14459 files changed, 57848 insertions, 63136 deletions

diff --git a/Manifest b/Manifest
index 1090222f99b9..47ad033ce8a2 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 28802 BLAKE2B 04fdba4dd3a756c7eb6ee3bd3b72fbc1666c9c2b7bfb316bec20e0d98caa8eb323ac0fd8d944d5666afcbed2e4e554539cc468ec84abf76fd680af5f8ce49bfa SHA512 e20e35676c07b60f77dd55f4b983118c186b2d3c4c7e8bb1e6cac16fc6a41916db0f89f834388380ccde12dcfaf107856d703765a8c7936431d36cf249c1a402
-TIMESTAMP 2018-09-30T09:38:33Z
+MANIFEST Manifest.files.gz 28823 BLAKE2B eec86af1e9ab5acfe8b9d2b41bb6edbf94e8561ddc016b9de0d8d86e3fc1fd5d19b7b6b4bf3806c0688605ed3b47dc9beccb96208518dd17b22c31cd11fec3d7 SHA512 2535a09941096b891f14edc1da6b7c878448d23c23ca727f5fe9be0e36877d8a8aba75541742b4a9db3b6445ec85e75613fce71eb05bd988e5dfd904b8351347
+TIMESTAMP 2018-10-07T09:08:41Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAluwmZlfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlu5zRlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAD9A//XjozQd5QDD/q3EvAGWnaKbYxxm31SaKewWxZbyoqhLK81e6s/Dw0RVYu
-NwSmVeCJ6WwlBzE/QXCe6lD31REGf5kPrDnBDkoX3nrHxOiQlWcxTuHbQmUUfCUu
-JF1MZPOwQkhuYpoK8+gS+g9KNttVPwbyd3sDxI2oIWeOgneoietmJmaaJjc4Fhm2
-LROvGRvSQm+Jz07/vExqNupMfxrdCsVQy4S7AGmDfeB0ScwxliL5mwV2KKBUuuS1
-cur6vhjmaYmUM/0VXwuNqMOSn+35GuTEmqguAdJT5gAI6IuM70mvpV01Ilb+sp3I
-m7Qa0v1LFzize69Xgd7aM6jyBlxtWPZ7038edYxlsyaGxPFeKv2TgPLGYS32r+LX
-F85wJkxD221pYKWVrMtMaUfvbkkRqkhF2Z8r3upYvoKG30YqFbdBqAoIe44QuahL
-Ysa5eZ+RnJnme4BZRC1KzdLsrT5DUoH7jLo0ftB6dZOrXsbFjONnnxnUh8j8jTDP
-8PzpisC1L52JUDX8ppxSh3KpOiNb4OOuNcgf79I+oBq0ppQm0GbK8bhNTHm64zLx
-ohKOOnGgiQgOt2/QdB4eT0y9XoFOtf850khqzzJLnu18z+cgSxf4P7To2N3CwfKT
-eUEd0kgsSgYQAS5oQa3T1hyv65ArXtvFeu9woUMadsq7yYP9k2w=
-=wYW1
+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
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index f92b9d13d9ac..18ef123bce61 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 9e3aeb5b5a3c..73a9d08c7a44 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 4661c9507415..db19a9263f60 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,18 +1,16 @@
 DIST ansible-2.5.10.tar.gz 10167484 BLAKE2B 0c60758d54fabef8037ce7e79d86c1508786a3e8cfe2cb1cc9d09cc24ece107414793f4dd12013dbc4c9a1354669288e0989374a20b7ebc035115dfd907c7279 SHA512 911f1f616206136708ceb4f9955e8bf309d7b506fcca9e0f31d770ead0a47c803d670909b6fe10b0d26056d3fd5c140e144132284ad5dbb618d3b013abc9385f
-DIST ansible-2.5.6.tar.gz 10157989 BLAKE2B 07341ab7a087e3139442d5420b461ca332f3a9e550874a746f43904763660ef12c9a2041bb991eeb315abdc7f6e31e3615d9283f407003eddddf2b661331c59a SHA512 169badaa6a94d1ea2d16cb97c7e5eb0b8c225a455edfa95f3ad9e4ec968d5b9525dec4732b60e5ba5f92412f87d8aacc0b2299f2595f3bb820ad8604be8e76d6
 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.1.tar.gz 10724749 BLAKE2B af4523ab904660fa3369bdae2839ab4b2f386235be5a004e1f9a9a5f7c555a2e6fe82319abe20ecbf7e74152f8e2ad5060fda2c2af0f5d62fdd9416901c9072c SHA512 1235e12a510317665956bfae9e0d03814083a24ba6e5c98072437e50b4a596437a173b32d9d5af37b4b9e168e35045fdb65e65276fdc830f473ab1f42dcba2d2
 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.7.0.tar.gz 11773769 BLAKE2B 00df537d2a8c6d76c7b4c4a424ff3c33a8a69d77ecdd741fe6ec4c6b30c7b136e28e644a488b6b49a305a454d1a923bd92d3b78be79a816fea6c127f4c2aa6da SHA512 a5e0e0b87bb2fa8fbc76825733a5c6afe642d4602be80466e5f28324e90be4487fd1c300e567a164222f171bd9eac65b7b36ca9b6fe4bebfcbd2c24dd60049ad
 EBUILD ansible-2.5.10.ebuild 1623 BLAKE2B 28e5e0c4e05904fa61ccb810b8ab546a41824c52a6d1246d9f9ae6e3d60d6d6c99ef91fda9aa304d0dda7fc3afcaf78e38731a189ca5fd5ccd1cf3e7dd7a0dc6 SHA512 44fe0eb5c7b0fe17db4e42abdb0c1294769527cdd724929799d517e1b21ce4a75ccdfa1a8099aee75bbd579f3cb820b00ac41ecc6903c18f03ea3a3ac31956bd
-EBUILD ansible-2.5.6.ebuild 1636 BLAKE2B 8c6498794147e6fc8c2cf50429a44f481f1244d532cb0205f6c0828bfceda1690264e78621fc74d75a03f3521600cc81f9f78afcba60a9e089b3472d9f4fa687 SHA512 5b90735e77ea2e0f47b6744f179ad555da406a6efa1a0137e590fe6e22cba1406aa925dd175a421fe7499ba2cdf9a8666673118700c046f9512d0572c6ec6fb6
 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.1.ebuild 1636 BLAKE2B 8c6498794147e6fc8c2cf50429a44f481f1244d532cb0205f6c0828bfceda1690264e78621fc74d75a03f3521600cc81f9f78afcba60a9e089b3472d9f4fa687 SHA512 5b90735e77ea2e0f47b6744f179ad555da406a6efa1a0137e590fe6e22cba1406aa925dd175a421fe7499ba2cdf9a8666673118700c046f9512d0572c6ec6fb6
 EBUILD ansible-2.6.3.ebuild 1624 BLAKE2B 406259cdee18b3b47e523252906b28e2480e51d0522fd14bcf7905938a737de5895b972ea51f0309105555b6475f966473f223f0ee7112f6a3ec910a0afd8697 SHA512 1f964bda9e7b54c0810d338c2fd474cff966a79285762d6bce3dfb1210cffa0a4a1d015f46bf59ff9c6463a63319386fb6e4d2bdc3ad9ebf2b9ba53bcff57669
-EBUILD ansible-2.6.4.ebuild 1626 BLAKE2B 99e0d3c67631e1f0c5c2e5118728ba06ad2fb26f6b0b689ca8541ac5f03611b5ec516a23ac7f2dfe73a677f0047e51291e83d03e820420e430276f0f844305fd SHA512 9e1a627f40a7a87abb811eaeb37601836324db2d292f4fae990aea3d6b3a5d30f739b1f4a198c5542cf0fbc1f836e9d96a8e67938fb6c3d9709800138a47ca9c
+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.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.6.ebuild b/app-admin/ansible/ansible-2.5.6.ebuild
deleted file mode 100644
index fb7e782721e5..000000000000
--- a/app-admin/ansible/ansible-2.5.6.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
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1 eutils versionator
-
-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.1.ebuild b/app-admin/ansible/ansible-2.6.1.ebuild
deleted file mode 100644
index fb7e782721e5..000000000000
--- a/app-admin/ansible/ansible-2.6.1.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
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1 eutils versionator
-
-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
index 6ca07021a91a..652b1374c856 100644
--- a/app-admin/ansible/ansible-2.6.4.ebuild
+++ b/app-admin/ansible/ansible-2.6.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
@@ -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.7.0.ebuild b/app-admin/ansible/ansible-2.7.0.ebuild
new file mode 100644
index 000000000000..71d5cc29eccb
--- /dev/null
+++ b/app-admin/ansible/ansible-2.7.0.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/calamares/Manifest b/app-admin/calamares/Manifest
index b48d2397f0f0..675a8a175dd8 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,8 +1,6 @@
 AUX calamares-pkexec 43 BLAKE2B 432999808da0fdde0e5d9c88887a5f112ac00c90af51f3d907d02ab4f9eb4fae7348856028bcfff98ced8698d0d039bd9506f50baa90f5b12b43c1b72885f230 SHA512 768148cd58cdfb5c6791b76ec60c21a4ca852120f53ed31a83bc7a2e0a26aa77b10bd3756182d3dff03208e820def4b83c45edba0484fa2f5a33c93880c3f4bb
 DIST calamares-3.1.13.tar.gz 2279516 BLAKE2B ff2c81e81086d53c205c25dbdb7e8b1b60f5f10c979e9afd85c02426cd38037c6fbbf76e21fa5fb152ea9bf1c47658563ba5b2fb7e84b4e2734d6269584315df SHA512 451e04fe41448976e612b2a682cf38ed2683b490bb195ba82ad97d47dfd3eb808f8c25251be00104e3f3b4086ab37be462034bbd2866e64536e90f7ebcfb0d7a
-DIST calamares-3.2.0.tar.gz 2488863 BLAKE2B 6941cdd7eb381a6ee4f7bc2628605ee5a670de0d839b5797cec930737ec5fc09e214c484c2e8398ab2f12669bbc64768d5ee20b2aa1adae799fb96373a0b07df SHA512 0b502749ace48ce56f2bb364d265c5b9197cca2b27115663f928cb58d02ba43e93b80b5022053bca5899ce6ee35146992157408fc5af017da6d61abdcdbc4e1d
 DIST calamares-3.2.2.tar.gz 2579462 BLAKE2B f477493451e084a287f43abfdd66d4a77ce839cad61f921801462bef73df74d42e616d63682d09d59309d6f98ffe560e6c8f9176c9fb290701dfb4e5aa263b29 SHA512 f060534941e0191defa65f024ec8dbbd275d16d40e491015997f12d3eb404a3117d1f113d4dcef3421ed0d15c1e24bdd8b31fc4554d313ebbd3959058c202e63
 EBUILD calamares-3.1.13.ebuild 1983 BLAKE2B ee4739b47d4224b681e5909fcc872eb59f8d414ecfd316338ae948b45fdcca51bcf7a82608b74b25e79db6a77fbe538f1ba4850edbc848a07bb4bf10aa9e471a SHA512 6c1630a7e30912297bc8238b46f40eb2935bd36ec862a421d46281881f167bd31b116c9bb19f082f9f584c01bc4102a241b8a668eae1cbcd6803e4b7404a969b
-EBUILD calamares-3.2.0-r1.ebuild 2158 BLAKE2B e723309d257b8b5209cb7dc84c5d6aa22b6ea9ac484786e44e8a5b0d0815248c39062898b4cab93b8e3cb6be6b8f7f802d877d660efbf186a0b68feb586c3d52 SHA512 8bed23d1f9d9a8468221d994b90b69f7e5a4bcd4e7c9bc06e515d123fa881956cc1f04c00b783bae237ddaad0abc74f98dc2951b48115546d262504816411cb9
 EBUILD calamares-3.2.2.ebuild 2188 BLAKE2B faf22c0f1f77779345778b693eea01edb5dfb28a3466b3393dda099e97c4e076924225c98bfa77a055cfeba312395f08b35eb21808161bf828c5bf658d378956 SHA512 9465e1540456e74042313b88a314757d7e6a0496ff6012818e601be11ad2f0c149c48870278c5ef8c06ac5218584e38798156061089189b20dfd1177becc1289
 MISC metadata.xml 1055 BLAKE2B a6c7974103baa5a646cb1d594e3f224903df9ce5c618ad4ed46c0b3d4df5d3437be570eda0d55e3b0ca8f6df4af9627b088ace2a3f0efc802528aeb49fc7bce6 SHA512 0269dad0b0a05e7c729ad5b9f1f7d6790c117b0d76b904dc909b868b1c298ff3352faafe91104b39cfc3c2e4f5e1a20244d3f5321c937d2334bd15bd910dc89f
diff --git a/app-admin/calamares/calamares-3.2.0-r1.ebuild b/app-admin/calamares/calamares-3.2.0-r1.ebuild
deleted file mode 100644
index 2d482b898d07..000000000000
--- a/app-admin/calamares/calamares-3.2.0-r1.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=( python{3_5,3_6} )
-inherit kde5 python-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="https://calamares.io"
-if [[ ${KDE_BUILD_TYPE} == live ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-IUSE="+networkmanager pythonqt +upower"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-cpp/yaml-cpp:=
-	>=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
-	dev-libs/libpwquality[${PYTHON_USEDEP}]
-	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_USEDEP}] )
-"
-
-RDEPEND="${DEPEND}
-	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 )
-"
-
-src_prepare() {
-	cmake-utils_src_prepare
-	python_setup
-	export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
-	       PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
-	       PYTHON_CFLAGS="$(python_get_CFLAGS)"\
-	       PYTHON_LIBS="$(python_get_LIBS)"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWEBVIEW_FORCE_WEBKIT=OFF
-		-DWITH_PYTHONQT=$(usex pythonqt)
-	)
-
-	kde5_src_configure
-	sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' "${S}"/calamares.desktop
-	sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' "${S}"/calamares.desktop
-}
-
-src_install() {
-	kde5_src_install
-	dobin "${FILESDIR}"/calamares-pkexec
-}
diff --git a/app-admin/chroot_safe/Manifest b/app-admin/chroot_safe/Manifest
index 1bc4dd55817b..c44b20b70343 100644
--- a/app-admin/chroot_safe/Manifest
+++ b/app-admin/chroot_safe/Manifest
@@ -1,4 +1,5 @@
 AUX chroot_safe-1.4-ldflags.patch 399 BLAKE2B 3acacf5d552da06fd1907d988f113d96058efbd357cd4e6bbe514d8e8ed750b7931f3ea61a065cf605c42e3d7a21986da5d27e5b242cc0d594adcd6537b9893a SHA512 f5e3114b5d553f95d1b885d1ff43aee4d3cfb2d15a5d519818ff2f4c36fe099cdd27e6bd578dbf7ce957c38d8b329fd786f0efb22d0785197706e19892da2753
 DIST chroot_safe-1.4.tgz 25886 BLAKE2B 62247d568240a93914e5c42c3bfefd2e8793a9b6bd27c13668ff3cc48ec396b622553764e934045c0c570eeff7b15c5ae9fb7b3623c5661be537e79ce9d93287 SHA512 7eee0d8e2c75ccf4bd918f610c21511498a6499b638d09634993a4d6874882a0dbc8c27eea95e9776f1722593e3445399a893557bfa6398a11b85447564dfe61
+EBUILD chroot_safe-1.4-r1.ebuild 752 BLAKE2B eb02065b18f0e11c6ee06d878aa5d942c28ba2427f0c0875b50c24f13e285793278043803497fc05a297b50ffd3069ee5cea75f753410b4137f5c78e228e25e1 SHA512 ed9177a1bb70f6b3e24d6c430474f2c56af71016b5d1d8651bd88df8ba0a51a0091ef6a87c8cc28f3f70e45f85e466ed2767008352ae2e8f3ee1c06c9eb64811
 EBUILD chroot_safe-1.4.ebuild 783 BLAKE2B acdc573b676ce35d9cf686f15f33231099361986209e15a28ac05c17a1b487dfa7d689ecd0ae2e474a23f089f50c63972aa4673c2e2e406a652f4ce4f2dca909 SHA512 f5977571dfaf1f7e63cdd6d75bd7ba01986856e75bb73dcc49f0da6d08f9a127cfe56cb286026f3f504956994e238fa53cf571400f4fdcba2116b9935c455364
 MISC metadata.xml 247 BLAKE2B 306b96b46dafe605c41d3111cf9bd2fc3ef659f9f66692d05f952f8c9606d5bf1b1dd8051cdf1cd2d4e41f01934e57ae3e55ae46d23ba5acc2314d2fef325a4f SHA512 c46fc3160d29be2ce0948b1503ce44ead81dc76a264e183dc667be4e4f9bce0e235c94c2ebd06934b63cc7575aa8d5f27a528bb79185d35a138c7e0ec6dd1e3c
diff --git a/app-admin/chroot_safe/chroot_safe-1.4-r1.ebuild b/app-admin/chroot_safe/chroot_safe-1.4-r1.ebuild
new file mode 100644
index 000000000000..1eb04bd3ccbc
--- /dev/null
+++ b/app-admin/chroot_safe/chroot_safe-1.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
+
+inherit toolchain-funcs
+
+DESCRIPTION="Chroot any dynamically linked application in a safe and sane manner"
+HOMEPAGE="http://chrootsafe.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN//_}/${P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+PATCHES=( "${FILESDIR}"/${P}-ldflags.patch )
+
+src_configure() {
+	econf --libexecdir="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_compile() {
+	emake CPPFLAGS="${CXXFLAGS}" CXX="$(tc-getCXX)"
+}
+
+src_install() {
+	dolib.so chroot_safe.so
+	dosbin chroot_safe
+	sed -i -e "s:/chroot_safe::" "${ED}"/usr/sbin/chroot_safe \
+		|| die "sed chroot_safe failed"
+	doman chroot_safe.1
+	dodoc CHANGES.txt
+}
diff --git a/app-admin/keepass/Manifest b/app-admin/keepass/Manifest
index 03ee3189ae80..32c0f77f0fef 100644
--- a/app-admin/keepass/Manifest
+++ b/app-admin/keepass/Manifest
@@ -5,5 +5,6 @@ DIST KeePass-2.39.1-Source.zip 5109228 BLAKE2B 0b1214ac70d3d615e029c89abe63176f3
 DIST KeePass-2.40-Source.zip 5136918 BLAKE2B 7b5071cbe3bc5f20450a094a4b8969e2e25f6bba27d88ee5c2c25f2706ed3cf18e721ba53ff54c78db6ea1e167cef1108611fc8253a9d6e19eb3f9d1f3317c73 SHA512 222f7e7ef65be8b0d75baa0a6e871d5edad1b570b64f261405b843d7387ec1faeb4138afb8b31934d70eebe0add297681028cb4f3acfcbe4f518c763fe6c0145
 EBUILD keepass-2.38.ebuild 3037 BLAKE2B 3fe5b971d8336ffdc3f9b520ac3c4530cdee3555c3e20cf7658ddb6fc874b28d1ee5710d76de2282128e83c84f05b5b2435db657e9be278ce4ed7ea107b6829a SHA512 f2f473c7fcde5e11711c3519c72ad78f2853ac6e7c242da2be9aa34e74e8d7962e2416e48a827b5a6d6e9b6f91314b426e662cbdc2e01e9c2d8e9331120f10a7
 EBUILD keepass-2.39.1.ebuild 3044 BLAKE2B 9585f72e1556fd9d033ee8dafb3a6baeca0e1aad2c318367f6dcadb102a0557890e422679529b3f3d61ebdf5120a49eda13553326f5b5a919d6245edeb927e77 SHA512 143239c46dc87d69859beaf7b3ef621d4793c6341871e7c325058529b00c4a1a5da297b42d1e4dc0788eb7e80a2b27d47f02bbdd9758050aab1615f02de8245d
+EBUILD keepass-2.40-r1.ebuild 3067 BLAKE2B ac3e7eb4b4ffb515bad007aed19a1259b96caff907923e6792d4988fbb0c045639bce852502a7843c7b22791a1ffe27bbf748b118f4842a7f11847f2f6786bfd SHA512 19ad84df5e6de4d238c4bc07e4c15377945a966222d6ea25863b364be1882b154a6b6e4514b7c7820b69b13f4a3e2cbf4ebe852efbf1ef7d72f4e6b06ece3901
 EBUILD keepass-2.40.ebuild 3044 BLAKE2B 9585f72e1556fd9d033ee8dafb3a6baeca0e1aad2c318367f6dcadb102a0557890e422679529b3f3d61ebdf5120a49eda13553326f5b5a919d6245edeb927e77 SHA512 143239c46dc87d69859beaf7b3ef621d4793c6341871e7c325058529b00c4a1a5da297b42d1e4dc0788eb7e80a2b27d47f02bbdd9758050aab1615f02de8245d
 MISC metadata.xml 651 BLAKE2B 058fa70fb6ce35fb52464a84cf506ad117343a1376a40b003c4f55bdf94369136276d8bbb67f30490eb73cba4df6b03d78e8c2a65cf8141dd6cf64654c9b6358 SHA512 6251f546e631decbc7692ab00900d722031ce638f3d878771a2bcfebedba8e1fee9b3e54dfd4c3ae3c711006099fc5a772555ea7cc018d012de164755ba8b52c
diff --git a/app-admin/keepass/keepass-2.40-r1.ebuild b/app-admin/keepass/keepass-2.40-r1.ebuild
new file mode 100644
index 000000000000..2e9012f82203
--- /dev/null
+++ b/app-admin/keepass/keepass-2.40-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils gnome2-utils xdg-utils
+
+MY_PN="KeePass"
+DESCRIPTION="A free, open source, light-weight and easy-to-use password manager"
+HOMEPAGE="https://keepass.info/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aot"
+
+COMMON_DEPEND="dev-lang/mono"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-dotnet/libgdiplus[cairo]
+"
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}/${PN}-2.36-xsl-path-detection.patch" )
+
+src_prepare() {
+	# KeePass looks for some XSL files in the same folder as the executable,
+	# we prefer to have it in /usr/share/KeePass. Apply patch using base function.
+	# This XSL file will not be upstreamed since the KeePass creator said that
+	# including this patch would break the Portable USB version of KeePass
+	# (which keeps/looks for xsl files in its own folder)
+	default
+
+	# Switch into build dir so the mono prepration script works correctly
+	pushd Build || die
+	source PrepMonoDev.sh || die
+	popd || die
+}
+
+src_compile() {
+	# Build with Release target
+	xbuild /target:KeePass /property:Configuration=Release || die
+
+	# Run Ahead Of Time compiler on the binary
+	if use aot; then
+		cp Ext/KeePass.exe.config Build/KeePass/Release/ || die
+		mono --aot -O=all Build/KeePass/Release/KeePass.exe || die
+	fi
+}
+
+src_install() {
+	# Wrapper script to launch mono
+	make_wrapper "${PN}" "mono /usr/$(get_libdir)/${PN}/KeePass.exe"
+
+	# Some XSL files
+	insinto "/usr/share/${PN}/XSL"
+	doins Ext/XSL/*
+
+	insinto "/usr/$(get_libdir)/${PN}"
+	exeinto "/usr/$(get_libdir)/${PN}"
+
+	doins Ext/KeePass.exe.config
+
+	# Default configuration, simply says to use user-specific configuration
+	doins Ext/KeePass.config.xml
+
+	# The actual executable
+	doexe Build/KeePass/Release/KeePass.exe
+
+	# Copy the AOT compilation result
+	if use aot; then
+		doexe Build/KeePass/Release/KeePass.exe.so
+	fi
+
+	# Prepare the icons
+	newicon -s 256 Ext/Icons_04_CB/Finals/plockb.png "${PN}.png"
+	newicon -s 256 -t gnome -c mimetypes Ext/Icons_04_CB/Finals/plockb.png "application-x-${PN}2.png"
+
+	# Create a desktop entry and associate it with the KeePass mime type
+	make_desktop_entry "${PN}" "${MY_PN}" "${PN}" "System;Security" "MimeType=application/x-keepass2;\nStartupWMClass=KeePass2;"
+
+	# MIME descriptor for .kdbx files
+	insinto /usr/share/mime/packages
+	doins "${FILESDIR}/${PN}.xml"
+
+	# sed, because patching this really sucks
+	sed -i 's/mono/mono --verify-all/g' "${D}/usr/bin/keepass" || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	if ! has_version x11-misc/xdotool ; then
+		elog "Optional dependencies:"
+		elog "	x11-misc/xdotool (enables autotype/autofill)"
+	fi
+
+	elog "Some systems may experience issues with copy and paste operations."
+	elog "If you encounter this, please install x11-misc/xsel."
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 6a858dbda6c6..c5eb93e1111b 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -7,12 +7,12 @@ AUX logstash.initd 2091 BLAKE2B 980722c1c3cd0cc60cf440d5a06185c66ac4348c0e899003
 AUX logstash.initd-r1 2176 BLAKE2B 37c05148d3789c69805ae5151bed5e297d71b9d60d71ff98ed411ac59b73c4a2a9462e6223a2c960301c6228c84879460ae0f793a24806768fb727b01d982709 SHA512 392c8297c6429e0384dd75073773e1f8f51dd62fd155b2a524efd9e862df114b13cc63cf37237526aebe838b5ff26a8f26a3ad08058a56a723e25025df9a16af
 AUX logstash.initd-r2 1989 BLAKE2B efa16227a2cf1a42f1f9e27e110dae64c7eb6547e22e89a71b3394fe587e0f83468e361d335e28b15a1507959dc26c019ae8ac9bc110f1b8a6896ceb7f3ceecc SHA512 77c69600f22d31e7e08c2d953c99bea8a24ad83c7abdd578526b850ca37c963a91cfd245b70e4ddb8d405135230fbc641768de2dc4dad096a0db3d40313acb2f
 AUX pipelines.yml 285 BLAKE2B d256148500854501d8e17c04a0abdcbf1be7aeea6d0e1eaa882023923967ebc012ef95185e06e33fbec60eaa949df650ebe4f9b18abaa7f4edab25d4e5b429f4 SHA512 9a9cff9472c7cd3164bdc73e37521489979106021b3d97fb2b005b74b150d2f2ee8df983219e01f8b5b00907008f4e9816fc303ace3b440a4b91dd178b6a098d
-DIST logstash-5.6.11.tar.gz 104371822 BLAKE2B 3597b8ef661fa2bcbfd112966b11789925b1fafdc11991390c96d62af02d959cc251c59f352a949b14760df9f5eda5672ff407b70b3f361d4ec7ce3379eb7e5d SHA512 1e8f78fd76f637672bf18ec4b986c56c76be357788364e4dc863933f28982b988b147f31e091381e960c010ee4791e6f79914a75bacfe6b0482e573272bba749
+DIST logstash-5.6.12.tar.gz 104371301 BLAKE2B be7a2c7df807ae9ab738c1ec7693e23bd4491e14cc866e50b2a4d6b58466ce94801ccc6684c7d297a2d89faba67ba10d61b50b57c439a8b3ba3fa3a0752b4529 SHA512 39411a92eac34160a9b38914c08165ba789c5d16f76b1823dd08305581b18a668fb680b60c6be50fd59b2bb79bf7f507b39b42cc71ac0f5b9c5be597048f32a5
 DIST logstash-6.3.2.tar.gz 144211416 BLAKE2B 8471fd0a920b4ef06cd775ceaafde33e16e5d1898c89339f4a039262a7a6472d6cb8dd2017db8811d6a827395a5b1e7040d9759c8734de2ccd1fc7e615345813 SHA512 11507b9177aa6cd4172eb825e395571de71bae8b0e39d7f700fe27c7219b22bc2b9a493e39016eead2d54407dc5e5cc20a0c6e4453140d628cadea076453308f
-DIST logstash-6.4.0.tar.gz 153887188 BLAKE2B 36f6181d8f8e9c9d9a9f919c66c909fd3008d41b2de9bf014738ba6f3bd8f08204c2acc12c32a4978421476ddc45dc01269d8b145c2d863304d942a24b02a520 SHA512 6cb47370c757151fd7e2eed03b05d28492bfc0f5d397cf885ee6814965a83884716b39d3c9360341c3d4d029dc60d61502453defd42cc072c5ad3756bc2c654f
+DIST logstash-6.4.1.tar.gz 153922055 BLAKE2B 5a9c2852047e7a6a318eaa710d273cbfa172ae02c08a08b361a6f2bc48c5e46b3d7709652a51e3b0102fbf7c73ad179c18b6ed6a961bece53d009de065f13e5c SHA512 b496ed0746ee38a375a3efc5eb93677accb61c3482550a75cf9ad5e7b8e104eb8560bce79325ce85a27d22b664299edf1970452837189fcfa9310798c58825c1
 DIST logstash-oss-6.3.2.tar.gz 144128583 BLAKE2B 99de9d375a06d132844ce63fa5d0e092bb05aedb93ff5e4a278ea75ca2fe68701afa3028af4f9c3e5b3b469e46faf4d6dc62d006e9dac3a9e9528ff94aa2dd47 SHA512 7fa97f0ca070677aaddc73ff900397ce4a45f4b02467917219acb3c414cf0cbf396b481f624d2ebc3f370b2e41120b3b103f6d080a9fafdce98b119eb8d27f5d
-DIST logstash-oss-6.4.0.tar.gz 153760331 BLAKE2B 7e519d9666d5fb98079c5eb721b1a4f721fbf0c871919d115e67ff00111d25184abf37bdcb3cacb1bc3eccbc779cc15a9324f72d5e02337ab6993a0d1a9dab18 SHA512 2261cffdb6ee7eba08d381f243e534b8d756c760ac40a5707a3abb4adca08c02c403a8c204dab2091bb46bb4be52b938867675041c49a25e3b1c98fb07f92b98
-EBUILD logstash-bin-5.6.11.ebuild 2198 BLAKE2B d271b016d5b4318124314f0df5ea9481197ee18c7f20183f731d0026d34356e3df80123174e733b009417984d81ac9f9eccc8c4e53e929a12e28ae28d6b43c3c SHA512 70df6a19cf77a14a9b0f80025cc42d1feb6fe2545dabf70e864b47f34b971d4b6ad1d70e4600eb684e656c2fd5827f98fcd06f319e6a483aab0e49e865e239bb
+DIST logstash-oss-6.4.1.tar.gz 153795059 BLAKE2B 1262fac2128bbbf1d172473ea8522ed2469a449d93eef4f3aefa6026e4347e2247ed03990164d72a9b8a01fa1c1b393207b7c5d73d82d20934ada78cefb5af64 SHA512 1192154eaa48cccbdefa4db7f08dce3a68066d5fd7a14cc3093d06c848efc5c4f1a87c873c43c4e17741be9e41c3de1f14ff41df7af2c3c4600a741fefc94b47
+EBUILD logstash-bin-5.6.12.ebuild 2195 BLAKE2B df43d04421b3463a427cb2d1c6a1efce021ad8064d08a004535463c6d58f8b41d5dce3fdfe81f556b949151392d373a0685e24a0c0c65d2ee405c6ed834760e5 SHA512 8acbfce31e3484fbd9d9de4337f981bb7d720eb7fda7c200efed822a645c7b81318a4f8642dee620ffd50fd365eb9d70d754cebf666fdeba8a405a2b4f5d5ada
 EBUILD logstash-bin-6.3.2.ebuild 2188 BLAKE2B 7256bfb5ecd30e4cc14ff6173e3faf9631c51e8d7f57edd8c415b661ffd9bdcc8e3f793c0acd3320fd7bc4589a992889d215ab16ad26a8ace452a54f0f50f517 SHA512 5390442582c1a9c7a05b0709376fdb8be89cda413f201a25c3e80c74ec72328b9aee554e875293d824349139188ad29585374bb9077fcf4634145d9e18d5bc9d
-EBUILD logstash-bin-6.4.0.ebuild 2188 BLAKE2B 7256bfb5ecd30e4cc14ff6173e3faf9631c51e8d7f57edd8c415b661ffd9bdcc8e3f793c0acd3320fd7bc4589a992889d215ab16ad26a8ace452a54f0f50f517 SHA512 5390442582c1a9c7a05b0709376fdb8be89cda413f201a25c3e80c74ec72328b9aee554e875293d824349139188ad29585374bb9077fcf4634145d9e18d5bc9d
+EBUILD logstash-bin-6.4.1.ebuild 2185 BLAKE2B dfcaa0e47c218e234f46096cba58dd2db1fc629262eeae6e988e599fe827c99bdbeb956e5f2c89f230e0791caaece1a8ebba257d9aa33a13f98b6c2ebd042b90 SHA512 683341bd6666acc3fc1dc5308e5d178f006f338590c1be96e116aa2ebcda4d2b74563eface36359624d03eb1b4023d378f9357722855e83fca7edc6f66ffa665
 MISC metadata.xml 648 BLAKE2B 1c6bd205971968cbbc720f093853d6f3eb069787447c3e4dcfb12bd345c75adfc7f47dc34a95d28f7bacc77f9e863c44880e15afbcb0fea5468d068b02a53923 SHA512 2fe18cd9d1ae40093e6187aad630c04d94c85e400808e74d3755c7591d260f86b00dff4f1cb7dbe905b014d1551ceeaff1ce4ca21e2c755097600733448453ab
diff --git a/app-admin/logstash-bin/logstash-bin-5.6.11.ebuild b/app-admin/logstash-bin/logstash-bin-5.6.11.ebuild
deleted file mode 100644
index b52e9f6f7bf8..000000000000
--- a/app-admin/logstash-bin/logstash-bin-5.6.11.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
-
-inherit java-pkg-2 user
-
-MY_PN="${PN%-bin}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tool for managing events and logs"
-HOMEPAGE="https://www.elastic.co/products/logstash"
-SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz"
-
-# source: LICENSE.txt and NOTICE.txt
-LICENSE="Apache-2.0 MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="strip"
-QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
-
-RDEPEND="virtual/jre:1.8"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup ${MY_PN}
-	enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN}
-}
-
-src_install() {
-	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
-	keepdir "/var/lib/${MY_PN}"
-	keepdir "/var/log/${MY_PN}"
-
-	insinto "/usr/share/${MY_PN}"
-	newins "${FILESDIR}/agent.conf.sample" agent.conf
-
-	rm -v config/startup.options || die
-	insinto /etc/${MY_PN}
-	doins -r config/.
-	rm -rv config data || die
-
-	insinto "/opt/${MY_PN}"
-	doins -r .
-	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
-
-	newconfd "${FILESDIR}/${MY_PN}.confd-r1" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.initd-r1" "${MY_PN}"
-
-	insinto /usr/share/eselect/modules
-	doins "${FILESDIR}"/logstash-plugin.eselect
-}
-
-pkg_postinst() {
-	ewarn "The default pidfile directory has been changed from /run/logstash to /run."
-	ewarn "Please ensure any running logstash processes are shut down cleanly."
-	ewarn
-	ewarn "The default data directory has been moved from /opt/logstash/data to"
-	ewarn "/var/lib/logstash/data. Please check and move its contents as necessary."
-	ewarn
-	ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
-	ewarn "Install the plugins via eselect module that will automatically re-install"
-	ewarn "all self installed plugins after Logstash upgrades."
-	elog
-	elog "Installing plugins:"
-	elog "eselect logstash-plugin install logstash-output-gelf"
-	elog
-
-	elog "Reinstalling self installed plugins (installed via eselect module):"
-	eselect logstash-plugin reinstall
-
-	elog
-	elog "Sample configuration:"
-	elog "${EROOT%/}/usr/share/${MY_PN}"
-}
diff --git a/app-admin/logstash-bin/logstash-bin-5.6.12.ebuild b/app-admin/logstash-bin/logstash-bin-5.6.12.ebuild
new file mode 100644
index 000000000000..9692d38eba5b
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-5.6.12.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2 user
+
+MY_PN="${PN%-bin}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tool for managing events and logs"
+HOMEPAGE="https://www.elastic.co/products/logstash"
+SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="strip"
+QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
+
+RDEPEND="virtual/jre:1.8"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup ${MY_PN}
+	enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN}
+}
+
+src_install() {
+	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
+	keepdir "/var/lib/${MY_PN}"
+	keepdir "/var/log/${MY_PN}"
+
+	insinto "/usr/share/${MY_PN}"
+	newins "${FILESDIR}/agent.conf.sample" agent.conf
+
+	rm -v config/startup.options || die
+	insinto /etc/${MY_PN}
+	doins -r config/.
+	rm -rv config data || die
+
+	insinto "/opt/${MY_PN}"
+	doins -r .
+	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
+
+	newconfd "${FILESDIR}/${MY_PN}.confd-r1" "${MY_PN}"
+	newinitd "${FILESDIR}/${MY_PN}.initd-r1" "${MY_PN}"
+
+	insinto /usr/share/eselect/modules
+	doins "${FILESDIR}"/logstash-plugin.eselect
+}
+
+pkg_postinst() {
+	ewarn "The default pidfile directory has been changed from /run/logstash to /run."
+	ewarn "Please ensure any running logstash processes are shut down cleanly."
+	ewarn
+	ewarn "The default data directory has been moved from /opt/logstash/data to"
+	ewarn "/var/lib/logstash/data. Please check and move its contents as necessary."
+	ewarn
+	ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
+	ewarn "Install the plugins via eselect module that will automatically re-install"
+	ewarn "all self installed plugins after Logstash upgrades."
+	elog
+	elog "Installing plugins:"
+	elog "eselect logstash-plugin install logstash-output-gelf"
+	elog
+
+	elog "Reinstalling self installed plugins (installed via eselect module):"
+	eselect logstash-plugin reinstall
+
+	elog
+	elog "Sample configuration:"
+	elog "${EROOT%/}/usr/share/${MY_PN}"
+}
diff --git a/app-admin/logstash-bin/logstash-bin-6.4.0.ebuild b/app-admin/logstash-bin/logstash-bin-6.4.0.ebuild
deleted file mode 100644
index acbb17a3c74d..000000000000
--- a/app-admin/logstash-bin/logstash-bin-6.4.0.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
-
-inherit java-pkg-2 user
-
-MY_PN="${PN%-bin}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tool for managing events and logs"
-HOMEPAGE="https://www.elastic.co/products/logstash"
-SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz )
-	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )"
-
-# source: LICENSE.txt and NOTICE.txt
-LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="x-pack"
-
-RESTRICT="strip"
-QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
-
-RDEPEND="virtual/jre:1.8"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup ${MY_PN}
-	enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN}
-}
-
-src_install() {
-	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
-	keepdir "/var/lib/${MY_PN}"
-	keepdir "/var/log/${MY_PN}"
-
-	insinto "/usr/share/${MY_PN}"
-	newins "${FILESDIR}/agent.conf.sample" agent.conf
-
-	rm -v config/{pipelines.yml,startup.options} || die
-	insinto /etc/${MY_PN}
-	doins -r config/.
-	doins "${FILESDIR}/pipelines.yml"
-	rm -rv config data || die
-
-	insinto "/opt/${MY_PN}"
-	doins -r .
-	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
-
-	newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
-
-	insinto /usr/share/eselect/modules
-	doins "${FILESDIR}"/logstash-plugin.eselect
-}
-
-pkg_postinst() {
-	ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
-	ewarn "Install the plugins via eselect module that will automatically re-install"
-	ewarn "all self installed plugins after Logstash upgrades."
-	elog
-	elog "Installing plugins:"
-	elog "eselect logstash-plugin install logstash-output-gelf"
-	elog
-
-	elog "Reinstalling self installed plugins (installed via eselect module):"
-	eselect logstash-plugin reinstall
-
-	elog
-	elog "Sample configuration:"
-	elog "${EROOT%/}/usr/share/${MY_PN}"
-	elog
-	elog "The default pipeline configuration expects the configuration(s) to be found in:"
-	elog "${EROOT%/}/etc/logstash/conf.d/*.conf"
-}
diff --git a/app-admin/logstash-bin/logstash-bin-6.4.1.ebuild b/app-admin/logstash-bin/logstash-bin-6.4.1.ebuild
new file mode 100644
index 000000000000..7cc0ca6f38b2
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-6.4.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 java-pkg-2 user
+
+MY_PN="${PN%-bin}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tool for managing events and logs"
+HOMEPAGE="https://www.elastic.co/products/logstash"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz )
+	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+RESTRICT="strip"
+QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
+
+RDEPEND="virtual/jre:1.8"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup ${MY_PN}
+	enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN}
+}
+
+src_install() {
+	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
+	keepdir "/var/lib/${MY_PN}"
+	keepdir "/var/log/${MY_PN}"
+
+	insinto "/usr/share/${MY_PN}"
+	newins "${FILESDIR}/agent.conf.sample" agent.conf
+
+	rm -v config/{pipelines.yml,startup.options} || die
+	insinto /etc/${MY_PN}
+	doins -r config/.
+	doins "${FILESDIR}/pipelines.yml"
+	rm -rv config data || die
+
+	insinto "/opt/${MY_PN}"
+	doins -r .
+	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
+
+	newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
+	newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
+
+	insinto /usr/share/eselect/modules
+	doins "${FILESDIR}"/logstash-plugin.eselect
+}
+
+pkg_postinst() {
+	ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
+	ewarn "Install the plugins via eselect module that will automatically re-install"
+	ewarn "all self installed plugins after Logstash upgrades."
+	elog
+	elog "Installing plugins:"
+	elog "eselect logstash-plugin install logstash-output-gelf"
+	elog
+
+	elog "Reinstalling self installed plugins (installed via eselect module):"
+	eselect logstash-plugin reinstall
+
+	elog
+	elog "Sample configuration:"
+	elog "${EROOT%/}/usr/share/${MY_PN}"
+	elog
+	elog "The default pipeline configuration expects the configuration(s) to be found in:"
+	elog "${EROOT%/}/etc/logstash/conf.d/*.conf"
+}
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index e92eaa5d50bd..4e420cf4d1af 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -7,9 +7,9 @@ DIST puppet-agent_5.5.4-1stretch_amd64.deb 17273314 BLAKE2B e296cda8219deafe9b36
 DIST puppet-agent_5.5.4-1stretch_i386.deb 18195740 BLAKE2B aa1e5b7030de4ec58a389a552c0d2c870875244f6a722c9b87d4aca28261f073b347476aaa313edd4f66fa07621a333c777a3a6b04228aa7d2f35391f4f84df8 SHA512 3e7346ccde7d3bc9e99bb38a2958c9ddda3dd4a5124ced21dc048df41566a0d9e6d9e5250f7c93433c02585fd83031292f8197a7c6537a1563dd6ebec464b979
 DIST puppet-agent_5.5.6-1stretch_amd64.deb 17279588 BLAKE2B d9614ee1cbec786303ac72fc9b704c90056771c9e3c23a93d6b7cff11f27394fbd277d5ae0d8eca20d9801d31019e7ca381af0cb60b72fc109ce6b2a99ee1124 SHA512 1172d72a1054cf04ab8033ab319313b7da6fd76684738bdb4aa1bc6bd9fa9dc0f2b00d765382023e0e854efbee6adba5b66bd62e2e04a9f153da79bccad427f7
 DIST puppet-agent_5.5.6-1stretch_i386.deb 18195950 BLAKE2B 602a8409a6f0b5695f389604f82b8d6401db5d8abdd7148418bab6f09d64b285ff1c43870b144e863f148993b2e02c1abe11827e3e29ad5cf1314d7030cd5988 SHA512 f96bd2f4cbb2cec2405fdf87bb61711f8a750462d15e65507d37cc6cf6fa8f3a5e3a3d66abc74cfc02a109cc17c413e7f32c8d5f179468c84f6a86452ae38c40
-DIST puppet-agent_6.0.0-1stretch_amd64.deb 17853440 BLAKE2B 8d361b7e9412a3410fb0863364db174639d1664c83eae67c188bb0f522c2944f048b9d41e9a5e5e3db281669ebca152fe49f174dda4be29d42b964a7955ccfe4 SHA512 8e6d50b6d3eff9179fcf915cbc483ea679b1edb236aed148aff92ccae4f915caf79459f346e2823fb03372997f10a6585206ea97260577704ede28f82a3761b1
-DIST puppet-agent_6.0.0-1stretch_i386.deb 18591732 BLAKE2B 89cad6275d1ef3cafa4e3794c3104d66dcb9ce450c31694e648aecc8d31d839b96ccc9f83fae4f2ee188387d058996b14961a2c6d9244fb71cfafc3cf1aa841c SHA512 85f9a313a9a1320e5a08d20ffc8e1de0e60336534ad5ffcc34581f34b9a2e68636a8c326001bc25209c2c530feb3ce08a86a1e7cbde143882a97103f09591af4
+DIST puppet-agent_6.0.2-1stretch_amd64.deb 17859762 BLAKE2B c787eb36bc1eacb544b669959d83539ba157702627a7cf925cd1be9e919604cd749f86a1635e9c0b53fe85f446e377fc61123ca259357f4a5781d0f8f406f365 SHA512 c0587cbf382258c73760837eab85985c2414ff59521bbed680b13b5d09ebb76a96cc52e553d68fb482f4b2d725b130fc3b747849637b4c73cb11b5f5cd266a44
+DIST puppet-agent_6.0.2-1stretch_i386.deb 18596344 BLAKE2B 9f1f99e0c1033f621b3c50674f18e296e65b9addf82e61163e995f69eedbca97174a3ede6324e9bec1b46c4819a2c68892a4bdb7db8e81aba975bb6293c018df SHA512 9f2fc097ea2ef7c4411227ba97fa3371b98b3b3b4fb5e9c70a71ae87215e3c7b9fb5ee2cd58324bb24fb2352e34d4509165ca8e2c9c1144e89237307683a7dfd
 EBUILD puppet-agent-5.5.4.ebuild 2481 BLAKE2B 763dc1a03051af2be4472342dcfad9304649f7fde6d83889c93cae0b7b7521d6c28cf17cf8227f553a0a409a705678070b8e83161871f5d116302803868c92d2 SHA512 b1811874ca9c554896a16c8f134a8b4b84217192924f999a5a0c9d72630776c50de5f0ef16be82559e6f97548332a23ca0e68618b64bdc623bc27745c70229a0
 EBUILD puppet-agent-5.5.6.ebuild 2481 BLAKE2B 763dc1a03051af2be4472342dcfad9304649f7fde6d83889c93cae0b7b7521d6c28cf17cf8227f553a0a409a705678070b8e83161871f5d116302803868c92d2 SHA512 b1811874ca9c554896a16c8f134a8b4b84217192924f999a5a0c9d72630776c50de5f0ef16be82559e6f97548332a23ca0e68618b64bdc623bc27745c70229a0
-EBUILD puppet-agent-6.0.0.ebuild 2180 BLAKE2B 2d854d4c7f26ea7c5dfb467207b9d740f571f0a9df789918b7ed195f283d697cd1d0bee7c02fccabe672f9a25984f023fc20192c2ad2a4fe8442f36527c67afd SHA512 ea66604600e2b5802bba6c3f7d57cd5a2c2dddf4d0885d69147563d45a722195321b5cab2fee523279e5c5dfbcec43e7303e3706172b0982e43a2c5f39ebd057
+EBUILD puppet-agent-6.0.2.ebuild 2177 BLAKE2B c85e11a40efe10eb550bbd4a04e01e9ab90e11e350697124e8adf36ae7b955111f00071a2dad7645c76b44ffa8a9a7285fd2e41d6756e96aa2053b70540227ce SHA512 0def0f855b823e935dc5addf3dcb5351b9b570d9e2c6de216ac8e9394143df015da37fd11187747bc620312d690285d9f981a18a3485720b79ffe7a16b406ee7
 MISC metadata.xml 433 BLAKE2B fc93f68be51fe0b46ffe44204f1a786375b0377168fc254be5b4d6b6d9f2ac4caabeec37064741ba951ce10e96612c2c612904b49ea63d6c40a93492b1ab853f SHA512 ad0a7b8c9b0898bca444d604071a12099559ef2ea3179fc2f56ef9b4a89de6b0791e462e1dd8a3fdfb56e22aca53b7c6e6451bc31afe242c174841c2765a0402
diff --git a/app-admin/puppet-agent/puppet-agent-6.0.0.ebuild b/app-admin/puppet-agent/puppet-agent-6.0.0.ebuild
deleted file mode 100644
index 1756e5e64ce7..000000000000
--- a/app-admin/puppet-agent/puppet-agent-6.0.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 eutils systemd unpacker user
-
-DESCRIPTION="general puppet client utils along with hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch"
-SRC_URI="
-	amd64? ( ${SRC_BASE}_amd64.deb )
-	x86?   ( ${SRC_BASE}_i386.deb )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-CDEPEND="!app-admin/augeas
-	!app-admin/puppet
-	!dev-ruby/hiera
-	!dev-ruby/facter
-	!app-emulation/virt-what"
-
-DEPEND="
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	app-portage/eix
-	sys-apps/dmidecode
-	sys-libs/glibc
-	sys-libs/readline:0/7
-	sys-libs/ncurses:0[tinfo]
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/run/puppet puppet
-}
-
-src_install() {
-	# conf.d
-	doconfd etc/default/puppet
-	doconfd etc/default/pxp-agent
-	# logrotate.d
-	insinto /etc/logrotate.d
-	doins etc/logrotate.d/pxp-agent
-	# puppet itself
-	insinto /etc/puppetlabs
-	doins -r etc/puppetlabs/*
-	# logdir for systemd
-	dodir var/log/puppetlabs/puppet/
-	fperms 0750 var/log/puppetlabs/puppet/
-	# the rest
-	insinto /opt
-	dodir opt/puppetlabs/puppet/cache
-	doins -r opt/*
-	fperms 0750 /opt/puppetlabs/puppet/cache
-	# init
-	newinitd "${FILESDIR}/puppet.initd" puppet
-	systemd_dounit lib/systemd/system/puppet.service
-	systemd_dounit lib/systemd/system/pxp-agent.service
-	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
-	# symlinks
-	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
-	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
-	dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
-	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
-	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
-	dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
-	dosym ../../opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
-	dosym ../../opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
-}
diff --git a/app-admin/puppet-agent/puppet-agent-6.0.2.ebuild b/app-admin/puppet-agent/puppet-agent-6.0.2.ebuild
new file mode 100644
index 000000000000..4ad0513947d9
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-6.0.2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils systemd unpacker user
+
+DESCRIPTION="general puppet client utils along with hiera and facter"
+HOMEPAGE="https://puppetlabs.com/"
+SRC_BASE="http://apt.puppetlabs.com/pool/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch"
+SRC_URI="
+	amd64? ( ${SRC_BASE}_amd64.deb )
+	x86?   ( ${SRC_BASE}_i386.deb )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="puppetdb selinux"
+RESTRICT="strip"
+
+CDEPEND="!app-admin/augeas
+	!app-admin/puppet
+	!dev-ruby/hiera
+	!dev-ruby/facter
+	!app-emulation/virt-what"
+
+DEPEND="
+	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	app-portage/eix
+	sys-apps/dmidecode
+	sys-libs/glibc
+	sys-libs/readline:0/7
+	sys-libs/ncurses:0[tinfo]
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/run/puppet puppet
+}
+
+src_install() {
+	# conf.d
+	doconfd etc/default/puppet
+	doconfd etc/default/pxp-agent
+	# logrotate.d
+	insinto /etc/logrotate.d
+	doins etc/logrotate.d/pxp-agent
+	# puppet itself
+	insinto /etc/puppetlabs
+	doins -r etc/puppetlabs/*
+	# logdir for systemd
+	dodir var/log/puppetlabs/puppet/
+	fperms 0750 var/log/puppetlabs/puppet/
+	# the rest
+	insinto /opt
+	dodir opt/puppetlabs/puppet/cache
+	doins -r opt/*
+	fperms 0750 /opt/puppetlabs/puppet/cache
+	# init
+	newinitd "${FILESDIR}/puppet.initd" puppet
+	systemd_dounit lib/systemd/system/puppet.service
+	systemd_dounit lib/systemd/system/pxp-agent.service
+	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
+	# symlinks
+	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
+	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
+	dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
+	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
+	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
+	dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
+	dosym ../../opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
+	dosym ../../opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
+}
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 0f062494a999..ec7f91c4c521 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -13,10 +13,10 @@ DIST puppet-4.10.11.tar.gz 3022878 BLAKE2B d3eec840bb1c46e0dfbbc9dad598b362049a7
 DIST puppet-4.10.12.tar.gz 3022218 BLAKE2B 03757857868b1544078ae5e40d6e438631c788f1b01a3e62ba90e477b754601d2c085228e084363ff20ee39728b02ebe8ca83e17f7c79dddae1c3968aef4e320 SHA512 ff7accf70b1d4de7282cf3b41246151c49c4758a41ace56a470e4723749638027011cf170747e66fa5812280e1612e754e12d92dd35fa6c93171f7187bb9cfa2
 DIST puppet-5.5.3.tar.gz 3040000 BLAKE2B d2534da5956806e5280c59e82332f1ffca79e72f73b1abb460f155aac936a5ba1719f18dc5742c85fca365ff6b03a602ca0ceaa04714091045ab2afac1b57823 SHA512 14a711002c64f0598930f64e9e2b81c03daddda750860acb349271c1cc9d04c0d149b14817b200dda26f0ca75c3f79593990ecf28a5cca83220a3f5a16eac34d
 DIST puppet-5.5.6.tar.gz 3026301 BLAKE2B eb05a0c4eed99ce1ce7a77be76da069be1e4b4f8917206b3811a3a7378c2e39b9c84b560bbcce0bee180ddb502251efb48362dd1c2494c79e6f441cde41a2707 SHA512 53bccc4cf3d4dde3079d96cd28b4cf380d004fdf67da8eaeaf70706ca5e1fe611910042f1aa03453fb29419bb9888a0eeef9a9d64e8f0cfe5d8d7a73e5bf5850
-DIST puppet-6.0.0.tar.gz 2790790 BLAKE2B 1f31839ca21a525ecfbfec2531e8a7570a7c9da5b0e2a8bf3b8641eba9637c61509fb00b3445d0b6ad6b9ef814b9a27850704c897b62ab660eb864f80d990bc8 SHA512 4443f76ec2c8cc23adf112573e5f4e5cef26973c058a70cdf00471b8bd5ac4bc01fb9aa5ba62cb20585266de917c809a439c88a430f051b127d99ef02547c677
+DIST puppet-6.0.2.tar.gz 2796833 BLAKE2B a3d09dfd7dd0cadb2f752b4836336abd98c8cf6350f4e8b503a7e6b3029e59ff235f3567033b20bc3724708a9504db9ee87ac4c8374f0488862a7205a8a65069 SHA512 f32298d2884927f02f5316dde1d3d9bf33b89f6d011e2eab7f935b730a16d39277b5c17b2986eab91c19aefd5071b5fcbba62550ddd60e3b964f33f4029ac25a
 EBUILD puppet-4.10.11.ebuild 5633 BLAKE2B f75ee3a7cb27288448f341a560e20b3b1246c37a690846bfda63d0ee9ea41600606a986160bb1967ad7c279a4d2204b54af1e45204e43725b4c1438ceb81e7a4 SHA512 90e2636f668b3227ece18ff03a16c28e7791c6ec192a87ca89395a03bc9182abdabb43ac6fc5261da7c4afd68caefaabe81549d39e7fd018cc0b5f307baded2f
 EBUILD puppet-4.10.12.ebuild 5628 BLAKE2B bfca2da4591b9589a1b3e42e8a06d91d75a77ca05a57910544caad33b540fd1c8c0b7fa6be4b11ab67ee693daf7486fee9f63115679a513c09ef1e15b3727152 SHA512 e5fd6431a729d205ba1f6360cb2f46f877de7f27a7bc1cf299f1ec2a487a2d2a374d0c059294b1bf08d31b7187b420297b368d474fc0dcc243787b8cea19a431
 EBUILD puppet-5.5.3.ebuild 3833 BLAKE2B 8a69323f2c1edf94a9dd384a695e3c2d2ba20fff0956cdda51ed853ca9e730c2c051324d0867baea4f71672337e41ec6c42b504edcdaf3f459d120080b3bea5e SHA512 b66520e6d78a3fe5bc8ae5151074133340db60eb402ac4d6f92f4add28b28b3d8280befc0aa74bb4935c9347e35ec240a6afa1bd67db23b1f15a46ad81b2d8ad
 EBUILD puppet-5.5.6.ebuild 3833 BLAKE2B 8a69323f2c1edf94a9dd384a695e3c2d2ba20fff0956cdda51ed853ca9e730c2c051324d0867baea4f71672337e41ec6c42b504edcdaf3f459d120080b3bea5e SHA512 b66520e6d78a3fe5bc8ae5151074133340db60eb402ac4d6f92f4add28b28b3d8280befc0aa74bb4935c9347e35ec240a6afa1bd67db23b1f15a46ad81b2d8ad
-EBUILD puppet-6.0.0.ebuild 3861 BLAKE2B 92a472ea908a5e6e391c3d9cd8f84b9b02b5c20f89d86b9b2c39b878caed8dc2ba61f0d11e0ff42e792c6bb61fa7fe924cbcb98acaf19c51ec01a5c07a4f69ae SHA512 333881b76e8736d3256447e0adba72de23d26fab13dbf77d63d658d4feced638815f7f360344e8cd5bcb3d96e685c7d270c821f7f2e9a17cbd7eaa6b8a350d00
+EBUILD puppet-6.0.2.ebuild 3858 BLAKE2B a6983174881ea5fc499dcce47eea8f2a6e10ec175d7d2f9582265aab3c4eeb18c8eb2b1e3d1676ba6f05734044886f725ede8e7a2d60ae6af91f01ba9931df2f SHA512 fd8e6ba95dd90ee9793170966da0299bc79e382f8a3d626361c012ca61c2d5f4e0ca647fa56ca722ec9db36adfccd9897fc824d0eb7986a8b6ac5625bf0ca680
 MISC metadata.xml 1514 BLAKE2B 54902aeb644661563205d2200b71fdb6c0191839643968ae3249b1438996bc6b2846fbc4f9487dd83c28e9501407153fcc21255ad7ed6356aca3fb9121ab6abb SHA512 3ae8d47ac2a12085ec4adcb43d0428dc0b85fb561bbda39afd01ba7466417a24f9630d37c8461f99ec1aa3eb4f118cab0cb31703f486ab6d3a65798119277c64
diff --git a/app-admin/puppet/puppet-6.0.0.ebuild b/app-admin/puppet/puppet-6.0.0.ebuild
deleted file mode 100644
index 81e7876eed5a..000000000000
--- a/app-admin/puppet/puppet-6.0.0.ebuild
+++ /dev/null
@@ -1,145 +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_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC="doc:all"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locales"
-
-inherit eutils user ruby-fakegem versionator
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="http://puppetlabs.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
-RESTRICT="test"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	dev-ruby/json:=
-	dev-ruby/semantic_puppet
-	>=dev-ruby/facter-3.0.0
-	augeas? ( dev-ruby/ruby-augeas )
-	diff? ( dev-ruby/diff-lcs )
-	doc? ( dev-ruby/rdoc )
-	ldap? ( dev-ruby/ruby-ldap )
-	shadow? ( dev-ruby/ruby-shadow )
-	sqlite? ( dev-ruby/sqlite3 )
-	virtual/ruby-ssl
-	dev-ruby/hocon"
-
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/mocha
-		dev-ruby/rack
-		dev-ruby/rspec-its
-	)"
-# this should go in the above lists, but isn't because of test deps not being keyworded
-#   dev-ruby/rspec-collection_matchers
-
-RDEPEND+=" ${RDEPEND}
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
-	>=app-portage/eix-0.18.0"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-all_ruby_prepare() {
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# can't be run within portage.
-	epatch "${FILESDIR}/puppet-fix-tests-6.0.0.patch"
-
-	# fix systemd path
-	epatch "${FILESDIR}/puppet-systemd.patch"
-
-	# Avoid specs that can only run in the puppet.git repository. This
-	# should be narrowed down to the specific specs.
-	rm spec/integration/parser/compiler_spec.rb || die
-
-	# Avoid failing spec that need further investigation.
-	rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-each_ruby_install() {
-	each_fakegem_install
-#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# systemd stuffs
-	insinto /usr/lib/systemd/system
-	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
-	# tmpfiles stuff
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	# openrc init stuff
-	newinitd "${FILESDIR}"/puppet.init-4.x puppet
-	newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
-	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
-
-	keepdir /etc/puppetlabs/puppet/ssl
-
-	keepdir /var/lib/puppet/facts
-	keepdir /var/lib/puppet/files
-	fowners -R puppet:puppet /var/lib/puppet
-
-	fperms 0750 /var/lib/puppet
-
-	fperms 0750 /etc/puppetlabs
-	fperms 0750 /etc/puppetlabs/puppet
-	fperms 0750 /etc/puppetlabs/puppet/ssl
-	fowners -R :puppet /etc/puppetlabs
-	fowners -R :puppet /var/lib/puppet
-
-	if use ldap ; then
-		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
-	fi
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto "$(dirname ${f})"; dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Portage Puppet module with Gentoo-specific resources:"
-	elog "http://forge.puppetlabs.com/gentoo/portage"
-	elog
-
-	for v in ${REPLACING_VERSIONS}; do
-		if [ "$(get_major_version $v)" = "4" ]; then
-			elog
-			elog "Please see the following url for the release notes for puppet-5"
-			elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
-			elog
-		fi
-	done
-}
diff --git a/app-admin/puppet/puppet-6.0.2.ebuild b/app-admin/puppet/puppet-6.0.2.ebuild
new file mode 100644
index 000000000000..b480f5331192
--- /dev/null
+++ b/app-admin/puppet/puppet-6.0.2.ebuild
@@ -0,0 +1,145 @@
+# 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="doc:all"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit eutils user ruby-fakegem versionator
+
+DESCRIPTION="A system automation and configuration management software."
+HOMEPAGE="http://puppetlabs.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
+RESTRICT="test"
+
+ruby_add_rdepend "
+	dev-ruby/hiera
+	dev-ruby/json:=
+	dev-ruby/semantic_puppet
+	>=dev-ruby/facter-3.0.0
+	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	sqlite? ( dev-ruby/sqlite3 )
+	virtual/ruby-ssl
+	dev-ruby/hocon"
+
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/mocha
+		dev-ruby/rack
+		dev-ruby/rspec-its
+	)"
+# this should go in the above lists, but isn't because of test deps not being keyworded
+#   dev-ruby/rspec-collection_matchers
+
+RDEPEND+=" ${RDEPEND}
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+	>=app-portage/eix-0.18.0"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+all_ruby_prepare() {
+	# Avoid spec that require unpackaged json-schema.
+	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+	# can't be run within portage.
+	epatch "${FILESDIR}/puppet-fix-tests-6.0.0.patch"
+
+	# fix systemd path
+	epatch "${FILESDIR}/puppet-systemd.patch"
+
+	# Avoid specs that can only run in the puppet.git repository. This
+	# should be narrowed down to the specific specs.
+	rm spec/integration/parser/compiler_spec.rb || die
+
+	# Avoid failing spec that need further investigation.
+	rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	# systemd stuffs
+	insinto /usr/lib/systemd/system
+	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+	# tmpfiles stuff
+	insinto /usr/lib/tmpfiles.d
+	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+	# openrc init stuff
+	newinitd "${FILESDIR}"/puppet.init-4.x puppet
+	newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
+	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+
+	keepdir /etc/puppetlabs/puppet/ssl
+
+	keepdir /var/lib/puppet/facts
+	keepdir /var/lib/puppet/files
+	fowners -R puppet:puppet /var/lib/puppet
+
+	fperms 0750 /var/lib/puppet
+
+	fperms 0750 /etc/puppetlabs
+	fperms 0750 /etc/puppetlabs/puppet
+	fperms 0750 /etc/puppetlabs/puppet/ssl
+	fowners -R :puppet /etc/puppetlabs
+	fowners -R :puppet /var/lib/puppet
+
+	if use ldap ; then
+		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+	fi
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"; dodoc "${f}"
+	done
+}
+
+pkg_postinst() {
+	elog
+	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+	elog "cause puppet to hang while installing packages."
+	elog
+	elog "Portage Puppet module with Gentoo-specific resources:"
+	elog "http://forge.puppetlabs.com/gentoo/portage"
+	elog
+
+	for v in ${REPLACING_VERSIONS}; do
+		if [ "$(get_major_version $v)" = "4" ]; then
+			elog
+			elog "Please see the following url for the release notes for puppet-5"
+			elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
+			elog
+		fi
+	done
+}
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index 1819dae36b46..6a85f0a032e9 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,8 +1,8 @@
 AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a60e2be4fa565f5b897f60d8abea21af273b1951477a1662c778081ee9a31063780c179097e764b0845b SHA512 50e78feda08e06a16290f90b7d593653c7fe2e98efdfc8cc7cc4a85a5be528e8bc585b934330f3a87b6f038311942fd8bc6d73f0538069d7b132dd3a64e23f11
 DIST puppetserver-5.3.4.tar.gz 67238476 BLAKE2B a92bdf77ffefc7c65c5cfd39431aa6b485bd92c617c4e32a281bfa431fbb428209b8834ef464a521e00d07f3ce0a443fe8a187f3a235c3200531533a1efa242d SHA512 edfa121d64fdbca9a8eef201fe6744e2694141deb318bec64c942bb1ebe6ea61ba1aaa15aee4f4e59913f79247b1c833c6633d3ff121eee836a83ccbaaece900
 DIST puppetserver-5.3.5.tar.gz 67238513 BLAKE2B 075d6101a29b57a1693a76ba557e4cff3b5689a7bd38cc9f0f116962081ec71a29c31dbd22be9bad49897f94fe0f309d87780d2edcdd6c02e9f403e4b0a631c2 SHA512 4d7546ed845cfc9b37e2db094cb0a7340bb344dbbf52eba9cac7e54b277302449e2c9c464243c0804c8d14c00d146e74725e0e46bde0297104c394ae19f2095c
-DIST puppetserver-6.0.0.tar.gz 62345355 BLAKE2B 086337ef25b89699df07779676727a28f580f992b04ca8fb0d26c38121fef625798ebb064a8a19c87341fbf2c54362158b60b772b94ff6f2f77efe3acac266f9 SHA512 2ab477e381fcb853bb862065465a4a29388e94d01cda49d78d2149dd25636cf98b9f0501733028fe3c5e61c36fc8093bf0423e5df01401e1e8888c2c48f79a2d
+DIST puppetserver-6.0.1.tar.gz 62362369 BLAKE2B 895eefe1f1d508a9a791fc30937bb778fe6d032fc0143caeafa695e73ee139cded8c6c839b90b4f168a641ab7952f4ba10a805e0a85112ca522e78df06838062 SHA512 485b24dbe74fe40c23b98693d02096052af23344a4c8d9bb5d29876cb4224ded482c5b741be1f2b8ff94d7e48041206acd4c301e9c188b3406b04b229fd51094
 EBUILD puppetserver-5.3.4.ebuild 4888 BLAKE2B 24f004c85c5726d79a4d8ad3563b03560d59f4b36380d9ade3954860cc36eb2d3070d4a491d7f6a01e9a5c09ff4d77c5220117b8c9b5119192db3a657dabcdd7 SHA512 281a4673302b36b1073df542be68a8dccd6bf682a9cd68aecfe63d185d9c7eda17ec79d627fb1790ebf0d85a93d92132f6eb5a850aee28995ddaf7c851c81609
 EBUILD puppetserver-5.3.5-r1.ebuild 4894 BLAKE2B 23e8e5a9b5d544c5107e8c56b5fffe727a06883dfcd13cf55f519e70a77798424a217970c4c38c1c703466a2ac16fe0032b9ccb7e377db5c40bdebba238caa53 SHA512 f43549918d1bfe8a9ffd444bd9816e91cde25b4939432949f28e4be5bf7081175bf524cbb66e9c9aa177b9da1844cb58155b1340b301c282a721db036cb83443
-EBUILD puppetserver-6.0.0-r1.ebuild 5327 BLAKE2B 2675238bcba4867791082dce66f80ae30c03576ee1caf3b84914a3a8cd6e9c33ce40faeb660212f7528d77e4b0fdf189b65bf64f69e33b1f849d3fe1eac96de8 SHA512 b9256334671a0ac889406994a4f43cca4d2ba0539144869b90d140b412119ae61b3088b17994b4cc63b7e71d347e46105557241f7c24cdcd0461950eb0bfde8d
+EBUILD puppetserver-6.0.1.ebuild 5324 BLAKE2B 3f8b7d7c250a90cdfae36bb127641a81c20940dfc16a24662151dc53c18f5504e18224a3ef5352c824be1ea44d11fc6ea0378f4614a60aaf39be59227ae83885 SHA512 cb0f6432ae4addf53f932e79c5bd8e216255f2b46d3edb604f05db5706c77859f9cf41a4421a26963d8ce52183bb0d9ef11e6b04a84e59aa705e6260d283303f
 MISC metadata.xml 468 BLAKE2B eb3daaf61cea0ff7524b0034463c7bdbf2fa8c40277deb106f28fd8e1ab90964600e3922c10eb317ce826e2b9b7db5162ad1c2e6e76d4b0c01de486e6b5a89fe SHA512 0bf5e337ba3d5d3e4d84cc397ecf40d0c0ba298aa22c9d54a89381391a69a2374ce736443edacc67403490d2a4950a7c386fb4741b149d0eca700d115b0ac24c
diff --git a/app-admin/puppetserver/puppetserver-6.0.0-r1.ebuild b/app-admin/puppetserver/puppetserver-6.0.0-r1.ebuild
deleted file mode 100644
index b4f7bc872f47..000000000000
--- a/app-admin/puppetserver/puppetserver-6.0.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 multilib systemd tmpfiles user
-
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="puppetdb"
-# will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND+="
-		>=virtual/jdk-1.8.0
-		app-admin/puppet-agent[puppetdb?]"
-DEPEND+=""
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet"
-}
-
-src_prepare() {
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
-	sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
-	sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
-	sed -i 's/var\/run/run/g' install.sh || die
-	default
-}
-
-src_compile() {
-		einfo "not compiling"
-}
-
-src_install() {
-	insinto /opt/puppetlabs/server/apps/puppetserver
-	insopts -m0774
-	doins ext/ezbake-functions.sh
-	insopts -m0644
-	doins ext/ezbake.manifest
-	doins puppet-server-release.jar
-	insinto /etc/puppetlabs/puppetserver
-	doins ext/config/logback.xml
-	doins ext/config/request-logging.xml
-	insinto /etc/puppetlabs/puppetserver/services.d
-	doins ext/system-config/services.d/bootstrap.cfg
-	doins ext/config/services.d/ca.cfg
-	insinto /etc/puppetlabs/puppetserver/conf.d
-	doins ext/config/conf.d/puppetserver.conf
-	doins ext/config/conf.d/auth.conf
-	doins ext/config/conf.d/global.conf
-	doins ext/config/conf.d/web-routes.conf
-	doins ext/config/conf.d/metrics.conf
-	doins ext/config/conf.d/webserver.conf
-	insopts -m0755
-	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
-	doins install.sh
-	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
-	doins ext/cli/ca
-	doins ext/cli/irb
-	doins ext/cli/foreground
-	doins ext/cli/gem
-	doins ext/cli/ruby
-	doins ext/cli/reload
-	doins ext/cli/start
-	doins ext/cli/stop
-	insinto /opt/puppetlabs/server/apps/puppetserver/cli
-	doins ext/cli_defaults/cli-defaults.sh
-	insinto /opt/puppetlabs/server/apps/puppetserver/bin
-	doins ext/bin/puppetserver
-	insopts -m0644
-	dodir /opt/puppetlabs/server/bin
-	dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
-	dodir /opt/puppetlabs/bin
-	dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
-	dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
-	dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
-	# other sys stuff
-	dodir /etc/puppetlabs/code
-	# needed for systemd
-	dodir /var/log/puppetlabs/puppetserver
-	dodir /etc/puppetlabs/puppet/ssl
-	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
-	fperms -R 771 /etc/puppetlabs/puppet/ssl
-	# systemd type things
-	insinto /etc/systemd/system/puppetserver.service.d/
-	systemd_dounit ext/redhat/puppetserver.service
-	insinto /etc/default
-	newins ext/default puppetserver
-	# normal init type tasks
-	dosym ../default/puppetserver /etc/conf.d/puppetserver
-	newinitd "${FILESDIR}/puppetserver.init" puppetserver
-	# misc
-	insinto /etc/logrotate.d
-	newins ext/puppetserver.logrotate.conf puppetserver
-	# cleanup
-	dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
-	fowners -R puppet:puppet /opt/puppetlabs/server/data
-	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
-	fperms -R 700 /var/log/puppetlabs/puppetserver
-	insinto /opt/puppetlabs/server/data
-	doins ext/build-scripts/jruby-gem-list.txt
-	doins ext/build-scripts/mri-gem-list.txt
-	newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf
-}
-
-pkg_postinst() {
-	elog "to install you may want to run the following:"
-	elog
-	elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
-	elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
-	elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
-	elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
-	elog "puppet config set --section master codedir /etc/puppetlabs/code"
-	elog
-	elog "# install puppetserver gems"
-	elog "cd /opt/puppetlabs/server/apps/puppetserver"
-	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
-	elog "while read LINE do"
-	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-ri --no-rdoc \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-	elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
-	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
-	elog "while read LINE do"
-	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-ri --no-rdoc \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-	elog "done < /opt/puppetlabs/server/data/mri-gem-list.txt"
-}
diff --git a/app-admin/puppetserver/puppetserver-6.0.1.ebuild b/app-admin/puppetserver/puppetserver-6.0.1.ebuild
new file mode 100644
index 000000000000..d62a1297c2c2
--- /dev/null
+++ b/app-admin/puppetserver/puppetserver-6.0.1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib systemd tmpfiles user
+
+DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
+HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
+SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="puppetdb"
+# will need the same keywords as puppet
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND+="
+		>=virtual/jdk-1.8.0
+		app-admin/puppet-agent[puppetdb?]"
+DEPEND+=""
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet"
+}
+
+src_prepare() {
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
+	sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
+	sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
+	sed -i 's/var\/run/run/g' install.sh || die
+	default
+}
+
+src_compile() {
+		einfo "not compiling"
+}
+
+src_install() {
+	insinto /opt/puppetlabs/server/apps/puppetserver
+	insopts -m0774
+	doins ext/ezbake-functions.sh
+	insopts -m0644
+	doins ext/ezbake.manifest
+	doins puppet-server-release.jar
+	insinto /etc/puppetlabs/puppetserver
+	doins ext/config/logback.xml
+	doins ext/config/request-logging.xml
+	insinto /etc/puppetlabs/puppetserver/services.d
+	doins ext/system-config/services.d/bootstrap.cfg
+	doins ext/config/services.d/ca.cfg
+	insinto /etc/puppetlabs/puppetserver/conf.d
+	doins ext/config/conf.d/puppetserver.conf
+	doins ext/config/conf.d/auth.conf
+	doins ext/config/conf.d/global.conf
+	doins ext/config/conf.d/web-routes.conf
+	doins ext/config/conf.d/metrics.conf
+	doins ext/config/conf.d/webserver.conf
+	insopts -m0755
+	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
+	doins install.sh
+	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
+	doins ext/cli/ca
+	doins ext/cli/irb
+	doins ext/cli/foreground
+	doins ext/cli/gem
+	doins ext/cli/ruby
+	doins ext/cli/reload
+	doins ext/cli/start
+	doins ext/cli/stop
+	insinto /opt/puppetlabs/server/apps/puppetserver/cli
+	doins ext/cli_defaults/cli-defaults.sh
+	insinto /opt/puppetlabs/server/apps/puppetserver/bin
+	doins ext/bin/puppetserver
+	insopts -m0644
+	dodir /opt/puppetlabs/server/bin
+	dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
+	dodir /opt/puppetlabs/bin
+	dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
+	dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
+	dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
+	# other sys stuff
+	dodir /etc/puppetlabs/code
+	# needed for systemd
+	dodir /var/log/puppetlabs/puppetserver
+	dodir /etc/puppetlabs/puppet/ssl
+	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
+	fperms -R 771 /etc/puppetlabs/puppet/ssl
+	# systemd type things
+	insinto /etc/systemd/system/puppetserver.service.d/
+	systemd_dounit ext/redhat/puppetserver.service
+	insinto /etc/default
+	newins ext/default puppetserver
+	# normal init type tasks
+	dosym ../default/puppetserver /etc/conf.d/puppetserver
+	newinitd "${FILESDIR}/puppetserver.init" puppetserver
+	# misc
+	insinto /etc/logrotate.d
+	newins ext/puppetserver.logrotate.conf puppetserver
+	# cleanup
+	dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
+	fowners -R puppet:puppet /opt/puppetlabs/server/data
+	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
+	fperms -R 700 /var/log/puppetlabs/puppetserver
+	insinto /opt/puppetlabs/server/data
+	doins ext/build-scripts/jruby-gem-list.txt
+	doins ext/build-scripts/mri-gem-list.txt
+	newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf
+}
+
+pkg_postinst() {
+	elog "to install you may want to run the following:"
+	elog
+	elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
+	elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
+	elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
+	elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
+	elog "puppet config set --section master codedir /etc/puppetlabs/code"
+	elog
+	elog "# install puppetserver gems"
+	elog "cd /opt/puppetlabs/server/apps/puppetserver"
+	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
+	elog "while read LINE do"
+	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-ri --no-rdoc \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+	elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
+	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
+	elog "while read LINE do"
+	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-ri --no-rdoc \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+	elog "done < /opt/puppetlabs/server/data/mri-gem-list.txt"
+}
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index d0cf64a45662..2c96a827bb67 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -18,5 +18,5 @@ DIST rsyslog-doc-8.38.0.tar.gz 7662314 BLAKE2B 57a121950a3f6630e4736a1ff998e93b5
 EBUILD rsyslog-8.35.0-r1.ebuild 11938 BLAKE2B 9275bcf376d28607c381b049e2b152c9f7ed14b32834a9b90cd0c45dc5edfa584bc3f18f754140c30471dac1207dd85f01612ab47ee82dcc09dafb69ba3eab53 SHA512 1d9eb2ad4dd408a69a108dc47d805d677a0151f77dc5485bfdf35202340341188e9449f76112c910f29483542e506cc0871c1e5527ba31e6daf3cf021f830258
 EBUILD rsyslog-8.36.0-r1.ebuild 12113 BLAKE2B bc15f57f63da43c5b3a2d3121bcb8e2ce00c14d8173c53d0912b424c2b2ee3ce936fc4fe75885da4a520615a220625a543f7c3a2e6807fcdf2d118a6a3728a38 SHA512 6fe8a096cbbf06f0748d8545577f9752a92466a33a2785332ba057686ce9b489f78263de65b670e21b163dfb52928b1fdbe0e9a46d29622bf9f05012c154b31d
 EBUILD rsyslog-8.37.0.ebuild 12209 BLAKE2B 7b49e66fb2e432d6542ddfa493b7025440cc4c0d6634439fb92ea3ea48c0e91b1d8e81ea096ba757315bc36773b220133e2a512b4432451d405b966755651c90 SHA512 28185c7dfb8a55a21047c294338a64fade8f49ceab3df592070eacb1940307b466b78597f732d21a33fd3b9fddb9653a772c88b0f35ea92c3827867ef0a91e90
-EBUILD rsyslog-8.38.0.ebuild 12299 BLAKE2B 408c2878cfc186ffca506fd7c97d799e424862e3e85695f8a3881ff9216ecab80fc01838788f1c98a2699d46a66adb9d315d0d49e360f1df2fab790ea180adec SHA512 274ee332f1d7389622c47bbd688de8c3fecb1bcbad3610ffe606d256cfaf60955cfee53f972f15bdeb468ade9189de3a955a3b7a5c1c98089f40e1a1e3cce0b9
+EBUILD rsyslog-8.38.0.ebuild 12294 BLAKE2B cd4004934b1d53638f7cec94213146c1c19c56fd237a41a7e72afcd857bfd425c655c6f017e74579b075b81a34e875343f69a500ef5a847b0eec06ae42230f78 SHA512 16d3c2b271444c1ec193dcf5bcbb576f91cd6e698688c448b435add8480b3b60e97686da0c4da2b2179017bdd207dd7f148c8e740f5d5c8aef18ca8a306361b9
 MISC metadata.xml 3944 BLAKE2B 576087c54675c912537690dca0d039a217c8afec6fa4c32a8f52f2350393b30763a4d9f0718a9fa47651afb434186ba3e25d4dd9253cf20f3315d3b06bebb3eb SHA512 536dc844883178b310d7d104d0f3a002be4ae14aef6409bd1fb44fec9b30b40165ac51914de020c5e63bea61a88d8467da279f353ed841c9c50f84db079fc9fa
diff --git a/app-admin/rsyslog/rsyslog-8.38.0.ebuild b/app-admin/rsyslog/rsyslog-8.38.0.ebuild
index c8801a0aef2b..ce2cf91b0841 100644
--- a/app-admin/rsyslog/rsyslog-8.38.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.38.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 @@ if [[ ${PV} == "9999" ]]; then
 
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa x86"
 
 	SRC_URI="
 		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
diff --git a/app-admin/spectre-meltdown-checker/Manifest b/app-admin/spectre-meltdown-checker/Manifest
index 23588a757198..588444df0001 100644
--- a/app-admin/spectre-meltdown-checker/Manifest
+++ b/app-admin/spectre-meltdown-checker/Manifest
@@ -1,4 +1,6 @@
 DIST spectre-meltdown-checker-0.39.tar.gz 43785 BLAKE2B c8688b28eac8951b3cf813cd591adc9cb01756a1da149129d2045274bf3d01c56a9145c4dd9154f6229d53a993dd8803e6c0cca866710ba09973f13421be4e6f SHA512 175bc147356e9730fb13f71c66e8826e85e3ad4e0d7f1fbb075f8310e1763f442b3da85fae70f107dcd77172d498fb24857c9e8343cb6813857039d55e9eab6f
+DIST spectre-meltdown-checker-0.40.tar.gz 52463 BLAKE2B d0cbaf695bea41bf918900d1356b8dd26cd7ab7b66ce8a82b2e82a0554dcfe5435bb20262490dcab312e2be4962a2fabb1defba0295a84ee62b5fa876f20f5b8 SHA512 da2d63d9aa513a529537dc58f9370c811577f70ecd856ee001888108a871351484f47697cdefb1b0711be3fb342ba733e78b75fd154eec98c4c9a8504e6adcf9
 EBUILD spectre-meltdown-checker-0.39.ebuild 609 BLAKE2B 36d1843107f84dd5e36b3f3548f64a6d34675ff83709430b7209ce817c362c7608a538439cec26d20c6507b556e822ea6e57ca9cc1260641092c55ed4b1c8005 SHA512 f1464c0b9ea01606833459688a90621b573c40ec598c39ec1bc4e41e48f8a5264345b82212d9332f09792a6cba1314f8bff2e519f982dbaf0a7b59e3b355dbef
+EBUILD spectre-meltdown-checker-0.40.ebuild 606 BLAKE2B 44fa0afc46a5c59b189c27206acccf770412fd2cd410dac09723716b25c56cb81f5808da98e6c9ebd4fcf765eff87b90d2e3fa11b4352582525f43fcfef879be SHA512 9f29eefe5fbf419d4afc64443d77d788447cfb3f2f1f9d895ffb206d7e4eb953c240bb10a9e11c8f73ae54bee9de8d1b2b29f79f717e16c06673be6c62ba91ce
 EBUILD spectre-meltdown-checker-9999.ebuild 609 BLAKE2B 36d1843107f84dd5e36b3f3548f64a6d34675ff83709430b7209ce817c362c7608a538439cec26d20c6507b556e822ea6e57ca9cc1260641092c55ed4b1c8005 SHA512 f1464c0b9ea01606833459688a90621b573c40ec598c39ec1bc4e41e48f8a5264345b82212d9332f09792a6cba1314f8bff2e519f982dbaf0a7b59e3b355dbef
 MISC metadata.xml 461 BLAKE2B ffd3a0e87b161c95e73d98acfb9ce11068ff5698ad095703e48ff7a95bd9c65379bdfa87ed19f6a1c5e10458cb10042f33e986d58741f8667b49409c1d7083ad SHA512 9e59c70f06c412ef1a742d2edbf62ef5e69e3997e8ba713e61a91dfcdb4a399035e60d9ce6fad43a1568cec658f05d33bc3aaa5fd2efc1cf70eb0f5fd98e1dbc
diff --git a/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.40.ebuild b/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.40.ebuild
new file mode 100644
index 000000000000..da9a981b3115
--- /dev/null
+++ b/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.40.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/speed47/spectre-meltdown-checker.git"
+else
+	SRC_URI="https://github.com/speed47/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Spectre & Meltdown vulnerability/mitigation checker for Linux"
+HOMEPAGE="https://github.com/speed47/spectre-meltdown-checker"
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+src_install() {
+	default
+	newbin spectre-meltdown-checker.sh spectre-meltdown-checker
+}
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 62db2d980041..1de1d11dfb0b 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -5,6 +5,6 @@ DIST sudo-1.8.25p1.tar.gz 3189951 BLAKE2B ebfedaad62e60f625db8c46a5c8f19977a5ec0
 EBUILD sudo-1.8.23-r2.ebuild 6366 BLAKE2B 54ac988d6be3e7e93dc13a45ada40a627e3ffeff4515d181a18ea9b2ad411d4c2a9e107fe718217668033bedec23e57216d4295d0df12c40ff5871c3ae9f9ec0 SHA512 3e7b3f21c550724a6ed048b0639d2630015c401dbe8c51d31310a26394b1a371ab18e438dc13357ff82b05715443f24f6cb42b1daac7ec5cc9d3776d6cbc96d7
 EBUILD sudo-1.8.24.ebuild 6379 BLAKE2B 9300c549acd5a013d3cfcbc0ce2fb0ae4375cf9858928dbc92f2fa7d1cb2979f19a7ec43026dcfab87a51bd87ce0f886030426a431c7acbe3bec3715b6778523 SHA512 f1c124e5658fd55d7bbb84b9d06d0cf123479cf96b1d95fae610d36fa583069d7ceab30b59116da18a71f3dc822aeef75bd099f93ac0f2e0fac92f0bd491ae8a
 EBUILD sudo-1.8.25.ebuild 6379 BLAKE2B 9300c549acd5a013d3cfcbc0ce2fb0ae4375cf9858928dbc92f2fa7d1cb2979f19a7ec43026dcfab87a51bd87ce0f886030426a431c7acbe3bec3715b6778523 SHA512 f1c124e5658fd55d7bbb84b9d06d0cf123479cf96b1d95fae610d36fa583069d7ceab30b59116da18a71f3dc822aeef75bd099f93ac0f2e0fac92f0bd491ae8a
-EBUILD sudo-1.8.25_p1.ebuild 6379 BLAKE2B 9300c549acd5a013d3cfcbc0ce2fb0ae4375cf9858928dbc92f2fa7d1cb2979f19a7ec43026dcfab87a51bd87ce0f886030426a431c7acbe3bec3715b6778523 SHA512 f1c124e5658fd55d7bbb84b9d06d0cf123479cf96b1d95fae610d36fa583069d7ceab30b59116da18a71f3dc822aeef75bd099f93ac0f2e0fac92f0bd491ae8a
+EBUILD sudo-1.8.25_p1-r1.ebuild 6431 BLAKE2B 7fc4cf65f44a71e5d7af3592b594a1453ac35b36d9d78ac34be974331b181ae4819a52fdc5616f501a28c2e14c6b0db999314ed8711fa97984b9eaa73b70aa3a SHA512 f5086673217867bd68ba1af5feacffee0f0c8232502d289fb187f0768ad4044a013b077e647202a1a7e3128e79df1a4d664293663c64afb4ab5a7fd1bb420ddc
 EBUILD sudo-9999.ebuild 6379 BLAKE2B 9300c549acd5a013d3cfcbc0ce2fb0ae4375cf9858928dbc92f2fa7d1cb2979f19a7ec43026dcfab87a51bd87ce0f886030426a431c7acbe3bec3715b6778523 SHA512 f1c124e5658fd55d7bbb84b9d06d0cf123479cf96b1d95fae610d36fa583069d7ceab30b59116da18a71f3dc822aeef75bd099f93ac0f2e0fac92f0bd491ae8a
-MISC metadata.xml 989 BLAKE2B c7f7d49fda7750b172dd4b2e5c3fc5f1f3dd602b6347479834bf6444c9311738bcd10fbbba100cee45c97bb899e53f3c113abc61ee89b3353b50876c30966589 SHA512 bc9addd017e474acbc753d6d2cce5d77281a3c1f0857de538168eb1a7b80e0d0b313ad2b03cc710b483cc9588dcaf0208a5b8aaccea18e2ca51b567020bea9ec
+MISC metadata.xml 1060 BLAKE2B 9d18c75cd15621433e2391bceaff27f7bafcf9fe39691b62ee040e894055193eb1d68acef48b467244978dcac79bc1bfb20af11952f641eab75104b2350b3d7c SHA512 e229a2df28f8bb87efb05a2980860fc37f8e324633444e26d9eb303397e16ca12e9e17ed6939e8e8044f03ab45eda4cb0401e38fdb9409229fc99a64c6da007e
diff --git a/app-admin/sudo/metadata.xml b/app-admin/sudo/metadata.xml
index fd239654c5e5..66a78473b2e3 100644
--- a/app-admin/sudo/metadata.xml
+++ b/app-admin/sudo/metadata.xml
@@ -16,6 +16,7 @@
 		<flag name="offensive">Let sudo print insults when the user types the wrong password</flag>
 		<flag name="openssl">Use SHA2 from <pkg>dev-libs/openssl</pkg> instead of sudo's internal SHA2</flag>
 		<flag name="sendmail">Allow sudo to send emails with sendmail</flag>
+		<flag name="sssd">Add System Security Services Daemon support</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:todd_miller:sudo</remote-id>
diff --git a/app-admin/sudo/sudo-1.8.25_p1-r1.ebuild b/app-admin/sudo/sudo-1.8.25_p1-r1.ebuild
new file mode 100644
index 000000000000..0420116ccdf8
--- /dev/null
+++ b/app-admin/sudo/sudo-1.8.25_p1-r1.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils pam multilib libtool tmpfiles
+if [[ ${PV} == "9999" ]] ; then
+	EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
+	inherit mercurial
+fi
+
+MY_P=${P/_/}
+MY_P=${MY_P/beta/b}
+
+uri_prefix=
+case ${P} in
+	*_beta*|*_rc*) uri_prefix=beta/ ;;
+esac
+
+DESCRIPTION="Allows users or groups to run commands as other users"
+HOMEPAGE="https://www.sudo.ws/"
+if [[ ${PV} != "9999" ]] ; then
+	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
+		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
+	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
+	fi
+fi
+
+# Basic license is ISC-style as-is, some files are released under
+# 3-clause BSD license
+LICENSE="ISC BSD"
+SLOT="0"
+IUSE="gcrypt ldap nls offensive openssl pam sasl selinux +sendmail skey sssd"
+
+CDEPEND="
+	sys-libs/zlib:=
+	gcrypt? ( dev-libs/libgcrypt:= )
+	ldap? (
+		>=net-nds/openldap-2.1.30-r1
+		dev-libs/cyrus-sasl
+	)
+	openssl? ( dev-libs/openssl:0= )
+	pam? ( virtual/pam )
+	sasl? ( dev-libs/cyrus-sasl )
+	skey? ( >=sys-auth/skey-1.1.5-r1 )
+	sssd? ( sys-auth/sssd[sudo] )
+"
+RDEPEND="
+	${CDEPEND}
+	>=app-misc/editor-wrapper-3
+	virtual/editor
+	ldap? ( dev-lang/perl )
+	pam? ( sys-auth/pambase )
+	selinux? ( sec-policy/selinux-sudo )
+	sendmail? ( virtual/mta )
+"
+DEPEND="
+	${CDEPEND}
+	sys-devel/bison
+"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	pam? ( !skey )
+	skey? ( !pam )
+	?? ( gcrypt openssl )
+"
+
+MAKEOPTS+=" SAMPLES="
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+set_secure_path() {
+	# FIXME: secure_path is a compile time setting. using PATH or
+	# ROOTPATH is not perfect, env-update may invalidate this, but until it
+	# is available as a sudoers setting this will have to do.
+	einfo "Setting secure_path ..."
+
+	# first extract the default ROOTPATH from build env
+	SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env;
+		echo "${ROOTPATH}")
+		case "${SECURE_PATH}" in
+			*/usr/sbin*) ;;
+			*) SECURE_PATH=$(unset PATH;
+				. "${EPREFIX}"/etc/profile.env; echo "${PATH}")
+				;;
+		esac
+	if [[ -z ${SECURE_PATH} ]] ; then
+		ewarn "	Failed to detect SECURE_PATH, please report this"
+	fi
+
+	# then remove duplicate path entries
+	cleanpath() {
+		local newpath thisp IFS=:
+		for thisp in $1 ; do
+			if [[ :${newpath}: != *:${thisp}:* ]] ; then
+				newpath+=:$thisp
+			else
+				einfo "   Duplicate entry ${thisp} removed..."
+			fi
+		done
+		SECURE_PATH=${newpath#:}
+	}
+	cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
+
+	# finally, strip gcc paths #136027
+	rmpath() {
+		local e newpath thisp IFS=:
+		for thisp in ${SECURE_PATH} ; do
+			for e ; do [[ $thisp == $e ]] && continue 2 ; done
+			newpath+=:$thisp
+		done
+		SECURE_PATH=${newpath#:}
+	}
+	rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
+
+	einfo "... done"
+}
+
+src_configure() {
+	local SECURE_PATH
+	set_secure_path
+
+	# audit: somebody got to explain me how I can test this before I
+	# enable it.. - Diego
+	# plugindir: autoconf code is crappy and does not delay evaluation
+	# until `make` time, so we have to use a full path here rather than
+	# basing off other values.
+	myeconfargs=(
+		--enable-zlib=system
+		--enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
+		--with-editor="${EPREFIX}"/usr/libexec/editor
+		--with-env-editor
+		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
+		--with-rundir="${EPREFIX}"/run/sudo
+		--with-secure-path="${SECURE_PATH}"
+		--with-vardir="${EPREFIX}"/var/db/sudo
+		--without-linux-audit
+		--without-opie
+		$(use_enable gcrypt)
+		$(use_enable nls)
+		$(use_enable openssl)
+		$(use_enable sasl)
+		$(use_with offensive insults)
+		$(use_with offensive all-insults)
+		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
+		$(use_with ldap)
+		$(use_with pam)
+		$(use_with skey)
+		$(use_with sssd)
+		$(use_with selinux)
+		$(use_with sendmail)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use ldap ; then
+		dodoc README.LDAP
+
+		cat <<-EOF > "${T}"/ldap.conf.sudo
+		# See ldap.conf(5) and README.LDAP for details
+		# This file should only be readable by root
+
+		# supported directives: host, port, ssl, ldap_version
+		# uri, binddn, bindpw, sudoers_base, sudoers_debug
+		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
+		EOF
+
+		insinto /etc
+		doins "${T}"/ldap.conf.sudo
+		fperms 0440 /etc/ldap.conf.sudo
+
+		insinto /etc/openldap/schema
+		newins doc/schema.OpenLDAP sudo.schema
+	fi
+
+	pamd_mimic system-auth sudo auth account session
+
+	keepdir /var/db/sudo/lectured
+	fperms 0700 /var/db/sudo/lectured
+	fperms 0711 /var/db/sudo #652958
+
+	# Don't install into /run as that is a tmpfs most of the time
+	# (bug #504854)
+	rm -rf "${ED%/}"/run
+}
+
+pkg_postinst() {
+	tmpfiles_process sudo.conf
+
+	#652958
+	local sudo_db="${EROOT}/var/db/sudo"
+	if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
+		chmod 711 "${sudo_db}" || die
+	fi
+
+	if use ldap ; then
+		ewarn
+		ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
+		ewarn
+		if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
+			ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
+			ewarn "configured in /etc/nsswitch.conf."
+			ewarn
+			ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
+			ewarn "  sudoers: ldap files"
+			ewarn
+		fi
+	fi
+	if use prefix ; then
+		ewarn
+		ewarn "To use sudo, you need to change file ownership and permissions"
+		ewarn "with root privileges, as follows:"
+		ewarn
+		ewarn "  # chown root:root ${EPREFIX}/usr/bin/sudo"
+		ewarn "  # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
+		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers"
+		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers.d"
+		ewarn "  # chown root:root ${EPREFIX}/var/db/sudo"
+		ewarn "  # chmod 4111 ${EPREFIX}/usr/bin/sudo"
+		ewarn
+	fi
+
+	elog "To use the -A (askpass) option, you need to install a compatible"
+	elog "password program from the following list. Starred packages will"
+	elog "automatically register for the use with sudo (but will not force"
+	elog "the -A option):"
+	elog ""
+	elog " [*] net-misc/ssh-askpass-fullscreen"
+	elog "     net-misc/x11-ssh-askpass"
+	elog ""
+	elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
+	elog "variable to the program you want to use."
+}
diff --git a/app-admin/sudo/sudo-1.8.25_p1.ebuild b/app-admin/sudo/sudo-1.8.25_p1.ebuild
deleted file mode 100644
index f4ab4527b4fc..000000000000
--- a/app-admin/sudo/sudo-1.8.25_p1.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils pam multilib libtool tmpfiles
-if [[ ${PV} == "9999" ]] ; then
-	EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
-	inherit mercurial
-fi
-
-MY_P=${P/_/}
-MY_P=${MY_P/beta/b}
-
-uri_prefix=
-case ${P} in
-	*_beta*|*_rc*) uri_prefix=beta/ ;;
-esac
-
-DESCRIPTION="Allows users or groups to run commands as other users"
-HOMEPAGE="https://www.sudo.ws/"
-if [[ ${PV} != "9999" ]] ; then
-	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
-		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
-	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
-	fi
-fi
-
-# Basic license is ISC-style as-is, some files are released under
-# 3-clause BSD license
-LICENSE="ISC BSD"
-SLOT="0"
-IUSE="gcrypt ldap nls offensive openssl pam sasl selinux +sendmail skey"
-
-CDEPEND="
-	sys-libs/zlib:=
-	gcrypt? ( dev-libs/libgcrypt:= )
-	ldap? (
-		>=net-nds/openldap-2.1.30-r1
-		dev-libs/cyrus-sasl
-	)
-	openssl? ( dev-libs/openssl:0= )
-	pam? ( virtual/pam )
-	sasl? ( dev-libs/cyrus-sasl )
-	skey? ( >=sys-auth/skey-1.1.5-r1 )
-"
-RDEPEND="
-	${CDEPEND}
-	>=app-misc/editor-wrapper-3
-	virtual/editor
-	ldap? ( dev-lang/perl )
-	pam? ( sys-auth/pambase )
-	selinux? ( sec-policy/selinux-sudo )
-	sendmail? ( virtual/mta )
-"
-DEPEND="
-	${CDEPEND}
-	sys-devel/bison
-"
-
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	pam? ( !skey )
-	skey? ( !pam )
-	?? ( gcrypt openssl )
-"
-
-MAKEOPTS+=" SAMPLES="
-
-src_prepare() {
-	default
-	elibtoolize
-}
-
-set_secure_path() {
-	# FIXME: secure_path is a compile time setting. using PATH or
-	# ROOTPATH is not perfect, env-update may invalidate this, but until it
-	# is available as a sudoers setting this will have to do.
-	einfo "Setting secure_path ..."
-
-	# first extract the default ROOTPATH from build env
-	SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env;
-		echo "${ROOTPATH}")
-		case "${SECURE_PATH}" in
-			*/usr/sbin*) ;;
-			*) SECURE_PATH=$(unset PATH;
-				. "${EPREFIX}"/etc/profile.env; echo "${PATH}")
-				;;
-		esac
-	if [[ -z ${SECURE_PATH} ]] ; then
-		ewarn "	Failed to detect SECURE_PATH, please report this"
-	fi
-
-	# then remove duplicate path entries
-	cleanpath() {
-		local newpath thisp IFS=:
-		for thisp in $1 ; do
-			if [[ :${newpath}: != *:${thisp}:* ]] ; then
-				newpath+=:$thisp
-			else
-				einfo "   Duplicate entry ${thisp} removed..."
-			fi
-		done
-		SECURE_PATH=${newpath#:}
-	}
-	cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
-
-	# finally, strip gcc paths #136027
-	rmpath() {
-		local e newpath thisp IFS=:
-		for thisp in ${SECURE_PATH} ; do
-			for e ; do [[ $thisp == $e ]] && continue 2 ; done
-			newpath+=:$thisp
-		done
-		SECURE_PATH=${newpath#:}
-	}
-	rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
-
-	einfo "... done"
-}
-
-src_configure() {
-	local SECURE_PATH
-	set_secure_path
-
-	# audit: somebody got to explain me how I can test this before I
-	# enable it.. - Diego
-	# plugindir: autoconf code is crappy and does not delay evaluation
-	# until `make` time, so we have to use a full path here rather than
-	# basing off other values.
-	myeconfargs=(
-		--enable-zlib=system
-		--enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
-		--with-editor="${EPREFIX}"/usr/libexec/editor
-		--with-env-editor
-		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
-		--with-rundir="${EPREFIX}"/run/sudo
-		--with-secure-path="${SECURE_PATH}"
-		--with-vardir="${EPREFIX}"/var/db/sudo
-		--without-linux-audit
-		--without-opie
-		$(use_enable gcrypt)
-		$(use_enable nls)
-		$(use_enable openssl)
-		$(use_enable sasl)
-		$(use_with offensive insults)
-		$(use_with offensive all-insults)
-		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
-		$(use_with ldap)
-		$(use_with pam)
-		$(use_with skey)
-		$(use_with selinux)
-		$(use_with sendmail)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use ldap ; then
-		dodoc README.LDAP
-
-		cat <<-EOF > "${T}"/ldap.conf.sudo
-		# See ldap.conf(5) and README.LDAP for details
-		# This file should only be readable by root
-
-		# supported directives: host, port, ssl, ldap_version
-		# uri, binddn, bindpw, sudoers_base, sudoers_debug
-		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
-		EOF
-
-		insinto /etc
-		doins "${T}"/ldap.conf.sudo
-		fperms 0440 /etc/ldap.conf.sudo
-
-		insinto /etc/openldap/schema
-		newins doc/schema.OpenLDAP sudo.schema
-	fi
-
-	pamd_mimic system-auth sudo auth account session
-
-	keepdir /var/db/sudo/lectured
-	fperms 0700 /var/db/sudo/lectured
-	fperms 0711 /var/db/sudo #652958
-
-	# Don't install into /run as that is a tmpfs most of the time
-	# (bug #504854)
-	rm -rf "${ED%/}"/run
-}
-
-pkg_postinst() {
-	tmpfiles_process sudo.conf
-
-	#652958
-	local sudo_db="${EROOT}/var/db/sudo"
-	if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
-		chmod 711 "${sudo_db}" || die
-	fi
-
-	if use ldap ; then
-		ewarn
-		ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
-		ewarn
-		if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
-			ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
-			ewarn "configured in /etc/nsswitch.conf."
-			ewarn
-			ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
-			ewarn "  sudoers: ldap files"
-			ewarn
-		fi
-	fi
-	if use prefix ; then
-		ewarn
-		ewarn "To use sudo, you need to change file ownership and permissions"
-		ewarn "with root privileges, as follows:"
-		ewarn
-		ewarn "  # chown root:root ${EPREFIX}/usr/bin/sudo"
-		ewarn "  # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
-		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers"
-		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers.d"
-		ewarn "  # chown root:root ${EPREFIX}/var/db/sudo"
-		ewarn "  # chmod 4111 ${EPREFIX}/usr/bin/sudo"
-		ewarn
-	fi
-
-	elog "To use the -A (askpass) option, you need to install a compatible"
-	elog "password program from the following list. Starred packages will"
-	elog "automatically register for the use with sudo (but will not force"
-	elog "the -A option):"
-	elog ""
-	elog " [*] net-misc/ssh-askpass-fullscreen"
-	elog "     net-misc/x11-ssh-askpass"
-	elog ""
-	elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
-	elog "variable to the program you want to use."
-}
diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index a5d1fa33294e..b5c137a9877f 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1,3 +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
-MISC metadata.xml 447 BLAKE2B da97d4af9961ab42d914dd33abbf433e5974ed49efb2ac2c4ff6cfdd50735bddc48b9b9e15d86a3701d740c73ef9df31439599fdd1cb6a37a306ddcf1cdafc73 SHA512 f6e65d544043790ff6b654dce7e4995214fde5f5c5f35926e396721cc223c97f06a918d7d345e9f4f51c82437af41887a0cb442eb0c7172f839df3249eb58095
+EBUILD testdisk-7.1_pre20180922.ebuild 2515 BLAKE2B 81cc356d19a748ce835e05fe66a425feaf6b5df216ca74df8e1df9bf3bbbfb9ae3f8bba584dd19869dbaa5120a872ae9f18e4210f657d2875d8dd1fac3a9d1fe SHA512 eb575cac363ad016c9049585d1a78a426297b264c976281a6748d232047283d9716beb73b5c8db447b0ae08b410b0ff5fc7bc2069900e4917a8c02a827ea07fa
+MISC metadata.xml 555 BLAKE2B 4b56bad0ebd1af77d90c4fa650adba5ae59d06940dff5aa346cb0e9dc9ebfad5324f774cb1afa646e15731b41cb09d7020ee3b6a5a0d941452099b6b7884da75 SHA512 3c47ad35d151d92e4be40cd91c7f0ced271f7b61a00280f536cc70a700d25ae36426593fcb8aec76e9cf1c24ae76dc8290b00bbcb73fa4d95182210fa680562e
diff --git a/app-admin/testdisk/metadata.xml b/app-admin/testdisk/metadata.xml
index 0421c7e47677..4c1e67e367e5 100644
--- a/app-admin/testdisk/metadata.xml
+++ b/app-admin/testdisk/metadata.xml
@@ -5,6 +5,10 @@
 		<email>robbat2@gentoo.org</email>
 		<name>Robin H. Johnson</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
 	<use>
 		<flag name="ntfs">Include the ability to read NTFS filesystems</flag>
 		<flag name="reiserfs">Include reiserfs reading ability</flag>
diff --git a/app-admin/testdisk/testdisk-7.1_pre20180922.ebuild b/app-admin/testdisk/testdisk-7.1_pre20180922.ebuild
new file mode 100644
index 000000000000..f5f2f95d5e0a
--- /dev/null
+++ b/app-admin/testdisk/testdisk-7.1_pre20180922.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_COMMIT=6837474129968d7de13d91e5454bd824c9136e73
+inherit autotools flag-o-matic gnome2-utils
+
+DESCRIPTION="Checks and undeletes partitions + PhotoRec, signature based recovery tool"
+HOMEPAGE="https://www.cgsecurity.org/wiki/TestDisk"
+SRC_URI="https://git.cgsecurity.org/cgit/${PN}/snapshot/${PN}-${EGIT_COMMIT}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
+IUSE="ewf jpeg ntfs qt5 reiserfs static zlib"
+
+REQUIRED_USE="static? ( !qt5 )"
+
+# WARNING: reiserfs support does NOT work with reiserfsprogs
+# you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released).
+COMMON_DEPEND="
+	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:= ) )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+RDEPEND="!static? ( ${COMMON_DEPEND} )"
+
+DOCS=( )
+
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-sudo
+		--without-ntfs
+		$(use_with ewf)
+		$(use_with jpeg)
+		$(use_with ntfs ntfs3g)
+		$(use_enable qt5 qt)
+		$(use_with reiserfs)
+		$(use_with zlib)
+	)
+
+	# this static method is the same used by upstream for their 'static' make
+	# target, but better, as it doesn't break.
+	use static && append-ldflags -static
+
+	econf "${myeconfargs[@]}"
+
+	# perform safety checks for NTFS, REISERFS and JPEG
+	if use ntfs && ! egrep -q '^#define HAVE_LIBNTFS(3G)? 1$' "${S}"/config.h ; then
+		die "Failed to find either NTFS or NTFS-3G library."
+	fi
+	if use reiserfs && egrep -q 'undef HAVE_LIBREISERFS\>' "${S}"/config.h ; then
+		die "Failed to find reiserfs library."
+	fi
+	if use jpeg && egrep -q 'undef HAVE_LIBJPEG\>' "${S}"/config.h ; then
+		die "Failed to find jpeg library."
+	fi
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-admin/ulogd/Manifest b/app-admin/ulogd/Manifest
index 62be52938cf8..65f85feef36b 100644
--- a/app-admin/ulogd/Manifest
+++ b/app-admin/ulogd/Manifest
@@ -2,5 +2,5 @@ AUX ulogd.init 949 BLAKE2B bebbf58aab0957017980d46762743f366d9f2daeca35bbed53c1a
 AUX ulogd.logrotate 193 BLAKE2B 65e6d518260ad322539f05ea5a3177092db8cfa67bd8cd035cd714f8c3e6f90860ce47e27dccdf66feed68258f9bbbe2ef16fa103000f0166927a8cf9fc6969c SHA512 be62a8c63d567d90ab07d9a9e86fb85d868683c385de598b81fa369fd13581a144a0be1aedd2b899d653d94475679eee1fd4939ae72a35777d75208584b2f17a
 AUX ulogd.service 390 BLAKE2B e1395888ffe09cafd98a4384ab7b06e18c0e1b92fa80fb07a05415a3927bcd68a5d3d900ada141c684359bd37910801d40e069cba8cefc8a7c323584b9d8b993 SHA512 73923e6a851bf4f34f532c8b3fa17eb227f2fb2b4c485b89a488789f2d4af3605bd09538095a6acbee6d74300e98755bb03bacabe450104319938cfff62e4c89
 DIST ulogd-2.0.7.tar.bz2 394573 BLAKE2B bec028a3b35038a8cc0f3f8b81b3e19addb66fce09e4ea0f3b2cd29b20cdb28025a576badd0765d9bb15f9d097799b6f55ff45058f8a838daa836c3fe878eef0 SHA512 1ad12bcf91bebe8bf8580de38693318cdabd17146f1f65acf714334885cf13adf5f783abdf2dd67474ef12f82d2cfb84dd4859439bc7af10a0df58e4c7e48b09
-EBUILD ulogd-2.0.7.ebuild 3186 BLAKE2B a70b5de31f86a873bfbd6163b8a9bdcec777bfcf5d12b86cf2d39b623147da2b1a4063518384f17e41697942040015eb1a5ab628a0f4a2b5454e9399d4add0ad SHA512 af9184754de193294703db3f5cd91b698df3c21547dc0e63bd8eb4990bed9642f4a06744a2dbcf19302cad40fdb8286faa22ef8cf2f0159d063e99b98a434164
+EBUILD ulogd-2.0.7-r1.ebuild 3198 BLAKE2B 8c6bafa8d1d514ef8fa8b73d456c2e254a32a138172fa43471083544234c55cbb0167be9cd74604cf49f3bb27f325589e727d83be92a84c4f35ecb4fa3fc356b SHA512 0510dbd4d7c53368d2c95d5d7270cdf87ad698fdfc9263a842041d1a13b9ec91a1b1d81716a203aac6ea394a87fe9f6d542da06a183e6592821e16cbca50a58e
 MISC metadata.xml 1106 BLAKE2B b3573379c3ff51e2547356bca45add6e891b5ab04784c8c926c52633551209c91ccf51103c289d4e45e16e7fb1f9775055131c400fdfa3627c158282ba0991ef SHA512 d97a125e3fcc6ed123c2da7520bd9f2fa615394d583ac5d984225286676ad3b01d0b5ccf01567d68cacffed6e12e5182bdbd618355e8bec2a05ade66369f9f1d
diff --git a/app-admin/ulogd/ulogd-2.0.7-r1.ebuild b/app-admin/ulogd/ulogd-2.0.7-r1.ebuild
new file mode 100644
index 000000000000..073eac95b564
--- /dev/null
+++ b/app-admin/ulogd/ulogd-2.0.7-r1.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic linux-info readme.gentoo-r1 systemd user
+
+DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging"
+HOMEPAGE="https://netfilter.org/projects/ulogd/index.html"
+SRC_URI="https://www.netfilter.org/projects/ulogd/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ppc x86"
+IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres selinux sqlite ulog"
+
+COMMON_DEPEND="
+	|| ( net-firewall/iptables net-firewall/nftables )
+	>=net-libs/libnfnetlink-1.0.1
+	dbi? ( dev-db/libdbi )
+	json? ( dev-libs/jansson )
+	nfacct? (
+		>=net-libs/libmnl-1.0.3
+		>=net-libs/libnetfilter_acct-1.0.1
+	)
+	nfct? ( >=net-libs/libnetfilter_conntrack-1.0.2 )
+	nflog? ( >=net-libs/libnetfilter_log-1.0.0 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	pcap? ( net-libs/libpcap )
+	postgres? ( dev-db/postgresql:= )
+	sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${COMMON_DEPEND}
+	doc? (
+		app-text/linuxdoc-tools
+		app-text/texlive-core
+		dev-texlive/texlive-fontsrecommended
+		virtual/latex-base
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-ulogd )
+"
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="
+You must have at least one logging stack enabled to make ulogd work.
+Please edit the example configuration located at '${EPREFIX}/etc/ulogd.conf'.
+"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	if use nfacct && kernel_is lt 3 3 0; then
+		ewarn "NFACCT input plugin requires a kernel >= 3.3."
+	fi
+
+	if use ulog && kernel_is ge 3 17 0; then
+		ewarn "ULOG target has been removed in the 3.17 kernel release."
+		ewarn "Consider enabling NFACCT, NFCT, or NFLOG support instead."
+	fi
+
+	enewgroup ulogd
+	enewuser ulogd -1 -1 /var/log/ulogd ulogd
+}
+
+src_prepare() {
+	default_src_prepare
+
+	# Change default settings to:
+	# - keep log files in /var/log/ulogd instead of /var/log;
+	# - create sockets in /run instead of /tmp.
+	sed -i \
+		-e "s|var/log|var/log/${PN}|g" \
+		-e 's|tmp|run|g' \
+		ulogd.conf.in || die
+}
+
+src_configure() {
+	append-lfs-flags
+	local myeconfargs=(
+		$(use_with dbi)
+		$(use_with json jansson)
+		$(use_enable nfacct)
+		$(use_enable nfct)
+		$(use_enable nflog)
+		$(use_with mysql)
+		$(use_with pcap)
+		$(use_with postgres pgsql)
+		$(use_with sqlite)
+		$(use_enable ulog)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default_src_compile
+
+	if use doc; then
+		# Prevent access violations from bitmap font files generation.
+		export VARTEXFONTS="${T}/fonts"
+		emake -C doc
+	fi
+}
+
+src_install() {
+	use doc && HTML_DOCS=( doc/${PN}.html )
+
+	default_src_install
+	find "${D}" -name '*.la' -delete || die
+
+	readme.gentoo_create_doc
+	doman ${PN}.8
+
+	use doc && dodoc doc/${PN}.{dvi,ps,txt}
+	use mysql && dodoc doc/mysql-*.sql
+	use postgres && dodoc doc/pgsql-*.sql
+	use sqlite && dodoc doc/sqlite3.table
+
+	insinto /etc
+	doins ${PN}.conf
+	fowners root:ulogd /etc/${PN}.conf
+	fperms 640 /etc/${PN}.conf
+
+	newinitd "${FILESDIR}/${PN}.init" ${PN}
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	diropts -o ulogd -g ulogd
+	keepdir /var/log/ulogd
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-admin/ulogd/ulogd-2.0.7.ebuild b/app-admin/ulogd/ulogd-2.0.7.ebuild
deleted file mode 100644
index a95d6739b241..000000000000
--- a/app-admin/ulogd/ulogd-2.0.7.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic linux-info ltprune readme.gentoo-r1 systemd user
-
-DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging"
-HOMEPAGE="https://netfilter.org/projects/ulogd/index.html"
-SRC_URI="https://www.netfilter.org/projects/ulogd/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc x86"
-IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres selinux sqlite ulog"
-
-COMMON_DEPEND="
-	|| ( net-firewall/iptables net-firewall/nftables )
-	>=net-libs/libnfnetlink-1.0.1
-	dbi? ( dev-db/libdbi )
-	json? ( dev-libs/jansson )
-	nfacct? (
-		>=net-libs/libmnl-1.0.3
-		>=net-libs/libnetfilter_acct-1.0.1
-	)
-	nfct? ( >=net-libs/libnetfilter_conntrack-1.0.2 )
-	nflog? ( >=net-libs/libnetfilter_log-1.0.0 )
-	mysql? ( virtual/mysql )
-	pcap? ( net-libs/libpcap )
-	postgres? ( dev-db/postgresql:= )
-	sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${COMMON_DEPEND}
-	doc? (
-		app-text/linuxdoc-tools
-		app-text/texlive-core
-		dev-texlive/texlive-fontsrecommended
-		virtual/latex-base
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-ulogd )
-"
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="
-You must have at least one logging stack enabled to make ulogd work.
-Please edit the example configuration located at '${EPREFIX}/etc/ulogd.conf'.
-"
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if use nfacct && kernel_is lt 3 3 0; then
-		ewarn "NFACCT input plugin requires a kernel >= 3.3."
-	fi
-
-	if use ulog && kernel_is ge 3 17 0; then
-		ewarn "ULOG target has been removed in the 3.17 kernel release."
-		ewarn "Consider enabling NFACCT, NFCT, or NFLOG support instead."
-	fi
-
-	enewgroup ulogd
-	enewuser ulogd -1 -1 /var/log/ulogd ulogd
-}
-
-src_prepare() {
-	default_src_prepare
-
-	# Change default settings to:
-	# - keep log files in /var/log/ulogd instead of /var/log;
-	# - create sockets in /run instead of /tmp.
-	sed -i \
-		-e "s|var/log|var/log/${PN}|g" \
-		-e 's|tmp|run|g' \
-		ulogd.conf.in || die
-}
-
-src_configure() {
-	append-lfs-flags
-	local myeconfargs=(
-		$(use_with dbi)
-		$(use_with json jansson)
-		$(use_enable nfacct)
-		$(use_enable nfct)
-		$(use_enable nflog)
-		$(use_with mysql)
-		$(use_with pcap)
-		$(use_with postgres pgsql)
-		$(use_with sqlite)
-		$(use_enable ulog)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default_src_compile
-
-	if use doc; then
-		# Prevent access violations from bitmap font files generation.
-		export VARTEXFONTS="${T}/fonts"
-		emake -C doc
-	fi
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doc/${PN}.html )
-
-	default_src_install
-	prune_libtool_files --modules
-	readme.gentoo_create_doc
-
-	doman ${PN}.8
-
-	use doc && dodoc doc/${PN}.{dvi,ps,txt}
-	use mysql && dodoc doc/mysql-*.sql
-	use postgres && dodoc doc/pgsql-*.sql
-	use sqlite && dodoc doc/sqlite3.table
-
-	insinto /etc
-	doins ${PN}.conf
-	fowners root:ulogd /etc/${PN}.conf
-	fperms 640 /etc/${PN}.conf
-
-	newinitd "${FILESDIR}/${PN}.init" ${PN}
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	diropts -o ulogd -g ulogd
-	keepdir /var/log/ulogd
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index 1d9bd1f30220..79f5313cb1db 100644
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 7651bb6ad63a..5e11a0f31d96 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -14,8 +14,10 @@ AUX freshclamd.service 191 BLAKE2B 5b517bf15d008454052bd0f7d5a10fb89284a5b64d1cd
 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 5301 BLAKE2B 3af979e58bb49428e6500331e7e9c773dd6d6fb3b6b8f8f5e2110979de0c36d3d7e0a0ad59ae0aeb92453daac138b1e402c7e38aa2899d7558f2696528ba6271 SHA512 d1910e5abb7c19b497f2f74e9febf92808292522e9dc904b36b37c04668cca708a6b748566794560e64b05e9e2c9a7201b72c5949e0ceccd30b0eab0ea4fd8ba
-EBUILD clamav-0.100.1.ebuild 5307 BLAKE2B 25f8c7a0cc2a54322c2292ea31e91259eb0a0840ce98bb7312fe827ab1a402036feb0245a4d431a9884d0be67a1e158bf0c45b54ee9704a7231fff644d3718ed SHA512 f92e56e7620b6eb5a43ab8a326e013ce7c8a7c84fcb19561e44570017547b734d0d9f4faa7271a70ffd6035f8cc6fe3b9ae38d37442e108b6f7ee2da2bcc91ef
-EBUILD clamav-0.99.4-r1.ebuild 5167 BLAKE2B 952f9313405c6e8b57734244ce7bb3221149b5a84215b70b80e180ef195e227c287f32699046c9954ff35185ab38c9461be7457c273a64a9ed98db88408159a5 SHA512 7fb514f40822222ef259c97d41f8371d851399527c62eec9ae1b0095d5754218d6dd8d921ca5037588112f713a107d40a0b4636c98b159acee9a4fd902e54f83
-MISC metadata.xml 822 BLAKE2B fc73a9b45c1a80d590d4ce93f4c704ce2df3ec270cb292ad5552b2452e737cff45ceb2cf14d7c061f9a2ad2104081cacf36d4c19ccbddadd40579236da5b5939 SHA512 3cf072b3463e721584f5b608ced29f528f56119f17fa6879de3f0950ca4678ffdd32527a317d8740f4c288af440940fe35d876b3b9b1224cf804ce3808ef3add
+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.2.ebuild 5436 BLAKE2B 8c4f6b179e8799c7b867419a98d6ea2616a815de07e5d1b1ba101cba6a83a754f096a7392c7adc785364021832f92535f01a6eaae3833ac555c787eae7536fa9 SHA512 c5ce697ac52e7bf62ab91a9d63169b5976d0dcb2849490bd09b4190a59fa0bc0a7440dcb859c86a3aabfc938f7da1d24864d0de6a3b8426d9b7f89cd51832b93
+EBUILD clamav-0.99.4-r1.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 966c9acf049a..0ee874e6b6ca 100644
--- a/app-antivirus/clamav/clamav-0.100.0.ebuild
+++ b/app-antivirus/clamav/clamav-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
@@ -19,7 +19,6 @@ CDEPEND="bzip2? ( app-arch/bzip2 )
 	iconv? ( virtual/libiconv )
 	metadata-analysis-api? ( dev-libs/json-c:= )
 	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
-	dev-libs/libtommath
 	>=sys-libs/zlib-1.2.2:=
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
@@ -74,7 +73,6 @@ src_configure() {
 		--disable-zlib-vcheck \
 		--enable-id-check \
 		--with-dbdir="${EPREFIX}"/var/lib/clamav \
-		--with-system-tommath \
 		--with-zlib="${EPREFIX}"/usr \
 		--disable-llvm
 }
diff --git a/app-antivirus/clamav/clamav-0.100.1.ebuild b/app-antivirus/clamav/clamav-0.100.1.ebuild
index 257420059332..2f4bd0aa4fdf 100644
--- a/app-antivirus/clamav/clamav-0.100.1.ebuild
+++ b/app-antivirus/clamav/clamav-0.100.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,6 @@ CDEPEND="bzip2? ( app-arch/bzip2 )
 	iconv? ( virtual/libiconv )
 	metadata-analysis-api? ( dev-libs/json-c:= )
 	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
-	dev-libs/libtommath
 	>=sys-libs/zlib-1.2.2:=
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
@@ -74,7 +73,6 @@ src_configure() {
 		--disable-zlib-vcheck \
 		--enable-id-check \
 		--with-dbdir="${EPREFIX}"/var/lib/clamav \
-		--with-system-tommath \
 		--with-zlib="${EPREFIX}"/usr \
 		--disable-llvm
 }
diff --git a/app-antivirus/clamav/clamav-0.100.2.ebuild b/app-antivirus/clamav/clamav-0.100.2.ebuild
new file mode 100644
index 000000000000..aa24c3f02f14
--- /dev/null
+++ b/app-antivirus/clamav/clamav-0.100.2.ebuild
@@ -0,0 +1,173 @@
+# 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 test uclibc xml"
+
+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 )
+	dev-libs/libmspack
+	xml? ( dev-libs/libxml2 )
+	!!<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
+
+	# according to configure help it should be
+	# $(use_enable xml)
+	# but that does not work
+	# do not add this, since --disable-xml seems to override
+	# --without-xml 
+
+	econf \
+		$(use_enable bzip2) \
+		$(use_enable clamdtop) \
+		$(use_enable ipv6) \
+		$(use_enable milter) \
+		$(use_enable static-libs static) \
+		$(use_enable test check) \
+		$(use_with xml) \
+		$(use_with iconv) \
+		$(use_with metadata-analysis-api libjson /usr) \
+		--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.99.4-r1.ebuild b/app-antivirus/clamav/clamav-0.99.4-r1.ebuild
index 79549d3b99a3..9e65d1d592f0 100644
--- a/app-antivirus/clamav/clamav-0.99.4-r1.ebuild
+++ b/app-antivirus/clamav/clamav-0.99.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=6
@@ -19,7 +19,6 @@ CDEPEND="bzip2? ( app-arch/bzip2 )
 	iconv? ( virtual/libiconv )
 	metadata-analysis-api? ( dev-libs/json-c:= )
 	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
-	dev-libs/libtommath
 	>=sys-libs/zlib-1.2.2:=
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
@@ -71,7 +70,6 @@ src_configure() {
 		--disable-zlib-vcheck \
 		--enable-id-check \
 		--with-dbdir="${EPREFIX}"/var/lib/clamav \
-		--with-system-tommath \
 		--with-zlib="${EPREFIX}"/usr \
 		--disable-llvm
 }
diff --git a/app-antivirus/clamav/metadata.xml b/app-antivirus/clamav/metadata.xml
index 5ddb818cae43..e81808edb4ed 100644
--- a/app-antivirus/clamav/metadata.xml
+++ b/app-antivirus/clamav/metadata.xml
@@ -13,6 +13,7 @@
     <flag name="clamdtop">A Top like tool which shows what clamd is currently scanning amongst other things</flag>
     <flag name="metadata-analysis-api">Enables collection of file property metadata using ClamAV API for analysis by ClamAV bytecode programs.</flag>
     <flag name="system-libmspack">Use system libmspack instead of built in</flag>
+    <flag name="xml">DMG and XAR support</flag>
   </use>
   <upstream>
     <remote-id type="sourceforge">clamav</remote-id>
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index b99612c35595..900cfa70e78c 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/createrepo/Manifest b/app-arch/createrepo/Manifest
index 5e0944d67048..6d8ea5146883 100644
--- a/app-arch/createrepo/Manifest
+++ b/app-arch/createrepo/Manifest
@@ -1,4 +1,6 @@
 AUX createrepo-0.10.3-ten-changelog-limit.patch 525 BLAKE2B 6e79c87e8865bab43721fd4cb79b79b5549642cc33f83dc245eeff5dbbba79f5244ab20f7e88903a7bad35d96a3c976999e0e69b57e19f90411685d6da4c0f6d SHA512 3ff54907d22680c5e617fa43b3954f533d66cf6f00a67e628ee4e6828871fce71cf200a562e8557a33e66cba09e9b76c12aec4c1dc7e7bc31589add9c71a1516
+AUX createrepo-0.10.4-lzma.patch 406 BLAKE2B effb1ad86dce44a95a66b93c653accfd0231c224a2884d85727463788667e359a386cb7d838ca5031ea10ce548c385c6cd038bf1fc3fa18c8980abc25eb0b15e SHA512 122cd697c497a70abec140275e273de7976d4afee059e0dee4329aa10d149b9e2e622598fdede900bcf1404f983129d9ef5ac3d3381180e4694b695a938366d0
 DIST createrepo-0.10.4.tar.gz 71186 BLAKE2B ddd15305c6861e9872bf55683035c311a22aea062d27ba4e06bbe4e09598c85fbbaf4b874cbbd1e4c521610a7faa4097a7062ac52752ab2916c14ffca70a817d SHA512 28858d7d886e1132d001bb1bd847657502eb132133e39a4d19a4c8a080728c6b6f344283bc6ee21ce8def5b7980cbca7ed78299adeb71ce1012751268f6740ec
+EBUILD createrepo-0.10.4-r1.ebuild 1201 BLAKE2B 76236e720e015c9446ff1eac9b7126b673cba98cafcfea1eb9047041e74c86eb892a84ecaf2f1f02c8634ae1341772c1622d52fc4b98fc5a4c241273e3fc71ea SHA512 fa626175152a80e96717c62ba41965e853b13fea792ec3b47d3670a7632798f870a66d4bc53ba6e80df01d2d90ee9ed85c2db39d90b24fab33c5b1ff1f97b8b6
 EBUILD createrepo-0.10.4.ebuild 1165 BLAKE2B 3446ad3d1fe82c4bdacf58f163b0ea9c6044ca9d2390450fc6b9216729dfdafb25a7e67815d879e14af0d0ea614f5555a6ad990943cc65e89f20d163b5c6f1fd SHA512 848e9e4eeaee11a93602aa7742e1246f6a7f390cb0712192bb9ca2d32efedacd9669d89f868cf05d736991b530ff5a53246c6054cc408d861f01bd2a077e25d4
 MISC metadata.xml 241 BLAKE2B da02aaf50e60432544b6c8832b7711764b2aa8b5d296dd64f19208832042de36daabc30c8310468cc604013b69c0cc3817f4a14aadd0dad4142c6bf68d4cb767 SHA512 d0c9844a236b2be2bb08d8aecf429dca028b0199db4c5c26c5a9cc2d9e13e21214ae110deb2b0d56e1caeae4ba0367effacbb542890e599bf4ebc6ffb4a369d8
diff --git a/app-arch/createrepo/createrepo-0.10.4-r1.ebuild b/app-arch/createrepo/createrepo-0.10.4-r1.ebuild
new file mode 100644
index 000000000000..39a64af2e0b2
--- /dev/null
+++ b/app-arch/createrepo/createrepo-0.10.4-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='xml'
+
+inherit python-single-r1 bash-completion-r1
+
+DESCRIPTION="Creates a common rpm-metadata repository"
+HOMEPAGE="http://createrepo.baseurl.org/"
+SRC_URI="http://createrepo.baseurl.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/urlgrabber-2.9.0[${PYTHON_USEDEP}]
+	>=app-arch/rpm-4.1.1[python,${PYTHON_USEDEP}]
+	dev-libs/libxml2[python,${PYTHON_USEDEP}]
+	>=app-arch/deltarpm-3.6_pre20110223[python,${PYTHON_USEDEP}]
+	dev-python/backports-lzma[${PYTHON_USEDEP}]
+	>=sys-apps/yum-3.4.3
+	${PYTHON_DEPS}"
+DEPEND="${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.10.3-ten-changelog-limit.patch"
+	"${FILESDIR}/${P}-lzma.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	python_export PYTHON_SITEDIR
+}
+
+src_install() {
+	emake install \
+		DESTDIR="${ED}" \
+		PYTHON=true \
+		compdir="$(get_bashcompdir)" \
+		PKGDIR="${PYTHON_SITEDIR}/${PN}"
+	einstalldocs
+	python_fix_shebang "${ED}"
+	python_optimize
+	python_optimize "${ED}/usr/share/createrepo"
+}
diff --git a/app-arch/createrepo/files/createrepo-0.10.4-lzma.patch b/app-arch/createrepo/files/createrepo-0.10.4-lzma.patch
new file mode 100644
index 000000000000..2bae50c0a8a6
--- /dev/null
+++ b/app-arch/createrepo/files/createrepo-0.10.4-lzma.patch
@@ -0,0 +1,14 @@
+diff --git a/createrepo/utils.py b/createrepo/utils.py
+index b0d92ec..1220c7c 100644
+--- a/createrepo/utils.py
++++ b/createrepo/utils.py
+@@ -25,7 +25,8 @@ from gzip import write32u, FNAME
+ from yum import misc
+ _available_compression = ['gz', 'bz2']
+ try:
+-    import lzma
++    import backports.lzma
++    lzma = backports.lzma
+     _available_compression.append('xz')
+ except ImportError:
+     lzma = None
diff --git a/app-arch/engrampa/Manifest b/app-arch/engrampa/Manifest
index f604ed8f80ea..fd95b1f8c549 100644
--- a/app-arch/engrampa/Manifest
+++ b/app-arch/engrampa/Manifest
@@ -1,12 +1,3 @@
-AUX engrampa-1.10.2-p7zip-15.09-compat.patch 851 BLAKE2B 50734ebd04df0f3a277408a9051612b7691e4b52a82d1851fb3cbda23b9308ae1868d15d7ce2b9b4ea9576bbd11bd0b7c71852bef5165a8dc09504ffbb674a40 SHA512 a6c11311b15647713a93ec20c52d228cb828ac15767b7dbc2ae1cffef50b73d06ff5e36891763f715a67a8b06dc1d3a6e2bf30b27abc3376baebe390e7a54c27
-AUX engrampa-1.10.2-p7zip-15.14-compat.patch 1225 BLAKE2B b1aa1546aeed6bc3116d8a7ccd8bb2e8a101a5df4fd902d748fbc2afc909db2f0071248107d8dc0f6d2bb2b3c6a2382955e6fab30a3f0ab3430b80c4e1d72104 SHA512 e396976cfce32b4ac48205c0c72a342d713c8798926a2c56855f4083e3f7598b6ce1e3df3fb03ee8b08c0bf18657a2c750389b465a142f4261eb03f12f4a8a3a
-DIST engrampa-1.12.0.tar.xz 1380144 BLAKE2B 87c8a69d3706489f7f2dfc704212714976ba3bb24954d02b798700be4f5c98bada0eec0e22402f85e3ea4d7852ab6bbb523deeef411887c68f5b998871c72069 SHA512 8c694b1f1baab099316f6e5d5ec67ae95171df3a988aee11b0527ae797717e7b3e57fa1ec53cb78e9aa397b1758f768736231ad1bd91c1bb8b2ba2f8f755cfec
-DIST engrampa-1.14.1.tar.xz 1417444 BLAKE2B 95dd08ba2264fb2ba937be61522cf56da8363fdc4af21c18bd3d8a22609ab0c9a606bda5f16b2795ad6b0b7bd017bf1150a2e31f6c29d9c111362ca93ff0ed65 SHA512 fea510d95fe483f676f66490706aa919b6a62bc20af9e22893304235ce0a38ff006c66494d548a3207dc4cd241cb785abe77652693d1b600e4ca6c8a0a60d763
-DIST engrampa-1.16.1.tar.xz 1432272 BLAKE2B 6181da44c6a80030c1ac856c017ba190bf91527e51c9d2eba38e267632360ad5497ee02d0a3ea00d73df4e6f507311e839e0d8d999b6d6561e298d784c3251ec SHA512 d61ee877b5e7ce0aacc46a8b786b1d074bc4d6870f453edf238d9b8fe3eecab750ce14f668c94bbceedec4a9b5bf16a828fff24edef227ae0108351adcfc73f6
 DIST engrampa-1.18.3.tar.xz 1427036 BLAKE2B 816155b7e2a0583263959d77bb5079a3d69ade087cac39e8e9c2c77901d0bfcbdb63a87ec9ed7cf92d2e580ae810d3e46641d690d87c1af7db6f6dca6627dfbc SHA512 6a3872ed9ec1e9d2779842d30c352c5068608913f9261a875b707951a45ff3122df2f4a4ed4da10c4f8a4617cc1d7aae4635b3f1234052793c4a6baa765d80f8
-EBUILD engrampa-1.12.0-r1.ebuild 1943 BLAKE2B 98c5255e301058a3aa09fa54fbd93bfb6c1c70f9f468608eca2cd6cf0b1838bc52ea708b8de3f7347e1d3b970be8a30e7f28803f13678908372cefaede528a75 SHA512 624884bbbc2a2a7c9eaa9f84c4ab7189ed70079f26535c5945eb2c5a96543fdf249599805ac538f304e316ed882645a1b3592b5752b1ba05f6142b356b60eb8d
-EBUILD engrampa-1.12.0-r2.ebuild 1948 BLAKE2B 7563e099ccf74cb69a5bce96804750f8edbb293207910ee652b8cd80a40a0f603c42e128a90f11ea0b737e371ad39dc23106336671846851dac5ee22e22492dc SHA512 0de7123927b4b41fd04606a1b11649ae2ed1f9250bfe6dad32cb8138fcaed7c5271eb9aa30fc921c8134ebbb7f867b36d0b867520a3defa63d1d31e36bd20d44
-EBUILD engrampa-1.14.1-r1.ebuild 1934 BLAKE2B 0d3565cc92cfa229671efd0b8ebdcfa32db2f74b3e2282f2da1969483dd16645dd2e1c6446ad3388ff9d9b502373c25d94719af56a07dd4d48e20e44d5c81fa2 SHA512 48a85e45c15b8d21f9e11e992efcf0fe24f8b6fc3934e26fba77221a8bf568a1f185eb584171d3a16500ab35ba0bd15d4a7d83e2d4dc9030c0a76166ed2643ec
-EBUILD engrampa-1.16.1.ebuild 1774 BLAKE2B b239d80ccc155e40d733b9de4997e689c9a0650eebf58f4c0615c4bd19ea71e51944bf9312135e5cf87ebf45bcc7ef6d8063f8f03c1ccef169b0a392c2efd787 SHA512 975831c6e938ccf8ad5547639a10d7224d01fc4d0b7870878b48cf8cf3051c9dcf779f72aea393c1a2798fb6e818f5e0bd5d8408a773e8b2c64dfeea30534056
 EBUILD engrampa-1.18.3.ebuild 1753 BLAKE2B 11e3876e0ea2061f7a4608ffe8795264594d4c2bafb14c430dc404cade3a15fa2c7f839be2acccfc8bd41f3325111b6bb6241570222c0a3048b6ea674c9f66ad SHA512 6ac876b38c305d108ac369231ae0cf1eed5e9d05e188a9be566fa014596b865781fd3953aac4ca3dd05adb4a552a5d9810a180ef073851990b437852e7ba1b1e
-MISC metadata.xml 763 BLAKE2B 7efc42df178dd52843a8f9c165d2c7a717fb05d24309dfcec6d7dbf61e8943b65f4a8febf2d58bfe29a81e0be37165f1b7345155d75e3e3d7676f625d679aea6 SHA512 fc5a05da5bf07067fc598b9849b068b497d3b9d107eddbe8d38bc15afb9b3df0e1071fae57e9c0a05b9813c03873581e66b0212cd126f14ccaddaccd85a57a96
+MISC metadata.xml 702 BLAKE2B de15449aa20cc44e6068bd8047630353f3389845a3332b57631bacdc9b9c4b188f8152678240e0142142db322af7058b09060f74413ff55fd1980fe697f32d0d SHA512 b465ea239cabf4ad1cd6b1f5ba7f87151e637595191c1a88cf17059f96ca1b03ce57d4200fc793d56be2b6ddb2ded20be460a4e1ac1727180e9662f9baba4522
diff --git a/app-arch/engrampa/engrampa-1.12.0-r1.ebuild b/app-arch/engrampa/engrampa-1.12.0-r1.ebuild
deleted file mode 100644
index 0448f8a0511f..000000000000
--- a/app-arch/engrampa/engrampa-1.12.0-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Engrampa archive manager for MATE"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="caja gtk3 magic packagekit"
-
-RDEPEND="
-	>=dev-libs/glib-2.32.0:2
-	>=dev-libs/json-glib-0.14:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango:0
-	virtual/libintl:0
-	caja? ( >=mate-base/caja-1.8[gtk3(-)=] )
-	!gtk3? ( >=x11-libs/gtk+-2.24.0:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3 )
-	magic? ( sys-apps/file )
-	packagekit? ( app-admin/packagekit-base )
-	!!app-arch/mate-file-archiver"
-
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.10.2-p7zip-15.09-compat.patch"
-	"${FILESDIR}/${PN}-1.10.2-p7zip-15.14-compat.patch"
-)
-
-src_configure() {
-	mate_src_configure \
-		--disable-run-in-place \
-		--disable-deprecations \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable caja caja-actions) \
-		$(use_enable magic) \
-		$(use_enable packagekit)
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-
-	elog ""
-	elog "${PN} is a frontend for several archiving utilities. If you want a"
-	elog "particular achive format supported install the relevant package."
-	elog
-	elog "For example:"
-	elog "  7-zip   : emerge app-arch/p7zip"
-	elog "  ace     : emerge app-arch/unace"
-	elog "  arj     : emerge app-arch/arj"
-	elog "  cpio    : emerge app-arch/cpio"
-	elog "  deb     : emerge app-arch/dpkg"
-	elog "  iso     : emerge app-cdr/cdrtools"
-	elog "  jar,zip : emerge app-arch/zip  or  emerge app-arch/unzip"
-	elog "  lha     : emerge app-arch/lha"
-	elog "  lzma    : emerge app-arch/xz-utils"
-	elog "  lzop    : emerge app-arch/lzop"
-	elog "  rar     : emerge app-arch/unrar"
-	elog "  rpm     : emerge app-arch/rpm"
-	elog "  unstuff : emerge app-arch/stuffit"
-	elog "  zoo     : emerge app-arch/zoo"
-}
diff --git a/app-arch/engrampa/engrampa-1.12.0-r2.ebuild b/app-arch/engrampa/engrampa-1.12.0-r2.ebuild
deleted file mode 100644
index 0d3575820196..000000000000
--- a/app-arch/engrampa/engrampa-1.12.0-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Engrampa archive manager for MATE"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="caja gtk3 magic packagekit"
-
-RDEPEND="
-	>=dev-libs/glib-2.32.0:2
-	>=dev-libs/json-glib-0.14:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango:0
-	virtual/libintl:0
-	caja? ( >=mate-base/caja-1.8[gtk3(-)=] )
-	!gtk3? ( >=x11-libs/gtk+-2.24.0:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3[X] )
-	magic? ( sys-apps/file )
-	packagekit? ( app-admin/packagekit-base )
-	!!app-arch/mate-file-archiver"
-
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.10.2-p7zip-15.09-compat.patch"
-	"${FILESDIR}/${PN}-1.10.2-p7zip-15.14-compat.patch"
-)
-
-src_configure() {
-	mate_src_configure \
-		--disable-run-in-place \
-		--disable-deprecations \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable caja caja-actions) \
-		$(use_enable magic) \
-		$(use_enable packagekit)
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-
-	elog ""
-	elog "${PN} is a frontend for several archiving utilities. If you want a"
-	elog "particular achive format supported install the relevant package."
-	elog
-	elog "For example:"
-	elog "  7-zip   : emerge app-arch/p7zip"
-	elog "  ace     : emerge app-arch/unace"
-	elog "  arj     : emerge app-arch/arj"
-	elog "  cpio    : emerge app-arch/cpio"
-	elog "  deb     : emerge app-arch/dpkg"
-	elog "  iso     : emerge app-cdr/cdrtools"
-	elog "  jar,zip : emerge app-arch/zip  or  emerge app-arch/unzip"
-	elog "  lha     : emerge app-arch/lha"
-	elog "  lzma    : emerge app-arch/xz-utils"
-	elog "  lzop    : emerge app-arch/lzop"
-	elog "  rar     : emerge app-arch/unrar"
-	elog "  rpm     : emerge app-arch/rpm"
-	elog "  unstuff : emerge app-arch/stuffit"
-	elog "  zoo     : emerge app-arch/zoo"
-}
diff --git a/app-arch/engrampa/engrampa-1.14.1-r1.ebuild b/app-arch/engrampa/engrampa-1.14.1-r1.ebuild
deleted file mode 100644
index 3af21bd02be2..000000000000
--- a/app-arch/engrampa/engrampa-1.14.1-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Engrampa archive manager for MATE"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="caja gtk3 magic packagekit"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.32.0:2
-	>=dev-libs/json-glib-0.14:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango:0
-	virtual/libintl:0
-	caja? ( >=mate-base/caja-1.8[gtk3(-)=] )
-	!gtk3? ( >=x11-libs/gtk+-2.24.0:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3[X] )
-	magic? ( sys-apps/file )
-	packagekit? ( app-admin/packagekit-base )
-	!!app-arch/mate-file-archiver"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PATCHES=( "${FILESDIR}/${PN}-1.10.2-p7zip-15.14-compat.patch" )
-
-src_configure() {
-	mate_src_configure \
-		--disable-run-in-place \
-		--disable-deprecations \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable caja caja-actions) \
-		$(use_enable magic) \
-		$(use_enable packagekit)
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-
-	elog ""
-	elog "${PN} is a frontend for several archiving utilities. If you want a"
-	elog "particular achive format supported install the relevant package."
-	elog
-	elog "For example:"
-	elog "  7-zip   : emerge app-arch/p7zip"
-	elog "  ace     : emerge app-arch/unace"
-	elog "  arj     : emerge app-arch/arj"
-	elog "  cpio    : emerge app-arch/cpio"
-	elog "  deb     : emerge app-arch/dpkg"
-	elog "  iso     : emerge app-cdr/cdrtools"
-	elog "  jar,zip : emerge app-arch/zip  or  emerge app-arch/unzip"
-	elog "  lha     : emerge app-arch/lha"
-	elog "  lzma    : emerge app-arch/xz-utils"
-	elog "  lzop    : emerge app-arch/lzop"
-	elog "  rar     : emerge app-arch/unrar"
-	elog "  rpm     : emerge app-arch/rpm"
-	elog "  unstuff : emerge app-arch/stuffit"
-	elog "  zoo     : emerge app-arch/zoo"
-}
diff --git a/app-arch/engrampa/engrampa-1.16.1.ebuild b/app-arch/engrampa/engrampa-1.16.1.ebuild
deleted file mode 100644
index 6f37d339de9f..000000000000
--- a/app-arch/engrampa/engrampa-1.16.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Engrampa archive manager for MATE"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="caja magic packagekit"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.32.0:2
-	>=dev-libs/json-glib-0.14:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango:0
-	virtual/libintl:0
-	caja? ( >=mate-base/caja-1.1.0 )
-	>=x11-libs/gtk+-3.14:3[X]
-	magic? ( sys-apps/file )
-	packagekit? ( app-admin/packagekit-base )
-	!!app-arch/mate-file-archiver"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--disable-run-in-place \
-		--disable-deprecations \
-		$(use_enable caja caja-actions) \
-		$(use_enable magic) \
-		$(use_enable packagekit)
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-
-	elog ""
-	elog "${PN} is a frontend for several archiving utilities. If you want a"
-	elog "particular achive format supported install the relevant package."
-	elog
-	elog "For example:"
-	elog "  7-zip   : emerge app-arch/p7zip"
-	elog "  ace     : emerge app-arch/unace"
-	elog "  arj     : emerge app-arch/arj"
-	elog "  cpio    : emerge app-arch/cpio"
-	elog "  deb     : emerge app-arch/dpkg"
-	elog "  iso     : emerge app-cdr/cdrtools"
-	elog "  jar,zip : emerge app-arch/zip  or  emerge app-arch/unzip"
-	elog "  lha     : emerge app-arch/lha"
-	elog "  lzma    : emerge app-arch/xz-utils"
-	elog "  lzop    : emerge app-arch/lzop"
-	elog "  rar     : emerge app-arch/unrar"
-	elog "  rpm     : emerge app-arch/rpm"
-	elog "  unstuff : emerge app-arch/stuffit"
-	elog "  zoo     : emerge app-arch/zoo"
-}
diff --git a/app-arch/engrampa/files/engrampa-1.10.2-p7zip-15.09-compat.patch b/app-arch/engrampa/files/engrampa-1.10.2-p7zip-15.09-compat.patch
deleted file mode 100644
index d0937a8959c5..000000000000
--- a/app-arch/engrampa/files/engrampa-1.10.2-p7zip-15.09-compat.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4f65bde8fc4d4efe747d4e7fbeba1211469ed79a Mon Sep 17 00:00:00 2001
-From: monsta <monsta@inbox.ru>
-Date: Thu, 24 Dec 2015 17:11:19 +0300
-Subject: [PATCH] 7z: correct checking for p7zip 15.09+
-
-from https://github.com/GNOME/file-roller/commit/ed9c3fd2
-
-fixes https://github.com/mate-desktop/engrampa/issues/114
----
- src/fr-command-7z.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c
-index 297ba1b..0b784f7 100644
---- a/src/fr-command-7z.c
-+++ b/src/fr-command-7z.c
-@@ -106,7 +106,7 @@ list__process_line (char     *line,
- 			strncpy (version, ver_start, ver_len);
- 			version[ver_len] = 0;
- 
--			if (strcmp (version, "4.55") < 0)
-+			if ((strcmp (version, "4.55") < 0) && (ver_len > 1) && (version[1] == '.'))
- 				p7z_comm->old_style = TRUE;
- 			else
- 				p7z_comm->old_style = FALSE;
diff --git a/app-arch/engrampa/files/engrampa-1.10.2-p7zip-15.14-compat.patch b/app-arch/engrampa/files/engrampa-1.10.2-p7zip-15.14-compat.patch
deleted file mode 100644
index 4e25898949f0..000000000000
--- a/app-arch/engrampa/files/engrampa-1.10.2-p7zip-15.14-compat.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From a2a537eb4c263a5b33851572a189fe89476b212e Mon Sep 17 00:00:00 2001
-From: sc0w <scow@riseup.net>
-Date: Wed, 25 May 2016 02:29:21 +0200
-Subject: [PATCH] p7zip-rar 15.14 supported
-
-since 15.14, p7zip-rar uses the plugin Rar.so to handle archives
-
-It can find on /usr/lib/ or /usr/libexec/
-
-If someone has it in another folder, we can add it
-
-Fixes #136
----
- src/fr-command-7z.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c
-index 20cfa2c..a7d032e 100644
---- a/src/fr-command-7z.c
-+++ b/src/fr-command-7z.c
-@@ -599,7 +599,8 @@ fr_command_7z_get_capabilities (FrCommand  *comm,
- 		if (is_mime_type (mime_type, "application/x-rar")
- 		    || is_mime_type (mime_type, "application/x-cbr"))
- 		{
--			if (! check_command || g_file_test ("/usr/lib/p7zip/Codecs/Rar29.so", G_FILE_TEST_EXISTS))
-+			if (! check_command || g_file_test ("/usr/lib/p7zip/Codecs/Rar29.so", G_FILE_TEST_EXISTS) || g_file_test ("/usr/lib/p7zip/Codecs/Rar.so", G_FILE_TEST_EXISTS)
-+			    || g_file_test ("/usr/libexec/p7zip/Codecs/Rar29.so", G_FILE_TEST_EXISTS) || g_file_test ("/usr/libexec/p7zip/Codecs/Rar.so", G_FILE_TEST_EXISTS))
- 				capabilities |= FR_COMMAND_CAN_READ;
- 		}
- 		else
diff --git a/app-arch/engrampa/metadata.xml b/app-arch/engrampa/metadata.xml
index cea4bb4fa4a4..ff7ba4c5fb87 100644
--- a/app-arch/engrampa/metadata.xml
+++ b/app-arch/engrampa/metadata.xml
@@ -9,7 +9,6 @@
 		<flag name="caja">Enable engrampa to integrate with
 			<pkg>mate-base/caja</pkg> by providing entries in its context 
 			menu</flag>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
 		<flag name="magic">Enable filetype auto-detection via
 			<pkg>sys-apps/file</pkg></flag>
 		<flag name="packagekit">Enable support for installing via <pkg>app-admin/packagekit</pkg>
diff --git a/app-arch/lha/Manifest b/app-arch/lha/Manifest
index f1e70b19c4d3..98491e3a6f6d 100644
--- a/app-arch/lha/Manifest
+++ b/app-arch/lha/Manifest
@@ -1,6 +1,7 @@
-AUX lha-114i-file-list-from-stdin.patch 991 BLAKE2B eab4a7c196a1e99bff97dee124d47af0870c01660fd96da3835797e0e14d9b2c271e69d8522278819f97f6787c050016a76916af28e2b949f880003f2f9b6426 SHA512 fb3e112ef592b7542cab4cd34759407b5bace3ebc83af0aad52daf9d8584ec897e26ef1e0d4cc3656c1b0bfbd5eb242dedc6fb0a8fedce765ae30735a95b79a2
-AUX lha-114i-fix-getopt_long-declaration.patch 267 BLAKE2B c87ac7e0842b9b637b5f9201ad0f596a2ee3bdb44447428d2f7e28c61c7da30f397c7dcacee86bdf6e1166f10d0b4962056ea77e443885487eae0eb3bcbb0f2d SHA512 c0e23d742a4e37b86f69e7096eba95e0c41619e2a459d526f5ede31ec73d2cfc14b3660fd1741c68e40d2ddb9bfd7c4250f275edea3965e1077b1a482a788f10
+AUX lha-114i-file-list-from-stdin.patch 999 BLAKE2B f039b70dfbb82f9d2ada3df90621b4a10117c33e4a201c5f22f8093ede4da5ace496af62b24af0c7f59a8ab28a10afbb6cc2be4ccd1c427f5a4e796455f8cf69 SHA512 28c79640e0bc1b7e7e29f06bea319ebdb594568d5752f1067db472d054c91101fd5d9d769448e32463025d162adf70fd067a161a9aa4ad1b1e38aa0e8023173e
+AUX lha-114i-fix-getopt_long-declaration.patch 263 BLAKE2B d5b53f0624a9b039167289f32369ba2b2905e8a223201404ba8d9a63d1a2fd9cb73f7e5d40fc2a14bcb510a4e49905545947bb21cfd38871e80c92591ba0007b SHA512 0216d24e001b7dc0db179d8e809fa838fd1d1d965e7d3f4ead79b9b276c39ee2666d6268fd835f9ce35664452d662aaadeeab00cb121f3485765db4c6be9d145
 DIST lha-1.14i-ac20050924p1.tar.gz 285518 BLAKE2B 7e10ee4cfaeb7212f9dfbe254d33ec7b97bce41a042eed3d6f826790650f5059a19d2a334cc41a86112ba8d80904168a0b3c2785e7670577b2bda0b4d27f0dcc SHA512 efe43d407d273f8f724f7b205223bd122c76adac4b67ad5e9811e88cae03f1f3c3af4297aa6f24951a02558975bbafacf697e97ab0da578b4e0115b89237566f
 EBUILD lha-114i-r7.ebuild 991 BLAKE2B af079ce8bcb696d6f7486c14e4faae0d4767e81556c85dd0c8ecf96e33d4d979b696af26c27abb7598e4410355193e2cd550d0342c555214f71fced05e86b674 SHA512 58af6daefe2f32f9479496811c78e0b224196da43f798d9734ee2bb4e78fcefd143bd2b01b409c8aeb1a736e6eae3548ef483e4a829b0a5a8d52dd226426a1e5
 EBUILD lha-114i-r8.ebuild 1147 BLAKE2B d8d4589cd5130d531750633b00553f98a59da7c7cbdb77750478a3bb3b6fb5f87a477f1bb524c972cd81c34189006d2371117df5c96b75be799e3f06079daee3 SHA512 fc3be81aba9e9f7d9a27c753ea187790956dcec389a890e6d06e939c0aafdc88a0b7e579f05f57809950f88bc32777b10ad3948b95fe27a41cecfd149ef08544
+EBUILD lha-114i-r9.ebuild 1145 BLAKE2B 3782520dd549dd9e8acef29baa3c9c6dd7913fbaa979388525d76e6e96dc40a0d810510c6b72764346de8ab1be7224095f73f84a5cc81039183c7eca6b91a3dd SHA512 15b7be4b3feb1d850f6e3c7d95f889cdc236d448bc76f7a663a4ccaf99e0a48dc8992c2cb7827b2b39d75c8c4e9a8f036c41dd73eaf6315e800b17d12f4af43f
 MISC metadata.xml 534 BLAKE2B 861f00b0b2b6c547ba122d9dbc9da0d9b84bd49b553a2c8f2d2fa5dd7ef7dcd86caca75292a825dccb74becd7ad8c34a4f9cbe71cd5096ba7617953c4f612c7c SHA512 499669685613b31d118c1878fda13c25551d13eedb1532507d2952a490725b1083dd16aaf4d6927bb2cc8ca859c2d29e1a064d15f9d4e099108ad7ea80fc040f
diff --git a/app-arch/lha/files/lha-114i-file-list-from-stdin.patch b/app-arch/lha/files/lha-114i-file-list-from-stdin.patch
index 4bd0d17d7527..d29f8d20bc8d 100644
--- a/app-arch/lha/files/lha-114i-file-list-from-stdin.patch
+++ b/app-arch/lha/files/lha-114i-file-list-from-stdin.patch
@@ -1,7 +1,7 @@
 Index: src/lharc.c
 ===================================================================
---- src/lharc.c	(revision 773)
-+++ src/lharc.c	(working copy)
+--- a/src/lharc.c	(revision 773)
++++ b/src/lharc.c	(working copy)
 @@ -561,7 +561,7 @@
          if (!isatty(1) && cmd == CMD_ADD)
              quiet = TRUE;
@@ -13,8 +13,8 @@ Index: src/lharc.c
              /* Bug(?) on MinGW, isatty() return 0 on Cygwin console.
 Index: configure.ac
 ===================================================================
---- configure.ac	(revision 773)
-+++ configure.ac	(working copy)
+--- a/configure.ac	(revision 773)
++++ b/configure.ac	(working copy)
 @@ -289,6 +289,11 @@
  	    [Define to 1 if you want to ignore dot files with -X command line switch])
  fi
diff --git a/app-arch/lha/files/lha-114i-fix-getopt_long-declaration.patch b/app-arch/lha/files/lha-114i-fix-getopt_long-declaration.patch
index b57a1c9c6158..3c3b7dfd94c5 100644
--- a/app-arch/lha/files/lha-114i-fix-getopt_long-declaration.patch
+++ b/app-arch/lha/files/lha-114i-fix-getopt_long-declaration.patch
@@ -1,5 +1,5 @@
---- src/getopt_long.c.orig      2013-12-18 16:05:59.789413528 -0600
-+++ src/getopt_long.c   2013-12-18 16:06:01.200420472 -0600
+--- a/src/getopt_long.c   2013-12-18 16:05:59.789413528 -0600
++++ b/src/getopt_long.c   2013-12-18 16:06:01.200420472 -0600
 @@ -64,7 +64,7 @@
  
  #ifndef USE_GNU
diff --git a/app-arch/lha/lha-114i-r9.ebuild b/app-arch/lha/lha-114i-r9.ebuild
new file mode 100644
index 000000000000..fc3cd93847f4
--- /dev/null
+++ b/app-arch/lha/lha-114i-r9.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+MY_P="${PN}-1.14i-ac20050924p1"
+
+DESCRIPTION="Utility for creating and opening lzh archives"
+HOMEPAGE="https://lha.osdn.jp https://github.com/jca02266/lha"
+SRC_URI="mirror://sourceforge.jp/${PN}/22231/${MY_P}.tar.gz"
+
+LICENSE="lha"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~m68k-mint"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-file-list-from-stdin.patch
+	"${FILESDIR}"/${P}-fix-getopt_long-declaration.patch
+)
+
+src_prepare() {
+	default
+
+	sed -e '/^AM_C_PROTOTYPES/d' \
+		-e 's/^AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' \
+		-i configure.ac || die #423125, 467544
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -DPROTOTYPES #423125
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		export ac_cv_header_inttypes_h=no
+		export ac_cv_func_iconv=no
+	fi
+
+	econf
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		mandir="${EPREFIX}"/usr/share/man/ja \
+		install
+
+	dodoc ChangeLog Hacking_of_LHa
+}
diff --git a/app-arch/rar/Manifest b/app-arch/rar/Manifest
index 7f47e2c9caab..67d57dbd0f85 100644
--- a/app-arch/rar/Manifest
+++ b/app-arch/rar/Manifest
@@ -1,9 +1,13 @@
 DIST rarlinux-5.6.0_p20180624.tar.gz 552245 BLAKE2B 9988b67d545df89bb7087c2bbec5a6fc47d99f6fd8a97e3581f135dc829a43e5c044248e95f60f7cd29370a0955a3c4c8a6667bfcead17301dc0f45ddae0057f SHA512 a0baba489c9268bc25c814c94747c117de66599f91da875b0e0b8233c24910f0e831f8b407f7a9bd8d709da6bdea4ef50306ce456ea5089f893619b8ee5b780f
 DIST rarlinux-5.6.1_beta1_p20180903.tar.gz 552295 BLAKE2B 45a709780bfbcfbaf0182a02a0c6bdea71ca4162b5e8bd223105fe01219e6053559b983e1aebf859480a62c18d6aa7cf689369b4bb5bedebd87eeb6812a31561 SHA512 daa7ed17f1c5418fd47e285c1cc06d833f2182fd3de89aefafd83a86935f52c61dc067d19521d3154ff07d891b69ace03d43940ae824adabfff82ffee1bda379
+DIST rarlinux-5.6.1_p20180930.tar.gz 552418 BLAKE2B 7a162a9e63336296e67064fe64d5bdefa4f0027bc23f27a419f14e5302fed7ed45bb78541ff7f3a417ed9f6e88700f4306d4ab3dbfb160a27dbf612df67f0c44 SHA512 b566d8d05068557987b69aa3b9610597c7226f7ff96ab935be33f3437b78d02dd539366b3a8499dc4c1d953a640a8a27f21b3f979969b71c6e3bde51a1118b00
 DIST rarlinux-x64-5.6.0_p20180624.tar.gz 541604 BLAKE2B 2fd865af38db47c556341bb2482ee9af83857bc196e08f9b47d5a0f8ccae708931c09dcca2115866d37c03b77f7548da87cf2e778f003e9a432634b9ae378aae SHA512 e8427d12016d4298d1e3ca3dc32f367e2b7a407572e48c665eaec796c3538d50349760b5691bc6d58256a5470dc0c6637740fcdc6e8a9bd420193fae16e209eb
 DIST rarlinux-x64-5.6.1_beta1_p20180903.tar.gz 541723 BLAKE2B fc70196124621d729530de31b7a213cf4e63326f7db11d65fe2941ae78dfd6bedcc4884b7f21454bd624a6565d679e95699aec9ee489672c3346198c2aa53c13 SHA512 b91388fd78ee45f7f7e3c1750e739ce28c325dcc3b11d8c507b022ade510d6bf012b00092238c3348933176d783d2ef9b1ce6269779a095b4a2320f27f035903
+DIST rarlinux-x64-5.6.1_p20180930.tar.gz 541765 BLAKE2B c3c115fe168df801ce81fbb31de810893539c2f3bcfb176e65ab0db9994fba0d2e3aa848cf073068651e301c1b36cf3d885d80841e6cf63ddb22d3210c14ab64 SHA512 b873397cc44ffe722248638f0315a445e7f8b39ce310d45b79e27d8c2662bf7bc8a095a3e7c4a8fa92e24551328530955f6f18a8553a1612ea00bec8ccaf2e37
 DIST winrar-x64-5.6.0_p20180624.exe 3180248 BLAKE2B 3ddbef82e2ecee7960c5d282de905a2d4d279c3ebae9ceb9e5b72a822d352a80d189a76514a414840ea5ad8002d718435757c860a0935134b6eba01b70e0f444 SHA512 61896901b580476d4c12d40d42eef725de270beb0b01526e7d5d4e02847a7b67b0380f0a365e92eafe2a2303d60945146457d43430aace51c9a443a8b1ceef48
 DIST winrar-x64-5.6.1_beta1_p20180903.exe 3187440 BLAKE2B c8f008ec746ab941dd41553d7f8004aab3d6a00771278eea76cb2b6c6a92394c93c6bd816e212950b99cdd28184237479eb301c0adc3d11712ebc9ab83b44656 SHA512 98da58d411d2d7c6cc49c62cbed3e3850eeccfee3bb7338777b734cbee14396c765b6c62a1d236e89458559d18b6871c3f97d2d9e600fc88655fa2c11e3eba27
+DIST winrar-x64-5.6.1_p20180930.exe 3190008 BLAKE2B c1411bd15b62ce63a5adc078ef2f7b2941ead91c683b8ade713b1e0a76075281f3c188d46de7d9f1da1caf37c4a4989bf9b35009401f8efa172fa0a4fddefdca SHA512 38c057b765a9a0ed51229018c9ececf94b8b6360a820e73db1af96412b6437614357f885c4c81ce89bc261bb3221d19cfb20284f16881eada0c46debe84f11b1
 EBUILD rar-5.6.0_p20180624.ebuild 2277 BLAKE2B 5b0b46e69ad6087789f311667a5168c31ca9eedf5acd889ee5a1b21a91f4932d259af6607ef3a03a871d55066bf6dc5562320f848e2ff344123b9497d3bfc423 SHA512 ef72607d08f840a8f0f4ac72e5a6e22733c49757afc25a4b9fbee049fee25e7fcefa70eae44df5f1a1e9293bfa60c51899bea2ff06892d09cd275878fd18b87a
 EBUILD rar-5.6.1_beta1_p20180903.ebuild 2279 BLAKE2B ad6b6a2875119d5125fd8b59be5a2c6bb839938542f2cb8c8e7f5544678964e45bd81b9ecf7399a9593e8c3daa54e3f19d6b073bbea3f5ca3ccaef9b5820984f SHA512 393e1805fb47027e6f12b41a435984288816001ec6ef03a71ac482bdf816106bbea89e4dcfe81c529cb3ad17b4db9dc39f14d95e2968c654a15294d14bc337b6
+EBUILD rar-5.6.1_p20180930.ebuild 2276 BLAKE2B 528284083b7f49c94778b81792bc63a41afe877a05863c685bb4fa64307c5f652dc41fc6fc2a766ad5b0dc723384cf6fc078dea08a2e9b40ff9ed05e1053c280 SHA512 8eac8419507f08932cc6caa3b9bb34d9f3c00a7bbd31c113c603d13f1b58d239144d32f78af6a98327f0eb737a5195d30aadd75627e0a2c7cf5999fb6fc1c6e2
 MISC metadata.xml 436 BLAKE2B 772b97d33730af0ec24c126f46634735b661470d99fe1c2fc90d36653d0143014cf45f84686f3621b3b276c70b859f6551ffe764089d0fb646f99cd04b7d0def SHA512 9748890b95ef59d0fc815cc71757c10e77914ea73d254770a8669d8b766d95c65a90eb941a360b361d4e0c28f1abde6ba15a84a77609820aea7eaa25d2e913a1
diff --git a/app-arch/rar/rar-5.6.1_p20180930.ebuild b/app-arch/rar/rar-5.6.1_p20180930.ebuild
new file mode 100644
index 000000000000..56fef413d7c4
--- /dev/null
+++ b/app-arch/rar/rar-5.6.1_p20180930.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="RAR compressor/uncompressor"
+HOMEPAGE="https://rarlab.com/"
+URI_x86="https://mirror.whissi.de/distfiles/rar/rarlinux-${PV}.tar.gz"
+URI_amd64="https://mirror.whissi.de/distfiles/rar/rarlinux-x64-${PV}.tar.gz"
+URI_w64="https://mirror.whissi.de/distfiles/rar/winrar-x64-${PV}.exe"
+SRC_URI="x86? ( ${URI_x86} )
+	amd64? ( ${URI_amd64} )
+	all_sfx? (
+		${URI_x86}
+		${URI_amd64}
+		${URI_w64}
+	)"
+
+LICENSE="RAR BSD BSD-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="all_sfx"
+RESTRICT="mirror bindist"
+
+DEPEND="all_sfx? ( app-arch/unrar )"
+RDEPEND="sys-libs/glibc"
+
+S="${WORKDIR}/${PN}"
+
+QA_FLAGS_IGNORED="opt/rar/default.sfx
+	opt/rar/default-elf32.sfx
+	opt/rar/default-elf64.sfx
+	opt/rar/default-win32.sfx
+	opt/rar/default-win64.sfx
+	opt/rar/WinCon.SFX
+	opt/rar/WinCon64.SFX
+	opt/rar/Zip.SFX
+	opt/rar/Zip64.SFX
+	opt/rar/unrar
+	opt/rar/rar"
+QA_PRESTRIPPED=${QA_FLAGS_IGNORED}
+
+src_unpack() {
+	local _file
+
+	for _file in ${A}; do
+		if [[ "${_file}" == rarli* ]]; then
+			if [[ "${_file}" =~ x64 ]]; then
+				if ! use amd64; then
+					continue
+				fi
+
+				unpack "${_file}"
+			elif [[ ! "${_file}" =~ x64 ]]; then
+				if ! use x86; then
+					continue
+				fi
+
+				unpack "${_file}"
+			else
+				die "Unknown SRC file '${_file}'!"
+			fi
+		fi
+	done
+
+	rm -f "${S}"/license.txt
+
+	if use all_sfx ; then
+		mkdir sfx
+		cd sfx
+		for _file in ${A}; do
+			if [[ "${_file}" == rarli* ]]; then
+				unpack "${_file}"
+				if [[ "${_file}" =~ x64 ]]; then
+					mv rar/default.sfx default-elf64.sfx || die
+				else
+					mv rar/default.sfx default-elf32.sfx || die
+				fi
+			elif [[ "${_file}" == winrar* ]]; then
+				ln -s "${DISTDIR}"/${_file} w64.rar || die
+				unpack ./w64.rar
+				mv Default.SFX default-win32.sfx || die
+				mv Default64.SFX default-win64.sfx || die
+			else
+				die "Unknown SFX file '${_file}'!"
+			fi
+		done
+	fi
+}
+
+src_compile() { :; }
+
+src_install() {
+	exeinto /opt/rar
+	doexe rar unrar || die
+
+	dodir /opt/bin
+	dosym ../rar/rar /opt/bin/rar || die
+	dosym ../rar/unrar /opt/bin/unrar || die
+
+	insinto /opt/rar
+	if use all_sfx ; then
+		doins "${WORKDIR}"/sfx/*.{sfx,SFX} || die
+	else
+		doins default.sfx || die
+	fi
+	doins rarfiles.lst || die
+	dodoc *.txt
+}
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index addfa3e9c424..dd4f18f221f0 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -3,7 +3,9 @@ AUX unrar-5.5.5-honor-flags.patch 1211 BLAKE2B 8104ac7bf12579218e71147865823da40
 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
 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 1851 BLAKE2B d4ab091a3e942be9c5fbc6eab230fad46e7a9576d1acce95f23f61b18ac9ba6fe4999803f25e7ae028807a9d65f6f97db5fd2b913d088e2efd41e814cc1711cb SHA512 2c5fa5fe23538fb0f775145817ba34cb730c4ab102079f410f212efabb80025632279a18b6aaa727e052de9c4bd680a7a6cb39aade3290979d0418892ce6717a
+EBUILD unrar-5.6.6.ebuild 1845 BLAKE2B 54766c25151e25f7e0c5e8c671b98ca9a2e6a420b40489bbb9ca392a75bdd3724bb4dd3e803364c6cd7885497175875f45bef7bdc953eccda7e7774ac6271c16 SHA512 25299b8fcbe59cea8f6ac92376412da2497f4e515d62f716714aa2ebd1e36ab4a20a1eb0f0e676ab0b7326dc2e8d8fcd399467ca713e555453ab271645620dee
+EBUILD unrar-5.6.7.ebuild 1852 BLAKE2B 70e7e9f58a06b2c726b2d227dd32045e10a5a36ff6a7a74550d8697472d9cf78913f2539f7c114b718367aa79053d75565f3906f81cf08c5096847b5fc38e5ac SHA512 d82cc2a9e8f3b46df705ebe5a897cd005ebfeb814b2dd095c8abe5485a6e3c0f6ff9f2a1da3cf6773f94099b1af7768ddcb2129553187fb2441d98be5bfc811b
 MISC metadata.xml 512 BLAKE2B 260947f2fad1c57508f689b2db22fff72276f40fb91789cfd0b0a2ae63d6710ed186d6350e4a23d19566e3469a097294f95074810652d61cb752a54dfe92ac80 SHA512 4a8c151dbda173dada5635cbd844459a1d999c6c41a2e140a09ba31536e1856d896141471c65b5cb52c9c92229f55c211e01ba23b975f4d25442ffc55ae6a13d
diff --git a/app-arch/unrar/unrar-5.6.6.ebuild b/app-arch/unrar/unrar-5.6.6.ebuild
index ce463cfa5935..3b12004604d2 100644
--- a/app-arch/unrar/unrar-5.6.6.ebuild
+++ b/app-arch/unrar/unrar-5.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"
@@ -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.7.ebuild
new file mode 100644
index 000000000000..384033090666
--- /dev/null
+++ b/app-arch/unrar/unrar-5.6.7.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit 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/zstd/Manifest b/app-arch/zstd/Manifest
index 2e006a279f08..8f7145abf1f3 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 1328 BLAKE2B 52b37b7e23da5923675b7b13c5b1b14729a2430952dbe24c46903e0553a3a1aeda7d11671671711a1fb54f79c43206536c3b187ca77fccde3bf15b8575355697 SHA512 a5f53bdfd97426587fdd53fbe1b16e28662f037a51f95b9b15f3a453a3da7fb5fb5e0b413200870950e0c89a047a215ae2578b8b266d99c9f1b5d75045105956
+EBUILD zstd-1.3.4-r1.ebuild 1327 BLAKE2B dc51deac27f4c5e89675ca519d9c268f187e46b0768db36c209975e6ce2eb1ff85be4e33105a12aefdb7522fc3259b945037972c72f8910e1fda842aecbbae06 SHA512 c24c65fbb57fd46bfcba186bee269ad628f87258a0c6e40df2c8b9eb15fcaa3979922f93c86f2597876b3131ea5e73a8c08d672b27e46f6004a5bdcb5a7a30af
 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 b5e953cdda71..535cb737c525 100644
--- a/app-arch/zstd/zstd-1.3.4-r1.ebuild
+++ b/app-arch/zstd/zstd-1.3.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=6
@@ -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 ~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 2d861486bfea..4e3ce7998e7e 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/dar/Manifest b/app-backup/dar/Manifest
index 6707e210b2b2..dee01a7f021d 100644
--- a/app-backup/dar/Manifest
+++ b/app-backup/dar/Manifest
@@ -1,7 +1,7 @@
 DIST dar-2.5.11.tar.gz 1891928 BLAKE2B 536cccca2533f7ddbc8b95972fe00e9c87a404481e6afbd7aa3634c00598403c18950eb876aefe71a818c3bf4df75bff5f3904dc69bd1d75880f6c8a349911a5 SHA512 36b90218a34ac7f41ce9ca0a2167cfb2fd243b23b8e84350153e8804f0faabf87291b4e4b061533bcb0ca079f087c074eeaa12a54ee8084dd386a072ac503847
-DIST dar-2.5.15.tar.gz 1905085 BLAKE2B 05dae478e140d9d86ffacbcff62ad612f8ae403e39cbf04fe64162722da4ee5feee1c6f826d4466de5a40f4ce8c24ca258ebaa26cd6eac851d34b946c3464f99 SHA512 0e583cd4dd920a3684364fbdea3bb882dfda2ca27f431a23146dc0c7d1e6ae74dd6245ba6983fc7f8073e9c9c9c496345c9645d1099eed7c75ac1e69381972c4
 DIST dar-2.5.16.tar.gz 1905306 BLAKE2B 5f4d0a8314decf0d22d54470e0a176b25c6faafd014162336e74afb7fae746c959bcb0e6908603a09fdd80dab4cd235765b12ebaddae8941ba90dee80f36f51a SHA512 20c4f6e17640f26d85dc51c20680a84b32b4e80b61a0fd7c92deccb05a79c88f73383fb497b53e1d6583dba244aeea78e12a6791b02e63c991f0b499f5c81e09
+DIST dar-2.5.17.tar.gz 1905938 BLAKE2B f45ccd5e076c54c1f087b2eb15d2f7e72cf6b0f2cafd226785174d547d952a3a3dd90a1d84193a3036fd309aa5a912d8118f35d598f19af92c21d49e044cad88 SHA512 f465669ed80ebd97a59835d64949f5c555c1174b128f037d9daf916ff1f770914627b46d72d350b937d571d2453a622f5b3bd7ea8e1992fa675d0d013df82410
 EBUILD dar-2.5.11.ebuild 2402 BLAKE2B 2399becf88620c4f86746df445e74c39b677f17352c3468462e4a64a3719c53cfd2fa25471026d3e950cd07c9231d83169e470e0adab51ed13b3ff4e9b08dc3c SHA512 2519d1c4ee298e6439cf09946efd68d9ee8f627087f276e629ed0bb9af9b9b50889dc9cff8888e98b40f2bbe8cde59e26bdebaaffef177829bf7d40994ed9ded
-EBUILD dar-2.5.15.ebuild 2381 BLAKE2B 30579303823d192fae8d51e10d15047cd78629dccdbe7f3a55bb3d241b6c017062bd7df41f53439ab2561f76ea8831af81c7054ded44a8f087933d01c65e7c55 SHA512 6186aa32ccba48c01e73078d2fc78f2a0c47f1b21aff4d163cd0142aa9be9f422935222880de9d8045a5e3a324e21e682657ef82355e3321a61e3b3a734b8cdd
 EBUILD dar-2.5.16.ebuild 2401 BLAKE2B 4a2cec184b059f34b33d8bf8185a89d852fc22ce8a79274809994f850b139a5829f4f9a2a1d50a850c37dadf5e444cbe58dda6d80b5b275fdf4e536a575ad3ae SHA512 a0fba745d39fff69a04944818af377d025787478f106198abdae9a6492048fdf82508d5c4fa818b048cbbd4992b1cf40eb0d29d35c01838fcbbabb3a5d42d64f
+EBUILD dar-2.5.17.ebuild 2398 BLAKE2B da4f12e9a5a975303cc0801c1081bc2742454b8f0fc2ee3f059bee3cdd1c1fbefc10765c9f83cd48c512e1bc634b93612aaf91498e73e37a71580d02373216ab SHA512 4da51e445dc0fe62d0f615b652fb53d3699a942bc1371616a9cd9f52a1bab61fbf5d5397bacac3d8ce1cae24554feff56b3392dcc6fe23564f9eadd4725b85dc
 MISC metadata.xml 887 BLAKE2B 7fc6c15d3f725d59a115a839feb6d138b806e1f0e168c6e726e83c9f0185c46cbf869284e17872a376ce52f515fc0446134b5f3a449a578a33c10154876fa1f5 SHA512 9210de7c2f273c52c39555e2db525b1bdaa58c44d22deab887d1bf96e42ac9e8f32545461c7129d4673ced220a6445ddda68c6c2733e5660fcad05e98db56817
diff --git a/app-backup/dar/dar-2.5.15.ebuild b/app-backup/dar/dar-2.5.15.ebuild
deleted file mode 100644
index dbd30f33f184..000000000000
--- a/app-backup/dar/dar-2.5.15.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic
-
-DESCRIPTION="A full featured backup tool, aimed for disks"
-HOMEPAGE="http://dar.linux.free.fr/"
-SRC_URI="mirror://sourceforge/dar/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux"
-IUSE="dar32 dar64 doc gcrypt gpg lzo nls static static-libs xattr"
-
-RESTRICT="test" # need to be run as root
-
-RDEPEND=">=sys-libs/zlib-1.2.3:=
-	!static? (
-		app-arch/bzip2:=
-		app-arch/xz-utils:=
-		sys-libs/libcap
-		gcrypt? ( dev-libs/libgcrypt:0= )
-		gpg? ( app-crypt/gpgme )
-		lzo? ( dev-libs/lzo:= )
-		xattr? ( sys-apps/attr:= )
-	)"
-
-DEPEND="${RDEPEND}
-	static? (
-		app-arch/bzip2[static-libs]
-		app-arch/xz-utils[static-libs]
-		sys-libs/libcap[static-libs]
-		sys-libs/zlib[static-libs]
-		gcrypt? ( dev-libs/libgcrypt:0=[static-libs] )
-		gpg? (
-			app-crypt/gpgme[static-libs]
-			dev-libs/libassuan[static-libs]
-			dev-libs/libgpg-error[static-libs]
-		)
-		lzo? ( dev-libs/lzo[static-libs] )
-		xattr? ( sys-apps/attr[static-libs] )
-	)
-	nls? (
-		sys-devel/gettext
-		virtual/libintl
-	)
-	doc? ( app-doc/doxygen )"
-
-REQUIRED_USE="?? ( dar32 dar64 )
-		gpg? ( gcrypt )"
-
-#PATCHES=(
-#)
-
-src_configure() {
-	# configure.ac is totally funked up regarding the AC_ARG_ENABLE
-	# logic.
-	# For example "--enable-dar-static" causes configure to DISABLE
-	# static builds of dar.
-	# Do _not_ use $(use_enable) until you have verified that the
-	# logic has been fixed by upstream.
-	local myconf=(
-		--disable-upx
-		$(usex dar32 --enable-mode=32 '')
-		$(usex dar64 --enable-mode=64 '')
-		$(usex doc '' --disable-build-html)
-		#$(usex examples --enable-examples '')
-		$(usex gcrypt '' --disable-libgcrypt-linking)
-		$(usex gpg '' --disable-gpgme-linking)
-		$(usex lzo '' --disable-liblzo2-linking)
-		$(usex nls '' --disable-nls)
-		$(usex xattr '' --disable-ea-support)
-	)
-
-	# Bug 103741
-	filter-flags -fomit-frame-pointer
-
-	if ! use static ; then
-		myconf+=( --disable-dar-static )
-		if ! use static-libs ; then
-			myconf+=( --disable-static )
-		fi
-	fi
-
-	econf ${myconf[@]}
-}
-
-src_install() {
-	emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html install
-
-	local DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-	einstalldocs
-
-	if ! use static-libs ; then
-		find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-	fi
-}
diff --git a/app-backup/dar/dar-2.5.17.ebuild b/app-backup/dar/dar-2.5.17.ebuild
new file mode 100644
index 000000000000..a8385195092a
--- /dev/null
+++ b/app-backup/dar/dar-2.5.17.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic
+
+DESCRIPTION="A full featured backup tool, aimed for disks"
+HOMEPAGE="http://dar.linux.free.fr/"
+SRC_URI="mirror://sourceforge/dar/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux"
+IUSE="dar32 dar64 doc gcrypt gpg lzo nls static static-libs xattr"
+
+RESTRICT="test" # need to be run as root
+
+RDEPEND=">=sys-libs/zlib-1.2.3:=
+	!static? (
+		app-arch/bzip2:=
+		app-arch/xz-utils:=
+		sys-libs/libcap
+		gcrypt? ( dev-libs/libgcrypt:0= )
+		gpg? ( app-crypt/gpgme )
+		lzo? ( dev-libs/lzo:= )
+		xattr? ( sys-apps/attr:= )
+	)"
+
+DEPEND="${RDEPEND}
+	static? (
+		app-arch/bzip2[static-libs]
+		app-arch/xz-utils[static-libs]
+		sys-libs/libcap[static-libs]
+		sys-libs/zlib[static-libs]
+		gcrypt? ( dev-libs/libgcrypt:0=[static-libs] )
+		gpg? (
+			app-crypt/gpgme[static-libs]
+			dev-libs/libassuan[static-libs]
+			dev-libs/libgpg-error[static-libs]
+		)
+		lzo? ( dev-libs/lzo[static-libs] )
+		xattr? ( sys-apps/attr[static-libs] )
+	)
+	nls? (
+		sys-devel/gettext
+		virtual/libintl
+	)
+	doc? ( app-doc/doxygen )"
+
+REQUIRED_USE="?? ( dar32 dar64 )
+		gpg? ( gcrypt )"
+
+#PATCHES=(
+#)
+
+src_configure() {
+	# configure.ac is totally funked up regarding the AC_ARG_ENABLE
+	# logic.
+	# For example "--enable-dar-static" causes configure to DISABLE
+	# static builds of dar.
+	# Do _not_ use $(use_enable) until you have verified that the
+	# logic has been fixed by upstream.
+	local myconf=(
+		--disable-upx
+		$(usex dar32 --enable-mode=32 '')
+		$(usex dar64 --enable-mode=64 '')
+		$(usex doc '' --disable-build-html)
+		#$(usex examples --enable-examples '')
+		$(usex gcrypt '' --disable-libgcrypt-linking)
+		$(usex gpg '' --disable-gpgme-linking)
+		$(usex lzo '' --disable-liblzo2-linking)
+		$(usex nls '' --disable-nls)
+		$(usex xattr '' --disable-ea-support)
+	)
+
+	# Bug 103741
+	filter-flags -fomit-frame-pointer
+
+	if ! use static ; then
+		myconf+=( --disable-dar-static )
+		if ! use static-libs ; then
+			myconf+=( --disable-static )
+		fi
+	fi
+
+	econf ${myconf[@]}
+}
+
+src_install() {
+	emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html install
+
+	local DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+	einstalldocs
+
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name '*.a' -delete || die
+	fi
+}
diff --git a/app-backup/untangle-https-backup/Manifest b/app-backup/untangle-https-backup/Manifest
index 32525fa57304..75fafe038250 100644
--- a/app-backup/untangle-https-backup/Manifest
+++ b/app-backup/untangle-https-backup/Manifest
@@ -1,3 +1,3 @@
-DIST untangle-https-backup-0.0.8.tar.gz 16263 BLAKE2B 3a41b2ee172a14e3a11ac6e1d47adf9bb818facf8e45d16826a0da70e9280c28d09f9d4f670b4efdda487c152ce4ef5350709b70165dc9262ae4e3e0d0a106c9 SHA512 4eb74d4cb939a9ac59fc475b5dbcc2a1fb4b36b59e6335c02b6de44b5fd56c44f1b7a52f6b71b36ed91663aff17556e0c9cfb04f309a191596a7a858ffec4693
-EBUILD untangle-https-backup-0.0.8.ebuild 579 BLAKE2B e5774400d0962670a5a6d2d0576d575d8e76b4346e1fcb574469395bf1f592c70dd007428712479c1a6cb24ab00b8f4b59290b34bf9405224eca86ff74367765 SHA512 5d6999edd4fa55f363de6f4f61c78019b8247ebdb1df53f0e129d28550095c981b3936f324216dcbd35ddf7e58717c1fc529ac1269da0b093a91574cfc9f02f2
+DIST untangle-https-backup-0.0.10.tar.gz 16377 BLAKE2B 1c6233383e3e986bb63177b5b9f47d57631f2128da822775e0daf8a8bf6fb175f7cd1518ef18d6db116d6a12b2c697fe40e145fe41d2c98a4e12eaf76760b92a SHA512 0bd13fb0b7133bfce1c582317b4e0904e976e07f943a2dedf5f03729baebb5cd8f9aa38cc30c55f953692ed88f358d08b693bc40e89c24e329af2f5167e9247c
+EBUILD untangle-https-backup-0.0.10.ebuild 579 BLAKE2B e5774400d0962670a5a6d2d0576d575d8e76b4346e1fcb574469395bf1f592c70dd007428712479c1a6cb24ab00b8f4b59290b34bf9405224eca86ff74367765 SHA512 5d6999edd4fa55f363de6f4f61c78019b8247ebdb1df53f0e129d28550095c981b3936f324216dcbd35ddf7e58717c1fc529ac1269da0b093a91574cfc9f02f2
 MISC metadata.xml 252 BLAKE2B fa9e1dbdc0de3313b50ecd9de7ac59006074b8b75ecb97a8fc4de5fb14609cb00dc1b24ba95a2e7fb11cbc6f8c8f0c068bd0311713cc2aa7e6016992dbd6e8bd SHA512 92f660063c96ac5b3e24e58733006d4a72a7e2f41605988efb575546a2539a92b1ceb3a37e018fcb5c08264a42af26950d6520ea80ba60130ad25ce6092ce742
diff --git a/app-backup/untangle-https-backup/untangle-https-backup-0.0.8.ebuild b/app-backup/untangle-https-backup/untangle-https-backup-0.0.10.ebuild
index 872eda0cac70..872eda0cac70 100644
--- a/app-backup/untangle-https-backup/untangle-https-backup-0.0.8.ebuild
+++ b/app-backup/untangle-https-backup/untangle-https-backup-0.0.10.ebuild
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 3a85aa04fefe..3868c21e9479 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index a97a93c515f1..78df7f783492 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,4 +1,7 @@
 AUX stress-ng-0.09.40-makefile.patch 1885 BLAKE2B 63eb0580af258cb6bd1085b40c6c124611ce86b23509c696ac99a2f9d12ff30aa33ff5ecbd34be048ed86b4c71c7729f1b27f9d41dbb7194f59ec5630b656471 SHA512 ebc40864b2c66fe60dc0525ab29b2b458b5d518aa5495f7335f1fb97ba7920764f527b4ed75ce54229c4145c89bd63c8a3abe3440b9ffe9625b993ca0be59086
+AUX stress-ng-0.09.42-makefile.patch 1877 BLAKE2B c8eb60af4ed9d3ba6cb3bb0484788b3428922a64bad53e7273f6be6a9965318a57262c35259ae611d11211a1a6ef694402d13874dbc054941eb1dc6662750cb1 SHA512 efac4c89672c8277d04da7de8cb8fd628847871dd37fb6d915737caf4682af5a7c68335e47d80ab8bdc15d1915bb4a614e58cffef61930620093f3d35f4c6ec5
 DIST stress-ng-0.09.41.tar.xz 359760 BLAKE2B d57d9350744db29d3e61201f146cd6569efae599743cf3e5971d645beba5de99b4162ec735e0f143c1c3cd8cc9e318441bfd97dfcf5db1b26cd7e4543bfcc918 SHA512 d1e2a6442c208d5d32ab688460475a59a2edd73220e44402632650eee022faf5728d282a374f22bcb86ce83662122823a7ba72f9824058d86d9b22a3c1791524
+DIST stress-ng-0.09.42.tar.xz 360452 BLAKE2B fa5ad15f066d8e762fb08cdcd4fe58ea6604890edf2384e0676e6c35645a6fd84c568369dc966d23527820630a0b44ab9b8969f3e170c876b03a194ea72384af SHA512 e209a8777331f91b3ec5fca9f6f664513498b21b5b31338e0882cc6c79674524906e8d0d4a8931ab5b382feac65e15639989fc0672e408aaa2eb84c72a059258
 EBUILD stress-ng-0.09.41.ebuild 681 BLAKE2B 2ac7829b587f3b29ef3607e18f2a51eed4d70be7bf422e1d8e4694e959a398434e05f3c7b6be0473acfe5a4775edef245096104e7109919213c260e6ae726f4f SHA512 fc9de4f122b1a92bff7aaf9d360da1d7ab67627ebc94a8bbd7cd0960c950a13302e43379a260d6d4846c70e62b2d7fc02b3aacd717274bc6ecc9d2b20c8fe1f8
+EBUILD stress-ng-0.09.42.ebuild 669 BLAKE2B cbc61ccdcc5c7cc726e2948b264ec7166d89c2a5122243d436d08c51bdd6bb903f7b59fee177baaca22b60a2d401ff53c5a8f9af19cae53dec338868a48710f0 SHA512 b69a8eaccad6f6f6c399374b3467cea5b61bbb2fe57103222cdcfe7aada8f31f11157a2056d62e5390d5e763453085d89bd5a92cb283e487044c8fd9125d531f
 MISC metadata.xml 796 BLAKE2B 746809bd51f5512246e29a1e15d9b41f3cf0df968b2e2655dcaef7bb839aff27ce2cefd4818e79fec18b9f12c7902bdd0440c634f9480da2352108950554d636 SHA512 47472bafada342a449ad7d3632c2b0859ee56f2eef31ca3ca9e7af1e106126ec7858862c67baa6b8d16611e2dd3ac166ecd931bab3491c875088e4bd66499aa6
diff --git a/app-benchmarks/stress-ng/files/stress-ng-0.09.42-makefile.patch b/app-benchmarks/stress-ng/files/stress-ng-0.09.42-makefile.patch
new file mode 100644
index 000000000000..66c07acf6793
--- /dev/null
+++ b/app-benchmarks/stress-ng/files/stress-ng-0.09.42-makefile.patch
@@ -0,0 +1,64 @@
+--- a/Makefile	2018-10-05 11:49:55.000000000 +0200
++++ b/Makefile	2018-10-05 17:28:38.000000000 +0200
+@@ -21,7 +21,7 @@
+ # Codename "portable pressure producer"
+ #
+ 
+-CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -O2 -std=gnu99 -pipe
++CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -std=gnu99
+ 
+ #
+ # Pedantic flags
+@@ -339,12 +339,10 @@
+ .o: stress-ng.h Makefile
+ 
+ .c.o: stress-ng.h Makefile $(SRC)
+-	@echo "CC $<"
+-	@$(CC) $(CFLAGS) -c -o $@ $<
++	$(CC) $(CFLAGS) -c -o $@ $<
+ 
+ stress-ng: $(OBJS)
+-	@echo "LD $@"
+-	@$(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -o $@
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -o $@
+ 	@sync
+ 
+ makeconfig:
+@@ -365,8 +363,7 @@
+ 		sed '$$ s/.$$//' >> apparmor-data.c
+ 	@echo "};" >> apparmor-data.c
+ 	@echo "const size_t g_apparmor_data_len = sizeof(g_apparmor_data);" >> apparmor-data.c
+-	@echo "CC $<"
+-	@$(CC) -c apparmor-data.c -o apparmor-data.o
++	$(CC) -c apparmor-data.c -o apparmor-data.o
+ 	@rm -rf apparmor-data.c apparmor-data.bin
+ 
+ #
+@@ -381,12 +378,10 @@
+ perf.o: perf.c perf-event.c
+ 	@$(CC) $(CFLAGS) -E perf-event.c | grep "PERF_COUNT" | sed 's/,/ /' | \
+ 	awk {'print "#define _SNG_" $$1 " (1)"'} > perf-event.h
+-	@echo CC $<
+-	@$(CC) $(CFLAGS) -c -o $@ $<
++	$(CC) $(CFLAGS) -c -o $@ $<
+ 
+ stress-vecmath.o: stress-vecmath.c
+-	@echo CC $<
+-	@$(CC) $(CFLAGS) -fno-builtin -c -o $@ $<
++	$(CC) $(CFLAGS) -fno-builtin -c -o $@ $<
+ 	@touch stress-ng.c
+ 
+ $(OBJS): stress-ng.h Makefile
+@@ -430,10 +425,10 @@
+ 	./stress-ng --seq 0 -t 15 --pathological --verbose --times --tz --metrics
+ 
+ .PHONY: install
+-install: stress-ng stress-ng.1.gz
++install: stress-ng
+ 	mkdir -p ${DESTDIR}${BINDIR}
+ 	cp stress-ng ${DESTDIR}${BINDIR}
+ 	mkdir -p ${DESTDIR}${MANDIR}
+-	cp stress-ng.1.gz ${DESTDIR}${MANDIR}
++	cp stress-ng.1 ${DESTDIR}${MANDIR}
+ 	mkdir -p ${DESTDIR}${JOBDIR}
+ 	cp -rp example-jobs/*.job ${DESTDIR}${JOBDIR}
diff --git a/app-benchmarks/stress-ng/stress-ng-0.09.42.ebuild b/app-benchmarks/stress-ng/stress-ng-0.09.42.ebuild
new file mode 100644
index 000000000000..59b29c72c00c
--- /dev/null
+++ b/app-benchmarks/stress-ng/stress-ng-0.09.42.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="Stress test for a computer system with various selectable ways"
+HOMEPAGE="http://kernel.ubuntu.com/~cking/stress-ng/"
+SRC_URI="http://kernel.ubuntu.com/~cking/tarballs/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-libs/libaio
+	dev-libs/libbsd
+	dev-libs/libgcrypt:0=
+	net-misc/lksctp-tools
+	sys-apps/attr
+	sys-apps/keyutils
+	sys-libs/libapparmor
+	sys-libs/libcap
+	sys-libs/zlib:="
+
+RDEPEND="${DEPEND}"
+
+DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
+
+PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
diff --git a/app-benchmarks/stress/Manifest b/app-benchmarks/stress/Manifest
index bf855dd0ec28..ad67a2c35d9e 100644
--- a/app-benchmarks/stress/Manifest
+++ b/app-benchmarks/stress/Manifest
@@ -1,3 +1,4 @@
 DIST stress-1.0.4-r1.tar.gz 191800 BLAKE2B 560065d963823e734bb706840908998a58c07c82b21ab579f7a0fd5163e7a8591ca0f6abe430bba058bafd9a2dac1fcf33f011663cd6c3d2fdefb221a49e5e8f SHA512 623a7d9585828bed4b7673e19fb0cfdda904552cd56353d74106047b64249299d5f8da892ec135f1781ec3984c7d5835dcc6c0d8e659e06c8a1e4fb2af9fd9c4
 EBUILD stress-1.0.4-r1.ebuild 542 BLAKE2B 867de86ee7552edb9f50a7336ee3b38d0fad5c2e054107f65b71369b75fa13a7794f54d32349211e2c029eb9e03a89edba8ff0f11781870f23b119f7bbb9f48c SHA512 cb552d5cd8c52dc75fbfd365c17d784fe6d8b8318c077e4c9d909431b226f8beb2ad40ad62d0e86eb0104acf088098e342afb39cd980fd699cc8ba692056f1b7
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD stress-1.0.4-r2.ebuild 516 BLAKE2B 2bdbb671e958f87d64dbe587f806c1c671259b3892e92f69cf2f1fa1b26e855ec54cd434b450b2f6f1c6349c0279f61a23699090a317e35644106dc0d1e243e9 SHA512 e92c28e176759435889781877a566d4259860af910dd66164b6ba888926cabf9268ed561524129a7f62428c732cc477669f80c9cf46c2af390f2e86a0bd0b9ed
+MISC metadata.xml 567 BLAKE2B aff13e629db6c40334669bda3e24cdbf9bf5d67d5954322caeec389d4b324a17eec66a4846febf6bfc2d21f2d2eca8989c37980aeb6d35ca744fbea1bdc29a58 SHA512 3a9699c915e68449c06fe72b084722e367b920f6ef29715f04757e0e4613383bd7a58f815d81fe2917ee7da74ec1df907e48ec74a0794a6ce3203278b20c72cc
diff --git a/app-benchmarks/stress/metadata.xml b/app-benchmarks/stress/metadata.xml
index 6f49eba8f496..486cfdbaa8af 100644
--- a/app-benchmarks/stress/metadata.xml
+++ b/app-benchmarks/stress/metadata.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		Stress is a deliberately simple workload generator for POSIX systems.
+		It imposes a configurable amount of CPU, memory, I/O, and disk stress on the system.
+	</longdescription>
 </pkgmetadata>
diff --git a/app-benchmarks/stress/stress-1.0.4-r2.ebuild b/app-benchmarks/stress/stress-1.0.4-r2.ebuild
new file mode 100644
index 000000000000..41adb494631e
--- /dev/null
+++ b/app-benchmarks/stress/stress-1.0.4-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="A deliberately simple workload generator for POSIX systems"
+HOMEPAGE="https://people.seas.harvard.edu/~apw/stress"
+SRC_URI="https://people.seas.harvard.edu/~apw/${PN}/${P}.tar.gz -> ${P}-r1.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index d372c70d5121..a29417bfc34f 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/cdemu-daemon/Manifest b/app-cdr/cdemu-daemon/Manifest
index 18a59436638e..5bb18610c012 100644
--- a/app-cdr/cdemu-daemon/Manifest
+++ b/app-cdr/cdemu-daemon/Manifest
@@ -1,5 +1,3 @@
-DIST cdemu-daemon-3.1.0.tar.bz2 79943 BLAKE2B 23407c3a14b426fa9f53c2d62564e34a8f878598c24cdd9419c811786d858135a0af3a1cde8b7afc4178f7772336ed533077c089c976e98de30c932deca1c426 SHA512 f0f3de31b2bf6a97852bb1bc45d301e6cbf401ca7499f42e99811ca62431e86b344c83ddb4420571f2038e43432711e04817b9ed3859893eec7d36fbad8dfdb5
 DIST cdemu-daemon-3.2.1.tar.bz2 82426 BLAKE2B 282b1a62ca3a770e709ff31ee7b72ed9f5e102c5f318a765a99421c93881e9ecacfdc5867af494e69dddda40603c8eb6cc8904a7c82fec004a6d5644a28a9f87 SHA512 399dbb818de8a550bd31784a5a7f0adb9d2e35d922ba71f341df81d20fd7e5ebaba5f31db1554caca17919325773f9ec6bb3d5ae99afa5d6eaf5b22142e010ee
-EBUILD cdemu-daemon-3.1.0.ebuild 1110 BLAKE2B 001cea1a051505de440cf792f5c561617312d8b946675623d47a204bc7e4b94ad4fa5e4ed8e2bdcb8d47483a0f33d8c2ffdbb935ffe3f401e90358f45de8d97e SHA512 ee7fdd166e61e9a9e6339629d46ed9c6aa91984e0e2b357958aa40d79c3401cde0d9fdf24942708074a7389b66205b6b38ad156674581cd68f16e89284093d14
 EBUILD cdemu-daemon-3.2.1.ebuild 1149 BLAKE2B c291fafea057bdf318b306757e6b77a54f5b42648bc9c7ef33b9a9f32b0e586f81743dbf3671ac48783dbd3a4cf7607ddaa6a00c0a8d2bde424da762bb876681 SHA512 e24a1b64ca31e69a0deaff694d5c0ebe256242de04636b53c9ff7ee4da208daccad0bf0da97fc3683240d5b5fabe53e0213c585600360147b18371e01f0caf5b
 MISC metadata.xml 455 BLAKE2B 23500677c263c1b8fc4839698bd6f1c08e9821fe4472a0b1725ad4777cfff385531ab6ec966f32a2335571c315b6f886f973451076745aa9fe4297c3cc436a30 SHA512 51c8d87f3c49c81798e4d2e038f911a2e05bfde742f229939f759c6768c6459cf4aa6829981791c57ef766fd447923194d7c14d4ad16951ae505d3b5a73c3479
diff --git a/app-cdr/cdemu-daemon/cdemu-daemon-3.1.0.ebuild b/app-cdr/cdemu-daemon/cdemu-daemon-3.1.0.ebuild
deleted file mode 100644
index e7bdef53c7de..000000000000
--- a/app-cdr/cdemu-daemon/cdemu-daemon-3.1.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils
-
-DESCRIPTION="Daemon of the CDEmu optical media image mounting suite"
-HOMEPAGE="http://cdemu.org"
-SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0/7" # subslot = CDEMU_DAEMON_INTERFACE_VERSION_MAJOR in CMakeLists.txt
-KEYWORDS="amd64 ~hppa x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.32:2
-	>=dev-libs/libmirage-${PV}:=
-	>=media-libs/libao-0.8.0:=
-	sys-apps/dbus
-	>=sys-fs/vhba-20130607"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS README )
-
-pkg_postinst() {
-	elog "You will need to load the vhba module to use cdemu devices:"
-	elog " # modprobe vhba"
-	elog "To automatically load the vhba module at boot time, edit your"
-	elog "/etc/conf.d/modules file."
-
-	if [[ -e "${ROOT}etc/conf.d/cdemud" ]]; then
-		elog
-		elog "${PN} no longer installs an init.d service; instead, it is"
-		elog "automatically activated when needed via dbus."
-		elog "You can therefore remove ${ROOT%/}/etc/conf.d/cdemud"
-	fi
-}
diff --git a/app-cdr/cdemu/Manifest b/app-cdr/cdemu/Manifest
index 1868942a4c12..735b531cf54c 100644
--- a/app-cdr/cdemu/Manifest
+++ b/app-cdr/cdemu/Manifest
@@ -1,6 +1,3 @@
-AUX cdemu-3.0.0-bash-completion-dir.patch 361 BLAKE2B 10202ce49885d8f8a824589a80f050b228e0bdf73ccc823131f36954b525471a3d10cedd791be56aa462e15526daf6ca3f363871930da9f6e94c10060371b7e5 SHA512 55c2fe9abddf87740126e60d6933431cb433b9420f4e94bb24bb9f80bae170632c5e9f7be4b552efcc748aa0eb97b6d65997cbe5f30f6399c4becb2971d92895
-DIST cdemu-client-3.1.0.tar.bz2 43066 BLAKE2B 97413d06b0466e81dce212c9f621fed2a7b83517c8ef3c70ccf182b48093b9c5f805ee40c81bf23bb88089da758876e80f57094c2ec761d42480a401d3b95114 SHA512 62c0650cfd18c1e8edca8c53a343460bf12aae35909251fce24098f16b48a3b30d083d436f494bf23145c06252f943f75413f024c6744696f5ad75cac0a15509
 DIST cdemu-client-3.2.0.tar.bz2 43588 BLAKE2B 0f75bed1ce2a715bb7acf227ebd3da8b80cf6418e28b0d352f294121c1f67acb8c6bab5f5dc5c768150ad46830b823d66f1940887c66225d20b41827c1377d31 SHA512 778f2ecac828ba278d0ded875c7bab2415f1c1acb62f4030eaf161376869939c48bc16a6d660326d9aacd2af745ef9dc9158f922a72aa8ccbd47f05ce41b8cd7
-EBUILD cdemu-3.1.0.ebuild 1148 BLAKE2B bf3b0903ce07572ea60b1f13dbd5e790cbf36d961f5ed0935ac37109beb4f45a0c0b2dc08032e242bd2d4408e3edfa708e3a85c3978bc81eb41fa38dfdb8e2dd SHA512 91cf3c8c2fc460e0de63dd7d9344142153fdf17f74cf70aee220769a6095a460efcace854ef7f5f5d6ff917011d80755ef55c69b99a9c4351bc24435fac97598
 EBUILD cdemu-3.2.0.ebuild 1092 BLAKE2B 9d47ca65c3b626913da1184f452c6a383123e565398de7492e901928730963aff243e146cfb2aa8d078b4125c02d1754bfed50c4df98ebfca7383ac524aea2f4 SHA512 dbe18fbb6042640a698656c2a9b941e95e3479946b06c2d9c2e7fd73c24dbd586aa4e7ce90c0f4fd65d9e3f688348c955a2f259679c1bab356d69a255cfab41d
 MISC metadata.xml 652 BLAKE2B 6750f0d7abcdba746aa4c2e75c3afc47dd9bebbaa3491cdc3cfccf0e629b944266b467779875ff84f4ba08624b5056c0b2f774020535eb93e85cddb9b228a7d9 SHA512 3c37419e3191ab278fdbb03b26ffafb36c6c00edc93566524a08253cb2deddd3ac61184e6bf0e66a0d18aa30b890c13f2c0946d396ee3835131a722e8bb76f93
diff --git a/app-cdr/cdemu/cdemu-3.1.0.ebuild b/app-cdr/cdemu/cdemu-3.1.0.ebuild
deleted file mode 100644
index aa0b79fa1f1c..000000000000
--- a/app-cdr/cdemu/cdemu-3.1.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-
-inherit bash-completion-r1 cmake-utils python-single-r1 xdg-utils
-
-DESCRIPTION="Command-line tool for controlling cdemu-daemon"
-HOMEPAGE="http://cdemu.org"
-SRC_URI="mirror://sourceforge/cdemu/cdemu-client-${PV}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE="+cdemu-daemon"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	cdemu-daemon? ( app-cdr/cdemu-daemon:0/7 )"
-DEPEND="${RDEPEND}
-	dev-util/desktop-file-utils
-	>=dev-util/intltool-0.21
-	>=sys-devel/gettext-0.18"
-
-S=${WORKDIR}/cdemu-client-${PV}
-
-PATCHES=( "${FILESDIR}/${PN}-3.0.0-bash-completion-dir.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	python_fix_shebang src/cdemu
-}
-
-src_configure() {
-	local DOCS=( AUTHORS README )
-	local mycmakeargs=(
-		-DPOST_INSTALL_HOOKS=OFF
-		-DGENTOO_BASHCOMPDIR="$(get_bashcompdir)"
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-cdr/cdemu/files/cdemu-3.0.0-bash-completion-dir.patch b/app-cdr/cdemu/files/cdemu-3.0.0-bash-completion-dir.patch
deleted file mode 100644
index 270ce7bb2ba8..000000000000
--- a/app-cdr/cdemu/files/cdemu-3.0.0-bash-completion-dir.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/cdemu-client/CMakeLists.txt b/cdemu-client/CMakeLists.txt
-index 99b595e..e4f9b6e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -39,7 +39,8 @@ install (
- 
- install (
-     FILES data/cdemu-bash-completion.sh
--    DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/bash_completion.d
-+    DESTINATION ${GENTOO_BASHCOMPDIR}
-+    RENAME cdemu
- )
- 
- install (
diff --git a/app-cdr/dvdisaster/Manifest b/app-cdr/dvdisaster/Manifest
index dd2b7126877a..eca6789c02b9 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 1759 BLAKE2B a3d136f68cfb576873589059cf9ae15361a8139b11f032be731f7749c6ff8b26f7b426120ac8a3c0f6368fe0b2e7a4dbc6e22f09aca42fc66b08987882d538fd SHA512 b3169cdd55823103abe2958c4653a8c9b71d86b8708174eea0c3d2905c68bdc4241f1e13d4b996803b22fc5909167c680b3b6496725a2489b0c37930ae2a9809
+EBUILD dvdisaster-0.79.5.ebuild 1730 BLAKE2B 2c956468351b47e4a085af56b8edd8b9e3eb265bf5d34588e5953f4403c6fe4a76e59957001d4faf3d8941dc58f205bef58e1d0366da3270965b951a7cf2b42c SHA512 611bf97c02003e0fe6f0a428d93257eee9c6c6269e27ab086b19c8680f439549dbd4926ec3739d0aa10320c8890434d56882d4cb08fa7a0149c1e6c37ed3ce8a
 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 dbc782d73d2a..edda38af4a4a 100644
--- a/app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild
+++ b/app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils gnome2-utils toolchain-funcs
+EAPI=6
+inherit desktop gnome2-utils toolchain-funcs
 
 DESCRIPTION="Tool for creating error correction data (ecc) for optical media (DVD, CD, BD)"
 HOMEPAGE="http://dvdisaster.net/"
@@ -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"
@@ -19,14 +19,17 @@ for dvdi_lang in ${dvdi_langs}; do
 done
 unset dvdi_lang
 
-RDEPEND=">=dev-libs/glib-2.32
+RDEPEND="
+	>=dev-libs/glib-2.32:2
 	nls? ( virtual/libintl )
 	>=x11-libs/gtk+-2.6:2
-	x11-libs/gdk-pixbuf"
+	x11-libs/gdk-pixbuf
+"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	virtual/os-headers
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 src_configure() {
 	./configure \
@@ -46,8 +49,7 @@ src_compile() {
 }
 
 src_install() {
-	emake install
-	dodoc CHANGELOG CREDITS.en README* TODO *HOWTO
+	DOCS="CHANGELOG CREDITS.en README* TODO *HOWTO" default
 
 	newicon contrib/${PN}48.png ${PN}.png
 	make_desktop_entry ${PN} ${PN} ${PN} 'System;Utility'
@@ -64,12 +66,11 @@ src_install() {
 		use l10n_${dvdi_lang} || rm -rf \
 			${dest}/doc/${PF}/${dvdi_lang/-/_} \
 			${dest}/doc/${PF}/CREDITS.${dvdi_lang/-/_} \
-			${dest}/man/${dvdi_lang/-/_}
+			${dest}/man/${dvdi_lang/-/_} || die
 	done
 
-	rm -f "${D}"usr/bin/*-uninstall.sh
+	rm -f "${D}"usr/bin/*-uninstall.sh || die
 }
 
-pkg_preinst() { gnome2_icon_savelist; }
 pkg_postinst() { gnome2_icon_cache_update; }
 pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/app-cdr/gcdemu/Manifest b/app-cdr/gcdemu/Manifest
index 65bd1017f2b6..836ba3c0e014 100644
--- a/app-cdr/gcdemu/Manifest
+++ b/app-cdr/gcdemu/Manifest
@@ -1,5 +1,3 @@
-DIST gcdemu-3.1.0.tar.bz2 48036 BLAKE2B 4fc14f02a7d006556bab31b82b0cb017efec2b7e3f99854567ac0e5b8211c151583e91cf72e180341077a927430688401c4ecb6112bd6758e7288c7a06e2c4ec SHA512 e3e0369cc443bc47befa52989cc2bc5d62e4c9462bb8de1c3dd8563e1240ba7f59fc8cc54aed2e96bdb23a5f6e2fa11ca36073dfa066409f097a1dca619866fc
 DIST gcdemu-3.2.0.tar.bz2 52144 BLAKE2B f349e4482905b0ac59bce5d6af74000e05ff9b7257c7ec8755106ac8fe316d59d19de8b72705fd9cccfa888d170776667ee07fe90311a81e78f251fee85601ee SHA512 61a1775c874c9c3604ce88758039ef80b262463ae180e791eb545811fa2176e4bf07c4dbcd3be5f17d446fdef92317a0ff64ce8d27f26aeaeee9d8134b6a95ea
-EBUILD gcdemu-3.1.0.ebuild 1213 BLAKE2B 8889f4c6277a8c6b736f0eea76b036d7f9534ccca1c5064d60ad800b40a5653159b63a0feee4a8008d296d0052c0020f3df13974432aa83419cdead3d1d14011 SHA512 95f84316bf0a91f2ba54fd5ed53b75d2d967507d1c14c5fb3c1c1950c83660b0efc40874bd1a6c34a1324c0f1a34ea64decd0379965a0609279405fbd40a206e
 EBUILD gcdemu-3.2.0.ebuild 1129 BLAKE2B 4af93d2a9f88cce37cc032ece75a76b4a6462df0a2226fe5c67c5fddc84351374af74b0b00ee76624af339bb847c178b4e1317355142261722e16fbe90d34814 SHA512 8c5494ce53fd55b5fa97d339ed46840eb7d873fd71e14c255588d5fc038f0f4786cacd865151f8e425cfe48cf3208d6b5d479adb0cf283f22f0144178d5b2897
 MISC metadata.xml 455 BLAKE2B 23500677c263c1b8fc4839698bd6f1c08e9821fe4472a0b1725ad4777cfff385531ab6ec966f32a2335571c315b6f886f973451076745aa9fe4297c3cc436a30 SHA512 51c8d87f3c49c81798e4d2e038f911a2e05bfde742f229939f759c6768c6459cf4aa6829981791c57ef766fd447923194d7c14d4ad16951ae505d3b5a73c3479
diff --git a/app-cdr/gcdemu/gcdemu-3.1.0.ebuild b/app-cdr/gcdemu/gcdemu-3.1.0.ebuild
deleted file mode 100644
index ec901b26bc91..000000000000
--- a/app-cdr/gcdemu/gcdemu-3.1.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-
-inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="Gtk+ GUI for controlling cdemu-daemon"
-HOMEPAGE="http://cdemu.org/"
-SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# librsvg for pixbuf-loader
-RDEPEND="${PYTHON_DEPS}
-	app-cdr/cdemu-daemon:0/7
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	gnome-base/librsvg:2
-	x11-libs/gdk-pixbuf[introspection]
-	x11-libs/gtk+:3[introspection]
-	x11-libs/libnotify[introspection]"
-DEPEND="${COMMON_DEPEND}
-	dev-util/desktop-file-utils
-	>=dev-util/intltool-0.21
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS README )
-
-src_prepare() {
-	cmake-utils_src_prepare
-	python_fix_shebang src/gcdemu
-}
-
-src_configure() {
-	local mycmakeargs=( -DPOST_INSTALL_HOOKS=OFF )
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	GNOME2_ECLASS_GLIB_SCHEMAS=1 \
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	GNOME2_ECLASS_GLIB_SCHEMAS=1 \
-	gnome2_schemas_update
-}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 0959220537fc..aa269ed6dc4d 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 45940f70bded..0d9cf4b5c692 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,10 +1,6 @@
-DIST certbot-0.24.0.tar.gz 1149694 BLAKE2B 7c57d59ced97de77e0f98eb11a2bba418ee81ba0eb4506ebc010cb0060c92820617ba2a3464dd398bfec6dc86f4c2dc8e22461d76ae51ccfbb97afab3bbb3681 SHA512 b067da7eea54deb72ff4b516382cbe480ffebcb378489a2b0c52955f7399401d936d8d6587d88473d6f4fa9e864de94514941bde9727a5babbf2d6211ea61b20
 DIST certbot-0.25.1.tar.gz 1160526 BLAKE2B 2dd2196c5986d5f5fe59f711589b6c3393d9c4183febb7048eab0b85e033f81d5c7ff12d7fea3aa69585308f5a4984143e431047fee73b42b16bd49e1cd2d14f SHA512 6395baa33acb4cf9e953294ddb07694ffa1e76424e12114db8df0f64fb3f1872c3145b02d853c139183b2b708d40d236f91d356eb9ecca447f577bd725fee6e5
-DIST certbot-0.26.0.tar.gz 1236499 BLAKE2B ea276f8b0fd4c7c6ce59acdcd3829d45d06ee31ac317bd846083da8ab105ae9357eaafd81992e1493c4965a95a70ee71f2d41875ca7e8c0613cbe44eeb3dffa5 SHA512 19f689d5b8724c6e7aa1539808b1b60913ad0f4a9272ebf6f40115028cef3cb49d9416239e104f125ed549c15e2a032935d0d2da1866548d0a177ef70608dce1
 DIST certbot-0.27.1.tar.gz 1240538 BLAKE2B 3d03acc8465c5d44de99ffbee67bd75fbd7d6e5d1cb1d1a6551d14c64dd699bbd91deaf3398ea3a7c2eeb8c353650e6a06cf64c88533f4270f05d1f3381843cf SHA512 ce4edd1088e9abba89f026953e42f782c6e3ef41b11123d7faf8f1e4c230b2be5107ad70b7c6d515b6ce3d06a65ae132a37d4e41fd35f728a17ba94bb09ebb00
-EBUILD acme-0.24.0.ebuild 1203 BLAKE2B adec925e16fe937f47f95933a1588796f84715efee9cd8cea4a2277ea2e43eac4f113d549b2346c2a5acca554b9bece4cb0513ccc14418240f01b0d42d017c18 SHA512 c601fabfd4e11dfa180d0dc8364c4a23dc9b100a053a1f13cd77521e53f2d69f3f76565428ad599f91eb5ef7d06d78803f2a7620ed6ae780ae0419f31f47f422
 EBUILD acme-0.25.1.ebuild 1259 BLAKE2B 91d958d832de58213b26d5252094d2e10c7cb600c656037219a8fbf6a52e1a7938c50c6bb831ccac6e3b7430705790775a779fa4fd946d120dd43b695ea006b5 SHA512 d84998cb58c0813cedbc2b2ac8dd5cecb25e331b0874ec6392a942e7a5cf6329c842a37d79a28b86edd0f04c197a6614a2cbec0e7800e2af4a4f9d97497cdfce
-EBUILD acme-0.26.0.ebuild 1261 BLAKE2B deaeeb535df0859ac91c7265460717146f92b7d528e729129f3d47b7cb446f80f85b7a9bbcfdb4aab975f7a88cf131a97d8005aed7ebd3ede6a14cd3dec1940a SHA512 d0e1304021d226c957f448632b05efc51e5b77b773546847686c1061e8dfe26656cf3b34503fd9eb307908bbd7d2b480e7e0d9d17a47602e057184d4f56b17f5
-EBUILD acme-0.27.1.ebuild 1261 BLAKE2B deaeeb535df0859ac91c7265460717146f92b7d528e729129f3d47b7cb446f80f85b7a9bbcfdb4aab975f7a88cf131a97d8005aed7ebd3ede6a14cd3dec1940a SHA512 d0e1304021d226c957f448632b05efc51e5b77b773546847686c1061e8dfe26656cf3b34503fd9eb307908bbd7d2b480e7e0d9d17a47602e057184d4f56b17f5
+EBUILD acme-0.27.1.ebuild 1256 BLAKE2B 1101a641f6d41ae084d7fe938fc8c6b91ebb54240baf55db0c31ae3520e8e4de648499c0ba647db773fa6b7c45ab3fc98144f62ebe0abf9566e81f2f9d3aa5f0 SHA512 87d7f1770277cf994c779964c76cf636d41281b6c2614c06d40771bab54b3edac737249a45d7f0624b58014c7447cce3adc92fb68f1c4b23db2bd9301b2ed0a2
 EBUILD acme-9999.ebuild 1261 BLAKE2B fd84623bd4510a088e0d27017f4e30a9b5214d1983298905163a4d944fb63bb1240b650a0ae1079398ccdd3c232fa58672b80f260deff64da0d62ef72c9d6a6f SHA512 0da048ccbf900d3dbde6b3d175a435e1337316d29bb900127c0429c434585a0f864aea1ba8af8262c1878ce77203d52d032614ca9722c063d7bf73607ea41cc0
 MISC metadata.xml 342 BLAKE2B 770c32b421519cd6bdf7e09a71a1ee679a7fdf18e03587f75097a766c51dc878000184759e3c69f0c19afe060dd5578ff91e481644086e138dbb728619895130 SHA512 bb057838d2a4161b1b5d545d32fb798bf52571fccaf3dfe7e1811ee4090813341222f7c27e21f36ea9353e9f48b401a4cda0f1937640ef052445e6b0eac9defb
diff --git a/app-crypt/acme/acme-0.24.0.ebuild b/app-crypt/acme/acme-0.24.0.ebuild
deleted file mode 100644
index 1011932ad110..000000000000
--- a/app-crypt/acme/acme-0.24.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
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~ppc64 x86"
-	S=${WORKDIR}/certbot-${PV}/acme
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of the ACME protocol"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.0.0[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	nosetests -w ${PN} || die
-}
diff --git a/app-crypt/acme/acme-0.26.0.ebuild b/app-crypt/acme/acme-0.26.0.ebuild
deleted file mode 100644
index 7c82dc6d67c0..000000000000
--- a/app-crypt/acme/acme-0.26.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
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-	S=${WORKDIR}/certbot-${PV}/acme
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of the ACME protocol"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.0.0[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	nosetests -w ${PN} || die
-}
diff --git a/app-crypt/acme/acme-0.27.1.ebuild b/app-crypt/acme/acme-0.27.1.ebuild
index 7c82dc6d67c0..2691a8a8d0d8 100644
--- a/app-crypt/acme/acme-0.27.1.ebuild
+++ b/app-crypt/acme/acme-0.27.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 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~ppc64 x86"
 	S=${WORKDIR}/certbot-${PV}/acme
 fi
 
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index fe8418c82080..fd36ea788bcb 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,10 +1,6 @@
-DIST certbot-0.24.0.tar.gz 1149694 BLAKE2B 7c57d59ced97de77e0f98eb11a2bba418ee81ba0eb4506ebc010cb0060c92820617ba2a3464dd398bfec6dc86f4c2dc8e22461d76ae51ccfbb97afab3bbb3681 SHA512 b067da7eea54deb72ff4b516382cbe480ffebcb378489a2b0c52955f7399401d936d8d6587d88473d6f4fa9e864de94514941bde9727a5babbf2d6211ea61b20
 DIST certbot-0.25.1.tar.gz 1160526 BLAKE2B 2dd2196c5986d5f5fe59f711589b6c3393d9c4183febb7048eab0b85e033f81d5c7ff12d7fea3aa69585308f5a4984143e431047fee73b42b16bd49e1cd2d14f SHA512 6395baa33acb4cf9e953294ddb07694ffa1e76424e12114db8df0f64fb3f1872c3145b02d853c139183b2b708d40d236f91d356eb9ecca447f577bd725fee6e5
-DIST certbot-0.26.0.tar.gz 1236499 BLAKE2B ea276f8b0fd4c7c6ce59acdcd3829d45d06ee31ac317bd846083da8ab105ae9357eaafd81992e1493c4965a95a70ee71f2d41875ca7e8c0613cbe44eeb3dffa5 SHA512 19f689d5b8724c6e7aa1539808b1b60913ad0f4a9272ebf6f40115028cef3cb49d9416239e104f125ed549c15e2a032935d0d2da1866548d0a177ef70608dce1
 DIST certbot-0.27.1.tar.gz 1240538 BLAKE2B 3d03acc8465c5d44de99ffbee67bd75fbd7d6e5d1cb1d1a6551d14c64dd699bbd91deaf3398ea3a7c2eeb8c353650e6a06cf64c88533f4270f05d1f3381843cf SHA512 ce4edd1088e9abba89f026953e42f782c6e3ef41b11123d7faf8f1e4c230b2be5107ad70b7c6d515b6ce3d06a65ae132a37d4e41fd35f728a17ba94bb09ebb00
-EBUILD certbot-apache-0.24.0.ebuild 1074 BLAKE2B a5f786cf12bd0b6bfdafa4f7fb1d2b89666e82f8adecdaa002a6ddc815fb6e84991f197efb2368f9dbf50fffbf38bf856b934b143e6b9e14316902f1cd2b67ff SHA512 5de3ed6d1e4f28a32cd8844c358d1f7a6bb20106afb9f1fb01985a355129d20743183e7619575b3c47aaefab839230cb729e50926e54ba1d52bfd5f9de490825
 EBUILD certbot-apache-0.25.1.ebuild 1073 BLAKE2B d34927f6b7d50934483fdfbd8201ff80bbccba5b3e9af84c26ff6179e1c0fef2447109c575e5e6bf12ac60fbb36cf2a03fd3dc6b47e021cb6219265b13a588ac SHA512 671a7e642023238022e7f1244ae1a28f9615e0ba29a04d00d7cce06c50845589c1a14688982f77cf40fcfe5926e01c5cc44ea56c55b9dfd8a5a3e9baca1379fc
-EBUILD certbot-apache-0.26.0.ebuild 1076 BLAKE2B f5d78faa967a989ae85d7ab072dc7e4faff4825c4cf35d5f00af2817fdbc1a9c22d215043d673692634c51dc60e2a5cfcf73b5c286a4d35abb8e5e4e89268e5b SHA512 1ff731a1ab08da68b5932b527403f7c1cdc5372020211ba4b44fa5b9eb74db19bacdad424a1e841dc664519b9c383155e8eac60a3e6597f3280b5518deba6d3e
-EBUILD certbot-apache-0.27.1.ebuild 1076 BLAKE2B f5d78faa967a989ae85d7ab072dc7e4faff4825c4cf35d5f00af2817fdbc1a9c22d215043d673692634c51dc60e2a5cfcf73b5c286a4d35abb8e5e4e89268e5b SHA512 1ff731a1ab08da68b5932b527403f7c1cdc5372020211ba4b44fa5b9eb74db19bacdad424a1e841dc664519b9c383155e8eac60a3e6597f3280b5518deba6d3e
+EBUILD certbot-apache-0.27.1.ebuild 1071 BLAKE2B 51fdb08a0f779a60f736026c00a219dfbf45724003865a9cf3649a02733a5483d9a2d57fd62a13fe197de011bd0937c73def29c4ff8b9d759a601b8c0257f75b SHA512 30ae244f7ddbc9e31de784b2bd9054e4c3f4fabef20f1af4aed6ab99f13c5e40432e98411980e08e1a8adf99a1de833025f6b44cefd5bf1e607efad4bb7ea5bc
 EBUILD certbot-apache-9999.ebuild 1076 BLAKE2B f5d78faa967a989ae85d7ab072dc7e4faff4825c4cf35d5f00af2817fdbc1a9c22d215043d673692634c51dc60e2a5cfcf73b5c286a4d35abb8e5e4e89268e5b SHA512 1ff731a1ab08da68b5932b527403f7c1cdc5372020211ba4b44fa5b9eb74db19bacdad424a1e841dc664519b9c383155e8eac60a3e6597f3280b5518deba6d3e
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-apache/certbot-apache-0.24.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.24.0.ebuild
deleted file mode 100644
index 600149c82dd4..000000000000
--- a/app-crypt/certbot-apache/certbot-apache-0.24.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})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="amd64 x86"
-	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-RDEPEND=">=app-crypt/certbot-0.21.1[${PYTHON_USEDEP}]
-	>=app-crypt/acme-0.21.1[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/python-augeas[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND}
-	dev-python/nose[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	nosetests || die
-}
diff --git a/app-crypt/certbot-apache/certbot-apache-0.26.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.26.0.ebuild
deleted file mode 100644
index ab98ef4612cf..000000000000
--- a/app-crypt/certbot-apache/certbot-apache-0.26.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})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-RDEPEND=">=app-crypt/certbot-0.26.0[${PYTHON_USEDEP}]
-	>=app-crypt/acme-0.25.0[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/python-augeas[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND}
-	dev-python/nose[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	nosetests || die
-}
diff --git a/app-crypt/certbot-apache/certbot-apache-0.27.1.ebuild b/app-crypt/certbot-apache/certbot-apache-0.27.1.ebuild
index ab98ef4612cf..5f448098501b 100644
--- a/app-crypt/certbot-apache/certbot-apache-0.27.1.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-0.27.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 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index bef039714090..bc72ad145f90 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,10 +1,6 @@
-DIST certbot-0.24.0.tar.gz 1149694 BLAKE2B 7c57d59ced97de77e0f98eb11a2bba418ee81ba0eb4506ebc010cb0060c92820617ba2a3464dd398bfec6dc86f4c2dc8e22461d76ae51ccfbb97afab3bbb3681 SHA512 b067da7eea54deb72ff4b516382cbe480ffebcb378489a2b0c52955f7399401d936d8d6587d88473d6f4fa9e864de94514941bde9727a5babbf2d6211ea61b20
 DIST certbot-0.25.1.tar.gz 1160526 BLAKE2B 2dd2196c5986d5f5fe59f711589b6c3393d9c4183febb7048eab0b85e033f81d5c7ff12d7fea3aa69585308f5a4984143e431047fee73b42b16bd49e1cd2d14f SHA512 6395baa33acb4cf9e953294ddb07694ffa1e76424e12114db8df0f64fb3f1872c3145b02d853c139183b2b708d40d236f91d356eb9ecca447f577bd725fee6e5
-DIST certbot-0.26.0.tar.gz 1236499 BLAKE2B ea276f8b0fd4c7c6ce59acdcd3829d45d06ee31ac317bd846083da8ab105ae9357eaafd81992e1493c4965a95a70ee71f2d41875ca7e8c0613cbe44eeb3dffa5 SHA512 19f689d5b8724c6e7aa1539808b1b60913ad0f4a9272ebf6f40115028cef3cb49d9416239e104f125ed549c15e2a032935d0d2da1866548d0a177ef70608dce1
 DIST certbot-0.27.1.tar.gz 1240538 BLAKE2B 3d03acc8465c5d44de99ffbee67bd75fbd7d6e5d1cb1d1a6551d14c64dd699bbd91deaf3398ea3a7c2eeb8c353650e6a06cf64c88533f4270f05d1f3381843cf SHA512 ce4edd1088e9abba89f026953e42f782c6e3ef41b11123d7faf8f1e4c230b2be5107ad70b7c6d515b6ce3d06a65ae132a37d4e41fd35f728a17ba94bb09ebb00
-EBUILD certbot-nginx-0.24.0.ebuild 1008 BLAKE2B ac4f94a0747dd797fb853dda9bb1a48791e030c027776cd65bc2f0bc491c5753b19392d77454c12fd216e6eb7ad087fa1ef03323e7cdcbb334684ef8e20b91d3 SHA512 319deb49333190fe536ec3ac8b97ecb78c10f9987fe6f725188b0a357e2eedc7ea83a84e1c80efb3c1deed328b97feed049b461a198fbd87327dd46695b3fda6
 EBUILD certbot-nginx-0.25.1.ebuild 1008 BLAKE2B 819a9aeb7221f952abf6ee4919f9bee45880489a60975042c50c78a46102aa54e2c1aae64f71f012a16435017ebd45989a025b0b7dd96b93cb6beb7e70c71b92 SHA512 596aad9c8d7965e532ad83b6960dd1830d97fa67acd98f95d42e2665cb64893fa8b3d00a30492242fa0890f986d346bd1d023ede1a2928bd57fef9bc050c9ec2
-EBUILD certbot-nginx-0.26.0.ebuild 1010 BLAKE2B 61d9476418271ad692d76133e2a4ed7f4ddb41c6b952e7915dcb009e885305efbe9e70aba04cb43c8e1509a3f6a801ffd53de09c518d9eba68dd81c881c15de1 SHA512 d824ecb5938fa25e248e476cfc95724aceea8ae9c5c30c18b6b392a3005c4e807469d37e1b806e1f7673a30058c10ffe73cbd8864ebc32f6b7d65043a03c4375
-EBUILD certbot-nginx-0.27.1.ebuild 1010 BLAKE2B 8a9362b6761d695e6933b0442e8cf3b0b393986d4c002d6c993e755948bcb21199f7c5dacd8ed6d9aae545f20ad46d7baf9f5c28696ddf9eaa71d66277537b3f SHA512 22b8aac0383470338d2b7126d3a2ea78bbefcbb08e5f53fdcd6eb6223a44bff91fffe2bb3e88a6af3967647c5661cb1b1600269f0b60f746bc34b01f3d6d5e0f
+EBUILD certbot-nginx-0.27.1.ebuild 1005 BLAKE2B 82a0537c5eab496eeda03c07b9f4e2e99c0eafb1cdae975df1ab565bda9167ba26715c22bfe525497fbfec39b788d0d627aa9cbfed7c75d4a4316cb9c2f225e9 SHA512 4080e09c6671e16d71143306311d6fcfcc59e348e18b8e86aa2ce2fe84965898f170067f09ad417a4751d459e205fa385d0748b13e9dd6ade15be458064c596d
 EBUILD certbot-nginx-9999.ebuild 1010 BLAKE2B 61d9476418271ad692d76133e2a4ed7f4ddb41c6b952e7915dcb009e885305efbe9e70aba04cb43c8e1509a3f6a801ffd53de09c518d9eba68dd81c881c15de1 SHA512 d824ecb5938fa25e248e476cfc95724aceea8ae9c5c30c18b6b392a3005c4e807469d37e1b806e1f7673a30058c10ffe73cbd8864ebc32f6b7d65043a03c4375
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.24.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.24.0.ebuild
deleted file mode 100644
index 57e3232d555f..000000000000
--- a/app-crypt/certbot-nginx/certbot-nginx-0.24.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
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm x86"
-	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	>=app-crypt/certbot-0.21.1[${PYTHON_USEDEP}]
-	>=app-crypt/acme-0.21.1[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.26.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.26.0.ebuild
deleted file mode 100644
index bda8ab5ae6d7..000000000000
--- a/app-crypt/certbot-nginx/certbot-nginx-0.26.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
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	>=app-crypt/certbot-0.22.0[${PYTHON_USEDEP}]
-	>=app-crypt/acme-0.25.0[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.27.1.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.27.1.ebuild
index 49176bb5a253..f880e805e63b 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-0.27.1.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.27.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 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm x86"
 	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index dfc6c61472be..b0a0fa63893f 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,10 +1,6 @@
-DIST certbot-0.24.0.tar.gz 1149694 BLAKE2B 7c57d59ced97de77e0f98eb11a2bba418ee81ba0eb4506ebc010cb0060c92820617ba2a3464dd398bfec6dc86f4c2dc8e22461d76ae51ccfbb97afab3bbb3681 SHA512 b067da7eea54deb72ff4b516382cbe480ffebcb378489a2b0c52955f7399401d936d8d6587d88473d6f4fa9e864de94514941bde9727a5babbf2d6211ea61b20
 DIST certbot-0.25.1.tar.gz 1160526 BLAKE2B 2dd2196c5986d5f5fe59f711589b6c3393d9c4183febb7048eab0b85e033f81d5c7ff12d7fea3aa69585308f5a4984143e431047fee73b42b16bd49e1cd2d14f SHA512 6395baa33acb4cf9e953294ddb07694ffa1e76424e12114db8df0f64fb3f1872c3145b02d853c139183b2b708d40d236f91d356eb9ecca447f577bd725fee6e5
-DIST certbot-0.26.1.tar.gz 1237273 BLAKE2B d3e1582eac16c224a361d383266000c057a825fca996776b575c152e9d7b29c3ac719dccfd7a7dc4a6adb9070f7c3b4a2fbf0e59bd6d5bf74acdfd7487c5103a SHA512 e1eaca840f020135ad329c458b25f69b622de0e886c69fe64f098a6ea468e74e69e16625c5ea5c9465d220b1de01e40a45450dc5e2aded1c474508f65863396a
 DIST certbot-0.27.1.tar.gz 1240538 BLAKE2B 3d03acc8465c5d44de99ffbee67bd75fbd7d6e5d1cb1d1a6551d14c64dd699bbd91deaf3398ea3a7c2eeb8c353650e6a06cf64c88533f4270f05d1f3381843cf SHA512 ce4edd1088e9abba89f026953e42f782c6e3ef41b11123d7faf8f1e4c230b2be5107ad70b7c6d515b6ce3d06a65ae132a37d4e41fd35f728a17ba94bb09ebb00
-EBUILD certbot-0.24.0.ebuild 1551 BLAKE2B 83b35abe2b04e6375e317dc1d7e02385cadaa6b688035e4754b171f65abe8859ad82d5fed76540c1c6db352cb3b50150f333ec3d3b7536537672cb382152cca2 SHA512 59275447bd956db66b5c6b8e51600337827cf621359a77e089ad2d1e804b77097637e49e94c84881cac3dfea38dfb76c9ddc13289a012a956f1d78046ad50db5
 EBUILD certbot-0.25.1.ebuild 1551 BLAKE2B 30e7acf9f0c9c712c144ab700a06f3e54e71b589c5896e232aa2a03ba745d11656421e4d5198211e31a3f5f7782ab14abc15e998590c498298ba86d55f12461e SHA512 66b2b8b2c62d471f0dea9de7df90958413a4ae9f6e59dafea592ad022d064eb8e6759a6dd0de0b228308f1a6cab8ef6e36ed633beefd3c4b24e4f31099d6a28d
-EBUILD certbot-0.26.1.ebuild 1553 BLAKE2B a9167ba71ebda3d61452d3c5b335660e587d166853efe3a400008b59b8df56aeaa378d8d7862096d17ab8f6d787bba172129deb6fe6bef4dfe6c7d750fcfb414 SHA512 0e45b16bdb0ccdb1af6a8d238f1284c7d6d7b27328b5880584bbff3e64367636926563bbc6e0c7101256df076183576b05cdfc16ec42822a785a331f85432ba4
-EBUILD certbot-0.27.1.ebuild 1554 BLAKE2B 36569c9d31879167b027688d264d0b24f89b0a66e0ff3ad9a352034cf3100c50e549d5a54fe9b5dde640a186f684eebeb270eab11dec65cc219caa0d745acd09 SHA512 e433ed7fa811a8a63db5acf6926013462f0f5bc7d011f299834f647d87eb8af9d495d93cdd96eb08f1c7849a4e86e9d9668eb7dcaf1f5d9a79dbfe2509d1a592
+EBUILD certbot-0.27.1.ebuild 1549 BLAKE2B 07ae7500c6727e4611cb0527dbba831b909811a657f59ea7b3fb89d6bf87e08314a7ae7a1733325d0ced5a363d99ab5a00a8d463bd8c47770eff6678f6506de9 SHA512 7b44d5da0a977dc8e83162ee216fe3d850a4f02028c9f8a78daefd380ebbde6a3b27b4557684e29ddc76cea888c2e32d2de2b195cc11bb6f1359cdc6b7f65051
 EBUILD certbot-9999.ebuild 1553 BLAKE2B a9167ba71ebda3d61452d3c5b335660e587d166853efe3a400008b59b8df56aeaa378d8d7862096d17ab8f6d787bba172129deb6fe6bef4dfe6c7d750fcfb414 SHA512 0e45b16bdb0ccdb1af6a8d238f1284c7d6d7b27328b5880584bbff3e64367636926563bbc6e0c7101256df076183576b05cdfc16ec42822a785a331f85432ba4
 MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
diff --git a/app-crypt/certbot/certbot-0.24.0.ebuild b/app-crypt/certbot/certbot-0.24.0.ebuild
deleted file mode 100644
index ba4271ffa17c..000000000000
--- a/app-crypt/certbot/certbot-0.24.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
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~ppc64 x86"
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	${CDEPEND}
-	>app-crypt/acme-0.21.1[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.2[${PYTHON_USEDEP}]
-	dev-python/josepy[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	test? (
-		>=dev-python/astroid-1.3.5[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/ipdb[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/pylint-1.4.2[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests -v ${PN} || die
-}
diff --git a/app-crypt/certbot/certbot-0.26.1.ebuild b/app-crypt/certbot/certbot-0.26.1.ebuild
deleted file mode 100644
index 021424b910a3..000000000000
--- a/app-crypt/certbot/certbot-0.26.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
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	${CDEPEND}
-	>app-crypt/acme-0.25.0[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.2[${PYTHON_USEDEP}]
-	dev-python/josepy[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	test? (
-		>=dev-python/astroid-1.3.5[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/ipdb[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/pylint-1.4.2[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests -v ${PN} || die
-}
diff --git a/app-crypt/certbot/certbot-0.27.1.ebuild b/app-crypt/certbot/certbot-0.27.1.ebuild
index 73cf25d06222..b0b558ecae05 100644
--- a/app-crypt/certbot/certbot-0.27.1.ebuild
+++ b/app-crypt/certbot/certbot-0.27.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 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~ppc64 x86"
 fi
 
 inherit distutils-r1
diff --git a/app-crypt/easy-rsa/Manifest b/app-crypt/easy-rsa/Manifest
index 23dc5bbbe149..7d06e0dbe304 100644
--- a/app-crypt/easy-rsa/Manifest
+++ b/app-crypt/easy-rsa/Manifest
@@ -1,4 +1,6 @@
 AUX 65easy-rsa 37 BLAKE2B 4a53c21a6027a9c5857d93e23703651b3d2642f54ce4519e727dd421230662f27f2ab45761041cf5b6b6cd654831d33297f1656eab26c496ee3e4f9d39f6ac3d SHA512 2f8c4f489ebd2ad2e5a0d45351361ecfc06a9481d9e15ea48215addb82ddf2083a85acb0a5c171d0c7e5406152d3679a5a7835e22ba9953e554614d94026d778
 DIST EasyRSA-3.0.4.tgz 37721 BLAKE2B 84d81eb86dfee42f6de935cbd308262d36626170880a24d260dd8ae708d6340feb63866cb1704c9209675112eef4a251399e19948e88067e90b410c00707a770 SHA512 0bc145e510891af022c05427436c3ec7a29fce9d83e022954acd0cc470c88c43f5549af0b6263b46e8dc5fd167621a118cba0c01a514c51032cea8f1efbb9787
+DIST easy-rsa-3.0.5.tar.gz 638366 BLAKE2B 990ef0cc7effd80d06d15dbb2dc3ef9a0a282a4adb501475fbd43c1b50bead374ba78ee9652e9c0f8d2e54354be4da6a0ae302e4ef2d576bd7fd981d59566d64 SHA512 9231ca7fda489a230d8418679d8824503ae680e2de6682d5f2d2fa716597f7df5980b7b88a3f6eb4fa0b7d9bbead59a1e2e4b8f4a5a36bda7f78ffa8f3c23d34
 EBUILD easy-rsa-3.0.4.ebuild 848 BLAKE2B 9f2f6974e21b91114185a3859d83e6d1274d8b02803fcf9ec949e8e27db807f2efd592f774ceeb0aeb41523f94080420a81a0126f3fa688aaef5637a4a07145b SHA512 3410d194d52040259e599093380d2ba443bc51258a6785505eb53326ebada4981938d533b202e79da67d794836d83aa161298227daedc67eb55ecd4be296d56e
+EBUILD easy-rsa-3.0.5.ebuild 822 BLAKE2B 0547c7d807a87cb573ee94a0557b2caa3f0aa70c9ac1e05796939db8468cc4521c7cf9cdbffc57371358e1726ed108e08a29e1111cb3ba808314bfb3dcb209cf SHA512 61590ca8ed7690a550aedd614ca1b9d0e6e2c7033962bd8f5a622c61be4ff7b80254aeecbf4224c6cf7c68611a095597ca6ef5ea6511c5328ded9d05a0d26102
 MISC metadata.xml 321 BLAKE2B 453742eb4f4eebfc23e6d9889fe78d2894c3f49bde81f56827c271dbf8281a2b6016205843a0aabd5ea574776785327a83b017389bcf41aeb5f5402c04e7a97b SHA512 e643d4681855376cdc17865fc1b4106a56861f7bc080ccf808a485594e3ca35fcfa72fcd2ad49af69275d569468c1684ebe784cb16e47cc528187bdeaba6a051
diff --git a/app-crypt/easy-rsa/easy-rsa-3.0.5.ebuild b/app-crypt/easy-rsa/easy-rsa-3.0.5.ebuild
new file mode 100644
index 000000000000..ff99431b6daa
--- /dev/null
+++ b/app-crypt/easy-rsa/easy-rsa-3.0.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Small RSA key management package, based on OpenSSL"
+HOMEPAGE="https://openvpn.net/"
+SRC_URI="https://github.com/OpenVPN/easy-rsa/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="libressl"
+
+DEPEND="!libressl? ( >=dev-libs/openssl-0.9.6:0 )
+	libressl? ( dev-libs/libressl )"
+RDEPEND="${DEPEND}
+	!<net-vpn/openvpn-2.3"
+
+src_install() {
+	exeinto /usr/share/easy-rsa
+	doexe easyrsa3/easyrsa
+	insinto /usr/share/easy-rsa
+	doins -r easyrsa3/{vars.example,openssl-easyrsa.cnf,x509-types}
+	dodoc README.quickstart.md ChangeLog
+	dodoc -r doc
+	doenvd "${FILESDIR}/65easy-rsa" # config-protect easy-rsa
+}
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index d10307781459..199c332ea2bb 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -4,6 +4,7 @@ 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.8.ebuild 3197 BLAKE2B 047ced194ad1467cdd5ade6f747b200aff373e5cbee4ae4ac17a113c4c1df5176abdb2658808c3bf00682dc08a42cca4c84c704016b682a8782521bf52783f4c SHA512 99bda452847ef64c1727b31d406034ad69da164355d18d36eefa7744f25cc2376abbf4dcc72b919884881b49cfdf27c8149c513c63c58467d4eb478d1db10fd7
 EBUILD gnupg-2.2.9.ebuild 3334 BLAKE2B b59f061776948cacfcf4b0e7e348a66e2d8ae8fbb1ec3b906afc98944b9e3a92f35db13b8befb42194cdb71f2eebbf8a2e04ee9ec511aa73a5934d7996f1932e SHA512 7a8db6bfb393b88a60331ebdc3892f3b8175824adcf02338972084a6f272231bba783ff7394d02696471d962dc4298595d110c9f5b6127b6d8bedc00f1784c0a
diff --git a/app-crypt/gnupg/gnupg-2.2.10-r1.ebuild b/app-crypt/gnupg/gnupg-2.2.10-r1.ebuild
new file mode 100644
index 000000000000..7d51332a5446
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.2.10-r1.ebuild
@@ -0,0 +1,126 @@
+# 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/libu2f-host/Manifest b/app-crypt/libu2f-host/Manifest
index bc8eb3fa9b1b..80bf618ff112 100644
--- a/app-crypt/libu2f-host/Manifest
+++ b/app-crypt/libu2f-host/Manifest
@@ -1,5 +1,7 @@
 DIST libu2f-host-1.1.1.tar.xz 455652 BLAKE2B f5cc4dd7752d66790b4139e5b8e9262f6622b9608bc8b220640db773ce1e794b58eb3fdf855df4e73417aabf5f8e979218dfd1b068111c66c6d830ef4b7ebb97 SHA512 1f6d26d47cabd44391a780f03d88b6ab9ed996bab26e2605f1942bfff2203aa9a8e90fa80c010ccf2e575dbfca3bd03d3322381343cdf6def3829bbe45db8693
 DIST libu2f-host-1.1.3.tar.xz 469480 BLAKE2B b2a002fa694972e71aef73191608d079f1c13d98a2f40e06d25a6e50a3175100099adbc5b5067e5f1fe027042f99e198a07282df735ab4ff2eec63a4f5daf59a SHA512 6729dd35beaae1c96283f81794ac6c058ed6446f935a5cee7dc1a3db594201c9f049de6a58ac2e544e1c6ac0c1e9815cce5e2e46a6e45372e419078307a57f55
+DIST libu2f-host-1.1.6.tar.xz 469380 BLAKE2B 7943b6dd61084952edb81ab2c93fd781d832f0ad07dff442c93464ecce57bde8a7b3d4aea5fa6801f39a5cbb272658ba86bf499f485bca35fa5fa314d609ff2f SHA512 499efac0243a7e5fadf6c456cc5530633337c07ab7dda52bd77b541b24ffd0337efe95cce499e73d6c46d312e737c044edcbdb4d41043b1e8721242d6e6ad20a
 EBUILD libu2f-host-1.1.1.ebuild 1298 BLAKE2B 3eb0abee39181c3aea3cf63bbc59655732a0b8ec28bbc7260694e25f545749fcf0d7bd20aff6f7a3575d56d52c7ae8094dc7954ac76c5f9921ebd21a5a376248 SHA512 c5422305f55e948d20c2b954710b97a61a6b3e8ce48dca1950967c2a6c02e6d63b0530ab427fa5c48a90802544b4b13dcee8ccb88c9e1df814549219db1bed1f
 EBUILD libu2f-host-1.1.3.ebuild 1171 BLAKE2B 0de12a01fbeec1d1a4c7e728456f2071c68bff6b325917ee1de2bb4b547f72f43788e999d2964e13731473cb14a16b2557c4f3b078eb464ae8af00909d5d621f SHA512 a9815676a32f12476cb05720e3b513a4ea8ea8b57c75d6fc1acb406b0c31772c145713537d09644ae5504df1cfbaac6281875afe31c2f5c8edabcc9266f37f27
+EBUILD libu2f-host-1.1.6.ebuild 1170 BLAKE2B c5d8cbb4986694acc55f0bc3f77cf067abed86f1da0d0e84bfc850be74bd8c22c0b94792316a40e8c05a428045f42946513b2b39e6a2e1ae58e84c3d207896d4 SHA512 7486e0234f2629c5adfea4a2e4ac62a4e8fc16e40e3da05e0b07418fbf9e6cf6d2ed25ff66c13df59bd001a9cec2ccdb373ac638d4091379b9672c677b1efdd3
 MISC metadata.xml 550 BLAKE2B 992fdc0643bed1c1122b544947535745a7209552387c3e6917942eee04cd33bd613f78f5e447099493b56e133d88095d958a8816f1b1ba65d34944ddb3210eea SHA512 9970724fffe49705d8dedc85522cbe3040c4e542fa5a56c2cbc428df2540975e76a84fe8c4819bfaacc085cccdf6e5a996a058c14f561b9ef10c7d705f98bfa0
diff --git a/app-crypt/libu2f-host/libu2f-host-1.1.6.ebuild b/app-crypt/libu2f-host/libu2f-host-1.1.6.ebuild
new file mode 100644
index 000000000000..edcf94b91186
--- /dev/null
+++ b/app-crypt/libu2f-host/libu2f-host-1.1.6.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info udev user
+
+DESCRIPTION="Yubico Universal 2nd Factor (U2F) Host C Library"
+HOMEPAGE="https://developers.yubico.com/libu2f-host/"
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.xz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="kernel_linux static-libs systemd"
+
+DEPEND="dev-libs/hidapi
+	dev-libs/json-c:="
+RDEPEND="${DEPEND}
+	systemd? ( sys-apps/systemd[acl] )"
+BDEPEND="virtual/pkgconfig"
+
+CONFIG_CHECK="~HIDRAW"
+
+pkg_setup() {
+	# The U2F device node will be owned by group 'plugdev'
+	# in non-systemd configurations
+	if ! use systemd; then
+		enewgroup plugdev
+	fi
+}
+
+src_prepare() {
+	default
+	sed -e 's:TAG+="uaccess":MODE="0664", GROUP="plugdev":g' \
+		70-u2f.rules > 70-u2f-udev.rules || die
+}
+
+src_install() {
+	default
+	if use kernel_linux; then
+		if use systemd; then
+			udev_dorules 70-u2f.rules
+		else
+			udev_newrules 70-u2f-udev.rules 70-u2f.rules
+		fi
+	fi
+}
+
+pkg_postinst() {
+	if ! use systemd; then
+		elog "Users must be a member of the 'plugdev' group"
+		elog "to be able to access U2F devices"
+	fi
+}
diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest
index c6eec792aaef..eb9cd08687f5 100644
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@@ -1,3 +1,3 @@
 DIST p11-kit-0.23.12.tar.gz 1257028 BLAKE2B 8add003ad298b7c4548c40f863835e9aae4234a66a4b216149be7c473f2b3b7ffb633b95883d58e5b039c974dd8571e56e23f6dcc77e484672605e6178d75ad2 SHA512 ae43b1f6ba5400cf5ae7b64b8c93aa47e5c7ee927196828600fd88beb6fdf6bcb6a63bc822d356757255638f9fbf10896e0604e32a1332a9a833836fa0468726
-EBUILD p11-kit-0.23.12.ebuild 1982 BLAKE2B c9ecf0b0639ba6272f02e4af616acb712af65ab76ec72cb869450991142eb4edb3e9f31ed117e4daa3aaa757e7783274cf372c5d07e99f18246ee6f1e5b321e1 SHA512 8b728ac51d8e6a539e1c4c501c7e86c7daf76f52e33fe2e3cd7cc1edf0c3430267972a9d139ae5a4265d2209fc7481b67e2d81f91b7e76a7077c9dffb3cef3fd
+EBUILD p11-kit-0.23.12.ebuild 1982 BLAKE2B f54ac03aa12b87894e7bc37e3e44e8b9f52dbc7fdd1033a45e5a95e5bfddaca22ac1df506f96620d73fa38d77865e1efff14183ed31ac5470bd692e2bea940a8 SHA512 9a17461a68d88526fa32c39f5ff7ac425245a2a23ed2571c1992401d663b517cc8db70262e5ec29ab56fc2a2da9ab93f65ff375bada82cb07fbaf34164895feb
 MISC metadata.xml 454 BLAKE2B 82db424896936d17b167806a47d54674d1d6eebe192ad1f8b4e985b00f74f10aa5f18ea587b866906571a91dcfda83626f6b25ebdbd6a6e02da65b34511b2b0e SHA512 24042c945cc3ab622b74c30eaa08819ebce4af9320b083ceb1f3f4db110fba6539121b4dbf0d245afdc395a9854bec022575861f7ae4e9418018d6bddbd4a888
diff --git a/app-crypt/p11-kit/p11-kit-0.23.12.ebuild b/app-crypt/p11-kit/p11-kit-0.23.12.ebuild
index b38707419541..4095da5e818e 100644
--- a/app-crypt/p11-kit/p11-kit-0.23.12.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.23.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=7
@@ -15,8 +15,8 @@ KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh spar
 IUSE="+asn1 debug +libffi +trust"
 REQUIRED_USE="trust? ( asn1 )"
 
-RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4[${MULTILIB_USEDEP}] )
-	libffi? ( >=dev-libs/libffi-3.0.0[${MULTILIB_USEDEP}] )
+RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}] )
+	libffi? ( >=virtual/libffi-3.0.0:=[${MULTILIB_USEDEP}] )
 	trust? ( app-misc/ca-certificates )"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index f636b4b23f5f..ff2e06e67134 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -8,5 +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 2864 BLAKE2B 3363a8ca104efcf6c81cc96b78a1b4263a639ba11c85eceae2ae4e36db70bb73ab5e7ca7e20c748963428e809e3662adc0cb88fa5c0076dc1cefcffb4a8cf981 SHA512 537ec6e9c8841d2192c3e0c984b7d38e436a8d22172f8c4effbfdb67b3dba1da6fc3104c012786cdd6352faf69a152eb097f85b70925099fae983caa3aa8b0fb
+EBUILD pinentry-1.1.0-r2.ebuild 2857 BLAKE2B e56f945db99dbd41278ec407d606662da157227a2fd25320a49f58fddf0280d7a61f2b8d2d1a3b48c9b7a665c3d8ab719f3a61d87684fad99a7c67d335c8b729 SHA512 48c7a152adfa0ca2fe342c0107d6cf9a8ebb82bcd678d77f5d99b02558b0fa3764ce172e3aa5af515e6fc75ec4bf5b0d02428483abd4630b9d2b1ee58c8270ce
+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 afc5e7f970cd..7c624a0187c4 100644
--- a/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild
+++ b/app-crypt/pinentry/pinentry-1.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
@@ -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/pinentry/pinentry-1.1.0-r3.ebuild b/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild
new file mode 100644
index 000000000000..82e3443aa1b3
--- /dev/null
+++ b/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic qmake-utils toolchain-funcs
+
+DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol"
+HOMEPAGE="https://gnupg.org/aegypten2/index.html"
+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"
+IUSE="caps emacs gnome-keyring fltk gtk ncurses qt5 static"
+
+DEPEND="
+	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] )
+"
+RDEPEND="${DEPEND}
+	gnome-keyring? ( app-crypt/gcr )
+"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="
+	gtk? ( !static )
+	qt5? ( !static )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.0-make-icon-work-under-Plasma-Wayland.patch"
+	"${FILESDIR}/${PN}-0.8.2-ncurses.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	[[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11
+
+	export QTLIB="$(qt5_get_libdir)"
+
+	econf \
+		$(use_enable emacs pinentry-emacs) \
+		$(use_enable fltk pinentry-fltk) \
+		$(use_enable gnome-keyring libsecret) \
+		$(use_enable gnome-keyring pinentry-gnome3) \
+		$(use_enable gtk pinentry-gtk2) \
+		$(use_enable ncurses fallback-curses) \
+		$(use_enable ncurses pinentry-curses) \
+		$(use_enable qt5 pinentry-qt) \
+		$(use_with caps libcap) \
+		--enable-pinentry-tty \
+		FLTK_CONFIG="${EROOT}/usr/bin/fltk-config" \
+		MOC="$(qt5_get_bindir)"/moc \
+		$(./configure --help | grep -- --with-.*-prefix | sed -e 's/prefix.*/prefix/' -e "s#\$#=${EROOT}/usr#")
+}
+
+src_install() {
+	default
+	rm -f "${ED}"/usr/bin/pinentry
+
+	use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt4
+}
+
+pkg_postinst() {
+	if ! has_version 'app-crypt/pinentry' || has_version '<app-crypt/pinentry-0.7.3'; then
+		elog "We no longer install pinentry-curses and pinentry-qt SUID root by default."
+		elog "Linux kernels >=2.6.9 support memory locking for unprivileged processes."
+		elog "The soft resource limit for memory locking specifies the limit an"
+		elog "unprivileged process may lock into memory. You can also use POSIX"
+		elog "capabilities to allow pinentry to lock memory. To do so activate the caps"
+		elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of"
+		elog "your users."
+	fi
+
+	eselect pinentry update ifunset
+}
+
+pkg_postrm() {
+	eselect pinentry update ifunset
+}
diff --git a/app-crypt/xca/Manifest b/app-crypt/xca/Manifest
index 246e64722284..8da4dcb8edea 100644
--- a/app-crypt/xca/Manifest
+++ b/app-crypt/xca/Manifest
@@ -4,5 +4,5 @@ DIST xca-2.1.0.tar.gz 1055745 BLAKE2B c3ea2953be7cacb8c4c6fb6911f2e51806d40f294d
 DIST xca-2.1.1.tar.gz 1055613 BLAKE2B bb6d6b4742c7a799bf1a65e1ed2f8ab8b4d695e717e630600bc22f0e0d4a9ae95d5d98d3e85ccfbdd07eb08cf7dba6b94c702790e21fe4899fce8fc33e4f7154 SHA512 e7c3fdb515bb7a719a775b97efcabe71dc1ccc31a7ddd7cb1a9543fb16d131bce180917418091927334a4dd169daef919a4d9476a29ab4355688c961e3340dd3
 EBUILD xca-1.4.1.ebuild 1206 BLAKE2B efe75fe96b26d9179bcb51365e5dd67be4e952629c9961e93522a576d4c233dfba2d1aafb6bc86eb5832efa16e7c869e1bda274847028756bf0ea939caa88b49 SHA512 692b76cd35fe8928890017bedfbebcb99d692bf1efc07f39230561240cf2e70acf021418c634f13f985e35a17b54727a58e537f309a3ddf0fd885267cbd80d74
 EBUILD xca-2.1.0.ebuild 1453 BLAKE2B b892c63cf6df72362d5a0fcef1a6b4f3679116ea3cfdcbffdf6a9b738fc9a0c3fee77f0095754d6bc2662949bf988b9a34506e44788c898909602fd0295a8bef SHA512 0f082f78fa1defafe7b3125226908115c9672b170d26cd2b6d91e98d0e2e0a8c7b4212a6344978a53f5ad7db77fef9ac10b023152a91d10142237c886daea712
-EBUILD xca-2.1.1.ebuild 1453 BLAKE2B b892c63cf6df72362d5a0fcef1a6b4f3679116ea3cfdcbffdf6a9b738fc9a0c3fee77f0095754d6bc2662949bf988b9a34506e44788c898909602fd0295a8bef SHA512 0f082f78fa1defafe7b3125226908115c9672b170d26cd2b6d91e98d0e2e0a8c7b4212a6344978a53f5ad7db77fef9ac10b023152a91d10142237c886daea712
+EBUILD xca-2.1.1.ebuild 1453 BLAKE2B 0dc3fe49d50d9a668918e5fc02517f41323dd3c63afea9581dc7807d4f5d535ce2b35158e3bd33561eeb8d481f9454a669c44a5816f59f91e9d8bbe7d856e653 SHA512 e66d97e9b0280d00f88ab9d7afadd6d322e1b6027763c5942d1eaba8b6bd964e959bd8b748bd8e78500374bd3cea9e9641c01744bbe29508bd21ad88d7c7c6b6
 MISC metadata.xml 313 BLAKE2B 6e1376d870ee5ab083ed80dcc19c1acd60d487e285e9bdba7b92c13e97cb05a3a6fa8bc4c6107d5d54470e6ca93889fca15c1a2f7e690a169ca7aff64bd2499e SHA512 ebc38746afd94878384ef0e4d7933e2a7433216716b1854cfc0227c3f0abf0847d784d36de4b04a778743e442298abd3769329deecdc771003681ecd3dbf3fa1
diff --git a/app-crypt/xca/xca-2.1.1.ebuild b/app-crypt/xca/xca-2.1.1.ebuild
index 083396d5b9ed..34566357ce3d 100644
--- a/app-crypt/xca/xca-2.1.1.ebuild
+++ b/app-crypt/xca/xca-2.1.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit xdg-utils
 
diff --git a/app-crypt/yubikey-manager-qt/Manifest b/app-crypt/yubikey-manager-qt/Manifest
index 272090fc11d4..c0fd367fd66b 100644
--- a/app-crypt/yubikey-manager-qt/Manifest
+++ b/app-crypt/yubikey-manager-qt/Manifest
@@ -1,7 +1,9 @@
 DIST yubikey-manager-qt-0.4.0.tar.gz 183566 BLAKE2B 2364d0d257ab5c05d0555aba4bb01ee1639a2c3a42b47173ae905945a6265b123985ad7d8fe50b0cfd38a1a0a588f3e1424aa46585ddbf50337ce2456899067e SHA512 12cef9636f06a92fdb3fce7cea5b97af3255b9cdd1b4feb4e184999eb77c17e465db927f56cd0e443a8ce8afc27b7e4be19ed07da7c41259f909ac4e98971de2
 DIST yubikey-manager-qt-0.5.1.tar 655360 BLAKE2B 6b109190750bd9675e32c836831a7e0ea286021303deffc64a351f2a127f5a5ee0190e3ca99abf0407bbb34a1a1c454f453fab464de2726f6cae539d5f865da1 SHA512 a8ceab5fd8d20eca2424d3f9a92ad12066e8fc26a7640df478965e5d9e2896fbc64885b26f599fcb2588f5b64d2f046af373f87e23ef266178ddf877e422ed36
 DIST yubikey-manager-qt-0.5.2.tar.gz 337194 BLAKE2B d6020116b9082671c039b521bbeebe7c1f0be022e233abbf8d6d788ea94e69e5f88aa3d6ec26a7b2edffa698327bb049e83ce54db2e0ba2ed1ad1dd536ab0961 SHA512 29265a10ae1dfe14dfdf4f1ba225516bf3bcbeb0115ca81696a4c5c506e957d6a99b0bb11a608e3175df99b8c04e8ae9250d5d42aab2b44b633d18fd2fc4c227
+DIST yubikey-manager-qt-1.0.0.tar.gz 8038084 BLAKE2B 9e1082be62dab2d43bfad3050dd38dbcd10e5b8761bf567ba4f3e1b4627a25709cfa29ac7a23560fff76e0a75b4668932a407268c8d90d791c381ad485fea029 SHA512 2cf5f70b2734a7c0346649f5419dbee39bef9bb80bb498631d4879abc48d422d70468713a48945e284f2bdef20f3bb570a0ac5a4daab6c1ff195d86e39168843
 EBUILD yubikey-manager-qt-0.4.0-r2.ebuild 1211 BLAKE2B 50e1f5f13343fd19b9b871f3c15a62bdbdeebddc9721d9aa7ac81de7c3312811d7cec0985e1063fdfa9d13b542cb03e0eace12c01d40c248df04c940fb2cb2d0 SHA512 d0511a033597c2e901736aa73b6b840fec03adabdda384a026ad4047be0d5ad0a3373ea2519b62e91efb0d864129d5d14a571a351ffc03477b899349985da64c
 EBUILD yubikey-manager-qt-0.5.1.ebuild 1445 BLAKE2B b11dd07d657c4e61f284d733ddcc71a3a2a0860a39b0a8d6ae9f3895cda38922dacb3816cd4464c91664f456e8edaf2b06175a07b1c8ad0d68cc2a616f00c881 SHA512 6beafa82aa84056534d0a99dac7438da46f7d9fd3328b220c39fed6da7da6c24239c8d2e68c48a994d6b691d4fc7ea832fae953243b6138df078ae16e0d226d2
 EBUILD yubikey-manager-qt-0.5.2.ebuild 1410 BLAKE2B 7da065e45b89bc70d7e3a577f9312bd6a955ad071fbc066c7401773fa9defe49aed871c3e4db7b6931309eff67a5a470014459a09c78568c159a582b9ae85d6c SHA512 d18d8da49e4080a2f84ac3ea1c800002d40eae7a584f35a430f3571a65b1e792b4e0f9275065dd392332d94998cd59c50183bf25bcfa310c3340adbb584c2376
+EBUILD yubikey-manager-qt-1.0.0.ebuild 1391 BLAKE2B 3df21aa74bea18bae177f2eb91fefe3bbf509698020167734de3406574d8c927f2997c75d70685cd3fd67f946284a10b06ff4d55042df6a69354fef00c070f22 SHA512 e67a0f971fa57843745d2c129566fd767e5bc6718d414040a3a460707053d5e638373dad884875d00ba70140020c7e1dfe5db3ee9abb551407a950b2814d920e
 MISC metadata.xml 257 BLAKE2B fd7fdb57fdce3a565a08cedc4d99216724e4013515d77ea89cb41a5c01e8f5479cab25fe53d44a705e3a71164cdc3c93e658e61deae654a13e5c2471dd83c57c SHA512 35e59430f93d3bb2e7e3042a2464b84f8e6cdf1e1624c1e7674bfc5147f9b9694da6b39ac081ed5fc22f1623aea889b743cfee11007911f3c8c17cf61443675b
diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.0.0.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.0.0.ebuild
new file mode 100644
index 000000000000..7412d412984d
--- /dev/null
+++ b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.0.0.ebuild
@@ -0,0 +1,57 @@
+# 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 eutils qmake-utils python-single-r1
+
+DESCRIPTION="Cross-platform application for configuring any YubiKey over all USB transports"
+HOMEPAGE="https://developers.yubico.com/yubikey-manager-qt https://github.com/Yubico/yubikey-manager-qt"
+SRC_URI="https://github.com/Yubico/${PN}/archive/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=app-crypt/yubikey-manager-1.0.0[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pyotherside[${PYTHON_USEDEP}]
+	dev-qt/qtsingleapplication[qt5(+),X]
+	dev-qt/qtgui:5
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtsvg:5
+	dev-qt/qtquickcontrols2:5[widgets]
+	dev-qt/qtwidgets:5"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_prepare() {
+	default
+
+	sed -i -e "s/ykman-cli//" ${PN}.pro || die
+	sed -e "/qtsingleapplication.pri/d" \
+		-e "/CONFIG += c++11/a CONFIG += qtsingleapplication" \
+		-i ykman-gui/ykman-gui.pro || die
+
+	# See: https://github.com/Yubico/yubikey-manager-qt/issues/54
+	echo "${PV}" > "${S}"/VERSION || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+
+	domenu resources/ykman-gui.desktop
+	doicon -s 128 resources/icons/ykman.png
+	doicon -s scalable resources/icons/ykman.svg
+
+	einstalldocs
+}
diff --git a/app-crypt/yubikey-manager/Manifest b/app-crypt/yubikey-manager/Manifest
index 45c46dd65960..8dfb991f349d 100644
--- a/app-crypt/yubikey-manager/Manifest
+++ b/app-crypt/yubikey-manager/Manifest
@@ -7,6 +7,7 @@ DIST yubikey-manager-0.6.0.tar.gz 77823 BLAKE2B 37d9a7e72135ba859521f209896c4742
 DIST yubikey-manager-0.7.0.tar.gz 83385 BLAKE2B cd0c440f8ce81549e52dd8e546d82678c19d95d2257c878b48d69719031317943bcca4ee713c03ca8f3fa1de4363df629b09b005955a1217adb2dc5ce89400aa SHA512 0fec23dafd2502a1508648fc96f1dcc873eaf3ad089f87b1afd94b35391513ad3a799985fcbc201c2fb4a3a3e473d24483c04a6862117d211c4cb6b294f74be0
 DIST yubikey-manager-0.7.1-test-files.tar.xz 9756 BLAKE2B 5a2e2a2a58d04c8f9954c1d13d0892b4f7392785d6e83e6948e720606318860b93e70862cee0ee7f987c14c3fa49bb7ff20cdf2a5bfc09c1f08681346428c003 SHA512 7543a9e9cfbe7f9ec02c98397f5cbd77cb307d79985a4b060176ee26605767e74d8b18d4c036ff90aed9a0232bb1382908c75e876a911c2ceb35a12666699b94
 DIST yubikey-manager-0.7.1.tar.gz 71834 BLAKE2B 45b0366531c8a158b3d8ebcfa8b76d608c14dba02224d4e4962c3757446829e3dff5f5e0d0ceda67caab7c67ad0510e037770c58a50552c2c6971136cb75c806 SHA512 3e9105f1c033f9314b90cf209eb52f7879fa1ea69e9ae6dac8de0b24d7d2ff6e45b6dd530917535fa645d6eea461f5b4f23bb8deb103ffc27d1f3483cfa681c7
+DIST yubikey-manager-1.0.0.tar.gz 90653 BLAKE2B 5d8522181ad460521995d3cae63976e06a444816a24efdc83b526d50262c902c8cc76b29d43f6f07725ee714666c853b690f1dd6fe98c9409f0cc1e722ada6f5 SHA512 9fd1926bf4e2c1278a42136a05db3e5fe0b7cb3d740f601fd0a420ab851badb61c2dd165157ac5b1f47e934f771b9d0b3cca4e07d1772d0f743556d482f77c11
 EBUILD yubikey-manager-0.3.3.ebuild 736 BLAKE2B 4d8cbfd4942f9dbca49240ed76c701d2bcca2e23aa3ffdb0f5346206938ee21fa003a197161e909a14c5d08b54956ecd5aefb659f363e7ff86d1e4994f23c685 SHA512 16b96e49659f6a5a4b9b3e90a61896de9d6cbcf991e2d9a44df81c48be8f7936f5de7aec380538cbc8ed034b54617928b456b53a2c322631dda476c6e6fe2d8f
 EBUILD yubikey-manager-0.4.5.ebuild 858 BLAKE2B 4218bcdb0c21ac2624282e8d174b74080b74cc0c62d0804e836dfe6d08dec99866af2d500c27837181e7574d0abecc4c97a8f565867ecf3adbae5ef2a1bfa3aa SHA512 25ace32bacc3ea4dafcc330222cd21b327e859ce138a4a2be4f07a322860dbf503ff00f9b32cd282ff8a97ade6aac59b4b9230ec23cf78b583bec490a614ed79
 EBUILD yubikey-manager-0.4.6.ebuild 858 BLAKE2B 4218bcdb0c21ac2624282e8d174b74080b74cc0c62d0804e836dfe6d08dec99866af2d500c27837181e7574d0abecc4c97a8f565867ecf3adbae5ef2a1bfa3aa SHA512 25ace32bacc3ea4dafcc330222cd21b327e859ce138a4a2be4f07a322860dbf503ff00f9b32cd282ff8a97ade6aac59b4b9230ec23cf78b583bec490a614ed79
@@ -14,4 +15,5 @@ EBUILD yubikey-manager-0.5.0.ebuild 858 BLAKE2B 4218bcdb0c21ac2624282e8d174b7408
 EBUILD yubikey-manager-0.6.0.ebuild 1206 BLAKE2B 108de94576641f16b0a706d50c6d313ce14f437416bc05fffc3593ae37024d0043f323b13a0f6e31564307652a34ba5c057f8932d79c6a2fefea7035e68dc225 SHA512 6e5d43facf6e57595d118bab7402d75504073a39a21c06475add9cb50682fc45518d8179ee90fec4c6bb2bc6cf326cd03448071da81f7be6688d76625d418c3a
 EBUILD yubikey-manager-0.7.0.ebuild 1434 BLAKE2B 0109266dcac3d0a2e3f99f10858c5a9637f23d97d9a909e49a8f8b984511a14f9a1d06b8f6d1b2f8b414fef96ce73aae982016f575a69e8074eadbaf8d7921a2 SHA512 5fb2ea58c782336d6730ab5295fc008c8b87d3ac72fb43b10c0c54a0885755b00bd641160d1491686b4cca5a7293af0fd74a17ba8cc60afe9fae39da16abdb0c
 EBUILD yubikey-manager-0.7.1.ebuild 1579 BLAKE2B 65991c1ec1c6acc26baac225043924eb7dd5fdcad0e99d8ba26931ef9da0318dd47ca9a5f602c75c3fb35eedfc0a275695231b5a03e191c9c30a323ef89bf95a SHA512 d24bd03dc385339b96e36fc8056e4044233b784ad73a9464ae2eb797d5ac48bef907e3c27a63125c34c41b8578f8a98c03f9b3cc18db263c3ad656724f532ba3
+EBUILD yubikey-manager-1.0.0-r1.ebuild 1529 BLAKE2B c6e82a3279aa4ea3a179df00c95f53d41626ff825b9c0e43da9670fd724ac8e3156ef54056b2b70c951dd73e0d8b4bc5594cedea16270e034a6cbd92233cfc8c SHA512 ccae1748ac051677ff46517a88e18affaadda2508dd05c261a0a0377d7f75cbdaaa5b114c70a74e5195ce8c9624cdb820c3f883dcd1be74f8046472614ba453c
 MISC metadata.xml 466 BLAKE2B 258688bf55e0d7d5d13a45996c2177d2154626a75ffd0c5b39cbc5c3f83979a00ec1d9a993870c00785d0e1d02cdeb1dadfa38f39d91b5992c5b495f644c6253 SHA512 6355c94235c5a7a9dbe37fb954d7de5807bbd48d62921f819da7ac1c56f0214820cbf74b2f91311573f8a1726b05960d944b536fbf0e0f27fe49a5aa0a827e1b
diff --git a/app-crypt/yubikey-manager/yubikey-manager-1.0.0-r1.ebuild b/app-crypt/yubikey-manager/yubikey-manager-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..a92231ecbaeb
--- /dev/null
+++ b/app-crypt/yubikey-manager/yubikey-manager-1.0.0-r1.ebuild
@@ -0,0 +1,60 @@
+# 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 readme.gentoo-r1 distutils-r1
+
+DESCRIPTION="Python library and command line tool for configuring a YubiKey"
+HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz
+	test? ( https://dev.gentoo.org/~gokturk/distfiles/app-crypt/${PN}/${PN}-0.7.1-test-files.tar.xz )"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+	dev-python/fido2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/pyscard[${PYTHON_USEDEP}]
+	dev-python/pyusb[${PYTHON_USEDEP}]
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
+	>=sys-auth/ykpers-1.19.0
+"
+DEPEND="
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2_7')
+	)
+"
+
+python_test() {
+	touch "${S}"/test/__init__.py || die
+	cp -r "${WORKDIR}/files" "${S}"/test/ || die
+	esetup.py test
+}
+
+python_install_all() {
+	local DOC_CONTENTS
+
+	distutils-r1_python_install_all
+
+	DOC_CONTENTS="
+		The 'openpgp' command may require the package 'app-crypt/ccid'
+		to be installed on the system. Furthermore, make sure that pcscd
+		daemon is running and has correct access permissions to USB
+		devices.
+	"
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 68b0be0bc068..b7549c7f8179 100644
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
diff --git a/app-dicts/myspell-el/Manifest b/app-dicts/myspell-el/Manifest
index 46f2bdcce3e5..5adcaba6e5d4 100644
--- a/app-dicts/myspell-el/Manifest
+++ b/app-dicts/myspell-el/Manifest
@@ -1,6 +1,4 @@
-DIST el_GR-0.8.zip 1532950 BLAKE2B a68eb9ad9819b4d5192cac1276a0e3a6e44dd9e89857ff208d5ff4883a26a8b4eac16c0de7a999c068aa60299d1cda9fa2149f25fa4dc672a56d065b8946556a SHA512 b8209890259dc0c003cf3219363f2270eb879cc8b6f34752b1b49ce07cd7461e0d948faf39b5b54760ad36c29264632f0fa2b4c91fec40d3e44cebf3789c42fb
 DIST el_GR-0.9.zip 2120747 BLAKE2B 5fe5030227b3f65bf04a7ecf055c5159120badae250ef8c718836e6115238b12391f82a656767313338ece98bce91e099d6f12f7e9e9f2f202dbdd6a14bfb6ba SHA512 8eb9d951bab3caf09f53e7ee98ff155ade8d9198533264ebdd53b413e38d9b84e5101938c1abb3e220e0764c98186fb2f5480be50e98e7effb7bcc8c961eaa49
 DIST hyph_el.zip 2224 BLAKE2B eb5c5ba1b856a9edc5bb78b583af442ccdacc3d7270b1e1d61081382b195fcc3637ef83a4e35eff79146a21360353145128adabfb494976a6998f1dbccfd062d SHA512 259a1ad3b4f38cf6aa67027cd3354488b298375450ed99b07e4ea8d355e90211caabfc40ce71af73e5d354348541bf8a486aecced23f75a4fe9abb8f6c2ac3c3
-EBUILD myspell-el-0.8.ebuild 587 BLAKE2B 549231b3cf9137f9665d979b08d3311def6102ce78e5db90efe5d941efb2c23613ff4b2d1f7669d99419177ef1f12b5feda3cd038299dc2b8800d9359cfdf2e1 SHA512 8dbb9395341c61facaa456a064784d0ebf524427435588429aac8bec2b43d6f413728a9194b7335702cd9052c6259d125ad6d7ef0ac1fbb773018b28caaac737
-EBUILD myspell-el-0.9.ebuild 597 BLAKE2B a01ae02b7eeba4580711757ecea2d672df185b36d671d99c4a5bb0233ca5abec3a63fb0ad22a315afc680c0caa63d07116d0f96f8410704818b4173334910b9a SHA512 2e8160f79064234c2b94e5f42799c4196b1c6d8f316ee36602db73cd12f174863be2fdaebc8bffc9de41e01685646a2e68b98ab0bb6d32c114169e8e35a21cb4
+EBUILD myspell-el-0.9.ebuild 593 BLAKE2B 384fdfa5d260c1e94442d236c65c566bdf451ea61d9b66d08bb70c799d75316d867e1672cccc5061d4f11f8d2894813cd9fbac0007e7182194936e18846cefcd SHA512 cef32f05855413721108900eafe3da63f2b576e87c9058bf246bde04b7a4648e6340cc6948d29134e31e27bf261d95c37c6e040f089deca31b0eb6c490146b83
 MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/app-dicts/myspell-el/myspell-el-0.8.ebuild b/app-dicts/myspell-el/myspell-el-0.8.ebuild
deleted file mode 100644
index 07fe0b1dd190..000000000000
--- a/app-dicts/myspell-el/myspell-el-0.8.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-MYSPELL_DICT=(
-	"el_GR.aff"
-	"el_GR.dic"
-)
-
-MYSPELL_HYPH=(
-	"hyph_el.dic"
-)
-
-MYSPELL_THES=(
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Greek dictionaries for myspell/hunspell"
-HOMEPAGE="http://www.elspell.gr/"
-SRC_URI="http://elspell.math.upatras.gr/files/ooffice/el_GR-${PV}.zip http://elspell.math.upatras.gr/files/ooffice/hyph_el.zip"
-
-LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/myspell-el/myspell-el-0.9.ebuild b/app-dicts/myspell-el/myspell-el-0.9.ebuild
index 8dbdf612d1ff..62286feda3d5 100644
--- a/app-dicts/myspell-el/myspell-el-0.9.ebuild
+++ b/app-dicts/myspell-el/myspell-el-0.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
@@ -23,5 +23,5 @@ SRC_URI="http://elspell.math.upatras.gr/files/ooffice/el_GR-${PV}.zip http://els
 
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 1f2836bb1beb..4ac4fc6eafb7 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 1758a4b78516..f86c74b6ebbd 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,10 +1,7 @@
 AUX doxygen-1.8.12-link_with_pthread.patch 1078 BLAKE2B bcf05d8e2c56e4c5a026ea8e8662e247aa48fb4c3ffeb2a26799ae98f1bbd1a9f9cfc55bcad4b9d254d6067fce8e51990ab9cecfcfa6fa9b1a9861c085525966 SHA512 01173974a66a4b6214f6506f9f9009da2ae3ee1b6f424763dfc2b1ce96293e71b463b1afb4c6ccdeac299c66132bbf6d3ee7fe543f1251ff429107f8b4017831
-AUX doxygen-1.8.13-NULL-dereference.patch 867 BLAKE2B c8202a4cb59115f0e9cba80bdd3fc1283226bded40f40233a5c0a6f32adaa433c56f662f29441d60fed2a4b1633bc603102d22b56f09f45522ff3f94fdc85335 SHA512 e0dc00095d3955fd171e554d0984a3d41b02643da0fa64c0f2815cc16b8cdbf0645e848507e7f100ac6ffb0e3712ca2bbec7e1a81091177e39555bde0b5e3f12
+AUX doxygen-1.8.14-llvm7.patch 858 BLAKE2B aec2e43c92460e4ff90f3ef9c275a40861b5692f3b999bbe1ddf9eeae2e7a75751582e513e9ba2a2ca6f06f50bccc6c939ec211a879111961abb09882bb8e12d SHA512 c43e295cf7b31e7bd4374c105a9f41622dfeca6326de85a9ba62cbe0907cd7526a8393afbea380c5c662235b09aba1460f0b50a9d9cbc86fe0c9830c9dd1ca10
 AUX doxygen-1.8.9.1-empty-line-sigsegv.patch 489 BLAKE2B 747825ab555b28642fc607980896e3a2f71f27c739a1e2e3afca28beb37ffccf8bf7cccc0bc250a4938c84d5caa5c05d4347496dc754a4cb28b5f506a838e6c6 SHA512 8b9d70fda66eae1fd871fbf29b7587d8f3872810f4b6b7b570d8fd8711a0a0fd84257798261db2c6a7aa7efd8874cf18e1056e67f53d6ec2bd3720cfd0f572ef
-DIST doxygen-1.8.13.src.tar.gz 4893912 BLAKE2B 3eb7eb6e7d122f681a9af8caf8a33789d323d52a5c205a3c44a7953eec78f4b227062da3e71c09de443aa6ac5c780937218c3a8c9ddf06d3eb23200a33b7406f SHA512 85da5bd28ad9f33a8e50fa92796817d31e59c024127cb647cb967e4321dd51378feaacdf099d578b7e6020fd646a3c63e99c77420e49e3894fc18ca89ba3e0a2
 DIST doxygen-1.8.14.src.tar.gz 4877980 BLAKE2B 9886e5165188548e0c8a3760a53709615385ab175795d07156584f3878996c8c5f18e439b6e45352a32ba5cd40e9b7fdb29cdf86511e1be70b18315069e33377 SHA512 5fac7e457a51b1f8e39fb65de5e0c07633e573f74e876580e7bcad5693540d6970fde1b2cb799a4df6ab9dfca951ece15b76b3010134d7658db3500183bea85c
-DIST doxywizard.png 4231 BLAKE2B c71e30fee273c7410bc6b65e171a864066e088d474785f5e24b5500806af1217a6e12e93c5b81a488e2d216bfa59aeed332a092515dbbf8b640d8f7320dda50a SHA512 5e2d26e7427b86866ebe75ec2c66c0f1100d230f3f3e4d66bac424a8dd0d42f0831d936ff03318dfa1bf73cbd9fb53717636d0c91ae3eea0f4e24641479d25d5
-EBUILD doxygen-1.8.13-r1.ebuild 3743 BLAKE2B 27ff1130731c6205ba3332a00a5b2d5175e3f5980ffffdb8dec65ae8ff1ad2893f48dca1ca77d07eb7be1b8d03509e17b752b02b44fce10601705af6b6c93f38 SHA512 aa8d218d2044b769787a82482a0483b219e17c656c3e8ad806fdda2026430bd63654113676caee8572bfeb1bc82aae6f54b55f0dee9e7b0ca723f1fb773352d2
-EBUILD doxygen-1.8.14-r1.ebuild 3065 BLAKE2B 1671edff9b1cd246347ba57cdadf6b94852abff5a2a65fecb348eae4ad4052b204e6fe51ae1231dd260fc53a2048e3817d5cea2b02e9c21477e5d7d1ddfb2ae2 SHA512 684e8c6f3409b840254c6599b87bc67b17ed5e9a41bf90b9112419d0c0a62b6de4316efd1f45e7a1929e1474e40e42bfd1b5b159e4f79b6a55a3d5a55702614c
-EBUILD doxygen-9999.ebuild 3097 BLAKE2B 6bd1e6c6fd59342bd060f4b4dcfe19997ade7cd570401d8306c67b49eabc9487af84ddb768682d749d2ac045072cbc33f28ccce3fdffbca8e971f1be733c9c05 SHA512 84a7175f62eac4cc2af66cf24e395e53779c2e0ed776aab3d6a0dcba0efc97ef20f8bb2c7b1c64fc7341f0ab333c0a0d6872a82e52dc5b4ee26b00065eada392
+EBUILD doxygen-1.8.14-r1.ebuild 3112 BLAKE2B c67fca40e309eb29b18fc982ff2e90a5eba9358d28ed78a2fd65a80e21a029b7f5f6efc8ea2ee304402acec9f5203960ee14ed4e58a43eff4919f012fca180ca SHA512 a22f0f29b0eaf2a8fefcb6c2cfccd2faa4312c91cfeb35bc05f28902046086baddc5d7e05a972dfaf394508d43c5f0661a646595ef93b7fd791058b1428376f5
+EBUILD doxygen-9999.ebuild 3094 BLAKE2B 38b34c1cdcd21317af407421b426fd35cccbcd5239c32651acbad713d94e92e2e16abaf7b8b2651158f24121a67f882a631dd81db010fe859e6faaf619711b2f SHA512 13e1d112c6fdab0fc7a6b7fed37d6f174da2c4001315d19f57b647f67ebb014fc513f0b580c23afa2cf5eb7fc3f12adee9e76b3b72a5d718a47e03c1dcf0d127
 MISC metadata.xml 891 BLAKE2B 175ca40e223a340b42e5446db6441e7b5a3d273b4457b47a5715911fc0c3ab7ffe24400e472a43182c20fd274404b6d542ba1ac697c7cb8dc0d099c7debba7a6 SHA512 951c1c9ce4096fa8ae4a01959ef4b8d66388d31ad07604e44df2ad5f689fc586d8d915fcedcd89731ba87ece080c4305a2ccf409ef87993017fa285f43196d61
diff --git a/app-doc/doxygen/doxygen-1.8.13-r1.ebuild b/app-doc/doxygen/doxygen-1.8.13-r1.ebuild
deleted file mode 100644
index 980992918892..000000000000
--- a/app-doc/doxygen/doxygen-1.8.13-r1.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} )
-
-inherit cmake-utils eutils flag-o-matic python-any-r1 xdg-utils
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
-	SRC_URI=""
-else
-	SRC_URI="https://ftp.stack.nl/pub/users/dimitri/${P}.src.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 ~x86-macos ~x86-solaris"
-fi
-SRC_URI+=" https://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png"
-
-DESCRIPTION="Documentation system for most programming languages"
-HOMEPAGE="https://www.stack.nl/~dimitri/doxygen/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="clang debug doc dot doxysearch latex qt5 sqlite userland_GNU"
-
-RDEPEND="app-text/ghostscript-gpl
-	dev-lang/perl
-	media-libs/libpng:0=
-	virtual/libiconv
-	clang? ( sys-devel/clang:= )
-	dot? (
-		media-gfx/graphviz
-		media-libs/freetype
-	)
-	doxysearch? ( =dev-libs/xapian-1.2* )
-	latex? ( app-text/texlive[extra] )
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	sqlite? ( dev-db/sqlite:3 )
-	"
-
-REQUIRED_USE="doc? ( latex )"
-
-DEPEND="sys-devel/flex
-	sys-devel/bison
-	doc? ( ${PYTHON_DEPS} )
-	${RDEPEND}"
-
-# src_test() defaults to make -C testing but there is no such directory (bug #504448)
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.8.9.1-empty-line-sigsegv.patch" #454348
-	"${FILESDIR}/${PN}-1.8.12-link_with_pthread.patch"
-	"${FILESDIR}/${PN}-1.8.13-NULL-dereference.patch"
-)
-
-DOCS=( LANGUAGE.HOWTO README.md )
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Ensure we link to -liconv
-	if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then
-		local pro
-		for pro in */*.pro.in */*/*.pro.in; do
-			echo "unix:LIBS += -liconv" >> "${pro}" || die
-		done
-	fi
-
-	# Call dot with -Teps instead of -Tps for EPS generation - bug #282150
-	sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die
-
-	# fix pdf doc
-	sed -i.orig -e "s:g_kowal:g kowal:" \
-		doc/maintainers.txt || die
-
-	if is-flagq "-O3" ; then
-		ewarn
-		ewarn "Compiling with -O3 is known to produce incorrectly"
-		ewarn "optimized code which breaks doxygen."
-		ewarn
-		elog
-		elog "Continuing with -O2 instead ..."
-		elog
-		replace-flags "-O3" "-O2"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDOC_INSTALL_DIR="share/doc/${P}"
-		-Duse_libclang=$(usex clang)
-		-Dbuild_doc=$(usex doc)
-		-Dbuild_search=$(usex doxysearch)
-		-Dbuild_wizard=$(usex qt5)
-		-Duse_sqlite3=$(usex sqlite)
-		)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc; then
-		export VARTEXFONTS="${T}/fonts" # bug #564944
-
-		if ! use dot; then
-			sed -i -e "s/HAVE_DOT               = YES/HAVE_DOT    = NO/" \
-				{Doxyfile,doc/Doxyfile} \
-				|| die "disabling dot failed"
-		fi
-		cmake-utils_src_make -C "${BUILD_DIR}" docs
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use qt5; then
-		doicon "${DISTDIR}/doxywizard.png"
-		make_desktop_entry doxywizard "DoxyWizard ${PV}" \
-			"/usr/share/pixmaps/doxywizard.png" \
-			"Development"
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	elog
-	elog "For examples and other goodies, see the source tarball. For some"
-	elog "example output, run doxygen on the doxygen source using the"
-	elog "Doxyfile provided in the top-level source dir."
-	elog
-	elog "Disabling the dot USE flag will remove the GraphViz dependency,"
-	elog "along with Doxygen's ability to generate diagrams in the docs."
-	elog "See the Doxygen homepage for additional helper tools to parse"
-	elog "more languages."
-	elog
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-doc/doxygen/doxygen-1.8.14-r1.ebuild b/app-doc/doxygen/doxygen-1.8.14-r1.ebuild
index 4c7544e05324..dce8fc8f3c85 100644
--- a/app-doc/doxygen/doxygen-1.8.14-r1.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.14-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
@@ -30,7 +30,7 @@ RDEPEND="app-text/ghostscript-gpl
 		media-gfx/graphviz
 		media-libs/freetype
 	)
-	doxysearch? ( dev-libs/xapian )
+	doxysearch? ( dev-libs/xapian:= )
 	latex? (
 		dev-texlive/texlive-bibtexextra
 		dev-texlive/texlive-fontsextra
@@ -59,6 +59,7 @@ RESTRICT="test"
 PATCHES=(
 	"${FILESDIR}/${PN}-1.8.9.1-empty-line-sigsegv.patch" #454348
 	"${FILESDIR}/${PN}-1.8.12-link_with_pthread.patch"
+	"${FILESDIR}/${PN}-1.8.14-llvm7.patch" #666692
 )
 
 DOCS=( LANGUAGE.HOWTO README.md )
diff --git a/app-doc/doxygen/doxygen-9999.ebuild b/app-doc/doxygen/doxygen-9999.ebuild
index 0f8cc61578a8..34ade676fbae 100644
--- a/app-doc/doxygen/doxygen-9999.ebuild
+++ b/app-doc/doxygen/doxygen-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
@@ -58,7 +58,7 @@ DEPEND="sys-devel/flex
 # src_test() defaults to make -C testing but there is no such directory (bug #504448)
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}/${PN}-1.8.11-link_with_pthread.patch" )
+PATCHES=( "${FILESDIR}/${PN}-1.8.12-link_with_pthread.patch" )
 DOCS=( LANGUAGE.HOWTO README.md )
 
 pkg_setup() {
diff --git a/app-doc/doxygen/files/doxygen-1.8.13-NULL-dereference.patch b/app-doc/doxygen/files/doxygen-1.8.13-NULL-dereference.patch
deleted file mode 100644
index 8d72e8ff6e0d..000000000000
--- a/app-doc/doxygen/files/doxygen-1.8.13-NULL-dereference.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0f02761a158a5e9ddbd5801682482af8986dbc35 Mon Sep 17 00:00:00 2001
-From: albert-github <albert.tests@gmail.com>
-Date: Wed, 4 Jan 2017 12:24:55 +0100
-Subject: [PATCH] Bug 776791 - [1.8.13 Regression] Segfault building the
- breathe docs
-
-Protected against NULL pointer of variable al
----
- src/xmlgen.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp
-index fe95c7a..70e198a 100644
---- a/src/xmlgen.cpp
-+++ b/src/xmlgen.cpp
-@@ -620,7 +620,7 @@ static void generateXMLForMember(MemberDef *md,FTextStream &ti,FTextStream &t,De
-     if (md->isInline()) t << "yes"; else t << "no";
-     t << "\"";
- 
--    if (al->refQualifier!=RefQualifierNone)
-+    if (al!=0 && al->refQualifier!=RefQualifierNone)
-     {
-       t << " refqual=\"";
-       if (al->refQualifier==RefQualifierLValue) t << "lvalue"; else t << "rvalue";
diff --git a/app-doc/doxygen/files/doxygen-1.8.14-llvm7.patch b/app-doc/doxygen/files/doxygen-1.8.14-llvm7.patch
new file mode 100644
index 000000000000..86e6d7999418
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.8.14-llvm7.patch
@@ -0,0 +1,25 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 5c55efae..1ad32b2e 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -262,7 +262,7 @@ if (use_libclang)
+     add_definitions(${LLVM_DEFINITIONS})
+     llvm_map_components_to_libnames(llvm_libs support core option)
+     target_compile_definitions(doxygen PRIVATE ${LLVM_DEFINITIONS})
+-    set(CLANG_LIBS libclang clangTooling ${llvm_libs})
++    set(CLANG_LIBS libclang clangTooling clangBasic clangLex ${llvm_libs})
+ endif()
+ 
+ target_link_libraries(doxygen
+diff --git a/src/clangparser.cpp b/src/clangparser.cpp
+index 77151d6e..2ea15ee2 100644
+--- a/src/clangparser.cpp
++++ b/src/clangparser.cpp
+@@ -4,6 +4,7 @@
+ 
+ #if USE_LIBCLANG
+ #include <clang-c/Index.h>
++#include "clang/Tooling/CompilationDatabase.h"
+ #include "clang/Tooling/Tooling.h"
+ #include <qfileinfo.h>
+ #include <stdlib.h>
diff --git a/app-doc/gnucash-docs/Manifest b/app-doc/gnucash-docs/Manifest
index 3d9b53f9361f..6a28cd4c9b31 100644
--- a/app-doc/gnucash-docs/Manifest
+++ b/app-doc/gnucash-docs/Manifest
@@ -1,7 +1,9 @@
 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 1670 BLAKE2B f13f7fc2d51ee3c91c07d577c9245b8851ea3891ade3ee4e09756f793bf5babf469f1eb764c7cfa466790d894ce3b1add0ec93f184ccff9d6844380955ad38e9 SHA512 0fc4e16167f525c5aa1d9a6666cc23143b8068bd82c288e828c573554ec6a94d0fcaf41a6973d1eeecf31cbb51bc1041f57be456f04c55a21063711e2f1d59e7
+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.2-r1.ebuild b/app-doc/gnucash-docs/gnucash-docs-3.2-r1.ebuild
index 186406585218..b82237e7a151 100644
--- a/app-doc/gnucash-docs/gnucash-docs-3.2-r1.ebuild
+++ b/app-doc/gnucash-docs/gnucash-docs-3.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
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 
 for my_locale in ${PLOCALES}; do
 	IUSE+=" l10n_${my_locale}"
diff --git a/app-doc/gnucash-docs/gnucash-docs-3.3.ebuild b/app-doc/gnucash-docs/gnucash-docs-3.3.ebuild
new file mode 100644
index 000000000000..186406585218
--- /dev/null
+++ b/app-doc/gnucash-docs/gnucash-docs-3.3.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="C de it ja pt ru"
+PLOCALE_BACKUP="C"
+
+inherit autotools gnome2 l10n
+
+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"
+
+for my_locale in ${PLOCALES}; do
+	IUSE+=" l10n_${my_locale}"
+done
+
+DEPEND="
+	app-text/docbook-xml-dtd
+	app-text/docbook-xsl-stylesheets
+	app-text/rarian
+	dev-libs/libxml2
+	dev-libs/libxslt
+"
+
+my_l10n_get_locales() {
+	local l locales
+	for l in ${PLOCALES[@]}; do
+		use "l10n_${l}" && locales+=( $l )
+	done
+	if [[ ${#locales[@]} -gt 0 ]]; then
+		echo ${locales[@]}
+	else
+		echo $PLOCALE_BACKUP
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local doc_type my_lang
+
+	for doc_type in help guide; do
+		for my_lang in $(my_l10n_get_locales); do
+			case $my_lang in
+				# Both help and guides translated
+				C|de|it|pt) ;;
+				ru|ja) # Only guides translated
+					if [[ ${doc_type} = "help" ]] ; then
+						elog "Help documentation hasn't been translated for $my_lang"
+						elog "Will do English instead."
+						my_lang=C
+					fi
+					;;
+				*)
+					die "Invalid locale: $my_lang"
+					;;
+			esac
+
+			cd "${S}/${doc_type}/${my_lang}" || die
+			emake DESTDIR="${D}" install
+		done
+	done
+
+	cd "${S}" || die
+	einstalldocs
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	optfeature "You need dev-java/fop to generate pdf files." dev-java/fop
+	optfeature "You need gnome-extra/yelp to view the docs." gnome-extra/yelp
+}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index b92953f839bb..c2d8c0cbc9e9 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 25e81096012b..1d763237f733 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 11341 BLAKE2B cbfa201230d78f7b2c727000a7bfcf1663e9ef862c9cf3d2ed2f33f826e7ba11edcd361eac063a2cb0f5133c5408ee88dca00e9276d7742ce29dd6b862f73928 SHA512 47107d55cc04dcce47bf15d2ece2eeabbd0ef68934d52db3257978e0f844f49561b2b972272e1c6ad3d4cc41ffc2cf8282c3d1216fd9a929e796deba179c8bd2
+EBUILD emacs-24.5-r7.ebuild 11335 BLAKE2B 4ef016333217c51f118a96d26eca3425ebfe58b0cb404f9cf5854148776ff99c2f652ee64af6ae049edac14b46305113efa12b327206d65b6475a3fa95b1bf39 SHA512 f790bd6abc22ac56f3adccae5d75380f594fa4b02434b0c5e3a6d4fe5df08ae9994438ee7a7a3af12a3a806d0869b8ecd229cd2d3b6d9ff12fc970b43e402705
 EBUILD emacs-25.3-r4.ebuild 11753 BLAKE2B ab01076daf8c815a4bd7de83d652c8293219d9e4fb25002897527c0aaa87ac00c11f36a0c8a10e4e474629007950c67792ab3cd8e243cb046791fcba1fea19ff SHA512 dbae997b01fa892ce34dc554d1566e8c2a530c3246805b6028ebaf45cffdfb878e1fd98d827c0f6f3e37be52ae38b2929223161b234a5ed9e2dbfda6d786c191
-EBUILD emacs-25.3-r6.ebuild 11641 BLAKE2B ff98a8e3ed4143d72e9a22eaecd9efd09a889d879b8e644bc4eb571a05e48d5a5d6035c2a00e0a8e169041fba13d5523253ed9f9e4535c14870ff06b78c2fb72 SHA512 b4e0305a0910677938d7c95e0c1a0e50e64b236e0488f2b86d66d7bd8e2ab05ddcd5b2a4e85b795a6b3f0c3c6e3d5087862623c1e623bba163a8ad3e251c7785
+EBUILD emacs-25.3-r6.ebuild 11634 BLAKE2B 51cd2dac77f4c5aac03f065ff6f3fa5015a1b54ec6b4f3c5e5577281bcd16b0c17cd9a2f68da0f88839517fd6d41694938b6a287b7f07b1e05957460f8da54de SHA512 c1dc674aac430beb665a923926e33ba5ed56cb2332f998cd66325964cd64b75bb5cb11f327b95a0714c19b8353ff02bfaafd6a38fc5b0363994704d3e44b1df4
 EBUILD emacs-26.1-r1.ebuild 12177 BLAKE2B 8849e102d459b68740e5127372c3ccdd07b64368cf6d364acd27ffcee331347dd2ee48d38204215b839d4682becc0449b104f168a86c1982c0940c1ab4f5389f SHA512 77b4ce147e8e091979d01ee111539111b2854a09caf85f637dddf3d2bac27509224f7437a6ed8f5321566042e1689b3c13d1b1485fdccfba5ef375e82367bdad
-EBUILD emacs-26.1-r3.ebuild 12287 BLAKE2B b85a157da9052bca61e2fc49c0f8705e38423f54d38d178725e07a92fa36753b520e99e086bca6e6eb7359b1ded161606046565e22d2bf273feca1a5f5d624ae SHA512 bfbea979b9c51e21373b2734dbd305cce0a80eca7bfc226b6c7495ceb3395894f2d2284545e190ae4ed9f95c305e6b464afb5a544e32db181c05fcd4750e4327
+EBUILD emacs-26.1-r3.ebuild 12280 BLAKE2B e0c0e6e52e221152df015618abd7484d9432fc21fb055f11c43a6bdf20f28ae43f67418f4905312800b12720086356321a66b14ebf32c3a2c58bb85986c9fa95 SHA512 7d46007b31ced805eacc53fc14c097c32c6352e83947116b96bb2d5cfd8e591d7bf6d63a5cc57511c4695860b7872853b784a1571cdad4f6bb98ce5464f3d8ae
 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 8a99b15164a6..36e4dd3d9b6c 100644
--- a/app-editors/emacs/emacs-24.5-r7.ebuild
+++ b/app-editors/emacs/emacs-24.5-r7.ebuild
@@ -1,4 +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://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 6ee9ceb9f750..27c885a8f56c 100644
--- a/app-editors/emacs/emacs-25.3-r6.ebuild
+++ b/app-editors/emacs/emacs-25.3-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=7
@@ -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 91e7d01a5f89..86d5ccefa1e8 100644
--- a/app-editors/emacs/emacs-26.1-r3.ebuild
+++ b/app-editors/emacs/emacs-26.1-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://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/nano/Manifest b/app-editors/nano/Manifest
index d00fb0ff1819..f7c12f5ecd2e 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -6,7 +6,7 @@ DIST nano-2.9.8.tar.gz 2905951 BLAKE2B 95b78c43a052be68956f5b9493c418c23a9db40b5
 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 2280 BLAKE2B b644ee6fab01ff53146e0fab085d5547ed4f11743e41a0f856f2ed552bec3f2dbe7a32439e816fac5f96234f1aa9d600761b9687e864854d29978f503168fa77 SHA512 8042d5e3fe58e71af3d928e4ed385665c65d21598f45fd58c1830ded958879cb8642fd98894f147b5b87cfc8a47a24386502084d740fccec5569acd532294220
+EBUILD nano-2.9.8.ebuild 2276 BLAKE2B 29928b676aca3a4b9321e5458c88983021ddf2c688ac722dc0a6be231091717a6f31c7949077baf2657407b301b1b08b71e629911a962294f25476726a53aef7 SHA512 c44028414fbb1503ce1ce4e62820fbf18a5d07c669f21cdd5a272b662292bc11d6afc71cfe3446682768382185eb02086d8dfb46d0ddd3d66735d9ce24d71209
 EBUILD nano-3.0-r1.ebuild 2329 BLAKE2B ba5b2dcd3e38887a4a1e21789fc2955bfdd9f5328a65edc159d728b97b93612bb4addb9b239cd7175a1a51346f77018597fed1e67bc4a55751570a2320c1079a SHA512 439aef7945a4dbb37a9132a922179440d011d7b172318cd875f065db8a20f92ed58c6c4c507d28dfd5df5eedad02bbbb199b3982378c6ee0fde8db216c5e990d
 EBUILD nano-3.1.ebuild 2337 BLAKE2B 13b03e1a7d6c511f07205e717ba46db0a812ea33b83fea240f19260558e789d0d6aac75dec56373290673c008166c6caa4de5f574ec3fa3319ab8e3e8b97d52e SHA512 488cf08e5b026af85c5ef01a0160b5e6c6973c14df1162e0bc66dd1a7732a06ce35599a8b733fa4056e76db4906796b7e6c6fa6c1f84b5dd83bd217756c905c0
 EBUILD nano-9999.ebuild 2279 BLAKE2B 6a4a167d78038e7c982383f87a94d8ced33eab3beb9a7765ec4de6832ffcc21a8105e5f8d2799e9df25545de224cc687365110db0f80cc6ef1578bd0b52e80ca SHA512 b9e7bbb9924ce98ed642ec963dfa0a585fd8bdda095fe19029df3b61c98d769e88760afb535e2f5fd728d1e9df39bd9c29524c90b1b3779b6e5d374917652955
diff --git a/app-editors/nano/nano-2.9.8.ebuild b/app-editors/nano/nano-2.9.8.ebuild
index 323caef5c8ae..ab539d9df7ff 100644
--- a/app-editors/nano/nano-2.9.8.ebuild
+++ b/app-editors/nano/nano-2.9.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"
@@ -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/okteta/Manifest b/app-editors/okteta/Manifest
index db08166c3cb8..6e8d6993747e 100644
--- a/app-editors/okteta/Manifest
+++ b/app-editors/okteta/Manifest
@@ -1,5 +1,3 @@
-DIST okteta-0.25.1.tar.xz 951952 BLAKE2B 180cb7426b85cc8598f774d50556fe26d95d11e7c8b5be542a38fd4fa1c0479b401e6be59e7ca86eabba805c2a5d2ea2d818960cb218d173fd87db23f9c5525f SHA512 67e594ee1674176cbf506ca1191ced748bf6aec268d57211e052552f9673c359ccb3fefd403b5cf63e04f63a4fd3b42b0d21ef8eefcbac999081d58505df2174
 DIST okteta-0.25.3.tar.xz 950956 BLAKE2B d177db59b5327f4e75157c99fdac2191de9a7ef63433635ccf8f11ef4dc4ff201942c9f68383d720b18c26a9e7335bc1181ea4f0e36491b34b27e6c7dc469c9e SHA512 f27b0c2ca3c5f1ad838af847e08c53c8f8f3c386921bd2e0d5e833902659477196e6c6b72a428443e2be9013928c2151c1889ef33d59404815a34d81560ef2a7
-EBUILD okteta-0.25.1.ebuild 1603 BLAKE2B 0c64e8a1b0aa5e485fd86cf5a4f9b341b57e81f052f432373a3c3b3b32bba5c135d49c0e27b1de5a5fb2a120cb9d5bc1f283a12a398312aea0d96717fab31d5f SHA512 0b247aed642351f80e4b718c28e6ca7d231399a03fed884905014a7e001d1fc7213c5fc3b04233382cbdad6c1878796198ffaaad9b70975a198bb94bb58cf169
-EBUILD okteta-0.25.3.ebuild 1604 BLAKE2B 3d4abb5f75e3de73c51944bfce29b22cd9d79d7cac87335201de43b8fd2a6b5b979be2f74d2e55d92d15564d4783b08db35d75ea820d5be04b3bc194ee21cab3 SHA512 44939a34bdd951feaf06a0d553cb99a1ed3499d816c1308c803ec4a20d1652cc24163a63db49da81305392681ab91ef9d3638fc9e5505a0c53ebeb2e2bdf09b1
+EBUILD okteta-0.25.3.ebuild 1600 BLAKE2B 4a63d9f28a852ee3263a76b4498d0a08e7bba942b003d0c8d426b09940360eef677f4f9785190b3424400734a3b802b485b3fe573d9ae0df8fac5c59b96b6662 SHA512 4e5fde23df3ce32108e04afa9bf47905452d45b8996e13c37b4cf0e3606f45ad6fc7cffca361a2b03796d08881f13608150ecbe9e6aa00849ae1f20efeece1c9
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/app-editors/okteta/okteta-0.25.1.ebuild b/app-editors/okteta/okteta-0.25.1.ebuild
deleted file mode 100644
index ebd3203d5e45..000000000000
--- a/app-editors/okteta/okteta-0.25.1.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
-
-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/okteta/okteta-0.25.3.ebuild b/app-editors/okteta/okteta-0.25.3.ebuild
index b0e29bfec2df..e023724f2d7c 100644
--- a/app-editors/okteta/okteta-0.25.3.ebuild
+++ b/app-editors/okteta/okteta-0.25.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 kde5
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Hex editor by KDE"
diff --git a/app-editors/pluma/Manifest b/app-editors/pluma/Manifest
index 4c4a31f09aeb..07a2d21776c1 100644
--- a/app-editors/pluma/Manifest
+++ b/app-editors/pluma/Manifest
@@ -1,9 +1,3 @@
-DIST pluma-1.12.2.tar.xz 3397280 BLAKE2B 23af095549ff944b0936889deda6576717a6376aa2f2be8ed9b7d8ad70f8bb0524aff7314f9c335a42d80951c047c8008278144f45c2c5edb09a259b298c0024 SHA512 db2878161903868703514531ba214fc34dad1789885f18756e9192d6ba17950c8be03141ada72f8c386b515d8b0f9d58a0ee94a33fe3ffe00f360ea667c2b275
-DIST pluma-1.14.1.tar.xz 3415364 BLAKE2B 9449fc6b5e98d8ecb25f70df6c114c13cc32a8c0348ed2047eb874e85c7d448d3d7f0b4d7dd6e2fada3de847ded425651dc6d0ca92ce3c784fd32948735f3b25 SHA512 5d04e053ab2eb0f90e34d9af541004867c7317fd9386229c4e702e95a80420df16b20e4ae4c30bbee79fe904282f6134f7c361971be07cd6952612d975c88d11
-DIST pluma-1.16.2.tar.xz 3428472 BLAKE2B c3b543fb11678269fbbc2d049686b2a553aa1fede4ef1bab8abbc7fed316f27ba67cbb366908966b6c844f8ad0c4899499e52b4720378364555ef9156c80ae95 SHA512 bf91a7e4e1cfb92f9fd9a1d5b4ac9f0fd2704785b2da5d7a3aa360b4c217a57653d6f7bf509c156b8711bc5164e022c685331c93a139f55ea41431bc72e848fe
 DIST pluma-1.18.3.tar.xz 3355188 BLAKE2B d53f381aa9c74cad0df82ccc73aaab9f87347cb8e3886471a2531bdd4d49a84ee97a50f2333b2e375f9bc2a634c25dc69b36659dcb589ace716e523a9d0b4544 SHA512 62ad57a8d7626e34c15610e121869ee9b06a2498acb40ec0a60839ca0273d146bd59682d352c3e98d892460c444c5442d32673c2f63897bb8c3e9e595e771dc1
-EBUILD pluma-1.12.2-r1.ebuild 1957 BLAKE2B 439ee1e569e161b2227abc7dffcb3815582f4f2a597b4d1769f1d0d1d2308361156cbaba558bd8e760499f129dade20a987e66dc94a7caf3cf530f3ead64a997 SHA512 fc460f11527c2a5cdced694b8c59ede5931f2ecf452e7a862791fe93fa18b2c260a51d8f6fca17c58445a59357efe48a6431d5824c8c045fd719ebaca5730860
-EBUILD pluma-1.14.1.ebuild 1999 BLAKE2B 179b831656292280771e6d4244ff24f8a4cf3285e82ba021ec73a32e6047cc9db2ce3ee9da226fb70d674e9b183c07ed55fe6cdb151b891b9b00a4199e4c4ac9 SHA512 095ec46f710d2ad58819291e28a560a4fadcab2790142604d025c69bfd1842ae78f7dca3ff5098062b2bf63f2448b5e96d66a64504edee21e9ba43a84a4e4c7e
-EBUILD pluma-1.16.2.ebuild 1999 BLAKE2B e301396e062768616a2c775d8fe644340eaaa4b085f2e8faf697f0aade4494b86cb4d5b3ad7218caec0677458f43ff27d80aa1f64cc5c40b07296127f8479ca9 SHA512 3394730f3248e8eaae6703aa472a4916e68e3aa96cc01dbe77df11786a48b95ba8a6936948fd3e2d6b921d8465f3ad05e98226802bdc8a198fee1a9aa66b31b6
 EBUILD pluma-1.18.3.ebuild 1762 BLAKE2B 5308bc86e3b681a3dd36fff0205dc4f45e4bbb1a490d135e975b38e1a66c400da7d3ee7014e34586d10ee5942e9366402a440d9cda2599e2dcbf256b524c1158 SHA512 8446e2f3c119ea9c1ed81b85265fc012c6d1990c5b12b56c9d3086e683c3b16b91e6e631c00f664b9027d60dfff1953b444e8135c9dc2af0da98eba6f0452b69
-MISC metadata.xml 410 BLAKE2B b9e15ebb574ba3482e7317f89fd1bd599a0ba5d42a27e0c0da34f86ed64830819f23fca50865cdba6081daea8313b82a58cf98fa46e3ccc61eb389222cd1bfd4 SHA512 0e79ae54838d841d9e4d65b82af5042223e07585808bcdbf9c26ae7b59cfc7b66d1bb24b39e1835ca75dd724d34854fd12d881b7edb20850fa434cf1db2b2e14
+MISC metadata.xml 334 BLAKE2B 2d5ac79ba6879f5486724c826a89ed81cf393bc3fedbdea40764b1fb23962672e7c2a625137080a16ccd8e67a55097a4f497269f89ccd8b256490ef99e15b9cb SHA512 fe30c9986ed7086a894a0835847351d92938c424af5b7da51211a23fc197eebbce53cc205014cdd2c3bcc951a5a449c5d5726bede7991716d81fb7bbfe8a3fca
diff --git a/app-editors/pluma/metadata.xml b/app-editors/pluma/metadata.xml
index e740906c492d..3daddb1815dc 100644
--- a/app-editors/pluma/metadata.xml
+++ b/app-editors/pluma/metadata.xml
@@ -5,9 +5,6 @@
 		<email>mate@gentoo.org</email>
 		<name>Gentoo MATE Desktop</name>
 	</maintainer>
-	<use>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/pluma</remote-id>
 	</upstream>
diff --git a/app-editors/pluma/pluma-1.12.2-r1.ebuild b/app-editors/pluma/pluma-1.12.2-r1.ebuild
deleted file mode 100644
index a9646a9a642b..000000000000
--- a/app-editors/pluma/pluma-1.12.2-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate multilib python-single-r1 virtualx
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Pluma text editor for the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk3 python spell"
-
-REQUIRED_USE="
-	gtk3? ( !python )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Tests require gvfs sftp fs mounted and schema's installed. Disable tests.
-# https://github.com/mate-desktop/mate-text-editor/issues/33
-RESTRICT="test"
-
-RDEPEND="app-text/rarian:0
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.5:2
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libX11:0
-	>=x11-libs/libSM-1.0
-	x11-libs/pango:0
-	virtual/libintl:0
-	!gtk3? (
-		>=x11-libs/gtk+-2.24:2
-		>=x11-libs/gtksourceview-2.9.7:2.0
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3
-		>=x11-libs/gtksourceview-2.9.7:3.0
-	)
-	spell? (
-		>=app-text/enchant-1.2:0
-		>=app-text/iso-codes-0.35:0
-	)
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-2.15.4:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.12:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtksourceview-2.9.2:2
-	)
-	!!app-editors/mate-text-editor"
-
-DEPEND="${RDEPEND}
-	~app-text/docbook-xml-dtd-4.1.2
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	>=sys-devel/libtool-2.2.6:2
-	>=sys-devel/gettext-0.17:*
-	virtual/pkgconfig:*"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable python) \
-		$(use_enable spell)
-}
-
-src_test() {
-	# FIXME: This should be handled at eclass level.
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
-}
diff --git a/app-editors/pluma/pluma-1.14.1.ebuild b/app-editors/pluma/pluma-1.14.1.ebuild
deleted file mode 100644
index a1c96eaebad6..000000000000
--- a/app-editors/pluma/pluma-1.14.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate multilib python-single-r1 virtualx
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Pluma text editor for the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk3 python spell"
-
-REQUIRED_USE="
-	gtk3? ( !python )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Tests require gvfs sftp fs mounted and schema's installed. Disable tests.
-# https://github.com/mate-desktop/mate-text-editor/issues/33
-RESTRICT="test"
-
-COMMON_DEPEND="dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.5:2
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libX11:0
-	>=x11-libs/libSM-1.0
-	x11-libs/pango:0
-	virtual/libintl:0
-	!gtk3? (
-		>=x11-libs/gtk+-2.24:2
-		>=x11-libs/gtksourceview-2.9.7:2.0
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3
-		>=x11-libs/gtksourceview-2.9.7:3.0
-	)
-	spell? (
-		>=app-text/enchant-1.2:0
-		>=app-text/iso-codes-0.35:0
-	)
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-2.15.4:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.12:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtksourceview-2.9.2:2
-	)
-	!!app-editors/mate-text-editor"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	~app-text/docbook-xml-dtd-4.1.2
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	>=sys-devel/libtool-2.2.6:2
-	>=sys-devel/gettext-0.17:*
-	virtual/pkgconfig:*"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable python) \
-		$(use_enable spell)
-}
-
-src_test() {
-	# FIXME: This should be handled at eclass level.
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
-}
diff --git a/app-editors/pluma/pluma-1.16.2.ebuild b/app-editors/pluma/pluma-1.16.2.ebuild
deleted file mode 100644
index 801ac0a47337..000000000000
--- a/app-editors/pluma/pluma-1.16.2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate multilib python-single-r1 virtualx
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Pluma text editor for the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk3 python spell"
-
-REQUIRED_USE="
-	gtk3? ( !python )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Tests require gvfs sftp fs mounted and schema's installed. Disable tests.
-# https://github.com/mate-desktop/mate-text-editor/issues/33
-RESTRICT="test"
-
-COMMON_DEPEND="dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.5:2
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libX11:0
-	>=x11-libs/libSM-1.0
-	x11-libs/pango:0
-	virtual/libintl:0
-	!gtk3? (
-		>=x11-libs/gtk+-2.24:2
-		>=x11-libs/gtksourceview-2.9.7:2.0
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3
-		>=x11-libs/gtksourceview-2.9.7:3.0
-	)
-	spell? (
-		>=app-text/enchant-1.2:0
-		>=app-text/iso-codes-0.35:0
-	)
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-2.15.4:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.12:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtksourceview-2.9.2:2
-	)
-	!!app-editors/mate-text-editor"
-
-RDEPEND="${COMMON_DEPEND}
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]"
-
-DEPEND="${COMMON_DEPEND}
-	~app-text/docbook-xml-dtd-4.1.2
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	>=sys-devel/libtool-2.2.6:2
-	>=sys-devel/gettext-0.17:*
-	virtual/pkgconfig:*"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable python) \
-		$(use_enable spell)
-}
-
-src_test() {
-	# FIXME: This should be handled at eclass level.
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
-}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 83c898f137c4..c2060b4c1305 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/dynamips/Manifest b/app-emulation/dynamips/Manifest
index 17e81a2df73d..c3d4bcbbc68c 100644
--- a/app-emulation/dynamips/Manifest
+++ b/app-emulation/dynamips/Manifest
@@ -1,7 +1,8 @@
-AUX 0.2.14-docs.patch 551 BLAKE2B 0e8b4ef51a247479d8306f5cc50619b32dbfe07bf04257ae633dc0ca8bcc6782fe092a6b2fe99c845e96cc2c87d5ac96d5a3bb981a379adc54891edfc67147b9 SHA512 31884a56bffd2bdfee76949ecc5c0d68fd10e30bea52315fbafb8e4c60b033f1baf2a380a67686af91b0ee49ae97f4012c778bf6f69d6dd583375d8f6b7e98de
-AUX dynamips-0.2.12-makefile.patch 458 BLAKE2B 706fc359aa844a87b4d9519b5355708a0c30c8511825381bc84f7ca567de1d6300c2733b550804d179eafd66b029ccafaf97bf2852e9650c4ad1b7778f6aeab6 SHA512 9f298052970a277221d9cf4a936290dcf832e633b72d860267128e898b882b3d84f6366a881ac736ba9e7c79639c3f429061c7c959f3d77121b36ff847eee91c
-DIST dynamips-0.2.12-source.zip 995877 BLAKE2B 0bfc709f49b196763e8a3dcfde214e1e26c9c735257d588b72aefc3ca8dec2b1325ce3cb634b59555365c9dbd3819d959ab6e51e986c2dd62595b5566d76b39c SHA512 08f388027e3234a44a75de77f30d6c96f0d881c4db60435a237f6ae6e3804872fda422ab11249f5c7283054f7d2d8466886dcd6056e59fc90802e67fa7cb8c55
+AUX 0.2.14-docs.patch 550 BLAKE2B f37293d4c46d37176020e28fac4174782ebee3fb223510e97e48cf52f748c8151dbd18a594e38b77753d34ef7ad201803713a2cb5c8a7081737eea20e6734977 SHA512 92d5dd0a5a4c619a0b0016bd355ba7463dd1663922e36cd11d1a5461e5f6c5a2be42f21ace8ebf67d5a0f383b4a58e670c5ba28982b769b0b7a773284af66ade
+AUX dynamips-0.2.18-docs.patch 533 BLAKE2B 765024fa4246c5efc576c91619d7c01c00b67cb6eddd3086b1670ea4f89e000dab6680e38cdbd384d9850477a682f42070d9a74c59ffea0a1a1f8d095703e625 SHA512 293059e7f4fc848362e5d6c881386bea9fcf616117d2723a216e510cbc23372f40a6d757f84bcdb429b5eb61f74e99d334e7507c2161c4d28ccb973c14aa7893
 DIST dynamips-0.2.14-source.zip 961813 BLAKE2B 71da393bfd5624ad47eda578eafd0f5b8b535d9a93c3ebc8902901c0415168098bb27ea44e92cbb230d0cf2ebb904311665978f1b30e6d35c7792b813a5cd8d2 SHA512 8c3d85998a61cae1e3e82501a00e886c954686f9a19a44acb7dee8b13911c0155ce2cdfecbdc41ed5d279266abdf77a5c3f2753fde12217b138313ffa46dabf8
-EBUILD dynamips-0.2.12.ebuild 929 BLAKE2B 82fe256856b6eb41f7b1e6efcab247531369d6405462bb06b17321840f6087941785a1fe720d7f82bd71b5ca21f4efa0427782e3d35fd7720682abd4b8077a4c SHA512 c1e45f0fe9e1ea182f0aed2d9687e0d78a7d247c18766c11bd98db6175b7f2b2038bbb8e3ca3062b4da479969d6512f0b238fc08062377b5a35d4723ee6891bc
+DIST dynamips-0.2.18.tar.gz 833554 BLAKE2B 8152b436e8fc43061c5603a44ceae8feebdd4593649d2fb6a1814ca22cfce2f671f6f98df5f03ee6eeef10cf09fc444d406edd8d3b4a6037a89cf0e8301774ac SHA512 d66e32d72ecc9ebff5232377ac9aa5b966ceb08884cc7f8dc4a8cf3f56305e7cefd677624ba66278f6603a3b275c384bd0ff3905932461b1f8056106cd272a4c
 EBUILD dynamips-0.2.14-r1.ebuild 816 BLAKE2B afd37e97b28167a417ca91c35c9ab21d60403a80260e0b636478b7db800a5ac320cc95abdebb6c1943464bc43f518e292315adee248fc72214070b518540f56d SHA512 5fe002c46f1f868e317c193c187db8ec7b63567561a1fd334c2cc32378f40cd3c14de5748da07626cad89c21b7163a9cae294a0f134beb152248f7f9c4d629b3
+EBUILD dynamips-0.2.14-r2.ebuild 828 BLAKE2B d71431c30fb42255b413e0954c4acd315cad6903d5f527a6494951d021fa2abfd31d95dc65ca05817b961e1e788ca5519898020ff2be6233c36a122f028ab11c SHA512 0a154fc896c4e3bdc430cd0833a372f54353a4f2bb12e12d7cdd322e2377d4cb0ddbf9e843f39c29b08c9e891ef934a97a6f970dacf75bd893dff33e2381bfa6
+EBUILD dynamips-0.2.18.ebuild 821 BLAKE2B 86ec42ec88cbbca52f6f50d9b703ad366452b730cf165714bcaf3a5a135c49872220e8fa6cc61b4d0ba0ce824fd0a100795a2f0493715e6080db1ec12ecce375 SHA512 a2a7ca16bb46b48ec1ef4e50bfabb0c6c420bb0baa43289dfeb83c11680f6a7f14be5957dcdedb8e48248192a8a054edeafb0a42135921d09168e9884b1248c0
 MISC metadata.xml 322 BLAKE2B 6c1fdcec350e68782be9e9e4dff8c9c0a71e05ffba537772dc86d0843b57d58ac2993e361daf84f3e3a8d4f1d25d5f841efbcc6a02e545ec0af1d3cc69155b37 SHA512 cfb689b938923b74a3ba4b7101da915c2e9a4f96f23e26d7a3baf69d1593cd8c063ee76911d90104f7cce91c5df98defbacc35e6526aef0e66af575125bd6fbc
diff --git a/app-emulation/dynamips/dynamips-0.2.12.ebuild b/app-emulation/dynamips/dynamips-0.2.12.ebuild
deleted file mode 100644
index 134ef537bf0d..000000000000
--- a/app-emulation/dynamips/dynamips-0.2.12.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Cisco 7200/3600 Simulator"
-HOMEPAGE="http://www.gns3.net/dynamips/"
-SRC_URI="mirror://sourceforge/project/gns-3/Dynamips/${PV}/${P}-source.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-libs/elfutils
-	net-libs/libpcap"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-makefile.patch"
-
-	# enable verbose build
-	sed -i \
-		-e 's/@$(CC)/$(CC)/g' \
-		stable/Makefile || die 'sed on stable/Makefile failed'
-	# respect compiler
-	tc-export CC
-
-	epatch_user
-}
-
-src_compile() {
-	if use amd64 || use x86; then
-		emake DYNAMIPS_ARCH="${ARCH}"
-	else
-		emake DYNAMIS_ARCH="nojit"
-	fi
-}
-
-src_install () {
-	newbin dynamips.stable dynamips
-	newbin nvram_export.stable nvram_export
-	doman man/*
-	dodoc README README.hypervisor TODO
-}
diff --git a/app-emulation/dynamips/dynamips-0.2.14-r2.ebuild b/app-emulation/dynamips/dynamips-0.2.14-r2.ebuild
new file mode 100644
index 000000000000..709519ab9275
--- /dev/null
+++ b/app-emulation/dynamips/dynamips-0.2.14-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Cisco 7200/3600 Simulator"
+HOMEPAGE="http://www.gns3.net/dynamips/"
+SRC_URI="mirror://sourceforge/project/gns-3/Dynamips/${PV}/${P}-source.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="ipv6"
+
+RDEPEND="dev-libs/elfutils
+	net-libs/libpcap"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+DOCS=( ChangeLog README RELEASE-NOTES )
+
+S="${WORKDIR}"
+
+PATCHES=( "${FILESDIR}/${PV}-docs.patch" )
+
+src_prepare() {
+	# comment out DYNAMIPS_FLAGS to respect CFLAGS
+	sed -e "s:^set ( DYNAMIPS_FLAGS:#&:" -i cmake/dependencies.cmake || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DANY_COMPILER=1
+		-DENABLE_IPV6="$(usex ipv6)"
+	)
+	cmake-utils_src_configure
+}
diff --git a/app-emulation/dynamips/dynamips-0.2.18.ebuild b/app-emulation/dynamips/dynamips-0.2.18.ebuild
new file mode 100644
index 000000000000..1b58ec9cfdad
--- /dev/null
+++ b/app-emulation/dynamips/dynamips-0.2.18.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Cisco 7200/3600 Simulator"
+HOMEPAGE="https://github.com/GNS3/dynamips"
+SRC_URI="https://github.com/GNS3/dynamips/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="ipv6"
+
+RDEPEND="dev-libs/elfutils
+	net-libs/libpcap"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+DOCS=( ChangeLog README.md RELEASE-NOTES )
+
+PATCHES=( "${FILESDIR}/${P}-docs.patch" )
+
+src_prepare() {
+	# comment out DYNAMIPS_FLAGS to respect CFLAGS
+	sed -e "s:^set ( DYNAMIPS_FLAGS:#&:" -i cmake/dependencies.cmake || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DANY_COMPILER=1
+		-DENABLE_IPV6="$(usex ipv6)"
+	)
+	cmake-utils_src_configure
+}
diff --git a/app-emulation/dynamips/files/0.2.14-docs.patch b/app-emulation/dynamips/files/0.2.14-docs.patch
index 1d744062e5b5..0572a04c4825 100644
--- a/app-emulation/dynamips/files/0.2.14-docs.patch
+++ b/app-emulation/dynamips/files/0.2.14-docs.patch
@@ -1,5 +1,5 @@
---- CMakeLists-orig.txt	2014-11-28 14:51:14.375913296 +0900
-+++ CMakeLists.txt	2014-11-28 14:52:09.579369288 +0900
+--- a/CMakeLists.txt	2014-11-28 14:51:14.375913296 +0900
++++ b/CMakeLists.txt	2014-11-28 14:52:09.579369288 +0900
 @@ -37,16 +37,6 @@
  add_subdirectory ( stable )
  add_subdirectory ( unstable )
diff --git a/app-emulation/dynamips/files/dynamips-0.2.12-makefile.patch b/app-emulation/dynamips/files/dynamips-0.2.12-makefile.patch
deleted file mode 100644
index 431f2df8ac74..000000000000
--- a/app-emulation/dynamips/files/dynamips-0.2.12-makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- stable/origMakefile	2014-03-27 18:17:28.000000000 -0400
-+++ stable/Makefile	2014-05-30 18:07:28.164255039 -0400
-@@ -19,7 +19,7 @@
- PPC32_ARCH_INC_FILE=\"ppc32_$(DYNAMIPS_ARCH)_trans.h\"
- OSNAME=unknown
- 
--CFLAGS+= $(INCLUDE) -Wall -O2 -fomit-frame-pointer \
-+CFLAGS+= $(INCLUDE) -Wall \
- 	-DJIT_ARCH=\"$(DYNAMIPS_ARCH)\" -DJIT_CPU=CPU_$(DYNAMIPS_ARCH) \
- 	-DMIPS64_ARCH_INC_FILE=$(MIPS64_ARCH_INC_FILE) \
- 	-DPPC32_ARCH_INC_FILE=$(PPC32_ARCH_INC_FILE) \
diff --git a/app-emulation/dynamips/files/dynamips-0.2.18-docs.patch b/app-emulation/dynamips/files/dynamips-0.2.18-docs.patch
new file mode 100644
index 000000000000..d94da32812b4
--- /dev/null
+++ b/app-emulation/dynamips/files/dynamips-0.2.18-docs.patch
@@ -0,0 +1,20 @@
+--- a/CMakeLists.txt	2018-09-28 13:12:14 +0300
++++ b/CMakeLists.txt	2018-09-28 13:12:39 +0300
+@@ -37,16 +37,6 @@
+ add_subdirectory ( stable )
+ add_subdirectory ( unstable )
+ 
+-install_docs (
+-   "ChangeLog"
+-   "COPYING"
+-   "MAINTAINERS"
+-   "README.md"
+-   "README.hypervisor"
+-   "RELEASE-NOTES"
+-   "TODO"
+-   )
+-
+ # uninstall target - leaves behind any directory created during install
+ set ( _templatefile "${CMAKE_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in" )
+ set ( _scriptfile "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake" )
+
diff --git a/app-emulation/lxc-templates/Manifest b/app-emulation/lxc-templates/Manifest
index e1923cae974c..7bd5593a6a11 100644
--- a/app-emulation/lxc-templates/Manifest
+++ b/app-emulation/lxc-templates/Manifest
@@ -1,4 +1,6 @@
 AUX lxc-templates-3.0.1-no-cache-dir.patch 241 BLAKE2B ba9fc4fe3d663384a64600977de1c5aba413e876e6ca43464b5f5986d21d5e01729c82eb1e6ea03b087644611b9fc7bf083436e467bc69e2b3779020ca287984 SHA512 504721074d9aa4c1d71e5fb5f59c8179cbb0247b6d56d7622a68a7c55a5fdd5fa25cb92199e5400457f1bf2e4bc8e2d91d5169fb02180688c7bbca655881bdb5
 DIST lxc-templates-3.0.1.tar.gz 256074 BLAKE2B 8a5dab2d69fbc29e0246a0853690726c07d24e0fe6d4e761d8ec8b4559cdf285a82e17c8f4d2a6bf2355896c667000d4341511b3c5f1805a55849b4812eb7efe SHA512 cae47b670654dc6c143827d196f0477c5354cb6d81ae4028192622fb73912e8bb3b62a0a68786e9212885bb52b593c6e742cfbfefb70ec33260d599e5d5c8290
+DIST lxc-templates-3.0.2.tar.gz 255721 BLAKE2B 6f3a09982833ae832623bf448a0cc8a5c3c6639606a1cd8e306e41fa86a1135eae5490cd93043c397e5be727b12b0fdae48709a5ff3e3dd2e590bc6aa7154f34 SHA512 1e4b271c86d3cc382a6c4cc5ad8a44362f731325b4657fbee29542837a2684ee7274b92985da1a2f8aa0f808e263bf50d682ee969ba137229e54528fa529f77f
 EBUILD lxc-templates-3.0.1.ebuild 513 BLAKE2B 15749a19b3c24df787d3d4eb8d7f6ebf902cff1c22fe0ee4bed0eafb8b5eb53860b5ff20d54e9775ef659f4ad46e160fccbd95bc2331a3f8b167c6332585aed0 SHA512 428a61af6aba82737427a699275522f992f6aba3eb870719e298f1b7b4a24842a21a33af2b7dfbd2a0e05f78b8316224f907ddaedfa2984d0117a67f0e064025
+EBUILD lxc-templates-3.0.2.ebuild 520 BLAKE2B 68d70ab9a40c33d6776da2765225d49e07f1b672d71d90062efd8415adb3965e84065d33977af67261932ef80dd295ef7dc207477e1c3bbf691ae2bd484ea3bc SHA512 90796dd4d82507cb4f0c0ee6d8749bec6d0df076d6cec37d15c29a1f3eccc2b651a0b0a02b9b8b4dd280708efaf37cf8152bae16ae1850661d2bbef681babc7b
 MISC metadata.xml 446 BLAKE2B d0b14eed14b0882b35ddb982ba432f6a5a3b63fdf8bb1c926c9d0db7b9cf7757c78cccca1244cd039d0db7e52c360e99c3fc0a2e915653543d5416054fec62af SHA512 473e0a28d72d39643f91e17910481331b1732b07e4cd74bac024c8a5a933e40a838948d5a8b0bef808332eac751422f7f88ec91501f63b779763606b71696acc
diff --git a/app-emulation/lxc-templates/lxc-templates-3.0.2.ebuild b/app-emulation/lxc-templates/lxc-templates-3.0.2.ebuild
new file mode 100644
index 000000000000..4a4dcd5d0e2a
--- /dev/null
+++ b/app-emulation/lxc-templates/lxc-templates-3.0.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Old style template scripts for LXC"
+HOMEPAGE="https://linuxcontainers.org/"
+SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+LICENSE="LGPL-3"
+SLOT="0"
+
+RDEPEND="
+	>=app-emulation/lxc-3.0"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-3.0.1-no-cache-dir.patch" )
+DOCS=()
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index c79557bcd940..591cec905334 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -4,13 +4,10 @@ AUX lxc-2.1.1-cgroups-enable-container-without-CAP_SYS_ADMIN.patch 5145 BLAKE2B
 AUX lxc-2.1.1-cve-2018-6556.patch 3994 BLAKE2B 791b80852408df5f325465a6ceea5bf7986641da4c988db1f61bebabe656554aa5032186f4e5409093c14b9c9fb3ee3d7bf06e338c5f4c19cb4e2eb9d8d1db36 SHA512 fcce5387cc1d67fcb035073a5295e15570b114d202f4b077363a5059813a28b7165b5ea3e32beb4b1be8d45613bc5d7d8223ed2ebff45d5e95b5fd1e87dbd490
 AUX lxc-2.1.1-fix-cgroup2-detection.patch 856 BLAKE2B e877e8a968d059c2034a2b5c23946241a6b45172f893e313bff30a7f798e3b1440e5a1e8ee277816308fb509901b52584a44021a156a91671e299964dd69b1bd SHA512 eb0fc8dee5a59d1641e8b3024bf79be2273aa15131fd7eaee98d80585c39ddb93d8d9cfe98c7f866ab2461fe8c6c7e3c038ec1a1263a6f9b02ed323a267b87f2
 AUX lxc-3.0.0-bash-completion.patch 915 BLAKE2B 8bb879e391cec349d211b47d321c64ea091c8475ac9a8c4adfb45918c044f6c49d9b9bce546082907d696f697baf0870893c4427abeafa496db89f99190cd091 SHA512 2f3728fcf5e88eecc1ae05bf038ef83baa375194c5bef0d0ef68feaf4d8092cdd8efef6b3c27207c4abd28b085f087af517242c65747b47d0a8fa840f6b9d279
-AUX lxc-3.0.1-cve-2018-6556.patch 3481 BLAKE2B 2ee1d488f7be81d97908d83d84346c5800b2d3f5ef395fb97c60263134b6e7e5048be7020e296e9d45b2ca17b0d8d0d911d0e3e1b08fe02866f506743f13270d SHA512 0cfc93c4f1a989e6c8d29c232aa8569649dd0797419f58c5e83b9febf851ed7b605a552a0b521e1c57de0179a08ee9e6ee8243130758867901fd5b26533425ca
 AUX lxc.initd.7 3468 BLAKE2B 37b0d044594f1c66631f991315e49c4ceea4640bf6c459e6bba713fb76ef9a8ee1fcbc49da68bd0f1e2929cf9904e0113a3b321166f7c3d360fcebeab6665e5a SHA512 c5841cff7d8b58d4283a26719e8a5db1be2c4add0f31065393b863b6626460180d91632106bc50cde4d3e74ae46a57d581fa1f01140dfa95522aba12277f9eaa
 AUX lxc_at.service.4 265 BLAKE2B 4454528e69a5c986c23c0c4ccc10ebe03a0650e47cd30208355d2f4a70a4cb46392473eccddd736988f1b72954948876601aaf99977d8e6014a7c774a416160f SHA512 d61e7103e90e6ffb3202533e7d7555d8c02b943f06ec6c0d673713c1c0ede58641312c65d6dd6a15907c1171522e6148c2313d7b11acbd85d59fe65758cd52b3
 DIST lxc-2.1.1.tar.gz 1378640 BLAKE2B 5fca516540a886729434579ff99acf3baa06977fa0e0b6f24dbf15094626335fc073597d308276e3dd20e27ceabf1477cc8e99d1fd24cf50b9aed2720b887b69 SHA512 2989d57acddfe091adcf8031721c3c9a2f8eff5476bd6155366b76ea7511e0f6120e669276e056e3963863e0f0acf3b095d44c36fa6652e67c197671f28cbdd4
-DIST lxc-3.0.1.tar.gz 1239920 BLAKE2B 7be668c11d7211540fe7e2fb6318d38eac0d8d493914f4705d097fca4c004a8d2191609d02bd9e1d9204c3c0b9ea937084d3f9050fc841f6d777768067af3d19 SHA512 f51b0844f61f64d4efc530454eae1fa499f7f1b908bd3b40d7031e7f311a402893a7504bddbc53f2ef9da2b3154d1b047fc4d876b99f0d487d7c79de64eea505
 DIST lxc-3.0.2.tar.gz 1236975 BLAKE2B 68047f6374b9081fb308586726797ed94fa66b5e94eb3fc12ad1a0aedc15ac1ee518ca5a341db79a715015e34ad38659200ad6aaf21f74639ebb55e7e1360645 SHA512 d7f5e3f91e5c8800e3e092ab209158a4d3e3c2816623249aeaaf2e0950428484ac5d1432d71298787721e1419cd962c0798ba14979e62161299fa15a299efde8
 EBUILD lxc-2.1.1-r1.ebuild 6818 BLAKE2B e885b3a11de8a131433bec83b1d47b8c2277fd575d2d8bbf475bbb6ad5b1b520fbe204f61034816a96eef2734b5986d1bdaf9f39c2c61f4d1e47597c49eaf90c SHA512 15d46b88c5163ed35d25e404696350d0ef4906c4b264f5c1e9987a2f98a24b68c8187222a39a041a7de622621ae3dc5a9e6b58ab24754e57a70e2e1374f8c840
-EBUILD lxc-3.0.1-r1.ebuild 5191 BLAKE2B 9f459a526990f82180248e70c618479b12bd2f0ebbed6531d380a379256f214511b1213e1627a4fc813d36d38a05b4f44894f14ce9d7fef2da1fd0f5d1db9b51 SHA512 3e32d03eb7bf76be38b9fba3b2b0645273c497d9053ff91167908675d133b7e55ab80f7f8bb6a58ecefb1c9b002ef8727b63af56cd2c478a6dea2e8dd9c4f033
-EBUILD lxc-3.0.2.ebuild 5033 BLAKE2B 3687be7ad11e70d8955f671e463a5311f0d5f5948e1c3ad1b31eab8071e5960d9b232dc5b8a176d56006e56e5ec39fd31197f75a9a20c24ce9131235151f287e SHA512 9b21e7225343ab7379dad667652acafe1f3e32c0b90edd8df4b0385bedb742f43f1998711be8039d673affac066b5aa9f70e2ee9557cd7d207b6c064dba440d3
+EBUILD lxc-3.0.2.ebuild 5028 BLAKE2B f51ca223fc632d7475e1353b6309b96ec8a97e40508c3f7aeb6bf3a9f0727981bd7217adea2b881be3c191494e56a33b44e19b07d7f2b1772697fbf466774baa SHA512 f6cd8a534453b85a4bc12c187dbef844722bf7f94150693683e486bf3daaeaf12a968d20c9c93261eaadb1b27511b083b4ab5bde13e4bd7b3624ab6a9826f765
 MISC metadata.xml 727 BLAKE2B f1f8eedf4986f221535eacc12429dadb73c25d07e67962d6676ca8f5303d971828df6bf781628fc0089ba29766136c73d164208f057bd59ca3789fab73ab7d47 SHA512 025b93960856b23bb9817b38fadb6ef9d6dfd2ab98f813de840634396fed8e577b8ff52c2d4698d21e0a18d3196d3233da0bf400bee4775cc1fa12b1014ec9f4
diff --git a/app-emulation/lxc/files/lxc-3.0.1-cve-2018-6556.patch b/app-emulation/lxc/files/lxc-3.0.1-cve-2018-6556.patch
deleted file mode 100644
index 198e835e6c59..000000000000
--- a/app-emulation/lxc/files/lxc-3.0.1-cve-2018-6556.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From f2314625c5702cfd25974929599fa439bdac8bdf Mon Sep 17 00:00:00 2001
-From: Christian Brauner <christian.brauner@ubuntu.com>
-Date: Wed, 25 Jul 2018 19:56:54 +0200
-Subject: [PATCH] CVE 2018-6556: verify netns fd in lxc-user-nic
-
-Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
----
- src/lxc/cmd/lxc_user_nic.c | 35 ++++++++++++++++++++++++++++++++---
- src/lxc/utils.c            | 12 ++++++++++++
- src/lxc/utils.h            |  5 +++++
- 3 files changed, 49 insertions(+), 3 deletions(-)
-
-diff --git a/src/lxc/cmd/lxc_user_nic.c b/src/lxc/cmd/lxc_user_nic.c
-index ec9cd97e..c5beb6c8 100644
---- a/src/lxc/cmd/lxc_user_nic.c
-+++ b/src/lxc/cmd/lxc_user_nic.c
-@@ -1179,12 +1179,41 @@ int main(int argc, char *argv[])
- 			exit(EXIT_FAILURE);
- 		}
- 	} else if (request == LXC_USERNIC_DELETE) {
--		netns_fd = open(args.pid, O_RDONLY);
-+		char opath[LXC_PROC_PID_FD_LEN];
-+
-+		/* Open the path with O_PATH which will not trigger an actual
-+		 * open(). Don't report an errno to the caller to not leak
-+		 * information whether the path exists or not.
-+		 * When stracing setuid is stripped so this is not a concern
-+		 * either.
-+		 */
-+		netns_fd = open(args.pid, O_PATH | O_CLOEXEC);
- 		if (netns_fd < 0) {
--			usernic_error("Could not open \"%s\": %s\n", args.pid,
--				      strerror(errno));
-+			usernic_error("Failed to open \"%s\"\n", args.pid);
-+			exit(EXIT_FAILURE);
-+		}
-+
-+		if (!fhas_fs_type(netns_fd, NSFS_MAGIC)) {
-+			usernic_error("Path \"%s\" does not refer to a network namespace path\n", args.pid);
-+			close(netns_fd);
-+			exit(EXIT_FAILURE);
-+		}
-+
-+		ret = snprintf(opath, sizeof(opath), "/proc/self/fd/%d", netns_fd);
-+		if (ret < 0 || (size_t)ret >= sizeof(opath)) {
-+			close(netns_fd);
-+			exit(EXIT_FAILURE);
-+		}
-+
-+		/* Now get an fd that we can use in setns() calls. */
-+		ret = open(opath, O_RDONLY | O_CLOEXEC);
-+		if (ret < 0) {
-+			usernic_error("Failed to open \"%s\": %s\n", args.pid, strerror(errno));
-+			close(netns_fd);
- 			exit(EXIT_FAILURE);
- 		}
-+		close(netns_fd);
-+		netns_fd = ret;
- 	}
- 
- 	if (!create_db_dir(LXC_USERNIC_DB)) {
-diff --git a/src/lxc/utils.c b/src/lxc/utils.c
-index 26f1b058..69d362dc 100644
---- a/src/lxc/utils.c
-+++ b/src/lxc/utils.c
-@@ -2548,6 +2548,18 @@ bool has_fs_type(const char *path, fs_type_magic magic_val)
- 	return has_type;
- }
- 
-+bool fhas_fs_type(int fd, fs_type_magic magic_val)
-+{
-+	int ret;
-+	struct statfs sb;
-+
-+	ret = fstatfs(fd, &sb);
-+	if (ret < 0)
-+		return false;
-+
-+	return is_fs_type(&sb, magic_val);
-+}
-+
- bool lxc_nic_exists(char *nic)
- {
- #define __LXC_SYS_CLASS_NET_LEN 15 + IFNAMSIZ + 1
-diff --git a/src/lxc/utils.h b/src/lxc/utils.h
-index 7d672b77..fedc395b 100644
---- a/src/lxc/utils.h
-+++ b/src/lxc/utils.h
-@@ -95,6 +95,10 @@
- #define CGROUP2_SUPER_MAGIC 0x63677270
- #endif
- 
-+#ifndef NSFS_MAGIC
-+#define NSFS_MAGIC 0x6e736673
-+#endif
-+
- /* Useful macros */
- /* Maximum number for 64 bit integer is a string with 21 digits: 2^64 - 1 = 21 */
- #define LXC_NUMSTRLEN64 21
-@@ -581,6 +585,7 @@ extern void *must_realloc(void *orig, size_t sz);
- /* __typeof__ should be safe to use with all compilers. */
- typedef __typeof__(((struct statfs *)NULL)->f_type) fs_type_magic;
- extern bool has_fs_type(const char *path, fs_type_magic magic_val);
-+extern bool fhas_fs_type(int fd, fs_type_magic magic_val);
- extern bool is_fs_type(const struct statfs *fs, fs_type_magic magic_val);
- extern bool lxc_nic_exists(char *nic);
- extern int lxc_make_tmpfile(char *template, bool rm);
--- 
-2.17.1
-
diff --git a/app-emulation/lxc/lxc-3.0.1-r1.ebuild b/app-emulation/lxc/lxc-3.0.1-r1.ebuild
deleted file mode 100644
index bf2c75e44b88..000000000000
--- a/app-emulation/lxc/lxc-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools bash-completion-r1 linux-info flag-o-matic systemd readme.gentoo-r1 pam
-
-DESCRIPTION="LinuX Containers userspace utilities"
-HOMEPAGE="https://linuxcontainers.org/"
-SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="examples pam python seccomp selinux +templates"
-
-RDEPEND="
-	net-libs/gnutls
-	sys-libs/libcap
-	pam? ( virtual/pam )
-	seccomp? ( sys-libs/libseccomp )
-	selinux? ( sys-libs/libselinux )"
-
-DEPEND="${RDEPEND}
-	>=app-text/docbook-sgml-utils-0.6.14-r2
-	>=sys-kernel/linux-headers-3.2"
-
-RDEPEND="${RDEPEND}
-	sys-apps/util-linux
-	app-misc/pax-utils
-	virtual/awk"
-
-PDEPEND="templates? ( app-emulation/lxc-templates )
-	python? ( dev-python/python3-lxc )"
-
-CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
-	~CPUSETS ~CGROUP_CPUACCT
-	~CGROUP_SCHED
-
-	~NAMESPACES
-	~IPC_NS ~USER_NS ~PID_NS
-
-	~CGROUP_FREEZER
-	~UTS_NS ~NET_NS
-	~VETH ~MACVLAN
-
-	~POSIX_MQUEUE
-	~!NETPRIO_CGROUP
-
-	~!GRKERNSEC_CHROOT_MOUNT
-	~!GRKERNSEC_CHROOT_DOUBLE
-	~!GRKERNSEC_CHROOT_PIVOT
-	~!GRKERNSEC_CHROOT_CHMOD
-	~!GRKERNSEC_CHROOT_CAPS
-	~!GRKERNSEC_PROC
-	~!GRKERNSEC_SYSFS_RESTRICT
-"
-
-ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES:  needed for pts inside container"
-
-ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER:  needed to freeze containers"
-
-ERROR_UTS_NS="CONFIG_UTS_NS:  needed to unshare hostnames and uname info"
-ERROR_NET_NS="CONFIG_NET_NS:  needed for unshared network"
-
-ERROR_VETH="CONFIG_VETH:  needed for internal (host-to-container) networking"
-ERROR_MACVLAN="CONFIG_MACVLAN:  needed for internal (inter-container) networking"
-
-ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE:  needed for lxc-execute command"
-
-ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP:  as of kernel 3.3 and lxc 0.8.0_rc1 this causes LXCs to fail booting."
-
-ERROR_GRKERNSEC_CHROOT_MOUNT="CONFIG_GRKERNSEC_CHROOT_MOUNT:  some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_DOUBLE="CONFIG_GRKERNSEC_CHROOT_DOUBLE:  some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_PIVOT="CONFIG_GRKERNSEC_CHROOT_PIVOT:  some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_CHMOD="CONFIG_GRKERNSEC_CHROOT_CHMOD:  some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_CAPS="CONFIG_GRKERNSEC_CHROOT_CAPS:  some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_PROC="CONFIG_GRKERNSEC_PROC:  this GRSEC feature is incompatible with unprivileged containers"
-ERROR_GRKERNSEC_SYSFS_RESTRICT="CONFIG_GRKERNSEC_SYSFS_RESTRICT:  this GRSEC feature is incompatible with unprivileged containers"
-
-DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt)
-
-pkg_setup() {
-	kernel_is -lt 4 7 && CONFIG_CHECK="${CONFIG_CHECK} ~DEVPTS_MULTIPLE_INSTANCES"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-3.0.0-bash-completion.patch
-	#558854
-	eapply "${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch
-	eapply "${FILESDIR}"/${PN}-3.0.1-cve-2018-6556.patch
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	# I am not sure about the --with-rootfs-path
-	# /var/lib/lxc is probably more appropriate than
-	# /usr/lib/lxc.
-	# Note by holgersson: Why is apparmor disabled?
-
-	# --enable-doc is for manpages which is why we don't link it to a "doc"
-	# USE flag. We always want man pages.
-	econf \
-		--localstatedir=/var \
-		--bindir=/usr/bin \
-		--sbindir=/usr/bin \
-		--with-config-path=/var/lib/lxc	\
-		--with-rootfs-path=/var/lib/lxc/rootfs \
-		--with-distro=gentoo \
-		--with-runtime-path=/run \
-		--disable-apparmor \
-		--disable-werror \
-		--enable-doc \
-		$(use_enable examples) \
-		$(use_enable pam) \
-		$(use_with pam pamdir $(getpam_mod_dir)) \
-		$(use_enable seccomp) \
-		$(use_enable selinux)
-}
-
-src_install() {
-	default
-
-	mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die
-	bashcomp_alias ${PN}-start \
-		${PN}-{attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,stop,unfreeze,wait}
-
-	keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc
-	rmdir "${D}"/var/cache/lxc "${D}"/var/cache || die "rmdir failed"
-
-	find "${D}" -name '*.la' -delete
-
-	# Gentoo-specific additions!
-	newinitd "${FILESDIR}/${PN}.initd.7" ${PN}
-
-	# Remember to compare our systemd unit file with the upstream one
-	# config/init/systemd/lxc.service.in
-	systemd_newunit "${FILESDIR}"/${PN}_at.service.4 "lxc@.service"
-
-	DOC_CONTENTS="
-	For openrc, there is an init script provided with the package.
-	You _should_ only need to symlink /etc/init.d/lxc to
-	/etc/init.d/lxc.configname to start the container defined in
-	/etc/lxc/configname.conf.
-
-	Correspondingly, for systemd a service file lxc@.service is installed.
-	Enable and start lxc@configname in order to start the container defined
-	in /etc/lxc/configname.conf.
-
-	If you want checkpoint/restore functionality, please install criu
-	(sys-process/criu)."
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-emulation/lxc/lxc-3.0.2.ebuild b/app-emulation/lxc/lxc-3.0.2.ebuild
index a80befa826a2..9d075f8a2a63 100644
--- a/app-emulation/lxc/lxc-3.0.2.ebuild
+++ b/app-emulation/lxc/lxc-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=7
@@ -11,7 +11,7 @@ DESCRIPTION="LinuX Containers userspace utilities"
 HOMEPAGE="https://linuxcontainers.org/"
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 LICENSE="LGPL-3"
 SLOT="0"
diff --git a/app-emulation/nemu/Manifest b/app-emulation/nemu/Manifest
index c6409cdaa766..a4a5507cda74 100644
--- a/app-emulation/nemu/Manifest
+++ b/app-emulation/nemu/Manifest
@@ -4,11 +4,13 @@ DIST nemu-1.3.0.tar.gz 70769 BLAKE2B 73108346c70f7ececd2b20cc91da323f2ecb4049140
 DIST nemu-1.4.0.tar.gz 84398 BLAKE2B 46ed3dfa392e8be472047612f4131e80ae3675c30b975320dbd21672bb8c5b3fc74dc0c5d1c4a5397f04c4bd725902d3f9b7d10808cab10fc89bb8199568cc10 SHA512 262b2eb7ead79b644110ecd4ea1858ef8d9775f3076e4df9f9c83149c148baf2b6db4645395301fabbda07f1e9e5577fe4f56a7eee010433ce02aa298fcee1a5
 DIST nemu-1.4.1.tar.gz 82891 BLAKE2B 2f2d85631fbde50513b56e86deb87c7ab8bf5478473ad8c1d3a5e6f276ce2a6b476667129ef3ee872de825736d1765d30db8a393c0a8e8b4308b6b5788095334 SHA512 b96388e3cf5106a21f189b375cedcb23f885b0f24c3c9b0e54bb51c04299c061ce2890b9dd168deb0b3afc70effa132e673f1475e42278fc6a6d703f7071c398
 DIST nemu-2.0.0.tar.gz 85769 BLAKE2B daadbd5925d56d3747b59a3a8f28ceeeb24a674e57f003cf07c67c24dc0ed73f024d35e2f02836d89c7568b7ac51bfc3c6131afb4864febdd6ac6f86a827bfee SHA512 74c489e35b96699fcc5f9cabdbe4445c1cdad5b06c2a18928e2270e169b76e009463177990c4f4d80b160e06118b0b4e87209132cc0ae0ee3d77e2d811865f5a
+DIST nemu-2.1.0.tar.gz 89117 BLAKE2B a44bf67990d79af0b73caf077266c4775f302ffc81d2394993da45870a72f462d487a92d63abdbe875c382d11b8d691f446a5e0b7270355770838ea86328fb1d SHA512 7e655227e22f5e2dd5ec1f77ef1635f1aaab2e57e417fb33d83d35cc67d7b802c35fa9174cf4282287213a1a825714743773260b96b452a382a8248fbef238bf
 EBUILD nemu-1.1.0.ebuild 873 BLAKE2B e12690f1d1126c8dfd810b599e9b35e4ef8d01411609009761df056ae1c297f0ef0968f2e4a5e1a8ec6d905e0bbe168a3b8c2b8d478657f1a3b855512479374f SHA512 8639e85e33e4941e3425473e363c710d8e0cc1a09aed00d31c12a349065ba3be98392cfdb3fb2d82e1381caac17a07f6862733aed0215bff931e4dd33930a2b5
 EBUILD nemu-1.2.0.ebuild 873 BLAKE2B e12690f1d1126c8dfd810b599e9b35e4ef8d01411609009761df056ae1c297f0ef0968f2e4a5e1a8ec6d905e0bbe168a3b8c2b8d478657f1a3b855512479374f SHA512 8639e85e33e4941e3425473e363c710d8e0cc1a09aed00d31c12a349065ba3be98392cfdb3fb2d82e1381caac17a07f6862733aed0215bff931e4dd33930a2b5
 EBUILD nemu-1.3.0.ebuild 873 BLAKE2B e12690f1d1126c8dfd810b599e9b35e4ef8d01411609009761df056ae1c297f0ef0968f2e4a5e1a8ec6d905e0bbe168a3b8c2b8d478657f1a3b855512479374f SHA512 8639e85e33e4941e3425473e363c710d8e0cc1a09aed00d31c12a349065ba3be98392cfdb3fb2d82e1381caac17a07f6862733aed0215bff931e4dd33930a2b5
 EBUILD nemu-1.4.0.ebuild 1891 BLAKE2B 27b52bc602b79f36049ef3c6d821bab4ea2d41d8d8b4e7db724471a70e57f31b00fb3e536d0f05e985bc0e9fb0bd108a81cedb06d1e7196b51d784fd3fefe64c SHA512 93f84ddd87c8796431d9e0bd42e437be3fd4cd774ba34252866dfba20ee8572a728578b05edda974af13977c42b60dadef2cd29208da568aba27e0f9bbaaebd3
 EBUILD nemu-1.4.1.ebuild 1677 BLAKE2B 86cda2a8ea881b7ad662a6a4cde1b167329d42343929556aeb2ed0df639a240e5775e92c6a866843691750a3efb7d1ede1e8d1c53a9ad956cdb1867b0879eaa9 SHA512 328d92af10ace6733a6cba58ede2bfe75fa464fc208fa81faf9a6c6e0d6e56ef7328dc4ec1e8295a6908fd9d438d0931dc84b59091e17d46c057d0e0dc48cb41
 EBUILD nemu-2.0.0.ebuild 1677 BLAKE2B 86cda2a8ea881b7ad662a6a4cde1b167329d42343929556aeb2ed0df639a240e5775e92c6a866843691750a3efb7d1ede1e8d1c53a9ad956cdb1867b0879eaa9 SHA512 328d92af10ace6733a6cba58ede2bfe75fa464fc208fa81faf9a6c6e0d6e56ef7328dc4ec1e8295a6908fd9d438d0931dc84b59091e17d46c057d0e0dc48cb41
+EBUILD nemu-2.1.0.ebuild 1677 BLAKE2B 86cda2a8ea881b7ad662a6a4cde1b167329d42343929556aeb2ed0df639a240e5775e92c6a866843691750a3efb7d1ede1e8d1c53a9ad956cdb1867b0879eaa9 SHA512 328d92af10ace6733a6cba58ede2bfe75fa464fc208fa81faf9a6c6e0d6e56ef7328dc4ec1e8295a6908fd9d438d0931dc84b59091e17d46c057d0e0dc48cb41
 EBUILD nemu-9999.ebuild 1916 BLAKE2B 232c49c84167c44c6fc3afd2e1b26cb6f820b53d345956c4d92058368f095206e3351ac431728a6f8847a88e53f09af7e39b5ff24874635b231b9a1ca6df7abc SHA512 87b016f6a485c921222428b96b11687cfb906118cfc398318b14f45ebd1c09aeb710b0cdea389a41e5936478e31645925599b32fe203fe07559debb54d7ed9b4
 MISC metadata.xml 499 BLAKE2B 2d190da58be258c1e5e997128bc65e9f928c9ec86e9be23d43cc881c92d9cd65e9cdee6db7afb92abf799aaa552ad5ddcf6dbdafd26d12c2521e8724f7f98471 SHA512 42e56aaad5eff7d180c6af0ef571f5fca4e101e934fc7506387456d89068ab8446e861dcd1124d85d962bf05b48a26833d0883b7c152c7214c79c324c18d236f
diff --git a/app-emulation/nemu/nemu-2.1.0.ebuild b/app-emulation/nemu/nemu-2.1.0.ebuild
new file mode 100644
index 000000000000..fad6abdf3786
--- /dev/null
+++ b/app-emulation/nemu/nemu-2.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
+
+inherit cmake-utils linux-info
+
+DESCRIPTION="ncurses interface for QEMU"
+HOMEPAGE="https://lib.void.so/nemu"
+SRC_URI="http://lib.void.so/src/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+vnc-client +ovf savevm debug"
+
+RDEPEND="
+	virtual/udev:=
+	dev-db/sqlite:3=
+	virtual/libusb:1
+	app-emulation/qemu[vnc,virtfs]
+	sys-libs/ncurses:0=[unicode]
+	ovf? (
+		dev-libs/libxml2
+		app-arch/libarchive
+	)
+	vnc-client? ( net-misc/tigervnc )"
+
+DEPEND="
+	${RDEPEND}
+	sys-devel/gettext"
+
+src_configure() {
+	local mycmakeargs=(
+		-DNM_WITH_VNC_CLIENT=$(usex vnc-client)
+		-DNM_DEBUG=$(usex debug)
+		-DNM_SAVEVM_SNAPSHOTS=$(usex savevm)
+		-DNM_WITH_OVF_SUPPORT=$(usex ovf)
+	)
+	cmake-utils_src_configure
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		if ! linux_config_exists; then
+			eerror "Unable to check your kernel"
+		else
+			CONFIG_CHECK="~VETH ~MACVTAP"
+			ERROR_VETH="You will need the Virtual ethernet pair device driver compiled"
+			ERROR_VETH+=" into your kernel or loaded as a module to use the"
+			ERROR_VETH+=" local network settings feature."
+			ERROR_MACVTAP="You will also need support for MAC-VLAN based tap driver."
+
+			check_extra_config
+		fi
+	fi
+}
+
+pkg_postinst() {
+	elog "For non-root usage execute script:"
+	elog "/usr/share/nemu/scripts/setup_nemu_nonroot.sh linux <username>"
+	elog "and add udev rule:"
+	elog "cp /usr/share/nemu/scripts/42-net-macvtap-perm.rules /lib/udev/rules.d"
+	if use savevm; then
+		elog ""
+		elog "QEMU must be patched with qemu-qmp-savevm-VERSION.patch"
+		elog "Get this patch from nEMU repository"
+	fi
+}
diff --git a/app-emulation/qemu-guest-agent/Manifest b/app-emulation/qemu-guest-agent/Manifest
index 09b74ab5708a..307e56a754d7 100644
--- a/app-emulation/qemu-guest-agent/Manifest
+++ b/app-emulation/qemu-guest-agent/Manifest
@@ -7,5 +7,5 @@ AUX qemu-guest-agent-2.5.0-sysmacros.patch 365 BLAKE2B 0468e23b64612b0a9375ab6d4
 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 1731 BLAKE2B 91b6d9f6900240536bb92051217a2ca5b73ac631df6a06cac00089bb5e3f33482ac923d24bb2beeda03e05ec0418ad4c45e7bbc701bf94a962a66449a3b79841 SHA512 bab85f27d0a2fb6ba46d52fb565b3c34e37040a750c0d2704c75c742d5e5ec1b3560e45840a9bc3ae2da5391e3f4a9b80b8ba9d217ef18c4f7f532d4d1c65664
+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.12.0-r1.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-2.12.0-r1.ebuild
index ec4616852a89..753a720c1c90 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-2.12.0-r1.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-2.12.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 @@ 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"
+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"
diff --git a/app-emulation/wine-any/Manifest b/app-emulation/wine-any/Manifest
index 2c9d8201fc4c..81c306d93f95 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.13.tar.xz 20551460 BLAKE2B 2f8b1c2f72761b3c5541b8760be3009295dc9482257539edce83aa9d6022b2e8a25e1cee4fe56b69808e51e338fd330db5da17dec5dea4ba7684b5d7eb7e77d5 SHA512 a07a3d2a19261f9251f165ca4c14871e6ebda4d3f99da16f9fc41f06e80cae3fb50aeab96628c7a739e635e896dbb31c55df8b42c4637a058f9035c664c93a59
 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-d3d9-3.13.tar.gz 50546 BLAKE2B 2773503ad2c952c47982258c8b7d7486b5822bfd759a96aa138996aed5ac16d7e3c7add7700f4394292f6154fdd8d58dbfabad1faf8b5013fb88f68ed7657521 SHA512 c3da30c0ce7fca433a703e42213c4a4f6c7a1f8a2d7744555a385641e5c344772dfd142779978d131bf42e79cddb4925b9926fd96e7e1497e173a755f1ec6ce5
+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-d3d9-3.15.tar.gz 50540 BLAKE2B 5fbb56d4e6b2373fa9a2075a379e577584a50c04fa15fbe3e282d25b03211e64dc5f429082a654c3c61016ddda9c5a12277b78086a0938e5cb20952b01ef72e2 SHA512 448433198cb40628edf2ee6f7697671c9efb1c8e68ce826b0edc884625e5f1659956f0c76ea995443c29ca4cefe5030559860d7413f553fc4a3523df3a35b3a7
 DIST wine-d3d9-3.16.tar.gz 50547 BLAKE2B d2031ceeb048a1221bd99c634b4ff84787b46fe79bb781c429706c5030a2509792ee3f24ca0d69d844d2d1e505c688aec255b5bf9a6561dc74a819360522c8df SHA512 3f1d2d75fc11ea7dfbe6b9e4e75c4dccc6488814e53be53ba7513da56848d6a57a7a7c66a70088b0615078b00a784caa9033d0415d3c3bb29adbd373d72a4d10
-DIST wine-staging-3.13.tar.gz 9936353 BLAKE2B f5791c6f1bc43395860ea938cfadefe88e6839e44d6e3a8c5b9474e1ec17654645145459a2a9c32adbec6a5cd6441f754b0121958ff4c12e424262bb61c18358 SHA512 0124950cc18d566daecc532a432bce27d712f48eaaa9b37bf930e056b460e30a8fb1806aa179f72b44a95dc56963a3dc063b4acb71affb7b8ddff3001fe59b9a
+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-staging-3.15.tar.gz 9941091 BLAKE2B 5a0e37ce52ff3e6130434aa56953e70fafb0c83dc33fa1ad7562a9244821ae75c30b9c858c7506462348b6d13016c236a14bde0297bc43d2d282d60c6c012470 SHA512 f0ed9d4a099b03c04a126927919b7eddbdaff7a08a0b97cdf387c64318826d6454183cf03997425b349540d13b1ccf6262aa2c5af0af682939584e3de71b7541
 DIST wine-staging-3.16.tar.gz 9928264 BLAKE2B 61882e36da7026b078e753de7a3a089fc64578fc2cf4ceb27146125003e86cc386ada2fa55d48e40279665218ae630bf63fce12b72acddfd8e4a6ea1730a9fca SHA512 25f06b06a0880b3926d9d3dfb35fd1aeb1f168426917dee32dcf906970474862021416f4e9db1917d8320962bc0bc17d1f3dad21b634a60b8e0da87a4b54067e
-EBUILD wine-any-3.13-r1.ebuild 20976 BLAKE2B d60f542984ac61b151add9c8440e7a8a62e91adb2f8cdd7a1ecaa03380e93bab5e2d3b7406fa459e6d2443fbcb74319d104643633cef9cadafe4143d866bd70d SHA512 f628e766b27699753535e8d3915bc620fdae8a914972f5b9a6e02a6bf85ffcc17c7b7cbaaf67b656bad775671f71a5cc84d548cdaad02485b26ee34f126cce04
+DIST wine-staging-3.17.tar.gz 9928657 BLAKE2B 549c44cb07423405b95351a8b7c2675ea8dafc015d457b87235d36c7b115778336bd52d6fa97b10dd9d439c8938f05fc81b6b73082680d906db93c8e401f29c8 SHA512 2fe9e8f801b53fa9b71fd908f5403956251522851383bfdde6828c6a8545d6f50ac8c41df54d89c2f92d74dc3bb563cd6a7d8ad394002c981197b71adc1a5e13
 EBUILD wine-any-3.14.ebuild 20976 BLAKE2B d60f542984ac61b151add9c8440e7a8a62e91adb2f8cdd7a1ecaa03380e93bab5e2d3b7406fa459e6d2443fbcb74319d104643633cef9cadafe4143d866bd70d SHA512 f628e766b27699753535e8d3915bc620fdae8a914972f5b9a6e02a6bf85ffcc17c7b7cbaaf67b656bad775671f71a5cc84d548cdaad02485b26ee34f126cce04
 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-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.13-r1.ebuild b/app-emulation/wine-any/wine-any-3.13-r1.ebuild
deleted file mode 100644
index 66208fb6657b..000000000000
--- a/app-emulation/wine-any/wine-any-3.13-r1.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.17.ebuild b/app-emulation/wine-any/wine-any-3.17.ebuild
new file mode 100644
index 000000000000..67fbe2cda640
--- /dev/null
+++ b/app-emulation/wine-any/wine-any-3.17.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 1f7af4e1eda1..a48a1234a2e2 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.13.tar.xz 20551460 BLAKE2B 2f8b1c2f72761b3c5541b8760be3009295dc9482257539edce83aa9d6022b2e8a25e1cee4fe56b69808e51e338fd330db5da17dec5dea4ba7684b5d7eb7e77d5 SHA512 a07a3d2a19261f9251f165ca4c14871e6ebda4d3f99da16f9fc41f06e80cae3fb50aeab96628c7a739e635e896dbb31c55df8b42c4637a058f9035c664c93a59
 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-d3d9-3.13.tar.gz 50546 BLAKE2B 2773503ad2c952c47982258c8b7d7486b5822bfd759a96aa138996aed5ac16d7e3c7add7700f4394292f6154fdd8d58dbfabad1faf8b5013fb88f68ed7657521 SHA512 c3da30c0ce7fca433a703e42213c4a4f6c7a1f8a2d7744555a385641e5c344772dfd142779978d131bf42e79cddb4925b9926fd96e7e1497e173a755f1ec6ce5
+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-d3d9-3.15.tar.gz 50540 BLAKE2B 5fbb56d4e6b2373fa9a2075a379e577584a50c04fa15fbe3e282d25b03211e64dc5f429082a654c3c61016ddda9c5a12277b78086a0938e5cb20952b01ef72e2 SHA512 448433198cb40628edf2ee6f7697671c9efb1c8e68ce826b0edc884625e5f1659956f0c76ea995443c29ca4cefe5030559860d7413f553fc4a3523df3a35b3a7
 DIST wine-d3d9-3.16.tar.gz 50547 BLAKE2B d2031ceeb048a1221bd99c634b4ff84787b46fe79bb781c429706c5030a2509792ee3f24ca0d69d844d2d1e505c688aec255b5bf9a6561dc74a819360522c8df SHA512 3f1d2d75fc11ea7dfbe6b9e4e75c4dccc6488814e53be53ba7513da56848d6a57a7a7c66a70088b0615078b00a784caa9033d0415d3c3bb29adbd373d72a4d10
-EBUILD wine-d3d9-3.13-r1.ebuild 18592 BLAKE2B 8bc6780621a208ff8f65e1874728fe9b5f9cadb6096e76e558cba81756c60df1e6854b32db07200ec497daeacee81254969b80b62d5e6a7038b6089843f9d052 SHA512 c4e8ab68885b8342b5ea28f97f103b8ead51e34bdd9abc7f3ef880540a9ed41256d19c9e5b81df0d87f0bb433fc21fcdea770388bb14ab3f074e1a47f0e566f3
+DIST wine-d3d9-3.17.tar.gz 50535 BLAKE2B 13e422d9c87696e7573f21120dbc4872792b6abd6dc28638ea3645d97eae1a6d12e8a8f91a219856aa5bf83c3882bc27fd52c5ae66f87a51d362694728f583ba SHA512 06b4c28650a6de9b5028ba9072f75f12c1d47aaa1008d4d21d1c3d26025dd1e42fa23928d2c33167dd969fcd9234b7766f4c6c2e0376b5aad5b38016e48296f8
 EBUILD wine-d3d9-3.14.ebuild 18592 BLAKE2B 8bc6780621a208ff8f65e1874728fe9b5f9cadb6096e76e558cba81756c60df1e6854b32db07200ec497daeacee81254969b80b62d5e6a7038b6089843f9d052 SHA512 c4e8ab68885b8342b5ea28f97f103b8ead51e34bdd9abc7f3ef880540a9ed41256d19c9e5b81df0d87f0bb433fc21fcdea770388bb14ab3f074e1a47f0e566f3
 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-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.13-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-3.13-r1.ebuild
deleted file mode 100644
index b92ea182b4a0..000000000000
--- a/app-emulation/wine-d3d9/wine-d3d9-3.13-r1.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.17.ebuild b/app-emulation/wine-d3d9/wine-d3d9-3.17.ebuild
new file mode 100644
index 000000000000..175fd1b98d03
--- /dev/null
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.17.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 4abdc9d992f0..3270999f48e6 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.13.tar.xz 20551460 BLAKE2B 2f8b1c2f72761b3c5541b8760be3009295dc9482257539edce83aa9d6022b2e8a25e1cee4fe56b69808e51e338fd330db5da17dec5dea4ba7684b5d7eb7e77d5 SHA512 a07a3d2a19261f9251f165ca4c14871e6ebda4d3f99da16f9fc41f06e80cae3fb50aeab96628c7a739e635e896dbb31c55df8b42c4637a058f9035c664c93a59
 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-staging-3.13.tar.gz 9936353 BLAKE2B f5791c6f1bc43395860ea938cfadefe88e6839e44d6e3a8c5b9474e1ec17654645145459a2a9c32adbec6a5cd6441f754b0121958ff4c12e424262bb61c18358 SHA512 0124950cc18d566daecc532a432bce27d712f48eaaa9b37bf930e056b460e30a8fb1806aa179f72b44a95dc56963a3dc063b4acb71affb7b8ddff3001fe59b9a
+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-staging-3.15.tar.gz 9941091 BLAKE2B 5a0e37ce52ff3e6130434aa56953e70fafb0c83dc33fa1ad7562a9244821ae75c30b9c858c7506462348b6d13016c236a14bde0297bc43d2d282d60c6c012470 SHA512 f0ed9d4a099b03c04a126927919b7eddbdaff7a08a0b97cdf387c64318826d6454183cf03997425b349540d13b1ccf6262aa2c5af0af682939584e3de71b7541
 DIST wine-staging-3.16.tar.gz 9928264 BLAKE2B 61882e36da7026b078e753de7a3a089fc64578fc2cf4ceb27146125003e86cc386ada2fa55d48e40279665218ae630bf63fce12b72acddfd8e4a6ea1730a9fca SHA512 25f06b06a0880b3926d9d3dfb35fd1aeb1f168426917dee32dcf906970474862021416f4e9db1917d8320962bc0bc17d1f3dad21b634a60b8e0da87a4b54067e
-EBUILD wine-staging-3.13-r1.ebuild 20008 BLAKE2B a3b4e250e3692f505c9a71b18744ebe7aad3df10af0e8cf5ab3c55325bea6c6e4136153967371cf052dbc4214fa698e50e2602abebe4433bbf1cec97e9b85af6 SHA512 4b6ea3cab70228719f69d6bdb62bc52db9360a528832f3b7a57de953dc0fc28764e55baa66713aa22a179bdda1d6714f9b399403dd4a3afb12c7e041fe53ea7f
+DIST wine-staging-3.17.tar.gz 9928657 BLAKE2B 549c44cb07423405b95351a8b7c2675ea8dafc015d457b87235d36c7b115778336bd52d6fa97b10dd9d439c8938f05fc81b6b73082680d906db93c8e401f29c8 SHA512 2fe9e8f801b53fa9b71fd908f5403956251522851383bfdde6828c6a8545d6f50ac8c41df54d89c2f92d74dc3bb563cd6a7d8ad394002c981197b71adc1a5e13
 EBUILD wine-staging-3.14.ebuild 20008 BLAKE2B a3b4e250e3692f505c9a71b18744ebe7aad3df10af0e8cf5ab3c55325bea6c6e4136153967371cf052dbc4214fa698e50e2602abebe4433bbf1cec97e9b85af6 SHA512 4b6ea3cab70228719f69d6bdb62bc52db9360a528832f3b7a57de953dc0fc28764e55baa66713aa22a179bdda1d6714f9b399403dd4a3afb12c7e041fe53ea7f
 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-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.13-r1.ebuild b/app-emulation/wine-staging/wine-staging-3.13-r1.ebuild
deleted file mode 100644
index 2977288b1ee9..000000000000
--- a/app-emulation/wine-staging/wine-staging-3.13-r1.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.17.ebuild b/app-emulation/wine-staging/wine-staging-3.17.ebuild
new file mode 100644
index 000000000000..fcac5949b93a
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-3.17.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 89c6a24fc2ba..523f67e8f09b 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.13.tar.xz 20551460 BLAKE2B 2f8b1c2f72761b3c5541b8760be3009295dc9482257539edce83aa9d6022b2e8a25e1cee4fe56b69808e51e338fd330db5da17dec5dea4ba7684b5d7eb7e77d5 SHA512 a07a3d2a19261f9251f165ca4c14871e6ebda4d3f99da16f9fc41f06e80cae3fb50aeab96628c7a739e635e896dbb31c55df8b42c4637a058f9035c664c93a59
 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
 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.13-r1.ebuild 17348 BLAKE2B 6a2f9c95b26d920bd8984a2f9d583cd52097719bf564ad438ed0af59595d37433b2d7242702c14acb57300a321f96502fc0a86e0473466138cfc55462cc09b48 SHA512 38b1f5c1fab78fc5a3429d9cc11240420b796434e16af249be7ac54823ade974aabbaef6863bc3e829e6ba36eee56df536707466046609bcba9d977707e370b8
 EBUILD wine-vanilla-3.14.ebuild 17348 BLAKE2B 6a2f9c95b26d920bd8984a2f9d583cd52097719bf564ad438ed0af59595d37433b2d7242702c14acb57300a321f96502fc0a86e0473466138cfc55462cc09b48 SHA512 38b1f5c1fab78fc5a3429d9cc11240420b796434e16af249be7ac54823ade974aabbaef6863bc3e829e6ba36eee56df536707466046609bcba9d977707e370b8
 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-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.13-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.13-r1.ebuild
deleted file mode 100644
index 9a0d8ea7f20a..000000000000
--- a/app-emulation/wine-vanilla/wine-vanilla-3.13-r1.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.17.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.17.ebuild
new file mode 100644
index 000000000000..72a38a225bc2
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.17.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/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest
index 8b0a86df0bf8..bd03304e3b56 100644
--- a/app-emulation/xen-pvgrub/Manifest
+++ b/app-emulation/xen-pvgrub/Manifest
@@ -1,4 +1,5 @@
 AUX newlib-implicits.patch 5307 BLAKE2B bf4b9bb51d863815df6e0e4097be224a49ef67d997bee8cf7d7d282f17cd43983058701739c5b3fabbc1f5ce16c8e3962421a1f3a541f6884ccd0fb6e0b53bba SHA512 582cfa36dbb44e8abc83120d44af78a7a7cd3f7a009c65858f3d68276bf5f772b18c4692b7e68202f9ec246e29c785fa111b19bcaefc2f04f429f1b69e77d48f
+AUX xen-4.10-externals.patch 2742 BLAKE2B 286bb4901c2b09728087e804468f75a0b93e705c80d1621b19b01351bc5548fd7303d269e2f2178a5097011cb319d8f0ddb8486d975eabfca274acb1becf6a5f SHA512 25b1b4a731b6903e63f382a7a8db815126cbdb5b8754c7e3bea020152ba1c6174f89878489fa75132eca9ef242a57cb0990eb7d5b9cd5708ad34c97e4c892756
 AUX xen-4.3-externals.patch 2806 BLAKE2B 43eca80ffc7381dffcbaa9fd61657d7c6038d2a4ccb32e7dc49fc0bf57abb4e84ecf63701aa61ee5392296fc39f4eec64c5f87695ef702864252230e66c30186 SHA512 07e9270ef404dfb765be284887e6d24202ac1783d08e7d30a768d461d6565fac4a4e9625b245610353bf2b76baf54c736170bfc84ed507491f7876e0d7a11c7d
 AUX xen-pvgrub-4.8-jserver.patch 547 BLAKE2B 02539834c0c4d6c5b1d1b2304770bfca6372db20e1b213637f5e9874cb1288c2bb9bac72b5b4c1f97ee2dcc3f9646f4b9408daff2d1b975c2fdefc82f110da2f SHA512 38819b6041d679257a8ebf91f481bf3d9957d3c25ead64725fba9f83fee033235909a8599e986604546008c3077f37db332958fee70eafb4016d723c2e2bfc2a
 DIST grub-0.97.tar.gz 971783 BLAKE2B a7b6feb6dddb6eeb20e027071091b2d37930e5b40687f8c8ff860839db208f832713db61389014d21842e1e152cad0466dc9722a79cbb81bfa1566a30b6b82cc SHA512 c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb
@@ -8,11 +9,11 @@ DIST pciutils-2.2.9.tar.bz2 212265 BLAKE2B 014b664e90c64e7255c9e21fc25a2cc60d57f
 DIST polarssl-1.1.4-gpl.tgz 611340 BLAKE2B 613da06dda9e4b86db5a4d616a0a0afee98c907c3c6b352eed3d9e500fc5739e62eb4f6fc32ff02579c6a6de9bd49fcd2c8bd8b2d158a5050cbaa82118d61ef0 SHA512 88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad
 DIST xen-4.10.1-upstream-patches-2.tar.xz 117588 BLAKE2B ddcd58964117652b50f3524d89089e2e9b14a8399fb5bd2db5d12827035ab94cedbfd5d65134d8953e4062a50e0e8a9b320e9c34008db8fd364456f47fd9cd26 SHA512 49ee8497af3753f3d611bf12c65fb7a79abb018862f1af096e9dde3ddfe8780bb95fc3da338c8d5f16a5d6d233d606d4cf8025a3d0e2897bf2668a1d5b27b198
 DIST xen-4.10.1.tar.gz 24674240 BLAKE2B f9a7e0c637db865ab32ad6b6185ab96022903aff65a18e194286a3fc372d4a45f6682cd636b7ac5b4fa0125e54ed51f8876a411d498cf75791718fd088c4a6d2 SHA512 236c02bee69e33644703ed26d323d4c491a91fc05bd0ee0990a7368579f7c82f5bb4510845bf80348fd923024d7d60d521f593dfd0365d971dc592f8ef10fbea
+DIST xen-4.10.2.tar.gz 24697204 BLAKE2B b331d3ad8d7842446f7d2da5dd31560f636aa1408dd3cc8798dff35b868ef5a609d17e97ef4355e1e5aa825a5abc74103796f9a8015037f0a564ffcebd825722 SHA512 2e301b4d6eb106fcb52203bc1208c8fd1fc7bb5d795166c0f86e4085227050301f7daa6f21db440c47bc2ca2c7f87d9b96753cfdf3fa724e0416b5679b84c163
 DIST xen-4.11.0-upstream-patches-1.tar.xz 56664 BLAKE2B 27579f4e628bb0d3fdd59f7e133e9134d4ca175842dfdae3a3f765b133254239ae3bca94d75dd655735b5bcbd67f9b8d444dd227028642e6e459e57ed8a20341 SHA512 e90b8e7fa9433e93b1620a776833a6d3578babebe5d73dcaae11186f473945a2270046932ab314a9c6049d3b460a655456f487a5b59730fe88a4f08d482c47a1
 DIST xen-4.11.0.tar.gz 25131533 BLAKE2B 892639b8bcd9b9956104e4d5137ffd88e17f92d965fa967b4af8d74a4fddcc21c6971c53026e0fb5ce833ab2c25c68f827abcac0b7b1dcebc21dca645c465573 SHA512 33d431c194f10d5ee767558404a1f80a66b3df019012b0bbd587fcbc9524e1bba7ea04269020ce891fe9d211d2f81c63bf78abedcdbe1595aee26251c803a50a
-DIST xen-4.9.2.tar.gz 23392753 BLAKE2B 5f96f0e5062eff8ac2971eef85ea2bae0e94e7542151237937a1cf7e74690bb0ce1c952e830d2fc13b3277f70b9ed1de511afe4f780ad7b3be0c58742ece39b2 SHA512 e06aec25439abcc548c174ba8e271c23031ea704bcc2480905140aa68490064fbb1c58d9c4174f6617b4f7bbcddfda284317df6f480a6e5b5b5a2c71fbe0ac93
 DIST zlib-1.2.3.tar.gz 496597 BLAKE2B 603020b70cd52b83e48bde420b86e2acfd29d69bf7476eecbeeb07d1b8bcab703d2cbd3eab77772990bddb8c268f13594592ce985798d49e2d6ba25104d49f22 SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e
 EBUILD xen-pvgrub-4.10.1.ebuild 5054 BLAKE2B 6d4135357a7f69691f97ea37c78e6523636bee9210f562e8498d61f2fd22121f3727ffa55a18968fe4bbc2ddcbb86f90bf645b5b0e23f2813d88df0bc811c4fd SHA512 d6c61408bbc9a760ac00923275ac8c56bc59cec06b6d642458ec2da89c62ff4a74620e23f984dcee9f60009d421ec55381d5ef6936588da6fd1dd424f62dd787
+EBUILD xen-pvgrub-4.10.2.ebuild 5045 BLAKE2B c23a65e17ae4ab5fcc967daff7b35ae6df819ad3533d3469fb1cd02eb4d216096744f329f4500b5304021c13c89afd773a3d84f69d9da982196ed82eff9c4ab6 SHA512 af609cbf0ecab2b7decbd3121a6fbabc720ef25e936572a0ba0f7559e1e35adf046d64bc5cb52fb298c0721b9a5f7fe7294fd0fe9ba761f160260c2e5f870701
 EBUILD xen-pvgrub-4.11.0.ebuild 5055 BLAKE2B 5f36d5ea8e6ba604c4a37cc5da0c7cbf69c481af1e0c241c92fc04eccf21d07960da278a61ca9a416b7bd2375018526ab511e0eb850c1d3411c16013530f8b47 SHA512 de08181157bb50a73ee007e0ac8d335d7830cfe9094381a361d7b60fffed44d71506e6d4c7a8339337025c4a5dfca7e2d44084ee004b882d4d29bde863a05c25
-EBUILD xen-pvgrub-4.9.2.ebuild 4867 BLAKE2B aa2e4f8620adc7c978d2ea86b5304df90d31062440d6b7039336f30882bb02eb4ead8c50ba79045b1477abac7a651c9d00bae0cf8a72c5576d85e00ca660d35e SHA512 dccfd9eaa96a8e12e9f60b2a864f96729568bd75626461df8792e47356d8a4829605f690bbbddf648077c1f27609b7aa622687298173f6a86c8afcd19f2dcd3e
 MISC metadata.xml 245 BLAKE2B 2bf2c7848c8c513915aaad9305b6146cf46201bbcf3ffa040c943b7188d2d2a9fe27e2b5ecde84ed2099dceadd4b057856df01ac603a6aceca0f7b7f466174c7 SHA512 3f646ec3197e46d25dde4f698b571fb85b040198f4cba7508c8d38405b4d9d0fc31dbd5ae6242aea8c2acd613aabe0486cb347a1db4811fa807b861148661f8b
diff --git a/app-emulation/xen-pvgrub/files/xen-4.10-externals.patch b/app-emulation/xen-pvgrub/files/xen-4.10-externals.patch
new file mode 100644
index 000000000000..b206144e304e
--- /dev/null
+++ b/app-emulation/xen-pvgrub/files/xen-4.10-externals.patch
@@ -0,0 +1,74 @@
+--- a/stubdom/Makefile	2013-07-09 18:46:56.000000000 +0800
++++ b/stubdom/Makefile	2013-07-21 16:07:08.094663570 +0800
+@@ -68,12 +68,12 @@
+ ##############
+ 
+ newlib-$(NEWLIB_VERSION).tar.gz:
+-	$(FETCHER) $@ $(NEWLIB_URL)/$@
+ 
+ newlib-$(NEWLIB_VERSION): newlib-$(NEWLIB_VERSION).tar.gz
+ 	tar xzf $<
+ 	patch -d $@ -p0 < newlib.patch
+ 	patch -d $@ -p0 < newlib-chk.patch
++	patch -d $@ -p0 < newlib-implicits.patch
+ 	patch -d $@ -p1 < newlib-stdint-size_max-fix-from-1.17.0.patch
+ 	find $@ -type f | xargs perl -i.bak \
+ 		-pe 's/\b_(tzname|daylight|timezone)\b/$$1/g'
+@@ -85,7 +85,7 @@
+ $(NEWLIB_STAMPFILE): mk-headers-$(XEN_TARGET_ARCH) newlib-$(NEWLIB_VERSION)
+ 	mkdir -p newlib-$(XEN_TARGET_ARCH)
+ 	( cd newlib-$(XEN_TARGET_ARCH) && \
+-	  CC_FOR_TARGET="$(CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(NEWLIB_CFLAGS)" AR_FOR_TARGET=$(AR) LD_FOR_TARGET=$(LD) RANLIB_FOR_TARGET=$(RANLIB) ../newlib-$(NEWLIB_VERSION)/configure --prefix=$(CROSS_PREFIX) --verbose --target=$(GNU_TARGET_ARCH)-xen-elf --enable-newlib-io-long-long --disable-multilib && \
++	CC_FOR_TARGET="$(CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(NEWLIB_CFLAGS)" AR_FOR_TARGET=$(AR) LD_FOR_TARGET=$(LD) LDFLAGS= RANLIB_FOR_TARGET=$(RANLIB) ../newlib-$(NEWLIB_VERSION)/configure --prefix=$(CROSS_PREFIX) --verbose --target=$(GNU_TARGET_ARCH)-xen-elf --enable-newlib-io-long-long --disable-multilib && \
+ 	  $(MAKE) DESTDIR= && \
+ 	  $(MAKE) DESTDIR= install )
+ 
+@@ -94,7 +94,6 @@
+ ############
+ 
+ zlib-$(ZLIB_VERSION).tar.gz:
+-	$(FETCHER) $@ $(ZLIB_URL)/$@
+ 
+ zlib-$(XEN_TARGET_ARCH): zlib-$(ZLIB_VERSION).tar.gz 
+ 	tar xzf $<
+@@ -105,7 +104,7 @@
+ cross-zlib: $(ZLIB_STAMPFILE)
+ $(ZLIB_STAMPFILE): zlib-$(XEN_TARGET_ARCH) $(NEWLIB_STAMPFILE)
+ 	( cd $< && \
+-	  CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" CC=$(CC) ./configure --prefix=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf && \
++	  CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" CC="$(CC)" ./configure --prefix=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf && \
+ 	  $(MAKE) DESTDIR= libz.a && \
+ 	  $(MAKE) DESTDIR= install )
+ 
+@@ -114,7 +113,6 @@
+ ##############
+ 
+ pciutils-$(LIBPCI_VERSION).tar.bz2:
+-	$(FETCHER) $@ $(LIBPCI_URL)/$@
+ 
+ pciutils-$(XEN_TARGET_ARCH): pciutils-$(LIBPCI_VERSION).tar.bz2
+ 	tar xjf $<
+@@ -142,7 +140,6 @@
+ ######
+ 
+ lwip-$(LWIP_VERSION).tar.gz:
+-	$(FETCHER) $@ $(LWIP_URL)/$@
+ 
+ lwip-$(XEN_TARGET_ARCH): lwip-$(LWIP_VERSION).tar.gz
+ 	tar xzf $<
+@@ -180,7 +177,6 @@
+ # cross-polarssl
+ #############
+ polarssl-$(POLARSSL_VERSION)-gpl.tgz:
+-	$(FETCHER) $@ $(POLARSSL_URL)/$@
+ 
+ polarssl-$(XEN_TARGET_ARCH): polarssl-$(POLARSSL_VERSION)-gpl.tgz
+ 	tar xzf $<
+@@ -385,7 +382,6 @@
+ ######
+ 
+ grub-$(GRUB_VERSION).tar.gz:
+-	$(FETCHER) $@ $(GRUB_URL)/$@
+ 
+ grub-upstream: grub-$(GRUB_VERSION).tar.gz
+ 	tar xzf $<
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.10.2.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.10.2.ebuild
new file mode 100644
index 000000000000..f4536845d19e
--- /dev/null
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.10.2.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='xml,threads'
+
+inherit flag-o-matic multilib python-single-r1 toolchain-funcs
+
+XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
+LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
+GRUB_URL=mirror://gnu-alpha/grub
+
+UPSTREAM_VER=
+[[ -n ${UPSTREAM_VER} ]] && \
+	UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+
+SRC_URI="
+		https://downloads.xenproject.org/release/xen/${PV}/xen-${PV}.tar.gz
+		$GRUB_URL/grub-0.97.tar.gz
+		$XEN_EXTFILES_URL/zlib-1.2.3.tar.gz
+		$LIBPCI_URL/pciutils-2.2.9.tar.bz2
+		$XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
+		$XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz
+		$XEN_EXTFILES_URL/polarssl-1.1.4-gpl.tgz
+		${UPSTREAM_PATCHSET_URI}"
+
+S="${WORKDIR}/xen-${PV}"
+
+DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
+HOMEPAGE="https://www.xenproject.org"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="custom-cflags"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="sys-devel/gettext
+	sys-devel/bin86
+	sys-apps/texinfo
+	x11-libs/pixman"
+
+RDEPEND="${PYTHON_DEPS}
+	>=app-emulation/xen-tools-${PV}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+retar-externals() {
+	# Purely to unclutter src_prepare
+	local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz polarssl-1.1.4-gpl.tgz zlib-1.2.3.tar.gz"
+
+	# eapply can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative
+	sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \
+		-i "${WORKDIR}"/zlib-1.2.3/configure
+	sed -e 's:^AR=ar rc:AR=ar:' \
+		-e s':$(AR) $@:$(AR) rc $@:' \
+		-i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in}
+	einfo "zlib Makefile edited"
+
+	cd "${WORKDIR}"
+	tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz
+	tar czp grub-0.97 -f grub-0.97.tar.gz
+	tar czp lwip -f lwip-1.3.0.tar.gz
+	tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz
+	tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz
+	mv $set "${S}"/stubdom/
+	einfo "tarballs moved to source"
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Xen Upstream patch set"
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			eapply "${WORKDIR}"/patches-upstream
+	fi
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \;
+	fi
+
+	# Patch the unmergeable newlib, fix most of the leftover gcc QA issues
+	cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
+
+	# Patch stubdom/Makefile to patch insource newlib & prevent internal downloading
+	eapply "${FILESDIR}"/${PN/-pvgrub/}-4.10-externals.patch
+
+	# fix jobserver in Makefile
+	eapply "${FILESDIR}"/${PN}-4.8-jserver.patch
+
+	#Substitute for internal downloading. pciutils copied only due to the only .bz2
+	cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
+	retar-externals || die "re-tar procedure failed"
+
+	default
+}
+
+src_configure() {
+	local myconf="--prefix=${PREFIX}/usr \
+		--libdir=${PREFIX}/usr/$(get_libdir) \
+		--libexecdir=${PREFIX}/usr/libexec \
+		--disable-werror \
+		--disable-xen"
+
+	econf ${myconf}
+}
+
+src_compile() {
+	use custom-cflags || unset CFLAGS
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/libs
+
+	if use x86; then
+		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
+		XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+	elif use amd64; then
+		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
+		XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
+		if has_multilib_profile; then
+			multilib_toolchain_setup x86
+			emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
+			XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+		fi
+	fi
+}
+
+src_install() {
+	if use x86; then
+		emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
+	fi
+	if use amd64; then
+		emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub
+		if has_multilib_profile; then
+			emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
+		fi
+	fi
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "https://wiki.xen.org/wiki/Main_Page"
+}
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.9.2.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.9.2.ebuild
deleted file mode 100644
index 138f1da19fe5..000000000000
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.9.2.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='xml,threads'
-
-inherit eutils flag-o-matic multilib python-single-r1 toolchain-funcs
-
-XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
-LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
-GRUB_URL=mirror://gnu-alpha/grub
-
-UPSTREAM_VER=
-[[ -n ${UPSTREAM_VER} ]] && \
-	UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-
-SRC_URI="
-		https://downloads.xenproject.org/release/xen/${PV}/xen-${PV}.tar.gz
-		$GRUB_URL/grub-0.97.tar.gz
-		$XEN_EXTFILES_URL/zlib-1.2.3.tar.gz
-		$LIBPCI_URL/pciutils-2.2.9.tar.bz2
-		$XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
-		$XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz
-		$XEN_EXTFILES_URL/polarssl-1.1.4-gpl.tgz
-		${UPSTREAM_PATCHSET_URI}"
-
-S="${WORKDIR}/xen-${PV}"
-
-DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
-HOMEPAGE="https://www.xenproject.org"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="custom-cflags"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="sys-devel/gettext
-	sys-devel/bin86
-	sys-apps/texinfo
-	x11-libs/pixman"
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-emulation/xen-tools-${PV}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-retar-externals() {
-	# Purely to unclutter src_prepare
-	local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz polarssl-1.1.4-gpl.tgz zlib-1.2.3.tar.gz"
-
-	# epatch can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative
-	sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \
-		-i "${WORKDIR}"/zlib-1.2.3/configure
-	sed -e 's:^AR=ar rc:AR=ar:' \
-		-e s':$(AR) $@:$(AR) rc $@:' \
-		-i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in}
-	einfo "zlib Makefile edited"
-
-	cd "${WORKDIR}"
-	tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz
-	tar czp grub-0.97 -f grub-0.97.tar.gz
-	tar czp lwip -f lwip-1.3.0.tar.gz
-	tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz
-	tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz
-	mv $set "${S}"/stubdom/
-	einfo "tarballs moved to source"
-}
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		einfo "Try to apply Xen Upstream patch set"
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_OPTS="-p1" \
-			epatch "${WORKDIR}"/patches-upstream
-	fi
-
-	# if the user *really* wants to use their own custom-cflags, let them
-	if use custom-cflags; then
-		einfo "User wants their own CFLAGS - removing defaults"
-		# try and remove all the default custom-cflags
-		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
-			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-			-i {} \;
-	fi
-
-	# Patch the unmergeable newlib, fix most of the leftover gcc QA issues
-	cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
-
-	# Patch stubdom/Makefile to patch insource newlib & prevent internal downloading
-	epatch "${FILESDIR}"/${PN/-pvgrub/}-4.3-externals.patch
-
-	# fix jobserver in Makefile
-	epatch "${FILESDIR}"/${PN}-4.8-jserver.patch
-
-	#Substitute for internal downloading. pciutils copied only due to the only .bz2
-	cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
-	retar-externals || die "re-tar procedure failed"
-
-	default
-}
-
-src_configure() {
-	local myconf="--prefix=${PREFIX}/usr \
-		--libdir=${PREFIX}/usr/$(get_libdir) \
-		--libexecdir=${PREFIX}/usr/libexec \
-		--disable-werror \
-		--disable-xen"
-
-	econf ${myconf}
-}
-
-src_compile() {
-	use custom-cflags || unset CFLAGS
-	if test-flag-CC -fno-strict-overflow; then
-		append-flags -fno-strict-overflow
-	fi
-
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include
-
-	if use x86; then
-		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
-		XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
-	elif use amd64; then
-		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
-		XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
-		if has_multilib_profile; then
-			multilib_toolchain_setup x86
-			emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
-			XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
-		fi
-	fi
-}
-
-src_install() {
-	if use x86; then
-		emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
-	fi
-	if use amd64; then
-		emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub
-		if has_multilib_profile; then
-			emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
-		fi
-	fi
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide and the offical wiki page:"
-	elog "https://wiki.gentoo.org/wiki/Xen"
-	elog "https://wiki.xen.org/wiki/Main_Page"
-}
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 8f9baa3703e3..30e4a5ddf3ce 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -1,4 +1,4 @@
-AUX gentoo-patches.conf 4908 BLAKE2B d2b6b92b5f7b22300872608b8f21f68b33423b19dc0dfcc70612eee83f0b5f5e252e2a646c67c1577e52562bbb0845f3bc420ab2e242cbb288ebd9405e97fb0d SHA512 be1a94bb52c8f0f8102d650c2bdfe7b04c04cf1813c2dc42ba2cff62da2b43d3644fafd1b204d577d573833c0510b639528521ef1737e7f438428ce9097acf78
+AUX gentoo-patches.conf 4188 BLAKE2B 747f2812a9556653aa33ac239749943093f066755ce0bad73bc583de5044f052d789e8f203565a1633955a12194c9cab0e04a453b988c45994cbcfc012d83f3a SHA512 38c864703bd08df7c6de281ca930c26cf161b08b364c964cc8d460717f6dc1664d6d81fc773140edec0fb091a051eb3d7cbd170946d8b2f0c0aef970ac179be6
 AUX stubs-32.h 537 BLAKE2B 456f57c4a4ba574c737f1b84b62a085d0290ebc8981a5f96fdebc16b6c86c801c5ca8dde135e803f46c5ec875fdd74770f6ed754880bc7af930b8ce1ce972fb7 SHA512 55308dbedaa91909a2213940f7a7b574cabe6b5a3104761a2a6f28d6aed00164544488c00cbf9d66a9a370a14c6b6d3a00434efd3ff0228cc8e4d81af19c0e68
 AUX xen-consoles.logrotate 63 BLAKE2B 4ae650876035d2815dbcacc6ed618c58cc61d9cfd9cde1b6c2f792cbf51898c577ef979443ad827fc82ced4d21ae24836883160b20d697965ef5377d50c2973c SHA512 ab2105c75cfe01768aecd5bcbb56269d63666e8a44e42b6a83aee87df6c84ee2f9ab249171c21b2e09f8fec2cae8318f6e87d160989398a3e7dd68db8d52c426
 AUX xen-watchdog.initd 181 BLAKE2B b8529db36016b6f71520c1e4119a2ea5c4d3f52f2c77ccb5603efb67bcdd88b8273a359f6ae0df61763ea31a50bd8a0be775df5aabbd17c90e7928c8ed5b7c0e SHA512 5f6da91c0067b93f1b9f1a2f181caf34034896944ab26f5820e860336e3b3159a65e8a7f39ea273927d64d58a2fe4d918d2c3234f2b03ab0770e0c15d6dfe84b
@@ -16,23 +16,14 @@ AUX xenstored.initd 1058 BLAKE2B ef28c6f9f1f91dd46d5d431a70736d76a9a72b215b6b8f7
 AUX xenstored.initd-r1 916 BLAKE2B 5acda60c3d1c8aaf91d14d980a0b68f3d5ff803b617431c87f46b5c2c6f4c87548fa8db32ebd554e8aad4928d7ec0b16598bf8dfb0aa7e3642caa96eb164a292 SHA512 1404c9c454f5359389a2e9588317f10412dafdbdeb1de5da945c10f8e6efd09007e96d35b75d04a4c3d5c59baa9c3bbee4192240cacee128b0adf9066d3efc10
 DIST ovmf-20170321.tar.xz 22141096 BLAKE2B 79e991c8f9deb297865c319e88b6e6d46b1d08067d3fd639c83f2a379670779ecc60c74c2671ea4eb4a6659fe08ac2d7d4ff337b010b42a908a50829a2d18eeb SHA512 f65dabde3df967224e2072817211786ee4fc3994ee31f8f9d6f67fd74e3479e1da459c720169dd81020cdc1777e4600e531bb124b4625c2ded42c6005bdc802a
 DIST seabios-1.10.0.tar.gz 588213 BLAKE2B 254eb4572a1dac06020a545820efb53a130a027aaab035cd916009b424475f89bd151f82f1bc5103c01c4657d09da3219d2fbcc7728add473011dcfc7bff7410 SHA512 f1b83ce37b59070b488e19f98c95ca9f413cf4969663331b631c3ccb884c90b2db793d32a779ef05cead538c2fd123be4b73391ad2fa20c900a1f14237178d8c
-DIST xen-4.10.0-upstream-patches-0.tar.xz 70884 BLAKE2B 9a27e7989486ba3ba59548de356384527cc5b78e63b6ed042506e6534e488272369f021cd2daa516820313c3fe18625a5864794ae0806e7018b8ad28b0a294b1 SHA512 e64bf1d30d24e922c60c3b518a4de7874b43cc695134b4cdd65f6d95ae9ae579c521fab13ca82409fde55e43815d072c3194997e2bda106204cbf329e93a0a00
-DIST xen-4.10.0.tar.gz 24618123 BLAKE2B 009faa980f9734525c137d525e626bfa3443c285aeb6b4af91bb2c32a2e98376ded0b1114b541d11e2d4353f4f588d58e8add5b1e0d7de2fe3399d4687c5bfae SHA512 5a37935c382f9cfe3641a35c3be0ba11689bca10c7d3c2401963513e3a834ee8d0c8a0ddcf3716dbf0a795aea1bab78caf19acf1272e5e054bf012cfa06a4690
-DIST xen-4.10.1-upstream-patches-1.tar.xz 85048 BLAKE2B d00f01980e1c889b2f6899970999b93a7ddbaa03f88219d576bfbe4ccfe0ef3f75afad1538065045833430baa16b64d8dd7eb42af6ad7c3ef948601b941c51bc SHA512 ede74a53faf82712d6ee0cf2a995bb78b7079481e47e829243632fac40069194671e6b9b765e535aa533f618cdcd7715f540e81acd947a42f7b8cbb693a3df82
 DIST xen-4.10.1-upstream-patches-2.tar.xz 117588 BLAKE2B ddcd58964117652b50f3524d89089e2e9b14a8399fb5bd2db5d12827035ab94cedbfd5d65134d8953e4062a50e0e8a9b320e9c34008db8fd364456f47fd9cd26 SHA512 49ee8497af3753f3d611bf12c65fb7a79abb018862f1af096e9dde3ddfe8780bb95fc3da338c8d5f16a5d6d233d606d4cf8025a3d0e2897bf2668a1d5b27b198
 DIST xen-4.10.1.tar.gz 24674240 BLAKE2B f9a7e0c637db865ab32ad6b6185ab96022903aff65a18e194286a3fc372d4a45f6682cd636b7ac5b4fa0125e54ed51f8876a411d498cf75791718fd088c4a6d2 SHA512 236c02bee69e33644703ed26d323d4c491a91fc05bd0ee0990a7368579f7c82f5bb4510845bf80348fd923024d7d60d521f593dfd0365d971dc592f8ef10fbea
-DIST xen-4.11.0-upstream-patches-0.tar.xz 21720 BLAKE2B 92c2ef90ca6af5032e9181d8edbe2b91a4117cc402f5abdff208aa76ee76b56ce75f576c56220d2ebf6d1a21957c10f7c45a2c88d2c77aa8b17fa9a0a99e5b57 SHA512 6ea0ee376251b20b7fa9b6334bca462f115d8a9929e31ae269ae9591b433b46e4e9076a2d2e39ec5f868d5d74739ad7b0ba0d9244e599da5255ccca0babd669e
+DIST xen-4.10.2.tar.gz 24697204 BLAKE2B b331d3ad8d7842446f7d2da5dd31560f636aa1408dd3cc8798dff35b868ef5a609d17e97ef4355e1e5aa825a5abc74103796f9a8015037f0a564ffcebd825722 SHA512 2e301b4d6eb106fcb52203bc1208c8fd1fc7bb5d795166c0f86e4085227050301f7daa6f21db440c47bc2ca2c7f87d9b96753cfdf3fa724e0416b5679b84c163
 DIST xen-4.11.0-upstream-patches-1.tar.xz 56664 BLAKE2B 27579f4e628bb0d3fdd59f7e133e9134d4ca175842dfdae3a3f765b133254239ae3bca94d75dd655735b5bcbd67f9b8d444dd227028642e6e459e57ed8a20341 SHA512 e90b8e7fa9433e93b1620a776833a6d3578babebe5d73dcaae11186f473945a2270046932ab314a9c6049d3b460a655456f487a5b59730fe88a4f08d482c47a1
 DIST xen-4.11.0.tar.gz 25131533 BLAKE2B 892639b8bcd9b9956104e4d5137ffd88e17f92d965fa967b4af8d74a4fddcc21c6971c53026e0fb5ce833ab2c25c68f827abcac0b7b1dcebc21dca645c465573 SHA512 33d431c194f10d5ee767558404a1f80a66b3df019012b0bbd587fcbc9524e1bba7ea04269020ce891fe9d211d2f81c63bf78abedcdbe1595aee26251c803a50a
-DIST xen-4.9.2-upstream-patches-2.tar.xz 16100 BLAKE2B 469b5ab7c5514a4974ba6370136d3b0b8da66a137e57ea2d8ba4341582ecc65e9131340cfc854b2e4991de778802726479176bf3a54a59660cef7337c31958e5 SHA512 900ed3a63986ad6add07fa4f2c2596c48f7e9aac18d0876229c3a0b076a6417488e0d7bd1bdbe9886e6900bbece35c378b7f8735778b4bdfa115a9662d43108b
-DIST xen-4.9.2.tar.gz 23392753 BLAKE2B 5f96f0e5062eff8ac2971eef85ea2bae0e94e7542151237937a1cf7e74690bb0ce1c952e830d2fc13b3277f70b9ed1de511afe4f780ad7b3be0c58742ece39b2 SHA512 e06aec25439abcc548c174ba8e271c23031ea704bcc2480905140aa68490064fbb1c58d9c4174f6617b4f7bbcddfda284317df6f480a6e5b5b5a2c71fbe0ac93
-DIST xen-gentoo-patches-12.tar.xz 28188 BLAKE2B 75f565d52e75d4f68d7a1be88a79e7cefe82350ca1f4852ecdb79137549d73ef1ffb665bac998956a6f180cde6faeb9a11ec1f5442c8ae53c7cbd869318ef315 SHA512 4e1ebbd244670d3a4171fd93eda7eb14deae3e3ad45b3a85c015696ff0a86b69156f24ee428d6c92b7be426938997cec2fab031ecb5b03ad26a38451523882de
 DIST xen-gentoo-patches-14.tar.xz 36244 BLAKE2B 94b751df0ae9a49d1c52ec5fa835d4a040ccb6a4a0f63ef6ef628191163ce7dbd47d4e3b2dbb1cf6cf6c8b368bea4267ff989754482c4794209a80eae9313c25 SHA512 8a23aeddbcf80c049da36e3ef9d797c16996b45be21b56f46f3c9c3833a7c1028fd9ed56fc8053faeb78db21076608de2eb32908e1ae1285f4f200ace40c8c2d
 DIST xen-ovmf-patches-3.tar.xz 4208 BLAKE2B 0df8f85667a33c91cbfd86c59aec2ae65eca892b45d66eed76f793a52e2748989bc2785861f8bfdf94235ef7a6c0be6572c6e6cce9695469e40f0facd0ce3947 SHA512 abe001053ca702138bbcdd6bea14e2daae5c785f862d6a15001ca894c8ed8617f0c5dc439c6f54a41433b988acf57c71911af1db074aa76732c39d98622a3b5b
-EBUILD xen-tools-4.10.0.ebuild 13952 BLAKE2B cadf3444af9c72c47c992fc78a002391dd5d2061b3897468b0b1cacbe80daab598134af9a2ba205b006dab8688499b8c712b2b4fd0dfcc2060964fabc02540a3 SHA512 626cd2d7bfbb5e699223792ce42951d565e1cc911233b82deaad46fe227411286b1a1521fa7b85cadfabcb2bbcd4ff0ec031f3050f0588edaf8589127c1096b8
-EBUILD xen-tools-4.10.1-r1.ebuild 13994 BLAKE2B b880db4e806ca2f06f0886e0ba49d73057b023082679b3cf2b4f79b99714fc0651ca0cb5f5261702446218a5da36bee67bc919cc55be83c722ae69aac67486ac SHA512 7dab694d492d27cb6880ea4f45c90c0f89d1ae5fcecd2aa7199e4ba97c799a44b3b464bc3236ad32ddd07b76fe337f99af34807ccaa5d1f278ffc55c42f4d8f4
 EBUILD xen-tools-4.10.1-r2.ebuild 13992 BLAKE2B be68b8d08e2573cae3f9af96a5454f69a502884ae02375f92f21c8e46754ca8cdcb7bc0e4d179f2f3187a87e3d1612a287068e1d9990ab67399de16b4e173536 SHA512 9f1ade8aba5d7eb7fd7f59de57aedba3df7700178c9cad913a8dcd1b03374ab48391f9c1de74a3129faa962117b8df02f5cf92f2c2ced9c5e9df75ca3ae8fc92
-EBUILD xen-tools-4.11.0-r1.ebuild 14042 BLAKE2B 9a1ceba71fd79ab52f11a305d35e123007add10f42ca620e87567f438a0298ccd39e6ee42fdb5bd1de6d4a34c2d32f6a319a78e904e45c5fa2113fff7e6f4e1c SHA512 c438ce83ceb481e90d25bbac38020759e154a1c2f00d9f31ffb959885aeb2576177e7fca9387cb53371be6e0081d1d4d05593ce7fc22be1a363919874330ca0f
+EBUILD xen-tools-4.10.2.ebuild 13929 BLAKE2B 4b5413024450ed0bbac700e6feb3a47f4d19c0b566ac7158601a86881bdd7350505d5c6a838a9d929c6336ae8aa9669de2257a87b65722d11143da9640c73117 SHA512 59c6a5c01b482f4d3b84a95552f5005e1b137fe59fbabfc38c010992369c840644550a2e81b53c0c526a7988d9e5ca13eb9b69d2fa9a82e0b4cdf25e2502d1b4
 EBUILD xen-tools-4.11.0-r2.ebuild 14010 BLAKE2B 947d246f47931527f6c998af76eb8f9db7d1a032fb9570e544fb30bdcd7eeda88893d8baf7924fd5283eac618bb462eca6a0e1f585777467655036d571663f9d SHA512 6fb10569080275314abb3e65ca3951ea01fc547616dc3cf32f621465258fe2635456626e90af097222959ab007e0d4c81d9cb7dbc996cc836d0f5d5f43ec0fe5
-EBUILD xen-tools-4.9.2-r1.ebuild 13729 BLAKE2B 06c044904e8f406ddd1e1cd1878f1a1477452e37033f749095a164cdc39a1cd5858da42cdcb70d125dc7241ac4991f2a4cf781ba78cc6eeef3b9d1797058a359 SHA512 dec7d7001832259ab31035b310411896cfba3e1a6d83780fd259fe8238033c58da39aed482f61b35bd295e9c0b12e8580367d3603f01ff81ffa1131d6bc713e3
 MISC metadata.xml 1267 BLAKE2B 8b9111b781201a51e373b606c888440fe42630f9cb08a43a4bb5a512456f57e7bb4e4f2af0a23d4cbf75489ba01efbc38820a6881317f16a459c96f8717d2b52 SHA512 c4e947a8cff20e4c5e77f5764fe26ee86a5674cc24ba2eedb7867476f9805ca47b895fcee92e8f353bb4bce877d32832318f8f7fd9514103fb2a963d6ea74647
diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf b/app-emulation/xen-tools/files/gentoo-patches.conf
index 2d4bcd195ac3..d4bdaa12c71b 100644
--- a/app-emulation/xen-tools/files/gentoo-patches.conf
+++ b/app-emulation/xen-tools/files/gentoo-patches.conf
@@ -116,69 +116,23 @@ _gx048=" xen-tools-4.11.0-gcc8.patch"
 # Fix pdf document generation, bug #650396
 _gx049=" xen-tools-4.10.1-pdfdoc.patch"
 
-# xen-tools-4.8.2 patches set
-_gpv_xen_tools_482_0="
-${_gx008}
-${_gx038} ${_gx017} ${_gx039}
-${_gx027} ${_gx032}
-${_gx028} ${_gx029}
-${_gx037} ${_gx040} ${_gx042}
-"
-
-# xen-tools-4.9.0 patches set
-_gpv_xen_tools_490_0="
-${_gx008}
-${_gx038} ${_gx017} ${_gx039}
-${_gx027}
-${_gx028} ${_gx029}
-${_gx037} ${_gx042}
-"
-
-# xen-tools-4.9.1 patches set
-_gpv_xen_tools_491_0="
-${_gx008}
-${_gx038} ${_gx017} ${_gx039}
-${_gx027}
-${_gx028} ${_gx029}
-${_gx037} ${_gx042}
-"
-
-_gpv_xen_tools_491_1="
-${_gx008}
-${_gx038} ${_gx017} ${_gx039}
-${_gx027}
-${_gx028} ${_gx029}
-${_gx037} ${_gx042}
-${_gx044}
-"
-
-# xen-tools-4.9.2 patches set
-_gpv_xen_tools_492_0="
-${_gx008}
-${_gx038} ${_gx017} ${_gx039}
-${_gx027}
-${_gx028} ${_gx029}
-${_gx037} ${_gx042}
-${_gx044}
-"
-
-# xen-tools-4.10.0 patches set
-_gpv_xen_tools_4100_0="
-${_gx008}
+# xen-tools-4.10.1 patches set
+_gpv_xen_tools_4101_0="
 ${_gx038} ${_gx017} ${_gx043}
 ${_gx027}
 ${_gx028} ${_gx029}
 ${_gx037} ${_gx042}
-${_gx044}
+${_gx044} ${_gx045} ${_gx046} ${_gx047}
+${_gx049}
 "
 
-# xen-tools-4.10.1 patches set
-_gpv_xen_tools_4101_0="
+# xen-tools-4.10.2 patches set
+_gpv_xen_tools_4102_0="
 ${_gx038} ${_gx017} ${_gx043}
 ${_gx027}
 ${_gx028} ${_gx029}
 ${_gx037} ${_gx042}
-${_gx044} ${_gx045} ${_gx046} ${_gx047}
+${_gx045} ${_gx046} ${_gx047}
 ${_gx049}
 "
 
diff --git a/app-emulation/xen-tools/xen-tools-4.10.0.ebuild b/app-emulation/xen-tools/xen-tools-4.10.0.ebuild
deleted file mode 100644
index 2180656b6793..000000000000
--- a/app-emulation/xen-tools/xen-tools-4.10.0.ebuild
+++ /dev/null
@@ -1,455 +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='ncurses,xml,threads'
-
-inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs versionator
-
-MY_PV=${PV/_/-}
-MAJOR_V="$(get_version_component_range 1-2)"
-
-if [[ $PV == *9999 ]]; then
-	inherit git-r3
-	REPO="xen.git"
-	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
-	S="${WORKDIR}/${REPO}"
-else
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	UPSTREAM_VER=0
-	SECURITY_VER=
-	# xen-tools's gentoo patches tarball
-	GENTOO_VER=12
-	# xen-tools's gentoo patches version which apply to this specific ebuild
-	GENTOO_GPV=0
-	# xen-tools ovmf's patches
-	OVMF_VER=3
-
-	SEABIOS_VER=1.10.0
-	# OVMF upstream 5920a9d16b1ab887c2858224316a98e961d71b05
-	OVMF_PV=20170321
-
-	[[ -n ${UPSTREAM_VER} ]] && \
-		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-	[[ -n ${SECURITY_VER} ]] && \
-		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
-	[[ -n ${GENTOO_VER} ]] && \
-		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
-	[[ -n ${OVMF_VER} ]] && \
-		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
-
-	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
-	http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
-	https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
-	ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.xz
-		${OVMF_PATCHSET_URI} )
-	${UPSTREAM_PATCHSET_URI}
-	${SECURITY_PATCHSET_URI}
-	${GENTOO_PATCHSET_URI}"
-
-	S="${WORKDIR}/xen-${MY_PV}"
-fi
-
-DESCRIPTION="Xen tools including QEMU and xl"
-HOMEPAGE="https://www.xenproject.org"
-DOCS=( README docs/README.xen-bugtool )
-
-LICENSE="GPL-2"
-SLOT="0/${MAJOR_V}"
-# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
-# >=dev-lang/ocaml-4 stable
-# Masked in profiles/eapi-5-files instead
-IUSE="api custom-cflags debug doc flask hvm ocaml ovmf +pam pygrub python +qemu +qemu-traditional screen sdl static-libs system-qemu system-seabios"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	pygrub? ( python )
-	ovmf? ( hvm )
-	^^ ( qemu system-qemu )"
-
-COMMON_DEPEND="
-	sys-apps/pciutils
-	dev-libs/lzo:2
-	dev-libs/glib:2
-	dev-libs/yajl
-	dev-libs/libaio
-	dev-libs/libgcrypt:0
-	sys-libs/zlib
-	${PYTHON_DEPS}
-"
-
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-4.11
-	dev-python/lxml[${PYTHON_USEDEP}]
-	x86? ( sys-devel/dev86
-		sys-power/iasl )
-	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
-	api? ( dev-libs/libxml2
-		net-misc/curl )
-	ovmf? (
-		!arm? ( !arm64? ( dev-lang/nasm ) )
-		$(python_gen_impl_dep sqlite)
-		)
-	!amd64? ( >=sys-apps/dtc-1.4.0 )
-	amd64? ( sys-devel/bin86
-		system-seabios? ( sys-firmware/seabios )
-		sys-firmware/ipxe
-		sys-devel/dev86
-		sys-power/iasl )
-	dev-lang/perl
-	app-misc/pax-utils
-	doc? (
-		app-text/ghostscript-gpl
-		app-text/pandoc
-		dev-python/markdown[${PYTHON_USEDEP}]
-		dev-texlive/texlive-latexextra
-		media-gfx/transfig
-	)
-	hvm? ( x11-base/xorg-proto
-		!net-libs/libiscsi )
-	qemu? (
-		app-arch/snappy:=
-		x11-libs/pixman
-		sdl? ( media-libs/libsdl[X] )
-	)
-	system-qemu? ( app-emulation/qemu[xen] )
-	ocaml? ( dev-ml/findlib
-		>=dev-lang/ocaml-4 )"
-
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/iproute2[-minimal]
-	net-misc/bridge-utils
-	screen? (
-		app-misc/screen
-		app-admin/logrotate
-	)"
-
-# hvmloader is used to bootstrap a fully virtualized kernel
-# Approved by QA team in bug #144032
-QA_WX_LOAD="
-	usr/libexec/xen/boot/hvmloader
-	usr/share/qemu-xen/qemu/s390-ccw.img
-	usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-QA_PREBUILT="
-	usr/libexec/xen/bin/ivshmem-client
-	usr/libexec/xen/bin/ivshmem-server
-	usr/libexec/xen/bin/qemu-img
-	usr/libexec/xen/bin/qemu-io
-	usr/libexec/xen/bin/qemu-nbd
-	usr/libexec/xen/bin/qemu-system-i386
-	usr/libexec/xen/bin/virtfs-proxy-helper
-	usr/libexec/xen/libexec/xen-bridge-helper
-	usr/share/qemu-xen/qemu/s390-ccw.img
-	usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-RESTRICT="test"
-
-pkg_setup() {
-	python_setup
-	export "CONFIG_LOMOUNT=y"
-
-	#bug 522642, disable compile tools/tests
-	export "CONFIG_TESTS=n"
-
-	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
-		if use x86 && use amd64; then
-			die "Confusion! Both x86 and amd64 are set in your use flags!"
-		elif use x86; then
-			export XEN_TARGET_ARCH="x86_32"
-		elif use amd64 ; then
-			export XEN_TARGET_ARCH="x86_64"
-		elif use arm; then
-			export XEN_TARGET_ARCH="arm32"
-		elif use arm64; then
-			export XEN_TARGET_ARCH="arm64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-}
-
-src_prepare() {
-	local i
-
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		einfo "Try to apply Xen Upstream patch set"
-		eapply "${WORKDIR}"/patches-upstream
-	fi
-
-	# Security patchset
-	if [[ -n ${SECURITY_VER} ]]; then
-	einfo "Try to apply Xen Security patch set"
-		# apply main xen patches
-		# Two parallel systems, both work side by side
-		# Over time they may concdense into one. This will suffice for now
-		EPATCH_SUFFIX="patch"
-		EPATCH_FORCE="yes"
-
-		source "${WORKDIR}"/patches-security/${PV}.conf || die
-
-		for i in ${XEN_SECURITY_MAIN}; do
-			eapply "${WORKDIR}"/patches-security/xen/$i
-		done
-
-		# apply qemu-xen/upstream patches
-		pushd "${S}"/tools/qemu-xen/ > /dev/null
-		for i in ${XEN_SECURITY_QEMUU}; do
-			eapply "${WORKDIR}"/patches-security/qemuu/$i
-		done
-		popd > /dev/null
-
-		# apply qemu-traditional patches
-		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
-		for i in ${XEN_SECURITY_QEMUT}; do
-			eapply "${WORKDIR}"/patches-security/qemut/$i
-		done
-		popd > /dev/null
-	fi
-
-	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
-	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
-	pushd tools/firmware/ > /dev/null
-	ln -s seabios-dir-remote seabios-dir || die
-	popd > /dev/null
-
-	# Gentoo's patchset
-	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
-		einfo "Try to apply Gentoo specific patch set"
-		source "${FILESDIR}"/gentoo-patches.conf || die
-		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
-		for i in ${!_gpv}; do
-			eapply "${WORKDIR}"/patches-gentoo/$i
-		done
-	fi
-
-	# Ovmf's patchset
-	if use ovmf; then
-		if [[ -n ${OVMF_VER} ]];then
-			einfo "Try to apply Ovmf patch set"
-			pushd "${WORKDIR}"/ovmf-*/ > /dev/null
-			eapply "${WORKDIR}"/patches-ovmf
-			popd > /dev/null
-		fi
-		mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
-	fi
-
-	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
-
-	# Fix texi2html build error with new texi2html, qemu.doc.html
-	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
-
-	use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
-	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
-		 -i tools/firmware/Makefile || die
-
-	# Drop .config, fixes to gcc-4.6
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	# if the user *really* wants to use their own custom-cflags, let them
-	if use custom-cflags; then
-		einfo "User wants their own CFLAGS - removing defaults"
-
-		# try and remove all the default cflags
-		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
-			-exec sed \
-				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-				-i {} + || die "failed to re-set custom-cflags"
-	else
-		unset CFLAGS
-		unset LDFLAGS
-		unset ASFLAGS
-		unset CPPFLAGS
-	fi
-
-	if ! use pygrub; then
-		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
-	fi
-
-	if ! use python; then
-		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
-	fi
-
-	if ! use hvm; then
-		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
-	# Bug 351648
-	elif ! use x86 && ! has x86 $(get_all_abis); then
-		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
-		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
-		export CPATH="${WORKDIR}"/extra-headers
-	fi
-
-	if use qemu; then
-		if use sdl; then
-			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
-				tools/Makefile || die
-		else
-			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
-				tools/qemu-xen-traditional/xen-setup || die
-			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
-				tools/Makefile || die
-		fi
-	else
-		# Don't bother with qemu, only needed for fully virtualised guests
-		sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
-	fi
-
-	# Reset bash completion dir; Bug 472438
-	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
-		-i Config.mk || die
-	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
-
-	# xencommons, Bug #492332, sed lighter weight than patching
-	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
-		-i tools/hotplug/Linux/init.d/xencommons.in || die
-
-	# fix bashishm
-	sed -e '/Usage/s/\$//g' \
-		-i tools/hotplug/Linux/init.d/xendriverdomain.in || die
-
-	# respect multilib, usr/lib/libcacard.so.0.0.0
-	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
-		-i tools/qemu-xen/configure || die
-
-	#bug 518136, don't build 32bit exactuable for nomultilib profile
-	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
-		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
-	fi
-
-	# uncomment lines in xl.conf
-	sed -e 's:^#autoballoon=:autoballoon=:' \
-		-e 's:^#lockfile=:lockfile=:' \
-		-e 's:^#vif.default.script=:vif.default.script=:' \
-		-i tools/examples/xl.conf  || die
-
-	default
-}
-
-src_configure() {
-	local myconf="--prefix=${PREFIX}/usr \
-		--libdir=${PREFIX}/usr/$(get_libdir) \
-		--libexecdir=${PREFIX}/usr/libexec \
-		--localstatedir=${EPREFIX}/var \
-		--disable-werror \
-		--disable-xen \
-		--enable-tools \
-		--enable-docs \
-		$(use_enable pam) \
-		$(use_enable api xenapi) \
-		$(use_enable ovmf) \
-		$(use_enable ocaml ocamltools) \
-		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
-		"
-
-	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
-	use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64"
-	use amd64 && myconf+=" $(use_enable qemu-traditional)"
-	econf ${myconf}
-}
-
-src_compile() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-
-	if test-flag-CC -fno-strict-overflow; then
-		append-flags -fno-strict-overflow
-	fi
-
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt}
-
-	if use doc; then
-		emake -C docs build
-	else
-		emake -C docs man-pages
-	fi
-}
-
-src_install() {
-	# Override auto-detection in the build system, bug #382573
-	export INITD_DIR=/tmp/init.d
-	export CONFIG_LEAF_DIR=../tmp/default
-
-	# Let the build system compile installed Python modules.
-	local PYTHONDONTWRITEBYTECODE
-	export PYTHONDONTWRITEBYTECODE
-
-	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
-		XEN_PYTHON_NATIVE_INSTALL=y install-tools
-
-	# Created at runtime
-	rm -rv "${ED%/}/var/run" || die
-
-	# Fix the remaining Python shebangs.
-	python_fix_shebang "${D}"
-
-	# Remove RedHat-specific stuff
-	rm -rf "${D}"tmp || die
-
-	emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
-	use doc && dodoc -r docs/{pdf,txt}
-	dodoc ${DOCS[@]}
-
-	newconfd "${FILESDIR}"/xendomains.confd xendomains
-	newconfd "${FILESDIR}"/xenstored.confd xenstored
-	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
-	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
-	newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
-	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
-	newinitd "${FILESDIR}"/xencommons.initd xencommons
-	newconfd "${FILESDIR}"/xencommons.confd xencommons
-	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
-	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
-	newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
-
-	if use screen; then
-		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
-		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
-		keepdir /var/log/xen-consoles
-	fi
-
-	# For -static-libs wrt Bug 384355
-	if ! use static-libs; then
-		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
-	fi
-
-	# for xendomains
-	keepdir /etc/xen/auto
-
-	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
-	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
-		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide and the offical wiki page:"
-	elog "https://wiki.gentoo.org/wiki/Xen"
-	elog "https://wiki.xen.org/wiki/Main_Page"
-	elog ""
-	elog "Recommended to utilise the xencommons script to config sytem At boot"
-	elog "Add by use of rc-update on completion of the install"
-
-	if ! use hvm; then
-		echo
-		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
-		elog "support enable the hvm use flag."
-		elog "An x86 or amd64 system is required to build HVM support."
-	fi
-
-	if use qemu; then
-		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
-		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
-		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
-		elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
-	fi
-}
diff --git a/app-emulation/xen-tools/xen-tools-4.10.1-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.10.1-r1.ebuild
deleted file mode 100644
index 3c9506c4f34f..000000000000
--- a/app-emulation/xen-tools/xen-tools-4.10.1-r1.ebuild
+++ /dev/null
@@ -1,456 +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='ncurses,xml,threads'
-
-inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs versionator
-
-MY_PV=${PV/_/-}
-MAJOR_V="$(get_version_component_range 1-2)"
-
-if [[ $PV == *9999 ]]; then
-	inherit git-r3
-	REPO="xen.git"
-	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
-	S="${WORKDIR}/${REPO}"
-else
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	UPSTREAM_VER=1
-	SECURITY_VER=
-	# xen-tools's gentoo patches tarball
-	GENTOO_VER=14
-	# xen-tools's gentoo patches version which apply to this specific ebuild
-	GENTOO_GPV=0
-	# xen-tools ovmf's patches
-	OVMF_VER=3
-
-	SEABIOS_VER=1.10.0
-	# OVMF upstream 5920a9d16b1ab887c2858224316a98e961d71b05
-	OVMF_PV=20170321
-
-	[[ -n ${UPSTREAM_VER} ]] && \
-		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-	[[ -n ${SECURITY_VER} ]] && \
-		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
-	[[ -n ${GENTOO_VER} ]] && \
-		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
-	[[ -n ${OVMF_VER} ]] && \
-		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
-
-	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
-	http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
-	https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
-	ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.xz
-		${OVMF_PATCHSET_URI} )
-	${UPSTREAM_PATCHSET_URI}
-	${SECURITY_PATCHSET_URI}
-	${GENTOO_PATCHSET_URI}"
-
-	S="${WORKDIR}/xen-${MY_PV}"
-fi
-
-DESCRIPTION="Xen tools including QEMU and xl"
-HOMEPAGE="https://www.xenproject.org"
-DOCS=( README docs/README.xen-bugtool )
-
-LICENSE="GPL-2"
-SLOT="0/${MAJOR_V}"
-# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
-# >=dev-lang/ocaml-4 stable
-# Masked in profiles/eapi-5-files instead
-IUSE="api custom-cflags debug doc flask hvm ocaml ovmf +pam pygrub python +qemu +qemu-traditional screen sdl static-libs system-qemu system-seabios"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	pygrub? ( python )
-	ovmf? ( hvm )
-	^^ ( qemu system-qemu )"
-
-COMMON_DEPEND="
-	sys-apps/pciutils
-	dev-libs/lzo:2
-	dev-libs/glib:2
-	dev-libs/yajl
-	dev-libs/libaio
-	dev-libs/libgcrypt:0
-	sys-libs/zlib
-	${PYTHON_DEPS}
-"
-
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-4.11
-	dev-python/lxml[${PYTHON_USEDEP}]
-	x86? ( sys-devel/dev86
-		sys-power/iasl )
-	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
-	api? ( dev-libs/libxml2
-		net-misc/curl )
-	ovmf? (
-		!arm? ( !arm64? ( dev-lang/nasm ) )
-		$(python_gen_impl_dep sqlite)
-		)
-	!amd64? ( >=sys-apps/dtc-1.4.0 )
-	amd64? ( sys-devel/bin86
-		system-seabios? ( sys-firmware/seabios )
-		sys-firmware/ipxe
-		sys-devel/dev86
-		sys-power/iasl )
-	dev-lang/perl
-	app-misc/pax-utils
-	doc? (
-		app-text/ghostscript-gpl
-		app-text/pandoc
-		dev-python/markdown[${PYTHON_USEDEP}]
-		dev-texlive/texlive-latexextra
-		media-gfx/transfig
-	)
-	hvm? ( x11-base/xorg-proto
-		!net-libs/libiscsi )
-	qemu? (
-		app-arch/snappy:=
-		x11-libs/pixman
-		sdl? ( media-libs/libsdl[X] )
-	)
-	system-qemu? ( app-emulation/qemu[xen] )
-	ocaml? ( dev-ml/findlib
-		>=dev-lang/ocaml-4 )"
-
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/iproute2[-minimal]
-	net-misc/bridge-utils
-	screen? (
-		app-misc/screen
-		app-admin/logrotate
-	)"
-
-# hvmloader is used to bootstrap a fully virtualized kernel
-# Approved by QA team in bug #144032
-QA_WX_LOAD="
-	usr/libexec/xen/boot/hvmloader
-	usr/share/qemu-xen/qemu/s390-ccw.img
-	usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-QA_PREBUILT="
-	usr/libexec/xen/bin/ivshmem-client
-	usr/libexec/xen/bin/ivshmem-server
-	usr/libexec/xen/bin/qemu-img
-	usr/libexec/xen/bin/qemu-io
-	usr/libexec/xen/bin/qemu-nbd
-	usr/libexec/xen/bin/qemu-system-i386
-	usr/libexec/xen/bin/virtfs-proxy-helper
-	usr/libexec/xen/libexec/xen-bridge-helper
-	usr/share/qemu-xen/qemu/s390-ccw.img
-	usr/share/qemu-xen/qemu/s390-netboot.img
-	usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-RESTRICT="test"
-
-pkg_setup() {
-	python_setup
-	export "CONFIG_LOMOUNT=y"
-
-	#bug 522642, disable compile tools/tests
-	export "CONFIG_TESTS=n"
-
-	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
-		if use x86 && use amd64; then
-			die "Confusion! Both x86 and amd64 are set in your use flags!"
-		elif use x86; then
-			export XEN_TARGET_ARCH="x86_32"
-		elif use amd64 ; then
-			export XEN_TARGET_ARCH="x86_64"
-		elif use arm; then
-			export XEN_TARGET_ARCH="arm32"
-		elif use arm64; then
-			export XEN_TARGET_ARCH="arm64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-}
-
-src_prepare() {
-	local i
-
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		einfo "Try to apply Xen Upstream patch set"
-		eapply "${WORKDIR}"/patches-upstream
-	fi
-
-	# Security patchset
-	if [[ -n ${SECURITY_VER} ]]; then
-	einfo "Try to apply Xen Security patch set"
-		# apply main xen patches
-		# Two parallel systems, both work side by side
-		# Over time they may concdense into one. This will suffice for now
-		EPATCH_SUFFIX="patch"
-		EPATCH_FORCE="yes"
-
-		source "${WORKDIR}"/patches-security/${PV}.conf || die
-
-		for i in ${XEN_SECURITY_MAIN}; do
-			eapply "${WORKDIR}"/patches-security/xen/$i
-		done
-
-		# apply qemu-xen/upstream patches
-		pushd "${S}"/tools/qemu-xen/ > /dev/null
-		for i in ${XEN_SECURITY_QEMUU}; do
-			eapply "${WORKDIR}"/patches-security/qemuu/$i
-		done
-		popd > /dev/null
-
-		# apply qemu-traditional patches
-		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
-		for i in ${XEN_SECURITY_QEMUT}; do
-			eapply "${WORKDIR}"/patches-security/qemut/$i
-		done
-		popd > /dev/null
-	fi
-
-	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
-	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
-	pushd tools/firmware/ > /dev/null
-	ln -s seabios-dir-remote seabios-dir || die
-	popd > /dev/null
-
-	# Gentoo's patchset
-	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
-		einfo "Try to apply Gentoo specific patch set"
-		source "${FILESDIR}"/gentoo-patches.conf || die
-		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
-		for i in ${!_gpv}; do
-			eapply "${WORKDIR}"/patches-gentoo/$i
-		done
-	fi
-
-	# Ovmf's patchset
-	if use ovmf; then
-		if [[ -n ${OVMF_VER} ]];then
-			einfo "Try to apply Ovmf patch set"
-			pushd "${WORKDIR}"/ovmf-*/ > /dev/null
-			eapply "${WORKDIR}"/patches-ovmf
-			popd > /dev/null
-		fi
-		mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
-	fi
-
-	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
-
-	# Fix texi2html build error with new texi2html, qemu.doc.html
-	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
-
-	use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
-	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
-		 -i tools/firmware/Makefile || die
-
-	# Drop .config, fixes to gcc-4.6
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	# if the user *really* wants to use their own custom-cflags, let them
-	if use custom-cflags; then
-		einfo "User wants their own CFLAGS - removing defaults"
-
-		# try and remove all the default cflags
-		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
-			-exec sed \
-				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-				-i {} + || die "failed to re-set custom-cflags"
-	else
-		unset CFLAGS
-		unset LDFLAGS
-		unset ASFLAGS
-		unset CPPFLAGS
-	fi
-
-	if ! use pygrub; then
-		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
-	fi
-
-	if ! use python; then
-		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
-	fi
-
-	if ! use hvm; then
-		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
-	# Bug 351648
-	elif ! use x86 && ! has x86 $(get_all_abis); then
-		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
-		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
-		export CPATH="${WORKDIR}"/extra-headers
-	fi
-
-	if use qemu; then
-		if use sdl; then
-			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
-				tools/Makefile || die
-		else
-			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
-				tools/qemu-xen-traditional/xen-setup || die
-			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
-				tools/Makefile || die
-		fi
-	else
-		# Don't bother with qemu, only needed for fully virtualised guests
-		sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
-	fi
-
-	# Reset bash completion dir; Bug 472438
-	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
-		-i Config.mk || die
-	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
-
-	# xencommons, Bug #492332, sed lighter weight than patching
-	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
-		-i tools/hotplug/Linux/init.d/xencommons.in || die
-
-	# fix bashishm
-	sed -e '/Usage/s/\$//g' \
-		-i tools/hotplug/Linux/init.d/xendriverdomain.in || die
-
-	# respect multilib, usr/lib/libcacard.so.0.0.0
-	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
-		-i tools/qemu-xen/configure || die
-
-	#bug 518136, don't build 32bit exactuable for nomultilib profile
-	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
-		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
-	fi
-
-	# uncomment lines in xl.conf
-	sed -e 's:^#autoballoon=:autoballoon=:' \
-		-e 's:^#lockfile=:lockfile=:' \
-		-e 's:^#vif.default.script=:vif.default.script=:' \
-		-i tools/examples/xl.conf  || die
-
-	default
-}
-
-src_configure() {
-	local myconf="--prefix=${PREFIX}/usr \
-		--libdir=${PREFIX}/usr/$(get_libdir) \
-		--libexecdir=${PREFIX}/usr/libexec \
-		--localstatedir=${EPREFIX}/var \
-		--disable-werror \
-		--disable-xen \
-		--enable-tools \
-		--enable-docs \
-		$(use_enable pam) \
-		$(use_enable api xenapi) \
-		$(use_enable ovmf) \
-		$(use_enable ocaml ocamltools) \
-		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
-		"
-
-	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
-	use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64"
-	use amd64 && myconf+=" $(use_enable qemu-traditional)"
-	econf ${myconf}
-}
-
-src_compile() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-
-	if test-flag-CC -fno-strict-overflow; then
-		append-flags -fno-strict-overflow
-	fi
-
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt}
-
-	if use doc; then
-		emake -C docs build
-	else
-		emake -C docs man-pages
-	fi
-}
-
-src_install() {
-	# Override auto-detection in the build system, bug #382573
-	export INITD_DIR=/tmp/init.d
-	export CONFIG_LEAF_DIR=../tmp/default
-
-	# Let the build system compile installed Python modules.
-	local PYTHONDONTWRITEBYTECODE
-	export PYTHONDONTWRITEBYTECODE
-
-	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
-		XEN_PYTHON_NATIVE_INSTALL=y install-tools
-
-	# Created at runtime
-	rm -rv "${ED%/}/var/run" || die
-
-	# Fix the remaining Python shebangs.
-	python_fix_shebang "${D}"
-
-	# Remove RedHat-specific stuff
-	rm -rf "${D}"tmp || die
-
-	emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
-	use doc && dodoc -r docs/{pdf,txt}
-	dodoc ${DOCS[@]}
-
-	newconfd "${FILESDIR}"/xendomains.confd xendomains
-	newconfd "${FILESDIR}"/xenstored.confd xenstored
-	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
-	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
-	newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
-	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
-	newinitd "${FILESDIR}"/xencommons.initd xencommons
-	newconfd "${FILESDIR}"/xencommons.confd xencommons
-	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
-	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
-	newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
-
-	if use screen; then
-		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
-		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
-		keepdir /var/log/xen-consoles
-	fi
-
-	# For -static-libs wrt Bug 384355
-	if ! use static-libs; then
-		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
-	fi
-
-	# for xendomains
-	keepdir /etc/xen/auto
-
-	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
-	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
-		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide and the offical wiki page:"
-	elog "https://wiki.gentoo.org/wiki/Xen"
-	elog "https://wiki.xen.org/wiki/Main_Page"
-	elog ""
-	elog "Recommended to utilise the xencommons script to config sytem At boot"
-	elog "Add by use of rc-update on completion of the install"
-
-	if ! use hvm; then
-		echo
-		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
-		elog "support enable the hvm use flag."
-		elog "An x86 or amd64 system is required to build HVM support."
-	fi
-
-	if use qemu; then
-		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
-		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
-		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
-		elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
-	fi
-}
diff --git a/app-emulation/xen-tools/xen-tools-4.10.2.ebuild b/app-emulation/xen-tools/xen-tools-4.10.2.ebuild
new file mode 100644
index 000000000000..4d7ed2a93e21
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.10.2.ebuild
@@ -0,0 +1,455 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='ncurses,xml,threads'
+
+inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	REPO="xen.git"
+	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
+	S="${WORKDIR}/${REPO}"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	UPSTREAM_VER=
+	SECURITY_VER=
+	# xen-tools's gentoo patches tarball
+	GENTOO_VER=14
+	# xen-tools's gentoo patches version which apply to this specific ebuild
+	GENTOO_GPV=0
+	# xen-tools ovmf's patches
+	OVMF_VER=3
+
+	SEABIOS_VER=1.10.0
+	# OVMF upstream 5920a9d16b1ab887c2858224316a98e961d71b05
+	OVMF_PV=20170321
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	[[ -n ${OVMF_VER} ]] && \
+		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
+
+	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
+	http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
+	https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
+	ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.xz
+		${OVMF_PATCHSET_URI} )
+	${UPSTREAM_PATCHSET_URI}
+	${SECURITY_PATCHSET_URI}
+	${GENTOO_PATCHSET_URI}"
+
+	S="${WORKDIR}/xen-${MY_PV}"
+fi
+
+DESCRIPTION="Xen tools including QEMU and xl"
+HOMEPAGE="https://www.xenproject.org"
+DOCS=( README docs/README.xen-bugtool )
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
+# >=dev-lang/ocaml-4 stable
+# Masked in profiles/eapi-5-files instead
+IUSE="api custom-cflags debug doc flask hvm ocaml ovmf +pam pygrub python +qemu +qemu-traditional screen sdl static-libs system-qemu system-seabios"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	pygrub? ( python )
+	ovmf? ( hvm )
+	^^ ( qemu system-qemu )"
+
+COMMON_DEPEND="
+	sys-apps/pciutils
+	dev-libs/lzo:2
+	dev-libs/glib:2
+	dev-libs/yajl
+	dev-libs/libaio
+	dev-libs/libgcrypt:0
+	sys-libs/zlib
+	${PYTHON_DEPS}
+"
+
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-4.11
+	dev-python/lxml[${PYTHON_USEDEP}]
+	x86? ( sys-devel/dev86
+		sys-power/iasl )
+	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
+	api? ( dev-libs/libxml2
+		net-misc/curl )
+	ovmf? (
+		!arm? ( !arm64? ( dev-lang/nasm ) )
+		$(python_gen_impl_dep sqlite)
+		)
+	!amd64? ( >=sys-apps/dtc-1.4.0 )
+	amd64? ( sys-devel/bin86
+		system-seabios? ( sys-firmware/seabios )
+		sys-firmware/ipxe
+		sys-devel/dev86
+		sys-power/iasl )
+	dev-lang/perl
+	app-misc/pax-utils
+	doc? (
+		app-text/ghostscript-gpl
+		app-text/pandoc
+		dev-python/markdown[${PYTHON_USEDEP}]
+		dev-texlive/texlive-latexextra
+		media-gfx/transfig
+	)
+	hvm? ( x11-base/xorg-proto
+		!net-libs/libiscsi )
+	qemu? (
+		app-arch/snappy:=
+		x11-libs/pixman
+		sdl? ( media-libs/libsdl[X] )
+	)
+	system-qemu? ( app-emulation/qemu[xen] )
+	ocaml? ( dev-ml/findlib
+		>=dev-lang/ocaml-4 )"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2[-minimal]
+	net-misc/bridge-utils
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="
+	usr/libexec/xen/boot/hvmloader
+	usr/share/qemu-xen/qemu/s390-ccw.img
+	usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+QA_PREBUILT="
+	usr/libexec/xen/bin/ivshmem-client
+	usr/libexec/xen/bin/ivshmem-server
+	usr/libexec/xen/bin/qemu-img
+	usr/libexec/xen/bin/qemu-io
+	usr/libexec/xen/bin/qemu-nbd
+	usr/libexec/xen/bin/qemu-system-i386
+	usr/libexec/xen/bin/virtfs-proxy-helper
+	usr/libexec/xen/libexec/xen-bridge-helper
+	usr/share/qemu-xen/qemu/s390-ccw.img
+	usr/share/qemu-xen/qemu/s390-netboot.img
+	usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python_setup
+	export "CONFIG_LOMOUNT=y"
+
+	#bug 522642, disable compile tools/tests
+	export "CONFIG_TESTS=n"
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+}
+
+src_prepare() {
+	local i
+
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Xen Upstream patch set"
+		eapply "${WORKDIR}"/patches-upstream
+	fi
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+	einfo "Try to apply Xen Security patch set"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		EPATCH_SUFFIX="patch"
+		EPATCH_FORCE="yes"
+
+		source "${WORKDIR}"/patches-security/${PV}.conf || die
+
+		for i in ${XEN_SECURITY_MAIN}; do
+			eapply "${WORKDIR}"/patches-security/xen/$i
+		done
+
+		# apply qemu-xen/upstream patches
+		pushd "${S}"/tools/qemu-xen/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUU}; do
+			eapply "${WORKDIR}"/patches-security/qemuu/$i
+		done
+		popd > /dev/null
+
+		# apply qemu-traditional patches
+		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUT}; do
+			eapply "${WORKDIR}"/patches-security/qemut/$i
+		done
+		popd > /dev/null
+	fi
+
+	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
+	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	pushd tools/firmware/ > /dev/null
+	ln -s seabios-dir-remote seabios-dir || die
+	popd > /dev/null
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+		einfo "Try to apply Gentoo specific patch set"
+		source "${FILESDIR}"/gentoo-patches.conf || die
+		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+		for i in ${!_gpv}; do
+			eapply "${WORKDIR}"/patches-gentoo/$i
+		done
+	fi
+
+	# Ovmf's patchset
+	if use ovmf; then
+		if [[ -n ${OVMF_VER} ]];then
+			einfo "Try to apply Ovmf patch set"
+			pushd "${WORKDIR}"/ovmf-*/ > /dev/null
+			eapply "${WORKDIR}"/patches-ovmf
+			popd > /dev/null
+		fi
+		mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
+	fi
+
+	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+	# Fix texi2html build error with new texi2html, qemu.doc.html
+	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
+
+	use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
+	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
+		-i tools/firmware/Makefile || die
+
+	# Drop .config, fixes to gcc-4.6
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+
+		# try and remove all the default cflags
+		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
+			-exec sed \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+				-i {} + || die "failed to re-set custom-cflags"
+	else
+		unset CFLAGS
+		unset LDFLAGS
+		unset ASFLAGS
+		unset CPPFLAGS
+	fi
+
+	if ! use pygrub; then
+		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
+	fi
+
+	if ! use python; then
+		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
+	fi
+
+	if ! use hvm; then
+		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	# Bug 351648
+	elif ! use x86 && ! has x86 $(get_all_abis); then
+		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+		export CPATH="${WORKDIR}"/extra-headers
+	fi
+
+	if use qemu; then
+		if use sdl; then
+			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
+				tools/Makefile || die
+		else
+			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
+				tools/qemu-xen-traditional/xen-setup || die
+			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
+				tools/Makefile || die
+		fi
+	else
+		# Don't bother with qemu, only needed for fully virtualised guests
+		sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
+	fi
+
+	# Reset bash completion dir; Bug 472438
+	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
+		-i Config.mk || die
+	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
+
+	# xencommons, Bug #492332, sed lighter weight than patching
+	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+		-i tools/hotplug/Linux/init.d/xencommons.in || die
+
+	# fix bashishm
+	sed -e '/Usage/s/\$//g' \
+		-i tools/hotplug/Linux/init.d/xendriverdomain.in || die
+
+	# respect multilib, usr/lib/libcacard.so.0.0.0
+	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
+		-i tools/qemu-xen/configure || die
+
+	#bug 518136, don't build 32bit exactuable for nomultilib profile
+	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
+		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
+	fi
+
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=:autoballoon=:' \
+		-e 's:^#lockfile=:lockfile=:' \
+		-e 's:^#vif.default.script=:vif.default.script=:' \
+		-i tools/examples/xl.conf  || die
+
+	default
+}
+
+src_configure() {
+	local myconf="--prefix=${PREFIX}/usr \
+		--libdir=${PREFIX}/usr/$(get_libdir) \
+		--libexecdir=${PREFIX}/usr/libexec \
+		--localstatedir=${EPREFIX}/var \
+		--disable-werror \
+		--disable-xen \
+		--enable-tools \
+		--enable-docs \
+		$(use_enable pam) \
+		$(use_enable api xenapi) \
+		$(use_enable ovmf) \
+		$(use_enable ocaml ocamltools) \
+		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
+		"
+
+	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
+	use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64"
+	use amd64 && myconf+=" $(use_enable qemu-traditional)"
+	econf ${myconf}
+}
+
+src_compile() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt}
+
+	if use doc; then
+		emake -C docs build
+	else
+		emake -C docs man-pages
+	fi
+}
+
+src_install() {
+	# Override auto-detection in the build system, bug #382573
+	export INITD_DIR=/tmp/init.d
+	export CONFIG_LEAF_DIR=../tmp/default
+
+	# Let the build system compile installed Python modules.
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+		XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+	# Created at runtime
+	rm -rv "${ED%/}/var/run" || die
+
+	# Fix the remaining Python shebangs.
+	python_fix_shebang "${D}"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}"tmp || die
+
+	emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+	use doc && dodoc -r docs/{pdf,txt}
+	dodoc ${DOCS[@]}
+
+	newconfd "${FILESDIR}"/xendomains.confd xendomains
+	newconfd "${FILESDIR}"/xenstored.confd xenstored
+	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+	newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xencommons.initd xencommons
+	newconfd "${FILESDIR}"/xencommons.confd xencommons
+	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
+	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
+	newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
+
+	if use screen; then
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
+		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
+		keepdir /var/log/xen-consoles
+	fi
+
+	# For -static-libs wrt Bug 384355
+	if ! use static-libs; then
+		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
+	fi
+
+	# for xendomains
+	keepdir /etc/xen/auto
+
+	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "https://wiki.xen.org/wiki/Main_Page"
+	elog ""
+	elog "Recommended to utilise the xencommons script to config sytem At boot"
+	elog "Add by use of rc-update on completion of the install"
+
+	if ! use hvm; then
+		echo
+		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+		elog "support enable the hvm use flag."
+		elog "An x86 or amd64 system is required to build HVM support."
+	fi
+
+	if use qemu; then
+		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
+		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
+		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
+		elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
+	fi
+}
diff --git a/app-emulation/xen-tools/xen-tools-4.11.0-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.11.0-r1.ebuild
deleted file mode 100644
index 6f927ec809a3..000000000000
--- a/app-emulation/xen-tools/xen-tools-4.11.0-r1.ebuild
+++ /dev/null
@@ -1,457 +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='ncurses,xml,threads'
-
-inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs versionator
-
-MY_PV=${PV/_/-}
-MAJOR_V="$(get_version_component_range 1-2)"
-
-if [[ $PV == *9999 ]]; then
-	inherit git-r3
-	REPO="xen.git"
-	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
-	S="${WORKDIR}/${REPO}"
-else
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	UPSTREAM_VER=0
-	SECURITY_VER=
-	# xen-tools's gentoo patches tarball
-	GENTOO_VER=14
-	# xen-tools's gentoo patches version which apply to this specific ebuild
-	GENTOO_GPV=0
-	# xen-tools ovmf's patches
-	OVMF_VER=3
-
-	SEABIOS_VER=1.10.0
-	# OVMF upstream 5920a9d16b1ab887c2858224316a98e961d71b05
-	OVMF_PV=20170321
-
-	[[ -n ${UPSTREAM_VER} ]] && \
-		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-	[[ -n ${SECURITY_VER} ]] && \
-		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
-	[[ -n ${GENTOO_VER} ]] && \
-		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
-	[[ -n ${OVMF_VER} ]] && \
-		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
-
-	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
-	http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
-	https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
-	ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.xz
-		${OVMF_PATCHSET_URI} )
-	${UPSTREAM_PATCHSET_URI}
-	${SECURITY_PATCHSET_URI}
-	${GENTOO_PATCHSET_URI}"
-
-	S="${WORKDIR}/xen-${MY_PV}"
-fi
-
-DESCRIPTION="Xen tools including QEMU and xl"
-HOMEPAGE="https://www.xenproject.org"
-DOCS=( README docs/README.xen-bugtool )
-
-LICENSE="GPL-2"
-SLOT="0/${MAJOR_V}"
-# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
-# >=dev-lang/ocaml-4 stable
-# Masked in profiles/eapi-5-files instead
-IUSE="api custom-cflags debug doc flask hvm ocaml ovmf +pam pygrub python +qemu +qemu-traditional screen sdl static-libs system-qemu system-seabios"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	pygrub? ( python )
-	ovmf? ( hvm )
-	^^ ( qemu system-qemu )"
-
-COMMON_DEPEND="
-	sys-apps/pciutils
-	dev-libs/lzo:2
-	dev-libs/glib:2
-	dev-libs/yajl
-	dev-libs/libaio
-	dev-libs/libgcrypt:0
-	sys-libs/zlib
-	${PYTHON_DEPS}
-"
-
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-4.11
-	dev-python/lxml[${PYTHON_USEDEP}]
-	x86? ( sys-devel/dev86
-		sys-power/iasl )
-	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
-	api? ( dev-libs/libxml2
-		net-misc/curl )
-	ovmf? (
-		!arm? ( !arm64? ( dev-lang/nasm ) )
-		$(python_gen_impl_dep sqlite)
-		)
-	!amd64? ( >=sys-apps/dtc-1.4.0 )
-	amd64? ( sys-devel/bin86
-		system-seabios? ( sys-firmware/seabios )
-		sys-firmware/ipxe
-		sys-devel/dev86
-		sys-power/iasl )
-	dev-lang/perl
-	app-misc/pax-utils
-	doc? (
-		app-text/ghostscript-gpl
-		app-text/pandoc
-		dev-python/markdown[${PYTHON_USEDEP}]
-		dev-texlive/texlive-latexextra
-		media-gfx/transfig
-	)
-	hvm? ( x11-base/xorg-proto )
-	qemu? (
-		app-arch/snappy:=
-		x11-libs/pixman
-		sdl? ( media-libs/libsdl[X] )
-	)
-	system-qemu? ( app-emulation/qemu[xen] )
-	ocaml? ( dev-ml/findlib
-		>=dev-lang/ocaml-4 )"
-
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/iproute2[-minimal]
-	net-misc/bridge-utils
-	screen? (
-		app-misc/screen
-		app-admin/logrotate
-	)"
-
-# hvmloader is used to bootstrap a fully virtualized kernel
-# Approved by QA team in bug #144032
-QA_WX_LOAD="
-	usr/libexec/xen/boot/hvmloader
-	usr/share/qemu-xen/qemu/s390-ccw.img
-	usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-QA_PREBUILT="
-	usr/libexec/xen/bin/ivshmem-client
-	usr/libexec/xen/bin/ivshmem-server
-	usr/libexec/xen/bin/qemu-img
-	usr/libexec/xen/bin/qemu-io
-	usr/libexec/xen/bin/qemu-keymap
-	usr/libexec/xen/bin/qemu-nbd
-	usr/libexec/xen/bin/qemu-pr-helper
-	usr/libexec/xen/bin/qemu-system-i386
-	usr/libexec/xen/bin/virtfs-proxy-helper
-	usr/libexec/xen/libexec/xen-bridge-helper
-	usr/share/qemu-xen/qemu/s390-ccw.img
-	usr/share/qemu-xen/qemu/s390-netboot.img
-	usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-RESTRICT="test"
-
-pkg_setup() {
-	python_setup
-	export "CONFIG_LOMOUNT=y"
-
-	#bug 522642, disable compile tools/tests
-	export "CONFIG_TESTS=n"
-
-	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
-		if use x86 && use amd64; then
-			die "Confusion! Both x86 and amd64 are set in your use flags!"
-		elif use x86; then
-			export XEN_TARGET_ARCH="x86_32"
-		elif use amd64 ; then
-			export XEN_TARGET_ARCH="x86_64"
-		elif use arm; then
-			export XEN_TARGET_ARCH="arm32"
-		elif use arm64; then
-			export XEN_TARGET_ARCH="arm64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-}
-
-src_prepare() {
-	local i
-
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		einfo "Try to apply Xen Upstream patch set"
-		eapply "${WORKDIR}"/patches-upstream
-	fi
-
-	# Security patchset
-	if [[ -n ${SECURITY_VER} ]]; then
-	einfo "Try to apply Xen Security patch set"
-		# apply main xen patches
-		# Two parallel systems, both work side by side
-		# Over time they may concdense into one. This will suffice for now
-		EPATCH_SUFFIX="patch"
-		EPATCH_FORCE="yes"
-
-		source "${WORKDIR}"/patches-security/${PV}.conf || die
-
-		for i in ${XEN_SECURITY_MAIN}; do
-			eapply "${WORKDIR}"/patches-security/xen/$i
-		done
-
-		# apply qemu-xen/upstream patches
-		pushd "${S}"/tools/qemu-xen/ > /dev/null
-		for i in ${XEN_SECURITY_QEMUU}; do
-			eapply "${WORKDIR}"/patches-security/qemuu/$i
-		done
-		popd > /dev/null
-
-		# apply qemu-traditional patches
-		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
-		for i in ${XEN_SECURITY_QEMUT}; do
-			eapply "${WORKDIR}"/patches-security/qemut/$i
-		done
-		popd > /dev/null
-	fi
-
-	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
-	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
-	pushd tools/firmware/ > /dev/null
-	ln -s seabios-dir-remote seabios-dir || die
-	popd > /dev/null
-
-	# Gentoo's patchset
-	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
-		einfo "Try to apply Gentoo specific patch set"
-		source "${FILESDIR}"/gentoo-patches.conf || die
-		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
-		for i in ${!_gpv}; do
-			eapply "${WORKDIR}"/patches-gentoo/$i
-		done
-	fi
-
-	# Ovmf's patchset
-	if use ovmf; then
-		if [[ -n ${OVMF_VER} ]];then
-			einfo "Try to apply Ovmf patch set"
-			pushd "${WORKDIR}"/ovmf-*/ > /dev/null
-			eapply "${WORKDIR}"/patches-ovmf
-			popd > /dev/null
-		fi
-		mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
-	fi
-
-	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
-
-	# Fix texi2html build error with new texi2html, qemu.doc.html
-	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
-
-	use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
-	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
-		 -i tools/firmware/Makefile || die
-
-	# Drop .config, fixes to gcc-4.6
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	# if the user *really* wants to use their own custom-cflags, let them
-	if use custom-cflags; then
-		einfo "User wants their own CFLAGS - removing defaults"
-
-		# try and remove all the default cflags
-		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
-			-exec sed \
-				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-				-i {} + || die "failed to re-set custom-cflags"
-	else
-		unset CFLAGS
-		unset LDFLAGS
-		unset ASFLAGS
-		unset CPPFLAGS
-	fi
-
-	if ! use pygrub; then
-		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
-	fi
-
-	if ! use python; then
-		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
-	fi
-
-	if ! use hvm; then
-		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
-	# Bug 351648
-	elif ! use x86 && ! has x86 $(get_all_abis); then
-		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
-		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
-		export CPATH="${WORKDIR}"/extra-headers
-	fi
-
-	if use qemu; then
-		if use sdl; then
-			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
-				tools/Makefile || die
-		else
-			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
-				tools/qemu-xen-traditional/xen-setup || die
-			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
-				tools/Makefile || die
-		fi
-	else
-		# Don't bother with qemu, only needed for fully virtualised guests
-		sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
-	fi
-
-	# Reset bash completion dir; Bug 472438
-	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
-		-i Config.mk || die
-	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
-
-	# xencommons, Bug #492332, sed lighter weight than patching
-	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
-		-i tools/hotplug/Linux/init.d/xencommons.in || die
-
-	# fix bashishm
-	sed -e '/Usage/s/\$//g' \
-		-i tools/hotplug/Linux/init.d/xendriverdomain.in || die
-
-	# respect multilib, usr/lib/libcacard.so.0.0.0
-	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
-		-i tools/qemu-xen/configure || die
-
-	#bug 518136, don't build 32bit exactuable for nomultilib profile
-	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
-		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
-	fi
-
-	# uncomment lines in xl.conf
-	sed -e 's:^#autoballoon=:autoballoon=:' \
-		-e 's:^#lockfile=:lockfile=:' \
-		-e 's:^#vif.default.script=:vif.default.script=:' \
-		-i tools/examples/xl.conf  || die
-
-	default
-}
-
-src_configure() {
-	local myconf="--prefix=${PREFIX}/usr \
-		--libdir=${PREFIX}/usr/$(get_libdir) \
-		--libexecdir=${PREFIX}/usr/libexec \
-		--localstatedir=${EPREFIX}/var \
-		--disable-werror \
-		--disable-xen \
-		--enable-tools \
-		--enable-docs \
-		$(use_enable pam) \
-		$(use_enable api xenapi) \
-		$(use_enable ovmf) \
-		$(use_enable ocaml ocamltools) \
-		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
-		"
-
-	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
-	use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64"
-	use amd64 && myconf+=" $(use_enable qemu-traditional)"
-	econf ${myconf}
-}
-
-src_compile() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-
-	if test-flag-CC -fno-strict-overflow; then
-		append-flags -fno-strict-overflow
-	fi
-
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt}
-
-	if use doc; then
-		emake -C docs build
-	else
-		emake -C docs man-pages
-	fi
-}
-
-src_install() {
-	# Override auto-detection in the build system, bug #382573
-	export INITD_DIR=/tmp/init.d
-	export CONFIG_LEAF_DIR=../tmp/default
-
-	# Let the build system compile installed Python modules.
-	local PYTHONDONTWRITEBYTECODE
-	export PYTHONDONTWRITEBYTECODE
-
-	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
-		XEN_PYTHON_NATIVE_INSTALL=y install-tools
-
-	# Created at runtime
-	rm -rv "${ED%/}/var/run" || die
-
-	# Fix the remaining Python shebangs.
-	python_fix_shebang "${D}"
-
-	# Remove RedHat-specific stuff
-	rm -rf "${D}"tmp || die
-
-	emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
-	use doc && dodoc -r docs/{pdf,txt}
-	dodoc ${DOCS[@]}
-
-	newconfd "${FILESDIR}"/xendomains.confd xendomains
-	newconfd "${FILESDIR}"/xenstored.confd xenstored
-	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
-	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
-	newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
-	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
-	newinitd "${FILESDIR}"/xencommons.initd xencommons
-	newconfd "${FILESDIR}"/xencommons.confd xencommons
-	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
-	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
-	newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
-
-	if use screen; then
-		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
-		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
-		keepdir /var/log/xen-consoles
-	fi
-
-	# For -static-libs wrt Bug 384355
-	if ! use static-libs; then
-		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
-	fi
-
-	# for xendomains
-	keepdir /etc/xen/auto
-
-	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
-	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
-		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide and the offical wiki page:"
-	elog "https://wiki.gentoo.org/wiki/Xen"
-	elog "https://wiki.xen.org/wiki/Main_Page"
-	elog ""
-	elog "Recommended to utilise the xencommons script to config sytem At boot"
-	elog "Add by use of rc-update on completion of the install"
-
-	if ! use hvm; then
-		echo
-		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
-		elog "support enable the hvm use flag."
-		elog "An x86 or amd64 system is required to build HVM support."
-	fi
-
-	if use qemu; then
-		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
-		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
-		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
-		elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
-	fi
-}
diff --git a/app-emulation/xen-tools/xen-tools-4.9.2-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.9.2-r1.ebuild
deleted file mode 100644
index d8eb34ba9c52..000000000000
--- a/app-emulation/xen-tools/xen-tools-4.9.2-r1.ebuild
+++ /dev/null
@@ -1,453 +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='ncurses,xml,threads'
-
-inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs versionator
-
-MY_PV=${PV/_/-}
-MAJOR_V="$(get_version_component_range 1-2)"
-
-if [[ $PV == *9999 ]]; then
-	inherit git-r3
-	REPO="xen.git"
-	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
-	S="${WORKDIR}/${REPO}"
-else
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-	UPSTREAM_VER=2
-	SECURITY_VER=
-	# xen-tools's gentoo patches tarball
-	GENTOO_VER=12
-	# xen-tools's gentoo patches version which apply to this specific ebuild
-	GENTOO_GPV=0
-	# xen-tools ovmf's patches
-	OVMF_VER=3
-
-	SEABIOS_VER=1.10.0
-	# OVMF upstream 5920a9d16b1ab887c2858224316a98e961d71b05
-	OVMF_PV=20170321
-
-	[[ -n ${UPSTREAM_VER} ]] && \
-		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-	[[ -n ${SECURITY_VER} ]] && \
-		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
-	[[ -n ${GENTOO_VER} ]] && \
-		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz"
-	[[ -n ${OVMF_VER} ]] && \
-		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
-
-	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
-	http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
-	https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
-	ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.xz
-		${OVMF_PATCHSET_URI} )
-	${UPSTREAM_PATCHSET_URI}
-	${SECURITY_PATCHSET_URI}
-	${GENTOO_PATCHSET_URI}"
-
-	S="${WORKDIR}/xen-${MY_PV}"
-fi
-
-DESCRIPTION="Xen tools including QEMU and xl"
-HOMEPAGE="https://www.xenproject.org"
-DOCS=( README docs/README.xen-bugtool )
-
-LICENSE="GPL-2"
-SLOT="0/${MAJOR_V}"
-# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
-# >=dev-lang/ocaml-4 stable
-# Masked in profiles/eapi-5-files instead
-IUSE="api custom-cflags debug doc flask hvm ocaml ovmf +pam pygrub python +qemu +qemu-traditional screen sdl static-libs system-qemu system-seabios"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	pygrub? ( python )
-	ovmf? ( hvm )
-	^^ ( qemu system-qemu )"
-
-COMMON_DEPEND="
-	sys-apps/pciutils
-	dev-libs/lzo:2
-	dev-libs/glib:2
-	dev-libs/yajl
-	dev-libs/libaio
-	dev-libs/libgcrypt:0
-	sys-libs/zlib
-	${PYTHON_DEPS}
-"
-
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-4.11
-	dev-python/lxml[${PYTHON_USEDEP}]
-	x86? ( sys-devel/dev86
-		sys-power/iasl )
-	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
-	api? ( dev-libs/libxml2
-		net-misc/curl )
-	ovmf? (
-		!arm? ( !arm64? ( dev-lang/nasm ) )
-		$(python_gen_impl_dep sqlite)
-		)
-	!amd64? ( >=sys-apps/dtc-1.4.0 )
-	amd64? ( sys-devel/bin86
-		system-seabios? ( sys-firmware/seabios )
-		sys-firmware/ipxe
-		sys-devel/dev86
-		sys-power/iasl )
-	dev-lang/perl
-	app-misc/pax-utils
-	doc? (
-		app-text/ghostscript-gpl
-		app-text/pandoc
-		dev-python/markdown[${PYTHON_USEDEP}]
-		dev-texlive/texlive-latexextra
-		media-gfx/transfig
-	)
-	hvm? ( x11-base/xorg-proto
-		!net-libs/libiscsi )
-	qemu? (
-		app-arch/snappy:=
-		x11-libs/pixman
-		sdl? ( media-libs/libsdl[X] )
-	)
-	system-qemu? ( app-emulation/qemu[xen] )
-	ocaml? ( dev-ml/findlib
-		>=dev-lang/ocaml-4 )"
-
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/iproute2[-minimal]
-	net-misc/bridge-utils
-	screen? (
-		app-misc/screen
-		app-admin/logrotate
-	)"
-
-# hvmloader is used to bootstrap a fully virtualized kernel
-# Approved by QA team in bug #144032
-QA_WX_LOAD="
-	usr/libexec/xen/boot/hvmloader
-	usr/share/qemu-xen/qemu/s390-ccw.img
-	usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-QA_PREBUILT="
-	usr/libexec/xen/bin/ivshmem-client
-	usr/libexec/xen/bin/ivshmem-server
-	usr/libexec/xen/bin/qemu-img
-	usr/libexec/xen/bin/qemu-io
-	usr/libexec/xen/bin/qemu-nbd
-	usr/libexec/xen/bin/qemu-system-i386
-	usr/libexec/xen/bin/virtfs-proxy-helper
-	usr/libexec/xen/libexec/xen-bridge-helper
-	usr/share/qemu-xen/qemu/s390-ccw.img
-	usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-RESTRICT="test"
-
-pkg_setup() {
-	python_setup
-	export "CONFIG_LOMOUNT=y"
-
-	#bug 522642, disable compile tools/tests
-	export "CONFIG_TESTS=n"
-
-	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
-		if use x86 && use amd64; then
-			die "Confusion! Both x86 and amd64 are set in your use flags!"
-		elif use x86; then
-			export XEN_TARGET_ARCH="x86_32"
-		elif use amd64 ; then
-			export XEN_TARGET_ARCH="x86_64"
-		elif use arm; then
-			export XEN_TARGET_ARCH="arm32"
-		elif use arm64; then
-			export XEN_TARGET_ARCH="arm64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-}
-
-src_prepare() {
-	local i
-
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		einfo "Try to apply Xen Upstream patch set"
-		eapply "${WORKDIR}"/patches-upstream
-	fi
-
-	# Security patchset
-	if [[ -n ${SECURITY_VER} ]]; then
-	einfo "Try to apply Xen Security patch set"
-		# apply main xen patches
-		# Two parallel systems, both work side by side
-		# Over time they may concdense into one. This will suffice for now
-		EPATCH_SUFFIX="patch"
-		EPATCH_FORCE="yes"
-
-		source "${WORKDIR}"/patches-security/${PV}.conf || die
-
-		for i in ${XEN_SECURITY_MAIN}; do
-			eapply "${WORKDIR}"/patches-security/xen/$i
-		done
-
-		# apply qemu-xen/upstream patches
-		pushd "${S}"/tools/qemu-xen/ > /dev/null
-		for i in ${XEN_SECURITY_QEMUU}; do
-			eapply "${WORKDIR}"/patches-security/qemuu/$i
-		done
-		popd > /dev/null
-
-		# apply qemu-traditional patches
-		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
-		for i in ${XEN_SECURITY_QEMUT}; do
-			eapply "${WORKDIR}"/patches-security/qemut/$i
-		done
-		popd > /dev/null
-	fi
-
-	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
-	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
-	pushd tools/firmware/ > /dev/null
-	ln -s seabios-dir-remote seabios-dir || die
-	popd > /dev/null
-
-	# Gentoo's patchset
-	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
-		einfo "Try to apply Gentoo specific patch set"
-		source "${FILESDIR}"/gentoo-patches.conf || die
-		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
-		for i in ${!_gpv}; do
-			eapply "${WORKDIR}"/patches-gentoo/$i
-		done
-	fi
-
-	# Ovmf's patchset
-	if use ovmf; then
-		if [[ -n ${OVMF_VER} ]];then
-			einfo "Try to apply Ovmf patch set"
-			pushd "${WORKDIR}"/ovmf-*/ > /dev/null
-			eapply "${WORKDIR}"/patches-ovmf
-			popd > /dev/null
-		fi
-		mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
-	fi
-
-	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
-
-	# Fix texi2html build error with new texi2html, qemu.doc.html
-	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
-
-	use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
-	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
-		 -i tools/firmware/Makefile || die
-
-	# Drop .config, fixes to gcc-4.6
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	# if the user *really* wants to use their own custom-cflags, let them
-	if use custom-cflags; then
-		einfo "User wants their own CFLAGS - removing defaults"
-
-		# try and remove all the default cflags
-		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
-			-exec sed \
-				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-				-i {} + || die "failed to re-set custom-cflags"
-	else
-		unset CFLAGS
-		unset LDFLAGS
-		unset ASFLAGS
-		unset CPPFLAGS
-	fi
-
-	if ! use pygrub; then
-		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
-	fi
-
-	if ! use python; then
-		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
-	fi
-
-	if ! use hvm; then
-		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
-	# Bug 351648
-	elif ! use x86 && ! has x86 $(get_all_abis); then
-		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
-		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
-		export CPATH="${WORKDIR}"/extra-headers
-	fi
-
-	if use qemu; then
-		if use sdl; then
-			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
-				tools/Makefile || die
-		else
-			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
-				tools/qemu-xen-traditional/xen-setup || die
-			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
-				tools/Makefile || die
-		fi
-	else
-		# Don't bother with qemu, only needed for fully virtualised guests
-		sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
-	fi
-
-	# Reset bash completion dir; Bug 472438
-	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
-		-i Config.mk || die
-	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
-
-	# xencommons, Bug #492332, sed lighter weight than patching
-	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
-		-i tools/hotplug/Linux/init.d/xencommons.in || die
-
-	# fix bashishm
-	sed -e '/Usage/s/\$//g' \
-		-i tools/hotplug/Linux/init.d/xendriverdomain.in || die
-
-	# respect multilib, usr/lib/libcacard.so.0.0.0
-	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
-		-i tools/qemu-xen/configure || die
-
-	#bug 518136, don't build 32bit exactuable for nomultilib profile
-	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
-		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
-	fi
-
-	# uncomment lines in xl.conf
-	sed -e 's:^#autoballoon=:autoballoon=:' \
-		-e 's:^#lockfile=:lockfile=:' \
-		-e 's:^#vif.default.script=:vif.default.script=:' \
-		-i tools/examples/xl.conf  || die
-
-	default
-}
-
-src_configure() {
-	local myconf="--prefix=${PREFIX}/usr \
-		--libdir=${PREFIX}/usr/$(get_libdir) \
-		--libexecdir=${PREFIX}/usr/libexec \
-		--localstatedir=${EPREFIX}/var \
-		--disable-werror \
-		--disable-xen \
-		--enable-tools \
-		--enable-docs \
-		$(use_enable pam) \
-		$(use_enable api xenapi) \
-		$(use_enable ovmf) \
-		$(use_enable ocaml ocamltools) \
-		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
-		"
-
-	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
-	use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64"
-	use amd64 && myconf+=" $(use_enable qemu-traditional)"
-	econf ${myconf}
-}
-
-src_compile() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-
-	if test-flag-CC -fno-strict-overflow; then
-		append-flags -fno-strict-overflow
-	fi
-
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt}
-
-	if use doc; then
-		emake -C docs build
-	else
-		emake -C docs man-pages
-	fi
-}
-
-src_install() {
-	# Override auto-detection in the build system, bug #382573
-	export INITD_DIR=/tmp/init.d
-	export CONFIG_LEAF_DIR=../tmp/default
-
-	# Let the build system compile installed Python modules.
-	local PYTHONDONTWRITEBYTECODE
-	export PYTHONDONTWRITEBYTECODE
-
-	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
-		XEN_PYTHON_NATIVE_INSTALL=y install-tools
-
-	# Created at runtime
-	rm -rv "${ED%/}/var/run" || die
-
-	# Fix the remaining Python shebangs.
-	python_fix_shebang "${D}"
-
-	# Remove RedHat-specific stuff
-	rm -rf "${D}"tmp || die
-
-	emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
-	use doc && dodoc -r docs/{pdf,txt}
-	dodoc ${DOCS[@]}
-
-	newconfd "${FILESDIR}"/xendomains.confd xendomains
-	newconfd "${FILESDIR}"/xenstored.confd xenstored
-	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
-	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
-	newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
-	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
-	newinitd "${FILESDIR}"/xencommons.initd xencommons
-	newconfd "${FILESDIR}"/xencommons.confd xencommons
-	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
-	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
-	newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
-
-	if use screen; then
-		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
-		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
-		keepdir /var/log/xen-consoles
-	fi
-
-	# For -static-libs wrt Bug 384355
-	if ! use static-libs; then
-		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
-	fi
-
-	# for xendomains
-	keepdir /etc/xen/auto
-
-	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
-	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
-		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide and the offical wiki page:"
-	elog "https://wiki.gentoo.org/wiki/Xen"
-	elog "https://wiki.xen.org/wiki/Main_Page"
-	elog ""
-	elog "Recommended to utilise the xencommons script to config sytem At boot"
-	elog "Add by use of rc-update on completion of the install"
-
-	if ! use hvm; then
-		echo
-		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
-		elog "support enable the hvm use flag."
-		elog "An x86 or amd64 system is required to build HVM support."
-	fi
-
-	if use qemu; then
-		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
-		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
-		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
-		elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
-	fi
-}
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 2cc185598d24..3f69e926ab64 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,18 +1,11 @@
 AUX xen-4.6-efi.patch 1954 BLAKE2B c027aff764e83eef957241827980559ccfeec5525bf0ce6b6b2d38db565fd0f24b21609c1d497934ef823d42116eaf96799b45314f11f57a9238ab21f1255a00 SHA512 361af33159cf49626e92d2815fd4422ea5b1d696a32ce2695ce75205fbbfb89d96b64a8af7332fffdc4a4390000bf52d3730403dfc2334af0da0bea59d58b689
-DIST xen-4.10.0-upstream-patches-0.tar.xz 70884 BLAKE2B 9a27e7989486ba3ba59548de356384527cc5b78e63b6ed042506e6534e488272369f021cd2daa516820313c3fe18625a5864794ae0806e7018b8ad28b0a294b1 SHA512 e64bf1d30d24e922c60c3b518a4de7874b43cc695134b4cdd65f6d95ae9ae579c521fab13ca82409fde55e43815d072c3194997e2bda106204cbf329e93a0a00
-DIST xen-4.10.0.tar.gz 24618123 BLAKE2B 009faa980f9734525c137d525e626bfa3443c285aeb6b4af91bb2c32a2e98376ded0b1114b541d11e2d4353f4f588d58e8add5b1e0d7de2fe3399d4687c5bfae SHA512 5a37935c382f9cfe3641a35c3be0ba11689bca10c7d3c2401963513e3a834ee8d0c8a0ddcf3716dbf0a795aea1bab78caf19acf1272e5e054bf012cfa06a4690
-DIST xen-4.10.1-upstream-patches-1.tar.xz 85048 BLAKE2B d00f01980e1c889b2f6899970999b93a7ddbaa03f88219d576bfbe4ccfe0ef3f75afad1538065045833430baa16b64d8dd7eb42af6ad7c3ef948601b941c51bc SHA512 ede74a53faf82712d6ee0cf2a995bb78b7079481e47e829243632fac40069194671e6b9b765e535aa533f618cdcd7715f540e81acd947a42f7b8cbb693a3df82
 DIST xen-4.10.1-upstream-patches-2.tar.xz 117588 BLAKE2B ddcd58964117652b50f3524d89089e2e9b14a8399fb5bd2db5d12827035ab94cedbfd5d65134d8953e4062a50e0e8a9b320e9c34008db8fd364456f47fd9cd26 SHA512 49ee8497af3753f3d611bf12c65fb7a79abb018862f1af096e9dde3ddfe8780bb95fc3da338c8d5f16a5d6d233d606d4cf8025a3d0e2897bf2668a1d5b27b198
 DIST xen-4.10.1.tar.gz 24674240 BLAKE2B f9a7e0c637db865ab32ad6b6185ab96022903aff65a18e194286a3fc372d4a45f6682cd636b7ac5b4fa0125e54ed51f8876a411d498cf75791718fd088c4a6d2 SHA512 236c02bee69e33644703ed26d323d4c491a91fc05bd0ee0990a7368579f7c82f5bb4510845bf80348fd923024d7d60d521f593dfd0365d971dc592f8ef10fbea
-DIST xen-4.11.0-upstream-patches-0.tar.xz 21720 BLAKE2B 92c2ef90ca6af5032e9181d8edbe2b91a4117cc402f5abdff208aa76ee76b56ce75f576c56220d2ebf6d1a21957c10f7c45a2c88d2c77aa8b17fa9a0a99e5b57 SHA512 6ea0ee376251b20b7fa9b6334bca462f115d8a9929e31ae269ae9591b433b46e4e9076a2d2e39ec5f868d5d74739ad7b0ba0d9244e599da5255ccca0babd669e
+DIST xen-4.10.2-upstream-patches-0.tar.xz 3884 BLAKE2B 4584fbe849e80c638db07f49a19cc26fe79606b76eef96258a02b198e4a198053785e76dd82a666e1b719641f5ca675aa7d35d97a8237ccc2d22485b790ebec9 SHA512 83bb37e241efdcb5641cb5423d09c1f04d3eb5cd89c72b74934d7712705735f9cfa00b3a2291947693409f966554660abd33f07b08cc94a4a0df8ce8b359996a
+DIST xen-4.10.2.tar.gz 24697204 BLAKE2B b331d3ad8d7842446f7d2da5dd31560f636aa1408dd3cc8798dff35b868ef5a609d17e97ef4355e1e5aa825a5abc74103796f9a8015037f0a564ffcebd825722 SHA512 2e301b4d6eb106fcb52203bc1208c8fd1fc7bb5d795166c0f86e4085227050301f7daa6f21db440c47bc2ca2c7f87d9b96753cfdf3fa724e0416b5679b84c163
 DIST xen-4.11.0-upstream-patches-1.tar.xz 56664 BLAKE2B 27579f4e628bb0d3fdd59f7e133e9134d4ca175842dfdae3a3f765b133254239ae3bca94d75dd655735b5bcbd67f9b8d444dd227028642e6e459e57ed8a20341 SHA512 e90b8e7fa9433e93b1620a776833a6d3578babebe5d73dcaae11186f473945a2270046932ab314a9c6049d3b460a655456f487a5b59730fe88a4f08d482c47a1
 DIST xen-4.11.0.tar.gz 25131533 BLAKE2B 892639b8bcd9b9956104e4d5137ffd88e17f92d965fa967b4af8d74a4fddcc21c6971c53026e0fb5ce833ab2c25c68f827abcac0b7b1dcebc21dca645c465573 SHA512 33d431c194f10d5ee767558404a1f80a66b3df019012b0bbd587fcbc9524e1bba7ea04269020ce891fe9d211d2f81c63bf78abedcdbe1595aee26251c803a50a
-DIST xen-4.9.2-upstream-patches-1.tar.xz 13812 BLAKE2B fe8bf636dea9fbd21c9fc432817dc8e21ffb78bf70279b86babb6963a0dbebc17493eb6c016ee1093ef36e66693df25e8aeb35a568260f2e62a97a787b3c70bb SHA512 d75ea99531a10279736f89057857c257955800df6fe42bd742babfd5a9e527a2cb0d4dc5505b41df5b9db82246a8414f14b7084997ee798ffab657a3991b17ae
-DIST xen-4.9.2.tar.gz 23392753 BLAKE2B 5f96f0e5062eff8ac2971eef85ea2bae0e94e7542151237937a1cf7e74690bb0ce1c952e830d2fc13b3277f70b9ed1de511afe4f780ad7b3be0c58742ece39b2 SHA512 e06aec25439abcc548c174ba8e271c23031ea704bcc2480905140aa68490064fbb1c58d9c4174f6617b4f7bbcddfda284317df6f480a6e5b5b5a2c71fbe0ac93
-EBUILD xen-4.10.0.ebuild 4819 BLAKE2B 3485abb76d742a02a1f5bab5a751c151fa2ac1e82f07fc98a288be9389f6ba4a5a1e56fc9a88ed41bc6e690b9e74ef301732dd57c3d2f25a8bb3e1fb4cdf4021 SHA512 932483e5bef935091d911cf162b40ff69992217847aa5dce3dfe82deda6e924624cf3d7f808b74fd0ea487a7cf25ee50c095e290d76aaaa259c9d57949534911
-EBUILD xen-4.10.1-r1.ebuild 4819 BLAKE2B 72bfc9525c0baaeebd6e12351bc38c0a45290cd50f2b4cf19f19bb250306b9a305ee14ff7bd7e3e3697fac9187c596647290d5e8cd2eff99c799d2cfa9a894d2 SHA512 56b92a8a629bb290f0cdf1e3c72438ce7cdb8f5bf77ace6e5113ff503d1ab745ad926b288cc69e7d3a4636cdb05004dd8a7505e277c9144414fb608d1ec4c8bb
 EBUILD xen-4.10.1-r2.ebuild 4823 BLAKE2B f3d9b58a962ff238a06aab52bc4a2b31f7fddc96ead762e76ea732cd7582598d752c96e6f3f8ed1f79fc30183bfac2113b45af43e8cd3c13ad17518f239240d5 SHA512 99a36b4c11f517eeb3d2c7ac047a031f4f1c3885b6a01390522e05697c9470c6da4014cf34498800b381aef88746dedea5c2300e7c43146f48d756777a81d8bf
-EBUILD xen-4.11.0-r1.ebuild 4819 BLAKE2B 3485abb76d742a02a1f5bab5a751c151fa2ac1e82f07fc98a288be9389f6ba4a5a1e56fc9a88ed41bc6e690b9e74ef301732dd57c3d2f25a8bb3e1fb4cdf4021 SHA512 932483e5bef935091d911cf162b40ff69992217847aa5dce3dfe82deda6e924624cf3d7f808b74fd0ea487a7cf25ee50c095e290d76aaaa259c9d57949534911
+EBUILD xen-4.10.2.ebuild 4796 BLAKE2B 63735fd721ef10e82c9403590e4728474117cf9c16d2063df2ad8edc9768ef7604e95971b75eb62fd9c8d4df85df7ad7bea4797174bc85f6d716904b8381a539 SHA512 361c7669572237bbd861b1adfe62a439c8fc1fc838e9023c0bcd2c8b864c0d91db3ad0063b2282d6bb8ce9a42f50cae833adf2f3bf7a1bb23e6b502e085a7308
 EBUILD xen-4.11.0-r2.ebuild 4819 BLAKE2B f2f02a3fa62bf031955b7d09e98b0028a69a98504af2fbfe6943fc74ca552245ffe014c8b746ce7ab9eb20bdc5d31aaf320f23ad682b44c9dc2e103f5dcd2e0f SHA512 e167c117f8f027a9ff832fbe27f33b0d40ea35a9cf3c958c9fb5ffe82b0c91a3ee086334c9da7c2d3bdaff3828e9b371945b59e0b6e763223f4f605802ee5dfa
-EBUILD xen-4.9.2.ebuild 4719 BLAKE2B bd5c63e4ed7046568f8276c0a5b65c1cee97e07e0410eec66324b7625619ed6320282181c9b10519f683c54cf22fd0af1e7bce14d5558966535b2393e6136af6 SHA512 3758dd6eb2323e30e9e77efbc46917bb16fed2f8380967903582d0c834d61fde1caa7902d96e5846af6ea4f0b914d64aaac2a58ad75c695e8a7c389e33f4971d
 MISC metadata.xml 417 BLAKE2B 5713c8e5f27d56714938b7d2bed096c3b3f9fbb0ad9bce2bb3240e4a8556134cfc88efe0e2c7feb2e9cc722c11800e8433afa0d03746b05998909dd976230225 SHA512 2708f84b8a1508eebc96539993ae1bde4b921d4401229c221e2bee9a0cd643fdf1f854fcbba6033ed68667d0efb00c25222f4c68535a96f2200084d8d8759946
diff --git a/app-emulation/xen/xen-4.10.0.ebuild b/app-emulation/xen/xen-4.10.0.ebuild
deleted file mode 100644
index 8027e789237b..000000000000
--- a/app-emulation/xen/xen-4.10.0.ebuild
+++ /dev/null
@@ -1,172 +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 flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-if [[ $PV == *9999 ]]; then
-	inherit git-r3
-	KEYWORDS=""
-	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~arm -x86"
-	UPSTREAM_VER=0
-	SECURITY_VER=
-	GENTOO_VER=
-
-	[[ -n ${UPSTREAM_VER} ]] && \
-		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-	[[ -n ${SECURITY_VER} ]] && \
-		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
-	[[ -n ${GENTOO_VER} ]] && \
-		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
-	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
-		${UPSTREAM_PATCHSET_URI}
-		${SECURITY_PATCHSET_URI}
-		${GENTOO_PATCHSET_URI}"
-fi
-
-DESCRIPTION="The Xen virtual machine monitor"
-HOMEPAGE="https://www.xenproject.org"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags debug efi flask"
-
-DEPEND="${PYTHON_DEPS}
-	efi? ( >=sys-devel/binutils-2.22[multitarget] )
-	!efi? ( >=sys-devel/binutils-2.22 )"
-RDEPEND=""
-PDEPEND="~app-emulation/xen-tools-${PV}"
-
-# no tests are available for the hypervisor
-# prevent the silliness of /usr/lib/debug/usr/lib/debug files
-# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
-RESTRICT="test splitdebug strip"
-
-# Approved by QA team in bug #144032
-QA_WX_LOAD="boot/xen-syms-${PV}"
-
-REQUIRED_USE="arm? ( debug )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	if [[ -z ${XEN_TARGET_ARCH} ]]; then
-		if use amd64; then
-			export XEN_TARGET_ARCH="x86_64"
-		elif use arm; then
-			export XEN_TARGET_ARCH="arm32"
-		elif use arm64; then
-			export XEN_TARGET_ARCH="arm64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-
-	if use flask ; then
-		export "XSM_ENABLE=y"
-		export "FLASK_ENABLE=y"
-	fi
-}
-
-src_prepare() {
-	# Upstream's patchset
-	[[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
-
-	# Security patchset
-	if [[ -n ${SECURITY_VER} ]]; then
-	einfo "Try to apply Xen Security patch set"
-		# apply main xen patches
-		# Two parallel systems, both work side by side
-		# Over time they may concdense into one. This will suffice for now
-		source "${WORKDIR}"/patches-security/${PV}.conf
-
-		local i
-		for i in ${XEN_SECURITY_MAIN}; do
-			eapply "${WORKDIR}"/patches-security/xen/$i
-		done
-	fi
-
-	# Gentoo's patchset
-	[[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
-
-	eapply "${FILESDIR}"/${PN}-4.6-efi.patch
-
-	# Drop .config
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	if use efi; then
-		export EFI_VENDOR="gentoo"
-		export EFI_MOUNTPOINT="boot"
-	fi
-
-	# if the user *really* wants to use their own custom-cflags, let them
-	if use custom-cflags; then
-		einfo "User wants their own CFLAGS - removing defaults"
-		# try and remove all the default custom-cflags
-		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
-			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-			-i {} \; || die "failed to re-set custom-cflags"
-	fi
-
-	default
-}
-
-src_configure() {
-	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
-
-	use debug && myopt="${myopt} debug=y"
-
-	if use custom-cflags; then
-		filter-flags -fPIE -fstack-protector
-		replace-flags -O3 -O2
-	else
-		unset CFLAGS
-		unset LDFLAGS
-		unset ASFLAGS
-	fi
-}
-
-src_compile() {
-	# Send raw LDFLAGS so that --as-needed works
-	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
-}
-
-src_install() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-
-	# The 'make install' doesn't 'mkdir -p' the subdirs
-	if use efi; then
-		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
-	fi
-
-	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
-
-	# make install likes to throw in some extra EFI bits if it built
-	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide:"
-	elog " https://wiki.gentoo.org/wiki/Xen"
-
-	use efi && einfo "The efi executable is installed in boot/efi/gentoo"
-
-	elog "You can optionally block the installation of /boot/xen-syms by an entry"
-	elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
-	elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
-}
diff --git a/app-emulation/xen/xen-4.10.1-r1.ebuild b/app-emulation/xen/xen-4.10.1-r1.ebuild
deleted file mode 100644
index 4a462ae958d4..000000000000
--- a/app-emulation/xen/xen-4.10.1-r1.ebuild
+++ /dev/null
@@ -1,172 +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 flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-if [[ $PV == *9999 ]]; then
-	inherit git-r3
-	KEYWORDS=""
-	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~arm -x86"
-	UPSTREAM_VER=1
-	SECURITY_VER=
-	GENTOO_VER=
-
-	[[ -n ${UPSTREAM_VER} ]] && \
-		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-	[[ -n ${SECURITY_VER} ]] && \
-		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
-	[[ -n ${GENTOO_VER} ]] && \
-		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
-	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
-		${UPSTREAM_PATCHSET_URI}
-		${SECURITY_PATCHSET_URI}
-		${GENTOO_PATCHSET_URI}"
-fi
-
-DESCRIPTION="The Xen virtual machine monitor"
-HOMEPAGE="https://www.xenproject.org"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags debug efi flask"
-
-DEPEND="${PYTHON_DEPS}
-	efi? ( >=sys-devel/binutils-2.22[multitarget] )
-	!efi? ( >=sys-devel/binutils-2.22 )"
-RDEPEND=""
-PDEPEND="~app-emulation/xen-tools-${PV}"
-
-# no tests are available for the hypervisor
-# prevent the silliness of /usr/lib/debug/usr/lib/debug files
-# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
-RESTRICT="test splitdebug strip"
-
-# Approved by QA team in bug #144032
-QA_WX_LOAD="boot/xen-syms-${PV}"
-
-REQUIRED_USE="arm? ( debug )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	if [[ -z ${XEN_TARGET_ARCH} ]]; then
-		if use amd64; then
-			export XEN_TARGET_ARCH="x86_64"
-		elif use arm; then
-			export XEN_TARGET_ARCH="arm32"
-		elif use arm64; then
-			export XEN_TARGET_ARCH="arm64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-
-	if use flask ; then
-		export "XSM_ENABLE=y"
-		export "FLASK_ENABLE=y"
-	fi
-}
-
-src_prepare() {
-	# Upstream's patchset
-	[[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
-
-	# Security patchset
-	if [[ -n ${SECURITY_VER} ]]; then
-	einfo "Try to apply Xen Security patch set"
-		# apply main xen patches
-		# Two parallel systems, both work side by side
-		# Over time they may concdense into one. This will suffice for now
-		source "${WORKDIR}"/patches-security/${PV}.conf
-
-		local i
-		for i in ${XEN_SECURITY_MAIN}; do
-			eapply "${WORKDIR}"/patches-security/xen/$i
-		done
-	fi
-
-	# Gentoo's patchset
-	[[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
-
-	eapply "${FILESDIR}"/${PN}-4.6-efi.patch
-
-	# Drop .config
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	if use efi; then
-		export EFI_VENDOR="gentoo"
-		export EFI_MOUNTPOINT="boot"
-	fi
-
-	# if the user *really* wants to use their own custom-cflags, let them
-	if use custom-cflags; then
-		einfo "User wants their own CFLAGS - removing defaults"
-		# try and remove all the default custom-cflags
-		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
-			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-			-i {} \; || die "failed to re-set custom-cflags"
-	fi
-
-	default
-}
-
-src_configure() {
-	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
-
-	use debug && myopt="${myopt} debug=y"
-
-	if use custom-cflags; then
-		filter-flags -fPIE -fstack-protector
-		replace-flags -O3 -O2
-	else
-		unset CFLAGS
-		unset LDFLAGS
-		unset ASFLAGS
-	fi
-}
-
-src_compile() {
-	# Send raw LDFLAGS so that --as-needed works
-	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
-}
-
-src_install() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-
-	# The 'make install' doesn't 'mkdir -p' the subdirs
-	if use efi; then
-		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
-	fi
-
-	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
-
-	# make install likes to throw in some extra EFI bits if it built
-	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide:"
-	elog " https://wiki.gentoo.org/wiki/Xen"
-
-	use efi && einfo "The efi executable is installed in boot/efi/gentoo"
-
-	elog "You can optionally block the installation of /boot/xen-syms by an entry"
-	elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
-	elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
-}
diff --git a/app-emulation/xen/xen-4.10.2.ebuild b/app-emulation/xen/xen-4.10.2.ebuild
new file mode 100644
index 000000000000..11b3b33c1836
--- /dev/null
+++ b/app-emulation/xen/xen-4.10.2.ebuild
@@ -0,0 +1,171 @@
+# 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 mount-boot multilib python-any-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm -x86"
+	UPSTREAM_VER=0
+	SECURITY_VER=
+	GENTOO_VER=
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
+		${UPSTREAM_PATCHSET_URI}
+		${SECURITY_PATCHSET_URI}
+		${GENTOO_PATCHSET_URI}"
+fi
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="https://www.xenproject.org"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="custom-cflags debug efi flask"
+
+DEPEND="${PYTHON_DEPS}
+	efi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!efi? ( >=sys-devel/binutils-2.22 )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+# no tests are available for the hypervisor
+# prevent the silliness of /usr/lib/debug/usr/lib/debug files
+# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
+RESTRICT="test splitdebug strip"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="arm? ( debug )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	if use flask ; then
+		export "XSM_ENABLE=y"
+		export "FLASK_ENABLE=y"
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	[[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+	einfo "Try to apply Xen Security patch set"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		source "${WORKDIR}"/patches-security/${PV}.conf
+
+		local i
+		for i in ${XEN_SECURITY_MAIN}; do
+			eapply "${WORKDIR}"/patches-security/xen/$i
+		done
+	fi
+
+	# Gentoo's patchset
+	[[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
+
+	eapply "${FILESDIR}"/${PN}-4.6-efi.patch
+
+	# Drop .config
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	if use efi; then
+		export EFI_VENDOR="gentoo"
+		export EFI_MOUNTPOINT="boot"
+	fi
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \; || die "failed to re-set custom-cflags"
+	fi
+
+	default
+}
+
+src_configure() {
+	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
+
+	use debug && myopt="${myopt} debug=y"
+
+	if use custom-cflags; then
+		filter-flags -fPIE -fstack-protector
+		replace-flags -O3 -O2
+	else
+		unset CFLAGS
+		unset LDFLAGS
+		unset ASFLAGS
+	fi
+}
+
+src_compile() {
+	# Send raw LDFLAGS so that --as-needed works
+	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	# The 'make install' doesn't 'mkdir -p' the subdirs
+	if use efi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
+
+	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+
+	# make install likes to throw in some extra EFI bits if it built
+	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide:"
+	elog " https://wiki.gentoo.org/wiki/Xen"
+
+	use efi && einfo "The efi executable is installed in boot/efi/gentoo"
+
+	elog "You can optionally block the installation of /boot/xen-syms by an entry"
+	elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
+	elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
+}
diff --git a/app-emulation/xen/xen-4.11.0-r1.ebuild b/app-emulation/xen/xen-4.11.0-r1.ebuild
deleted file mode 100644
index 8027e789237b..000000000000
--- a/app-emulation/xen/xen-4.11.0-r1.ebuild
+++ /dev/null
@@ -1,172 +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 flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-if [[ $PV == *9999 ]]; then
-	inherit git-r3
-	KEYWORDS=""
-	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~arm -x86"
-	UPSTREAM_VER=0
-	SECURITY_VER=
-	GENTOO_VER=
-
-	[[ -n ${UPSTREAM_VER} ]] && \
-		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-	[[ -n ${SECURITY_VER} ]] && \
-		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
-	[[ -n ${GENTOO_VER} ]] && \
-		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
-	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
-		${UPSTREAM_PATCHSET_URI}
-		${SECURITY_PATCHSET_URI}
-		${GENTOO_PATCHSET_URI}"
-fi
-
-DESCRIPTION="The Xen virtual machine monitor"
-HOMEPAGE="https://www.xenproject.org"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags debug efi flask"
-
-DEPEND="${PYTHON_DEPS}
-	efi? ( >=sys-devel/binutils-2.22[multitarget] )
-	!efi? ( >=sys-devel/binutils-2.22 )"
-RDEPEND=""
-PDEPEND="~app-emulation/xen-tools-${PV}"
-
-# no tests are available for the hypervisor
-# prevent the silliness of /usr/lib/debug/usr/lib/debug files
-# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
-RESTRICT="test splitdebug strip"
-
-# Approved by QA team in bug #144032
-QA_WX_LOAD="boot/xen-syms-${PV}"
-
-REQUIRED_USE="arm? ( debug )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	if [[ -z ${XEN_TARGET_ARCH} ]]; then
-		if use amd64; then
-			export XEN_TARGET_ARCH="x86_64"
-		elif use arm; then
-			export XEN_TARGET_ARCH="arm32"
-		elif use arm64; then
-			export XEN_TARGET_ARCH="arm64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-
-	if use flask ; then
-		export "XSM_ENABLE=y"
-		export "FLASK_ENABLE=y"
-	fi
-}
-
-src_prepare() {
-	# Upstream's patchset
-	[[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
-
-	# Security patchset
-	if [[ -n ${SECURITY_VER} ]]; then
-	einfo "Try to apply Xen Security patch set"
-		# apply main xen patches
-		# Two parallel systems, both work side by side
-		# Over time they may concdense into one. This will suffice for now
-		source "${WORKDIR}"/patches-security/${PV}.conf
-
-		local i
-		for i in ${XEN_SECURITY_MAIN}; do
-			eapply "${WORKDIR}"/patches-security/xen/$i
-		done
-	fi
-
-	# Gentoo's patchset
-	[[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
-
-	eapply "${FILESDIR}"/${PN}-4.6-efi.patch
-
-	# Drop .config
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	if use efi; then
-		export EFI_VENDOR="gentoo"
-		export EFI_MOUNTPOINT="boot"
-	fi
-
-	# if the user *really* wants to use their own custom-cflags, let them
-	if use custom-cflags; then
-		einfo "User wants their own CFLAGS - removing defaults"
-		# try and remove all the default custom-cflags
-		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
-			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-			-i {} \; || die "failed to re-set custom-cflags"
-	fi
-
-	default
-}
-
-src_configure() {
-	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
-
-	use debug && myopt="${myopt} debug=y"
-
-	if use custom-cflags; then
-		filter-flags -fPIE -fstack-protector
-		replace-flags -O3 -O2
-	else
-		unset CFLAGS
-		unset LDFLAGS
-		unset ASFLAGS
-	fi
-}
-
-src_compile() {
-	# Send raw LDFLAGS so that --as-needed works
-	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
-}
-
-src_install() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-
-	# The 'make install' doesn't 'mkdir -p' the subdirs
-	if use efi; then
-		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
-	fi
-
-	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
-
-	# make install likes to throw in some extra EFI bits if it built
-	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide:"
-	elog " https://wiki.gentoo.org/wiki/Xen"
-
-	use efi && einfo "The efi executable is installed in boot/efi/gentoo"
-
-	elog "You can optionally block the installation of /boot/xen-syms by an entry"
-	elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
-	elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
-}
diff --git a/app-emulation/xen/xen-4.9.2.ebuild b/app-emulation/xen/xen-4.9.2.ebuild
deleted file mode 100644
index ff12221cf111..000000000000
--- a/app-emulation/xen/xen-4.9.2.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
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-if [[ $PV == *9999 ]]; then
-	inherit git-r3
-	KEYWORDS="amd64"
-	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
-	SRC_URI=""
-else
-	KEYWORDS="amd64 ~arm -x86"
-	UPSTREAM_VER=1
-	SECURITY_VER=
-	GENTOO_VER=
-
-	[[ -n ${UPSTREAM_VER} ]] && \
-		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-	[[ -n ${SECURITY_VER} ]] && \
-		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
-	[[ -n ${GENTOO_VER} ]] && \
-		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
-	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
-		${UPSTREAM_PATCHSET_URI}
-		${SECURITY_PATCHSET_URI}
-		${GENTOO_PATCHSET_URI}"
-fi
-
-DESCRIPTION="The Xen virtual machine monitor"
-HOMEPAGE="https://www.xenproject.org"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags debug efi flask"
-
-DEPEND="${PYTHON_DEPS}
-	efi? ( >=sys-devel/binutils-2.22[multitarget] )
-	!efi? ( >=sys-devel/binutils-2.22 )"
-RDEPEND=""
-PDEPEND="~app-emulation/xen-tools-${PV}"
-
-# no tests are available for the hypervisor
-# prevent the silliness of /usr/lib/debug/usr/lib/debug files
-# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
-RESTRICT="test splitdebug strip"
-
-# Approved by QA team in bug #144032
-QA_WX_LOAD="boot/xen-syms-${PV}"
-
-REQUIRED_USE="arm? ( debug )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	if [[ -z ${XEN_TARGET_ARCH} ]]; then
-		if use amd64; then
-			export XEN_TARGET_ARCH="x86_64"
-		elif use arm; then
-			export XEN_TARGET_ARCH="arm32"
-		elif use arm64; then
-			export XEN_TARGET_ARCH="arm64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-
-	if use flask ; then
-		export "XSM_ENABLE=y"
-		export "FLASK_ENABLE=y"
-	fi
-}
-
-src_prepare() {
-	# Upstream's patchset
-	[[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
-
-	# Security patchset
-	if [[ -n ${SECURITY_VER} ]]; then
-	einfo "Try to apply Xen Security patch set"
-		# apply main xen patches
-		# Two parallel systems, both work side by side
-		# Over time they may concdense into one. This will suffice for now
-		source "${WORKDIR}"/patches-security/${PV}.conf
-
-		local i
-		for i in ${XEN_SECURITY_MAIN}; do
-			eapply "${WORKDIR}"/patches-security/xen/$i
-		done
-	fi
-
-	# Gentoo's patchset
-	[[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
-
-	eapply "${FILESDIR}"/${PN}-4.6-efi.patch
-
-	# Drop .config
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	if use efi; then
-		export EFI_VENDOR="gentoo"
-		export EFI_MOUNTPOINT="boot"
-	fi
-
-	# if the user *really* wants to use their own custom-cflags, let them
-	if use custom-cflags; then
-		einfo "User wants their own CFLAGS - removing defaults"
-		# try and remove all the default custom-cflags
-		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
-			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-			-i {} \; || die "failed to re-set custom-cflags"
-	fi
-
-	default
-}
-
-src_configure() {
-	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
-
-	use debug && myopt="${myopt} debug=y"
-
-	if use custom-cflags; then
-		filter-flags -fPIE -fstack-protector
-		replace-flags -O3 -O2
-	else
-		unset CFLAGS
-		unset LDFLAGS
-		unset ASFLAGS
-	fi
-}
-
-src_compile() {
-	# Send raw LDFLAGS so that --as-needed works
-	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
-}
-
-src_install() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-
-	# The 'make install' doesn't 'mkdir -p' the subdirs
-	if use efi; then
-		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
-	fi
-
-	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
-
-	# make install likes to throw in some extra EFI bits if it built
-	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide:"
-	elog " https://wiki.gentoo.org/wiki/Xen"
-
-	use efi && einfo "The efi executable is installed in boot/efi/gentoo"
-
-	elog "You can optionally block the installation of /boot/xen-syms by an entry"
-	elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
-	elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
-}
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 9cfb1bbf0ffe..ed83f91a68ed 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 57ad9322265d..217f3fa08132 100644
--- a/app-eselect/eselect-repository/Manifest
+++ b/app-eselect/eselect-repository/Manifest
@@ -1,4 +1,6 @@
 DIST eselect-repository-4.tar.gz 5535 BLAKE2B 4dce6c0136ec9394c9bf4128ec26ab67260d4b96a165825ae7b15b8476d10d23fcc5190946fc54013d6eb8e4f18988b07df4c849ba50844571986a6823511547 SHA512 0d3c204d73bb4314bc24fdf6cd837f2a56ac00d1d11fbec7f072af874bc468777676bba40e0cc17553f6dec7a907f10865f9c356a6390372e0734173465ac483
+DIST eselect-repository-5.tar.gz 5607 BLAKE2B cc007474b51873b7fa7f9c56572be717e7b8dff0d46c21d838911bcf9ecea99549da8e9f2d63c8101c0bc9c2ca230bfaba46f8bd770488d6566a62b2ac2ab0a6 SHA512 b5cf1701cc1d0cb50afcb9403f5c6f41223240891029f51ff899144eecee6fa3d7cfad23c477fae23733f9005413facd2cb8e9e1dea70931abc691a225fa83b4
 EBUILD eselect-repository-4.ebuild 971 BLAKE2B 18ffed0ba63a3cd42f8d543038bdabd9498252b6fe0664dc09b29287b5960b16d04469506a90a0dae2dfd911a62ac8f7054837acb0c8593d1204b5fcd39c60c3 SHA512 e0f09d7f2a0532d294512c3556296e252483704abc5999faa1db093606d5fb3ffa39ac565d84cb4770d5868375b16035ff0d845b865483be769d1c766628d936
+EBUILD eselect-repository-5.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-5.ebuild b/app-eselect/eselect-repository/eselect-repository-5.ebuild
new file mode 100644
index 000000000000..06ccc47c631d
--- /dev/null
+++ b/app-eselect/eselect-repository/eselect-repository-5.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 ae6c4ec6d385..3d80df2bf6bc 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/foremost/Manifest b/app-forensics/foremost/Manifest
index 3910c1f808aa..2540ab69b4e1 100644
--- a/app-forensics/foremost/Manifest
+++ b/app-forensics/foremost/Manifest
@@ -2,5 +2,5 @@ AUX foremost-1.4-config-location.patch 462 BLAKE2B 7dadc7fd049b09992e9e3019aaaa2
 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 890 BLAKE2B d7d8c238ec0ebfde11f0bb6f2be6bd8518c5c3309791e3abba7994f77bf8fee7c147e00ba4c9f78a460c4b234f6ef9bf79cbf181264f7fb5b87956c6fa9a1f73 SHA512 78967f04824c614d2830bbd0f3eef392ddc59e6cc0c634011bcfa9a12116f47f8a6b04b3b1586122572a89682ae739ff124fde07731b1dd4eb279a070effb496
+EBUILD foremost-1.5.7-r3.ebuild 885 BLAKE2B 7304e22381c001abea19e8b638c0c3312511867529c09c65aaf0b951853fd4c08185270e68a6f03029c4f29b1c18c73d1eeda6ecc3cd188208a3264a77aaf916 SHA512 0cc6e8cc9f5a54a3f17938741d75e8a2aa76890e083065095eb860e6905414d494fc41850ae15fee3042aa364ddd376ad6843135816d3a273650fdb50b64bd61
 MISC metadata.xml 303 BLAKE2B 14bc09979926d326ccb75438d8e32f9a60b1df8078e6344f4dc2e32a33c0994bf2740a4b29d7c1a479bb514815f037d2d9a9ac9c8387fbc01b7795e2a37fea86 SHA512 165c108232c3a65d3fbeb0fb2f612c7c4c4c16a57e4b3e280c4ef40d6a586b56df437454283ff5b52fa3a0880d9643682493b3d75cac01170edab53bb5f1ce52
diff --git a/app-forensics/foremost/foremost-1.5.7-r3.ebuild b/app-forensics/foremost/foremost-1.5.7-r3.ebuild
index 69d67a469d2d..8cc4d22b4a5c 100644
--- a/app-forensics/foremost/foremost-1.5.7-r3.ebuild
+++ b/app-forensics/foremost/foremost-1.5.7-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
@@ -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 b1067d9b739f..5b39885de84a 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index e01bd430dbe0..8c0b90306009 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,3 +1,4 @@
+AUX ibus-1.5.18-enable-gsettings-in-runtest.patch 1707 BLAKE2B 760f99faf079a65b7c36e355f19f16e71a0d3fa5dcee2a8201e571732c317f238d7bac7bcde6d823d5ff6ecde40c430ff310356f921d665f08708c4b5e24c4d0 SHA512 fedcb39f6a4b70055aae2dd90a03fa6e709feebeff20bd5df30deec3346c85036ede017c0a8bab92680a5a004e50e5e450b288bd8981889a8b1cd89334f74531
 AUX ibus-1.5.19-gdk-wayland.patch 2996 BLAKE2B d203c843a0ba692c1be81c1172866bea6ea30e6ea25c562d04ad31934af48f4e2bcc5d5ec862af049a026c3656c0fce960715c7271514e1d4faa54c8f6ed369c SHA512 e53619feafc4f5e7cc662d0c59be5beda916dc3b2ec2f74121b6b3fb874ed3bc15f43ee739b272f2304344c9acbc399b5c522d2f5d54695aca7e48d4b68430bb
 DIST ibus-1.5.12.tar.gz 2190284 BLAKE2B 57ac7f9e8e8f0419bad1bf3aa629282ef3c0188d29e98bc872e594955f69e0863020d600c674cabed56db156a85210b5b3c1fe137b135395a27d2535e4938164 SHA512 a443bf0d1b71a52c18e7d13a0c69f38c48f6924cfb1669912880b87be1bf41bcb7d8d6252aafd6799e43d41c081fd94cf334fd836a0505c93a4e5c5b68241c81
 DIST ibus-1.5.16.tar.gz 2375719 BLAKE2B cf4cbd4556e43403c73da3cd2cb9f6da8e0baf5f90b3bc74f6d12c1bad057198ed828053dcbb3ddfd28c37d9011b6166e834385720aa827a68f594dbd4cf9298 SHA512 494ead69cf9c0111fd25fd1de27e796d89db4f08443afa1ec469f638469b25d8b19a59ea7ab0db0f3a130b9a89b3f2819667099ba38fc973d6efc61b367ce237
@@ -5,6 +6,6 @@ DIST ibus-1.5.18.tar.gz 2760121 BLAKE2B dfcf549362ac9ac0cb9adb9cedc3fd7146877a42
 DIST ibus-1.5.19.tar.gz 2842274 BLAKE2B a5aea4770c1c0a58a9e0b1aa26f47a8ab9eb5060a0c06179663984c5b531464ff4575a8ece2f2ee2122f777ca615296c1e46ad4833c68ba2da038f2b85dea374 SHA512 ddcd464c9afb6d081df1cfac65069506877eb4818c3ba5594bcf76f3c6795ef6c17177a778dc89b2ef69d10d87297aa12c8e04f156b750e500b51b32787bd9fc
 EBUILD ibus-1.5.12.ebuild 3678 BLAKE2B 8b08b4f6cf2c188d387c43741f0e430749ba003dd7693ce4b70e36c21d5c046f8f0be82ecc2401df577603f7c074d99904d6dfc3aa60f1327157e835563779a7 SHA512 178fdf0169e444161b598ee800a99328060ec7a28a6cd73ca2c26ddce10372072faabe63234d2a9b7c0e31b758cdf7f533c508f05491be80a9ae130f466a5679
 EBUILD ibus-1.5.16.ebuild 3959 BLAKE2B 7a8872f49d619d6079915884ff25ee90a74653fa4614c61043d34414989cafebe122cedc65d72999b2eaca668f0ab0d76484d6ef177e419a3e284476430bb1ff SHA512 b664b04cc0010f3e6da17f7e2dfd5f10ba2241def9a807d5da176c8b1f0eb14a066dd9df6af3b750f06f3b476d867a30b18e32ce85ab1b4efa44274132b75e96
-EBUILD ibus-1.5.18.ebuild 4218 BLAKE2B 6372729abd56ca1faceb32232fd419c7dadf0e4c46ad90bfb100087f500fe09597be0b0e9e4511b1c4cd04d334c72ef3c95e174354d0d44fa8e285c509838696 SHA512 b125534a7f697908dd1b2e71a2bf98a82ff579af2beff77e37c8cc5c4452230d2a4cc213b6f2eb389c9a6e53237dd3e2d27ff9bbee75d564b213e36e21f1463e
+EBUILD ibus-1.5.18.ebuild 4279 BLAKE2B cc9c0046615c92f1767e7c1e942a283e7ba6a1d9acc9f65c96b4f7bb60cdc0434017c112f21e1a321a55a0997d942b57ed8ef9013762d4ac635b5da3f0c31725 SHA512 65d60a8f53ea373982e35c8c817a1752565cd98f4c54db339119f762898aed3142ccd8d044ecec54b1375e9ffeaa306d07e6ad0cff198d63b58140ef4c12ee4e
 EBUILD ibus-1.5.19.ebuild 4340 BLAKE2B 2550c7270052bdcdedf645f7698f3e972bc3e22c4456e976e9a161678e8e96ddeddbb6bfba13b8db976538d3f97f3c860773320f3d790c03a726979bdd3b1c41 SHA512 14f9d43bd461806e4bc0fe116ea3c983c691975e8285bba5d919d3c0cf52d4f3e41fb58f749866cc0f5d674e9db6e26aee9da77e431d5b11c29169228b0a7b7a
 MISC metadata.xml 942 BLAKE2B 9d8f0df17ae7c5c60892a8bf661c1f7325f4943e30d51667fe5e56f2c74f55e36c6f40cd6044435b9f046a88a267fa1b5d46f6cddc0cefa6b423554ff905e882 SHA512 5501b7ef3b46de30b69eabe28334556c979c99610f0a6051a254a7591de612d99ea9ee3c18c2f3869ae2046514df8cd555d801cc778bc1db111895256b7ab100
diff --git a/app-i18n/ibus/files/ibus-1.5.18-enable-gsettings-in-runtest.patch b/app-i18n/ibus/files/ibus-1.5.18-enable-gsettings-in-runtest.patch
new file mode 100644
index 000000000000..24b5cd3f6a8c
--- /dev/null
+++ b/app-i18n/ibus/files/ibus-1.5.18-enable-gsettings-in-runtest.patch
@@ -0,0 +1,62 @@
+From 4b4fe00cc2750713ef8d2bc0a9f396ab577c36fc Mon Sep 17 00:00:00 2001
+From: Naohiro Aota <naota@gentoo.org>
+Date: Thu, 4 Oct 2018 18:14:17 +0900
+Subject: [PATCH] src/tests: Enable GSettings in runtest in ibus-1.5.18
+
+This patch is based on:
+https://github.com/ibus/ibus/commit/10cc30eac200d10b581d9d2122d5a732f4880943
+
+Signed-off-by: Naohiro Aota <naota@gentoo.org>
+---
+ src/tests/runtest | 21 +++++++++++++++++++++
+ 1 file changed, 21 insertions(+)
+
+diff --git a/src/tests/runtest b/src/tests/runtest
+index 0e43fee..84d85ab 100755
+--- a/src/tests/runtest
++++ b/src/tests/runtest
+@@ -29,6 +29,7 @@ ibus-engine-switch
+ ibus-compose
+ test-stress
+ "
++IBUS_SCHEMA_FILE='org.freedesktop.ibus.gschema.xml'
+ 
+ # Portable replacement of basename.
+ func_basename () {
+@@ -80,6 +81,12 @@ trap 'func_cleanup $tstdir' 1 2 3 15
+ tst=$1; shift
+ tstdir=tmp-`func_basename $tst`
+ 
++# IBusEngine has GSettings
++if test ! -f "$top_builddir/data/dconf/$IBUS_SCHEMA_FILE" ; then
++    echo "NOT FOUND $top_builddir/data/dconf/$IBUS_SCHEMA_FILE"
++    exit -1
++fi
++
+ test -d $tstdir || mkdir $tstdir
+ 
+ ( cd $tstdir
+@@ -101,6 +108,20 @@ test -d $tstdir || mkdir $tstdir
+     IBUS_ADDRESS_FILE=$PWD/ibus-daemon.pid
+     export IBUS_ADDRESS_FILE
+ 
++    cp "../$top_builddir/data/dconf/$IBUS_SCHEMA_FILE" $PWD
++    glib-compile-schemas $PWD
++    if test $? -ne 0 ; then
++        echo "FAILED glib-compile-schemas"
++        retval=1
++        return
++    fi
++    if test ! -f $PWD/gschemas.compiled ; then
++        echo "NOT FOUND $PWD/gschemas.compiled"
++        retval=1
++        return
++    fi
++    export GSETTINGS_SCHEMA_DIR=$PWD
++
+     # Start ibus-daemon.
+     ../$top_builddir/bus/ibus-daemon \
+     --daemonize \
+-- 
+2.19.0
+
diff --git a/app-i18n/ibus/ibus-1.5.18.ebuild b/app-i18n/ibus/ibus-1.5.18.ebuild
index 927ddd72824e..711a75dbc83f 100644
--- a/app-i18n/ibus/ibus-1.5.18.ebuild
+++ b/app-i18n/ibus/ibus-1.5.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"
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ~ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test +unicode vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )
@@ -72,6 +72,8 @@ DEPEND="${CDEPEND}
 	nls? ( sys-devel/gettext )
 	unicode? ( app-i18n/unicode-data )"
 
+PATCHES=( "${FILESDIR}"/${P}-enable-gsettings-in-runtest.patch )
+
 src_prepare() {
 	vala_src_prepare --ignore-use
 	sed -i "/UCD_DIR=/s/\$with_emoji_annotation_dir/\$with_ucd_dir/" configure.ac
diff --git a/app-i18n/unicode-cldr/Manifest b/app-i18n/unicode-cldr/Manifest
index 7919dd055d60..4628757ea78c 100644
--- a/app-i18n/unicode-cldr/Manifest
+++ b/app-i18n/unicode-cldr/Manifest
@@ -1,5 +1,5 @@
 DIST unicode-cldr-common-31.0.1.zip 16370865 BLAKE2B 46e941471074116eb00ba81848b37c82e025e12841d75ef9e4e2620f887384c4dbb3f8c36febcd86d19cd17d4d84e77e11121d1ed1cf2ccf67a09260cdddc9f7 SHA512 6ef4a73b31bde5dead5af9145e5befa5969e9449b4072c94c5370c979db54e3072ec5bf15f54152045da329bf4382e54edb532c0ec77a2ce451bacc8778b73bc
 DIST unicode-cldr-common-33.0.zip 20401984 BLAKE2B 1318f8c73678f4ed2ff6a2d947171515d52825c2395e77c8149fb6a5646110876dd8e1bc30a3b918cb25c4bf106b42fe2a372a9938ff0dbf106cf0d7dc33d75a SHA512 f2f9fa5242702fd8044c9b239e175b7ead41e36da39c9e67e70b4fde7ed5d28115141ea457cda4f645b10a2d29734b35590bd0f012296bdf4986a920b87532dd
 EBUILD unicode-cldr-31.0.1.ebuild 496 BLAKE2B 8df1bcb6bbc05a9177c20aab6337a752e65d21ac11993aaa85a48025f5e196eb151a09dd3525ee76ffdae1710c0ff399fe6428dbada25ae89d83f64300b445ff SHA512 93ba56c3abf39bc27c7d825c63255fcea2c1c2d942b3984fd5a98cd911399f5ac4002e1e89972ca5495e9787cba266d0ce82f4d83ff9699d4c33bce90a02a880
-EBUILD unicode-cldr-33.0.ebuild 711 BLAKE2B 3b80883ca9a18a625587fc42aa852e83038106c82bedaf4ded438137caec69ea0a1ae67e5dc85fed41fd5efdefe9367c22761db1c8fc8c2405da319a29d462ad SHA512 5c77c27011c3d5a03d3d2adfeeefdc21801b38b6de85d199bea396001e550f35dbea21411fd6bbd86f7a57023ff33ebc0981650e7f851151073a71e41d90e8cb
+EBUILD unicode-cldr-33.0.ebuild 706 BLAKE2B 62e7d0d9c372e0eb5cb514bdaf1cb42430f9cb78499036fd0db4d36a9dd767d63568e409a689c722859ec4aa7cf35088b12ae6ff01c9525de2d77e44c4d33c92 SHA512 8c942329e2dcaec4fbb6dd5c9b2f16604f38869f49761e7a1fa30f0f5fd4b8a92cdc1798142cd5947927df2afb52f06324ace2a0911b5d8df13a284bf4308f15
 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/unicode-cldr/unicode-cldr-33.0.ebuild b/app-i18n/unicode-cldr/unicode-cldr-33.0.ebuild
index 276665ee3e26..0890b8de3b58 100644
--- a/app-i18n/unicode-cldr/unicode-cldr-33.0.ebuild
+++ b/app-i18n/unicode-cldr/unicode-cldr-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
 
 EAPI="6"
@@ -13,7 +13,7 @@ fi
 
 LICENSE="unicode"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/app-i18n/unicode-emoji/Manifest b/app-i18n/unicode-emoji/Manifest
index 8e13a01398a8..bb6c4fa7ce73 100644
--- a/app-i18n/unicode-emoji/Manifest
+++ b/app-i18n/unicode-emoji/Manifest
@@ -8,6 +8,6 @@ DIST unicode-emoji-variation-sequences-11.0.txt 36333 BLAKE2B c32b674969a102d246
 DIST unicode-emoji-variation-sequences-5.0.txt 36120 BLAKE2B 50e19bd7147486437dc4fd7784ec9bd5869e58f934738fa1d46edc030202fb9490ddebd6f1cefb98dd78b3be2c4da7e3f2acef0ce54487a183123311efbf7205 SHA512 484509ed56c5ea5e73160e211643a938d3fa08474281d316e5ed2d2346f38f5140a147454a9cb81c9f463d6c62befd98a8b70b695ee50effdbcfc6085dcaa520
 DIST unicode-emoji-zwj-sequences-11.0.txt 126959 BLAKE2B 82d78fd5fd47bb4201001903c0610e3950a2fa1c315fe8494e15977999ba0b8f0d4431eb842db6f01ab765fd181067b07258ddb4c547ddfc01fc0da7680ea540 SHA512 a2a50cd5451d3ba1da0f3b46e18a10d621ead0372599b98dad0fd47fdb271407f72bd72854136c93311b13950cedc2b1594f06d460e551ab120ed30ba8abce4d
 DIST unicode-emoji-zwj-sequences-5.0.txt 115207 BLAKE2B beb8f304be16ffe34fde4cab20bfb981f3ae61ffc6827ced0b3160de7e405459fdf38c6e7fcafdd3887da16da7870b84520f1c68e661480efbd0cb9510a04649 SHA512 26398ac77035d2f5df7a61f4c2a8a098af8e551576c9c9f157379c05aa8f75de5a0827c9bc476eb20f32c38b0c3605f6a1d9e07fe27f0e75df359ed2a7e6d25b
-EBUILD unicode-emoji-11.0.ebuild 1025 BLAKE2B 98c6e475ed8a881e9d3958fe49468e409376cf50d74de20bf3ed9d61c67f3b035b3894551632b06bc040ce836b40cb2e8a052ef28cf323b3baa20a9b62d4fff9 SHA512 f828fc3dd9fd43856a327fd352fbf5f6e34d678f17b90f9c211a48a54bc6e1823961e5c0ca3a5478754c29b31c99e42f1ff8c53f9f73015c291e073feb2d3787
+EBUILD unicode-emoji-11.0.ebuild 1020 BLAKE2B 8fa5c7d357e534ffd5e25ed379a1c5afccb9371a0a0f1e96cc58edba433ad2845cfc63ad3ce0915c82cb023253961180f1eabacf15cd41e3b3f1894f6f2b153b SHA512 2e0257a4cea40c485b8eee9d94ff49689538cd84b05f5b471c667547d33fb4e46e569d1f73f374cb58b457e5681dd6e4093b6f97a65b2c5002bd1df86af9d1e4
 EBUILD unicode-emoji-5.0.ebuild 880 BLAKE2B 08d91ce21e632d7a1befe8be1ca4495ece3e56d38d9bf2f062d086ebe10c0b8db89d021ddde659f0c1a383edfae80bdc5becbcd0ca37c7edc158c1d93ef8775a SHA512 b23eae90ba1df31c6965028ebc6d9b0f3064cfdb16f1069a7774e20ea61780bc4b4c086113f45aaa7e5aa00c4501782ed01972186cb5b753b61d9b33dbc328c5
 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild b/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild
index 299080677561..bf849c4e6cdd 100644
--- a/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild
+++ b/app-i18n/unicode-emoji/unicode-emoji-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"
@@ -14,7 +14,7 @@ SRC_URI="${BASE_URI}/${PN#*-}-data.txt -> ${PN}-data-${PV}.txt
 
 LICENSE="unicode"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index 80f23d2892e9..f266633f89a1 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/collectd/Manifest b/app-metrics/collectd/Manifest
index f175f543b023..b18576130447 100644
--- a/app-metrics/collectd/Manifest
+++ b/app-metrics/collectd/Manifest
@@ -4,5 +4,5 @@ AUX collectd.initd-r2 1843 BLAKE2B ccb12e55de72565aa7b6bb0f2c4e7a5a6d15ff23d5bc7
 AUX collectd.logrotate 115 BLAKE2B ce2a79787096b04af6ecd128633dde68fb868a02cc1d246c3e512c1733133fcc8da41b3ab2a0051b4da78c53e6629b2ad8085872dec1d4c28e397c88cafe3a90 SHA512 87ec01784d415f00834c2b20614f11f7e08b70f88d7c87509a8b8fd7e1af8758565b9ed6a6840af7bf1006cb941a61a6ff4f3176f6ded722728f24483b08bc8e
 AUX collectd.tmpfile 39 BLAKE2B 0d1ee2f02e539e854b62b47032308d08505fa31d8428e98f8d150c924201074c5edae22eea3990edf3a7837f1473193fe009a501645bf064638c532ec53a36cc SHA512 55fb70da9ece74b143c3e971b890954842230691039f8ad2240cc4c8d699e4e7a21efcbfd0b3cb2503e90af0bbdd0c7d886e09baf9fc86ec26c115a0bce6a668
 DIST collectd-5.8.0.tar.bz2 1686017 BLAKE2B 26d995cdb9c25869bf96a056e6ba879de9f009fd4bbf1364a7dedba93b822e57c4b606ca8c84da68cc29db8e77333047695e85d7eb101080de9cee783240f5ea SHA512 1b3d0cc44e2ca54e13eebf292074f1efa8b33d6800d04405e0eaaa2dd1cb2416c6eae580729fb5aead23a5039f41ffe8a9989a907a8c18be8f867f1099fc0008
-EBUILD collectd-5.8.0-r1.ebuild 19415 BLAKE2B 1dfcc4d012ebc4b075896d0917325d31079eb1345ad6e10f336bf71f47637964b000aa34d6c9fcd33f4411cd42bab4ee4dbaeeb30d96d8c194d053346bc2f6e8 SHA512 483d9f72ec422b55ca9868e452bd2f014de3cd691d8572b00b2029d976cffefd3d93ed70dca7fd939b22c3296ba9e9704147ff70d9b6184d7d500c6e10641095
+EBUILD collectd-5.8.0-r1.ebuild 19414 BLAKE2B 3bdf9270dacb93480694b7ccfc0b2cae4fbc5aa2a2ca9b1acc9c8d9dfe1fdc4725a86ac064504b7df2ebecff1ac1d0f7625596717b1fadaa2491c5586bc2df94 SHA512 4967130b806f6395e1116c03f90cc2b84bb586c862e24a9adc86b653b079ef08121911fdbebdcfd80a0dddfd72d661949210f1027a793e933ab038a37fb46052
 MISC metadata.xml 1515 BLAKE2B 5525766b822463f94f7c2cddbdf78b4c4ea5a473880a473d0b51481d948569cfc7f51bd2e74eb67065ab2be1b23e4fb7ee99512d018c6e6b5ac1ee7331eae9eb SHA512 51c17c16d27b722d729d036d67c562ab76e212dac9bcd004a7e43c2c5e041b8c46e74f9a130f30c2e18cc95ca1b367034246eff02cfaf55f6f9375ff836749e5
diff --git a/app-metrics/collectd/collectd-5.8.0-r1.ebuild b/app-metrics/collectd/collectd-5.8.0-r1.ebuild
index 0f37f6abcfc2..d0f6da99fd52 100644
--- a/app-metrics/collectd/collectd-5.8.0-r1.ebuild
+++ b/app-metrics/collectd/collectd-5.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="6"
@@ -125,7 +125,7 @@ COMMON_DEPEND="
 	collectd_plugins_snmp?			( net-analyzer/net-snmp )
 	collectd_plugins_snmp_agent?		( net-analyzer/net-snmp )
 	collectd_plugins_tokyotyrant?		( net-misc/tokyotyrant )
-	collectd_plugins_varnish?		( www-servers/varnish )
+	collectd_plugins_varnish?		( www-servers/varnish:= )
 	collectd_plugins_virt?			( app-emulation/libvirt:= dev-libs/libxml2:2= )
 	collectd_plugins_write_http?		( net-misc/curl:0= dev-libs/yajl:= )
 	collectd_plugins_write_kafka?		( >=dev-libs/librdkafka-0.9.0.99:= dev-libs/yajl:= )
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 372917a03734..92e383be2dc7 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index d1b06c22ca3a..99486a420db8 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -6,5 +6,5 @@ DIST nss-3.37.tar.gz 23027581 BLAKE2B 0ce7190a029321d5620dc8b9aedf1f4252c53dbef5
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
 EBUILD ca-certificates-20170717.3.36.1.ebuild 6242 BLAKE2B 0056524a8dca1fd3f6ea44d331ce35fdb6731dba91d3bd72b22d866455b334e7f10b18b3a586081cd75015423c275b88c532c36dd2a96cf1bb898c854456622b SHA512 c112ebedc32f62230390f58fb56598842000f189d6dc0215523cc621c9424068eaf52a38135767590699aa9cb258e408284769af4cf44ea951d0daf7d84e2b6e
 EBUILD ca-certificates-20180409.3.36.1-r1.ebuild 5729 BLAKE2B 140f0bf955cfe3ccbc87f374c24011b3e877da661aa4ce32cfc4a51b4098016d53e1de468f62d51035c960ac53f9b479deadfcdc1d479afbcf8d2caedf021585 SHA512 c95f25a84db5fc07e7a08a49529cf9c28f3a9153d2c29226b3f95dd457485c265ba84fef558132f63231b9c0c2f2c203902df9c11d1e3a878a19fd0959d10c4c
-EBUILD ca-certificates-20180409.3.37.ebuild 5729 BLAKE2B 140f0bf955cfe3ccbc87f374c24011b3e877da661aa4ce32cfc4a51b4098016d53e1de468f62d51035c960ac53f9b479deadfcdc1d479afbcf8d2caedf021585 SHA512 c95f25a84db5fc07e7a08a49529cf9c28f3a9153d2c29226b3f95dd457485c265ba84fef558132f63231b9c0c2f2c203902df9c11d1e3a878a19fd0959d10c4c
+EBUILD ca-certificates-20180409.3.37.ebuild 5730 BLAKE2B 41dd842c549766695617bc3574a82ae44c48ae2dc334b963c8a3ecc03f2df095674b3b57f0ec6158b953950b745671b73b9c6af4299db37375eb8cd540e3e7b1 SHA512 83bd8c64eab4bfcfaade11aa7d5e066eeee35d10f23a988c382eaa3d8232de4cfb3a930a61ffa45c78612ed6dbac17be97a733f5411048b8bb9bbd454031bf70
 MISC metadata.xml 538 BLAKE2B 20dd319e6f583b4b6b93fdfc7fb965c54c7b92426715cf287611ea58ed5040ffac4afa77df2e6464a387c120a8d80d508c6e997c820eae9395ba859b13c5702e SHA512 f2779da4ea4b24e196b64d6e4c94d47e426d431508db58355a08ca420498cbbe2f322c5f8dc6e132b612baf03ee6bb1561beade226bd2f71d6afa160064d7a7c
diff --git a/app-misc/ca-certificates/ca-certificates-20180409.3.37.ebuild b/app-misc/ca-certificates/ca-certificates-20180409.3.37.ebuild
index fbbb928d022e..95efb82e672b 100644
--- a/app-misc/ca-certificates/ca-certificates-20180409.3.37.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20180409.3.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
 
 # The Debian ca-certificates package merely takes the CA database as it exists
@@ -26,7 +26,7 @@
 
 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} )
 
 inherit eutils python-any-r1
 
diff --git a/app-misc/cdcat/Manifest b/app-misc/cdcat/Manifest
index 10fb23294b0a..4e6c9ce9ee88 100644
--- a/app-misc/cdcat/Manifest
+++ b/app-misc/cdcat/Manifest
@@ -1,4 +1,3 @@
 DIST cdcat-0.3.tar.gz 7464 BLAKE2B 24d0acce5bca9f84d24944e74a463ec64fee19a989ef89c187dc283d5c87dbdffb76e9471159903603c07924e0affef6f1b48dc7ab5e7292e5ae427510f7a259 SHA512 6d30a22c29a1846a3899f384bcc395444af77b62024cb9f45da877819614c3f1ff495e03f7d7b498716fe4725c569c88a14480a37fc4e4fef5cfd9a640e4cfa3
-EBUILD cdcat-0.3-r1.ebuild 1245 BLAKE2B c45100b1cb46d197421f9964a22edcbb7a5f4d026348d6a8c436c30df1d4463e6ecf353458957f8b9e8f05bf2cccc13a1ae42e91359ce0471e351195d9884e58 SHA512 1fc07b8db7fa5e486171370a4f0577321ce3d7c39766dd1eca9678ac11671c6430416a14490129d32b2928aae619b057f3ac9847fce7e14af15a859568269521
-EBUILD cdcat-0.3.ebuild 1231 BLAKE2B 435ec1d0f9750158055c9ddf2ebc1a31fa0223d51d59b34832fd9bd8cef528244e3a9d645c0d20b9149d0b1b578a4c43ef495d61b31822e07a84336da09a19ce SHA512 a21844dbbc3ba3206407dd59e0af6bc520fb09d83a08fc3454853bcd2c44853e8f68d2ffed1819a034c6e22c6792f0ba7b4b35d91df62f75716429a82f5185fa
+EBUILD cdcat-0.3-r1.ebuild 1239 BLAKE2B ac07365db2ca0d52437ea84268db936669044fa2d97502bcd79b1f86a9cade70b426c788430267609b4e7e28abaa84092e918a2142484ee1b923e4c1e521404c SHA512 c2e0c151bd9b306fdf6a10fa3c760fdbec1be83e83c92f8f54e67d811be0a396b4ed86d6daebf99640374e6d811c3c00744e5fab681f947fa5b085d81f1c4423
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/cdcat/cdcat-0.3-r1.ebuild b/app-misc/cdcat/cdcat-0.3-r1.ebuild
index 3649b8e2eacc..8ad49a3e87e9 100644
--- a/app-misc/cdcat/cdcat-0.3-r1.ebuild
+++ b/app-misc/cdcat/cdcat-0.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 @@ HOMEPAGE="http://cdcatalog.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="virtual/cdrtools
 	!app-backup/cdbkup"
diff --git a/app-misc/cdcat/cdcat-0.3.ebuild b/app-misc/cdcat/cdcat-0.3.ebuild
deleted file mode 100644
index 6f165bb146e3..000000000000
--- a/app-misc/cdcat/cdcat-0.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="simple yet effective CD indexing program"
-# original src went away: SRC_URI="http://littledragon.home.ro/unix/${P}.tar.gz"
-SRC_URI="mirror://sourceforge/cdcatalog/${P}.tar.gz"
-HOMEPAGE="http://cdcatalog.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="virtual/cdrtools
-	!app-backup/cdbkup"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# workaround install.sh ignoring --man_prefix
-	sed -i 's:^MAN_PREFIX:#:' install.sh
-
-	# fix path to cd index files to be FHS-compliant
-	sed -i 's:/mnt/ext/cd:/var/lib/cdcat:' src/cdcat.pl
-
-	# work around problem with isoinfo -di
-	sed -i 's:isoinfo -di:isoinfo -d -i:' src/cdcat.pl
-}
-
-src_install() {
-	# workaround install.sh ignoring --man_prefix
-	export MAN_PREFIX="${D}/usr/share/man"
-	dodir /usr/share/man/man1
-
-	# create index files path
-	dodir          /var/lib/cdcat
-	chgrp cdrom    "${D}"/var/lib/cdcat
-	chmod g+ws,o+w "${D}"/var/lib/cdcat
-
-	# now use the included install.sh
-	./install.sh --prefix="${D}/usr" \
-		--man_prefix="${D}/usr/share/man" || die "Install script failed."
-
-	insinto /etc
-	doins doc/cdcat.conf || die
-}
diff --git a/app-misc/cpipe/Manifest b/app-misc/cpipe/Manifest
index a89821a1902b..673d0dc61e39 100644
--- a/app-misc/cpipe/Manifest
+++ b/app-misc/cpipe/Manifest
@@ -1,3 +1,3 @@
 DIST cpipe-3.0.3.tar.gz 16392 BLAKE2B 6aadb1b186bbf9aa5d804ca719baaff662116084c1e24c9fac38526e8fd190421189dfb02787f430dd0997b3b1bcba41ba002630a324e508190a0b6bd6b0af91 SHA512 255e3833ddaf27af1768e650a47d0565224ddd22137636ae0fae491a4d03f523b74a76f26b261c71442a7509f42eee64b75fbcf7078641a64b66a2590bb803b3
-EBUILD cpipe-3.0.3.ebuild 649 BLAKE2B 681dbcee08f62a22faf8e5202815d776870923ff5d5e221f034e2ba3c20bdd5e784375ad31f361c5b76322e8809be240b94c39e7893de68dc7e1cf1b3983de2a SHA512 d5664f0b059e092f0e4ca41e8aaf630cbabab2a07c25616b550069355d6570c35737aca7c4211c37943be15a6b968348eed2c43c8b8e71ddcc7a8e481789bd0b
+EBUILD cpipe-3.0.3.ebuild 659 BLAKE2B c79449c6313e63e2ecf9cc00834750bcffe67811fdc1d13dd003ed3fa66f4dfb3b0c564b6eb7616754f60f7c0c9533ad90113b1d09df0a3099d9e8527e8f1ee8 SHA512 73f526e020ce899e19699e5fd6cf6bcbfeba343f37f5b203dfc1488eb711941f492cb5ff16bdd14a974d34dd5893d0f89690928aeaf98e7289fc00d376d5807a
 MISC metadata.xml 330 BLAKE2B ae60f1e0f28436199a2f72cdb7ec2714258a8ba42eca5bee81c54bf3cfdbcaf04f450c737897242d064c611947124b8865d6b2720eea1eaca4e8643a8fd09e9c SHA512 5d888afdae9cd65ef26799a4c311dd11bbe8cbea93d6e8ba4e92086cce3df5708be39ea4c20a1ea0bd76d9e06846dd1f48af120f0812f4be75e9ae1f43e669bb
diff --git a/app-misc/cpipe/cpipe-3.0.3.ebuild b/app-misc/cpipe/cpipe-3.0.3.ebuild
index 1f656dc38a49..e37354a3d76f 100644
--- a/app-misc/cpipe/cpipe-3.0.3.ebuild
+++ b/app-misc/cpipe/cpipe-3.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/HaraldKi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86 ~amd64-fbsd"
 
 src_prepare()	{
 	default
diff --git a/app-misc/ddate/Manifest b/app-misc/ddate/Manifest
index f829ade5a82c..098f726b64d6 100644
--- a/app-misc/ddate/Manifest
+++ b/app-misc/ddate/Manifest
@@ -1,3 +1,6 @@
+AUX ddate-0.2.2-dont-compress-manpage.patch 646 BLAKE2B 18465cdb8ec25750868455214c4557f42a57448b8b5785a6793df2ff412d089af0e88743a7c361ab4284a9a6d98fda1c6cdccbb227628afa65beb7d5919ff6d9 SHA512 a967a30379e6fb07cd00cf133068409c24dfd660fc84a200fca8feae5664ce90598f23984b73e32e1dae9c4af31f0289f82cb24d6a4b74956c88c266d9c9e485
 DIST ddate-0.2.1.tar.gz 7757 BLAKE2B b2899b325d5cb45b2aa2460fa900740c41c7790823958fcd1cf971713d61283e050737b0cecdd1988c60718e2741ba1d3a0a48442b4013d9727db6a3765da882 SHA512 377ae4be0ddd2386de726603116ec64a524f2f4263cb30d2cd8f10024659f5fee552cf13de45cbaad36c93d2dfd16c0667993d67a37ba2276a96ca052265c714
+DIST ddate-0.2.2.tar.gz 8049 BLAKE2B 7a987595b2dc399a5fc254891b92af84c9f94830f65c756f75db30c1e4db008ad715608ad37d53f3b73f3f5263023c066c546eb7536dc7439ded3650996be001 SHA512 5d148e030bee392eb93c5ae519061af0736f2f75eaae916e3efaf927d9f4de8cc72afc4a5121b6fbc0264b73e9f580330a38b97bb78837d447d0b4c1fc29ec06
 EBUILD ddate-0.2.1.ebuild 665 BLAKE2B 976c1f0c0332d87d64147d0524f46f5971b4ea37477a42a70d4e4a63281c7eb02d4e41b5d66be204c1210372376a0ba8e0a5f415e858ed27cb189e298fe1cd2c SHA512 442a9548fc42ff0aa96f36020da4e6c840cc34dcdcb487d6be2c2efe3d71043fa98bb12f100a5c07dda3eed4ade983f8213e47a445c4bc9303583f0a68b04450
-MISC metadata.xml 219 BLAKE2B 9858286d68d75ce04ccfc658dc2fb021bac4342b211ac0cad2f57e64ee921af88be0fd6edb6c34c2f779207635cabcc390c8e72bad60d3772704714f31351fcc SHA512 6e64ad59ba9b06e33a75001a02ac552d3e5127ddfadeb4a06afa90d334718ec1516c71c6195538cb3fbca9998acff0239ce70a6a9b1d8dc393a1ff02fc24f168
+EBUILD ddate-0.2.2.ebuild 518 BLAKE2B b0c492da6c0326f6430dba598b3037afbd2ac454bd91e1d43b2359ac7c15a0ce1f92c776dc85166f80d09c38d11dab81344ed2230ec12076c4dd5e37255d90d8 SHA512 f01eb4e97a2b5d48ed99579a7c857f8e121f72b183cf112f8e6402730a850c8ef08366939ab1a25f98f12212f2db58e3e783511a4f0d005e3bd192bfc0059994
+MISC metadata.xml 711 BLAKE2B ddfa1311f5fa3c5604c206dc77da1e40c3095ca3f5103b54b9d0d520626b62f49c95ebb077bea726c4f43100f0ebeec47005ac307d77012f8a592f29f61cc507 SHA512 4772c77e33981110fa4f1538414db73cfc67d09c686209bbfcf331e6fcb8c3fbae87b702ef88f672cd55a99a3b0c83996a8005c5f79b1a102b8410825f27a6ff
diff --git a/app-misc/ddate/ddate-0.2.2.ebuild b/app-misc/ddate/ddate-0.2.2.ebuild
new file mode 100644
index 000000000000..ed2ea3d74539
--- /dev/null
+++ b/app-misc/ddate/ddate-0.2.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 cmake-utils
+
+DESCRIPTION="Perpetual date converter from gregorian to poee calendar"
+HOMEPAGE="https://github.com/bo0ts/ddate"
+SRC_URI="https://github.com/bo0ts/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+LICENSE="public-domain"
+SLOT="0"
+
+RDEPEND="!sys-apps/util-linux[ddate]"
+
+DOCS=( "README.org" )
+
+PATCHES=( "${FILESDIR}/${P}-dont-compress-manpage.patch" )
diff --git a/app-misc/ddate/files/ddate-0.2.2-dont-compress-manpage.patch b/app-misc/ddate/files/ddate-0.2.2-dont-compress-manpage.patch
new file mode 100644
index 000000000000..1eacf8ae3a11
--- /dev/null
+++ b/app-misc/ddate/files/ddate-0.2.2-dont-compress-manpage.patch
@@ -0,0 +1,20 @@
+--- a/CMakeLists.txt	2014-06-20 14:56:55.000000000 +0200
++++ b/CMakeLists.txt	2018-10-05 17:03:43.000000000 +0200
+@@ -4,15 +4,9 @@
+ 
+ add_executable(ddate ddate.c)
+ 
+-add_custom_command( OUTPUT ddate.1.gz
+-  COMMAND gzip -c -9 ${CMAKE_SOURCE_DIR}/ddate.1 >> ${CMAKE_CURRENT_BINARY_DIR}/ddate.1.gz
+-  DEPENDS ${CMAKE_SOURCE_DIR}/ddate.1
+-  COMMENT "gzipping manpage"
+-  )
+-
+ add_custom_target( manpage ALL
+-  DEPENDS ddate.1.gz
++  DEPENDS ddate.1
+   )
+ 
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ddate.1.gz DESTINATION share/man/man1)
++install(FILES ${CMAKE_SOURCE_DIR}/ddate.1 DESTINATION share/man/man1)
+ install(TARGETS ddate DESTINATION bin)
diff --git a/app-misc/ddate/metadata.xml b/app-misc/ddate/metadata.xml
index 62bf9ab7eebb..5326117a6b34 100644
--- a/app-misc/ddate/metadata.xml
+++ b/app-misc/ddate/metadata.xml
@@ -1,7 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <upstream>
-    <remote-id type="github">bo0ts/ddate</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		Converts gregorian dates to discordian dates.
+		Sacred document of the frogs (old erisian poem):
+		73 Days hath chaos, discord, confusion, bureaucracy and aftermath.
+	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/bo0ts/ddate/issues</bugs-to>
+		<remote-id type="github">bo0ts/ddate</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index e0ac8a9f5708..c7f2a9934026 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -8,12 +8,12 @@ AUX elasticsearch.service.3 1527 BLAKE2B 7f7bee9019de2814cdce1e4a66932a0a2a915cd
 AUX elasticsearch.service.conf 235 BLAKE2B 23ada111be21dff12323edbe981883cb1ed275b6c7a9f55e77fdcec1919d374818683403a2a7a7c2c2839db2b8afcd66f7667d5080ecb52cade853a400f972a6 SHA512 b300dbc1b3c341ebbcac68385c651133427f342dc0351501b47730b392cc176b7b8dc53877affc6ab384d2834d246a3d0c63b6015dddf2c90d4bcf41cee9968c
 AUX elasticsearch.sysctl.d 24 BLAKE2B 4012fbdbc98a8b28df11aed33cb82c113790c44721eae1d69e19c595bfbf329618b9cb67be9528f1994c546233cffd31b20eee39edc142bc86f7a7cf5e08903e SHA512 9f3d8238edff6704bea06b6535ee8915f4a3c9bdc8389d9d4943bcfa49161b61f9a1ca49dbcc415580438f4396fbc3d58eef301554f9426287606a755ada715c
 AUX elasticsearch.tmpfiles.d 56 BLAKE2B 0c28c612fadfdd86321df797527399fa5073a7350de95ec2b32dfbe51cbf52fe5dcf68ebd4e3fba6cccba1cf252a16dee3b701c4c6692121745c41665cf3c972 SHA512 5cc722abcaae68afffde96e38b2c9572faf898178d3c291c945fe49fbf977e319322b99fb6fb5bf49cfb04e86f071dde0db621849288f712a56571b13af9a11a
-DIST elasticsearch-5.6.11.tar.gz 33864199 BLAKE2B 08884e6367007835ec1d248912d4127ade4d5fff85927df86ee7de4ebf5ee9bc9639940c89b71739cf17fd389d0c47a23cc48ccd1777b94830f1614663fd7487 SHA512 cc0ec89889e23d7aa3e03a2bb76bf6bb40b3084a8a13da99851c4770533048283d36b4c13322b4689480914e5e57c4c998d4abba44d8caa44ffdb21edb207a9c
+DIST elasticsearch-5.6.12.tar.gz 33861038 BLAKE2B 548513d568ffad6373f15671934cce84217d59b8a036847685ad055681f816d3a75fb6ba2c60c7965402e791d6f5b1a11fe8918bca9f4a60fb8e9d43809da0a2 SHA512 bc2436ff34bca652f6a6462920921dce3b085300787e02191c0673d7b3789c0cf81681108573f0ec4dc945e91a2e6ae19898d1b606ca35694bfde6d9cd5762cd
 DIST elasticsearch-6.3.2.tar.gz 91452574 BLAKE2B c422990fabad70e6e77e8f59f6fb9e9bf5a84eb7e6b8b67dfd91f53e474b1b501b3a1d5ea8f54f0793631504f194a116e816eb3558782b67c8dadecbc2711ee5 SHA512 954cd1e16a5f2e0b0efaeb7e6b19c708d1588d30814a31defb09037c3b90f78c5e9dbd1ca9af9c700d517145a4279bacc1d8ce7cc6894fbe7bf71eec9ed3110d
-DIST elasticsearch-6.4.0.tar.gz 97901357 BLAKE2B 60263c3b68a91fba2341d45162cac328e5561cfe046bcc0dfff3eb09d2e487374c5e8481b460a54861df7b2c5774ac2cc6c884fc6b5455fb40f0c89848c0ad0b SHA512 6f465378a51c487f1f6a84a0843ac1038db60170ee8a5d96874a759f6dbbf2de9f7bcbbf55616f49f28f1098c82f2e585c917267d02b8b1f43627a1984b3da66
+DIST elasticsearch-6.4.1.tar.gz 97924081 BLAKE2B 179433ebe9fca80517057a0379d67545bfd42af741ca64fc2e5b307f9071634d20f297c46d43cfbcfa8dcc45f269c5db32b70656bd4c3035a47aacae861875a2 SHA512 a023a6db5554dee6f10718dfa297aa06a735c7857542c2db80fa5c2b86ff4bf405bb8167578c5b60741ad05ed96a64b54bc71d128a0ff955468b0449588b053c
 DIST elasticsearch-oss-6.3.2.tar.gz 29418577 BLAKE2B 152640dc01a10f44ba43f87f68361cc0dd5e1cf54d0ff92377f3acd1a12a247f002ffe2d003cc53760e891278249c10b1d6d4eb978b0bb1c1ebf8879a2cfcb9a SHA512 3c51a860414f7e55900b1d9a350bdbc3e673c8445e316454c2480315b4b9fc08df58090c6281cecc3ae63d12d78d6bd58e228b3371aa325db799ce18758a21f4
-DIST elasticsearch-oss-6.4.0.tar.gz 33727061 BLAKE2B dd0ff95bb124103ca340b480c5192c9919ef226d4c3ef1b61accd0df2ee9b60a8215693b3db0fa327a4d6791de66746654144a9172210687e8a2efa9f6f4dde3 SHA512 0197dcf24bdb81cbcfa492d899363528816143962abd1925a5092e8177c25e8ca490afe5868b41057b3cded296f59f38ed11ba0156a820b6c877c69a5888846c
-EBUILD elasticsearch-5.6.11.ebuild 1689 BLAKE2B 7520b1676de4ded7fbb3691cca543c3a5c6de99cfa1ffff09e40ba55991d086f7004c372387e932213bbf5dbab42952266f4da9cbaf051c1795089c420949dbf SHA512 36d5128d2779abddd535e0918bbe4569c3d1414dbfc43e57fc037ca3056aabf73dbfd43b58811c5a4d0bc3d0e3edbf093ca458add2b90b87b62cb22416552fb0
+DIST elasticsearch-oss-6.4.1.tar.gz 33725674 BLAKE2B e24809eab213aa34499dcfb1e9a9a2b37d85346d4647282de51c95b17f0ae693f9b48e1649658d700ed8e3d547fd22b5f2276c3b4a2b78aa6c129b8bd1eb096b SHA512 5036adbb091dff95416f4f4b24f615475d7c8c058fcda733ec49a9867b7dafcb90c430f486c667cdc30958280814e609c3f0bc49c20bdb06c0a22d01504a3873
+EBUILD elasticsearch-5.6.12.ebuild 1686 BLAKE2B 5275864107bfc5c8be3e0725eac78ec21021aff4716f494f8e793e2198223450ff5fa7eaeb63959641af4a4c9e30c3ba865e7871cec6ec903010a97b1cc3c107 SHA512 ef36e2a07bf258cacd735c87b765d72c678a47c2a968e89e9ed11ce2592aa42ec2509dc65fa39dd2a66ff4e681d724c05dc4f7ad93439753beee75aa0dccc744
 EBUILD elasticsearch-6.3.2.ebuild 2603 BLAKE2B 329924c83731282a8054c4c5965f30fa6c2748b4558044fa7b1407ef406dbc02a02735274ec942c20830396e2eec9e614b7406028623e03bab570e42bba522ca SHA512 9435e7af52a42bbe8626330dce0c2b80a827d697a8fae96edceba3a9665472775e71e23cee099b931bf17dc65eddce2fbee68e36823d1796bc7187169153db55
-EBUILD elasticsearch-6.4.0.ebuild 2582 BLAKE2B dd354462830a8d19a87b031fa9930a2e88472370a69f95333e0b5fbbc363075e5e26c1c231640126e4b60e90c3cc08f48af15f1fddffe1fc00cdf907c1435333 SHA512 370f137aeb73744e42d6b6a5e2554a9e4fbf1fbb218e4f45d8b39050d0bbc231ef2f27dcc0295db2ab7c10f0a394a88f263e5f8bd630023664f3be4f245aec77
+EBUILD elasticsearch-6.4.1.ebuild 2579 BLAKE2B c397625f021c0dfccede2c57e24cd0584def56204ec33ea7fecd36e901fce6a8cd9d449b03dd19cc3c7ec66be5e700f25454e0cc2e18e5dd924791349b66f7cf SHA512 b89368ddc71306ab1345257ee899e2b0be87276587e5157d714616ca7548175ec7be80fc646ded6ac86635fae785def9b63401a642b805470b7abf54e0038d8e
 MISC metadata.xml 567 BLAKE2B 3123e01d77b67569afb2bb4908b38c702ebe1d308ea236b8ebba11709bc421af27ec29d72398a3af0aaefb39a2a2f34e27bffbbd1b3306dbc299e49bfd48cd35 SHA512 74669ea5437ad23c604c82a734973d58a31d78f0f4a2b7e2db655d884bf017d32ea25e451517601b35d406789e661ed2e173752bc232a03c3564e971c5a83a0c
diff --git a/app-misc/elasticsearch/elasticsearch-5.6.11.ebuild b/app-misc/elasticsearch/elasticsearch-5.6.11.ebuild
deleted file mode 100644
index 26cfa98675c0..000000000000
--- a/app-misc/elasticsearch/elasticsearch-5.6.11.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 systemd user
-
-DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
-HOMEPAGE="https://www.elastic.co/products/elasticsearch"
-SRC_URI="https://artifacts.elastic.co/downloads/${PN}/${P}.tar.gz"
-LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="virtual/jre:1.8"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 /bin/bash /usr/share/${PN} ${PN}
-}
-
-src_prepare() {
-	default
-
-	rm -v bin/*.{bat,exe} LICENSE.txt || die
-}
-
-src_install() {
-	keepdir /etc/${PN}
-	keepdir /etc/${PN}/scripts
-
-	insinto /etc/${PN}
-	doins -r config/.
-	rm -rv config || die
-
-	insinto /usr/share/${PN}
-	doins -r .
-
-	exeinto /usr/share/${PN}/bin
-	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
-
-	chmod +x "${ED}"/usr/share/${PN}/bin/* || die
-
-	keepdir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-	fperms 0750 /var/{lib,log}/${PN}
-	dodir /usr/share/${PN}/plugins
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
-
-	newconfd "${FILESDIR}/${PN}.conf.2" ${PN}
-	newinitd "${FILESDIR}/${PN}.init.2" ${PN}
-
-	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
-	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
-}
-
-pkg_postinst() {
-	elog
-	elog "You may create multiple instances of ${PN} by"
-	elog "symlinking the init script:"
-	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
-	elog
-	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
-	elog "from /etc/elasticsearch into the configuration directory of the instance:"
-	elog "/etc/${PN}/instance"
-	elog
-}
diff --git a/app-misc/elasticsearch/elasticsearch-5.6.12.ebuild b/app-misc/elasticsearch/elasticsearch-5.6.12.ebuild
new file mode 100644
index 000000000000..32370ac9f8a8
--- /dev/null
+++ b/app-misc/elasticsearch/elasticsearch-5.6.12.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd user
+
+DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
+HOMEPAGE="https://www.elastic.co/products/elasticsearch"
+SRC_URI="https://artifacts.elastic.co/downloads/${PN}/${P}.tar.gz"
+LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="virtual/jre:1.8"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 /bin/bash /usr/share/${PN} ${PN}
+}
+
+src_prepare() {
+	default
+
+	rm -v bin/*.{bat,exe} LICENSE.txt || die
+}
+
+src_install() {
+	keepdir /etc/${PN}
+	keepdir /etc/${PN}/scripts
+
+	insinto /etc/${PN}
+	doins -r config/.
+	rm -rv config || die
+
+	insinto /usr/share/${PN}
+	doins -r .
+
+	exeinto /usr/share/${PN}/bin
+	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
+
+	chmod +x "${ED}"/usr/share/${PN}/bin/* || die
+
+	keepdir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+	fperms 0750 /var/{lib,log}/${PN}
+	dodir /usr/share/${PN}/plugins
+
+	insinto /etc/sysctl.d
+	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
+
+	newconfd "${FILESDIR}/${PN}.conf.2" ${PN}
+	newinitd "${FILESDIR}/${PN}.init.2" ${PN}
+
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
+	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
+}
+
+pkg_postinst() {
+	elog
+	elog "You may create multiple instances of ${PN} by"
+	elog "symlinking the init script:"
+	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
+	elog
+	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
+	elog "from /etc/elasticsearch into the configuration directory of the instance:"
+	elog "/etc/${PN}/instance"
+	elog
+}
diff --git a/app-misc/elasticsearch/elasticsearch-6.4.0.ebuild b/app-misc/elasticsearch/elasticsearch-6.4.0.ebuild
deleted file mode 100644
index 2a715bac374a..000000000000
--- a/app-misc/elasticsearch/elasticsearch-6.4.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd user
-
-DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
-HOMEPAGE="https://www.elastic.co/products/elasticsearch"
-SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${P}.tar.gz )
-	!x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${PN}-oss-${PV}.tar.gz )"
-LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain x-pack? ( Elastic )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="x-pack"
-
-RDEPEND="virtual/jre:1.8"
-
-QA_PRESTRIPPED="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 /bin/bash /usr/share/${PN} ${PN}
-}
-
-src_prepare() {
-	default
-
-	rm bin/*.{bat,exe} LICENSE.txt NOTICE.txt || die
-	rmdir logs || die
-
-	if use x-pack; then
-		rm bin/x-pack/*.bat || die
-		rm -r modules/x-pack-ml/platform/{darwin,windows}-x86_64 || die
-	fi
-}
-
-src_install() {
-	keepdir /etc/${PN}
-	keepdir /etc/${PN}/scripts
-
-	insinto /etc/${PN}
-	doins -r config/.
-	rm -r config || die
-
-	fowners root:${PN} /etc/${PN}
-	fperms 2750 /etc/${PN}
-
-	insinto /usr/share/${PN}
-	doins -r .
-
-	exeinto /usr/share/${PN}/bin
-	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
-
-	chmod +x "${ED}"/usr/share/${PN}/bin/* || die
-
-	if use x-pack; then
-		chmod +x "${ED}"/usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin/* || die
-	fi
-
-	keepdir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-	fperms 0750 /var/{lib,log}/${PN}
-	dodir /usr/share/${PN}/plugins
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
-
-	newconfd "${FILESDIR}/${PN}.conf.3" ${PN}
-	newinitd "${FILESDIR}/${PN}.init.5" ${PN}
-
-	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
-	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
-	systemd_newunit "${FILESDIR}"/${PN}.service.3 ${PN}.service
-}
-
-pkg_postinst() {
-	elog
-	elog "You may create multiple instances of ${PN} by"
-	elog "symlinking the init script:"
-	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
-	elog
-	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
-	elog "from /etc/${PN} into the configuration directory of the instance:"
-	elog "/etc/${PN}/instance"
-	elog
-	ewarn "Please make sure you have proper permissions on /etc/${PN}"
-	ewarn "prior to keystore generation or you may experience startup fails."
-	ewarn "chown root:${PN} /etc/${PN} && chmod 2750 /etc/${PN}"
-	ewarn "chown root:${PN} /etc/${PN}/${PN}.keystore && chmod 0660 /etc/${PN}/${PN}.keystore"
-}
diff --git a/app-misc/elasticsearch/elasticsearch-6.4.1.ebuild b/app-misc/elasticsearch/elasticsearch-6.4.1.ebuild
new file mode 100644
index 000000000000..52da0c6d6359
--- /dev/null
+++ b/app-misc/elasticsearch/elasticsearch-6.4.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd user
+
+DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
+HOMEPAGE="https://www.elastic.co/products/elasticsearch"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${P}.tar.gz )
+	!x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${PN}-oss-${PV}.tar.gz )"
+LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+RDEPEND="virtual/jre:1.8"
+
+QA_PRESTRIPPED="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 /bin/bash /usr/share/${PN} ${PN}
+}
+
+src_prepare() {
+	default
+
+	rm bin/*.{bat,exe} LICENSE.txt NOTICE.txt || die
+	rmdir logs || die
+
+	if use x-pack; then
+		rm bin/x-pack/*.bat || die
+		rm -r modules/x-pack-ml/platform/{darwin,windows}-x86_64 || die
+	fi
+}
+
+src_install() {
+	keepdir /etc/${PN}
+	keepdir /etc/${PN}/scripts
+
+	insinto /etc/${PN}
+	doins -r config/.
+	rm -r config || die
+
+	fowners root:${PN} /etc/${PN}
+	fperms 2750 /etc/${PN}
+
+	insinto /usr/share/${PN}
+	doins -r .
+
+	exeinto /usr/share/${PN}/bin
+	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
+
+	chmod +x "${ED}"/usr/share/${PN}/bin/* || die
+
+	if use x-pack; then
+		chmod +x "${ED}"/usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin/* || die
+	fi
+
+	keepdir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+	fperms 0750 /var/{lib,log}/${PN}
+	dodir /usr/share/${PN}/plugins
+
+	insinto /etc/sysctl.d
+	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
+
+	newconfd "${FILESDIR}/${PN}.conf.3" ${PN}
+	newinitd "${FILESDIR}/${PN}.init.5" ${PN}
+
+	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
+	systemd_newunit "${FILESDIR}"/${PN}.service.3 ${PN}.service
+}
+
+pkg_postinst() {
+	elog
+	elog "You may create multiple instances of ${PN} by"
+	elog "symlinking the init script:"
+	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
+	elog
+	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
+	elog "from /etc/${PN} into the configuration directory of the instance:"
+	elog "/etc/${PN}/instance"
+	elog
+	ewarn "Please make sure you have proper permissions on /etc/${PN}"
+	ewarn "prior to keystore generation or you may experience startup fails."
+	ewarn "chown root:${PN} /etc/${PN} && chmod 2750 /etc/${PN}"
+	ewarn "chown root:${PN} /etc/${PN}/${PN}.keystore && chmod 0660 /etc/${PN}/${PN}.keystore"
+}
diff --git a/app-misc/irtrans-irclient/Manifest b/app-misc/irtrans-irclient/Manifest
index 26623ae02d28..26988bad08de 100644
--- a/app-misc/irtrans-irclient/Manifest
+++ b/app-misc/irtrans-irclient/Manifest
@@ -1,5 +1,4 @@
 DIST irclient-src-6.01.05.tar.gz 69814 BLAKE2B fb8d854fa9c00e57ff5f4002047c1733fb42e95d4055efb2c23bdbe381f901705973f54c155a65ddab1ca134d0c31b5e36eb90784a9e9986bbd5c8a2f4d4775d SHA512 47d76f66ce6422252624dd805fbff042bcd9443f04b656cb2b20267dbf42a57345a0ac5cda0204a44535088a06c1232d2dea6305ad3561c78a7330774c1e998e
 DIST irtrans-irclient-5.11.04-ip_assign-1.patch.bz2 5051 BLAKE2B 79b8fb9249c69e8a868771a288e5f0e7c4d6658d36f97ce1ac0c577dae5c810207780406bb7a87df3392eb795463b9c62c6ce7d99ef349111db99637ee8d2432 SHA512 9be72f7f6fcc24c9bda73cf5dd8a2c112c6cb82e2ef50d40c17b43d7dcb8f11bcf8bc0ebb914046b5429bce1b4936278ade936db6c916384fbd637a300f528cf
 EBUILD irtrans-irclient-6.01.05-r1.ebuild 1331 BLAKE2B 9709f86529fe6fece10be99747e312d0a2467588e32cef7391f70cfef0bfe892db88b12b0d4cdaf07853fe30c160658f5ef31a7c85d17b55ed75734ba7765ff1 SHA512 3754845152408964332914b5e4ade4a3f38d3eec9534c2f12a1e863f77ec26f5cf539f0e6aec3cd6e434e3cc65e74e5c05956a357159a317208433c16959f5f3
-EBUILD irtrans-irclient-6.01.05.ebuild 1647 BLAKE2B 15d5c9cd56c80697b178798212130e406ca19dcdf3e81c4251b885cffcff37eabe2295390997a916a5d663830bc100d242a57f05597d0cf970600340f7337c00 SHA512 a454497e39e36731065ec6d4d2b78fedfbae575357fefedcd21439267964bc2ae483048c80e59c7e7663e7510a9fd8e70e9ad857ee2525fa2d31212656efb447
 MISC metadata.xml 460 BLAKE2B 8911eaf34bbdd8c9978c5d89582d1f0765ade9101da2102b02ab55f2f2c93384198c2fe79fcddb3ae8319bb32d0c8c973e69297a7830d7afafc454a7600dc145 SHA512 6067b6d98528ce0e9b0811ae31d949362173c43471d935197d2da5eeee5b4391cbd43b1bfbed8468c187d71c341f1eee247df0bfd3faf963104a67223501f75c
diff --git a/app-misc/irtrans-irclient/irtrans-irclient-6.01.05.ebuild b/app-misc/irtrans-irclient/irtrans-irclient-6.01.05.ebuild
deleted file mode 100644
index dc6bd63ff3ff..000000000000
--- a/app-misc/irtrans-irclient/irtrans-irclient-6.01.05.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-RESTRICT="strip"
-
-DESCRIPTION="IRTrans Server"
-HOMEPAGE="http://www.irtrans.de"
-SRC_URI="http://www.irtrans.de/download/Client/irclient-src.tar.gz -> irclient-src-${PV}.tar.gz
-	http://ftp.disconnected-by-peer.at/irtrans/${PN}-5.11.04-ip_assign-1.patch.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~arm"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${RDEPND}"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	epatch "${WORKDIR}/${PN}"-5.11.04-ip_assign-1.patch
-}
-
-src_compile() {
-
-	append-flags -DLINUX
-
-	# Set sane defaults (arm target has no -D flags added)
-	irbuild=irclient_arm
-	irclient=irclient
-	ipbuild=ip_assign_arm
-	ip_assign=ip_assign
-
-	# change variable by need
-	if use x86 ; then
-		irbuild=irclient
-		ipbuild=ip_assign
-	elif use amd64 ; then
-		irbuild=irclient64
-		irclient=irclient64
-		ipbuild=ip_assign64
-		ip_assign=ip_assign64
-	fi
-
-	# Some output for bugreport
-	einfo "CFLAGS=\"${CFLAGS}\""
-	einfo "Build client Target=\"${irbuild}\""
-	einfo "Build client Binary=\"${irclient}\""
-	einfo "Build ip_assign Target=\"${ipbuild}\""
-	einfo "Build ip_assign Binary=\"${ip_assign}\""
-
-	# Build
-	emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}" "${irbuild}" || die "emake irclient failed"
-	emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}" "${ipbuild}" || die "emake ip_assign failed"
-}
-
-src_install() {
-
-	newbin "${WORKDIR}/${irclient}" irclient
-	newbin "${WORKDIR}/${ip_assign}" ip_assign
-}
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index 627742fba480..9bf36cda9f21 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 2147 BLAKE2B 9cec5002c19ec5774c6cc14d83879b210e466f3d6ed0870cbae27d168ec91b60d681a1937347427eb32d44ac84663362a4ef2e3701a1e77443423ce6a7dc2e1b SHA512 0d8e0e837e06df8646b17c889b31e2479c6d74f0c81c144eff344cc66f557e6292a74764e8ad0124fc82970aff27b67ee54c3c751b554cf40dc7da51f02fd7d6
+EBUILD tmux-2.7.ebuild 2141 BLAKE2B 52286b25466be1d8108ef3370ba50c3628447cc8aa10756bb0ac10ba56a5b64d933b14b2fc246a6d207b8293ca3885461dbd97ac6431a919037817be71269295 SHA512 4a8dacdf74989e9fadb1dd159d938cd3b90b0ddca00ac102eea82fd267fc1e257491e62ccff4084141cb444b7f72863b6df18a530d721e83df7077d6169a43b5
 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 82aab0c941d3..bfe4e67a390c 100644
--- a/app-misc/tmux/tmux-2.7.ebuild
+++ b/app-misc/tmux/tmux-2.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
@@ -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/workrave/Manifest b/app-misc/workrave/Manifest
index d7f2c4c19bbe..8d61f3a432b8 100644
--- a/app-misc/workrave/Manifest
+++ b/app-misc/workrave/Manifest
@@ -1,4 +1,4 @@
 AUX workrave-1.10.6-automagic-gstreamer.patch 881 BLAKE2B 9d74d1d51d1f351659b6ce237eb174b193e0dd8f4c1387cc8e5e2e787bc329c86249cd8d06e85c7a101c7edb8c51ae3e94c2dcc3ad565fb0c5699350981138f0 SHA512 87b9ee4847a8d3ed7afd479b0eb67864f328991c76c3525837e8fb31df299dfc5be43ab35c884a75a40f756d1a3b929c6a415448f88cbe726a2088e8cafeb290
 DIST workrave-1.10.20.tar.gz 6377941 BLAKE2B 00f573c05ddacd61d50d80a4079d161b18e7e52606cf502f359cf51c4b64407c978fa944e79314146baea62fe77212fa623d54706c62e23fd1ca17cbf25db409 SHA512 fc8d98aa560946f00ee30be0c28648245a425cd3fddeba8fbdd61fb89d107cc8085d5c4d8a326c739b394e6baada2b28cf98ce9ccaf85dca6bfaa1ae78d4ce56
-EBUILD workrave-1.10.20.ebuild 2747 BLAKE2B cc96842b44fc276753dc4eef8ba6fc1d9cdf1e56e3c0173711eeead52b9883d6e92d4b17e8f273a9744242a0da36c47c710eca75f2dadfcfd70345118fdeb78c SHA512 d09af88807d0b98abcbba41d9943595ca947a217c3d17e106550c94e451e754c8b009dc0014a94134a607185e250879a7548fddd60aaf092ce0bd2ec98ce7202
+EBUILD workrave-1.10.20.ebuild 2765 BLAKE2B 6ec931d380d74aa444a0919cf87659e222735ba717256cec88523174071077e0f3e51cd042a7e59365a1e24bd1b31df048417f631d90cfe32097e0bcb80b0856 SHA512 d60084718539d24e71d705ce0fbad9eee7eb3355b694b670b2ebdefa42db06336b88fb3ee84821c8bf1899fcaa716ce86b549f6e7849d2e5ed13333a3455ec22
 MISC metadata.xml 766 BLAKE2B 7fdc6a41af2c9048875b633ed213337c255b0449474d9c3052615655a904406ee35e226b652ca5519d3c12be63550da344eeabad3656604a8c5cb8df0b25fc18 SHA512 980b66185f9d02d4c0cfd2fe24700a4bb325741097ecf63e7bcd7e47c183e4693c22a6486c70dfce2b7d80837de7ab7c9c908f3be12ba5d16bba1de5d61f6858
diff --git a/app-misc/workrave/workrave-1.10.20.ebuild b/app-misc/workrave/workrave-1.10.20.ebuild
index 84cbc53fece7..3b1fa627e946 100644
--- a/app-misc/workrave/workrave-1.10.20.ebuild
+++ b/app-misc/workrave/workrave-1.10.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
@@ -53,6 +53,7 @@ RDEPEND="
 
 DEPEND="${RDEPEND}
 	dev-python/cheetah
+	dev-util/glib-utils
 	>=dev-util/intltool-0.40.0
 	sys-devel/autoconf-archive
 	x11-base/xorg-proto
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 08cd1cb36f53..2017e68d3f5c 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index 86d364859cd9..086b185f0b2d 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -3,8 +3,10 @@ AUX gnucash-2.7.4-fix-tests-for-32bit-platforms.patch 1840 BLAKE2B 4de54cb147d56
 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 3964 BLAKE2B 8143c1d294c5b5df4cf83f0901919edbd44d2a22909cb09d9bccea15247c3e15ce050a8003f6845e00cf3cb74291f32e8c26700f851407ccbd5a83a5435d862e SHA512 3779398d4db88d1a8263fa4ffa44ca399b79e43fa0d956bedac9945d33bb90f2dc1fecca88c4321bfe1b5f43702cb8e2b49cdb007aea4756a3883099416c785b
+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/gnucash-3.2-r2.ebuild b/app-office/gnucash/gnucash-3.2-r2.ebuild
index 52fda92ce402..d582a50930ee 100644
--- a/app-office/gnucash/gnucash-3.2-r2.ebuild
+++ b/app-office/gnucash/gnucash-3.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
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/Gnucash/${PN}/releases/download/${PV}/${P}.tar.bz2
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 
 IUSE="aqbanking chipcard debug doc examples gnome-keyring mysql nls ofx postgres
 	  python quotes -register2 sqlite +gui"
diff --git a/app-office/gnucash/gnucash-3.3.ebuild b/app-office/gnucash/gnucash-3.3.ebuild
new file mode 100644
index 000000000000..52fda92ce402
--- /dev/null
+++ b/app-office/gnucash/gnucash-3.3.ebuild
@@ -0,0 +1,169 @@
+# 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 +gui"
+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
+	>=sys-libs/zlib-1.1.4
+	>=dev-scheme/guile-2.0.0:12=[regex]
+	dev-libs/boost:=[icu,nls]
+	dev-libs/icu:=
+	dev-libs/libxslt
+	aqbanking? (
+		>=net-libs/aqbanking-5[gtk,ofx?]
+		sys-libs/gwenhywfar[gtk]
+		chipcard? ( sys-libs/libchipcard )
+	)
+	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
+	gui? (
+	  gnome-base/dconf
+	  net-libs/webkit-gtk:4=
+	  >=x11-libs/gtk+-3.14.0:3
+	)
+	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
+	sys-devel/libtool
+	virtual/pkgconfig
+"
+
+PDEPEND="doc? (
+	~app-doc/gnucash-docs-${PV}
+	gnome-extra/yelp
+)"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.2-no-gui.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}
+		-DWITH_GNUCASH=$(usex gui)
+	)
+
+	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
+
+	if use gui ; then
+	  rm "${ED%/}"/usr/share/glib-2.0/schemas/gschemas.compiled || die
+	fi
+
+	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() {
+	if use gui ; then
+		gnome2_icon_cache_update
+		gnome2_schemas_update
+	fi
+	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() {
+	if use gui ; then
+		gnome2_icon_cache_update
+		gnome2_schemas_update
+	fi
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-office/libreoffice-bin-debug/Manifest b/app-office/libreoffice-bin-debug/Manifest
index c642aa8cfa94..0023395ff168 100644
--- a/app-office/libreoffice-bin-debug/Manifest
+++ b/app-office/libreoffice-bin-debug/Manifest
@@ -1,27 +1,14 @@
-DIST amd64-debug-libreoffice-6.0.3.2.tar.xz 1229801400 BLAKE2B 7803c708814a8551c495d6dacd1f15cfe54bbe95b2101f1551519718dc464f990d86ef6bf3f0de88189f0f1119dd23c00b6557c5b59f7a11c12f56849db6a690 SHA512 46a3d5b27598ffe5fa20683aa4419119659e40fdf64e45a6770627e1b308efb19297ab7f856b2b89caeb3df409d569ed4095ae13fb39b1ea4e10305d2caef3ac
 DIST amd64-debug-libreoffice-6.0.6.2.tar.xz 1226804568 BLAKE2B 0522713fa08168ed1eeada9a3c7562fd43ccae15b03b75cd7b27e9b800d165a45ee66f9540311788547e0da75c3a911831507a956b3c05f73994c09410a92014 SHA512 76a6c22ec217b338cf6f597401aef5b0d523ae9ee99a680e57b26ab07f56460396d6491e6229e71bb50cbdf3fce9912faf560f82b421093db7d5e6dfe9397e28
-DIST amd64-debug-libreoffice-gnome-6.0.3.2.xd3 337274654 BLAKE2B 469596571d6fd22622218c6dc45d9b72638fb7f00cae7137c8a18a7ba716f0049c9b0e63d6811028784a8bdba999442d3da75d1de1d6a07ac09f66b1eb1e0191 SHA512 4020dc29a8c316f6fab9ff9d77faf30008219b01c0bb0cb2a3b48edf6680b390cfebeee22d361ee4e779af30a3e59c8b1f6677669a87f9a41c11a83ea73dd6c7
 DIST amd64-debug-libreoffice-gnome-6.0.6.2.xd3 335183287 BLAKE2B 4bd98a0a3f5c3e1a1b5d68eb9601937efbec1f3dd81a4b463fc99420a2f41ce70c5d801f8045afbeadfbc2f0228941e8504344d0a282e431b53e406df4c489b1 SHA512 54ba70e76bc263e8c1ec554b6241fbc3685ce15e3e729c79bd0ab718daa506745425e514b22ace5e46284562192ae5727b7c4fff9f6f5152b5f1e44912345199
-DIST amd64-debug-libreoffice-gnome-java-6.0.3.2.xd3 611891145 BLAKE2B 9877d89fc3445401754facf2df41c962cc6b69889b2f67b536b6f7bca22ca9b608d834c10eb09ae11f602fe0196b71a37b84f9b92266d72f56c562ef27fcf4de SHA512 175ef1ca77c090e3a6f788925a79b177a7e34e1509d1eb169ca70384821b83b3b32bf4ff4913e6175cddfa3e92ec45dd18ccf1f43c8af9751617e932ff0f58e0
 DIST amd64-debug-libreoffice-gnome-java-6.0.6.2.xd3 612061584 BLAKE2B 3cba602d840a8c086161fbb46f323bf4a660d25e3c30e90c79241bc5278487d6038661a87b5610e57cbf08074ffa87cfab7620ceefc51828fa1520159415cd32 SHA512 c21a5d30d1fc6602c3fd7e79ee1942aba5c4af0767311d13289a06980f156c1c3b5c21dac8105bc57af5564d5e663ae6af2617bfc18c32330bf8fd452afad1d0
-DIST amd64-debug-libreoffice-java-6.0.3.2.xd3 602837451 BLAKE2B 71a87e3cfe01391ff0fc921e1e8227e5a5f60ea45fba1ea44c657f5a970edad464b161b60c051a8ae01570407994aebba8d69780475f7200d2c4bbf0faa167b9 SHA512 3c07c774e8b7aeb2ccd0977b9fd0737725fb3818c84d2ea35213e10b87543b73a3f7fc4a0c9748b3ca317c4f631308375720c8f73fe7a488bf07374064fd25ab
 DIST amd64-debug-libreoffice-java-6.0.6.2.xd3 603154536 BLAKE2B f9584de8d860d4a7d04ffeecd70c094152a134bf45054a1a3526f061a493045ceed27b5e5f0325f8f836e511af1c6bc64b19581c895bbce592b551460c7bcdbb SHA512 8841179dce5b2adf9a5011715354acb1f20b65f44bb318988a9df910428010ef33d59ebd58a06635905044e45da68496a25325184016e41dd8a7753a38f292d3
-DIST amd64-debug-libreoffice-kde-6.0.3.2.xd3 342896759 BLAKE2B ef402abc0739975818feda3c3112f3af36654d0ca912f017beb76b9d3043d371316b8d294ae56d98acd4d3f4073d9505895f6f8f59f1003dde39a2907db4482b SHA512 877575d6c920db5ceb81f259053c8f7296f596e6bfaf75176bb522592f5eff0b4599f5901b42a553fc224a2245cff15b002f959f001be8e438f5c6c081ea77c4
 DIST amd64-debug-libreoffice-kde-6.0.6.2.xd3 333983698 BLAKE2B 970a9f50b3f0f6780fde8948686715b3f078aeb7922e2604f24c2f57adde7efade1f47eed1f72d487f4a0f662387bfae8a3e60baa0a05e271fdfeee280282157 SHA512 99837f2968f9d4437047db9fe72e39c35797b3c38d1dc271a0156b4665e0573cc129dbc9b98f9f669c92d340dd034cb5eb005ca768f693181a70d447c0e24d56
-DIST amd64-debug-libreoffice-kde-java-6.0.3.2.xd3 617577189 BLAKE2B e22f192a8533d3500a3cc362c3d0f713d6e6fbc0874d337cc1742cf7825e4348301885317412ac2c038c6e83269f20e67c526792e0fde91df3cbbe46e5b5bbd5 SHA512 25973bade0ff78f6a482f88449de70cd237d430da1ff8ef561c6fe7eb4459d3e582ceae4721c37e589304324446bf877005de3923b857279c98f112180dca9a1
 DIST amd64-debug-libreoffice-kde-java-6.0.6.2.xd3 610851675 BLAKE2B 4f23bc53a115a1a5604106bc8398b1aa40ec9d4329fb4146c13919170172205103c73b7f679f8eae66e7d1eebf569536082e738b5ea2e6fa743d60fa8d7b2c5f SHA512 9a4195becf67a31f0c7ba6653b1c878d4b00af43f2642a80ee097eb99176114595cc2373092df9034c44593d5a3db83dd252541ba22109176393ef276b126345
-DIST x86-debug-libreoffice-6.0.3.2.tar.xz 1201421892 BLAKE2B 205c3eda17dde4f096347e962bd3e4b9806da6e1b9266c72fe85b3ecce1d8286ff16857ee32108daea3641cc9fdb92fdbc7b0f175db5b6513d8cea2407ffc071 SHA512 93211e233504f590e3b00a6322038ff40840c446e09094e781d5779d11d0c746cb3b783bee582401cda994ee9424643d5b05fb1673906deeb022b7aee7ecbcb6
 DIST x86-debug-libreoffice-6.0.6.2.tar.xz 1198893492 BLAKE2B 36eaace94d6d5bd17be50cd58924cec5459663de005d1e9cc17de13e420426dd9f75ebc30fa2e624d2ee37fb3836cde6008dbb8ea023e454603d8a733e02be80 SHA512 960c973b27ed04e27f40468823cdb092771983995760a008b733ff76af8a25ed9dc4a5fef3ba1969f881544d0d8a92476fe28ff1ff9a123cc095b4d591f28fce
-DIST x86-debug-libreoffice-gnome-6.0.3.2.xd3 327309281 BLAKE2B c27828cced30fe648ceb1005df12c2ca931dc65d3ca696dc763cf458991c92ec8ba89a98c96c30eb60b8ba7f4f6d6df40015c7e1472c656c6cb694f25e83397a SHA512 572a7126a762a8d9c3783f772b9b6b8de931e384d5699a549466157f2fa464843e3d931261e6193221fb1dc53df22e96ba8ab4f68d920bcbfa254c1a397a9082
 DIST x86-debug-libreoffice-gnome-6.0.6.2.xd3 325202188 BLAKE2B b1bdd507d9d56e4ad9d8880998b866053c76c369e29a283dbefd4d9ad73f45852ae22e4f84b10efb3290db25e1c7a5459c4c622144933b98fb581887e2f48fe1 SHA512 f5e2e806866e4990fe5c5040563c0dde7e7e7cdcb7e1b15d507a3fc7895a43ea03e941d4d06c89ce4c9b9d0776909b5a5da0962d0550ef5c65c3b2f98d2acb6c
-DIST x86-debug-libreoffice-gnome-java-6.0.3.2.xd3 590466385 BLAKE2B ce857408beada974f07df57f83e4abcd905994be1c393ee5a0319b879c561192fa2a2f7a122f530d82a0cc16ded766e49244c37b463c26bccadf2cfd811a0654 SHA512 2e1981190931cee047dc80bbc43f189447c0e7c3f533438efc7bdc001116db560530af3cd89e6e11d31d65fd05dac914fb40b0b715e5494968436fedc600ca49
 DIST x86-debug-libreoffice-gnome-java-6.0.6.2.xd3 588188373 BLAKE2B ca498345862349b7181cb1cf1dfce8669867f5ce0f40404575c3325bb36b44f89f5d25ec44fbcc71f6c604ed43889870d93d9c8f94680ef102b8b45b1127c106 SHA512 dac4ab117a4992e9b6e3e9a9e4657ed9ba2cd01630cbda6b9f8b6ed8a6e75e4a212cdcbc3040e1dff991a12212e1d2c242f461a08d236a4888e86179521146fc
-DIST x86-debug-libreoffice-java-6.0.3.2.xd3 581633470 BLAKE2B 83f32dbc5c095738a485f0dae6ce0a436f64032d9ae4e3ec789f3e1e3e73fb3155ede192fa9132f407556029c33c3915d08f5fb0a5ca05ddcd5b2f99ad48b3d7 SHA512 c31ce9b366879e7d43001212d6a49bb787bfa916b34e2b3faef8560a7b87f8a3eb25d08b2b1daea615c89e36dc98dfc79878e37038433ba3c26427230c90928f
 DIST x86-debug-libreoffice-java-6.0.6.2.xd3 579363410 BLAKE2B 5c75930a70f21696d985ee876d2fee1e92494fc9db4ff103ebc9626887fc397905f1362127848d941fe62bb70749817ef972984a60d7449753ec04aee4bd61ba SHA512 92d933204804eb3faf9beca6f075d0ff435785f13fe5fbf0701ce0e2d59102797df85ac33c50b2a62e36f9c9566c04f6551a34fd7376913592edc96f40641fdb
-DIST x86-debug-libreoffice-kde-6.0.3.2.xd3 326143479 BLAKE2B f1e4a4804b0f5b9bd26f7cada129c6de72d39706e41fde3223d933ced0aa50ff60922dee22e6d3dfbfbfb26e5d219a92644e394793fe413041173672de7704ad SHA512 22a1e19316be3f5bec3ae62dc470ef46065ebe2cc3963fe4952d0285efdb4a434224034eb8dfaa60da866ce2854e0020518e088a4be322b944f7929ceb06bb11
 DIST x86-debug-libreoffice-kde-6.0.6.2.xd3 324043934 BLAKE2B 4f1da55ca925acacc6621389e2c2dc281b39ee8cd93a819a28c9495af6c333786d9745a3021ba9db46094d5d32a345d1b4731c9e11d59304cbcd0139ac443f25 SHA512 b0103f32bf0314066011442a93144de8bf13e6116b9c9e93656d832d4c7ff8fcdfc2c22ac1aa52887a3ed35476d8954e2064e3e0e66cb43e40c4aa5469207363
-DIST x86-debug-libreoffice-kde-java-6.0.3.2.xd3 589281609 BLAKE2B 7446486d969b3672dee561b98360fdaaf4a8c61de6bec38c7de92716db5694641b6429b3aec025649a0970d30b70e8b6a168bad320571b7c72061985b14acf92 SHA512 aa25befbad574afa525477ff23ff77bc59edebdd7bd66bb20174bcce0a99164a149c572054ccc888fd0179bcb539f746b74201f01bdc35dc613b116a6b86bf49
 DIST x86-debug-libreoffice-kde-java-6.0.6.2.xd3 587012572 BLAKE2B 5a3495eb3a1b9149e9378501303716c76ba1ce82f18339e60b1727f1467e351b9fa788196fae0f03aac122534d36f26d19d10421fea79603b4240a580b1a6b6d SHA512 64fcbb87757cb8519a2d4c9935c677f112d1d6f570ee30d6226525e9159fc136271e8b31f15ea06864d63f3003526d84c6253c6f532fd0cacc99f755396bbf50
-EBUILD libreoffice-bin-debug-6.0.3.2.ebuild 2679 BLAKE2B 5d8267d6479ed3e62533f4254f401ca2641ffa93989820a25c5a22425b3e905c2aa9b26d3c177cc5fbbc5cf4d424228e27f57de3080170b24d284aa57328e08c SHA512 89d8eeedc6b58113ebc47c943f970402d5f1465807376621ed09ac877df37e57529490ba60e6cd380e895fca0cb27e2fb4c5345af61c22acf467f13ee878dfb8
 EBUILD libreoffice-bin-debug-6.0.6.2.ebuild 2626 BLAKE2B 632daab6702e56cce06c16acfda09c0042296e34dfd75246debfc6d40c786ac15f447505a9948dfcfb58062bd86cdc13ed1ec93c8f9cb7df7091fe14dd9f6064 SHA512 7cd35b5da20aee77866d7eb35af29b3335611a7407fe94ac0f30a8faf3aa70d707f1afc2e5c6fcec3fcc684e947f5be887676753b70799f681efee8282645031
 MISC metadata.xml 481 BLAKE2B 2b7085b47722f20719ca5e219b52e4334c4819db8c61dcee1446ac28e70cd90a3ac7e1713a4e95a0d3952d931ebcc34b137294b1e17f79cea9f41ec31fb3cd55 SHA512 6c5698440da103c49a6a26c99d3af9ef88f79a74542bca66cc8adad77dd5412760630e5753f163e92cbe58b53c0fd899b9115ca3ae85627bbacdc01c6dd7bb63
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.0.3.2.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.0.3.2.ebuild
deleted file mode 100644
index ca7d569d701d..000000000000
--- a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.0.3.2.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
-
-BASE_PACKAGENAME="debug"
-BASE_AMD64_URI="http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-${BASE_PACKAGENAME}-"
-BASE_X86_URI="http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-${BASE_PACKAGENAME}-"
-
-DESCRIPTION="LibreOffice, a full office productivity suite. Binary package, debug info"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI_AMD64="
-	${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz
-	kde? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
-	)
-	gnome? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
-	)
-	!kde? ( !gnome? (
-		java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
-	) )
-"
-SRC_URI_X86="
-	${BASE_X86_URI}libreoffice-${PVR}.tar.xz
-	kde? (
-		!java? ( ${BASE_X86_URI}libreoffice-kde-${PVR}.xd3 )
-		java? ( ${BASE_X86_URI}libreoffice-kde-java-${PVR}.xd3 )
-	)
-	gnome? (
-		!java? ( ${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3 )
-		java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PVR}.xd3 )
-	)
-	!kde? ( !gnome? (
-		java? ( ${BASE_X86_URI}libreoffice-java-${PVR}.xd3 )
-	) )
-"
-
-SRC_URI="
-	amd64? ( ${SRC_URI_AMD64} )
-	x86? ( ${SRC_URI_X86} )
-"
-
-IUSE="gnome java kde"
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-
-RDEPEND="=app-office/${PN/-debug}-${PVR}[gnome=,java=,kde=]"
-
-DEPEND="dev-util/xdelta:3"
-
-RESTRICT="test strip"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/*"
-
-src_unpack() {
-	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
-	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
-
-	local patchname
-	use kde && patchname="-kde"
-	use gnome && patchname="-gnome"
-	use java && patchname="${patchname}-java"
-
-	if [ -n "${patchname}" ]; then
-		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
-		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
-		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
-	fi
-
-	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
-	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
-}
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr
-	cp -aR "${S}"/usr/* "${ED}"/usr/ || die
-}
diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index 5d7e29dd68e9..8336c30ff51d 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -1,28 +1,15 @@
 AUX 50-libreoffice-bin 158 BLAKE2B 2091698f80fbe097785c60b20f636150a2ee65bf52639fa1bb4a92341d050146040ad8912c5f5e3ca22e48ac3d819053c9948e256fb1d0e0901f7645934bfb89 SHA512 2d1158f48ac80f9212578d020e5659e777ff494adc3abc94438cec6890b88741f92ea2ed3bb4585ffdabe531d55c6938ca9408e9ece5a438e67d480eb406ed50
-DIST amd64-bin-libreoffice-6.0.3.2.tar.xz 80241340 BLAKE2B ccf0df99283356aa384bae7d33c92fd44adb3aca4ddfd18a1afefad6c1dbf40e6fd31f2fea2ab53f15beb9d13707632c651d94a512ebc3959ae1dbce432139d7 SHA512 72a955f80c371c899c39ca2b2ad29e029ac5d71d5690b7cc198b413cbd2cf50064ee8340fc7fec82b5db24a1d94148788dfa3685dfd70ca7437aad3c0a443939
 DIST amd64-bin-libreoffice-6.0.6.2.tar.xz 80491496 BLAKE2B a182c9e47a625e15a08976dbfe16724f6201094bae93f8a9ed7f4b819a1657a0781d4970ea213e652a49c5916e8e34c0dbeaa4989ee6e2ce4760a041a3714a20 SHA512 d5a92d430022a0b56902395e9224e87681130a489b41aa93d171848d7c612d5e2138422e8738d673f43744963fe0caadacd729f49193cd96e9bd1f394c868892
-DIST amd64-bin-libreoffice-gnome-6.0.3.2.xd3 16533839 BLAKE2B 32513b9df6f67fa54ff61abbf26e48e785cc47ab7f1df38ce5b30bb5e156b79834bbd3933dd9fc15397453af44eb5d1cd60bb07b238df5360ead432f08600bc8 SHA512 677538bf28049dfd4e285ebbe260392ef12730b96c9d5772e919afbea87e07ccbfc427258ecc2715e4dd97e0e0e6c23150a972747848b352281be1da765e07ae
 DIST amd64-bin-libreoffice-gnome-6.0.6.2.xd3 16613087 BLAKE2B 7cdec36d986fc7ed3c92c26b1ea91c24d8b951d27a8f0f32821f542e7abf456cd611eee79667e2d508a4d9510d1685253807b0e2a0e62a3f3b3e76a03f12cc6b SHA512 1686d19c296096ac2d3400ea06c8a8e00d56e0db2896d66021b88f7025981d14a9ea207cdb68685a1f6efcbe9be133ebdae27771c8e7c8a9e3c5675bb1e20a9f
-DIST amd64-bin-libreoffice-gnome-java-6.0.3.2.xd3 27088942 BLAKE2B 3642466bec0631a8c801d10e699c027db8ef2b7ffb207113afd4a80cd165c5575647927095e513dbc7ba5cfc256b9b24058559a18ef47107d3632608da5c1744 SHA512 71c47127cdafc1f89a1bbec5d640916fe4005beb3a3cae750685050724817805a564c4c6ffaa1b70157e0769b363bb79b2cd5a70e42edb439e59e8a7678aec57
 DIST amd64-bin-libreoffice-gnome-java-6.0.6.2.xd3 27267767 BLAKE2B 42e3cdb1754bd97ce11320ed6a01b678399be0fb541fcbe9193dcf662955be4d3483fb561958a94b82c73c4c02cc2de88d80d951514a6a0b4667657907941f41 SHA512 820d340c0d3a20074f636b970f5a6ac37a67ea99be1c1bded2cd2d6a508f05e3406e97d42ccf1f66c9beb19f9d027acf2e557a57157e74ff2873388dca123a2d
-DIST amd64-bin-libreoffice-java-6.0.3.2.xd3 26086875 BLAKE2B 8b11a74400a5d275c72325842024cc911e38e987bd33f8a42292c4bbba1c6c25f95374c37ddf25377f02e799e47c745704faad0482840e867e53790e76a1fb41 SHA512 b8ecbc631de6451c27a40c5dbe373a829a6a1ac8ad7762817182aac71cb2efb70859badc9f08d67ccb836f32958d79f029236a910f0cd32cd583aff68422af33
 DIST amd64-bin-libreoffice-java-6.0.6.2.xd3 25919864 BLAKE2B e08fe57214893d270a2f56dd1732a72279f8ba38451ea7bc852ab1d43ea5dab0ff22d77f22456dce260164395f0900c28670c051a992368ebcb1c6a23efef609 SHA512 bf7c988e619399b36471f11ed719b8bac025fe6fb80300b2cd625346035fc823b84b812d68ebd98e81c9eceab632e5a933787088bc55a0719e9ced2305772b55
-DIST amd64-bin-libreoffice-kde-6.0.3.2.xd3 16836580 BLAKE2B b71b5945367d20e0b05cf17304ff860ba6d504a4922c125028ce02748c7fa88dabf086a0c57f35257f511475f87169137332a0b1a44e7e380041c5cf301266ed SHA512 0ff269492903f66b8702168fc9c0d432aa287ee01d167919abe7cd913e1975b8ae63b28fa4383d96cffced5a71420b445f762aa9ec3163301b164122dbe167cf
 DIST amd64-bin-libreoffice-kde-6.0.6.2.xd3 16483824 BLAKE2B 1685f5af9ffc3d879130741d7ada9abfdbd0ad54c47fa44cf60425cad9637ed2bb1c787e95193c223be44dd03c04585e27210a53f3cf518d354e698eff48a13d SHA512 897bb83515941724eb2b580887d75627e4113b87f57620046fc298cc83e4a7ced5c49320fd0f2c71c7fbd976b69be796702d8522067747b6b96e766d04d911b1
-DIST amd64-bin-libreoffice-kde-java-6.0.3.2.xd3 27332736 BLAKE2B 6ec2d1b3e66bc05bce17706206fbecc8cb00d1d472795e1b194286e2da4137aacb97f8fffe86b8628d61c3fcfd95e766ba1e58c0aca4f1ac7bfad26c143a1820 SHA512 7116c9ccac4c6453c5f859c12157ee908ad718958922b3c7cfff460319cb6b214f177f1f922fc670a395ce08630987b7f85497dc20f5802e5d2fc4c1aa7fbb45
 DIST amd64-bin-libreoffice-kde-java-6.0.6.2.xd3 27132579 BLAKE2B c7f406f0e2d3ab088985b504ddc3bf9c7e8feb1fd569918f21161dca571af134d5cdbc1aac7d00f5a99d8b943088f711ba6066009a7f399826fae85bc5b3443d SHA512 934d5faea55ec1a8292c3d45a6621e773f1132a51bf513703237b684b22784acbada8b6e5fa0e119ee4ebcf15873f4d7fc56aa60007632da32ed8ed54b6ef1cc
-DIST x86-bin-libreoffice-6.0.3.2.tar.xz 82383316 BLAKE2B 24841434c900c08fe8090e1981cf700b671dc19b7e38bc4d2a228dd86a31feec70de4c569bf9fafae48ca5adba7f7822d491433dd9579a889c9b29da319d00b6 SHA512 c9f16eacdc3efcb30c27df072851e31f519de421254b75196e566c594ae7bb9dab89effb37755554db7c24293bd96efd3647ab586ca63d20cdaf0f69512f49df
 DIST x86-bin-libreoffice-6.0.6.2.tar.xz 82803120 BLAKE2B 0257d683e1c567076619303302ae29497bb27ecc38504cec731a71b062d0f7c815dcb0e0c1738a7fad2b22e619c4d9e96932e8cb2b357923131ca50f90945a62 SHA512 8d84192778ea5f3d08c4e02cbb78234dbb5f042e17e591750659414e9bf4845155cea9a0435ae51f5cd3e454df8149494ce4407649d8901d15a47b591c0b2575
-DIST x86-bin-libreoffice-gnome-6.0.3.2.xd3 15746873 BLAKE2B ea6ba788dea6e4bf7d02359fc9278306536d6dc67fd1cdf034df012ce66ebf0ffed7a1992ec3630da8788516a07dc4960b7afd1cd885c959f758af80c436b13d SHA512 227556f927e1a9b02120d280605675e2b89598cf8d0af14074cd2caf12da1a939b275c9c720c3eb90319ab88ac5c452e4e84a0dedc62f4b0d02c3ab015503bad
 DIST x86-bin-libreoffice-gnome-6.0.6.2.xd3 16698373 BLAKE2B 28926e6691e420aec86c4ad55f01e34a40e5eb3be326c65e2340d794a2a779a57f55a60f596c48488e7c07bfcf597658b77ee4aa0fa88ae06f042590d4d29eeb SHA512 3c9b86e16a5d9f6ca4d0b4d54401641d344ed7ad49bd5dc4425f6714b60d8538dc7e35c5223ef75a18993fdb221d84673885f7078d235d423a9aacccbeed567b
-DIST x86-bin-libreoffice-gnome-java-6.0.3.2.xd3 25278665 BLAKE2B 73f17e5a6f247aec8183af3602a0e006670e128402fc313ee9421a279a35f39fe4143351df5570e2210fa0b1fe8380f54a719275ea8f35a64883209d599fa04c SHA512 0910cf556e3f6aebafe95f9dd0db45bbb90032f42a4b0245a2447b82f0cd0dd38837a499f4fa308409866fe0c3c3daa8601d75ab831fb5e5e521a02a5984542b
 DIST x86-bin-libreoffice-gnome-java-6.0.6.2.xd3 24522170 BLAKE2B 4bebdb968972ec06cd6ff65fad101dd857ac7cad3e1ff5c60396cfe24c75ebca2c9a043568444fd20e1b359531ab2902a818e954a98fd51d0396bbbafd6ff8fd SHA512 cf654354b653d682b79b22709ed3129f593e8f6de37f20e643125ebd3f4b0684e607d2fbe86ad0e69d10f113ddbfaa85d05d0f0e534ab5655fe7fa37265bd75e
-DIST x86-bin-libreoffice-java-6.0.3.2.xd3 22891551 BLAKE2B 9c83e2028c83f4b03cc4ff2b09fc207ef7dfe7168afb982519ef1581b06d97f78852fc92beebed3af04c92619d4852bf2e087601f02db6ccd3ebebb19ce8a540 SHA512 ef3b518da2d30ebab5d3a86a672adc696f68a970ab69cfd575f9687ea257985d5ccdde68587803830ad2583c1bfcc3f9e7fd30c70ede3abd8bf34b3d978c1d8b
 DIST x86-bin-libreoffice-java-6.0.6.2.xd3 23279002 BLAKE2B fc540ffbbab1d9dc5c1dd4a05425d2682188e9245532f1cc855277eda8f69e1a4e7d6f3a6ae1041d8b2f66a9f220bd2869fb2358ae7ed658b2e793ea6960986b SHA512 b953afa7faa715a2713e0aebb7fc740f9dbd7bd10830385d3cb19530f6bb4714dffa59eebc42656fa92b12b70bb71825790bdd8203a1874f0aa2604b4e736934
-DIST x86-bin-libreoffice-kde-6.0.3.2.xd3 14377062 BLAKE2B dfd9f68bb720ab03b13c3b5af83d43bbbab28ac5f263806aa89e140654b8be2a6ddf973a3ba26d97ec517ecd97c939517376f3bb8214d38bdd50d844eda0edce SHA512 d87c81ff379e3d59f014a4c14397c4020c5022db353cd5b1e00d56a4cb9aeb1f3e608b9ec1396fc54bd54c8fecd2e48cccce6cf0f4a0831763703f6f512e2fbe
 DIST x86-bin-libreoffice-kde-6.0.6.2.xd3 16613416 BLAKE2B c10e126670a948f60f51f935150d803a20e3f26ea43822173a8d31818bfa851b52ae75a038bb8fa3ae3e3547459264ce882670e88d2f132bf6315a2aa60504f4 SHA512 f857c19d0f6f431be9e9efb40daae14b5f762bf2580024215fa751e9ccccc3dbd368b5214f1669f590f54870e8d673be58fa57eb9bc452fc4f3126c06f437e7a
-DIST x86-bin-libreoffice-kde-java-6.0.3.2.xd3 26149695 BLAKE2B 7b8d349b888ca929472a519161ea915c3737cdbabbd4fdc7f850e326efa0cfb24890eb1c13e77ec600878bcd9ec22be87cfa1fa63bb692a739872e2264c28742 SHA512 3a3dbc2824afa8258ec546e500c6e232b8db49ddd489f63ed2d23d3492865bf7fc473518b115099ff68917e91d96188931b870d54f19602f3c8c3e37a5bf56cf
 DIST x86-bin-libreoffice-kde-java-6.0.6.2.xd3 24393402 BLAKE2B db927aa404b4b0d6e9cc5f8be019e5701937f3fc2146d731a8fa007ddedf5a992b1f36c4eb4e30f20821b497d20011441db305d344b24831cfa075a232dc542a SHA512 f42defba10412acb0676fe3e23dfd39a11456812db908ac1e8120d4ef9cf95fce6d1cdcd344c21b6675e17b8117488caa36b0bc44bcabbc77d19c95ac8789875
-EBUILD libreoffice-bin-6.0.3.2.ebuild 6725 BLAKE2B 1f2422c1a1494f1d40f437134e49d88140f0ad8d5a673ae0992f08dfa3642b057c0315952d7f73891f458929d9d54da3f46070ac59eb3ff0c073416472481d48 SHA512 c886bab7dab9c99839bdd18d497f7bea12379fa7c5937dacdaed87cabf4d1562a9fee2473feb168e56cae85f42ae3d9e9391b273ceb95ae1c5d6094a99506429
 EBUILD libreoffice-bin-6.0.6.2.ebuild 6792 BLAKE2B 24f3505fe905125205eec9529be539352d8418ab4b8fa2cc1dede6ed841cdda05304fac9d71bef08236f16d375133dcb6b93142c65689764060203d7ad0013e9 SHA512 b5a2d493c5880dc772ccc2abeaf9b8eac9e1a87c44d08f912be30dd1ed3f897a7522edb27e9ddafffd4550adab36428e84707b50e6f90be1f27dd5e3da09c02a
 MISC metadata.xml 510 BLAKE2B 3c08e88fbf4a981a3adde50ee62d59899f24f87b2aee7359bec6c337adde486096de536227d81b1e3eeb2a27e01c08ca1d91db6d9311e0d34211528f63aea23c SHA512 12331dfd1fe409ce5a65bcf1ce8bd2e23f2e789b7009216e987b861fde897b78b16487399338af0e94e9e40da70ba32624251d71de5aae7d5b23891f54a994f0
diff --git a/app-office/libreoffice-bin/libreoffice-bin-6.0.3.2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-6.0.3.2.ebuild
deleted file mode 100644
index 47d6493690f4..000000000000
--- a/app-office/libreoffice-bin/libreoffice-bin-6.0.3.2.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-BASE_PACKAGENAME="bin"
-BASE_AMD64_URI="http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-${BASE_PACKAGENAME}-"
-BASE_X86_URI="http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-${BASE_PACKAGENAME}-"
-
-PYTHON_COMPAT=( python3_5 )
-PYTHON_REQ_USE="threads,xml"
-
-inherit gnome2-utils java-pkg-opt-2 python-single-r1 pax-utils prefix versionator xdg-utils
-
-DESCRIPTION="A full office productivity suite. Binary package"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI_AMD64="
-	${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz
-	kde? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
-	)
-	gnome? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
-	)
-	!kde? ( !gnome? (
-		java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
-	) )
-"
-SRC_URI_X86="
-	${BASE_X86_URI}libreoffice-${PVR}.tar.xz
-	kde? (
-		!java? ( ${BASE_X86_URI}libreoffice-kde-${PVR}.xd3 )
-		java? ( ${BASE_X86_URI}libreoffice-kde-java-${PVR}.xd3 )
-	)
-	gnome? (
-		!java? ( ${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3 )
-		java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PVR}.xd3 )
-	)
-	!kde? ( !gnome? (
-		java? ( ${BASE_X86_URI}libreoffice-java-${PVR}.xd3 )
-	) )
-"
-
-SRC_URI="
-	amd64? ( ${SRC_URI_AMD64} )
-	x86? ( ${SRC_URI_X86} )
-"
-
-IUSE="gnome java kde"
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-
-BIN_COMMON_DEPEND="
-	app-text/hunspell:0/1.6
-	=app-text/libexttextcat-3.4*
-	=app-text/libmwaw-0.3*
-	dev-libs/boost:0/1.65.0
-	dev-libs/icu:0/60.2
-	>=media-gfx/graphite2-1.3.10
-	media-libs/harfbuzz:0/0.9.18[icu]
-	media-libs/libpng:0/16
-	>=sys-devel/gcc-6.4.0
-	>=sys-libs/glibc-2.25
-	virtual/jpeg:62
-"
-
-# PLEASE place any restrictions that are specific to the binary builds
-# into the BIN_COMMON_DEPEND block above.
-# All dependencies below this point should remain identical to those in
-# the source ebuilds.
-
-COMMON_DEPEND="
-	${BIN_COMMON_DEPEND}
-	${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	app-crypt/gpgme[cxx]
-	app-text/hunspell:=
-	>=app-text/libabw-0.1.0
-	>=app-text/libebook-0.1
-	app-text/libepubgen
-	>=app-text/libetonyek-0.1
-	app-text/libexttextcat
-	app-text/liblangtag
-	>=app-text/libmspub-0.1.0
-	>=app-text/libmwaw-0.3.1
-	>=app-text/libodfgen-0.1.0
-	app-text/libqxp
-	app-text/libstaroffice
-	app-text/libwpd:0.10[tools]
-	app-text/libwpg:0.3
-	>=app-text/libwps-0.4
-	app-text/mythes
-	>=dev-cpp/clucene-2.3.3.4-r2
-	=dev-cpp/libcmis-0.5*
-	dev-db/unixODBC
-	dev-lang/perl
-	dev-libs/boost:=[nls]
-	dev-libs/expat
-	dev-libs/hyphen
-	dev-libs/icu:=
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-	>=dev-libs/liborcus-0.13.3
-	dev-libs/librevenge
-	dev-libs/nspr
-	dev-libs/nss
-	>=dev-libs/openssl-1.0.0d:0
-	>=dev-libs/redland-1.0.16
-	>=dev-libs/xmlsec-1.2.24[nss]
-	media-gfx/graphite2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
-	media-libs/lcms:2
-	>=media-libs/libcdr-0.1.0
-	>=media-libs/libepoxy-1.3.1[X]
-	>=media-libs/libfreehand-0.1.0
-	media-libs/libpagemaker
-	>=media-libs/libpng-1.4:0=
-	>=media-libs/libvisio-0.1.0
-	media-libs/libzmf
-	net-libs/neon
-	net-misc/curl
-	net-nds/openldap
-	sci-mathematics/lpsolve
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/cairo[X]
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	net-print/cups
-	dev-libs/dbus-glib
-	gnome? (
-		dev-libs/glib:2
-		gnome-base/dconf
-		gnome-extra/evolution-data-server
-	)
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	gnome? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		gnome-base/dconf
-		x11-libs/gtk+:3
-	)
-	kde? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		gnome-base/dconf
-		x11-libs/gtk+:3
-	)
-	x11-libs/gdk-pixbuf
-	>=x11-libs/gtk+-2.24:2
-	kde? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtx11extras:5
-		dev-qt/qtwidgets:5
-		kde-frameworks/kconfig:5
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/kio:5
-		kde-frameworks/kwindowsystem:5
-	)
-"
-
-RDEPEND="${COMMON_DEPEND}
-	!app-office/libreoffice
-	!app-office/openoffice
-	media-fonts/dejavu
-	media-fonts/liberation-fonts
-	media-fonts/libertine
-	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
-	java? ( >=virtual/jre-1.6 )
-	kde? ( kde-frameworks/breeze-icons:* )
-"
-
-PDEPEND="
-	=app-office/libreoffice-l10n-${PV}*
-"
-
-DEPEND="dev-util/xdelta:3"
-
-# only one flavor at a time
-REQUIRED_USE="kde? ( !gnome ) gnome? ( !kde ) ${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test strip"
-
-S="${WORKDIR}"
-
-PYTHON_UPDATER_IGNORE="1"
-
-QA_PREBUILT="/usr/*"
-
-pkg_pretend() {
-	[[ $(gcc-major-version) -lt 4 ]] || \
-			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 4 ]] ) \
-		&& die "Sorry, but gcc-4.4 and earlier won't work for libreoffice-bin package (see bug #387515)."
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
-	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
-
-	local patchname
-	use kde && patchname="-kde"
-	use gnome && patchname="-gnome"
-	use java && patchname="${patchname}-java"
-
-	if [ -n "${patchname}" ]; then
-		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
-		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
-		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
-	fi
-
-	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
-	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
-}
-
-src_prepare() {
-	cp "${FILESDIR}"/50-${PN} "${T}"
-	eprefixify "${T}"/50-${PN}
-	default
-}
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr
-	cp -aR "${S}"/usr/* "${ED}"/usr/
-
-	# prevent revdep-rebuild from attempting to rebuild all the time
-	insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
-	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
-
-	use java || \
-		ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest
index 0f96f43c0904..7365d7b0e71a 100644
--- a/app-office/libreoffice-l10n/Manifest
+++ b/app-office/libreoffice-l10n/Manifest
@@ -1,172 +1,4 @@
 AUX lo_gen_langs.sh 1469 BLAKE2B ff7a1744a71711025812d5fb40e803f5d111069099ca9d94ab408c0307df6c8fd0bc0b645d67127bb0d1666787ea3e0c546349b26373e5067446f929d5985003 SHA512 d683506baad2ddab1375a006f237661736e78e2f81a93cbe2c168f6bc4f67125ca1fef152fa4f8adbd59fdaf2b00eb13c8697863b0ae601eacc97f7395ab2eb2
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_am.tar.gz 7989311 BLAKE2B 7ff6325d64d79df5c4a4785895a8124b694dbed8cf531ed0fc430a5eaeea5150d907649108523cb7307e76b8bba6667a1b387c69319a4f97fc89d0d0e1a04e01 SHA512 ed74a073453986b5b1ce9a10c661019f224e5e759a221b1a82dccafee346c686aaabecc76a10ee40f57c06840a5292099671cad6d76cc85ba7e579a13f0b2b1a
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ast.tar.gz 7905060 BLAKE2B 2276f2fbffb28de02fbbd6aaadca9f7e9e91f6469cabdcaba2774c47b71b4558c0b832d1dae196223b23781e67fb068dd3be37b4bcd4fb1e6cb2d9c35c456e54 SHA512 80d01b4fe97857de7a44cc2df14f2ec835a80ec1ba2b29f75f69590288aa496158654989b32bc678b528366171af4278125bdf0a48aa96539443124bfe443283
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_bg.tar.gz 8465944 BLAKE2B 4c8b6f310b2cf804562df7718f9d9020f0fa06549136688e82aff2313a86f0bde314895417f04757b5da84e0f75e613f93c0344a62f0d5e7d44f8d6dd73f4c7c SHA512 308eb6d78746696456a91b80e95cbc10642d6594d47c180f85924457368755347bc9d949d5e8395175dc5acdfedd88b350211d18fbd61fcd99ed04d493fbdd93
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_bn-IN.tar.gz 9145265 BLAKE2B 03a40f0d4c163690f9737745ea4099bebdfcac79f330afd90fa3e1c8b720a32c30430c0e6f5db921f7227e1a04a51a4aec67468e01626280e5a7e583b917a306 SHA512 08b4fccf40cb5c4d95351b19eafce7d138315b1566fb7ff4974368a31a2875da0e31adabc0af099e3d77fdf99806b659b44fe879a771effb11001963f973dfff
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_bn.tar.gz 9145077 BLAKE2B 11db29866225ed0198cf1a792441ef423a969ee33f402d70c88e36532dd6952716e13169969c254ec1aae615cff1cc05c4adc4235799283a64dc30e4063e8f8e SHA512 cd4b44db2b0d41c5fe5c64d6d5b6d9a17477c850c691f759966d0aa8db1bdbc490ee4ec0e6a35eb457b6fde9fc89611634a23181232eb91a91663bd4402c772c
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_bo.tar.gz 8890766 BLAKE2B 2dd15400c6338bec55b3b87d4cf3c216f2df1e4c11180789a85284935289a033f14a2d9b7b2a696deb3c54944db21f673977ae33cdbdb896afa1aa4ebec70f90 SHA512 ddf25cf1d50d69b6631d4b1b073ce601f0429422deef7b0b9fc9ed70943f727796f53967f3843b309670ee490e92b90361f18b6258f8617d47cb51c9e2ba4a3d
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_bs.tar.gz 7210660 BLAKE2B 774cc885d9ccefb3272f930428c44b2796c830928a31e748189d0cba33bf5b7b85154263dfa5167850c2fb7b7041ca21808fc53acc172b3ad62a26cf4dd020c8 SHA512 9876fcfe2776c01632218f2025a305894a828f2087b61a4c1ffe0afa400ce72c7858aeeb18f46b4a1e4faa85f2cdee0295b21438de2a8b94ebbef4a6c10e5afb
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz 8091859 BLAKE2B 79cfe1fd2699c8f6b399c9c3fab35d776f24ca97fc592903a62b1db4b4de42c1166abf1bbc7b552c660a611a94e131515e1d3f4f923476cb5627609565e1252e SHA512 67404f9a73c749fecd7edf689c4d7f25b901278368cf24e1c20f57b7d3a8a04e9fe61782556215e9d6e33ada6d80c1812c56631942b93618356f5128b528a50a
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ca.tar.gz 8095296 BLAKE2B d6433136e6044ca936dc275722d16be86cab3c4514b078c44d9d437ef66f2308162bc671a3ab0b34159365cdcb31790cc9c35fd7263e435a300470701a75c6c4 SHA512 b88fdc80bf4dd193061d141b9c4f6e0deec86d9fb4db435f3259fc4cd1cf4bbd8dc22802ab2ed9abb36d5d4f7ba014cc52586c78eccb69b0b16a07f8fb39aa7c
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_cs.tar.gz 7798311 BLAKE2B 89a9d236ec41b2d8f64286839e99acdd735ea8a72d7b5710a1f0e9b367baf82ce22305ff27ae0db3e4d0a3c714cdab448011a5b50be93fa48829bd5dd7211b5c SHA512 1f740b586430f62d770f8bba86ae6cc4d5292f6f27b3957d9ffcce06adfda0348ce0f7d2b9858ea08df5dd61549549d6cda056a01c2c837a9341d10be40a5599
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_da.tar.gz 7725962 BLAKE2B 9c84cfc2599c14a8b92be833debc8eab6474a4cfb79613e9389955dd6b395611152e21a77b6418f8fda60f10c22288c5eb2e9dc55745442d84c2e529eac08c29 SHA512 e54f20f53d684786952a490bf24a10217a0dc30e61094d6a41686dc972ec84620ab837bac5b5aad8ad1c53d76e23cb9424ec74dbe40b2cb9348bb36a211d290b
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_de.tar.gz 8226939 BLAKE2B ca261cd3f6a1ce1b8d7c681b1d8cd83790ccddbe91ddd3d8779b7d7d0fd57bd7e21e9f88bf78b48647dc59a42fdfe572756299e409bfa87648cb2e7f16e9a349 SHA512 da0c71bf351eff40581b0c824587b256a451e7af01bd6a80310f591e0c8f8e27903e33ee7ffd49721acb79671c0f411825495ae7fcf63a4a590ed3fffc715ee4
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_dz.tar.gz 10265396 BLAKE2B 817051fea80724cb18d5b48405127afdbbb9290b9825973b997dc1e4fc648536a53f626242313bec40f3abfb27c318e3bdfc965bb7bc6b2459842576605f6edb SHA512 b85f8019dae65a9d3a83bdd5379b67f3cfa54b3e98d444cf2e8ded743f655c27fa25c1336056b3296f82302ace1b4af15560209992b1172a5c1f6deb806ad67c
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_el.tar.gz 9115031 BLAKE2B 346dbfe36b6c79e2ca4064f8d9382a6c31904f1bb62ad7fc44f8ab174e795d373fcc4a0faf0565fd515959cfe58cca786488c5e485311f260ecc5f11fe5e81a3 SHA512 1a1da4892a3ec3823de4ea1c266608d7d8ef1ef2c8f1404a3ce77ffdba21b6b6fe5d851e62f9550bd1b3ca072022b4c156fdd19aa2667aa96690df1c369361be
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_en-GB.tar.gz 6554650 BLAKE2B 24bccd7bee32726421ce2eca65256fcd2ca9b5f3e0d6f44df3cf24da667b6826b8bdbe07b5ed5556f76e40e77be9da88d6a7bd0c851310752f38c4e341ec2f6b SHA512 ad8e72030213d3297fca7f8f9d70452be7cd854e7ca8769d02d05cd8308dbf07e5a2f015ead6260ec9c725ff5699ef734e1adf2f71891ed4317804a6bb5d304e
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_en-US.tar.gz 6590364 BLAKE2B d428344d5ae8ebb00337e657daa5a0255f083e230f9620678fe904fe558b5277cc3b3e6d18facc160660a874baa6fa0d551a8ddba5c74062dd0f5f3e03b83cd5 SHA512 672b6dd87838a604849c3b78ad8f7693700532580ccc0d13d27343b7656cba9a38210d78a111bd459295b6dc64c5d8c020ac930741060d7f224110da2895f37d
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_en-ZA.tar.gz 6533263 BLAKE2B e13e6e4d30b78eb70aa27ffcf4ba5659f75afb5682694a4d98988fda8a01a674b275b3ab0175f5238a7dbc58ee51502670e2d2d83fea93c27ecafef7676609d9 SHA512 c94b34403433ee52e550cda1814cca22e030bc9a8f088b84573b78ec6d94dea04bd0666e59ed3e3e894154c6232751cd881b18e60e334e7ff3889311f1fc21b0
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_eo.tar.gz 7157624 BLAKE2B 4a143cb23ae81da1b4d64c0f51a4bc7646c0357b146f7e15e15ceb4d8302601575906a73f38b1f1b7fc2058d09fea5ecef65b42c8914eaaa3febc85cad566fd3 SHA512 65d650a32b9206d2d9dfbd17fd0f223570048f99782d617758081912a860a95e38a4997520c83897a16f3080d62e219e2362995b07585edb7dca9f92e9bf71f9
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_es.tar.gz 8144158 BLAKE2B 6bfdf9f51144cb9e888ec8095bbd72899053f7b960a72d40b9d219b4e0c31ba19af26a74d3c864a45ba9e341edf9fcbadc28e776480d7427d1680d71d1a27b68 SHA512 f421ca8bcd611632cdbb0349a929225fe201a8c4849b20c8db793f99220330acd5732845fae4cfbfb8cc569df0a03b8d7e16dfd66a88e754bfd025c6b619ab3b
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_et.tar.gz 7654961 BLAKE2B 932e35e191ae920197d8305d50f3de33addc506ccac92b01e9c3d200984f61dfe2124efd2624100a2665d96411c47f9b6e8df2507e615b5ca9549135b0893f4c SHA512 5f735a4a2da994e8feb751823cdd5c197535fd5068431a5882b92ceb21771d98f5c05bd51adb7b5f3a32b16ae27cd410a731e96daea5ef5be9aa5e81258c64e0
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_eu.tar.gz 7717305 BLAKE2B ee6b44370a1dbaa8e06ccbf8e236f82ec389500f681e87596ce86bd4ba84f40b903ccc38535373b9e56235f00c28a919041ff647e397cd173f3ae58a20015fad SHA512 5869b9daeebac9bdd76d0c5cf4b109c286a6c029b7802a3127a44e6f16f8a40811a32970aed85853ae722a6e599dc9d533ebe35ef5e2e2ef8c466265e73a7bbf
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_fi.tar.gz 7893417 BLAKE2B b788932646f036746a260e3ea850a7a5a078c0b685c5664ea7c7f35bb1446e67d645e36ed7d3847721d557afdf0a18ff4b26fc0d7e448219fc2587e40e96bfa1 SHA512 798dc204e27a026e7a7eebbadfd46ab16d17514e3a56e2cf41017cdc728f16ae68757bee730a87701e4a358a4108501f6fc07cda561ef7a0384a74b5cbe05315
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_fr.tar.gz 8323839 BLAKE2B e888a95148121ef15e32fedcea276901c8995b00762daa5af30e09488763929576f2844f01256e8872f2700ff3db4b37b35952963d174f1cdc8916348f229f07 SHA512 49992b74f3e6f4dbe5de4ca3678325eb0197cd4cd997cff891ca96ab11844926955b7cc90d28c53d2ad2b3e4948a29043279d3c0c1123a5d9a80b2f510b327e0
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_gl.tar.gz 7808114 BLAKE2B bafdba8e5e253b22da4cffadae37fbb7cbc53f5f37f96cb3e78508f11cef1f08f93a0e81573733b9d9f54fa619362cc669d4c36bc609e145a59a48d2b4581392 SHA512 cc669806982901796826f018febb808cef6ad1a35a9f7c46bcbd0fe0986d42b9b50011bc28cdddca53ef2c462462f94677ba849b0d046f9f696415e9996d2d35
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_gu.tar.gz 6750455 BLAKE2B ca67869cbfcc292c8d33e716adbaa11537f0c5fe7078122e96789544412f45a7de8e0fa0332a68cfa90aa4e5cdfc0470e5a5af2894ed764643d5c200bad4a7c0 SHA512 329a0120b0e20cacf3e4b0c226020d8ad382658ee3c92e640ce02e82d54373e2444f03092cdccc6a81574ae2dc6c1fe3c83c488390e9a1667780e7229b895c3a
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_he.tar.gz 6365074 BLAKE2B 0918f2db4f14dc8a8eb8a6d068468ca38ada46262218531beabe39a257f5a9745069c7e8199f1862945f713deff7850266d664e07040c877721af10d5a63b8df SHA512 6095203834c97ab8d67d628e6e3aa1f3918148cc4d9b259fbd428388801b017f44ea14b4bb99bd2096e3a3b52b456b46ed266abfbd35a9a4e88b65bcc0a4d278
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_hi.tar.gz 7397574 BLAKE2B ca3d683e1059717f194b075f292c41aa1aaa50d7c989c86b9cfdc0617496e552365a28170e12c920cd11662db23e4a307d739a15b03c0d668a103c036773001c SHA512 92328fa4a58bfeb04b4948d797f7e61c2c9b33f32589ea21b6cb11284a355b8b9d3219b9d2236ca9d152d35c6a6d3cc7d52ef034db583e9a4721d348fd736392
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_hr.tar.gz 6903240 BLAKE2B 6907e025fe05b99e55896d1e7ba59b7f377976b5f544ecd97e2cd2165db81124311501c81272113497b80247af250417683fce3c640f56cf80acd14facad56f7 SHA512 8f64447b055184e198bbcc12584e0070fcc9fa49e25e0693f7e8ea050dec183694f256c7c18bd6b71b06cce7e13beb17b0033480a49242072d79f199bd4abbc7
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_hu.tar.gz 8220284 BLAKE2B 45624b742df799dfdf42634636109a59ef7dbc0b259f25bcc00f4116d5903eef6a4a710aafab39de780b729fb09cdd53dfcc162776f70d0203cedf8e47c1b3c1 SHA512 c73fbb407988905a9eccac1e5f547c14e6f2c80839699450e9dda09c08c0def6f923754a4b6d29ce70d343d12bfdd9f93a7e9a0bd3f3d7172d018790cd5fcd2d
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_id.tar.gz 6967346 BLAKE2B 757a6f8c3c2026aa44420a3fbfe95b071f8b46e493af977173ac4384e9f86078ae6a9ef02f64658b4ddf3885cc8e7b768ebc1c70f48fc2f04eb652eba258387b SHA512 065c7c495cb98772de9336827cff0550d926ba6a0ef18cd131ddaa69a5e367f9012619aa2617281abaeb7336eb86f65ada12c378e1d4be0b21f807ed529dd546
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_is.tar.gz 7029490 BLAKE2B f1e2fddfd7f3134c57d5f6b6013523c8fedde87b56d2113db55a0ffd6cbed21a3ca1e391a5907a6b9a225371963ea5da6bbc8b8905a02042f6aaaacd21905f81 SHA512 3217e6f3ff4f5c2a0498fa1733d84d6af3e8644921c962ee50c1228bb0851235eff453a73e1e48996dd488a5bc94790b8d5caa9678d275979625ca29a5113cb8
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_it.tar.gz 8075985 BLAKE2B 7f68c73f4f57c43eaabffc6cecf6be1a0c1583defe2fb5555b293852926f052bfccf654dbcc7b84b66c49a2aa8ec0f9e944713a169a2d6e2b3d2d7c64fc94e90 SHA512 20cd314e4b37d36725d392a4cc439a6f1e0121f90e15ef5380e85d22070ad752952616af9d03308030359102c1c0d043b8efd1050ca5fb2b545f87cbabee7bc5
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ja.tar.gz 13166104 BLAKE2B fd14a5436c6c0680d24949a088e0dce1ccd3dad5834ee3486218e739c34622e9ffc72b7ff6ae7b39d74a5d52b3a6ec5e1e8220c1baa94ce4d9332d6bf4fe8809 SHA512 2e399a9605f5a7fb69b4805aaf86a00affa836fe94ff4ae52240f12dbd3fdae9a9dcd407d9c1d52f2f9c371114016a7a971cfaf10c4a633532e786c6e0effad4
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ka.tar.gz 7192674 BLAKE2B 7aaf25890c5e1f44e8861eaf74e63579cb99a157f938809976e0581be63b4e058deb60900b497961b2516aa1817335ce0af1b962997aa7a5055db7e8f5229871 SHA512 504c31ad61024628352a193f17553f8649d0630afbe9d655ab54ee27a7a49b2d49dbc9832db3abb13c37b2682f2262437a8d37ddb59626ca8bc4e193099c03d6
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_km.tar.gz 10329080 BLAKE2B 08d8fbce4b20ecce4e07b76b3c355ccd480e615cb924669991b16452c7005d6d017f41a6dafa2f03fc445d612263069ca66c4e70812d109fe3234fac3a7bdeaa SHA512 e544661d2796503a61895bfe43dbeee9e52db8e116208e4dc92c225d83071619f3fc841c6bd905067fe30ae3302f07294e1a479a74e2f8a9b6ce31bdbe21ab2c
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ko.tar.gz 9435916 BLAKE2B f1122c112a2300b99721fc9d95c98ac0b50bd6ebb26155e5102c6081d1d80fe20a5da71d2fbb658012f2ab3e3875f7738bfe8d0749d0544feba2cf3a89d69df6 SHA512 72ff0f91f3ad7966bfb171a77fc21b1b2790e27a1df317a4c882d7deebb02c6ac3d436656b3f51a63c70ccfe5e2414096eb791b137f2933252d9edf71c7b7fa0
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_mk.tar.gz 7412218 BLAKE2B 37be769dba08595a7f4218b33bdc98994b8bff5601170460768698cd10e61dbd0affd2f2704b4a9967256585aea9b7df81570339fdfff2a9f0ecc0893cc9e5a1 SHA512 4ab978ee92a276bec05c4d49742ba964ebecc23dbbb515dc6fd6926b7b71d01ab7570f2eff065d956fc4cefef2f7dd4a08348264c099d31e471158e52c9100e6
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_nb.tar.gz 7765933 BLAKE2B bb5b0b98de63b564a5c99ace2a11ce18cee8f069b5480464ecb97a83c07c66a2f3058276872283d49fe2e690a3b4758b23c6ef0880c1c0e913a6411100fecd58 SHA512 86805311909343fa0553bee4797c8da8df6d60b95f64b353153c628e509b7d18e16f7adfa6165e3c2656d27025931ee086aea263950c387dc25e1cef777cafa6
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ne.tar.gz 9751156 BLAKE2B 80d3580a058996b3eaf0b76b9b6530639ab664246f7af6a45de7e70b26e630ed1826ccd76466963c4bb6a52fa90eb424d8bbf503c6fbfab5cfeefb8bca2a9bd2 SHA512 ee66b0abbbf063c96c34916e51c25cce9f9c689e31b96628636881f94c181b766859b168392342c23f5203a8f9b7844c899f5c611ee3b2539104501d1699b325
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_nl.tar.gz 7878704 BLAKE2B bf9b6a2250bc194e6f404e7417dbfcbf1de8f1b6950123bbe07bd3d96bbddc425f615274673da148c1c013582459c2d287333d41588cdc4b1f563626be29ea55 SHA512 ef76fc1d27c3064c4255399d8847696fc1cea3e13c9b0a96a8130009701529eda92cf185b02ff862c17133eff823975688faac7629851bc8dffb1de6fa2dbb36
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_nn.tar.gz 7755657 BLAKE2B 5ffc38a49bb6e6c8b4303c3a369f5346eb1e38b13317586c4e5a05fe2689bb7bb4f0c35638cd93d27902f04ab197cc93e16f82146a7a0bb9822cc11c02eb6d87 SHA512 c3e5567d1c74a1850ca991874c9f6265e71943ce6eb2614619bd3ce72f564ee7b980104d53010026a293183b0efd5aeda44dc03c3273213c954bd56607f4ff6a
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_om.tar.gz 8063660 BLAKE2B a3251a68ffc8210f233d05d38354dfded22eb708f6c0b26aed423902e5169e19b3d7f596629ca1d8bb70699ff9fc8ec347623c862ed90f11a2350b50ceae2a03 SHA512 a604c723c473c8feabf267eea137f6ec856c1ce321c663175cc56be8e103707f36ac0628a59f1b7e65bbac45f4b70d55e33ff20108d2183621270fd4ec390bb8
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_pl.tar.gz 8231116 BLAKE2B e05980027ae453214c28afe056beea34c7ee4c5adda7460c29c9cfd4bbea7cd717a31ed47397b62e34e7ea0dddc9d4493f765c2bd4f141fd3797ceac1df5e33f SHA512 a31917596ec17e216ae02f0348410813822748e94da4adab84d34d20d1f258bd9d2c8df64f85e0d130c976aba48b03dc52c91995e68030a2f629bde72ebf4eb8
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_pt-BR.tar.gz 7889822 BLAKE2B 75ba89b9568d28844ec0b00bfbd8ea11bc8bba3544439ea493e4498646dd85674c9f094d97921774b58f9c55d21ef49331240174dae0069f56ae28ff681d61d8 SHA512 552f784cbbaf256cc3dbe3a8f616ff7ec8ad344a939d4a2c8358b3e07827cee6f1a66df22e6275cceb447b896aba7ba15e12044de956edbdc2d89a5c85170610
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_pt.tar.gz 7863264 BLAKE2B 57422282f406184c10799649d62e61d8e46f0efd04dab52d74f977c13a9a0de7939233e0f3966502798f5342febe1740c86b85bc12d9b23e6178912d556238b0 SHA512 79865350015eccf1036492fd898db54cc66065a8d83b7dc841ab4cb021aa312233c31eaa44450062ec500ab8e69914cbca4c251fd955e19b38d3026817c2a109
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ru.tar.gz 8502940 BLAKE2B 31941bf25ca32815779714a8fca6a1c4f3343addf7a294be65896894fa24d4fa0f2dce8a776c73fabf2c24200ed76b69aafaf1e27da1d0348fc26e8ae2f9a052 SHA512 710e3f76364b98e5d105ee79b741f24a2707c7d434d8b7cf2d401299de077ad2be9d8c110bf1cd14857a2f4edc3ba28fed68b9a2da069e2ae3fef1930d5b524e
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_si.tar.gz 7284109 BLAKE2B 092b55e104b83fce1909f41c35a4b3729e7b35b779611427569456455b25a97cb1ccc6932df577b2effd64667b107d45da1983585462e63659badfdd03046f29 SHA512 fb2b70c208eacdb3b640b9371709297e658f8686cf687f020bc6c2c8a8d906b260998a2130f8b515699976e95418676c637307d19e75c1fdc63a00c3a1b0827d
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_sk.tar.gz 7585969 BLAKE2B b3c0c320949fd851ca5318d768d26ca44edd6823f732aba87bdaf520753ff7a02bc24723f747ce4b4aa825afc496f953590d88c0497548acd10b053b1c251fa3 SHA512 0a5a14fae0a4d8c15a1aaba0d9d1ad8dd06336a22492aad602a903eb2ad6f731d956461ff5c94487b73e0e49a681943be3a35556fc1fcd3ce83df5da5ef1a9c7
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_sl.tar.gz 7898492 BLAKE2B c56cb4eb1a379349a929e2521081f4fb067cc485cc8eda73263f7bce6a93029a3acb59f1ecd1f8f37510247f2053dd269ed3a32e16d7c633e7287f73d44d30d0 SHA512 67382f48e03cd99179ffa673829fe41032af2c83260ddfca2469a0060f948207a7143c57f1650f516047a94454bc543a384dddf9ea067b6803a9e360f6ffce6c
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_sq.tar.gz 6940563 BLAKE2B 17744a6eef50f67f63459a903d1b65a2aca75a8f6ec191db79f49d9b114cca02094439838261e353a18802f5075e4ad52b8e9bbd81a202cc4bdb1ad7bd9af0e3 SHA512 28314d8279aa4b31e163fbc60a2aa46046a66973f11bd0476cbae123a57b7d0555ece80fe966e149887382c861dc9c3b98fc8df0746aea575317fc368cd21c33
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_sv.tar.gz 7823959 BLAKE2B 678feb869ca034ce9126821da03d6e079ad4e19eabb0ba513f17e8a9dafa13e9c4b04718b33ae0a23c0398f0254fbc180db45fc96428f42f1b47cfcdd4ff55f3 SHA512 826a5ec75712574f8b68b26021cd3e35d6505d44203123a7d9b1dcdc8b55fb4e0f8161b88ed846b4202ebddb19b24e2d2d647b272747ca02df59575380e46a1b
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_tg.tar.gz 7245219 BLAKE2B 0c2923151c449cbd316438d60435ae6b43dbe926663455386daf7e9db4f3eaea5e94d522b85deca22673a760a9b12acd2617c2ec0f0334828fbcc0e11c4cbf8d SHA512 9d0b970c10a76a5a093334387c4adb9e77b3d3bee8a4f7e47ee786b0f4946ba2a4f8ae31c146b7e4d68769b1de3350fae52b232dce460407b0e0be8e96853f79
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_tr.tar.gz 8067217 BLAKE2B 8c991c83bb35780b33c2da801254ff6b82b15ae57684450fe4a35ada0f1fa61ef1ac54ffa825f2c491ed53e164a6d4a3d56a5a50ee9a7b8115764a8c383fd318 SHA512 0f29cc6ceaadc5f73a817d8c6f37bfbfc4ca0716f76a92c0235103dfed442c6becd4d81279dbd0bb29027ad79f9c5bfb4f265729444982df8ee03f16ac5c3141
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ug.tar.gz 6935032 BLAKE2B d8f37421e29a75dff52d66c1552bac2f84e46ba83a863e95c907c420040443f20805b6406e055ba7ab23efe6ab64c45ccb48570e352e9eaf1bdab383e3511d66 SHA512 b55f5453df83e2f51a185f229421ba1cdbdb2b1dcc2c70a82c79ffd62e9a5d9b6725be5bdf5a247e4d5022499760d4c740616336f4c747421f17917f98759241
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_uk.tar.gz 7973562 BLAKE2B f244323e2d6e7924aa443617eac636fce8831ecdeed111d886265816ea94471c197321b40b54c02e46710415271331b2e1f7ba6c1cbba132f5fd312a93011461 SHA512 e82d88030eefdfe3e71d553b44e8b44ad5aa7996d93a5370413769bee24e68cfd9054e71b2d5cc49407c20be1bdc7c10365ef3a847855d060ec6c0c38fc69136
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_vi.tar.gz 8186044 BLAKE2B 40a101ef596f7f05059b7c70c4d5038f011bb65db8d0cf7c9cf547560425cbfd187e767aa9e4549fff2c0b59d864b81839decfb8794b08afda83e268faee1655 SHA512 dfb7d919d2da676eb46d71d1720e243ac625d37a864c1bc017ef20b5e0a2b92ca92e25e00d14c03401d03fcb5e59516fd2e2467ccc5078168e69a76995288937
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_zh-CN.tar.gz 10798290 BLAKE2B caebe9af62fcb38d333fa9ef30c9b29116a3a8cb08146dc16ce8eeb0a472e84dc7d3fc50f9be6720d67e4c51533cf2ad91bf6f0a642980ad93087dfd8d82a96a SHA512 ea09c6b0f9c243ca467520662a17e7e143474fc47d01cf330278bc6efb6fdf5993ed1b96fdfa7693cee7cc2cdde7a29f78b8b7b46b2f4e54c5ce4de79a88c73b
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_zh-TW.tar.gz 10719957 BLAKE2B 3aa074868a811fe64a8d449dfac10ca0cc1c7266bf961ce1f1f47302a6adb1c87fcea1ba8cfaaed1187af7f747591a45bd14531cef12ea3b07607114d5170b12 SHA512 67fde6230f4750adc6720e4fc2f8b038aed8d1862af0fa11c0f0dcc023b22177ccd7caeccd4fa2f5cf2a7c603907f7dda3410e3eb9f3856bb2c1eab16810bb35
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_af.tar.gz 1012378 BLAKE2B 01c56eac2bba65b9caa9978d36be1540807a17d9352ef77dc9869e7c50a28c118bbf756d48ab1d4155e431064ef688e0f70c63d144bc2bc650b82e25535c9fee SHA512 f2d8ee5042dfde63f4f4f401812cdc740acfae9976bc84d27473704acde483ebcf956c6f86d1557c06229799a301160e592712fb829bea99729c7c3658247ec4
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_am.tar.gz 752643 BLAKE2B 56a7ddcf56024574f85acc1b1371af541ceb9530670ddd44a9c7f994b829cfd0fc9dda4c60682b879d07e425e12e529d21ba9071a8b9322699171b7182bafe4d SHA512 3fa39d57568875fcb47000b7ff4c3381105918bf5a49286579fb7a7786a38d7e8333d69d27700c7a708f4031fea8ff20123aa4a671e1bca4645267fbb2d0f964
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ar.tar.gz 2424633 BLAKE2B 5cff7ded7a45ea57c7d56b66785f7642e513bc3109a79d797876914e7a032687765d65800e99bdfd3ef1f58121f8a5f008537ec1ff2b82878bed0f3646b6d6fa SHA512 b9b900ac8fdbc2fef82513e21fdc7bde9c38305c754a6aa9b05860e5ae0b9cebc48412f92cd4ba978a2296ee6170279dbbd5db1aae89b9f77793a93f01402b44
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_as.tar.gz 541911 BLAKE2B eec72b321502bfb0ee12276140b221a38abb1e58f29b11e1b88ed5affff66a427797d940d1fd0dff8a93ede800885dce10a61b625d63026761ee90b4fc4b3d67 SHA512 f3525d55202ff14f55a6a758ec63d130c81cd964890f7acd7fd2fade1681b9b315d9b65c607ad8913b466fea6fd57ae376a44795cd5d1fd35f256b25e19d3b42
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ast.tar.gz 450165 BLAKE2B d1a426d6e3c89016ad2a27bc446576057803a71d82e89618ebd86953caa43d44f1adea7244f4ce640168fddf42573f35309e6db94f43e43668fc035ff3edf728 SHA512 e8e4ddd20766f6ac8eebfdc78e29c05800e5c808b71fe5bc58708973a3abcf19147e891ade83253c1aa297b4ac8f9c82f19bebf1c2030dbe057f6dd14fc233a7
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_be.tar.gz 1074755 BLAKE2B 61af7d4c5f1a345ec68df09dad85bc9b21562d210a9cd69555433e3681f2ba6108cb9857b19bf5635931a8cd68fa249cfaf96d7f0a4ab77334f487d8f1d4b2f2 SHA512 d139b51eda7b8ed9562b726eb71fb5bfef6e871a09721d8996d63239a57a8e68dd37c70989fcf85a49a8bcf964db3c50eee3812a32a3be5c98b083dba639b619
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_bg.tar.gz 2203596 BLAKE2B 773ad993fa7cd0284289690c37182f9a6293af70a6bf0fb35f72c97954e29e9eee336a8fa72bfe62c9fc5c02cea9d4814a920cb7e7fb17b3783c11edbc48dc7e SHA512 d25bc29d8e9ed01f38019e2a6e4527adf98b4377e8fe523c4cd07d8ab0ec5d56c42c4408a7e8e2805ae4242242b76f92fb8c4404bc3a614c30d095fda7c0f03f
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_bn-IN.tar.gz 629667 BLAKE2B 0cf20ab8498effadcc81ef979a6ca8681706b480f45b92e594e04678747ee5217726e91f88af13e9e5c311645f064ba1fc4c91ab3216d03c7a896861ac9ff5ab SHA512 2b0d2573a445dffe5e2598ce17c244df4f4e0e8453306089b3082905d9ef96cfad57c0956ef41d78a59fbb9a791bce2d7c439ea7101df2ec33c28a7a5f412f24
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_bn.tar.gz 795090 BLAKE2B c25bd5759b40e6c98e2e5167a810637b54fae89556a40dca53a20adf7f2bf736bbf3d3acec1568f45d05f50bb1be68b403e293bf55bc398449f54afb2f7352c3 SHA512 22c4e92957e9e477d4c797c51aa5967e1f3effc3b4f045f674914dbd7f3910ef5dd21d3d13af9b4aa965a90a943c033e10ea81045c5fa76b9b6580fc77396e51
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_bo.tar.gz 386560 BLAKE2B f91999e207e99684bfea0da3343857e69943c755afd311651ca90cd67b04a2002d6f2b7277e823befa4130b183e01828b214f0c9fa202f403476d0f74df5c1a9 SHA512 5d146c06a8c177cf889316bceb6f341913bf60590c429322d266464cbfb4b6f5798fe282ecabe48e523d45edd247345184c57fcecfada3621490ace1569b81cf
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_br.tar.gz 1866680 BLAKE2B e2f4db711454ddc8235f521393910ff61ea7b14a432dda786455d83277e3c316f69c629b9ed66b1af552a71932f0e3797617c8a6edb169c6ae11fcdfdff9c33b SHA512 7571be459bbd2d9043e9a9a8f18979ffd5486047298cf4697912f508c4e123f47b9b1ecca5c533920df01dd6813eeb8f2dc5fd11dd82573859877fc410cb6f21
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_brx.tar.gz 342848 BLAKE2B 0a100950db3aee0f804a09f96eb2ec5818d94776e19536fbf9d70fbf62e0cfb10c3c8c2a7017f0541816b51d927a4e7ea75938b157f768f44c58d6bcf9b06b4f SHA512 28ff09320f4825f1f1b9561a36aa736c755f391bb710286dc3b44f5a6ab16ac991d4ba71437e569f066a9d54efcf6975c85575495a9921865df2874ea7bbd98c
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_bs.tar.gz 646065 BLAKE2B 024613084506e72be362924d8ac15ecbb9a034ae621e10ddb30230369a3d9ee882485c7831ffc4bb8bb54c5005cce10230d29f0a08bbc97eda75a4160c186ca0 SHA512 c2c3bc0cddbd1b206456d90a83306914857144b26307e97b73ec24401375294a694971bdcad14d2dd1075c8d3d5cc204aa0be488b5b2f4c643b13ba302aeb077
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz 1993796 BLAKE2B adc424cdf5d429bd4dc89a614d852fb537181ee22facf22e2e35c8d7bdd2cadd808b2ac291026055c6c19a4d80b4f74378f6f69a1b612110d88a4e22ef89236c SHA512 69b54e22ae065b1f455bbd785652b5a48f6159e7e6a38c8aacdb88f6d4e870a9ae3c23b5d7a9f87e26ba2734e2f3943780a57a982dc729218cfa3d97263e4b7e
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ca.tar.gz 2007183 BLAKE2B 0cb3a5080215727dde7488545da594087377a974115df4ba075c2129e8d6f5aa720e5cb6eb8120a99578027c0ae925e8865faf7e181b7ad99512948fb044c817 SHA512 165da8e5cd02610842693a666f3012e8c8cc4e6b5df0cc8da95f3a36ee066415b5a52d0e14d2e0544a8670be0a3c842af9f692a977ae83bd378a0aeb05b6419c
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_cs.tar.gz 3173833 BLAKE2B d9d55c79b7c2546b691511ca91d6ef49a06fb3ea5cc9eaf757a0aad1c6a8b9d4e41b4961e1a798c3396c8a8916fe3ed400d57ce1e41eabd7b42580bf30c47b5b SHA512 03b0ea85c52bee80d034fbc178fcb22631c43a3a9c8a053d1b4de9e92cf397dabf7a3c5831058b11ee6e9c40d70843bbda917065cbb18eb58d0438e602b06edc
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_cy.tar.gz 712771 BLAKE2B a41fb6d0d7a30c93152bf65d32e2bbd28ddbff989b0ad46cd8a065b19f9cc8c0ee96843299d40ea7cc748310067fb246e167ca070a22e3aa26714e42b6e66a5d SHA512 cd42c5172b0d150dd8a4fd16a513386398c30bcff95f67fb8384c731d36ad04de4b8d67ada5515c7ffa5806a717ee87770831ec6b249c75122776d7ccc144a59
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_da.tar.gz 2616228 BLAKE2B 0208dfc354b5335cfe58ac1fe751ab278a3d4e77599718769b022c089ca6b7cbcb4c888fd282c6bb093af693ce387233d8404e66950946639c33fce44e5ffe86 SHA512 bb059f3d181ab70e441eef66066c841d714b422966737503891b6fd2541fafb7b40f36af3705cfc1397c7c1ab9a6a10fdd96ba05359780c0bed480c4288183de
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_de.tar.gz 21743891 BLAKE2B e4fc96c9dc958f6701cd796d1333a4b192d41dce0aedd2ea61c1dbd8bd8ad969dc991c4fd347fe8ea14c453365db6451aea3e5b67da5de5e24ff8dd509e0fc84 SHA512 8f64494ab93044ad5fc657f213fb6330eccee20cea9d3435a92a728a0e79831c11a9f5e7a2a23bb894523b8e8540622fe4bc7aa9ad8a4104b05a6af911e1e106
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_dgo.tar.gz 449108 BLAKE2B f898d250889b589230c60eb6a5ff3b51b06ff67033208a7c695103e4a52ebf638751c56c700a4473868213f6c12bb1cf607f9c76ddd665ec8ac73daf1a97f065 SHA512 aa241887069ce3d84642c64a4de512b6327aa503aa7a16ae9a6bf08f8f41bfc7e900ecabeda83504fc939ed31353ec38c3809660339fc491a913f1971c589861
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_dz.tar.gz 373643 BLAKE2B f44f4ea9c8c9a403b297b0c7dafd8f99674c5c295c49beb475498caae0b4afe60498adaf10069df0283c98a6518f17c528e6a96c01434d550639a41569d1287a SHA512 40b5ef2947a1b7f0f1dd7aab6280499f285cb10840a856d1bcfb9b802490a24e180f0b859782ce0fc54c979bd5d60cb6ce1e79d1d1593261b3bdfc64cfdd88ee
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_el.tar.gz 2815421 BLAKE2B fb74a9c823a74dcb95996ea8b465ef31d5294fe8d2af1a2d8c8db177c9f4bc7924ff331254ea94597963f215b5918b8a1ce17197a6fe2de70b46abf34d4393bc SHA512 db26a52db6ed9533652ca0011c64adf17f1ec7d05c71c457d923797537f72814ef5062473bfd1570f52d37b4344f5223d94635a4214cee7558dfc89568fb3890
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_en-GB.tar.gz 7230572 BLAKE2B 2d5ba62757e5567d6fb4e5df43b03a60c15d105a79bd1f7bcbf399394d06c8dfc07a7753d6a6f5986e9c47e3c506ecf6e2e1d98b362262d33e3b62ae66c726fc SHA512 1e102c0fadab3c32d686e294ec2c8ecff7fb01eba9a5284d3fec5e72e76601a8b378d6fa72a9368e0f9592a6513fc0a3a3ac9e243a781d9f5a65469c09dccc61
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_en-ZA.tar.gz 6835443 BLAKE2B ec8d0a90bd8d7ba397f4b98061a8676208f5af1d211e41d77702c24400c1645a1e0befbef4f2e2e1d0d671fe3fa6ff9f4b8aa116dfb35789ad6874f25a31ae3d SHA512 1b169fc334fae18977e99a911f5084a8c95ec812cc154f6104a379d15632200c200919d47321a22ed7071730d366d0850c07358055f2533bf32c0ae606ae9009
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_eo.tar.gz 709935 BLAKE2B 584718c7e5643c70d5284303d4c2c431f31a3ca82c0813175321c7ae765834f587c00f6a951ac94d325a99d35e79a14b0e5ab00aa6318cd2be169e9245ff03db SHA512 10a6e90b96dd516fe5901aba6c98b6045baf197c6244628fd308cfa9101d1a252e54379cb0022ae4405a722a2f1b8fd988cf500f48ec4caa328c911d9cc7fdff
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_es.tar.gz 2208894 BLAKE2B 3726733a4c608673545e5b086ed744a5a770bddd668b1799f0a30c4e49b5a495d4e3e2c5948d122acc08026c84f46c172ccdb362dc0ea809092adb30bf169c29 SHA512 59f2edb7da9401a2c936ddff9302e1297a0cec02b2f16d6c8d60e5e946d56d4cd9d5bc6a274ee71286f8a9bfe82b6895b9c12d942c7197e01475d68484bd8255
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_et.tar.gz 1622951 BLAKE2B 1710ebc60b8aaf1b36b4a9b0d261bb6d69c522fe0421e5ccd9bc5e78b1af072f69e66ef9ba2e5db062ef2fc3c3ce19565d18b5ebbaff59a219db4b659b0da6b4 SHA512 6f4069a16ee6de85e031658694ecabe8754363fd2031b6ede7059285c64b163902e0dec889e3eba160f9e963fa1b282991eb7a33a06d9efcbd58ad5f8e7da8a7
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_eu.tar.gz 717831 BLAKE2B 2c32590078c9b605cc0966937c0574cc6cf55c723d1207a6b91d23d36a8090760e5d628445bc310b39548a64453ff8904573e968fa75014ac32be07090a57f22 SHA512 8906bdb4977d93ce6a24226a61ec765578a05fedea8a90c2f38f48eb6675cc7fff9e4864dce2ba13d158a1ef710310afe146fbb65b5276e3606ded207fc99054
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_fa.tar.gz 333791 BLAKE2B 84e7ccb64a09f5cc4ceff6d66dd9efb5f88388afda26c6ef806a5f0dafc9e195026dfbb097a0c56f5361b05371334bcc8f031bc3fbb840e79a1765cdb0d0609a SHA512 57085c5e6668d975640c4e09346e466c5edcc97a83ee02cf979cc9327a0eee9d5aa3aa59b0b70cdf9cb61faf9fcaaeb949fe8c0aac987f89054ae121d4e21b93
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_fi.tar.gz 723811 BLAKE2B f006ec6f688adc41a9e4f5f05fe6db3383fd59ac068e81f74b0480363ada91853f5f31f6b0d889cbe76ebbb022f85a50c7084a23198e1e08a6744c1ef0499aa3 SHA512 b5c3eeee63068e978e938e1da8d12d1b3485e7837e613ad752d128b0b10b45952b128b0a80127dc04101e9b9ef57fa47722be48cb2e6c78a2685d08295d578d5
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_fr.tar.gz 3021405 BLAKE2B 0bf0624c4f119598d5b4c51ccc68da5988b6227b03ff17ed9ddc88f24ebf535388271d91113ef590185576ba015bd2367a0f45e092e7114bc9d72ebc0da0f509 SHA512 47df9e0ff52e6dec0ac6ad538e69ea81fa5e8bd72031170b4782764f5ae30bd9595bdb46da17fc18c00a803fcb6939a38a75345bb489bc3905f25330ddbfcaaf
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ga.tar.gz 733454 BLAKE2B 8d3334ec5b5be3789e0c001f89f0d6930c084f1f9381e3e7702d6598c92c8d9d51e779f47683a1d6411d30f58963f9998000fe9e13f7f6ebcb584e1d171103eb SHA512 b175d5a4d128e5e79ed252dcb8aeca8f25987b142b542cc821d306cb76986e8849b1cb9e412aadb607eebd240e1b5b4cfbda7c7d9c4a8e71ed0731223d984b3e
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_gd.tar.gz 1770660 BLAKE2B a9a8632536249abd2547d491a151c338c4e22018943bf125c48ccf83c1ba030a5f8ff9c4399dd3cec0cd38d76af6edd058c6cb649605117b7551d2907182e5ad SHA512 f6e574d44c2bb68b409eec485873d41d0c21464c9ff5a9b633dab549f9755ed45c4b8e4361e7e5ce007270a0b4a00010562ea54263879d31fca9f410b8decd1f
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_gl.tar.gz 1283142 BLAKE2B c90282c6df03d1a29674115cd303d5f6297eee5255f52f01f696c4cfb6694f3e8703c9495e64127673a5657f03a54deb965563e06ea0695f68a072ac26b43ca6 SHA512 bd728730a894f7c65627d24cca74cce13bb70cee68e50314b94b05366a2c9b635a5bbaaf1533b2d6bc57bb72762130338940f3b78e0d4f1037bcdbb5e5f37699
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_gu.tar.gz 1240110 BLAKE2B 2d1b1cdf6fbf09002878bd894809cd4ac918e4a9c3f6364b1fcbcb80232d02ef80aabf0d71c476c2e81f1205c9db15db0a4b6ec90720ec86fe879575e1dd7acd SHA512 69481b9c5e45d434723dfbf9ec98044c0a609a47267a3fd47b080d1aca803cd9870a853ca88cc5e41dfc3ed064997e0d2e6c29ad7beed431600e826749f45165
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_gug.tar.gz 520565 BLAKE2B a6a3ec60a869725cdef67381b32612ff7baf1fe5e7eb6a55327027e0465d5729c720402e697ceb75a633056ecb99f634440c41a93729f324b330a9ab8f8f33d7 SHA512 f36e8bbea4ea0654a0253560a2cded38b93bb860ca4a023f32cc5142e62dce6a7076838511ab27329456da252c3258ba49102e53d8af78f8a49cb7e101d7f247
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_he.tar.gz 1632128 BLAKE2B 5f174757154b6d7a92e3f7cc150e1480f816eea3f5ebb945ad62711e990b8bcf3807edd3d8039283953a1f0b048f8d5f5e4a3a50edecffbd28b832d6d8bfa9c3 SHA512 84052724bfd8f49061b62174551fdea08f98510422c92aa83ab70115c04da6bb726e23d555ea998ddf41476a0b2a3773120f1b92a0108d1a9192b0291fc6287f
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_hi.tar.gz 579148 BLAKE2B 727166ca9c9cfa6f2c05bb24d8fead37163797171351e94d9aabd3a3e5f818459ef28520634ebaffc2542e5cd3c44e4265d87b86bd719c4f118259156505079a SHA512 1910f26f84c21e3ed03896dccaec0379edafdb93371c8021255be46f7bade41fe5ed5c4072857c282f2cb59ad7e3c3f027ca2b0ee9108f5e465f87c134c5fea4
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_hr.tar.gz 966787 BLAKE2B db58c8b82834ee30c00396f571d03f80b338589a0ce73a7991d261ec275cae5c348d54a5800ffcf274e4ebe8bf070aec8ed78a91d982b3ccbd79af9e8d415d32 SHA512 038823869520e3f452dbc6876cd092950a07510413c79a93797e415cd93ca7714e0fba678438eeae15ce0e4438c51ccd992196b80c08c25b6c7f2d23ee6a29bd
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_hu.tar.gz 2983695 BLAKE2B 252e70f0f033389eb24b8db388ad5839f956e40552e4e10144742c4fe9bc409de901dcc2dd72013e5966d0838d8cbec144ca0e47b794aeaf752845a1933052a2 SHA512 e7bb417774e8377d672b91aa97c5e1a3afa2b1642116523c24ab97dc6529ddcf8a545a0272190f28f787f5a0a0dd1d23abb04598b0e70d0b6e64dc9bdd5cdb07
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_id.tar.gz 693221 BLAKE2B 9f8a251532e21111a5ee8a6faa215446da79779d81fbf2b88add09add3d7bb304de6e64457dd6513f3b309300b86a0353fdc004eed65eefd7bf52d1eb83d06bf SHA512 f158ccf2fad8b169742fad29d13963d1dd864bb19ca97775d503ae50415ccaf2920caa42277fa139028dca3926c906029d0cbfd2a848535757cc1459b784dfa6
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_is.tar.gz 1502764 BLAKE2B a5d91433c1809b1296923dd73c39f73b94bb1a23538a7331f32d46bcff9ece5fdeef76550c5ab34fc048320ae69148d36fbb58e1135ee11f17530ae6b0582d57 SHA512 d4cc1caf6facb44aace876bdf68016bc424420b4bc2848f00096104f7f29b6d8f287eabb98c7b316ce87bc37fcafd5eb84651caf88c5f4fb8fc4c022f0422e67
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_it.tar.gz 2056551 BLAKE2B a66353aed2701a2fa9a0ceaad594c3b3d1f2fb2043877209a34d2c151a8fa49d1d48116769c24caf93e78690b85412ffdd4c05aaf90e4e54ba79cb7ed00ff0d9 SHA512 6b9e7da7875af5b00e1fa8b78319f9108877f0d495a27d9fd1d10e35c5cac245aeb4ce94ca472d7a35f6b0979872496eba9d0569ac5da74e36125a8bb089c549
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ja.tar.gz 807773 BLAKE2B 7bf744d179d86c52c24a783ca4c0154e8600d3bf9208fb9579b674cee3494594f2ee37d9e40ebbcbafcf1de0d030ed4e807bf9ec1c95d42f2bc5a31152de63c0 SHA512 a06fdfc6b1b7e48df25cc42cd57f9f464cc91018f47dc2ae3d75050753e6a98d3435f0921ff2046074e504544e6d378021ba2d4b4538c56ca8d090a9dc4c5547
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ka.tar.gz 366927 BLAKE2B 57670d03b246ad2732d00d1541d494805f3a75403cb13c5f625ea197ecb3cc76841653f606a2ed428355a672d98e383409731677ac1f20ad2f88d8d0ba3f7da2 SHA512 678d86935f0c4013d1a7cb6ed45425ff797454e482ad1f11846439d46c0015726979ba4d0f53a5647e42c55d8b1b211b806d59e1001dcc9375b8aa2496290a33
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_kk.tar.gz 771065 BLAKE2B be730cd31ecd04b7c934b38d02a08c03a5aea743986539147328e2a8548d4ca4f29f770cdde2bc99d33cb4e2652674b9ecc3c290f723353875790e99c74c1d47 SHA512 1cb880f86c189dede63f8dc44c3b48d344cddcaa95cee3f890aca1b1d6dd14c19f194643c4be85466ae9fe73b970ace3ec6af17210c5ecffbd2196ea71c1bfbc
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_km.tar.gz 696627 BLAKE2B d0444595dd17ff36f66b2e0a2dd40ecd76be3fa57bc772273dd9bd178b95454f6d9fede9afe4d8f4ae6ac92a85634069bbed568a9d5f6d89e56c19870d1e4f5e SHA512 c8ba5f09f683f5b3e508536bc950a7b707d4a1a4852df264cb7fca76895641ac5aee010c57865c0b87fce3dffaac70e6a95546291ed1df8eb3b53ff924c3f873
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz 339744 BLAKE2B 1b199e5234b9f7bf2c529c610759831fbd7edabcabb74e8d7affc59dbdcae9a10c13a2c811478f0dbd3e41462d78909fd0be918e4e5ae815e78783d1392a745f SHA512 a651cc64ded35dce7f48c077c9f5d6c9fd774e2b0b316a0468b6704a8043e1593761489bdac13454d7e2949ff0741ba01bddd13a613e5a5e2cf4edcf53b5f292
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_kn.tar.gz 594445 BLAKE2B d964d19c012c0f4e3cad44a85abe516d2341894226caefdbb4a163aaf4d6d2d480660dbe1c5e2baa799b0ce944e250fcb2c89528c4d409864c0973bc5abb433d SHA512 144fe5306699b610d9b7b8ee5962ec06e6363a014ef97ef54156b85d0ac3349b6217790647995e8c67c6055633d13413ad5d5d6c45eec74112d66e6c022eaa68
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ko.tar.gz 685592 BLAKE2B 5035be3adf8e65b0113950a6766a5580e4e85c46a3a5257653aa7c2af7028d109f28336668442e511db74422c23cad657a99e534493f1aa43d001b37bf0c0d80 SHA512 06806a016cfba866dede4c68fd105cdf504f6f3d6140dff110dc1a82468f035910957c1434c75b65aeb037a62b65bea41cbc9c34cb8e2c2fb04247628a24e8c4
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_kok.tar.gz 419471 BLAKE2B a8972fe8a56c9ce67b986143ce1788962c8d9c5c722da01800680d19c9f6972aae64d8e71b6e47fc0e4fc5ab2a98b196bc6b2cd34cc4e982ccc585e960ce5b15 SHA512 3b1e7c8bfa29ff720d914c3d957dfc82e7e6a8508989b754c26bd6e80da4e960881268fd0bf82add0f6772f9822e1cd11c860dc55e02bb24060166dfd1cebca7
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ks.tar.gz 334232 BLAKE2B db18344983f73e464cacb80d0da41a0825af4830d51539dfe631639e7af55434d5a1fd1faa7d54a20fb42a655e9f3813c8e90da1b6dcc50be7a27eb2cb17a8d3 SHA512 8af41183a410ef95ee5bf6f8cd829261ed1be3986a570813cc349930243f609e8980fbea79217fddc2f23847e012dfc8129c41381fda1180337cc68a4109f2bd
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_lb.tar.gz 145002 BLAKE2B b35378a4c5ee8b3d31d01b12b0be6af40b5790a0bc9d6d9edd0c7721555dc9bec399cb96084838d5b421c589b54e480e0a0801731fca133d81e0f5e0ef23c68f SHA512 902addde1c70fc33b11f34bfd85b2fd537096be70c99a31c623238870a21f5357620edd3b864c915f990b590cfdb5695c755136c7a5788d5d622f849f9363751
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_lo.tar.gz 368712 BLAKE2B cf7bf5821c955df606bd90f0b9f51fedb16a82bc4c91e53d1156c0eeb23c5601f351367634809f71f7801fa50ac74b2e1d12227718b0f37b1b5b5ee86658970e SHA512 6ca2afadaabd55548bc38e9aec1545196ed8ef54209262a5179b67b526470453392aa10f1d9e236105355c045a751bad90caf0d43170cc27a8fbd90b08f94f68
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_lt.tar.gz 1027636 BLAKE2B dcba7b7e307a5c8ce1dafa8ec0c3cf2d64dfe4d8406ce9a1ea643c16b58c84b9b8addf54366d7469c658cc4427e5a8b652225e7e978073f33a0e9fb6234cba34 SHA512 9565b9243db58a2e95c43a3718e12826831779d8c718dbae66d25d7d1115e89b779116b06b3e288335d24b6bfd7a6be8d4c6fb98ef4911fec68fd1b29e1b2292
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_lv.tar.gz 1455727 BLAKE2B 2cd2713cff401fa026eea84181236b998f32e1cd5f56031560f9231a78ba738a6b94b2d1b5eabbded3a7ecef5d808b34179ef949f8a2a100a864796789e01281 SHA512 7a2fbfa0dc0292ad481ed99940394a8378c87456f9460e8ca35630b9267316a484a0e5fefbff57bdd7b1ebbfdf6c31acde722b255480ed4870a7a3dc41806078
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_mai.tar.gz 336114 BLAKE2B d861a319dbdbbec01df4650cc44fd23c3b7c35abd5a2dd7e306e9959aa7250cf23301eac30e304a15ec815b243a1815927709fea42c22da7311300004d2935a2 SHA512 8079624b0cdd0ba20667091e6665211231ddb241d41c774be40aa6c8fd40ecff426ec4f490936606ea2e8a0d33a64b265b9f5b7b7d70cf902447272da36a6311
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_mk.tar.gz 389024 BLAKE2B 802a66306be7052d88598c90a8a9a19c843e5bd64ef3df0630732a5c0a2bbdd6fd3568ba9c4491cd68cdfe4bde32262f64376ecd5382215f8cb2fc1eb4beee1f SHA512 6252888f1eeb033301025ac3b9b4e7442fe64bf1309869a2731f9c34c2636e054e897766ec7a65ca94a457a2a8b677d711929003fced4bdcb86d4310fd890d39
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ml.tar.gz 556045 BLAKE2B e4f9dc957d7e9823974069b60737b84ec8c945cd8475ff65b9d8258362f6f3fe73f11b41c6ff438b654fa5008387cfe8bfe0499bacd1182c1995be6bbe4dee1a SHA512 9a72c6dc95167511703e954c5de293caa5893875a1a559649a4039a0e1ae29a80ac328aaa92cf35a8fee66aba28e04b5448072ff29d3db796014c7512a84e020
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_mn.tar.gz 518362 BLAKE2B 96eca6aaebd12ed6d5e31c80c1d3a8fbb19cad3d560b03eed44447810d3e96dd9902e9f86e7832f745fff8fa339b239b0559dbe534a9754a2a9dcba6e633faca SHA512 5ca6daf3e39dec1ba7834ecbfb13369e5653a35b99dfd37a0424b689ab20c476765636dfe9d299da59e2d3cb76ec26df5992b3cf41237b5803ef40e3309a6673
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_mni.tar.gz 410233 BLAKE2B 837e273ea9f01002d6f0d50a6a3078ce034631cb4f5d12df6a338a6d49bf3a5021dd89d9f3dfb55a036c3ed767450ff3d880a2f19e95c468b84cbcb2511b859e SHA512 a5fea5fbf8c80f6558394c30efb1e87848795d16e928506053cff7e6ffe07c62978577a6b13ac196bd6271ec685d9fca48cf421771dca247f852bb3b7120cba8
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_mr.tar.gz 589995 BLAKE2B 81c627172406db994c85d93a6766402d36875115038bfa7eee8c0f12bd9d1975f81e5210082731006477535b3ac1d06e94041d67d4f78f88d69b85bea87766d0 SHA512 038c253f73a504ad1612ab7a67b48f77fe87207ea99c59b90a44c5b8ca55668548af39bf866e72221a71e8dc1bdf4b0083f2b911650572065262a93cdd25c3cb
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_my.tar.gz 472601 BLAKE2B d413d13c214b6c6454c78ccf2e7f3cd9699ccaf9102d2009494c963d9ac363ba94a278aab9220cddbe3ddd7994351367a64965099880688e7c8101bc44f74202 SHA512 ba62702a678b237cde76b1647d8ec1ac12bd4e80144c5dc55fd5e826d43b8156a61e30673fa4ed5d4d8244af0675c6a7951984e9264b9b2a6e3b573afb654c3b
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_nb.tar.gz 3712345 BLAKE2B da2c93559e43e764572ba6e422c7c84be1bc4efdc7c732ba8fd5a1ad67286b9fcbef90874c614240e5852b5773d113aae9b8dd04061980af366a955a3b68d541 SHA512 bab510c0f0c36fb753520a84d4966e6eff9daa1f0d9e39b7eb6d69260ccba2cca6851b98617e8c5d469b5cdc750cf2a78d245bc51be7f44ceb10405e5ff50272
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ne.tar.gz 839059 BLAKE2B 03b01cdb3027421aa827d3885b4bade47e867276d3ba93a06d7b9a6b81faf667e0b388e2eb87903c0833ed543eaf8f2cc440f858a7df70897c1bea2ced34128c SHA512 623b423a78cf5def6fc424f09f41ac5ed942710a59a20a5a3137be6eeb49a0184720880dd747ea5bf37414e5e9faa91eb742df5dffe717b06ff7cbf39524a2ed
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_nl.tar.gz 1513200 BLAKE2B 4668cac9c7dc42ae822fc448e76b5b59cba62045812b94eb0b41fd0df90466accf46f73094cf99902a0f0c1d1a1a2d273b9eacc4ad2c18676c8550e269546b71 SHA512 b675d99ad7da3ad3c4d1984466cbef7be73ea7b07fb43a48654b23c3c8b6096202f91e1e3d5a7c722aca1d80670abaaf4a82d9c04e56628b49711352048d17ff
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_nn.tar.gz 3712718 BLAKE2B 46eb1d755ddaca4d422c4688b415228fc1220c5e1833459b0661a5dd40c1f01b59834335ceeaed680c6a505ba0284024769e224a4224d6bbe81da7421df338b4 SHA512 aa8ae3071a2baf4b17b8eddb6fe052590cdddc2ef39659dc678d91c082da502c54fc116d20d95530f2ca920efcf4a3dfd9e6de09c6423d7a598672a545b0c959
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_nr.tar.gz 282009 BLAKE2B f03526d8f98aa0154c15143d068e50079e074dc434abae8909451471f7abaf98dd2ae9678dd818344236641d63e3308e44c4ee19e4a56321d867ed7a042e90f1 SHA512 37eff1148d18a24fac1249807c135b6dadaed2eb003e32dfddff6c0c48be5a6485efbf53b2783ce96f35781cd8448a914c6072ec7543614d335f438e4889167a
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_nso.tar.gz 327609 BLAKE2B 6c8f29a05c09379dd483779b4f8065e1c853d4f947a829a45aad4ad6028f22dfb66fb68f85eee32eb6477995017657996f6e67a4893b57ca81eeb4914e57c271 SHA512 e222b14e26376aa58a03200318a425177071f63e11890df2eb3fec063d8c021a8f3eb4f27aece8a80469e550d42c9f155badcefc5db58e1267076b8bc7c82422
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_oc.tar.gz 885160 BLAKE2B ea5efe42e0d581b6bdb281d9c51c91e313b9ecc1fe7c0531004f5ad0e89dc7e50fc67413b82723a0e6f0672752d89b200b92c359890081841c58806ffb45ba94 SHA512 071ad39d8b91195ac86cadf56d0c8b872928e3546226097ff0e0297fe615ed721334eef2d37c53918f799ff2aa5d396e199f0b4e825da7a794b312a839b2966e
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_om.tar.gz 376695 BLAKE2B eb599fa62bb330a4bcfc1bf819825ea30bce717a84f9fe71568554d48fd7656e50c98a24853d3a9442a91df41bff2d29a38cbbda7932dfec30a7e276cc3b1802 SHA512 2bf6c1f277059a6cb9c9a4f72219afaa0b89e1ad00b3a3764520642f97a06e1195283d62269818796ec468f0ac93227ae32fde8311294a06a90bb2a7de31d02a
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_or.tar.gz 612578 BLAKE2B a1f9e407da91616e8f6730551078d058f82017367401d5f05cc98419da9ea2c1800fbf802ec0fd3ff1b4a1e8d136ec83c7aef2495dd960f7bd72c68ef05cc1eb SHA512 011d88128c22021fc6599d88b5b114cd6bb6a5117df07c595e3714112f8be9fb999834b76dceb46c15b3b86015db801c5d01623e70fbf093cea306d0dac6a9b1
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_pa-IN.tar.gz 481623 BLAKE2B 6338f91a353c7d169f982b95f19661a348127983b7bc7716fbf40728cb9eff65c082102a5f4a4224abbf204e1ebdbe90fb319de947ed0a62d747db0e756a536d SHA512 dd155cb29d862db3bfcce76ee27e4829be9b316c160bf331ff2a4a9da7768d9d95fc81a6769311a528050f1c69815ff0438a06635280afc653f76a35b06cd7bd
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_pl.tar.gz 3040472 BLAKE2B 0d0bac3b5a630caebacbb3b27aaa334fc3fbcb5c9e9c38fc570753105bbe63fc5982b90c3078091108aa413e1ac47dec64a4a9c24c155887358dd3b1992d69b6 SHA512 822567004b352b53138537cdaf3e560db27867ecb5280f22db228b8b41b79766d1148c8981754dec306982281d91eea9026c74c19f4779ceb50560ae1724be8d
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_pt-BR.tar.gz 2803987 BLAKE2B 2cf05369999c2a0ed8810c402b70c7ca99712b09861d8719e69a4c57dcced1ca0747e27c0fde6a72fd2e2fcc73ea48894d07f343f65c07aab384e45a65e3342a SHA512 aaeecf91f865a62e04198cf5bdc7cf3485ba78287c237b34c8e9af0ba2f554281ae0eee20f916f3912384286e94c06843cf6754e745670266647f2bcc1f73746
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_pt.tar.gz 2360057 BLAKE2B 18f7b4b90d35d3e9d7fae583d6a0262c2e19eee7b4d5620c5b9f9b13a34dbc21d1a7a4ee60679c274354cbe90e48df29594b80a0fab31b9f5231707925cc3606 SHA512 1d5bbea4609c573b9519294aff8606d138205ee0885a7e5e71cbfec1fd47a7f0504c83a434acdff36787394f42bab593616f215410dbde370ba5d2c68bb5357b
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ro.tar.gz 2545736 BLAKE2B 1aa630e1a57145eb2fa1673ea99ba888ec379197bcf1599620da1ba7a57bff829dde9828e95083a7e2c43b72624f9d10a42c8d557313a7c0a38fd878cd11b06d SHA512 0f0f2f17dfc468603259f79f0d30b06bbae4c773af7df2ce1f82b12012525d93abfd0ee8aa664f7839877fea35597b035f6be4b0ca000e2251592b004181d1b5
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ru.tar.gz 1887629 BLAKE2B fad338a15ab25b4a45f35dc64bc1df3f1322ffcde1adb0611c346db8448acaa8ee78b8ff7d48b57a5bc492e6dfecebddfcdf9e6cd6dfbddc04818186f69af675 SHA512 1beb24c9eeaea01972dfd1d8450e78a0ec99a0ce23a3735de904508873856fdc6ba5148bf2541cbaf64c0ead31874785be0f660ce5d6c40c8ffabdfd935449f4
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_rw.tar.gz 348446 BLAKE2B b95ab334fad870a020083ab856acc9dd37714a46857d6cc714d093cdb3048b3dccff38d818d923a301dee3aaac51e11eb401fb045118c1667b111820718656ae SHA512 2d0e282b48f94c3456185e039cdf6a36eaf5bfa0d14d29d64b4403826c07105102b871e7f08560df4096b5e0bbfea8f7247d257497c255ca428f6bfce01d02ee
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sa-IN.tar.gz 458525 BLAKE2B d459d727765c07da48c3045dc6f7b94f7560d66e7df59ae288c311155e92dab1b29b0fe7e869d2f9a0a18032e5b295a393656a9cd28f0fc3a7c2f9b9b6304106 SHA512 88988f152cecb07fa3e06047dcaaa720b4107755b625dd5977753a3b5361aebb65378d2362264d7736b2def761738152fbbd300e274654abb522ca813b82f8e3
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sat.tar.gz 533475 BLAKE2B e3878f01e049cdcc8981a010e390a0b5ae72d4da72cc34d46c4dcad3140d74277facf7dcabdcaf05a7973d1b5e9658f0c82880ddb8453574e5fb805f7c72094a SHA512 4a15f8a244ab19120b27c0ecf96af3143ad1f7e614082ea475a3f6987f85ff87131c33189141ef3b3649e3030d5e3aba7229f216a84f7af8ca533931d80208d9
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sd.tar.gz 445369 BLAKE2B ad94d5b8956c66d6566f6aa46c6480de0aff63d6c32b2d00329a909ac2a6b61ad93e1f91ac9a2b48ccb73df2dbd5e1aa8301ec246aa193dd90cc09dfe15b13f5 SHA512 4b8f1a5fafe451ed111f948f5b5de827a7da6b1a3fe00121a8ba521a976ece1df95f6e1abd8818245c3ed827d50855e1c6063a870080b9fcd48eae5a6fa43c89
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_si.tar.gz 746685 BLAKE2B 6861c67014dfd258300768e901c73fc60deed88f84e2808feca2469ac4e8b16118a15e78c25729a909640ed7fe54d3a7176392068b3496d921d984e922366624 SHA512 7ea9ecf31cfd73236371a4d68f09ab0c824ccef90eecc2111d8dfca38e277252c20a9e3acd41467d69464bd0138f40f6c7f35b44ecb8bb8f644d94e8b38d0e97
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sid.tar.gz 460899 BLAKE2B 5829a2c81f53280acf6b08f774ba5e914de738e9153d863b6ab1d05ec386263c8f2009df31c10897fd4b5d5bddcf4b1d873763e82e9220407b53dbd11619dc13 SHA512 3fbb04c2385ec8f4c78b22101d9cc7f4715ef9ebacbfd147a2946e1a302e2e8bc57c828c1692baf2d246f9b3127da3f4c9a540fbcea29b397af8ee10f14132de
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sk.tar.gz 2005971 BLAKE2B 17c3a2f0749c71e6e7f960b9ad0a7ecfc3bb4fa83aab55cefd71ec7206b51cc3153b3ec81122e7e45e18c25351636c5c7f7c4ab816ddd20fd627545955a28ca6 SHA512 3d4e5e74ecb25b656a8ffe6f96bb37eaf51e7d1590d7f8df748dfb5e8f3d1276c0f13f7c02d6aa3923320e14a64865aaa34003e61aab8b316b13e459e0fdee0e
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sl.tar.gz 2405375 BLAKE2B 8a2be671903b97b54f3e34961c5e9aeae5dc40626656ea9112a2fb10feaeb3657b34982c3d9bf9c4586ba65541dbd685c3b3df36c625a1d7b4b61f37660ed3c5 SHA512 bc69e02e46c48573b7df17028c2061c0dbe84e2a0af81517037c3724083fecce9b0f7cbddfb6aea3bd816580bd5cda2dadb3099bcef7297550d26013b6e4b995
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sq.tar.gz 1171426 BLAKE2B 004957d20ec0ab363241f3431fd1b7e5b9477993c18758d4f825d02d993644676de507272e8df4d2fad974762b439891bf4e52574065290c836f7bcc3cb94d6f SHA512 395bb4f8264950015db7ff9248bd303e64843b4a11fdffbcb7dc82f934d3b2bf1ed6aa72dc75c564b66e81592671d80e1ed31b96fece035c68ff564358589ca6
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz 1461854 BLAKE2B 23b28b090f3e0280e7f00aa11ab69485eedc7980441420b86004d6823cdb84cef71313b2f53147b8fcdec1d3201d1a931d103aafaa6b3c272b86cc0abe98b4a4 SHA512 92f766819522e03989a43a572dd48db1d07e746e6e3c51ec1ddf24317aa44aa8b36c526e12a9f0a63d721f85b75e4e82238d909982dd7bfeee9f5e138f16daca
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sr.tar.gz 1480658 BLAKE2B 62bcb734795eed1d774541fe73b2f60ffd8ceb5071f473eb985ededfc597a36ad5a108705eb2c1f031acff199ad7917e2fff37d82c494d9909ee7d2dfd8177e0 SHA512 3299509ce6fe7437ae1ffc5165e826d6d7f4584255294ba7484a800b45004fc54226d27d73ceefe9cb51d088687ffffbca65ab16bb13b0a215f3a26ebb99b747
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ss.tar.gz 291695 BLAKE2B 88bace33aaa6db8acbaea3af37b169cd4e9a025311b141f79a3d45c617f1102499aef9a82321ff101d6e500b1225c0b2724bab9eab03e13e4925638abdef268b SHA512 7c27f06c59e324250f5fb271d084859544763e94220cc392e6f9050285284ae26fc39a15c320346f94e5289ed4db695bd1701a1e2a094685430f8c6dd39ca2ac
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_st.tar.gz 284374 BLAKE2B 6cf25fff63df0d9c3f9749e69e55410e2b161f2f6299b52f060b149ca23c36fbdcbeb3301943e11a127107fd7db12c7d1da1a7382c836ee1d57d46f4411993b0 SHA512 9dc4ba06a388dee08b07caad7114f7c0759a184804b0293c5b512082cfc93a03f583adc1a5aaefcb2751f5f6e149cd51d0b2c12bf16ec234f8bc5a429edd0454
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sv.tar.gz 2548896 BLAKE2B 80c7f8aad2a61a39874d872a646dc7779fb1ecd0eb7079e5d6e7921d23699dce9b040c8984600a72ca4d6ff22c0ded61f3d646ad7995356ff5f3067760a8b315 SHA512 dc5d022e3d729da43da8557613bd4c4e72bf5f235f2dc595b6140ea3d8eb64a4154b9e4b61f048706ade5b40a83a53c67de8bdec6a88081b487fc271030710ae
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz 323428 BLAKE2B 72ba13204345d5bfdd941b0913349bcc4f6ea724a3d9d6e7e36f3eb54cbf0cbc2045d1a2be047907c2aa65933a922c01542af72a5fb0e9e2c4c7adfd1fa24761 SHA512 896c54fbbe8ddf273a4df61fc2a123bfa76a7971550936021b16206af8babd374b8e7a611fda40318e033f15127dbc6b6273c9e98ab568ff27a20a4c70dd9966
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ta.tar.gz 698296 BLAKE2B 19f86c653cae1cfa9c3c40fbacd0e1fcb7c184754a75e16b11a071968d4ae43c77d41db2711ff926ec5808707ce392ad8a5eb46e9b0bd4f3da0d399176992bc8 SHA512 d35fadea4801b58d5cea635133bb66b11b817974b90f4bcb0f376d44243dc21cddd413c1135656d5c6e1a72902a192289df7162e99e79b04572144b159ab9587
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_te.tar.gz 1098830 BLAKE2B d7a3af07993054bd8315c677a5461e7b2de25e455816515239b7d9798612f93c42195dc5370ea2a3422c638fc684d52e557479797e56760acbf7d9a654a2f64e SHA512 08f14c28fd05f9f34e43fc0eab14f8e6981eaa3d5f9847fbbc21d589dd11ab3c0de0937d83e3f550d142af541a2318d5df8361f4d5aae28eaf132b8baef56c48
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_tg.tar.gz 363359 BLAKE2B c548640975ae7714a0a162fc0954ee5689fe40eec34da98b72d5280e34767c2c7de97988bc12cf14761192a8bc7edd452134df26c81765948a2da64c06d74146 SHA512 518fb7c285ecea164ca223fc02ec1e8a8df3df4fed4b703caa3d2c8b8e3aec2053cc59d7fbca78dcaffde2deaeb6c3590ab5163504c4a38be31ec14c1b4fbd04
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_th.tar.gz 631898 BLAKE2B e7ef53a79c6b29773256a35cd892c8c119a33d59449448af79ec8b5f66ea98edd00638e1a8e9606f4f19dc990cfb6e432d182872d5202964064b1c3851602204 SHA512 aa090197768f61aa208b6649b75ea89d82b23fcb7d92be3150bd3e9cfa1a6c6d8cd47fd1d538caa62c5e710e62a4afb3cb5dd0ca45cb94ad6b97b7c4d5240ed1
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_tn.tar.gz 263381 BLAKE2B 568a22447ddb14ae533779c40986a0ea00fc31913addb80114fef19cbc5ad952a2f9fc8af9cd28fe4011d40a9e5ad3b0fcb5bb63eb9a96fc1634f85522d58d60 SHA512 dc406568232318d3b95f1608a3ebb3675ef5955ae403fff47105251958b842f40faba8d3429793722740fedfa064376fd070829f334c001dc1055e2d7b625bfe
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_tr.tar.gz 763812 BLAKE2B 04e00f0d65f630de1cc22d614e9b57d76d7e751efacf423e9e0f57494be85f48ebbe0b66f6ed0b006b861404f24b85b3f363951555547bd6e10e914e64256528 SHA512 a4f41a3977aa37ad8a0a649b8f45ef2b0e4f471d4360ce7802497c326fe90eeb0a3c18be82bb412278e45c8e9091711b0479b281a6cb908f9efe7c9808d33267
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ts.tar.gz 282508 BLAKE2B fba81adae3847b26e38754355fb4349a338f4aa9b0d15bfb79a3d4e600feb8bfc3dd5bdc11bc0f93cc01ba35a6dbfe28b5609adabcd6bb17fa5f3b182b0e87ad SHA512 b34d1dbefa94e23cd33707314befba7b025c2634966b4837dd0f65aa2f876faa842cc58d9858b6fec72422a63cdbd9e18e7217c619696286a74028db47fe5042
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_tt.tar.gz 185073 BLAKE2B 2f389d6b0c63b5a3bbc7c22dbb6a172b4fd21bd8417d70859c7c3db71f418a7c8c4c8d76af4111dd0db24152216108fd6a3eae59aeff10a09beb23e25aafccb4 SHA512 5ae067b2f0f39a696becef533dbece469cb43c042f563e0fefebe790d01d83f3b20f728148a5c2c6814b07c5561d690fa61c619d97a877ef1f66824b7cd001bb
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ug.tar.gz 557679 BLAKE2B ee5de21ddf0246445c4c3339b27993db8abeaf2f7f45b5e38463810e0f365b39fb5d92e30a555ae9b8d28b01dcf4549a43fb6bbde8a3e91c7dddc9c8847eb523 SHA512 e105c572af3de325592d81cca7a1e2b348ff94303441056d117bf9ec2f0dd765d900b2232e786faf3fa92e1d6ced87b5e81c2eaa83e66f46073a1200b00e1a76
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_uk.tar.gz 1608990 BLAKE2B eca56c23fa80c11d83f2c0e2e5cd41977e88613024b8d56d5f57df4d0ae58d7fb367354a06f0846135246cefd194bb48617d8426af598d72c0d2a5ce8914d4bc SHA512 f8b5c5f6e19e98d907a97c8680b6c66a7d4c6d503ca84f63e2a4bd2918e666236ca01f40a2bfa2fad5969f32cf3999285d6c50854109c23c2bf0191a92c39ce2
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_uz.tar.gz 319814 BLAKE2B b6a76c8869181a511b374afbf60483f5ca1069ff30013508f534b46b377d4b5a07ae090980c51fe791bed176e72e1f7aac9ff6fb2554973c0268880a8cec14b2 SHA512 24e1e8a594c4fa6da26c55abaf3762f2d27ef242f590ad5c38746658377d19b39eae708a630d129c695811cbe1ccae36c8a9f152febf4cef9d7e63aa7622fb14
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ve.tar.gz 286011 BLAKE2B dedc338013c911505aeb29d1d288f5fbcca2ae1b6213ab4d140292d885a81a77ad957d53443e7150f048fbfa64f096c9c83a534b27ee7e507e56818c5638de82 SHA512 9eebf6d12d80e28812a3fde2a254cbfb79dee9961ab64c1bf82e4b95b533323271c1e21f5f81ccd6d3685b1279e1ebe650f0aa203a369240d80c9a6debd44699
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_vi.tar.gz 472253 BLAKE2B 4b9ed7f88d3b03bb43731c11e97ac20745dab8e78ff3622a3d00e954872a6aaf1a8279837c1d2573ad1eb42128aa32519bcf8159afbbe3295e840b124c56d238 SHA512 2ede22ba36a95136e2d8da7a753af70b8bbc6f0b0947ad8e96fed10bf0fe769a181001d1b4000d736a5820645e3a560f797ba1c60c71d6a594d98de54872566c
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_xh.tar.gz 295519 BLAKE2B 43fe241118408a92c7b29d5b68f01d716fe454b380ad10451a5497319a352be123b455b2324da5bb9c063a743d6d701c0fc2ff505da8729476610f07636ad836 SHA512 ca56612e86ad605e5db5df936a09d0e1ed9c293e170f656ddd7b51ffe4133c4c4014f98b66d516d56537c7db0f21d55c2825ceb8635ba226fecb42cc58f2b555
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_zh-CN.tar.gz 798275 BLAKE2B 2764972970aa98f346ad76bac0f8be6685cb2436613e1e29b289f018cd5cc8636ca73c9726bc91b493fe3bacc116f7913a1ab943645c054352def45cde15ddfa SHA512 032ef143bb3bd3bd06701e84aff497d3dfd8076493e31221723ef3d321cb952196022b1520904ba21266944d84efe5d241822375ef116c56a02ecbd23de8f3c1
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_zh-TW.tar.gz 796214 BLAKE2B a24f8f780837c685d50763854e9ae5f3c9b5685a46215acfd5215b25a7d46ed310c036fdc3a98bd5c4142346d5ff393defaaf68f27e192797bd73b71493285ff SHA512 58248f1fc7a7aafbb4262ee0d70273b3f5afe5a294b19d5032d76e6a173f0562fc2d3326319670b595367f97bfa26536b59dcbad8e9fee88633bd5ce33d2164a
-DIST LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_zu.tar.gz 325473 BLAKE2B 44d86495b8e5b09ba09b9699f7b37c727b834c9b28ce7027f24965f6ad9c920a3609dd36acfd70cf534db20884245844a111ec4b32e04c102080f0ae4e0223b8 SHA512 2d399bf1eb9d9214f36b134869fdac3de69735a0e964136cb663f82f26896fd86165922f253dfd3ba069c282ddc19e4dc2db08e83248ee2fa10f534b9378c0c0
 DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_am.tar.gz 7989353 BLAKE2B fe3bbdd2d08ea660a7d674cc6451f4fd19b472c5219709f0ee1558d35a1ff054dc190205efd88c57186f03c46801c6d0e47f218de9eab684c8061eaa7aade0ad SHA512 7baf9ae08ef566b370c75137f415a47418f97f080d5a5a853dad2aba7d7c81a3b467db8369906a6c7726d51764d11f07b1242e780b93329e1c4422c2ce2c32fd
 DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_ast.tar.gz 7905213 BLAKE2B 8a8821b58813d6da1dadaa4744856b9101eed43cd36a8207091bbff5bd709605715e2a2c898c6dc384afef914d01c3159064247fef69142c20373f313a588e49 SHA512 991cc9a4bd19bdce00f6e7aa1efbe133163b1bea3a3d99952fe1c2f6eabd76990a6c0f11a8d636d60499811818ec6ad52a5391b39db728d752f72b97301c3627
 DIST LibreOffice_6.0.6.2_Linux_x86_rpm_helppack_bg.tar.gz 8463619 BLAKE2B 2db6842597a841fce78ef9ce2ffbf1cd2f5c1588ff1763f46510c2f851d4c1eb0070116e57fa442362e48e7c44bca2f54a40ad0f20659a69c8f6274bc66d1350 SHA512 75633005eb0a4c36dfb40955bed01dcc22727897d6380df50076f3aba19502fe23cc24d6135c4283f4510890687f2df0ef3b0ef88b6f8c4a8b6284dbb9c2a918
@@ -335,175 +167,174 @@ DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_xh.tar.gz 294874 BLAKE2B 99fc873
 DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_zh-CN.tar.gz 798382 BLAKE2B ca5fe6e41a37d34395c40c117ebd3f43c0dc20727098d32cc152ba6c56d21a621d1fc921bce8beb1082008bfca2f933b02a80a6197cf5d19b7817f8409f2d5b2 SHA512 9d4867a1dcf8e31587013999c252b7ea1c3fd30bff208161f004b6cf7fb4cfc5290801f45e7fc96c74669f915091ee844cb8cc595b16a27268b6b61ea5ade081
 DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_zh-TW.tar.gz 795342 BLAKE2B c26ed443724488f1071a75f174317e890a4bd9fecefa012329fec9ba40b4cfb8c7ea161b5925328e0ec5f714571031e92a3ede601ebb570373e250908809350c SHA512 acf12d76d8e4ba5257e35ef002241e656ff6be04eea2664603559ad31870cf95f52d7649388f67e828582403e2ed78251dd8917b690ba3ea176459c99bc81e0b
 DIST LibreOffice_6.0.6.2_Linux_x86_rpm_langpack_zu.tar.gz 326220 BLAKE2B 3860aebbd0d2b3a494e8790149816ddf7b3a3a097d8874e5e14df4d602bf3bd384755b5d4814444906e1673cdd2775d5dd51a4442f4cbe616967ae3e319dd865 SHA512 c4dadf35e9bd29b0a43bbd94191630966435ec943dbe984f268550b25af8ea1884b0c5136ac673ab58d7a8a44a82c340cf297c031616200e3706f7d9b4000fe1
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_am.tar.gz 2519758 BLAKE2B 91ccc2f3343a7e080bccc6b2b9780328312c1a98047b5c08e3e9bed4250f261892a54796938acda3f64825e4e7aae603f1b1751baa70bae16b7883c479142d9d SHA512 09a835948c28b7bdf20cc616a32c8088b2772f1a6c94311907be91c8ea65c79d64417e4543b12eba26dd2c8bd4484736147ed199350fcf82e0eba8a499c1eac8
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_ast.tar.gz 2429887 BLAKE2B c7bd7840b6ea64ec117288807dad33a7882bfc1a394653b226ef398b44f09903bddf6f746f543e629479b7dd2d558e1fd7830661986356968d3ede9dd9f04aae SHA512 9d68c4329bbe3743cbf2603aad58cdcd603073e7322113419ed043a1c6fd871ad3eaaeca01b704f062520e5a5fdd57a4724ff65b3fc7d9d3f7bebb656dcf461e
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_bg.tar.gz 2618626 BLAKE2B 8c42427d7b60ea2a9ad1e876db4e0846a5cb7e4743aae20b353a8b86ff085002d396ebfadb6bb69aa61fd66878c5f9338bdae93dc8674e81f7055656b46810e2 SHA512 54b98e603b188d35e94320d579ad3f50f6e40d15af2a895b00d06d5974e8acd845ea8b5c6ad6566e01d937cd85660c217f0cd6685a64a55f6f789d4e843eb658
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_bn-IN.tar.gz 2651473 BLAKE2B 5b400966d175da4cc0921b54dd3f7c0541ddfc5415f955be4af26a9a58745aab44209bc8173322dde84c24647410dae9d0e0dee0fbf7a98cc9d729b4920cde3d SHA512 479132884825cd9003a877017201bbc28cf76e8e14f728e1dd653e8ea786115bde43f80ee3ca2eab113251094b739801c14b01d9c057e305cf3259885cfbfd86
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_bn.tar.gz 2625711 BLAKE2B 41bec377b3396de2488f77f139b54b8b63527b21e3b99ad464f59acd22ad5696bd7a71526128e6df3d24c2e0fe887c5501560d877aa98fe2ba246ab4852c9858 SHA512 533c2379820c1455270e506544b370dd94a871d65350cfd0fb6f28d25eef81e339c1d332fa9f6a39110dd350aeea90b293ab2d5c9e03279b4127e084671b0208
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_bo.tar.gz 2637960 BLAKE2B 163718ffca44e8690fc5b59ca6e98cc922fa67ce5e8320bc5d09540bab2cebf3e497e42cead25275e53b4e36927225fac870d753b60e7753004a4fe8b01869f2 SHA512 ddcc06adb7c867d49fa23fc659a6efb85463827a9f0de993b7e133b894e37e8b328493ca26eb4d39e2723fc664cbe7cefc53dadb219204a7db25057c041105ff
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_bs.tar.gz 2345346 BLAKE2B 954d23be664f9c00818ebd4d978a8046d86ea28b007507fd52305584e2708d6154161d8387cf388e9b42eb3ad5047339541e0b8b59bcd941d32ed8d37c9ea5b4 SHA512 6f16398ab80682b1de8ecc2009bfe64517320ec3d949b5f956cf1badd2fa701e3573e1dc7e6cce008b34779ccbfab5fe31acc71575c5e56a1a9d664967fa3438
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz 2420319 BLAKE2B ebc205f2f61542ebb81b6e5f505dd9de57941f79f808340d8cb91e9eb04b9cef2683e43fa2c7939de58a22764d4397845d7dbb425901bd68e28311eb8bc7c084 SHA512 69d130526487870641c5a30705bda8e77c5b27f4b3b6361091db50454792ab269b5ebad878516be8d13155523a826ccc1234d2e6b93199562c38eb68fb000ef7
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_ca.tar.gz 2413251 BLAKE2B 735880915b8561205eef0e3c04448a6ce33921ca75afd224dc35aabf1a499127de186dce99a40113c3539d98a22123781816b0b5a21f981ecb7579fada188993 SHA512 53eaced6b4e6128791cd36811e23eacc82003db20a87657f0b6ea32750be059d41b8ac477e936d64ac3785bd14cc1ffb8a65d4fc1c14ca3484768ef6c1542b0a
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_cs.tar.gz 2437971 BLAKE2B bc5203dd23f3b8c31c9c211bf28a85b661971468f2a89c26d12c82762bc45a0b34f5120124ca58e5d7e15eef851985758324db10285ef95859cf966790706718 SHA512 92d19c7687dde0b61e607a7259cacb76e985df296af5ef2f4312abfe6d7d55d20c8f8c3ddc62b1e09a6c6996dc5ff1741fb06554728054776397b787fe87f2fa
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_da.tar.gz 2368589 BLAKE2B 2cad622a18a992c047763c4a91e0b5719d911bf9706d69c77d5dbc8b2bfda0c998032b6c9fce206438e2e5fb44855b77ac522c0c74de632e9fe026801da7fe64 SHA512 823e09fc010f30b90c91d417a8c126c301c79e4a824c50adad4eda34fc0cc652b8d8fc90712a65784c7295b34664bc63b83a545388f084eb4ae23d0175ea1bf3
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_de.tar.gz 2465382 BLAKE2B 2b0a13ba56bf4e4531aea70cbedacc7084c5ed8100b39fd8fa94cca3a4a7091ae12fddb5e168671d7a87bc1d2df000a49362173fbec5810ef18b0b9128ebe4a3 SHA512 5e735a0122e336afd87e6eedae274149b7931c67be37e7c2c2620b226fb0bc49870f72f66fc06fa95495d1b0eaa378d55dc190912da7f7106695705c184761f1
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_dz.tar.gz 2803205 BLAKE2B c3a14e2f9952616d8fa6e945c500b22033e2ca8ddea0eaf1ffb75e4be2cc697f7ea27a6c42f3d5ee066b8052bc37923805dc9542915c4d66bdf1f6af7da9b67e SHA512 0cd5dc3ecb8de6c0bd4df925c471b4aff380a7f561837217f6b271d3511608e84cbb3555803ae4e062099ae468e365a479d388140d492d22e46785fc6d1653ce
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_el.tar.gz 2825230 BLAKE2B 15b65242744b3040d851b925c1deff6a7f861b39942388c6963f1b28981cbf37f437c53b5ffebe6793299b7e2d8da509770c4a9a3ac4b5de1efca054c2cd0aeb SHA512 1b4e59134f7a2bea10b07434ee30bb4add1bf6c033a9a101b229b6d9a325fdf0dc329debb51cdda9c57131d01393228610cc8a14f605242fce06b3d38e8c2286
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_en-GB.tar.gz 2249130 BLAKE2B 1e7c9426c65614d153259d9999fc4e584dc0e6ff7f088f482dd487749d7efb59c42c32417825119629911f7d214d0c0d8d2d4c158d3fc3c6eceb2f01002591d1 SHA512 b856e09a333ec2ef11d7c1aa1c56dbf202e2f954fd402a76a00f9402440fac6ee505072e62a8745e6e182a6a3f4a2931793a94fafae9cf3ffb61d9519115a6dd
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_en-US.tar.gz 2105250 BLAKE2B 17cb3c732233e35a122d176a2999d96a3ee0f17d0a262891d1af78ce2f737e0b338d0d09c074f70668990b5569de022f6fd43944a9af49ca63d7f0d8b8e0eb99 SHA512 7d45af321a446d98bce441ca0c1d8000f067060e902a36953c5cebb4f9c3224ae259e43eb627226002be87cbc1fdbfd9fef8927f4361704f14c2b3b008bc2216
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_en-ZA.tar.gz 2245470 BLAKE2B cbd0c0bfd360dde926de60268bc905c6f58f8c52b33f77a5c30e7b15905e771b6f27a7d0a6c563557eb6d83096b2b71f4b0d06e964d460721a555066b7022604 SHA512 39545ec8d48bbd495bacc0f8e52c73433b97dfebaec54aa651ea6ef2a6214ff89d204422cf7ffed4b84ca7e33041c126393df4a152ba28b95ded56bcc473031c
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_eo.tar.gz 2327627 BLAKE2B d8677c4d062faf913eb9e4775d19eb350e9fe01054e1a11d32308e9e7a116f636284d63bc4c6a80eb2ef5b474582880ad38bfcaabe7029dc84185ef8b0aeb5d2 SHA512 31df5ce3f255c22b34db9cd598ea07c7d929137feb83f4bdd1e049a8ec20279f961aa216300e623dcc7f9bee7aad1fa5abede8b594fb7def07320075bf54c096
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_es.tar.gz 2442595 BLAKE2B 89db009d05726d10990c3e0cae5555b43f1f921b0387403a4e37153f90de5484845e4b508f66d27bf99b0dc522c935ae0fd860084185185c5815d4df46ca5560 SHA512 64f820a08e26b2edc3fe332049b2df6260f2caca910b9b8d80f80cd420de593332e98810a3e367e8e07a3f3d8ede8d6fff02687fc7acdf65b9cc53a4be07439d
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_et.tar.gz 2344383 BLAKE2B 69b4607ac7713c830dd377c71b62e55662dc01fa0b3f6067816ed56f6e27192a880acb2b7b963387f54cd4a07389e04d3f5bea5021adc0a4905921423aafffa1 SHA512 5be9e281a0d34809f1204f33afd8d864e2d5e40f8be33e2aa2588eae3f5d74d1c6ce385101b3d1b83ae836c533988c495f40417fafd1ab29808de5e4b1c8e618
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_eu.tar.gz 2322487 BLAKE2B 549931fbe53355b9b663226034ca5be5d595ecc7e03717e7f273ef7400c1251ce18436cbd7314853bcd9cbfe6fd5d376ac438ca9b800dcceb2d43daf98017cad SHA512 c3e16bb69d1ace9d8d3a96508b18484bac5cfc01b85b156405b662a6fe491f44e953b27cab7f0329924348296ddc21cdcfffc4c59ee8bbdc1032aa058a8459f2
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_fi.tar.gz 2413813 BLAKE2B 9d99edb7762cf8e41b65ba8a9ec30d1f4ec05fb4dd80e72c87556574c02ff702df7205a3566fedfd62b6816c481a419344e179ad7d6a02761e16cbba0085cfc4 SHA512 afa97716f858a3d6df74d8fefb2a5f0241bbdd12a8747caa195bbd53fabac0a4c5c04b115c52135e6758dd2b78d4a2d10458855d9e28b58666edc0401a9e9065
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_fr.tar.gz 2432305 BLAKE2B a09765ca8b224e4ecc5eb990e5202c847a266fb84942aeb77141ff3c6d314d57959a476bc9b158e282654332827ac480174f9bc8dc6ef9644595a2c23d3a7a0f SHA512 9cc8134910cf95f0f97c0b624a51167d6cdc0662a55e6a04f35a8c67c1864e1cc2166eac270705486bc821ef1fd089cbfe43c6525762a181f63275f0371bbdb2
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_gl.tar.gz 2409372 BLAKE2B 6178f47cfcd78dd3e18d66f45373a024de09d58f41336311ccfccc5908f88436b65556f9858b1c599fc3d761ecd4c142026e2bff8d8a2bb4ae64c44dfa9e055f SHA512 0a1d8272be0e9327fa20e09742daf68fd914328311fa7c7d8a83f108b50d8ca0074d5ed5175c8ad951e90faa41b61364e18851481e8cd00f85757d621d1f6f48
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_gu.tar.gz 2298374 BLAKE2B 7695f96fe431968654a63e4a31b94d1915c2d3e223ed14326474f3b57318454379b457c7405245fbe2eeaa484232bec010d9bf22bd2d0a01f85af3034106dbba SHA512 061d419a2c535287855b7831d2bcab62b2b7116fe19544e809ce4eb2c457a0f0061861fea012291739d09ef5539d6e2dc6cb4ff016d49d4d08d9eed00fa41f99
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_he.tar.gz 2180163 BLAKE2B 73fd9a8293db74e51bfee6ad62de7a70c4a6a1efaa2244a5f3876aeb1e8ed77bff5d44990959c088ed90a41f107181332ccd9cf294dd07fba0d167cce20eb753 SHA512 1a33581fcf089c8d15b29371132d4ce29a0da5408a1aa898071f13a6b2506f82040688f962c628338ff1771bb123ebe2c57b0e8d27882b26b14a3fee3b311bd9
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_hi.tar.gz 2404824 BLAKE2B 05f1dee9e0a9656b17ede2668bf3e4e3896db0e297ba06afc89c5a7a2171c1ccb025a538840212c143b4f98e5f242647989bbb8bb7714b9c36d2d3ee558b6575 SHA512 18b471c0e270185849f8cdf4348799f7abeedbd2106399ee9317c01c04ab2449e0a9e614841b3b266114c560184adce1b85d12d56283eb39672eac212927c90f
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_hr.tar.gz 2303317 BLAKE2B fe89ee0a31f140c4e6344b33e92394a5badfefd0ef6f245dec3f64b0e7766ae0a2a301aa21a41dc969c264ae2f00c1e86bc18f41b13bb975d6210c4cf38045d6 SHA512 5f27dfded572458cac64fb0772f2d7c44194292bb7354552d2d27c5dbdb8a044d302cdb4f9279e5e1283b0c29e6feebd785981dc9969f7fcc8c408335268698e
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_hu.tar.gz 2529747 BLAKE2B 6017661f17a17cee1dcdbc74e069c3fb80175167f7a577b718495b16157069a080a65f69a7d0afb1a1757f1ed43c0ea095fd5870b93bda801fef6a4041272002 SHA512 f1ff871bb938490bd59d1b9131f5548374899faaf9371ec9a3f06e606fbbcdf61b7292d9c9a38f82203e298b2458072bc57db03fd521abc1b68d3bf84abb7ec5
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_id.tar.gz 2302393 BLAKE2B 7a27813b37457e36d26ef50978169b35a26e817a1b344adc6446c15d04fe50b4f4aaab0980ea80c72ca9ab697f6b0053311729d6ca6d86dea40580d62820b750 SHA512 5c94383eea91af21a2fef01133eeab015fa8426bb559c2435d490297905d2f943be8819bea050cf59c52a9da6bd6f6ca1d6c543c282099efac2917e26d854bfd
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_is.tar.gz 2322992 BLAKE2B 48569f7c11cecb1a46dd889b6ebe2a83607bc7d2120dbae917be25d758b370f4bfbe331c6017eb8d13766cf1c26833d076b07e46f2df644265d3d7fc9d108fb6 SHA512 b16e669011aca2762f0beb66f5a7b2d41056a607dc06713ff1476ad934a47f1851a4da73fa50e7c619caa271c24a09d3dbfa0bbdaee6b9fb2a1ff210073926dc
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_it.tar.gz 2400981 BLAKE2B 9a45e6d0f34ae426745641f64570dc2a58d851e3abef0195ca4eecc092d40046cbe87116ee9218bf75c11baf65d792300b12fa2bf95e2fbaac520b763dfdc1c7 SHA512 0a3e3edb52d06f80d884e6bb5e82c3eb8737eb84660729959a20d1783808a7024f0b782b0814e26e1151f397b9e0dba817c872dad36f70b35bff7d733c76a229
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_ja.tar.gz 2563804 BLAKE2B 4d24c730ccf4b92f904a9dd239f3bbe034119bda673d78709427f8825ba78d5565ab19f58c3f6ff18224c942153d0acb456ba0b32f081f0f5a8fb3de954e2910 SHA512 2779bb033d94155d884cb14872c83c21e1ef2b6de1181dfe605d25565b142062a5969df89a6bb219fef2805c9674fa6c718f3aef754ae954691254e456ff99f0
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_ka.tar.gz 2443820 BLAKE2B fe66a080ff2a323821163777efe67841d8d0a6a7202fcbb3c7161d1b3c59e03bf0bb78093a969d3426f556d3cb637e814c80e8311e79a6e3edfabd3b73f1cb23 SHA512 6f6b2459710bb4e1641f0ece5babfe475d173145f3c0570f8a71d7b7e8520ee49e0d82164efb06bbee4ae0cc63756b0e7b9b8d95558b1669d957cd50e268ed85
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_km.tar.gz 2733996 BLAKE2B ff681d98be1b4961de512294458e7e463c51b7f8f1c999a66a30c2fbe71164c840aa95def7a1d30bd2a735eb82d15766d1476732f29b645071b16c9be1948f48 SHA512 accdaf4bd7430981696ed9b96183920a0c6fcdaba0af301f214d7d13385be963ef9e5e8fa46ca14107ee7b061153bc043b837c0e7cce52cc384e6c691fafd0b2
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_ko.tar.gz 2435292 BLAKE2B ae2dde156796341629a49cb4331bcfd2cf660ad23d53b7483055c3d21fdd1c4d848c77305b6bcfdde137d63b02cad83a0a2069b707dcceb9549e55eef0348579 SHA512 008fd7bf4e4e0644f33215f3945a690412b425ad26eca8c39c7a44bff2925372ac81be71f3aa3dcd359a2b7a31ee7385b465b16c5ba87baf3c3453db26d06118
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_mk.tar.gz 2425784 BLAKE2B 351dad53fc1900582e3144f17e724e6e0a947e4d2fc39166678dd1ab435c6c1b2e0b0772e5f5140cb896e82bb8445a210bff3027402c2b4a90d0916bc8153a5f SHA512 19854a784a62f707753c96b07ccf96f436188f1897bf384a71ae22b54ba0fbaa2bedafe2c071b57904037158010f059c0a03a8908c77cc144545ed02664cf983
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_nb.tar.gz 2358093 BLAKE2B 1d7dc1b1afebb29efd22b9f38fc15e94888dc01532f060050ddc3ed57fc55793684de58e913cc896bdeb1bba498f4f022a03747c2ee1e9eabb8eaf5d90470e2e SHA512 826d7f803dc534e8907e1eb22073d50c06fc5e5564475e3db7c8ffc479bdf7a7d2d99a6fa967d27e85200b3f9af74dfab4b1ec38d519227b200fae4e78937afe
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_ne.tar.gz 2661736 BLAKE2B 94ef99e9cd32a7dd842321ae97a941a2a55952ef9632793a21953b9321f123da748441692c341770954936122323791547e78c42c9ba84b7894a4fa5cfd6f5bf SHA512 a9aed6d371a8abf8eeeaa21673c6a2307e59e928f28edf3e1207749da7e579c97c657e4476f0ef81f910f72317b555ef9f698d7158f992927ba498ca7c573754
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_nl.tar.gz 2401137 BLAKE2B 1fed3eaadc970dad108a00c118cb25f7ca30be4a027f1792d54937f7175d6cb58643b1f1daa1c720cc1e532b092f4d5c52c8e981b7459e404452b1059ec5e14f SHA512 2ca7c3036e028a8c3447d8097a7febfa7192fe27976acd04c99d9140fe1de4a0fe4207794f6780dcac1554033bdeae170f105c9b010d3e133c310b6d1a0a28a6
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_nn.tar.gz 2340580 BLAKE2B 7492a7615fbd178b6e3483abeb7ef5a1850337284e1c4e0f58ba48e7bb86b621e21a9d3aa021705a8bdd2d982c4dc83bece815bbe5ed46e76d8cd8d0d710535d SHA512 a1f0008395284617fb15585446929cba7bca0f014f39c2dd21cb53c9e396c6151006fca27f392f9d07f16cb93a4d07147844dfea0d3d997e94d781d4fca64d1a
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_om.tar.gz 2432949 BLAKE2B 76f30a37f4535a4f75906bbab71d7a8842f6fdbecc2c045812d54ecbc1b79e8d82867b01f7da2c18c5e32e90a75abcb0f58c991a4da77f0ad3a3b75d43846c6c SHA512 a184bdaa5d2ea11c5f79569bdb85ba30f510ddcf40c050e4f586692b198f0e8ad84ad5c7b3ef80b14ffef289c28dfffbd9614df9d3214077de4e3660f473d8cf
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_pl.tar.gz 2499924 BLAKE2B 04c758a39434957e650848dcff0f7797fc6b230f15bfca222e8f6d25f5e8d9e7c84afe1f4f271bbfbe6ca3ccfa7115c6da3f4d001dd655a342a3a83898561f7f SHA512 484e7854554fb08de8517363613042ef51ec8c017b8862b14ef72bb2575a6176f9822fcfd5a4c56958bd515f085a7779288178a385e17acb1b948a2c00f40e9a
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_pt-BR.tar.gz 2418058 BLAKE2B c6c1badd1002b1f3c94b9553d28dc33c858bd807219b8a3be9becaa9bc039054225a77d9c3c6415460c4372d47f228a3ddc020c79b380d9bc36f6831f72b5f59 SHA512 69de16a8b5521a368196358d0b2963ce75a2f360d3f2c05f22684c80cc755df11f1fa9feccdee08063df8c4170095e0f6033b19bf25d38bc60e2da025bb75ce3
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_pt.tar.gz 2377644 BLAKE2B c94715709deb31d138bf2dccbba9e37d70809ca3c8bd4ad4b9fa7740fdb4e55805a76cd190701cad5744b1f89cba418c264a7cdbac8f29fd1269c3609633e4b9 SHA512 da6cacb58db81c79e2220f6e14029604bcb7423361aa30aa6b9d8ed3d5d401a25445e19202825d19011a0d2f3befd61f90878760a770c11d07e253dd51777c91
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_ru.tar.gz 2699596 BLAKE2B ad5567f4bf1d0688961b37bbc17d7d3d2644be86ddf4cf9ec67a4556a47226e826aeb6865e11d216477c7b49fcb73781cca080618fd41fe843347fdaec54daf9 SHA512 da54b93d02ab855be954b549ffe64708366c8391f8c9d4f9bad247d829701122538ff51d417338172f61d12d9efe653d04ac27914fdc3e3f14ae6e5a478de4bc
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_si.tar.gz 2399045 BLAKE2B d188efab3d319f96d478c8809a323f0d53a8970ff6acbbc7dc11b3c93f6c96ce0df58add452e40d2deb7b846ff5b0dd3497cfe7a06c4f4266ccfa059042dbcdb SHA512 ffbb6b5c3725dfc5d59e24cdecc001848e08297e23d834959f5d3a5a8bc9c42203d90c93a65fa621f7004c3a9d0963503445c035af38e6137b0a9e6d1c151089
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_sk.tar.gz 2443117 BLAKE2B 5a6e61e9a0538e7556eafd6643adf0d1a0695626dd88aea661582206ece7607edcbe7a3530b2e80bbd119dced936abaae2b2ea918b116ce7c610c193ec883614 SHA512 5236fa5bc7e024add9ac0e80ee86ebe3312d363eefeb4bbd690e0d78db667e67096deb058632932a4674f1c139832cd1b51f9879d055c214363884ad59735b37
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_sl.tar.gz 2384412 BLAKE2B 117acba63f597c51823fe8c9f52255bbe2205f93d67d868cf4b52877d54fbd7b03fb56ef6cb7bef3f95aa36aebc96d0b12153fecf8556f0a44f1211a4d378e28 SHA512 dce4b6ab9e296828531c1e006bef0cc8c44254abeb1e0ce73825d175852ee273f33fd88276a2135597d2bc82fd6d98fb7eeaf68ce0d8a51ba3c6b8bb0862fdfc
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_sq.tar.gz 2301514 BLAKE2B f642309cb81a6a381915a7465c2c29b3340e91f31bcd60dbe718bfa38a79d45f424418dfe78bcbd08e038e239a0cf482040b24eead1ff65391d57a097c74c7a6 SHA512 d63606a7adc1d12f5c75943840c16076bdb8fba010ae2633533fba52195bd35037e26dc43b69a30e7f87ae6c41c777f6265287bbbe0212bef1ba8645acbf866f
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_sv.tar.gz 2379815 BLAKE2B 69133f3d6e687ed56b8f747be1aa2e2285a6a7f2f181c6aa9f04c1db00143d3bb6ac72bdf33d4fedc9523be224af855f38d137d5560e153f02aa3027ac6d4c00 SHA512 c8acd5904bfb28e78e264ece7c563ad938bc8d2ebe2d7c619cf876fbc5485d214f36f20133cc5701b39cfeb6c2327008e798fec8f84ffebf8f22c5421ac51978
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_tg.tar.gz 2389881 BLAKE2B 8651cf6b702cb4a789cdcb04788f2014d0180ab51c771d61f273fc345c42b70d82498caf7f8268842dc92a289c5a55423f5dee5ba6b1727a58956e71dd910c78 SHA512 28c1c2c72530a741adc224da73b996dfd495b5448c821098a6f6aafc3fd63bc8c3562ccc40071bbf94850292026cdfa63e480d4a6d0fe18140e2e30a282e78b8
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_tr.tar.gz 2436651 BLAKE2B 534ff7891b871c3864a7a76b8e3f8274ed8f862aae8dd5f0d11a9dc75f9b6f7f7ffe362eca841b345b3490684cb151d2a6bd88a23355a8bbf8ea2772dcda31b5 SHA512 ef1cd2e513d0f98f452aa8d2ec7c80a94eba4b6a5382ecb442f5f3029f4b017c2517d3dd189aaefc2a253d194f0e751f6dace991999ead43d565cebdc1ccdca9
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_ug.tar.gz 2360076 BLAKE2B 9a536ee73d13086d6b8e1c457287488951a973b0e204cb2a96e51ab8fea834435a48f396d79043c51c9e5c77a47d8cae6c2d6ef5e1647e0b13939c81a4cf45b3 SHA512 51a490bee822695fd1f266e86818e16d1acbef0b6c5cedf6da275b10d1f883fe1bb2a309898b5e3e6f62aa279086c120082a0e678c5c861c068a86563bd14a3c
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_uk.tar.gz 2618246 BLAKE2B d0fcc0a58fa897e641bb62d17558ac5abb013ef8bae62217454b732eb71511de1342c0b9d71f5ebc0c6534bd31ecf3ddac2043a1b25c7fbca611f47bfe892931 SHA512 7b38b41c9be3ce1f8f0d05b4397303961e0a210554e70c221c01e7f8bc79b89ad826c9e71df58c6885625b9ffd9704b2e0273dc3644f036117a15e9c15bb4c83
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_vi.tar.gz 2438970 BLAKE2B 16ca3ebced6aea769f1ee0450e6ea6c9d642900d0c7fe82fc9c3105be25adadac2ed09fbb89799da3f36824410571d93521ce1ac8ff788ad1ec74bb1d26e8189 SHA512 bdfb0ca6235d66cac4a2dd21691785095ef10163a4b44aadb6b9fe538870e5aa0863fe730df531e632910edeb46569e2d2bda18e86dac0e517545fafa9a51a5b
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_zh-CN.tar.gz 2451617 BLAKE2B 26f5a0350a4ec833e0ed1f5cfdacb51bdb3bc2beaf1d81f5dc5fb9b00258fe93b6e728e0e68a35135277e69612b86f3682d70137d7b1a1ac616f1212d1115fff SHA512 16090ab2c09616aee421efe4be60aa9d42d39582b92059802815869cfcbf0339f4cf86ee570bc274ef6bba3bbe7cb3d7d76dd5d4d7bedb5c887c710729a4c16a
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_zh-TW.tar.gz 2481016 BLAKE2B e6c76a14098b2f236a1d0d20da8a924794cddbd0b4a67c9b2d86e02583f754b6c413a36fd77ff363350a119d83cf8776badc8a8b394696d82a26140bdf275ece SHA512 ee3e8a91553a924a0c7669f4b8a35f1ac50ad8740f9001a355037eb4f39ef82434e7a49949d164065ac9d8d3b7a00ccc76fc21fdac13fd7093f2fd785a3b93cb
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_af.tar.gz 1005739 BLAKE2B b8188266914361a0b2afab014043f7cbb248e79a67af7d35ba9a083da907131d57f72a54b368cedd43b6832428c47add50ca1e54b6279c6a2fa2706cb36b42bc SHA512 a9e858f9edac58b395729d21537a0d4aa7f650a523e6c8746cb23547e0ab98f3f0369dbd16ffd1ffee4f74a2d8e47b280dcbd37c8c981e1730f3d98ba24e3796
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_am.tar.gz 756275 BLAKE2B 97c6e016aade4d76d53903e8bfdeb6475f44732677d43ccae737f505e24011fa83c22382f744b99453ea11af714bc47f0eeb40502ef6bdfc5124409df00db272 SHA512 b42f4551ed5be62fe4b0d6843e177ef0815e1febad67d176c3ddc2d6898c55ce7e8f59c4c61c8029eab1cea6b7c7b0b671f1fb09db27371efd3000393b4ae059
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ar.tar.gz 2417528 BLAKE2B bdc51a5b13265c8538ed29eb7be00d726d1a4d20752271635638b703e1521ac2ebf40c841ae52c726f8194f55df481a9037151acb2a8c41f01dd06b15acf5bf9 SHA512 490492755bdf878ca6d746f86e52c9559e420945907761c60335342cc91ada6a779849407f31e9bfd3fd9f077509b85495537b2ca0b2b35b188345dd30c29293
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_as.tar.gz 533200 BLAKE2B 98e0288fd1bd490f8e13f379d83c3dadaab41009b0072e1b179493d361ab2c10cd3a78d382c2e018b0df676ce70e5276fece35bd7155db8a6dc31854210eb590 SHA512 17c99225b1c2f4198e52b5dce672cadcdf0b253285da15fa8274f8e5d7b6f430fb8fc98817d134f66b2f33b5db7b2cf9855ddf61a4f26b59d9951192f81501b7
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ast.tar.gz 440940 BLAKE2B d8ed890fcc5afa559756af0eaa298e261ee977537d27f1698561dd2cfb5cdb3355f977d11d6ea122aea60085f78407337780a7e2762e3587337017e502a333d8 SHA512 5e4b775ae7a4bbe717bd1a52bbf3da34a49a015f5d224b5fe2e465e1957bee9b918031a4c671b707bfc6542e342e63bff8ee400ec886ff172bf34ac40b3244e5
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_be.tar.gz 1060082 BLAKE2B 3ab7bcbeac133c97d062fa522cec611198eb57905cb4bb958b1e93b0b4c7d6a72065417fcf6b1a41ad05337d0a3dfad8abfd4f1e4d6306a12b81dbae20e2553f SHA512 aa4b997ca62d32ea5f2f18cf75e764b95ec5e8827e445b8c0fcb380d8020ea5cece42cd3dcdeb775022fda30c544ad8de246f634c2b0fe583cbac7198d34d17f
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_bg.tar.gz 2206753 BLAKE2B eab5f132d63d90aaa7b47c4490fb59d55f212cf82c0ae81341c5e81b437bb1fd36cabe04849805962766f03518b4f44388631f999e92386b417afecf0e5b3202 SHA512 5813bc36f8dce1de3ea158e83a3c2b8ce6f0a9965b73c5c305d8848c54d44771ff71b76fa70340f31ac444793c024d3aad9fe1a4d5bcdaad41715586dbe78537
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_bn-IN.tar.gz 620023 BLAKE2B 113a534c0f50505adebde7e9ac893f4a428c24feb1985396fc5a9dc4be2f597fd99c617addec6566ad439482d40ae531c089b19a4df9452bb634aa9d1d542870 SHA512 4a84ac5393fbc75bd965b22878dfd4cd5550ea8d6372a10a55f329c35f846b10e46161f8a4c1138bcff3779a017cfe4e5a1e76f97c8a55b7d75d6ee8ebf081b6
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_bn.tar.gz 789031 BLAKE2B f2f2005c0c339b25ea646afe1f8f97063caa2e0a7bde605b8ce1909f79a589819800fe42c1e8253e2ac814f7106b6b5072edc9c9b77fd45ef1da4278c4f22a3e SHA512 8a16d48dca931bed5c17f6e571f9d36cea190d4de6b70c51a1e3d8b0ad4b7d11f0887f3366e4c1d2dd428d6235df47810738b4f829e49d543b3badc991f25ff4
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_bo.tar.gz 380600 BLAKE2B e1f24cb2cc11c880313f62d7196ce73c249b020ced6be52cf58e6f137d4b4c086f543c1d286c834604e8f1e80fd348f9a680e3bdfb91096fe396ac7b7c0471fc SHA512 62de821857162a32e6005d2209b226d8aa399be2cea80b606ee448ee84ac20a406de7688fc47f6b79669fb5b00752f72f60a1de04e033ab137659e735bc41291
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_br.tar.gz 1857304 BLAKE2B 63a459175a10eef12d8bf72206f07751904804469b81e7d283995305940a10e5dfef72d99e04f4804c488a7c0105fe0048d6373f21cbec99fdb49c075c8f1afb SHA512 e1b5a60ae69feed0b3093996480a7820e433f90f2866157a1dcd78201ffc755d8bb83fe0b14b4abedf5717a880122acd932c01b9714d7607c33f16701705ae1b
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_brx.tar.gz 337905 BLAKE2B df1e59f1ef2d2485199e3f673b8de2f5f52f5f9da9ae0cdd053a83e9d80be6505124ed8dd9fa6389379d84d8909b2a3aeebd952efe2831119d2f3ec4e8b259bc SHA512 9a382bafb156de95e881c245e1e8d916035d86fc327744a7ea1dfe0b70c9d8d3449f5b5c419efe32090c888258f944fe1075234722e61eecd9bb419abb735e8c
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_bs.tar.gz 637420 BLAKE2B 5de28830e50ce0aab7e76030785741f0a4796323bf23b2a9349f8c85d5a863b30c87c1a141cf5e65bfa62b0103e549ca7d5d534721277e6a142e5fa52987520a SHA512 fbcf705ae8179fb0708fcfd203ad0fa7779e408aea4d5eede030aa4226e98a7fea076e38b57e236a95509ae2e819f57a86a4c7df07fa4cbc32cefd4b8e308049
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz 1977010 BLAKE2B b131bd44042570d795a99ca026415670fa084ad41e455646eb58827c150841e8d3dab6803699dc196f2eb87218d880304b03ca8ec9e627324a01e42feb29ec6c SHA512 d4f2e2ed2e9363c36523b07b16e732dbf6257ae0d3c09554882ba4e29d5b7da33b87e15e4c5d7329ec937c0fd599a1f69e028dddf291280321eff1cb5c046e63
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ca.tar.gz 2008906 BLAKE2B cc8f14e9eca6bf5719d669c2c84b72892aac061ed0e10843fd3f6e51f667acd98983bc70bcdc743432a1486a91704f23138198a604e58f91a03cff095c59430b SHA512 b1f0408f56075f933e406af258b08e86fb4ad6160739ae67c39187bf1d5af6102c500435adf755e0dbf75ae6213d34663e8bd1452c6627c24c809fa69a0224d5
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_cs.tar.gz 3176032 BLAKE2B a90cd0266ea55ffdf09cd963fa6074e0e36e8463f86de6d28c9d4f54010ad2c04bf630b0928f1999d1f18888fc646ae44952aa3395923304d762033c30c75de8 SHA512 81e9cb0d732c8d1bc9c619a3c181795cf558c5924675524f9467bdc3c1e9d66f8503c2b2f4f2f0dd627ff06e64afd5197942844bb571f522948c38aaf2a1acee
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_cy.tar.gz 715779 BLAKE2B 21c23a673579ac6bef0863674e3c997b3e8cd73c347b2299855502738afb199d2b4bf4a450ed223099ea6ef0e0332e1543e0cd4bc9742242bdfde3a916c885e0 SHA512 40ec935c472d1aef5ad56f39afeaff3d10bc52ee0d363a1bda80d1249b1afa4cdbeb756086da8192e0b554bc85753d6c1758f1a6f6982c616dbf4d6d0ee69f67
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_da.tar.gz 2618733 BLAKE2B f52f79e4e2b4d2ec8865f944c6006fb71a7c78ce4e82fd4518cba5f024bdf3123a889ff381ade17d9756d2d69d3dd7c1f4be4585e1484eed99e8c27d50dc4bc6 SHA512 83ab38d39aabccb62d7272ba57b2a307e0de16eabc892243dd561ed57c6adb1fd97cb07b71abfe4b7739d1d710bb3561aee7af30f813b764e48d4f4a19495aa7
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_de.tar.gz 21745846 BLAKE2B c9676532bfea94a2aa519420eb2ec2f8bb99e23ab0b241524577dfcb0ec4ffb11d1c7d89e585d7bf5abc5d09410918ed967ec437996e42d8f9b906310d852397 SHA512 3e3b5722410ca1d9ce6c0822700562ed5d1242ee639b05717d8ab276b948d31317e798847a51325c4edea161b5d33148a8d5213b77488aa5731995155f01267e
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_dgo.tar.gz 442854 BLAKE2B 64b669a8ea736d51fbe2f0fc1ad210a53cb5d3b2fe9a12f3dab05f8babdaace9cafbe95e31229f6e70f0108d53e881136635e0f0176eee153cc61f3f0100ff86 SHA512 744a95d9a4e112a17b03730323d22ba3737c5bac0031f5279eb827b3612c2a8f4dd2d47db897b4c64c2b809f72ffae7eab968ea6b4c471c1eacd3986fb796e5c
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_dz.tar.gz 368433 BLAKE2B e7b376591ba4bf54201f033fabc1dbc93d421ff1a65a4ab352cbcb8d35e4ee94e6fd5bba4b1cef84c3ea297ff7c54c5b35f8f04b91ebd4b2b6aae0587596e1df SHA512 4fc1deb835a14250820744e54baedcc8a5d9e9e567568e097c8df219c0f9bc127805a80d866e88334f7a2b59f4196a3326f218e6fcac9a446f8f045ab9d7b4e1
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_el.tar.gz 2815858 BLAKE2B 2f3ec67d7fe910a0e2461fae508377c24a5811fb5ece65080a5182b71a52f7bfdac29e8b98ee9be74c1704010f35716f66733016acd2cd1973742c4a41a62319 SHA512 17631c61fad9485ad2ec1225f98e29fd3edc1ae9e3f4617bc970e2bef48fcb6c25ca5e64b4287ad800052edfb5a3e1bf27aa52e393c0a633ce03d2a3fd072c5a
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_en-GB.tar.gz 7247545 BLAKE2B 5eccdc663fd2cb75e610f0c06d9f93583d8704ad26f1b5e52872293dc521c9c86a1d837c973750c57f9196579f8868f3ae20bf17268d46f7bb292a076af32870 SHA512 0ec8bfed7e8149dcfbf71e689d2037d0470f1236a187d48c684e8619e200da4ed99db8c6549a7ef918f4632cd98905b79afe27aa1e81fabb89b6e3f7158f8d70
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_en-ZA.tar.gz 6847075 BLAKE2B 1071c248c2ae88c865c4e3501dd433bb61f406ee5dc022991f56f00779ef1688a16b9597b529511a179ba15ee02e49f9c64ab506b0c2ea71f77d29bf4bfab05d SHA512 7e0831c1529a3cf9fda788a820be7802fa6378da61805d859bc47beaff379e8b51a17346f97d2e2fd6a1ba265cc9c19f3d07650cbf219e7aab8d45f60f141c71
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_eo.tar.gz 711826 BLAKE2B 886617987f494215a1f446774f025a87f7791f73ae525142f193131aa13d85053ca4858a02a5151e8e8e6f779d502e4307b5b727b3ca6b04cd2f95b9ea81621c SHA512 7dba995c06c44fd8281103bed174687bdfc31c3955181a8d9b1e4c265819bcb4250f4412f2252beeb2cb2ce8fab78a2394b3775f7804577374eb2a2a90cd3496
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_es.tar.gz 2231733 BLAKE2B 0cecf8d408b2d71a0477b8dc99a8b17366d4af66e5e0b571f1fc65ef8bb7298e726a11ae415560cfbfb8f4b41b1e84bb497cdc6f48dca75e4ada053a6d7db181 SHA512 f66e60c41dd35f374dfe203cbea175497df1ccbb9be3ec9dd5903a09889f696b0eb26d69a849155e3fe85fe53bcc34ca2bda8fae63ab9fa50c9c03f9d63fc835
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_et.tar.gz 1624087 BLAKE2B b28295c499a8b337ec951cf076e5a37e4ca8fc4694383892cbedebae4e8c6469be87f12fd37a758e0dd0a9f58d97e7bf37373bf447f363b9b3be0b466a86f4ee SHA512 b4d2206c6be43241c62fea3d76b8d822b39cdff9d349a1c5eb747acb279218e139005c367989d74674fb546607556fb9fec0d2272353a0200d6b60067a829b42
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_eu.tar.gz 719616 BLAKE2B 0f27b1ffc3a5d6b66c917df5aef05252a16361909585ef4d0eedd73ac31dc89522eec05a2725028785f64cbc99d02577abfa8cf4d004c83f9cfe1044d2888f98 SHA512 f4f59fea9a438456b5afb1f6732eb9c83e1d91145ad3068659760b1318a1a051bfb9faab3b4024c13f196f27cf9e94fdfa3d82c51f79559f8e989245c65b9342
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_fa.tar.gz 332179 BLAKE2B 9a4aeed9d37431b3cd0a9855cf0e8b147081da6ed81e8c9f6af662109d09405b493145be14324b691fdbd0189a77e1595714abb98065ca5cd9bca6884d8bc567 SHA512 d22fa8a19d0f827485471869e404d237d3f42999f134c1586cce8213c38d4ad4480e8dcb196722137c2c6ca2f7dd3c300f173ce782e42a8f5a64fd38d6eba4bd
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_fi.tar.gz 708605 BLAKE2B 07a0da3c59e6cafee031fa124b3fbeef9f8a2885a813af826a3cc199c2471159e89b1ef0ab3279363f080bc40b185238bfb3f8b95d860f9d99663e331b09413b SHA512 de3a5942676e7eac8fe08abda46424079fbddc65f270eae3057b8b27dd2f4718061310be3b2cbead9c3e07d43aa11e633456b6ba0f93fdeb1adf594ffcac3b28
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_fr.tar.gz 3026624 BLAKE2B 2a5ae9591541de2a09ead84f058e183d47a29247d2f882fdba747d7b89457976ebe85b296867fc542aa10bf4f2277ef99f796dc46be2df6cd3f1f3a63ddd58c4 SHA512 aab534fe3c1ea231301572afa281765c7d18918a3ee7f2f60facaf788cefd634d5a7b728a1bba2f810041430ccfa3698b96c49c9493ab55c772691ef26038864
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ga.tar.gz 728626 BLAKE2B fc4e649455f514c02242406a336b60bedb4e6e399f34443d169f4e12db763f53931bde4a09f2710688734fe2dcab3ab91a596426ce63573fb1be2a666bba541a SHA512 60efc6e0d396a9dd85e10a45f3d06d0481cddd60d8c33b272cda27e7d2e39874113d325ddb23f888e697931e110030f22d328fc355de2751658de783b412185b
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_gd.tar.gz 1763343 BLAKE2B cb5ba1353f70ef73bfc05b975f0f493b8036ed359fffcb0a1656e2e1b91a07eb984f5cd2c3c16fda2f4f7d41f0c74b5afad8ec5660f8c18a17cc0e284df95128 SHA512 6ca8ee287a3fd6b2e1b3c6cd462776cc8ebde6af8bc3f505eb74ea50193a6de92ba5bb13d215e7083dda460bdc65ba2d027976ff35dc6a3bccdc8d6a4808ff8d
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_gl.tar.gz 1285658 BLAKE2B f244a0975f7e924b1e63671e61366b91a405603b0d145e46a90a6b6255f727e59a02b61a2fe34109e9e36e5b8e177de2cf793b141603e847b08c68fd72153b50 SHA512 7b8c1fb37f6fcdfd838332f3c79c59f10e28994a0169eea8440a047928b412131bd26a1bf75366d338345cc95f1f490efb63350378d94571c7f3990fe121caed
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_gu.tar.gz 1232113 BLAKE2B b73faff776c9b80c9e2de97ffebfe96ad2b713225f05b43d54c53dc3996e3dd2c45f073d5e923b9034c77ca170f442f9c4e93e20e479e65ed536258478dad45b SHA512 3680cc62ebea5908ec669061262067e539796a2e22df5d7a9a3d84144ecb947753fe5d4a098788602a455dc5a4a2c277e01b9e683cb00efc60f346f295092556
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_gug.tar.gz 511349 BLAKE2B 73a4da99eb19efa12adf6f5c5842ac5653802280093cd7c9eed9da8fd4fa3e5b6f7dc88cd9924c5d0827994642e140c8897b9b7c46a304206772784b267af1da SHA512 2a9e2b1c59563974352352781a865e26a756d3275a38f07da37261200d201aa80e7f706c5122af2788967a29d0a91cde4debb904ab5b4aecc9c8310232cee6a2
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_he.tar.gz 1625999 BLAKE2B 033f428a875d75f401c4b3178bd68ee0897fbe25f7c676b18a2fa0dbb338c552a21a65e5257fa2dd7ae41524f08397e3d05662139bc1661875ddcc3490aacad2 SHA512 c821c21576851a2241dac7ff5627ad115f03072b9510ccb4353288905900f8a61c1e2159d722a90d929c7fcd79d027a879257639f464079df0e7c36ea5335f98
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_hi.tar.gz 572100 BLAKE2B b5ed72164f7bd6f7ced06f6f1b6f53e85c56f25168d7abe0c97674796865f6f897d4eae7e081e0e65e94e8f3e53aeb972fdd9cf357208da2edbaa17f65166482 SHA512 a0c8e130f31979a2d5c547af34f2698e3ab37ed7b94d57eeb45239b5fcfccc80e11e42a9c0a240a96a64b45d3a46933c95c3b1e81a94eb5e39602d28279915c0
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_hr.tar.gz 968699 BLAKE2B 28ce548efdabb981869b2fc372a68f9079fcb83bcb2dafd778c9dc5fedaa67464a1351eb921b4910d03b3eaf66c301c9c060e3bd0877816b8a9f27cba9bce8de SHA512 c4c4463c47d82501549b253e139035e50ce8a10caa2901bb10cb63082758a72143ad9546c10192c80eea41358186110e81293351c38ca14b98623e58d2566f86
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_hu.tar.gz 2993783 BLAKE2B 700324d81ffcb0d5ad50609ed895051aead93da67b0f96a3b9b705325cc59258fc4ec7ff8fc713bfc082b99b00413eaca1403f82e4b54f745b895763c38cc525 SHA512 b95b9163b643daf8002036b21d2eef16b66a95a3af96201e802bde42ec249926bde054ff02ea189c4d75ceed1be8057b038ede3d78cf106edd2911c75df416ab
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_id.tar.gz 1551867 BLAKE2B 3a806ce70cae8028e9c587c7d64013f6342c1a1585c78a5233c2dec239e50830bf1eae64ac4ef740eafbab245e9378e8fcd288fbbf3bcaf57631f90bfc15406a SHA512 c301bc2283ebe51b62c4f04d003f4dce51d85d66272518ad4a12b33e57561dea840892e3107ad0b91964c68806b731ad7746c5411063efda4b498a1527d283a3
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_is.tar.gz 1508311 BLAKE2B 9af5c7bdc635a77f4f59717062fca3f9737ea65e908f9576e5d0ad5923ddb27abd82c4aede16b22fe7a6594d51f253d6bf79b78424d553c06185cf49cd7c930f SHA512 34e312280cbfbad6e9925412568513e19070e6159b3f19d1b011bf6599ccee368a88996f31fcf9f6b2b9841be2195b4681d1d35d157d6219786fe5bc3483b57a
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_it.tar.gz 2058642 BLAKE2B 47de4e79c7bda793f8ffcbab81cff848a5082c6410bd5810f29692edbfa933b15d5ac83bead65332fbe256adbe14449a58288270e5fed52e4bb5f9fe6df7a9ca SHA512 233ec061f4c2ee824f6131f32fe00ee887df6630f49f48c2e8687312dedf92bc5e5b87b5fe92a4641e0a3172dfb8ece3dd032ccf0fe7f7f9572d88a6d76df5e8
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ja.tar.gz 806411 BLAKE2B 22c8324570ea5e58269e6c6c1692451c9f2913a9af6f0dd190f8a60a1513ab39958b4b0597ef44af36c02191e778800834275a2e76bb3fdce410f2f2cfb92495 SHA512 6a7b39fec922e31b5efa8aecea51c803c98fd2db1215b2b8f256bb2587f349170e9e733908059473be1f4ae8ed42f8a63b86194e55deb2ead76dc76fa012f69d
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ka.tar.gz 361894 BLAKE2B 00b0c9dbf300c177b5fcb5211d1d2d451a73043826249f15f732cb691cc8390dd08b3ea1df415aa35264541e120241f4f8b8a706edfc4ff2f50de235e0c22d92 SHA512 dabc2788f4f1c3c092211585deb3fda68e096a55bb7a69d2a30ff1b64b55082ffe1b7206e640ce3106f971a7a75fe70bffd40a19b819dea392466773a74a56e0
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_kk.tar.gz 772800 BLAKE2B 83d1acac1f659bf593e1dec85dc290219bb8a1e664ae0060fb936da1d0304c98824add8f91798e730eb06e39775d5f2b808d2f603ffe709d2c76625b4160f967 SHA512 e3ecfbea499864319dc528e00f4290d40e83e08d10d155132a58b44164b7437e54c68c0eab5bf96cc75be5b3ae5e2ec01757ca1d53ad308b5f7b6a7243710f5e
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_km.tar.gz 686151 BLAKE2B c731002a1371280344087fa5e6e8ec5e9e1d54d76c2210a377d087cf1164b54bc65d6afa8472d67acb08dc7bf4f6751276ad59f366e7e7f601ff876bf34f85bc SHA512 bcc8d1e3f8ee9d0967d34536c4d103d0ce8dfcbbf8bb5c4eb9a2ecaf593553ea8a3bb57710e31d874407d3dfd4cc5ba5622e597e02914e131927b8a923c57621
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz 333965 BLAKE2B 7c4ad9b4d580b14c207f3ee61f34bc651271d126c525b6cec06532571c0ddc27a98113fce3cf5e93d2bf7e1777eb7acf37ccafb683149adb0cfe7773161922b0 SHA512 00b970713261121aab99ccdf6983e14b7364bb77a81135268cd8f39ad78c1371590155a97c3e96e7e42c2e60ee06ce044a1c87dc5b3999124b544191bb5ce50a
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_kn.tar.gz 585189 BLAKE2B ae2dcb538d5c1ee3f2ea57f0aa11b8fc5a595316ff73929879915752dff1370a0dff85964cb95c31b50322af73f96dc880e4f8347b4d432fc4b39645dba3043b SHA512 685828a5462cf7728cc5396492fde5a9f18bec186a3855448955f13681a453c211a52deb45ae9b0fc4a6f4b8048a824f0d2945d5f2e3ffb28967d7f53026031d
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ko.tar.gz 812168 BLAKE2B 625c6d25eca47aa7ff9fd0cd88c2b8f8615a689b9afc4674db8de5f58a469373136644b1229f8854f0bf59061f8627f7c468ae32705a51ba34eea2dcc6661e9b SHA512 1dbefa70b96d5c603ff67f7147daaeceef10ccb7ceb127974eac98515d647a34e4f9c0ba4c3beda19456e3b1a980434aab67e9ac70d5950599219ac4155cae6d
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_kok.tar.gz 413303 BLAKE2B a2c4a01472ac31cc72f7d4992efea23a226557a3286d15dd6f629f37e6fcc91c8017df28889978a74a48e2d0988040cf9443c75eb4bcd3b936caf5d06a1f968f SHA512 6e6a11cd7c0491eb71a109af5c7a82a0c2e89aae53c755a627299e61654abfadd6ca69fa1d3fbfa4516b5ab0461c832c7eaded1950996697c6302732844835d4
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ks.tar.gz 330763 BLAKE2B 0eb0abeb1fd98a74444ee2460421bfa217815e8bfcaabc76994fa3d070abbf7288d6adcace43c4f59c4a6f1cb743bf270e889a4c154b040ba098ec9746abfa7c SHA512 5d820293520ce8a44a7fcbe99ce78889735212ec232f6a52dc5fd7218c3fccc980662aaadced5d9cc60da8b07902bb5728712b0b703fea3c837a39c638e7b28d
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_lb.tar.gz 141874 BLAKE2B 8354141bd9d3fc28524ea05ded1ea9b24afa17fed9687023f6c43cbf0db52779e76b59de26de20c81cf1f67147d87c54a53ac425d9ec5bc368aebea1838c0ecf SHA512 cdebecaaaa7247258f26e61719280fe063721ee64754fa884c39f5f4d7eb25e8890361e96fef4b586593ba166581769b07e1205d763c9c461b6c0824b1189e67
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_lo.tar.gz 386319 BLAKE2B 604fe9d60e622f5e5db10d3ad4d602947e1beed882353dd6f787ed09b1167727e7b2ef7378eeaea0a6cb0ac642abbd077d12816eb5818fbcce346329f7c35f35 SHA512 666e62245e07eda9781e7e88e93978004f42fc3138dba7e8f781abdfc262df8823be6d382bf8231c5f884db4117b82bd2f8917e92ae592dd4d1e08f67d9b4f50
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_lt.tar.gz 1021380 BLAKE2B 4de9fc66b25d0bb3f94436ec89951464f8f44863b11ceef6e727727d6ce631493b86f524da996c14ca6482892f6337c00232fc276189f92ea8eb710620145e45 SHA512 5dceb5da70d5027f4acdf329f5a4188fcd3329272feec746157ddaf9b77a7ee9afe0858ce82fa7145d0bccf2cd463e17feac35269d4d2bcef25bfd5f4fd358a1
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_lv.tar.gz 1445833 BLAKE2B 6e74791c153a6b1b00f3374acdf5acbe360b58f4bf6af29f0d0f28621ec25e4c86fcfe010dad97b458352d0263f8d51ad1da10866d791efd08a64e58f74f32c4 SHA512 8c941a76cfa79924a373fdff784b6ad5cfa36d1bb339278e1a0cf6bdb0ade8c490e8e92d3fd0df5c287353b2c5ab0b7103ec4bb006396a3a6658b4b423dd2505
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_mai.tar.gz 331429 BLAKE2B b54f19cbf6db09f76175fff537461a13faac3d7c0d42ba34248d4c97bb5b251e9bb798c74f712d78fbf28a0150693c11414c3efe4b9579d79982d6105e96e08d SHA512 1e87e275ccddfa9aaa24cce5fb3f4cbae6e146324258a483552760187827d460226649c4fbf8d48f597c0dee7aff30f9df5903987909a058758e12bb3303d1b0
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_mk.tar.gz 384180 BLAKE2B f06b356768ccd674ff66ca6d55e055ebed44feab03aa86e72dc873d3a1e14fc20d80a6939b47cbca21e5dac43ad7ef70c737ae81647edb2545cb5f3397fc79f0 SHA512 bbac83fb9fba8d244e4da84806b5f8857f26c7aaadacf1081eb9f603eb499526a80bdc468baeec527fb8a11beaf73b678fa7a54c8c4085728d520b90bda67959
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ml.tar.gz 545920 BLAKE2B cf5f66ffdc561263ffb23852a0d89cc3387c76ca6fd4b5e45204809f5d37a167782becb50eaf33363683c0a06c8a7ddbd4d71d63b7bab6059cb04238c98f7119 SHA512 5b2836c91f016e38bf306d13eb5ed35a1214acff7bcc37d68d0a15c66f911b9373c98052b2e7404f3a1763ad9820923a185b4e3cb29336b9169f9f1d42520c27
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_mn.tar.gz 510382 BLAKE2B 46e4c50ff71c3e9c278a4c39efd845839baac7c8abab27fdb460c74315975d161320e7000bc82a05187317f24db0fed9c30ac70002d000410457dfb497021891 SHA512 0a30e21e02cbe0f36c4addf6210b01c6afda47ae132e981f394db24d726884ad1fa65919b0a8b1445d976ef030908f008f9f1ed638a4131d33660eec01a2ffe0
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_mni.tar.gz 404388 BLAKE2B e7a2e376596b3b6e078aa5d264506b9a94c47f78b0e2113854c642bff4c7788136b190bad4cb5debde3ed61ee2430fc075ff8335f766fb42c08a0582e5188b74 SHA512 f82b8e829b1d98ccb19bd5112afc076d31da152872be4daa3b7dbad1b382dbdee1c1ff8271c119a25bd8ace1e7dcd58ce4a330628332c4829067b3f0a0964f44
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_mr.tar.gz 580161 BLAKE2B 60c63c95d48b539c8968d0a365b0124e713611c4ed222a791a0b6371691d01b7687f707d83a47aaef0820aaa33190bb32be9e9f6fdebe6112118a791b4743d08 SHA512 a053b0f123f98569512c82791a13288e04d62fcd6b1183dbd71e0f0e722aa4685e4f25888904061d77a9e3bf4dfa6cb1fc604c78b7dcea18d0f765f1ca045355
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_my.tar.gz 466213 BLAKE2B 162379bfbb642b17149a2fbb7b5ec243ebbed96a5b9ea8aa6fab397bfa30765a908e1b3127ef5b80efd59f094eda260011beed5946fb7f589fe52cc44f0ab006 SHA512 d3c2f02d0c98eee1b9e31901f1b018a12498db19f5ebe86e602290f6d5f565f0e1ca6b0c9eb5918880f6b188b83b17206c8c6627efba64b97a515b5df2cb4eb4
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_nb.tar.gz 3712122 BLAKE2B 7c39dfc8d2827f1e6be82fe007091a2f8367554414ab9ecd3e74ad6aa3737f7db05df71815578a47bd2a32887746dd2bbdaaeae13425ae4e76f8363e4883a1b9 SHA512 461225c4f32725ae115988c821965859561436fa41cb0ab6467bc6c019bf5ecbd8c782bc3464fef83cd0f569b2f4416be860f121cc004253e03be98a7eb5dd99
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ne.tar.gz 838454 BLAKE2B a0ec28ab84236bee1320dd1821bbc2758e935fa291b88433a89360682127cfbb392b9c1524a037c38925bbfaf87807fcb0ecd1a65398bc116f26255f2a4e8069 SHA512 282cdd8faca60754bbc2f3a5d6bb49567052ede47c4ea461709aa619652e8159cadac5cf96522e905e8eb6d8902700db4f983c85577f2d30bb1da2eb5591d2a0
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_nl.tar.gz 1514861 BLAKE2B 349ee2056fcbe3a78818f5fd4e17e22ead789707f0e5ec5506a6540b6f439b418001b00ade1973bb78307e9439a070d1232f5578d7a1f409da6302a74e89d7b5 SHA512 f09c5346ae7675da3754d36b9266c4fdf820807a74aa86049d1df96a4402f9ae2d8f2a0d36a64ad60ab674c336e2b17066534d25c56a16fdf0c6d56c66fb401b
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_nn.tar.gz 3714884 BLAKE2B 5f648fbda98e6371b07be132a85ff7757e1833f9a91a393df14ebea10a6663970198e08d1941f097feb9c031cb5d6ab37174638244a5ca3bb324444ec4c6ef8a SHA512 494a129f8b36349a3a6e8ca03c4121b8a02e75e68858b29cef30364ba1242365e190efc8f42f9e9a486f476d3b267e84b196c79603dbc2773f316bbd12709ab4
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_nr.tar.gz 277447 BLAKE2B 0a6fd23f92f525646ad20177f29069c9911aebb574aa0515ba7a6de8dc9f56499e89373e638707e77e5becf023d9ed97befe064b2d863eae2c748503cc26a7b5 SHA512 e0d45d7da8a7f9c04494f167d97b0333d49682c66fd3a5b066b5957e80b2bf89dff0fd4a5e07b7754d0381262710dbed74522dafd8a879dd43673fc1cbbadfd7
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_nso.tar.gz 322799 BLAKE2B e979b41b5f9b6b8109d9bc8a67ca7b7a11f6f5ff88e7d355ba4bad3f283e3d422550d943d5098d68514e6b7cd4e5a3e0bd7a0faba96c30b49dce1191a02f3b6b SHA512 5c8d830ee4553705b0d40e27e539a088e1056e2103fcce7df9f2d05d293973eacfabd7277d3e53dc1d7f28b0c9aaa8ee49094ad1db41b0e8f878e63ddf15d16c
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_oc.tar.gz 873995 BLAKE2B 844479476d4eef0ddb86adb13860d2070b5f3dafd9ffecc100cfa7a2d570e62d0f00453231aad7b395005a1bb4fc3d4ca1c71cda61b3f93098046a7d7bbc526d SHA512 0a81460361aa5dc8af796b3941030f559e1d199a096a375a8ab1d18249fcfec535480554d1134e3da3d368c9d174c558ec9e6e1de1a2805f47031f77a6b77ae6
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_om.tar.gz 371326 BLAKE2B 91c28f1beb28d0a51c5416b548f8c7e3c09403380f399e0c58bfa27dfff55ff7478c0965f2bd2f892556f5214ae71ce97823f383ed362095c3810cb7d2d9b12c SHA512 508ea9f29193b7fe40014a56ce8754e7f0ac8e54131689bffd9a2ea4891f3a13c930a54458f2a190ea604b6a2f4d1a8b90d4ab0ac96011d2af1bf37d52e1b67c
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_or.tar.gz 603227 BLAKE2B 2e323b34b9c0a35ce75b97563f23ee6c43fb03bca10c407283d121c629646609def1d818412bf774bbe22045689ce984c5ef8563b5a72519e9ff460b7f32f6de SHA512 9c7109a9906425a9a08f5e8f0553b8dd9c81a04feecde213c0e6f074f0340acc6802871dc660e9ed171dcd998996958560a0a90f302e1ac936dd768527a2dc93
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_pa-IN.tar.gz 473717 BLAKE2B 1384a5fb853794dc664c1f14cea495cb4679a17c43a4ed519a795b2b3eeaacfda6ccd6665fd0eff287f7d9242b5f5bc90c263479049fe813149d3814d3944039 SHA512 b8679b080f63b0bf00f8f9bde20fbafe7edc3238fac9bc316203b958dba253068860bfda6e56a9ba4c3726afa3c28c54040e3f1dae4bb9f5074a6dae8ffec485
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_pl.tar.gz 3083065 BLAKE2B 5c910e7babf0db9f1bcdfc7345a4d5d737ded3e5cca077657bd0af5d48e2029a97690b2e8cd6d71ea1e4ea49c1597a041c3218a484aaacf3db4f4f2ad1571c99 SHA512 db3527d37a4f2a6bacd2725b25e3de52442fe44d3a1e6d627acad14da52a300e59ad7106ee72d29265c0179d03c288765334922edbe9eabdda99871d2a4f88a7
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_pt-BR.tar.gz 2805990 BLAKE2B ade6e451744c0b85f584f3f3b29ad32e3d324d32e9155b6e8e719320835b4ae9bb7d716e7678ddd296362789f86860aa1265181b98cfff13d68d8eb01f537f56 SHA512 894aa216bcc634faadaf7d09fad058c9a1f0c2989429de3e5200356602fa8da85fe6b21c91edbc42e968a60b2435eb645e82315b30783bcb7a06ba74029d1241
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_pt.tar.gz 2361138 BLAKE2B 97b12f2fcd2230194a99e34b4f8634620f62f9d30bf157aafada64ebd0ad3165577de240191106ed178a163d2b962459f0a23e29e6913213a8bd310c718ddd8f SHA512 ca8e86c0f9059b01adddb4ed6ed29f102da664e20ab5dcee36705251538dbb91d02ae406407b6407c8498686f45e34310be3234f53101050f53cb11efd9b68f9
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ro.tar.gz 2534021 BLAKE2B b969ee0f1fd815bd4037faae6957d71bff4ca790479d90159aa9aa28a19ec3314f329ac775d55357bb5ebea33866a0feff80b656efe04bc6107cf1e8458cf638 SHA512 016c59da00699b75cd7b782d199a88f5616a6bef5c68e13d93a36b7dc2d3e0b8f4d8f0a13493197892e91d5dd49a8dcb725b2f5395c8a58852a9ec3e7828d026
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ru.tar.gz 1882079 BLAKE2B 357d07b1a453c81a6447d13da0ea6e5751cccff29c9da313a71c54865111a7152a77a3fe45204258e133ec7e529edf14ab5b56d6cf10cc910c5472aaa1446b73 SHA512 d81031b5a1ac9a4955f72ea896101e6ef875a7562ac7d77ae3af85cf4ea025213b47fedab2378055481956283e601443c38f2efadfebe4d4d79053ba64c11446
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_rw.tar.gz 344561 BLAKE2B 66eb8ca6b867a0b805adc35075c2506b8ef4f7f09d87685fbf92d79cbf060f7d2f92509886716909d4dc8c8885dd1350c652ff05c16b6478a7705b45d70e947f SHA512 9d494648b25cde40c5ecbaa67c6e2b226ea132504298d7f67be0786b7b01c8a56fd63c4131db83d58a9f18753a8072ce097585fb8d671dd655adf9478fd15cd4
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sa-IN.tar.gz 453018 BLAKE2B bc879e93e59b54ebf488ca24962665d7cebab3b99535f135a04de8c0d271fafe3f42af9eebba9fe3305ae1ec7e489a5d3d5b599c756d0750f2367c9005bf6b54 SHA512 01afe6e155bf74e707fea0289e0250e11bb5d3653fe50a4d76e92941a8f6a7ea5a9e9e93b5e9eaf29fcbab0c983222b72540413caac400bc023caa3ec52ce4c5
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sat.tar.gz 524675 BLAKE2B 09d9405bdbc6fa85e72e9563a4bc1611b64e919950de2c38cc44c2663265664a9d1864a72aa0ade065246ac3748dd2ca4ed3eb352e52e074576f05de7a663bf7 SHA512 421b47a4fd9662d8b032fe1f39855c7b5db333229818afd17ce708e632ff93edd836885e66b1c27c17ccbb73707ad8816b70759ad58a8819de24b60ab7e5e32c
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sd.tar.gz 439510 BLAKE2B cf5e0853ab43dd757d8bbb8cd2bc5ae3d3f743e6975783d2aaa7676e55cc4960181a6be4058202a125b53c2f3bb3be5150ee75ea221f44d3b9dc14b2cb52cdd1 SHA512 0d73e2389a75732562988af6bdb02c5e0072a4637a4f15dad05ad56cdb09bb21b60ab7d836f74f06d9954c44572a0411ba15314d57813465b4e6cc6b18370142
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_si.tar.gz 739224 BLAKE2B c973293bb9f92506484387a0d090471d9f666f23d10d5d51480ee82a4934eb616a7758166017fa932de4841eb4ced57d3dd7b3723e079bc5e4ed94c5efc97c9f SHA512 9e2cac17316a634a73ece1a759df5e1b18f6710af1213849e614de7470a81e64cd1404cf672c09e33ade74753a88d36a382a5ee21077c127036f71cae44d5710
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sid.tar.gz 452604 BLAKE2B b4039366146b09b6a04257788cd6f1edb363932a50722b9cd9287cf0fbdc0d9f8093993cf26c0cfdb34e761d5d4b6b65a7cadce1637bca87c953cfcd933bf869 SHA512 7ab007bbef84689c1c795a77240d7ac5d50c898373cb25bffdaf9620c6857f43c4fb275e3b6ea71da51a70cf9d85ae6f42fc2f921b940e856c511ab4a99a1ab3
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sk.tar.gz 2013854 BLAKE2B be680027d6bbd1a5e9f6d86ddbc987ca0f84d3416a2cd8457c0c18b132d396ebd8d22b84ef7e352c869396c91bd0ddf04a5e7bb5cb54f8aff106ba8ac6a9d2fe SHA512 e0cee6bd95028f616c74cc80b083ce16d3e282f429cf264a62806ac7736cf22f6454bebcbaa730abafa228d838c06a73241464f1c2249b2e76766aa50a0b60bd
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sl.tar.gz 2407151 BLAKE2B 684436e19d86c8e0800dea8d62ee04ee063a8feb07dd12768fb90283a225d02398bdff899395f532143f84fa6a077b6b7e9e092eb3c6c62c6b1a7c969082d1d6 SHA512 560eb7c282618711adbf85476dcb7cd58cb757422c43c2b54dfa207474a24f7fe41f470f58ccc9607fc6ba27de784d31e231b2635a80dca448a2d6c36b58d4d3
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sq.tar.gz 1166137 BLAKE2B 50959aa7475f1e62d2a307144f48148444e0933ee0bf1c7a22ed678233e13dae183338becd0629bd3ad390f5979d6f436c896d0f5f9d974046a2a14c464dd4c5 SHA512 64de75d31fbfd27a8602335bda8bf78bcd55ff8cfae5fa5f8db39547f294bbb16de3693a5dfe61f8cfb72896d5c2ec35e9049b556f15cb0336eeb8b0817dd1df
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz 1461736 BLAKE2B 9e247e35641efe188e505a70e3d4870ac4cf09f55fb979e8af58514ddf2a7e628364246a66c1344b6d05b08e0b0a360c9273d9b7cda654f0cc1eaf065f2aa638 SHA512 eb4e0c52b10584cae53ad632f610d1d7710a9eecfa317f5e9e2e36ba41b003cf336b50c543f5ab44cf51001f295bf2d5d5430aff084326e924629a464005511e
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sr.tar.gz 1480155 BLAKE2B 4bb6b4a5466e55596537111110bdddd12f77919f0a36d0d6e20d313c5ac2183810e2e06d793ef35cf66af9a4994c019057f69f2c61c9dc324b5d54e029b5ec9f SHA512 ff247c5c439a62c05c06989b9fc17a82505f91b863b6b916edab98aaefa84f2482d7431139a34c8c1131120f019cf27c83ef3361f057d3e0c55a75ce433551d0
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ss.tar.gz 286612 BLAKE2B 545d6fecda6ed77f4f0bb323f1ae506b44aecf5c44a8c61f96748c30ba8ceb0c1e88a53f4609a32a2dcd2b1479c581a1c28219fc880b53495a8f5cb582377836 SHA512 f22ac50c5831af16983a80e77bcfe4d142ad9a9ef3a1c8fd0049283026d8ce3c4e03f9c1d69bf3d5c9c9b495f428abb16dc39d9c919d52552159368f206f1a6d
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_st.tar.gz 278919 BLAKE2B a0fabc1c3115e204fa00ada15411ec1176b1568b06d70b093479d7750153ac2ba2391757c454a266af9b230bdf900b98e7323f136c890bebcfae730a7ff39b3b SHA512 9ffede9c834aa9432389f316c5d828e210cff984451bb7c2e6e36bf5517f5c8da4457dec82492f2b8dbe3a99ce6a24f57c11a70345174f9608a23dbfc8d44c34
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sv.tar.gz 2537143 BLAKE2B 90c31cc450fbce28a61f18c7fc9c25b7f938e656e8bac8489e8dab3299adaafcba1cd3f9355d732004e307a9bb946247204daa89545a1d5b87105f2e532d0536 SHA512 8df4202c1f28d075717718fa372b6c848dec6ec396006396f504bd232568c7def2db87bcf3063aedd7551f39adce5707da7e2afe530bb18a563af958bca9b019
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz 319150 BLAKE2B cef537e1a721083ae996b6c8854de86cb13ececcd6226d71dd486d1bb414187ecd092e4450034eff34039761280319a36244d793fc870b20b5c614d9d16f7995 SHA512 333ce6a755c7dd55b504a82c3c5817b042e6c94ad9831c48c4477d4ee1103b35810b09d094954d8c1783b98bc4638184c0c231b379a617e0e06c8e8b0fe5bafe
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ta.tar.gz 688349 BLAKE2B c35aae6476683ff3e6f6dd2d9c89d864c2c3332d7d1c4c271e141d3b41e60d7fe7f3338c4d280741628eb296abb51e18070664793f715ef63c712e7976048c0a SHA512 ff31347a48f95675dff0a130a3d8caa8318b194192c3a46c84aab062f193e155a58815a462c0219d5b61dd0f31606b016fb2f501ee0617d3c14b905d367b1f6e
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_te.tar.gz 1089896 BLAKE2B 4cc37e681858b894474d110acddbd2d7148babb464e6cef329e0f9e07ea87830ba0b1298ac6a51497468c87d067b31ae49314ee7c0013e7d2660ff899e63e006 SHA512 c7d027d1aeb7673519c1588a2413618ab373708c32f678ff108101fc800b5fb749b969910d9614943335e2d332efdeec2e990b08a802ed07cd782ce219531b24
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_tg.tar.gz 357898 BLAKE2B 6f4c2e531a62a2c402eb092f01a897cc842c2ed672eac00b6c5d8034ef44aecdfa823b4aa7566dea894af61da8000130d637fe8b6c9dc9b192431aa47dca8b31 SHA512 d148d5a1d50e3ae5c670dd6eada6ea1112985f4b5fc560b52d218bb288bdbd9efaf692eba20fd7220fa7233b7660b0599f7375b1e85db009bd21f3fe47f94d08
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_th.tar.gz 622884 BLAKE2B 829b721a8a1c9f57de6f1f3597974b11bf459b607f1fe12b89e260625f5296692072a679d57844dc19d36965c19525fd4504fdca32a3123d58b1e4baf37d58b3 SHA512 1ba3a0df6cfa835523308f2b972880bb03d8371d876a809142c4754403a4a2281372ebf8c64adf375e8404a8ca450ebc38d8d8a22c72e7a624e07766f1b22e28
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_tn.tar.gz 258728 BLAKE2B 7e426abbd6b5c84af49964a6b5efde5573c9555bd6eb848c462d195795fff0ad47798e75a2c32afc4cab062267c1728de6bd097d3b6d6727aac636785a35fa9b SHA512 424f683a614de59a27299722fa087c1db3a35a00a1c86112f9b0a9de5f407c3d6db7fc1a816ca16f7422a819b70c3ef3ea6d14bc2e4c625c4c04ee9f9b5e21d3
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_tr.tar.gz 764977 BLAKE2B f39261df293f95c898dd58507dcd540a40770a2e2c594f59df72db9b03004866a5a1d3d8168d764b68fc5eb67461cf6449492129bd073d7dfe7b461b439435c1 SHA512 b836641542ecdd7ba713e12985c43033b526d85b47e708c088c54bfa437fb43764ff54cb42c37e3ad93a6e08f9202c4d27a1476cb4d289157a054aaf8cbcf9ff
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ts.tar.gz 277925 BLAKE2B e1218d6b400cd06b7524b377927b16fb51649464f40f94da848a9a2e12c15ff492c075f3effe238e1f418aafeb1eef93fad7f7a7bc50ee402861cedcbcf4e188 SHA512 7edac3d599be6108af6dfbd4029652730f233be81d2f366c196371aa2ca50bdac37cdb91fa0ef29be3285e1f22bf4dc5b760ec8bf967a4635fd4a1cb331aef02
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_tt.tar.gz 182493 BLAKE2B 55a75f97671dc126801322e023335b6bd69ccdf26e699ef6751bb72ec2f63ed2391fd7158edda1da7e0281c7e3f91168cb5131ec2d060a55a79db7d1a87a89d3 SHA512 939fbaab4cdad5de4a28f6c48cff0b523474320f9532256a1b174b591d2024a160340b9539c88b6a7b7d84bdca1404a4c6dc943b8aefb13b4a2443652e03ac76
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ug.tar.gz 551086 BLAKE2B 3c3658fe3b2d1ba4b21d44304448c4e1a54a4ce7fcbd6235a66cddc7d22dbac8de1fa45cb83056f677d737fd51d293a1c10dbd90648ac26a9f2321214ddc764d SHA512 cb989ba75f593090c4a1b85fdb5f19c555cd5cae9715da0f6be3c4f7861b5913ea1d052be42e19639a2d9747084ddac78cb7afa3c36e33b1cd65010befd6a7f7
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_uk.tar.gz 1609841 BLAKE2B 8ad4a1cb1b24029770a52a68ff60f515163f33466625818a2f3c13bd91e2b1730a9a0cab6479f6983205a5061d887e7992bfc146825d87736bedfc70930acdc1 SHA512 941cd42db14579943bf6048c7db6465d4d4155f03d4696b41a9688aa5a40c1a8bfa8516d463d5daa0dc09602965e55d6664dfb468884d1a55c0cc44b66630a38
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_uz.tar.gz 314950 BLAKE2B 922b82dda2f81adeb94df092a762d6d97fbc2d1450ab99e901583d304dc3bacabae608a213c96a3a9292008019ae05059665f8cc3e131384feac34fb32328bf6 SHA512 2d53a79aefd1a62e4a5cc096de25d95d754f3464593994ad6f0644110b59554eabb5f20f8115f784edc09a692628aeda382e37dac0632e5729924655626c3d0a
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ve.tar.gz 281749 BLAKE2B 771c0020c89d3bac3c576bc3984ef1c3282e828fe51ce273473249923a508401b259c8ab300689cf927f134d2a413974a445382084635406ed28f0a4c4fb9b3e SHA512 bc4c0ced415589b4be39590ff2fad5e063426bdfa92700fb7945b1cbf478d8261f8d9e5cbb28281d3819d239fc459b433e5bd6982009796ba1ba8a5b4ca9ff27
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_vi.tar.gz 466421 BLAKE2B 61681df836a90523427f1a67f354628a675668a5efe3ea5749d107983b45a8db330411d408766172598eb1c82bf12589b924540dee437a6dd47b68333f475445 SHA512 d6483aa935da8ffe679c648d655ac8c06e20eec02e13d6125b1e2564270c82f8f43567c20aa38670b602772f3d7a77e22f57f3d2abe6b006ba4f46671538b4ca
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_xh.tar.gz 290134 BLAKE2B 886a463c746bf796db6aaf7b623f526c41dff95a1407fb90e7d1e39c95842c23665a9f80e74d1d81c6d602e9e660e481cef5b3cd2f0d20d1d79d53cae62a5c76 SHA512 8b14fd07b3e815735e43ff2aed4f11866938f03f1507e1d958dba137fc82aa1b193d36e8831b77dfaaec8ca1c96d6cadc018c09968d8312e771769e29eea327c
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_zh-CN.tar.gz 791378 BLAKE2B 25333368905856a4a3cef41ba7d94ce987a9a1437b6168403dda912c3fb8ba39550013b8f98f502399ad7ee3603aa0d04331f4fa535f450c94c220683b8333b1 SHA512 ec29cded36bb9aa98fbd2a2d11291027c6869a5607261941d93b45f46d02cc3a1bf315bf2642e00efb88f0cc0094a547409f2920d4ab6937aa4374699cb874f6
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_zh-TW.tar.gz 798513 BLAKE2B 50de3798b2e1550f3800c38a2dd2f4af71d3b3ebc9a8e2b7c1ade198abc7e6fc5165167c29a85a8be9792554a79f7d77a30bd53af43092baf61a1ea598764147 SHA512 d3a254c7b5bd3d3b271d57f031b8ff4257b7322d9890cb04bb57075f4bce81581143b47f437dae4293a881c28aedc8ae1f245b049738eaf1cdb563f556dd75d0
-DIST LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_zu.tar.gz 320418 BLAKE2B d16cc017b2ba3c582e96b65b49cebb820f0a8f7a9c3d13f2ef02e73d14aab96cbcf56401acbca24efd484e7774e740381d43f15b1c429acd3cc7d7f6042af3c3 SHA512 d836dd18a0f68c6ce96f25bc92756314679e7dc0bc419d40adb5a187c9e2dd27b7bf79bed35048586d64dfd38f7d73592ba0dc6d68f2abab672ffbb9bcb7f1ac
-EBUILD libreoffice-l10n-6.0.3.2.ebuild 3365 BLAKE2B ac42e9f05e88133d0adb56e0c8e7288ea1d79c19a2359c8afa51620615f49d0921337242903ca134a8760030ed5a3c7a2171561dbcd6e7b3f04e58951825c165 SHA512 e7c0f037d6e9ffaa42d286fbebefdffe0f21d3f6937bb7d2b55cef9ef7e4c2557dc4b6f30bf9411740f3fabf4063b7b1dd5714148c5f2698419247448f2d95ea
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_am.tar.gz 2520448 BLAKE2B d3727437c8b4e1325e26c5694d9ac14b77796e2e1fd65e51dc1ff07897c63a31d00b9e649c8ae010a4c142fb2dca6f53f824021f4da9fb8fed534af48e934ee8 SHA512 a7bd9e4d3e94798faf28777d622cc28d28efe4ea46801498ab5b1ee1f38b8d3f611081aad3a43f7cfc9530ce97ae03e45090ef0a29169d5609cb83e2b1378a4b
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_ast.tar.gz 2430233 BLAKE2B 05b1e284eff9ad2f531136ba071b6c93f7a4fa30e9697dc98ba47613733070271e357bb5f0b020d7ea881a2b552dc18ac3ab95841b54b1be43f54d16ce8200cd SHA512 88338834af9c6eabb961d533ca2e8d89808b0e8e0372169e5190fb74f036d49d2210bb85c378ed6678f649a3ad4c0164e8868e8a4483175f266475a1460809c3
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_bg.tar.gz 2618865 BLAKE2B c43ea41acc474ee2c11b01cbbb35f573f63be358e5a53908ce2cfb2acbe269d8cdf3c32508a0080ae090bab5a719c1defdd241546e9f1aca197543b5bc6e1d75 SHA512 26c8d43842fb9fed6d731086152359f16a8248ac9e106bccd8a2bc0afd9552b2a290275ad64285c946f3793f94c474cb12c26784d7c788ed3c6848a85e6ad87b
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_bn-IN.tar.gz 2651644 BLAKE2B 289c09fc8e605ec2aefccd8f7dfe18de409bfbf665cfc9c728c943580991ffee06a1f261c1b83a627ba9efc0cff93c548f857997be38133770073c9eb82e51b4 SHA512 bd43f771ee65a2f803352e4ece9457467d40139829ea304979d6e913775dcb6bb3a345c4f9ec0d5f3d79ecb7790500c8d9a1830ce42d09e0d5ae9734815c5fec
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_bn.tar.gz 2626252 BLAKE2B d168e9960f54c4dea35c250590d07be6bd4d7e6f1275f7d80f10802515dd86e27f8dad973e6331aca53463576b3ee1aab13c40ca54d2d5d481b19c6717212aef SHA512 a454616775f0ef31325bb28ea1e4e9007c5eedfa0a18c417e6022591785d3b755ebc251f51f0ae539456434485d64add70375d9573ff9c9875e5712ee993fb3e
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_bo.tar.gz 2638314 BLAKE2B c8ac11e1e444621e66a6256841652e92bd87917e12d9cd90ef428a6f4c4c45f2fda1338f77f545a15e0d37a30eb6a859675984ae73efc721d282a73d7fb5c6e2 SHA512 7d3c58d3d71e31ee1787cb87aa94c21f745911d4e1e32ba6124f968e7a7c7cb918b82ed7802e5a909e2a00de0dbc4e0363c7a2a59ef7f4f9dfe969c1036c5cf6
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_bs.tar.gz 2345347 BLAKE2B b8b95c3164cfcfd4694413c8ee355fe63655fa522b1e23d86c530bc071954ed78bdcbf9fcad09c47fdcd58aeb21721a15a9f6251d261f8049e0a829fa1cc8713 SHA512 f0310f6fdd7efa424a7bee7b0abf146393a0b78f312003d2b571bdbf4b136aa8065d3af96d77293f61c13ca8549730a0052ea22ff65bceb0c13cda8bf22bbd96
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_ca-valencia.tar.gz 2420200 BLAKE2B 1ebd9c54d0e74972afda2e18e2272ab24de445970e685b881f9b7098c7be82489e67aaec7311dd970d89aea4106ca2165bb37977b7aa6c0e93fdd28d6683e17c SHA512 bdfb8a35ea4dfc3cf407ecd89188bd9c30e53c38fae4e1f25d1b775f14cd478ec17f8ece4fb3cfc947670515dd6a2514e5186298a62fe6f248bdf4104361bf06
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_ca.tar.gz 2413294 BLAKE2B 844227196df8417780f974d4472e5d66c6d6e0a28aefc9e2f5b2787a15ca9b2a456666c82ad83388cecadd64bb59115f10ac1881baf3102f7506900771e73494 SHA512 0eeccc3e2f6c4ce4c59225b315280aed2365f35c09280015bcec66eeec8841f04fe311bcc8436dbd0a409372c0ab221dac1fd9f46df508c3439f44a96ec928f8
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_cs.tar.gz 2438049 BLAKE2B b27a14749d8dbc1eaea48b09691c1c06c3c5d14fc01a5e5dcf620fb0722604c2d357f0f438337154cfd7d678c60f4742b3f14da2d36c9d906b9d50276095c6f3 SHA512 bab88afa7d952ced87ae64e1e7c54ee0c4f67b222ea198cbbe08faa5f1ec4f6a28f0081e248c223a026a3627f9302c0f075b2a5b9448a448f0c63a330cdd5b47
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_da.tar.gz 2368656 BLAKE2B 607c26ca03a6c7e0acc39c2718b5dbdff5c728e820c122fe1dc6539bbbd0731429324b73793832a9df08c52258d336f8cc04e3132b37644d8cf9c482d84737c8 SHA512 09aca3fd20eb7ca1dbaf37859170fc8dca9e095fe537f1db715c1edd8afb51c193fa5b04982b5dfc2ff29aa8771348191d4c1ac17b05411c59d861d8086e4d9c
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_de.tar.gz 2465233 BLAKE2B 7b2a7adb59c42b7a8f7b2cfddd65609cff82818f43401c381f6c3294f575e393599dac220d19df8a72cac8b62925f28d1bd598b2a253f72053385770d21fea17 SHA512 c8ed7445fbcf72138ee7320ce6ffd225071b2560dde8a0d004915516288777d210bbccee935cff4d1ad245c5595b6e626b103861e9d42d948371fb156d3b7f0a
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_dz.tar.gz 2803378 BLAKE2B 6c5788d4741ef3f269ef8dbaad57f0db5019e69c9bbdc3000354b9b409db12bc88c2401d0910403491ce74d18aed33d04325919ec8ebd76fcb37d4ee0b572b83 SHA512 c1ab557ba6018aaab2b211a200556dd284dd231ddf8fd15ade53715cf2bc9febf234d2b1785ee5d50879009dd8429213754ec6d5766bf9f9fc23ba9e065152f6
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_el.tar.gz 2825236 BLAKE2B 271f5d85fb7172ba1dc44a9116a3c595ac4e0c55ebc93845560e1355e9b9a4d1a1f42ec6c92453c46e6ebf17c7dd81dbe8b33812d5690497476f28564546cbf7 SHA512 afdb6910f694a8be97f703de92e4d5f3df5fdc0b9def8726253a0a83ceba73218cf65db8246328cfa26f035406d0b7a9be9322a2a3538ad15f7885f52c37fdf6
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_en-GB.tar.gz 2248980 BLAKE2B 5f0dd3bfc9af6b5ea3b7fb5cc53fbc94262ee7a3eaa93df536e31b9b104ceeb623edc2c3a7c52d954bd9a7a3d247c1b319a0b797d0a219730de4230017e4666c SHA512 a5be552ac6b9da5e2065e26280a07d926f982f8fc5e916636908cfe787c282c0425f40c543ee9ecbbafe7fcd2b3b9556d6870aeede51586818a7dd7e71a1aa6f
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_en-US.tar.gz 2105826 BLAKE2B e99d8a65641a6833a9ee36b287921663bf312b23a766cabece41e91ce0955a4483abcb00b665d906b5067bf720f63fc851a4ee72a796a8a01247cf414d4710ee SHA512 8b10118e97caca578845db8bddfa1f29af33b3725d85644bd1d80af479a3589dff72fcb8e698c343d459218d59e1bd8c4cfa39624cc558c360aa6b49af0d51a4
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_en-ZA.tar.gz 2245621 BLAKE2B 17758a4ac03107ac89a68b2bee28f2f52472f1a9733b49a73261f0699700a1fad24d4e1b9be60b78ae0f84d12d1bbe4317df9db05415e4af0e85afb7c1551144 SHA512 d01487e148fc8f40ffd15331e4dd1fbff932e3bf5a885807e792aecdedde901e2764291ab924cf7d7d096a64011c38057992b110d1b71c478e0c94abc9e19075
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_eo.tar.gz 2327429 BLAKE2B cb8f71fb192e82dcc8a4f8e1168de6a91452bfcf18761c52e07a7f4da509cb3409e548bb061e47bfcdd8fe3169db88bd3049369203f8606f5c95216de1746e35 SHA512 4750060ad6b79e04c3c350687acfd04535c0dcd6d1c7ef0466efcc607ce65e8857f294e70b004e40d5a0a5a5d616c36d57c85b3826be0bff4b8b315e71119fa8
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_es.tar.gz 2442760 BLAKE2B 3624de02721a13f26bd3a6b8e13aff3fd91a980da436e54e1cd7cb3111fbe9b788face43e6320adbb9f86bba9fd53b12859f787132d70de87bb118eb1cc48fe2 SHA512 a192e9298020785995f2b7c1fa3bed3c5f93399e9e612e286cbb5b9790b6f5d552b3bd157db63759986f157901f6f9bb2f3502df44ff42bd4a2b04dc5f264827
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_et.tar.gz 2344185 BLAKE2B 3ecd2aa6cd72746ab219bad94b03bfabf54f0d7deba27833fa71dbf077b18376947aae3af48094205b903de0478820ba651b8a62b01dd5b4d971ad2c97316c44 SHA512 1c782706ecd46acc5442dc8b2937828370cf514c7be39025bde95c5613ce3605710e42353517c56037647b1db0c9d3b874c223af945c5be47e32ed75a0b94738
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_eu.tar.gz 2321530 BLAKE2B 1c59ac7ca548a7d258e3948ad5d5379c298f3924bc54b3a1a6e35376ccb576c13e9462d8670a4d2f33e31343eabd1a9ef400aafa9d6fe4dc333623dc7046d74d SHA512 7650897e125f6b543dea332e2c0beace7ac4a8773f40a70225adfde55c0ad0b58ca3b905578e35e57e39e23807935918ca7a9d4d96e9f39ceec75ce5b4da45ce
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_fi.tar.gz 2413949 BLAKE2B 5d580ba7d1e1a55fecca4b4f3aae1fb7b6761c4619288d4e6e1806097aaa81f46c8ab1772b6f094c7d41f2a7e85d8976e91cbcaa5713c556c72f501069ec46b6 SHA512 1a4020dcc6464d3c242ef6030cb7d3178bc025e5dac7c71e0a101518e100cdd0f2dbcd7e5b8843eac03b60198693d5af86da999e8cd8c2a3883aeaa41aa0e4c5
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_fr.tar.gz 2432569 BLAKE2B d602919f1b8214c368062e1a49253ef9d9ef651f524257a4fa458f97a08984c01d684a853f2027757e3424c1eb86bb3952b18225425f85f0f655990761a1943f SHA512 cc06b9845c39e75619ae7dc2ecec29e241eaf7f14c8daf783ff0f53734ee68f8ea5a46b7d3c9ded6f1dc9b3e851a82a175a00779f56004e349f868ccf4a65cb6
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_gl.tar.gz 2409385 BLAKE2B 80223df33d8e36078fe8580459e7349e2b3693ddc4cd35dc2f1bb4aa88b1970479cf5b80a92a23027930aa27e271b748e315132037020794d25b6231b17103f3 SHA512 8d3ba2b4f798bd947f87099d2fba9dece8266767cec3744310458740a1ebe6e8d9ee14f359a3379b3ad6362f735a7adbcfccbee0cc6a3558dba74692c40014d1
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_gu.tar.gz 2298669 BLAKE2B 705d22affdeee0d73c001df6fa72696ba9f538a8956c7cf757c64b0793eb1f5be8be6a74475e54b288ff1129586032ca80d186d861e4be2fce3b6084c22ced42 SHA512 3fa8fb9e2a9baed1b840751d480d01d25c27028e29022175f0979b31343a23022e4b4fcea29cafda7b7e5a00d89b705df9ff11f5c4feb8298a7db10d9ce190b1
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_he.tar.gz 2180139 BLAKE2B c223938adb10e56212c5c62a8c63db7fb19bfccc42846346c6281f2c5654ff460e01d7d241aac86f82dc3e04f91bdd7b82c6ee6e06ec5adc57cde257b279e1d0 SHA512 f049622d17c8e42b152a4bf7ea7997f0e3dbc45d4bcf2ce28aaad839d3189c3fc2f0f43005a8a9b8ef8e84a69748dbf825f6aa8ed90de9c5834d9e90bdedcd7a
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_hi.tar.gz 2405356 BLAKE2B 3781b640fe4eac5539df04fade66815e110b0a34f90221bfaf56f3368f2dffcc5b7b2c0a94649480da1579cf2a0e9fd0ffba0f11ba742e71d307c7ed8ec04ec1 SHA512 29f56a21c845ede2657b1a8574da047466e62219eaa6a582f70832844e6a992aacfea5c768c77af3206ba6eee777cb8e75c59e2bfce5cd440225ac1fe9845021
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_hr.tar.gz 2303440 BLAKE2B d7280b9eac8db60ed8cd9075079e783a5701a1b1dc459b3095bb9fcd719749d5f07755ae42095c47e523dc1253a37b41a24b4e2efdffbfe4a29a56c726f35b1b SHA512 ab0d41f0d2dd3b1724c99c45c6af777f979085fb6dec760c45c7ce33071665c5ebd687cbd95ecd4ce4070a7f63d1bedc4f9dcb4e0f465c975859ef847e8f4aa6
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_hu.tar.gz 2529575 BLAKE2B 498172244f50e78a2194f354ef71198b47c9c27f468b5ece3116bce3ba53e986074514ccfe43af186cb0395fe6ddcbc2fe4ebb30da280fdcfaa90ae26434591f SHA512 e3d772060e659f1a745d3b87d660eb6d369d61a57936a4439ead1a88767c4bd34d3ca51c65d75549c85919c9045c2a240b219eb1a6e3948aff238d44b699864f
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_id.tar.gz 2302760 BLAKE2B 1ba8d132e55df526fa31346adb8e5c97d545c24ed6b654a8aa13d28ab388c7d961a4413885742cf960d2ca773b541d23604c36bbe2569f4e3013c100f6a351fd SHA512 0fa39746d426d2600b2d4a392b490fef228675d0a7bed1e703572ebac18eddec33e755aa3578df4cd24ff7166fa9e4ed6f80dfb2430ed784d5174c04dac21ae1
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_is.tar.gz 2322661 BLAKE2B 2e20c56d54412a45679bdd0a0fdc68bf6469c968641b23e3023b0847e1beda2181d5d7aac701f4b0ba17fa347a815f33ba26b44d7ad9ff067bd42c3c9b2d1d42 SHA512 5afd653b703c4de771004ca493976ae336cc5447ad555e68b4a7205b1644f100f9c2aca07d2edf78cc13c22fbdc41a7480e843a67e95805a8674463dd025562b
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_it.tar.gz 2400536 BLAKE2B 6a18d5bcfcb76924e7042bebbea80e2a5ef0c0c4e254e1d78ee8c790cd18dfd35a04f01f9f6cf1ac8f4ef12fb45f6526f7231cfdd44aa2af6f06eddb990623cd SHA512 b7090b70fec70bf1eb2dbc70f527f7e744d945082c472f40ca6596c54b11aef95ac92975b8bab1adb4e165ca12bce53b0468de158789fed762ed46bf3832bd0f
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_ja.tar.gz 2564301 BLAKE2B afe5ecfde61fa4ae623d9d54a97a3ef4fcbd2bc9b03aeea2818f13dbd12c70481606cc14b7253949f4b19f5f29c80c6fd592f4e3fff80a57ec9715012f783e80 SHA512 e0bc501ffff3813bcb1acacfd180753e3c680ae0cf8bf551cadf524a7ad8ba4d32d4fb0e8799ee68611b4b16869d79c42c178fec2b7b2f83cc9996712c87ab97
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_ka.tar.gz 2443809 BLAKE2B 2e844ee29f17017458b3a337603f7acec0691b0ff6ec4f2197248bd1d7f007744b17b6d660208ea9047e37167504a8dfb04da782323f8cbe153944a6c1693d9b SHA512 8cae6394b3eccaf9d36a27351bbc26e9956477c7208e12fe781146902aca4a3d457d82b6124043504d4c9a4c8df7ec95d2aaefbcb9becf09a23429016baeb551
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_km.tar.gz 2733606 BLAKE2B 5126f3d606989c5828ecb7fde2ac44a58c73be3691998568af931fe0cee249e7671cb31876e807a154a8c2d67c00e6497004e96487eefab72f10b31cbed0fdde SHA512 74a1d98bcc432054ef7be7115451661249daa528bfa2b085305c73493d8049c8c303f30aa25f66e1644b8a1b33e03ac79060f4c1a9451dba216d08cd6241dac5
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_ko.tar.gz 2435568 BLAKE2B 28bc97cd024f789a479df082c1cdf9179e5f94caf6e8b316d292e6a1f6bc02942487e7011c8e97c3dbbbdb4ca1d2b80bcd69f59f172c99e1bd3fd6cbf20e6015 SHA512 6177755e70c4b6c2f4f2be6331e380dd32a44ce4fc35bfe6efda1019af1473e8901f65ec2278506787748fe9b4b7857b1900cad2b78a9fdd9f1992257c5cdeb9
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_mk.tar.gz 2425862 BLAKE2B 97fd5bcfdf32c942e3076aca3e372767d647c53c8b824512668994461f717bb0b36e67a9f50a4c74cafd9ffce3e90386b477a64404bcf5a066d894fdb4b9558c SHA512 1f1b33811c29008742e18d9673a533b757820768f43e7f9d50093ee20cff050975134d7174a2477a5aa5d99d103d539fa4a49e06322c8df8d23295a53f02bf2f
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_nb.tar.gz 2357756 BLAKE2B f6e55a640c0c0c907c67c2fc11b2b6d03aeb1722d4034cae06b309efcaa516e4337a38cd27298e96eaac461883adf419c66338e47552e692c9e750634bab2fd2 SHA512 06004831b8125da157de3711184a8278c1a0711053da36c9db74d37bfd905cbb062df45a522eddfd49fca10ca3c262e95fb432daf37f40d146c036d789649ccf
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_ne.tar.gz 2661501 BLAKE2B 6dca096806f48a02bbe1832431a406432580bd4b5c8dde854b7d575f5cf373cb23b7209b96eb8ee7f571c1ecefda5e9f5cc7444c0889c04e4c85a9616a2ebf0b SHA512 6222faf0ed25d1d4c9aead9056376744d5e403571eb9e7092e220f45ee21d3f824b3a00f42f5ac67aacfeb3a7469be55c6699ba220b81b0d8db41ed230c6ea73
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_nl.tar.gz 2400304 BLAKE2B cd1bd9331dc2a003073f33725ad155b0a2b3b9fbcb51028686a4a24ea35f97f5a2474fb380df3555747c0d8eb695628763b91e273e9a50b04d488f25dbfdd686 SHA512 8d4928555fc729370c3f71df45262dbcb9372715af720d7cddf157b252f91818af99a4b26ce85cb8042edd531379016352e9c2e3858a0292f9df786eff74b10f
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_nn.tar.gz 2340539 BLAKE2B dc1b4d85078602262b6799f08efc3f3ce7e898756d4dd4d963e49314b744e2652386a50d85eef841a02c3208807880b01ccde4a5b1cbf8f577146db11c6a96d5 SHA512 0c6a89844b3c08dcd70d06e05f427e9478019da6029766939cb996f591a2a9cce61929b6b69cf60f740b1457468858142f8836df334877ba9e79daeb53732751
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_om.tar.gz 2433015 BLAKE2B c854044aa7ab1ccd8ba4213bbe8b4678196b82dadf677a07e5866517d334f211fbda0e8b229d71930001c1ceb4da006d5d2e25721319bafec9ced2f778b1b5ba SHA512 8abdea8078e1d21752c35b7d99a54e15755133cdf1d57a94fc6fc1341d1361fbd08b4798c254647593df711f34d375770ee3d10a8bb8618389b4b284ef42d9cc
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_pl.tar.gz 2500028 BLAKE2B 1ea45b8a74a13471baae1cf9337650cef970bedf1701b25651f93a6b35eafd7a1422b0ec7d4a2c57afbc435aa817edf39ed53f1c5c395e539d924a911164c67b SHA512 6ee0f28e25f549d011b5dc74a4612a86b02357c9d69129f43b56c3f59cdd7b6f8aa4067a4228c36139a30e37776889b2c5803868b767b086b1583c606bdb556b
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_pt-BR.tar.gz 2417914 BLAKE2B 93acf89255dce48b917551ea8274994a5dc876738f36dfdf20e14c0a2e5a496e151fabded528af21c9165e89a27935212db6168fc30ae352fcecc01eb1bbb665 SHA512 784fd61cb951ad24b5a85ec72a18441602f631b238614de451d51c2c211b69cac0c4dfe3d5fe4ed574ce5ff764cecd1fb4e03e34a3bd1da2c165d847df6706a2
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_pt.tar.gz 2376971 BLAKE2B a2d7068c2615f09a3080aed13ea01867cdcf146ca1e9687701c485d8062d074acc7587cc6214596a35130f80e67b40c68cd848c8df8cdb30831faa2ebef69d6b SHA512 269cc75fedc12de3b81b48b0dc34aa56958bc58f6f76cad44664fc8b67eff5d4be2e3f991d702f4a522d0c8b1d8a482d180f07a553b3b34799ab0c80d9803dec
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_ru.tar.gz 2698941 BLAKE2B 56dd2246f206adbc5db5daa99c12e99ceb9d7e3566510babb8272e6badb03c0a945972395f19ddb67140a54747244016e738bee25521b2b19c12ee8d82d42c73 SHA512 cabdeaa71ebbe8aff2ca5841268576bc341c57ffffa0d033449ec75dc1eb7467b79ec2d61d53b466d5423e0a360a9b6f6f1057d0c63a730c4b27c56c0a0c5c80
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_si.tar.gz 2399122 BLAKE2B 0f7c8eadd011c240b270372334324aa1222fb39bc0a15445f129b907963aeba16c009802d4712470534165f0deba5c70d0ce0c6c4c1b52e9e21b6e40bfad7627 SHA512 52242290d161e47017fdac9735650b84784928043596955707771f7cafa1464a3e84d5b049816c9a8f1ae31eacde6f8c739861b7fc42b282536c2e0434787965
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_sk.tar.gz 2442967 BLAKE2B be46dea912a2cfbffcde2e1bf88440eaa6ab4da850fa8afcb6e24cdb0e4e20631473be4cd36f89118c853fb0a2922d9fec939ac3cb70961880be97eeb9896f24 SHA512 705d9a262b51016800cd0f18f4d65de2935fa233b20c766b41e166957aab67fe18b504d5912bf0a7e6758b179d9c6f3b774eb7ef4c4b38bcb845d6e150dd7c26
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_sl.tar.gz 2385384 BLAKE2B e9336e13ee239b0b6284fab8f2e8bcf2182c244ad17ba6c00944e0991070287e920fbaea5804ee9de8fcc404047c6736b650c4f6141af151dda194be433b39cc SHA512 efadf5a7c239ca6845fbc46dc023cb4d36705ef5a94ee834e692e87611186c4922e09d34b6a80cd2c2c806b9360af6f37ebc2fb57001a4662ce9852556c18ffc
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_sq.tar.gz 2301657 BLAKE2B b9fcbc09f6eee226ae90cca68ab873f74790877754a69e61972e37f979b061ea0670320024fb2b0dd415e4cf73fb8d544a3029af121abd71f4a5e42316876ea2 SHA512 d1fbfc3ed2b155e7961496c8fc20bed6ba641baec2c085708d0d02f691df972176954fd952600ff4668f4777915ce2b29f5ead102d5f7c9244196bdb4c19fbe1
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_sv.tar.gz 2379845 BLAKE2B 287fb2cfc53e8106d9747be59eee004dd452fd0ac41fada1146b39d77ac90483f9aad040a9c8aecefd8b63ad85f64c6ec9e203d718b3417dc5780161431b2c3c SHA512 ec8d1988bc4900c17a886a5df4f4e1214a3eef81ba0abb66551e0f7609976b0bcf6bfbc3873cd6769f3a4c73de139d78c875b36e02e117ed23e4585e3e1d8293
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_tg.tar.gz 2390094 BLAKE2B f723c234b32afa0a4d28c8ca6de3b8a6f33a0c579ef8c572048272b63ada2abab40ee4a119f1e87a785f06532100470c3494b2c3db3b2a20e367f10b293f7964 SHA512 6984c7108cabe0d027b5570247206b292c989bfeb258289d64eb26412a747040e07d6f1ddd8e924fb03169ab084ccd1c6e997eff958e385242170bd22743e5cf
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_tr.tar.gz 2436195 BLAKE2B 8d0246df687296ac3ebee150b97d035e83fa1585852b2231577a24198c7eca3d94fd8c3f00273ff19e392e37acbf981b405445d5e9c29caf4ba63c17bd5639c3 SHA512 b805f4b83d7056743890f89a1b4de7963b23b3b0beded2c01723f3f04bd5df97fe711c1bbbaac09be3e8da06713ead37bf4c2d747253e3d208820786c0da42c0
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_ug.tar.gz 2359782 BLAKE2B fadee4888cd5408b15958583306964a3f1ca05e89f84f273c3d358cf48430a57210b8a9da7276c6d861ec9ec03a71847e3b1506ba7b6a0b7499e1e01a21ed459 SHA512 9e34e21139cfbc18cc9c87d2c350fe1ada96fb735a4cca2ac3617677ac4534421b7c4a02451483e86748e37583b200bc87fff58916d4c4a011b040f37bc3642a
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_uk.tar.gz 2618333 BLAKE2B aa641055ab167421261dc7f79e10c575ef9803ddf280e6f84be292107acf20070fe1ab07f7399555ce08715a3a14325367ddd03ccbb57df478266c80871619bb SHA512 5919693d1d1700de1c68167bb5412869904e31b33ca67320388d32668d5ea5d3ef9468059a82b7687e36ff7ed7529eb3354b217617b538d2bf2d2a178504b975
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_vi.tar.gz 2438833 BLAKE2B 2fc0e086290b0922ea2db95b24d66d5e0ed93d68b70287bc151a2c52e39f6cd42091e92e4d99be868c92cd3c885623063ade8000bfd727421aabff3c0f266575 SHA512 e50f855b41fe530ca4d1894c4e737592c9fe66147779cacf74f5f421257a463e4d03a7dd8bb801a8e6759b0a34f9bf9b8b42895c1272a3f851f4dc106f99f1c7
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_zh-CN.tar.gz 2451639 BLAKE2B 6bb6a463b31138acfe143661ba0181dd4592ea2bbb5db5d2feff9bc0267b1f5adcfdc5f36e08528297db016636c22f32e201819f03c312dfbce5a23582be1e10 SHA512 558113a429165f703b59d797771bc831c5342ab065416284df2e5031bcfa9457bb92bacd1ffc9d82e77ca476c1188f5c7447143c0d5e7a0c619fae39ccd30c31
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_zh-TW.tar.gz 2480905 BLAKE2B f7bed40612bdd0be981a10c40d5715fbc7fd2af8ff05ca04eefb29e040c61848857f2a2ea1db04463761e45f7321708aa4cec2866697b9dd3a92201f706f7ad3 SHA512 0e4a18df27720474ce105f0a7b7f1b8437a017a0d75f96e647c963ba91518b8a7237c08e1c8d4a5f27fd583d8cb1fd24894b745788269bf2fae66ccea6f5105a
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_af.tar.gz 1005287 BLAKE2B a2776cfd34433298293b959bd0b8f31fd7c808d124c6fcea4160059a7d96ee4a169fad53007e0ebce5e3eeb37442c19379b2e1fb0d60afc25a7f705d6759b613 SHA512 55c4c84b76be60b8fab9ac314df7b83efeb9daa4d29a252458203b518b54593d68ad953e2ec7b57f412d124c00a29a2b6c57904a8e2d1d35c23ce4871e139cbe
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_am.tar.gz 755543 BLAKE2B 52c50d575fcd23a758e53ee4999e947e2282a9f5ef790a49aed1543ecf7eec4427ccfa0fa4b3060bf15f54f7fa6c3831770749975eb2c6b0bdf05d2807979525 SHA512 347acb774acc653aad4914ddf45c9c1f4ca2db49608a952f081f271e56ea58bbd92de53872d9d4c9bd527f16978e223214dc9a68dd7b5d5e74fd13f66741cf95
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ar.tar.gz 2417070 BLAKE2B 73c69e926c11c822c5d45e60f18b37f9449d039ce9f584d175c370d1c1ffd837ae551c44dc765f5356276c4e59c68fccd8d4587c571e2ec6ca9a75472353e47e SHA512 3a4fefcc6c1df77f0a22b9a08b5d210836fc718ee1ec43ac4f8e2e4c858286f477b585d2326b99cd9173cf0a0d354dd55fba55672687151cc22216e39f96618f
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_as.tar.gz 533176 BLAKE2B 8c1f32c3470150e0ecbce30e6de0889170047368fb07eb9b2f58233cd681ed9c60a77bcb240fc0d21160f524cb54d6189c7aca2784755bdd081680290e7a8056 SHA512 8776e02bacdd44b7104736ab6f44ed504c46c2178ac29e3fe5c2eee8a73987990ab08e5eaf06b402b7431c025d92127716abc9047b9d5aaefbeac594cb9678fb
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ast.tar.gz 440942 BLAKE2B 8754649890e16f837102affaa83ba9ad13317c695eab364abc100fa308c388096af1361c317affa35ff27f79c86c3cf2b1101d2e609e4bb9fe620d45de8410c9 SHA512 0a0c48e8d8de0651b28f3b372a05a0507d86524ed1e630651633f249b4c7e17d2bc032d91e0f45b824ac6b04286bfafa73f31afc86119bda195abbc26ef893ad
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_be.tar.gz 1060119 BLAKE2B ace4f3ac93c39cc7e5ecf0404ea23cb6a229e03b76586b27ba76655073f60a4bfe7ed5a96fbe86d754c61ab30c5bb1fb09db3b886eb4532e7f078e945b48bbd7 SHA512 2ed70293ec9cefa9e8c267fc8da5e9f7c06597fa40f17cec60aff8c579503f62a04454282ed6c3a9d8e56a8c4d3090e2fd6eb5c90583a69f4b46423686856ba4
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_bg.tar.gz 2206863 BLAKE2B b2bde0beca74d762db61712c46041b40ddfff48e67a9881a7c79e908c805e53e90904db7011efc45ed75d53d192889751815dfc7b787647e19b1a42a966400ea SHA512 539561f134f8c98fa330bd15433822cbbe1469f702d25ed8962f81672eb5267c176d303e3362710d76c2fda3c3b38d7c2d575fda2de17af91c36b89271109db9
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_bn-IN.tar.gz 620548 BLAKE2B 2bed053a4f9c0708341ce6d596cd5de9122dfa1a7abd0137710f9302ef03354b2806c48c8916bfaef8ebd10facde9622ad3e18ab22fd625b21d5ba2667d9dac3 SHA512 fb10a398b02d28d95adac9ad5539895a81c4c2bbd374c3b28d72ff70a895f98a75038d08bfb693db4b86a74aea71e7a4019a7208008faf14b2d6fda54bf83e06
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_bn.tar.gz 789619 BLAKE2B 924d4242134f981610ea4e3c26a9be4ee33191d87283edae544988b43dcce17c5c3969db6afa324b12e2c2cbcb4a6a827e041a0f94d0c66d12307f4269ec367f SHA512 bd2b25dfe6d607f48d22d865129b0b9a24ec2842953c1c41f811019cab81b0eb52ba458459d09f7cdd31fc34d8d3c1e268d6742a4440fe262dfd123258ebf122
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_bo.tar.gz 380775 BLAKE2B 38c92a907e8d15f001d7f714f21ffaf752a066ddf5e99beee3f5fe4102de376388ad77fbfd38cd786e32409d4bbe8bcf7caae6c3410ce7ea266e6447f181b818 SHA512 8c748aafcad9e56327fa0da4c59f64aa964a424de60c669f1f451d97f47fa4329afad3a4983e23aae89f7578f6132a6a74e0372b698cd5d4ca5a044ed68b58e1
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_br.tar.gz 1857408 BLAKE2B b91d9131fe52d768f946d0b6cef85e166fb6d887b4a0e8fb80060a4c4f28e024dc39fb2415e376069e677d4e9c6d79088dcbc53b44adcae24abd1655bc5d69b7 SHA512 299459d9a90a9bac7b2622631f26d4ac2471f62ffbd74ce0d12287d58c164ea0901e17f007fa6db75100ec0aa3a52fba1261f2499da699d604eca275d035d166
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_brx.tar.gz 338494 BLAKE2B 32aaf52253dee7eeb03e97ade60576b923f0421e77189f61fe06c07643a52f1d1fbe4cfd420993836eb87c143bad7ef27d705f68602e3a3de0ac90d4a546f66e SHA512 8d7f45a58f43ed55877c5d8ab1177723e79b6d509a36486052abbf98da51943112153f77e593022273735c28383d14820c933d9f1809447d7134a4815d7e5b7d
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_bs.tar.gz 637489 BLAKE2B 98c8739d53450547ce0c99751599a81a6f8df40a5d9734b1d65231588ee2e798f04cc80fb826723e0118fa23b701acf8807d6a9ff250fa43342b205b1f1f9c85 SHA512 8390d0ecc87fc594f7123cf64facf7aab4140d56ab1ec51520f968c99669536348ffe4a469d34321607df8edcffbd52bc9ca926142fdfca5de75f07d0e921669
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ca-valencia.tar.gz 1978004 BLAKE2B 4460db6c3070123e2e0b7ecfac715977bc5ad2a475d79600afe9cf30f6345c0a3bdbc3f62eb4a21fef03adfd8a36ec51b8c82bd1d9eacd1247f120a5eb000d07 SHA512 e3700475579f030252f540adbea6a879af19fc9a2823919ca900337f2df613c86684c76f8d527ccd24f9bcfa42e6b2699e6e4a859483578897a4150aaf734c25
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ca.tar.gz 2008874 BLAKE2B b723d919bf00f5499fd066a7589da7ea004a2a3e9dcf3390a91a9b9dc7154767afbc299f78d0ec7f539039b900c37324b1a21fc2eeee50850ab6ef029fc92e05 SHA512 5b9af414edec7071130596f3f090d8361812b70df4cc121043933d6de3c2bcaeb7ed415c8470480595042f0cdd4b60c337d57c0d7be095b009160ff058f07d8c
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_cs.tar.gz 3176205 BLAKE2B 01a1aff0bb82f68b5261341d1c7cfeb42509198a447ff1db66a758faf54afda2b04e2b213b96f9029e7206a97ec2c37083e5db6334ada465dbe9493630d2a06e SHA512 7a1f51be5e211843dd64877542a53e0edc790a54efeffc6ac0483cad08e204204e43d74e20e4fb7fabde753df12517f3bbf9839f7a118d9364f42584aac6af85
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_cy.tar.gz 715122 BLAKE2B e05c45df7f104224b41c30585a39e05c7b92b7d8e239ea815205e0d0894fdc3af1ab992a3276c1263199c2c8e4f75d4ffb4821f0536b26d54f57e3816a2e1b2e SHA512 61d7d49493947cb64681491a016c7623a04b8f7e69c41d2db8d4c373eddd5da218b14f335a15e9ea1f55d6a60bdf917c1e812fb9f846e673103637f8ab0b403f
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_da.tar.gz 2618833 BLAKE2B fff6c44b846133c396967e6b9e34e17caee55dad940a6869026dbf5aa5fd6489f291b9e8755d5553dd3cf362590089711dffa167f997e4b4021868c9e48a8504 SHA512 bc666a9863f5e8925b07ea68f4dd8027da19db0d8359dda8886baf7e7131fe21145275793014181bf7747c2835667b4ec9ea7aca9cc135042396727e47310785
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_de.tar.gz 21745831 BLAKE2B 8173788a0093b5920c1247d43529cc8d27a4096e6bd64a12611be1b393abfc9c0ea67da863e552153b7ea210afc1a3853cef217da59fb2769ecbc0834ce812f1 SHA512 8b1af4329bfcc6e27814fdfa3b11b7b358ab736e14c54fd23e2b0c9ff5b23507b9eaf1db987dbcd505e257f4ac2d7caa08aa43622c9de247b30ae3ed15d308ac
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_dgo.tar.gz 442177 BLAKE2B c6b0d0bf725b03ccc755d5c03f4fdbc885255c301813ec0fa66af5b39d848b216dc3999a0217691bb57bd25078ae3bf10e74a2174253809a1f2d046d211e071f SHA512 5561811bdd98ab00977e7f57dc6b3619f087125139a9dd5f67197047762737d1c1ef971d59a24a28c5f4e23ae54cf29e0561be18e9ab9da4ec42e79cef5fdb81
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_dz.tar.gz 368424 BLAKE2B c61332826b237dac98f9c7e6c0fe351f6107d17323502f7024570dd19127800fc759d5d8a8ff991d2ca61ea7af48a27556186305c6de627c4f12a287b9e2adca SHA512 f9088db8c3d0443ea096a4dfb7476d923800faadef329f108b161d5fbab3d09c8b59795d52b161be7b080fc1e20aa450f73e04e6a40ae0a8f929d46ebbe70799
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_el.tar.gz 2816521 BLAKE2B ac1d2edf75f80fd856051c95372e01c84dcf6701d50e66d0fc2c82842a1254c113eb0bffab1ec48386b960ef1f89513bb4205ed5c8bf43ad6dc3fb22620bae5d SHA512 e4b3979392fd10f01d11e4c1d7d63dcd8fe2ceb22ffa998c66bce135f2673baa269a491012efdf077c15d7cdd1d8c2c4d74f1753bafbdf124409e0dd546ce2be
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_en-GB.tar.gz 7249408 BLAKE2B c74b80b2381322614d258924afcad91e830cb471f2800052fd7948f387a7f39d1759bc540b6cbc332b22badf1a5bb25ff1af5d51f98c9dfbe29f5f848c6f0b05 SHA512 672ac44808e9a468c777d5766551b11eafd1d03c795a1748f2abb32ea3658e02ef13a9732ee5bff2bdc55bec7d2d1184a293cde2daa731602c84b0f63f5232bd
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_en-ZA.tar.gz 6848089 BLAKE2B e1021e307f5168108947ce0bf5672c0018ff6398036e37b8f6f51151d49a68c05a13ddef6f59a91caea305553bf6bb26b15674159e901ccf266a929e39e68d65 SHA512 a029b07a595f9b3f18ce7f051e2b6c978f13fd615cec5f6ff4454458f735b158980d46e77f15b929a0bc8f4d16ebe118cadf90c6e8b5a057fa88028409d9980c
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_eo.tar.gz 711808 BLAKE2B b88fb6add4e7cb01bff2d4cc320d4b8833fc55706701e5f5410e959c44ba684995c4cd0dd3f8ab12f922ba9bac42525fbd18e04a99ca36ca7129f0d3277120a8 SHA512 b75cedf08aa6829fbb2f9344c7d7300ef6bd124326766fd215c5f70ab04ceee960d5e7b74f3f25a349eb9652cf89f01568ec739192fdf23e0edff428cff83ffc
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_es.tar.gz 2232159 BLAKE2B da6adf3a875b809fb33160649bc7609a729c75642987712ce839e93c5c6c2a4fd12b75674e805d75b43726d69b5369f782bbea774e238d3773cc62cc47b1f8c3 SHA512 6fda15073d315a3fc1cdc3078a7f82bf7c2c60ea2136117db8b456d1676cfc88e4cd0861b36531592bb4830c3a1974d4af8253929c9a4fb4be7df35a1f757bf4
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_et.tar.gz 1623961 BLAKE2B 72b644b6da03d16777b486775085bc41dc69697f007afb5a0a2e50cd09412c7c2e2aede4a7789d1cd5fb633db9d54637ebdd7d7e8ebb733c5e4fea3e83078508 SHA512 bf6b19540d68fd44022215642b05419b4d8d1a7dce4c5afd7bf2557febe867e3f28bb25a733f910f162f07b7d95d6e2da10730b80134fe67bd19b42c45eb8b6f
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_eu.tar.gz 720271 BLAKE2B f3aa72112a40d79165236d0010f34e386abfd0595e5301cff70fcabdbcf10f9a550e2a0afa716ebb6e3fe7e4c3c2f27991c30061bae5b1b780e09f1a99b8efa9 SHA512 89349df043f1b8d7727070d73f9073f8c522d2c5759618a5e867ff36c7c2d987822ceddeaab74fe01b0da1db250b98fc7e6d3adc2e301dee2a45f6fc0d56bb2f
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_fa.tar.gz 332172 BLAKE2B 9cad292a18675e00eff2a779193958c5c3b225c56c2d893288797b5a63ca33a410a9482c4d13d712a132021cc1f8a598e06b77715534f3ca43757897c45dfc24 SHA512 8659e19a1f5b39ad6e57f80d70c5afa384ef40e0382d6213473f6aa12a04d3cb04e8feeda13aaa603df23bb62cb5a0270d20ed405ee4bf6faba2e51d392ed1ba
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_fi.tar.gz 708573 BLAKE2B fc7abb51f62247fea3528ce9fc0c103f1c8866a29286567dc30ce05cb54cb6d020efae1b36802836f5aee52fa8cbb74536e68bc6eceb16c77b245a17beb25190 SHA512 d98c43cfc0abaaf4a2867dc082320be2824aed42d53227f791dda56b141d6349fcd4e5fa8a046cdbe58617697197347e07987aa31e708793dcdb0c22f35e7f54
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_fr.tar.gz 3026768 BLAKE2B 2aef81adc2830fd48fa6c699996429212d96ca4b34c09ff8e3718860e2ecc7c5d191e4e7df6456cc4b0c083468075bfc2307a5b546b07cf5ffe67328f03a8dca SHA512 ce88a721459f67cb23559399c7bdac5c1b37acfde59f2a5e1bf9172b3f07aba7f9d901fe68849baec5e665923ab315122762edf3171b3f34259d642370897c94
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ga.tar.gz 728576 BLAKE2B 7bdeb51d57788f6a7c4e0d3a8a536e9bf45a2ff46c2aaa1fe959fdebe0a58728bf55b6bfd08f77f032d6943beb1d87cdd9cc3dac8f87c21df2fb8db6eecfcb16 SHA512 3c28004c36d4bec8c6f0e450f4af96ba84161ed421c0287e73806e38d2eea8784c5f4d2ed898d5b50ba54dc944ed576b49644df58a681cac3958536fe3953c1e
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_gd.tar.gz 1763425 BLAKE2B 823eaa4cdbe99151e977e112759db5bf4fe364a160721776aec23ba1e96b1763cb9208e34fd6926fd63e062842ae2021da9c2952ba505cee0fc54687fc6df2d6 SHA512 16e633fea312705e11c728d4ec042eba671e3175b79afad96258bd33670d3cde877cf7c1e8ed58ec349228a37c9cd03567c725a3092b09a4b291935545101b4f
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_gl.tar.gz 1285530 BLAKE2B 73bb328796519347836f7c81ebdcfb8d2e233fdf2a28afdd5747f46d7e6f6d031e7af0f698e597e5beba42832daa253a3b895bc13dd2e37eacde47a97c7b6234 SHA512 c83c5b63b257345f727cd3b95d1f9a89d948212a8a3e0df4510867923323e50597b2ee7b27ae9ca1e919f1cf6d39e4992037eb529e134cd440f342be45f1aea7
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_gu.tar.gz 1231526 BLAKE2B 2eeab482fdea6b06ef0acfe7f81fbdcbb0c467cb6d4d055ccc45f2c72675f6b2528b653fa2c343ba9f7375a54c07ba0de73d30ef0070d519b3f16e2685e83f6c SHA512 8cbb0526b5e70133a4326cc6de47aa38e72b0e303acef625e37be3ce769ff642f72b6ba829142d5cd665d98e7e0d4cbd79985b09ddedc0dc1aa8ab44d0f33ff5
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_gug.tar.gz 511343 BLAKE2B 075096b4c8045bdee3332f8b0e68efa3b2e8423a02d1a63c6ec8dd8a50ab218ec5fdea3e3c426ae2ca0e61c273fc6cc541e79caf2146ec44033ad81a891eac11 SHA512 d9dba67f25b53aa36c21def1eba3a017e00dfd4ddbfb459dc87097ee6f6dafd5724f62d64fb59c0404bb18bc0b1b68f61ad72c8d9f4d6d0698865121db79f55c
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_he.tar.gz 1625005 BLAKE2B d33b383f0af2fda188bbc83bc7f35f85788dbba1d67770c0446c1f36e3847b873b678983dd6dfb0ccb0203bf4cdea0bfa2f04a15d91d9a893012bc6f4c50130d SHA512 c2524122f19e71f8e00c3cfaa3381ce6f66b52316f3246880e818b8ec320d90949dd396dbd2ddf762c29a9f7df704e02dc7ffaa2240deb63ae67c74f3a2a450c
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_hi.tar.gz 572556 BLAKE2B 55408c58fb09a04aed65405f9d4dcc8d9a8640284d0fc7608af05108273b2fa7cda298166a3ea2c7683aaab50b92b8a82acc6225c78243e5f3f77d9597dae4df SHA512 bd3dc315dccc85dd713a2619bfc8f26b145aab1330cf28ff7de6549aa83f766e3eb5444affb15fa3bf303584eec5201f3964902dbd34c71b6ed5f893a8b7d83e
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_hr.tar.gz 970598 BLAKE2B 3cf0df63ab8873f01f7ea75573b0673d588cd82e29969778630e9abeec661565ba3657b29ebb258b4d1e30e35cea5057bf8d8d304700c66328b4947430d73e4f SHA512 3296a6517778661463405deab283db36742363b81351628a7fd9d0c4645da79238fa590dfc7fc5c9ae5de1e115d8250e02482af1b5d0b51aaf8460e787edea62
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_hu.tar.gz 2993395 BLAKE2B 545fbe908ba70a1644032a7be4d0d6c0210bb93252e951c6e3b8d1a3963a362515b01fc71f0bca174cb3a769746f4fc38681e0a5c6c0a271c35e16c54090336b SHA512 203c082c803268200a99b8bcc2d7be328fa54984abdf6ac2a495fa943ef2131aae78f1dbbfa3241cdfcb5aeffebd0162dd9e28d25d42912b9a9d42170ff3739d
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_id.tar.gz 1553757 BLAKE2B d7282b91badda920847e8a9888fa563160f83100148c810b5ba6aacee2d08b3f6da0993639f58767ad4301dd84e54d164cb849de6ad4974ac6d7c9c6802ea7ae SHA512 577b94a9552b82e2021d7871833e8469fd3e41a1783d4f949da5077180b724d2dccea02abadf36eccc0cf9733786a2b57c64c6563587a97533c8a468a0248fd2
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_is.tar.gz 1508455 BLAKE2B a1fd02b4043f92b1fcf684f9bbfd20a499331733ab103b4b6a162643bc3f54944730a26d31b6a6d98595cf58f7aabd04eb8c2e3aae39a9955e93edd3647edf42 SHA512 2db73845b55e7393e898ae1e347bb3b2434cf22247b2d670bdd7c66ccbb3381bb31b2e806692b62796b5db660539c7061e0ba746aaf43ed778c5b0a975cdb918
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_it.tar.gz 2059409 BLAKE2B 40fba16de9b54fecc4583d3fd95e8f2c79700f967153f6ab2d448029d4e8110dd3c48958b22d6a4a75b6c8951c8df4730b17444040875ffe96b1393ce35f38d0 SHA512 8d79e3026972b81636fc43f5a4e27012a738958252b5b76ee86b41eabbd9fa1aaace5d100cace01f3b9e4128f191f563b34ea635c6b24f51f1c35590507da76e
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ja.tar.gz 806404 BLAKE2B 2dd96a6657d4962746a5b81d17598907a34ca0f8aba41a4b794ff4c9e21cc3d73ee2fd2bd9828dee47346d6f4f44b6d1479e8d600fbfbb69145df430bf851ac8 SHA512 85e502ae163d00162f90936d749d9c0b3cbc6b58db7b8d0a2a498df76322d5c913bb5ad6b8d14406c72825733145b30292c572fc66464c198927ec95d94552ca
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ka.tar.gz 361880 BLAKE2B 73c56ef6456d2b7002d28d2628d3d64a7f03b25028640e9ecb86f7ad659f686deb63850a85a4fe01326476e5ce91553a11091f6a02d8cd1a2d359d27bd9ec368 SHA512 da5355f43e7235b52e6766352a2f74f6ca7ee1bd10a9c3ffe6fa0fa6dbaaec70e3f6355009996f845915de924c74ee5731dcd02f4bf9e9abb27ff886c7b0fd62
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_kk.tar.gz 772761 BLAKE2B 490eab5f3b1c19ca9c18bbe26099dde064e610ab9b6972f7df095d5fc6636a089e4a567515f16069ea2eec896fee4c944c02d451c3a00a2f2892078ee7c9d08e SHA512 5b65007d5278b5706a5910f1f8ef29819c857068dd197ca65bd60c046752a4e2b0f55d2031100fa135ed2f47365d5da58febcfab7d763435015c7b410846008d
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_km.tar.gz 686753 BLAKE2B 417d0d06c5f6417c7a1a6eb7ed82b4c0879e4f825d97a7d5a4d1606645d6a620f7f5af8b57103968e4e6353d3c343e39835c69f9dff30b5c3717694d919e57a9 SHA512 d247587238b5828e12915108d2c915a1cabcf4a4397365999cc716c754ba7987e68dd5336a52f29e574583f9b848f53b1e415a2a66249293f07fd0e5e188b87c
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_kmr-Latn.tar.gz 333924 BLAKE2B a3f0176e6e067421c8524e29e1458637a9a6798ea92c92730ead0591cde74277c36f266ab7397e53e7987d1761e4d6ca4f25b6277d022bd8376e0da7d309641f SHA512 a8bd1d054183529ab6d919a98fea4a4521ff8ee8d6679c8193c564d882d15f6b3e12ffb07b8bdca647eebd0e5662dbb9ff0cdcdffc33562c7ce637f6a321dce7
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_kn.tar.gz 584524 BLAKE2B dac900164dec0532d1b97604b73b1c1941b34914f0ec34e021cd4101942bd79dc825eab83b27be814620e03d1d52bfa95ca23cb0b623282e917e352d732ec910 SHA512 1440f4c6ae0eefebfb59d9e11af64b9ed6d15e1e73ae73d2d5dc1015e86d2e1cf11934494500ed273fe1723be3960626850aead6a36810ff8a4220ccd3cd37b6
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ko.tar.gz 811465 BLAKE2B f4dd7262d3f0eb1aeabe03c38a4e88f0167ba359f9355a34e74f7e7003c71ef734b9f50f43343ed2b06b80778bd03077bd8fc96271e839e5598355988f1e9e72 SHA512 741f448f5c88966d1d98345952c595c95a812e80b95ae263d43b0a252e2d5331de88050bb2113e8470bc37435250103ee28f173b077141c02c079e10f2b6ff65
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_kok.tar.gz 413321 BLAKE2B 0a831e658ef8acfcc955ea1570d2f92ec63b59944ab91aa993dc60e1a7e72d10bc7abc29ac44da4d0e646057161992d969d9ae7ab598627b2359c32e44eda2d1 SHA512 e34dadbb4575a12fc38f29dd4c9bae7d0dfc041b4bbf4904a0876983b0781b6ae9ce2a08e5e569aa8e673e8ded65e53695844888a413cf3b68ae1a99eb0fd711
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ks.tar.gz 330740 BLAKE2B e6a0047fac547ce4cd6038c1e54c878c47be106931946fda6fea926023c7ba3d9c8725b852504776d806fbd3e7a3dad74fcf66cece3332e97fcc4576bbda1de1 SHA512 1f8fa3357ea096c0c2b68a2a10854563def5fde3431cd8520cb8d2d00d11eaa1f7eccc049de385e8e2ca1527093f47bc7fd16c1e4c111a8e085c0af0a235a5ff
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_lb.tar.gz 141865 BLAKE2B 9d6dc611228eb7f1f41ab3e7496ad13ba777ad01e27072c5a9960325f835a5bd490adc68d31890608f337026d64f7f95094408c688df8b84589b14ab003ae148 SHA512 66434e33d650b7dce6afe5c364883423c25b20e50c3b81fc91cf57d20856ee04a09e02b3bb72630516cdb0488303d325ed181835b9bf76e6a73e76fab83e477e
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_lo.tar.gz 415815 BLAKE2B 16a7f8e4f5fa3f6be16d3ad3641a163d12a216504ff61e27f5775409b1c0cd6f00cad1437e7b625ec6a905509e8bd9fc735eaff7f7267345b8febd5c8e1564b1 SHA512 56ce628df94a9dd635ddd70552150e166e7c2b1fa20f878347571cb956c23d252eb146ac8bb1ebc88f3c851fcfcdfaad722b5ba7b8e662eb92a21eafe69ec84e
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_lt.tar.gz 1020894 BLAKE2B 947d7ee88b7408a4b1cf8ecd1f627d82713c640cf387855efe0a25027f25d53f33c2143f2fbfa8c0805110921867407590c7f236dad94a5c14557809d291ca62 SHA512 e2f505ea90de1da1a14c1c98eec1b959550ace555351992e35d72d7831f71c1781de48696b25074e9b650c9422d3acdc527e15c804613f762ca39c490fd6b236
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_lv.tar.gz 1479618 BLAKE2B 1758c78a3206cec3ac7eb2dc324a83d3a22eea456c8741e7b69ffdb36c30a3fa25532917bf32ba12ed496fc99913e6cc615ae8d34ce9da4684028dc91922c2aa SHA512 6f13317f040f1959c1f639229d89bd481b5e12a61f203db3c69d79687e134fda23d1b53af2ebee537c3c99b939f6c6590fad7b69195d822c72853d847e64999e
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_mai.tar.gz 332128 BLAKE2B 45c593551bca326d7ff144f1e41ce5c8f7ed1fa722ee5e9350bbcebe2b853783ee4af9a73fbed6ec286d2fc6b91fc2926d57e02e82c20e4a88c452f519e10c1a SHA512 0fb9de1eea95eaf7b3820026beb74b4b18cde9d9e681872b4ec3131117704c83444451ff8ca8b04019279a9399e86098e0a4504d24eaf4c4018f7f1cfcd9efba
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_mk.tar.gz 383496 BLAKE2B 7fb4588e3bc021bfdb1c0a3d829bf2b7d92399da940a696c8be6c3540d481ca7afadb0661ee7ccda76b956457d249380e6d9c97240129f153313bdb47ed3b2dc SHA512 f391ce24f03f9eb8e5e938c8284864e36ea2369f7c724931b461a93b5ae03652421a959b3e59889225dec21aa872b03ce1795fe4a3b11978c9e2693324a04aa7
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ml.tar.gz 545911 BLAKE2B 87d50d163810eae48983ed3bd3020bdd0d2035466adf2d5ac1329ab728588a4edf2033c2ed9b2e9d59ca60c707d5e6b3732a10e62a91621a1515e97793e1b704 SHA512 20d878aaceb45485f17e0795858b4a2d3be194f8ee416701502c1cadb3af4d42262de88b70bb16d7be4fd578dee6784ad089aca67859f285892ae0dc9aa550b4
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_mn.tar.gz 510374 BLAKE2B afaa6ffa68924e1cbe6db81f5a3a7ea60bc62d48e204434ecbabf97a4246a20e1543f647b7c9227e7264bd5e53543f7bf89428ded77891135ea206d17da7524e SHA512 9fb80b2c1299a089bf7b427c3bac9e117c5fee708aa6baa2053a599a0c51f9553082656596e8b5cc73c92b9855092695c86c0923686bce27677684115208662b
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_mni.tar.gz 404348 BLAKE2B f309140db15b194c3516cd86471758840fea3abbe2dbbd1bdfbeb8dde81c234f1e5f9bd6780e4722684142aeb44aca90d4d3781d298ae64cad03cf70804ae770 SHA512 d3dcd8509af5c82d55d355506ddac42a8fd5d47b698fcb9446428251cae72d267e2cf75cceb01a5d201781c6d19c0e02e363580101db6a76158907a0f6b16626
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_mr.tar.gz 580676 BLAKE2B 98368e497589ff746aa1651773375e6e053d513d085516df48de715d3bed659eef3ea08fb3b08d093e49f2e2ca1db27908476c3bac0a757e88a6498da40b4749 SHA512 ef4e6a2d694d88a6bab62b1fe9e59f3c851c2f8828514b3983531114458567b537530859c017aafbce18585278ecc9d60e48289ab1b57b543851d50eb26e2d0d
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_my.tar.gz 466869 BLAKE2B f21ffbf40f68c1a9d1b2d7a13a528e81648f505476458851d96922005435f7db0a70948a806f74143b1bf8c654b809261528edf23415cba0b2e5a9b1ead2eec2 SHA512 60c06015f735dc0ccf038400c8d5f9354015f5a72bc10c7f6d1127361e84935f868e8d1ef3c77bf34f62ebb797878100900e7a89404253d7273fca567fb79c35
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_nb.tar.gz 3711522 BLAKE2B 8e8bdf1e1a4d5a555114152d3ebd111294daef360c6df2eabb6f4a5c4794f91ed96a4e2aae8881182fb510f232fdf778ed4ae5ee88304b8826ed56a20ad1b1ba SHA512 c778237903728535224636fe7d74edbe1aa6f6890559b1e4dc67398608414dc087948bf49e15dd182569bc8b1d88614540530c4faa23f85dfd8bdfd80559a47f
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ne.tar.gz 839128 BLAKE2B fafe3836562deda1c66618756de0b6f598e16b684d84819152f7661130ed31dc5b580bfada039bfdba1ac38ede2310b50a77f3e84ef51961aec24874cb75478f SHA512 678ff27bab28db3fb6314b104b08cf5b57b0f84b112a008708d1cc56bff6c4da7d8abd559f158c6ed62c887bf033295f579250b500557456f6b2effc7c6685ba
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_nl.tar.gz 1515556 BLAKE2B ba978ce1c35b33637af267c952e9fdf74cb9fed0fc1515ae5881a6871d8d77e04c24ab66bcf4f5cb78fafb63c3840f6da533749632c0e9a2310aa739fc4842f9 SHA512 e609d5be1ffda7e00c568b3010d14d1e579be020278ad3cbbc2f0cd19c11412e73cb38e6c84e6f18d0924fee93b1c3bb8153add1aa11b6ef8c36e26e6b9f9c12
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_nn.tar.gz 3715509 BLAKE2B b0f215067032a57d4d044b1fc7adca55f18ca993b7c81fdeb3913e439f2360b3ac91e6a63c226118bddf8c86bd751a1b91c383d772799b253924e1021ffc71e6 SHA512 c259ca9da8ce6b8c53982e9c97b75d5b0af23072291f5bc422b2f5b71ef9b8ac76f80c17a51e0bf98caed459e498f0adcaaf6601ec65e9ef137f52684d74863a
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_nr.tar.gz 278053 BLAKE2B 68f8c295157cf5e20c3cb34250ccce4b5afcaa1703d189009ac3cfda9eb4aa308d22934d9ac69cbfad1752d78b0a9687d29826a9cd7aff0a872486ba17b5f0c2 SHA512 7fe6ca0c84cd82d2afd2b88e6b52826cd71bd402cda4b5df470e75e193313626251618c04bd7121865aedf560694942bd986d269c42a017846943dc40e5bf319
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_nso.tar.gz 322145 BLAKE2B 13f898af4a0bfd02a47b6dae8de143aca1efa1e8b62fd144f7edf133b8512fd58c3a0356d6eb51229a654f5ce7ff161fe3ce13e1d8029611301f951f9c8c8231 SHA512 6dfee264a7ba178ec3f383ae43d1b44820c2c11e75298318d7b05a269a3d4a43a51fcd00ebc487543ebb292150e0378e4f22f3021cc22cbb3b37091f202dfcc3
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_oc.tar.gz 874136 BLAKE2B 41d3b0d219e3283ef5c1b063ccd3c5c5a6ebc03f2db077c6bfbc9c919cfe628438ff5f6c1ca4655dff75246ef9c4771f6314e48c08f050ee0def8bb405b154fb SHA512 3d724978233e64c80ad898d35a97e3e580e9b53a328353740a9b7e467395759c0921b2bcebcc9834ef81faad842860507820f9ca5ab863751c9e9eb47ea8d90e
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_om.tar.gz 370694 BLAKE2B 02b0a53f9cf2ba74aea0eb997a5526f7d604a1d6abc4e07b03fed37da9617a85364913b4e22ca5af0f291a11dc180b454bfd0c41ff5ad5958e9acd6736814387 SHA512 6a934c7bd83fd821c46f101e4405205ea93f3115b1b25c3c0239fd45f1960816cc9e913d263d8e1ca98482ee772a1aa22f5801eefe372668f5e98bc2346a6d12
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_or.tar.gz 603181 BLAKE2B 8daf895ed52bfca1039b9c896769fb4ed085673889ec6721b1fea5711316d517c78ff90331595bbc90493d8f338caf564f05a31c68d0200ddfe737def865629a SHA512 e0c13dc9dac9b94e1f334a1779aa7d81285d516645a778a7881d2c58305435a09bf55c74514541227205dddf20d4dbe1cdab82edfd02df309924b6e0b82acaed
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_pa-IN.tar.gz 473660 BLAKE2B 3c390f230a536fc82c8e120fdf8b7ad6c10f124578ee9514490fa2f7f295fb44c34aa7ae87e1a1bfe537f704216ed79328683805bace8367f4b3c3badedcfca5 SHA512 2755c5d5e1eecdc49b577d3b9f0f7d870aa765501f842334b3a33fbb9eaeb9864fbdc570d682981887dfc207d61aeb7e795c731f6aa7258f4a103bfd0d4d3238
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_pl.tar.gz 3083873 BLAKE2B 6cc46fb4e5c568c2b0c05947e0885094f4fc47c6c249227568a0cca5355e27ab195e864b9f51e90c2079cbbc603ab73fe4dd49bed7d6349be5597c395d1f7f3f SHA512 14e5da8f0ed5bf207b7b7b4f5f0e1dbb0df2f89dcc14573e9fb984ece4476dc91e13ff25db0490c667b693721dad725a81eef812c7f453db0b916d066501eefd
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_pt-BR.tar.gz 2804533 BLAKE2B 0ea3538d4335d27ab79423ade32e42b30043f35903ff3937c793b2abbcbb432736d39301153285527b51fc51d7d309d99d1d42d74176b05d7b95483cd74fa211 SHA512 228b15eb7465a42b384e98ce4f7ce54c6c10f6174f20e81f347cd82ae330e1fa17be96532122802feb1029d568563817de801e686feaa5b7b8622e57ada034c8
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_pt.tar.gz 2361253 BLAKE2B f4152842105b2516075236e4d4ef362bd4582bf4d3f55bc89562cba85ff650f5df02134af32ac42f5b71de5996c039bbfdf0d9727b58372e50361349de734fc1 SHA512 0761ff2f2a7f55df743bef15d1630aeeb60ac6ad2fd9c8cda3024548cd405b27c1658ee8242465337cfba921d992cbd85fc67b0e73647507c300df8219de5fdd
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ro.tar.gz 2534044 BLAKE2B bb23f5b6b2aadf30383c2d35383145284e6dd630701b39dd4ce4592514e5a44f582c0f9da10c0dcea437638616ae23a8deb21785d878f44beb35d772de14e8bc SHA512 0fcd8f9cfd1dc5a9c093e9b7e7ece3876ae4107b63a019713bf8d734243c3ba4fef95ed4cafd856e60444cc1323edddd15a46e11f466c608e34ed93bc56bd52f
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ru.tar.gz 1883821 BLAKE2B ee98e6caa88f0eefa7d8a5d023702b3ecf468f3df8ea92f279d79a312d94fc4de36ce83d31c166697aa87f3b8dde21cd0e9b4e551a972d7e823f7bebd95f5e6e SHA512 bc11240445fd30dffe41ec7f4e1b52df11efd45cafd541813c81aa5b0e7c75e0f064105b765457f130872c2a734654fe2066e2eb31d32945a4bb696b3807efe3
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_rw.tar.gz 344526 BLAKE2B 6e5c28cce6d1f931786665c8451b525102ad3ac1bbb90f8987dca001a85a2fb0c9dd1d4690c60c13d525a9f3abf700bb4bcc66fb0a000543038c9a3a85327f7e SHA512 8daf045075ec01cfb05f1b54a1c0d59982cc398afd8dfcd33fb73af5ff2c88f89f5b3bf51753054d736c9e990ba39ba6a7bc06b7945bd4635aba06bb44bddffc
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sa-IN.tar.gz 452344 BLAKE2B 2e6a852d96aeb453fef00521b8def5ec9adbe58059bdec1fdf0d932be1b0a9a9d2604db6607bfe711edc6054a23986ee10b30e132c675a4ae4f58b0f00584bde SHA512 39610d05a483d984609c53aec3f42c1c8975644c7f0fc1cc25b1bbee1695d830684e6a16823cb88c68bbe45f0f1b608bfcacdeb531fb679e82a717bee197fc3d
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sat.tar.gz 524667 BLAKE2B 7f80a1d8b47b38360b7fe08c3ae5f68cd93dc3ebff94b2ccebc4a2aecb69334dbeaa64467ed70f920af876f4d49e24020275dae35c22690b54c39899b260bcdf SHA512 40ca622a62d77c1cdfa420d44bfecb99d59c1a2587cc248d1408b37d470659235718bb1f89f7e4600968ac77b84022cc9aa087f74b4af8cd0001b0064fd8e0f8
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sd.tar.gz 438909 BLAKE2B 2306804424647ad32859d515476c5958e04fd87e5967956ff62e9ad8380de8b844c7198e8beac3b2e028866f34d580fb3373d6b343d9568ff81adfd322294768 SHA512 29ad407ec9855d33ac3b1c4bfe4a24624fd3713f4937bf8e4103045eadce9bd15da5277e9391070e4f074f04d77e587bc27b7dcf235d9022aa89306842e9b912
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_si.tar.gz 739921 BLAKE2B 1262723116f9f60638bd938ed95f8cca6b5f9ace8bc492a2f8dcbb4126fd1c5541305f0082119be58d03c9cd7faff2eab25a9795a2e2fd4d25332a918c323ca0 SHA512 d8153c97da1a342cb6f051d52c90c57b9b007fcdb6b09dc4a40d6c2759970aa7b42555d16a367d53f15a1e7320b802bed41b9bde3c99c27470766d42469b1118
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sid.tar.gz 452561 BLAKE2B acd4cf20929751b358f3ea049b761b2fb74d95f1b980bedf8365d2278c7b1c508b34df20e9d0e32b50193e339fc996bc7d2113c2c06bf7a89528a59490784264 SHA512 dd2c4f5906dd19b2331daded6584b303824c98e5da0642b6135aae5f320ebdafe9f9ab136b1cc5093435dc6c3b246f382e84f64e5305534918f8a951cb59f19a
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sk.tar.gz 2014088 BLAKE2B 668c5b793772a5cab3cd4fd1fa3de58f6cb4849c6ac1dea795ae497ce0c27e564dd60f9091fbf3cca69856c8e1399ebf08cee0cfa117cbbc55d4b18ec1df8fa1 SHA512 42d12cb9470baae1171e94cdc94c65ce4a60567dd8160f5e34bb8038131ee1ebc020b8f16ac5e0d69be0f34893c1391a15ab58ee1174c408a0d86101cf22aba1
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sl.tar.gz 2407188 BLAKE2B e98e7c1acef02780d1cd90e8658ade8ce631451abda4b0611e81d44bb754afee2fe0391f893b41df7a02db2aabcc47cb81c0564ac6c587545dd30a872d3b106d SHA512 358cefbbdf36f7a615895ea2033b9773f30341890b14fe5b9e2c71ea25160f9484cf5a9f62b0453b110ce5f941ae144ddf47cbbef773a1d9fdf74e20617c352f
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sq.tar.gz 1166752 BLAKE2B 12dafb60518c3cb5a8885ce5ca70c3f414952f14d968dfacbad8124a9f6a941684484fb21dce07069477dac8baaab8508665dfacb47a8fb3880471fe881e2913 SHA512 347a076627ecdfe2fa7131f5fba191143ff1f484bf3437aaa30aa2bc284ea64cc0dbe9421613f4ca5600b2f4bb7e8f86496ae709d48489148c5c9afae1b2d6d9
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sr-Latn.tar.gz 1461930 BLAKE2B f2aa7fbadfb771d018760cfe7a0912d04e0cf4b6c74880afb9d8ded198a815b9748fffaf492b42dee5df2dc19f4214e1010dd02e2ff058061df5c18ff3d7d217 SHA512 2210b8f9241fd97b18582e366a65f4ce39b00c1764db52a799454486965115a795a8379d97025f324be58be6657c36c5766a917821f6505393ed80cb5c0d60b5
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sr.tar.gz 1480725 BLAKE2B c4115ec50cea29ba65ac8d6f270a20b80b51bd2c378528e9b0f18e3ab6894ccb1acfda293d085b9e8af8a12be0c87d7733f4d623597df2b0886f1b40c5290ad4 SHA512 6926617ac1a503cbc6f6eff23584dad258ec6f3c7081beb883055fcb816d05a85eb182091953bdf4927229e5622951ba07264d847056e7e87322d2a34a112d74
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ss.tar.gz 285993 BLAKE2B fda2f82758df99995207f37a7b8fc7235a20fec5ef0c9017749339912dde5a860197d682733ab31347d1b0ae34d340ad657730bd4b101edc31e746fbaa734012 SHA512 f05ff6e5b5676b52e8dda21e3bfc97cf83e6b1c11ec753b41e000075997dc8c191194c4265b109c49165e5cd142fdd1946706e2829177b3eee1974feda683238
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_st.tar.gz 278915 BLAKE2B aee9b7c4f085550a66da65239092f73c4af1486257cf3538e9e6dc2b9a0c37399af540d87f36feeba817c593f9e594fec9fd7b9ff5a2d4700110b7fef04aa32f SHA512 fe5083cfad766503a46d98eda827cdc2116bda3ca00c55c84725c2db86d162c889b920af5ebb7c3be95e4969346a3175ae77ab8f1f56b9ca5ce9226361a1ad0c
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sv.tar.gz 2536630 BLAKE2B c691d3fa80f2eed2d8b6dc501e4acd86cfb92adaaaf479155814662450e37d1eabfef2d841d33214a443b9ffa5e8cb61f1910c5e00f71c7ed2b7797f1becf028 SHA512 cc8057ec3e136af220df3ee84516214cd08370f46b93c0819eba2d23824cad9c45d57cfb9610c2352b59edb4646c96538c134da54aa621093b2992de3f9f423a
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sw-TZ.tar.gz 318447 BLAKE2B 1d0f6a6a3d8c794e26b1fcec8c13cd18519708ae811ee4495622cbeff3a4665be828eb67496a14b7c26ad45c0ded2fdc5a5bf265f079ec572a10b16ad65a2131 SHA512 caa07a3abe9078e2f118cf9f3032347bc3145e601c076173e44886e39c37002145b6adad62edcb6b45c40bc899ff4352696e552a0ed022d0713e17bbbc2ec188
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ta.tar.gz 687687 BLAKE2B 1809239a46205dcfcf4f7c7d45ec8f8dcb671c2d7b0e706a0611529907d0b64f1a553a913729cc6cb0644a0db564b6d12dd50534eb73f6d20074f385c97cf76d SHA512 00f81631d9ede34c5632ce0d67e476d719ed96fba767e4eb95a529dbe056b1e433af2fc98a28fb25ad678ab1a89542b14ba85effef80834f4c5676ef3d781067
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_te.tar.gz 1090578 BLAKE2B a61465405a5b407bc8d08287b3873b42988822f474b5d11d021ac2a29e9047bf316632202302115d76e5f370797dab2e7a33db98417da41a71ac2efc7209d618 SHA512 80dfafccdb160c5b3ed0cbbe3e82cc80134787ea2591b13c83ddecf96f389e46dc3b7b94e9fd48a7c03accfb7e1f39501704e64696739ac5cd86bf1f342e71f7
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_tg.tar.gz 358473 BLAKE2B b0a18b6b0d18696dd5d9c1dd6886373b560992c24dc0cf98c862e6e071c835d381acd45aa183eea2470f0c98c31552bb306bbf56e6cd2691baf182256c7503e0 SHA512 d1cf8d23097dce0e7bec99754b5547606aaee5912828e5dcab977a1de7438551379a9cbd8eb3a31cae1e91f710f306cd7942464ad3f3233923943ff2c798ed58
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_th.tar.gz 622878 BLAKE2B c2e409700c90c626debcf5a7a4c147c8b7566e127f047f9c2bb7172a27768232c75b07336f4ba9a87411b3f98450e58382102deefef5cd48803928ed68aefd6c SHA512 deeab7654dfbecdd1313723182a270f968164f27ddf8572c1e7cdca5694aa3bbd2bef40ca09a97eb558d40342398f31f36c4f1e26311aeeebcbe930d6f30a287
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_tn.tar.gz 258722 BLAKE2B 53eb51c12c63ecc492f9930f24b324722fd0cfda1be229d4220562dff5d6f79f5e690d1f5f9cfa1c60bddd6b2d820e6a9e15363cc5aa1bb27ee5b8ecef9f5ca8 SHA512 842295ff8d6ededd62805e600e41d7e9999ecb325d417842321b44858b7ebd0212683b1fe0520badd530274a9a8525699e91a27373add7ac7f8fe0f80512da90
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_tr.tar.gz 764398 BLAKE2B 45812fca2ff84e0eddcc0bbcfc04e2d360d9c7c7e2797a81d1a1c89161f11a337b5628c7880f0380d5391edf8b81504be8729520e5c128aaf8d2c283926c71a7 SHA512 35e90824d83c2140f9d1d0f10573a0d6324dc60e9b639eaf6c75e5514e3c730febddd3ec156b1b4f2f54e9eb9d0b03156d117aabe7d82ad6fff718b07d74cb7e
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ts.tar.gz 278534 BLAKE2B c5d037f7f83176738de67c6fbb6ebfc61a520a0d9b1947c2a8b2ebe6c0e97d08fad993008f33475cf0ef097c1aab3fd21196b134ce5eb2a85e4acb48741d2fa6 SHA512 e1a7357e8ebd83a82ede71d11d60b79c6d59eec70e9b562fa3edd518507ac3c368b6730edc0a299d70f2deb4c4894334d67b64b584ceb6664213272479f37edb
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_tt.tar.gz 183104 BLAKE2B 774e0f8ca6a0a68eefb4a8be828851eb694f30b5d5a48b5a81cbdedc9a3f825ec5c654087dcf3e07edcd591e0a22dec9128ff9b35ce87ad7eaf81cea331aa087 SHA512 9e680eb1c65e47fb614d206339aa3dbfcb2f3e347ab7aaa683d29c5e681b6b175dbd9174a54ac23081bb01e7753f43d082c4345582b45951facadde3c26e2da3
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ug.tar.gz 550398 BLAKE2B 823511248087c34893118e118da4990ce21e8deb9fb66a22c646351128615027f975b71c621e2c19292941fdb151ae035b2bf6fc4564267d79ee8df5865d1edb SHA512 057e74b749cc473b02100f11523ee55e273390526dea2cb06d95f1472175277c22829bf7c004f0784b5b537be72c7f015f3465c4643a6a387e0b6414f5c422bd
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_uk.tar.gz 1609788 BLAKE2B a6b0d182dcac962349b6559f60665d2d2d9277294ad0f4b1024a40484ae293915bdbb3cbf96422e7555b5a71b745cef52d0285a977da54b5aaa8f499e6cdc29e SHA512 e1c48460978bc3eee2d2db6297355c259f5592a06c65d460656511a4690838e0dee93db2df8ad27825b1e90415948ad4ab55a4b6877b6dfc4c44a332267bf53f
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_uz.tar.gz 315592 BLAKE2B 8c3b5c61c7c1513d661a4d8fca0a5d59bdac33695017fad5ddc4ed9e89d6a82fd1997a0d5331bafbf4bf358688bee8c55ea5366831d5dc9483648a97132bd85f SHA512 07b9514d170530f0c434cfde57567d7220a2480900c6a4b3d874eb29d3c294253f71822fde7d8c61dfb01ce9c17f49c3e0b111036b9894fb896168f1f83c2242
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ve.tar.gz 281112 BLAKE2B 17a82331cd532ba76d178ca7f8d44893cc542ce4ef6e8bdc57b474f5b67f3e735e3a6ba7fb93770bdeaf5e64ebd31a650c70f6cdfa31456009d4a1a30d309768 SHA512 689306ce2d1ba13f6790ace02f4501fce1be2fbd201815d54105e511914430b075009041984ed9eeaddbc3267dcc931986d49e8c637751bf7b1216b51d3e6eac
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_vi.tar.gz 466970 BLAKE2B 4034d4f7f202e14bf475b5c5c73ef9fe713aad9f0232cc705bbcef2b5c8cd46b4a00dbc62b30e3e84002b201330987198f71d14f5d09438ff18dc85d469dd0db SHA512 ecde1ef378ecc39a753d974b1364d4273195537791771c6f21d96fece189cc563e6930f03ca0cafd10baaf9edf156ac2770d0e24f68b6cc6a1bd56f181043a1b
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_xh.tar.gz 290771 BLAKE2B 2c8bd0453df58cec6bbad9d5e745458b3e42054f25d0b4b710a1dea45f66663e7c9fb2aa6a5d48e08051f742dfa3ec27aa19eb4c5dda56c22122be5aea3f2c53 SHA512 1941cbc2272999f07c6abd0fd5540dfe0bbda914a0cfb84ba48bcbcab500d523295cfd006646a3ff5fafd3ac30fe6cc36fda96441ce5588220799d9c24119666
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_zh-CN.tar.gz 790873 BLAKE2B c2958bd4bdf5d340fcfe1a4730f3fdb7f68e627e754c3f1673bf057d113f7cbaceb24ead7254ef51d8628eb22de2c9cdfa05de02e4fcf6168687e458fb61cb73 SHA512 bd83916fb8f60e08f8c5c817956de9675ccdbdee5520a5894ccc946eff9b4d8812636bf9427cbb8029ccf55066a6f2585d54fbf4ab99910cc3c66c98e1a253a2
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_zh-TW.tar.gz 799010 BLAKE2B 4ca897c4a2a9142d5692b88f10b9435371173e0e44213ba6daaefc4453b1e4ed894e0e0abe8f39813469868fa270df491d33f7a1af8e5a45ce52e83e8c807514 SHA512 0adeb4c5569f18f4e9a8dd976109e8fd127ffc7f7b8f923ad77362ee65b09f0f57a1a29c949082a6d186f35e113904ea9f93085e3046a35e4181b3296526aa84
+DIST LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_zu.tar.gz 321165 BLAKE2B 83fc51923a6252e2dd4cdda08b378524cb50741357134abaa6907175d971ede27b823362428cfb8d8ae8488022104b95b7d82c70e3020adc9ab71251557a190c SHA512 01b21629da76dcdadcef00da146cf4bb82327d6b9139ccee33e42a560adc9386c6cb44ef4bf2e22890861a44e3d1a0a1fe4e334514392643da28d05b532c2a43
 EBUILD libreoffice-l10n-6.0.6.2.ebuild 3323 BLAKE2B 4640490672fd2643f71c011321f3876bbedf9cf5a83beb8e63d9e80f591a217c3db90d8124296ee7ad532b08df2ec0a4088c8ca06ec5287faf360d63f72c5076 SHA512 056058e0d7c780e19090d3a7cf5cc38d2338e36ee2380a090034ee2aba9390a4b18ffb8fa28fedc2f42ec22712d6a6ad47792df5958a7c587f666a70dc5434f0
-EBUILD libreoffice-l10n-6.1.1.2.ebuild 3641 BLAKE2B f6d21768830910fd315e0f3c4e5eca915e74d1b28f12bcee246e3c5938fd868452fd775716026fbff76188943fc2750df11fb4b3ab2f2cfc5d24e7478eea8d80 SHA512 6955813a08bfd53eff3a309a15489f4bdb828bbec7ff2b6ee6b238975f73d456a613821f511ca5de680ad462fb8629648b2689ea032488931b139543d227b0ef
+EBUILD libreoffice-l10n-6.1.2.1.ebuild 3638 BLAKE2B 3321eaf0f24597e1c2ca6d9b01645d4ff61c921f7a9c86c88f5bf9868c7b14e5d39ebb1817f686090cf12c940620bd6d17fe6a137875d36cf85b0123550bc1ce SHA512 c7c23f50e509302c89203d13ec35194905f760d73a5ae8bca108306377b07042caf1c0c1ef23d017ba6434ed79f1b53932b149dc78339c696bde764de4679a26
 MISC metadata.xml 369 BLAKE2B 7629064f409fe8ba7f0daa435ff56eaf0870f70b45961c635119725e9a78ca40bbdf77a39e70f83a31103944f579b13db5fb07f8dc9e7ecb77491d36220370e9 SHA512 8cc7592062150a5472a5b8cf4106d0c3fd7270c7e6d0d566852bbc6670a90be2c73e6c04f085e32b41f40dd1adf9800a53a1af8df5cb297c20394c55e3df45c6
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-6.0.3.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-6.0.3.2.ebuild
deleted file mode 100644
index eade0e87ec02..000000000000
--- a/app-office/libreoffice-l10n/libreoffice-l10n-6.0.3.2.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 rpm versionator
-
-MY_PV=$(get_version_component_range 1-3)
-
-DESCRIPTION="Translations for the Libreoffice suite"
-HOMEPAGE="https://www.libreoffice.org"
-BASE_SRC_URI_TESTING="https://download.documentfoundation.org/${PN/-l10n/}/testing/${MY_PV}/rpm"
-BASE_SRC_URI_STABLE="https://download.documentfoundation.org/${PN/-l10n/}/stable/${MY_PV}/rpm"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="offlinehelp"
-
-#
-# when changing the language lists, please be careful to preserve the spaces (bug 491728)
-#
-# "en:en-US" for mapping from Gentoo "en" to upstream "en-US" etc.
-LANGUAGES_HELP=" am ast bg bn-IN bn bo bs ca-valencia ca cs da de dz el en-GB en:en-US en-ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt-BR pt ru si sk sl sq sv tg tr ug uk vi zh-CN zh-TW "
-LANGUAGES="${LANGUAGES_HELP}af ar as be br brx cy dgo fa ga gd gug kk kmr-Latn kn kok ks lb lo lt lv mai ml mn mni mr my nr nso oc or pa:pa-IN ro rw sa:sa-IN sat sd sid sr-Latn sr ss st sw-TZ ta te th tn ts tt uz ve xh zu "
-
-for lang in ${LANGUAGES_HELP}; do
-	helppack="offlinehelp? ( ${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz )"
-	SRC_URI+=" l10n_${lang%:*}? ( ${helppack} )"
-done
-for lang in ${LANGUAGES}; do
-	if [[ ${lang%:*} != en ]]; then
-		langpack="${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz"
-		SRC_URI+=" l10n_${lang%:*}? ( ${langpack} )"
-	fi
-	IUSE+=" l10n_${lang%:*}"
-done
-unset lang helppack langpack
-
-RDEPEND+="app-text/hunspell"
-
-RESTRICT="strip"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-
-	local lang dir rpmdir
-
-	# First remove dictionaries, we want to use system ones.
-	find "${S}" -name *dict*.rpm -delete || die "Failed to remove dictionaries"
-
-	for lang in ${LANGUAGES}; do
-		# break away if not enabled
-		use l10n_${lang%:*} || continue
-
-		dir=${lang#*:}
-
-		# for english we provide just helppack, as translation is always there
-		if [[ ${lang%:*} != en ]]; then
-			rpmdir="LibreOffice_${PV}_Linux_x86_rpm_langpack_${dir}/RPMS/"
-			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
-			rpm_unpack ./${rpmdir}/*.rpm
-		fi
-		if [[ "${LANGUAGES_HELP}" =~ " ${lang} " ]] && use offlinehelp; then
-			rpmdir="LibreOffice_${PV}_Linux_x86_rpm_helppack_${dir}/RPMS/"
-			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
-			rpm_unpack ./${rpmdir}/*.rpm
-		fi
-	done
-}
-
-src_configure() { :; }
-src_compile() { :; }
-
-src_install() {
-	local dir="${S}"/opt/${PN/-l10n/}$(get_version_component_range 1-2)/
-	# Condition required for people that do not install anything eg no l10n
-	# or just english with no offlinehelp.
-	if [[ -d "${dir}" ]] ; then
-		insinto /usr/$(get_libdir)/${PN/-l10n/}/
-		doins -r "${dir}"/*
-	fi
-	# remove extensions that are in the l10n for some weird reason
-	rm -rf "${ED}"usr/$(get_libdir)/${PN/-l10n/}/share/extensions/ || \
-		die "Failed to remove extensions"
-}
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-6.1.1.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-6.1.1.2.ebuild
deleted file mode 100644
index f9ce9a0b7254..000000000000
--- a/app-office/libreoffice-l10n/libreoffice-l10n-6.1.1.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rpm eapi7-ver
-
-BASE_PV=$(ver_cut 1-3)
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-[[ ${PV} == *alpha* || ${PV} == *beta* ]] && PN_DEV="Dev"
-
-DESCRIPTION="Translations for the Libreoffice suite"
-HOMEPAGE="https://www.libreoffice.org"
-BASE_SRC_URI_TESTING="https://download.documentfoundation.org/${PN/-l10n/}/testing/${BASE_PV}/rpm"
-BASE_SRC_URI_STABLE="https://download.documentfoundation.org/${PN/-l10n/}/stable/${BASE_PV}/rpm"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="offlinehelp"
-
-#
-# when changing the language lists, please be careful to preserve the spaces (bug 491728)
-#
-# "en:en-US" for mapping from Gentoo "en" to upstream "en-US" etc.
-LANGUAGES_HELP=" am ast bg bn-IN bn bo bs ca-valencia ca cs da de dz el en-GB en:en-US en-ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt-BR pt ru si sk sl sq sv tg tr ug uk vi zh-CN zh-TW "
-LANGUAGES="${LANGUAGES_HELP}af ar as be br brx cy dgo fa ga gd gug kk kmr-Latn kn kok ks lb lo lt lv mai ml mn mni mr my nr nso oc or pa:pa-IN ro rw sa:sa-IN sat sd sid sr-Latn sr ss st sw-TZ ta te th tn ts tt uz ve xh zu "
-
-for lang in ${LANGUAGES_HELP}; do
-	helppack="offlinehelp? ( ${BASE_SRC_URI_STABLE}/x86/LibreOffice${PN_DEV}_${BASE_PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice${PN_DEV}_${MY_PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz )"
-	SRC_URI+=" l10n_${lang%:*}? ( ${helppack} )"
-done
-for lang in ${LANGUAGES}; do
-	if [[ ${lang%:*} != en ]]; then
-		langpack="${BASE_SRC_URI_STABLE}/x86/LibreOffice${PN_DEV}_${BASE_PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice${PN_DEV}_${MY_PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz"
-		SRC_URI+=" l10n_${lang%:*}? ( ${langpack} )"
-	fi
-	IUSE+=" l10n_${lang%:*}"
-done
-unset lang helppack langpack
-
-RDEPEND+="app-text/hunspell"
-
-RESTRICT="strip"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-
-	local lang dir rpmdir
-
-	# First remove dictionaries, we want to use system ones.
-	find "${S}" -name *dict*.rpm -delete || die "Failed to remove dictionaries"
-
-	for lang in ${LANGUAGES}; do
-		# break away if not enabled
-		use l10n_${lang%:*} || continue
-
-		dir=${lang#*:}
-
-		# for english we provide just helppack, as translation is always there
-		if [[ ${lang%:*} != en ]]; then
-			rpmdir="LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${dir}/RPMS/"
-			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
-			rpm_unpack ./${rpmdir}/*.rpm
-		fi
-		if [[ "${LANGUAGES_HELP}" =~ " ${lang} " ]] && use offlinehelp; then
-			rpmdir="LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${dir}/RPMS/"
-			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
-			rpm_unpack ./${rpmdir}/*.rpm
-		fi
-	done
-}
-
-src_configure() { :; }
-src_compile() { :; }
-
-src_install() {
-	local dir="${S}"/opt/${PN/-l10n/}$(ver_cut 1-2)/
-	# Condition required for people that do not install anything eg no l10n
-	# or just english with no offlinehelp.
-	if [[ -d "${dir}" ]] ; then
-		insinto /usr/$(get_libdir)/${PN/-l10n/}/
-		doins -r "${dir}"/*
-	fi
-	# remove extensions that are in the l10n for some weird reason
-	rm -rf "${ED}"usr/$(get_libdir)/${PN/-l10n/}/share/extensions/ || \
-		die "Failed to remove extensions"
-}
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-6.1.2.1.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-6.1.2.1.ebuild
new file mode 100644
index 000000000000..9d5656c56116
--- /dev/null
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-6.1.2.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rpm eapi7-ver
+
+BASE_PV=$(ver_cut 1-3)
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+[[ ${PV} == *alpha* || ${PV} == *beta* ]] && PN_DEV="Dev"
+
+DESCRIPTION="Translations for the Libreoffice suite"
+HOMEPAGE="https://www.libreoffice.org"
+BASE_SRC_URI_TESTING="https://download.documentfoundation.org/${PN/-l10n/}/testing/${BASE_PV}/rpm"
+BASE_SRC_URI_STABLE="https://download.documentfoundation.org/${PN/-l10n/}/stable/${BASE_PV}/rpm"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="offlinehelp"
+
+#
+# when changing the language lists, please be careful to preserve the spaces (bug 491728)
+#
+# "en:en-US" for mapping from Gentoo "en" to upstream "en-US" etc.
+LANGUAGES_HELP=" am ast bg bn-IN bn bo bs ca-valencia ca cs da de dz el en-GB en:en-US en-ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt-BR pt ru si sk sl sq sv tg tr ug uk vi zh-CN zh-TW "
+LANGUAGES="${LANGUAGES_HELP}af ar as be br brx cy dgo fa ga gd gug kk kmr-Latn kn kok ks lb lo lt lv mai ml mn mni mr my nr nso oc or pa:pa-IN ro rw sa:sa-IN sat sd sid sr-Latn sr ss st sw-TZ ta te th tn ts tt uz ve xh zu "
+
+for lang in ${LANGUAGES_HELP}; do
+	helppack="offlinehelp? ( ${BASE_SRC_URI_STABLE}/x86/LibreOffice${PN_DEV}_${BASE_PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice${PN_DEV}_${MY_PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz )"
+	SRC_URI+=" l10n_${lang%:*}? ( ${helppack} )"
+done
+for lang in ${LANGUAGES}; do
+	if [[ ${lang%:*} != en ]]; then
+		langpack="${BASE_SRC_URI_STABLE}/x86/LibreOffice${PN_DEV}_${BASE_PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice${PN_DEV}_${MY_PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz"
+		SRC_URI+=" l10n_${lang%:*}? ( ${langpack} )"
+	fi
+	IUSE+=" l10n_${lang%:*}"
+done
+unset lang helppack langpack
+
+RDEPEND+="app-text/hunspell"
+
+RESTRICT="strip"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+
+	local lang dir rpmdir
+
+	# First remove dictionaries, we want to use system ones.
+	find "${S}" -name *dict*.rpm -delete || die "Failed to remove dictionaries"
+
+	for lang in ${LANGUAGES}; do
+		# break away if not enabled
+		use l10n_${lang%:*} || continue
+
+		dir=${lang#*:}
+
+		# for english we provide just helppack, as translation is always there
+		if [[ ${lang%:*} != en ]]; then
+			rpmdir="LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${dir}/RPMS/"
+			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
+			rpm_unpack ./${rpmdir}/*.rpm
+		fi
+		if [[ "${LANGUAGES_HELP}" =~ " ${lang} " ]] && use offlinehelp; then
+			rpmdir="LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${dir}/RPMS/"
+			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
+			rpm_unpack ./${rpmdir}/*.rpm
+		fi
+	done
+}
+
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+	local dir="${S}"/opt/${PN/-l10n/}$(ver_cut 1-2)/
+	# Condition required for people that do not install anything eg no l10n
+	# or just english with no offlinehelp.
+	if [[ -d "${dir}" ]] ; then
+		insinto /usr/$(get_libdir)/${PN/-l10n/}/
+		doins -r "${dir}"/*
+	fi
+	# remove extensions that are in the l10n for some weird reason
+	rm -rf "${ED}"usr/$(get_libdir)/${PN/-l10n/}/share/extensions/ || \
+		die "Failed to remove extensions"
+}
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 0214c07d340c..270d000641e0 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -2,27 +2,20 @@ AUX libreoffice-5.2.5.1-glibc-2.24.patch 361 BLAKE2B d95ded4f051c77aed22ce99f627
 AUX libreoffice-5.3.4.2-kioclient5.patch 605 BLAKE2B 30961066c080c4d06ca978b7c0ad4b57a3739d6d34a2941f2ea57d3a5c4ab65e3f3c2376243aa88c9c05b1038cf9bfb7605a370d11513bb4553de2d268010519 SHA512 2aa6d1fc96749b79b3291f6e27630c6cf59d2c743f0dd8603867ba8aec2c17f87b70e1dd031365013f7e9ea53c160e9cb3f48af592a587dc05f3ae4cc1b35df6
 AUX libreoffice-5.4-system-pyuno.patch 1399 BLAKE2B d7516b0ac19509dae8eaaac94acad65e35c71b68ea0f2962c41d9422a89993dc90e76b1f7cd3d19f8f3860b443f063ee1c17024c7f56fd3b8470d2b690eb9c32 SHA512 41b57b857a294b8ac234aaf160dbd380008f716ffdf481b7c733f1dab8702876aad827ab9f1b8f2f26778f0b3a6dfdc9e3ae190188a484d9aeb4568df2e9b418
 AUX libreoffice-6.0.3.2-disable-flaky-tests-1.patch 8928 BLAKE2B e5399e0e520dfe4ac5d0a02c3bf3372ccdc7725f073aabb74c36600a7cd09eb45a9e5d5486bf700ae374723206e3a421069b298137d14a9b05e17e70f2d9d3b4 SHA512 ca100dc389ed93a5eeed35f001d9e0f6f886782bfaa3dead3105b9bce91ca9e721354b55cd67fdb40c7d2d64966c530ebc6ba6a4e3c62b0e006759c7b64f1b29
-AUX libreoffice-6.0.3.2-disable-flaky-tests-2.patch 1330 BLAKE2B bf038456e3012592e69e6448399160d146ab42a6ce641f9728a13ae9275342d2deb60bfa14b12919c712f0e8f67e2d061a789fad80711c758e80e4adcb6271fb SHA512 30ede2094102b2d6d95e5cd7d76d59a3c4c40e9bd7300681613aea78a23406e32b0bd23aae779d5f8d21102baaaab999a0915e9ef3d16b32463b55caf6867456
-AUX libreoffice-6.0.3.2-poppler-0.64.patch 2617 BLAKE2B c7e9848012b40ace6cd42e7ba114bb03f137c88b25d895be4da3c962ffd2279e524b3b32ed9b24c605ede55920b664759cf321d241e5fd974651242f5c4f19e3 SHA512 ed6941b73fa49a1b520014fb92269a01f947a93bc80b7f6c8cb1c07572ae636154a1ab38a6d6de2d3129f16fad4c224b21aa9cf52e3f95343c882013b24f8b49
 AUX libreoffice-6.0.3.2-testTdf108947.patch 638 BLAKE2B 38da9bf34a921d22002d45e650c738687706c77a67ac2748ee14efb48f47a328b1339712687b525a4f66a1ad0b36fc69c0613ef441067a206ea4df81754f4727 SHA512 a712fb653d86a74a96d568805ca48d183a7ec71f32ef34cfb98a4999cb7fead3f5cd11f5d8f8944041583d5221b0dbaeb3cdfc625a1958118e867569d0c56479
-AUX libreoffice-6.0.4.2-glm-0.9.9.patch 1017 BLAKE2B 7a85f652d6a9c01157da37a9bcc72261849f8f5b64816a8b55b149a44c50e684102a63f0d758b69ed2199259a3a934fa4c47f56ca65b66a82558a72dca991084 SHA512 aca8b606c5ef7c7333938d489faa24f86f454f22797d40ff735653ef57b70874cb4b9d22f32099a8cbc45b23c6943dc1d9dbdda9b6a08052c63ef2ac99a3f1a1
 DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a
 DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325feae4f168ad0f84602708fe724a1d9a9a054ed4991992c1d4637b31083cf569326b8aac1ec598e71ec65fb31ee16233b9c736e97ef062b47d7 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c
 DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23092bc57ccd989f26ea04a323dcb17a0ea8baaa6a21b5d5e2b6e29fcae9d18ecd043073030e104ad56c86a115760590f57eda86c22c9fe478b0 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a
 DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
 DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
-DIST libreoffice-6.0.3.2-patchset-01.tar.xz 39268 BLAKE2B 0bf5ad04323cbd2cf157dacc96aa9d3344d683f3303e5c284a83c0f8783d23881402393f2361d4db1270cf75424ff6f12e5b16540b3f7ccb624c29ccc8c71416 SHA512 f6632afe1c7bcdfb1ca82059d299f808e5eee982c176aa2cc5d728e11b833c3fe921c9c627847bc12128ae5e32c901cbbdfec0b71a22bb9a4b5041b645ed934f
-DIST libreoffice-6.0.3.2.tar.xz 203747760 BLAKE2B 8a666aa2e3e880b050ac8eed93a1c55ddbfa7ce74364b0dff4f5be446cf64c4fe347b164716a7d226c6cfbac01dbd3f11b89ecff75460ccd902ac44fe93d5daa SHA512 d1ec8982f185926d3f3040bcdef737e7c74fcf5b360a12a91983eac92843510553759ffa84c7d244df13036fc32149ffe13dd6a56fb1bda6f64fd5a318fd7879
 DIST libreoffice-6.0.5.2-patchset-01.tar.xz 39820 BLAKE2B d8b436378b05a8a58156817b5d1e0323fd6fcfde9aa9fc4fc6a8056a06a16c84c5860ffe1ae715faddb707c5aa417b43e6c7f5c05821f86208edbb3778d830a1 SHA512 ec99a6358c0a20075abc0aa136ad6ccded4562fa0f25897efe2a8783fb33b97b92a2dd8041206b3344a79dfd10ebe98b79c8bf0b4e8539e45942978f0028dc59
 DIST libreoffice-6.0.6.2.tar.xz 205022916 BLAKE2B 715d24c7bbfe4d570011f5090cf647421f68e73fb76047ec0fb973ec0bfb30be3ec1d521bdd92369e23abaa444e7afd3e070ff613486e8f85b9ca76d9496fd0e SHA512 8cf7bd4d8f81ee09f8a21c4ccb12f788c67cf1cba71e08b9b720f9e8b4ec2dfcc25452ef05b6b60529463241c2b23a70eb6a79a8f15b95e890a2ea9cbb458517
-DIST libreoffice-6.1.1.2.tar.xz 207211808 BLAKE2B 9c60f6153a82903252102056d27ae412350200fcdb8dfc8cbefeb92bd50eebfbd11bda06e20f35d19320591f9cfdfa53c9f1fda8c66d2bee66c59c37f27753be SHA512 c3429fbd247c4b17f4e140751fcb1e593705aa60911556c4dfc960ebaa6fe50a39d933d14bfc3c89cdd92619f41611eb1aa0090fe9d391d84989d206005af3ea
+DIST libreoffice-6.1.2.1.tar.xz 207364016 BLAKE2B 9046cd4eaa30be40e5223718491ef5f39ad6940ae6bef1c88618eb42dfffeb9980db164367f7c6518979f57b31688abcc81068be2da4de08b6da5a7245e50283 SHA512 b7c7839da8251fd0f01794381d77a5abd4d092f21589df046402a1d332d782608aa00ab29ad60c9a34f27f11576d70c5a678e87a0f53c5b4065ae59fe77a0367
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-6.0.3.2.tar.xz 2972952 BLAKE2B 90b62af89bbdec436e8ca5ede3aa8aa57109e22136d454850a108fd4aac1eace166432be8152d623b06ba9e04001a579b3200bbbd20caa1ac6c3b97026319dd3 SHA512 cb538553efd94c7a6f9059b6fb74351adba5449d7f4555558fd0337950528be2bbb7ddf7aaef4992eb18f432c42133d17bf8f0af9d3fe29eddd9d620ab847a40
 DIST libreoffice-help-6.0.6.2.tar.xz 2972748 BLAKE2B 38534d5fd08751af587fd5b5be03b39b086e2bc26878c50e98bafd7a2b48f517ac29b8d434748449b0a3e8a451c31f40255094d64965800aadfd94c111295be5 SHA512 89caab57774f85f3e58523c0debb57247a0f10959634bf296aaacc4928bcce6ea8ed9f167b267e2e0eeb52b69714eeb094fedfa3e810cf409dfbc7c5e49b7c13
-DIST libreoffice-help-6.1.1.2.tar.xz 15757536 BLAKE2B 5e93bb65c6e42f924bd1c782e472f247b97cb9264c671d932a71cf67813d529c363a8664eeca48b407a0882ad2d0d7392cffcfddea0f35f0c62881b3c11d70ce SHA512 6e22a3efa9c6db97dec27a5f6ef21efb0c0665712715338d8fb73340a9572841fcaac63b0f6b03d67bc9c459a85d1910c18a5830ff8541265509cf8a1bdc3aa1
-EBUILD libreoffice-6.0.3.2.ebuild 16953 BLAKE2B 9b17913bb18d607ac0141226e54199b1d48c5f88a66d9ba8a6bb40459e35c1301a57c0b111a23f12e03daba9e9e6b850e874d64e4d2a37bba809dbff24201eb8 SHA512 acd68e679413031897fe17a27b1da7c688522ca4e773174be5ab1595c588b62e0969f72fa758f1548d9adce54cca151ecd5edfee1193dcf568ec5fc4b8265a22
+DIST libreoffice-help-6.1.2.1.tar.xz 15757852 BLAKE2B 2f40eeb16956695e6a4f5d9bf6ac6ad8a72a4a38dd4b481320c1ffe7bf41b789e938291631816ee84cf4da83a0347d34383e9ed9c3f4b48374cf15cea13243a7 SHA512 6cabaed79d0405e4e35af3e3689561e0d447bbf98b081b6a40fd52c37bda7b0886d4df4ea1c2deaa7db56c26933b5697ae4ef796f6e763a58b7ee729debcca6e
 EBUILD libreoffice-6.0.6.2.ebuild 16750 BLAKE2B 7ea6bb2645ee81c15ed71d5353d15507ba5c29d05758de31af8528897f251880f08e08dad979c43d27a9199429c182ec618a038f772e5827106b824343e31948 SHA512 d7dafe868dfb5a59199f71090bc05cb6402aa247ee309e5fa199dcd00d2c44f57a5ddfc6e97f7f851c457d0fe7fb0d8033795b58ae626ff2c616dbbeb0c13e64
-EBUILD libreoffice-6.1.1.2.ebuild 16621 BLAKE2B 8c41b3d18295850bfe0ed357c5af48a714e701d0e5d10d1518c62046765d5a39f2f4cc6e92271dce5128e9b9f274bd7de5d3357f7246a01ca932efedb9fd2081 SHA512 2ebd9b765abd73901d070b9cfdc68ce9078d781b728883e151ae306d25ea452c08030c18b87acf0ce869b59e751670c73c5f9acfa8818c5666513d5fa2def55b
-EBUILD libreoffice-6.1.9999.ebuild 16614 BLAKE2B 257cd4a52af11d361f88f995e4de43d61ff9859329923d325652309efbb12937fbb73f74e077e20194deb8aadd96bcc750651443114cdb8297d041a6b186b2f3 SHA512 02f0cf63d59bc250899fd9a79c0ee8a2753d0770da201fe880cea6b3c28b73a4eb47e49fdb78b56baf76339c6598a5e5055147ec1b9825260059ba90ee6f18d8
-EBUILD libreoffice-9999.ebuild 16705 BLAKE2B 17635b8620dd44fd2e42ada77e9433c3a7bee0777be322b9c2ecd48c05c7577e425e9dd1ffd78908937f12e1e6019a8b6dfb5454e5e042f6076cf84eecb24fa3 SHA512 cb3dda6684f8477511a3bcffe5fe221594b5cda24f8b593e78b0208b595f84f01d360e0cc0098a3382792506d11ce4165c7ec54a7d14170f0a3f0a3171d42577
+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
diff --git a/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-2.patch b/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-2.patch
deleted file mode 100644
index 55f2d8a55fc7..000000000000
--- a/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-2.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/xmlsecurity/qa/unit/signing/signing.cxx	2018-01-27 18:21:08.228434985 +0100
-+++ b/xmlsecurity/qa/unit/signing/signing.cxx	2018-01-27 18:21:37.428824309 +0100
-@@ -114,7 +114,7 @@
-     /// Test a typical broken ODF signature where the XML dsig hash is corrupted.
-     void testODFBrokenDsigGPG();
-     /// Test loading an encrypted ODF document
--    void testODFEncryptedGPG();
-+//    void testODFEncryptedGPG();
- #endif
-     CPPUNIT_TEST_SUITE(SigningTest);
-     CPPUNIT_TEST(testDescription);
-@@ -143,7 +143,7 @@
-     CPPUNIT_TEST(testODFUntrustedGoodGPG);
-     CPPUNIT_TEST(testODFBrokenStreamGPG);
-     CPPUNIT_TEST(testODFBrokenDsigGPG);
--    CPPUNIT_TEST(testODFEncryptedGPG);
-+//    CPPUNIT_TEST(testODFEncryptedGPG);
- #endif
-     CPPUNIT_TEST_SUITE_END();
- 
-@@ -743,14 +743,14 @@
-     CPPUNIT_ASSERT_EQUAL(static_cast<int>(SignatureState::BROKEN), static_cast<int>(pObjectShell->GetDocumentSignatureState()));
- }
- 
--void SigningTest::testODFEncryptedGPG()
-+/*void SigningTest::testODFEncryptedGPG()
- {
-     createDoc(m_directories.getURLFromSrc(DATA_DIRECTORY) + "encryptedGPG.odt");
-     SfxBaseModel* pBaseModel = dynamic_cast<SfxBaseModel*>(mxComponent.get());
-     CPPUNIT_ASSERT(pBaseModel);
-     SfxObjectShell* pObjectShell = pBaseModel->GetObjectShell();
-     CPPUNIT_ASSERT(pObjectShell);
--}
-+}*/
- 
- #endif
- 
diff --git a/app-office/libreoffice/files/libreoffice-6.0.3.2-poppler-0.64.patch b/app-office/libreoffice/files/libreoffice-6.0.3.2-poppler-0.64.patch
deleted file mode 100644
index 37a554d807da..000000000000
--- a/app-office/libreoffice/files/libreoffice-6.0.3.2-poppler-0.64.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 106b2c96e9807af14d6eb6e8f83dcf25095a093e Mon Sep 17 00:00:00 2001
-From: Rene Engelhard <rene@debian.org>
-Date: Tue, 24 Apr 2018 15:56:23 +0200
-Subject: fix build with poppler 0.64
-
-GooString became const...
-
-Change-Id: Icc95be2e8603a4e22c6a9ac2008986bacd0bfba5
-Reviewed-on: https://gerrit.libreoffice.org/53422
-Tested-by: Jenkins <ci@libreoffice.org>
-Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
----
- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 10 ++++++++++
- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |  4 ++++
- 2 files changed, 14 insertions(+)
-
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-index 00fd56a..9618e5b 100644
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-@@ -446,6 +446,9 @@ int PDFOutDev::parseFont( long long nNewId, GfxFont* gfxFont, GfxState* state )
-     FontAttributes aNewFont;
-     int nSize = 0;
- 
-+#if POPPLER_CHECK_VERSION(0, 64, 0)
-+    const
-+#endif
-     GooString* pFamily = gfxFont->getName();
-     if( pFamily )
-     {
-@@ -742,6 +745,9 @@ void PDFOutDev::updateFont(GfxState *state)
-         FontAttributes aFont;
-         int nEmbedSize=0;
- 
-+#if POPPLER_CHECK_VERSION(0, 64, 0)
-+        const
-+#endif
-         Ref* pID = gfxFont->getID();
-         // TODO(Q3): Portability problem
-         long long fontID = (long long)pID->gen << 32 | (long long)pID->num;
-@@ -932,7 +938,11 @@ void PDFOutDev::drawChar(GfxState *state, double x, double y,
-     printf( "\n" );
- }
- 
-+#if POPPLER_CHECK_VERSION(0, 64, 0)
-+void PDFOutDev::drawString(GfxState*, const GooString* /*s*/)
-+#else
- void PDFOutDev::drawString(GfxState*, GooString* /*s*/)
-+#endif
- {
-     // TODO(F3): NYI
- }
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-index 922c513..2a6268c 100644
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-@@ -223,7 +223,11 @@ namespace pdfi
-                               double dx, double dy,
-                               double originX, double originY,
-                               CharCode code, int nBytes, Unicode *u, int uLen) override;
-+#if POPPLER_CHECK_VERSION(0, 64, 0)
-+        virtual void drawString(GfxState *state, const GooString *s) override;
-+#else
-         virtual void drawString(GfxState *state, GooString *s) override;
-+#endif
-         virtual void endTextObject(GfxState *state) override;
- 
-         //----- image drawing
--- 
-cgit v1.1
-
diff --git a/app-office/libreoffice/files/libreoffice-6.0.4.2-glm-0.9.9.patch b/app-office/libreoffice/files/libreoffice-6.0.4.2-glm-0.9.9.patch
deleted file mode 100644
index 1430fdf1a346..000000000000
--- a/app-office/libreoffice/files/libreoffice-6.0.4.2-glm-0.9.9.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 5f1bf6598b5725ad1e50ae9f7ec7524cc8a834fa Mon Sep 17 00:00:00 2001
-From: Louis Sautier <sautier.louis@gmail.com>
-Date: Sun, 10 Jun 2018 12:25:18 +0200
-Subject: Fix build with GLM 0.9.9.0, tdf#118070
-
-One of the test files was forgotten in 953c4add8fd76d88f49a81ae4c21a1fdcc007e57
-
-Change-Id: I0315433c688ff7edb2ba599bbef203cac9de3022
-Reviewed-on: https://gerrit.libreoffice.org/55554
-Reviewed-by: Rene Engelhard <rene@debian.org>
-Tested-by: Rene Engelhard <rene@debian.org>
----
- vcl/Executable_icontest.mk | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/vcl/Executable_icontest.mk b/vcl/Executable_icontest.mk
-index ce16330..8c917b7 100644
---- a/vcl/Executable_icontest.mk
-+++ b/vcl/Executable_icontest.mk
-@@ -19,6 +19,12 @@ $(eval $(call gb_Executable_use_externals,icontest,\
- ))
- endif
- 
-+ifeq ($(SYSTEM_GLM),TRUE)
-+$(eval $(call gb_Executable_add_defs,icontest,\
-+    -DGLM_ENABLE_EXPERIMENTAL \
-+))
-+endif
-+
- $(eval $(call gb_Executable_use_api,icontest,\
-     offapi \
-     udkapi \
--- 
-cgit v1.1
diff --git a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
deleted file mode 100644
index 04b8d2c48514..000000000000
--- a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
+++ /dev/null
@@ -1,578 +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} )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
-	https://dev-builds.libreoffice.org/pre-releases/src
-	https://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
-	https://downloadarchive.documentfoundation.org/libreoffice/old/${PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-PATCHSET="${PN}-6.0.3.2-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs gnome2-utils java-pkg-opt-2 pax-utils python-single-r1 toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
-	for i in ${DEV_URI}; do
-		SRC_URI+=" ${i}/${P}.tar.xz"
-		SRC_URI+=" ${i}/${PN}-help-${PV}.tar.xz"
-	done
-	unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
-	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
-	# no release for 8 years, should we package it?
-	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
-	# Does not build with 1.6 rhino at all
-	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
-	# requirement of rhino
-	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
-	# not packageable
-	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
-gstreamer +gtk gtk2 jemalloc kde libressl mysql odk pdfimport postgres test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	app-crypt/gpgme[cxx]
-	app-text/hunspell:=
-	>=app-text/libabw-0.1.0
-	>=app-text/libebook-0.1
-	app-text/libepubgen
-	>=app-text/libetonyek-0.1
-	app-text/libexttextcat
-	app-text/liblangtag
-	>=app-text/libmspub-0.1.0
-	>=app-text/libmwaw-0.3.1
-	>=app-text/libodfgen-0.1.0
-	app-text/libqxp
-	app-text/libstaroffice
-	app-text/libwpd:0.10[tools]
-	app-text/libwpg:0.3
-	>=app-text/libwps-0.4
-	app-text/mythes
-	>=dev-cpp/clucene-2.3.3.4-r2
-	=dev-cpp/libcmis-0.5*
-	dev-db/unixODBC
-	dev-lang/perl
-	dev-libs/boost:=[nls]
-	dev-libs/expat
-	dev-libs/hyphen
-	dev-libs/icu:=
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-	>=dev-libs/liborcus-0.13.3
-	dev-libs/librevenge
-	dev-libs/nspr
-	dev-libs/nss
-	!libressl? ( >=dev-libs/openssl-1.0.0d:0 )
-	libressl? ( dev-libs/libressl )
-	>=dev-libs/redland-1.0.16
-	>=dev-libs/xmlsec-1.2.24[nss]
-	media-gfx/graphite2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
-	media-libs/lcms:2
-	>=media-libs/libcdr-0.1.0
-	>=media-libs/libepoxy-1.3.1[X]
-	>=media-libs/libfreehand-0.1.0
-	media-libs/libpagemaker
-	>=media-libs/libpng-1.4:0=
-	>=media-libs/libvisio-0.1.0
-	media-libs/libzmf
-	net-libs/neon
-	net-misc/curl
-	net-nds/openldap
-	sci-mathematics/lpsolve
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/cairo[X]
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	bluetooth? ( net-wireless/bluez )
-	coinmp? ( sci-libs/coinor-mp )
-	cups? ( net-print/cups )
-	dbus? ( dev-libs/dbus-glib )
-	eds? (
-		dev-libs/glib:2
-		gnome-base/dconf
-		gnome-extra/evolution-data-server
-	)
-	firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	gtk? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		gnome-base/dconf
-		x11-libs/gtk+:3
-	)
-	gtk2? (
-		x11-libs/gdk-pixbuf
-		>=x11-libs/gtk+-2.24:2
-	)
-	kde? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtx11extras:5
-		dev-qt/qtwidgets:5
-		kde-frameworks/kconfig:5
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/kio:5
-		kde-frameworks/kwindowsystem:5
-	)
-	jemalloc? ( dev-libs/jemalloc )
-	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
-	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
-	mysql? ( dev-db/mysql-connector-c++ )
-	pdfimport? ( app-text/poppler:=[cxx] )
-	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	!app-office/libreoffice-bin
-	!app-office/libreoffice-bin-debug
-	!app-office/openoffice
-	media-fonts/dejavu
-	media-fonts/liberation-fonts
-	media-fonts/libertine
-	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
-	java? ( >=virtual/jre-1.6 )
-	kde? ( kde-frameworks/breeze-icons:* )
-	vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
-	PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
-	# Translations are not reliable on live ebuilds
-	# rather force people to use english only.
-	PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-#        after everything upstream is under gbuild
-#        as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
-	!<sys-devel/make-3.82
-	>=dev-libs/libatomic_ops-7.2d
-	>=dev-libs/libxml2-2.7.8
-	dev-libs/libxslt
-	dev-perl/Archive-Zip
-	>=dev-util/cppunit-1.14.0
-	>=dev-util/gperf-3
-	dev-util/intltool
-	>=dev-util/mdds-1.2.3:1=
-	media-libs/glm
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	sys-devel/ucpp
-	sys-libs/zlib
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	x11-libs/libXt
-	x11-libs/libXtst
-	java? (
-		dev-java/ant-core
-		>=virtual/jdk-1.6
-	)
-	odk? ( >=app-doc/doxygen-1.8.4 )
-	test? (
-		app-crypt/gnupg
-		dev-util/cppunit
-		media-fonts/dejavu
-	)
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	bluetooth? ( dbus )
-	kde? ( gtk )
-	libreoffice_extensions_nlpsolver? ( java )
-	libreoffice_extensions_scripting-beanshell? ( java )
-	libreoffice_extensions_scripting-javascript? ( java )
-	libreoffice_extensions_wiki-publisher? ( java )
-"
-
-PATCHES=(
-	# not upstreamable stuff
-	"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
-	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
-	"${FILESDIR}"/${PN}-6.0.3.2-disable-flaky-tests-{1,2}.patch #bug 656676
-	# 6.0 branch
-	"${FILESDIR}/${P}-poppler-0.64.patch"
-	# 6.1 branch
-	"${FILESDIR}/${PN}-6.0.4.2-glm-0.9.9.patch" # bug 657178
-
-	# TODO: upstream
-	"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
-	"${FILESDIR}/${PN}-6.0.3.2-testTdf108947.patch" #bug 656600
-
-	# gtk3-kde5 vcl plugin backported from master
-	"${WORKDIR}"/${PATCHSET/.tar.xz/}
-)
-
-pkg_pretend() {
-	use java || \
-		ewarn "If you plan to use Base application you should enable java or you will get various crashes."
-
-	if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
-		ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
-		ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
-		ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
-	fi
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		CHECKREQS_MEMORY="512M"
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			CHECKREQS_DISK_BUILD="22G"
-		else
-			CHECKREQS_DISK_BUILD="6G"
-		fi
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-	xdg_environment_reset
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		CHECKREQS_MEMORY="512M"
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			CHECKREQS_DISK_BUILD="22G"
-		else
-			CHECKREQS_DISK_BUILD="6G"
-		fi
-		check-reqs_pkg_setup
-	fi
-}
-
-src_unpack() {
-	default
-
-	if [[ ${PV} = *9999* ]]; then
-		local base_uri branch mypv
-		base_uri="https://anongit.freedesktop.org/git"
-		branch="master"
-		mypv=${PV/.9999}
-		[[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
-		git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
-		git-r3_checkout "${base_uri}/${PN}/core"
-
-		git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
-		git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
-	fi
-}
-
-src_prepare() {
-	default
-
-	# sandbox violations on many systems, we don't need it. Bug #646406
-	sed -i \
-		-e "/KF5_CONFIG/s/kf5-config/no/" \
-		configure.ac || die "Failed to disable kf5-config"
-
-	AT_M4DIR="m4" eautoreconf
-	# hack in the autogen.sh
-	touch autogen.lastrun
-
-	# system pyuno mess
-	sed -i \
-		-e "s:%eprefix%:${EPREFIX}:g" \
-		-e "s:%libdir%:$(get_libdir):g" \
-		pyuno/source/module/uno.py \
-		pyuno/source/officehelper.py || die
-	# sed in the tests
-	sed -i \
-		-e "s#all : build unitcheck#all : build#g" \
-		solenv/gbuild/Module.mk || die
-	sed -i \
-		-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
-		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
-		Makefile.in || die
-
-	sed -i \
-		-e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
-		-e "s,\$INSTALLDIRNAME.sh,${PN}," \
-		bin/distro-install-desktop-integration || die
-
-	if use branding; then
-		# hack...
-		mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
-	fi
-
-	# Don't list pdfimport support in desktop when built with none, bug # 605464
-	if ! use pdfimport; then
-		sed -i \
-			-e ":MimeType: s:application/pdf;::" \
-			-e ":Keywords: s:pdf;::" \
-			sysui/desktop/menus/draw.desktop || die
-	fi
-}
-
-src_configure() {
-	# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
-	# Note: these are for Gentoo use ONLY. For your own distribution, please get
-	# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
-	local google_default_client_id="329227923882.apps.googleusercontent.com"
-	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
-	# optimization flags
-	export GMAKE_OPTIONS="${MAKEOPTS}"
-	# System python enablement:
-	export PYTHON_CFLAGS=$(python_get_CFLAGS)
-	export PYTHON_LIBS=$(python_get_LIBS)
-
-	if use kde; then
-		export QT_SELECT=5 # bug 639620 needs proper fix though
-		export QT5DIR="$(qt5_get_bindir)/../"
-		export MOC5="$(qt5_get_bindir)/moc"
-	fi
-
-	# system headers/libs/...: enforce using system packages
-	# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
-	# --enable-cairo: ensure that cairo is always required
-	# --enable-*-link: link to the library rather than just dlopen on runtime
-	# --enable-release-build: build the libreoffice as release
-	# --disable-fetch-external: prevent dowloading during compile phase
-	# --enable-extension-integration: enable any extension integration support
-	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
-	# --disable-report-builder: too much java packages pulled in without pkgs
-	# --without-system-sane: just sane.h header that is used for scan in writer,
-	#   not linked or anything else, worthless to depend on
-	# --disable-pdfium: not yet packaged
-	local myeconfargs=(
-		--with-system-dicts
-		--with-system-epoxy
-		--with-system-headers
-		--with-system-jars
-		--with-system-libs
-		--enable-cairo-canvas
-		--enable-largefile
-		--enable-mergelibs
-		--enable-neon
-		--enable-python=system
-		--enable-randr
-		--enable-release-build
-		--disable-breakpad
-		--disable-ccache
-		--disable-dependency-tracking
-		--disable-epm
-		--disable-fetch-external
-		--disable-gstreamer-0-10
-		--disable-online-update
-		--disable-pdfium
-		--disable-report-builder
-		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
-		--with-build-version="Gentoo official package"
-		--enable-extension-integration
-		--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
-		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
-		--with-external-thes-dir="${EPREFIX}/usr/share/myspell"
-		--with-external-tar="${DISTDIR}"
-		--with-lang=""
-		--with-parallelism=$(makeopts_jobs)
-		--with-system-ucpp
-		--with-vendor="Gentoo Foundation"
-		--with-x
-		--without-fonts
-		--without-myspell-dicts
-		--without-help
-		--with-helppack-integration
-		--with-system-gpgmepp
-		--without-system-sane
-		$(use_enable bluetooth sdremote-bluetooth)
-		$(use_enable coinmp)
-		$(use_enable cups)
-		$(use_enable dbus)
-		$(use_enable debug)
-		$(use_enable eds evolution2)
-		$(use_enable firebird firebird-sdbc)
-		$(use_enable gstreamer gstreamer-1-0)
-		$(use_enable gtk gtk3)
-		$(use_enable gtk2 gtk)
-		$(use_enable kde gtk3-kde5)
-		$(use_enable kde qt5)
-		$(use_enable mysql ext-mariadb-connector)
-		$(use_enable odk)
-		$(use_enable pdfimport)
-		$(use_enable postgres postgresql-sdbc)
-		$(use_enable vlc)
-		$(use_with coinmp system-coinmp)
-		$(use_with googledrive gdrive-client-id ${google_default_client_id})
-		$(use_with googledrive gdrive-client-secret ${google_default_client_secret})
-		$(use_with java)
-		$(use_with mysql system-mysql-cppconn)
-		$(use_with odk doxygen)
-	)
-
-	if use eds || use gtk; then
-		myeconfargs+=( --enable-dconf --enable-gio )
-	else
-		myeconfargs+=( --disable-dconf --disable-gio )
-	fi
-
-	# libreoffice extensions handling
-	for lo_xt in ${LO_EXTS}; do
-		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
-			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
-		else
-			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
-		fi
-	done
-
-	if use java; then
-		# hsqldb: system one is too new
-		myeconfargs+=(
-			--without-junit
-			--without-system-hsqldb
-			--with-ant-home="${ANT_HOME}"
-			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
-			--with-jvm-path="${EPREFIX}/usr/lib/"
-		)
-
-		use libreoffice_extensions_scripting-beanshell && \
-			myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
-		use libreoffice_extensions_scripting-javascript && \
-			myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
-	fi
-
-	is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# more and more LO stuff tries to use OpenGL, including tests during build
-	# bug 501508, bug 540624, bug 545974 and probably more
-	addpredict /dev/dri
-	addpredict /dev/ati
-	addpredict /dev/nvidiactl
-
-	# hack for offlinehelp, this needs fixing upstream at some point
-	# it is broken because we send --without-help
-	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
-	(
-		grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
-		source "${T}/config_host.mk" 2&> /dev/null
-
-		local path="${WORKDIR}/helpcontent2/source/auxiliary/"
-		mkdir -p "${path}" || die
-
-		echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
-		perl "${S}/helpcontent2/helpers/create_ilst.pl" \
-			-dir=helpcontent2/source/media/helpimg \
-			> "${path}/helpimg.ilst"
-		[[ -s "${path}/helpimg.ilst" ]] || \
-			ewarn "The help images list is empty, something is fishy, report a bug."
-	)
-
-	local target
-	use test && target="build" || target="build-nocheck"
-
-	# this is not a proper make script
-	make ${target} || die
-}
-
-src_test() {
-	make unitcheck || die
-	make slowcheck || die
-}
-
-src_install() {
-	# This is not Makefile so no buildserver
-	make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
-	# bug 593514
-	if use gtk; then
-		dosym libreoffice/program/liblibreofficekitgtk.so \
-			/usr/$(get_libdir)/liblibreofficekitgtk.so
-	fi
-
-	# bash completion aliases
-	bashcomp_alias \
-		libreoffice \
-		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
-	if use branding; then
-		insinto /usr/$(get_libdir)/${PN}/program
-		newins "${WORKDIR}/branding-sofficerc" sofficerc
-		dodir /etc/env.d
-		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
-	fi
-
-	# Hack for offlinehelp, this needs fixing upstream at some point.
-	# It is broken because we send --without-help
-	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
-	insinto /usr/$(get_libdir)/libreoffice/help
-	doins xmlhelp/util/*.xsl
-
-	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
-	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-office/libreoffice/libreoffice-6.1.1.2.ebuild b/app-office/libreoffice/libreoffice-6.1.1.2.ebuild
deleted file mode 100644
index f95a103c87c6..000000000000
--- a/app-office/libreoffice/libreoffice-6.1.1.2.ebuild
+++ /dev/null
@@ -1,568 +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} )
-PYTHON_REQ_USE="threads,xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
-	https://dev-builds.libreoffice.org/pre-releases/src
-	https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
-	https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
-	for i in ${DEV_URI}; do
-		SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
-		SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
-	done
-	unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
-	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
-	# no release for 8 years, should we package it?
-	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
-	# Does not build with 1.6 rhino at all
-	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
-	# requirement of rhino
-	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
-	# not packageable
-	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
-googledrive gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	bluetooth? ( dbus )
-	kde? ( gtk )
-	libreoffice_extensions_nlpsolver? ( java )
-	libreoffice_extensions_scripting-beanshell? ( java )
-	libreoffice_extensions_scripting-javascript? ( java )
-	libreoffice_extensions_wiki-publisher? ( java )
-"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	app-crypt/gpgme[cxx]
-	app-text/hunspell:=
-	>=app-text/libabw-0.1.0
-	>=app-text/libebook-0.1
-	app-text/libepubgen
-	>=app-text/libetonyek-0.1
-	app-text/libexttextcat
-	app-text/liblangtag
-	>=app-text/libmspub-0.1.0
-	>=app-text/libmwaw-0.3.1
-	app-text/libnumbertext
-	>=app-text/libodfgen-0.1.0
-	app-text/libqxp
-	app-text/libstaroffice
-	app-text/libwpd:0.10[tools]
-	app-text/libwpg:0.3
-	>=app-text/libwps-0.4
-	app-text/mythes
-	>=dev-cpp/clucene-2.3.3.4-r2
-	=dev-cpp/libcmis-0.5*
-	dev-db/unixODBC
-	dev-lang/perl
-	dev-libs/boost:=[nls]
-	dev-libs/expat
-	dev-libs/hyphen
-	dev-libs/icu:=
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-	=dev-libs/liborcus-0.13*
-	dev-libs/librevenge
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/nspr
-	dev-libs/nss
-	>=dev-libs/redland-1.0.16
-	>=dev-libs/xmlsec-1.2.24[nss]
-	media-gfx/graphite2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
-	media-libs/lcms:2
-	>=media-libs/libcdr-0.1.0
-	>=media-libs/libepoxy-1.3.1[X]
-	>=media-libs/libfreehand-0.1.0
-	media-libs/libpagemaker
-	>=media-libs/libpng-1.4:0=
-	>=media-libs/libvisio-0.1.0
-	media-libs/libzmf
-	net-libs/neon
-	net-misc/curl
-	net-nds/openldap
-	sci-mathematics/lpsolve
-	sys-libs/zlib:=
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/cairo[X]
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
-	bluetooth? ( net-wireless/bluez )
-	coinmp? ( sci-libs/coinor-mp )
-	cups? ( net-print/cups )
-	dbus? ( dev-libs/dbus-glib )
-	eds? (
-		dev-libs/glib:2
-		gnome-base/dconf
-		gnome-extra/evolution-data-server
-	)
-	firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	gtk? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		gnome-base/dconf
-		media-libs/mesa[egl]
-		x11-libs/gtk+:3
-		x11-libs/pango
-	)
-	gtk2? (
-		x11-libs/gdk-pixbuf
-		>=x11-libs/gtk+-2.24:2
-		x11-libs/pango
-	)
-	kde? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtx11extras:5
-		dev-qt/qtwidgets:5
-		kde-frameworks/kconfig:5
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/kio:5
-		kde-frameworks/kwindowsystem:5
-	)
-	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
-	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
-	mysql? ( dev-db/mysql-connector-c++ )
-	pdfimport? ( app-text/poppler:=[cxx] )
-	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	!app-office/libreoffice-bin
-	!app-office/libreoffice-bin-debug
-	!app-office/openoffice
-	media-fonts/dejavu
-	media-fonts/liberation-fonts
-	media-fonts/libertine
-	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
-	java? ( >=virtual/jre-1.6 )
-	kde? ( kde-frameworks/breeze-icons:* )
-	vlc? ( media-video/vlc )
-"
-
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
-	PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
-	# Translations are not reliable on live ebuilds
-	# rather force people to use english only.
-	PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-#        after everything upstream is under gbuild
-#        as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/libatomic_ops-7.2d
-	dev-perl/Archive-Zip
-	>=dev-util/cppunit-1.14.0
-	>=dev-util/gperf-3
-	dev-util/intltool
-	=dev-util/mdds-1.3*:1=
-	media-libs/glm
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	sys-devel/ucpp
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	x11-libs/libXt
-	x11-libs/libXtst
-	java? (
-		dev-java/ant-core
-		>=virtual/jdk-1.6
-	)
-	odk? ( >=app-doc/doxygen-1.8.4 )
-	test? (
-		app-crypt/gnupg
-		dev-util/cppunit
-		media-fonts/dejavu
-	)
-"
-
-PATCHES=(
-	# "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
-	# not upstreamable stuff
-	"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
-	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
-
-	# TODO: upstream
-	"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
-	CHECKREQS_MEMORY="512M"
-	if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		CHECKREQS_DISK_BUILD="22G"
-	else
-		CHECKREQS_DISK_BUILD="6G"
-	fi
-	check-reqs_$1
-}
-
-pkg_pretend() {
-	use java || \
-		ewarn "If you plan to use Base application you should enable java or you will get various crashes."
-
-	if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
-		ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
-		ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
-		ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
-	fi
-
-	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-	xdg_environment_reset
-
-	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if [[ ${MY_PV} = *9999* ]]; then
-		local base_uri branch mypv
-		base_uri="https://anongit.freedesktop.org/git"
-		branch="master"
-		mypv=${MY_PV/.9999}
-		[[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
-		git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
-		git-r3_checkout "${base_uri}/${PN}/core"
-
-		git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
-		git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
-	fi
-}
-
-src_prepare() {
-	default
-
-	# sandbox violations on many systems, we don't need it. Bug #646406
-	sed -i \
-		-e "/KF5_CONFIG/s/kf5-config/no/" \
-		configure.ac || die "Failed to disable kf5-config"
-
-	AT_M4DIR="m4" eautoreconf
-	# hack in the autogen.sh
-	touch autogen.lastrun
-
-	# system pyuno mess
-	sed -i \
-		-e "s:%eprefix%:${EPREFIX}:g" \
-		-e "s:%libdir%:$(get_libdir):g" \
-		pyuno/source/module/uno.py \
-		pyuno/source/officehelper.py || die
-	# sed in the tests
-	sed -i \
-		-e "s#all : build unitcheck#all : build#g" \
-		solenv/gbuild/Module.mk || die
-	sed -i \
-		-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
-		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
-		Makefile.in || die
-
-	sed -i \
-		-e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
-		-e "s,\$INSTALLDIRNAME.sh,${PN}," \
-		bin/distro-install-desktop-integration || die
-
-	if use branding; then
-		# hack...
-		mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
-	fi
-
-	# Don't list pdfimport support in desktop when built with none, bug # 605464
-	if ! use pdfimport; then
-		sed -i \
-			-e ":MimeType: s:application/pdf;::" \
-			-e ":Keywords: s:pdf;::" \
-			sysui/desktop/menus/draw.desktop || die
-	fi
-}
-
-src_configure() {
-	# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
-	# Note: these are for Gentoo use ONLY. For your own distribution, please get
-	# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
-	local google_default_client_id="329227923882.apps.googleusercontent.com"
-	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
-	# optimization flags
-	export GMAKE_OPTIONS="${MAKEOPTS}"
-	# System python enablement:
-	export PYTHON_CFLAGS=$(python_get_CFLAGS)
-	export PYTHON_LIBS=$(python_get_LIBS)
-
-	if use kde; then
-		export QT_SELECT=5 # bug 639620 needs proper fix though
-		export QT5DIR="$(qt5_get_bindir)/../"
-		export MOC5="$(qt5_get_bindir)/moc"
-	fi
-
-	# system headers/libs/...: enforce using system packages
-	# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
-	# --enable-cairo: ensure that cairo is always required
-	# --enable-*-link: link to the library rather than just dlopen on runtime
-	# --enable-release-build: build the libreoffice as release
-	# --disable-fetch-external: prevent dowloading during compile phase
-	# --enable-extension-integration: enable any extension integration support
-	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
-	# --disable-report-builder: too much java packages pulled in without pkgs
-	# --without-system-sane: just sane.h header that is used for scan in writer,
-	#   not linked or anything else, worthless to depend on
-	# --disable-pdfium: not yet packaged
-	local myeconfargs=(
-		--with-system-dicts
-		--with-system-epoxy
-		--with-system-headers
-		--with-system-jars
-		--with-system-libs
-		--enable-cairo-canvas
-		--enable-largefile
-		--enable-mergelibs
-		--enable-neon
-		--enable-python=system
-		--enable-randr
-		--enable-release-build
-		--disable-breakpad
-		--disable-ccache
-		--disable-dependency-tracking
-		--disable-epm
-		--disable-fetch-external
-		--disable-gstreamer-0-10
-		--disable-kde5
-		--disable-online-update
-		--disable-openssl
-		--disable-pdfium
-		--disable-qt5
-		--disable-report-builder
-		--with-alloc=system
-		--with-build-version="Gentoo official package"
-		--enable-extension-integration
-		--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
-		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
-		--with-external-thes-dir="${EPREFIX}/usr/share/myspell"
-		--with-external-tar="${DISTDIR}"
-		--with-lang=""
-		--with-parallelism=$(makeopts_jobs)
-		--with-system-ucpp
-		--with-tls=nss
-		--with-vendor="Gentoo Foundation"
-		--with-x
-		--without-fonts
-		--without-myspell-dicts
-		--without-help
-		--with-helppack-integration
-		--with-system-gpgmepp
-		--without-system-sane
-		$(use_enable bluetooth sdremote-bluetooth)
-		$(use_enable coinmp)
-		$(use_enable cups)
-		$(use_enable dbus)
-		$(use_enable debug)
-		$(use_enable eds evolution2)
-		$(use_enable firebird firebird-sdbc)
-		$(use_enable gstreamer gstreamer-1-0)
-		$(use_enable gtk gtk3)
-		$(use_enable gtk2 gtk)
-		$(use_enable kde gtk3-kde5)
-		$(use_enable mysql ext-mariadb-connector)
-		$(use_enable odk)
-		$(use_enable pdfimport)
-		$(use_enable postgres postgresql-sdbc)
-		$(use_enable vlc)
-		$(use_with accessibility lxml)
-		$(use_with coinmp system-coinmp)
-		$(use_with googledrive gdrive-client-id ${google_default_client_id})
-		$(use_with googledrive gdrive-client-secret ${google_default_client_secret})
-		$(use_with java)
-		$(use_with mysql system-mysql-cppconn)
-		$(use_with odk doxygen)
-	)
-
-	if use eds || use gtk; then
-		myeconfargs+=( --enable-dconf --enable-gio )
-	else
-		myeconfargs+=( --disable-dconf --disable-gio )
-	fi
-
-	# libreoffice extensions handling
-	for lo_xt in ${LO_EXTS}; do
-		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
-			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
-		else
-			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
-		fi
-	done
-
-	if use java; then
-		# hsqldb: system one is too new
-		myeconfargs+=(
-			--without-junit
-			--without-system-hsqldb
-			--with-ant-home="${ANT_HOME}"
-			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
-			--with-jvm-path="${EPREFIX}/usr/lib/"
-		)
-
-		use libreoffice_extensions_scripting-beanshell && \
-			myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
-		use libreoffice_extensions_scripting-javascript && \
-			myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
-	fi
-
-	is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# more and more LO stuff tries to use OpenGL, including tests during build
-	# bug 501508, bug 540624, bug 545974 and probably more
-	addpredict /dev/dri
-	addpredict /dev/ati
-	addpredict /dev/nvidiactl
-
-	# hack for offlinehelp, this needs fixing upstream at some point
-	# it is broken because we send --without-help
-	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
-	(
-		grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
-		source "${T}/config_host.mk" 2&> /dev/null
-
-		local path="${WORKDIR}/helpcontent2/source/auxiliary/"
-		mkdir -p "${path}" || die
-
-		echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
-		perl "${S}/helpcontent2/helpers/create_ilst.pl" \
-			-dir=helpcontent2/source/media/helpimg \
-			> "${path}/helpimg.ilst"
-		[[ -s "${path}/helpimg.ilst" ]] || \
-			ewarn "The help images list is empty, something is fishy, report a bug."
-	)
-
-	local target
-	use test && target="build" || target="build-nocheck"
-
-	# this is not a proper make script
-	make ${target} || die
-}
-
-src_test() {
-	make unitcheck || die
-	make slowcheck || die
-}
-
-src_install() {
-	# This is not Makefile so no buildserver
-	make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
-	# bug 593514
-	if use gtk; then
-		dosym libreoffice/program/liblibreofficekitgtk.so \
-			/usr/$(get_libdir)/liblibreofficekitgtk.so
-	fi
-
-	# bash completion aliases
-	bashcomp_alias \
-		libreoffice \
-		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
-	if use branding; then
-		insinto /usr/$(get_libdir)/${PN}/program
-		newins "${WORKDIR}/branding-sofficerc" sofficerc
-		dodir /etc/env.d
-		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
-	fi
-
-	# Hack for offlinehelp, this needs fixing upstream at some point.
-	# It is broken because we send --without-help
-	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
-	insinto /usr/$(get_libdir)/libreoffice/help
-	doins xmlhelp/util/*.xsl
-
-	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
-	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-office/libreoffice/libreoffice-6.1.2.1.ebuild b/app-office/libreoffice/libreoffice-6.1.2.1.ebuild
new file mode 100644
index 000000000000..e889c4c70b11
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.1.2.1.ebuild
@@ -0,0 +1,568 @@
+# 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_REQ_USE="threads,xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+	https://dev-builds.libreoffice.org/pre-releases/src
+	https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+	https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && SCM_ECLASS="git-r3"
+inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+	for i in ${DEV_URI}; do
+		SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+		SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+	done
+	unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+	# no release for 8 years, should we package it?
+	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+	# Does not build with 1.6 rhino at all
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+	# requirement of rhino
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+	# not packageable
+	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
+googledrive gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	bluetooth? ( dbus )
+	kde? ( gtk )
+	libreoffice_extensions_nlpsolver? ( java )
+	libreoffice_extensions_scripting-beanshell? ( java )
+	libreoffice_extensions_scripting-javascript? ( java )
+	libreoffice_extensions_wiki-publisher? ( java )
+"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	app-arch/unzip
+	app-arch/zip
+	app-crypt/gpgme[cxx]
+	app-text/hunspell:=
+	>=app-text/libabw-0.1.0
+	>=app-text/libebook-0.1
+	app-text/libepubgen
+	>=app-text/libetonyek-0.1
+	app-text/libexttextcat
+	app-text/liblangtag
+	>=app-text/libmspub-0.1.0
+	>=app-text/libmwaw-0.3.1
+	app-text/libnumbertext
+	>=app-text/libodfgen-0.1.0
+	app-text/libqxp
+	app-text/libstaroffice
+	app-text/libwpd:0.10[tools]
+	app-text/libwpg:0.3
+	>=app-text/libwps-0.4
+	app-text/mythes
+	>=dev-cpp/clucene-2.3.3.4-r2
+	=dev-cpp/libcmis-0.5*
+	dev-db/unixODBC
+	dev-lang/perl
+	dev-libs/boost:=[nls]
+	dev-libs/expat
+	dev-libs/hyphen
+	dev-libs/icu:=
+	dev-libs/libassuan
+	dev-libs/libgpg-error
+	=dev-libs/liborcus-0.13*
+	dev-libs/librevenge
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/nspr
+	dev-libs/nss
+	>=dev-libs/redland-1.0.16
+	>=dev-libs/xmlsec-1.2.24[nss]
+	media-gfx/graphite2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+	media-libs/lcms:2
+	>=media-libs/libcdr-0.1.0
+	>=media-libs/libepoxy-1.3.1[X]
+	>=media-libs/libfreehand-0.1.0
+	media-libs/libpagemaker
+	>=media-libs/libpng-1.4:0=
+	>=media-libs/libvisio-0.1.0
+	media-libs/libzmf
+	net-libs/neon
+	net-misc/curl
+	net-nds/openldap
+	sci-mathematics/lpsolve
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/cairo[X]
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
+	bluetooth? ( net-wireless/bluez )
+	coinmp? ( sci-libs/coinor-mp )
+	cups? ( net-print/cups )
+	dbus? ( dev-libs/dbus-glib )
+	eds? (
+		dev-libs/glib:2
+		gnome-base/dconf
+		gnome-extra/evolution-data-server
+	)
+	firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	gtk? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		gnome-base/dconf
+		media-libs/mesa[egl]
+		x11-libs/gtk+:3
+		x11-libs/pango
+	)
+	gtk2? (
+		x11-libs/gdk-pixbuf
+		>=x11-libs/gtk+-2.24:2
+		x11-libs/pango
+	)
+	kde? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtx11extras:5
+		dev-qt/qtwidgets:5
+		kde-frameworks/kconfig:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/ki18n:5
+		kde-frameworks/kio:5
+		kde-frameworks/kwindowsystem:5
+	)
+	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+	mysql? ( dev-db/mysql-connector-c++ )
+	pdfimport? ( app-text/poppler:=[cxx] )
+	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!app-office/libreoffice-bin
+	!app-office/libreoffice-bin-debug
+	!app-office/openoffice
+	media-fonts/dejavu
+	media-fonts/liberation-fonts
+	media-fonts/libertine
+	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+	java? ( >=virtual/jre-1.6 )
+	kde? ( kde-frameworks/breeze-icons:* )
+	vlc? ( media-video/vlc )
+"
+
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+	PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+	# Translations are not reliable on live ebuilds
+	# rather force people to use english only.
+	PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+#        after everything upstream is under gbuild
+#        as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/libatomic_ops-7.2d
+	dev-perl/Archive-Zip
+	>=dev-util/cppunit-1.14.0
+	>=dev-util/gperf-3
+	dev-util/intltool
+	=dev-util/mdds-1.3*:1=
+	media-libs/glm
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	sys-devel/ucpp
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	x11-libs/libXt
+	x11-libs/libXtst
+	java? (
+		dev-java/ant-core
+		>=virtual/jdk-1.6
+	)
+	odk? ( >=app-doc/doxygen-1.8.4 )
+	test? (
+		app-crypt/gnupg
+		dev-util/cppunit
+		media-fonts/dejavu
+	)
+"
+
+PATCHES=(
+	# "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+	# not upstreamable stuff
+	"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+
+	# TODO: upstream
+	"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+	CHECKREQS_MEMORY="512M"
+	if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		CHECKREQS_DISK_BUILD="22G"
+	else
+		CHECKREQS_DISK_BUILD="6G"
+	fi
+	check-reqs_$1
+}
+
+pkg_pretend() {
+	use java || \
+		ewarn "If you plan to use Base application you should enable java or you will get various crashes."
+
+	if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
+		ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
+		ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
+		ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
+	fi
+
+	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+	xdg_environment_reset
+
+	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+	default
+
+	if [[ ${MY_PV} = *9999* ]]; then
+		local base_uri branch mypv
+		base_uri="https://anongit.freedesktop.org/git"
+		branch="master"
+		mypv=${MY_PV/.9999}
+		[[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+		git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+		git-r3_checkout "${base_uri}/${PN}/core"
+
+		git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+		git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+	fi
+}
+
+src_prepare() {
+	default
+
+	# sandbox violations on many systems, we don't need it. Bug #646406
+	sed -i \
+		-e "/KF5_CONFIG/s/kf5-config/no/" \
+		configure.ac || die "Failed to disable kf5-config"
+
+	AT_M4DIR="m4" eautoreconf
+	# hack in the autogen.sh
+	touch autogen.lastrun
+
+	# system pyuno mess
+	sed -i \
+		-e "s:%eprefix%:${EPREFIX}:g" \
+		-e "s:%libdir%:$(get_libdir):g" \
+		pyuno/source/module/uno.py \
+		pyuno/source/officehelper.py || die
+	# sed in the tests
+	sed -i \
+		-e "s#all : build unitcheck#all : build#g" \
+		solenv/gbuild/Module.mk || die
+	sed -i \
+		-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+		Makefile.in || die
+
+	sed -i \
+		-e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+		-e "s,\$INSTALLDIRNAME.sh,${PN}," \
+		bin/distro-install-desktop-integration || die
+
+	if use branding; then
+		# hack...
+		mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+	fi
+
+	# Don't list pdfimport support in desktop when built with none, bug # 605464
+	if ! use pdfimport; then
+		sed -i \
+			-e ":MimeType: s:application/pdf;::" \
+			-e ":Keywords: s:pdf;::" \
+			sysui/desktop/menus/draw.desktop || die
+	fi
+}
+
+src_configure() {
+	# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+	# Note: these are for Gentoo use ONLY. For your own distribution, please get
+	# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+	local google_default_client_id="329227923882.apps.googleusercontent.com"
+	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+	# optimization flags
+	export GMAKE_OPTIONS="${MAKEOPTS}"
+	# System python enablement:
+	export PYTHON_CFLAGS=$(python_get_CFLAGS)
+	export PYTHON_LIBS=$(python_get_LIBS)
+
+	if use kde; then
+		export QT_SELECT=5 # bug 639620 needs proper fix though
+		export QT5DIR="$(qt5_get_bindir)/../"
+		export MOC5="$(qt5_get_bindir)/moc"
+	fi
+
+	# system headers/libs/...: enforce using system packages
+	# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+	# --enable-cairo: ensure that cairo is always required
+	# --enable-*-link: link to the library rather than just dlopen on runtime
+	# --enable-release-build: build the libreoffice as release
+	# --disable-fetch-external: prevent dowloading during compile phase
+	# --enable-extension-integration: enable any extension integration support
+	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+	# --disable-report-builder: too much java packages pulled in without pkgs
+	# --without-system-sane: just sane.h header that is used for scan in writer,
+	#   not linked or anything else, worthless to depend on
+	# --disable-pdfium: not yet packaged
+	local myeconfargs=(
+		--with-system-dicts
+		--with-system-epoxy
+		--with-system-headers
+		--with-system-jars
+		--with-system-libs
+		--enable-cairo-canvas
+		--enable-largefile
+		--enable-mergelibs
+		--enable-neon
+		--enable-python=system
+		--enable-randr
+		--enable-release-build
+		--disable-breakpad
+		--disable-ccache
+		--disable-dependency-tracking
+		--disable-epm
+		--disable-fetch-external
+		--disable-gstreamer-0-10
+		--disable-kde5
+		--disable-online-update
+		--disable-openssl
+		--disable-pdfium
+		--disable-qt5
+		--disable-report-builder
+		--with-alloc=system
+		--with-build-version="Gentoo official package"
+		--enable-extension-integration
+		--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-tar="${DISTDIR}"
+		--with-lang=""
+		--with-parallelism=$(makeopts_jobs)
+		--with-system-ucpp
+		--with-tls=nss
+		--with-vendor="Gentoo Foundation"
+		--with-x
+		--without-fonts
+		--without-myspell-dicts
+		--without-help
+		--with-helppack-integration
+		--with-system-gpgmepp
+		--without-system-sane
+		$(use_enable bluetooth sdremote-bluetooth)
+		$(use_enable coinmp)
+		$(use_enable cups)
+		$(use_enable dbus)
+		$(use_enable debug)
+		$(use_enable eds evolution2)
+		$(use_enable firebird firebird-sdbc)
+		$(use_enable gstreamer gstreamer-1-0)
+		$(use_enable gtk gtk3)
+		$(use_enable gtk2 gtk)
+		$(use_enable kde gtk3-kde5)
+		$(use_enable mysql ext-mariadb-connector)
+		$(use_enable odk)
+		$(use_enable pdfimport)
+		$(use_enable postgres postgresql-sdbc)
+		$(use_enable vlc)
+		$(use_with accessibility lxml)
+		$(use_with coinmp system-coinmp)
+		$(use_with googledrive gdrive-client-id ${google_default_client_id})
+		$(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+		$(use_with java)
+		$(use_with mysql system-mysql-cppconn)
+		$(use_with odk doxygen)
+	)
+
+	if use eds || use gtk; then
+		myeconfargs+=( --enable-dconf --enable-gio )
+	else
+		myeconfargs+=( --disable-dconf --disable-gio )
+	fi
+
+	# libreoffice extensions handling
+	for lo_xt in ${LO_EXTS}; do
+		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+		else
+			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+		fi
+	done
+
+	if use java; then
+		# hsqldb: system one is too new
+		myeconfargs+=(
+			--without-junit
+			--without-system-hsqldb
+			--with-ant-home="${ANT_HOME}"
+			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+			--with-jvm-path="${EPREFIX}/usr/lib/"
+		)
+
+		use libreoffice_extensions_scripting-beanshell && \
+			myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+		use libreoffice_extensions_scripting-javascript && \
+			myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+	fi
+
+	is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# more and more LO stuff tries to use OpenGL, including tests during build
+	# bug 501508, bug 540624, bug 545974 and probably more
+	addpredict /dev/dri
+	addpredict /dev/ati
+	addpredict /dev/nvidiactl
+
+	# hack for offlinehelp, this needs fixing upstream at some point
+	# it is broken because we send --without-help
+	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
+	(
+		grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
+		source "${T}/config_host.mk" 2&> /dev/null
+
+		local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+		mkdir -p "${path}" || die
+
+		echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
+		perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+			-dir=helpcontent2/source/media/helpimg \
+			> "${path}/helpimg.ilst"
+		[[ -s "${path}/helpimg.ilst" ]] || \
+			ewarn "The help images list is empty, something is fishy, report a bug."
+	)
+
+	local target
+	use test && target="build" || target="build-nocheck"
+
+	# this is not a proper make script
+	make ${target} || die
+}
+
+src_test() {
+	make unitcheck || die
+	make slowcheck || die
+}
+
+src_install() {
+	# This is not Makefile so no buildserver
+	make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+	# bug 593514
+	if use gtk; then
+		dosym libreoffice/program/liblibreofficekitgtk.so \
+			/usr/$(get_libdir)/liblibreofficekitgtk.so
+	fi
+
+	# bash completion aliases
+	bashcomp_alias \
+		libreoffice \
+		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+	if use branding; then
+		insinto /usr/$(get_libdir)/${PN}/program
+		newins "${WORKDIR}/branding-sofficerc" sofficerc
+		dodir /etc/env.d
+		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
+	fi
+
+	# Hack for offlinehelp, this needs fixing upstream at some point.
+	# It is broken because we send --without-help
+	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
+	insinto /usr/$(get_libdir)/libreoffice/help
+	doins xmlhelp/util/*.xsl
+
+	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-office/libreoffice/libreoffice-6.1.9999.ebuild b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
index 285959c3464f..e889c4c70b11 100644
--- a/app-office/libreoffice/libreoffice-6.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.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
@@ -79,7 +79,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 [[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-arch/unzip
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 54d654db3d59..e78bc21416fe 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-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
@@ -78,7 +78,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 [[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-arch/unzip
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 9a1c030fda89..8c816c0078ac 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,10 +1,7 @@
 AUX scribus-1.5.3-docdir.patch 1309 BLAKE2B 978a5b54992bc2d2e84cc7435ffe15c2ace03a649de6b240a5b7a8a513134eb1ffac3f9a0f8adcf8679bf07f7beef47b4216102f9d3e3c84333b208b68e41e00 SHA512 5f3bd4fe4f61a2c8d2a58e3f480c95d32280358366a7eabc3c483abe1f3ef07ef5e3864be8ffce8b48584da23f81cb9b96b81c83a59ad4f3da5c7a5c34234063
 AUX scribus-1.5.3-fpic.patch 499 BLAKE2B 68790e6d7a76c4ae01490956b0db09bc79e1c27269fa4cd4c4752bd60b228e36973a1c32d5d8156c12782091fa15614ba274be07dee0d92df9ef521f2d4361a2 SHA512 e38fc85e72af67c0fea4c14dad92a759f5065cd4e337ef2257a90f27e39297c6991c467e53e9c51ae247bf2f8c34fa62fa76cf839a53b386c9c378e53756d015
-DIST scribus-1.5.3.patches.tar.xz 5332 BLAKE2B 3e7702da61a0698873175011115d86bc473a4d2d59be4bca894bbde41844029707dda7307f1d07033fde501da03097aed21dcf12991bb978df1156cb6654077a SHA512 aeb8142eca826a3f9cbd25e8e2276a352f24fe65241a2fe737fd26597419ad9a7180b337f77fb6ba6ac83f378b235d38b1eb6fd85d10985d3a1dbd21bbe4773f
-DIST scribus-1.5.3.tar.xz 74222084 BLAKE2B ffb50c728c0669ab8a22c416c143e8dd47c818120247b4cf5a890872857326b53491be99004a344d78ea2cf2b174ae2987ddcddb4cef39a6e95fe1695be45d48 SHA512 487cea685869397bc52acc7be8e8e9f4bad3f594c1f95740207e4d9e26b07461a7fd2a95d5337b38f1b0fa6504a9f6059cca6740c78cc165eab0b779ffdfe980
 DIST scribus-1.5.4-poppler-0.64.0.patch.tar.xz 3020 BLAKE2B 3388efe6498545ffef6604a41b9e697a0cb6cd053c4893f9d64349bb2251400aca7a4f7dd193eb94cf69ca3f4ae1a3ba3ed106127c4fa680f396940d8056e669 SHA512 4577b4b737948a2b41dc0cec90ec95ba260959343e4953929696ceab518a2723a28a891b189caf79435e7fc8f8fc0a1012e7079e890d10549cb2ba426d15b568
 DIST scribus-1.5.4.tar.xz 72832248 BLAKE2B 64797e865ce44fb01f1e29823e3cb46b2b8f1501e8d07e8b265e93a37961582ec4118d0f32d460bc044e32cf7fa6069732f6b9ce60e4dc4b0b42f914b280e637 SHA512 7875ea5f3db5fb116856cf4cf56b4cce2d0b00d9c4820969f52b89e9bf2b36f96eb9e15b368d392be74d4c6d32e971fc28f6ecbf6661fce5e3b9cb61c4d02403
-EBUILD scribus-1.5.3-r1.ebuild 7114 BLAKE2B 6007bc6d4f797fef14bbf2eafa9f31fb6669d1d9218c5c572537d3f561368765e86fbb7b5a2629de84c25e9c2d5369d16cf02f10a7e0d719d473cf5bdc3f0b19 SHA512 3f9f2698b8ffbc68534252602bcb05452ed0101a12b62387f31d2ea9d4da0de4311359411935c6993e53414ebad38d3128ba242b446437de3e146255f1bd6933
-EBUILD scribus-1.5.4.ebuild 7087 BLAKE2B c4a867e61b48a6eea3a56a3071f46d58be50ad95b9a5940b8022ed33cbb8bccb9a9ce2b761114fc0b023b4d3ea152f29f2185ef4e7bf767563e21c6fbe0e0747 SHA512 05206a6047b0c555d996697fb3de7bf5078ddca01f603aa40c5b98026c2f160521d52f07794e914dd31c234d6cf96c679629c1c0cbbcf22fc2353d6ee63d4c25
+EBUILD scribus-1.5.4.ebuild 7083 BLAKE2B 92f9fbbd65cc0dea797a60637b058c6100dd276b79d8e3005e3700226f3e985c622df77e9e241cfb009003e12723774a24490f30b9da9bb006e059ab106129cf SHA512 90bf11798feaba4910ce511e88457cf7b951a211d39e1c481e733da113663582d1a16629a39934806b8f51bbc68e974f2923f8fe21baa094e21dd31ccfd86de7
 EBUILD scribus-9999.ebuild 6770 BLAKE2B b6c97500b940fc8535bf729e0dd53f1f83e119a567d6ebd84354855d9701a185ce0e0393a67729aa14e682fe3ffc4cd72786e3b7becfd8ba0b2160910683c127 SHA512 06aa425130bdf6540d0c2f07bff00b8a639c74790faaecd3c3af3e7714220821be0312e162248b6d748abea48e965ee29deedd230cb18eb9d84e38b1b670f105
 MISC metadata.xml 845 BLAKE2B 6522fd7c428e4f5f8bd77c03a09408e443e91d45fb0bbe72a312d48f1cdee38ab62a4059940237f18aa2e63b0595b79598846d5acb3d7289427b9d1cae768510 SHA512 18872713a1aa8d6739186ffa60f8f747f8ee9de41339c8a2d20c49d97771ce3967839044f7573bab2d7717a73c2705722071d16441bb458060db5f9e5c15f3d1
diff --git a/app-office/scribus/scribus-1.5.3-r1.ebuild b/app-office/scribus/scribus-1.5.3-r1.ebuild
deleted file mode 100644
index b962ce4b7175..000000000000
--- a/app-office/scribus/scribus-1.5.3-r1.ebuild
+++ /dev/null
@@ -1,250 +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="tk?"
-CMAKE_MAKEFILE_GENERATOR=ninja
-
-inherit cmake-utils eutils flag-o-matic gnome2 python-single-r1 xdg-utils
-
-DESCRIPTION="Desktop publishing (DTP) and layout program"
-HOMEPAGE="https://www.scribus.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz
-https://dev.gentoo.org/~asturm/distfiles/${P}.patches.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts templates tk"
-
-#a=$((ls resources/translations/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'; ls resources/loremipsum/*xml | sed -e 's:\.: :g' -e 's:loremipsum\/: :g'| awk '{print $2}'; ls resources/dicts/hyph*dic | sed -e 's:\.: :g' -e 's:hyph_: :g' | awk '{print $2}'; ls resources/dicts/README_*txt | sed -e 's:_hyph::g' -e 's:\.: :g' -e 's:README_: :g' | awk '{print $2}') | sort | uniq); echo $a
-# Keep this sorted, otherwise eliminating of duplicates below won't work
-IUSE_L10N=" af ar bg br ca ca_ES cs cs_CZ cy cy_GB da da_DK de de_1901 de_CH de_DE el en_AU en_GB en_US eo es es_ES et eu fa_IR fi fi_FI fr gl he he_IL hr hu hu_HU ia id id_ID is is_IS it ja kab kn_IN ko ku la lt lt_LT nb_NO nl nn_NO pl pl_PL pt pt_BR pt_PT ro ro_RO ru ru_RU_0 sa sk sk_SK sl sl_SI so sq sr sv sv_SE te th_TH tr uk uk_UA zh_CN zh_TW"
-
-map_lang() {
-	local lang=${1/_/-}
-	case $1 in
-		# Retain the following, which have a specific subtag
-		de_*|en_*|pt_*|zh_*) ;;
-		# Consider all other xx_XX as duplicates of the generic xx tag
-		*_*) lang=${1%%_*} ;;
-	esac
-	echo ${lang}
-}
-
-prev_l=
-for l in ${IUSE_L10N}; do
-	l=$(map_lang ${l})
-	[[ ${l} != "${prev_l}" ]] && IUSE+=" l10n_${l}"
-	prev_l=${l}
-done
-unset l prev_l
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	tk? ( scripts )"
-
-# osg
-# couple of third_party libs bundled
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	app-text/libmspub
-	app-text/poppler:=
-	dev-libs/hyphen
-	>=dev-libs/icu-58.2:0=
-	dev-libs/librevenge
-	dev-libs/libxml2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/fontconfig
-	media-libs/freetype:2
-	>=media-libs/harfbuzz-0.9.42:0=[icu]
-	media-libs/lcms:2
-	media-libs/libcdr
-	media-libs/libfreehand
-	media-libs/libpagemaker
-	media-libs/libpng:0=
-	media-libs/libvisio
-	media-libs/tiff:0
-	net-print/cups
-	sys-libs/zlib[minizip]
-	virtual/jpeg:0=
-	>=x11-libs/cairo-1.10.0[X,svg]
-	boost? ( >=dev-libs/boost-1.62:= )
-	hunspell? ( app-text/hunspell )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	osg? ( dev-games/openscenegraph )
-	pdf? ( app-text/podofo:0= )
-	scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
-	tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
-	app-text/ghostscript-gpl"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-docdir.patch
-	"${FILESDIR}"/${P}-fpic.patch
-	"${WORKDIR}"/${P}-cmake-openssl.patch
-	"${WORKDIR}"/${P}-poppler-0.58.patch
-	"${WORKDIR}"/${P}-x86-fpic.patch
-	"${WORKDIR}"/${P}-qt-5.11.patch
-)
-
-src_prepare() {
-	rm -r codegen/cheetah || die
-	cat > cmake/modules/FindZLIB.cmake <<- EOF || die
-	find_package(PkgConfig)
-	pkg_check_modules(ZLIB minizip zlib)
-	SET( ZLIB_LIBRARY \${ZLIB_LIBRARIES} )
-	SET( ZLIB_INCLUDE_DIR \${ZLIB_INCLUDE_DIRS} )
-	MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
-	EOF
-
-	sed \
-		-e "/^\s*unzip\.[ch]/d" \
-		-e "/^\s*ioapi\.[ch]/d" \
-		-i scribus/CMakeLists.txt Scribus.pro || die
-	rm scribus/ioapi.[ch] || die
-
-	sed \
-		-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
-		-i resources/templates/CMakeLists.txt || die
-
-	edos2unix scribus/ui/propertiespalette_utils.cpp
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	# bug #550818
-	append-cppflags -DHAVE_MEMRCHR
-
-	local _lang lang langs
-	for _lang in ${IUSE_L10N}; do
-		lang=$(map_lang ${_lang})
-		if use l10n_${lang}; then
-			# From the CMakeLists.txt
-			# "#Bit of a hack, preprocess all the filenames to generate our language string, needed for -DWANT_GUI_LANG=en_GB;de_DE , etc"
-			langs+=";${_lang}"
-		else
-			# Don't install localized documentation
-			sed -e "/${_lang}/d" -i doc/CMakeLists.txt || die
-			safe_delete \
-				./resources/dicts/README_${_lang}.txt \
-				./resources/dicts/README_hyph_${_lang}.txt \
-				./resources/dicts/hyph_${_lang}.dic \
-				./resources/loremipsum/${_lang}.xml
-		fi
-		sed -e "/en_EN/d" -i doc/CMakeLists.txt || die
-		safe_delete \
-			./resources/dicts/README_en_EN.txt \
-			./resources/dicts/README_hyph_en_EN.txt \
-			./resources/dicts/hyph_en_EN.dic \
-			./resources/loremipsum/en_EN.xml
-	done
-
-	local mycmakeargs=(
-		-DHAVE_PYTHON=ON
-		-DPYTHON_INCLUDE_PATH="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-		-DWANT_DISTROBUILD=ON
-		-DDOCDIR="${EPREFIX%/}/usr/share/doc/${PF}/"
-		-DWANT_GUI_LANG="${langs#;};en"
-		-DWANT_CPP11=ON
-		-DWITH_PODOFO="$(usex pdf)"
-		-DWITH_BOOST="$(usex boost)"
-		-DWANT_GRAPHICSMAGICK="$(usex graphicsmagick)"
-		-DWANT_NOOSG="$(usex !osg)"
-		-DWANT_DEBUG="$(usex debug)"
-		-DWANT_HEADERINSTALL="$(usex !minimal)"
-		-DWANT_HUNSPELL="$(usex hunspell)"
-		-DWANT_NOEXAMPLES="$(usex !examples)"
-		-DWANT_NOTEMPLATES="$(usex !templates)"
-		)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	local lang _lang
-	# en_EN can be deleted always
-	for _lang in ${IUSE_L10N}; do
-		lang=$(map_lang ${_lang})
-		if ! use l10n_${lang}; then
-			safe_delete "${ED%/}"/usr/share/man/${_lang}
-		fi
-	done
-
-	if ! use scripts; then
-		rm "${ED%/}"/usr/share/scribus/scripts/*.py || die
-	elif ! use tk; then
-		rm "${ED%/}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
-	fi
-
-	use scripts && \
-		python_fix_shebang "${ED%/}"/usr/share/scribus/scripts && \
-		python_optimize "${ED%/}"/usr/share/scribus/scripts
-
-	mv "${ED%/}"/usr/share/doc/${PF}/{en,html} || die
-	ln -sf html "${ED%/}"/usr/share/doc/${PF}/en || die
-	cat >> "${T}"/COPYING <<- EOF || die
-	${PN} is licensed under the "${LICENSE}".
-	Please visit https://www.gnu.org/licenses/gpl-2.0.html for the complete license text.
-	EOF
-	dodoc "${T}"/COPYING
-	docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING}
-	local size
-	for size in 16 32 128 256; do
-		newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus.png
-	done
-	newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus.png
-	doicon resources/iconsets/*/scribus.png
-	domenu scribus.desktop
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-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
-}
-
-safe_delete () {
-	local x
-	for x in ${@}; do
-		if [[ -d "${x}" ]]; then
-			ebegin "Deleting ${x} recursively"
-			rm -r "${x}" || die
-			eend $?
-		elif [[ -f "${x}" ]]; then
-			ebegin "Deleting ${x}"
-			rm "${x}" || die
-			eend $?
-		fi
-	done
-}
diff --git a/app-office/scribus/scribus-1.5.4.ebuild b/app-office/scribus/scribus-1.5.4.ebuild
index 6f8452488379..8fe01e20f220 100644
--- a/app-office/scribus/scribus-1.5.4.ebuild
+++ b/app-office/scribus/scribus-1.5.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
@@ -16,7 +16,7 @@ https://dev.gentoo.org/~asturm/distfiles/${P}-poppler-0.64.0.patch.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts templates tk"
 
 #a=$((ls resources/translations/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'; ls resources/loremipsum/*xml | sed -e 's:\.: :g' -e 's:loremipsum\/: :g'| awk '{print $2}'; ls resources/dicts/hyph*dic | sed -e 's:\.: :g' -e 's:hyph_: :g' | awk '{print $2}'; ls resources/dicts/README_*txt | sed -e 's:_hyph::g' -e 's:\.: :g' -e 's:README_: :g' | awk '{print $2}') | sort | uniq); echo $a
diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index 27de8c3f8986..84b6035aed04 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,8 +1,6 @@
 AUX skrooge-2.14.0-designer-optional.patch 3425 BLAKE2B 735941612ef1e99db255a23cdc00fd83a05b901c742a30e211f73296fcb05149cb620e510f795e236a6abaaade1fe5898d149863e125afaa1da392cc3f074eca SHA512 872e3d824a812c7fe75b61cfdae25910ecd5562304b023035b3f3c208b32144435f109c207a8cb2dd56fdf49abedb730fa00029d388a196eab63751c5f2376ec
-DIST skrooge-2.13.0.tar.xz 20432856 BLAKE2B 5e5ace28f0a3d0f60decb8bcb63fde3d9ed5dc79103ce8d2f4bad2be33b3e4896f19aac4954668bee194362b3b860f0e585e902ed54563b0a82ee36ab41263a7 SHA512 7c5543a4c26953c89a1a67b653bdf5fa7f4baa14d96e763d868f27b288a0f9d7d4bc2994436a4e749d4fd7db999c16b6fcee69817be0774c6e171e49d69e30ba
 DIST skrooge-2.14.0.tar.xz 21659440 BLAKE2B 2b90a5a34d06d916aed4e1d2622c624bdc30c6b947f812f5f227e7ef0198eeada4bb1c37be92a2cc07908635ce1fc7fc749e8b8f7444f9a448ab86602754f9bc SHA512 0446a8863120ecb3c8da4b03c2bf78d2a4e69b968a44d4084c234e369a2c91f63ea468738d00469a9a772855be9f224123a1816ad649171fbd6b780c6c05f62d
 DIST skrooge-2.15.0.tar.xz 20704388 BLAKE2B 37280e039595b5c7b3cb1af0fd20f66cc96c5796995c7a9ef4b83878c9a835856e54804ca312bcbb46d6de599a17dd49e45ef0e1dc1e6492b642ed36d88d731b SHA512 c49f8a84d7339ff2b96f27a7895bbfe5f75c33534c7c4f95e47ebd9787bf3e80847139e4a257bc3bdd12e853bfd2131173a66c436cbc3165e1ac7a5ae684eab0
-EBUILD skrooge-2.13.0.ebuild 2365 BLAKE2B aeaf4ffdc815569d4c124bff99bc47acd7b49b576e761e981073a86e0c2e24275696dfcbc4ca2105e3c6fa0b52149130d0a21d9910750ed15e50f9a1b99bb2c6 SHA512 fd9c100ebf80952bb209597e369ca03f88e0a122ec4fb7271ed551c72016e360e49f87f5abff85018eed0a42cf03b39806d1ecb5b973526e95e9443c255b44e8
 EBUILD skrooge-2.14.0.ebuild 2421 BLAKE2B f843ddafdf01ad1d73b3b8eb17c108914ac69204e3705ddc2170d4a568c9b625db5dfacd683a51cf032096d98500217fd1423616edba131457f8e57018c1dbe6 SHA512 5a32ebc4ef0a6a0c3af283bd089a22171460c1a06d2992f59aba952bf533b190983b0b23bffc3a40869989571930042545d1fdebe974a04428da4a1c411d2bd3
 EBUILD skrooge-2.15.0.ebuild 2431 BLAKE2B 24f6b79a360a0d6991f91761a4134c08da13d4895a0bc3ec37d3ca9edefd19a9a50f5856140bf9e0461244941a292bab6e895ca7d739b22b703ffe95c113a86e SHA512 3e58a0230ae2cc127ed9068f8247f997eae35532d52814986003dcc50946bf49dc5358329628af6d4632f868e02870a6cacfaf9013c41c82a7c0d1b6fa50a4ab
 MISC metadata.xml 400 BLAKE2B b0f7a87e2c2fda05271f731d2c3a6d9a490cf94dd7a742ed60e21aa44964a50bad1218c6ebd9ad16d87a8814f34b70792f7d80bd1e03d80845bd9f1c9292a95c SHA512 50120cec8f5798f6b104c6e1fd05b831f2f280e2f3bab8aa66667a3da1bb351a955b671d16cf4e30b44b0738625424fe4a32bb8a677947d147031964e108dcb0
diff --git a/app-office/skrooge/skrooge-2.13.0.ebuild b/app-office/skrooge/skrooge-2.13.0.ebuild
deleted file mode 100644
index d2d42126152c..000000000000
--- a/app-office/skrooge/skrooge-2.13.0.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_HANDBOOK="optional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Personal finances manager, aiming at being simple and intuitive"
-HOMEPAGE="https://skrooge.org/"
-[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="activities designer kde ofx"
-
-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 kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knewstuff)
-	$(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 kxmlgui)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwebkit)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	app-crypt/qca:2[qt5(+)]
-	dev-db/sqlcipher
-	dev-libs/grantlee:5
-	activities? ( $(add_frameworks_dep kactivities) )
-	kde? ( $(add_frameworks_dep krunner) )
-	ofx? ( dev-libs/libofx )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwindowsystem)
-	dev-libs/libxslt
-	virtual/pkgconfig
-	x11-misc/shared-mime-info
-	designer? (
-		$(add_frameworks_dep kdesignerplugin)
-		$(add_qt_dep designer)
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!app-office/skrooge:4
-"
-
-REQUIRED_USE="test? ( designer )"
-
-# hangs + installs files
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DSKG_BUILD_TEST=$(usex test)
-		-DSKG_DESIGNER=$(usex designer)
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package kde KF5Runner)
-		$(cmake-utils_use_find_package ofx LibOfx)
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	local mycmakeargs=(
-		-DSKG_BUILD_TEST=ON
-	)
-	kde5_src_test
-}
diff --git a/app-officeext/Manifest.gz b/app-officeext/Manifest.gz
index 62c35f22da40..71b1b180acec 100644
--- a/app-officeext/Manifest.gz
+++ b/app-officeext/Manifest.gz
diff --git a/app-officeext/texmaths/Manifest b/app-officeext/texmaths/Manifest
index 1ee502042e51..20035fb609a9 100644
--- a/app-officeext/texmaths/Manifest
+++ b/app-officeext/texmaths/Manifest
@@ -1,9 +1,11 @@
 DIST TexMaths-0.37.oxt 94750 BLAKE2B cf9c9da7c8a4c7da06597e042617bda92bf506f3071189a0e9b494e4fedcd2c9de12cf2652c31a6956a6904583667dedf4ec7b61c3be03d73e49546cd591c690 SHA512 c422dc4e207e614e42ac11fdf0fb3670f0e1778ff32ca242cd192737780c630efef1384a32d4304dc46fdad0f5062b23b3132b0f516e594e9696b2001c62302c
 DIST TexMaths-0.41.oxt 151517 BLAKE2B 74588ff73e972eca6688e2d47c38d9e782918c62dac80a1e6d1d2db097e21df8e58591e62b467b1b40d662771f273f0c6666495b5bd51bdca3379dc2a24d2df6 SHA512 32497367b1198cb9756bb253479c53ceaa9cbc40db3ed3bcf4c0b0cd24b8ad2cca1fdf8d1e7916827dfc1f4af8d615f4f7f9041e8a0b88a4d7cb76d345096bf3
 DIST TexMaths-0.42.oxt 156189 BLAKE2B 51ebebe88d9da592d91ee5c3803929a33c267da2b0156f9c66c08de19f200867d6c1eb683946b97c11c341831502368f64bb1c61adc0f5ed35ff1353f4997b40 SHA512 cc0ddcbeea1304c29aac2e95cf66037f5af886d9597e447664971ba116ce2b41d802544cd635a403ad2be350e6ca9cb5c52499ceb40e45123e16a63e668e3e6c
+DIST TexMaths-0.46.1.oxt 1206650 BLAKE2B 649596405fc0eef78bde4e98eba833321cc88f2debe67bc4c287008447de8db146c32a0e03a3c80aa00f360992f05239b9eeccb942d6150f2c295fa82eb42972 SHA512 6f0409862bd45c3abf78496e611e82cacd38181e773d852586800733ddd64f0c2be3edeb6a87251328dc8183f8ae93e4a1666021b5ad89babf2534294710a9fa
 DIST TexMaths-0.46.oxt 1206365 BLAKE2B b62ef058113903607ae970da454bbecd06beb36e5e7e86d9a6076f9d93f7b30c4febd8ee7f0faa509f71c844fd7ee33673d9c2bb2560520c6b4c5b475015d792 SHA512 41b37ed910051e5579ea999ec075185ba9043b182b43037dda7403afc4cfdf616829e4a471023c36277a9a6495dba53ee4e88fc306d4ebb74b67da9e4a23d092
 EBUILD texmaths-0.37-r1.ebuild 460 BLAKE2B e1fb31578ccac73f7ae9e5b995a240711fdfc3a73597c05c3d4f8a88406675aa00debccd20f88623aa3e222856531e0bb75baa6068e8cafa4013eb092ea9f48d SHA512 7474e035025f193e0f19decceea77d0d941cb8867aad56629464db60304ba8705f7099dd5053e2ce2fe639a9b48d9bcfba01590f6e5981407df9629babe084b5
 EBUILD texmaths-0.41.ebuild 460 BLAKE2B a6f668e307cb5321811340b815d70214e20c58032ea1936a95c7a17416500190c24401880bb0c29e4cb0a3d9ff16ebf6bafd7451f0ad5e19b76d983818911318 SHA512 02a69eed313c753bda94600df05168e6be7bf732306e9dd52bae998322e04ba1dbc771b30c9f701cbf1385629a657ab2cbd859067baabee4c6a53951b5917683
 EBUILD texmaths-0.42.ebuild 462 BLAKE2B cee68562a3585b9d61ed78c0f330982cde48ce26dc01fff6cefa577fccaa22ec77287e6f367173a64bf29a142b0d05d217e6571bdc914c431b01962d6be6e96a SHA512 c4ac6566a5bf85143e8bac07cd62ec5dfa8e1064128bf619f6edd74b07694c16b5828f06d8b2efd24acf5d58abaae339b2c6b9aeef9d6acf1f202ad158df5ffa
+EBUILD texmaths-0.46.1.ebuild 459 BLAKE2B 13a0008d62bebbd9a5bebab050d2da9b9092eb85ea304cc238c190136ef4766a40c1574a946122da921a48f82162640790459658b4ab8580bb5e75394c1ea3a4 SHA512 1ccd364aba07eee84f049f0a9bd12486ce858aa006e9a48b9353eaac8255cd143983090fb3eb4087abf07145deedbbb4aee849538bb4ff9490d773d8f65c994a
 EBUILD texmaths-0.46.ebuild 462 BLAKE2B 43cffe5fcd2fe81d232d28e2f2a055b9ce331416ed528d103f5e869659c7c785f87a30be39edd5b98d400c66ad2f50928a17e7d126ed46aac4837a096eb55e85 SHA512 3a0268cad1e963b192f035d2e882bde95f2f0dcbea74d2a9c3d5ad4b636aa9ae7f582c9bf190899c20dc047bf2bd1e801c7345ab4f94557e4c8e6b009adeb12e
 MISC metadata.xml 333 BLAKE2B 3ec9f71cb817e8eb61176bfd9215185cf198a7d7688c457e3026f042460c4a78f2f1cc16f6c91218f1c07fce1adb0dfec6d128a06e32fae92b3c7c9903e357bc SHA512 41e3cf3ca9cf1e60d5cf056df0293f0e661f4243f4cac927b70d331a76e1f13866aaff8e9ff943a39ad1af72929ed92a410ea26f2aa086f4ba038d5043f20ca1
diff --git a/app-officeext/texmaths/texmaths-0.46.1.ebuild b/app-officeext/texmaths/texmaths-0.46.1.ebuild
new file mode 100644
index 000000000000..94e2263b5494
--- /dev/null
+++ b/app-officeext/texmaths/texmaths-0.46.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="TexMaths-${PV}"
+
+OFFICE_EXTENSIONS=(
+	"${MY_P}.oxt"
+)
+
+inherit office-ext-r1
+
+DESCRIPTION="LaTeX Equation Editor for LibreOffice"
+HOMEPAGE="http://roland65.free.fr/texmaths/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.oxt"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	app-text/dvisvgm
+	virtual/tex-base
+"
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 9d0a6f924ea5..c7aa89b929df 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index 99dc8b24f1b0..4af00cf9e6ca 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -4,5 +4,5 @@ DIST eix-0.33.2.tar.xz 614192 BLAKE2B dcbbdb9b9ccf6f780d89c791c34cc588700720b7f0
 EBUILD eix-0.32.9.ebuild 2897 BLAKE2B 25b666ca91a0d72d8a58d610e7162194a81fb3010f0c8475b0fd66ad2354bc420063080843df75aef7f1a331ecc3329b9f8c1665464c39014cb7609d1b88a770 SHA512 528cdba7e083e90458390c08a85ff790c242cc4d371572ebf5459b5c37f9676d1e3a6df5cfba3c558347d4f94454c7ef9254256c00cea57edfd41b5a0dee7a01
 EBUILD eix-0.33.0-r1.ebuild 2803 BLAKE2B d6f6529df6b609003e9c5b49e9c732e8bbedec446936d4b53b13c45b69df03b7a5ee830d3c9dd8c7e450543129bb9e61bc8e2cf839c11cfd079bc2722918b5ca SHA512 31bcf38358758e013484fb86b43bfee405d51361bc0df1162044085c724a8eb1f98184469038f20579069e5cc3e86352cc25515858747af2e1758b0148d26a8b
 EBUILD eix-0.33.2-r1.ebuild 2803 BLAKE2B a8217bb65f047590307aa403e54396ba55f4d2aad98b58d9452bb9e855e7edad327c66b6816e243f911d32dfe335900dcd174be3fcb4160d63221d56ec840cac SHA512 48cfb75718d8021014d94d9bb1291e47d8a1eced46932262f70fe53a9e3acea80ee3f87d1f73af259ad158bc366cd2000b194ab74fa6d62d584370244cc16870
-EBUILD eix-0.33.2.ebuild 2797 BLAKE2B 2e9453415e864abca0f52717b08fa257b6decfa040169a6ffbb3968af3e81b8f57e8dcae3f9b43406af6aed2be327f9f764f07ebfe70626e60caad55373ba921 SHA512 ecade75d2a73c97fc041afbc6a849dfac5e1abea7388de6d3cd97fd9bbfd3466b1e485c5524a14365fe0ed5d63fa4d9cad22d4c92ed1b7da0dcaf4580f3cd3b7
+EBUILD eix-0.33.2.ebuild 2795 BLAKE2B c490432dce6040986795e37744569cf27d320e9a0e066f5998960eded9cbd17e443786eb4346463d4d8d852765ff8791856951c109a514d7a0b6568bb7888571 SHA512 bc901e7e995bde5142988d6bf7ff4031fd3c895684e10db8249e7c723f39d9de4bb948d369da252aaa9b6378fa42318b66be177df6124ef79d9bf7094c762bfe
 MISC metadata.xml 933 BLAKE2B 50fb01d14ad0ce00114dc8b6d9c70fdc2c5ee036d9883cd307721bc0abfa1ef9a74a826b5ab74dab7f9c9579e20c9b222cce33e04c065eb3310d230578fe9f42 SHA512 e5272580ca0631bcb1150f8a879150e8ae9c90948b3c90ef8ee42631e7345b99c2a6db64ce199a02e86f83ede5f8b41134d50136746d836fe68ae97429a6b550
diff --git a/app-portage/eix/eix-0.33.2.ebuild b/app-portage/eix/eix-0.33.2.ebuild
index 381268788b81..4efb8b39b3c2 100644
--- a/app-portage/eix/eix-0.33.2.ebuild
+++ b/app-portage/eix/eix-0.33.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${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 ~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="debug doc nls sqlite"
 
 BOTHDEPEND="nls? ( virtual/libintl )
diff --git a/app-portage/repoman/Manifest b/app-portage/repoman/Manifest
index 0306a967627f..611b4b8691f5 100644
--- a/app-portage/repoman/Manifest
+++ b/app-portage/repoman/Manifest
@@ -7,7 +7,7 @@ DIST repoman-2.3.6.tar.bz2 78961 BLAKE2B c11953ced4d6bcd5e6e6a5b2dacb8802446f3ac
 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 1958 BLAKE2B 3b07f84e738e20027799bcb3faf4985b5b3040699051380ce8b8b640289a37cee9b97fc46a3a3b3e2559aaddde5b70d86b4e7f8626dff5721d2b450d5e7e89c6 SHA512 2486405267eb1de83802c9ecc817fe0f31d1e9825c92991bd0064e5908c4e0069e5ed2fb0b44bf7e8092cf4163a9b14f00c425bc72174a39dc393fbb4898f734
+EBUILD repoman-2.3.11.ebuild 1951 BLAKE2B c2b70c97134210304bd2cda2871e95b613614e20ab95144386c15a73ad964aac88421c19487234005ab460d8d772c0c9885a370e51d584df759d0dfbf7ef679c SHA512 3a6ec245037db2ee04af521a5482bde45af18e2dff01a48cb7a3a9de96b60bffbdd6480aaf75459e80faa50b38c72691b3e30ce08f1d8a2a9bc73f6c877f742f
 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.11.ebuild b/app-portage/repoman/repoman-2.3.11.ebuild
index 3273c5884deb..bdac6b87c709 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 e9de99c7e95f..ac1c502610fd 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/gentoo-zsh-completions/Manifest b/app-shells/gentoo-zsh-completions/Manifest
index 2f7ca4ff9a2c..9d7be674c686 100644
--- a/app-shells/gentoo-zsh-completions/Manifest
+++ b/app-shells/gentoo-zsh-completions/Manifest
@@ -1,6 +1,6 @@
 DIST gentoo-zsh-completions-20150103.tar.gz 23759 BLAKE2B 9e48cad8b98df4de9479f06ab394e689f2169c6b52e062806b2051f18b86a6f80b660f472fe48b94bb0aff10095d7fcb9e097aa38710d6f3969cb03cfa4aff5c SHA512 4d87edda071d98672df79e3dbb9565757c0738bc50751d31e5dfefab4f17523387fb2342906ecc0600ce86d888ab4a785756bbb1daf37ca56a3ce1af9e5ae173
 DIST gentoo-zsh-completions-20180228.tar.gz 23246 BLAKE2B a6e4004aa7592cbb097cad55fe9d7286f39bd264d8c463ed22e665ca6a60732b0bc8678a0ac09715e2f34abbadd0e4466d783fdb228ce364bcbe13fb7f097649 SHA512 2b3dcfb910e297eb2f03f4ad9f3749b379ceb60f8b6cbcb7c7d03b7921b79aa21f8d3aa50931c5d4eff52f988a208f1a810c6da7c20720be7a3f2ce4a4564788
 EBUILD gentoo-zsh-completions-20150103.ebuild 771 BLAKE2B c65368b319701900a3df63d3fc927b784776c07678bc040926d6e2629f4d2424028ed0485bac0963e4791ce65febe8043e59d96bc482e506bdf059ce6adebe28 SHA512 f9eb8af6a85e8d5a0ad67ad9c96c26cc9471e484bab7d88ea921a0d49e8d9fccf3edf47c8785a8ad356904808d3724bd37c121158ddce8d32df16a228122cf24
-EBUILD gentoo-zsh-completions-20180228.ebuild 780 BLAKE2B 29e5e1a3f80ebf8863be26da8831e4681d7339eca2575196f41e1aad595d9beef708a8fbbc908db1e0479c53a8d0d0a45eb89bdea6a2730baec658562b161244 SHA512 a2b5768576f3e5b58568618fcf7a6aedef113095f7d2156bd927e4fc3ee28c1b41ed3d94114e2c2af64af832170c1d80043424fc8a7f36e8d77b049e77c57668
+EBUILD gentoo-zsh-completions-20180228.ebuild 768 BLAKE2B 470f45864fd3d3feb8178896a8eb554b6a504d8f7be8f896249e0c89055276c7fe97faccf3e3c423427e950c847919e187048bf065a2f6701997506499f7a66c SHA512 4b4387773a8018feb991d186f714779b3a8143d95c4d470740b5196c19db034673a992792bf1e29f2bf80f078837e389ee9a2dc02cdb0933c9d85c2ad4ff2e30
 EBUILD gentoo-zsh-completions-99999999.ebuild 771 BLAKE2B 7436e2dd771079cc966ec435d850a24086e82c9e33c22dd8a1b0f731ffe8c34701f2ab1718d2699fb1d97bf986901442ecf5bf380f7feba63531831fac9a338a SHA512 51c32e89ab85b75c7415c85dfa06670423a3e1944be0cce715fb416a238196faebc881220c275853a18d69153bf13607638ea127e15727df562e10106f104270
 MISC metadata.xml 350 BLAKE2B c8d3cbed9f1d2cc6511612f05448d7826ca031448c936a2ec18ad2bc8af628c3531a248c63cc2f46f0037c2b9305051df2b3d05808d5d7721c39560c0621bfd9 SHA512 06072032aaba8a33b43231772067bbadedc05abe289933b54108d30e6acd81fab23e621db91dd1269df46a171bb11c3903e8e942a7ce964c1229e44912702d59
diff --git a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20180228.ebuild b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20180228.ebuild
index 3cc5d5efac76..8a7da71514ab 100644
--- a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20180228.ebuild
+++ b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20180228.ebuild
@@ -1,4 +1,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
 	EGIT_REPO_URI="https://github.com/gentoo/gentoo-zsh-completions.git"
 else
 	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
+	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
 fi
 
 DESCRIPTION="Gentoo specific zsh completion support (includes emerge and ebuild commands)"
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index d61508e99541..98346f3cd2a3 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/atril/Manifest b/app-text/atril/Manifest
index 098d3f70a14d..a4b7deaa5500 100644
--- a/app-text/atril/Manifest
+++ b/app-text/atril/Manifest
@@ -1,10 +1,3 @@
-AUX atril-cve-2017-1000083.patch 902 BLAKE2B d2840c3cd00f7961262c9b9256a594be77b598cd44fd27064336721f422f5ab315382d9917981a6a5b33b08d100fd32edb19cb54bea1f70f074064dd72af036e SHA512 b34d4cd356b6b0466e77bd837ea03aa5ff9d922f61b0f317fcd02b6d0b0c3efd87fa07ec442a9ee5d71f767751e4ebaa8bbcf6c1a3b0b5905a7610872fbb7d06
-DIST atril-1.12.2.tar.xz 1663920 BLAKE2B 7fa615a3d19fe33b086676d2326d690b5d6c694679a7e934ecf8922ad73aa83eb2ffb6c16aaf776e1d3798c3fa93fa844f52382b9eb9aa813cc6686395a4114e SHA512 2ceeda42adeb284a25caff3a69d15a231129988fb410e4d502a281ccf5819307b9963722a2e330307a1c3b15d3c82405b708d983ed1c266e091a35264766e6ec
-DIST atril-1.14.2.tar.xz 1703272 BLAKE2B e02fee02ad8644be9ea2c388f24c9f9e3480a68ae86bba41939e4fa195626189f9e6d93b97ea4b9d4a256f72ffc3d604f69fe4222c00a385f9d4ad9ac3a8e337 SHA512 9f77abe43848a3a35df1484edef4a6bbc6339f82b0d8e9f3c149c44fd632f2720acf24bcc1354b944c5c364fc4ce1d70b733c1ec5bc40b1a17041e59acf7bd9b
-DIST atril-1.16.1.tar.xz 1691456 BLAKE2B 5fccac614c64e7241ce0369842e97379c98df00f12d61524291afea22eebf18777ec2550592d734ff38aa64b92cbfa6350d11823a043337c6a7ee4b52757989f SHA512 69128171f13f50079b0b40bfada868967c289b5970e3cda3454f10e7cf723000ab29290c7c9ada67648c370472fd51eeb0a8dbbfa0af05babfc85cb28e3570fe
 DIST atril-1.18.3.tar.xz 1695960 BLAKE2B 2479ddd46104153631d34070054e9ba72956468c7b720aa5dc3c4a458a00cc00484cdfefb01981f2e8beeb7a13f1fc3db940dcc9a728863a1378b5b896e71e57 SHA512 d57cf4386651cb871455b003482e896a2735fb023e0b11f192ed1d169e364306f9ba55ef163df02ffd236b5f86d6afe2c1068d00d3fbc309807ded729ce2355a
-EBUILD atril-1.12.2-r5.ebuild 2382 BLAKE2B ec25ced8e7a2cd8a016a610f25934f6a7d3d51331837b9080698290a2a5d1efcc121c5bc4b5c250e497e6c445801ad83b8acfdadf05b0446bc46745a7682c9da SHA512 c5ba364d84fc7eaca092b67abeba1ba7b1fba69c2eba9b25c222d2bd90eb340e45013186ff7d1049fc80d0b073ed17cc7a28a019112cbdb82b5eaade6f2281eb
-EBUILD atril-1.14.2-r2.ebuild 2424 BLAKE2B 08574d5d036b9d82b488eb2eb22b51c45589966b66a1ea098ddbe6549f9aff4502b54e9fa16ed286409ba36a7d06a7db5c5bdce3a6cafb2f309e59dd1cd1eda5 SHA512 08a36e6834962d26061983ec642e1ef6b2ed5ef6b2acf581d760cd3bc7d4ef1b77e6b04242c030bf5c0431b48abaad0ae252f41996d1bbe6c418354bbdf545bd
-EBUILD atril-1.16.1-r2.ebuild 2361 BLAKE2B 976f440938df2ccbc05556b1ff48113467c6e37cd9ffe807b5c57d63bf9fe89de764862516856a08b040667fdbb1239961bea0cc343644e283919846e915d171 SHA512 b12c4cd1992f30ce6a33df8e0bb063afa3ebdc292ff9226fa63adae17642beb1a7f7ce1437238c745c0faab79d0b761d29251df4a022c68854d39962c321df0c
 EBUILD atril-1.18.3.ebuild 2164 BLAKE2B b846318383a8a5c62e7c48807172df259df46254d95eb64d962884c26decad08bf5023b6c07bf64c23a29ca534421daed0c2951d41b96f828a9ccd78e088974a SHA512 6c9782e6bd88b3258a54cbd4f31115f6527fd91a745c587ca872f9956afc6cb752b651aab86c18b563f935e469873efe780dc5965c6c6d3f2001cb3ca72a1a97
-MISC metadata.xml 843 BLAKE2B 85c02a872255c9b51727285c86f1f5df7c8b841576557ba7bbc240cc3e549ddf1f681e1c9f416785650d7d9e3168e4db06ca52ce61e50a47fe6660a73e97dc92 SHA512 9248d2446621337488268f0c7f839821383bba8d170620376cb95b96868448fc3bc411e336104f59db0d8bb5d304dc1c0b76ef818686b930c93a04764e9f4fdc
+MISC metadata.xml 782 BLAKE2B f87378442b88dfae4c1b06d6bfc3f3d13770271bb0c589ad37965325bdc0ac13cdbea3dc18fb41d48339a078c2d11c0adfa78a88da9216356c79fece0f5f39d9 SHA512 d3c0b43a5957c49d606b8eafd71ec8a0ef3e428e1953a0e8172c633bede7c9e1d468cf61eecb2f6cd980ff64ab02faf16c9501351ccebbc64175af9fb9b32477
diff --git a/app-text/atril/atril-1.12.2-r5.ebuild b/app-text/atril/atril-1.12.2-r5.ebuild
deleted file mode 100644
index 582095d7761e..000000000000
--- a/app-text/atril/atril-1.12.2-r5.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
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Atril document viewer for MATE"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring gtk3 +postscript t1lib tiff xps"
-
-REQUIRED_USE="t1lib? ( dvi )
-	!gtk3? ( !epub )" #608604
-
-RDEPEND=">=app-text/poppler-0.16[cairo]
-	app-text/rarian:0
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.5:2
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-	sys-libs/zlib:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	>=x11-libs/libSM-1:0
-	x11-libs/libX11:0
-	>=x11-libs/cairo-1.9.10:0
-	x11-libs/pango:0
-	caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] )
-	djvu? ( >=app-text/djvu-3.5.17:0 )
-	dvi? (
-		virtual/tex-base:0
-		t1lib? ( >=media-libs/t1lib-5:5 )
-	)
-	epub? ( dev-libs/mathjax )
-	gnome-keyring? ( >=app-crypt/libsecret-0.5:0 )
-	!gtk3? (
-		>=x11-libs/gtk+-2.24.0:2[introspection?]
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3[introspection?]
-		epub? ( >=net-libs/webkit-gtk-2.4.3:4 )
-	)
-	introspection? ( >=dev-libs/gobject-introspection-0.6:= )
-	postscript? ( >=app-text/libspectre-0.2:0 )
-	tiff? ( >=media-libs/tiff-3.6:0 )
-	xps? ( >=app-text/libgxps-0.2.0:0 )
-	!!app-text/mate-document-viewer"
-
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	virtual/pkgconfig:*
-	sys-devel/gettext:*"
-
-# Tests use dogtail which is not available on Gentoo.
-RESTRICT="test"
-
-FILES=( "${FILESDIR}/${PN}-cve-2017-1000083.patch" )
-
-src_configure() {
-	# Passing --disable-help would drop offline help, that would be inconsistent
-	# with helps of the most of GNOME apps that doesn't require network for that.
-	mate_src_configure \
-		--disable-tests \
-		--enable-comics \
-		--enable-pdf \
-		--enable-pixbuf \
-		--enable-previewer \
-		--enable-thumbnailer \
-		--with-matedesktop \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with gnome-keyring keyring) \
-		$(use_enable caja) \
-		$(use_enable dbus) \
-		$(use_enable debug) \
-		$(use_enable djvu) \
-		$(use_enable dvi) \
-		$(use_enable epub) \
-		$(use_enable introspection) \
-		$(use_enable postscript ps) \
-		$(use_enable t1lib) \
-		$(use_enable tiff) \
-		$(use_enable xps)
-}
diff --git a/app-text/atril/atril-1.14.2-r2.ebuild b/app-text/atril/atril-1.14.2-r2.ebuild
deleted file mode 100644
index d3ef2efb7e21..000000000000
--- a/app-text/atril/atril-1.14.2-r2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Atril document viewer for MATE"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring gtk3 +postscript t1lib tiff xps"
-
-REQUIRED_USE="t1lib? ( dvi )
-	!gtk3? ( !epub )" #608604
-
-COMMON_DEPEND=">=app-text/poppler-0.16[cairo]
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.5:2
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-	sys-libs/zlib:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	>=x11-libs/libSM-1:0
-	x11-libs/libX11:0
-	>=x11-libs/cairo-1.9.10:0
-	x11-libs/pango:0
-	caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] )
-	djvu? ( >=app-text/djvu-3.5.17:0 )
-	dvi? (
-		virtual/tex-base:0
-		t1lib? ( >=media-libs/t1lib-5:5 )
-	)
-	epub? ( dev-libs/mathjax )
-	gnome-keyring? ( >=app-crypt/libsecret-0.5:0 )
-	!gtk3? (
-		>=x11-libs/gtk+-2.24.0:2[introspection?]
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3[introspection?]
-		epub? ( >=net-libs/webkit-gtk-2.4.3:4 )
-	)
-	introspection? ( >=dev-libs/gobject-introspection-0.6:= )
-	postscript? ( >=app-text/libspectre-0.2:0 )
-	tiff? ( >=media-libs/tiff-3.6:0 )
-	xps? ( >=app-text/libgxps-0.2.0:0 )
-	!!app-text/mate-document-viewer"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/rarian:0
-	app-text/yelp-tools:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	virtual/pkgconfig:*
-	sys-devel/gettext:*"
-
-# Tests use dogtail which is not available on Gentoo.
-RESTRICT="test"
-
-FILES=( "${FILESDIR}/${PN}-cve-2017-1000083.patch" )
-
-src_configure() {
-	# Passing --disable-help would drop offline help, that would be inconsistent
-	# with helps of the most of GNOME apps that doesn't require network for that.
-	mate_src_configure \
-		--disable-tests \
-		--enable-comics \
-		--enable-pdf \
-		--enable-pixbuf \
-		--enable-previewer \
-		--enable-thumbnailer \
-		--with-matedesktop \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with gnome-keyring keyring) \
-		$(use_enable caja) \
-		$(use_enable dbus) \
-		$(use_enable debug) \
-		$(use_enable djvu) \
-		$(use_enable dvi) \
-		$(use_enable epub) \
-		$(use_enable introspection) \
-		$(use_enable postscript ps) \
-		$(use_enable t1lib) \
-		$(use_enable tiff) \
-		$(use_enable xps)
-}
diff --git a/app-text/atril/atril-1.16.1-r2.ebuild b/app-text/atril/atril-1.16.1-r2.ebuild
deleted file mode 100644
index 41128c94216b..000000000000
--- a/app-text/atril/atril-1.16.1-r2.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
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Atril document viewer for MATE"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring gtk3 +postscript t1lib tiff xps"
-
-REQUIRED_USE="t1lib? ( dvi )
-	!gtk3? ( !epub )" #608604
-
-COMMON_DEPEND=">=app-text/poppler-0.22[cairo]
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.5:2
-	sys-libs/zlib:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	>=x11-libs/libSM-1:0
-	x11-libs/libX11:0
-	>=x11-libs/cairo-1.9.10:0
-	x11-libs/pango:0
-	caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] )
-	djvu? ( >=app-text/djvu-3.5.17:0 )
-	dvi? (
-		virtual/tex-base:0
-		t1lib? ( >=media-libs/t1lib-5:5 )
-	)
-	epub? ( dev-libs/mathjax )
-	gnome-keyring? ( >=app-crypt/libsecret-0.5:0 )
-	!gtk3? (
-		>=x11-libs/gtk+-2.24.0:2[introspection?]
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3[introspection?]
-		epub? ( >=net-libs/webkit-gtk-2.4.3:4 )
-	)
-	introspection? ( >=dev-libs/gobject-introspection-0.6:= )
-	postscript? ( >=app-text/libspectre-0.2:0 )
-	tiff? ( >=media-libs/tiff-3.6:0 )
-	xps? ( >=app-text/libgxps-0.2.1:0 )
-	!!app-text/mate-document-viewer"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/rarian:0
-	app-text/yelp-tools:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	virtual/pkgconfig:*
-	sys-devel/gettext:*"
-
-# Tests use dogtail which is not available on Gentoo.
-RESTRICT="test"
-
-FILES=( "${FILESDIR}/${PN}-cve-2017-1000083.patch" )
-
-src_configure() {
-	# Passing --disable-help would drop offline help, that would be inconsistent
-	# with helps of the most of GNOME apps that doesn't require network for that.
-	mate_src_configure \
-		--disable-tests \
-		--enable-comics \
-		--enable-pdf \
-		--enable-pixbuf \
-		--enable-previewer \
-		--enable-thumbnailer \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with gnome-keyring keyring) \
-		$(use_enable caja) \
-		$(use_enable dbus) \
-		$(use_enable debug) \
-		$(use_enable djvu) \
-		$(use_enable dvi) \
-		$(use_enable epub) \
-		$(use_enable introspection) \
-		$(use_enable postscript ps) \
-		$(use_enable t1lib) \
-		$(use_enable tiff) \
-		$(use_enable xps)
-}
diff --git a/app-text/atril/files/atril-cve-2017-1000083.patch b/app-text/atril/files/atril-cve-2017-1000083.patch
deleted file mode 100644
index 29c81f7e5424..000000000000
--- a/app-text/atril/files/atril-cve-2017-1000083.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f4291fd62f7dfe6460d2406a979ccfac0c68dd59 Mon Sep 17 00:00:00 2001
-From: ZenWalker <scow@riseup.net>
-Date: Wed, 19 Jul 2017 11:00:09 +0200
-Subject: [PATCH] comics: make the files containing "--checkpoint-action="
- unsupported
-
-Fixes #257
----
- backend/comics/comics-document.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/backend/comics/comics-document.c b/backend/comics/comics-document.c
-index 9f945c6..4d4d293 100644
---- a/backend/comics/comics-document.c
-+++ b/backend/comics/comics-document.c
-@@ -983,6 +983,12 @@ extract_argv (EvDocument *document, gint page)
- 	char *command_line, *quoted_archive, *quoted_filename;
- 	GError *err = NULL;
- 
-+	if (g_strrstr (comics_document->page_names->pdata[page], "--checkpoint-action="))
-+	{
-+		g_warning ("File unsupported\n");
-+		gtk_main_quit ();
-+	}
-+
-         if (page >= comics_document->page_names->len)
-                 return NULL;
- 
diff --git a/app-text/atril/metadata.xml b/app-text/atril/metadata.xml
index 8c1303cd8bc9..0b999715ba8c 100644
--- a/app-text/atril/metadata.xml
+++ b/app-text/atril/metadata.xml
@@ -11,7 +11,6 @@
 		<flag name="dvi">Enable build-in DVI viewer</flag>
 		<flag name="epub">Enable build-in DVI viewer using
 			<pkg>net-libs/webkit-gtk</pkg></flag>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
 		<flag name="t1lib">Enable the Type-1 fonts for the build-in DVI viewer
 			(<pkg>media-libs/t1lib</pkg>)</flag>
 		<flag name="xps">Enable XPS viewer using 
diff --git a/app-text/discount/Manifest b/app-text/discount/Manifest
index 0dd6def1b539..57cdc61a14f6 100644
--- a/app-text/discount/Manifest
+++ b/app-text/discount/Manifest
@@ -1,7 +1,9 @@
 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
-MISC metadata.xml 366 BLAKE2B 2e5fe0a3c428627cc1feb2aee974a537b8244ea9029ed6830b809c110d057a65535684032e830a42dff47852b632dc7c74473294f2eb2c7cd9789be3d27bd87f SHA512 39d05813a4efdcd14d0f5932efc63c25ae22b83088cb1bf020863e8ab9bdb348bcbd48901a2dff3c1184dc1483ae3868d2b4a2fd942dda91150944008773db3f
+EBUILD discount-2.2.4.ebuild 1787 BLAKE2B 828913834a04e586de8b6dcb1db76c5668ab361b7cce88038e523a5d734aaa6c5aa811a99e7b2beb97c57e9fa438f03693dada95cc02172c3c57ced451c109b2 SHA512 d4465bcf671e5c77c14744b8350f93f842df12dcfdedbb71785fc5b879d142491095565092d4cd8a12e18f0ee3de537ac6c269993ee81cfc920d57c78a9d050a
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-text/discount/discount-2.2.4.ebuild b/app-text/discount/discount-2.2.4.ebuild
new file mode 100644
index 000000000000..1486b3455681
--- /dev/null
+++ b/app-text/discount/discount-2.2.4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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/metadata.xml b/app-text/discount/metadata.xml
index f5a6787777d1..7a38bb900964 100644
--- a/app-text/discount/metadata.xml
+++ b/app-text/discount/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>reagentoo@gmail.com</email>
-		<name>Dmitry Baranov</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-text/docbook-sgml-dtd/Manifest b/app-text/docbook-sgml-dtd/Manifest
index 40b14895e23c..87b727f9b584 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 1011 BLAKE2B 9c02058236f7b66de9aa762ed696e22c93e074f6647faf1dc37262f7d4ae5d02c0400cdaa015ce1560aae913b4db6e32a862305c56c7378a42d45f28085adfc8 SHA512 367701e984259dc600291eff305ec2274d947a24d18d96e4c198910850c5355a2056c3b151d9a31b27ee09d346f5245a9b35bdb26462276f82420ea4112b8b32
+EBUILD docbook-sgml-dtd-4.5.ebuild 1005 BLAKE2B 6aed4a3c42c3fb5c1f10eb727fc6742f8330000ed2d0be8da72690b8d35d6421ccc23a8f04ca479d509fd393491f9e524e91cfe8df0ed5d61652e82b2f54c76c SHA512 3c8be641d48208d311b4c7033fefa4d278a1a4f7bc446e9282819c22eb731cd9cd2f61cbd829c1a9c6aee3d8788deef7d7c0cb44735006e680aebb58f766745d
 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 d3912738df83..67de063dc7f8 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
@@ -1,4 +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 @@ 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/evince/Manifest b/app-text/evince/Manifest
index 6f0e892d42f2..15af557fe6e6 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,6 +1,8 @@
 AUX 3.24.2-CVE-2017-1000159.patch 1644 BLAKE2B dfb16a3fd8403d69212d0d20fa97dc06ad2b43d1c71894a0a2b366002b945110a73942446543276058ad5bb8ed867b68b3750eb9eed5bb23d2b130c14239f98e SHA512 a09d1e4a6f22c1b93ab322c1b7201bf4665bbc12b29dd9222db22b7d1b73f9ebc745c7e9b77e2bb54656916360757fd8007b6c38c004983b42f506bbaf4369ff
 DIST evince-3.24.2.tar.xz 3509216 BLAKE2B 3bcb9e15a6576650d17d6ea1df638c4b16759ddd2353ca47b425c1fec04f90b85ff7f338472e5e18defc01ab066ef241eff40e8f493fa2238814933703636e7b SHA512 77e099ff60188f982a49f5c8287eb2ed8d42402a15a54ccf8367b3814e7e16ba31354363d3f101117153792daa96f653f24bb06193b5e749d0ebfaac7d7c1e0f
 DIST evince-3.28.2.tar.xz 3379552 BLAKE2B 64f77f2c19649f74291d34f6a0dfc49348d2a8e80cf2b37ef40b2c3bbfbd1198c40a47dd56ca6b04166e9981ebade3b8f74eeefa9234246968fd1e7fb4babcdd SHA512 6deeefc5ed52d79627ae892b227bcf023c6ea45ac02c6a3a7c9fa1004f5da2e36051bfea73f6838cb8f9aed8cadfd145173a5d3b2be405f1d1f06bd4fdadae23
+DIST evince-3.28.4.tar.xz 2174604 BLAKE2B 7f9bd298221d3b5b504e7cbaa6c8f99fa0ea54c418c92fef8be14a635a6ee20a33d1d4aac3af4a50af123e70de2bd22b80a3ed56ff8f7320b1d86629215af7af SHA512 655cff393af4102782abc08a999d5d27314860a3dfbbdfceb443617d696bc02b5c60cf5af6395fa51c1c4e20d8443384de35f1e725947b1d6c862122efaa5257
 EBUILD evince-3.24.2-r1.ebuild 2874 BLAKE2B dba10da7fdf7adfc96c52ed4cde40c9793bec028e3c56043f9bd6a1acec62f1b9d3dd900bfee8281c19fbf7eb43bab8a6895ca3bad21fd49669f0ec106459612 SHA512 92527495b1f50a477458599f01c00c652bfd572d179130920c49ecde92878adb3a8bea317645a10ead7f04c963ee46a082629dc05e153aaa0ea47bd91ed92b0e
 EBUILD evince-3.28.2.ebuild 2836 BLAKE2B a7bb13c67bbcf995cecbf7e954cc02a422217d1a7ffc0330e142cc6cb7ac0b1e0660e14ba732ee4582f34bbba3dec6349752e3c7160b893734f1affaa1fc0804 SHA512 0dabd52455c49be144e03854dcbca8cb901399de94fb081623f55f88e3a5d0945ae5b2da4c884dc2c5e231c4939137ca272b02a72a60ad10620889a4686e0c6a
+EBUILD evince-3.28.4.ebuild 2833 BLAKE2B 180ae57826483e9d5abbf962838483adc074073145b12506f044ba00fc3c520f6bfd57607133ab7a161c760c6a54c09b97e2c202a9c3ffd84d698e029ebde7a0 SHA512 6e8b9f1a4757d75810dd7dd89c3572ee0c1096233e1f4f1e3a5cdeed510f51a14d9901e08db6c9f5eed44e6141a558904acb572bfb87835848be746a5725a40e
 MISC metadata.xml 780 BLAKE2B 2d04283b6f69a9ba788c9d40049767219854376c36c5c1716084b62e2710fdadce7c917d6fa58e51f5e249954e22a0d725cccbaecd66bf6f7417d31b5c3a8865 SHA512 4580592dd517fcba266be541cada8bc0225d35bafaa9505bd5e8127c3cffee65917f4bb0b9aee1263f2d96f5fc47f0cf9d59ffb84e97d2f4727e4504f753a4b9
diff --git a/app-text/evince/evince-3.28.4.ebuild b/app-text/evince/evince-3.28.4.ebuild
new file mode 100644
index 000000000000..84b26f36da43
--- /dev/null
+++ b/app-text/evince/evince-3.28.4.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 systemd
+
+DESCRIPTION="Simple document viewer for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
+SLOT="0/evd3.4-evv3.3"
+IUSE="djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin +postscript t1lib tiff xps"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+
+# atk used in libview
+# bundles unarr
+COMMON_DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.36:2[dbus]
+	>=dev-libs/libxml2-2.5:2
+	sys-libs/zlib:=
+	>=x11-libs/gdk-pixbuf-2.36.5:2
+	>=x11-libs/gtk+-3.16.0:3[introspection?]
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/cairo-1.10:=
+	>=app-text/poppler-0.33[cairo]
+	>=app-arch/libarchive-3.2.0
+	djvu? ( >=app-text/djvu-3.5.22:= )
+	dvi? (
+		virtual/tex-base
+		dev-libs/kpathsea:=
+		t1lib? ( >=media-libs/t1lib-5:= ) )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0 )
+	gnome? ( gnome-base/gnome-desktop:3= )
+	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
+	introspection? ( >=dev-libs/gobject-introspection-1:= )
+	nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] )
+	postscript? ( >=app-text/libspectre-0.2:= )
+	tiff? ( >=media-libs/tiff-3.6:0= )
+	xps? ( >=app-text/libgxps-0.2.1:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gvfs
+	gnome-base/librsvg
+	|| (
+		>=x11-themes/adwaita-icon-theme-2.17.1
+		>=x11-themes/hicolor-icon-theme-0.10 )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.13
+	>=dev-util/intltool-0.35
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+# eautoreconf needs:
+#  app-text/yelp-tools
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Do not depend on adwaita-icon-theme, bug #326855, #391859
+	# https://bugs.freedesktop.org/show_bug.cgi?id=29942
+	sed -e 's/adwaita-icon-theme >= $ADWAITA_ICON_THEME_REQUIRED//g' \
+		-i configure || die "sed failed"
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--enable-pdf \
+		--enable-comics \
+		--enable-thumbnailer \
+		--with-platform=gnome \
+		--enable-dbus \
+		$(use_enable djvu) \
+		$(use_enable dvi) \
+		$(use_enable gstreamer multimedia) \
+		$(use_enable gnome libgnome-desktop) \
+		$(use_with gnome-keyring keyring) \
+		$(use_enable introspection) \
+		$(use_enable nautilus) \
+		$(use_enable nsplugin browser-plugin) \
+		$(use_enable postscript ps) \
+		$(use_enable t1lib) \
+		$(use_enable tiff) \
+		$(use_enable xps) \
+		BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins \
+		--with-systemduserunitdir="$(systemd_get_userunitdir)"
+}
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index ce34f56c5689..5e6b60a511e5 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 5561 BLAKE2B 2ffc000083b14d57a215824798782566e68208b19960d96f5fb9dca0442ecb81ad614a44e995087e0ed07f97a3a24bd11de2ba93dcff2bb4133081e5ad6c46b2 SHA512 7d88cb1b753983dc98821941afe3757f8cf1b8db55edc0a7ff95b6a26552c4d1d35ade381643c4566530196378780d3c3a919b860157de4ef966e1aac3940e9d
+EBUILD ghostscript-gpl-9.25.ebuild 5550 BLAKE2B e5ef67938e22007f726872a040c949866416d15f02de27def771ce5b2cae21745b4650fad0ebba99ebe48784aa5d9216b4cb2fcbeb2b1f5aff87fd04a0088bb0 SHA512 935f4f89f3805603315b5a0e7dae63c2286bf368fa1a0f4ed953e9452ef5ff6b32a54b28ee0f1b53fb2abc9a732e10b4b5027ed53035bce62a31cfb7f48622f9
 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 2d27fdc8171a..78d7519966a5 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.25.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.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
@@ -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/gspell/Manifest b/app-text/gspell/Manifest
index 1e389de98f8d..6646aac94ba9 100644
--- a/app-text/gspell/Manifest
+++ b/app-text/gspell/Manifest
@@ -1,5 +1,5 @@
 DIST gspell-1.4.2.tar.xz 407356 BLAKE2B f2ee6ae43be55e8ad7253e10893868a8d7857bbe41e14d71103b27a0faf40b0ed247e9fa38ed7bc75039fe0f1f600fe739f538d50f69fb063d0932df6c0b1c27 SHA512 00f53d3ca47a4ba1af1e8b4983a41dc6df8a9788898b45ffdd161a3fc8de28024cc985f49fbb872912c0a94addbca3b28ce2edda70eeb206a794e2bcf65e4a5e
 DIST gspell-1.6.1.tar.xz 416704 BLAKE2B 2a180bc52d3f09813d8de362e5bf900f831663c09530c8a9b993baf55f852a3939447a71c9c9dc0caafba7e8b74a2a5aad4443cf248eb87da4e15e0481e74262 SHA512 f1ffbd0d23d9743bcf924c25b3a3d7bf93c6a5e4ea5e362fb7300f657d8c1d0117e847f3dec29de377947f850e003b24a3231e88e99b313c955dd94ce358c23e
-EBUILD gspell-1.4.2.ebuild 984 BLAKE2B 34d49bf58ed3d59cbb94f95739fa8e03985f3e93be328251e5f1a080ea2e0eec734e9ab036e096f37c873da24c4fdea98c09b98bb010d9c9fc7b455e6ef7ad74 SHA512 43c47b3b112301aa1876e805999bb1631f6add794a7ab68d5ba162f7d12b741fadf2486458294f4b2b5bfd78f3143d9f9ca16631ba8020aad92ff1fbefc2cd92
-EBUILD gspell-1.6.1.ebuild 1013 BLAKE2B 88c7afe164ee3909fd779cd5f66d417b5315d72c60911f41556c0a0b38b5d67d300949f147d5eef4bb450f7b830d4d947c6670b9e07c22eb1c49890498457c1e SHA512 3e16dd138639cba06d4a6edb08b80767e43d63cbb411e01a2be8f3e084135946332acbf442d2b23d5b336f24c62b423aa092bd1a4aea79c9682382ee38e49165
+EBUILD gspell-1.4.2.ebuild 1002 BLAKE2B 06a4b0b33579b30a5e3f2cfda415ee0a81898089405af5b71d35e4e45ed90c89c7efe4d30808c23b56ffa883ce45f846d94774c06ff62e5f66adbc7bf2289811 SHA512 516960e85ba6bc8601dedc0c9045b23bf988644382157afcb4a7f3590668c88022d81647b0a1e97d6a6ecac12f7f6ad6c5949aaf78cdb622eda32125abad72af
+EBUILD gspell-1.6.1.ebuild 1031 BLAKE2B dda3a661518a14663b0bb30b4a3324aafa5ca28030e55b9318bee054b76ad15567174d5b91f39b0c2b256dbea0cb94ccd897e2e81961959c735eb4abad5a5d04 SHA512 d89a169bcec2093320857178b039ca2729bed54336d2658b63daf867950f0cb3038c20ae67ccf8b6de11cb426dd4d35c58ed929293da64e757def106da7eb901
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/gspell/gspell-1.4.2.ebuild b/app-text/gspell/gspell-1.4.2.ebuild
index 25328fe7e66c..ec2125c80b3e 100644
--- a/app-text/gspell/gspell-1.4.2.ebuild
+++ b/app-text/gspell/gspell-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"
@@ -25,6 +25,7 @@ RDEPEND="
 	vala? ( $(vala_depend) )
 "
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.25
 	>=sys-devel/gettext-0.19.4
 	virtual/pkgconfig
diff --git a/app-text/gspell/gspell-1.6.1.ebuild b/app-text/gspell/gspell-1.6.1.ebuild
index c47de38e8597..120ad059c3a2 100644
--- a/app-text/gspell/gspell-1.6.1.ebuild
+++ b/app-text/gspell/gspell-1.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"
@@ -26,6 +26,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-libs/libxml2:2
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.25
 	>=sys-devel/gettext-0.19.4
 	virtual/pkgconfig
diff --git a/app-text/libetonyek/Manifest b/app-text/libetonyek/Manifest
index 60a794df43d8..5b60d730bf22 100644
--- a/app-text/libetonyek/Manifest
+++ b/app-text/libetonyek/Manifest
@@ -1,5 +1,8 @@
 AUX libetonyek-0.1.8-glm-0.9.9.patch 409 BLAKE2B b0731eba3a65ea4e88bd24a633875157acbb4c1e727bc7bcf2a4f1af67197c1d9762a7aa6265e31357eead2baff13c28126d6f4bbc698a997f442bc58771b5b2 SHA512 edc407a4958befee95b53733b0c73bc8281575b53b8d2c65491eee6aafc63d775d3ce9d0a0578ce51cf8bc8f047a683bb0dbd8b79f2b1914dc5df6de64b835fa
+AUX libetonyek-0.1.8-no-parentheses.patch 1052 BLAKE2B 9603025aa5e9ef25d8d17ee25c6f30cd87455b68c000b92f4483deda594ecb1b061cd8e0630247fb1c2eaa8860cfa7a3c2896c3fb901bc5205bc75fd51388a4d SHA512 7ab3cdca79784d362df85b279e762189738061a386313e71d9c1aa889b40df5586fb487bbc52615835472c8d3a674163bb84569285e9c3672dac4a5694af5c57
+AUX libetonyek-0.1.8-typo-fix.patch 1189 BLAKE2B 404c2c55b8a0946670bf68e13a50a660be7c38021ed7e9a50d9522b883b512d512bc89dc294df62cb479f609616327414b6064971a86e99f38d071a17196b62e SHA512 5085b727c12219f784339a3ab8ecad88302e33338c5467e49adbc1acee91f85ee20f6b2bf765e5a085099141615976368003cc0e8fc3ed4142f0467c15b7a0ee
 DIST libetonyek-0.1.8.tar.xz 1324868 BLAKE2B 2088349df75011f54f5822ffd69336a7942a148ff829111c02efbfb99c705a9e00105147942f3e9e81278be3b1f2be4d63aba8cbf6a54127f04fc547df6b7b1d SHA512 c8c08100b0c75e0420bbcd796f7cb9285e77ce1be34757df5b237d114a428a4a6094f12e442f81769a2fac5be45ea4376ff9e1d90448e18b3443bfe7c645a865
-EBUILD libetonyek-0.1.8.ebuild 1223 BLAKE2B a6b9d1b52b17ba30d2f5eeb1e3716322d69ac50a655294607b6e4ba0633ae2f35fc64b4ada3e9bbfaa02e93d9b0eb5719224c8d3b1ef8273c213fb424692096e SHA512 526520f569135e98351aaa12ff5a5b2c45b6689cc0f54cabeae9c6aa593231bd0fb35f4ffd387ee449ad44b2e1f991ebd1038cea8872d78469189c2d1d77dc5d
-EBUILD libetonyek-9999.ebuild 1183 BLAKE2B 326e3f725846dbda6102ccf8a4ef4a1b63c723c80c36cdc927243482c38cf2d745d032149246bd6b3d083b455042e6eda60d4212c36f8239c621ccbaeb0e9ef8 SHA512 3993f39d97f9e53ce01237e2eb94ce458538903b1a66b8462c4fe9135b3101b0fe534e61d36ae79de939df2988cfd061463ffed06dc08172a289284661fd4ad3
+EBUILD libetonyek-0.1.8-r1.ebuild 1439 BLAKE2B 4aedcdd5eeabda732bfb69204d073fe83157b489177b16683785b0db2ea09e2697e48438dfd455f40f9706e5cb6a80795b54a7f1a4bccfbe49795417fda02967 SHA512 5aa9b843157114144e65e867faf5ff9beb9d5916440b3e72b4ce9e9b2cc3cd207573f9c65d207ea543409fd264e8b4f8ad34ef1b16f3ed1b801cf1fd604c94fa
+EBUILD libetonyek-0.1.8.ebuild 1224 BLAKE2B afde4827cbdbc5d956e84dd46fc9df2252e5d3c6af8fcce8f3b1afbfe694a5050729b3989f1cde73efea30ae63cee413d2ea825b2df6c13595b509be0786d937 SHA512 1939662481af2af90d0b45ac6949c5453fdd20cd554ef4a0143465a1c48551377b0614742e3643fd59b31fe4296b22dfa493890f5ba90996dc40e1e14b32ae60
+EBUILD libetonyek-9999.ebuild 1329 BLAKE2B 58566cb1623a2aa4b053650f3b9af882df926a4df39e25a129ca7b7e28a2e8b9aae0f09848777841aa81eb1d345ad8bfc5e129cb5ad597ab310e54f9007f34fc SHA512 54c998440fdc017bd77e7c959d75b6ce0736d50b2f067d7be760651189b92327d12b4449c1b5b76c451b6d28e38a90ef45ea51c5c18c0161f8ebda6b75e5685a
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libetonyek/files/libetonyek-0.1.8-no-parentheses.patch b/app-text/libetonyek/files/libetonyek-0.1.8-no-parentheses.patch
new file mode 100644
index 000000000000..e13fe5f31cef
--- /dev/null
+++ b/app-text/libetonyek/files/libetonyek-0.1.8-no-parentheses.patch
@@ -0,0 +1,29 @@
+From 935cb58a61e45f441bdea143317a7d0d52c7f944 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Sat, 5 May 2018 14:01:43 +0200
+Subject: [PATCH] =?utf8?q?WaE:=20unnecessary=20parentheses=20in=20declarat?=
+ =?utf8?q?ion=20of=20=E2=80=98aligns=E2=80=99?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Change-Id: Ic3cb38d071db8e3947c09a4b216b62d18e01b6aa
+---
+ src/lib/IWAParser.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/IWAParser.cpp b/src/lib/IWAParser.cpp
+index ab9c6c8..973610e 100644
+--- a/src/lib/IWAParser.cpp
++++ b/src/lib/IWAParser.cpp
+@@ -1676,7 +1676,7 @@ void IWAParser::parseCellStyle(const unsigned id, IWORKStylePtr_t &style)
+       auto align=get(properties.uint32(8));
+       if (align<=2)
+       {
+-        const IWORKVerticalAlignment(aligns[])=
++        const IWORKVerticalAlignment aligns[] =
+         {
+           IWORK_VERTICAL_ALIGNMENT_TOP, IWORK_VERTICAL_ALIGNMENT_MIDDLE, IWORK_VERTICAL_ALIGNMENT_BOTTOM
+         };
+-- 
+2.11.0
diff --git a/app-text/libetonyek/files/libetonyek-0.1.8-typo-fix.patch b/app-text/libetonyek/files/libetonyek-0.1.8-typo-fix.patch
new file mode 100644
index 000000000000..32593fed4805
--- /dev/null
+++ b/app-text/libetonyek/files/libetonyek-0.1.8-typo-fix.patch
@@ -0,0 +1,28 @@
+From 9b78187ac2ccca0158cc9cc0bcc0576b457a78d7 Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Mon, 23 Apr 2018 17:20:16 +0100
+Subject: [PATCH] intial-creator->initial-creator
+
+Change-Id: I6fe5d0732edb97ac7ff6d527f48543cab1bb3f7b
+Reviewed-on: https://gerrit.libreoffice.org/53337
+Reviewed-by: David Tardon <dtardon@redhat.com>
+Tested-by: David Tardon <dtardon@redhat.com>
+---
+ src/lib/IWORKCollector.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/IWORKCollector.cpp b/src/lib/IWORKCollector.cpp
+index 0e0c775..4252a49 100644
+--- a/src/lib/IWORKCollector.cpp
++++ b/src/lib/IWORKCollector.cpp
+@@ -771,7 +771,7 @@ void IWORKCollector::fillMetadata(librevenge::RVNGPropertyList &props)
+   if (!m_metadata.m_title.empty())
+     props.insert("dc:subject", m_metadata.m_title.c_str());
+   if (!m_metadata.m_author.empty())
+-    props.insert("meta:intial-creator", m_metadata.m_author.c_str());
++    props.insert("meta:initial-creator", m_metadata.m_author.c_str());
+   if (!m_metadata.m_keywords.empty())
+     props.insert("meta:keyword", m_metadata.m_keywords.c_str());
+   if (!m_metadata.m_comment.empty())
+-- 
+2.11.0
diff --git a/app-text/libetonyek/libetonyek-0.1.8-r1.ebuild b/app-text/libetonyek/libetonyek-0.1.8-r1.ebuild
new file mode 100644
index 000000000000..e58d47644acf
--- /dev/null
+++ b/app-text/libetonyek/libetonyek-0.1.8-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libetonyek.git"
+[[ ${PV} == 9999 ]] && inherit git-r3
+inherit autotools
+
+DESCRIPTION="Library parsing Apple Keynote presentations"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
+[[ ${PV} == 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
+
+LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="doc static-libs test"
+
+RDEPEND="
+	app-text/liblangtag
+	dev-libs/librevenge
+	dev-libs/libxml2
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	>=dev-util/mdds-1.2.2:1=
+	media-libs/glm
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-glm-0.9.9.patch"
+	"${FILESDIR}/${P}-typo-fix.patch"
+	"${FILESDIR}/${P}-no-parentheses.patch"
+)
+
+src_prepare() {
+	default
+	[[ -d m4 ]] || mkdir "m4"
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-werror
+		$(use_with doc docs)
+		$(use_enable static-libs static)
+		$(use_enable test tests)
+	)
+	if has_version ">=dev-util/mdds-1.4"; then
+		myeconfargs+=( --with-mdds=1.4 )
+	else
+		myeconfargs+=( --with-mdds=1.2 )
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libetonyek/libetonyek-0.1.8.ebuild b/app-text/libetonyek/libetonyek-0.1.8.ebuild
index a3df8b9feddd..88f7b92bc33b 100644
--- a/app-text/libetonyek/libetonyek-0.1.8.ebuild
+++ b/app-text/libetonyek/libetonyek-0.1.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
@@ -25,7 +25,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-libs/boost
-	>=dev-util/mdds-1.2.2:1
+	>=dev-util/mdds-1.2.2:1/1.2
 	media-libs/glm
 	sys-devel/libtool
 	virtual/pkgconfig
diff --git a/app-text/libetonyek/libetonyek-9999.ebuild b/app-text/libetonyek/libetonyek-9999.ebuild
index 39b6f10a69f8..434fddd7f1a7 100644
--- a/app-text/libetonyek/libetonyek-9999.ebuild
+++ b/app-text/libetonyek/libetonyek-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
 
 EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libetonyek.git"
 [[ ${PV} == 9999 ]] && inherit autotools git-r3
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
 LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
 SLOT="0"
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="doc static-libs test"
 
 RDEPEND="
@@ -24,7 +24,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-libs/boost
-	>=dev-util/mdds-1.2.2:1
+	>=dev-util/mdds-1.4.2:1=
 	media-libs/glm
 	sys-devel/libtool
 	virtual/pkgconfig
@@ -39,12 +39,19 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		--disable-werror \
-		$(use_with doc docs) \
-		$(use_enable static-libs static) \
-		$(use_enable test tests) \
-		--with-mdds=1.2
+	local myeconfargs=(
+		--disable-werror
+		$(use_with doc docs)
+		$(use_enable static-libs static)
+		$(use_enable test tests)
+	)
+	if has_version ">=dev-util/mdds-1.4"; then
+		myeconfargs+=( --with-mdds=1.4 )
+	else
+		myeconfargs+=( --with-mdds=1.2 )
+	fi
+
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
diff --git a/app-text/libspectre/Manifest b/app-text/libspectre/Manifest
index dd124695fe24..9af4b14cbea7 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 1110 BLAKE2B be9c0200beb1c2264280405dd80f28db2497e071a80bdeae45f8d5810dedcdf8d1db045ed19b15e033b10ae711c578c6562d03b979dd5747f3446503c3b9dee2 SHA512 add5c59d81def9ef31d881f19fff022d35727af1421dfcd94c4053a070e6e25aa91243e9685a6e8b1a2838aa77e9073f5079d95d70ba5d31d753d525306d06b8
+EBUILD libspectre-0.2.8.ebuild 1104 BLAKE2B daf7b21d86d15067b412a9b7bc936d40bc7351035b5018619b02773f86eadc38ffca84bde5ac788606484b832bb26e94e07e363aab3d2ba16f9bacf2a8c3a16e SHA512 6cfd7ef0f0b0823378ffa9c85db2f65c64f16476ea0b93d82b0814ce1e732dac73acf568a624d6f499db37d0f0a0042b96db4e9465775898aac811292a3afbcb
 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 feb3225fdc4a..df338f5da2da 100644
--- a/app-text/libspectre/libspectre-0.2.8.ebuild
+++ b/app-text/libspectre/libspectre-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=6
@@ -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/linuxdoc-tools/Manifest b/app-text/linuxdoc-tools/Manifest
index 721e445382bb..020d6148464f 100644
--- a/app-text/linuxdoc-tools/Manifest
+++ b/app-text/linuxdoc-tools/Manifest
@@ -1,3 +1,5 @@
 DIST linuxdoc-tools-0.9.72.tar.gz 614429 BLAKE2B 404b311c0560780bd81f021760d32e47cd6ebe8abc9aa64a181b8ce727dd0edbbd88d286cdfdcc97a51981bd0bd299563d7b1b2945e06f83ff32c7d3e56abb19 SHA512 2d522a99212dab2535786b64e0b404a9bb023d1612d8e57a628de21b5e77b104285713a98591c61a2fb2196e687b34180198ab0dfeda2b44fbbce051e9919408
+DIST linuxdoc-tools-0.9.73.tar.gz 613971 BLAKE2B e2e04aaa44d5e2cea5af266e38b476381f87a02b9704e03ae5943f7714634d5d214350abd5b193f2efe656a264403c679495af5f954870b30d32b8b799ad7206 SHA512 b26896316e259cf4ef170814d410b1e39e58f61db49b03b4b9c1f767f8459d84214e92d9dcc09ad739508fd9c3c5fe4a2264cbb3c693a11362e59fd221655252
 EBUILD linuxdoc-tools-0.9.72.ebuild 1777 BLAKE2B b61585eaf79a55b9acc1f4711cbaec19d421db998f091a4fb5827292bb30c5720de9ba5a300ad0cf248b509a8ec4d1a0415a4ee498edb18f49279cf673ff35cb SHA512 40632a82dc9252a4bac966174c4e87f6f1adf075fb2ef125ea07ccc5796b98e74d8823d1afff11f98e042ded4eb5b7da82a8b8c5ab052e4f7d53357b84cbf649
+EBUILD linuxdoc-tools-0.9.73.ebuild 1663 BLAKE2B 8a5e2b42c4add946689d6b9219fcfc402bb338d2819b6bb32413f1e24545efddf3a4eed65e3b1ed84346e249cf6ef5fb104b41d7d880bd6519ee30919f699067 SHA512 ea7075321553e28ddd64e9dbaca32323362c5a4c9499b8fe5528b73a8f30754e69eb2e49a1e1e089bf69f3c803d9eb82fdd181dd928d66792ad5173e95c95913
 MISC metadata.xml 911 BLAKE2B a78b50af9faf588a872f75b94f1278ce1ef5e16edb8c6f6c953dcc29b466be53f70a63275e5df54bd46f58d726e80f07b8cd8ae051d93f7c6ee11f0c8e63b8fe SHA512 6afd802552b700006b38a5eee516e5e1f59d0af0dff294bc2807804f8a85823ca2c5a928c0cfe2d5ef74d8c34521ecdd2a54d4ff5a1d322f17d42a6e5e6ad0f4
diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73.ebuild
new file mode 100644
index 000000000000..18bccf5a4872
--- /dev/null
+++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# EAPI=6 is blocked by Gentoo bugs 497038, 497052.
+EAPI=5
+
+inherit autotools latex-package perl-functions sgml-catalog toolchain-funcs
+
+DESCRIPTION="A toolset for processing LinuxDoc DTD SGML files"
+HOMEPAGE="https://gitlab.com/agmartin/linuxdoc-tools"
+SRC_URI="https://gitlab.com/agmartin/linuxdoc-tools/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3+ MIT SGMLUG"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86 ~x86-fbsd"
+IUSE="doc"
+
+RDEPEND="
+	|| ( app-text/openjade app-text/opensp )
+	app-text/sgml-common
+	dev-lang/perl:=
+	sys-apps/groff
+"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	virtual/awk
+	doc? (
+		dev-texlive/texlive-fontsrecommended
+		virtual/latex-base
+	)
+"
+
+src_prepare() {
+	# Pregenerated configure scripts fail.
+	eautoreconf
+}
+
+src_configure() {
+	perl_set_version
+	tc-export CC
+	local myeconfargs=(
+		--disable-docs
+		--with-texdir="${TEXMF}/tex/latex/${PN}"
+		--with-perllibdir="${VENDOR_ARCH}"
+		--with-installed-iso-entities
+	)
+	use doc && myeconfargs+=(--enable-docs="txt pdf html")
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Prevent access violations from bitmap font files generation.
+	use doc && export VARTEXFONTS="${T}/fonts"
+	default_src_compile
+}
+
+src_install() {
+	# Makefile ignores docdir configuration option.
+	emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}" install
+	dodoc ChangeLog README
+}
+
+sgml-catalog_cat_include "/etc/sgml/linuxdoc.cat" "/usr/share/${PN}/${PN}.catalog"
+
+pkg_postinst() {
+	latex-package_pkg_postinst
+	sgml-catalog_pkg_postinst
+}
+
+pkg_postrm() {
+	latex-package_pkg_postrm
+	sgml-catalog_pkg_postrm
+}
diff --git a/app-text/lv/Manifest b/app-text/lv/Manifest
index bb24098a3e97..60db33d8bbb0 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 1017 BLAKE2B df902d931c531f3e510c5528a2dc7387a0472cb2f6ef081833a5d31ed0c72d6f2b549865b1ce068c6207ccadc946ea7942dee424eec0ff05f8b555b62c7889a5 SHA512 7a740ca5ae20ebd82610dc64fcc5714999525a1ab10fa325ae7b16f438864de8a53ed14b415670643ada5d005630774548d3d7b3291e2df27544f6d94a053a25
+EBUILD lv-4.51-r4.ebuild 1010 BLAKE2B c2c90102b208760c5b3834746b4722cc5de3993715a6ca9ac464f20900b3080f282f4f6b5c0976a09ccee518df303831bdfc081e3d64d7d4f3bf77451adb0966 SHA512 b655b25cbc62ba0e582928ddbd1ef8f843d5e393b5daefb3e428ca6692ecfa579a6cd7fe97949d486de822ea56abcdb03c4a873846815a30dd501cf94571c293
 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 2518014787f3..722c56da9cf5 100644
--- a/app-text/lv/lv-4.51-r4.ebuild
+++ b/app-text/lv/lv-4.51-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"
@@ -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/qpdfview/Manifest b/app-text/qpdfview/Manifest
index b41fa39dff49..4c5a7d40fe40 100644
--- a/app-text/qpdfview/Manifest
+++ b/app-text/qpdfview/Manifest
@@ -3,5 +3,6 @@ DIST qpdfview-0.4.18_pre2.tar.gz 668677 BLAKE2B 1c79a7f9f9d67c533660457ca74d27c1
 DIST qpdfview-0.4.18_pre3.tar.gz 747794 BLAKE2B 08420a350ae6f8bba65efe2a930a8941a00182900e33266a03d9b6ded4b8ba7ac446de9ed8095f8876dfd3ecfb26b20cc146c82d9c9228fd5c136ad36d749061 SHA512 c72f766b0ffb175e0577f08975490b985e859cb41ccf1d6bcdb618664b96b3c4d0fe4ffab2e493ac20b87b85aa658f3beb5b0d430d21deae78df4c503649f1c0
 EBUILD qpdfview-0.4.16.ebuild 2137 BLAKE2B d0ce86840680b56afd8b925b820d0641a0754776d4054b469c691f5da10db072febd5b04b34b80394bc08f47d6b5b7b58390332c30d445116528cbc238fe2144 SHA512 2d89740ee569287794935eb369c8a035a3ceeceb3e428e740f0b0adbe808f532a336dae9739c789bd4ee71b1a7f87af222ce91c19028bb179275184607489549
 EBUILD qpdfview-0.4.18_pre2.ebuild 2351 BLAKE2B aa38b631649b7d03be1a6e1df550cce81f44fe721d8b874b225ce6414a749a96dedc585b4d4482224d23c56cb2176c530e02bd47dc74ebdc45718642c8c39f28 SHA512 1c49e2ce7d9fedbbed5ea45b550403a11c68035d5943361d901b9df33c357c730d1b46ab66de6783576bcb562f64eeee61a9ca3857a93aa9759d4c756d98dbf6
+EBUILD qpdfview-0.4.18_pre3-r1.ebuild 2392 BLAKE2B 9b8d9bf46515c2e77b85fb0dbf6bbcc183c9bf8e2c0b0c837bb1442634885770806285c35094e91439da58482176a77deea8a0addbd9842804509b1aea3fd9bb SHA512 930ef2979ac45d7beb67b8da2074d476c393a00e0054e0a045ea14b62825688d53b19047faa57ac12ed155b46bfc6833fbdc93eddba5ecd9bcf7ac63dce707fe
 EBUILD qpdfview-0.4.18_pre3.ebuild 2388 BLAKE2B 17cea66141ca629186a310ff101e138a57ddb995b46df94d834524be2b0fa4a565973715022bb5adfa19dbc9423c742bf91ba2b7b08c7fb9d88873aa4658a5ad SHA512 52b2f4ea6c8c4a5a5eb673613c6e4cea1e503280f63093e5044c247724507495d633f673712a1bdc7743cb4c0f1f63a4922f9cedcd0b316db9e80c4d71c0e5ec
 MISC metadata.xml 534 BLAKE2B db66db041dd0875c8d4e36e3223d7f82263555f2d6a1dcc5270279b3fc8bc77499712253d43b56e278187f163af0495ca9e7e6aa0ba0dc8e9a5fe9cf7f2daf99 SHA512 e086f5e92c5ad9058f13c23c814a5cdc988a09cdbebecb1018b59d32a756dc2766b13ee1c3e09966cc7e221cc1c4ee26f9bf11c50610f94b28c20a34c316f133
diff --git a/app-text/qpdfview/qpdfview-0.4.18_pre3-r1.ebuild b/app-text/qpdfview/qpdfview-0.4.18_pre3-r1.ebuild
new file mode 100644
index 000000000000..a6c1da2e0daa
--- /dev/null
+++ b/app-text/qpdfview/qpdfview-0.4.18_pre3-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PLOCALES="ast az be bg bs ca cs da de el en_AU en_GB eo es eu fa fi fr gl he hr hu id it ja kk ko ku ky lt lv ms my nb nds oc pl pt pt_BR ro ru sk sr sv th tr ug uk uz vi zh_CN zh_TW"
+
+inherit l10n qmake-utils xdg-utils gnome2-utils
+
+DESCRIPTION="A tabbed document viewer"
+HOMEPAGE="https://launchpad.net/qpdfview"
+SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex"
+
+REQUIRED_USE="?? ( fitz pdf )"
+
+RDEPEND="
+	cups? ( net-print/cups )
+	djvu? ( app-text/djvu )
+	fitz? ( >=app-text/mupdf-1.7:= )
+	postscript? ( app-text/libspectre )
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5[cups?]
+	dev-qt/qtwidgets:5
+	dbus? ( dev-qt/qtdbus:5 )
+	pdf? ( >=app-text/poppler-0.35[qt5]
+		dev-qt/qtxml:5 )
+	sqlite? ( dev-qt/qtsql:5[sqlite] )
+	svg? ( dev-qt/qtsvg:5 )
+	!svg? ( virtual/freedesktop-icon-theme )
+	synctex? ( app-text/texlive-core )"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig"
+
+DOCS=( CHANGES CONTRIBUTORS README TODO )
+
+src_prepare() {
+	local mylrelease="$(qt5_get_bindir)"/lrelease
+
+	prepare_locale() {
+		"${mylrelease}" "translations/${PN}_${1}.ts" || die "preparing ${1} locale failed"
+	}
+
+	rm_help() {
+		rm -f "help/help_${1}.html" || die "removing ${1} help file failed"
+	}
+
+	l10n_find_plocales_changes translations ${PN}_ .ts
+	l10n_for_each_locale_do prepare_locale
+	l10n_for_each_disabled_locale_do rm_help
+
+	# adapt for prefix
+	sed -i -e "s:/usr:${EPREFIX}/usr:g" qpdfview.pri || die
+
+	default
+}
+
+src_configure() {
+	local myconfig=() i=
+	for i in cups dbus djvu pdf svg synctex; do
+		use ${i} || myconfig+=(without_${i})
+	done
+	use fitz && myconfig+=(with_fitz)
+	use postscript || myconfig+=(without_ps)
+	use sqlite || myconfig+=(without_sql)
+
+	local myqmakeargs=(
+		qpdfview.pro
+		CONFIG+="${myconfig[@]}"
+		PLUGIN_INSTALL_PATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
+	)
+	eqmake5 "${myqmakeargs[@]}"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}
+
+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/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index 822d95d3341c..d16b638a216e 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -160,5 +160,5 @@ DIST texlive-module-typeoutfileinfo.doc-2017.tar.xz 760 BLAKE2B d6ae70e4c4baf447
 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 11811 BLAKE2B 9478846ecf0d8a375ce08f6b1d67d4a701119c2b81f7e2378c3353e1e89c3a38d2a011cb8e1801cb6e0c37f582f26de74f942759e2dcd089268b77cb7871f006 SHA512 e2b6d392fe780dd1262d5e8234da06bed0c64e7d674d301fffe23be5b8d0c7e25dc1acdd7e546bc217a74caa238d097ac7cbc05e48032f4e6bcdfb4e90660321
+EBUILD texlive-core-2017-r4.ebuild 11810 BLAKE2B 86ace87ccc5953c2ca93605edff43c03597bcdf5cd4ccecdb58b7b077ebaeb7c57dab32e3c151d741beb1bea5ddfb229af3f0d76d01b2b7d190f286b38827ba6 SHA512 4ba3beac7021d1ed6c0952515017c039e1e9f9d1dd7f777df3c599502dd90e8e01c797cd0a11b8b91a11911b69470f5132977c7dd6730fb067f92d318d6590b8
 MISC metadata.xml 661 BLAKE2B 23fd3817c5a9861b9adec9a78b6dcae0a23743cf685560a86a991896ed8f102fe66aa15a416939829c0c085cdfee24668f7a07631b3f4aeee469002f35b481e6 SHA512 c00ae9537fced06990a4ffff5fbe5101670ce1d84c879c0e9eeaf5c979107dd6a1f92f8f8271731b6c4818abead15b759fc9958ece317e554effbd3cb23fd2b9
diff --git a/app-text/texlive-core/texlive-core-2017-r4.ebuild b/app-text/texlive-core/texlive-core-2017-r4.ebuild
index 30f93b013f8f..72492b59e8ce 100644
--- a/app-text/texlive-core/texlive-core-2017-r4.ebuild
+++ b/app-text/texlive-core/texlive-core-2017-r4.ebuild
@@ -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 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cjk X doc source tk +luajittex xetex"
 
 TEXMF_PATH=/usr/share/texmf-dist
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 23607b30ee73..35145b268b04 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/breakpts/Manifest b/app-vim/breakpts/Manifest
index 1e2df12aa0e4..d4fd65c86051 100644
--- a/app-vim/breakpts/Manifest
+++ b/app-vim/breakpts/Manifest
@@ -1,3 +1,5 @@
 DIST breakpts-4.0.tar.bz2 17349 BLAKE2B c7ad9eed8fb13537c940e6868f5e4e5dd812a6b7f7c26c4617e3c24905b6e2a817dc91990b613b700e793dd763a6841f85dd7f9cc42fb9f5afc25c3609f909fc SHA512 a480bf32cd3e756ac25849b1d5fd20521bd8c965454bb94c33810c9d1d4464762a731d08dcae858c59853a6cf41ab3cb6cddeda440c8b041cc8ec192ab2bd2fd
+DIST breakpts-4.0.zip 20124 BLAKE2B 2ea7568af5407d57c4d4b505c69d625056d62e8f5bd25bf5ca13918e3ffbc0f83de2aedb0abc3468215a650308ed8b592a618c0b50c24dd8ad3f931ef5d2ff8b SHA512 3e7f148896a10abd30a16d903c14460668ee48d078ae3c3b6ff663dab53d32199d8cf9cd3a56164a32d0be2684e64a882e917f3f632318ce85db5eb07e29754d
 EBUILD breakpts-4.0-r1.ebuild 682 BLAKE2B bf0c5025e3e2707a805b6fbd22f97313235c6a7d55f0397015c36f7e0041305c374fc44104d5a26c1f56f9a7452b60fa26f72869d6fb65b1f433e9f90930780a SHA512 90aed4c69a96cf1cbbd27162d9e1b057792f3f1ccaf6335a99060bbf89fe2b1dfb0344c2999004802628329b567ff33728faf643df0cfc5eabd73ece79a1c250
+EBUILD breakpts-4.0-r2.ebuild 803 BLAKE2B 1ac75b05bd5d45dbcdc8cedb9687769c1deff041acd406824b62e40758c57927e95c031533d15a353a59a436d45f2cb3ca1519fb37c1dfdfcc6e27abb3d4d2e8 SHA512 eaf5a8afbd71843625a60c672bacc09b3e1d52d6ba6a69e0878ad48d0dd9fe1000ee67619b9cc0e5981fa80fd676e9ad0f62563bda5901eb9b97d2a09fbac701
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/breakpts/breakpts-4.0-r2.ebuild b/app-vim/breakpts/breakpts-4.0-r2.ebuild
new file mode 100644
index 000000000000..1dcdff18bc43
--- /dev/null
+++ b/app-vim/breakpts/breakpts-4.0-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: sets vim breakpoints visually"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=618"
+SRC_URI="https://www.vim.org/scripts/download_script.php?src_id=8142 -> ${P}.zip"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
+
+S="${WORKDIR}"
+
+RDEPEND="
+	|| ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 )
+	>=app-vim/multvals-3.6.1
+	>=app-vim/genutils-1.13
+	>=app-vim/foldutil-1.6"
+DEPEND="app-arch/unzip"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin allows breakpoints to be set and cleared visually. To start,
+use :BreakPts, move to the required function and press <CR>. Breakpoints
+can then be added using :BPToggle or <F9>."
diff --git a/app-vim/gentoo-syntax/Manifest b/app-vim/gentoo-syntax/Manifest
index bad901687822..9e01bab5cbaa 100644
--- a/app-vim/gentoo-syntax/Manifest
+++ b/app-vim/gentoo-syntax/Manifest
@@ -3,6 +3,6 @@ DIST gentoo-syntax-20170225.tar.gz 18939 BLAKE2B 7586b45791e74e69ad6e0607bc0a4d5
 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 1291 BLAKE2B d41ffb1d75ef52e3fbd56f534df5679230120d96eb3f5409095bbac2ad3a5e87c559a02447dfe8be868a65db777a817cf044f788767ad22b6e9c595e8ef4c422 SHA512 56240851586c4dd7b4ee85fe951c9c76fe0866b073b8eab2de0c17b86cefa67e992fe794a92d834a599151e72d8b27267a006617052a7d5042f33082b7334764
+EBUILD gentoo-syntax-20180821.ebuild 1287 BLAKE2B c708e1b0229d178f87fe5c8eb8da11586ba954bcdd0460e1fb47685470be5bc0241762c53516627dfd01149233ccc467fd1ec44c81433045dabf7aae62f10fd6 SHA512 9962008a1e4cfc008926e29531a52cd66e8a4f8dedf6aac88cdd9e39e052d1359c564c046e3682ed30912ab5425a2eb46a8ea1772285506448f9d6f0af7895c6
 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-20180821.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20180821.ebuild
index debde524302c..32d7c5342126 100644
--- a/app-vim/gentoo-syntax/gentoo-syntax-20180821.ebuild
+++ b/app-vim/gentoo-syntax/gentoo-syntax-20180821.ebuild
@@ -1,4 +1,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://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/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 57cfe1f72ad6..c7905c5e3ca5 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest
index e195de230139..d5a30ef78f2a 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 1034 BLAKE2B d5ca6c633ba75ad7421cfe624788e2a1ddfcdaa047228f6afc82a7276e2888e3474e2b323b0281f1d9eddb11709863a3f9e549f478a07fa5d0b32240609f0f27 SHA512 a81ddbb53174ff2afcca34f26cedd3ce7828faf71f35c62b6c23906da5f8713ea70d2db3cbdb1e4b6c9b3b324d5dc645dca71c81b2fc80b0d76f902855194188
+EBUILD catch-2.3.0.ebuild 1030 BLAKE2B d2aa24e6a9ea0274859df948e70f50db8e50cd7cf290c4857b3f4f4f1cae26ca97ffc6230dcd9c55d5cd53e400a6bc8560ea5f7a56803951fcaf963133e77f7b SHA512 8223fab7abd67fd6f736c9fa74169a514a12b6f775f4f00e21be47c345ac901a801e2a20942497add7ffbfd416bdd601d0a249116d3dca98a6c2330adfbf3eb7
 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 94a870ee7cea..a5f5b0bd658f 100644
--- a/dev-cpp/catch/catch-2.3.0.ebuild
+++ b/dev-cpp/catch/catch-2.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
@@ -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/websocketpp/Manifest b/dev-cpp/websocketpp/Manifest
index 95c8204c2080..1e13b30da8e1 100644
--- a/dev-cpp/websocketpp/Manifest
+++ b/dev-cpp/websocketpp/Manifest
@@ -1,6 +1,6 @@
 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 787 BLAKE2B 93f68f1f064f4b31abe4adeb1be8014145469ba17262e7197ee3695207840442d6afb1362d0d1a4cebb456509ab554fd3bdb94fd2de0fdc605b98582c08fbd85 SHA512 8c79fbae1a1e2f943820e36be7e839983516acd206c101f2e0cf69612e42c166b131e1019d8fd27eac1f5689e729818df07ea1f0f2746d4098ffbc1eafe45299
-EBUILD websocketpp-0.8.1.ebuild 794 BLAKE2B f205c144d91e207cc4c6e3cf8e166ca3cfc7b1c63e5c27b9cb9008dee02bb49902bf5941e780b4215c172cb9970e5b792baba5e22fcbcebb95f92fda3c093e3e SHA512 3ff6012ab5a4beec24f1ef4202be1aa03a483681c5ce31ebaefd0393d7102200e94b5cee968bc1ee405dae6b06d6428e166b90f2853594cec83779a2ec3597b3
+EBUILD websocketpp-0.7.0-r2.ebuild 785 BLAKE2B c6f38b15b53ecf7832562bf891cee935503f23a77e3405171b278d9194fd7fae6f4c7b00ad1d95719ba9f4582e87946dabd465b8eb9858e072a23cabeb6f2580 SHA512 048170cd90d448f2e22b81929eec28809a98c537a2ff84697a4818feb39d7c71a962a004a76021597d7b386baa5154a4562e55d1b5ece6e3fab6eb3a2598b5a6
+EBUILD websocketpp-0.8.1.ebuild 792 BLAKE2B 777abcc5726b40ae6c0be75a68a9fce88954a6f2287ba7611188127f158eea1c4efeca41c74ed0dc8fa0a48569d9398f27b245838cd3e24d887b4862d0eff4e2 SHA512 4354d47af35a22013f407299577cb88abb9a55ef1b6e37c03434715873bcf50af1e71e15a001803a51e92b6f74d86c30093f534086b36954f69ec85560e7e71c
 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
index 1f3730df214a..49aa4f68f4d9 100644
--- a/dev-cpp/websocketpp/websocketpp-0.7.0-r2.ebuild
+++ b/dev-cpp/websocketpp/websocketpp-0.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
@@ -6,7 +6,7 @@ EAPI=6
 inherit cmake-utils
 
 DESCRIPTION="C++/Boost Asio based websocket client/server library"
-HOMEPAGE="http://www.zaphoyd.com/websocketpp"
+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"
diff --git a/dev-cpp/websocketpp/websocketpp-0.8.1.ebuild b/dev-cpp/websocketpp/websocketpp-0.8.1.ebuild
index 0818e872e796..332c2d9ffcaa 100644
--- a/dev-cpp/websocketpp/websocketpp-0.8.1.ebuild
+++ b/dev-cpp/websocketpp/websocketpp-0.8.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 cmake-utils
 
 DESCRIPTION="C++/Boost Asio based websocket client/server library"
-HOMEPAGE="http://www.zaphoyd.com/websocketpp"
+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"
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 80c01cec2f69..ab877a13cb90 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/kdb/Manifest b/dev-db/kdb/Manifest
index 4cc3aeb9622d..72af1b6f2b2c 100644
--- a/dev-db/kdb/Manifest
+++ b/dev-db/kdb/Manifest
@@ -1,3 +1,7 @@
+AUX kdb-3.1.0-crashfix.patch 1137 BLAKE2B e7ea0a921390ee4e6011f7db579de8acc9a8dc79ed71fef1bc6a7959cff81250f4874a4efbafedaddff719e0a17701a45c02951847a42be02b812431424abba2 SHA512 396e6470071b75d79b0868eb58b7d7add83d514e242277b8e32636301cf2326035bf754641c5da593f02641ec8c762e96d66da97fa06c2eac4ce26c267483ed6
+AUX kdb-3.1.0-fix-loading-objdata.patch 1157 BLAKE2B 49e71094b66790a1a7a40ca7c75190ca2c2cc5d6403737c6cfaf89af55e8fb363a80f8ee6ca19b01f2b3c8706caed0dcda5a52dc64c4d9b7c9ea02400a642d86 SHA512 423f817358b1ed7f74dc9dd565b51a3089212d974f3dee7efad4ad2393640f8c23d30ba6d8c1213669beb6e5182978935fe7548a5a7a21e99c8b7b6fbfce9f6f
+AUX kdb-3.1.0-postgresql-11.patch 1087 BLAKE2B 0799a1ac60b2aae5129e6a442f41608a0f4dc76f24315a2add9bcc395a7a4bc1eef4536a345a741bf248f77e7d10a92e3f3108c2e7a180eec7ee2b4c2286d454 SHA512 9986884f2375f3a6bf18855b7a05620a4cbb0e280148ead9ffb390e71270d4b0bbafeb407495ed78216c225ee0760f233d3fb1ceeb39c35ea3f9455f14cdec76
 DIST kdb-3.1.0.tar.xz 543780 BLAKE2B d874765758e245fc939bf88312b064d2dcff3460b2c9e968277e0ce7b8821314273cb3086e821645f9d7605de1a4268e25d11c40f8bf847a8dc98c410bd4d9eb SHA512 f94f1ff87cb5133570f7e9b0ab48202a516eabe1c3f2ed750cd1794800d9b9936bbd62e1479ca6877c293f6473b7f4e2d4a144b928b5bc0f228af327131b43c2
 EBUILD kdb-3.1.0-r1.ebuild 1051 BLAKE2B fdb334e923fe982490712bb019e3318a1b5a91d2e2aae531db58dcc0c95c05f602f9372f4157215a51922a7859656a5aafd91d7b2f06a87de1bff32fbb616675 SHA512 b0c3b31c9c35bd8cc27d35763baac99952753685beafca43a20c21e528965471f8e01ef7b72aa021a20b2ee166a01a5887d497fac07875dd0811e450503db737
+EBUILD kdb-3.1.0-r2.ebuild 1222 BLAKE2B 66d7fae401dc74d7c4acba16615acca40aa12bfc36efa336296b6d0bc6c7034fbb8c351c19a232f07339e43a6cd813bcacbbea033d761ecf393295747d6835ac SHA512 8e84a7fd7227815fabc512019cfb0099a4b609b8a9d95de5f5d6252a5296e16bd4e8d467167a9ca0002df4d4816b26eef22b9e3d9a63deb2b5d46affc7952de0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-db/kdb/files/kdb-3.1.0-crashfix.patch b/dev-db/kdb/files/kdb-3.1.0-crashfix.patch
new file mode 100644
index 000000000000..dcc114d49915
--- /dev/null
+++ b/dev-db/kdb/files/kdb-3.1.0-crashfix.patch
@@ -0,0 +1,29 @@
+From 386375b6dd9841fdb24a56dcd637be38fcb4c175 Mon Sep 17 00:00:00 2001
+From: Jaroslaw Staniek <staniek@kde.org>
+Date: Tue, 27 Mar 2018 00:20:34 +0200
+Subject: Fix crash in KDbConnection::recordCount(KDbTableSchema)
+
+FIXED-IN:3.1.1
+---
+ src/KDbConnection.cpp | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/src/KDbConnection.cpp b/src/KDbConnection.cpp
+index e53bb33..d416d12 100644
+--- a/src/KDbConnection.cpp
++++ b/src/KDbConnection.cpp
+@@ -3420,10 +3420,8 @@ int KDbConnection::recordCount(const KDbTableSchema& tableSchema)
+ {
+     //! @todo does not work with non-SQL data sources
+     int count = -1; // will be changed only on success of querySingleNumber()
+-    const tristate result
+-        = querySingleNumber(KDbEscapedString("SELECT COUNT(*) FROM ")
+-                                + tableSchema.connection()->escapeIdentifier(tableSchema.name()),
+-                            &count);
++    const tristate result = querySingleNumber(
++        KDbEscapedString("SELECT COUNT(*) FROM ") + escapeIdentifier(tableSchema.name()), &count);
+     if (~result) {
+         count = 0;
+     }
+-- 
+cgit v0.11.2
diff --git a/dev-db/kdb/files/kdb-3.1.0-fix-loading-objdata.patch b/dev-db/kdb/files/kdb-3.1.0-fix-loading-objdata.patch
new file mode 100644
index 000000000000..7bf0100d418a
--- /dev/null
+++ b/dev-db/kdb/files/kdb-3.1.0-fix-loading-objdata.patch
@@ -0,0 +1,27 @@
+From a00f37b024e1a0888de3266af9acff99e6f21aa2 Mon Sep 17 00:00:00 2001
+From: Jaroslaw Staniek <staniek@kde.org>
+Date: Tue, 1 May 2018 23:29:06 +0200
+Subject: Fix loading object data for given type and ID
+
+FIXED-IN:3.1.1
+
+CCBUG:393705
+---
+ src/KDbConnection.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/KDbConnection.cpp b/src/KDbConnection.cpp
+index d416d12..690752d 100644
+--- a/src/KDbConnection.cpp
++++ b/src/KDbConnection.cpp
+@@ -2188,7 +2188,7 @@ tristate KDbConnection::loadObjectData(int type, int id, KDbObject* object)
+         }
+     } else {
+         if (true != querySingleRecord(KDbEscapedString("SELECT o_id, o_type, o_name, o_caption, o_desc "
+-                                                       "FROM kexi__objects WHERE o_type=%1 AND o_id=%1")
++                                                       "FROM kexi__objects WHERE o_type=%1 AND o_id=%2")
+                                           .arg(d->driver->valueToSql(KDbField::Integer, type))
+                                           .arg(d->driver->valueToSql(KDbField::Integer, id)),
+                                       &data))
+-- 
+cgit v0.11.2
diff --git a/dev-db/kdb/files/kdb-3.1.0-postgresql-11.patch b/dev-db/kdb/files/kdb-3.1.0-postgresql-11.patch
new file mode 100644
index 000000000000..050335a38528
--- /dev/null
+++ b/dev-db/kdb/files/kdb-3.1.0-postgresql-11.patch
@@ -0,0 +1,24 @@
+From 675d51d86b377992aacdb8253cb7c3b8a80474c0 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino@kde.org>
+Date: Tue, 22 May 2018 18:37:53 +0200
+Subject: cmake: find PostgreSQL 11
+
+---
+ cmake/modules/FindPostgreSQL.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/modules/FindPostgreSQL.cmake b/cmake/modules/FindPostgreSQL.cmake
+index 039c380..56e6e56 100644
+--- a/cmake/modules/FindPostgreSQL.cmake
++++ b/cmake/modules/FindPostgreSQL.cmake
+@@ -86,7 +86,7 @@ set(PostgreSQL_LIBRARY_DIR_MESSAGE "Set the PostgreSQL_LIBRARY_DIR cmake cache e
+ set(PostgreSQL_ROOT_DIR_MESSAGE "Set the PostgreSQL_ROOT system variable to where PostgreSQL is found on the machine E.g C:/Program Files/PostgreSQL/8.4")
+ 
+ set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS}
+-    "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
++    "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
+ 
+ # Define additional search paths for root directories.
+ foreach (suffix ${PostgreSQL_KNOWN_VERSIONS} )
+-- 
+cgit v0.11.2
diff --git a/dev-db/kdb/kdb-3.1.0-r2.ebuild b/dev-db/kdb/kdb-3.1.0-r2.ebuild
new file mode 100644
index 000000000000..e39c39e70d8c
--- /dev/null
+++ b/dev-db/kdb/kdb-3.1.0-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_6 )
+
+inherit kde5 python-any-r1
+
+DESCRIPTION="Database connectivity and creation framework for various vendors"
+[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="5/4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug mysql postgres sqlite"
+
+RDEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-libs/icu:=
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? (
+		$(add_qt_dep qtnetwork)
+		dev-db/postgresql:*
+	)
+	sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-qt/linguist-tools:5
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-crashfix.patch"
+	"${FILESDIR}/${P}-fix-loading-objdata.patch"
+	"${FILESDIR}/${P}-postgresql-11.patch"
+)
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	kde5_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DKDB_DEBUG_GUI=$(usex debug)
+		$(cmake-utils_use_find_package mysql MySQL)
+		$(cmake-utils_use_find_package postgres PostgreSQL)
+		$(cmake-utils_use_find_package sqlite Sqlite)
+	)
+
+	kde5_src_configure
+}
diff --git a/dev-db/mydumper/Manifest b/dev-db/mydumper/Manifest
index e597f188c9c4..fd83bc33acbc 100644
--- a/dev-db/mydumper/Manifest
+++ b/dev-db/mydumper/Manifest
@@ -3,5 +3,6 @@ AUX mydumper-mariadb-define.patch 766 BLAKE2B 26d8b037de5362bb456f19ed85d5b20cb9
 DIST mydumper-0.9.3.tar.gz 45320 BLAKE2B 6e6d4420ced29d4ea77aa257ee155ce0810fe7d0ac3bf22c22156dfcfba35a3c461e4115d5814b5e0050331151a5b0c3bd819c1ecc534b6644972bf76de5d004 SHA512 3bc2c85dbedf234aecca3b66f445e42bb7ddff83f914d5cc231f6a5755d1c2bf300ae9bf4bdea0717b45ea5338c6c336ec44f375dbf29570ed785ffddda53898
 DIST mydumper-0.9.5.tar.gz 60010 BLAKE2B f74a949712526b3fc3b1957c9f9dc5c5f820d88f781926331e751eb99e6315b37bd8f38ac8a0e1943485cc74fe9b14a7e74e955c77ceba6b10bb1e18a7720d75 SHA512 5b72234c88fd22c103afb9fa5a7c3c99d6585cb450b8cc7385cfd23ae2ce09c0848d15767a5957a7b8f87a7614bdb058dea8990f1a2a12300c2c74fc9da2de75
 EBUILD mydumper-0.9.3-r1.ebuild 1025 BLAKE2B bbaf77ab28323c82103b68aeee4222bf218554e45e05ae07467c18dc69e25f43ab2b1e70ddafa69cb8f2045d85c361511016de81c8d6aa20db7cdd25ffdbe614 SHA512 5b1a7b6669e4cfc85d0e32a9a5474de7dc00c27931c72219c1cd212139f616eaf492c76e749ea3cf94f88aa31d35455783b3ceb65943f9f82f34288dc037d64a
+EBUILD mydumper-0.9.5-r1.ebuild 1054 BLAKE2B ab2776d3e913a6ee95906839878acde43c87c9bb04f901218a1e864601d60cd73a4e2329cae9abb5033501163d7535d4d1e1ecaf9785e4d6d09b98519ef371b6 SHA512 2d1b0e7a932a09114dc5e3848510700b81e6c086551e21fc41a966b0f116b0d96584908359879786f6c16cd6313800721b498ca53bb826380d6625c38786efb2
 EBUILD mydumper-0.9.5.ebuild 1026 BLAKE2B 6ded4d30e464888593beb8bf4d06441c02e17b28ff59ddb3aa9142b42dde1ccf00b05dac0977fe514d23e1be06099c217df778976a799451982bf9ac2948985c SHA512 37776222d7cc3cbcc5b520f1731d445841028aec63899a6bbfb2c1a931b78aef3987555404955f1c2742782cd599065eefbe04b6739460fc5642d4e0e606ba84
 MISC metadata.xml 448 BLAKE2B 141a4303111433ea46ec427dcf7942fae3165ea27b90c1d92f1fd4e4a82bbdea0476a7f5380250684ca763feb7ba7045bae9443329c260b0732452b3e639c5ea SHA512 192415f225533e6195856255483cb80c5da21f496bfe048518dbfccf8cdc049339ab5322d125e627a3a84fcdfb052012fd57cbe2083118917b35796f7a9e9353
diff --git a/dev-db/mydumper/mydumper-0.9.5-r1.ebuild b/dev-db/mydumper/mydumper-0.9.5-r1.ebuild
new file mode 100644
index 000000000000..a924406ea685
--- /dev/null
+++ b/dev-db/mydumper/mydumper-0.9.5-r1.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
+
+DESCRIPTION="A high-performance multi-threaded backup (and restore) toolset for MySQL"
+HOMEPAGE="https://github.com/maxbube/mydumper"
+SRC_URI="https://github.com/maxbube/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+COMMON_DEPEND="dev-db/mysql-connector-c:=
+	dev-libs/glib:=
+	dev-libs/libpcre:=
+	dev-libs/openssl:=
+	sys-libs/zlib:="
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )"
+RDEPEND="${COMMON_DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-atomic.patch" #654314
+)
+
+src_prepare() {
+	# respect user cflags; do not expand ${CMAKE_C_FLAGS} (!)
+	sed -i -e 's:-Werror -O3 -g:${CMAKE_C_FLAGS}:' CMakeLists.txt || die
+
+	# fix doc install path
+	sed -i -e "s:share/doc/mydumper:share/doc/${PF}:" docs/CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=("-DBUILD_DOCS=$(usex doc)")
+
+	cmake-utils_src_configure
+}
diff --git a/dev-db/percona-toolkit/Manifest b/dev-db/percona-toolkit/Manifest
index ddff65af59bf..9685b97ea5f4 100644
--- a/dev-db/percona-toolkit/Manifest
+++ b/dev-db/percona-toolkit/Manifest
@@ -11,6 +11,7 @@ DIST percona-toolkit-2.2.19.tar.gz 1425623 BLAKE2B fe9b363ec924b1af9110ea7e7dab7
 DIST percona-toolkit-2.2.20.tar.gz 1431840 BLAKE2B 76565662b4037010f7e8de98316f568c2994f55d042ae3a21b80dc3b839444a11014b61db675cc21c149f26c3b7df52013d7b06c9c1127ec325dae2942a4e4c0 SHA512 f7a5f47e9ca05c43dcb80866a1eacd13066e1f036f4f58d51145fc6354ddc86dd6515a9aa33c8f736029800bf4c80f7ba5fcb9f1e6ac41653b3351597885f679
 DIST percona-toolkit-3.0.10.tar.gz 17335242 BLAKE2B c24103576c537eb9afbdcedc6acf51671853c8e0764092f76d3ee4a1de338a521d91b956b13665ca92a06a70726b92cb9d530ab04b50ed30990868305bd0a7a0 SHA512 e9477f908bbcc5c975f11d42fe9b2b61adebe823657e23a2c74c639767c73f3f71ebdf2bec1d839ad14f2d5080c5f1f9620db07c6bf9694bd7623e86f390e902
 DIST percona-toolkit-3.0.11.tar.gz 18254993 BLAKE2B a6c582bdda96bf5c74e7b5340c465d71f4f119d8364c1d36fc02c650d741972e706bb5eee86fd5bc22ed4f7298a45f0d5c5d9e4438230a8b7b09a58498dda7e8 SHA512 f722ccc8b0fde8f61d4cf269ec89df410f656153da06cf396d222cbb817e88b50e23c0ace383429acf39ddec0501e75d6d3e358fb5ed53ee50a0162eaed9a717
+DIST percona-toolkit-3.0.12.tar.gz 16205557 BLAKE2B e159867d7c6a8b1fd8fa0f31d3a7bdff45f45353995d57d71cd2fb763044524fb62c6c0dcff893ff9d92b5a18dd695445ac46b01ff99be7cbac9d625e5521c44 SHA512 4c01a04f6a4efb444e248d55ab846f32d4784e021b51b272875de3f1f0907298c66073f6d2a941ad407aefa9840407e55095c5ec848998f731539b12ec1875f8
 DIST percona-toolkit-3.0.7.tar.gz 79294306 BLAKE2B e3a556c823d355e5af504210dfb360e6fcf217ca6bfb7ba729e83e66cfdd09231c09d05fb51df1eac6bee0c6615620ac96ffce47c4f0473394d9c008ce8bdabe SHA512 e5a23ce6f4fd74f0956187679810de23a9d60f8073609289d641411c9f397f49b02c05cbcd0a68d78992849f17b70fb3ae411ac967e25c7be45f95ec374414fe
 DIST percona-toolkit-3.0.8.tar.gz 79316265 BLAKE2B 5d6efdbaa4fd3ac914c059c9240f6dcd0de89c6b2ea444c407b115b380bb676c51266f907f6e37a62a40032fd5aa6e1816752c8ec08150dddf71c7568f42c739 SHA512 d5380395b052aebe651806649ff22f259d1af9401112b7ffe86b10664b87f917fecfe91bdc72b401d00471fc9c141391006cd322c9464fca1343f704ecaa8623
 DIST percona-toolkit-3.0.9.tar.gz 15197340 BLAKE2B 095d8c0b26853caa6d2515de1d8fb8ff13b3084caa46498c8c789cd4e7b18473d41992701e393ad91cd7fdda8b3e56a099600285aeb4ba788110d36a028f76b6 SHA512 56a8732cfdbd58d0602e482d7bf049d2049104b7ae203d756db81a052cd837f16d2a35f75def4f23748534d0d2eb6441cb9fe49175a931fbcdbb6adeb42f1c53
@@ -21,6 +22,7 @@ EBUILD percona-toolkit-2.2.20.ebuild 1213 BLAKE2B 2bcc433599d64b15225e508fa16c50
 EBUILD percona-toolkit-3.0.10-r1.ebuild 1330 BLAKE2B acf05bb59b278883dece85f7a60a6ae114a5a5253a867b0f2c5259196eddb4a95acdf66809c1ecb5ad47140f220b9cff47efeedc0ddc1f370db1ee6181c4f12c SHA512 cb5d77f6f689989ae2aa5e4eb4ca7273981b9f18e6308d67dd5ca25ddb163db24655b3d54e84f70f911ffd098bacf5d114dd8afd1a4b2c06198ad55f9fcbcff4
 EBUILD percona-toolkit-3.0.10.ebuild 1249 BLAKE2B bd743a722e60cade6307bd04c774a77d0e01b2272e82974be486b47d0462120910c1182ba6fc3f7cf268f4ebfa04d432e456f62079010621aeaf6b325c743b54 SHA512 988d423c3125592608caa659543b508dcea2048b0c905a24c924e75894ca7c93924908e49f5c6c2c5d660a7b90a242e558e874849f0793d58a82abec1ad38982
 EBUILD percona-toolkit-3.0.11.ebuild 1330 BLAKE2B acf05bb59b278883dece85f7a60a6ae114a5a5253a867b0f2c5259196eddb4a95acdf66809c1ecb5ad47140f220b9cff47efeedc0ddc1f370db1ee6181c4f12c SHA512 cb5d77f6f689989ae2aa5e4eb4ca7273981b9f18e6308d67dd5ca25ddb163db24655b3d54e84f70f911ffd098bacf5d114dd8afd1a4b2c06198ad55f9fcbcff4
+EBUILD percona-toolkit-3.0.12.ebuild 1327 BLAKE2B becf83720c5604ec44f6ea1a9a36832778e34b06f9b33d72a7b83ac9bb4fd74803a03945fb918565bfd50cb2753b3915621d445dd33f44e64e25d06507f13a7b SHA512 3a598735a027e87c54c8417a43ef56edca0d89288a9e50e5ef826f84619908dfa76a0a51db5c7fa10c47113952be17b407bfeeb22294618d684430804322d0b8
 EBUILD percona-toolkit-3.0.7.ebuild 1167 BLAKE2B f61aaf597895efa1b68a04f889e93fef6207d4e2cc9f14e986aee81cccb6ca7888d7479bc01bf11bea554bb9f860615ebfb95111420c641ad7e8b16808121a24 SHA512 940474cb8cf56cff984dffc33c3848808d184c33f6d31a4bcafdc2ee16feecbe6f4084c80e243d18eb62c9f09759f274144aff2c3f45d465bc01c8f82d1e5ac1
 EBUILD percona-toolkit-3.0.8.ebuild 1249 BLAKE2B bd743a722e60cade6307bd04c774a77d0e01b2272e82974be486b47d0462120910c1182ba6fc3f7cf268f4ebfa04d432e456f62079010621aeaf6b325c743b54 SHA512 988d423c3125592608caa659543b508dcea2048b0c905a24c924e75894ca7c93924908e49f5c6c2c5d660a7b90a242e558e874849f0793d58a82abec1ad38982
 EBUILD percona-toolkit-3.0.9.ebuild 1249 BLAKE2B bd743a722e60cade6307bd04c774a77d0e01b2272e82974be486b47d0462120910c1182ba6fc3f7cf268f4ebfa04d432e456f62079010621aeaf6b325c743b54 SHA512 988d423c3125592608caa659543b508dcea2048b0c905a24c924e75894ca7c93924908e49f5c6c2c5d660a7b90a242e558e874849f0793d58a82abec1ad38982
diff --git a/dev-db/percona-toolkit/percona-toolkit-3.0.12.ebuild b/dev-db/percona-toolkit/percona-toolkit-3.0.12.ebuild
new file mode 100644
index 000000000000..21aa1f40c53b
--- /dev/null
+++ b/dev-db/percona-toolkit/percona-toolkit-3.0.12.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit perl-module
+
+DESCRIPTION="Advanced command-line tools to perform a variety of MySQL and system tasks"
+HOMEPAGE="https://www.percona.com/software/mysql-tools/percona-toolkit"
+SRC_URI="https://www.percona.com/downloads/${PN}/${PV}/source/tarball/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 Artistic )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+# Package warrants IUSE doc
+IUSE=""
+
+COMMON_DEPEND="dev-perl/DBI
+	dev-perl/DBD-mysql
+	virtual/perl-Time-HiRes"
+RDEPEND="${COMMON_DEPEND}
+	dev-perl/JSON
+	dev-perl/libwww-perl
+	dev-perl/Role-Tiny
+	virtual/perl-File-Path
+	virtual/perl-Getopt-Long
+	virtual/perl-Time-Local
+	virtual/perl-Digest-MD5
+	virtual/perl-IO-Compress
+	virtual/perl-File-Temp
+	virtual/perl-File-Spec
+	virtual/perl-Scalar-List-Utils
+	dev-perl/TermReadKey"
+DEPEND="${COMMON_DEPEND}
+	virtual/perl-ExtUtils-MakeMaker"
+
+# Bug #501904 - CVE-2014-2029
+# sed -i -e '/^=item --\[no\]version-check/,/^default: yes/{/^default: yes/d}' bin/*
+# ^ is *-no-versioncheck.patch
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.7-no-versioncheck.patch
+	"${FILESDIR}"/${PN}-3.0.10-slave-delay-fix.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s/=> 'percona-toolkit',/=> 'Percona::Toolkit',/g" \
+		Makefile.PL || die
+}
diff --git a/dev-db/pgadmin4/Manifest b/dev-db/pgadmin4/Manifest
index 140b6e1dbed3..8ab21c88884e 100644
--- a/dev-db/pgadmin4/Manifest
+++ b/dev-db/pgadmin4/Manifest
@@ -1,3 +1,5 @@
 DIST pgadmin4-3.0.tar.gz 28915010 BLAKE2B 7e6dccd91f082f7b5514f5d3abdf4653a9961b4efc706e10ce58d817785d514508233e25068762fe0e4bca4c1a3cf10a2515afa38e6f9ba3c99b4af3fa32f3d2 SHA512 5921340176e6748ef13112d906061f195d4bb2f73917d762371bbaeb44ef66cf8e0edcd1cd241eb78dae46ed0b3af014c749468a930fb0c0983b38b2c54dfc3a
+DIST pgadmin4-3.3.tar.gz 30471775 BLAKE2B 06fe13d4e87709aa7ea5a7eef0aa5c7f3aae6891da0c4414fdf5e8936bb6bb7ac9092fd1e4f32f2f253fad7ace5fb8bdf07fed7ccb6dac68175fee5db2d27f4f SHA512 25027298a51d2ce01902fcd2314e35a44dfb5e3d7f6f5f1620841488bd5b8215436ffcad102fe9846ed4a9dee550232cb0b03c2ee0d5f46f53c753c8107e7ec3
 EBUILD pgadmin4-3.0.ebuild 3481 BLAKE2B 697a5b6250d747aff9b4216603077a977a84c44bd344f935315eb0ca9a41b85527b32df819738d42626759fb8244392c15edd4909c9b8f03cdb82debf24f5172 SHA512 5f14d65bc3dac207fd3ced4105be3115cd0821a6a5054ce9d150d31d19ca5de44c66b3971444e200d79bfc6b11949cd437a0cbec388f26beef94ccdacb1c3b19
+EBUILD pgadmin4-3.3.ebuild 3530 BLAKE2B ab03ed3c766c2d49feeb057b20054c36b068898e2269f2bf0fb9a967e376d2aff1219932df9ccb1fda4d55aad05161b1caa6435abbb05ea8ae735805cb54bf3d SHA512 105d6449bb961770948128131b4338190fbf27e46467d5b75a99b3b8f32a102137608f3659fb1bfb6cf274e640e88424409d1c0e00df4a84e25553690e29f463
 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
new file mode 100644
index 000000000000..2577aff506aa
--- /dev/null
+++ b/dev-db/pgadmin4/pgadmin4-3.3.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( 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/pgbouncer/Manifest b/dev-db/pgbouncer/Manifest
index dab44ce95cef..8b4298d70a5f 100644
--- a/dev-db/pgbouncer/Manifest
+++ b/dev-db/pgbouncer/Manifest
@@ -1,11 +1,7 @@
 AUX logrotate 119 BLAKE2B 7ed90c0272410e5a37411f78aaa446d1688ceb5a5a0cfa652f8ea3d043f693af2b963aaf18bb230ec4cd5ae34f09219f02b9ee0ca5b43fe61489f46aa7a8d505 SHA512 5aa4226ab2d168a88a3b64deb114d3901431d2afb2571cf8ae411c989549bc465ee05104a6863cc8fce6d769d809b4ab536973280f50cb4415c6698c34e1a5b8
 AUX pgbouncer-1.8-dirs.patch 984 BLAKE2B 0e9a3550efad0669e4598513197c50460326f701dae628ae8c9fb201e08ae3f0c5826515c6a884a00f2b0afd048490b16d87f9b3b9cf836ca4c77284cd705334 SHA512 2c9ddd2ae193b032435f97d41e789283ae69d99fefeb3829e80a90be296ccd2a754a9d00e6930985408758dfa3349d65f3c2ddf1f74053424bc8d8d09b2fa0e2
-AUX pgbouncer.confd 425 BLAKE2B f9b7065c043474f2208b44eecefb9cd1d6544295a47c3aee51f340f522eb4ba87bb270c99e18183541aca144eb16487a622ff5f2b5d5b87b2d1c7dd950262afd SHA512 9f997cbfb18f5bb1623aea2a9af706359a973fd2167be91ee6ffb37a22a6dc453280c66b6d2c11ab0174dbf159a195f0a1612be198466633d728a5317a878035
 AUX pgbouncer.confd-r1 457 BLAKE2B 0b2e33b57ee33eac42742a8f9fe7c0f090bad53c5d7c29d86fd3047307bd05d62f922fc66a0805ba3396934f6e2e7060f810f1c71c5b07d887edf2763cc0f40d SHA512 0642b12236e944b6b5086b593dfd4a5d7c04c8347fc286835381945a50a421e87805900d63d84d12dcb1fad667fc81f21c8644c63af33388a71048ec6e024ab5
-AUX pgbouncer.initd-r1 2216 BLAKE2B cfc489a5db03b6e4c56c79036d070152a6f78ce6c300fdc52049aaf91c41db1e2a41af409e701ab8dc2a24a5ca4e8b89b38cc61c52885a1330a04ef727d7585e SHA512 c2af62daf4e7c8e5a25acd17237de2134f1e496a51bd054abecc020a65b39c309c85572c17105431fd598a80ada187fb32fa8f2b1db229d2207c59607748220a
 AUX pgbouncer.initd-r2 2204 BLAKE2B 9c417188d4a762906c7631f1ae8fc7c7b8f6c52805acf6bfc12d580c53b2faa4e36b7c0662852feaf78aebcc29498bb8ae441d749a710793508c6950a448862f SHA512 dd9e8f7487affcc46b359e6d07a4c2fd698626d7360d2b2929389bbd7a340059eb27f0e0e9a648b7005c446d65762edbb02b865fa68194ebb822c01fba19fd7e
-DIST pgbouncer-1.8.1.tar.gz 465930 BLAKE2B 692c551cb7bfb56bfe1b354791b06bdf61866197150a78a7fa9688891a2e4cd3c015abc5fbe33bf66dc85ab0ae83745f2db852eae91ae99596c97be0154e8bd5 SHA512 595a94db98866cec211f2b8c1ad13d209dba00e5fd41f2e9025aabdcb660194f0f772810270a1d9f067c3039c9fee630e8ff2d56f231935add17207aecc10bee
 DIST pgbouncer-1.9.0.tar.gz 469300 BLAKE2B 466f171a49ec9ce9be9a9d3208780cfbff956da7c74ec4332c7104ea537cb47a5cfdc0d80bbd96d233769b6f430f1ad99b623caefa2dc93af7ba336dd0f49514 SHA512 b127f4cb60ca5cdf339da76727918f0a3797a3e0a89f8ed6fdcaa80f3391d2c5bb51e19731915775210c0e5070dd611ee2e410c9a947624e45b5cf11aecdacf9
-EBUILD pgbouncer-1.8.1.ebuild 1892 BLAKE2B 7fab90d3eb06d905c21a42773532c21fb978d7040915d14262f5203eb54db0fb7a6747b88fcf0183b6980f29a81774d79b809c50193bfdc07def521b9df42f2c SHA512 723a646c3694518d5a0e40b8dc6dd6ea2d393b6dbebccfafb324a1d6f160415166c3ac1fbda068aadee277c2ac549fca92109d432a6ec49f20f687ffd06fe931
-EBUILD pgbouncer-1.9.0.ebuild 1897 BLAKE2B 77c6be134fe3990c28f94f5ed7ed76debb4b01080ab594d0355cdae244578a2a3edd986a79d13a6e842b4a1274ea53ba335c0febda14c89ae24b4c3a04ba11c5 SHA512 ff4226509d48fe8cbad3db18f161517db38a8e70c48e5609ae478bfdae20d6989364f2cccadf00fd1b5d736f57305bc9789bec3599d0da2fb3e95bac7a58e7ff
+EBUILD pgbouncer-1.9.0.ebuild 1892 BLAKE2B d44fc3cfb7219eceffd1052c04d857f9ad3a2d3fb588b6811c174eb3d8295e4c8dc2912c63b8b71c50eeff61d6cf4d0c96bc398587e35f18f26bb37fad439722 SHA512 070a4cf26ce72183d63cd7bd7d54ff9940c9ecfc4f289d3aa04b356a27d3c1bd70a82a5756e796f0acb25d40c17656c930f68c87d3b207c42f49f2fad103c253
 MISC metadata.xml 472 BLAKE2B b06a5dca1ee52c85fa1f948c4c8cf6e83c0aba3e0b0bd77672f1585c01d0a2f8ef4d7502e30e9cb658ec3dd3e53560671b69210166c36b4ce888e329f531585b SHA512 b098e87be6194706f462bb93c4bf5425023f7bd90a0ed421a51ea42db98c85ebd77f23eb413f4e271e126ad4404cd0bdf0694f675662c421f7afd8ec0f036b4d
diff --git a/dev-db/pgbouncer/files/pgbouncer.confd b/dev-db/pgbouncer/files/pgbouncer.confd
deleted file mode 100644
index e2c584011884..000000000000
--- a/dev-db/pgbouncer/files/pgbouncer.confd
+++ /dev/null
@@ -1,12 +0,0 @@
-# Location of configuration file for PgBouncer.
-INIFILE="/etc/pgbouncer.ini"
-
-# How long to wait in seconds for a safe shutdown. Equivalent to
-# issuing 'PAUSE;' and 'SHUTDOWN;' on psql console. (See 'man 1 pgbouncer'.)
-NICE_TIMEOUT=60
-
-# Set to 'YES' to perform an immediate shutdown if the nice shutdown
-# doesn't work. Same as issuing 'SHUTDOWN;' on console. (See 'man 1
-# pgbouncer'.)
-FORCE_QUIT="no"
-FORCE_QUIT_TIMEOUT=2
\ No newline at end of file
diff --git a/dev-db/pgbouncer/files/pgbouncer.initd-r1 b/dev-db/pgbouncer/files/pgbouncer.initd-r1
deleted file mode 100755
index 7392918593bb..000000000000
--- a/dev-db/pgbouncer/files/pgbouncer.initd-r1
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/sbin/openrc-run
-
-extra_started_commands="reload"
-
-PIDFILE="/run/pgbouncer.pid"
-
-depend() {
-    use net
-    after postgresql
-}
-
-get_config() {
-    [ -f "${INIFILE}" ] || eend 1 "'${INIFILE}' not found"
-
-    eval echo $(sed -e 's:;.*::' "${INIFILE}" | \
-                    awk '$1 == "'$1'" { print ($2 == "=" ? $3 : $2) }')
-}
-
-start_pre() {
-    local s="$(get_config unix_socket_dir)"
-
-    if [ -n "${s}" ] ; then
-        checkpath -o root:postgres -m 1775 -d "${s}" || return 1
-
-        local listen_port="$(get_config listen_port)"
-
-        if [ -e "${s%/}/.s.PGSQL.${listen_port}" ] ; then
-            eerror "Socket conflict."
-            eerror "A server is already listening on:"
-            eerror "    ${s%/}/.s.PGSQL.${listen_port}"
-            eerror "HINT: Change listen_port in pgbouncer.ini to listen on a"
-            eerror "different socket."
-            return 1
-        fi
-    fi
-
-    checkpath -o pgbouncer:postgres -m 0755 \
-              -d "$(dirname $(get_config logfile))" || return 1
-    checkpath -o pgbouncer:postgres -m 0640 \
-              -f "$(get_config logfile)" || return 1
-
-    return 0
-}
-
-start() {
-    ebegin "Starting PgBouncer"
-    [ -f ${PIDFILE} ] && rm ${PIDFILE}
-
-    start-stop-daemon --start \
-                      --pidfile ${PIDFILE} \
-                      --background \
-                      --make-pidfile \
-                      --user pgbouncer \
-                      --exec /usr/bin/pgbouncer \
-                      -- -q "${INIFILE}"
-    eend $?
-}
-
-stop() {
-    local seconds=$(( ${NICE_TIMEOUT} + ${FORCE_QUIT_TIMEOUT} ))
-    ebegin "Stopping PgBouncer (this can take up to ${seconds} seconds)"
-
-    local retries=SIGINT/${NICE_TIMEOUT}
-
-    if [ "${FORCE_QUIT}" = "YES" ] ; then
-        einfo "FORCE_QUIT enabled."
-        retries="${retries}/SIGTERM/${FORCE_QUIT_TIMEOUT}"
-    fi
-
-    # Loops through nice and force quit in one go.
-    start-stop-daemon --stop \
-                      --user pgbouncer \
-                      --pidfile ${PIDFILE} \
-                      --retry ${retries}
-
-    eend $?
-}
-
-reload() {
-    ebegin "Reloading PgBouncer configuration from '${INIFILE}'"
-    start-stop-daemon --signal HUP --pidfile ${PIDFILE}
-    eend $?
-}
diff --git a/dev-db/pgbouncer/pgbouncer-1.8.1.ebuild b/dev-db/pgbouncer/pgbouncer-1.8.1.ebuild
deleted file mode 100644
index f590a731732e..000000000000
--- a/dev-db/pgbouncer/pgbouncer-1.8.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 user
-
-DESCRIPTION="Lightweight connection pooler for PostgreSQL"
-HOMEPAGE="https://pgbouncer.github.io"
-SRC_URI="https://pgbouncer.github.io/downloads/files/${PV}/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+c-ares debug doc pam ssl -udns"
-
-# At-most-one-of, one can be enabled but not both
-REQUIRED_USE="?? ( c-ares udns )"
-
-RDEPEND="
-	>=dev-libs/libevent-2.0
-	>=sys-libs/glibc-2.10
-	c-ares? ( >=net-dns/c-ares-1.10 )
-	ssl? ( >=dev-libs/openssl-1.0.1:=[-bindist] )
-	udns? ( >=net-libs/udns-0.1 )
-"
-
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-
-	enewuser pgbouncer -1 -1 -1 postgres
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/pgbouncer-1.8-dirs.patch"
-
-	default
-}
-
-src_configure() {
-	# --enable-debug is only used to disable stripping
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--enable-debug \
-		$(use_with c-ares cares) \
-		$(use_enable debug cassert) \
-		$(use_with pam) \
-		$(use_with ssl openssl) \
-		$(use_with udns)
-}
-
-src_test() {
-	cd "${S}/test"
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS
-	use doc && dodoc doc/*.rst
-
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	newinitd "${FILESDIR}/${PN}.initd-r1" "${PN}"
-
-	insinto /etc
-	doins etc/pgbouncer.ini
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate" pgbouncer
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		einfo "Please read the config.txt for Configuration Directives"
-		einfo
-		einfo "For Administration Commands, see:"
-		einfo "    man pgbouncer"
-		einfo
-		einfo "By default, PgBouncer does not have access to any database."
-		einfo "GRANT the permissions needed for your application and make sure that it"
-		einfo "exists in PgBouncer's auth_file."
-	fi
-}
diff --git a/dev-db/pgbouncer/pgbouncer-1.9.0.ebuild b/dev-db/pgbouncer/pgbouncer-1.9.0.ebuild
index 46b5a23edb21..258f5cb8675a 100644
--- a/dev-db/pgbouncer/pgbouncer-1.9.0.ebuild
+++ b/dev-db/pgbouncer/pgbouncer-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"
@@ -10,7 +10,7 @@ HOMEPAGE="https://pgbouncer.github.io"
 SRC_URI="https://pgbouncer.github.io/downloads/files/${PV}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+c-ares debug doc pam ssl -udns"
 
 # At-most-one-of, one can be enabled but not both
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 0b304affcd8d..6a67831df231 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -6,12 +6,21 @@ AUX sqlite-3.23.1-nonfull_archive-prohibit_bound_parameters_in_arguments_to_tabl
 AUX sqlite-3.24.0-full_archive-archive_command_paths_handling.patch 431 BLAKE2B f2ed5b15db753821cef0a51c1301bb79c3fabc908c328ac33b21cef594f068b2f19863cbae4a909e19b7370c5a2c20839edffb407ba1f1946b407672f7bb4fd7 SHA512 d8449092d5892398fd827973d18f7eff189562b70fb5ea93e41a0789a573945c7555b602ec0b73df66af597c6ada79c73edeecb3d496ccbd8b29f05a05871089
 AUX sqlite-3.24.0-full_archive-build.patch 13851 BLAKE2B cc40445f0ef248d21fb40500186614a7092abaa174db63710471c8aae2bf435f8ffd62a7b8332785a8ebe29bad39469ab3ea03d9c8287576c83a927df02b9102 SHA512 e6c6d5545ea7578952bbadef324ca8ee988542917ee314e6da69db69fb5727493bd36f55aa9dd0cece21ec8d9235361b12a87ce768849596cee9a5bf98cb0a5d
 AUX sqlite-3.24.0-nonfull_archive-archive_command_paths_handling.patch 419 BLAKE2B 378e99da6cca145c69bb8fd883f69ae7e82964ed67ac4ad16f89e3a80fe863cfe67b3c68e79c6fa48170b222589f7b0bdd0f623ca8c12732d5c4f93b6b235164 SHA512 29aa164628870e4e002f5a5819f808dcd66da2f84e4202303ebd1eebc3ace5cdad19af60879de54ea5ca05b23e68337a3f4ee3401866197ad3046dd17941f263
+AUX sqlite-3.25.0-full_archive-build.patch 13864 BLAKE2B e60fba6a84659b658dfb3cbb9f3e2fdab28cf928329f20cdfb1a2aab5ba8162f25f0b0fb3610259c5a8263a0901c9e30dbdd6d7bb4654146deeb0c9fdd44496b SHA512 37416842348a7cae5a61365977eb77e1db86b68be3ead7b69090df56a5a87b856569c224a1bc85cc0ff599c62077c3f8eabdf4071fa0c919bf139e8f579c2dbb
+AUX sqlite-3.25.0-nonfull_archive-build.patch 416 BLAKE2B 37faa30235c1b668d3cf510c353730a932a807f650c638ac0d07d3a1c0534dedef233c06cef52b6569eb1d58b5bcd910dd59c8d2e792726945f49f882d4181be SHA512 44db89a32b51713cf59fb3f071cca08648deebf6e2830dd61b033a5160ce6ddcbf54a191be42b3b252ea4bc16614fbcfa569207f34f268f1da5acd5fadcda668
+AUX sqlite-3.25.2-full_archive-disallow_window_functions_in_recursive_queries.patch 1481 BLAKE2B 01c7d129328820c2c0ad8ebd74bf4222eae131f493d6db968312d8b76def9c024b654de5d2a4d0c87119a1d073717879d4610a7819244a72d8894218123347cc SHA512 7ef354b8633d2a6d58e7a99acbd41d353ab83eac6f08a1998763a366a2cbbac3e2fdd6be24903e1fe403180a512d5fa7311db2299001be4e7583ea70069a980a
+AUX sqlite-3.25.2-full_archive-tests.patch 1549 BLAKE2B e17fa8e556518f6c4d22b225b721e9f2592a111f8960374c4aee326daf7a1bdfcefc7c6415f8d03a0f6c1f69544ea031a067b5c24bc24bbf20e9d20c9a56a0c6 SHA512 f448c8b77f01ede8b6b63a583916bd1ef9d75d6b71340e43a694dd0d888e4de0bd7cd10c1de0ee64903048f86544c9a88de5fb7b9c0aebfa159e62aae6df4f4b
+AUX sqlite-3.25.2-nonfull_archive-disallow_window_functions_in_recursive_queries.patch 572 BLAKE2B cc91956ea6d2187c3a3f2f15384173624383958e222b4a6d5f5f16494fa2a602a952054b1d670e043a8eab46c338404101ef6d58f50584999d6d3edf3997ed43 SHA512 e8461af692241475501b291754479e035a38edcdde99c086f069d75b6c2527e74abd606d4fb1551a5d7be4c80d9b21aea10d6dae6fb5b0b7fcbb003ac94b3583
 DIST sqlite-autoconf-3230100.tar.gz 2675362 BLAKE2B 2dd075f0dc05425563a8e679bb463724296294b5845746f06b51a24c9601be203ee0f2213f43eaca0757fcbb54b777cee746d873c98f377a0b010d8066d7fcb5 SHA512 52cae7ed0678b763d40373ae260672b906861379428529a58a017cbc82419a6b109e0b2ac7ff5532e6d941693cc4ab68e6563f424b92b3b27c8916859a6e4826
 DIST sqlite-autoconf-3240000.tar.gz 2699252 BLAKE2B c8beb3b90bdd06f76cafeba859cbf91cf4d0cb313fc9202d210ccbad5fca7f9a062ede63387e814d664f0ae38bcfa48db222f466dbcd429fecfb53cfdac155c4 SHA512 eaec866de26003ec36559aab15dd18dc0e6029453002a4eec5e176bb35a712b8b06c235436e6c1a226b67c7eb90d7a26c2b3b3d9a5e6e92a5af485236b77c878
+DIST sqlite-autoconf-3250200.tar.gz 2763876 BLAKE2B 3d97cc60edf8f91855215bd59260362665c8ec7699510f2e07c7ba57e10c400dcc99bb392e216f798bef1ffa7120b48ee62ce144a871741ef57b3aefeab875d6 SHA512 5ef9a6dfbb0822257af1a3a379785a95ab02edecbbb53b57074ddd0b8dc294fc07cbb9a8a7acc4e1640fb1743525ed6331fecebbddce01bc017330b20e127ad9
 DIST sqlite-doc-3230100.zip 8882546 BLAKE2B 1e80647e3789b9130a93e881933fb1260794d9ccf359969a16bdeb0df5a51787eaf8404641c4b760bedd45063d46f8874fd74a4da1fef0234f3d8e92db754d76 SHA512 d3a42621480a928446c5f71d0f2ee68e245b071971da38438f9070bd5bcbe1930ea5bd20e06c68543df75badd2e4565abc94420df50b7152c9cd129587471471
 DIST sqlite-doc-3240000.zip 9030826 BLAKE2B 4444e3dd0ce782e19fa01c881e0b5453723419ef1cf95cbe751d759a264bbe288a5c23a2b6514ed459b99b11637349c02def68fed7df8625bfc161307e44564c SHA512 31e9046cea569d7ad1b3af176e1bb18cd59474afb6849871ead6e7c9c096f046162fb313a38684a8c944fad9f689c4c3c692be1d7dc6a8ef5a6685bbc7dfdab6
+DIST sqlite-doc-3250200.zip 9229732 BLAKE2B 9bc4499c2934d15428dd30e0522362a2c2e703061c293f1b657f01d3945612760be3b4f145ddf76d9cf87953fae26884646887e53c0c55683ce42bc239dcf952 SHA512 a0b764ca0eea0e9719d46b6e1f92db78578457c8331976d4712c56cd10fc062fd73629686a0e45dfdeb505fbfbe0c53652a5e64507702ff4e12b62a2fc8d8211
 DIST sqlite-src-3230100.zip 10849436 BLAKE2B 6bed0a45c83ddb51d665835d174f623b30b1c3b81562fdea2317b58d876a0852136fe4f8a3ebc7679676f366e19c84d0ad2f54d3d8c73712145099975f80cf1a SHA512 69a87b76860c3b172d9e68b0fc0b8c157b606375e2b7d793ce4bd4b898ef737cd721189bc6a3342c749e224e60fa96203d449668c49dff2ebdc682b49630a59b
 DIST sqlite-src-3240000.zip 10980065 BLAKE2B 201a59cb34271e5ac79e96e4e2ea64f8b61aa99c44eedf61c0a21752ad4376caaf7980a6923dca66266b1a315d9867871d0d172c17907b4147c15431aa212a70 SHA512 812c2df7179abb1e445b5b3e161c940b120c53366a7b2c1f0bfc3599cd9921e5543ba39ca3f297eeaefec318f10c15f630f00f9cf04133c7cd419a04f3bbdd0e
+DIST sqlite-src-3250200.zip 11381811 BLAKE2B 6183436f66c862c32d1dfd59ea4ccb5eaf3dd516ffcf9d7edf786e8fbf56eff3cb84d08e291b2e86fae25e537bed452aed693bdb0f0d6bb6581da86641013557 SHA512 7354af2d45c574ba867fab8aabc6ff903279f028aebed50c71019066df78f61a0b941564c572c87b0f3ed3e5783bf325a690a9957d775228fbbb293dd9a5ad37
 EBUILD sqlite-3.23.1.ebuild 9703 BLAKE2B 4e6cb6336b1bad31d56cdb3a1ea3ca32323b4280caaaa053221e1e405ea2edbd552860ee89934f66d68d19425f0632bea45eea33595cfb6f7e95c5b4bf5eb1d5 SHA512 7fa4f6ab562af73f00338da2e6aaef80751dfd7071c21abf64647cbf68b8e2180e524574c2f0bc38cf138bc8dd3edb7c75f4b3f2a28f788fe0cf108a158ef44f
 EBUILD sqlite-3.24.0.ebuild 9524 BLAKE2B dd5bd95346b77d111c1784a69feb6d44170375c82d7734420587d00fcc1f987fdb7676200f988c683606b856008f198b22999a8dd208a275b625702ba0341fae SHA512 0393124beded522a17bdd4f5690d0022f9646069ce735d79c316597743b036a06c0bd5a77635b428a78954920551876e10e55d1498305ec857b5d7eb2d4b05fd
+EBUILD sqlite-3.25.2.ebuild 9870 BLAKE2B 235bbb1eec1d35a1babb2bcfd4daa3f34fe69d4e5973b5fda452df9965bd083a64d15c273d89f25eb2168a72efb615606dcc0698e5e35787e070b16e186e491e SHA512 f467e23b508f8a2d7729f6bf02529b151b15d8b90dbf432512a1f2b122f2a3b2ce1135378dc57b7335d20153309e50df950e3150e05b01d9f068fd18a5a25575
 MISC metadata.xml 723 BLAKE2B 8866fbde770e7b8582de27303c72df047db80e0d70b1a1ceca0951a05b51bb704452071ceb6c29ecf3704d523888351615d1798aaab092e6b7505d4c6e3698ad SHA512 40616710b1d4edd3e24b5ac0797c1c9b606aeacac9f9543722bc9529e7c2c704a0c10b0ca68a5ba6e0a0ee8bc605212e8a49a050c8687afbdd7dbf28d6d4506a
diff --git a/dev-db/sqlite/files/sqlite-3.25.0-full_archive-build.patch b/dev-db/sqlite/files/sqlite-3.25.0-full_archive-build.patch
new file mode 100644
index 000000000000..d39d843d12c0
--- /dev/null
+++ b/dev-db/sqlite/files/sqlite-3.25.0-full_archive-build.patch
@@ -0,0 +1,407 @@
+Move some code to libsqlite3.so to avoid duplication.
+Link executables against libsqlite3.so.
+Increase timeout for fuzzcheck.
+Fix building with dlopen() not available.
+
+--- /Makefile.in
++++ /Makefile.in
+@@ -310,6 +310,9 @@
+ # Source code for extensions
+ #
+ SRC += \
++  $(TOP)/ext/expert/sqlite3expert.c \
++  $(TOP)/ext/expert/sqlite3expert.h
++SRC += \
+   $(TOP)/ext/fts1/fts1.c \
+   $(TOP)/ext/fts1/fts1.h \
+   $(TOP)/ext/fts1/fts1_hash.c \
+@@ -359,8 +362,11 @@
+   $(TOP)/ext/rbu/sqlite3rbu.h \
+   $(TOP)/ext/rbu/sqlite3rbu.c
+ SRC += \
++  $(TOP)/ext/misc/appendvfs.c \
+   $(TOP)/ext/misc/json1.c \
+-  $(TOP)/ext/misc/stmt.c
++  $(TOP)/ext/misc/sqlar.c \
++  $(TOP)/ext/misc/stmt.c \
++  $(TOP)/ext/misc/zipfile.c
+ 
+ # Generated source code files
+ #
+@@ -430,7 +436,6 @@
+ # Statically linked extensions
+ #
+ TESTSRC += \
+-  $(TOP)/ext/expert/sqlite3expert.c \
+   $(TOP)/ext/expert/test_expert.c \
+   $(TOP)/ext/misc/amatch.c \
+   $(TOP)/ext/misc/carray.c \
+@@ -453,8 +458,7 @@
+   $(TOP)/ext/misc/spellfix.c \
+   $(TOP)/ext/misc/totype.c \
+   $(TOP)/ext/misc/unionvtab.c \
+-  $(TOP)/ext/misc/wholenumber.c \
+-  $(TOP)/ext/misc/zipfile.c
++  $(TOP)/ext/misc/wholenumber.c
+ 
+ # Source code to the library files needed by the test fixture
+ #
+@@ -620,25 +624,25 @@
+ 
+ libtclsqlite3.la:	tclsqlite.lo libsqlite3.la
+ 	$(LTLINK) -no-undefined -o $@ tclsqlite.lo \
+-		libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \
++		libsqlite3.la @TCL_STUB_LIB_SPEC@ \
+ 		-rpath "$(TCLLIBDIR)" \
+ 		-version-info "8:6:8" \
+ 		-avoid-version
+ 
+-sqlite3$(TEXE):	shell.c sqlite3.c
+-	$(LTLINK) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \
+-		shell.c sqlite3.c \
+-		$(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
++sqlite3$(TEXE):	shell.c libsqlite3.la
++	$(LTLINK) $(READLINE_FLAGS) -o $@ \
++		shell.c libsqlite3.la \
++		$(LIBREADLINE)
+ 
+-sqldiff$(TEXE):	$(TOP)/tool/sqldiff.c sqlite3.lo sqlite3.h
+-	$(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.lo $(TLIBS)
++sqldiff$(TEXE):	$(TOP)/tool/sqldiff.c libsqlite3.la
++	$(LTLINK) -o $@ $(TOP)/tool/sqldiff.c libsqlite3.la
+ 
+-dbhash$(TEXE):	$(TOP)/tool/dbhash.c sqlite3.lo sqlite3.h
+-	$(LTLINK) -o $@ $(TOP)/tool/dbhash.c sqlite3.lo $(TLIBS)
++dbhash$(TEXE):	$(TOP)/tool/dbhash.c libsqlite3.la
++	$(LTLINK) -o $@ $(TOP)/tool/dbhash.c libsqlite3.la
+ 
+-scrub$(TEXE):	$(TOP)/ext/misc/scrub.c sqlite3.lo
++scrub$(TEXE):	$(TOP)/ext/misc/scrub.c libsqlite3.la
+ 	$(LTLINK) -o $@ -I. -DSCRUB_STANDALONE \
+-		$(TOP)/ext/misc/scrub.c sqlite3.lo $(TLIBS)
++		$(TOP)/ext/misc/scrub.c libsqlite3.la
+ 
+ srcck1$(BEXE):	$(TOP)/tool/srcck1.c
+ 	$(BCC) -o srcck1$(BEXE) $(TOP)/tool/srcck1.c
+@@ -717,7 +721,7 @@
+ # Rule to build the amalgamation
+ #
+ sqlite3.lo:	sqlite3.c
+-	$(LTCOMPILE) $(TEMP_STORE) -c sqlite3.c
++	$(LTCOMPILE) $(SHELL_OPT) $(TEMP_STORE) -c sqlite3.c
+ 
+ # Rules to build the LEMON compiler generator
+ #
+@@ -1017,14 +1021,9 @@
+ # Source files that go into making shell.c
+ SHELL_SRC = \
+ 	$(TOP)/src/shell.c.in \
+-        $(TOP)/ext/misc/appendvfs.c \
+ 	$(TOP)/ext/misc/shathree.c \
+ 	$(TOP)/ext/misc/fileio.c \
+ 	$(TOP)/ext/misc/completion.c \
+-	$(TOP)/ext/misc/sqlar.c \
+-	$(TOP)/ext/expert/sqlite3expert.c \
+-	$(TOP)/ext/expert/sqlite3expert.h \
+-	$(TOP)/ext/misc/zipfile.c \
+         $(TOP)/src/test_windirent.c
+ 
+ shell.c:	$(SHELL_SRC) $(TOP)/tool/mkshellc.tcl
+@@ -1183,15 +1182,15 @@
+ 
+ # Fuzz testing
+ fuzztest:	fuzzcheck$(TEXE) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db
+-	./fuzzcheck$(TEXE) $(FUZZDATA)
++	./fuzzcheck$(TEXE) --timeout 3600 $(FUZZDATA)
+ 	./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db
+ 
+ fastfuzztest:	fuzzcheck$(TEXE) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db
+-	./fuzzcheck$(TEXE) --limit-mem 100M $(FUZZDATA)
++	./fuzzcheck$(TEXE) --limit-mem 100M --timeout 3600 $(FUZZDATA)
+ 	./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db
+ 
+ valgrindfuzz:	fuzzcheck$(TEXT) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db
+-	valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 600 $(FUZZDATA)
++	valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 3600 $(FUZZDATA)
+ 	valgrind ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db
+ 
+ # The veryquick.test TCL tests.
+@@ -1222,24 +1221,23 @@
+ smoketest:	$(TESTPROGS) fuzzcheck$(TEXE)
+ 	./testfixture$(TEXE) $(TOP)/test/main.test $(TESTOPTS)
+ 
+-sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in
++sqlite3_analyzer.c:	$(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in
+ 	$(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in >sqlite3_analyzer.c
+ 
+-sqlite3_analyzer$(TEXE): sqlite3_analyzer.c
+-	$(LTLINK) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS)
++sqlite3_analyzer$(TEXE):	sqlite3_analyzer.c libsqlite3.la
++	$(LTLINK) sqlite3_analyzer.c -o $@ libsqlite3.la $(LIBTCL)
+ 
+-sqltclsh.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/ext/misc/appendvfs.c $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in	
++sqltclsh.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in	
+ 	$(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in >sqltclsh.c
+ 
+-sqltclsh$(TEXE): sqltclsh.c
+-	$(LTLINK) sqltclsh.c -o $@ $(LIBTCL) $(TLIBS)
++sqltclsh$(TEXE): sqltclsh.c libsqlite3.la
++	$(LTLINK) sqltclsh.c -o $@ libsqlite3.la $(LIBTCL)
+ 
+-sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c
+-	$(LTLINK)	$(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c -o sqlite3_expert $(TLIBS)
++sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/expert.c libsqlite3.la
++	$(LTLINK) $(TOP)/ext/expert/expert.c -o sqlite3_expert libsqlite3.la
+ 
+ CHECKER_DEPS =\
+   $(TOP)/tool/mkccode.tcl \
+-  sqlite3.c \
+   $(TOP)/src/tclsqlite.c \
+   $(TOP)/ext/repair/sqlite3_checker.tcl \
+   $(TOP)/ext/repair/checkindex.c \
+@@ -1250,30 +1248,30 @@
+ sqlite3_checker.c:	$(CHECKER_DEPS)
+ 	$(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/ext/repair/sqlite3_checker.c.in >$@
+ 
+-sqlite3_checker$(TEXE):	sqlite3_checker.c
+-	$(LTLINK) sqlite3_checker.c -o $@ $(LIBTCL) $(TLIBS)
++sqlite3_checker$(TEXE):	sqlite3_checker.c libsqlite3.la
++	$(LTLINK) sqlite3_checker.c -o $@ libsqlite3.la $(LIBTCL)
+ 
+-dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c sqlite3.lo
++dbdump$(TEXE):	$(TOP)/ext/misc/dbdump.c libsqlite3.la
+ 	$(LTLINK) -DDBDUMP_STANDALONE -o $@ \
+-           $(TOP)/ext/misc/dbdump.c sqlite3.lo $(TLIBS)
++           $(TOP)/ext/misc/dbdump.c libsqlite3.la
+ 
+-showdb$(TEXE):	$(TOP)/tool/showdb.c sqlite3.lo
+-	$(LTLINK) -o $@ $(TOP)/tool/showdb.c sqlite3.lo $(TLIBS)
++showdb$(TEXE):	$(TOP)/tool/showdb.c libsqlite3.la
++	$(LTLINK) -o $@ $(TOP)/tool/showdb.c libsqlite3.la
+ 
+-showstat4$(TEXE):	$(TOP)/tool/showstat4.c sqlite3.lo
+-	$(LTLINK) -o $@ $(TOP)/tool/showstat4.c sqlite3.lo $(TLIBS)
++showstat4$(TEXE):	$(TOP)/tool/showstat4.c libsqlite3.la
++	$(LTLINK) -o $@ $(TOP)/tool/showstat4.c libsqlite3.la
+ 
+-showjournal$(TEXE):	$(TOP)/tool/showjournal.c sqlite3.lo
+-	$(LTLINK) -o $@ $(TOP)/tool/showjournal.c sqlite3.lo $(TLIBS)
++showjournal$(TEXE):	$(TOP)/tool/showjournal.c
++	$(LTLINK) -o $@ $(TOP)/tool/showjournal.c
+ 
+-showwal$(TEXE):	$(TOP)/tool/showwal.c sqlite3.lo
+-	$(LTLINK) -o $@ $(TOP)/tool/showwal.c sqlite3.lo $(TLIBS)
++showwal$(TEXE):	$(TOP)/tool/showwal.c
++	$(LTLINK) -o $@ $(TOP)/tool/showwal.c
+ 
+ showshm$(TEXE):	$(TOP)/tool/showshm.c
+ 	$(LTLINK) -o $@ $(TOP)/tool/showshm.c
+ 
+-changeset$(TEXE):	$(TOP)/ext/session/changeset.c sqlite3.lo
+-	$(LTLINK) -o $@ $(TOP)/ext/session/changeset.c sqlite3.lo $(TLIBS)
++changeset$(TEXE):	$(TOP)/ext/session/changeset.c libsqlite3.la
++	$(LTLINK) -o $@ $(TOP)/ext/session/changeset.c libsqlite3.la
+ 
+ rollback-test$(TEXE):	$(TOP)/tool/rollback-test.c sqlite3.lo
+ 	$(LTLINK) -o $@ $(TOP)/tool/rollback-test.c sqlite3.lo $(TLIBS)
+@@ -1295,11 +1293,11 @@
+ kvtest$(TEXE):	$(TOP)/test/kvtest.c sqlite3.c
+ 	$(LTLINK) $(KV_OPT) -o $@ $(TOP)/test/kvtest.c sqlite3.c $(TLIBS)
+ 
+-rbu$(EXE): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.lo 
+-	$(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c sqlite3.lo $(TLIBS)
++rbu$(EXE):	$(TOP)/ext/rbu/rbu.c libsqlite3.la
++	$(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c libsqlite3.la
+ 
+-loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
+-	$(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS)
++loadfts$(EXE):	$(TOP)/tool/loadfts.c libsqlite3.la
++	$(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@
+ 
+ # This target will fail if the SQLite amalgamation contains any exported
+ # symbols that do not begin with "sqlite3_". It is run as part of the
+--- /configure.ac
++++ /configure.ac
+@@ -587,6 +587,9 @@
+ if test "${enable_load_extension}" = "yes" ; then
+   OPT_FEATURE_FLAGS=""
+   AC_SEARCH_LIBS(dlopen, dl)
++  if test "${ac_cv_search_dlopen}" = "no" ; then
++    OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
++  fi
+ else
+   OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
+ fi
+--- /ext/misc/sqlar.c
++++ /ext/misc/sqlar.c
+@@ -14,6 +14,8 @@
+ ** for working with sqlar archives and used by the shell tool's built-in
+ ** sqlar support.
+ */
++#ifdef SQLITE_HAVE_ZLIB
++
+ #include "sqlite3ext.h"
+ SQLITE_EXTENSION_INIT1
+ #include <zlib.h>
+@@ -119,3 +121,5 @@
+   }
+   return rc;
+ }
++
++#endif /* SQLITE_HAVE_ZLIB */
+--- /ext/misc/zipfile.c
++++ /ext/misc/zipfile.c
+@@ -24,6 +24,8 @@
+ **    *  No support for zip64 extensions
+ **    *  Only the "inflate/deflate" (zlib) compression method is supported
+ */
++#ifdef SQLITE_HAVE_ZLIB
++
+ #include "sqlite3ext.h"
+ SQLITE_EXTENSION_INIT1
+ #include <stdio.h>
+@@ -2175,3 +2177,5 @@
+   (void)pzErrMsg;  /* Unused parameter */
+   return zipfileRegister(db);
+ }
++
++#endif /* SQLITE_HAVE_ZLIB */
+--- /ext/repair/sqlite3_checker.c.in
++++ /ext/repair/sqlite3_checker.c.in
+@@ -2,6 +2,7 @@
+ ** Read an SQLite database file and analyze its space utilization.  Generate
+ ** text on standard output.
+ */
++#define SQLITE_CORE 1
+ #define TCLSH_INIT_PROC sqlite3_checker_init_proc
+ #define SQLITE_ENABLE_DBPAGE_VTAB 1
+ #define SQLITE_ENABLE_JSON1 1
+@@ -14,7 +15,7 @@
+ #define SQLITE_OMIT_SHARED_CACHE 1
+ #define SQLITE_DEFAULT_MEMSTATUS 0
+ #define SQLITE_MAX_EXPR_DEPTH 0
+-INCLUDE sqlite3.c
++#include "sqlite3.h"
+ INCLUDE $ROOT/src/tclsqlite.c
+ INCLUDE $ROOT/ext/misc/btreeinfo.c
+ INCLUDE $ROOT/ext/repair/checkindex.c
+--- /src/shell.c.in
++++ /src/shell.c.in
+@@ -61,6 +61,7 @@
+ #include <stdio.h>
+ #include <assert.h>
+ #include "sqlite3.h"
++#include "ext/expert/sqlite3expert.h"
+ typedef sqlite3_int64 i64;
+ typedef sqlite3_uint64 u64;
+ typedef unsigned char u8;
+@@ -127,6 +128,10 @@
+ # define SHELL_USE_LOCAL_GETLINE 1
+ #endif
+ 
++#ifdef SQLITE_HAVE_ZLIB
++#include <zlib.h>
++#endif
++
+ 
+ #if defined(_WIN32) || defined(WIN32)
+ # include <io.h>
+@@ -936,13 +941,6 @@
+ INCLUDE ../ext/misc/shathree.c
+ INCLUDE ../ext/misc/fileio.c
+ INCLUDE ../ext/misc/completion.c
+-INCLUDE ../ext/misc/appendvfs.c
+-#ifdef SQLITE_HAVE_ZLIB
+-INCLUDE ../ext/misc/zipfile.c
+-INCLUDE ../ext/misc/sqlar.c
+-#endif
+-INCLUDE ../ext/expert/sqlite3expert.h
+-INCLUDE ../ext/expert/sqlite3expert.c
+ 
+ #if defined(SQLITE_ENABLE_SESSION)
+ /*
+@@ -3654,7 +3652,9 @@
+     sqlite3_shathree_init(p->db, 0, 0);
+     sqlite3_completion_init(p->db, 0, 0);
+ #ifdef SQLITE_HAVE_ZLIB
++    extern int sqlite3_zipfile_init(sqlite3 *, char **, const sqlite3_api_routines *);
+     sqlite3_zipfile_init(p->db, 0, 0);
++    extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *);
+     sqlite3_sqlar_init(p->db, 0, 0);
+ #endif
+     sqlite3_create_function(p->db, "shell_add_schema", 3, SQLITE_UTF8, 0,
+@@ -5549,6 +5549,7 @@
+         goto end_ar_command;
+       }
+       sqlite3_fileio_init(cmd.db, 0, 0);
++      extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *);
+       sqlite3_sqlar_init(cmd.db, 0, 0);
+       sqlite3_create_function(cmd.db, "shell_putsnl", 1, SQLITE_UTF8, cmd.p,
+                               shellPutsFunc, 0, 0);
+@@ -8584,6 +8585,7 @@
+ #endif
+   }
+   data.out = stdout;
++  extern int sqlite3_appendvfs_init(sqlite3 *, char **, const sqlite3_api_routines *);
+   sqlite3_appendvfs_init(0,0,0);
+ 
+   /* Go ahead and open the database file if it already exists.  If the
+--- /tool/mksqlite3c.tcl
++++ /tool/mksqlite3c.tcl
+@@ -117,6 +117,7 @@
+    rtree.h
+    sqlite3session.h
+    sqlite3.h
++   sqlite3expert.h
+    sqlite3ext.h
+    sqlite3rbu.h
+    sqliteicu.h
+@@ -403,6 +404,10 @@
+    sqlite3session.c
+    fts5.c
+    stmt.c
++   appendvfs.c
++   sqlar.c
++   sqlite3expert.c
++   zipfile.c
+ } {
+   copy_file tsrc/$file
+ }
+--- /tool/sqlite3_analyzer.c.in
++++ /tool/sqlite3_analyzer.c.in
+@@ -14,9 +14,6 @@
+ #define SQLITE_DEFAULT_MEMSTATUS 0
+ #define SQLITE_MAX_EXPR_DEPTH 0
+ #define SQLITE_OMIT_LOAD_EXTENSION 1
+-#ifndef USE_EXTERNAL_SQLITE
+-INCLUDE sqlite3.c
+-#endif
+ INCLUDE $ROOT/src/tclsqlite.c
+ 
+ const char *sqlite3_analyzer_init_proc(Tcl_Interp *interp){
+--- /tool/sqltclsh.c.in
++++ /tool/sqltclsh.c.in
+@@ -27,19 +27,17 @@
+ #define SQLITE_OMIT_SHARED_CACHE 1
+ #define SQLITE_DEFAULT_MEMSTATUS 0
+ #define SQLITE_MAX_EXPR_DEPTH 0
+-INCLUDE sqlite3.c
+-INCLUDE $ROOT/ext/misc/appendvfs.c
+-#ifdef SQLITE_HAVE_ZLIB
+-INCLUDE $ROOT/ext/misc/zipfile.c
+-INCLUDE $ROOT/ext/misc/sqlar.c
+-#endif
++#include "sqlite3.h"
+ INCLUDE $ROOT/src/tclsqlite.c
+ 
+ const char *sqlite3_tclapp_init_proc(Tcl_Interp *interp){
+   (void)interp;
++  extern int sqlite3_appendvfs_init(sqlite3 *,char **, const sqlite3_api_routines *);
+   sqlite3_appendvfs_init(0,0,0);
+ #ifdef SQLITE_HAVE_ZLIB
++  extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *);
+   sqlite3_auto_extension((void(*)(void))sqlite3_sqlar_init);
++  extern int sqlite3_zipfile_init(sqlite3 *, char **, const sqlite3_api_routines *);
+   sqlite3_auto_extension((void(*)(void))sqlite3_zipfile_init);
+ #endif
+ 
diff --git a/dev-db/sqlite/files/sqlite-3.25.0-nonfull_archive-build.patch b/dev-db/sqlite/files/sqlite-3.25.0-nonfull_archive-build.patch
new file mode 100644
index 000000000000..be0a7e30dde3
--- /dev/null
+++ b/dev-db/sqlite/files/sqlite-3.25.0-nonfull_archive-build.patch
@@ -0,0 +1,14 @@
+Fix building with dlopen() not available.
+
+--- /configure.ac
++++ /configure.ac
+@@ -102,6 +102,9 @@
+   [], [enable_dynamic_extensions=yes])
+ if test x"$enable_dynamic_extensions" != "xno"; then
+   AC_SEARCH_LIBS(dlopen, dl)
++  if test "${ac_cv_search_dlopen}" = "no"; then
++    BUILD_CFLAGS="$BUILD_CFLAGS -DSQLITE_OMIT_LOAD_EXTENSION=1"
++  fi
+ else
+   BUILD_CFLAGS="$BUILD_CFLAGS -DSQLITE_OMIT_LOAD_EXTENSION=1"
+ fi
diff --git a/dev-db/sqlite/files/sqlite-3.25.2-full_archive-disallow_window_functions_in_recursive_queries.patch b/dev-db/sqlite/files/sqlite-3.25.2-full_archive-disallow_window_functions_in_recursive_queries.patch
new file mode 100644
index 000000000000..6b34e2e4f9d8
--- /dev/null
+++ b/dev-db/sqlite/files/sqlite-3.25.2-full_archive-disallow_window_functions_in_recursive_queries.patch
@@ -0,0 +1,49 @@
+https://sqlite.org/src/info/e8275b415a2f03bee
+https://sqlite.org/src/info/7fc2994434c7d9ed
+
+--- /src/select.c
++++ /src/select.c
+@@ -2318,6 +2318,13 @@
+   Expr *pLimit;                 /* Saved LIMIT and OFFSET */
+   int regLimit, regOffset;      /* Registers used by LIMIT and OFFSET */
+ 
++#ifndef SQLITE_OMIT_WINDOWFUNC
++  if( p->pWin ){
++    sqlite3ErrorMsg(pParse, "cannot use window functions in recursive queries");
++    return;
++  }
++#endif
++
+   /* Obtain authorization to do a recursive query */
+   if( sqlite3AuthCheck(pParse, SQLITE_RECURSIVE, 0, 0, 0) ) return;
+ 
+--- /test/with1.test
++++ /test/with1.test
+@@ -865,6 +865,27 @@
+   SELECT * FROM i;
+ } {1 {recursive aggregate queries not supported}}
+ 
++# Or window-function recursive queries. Ticket e8275b41.
++#
++ifcapable windowfunc {
++  do_catchsql_test 16.2 {
++    WITH RECURSIVE
++      i(x) AS (VALUES(1) UNION SELECT count(*) OVER () FROM i)
++      SELECT * FROM i;
++  } {1 {cannot use window functions in recursive queries}}
++  do_catchsql_test 16.3 {
++    WITH RECURSIVE
++      t(id, parent) AS (VALUES(1,2)),
++      q(id, parent, rn) AS (
++          VALUES(1,2,3)
++          UNION ALL
++          SELECT t.*, ROW_NUMBER() OVER (ORDER BY t.id) AS rn
++          FROM q JOIN t ON t.parent = q.id
++          )
++        SELECT * FROM q;
++  } {1 {cannot use window functions in recursive queries}}
++}
++
+ #-------------------------------------------------------------------------
+ do_execsql_test 17.1 {
+   WITH x(a) AS (
diff --git a/dev-db/sqlite/files/sqlite-3.25.2-full_archive-tests.patch b/dev-db/sqlite/files/sqlite-3.25.2-full_archive-tests.patch
new file mode 100644
index 000000000000..2868b3fc123b
--- /dev/null
+++ b/dev-db/sqlite/files/sqlite-3.25.2-full_archive-tests.patch
@@ -0,0 +1,70 @@
+https://sqlite.org/src/info/d04b2013b5436430
+
+--- /test/like3.test
++++ /test/like3.test
+@@ -130,12 +130,14 @@
+ do_execsql_test like3-5.110 {
+   SELECT x FROM t5a WHERE x LIKE '/a%';
+ } {/abc}
++ifcapable !icu {
+ do_eqp_test like3-5.111 {
+   SELECT x FROM t5a WHERE x LIKE '/a%';
+ } {
+   QUERY PLAN
+   `--SEARCH TABLE t5a USING COVERING INDEX sqlite_autoindex_t5a_1 (x>? AND x<?)
+ }
++}
+ do_execsql_test like3-5.120 {
+   SELECT x FROM t5a WHERE x LIKE '^12%' ESCAPE '^';
+ } {123}
+--- /test/window6.test
++++ /test/window6.test
+@@ -147,17 +147,17 @@
+ #-------------------------------------------------------------------------
+ #
+ 
+-do_execsql_test 6.0 {
+-  SELECT LIKE('!', '', '!') x WHERE x;
+-} {}
+-
+-do_execsql_test 6.1 {
+-  SELECT LIKE("!","","!")""WHeRE"";
+-} {}
+-
+-do_catchsql_test 6.2 {
+-  SELECT LIKE("!","","!")""window"";
+-} {1 {near "window": syntax error}}
++ifcapable !icu {
++  do_execsql_test 6.0 {
++    SELECT LIKE('!', '', '!') x WHERE x;
++  } {}
++  do_execsql_test 6.1 {
++    SELECT LIKE("!","","!")""WHeRE"";
++  } {}
++  do_catchsql_test 6.2 {
++    SELECT LIKE("!","","!")""window"";
++  } {1 {near "window": syntax error}}
++}
+ 
+ reset_db 
+ do_execsql_test 7.0 {
+@@ -166,9 +166,11 @@
+   INSERT INTO t1 VALUES('');
+ }
+ 
+-do_execsql_test 7.1 {
+-  SELECT count(*) FROM t1 WHERE x LIKE '!' ESCAPE '!';
+-} {0}
++ifcapable !icu {
++  do_execsql_test 7.1 {
++    SELECT count(*) FROM t1 WHERE x LIKE '!' ESCAPE '!';
++  } {0}
++}
+ 
+ #-------------------------------------------------------------------------
+ #
+@@ -336,4 +338,3 @@
+ }
+ 
+ finish_test
+-
diff --git a/dev-db/sqlite/files/sqlite-3.25.2-nonfull_archive-disallow_window_functions_in_recursive_queries.patch b/dev-db/sqlite/files/sqlite-3.25.2-nonfull_archive-disallow_window_functions_in_recursive_queries.patch
new file mode 100644
index 000000000000..4ee3d477cfc4
--- /dev/null
+++ b/dev-db/sqlite/files/sqlite-3.25.2-nonfull_archive-disallow_window_functions_in_recursive_queries.patch
@@ -0,0 +1,19 @@
+https://sqlite.org/src/info/e8275b415a2f03bee
+https://sqlite.org/src/info/7fc2994434c7d9ed
+
+--- /sqlite3.c
++++ /sqlite3.c
+@@ -125441,6 +125441,13 @@
+   Expr *pLimit;                 /* Saved LIMIT and OFFSET */
+   int regLimit, regOffset;      /* Registers used by LIMIT and OFFSET */
+ 
++#ifndef SQLITE_OMIT_WINDOWFUNC
++  if( p->pWin ){
++    sqlite3ErrorMsg(pParse, "cannot use window functions in recursive queries");
++    return;
++  }
++#endif
++
+   /* Obtain authorization to do a recursive query */
+   if( sqlite3AuthCheck(pParse, SQLITE_RECURSIVE, 0, 0, 0) ) return;
+ 
diff --git a/dev-db/sqlite/sqlite-3.25.2.ebuild b/dev-db/sqlite/sqlite-3.25.2.ebuild
new file mode 100644
index 000000000000..9ca3d39f36c1
--- /dev/null
+++ b/dev-db/sqlite/sqlite-3.25.2.ebuild
@@ -0,0 +1,322 @@
+# Copyright 1999-2018 Arfrever Frehtes Taifersar Arahesis and others
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+SRC_PV="$(printf "%u%02u%02u%02u" $(ver_rs 1- " "))"
+DOC_PV="${SRC_PV}"
+# DOC_PV="$(printf "%u%02u%02u00" $(ver_rs 1-3 " "))"
+
+DESCRIPTION="SQL database engine"
+HOMEPAGE="https://sqlite.org/"
+SRC_URI="doc? ( https://sqlite.org/2018/${PN}-doc-${DOC_PV}.zip )
+	tcl? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip )
+	test? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip )
+	tools? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip )
+	!tcl? ( !test? ( !tools? ( https://sqlite.org/2018/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )"
+
+LICENSE="public-domain"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
+RESTRICT="!test? ( test )"
+
+BDEPEND="doc? ( app-arch/unzip )
+	tcl? (
+		app-arch/unzip
+		>=dev-lang/tcl-8.6:0
+	)
+	test? (
+		app-arch/unzip
+		>=dev-lang/tcl-8.6:0
+	)
+	tools? (
+		app-arch/unzip
+		>=dev-lang/tcl-8.6:0
+	)"
+RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]
+	icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
+	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
+	tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
+	tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )"
+
+full_archive() {
+	use tcl || use test || use tools
+}
+
+pkg_setup() {
+	if full_archive; then
+		S="${WORKDIR}/${PN}-src-${SRC_PV}"
+	else
+		S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
+	fi
+}
+
+src_prepare() {
+	if full_archive; then
+		eapply "${FILESDIR}/${PN}-3.25.0-full_archive-build.patch"
+		eapply "${FILESDIR}/${PN}-3.25.2-full_archive-disallow_window_functions_in_recursive_queries.patch"
+		eapply "${FILESDIR}/${PN}-3.25.2-full_archive-tests.patch"
+
+		eapply_user
+
+		# Fix AC_CHECK_FUNCS.
+		# https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
+		sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac || die "sed failed"
+	else
+		eapply "${FILESDIR}/${PN}-3.25.0-nonfull_archive-build.patch"
+		eapply "${FILESDIR}/${PN}-3.25.2-nonfull_archive-disallow_window_functions_in_recursive_queries.patch"
+
+		eapply_user
+
+		# Fix AC_CHECK_FUNCS.
+		# https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
+		sed \
+			-e "s/AC_CHECK_FUNCS(\[fdatasync.*/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" \
+			-e "/AC_CHECK_FUNCS(posix_fallocate)/d" \
+			-i configure.ac || die "sed failed"
+	fi
+
+	eautoreconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" options=()
+
+	options+=(
+		--enable-$(full_archive && echo load-extension || echo dynamic-extensions)
+		--enable-threadsafe
+	)
+	if ! full_archive; then
+		options+=(--disable-static-shell)
+	fi
+
+	# Support detection of misuse of SQLite API.
+	# https://sqlite.org/compile.html#enable_api_armor
+	append-cppflags -DSQLITE_ENABLE_API_ARMOR
+
+	# Support column metadata functions.
+	# https://sqlite.org/c3ref/column_database_name.html
+	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
+
+	# Support sqlite_dbpage virtual table.
+	# https://sqlite.org/compile.html#enable_dbpage_vtab
+	append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB
+
+	# Support dbstat virtual table.
+	# https://sqlite.org/dbstat.html
+	append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
+
+	# Support sqlite3_serialize() and sqlite3_deserialize() functions.
+	# https://sqlite.org/compile.html#enable_deserialize
+	# https://sqlite.org/c3ref/serialize.html
+	# https://sqlite.org/c3ref/deserialize.html
+	append-cppflags -DSQLITE_ENABLE_DESERIALIZE
+
+	# Support comments in output of EXPLAIN.
+	# https://sqlite.org/compile.html#enable_explain_comments
+	append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS
+
+	# Support Full-Text Search versions 3, 4 and 5.
+	# https://sqlite.org/fts3.html
+	# https://sqlite.org/fts5.html
+	append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
+	options+=(--enable-fts5)
+
+	# Support hidden columns.
+	append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS
+
+	# Support JSON1 extension.
+	# https://sqlite.org/json1.html
+	append-cppflags -DSQLITE_ENABLE_JSON1
+
+	# Support memsys5 memory allocator.
+	# https://sqlite.org/malloc.html#memsys5
+	append-cppflags -DSQLITE_ENABLE_MEMSYS5
+
+	# Support sqlite_offset() function.
+	# https://sqlite.org/lang_corefunc.html#sqlite_offset
+	append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC
+
+	# Support pre-update hook functions.
+	# https://sqlite.org/c3ref/preupdate_count.html
+	append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK
+
+	# Support Resumable Bulk Update extension.
+	# https://sqlite.org/rbu.html
+	append-cppflags -DSQLITE_ENABLE_RBU
+
+	# Support R*Trees.
+	# https://sqlite.org/rtree.html
+	# https://sqlite.org/geopoly.html
+	append-cppflags -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY
+
+	# Support scan status functions.
+	# https://sqlite.org/c3ref/stmt_scanstatus.html
+	# https://sqlite.org/c3ref/stmt_scanstatus_reset.html
+	append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
+
+	# Support sqlite_stmt virtual table.
+	# https://sqlite.org/stmt.html
+	append-cppflags -DSQLITE_ENABLE_STMTVTAB
+
+	# Support Session extension.
+	# https://sqlite.org/sessionintro.html
+	options+=(--enable-session)
+
+	# Support unknown() function.
+	# https://sqlite.org/compile.html#enable_unknown_sql_function
+	append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
+
+	# Support unlock notification.
+	# https://sqlite.org/unlock_notify.html
+	append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
+
+	# Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements.
+	# https://sqlite.org/compile.html#enable_update_delete_limit
+	append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT
+
+	# Support PRAGMA function_list, PRAGMA module_list and PRAGMA pragma_list statements.
+	# https://sqlite.org/pragma.html#pragma_function_list
+	# https://sqlite.org/pragma.html#pragma_module_list
+	# https://sqlite.org/pragma.html#pragma_pragma_list
+	append-cppflags -DSQLITE_INTROSPECTION_PRAGMAS
+
+	# Support soundex() function.
+	# https://sqlite.org/lang_corefunc.html#soundex
+	append-cppflags -DSQLITE_SOUNDEX
+
+	# Support URI filenames.
+	# https://sqlite.org/uri.html
+	append-cppflags -DSQLITE_USE_URI
+
+	# debug USE flag.
+	if full_archive; then
+		options+=($(use_enable debug))
+	else
+		if use debug; then
+			append-cppflags -DSQLITE_DEBUG
+		else
+			append-cppflags -DNDEBUG
+		fi
+	fi
+
+	# icu USE flag.
+	if use icu; then
+		# Support ICU extension.
+		# https://sqlite.org/compile.html#enable_icu
+		append-cppflags -DSQLITE_ENABLE_ICU
+		if full_archive; then
+			sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+		else
+			sed -e "s/^LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+		fi
+	fi
+
+	# readline USE flag.
+	options+=(
+		--disable-editline
+		$(use_enable readline)
+	)
+	if full_archive && use readline; then
+		options+=(--with-readline-inc="-I${EPREFIX}/usr/include/readline")
+	fi
+
+	# secure-delete USE flag.
+	if use secure-delete; then
+		# Enable secure_delete pragma by default.
+		# https://sqlite.org/pragma.html#pragma_secure_delete
+		append-cppflags -DSQLITE_SECURE_DELETE
+	fi
+
+	# static-libs USE flag.
+	options+=($(use_enable static-libs static))
+
+	# tcl, test, tools USE flags.
+	if full_archive; then
+		options+=(--enable-tcl)
+	fi
+
+	if [[ "${CHOST}" == *-mint* ]]; then
+		append-cppflags -DSQLITE_OMIT_WAL
+	fi
+
+	if [[ "${ABI}" == "x86" ]]; then
+		if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then
+			append-cflags -mfpmath=sse
+		else
+			append-cflags -ffloat-store
+		fi
+	fi
+
+	econf "${options[@]}"
+}
+
+multilib_src_compile() {
+	emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
+
+	if use tools && multilib_is_native_abi; then
+		emake changeset dbdump dbhash rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh
+	fi
+}
+
+multilib_src_test() {
+	if [[ "${EUID}" -eq 0 ]]; then
+		ewarn "Skipping tests due to root permissions"
+		return
+	fi
+
+	emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
+
+	if use tools && multilib_is_native_abi; then
+		install_tool() {
+			if [[ -f ".libs/${1}" ]]; then
+				newbin ".libs/${1}" "${2}"
+			else
+				newbin "${1}" "${2}"
+			fi
+		}
+
+		install_tool changeset sqlite3-changeset
+		install_tool dbdump sqlite3-db-dump
+		install_tool dbhash sqlite3-db-hash
+		install_tool rbu sqlite3-rbu
+		install_tool scrub sqlite3-scrub
+		install_tool showdb sqlite3-show-db
+		install_tool showjournal sqlite3-show-journal
+		install_tool showshm sqlite3-show-shm
+		install_tool showstat4 sqlite3-show-stat4
+		install_tool showwal sqlite3-show-wal
+		install_tool sqldiff sqlite3-diff
+		install_tool sqlite3_analyzer sqlite3-analyzer
+		install_tool sqlite3_checker sqlite3-checker
+		install_tool sqlite3_expert sqlite3-expert
+		install_tool sqltclsh sqlite3-tclsh
+
+		unset -f install_tool
+	fi
+}
+
+multilib_src_install_all() {
+	find "${D}" -name "*.la" -delete || die
+
+	doman sqlite3.1
+
+	if use doc; then
+		rm "${WORKDIR}/${PN}-doc-${DOC_PV}/"*.{db,txt}
+		(
+			docinto html
+			dodoc -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"*
+		)
+	fi
+}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 9b0721e7a541..59facf37cecb 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 6f5af2646231..4832adcb2eee 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,11 +1,9 @@
-DIST protobuf-3.4.1.tar.gz 4490100 BLAKE2B e2bc1ef2ee1a0af44830b3c65a6c9e73883fe6ec0d07f6a6136f5564f0e85306005440ca6f8c4eb834c7c70f909792c9e2457a761f10f95431981263a9acd7a3 SHA512 471e52198fa878a79183dc8fbc39d9c65239be4d9dff799e12281ee9b1af61a427584534b1baae1773bc6e4c86467f89ca2e7911a21effd86bc5f40cc7d94c34
 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
 DIST protobuf-3.6.1.tar.gz 4485582 BLAKE2B 546c49759df784018459809b9db692c5c94aef5d717183af5cd9edd96b4c658e759f23950cdcd5dddceaaad06ea1de2a2357b9fa8c496ed5d538fc5920174da0 SHA512 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839
-EBUILD protobuf-java-3.4.1.ebuild 2083 BLAKE2B 0d8ddca861124a5d2869398b7c955338931baba25b478695deb569b224bde7d4b92d8e53a4871b78ef57e4f3d352ba7f03107008799a1e3a21109b49a35763b7 SHA512 2de4bb6979c348fa30528b0bf9c99dae2952d43c3b4485afed0068dbcf9803ab59a21f89b0a0f5bc8d3b6a0024ac85a856e97ea2e00cda93985705746cc9fb7f
-EBUILD protobuf-java-3.5.1.1.ebuild 2080 BLAKE2B 0e51dd999d692bfa8a663821c5e1d6bccb031e350e4da42208a99114c7154dca30aae4076e57db0b25761d0c1233c0e71904c6be171cefc19892a68856f2502b SHA512 8f203866faa74f44e8e6209d787f34c84fb0dc8847bdda30bbec0171a5b8133eff54ce3609bc41cc972a5a1848a36fa3fa53561836da3744db66b6d517ac9013
-EBUILD protobuf-java-3.5.2.ebuild 1799 BLAKE2B 9823ead3f3d611217a070907bae7d62a0e10b68a617c39af629ef48c1f83f840cf48588b21d6eca40e229f9e42ff05e2686ca973f4bdbd51a856612adae6a144 SHA512 c8df2c790f1584389c9d5a24d73c7ee0211e6c5b99d189fbfe483465bfdcd8a7e902c4025ace00bf59f7326fcec6f4c70b4c004f6bf656a6b260e24d61300a05
-EBUILD protobuf-java-3.6.0.1.ebuild 1097 BLAKE2B 2daec7aa9712be1a166a5281821adb1c29437824c28d6f79574c6ee7005c7e0576b0b39a86a661beedb3144b411309226ac052ada72c172613ced1480cf4bd7e SHA512 2deda95ada705bd49c281e839138c474c5183b67d12c9197da3772e3346d7d2637ab861a4000d0362b5e112c8728c9ac9251ffda031ee32e9dcaacf904267cc2
-EBUILD protobuf-java-3.6.1.ebuild 1097 BLAKE2B 03a214f5716dacf251b0b2827c26ed5c37f75d12e202d01a8f75fb26774245d36aa59ee36ca40a5ebc3be0af60a7406d3e0161ea3eb51e3062dfe85b657f0af3 SHA512 dd535ed4039aa48be10cc427005a3eca8d54434c33242c4e6bfd8e8f56a6310aa58980731cb0727b08909919bf38cfab776aeedf5454305a2ccfcd0fb0a65e2a
-MISC metadata.xml 796 BLAKE2B 730596798d9434732683c07bf8f4df861e3a2a4f0b681b642f6226e749729cbba260623c3d116e0dcc059fcce12df365e7ef1890139a570de37bf5d994d9035d SHA512 10479327785c7afbb86288465782b3c4af5b8901a5d63c7989bdebdecdda2ea44990b99cf74e0a1ed87d686e74991b65237a1e3e04b6b87bee510c70e810503b
+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
+MISC metadata.xml 805 BLAKE2B d90fd4afcd89ea87b592be42fa34d1279f2fc28b24c3891c2065b909b197927014c3e96d6cc88797b5cb9ccb087efdb2f3b31bb436bde3e7d6858cdacb714c3e SHA512 4bbb4b673edf832e0e5bd985d3d11e813d8512c31e79441c8b0321b4d40f89bf0a15b5bbcf12f3ef9294fa831c35b7dc518be1a86b2fb87eab173a6b2bccf476
diff --git a/dev-java/protobuf-java/metadata.xml b/dev-java/protobuf-java/metadata.xml
index 8ed30cca824b..0697e5cc44b2 100644
--- a/dev-java/protobuf-java/metadata.xml
+++ b/dev-java/protobuf-java/metadata.xml
@@ -20,6 +20,6 @@
 		<subslots>Soname version number of Protobuf</subslots>
 	</slots>
 	<upstream>
-		<remote-id type="github">google/protobuf</remote-id>
+		<remote-id type="github">protocolbuffers/protobuf</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/protobuf-java/protobuf-java-3.4.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.4.1.ebuild
deleted file mode 100644
index e5e3a7c4b5d7..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.4.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf"
-SRC_URI="https://github.com/google/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/14"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="nano"
-
-# Protobuf is only a build-time dep, but depends on the exact same version
-# (excluding revision), since we are using the same tarball.
-# But probably same subslot is sufficient.
-DEPEND=">=virtual/jdk-1.7
-	~dev-libs/protobuf-${PV}"
-
-RDEPEND=">=virtual/jre-1.7
-	!<dev-libs/protobuf-3[java(-)]"
-
-S="${WORKDIR}/protobuf-${PV}"
-
-src_prepare() {
-	default
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	pushd "${S}/java" >/dev/null || die
-	einfo "Compiling Java library ..."
-	"${EPREFIX}"/usr/bin/protoc --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
-	JAVA_SRC_DIR="${S}/java/core/src/main/java"
-	JAVA_JAR_FILENAME="protobuf.jar"
-	java-pkg-simple_src_compile
-	popd >/dev/null || die
-	if use nano; then
-		einfo "Compiling Java Nano library ..."
-		pushd "${S}/javanano" >/dev/null || die
-		"${EPREFIX}"/usr/bin/protoc --java_out=src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
-		JAVA_SRC_DIR="${S}/javanano/src/main/java"
-		JAVA_GENTOO_CLASSPATH_EXTRA="${S}/java/core/src/main/java/"
-		JAVA_JAR_FILENAME="protobuf-nano.jar"
-		java-pkg-simple_src_compile
-		popd >/dev/null || die
-	fi
-}
-
-src_install() {
-	JAVA_JAR_FILENAME="${S}/java/protobuf.jar"
-	JAVA_SRC_DIR="${S}/java/core/src/main/java"
-	if use nano; then
-		JAVA_JAR_FILENAME="${JAVA_JAR_FILENAME} ${S}/javanano/protobuf-nano.jar"
-		JAVA_SRC_DIR="${JAVA_SRC_DIR} ${S}/javanano/src/main/java"
-	fi
-	mv "${S}/java/target" . || die
-	if use nano; then
-		cp -Rvf "${S}/javanano/target" . || die
-	fi
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/protobuf-java/protobuf-java-3.5.1.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.5.1.1.ebuild
index d734039adfee..c0a6932d5146 100644
--- a/dev-java/protobuf-java/protobuf-java-3.5.1.1.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.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"
@@ -7,8 +7,8 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf"
-SRC_URI="https://github.com/google/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/15"
diff --git a/dev-java/protobuf-java/protobuf-java-3.5.2.ebuild b/dev-java/protobuf-java/protobuf-java-3.5.2.ebuild
index 77039bfd60d9..c60c8f9317b3 100644
--- a/dev-java/protobuf-java/protobuf-java-3.5.2.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.5.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,8 +7,8 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf"
-SRC_URI="https://github.com/google/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/15"
diff --git a/dev-java/protobuf-java/protobuf-java-3.6.0.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.6.0.1.ebuild
index a2440356fbdb..5c4309e854e0 100644
--- a/dev-java/protobuf-java/protobuf-java-3.6.0.1.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.6.0.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,8 +7,8 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf"
-SRC_URI="https://github.com/google/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/16"
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 d46192fa1762..798a81f93df2 100644
--- a/dev-java/protobuf-java/protobuf-java-3.6.1.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.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,8 +7,8 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf"
-SRC_URI="https://github.com/google/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/17"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 8e986282a739..4f701e802d33 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index b1a14529dd22..0f1b25539223 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -5,15 +5,19 @@ AUX epmd.service 138 BLAKE2B f56c907ec51bb85c437235334cf01c6a43ccf2316be3b226ab5
 AUX erlang-20.2-libressl-2.6.1.patch 4228 BLAKE2B 8c671d3aa8329562b274e6b9f233a3f93565f5a0f4491b83e7e57fb6881d0fbaaf955d7aa5537bdcfc85dbf4c979a3625aed2c203679eccaf9fcc4bd93133836 SHA512 66ff54153264d37d21822a19c07dc7d07fb4ed5c32234be7270821c060fcbd2673069dfd23a38512c7b0373fc97e6e44799f4b4280a1391b300f60f422ef6d69
 AUX erlang-20.3.2-dont-ignore-LDFLAGS.patch 1337 BLAKE2B 7272c96b1ee947a98f0a5b1f3bd1fce11e8d02f121348208196ae60af965dfde7fac15263ca0a58df96dff21785a1a63f4fc10f7e7e10c0f68a618e760e5ffd7 SHA512 59d39b1680ac3406e4c37f81a0207588208a873279920258235af54700f80bd67584c3e55c9278f893cd7813573bbec8b13195e47ba00101fc578d5a2b40fa34
 AUX erlang-add-epmd-pid-file-creation-for-openrc.patch 2359 BLAKE2B 54a3148144bcbb9a4dd68e89fd609a09a9e9a0a9c7a71a4e9eaafc12632e23da44411d72c1590e482fda73d5464b1071386aa564b8d9a73b032b62c474d20570 SHA512 301aed1980a8638a8cd069ecb6e968e5c15d3e82b38580861a0ed6a2fc7a9505d99525a53a6ac19c2d9b786703aac6bf51751275a6a7fafd8f530c07ea0c7e8c
+AUX erlang-custom-autoconf.patch 398 BLAKE2B c99d3bc311bbca379786b9e4d29ee4983354a069508328c95e99a62bdfb8d15dbf372124acdf66c603f64acd9cabeb146e5bd5ec1e1ffd09af125fc4a076abdc SHA512 b82e09d0cd686c07b9d370e397edda10bd96435e70f4a0995ec06638e237e3b8fd0e1195ecc036b51367ffa36a0b4db5a2b1fe5d389a0b97e19d32aec51755d9
 DIST erlang-20.3.2.tar.gz 53492641 BLAKE2B 2cdf78b6003801400d99949865a5b3e17d2209bf411bbe07dc12f749c84725710d12f85cb2559bc39ac04a7d6f7a9ae07b5f131a5524cf4ce3eb8559ca0259bc SHA512 060874cd4f72c1ecea178dd102f4b37a644485a810127092ad04fee76b52729ce199ee476335a2a40370bc718b7e03eb76869c3a48d457773856fd9f6d30a20b
 DIST erlang-20.3.8.9.tar.gz 53514692 BLAKE2B 1afa37ff8cc462cb0cc719c49c2c10b2684c7160b6912c574834021b2f521737dfa4cfedd0c82c843c1bb1e1977143fac7ae1ec94cfa9df4b2775deffd903a7b SHA512 6318760423f019a1611479da9b4187556a29e97f27bbc900cb36e0b2e0ef7e89ca65c053afbe4154cd9b5eaa3b59085a6d88c26d2990b09b7d2396b1dd5584a7
 DIST erlang-20.3.8.tar.gz 53499006 BLAKE2B 0c38fb739a9c4f4b79533faea8c533f85c30d680081b5de96e70722a243d53b9317a26c7138a24a78cadd938777bd48a515484fffef2fdfd720819ab12bb8c0c SHA512 2ada142b47fdd0d1807a179e7cd3067e001f94682011436d33e503219a8a93495a187f8192fa2ebcdac48409e489b7b310d538779447981e6ba033a6dde12e1c
 DIST erlang-21.0.2.tar.gz 52835517 BLAKE2B bf7e2e166236a7c0a3e3411889f163dce0d938c1a854a6c264c137b601587c4cd4d62d58d9a87cf925406272d6e3d6547e4403927adc8e901716289ee2164162 SHA512 ff736a6df92ac7feec7b9ebb1b6523d511a533d48e536f36aee20fa21b5a1dc33791065d45f6900bbbaa48b4ba80b57a306b416801456a5ac33468786dfb00b7
 DIST erlang-21.0.9.tar.gz 52842736 BLAKE2B 57de5e94450a70d32eb46bff691be4d3679daa56bee4e9aa2aad156b9447ea5bbe1287b806c304115c0ac4a677b8a04fb23286e269c7e0516f60cebd5ef2b3c7 SHA512 01bc5ce8d5c76823af1a17d389f326509c4ade5add0b0e66830e2c6aec2c7d93906cbbf9fb6b454178bddfa1c96355d632e4c557ab6da2bbdb8c6b0e05d87ee8
+DIST erlang-21.1.tar.gz 53857079 BLAKE2B ae292f5e98d747a6afb5d82205dd33d55cb6e275e3ebc98a4dbc8378cfcb1ea64f83d5f2d2256fd7208c7fe553b47ff25edf2858287f5316cae50788f2175337 SHA512 9e118e902c33b8dd71266efb4cc4aeb0db0d8be8adb64ac85595a6507dc847b84e5444a9b5c5cbf46b560c885db9f4cd934c74de4aa2e1574785295ea0865348
 DIST erlang_doc_html_20.3.tar.gz 33594990 BLAKE2B 34db68a5c3ae56f097474cc0b776971853d96c57d3d2e058a5db8998aad9c8d498610979a46155e8e935022f363c944f407c10c650fd35174cf1f50697ddf1de SHA512 4b280228fb9cbd9eb62db12ff9d6fad67d6855d0cdbc780839bbc95302ffd907c5b410e6f8519207db8850b753964571a9bf9df9eca53749f5b01d1b27dbc6d4
 DIST erlang_doc_html_21.0.tar.gz 32501093 BLAKE2B 5c5bab831d4a86129cca41f8e82416d45a92e8ae29cd2223301633b46471783ee6bb8131d469cedcf0f655ea21879c475c61d0b9eefba9e12d78d0a803403a19 SHA512 8be300d9e502b7dcf8db4621d7c5c8981f47cbff851b30b33ef33871f737554eda73dacd179b64995fc45362c4dfd91e15ff659d2898f863465222176bfbff9f
+DIST erlang_doc_html_21.1.tar.gz 32692731 BLAKE2B a7fa8ebe1c876ab7eecd2dd46ffd4d288db6d308e0f131d53c26ee4b67a92cb6fcb89b6c880ef34df395c7ad61fcdc81eac32e0fcf7336be7d517263218146bc SHA512 0d659f55bfb01eecf140a310154724489ef56b6ccbe9ac30f6b053f598276721b80de7b5b3200707cf8a6e77b8854eae5453f655225f431fcc982550539f767f
 DIST erlang_doc_man_20.3.tar.gz 1339710 BLAKE2B 00aba848940914b3d98f9500b8201b0679d7d63d066cee296c8fbb399f132340b989f3cdcdd6c45a46e432efdb7c40c39d8ab4f3dbd64570316d649efc9faed1 SHA512 22c398ce3b42c7ef8abec1db85745eeb4d8804bc679d40b6a786fdc40dc241e43b5551df5d1eccb3ca8d4a64b833bf6663e77044f4564bb49cf67c4b74c5ea25
 DIST erlang_doc_man_21.0.tar.gz 1311959 BLAKE2B 70b049c6d7b8bbbb3bf77f7588ccf0eb937d5fe511968d47e1325dd01b48e986ae82804ffc88b750f0f7e2fe0482c0506ad060a6a84892eea61264aa2b003dd9 SHA512 611ac0b7cb2c0bc0bb6cd194dffe4f9d2c95bf38da033aa8c43d386a9bedf6f7d6fa8a95d340dbb57da2698602599c8e0501cbbdd735d6e5d35110aa9087dc79
+DIST erlang_doc_man_21.1.tar.gz 1317726 BLAKE2B 5e5c2b77a41da6ab9ae1264ba5824a9f3bda6d3b7a824b372e01356888db437ed9e45bf987d678aca3fd8d0f0e6dce25080c7a2aaa4e061936f1e6ac4717e843 SHA512 94c6191ba9f42bffeb398e865026fbc79f3b233389c7d471f0c680799aa3669e97ab5305cd53f26d6525aed33d738ebfc4eb79a8f1a0b29dc4b79a2a37a29a4f
 DIST otp_doc_html_19.1.tar.gz 34624316 BLAKE2B e3a5edfe1645d58e4cbd6537c775190716eed7613610ddfa112692fdbace2077b1ccdf7df5987973d2ae4ef529e4ec45d44a240265157816e2a15dabe9232b83 SHA512 2c6448af0be4bf35427950aca82eac3aac7554575ba07a8ba8942c27e1eb668461fde00604c3be28fbaca8a1e28ee4861608e33a9c79bc951bb695f99b1c1ac8
 DIST otp_doc_html_19.3.tar.gz 35818689 BLAKE2B 30118276fbd817b803ef20700fe2e71a8457645d00f8949b6d3175d92cb5c84d306e4de9899e2f5e0c562d8040dc22db35e1a0f2e314cf1a783794573b3ece59 SHA512 a70d2c470fa1dc0594b20af73ba36ccb7702b4192960e6fc0296738175215a43450f9bf558637f7f5e40757f7a15dcf4f1ae8a88515e211cd3c0fae45c5e1858
 DIST otp_doc_html_20.2.tar.gz 33570484 BLAKE2B c47244a601ae780e5304aedbafbc84d514cb21852760c51384b197d8d37602d51448b7123f6205da9afd2c5d2158f518a122dd4d550ca2ff22d3425eb31b6cf7 SHA512 b481930066737cf0ae2496aa9bc0c865da46bd3985fe5ebcf51eb9383539a57ec364e1eed9d3916ba0953d837d0d5d37cfc129a995d4e2a9656846e75cda9397
@@ -35,4 +39,5 @@ EBUILD erlang-20.3.8.ebuild 6716 BLAKE2B 0c979eadeffa3a1f9b478b2f8025e277eff34e9
 EBUILD erlang-20.3.ebuild 4830 BLAKE2B 0d98f34098815c5b4a42c0629f8a0a6f492f3ddfcaa154c0d7b6bc3572d108d789175c8146d78789375f906a1c024fcafce6e9e5c1b0d76ba6f7056b2f8038fd SHA512 f19a1237535942004359468046539cfae2551e28fb1090161cef0ee4d20bcb28aa1a6ee62ee37f2e0ec409675cd6cbf2b41ee9aef3bf967a59e2cb52735dfbb2
 EBUILD erlang-21.0.2.ebuild 6715 BLAKE2B a7d1ae8ef4c13b5dda06d3eeaf6c6fd0daf08242381e27ac5c8bcc26b485985042a0fd3bbdf99840e0f3a44cfa2be2f67f488635f7eb5859485f55d159eb4654 SHA512 4347100ae033a9768a71533c1b6e55a856a590df86dc44592a40ef63cf23559f26c676528e4daa69db38bf941418cbb180e004e5309cc53dc1e4bef450c991ed
 EBUILD erlang-21.0.9.ebuild 6715 BLAKE2B a7d1ae8ef4c13b5dda06d3eeaf6c6fd0daf08242381e27ac5c8bcc26b485985042a0fd3bbdf99840e0f3a44cfa2be2f67f488635f7eb5859485f55d159eb4654 SHA512 4347100ae033a9768a71533c1b6e55a856a590df86dc44592a40ef63cf23559f26c676528e4daa69db38bf941418cbb180e004e5309cc53dc1e4bef450c991ed
-MISC metadata.xml 700 BLAKE2B f71879bdfc301ed27bd8212f074e5dbb176b29bcdab9edeb5ce0ba3dab3d8cb888977a140e91b0a50fbe35960799ab487afa3cd26a7b3b52d01909c678c1f30c SHA512 cada8e7cf719a6f0249c9f8538452d599e9ea938b2d57a9083e728c8f9d1c259871cc0f32c4f01c725692dd5e8270f0f67d84335593bdfe5ae31a54f117b1b84
+EBUILD erlang-21.1.ebuild 4451 BLAKE2B 51029e626d6cc24b9eacd6e3360890a3b01c2ca855e210b278a12c32f1e43be408709f9d2ebd177130fe52425e7645cdaa933070ac2db8392dd99ff5dcf8f243 SHA512 e4e3605c8943b5370e4745c87a49d946ff50414279d834e1567c2125d0c695ca18760c36d7f9e21d033804bc461ddfc857d315f014473de68529fa20e173566b
+MISC metadata.xml 767 BLAKE2B 7b4e24e035cc581418aa0509baad9913b3abb195414f2e91136510a5910b69a186853b352557f1e49280aae7871cc2e033b6e2ea6f22b3b73c88d78853937309 SHA512 c816f414d07fac9433a22bdfb083db600200f45cc0fcc0eb06389056df4ccdfa31767ff0a25b8f7caf1b17dffc303ff3f766a642cfd263c0c723623c31c5a716
diff --git a/dev-lang/erlang/erlang-21.1.ebuild b/dev-lang/erlang/erlang-21.1.ebuild
new file mode 100644
index 000000000000..4b6b149c1240
--- /dev/null
+++ b/dev-lang/erlang/erlang-21.1.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER="3.0"
+
+inherit autotools eapi7-ver elisp-common java-pkg-opt-2 systemd wxwidgets
+
+# NOTE: If you need symlinks for binaries please tell maintainers or
+# open up a bug to let it be created.
+
+UPSTREAM_V="$(ver_cut 1-2)"
+
+DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
+HOMEPAGE="https://www.erlang.org/"
+SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
+	http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
+	doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
+
+LICENSE="Apache-2.0"
+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 ~x64-solaris"
+IUSE="doc emacs +hipe java +kpoll libressl odbc pgo sctp ssl systemd tk +wxwidgets"
+
+RDEPEND="
+	sys-libs/ncurses:0
+	sys-libs/zlib
+	emacs? ( virtual/emacs )
+	java? ( >=virtual/jdk-1.8:* )
+	odbc? ( dev-db/unixODBC )
+	sctp? ( net-misc/lksctp-tools )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.7d:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	systemd? ( sys-apps/systemd )
+	tk? ( dev-lang/tk:0 )
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+"
+
+S="${WORKDIR}/otp-OTP-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/18.2.1-wx3.0.patch"
+	"${FILESDIR}/${PN}-20.3.2-dont-ignore-LDFLAGS.patch"
+	"${FILESDIR}/${PN}-add-epmd-pid-file-creation-for-openrc.patch"
+	"${FILESDIR}/${PN}-custom-autoconf.patch"
+)
+
+SITEFILE=50"${PN}"-gentoo.el
+
+src_prepare() {
+	default
+
+	./otp_build autoconf
+	find -name configure.in -execdir mv '{}' configure.ac \; || die "find failed"
+	eautoreconf
+}
+
+src_configure() {
+	use wxwidgets && setup-wxwidgets
+
+	local myconf=(
+		--disable-builtin-zlib
+		$(use_enable hipe)
+		$(use_enable kpoll kernel-poll)
+		$(use_with java javac)
+		$(use_with odbc)
+		$(use_enable sctp)
+		$(use_with ssl)
+		$(use_with ssl ssl-rpath "no")
+		$(use_enable ssl dynamic-ssl-lib)
+		$(use_enable systemd)
+		$(use_enable pgo)
+		$(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null")
+		--enable-threads
+	)
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	if use pgo; then
+		# disable distcc and ccache
+		export DISTCC_HOSTS=""
+		export CCACHE_DISABLE=1
+	fi
+
+	emake
+
+	if use emacs ; then
+		pushd lib/tools/emacs &>/dev/null || die
+		elisp-compile *.el
+		popd &>/dev/null || die
+	fi
+}
+
+extract_version() {
+	local path="$1"
+	local var_name="$2"
+	sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed"
+}
+
+src_install() {
+	local erl_libdir_rel="$(get_libdir)/erlang"
+	local erl_libdir="/usr/${erl_libdir_rel}"
+	local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)"
+	local erl_erts_ver="$(extract_version erts VSN)"
+	local my_manpath="/usr/share/${PN}/man"
+
+	[[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version"
+	[[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version"
+
+	emake INSTALL_PREFIX="${ED}" install
+
+	if use doc ; then
+		local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* )
+		docompress -x /usr/share/doc/${PF}
+	else
+		local DOCS=("README.md")
+	fi
+
+	einstalldocs
+
+	dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl
+	dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc
+	dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript
+	dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call
+	dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp
+
+	## Clean up the no longer needed files
+	rm "${ED}/${erl_libdir}/Install" || die
+
+	insinto "${my_manpath}"
+	doins -r "${WORKDIR}"/man/*
+	# extend MANPATH, so the normal man command can find it
+	# see bug 189639
+	newenvd - "90erlang" <<-_EOF_
+		MANPATH="${my_manpath}"
+	_EOF_
+
+	if use emacs ; then
+		elisp-install erlang lib/tools/emacs/*.{el,elc}
+		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
+			"${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
+		elisp-site-file-install "${T}/${SITEFILE}"
+	fi
+
+	newinitd "${FILESDIR}"/epmd.init epmd
+	use systemd && systemd_dounit "${FILESDIR}"/epmd.service
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-lang/erlang/files/erlang-custom-autoconf.patch b/dev-lang/erlang/files/erlang-custom-autoconf.patch
new file mode 100644
index 000000000000..5ae7b43ba289
--- /dev/null
+++ b/dev-lang/erlang/files/erlang-custom-autoconf.patch
@@ -0,0 +1,14 @@
+diff -ur otp-OTP-21.0.5.orig/otp_build otp-OTP-21.0.5/otp_build
+--- otp-OTP-21.0.5.orig/otp_build	2018-08-10 19:02:51.000000000 +0200
++++ otp-OTP-21.0.5/otp_build	2018-08-15 23:44:59.417191209 +0200
+@@ -1343,7 +1343,9 @@
+ 		do_lazy_configure "$@";
+ 		do_boot;;
+ 	autoconf)
+-		do_autoconf;;
++		create_lib_configure_in
++		distribute_config_helpers
++		;;
+ 	configure)
+ 		shift;
+ 		do_configure "$@";;
diff --git a/dev-lang/erlang/metadata.xml b/dev-lang/erlang/metadata.xml
index 9da736baffef..2f3f0770a55f 100644
--- a/dev-lang/erlang/metadata.xml
+++ b/dev-lang/erlang/metadata.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
- <!-- maintainer-needed -->
- <use>
-    <flag name="hipe">HIgh Performance Erlang extension</flag>
-    <flag name="kpoll">Enable kernel polling support</flag>
-    <flag name="compat-ethread">Enable compatibility with pre-pentium 4 CPUs in the ethread library.</flag>
-    <flag name="dirty-schedulers">Enable dirty schedulers</flag>
-  </use>
-<longdescription>
-Erlang is a programming language designed at the Ericsson 
-Computer Science Laboratory. Open-source Erlang is being 
-released to help encourage the spread of Erlang outside 
-Ericsson.
-</longdescription>
+	<!--maintainer-needed-->
+	<use>
+		<flag name="compat-ethread">Enable compatibility with pre-pentium 4 CPUs in the ethread library.</flag>
+		<flag name="dirty-schedulers">Enable dirty schedulers</flag>
+		<flag name="hipe">HIgh Performance Erlang extension</flag>
+		<flag name="kpoll">Enable kernel polling support</flag>
+		<flag name="pgo">Build erts with profile-guided optimizations</flag>
+	</use>
+	<longdescription>
+		Erlang is a programming language designed at the Ericsson
+		Computer Science Laboratory. Open-source Erlang is being
+		released to help encourage the spread of Erlang outside
+		Ericsson.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-lang/execline/Manifest b/dev-lang/execline/Manifest
index f2fcb89ff1ae..14b0ac0638c4 100644
--- a/dev-lang/execline/Manifest
+++ b/dev-lang/execline/Manifest
@@ -4,4 +4,4 @@ DIST execline-2.3.0.4.tar.gz 82774 BLAKE2B a658b538d0a17f15876fe9a822bb7c7e4edba
 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
-MISC metadata.xml 478 BLAKE2B ecb74c96759ba274c63367526e88c0b98ecad92f2d5ce436ea41688ba64aa9fd2e8e661449cfc376575ec7aa38030a012ca37cfef22f22149d3b64d26c08c9b4 SHA512 ed6d5e5d2c23cd9e6a6a1ab64db1ffb2b1517e41dc06878918ef907454440c8e84cb8f91acb517bcd45fa1ebc0b990b1089ac3e2158baf1b128ff05efc2c71d0
+MISC metadata.xml 808 BLAKE2B 493e9369dca91a49b964006f1abc1a9285a03115b60c13312f83be014d8a8a3a8ab4b3a5b4c21fda6850c317da52440a0f9b5d8fdc5d3536b35d84c059b71731 SHA512 aa5d0e5f6898c853818187a40791e1fed0fce3f3e9429329d9a4224e9fa25165a2336a3202080404c531e8cba718bf6da158b49c108874bf8b72e6d21c9cd31f
diff --git a/dev-lang/execline/metadata.xml b/dev-lang/execline/metadata.xml
index a297f89a0795..a3625cad2322 100644
--- a/dev-lang/execline/metadata.xml
+++ b/dev-lang/execline/metadata.xml
@@ -5,6 +5,18 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>aranea@aixah.de</email>
+		<name>Luis Ressel</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>samuel@sholland.org</email>
+		<name>Samuel Holland</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		Execline is a non-interactive scripting language similar to sh.
 		According to the home page, the syntax is far mor logical and
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
index f60f940b3cc6..4b0d4a140b55 100644
--- a/dev-lang/julia/Manifest
+++ b/dev-lang/julia/Manifest
@@ -5,13 +5,13 @@ AUX julia-9999-fix_build_system.patch 2920 BLAKE2B b9021a4092cb95c86b10ad7ff6e16
 DIST julia-0.6.3-bundled.tar.gz 2099258 BLAKE2B dea1f5d37477e0a612e3901d7d568e8c4b350496f9d2b344cd7e2c2043ae30b4dd26b567803a2cb96d1ec4dbe2ba514fb08b925c695589746691887334330dd2 SHA512 d04cd55ba0dde08f253db3a388cf5ebe87cec8ae321a5af4c1c92f2680aa6e6ef2ebfa771ec74f8f1ff96409e2c0645476acf577859e8718eac4a581f097639d
 DIST julia-0.6.3.tar.gz 5542642 BLAKE2B cccd1ee2eb4d9f59382a0d1f6466e77c84b0542456c405c05b718bc8a39ff537a09760a523ee572fc9eee6797158aa00010fc4c931a80deac645fb1e45061c87 SHA512 f529bb30a17989234061cf4c3d87aecc6da720eb494efaca7be4ec1ed5eda60d440896fb76a45b6cb30205030256e7de765e8944f873b31d96f7c9ecac542db8
 DIST julia-0.7.0.tar.gz 7547849 BLAKE2B 6721e980a5fd84f1a28838a91acdd95e8562dd971903e30776dfb90a6cc0ac1ffbedd22c2bfee45bd2fa616adead82680ebe30f9b86a1d968db2353233b32bc2 SHA512 296dbc71fe5238b0cbdc5c67f7002fbf05abea85dc4298784d74fbfef1c96890ab9cc1bbe874337c01f39ca08a6022f6abcde3a5e2ff1cdc25f2f7493ead1804
-DIST julia-1.0.0.tar.gz 7378753 BLAKE2B 1fcf3a63b00b6a49a86ca69b6ee809a28c828287c739405ae180e96645d565de0941b049d319f82f60e1ee63ee89629be213ecb22ab1ea901b306d1e149fa861 SHA512 5a53b16a1ab57cdffa5dadf11e78c413ed9f18af23ae90b64dee8323c2fc9bd6e6918b341f48accbcb7a6eab559811c80d72ac3ac0576c7cf6c9c9057356f6ba
+DIST julia-1.0.1.tar.gz 7382328 BLAKE2B 61ff64298f3740fb50a2cb9c5561e1d4594eea8edbecc4fde9771807be22f753b6c606a530eea9bf569aaccbb4c4a39664ba5d08793d8e127d0988cf7b0244f8 SHA512 41ca8c0280c4914e43f5a37ed09ce47174f991e3079703a705081265509d22cd6cb66a928dc1c41d473a3d8cc59bb6f74e25e3a960e828d6e469d85a8db58c18
 DIST julia-dsfmt-2.2.3.tar.gz 291773 BLAKE2B 6ffae90494d72527920c80fc0fb005da1c7b84f8a03a7ecb0789434c0fff97359e5098e85431896dffccc7d5148c414e847aaba5feef648b8788421a466ff65e SHA512 6d8ddcd01aab3f9039f4f0288a8af53e290cc2f293ed8c4a8c9f3b3f12398e7eedfce8016117b425766ba89c61c86c13b3e420035b5f9bf91315b8b814c03662
 DIST julia-libuv-ed3700c849289ed01fe04273a7bf865340b2bd7e.tar.gz 1492695 BLAKE2B ad03512dd1db2c7066b46b5a3a314645b925481d8ace09ac0a0ae23cf5b8a64338ad457f8df229aa82f1d45605b5366883f563f2e22756ce28bb6fb7607d7124 SHA512 1305035b1372bdf234e3c5e673ee4c8ab5bda83ff06bc27704786def52667c3143fe587fca8f6e0855ba0c8b6d4dd90b2faefd33736224173f459d751885683e
 DIST julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz 4183 BLAKE2B c932e23b1b476d3fd16cf6f451efd5fc6d9c1ec2c53e8ac086340a100817d9b30dae3eff50b284a42c09b2bbae30b9e2fd38b2881f8cbf4974a89f3bd0c87599 SHA512 6fb77b715d70d9bc95a8546c3bf97bd3677c7ea344b88bb5bc3bbfac9dceabe8a8cde7a0f64dec884cde802e4a3000e30837d3f824b5a9242348c4fe061526a3
 DIST julia-utf8proc-97ef668b312b96382714dbb8eaac4affce0816e6.tar.gz 156361 BLAKE2B e5e1485b758e959ed78f7fde8b211376da2365e5835708042de57c091b10b59755e1203a9f88c0d761687bf3d166207410de6ec203d80fef4dbdf06a50404cd1 SHA512 1c80dc6e71fdad187b142d02e561dfe1880857baaec08d36240ecb2f275d1bc5467aace84eebe5a10fd3f4c40b0035e65a5db3ec2a9ee6940920b0aad6221c55
 EBUILD julia-0.6.3-r1.ebuild 4632 BLAKE2B 7eaa908368c487b54150f3d7b4ea42b36d66a3219e6da91805184bb29ff70e9adfef32dea45bec6e23e04e6bae25dd2f4cf608a24776992e678578ed4d038c20 SHA512 aa749655bf23845e9124146cc6ca12245660e76addd23a38f46fb1ff8849b4f8e5e05b4f83ee5c4f5dfe005fb9e462aee39e7831a351afd96fb29a0795ebc486
 EBUILD julia-0.7.0.ebuild 5261 BLAKE2B abf094bbd73bcdfa0fe415a98498b65f32eafe13f5d5239d19f6324dd9213b811311f7162072af9d74740de50da9cf571575ab8cebfd6ebd3ac27fff3f95f566 SHA512 aac8187040ab4b525aa0803ec7e48e56d642365a4586a3aec6dd98b490279f21f31863f127eb17bed81be7ccb70e26f87c6411fc5dbb18885fff24ddc5869b4c
-EBUILD julia-1.0.0.ebuild 5261 BLAKE2B abf094bbd73bcdfa0fe415a98498b65f32eafe13f5d5239d19f6324dd9213b811311f7162072af9d74740de50da9cf571575ab8cebfd6ebd3ac27fff3f95f566 SHA512 aac8187040ab4b525aa0803ec7e48e56d642365a4586a3aec6dd98b490279f21f31863f127eb17bed81be7ccb70e26f87c6411fc5dbb18885fff24ddc5869b4c
+EBUILD julia-1.0.1.ebuild 5258 BLAKE2B 3a69cdd1efd15a1520aa824f3d8a8d2e03400ca34cdf742d50b22c40dc1ac6668ba5fb5bd64f2b6a288b581816ada817b949aac3f6d0e853fe0551b7cc902de5 SHA512 8c473c864ed19a5df08f0921f20754a96d432f9187036d1cda3ee9967c0299ac25b0955438f5c54ae6c556c996b3979c3d2b6a219bae050fb633fe83cc651b81
 EBUILD julia-9999.ebuild 4089 BLAKE2B b38fb0ae040da02961650abdaf40ec17632899cd63aeee83f0b1bb67a760d68ea80a251e29baf594b15b944017ae894db607a4179ef025fb18fb5fbaecae53c3 SHA512 dfb930b357f61479cb28d4d1c5f08fe264ac8ebcd4cd41a0da4c947209b6318cad25bf011e45ea1db3575dcf667f694119a8b40f7ad181914309cd0b93467729
 MISC metadata.xml 1291 BLAKE2B 98782d71b9f74e628e4e6dc5264b7bcddfb61f4ce42c4e3baa0a2ec0cc6e2ef6368d1c2b1d755972b214823533c3935b4558c79bd920072649d9072b985efcd4 SHA512 0bbe350eef4d0daaa4a971b843b4359d2513dea5e2dc9e8a3b6241ff403c043f605634615c39a3fdb2a4d090851a19d6b20ebd5c7b3886f009ade3b5c16dfaaf
diff --git a/dev-lang/julia/julia-1.0.0.ebuild b/dev-lang/julia/julia-1.0.0.ebuild
deleted file mode 100644
index f7b451ce750c..000000000000
--- a/dev-lang/julia/julia-1.0.0.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-RESTRICT="test"
-
-inherit llvm pax-utils toolchain-funcs
-
-MY_LIBUV_V="ed3700c849289ed01fe04273a7bf865340b2bd7e"
-MY_UTF8PROC_V="97ef668b312b96382714dbb8eaac4affce0816e6"
-MY_LIBWHICH_V="81e9723c0273d78493dc8c8ed570f68d9ce7e89e"
-MY_DSFMT_V="2.2.3"
-
-DESCRIPTION="High-performance programming language for technical computing"
-HOMEPAGE="https://julialang.org/"
-SRC_URI="
-	https://github.com/JuliaLang/${PN}/releases/download/v${PV}/${P}.tar.gz
-	https://api.github.com/repos/JuliaLang/libuv/tarball/${MY_LIBUV_V} -> ${PN}-libuv-${MY_LIBUV_V}.tar.gz
-	https://api.github.com/repos/JuliaLang/utf8proc/tarball/${MY_UTF8PROC_V} -> ${PN}-utf8proc-${MY_UTF8PROC_V}.tar.gz
-	https://api.github.com/repos/vtjnash/libwhich/tarball/${MY_LIBWHICH_V} -> ${PN}-libwhich-${MY_LIBWHICH_V}.tar.gz
-	http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${MY_DSFMT_V}.tar.gz -> ${PN}-dsfmt-${MY_DSFMT_V}.tar.gz
-"
-
-S="${WORKDIR}/${PN}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-# julia 0.7* needs a patched llvm-6
-RDEPEND="
-	=sys-devel/llvm-6*:=
-	=sys-devel/clang-6*:="
-LLVM_MAX_SLOT=6
-
-RDEPEND+="
-	dev-libs/double-conversion:0=
-	dev-libs/gmp:0=
-	dev-libs/libgit2:0=
-	>=dev-libs/libpcre2-10.23:0=[jit]
-	dev-libs/mpfr:0=
-	dev-libs/openspecfun
-	sci-libs/amd:0=
-	sci-libs/arpack:0=
-	sci-libs/camd:0=
-	sci-libs/ccolamd:0=
-	sci-libs/cholmod:0=
-	sci-libs/colamd:0=
-	sci-libs/fftw:3.0=[threads]
-	sci-libs/openlibm:0=
-	sci-libs/spqr:0=
-	sci-libs/umfpack:0=
-	sci-mathematics/glpk:0=
-	>=sys-libs/libunwind-1.1:7=
-	sys-libs/readline:0=
-	sys-libs/zlib:0=
-	>=virtual/blas-3.6
-	virtual/lapack"
-
-DEPEND="${RDEPEND}
-	dev-vcs/git
-	dev-util/patchelf
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.0-fix_build_system.patch
-)
-
-src_unpack() {
-	tounpack=(${A})
-	# the main source tree, followed by deps
-	unpack "${A/%\ */}"
-
-	mkdir -p "${S}/deps/srccache/"
-	for i in "${tounpack[@]:1}"; do
-		cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die
-	done
-}
-
-src_prepare() {
-	default
-
-	# Sledgehammer:
-	# - prevent fetching of bundled stuff in compile and install phase
-	# - respect CFLAGS
-	# - respect EPREFIX and Gentoo specific paths
-	# - fix BLAS and LAPACK link interface
-
-	sed -i \
-		-e 's|git submodule|${EPREFIX}/bin/true|g' \
-		-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
-		-e "s|/usr/include|${EPREFIX%/}/usr/include|g" \
-		deps/Makefile || die
-
-	local libblas="$($(tc-getPKG_CONFIG) --libs-only-l blas)"
-	libblas="${libblas%% *}"
-	libblas="lib${libblas#-l}"
-	local liblapack="$($(tc-getPKG_CONFIG) --libs-only-l lapack)"
-	liblapack="${liblapack%% *}"
-	liblapack="lib${liblapack#-l}"
-
-	sed -i \
-		-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
-		-e "s|GENTOOLIBDIR|$(get_libdir)|" \
-		-e "s|^JULIA_COMMIT = .*|JULIA_COMMIT = v${PV}|" \
-		-e "s|-lblas|$($(tc-getPKG_CONFIG) --libs blas)|" \
-		-e "s|= libblas|= ${libblas}|" \
-		-e "s|-llapack|$($(tc-getPKG_CONFIG) --libs lapack)|" \
-		-e "s|= liblapack|= ${liblapack}|" \
-		Make.inc || die
-
-	sed -i \
-		-e "s|,lib)|,$(get_libdir))|g" \
-		-e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|g" \
-		Makefile || die
-
-	sed -i \
-		-e "s|ar -rcs|$(tc-getAR) -rcs|g" \
-		src/Makefile || die
-
-	# disable doc install starting  git fetching
-	sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die
-}
-
-src_configure() {
-	# julia does not play well with the system versions of dsfmt, libuv,
-	# and utf8proc
-
-	# USE_SYSTEM_LIBM=0 implies using external openlibm
-	cat <<-EOF > Make.user
-		USE_SYSTEM_ARPACK:=1
-		USE_SYSTEM_BLAS:=1
-		USE_SYSTEM_DSFMT:=0
-		USE_SYSTEM_GMP:=1
-		USE_SYSTEM_GRISU:=1
-		USE_SYSTEM_LAPACK:=1
-		USE_SYSTEM_LIBGIT2:=1
-		USE_SYSTEM_LIBM:=0
-		USE_SYSTEM_LIBUNWIND:=1
-		USE_SYSTEM_LIBUV:=0
-		USE_SYSTEM_LLVM:=1
-		USE_LLVM_SHLIB:=1
-		USE_SYSTEM_MPFR:=1
-		USE_SYSTEM_OPENLIBM:=1
-		USE_SYSTEM_OPENSPECFUN:=1
-		USE_SYSTEM_PATCHELF:=1
-		USE_SYSTEM_PCRE:=1
-		USE_SYSTEM_READLINE:=1
-		USE_SYSTEM_RMATH:=0
-		USE_SYSTEM_SUITESPARSE:=1
-		USE_SYSTEM_UTF8PROC:=0
-		USE_SYSTEM_ZLIB=1
-		VERBOSE=1
-		libdir="${EROOT}/usr/$(get_libdir)"
-	EOF
-
-}
-
-src_compile() {
-
-	# Julia accesses /proc/self/mem on Linux
-	addpredict /proc/self/mem
-
-	emake cleanall
-	emake julia-release \
-		prefix="${EPREFIX}/usr" DESTDIR="${D}" \
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-	pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')
-	emake
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	# Julia is special. It tries to find a valid git repository (that would
-	# normally be cloned during compilation/installation). Just make it
-	# happy...
-	git init && \
-		git config --local user.email "whatyoudoing@example.com" && \
-		git config --local user.name "Whyyyyyy" && \
-		git commit -a --allow-empty -m "initial" || die "git failed"
-
-	emake install \
-		prefix="${EPREFIX}/usr" DESTDIR="${D}" \
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-	cat > 99julia <<-EOF
-		LDPATH=${EROOT%/}/usr/$(get_libdir)/julia
-	EOF
-	doenvd 99julia
-
-	dodoc README.md
-
-	mv "${ED}"/usr/etc/julia "${ED}"/etc || die
-	rmdir "${ED}"/usr/etc || die
-	mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/${PF} || die
-	rmdir "${ED}"/usr/share/doc/julia || die
-}
diff --git a/dev-lang/julia/julia-1.0.1.ebuild b/dev-lang/julia/julia-1.0.1.ebuild
new file mode 100644
index 000000000000..6f417285d135
--- /dev/null
+++ b/dev-lang/julia/julia-1.0.1.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+RESTRICT="test"
+
+inherit llvm pax-utils toolchain-funcs
+
+MY_LIBUV_V="ed3700c849289ed01fe04273a7bf865340b2bd7e"
+MY_UTF8PROC_V="97ef668b312b96382714dbb8eaac4affce0816e6"
+MY_LIBWHICH_V="81e9723c0273d78493dc8c8ed570f68d9ce7e89e"
+MY_DSFMT_V="2.2.3"
+
+DESCRIPTION="High-performance programming language for technical computing"
+HOMEPAGE="https://julialang.org/"
+SRC_URI="
+	https://github.com/JuliaLang/${PN}/releases/download/v${PV}/${P}.tar.gz
+	https://api.github.com/repos/JuliaLang/libuv/tarball/${MY_LIBUV_V} -> ${PN}-libuv-${MY_LIBUV_V}.tar.gz
+	https://api.github.com/repos/JuliaLang/utf8proc/tarball/${MY_UTF8PROC_V} -> ${PN}-utf8proc-${MY_UTF8PROC_V}.tar.gz
+	https://api.github.com/repos/vtjnash/libwhich/tarball/${MY_LIBWHICH_V} -> ${PN}-libwhich-${MY_LIBWHICH_V}.tar.gz
+	http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${MY_DSFMT_V}.tar.gz -> ${PN}-dsfmt-${MY_DSFMT_V}.tar.gz
+"
+
+S="${WORKDIR}/${PN}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+# julia 0.7* needs a patched llvm-6
+RDEPEND="
+	=sys-devel/llvm-6*:=
+	=sys-devel/clang-6*:="
+LLVM_MAX_SLOT=6
+
+RDEPEND+="
+	dev-libs/double-conversion:0=
+	dev-libs/gmp:0=
+	dev-libs/libgit2:0=
+	>=dev-libs/libpcre2-10.23:0=[jit]
+	dev-libs/mpfr:0=
+	dev-libs/openspecfun
+	sci-libs/amd:0=
+	sci-libs/arpack:0=
+	sci-libs/camd:0=
+	sci-libs/ccolamd:0=
+	sci-libs/cholmod:0=
+	sci-libs/colamd:0=
+	sci-libs/fftw:3.0=[threads]
+	sci-libs/openlibm:0=
+	sci-libs/spqr:0=
+	sci-libs/umfpack:0=
+	sci-mathematics/glpk:0=
+	>=sys-libs/libunwind-1.1:7=
+	sys-libs/readline:0=
+	sys-libs/zlib:0=
+	>=virtual/blas-3.6
+	virtual/lapack"
+
+DEPEND="${RDEPEND}
+	dev-vcs/git
+	dev-util/patchelf
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.0-fix_build_system.patch
+)
+
+src_unpack() {
+	tounpack=(${A})
+	# the main source tree, followed by deps
+	unpack "${A/%\ */}"
+
+	mkdir -p "${S}/deps/srccache/"
+	for i in "${tounpack[@]:1}"; do
+		cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die
+	done
+}
+
+src_prepare() {
+	default
+
+	# Sledgehammer:
+	# - prevent fetching of bundled stuff in compile and install phase
+	# - respect CFLAGS
+	# - respect EPREFIX and Gentoo specific paths
+	# - fix BLAS and LAPACK link interface
+
+	sed -i \
+		-e 's|git submodule|${EPREFIX}/bin/true|g' \
+		-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
+		-e "s|/usr/include|${EPREFIX%/}/usr/include|g" \
+		deps/Makefile || die
+
+	local libblas="$($(tc-getPKG_CONFIG) --libs-only-l blas)"
+	libblas="${libblas%% *}"
+	libblas="lib${libblas#-l}"
+	local liblapack="$($(tc-getPKG_CONFIG) --libs-only-l lapack)"
+	liblapack="${liblapack%% *}"
+	liblapack="lib${liblapack#-l}"
+
+	sed -i \
+		-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
+		-e "s|GENTOOLIBDIR|$(get_libdir)|" \
+		-e "s|^JULIA_COMMIT = .*|JULIA_COMMIT = v${PV}|" \
+		-e "s|-lblas|$($(tc-getPKG_CONFIG) --libs blas)|" \
+		-e "s|= libblas|= ${libblas}|" \
+		-e "s|-llapack|$($(tc-getPKG_CONFIG) --libs lapack)|" \
+		-e "s|= liblapack|= ${liblapack}|" \
+		Make.inc || die
+
+	sed -i \
+		-e "s|,lib)|,$(get_libdir))|g" \
+		-e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|g" \
+		Makefile || die
+
+	sed -i \
+		-e "s|ar -rcs|$(tc-getAR) -rcs|g" \
+		src/Makefile || die
+
+	# disable doc install starting  git fetching
+	sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die
+}
+
+src_configure() {
+	# julia does not play well with the system versions of dsfmt, libuv,
+	# and utf8proc
+
+	# USE_SYSTEM_LIBM=0 implies using external openlibm
+	cat <<-EOF > Make.user
+		USE_SYSTEM_ARPACK:=1
+		USE_SYSTEM_BLAS:=1
+		USE_SYSTEM_DSFMT:=0
+		USE_SYSTEM_GMP:=1
+		USE_SYSTEM_GRISU:=1
+		USE_SYSTEM_LAPACK:=1
+		USE_SYSTEM_LIBGIT2:=1
+		USE_SYSTEM_LIBM:=0
+		USE_SYSTEM_LIBUNWIND:=1
+		USE_SYSTEM_LIBUV:=0
+		USE_SYSTEM_LLVM:=1
+		USE_LLVM_SHLIB:=1
+		USE_SYSTEM_MPFR:=1
+		USE_SYSTEM_OPENLIBM:=1
+		USE_SYSTEM_OPENSPECFUN:=1
+		USE_SYSTEM_PATCHELF:=1
+		USE_SYSTEM_PCRE:=1
+		USE_SYSTEM_READLINE:=1
+		USE_SYSTEM_RMATH:=0
+		USE_SYSTEM_SUITESPARSE:=1
+		USE_SYSTEM_UTF8PROC:=0
+		USE_SYSTEM_ZLIB=1
+		VERBOSE=1
+		libdir="${EROOT}/usr/$(get_libdir)"
+	EOF
+
+}
+
+src_compile() {
+
+	# Julia accesses /proc/self/mem on Linux
+	addpredict /proc/self/mem
+
+	emake cleanall
+	emake julia-release \
+		prefix="${EPREFIX}/usr" DESTDIR="${D}" \
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+	pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')
+	emake
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	# Julia is special. It tries to find a valid git repository (that would
+	# normally be cloned during compilation/installation). Just make it
+	# happy...
+	git init && \
+		git config --local user.email "whatyoudoing@example.com" && \
+		git config --local user.name "Whyyyyyy" && \
+		git commit -a --allow-empty -m "initial" || die "git failed"
+
+	emake install \
+		prefix="${EPREFIX}/usr" DESTDIR="${D}" \
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+	cat > 99julia <<-EOF
+		LDPATH=${EROOT%/}/usr/$(get_libdir)/julia
+	EOF
+	doenvd 99julia
+
+	dodoc README.md
+
+	mv "${ED}"/usr/etc/julia "${ED}"/etc || die
+	rmdir "${ED}"/usr/etc || die
+	mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/${PF} || die
+	rmdir "${ED}"/usr/share/doc/julia || die
+}
diff --git a/dev-lang/mujs/Manifest b/dev-lang/mujs/Manifest
index e58b1932806d..99976d5d6362 100644
--- a/dev-lang/mujs/Manifest
+++ b/dev-lang/mujs/Manifest
@@ -1,7 +1,10 @@
 AUX mujs-0_p20150202-Makefile.patch 593 BLAKE2B f2e12bc18ae155a4cc5c69a9b1c5ad749e206a567fc7c58ae453f85f2dbda6cb5f0c462e853ad6c52e422a0dcab9834312d1c2cdbd419759ceedaa4b5513314d SHA512 2c6c0b0ba8dc757a1ae57fbfe5ea56970e07177b45e7d7aa7ed41896ead5b0d4200003897f9c837fc97e96bdc2fd51229fd2629e8780194ad12f86940591878e
 AUX mujs-1.0.1-gentoo.patch 788 BLAKE2B b3a62c59226c79a81c748b1c7d6cfa80e89d909f47946133e22fc07f57f99bead5a61be8b9b76902ca04f86d2a7494940145118cf464ef2a39a651797ce5921b SHA512 b7409ff5aa9e5e38d3d9b7a3805699847a043ee83d46520d2b2ac011ac0a66588126a5c6761e919f9f9c7c510ff5d62d7c22c97739b52e611f5b89a911f52169
+AUX mujs-1.0.4-gentoo.patch 638 BLAKE2B 4f4f5a3d21f49380ab9b2c87d3e367e1a83490794ed1e7653be2079d1fd71b2359d728f3831dec3199f9a1cf7331627a657019df332dea175f1c08e95638c3a1 SHA512 4e50aa9143d461935f6475ee409a8392ddd93b51a1817a1b21d3152064c2c1b0bb1b8bdc97558b0b2b04094431085c22e80da43b099dd5a87e4d593033563f51
 DIST mujs-0_p20161202.tar.gz 105413 BLAKE2B a65a343d6f60975c88001cdd8eae881559eaf8ba94cf26c8aa9a9a3837cd47ee798c784ed9e90380a76ef328e56d63d1dccd8a85a4a7496d31046d221cf8d7b9 SHA512 90dd1bce44740715a6f642bdb376be230c4a03c7970c2026479cf014a080b98b56a2131ca7ef8bf9c05b91285fe7dcc21dd4ca83879750351d57088408a62cbc
 DIST mujs-1.0.1.tar.gz 116948 BLAKE2B 54d898eff95e65688a51d9df9175964609a55ad3243ffaa4da10f27a6262a207777dd500cb76aefc22aa52799fed577864d15dfec9ed4aea24f0a4f1ff8dfa0a SHA512 46cbc45735dbf173d7fa5839e3b511730e4d42933c2286d170767659649ea88c2a3dcc74fb986d1eedb1d4fec8fcaaba146805cc9d0ef7da98bb5a9ce0c80a96
+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
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+EBUILD mujs-1.0.4.ebuild 1025 BLAKE2B 4b14f7ab8a7073ee7a08de5b0859ba2c23fa34282ec7f7568034e2fef0c07c67f0fd5c33fed076185e8105a9619a8410d9bed99c7ca930d7664d580bf80e679d SHA512 eaf763476bb88f9b5362ce9d126ddcc2189a9b0d10d0ceb74c6fb2b39ea7c32bc15e93b3cf8d37795ed0ecac8190f9ed4c360263623d9d77076359f273bdf125
+MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
diff --git a/dev-lang/mujs/files/mujs-1.0.4-gentoo.patch b/dev-lang/mujs/files/mujs-1.0.4-gentoo.patch
new file mode 100644
index 000000000000..c05b8787466c
--- /dev/null
+++ b/dev-lang/mujs/files/mujs-1.0.4-gentoo.patch
@@ -0,0 +1,23 @@
+1. Add to user-defined CFLAGS instead of being overwritten by them
+2. Don't strip binaries: it leads to QA warnings
+diff --git a/Makefile b/Makefile
+index 7284f51..7615158 100644
+--- a/Makefile
++++ b/Makefile
+@@ -15,7 +15,7 @@ endif
+ 
+ # Compiler flags for various configurations:
+ 
+-CFLAGS := -std=c99 -pedantic -Wall -Wextra -Wno-unused-parameter
++CFLAGS += -std=c99 -pedantic -Wall -Wextra -Wno-unused-parameter
+ 
+ ifeq "$(CC)" "clang"
+   CFLAGS += -Wunreachable-code
+@@ -32,7 +32,6 @@ else ifeq "$(build)" "sanitize"
+   LDFLAGS += -fsanitize=address
+ else
+   CFLAGS += -Os
+-  LDFLAGS += -Wl,-s
+ endif
+ 
+ ifeq "$(HAVE_READLINE)" "yes"
diff --git a/dev-lang/mujs/metadata.xml b/dev-lang/mujs/metadata.xml
index a535b8852829..68674fe1b802 100644
--- a/dev-lang/mujs/metadata.xml
+++ b/dev-lang/mujs/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-lang/mujs/mujs-1.0.4.ebuild b/dev-lang/mujs/mujs-1.0.4.ebuild
new file mode 100644
index 000000000000..91ee7c0085a7
--- /dev/null
+++ b/dev-lang/mujs/mujs-1.0.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="lightweight Javascript interpreter"
+HOMEPAGE="http://mujs.com/"
+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"
+IUSE="static-libs"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.4-gentoo.patch
+)
+
+src_prepare() {
+	default
+	append-cflags -fPIC -Wl,-soname=lib${PN}.so.${PV}
+	tc-export CC
+}
+
+src_compile() {
+	emake VERSION=${PV} prefix=/usr shared
+}
+
+src_install() {
+	emake \
+		DESTDIR="${ED}" \
+		VERSION=${PV} \
+		prefix=/usr \
+		libdir="/usr/$(get_libdir)" \
+		install-shared \
+		$(usex static-libs install-static '')
+
+	mv -v "${D}"/usr/$(get_libdir)/lib${PN}.so{,.${PV}} || die
+	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so || die
+	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so.${PV:0:1} || die
+}
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 68477fa6d73b..891180eb175c 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -13,7 +13,7 @@ DIST php-7.0.32.tar.xz 12030780 BLAKE2B 0c277eac4c931a6e30954cceb7feef8dea1c3ef4
 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.2.10.tar.xz 12160864 BLAKE2B f1959a00622c1bd11fa87c61d152c802b307f0b9e89b51ed86b40086cda03eeb6652d47b59df8cc7c9b4e79ab687ae1292b978f453e9f07ac352d209b64c62d8 SHA512 aa90fce17034b2649012d66461626ae74c21ea938b1c71c7eb12419e562c641b432df87a7e900c245ad28df39624cf64a1b2f8ffb123608d94cd35e41f09c0fe
-DIST php-7.3.0RC1.tar.xz 11920364 BLAKE2B 82a7fa5359c4fb3e6b66249d1c45dad5275b251261d33d07d5c5e86360c1a32affa3d80145802d8dbf391f253d895d4107affcd773f1637c373240ce854606e3 SHA512 40f8fe3367fb42fe739888d1f2335e6326a7ca35c33b8ebc8de59fd5d35a2a7ab6866a6bd837b8a0eb41b89d3c7c3a49332850ff2e9a2b9d244665da91422725
+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
@@ -21,5 +21,5 @@ EBUILD php-7.0.32.ebuild 22009 BLAKE2B bf0d62e15cb11ed5669d5e485b53b58f8da843631
 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
-EBUILD php-7.3.0_rc1.ebuild 22325 BLAKE2B 629c41eb9f5184480f90f4f755eec426e12426904b0c63fe4f7a4cc51534a010f1fd679e1d95d1c1ebd1ac521a1bfc7cad2919fc3451196a18483e585ac6e92c SHA512 4c7c0e81790e28d149a265fd00c5f0d5b661c91fd9d1ae315041e6792bd4cf41380ce5d6540f52d3b5e9b9ab32b4d505c56178fef0172a68dd43ba340193ea08
+EBUILD php-7.3.0_rc2.ebuild 22329 BLAKE2B 7841e7d459849f06a47128e2c0a8f1997b3d1b6be02081d3dafa624f7ea319da13974cd904ce772260c8e001ae5c594508cf5be9f0426d8fd5da9ff6107111ca SHA512 f81a2d251ded29e6f91f72c736c27f44e8f8f6ef9cdfe57d7b8fefc0c3c27869a83972355d03532db95ba0c9c0b3322870174b7c8c0e57a1f9ea8ec4c40ca4c7
 MISC metadata.xml 2577 BLAKE2B 9b15d6073181a5f5ff7b00ef8b68d24c7ea8763171ae84895ebc4a6925f589d2a02e4e29116c2741b3502b35d32aa58e7ed909e144c0e694f8cce5b4d26ecd3b SHA512 14e6daa693325b8a27157cff22d0b0cae9d89e4dada775f39188f7f36546b78a8b19efedb2f7b6f64ee1375bf29d3af32a8f7d6e7bf0d04cf2a7241abd154afa
diff --git a/dev-lang/php/php-7.3.0_rc1.ebuild b/dev-lang/php/php-7.3.0_rc1.ebuild
deleted file mode 100644
index 2bed0380d7b2..000000000000
--- a/dev-lang/php/php-7.3.0_rc1.ebuild
+++ /dev/null
@@ -1,743 +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
-
-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 )
-	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/php/php-7.3.0_rc2.ebuild b/dev-lang/php/php-7.3.0_rc2.ebuild
new file mode 100644
index 000000000000..38dbc82aca6b
--- /dev/null
+++ b/dev-lang/php/php-7.3.0_rc2.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 62867ce8e87f..1b8bd40c1b7a 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -38,20 +38,20 @@ DIST python-gentoo-patches-3.6.2-0.tar.xz 10744 BLAKE2B 3075754627617ac2ceee879e
 DIST python-gentoo-patches-3.6.4.tar.xz 12888 BLAKE2B 7cf49ae22df53e855f2e99df51686b5d4bd0da82ef4c22836e24726ea9ed561808352c0305a5659b052d38b843f1ff61b6466a7bc3673b7e5cfb4d81d22fa4bc SHA512 90a1b685f2539872ffd67f96581f70145b7afaf18af19f4a7f4a61214103d2a10bf0069c1769dac229ae011fceaf8538f041082b33c1671905246d018d184dd7
 DIST python-gentoo-patches-3.6.6.tar.xz 13876 BLAKE2B 4be56b54e70c9b83209734097e03a7dbaa8f46ae13e268fc6a7f465ffd052ce03ca9e1fc45f1d432f2de17d4ce16ca8bc684b24344862cd8f52f9d1a90d90b7a SHA512 534b9eaefcbc45908119852a103bf10e400a8628c66aa599812fbceda36810d626d33e6701d1b7866e4df68397f717df6a217cb414049ca6f378eff9f43a27ab
 DIST python-gentoo-patches-3.7.0.tar.xz 12268 BLAKE2B 758b635ff53b6f7bfabb1db632ee2a5c14b163d6d6f14e4e44c31c9ac1591d411f597d42b05707f586f9ff7c3a030703502307bae732bcf003987939eb5b036d SHA512 19dd5bac06bb40622e74e3b16c7fba83f1178417e686eaf61b2b207602c76beebc8c78d675e401ec4d18add1ca033fd47baf2e48e9abb487593b7d821bcaf509
-EBUILD python-2.7.14-r1.ebuild 10807 BLAKE2B 77559a6470686f4f50593cf9ec5a6b836f6e7d5ae0151ade47166f6a636535a0d6104aad66e6aa6b420eedab8b61f45049116384229252994dfef8d299101f68 SHA512 0c246dba278ec82053741ddd9c549e912bbd4a195f525ecc2852ed95f6004a0df66439c038cf9b238a25f031ea00ffc4cadcedfb90e5905cedcc048316253814
-EBUILD python-2.7.14-r2.ebuild 11019 BLAKE2B 178990cb0ee54a3b48581f4f3f17ffd4d63ba0b1d75282376a8b033ea7251806b52bde7880142005a2e4544989becc974be503f3b4d16a07e49b5f7e36ce6829 SHA512 f7ace180b4bee575e04d6500bb30959340646c55ed3457e46151f17f86fcca9d044040adbf5dbab7b7948ceacedf8f039dd8579d01af6fc5693d5c29ae36d1de
-EBUILD python-2.7.15.ebuild 10813 BLAKE2B 3681a8839058870ddb69f9b9b9d4a348672be453c130515a30a8b7b9627127894ebaf33fb60e299cf4b9dc19ea08fbebdb2d54eac482014dbe7da8052053fdd9 SHA512 89a44ecb8ff02d09319b2121517979b4024a2e12274ed858d59baa51ae5d63f16907dcf5fc61aa559ca5cf352ba2ea3d1b2e21166a3dd70b554ba6487b9be742
-EBUILD python-3.4.5-r1.ebuild 10658 BLAKE2B 46398a90c4f67b4923d9c65476f0eceb42135084b0f71f456162557a2c7adf2cf0c6f07e2d9b65d49eb92ee75233c249bfac32a9e5fb1fcdcd67988f19e4033a SHA512 7a2e1312afcfa032aa16579868f2c7efe04eb38904db2b66f11f87e174533c9df89abeb16a28e3f6372651e2a733f885ae5bb78b07cacd150c9ffe8c66f9c2aa
-EBUILD python-3.4.6-r1.ebuild 10588 BLAKE2B f2c2081a1bb9000121854e607f310a52f1c083c840a5a10d4cfaa54d0aba66de8cd994c1cc6df702b4688875ab3327344b1ef86125602dbde353675168b7fb8d SHA512 72c0262b0c4061a97b1098373802d574591d9ae53785494fadd8b8e403d358b5ca7de478a5380b3452c5778f0ad6e186c19c41fb6a28149069096b4b69e9ce28
-EBUILD python-3.4.8-r1.ebuild 10845 BLAKE2B 58fa9357893af72ed60edf615ae02c8522e5deaaf2a0ccf8e849e0601704e3e4cf69ab9567018d5aecf75161012f3dcde71cfb5362a8efa40ff3bf73c86bf579 SHA512 d5e830065f67021b33427dae063df5ce40ddd7ece6c1b21849ec6de6ab7140d4a24a0bcd728afb234495cfe4ce4db24e75235aef9efdd95df7a4b4f0e6e4639f
-EBUILD python-3.4.8.ebuild 10635 BLAKE2B 649637000f5d17abb3f77e527b9c93b21bcb075b9d053cf3bab07d99ce9877844405b8c1335dc0fd392f0dc1f612a318c994018c1437a812cbcd5756069cdebe SHA512 ff3e7c1a7272c96085b6fabf79fb11ceb759a6d84e4cf1317f646f889331a6ed53c4aa776d289382399ba39f9aa3f29997f359446aaf4202ca8492270502ce2a
-EBUILD python-3.5.4-r1.ebuild 10719 BLAKE2B da7ece23e2f6333066b9f5d74f40e21326ec785715a818c95627818ae3c1c8c55aedd88323e5203aa90e69290871daa1baae9802ed6dd1a2a20b7ffbd02eec76 SHA512 ec0248c551531623f02430182c299c0f19ed002c195ae020e8f5b815e9978bf7c10e0a4d85aea312e99472f117cf94089c8644a25e5a8a142f88a62daf9ad332
-EBUILD python-3.5.5-r1.ebuild 10999 BLAKE2B 80e8e0c4f0c09b4deb2f91ddae0536b5f1c8b0e3d14cdb36684a775acad7d2326ba828a8ad5a8b1560c9837ceb6eee592ea16b3c128125d95649aca44757c064 SHA512 01ddee5c0d7a792be45eabbe842ec6bf2fb608ba4d02abc5868559c6bc52e15c4b52e571e01b45557307dccb86a89dc7dcbbbc4dfe7cf96ce99c6e8cc205042f
-EBUILD python-3.5.5.ebuild 10836 BLAKE2B 226dce09f72d149be125be9504ff386e0a897882cbf2aafb3faaa031e1733711e28f1133d49957fb70cc6e1f4494abe6a795895c719be1361cb872926742d494 SHA512 c0ee50ffaaa8d278e65f77ea190770a46b00b6e338cd4f7456b8222e02f7d39cbb5689f0f0f302256371bf351fdeb025128e618e3b8fe455b651f0e90f656fce
-EBUILD python-3.6.3-r1.ebuild 10151 BLAKE2B 9ec6af3cb9b012f3869cf28c5a59f6c3b36ffe403f91b0af02f2892fd083c36190e2d50ce2c81e7f9347b4a08847d1591debaa5d126734dc2d24ee349a897ec5 SHA512 67d93b9c93ee37fc46cf193730550636487b189c57fb47f1fcfc1a3bf2cf12e464df1614ee9b871f0c385c243d9fd2a167be8635a524ca322d0964c04df77f17
-EBUILD python-3.6.4.ebuild 10083 BLAKE2B 7d04d19bbc1163fd3425f666dff268ca58657ea4e6548bbe3320e9c2cec26feefcf66762d709680ad790fdd44e846fd587301b586a6f8f28a0806d7b47e29a1a SHA512 23e3d170b5f28fce900ba35108d8ffdfe654347e3af4c1fdc5920d49264f1976c16eb9393a811b4883c1a5ce94140700411bc8c2e5087a2d3a06abb164749a43
-EBUILD python-3.6.5-r1.ebuild 10387 BLAKE2B eb8fea85856a47017c639189b27cd0ab40da87f7651c51fe745e07813a74416e5e26aec55eb70638b5439fa6a08a92bcb5cb77c121f6bca3f253f1841b71f88e SHA512 2af8033d26fcca0544027c4d60a3b50b14c3e116bf1c97dcfc4c7bb62e63ff4998df75f381300ecef8ed9253e6f65fa7e99ed8f077641acf2204f92724b4274b
-EBUILD python-3.6.5.ebuild 10177 BLAKE2B f44ebef2b81e2f720ae4be5a2d180e19d525f7907dedd45504d32789079e709a5ccdc01b88012e9da0444209784440546cda7efe5ca0f7380c8dd9bcd84a1dcb SHA512 3e9ce618a11497e5d9ff87986354edc8f6b4bb7e6335dc002b505a54f21e412bf1a5ba290309d601976fd1f14cdbff5938de428c05c43c45ab1a855fb58e3c9c
-EBUILD python-3.6.6.ebuild 10224 BLAKE2B 1b68598a5408e045b0cde030208265457edce9b593791ffb1f173890c569889f030118e445dfe8981bb29aee4d7840eee59d178a6a8107a63f98799256253e8f SHA512 be939d6ab2e52104938453aed9bd3bbd0c93dbb5f78a79f078c64646947345c8ceadfc5cd90685a2e63efe4acc52c704aa284d2db7755bcad36cd982e4d66427
-EBUILD python-3.7.0.ebuild 9619 BLAKE2B 7662bd885c16eb9a9cef29ca16ed7e9c632f144641030a96488d5c02ef2871a4e0c919a015f73e191d0481d7e5d8cb404eeb8e159a572d3bd0e25ababd1ef471 SHA512 fa403f5299a7ef598eadad97c5b90c419ced68dc618f6da97dabe21b3280875468477f73a9e5ca71532739f83cbc1c7bc5080cecd543d908d9805b3f08bbf036
+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-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
+EBUILD python-3.4.8.ebuild 10634 BLAKE2B 446ae940d649e95bc88f132c440c2e285b43abdae41c77f1851e86e402c595abf052843a4cde14a20199fec85dd23715305c450cba249dda16d0629ce4f03043 SHA512 86280e6269b28adb5a073e8d37637ea30b0fbcf10aa6ea42676d8af96d6b2c68ad31c6d09af5cfe561151ce5d62f15503898d4e131ddd191baba2ad6abe07f7a
+EBUILD python-3.5.4-r1.ebuild 10718 BLAKE2B ff785e12f910014b140ee718ae961496927996120d13a5ee1ff3c2803cd82554b356ad87251abfaa0a76a4aa8c9ac370a0cebd1a0f6f346250ce5ca1f888f8dd SHA512 8784ee3a2d7e850c0a8b53bb3f5b3ac882fe447db075fbc94cbe5c17b7b3885f000d8c1679a7d7a7c3098d7f488b77656e378d125ecd2250bbdd186b3777fda3
+EBUILD python-3.5.5-r1.ebuild 10998 BLAKE2B 2cd1c3cf07eb7bf4d4ffa28c259f0f618ee19f208ac979a8bf5b990e785b40c00fc25bb296ff72489348ca6e3b7537899b71b1f3def4eb5dfad85ba45739085a SHA512 3098153db6e80226743b18eef3ce8a390b8e38e5c7cd145fc4431cd6677fe852f5794a95a88e9923777bdfc804d3b2d659179cfd3693d5ee414edee7a08482cf
+EBUILD python-3.5.5.ebuild 10835 BLAKE2B 3963285067d084dac6a95b3a362b47f097c25e3d2bc8699e47c66b2322aaa4cd4a59bf61774a075356f770ea4328f076650e10b5cf1789e9d312c974928e39f4 SHA512 8286b1a0494984743fdb7d0b7ea6c8a0a8a91f8774f67b2cbd10988a53cc3de3f1d0f5ba135e4b7fc59aa6edaf097363e56f69fd6d01f7d1973aa36797fcdc20
+EBUILD python-3.6.3-r1.ebuild 10150 BLAKE2B 25536b241f8d90b4501efd7064faf10da7759fc72b81d562cdc93d8f13696a962da62f18a4a854cbfe4658345f25879c9c0b3c532ce46ad1857e0ec84138aba0 SHA512 2cae98cfeef9a34489c5e63a70c17a967f31c154f92520913a65488ca43a807603ad55224162f54124b39490195ddf0a868681e12da0946e4788bb637c325787
+EBUILD python-3.6.4.ebuild 10082 BLAKE2B 9b76bfa3c71f1593800425a21122bd395aeabe212ee6a0965272d53edf9b5f82f9262970b7742fee2e039e4ceecd68fb2511928250bbb9419f738a6b77443bdf SHA512 6a0460274d717582704e063771565fd6e670a2b72148997cc80908238c3e070abdfd794e0ec902c5344207bbf089c126da3c9f10e25b5e06b452e70e758c4a29
+EBUILD python-3.6.5-r1.ebuild 10386 BLAKE2B 83ae787d5e2aea12a082ff1d23a07ec82b2ffddf952ff0f3893d6f19a5895bb019737acc01b6ef359a78128c12998ed7c4db2e1142c3d464bef2428da24594d6 SHA512 7ae3b62f137bc588188b44bfd29f96de4205ed607abe2efbd91b2b4f4a82181c8cc623a88df30a2b6e92c4039e98a8600f06c1c2554963a09b1bb55ae7c8b58f
+EBUILD python-3.6.5.ebuild 10176 BLAKE2B f12972b6a9e4890bd148e47e666f9e63b51bb2de34a1624fa99e3900a5e31092433b917d85a6044eb76dabb6f4bbaf354f35e8547bc91704a108d6f8dc079e3c SHA512 72ea63116b9513535d57682dae6d9f52a1cd26d4da4e1ecbecc67e8d11d6ef1a4764fdb863bfb8d74a42d19133035f0797af589c91293ccee3bb289e6b429707
+EBUILD python-3.6.6.ebuild 10223 BLAKE2B 537eb12730b78248ce68d3812327b142313d0990bf9e82eabc71a4406a1b3edea93057cf4ffd7483821612bd9fff98f9854bbb2f0b9fa3ba77cdd39dc28a2982 SHA512 2c8aa67af5d31ce80ff3a489919753d5e6c24855f400e34ed24579ccb7b77ec6908a5eb926c453293bfae874b6588277672b7bbc8344916abd6b906d875fdbac
+EBUILD python-3.7.0.ebuild 9618 BLAKE2B 5cfbe7810e6a499caa886df24d25932b6f8b27430c029a235eb35d885f1199b6a998703b5d171e62b45ec1b4092825cbd593dcc45f8ad37e0653fcde3224673f SHA512 aa799fde9af31a1fa70cf1b98ae34799a95da0095d1ada59b9aa5aad172064c20e8027f989f7e08af10681a322e82e0cc477dd2430e887b114fbf35c88cdbad4
 MISC metadata.xml 819 BLAKE2B 120c7c65d77488e726c5a0f4aa19469867ea6900e747169fae2f9cf8f14ec2936089d5edfe1935ce610bec26387273e261b1cc4b023680c8c4b229f2141a7223 SHA512 08f45707e5490067a21951b9d37c8ae67064ab67cccc5b8d8c204eab8d4a004fb910627b62989c67b849b89d301618f8f8f7996e99e1ef5bab38a239c49c124d
diff --git a/dev-lang/python/python-2.7.14-r1.ebuild b/dev-lang/python/python-2.7.14-r1.ebuild
index 551734096a4a..46a254fb0311 100644
--- a/dev-lang/python/python-2.7.14-r1.ebuild
+++ b/dev-lang/python/python-2.7.14-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"
@@ -26,7 +26,7 @@ IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurs
 
 RDEPEND="app-arch/bzip2:0=
 	>=sys-libs/zlib-1.1.3:0=
-	virtual/libffi
+	virtual/libffi:=
 	virtual/libintl
 	berkdb? ( || (
 		sys-libs/db:5.3
diff --git a/dev-lang/python/python-2.7.14-r2.ebuild b/dev-lang/python/python-2.7.14-r2.ebuild
index 44795a2ff031..cc59a5124337 100644
--- a/dev-lang/python/python-2.7.14-r2.ebuild
+++ b/dev-lang/python/python-2.7.14-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"
@@ -26,7 +26,7 @@ IUSE="-berkdb bluetooth build doc elibc_uclibc examples gdbm hardened ipv6 libre
 
 RDEPEND="app-arch/bzip2:0=
 	>=sys-libs/zlib-1.1.3:0=
-	virtual/libffi
+	virtual/libffi:=
 	virtual/libintl
 	berkdb? ( || (
 		sys-libs/db:5.3
diff --git a/dev-lang/python/python-2.7.15.ebuild b/dev-lang/python/python-2.7.15.ebuild
index f74ec7b7f448..f6f405968445 100644
--- a/dev-lang/python/python-2.7.15.ebuild
+++ b/dev-lang/python/python-2.7.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"
@@ -26,7 +26,7 @@ IUSE="-berkdb bluetooth build doc elibc_uclibc examples gdbm hardened ipv6 libre
 
 RDEPEND="app-arch/bzip2:0=
 	>=sys-libs/zlib-1.1.3:0=
-	virtual/libffi
+	virtual/libffi:=
 	virtual/libintl
 	berkdb? ( || (
 		sys-libs/db:5.3
diff --git a/dev-lang/python/python-3.4.5-r1.ebuild b/dev-lang/python/python-3.4.5-r1.ebuild
index ba53f11277db..854a0393abe8 100644
--- a/dev-lang/python/python-3.4.5-r1.ebuild
+++ b/dev-lang/python/python-3.4.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"
@@ -28,7 +28,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="app-arch/bzip2:0=
 	app-arch/xz-utils:0=
 	>=sys-libs/zlib-1.1.3:0=
-	virtual/libffi
+	virtual/libffi:=
 	virtual/libintl
 	gdbm? ( sys-libs/gdbm:0=[berkdb] )
 	ncurses? (
diff --git a/dev-lang/python/python-3.4.6-r1.ebuild b/dev-lang/python/python-3.4.6-r1.ebuild
index 00a9bfb9c67b..9875d5dbd8ed 100644
--- a/dev-lang/python/python-3.4.6-r1.ebuild
+++ b/dev-lang/python/python-3.4.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="5"
@@ -27,7 +27,7 @@ IUSE="build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline
 RDEPEND="app-arch/bzip2:0=
 	app-arch/xz-utils:0=
 	>=sys-libs/zlib-1.1.3:0=
-	virtual/libffi
+	virtual/libffi:=
 	virtual/libintl
 	gdbm? ( sys-libs/gdbm:0=[berkdb] )
 	ncurses? ( >=sys-libs/ncurses-5.2:0= )
diff --git a/dev-lang/python/python-3.4.8-r1.ebuild b/dev-lang/python/python-3.4.8-r1.ebuild
index 5534c1784879..0d3fb720671e 100644
--- a/dev-lang/python/python-3.4.8-r1.ebuild
+++ b/dev-lang/python/python-3.4.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="5"
@@ -27,7 +27,7 @@ IUSE="bluetooth build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses
 RDEPEND="app-arch/bzip2:0=
 	app-arch/xz-utils:0=
 	>=sys-libs/zlib-1.1.3:0=
-	virtual/libffi
+	virtual/libffi:=
 	virtual/libintl
 	gdbm? ( sys-libs/gdbm:0=[berkdb] )
 	ncurses? (
diff --git a/dev-lang/python/python-3.4.8.ebuild b/dev-lang/python/python-3.4.8.ebuild
index e5db42e682c7..6045de218724 100644
--- a/dev-lang/python/python-3.4.8.ebuild
+++ b/dev-lang/python/python-3.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="5"
@@ -27,7 +27,7 @@ IUSE="build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline
 RDEPEND="app-arch/bzip2:0=
 	app-arch/xz-utils:0=
 	>=sys-libs/zlib-1.1.3:0=
-	virtual/libffi
+	virtual/libffi:=
 	virtual/libintl
 	gdbm? ( sys-libs/gdbm:0=[berkdb] )
 	ncurses? (
diff --git a/dev-lang/python/python-3.5.4-r1.ebuild b/dev-lang/python/python-3.5.4-r1.ebuild
index 3e416a39721d..b9cb90871000 100644
--- a/dev-lang/python/python-3.5.4-r1.ebuild
+++ b/dev-lang/python/python-3.5.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="5"
@@ -28,7 +28,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="app-arch/bzip2:0=
 	app-arch/xz-utils:0=
 	>=sys-libs/zlib-1.1.3:0=
-	virtual/libffi
+	virtual/libffi:=
 	virtual/libintl
 	gdbm? ( sys-libs/gdbm:0=[berkdb] )
 	ncurses? (
diff --git a/dev-lang/python/python-3.5.5-r1.ebuild b/dev-lang/python/python-3.5.5-r1.ebuild
index 77783a7b54ed..1efa1605dc2e 100644
--- a/dev-lang/python/python-3.5.5-r1.ebuild
+++ b/dev-lang/python/python-3.5.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"
@@ -28,7 +28,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="app-arch/bzip2:0=
 	app-arch/xz-utils:0=
 	>=sys-libs/zlib-1.1.3:0=
-	virtual/libffi
+	virtual/libffi:=
 	virtual/libintl
 	gdbm? ( sys-libs/gdbm:0=[berkdb] )
 	ncurses? ( >=sys-libs/ncurses-5.2:0= )
diff --git a/dev-lang/python/python-3.5.5.ebuild b/dev-lang/python/python-3.5.5.ebuild
index 18589e23069a..a38e7d4673aa 100644
--- a/dev-lang/python/python-3.5.5.ebuild
+++ b/dev-lang/python/python-3.5.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"
@@ -28,7 +28,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="app-arch/bzip2:0=
 	app-arch/xz-utils:0=
 	>=sys-libs/zlib-1.1.3:0=
-	virtual/libffi
+	virtual/libffi:=
 	virtual/libintl
 	gdbm? ( sys-libs/gdbm:0=[berkdb] )
 	ncurses? ( >=sys-libs/ncurses-5.2:0= )
diff --git a/dev-lang/python/python-3.6.3-r1.ebuild b/dev-lang/python/python-3.6.3-r1.ebuild
index a725f4bf9888..d6721a3055ec 100644
--- a/dev-lang/python/python-3.6.3-r1.ebuild
+++ b/dev-lang/python/python-3.6.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="5"
@@ -28,7 +28,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="app-arch/bzip2:0=
 	app-arch/xz-utils:0=
 	>=sys-libs/zlib-1.1.3:0=
-	virtual/libffi
+	virtual/libffi:=
 	virtual/libintl
 	gdbm? ( sys-libs/gdbm:0=[berkdb] )
 	ncurses? (
diff --git a/dev-lang/python/python-3.6.4.ebuild b/dev-lang/python/python-3.6.4.ebuild
index 522b5b5078a4..bc7956480f11 100644
--- a/dev-lang/python/python-3.6.4.ebuild
+++ b/dev-lang/python/python-3.6.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"
@@ -28,7 +28,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="app-arch/bzip2:0=
 	app-arch/xz-utils:0=
 	>=sys-libs/zlib-1.1.3:0=
-	virtual/libffi
+	virtual/libffi:=
 	virtual/libintl
 	gdbm? ( sys-libs/gdbm:0=[berkdb] )
 	ncurses? (
diff --git a/dev-lang/python/python-3.6.5-r1.ebuild b/dev-lang/python/python-3.6.5-r1.ebuild
index 1b6857af96bd..d68506f47d5f 100644
--- a/dev-lang/python/python-3.6.5-r1.ebuild
+++ b/dev-lang/python/python-3.6.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"
@@ -28,7 +28,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="app-arch/bzip2:0=
 	app-arch/xz-utils:0=
 	>=sys-libs/zlib-1.1.3:0=
-	virtual/libffi
+	virtual/libffi:=
 	virtual/libintl
 	gdbm? ( sys-libs/gdbm:0=[berkdb] )
 	ncurses? ( >=sys-libs/ncurses-5.2:0= )
diff --git a/dev-lang/python/python-3.6.5.ebuild b/dev-lang/python/python-3.6.5.ebuild
index 2b8333b1fec8..07d92a8c3ab8 100644
--- a/dev-lang/python/python-3.6.5.ebuild
+++ b/dev-lang/python/python-3.6.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"
@@ -28,7 +28,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="app-arch/bzip2:0=
 	app-arch/xz-utils:0=
 	>=sys-libs/zlib-1.1.3:0=
-	virtual/libffi
+	virtual/libffi:=
 	virtual/libintl
 	gdbm? ( sys-libs/gdbm:0=[berkdb] )
 	ncurses? ( >=sys-libs/ncurses-5.2:0= )
diff --git a/dev-lang/python/python-3.6.6.ebuild b/dev-lang/python/python-3.6.6.ebuild
index 005fb4f6783b..4cc794c4ad27 100644
--- a/dev-lang/python/python-3.6.6.ebuild
+++ b/dev-lang/python/python-3.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"
@@ -28,7 +28,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="app-arch/bzip2:0=
 	app-arch/xz-utils:0=
 	>=sys-libs/zlib-1.1.3:0=
-	virtual/libffi
+	virtual/libffi:=
 	virtual/libintl
 	gdbm? ( sys-libs/gdbm:0=[berkdb] )
 	ncurses? ( >=sys-libs/ncurses-5.2:0= )
diff --git a/dev-lang/python/python-3.7.0.ebuild b/dev-lang/python/python-3.7.0.ebuild
index e3cebf3af955..8b310678105c 100644
--- a/dev-lang/python/python-3.7.0.ebuild
+++ b/dev-lang/python/python-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"
@@ -28,7 +28,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="app-arch/bzip2:0=
 	app-arch/xz-utils:0=
 	>=sys-libs/zlib-1.1.3:0=
-	virtual/libffi
+	virtual/libffi:=
 	virtual/libintl
 	gdbm? ( sys-libs/gdbm:0=[berkdb] )
 	ncurses? ( >=sys-libs/ncurses-5.2:0= )
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 006e7989114e..bf8b4678ca13 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -13,9 +13,9 @@ DIST ruby-2.5.1.tar.xz 11348108 BLAKE2B ea1019a81f96169ab8d435215362b36b098df373
 DIST ruby-patches-2.3.7.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 6873 BLAKE2B ba2a6dac0d1a97c16b362348d4e693a46092fb0b6ed1834d2e91038aae254ed1005da06499673adc1b4751cb96865b2932eab1f24f74144f6030ecf7f358c8e1 SHA512 e1b9a05c7778d6859a778b90ea88401ff5a314bbad99e99c900f0434332154dddb9fa19eec25d8d112d879fb26ab114dcb62971396a57a81b03272f67e997c40
-EBUILD ruby-2.4.4-r1.ebuild 6614 BLAKE2B fcefec91b4b2dbebc60933f0d99bacd607f17ac8a5cb3219c4d2883b84ec80fc96cb959e94b337aa8820e39c0297071ccb89c6c3f9fdb823a0fe1f36cd8a71ff SHA512 394540a7ff8ae0ccd2074212a9afc666cc743d1ac85d6d0ea3e680e9088a248231d360b345c89ac2bb98bb12804cec2035952606eb938665df0ba6556b93d6e5
-EBUILD ruby-2.4.4.ebuild 6980 BLAKE2B 2a08be5225e43fd5e5d7c90ff63ed43b6eab9b6e69ac1df7aead9657d651267e8bc0e741e16a276bee7fe5ecca5565d17d1428d96e5713305d278f251cdd99f4 SHA512 f43e497753a3fcfc0ff3e4ff840ae8cf3003671da0fe55e62651c17592f885cdbb99ed76ff6b99581ffd0903d23bc03b5425839f884f9e0e7ed925fb748edd4d
-EBUILD ruby-2.5.1-r1.ebuild 6406 BLAKE2B 8bdfbb254c15eade779454f1688038ed1fb13955d57e88c36c6a7a2e11e9efa7c20d680ce2e7422e92d1bfe8b4f59ba7dbe3282fb60ba1c6a070143c047a22d2 SHA512 b161c3b9848f9580de3f30474dcb49c0b71a09864b33e63e0882826e17be454dcaa566f7dd74f6a7e0d856df12dd79d39aed534ad65258fbf1ecaa4a40512d10
-EBUILD ruby-2.5.1.ebuild 6772 BLAKE2B f9ac0a58ebcd718715fb67cbbe90cc853a14d8ba717bd91e93645115c5b37dc4def3827dbd01ba7b91138468b124c3581f90a133e88884a7f2b9a902f3b4ad82 SHA512 ed302d0d2a27d002a1b89aaea3b25ce6c88660f1fd30469cc2d292cfe3679bc477b6f8ac986964db45541db091be3040ee8dc8a76f5c10995d307dcb4246042b
+EBUILD ruby-2.3.7.ebuild 6872 BLAKE2B d7cf4b0319f63d9485130c17a393671da672e4f6a4227147be161f0f3e941b8f9b2da4b43168018909ac38b002bea7348f8781fa5a7868913e0b88261dbbd874 SHA512 302d8e3feb1d532eab9e9b5e60d258ceec22a44d40c9adba4cc27d5460dc05deb932777163f06e39975756090a448a73af96c801288b0c3912cca4c591a3cd43
+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.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
diff --git a/dev-lang/ruby/ruby-2.3.7.ebuild b/dev-lang/ruby/ruby-2.3.7.ebuild
index aad01a2cc30a..a65f51e5afc9 100644
--- a/dev-lang/ruby/ruby-2.3.7.ebuild
+++ b/dev-lang/ruby/ruby-2.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=5
@@ -49,7 +49,7 @@ RDEPEND="
 	ncurses? ( sys-libs/ncurses:0= )
 	readline?  ( sys-libs/readline:0= )
 	dev-libs/libyaml
-	virtual/libffi
+	virtual/libffi:=
 	sys-libs/zlib
 	>=app-eselect/eselect-ruby-20151229
 	!<dev-ruby/rdoc-3.9.4
diff --git a/dev-lang/ruby/ruby-2.4.4-r1.ebuild b/dev-lang/ruby/ruby-2.4.4-r1.ebuild
index dec2991fe7a8..f56853e06c91 100644
--- a/dev-lang/ruby/ruby-2.4.4-r1.ebuild
+++ b/dev-lang/ruby/ruby-2.4.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
@@ -34,7 +34,7 @@ RDEPEND="
 		dev-lang/tk:0=[threads]
 	)
 	dev-libs/libyaml
-	virtual/libffi
+	virtual/libffi:=
 	sys-libs/zlib
 	>=app-eselect/eselect-ruby-20161226
 	!<dev-ruby/rdoc-3.9.4
diff --git a/dev-lang/ruby/ruby-2.4.4.ebuild b/dev-lang/ruby/ruby-2.4.4.ebuild
index 76b123a6e62f..038d354bd15d 100644
--- a/dev-lang/ruby/ruby-2.4.4.ebuild
+++ b/dev-lang/ruby/ruby-2.4.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
@@ -47,7 +47,7 @@ RDEPEND="
 		dev-lang/tk:0=[threads]
 	)
 	dev-libs/libyaml
-	virtual/libffi
+	virtual/libffi:=
 	sys-libs/zlib
 	>=app-eselect/eselect-ruby-20161226
 	!<dev-ruby/rdoc-3.9.4
diff --git a/dev-lang/ruby/ruby-2.5.1-r1.ebuild b/dev-lang/ruby/ruby-2.5.1-r1.ebuild
index d5c3f48de2dd..63877c7dfd3e 100644
--- a/dev-lang/ruby/ruby-2.5.1-r1.ebuild
+++ b/dev-lang/ruby/ruby-2.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
@@ -34,7 +34,7 @@ RDEPEND="
 		dev-lang/tk:0=[threads]
 	)
 	dev-libs/libyaml
-	virtual/libffi
+	virtual/libffi:=
 	sys-libs/zlib
 	>=app-eselect/eselect-ruby-20171225
 "
diff --git a/dev-lang/ruby/ruby-2.5.1.ebuild b/dev-lang/ruby/ruby-2.5.1.ebuild
index a6c97c1a7362..4b253b680268 100644
--- a/dev-lang/ruby/ruby-2.5.1.ebuild
+++ b/dev-lang/ruby/ruby-2.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
@@ -47,7 +47,7 @@ RDEPEND="
 		dev-lang/tk:0=[threads]
 	)
 	dev-libs/libyaml
-	virtual/libffi
+	virtual/libffi:=
 	sys-libs/zlib
 	>=app-eselect/eselect-ruby-20171225
 "
diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest
index 72322ebdd452..af03d83974dd 100644
--- a/dev-lang/rust-bin/Manifest
+++ b/dev-lang/rust-bin/Manifest
@@ -1,21 +1,8 @@
-DIST rust-1.25.0-arm-unknown-linux-gnueabi.tar.gz 152771389 BLAKE2B b163a41846233f08ba34ba325058843141b285758eede668e84d32751ace27d4b36fc5e8f963e1d13da1b46ae7cb48944987acc7ff36ced300bee154c7b22e68 SHA512 33a7bb3ed7a0b5b85e5dc0438ff620b67bc7bfe4d5e35bdcc9207a5dddf017a588a7de4877c4f1784f22f1d6e503ddd24d57f3d3af94d4bf00c781d4c378bb5f
-DIST rust-1.25.0-arm-unknown-linux-gnueabihf.tar.gz 152774994 BLAKE2B 438fc55edcf80f1f292765c7d062c7c2e282c7798d0ca7312557262a7474f60341aae1c9a3f5bfe349576f7204fe1fa044dded933157b128e6c6015e23c89388 SHA512 688e8e0d2e5661f132033afe8020a93828a45d00a874155a1a7887c69590061a413db95f0443d43234fb65b5510dfd7bdb092c0cc7b3fde6abd5f386786d95ad
-DIST rust-1.25.0-armv7-unknown-linux-gnueabihf.tar.gz 150376603 BLAKE2B 44aadf00b74d3d35039486289b319db5b1820dfb3b0fdbc03714ae2a8df78e09ee09fa41d9d8ec1377b91fb4a8f67cd7f4cdc99ceb39da4b48ba464ee1b73600 SHA512 a45312bec4c06b04d3c148d87a64aa55e14cc160eaaa6b712ce738590063137c8f9dd1030656071c1ac9a22cb852f34efdb98c435527c7371da381b802fb9104
-DIST rust-1.25.0-i686-unknown-linux-gnu.tar.gz 169267482 BLAKE2B 8fb18c95adf7edd74cd305683ab2ee33d59cce1a0f515e9ba63dfd105ffaf9150444e281502747856fa5164f24707b4bbbe110a2b1b7a1cf65c96b883a6f2ede SHA512 76bcd978b9b23b0fc6315f91bed153e59616aa62f520aae8e8d3587b5f5fae74fef15f8b0a749b02a69be56fad4df9a413019438135481917bca1fb1a7704de7
-DIST rust-1.25.0-x86_64-unknown-linux-gnu.tar.gz 178696930 BLAKE2B 0f82e837494d394c86462583f3d65f1ad839a97eda00fbc00476d06255831088cb7e554cc14edbf9dd23fbebf75078dc78204bdbec4795781f7fae0cbb6de63d SHA512 544e85bb69359d8ff6059d0f470b5995822f73e6d361be43f69f87d394b7252a11686f835336930bc257ba4347c0498abf5b1fbd751180d96bd9ca872b76d65c
-DIST rust-1.28.0-aarch64-unknown-linux-gnu.tar.xz 98937652 BLAKE2B 836d3dd4e583fa50dd317c3bea56257e6ea19defdb38c16be6debb2854e147c8a92c4832263e4ac314136022a176526fe7d3774a3c5a84cd8d364cd2a1532860 SHA512 8d9acbc90ddaa1e0de0234a21798b19b5365ea371a12f9a143c6ebacbb48f57344da6e827e867513be502bce2801de27a0dbbacdf8618c653aeb58026b6c469c
-DIST rust-1.28.0-arm-unknown-linux-gnueabi.tar.xz 104676648 BLAKE2B b26b23c3605e6584c51e0e914dbb3be60996e079e52ff2d4850ed43c1f1f7cd5ac575b40dbe852f927d36654f5ab7e384548f3a92b3466bfbb1cda7f9f069bcb SHA512 a1eaf1d7826ebfe222d233cabd8b88073ca2c8dd42a0b870e324dfc63e7290308418222c56802bc421c9bda119dc7c5f3e225ff33cacad5776b79cbcc1a877b2
-DIST rust-1.28.0-arm-unknown-linux-gnueabihf.tar.xz 104992084 BLAKE2B df97766d7abf73f668a2936834bc0f35739289eeeb5395276a2fdfd5b6c0baee3ba1eee1099f19d4f4f1cbd1a33cf62ad888dd3d1856b613ac853c6a17650741 SHA512 3b58b83f38bf8d8e841ae6614d72bb6e6faf75fb7c19abc5451548b0e6de0ef3b64dfbc70481a1e40f74074bfad701aa7a58296b4a0d07957a418bd3cd769917
-DIST rust-1.28.0-armv7-unknown-linux-gnueabihf.tar.xz 105144132 BLAKE2B d9e0791c7dc77ade26d383a5c57117a2b7b50c6a523b31fbf604c0b779c966c5055554f85c718353f2e581bfe8a228369671a8b731f808bc0133ad3fad61f853 SHA512 9142110e0c24657aca41468648d9364c2e6fce60b08ca7113c944a53701fc5a309481a8fdd5845b229bcc750ccad63af561d452c3a3a0727ab1ca7a461b06d3d
-DIST rust-1.28.0-i686-unknown-linux-gnu.tar.xz 136925948 BLAKE2B 85d9239533920c3f16d7c61bada0caeabceceade29032b70bb4562bfd04fa0158cdd85b8a0a1119506416fa5916ade8a0466bf6c10da457299a6319aa25f9dd6 SHA512 ffdfab46db14f07354b553e02fdb9dc6602c2c52b78d8f17c499f4ddb1e257aa53479df836eb3f06a2548d34296b0277cdb6b4c6f3cec57265823df22752c135
-DIST rust-1.28.0-x86_64-unknown-linux-gnu.tar.xz 134120432 BLAKE2B 56fb79a98659d9c8e56b8eef87dea3302ee5901bc4507d1c204628370b20cf34b2875c9586faa0acc2bc2b1a5beedeb9b5ba199cfb85d52f268f084a02f04f27 SHA512 4f427c11a9cd22aedd01bd7ed5bee2ba5e00a27db25af4f596cf8627d88eff8e72625eb83729d2e6c6780aaffd44c0e7065a1c8fa22f4899349b72c726cf6a5f
 DIST rust-1.29.1-aarch64-unknown-linux-gnu.tar.xz 100127240 BLAKE2B 32bebfcb3fe9c12bc0404d1a7980d09a3e96117d93eccc3f76601a4a06ff5ab9d4627bc50ce00b6c69723379a2ebf3e3f25b9724b1bd2dc00c001b28fd70b916 SHA512 fae658f99069b599e3ec17e5a6b80f3c726937dd4751e375a003583ac6feeeb5f68bdd9e55c8ab84a0974607a45e08eaaad9e373f5a9b4bc172d2c986664d671
 DIST rust-1.29.1-arm-unknown-linux-gnueabi.tar.xz 105764732 BLAKE2B 552c0df65a1ca1ff094d25ddbdaf6e50b4faa1123677b796eb6a5aec2f8cba7f9ede9611aa2e7ffd7c4e39d578f166e73e4c9916a8db7a7652b006364ea78601 SHA512 cd5ea55b3c4f67deeb9a2688fea6800ebac1bbabfa5ce8d37f6ca0c1628cde9770831a0ec894309ca86dfed9faa3949c479e5b546abfaebcc6431f7709f487b2
 DIST rust-1.29.1-arm-unknown-linux-gnueabihf.tar.xz 106051860 BLAKE2B 65d9a5f75540cdfedf89ebbe30f04fce964a3e1d27479a8393924c5b6a1cd77883c7d54b9e1634378febe6a2ec3ec04f6ba403e15afc43e6cc5b32902932ba57 SHA512 aea98cbe613abf8fbba45806356a26776bc369c4100658fc613bf730d7f7ed6aeb413cbfefa5eb77da80008dce95264b8bcbe420804b32ad577c5821203fe151
 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
-EBUILD rust-bin-1.25.0.ebuild 3456 BLAKE2B c25d70226b0ea86619e749fce47b34706b08257bb0a33f99d6ceeff477040e1dadb4daa830e9c23463f4b20283109292c499dc216753ab9070717275800a8133 SHA512 a423705eb4fc96bd0fe3efe5f79187be88f46a965c1735a65c1990b43917d8d2fb8298b536375db590edd25314c41fa0aef344f8444c9413426013885f0adcc7
-EBUILD rust-bin-1.28.0-r1.ebuild 4998 BLAKE2B eac6ae3906f8fdaa51d903ddafd37f1bef5821415c2e74b618358b6abeabd856141b252627c2a9a8a5d02dd75cc7fc13087beb3a86407e2ffeff7797544bb7ac SHA512 f9997cda1d0b9be957ac1acff603db3d950ee1e9c46ea7613e761348a8144b2c4ecc2d4a3fe696be604fbc665bc24aa3652b4c9d22d693706d8bdd7d464bc33c
-EBUILD rust-bin-1.29.1.ebuild 5622 BLAKE2B 40139b3cdbca4be7d71b029e0da3d27d901e4553e3c6ea47a4682cfa36a8ccb9f76f7b4cfa0bce50efd42de87923d93d539d32d89809d9473d6e3837be2a125f SHA512 5ca2dc61748fb2e008813c826a218ab14c29aae9e14cbd36ddba1bed9a661cc72512082c6fd211e160835ead1a67a7daa8d5e08a6d2ff7d5af65dc19f62f661e
+EBUILD rust-bin-1.29.1.ebuild 5653 BLAKE2B 77ac557fd404c79aa691a6ba7f78b8113c2af5e2e769e6546a9806b02eebf0fc3eab96b9dbd495d47643d33cc7395ccebb9e4cf7f5183f50acec503ff5170046 SHA512 1151d8c5783a0ea17069b00a0d906b2a2777932bd21859bb8095fca2488fc7117634f44ddbcb054621ca1cf7a83ad3662ac986a2bde2a789c2f9d55a8fb015c1
 MISC metadata.xml 435 BLAKE2B 5725f771e138720715bb1a5f317bbe0757d981da2059320e5be70583c3a98dcc4fc23141a3b489cdcffa2a53dfaf621b0ee0336a3ca6a05bf7bf8db1b06cf0c3 SHA512 af938d75754d54ed33a87410cdac16fe4b74614e3c5e352c2c1f906137f0a3e96a2eb1036d0aa7b2a17b629b05d44fdf44348b53f7720c770c6e6cae2a715f16
diff --git a/dev-lang/rust-bin/rust-bin-1.25.0.ebuild b/dev-lang/rust-bin/rust-bin-1.25.0.ebuild
deleted file mode 100644
index 0d270141b6dc..000000000000
--- a/dev-lang/rust-bin/rust-bin-1.25.0.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils bash-completion-r1 toolchain-funcs
-
-MY_P="rust-${PV}"
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="https://www.rust-lang.org/"
-SRC_URI="amd64? ( https://static.rust-lang.org/dist/${MY_P}-x86_64-unknown-linux-gnu.tar.gz )
-	arm? (
-		https://static.rust-lang.org/dist/${MY_P}-arm-unknown-linux-gnueabi.tar.gz
-		https://static.rust-lang.org/dist/${MY_P}-arm-unknown-linux-gnueabihf.tar.gz
-		https://static.rust-lang.org/dist/${MY_P}-armv7-unknown-linux-gnueabihf.tar.gz
-		)
-	x86? ( https://static.rust-lang.org/dist/${MY_P}-i686-unknown-linux-gnu.tar.gz )"
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-SLOT="stable"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-DEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
-	!dev-lang/rust:0
-"
-RDEPEND="${DEPEND}"
-
-QA_PREBUILT="
-	opt/${P}/bin/rustc-bin-${PV}
-	opt/${P}/bin/rustdoc-bin-${PV}
-	opt/${P}/lib/*.so
-	opt/${P}/lib/rustlib/*/lib/*.so
-	opt/${P}/lib/rustlib/*/lib/*.rlib*
-"
-
-pkg_pretend () {
-	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
-		die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
-	fi
-}
-
-src_unpack() {
-	default
-
-	local postfix
-	use amd64 && postfix=x86_64-unknown-linux-gnu
-
-	if use arm && [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv6* ]]; then
-		postfix=arm-unknown-linux-gnueabi
-	elif use arm && [[ ${CHOST} == armv6*h* ]]; then
-		postfix=arm-unknown-linux-gnueabihf
-	elif use arm && [[ ${CHOST} == armv7*h* ]]; then
-		postfix=armv7-unknown-linux-gnueabihf
-        fi
-
-	use x86 && postfix=i686-unknown-linux-gnu
-	mv "${WORKDIR}/${MY_P}-${postfix}" "${S}" || die
-}
-
-src_install() {
-	local std=$(grep 'std' ./components)
-	local components="rustc,${std}"
-	use doc && components="${components},rust-docs"
-	./install.sh \
-		--components="${components}" \
-		--disable-verify \
-		--prefix="${D}/opt/${P}" \
-		--mandir="${D}/usr/share/${P}/man" \
-		--disable-ldconfig \
-		|| die
-
-	local rustc=rustc-bin-${PV}
-	local rustdoc=rustdoc-bin-${PV}
-	local rustgdb=rust-gdb-bin-${PV}
-
-	mv "${D}/opt/${P}/bin/rustc" "${D}/opt/${P}/bin/${rustc}" || die
-	mv "${D}/opt/${P}/bin/rustdoc" "${D}/opt/${P}/bin/${rustdoc}" || die
-	mv "${D}/opt/${P}/bin/rust-gdb" "${D}/opt/${P}/bin/${rustgdb}" || die
-
-	dosym "../../opt/${P}/bin/${rustc}" "/usr/bin/${rustc}"
-	dosym "../../opt/${P}/bin/${rustdoc}" "/usr/bin/${rustdoc}"
-	dosym "../../opt/${P}/bin/${rustgdb}" "/usr/bin/${rustgdb}"
-
-	cat <<-EOF > "${T}"/50${P}
-	LDPATH="/opt/${P}/lib"
-	MANPATH="/usr/share/${P}/man"
-	EOF
-	doenvd "${T}"/50${P}
-
-	cat <<-EOF > "${T}/provider-${P}"
-	/usr/bin/rustdoc
-	/usr/bin/rust-gdb
-	EOF
-	dodir /etc/env.d/rust
-	insinto /etc/env.d/rust
-	doins "${T}/provider-${P}"
-}
-
-pkg_postinst() {
-	eselect rust update --if-unset
-
-	elog "Rust installs a helper script for calling GDB now,"
-	elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV},"
-
-	if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
-		elog "install app-emacs/rust-mode to get emacs support for rust."
-	fi
-
-	if has_version app-editors/gvim || has_version app-editors/vim; then
-		elog "install app-vim/rust-vim to get vim support for rust."
-	fi
-
-	if has_version 'app-shells/zsh'; then
-		elog "install app-shells/rust-zshcomp to get zsh completion for rust."
-	fi
-}
-
-pkg_postrm() {
-	eselect rust unset --if-invalid
-}
diff --git a/dev-lang/rust-bin/rust-bin-1.28.0-r1.ebuild b/dev-lang/rust-bin/rust-bin-1.28.0-r1.ebuild
deleted file mode 100644
index 0cc40a09a3fa..000000000000
--- a/dev-lang/rust-bin/rust-bin-1.28.0-r1.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils bash-completion-r1 versionator toolchain-funcs
-
-MY_P="rust-${PV}"
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="https://www.rust-lang.org/"
-SRC_URI="amd64? ( https://static.rust-lang.org/dist/${MY_P}-x86_64-unknown-linux-gnu.tar.xz )
-	arm? (
-		https://static.rust-lang.org/dist/${MY_P}-arm-unknown-linux-gnueabi.tar.xz
-		https://static.rust-lang.org/dist/${MY_P}-arm-unknown-linux-gnueabihf.tar.xz
-		https://static.rust-lang.org/dist/${MY_P}-armv7-unknown-linux-gnueabihf.tar.xz
-		)
-	arm64? ( https://static.rust-lang.org/dist/${MY_P}-aarch64-unknown-linux-gnu.tar.xz )
-	x86? ( https://static.rust-lang.org/dist/${MY_P}-i686-unknown-linux-gnu.tar.xz )"
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-SLOT="stable"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="cargo doc libressl rustfmt"
-
-CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
-
-DEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
-	!dev-lang/rust:0
-	cargo? ( !dev-util/cargo )
-	rustfmt? ( !dev-util/rustfmt )
-"
-RDEPEND="${DEPEND}
-		cargo? (
-			sys-libs/zlib
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-			net-libs/libssh2
-			net-libs/http-parser
-			net-misc/curl[ssl]
-		)"
-PDEPEND="!cargo? ( >=dev-util/cargo-${CARGO_DEPEND_VERSION} )"
-
-QA_PREBUILT="
-	opt/${P}/bin/*-${PV}
-	opt/${P}/lib/*.so
-	opt/${P}/lib/rustlib/*/lib/*.so
-	opt/${P}/lib/rustlib/*/lib/*.rlib*
-"
-
-pkg_pretend () {
-	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
-		die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
-	fi
-}
-
-src_unpack() {
-	default
-
-	local postfix
-	use amd64 && postfix=x86_64-unknown-linux-gnu
-
-	if use arm && [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv6* ]]; then
-		postfix=arm-unknown-linux-gnueabi
-	elif use arm && [[ ${CHOST} == armv6*h* ]]; then
-		postfix=arm-unknown-linux-gnueabihf
-	elif use arm && [[ ${CHOST} == armv7*h* ]]; then
-		postfix=armv7-unknown-linux-gnueabihf
-	fi
-
-	use arm64 && postfix=aarch64-unknown-linux-gnu
-	use x86 && postfix=i686-unknown-linux-gnu
-	mv "${WORKDIR}/${MY_P}-${postfix}" "${S}" || die
-}
-
-src_install() {
-	local std=$(grep 'std' ./components)
-	local components="rustc,${std}"
-	use doc && components="${components},rust-docs"
-	use cargo && components="${components},cargo"
-	use rustfmt && components="${components},rustfmt-preview"
-	./install.sh \
-		--components="${components}" \
-		--disable-verify \
-		--prefix="${D}/opt/${P}" \
-		--mandir="${D}/usr/share/${P}/man" \
-		--disable-ldconfig \
-		|| die
-
-	local rustc=rustc-bin-${PV}
-	local rustdoc=rustdoc-bin-${PV}
-	local rustgdb=rust-gdb-bin-${PV}
-	local rustlldb=rust-lldb-bin-${PV}
-
-	mv "${D}/opt/${P}/bin/rustc" "${D}/opt/${P}/bin/${rustc}" || die
-	mv "${D}/opt/${P}/bin/rustdoc" "${D}/opt/${P}/bin/${rustdoc}" || die
-	mv "${D}/opt/${P}/bin/rust-gdb" "${D}/opt/${P}/bin/${rustgdb}" || die
-	mv "${D}/opt/${P}/bin/rust-lldb" "${D}/opt/${P}/bin/${rustlldb}" || die
-
-	dosym "../../opt/${P}/bin/${rustc}" "/usr/bin/${rustc}"
-	dosym "../../opt/${P}/bin/${rustdoc}" "/usr/bin/${rustdoc}"
-	dosym "../../opt/${P}/bin/${rustgdb}" "/usr/bin/${rustgdb}"
-	dosym "../../opt/${P}/bin/${rustlldb}" "/usr/bin/${rustlldb}"
-
-	if use cargo; then
-		local cargo=cargo-bin-${PV}
-		mv "${D}/opt/${P}/bin/cargo" "${D}/opt/${P}/bin/${cargo}" || die
-		dosym "../../opt/${P}/bin/${cargo}" "/usr/bin/${cargo}"
-	fi
-	if use rustfmt; then
-		local rustfmt=rustfmt-bin-${PV}
-		local cargo_fmt=cargo-fmt-bin-${PV}
-		mv "${D}/opt/${P}/bin/rustfmt" "${D}/opt/${P}/bin/${rustfmt}" || die
-		mv "${D}/opt/${P}/bin/cargo-fmt" "${D}/opt/${P}/bin/${cargo_fmt}" || die
-		dosym "../../opt/${P}/bin/${rustfmt}" "/usr/bin/${rustfmt}"
-		dosym "../../opt/${P}/bin/${cargo_fmt}" "/usr/bin/${cargo_fmt}"
-	fi
-
-	cat <<-EOF > "${T}"/50${P}
-	LDPATH="/opt/${P}/lib"
-	MANPATH="/usr/share/${P}/man"
-	EOF
-	doenvd "${T}"/50${P}
-
-	cat <<-EOF > "${T}/provider-${P}"
-	/usr/bin/rustdoc
-	/usr/bin/rust-gdb
-	/usr/bin/rust-lldb
-	EOF
-	if use cargo; then
-		echo /usr/bin/cargo >> "${T}/provider-${P}"
-	fi
-	if use rustfmt; then
-		echo /usr/bin/rustfmt >> "${T}/provider-${P}"
-		echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
-	fi
-	dodir /etc/env.d/rust
-	insinto /etc/env.d/rust
-	doins "${T}/provider-${P}"
-}
-
-pkg_postinst() {
-	eselect rust update --if-unset
-
-	elog "Rust installs a helper script for calling GDB now,"
-	elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV},"
-
-	if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
-		elog "install app-emacs/rust-mode to get emacs support for rust."
-	fi
-
-	if has_version app-editors/gvim || has_version app-editors/vim; then
-		elog "install app-vim/rust-vim to get vim support for rust."
-	fi
-
-	if has_version 'app-shells/zsh'; then
-		elog "install app-shells/rust-zshcomp to get zsh completion for rust."
-	fi
-}
-
-pkg_postrm() {
-	eselect rust unset --if-invalid
-}
diff --git a/dev-lang/rust-bin/rust-bin-1.29.1.ebuild b/dev-lang/rust-bin/rust-bin-1.29.1.ebuild
index 857b9fca3135..509e6014d003 100644
--- a/dev-lang/rust-bin/rust-bin-1.29.1.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.29.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
@@ -20,8 +20,8 @@ SRC_URI="amd64? ( https://static.rust-lang.org/dist/${MY_P}-x86_64-unknown-linux
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
 SLOT="stable"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="cargo clippy doc libressl rustfmt"
+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"
 
@@ -36,10 +36,10 @@ RDEPEND="${DEPEND}
 			!libressl? ( dev-libs/openssl:0= )
 			libressl? ( dev-libs/libressl:0= )
 			net-libs/libssh2
-			net-libs/http-parser:=
 			net-misc/curl[ssl]
 		)"
 PDEPEND="!cargo? ( >=dev-util/cargo-${CARGO_DEPEND_VERSION} )"
+REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )"
 
 QA_PREBUILT="
 	opt/${P}/bin/*-${PV}
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index db5f3e35292a..54bfc92a23c5 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -1,17 +1,6 @@
-DIST rust-1.24.0-aarch64-unknown-linux-gnu.tar.gz 184157362 BLAKE2B 68b1b9471b6d26dbb2c3bf897d2bffc15d2fcd1fde774d4f23389e9ccb96fc60d8ec8c343b5f93651bced05bdf228d549c747f3f3d4de9c8232e99aa1b6bef6a SHA512 d15548a7b21ca4605ff24d098a59414548a315acd736ac4d8ac845399c9febdd810ba76fdf2dd9336325bd749866ee72f3d8c7c573b04a4d932d00cd7cac34c0
-DIST rust-1.24.0-i686-unknown-linux-gnu.tar.gz 193631843 BLAKE2B f19e9f717f5626b2267da4e661b53f45f7948a83a25156239af3cadb1184bf39669171364754f1787cdb78c3b62bd145bff1e3f4c3c7890f0dd52839bd8ae923 SHA512 3806bee5dccc080fae437bbc7f2e2062803244eb57c25e5e591e46279810c661bf016a4043e0af991b49b9e09a5d81ec275a852c3647a474507b03846d76aac0
-DIST rust-1.24.0-x86_64-unknown-linux-gnu.tar.gz 199663002 BLAKE2B 2373637eb4410c07328b3cbaecb56ca465956ec1a2f14786e00922d74c4e68760538383960080348be003bee656761f5bbd0aa871ea21e22d029b3f8ab5344a7 SHA512 63ecb84b31f586c85e25229fb673892567edc2f557ac2ca1958caf3e26aa4e6c9a55b410aeeeadf1a61a5ebd66a517106e942f923a2884ce69ee92aec622187b
-DIST rust-1.27.2-aarch64-unknown-linux-gnu.tar.xz 94186748 BLAKE2B 7e8f46128a7638217ef63caf479e1a6d9ebde7a225b7dad55082eb06e0206f0b1a5efa65badb15127a456ddc39702482407bbb9171a11397a31bc7c85d2cbcfa SHA512 84022350f1e8fc34a353a09848333424a557ddea3b9445a1a5fc9d2f2abced942154e80888ab4091174d6d83c6766f583ef240ab2e2233de5d536633d2765040
-DIST rust-1.27.2-i686-unknown-linux-gnu.tar.xz 144776012 BLAKE2B 98883f45637adf0920543da8951f29bf5ab11d1f39e9f4154b77e882eadce26ec5e8ed3e9bdcf560f8009fbaab4b7255ba8eb8eeb8beadad39ec6fa74b6dde45 SHA512 e17960120bdd18a527c0783ce8ca8d76cdc9b436f36a73a82fd2ea709b253f33feeb88310fab7a86305bad403eb5dad7ea43d0e5bc5ad1e3847f29e85040303a
-DIST rust-1.27.2-x86_64-unknown-linux-gnu.tar.xz 144218956 BLAKE2B 40834086f211dd64ec76be37eb477697ff44783f261f0b9bfc10b46cc340cf3c15adf80d39a9df642b4985ea1239ad7f1d1803a44f3bd3d53f073bdc38a1de0e SHA512 14861392dad81d2c040d0deb64d5dd34652d5cc2875e404609a0f13c8fb6bdc38f9bc7b1e309829365a00c42b610f2b7a73cffa232ecfdf0618b5508a8667198
 DIST rust-1.28.0-aarch64-unknown-linux-gnu.tar.xz 98937652 BLAKE2B 836d3dd4e583fa50dd317c3bea56257e6ea19defdb38c16be6debb2854e147c8a92c4832263e4ac314136022a176526fe7d3774a3c5a84cd8d364cd2a1532860 SHA512 8d9acbc90ddaa1e0de0234a21798b19b5365ea371a12f9a143c6ebacbb48f57344da6e827e867513be502bce2801de27a0dbbacdf8618c653aeb58026b6c469c
 DIST rust-1.28.0-i686-unknown-linux-gnu.tar.xz 136925948 BLAKE2B 85d9239533920c3f16d7c61bada0caeabceceade29032b70bb4562bfd04fa0158cdd85b8a0a1119506416fa5916ade8a0466bf6c10da457299a6319aa25f9dd6 SHA512 ffdfab46db14f07354b553e02fdb9dc6602c2c52b78d8f17c499f4ddb1e257aa53479df836eb3f06a2548d34296b0277cdb6b4c6f3cec57265823df22752c135
 DIST rust-1.28.0-x86_64-unknown-linux-gnu.tar.xz 134120432 BLAKE2B 56fb79a98659d9c8e56b8eef87dea3302ee5901bc4507d1c204628370b20cf34b2875c9586faa0acc2bc2b1a5beedeb9b5ba199cfb85d52f268f084a02f04f27 SHA512 4f427c11a9cd22aedd01bd7ed5bee2ba5e00a27db25af4f596cf8627d88eff8e72625eb83729d2e6c6780aaffd44c0e7065a1c8fa22f4899349b72c726cf6a5f
-DIST rustc-1.25.0-src.tar.gz 98639156 BLAKE2B 1408d5dd0611d4830de3b6b3d00e3fad4198a47599b639d0ac0bd05aaba401f743056a942e9df04a4d192c6b12e8cfe9a9cdf8cd26e48b72104ce9b423df049e SHA512 7d8886f4d5a621eb794e814deb60be681fa38cf086f87ffa14e5a3500c640b237c549a632de1331a0f1b71963de41f6d31a4df3866b7e597424002316fed81ce
-DIST rustc-1.28.0-src.tar.xz 55838968 BLAKE2B 1ff1f54dbae8c6481a6467d35b7c7dc340eba5e8c34f08ecb7b2300239c98a70c8459dacb8c8932ab6d9b3e2770e5b3508e23db7b01ff6014b7dbc076cf1de94 SHA512 a4885cd42a1006738cca2f0d8c0d5e4fd4014fc4629cbf691935bd36ffb896c553717022e67532359b5f1bd8e5050fc38b9dffed7c45cc76f7089ec134dfb980
 DIST rustc-1.29.1-src.tar.xz 61937676 BLAKE2B 6a60249538e1ec62471f4d0e3fc31c0a648433aa6f85ca7341657ea07772e338eb92a629941685808f4b80e84cb025d78aee9d0d6fa71c6635a1647c61bca9bc SHA512 1ded651b4c460e11e5e44c26de88a80fb13c2000097de2ee1e5af89638e12a7e8f43dd756689d4cc4fad45c52d4d43a3c70dd6a3ae550735b9dad5f8defea6a7
-EBUILD rust-1.25.0.ebuild 4602 BLAKE2B ef12c22219b70843d6132e07dc0df131502ba441a750c86f1863bd55c708df992a8d359fd62da11ff473806998673fbe0db11ff8129d4af42295ad6d849be511 SHA512 737a3f8469cac36442f11260de811294ab38faa23c515c78159288f340e51bafbb64b7c6354e8409f5b7093e65907aaebcc787493779f70f56a5bb02535574c3
-EBUILD rust-1.28.0-r1.ebuild 7550 BLAKE2B 35dbc225cc8e63d11c33f6743eea333dd3ba48b96b8699e3e09f450ba371aa61bad58069c8a67fb171d57ec47f993ca7f0c6ef254a0cacf596d3afa04d081adf SHA512 24d099675c7126591885e037bb624bb35b8db68cfe4b43bd162c7763e824a18fe16c4343c626be43c0bc6ccf3880231b669daa0f2db3858fe376d3bb56de3fc9
-EBUILD rust-1.28.0.ebuild 7363 BLAKE2B 4e60865cac7da0a2883e7be90c1077f86adfb61bf63e3458ef4b6d7bee992554c9a460a06c4b166ae04d076d67a743d0860a86eddc9f559c73889e3368d94726 SHA512 a19f7db936df9484c09bccc0fa23a6f9d223681ab403fa92dee8a04edc2ffb76eef6f0d77d0d6169a6cd2494b5ae3f1935965a73fba1528ec3aebe6259a4c675
-EBUILD rust-1.29.1.ebuild 7994 BLAKE2B 96289041160e60d5157864e73019eea780fafb0b86e362c21fd11b5777b4ada6ff7186c0476bba5d340138074a78306db53d8beb093830245ec0e5e794917375 SHA512 1d36d1835ea0626a6023b48fa35ae0823c1f792eade32a5a51170d23b1dc65453c2bd6fd34537e58dd470636c36405eb1428499cae2b5c713072f2d534b506f5
-MISC metadata.xml 785 BLAKE2B bed9bef5b39c89114e13e56a02b471dba01875b9c600d0e8488d93048fa7b31adc39446d53dc3aaf2c9730aab608feddeb89285bd00fe50bd8e9364472a8e525 SHA512 c51fefb4c1820ca97a1ea50c0f770313664d6a414052dc7eadeb12d767536e5fed8d8cac910be29c38a5ad3ffb31429e79a8a59378640baa6a15d3e1d2e8e1e4
+EBUILD rust-1.29.1.ebuild 7965 BLAKE2B f84b3e11c73b20abf236f457435c56fc2ef160cbd174bb048a24c307a6627680ce266cdd276974a569d0ba715c13f0e1e2e36c2fef3d1600bc4eefefdbc0e3da SHA512 23d46b6feff4016ad6b9e508c58a7d41dfe1568b45b6332efd56c08100d8790f40509cc16b0aed699a839b47ae6bdba700b428c74ed7aa6bd03d8927d6af7233
+MISC metadata.xml 673 BLAKE2B d52ce94b5b6dcf9ceacafd0d7b5cd83c00a5c3fcf4310c1bc26c4c7730d6180f06f3d0addb90572a5ead86a7b9279cfcc95ecb6c7be2b043221f19753ade377d SHA512 7e92c8d0a294e2b4efe1ed5ee396d7434ffe309e0b4e9bf3edca0a4447612a6c8d7982aba2c14b60b2acc099c14242d7fc91f2a828957790400b6ead192c1052
diff --git a/dev-lang/rust/metadata.xml b/dev-lang/rust/metadata.xml
index 8b63f5a12fce..8da6b2e99de0 100644
--- a/dev-lang/rust/metadata.xml
+++ b/dev-lang/rust/metadata.xml
@@ -6,8 +6,6 @@
     <name>Rust Project</name>
   </maintainer>
   <use>
-    <flag name="extended">Build and install rls, rustfmt and cargo
-    alongside the compiler and stdlib</flag>
     <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
diff --git a/dev-lang/rust/rust-1.25.0.ebuild b/dev-lang/rust/rust-1.25.0.ebuild
deleted file mode 100644
index 5411d562a2f0..000000000000
--- a/dev-lang/rust/rust-1.25.0.ebuild
+++ /dev/null
@@ -1,173 +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 multiprocessing python-any-r1 versionator 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.gz"
-	KEYWORDS="amd64 x86"
-else
-	ABI_VER="$(get_version_component_range 1-2)"
-	SLOT="stable/${ABI_VER}"
-	MY_P="rustc-${PV}"
-	SRC="${MY_P}-src.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-CHOST_amd64=x86_64-unknown-linux-gnu
-CHOST_x86=i686-unknown-linux-gnu
-CHOST_arm64=aarch64-unknown-linux-gnu
-
-RUST_STAGE0_VERSION="1.$(($(get_version_component_range 2) - 1)).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.$(($(get_version_component_range 2) + 1)).0"
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="https://www.rust-lang.org/"
-
-SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.gz
-	amd64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_amd64}.tar.gz )
-	x86? ( https://static.rust-lang.org/dist/${RUST_STAGE0_x86}.tar.gz )
-	arm64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_arm64}.tar.gz )
-"
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-
-IUSE="debug doc extended +jemalloc"
-
-RDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
-		jemalloc? ( dev-libs/jemalloc )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	|| (
-		>=sys-devel/gcc-4.7
-		>=sys-devel/clang-3.5
-	)
-	dev-util/cmake
-"
-PDEPEND="!extended? ( >=dev-util/cargo-${CARGO_DEPEND_VERSION} )"
-
-S="${WORKDIR}/${MY_P}-src"
-
-toml_usex() {
-	usex "$1" true false
-}
-
-src_prepare() {
-	local rust_stage0_root="${WORKDIR}"/rust-stage0
-
-	local rust_stage0_name="RUST_STAGE0_${ARCH}"
-	local rust_stage0="${!rust_stage0_name}"
-
-	"${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig --destdir="${rust_stage0_root}" --prefix=/ || die
-
-	default
-}
-
-src_configure() {
-	local rust_stage0_root="${WORKDIR}"/rust-stage0
-
-	local rust_target_name="CHOST_${ARCH}"
-	local rust_target="${!rust_target_name}"
-
-	cat <<- EOF > "${S}"/config.toml
-		[llvm]
-		optimize = $(toml_usex !debug)
-		release-debuginfo = $(toml_usex debug)
-		assertions = $(toml_usex debug)
-		[build]
-		build = "${rust_target}"
-		host = ["${rust_target}"]
-		target = ["${rust_target}"]
-		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
-		verbose = 2
-		extended = $(toml_usex extended)
-		[install]
-		prefix = "${EPREFIX}/usr"
-		libdir = "$(get_libdir)"
-		docdir = "share/doc/${P}"
-		mandir = "share/${P}/man"
-		[rust]
-		optimize = $(toml_usex !debug)
-		debuginfo = $(toml_usex debug)
-		debug-assertions = $(toml_usex debug)
-		use-jemalloc = $(toml_usex jemalloc)
-		default-linker = "$(tc-getCC)"
-		rpath = false
-		[target.${rust_target}]
-		cc = "$(tc-getBUILD_CC)"
-		cxx = "$(tc-getBUILD_CXX)"
-		linker = "$(tc-getCC)"
-		ar = "$(tc-getAR)"
-	EOF
-}
-
-src_compile() {
-	./x.py build --verbose --config="${S}"/config.toml -j$(makeopts_jobs) || die
-}
-
-src_install() {
-	env DESTDIR="${D}" ./x.py install || die
-
-	mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
-	mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
-	mv "${D}/usr/bin/rust-gdb" "${D}/usr/bin/rust-gdb-${PV}" || die
-	mv "${D}/usr/bin/rust-lldb" "${D}/usr/bin/rust-lldb-${PV}" || die
-
-	dodoc COPYRIGHT
-
-	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
-	dodir /etc/env.d/rust
-	insinto /etc/env.d/rust
-	doins "${T}/provider-${P}"
-}
-
-pkg_postinst() {
-	eselect rust update --if-unset
-
-	elog "Rust installs a helper script for calling GDB and LLDB,"
-	elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}."
-
-	if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
-		elog "install app-emacs/rust-mode to get emacs support for rust."
-	fi
-
-	if has_version app-editors/gvim || has_version app-editors/vim; then
-		elog "install app-vim/rust-vim to get vim support for rust."
-	fi
-
-	if has_version 'app-shells/zsh'; then
-		elog "install app-shells/rust-zshcomp to get zsh completion for rust."
-	fi
-}
-
-pkg_postrm() {
-	eselect rust unset --if-invalid
-}
diff --git a/dev-lang/rust/rust-1.28.0-r1.ebuild b/dev-lang/rust/rust-1.28.0-r1.ebuild
deleted file mode 100644
index 8b05979a58f8..000000000000
--- a/dev-lang/rust/rust-1.28.0-r1.ebuild
+++ /dev/null
@@ -1,277 +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_{5,6} pypy )
-
-inherit multiprocessing multilib-build python-any-r1 toolchain-funcs versionator
-
-if [[ ${PV} = *beta* ]]; then
-	betaver=${PV//*beta}
-	BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
-	MY_P="rustc-beta"
-	SLOT="beta/${PV}"
-	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz"
-	KEYWORDS="amd64"
-else
-	ABI_VER="$(get_version_component_range 1-2)"
-	SLOT="stable/${ABI_VER}"
-	MY_P="rustc-${PV}"
-	SRC="${MY_P}-src.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~x86"
-fi
-
-CHOST_amd64=x86_64-unknown-linux-gnu
-CHOST_x86=i686-unknown-linux-gnu
-CHOST_arm64=aarch64-unknown-linux-gnu
-
-RUST_STAGE0_VERSION="1.$(($(get_version_component_range 2) - 1)).2"
-RUST_STAGE0_amd64="rust-${RUST_STAGE0_VERSION}-${CHOST_amd64}"
-RUST_STAGE0_x86="rust-${RUST_STAGE0_VERSION}-${CHOST_x86}"
-RUST_STAGE0_arm64="rust-${RUST_STAGE0_VERSION}-${CHOST_arm64}"
-
-CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="https://www.rust-lang.org/"
-
-SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.xz
-	amd64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_amd64}.tar.xz )
-	x86? ( https://static.rust-lang.org/dist/${RUST_STAGE0_x86}.tar.xz )
-	arm64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_arm64}.tar.xz )
-"
-
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC Sparc SystemZ X86 XCore )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-
-IUSE="cargo debug doc +jemalloc libressl rls rustfmt wasm ${ALL_LLVM_TARGETS[*]}"
-
-RDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
-		jemalloc? ( dev-libs/jemalloc )
-		cargo? (
-			sys-libs/zlib
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-			net-libs/libssh2
-			net-libs/http-parser
-			net-misc/curl[ssl]
-		)"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	|| (
-		>=sys-devel/gcc-4.7
-		>=sys-devel/clang-3.5
-	)
-	cargo? ( !dev-util/cargo )
-	rustfmt? ( !dev-util/rustfmt )
-	dev-util/cmake
-"
-PDEPEND="!cargo? ( >=dev-util/cargo-${CARGO_DEPEND_VERSION} )"
-
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
-
-S="${WORKDIR}/${MY_P}-src"
-
-toml_usex() {
-	usex "$1" true false
-}
-
-src_prepare() {
-	local rust_stage0_root="${WORKDIR}"/rust-stage0
-
-	local rust_stage0_name="RUST_STAGE0_${ARCH}"
-	local rust_stage0="${!rust_stage0_name}"
-
-	"${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig --destdir="${rust_stage0_root}" --prefix=/ || die
-
-	default
-}
-
-src_configure() {
-	local rust_target="" rust_targets="" rust_target_name arch_cflags
-
-	# Collect rust target names to compile standard libs for all ABIs.
-	for v in $(multilib_get_enabled_abi_pairs); do
-		rust_target_name="CHOST_${v##*.}"
-		rust_targets="${rust_targets},\"${!rust_target_name}\""
-	done
-	if use wasm; then
-		rust_targets="${rust_targets},\"wasm32-unknown-unknown\""
-	fi
-	rust_targets="${rust_targets#,}"
-
-	local extended="false" tools=""
-	if use cargo; then
-		extended="true"
-		tools="\"cargo\","
-	fi
-	if use rls; then
-		extended="true"
-		tools="\"rls\",$tools"
-	fi
-	if use rustfmt; then
-		extended="true"
-		tools="\"rustfmt\",$tools"
-	fi
-
-	local rust_stage0_root="${WORKDIR}"/rust-stage0
-
-	rust_target_name="CHOST_${ARCH}"
-	rust_target="${!rust_target_name}"
-
-	cat <<- EOF > "${S}"/config.toml
-		[llvm]
-		optimize = $(toml_usex !debug)
-		release-debuginfo = $(toml_usex debug)
-		assertions = $(toml_usex debug)
-		targets = "${LLVM_TARGETS// /;}"
-		[build]
-		build = "${rust_target}"
-		host = ["${rust_target}"]
-		target = [${rust_targets}]
-		cargo = "${rust_stage0_root}/bin/cargo"
-		rustc = "${rust_stage0_root}/bin/rustc"
-		docs = $(toml_usex doc)
-		submodules = false
-		python = "${EPYTHON}"
-		locked-deps = true
-		vendor = true
-		extended = ${extended}
-		tools = [${tools}]
-		[install]
-		prefix = "${EPREFIX}/usr"
-		libdir = "$(get_libdir)"
-		docdir = "share/doc/${P}"
-		mandir = "share/${P}/man"
-		[rust]
-		optimize = $(toml_usex !debug)
-		debuginfo = $(toml_usex debug)
-		debug-assertions = $(toml_usex debug)
-		use-jemalloc = $(toml_usex jemalloc)
-		default-linker = "$(tc-getCC)"
-		rpath = false
-		lld = $(toml_usex wasm)
-	EOF
-
-	for v in $(multilib_get_enabled_abi_pairs); do
-		rust_target=$(get_abi_CHOST ${v##*.})
-		arch_cflags="$(get_abi_CFLAGS ${v##*.})"
-
-		cat <<- EOF >> "${S}"/config.env
-			CFLAGS_${rust_target}=${arch_cflags}
-		EOF
-
-		cat <<- EOF >> "${S}"/config.toml
-			[target.${rust_target}]
-			cc = "$(tc-getBUILD_CC)"
-			cxx = "$(tc-getBUILD_CXX)"
-			linker = "$(tc-getCC)"
-			ar = "$(tc-getAR)"
-		EOF
-	done
-
-	if use wasm; then
-		cat <<- EOF >> "${S}"/config.toml
-			[target.wasm32-unknown-unknown]
-			linker = "lld"
-		EOF
-	fi
-}
-
-src_compile() {
-	env $(cat "${S}"/config.env)\
-		./x.py build --config="${S}"/config.toml -j$(makeopts_jobs) \
-		--exclude src/tools/miri || die # https://github.com/rust-lang/rust/issues/52305
-}
-
-src_install() {
-	local rust_target abi_libdir
-
-	env DESTDIR="${D}" ./x.py install || die
-
-	mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
-	mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
-	mv "${D}/usr/bin/rust-gdb" "${D}/usr/bin/rust-gdb-${PV}" || die
-	mv "${D}/usr/bin/rust-lldb" "${D}/usr/bin/rust-lldb-${PV}" || die
-	if use cargo; then
-		mv "${D}/usr/bin/cargo" "${D}/usr/bin/cargo-${PV}" || die
-	fi
-	if use rls; then
-		mv "${D}/usr/bin/rls" "${D}/usr/bin/rls-${PV}" || die
-	fi
-	if use rustfmt; then
-		mv "${D}/usr/bin/rustfmt" "${D}/usr/bin/rustfmt-${PV}" || die
-		mv "${D}/usr/bin/cargo-fmt" "${D}/usr/bin/cargo-fmt-${PV}" || die
-	fi
-
-	# Copy shared library versions of standard libraries for all targets
-	# into the system's abi-dependent lib directories because the rust
-	# installer only does so for the native ABI.
-	for v in $(multilib_get_enabled_abi_pairs); do
-		if [ ${v##*.} = ${DEFAULT_ABI} ]; then
-			continue
-		fi
-		abi_libdir=$(get_abi_LIBDIR ${v##*.})
-		rust_target=$(get_abi_CHOST ${v##*.})
-		mkdir -p "${D}/usr/${abi_libdir}"
-		cp "${D}/usr/$(get_libdir)/rustlib/${rust_target}/lib"/*.so \
-		   "${D}/usr/${abi_libdir}" || die
-	done
-
-	dodoc COPYRIGHT
-
-	# FIXME:
-	# Really not sure if that env is needed, specailly LDPATH
-	cat <<-EOF > "${T}"/50${P}
-		LDPATH="/usr/$(get_libdir)/${P}"
-		MANPATH="/usr/share/${P}/man"
-	EOF
-	doenvd "${T}"/50${P}
-
-	cat <<-EOF > "${T}/provider-${P}"
-		/usr/bin/rustdoc
-		/usr/bin/rust-gdb
-		/usr/bin/rust-lldb
-	EOF
-	if use cargo; then
-	    echo /usr/bin/cargo >> "${T}/provider-${P}"
-	fi
-	if use rls; then
-	    echo /usr/bin/rls >> "${T}/provider-${P}"
-	fi
-	if use rustfmt; then
-	    echo /usr/bin/rustfmt >> "${T}/provider-${P}"
-	    echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
-	fi
-	dodir /etc/env.d/rust
-	insinto /etc/env.d/rust
-	doins "${T}/provider-${P}"
-}
-
-pkg_postinst() {
-	eselect rust update --if-unset
-
-	elog "Rust installs a helper script for calling GDB and LLDB,"
-	elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}."
-
-	if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
-		elog "install app-emacs/rust-mode to get emacs support for rust."
-	fi
-
-	if has_version app-editors/gvim || has_version app-editors/vim; then
-		elog "install app-vim/rust-vim to get vim support for rust."
-	fi
-
-	if has_version 'app-shells/zsh'; then
-		elog "install app-shells/rust-zshcomp to get zsh completion for rust."
-	fi
-}
-
-pkg_postrm() {
-	eselect rust unset --if-invalid
-}
diff --git a/dev-lang/rust/rust-1.28.0.ebuild b/dev-lang/rust/rust-1.28.0.ebuild
deleted file mode 100644
index 41be6dd55690..000000000000
--- a/dev-lang/rust/rust-1.28.0.ebuild
+++ /dev/null
@@ -1,269 +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_{5,6} pypy )
-
-inherit multiprocessing multilib-build python-any-r1 toolchain-funcs versionator
-
-if [[ ${PV} = *beta* ]]; then
-	betaver=${PV//*beta}
-	BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
-	MY_P="rustc-beta"
-	SLOT="beta/${PV}"
-	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz"
-	KEYWORDS=""
-else
-	ABI_VER="$(get_version_component_range 1-2)"
-	SLOT="stable/${ABI_VER}"
-	MY_P="rustc-${PV}"
-	SRC="${MY_P}-src.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-CHOST_amd64=x86_64-unknown-linux-gnu
-CHOST_x86=i686-unknown-linux-gnu
-CHOST_arm64=aarch64-unknown-linux-gnu
-
-RUST_STAGE0_VERSION="1.$(($(get_version_component_range 2) - 1)).2"
-RUST_STAGE0_amd64="rust-${RUST_STAGE0_VERSION}-${CHOST_amd64}"
-RUST_STAGE0_x86="rust-${RUST_STAGE0_VERSION}-${CHOST_x86}"
-RUST_STAGE0_arm64="rust-${RUST_STAGE0_VERSION}-${CHOST_arm64}"
-
-CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="https://www.rust-lang.org/"
-
-SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.xz
-	amd64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_amd64}.tar.xz )
-	x86? ( https://static.rust-lang.org/dist/${RUST_STAGE0_x86}.tar.xz )
-	arm64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_arm64}.tar.xz )
-"
-
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC Sparc SystemZ X86 XCore )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-
-IUSE="cargo debug doc +jemalloc rls rustfmt wasm ${ALL_LLVM_TARGETS[*]}"
-
-RDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
-		jemalloc? ( dev-libs/jemalloc )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	|| (
-		>=sys-devel/gcc-4.7
-		>=sys-devel/clang-3.5
-	)
-	cargo? ( !dev-util/cargo )
-	rustfmt? ( !dev-util/rustfmt )
-	dev-util/cmake
-"
-PDEPEND="!cargo? ( >=dev-util/cargo-${CARGO_DEPEND_VERSION} )"
-
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
-
-S="${WORKDIR}/${MY_P}-src"
-
-toml_usex() {
-	usex "$1" true false
-}
-
-src_prepare() {
-	local rust_stage0_root="${WORKDIR}"/rust-stage0
-
-	local rust_stage0_name="RUST_STAGE0_${ARCH}"
-	local rust_stage0="${!rust_stage0_name}"
-
-	"${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig --destdir="${rust_stage0_root}" --prefix=/ || die
-
-	default
-}
-
-src_configure() {
-	local rust_target="" rust_targets="" rust_target_name arch_cflags
-
-	# Collect rust target names to compile standard libs for all ABIs.
-	for v in $(multilib_get_enabled_abi_pairs); do
-		rust_target_name="CHOST_${v##*.}"
-		rust_targets="${rust_targets},\"${!rust_target_name}\""
-	done
-	if use wasm; then
-		rust_targets="${rust_targets},\"wasm32-unknown-unknown\""
-	fi
-	rust_targets="${rust_targets#,}"
-
-	local extended="false" tools=""
-	if use cargo; then
-		extended="true"
-		tools="\"cargo\","
-	fi
-	if use rls; then
-		extended="true"
-		tools="\"rls\",$tools"
-	fi
-	if use rustfmt; then
-		extended="true"
-		tools="\"rustfmt\",$tools"
-	fi
-
-	local rust_stage0_root="${WORKDIR}"/rust-stage0
-
-	rust_target_name="CHOST_${ARCH}"
-	rust_target="${!rust_target_name}"
-
-	cat <<- EOF > "${S}"/config.toml
-		[llvm]
-		optimize = $(toml_usex !debug)
-		release-debuginfo = $(toml_usex debug)
-		assertions = $(toml_usex debug)
-		targets = "${LLVM_TARGETS// /;}"
-		[build]
-		build = "${rust_target}"
-		host = ["${rust_target}"]
-		target = [${rust_targets}]
-		cargo = "${rust_stage0_root}/bin/cargo"
-		rustc = "${rust_stage0_root}/bin/rustc"
-		docs = $(toml_usex doc)
-		submodules = false
-		python = "${EPYTHON}"
-		locked-deps = true
-		vendor = true
-		extended = ${extended}
-		tools = [${tools}]
-		[install]
-		prefix = "${EPREFIX}/usr"
-		libdir = "$(get_libdir)"
-		docdir = "share/doc/${P}"
-		mandir = "share/${P}/man"
-		[rust]
-		optimize = $(toml_usex !debug)
-		debuginfo = $(toml_usex debug)
-		debug-assertions = $(toml_usex debug)
-		use-jemalloc = $(toml_usex jemalloc)
-		default-linker = "$(tc-getCC)"
-		rpath = false
-		lld = $(toml_usex wasm)
-	EOF
-
-	for v in $(multilib_get_enabled_abi_pairs); do
-		rust_target=$(get_abi_CHOST ${v##*.})
-		arch_cflags="$(get_abi_CFLAGS ${v##*.})"
-
-		cat <<- EOF >> "${S}"/config.env
-			CFLAGS_${rust_target}=${arch_cflags}
-		EOF
-
-		cat <<- EOF >> "${S}"/config.toml
-			[target.${rust_target}]
-			cc = "$(tc-getBUILD_CC)"
-			cxx = "$(tc-getBUILD_CXX)"
-			linker = "$(tc-getCC)"
-			ar = "$(tc-getAR)"
-		EOF
-	done
-
-	if use wasm; then
-		cat <<- EOF >> "${S}"/config.toml
-			[target.wasm32-unknown-unknown]
-			linker = "lld"
-		EOF
-	fi
-}
-
-src_compile() {
-	env $(cat "${S}"/config.env)\
-		./x.py build --config="${S}"/config.toml -j$(makeopts_jobs) \
-		--exclude src/tools/miri || die # https://github.com/rust-lang/rust/issues/52305
-}
-
-src_install() {
-	local rust_target abi_libdir
-
-	env DESTDIR="${D}" ./x.py install || die
-
-	mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
-	mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
-	mv "${D}/usr/bin/rust-gdb" "${D}/usr/bin/rust-gdb-${PV}" || die
-	mv "${D}/usr/bin/rust-lldb" "${D}/usr/bin/rust-lldb-${PV}" || die
-	if use cargo; then
-		mv "${D}/usr/bin/cargo" "${D}/usr/bin/cargo-${PV}" || die
-	fi
-	if use rls; then
-		mv "${D}/usr/bin/rls" "${D}/usr/bin/rls-${PV}" || die
-	fi
-	if use rustfmt; then
-		mv "${D}/usr/bin/rustfmt" "${D}/usr/bin/rustfmt-${PV}" || die
-		mv "${D}/usr/bin/cargo-fmt" "${D}/usr/bin/cargo-fmt-${PV}" || die
-	fi
-
-	# Copy shared library versions of standard libraries for all targets
-	# into the system's abi-dependent lib directories because the rust
-	# installer only does so for the native ABI.
-	for v in $(multilib_get_enabled_abi_pairs); do
-		if [ ${v##*.} = ${DEFAULT_ABI} ]; then
-			continue
-		fi
-		abi_libdir=$(get_abi_LIBDIR ${v##*.})
-		rust_target=$(get_abi_CHOST ${v##*.})
-		mkdir -p "${D}/usr/${abi_libdir}"
-		cp "${D}/usr/$(get_libdir)/rustlib/${rust_target}/lib"/*.so \
-		   "${D}/usr/${abi_libdir}" || die
-	done
-
-	dodoc COPYRIGHT
-
-	# FIXME:
-	# Really not sure if that env is needed, specailly LDPATH
-	cat <<-EOF > "${T}"/50${P}
-		LDPATH="/usr/$(get_libdir)/${P}"
-		MANPATH="/usr/share/${P}/man"
-	EOF
-	doenvd "${T}"/50${P}
-
-	cat <<-EOF > "${T}/provider-${P}"
-		/usr/bin/rustdoc
-		/usr/bin/rust-gdb
-		/usr/bin/rust-lldb
-	EOF
-	if use cargo; then
-	    echo /usr/bin/cargo >> "${T}/provider-${P}"
-	fi
-	if use rls; then
-	    echo /usr/bin/rls >> "${T}/provider-${P}"
-	fi
-	if use rustfmt; then
-	    echo /usr/bin/rustfmt >> "${T}/provider-${P}"
-	    echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
-	fi
-	dodir /etc/env.d/rust
-	insinto /etc/env.d/rust
-	doins "${T}/provider-${P}"
-}
-
-pkg_postinst() {
-	eselect rust update --if-unset
-
-	elog "Rust installs a helper script for calling GDB and LLDB,"
-	elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}."
-
-	if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
-		elog "install app-emacs/rust-mode to get emacs support for rust."
-	fi
-
-	if has_version app-editors/gvim || has_version app-editors/vim; then
-		elog "install app-vim/rust-vim to get vim support for rust."
-	fi
-
-	if has_version 'app-shells/zsh'; then
-		elog "install app-shells/rust-zshcomp to get zsh completion for rust."
-	fi
-}
-
-pkg_postrm() {
-	eselect rust unset --if-invalid
-}
diff --git a/dev-lang/rust/rust-1.29.1.ebuild b/dev-lang/rust/rust-1.29.1.ebuild
index d24453026eb0..71a52599320e 100644
--- a/dev-lang/rust/rust-1.29.1.ebuild
+++ b/dev-lang/rust/rust-1.29.1.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=( python2_7 python3_{5,6} pypy )
 
-inherit multiprocessing multilib-build python-any-r1 toolchain-funcs versionator
+inherit eapi7-ver multiprocessing multilib-build python-any-r1 toolchain-funcs
 
 if [[ ${PV} = *beta* ]]; then
 	betaver=${PV//*beta}
@@ -13,25 +13,24 @@ if [[ ${PV} = *beta* ]]; then
 	MY_P="rustc-beta"
 	SLOT="beta/${PV}"
 	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz"
-	KEYWORDS=""
 else
-	ABI_VER="$(get_version_component_range 1-2)"
+	ABI_VER="$(ver_cut 1-2)"
 	SLOT="stable/${ABI_VER}"
 	MY_P="rustc-${PV}"
 	SRC="${MY_P}-src.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 CHOST_amd64=x86_64-unknown-linux-gnu
 CHOST_x86=i686-unknown-linux-gnu
 CHOST_arm64=aarch64-unknown-linux-gnu
 
-RUST_STAGE0_VERSION="1.$(($(get_version_component_range 2) - 1)).0"
+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.$(($(get_version_component_range 2) + 1)).0"
+CARGO_DEPEND_VERSION="0.$(($(ver_cut 2) + 1)).0"
 
 DESCRIPTION="Systems programming language from Mozilla"
 HOMEPAGE="https://www.rust-lang.org/"
@@ -49,7 +48,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
 
-IUSE="cargo clippy debug doc +jemalloc libressl rls rustfmt wasm ${ALL_LLVM_TARGETS[*]}"
+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 )
@@ -73,7 +72,8 @@ DEPEND="${RDEPEND}
 "
 PDEPEND="!cargo? ( >=dev-util/cargo-${CARGO_DEPEND_VERSION} )"
 
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )
+				x86? ( cpu_flags_x86_sse2 )"
 
 S="${WORKDIR}/${MY_P}-src"
 
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index ad49be8f6729..8b9442fc70ad 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -15,7 +15,7 @@ DIST spidermonkey-slot24-patches-01.tar.xz 3444 BLAKE2B f207577db223d51e315d473f
 DIST spidermonkey-slot38-patches-01.tar.xz 7472 BLAKE2B 7585aa6f5a84d6ae21e41137fca8da093580182f798f63bfcf2e402e3bf58df4cb3f43cef3eb635044508800f6757247fa3a65ca53230243a455925f436a9510 SHA512 953acee985d192c6d0f18f14c70fdda33a7c8f784c6833ca8b75495044b40a8b3f29b281c40dbfcda0c8570c111a3dd1717c2ef0ffd651c1b50d1f2bff1f6d09
 DIST spidermonkey-slot45-patches-01.tar.xz 5092 BLAKE2B 0188a179fc741ab84a93aae1e77f8b765868ca716b8879661bfa678aef918998c9488db3b866a13c79ae28edb43ac0ebb10345b0471b717c4174c61cba9646bc SHA512 d52f038a7b4f7b410b5a1f94a55962adafc5906e7d85f605f3fe45ad49417c2b9d58d853a81b5d2395a2842c9780992d5a2c1a0e67aa77fb09f21aff9aeb0f7a
 EBUILD spidermonkey-1.7.0-r3.ebuild 1544 BLAKE2B 6de699a424a3db9dc3a30ad690d8991fef0387b1a87479b46301bba6cef602a67829b4ef4d36a0d58bad6b7e7b4a71d8fb3ae7312b8a2abae09b2874d56f4378 SHA512 abd9fbd84c61025a5eb1f9777179a3e49daa0ff9ad404ddd442e9a8ec0fb18cf279a7b0361616a340ebcf7ccc73883db09d1b3ed31d0adbf34124584cd7fac26
-EBUILD spidermonkey-1.8.5-r6.ebuild 4380 BLAKE2B 54f605460efec128a3cb0c976e5eadd8bc86d44066039cab7a99e31cf8859fe16662a64f99a556b6d4b7951e3025f0384b9aa6c69163f47b4f115537fbc7717c SHA512 46e499987b5f2c9e469822b8874f79ba9714554b0233eea009d71084ad69ba5b36cf2a41272e6944f6ceb04291f9b7ea5d4c73dab0f5c0afc715ad0c02a5be9a
+EBUILD spidermonkey-1.8.5-r6.ebuild 4444 BLAKE2B 6fcfb3b526227abd6b2f7436d94d8c3d83d5f7fd2ee1d3023e3b17ee7d22c0cceffd6c12ba6d8e577c9344a98a29218735ce4d1b56c285730e56d19c52e26e03 SHA512 536894c766fb99fadda983d10dffd4df3ffff7141dcd3f85c2878e32d93042e4b3db626848cdecb232a299aae4a12b1aa832d8262bd518ab53776403a29f3aa0
 EBUILD spidermonkey-17.0.0-r4.ebuild 3547 BLAKE2B dee9143cf3aa2ed35cb7a3c5ba754ae3508dad1855ef6bdb8cb404406382b561d62452c37ad307204cc4cb6454f6a4856863316449437ea836946796551d8a45 SHA512 c83e91990e7018d48280a51452e258dfc29246b18387c730c3485b24473ece0da7b21432144f9736dbced370534ed41ee9cbbb49e0855e0cf219acbe91e62e08
 EBUILD spidermonkey-17.0.0-r5.ebuild 3563 BLAKE2B 4b5294071559ee1e8487dfa5df388e17fb357ec8898f6e4390c1d3540a89647df04245e4c33706e52080236f9fcec7422a2cd0463f1f78feca1afc42f1d29e40 SHA512 6546f0c8bc2e7b1baecd6d616550977d83079c71ee973ab811a9cede0612d95b892a5f4d02a4a4733b5e90fff9795cdf50531e41f278fa210c988467931433bb
 EBUILD spidermonkey-24.2.0-r3.ebuild 4016 BLAKE2B 4f52b07f5f156f701ba6e1dc7837a183a21d96d60467bf66ab0cfe2cf9d4269d6a5e56f4fa9813cceb877c084a8b53030d7f35d99fd934754b2f2f2612fcf35a SHA512 e71e25a69845f9555a6257a57e420166303c7be5dc511f9180c6bbcc814c7a52283cd55a19429ca94b73b21403d6faf0fe25485b8520cd7808881bfcfce14056
diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r6.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r6.ebuild
index c023e9f7c885..fb6e97c76852 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r6.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-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=5
@@ -77,6 +77,8 @@ src_configure() {
 	CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
 	AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
 	LD="$(tc-getLD)" \
+	ac_cv_lib_dnet_dnet_ntoa=no \
+	ac_cv_lib_dnet_stub_dnet_ntoa=no \
 	econf \
 		${myopts} \
 		--enable-jemalloc \
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index d01fdda3eec4..37cc09566fcc 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index f368b784da42..54781a3b9e4c 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -4,5 +4,5 @@ DIST apr-util-1.5.4.tar.bz2 694427 BLAKE2B 6de337fa48f0ca3775ba5b054b3a59726e25a
 DIST apr-util-1.6.1.tar.bz2 428595 BLAKE2B ab6eaf1594aaa1c7aae151319b630b83bdb8b68ec04f0e2b429b7c7789bdf274873270200ba43701359e2502d2be8624d8e42a56a5f399ec95a841e7c73ce706 SHA512 40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d
 EBUILD apr-util-1.5.4-r3.ebuild 3685 BLAKE2B 6de15972c714d4077aeeaf62771b0427c96d7022ffbe8f639576d1c422562806ac5daf93b6d6841f581f0d8e2419a33692abe392bdb583b1722ae3734865af9c SHA512 576d513d8716117cbbe854d14e183c13060408f187a22b000e5e21f2f6b71c8774bf197612ae27080a3d97ea0bbbb078579db2551c54c12a6a1b75dd63fb2c7b
 EBUILD apr-util-1.5.4.ebuild 3214 BLAKE2B a90ae943aba394503d08cfad961e603c5aaf1460b28f040e35c0a330ad59ea333606cc909e6d8543f1c24a4a0898492dc50d988cfcf6e7ea681dd12207870838 SHA512 a419670fc4df0a4b7c7f1c2d07b67428dda3d72663e45ab1c2cd72268c33100a4d9319398086666530d69524f61eae196198e4622f0dc889f7413b763c3ec5c2
-EBUILD apr-util-1.6.1-r3.ebuild 3755 BLAKE2B 573a5e6330a9e2963c1d5b53249a164492543c19505925e253fba88ea94b85c2d3e49a0bd2ef23bb58ee8004d3ccc3e1df323b487aff04fdcad97438cbfbef68 SHA512 bd2fd029bf28a5a06258fca09efd74f21bc1d106142752dcedac86726785f7bc252cc79b8e160cd610cb930c271b905d8bcd3ee35d749816dc2bc51874aaa4a8
+EBUILD apr-util-1.6.1-r3.ebuild 3754 BLAKE2B 383ac17d4207ae3b8ac2748ecd72794c1183ecb15337b374b447659d120a353f397568a937e5dcce340c7c5a24d6fb914f60db5149581b7e2f23c65467a90a48 SHA512 c8faa9b04edf8632d5057d22b9a1cca170b936d9281f0087a14e18898c924fba4647a50f0b24876f53719dff4e2f9a416fe8e781aadc4e9aaab49a39fef676c4
 MISC metadata.xml 515 BLAKE2B d300be91135a6a7dcc55a61b484b5dd1785663b9f3b51d621dcacffd9ec5747b69bb227f60dce1bf30a57fe93629de3c82fa7138a5f056e4f349ce6909453020 SHA512 af8e2bbded13ef475d1577eb4faa27e17a045804f1de3e79c4c3d736871db304872fc65db0d606c243292392fb4ac773711ad9e153369714689138249d469158
diff --git a/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild b/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild
index 00d205ec23a6..ebf60b55f79f 100644
--- a/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild
+++ b/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="berkdb doc gdbm ldap libressl mysql nss odbc openssl postgres sqlite static-libs"
 #RESTRICT="test"
 
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 79ed6fe545e4..93b4c954c86c 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -2,6 +2,6 @@ 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
-EBUILD botan-1.10.17.ebuild 4274 BLAKE2B d88abeb1a9bfc04c121836a5a77a9b07ddb34c45244a85b0b74fe9346689736b882d489ff42a1b0726242771a90cdcacb053ba24b5a83c7d69ef8f6ea7f08ed5 SHA512 7cfd69bf005f0653793b4ece07bdba09b7b8ae8098da17b7ed028acfbd8fbef63a9568134f9ce3f7660761e5baa75f13f40f5d0c651acf7a00670907af85a534
-EBUILD botan-2.7.0.ebuild 2393 BLAKE2B 26b85ca13ac9f98c014fc58665df5331c0e6f56a4ca5823c1ad953e50c9b295c594b68740492ce6aa7e7b5433599d62bb90dce782b85bf3a972f1bcbbfd167c7 SHA512 494abf5e37c78ac82bf2e3f00efa0ef1cea54d62f54cad7883e46bf4339865223f495c0133b5ee9d0b4f2d9c33a89f363b3f3b5c37b62d3e32a1319c51b5d58e
+EBUILD botan-1.10.17-r2.ebuild 4274 BLAKE2B cc2cc4d510a95803463c477848e09cfec79a11e5246d9c9d5678502f1f279989b0ebb92840e62c445bc13a0fe1276a41b63a3c1a14ad4b8bde058f51ac91e586 SHA512 5e256c4785e2560bcb151d687136688b3a2daa11e8f87a46965aa9e687b781c7fb00cabce5ee90b6fba6aca800ff636ee9921093d1de8d22a1780d809f0613de
+EBUILD botan-2.7.0.ebuild 2480 BLAKE2B 3207ded4663f1cf2cd55153f4369fef6a4a93967703a1afbe8f91b2dc0cca944a89eeaef3dd64b3ee8253deb034b8c69e4adcc0c018f80b3dafbe145d0955ce1 SHA512 e5cd37b8ff517686c295b094e66305d5b3d5741d95ee42e62c03dc6e0d5b452257033bd7c740c59bc65e47b179c2e4b2ade7cd11ebbf629f12a0c2c842590ff7
 MISC metadata.xml 610 BLAKE2B a74ed3478dcf62ad762a113e594c660656d52352e569d4eaa54c47009505a869c4e553a8f8330b0b2ad9dae88b7b2bc6d44ede1f2dd330da9ff01240f56eed29 SHA512 9d14b7f0222b9b169f8ae60798d1a9ac551004bcbd0344451409cdb1cbefaaf70760a2f443f0c793265492387ca28f7dccd293bd30585a014a72f2a21eee1561
diff --git a/dev-libs/botan/botan-1.10.17-r2.ebuild b/dev-libs/botan/botan-1.10.17-r2.ebuild
new file mode 100644
index 000000000000..6e97aaa2be67
--- /dev/null
+++ b/dev-libs/botan/botan-1.10.17-r2.ebuild
@@ -0,0 +1,160 @@
+# 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="0"
+LICENSE="BSD"
+IUSE="bindist doc python bzip2 gmp libressl ssl static-libs threads 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 )
+	python? ( ${PYTHON_DEPS} >=dev-libs/boost-1.48[python,${PYTHON_USEDEP}] )
+	gmp? ( >=dev-libs/gmp-4.2.2:* )
+	ssl? (
+		!libressl? ( <dev-libs/openssl-1.1:0=[bindist=] )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+BDEPEND="dev-lang/python:*
+	doc? ( dev-python/sphinx )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+	"${FILESDIR}/${P}-libressl.patch"
+)
+
+src_prepare() {
+	default
+
+	sed -e "s/-Wl,-soname,\$@ //" -i src/build-data/makefile/python.in || die "sed failed"
+	sed \
+		-e "/DOCDIR/d" \
+		-e "/^install:/s/ docs//" \
+		-i src/build-data/makefile/unix_shr.in || die "sed failed"
+
+	# Fix ImportError with Python 3.
+	sed -e "s/_botan/.&/" -i src/wrap/python/__init__.py || die "sed failed"
+
+	use python && python_copy_sources
+}
+
+src_configure() {
+	local disable_modules="proc_walk,unix_procs"
+	use threads || disable_modules+=",pthreads"
+	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
+
+	# foobared buildsystem, --prefix translates into DESTDIR, see also make
+	# install in src_install, we need the correct live-system prefix here on
+	# Darwin for a shared lib with correct install_name
+	./configure.py \
+		--prefix="${EPREFIX}/usr" \
+		--libdir=$(get_libdir) \
+		--docdir=share/doc \
+		--cc=gcc \
+		--os=${myos} \
+		--cpu=${CHOSTARCH} \
+		--with-endian="$(tc-endian)" \
+		--without-sphinx \
+		--with-tr1=system \
+		$(use_with bzip2) \
+		$(use_with gmp gnump) \
+		$(use_with python boost-python) \
+		$(use_with ssl openssl) \
+		$(use_with zlib) \
+		--disable-modules=${disable_modules} \
+		|| die "configure.py failed"
+}
+
+src_compile() {
+	emake CXX="$(tc-getCXX)" AR="$(tc-getAR) crs" LIB_OPT="${CXXFLAGS}" MACH_OPT=""
+
+	if use python; then
+		building() {
+			rm -fr build/python
+			ln -s "${BUILD_DIR}" build/python
+			cp Makefile.python build/python
+			sed -i \
+				-e "s/-lboost_python/-lboost_python-$(echo ${EPYTHON} | sed 's/python//')/" \
+				build/python/Makefile.python
+			emake -f build/python/Makefile.python \
+				CXX="$(tc-getCXX)" \
+				CFLAGS="${CXXFLAGS}" \
+				LDFLAGS="${LDFLAGS}" \
+				PYTHON_ROOT="/usr/$(get_libdir)" \
+				PYTHON_INC="-I$(python_get_includedir)"
+		}
+		python_foreach_impl building
+	fi
+
+	if use doc; then
+		einfo "Generation of documentation"
+		sphinx-build doc doc_output || die
+	fi
+}
+
+src_test() {
+	chmod -R ugo+rX "${S}"
+	emake CXX="$(tc-getCXX)" CHECK_OPT="${CXXFLAGS}" check
+	LD_LIBRARY_PATH="${S}" ./check --validate || die "Validation tests failed"
+}
+
+src_install() {
+	emake DESTDIR="${ED}/usr" install
+
+	if ! use static-libs; then
+		rm "${ED}/usr/$(get_libdir)/libbotan"*.a || die 'remove of static libs failed'
+	fi
+
+	# Add compatibility symlinks.
+	[[ -e "${ED}/usr/bin/botan-config" ]] && die "Compatibility code no longer needed"
+	[[ -e "${ED}/usr/$(get_libdir)/pkgconfig/botan.pc" ]] && die "Compatibility code no longer needed"
+	dosym botan-config-1.10 /usr/bin/botan-config
+	dosym botan-1.10.pc /usr/$(get_libdir)/pkgconfig/botan.pc
+
+	if use python; then
+		installation() {
+			rm -fr build/python
+			ln -s "${BUILD_DIR}" build/python
+			emake -f Makefile.python \
+				PYTHON_SITE_PACKAGE_DIR="${D}$(python_get_sitedir)" \
+				install
+		}
+		python_foreach_impl installation
+	fi
+
+	if use doc; then
+		pushd doc_output > /dev/null
+		insinto /usr/share/doc/${PF}/html
+		doins -r [a-z]* _static
+		popd > /dev/null
+	fi
+}
diff --git a/dev-libs/botan/botan-1.10.17.ebuild b/dev-libs/botan/botan-1.10.17.ebuild
deleted file mode 100644
index 3288e91d07f7..000000000000
--- a/dev-libs/botan/botan-1.10.17.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit 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="0"
-LICENSE="BSD"
-IUSE="bindist doc python bzip2 gmp libressl ssl static-libs threads 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 )
-	python? ( ${PYTHON_DEPS} >=dev-libs/boost-1.48[python,${PYTHON_USEDEP}] )
-	gmp? ( >=dev-libs/gmp-4.2.2:* )
-	ssl? (
-		!libressl? ( <dev-libs/openssl-1.1:0=[bindist=] )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-BDEPEND="dev-lang/python:*
-	doc? ( dev-python/sphinx )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-	"${FILESDIR}/${P}-libressl.patch"
-)
-
-src_prepare() {
-	default
-
-	sed -e "s/-Wl,-soname,\$@ //" -i src/build-data/makefile/python.in || die "sed failed"
-	sed \
-		-e "/DOCDIR/d" \
-		-e "/^install:/s/ docs//" \
-		-i src/build-data/makefile/unix_shr.in || die "sed failed"
-
-	# Fix ImportError with Python 3.
-	sed -e "s/_botan/.&/" -i src/wrap/python/__init__.py || die "sed failed"
-
-	use python && python_copy_sources
-}
-
-src_configure() {
-	local disable_modules="proc_walk,unix_procs"
-	use threads || disable_modules+=",pthreads"
-	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
-
-	# foobared buildsystem, --prefix translates into DESTDIR, see also make
-	# install in src_install, we need the correct live-system prefix here on
-	# Darwin for a shared lib with correct install_name
-	./configure.py \
-		--prefix="${EPREFIX}/usr" \
-		--libdir=$(get_libdir) \
-		--docdir=share/doc \
-		--cc=gcc \
-		--os=${myos} \
-		--cpu=${CHOSTARCH} \
-		--with-endian="$(tc-endian)" \
-		--without-sphinx \
-		--with-tr1=system \
-		$(use_with bzip2) \
-		$(use_with gmp gnump) \
-		$(use_with python boost-python) \
-		$(use_with ssl openssl) \
-		$(use_with zlib) \
-		--disable-modules=${disable_modules} \
-		|| die "configure.py failed"
-}
-
-src_compile() {
-	emake CXX="$(tc-getCXX)" AR="$(tc-getAR) crs" LIB_OPT="${CXXFLAGS}" MACH_OPT=""
-
-	if use python; then
-		building() {
-			rm -fr build/python
-			ln -s "${BUILD_DIR}" build/python
-			cp Makefile.python build/python
-			sed -i \
-				-e "s/-lboost_python/-lboost_python-$(echo ${EPYTHON} | sed 's/python//')/" \
-				build/python/Makefile.python
-			emake -f build/python/Makefile.python \
-				CXX="$(tc-getCXX)" \
-				CFLAGS="${CXXFLAGS}" \
-				LDFLAGS="${LDFLAGS}" \
-				PYTHON_ROOT="/usr/$(get_libdir)" \
-				PYTHON_INC="-I$(python_get_includedir)"
-		}
-		python_foreach_impl building
-	fi
-
-	if use doc; then
-		einfo "Generation of documentation"
-		sphinx-build doc doc_output || die
-	fi
-}
-
-src_test() {
-	chmod -R ugo+rX "${S}"
-	emake CXX="$(tc-getCXX)" CHECK_OPT="${CXXFLAGS}" check
-	LD_LIBRARY_PATH="${S}" ./check --validate || die "Validation tests failed"
-}
-
-src_install() {
-	emake DESTDIR="${ED}usr" install
-
-	if ! use static-libs; then
-		rm "${ED}usr/$(get_libdir)/libbotan"*.a || die 'remove of static libs failed'
-	fi
-
-	# Add compatibility symlinks.
-	[[ -e "${ED}usr/bin/botan-config" ]] && die "Compatibility code no longer needed"
-	[[ -e "${ED}usr/$(get_libdir)/pkgconfig/botan.pc" ]] && die "Compatibility code no longer needed"
-	dosym botan-config-1.10 /usr/bin/botan-config
-	dosym botan-1.10.pc /usr/$(get_libdir)/pkgconfig/botan.pc
-
-	if use python; then
-		installation() {
-			rm -fr build/python
-			ln -s "${BUILD_DIR}" build/python
-			emake -f Makefile.python \
-				PYTHON_SITE_PACKAGE_DIR="${ED}$(python_get_sitedir)" \
-				install
-		}
-		python_foreach_impl installation
-	fi
-
-	if use doc; then
-		pushd doc_output > /dev/null
-		insinto /usr/share/doc/${PF}/html
-		doins -r [a-z]* _static
-		popd > /dev/null
-	fi
-}
diff --git a/dev-libs/botan/botan-2.7.0.ebuild b/dev-libs/botan/botan-2.7.0.ebuild
index 9763cbe67a68..10f8cd214c78 100644
--- a/dev-libs/botan/botan-2.7.0.ebuild
+++ b/dev-libs/botan/botan-2.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=7
@@ -12,7 +12,7 @@ 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"
+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"
@@ -49,8 +49,12 @@ src_configure() {
 
 	local myos=
 	case ${CHOST} in
-		*-darwin*)   myos=darwin ;;
-		*)           myos=linux  ;;
+		*-darwin*)	myos=darwin ;;
+		*)			myos=linux  ;;
+	esac
+
+	case ${CHOST} in
+		hppa*)		CHOSTARCH=parisc ;;
 	esac
 
 	local pythonvers=()
@@ -62,25 +66,26 @@ src_configure() {
 	fi
 
 	CXX="$(tc-getCXX)" AR="$(tc-getAR)" ./configure.py \
-		--prefix="${EPREFIX}/usr" \
-		--libdir=$(get_libdir) \
-		--docdir=share/doc \
-		--cc=gcc \
-		--os=${myos} \
-		--cpu=${CHOSTARCH} \
-		--with-endian="$(tc-endian)" \
-		--without-doxygen \
+		$(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) \
-		$(use_with boost) \
-		$(use_with doc sphinx) \
-		$(use_with doc documentation) \
-		$(use_enable static-libs static-library) \
-		--with-python-version=$(IFS=","; echo "${pythonvers[*]}" ) \
+		$(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"
 }
 
diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest
index bd2df26b3a6f..5d9c82c946db 100644
--- a/dev-libs/crypto++/Manifest
+++ b/dev-libs/crypto++/Manifest
@@ -3,5 +3,5 @@ AUX crypto++-5.6.5-CVE-2017-9434.patch 1728 BLAKE2B 0cfd25fca89d59486ba9c49a87f0
 DIST cryptopp565.zip 4220843 BLAKE2B 0c42da3564cdd175c2f2c5c4272caf826f21e47d2271c7f54acab86f5f79dcdad8d6cb946bc88f55fde6189bb2d24ad8fb03dda6b3b8c6f105434b55b8b217d0 SHA512 f13718d02ca69b0129aaf9e767c9d2e0333aa7538355f9c63d9eaf1ff369062084a18dc01489439ebf37797b3ea81b01beb072057d47ec962bfb824ddc72abc7
 DIST cryptopp700.zip 7296665 BLAKE2B 1b1a60e240a9d94b4edfea16beef0ec48ec26c61f7f9a3d89d29bd2e77b13a83ce942f81467bb90d3086253560a3c4acd6b89178dcb416ed4328340ad5222dfd SHA512 8fd8d680e5ceaf10b3c32cb1504bda4b32abc9fcaa2c6e61e3b5e67aca805c792579884bc6a749c29a99105304c421d03d7fe7909fc58f750b3155c7c5cec8ec
 EBUILD crypto++-5.6.5-r1.ebuild 1530 BLAKE2B df7d53463e39d86aa3eb905911e5ccdd6cd6ae435b4a51059978b68109c3448c555bbe91984f285671856d5ab7c98232cf2b171d154a01a97655d5aea14cf94b SHA512 f8065ac14fcffa77b75a439edcad34214d62a40184c27f79b073d4f788b2ef3b8667110ef9766d901ed69a25cb1f1639d494f4a0ad2e97391879821569b5a06b
-EBUILD crypto++-7.0.0-r2.ebuild 977 BLAKE2B 730156615bf2d5c2906fff86dc6b9c980af6a8382caa7ff6aae06312dcca7ca1efc9dd1bc4744a83f84fc326976769ee498065da7f77f615db124b25f37e88de SHA512 b5fe6d57979b304edd20fbeb66611109e3fe5533c5eb9f575604e4688c24b8a9f15229942bff70de810b6752e14827d36b402ec3f6473a076a258cfebc1c789f
+EBUILD crypto++-7.0.0-r2.ebuild 973 BLAKE2B ae9cbb5042009a6206a8662b6be7da9cb0c2e742aa1f9c8cb4014a9ffc6c080e569c0a5b3c1edce948064714ab619847cc31ed3e569ddcec225f2fef443d3984 SHA512 3bcafbf3ebd72a3e1180aa69ae127392474ddf7ea065edd5435e042d1b2afa1cf5049b5dc29413543f461b0cbfcf7b77998ae7a2f825673d63af20269df09fc2
 MISC metadata.xml 597 BLAKE2B 8e8dd9fb9a60f2a5e7fdda6de99b6a07264d54aaa666a41d7fb30da338f91867bdda7135bd21e92191722de7e14ac10f394ac8d8f3118109f4ce6800fb12ebc0 SHA512 e20fd2e76765968417d659a6342ff9229dc822c2291bca00dd6cccd55dc3195563574aaf3a88c68b111821b41c9bce172f4d79bbb462f2b913ab15bcc2c2ee5a
diff --git a/dev-libs/crypto++/crypto++-7.0.0-r2.ebuild b/dev-libs/crypto++/crypto++-7.0.0-r2.ebuild
index ca2ab2b9648c..48ed4e46d471 100644
--- a/dev-libs/crypto++/crypto++-7.0.0-r2.ebuild
+++ b/dev-libs/crypto++/crypto++-7.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="https://www.cryptopp.com/cryptopp${PV//.}.zip"
 
 LICENSE="Boost-1.0"
 SLOT="0/7" # subslot is so version
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86 ~x64-macos"
 IUSE="+asm static-libs"
 
 BDEPEND="app-arch/unzip"
diff --git a/dev-libs/dbus-glib/Manifest b/dev-libs/dbus-glib/Manifest
index a3fe5dd1cb96..faee7e4790f6 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 1903 BLAKE2B 0bc3d43318a223eb303c44050b730a8d94f1d2a26da3c128240c4e710a7816ad5fd3629f8845adf471b6415597af4ebe043bc5de38cd6b1cc4cb5ba6096970a2 SHA512 806c14e4bb4e79812e85afa53c26e4e501b2ea279ea36a74a555d4dfa637814025fb9e19c55188c09bc2bc7856df371406a861764c0cd7e6b32455204e29b726
+EBUILD dbus-glib-0.110.ebuild 1897 BLAKE2B 3572063aeb3e4481c231bbe838ff5ebfd9c52458896ec8dcb3a335ca8ab45f86d9f3b7cb08a5e5d445b07dca670c01f963e0a1cb2c8290d8cc02acaf4754c0a8 SHA512 6238cfd544298435a9c903906e2ed32362aa40b8663d426e20020c74aae6d5885aceeb8db514bb9cb803436aebcbe34034cea5d9ea4f7fb9669007ededb6e2dd
 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 b1c7afdf6d26..cd25f239647f 100644
--- a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
+++ b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
@@ -1,4 +1,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://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/flatbuffers/Manifest b/dev-libs/flatbuffers/Manifest
index b538cf413026..c331a0bc541e 100644
--- a/dev-libs/flatbuffers/Manifest
+++ b/dev-libs/flatbuffers/Manifest
@@ -1,5 +1,7 @@
+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.10.0.ebuild b/dev-libs/flatbuffers/flatbuffers-1.10.0.ebuild
new file mode 100644
index 000000000000..5aee3963ad99
--- /dev/null
+++ b/dev-libs/flatbuffers/flatbuffers-1.10.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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/gjs/Manifest b/dev-libs/gjs/Manifest
index ad2fdeb2ecf0..c7191a9d0f53 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -4,7 +4,7 @@ AUX gjs-1.43.3-disable-unittest-2.patch 1119 BLAKE2B 8ab995513b63faee201f84ec45f
 DIST gjs-1.46.0.tar.xz 490812 BLAKE2B d7b71d6c611404d9313cdd19959e2a0cb7f035bbd2528db77ccb0030e685019b756216bfbc64885b3641c14cab2f29110492c87047c3ceb1a627765857b19a95 SHA512 14af40668e95d269ac87556c75cf45680c41bc8246f04c46726d34bd80e9344045c0a510567f156c2c25c1f10dd474dc38bd50581d1b2e5abe0daa0cf570e2bc
 DIST gjs-1.48.7.tar.xz 595324 BLAKE2B eac8b5b2f7e909e94e3fb305cac443da3f433047ee07fa8fbd15905890f77d57449c8689867df61f1ac849b8b4bddc089a9b1ddc3aa79d4b3d054226c58fa909 SHA512 b8c58e068eaecfca2fa40cebe209fa8058e603809be4307099a0f3dbd561752a540d587d546ffa74aef0268a111f2b2846a1e0febda1adcefdac8c02e716e2dd
 DIST gjs-1.50.4.tar.xz 612260 BLAKE2B c5731dd9f0703a3c6fa8e407fdba888629f7f0ad197ad60a433bc9eb315a6f633e9f192cf3ef51d17dd3529f66dc4c291f302e5dd57873e6f274047af46c2647 SHA512 d95aed6ec8001ccc5f70abad8e2c6dcee8d62f54500f19f5acb25096b398b03a932afeb226d27c0bd6c5c57d9685403f7b77b06ee7b861648402a9137446fcbb
-EBUILD gjs-1.46.0.ebuild 1559 BLAKE2B 8e46f9f4a7f06ed43132e023b25203eef301345e8de0d52183edb25c07b79fc1dec1c2285ea5b4b57b4923092e165901ebba049362cbce73c50a377b4a7e5d0e SHA512 083fd06684cd111f77b35f251c9d1418614550947366e838408daa2f214204d530273a2954304f6e3aba092c8160dec9ae581d7422f033cbf3aaaf72ec99ccae
-EBUILD gjs-1.48.7.ebuild 1552 BLAKE2B e73f0771b9cca26ed1720083502a1bff29d328c55a1a0c340c4e55941e51e683c72d41ef1af7d13269cf2cc34480a79775b5652c47244bbdfaec60e03c74f9e4 SHA512 ace6e02f405ef1433b9f8a1ee17a7d26ea695b9b8bb954ca6bc1ff3730c8246a9561e9c28b80c42f7c3713d2f40b37e020a2297cfac517e84044518ba8718920
-EBUILD gjs-1.50.4.ebuild 1424 BLAKE2B b9039836c0e02838fed58199e147221fb0410fb7c7b2baacd5ed156b82b786f8efd0318a47c56517a313096da511338b51a4546abc4eddcb1c5d189278999d1d SHA512 1eb4bb24fc0cd53475a2759cd13ad2e729fb1a5d15a1589bf16a25aed701a8a27bc5f99d22c1cc9d15dff21a993821afa03c40206e4e354ae480429fe858b9cf
+EBUILD gjs-1.46.0.ebuild 1558 BLAKE2B 035abf83ae724d27a06ee1973ccd28afc29bedea4e5720fe5b3758bfda79e5c33718dce56fe938698ee58b7c48b1737767b1facfcea6fa6be97b093b92c7c70a SHA512 f6fb1dafb934f9b5296195e8a651dc410b061d0a1cba8b066547043c50090e1c101fde253d08312a0f0b98658f624e3513b4d9fdeddd99ad8893749e23ca43a6
+EBUILD gjs-1.48.7.ebuild 1550 BLAKE2B 1eab7ab879fc148e8c1a09b9b627f3d06b4c0e80cca096ee93c5268b7b7d7b1822b48f2537e7bfb390ebfd2724da9b1974e2d40bbf1f6e5f5a8ed9e12c63d2ff SHA512 2713ac130bccd430323cfc8331b1d71fd689b42965ed29169f438912c8dddbec9186e9bf0058b60611ed65c6df610dc84923d8b815cf22f382776aed44e32299
+EBUILD gjs-1.50.4.ebuild 1426 BLAKE2B 7e0935809f042ae3078234aec4958a916f6d0d72fb02a2618f7e83e55b98aed3c74463314c6061f006170225350f854771ba2b7e5689bcabf14273880560c662 SHA512 b3c1c9390ba0be0958e4eb5eb811bfd97999894f6520b1aafa6e8f8aa2db2685c31bb2955c1cd224d9439d188a76c33a1c9687628211534326bb96ccf8b236ff
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/dev-libs/gjs/gjs-1.46.0.ebuild b/dev-libs/gjs/gjs-1.46.0.ebuild
index a93e55bea193..a0935c8510fa 100644
--- a/dev-libs/gjs/gjs-1.46.0.ebuild
+++ b/dev-libs/gjs/gjs-1.46.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
@@ -18,7 +18,7 @@ RDEPEND="
 
 	sys-libs/readline:0
 	dev-lang/spidermonkey:24
-	virtual/libffi
+	virtual/libffi:=
 	cairo? ( x11-libs/cairo[X] )
 	gtk? ( x11-libs/gtk+:3 )
 "
diff --git a/dev-libs/gjs/gjs-1.48.7.ebuild b/dev-libs/gjs/gjs-1.48.7.ebuild
index e21c88092638..257b11cc9611 100644
--- a/dev-libs/gjs/gjs-1.48.7.ebuild
+++ b/dev-libs/gjs/gjs-1.48.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
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="+cairo examples gtk test"
-KEYWORDS="alpha amd64 ~arm ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ~ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.52.1
@@ -18,7 +18,7 @@ RDEPEND="
 
 	sys-libs/readline:0=
 	dev-lang/spidermonkey:38
-	virtual/libffi
+	virtual/libffi:=
 	cairo? ( x11-libs/cairo[X] )
 	gtk? ( >=x11-libs/gtk+-3.20:3 )
 "
diff --git a/dev-libs/gjs/gjs-1.50.4.ebuild b/dev-libs/gjs/gjs-1.50.4.ebuild
index c4457cc28600..f31803a08d20 100644
--- a/dev-libs/gjs/gjs-1.50.4.ebuild
+++ b/dev-libs/gjs/gjs-1.50.4.ebuild
@@ -18,7 +18,7 @@ RDEPEND="
 
 	sys-libs/readline:0=
 	dev-lang/spidermonkey:52
-	virtual/libffi
+	virtual/libffi:=
 	cairo? ( x11-libs/cairo[X] )
 	gtk? ( >=x11-libs/gtk+-3.20:3 )
 "
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index e0258f1e2991..8338e4eeefa2 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -5,7 +5,7 @@ DIST glib-2.54.3-patchset.tar.xz 39488 BLAKE2B 0bebd1f8eadd1796c355dbad20739ec24
 DIST glib-2.54.3.tar.xz 7836536 BLAKE2B 140e7cf09a41b72a5b22e5b87e9674cbfdfe1b82f3cf5f0fd3ecb2ed6b1f62a90f8b4c0bc2f655e297f91394f771f6ecad210357e31f104ee49ca178be6b9d76 SHA512 23eb4458684624f80c17aa784eab42a38eec87bb5979fcfe56f0bc63b5c7bcf8251a0d4ea916fe2c8109ff5b14a4b60c6260755d079ff984c0d8e6a2871d307d
 DIST glib-2.56.2.tar.xz 8041756 BLAKE2B 1af5bb37378856e959602bcb9299266bba46b990839c923f6b9881624aed306af0779005281b3e3a46b5994c54812edc86aade9cb782c596fd63b6fd91baba51 SHA512 8201ea82d3613d2e879284abe01520b766da30957c5a1a22f3e6019b0cce6bf95d25beae78867b6a133401c4165153c0c92974dd459ab12f9e0e9dd0c95df5d4
 DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
-EBUILD glib-2.52.3.ebuild 9536 BLAKE2B 6ab32f46e939df7690f1a855522e323db3e5f34294399cb281a6d775fcd47272019cbf5be91ef19c6f264ab9725691485a7656bf24fe1a7f94de95d843657c56 SHA512 81dea9748342fe63b025fc637ea8940ae10e0f2d2aef5ff3d724714998ccaef21f10229a6c0374cb3c7bbf0ef1991a4d4da1f1fcfcee1c566918817ecd463cf1
-EBUILD glib-2.54.3-r6.ebuild 9987 BLAKE2B 9c0a0272ad99ece03e1770a6e2506fcb517996c1a54f6bf68a2f88eec5fa169876d8570e2bc73ff207b8ed4afd7c23ac82caae00ff7c126d48771517bb00c16f SHA512 658a2e7e650abb0b2d3b77c158f5b754f3979f8b8fb91227368c81142815d6087b3c6e2b2e55981c348ded06a96475890213d65930b78209aaf71ec7653da1f6
-EBUILD glib-2.56.2.ebuild 9676 BLAKE2B 06d2b78ba5ba5515467b8458cedc6b9897c8103ca91aa42b1618be7f6eaf21c666318edb1581c4b6e97603d8ae3aa3a42b8767cff81666f33a8c195d5c82aabd SHA512 0b83bed25cd099cc044ca6581d618f0eb1bf6b81a797052722bf68bbb7cf19b92431622790d702b5613b600bc6b1b0a570e5b51f02a469b496459bbef1a91a9d
+EBUILD glib-2.52.3.ebuild 9535 BLAKE2B aadf3d0845d85d7466b05c24cb9fca72b737cce6825ab6e685f809814fefe452995e8b7705045afd3a5172733ef756ab59314fe8318a03bc9bee5de288052cf6 SHA512 3edf2ce2a54cce35781b65332398eddac3b7956624cb02fa384f616b79979f3df54ec73a949a391d607bcb25a639fd60d90e3aa487584b871f06d2052815707b
+EBUILD glib-2.54.3-r6.ebuild 9986 BLAKE2B 4eca2dcc09586f88ee9e08451e915c83c2a7fd54e0e78e23cd8ff25502896ab56c99cce5f8314686099ab74cebed7c3685b77c70644caf2706a4007ea92ed43e SHA512 a27606f1dc6c4d6b76504d9f7310ad6f6c2f9ab4dbd160a0ac9721b9be085e5144747607184ef179bc742d8616fa58cb031ce127c04e2c1443a55b46daaf2282
+EBUILD glib-2.56.2.ebuild 9675 BLAKE2B 7b93561c9c133edad4153a2b946bbae03d897f03512959fce597a39466a60b6519db895a84feb859b7db50cf69eea3f9b3387f5c4b043f346b8d95a4ae3ada1b SHA512 71f589c33599f2cd5101d15eb95c2039aa3e1cef4c2044c09b1e37e5c5f62300bc0fc8efe14b9a5bfbc3d18057bac8465e995eec0a02b81e13b7ff03ce47221c
 MISC metadata.xml 978 BLAKE2B 75f0c12ff1628b7c345b1e85c6baa041973f11555aa520348ca6f347d2241ee0fc9bc26891b25bd34ae512dbaf761b5382d93f094dc0c4ff9a76c3ec852c9583 SHA512 8087f80cbbffb14930b50178559cc4dbde999d4e123475beb04e2d0a25e64b24ee5ab8523f1df1839e82f74272b40cd9a57b78acf34fd64f8b4723bed26573c8
diff --git a/dev-libs/glib/glib-2.52.3.ebuild b/dev-libs/glib/glib-2.52.3.ebuild
index f5f22a01a8a2..931700a301b5 100644
--- a/dev-libs/glib/glib-2.52.3.ebuild
+++ b/dev-libs/glib/glib-2.52.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
 
 # Until bug #537330 glib is a reverse dependency of pkgconfig and, then
@@ -37,7 +37,7 @@ RDEPEND="
 	!<dev-util/gdbus-codegen-${PV}
 	>=dev-libs/libpcre-8.13:3[${MULTILIB_USEDEP},static-libs?]
 	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	>=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}]
+	>=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
 	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	kernel_linux? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
diff --git a/dev-libs/glib/glib-2.54.3-r6.ebuild b/dev-libs/glib/glib-2.54.3-r6.ebuild
index 475953b02b92..ece8f434c299 100644
--- a/dev-libs/glib/glib-2.54.3-r6.ebuild
+++ b/dev-libs/glib/glib-2.54.3-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
 
 # Until bug #537330 glib is a reverse dependency of pkgconfig and, then
@@ -37,7 +37,7 @@ RDEPEND="
 	!<dev-util/gdbus-codegen-${PV}
 	>=dev-libs/libpcre-8.13:3[${MULTILIB_USEDEP},static-libs?]
 	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	>=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}]
+	>=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
 	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	kernel_linux? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
diff --git a/dev-libs/glib/glib-2.56.2.ebuild b/dev-libs/glib/glib-2.56.2.ebuild
index c30bba39cb88..0deac6b0f6bb 100644
--- a/dev-libs/glib/glib-2.56.2.ebuild
+++ b/dev-libs/glib/glib-2.56.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
@@ -31,7 +31,7 @@ RDEPEND="
 	!<dev-util/gdbus-codegen-${PV}
 	>=dev-libs/libpcre-8.13:3[${MULTILIB_USEDEP},static-libs?]
 	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	>=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}]
+	>=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
 	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	kernel_linux? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index cef125664f00..7dc1f21bde38 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -2,10 +2,10 @@ AUX portage-sandbox-test-fix.patch 2010 BLAKE2B 8e9e180c180f2059f57c953a9c828164
 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.0.tar.gz 814292 BLAKE2B d48f09ade91fd5194669101fc5c9e60ad1eba09dce61507c716257bfeaef4cf8e9318f5674a23c92bf95324fad7712443f4c31ea09de1b9769e4d4e2d1a2de15 SHA512 9788722bb85ff3018f4b7ecccd9dbd86104d8bdafd6179766e137ed09343e4b6b2029e48afe2aa4bae03e2b45176fc619da0697e3e305ee4651cc21602e15af4
+DIST leatherman-1.5.1.tar.gz 814327 BLAKE2B 133c65adb16b9eabd8dab341361d36a3736447596b019f15603e7cb45bef472a4267c5765adcb03bf9492d7f553d326c0f64ca026b4cad22e6f4744f9f12cc6e SHA512 3673a6ed530ae8f30b9a037ad42a3648ad61d50eae5c3a39a4a58f190567ccd21c4132289ecc8534202502bb7435ae79c9568a3dadf0ce75ae9c7d7fb65271f9
 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.0.ebuild 1155 BLAKE2B 4d72e82f0b95572bfbff180fc5f954a06a783610f0f23f7382c6ea2333d2688c9c75de277ae436f189e00f8642ef305d10185ecaac98936e77a9e71dfff72545 SHA512 e50d9fc558f936f8208990cafeeba75cacd421905e9a7c41e3644a2bda7ce83f18eb326eee4c8e35ae7b9023a161797f6542c16f1b3a8b545de5a9b416de519c
+EBUILD leatherman-1.5.1.ebuild 1152 BLAKE2B b99c4ef34fbcfd3d13e14fdf749beef32d4154a9a5bb8ce33255e3e59447c7e4d87e067772296f862955f9faf8ebcde31d0d59f7f414f4c08b0e0d1f2573d3a4 SHA512 ea60992fb8aedc29ad5176438edd7f1f1e20a495d25ec8250ff1383aa56e1b836baf8ab0fa094c32b231ddf005dda11c631d9f8d6c367ba009cfb0a45e7fe306
 MISC metadata.xml 415 BLAKE2B 9ab19e50b48bd911313c662cdae1221ba5c1222f6a80ec4836b63d1b07625011cfb1da7727fdd5f8156d24595df96a37376cf064f19eefc2d566fd6723afef06 SHA512 9450c72aff399df62f4479bee9e2e564bd7c451ee69fef1cf5c59b37331b312c982418de6d8dc1a5dcaec37050165413e13f83de5102e88e1c5fffa67d9b0023
diff --git a/dev-libs/leatherman/leatherman-1.5.0.ebuild b/dev-libs/leatherman/leatherman-1.5.0.ebuild
deleted file mode 100644
index d209a9910531..000000000000
--- a/dev-libs/leatherman/leatherman-1.5.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 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.1.ebuild b/dev-libs/leatherman/leatherman-1.5.1.ebuild
new file mode 100644
index 000000000000..cc7a76208a23
--- /dev/null
+++ b/dev-libs/leatherman/leatherman-1.5.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 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/libassuan/Manifest b/dev-libs/libassuan/Manifest
index 638f7b0f61cd..607b749ed757 100644
--- a/dev-libs/libassuan/Manifest
+++ b/dev-libs/libassuan/Manifest
@@ -1,5 +1,6 @@
 DIST libassuan-2.4.3.tar.bz2 559867 BLAKE2B b80f73573449aa1705ac3b4f12f89cac6a19bf4b2ed8f46d5576164196300baeaeb782c997078ac252a564b9f6067df87a340b46c68058d4a28c8291bbecf96b SHA512 2b0f58682b408fc58fa0ec2980b36e54ba66701bf504cf6c98ec652af43501bc7c18573bc78c5b83260f5a3bdb0ec8f4e0662bafd9bba3fe7287e77598e8e4c1
 DIST libassuan-2.5.1.tar.bz2 564857 BLAKE2B dc046b9551183ec543d2a186c3c593471c80445b48aec1366d0b997386c57187f9b7a848973d0930ca8d2be3f138e83c22ef9292e4c8bf5614a99ea3065c7827 SHA512 c8829925221780f175cee8c4084060b0d661229f583a50d400a1903ab7303b2724b99ff9c0fa242881d4c5d779036756e1da54d9143acc0fcd92f302ecb5882d
 EBUILD libassuan-2.4.3-r1.ebuild 1088 BLAKE2B 458d0bc83d786010d8baa61a4a7c195a1c0081ee6e592ca3d29be23aaaccea5497e4927b706eb3ff63a9d07360046e02474c31ca03f8bab94af695db3611faaa SHA512 e37bd3bb1d513367b556210b9a395958f42773f5ecb4252a525717fbaa769c9a0911f6586a920c264ef388c382aad148747166c02e4bf8919c960b16c129638f
+EBUILD libassuan-2.5.1-r1.ebuild 1218 BLAKE2B 6f0705cb8c942e8de261a0ceb7252b8074ecb427451a8be29bd163f4342f5becebfc5332e48c05d2e491c002dfd1d34fa191ae3a809da0a129357ca4c3b0259f SHA512 ab6659c42a059ac9443204f9550ad86667593a29b760614a50f86a001e7d83499701079c85b7f063a555e27d5145e69f175a2fa05926fdba3eecea454d0c3098
 EBUILD libassuan-2.5.1.ebuild 1087 BLAKE2B 16d92a4b99e67f950b73ffd544b112833b3da5ec14d7eca14d40651bae83a5b96eee71f751190b4522aaf969fd4fd8df492a85b5cc71baa41d7c284795c84639 SHA512 8d9b67ceaa45c369d93c0fff2a56061d49c056aefe9a67dfee92d508d8bdf323f5651e912480d246964e4a0bb653a22f107d1ee141b3978affccd3798ece6194
 MISC metadata.xml 858 BLAKE2B 2fc69cd4f58f8764d9d43c0b89be8765fe6d8bdab1dc8c0de634899d6ae22702ae1d7cac1b9cd69999fc297dcaa7a7386872cabb63f905558a20f736b500ad5b SHA512 cb46245a5f02ad762cb86bb18ca13fee1e9df22c6e1e367c16c9392680722d4852834c6d4d259d7ca71d817ecac22bda120da75513d6f17d243fd8db062f4303
diff --git a/dev-libs/libassuan/libassuan-2.5.1-r1.ebuild b/dev-libs/libassuan/libassuan-2.5.1-r1.ebuild
new file mode 100644
index 000000000000..f834f0c7a39c
--- /dev/null
+++ b/dev-libs/libassuan/libassuan-2.5.1-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool
+
+DESCRIPTION="IPC library used by GnuPG and GPGME"
+HOMEPAGE="http://www.gnupg.org/related_software/libassuan/index.en.html"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3 LGPL-2.1"
+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"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/libgpg-error-1.8"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		elibtoolize
+
+		# fix standards conflict
+		sed -i \
+			-e '/_XOPEN_SOURCE/s/500/600/' \
+			-e 's/_XOPEN_SOURCE_EXTENDED/_NO&/' \
+			-e 's/__EXTENSIONS__/_NO&/' \
+			configure || die
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(./configure --help | grep -- --with-.*-prefix | sed -e 's/prefix.*/prefix/' -e "s#\$#=${EROOT}/usr#")
+}
+
+src_install() {
+	default
+	# ppl need to use libassuan-config for --cflags and --libs
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libatomic_ops/Manifest b/dev-libs/libatomic_ops/Manifest
index d1532e5d0904..75182dfd4369 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 738 BLAKE2B 265631a726b304566a26e1a302fcc06089317676e73f6a31c690af800c8d41bbe1f6d61126c81098a0c39b9f68f3406fec2ebb5996a9e253d06db3e25ecd4894 SHA512 9f441be3a6dc0b337c1201ea23b54880d3fe9819d06e5cde1d677edf1905aaac7310d64fe6f6c6535ca934c13995bf4ea601af89ab8759aa661431bc3bab4182
+EBUILD libatomic_ops-7.6.6.ebuild 734 BLAKE2B e232e71e2fb3de24ea1710660294c5adcae596599112f90e7af8c328b41cbce194b7e0d40df91b08f7a39e539fb706c9eac12e381acb634fb1287e19dd078da0 SHA512 627b84b11582a66fc496d5dc6529eb8c7a93e96426a82deba0abb689db8a6edf8391026820de4852ff176891bda2ab2b7ce1f5a3568e5fda59a8be4e2d701be8
 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 a2a7fc2abd3d..eb11eae64c09 100644
--- a/dev-libs/libatomic_ops/libatomic_ops-7.6.6.ebuild
+++ b/dev-libs/libatomic_ops/libatomic_ops-7.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"
@@ -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 5d221f0b219d..1bff35281722 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 1182 BLAKE2B ededda1743d781e8846e0e70c5d7457c0e9e1ac6600255a381376fdbdeb717e465a9a8306e3da1f8a4c86d30d86976e32fda02a3507fcbe60341b83c947e70c8 SHA512 94e40afe8193d06fa79ec53d5887586b39c7ee30bf2269b7165d4f930e5bd20486233c3acd532ce9cb98406693ffc7ff54f549fa5edbda744720efc77873b5c9
+EBUILD libbsd-0.9.1.ebuild 1175 BLAKE2B 0313bdfaebb0414fd50bcaff4e2486dbf40105b41717ff1264b251c38cc71b740a1f9e4106fe06a7bb3073e35c857b5fb7359576db7e9835d6e498f52baf675a SHA512 f9b23b91b0a8b92ed9b58c874677a4ba30c05cfd89e3782bae1604f07151dbff030e4a3655c16bbb0ab8ad8e41822c07fe7962e219bf7c9568f2e79976dd0333
 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 28704d7a0f1e..af8633e3a839 100644
--- a/dev-libs/libbsd/libbsd-0.9.1.ebuild
+++ b/dev-libs/libbsd/libbsd-0.9.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="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/libffi/Manifest b/dev-libs/libffi/Manifest
index d1fdd3693d78..81e94890b475 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -5,8 +5,11 @@ AUX libffi-3.2.1-ia64-small-struct.patch 2306 BLAKE2B 1bace1573d4bdb93e7be97a860
 AUX libffi-3.2.1-include-path-autogen.patch 2901 BLAKE2B 836e61b6f64b9d649e969799e42c5dd808750ba51997d7486eef58e636ef2e1f215f9a26b5e88e61366d57e758688c4e69f578edd81167e1dbb0a8357f049150 SHA512 6c8b2d7dca0cdc6f69b2393777f546b6722b6260cfa6fcb814915975227185cc3b467b6537939f8f8d05df5fd8f245301030aa4ef74a3c2fa073e6200e91d47f
 AUX libffi-3.2.1-include-path.patch 1156 BLAKE2B b5842f5dc6462edac0a5f58265246599d0283bb148f954fb79d8037e37ae332a664f57a201589b89022d63932d8a4e56c4b0c6a7a9a2240ae6602e847fff3a55 SHA512 f387590510ee5e3aedc03744fcf1faae35c105a81d4c2f646e495d489bc6467cd88d4a0a63b40a29fe620ad71db1a05c1fe483af63974222f366135f73f36cb3
 AUX libffi-3.2.1-o-tmpfile-eacces.patch 660 BLAKE2B 651067a56e0bd0980a696ad12c8fa76d68d914fa370fb93c3f5f5759dd4837895a077510606fa451beafb75e7da19f42a9f88e3d56d6c283f684da695ad69960 SHA512 0887063ce1d812c31a34d662f852cf2944e008f2f60bd07941572f9032861e749968b090686e0d788f7cc3c5c8f1ed2388418ff000c42fd2d592f9837e782f65
+AUX libffi-3.3_rc0-hppa-no-TEXTREL.patch 2821 BLAKE2B fcc7eb0ed4a3f9b31718bf7761de8194a5fff6dc0c32be843e15e3da089ccd3819b656843844475199eb5ecc53312f4ad5c1b26d896df464d077ce15ee32eb13 SHA512 202b0685ecbf058a0414e1f2e673e4c793f5381b5714e5e8f025307068eb48f5c7eb85081859194b4500cbc5b6981f07fb4b6efc866071ea0e64f9231852444c
 DIST libffi-3.2.1.tar.gz 940837 BLAKE2B d202ccaa185acfd2476ed2a9b011891507cd8efbbda60f67c583268d1563853442ed829acecbf81c9b6b9a930345780bb7a4bd80e71e50ef544c7f4eab8cb01f SHA512 980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483
+DIST libffi-3.3-rc0.tar.gz 1084854 BLAKE2B 2c38d60f17ef52bcf270178c13c218f6ee320c9785091621d4689bcf6cee31d07eaaca12790965e1ae3ad71ad2c408342743968bf1d23f81a07fbdf6cfd55b90 SHA512 e6e695d32cd6eb7d65983f32986fccdfc786a593d2ea18af30ce741f58cfa1eb264b1a8d09df5084cb916001aea15187b005c2149a0620a44397a4453b6137d4
 EBUILD libffi-3.2.1-r1.ebuild 2269 BLAKE2B e2075034b9e9bec42427dcacbfc03aa114d9c2e5fd3cbda307bd24ae63573a8ab27459ed0b73177bd969232be7640b737a35bae7f5be69876b92de4351dfcbff SHA512 1f27cd306112d3de8762f0cfab1f6196819a6793585c477027b3e0a48fdf0259f764d87b8cb221c5b32aabd5ae47d8535f040d0960256064d14a4d78a67bcfb9
 EBUILD libffi-3.2.1-r2.ebuild 2328 BLAKE2B 26926447321e54807371c9e2154b062def22f04e298ee1ccbc5f92fed4bedab44d19622f034460c0727838fa1c6146c42cbd7fe83bc385df03c827535c42b949 SHA512 04a18c564ca898ffc3434ab7d62f2c2380300937726dae6c50f5e0d479009b059d020d48589b52970aa34723f6530bbeddd0f8f5f6fe3a865d90a48dd494e189
 EBUILD libffi-3.2.1.ebuild 1968 BLAKE2B 611f038994a687222d26a6709163e1848d15114dccd3e87c9b0a28cdc5851c6cb769eba5517d18f196cf0d27a1703ed01b40ae73e04d4e15b9cc26c07ecc9acb SHA512 f9f3b0a71a8a57adb563eb6c1ed64602976f18ff8e653f777d8dd14928bfc27417ee1aa81eab2529be1dd6b7fb70af274fe2d7cc1c0c09d29e48f37661ddeec7
+EBUILD libffi-3.3_rc0.ebuild 2022 BLAKE2B bfa0038c2730f125a3754a8c5e52895d2163ff7748235082112e8dc5316b7e7ed43b3bc8eb0726513dda7058aa0f5fb1a9b4be0c18f205eba2c48f8144ae4061 SHA512 134ee21346f8b308cdeb05c3f72ad541f846eadfa786c188dfb050916c2703ea8c282b9b59ba008ffb18a125df9f195b127a252b9839c964cb8411f4846f4252
 MISC metadata.xml 1866 BLAKE2B 4623e414d8d8c2d569b2ae8a6fd6117c38b11e5b3845bba17b32ce442b88afd0ea1aff66cd73181c59b7e66be65df078d68d13f793ab654c3e213ab4c20fce50 SHA512 e1de94bb58c77aa48ee1b7d81777d26b736db3f3ef652099bb3f3a9bd75689258a61168371a30976e0717519bc9300b3812a8405ad1f16683c45a24817960b90
diff --git a/dev-libs/libffi/files/libffi-3.3_rc0-hppa-no-TEXTREL.patch b/dev-libs/libffi/files/libffi-3.3_rc0-hppa-no-TEXTREL.patch
new file mode 100644
index 000000000000..c6286f349900
--- /dev/null
+++ b/dev-libs/libffi/files/libffi-3.3_rc0-hppa-no-TEXTREL.patch
@@ -0,0 +1,93 @@
+From 955e3c56459556284cf4a7fb23c51f9d310be80c Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Sat, 19 May 2018 10:49:07 +0100
+Subject: [PATCH] hppa: avoid TEXTREL in .eh_frame section
+
+Before the change hand-crafted .eh_frame section contained
+ABS relocation and caused TEXTREL tag to be emitted:
+
+```
+$ ./configure --host=hppa2.0-unknown-linux-gnu LDFLAGS=-Wl,-z,text
+$ make
+...
+/usr/libexec/gcc/hppa2.0-unknown-linux-gnu/ld:
+    read-only segment has dynamic relocations.
+```
+
+Link failure is caused by absolute address of FDEs
+encoded into .eh_frame entries.
+
+Fixed TEXTREL by using pcrel (instead of ABS) encoding
+for absolute addresses (__PIC__ code) by adding augmentation
+information ("zR" CIE type).
+
+All tests still pass on hppa2.0. The specific tests that still pass
+and exercise this code path:
+    testsuite/libffi.call/unwindtest.cc
+    testsuite/libffi.call/unwindtest_ffi_call.cc
+
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ src/pa/linux.S | 25 +++++++++++++++++++++++--
+ 1 file changed, 23 insertions(+), 2 deletions(-)
+
+diff --git a/src/pa/linux.S b/src/pa/linux.S
+index f11ae76..ab04c75 100644
+--- a/src/pa/linux.S
++++ b/src/pa/linux.S
+@@ -297,10 +297,18 @@ ffi_closure_pa32:
+ .LSCIE1:
+ 	.word   0x0     ;# CIE Identifier Tag
+ 	.byte   0x1     ;# CIE Version
++#ifdef __PIC__
++	.ascii  "zR\0"  ;# CIE Augmentation: 'z' - data, 'R' - DW_EH_PE_... data
++#else
+ 	.ascii "\0"     ;# CIE Augmentation
++#endif
+ 	.uleb128 0x1    ;# CIE Code Alignment Factor
+ 	.sleb128 4      ;# CIE Data Alignment Factor
+ 	.byte   0x2     ;# CIE RA Column
++#ifdef __PIC__
++	.uleb128 0x1    ;# Augmentation size
++	.byte	0x1b    ;# FDE Encoding (DW_EH_PE_pcrel|DW_EH_PE_sdata4)
++#endif
+ 	.byte   0xc     ;# DW_CFA_def_cfa
+ 	.uleb128 0x1e
+ 	.uleb128 0x0
+@@ -310,9 +318,15 @@ ffi_closure_pa32:
+ 	.word   .LEFDE1-.LASFDE1        ;# FDE Length
+ .LASFDE1:
+ 	.word   .LASFDE1-.Lframe1       ;# FDE CIE offset
+-	.word   .LFB1   ;# FDE initial location
++#ifdef __PIC__
++	.word	.LFB1-. ;# FDE initial location
++#else
++	.word	.LFB1   ;# FDE initial location
++#endif
+ 	.word   .LFE1-.LFB1     ;# FDE address range
+-
++#ifdef __PIC__
++	.uleb128 0x0	;# Augmentation size: no data
++#endif
+ 	.byte   0x4     ;# DW_CFA_advance_loc4
+ 	.word   .LCFI11-.LFB1
+ 	.byte	0x83	;# DW_CFA_offset, column 0x3
+@@ -338,8 +352,15 @@ ffi_closure_pa32:
+ 	.word   .LEFDE2-.LASFDE2        ;# FDE Length
+ .LASFDE2:
+ 	.word   .LASFDE2-.Lframe1       ;# FDE CIE offset
++#ifdef __PIC__
++	.word   .LFB2-. ;# FDE initial location
++#else
+ 	.word   .LFB2   ;# FDE initial location
++#endif
+ 	.word   .LFE2-.LFB2     ;# FDE address range
++#ifdef __PIC__
++	.uleb128 0x0	;# Augmentation size: no data
++#endif
+ 	.byte   0x4     ;# DW_CFA_advance_loc4
+ 	.word   .LCFI21-.LFB2
+ 	.byte   0x83    ;# DW_CFA_offset, column 0x3
+-- 
+2.19.0
+
diff --git a/dev-libs/libffi/libffi-3.3_rc0.ebuild b/dev-libs/libffi/libffi-3.3_rc0.ebuild
new file mode 100644
index 000000000000..0a31487e51f1
--- /dev/null
+++ b/dev-libs/libffi/libffi-3.3_rc0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib multilib-minimal toolchain-funcs
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="a portable, high level programming interface to various calling conventions"
+HOMEPAGE="https://sourceware.org/libffi/"
+SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/7" # SONAME=libffi.so.7
+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="debug pax_kernel static-libs test"
+
+RDEPEND=""
+DEPEND=""
+BDEPEND="test? ( dev-util/dejagnu )"
+
+DOCS="ChangeLog* README.md"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2.1-o-tmpfile-eacces.patch #529044
+	"${FILESDIR}"/${PN}-3.3_rc0-hppa-no-TEXTREL.patch
+)
+
+S=${WORKDIR}/${MY_P}
+
+ECONF_SOURCE=${S}
+
+pkg_setup() {
+	# Check for orphaned libffi, see https://bugs.gentoo.org/354903 for example
+	if [[ ${ROOT} == "/" && ${EPREFIX} == "" ]] && ! has_version ${CATEGORY}/${PN}; then
+		local base="${T}"/conftest
+		echo 'int main() { }' > "${base}".c
+		$(tc-getCC) -o "${base}" "${base}".c -lffi >&/dev/null
+		if [ $? -eq 0 ]; then
+			eerror "The linker reported linking against -lffi to be working while it shouldn't have."
+			eerror "This is wrong and you should find and delete the old copy of libffi before continuing."
+			die "The system is in inconsistent state with unknown libffi installed."
+		fi
+	fi
+}
+
+multilib_src_configure() {
+	use userland_BSD && export HOST="${CHOST}"
+	econf \
+		--includedir="${EPREFIX}"/usr/$(get_libdir)/${P}/include \
+		$(use_enable static-libs static) \
+		$(use_enable pax_kernel pax_emutramp) \
+		$(use_enable debug)
+}
+
+multilib_src_test() {
+	emake check RUNTESTFLAGS='-a -v'
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+	einstalldocs
+}
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 4336f6d99508..4a9bda2c9bfa 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -11,5 +11,6 @@ EBUILD libgcrypt-1.8.1.ebuild 2087 BLAKE2B 3fef7833b394d4adc5a21b6e725029e222d5b
 EBUILD libgcrypt-1.8.2-r1.ebuild 2134 BLAKE2B 337e99d2b43af15fcacf52bfc1dc2f58ffcebdc1d9ddb5441afa887dc14d0ef3c01129862133cd9d1cbc589985822bca6aa48a6527ae624e8d5c51183e1ac066 SHA512 81266f185d38869b311ee901a476e001d4d08ad49dbc789a6c196145b3203439398eb31dac171490340146aab09b69b9b01183a404506f3a42b57745819b604f
 EBUILD libgcrypt-1.8.2-r2.ebuild 2199 BLAKE2B d89c6479ecfe6ba8aefa19e8a3a93acfc1b36f96b3d24442918c9265829623564e11fbb447f953677c68ee88512705bd760e72a66265b2f4f65712372916d7fb SHA512 fd32c5982155cd59683efe845834c861048135330b1a6677c04780be1545183865a2880ef712e2f68a38fe130efe8b6f9f39268b0ffa147edb1ee608750d9f46
 EBUILD libgcrypt-1.8.2.ebuild 2100 BLAKE2B f5b19c9a2df7e882a440b8efcad581bc20df60805ced3ac31e289a36095008d6d89167d89780185a2313516779938d0a151714d06f6d12f93cb5456ea695b6c0 SHA512 c9966023f681b53bf9d2c9b9f0da01f888e14b15c360e4b565e752c0013883b4a91a08dbb06aedd75678930376a8aef240e2cfa193b2b7978d4a15d84acd060d
+EBUILD libgcrypt-1.8.3-r1.ebuild 2333 BLAKE2B c9d9679dbcb7d316b0da41b3be1f9b9c9da2564cb35269e70b89244882857364ece908dcd2c4521f351e2aea2e575ea7dedbb93b268c2070c7a592d69ff159f9 SHA512 09c1ed28c41f64f5520319682e4abb327c29f4dbb34a5689383515ecc81cd6d46ac8ee2afa5dfd2c2f81e6224109d35375fa08a594cc230900d7aa41a2383aa3
 EBUILD libgcrypt-1.8.3.ebuild 2186 BLAKE2B d1c56ad5f0182fcac6ab2fa237e5205818a0f61a7edea666b1f0f1fc4fe1f95fc6ad4a410262b293fb6e47f3e570d71f552a717887a9efb921bf902bb4f12061 SHA512 8f902c37512a01fcbc83026281e8ce9f5a8dc18d975c180f4f4206c38538dad8192ff15fc3782bcb6475e37c4bfcb4b3a96ab5321e79268a91a623f890aebbae
 MISC metadata.xml 436 BLAKE2B 63494d2110caa2744cb7e2a43bb1622cc1709698a914bcda9958ee6fb9f8e5c5cee94e5cc9ce744a6638650e6bb78a0cea719a7afad53868513a15314ebb75f6 SHA512 953eb7a141dadcdb8f4c997924169a5e9dc5ce9e86a37b3171417f3825fad7763891ddf71cf7f05e36e2c39c534474dcba3e958b06bfb0f384d0ddf26afc10e4
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.3-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.3-r1.ebuild
new file mode 100644
index 000000000000..02488a6c3c14
--- /dev/null
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.3-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib-minimal
+
+DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1 MIT"
+SLOT="0/20" # subslot = soname major version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc o-flag-munging static-libs"
+
+RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( virtual/texi2dvi )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.1-uscore.patch
+	"${FILESDIR}"/${PN}-multilib-syspath.patch
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/libgcrypt-config
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	if [[ ${CHOST} == *86*-solaris* ]] ; then
+		# ASM code uses GNU ELF syntax, divide in particular, we need to
+		# allow this via ASFLAGS, since we don't have a flag-o-matic
+		# function for that, we'll have to abuse cflags for this
+		append-cflags -Wa,--divide
+	fi
+	local myeconfargs=(
+		--disable-dependency-tracking
+		--enable-noexecstack
+		$(use_enable o-flag-munging O-flag-munging)
+		$(use_enable static-libs static)
+
+		# disabled due to various applications requiring privileges
+		# after libgcrypt drops them (bug #468616)
+		--without-capabilities
+
+		# http://trac.videolan.org/vlc/ticket/620
+		# causes bus-errors on sparc64-solaris
+		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
+		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
+
+		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config"
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" \
+		$("${S}/configure" --help | grep -- --with-.*-prefix | sed -e 's/prefix.*/prefix/' -e "s#\$#=${EROOT}/usr#")
+}
+
+multilib_src_compile() {
+	default
+	multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf
+}
+
+multilib_src_install_all() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libgit2-glib/Manifest b/dev-libs/libgit2-glib/Manifest
index f6340673a295..392db32e74d2 100644
--- a/dev-libs/libgit2-glib/Manifest
+++ b/dev-libs/libgit2-glib/Manifest
@@ -1,3 +1,3 @@
 DIST libgit2-glib-0.26.2.tar.xz 421956 BLAKE2B d38698f00d85b484d17078e78ad051a4c068b87df73fcf4d7b852dc6966628580cc4e5b3899a6edd5dc29fb47ef97ebe2c458992701b7642549f3e411d917dc5 SHA512 35fb3ec7a3757212f53cc884760f69725beff8462018b8e716fad389ba57d1acba99ece0fcd148ff40dc63e1fc7e7d566fe84759bd88d3a0ff9fdf970b0a5563
-EBUILD libgit2-glib-0.26.2.ebuild 1283 BLAKE2B 57d0c5d1d5e580f6d43326d183446004d2242668f196e2a6f82c950fb15b87ca9f1b3c2f8aeb9053fee7a4402279a6aa234af8af22abaf827008232f810f3561 SHA512 2c61ed36beb0422bc1acdf3209e94358fa0c6d50c520d3ad5cb9cdc4c97b26fdfb150e4ad8cea42ac2bef97b45a22303dfbddf382d642205659e220a8312112e
+EBUILD libgit2-glib-0.26.2.ebuild 1304 BLAKE2B 9a3bedeca6910a8bb1dc73783869b733c8135375748ee3be8ae1695636b7cb0e92f12fbadd701ce08ea438a10d898be30a5d10bbc25ebb3db31d82b32c6d6ecf SHA512 b111e69cd3c5ba40f24b12060c9b3cd5d61a3b425c173e14743c82dcf425b27da9786d52b79cb3c0af94302a29cba058ec70196b752cacad2262bfecdd72ebd3
 MISC metadata.xml 431 BLAKE2B b9cd78ab798b15be24933f218649464c25a768b6fda11d29190a18d49d2d5b2011555ee047a6b6d14df94cde89dd6bd83a85cf525215ff84ccaa2c8b5d64bbc4 SHA512 7ec17f350ff55331f7c502957be11244f629201769446e9900660f1573872a4425036feee58a9c82f05ed16d7e36820719818b7cf29bff4c37ab944c4c19c970
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.26.2.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.26.2.ebuild
index a7a8316fda36..0a599c520050 100644
--- a/dev-libs/libgit2-glib/libgit2-glib-0.26.2.ebuild
+++ b/dev-libs/libgit2-glib/libgit2-glib-0.26.2.ebuild
@@ -28,6 +28,7 @@ RDEPEND="
 		dev-python/pygobject:3[${PYTHON_USEDEP}] )
 "
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.11
 	virtual/pkgconfig
 	vala? ( $(vala_depend) )
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index cdb0a42b7e53..9610161997c1 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,6 +1,6 @@
-DIST libgit2-0.26.6.tar.gz 4734435 BLAKE2B 0831d0a78ba74b6cd989821f0abb6774f8879f18906025ce02d7c0f7f8f3e7f03b30121f79e370b85201e110a6fc4aca2ae2e608b12f01cd527ab42bf597099d SHA512 6a5a167bfe8696294cf188feec2aad898af52f4c05a3a40a55f48ea3168d200a60fc42b3819a22b1bf472be696f5dafef473d457c08bab164cbf654c4de6bda7
-DIST libgit2-0.27.4.tar.gz 4772254 BLAKE2B 9c0e7b436d8cb07a8f1407d22bcd4c7b161f3ceef9dc4e67f9daec784a1cfb9f8f2e493a78f5ef6b4893e54c1f1b567ae53ead52a992ee10eabe3229195417a1 SHA512 d27db86eb1b9f0d4057f8538ba1985ee76c3ca106e57d417fa9bff79d575f91a07ad28693112b58dc1d61d68116a82e6a145f12276158f2806b6c4964d741f61
-EBUILD libgit2-0.26.6.ebuild 1946 BLAKE2B 74710e5754c400a95e86754ff85a256dcc915cbbfa1102afcf9731ce427d9afc5f38bd559a13f0f6e47d0a6169445ecba65d3b154c6245bb760994897958e12a SHA512 721657b35fff014617ab5aad24b8977ab6117cfbab1e8eefc1d909e992356d9387b528116725501c5b80485626712145bddf5fd08fe29840ed95e619735990a0
-EBUILD libgit2-0.27.4.ebuild 1954 BLAKE2B fc3f925140f6f282598a08247dc5df33a0089affc49cc4001ccee23c414f256f175fdf490a65109bb673e03f4ec7b0f9c629d3a01aed438689ea56727d6aab9f SHA512 d07f52a7f9097b69d935ce82043e36469bfb0a0b59fa8de00eb83427f03194a8109f92b38762b765bf89f61257c703e90ef103724889e6a4c15192e6fb9cb7e6
+DIST libgit2-0.26.7.tar.gz 4737641 BLAKE2B dd87ab3048dec361619ff0e42d19161e4b20a07d334ad42aa077b77202bf5e84b85e33a6d6668afef36a7ff23f85a68f28049e08dd7502b241e40a730a78bb44 SHA512 5ad0c514b6c1c58031029f4ada278a164cc112f25c36745973df27711f12888000c054816b65889576124e93b71ec9a1c4f4cc0b538f177d93a57bc145fea1e1
+DIST libgit2-0.27.5.tar.gz 4775158 BLAKE2B 118af462a4969bc802451b887386e87da0f855641a774ce7460d6fe7ad9c62ce71a4b35a7461a95c7c4a96c59143c9c1acc78c5a1b21143a651491713f4fa15b SHA512 318b981456d55f60f8aa1897f1f70274329e48f09769b661eb4bbe76399071eca0fbc7deacb3191db16bc89dba8cc69a64adaf8cbc65e34a65b6e72ca122e21f
+EBUILD libgit2-0.26.7.ebuild 1943 BLAKE2B 1b307186052d51167fa1cc022aac4f847de31e36398c8ba58b178399e2aa527e0619a09bbcca20414f122008a4e7f8344ffd8f67b0948b605ce42d3c95c4fba9 SHA512 11a0a56558a263784838c185f6967a9fba0f2206591cc1bce6f18be73ea2a990c6012cde6c370fcb7ceace0433a07353735a6d0cb0d0580cf27005f090581fb1
+EBUILD libgit2-0.27.5.ebuild 1954 BLAKE2B fc3f925140f6f282598a08247dc5df33a0089affc49cc4001ccee23c414f256f175fdf490a65109bb673e03f4ec7b0f9c629d3a01aed438689ea56727d6aab9f SHA512 d07f52a7f9097b69d935ce82043e36469bfb0a0b59fa8de00eb83427f03194a8109f92b38762b765bf89f61257c703e90ef103724889e6a4c15192e6fb9cb7e6
 EBUILD libgit2-9999.ebuild 1954 BLAKE2B fc3f925140f6f282598a08247dc5df33a0089affc49cc4001ccee23c414f256f175fdf490a65109bb673e03f4ec7b0f9c629d3a01aed438689ea56727d6aab9f SHA512 d07f52a7f9097b69d935ce82043e36469bfb0a0b59fa8de00eb83427f03194a8109f92b38762b765bf89f61257c703e90ef103724889e6a4c15192e6fb9cb7e6
 MISC metadata.xml 1049 BLAKE2B 11b39ef834ba3e7ba1e1c5861c329a7ee0c7947952d52b2fc0b0afb7b4357fc101261c70ab263ee592e3404e33d8d87a61db949da9667d683b9fc2dd21343af9 SHA512 893398eebf0a7a90102d85c3cbc37a083db0a676fb99718e0fb3c999765851fb712110aac0c164c1b7b29505e620446c1e1b74fce38c775576f1f36f3ea34867
diff --git a/dev-libs/libgit2/libgit2-0.26.6.ebuild b/dev-libs/libgit2/libgit2-0.26.6.ebuild
deleted file mode 100644
index fe1356367611..000000000000
--- a/dev-libs/libgit2/libgit2-0.26.6.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
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
-inherit cmake-utils python-any-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc x86 ~ppc-macos"
-fi
-
-DESCRIPTION="A linkable library for Git"
-HOMEPAGE="https://libgit2.github.com/"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0/26"
-IUSE="+curl examples gssapi libressl +ssh test +threads trace"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sys-libs/zlib
-	net-libs/http-parser:=
-	curl? (
-		!libressl? ( net-misc/curl:=[curl_ssl_openssl(-)] )
-		libressl? ( net-misc/curl:=[curl_ssl_libressl(-)] )
-	)
-	gssapi? ( virtual/krb5 )
-	ssh? ( net-libs/libssh2 )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md )
-
-src_prepare() {
-	# skip online tests
-	sed -i '/libgit2_clar/s/-ionline/-xonline/' CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
-		-DBUILD_CLAR=$(usex test)
-		-DENABLE_TRACE=$(usex trace)
-		-DUSE_GSSAPI=$(usex gssapi)
-		-DUSE_SSH=$(usex ssh)
-		-DTHREADSAFE=$(usex threads)
-		-DCURL=$(usex curl)
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]] ; then
-		# repo::iterator::fs_preserves_error fails if run as root
-		# since root can still access dirs with 0000 perms
-		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
-	else
-		local TEST_VERBOSE=1
-		cmake-utils_src_test
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use examples ; then
-		find examples -name '.gitignore' -delete || die
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-libs/libgit2/libgit2-0.26.7.ebuild b/dev-libs/libgit2/libgit2-0.26.7.ebuild
new file mode 100644
index 000000000000..4b2a77205814
--- /dev/null
+++ b/dev-libs/libgit2/libgit2-0.26.7.ebuild
@@ -0,0 +1,82 @@
+# 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 cmake-utils python-any-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc x86 ~ppc-macos"
+fi
+
+DESCRIPTION="A linkable library for Git"
+HOMEPAGE="https://libgit2.github.com/"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0/26"
+IUSE="+curl examples gssapi libressl +ssh test +threads trace"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-libs/zlib
+	net-libs/http-parser:=
+	curl? (
+		!libressl? ( net-misc/curl:=[curl_ssl_openssl(-)] )
+		libressl? ( net-misc/curl:=[curl_ssl_libressl(-)] )
+	)
+	gssapi? ( virtual/krb5 )
+	ssh? ( net-libs/libssh2 )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md )
+
+src_prepare() {
+	# skip online tests
+	sed -i '/libgit2_clar/s/-ionline/-xonline/' CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+		-DBUILD_CLAR=$(usex test)
+		-DENABLE_TRACE=$(usex trace)
+		-DUSE_GSSAPI=$(usex gssapi)
+		-DUSE_SSH=$(usex ssh)
+		-DTHREADSAFE=$(usex threads)
+		-DCURL=$(usex curl)
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]] ; then
+		# repo::iterator::fs_preserves_error fails if run as root
+		# since root can still access dirs with 0000 perms
+		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
+	else
+		local TEST_VERBOSE=1
+		cmake-utils_src_test
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use examples ; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-libs/libgit2/libgit2-0.27.4.ebuild b/dev-libs/libgit2/libgit2-0.27.5.ebuild
index d10065358a4f..d10065358a4f 100644
--- a/dev-libs/libgit2/libgit2-0.27.4.ebuild
+++ b/dev-libs/libgit2/libgit2-0.27.5.ebuild
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index 2751a2d33f27..130880a681d6 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -3,5 +3,6 @@ DIST libgpg-error-1.29.tar.bz2 894749 BLAKE2B 27f7eb516663e31b5a4734d83117127d88
 DIST libgpg-error-1.32.tar.bz2 904382 BLAKE2B 92141af9e00725015ef31152ccfe4db9535a7a6ba0aa6d011f2404bc998d7b0932fdce742a45d271995c838d34342e5197a081a42eb2e5e29c11271a1c11c6f7 SHA512 0130af48fe81f4db401635757d22a330455aab5dc27edfffad44b7c7c5c439399e92d234c9e00f4d3a399646b52e06c95d53196ea19f5a166817e2032511cb20
 EBUILD libgpg-error-1.27-r1.ebuild 1287 BLAKE2B d8b77035b21a5d67fb35fa94c7581a1c2229aff20fab7ad47ab4a0bc18490d4331dbdfb81e2114b5f3fdfb4184837067a3afcca141710b1f846d3e40de2f3c98 SHA512 59121052137fb7f122a048bc320076d1d54320a41748aa5647e3d660be4b53d1d89868eb4ae23335b0492ee5b530f912449c45f1e1a5a8567b386fc7f077993a
 EBUILD libgpg-error-1.29.ebuild 1289 BLAKE2B 0d86eb4d6815b150aa7f9514e44368af4a45ab36462e4f8d858552c7b88df9e82ca103d2f742f42e5d93ea5df9721b47f08026ba99eb9fa5c63bf27bfa80059d SHA512 6b22dbb50879e62a76df64f957a23a718177a37f610b793c09c6e08c073fd882e421ecf820a0499e77edaac7cb3095003e1ccb5b62ceddb46fa88513395284ac
+EBUILD libgpg-error-1.32-r1.ebuild 1428 BLAKE2B f70906a053dd6a9731cee51b131c22152aa221ea12083353e457acc69246dcc302288bd646759d85c08321d21d03ce11e9d98ff33034f375e7516942cf8f6a2d SHA512 5e74d9b2ed48ec553d24eb088c40dbae89b9bc784494461bacd92bb8feba1920e6b48ad590592c3fb0b3ae95cc55a6bee9a69397f624d40cd2787d81861d7cf4
 EBUILD libgpg-error-1.32.ebuild 1300 BLAKE2B f7367cc13a9db8e3e671459d9dea8884633c5f401af615c28670c4902c52e9f461ad4d40b2cee61ba4aaf0b76f205ab55a32b724083a14d3762d469109894f66 SHA512 ae3d6a4c73e9ba6631a1f852278ea3a5827e81271ef90bc8cb991cd7c4b69cdf81df660ac768cd76d3a5b8010bfb7da9c7cef1421dfa1ba01138d2b03a3b0282
 MISC metadata.xml 315 BLAKE2B 18ded955b84237e03c8d14dc65f6b869c12674d4a87906f8fbc7650d02b20418cc2d97e9be6ea32f1aa170a8763cad3b91f9ac9b821a825fea0583cc66bed728 SHA512 502b5daf04f1b706514aba7d18cd454e1e99f63462159d3f5baebd1617bfa4760c7ea6fae9b7624fae2bc5943f8950211c6f4b326b6b62c3cf7eba4fc1255334
diff --git a/dev-libs/libgpg-error/libgpg-error-1.32-r1.ebuild b/dev-libs/libgpg-error/libgpg-error-1.32-r1.ebuild
new file mode 100644
index 000000000000..92257a968e2a
--- /dev/null
+++ b/dev-libs/libgpg-error/libgpg-error-1.32-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool multilib-minimal toolchain-funcs
+
+DESCRIPTION="Contains error handling functions used by GnuPG software"
+HOMEPAGE="http://www.gnupg.org/related_software/libgpg-error"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+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="common-lisp nls static-libs"
+
+RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gpg-error-config
+)
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/gpg-error.h
+	/usr/include/gpgrt.h
+)
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(multilib_is_native_abi || echo --disable-languages) \
+		$(use_enable common-lisp languages) \
+		$(use_enable nls) \
+		$(use_enable static-libs static) \
+		--enable-threads \
+		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
+		$("${S}/configure" --help | grep -- --with-.*-prefix | sed -e 's/prefix.*/prefix/' -e "s#\$#=${EROOT}/usr#")
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libgudev/Manifest b/dev-libs/libgudev/Manifest
index 1ca119e42594..b1f08664bdd4 100644
--- a/dev-libs/libgudev/Manifest
+++ b/dev-libs/libgudev/Manifest
@@ -1,3 +1,3 @@
 DIST libgudev-232.tar.xz 270904 BLAKE2B 90b2ec011f065929bd560398de9cfa8c365f9b84d205c816f2d7a98391d96bde47449eb77bc76b1e486af7dfdb3ed6525f216549e0dc3571b2ee672920438c98 SHA512 f648a41e2a6af7e26634c7cc259fdc47bb6e6ffb329324d157f340e42928e28c2059a0e923b9b0aaecd1ee3ecafbc7b55e5652f1f77bc1b88367b97057a1bedc
-EBUILD libgudev-232.ebuild 1089 BLAKE2B 4898321c81f89ddf83300bbea870bd1c3e3c04ec2785ea005785265a7ca98a4de348a9dc54803f372ac4846098336d67b71743d96d2a8bf3d3568709e6ed1fa9 SHA512 616900ea83853274a9ae05420935201d8043b1386160a6aa96d334884ca0f3059676db86c36c80ac6cf4675f4a8ed7e1cfee7d4c738cd1b6f7058e036cd6355a
+EBUILD libgudev-232.ebuild 1107 BLAKE2B 657169f15b0ced4bcf54872d71e89fe6fe9a7564e4df737b872ad82bf54f8a2fbdee47cfdd6c315ed30f6114883cfc34f57534c8643af4673baf92bea7ef82a0 SHA512 07bb376e155292c054cac61b500447f3f680874a441c024fe8d6daf882b9aaff0faa046a9d0a206e5634bb502abf41544e7c57bcc0914c494e464f97c7bad18e
 MISC metadata.xml 361 BLAKE2B 82ce1db7744cf4c9d543621978add958e480a57053f250d98d756d2d476e2ad84adf8ee41e8c332eaaec255ce9440223579ea072aadb89023c1bfd359acc6d1a SHA512 5306c2af0867c2122471d13cf49ebe04cccd62897c82d73b66b52792d784ca7bfd7d2cafa0821998084e78b43505fc449040bb46c2b406ba2d50b8a92af03f1f
diff --git a/dev-libs/libgudev/libgudev-232.ebuild b/dev-libs/libgudev/libgudev-232.ebuild
index e05ba73f4771..19cf0c8a543c 100644
--- a/dev-libs/libgudev/libgudev-232.ebuild
+++ b/dev-libs/libgudev/libgudev-232.ebuild
@@ -1,4 +1,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,7 @@ RDEPEND="${COMMON_DEPEND}
 	!sys-apps/systemd[gudev(-)]
 "
 DEPEND="${COMMON_DEPEND}
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.18
 	virtual/pkgconfig[${MULTILIB_USEDEP}]
 "
diff --git a/dev-libs/libindicate/Manifest b/dev-libs/libindicate/Manifest
index 9206bd2aecb7..b52dd7e73cef 100644
--- a/dev-libs/libindicate/Manifest
+++ b/dev-libs/libindicate/Manifest
@@ -1,5 +1,5 @@
 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 1686 BLAKE2B 8243be1670a95a6a8a4416fa93921c98efbc2120aa37f756792e63f71172a309ba5b28d70c03113a1478953ec8735bdd38d76e9198d522b353a012e4f848fedd SHA512 cc0477aca3f4c2f53337fc08bd4d28bd1c1c39fa5b853b1cfa5eda6f6e0217b24174ce83614de4c3d8bee6ff641fb48dd4ad5c4a4ce51009cebe90d05269fc03
+EBUILD libindicate-12.10.1-r3.ebuild 1680 BLAKE2B ff6b7415ef202771091e30bbb4883b20a1ce6d1e590a54c67a5f895bc6f0f9ff04e1974706795e499f5d16e00482265ae212b52be61d3f4808e54ed2708024be SHA512 060af29ebf73d4dff380ad77afd2495b94da1310e54f00d4a8adf666f4be2aee1b78f1c41666b14cacdcc372333484a47ae4a10f8946962935105d61762f1c0e
 MISC metadata.xml 328 BLAKE2B e528a6922cf244dd2e8e3387f539f9922378395dadf028852a3e17120186a4cdd82c89b29802ef5a0698a35737294733fbf9a717c3c31af90cb634ee5aa5cea9 SHA512 fc8169dee128e50da93fe6baec57989b4b2e0a59e36661328ae7bd5bf1db1ea5bcc08efb72e6ba2d0e0d9a18870144066a5c77a1f275801a4fc98953cf891a3b
diff --git a/dev-libs/libindicate/libindicate-12.10.1-r3.ebuild b/dev-libs/libindicate/libindicate-12.10.1-r3.ebuild
index 73526a89128e..20f1036d1a87 100644
--- a/dev-libs/libindicate/libindicate-12.10.1-r3.ebuild
+++ b/dev-libs/libindicate/libindicate-12.10.1-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
@@ -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/libinput/Manifest b/dev-libs/libinput/Manifest
index 8b6302c732e2..e5c397c41e20 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,7 +1,9 @@
 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
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.12.1.ebuild b/dev-libs/libinput/libinput-1.12.1.ebuild
new file mode 100644
index 000000000000..e4f4f74efb75
--- /dev/null
+++ b/dev-libs/libinput/libinput-1.12.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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/libksba/Manifest b/dev-libs/libksba/Manifest
index 1a3c7a8c9194..49eeb4694194 100644
--- a/dev-libs/libksba/Manifest
+++ b/dev-libs/libksba/Manifest
@@ -1,3 +1,4 @@
 DIST libksba-1.3.5.tar.bz2 620649 BLAKE2B 6ed250684e40b4efcc07a86584adfbc659f886919d0306e82e2275c9acb8a1df698c7cc9a917fa66dd906fe473d14fa29507c03e681aed86286d65d9551cb5f6 SHA512 60179bfd109b7b4fd8d2b30a3216540f03f5a13620d9a5b63f1f95788028708a420911619f172ba57e945a6a2fcd2ef7eaafc5585a0eb2b9652cfadf47bf39a2
 EBUILD libksba-1.3.5-r1.ebuild 803 BLAKE2B 9efcc44c2c4eed76d727ba908068e13edacf642d0136b54c4d310e168661c5a1cb8a9a4af90628493748d4fbcbe5c0a6489c71ac2fa401dedd076b131d98f0e4 SHA512 1f648c845434fabc1a9ebd5650e9a17a9943f82ed5963c8e5400cf5fbd8d13fc281be2f82a571616f3c55a59430f19aed69c8696c0d3ecc61a3aee3523c67c0a
+EBUILD libksba-1.3.5-r2.ebuild 927 BLAKE2B bc4a9c94d9a9ba57047f0ab165fa918fb57466e9c5745655553238f59f26d5aeb7426d4a0d8ec4283a7eab9bfc874c21dc52930adc22733a2b460dbc090748cd SHA512 9ca0cdcf38fa02a84613515bbf9bbc23c2ee250be4a6935d0bdd8aee11364f747214b81e7b3009ea842b58648d8e17b8c2aade1604e39022362eb15aa4f9216f
 MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/dev-libs/libksba/libksba-1.3.5-r2.ebuild b/dev-libs/libksba/libksba-1.3.5-r2.ebuild
new file mode 100644
index 000000000000..ef29c486e9a7
--- /dev/null
+++ b/dev-libs/libksba/libksba-1.3.5-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="X.509 and CMS (PKCS#7) library"
+HOMEPAGE="http://www.gnupg.org/related_software/libksba"
+SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2"
+
+LICENSE="LGPL-3+ GPL-2+ GPL-3"
+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"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/libgpg-error-1.8"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(./configure --help | grep -- --with-.*-prefix | sed -e 's/prefix.*/prefix/' -e "s#\$#=${EROOT}/usr#")
+}
+
+src_install() {
+	default
+	# ppl need to use lib*-config for --cflags and --libs
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/liblzw/Manifest b/dev-libs/liblzw/Manifest
index 48e6fbe5c87d..e53841a6d1eb 100644
--- a/dev-libs/liblzw/Manifest
+++ b/dev-libs/liblzw/Manifest
@@ -1,3 +1,4 @@
 DIST liblzw-0.2.tar.lzma 868300 BLAKE2B 6346fb0aa5d2a199276faf04a7ac6fd571d0dd06952028ff5b49c7ec312b0ba77b219be6d5a000b4477f6c84ab30ac3818e58e1165033746f675265f4fb38ef2 SHA512 46b14fe83793e9611c9ee969f699fe752f4d2df46a53b0f975fbce9805259fe4024c42df6f4946fc6dd7270b9b15307c54f31417309806ab6c616abcee73d9bf
+EBUILD liblzw-0.2-r1.ebuild 481 BLAKE2B a68d77abd812adcbc20377de1b9488b6c92fc1d941bcc54a68260afdc877f678daedb639bfb9e74b8b79eaa6e46968f910263eeae44b60c53b48003feae02ef0 SHA512 2f3a763e301016f849b5648cfa0d5c6db41175801c4a79b10059a48a2672e26b89ef0797880720dac6e0f7757fd1fd967f7f44a5488a6512235addf098d312a2
 EBUILD liblzw-0.2.ebuild 465 BLAKE2B a0ce966c22682ea2a0c95a5842441581a58f6eb479e8906786f45e4c706cb6979be80c0743ecda7f520011697573c146eec76d1a0e5b3e482a3c39283dac7393 SHA512 68d82e623358e6abdedd188709c53409669343ace16f7277484305dc014813b80c3b17733d13246c61ef3d081b3e100146ad567702a5fca4e932a0501fc23669
 MISC metadata.xml 298 BLAKE2B 60130700ab462ebfa04aef1cd0e9eb03149d92258231dd3d8a0f15a7a374d3f3d0990600cb028b63617b25e4a3c47ebbe5fc4a65e8631105273e181f53211a74 SHA512 6bef7a0d6aa13e842ecbcadde45cb547b121eb8e7683289c279b9850fde59361e7be855b6dc0e54f7ec2094c55aeaa35e95595754a9a155ab651ccb7203f2280
diff --git a/dev-libs/liblzw/liblzw-0.2-r1.ebuild b/dev-libs/liblzw/liblzw-0.2-r1.ebuild
new file mode 100644
index 000000000000..d2613787f461
--- /dev/null
+++ b/dev-libs/liblzw/liblzw-0.2-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="small C library for reading LZW compressed files (.Z)"
+HOMEPAGE="https://github.com/vapier/liblzw"
+SRC_URI="mirror://sourceforge/freestdf/${P}.tar.lzma"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~m68k ~s390 ~sh ~x86"
+
+src_configure(){
+	econf --disable-static
+}
+
+src_install(){
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libmateweather/Manifest b/dev-libs/libmateweather/Manifest
index 8e8a43937a65..cb653c3ab2ed 100644
--- a/dev-libs/libmateweather/Manifest
+++ b/dev-libs/libmateweather/Manifest
@@ -1,9 +1,3 @@
-DIST libmateweather-1.12.2.tar.xz 3394620 BLAKE2B b95af472d88c6c4495422251cd8f10a50b739b26f535677411388e6fc4748512768ae153cf0283ce2ee2697712f2f773bb8df231630782df4dd6f61e1c52754c SHA512 057037c6983ba6d21ae8c9af67d5b1bde1f7da81dbc5ef89e5eabc1b844178d2d121d29d90484baa001d22cb24e8dc832bcb1ad2702460d22f48db430fa20fd9
-DIST libmateweather-1.14.3.tar.xz 3345244 BLAKE2B 1db6f13507a10c6ad9bc0eed69b9cbdc35fa9f601ef80993a419238234c8a62a1d45f0c215d2c9347ee6622a9eb30faef76452acf8a210695051654bdf1dd227 SHA512 51e1a29b5faca6d433f6a84fc3e08bf39e87ac48d77ff90085cd7d394b3f31388f7b6b3382e4b75dbdf3b2d07f16e9f9f92bff713d3a038270314313f614af36
-DIST libmateweather-1.16.1.tar.xz 3346620 BLAKE2B 4bf5594b879517f00faf3c41b97642945cf0a8dbb65eaf66672f5d5c70432c136802743109ef74dcc67c3cf8e64ed2099f98d2167f5ffccf28a93d1b03931e76 SHA512 7cc49cc3fc16a3f06cd50db49f868d8f31a2acc95cf0c6912724248a1b35700ae0600363cd891d5bdf9961d3ae373841a0df412382933084f5e5224ff21aa386
 DIST libmateweather-1.18.2.tar.xz 3455940 BLAKE2B 15cb57c0202c1117f203bd9550c86d255404984e9163a7f79b8f81a0c436ff6bf9e1945536a15078ad479c9379798966337b6b8851ec84384ccc08c352d06260 SHA512 9b0f9b11f0c9b472a13adc1cfd26076dffd278e0154efa4248f8cc4a999250c88c761985b9a18978a7581e5459232fe2314181ae26a1c7c4fd4c80b536827504
-EBUILD libmateweather-1.12.2-r1.ebuild 1351 BLAKE2B d32c05e9f3b19d85e983006bac8b5a7e213473e89df0d85477c8650ea91adbb3f7e16013a612330c548c54aab3fcbbf2a1db680499d2fd4a7a5d8dad4e7475c7 SHA512 a8c4479e2b4a2aaa5079598906a3b005b8fbfb6f45101c5cf14890c4fba168b65219080507e163e486477cf91342ccbbcf9beba7c407e378e249555b70257951
-EBUILD libmateweather-1.14.3-r1.ebuild 1393 BLAKE2B 9f9a6f172ce2fb888f88b4bffc1f3da0aa38c6899de7c3b17fe8274020e9a634ac97df71442c8055154c635d9154de2c15384f888aa0f35dfc76f16f390e2d24 SHA512 a8e6b2fa6abcc518c0ca56f7b770578209a508ffbb5b97b2b147ff7fd602cc3c2a1cbe657f198b525a6f91f8d0bb13fa89aa63cd9e578a39512d26707a7690d5
-EBUILD libmateweather-1.16.1-r1.ebuild 1393 BLAKE2B 9f9a6f172ce2fb888f88b4bffc1f3da0aa38c6899de7c3b17fe8274020e9a634ac97df71442c8055154c635d9154de2c15384f888aa0f35dfc76f16f390e2d24 SHA512 a8e6b2fa6abcc518c0ca56f7b770578209a508ffbb5b97b2b147ff7fd602cc3c2a1cbe657f198b525a6f91f8d0bb13fa89aa63cd9e578a39512d26707a7690d5
 EBUILD libmateweather-1.18.2.ebuild 841 BLAKE2B 89c03dce2df151e8543f7bf98e0adf752121193cfc0880a85934c939bddc09bfa65a280caff3cd1c82fd0bcc8abd7104bf44eef4eb408fa960b34159945fcaac SHA512 62bd8582102a4e79ddf286bd86325107cde4c7219b41e58ed2aa0669b03223f8f5a208c445c9c7e24e6111497bb8f33cce8a117e7309e4a1a16960eb4d5d0331
-MISC metadata.xml 419 BLAKE2B ce791bdb7144ed1cece755cdf8d85dfff6ea4f06f44066de84e73087817e113e2087fd9c33f10e3480c363d46c5e4b08a7771c3cdcc2766a0b60c315be0a0449 SHA512 72aa11bd406832fed28f2a95e1ed19af5c483ce4238ac76a3d3364bfded1a6d823ca62e2c9e794b37a9d58d9270f92aa03f392b5307611b6b17cb148e826f5fe
+MISC metadata.xml 343 BLAKE2B 2c44370234b1e71de86ca5e1fc09ab633185cd1401071d3487b8d4c582115f92e30ace26aca5d3dfb89b8c4aefade6ae4bf6b93776fa123206e638b83e0df9d7 SHA512 1bc3a926850df9eabb80136639bc47809b0c49bcefc37c990cb7941a3629c7a0b2b4e6b538c5af7dcb2187239792b500185349a1ba6befe5b85f191b73467a2a
diff --git a/dev-libs/libmateweather/libmateweather-1.12.2-r1.ebuild b/dev-libs/libmateweather/libmateweather-1.12.2-r1.ebuild
deleted file mode 100644
index 594d5bf14f73..000000000000
--- a/dev-libs/libmateweather/libmateweather-1.12.2-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=6
-
-MATE_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1 mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="MATE library to access weather information from online services"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="debug gtk3 python"
-
-REQUIRED_USE="
-	gtk3? ( !python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	"
-
-RDEPEND=">=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.6:2
-	>=net-libs/libsoup-2.34:2.4
-	>=sys-libs/timezone-data-2010k:0
-	x11-libs/gdk-pixbuf:2
-	virtual/libintl:0
-	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3 )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-2:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2:2[${PYTHON_USEDEP}]
-	)"
-
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	>=sys-devel/libtool-2.2.6:2
-	virtual/pkgconfig:*"
-
-src_prepare() {
-	mate_src_prepare
-	use python && python_copy_sources
-}
-
-src_configure() {
-	mate_py_cond_func_wrap mate_src_configure \
-		--enable-locations-compression \
-		--disable-all-translations-in-one-xml \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable python)
-}
-
-src_compile() {
-	mate_py_cond_func_wrap default
-}
-
-src_install() {
-	mate_py_cond_func_wrap mate_src_install
-}
diff --git a/dev-libs/libmateweather/libmateweather-1.14.3-r1.ebuild b/dev-libs/libmateweather/libmateweather-1.14.3-r1.ebuild
deleted file mode 100644
index 6858f117b265..000000000000
--- a/dev-libs/libmateweather/libmateweather-1.14.3-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1 mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE library to access weather information from online services"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="debug gtk3 python"
-
-REQUIRED_USE="
-	gtk3? ( !python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.6:2
-	>=net-libs/libsoup-2.34:2.4
-	>=sys-libs/timezone-data-2010k:0
-	x11-libs/gdk-pixbuf:2
-	virtual/libintl:0
-	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3 )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-2:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2:2[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	>=sys-devel/libtool-2.2.6:2
-	virtual/pkgconfig:*"
-
-src_prepare() {
-	mate_src_prepare
-	use python && python_copy_sources
-}
-
-src_configure() {
-	mate_py_cond_func_wrap mate_src_configure \
-		--enable-locations-compression \
-		--disable-all-translations-in-one-xml \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable python)
-}
-
-src_compile() {
-	mate_py_cond_func_wrap default
-}
-
-src_install() {
-	mate_py_cond_func_wrap mate_src_install
-}
diff --git a/dev-libs/libmateweather/libmateweather-1.16.1-r1.ebuild b/dev-libs/libmateweather/libmateweather-1.16.1-r1.ebuild
deleted file mode 100644
index 6858f117b265..000000000000
--- a/dev-libs/libmateweather/libmateweather-1.16.1-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1 mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE library to access weather information from online services"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="debug gtk3 python"
-
-REQUIRED_USE="
-	gtk3? ( !python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.6:2
-	>=net-libs/libsoup-2.34:2.4
-	>=sys-libs/timezone-data-2010k:0
-	x11-libs/gdk-pixbuf:2
-	virtual/libintl:0
-	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3 )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-2:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2:2[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	>=sys-devel/libtool-2.2.6:2
-	virtual/pkgconfig:*"
-
-src_prepare() {
-	mate_src_prepare
-	use python && python_copy_sources
-}
-
-src_configure() {
-	mate_py_cond_func_wrap mate_src_configure \
-		--enable-locations-compression \
-		--disable-all-translations-in-one-xml \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable python)
-}
-
-src_compile() {
-	mate_py_cond_func_wrap default
-}
-
-src_install() {
-	mate_py_cond_func_wrap mate_src_install
-}
diff --git a/dev-libs/libmateweather/metadata.xml b/dev-libs/libmateweather/metadata.xml
index 7cbfd82a6056..dc3f1bc34c2f 100644
--- a/dev-libs/libmateweather/metadata.xml
+++ b/dev-libs/libmateweather/metadata.xml
@@ -5,9 +5,6 @@
 		<email>mate@gentoo.org</email>
 		<name>Gentoo MATE Desktop</name>
 	</maintainer>
-	<use>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/libmateweather</remote-id>
 	</upstream>
diff --git a/dev-libs/libmirage/Manifest b/dev-libs/libmirage/Manifest
index 0a92ba7b8f05..0d75188408de 100644
--- a/dev-libs/libmirage/Manifest
+++ b/dev-libs/libmirage/Manifest
@@ -1,5 +1,3 @@
-DIST libmirage-3.1.0.tar.bz2 234649 BLAKE2B 1b0194fc6271454481ba752f2e7241d9aa69b8d1608dc059b17eb32ad78ee7721d0f85677511e97ccc6fd708690950d0ed6ab662cdff4ccd94804b1a5756542b SHA512 fcf49b171b6f84ad32cdeeb63def76e8bd5c5f33aadcc678e06d7388d0c351e8047beae6db9db7b69f704ab4db86aca4e8fb9817b2450c70b5f1d3d7a3760394
 DIST libmirage-3.2.0.tar.bz2 234214 BLAKE2B f2b8c42eed89efaeddb8051160c51814b4df45c1ca7cdb4cef683b86ea73dcd1446c6806588a9df0410da5b3971ce8945f2479022f21177237ee8b0d4b18d2d3 SHA512 15507154441b660f5a58e1101d4e6f9931a7640b90d3de5e387274c72be07f367b54a6be34dd31442bc504459414f611ffc39f86ff6a7381a820d059aef1d6d6
-EBUILD libmirage-3.1.0.ebuild 1178 BLAKE2B 368ef1f9c2dafa9706b90bd21e360a85997c7f6347260b23f566851eb84d1f0b482dc0367b81ba7ab888d5c80e08718201797d327bce2e6deba61e4a7aeae81b SHA512 e73f833029df60b402a6c4ee05e348c579cf358a5e5a66743b51710629a26d420d88bb5ea336a32ff03207204794f847bd1d668295658a3e4e99f1500d92ed13
 EBUILD libmirage-3.2.0.ebuild 1178 BLAKE2B 8b781a34e0f1e0d8049b3be8b4fb3c0a11c96cf3bcaa655ba8309ef14e5d298609f6a78f383e1a6895e726b31a442b34c4581c610198bacb517435799fdd4a05 SHA512 491e40196a432fa0fb4d3d1d6adc430e0b0d6fb04b9f1d2b23450c35e4c51aa6984a61d1b9c934b7fa6d856875dc6eaa5204bb46a5b732298409ff467e38a931
 MISC metadata.xml 455 BLAKE2B 23500677c263c1b8fc4839698bd6f1c08e9821fe4472a0b1725ad4777cfff385531ab6ec966f32a2335571c315b6f886f973451076745aa9fe4297c3cc436a30 SHA512 51c8d87f3c49c81798e4d2e038f911a2e05bfde742f229939f759c6768c6459cf4aa6829981791c57ef766fd447923194d7c14d4ad16951ae505d3b5a73c3479
diff --git a/dev-libs/libmirage/libmirage-3.1.0.ebuild b/dev-libs/libmirage/libmirage-3.1.0.ebuild
deleted file mode 100644
index 53a4fe0fd81e..000000000000
--- a/dev-libs/libmirage/libmirage-3.1.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils xdg-utils
-
-DESCRIPTION="CD and DVD image access library"
-HOMEPAGE="http://cdemu.org"
-SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0/11" # subslot = libmirage soname version
-KEYWORDS="amd64 ~hppa x86"
-IUSE="doc +introspection"
-
-RDEPEND=">=app-arch/bzip2-1:=
-	>=app-arch/xz-utils-5:=
-	>=dev-libs/glib-2.28:2
-	>=media-libs/libsamplerate-0.1:=
-	>=media-libs/libsndfile-1.0:=
-	sys-libs/zlib:=
-	introspection? ( >=dev-libs/gobject-introspection-1.30 )"
-DEPEND="${RDEPEND}
-	dev-util/desktop-file-utils
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DGTKDOC_ENABLED="$(usex doc)"
-		-DINTROSPECTION_ENABLED="$(usex introspection)"
-		-DPOST_INSTALL_HOOKS=OFF # avoid sandbox violation, #487304
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	local DOCS=( AUTHORS README )
-	cmake-utils_src_install
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-}
diff --git a/dev-libs/libmspack/Manifest b/dev-libs/libmspack/Manifest
index ecb842477581..39429f503b13 100644
--- a/dev-libs/libmspack/Manifest
+++ b/dev-libs/libmspack/Manifest
@@ -1,4 +1,6 @@
 AUX libmspack-0.6_alpha-fix-tests.patch 575 BLAKE2B 35a8342f103926bfff555237cbd432fd679ab61620aeaf654041cfb6c39a18f3be475bf7e0a93c004d7c953d6f2ed66e4528d3b546e9d22b28e1e666c6d9caeb SHA512 8c715e174d3eca76fb33c2a5eccccd4f7c4c7702320d0db9db5dec6038129f508afade126ae791191ffaaf60740a722db7a87fc76f8c00c86912a1e2e2323eda
 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
 MISC metadata.xml 355 BLAKE2B 27dbf410ad5287ffc5ec6336a0c4cfc8eb02b52d72c9cceaaf39518dd435fc647e5c667f003c2b00141bd076fb574e6914f8cd3ad37de693bccfef9942e46689 SHA512 08390d344d23931d0c418eb18e0db2dbaba1f9942fac4984786fab7fa15045a9ccded1acc98d8ff4fdb4a2d5d83cb68383818745cb06b1b743489a2efaeb69d1
diff --git a/dev-libs/libmspack/libmspack-0.7.1_alpha.ebuild b/dev-libs/libmspack/libmspack-0.7.1_alpha.ebuild
new file mode 100644
index 000000000000..a75ec2a107d3
--- /dev/null
+++ b/dev-libs/libmspack/libmspack-0.7.1_alpha.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit eutils multilib-minimal
+
+MY_PV="${PV/_alpha/alpha}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="A library for Microsoft compression formats"
+HOMEPAGE="https://www.cabextract.org.uk/libmspack/"
+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"
+IUSE="debug doc static-libs utils"
+
+DEPEND=""
+RDEPEND="
+	utils? ( !app-arch/mscompress )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	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)
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		default
+		cd "${S}"/test && "${BUILD_DIR}"/test/cabd_test || die
+	fi
+}
+
+multilib_src_install_all() {
+	DOCS=(AUTHORS ChangeLog NEWS README TODO)
+	use doc && HTML_DOCS=(doc/*)
+	default_src_install
+	if use doc; then
+		rm "${ED%/}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die
+	fi
+	if ! use utils; then
+		rm "${ED%/}"/usr/bin/* || die
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
index 4192ee599e15..fdbdee33ab40 100644
--- a/dev-libs/libpeas/Manifest
+++ b/dev-libs/libpeas/Manifest
@@ -1,6 +1,6 @@
 AUX libpeas-1.14.0-lua.pc.patch 553 BLAKE2B a86596d6c76e22e3e947709db226a47110f0964ae493d4fd16e506f4666de5fd5214d431a5109ffb0b68a6743bf2aa89aba84b63fabe4e402ac491be01479743 SHA512 ead06352498ff82a4520d4a7ed7b5d03e2d0adcdf2025413851b8385bfdd691c938b456b555d2214ec2dc7b95708f306149d6f1cfa7c5b03ad28a1c90c873349
 DIST libpeas-1.20.0.tar.xz 557872 BLAKE2B c10cd85ff6f15f2124541aba3b437e3216322647e36f93a2202df14aebda7c35896a5f77a40ddcd5a5f0300df11c274334cc3a8dfba3fe2745e0b364cb7eac4c SHA512 b3ddebf65e1a76493b5cd5150f60c13597c90398eea16c002e51d25449a595f7591bd0ccd1214ca3a8cbce724eb10f38a316e8c95092442034c048bc95cfdbf4
 DIST libpeas-1.22.0.tar.xz 561332 BLAKE2B 219918f8663cd60c9353f477ef905ce0d1e21bf5b7c09661c4cb3c8adbba3af9f5e93b9de8a1b098dab09b1f4071854a871c8ea1db878bda8fe9e51aa45e5f87 SHA512 9c1da1d4b5688c0f4d0647f3519dbfbed94c8921091057aaef0e41bf5ed3f8faf04a49ce9e4eea3fd7bf4ac4dfa1727d76a5f6dae2a4f52228d4c8c74b420c91
-EBUILD libpeas-1.20.0-r1.ebuild 2194 BLAKE2B a03b68170871a7e76c8388b4bd2d40f4445c5c4dcae3b98973d95bf7986df94cc3663b4f966f629bb13fb22426c1c3a4703e6b0dba1b4a8edd4655331e6391bb SHA512 bdc2c00a5cbf017d4350d53e3036608eb29b8066478f85cec4ff3a3ce77f8e023211eab919f2956d59d88c6828e947fb6560841ad0806fd270e01169ab8d0868
-EBUILD libpeas-1.22.0.ebuild 2196 BLAKE2B 2bb01f72b8310096a7ed5e8bca2897e8b9ccf5bb7f274b59dc53bde0fedc87ae73bac4a6468465bc4dcfee18f2bdb8b1785ed68628d42528ad2236ccc30ae4ab SHA512 d284b413a68ae347349a341e4ae0257f38417d592b46d9ba6e6d1aa8a5d953f7fd860d51ff0836c8c9604c998430b358c913de44a315a0e6bb3eec94c83e190c
+EBUILD libpeas-1.20.0-r1.ebuild 2212 BLAKE2B 94369c4abc1588f29d6a110b9214b25ccc43f4726c91ebb007f1e72b46716bd7dc99ffc18e4c4586e342ff520b124fdaa7909c83c29b294379f8e4a892fadfda SHA512 8be3b2b79b1c7f6adb3ead0aaedbf190723a4526a453553e975f87d9d9cafc66e8e8ba56e4ff4023a3504bd80c3eea03f2a298aaff143cc63bc42dae870d3e90
+EBUILD libpeas-1.22.0.ebuild 2214 BLAKE2B a46dee4e46b038bdb23673db638f532b35d8c1306a3acecfc132d57380894ae249965a624b4c6b3bf0ff9b4806af50e9c5103d3e2ede4926fac2efa193be8e92 SHA512 ccfb81db1a18863d8f639a9b76c48543165f89bb2202d16b0354395d72f7cf188f5102d49bbbbfb7d89a4cf0d3b21ed63656fe92597af38aef05a056ee31ed40
 MISC metadata.xml 415 BLAKE2B c3e3dc9746663cd67cfb3a1b2e765bf5da73f9db2669ff7003b5e77ccbbe686780dd181727c3dd3d3f4c5f6e312daa1f36901896ff843cb81c687853340ef680 SHA512 4bf99a5c542cab95dadcf6db8aecbefa0be453f8851c2222ee698eec38c221f3b45b2ead6f87dd1d1ec5a233ba73054cf3b3d7b92d12ff4d88ee04a2057c50ea
diff --git a/dev-libs/libpeas/libpeas-1.20.0-r1.ebuild b/dev-libs/libpeas/libpeas-1.20.0-r1.ebuild
index 9eee684fe8be..347976db785f 100644
--- a/dev-libs/libpeas/libpeas-1.20.0-r1.ebuild
+++ b/dev-libs/libpeas/libpeas-1.20.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
@@ -31,6 +31,7 @@ RDEPEND="
 		>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}] )
 "
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.11
 	>=dev-util/intltool-0.40
 	virtual/pkgconfig
diff --git a/dev-libs/libpeas/libpeas-1.22.0.ebuild b/dev-libs/libpeas/libpeas-1.22.0.ebuild
index 8d8c434cf020..943446685b42 100644
--- a/dev-libs/libpeas/libpeas-1.22.0.ebuild
+++ b/dev-libs/libpeas/libpeas-1.22.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
@@ -31,6 +31,7 @@ RDEPEND="
 		>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}] )
 "
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.11
 	>=dev-util/intltool-0.40
 	virtual/pkgconfig
diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
index eb5ab69a5a1c..6b64e4dd7bfc 100644
--- a/dev-libs/librdkafka/Manifest
+++ b/dev-libs/librdkafka/Manifest
@@ -1,5 +1,5 @@
 DIST librdkafka-0.11.4.tar.gz 1900117 BLAKE2B 3e755c91d6a2e12829ba841749977f8c05c9f243d79db64247547e4a49790e67d07f7d82633f45689dcc5f88caaef200027e6af3866de283c1de6120d7f98467 SHA512 6b34e7c476d328a2f8e8321f6ddcaeaf43730284bb3aaddac81c3cd9a1fa5d7f7ef7481f1093b36d89edde7b766da6cd27a9eb9a635b12b640e8a46a269bafc8
 DIST librdkafka-0.11.5.tar.gz 1984510 BLAKE2B 55a27482275726233b5c9b39dfac1b9f34235c68600b5720c1a9dec782de6a4d7d084ad71e50857c32a93b39beacc891933e02f45162d0de144ecaadb3640c41 SHA512 4a8dc46ad66f23cff4d4ef2fc8daa7207bfa3e77fd3580b3f141a73b449e60ea5381e97263235b4d0d762df027a8a2cad08637d88162d9605c82d74a1e64b67c
 EBUILD librdkafka-0.11.4.ebuild 1251 BLAKE2B 27576a7d2421373ed2d13d9f0ec566d6575c137372f08000271ad0e7f492c22d19a817d803816b2aacd9ceeda28a5f2c4307f56b7302efa8734a52b3b0b2db37 SHA512 9cdeeee1606f1108e4ad3e203ddcb4f99dace5768e4fa37bfade9b4630e60e7fe6899b17d231c8fdbda9d1ef513a2f5f3868fd7153348f386090db3bc3f94e1c
-EBUILD librdkafka-0.11.5.ebuild 1256 BLAKE2B 6b789b387aa1c063bffae6721a597ee16bb0f6679021a0c65e1a2c9b65844ca2e06cacc936553733feff6b3b6ecdb9ffdd4daf1a9e0e4e2be0d09170a63eca44 SHA512 bfe22f31e565a0690af0bf1e8edc4836612235edda04dcbb826e9f24011a2abd9a6924e0891c6ac5eb489fe3a24efff5857cc157845733f5cb77e9a9de10e259
+EBUILD librdkafka-0.11.5.ebuild 1251 BLAKE2B 7f395b4ae2c92b1ff4a0c110cebb46a30379b0bce1994bcf2e0038fb81c2408f6bd2ac3e902fbcf3018dbd249be3c65f0b334cd4d27d93963a03554292cb1875 SHA512 83a55f1104a0f7061e377358b040f86ce932f469de90ab4296ecf5229e8b9883d236ce785695277ad4dae84aa7dc0a731e48110502d8aafc461566c003925fee
 MISC metadata.xml 533 BLAKE2B 51fa8b199e9126c2942044008614a47915d17ea2e11edbc4254e995ceddf71649018feed0655fa3a5a73d6d7f2c17ab0b4e963bd0b7f4922f1a3fbcd85e04052 SHA512 7f859dce01869e64712cb9042a1ab982255ec524334f2a1fbaf3f0e50fbc08bd3dd21e4bdf2ccef5b539aef94e0bfa2b7af95ef215cfddea4202608005934308
diff --git a/dev-libs/librdkafka/librdkafka-0.11.5.ebuild b/dev-libs/librdkafka/librdkafka-0.11.5.ebuild
index 5e13b2f3eb90..cbd1e8fd3d24 100644
--- a/dev-libs/librdkafka/librdkafka-0.11.5.ebuild
+++ b/dev-libs/librdkafka/librdkafka-0.11.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="7"
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/dev-libs/librelp/Manifest b/dev-libs/librelp/Manifest
index 223c6f07c9af..30334dc8a384 100644
--- a/dev-libs/librelp/Manifest
+++ b/dev-libs/librelp/Manifest
@@ -5,5 +5,5 @@ DIST librelp-1.2.17.tar.gz 506426 BLAKE2B 998d2845263655a43d0cb002c4538663047f2e
 DIST librelp-1.2.18.tar.gz 506766 BLAKE2B 939bd2279e03a6431fbdfb787aa3d62b3f622ec3248dfc7c0a0a141294c27319081092a624c328374cdba0cbd51659301a77ad41bed27ba13f47601f7a607944 SHA512 7193438238b7019e7a4944d6d900a1fa5a369ff8a6b97a6dca7e82b6637c0f391ec3554eeeaa285881457cb2abe72fa1a893244ec9a36cc9d2e2592d58c5462a
 EBUILD librelp-1.2.16.ebuild 1121 BLAKE2B d273b6b565f873de81b7e9f4ef5898b27b9e89a8b6f55f34af56d9a1ec4fd737906124449192ca1a34964f1f83392d8f31260bda8788f408fed0f21698d13a5a SHA512 1c97eca0f18370667f0d9efd30d42e8d1e047cf146c505731a6005da2492a10e1cb9dd5c26e210e76018c0763f6be2ea5996ec8d7b3c0277396b81f44f772df8
 EBUILD librelp-1.2.17.ebuild 1453 BLAKE2B 0340264d4d63c0b46fdc82716e3232355131121204108f247ade16c6ff5bc194ca0b9fa2e5d69b928c8793af537310d19fcc31e8b154226ff7bdde14bbde8f74 SHA512 0aaf5db558d22b5b79b36df0a32cc88c9b649a6d0457002e5553a414b8c058af68efe18570c0822f95708f69acec2fefcb131957e40bb775b55570c376ec29d0
-EBUILD librelp-1.2.18.ebuild 1450 BLAKE2B 2dc770f3a5df10a91fdb9dfdbbbafef121c2716059458d40fdf74d818c120ec98ed30442576102d2d6b1fd345d32464d5998c51d6ee1c38bcfcfd2544fa2bc38 SHA512 9f79958875bc5b457c0c1105016beff198e9c157aa47100f41dc4796174c6a720d9cd90af6fed441c6213c93b5943809d5317c8fac6e1d658bdc772ab3feb091
+EBUILD librelp-1.2.18.ebuild 1448 BLAKE2B 0b4ab1fa9a6cbf0c8ce6292ab91532696097188da64f3fdf89817ebd8dc356ec1c2b8215aad30c56ae575fe1d2dbc3d8db388b0724236d494783847611966908 SHA512 0ec2fa4e69440f21b6784e068366c4805f37109226f9a53633b6dee17df5be95c3243690082a17e2f6ee108d2c1163c2f50c7a3b86023da98fade0982ca7b56c
 MISC metadata.xml 503 BLAKE2B 987b40e4f9b5e33e1f293023237b7d0cb614ea36113d6d5becb780fddc729a2a2a033cab8e41b64a0465d0f14e220c96787e30b7b133979e36ad86a1273ad0a8 SHA512 31f5e4ece41aab561a70c7b9af6119bce8c3cb7fb6720be754dd925ee656faa75ee953cd3d296d1b8bb5f48368d015ec5d2768d217b349f1689e767424786e3a
diff --git a/dev-libs/librelp/librelp-1.2.18.ebuild b/dev-libs/librelp/librelp-1.2.18.ebuild
index b57bbb9097e4..d6002e114922 100644
--- a/dev-libs/librelp/librelp-1.2.18.ebuild
+++ b/dev-libs/librelp/librelp-1.2.18.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-3+ doc? ( FDL-1.3 )"
 # subslot = soname version
 SLOT="0/0.4.0"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc x86"
 IUSE="debug doc +ssl +gnutls libressl openssl static-libs"
 REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )
 	gnutls? ( ssl )
diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest
index 817455b54ea9..9a63a5831cfa 100644
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@@ -1,13 +1,10 @@
-AUX libsodium-1.0.10-cpuflags.patch 1261 BLAKE2B 7c6db671f50891243b5c235404991dbfa5b5ac3ac6424669e73d0e10713d9734f3ce58223f300b865c58962170c43aa823f221a00f41c596e95ee84029cdf089 SHA512 ba8ded5442d027d6b85d19d12dcee4a42234013062e9d4d33f5016ecb455401284b48754069277839e5095cd814de7f6e8c1e93ca5b1e8999f2c8e1b81296bd0
+AUX libsodium-1.0.10-cpuflags.patch 1262 BLAKE2B 64c222e8b67fa85968151238bdd397d8babfcacdb857c54c8fe54b148787a111d9246583c312593b8e803c7fb4a21143ef7351ece2d4d2d5d0518f32e05de46a SHA512 eab27424dd5c506b1f371c156f656f4d95189329053c5814d5212f3503f39a02c1583fe8c6ba9bf0f7e6240f8a94ffe448656857e0be174b354f67bae3e1e2fc
 DIST libsodium-1.0.11.tar.gz 1846782 BLAKE2B aadab6c89d11740dca72d7686d06cfeca6c504fca9e78108778817da4071d9e7bb6115df42e9509cd872ae7a5489ef15c099cabaf564f28e90b7f74a63bae140 SHA512 4b1293c4d0e52264beecdd05833857bc4d77d1c2a97eea0138fe04df383b9a2dfcad4a79ccd9aed8f6c0047ba67c49292b0d2ccf987ab0b5046b46b1586ccbd7
-DIST libsodium-1.0.13.tar.gz 1895139 BLAKE2B cc59f58f0bcd3c7d69a32a401063f8514289a3bf655ccea303f37ec9c08ad16c8780981999f99efe8257180ef45d86af8f512271eb4e1232eefe6e5baaf300b2 SHA512 c619b12fdf0b2e59174b6e383a62d5499ebcd720fdbb2c1a41a98a46c285df075202423454b294fefee185432441e943805397d7656f7cd7837de425da623929
 DIST libsodium-1.0.14.tar.gz 1876526 BLAKE2B 37e9b785cc397f58ab07e38eef9e6f3ed8a2dbfbfd1c865b64d8d9b9440db3f8aa32671065cebf4f73d449889e7abfacf63910add08f0e27582cd6fb32bfbacd SHA512 46663b05aab13ec4003ecc32c89bdaedf60824703be522661eeaa3db8013140bda434c19a759dc38bcbce757e9673a03e701c0eac1526a31a4b7a15608ae8696
 DIST libsodium-1.0.15.tar.gz 1866057 BLAKE2B 220e327f7803c6cf0b1260b313a225d7cc7a965b36920c744379c5939643e588687032478e3d7a79b4614c5fa57b0dd2afd216b2e23ca69ad16ea67764a840ca SHA512 299a208f8342793d13498e95b23f1749f5b5b13ec276db3ec401130615e837ef475b6a1283b6e87a5f8227d23e70e38ca721073dadd5dc88fe4aff342aa64adc
 DIST libsodium-1.0.16.tar.gz 1910835 BLAKE2B d0d83730cfdb64a928c4597a3bcf4ae179d74bb9f850364bf0670547a12842009c0ca32d36d06053906fb649497406b1d7988e167772d5f1138d23798d8775f7 SHA512 eab917d599c9c1fe971a6ecf915b9a6476ccec2d46cf23cbfbf06dd3833089b422f192de4d55f17b93362f1251ba8d5ddeb95ced1a422a3a2631b4b82553907f
-EBUILD libsodium-1.0.11.ebuild 1042 BLAKE2B 95f1c5cdf1ef19da389bb03c973cec7c5e93cb7c09dced6eb2b0b7c772c18811b82ce9db2e41adeb7e91a0ec94a58103ca129b4f7fe8e4d5013e0a75606858be SHA512 d70a16a7e9c752f7d649b23f697f7f8b52e1b51ff5bf8904b73ebe2bc830ca314ca7dd574b91ecc28e7458776a98b79bd36f3c5457081e1576242cfb5bb8955b
-EBUILD libsodium-1.0.13.ebuild 1052 BLAKE2B ea8f2cb2872ff2803d9c2b56572b864fc47885645516d966f5ca0a7b77a06f7af76c5973461bc6bbecd6aec106205999291337762c850a36396d5a515fed1462 SHA512 46407c1cdec13c2db6f5399ccdf915d51bf3b34fa1f6fea094360e4a295347ea47356bd340729efc5511fd92246f2a087f829a57d72a00e48184392a101c7bb4
-EBUILD libsodium-1.0.14.ebuild 1052 BLAKE2B ea8f2cb2872ff2803d9c2b56572b864fc47885645516d966f5ca0a7b77a06f7af76c5973461bc6bbecd6aec106205999291337762c850a36396d5a515fed1462 SHA512 46407c1cdec13c2db6f5399ccdf915d51bf3b34fa1f6fea094360e4a295347ea47356bd340729efc5511fd92246f2a087f829a57d72a00e48184392a101c7bb4
-EBUILD libsodium-1.0.15.ebuild 1047 BLAKE2B 1cff6b973068f72f2e2810760be7bd51416bfe6ae7a79cd8a266e234577046d52ff49f9a3cf940dc2538a952e8c566614f7918d11dd44d17d78d5b2a7c2e662c SHA512 613ba210222df239cbb6c986e472b08e27a83e48016016adcf2d14280587390a7807c0f7d6b5f1c3fd24d506d8dbee40de030329e3329a7d004fa37e0aa131fe
-EBUILD libsodium-1.0.16-r1.ebuild 1204 BLAKE2B 7b3cc043c5cd3c91e75177878156cc2c4d63b3e8c109801bd604b9f9d8e0e94f593c983da16e065c9650dce785f67fece9d71cc835f1457b5092dcb20e14c711 SHA512 1a7d8bc354f2cc6b76706e4e202e6a0ad997fd0523c50598d92f56b13a3e370f0245f3571a4304de92a680178e1f696ac1bb588933af1f4edb8ad593f0f9d42d
-EBUILD libsodium-1.0.16.ebuild 1064 BLAKE2B 80b0f5bb116fc2da72b1d21f824c7a859feab1ae105222dfbcdf734ae23f10dacbe712c0320d4172b6b57b1928bf4432dd2c49cda21c803a061361bd9e2c6f2c SHA512 f21c78a4250393a583ec41f1f13fa14e2aff7106abf63d529ee92a65c346b5b62ce75ffb4528d538a02fbacdc018faee67e9440a9cd534b59863817900a7f19a
+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
 MISC metadata.xml 792 BLAKE2B 381d25a84293a019bccb6e68f25b37a08ff768cb36207bd971c925731380925b50f743efd7bdb542364a870be0070c1428a2b08e37de5d190a21a2f077ca8ff7 SHA512 78cae1c9f71512da084b0c93301bda69cf6d2da6cf66099df45f31a763c5f23459e6b484ecd5d3d1e8faf570c2de8a4d1816a2b3c8565a539ee64fcf7b1b61f1
diff --git a/dev-libs/libsodium/files/libsodium-1.0.10-cpuflags.patch b/dev-libs/libsodium/files/libsodium-1.0.10-cpuflags.patch
index 09e5c01618c5..544c283d8509 100644
--- a/dev-libs/libsodium/files/libsodium-1.0.10-cpuflags.patch
+++ b/dev-libs/libsodium/files/libsodium-1.0.10-cpuflags.patch
@@ -24,7 +24,7 @@
    CFLAGS="$oldcflags"
  
 +AC_ARG_ENABLE(aesni, [AS_HELP_STRING(--disable-aesni,Do not use aesni code)],
-+  AS_IF([test "x$enableval" = "xyes"], check_aeni="yes", check_aesni="no"),
++  AS_IF([test "x$enableval" = "xyes"], check_aesni="yes", check_aesni="no"),
 +  check_aesni="yes")
 +AS_IF([test "$check_aesni" = "yes"],[
    oldcflags="$CFLAGS"
diff --git a/dev-libs/libsodium/libsodium-1.0.11-r1.ebuild b/dev-libs/libsodium/libsodium-1.0.11-r1.ebuild
new file mode 100644
index 000000000000..fe9bd6598f34
--- /dev/null
+++ b/dev-libs/libsodium/libsodium-1.0.11-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils autotools
+
+DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library"
+HOMEPAGE="https://github.com/jedisct1/libsodium"
+SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/18"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~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 )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# --disable-pie needed on x86, bug #512734
+	use x86 && myconf="${myconf} --disable-pie"
+
+	econf \
+		$(use_enable asm) \
+		$(use_enable minimal) \
+		$(use_enable !urandom blocking-random) \
+		$(use_enable static-libs static) \
+		$(use_enable cpu_flags_x86_sse4_1 sse4_1) \
+		$(use_enable cpu_flags_x86_aes aesni) \
+		${myconf}
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/dev-libs/libsodium/libsodium-1.0.11.ebuild b/dev-libs/libsodium/libsodium-1.0.11.ebuild
deleted file mode 100644
index 0ee03ff85352..000000000000
--- a/dev-libs/libsodium/libsodium-1.0.11.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils autotools
-
-DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library"
-HOMEPAGE="https://github.com/jedisct1/libsodium"
-SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/18"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~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 )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# --disable-pie needed on x86, bug #512734
-	use x86 && myconf="${myconf} --disable-pie"
-
-	econf \
-		$(use_enable asm) \
-		$(use_enable minimal) \
-		$(use_enable !urandom blocking-random) \
-		$(use_enable static-libs static) \
-		$(use_enable cpu_flags_x86_sse4_1 sse4_1) \
-		$(use_enable cpu_flags_x86_aes aesni) \
-		${myconf}
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-libs/libsodium/libsodium-1.0.13.ebuild b/dev-libs/libsodium/libsodium-1.0.13.ebuild
deleted file mode 100644
index 2b80cec2ea29..000000000000
--- a/dev-libs/libsodium/libsodium-1.0.13.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils autotools
-
-DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library"
-HOMEPAGE="https://github.com/jedisct1/libsodium"
-SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/18"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~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 )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# --disable-pie needed on x86, bug #512734
-	use x86 && myconf="${myconf} --disable-pie"
-
-	econf \
-		$(use_enable asm) \
-		$(use_enable minimal) \
-		$(use_enable !urandom blocking-random) \
-		$(use_enable static-libs static) \
-		$(use_enable cpu_flags_x86_sse4_1 sse4_1) \
-		$(use_enable cpu_flags_x86_aes aesni) \
-		${myconf}
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-libs/libsodium/libsodium-1.0.14-r1.ebuild b/dev-libs/libsodium/libsodium-1.0.14-r1.ebuild
new file mode 100644
index 000000000000..6d9c86e10fa9
--- /dev/null
+++ b/dev-libs/libsodium/libsodium-1.0.14-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils autotools
+
+DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library"
+HOMEPAGE="https://github.com/jedisct1/libsodium"
+SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/18"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~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 )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# --disable-pie needed on x86, bug #512734
+	use x86 && myconf="${myconf} --disable-pie"
+
+	econf \
+		$(use_enable asm) \
+		$(use_enable minimal) \
+		$(use_enable !urandom blocking-random) \
+		$(use_enable static-libs static) \
+		$(use_enable cpu_flags_x86_sse4_1 sse4_1) \
+		$(use_enable cpu_flags_x86_aes aesni) \
+		${myconf}
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/dev-libs/libsodium/libsodium-1.0.14.ebuild b/dev-libs/libsodium/libsodium-1.0.14.ebuild
deleted file mode 100644
index 2b80cec2ea29..000000000000
--- a/dev-libs/libsodium/libsodium-1.0.14.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils autotools
-
-DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library"
-HOMEPAGE="https://github.com/jedisct1/libsodium"
-SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/18"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~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 )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# --disable-pie needed on x86, bug #512734
-	use x86 && myconf="${myconf} --disable-pie"
-
-	econf \
-		$(use_enable asm) \
-		$(use_enable minimal) \
-		$(use_enable !urandom blocking-random) \
-		$(use_enable static-libs static) \
-		$(use_enable cpu_flags_x86_sse4_1 sse4_1) \
-		$(use_enable cpu_flags_x86_aes aesni) \
-		${myconf}
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-libs/libsodium/libsodium-1.0.15-r1.ebuild b/dev-libs/libsodium/libsodium-1.0.15-r1.ebuild
new file mode 100644
index 000000000000..cbf53540a9cf
--- /dev/null
+++ b/dev-libs/libsodium/libsodium-1.0.15-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils autotools
+
+DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library"
+HOMEPAGE="https://github.com/jedisct1/libsodium"
+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 s390 sparc x86 ~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 )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# --disable-pie needed on x86, bug #512734
+	use x86 && myconf="${myconf} --disable-pie"
+
+	econf \
+		$(use_enable asm) \
+		$(use_enable minimal) \
+		$(use_enable !urandom blocking-random) \
+		$(use_enable static-libs static) \
+		$(use_enable cpu_flags_x86_sse4_1 sse4_1) \
+		$(use_enable cpu_flags_x86_aes aesni) \
+		${myconf}
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/dev-libs/libsodium/libsodium-1.0.15.ebuild b/dev-libs/libsodium/libsodium-1.0.15.ebuild
deleted file mode 100644
index cfce5ad6f4cf..000000000000
--- a/dev-libs/libsodium/libsodium-1.0.15.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 eutils autotools
-
-DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library"
-HOMEPAGE="https://github.com/jedisct1/libsodium"
-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 s390 sparc x86 ~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 )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# --disable-pie needed on x86, bug #512734
-	use x86 && myconf="${myconf} --disable-pie"
-
-	econf \
-		$(use_enable asm) \
-		$(use_enable minimal) \
-		$(use_enable !urandom blocking-random) \
-		$(use_enable static-libs static) \
-		$(use_enable cpu_flags_x86_sse4_1 sse4_1) \
-		$(use_enable cpu_flags_x86_aes aesni) \
-		${myconf}
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-libs/libsodium/libsodium-1.0.16-r1.ebuild b/dev-libs/libsodium/libsodium-1.0.16-r1.ebuild
deleted file mode 100644
index dd260ff32ea3..000000000000
--- a/dev-libs/libsodium/libsodium-1.0.16-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library"
-HOMEPAGE="https://github.com/jedisct1/libsodium"
-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"
-IUSE="+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local ECONF_SOURCE="${S}"
-	local myconf
-
-	# --disable-pie is needed on x86, see bug #512734
-	if [[ "${MULTILIB_ABI_FLAG}" == "abi_x86_32" ]]; then
-		myconf="${myconf} --disable-pie"
-	fi
-
-	econf \
-		$(use_enable asm) \
-		$(use_enable minimal) \
-		$(use_enable !urandom blocking-random) \
-		$(use_enable static-libs static) \
-		$(use_enable cpu_flags_x86_sse4_1 sse4_1) \
-		$(use_enable cpu_flags_x86_aes aesni) \
-		${myconf}
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/libsodium/libsodium-1.0.16-r2.ebuild b/dev-libs/libsodium/libsodium-1.0.16-r2.ebuild
new file mode 100644
index 000000000000..2afa35b750c9
--- /dev/null
+++ b/dev-libs/libsodium/libsodium-1.0.16-r2.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 multilib-minimal
+
+DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library"
+HOMEPAGE="https://github.com/jedisct1/libsodium"
+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"
+IUSE="+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local ECONF_SOURCE="${S}"
+	local myconf
+
+	# --disable-pie is needed on x86, see bug #512734
+	if [[ "${MULTILIB_ABI_FLAG}" == "abi_x86_32" ]]; then
+		myconf="${myconf} --disable-pie"
+	fi
+
+	econf \
+		$(use_enable asm) \
+		$(use_enable minimal) \
+		$(use_enable !urandom blocking-random) \
+		$(use_enable static-libs static) \
+		$(use_enable cpu_flags_x86_sse4_1 sse4_1) \
+		$(use_enable cpu_flags_x86_aes aesni) \
+		${myconf}
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/libsodium/libsodium-1.0.16.ebuild b/dev-libs/libsodium/libsodium-1.0.16.ebuild
deleted file mode 100644
index 6144b166e52d..000000000000
--- a/dev-libs/libsodium/libsodium-1.0.16.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 eutils autotools
-
-DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library"
-HOMEPAGE="https://github.com/jedisct1/libsodium"
-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"
-IUSE="+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# --disable-pie needed on x86, bug #512734
-	use x86 && myconf="${myconf} --disable-pie"
-
-	econf \
-		$(use_enable asm) \
-		$(use_enable minimal) \
-		$(use_enable !urandom blocking-random) \
-		$(use_enable static-libs static) \
-		$(use_enable cpu_flags_x86_sse4_1 sse4_1) \
-		$(use_enable cpu_flags_x86_aes aesni) \
-		${myconf}
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-libs/msgpack/Manifest b/dev-libs/msgpack/Manifest
index 1d3620fd1899..6183d1107bf8 100644
--- a/dev-libs/msgpack/Manifest
+++ b/dev-libs/msgpack/Manifest
@@ -8,7 +8,7 @@ DIST msgpack-1.4.2.tar.gz 776384 BLAKE2B c8605847aca3faa3aba2c573bc6f020fbfbc773
 DIST msgpack-2.0.0-patchset.tar.bz2 1645 BLAKE2B 273faa0fe88f4da06b57b7deb02de77191bdb6c5ca76d314043636979157b879f73cbcb0a0b931cecb3eb0f706b3c6cce0e42350eebf20c44503393504c9edb0 SHA512 7b40b0e6675b333bdbf3d811e47a55e35c4aa136e378966ce3e5f42aaf6de57d883db71ed5c189c6da1803d6725847db23f6fdf1cc0cdc921d3cadcf245545c4
 DIST msgpack-2.0.0.tar.gz 446063 BLAKE2B 24bb0657dc8f190740ae3f91541f702d9954e1ff6c12931c43911556a1d34634882dd59678e5aae4a4b55733620a1445c2fef0379be9454b0fa32ce5d7515f08 SHA512 74d1c9641ecdf1a54346088c59415cf778821dc6f6acb0c5a8a93c2284edaf53c4746459093971d96136279fbd8de10cb9a43dd8d8220d335618ad30e971e9a3
 DIST msgpack-2.1.1.tar.gz 460168 BLAKE2B b6e3746033e4779139c5efe0d48eb00e19badff17f910f5a5cdba8ebdccb178f88cbb4e6e85687e4a2ddb0d5c9e6b53dec1e4cc2cee070b5e51e38c5a67b0ad3 SHA512 31ed6fda498d43da6fdbbe000ce36c40e4cf886f00d879c57d406def7f5bba4eaf66f02f221398cb50f6f4c748d5cde9c97eca0cfa21b368c7c933c3301cf9b5
-EBUILD msgpack-1.1.0.ebuild 1063 BLAKE2B b01756400a2d53df06f2ef9db07d917b2345222e2e8aeae733a15c8f2868bd5c5facf918e41f745e470b975ecff7cecf9f5dd625afff15bfa6df763a570bbceb SHA512 357f12d850d2a039e066e51907679849b59783ed6ee26ed4b2d4934850274ee4e25bc5b338e2d085ad1eaa750d5724786606e4ce17e2f097f65816e2e9e2bf26
+EBUILD msgpack-1.1.0.ebuild 1033 BLAKE2B e41916d1f6989bc7c51034b13014b7082ec7e211ddfd2f8a04954ae4b6d401b79280cca54c7571412e28a487339f7ace68b05fc7aca15f0c8ecd8359a67e6ee6 SHA512 2184c7b7c056ea3dcce1c7502b9824066ffdcac16abed62b80edcff6af977c9694e0b3c652cd1abe08bc87f7e767e7e4cc9660370ce7f1f0d1a8e2b699b3dcb8
 EBUILD msgpack-1.4.2.ebuild 1674 BLAKE2B 2a36fc474c50ed7723ad62a2942946c62a0eddf2def09599f1e15215f24c0ba7c560f6e904a07f4cc672602a802a3659a00ce590f0f70d1463797a3f7d2cdfd1 SHA512 bc91ffe2886996f3bec6519cbd22702395efe799793567c63a43d211e5b59e2188bd9194adc607bb5fdc5ad14199a51717084aa941a400a61b1a32ba1ce5a976
 EBUILD msgpack-2.0.0.ebuild 1023 BLAKE2B fce4463e3f3b4c66ab563b2e1ea346808b0c4b4d64e1392c6e857f49db1d25dd9e3fabda8f70f4c9f07c23f29b3aa3ec042a332ccee15b1c8b647d0a765ef141 SHA512 9e920a7a0e0321cf9ef8001adec487166733a8ecb9e7aa6d4e6101b7aae9215f2389f3738724bac5acdd67dac5de26ea9b7913b8acd6c7a4cb61349da639302a
 EBUILD msgpack-2.1.1.ebuild 1673 BLAKE2B 3c50da3985f6154b8896c0913b93319aa39d181e43f252c5a89dca2b3ed1e0da6e0ce71f70dce4f62aabc0c27f402db3c0ae87ae27f6a6eb54b857e538feba0c SHA512 9f3ed1a223c3390b60c3790885ab7e19cf51f2071c9078f1f5f9de1ade7707f06a54b7f77d4f0d1169d462d70f6f341285e0604a03ce2a1a815d871dcc47c702
diff --git a/dev-libs/msgpack/msgpack-1.1.0.ebuild b/dev-libs/msgpack/msgpack-1.1.0.ebuild
index 9b281e2b23f9..5b8c66b8a343 100644
--- a/dev-libs/msgpack/msgpack-1.1.0.ebuild
+++ b/dev-libs/msgpack/msgpack-1.1.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=6
 
 inherit cmake-multilib
 
@@ -37,9 +37,9 @@ PATCHES=(
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use cxx MSGPACK_ENABLE_CXX)
-		$(cmake-utils_use static-libs MSGPACK_STATIC)
-		$(cmake-utils_use test MSGPACK_BUILD_TESTS)
+		-DMSGPACK_ENABLE_CXX=$(usex cxx)
+		-DMSGPACK_STATIC=$(usex static-libs)
+		-DMSGPACK_BUILD_TESTS=$(usex test)
 	)
 
 	cmake-multilib_src_configure
diff --git a/dev-libs/npth/Manifest b/dev-libs/npth/Manifest
index 93a1bdce0bf4..19712eed7b20 100644
--- a/dev-libs/npth/Manifest
+++ b/dev-libs/npth/Manifest
@@ -5,5 +5,6 @@ DIST npth-1.6.tar.bz2 300486 BLAKE2B 665fdb2f4cbe59750b6b4b7c2701ee80a23a122df10
 EBUILD npth-1.3.ebuild 675 BLAKE2B 101174fbc1293b04ee1b227560213654c2dbe7488dbdbaeb8de89fed9ab4462e22aaa7885f296f7188a7215f599adb82b73ff23e1af88576fbd44f5d93c4be30 SHA512 3a699b2874058b7fe4614d9d6853b10178565092f68aed700f12a79ea7ec7ba28e7e30e97f5e0c766066223d224c58cf14275986edf6eef1b521ff1c270504c8
 EBUILD npth-1.4.ebuild 690 BLAKE2B ebfdb4fa6dd18b1ba10b0eb7cb87b9506151db6906e10ecfa7b3930e9b11dede9212f46109bee83baba3afce807105abaae322f4bb825197d7466b5dc60b51a0 SHA512 c46dca3ea141e43649d01408d668ab3619fb06c1ca2d66eaf8c44d250f983886844e20ec79aedf3731c257118c3bee96d2f3003de55559cf5db399adb0697006
 EBUILD npth-1.5.ebuild 759 BLAKE2B 8fab769d848c8f18dc3b3ed6304e994ef75a218aa194b7aae52abb4bececd80696824164dd9cf7e1677b9ec078d2327104b298e9fba49a9c6a2647aad2a1e6d4 SHA512 76f6420df7ea25fc796356765cfc2f1512948c0b089e3fb1335c8ae1e32c380701a581c4bb1eb6c9f46dc63be056314a341156b973c138af59e7a47d93b34043
+EBUILD npth-1.6-r1.ebuild 775 BLAKE2B 8b5d532ba541583413b1945737d42f4a043d1215e6431c7defb127c34c8f6113fdbc4c8e2ebdf930a1bd8c4465fa8f27d6a1e6ff9598e09f37908c23944f247d SHA512 d0102def9bcf1e86a1894db0fc04a055c569eccab77d9129797f5c51c2be4774a546296b9b08740336da901ee79c42011c0e74898b51f30399d513817a16aced
 EBUILD npth-1.6.ebuild 771 BLAKE2B 468a628fcfdf6598dcf33f8cbde187d4d6cbfdc59a50793e73b87f8d34966dfeea4105d894ac5b8a7b6478b8282424c1cc1c86ae008999caf8b1ffcac36d0957 SHA512 9cfd786c8bcd1b597eb45e779462dde2e5b72f0d09aa3990bc2a242c43167c350a22a20249fb1121b0fc1f69332ac962474ed6dfb10ee4104183b75f2419b229
 MISC metadata.xml 246 BLAKE2B 569d634cc821d4a537880a58ca96bf709155b0af827d8153b9521d5ca29f174ec29629d11b9eb91ee1cbba5f1a823d5c621521105a00e9fbd6d9a27bc3740bde SHA512 8ac20e3524a896e77d186b34b589ffe4287593c43fca1d50bcc06cd27e8cb8f5c0da2087622413a748a1738177d5939a50bda7a1e5d0ba36fbf4fb6d7b9bb015
diff --git a/dev-libs/npth/npth-1.6-r1.ebuild b/dev-libs/npth/npth-1.6-r1.ebuild
new file mode 100644
index 000000000000..14e2fc70b370
--- /dev/null
+++ b/dev-libs/npth/npth-1.6-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool
+
+DESCRIPTION="New GNU Portable Threads Library"
+HOMEPAGE="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git"
+SRC_URI="mirror://gnupg/${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 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+src_prepare() {
+	default
+	elibtoolize  # for Solaris shared library
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/processor-trace/Manifest b/dev-libs/processor-trace/Manifest
index 8de3bf19824f..16a9d425cb24 100644
--- a/dev-libs/processor-trace/Manifest
+++ b/dev-libs/processor-trace/Manifest
@@ -1,3 +1,7 @@
 DIST processor-trace-1.6.1.tar.gz 250843 BLAKE2B 0fa3f97f14e6fb931ea787261e84c65cbce0667db7adc709bdf386f5a87a9eb9af71b3b5b45c1c0f17d6b8e6800b92e9417955dc5496f3f6d3022620153fc2ad SHA512 c7c9c8ba78021fff3fde12a216f5729c6031114e5a727f49b7ff1a31c53b5ddba24d1b3aee252d8278ecd1fafe78a44ed059c12b9eb29eca33093e0720673468
+DIST processor-trace-1.6.2.tar.gz 259982 BLAKE2B ab394dd37eab924e841d77911f90e0b3ecceac69ae1b8fcd911c0bc26c2ac4aedf8bde3e0d8197b3341159d6b35458177f0c795eb9c1b146e38fd278135042fe SHA512 10f4ef6bcca9a4b39b0cfbfc82d79a6adb206aaa1a78961b0dea0926f7e2e462ea3cd5430dc82e71ce9dede18550f3c84d38fee26e1b2065668767fb5f796995
+DIST processor-trace-2.0.tar.gz 338965 BLAKE2B cc536139ab0e6f7e0d4a99e906a32e9636e55444e4c5fc37fb18a0df538bb5f6ae4c0cf4bc207afab6d0490a2fa7678fc8a0696dd1b16055869d6fdbd73618db SHA512 ec63151e842c81cc73ea11ba560b63e005cefbe19d98de24ae5c8caa4de7c9c1d71d1ec5b6214a347592eac675b75a3d2b26d4691ca86f91020ebfea8e912939
 EBUILD processor-trace-1.6.1.ebuild 543 BLAKE2B 0a4155b01d2de88da40c6786cb052e8de930350a90a72aa734f25660b4e7441f74705f4a5808f091da2e540485e1544183817d60a8d94d69213d6d3443881f87 SHA512 6fb6b8239ac8ee0eb3d1f8d1c15980df0b0338bf9e78d3ac0b4b3dc1e22bdc9ca2db8d2e760e70682087748aa25d9eb6a440445493334f31ca00534115fb7f61
+EBUILD processor-trace-1.6.2.ebuild 540 BLAKE2B a44ae143be81d5cb72cb63fbd04b4a22407ea8a4f17a2ebecce0753d9c85e1a80a314a267d93551fe6d68efd0b9663cb17903a8cfd0d82bce343bf2debddfe1a SHA512 a3bbdf085cec752deaf4023eb99c58e246ca837dedc39e46f0809b5c430df9df995d98e7e7e131531a65fbe08b7a8accf40864894751a0ebd4f4001b96bfb47a
+EBUILD processor-trace-2.0.ebuild 544 BLAKE2B abd9ee3819ffdb9458f48da3d1c8eb5c32ecb65f902fa5791d9edd87476e5f00105c2cb883e35f474927d8e4a7fb24eb0cb180a96afcbef88a3833884b72a125 SHA512 b72dd17cc2f06c009164ff6f051231092b2befa9055590ddf39a5527c6a3c90db2997214f1f2083b637d1089d7b88bd70572ae142489aa546152e5b6d5b385ea
 MISC metadata.xml 369 BLAKE2B edcef74fef3ee485f69eb5c78d78dd917969ca0caf6d0e1df3829abafe94c88bc5c1b098c79f1c7f9af67108a3d31f841ec749a386d25785db20f160091f450a SHA512 2f19cdf8f8f3bce36e4c7f904e16b8068cdf41fb01e8031c13afee9a413e1d65084fa69db2198ba0b239ccd05ade12bc13ec042b689eb86ee725d51167d9a9e1
diff --git a/dev-libs/processor-trace/processor-trace-1.6.2.ebuild b/dev-libs/processor-trace/processor-trace-1.6.2.ebuild
new file mode 100644
index 000000000000..58e645476adf
--- /dev/null
+++ b/dev-libs/processor-trace/processor-trace-1.6.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 cmake-utils
+
+DESCRIPTION="Intel(R) Processor Trace decoder library"
+HOMEPAGE="https://github.com/01org/processor-trace"
+SRC_URI="https://github.com/01org/processor-trace/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT=0
+KEYWORDS="-* ~amd64"
+IUSE="doc test"
+
+DEPEND="doc? ( app-text/pandoc )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DMAN=$(usex doc)
+		-DPTUNIT=$(usex test)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/processor-trace/processor-trace-2.0.ebuild b/dev-libs/processor-trace/processor-trace-2.0.ebuild
new file mode 100644
index 000000000000..253935c1743f
--- /dev/null
+++ b/dev-libs/processor-trace/processor-trace-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
+
+inherit cmake-utils
+
+DESCRIPTION="Intel(R) Processor Trace decoder library"
+HOMEPAGE="https://github.com/01org/processor-trace"
+SRC_URI="https://github.com/01org/processor-trace/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/2"
+KEYWORDS="-* ~amd64"
+IUSE="doc test"
+
+DEPEND="doc? ( app-text/pandoc )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DMAN=$(usex doc)
+		-DPTUNIT=$(usex test)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 2d93ad2e65e9..ec7a05c5acbe 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -1,20 +1,18 @@
 AUX 70protobuf-gentoo.el 170 BLAKE2B 6d9a92bd3310ca09d18dd762bc0bbd4b0b36184c17f95c80c02183c457fe4ff1142ca1e3207e5a77c078fe5f768cb3e85abc712abc1f4c85774ca1ebf178059b SHA512 ed73cd6b1bf6c0019e4da73c3a480b0f917e949dfad2696336e805263c81610b2a8a0514840e389db0f0e78252cf053d754c5e07731dc5e9c93c9e88f0b2923c
 AUX proto.vim 49 BLAKE2B 9b6d31105811a8f8cbcf76328172fda5b66b33351bb16573ed1ed08d4c553af2805962a6d6609fbdad4a2644bf9cecd1e771a557f138111ad2c0be959b497ee9 SHA512 65c1f49887c17973d1dfce07fa86d04c5079d2382826eaeb22e128570717f181c53d22ba50905252021f7e476a90ecd29f9d18799c1ccea64b01f4638323538e
 AUX protobuf-3.4.0-disable_no-warning-test.patch 900 BLAKE2B 6187eeba1912f1bc6732d944eba4617ab99946efa429b3a96bb3b984af7ef45098885ce6bcdada1bb8995aee4a61cde404175459975242acf263a57d2d74c7fc SHA512 6d0687d17b626493e7e57dcb3e34095c9a450ecb8e538e9ad7cab69bdaf19ba52fbf5d70187c773bee0ee28496850e5ab0f56dcd571797e62434d865bd8761c2
-AUX protobuf-3.4.0-protoc_input_output_files.patch 9636 BLAKE2B 6276c9b731a0ed8e6f437a4a2db57a79d245e02046a62ff7415f41d925ffe7cb115810a2784a7e41ec3f32311be1bbe8ff35660126535be55f9e2ff92a50af6f SHA512 036fcc8a169be8d96dd04523642d5f42a2b935d8b818d3f3ae6f4e8e08ed9bd10528b6c0b1f84901b8415e09e4375ce5b885177f08e757c2af5160640c0369d9
+AUX protobuf-3.4.0-protoc_input_output_files.patch 9645 BLAKE2B 56911d89826684d39e9590a7577e10b036794f42bfa899896ba8311002632ea511057280c2676c1755ade71c8b698693b27fdd08cf4866d6673dc6cbcc17ffa2 SHA512 52894a8886386c5d9db45d78b777d7874b2bee3bf66315b27dcdd5d0ccb387fc25a47f547cbaca6630aae120ea78dc052ae5cdadb2219adbcc3b52612a5cd1ae
 AUX protobuf-3.4.0-system_libraries.patch 5788 BLAKE2B e82517985065f53793ba5f4914317a6c2dbd7bd2c1e3bdb0796c85c402f4ec7e9d6645c1ccb7f73bf0b559d44db14ace9657c059c07948c3baf11c4b450bb572 SHA512 f8b54087e755ab6ae07630e99ca542b5690429ed7c9801c04219b016fd361b39a01d9e4d594f5c5820a0ec90f02f7ef4aeaf864e1ea2b770078a198daf928db3
-AUX protobuf-3.5.0-atomic_operations.patch 785 BLAKE2B 7c7cc7a0000fc5472a8603a8770fd20f0577e099d66f280f9c111485159f34a3010fcc76e88e2feb6eca4283a3458cd02bedac58f100e14f7e911e305c06869b SHA512 a84b8e87efab8c4063bf9b8f2422170c3b08acac66ebdeafca700309ee27614bdec1ec18a57d188bd6170bcc966854582ec748b0caedbec1feb0c3602fe9d9ae
+AUX protobuf-3.5.0-atomic_operations.patch 812 BLAKE2B f55d364fa5b7ee405d7cb9b08e6ce1a3446a9604a39002f915bdaca2cd527bc7c173aefd898f473b1666eff55c1473db9699b4dc3c992ab3bdc8ae18855cb1b1 SHA512 c7ed996f106bd9632c9979c2e5665759c18c46f64f05bf5b8b9efc5c896b6a072375a657df7f5372b8089aad38791f768765ac1118c2aeed1785f040aea310ee
 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 9623 BLAKE2B 8b04f9a8f98701dec8ec1b5c2206a01a3b8d18e378c6c99d09ff079f24de204bdac9cd384d286973ce79742ab6bc6339e89b43db172296e661eaaeec7973ff6d SHA512 334ae940d86c34e2175fb57dcb0ea50e154ccb526910442bd0a48563b604ffc404518a9a527207d043af572047c15327703861833a21f5896ff1a48674a72f30
+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
-DIST protobuf-3.4.1.tar.gz 4490100 BLAKE2B e2bc1ef2ee1a0af44830b3c65a6c9e73883fe6ec0d07f6a6136f5564f0e85306005440ca6f8c4eb834c7c70f909792c9e2457a761f10f95431981263a9acd7a3 SHA512 471e52198fa878a79183dc8fbc39d9c65239be4d9dff799e12281ee9b1af61a427584534b1baae1773bc6e4c86467f89ca2e7911a21effd86bc5f40cc7d94c34
 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
 DIST protobuf-3.6.1.tar.gz 4485582 BLAKE2B 546c49759df784018459809b9db692c5c94aef5d717183af5cd9edd96b4c658e759f23950cdcd5dddceaaad06ea1de2a2357b9fa8c496ed5d538fc5920174da0 SHA512 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839
-EBUILD protobuf-3.4.1.ebuild 2512 BLAKE2B 671e0bb79f5744b86a4c968a42b3efc0583b357cea941ae577dfa3839c401d19a2f42db02d0a70d66466d5a585bac646c8d143da3c4b2bbfb81fab0512418f70 SHA512 e80a80f3806c09fcf79a6ad7cb271a1bac2ad10f4020cc49b57112982bef76f2658660439f320ba71fe0b2ec1f86374c8e5f19d8b9640963ba10bbb436e5fcf3
-EBUILD protobuf-3.5.1.1.ebuild 2606 BLAKE2B de3ad34fecf997b8734738c0e8eeeb320c1a40cb31fb254e6385bfce42ee6e783de5328dddd3f4e65967e19d8d37f11d24724155d14d378cd3e75e0b611d4f30 SHA512 e15a7313e583a56b88cc7408d2d081e8ceac6e660595fb99c9f1dd91eafa7a8fa45c4f6259d7bd240a994f7464d28bdd0997da5c026d64399ad650e3f32625ab
-EBUILD protobuf-3.5.2.ebuild 2476 BLAKE2B 102bace5a78941b00193e4f0ffbd49e6ed849e7ffaadb24337ca014ce2d8e3c701c059add758033e77a85b4b91102a506f30c4abe990f634ee591779ae599ae1 SHA512 cbf835d457fd5420001d85cfb6ff34ea0adf385fa606a2b169e57f01214835f72d54589309ea215f8823e8ce7551e8d7caf4d629353ed1ae3ce4c00a840e1bd1
-EBUILD protobuf-3.6.0.1.ebuild 2476 BLAKE2B 527f59cc354c4c0e1db7500f5b7c803abf79d7f97e4d7ab4a187ea7817cc75441d162bac2614fb00e635871d79ac89cb76726320e060c01d622006e9668c7c23 SHA512 10ea54508497790213297670dfc9998218d46f2eb5276bc636a37b9afff3762650c081bcdd12ff4d6a28a50b01b781b6afa83abc9b2c1e36dee1d61d29f535b6
-EBUILD protobuf-3.6.1.ebuild 2476 BLAKE2B bef94c1f01371d56bb2f7dc0c95349b9a011f408b43694eb2129fe363d3de3ec07fc67d7acfe3770edc2b99ae11f75672afeae392ad8cc38f23a503a0f242ef6 SHA512 3c11db3b60189a0d09c91fd61566e521f124048037e28af02789ef87094137f7aea3fe0d47b42b87f6f41dd0fdb0ff33980e24937e3b0697cbc8b609a8a08f34
-MISC metadata.xml 534 BLAKE2B b5ffe91fcd25e8285f33e178fdf39f6c5e2e477e5db4bf80ffb144dc8e2c982a586329eb27239ea2867efdbc771ecde26197aa12c67441ede2bf08e1d8e78f0c SHA512 f9b4a37461edbf530940c86f2b0a3838fad80395f1c5e4738b40519fec2df24867e005cf55884f126d2a3a1dfc894cfd1a26fa085268da2dc4b0e562390ebb3e
+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
+MISC metadata.xml 543 BLAKE2B 43724e6d32707c62de4e1daffe50ba943c66286f6fe2357ec7171dad9feb7407049c26da517442957d61c11229617bd639d60bf070e7eedab8c871956cb3577a SHA512 f5a65ed219ff9f36c9d7bfdfe3bfe080ce0920e72f31f69820cc16822a04cdb38ec3c5d6b776b3c6cfde0bfc74c474558d048b706ac89e9405376e88504b8983
diff --git a/dev-libs/protobuf/files/protobuf-3.4.0-protoc_input_output_files.patch b/dev-libs/protobuf/files/protobuf-3.4.0-protoc_input_output_files.patch
index a7d338e99289..75c4dc28ee4a 100644
--- a/dev-libs/protobuf/files/protobuf-3.4.0-protoc_input_output_files.patch
+++ b/dev-libs/protobuf/files/protobuf-3.4.0-protoc_input_output_files.patch
@@ -1,4 +1,4 @@
-https://github.com/google/protobuf/pull/235
+https://github.com/protocolbuffers/protobuf/pull/235
 
 --- /src/google/protobuf/compiler/command_line_interface.cc
 +++ /src/google/protobuf/compiler/command_line_interface.cc
diff --git a/dev-libs/protobuf/files/protobuf-3.5.0-atomic_operations.patch b/dev-libs/protobuf/files/protobuf-3.5.0-atomic_operations.patch
index 7a88e8379500..9582431d41f6 100644
--- a/dev-libs/protobuf/files/protobuf-3.5.0-atomic_operations.patch
+++ b/dev-libs/protobuf/files/protobuf-3.5.0-atomic_operations.patch
@@ -1,6 +1,6 @@
-https://github.com/google/protobuf/issues/3937
-https://github.com/google/protobuf/pull/3955
-https://github.com/google/protobuf/commit/642e1ac635f2563b4a14c255374f02645ae85dac
+https://github.com/protocolbuffers/protobuf/issues/3937
+https://github.com/protocolbuffers/protobuf/pull/3955
+https://github.com/protocolbuffers/protobuf/commit/642e1ac635f2563b4a14c255374f02645ae85dac
 
 --- /src/google/protobuf/stubs/atomicops_internals_generic_gcc.h
 +++ /src/google/protobuf/stubs/atomicops_internals_generic_gcc.h
diff --git a/dev-libs/protobuf/files/protobuf-3.6.0-protoc_input_output_files.patch b/dev-libs/protobuf/files/protobuf-3.6.0-protoc_input_output_files.patch
index f515b6cd1a47..8b583522f464 100644
--- a/dev-libs/protobuf/files/protobuf-3.6.0-protoc_input_output_files.patch
+++ b/dev-libs/protobuf/files/protobuf-3.6.0-protoc_input_output_files.patch
@@ -1,4 +1,4 @@
-https://github.com/google/protobuf/pull/235
+https://github.com/protocolbuffers/protobuf/pull/235
 
 --- /src/google/protobuf/compiler/command_line_interface.cc
 +++ /src/google/protobuf/compiler/command_line_interface.cc
diff --git a/dev-libs/protobuf/metadata.xml b/dev-libs/protobuf/metadata.xml
index 6aeca898035f..f37667040e4f 100644
--- a/dev-libs/protobuf/metadata.xml
+++ b/dev-libs/protobuf/metadata.xml
@@ -13,6 +13,6 @@
 		<subslots>Soname version number</subslots>
 	</slots>
 	<upstream>
-		<remote-id type="github">google/protobuf</remote-id>
+		<remote-id type="github">protocolbuffers/protobuf</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/protobuf/protobuf-3.4.1.ebuild b/dev-libs/protobuf/protobuf-3.4.1.ebuild
deleted file mode 100644
index 861514638202..000000000000
--- a/dev-libs/protobuf/protobuf-3.4.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
-
-DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/14"
-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 )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.4.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.4.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.4.0-protoc_input_output_files.patch"
-)
-
-DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
-
-src_prepare() {
-	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_with zlib)
-	)
-
-	if tc-is-cross-compiler; then
-		# The build system wants `protoc` when building, so we need a copy that
-		# runs on the host. This is more hermetic than relying on the version
-		# installed in the host being the exact same version.
-		mkdir -p "${WORKDIR}/build" || die
-		pushd "${WORKDIR}/build" > /dev/null || die
-		ECONF_SOURCE="${S}" econf_build "${myeconfargs[@]}"
-		myeconfargs+=(--with-protoc="${PWD}"/src/protoc)
-		popd > /dev/null || die
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-
-	if use emacs; then
-		elisp-compile editors/protobuf-mode.el
-	fi
-}
-
-multilib_src_compile() {
-	if tc-is-cross-compiler; then
-		emake -C "${WORKDIR}/build/src" protoc
-	fi
-
-	default
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	insinto /usr/share/vim/vimfiles/syntax
-	doins editors/proto.vim
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/proto.vim"
-
-	if use emacs; then
-		elisp-install ${PN} editors/protobuf-mode.el*
-		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
-	fi
-
-	if use examples; then
-		DOCS+=(examples)
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-libs/protobuf/protobuf-3.5.1.1.ebuild b/dev-libs/protobuf/protobuf-3.5.1.1.ebuild
index ea6e36624008..b64b56a4da19 100644
--- a/dev-libs/protobuf/protobuf-3.5.1.1.ebuild
+++ b/dev-libs/protobuf/protobuf-3.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"
@@ -6,8 +6,8 @@ EAPI="6"
 inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
 
 DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/15"
diff --git a/dev-libs/protobuf/protobuf-3.5.2.ebuild b/dev-libs/protobuf/protobuf-3.5.2.ebuild
index 1f060c91027f..eb1466f8f448 100644
--- a/dev-libs/protobuf/protobuf-3.5.2.ebuild
+++ b/dev-libs/protobuf/protobuf-3.5.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"
@@ -6,8 +6,8 @@ EAPI="6"
 inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
 
 DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/15"
diff --git a/dev-libs/protobuf/protobuf-3.6.0.1.ebuild b/dev-libs/protobuf/protobuf-3.6.0.1.ebuild
index 463b4135d83e..fc490f98194c 100644
--- a/dev-libs/protobuf/protobuf-3.6.0.1.ebuild
+++ b/dev-libs/protobuf/protobuf-3.6.0.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,8 +6,8 @@ EAPI="6"
 inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
 
 DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/16"
diff --git a/dev-libs/protobuf/protobuf-3.6.1.ebuild b/dev-libs/protobuf/protobuf-3.6.1.ebuild
index 05027c009a55..3b3bdeaf3517 100644
--- a/dev-libs/protobuf/protobuf-3.6.1.ebuild
+++ b/dev-libs/protobuf/protobuf-3.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"
@@ -6,8 +6,8 @@ EAPI="6"
 inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
 
 DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/17"
diff --git a/dev-libs/qtkeychain/Manifest b/dev-libs/qtkeychain/Manifest
index a9325551c51a..4ac334fab553 100644
--- a/dev-libs/qtkeychain/Manifest
+++ b/dev-libs/qtkeychain/Manifest
@@ -1,5 +1,5 @@
 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 903 BLAKE2B 9a24be53e7ae0c5280efebb82d307f967750cbeb0b2aade9705a70efc6076917168e11b33931d5164916739fa6eaef2d9d889fbfc5daa31cdc461afaa8fd90a4 SHA512 978d622d0ddf54d58a24cb6a2cb36404cae848558cf236d033e781bac9185b5b51cc260706e971ea70bfd277940e7a394f027949ce8bfea7846d69b8aa1e8b69
+EBUILD qtkeychain-0.9.0.ebuild 899 BLAKE2B b3eb1cd027c97c362d6555ea1d6ffd8e8d6b1a3f44bb1dce7d2caaa89a593ff84f806aea78a7bfbef3732f72ba1a52b7b038bf8ca6baafa79294331d6fda4723 SHA512 16a16f1e8f8a1a1bf59643ec18f1c8c179987ed6075abdbb127cb3cd1503b4c5a61d2e2bbdc3a5c9a5606e1d343a27111d90e7bc226f20a83ca65d626a94f751
 MISC metadata.xml 335 BLAKE2B 676879e385fb11722b2c2d90478178b06223e401992e5c55b88081e513fc11904e4766f4525eba3349a0e9f2fdc81b08cbeb2d973f9b77cf70e9985afd63e40a SHA512 72e060f41c90aa2a177af6c32b35109f0489fd277f5864cae4f6be7e2577f0920ba75f811081b058a210d54415dfc7e8aed35ca233748e35dcd1233b59d47342
diff --git a/dev-libs/qtkeychain/qtkeychain-0.9.0.ebuild b/dev-libs/qtkeychain/qtkeychain-0.9.0.ebuild
index ac90679ec32a..955b422dd8ce 100644
--- a/dev-libs/qtkeychain/qtkeychain-0.9.0.ebuild
+++ b/dev-libs/qtkeychain/qtkeychain-0.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
@@ -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/rasqal/Manifest b/dev-libs/rasqal/Manifest
index 31c0c8eea201..88f9c0c05b59 100644
--- a/dev-libs/rasqal/Manifest
+++ b/dev-libs/rasqal/Manifest
@@ -1,5 +1,5 @@
-DIST rasqal-0.9.29.tar.gz 1550144 BLAKE2B 205fc4864a86447246d43b52c2defa00b17628c2a6f459dc40b0fa79b42cd306405f31f600d5ad535891d2f79c46970d77f559249d6a22578d9b83e28d2fb46c SHA512 9795e2ffd439157af7d386ef7191fed3c960e88f04e46ec80bf845986841b9fb094219c561144cbe9ada5582264b32eec4850cf8f2258661d09f2df9dbffda4d
 DIST rasqal-0.9.32.tar.gz 1544623 BLAKE2B c94833d2906fc211d743d63a52478e6acc9f26c7528beb1bea0ec8c365b5d13e6ac85e57b75b920d1ccb5768112d06cf615212c7bf248120671730c5095b3c88 SHA512 071f5ff30a1271bdd747cab7991a34c75f9c0132e81d7662acb13a2e380b98c325a9b2998f6a08a393251623680074a76f58f70bdd93b5c1416779aacc7be428
-EBUILD rasqal-0.9.29.ebuild 1867 BLAKE2B 9d1eb0fd9ad725ee2af187407b6d7e0157bfa84b72fdf84f67f2f2d0c2f208c0800bd1e103c2c5421ee2e862c3c193096237f7e0d9dfb6ac46e43c4783fb1869 SHA512 56ad947cb4af7c7676a14ddeaceefdf2fd96c60e27d66e42c604d7fbf6303faf96c1d934c6a44da3cc3668e77c9bfbbbf13b07972ad7e028363c23855543c2a9
-EBUILD rasqal-0.9.32.ebuild 1925 BLAKE2B 3549cf20fc56e92ca7adef2cfe92b4e5bf402fb62e44f6305477364893cb4080d85cf2f41d3df6ffd5bc4cd5872a76e1b27871ca6cd5c6f32dc0193c161252c8 SHA512 d2f02414c7290705d43cbfe2f2d77a4adf531600bcf5a113eccf1dc83e49046554a852fda2a9cbffcd0347643a101d3ba03f7b97c131ba05b8f9470d7904aa31
+DIST rasqal-0.9.33.tar.gz 1595647 BLAKE2B 87bca86b2f0dceb0801f5a34dae9ae1f87d8a7d0dc1e03fdf04998a0d4885ed76be2719d3e01489a5510a26715bb093a75ce194cc42f3cedff88f64161d6a2fb SHA512 05728682797470db9e51d156012e8fde9dec1554d107372faa11cbe6cdc3356e92386f4f8de6d7c41e3100b76f9b1c6809102a913829cddbd2ff29043c04d522
+EBUILD rasqal-0.9.32.ebuild 1923 BLAKE2B da3d291be1ec4e166366babaf6f674e0625f636dd387eb54ce3a7be8aba2b7434425b03aacaaa1ade21a45ce3c03a6d45ab91573ccb931bd08d9d59ce7f3e86f SHA512 f8d876154ce4b8847c067776d2fd8d48cae9eac11fceb14d9a15994ebb3e461f9a0226e55388387692f13493098fd670ba5c2f3cd87585056aecf696cb743948
+EBUILD rasqal-0.9.33.ebuild 1697 BLAKE2B b4aad4ea467364c724c5b902db89e81b3fbe25d5673c33f5bb5d493f3e6f8ed3a9ad9c782825a5df24cba0568c10a0d9a5b73eb582d8232a70b252456175931d SHA512 32d3ccc61649161ca647e76736fcb02819124d5c325f2ce45ac113d56d159b7cffd916194a6ccf3c96581cca1082d335d1e7c5df1c923ad92ffb1395e21e1ade
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/rasqal/rasqal-0.9.29.ebuild b/dev-libs/rasqal/rasqal-0.9.29.ebuild
deleted file mode 100644
index 5851683b32c7..000000000000
--- a/dev-libs/rasqal/rasqal-0.9.29.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit libtool
-
-DESCRIPTION="library that handles Resource Description Framework (RDF)"
-HOMEPAGE="http://librdf.org/rasqal/"
-SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="+crypt doc gmp kernel_linux +mhash pcre static-libs test xml"
-
-RDEPEND=">=media-libs/raptor-2.0.7:2
-	kernel_linux? ( >=sys-apps/util-linux-2.19 )
-	pcre? ( dev-libs/libpcre )
-	xml? ( dev-libs/libxml2 )
-	!gmp? ( dev-libs/mpfr )
-	gmp? ( dev-libs/gmp )
-	crypt? (
-		!mhash? ( dev-libs/libgcrypt:0 )
-		mhash? ( app-crypt/mhash )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/flex
-	test? ( dev-perl/XML-DOM )"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_prepare() {
-	sed -i -e '/random_approach/s:==:=:' configure || die #416659
-	elibtoolize # g/fbsd .so versioning
-}
-
-src_configure() {
-	# FIXME: From 0.9.27 to .28 --with-random-approach= was introduced, do we
-	# need a logic for it? Perhaps for dev-libs/gmp?
-
-	local regex=posix
-	local decimal=mpfr
-	local digest=internal
-	local uuid=internal
-
-	use pcre && regex=pcre
-	use gmp && decimal=gmp
-	use kernel_linux && uuid=libuuid
-
-	if use crypt; then
-		digest=gcrypt
-		use mhash && digest=mhash
-	fi
-
-	econf \
-		$(use_enable pcre) \
-		$(use_enable static-libs static) \
-		$(use_enable xml xml2) \
-		--with-regex-library=${regex} \
-		--with-digest-library=${digest} \
-		--with-uuid-library=${uuid} \
-		--with-decimal=${decimal} \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	default
-	dohtml {NEWS,README,RELEASE}.html
-	use doc || rm -rf "${ED}"/usr/share/doc/${PF}/html/rasqal
-	find "${ED}" -name '*.la' -exec rm -f '{}' +
-}
diff --git a/dev-libs/rasqal/rasqal-0.9.32.ebuild b/dev-libs/rasqal/rasqal-0.9.32.ebuild
index bd7ad7318390..2400b22d3e4d 100644
--- a/dev-libs/rasqal/rasqal-0.9.32.ebuild
+++ b/dev-libs/rasqal/rasqal-0.9.32.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 @@ SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="+crypt gmp kernel_linux +mhash pcre static-libs test xml"
 
 RDEPEND=">=media-libs/raptor-2.0.14
diff --git a/dev-libs/rasqal/rasqal-0.9.33.ebuild b/dev-libs/rasqal/rasqal-0.9.33.ebuild
new file mode 100644
index 000000000000..df3e0ecc3f50
--- /dev/null
+++ b/dev-libs/rasqal/rasqal-0.9.33.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool
+
+DESCRIPTION="Library that handles Resource Description Framework (RDF)"
+HOMEPAGE="http://librdf.org/rasqal/"
+SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="+crypt gmp kernel_linux +mhash pcre static-libs test xml"
+
+RDEPEND="
+	>=media-libs/raptor-2.0.15
+	crypt? (
+		!mhash? ( dev-libs/libgcrypt:0 )
+		mhash? ( app-crypt/mhash )
+	)
+	!gmp? ( dev-libs/mpfr:= )
+	gmp? ( dev-libs/gmp:= )
+	kernel_linux? ( >=sys-apps/util-linux-2.19 )
+	pcre? ( dev-libs/libpcre )
+	xml? ( dev-libs/libxml2 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=sys-devel/bison-3
+	>=sys-devel/flex-2.5.36
+	virtual/pkgconfig
+	test? ( dev-perl/XML-DOM )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+HTML_DOCS=( {NEWS,README,RELEASE}.html )
+
+src_prepare() {
+	default
+	elibtoolize # g/fbsd .so versioning
+}
+
+src_configure() {
+	# FIXME: From 0.9.27 to .28 --with-random-approach= was introduced, do we
+	# need a logic for it? Perhaps for dev-libs/gmp?
+	local myeconfargs=(
+		--with-decimal=$(usex gmp gmp mpfr)
+		--with-uuid-library=$(usex kernel_linux libuuid internal)
+		$(use_enable pcre)
+		--with-regex-library=$(usex pcre pcre posix)
+		$(use_enable static-libs static)
+		$(use_enable xml xml2)
+	)
+
+	if use crypt; then
+		myeconfargs+=( $(usex mhash mhash gcrypt) )
+	else
+		myeconfargs+=( --with-digest-library=internal )
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index 4e25d8ff89e2..9f806dbf005a 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -3,8 +3,10 @@ DIST re2-2016-05-01.tar.gz 399509 BLAKE2B ec7676da99493bb2be56bd661f8f3bd57b123b
 DIST re2-2016-11-01.tar.gz 379816 BLAKE2B 251c45684fa4f3f85e0138c6f788f7a35fbc2ad8766f6a9bc0daf7305ac2140a1102602cf8843242f7a311ec09bf4fe516b605e39e8c857aa2f475783085c231 SHA512 1be7d2551737cb9dc1031dac9335f82dfb58f3612bdb745bf6c5121334bf8689bb0564b751c23e4c002478cc46cc237ce4da294090adb983b0c1db25a9fac0a7
 DIST re2-2017-03-01.tar.gz 382241 BLAKE2B 0a034267f435386b1bfc1680c98aabf4d18dac40cbce3c5a5705cb6a383d54f81b90e22fdd0f16220434eca2eb1c6a5d28ae7e903cdca2397bbc6c10c11ac703 SHA512 566a3ff6598fc9b26dcabe175efa48becd38459185d6bb86b3abb1856a3e7b0f9b5e302594b1ac4817dcb5968920df43d23279a6cff2a74b6b0c174dc9379f88
 DIST re2-2018-04-01.tar.gz 389724 BLAKE2B 629d5cf82a465dfd2d50a3761f0b6504dba6309e5a2605a6f1fde20cae7e7cbb7bef6703abc12161891cb14e7308db3d18b25e575d3ffd8bbdd5cfba6f067983 SHA512 862d9bcb574ea986b1497d6c079104a0cf27b418a6ec8c24047f0d43ede2c8f7f0bdc6a3ccddaeb746f0d821e3e7fd701f438d7fed101db969785c4b344e0462
+DIST re2-2018-10-01.tar.gz 391254 BLAKE2B 297b9abef94fb3ad95e35bb7ff642a5d47b5bc20b1bc3544c76f8a91ec5b9812a1fad1cd5c6a7d4b7c24baaf15302602e8d1b483bdfc6d1246bf268620a9440e SHA512 91e400856137d16c6319e310dab99b4baa74c0bcf634c97464fccdf4092ffc8e1d5ee2a6714b8114719e2dd92e962d5e970ce1b360a3644a8b395d8fb47431be
 EBUILD re2-0.2016.05.01.ebuild 1202 BLAKE2B 0594d59305793044b9fed2d0570a6c68c5384e0a1f38481fcbdcdf4cb3073484dc660a22f7adfdc977bf1a200cb24f27120b94e87f4319178e196b57ccb59fda SHA512 1bc1f823a2927bb76e2793933d6048ddb93f829464ba8d9d9c0850dc08889026c8e27250e5922b5aa7bdcfe74d7bd0a4be1f59433065141dd7cfaacc6c6c25ac
 EBUILD re2-0.2016.11.01-r1.ebuild 1305 BLAKE2B 8bc950fb1337eeb4f811b3a3a7435b28dce8ec9dad238095a2b19457eced7585ddf64e32844e7970e50b87f3fb913f5dcc9d7529094055e4e1a299ed75950c75 SHA512 a5ef7207e94fc73bcbc4fdd809fa3ed580c9ec0880e073124986a4bdbca7e726be0c122fe7b6f384db8a0ca654645c9fadfb16e3f035e78a1c74e6bca80850c9
 EBUILD re2-0.2017.03.01.ebuild 1305 BLAKE2B 8de6b4e1d07af2677a77755753ff474d818373c0be13008c326972de4cb02b949eb923b1c0353dc0130753d563f6deef1fc54104d32bbcc2c16f676c3afa27ad SHA512 bda266f9e96eec73858ad9c7e0f91f327c216e3d6044bd07abf58dfdf822313e6e7f7b9129b852e0b1ca4ae2bc8ad9c4a38e89e200bac433efd180fc2e7abf60
 EBUILD re2-0.2018.04.01.ebuild 1306 BLAKE2B dcfd4db7dfd17f0ffbab32c96f605ff815933859635e6296570a5783d03b02b221f560ccce8582e2635614f29c379f34e2b375480c06e0d14fe114aa43a15d2b SHA512 c4af6a5638e487c3ce981649ef8ccb30dbf4cf59cd21f06dfef2af8ac0bfa69eb13d11bb9b64b9d575adf15d84fd57163a37dc439abb15086924aad6b54a821d
+EBUILD re2-0.2018.10.01.ebuild 1312 BLAKE2B b900d7db4b5d2e8389fe9b4368d1e59b8161577bb63f14ff4be0c93ddbeba5a80b80d2802191985eac10fbe003d8193039ed8b28acee55ff8243fede1e477a8c SHA512 0f094160180d99097666322e7d68c6ce06f00392f9e53844926593a00e11a9a2484fa5a7486d8dfae27c49b8d00e1ce8c380f466f8a77a9823ebaa6b5842fb94
 MISC metadata.xml 337 BLAKE2B a584c0de18fba97bedbfc3589eb7e35d2f9f794946f8161c50e807e6ed8dc90631b9aecf3f20b6e04bc27b4b5f92e9044221a50a92f8ed61052794392a0f68e8 SHA512 5dbef91cae8363700badc73e352829c4e4e8265bdb96104136c3759d1731148b7260840b4319116ceac00aa9ba17de6eafa2cf9684878b7e9f032469b6f2fec0
diff --git a/dev-libs/re2/re2-0.2018.10.01.ebuild b/dev-libs/re2/re2-0.2018.10.01.ebuild
new file mode 100644
index 000000000000..641a25172807
--- /dev/null
+++ b/dev-libs/re2/re2-0.2018.10.01.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs
+
+# Different date format used upstream.
+RE2_VER=${PV#0.}
+RE2_VER=${RE2_VER//./-}
+
+DESCRIPTION="An efficient, principled regular expression library"
+HOMEPAGE="https://github.com/google/re2"
+SRC_URI="https://github.com/google/re2/archive/${RE2_VER}.tar.gz -> re2-${RE2_VER}.tar.gz"
+
+LICENSE="BSD"
+# NOTE: Always run libre2 through abi-compliance-checker!
+# https://abi-laboratory.pro/tracker/timeline/re2/
+SONAME="gentoo-2017-03-01"
+SLOT="0/${SONAME}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="icu"
+
+RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="icu? ( virtual/pkgconfig )"
+
+S="${WORKDIR}/re2-${RE2_VER}"
+
+DOCS=( AUTHORS CONTRIBUTORS README doc/syntax.txt )
+HTML_DOCS=( doc/syntax.html )
+
+src_prepare() {
+	default
+	grep -qv '^SONAME=0$' Makefile || die "Check SONAME in Makefile"
+	if use icu; then
+		sed -i -e 's:^# \(\(CC\|LD\)ICU=.*\):\1:' Makefile || die
+	fi
+	multilib_copy_sources
+}
+
+src_configure() {
+	tc-export AR CXX NM
+}
+
+multilib_src_compile() {
+	emake SONAME="${SONAME}"
+}
+
+multilib_src_install() {
+	emake SONAME="${SONAME}" DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="\$(exec_prefix)/$(get_libdir)" install
+}
diff --git a/dev-libs/redland/Manifest b/dev-libs/redland/Manifest
index f47146ddaa76..cf6b5744ee28 100644
--- a/dev-libs/redland/Manifest
+++ b/dev-libs/redland/Manifest
@@ -1,8 +1,8 @@
 DIST redland-1.0.15.tar.gz 1600090 BLAKE2B e655860230459afafaad549d0403c0c439a744bc8f8168e8abf498d52988f716d1b719be25d8ef034008fda8194bcaaa4c0c46230d2bff84b6a046ff150b464b SHA512 94b8806d0c5b8ff5c394bc6825c1347efe609a2d7a72f9346fc88b15094938e69b482d28ca8a4eea64876a6afdf6c3b60275c987a617cc498cf19d6fbc53950b
 DIST redland-1.0.16.tar.gz 1624112 BLAKE2B cee6c1b4ca07e2758be57b63a47a2d1b63e0db46ff26aad3a2779b7f64fe2bb147dbcd924142eb46614f249bce78f3b760f2dfc4b0de8f9c956f5696c5df6045 SHA512 16a57569d00f8bbfda9e90d93d686e6f51b14f066f013c9757f2b372d7b23c58fe0ba172953f8affe73c8d804e966566dc38401caca46cee2a8b091019828457
 DIST redland-1.0.17.tar.gz 1621566 BLAKE2B ec94cd456a771b97ab16fab63cf6beffe1ce3371c06213faa49162fe452b31a21dffe6c2cc631c10b137f44dc71c2c40c1d7fac0552bbe0169728427b1f47a36 SHA512 363323ffc9e75d4f0e3a3b40952f6241fd0d8b9f46bfd4dd86cf0a5162de35257a8b70ce408a6083c03ba7c388982231a3774e5e9024b262ebb02968f778b850
-EBUILD redland-1.0.15.ebuild 2037 BLAKE2B 76bbc94678e60052acf6f4dcf4204718573c8cc9e2023376ca53cfd0c31ebfdab9b438a18407e9a04f2e25c69f7155ebcb107d3a3f33bb0b420dcdb1a3ba37e2 SHA512 5db077e60139ade14d05b94469c9acf58a564faa49f9834947cac0f2a5cca38aea509fe3ebd5bb3fff92eb0b0a755be7b571ee0a47d20244a643949876c41e18
-EBUILD redland-1.0.16.ebuild 2383 BLAKE2B e1ffdb4435548b5cd9fe6f9fcb5dee7ef2c1d921bc8a01e9d1ebd4d9543f3fd6e8a3c8099e19e002fb7a5f26441f75beb982a137ffd03b873cab383b023a787e SHA512 95faf59e5b1dd7b606c4efedb1b9d067e4f631c5878cbf42db47f1ea1a63d7d2f7b1ebfb7685a33df2ca3c1570f8ddf3932c6595d3cf767f8cca21bd785195d7
-EBUILD redland-1.0.17-r1.ebuild 2468 BLAKE2B 7a008bff1be211de3623e3fce8ac203678192923c8fa6ebd294467a3e8d45e0ee5c7575cbf92470f7d1aa8e1ef712f4266f3086a29ad3d7f326d643282486001 SHA512 fe74a9d2447205ede8ddb98b0f6efc27c14030a7c704b50a060d6235ce490afb76a3eddfdc5d4f04d653da320777f1e6aa1c0ddae594b241542bc3c20540b9fb
+EBUILD redland-1.0.15.ebuild 2035 BLAKE2B 32b6c160e8e0a060e710e214494c5a0302121c6ebd09eb361b9a771d2c6e1747bf334ab50260bd1a5575240a4bbf94d9fd84b091769240f4d7836672e0b4a6d2 SHA512 15d93fbeced1dcd4b97df929afc06ed1603ac84891e9c71d8dc919364f11b670827abb9ad6e642ff5cd73cde9f35d85abce7ecd67b44d96b1c321cb176e052d6
+EBUILD redland-1.0.16.ebuild 2381 BLAKE2B ff6c344a517ebe2715fea5d02fc80171021b9980b6acc0a8a52022e9fb23b59555ee7d0465d3f715f62450c5f36f70b14e3e452cbafb0e67201fa2c319bcc066 SHA512 fe1b176d738e8875379e32e03f540c389c89d45937b86a850f25f2450b8f5dd0318efe828357bb1352a0f3e81289f672808ebb34be8a5863d868ebcf1b28cb86
+EBUILD redland-1.0.17-r1.ebuild 2465 BLAKE2B 9e51a587e8a261690b6618a3582b13348024f662878ed78af00eb1a853e82350e85ffb6833055e09fec1bfbe57a0d0cd2d062635a41d8cc3e56a845030d28620 SHA512 6dfccc33a0c499c6caa93392fa1d8fcf7ad43661f4da4f01dac6aa2eb9289c7bfbb815333467ebb2afa66ba1242c016f9d2e129af0e298f67d4b7b2bef23c71c
 EBUILD redland-1.0.17.ebuild 2468 BLAKE2B 1213656b2309c86f3e0a0122a6462c02183d8ea8e2b66c921b7cbefd16f27b2353ea510238b5c8171f83c1c4d63fe11a1cd37a5e6a8b18b142198cee1cd9f9db SHA512 157f178cdc5ab1af0a7bf5ed3b10017a01c3f4e11a9376b3d7414af02fb5b917943d310470acc7e816415c0fd34d3165d27f83093b7d6466174bc28aa65d6841
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/redland/redland-1.0.15.ebuild b/dev-libs/redland/redland-1.0.15.ebuild
index 931d328b87fe..a2881c810b0a 100644
--- a/dev-libs/redland/redland-1.0.15.ebuild
+++ b/dev-libs/redland/redland-1.0.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=4
@@ -10,7 +10,7 @@ SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="berkdb iodbc mysql odbc postgres sqlite ssl static-libs +xml"
 
 RDEPEND="dev-libs/libltdl:0
diff --git a/dev-libs/redland/redland-1.0.16.ebuild b/dev-libs/redland/redland-1.0.16.ebuild
index fd6b87809580..f83ab05da876 100644
--- a/dev-libs/redland/redland-1.0.16.ebuild
+++ b/dev-libs/redland/redland-1.0.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=4
@@ -10,7 +10,7 @@ SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="berkdb iodbc mysql odbc postgres sqlite static-libs +xml"
 
 RDEPEND="dev-libs/libltdl:0
diff --git a/dev-libs/redland/redland-1.0.17-r1.ebuild b/dev-libs/redland/redland-1.0.17-r1.ebuild
index efb79fe91023..5498592ffbf4 100644
--- a/dev-libs/redland/redland-1.0.17-r1.ebuild
+++ b/dev-libs/redland/redland-1.0.17-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="http://download.librdf.org/source/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="berkdb iodbc mysql odbc postgres sqlite static-libs"
 
 RDEPEND="dev-libs/libltdl:0
diff --git a/dev-libs/shhopt/Manifest b/dev-libs/shhopt/Manifest
index 52123e0afd42..2c908cdae689 100644
--- a/dev-libs/shhopt/Manifest
+++ b/dev-libs/shhopt/Manifest
@@ -1,4 +1,5 @@
-AUX shhopt-1.1.7-build.patch 1880 BLAKE2B c1cc6e625872107bfb1e0f8578267dca5b8bac87b41fbb01b5a881f4c7d389b53bac67deb86d47139e6ae3d257a4bff2335af507b1f7d5fd719c2088988bfecc SHA512 980b6796678213fd1538da374eba084a67c8a48e446083b86f280c00f355b0a45bc679431991156fd99b983a1d20b07f612389a129e1789a905b8e9967a42a37
+AUX shhopt-1.1.7-build.patch 1884 BLAKE2B 1854a892ddc14d7202efbb4ebf20778a10ae1c490a40b28157e313c711fb946a925f61a71cc2f3919f6f55718636d05486e79e89f730575528bc3b0d2894fa34 SHA512 79eca8ada571f2f514d540a4c52fdf9503764f67422173bff160ed3ca04b0578c0a88a147234ffaad7a5ba94ab7d265785277062b25438abb888c92fab99d4a8
 DIST shhopt-1.1.7.tar.gz 9923 BLAKE2B 4f9fb23a67c03caf6c56227729a681eac3ee9c78e16f56d6fedd2b1cdbe56471150d9e91ecf84945348078d03102aa7e7cc98b4cf11dda6f5da79d1edc48b96d SHA512 bd985d50e87808b5c6993496ba3e7c255d47895d90e108f03fd72bb273e786730898048af3b30ca29cb5dbd058f2ea178ca73b6362211c50aa0eb75f743b5ec8
 EBUILD shhopt-1.1.7-r2.ebuild 755 BLAKE2B b7dfa83327287fc7864412c98ad5371b02fbeb728638a0ce061a88a05479485e9983d9a4011fa0fad0449b65b55f2e47540906fd38f3a0c6a5764d60744b8eea SHA512 de5d809cc761dadc3cc74dd2b8abf83c8bc77dbdc689f172babfe47b4591beb9e8a87c97b0716f3b3fa2f704b7ec0e2c21321ac9f0168f615a57d65dee373e4d
+EBUILD shhopt-1.1.7-r3.ebuild 666 BLAKE2B 8f97412b4694bea2d26542ba2e819dd3d7756d75bc86e988ae70c9a96fb655193accd3ed8c2ad50196ffe582c5f85e6af6ea80c468d5b1afdf469c2c05e9a593 SHA512 4c6b28dc9d047d0ffd069ae01d75ef485c54fb640e7bbbba3bdf3d8826d50f9377603a3b2557a35e31cf1d830d02a1bc162c196de218b8941a48b59b66d1e91f
 MISC metadata.xml 341 BLAKE2B 738802ec66db2e5052eb57b90dd0076cca1afbdca62fa325f920f0ec6f4ff4b78f886402783ad6f97c7b10e4e2ec10bbaf1bf2bc8823bd48d048c35141a6cb77 SHA512 276ee6e17baeb1981c1c912b4f281d7eb71b171492d00d5ce522c3d6defbba4eef3dd87b43d4ec02eda21cfe148f2b0dcbe04d7dbd9a42918168844b563427f4
diff --git a/dev-libs/shhopt/files/shhopt-1.1.7-build.patch b/dev-libs/shhopt/files/shhopt-1.1.7-build.patch
index d1d5606faab6..3405511e2238 100644
--- a/dev-libs/shhopt/files/shhopt-1.1.7-build.patch
+++ b/dev-libs/shhopt/files/shhopt-1.1.7-build.patch
@@ -1,5 +1,5 @@
---- Makefile
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -5,20 +5,15 @@
  VERPAT		= 7
  VERSION		= $(VERMAJ).$(VERMIN).$(VERPAT)
diff --git a/dev-libs/shhopt/shhopt-1.1.7-r3.ebuild b/dev-libs/shhopt/shhopt-1.1.7-r3.ebuild
new file mode 100644
index 000000000000..83fb8b878ace
--- /dev/null
+++ b/dev-libs/shhopt/shhopt-1.1.7-r3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="library for parsing command line options"
+HOMEPAGE="http://shh.thathost.com/pub-unix/"
+SRC_URI="http://shh.thathost.com/pub-unix/files/${P}.tar.gz"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+PATCHES=( "${FILESDIR}"/${P}-build.patch )
+
+src_compile() {
+	emake CC=$(tc-getCC)
+}
+
+src_install() {
+	dolib.a libshhopt.a
+	ln -s libshhopt.so.${PV} libshhopt.so || die
+	ln -s libshhopt.so.${PV} libshhopt.so.${PV:0:1} || die
+	dolib.so libshhopt.so*
+	doheader shhopt.h
+	dodoc ChangeLog CREDITS README TODO
+}
diff --git a/dev-libs/skalibs/Manifest b/dev-libs/skalibs/Manifest
index f05f61b7fc44..ae18d1055bab 100644
--- a/dev-libs/skalibs/Manifest
+++ b/dev-libs/skalibs/Manifest
@@ -6,4 +6,4 @@ EBUILD skalibs-2.3.2.0.ebuild 1030 BLAKE2B 9a929766737a4e0a0f32fcdfe31d37d6bf1a0
 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
-MISC metadata.xml 340 BLAKE2B 8d5e67ea656a7177e109b8d3192b014fd87d673cd07b06a15169bfead655bcc560142cff85b996bbd192a7cd87208617021b7561a878e190b4a13eeb1e7f3769 SHA512 f68ae944fc47d4d472e90b676023d6ca7648f0b94c0f8ace048c8b6791e1d738a96474435846d779f05df51beff2e33bd09234fd8a3be0ce215824045dfa843d
+MISC metadata.xml 682 BLAKE2B e5d2f804eddae75e951e0d779f6c26b9055186976bb27ab8c4afc8fa160aee1a6c119d03c19b95d54e7af721a86aae99b9c78277adc03e59fa4f86c0a5e93263 SHA512 cc1e8bf973b516a44122fa19165cd6c08547837d38c909d0a8ac7116c87ad93bb1f25ca31e5358c63abf4b13673a285cce8fb783506b61659f998ce47dc4b656
diff --git a/dev-libs/skalibs/metadata.xml b/dev-libs/skalibs/metadata.xml
index fdf4b3253e89..b538bc1f73d4 100644
--- a/dev-libs/skalibs/metadata.xml
+++ b/dev-libs/skalibs/metadata.xml
@@ -1,12 +1,24 @@
 <?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>williamh@gentoo.org</email>
-<name>William Hubbs</name>
-</maintainer>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>aranea@aixah.de</email>
+		<name>Luis Ressel</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>samuel@sholland.org</email>
+		<name>Samuel Holland</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/totem-pl-parser/Manifest b/dev-libs/totem-pl-parser/Manifest
index 245605bfc773..5c21c8447326 100644
--- a/dev-libs/totem-pl-parser/Manifest
+++ b/dev-libs/totem-pl-parser/Manifest
@@ -1,4 +1,4 @@
 AUX totem-pl-parser-3.10.8-gmime-automagic.patch 3454 BLAKE2B fe16c0c78e73ebd735ff619074462d455087c7436d9dcba862771f0aa10df9400960733e1c829fa240af6bc43cea50957dbd5034e95c26bc5c076715b71b1cb7 SHA512 0cb2b632ec79711ced87a8b8df13011defeb2117a3242d28129f53bc3c845a18d929a2697edc99e08b69410d7933ab065a65257fce62c12a8bd72f19bb4d5d6d
 DIST totem-pl-parser-3.10.8.tar.xz 1618992 BLAKE2B ab7dc3010afb9a2112f19991ee74c43436962a66fa233162b2d2c6743e5727762102f6f0bfed2a30750c0d4e3cf0fbfdb7fdab8568b0cb827e49d0f99a938c41 SHA512 1692fe6d183838bdfb9125ae2bf9fbf74762333a7ebb6becc755bfdbfb8d2ea1ae257f42aab7b7a1ab419aee2b35902176a731f26736a62015806d1423adae70
-EBUILD totem-pl-parser-3.10.8.ebuild 2062 BLAKE2B ad735481c3102babafcb066ee850f17a063f1f0df8db15bf400a43b32c6d5551a6f9cec8e3c63025ca6a220800928cef151d314fe5df8271d3a393c78061d523 SHA512 3c302b3e5593cfb305dcf5e6a405cb1d14c81d0ebb063ab0ec05758a0e013ddf334bb3e29aeebcf87f721fb376a175368802446e7ec64eb7a45020b02d0d72a8
+EBUILD totem-pl-parser-3.10.8.ebuild 2080 BLAKE2B 8234199f84709abb2cc9140fc61065c05bdff5ada8dd1d36e76b7558715850a9079eb35de0742807ffc06f3c394f3096054ce3c6720f4859cc6e306b4a4efbe5 SHA512 e377bc056735214d3859ee50a06f61c815e1add95b1fb6265c895c7fcdc908a0790080e5db1a73e861fa416375b3f98eb1127d6156ba28eaf2a0bc70a950bfab
 MISC metadata.xml 482 BLAKE2B 38550c9c390117026b4c51a779fe05f9d023877b0d071f02a320ba624fc36046763c569d3e735cd4e5b46ad941f3882e7257055b68fafd909d3c5fe1706f4f3e SHA512 40da37106a328a46dea049d602980112ef3b9b0fd644b05d5375f1e7f7748373478a8cb779bafd7607f38a1c989e65fba5cdfaba55dd2c4dc2f5bb748e4f9d77
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-3.10.8.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-3.10.8.ebuild
index bba9b046d3f1..3ae67778266c 100644
--- a/dev-libs/totem-pl-parser/totem-pl-parser-3.10.8.ebuild
+++ b/dev-libs/totem-pl-parser/totem-pl-parser-3.10.8.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,6 +26,7 @@ DEPEND="${RDEPEND}
 	!<media-video/totem-2.21
 	dev-libs/gobject-introspection-common
 	>=dev-util/intltool-0.35
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.14
 	sys-devel/autoconf-archive
 	>=sys-devel/gettext-0.17
diff --git a/dev-libs/xxhash/Manifest b/dev-libs/xxhash/Manifest
index f547d154c52d..c02b2477e64d 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 839 BLAKE2B 1d7fe6c29fa6a167988991bc32da737c668c7a4f9b3a355e4ee205a651be3994664ba49eee96c9da7df9b4611f54865dc583c596bd18f1e219f21285a218b4cb SHA512 b4e0674a2324f013ce0bf5665d7e8937a84a540a038f288763af6370a1891641aab318b26289d7b18a2e9e7bfa00f4e45101b27305af28decb339b995228ad09
+EBUILD xxhash-0.6.5.ebuild 834 BLAKE2B 1afc6f4abd178d88f9153357189adc568606438d44e31909e7e404a1927ca99d0066d71c331cbf4432702e99e8544ebb10d0d5bbf8625a36f6cfe8cc9a7a9662 SHA512 07a2ff9cbc7cd709e9b8288dfef2f17a8f96d5a4fc8845706d9d1a54afa496b173bbf8c5d1733c5f3b2eca5dfd5859b89a56b657cc995fdfbe61adda382e9666
 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 fac71089f077..31959e459926 100644
--- a/dev-libs/xxhash/xxhash-0.6.5.ebuild
+++ b/dev-libs/xxhash/xxhash-0.6.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 @@ 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="amd64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x64-macos"
 IUSE="static-libs"
 
 S="${WORKDIR}/xxHash-${PV}"
diff --git a/dev-libs/yajl/Manifest b/dev-libs/yajl/Manifest
index 5966bf0eff0c..fefca037d787 100644
--- a/dev-libs/yajl/Manifest
+++ b/dev-libs/yajl/Manifest
@@ -1,5 +1,4 @@
 AUX yajl-2.1.0-uclibc.patch 487 BLAKE2B 873f1c4d4c53ff155814d960301f0932267ce277bfe772593853234c446ef949a7bd424c7db8f97c9dbc14428b03210b1c740a51b5379dbcebefbb311144a826 SHA512 7d81f13329da5fa81c31b07763b50153197760c93ceaf14d3b87232a377fb0871dc522f73a7d556131d1272496d7e8082eaef8ec968b8004e2d2c5e74987167d
 DIST yajl-2.1.0.tar.gz 84039 BLAKE2B 53cfa60994a478050ef1ab35ecfe60cc51f166bc101ee81f42122b134cc30afd1277c3c2661f5c03dc8c8117fcfdaab8ec7c6d735a6810ea4700f1afaea60e1a SHA512 671c06081e01584d170b614dc0685f49c6d7448b673d8ed99749ce4e0ca73875af9f62df7787b919ceaecab213668ac1d2a5800b6831731ec146353552f36985
-EBUILD yajl-2.1.0-r1.ebuild 934 BLAKE2B 4d26864c70bc35e811fdcc99ceb497763af0b1d124dd33926e637e2fb598a47c29a72cc3acd4c575db6053c0b1a4797660b01c9cbdc0d5beba72f17c5db98390 SHA512 8d688fd2f7913c050a5a85614b1a43fbbea97e4de89906ad9ee55fe536499f3105a6d5123e653cb8556ae7b54c04df492c5c916609aeecb897c776d4119db1cb
-EBUILD yajl-2.1.0.ebuild 894 BLAKE2B b264eef4b077162606be918a7a2af354c7a6ed46b39bf4307649703727b8de7b222d231fd34e9d7c1a234021069c13de5840a18b5b534950da694f1276677411 SHA512 74b0cc65f70342aa512fb7da7322bc06f6e6acd635427d836c383dd42eee55f61af85968d0a624fe72c18aa9e5b19f6f42d49049717e45bc09be06a5b55cfe8a
+EBUILD yajl-2.1.0-r1.ebuild 930 BLAKE2B 0a7882f77bf56732226ac8187954c2733a33c1438d39e76d1d26c7c9b3e713bcb6706190350f3b8409e8c53957c42556c2888b6687f0f99e0aca30fc567b98fa SHA512 5f6462f1b1a53e558f25c1e91d3e0b6dd624d33f5a83f01742212f6ceae3a6940ba74f84b5857be1f5480ec152141aaeda6cbef5152b5d3b353e774725d09b8d
 MISC metadata.xml 446 BLAKE2B 84c4b6dc7569e85ba3925a34c96c67c8f7d23a5d8861a296ba4fde89122645cd6e49d0ec8749cb6028d10d9b945735ed732ea4473c98393d8b83874eba9c06ec SHA512 6cbb37575c23168f216682c7f2decadcb18a11d9c0af71e6de531b1002541d913fa84f98ed78f13ad1c995c332b87d61c658ac0f3fbbef39e01fe2786e1da6f9
diff --git a/dev-libs/yajl/yajl-2.1.0-r1.ebuild b/dev-libs/yajl/yajl-2.1.0-r1.ebuild
index d809c1acf2d2..a07a6e1bf4b7 100644
--- a/dev-libs/yajl/yajl-2.1.0-r1.ebuild
+++ b/dev-libs/yajl/yajl-2.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lloyd/yajl/tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/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="static-libs"
 
 PATCHES=( "${FILESDIR}"/${P}-uclibc.patch )
diff --git a/dev-libs/yajl/yajl-2.1.0.ebuild b/dev-libs/yajl/yajl-2.1.0.ebuild
deleted file mode 100644
index 0b1c354fe507..000000000000
--- a/dev-libs/yajl/yajl-2.1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils cmake-multilib vcs-snapshot
-
-DESCRIPTION="Small event-driven (SAX-style) JSON parser"
-HOMEPAGE="https://lloyd.github.com/yajl/"
-SRC_URI="https://github.com/lloyd/yajl/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/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"
-IUSE="static-libs"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	multilib_copy_sources
-}
-
-src_test() {
-	run_test() {
-		cd "${BUILD_DIR}"/test/parsing
-		./run_tests.sh ./yajl_test || die
-	}
-	multilib_parallel_foreach_abi run_test
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	use static-libs || \
-		find "${D}" -name libyajl_s.a -delete
-}
diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz
index f2ac42204c87..d8572e1d1b51 100644
--- a/dev-lisp/Manifest.gz
+++ b/dev-lisp/Manifest.gz
diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
index ddf26c570d08..aaadb2074f95 100644
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@@ -31,6 +31,8 @@ DIST sbcl-1.4.10-source.tar.bz2 6161728 BLAKE2B 192f008ec2f488f3f28375e56f5c90e3
 DIST sbcl-1.4.11-armhf-linux-binary.tar.bz2 9767589 BLAKE2B 2949338bc19973e0ca38f435caaa4c991a6c86d70dc092a4f1b6ec3eefa47af76f2a0c3fd8a4f8004127f4b8b3666a5cf4260b6ab56802308880067e4eaf8568 SHA512 297edddc36e9b9de080f9e25faa323e23877af234104b4b7e0fe2b74f0dd117d9cf0caa87b79718a8b071bcb5e97c8118f1d11af0e4aba2a961beb40c4dc99cb
 DIST sbcl-1.4.11-source.tar.bz2 6168945 BLAKE2B bff67a41265c06d38b62ee6ab64b750af86a26ff8945dc6ad910ea6e2e2359652cfaabca4710e0a2e967af35e883d4095bbc89721f2e0cafefa1af475ded4a20 SHA512 4a86a3fd355bc77616941af5dadff72b56cc212babfebff1f21db7546f9aa49c75b4ef3302712239eef957ceaba571cd41bec664824d6d996966d6ad8a7b274b
 DIST sbcl-1.4.11-x86-64-linux-binary.tar.bz2 10263675 BLAKE2B bb8f1d15ebdca6f980e9da5073884115f6ee70fe0837b0718d72b9f64f5c5706c1c56cae6b232d7cf48a858a0d00237cd6df9c4721b746a1902f603672f3a5f4 SHA512 8fc7bd9cc5742eb60e649069ce575f5dad9f0285388a920432c1b4662f24e38de1b45ae9128ba33b5f5ee585d4ce737e0178295d37a38c8185be661599bc65bb
+DIST sbcl-1.4.12-source.tar.bz2 6166453 BLAKE2B a85589610b6bad9bd2688c0320f4668508e923418f78a7ba6010c5f28c23cb23bc926156e3ea63dab6e23c38847449ffd0f7ae17db1ea3e49d0dad7b6b2db633 SHA512 5c6886a28460afc2fae67c8d651d718faf0e01c382010311c11fd15ba65c0073ec7bb63bdc74459b33cee062e1c1a50ab48d8f4cea47d626d710deb75553e377
+DIST sbcl-1.4.12-x86-64-linux-binary.tar.bz2 10226228 BLAKE2B da5ab75c4913424774beadd47c0d5a5e1ea2885c0e45891ff9b730ea63a60ae1532e79b74ba1ac4f719447cce02e997ae0c771a0a916de646be1809068b82248 SHA512 6eb8bd4a7a5bddb06d7cc7a3224f2edad7add58c0af88b2d36ef6523a942d30f659189833def36c4688ffaf7046b11c3b4ddca09473af234cab3527ecca96220
 DIST sbcl-1.4.2-arm64-linux-binary.tar.bz2 10578821 BLAKE2B 1cd25c548be0f1b7ec01edc3bee7fe6c2aaf07b7bd1fc55d408dee7ac95e8f3761a194bf9e8efb734179a7eff04cdae2fe5ba4a9ba5ab06f7322ac1550d142cc SHA512 39bbd735b242aa0bbac05c6f4dbe28cb45e01684db7e5b4f1e51f995a9f9d5b484f63cc4243f472f72b3b1e6c4cd2268a7e812b15426eca5cf9a1fede10f44bb
 DIST sbcl-1.4.3-x86-linux-binary.tar.bz2 10227185 BLAKE2B 6d77c4f4177cbdb72fb9bab0da5bd91e0aa8deafffd238818a2551332f0ab246715d9489b5c1156f3481aa7fb79d161a988404620fc09fe86ff927543a1ee678 SHA512 41cd63d61dd7c46370341dce39a362287a23b528bfebe8e5571614aeefdea03d318207d25562e995db9ccedb6c1f50ea4d66627721f0fd9486e99440126e6a38
 DIST sbcl-1.4.7-source.tar.bz2 6031614 BLAKE2B b98d8c3891e4f3180624ef0ccc1e81146d97e58c577c9efb2b3ac178f81a836f4019111a6c33ec31edb47d41920249c33a87955303c02ffc608ea42747b7f662 SHA512 b6eb749878920bec90f50f19c8c8700f700677ae1a7f7fb1ba1bbaa37f218d36eeee0dea65eb200f0cd09a9694600969f4c15042faf357395715b5390a6fdb6b
@@ -42,6 +44,7 @@ EBUILD sbcl-1.3.11.ebuild 8382 BLAKE2B 7df1cb22c53debbc4f972fd230bd4cef1132f2349
 EBUILD sbcl-1.3.21.ebuild 8318 BLAKE2B ff8e43085524e8e02a5af841962dedc9667a99a9ca4167227eee069957c7db66ad204d2548b64eb0c506719683f6069b62f10c3965737c4291cfa05aeeed35e9 SHA512 4e277a575b10bf4b1ba510bc7827c920c9aeeb68073b2c4e24ec3c354437c0a1eaa9ffeaab12dde5aa46b2a883a8d681aa0726c990911d6b1213c09f2df13798
 EBUILD sbcl-1.4.10.ebuild 8669 BLAKE2B 2d4131570d6646076c2404fcbec93c999dc75f24652ed861bf9f981309066c15f16a4a90701ab19522f93157339cd0228daa466acef7424ec490f1a05e4e806a SHA512 3f41a91f91304b76f7503e2f3796a4536442700b94407e2794dc14874a9b72fdde4c3a1ebab245c7f658aee6fced45345eea63b7df4d36e317e3aed36a3a0e7c
 EBUILD sbcl-1.4.11.ebuild 8670 BLAKE2B ccf4bb9b1568531a51d821827217a8779a42ac6fc9b8e0a967fb6bc5cb6e649473c148c04973ce23fe5fe215da326cfbc4cf37e4be5c79d4fbac0de7cd56e5fb SHA512 7dc95010904e70fd09fc33d6640c9c191cc6f457c4417497827aaaa19d38424632f7b5201a91063850b7a4d5a18d2708712d321214f55373abdf3a6338451c74
+EBUILD sbcl-1.4.12.ebuild 8670 BLAKE2B f753fce6ff0dcb83ae71658b32c794937fa03bf6842f313d712ef35a9d41c05d532244d381f098b9e8d445c647cacf4de675539c280a7b98c2c47bc971ec50b4 SHA512 e57baf5184b43ebb11cdb4f9c8d87dfb608dc998059f3850468f302f37a7459dfd32114a58d811f3b5cfe78de24215a568d02db0c457ff6763c5f756885dc6c2
 EBUILD sbcl-1.4.7.ebuild 8669 BLAKE2B c8132a464276020c610727546c1508e9d552d524195ee7e82766e732b90869129b7bf483c42f56b195b8a1873679acaf0f9bd2d99a0b36141b96985275dacd63 SHA512 2c20dd0576b2245ab07d41c83512a7d3a45d4c5f566bc1182ebfab1981c41bd4dce8cb82f84a5c0441a461efa337952bf3fcdb44e8635a24eb1daf7795cecf2b
 EBUILD sbcl-1.4.8.ebuild 8669 BLAKE2B 2d4131570d6646076c2404fcbec93c999dc75f24652ed861bf9f981309066c15f16a4a90701ab19522f93157339cd0228daa466acef7424ec490f1a05e4e806a SHA512 3f41a91f91304b76f7503e2f3796a4536442700b94407e2794dc14874a9b72fdde4c3a1ebab245c7f658aee6fced45345eea63b7df4d36e317e3aed36a3a0e7c
 EBUILD sbcl-1.4.9.ebuild 8668 BLAKE2B 94bf998fa8f712c7729df621016edbf35da3b0c5b317abe4188aed86e582d942c9fa591736f20ec5cc292802f15c36557b7a0bc8653bb5e8d380a0315d3819e3 SHA512 b43882d089add72215bd0fe3dec9b4fdbc02a4b936c846311539ca2906d0d702bda7d340c168a6be78a2588001c5fecc017a02be817872dc39de8938f9a1ac2e
diff --git a/dev-lisp/sbcl/sbcl-1.4.12.ebuild b/dev-lisp/sbcl/sbcl-1.4.12.ebuild
new file mode 100644
index 000000000000..3b0d00a105d6
--- /dev/null
+++ b/dev-lisp/sbcl/sbcl-1.4.12.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib eutils flag-o-matic pax-utils
+
+#same order as http://www.sbcl.org/platform-table.html
+BV_X86=1.4.3
+BV_AMD64=1.4.12
+BV_PPC=1.2.7
+BV_SPARC=1.0.28
+BV_ALPHA=1.0.28
+BV_ARM=1.4.11
+BV_ARM64=1.4.2
+BV_X86_MACOS=1.1.6
+BV_X64_MACOS=1.2.11
+BV_PPC_MACOS=1.0.47
+BV_X86_SOLARIS=1.2.7
+BV_X64_SOLARIS=1.2.7
+BV_SPARC_SOLARIS=1.0.23
+
+DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
+HOMEPAGE="http://sbcl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
+	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
+	amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
+	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
+	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
+	alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )
+	arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 )
+	arm64? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 )
+	x86-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_MACOS}-x86-darwin-binary.tar.bz2 )
+	x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 )
+	ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 )
+	x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 )
+	x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )
+	sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="debug doc source +threads +unicode pax_kernel zlib"
+
+CDEPEND=">=dev-lisp/asdf-3.1:="
+DEPEND="${CDEPEND}
+		doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
+		pax_kernel? ( sys-apps/elfix )"
+RDEPEND="${CDEPEND}
+		!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"
+
+# Disable warnings about executable stacks, as this won't be fixed soon by upstream
+QA_EXECSTACK="usr/bin/sbcl"
+
+CONFIG="${S}/customize-target-features.lisp"
+ENVD="${T}/50sbcl"
+
+# Prevent ASDF from using the system libraries
+CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)"
+ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)"
+
+usep() {
+	use ${1} && echo "true" || echo "false"
+}
+
+sbcl_feature() {
+	echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}"
+}
+
+sbcl_apply_features() {
+	sed 's/^X//' > "${CONFIG}" <<-'EOF'
+	(lambda (list)
+	X  (flet ((enable  (x) (pushnew x list))
+	X         (disable (x) (setf list (remove x list))))
+	EOF
+	if use x86 || use amd64; then
+		sbcl_feature "$(usep threads)" ":sb-thread"
+	fi
+	sbcl_feature "true" ":sb-ldb"
+	sbcl_feature "false" ":sb-test"
+	sbcl_feature "$(usep unicode)" ":sb-unicode"
+	sbcl_feature "$(usep zlib)" ":sb-core-compression"
+	sbcl_feature "$(usep debug)" ":sb-xref-for-internals"
+	sed 's/^X//' >> "${CONFIG}" <<-'EOF'
+	X    )
+	X  list)
+	EOF
+	cat "${CONFIG}"
+}
+
+src_unpack() {
+	unpack ${A}
+	mv sbcl-*-* sbcl-binary || die
+	cd "${S}"
+}
+
+src_prepare() {
+	# bug #468482
+	eapply "${FILESDIR}"/concurrency-test-1.3.15.patch
+	# bugs #486552, #527666, #517004
+	eapply "${FILESDIR}"/${PN}-1.4.0-bsd-sockets-test.patch
+	# bugs #560276, #561018
+	eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch
+
+	eapply "${FILESDIR}"/${PN}-1.2.11-solaris.patch
+	eapply "${FILESDIR}"/${PN}-1.4.0-verbose-build.patch
+
+	eapply_user
+
+	# Make sure the *FLAGS variables are sane.
+	# sbcl needs symbols in resulting binaries, so building with the -s linker flag will fail.
+	strip-unsupported-flags
+	filter-flags -fomit-frame-pointer -Wl,-s
+	filter-ldflags -s
+
+	# original bugs #526194, #620532
+	# this broke no-pie default builds, c.f. bug #632670
+	# Pass CFLAGS down by appending our value, to let users override
+	# the default values.
+	# Keep passing LDFLAGS down via the LINKFLAGS variable.
+	sed -e "s@\(CFLAGS += -g .*\)\$@\1 ${CFLAGS}@" \
+		-e "s@LINKFLAGS += -g\$@LINKFLAGS += ${LDFLAGS}@" \
+		-i src/runtime/GNUmakefile || die
+
+	sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \
+		-i make-config.sh || die
+
+	# Use installed ASDF version
+	cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
+	# Avoid installation of ASDF info page. See bug #605752
+	sed '/INFOFILES/s/asdf.info//' -i doc/manual/Makefile || die
+
+	use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
+
+	# Some shells(such as dash) don't have "time" as builtin
+	# and we don't want to DEPEND on sys-process/time
+	sed "s,^time ,," -i make.sh || die
+	sed "s,/lib,/$(get_libdir),g" -i install.sh || die
+	# #define SBCL_HOME ...
+	sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die
+	# change location of /etc/sbclrc ...
+	sed  "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die
+
+	find . -type f -name .cvsignore -delete
+}
+
+src_configure() {
+	# customizing SBCL version as per
+	# http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
+	echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr
+
+	# applying customizations
+	sbcl_apply_features
+}
+
+src_compile() {
+	local bindir="${WORKDIR}"/sbcl-binary
+
+	if use pax_kernel ; then
+		# To disable PaX on hardened systems
+		pax-mark -mr "${bindir}"/src/runtime/sbcl
+
+		# Hack to disable PaX on second GENESIS stage
+		sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\    paxmark.sh -mr \.\/src\/runtime\/sbcl' \
+			"${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime"
+	fi
+
+	# clear the environment to get rid of non-ASCII strings, see bug #174702
+	# set HOME for paludis
+	env - HOME="${T}" PATH="${PATH}" \
+		CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
+		CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \
+		GNUMAKE=make ./make.sh \
+		"sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \
+		|| die "make failed"
+
+	# need to set HOME because libpango(used by graphviz) complains about it
+	if use doc; then
+		env - HOME="${T}" PATH="${PATH}" \
+			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+			make -C doc/manual info html || die "Cannot build manual"
+		env - HOME="${T}" PATH="${PATH}" \
+			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+			make -C doc/internals info html || die "Cannot build internal docs"
+	fi
+}
+
+src_test() {
+	ewarn "Unfortunately, it is known that some tests fail eg."
+	ewarn "run-program.impure.lisp. This is an issue of the upstream's"
+	ewarn "development and not of Gentoo's side. Please, before filing"
+	ewarn "any bug(s) search for older submissions. Thank you."
+	time ( cd tests && sh run-tests.sh )
+}
+
+src_install() {
+	# install system-wide initfile
+	dodir /etc/
+	sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF
+	;;; The following is required if you want source location functions to
+	;;; work in SLIME, for example.
+	X
+	(setf (logical-pathname-translations "SYS")
+	X      '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*")
+	X        ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*")))
+	X
+	;;; Setup ASDF2
+	(load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp")
+	EOF
+
+	# Install documentation
+	unset SBCL_HOME
+	INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \
+		sh install.sh || die "install.sh failed"
+
+	# bug #517008
+	pax-mark -mr "${D}"/usr/bin/sbcl
+
+	# rm empty directories lest paludis complain about this
+	find "${ED}" -empty -type d -exec rmdir -v {} +
+
+	if use doc; then
+		dodoc -r doc/internals/sbcl-internals
+
+		doinfo doc/manual/*.info*
+		doinfo doc/internals/sbcl-internals.info
+
+		docinto internals-notes
+		dodoc doc/internals-notes/*
+	else
+		rm -Rv "${ED}/usr/share/doc/${PF}" || die
+	fi
+
+	# install the SBCL source
+	if use source; then
+		./clean.sh
+		cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die
+	fi
+
+	# necessary for running newly-saved images
+	echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}"
+	echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
+	doenvd "${ENVD}"
+}
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 26f0f2562eb3..6917438d6ebe 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/lua-openssl/Manifest b/dev-lua/lua-openssl/Manifest
index be21660b2886..f89040516b9f 100644
--- a/dev-lua/lua-openssl/Manifest
+++ b/dev-lua/lua-openssl/Manifest
@@ -1,4 +1,9 @@
+AUX 0001-fix-libressl-compat.patch 14675 BLAKE2B a90784a7925c5f3eca792d54e60f6b2d56e983f6f72c3a43cc9092242a6f7dac59c33e558d854600a107075c07b412e517ddfd45b902d426f4ec7d7ffafb2d0e SHA512 ebd92ba95304883950719a56466c2abc230b5d77fbf9c58925e52e840089517b5f2c745b27b327ff4fa81b5b3e8908d4cebbafdbf6ba641c2b0fc866f278f966
 AUX lua-openssl-0.4.1-Makefile.patch 3494 BLAKE2B e007800b599eb7f979fa23ffed4a436f9804c82ec8e4c98307192cc6e25c8c4571bfcf803a99bc6dbf3ac4f05217b7639423e32ce4ac8c73a3a31f25daf73062 SHA512 bc5b4c2dfd95b82bcdef0e0f5467af9249365db73b39ee416795140be95a89c0cc968507d62f9b9424f3a492429a49153bed5f7706a2a878430e6af41be38505
 DIST lua-openssl-0.4.1.tar.gz 363525 BLAKE2B cd2222241f742421c31eb4334a472bdd79b3b348210f02a5d4275163a3d57ea6c13adf894aa9aeb24266a8bedf839aadc3c3923bb65d075963b1810581629fb4 SHA512 c6deda86f77f9d6de1863611db9eb82506ea9789ec0425cb40cdb7d142d53aa633d53e1446b7eeb464636261385822d9cedc841bd35163931cc3758e7c3a308d
+DIST lua-openssl-0.7.3.tar.gz 383743 BLAKE2B 2709eed607e6d752488cacd5b96ee4a845f1ec13948fc7e40e45af968f240579b5d96ab69380f87d7edfc8a55aa44b099e9a592891f78a7928d172f5abcbc9fb SHA512 00eea8d4d04e167456a7602ae111cb768db61f7bdf9e0056c424bdcd67618811cd304543f95ecb273c66c6b41779e2fe721cb43bc332765ce77effb6245edbe2
+DIST lua-openssl-aux-b56f6937096acea34ddf241ec7ea08ac52414d18.tar.gz 3684 BLAKE2B 78e92c6cc1c2a29b00a9179db71a9404aff40a0e844f2f092b7868bbf98b6f3fa9519c63a2c38304ce2928b007bd4c015c5afa66ca32b1646035ebb949b3c655 SHA512 ba1eaf7c6b58fde48f47146d6c773368484ea10a229d6a45f317bda8d8cc21829ceda68071685f1b071e150936362b934b90532344ebb266febcc0efa45904f4
+DIST lua-openssl-compat-daebe77a2f498817713df37f0bb316db1d82222f.tar.gz 51418 BLAKE2B 1d04684e6b6d850bdf6bd3165a90c6a08bd93b757d91e387da152bcb3fc4756db5c16f3cc12ecf33bcdd647742c7923cc2e72627beb5527c5e9dfbfd63c147ba SHA512 60ec9ecfc4e4ad47b6a8189ffb1e7c83fe8b9e9df13cb91bf33725905ab72bff3d3009e8ad04fb73fd7255facdbb8279f20bfd160aee89b12c25431786eaca14
 EBUILD lua-openssl-0.4.1-r1.ebuild 1109 BLAKE2B 098681960488aa3c080eab0feebce74262ee90878dd0a0e04f55b80104c68212e2175deec6430c55a796e587c5265fce5831b66a359d5dd8e3465633d1d21548 SHA512 501e5d001021d0cf8ace8ba668f6e7b4880a0cb932573e6444ab0dba959c5116b51e700f48cfc08d3219821878a87b61720596ca2de99a387bc3fc8c9470a5dd
-MISC metadata.xml 249 BLAKE2B 3ab35857c3c6e5cea39d8d6d3b54fdfefd9877895c470c3ca2cfbb50a298410842de32514bf22d823f789aa09b1bd06a8e35f7282359077324737ec01a7dda25 SHA512 4a88e5a29b58bf05ab0d5ba495f472d5642c757067e19ee24ba751e2e3df458b308714f3744f82b54004ab87289eb33d57b78d0785c99eb08f079e9d3f0f5608
+EBUILD lua-openssl-0.7.3.ebuild 1830 BLAKE2B 1ecfaaa56fd83dfa222fdd53a78c37674b3c3907af61d22707cbf55ab6dcb07b2f011852bc286f2bd1390fb01cf4677cac1a76bab8813916e16acc74ed65a3f9 SHA512 f05c8db1f70cb24e591d45a800da2503cc81488d11dfb88ed19703b6734cffbe5a42c0b87c8fbea12b07590b7b4f20db5faca70a79263ff29e722de99b4876de
+MISC metadata.xml 450 BLAKE2B 6308bdf6f3938b3fef9178572471418882e1777bcb740c537023e03f007d46459bb4142783315376d4c9ae59d7884e138381c91e9517e07c5fb061152f11730e SHA512 9bd34c3cce2d9e9ec2ad4529afd569161416e6ae4e519c392957bd735e398ed4445a4ffaad8215bed2073481390d1f2a61b4ade3879de28152196db1107764e9
diff --git a/dev-lua/lua-openssl/files/0001-fix-libressl-compat.patch b/dev-lua/lua-openssl/files/0001-fix-libressl-compat.patch
new file mode 100644
index 000000000000..19b0539c0820
--- /dev/null
+++ b/dev-lua/lua-openssl/files/0001-fix-libressl-compat.patch
@@ -0,0 +1,433 @@
+From 44d5360d0caed1f4f364691f789fe825fcd17a3e Mon Sep 17 00:00:00 2001
+From: crito <crito@fnordpipe.org>
+Date: Mon, 1 Oct 2018 20:10:05 +0200
+Subject: [PATCH] fix libressl compat
+
+add conditions to build with libressl and add missing functions.
+backported from upstream repo.
+---
+ src/compat.c  | 11 ++++++++---
+ src/digest.c  |  2 +-
+ src/ec.c      |  2 +-
+ src/engine.c  | 10 +++++-----
+ src/lhash.c   |  7 ++++---
+ src/openssl.c | 12 ++++++++++--
+ src/ots.c     |  5 +++++
+ src/pkcs7.c   | 24 ++++++++++++------------
+ src/private.h |  7 ++++---
+ src/sm2.c     |  2 +-
+ src/srp.c     |  3 ++-
+ src/x509.c    |  2 +-
+ 12 files changed, 54 insertions(+), 33 deletions(-)
+
+diff --git a/src/compat.c b/src/compat.c
+index cc4cc21..cc45845 100644
+--- a/src/compat.c
++++ b/src/compat.c
+@@ -5,7 +5,7 @@
+ #include "openssl.h"
+ #include "private.h"
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ int BIO_up_ref(BIO *b)
+ {
+   CRYPTO_add(&b->references, 1, CRYPTO_LOCK_BIO);
+@@ -16,6 +16,11 @@ int X509_up_ref(X509 *x)
+   CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509);
+   return 1;
+ }
++int X509_CRL_up_ref(X509_CRL *x)
++{
++  int refs = CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509_CRL);
++  return (refs > 1) ? 1 : 0;
++}
+ int X509_STORE_up_ref(X509_STORE *s)
+ {
+   CRYPTO_add(&s->references, 1, CRYPTO_LOCK_X509_STORE);
+@@ -464,7 +469,7 @@ const ASN1_BIT_STRING *TS_STATUS_INFO_get0_failure_info(const TS_STATUS_INFO *a)
+   return a->failure_info;
+ }
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10002000L
++#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER)
+ int i2d_re_X509_tbs(X509 *x, unsigned char **pp)
+ {
+   x->cert_info->enc.modified = 1;
+@@ -527,4 +532,4 @@ unsigned char *TS_VERIFY_CTX_set_imprint(TS_VERIFY_CTX *ctx,
+   return ctx->imprint;
+ }
+ 
+-#endif /* < 1.1.0 */
+\ No newline at end of file
++#endif /* < 1.1.0 */
+diff --git a/src/digest.c b/src/digest.c
+index 02e8fe1..0dcf65b 100644
+--- a/src/digest.c
++++ b/src/digest.c
+@@ -468,7 +468,7 @@ restore md data
+ static LUA_FUNCTION(openssl_digest_ctx_data)
+ {
+   EVP_MD_CTX *ctx = CHECK_OBJECT(1, EVP_MD_CTX, "openssl.evp_digest_ctx");
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+   if (lua_isnone(L, 2))
+   {
+     lua_pushlstring(L, ctx->md_data, ctx->digest->ctx_size);
+diff --git a/src/ec.c b/src/ec.c
+index f0d2b6b..5db32db 100644
+--- a/src/ec.c
++++ b/src/ec.c
+@@ -611,7 +611,7 @@ static int openssl_ecdsa_set_method(lua_State *L)
+ {
+   EC_KEY *ec = CHECK_OBJECT(1, EC_KEY, "openssl.ec_key");
+   ENGINE *e = CHECK_OBJECT(2, ENGINE, "openssl.engine");
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+   const ECDSA_METHOD *m = ENGINE_get_ECDSA(e);
+   if (m) {
+     int r = ECDSA_set_method(ec, m);
+diff --git a/src/engine.c b/src/engine.c
+index 1a26d8b..f12ca53 100644
+--- a/src/engine.c
++++ b/src/engine.c
+@@ -14,7 +14,7 @@ enum
+ {
+   TYPE_RSA,
+   TYPE_DSA,
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+   TYPE_ECDH,
+   TYPE_ECDSA,
+ #else
+@@ -24,7 +24,7 @@ enum
+   TYPE_RAND,
+   TYPE_CIPHERS,
+   TYPE_DIGESTS,
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+   TYPE_STORE,
+ #else
+   TYPE_PKEY_METHODS,
+@@ -150,7 +150,7 @@ static int openssl_engine_register(lua_State*L)
+       else
+         ENGINE_register_DSA(eng);
+       break;
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+     case TYPE_ECDH:
+       if (unregister)
+         ENGINE_unregister_ECDH(eng);
+@@ -183,7 +183,7 @@ static int openssl_engine_register(lua_State*L)
+       else
+         ENGINE_register_RAND(eng);
+       break;
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+     case TYPE_STORE:
+       if (unregister)
+         ENGINE_unregister_STORE(eng);
+@@ -392,7 +392,7 @@ static int openssl_engine_set_default(lua_State*L)
+     case TYPE_DSA:
+       ret = ENGINE_set_default_DSA(eng);
+       break;
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+     case TYPE_ECDH:
+       ret = ENGINE_set_default_ECDH(eng);
+       break;
+diff --git a/src/lhash.c b/src/lhash.c
+index 564bb52..8057efb 100644
+--- a/src/lhash.c
++++ b/src/lhash.c
+@@ -130,21 +130,22 @@ static void dump_value_doall_arg(CONF_VALUE *a, lua_State *L)
+   }
+ }
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ IMPLEMENT_LHASH_DOALL_ARG_CONST(CONF_VALUE, lua_State);
+ #elif OPENSSL_VERSION_NUMBER >= 0x10000002L
+ static IMPLEMENT_LHASH_DOALL_ARG_FN(dump_value, CONF_VALUE, lua_State)
+ #endif
++#if !defined(LIBRESSL_VERSION_NUMBER)
+ #define LHM_lh_doall_arg(type, lh, fn, arg_type, arg) \
+   lh_doall_arg(CHECKED_LHASH_OF(type, lh), fn, CHECKED_PTR_OF(arg_type, arg))
+-
++#endif
+ 
+ static LUA_FUNCTION(openssl_lhash_parse)
+ {
+   LHASH* lhash = CHECK_OBJECT(1, LHASH, "openssl.lhash");
+ 
+   lua_newtable(L);
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+   lh_CONF_VALUE_doall_lua_State(lhash, dump_value_doall_arg, L);
+ #elif OPENSSL_VERSION_NUMBER >= 0x10000002L
+   lh_CONF_VALUE_doall_arg(lhash, LHASH_DOALL_ARG_FN(dump_value), lua_State, L);
+diff --git a/src/openssl.c b/src/openssl.c
+index 994c22b..debea63 100644
+--- a/src/openssl.c
++++ b/src/openssl.c
+@@ -338,6 +338,9 @@ get FIPS mode
+ */
+ static int openssl_fips_mode(lua_State *L)
+ {
++#if defined(LIBRESSL_VERSION_NUMBER)
++  return 0;
++#else
+   int ret =0, on = 0;
+   if(lua_isnone(L, 1))
+   {
+@@ -353,6 +356,7 @@ static int openssl_fips_mode(lua_State *L)
+   else
+     ret = openssl_pushresult(L, ret);
+   return ret;
++#endif
+ }
+ 
+ #ifndef OPENSSL_NO_CRYPTO_MDEBUG
+@@ -405,7 +409,9 @@ void CRYPTO_thread_cleanup(void);
+ 
+ static int luaclose_openssl(lua_State *L)
+ {
++#if !defined(LIBRESSL_VERSION_NUMBER)
+   FIPS_mode_set(0);
++#endif
+ #if defined(OPENSSL_THREADS)
+   CRYPTO_thread_cleanup();
+ #endif
+@@ -421,7 +427,7 @@ static int luaclose_openssl(lua_State *L)
+   CRYPTO_cleanup_all_ex_data();
+ #ifndef OPENSSL_NO_CRYPTO_MDEBUG
+ #if !(defined(OPENSSL_NO_STDIO) || defined(OPENSSL_NO_FP_API))
+-#if OPENSSL_VERSION_NUMBER < 0x10101000L
++#if OPENSSL_VERSION_NUMBER < 0x10101000L || defined(LIBRESSL_VERSION_NUMBER)
+   CRYPTO_mem_leaks_fp(stderr);
+ #else
+   if(CRYPTO_mem_leaks_fp(stderr)!=1)
+@@ -541,13 +547,15 @@ LUALIB_API int luaopen_openssl(lua_State*L)
+   luaopen_dh(L);
+   lua_setfield(L, -2, "dh");
+ 
+-#if (OPENSSL_VERSION_NUMBER >= 0x10101007L) && !defined(OPENSSL_NO_SM2)
++#if (OPENSSL_VERSION_NUMBER >= 0x10101007L) && !defined(OPENSSL_NO_SM2) && !defined(LIBRESSL_VERSION_NUMBER)
+   luaopen_sm2(L);
+   lua_setfield(L, -2, "sm2");
+ #endif
+ 
++#if !defined(LIBRESSL_VERSION_NUMBER)
+   luaopen_srp(L);
+   lua_setfield(L, -2, "srp");
++#endif
+ 
+ #ifdef ENABLE_OPENSSL_GLOBAL
+   lua_pushvalue(L, -1);
+diff --git a/src/ots.c b/src/ots.c
+index 6b75946..762d17e 100644
+--- a/src/ots.c
++++ b/src/ots.c
+@@ -1265,7 +1265,12 @@ static LUA_FUNCTION(openssl_ts_resp_ctx_set_time_cb)
+   arg->cb_arg = luaL_ref(L, LUA_REGISTRYINDEX);
+ 
+   openssl_valueset(L, ctx, time_cb_key);
++#if defined(LIBRESSL_VERSION_NUMBER)
++  ctx->time_cb = openssl_time_cb;
++  ctx->time_cb_data = L;
++#else
+   TS_RESP_CTX_set_time_cb(ctx, openssl_time_cb, L);
++#endif
+   return 0;
+ }
+ 
+diff --git a/src/pkcs7.c b/src/pkcs7.c
+index f043c86..f0e5221 100644
+--- a/src/pkcs7.c
++++ b/src/pkcs7.c
+@@ -346,7 +346,7 @@ static int openssl_pkcs7_dataFinal(PKCS7 *p7, BIO *bio)
+     os = p7->d.signed_and_enveloped->enc_data->enc_data;
+     if (!os)
+     {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+       os = M_ASN1_OCTET_STRING_new();
+ #else
+       os = ASN1_OCTET_STRING_new();
+@@ -364,7 +364,7 @@ static int openssl_pkcs7_dataFinal(PKCS7 *p7, BIO *bio)
+     os = p7->d.enveloped->enc_data->enc_data;
+     if (!os)
+     {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+       os = M_ASN1_OCTET_STRING_new();
+ #else
+       os = ASN1_OCTET_STRING_new();
+@@ -383,7 +383,7 @@ static int openssl_pkcs7_dataFinal(PKCS7 *p7, BIO *bio)
+     /* If detached data then the content is excluded */
+     if (PKCS7_type_is_data(p7->d.sign->contents) && p7->detached)
+     {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+       M_ASN1_OCTET_STRING_free(os);
+ #else
+       ASN1_OCTET_STRING_free(os);
+@@ -398,7 +398,7 @@ static int openssl_pkcs7_dataFinal(PKCS7 *p7, BIO *bio)
+     /* If detached data then the content is excluded */
+     if (PKCS7_type_is_data(p7->d.digest->contents) && p7->detached)
+     {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+       M_ASN1_OCTET_STRING_free(os);
+ #else
+       ASN1_OCTET_STRING_free(os);
+@@ -474,7 +474,7 @@ static int openssl_pkcs7_dataFinal(PKCS7 *p7, BIO *bio)
+       goto err;
+     if (!EVP_DigestFinal_ex(mdc, md_data, &md_len))
+       goto err;
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+     M_ASN1_OCTET_STRING_set(p7->d.digest->digest, md_data, md_len);
+ #else
+     ASN1_OCTET_STRING_set(p7->d.digest->digest, md_data, md_len);
+@@ -577,7 +577,7 @@ int PKCS7_signatureVerify_digest(PKCS7 *p7, PKCS7_SIGNER_INFO *si, X509 *x509,
+ 
+   md_type = OBJ_obj2nid(si->digest_alg->algorithm);
+   md = EVP_get_digestbynid(md_type);
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+   if (!md || !data || (hash && len != (size_t) md->ctx_size) )
+     goto err;
+ 
+@@ -1137,7 +1137,7 @@ static LUA_FUNCTION(openssl_pkcs7_sign_digest)
+     os = p7->d.signed_and_enveloped->enc_data->enc_data;
+     if (!os)
+     {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+       os = M_ASN1_OCTET_STRING_new();
+ #else
+       os = ASN1_OCTET_STRING_new();
+@@ -1155,7 +1155,7 @@ static LUA_FUNCTION(openssl_pkcs7_sign_digest)
+     os = p7->d.enveloped->enc_data->enc_data;
+     if (!os)
+     {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+       os = M_ASN1_OCTET_STRING_new();
+ #else
+       os = ASN1_OCTET_STRING_new();
+@@ -1174,7 +1174,7 @@ static LUA_FUNCTION(openssl_pkcs7_sign_digest)
+     /* If detached data then the content is excluded */
+     if (PKCS7_type_is_data(p7->d.sign->contents) && p7->detached)
+     {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+       M_ASN1_OCTET_STRING_free(os);
+ #else
+       ASN1_OCTET_STRING_free(os);
+@@ -1189,7 +1189,7 @@ static LUA_FUNCTION(openssl_pkcs7_sign_digest)
+     /* If detached data then the content is excluded */
+     if (PKCS7_type_is_data(p7->d.digest->contents) && p7->detached)
+     {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+       M_ASN1_OCTET_STRING_free(os);
+ #else
+       ASN1_OCTET_STRING_free(os);
+@@ -1217,7 +1217,7 @@ static LUA_FUNCTION(openssl_pkcs7_sign_digest)
+ 
+       if (hash)
+       {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+         if (l == (size_t) mdc->digest->ctx_size)
+         {
+           memcpy(mdc->md_data, data, l);
+@@ -1272,7 +1272,7 @@ static LUA_FUNCTION(openssl_pkcs7_sign_digest)
+     unsigned int md_len;
+     md = EVP_get_digestbynid(OBJ_obj2nid(p7->d.digest->md->algorithm));
+     EVP_DigestInit_ex(mdc, md, NULL);
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+     if (l == (size_t) mdc->digest->ctx_size)
+     {
+       memcpy(mdc->md_data, data, l);
+diff --git a/src/private.h b/src/private.h
+index 8e9d5b8..7140cae 100644
+--- a/src/private.h
++++ b/src/private.h
+@@ -46,9 +46,10 @@ extern "C" {
+   luaL_getmetatable(L,"openssl.bn");                    \
+   lua_setmetatable(L,-2)
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ int BIO_up_ref(BIO *b);
+ int X509_up_ref(X509 *x);
++int X509_CRL_up_ref(X509_CRL *x);
+ int X509_STORE_up_ref(X509_STORE *s);
+ int EVP_PKEY_up_ref(EVP_PKEY *pkey);
+ 
+@@ -124,12 +125,12 @@ STACK_OF(X509) *TS_VERIFY_CTS_set_certs(TS_VERIFY_CTX *ctx,
+ unsigned char *TS_VERIFY_CTX_set_imprint(TS_VERIFY_CTX *ctx,
+     unsigned char *hexstr, long len);
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10002000L
++#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER)
+ int i2d_re_X509_tbs(X509 *x, unsigned char **pp);
++#endif
+ void X509_get0_signature(ASN1_BIT_STRING **psig, X509_ALGOR **palg,
+                          const X509 *x);
+ int X509_get_signature_nid(const X509 *x);
+-#endif
+ 
+ #endif
+ 
+diff --git a/src/sm2.c b/src/sm2.c
+index 0655888..1db3198 100644
+--- a/src/sm2.c
++++ b/src/sm2.c
+@@ -1,7 +1,7 @@
+ #include "openssl.h"
+ #include "private.h"
+ 
+-#if (OPENSSL_VERSION_NUMBER >= 0x10101007L) && !defined(OPENSSL_NO_SM2)
++#if (OPENSSL_VERSION_NUMBER >= 0x10101007L) && !defined(OPENSSL_NO_SM2) && !defined(LIBRESSL_VERSION_NUMBER)
+ 
+ #  include <openssl/sm2.h>
+ 
+diff --git a/src/srp.c b/src/srp.c
+index 85626b5..6fb0a50 100644
+--- a/src/srp.c
++++ b/src/srp.c
+@@ -1,6 +1,7 @@
+ #include "openssl.h"
+ #include "private.h"
+ 
++#if !defined(LIBRESSL_VERSION_NUMBER)
+ #include <openssl/srp.h>
+ #include <openssl/bn.h>
+ 
+@@ -198,4 +199,4 @@ int luaopen_srp(lua_State *L)
+   lua_settable(L, -3);
+   return 1;
+ }
+-
++#endif
+diff --git a/src/x509.c b/src/x509.c
+index 94e9982..07adb54 100644
+--- a/src/x509.c
++++ b/src/x509.c
+@@ -1196,7 +1196,7 @@ static int openssl_x509_extensions(lua_State* L)
+   else
+   {
+     STACK_OF(X509_EXTENSION) *others = (STACK_OF(X509_EXTENSION) *)openssl_sk_x509_extension_fromtable(L, 2);
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+     sk_X509_EXTENSION_pop_free(self->cert_info->extensions, X509_EXTENSION_free);
+     self->cert_info->extensions = others;
+ #else
+-- 
+2.16.4
+
diff --git a/dev-lua/lua-openssl/lua-openssl-0.7.3.ebuild b/dev-lua/lua-openssl/lua-openssl-0.7.3.ebuild
new file mode 100644
index 000000000000..564518d7fb1a
--- /dev/null
+++ b/dev-lua/lua-openssl/lua-openssl-0.7.3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="OpenSSL binding for Lua"
+HOMEPAGE="https://github.com/zhaozg/lua-openssl"
+LUA_AUX_COMMIT="b56f6937096acea34ddf241ec7ea08ac52414d18"
+LUA_COMPAT_COMMIT="daebe77a2f498817713df37f0bb316db1d82222f"
+SRC_URI="https://github.com/zhaozg/lua-openssl/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/zhaozg/lua-auxiliar/archive/${LUA_AUX_COMMIT}.tar.gz -> ${PN}-aux-${LUA_AUX_COMMIT}.tar.gz
+	https://github.com/keplerproject/lua-compat-5.3/archive/${LUA_COMPAT_COMMIT}.tar.gz -> ${PN}-compat-${LUA_COMPAT_COMMIT}.tar.gz"
+
+LICENSE="MIT openssl PHP-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl luajit"
+
+RDEPEND="
+	luajit? ( dev-lang/luajit:2 )
+	!luajit? ( >=dev-lang/lua-5.1:0 )
+	libressl? ( <dev-libs/libressl-2.7.0:0= )
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	!dev-lua/luaossl
+	"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=("${FILESDIR}/0001-fix-libressl-compat.patch")
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	pushd "${WORKDIR}/${P}/deps" > /dev/null || die
+	unpack "${PN}-aux-${LUA_AUX_COMMIT}.tar.gz"
+	unpack "${PN}-compat-${LUA_COMPAT_COMMIT}.tar.gz"
+	rmdir auxiliar lua-compat || die
+	mv "lua-auxiliar-${LUA_AUX_COMMIT}" auxiliar || die
+	mv "lua-compat-5.3-${LUA_COMPAT_COMMIT}" lua-compat || die
+	popd > /dev/null || die
+}
+
+src_configure() {
+	tc-export PKG_CONFIG
+	LUA_VERSION="$(${PKG_CONFIG} --variable=$(usex luajit abiver V) $(usex luajit luajit lua))"
+	LUA_CFLAGS="$(${PKG_CONFIG} $(usex luajit luajit lua) --cflags) ${CFLAGS}"
+	LUA_LIBS="$(${PKG_CONFIG} $(usex luajit luajit lua) --libs) ${LDFLAGS}"
+
+	export LUA_VERSION LUA_CFLAGS LUA_LIBS
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake PREFIX="${ED}/usr" install
+	einstalldocs
+}
diff --git a/dev-lua/lua-openssl/metadata.xml b/dev-lua/lua-openssl/metadata.xml
index 5056b9e74ffb..731dad42e18a 100644
--- a/dev-lua/lua-openssl/metadata.xml
+++ b/dev-lua/lua-openssl/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>crito@fnordpipe.org</email>
+		<name>Matthias Hauber</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">zhaozg/lua-openssl</remote-id>
 	</upstream>
diff --git a/dev-lua/luaossl/Manifest b/dev-lua/luaossl/Manifest
index 33e656590223..fc527a12f5e9 100644
--- a/dev-lua/luaossl/Manifest
+++ b/dev-lua/luaossl/Manifest
@@ -2,4 +2,4 @@ DIST luaossl-20150727.tar.gz 355486 BLAKE2B 81907c3a3f565432eb2d2b17db48f3814968
 DIST luaossl-rel-20180708.tar.gz 455381 BLAKE2B d57e27638e6aee44a94f85094bab9161f0b87bdb379863fdef4517a1cb3415f4ef7e62967ee1e3fa2dde4d5629a24d732dc8ea0fd2ea54ccd84f69c4b18e2c57 SHA512 b2a73a7e7ace9a01c8c5a26603107f7741de88de32c393ed9134b70d55278c81d48e357955e671654825de282449b9570ecdc6a4fbcf4890439c0200ba471338
 EBUILD luaossl-20150727.ebuild 1008 BLAKE2B 13aa6f30dc48ce88bea032225c5e82eb9bc7b98b692a9fe4554bd71c17e8d5e7b86a79e0adb50cb79ca06255da7185b7f2b1e1ac730ffa66ae39587475ee07b8 SHA512 76e0a12cf036ed3ca5c26248d6263540f4924469a42dda5ff48f1f485f1abf6de5714613f75a5fcd6bcb3b35030c45c1f35dcc17ad91b47f1c71d1b2cfbe4cd9
 EBUILD luaossl-20180708.ebuild 921 BLAKE2B 7124683a0b21b71e8785ab8517012a9750a366afcb9eb5f1b82d5917fff5527499369ef7ed4891165e42a18fb09bd83763952d778b92db46838bcdb2dbf5276b SHA512 587d420d87f6b4f27e3267eaa12a96d5993cf557a43ba06f603a9acbe04231837368c6dedf0929d6025cd886981ccc120eab5c86517e509edb312d112ff78e22
-MISC metadata.xml 245 BLAKE2B 3de0e2bf54d5109317127196b0ebfe42b637b6e6cf6fbf82a5f2e7b8a45e2fbe46a7984b99354e626ff06849528bba05d63b46f9248e67e201573d46cda4dac4 SHA512 9d0d12e3741c2df573672c630a1d6d617beda53f531b5413a24ddb5fe8d8ee827998a85b95bf90ecad1f2a9ceccb229d9b37af41ea567961743471f52913c5a6
+MISC metadata.xml 446 BLAKE2B e11f955abb7417868998af974278f1aeacfcc45c99727f9085958f1947873911a6c52e049782195fcc143336ac4359ac536797f3348df75295b64b48cafe759a SHA512 31b5c084ab50a3864d5bb189e55181a43d7ff2a2ff45738e00d5d863819ad2405b778f93caa12d9f62015e321252bcd1fdd776b7ff3a6299c58fc5cf74f6d547
diff --git a/dev-lua/luaossl/metadata.xml b/dev-lua/luaossl/metadata.xml
index 581bc911a605..8056c7be9898 100644
--- a/dev-lua/luaossl/metadata.xml
+++ b/dev-lua/luaossl/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>crito@fnordpipe.org</email>
+		<name>Matthias Hauber</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">wahern/luaossl</remote-id>
 	</upstream>
diff --git a/dev-perl/App-pwhich/App-pwhich-1.140.0.ebuild b/dev-perl/App-pwhich/App-pwhich-1.140.0.ebuild
index e14689ed3725..1f24840392d1 100644
--- a/dev-perl/App-pwhich/App-pwhich-1.140.0.ebuild
+++ b/dev-perl/App-pwhich/App-pwhich-1.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
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Perl-only 'which'"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/App-pwhich/Manifest b/dev-perl/App-pwhich/Manifest
index e2001f81a628..13c2e00352da 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 463 BLAKE2B 18957747b0f69aed0e0831e1a3b61b3cdb18f526a92580bb3e7fe9806301bef7874e1ad9e10a9793593676a1c401600edc06703b6cb7f6664cc690e62c7b4013 SHA512 1639a57354e7d6d05ef808fd99a56482816e9c2a71617e96818f7e29c3f03a381f12e66a68fb988c87b81fe0005591ab44695a73de1f9573b314777411e05081
+EBUILD App-pwhich-1.140.0.ebuild 459 BLAKE2B 6d70f70932c86561f503f6c28fc057c2171554fcc7c98b28445ba77ce23b58dfd8d4002ee2245ee151a0fef6bad968e1d533ccc367299def3ddada0f36d51671 SHA512 37758db699e1e69943d3f47396540b3ca636350d5100c7694b2c8069c03701aa50eb2c66bb664b2a697caa5273b4944933fb30daf3e5c3b5c70574d4dff1b2b9
 EBUILD App-pwhich-1.150.0.ebuild 543 BLAKE2B c3cda7d0edef65f913053ddb7cbf5d81d2814f524e23ca999f8f84182d8e7bda1cde133261bd91d12867a0ee46e7f171c85ee9b29bbb9f2e26942dfc367f42de SHA512 893707ad570447403670cab8f29fd740b9499605fa372bfbd24418f1332a199c937b235927f60adc0d4f5adf75a8809094200d8fbffa03ec42f3bbfa1d10b370
 MISC metadata.xml 392 BLAKE2B 80688a705e20a8786d2aaab17623c50d3f6ed1ce7ea10433d0f70fd907e9504d190028c2fc84d5c72ca6d759bbdaad5bbdbd5fbdb3c1933e144c2bc6841d3a64 SHA512 2bac82b1e61abeb1f1edf0ff8bbc01d200a6c34778502661347c8531cc6c2a19b0d0c8241250b1a93cce9070b41496bedf56320999fff73d6a93aff31513a0fa
diff --git a/dev-perl/CGI-Session/CGI-Session-4.480.0-r2.ebuild b/dev-perl/CGI-Session/CGI-Session-4.480.0-r2.ebuild
index 4614a2b2b0ad..efa18de2b7f0 100644
--- a/dev-perl/CGI-Session/CGI-Session-4.480.0-r2.ebuild
+++ b/dev-perl/CGI-Session/CGI-Session-4.480.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="persistent session data in CGI applications"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/CGI-Session/Manifest b/dev-perl/CGI-Session/Manifest
index 5bd9f231ce9b..7dd10f7c02f8 100644
--- a/dev-perl/CGI-Session/Manifest
+++ b/dev-perl/CGI-Session/Manifest
@@ -1,4 +1,4 @@
 DIST CGI-Session-4.48.tar.gz 95291 BLAKE2B d1d915c85e230ec73575d56cc92589c45a5f6d35f52737b5cefa61704cfc42aeb6682e3e56e1b8cb015ff2d55b141dcfe01ad4fe376e70ff17014edd3951a531 SHA512 82d6a498035b91474df712fdae2c9ce7290157ddec36095757f16b5cbce593d3b5115077c722350d1c890c299230f7489a41328ed64b85a0f4c3cfff8aceef54
 EBUILD CGI-Session-4.480.0-r1.ebuild 513 BLAKE2B 1875700b7c9297f8aab0332e2de9f747740aac2ba60880fd4d4dc34dbf3890acbd16166c5ba41ccb9134deb8ef65a6aa472f8a7b86d00ca99eae818849ea27b7 SHA512 6f9f82f6e5703a87a9518abac9f020377d01be90c40051a63323451a00304f441b092a3635e5a39f06c3eedd20bdd60c2d5901784f002c1f7691edeb0ec009ec
-EBUILD CGI-Session-4.480.0-r2.ebuild 496 BLAKE2B 3b4b1597edd148ddbd2f66860dab5d465a12e622724d8720cdd7676516f8eff483cdad19897921402377e6f6801cd328aff65c0ada59d7723850cc13a45b5354 SHA512 cbbbdb4c490ca570591714506c3d74e2bb2778ad398c083511285b0efc6d1169cd2a2fedda309cc031d80315197c026afc661d6e32238c2369abea7c4e7a55d9
+EBUILD CGI-Session-4.480.0-r2.ebuild 492 BLAKE2B 6000f720c50ace0bfbb04c57237714868fb6bf81f435370c74d81b5da26593635134d271587c7741f8e38a4de9db8febda3a3eaa098d0a69c9d2311c82fdc28b SHA512 89d844893e93fb23e59ee4aa393c147771d4f5a3101ef72f2456fce727895ff963166e5037bb9a7c225da6c3f8deec21480c31a1917237bccc999613e3c17131
 MISC metadata.xml 1637 BLAKE2B 27d43c41f9acb206c4d50b34971d917c412aba3fde8cce4c1a08dd7250f154440f49d025533f67370f59206ccea949e2e8ca9a0092c3c58cfc422f11e4df9ffc SHA512 00f923a38d667b785fffd9543d724f0eb8d016562bdbba08b24b567128972461ee8816eeea66e9b14c77bdc8ba0317d36fa7217986088fbb642db9781524e2f1
diff --git a/dev-perl/CGI/CGI-4.400.0.ebuild b/dev-perl/CGI/CGI-4.400.0.ebuild
index 4e07e8571383..e321b61fd5bf 100644
--- a/dev-perl/CGI/CGI-4.400.0.ebuild
+++ b/dev-perl/CGI/CGI-4.400.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="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 8cbcd2fbe3ae..d2b4f07ada68 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 1007 BLAKE2B cdcc74f7d8360cba534e0a8807803619d4c5190149bbb55ffe4653eeaa2b07f3dab5484983770d818a2b3185e574814e17b2c4a2d95d356ce4d3a51426d65de9 SHA512 fffe0e175b4c08b4c84345db56ccbde54eddbbb8405354121e39af7d8d736773e77af56f6900612694fb18e264a9242b662f81c5dc620cc0baeb5377e0e13693
+EBUILD CGI-4.400.0.ebuild 998 BLAKE2B 7d162cf8576113e31d6157b19e97fcd794f82e9cec4e9bd403f37fd94c516466f8151a1fb6113c5c468202445337fc53a70ac90018f0cbe27cbaea4303bbd990 SHA512 587cfd72e0da6e159491c2783b4fb1e51675a5c50e3c80413c10b5fb5ed98f869b3f4348140c9750becc513429b4692908c8ba9426d67629a56f6d58e35bd7de
 MISC metadata.xml 906 BLAKE2B dfdc7b33ffc98d0b9322c6682e0ff42ccb21f7cc52f5bf1f30e14284bd598bb02c1a63af712c20880d391f756855d31a77b21e6c37f35716fcda5d74cec8dff3 SHA512 89ff442464fb49a81c17538be8756521ce901bfdffc7e72b8ddaf56b00bbda42e1b9dd779c7e975986a930662ef1e3e57bfee10f51aef656db48e2a573ea04ec
diff --git a/dev-perl/Cwd-Guard/Cwd-Guard-0.50.0.ebuild b/dev-perl/Cwd-Guard/Cwd-Guard-0.50.0.ebuild
index c0946a22d4e9..e5016f5d52a8 100644
--- a/dev-perl/Cwd-Guard/Cwd-Guard-0.50.0.ebuild
+++ b/dev-perl/Cwd-Guard/Cwd-Guard-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=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Temporary changing working directory (chdir)"
 
 SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ~x86"
+KEYWORDS="amd64 hppa ~ppc x86"
 IUSE="test minimal"
 # Cwd -> perl-File-Spec
 RDEPEND="
diff --git a/dev-perl/Cwd-Guard/Manifest b/dev-perl/Cwd-Guard/Manifest
index d8cd284aac94..906cd7109186 100644
--- a/dev-perl/Cwd-Guard/Manifest
+++ b/dev-perl/Cwd-Guard/Manifest
@@ -1,3 +1,3 @@
 DIST Cwd-Guard-0.05.tar.gz 10253 BLAKE2B cd11c91769212a5b77ce267542d6ddc231ff4ee64baa5abf88035d3fedfe005141e571b516b799f611488347d89896f16660c66a58e20729b0cddc6753b89163 SHA512 14aa68e535cec8f7182d5648558c539cbf6eebe2fee9c59d0b06f5b45cca1c6c652104a58f71b5a56f796f03d139e3e74962e45fb127bf038803b05cb9f32b82
-EBUILD Cwd-Guard-0.50.0.ebuild 621 BLAKE2B 8c32908f773d4cde5ae668fdddab02796e9a23672adce1792e2996d9f268256802dea8d380f6763de9767882f3ea6043571a7e573241f56ea125c646ad0c49db SHA512 fab9561036a6395ad59c3bd686c4a507c3872a08ebd64c793ac7ad6b05cb14fa131d6e5044ddb77502eb397e8c041f6fc135189200e2d96328fc84a11d7daba0
+EBUILD Cwd-Guard-0.50.0.ebuild 617 BLAKE2B 8df63bf297fe3309d11f9d2c5806e2f08a7b8bc89bb36463a3c924f4c69dc96c93ab29734ff474a3499397c436b58e654353425d228de912fc0831ba98c503e3 SHA512 68e3bdbd36952f3e6468cfd462baf6d1f44cb55a951d5b5331f449a485f25f0c01f83cd25545312121d18f8dfd7d865ef05fec508e890418e7c50ea95ddb90fb
 MISC metadata.xml 390 BLAKE2B 1c9d88c362c73b45891121b3ed52681c244cce889a8dfb2f2285b61d74700106f9a7a1dbad243ce32576734ac6cfe29fde8e5131185f0bfd0170291e1b3a350e SHA512 b103d96a5b31e484d29b5f3043574dc7c4d1602a5ee2c904fc84f591fcc9758db92ddcfb1c1303ca22164f575af5e8ff809af8817ba78ae4e8d2f5d1d557aca5
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 8e84fa9db15b..d81d0a4e0202 100644
--- a/dev-perl/DBD-SQLite/DBD-SQLite-1.580.0.ebuild
+++ b/dev-perl/DBD-SQLite/DBD-SQLite-1.580.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="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 c41fe0ccb309..67cea54524cc 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 1300 BLAKE2B c1f695179b4e6df47d3410b1d8b15207813efed077c457a3394233438015a92e4a51b885c908f37d74392ded29e75de31dc6c4267977d0dbf3269fda179f0034 SHA512 24011c6588b9be3b43230e7884504e3fc09c31326e52813d57fef72933e9fb4a6d359144c189d5a61e281bbc5923553df60c14d4b75291875f8ad397f2b1e6e7
+EBUILD DBD-SQLite-1.580.0.ebuild 1291 BLAKE2B 4551823cb7651d016855009ba3664b052acd8f1e87b321a97f10bd893b508008e2262d6d2736558796b5f6278dc56176c26b630734a416a23b252dc3f8337f30 SHA512 e6f442673a54689ac5726114f23e8420b4a3605e07ce57b03cb387281974427230666d104663c647e9438a63330b1ec6ea7c35ea25684ed0a9607f0dd5f4fdca
 MISC metadata.xml 1076 BLAKE2B da1e831d74cde4db051a301cce34e8a64ade0f85accb892a72f5480db33ce3672542932b455b69f8cb7c0abf792799639f8c06c572e89a0abdba64561d2aa4f9 SHA512 6dc34ac81f2eef0a16be36407d29a91f341f19706a9660d751b5d4b289b44d6595f31260a4987b2cff22c4b02440cd07dfbcef48b1422da5ca96a5dcfdea510e
diff --git a/dev-perl/DateTime-Locale/DateTime-Locale-1.30.0.ebuild b/dev-perl/DateTime-Locale/DateTime-Locale-1.30.0.ebuild
index 300f5cf746f0..b1607f55e909 100644
--- a/dev-perl/DateTime-Locale/DateTime-Locale-1.30.0.ebuild
+++ b/dev-perl/DateTime-Locale/DateTime-Locale-1.30.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 ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/DateTime-Locale/Manifest b/dev-perl/DateTime-Locale/Manifest
index 16cef1e551a7..534c6a16e5d3 100644
--- a/dev-perl/DateTime-Locale/Manifest
+++ b/dev-perl/DateTime-Locale/Manifest
@@ -6,6 +6,6 @@ DIST DateTime-Locale-1.16.tar.gz 1228443 BLAKE2B 43b9bc0439d269dd29856538c87ff86
 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.20.0.ebuild 827 BLAKE2B f4aa41f7d581b7a7666807d7983521b318705335b623821d8d87a87dabfae3fb2ac55da2c8ac0f947604e0df537d6c2956c18a3b69e07fc52c7918e8c9965ea0 SHA512 827d35957b661b26ca6ec5d65c2cf3b00f3554c1e1aa264095775b8ac3d5c9d5301bfee3dc6f926cdebf8254baf6b2577e4e154c68fcd8acd13db65289e23f8b
-EBUILD DateTime-Locale-1.30.0.ebuild 850 BLAKE2B 2c3ba76cbf46368f46ee55059cb3c5275754694ce1fd812e548b9a453debf63937b8f666e394cc2277b4f03c97467578d87af7a55814cfd39ec5ee54f4255357 SHA512 ee1fade55099496df707b05f59c579f30e528152fb94afcf6726f2f91cce243364f5591334d04dd746824550cc9a6023c00c63ec201a74c4eebce87d72f8f2cb
+EBUILD DateTime-Locale-1.30.0.ebuild 842 BLAKE2B 202b22f94833330bb07115eea2c6259eeda491a86a27e3182c0d2ced2149f969e4a67c47422a0d25387fe95e18aa59c06b9b59d333a03d9c758f576d4d09c296 SHA512 0200afaaec2ac67b8ee290886a2586e59735e773043b3521fe913a08792dfd360feb42509a914ea1841c3e16ce1437e6b6879b04b93870d0a1695072ce1c69bd
 EBUILD DateTime-Locale-1.50.0.ebuild 867 BLAKE2B 2efbd20f5d48ef3dd9e0921ffebfa1a638df903ac65f5bba7fd9c1fbcb88520eeb6b92735b1a9a292080b7329839543a46e4fb8cb867e276bc67aa7c024daca9 SHA512 55be9caf6180a147e27475b2f9fd1bfc92faf55cb94c4475955bad66d9a0d91cdeb019771cc52557213afb4ed4284d2e2e1d318f0080cc74f2951764188044eb
 MISC metadata.xml 825 BLAKE2B e89d502ee3fe1ba2ff7e95050a8cc9d91960a013d91f49bd7cad3f611fd675ed646a71f44da3875f1396d786b0fceb533f35ea9df5c80b64b2c1a3eb236586de SHA512 75e572955930e34ee22c2ec03d03659883d12f64d3c1b2e55112f42bef46cf8ddaacbb92293a3e1a4fe3989bd962c682fb76fa021c8f88f95a1f921a5f8d3de6
diff --git a/dev-perl/DateTime-TimeZone/DateTime-TimeZone-2.10.0.ebuild b/dev-perl/DateTime-TimeZone/DateTime-TimeZone-2.10.0.ebuild
index 3c78317e063d..aa77a5e40163 100644
--- a/dev-perl/DateTime-TimeZone/DateTime-TimeZone-2.10.0.ebuild
+++ b/dev-perl/DateTime-TimeZone/DateTime-TimeZone-2.10.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="Time zone object base class and factory"
 
 SLOT="0"
-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 ~x86-solaris"
+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 ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/DateTime-TimeZone/Manifest b/dev-perl/DateTime-TimeZone/Manifest
index 25d43cb3afd1..077d033f7ef0 100644
--- a/dev-perl/DateTime-TimeZone/Manifest
+++ b/dev-perl/DateTime-TimeZone/Manifest
@@ -5,7 +5,7 @@ DIST DateTime-TimeZone-2.11.tar.gz 954800 BLAKE2B 9a0eeecce85efeb6de4df0d5be2372
 DIST DateTime-TimeZone-2.13.tar.gz 945446 BLAKE2B cbc715cdea59098c1cb6994a99b93785769b0a97c32260fd2c00a0caa48682cbb0280db02e68e7d9dea97d5a557baa9a37cad86d9518a30a7d760bc0f44447b6 SHA512 6003b2b6044c35a7c75840cf550d1f68500c1d762dc0ebdcf22e1714b68804382d2d969512d183c460fe89fe2fdbd8037463594536d6c3acee0ccf79734ac654
 EBUILD DateTime-TimeZone-1.930.0.ebuild 901 BLAKE2B d3d5804bfe298661d00300178078d56b4b145904ee3e9420edc42037c1cbec19c795f62e7c6a7d22aa9d5ddd4c4797177bee31dc5c9dff97343bd36acf8612cf SHA512 c03ddce50c6abc673f14744a46c2fbe6017888c0ac5a7c24bf2faf195d779854aa97d511215c2ebdb20c5e7f35b67c24cd7ac828036f3263f48d9bb21156fbbc
 EBUILD DateTime-TimeZone-1.940.0.ebuild 868 BLAKE2B 6a413c3af9bad6ed33d22c5d8211367e906f1de9ebb805572d48f5e13fbbe2974431e28c245f559e6aae6d7729975fb1fde32a36a6ac26ca94cdcc032917eb34 SHA512 095d3a8147841b8e9e5abf595b02f36d40b26da5956335156c5fcc1c2c3b651d621b23e227cd7e4c91e2dc13abce8197e27f4a88da1b1f726f2fd1af2d6271ab
-EBUILD DateTime-TimeZone-2.10.0.ebuild 868 BLAKE2B e154e9734c35f239f9fb683be3b7e3ffccfa34e184562cd748fa6536f0f41cda171c0e048e24d002bdd5e8218e52afcce2686597fd8921db12c3c16c7547548c SHA512 aacdf2009c6e27851bde690f5dff9c8fc3766be959f9cf9cfcea8078e73083d2d0e1fc0782cc0704c870ed9feaccf67b58ee3f30b2d158ba34b4e9b36eefc4e9
+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
 MISC metadata.xml 31072 BLAKE2B 180ff25ce0dbe3c72b21e789d1d2bfcda87a283cb955bf94e49ae1df99e1ab1c045fea5b23e7d351a9936130d39e9e2985805049f9053242f663e01bfe3dcdc5 SHA512 48a013c39c41bedd29a9a151a48afc237b59d491ae8542dc6881b918191b80e08a034a127c82108cf6e474509ff9ae28e797ec31285ce96f7dafa71aa9de7440
diff --git a/dev-perl/DateTime/DateTime-1.280.0.ebuild b/dev-perl/DateTime/DateTime-1.280.0.ebuild
index cf3160559fd4..b7c57e9f628e 100644
--- a/dev-perl/DateTime/DateTime-1.280.0.ebuild
+++ b/dev-perl/DateTime/DateTime-1.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=6
@@ -11,7 +11,7 @@ DESCRIPTION="A date and time object"
 
 LICENSE="Artistic-2"
 SLOT="0"
-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 ~x86-solaris"
+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 ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/DateTime/Manifest b/dev-perl/DateTime/Manifest
index 11b6291d13b1..9d39ea623946 100644
--- a/dev-perl/DateTime/Manifest
+++ b/dev-perl/DateTime/Manifest
@@ -6,7 +6,7 @@ DIST DateTime-1.42.tar.gz 239033 BLAKE2B fd4c20c30d7008cd70dfbd020fff3a0a90f9ea1
 DIST DateTime-1.44.tar.gz 239685 BLAKE2B 6d725244f1ef028a5860774b93c1e361e6cd14f6d6cff5a586ee8af6bd4c2fbb196b66884ec62878dbf585824d24e754092750e32cfaa57dc999307e4637e279 SHA512 a256efc26ad1f2859f3371b70e5edd0d962d2c19c54b746178e3945b1dc665621d09b7ac6be279c7e92b8aa91763c5df2d8ccbca1832ba69ac810feb8533ca71
 EBUILD DateTime-1.200.0.ebuild 909 BLAKE2B aef4abd96e35469b64d4a88ceb9abeadc316db2708c310766b57e028a8194d930f3a75380ec2c5d653011c24bc004d9bc55d372c461177fbf9a5e9f953e282d5 SHA512 b9e266a1e5541cfafbf2d52618c3d8ed86c41e6b4dc6dd8e4d759ab43b2417148fc47cb19a9911386e23457eece51e3011944447dda341c5ced1e1199d567e24
 EBUILD DateTime-1.210.0.ebuild 889 BLAKE2B 46389733076ebc01959e7320be5bc3e1b9b456ec7b2b4e7be6862f94d3d9224c4d2367d3b49d0167ec840a8a9d55c3f32fe772a563d02f1971ba6a214c91b7db SHA512 090dd3ea4034f7adac550ad01b16713ba0fca37e23dbde9898eb16921ec3d16dcd349bb94e70178009e140ce63a5d74fb36b0a168047caf3938721c6a2cdbd59
-EBUILD DateTime-1.280.0.ebuild 855 BLAKE2B a557c328e604c5fbbc29271e463481a8b03db49a4a43c282da43635f4e90de403574f3a8bb475be6941b71c423fa7a2e5014c75b562d2911835745a605356f7f SHA512 4f9ed172982bb2d30f6177145ec36717d840089930537ce63be5e5f6e0742033f513e52e0f58d70e1d90125adb47897c697772d7d06012ecf3a18bb3f17e66f4
+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
diff --git a/dev-perl/Devel-CheckCompiler/Devel-CheckCompiler-0.70.0.ebuild b/dev-perl/Devel-CheckCompiler/Devel-CheckCompiler-0.70.0.ebuild
index 6fcd41b8ebad..f84b5ccbf079 100644
--- a/dev-perl/Devel-CheckCompiler/Devel-CheckCompiler-0.70.0.ebuild
+++ b/dev-perl/Devel-CheckCompiler/Devel-CheckCompiler-0.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="Check the compiler's availability"
 
 SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ~x86"
+KEYWORDS="amd64 hppa ~ppc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Devel-CheckCompiler/Manifest b/dev-perl/Devel-CheckCompiler/Manifest
index ba5a349bd630..a3fc26d5aec3 100644
--- a/dev-perl/Devel-CheckCompiler/Manifest
+++ b/dev-perl/Devel-CheckCompiler/Manifest
@@ -1,3 +1,3 @@
 DIST Devel-CheckCompiler-0.07.tar.gz 11261 BLAKE2B 14321bacc94d45133e781007d644b9d4cbe0edba36a25cf15739e09bab214fd01b0b21616517bb7070f2082a17a22b7e925fde4cea0699cb6c30ae345a498138 SHA512 147fbdab382ff40bf1402d2d6be1143fe77403cd2444e854fdf11eb02e8acdcab8cb6bbdd7f3aef01cc64fac2862efaa044c5148c7770b84b464f7360c399d7a
-EBUILD Devel-CheckCompiler-0.70.0.ebuild 498 BLAKE2B 960886104f50ed1e19dc4941f457b98e00f08b66984aabce37c28d1a2c8f3c3e167dc3f658d54e4eedef56f8037bfeff19ce7e47c475f65fc104fa930ab50630 SHA512 30f6ad9deb7b66b2019e730d46be4d61421bcea0bddbcb646105b5004b0a5df0ac2a241ab586d4ef634d234f45f182c6399b6d537eff99f7b58944ac29ff7a8e
+EBUILD Devel-CheckCompiler-0.70.0.ebuild 494 BLAKE2B a83c0d4a479411a84b8cd8210e543d085912877d13d1e5099d92d6d30bcd9b1742343bb2658fef6d3cdb040c976cb28f5e89c4f85fe5b2e891327778bad65591 SHA512 cf7072cfb7f4eb8369042e1a1135baadc808aea62ca54009ddf47cc34760c88c550dd3ef821259ef37eeb717019a059fd87a0f780137cdbb26ad5b5721199784
 MISC metadata.xml 473 BLAKE2B 6a72a334871ba29f4279f17676bac22f26d393f45fb15aedf3afc1457c5f32fa83ed4606b007fdcb17b92f76f1e8827d95be4866356202eb50ce00297ed0faf3 SHA512 b3ec611f8b34ce584d67e24614695a34096923ecf2f5bea23764dc2f18881607eeb43e43ce6e24c143f3d82e7bbd963796d48e096a690a8d5eb10c6defd06335
diff --git a/dev-perl/Devel-CheckLib/Devel-CheckLib-1.110.0.ebuild b/dev-perl/Devel-CheckLib/Devel-CheckLib-1.110.0.ebuild
index 24e29782e89a..d3946bf0c052 100644
--- a/dev-perl/Devel-CheckLib/Devel-CheckLib-1.110.0.ebuild
+++ b/dev-perl/Devel-CheckLib/Devel-CheckLib-1.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="check that a library is available"
 
 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"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Devel-CheckLib/Manifest b/dev-perl/Devel-CheckLib/Manifest
index 92f361851da1..d64b374133f1 100644
--- a/dev-perl/Devel-CheckLib/Manifest
+++ b/dev-perl/Devel-CheckLib/Manifest
@@ -4,7 +4,7 @@ DIST Devel-CheckLib-1.09.tar.gz 15015 BLAKE2B 22918bd2c13fc2c4cc66f3d4cb272a8fa4
 DIST Devel-CheckLib-1.10.tar.gz 15158 BLAKE2B 07d9444275568561c0ae1d49f85959125845c77f59e43336728e2fc1025d55f7b45b8284747ac840eb9029de02589d9a8f092f884a77e50846c6b15ed998ff39 SHA512 aab565df0b31a08b2dff3fb777bc208ff9b8322d9012fb2deaa5d27411e4915cdd2e48cd65eb55323c69f23975e08cee8cfa4a8221a4b2e39770bdeecfe3f127
 DIST Devel-CheckLib-1.11.tar.gz 15209 BLAKE2B 786931bfcd453ce8233a3984e97b76d2761654e967dffa00b53bec5b5eb053421b0ffe29355f519de5492930ecbf7a1958cca984c5ce4a226ff01cf3878a3112 SHA512 21a64cb2ec4f3769d604eba151074daa841d40d2073a93ec186e82d8496f5ca05728c5352a31c4f07765956b85cb3144225edb51b84245b0582267af55ef2e2f
 EBUILD Devel-CheckLib-1.100.0.ebuild 570 BLAKE2B 77d64ac2537cf83539df5cff991acd3ad9dd1c84c3fc239aaf5c2898e21ccc934c48e5c3d3e6d323b15863efa11276aa1bbc6c85b440e751365696bfc3853415 SHA512 a6092dd3878c5b1c8550e5f1f79272b1e706630fe2a0dba35895bf89707fcaee30d0af27b272167556fb9530e0c319115d7cbb6ca0c735004a95a3f0cab49d83
-EBUILD Devel-CheckLib-1.110.0.ebuild 584 BLAKE2B 7d9eff8b7debebb81bae23f46d6affc7ae637c066159489cf1cb8617b2f0ffabfb3990f912eda733683f2e75bcf77435e02df2e7412817916db2e3258c9b8340 SHA512 cb23b5c16096b88cf5ec5b0c619e0042faf0e9fa2db51a62ccdb32eb5cc1fc33e0ef52e3febb13c40de23cdf8d932b11545780c56f84bee6483b72bf55b28ca0
+EBUILD Devel-CheckLib-1.110.0.ebuild 579 BLAKE2B b2795ec6a2233d4bf62f9fd9c0592094ba61e9c013bd196d1fcfec19c12eef85677236123631f36c6f6c0fdac1206a462adcd907be2d817009410b654bb6e953 SHA512 ad46a9a44679f821d1d4b8e6a2e254933ffb477c92bbe3dbf8787fb5fb600f653675b0928d9c42135c083d27716de614c2409fac57c01e8ea03ed42b9b50f521
 EBUILD Devel-CheckLib-1.60.0.ebuild 521 BLAKE2B f1d8ee2d5ffcd17f03f88546922771916af5f413e259cc5909d499e56d238293f12ed9d0e923b3074ee2298080dfc576aff02fbc5bfa471b7705844b2d787637 SHA512 499e778b5e4bc3882daccb1b8fb49cfa97f6bd7be0a3dbf0d0a4c80cb6f5c694da0fd1c8724e7f9bbba739b5d0051a8dd40a7435824886b9589cda495cc75efc
 EBUILD Devel-CheckLib-1.70.0.ebuild 525 BLAKE2B 9e84675b9caf7d5e752c6d08682dac4f88e029efc4259e5a5ffeb2f3b219873447318844b491d3e0186b4cd134388ab2ecfd39e398d77bb19258f5f84b730ff1 SHA512 ad9f831d74009ebe165087638352d757e445349a032e731fbd1e081ec6cb15de13fe870ef51aebaf6862460e3c3f64d17138f0669514c380078d69ba56d70887
 EBUILD Devel-CheckLib-1.90.0.ebuild 525 BLAKE2B 8d9d1a852ca926c8ff71aeacb27400e98f23eb0b278e21c9a50cc19d31135a393b118acc58df7f07004329e92ecd39a1445ef11c96e99ff3ae23d8fca5d68039 SHA512 2e4398f488fe89ba2667d20615e4834b404a682da88088a38a73da40b2fcb66bc0669afe540a9a04c10c69f7333501eea0160035ce64e0ed0956b7655869f26f
diff --git a/dev-perl/Email-Address-XS/Email-Address-XS-1.10.0.ebuild b/dev-perl/Email-Address-XS/Email-Address-XS-1.10.0.ebuild
index a9a1fb77def4..eec3f4e660cc 100644
--- a/dev-perl/Email-Address-XS/Email-Address-XS-1.10.0.ebuild
+++ b/dev-perl/Email-Address-XS/Email-Address-XS-1.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
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Parse and format RFC 2822 email addresses and groups"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc ppc64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Email-Address-XS/Manifest b/dev-perl/Email-Address-XS/Manifest
index 4f51067d017d..8c27797689af 100644
--- a/dev-perl/Email-Address-XS/Manifest
+++ b/dev-perl/Email-Address-XS/Manifest
@@ -1,3 +1,3 @@
 DIST Email-Address-XS-1.01.tar.gz 26805 BLAKE2B 657c9b33e2008ba35dbd46bde1fd11b90112f1d2afc422b2cb97c041067c5ac435e7662d8c083866b0e9efb98b94987bbe1a04d284c960a1fcd047cdc1badf36 SHA512 399d8365f2d9d642f482b5fcb4400cb66923f99938180ed1e68c3c7729d44eb53159889780ce6bb97857ab8ef3bc0c4f2dbe74ee453ab250e003761f66c28449
-EBUILD Email-Address-XS-1.10.0.ebuild 466 BLAKE2B 0eddeb9014d8812dffb22fd49d0b73ad310eca30a43ed1843c80da7816c4d0791b6fa4b0f5efc849fd676e59fede16df07a72a16b16760e2ce9a0d3b63acb037 SHA512 72e33ef290b0d71b067c78eff0c88f53f263a95a089e7b0302c7f29e6ce580a903513c5f6bf282fc7c33281fe6e941e071861cb18ece6916d0121dde923fe3cb
+EBUILD Email-Address-XS-1.10.0.ebuild 460 BLAKE2B 462f93aa141eea6afa8d628eee26743029c4308dfc58a326ff7aea8d58a4ce24020f4fab7c96bb2f004e6ffe94d41c8d59d08c4e7697aea471370d9522ee106a SHA512 3bdf770e950cdd2f43b9496e103ace6712d1a602671d5e0eaa71f07f21adcc0e3adfbe7292b58d48d49b5f69fd943878742f8218f5f5b3900a756d766fa37960
 MISC metadata.xml 405 BLAKE2B 3eb24bd0ba972e27de688c9a1c8afc1072ee6da64e4852424690934ed9e077b0f4ce045f0a5bdc24547b193bf1072294833eb4a09c1758c1326c46a37f4c59e3 SHA512 2324deca6b9252e105b7fa6475cb0f1b8743da67ff5a166432655f0c3a11fa60778964518876128000946b8413a2cdc9accd35a35119a0d060959e68360cbf73
diff --git a/dev-perl/Error/Error-0.170.250.ebuild b/dev-perl/Error/Error-0.170.250.ebuild
index f1f5699f6efa..887f3bd2d32f 100644
--- a/dev-perl/Error/Error-0.170.250.ebuild
+++ b/dev-perl/Error/Error-0.170.250.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 @@ 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 198eec8be14e..aa18f26ccce2 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 779 BLAKE2B 6c1a393c1836145b70a00f09f1fbddfc6535de78f930d89c9265389fcbd9af158b39709e919acb9d043563217753e7380b2663a6df4ef551a34a4edf3b3333cd SHA512 eef59dd5b37bb1ca33662f1bdea6d8d8918f2edd46681c0bdcea9a7023e2fb369155cff3715c4604bfcab1065d8428cbce425db18ecf373b23091d039f2c5c1d
+EBUILD Error-0.170.250.ebuild 770 BLAKE2B 05dd655d2bcc38c8ad485ddf62337ad02a52afd0f487a0bb75b3af91983f02bdeff608117b84b6e88554331df9542bc0ba702f23cf6f6daa05d95190c89b0976 SHA512 5269f7059e907bc485ac8b6dbeae1c9fbde2072670efa606c430bbf525927d8dab08dc10a49cefc49c7da248f31666e760eb97ee1640d765579bda5b44b907f8
 MISC metadata.xml 560 BLAKE2B 0d59c926b5fe430fcae8cf8431dd7a15c9e1144cae7ce86aecbf1ad44cea77c37e3d23e1a7f682b591dabdf48cfa7da235eae18a4edd104546b4b8b8c24a0e91 SHA512 348405f6cd75c3e1a5a5b21bcb3da8fd95a9ffc9117c2d4ca7c675cdc37437442edb9489689976712995e1956a1f722cb9f46e0228ff4735fd98fdf02d5957da
diff --git a/dev-perl/Expect/Expect-1.350.0.ebuild b/dev-perl/Expect/Expect-1.350.0.ebuild
index 930484b50b0a..b7a47120e21f 100644
--- a/dev-perl/Expect/Expect-1.350.0.ebuild
+++ b/dev-perl/Expect/Expect-1.350.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="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 7165675ba319..b11b8c231576 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 633 BLAKE2B 24de5a2689c27b939016a698c0ca5620bac9af55c6c038b81e579b656254c77f2e253906d606eb694ebfecca311034b8ab3cc49977ff77076f305d189141e8cf SHA512 4a2524693d711c8e47658d5a412962c5ecfc3c442fc820d40c416cd66708838237eb31e3807b881ddee6443633c84da953d5cc4efb5dc0b398dcd3f0c6a365e3
+EBUILD Expect-1.350.0.ebuild 624 BLAKE2B 6bd8301bab2a88133c5ac0b0ab95f770c1c1f2df3b7f58ac29d8f776c1a31a49b83882b21b51f17a36d9bc5e6f99c9570b811e0333884e703e58ba01093a96c2 SHA512 88c19af11610bbae35b39802bc701e5d4b5bce403460da60e1afe8a33efb3744b403fcc8396e04d02adcca1f796d5e91c5f8735a31366c09f22e1bac4c02cbf0
 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 813c9d6b2270..db1db574f1d0 100644
--- a/dev-perl/Exporter-Tiny/Exporter-Tiny-1.2.1.ebuild
+++ b/dev-perl/Exporter-Tiny/Exporter-Tiny-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=6
@@ -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 ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/Exporter-Tiny/Manifest b/dev-perl/Exporter-Tiny/Manifest
index dd71ade49bfc..b20b4f639a3c 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 688 BLAKE2B b1e6805771e9edbb8c434b28b535a8c2f4c53cd5cc9c4bf2c8880db5f113a0a85b36f9173337db08f55e749bb5db3364197448c1b83bee97ce684235160344a3 SHA512 12b35be9a140b58c7cea28153ef84c6849e119b06183882f0a09d6a87a59bd9f7857bf48bb311e53cf7f03e5a8d6e73f704e3ac7afc73f2a8f41b3259a1d3049
+EBUILD Exporter-Tiny-1.2.1.ebuild 680 BLAKE2B 1e13b2295e1477725760eb71e8ad75057ddfe0af67d23e673f136f1bf555bcf4fb32321676c8f9f6f53f4c3a5f97a06ea497bc54bfa5985089c14e66cf2736d5 SHA512 5fd4fa5ff954b906f0da07366759905d26acd85e8f1c3ab711abe9ad45bedd596417fce077226307e95c370cf134123000d35546c1c9c6290a12d3715671078a
 MISC metadata.xml 526 BLAKE2B ff3d85e25fb9fc01e22051e32193d99818a9ea73ed6ac8385ec4cb4a2734cb63e46c78c4c8467fdeacae7a66931fe608638080ca1eb5e615b926c4d35c9c494b SHA512 92bf9ce5fa1f9e099d8984eb0be24cfeb9596c50ce420f9d1c9e2ff62ed51ca2a7b23d95ae685ebd2657e5b607910d02492f0c93c6d0b926187ede4a35356679
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 d50e1a9dbcbb..4093b0eeaded 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
@@ -1,4 +1,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="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 c7af6452d1e0..f05de60d645a 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 465 BLAKE2B 8b558a74802080fb564948b8866ce039371d3f5e19ffbbdb35030e559b85e8a11e91f90cd6ce30733a77d4993440733033f6f7f9fe449ab19d5b972956bb3ad2 SHA512 13af63d353a9c84872b25832d0ed76ac6ba4caa1d5f390bfaf23e05d2c2c1b7c0dbc4263ee37eabe906364f55fa78d7da78b1d0eae9eae1c5eed2106159c41f7
+EBUILD ExtUtils-F77-1.200.0-r1.ebuild 457 BLAKE2B d168b85a809a660c13c85fe6de0c95c87cfa5897c64f1e9e7f14d33b6ba7a9a33a43d17d94aaacc6014f03cf14bf05544363893710d9e5d3f594290d38184f8e SHA512 538f76aae9bc365d7c7289ed065894f0503671625f798770653bb67a4c9214bfd62afe89143cfc63c16fd9548de89e6a78ce3113da47fb4e76fbbd4901e2e907
 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/Festival-Client-Async/Festival-Client-Async-0.30.300-r2.ebuild b/dev-perl/Festival-Client-Async/Festival-Client-Async-0.30.300-r2.ebuild
index 6427667e2dbb..715efd5d3f31 100644
--- a/dev-perl/Festival-Client-Async/Festival-Client-Async-0.30.300-r2.ebuild
+++ b/dev-perl/Festival-Client-Async/Festival-Client-Async-0.30.300-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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Non-blocking interface to a Festival server"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~sparc ~x86"
+KEYWORDS="~amd64 ia64 sparc x86"
 IUSE=""
 
 src_test() {
diff --git a/dev-perl/Festival-Client-Async/Manifest b/dev-perl/Festival-Client-Async/Manifest
index 0c4b9e42242f..9a37555be719 100644
--- a/dev-perl/Festival-Client-Async/Manifest
+++ b/dev-perl/Festival-Client-Async/Manifest
@@ -1,4 +1,4 @@
 DIST Festival-Client-Async-0.0303.tar.gz 30595 BLAKE2B 62de8dcfa5fd53dc88490f3af71bab7d3328c79b0d0dce07ce36624ccf9ab9a8e73abc661e547e1d9ef33d4466e99468eb841f68541a4ba5e5cf1ae61a7c95c0 SHA512 f71e453fb2a75154e03619726ec017bd646a60512912d2efaec896a5b835a80306fcc674ec09c48080e29212c2461684befc91d0f33140a822d6454ab3cb9bf4
 EBUILD Festival-Client-Async-0.30.300-r1.ebuild 304 BLAKE2B 9d93c654e75180fd2921341873cc6da81748a0444526bfd6cbbb6c8c13c1df6e403e9dafff59f8c6372c57e22b6de64441bf9cea2033d9e898e6fc415f70159a SHA512 6588a277e8fdab12f89ca8e254294d6ea960a34310f0cd92e6acb917685a2c62334ef0b6374966e0b668ff9805e11edc09bd4098d0ab64e0854f56fab682b33d
-EBUILD Festival-Client-Async-0.30.300-r2.ebuild 916 BLAKE2B 0ece8bdabddc18d1c26102b5e82796ba25b03b9e3c78e63002c6e8e0866fc04ed3b03cff230d1f763d0f60bb878ef2e7b61a256cc710754310c0816d9fd73b4c SHA512 1de09ecabb4f2fce21f15b9a09530cdb02678f6817d81f1f9168ab296b05966c43c13d3a2b43cf39989c642855e30c24566483a2c8ca07177bd6909f9230bb18
+EBUILD Festival-Client-Async-0.30.300-r2.ebuild 910 BLAKE2B ebb272ad4bb385c42064a873dd5269ba5d4a04bd15b51464e65ff06183369f8d0243be878abd2fc7e59f2991940a20cebbe1f2a248fa4b9b087ddf21a5762c69 SHA512 c75b287fee14bf68ff5ba3fba6b45eb46f44eb6f7aea9b65483e2a16579b7d5a69e309de9cedd82f82aee563f04487594dded1ba1b35014fc9a97e640070cb1c
 MISC metadata.xml 415 BLAKE2B c51a1f7f38be789cf00b75fbea70e2769361a0ebaed7218b2e95403e30aa1c6642009775f48822fd00c2b743c93cb13e0e4dd0783fc414c5c79d028df6a6e823 SHA512 ddea316bf48a38b161c399d4d6f25759488a43d04918813cd8f07d1ea8e786e31b6ddf1cc2c2bee798eedaf1054a1e7e23f1fbabbdc2978d03c57897d222f547
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 5e8c7dc0128a..b3ab23ba60a3 100644
--- a/dev-perl/File-BaseDir/File-BaseDir-0.70.0.ebuild
+++ b/dev-perl/File-BaseDir/File-BaseDir-0.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="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 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/File-BaseDir/Manifest b/dev-perl/File-BaseDir/Manifest
index d5d0c82e21da..1ac9c3854784 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 855 BLAKE2B cb6e2860fdeb53059f17d673aab2213a2a0ba10324248bcd3f155c5f181595c6f0cbb386cdf6d728c02ecbb987d721d7786bab4e9a8b3f898b8cbcca6ab3819a SHA512 93837129ca8928b60083fa615da92181ac1ac18ed9a8bef56ca2aa9b810303a02b349c19ed3e6e1a572eb7a9c5a393676c9fc1db8f7f6744169347ac07ecc5f3
+EBUILD File-BaseDir-0.70.0.ebuild 846 BLAKE2B 83da717bab1ced2da4286a5e7ae16d17f0be0b7f3bf4c5179d868d3b16276d42c7ff0092b0d7e95034a9d8d23e9183a6be8480c511e753d06b76df1a4934cbaa SHA512 18fb7c1ec5b5a8a62fee130ba1cb29e232d80eeef96bf246a74a1f3c7bb1f94692973494ec738db93ffadf226dd8e3b229f346fa2bb4ecc7392e95b30b4b19d9
 MISC metadata.xml 519 BLAKE2B 875987e9e16f33472bc355fa0b6dbe05f0659d134c2e095ff64c758f20a26ca6fecb3d413d8308c0b3e91d35c8c84c250152ace8eb81de928aa1bbb386859044 SHA512 1d6892e71323a869a4f1ed70c1c32c0877a3dedfc13c2d019e833c0a2b230dc434a99821852dd52a60e35dd44e5254e51e7f6930fb8478356b495fca77905fc9
diff --git a/dev-perl/File-Copy-Link/File-Copy-Link-0.140.0.ebuild b/dev-perl/File-Copy-Link/File-Copy-Link-0.140.0.ebuild
index 5f5e376ee2e6..af37c7578bd0 100644
--- a/dev-perl/File-Copy-Link/File-Copy-Link-0.140.0.ebuild
+++ b/dev-perl/File-Copy-Link/File-Copy-Link-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="Perl extension for replacing a link by a copy of the linked file"
 
 SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ~x86"
+KEYWORDS="amd64 hppa ~ppc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/File-Copy-Link/Manifest b/dev-perl/File-Copy-Link/Manifest
index bc5583db96da..ca3b386f9676 100644
--- a/dev-perl/File-Copy-Link/Manifest
+++ b/dev-perl/File-Copy-Link/Manifest
@@ -1,3 +1,3 @@
 DIST File-Copy-Link-0.140.tar.gz 11157 BLAKE2B 4f751ffef556ac7cedb57bf8189f4e57a1e64210327c9bd28401f52c63437a88418fc41f5c1f8624b7b3bb66496eced9a36a3ed3cc320e614a6b6cb9dfb28548 SHA512 d937d8353c4be3070591c7e28ea177e587326936cea6d84d895d0fd951e663e506c5680f0d8acad756972db7c70147b31078a2e2595bcab4bb56879b97f3c8b1
-EBUILD File-Copy-Link-0.140.0.ebuild 543 BLAKE2B 7f3f163e4d2285e0369f8e11f6feb799345ba140550978d7cde53f831a46fbbab159df00a23affbd5e31c10871d2571154f32632b36044ee280ea5ceddc3f587 SHA512 20c35446e3ef5ac5989ea94f86819771d152ecdf6835101f360a8128d4f62a6be841d9d039c292b5e6faadbdca2f4664a3426f9dc30f5d0b5479c8a7ba1e6b93
+EBUILD File-Copy-Link-0.140.0.ebuild 539 BLAKE2B fdc0799be9b458787685e0a5377d3acf34316142fe3407db3cc1aac1f162e39d1d8348c16d8d2e7f234e63a0e795951b6546d441313545de60bbbd760dd7fab9 SHA512 f1529464555334f96a795e14f8977ae494e395118a4d187eca5559e447cbcf6eecd8c3a35a9754b341608ae2f9f9f114b4333f4d9ea7a77038ca74744da77872
 MISC metadata.xml 1172 BLAKE2B c22400c6068f74c08ec59ab7607acd517478c1335dd6d1e30186490ed8be88b576009250c99891bd3104b944369e6dc6ac6cbca75aa072542128815ab9359310 SHA512 b1e74608a35c3c6b511186c1ef837bc515a682fdd9ddffcf4c76f5430f16616a1943c823ce9772c988eb12c150129c29241526969085e61b92db9c1ebf39889d
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 8f9d3e94e721..3655b5b9093e 100644
--- a/dev-perl/File-DesktopEntry/File-DesktopEntry-0.220.0.ebuild
+++ b/dev-perl/File-DesktopEntry/File-DesktopEntry-0.220.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="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 8b24f5588f7e..a5c8c052eda1 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 760 BLAKE2B 7d9137f919463dc52906673c6136fec685e24df9a8478128f41cd0b4befbd4b6b57413b69fe4e2fa64dd8ebd3d6fba1538a669fdb5787b5968c7b620114baef7 SHA512 627bd087f413d5a7e781b5351db5fbb65e736af947f9b6b664306637a93ef045de4050f4b9b5413036d0d79918e5fda3b4b6d9552d67702a825ee11cc838bc24
+EBUILD File-DesktopEntry-0.220.0.ebuild 751 BLAKE2B a0eacbd517bbbb9170e7cd8b391d1b030f1895dbed76b820655c47e7c9d8d3b5d125ccf3c461635d7407143735298cac17da30ee0b28c847b4819ff2dc49e48a SHA512 5e0a4c7a874989e7b40563cd55f5c880210912026ae78dc566fa1f16b3f71b49ab628be8ddf9943811cb65ba12f39d6c540bf8bb855ba113538162950875a264
 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-Share/File-Share-0.250.0.ebuild b/dev-perl/File-Share/File-Share-0.250.0.ebuild
index d57f05ebde4b..f284dd2dc340 100644
--- a/dev-perl/File-Share/File-Share-0.250.0.ebuild
+++ b/dev-perl/File-Share/File-Share-0.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=6
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Extend File::ShareDir to local libraries"
 SLOT="0"
-KEYWORDS="alpha amd64 ~ia64 ppc sparc x86"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
 IUSE="test"
 
 RDEPEND=">=dev-perl/File-ShareDir-1.30.0"
diff --git a/dev-perl/File-Share/Manifest b/dev-perl/File-Share/Manifest
index c8be9ab80999..e5e5038a2297 100644
--- a/dev-perl/File-Share/Manifest
+++ b/dev-perl/File-Share/Manifest
@@ -1,3 +1,3 @@
 DIST File-Share-0.25.tar.gz 13696 BLAKE2B 121c9e5fc2eda6aa76fc4ea3c12263305c375292fbee72f66ef271533a8f0643776b65672d05a36bd2b4e477791618921bf56e1b0356ef64c146cfc388eee9bd SHA512 7c9f9a341a5d2d397479a09da05136df1d0c6b9869da511e45ee75b49565218f2231fd1b45c61e68ab802402a95af02513c4c78ce72cf8205537d0e68f9b1e46
-EBUILD File-Share-0.250.0.ebuild 509 BLAKE2B 9d718304210e8b53e2774a8ad92b6de7b9f51864c36bf9683b339ca9df97329f3d795c96bc5f26f5b2b35d8cbf0ff95803f031fc538a20d6e60babe5247b5c9d SHA512 8da99955257ea6f1f6a0199942bc4d0b644a9ac3a608e88bec49b59f5da4153bfcb19f125ee3eae9cb8636d102e1f959b3875075726ba27e7e51941d5763aff3
+EBUILD File-Share-0.250.0.ebuild 505 BLAKE2B 2734dbcc35b6f81fa12c8d1d712530a6da225b612ee1fdef3f0ae56c48997f5f6abf73002aa6e998f1aae4d800ab1e1b5ada41b3c6bf77f2a23baae7027f0914 SHA512 217bcd57f12d7abf8f487184b8903fb1ef0cd326e9c9e585ff0c3ae6dd97967494512c5c4365392017fd25a13a51c94ad2c48b2df0231678e719b600a4a5071e
 MISC metadata.xml 392 BLAKE2B d00b1653b0f0da47f2617d0033d46ec22bfed36e2cbd71508d9eee7e3bfab001218aa3adcdadb226a355f763bb1d5a1f07eece27d6ee00ffe46dc1a24ade5f5f SHA512 474f9859d53b737274b943d3fe72fdd57576357107abd1824aff347b8ae5b831d1c221c4e569b473ec91da77183f37935de5bbf555d82a46ad2ecc4d52a492d9
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 cb525f19416e..8d53dd60e25e 100644
--- a/dev-perl/File-Which/File-Which-1.220.0.ebuild
+++ b/dev-perl/File-Which/File-Which-1.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="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 ~sparc-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 701d100149be..48124f91a7d2 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 681 BLAKE2B db12e7dc1e87bdbeee78fe0c5f3d9a47a49e2ce25f99a93dffe598729f2203476e263638a9f5984617db40496704bc7792e10d5f4a950936d8447258c2e5f07e SHA512 396c1b63c654412a251f9187839be6716a65b04c14cb3c565f873a65d96c3035b6b3f000223351421445da0059edef71941775e46917461f495730c74b0c75bd
+EBUILD File-Which-1.220.0.ebuild 677 BLAKE2B 127af8ed747e96bf18e3b47f2546f5f177a6c75ef1582b1bbbba5422a140b8c4886dbefa679ccecbf5472d343496872ee142a6741ccf43d3dcd528cb7e1951fc SHA512 4df6690cc4b339010a6f54fbf29dd9676581b5f651ff706a08bf0b79605023771041222995b8a1e51144de37682dffe2fa9bf9e5de6afb73725c3fd596d46872
 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/Hook-LexWrap/Hook-LexWrap-0.260.0.ebuild b/dev-perl/Hook-LexWrap/Hook-LexWrap-0.260.0.ebuild
index 14936965d8cf..0669e8dd8896 100644
--- a/dev-perl/Hook-LexWrap/Hook-LexWrap-0.260.0.ebuild
+++ b/dev-perl/Hook-LexWrap/Hook-LexWrap-0.260.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Lexically scoped subroutine wrappers"
 
 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/Hook-LexWrap/Manifest b/dev-perl/Hook-LexWrap/Manifest
index bb96f6f4149b..e1906869c3ad 100644
--- a/dev-perl/Hook-LexWrap/Manifest
+++ b/dev-perl/Hook-LexWrap/Manifest
@@ -1,5 +1,5 @@
 DIST Hook-LexWrap-0.25.tar.gz 29304 BLAKE2B a8a599b6be6a4b71c918cdcf0a2b7b51a3ee5eb8c73d5c383681e67e8fc09d726e48d5336022927dd69c5e99c5f9e7c3e53a85efdf8dc2c0eebd95845afc7783 SHA512 63623164ac67a33bd12ef771725a09647bdfe19d2f8eb84a0049ca0bdf4adc325143889a5751b1aefaca23eedb1a503ee42071b2fe3e7e3f033c148c0716eca9
 DIST Hook-LexWrap-0.26.tar.gz 29479 BLAKE2B 63c4128655342b752cb50347769674f40edaf633ea47b0dbb1f3fadc4bf9e1342bd810aab891f23e8d2c5918e4b4ebf2bae92f29910d6834da499e8e2a7c94e2 SHA512 f7771d4fb8379f43fa5b864e345f4526603914c3c486c637ea07fb9e2d41569bf40948a9039fab7d10c683fb85e16a8653876613903d34cc6801fcc9e92aa58b
 EBUILD Hook-LexWrap-0.250.0.ebuild 626 BLAKE2B 2e12c103ab22cd81990cebbd5fc0b84a3af548330d49e541ed7a047993f44be08bfb5a7fc303135d0792180bef8c53dcbe5fe6966357d7817b8c58ac25890c4b SHA512 08e2142757d8c9f8ba2b28b659f1e764c509a9790b5afd586c8708abd61c41e2ffd45d4c0ad400d1fcc9b8e7d36fda513025f1cf02dad9e3cf9887099d0830c5
-EBUILD Hook-LexWrap-0.260.0.ebuild 593 BLAKE2B 0288d69cce2472955e4ba85bf1a8856e148134ac12e6982c0d0329f9ac1940ee0ee081c89a7ea38178395ad0645b28f85c7296914d6e6a709b61626a8b62ad1a SHA512 ec20868fb09cf145339e0458784deac9262c7072eab33ef548433d8e3fe9fd49028251b67fac544913d73a5114cbd9efc032d0a3c2273e114b325783c9b66c1d
+EBUILD Hook-LexWrap-0.260.0.ebuild 592 BLAKE2B f466b3eb2e945386265be322154ddaf0cc8f16df02a698fa0bcaf4c923717b2f034b7092e4942688429495599c26b1bf524bcdc1187ea084f5897e57c4d02f8c SHA512 1dd39d363a6ea692c64648aa804251692ab2ebd900c52901d234311c80a14613eacdf134cab72848da96af926f55f6ed486de4ce48a4c95c660ea1521d6028a3
 MISC metadata.xml 396 BLAKE2B c39442ccfdfbec2b370fd16fcc3575c88d66e9ae77ec96935fab7c9797c072b3cf2417ca5799860c86d846db5d5b4a06f48a41ce848e40631f5b8e00eba80195 SHA512 ad99fa93dbb52689ea61dd31590e478da4c7dd7a1d384019aeb506d10f889882e32bc85567812b1a1625afae6ea56c57abad658a35f939655f8b362adf1eb8e6
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 7653cc946637..14531f4b3a08 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
@@ -1,4 +1,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="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 ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/IO-CaptureOutput/Manifest b/dev-perl/IO-CaptureOutput/Manifest
index e594f01fe158..ee374e7d87c5 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 614 BLAKE2B a705cb5a14623f860847e0bd305e1e445e8a0fcda8cbfbe4d7cb82737c77b921a8f35f6bb2592c1b102ca3d66b62c4d8aa5a129279fe4776ef48ba149b4c6c05 SHA512 aedfc0e117b21af547932a49a804f75fd9fbd809c1fa768f544887661d12205c8f0179425cd6e47cb7db7931112f976847d59de9580cb958a76fb5567c8ee559
+EBUILD IO-CaptureOutput-1.110.400-r1.ebuild 609 BLAKE2B 294dc4b376db1732069d04b7bdbcefb1970b9c774b6005c3f3ba920b90523d6f222bb0bfa85c1a4fcab0b330de85702fb3825f0020eca5a3fecf128ad214d55f SHA512 7e7482552b01c04836e7ab43332f362052b3ec0c28f4b04de978e78a374bb8d4e9d1fd5aad7804ac008183e6a8726bf66eccdbc662a27ee8ffc32b71c16af41a
 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 c7ab59e6bb16..d555e9867c2f 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
@@ -1,4 +1,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="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 e0ab4480b2ac..53ac2680606c 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 397 BLAKE2B 40573af475cf46456faa1419e73ee3fc051781cd938f99fd671f4564bac1c75eab66d82d1b30f658f49d1464784b4e4d46fb5213e80fb145e28ba92aaaaea70b SHA512 3536238c14a326c4a531590c40282606cc259a6e285f9d43a3d8460c38fac8312009e49212f86fe68215bef7d4f7b7b81ff56c9fbced7d6b0fb926ca1a1bf8dd
+EBUILD IO-Multiplex-1.160.0-r1.ebuild 389 BLAKE2B 8f2d78b49ed813d455d35ddae3fbf45ec1a74914d6ef2aa7bd187a9f764417e59b39c3cd0b9b559c85cbeaf924b7187c26da1443d649cc0701ec871fd9d36038 SHA512 62c12af7a8f1f8b10913877656bf6c82b51287ecd689766cdeca0767c522753fbd8ff380316a347877bcec8dfe7c57adc953bcdc73a3b6b90233029e1187c34d
 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 6671f604307b..02a4ae4aa42a 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
@@ -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 ~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 ~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 0e1cce1397d8..8793c01c8c7e 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 643 BLAKE2B 809182813dd2d665277f45cf4326c9f641ec83b6ff74e5850219116c7f185775df8f4ee2d45ad6531be9d0cc932aa08601f9176c58ea938a579bdc9c55765213 SHA512 7315523669248a095c848241a38e7c186d88b5944690242a7d814dcf15251932b604771ea9960e710ca3a4d0bf7fefc5e5266f6583456ea5ff3f3e2eb5a5136e
+EBUILD IO-Socket-INET6-2.720.0-r1.ebuild 688 BLAKE2B 67781b5041a76934536fbab5c020651c4a94b2ab10034c86284079dd099560a921856f04e3354efd3d9cb7d7f6f9c063c9e00808196493a30589ba8643329a81 SHA512 65c45047c06d95e746c26329551a3fb7c949c3eef20ba81c36c4d97e6e98a565f659541e08836bddc458ac88b8d28c4c396a5e2b5e88c43e2b87f85bcea150a5
 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 d932aa35d296..e30fe16a3e80 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
@@ -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="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 f169877ffb52..3ec3e7747bb7 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 812 BLAKE2B e055783fe8f1051c5f9cdb1220eeb73c997f9cdb4b84ab6afb9309ab20c995a23bcd027ab654867b74b245ad2c7c644dbac71ba11727f4d7b38e9682be0020d1 SHA512 139cba4a4a3d3a24b29fc719ea99f3d0f432c4110c7dd365284325870e1dc18c258f93cf92e46a9391742d0d0acf4c76f515c029d30437025cdee86da3aef216
+EBUILD IO-Socket-SSL-2.52.0.ebuild 803 BLAKE2B a18cc12480cfa224bb70a0b71667d12f61388691261a71305d5ea3ae79fc1a30e86f546e060f272c26509119d6c49aa2c93d5da7a513e8382af2d210a4198765 SHA512 b6bff429e3cb0a61a871edc225e37be053fef5f30ed1ed3d91ccabf7d36d9857c455b73ca514f3f729cc31281c523afe9799d79e223edc69c6fcfc0cf453e1b8
 MISC metadata.xml 994 BLAKE2B 4a4916d4a8b216f0eb6c82056f70732295918bdc80a2c3715be97568ef8e7d1084a42666db47f4b2bad4045e175aa45674fd4ed2c4ef4c6d38873434a2bc4640 SHA512 c861d564131ef33b1949718f73b16df3b14a801465f544e831b969b52d5c03bd0b4906416e99a92331ef08641d283099d1ab0352c29f90b4b835d46819c20c26
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 168c741cab7b..577981938ea5 100644
--- a/dev-perl/IPC-Run3/IPC-Run3-0.48.0.ebuild
+++ b/dev-perl/IPC-Run3/IPC-Run3-0.48.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 @@ 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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/IPC-Run3/Manifest b/dev-perl/IPC-Run3/Manifest
index e4b084884f53..4523c49d3c7f 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 560 BLAKE2B 7a8c259bb490a370222c7e00bad396f39def10c84e2b678f4d3bf132b87a43ea5a12c53795d4e968f605d5ae8e264883bab2454572137515320f24754d7baa45 SHA512 d3e662ddddff44c3076f5a4c79a4c08ca4e2ec12a3cef476ebb5332a9c2eb8002cf6b983060d7c8838dfb3870c0560f223d04af1c73d4a5dea7ed5caad6a937a
+EBUILD IPC-Run3-0.48.0.ebuild 556 BLAKE2B e579cb643b3c45bf600c56b8b08124e036b4233f23fc36e38e830ab94083d09ec2e589a3bd66e797815f2df7c5ce3f991dca9d260f49954debf2e32cc8f239cd SHA512 39f13275f31c64d9b3cc0b7a6824dd394d7a66d923fc2a25cc0f94ebbdaca3e07cd31a02137fb7f17bb4afc075ed19566c78b17a6c7c684fbbb7d13f487471be
 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 65cd434cbb7b..b537859507b8 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
@@ -1,4 +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="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 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/IPC-System-Simple/Manifest b/dev-perl/IPC-System-Simple/Manifest
index 4fa68ce24160..41d9178819ac 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 575 BLAKE2B 9e5f4f2c30d22f7f1f726f5482ba858e84ff40a3b1795ff0432524be40c8288c9d7ad7049ff4802023dd98d977e5c43c3b8dcab19ac919579e2a229078390705 SHA512 2d20759351474f2720652f99c0121e5245933668be4330ea96f041f889f43cf0064bb3c848207b34a2b10ec06ac866d6e35ab287c21a0a51e95c2d7577360f1b
+EBUILD IPC-System-Simple-1.250.0.ebuild 567 BLAKE2B c13ef76cd5a021a2cbffb1a9e63d09c83258d680b031b937afb4ac6cf92b9a93e0dda2551b2d11ed6d881c6c8dd6c67a4d2ae497a157523389d5d9bc370cb4d2 SHA512 b996811be6ba1daa8e88cd939497ab8e8f7b029251fafc99e096ecd0caf1fc834cec0843a174fb460a27b5bbb50909cc2bb61410460ac7bbfeaf317cd9dbd50e
 MISC metadata.xml 395 BLAKE2B 85e5ac1bea2549603f246cb86958de6be604eb17684095bb6836f0d880d184566dbd5905ff4d10e64c5ad5c7af3f073e583066955a2c0d9aefc30be309012373 SHA512 b7dea887b8f7f9b9911e9deeaa787dd80cabd1840b08432caadbc88ac685b6f7851678b8d5472eff11f66dc2beecc455d54521d086f6fe1fd73dc51e245f054b
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 83f947effa4e..ec1089410306 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/Mock-Config/Manifest b/dev-perl/Mock-Config/Manifest
index 4ff5699c4358..688347da0952 100644
--- a/dev-perl/Mock-Config/Manifest
+++ b/dev-perl/Mock-Config/Manifest
@@ -1,3 +1,3 @@
 DIST Mock-Config-0.03.tar.gz 6139 BLAKE2B 6104f182cacb2d73366ae7df98d7471ce8be01b94add0d16cfdcdd8c14e2f38781b9708a689d39f3ee701d1bf964f7af3563337e458bccef3a2a9b2e4fefbeb7 SHA512 6e61e8edc3226b133eb4b49358cccb45a8eb7da5b56eed0d75ce1503b5ef91c7ea84606ef3bd482e3ac8dc3d66226aa3065d835547b4e807729d909eae88c8c0
-EBUILD Mock-Config-0.30.0.ebuild 540 BLAKE2B d30f34d31afa56948014e8280f39ef9db5498bd8499ccbc2bbae5dbabf82a5188925b1127aaa4001cf364acdf7d9c8d82e8d3fe61e068799e391334daf380058 SHA512 e65434effaedeab62f7a459481caf9f06fb5833e3993e37d579dfffe0d947ad84ab7698c6b1c3e77eb79949a9a0a99cdf9b356819010c084c2ae94f62c427a28
+EBUILD Mock-Config-0.30.0.ebuild 535 BLAKE2B a128d643b271edc2790d4e645205c86615704d59899dd6450709107ebfe09ab2e6e17cbf6dbc150d1ea402ec460c745b1f6cda87c945457ec188498b3e5d54b1 SHA512 ddaa558e0d6289379049c2d3377e20f6596b9ef17349ded84bceff526c4268af93c3810b241491d682584c3cf2ce6f0846a6bcdf0f802d2515583d4fe72d6cea
 MISC metadata.xml 394 BLAKE2B 9d090491d856b5a252d8443901a4517bcf5661f883a367dcaf00a46871e9087f5acfdb18f4b538a6acd4c3eda42746c2e24e1491b7f5299d9b7194031715cc6d SHA512 d628864d69ac90706453bcfc60401207b223b271c808b7c1b727d17bee7ebad915e1cb302d07d0f029b02dad857e3fa10345a6eadc65f91ad384b849efc20c62
diff --git a/dev-perl/Mock-Config/Mock-Config-0.30.0.ebuild b/dev-perl/Mock-Config/Mock-Config-0.30.0.ebuild
index 9effced5b0ea..22b294944099 100644
--- a/dev-perl/Mock-Config/Mock-Config-0.30.0.ebuild
+++ b/dev-perl/Mock-Config/Mock-Config-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
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Temporarily set Config or XSConfig values"
 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"
 LICENSE="Artistic-2"
 IUSE="test"
 
diff --git a/dev-perl/Module-Build-XSUtil/Manifest b/dev-perl/Module-Build-XSUtil/Manifest
index 85204f1ec7af..b4e8bd0c3ab3 100644
--- a/dev-perl/Module-Build-XSUtil/Manifest
+++ b/dev-perl/Module-Build-XSUtil/Manifest
@@ -1,3 +1,3 @@
 DIST Module-Build-XSUtil-0.18.tar.gz 15200 BLAKE2B 04885b37ba0e9dea8a57269ec8352e525d5149c6ccfc905a075b9901da902f37c5ca1fa77b192aa3026bbfd5ee096cbdfeb5cb12ca3a4a5bf871a0536311f8c1 SHA512 ff2b9efd23a91e16ae95e6abc283e9c64e4eca9e1bfde3d6d2b95b052e5bcdf4d00baa6bf07d44dc6ffbf426eb73b2b83b52c60f5cd208862d35d006dec692be
-EBUILD Module-Build-XSUtil-0.180.0.ebuild 986 BLAKE2B bb567aab8815d461af006096ab37055c530516e079fb472c249d7b3748267043140ff9d803247c6641492ed8e75bd258dc3827e9b40a2ce337ddf9205e2985a9 SHA512 6049bd5fdaa6b7335008d6b4aaa23c905b23406483ad65a0091e60d39652749ef9c450786921583564653be2c1ede2d14facd15efc2c7bbb790f6328497f2f00
+EBUILD Module-Build-XSUtil-0.180.0.ebuild 982 BLAKE2B d3dd7357d6f5882fcd782c35e0a4ab7efb689a1c4d37ccc963793d69f34794523fc165c53738808d4f1e18909a2c888b3279d42c591e9bd79383b27dd736b864 SHA512 708ded52314da1ab4da33e9293812538e6e756440557a9dbbc67e3d438bcce52755707b1a42da2b889f8131729793a07f86a2f9f11005b7bf5dc9a2417c6d607
 MISC metadata.xml 411 BLAKE2B 1627cb3e870579d63bb01ac19928e9dbbc160bc7b3bf152d87ba2fd6ce2b285155deddc587943739877ed985ad2f909900865297e8361a5a577cd3239d23fc88 SHA512 431a75673c0fa2a510afd7fe371f5fcb4cc7988d81d9321aab878d901bb5b864f2d05864838cc15ad864dd53527aa502b8bddfe0684718320625b163df8362ef
diff --git a/dev-perl/Module-Build-XSUtil/Module-Build-XSUtil-0.180.0.ebuild b/dev-perl/Module-Build-XSUtil/Module-Build-XSUtil-0.180.0.ebuild
index 50eb0181ffaf..5ebf520bf5e6 100644
--- a/dev-perl/Module-Build-XSUtil/Module-Build-XSUtil-0.180.0.ebuild
+++ b/dev-perl/Module-Build-XSUtil/Module-Build-XSUtil-0.180.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 Module::Build class for building XS modules"
 
 SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ~x86"
+KEYWORDS="amd64 hppa ~ppc x86"
 IUSE="test examples"
 # File::Basename -> perl
 RDEPEND="
diff --git a/dev-perl/Mouse/Manifest b/dev-perl/Mouse/Manifest
index 292c805dde8d..b124190a57d6 100644
--- a/dev-perl/Mouse/Manifest
+++ b/dev-perl/Mouse/Manifest
@@ -1,3 +1,3 @@
 DIST Mouse-v2.4.10.tar.gz 222745 BLAKE2B 3d0f5d3c6f9183f67db24ec9859bd945080bf5f9f9aa370dfb6803a6d32e7e01e589540d24bdc0a0fe338a08d9f89845bd8ef060d381717ec709877de066f2c5 SHA512 57d797bed24ccea66307d95395bb7d5dd860c0bc41e25a7701cf5a16fdf28776dc7633a6b8bbb1bcf6684b930385da71bf2d44f777a211988a500e30bdf8e9e5
-EBUILD Mouse-2.4.10.ebuild 751 BLAKE2B d52b96d480321ba33306d7513cdb428c2af8ee6bb0f67c3bc11d8487180590d65ffb54f262b1ead53eb3b7f9f80bb3190f66de820cd5fd4cbc3bf04d22f67b7a SHA512 75792ff5c39491f9811698314c0fabd11681e08cabb31b228f29e3d13afbf308cf67402cbaf22e096d86cb4766cbe446ac30afcbb9d428eb3b629aa29b3efaf8
+EBUILD Mouse-2.4.10.ebuild 747 BLAKE2B ae8ac53162307f544ccfcd452a208903876f74a4023fb72d8e287cb6a91efac4b9a56ac86cadb2cc21302835383bf6d7fba073a688aec98e7ce88b6b8efe2d6a SHA512 bacfe7b63acd0a1b0b63a8263c33d68bce1507eb6386a8cadd38943858878e80e77832297020556e4e4c0ef584be48e0ea431c9f5a625e87deae31eb0559bf3d
 MISC metadata.xml 2262 BLAKE2B 0916b57428ea820a1ca71f1487de36dfa3441b86241b9d372c30f32014af2901b7a79cdb1a9b3ff16cbd0a98818b7316c7555277f9bbda8075a5f6aa20c0cbbd SHA512 3221d09e315f504d05902d6d1417902c6d1cb8bddc517c2a541191f40ce7891f93dee31fa8b6da4a871960ba7bba4a2e3ed281dea90c8b847b28c164ab97a48f
diff --git a/dev-perl/Mouse/Mouse-2.4.10.ebuild b/dev-perl/Mouse/Mouse-2.4.10.ebuild
index 0117abf194fe..0ec932468f8a 100644
--- a/dev-perl/Mouse/Mouse-2.4.10.ebuild
+++ b/dev-perl/Mouse/Mouse-2.4.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,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Moose minus the antlers"
 
 SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ~x86"
+KEYWORDS="amd64 hppa ~ppc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/MouseX-NativeTraits/Manifest b/dev-perl/MouseX-NativeTraits/Manifest
index 360223ac4661..bea9ba1f6d54 100644
--- a/dev-perl/MouseX-NativeTraits/Manifest
+++ b/dev-perl/MouseX-NativeTraits/Manifest
@@ -1,3 +1,3 @@
 DIST MouseX-NativeTraits-1.09.tar.gz 50322 BLAKE2B f8d2d81bc386d83da7ec335217f6b59b26a5b9b295285e16a29401202c28b64628cf53e390e4cfe171f85d0d68654b5b9c21ac0d835404d2c2e71fbaccacfc37 SHA512 2aad717c7c78c1014f705a85b8bb8cab79febb827aa478a0884bcdd4d8d702a366785bc6104ba115513c234b8ca71cafcbbbc070ba37d6328255fe1f972c3619
-EBUILD MouseX-NativeTraits-1.90.0-r2.ebuild 718 BLAKE2B 21156653f6c3f0f0f0ab410cc195ba9325ea2d3b8006e9412d59a38007a4036659d75d8a5873b48cae8194a353c4698e263db980556b0e5c6cd951f85e021fde SHA512 77e4ad7c107113c544cd48bb3c29151f324b8b0c07c36448fba283641102f9dd1b1582b756b3d2aa31b24ebe6fbe0a33d556d804a69317b1738df9f53d1e9381
+EBUILD MouseX-NativeTraits-1.90.0-r2.ebuild 713 BLAKE2B 8056dbc68260a8b40228fdddd0855292d3a931828f44c6fd43f74f3a410f911343b1bc02e2558668997a2c7b8189147a795893c7ad3fad38520ab87fb8141844 SHA512 11ab577b1586ccd546b3a43d0d0f31dc78256860b465ad3a08712fefd7b08ac43768105b75dffb77b22510cfac9eacf5efab538ed9398fe2e515c8d382996b02
 MISC metadata.xml 2364 BLAKE2B c6532279dd70a12125ce32c8bba7a864a4e5c8499386eb027c93e19611cf9bf37f32dfb78452c67c3492a3bfb1a23c7aba2651a34f228a7c9f3a0db357b32714 SHA512 89e91d4115edb18a15298ee555edc35e2fc1a75a6a3cb960d980883aad15bbd1c5f2e83bb25ad69bcbf562fd12425681108872b2abe2021b3cae7f842bde11c8
diff --git a/dev-perl/MouseX-NativeTraits/MouseX-NativeTraits-1.90.0-r2.ebuild b/dev-perl/MouseX-NativeTraits/MouseX-NativeTraits-1.90.0-r2.ebuild
index bda203b1611c..4700c9a2c63f 100644
--- a/dev-perl/MouseX-NativeTraits/MouseX-NativeTraits-1.90.0-r2.ebuild
+++ b/dev-perl/MouseX-NativeTraits/MouseX-NativeTraits-1.90.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
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="Extend your attribute interfaces for Mouse"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Net-CIDR-Lite/Manifest b/dev-perl/Net-CIDR-Lite/Manifest
index 47066df8b4b3..9938bc41d3b9 100644
--- a/dev-perl/Net-CIDR-Lite/Manifest
+++ b/dev-perl/Net-CIDR-Lite/Manifest
@@ -1,4 +1,4 @@
 DIST Net-CIDR-Lite-0.21.tar.gz 9931 BLAKE2B 50378fc1b032bb19cf8033ef6e884d8d623c91f1a0581763da483a031013b70ed36580304e1d2cabcbca1099d5e3062a7642b8aa2913ad1576cb9bf865f675bc SHA512 c8a5b00a26fb823e637825eac72ca7002f401a1a623d8b77b694848975124f24fba86830df8d41f6bdba4d2e2f0f93b2b155ac1511b607efa67942189614dc7c
-EBUILD Net-CIDR-Lite-0.210.0-r1.ebuild 526 BLAKE2B ea1c8a902d6e0f1134b5f77cbf5a4fd2f010bd10c333c9322f58ace2534172f743f21d5c1a016eb7a83d3cb7aade26744ea7427b60ad6337f80dc628bed62998 SHA512 cfc970a8c94a4d6cc69727e72bd1218a353df7419a404ec4f53df933b54987357217947c5b9c853963aa11673c310ba72ce1cb08739643d4837a36af08701e5e
+EBUILD Net-CIDR-Lite-0.210.0-r1.ebuild 522 BLAKE2B b50cfc9c5e8c20ba75e59f2140ff55bc16a11ae19c3bd3c6c3bd8e25c09d0683892bd878717fd687556a6c9927b916eb814a73ae9958e2efc11e35b3bf28ec7d SHA512 c81b30539f3d4d5ceb252d1b774e19af9ec666e0ffa9c70a6997e20162f8622c4835efa0d4e4ccab2f82a3876974b367dabaf91429fc03ccdad80e0a708cf8bc
 EBUILD Net-CIDR-Lite-0.210.0.ebuild 378 BLAKE2B 55b046ed69d84d2da0efbd258348e600f6473b52286ae94d43646a762801043efff1980199e7c6289ce13a603dc2487c1669dc69b429117792413bc7c46d3ddb SHA512 8f64f0526acbbe70bf3f42796afddf192f8b5d8d7afbede599b8ece16f87d9e1c50e4a08ce43bdb6663bffee132eab0c0939ff22aaaf5773ade0467a45ca52c8
 MISC metadata.xml 467 BLAKE2B ab893eecc1c077301285d29b33a5007ad21e15a0140f83620041599281c79221c6a00d2eede7f06e1ab9f9d23d38f05eab3e8b4f338afb2e11c597afec873783 SHA512 3ab581f43391e1f501e8c6bcf4b8d0adc640ab109ea7f948b201f2307636219bc781bc4b52ac0db2f012d8ae00789bba4925789120811b2f7a1aab5ff3fed7dd
diff --git a/dev-perl/Net-CIDR-Lite/Net-CIDR-Lite-0.210.0-r1.ebuild b/dev-perl/Net-CIDR-Lite/Net-CIDR-Lite-0.210.0-r1.ebuild
index 4a9f0e9e9339..4b725b64103d 100644
--- a/dev-perl/Net-CIDR-Lite/Net-CIDR-Lite-0.210.0-r1.ebuild
+++ b/dev-perl/Net-CIDR-Lite/Net-CIDR-Lite-0.210.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="Perl extension for merging IPv4 or IPv6 CIDR addresses"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/Net-DBus/Manifest b/dev-perl/Net-DBus/Manifest
index 8dc11b3045d1..dd54583793d5 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 612 BLAKE2B f4c7dadb2a291707d0e6e51047aae600e229499471a885614d291edf2a2c2f73efe60e66bd5fd9fcc677f2b845d01eeb7086d1f14343d2aaa972d7430ace1dfa SHA512 18cdd925425afdc16a15f09f11fa6e417d6819898255c384ec58d77a1404a942528cfe46fe7e081915ff76fc1ad17d0c039098ed99963831148706fe35f371de
+EBUILD Net-DBus-1.1.0.ebuild 611 BLAKE2B deef80b4720d9dc3d174d161f38544fd8de5c6bd342b0881d79f1c63a44d7429bc13984d369db1989f14c31a60095197d65bcc804ac9f4e3ebdc453c70669575 SHA512 c3d611d0a5829a043bbacdca59b492c12ac53b1f4a94a0c014a69ed1cac97ef040eedc262cdc9c45aca43a7bba08d1737edad80a85a8870c393e876b528bd58e
 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 51eb4ae67a9e..704153c795f9 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-Resolver-Programmable/Manifest b/dev-perl/Net-DNS-Resolver-Programmable/Manifest
index a4bac3534181..3814cdb04db4 100644
--- a/dev-perl/Net-DNS-Resolver-Programmable/Manifest
+++ b/dev-perl/Net-DNS-Resolver-Programmable/Manifest
@@ -1,5 +1,5 @@
 DIST Net-DNS-Resolver-Programmable-0.009.tar.gz 15770 BLAKE2B 10cc9fccc5a365f408139a2c1365fdb2a887fd99b6f21bdbfb0d27ba09750b8d0ed302f19f4425854e9ec0ab6f91697bd644bd1d5f8adc3810c839cf62cd30c9 SHA512 a9a239ff454ba186e2a00e578615d6b25075f4e1fde548893681c169d04571c1621b023ecd2ccbb95a8fff50d8b811c410212db31a1b78f2d62977a45e90a735
 DIST Net-DNS-Resolver-Programmable-v0.003.tar.gz 15974 BLAKE2B 02bc14b48dd2c89f68f3292efbfba44b70dbac2e0f8214987e6a22ff2cc6f535816a29c8c69fba335514011cab1e1d43b7826a1fb8d76e60f7707a283abc6f86 SHA512 65e3cfaff11172af7b22e203eb3acd8a0d85b4aeffc0426f3c69cd09c8cdadcd4341a2186bd58128985fd5a8ba4c695570dbfda8c4010d5a3c5b06f4e2de002f
 EBUILD Net-DNS-Resolver-Programmable-0.3.0-r1.ebuild 507 BLAKE2B f2c9d7a7327228f2587b97df26574091333d1f95cceefb9e529716f05649399fc2ab1ecb43fb66f7da23d4986786eb2bd9495e244fbf8fe16f7d34491d95725b SHA512 9cf8b9df8693d5e6f01a49cf4a0a3a9bf6d251b8abe8dc4e4d7f935e08e2590e81f0161ff4f40a967cced03294bc8bcdacce563ba38880772ad3436ed543dfc2
-EBUILD Net-DNS-Resolver-Programmable-0.9.0.ebuild 481 BLAKE2B 9c8bc99b05beba4378cd112158dbbcc22943f8b9b1bb87dbec5789ac66cbfebef987269e0cbb2edcbc547afa232cff0ce0b0732d4a7b301a10d5c26ed3ffb00a SHA512 018001881c70172c5f98f3804f30cf620c5676b5915d85ec1989e47ee79f6a522121608f6cf01cff2ac5b75dd7f8549f8a0c97da05cbd0801273b6b75d649cfa
+EBUILD Net-DNS-Resolver-Programmable-0.9.0.ebuild 477 BLAKE2B 845a302edc4a7ea2fea825723f146038663bd342b9ee7a554fdc1bdf45340cd6983f773ea363354a1a88fec36f0a9866b78b3b5b613b6aaab002332f559bf819 SHA512 c175bc622365445ea2c3c61718101a2723334aaa0fc26f4117e1d24089828b88df1cf90152d620f37c74c465ad8159a4482a73b728f99dc224a44b7bb5424320
 MISC metadata.xml 432 BLAKE2B 8bf4614ff7f500e972d71c3b89e838f7a1fb62a031362188b4b1cada8d38d02f831ffa599b706f459fc14fe17a155099e3a48e866ccd9c9213924ed03f1fd380 SHA512 e05a795adcf655269146a65a9349768c2843514ebf4ffd192f332ce26a0e55f80de06356b5b956feb1ab28bb8e41a50b6ce0bc272845ab0f331e3de2baf2947b
diff --git a/dev-perl/Net-DNS-Resolver-Programmable/Net-DNS-Resolver-Programmable-0.9.0.ebuild b/dev-perl/Net-DNS-Resolver-Programmable/Net-DNS-Resolver-Programmable-0.9.0.ebuild
index 9b4f8867497a..8d214de1ab76 100644
--- a/dev-perl/Net-DNS-Resolver-Programmable/Net-DNS-Resolver-Programmable-0.9.0.ebuild
+++ b/dev-perl/Net-DNS-Resolver-Programmable/Net-DNS-Resolver-Programmable-0.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="programmable DNS resolver class for offline emulation of DNS"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Net-HTTP/Manifest b/dev-perl/Net-HTTP/Manifest
index 8fab324a63cb..8234e9298c57 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 918 BLAKE2B 2e502bc139383ede16587e5652f11668d184e61e9200be41097558922eedc366728dbcf653fe0824f3e14526b1226c9bba7db297d8f59f110791132a24b3a1dc SHA512 46eca7acaee1fa448526613fd03b9bca6d9f9092ddf4922a011361d221af684406222bfcf060c29de49c514ba89898980df7916a01ca2a54f4aedd0847bece6f
+EBUILD Net-HTTP-6.170.0.ebuild 914 BLAKE2B 87bfc7e8b76cef41a02b09eb1935f72602e2564c9d8ff56f3ef363aa975170da796eb2567c6b0458041e940310e6cdc882562445b5d137cfaa4ac54033f50dd0 SHA512 44c378ce4c6edadcb94d285899782a75c0fbbd66cdaf680f76cf1ba6cbfa62eca6c72024ee86bd580c9647417294254d4ee5d81ce49154a484378a5078df5a4b
 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 dfff97706ebd..7267c60a5238 100644
--- a/dev-perl/Net-HTTP/Net-HTTP-6.170.0.ebuild
+++ b/dev-perl/Net-HTTP/Net-HTTP-6.170.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="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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="minimal test"
 
 RDEPEND="
diff --git a/dev-perl/Net-Ident/Manifest b/dev-perl/Net-Ident/Manifest
index e39347a273df..fb0737485d4b 100644
--- a/dev-perl/Net-Ident/Manifest
+++ b/dev-perl/Net-Ident/Manifest
@@ -1,4 +1,4 @@
 DIST Net-Ident-1.24.tar.gz 26691 BLAKE2B f3133efbd32d568d333351111e36eb0d1cf2be88d5babc78465152a82e77f3e56d47a0f7e945719ea64233086a85add1c9c8645292d959e63cd5a3f2a186fbf4 SHA512 877a2699964323b009dbdbab134bb329acf71758e48165f4d19bb8e49d0c02786f58ab32bb1bc2ff6c4d375d4b64128207cbbf3c858a6db2e30bd2733474d740
-EBUILD Net-Ident-1.240.0-r1.ebuild 560 BLAKE2B 2818132adf5d896502957b90632bfe9733aedd468e9d76316778ca9e578d89a65b9c882dc8801d3c3aa6035a74e0eccd324fbf7c1730d3c6d3752c570e3952b1 SHA512 0c980d6a615e0948fbc514af9f4f0561e74ca571e22b5056ebd5a5c301944f7c30575a7e44ed88deed99db1fec44ba60d5db7f02228a0ffafdc730bbd76e8d6a
+EBUILD Net-Ident-1.240.0-r1.ebuild 556 BLAKE2B 68f36fc6001ae36f44059e9b304b95b8f68ef0b5b03cf78706ffc2ff121ac93481cb114f9d4dd7854317036d95938d539c74ea9ba0f990d23c22add056675f5b SHA512 05234298e90abba4170b985ace8706bbc481254f2c23b48bcc8c1c62ea44fa8d98adbef5af4be70d1d2c677ad350f437b8790cb75c8710fa0f0dcad378e1cb60
 EBUILD Net-Ident-1.240.0.ebuild 372 BLAKE2B e0539cd9d9486ee537166106d36c14029a73997b526239755315679258037bd3e42711d11836040c0105749f0fe16d9625fd285213700e066c84c77f24a854a7 SHA512 295f6ec7c437be7f80e921d274302251e7f56b504f267adab16dc253cbea55fa125a4a452572e0edaa4f7c2bbafb115c86c6a5d487bf98270f467a78ef821d01
 MISC metadata.xml 390 BLAKE2B 5f3c71d090e39e5df3de9680b722396ad15c50ce7e16374000255aba2a237e0488409741dae7d9c24265bfd45a0a513f9c9a76ab62bf9bd0d670917dc5b38c3e SHA512 8cf5e0f58fbc82f98d9dd82acc2925b36c13f79325a7b7f38eaa6b298d0ae19e4667198dbcd2a0fc94eb6af159fa0e434fa8dbe8ae27656b1297303186d56c14
diff --git a/dev-perl/Net-Ident/Net-Ident-1.240.0-r1.ebuild b/dev-perl/Net-Ident/Net-Ident-1.240.0-r1.ebuild
index 096e6235376a..4701dca89281 100644
--- a/dev-perl/Net-Ident/Net-Ident-1.240.0-r1.ebuild
+++ b/dev-perl/Net-Ident/Net-Ident-1.240.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="lookup the username on the remote end of a TCP/IP connection"
 
 SLOT="0"
-KEYWORDS="amd64 hppa ~ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Net-RawIP/Manifest b/dev-perl/Net-RawIP/Manifest
index e6a55526eba3..45794cdd1abe 100644
--- a/dev-perl/Net-RawIP/Manifest
+++ b/dev-perl/Net-RawIP/Manifest
@@ -1,5 +1,5 @@
 AUX Net-RawIP-0.25-no-network-tests.patch 727 BLAKE2B 419aaa8355b63e5128698a5fc625c67c364371dd61c1f4d02e2259895591349a0e142c59828bbea3d92ec6bf46d1e1117b5574fc33b025c64ca63e4f880e8952 SHA512 df4d6b376637da7bef5786ae1dd443ef91cd1d8a75f6dac074674408629c8cde02bb8a5adb3494adbfe0d5554292693f4b4cb2dd1104ce5ab09c66f37ecebcf6
 DIST Net-RawIP-0.25.tar.gz 43474 BLAKE2B aa6b4f5e7a697bf0d64760ca5fa7cf199c09e178e509dd21bebe1a13d833351ca57396b840f2fe21aacf5f2216edd06688e9278e9744cb41312a7495648076e8 SHA512 c48c77389db9dc8d5c64d67e5c62bac5e3314dbc36bcfa51aa20d07224492edaa65f5c71d47ca0b804ac62b1b02387e172cd3561eadaa3a1a8040968b182b3ca
 EBUILD Net-RawIP-0.250.0-r1.ebuild 357 BLAKE2B bc69f5dbad7e69ddee2decd109328cf59af053de8a1f5e84e3aef228b39d0b6e1e7cf8d993b37c1fe47dd1ec3404ce42f941824f98a6887b7037f751a33edf7b SHA512 be0981c5cb41104611139f84c69ec52f36cdd1bb901529bbc31c1e6ebb03c5330928fb2d3c6047f9db6442839a39226a4c402e4bea5675d28c6993fb5b2eeceb
-EBUILD Net-RawIP-0.250.0-r2.ebuild 492 BLAKE2B 0bd035e5c5c2c543b1b4037b88fc979539c32270e4ed055fe972f2f5c2e9a4c36e0e869b88d0e9670aa5bf8875549b13f81a17ca5b7ba097998b869480c1bca0 SHA512 fcff417a135eba2d444299365b470a534faf65785883761cd42adc9cbf8484e94800151448eeb7c313394170080623d0432956c11159990b136071cb58259cf6
+EBUILD Net-RawIP-0.250.0-r2.ebuild 488 BLAKE2B e6b8136f48c0dcb8a72fae694126f39add707eb15eed499faee9037e3063cfe3bd4f1cbb9f79f5ef7ca9c9bad6bca80957aee0dd8efba88e648958020486aac7 SHA512 3688a867f85989e15d33851ea716608aa6f1308c49a77606104e554193974ef8e7f65dd7837373ac5c82409483259b9585a535604e320a7878995910ee22e480
 MISC metadata.xml 846 BLAKE2B 8cce702f40688fc23679abbae21602eb27c9d4d4674ae21c0fc0983100e81e3675a7781b1d2bb99d531ddf1ea4f5626ffa44509caedad8fa414710600f26a2cc SHA512 b3fec49c85d47f83582c905d0a17fa7c0b478a6753f89ad1ef14d7efc9d087665ab64582d649eaee61c0ae0b0f10424325a1e60f782f19abf41b5a94b25500cc
diff --git a/dev-perl/Net-RawIP/Net-RawIP-0.250.0-r2.ebuild b/dev-perl/Net-RawIP/Net-RawIP-0.250.0-r2.ebuild
index c739e94ee20d..e22a2458c31a 100644
--- a/dev-perl/Net-RawIP/Net-RawIP-0.250.0-r2.ebuild
+++ b/dev-perl/Net-RawIP/Net-RawIP-0.250.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 @@ inherit perl-module
 DESCRIPTION="Raw IP packets manipulation Module"
 
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ia64 ppc sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86"
 IUSE=""
 
 RDEPEND="net-libs/libpcap"
diff --git a/dev-perl/Net-SMTP-SSL/Manifest b/dev-perl/Net-SMTP-SSL/Manifest
index e637f4860e32..c2cc6ee549d6 100644
--- a/dev-perl/Net-SMTP-SSL/Manifest
+++ b/dev-perl/Net-SMTP-SSL/Manifest
@@ -1,5 +1,5 @@
 DIST Net-SMTP-SSL-1.03.tar.gz 2271 BLAKE2B 8f131527139a96155bb33c4b1c0530ba88955f08d4a7d1a2b8afec6119300b102c5ba0f4ac3757c216491b5aea9a3311a0b501a5a4dbb2d453ddf3abf3a18719 SHA512 71e766274745893cb6eddc91a4b24d7b538051974a2cd93d4abd8447daec72907b482edb25e628cfa480c99af935568c4765e85ddfc951e0ec9b2de25c366bc8
 DIST Net-SMTP-SSL-1.04.tar.gz 2457 BLAKE2B a55dea686b5dd6b0ecdf025a40a71f8a87fc8fdb8cab49b6e310c1bca8a513945ca33914d762174a907ec5f146765f7aea0f70f59be4e9fee88051d2bf9c8ba5 SHA512 dfbf59e5d895add19f5684c999c941ab56a58be39492a02e5a9bdac47039bf388279eda734c6b0422d228ac14efed899b3572561e6a34cfd9582423252efb509
 EBUILD Net-SMTP-SSL-1.30.0.ebuild 656 BLAKE2B 11c2a134a482055bcc1bbb7a11087c15f1a5281de19dd6c8007802e3c411520f912a4f8c3d202bc132819b86a175ad7efec63c98d2c5d6b622403f195c2e53e7 SHA512 4665243b12d15417ae9cad88dc20bdb385e43db8bf8bf37db11b5bd3cfa6acf79eaee3468987290895ae5774383c8476948e9255badc2637813eb12e3e03d9b8
-EBUILD Net-SMTP-SSL-1.40.0.ebuild 1003 BLAKE2B 656275996fc826ab6115914d56e54c977ad3cd0d510fa5a25dba09b4977255f209d6bb3163695af15dd9e62ce68d26644d6cf3abeccf3ec4f073dd6b0e95b24a SHA512 ec7f05dbb6742ddf264544e3d8be4a90e73056ac616729783074568694a663b381452af98913437f8b542c9eef2869d9951fb372b89b0f2a08385304195b34e6
+EBUILD Net-SMTP-SSL-1.40.0.ebuild 999 BLAKE2B 6179f3cad697b33ddd623cdea54870a023439671c76e20e33f7cd962a47e1d4b26cb5b11e3f5467af256512deb5cb152a90fa8e79fbedffa25996d5d16a2debb SHA512 f98abc8ef80fe7e4e1ca1b7efb01725fbc5b7b03f22712f86d7bcea7b4c7769e9c96ed6ca9ce6c8ccb92dab342fa85a40ef75de57b75866313a5622c19f27c3d
 MISC metadata.xml 397 BLAKE2B d7303f80c582df42de65102844f16f8472b73945783da5e22e6fd4c953f43cba9b5d9d6a05f2addb1e7d64466a0b391a754694b89e778d85fc26d810e94e61f6 SHA512 fa14f661a6de196fecb439768409f142a6460928a42a191deee1c63febae99861143699013df1a9700a42e861aa3bc90f10c704c3f08eb186152dd2c72b1e7c7
diff --git a/dev-perl/Net-SMTP-SSL/Net-SMTP-SSL-1.40.0.ebuild b/dev-perl/Net-SMTP-SSL/Net-SMTP-SSL-1.40.0.ebuild
index f5a864fd55e3..b11012b94c05 100644
--- a/dev-perl/Net-SMTP-SSL/Net-SMTP-SSL-1.40.0.ebuild
+++ b/dev-perl/Net-SMTP-SSL/Net-SMTP-SSL-1.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="(Deprecated) SSL support for Net::SMTP"
 
 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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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-SNMP/Manifest b/dev-perl/Net-SNMP/Manifest
index ec9562eaf393..0a4e6823c663 100644
--- a/dev-perl/Net-SNMP/Manifest
+++ b/dev-perl/Net-SNMP/Manifest
@@ -1,4 +1,4 @@
 DIST Net-SNMP-v6.0.1.tar.gz 94664 BLAKE2B c9ad2568fbef3ef880902fd6b073149312b7cfb24c570a96f8a7f48d1264f939ce29214ff809a37d6d53e065ff2aa978475e9a66c6c383b35186106bf23483ce SHA512 5e38d4a934661201d42fd4a2d08aeca8c4522e0e430303eec7af38d16ea0aee131a4ec563bf87874376fe4995a674a24451f2a12b71a9c51ed3632e6f65314df
 EBUILD Net-SNMP-6.0.1-r1.ebuild 733 BLAKE2B 7046a9f6724f6e480b4c249b135aeffe9deb7c36c0cf5c96d021c101209ece8d3cb3a2676b03f75c09a05767a76aee542f75475860e305303d9a990825eae5f2 SHA512 a9fce9eec2ac305854745a77d0143e0b6003f44567b758342b78b8e4e87189e7c071f693b479a8a43c88ae649d6c3623ceb3a3197f13ba880e6d79a0d312196d
-EBUILD Net-SNMP-6.0.1-r2.ebuild 944 BLAKE2B 6d34ca4f4d3b03d0a915700d1811b4057af5355d148d064ab8afc83b9ba271700d31030f82ce8b55f0d1f1081da922cd4d72b95d3a1a1a9e9601998dfc058916 SHA512 1714e3a58530b9b22d8ee8f1ddf7c57726b41e2d567b040c0ff12164d6bf6f539d5baee9da0476e34b5cf1413f286cf1de40c29fee77d0751f1e4165dd285de9
+EBUILD Net-SNMP-6.0.1-r2.ebuild 940 BLAKE2B 2d4a2ad397faa2ead1c7cb89923afb8bb3e5b3231e10d499a20be70a28437672ebe6ff19c89fb763177b5f1357f1ca27bcf611f4e9ea85bc9f5b2779d1e3c2eb SHA512 a3a785a763728f388cd5cbd60eecd52bed2182b9ac393c29998fcf6ef5cecb43f6f7ea8eba61196d7832f8eb060b72d4fcf121e4c50ac0c579b9b0c8ca6a1c6f
 MISC metadata.xml 1396 BLAKE2B 0737facf9eeed6c09186b5e4ebbebbf1e6eb87946dcf2baf9417f98547747f1ba55b94a4ace8553bac806183609e4a9caed189e4118c03f2a611eadac9c034c0 SHA512 d0c2b6a1dbd9ab196e6ce8bd616abfb093a9e7bba7ac58704c14c31ed0bc5aa40db07715e2b82f3d2e2696b785e8dc6b0981c65c0f8ddd3bc7b8dc56eb5bba38
diff --git a/dev-perl/Net-SNMP/Net-SNMP-6.0.1-r2.ebuild b/dev-perl/Net-SNMP/Net-SNMP-6.0.1-r2.ebuild
index c16d12df4939..5b1473fc08f0 100644
--- a/dev-perl/Net-SNMP/Net-SNMP-6.0.1-r2.ebuild
+++ b/dev-perl/Net-SNMP/Net-SNMP-6.0.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A SNMP Perl Module"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~sparc-solaris ~x86-solaris"
 # Package warrants IUSE examples
 IUSE="examples test minimal"
 
diff --git a/dev-perl/Net-SNPP/Manifest b/dev-perl/Net-SNPP/Manifest
index 790c36658dd1..bdbaee0877af 100644
--- a/dev-perl/Net-SNPP/Manifest
+++ b/dev-perl/Net-SNPP/Manifest
@@ -1,5 +1,5 @@
 AUX Net-SNPP-1.17-dummy-timeout.patch 1307 BLAKE2B c69dc13842f2ef0eca4c974bbc0c36dbc68df2ed522d0c91d8c191091bd86d1b90d30912428ce59f039d8462e84dd8c8a3209d8ea7324fd1b62905a4952e7ba6 SHA512 82320a2c40a25a66365c9375470782c7f4f609da3b0509115cde2540d011d147c7d0980794d9807cd2370ed990b7b8da14d4f519d5bfad45584fd962b7398a72
 DIST Net-SNPP-1.17.tar.gz 16099 BLAKE2B fb6a2186f1621b9ce06af45e707f8da8816a7e20412cb92082625fa3cdbe2ca135cd3dc4149c9f427c27f72341785d86f22417117a017034da73477d03ec82e9 SHA512 aa1e47736226cc528513f5339579aa20f1aabbc5c0ddee2e4ca24beb0f797f50805fcf547fc6b8d0564be9331256706894d2619ee5a32c574a21d3738d86dcda
 EBUILD Net-SNPP-1.170.0-r1.ebuild 299 BLAKE2B 4b0bf1d8b248595367e2bb2d2cf0abd0f83200e1e00888aaa65b53156d255791df545998bfaea4572c29c56751b93b5e0da76e17eca1a935cbd43eb49c8063a9 SHA512 8f44772cb6d4db1336b1be4c4cd9ad5f691997a071234ef6996fa047bb24b3ba66a8a880d9e45593fdec8dac30b971ebc0541acabf661d2d5b68fcaff914373b
-EBUILD Net-SNPP-1.170.0-r2.ebuild 397 BLAKE2B e28e3194fcaefc4cc63a44c14b222a626f9a5f948b73ed5f1975f293589bbfaef46b067f094467270abde1c97792875665f11f5c43d422924373e5f664a1a394 SHA512 b6013f9890441e568b8ba64c63772227a0c91cac1c59fa12e94d646f63320d6b3d9fa3cb955ddcab780af92f38c84d9d4f2f201980598c192704c20e0e4942b4
+EBUILD Net-SNPP-1.170.0-r2.ebuild 393 BLAKE2B 2eb971c8d5b6032fbb4f0553767bd2fb11385c9592223fefd23670e87ae07343faafe942e377d845fe0175fe0f883db6276ed530b27505edf67f09b75fded248 SHA512 ed14a12232d68d7c6042633429c640494aced0133ffd8e028e10ed7db86b88e681a0c7c9c2d5f2c6721f76d0ca729c9a26218ab07183de16b0dc6f32fd5b5eb9
 MISC metadata.xml 517 BLAKE2B 394f23e47bc0b3c4262ad7e7db40b5d166a67ee184f77f6e3a8906895b78e58e3ff685e4f39ff5c6318666386e7c041bc99570f646f9fcc27a1089b095e2440b SHA512 56c7df829746577210954b5a9442935a3cd964f3cc226165d3b8946a23f0cb1ab57731a6dbdef95454e051cb84dbd089a457769da842f1fc96db4ad33e4cca7e
diff --git a/dev-perl/Net-SNPP/Net-SNPP-1.170.0-r2.ebuild b/dev-perl/Net-SNPP/Net-SNPP-1.170.0-r2.ebuild
index 547fca6579b4..1684e331f399 100644
--- a/dev-perl/Net-SNPP/Net-SNPP-1.170.0-r2.ebuild
+++ b/dev-perl/Net-SNPP/Net-SNPP-1.170.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 @@ inherit perl-module
 DESCRIPTION="libnet SNPP component"
 
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc sparc x86"
+KEYWORDS="amd64 ia64 ppc sparc x86"
 IUSE=""
 
 RDEPEND="virtual/perl-libnet"
diff --git a/dev-perl/Net-Telnet-Cisco/Manifest b/dev-perl/Net-Telnet-Cisco/Manifest
index b10015b12e89..9680d94506dc 100644
--- a/dev-perl/Net-Telnet-Cisco/Manifest
+++ b/dev-perl/Net-Telnet-Cisco/Manifest
@@ -3,5 +3,5 @@ AUX Net-Telnet-Cisco-1.11-no-interactive-test.patch 3561 BLAKE2B 32e91eb50abf5bb
 DIST Net-Telnet-Cisco-1.10.tar.gz 17579 BLAKE2B 0fd21fcb58d7d0b8474df3e04b28cc8e2ae978f1d02f2c050bc9974b39f1b531ff159f9282aec9d17ddae309ff902a0a5eeacdf9903acfd5ee503f803d9cdb00 SHA512 1fcae8e54425a2ddf2e32c772886af97d308421eb664abb296ec16e97531c2eb6727ea4607d48fa957e9a926dc5b88bfffdfa75da10793f4f0247fa3b1f45672
 DIST Net-Telnet-Cisco-1.11.tar.gz 19282 BLAKE2B 39925b96a8d709f58012c12ec368c48a54549a324ae0fbcdc4cf97daed034b6cb76639b3fda1c3b77824e5c702f6b8e5abc4093558888788ce6cac19342575c4 SHA512 b12da84517df470d40d56a54e8d8c7b331bed87c3c330da7fc1efb7d078805e6f7348f0b52971d3c1b4e3d39014d76bbe7535c40ad3afa7efcf567521ddf0c4b
 EBUILD Net-Telnet-Cisco-1.100.0-r1.ebuild 434 BLAKE2B 5323a16af3001c0437af5fc9abc7d85aa653770bcbacc6f6d8d0f732281a2e4b69abd52f884a8a2d788807ea13d92c34d25f7af2531808c716d4a977f93168ba SHA512 33de8f4bf3fe849a47a2f242108b5f749814c1f49d808e19a954bf7321ee08db3aa8c040776801b3bbd1e7d0349b90fad9a3f7c3bb08ae3ef3728ba9a6993c87
-EBUILD Net-Telnet-Cisco-1.110.0.ebuild 839 BLAKE2B 424182b78498fa9e1ed0082e6fe0b071d6b823791f43af8c0f6f09f45db288d013cb9482c8cf2cb7a5bdaa7d530f5679474e2b1c68446dac01d9ff2fca5301c4 SHA512 83ef474fbec038748510e9f9fd02d47a312f338d95a87360787e276f7c260981573b3f73d12726fe1aafa004ff1f36746aeb8a607702d88e9851b1b17693048a
+EBUILD Net-Telnet-Cisco-1.110.0.ebuild 835 BLAKE2B d79ce552f4c54ae722e740854f5dc156046252f7c0483bbff867ae273072c35fa020e5176608d47b1a6d709daae58441fa8a29790dcdaa2b58631af0c618fab0 SHA512 97698856c3612012deac93708a0ef788c12d94cb0f888eef8e6ecd6a1e7b47ca133c13a2cc0822e9eab63493e43b79c1a4540a3568ba2881a92cbf33af9974c2
 MISC metadata.xml 405 BLAKE2B 69bc843b13f3d936e191bc1a233e73d7e53567a18e272199fe14b5959d594158835de317f754c2edd20031e1987ab1a67385e7a8f68f72e5059c76418da05bb8 SHA512 8d84c7d06d47dc52c1a9a8f5fa64bf013283a1dad3b3e112d3ed0c8a16d367e04eb5c12326f97448771ac9b340863ad5a11f51b6a427271d15f2f62029787c75
diff --git a/dev-perl/Net-Telnet-Cisco/Net-Telnet-Cisco-1.110.0.ebuild b/dev-perl/Net-Telnet-Cisco/Net-Telnet-Cisco-1.110.0.ebuild
index 0a2b2f42a12d..8a122f1ff5e1 100644
--- a/dev-perl/Net-Telnet-Cisco/Net-Telnet-Cisco-1.110.0.ebuild
+++ b/dev-perl/Net-Telnet-Cisco/Net-Telnet-Cisco-1.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="Automate telnet sessions w/ routers&switches"
 
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ia64 ~mips ~ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ~ppc ppc64 sparc x86"
 IUSE="test"
 
 RDEPEND=">=dev-perl/Net-Telnet-3.20.0"
diff --git a/dev-perl/NetAddr-IP/Manifest b/dev-perl/NetAddr-IP/Manifest
index 5bca56763448..b1ab9a13c442 100644
--- a/dev-perl/NetAddr-IP/Manifest
+++ b/dev-perl/NetAddr-IP/Manifest
@@ -2,5 +2,5 @@ AUX NetAddr-IP-4.079-no-sleep.patch 1392 BLAKE2B 156aa6d8fce49843c82a682197df449
 DIST NetAddr-IP-4.078.tar.gz 213358 BLAKE2B aa0c040f3ecf6b57184ec5c4dc2c3b18b1def5bc955f72bc8cd8f31e42a7b139039cd6b95f712bd7ca857e21c5b388a282275c1f77ec433a6018e2663c621228 SHA512 37ca056da216ead336ea3b3ce791ef804fc26d54c45a40eefc3adb662dfe02d7ac8618128eba8eff9ebc0be4a3b511fed14363ca63eb99e7e2b0e44416948311
 DIST NetAddr-IP-4.079.tar.gz 213896 BLAKE2B e0e54e5fc944591801faeb7bd28187579e72458240dc40d847b3efb1bd5136ccfa8993c6a74a1d8b01970f20495b0655dbc865be44f3de714896c07ee06e203f SHA512 8ebc8ffb914cf72c041441f96de0e9c982eebdb8c26dbf15f885d0113b3634e4851d81f13f555c14d1fdf0ab95ae2ce880ed124e6c200e391adae3b1d6d3eb65
 EBUILD NetAddr-IP-4.78.0.ebuild 554 BLAKE2B a57d4009b9128ede990ab029519954b46182012028f4ebf6b16d303c0ea3d28de87ed39b5ee79e92dfcc24b1bfc19fcb39c48ec8f1aa64ef2a9b5bc3a127d158 SHA512 d7f4914a7be5f9bf5ea5c4632b73f14aa235d9f24190e4b60f5ad82033e3d0788eb2f848976aad6e3767b2063861e26426e0641e170d96194daeb3b1b3685c60
-EBUILD NetAddr-IP-4.79.0.ebuild 549 BLAKE2B 7a4418e82c2256e6cf728db83d8fede5789eb378a7e2cc6c60ab798d0058faaabedff4cbaeb537e1dd8bc8ed0c124f6159d9352899a0621432085a78dd118422 SHA512 93e040118e4388a725ffaf0318684f45008b37ed6850dcdc6a416848a8a2968f5f1f4671bfaa4a7f3977ffc68607d7358f84b04655e31be2d85220ed3c76187f
+EBUILD NetAddr-IP-4.79.0.ebuild 545 BLAKE2B 3bdb9ce7db930910a83372d3493a185a7996b8eb681cac7c79bc2d3fe1c31bf2d3bb5937d8ab93e78f731b628d342397afe806ed75824cd86c38bf93e4a58d3d SHA512 8b8b58cff7677e56e8d7342f475ec1b646f60ba2b9f9986add18f56c20adc368261f015eeed6f4d070f154d9dad1ac9e1061cc46bf379052c37d48de87bb1966
 MISC metadata.xml 793 BLAKE2B c526374a9aa351bb92b44cd5a5942c6bc453b0f89344c75852ed3385648668892d8d2e0dc2f389f67a1839f765501983e7e321d26f60e59c24ce247ef09bc6a4 SHA512 edfd50c703ae7fb8349cb69172723b2a640aff63e51a59e85d4f416691bd55eec954de4d5040801e3f65d9d09dec5886b9570f10e2b99289c713d46b93923edc
diff --git a/dev-perl/NetAddr-IP/NetAddr-IP-4.79.0.ebuild b/dev-perl/NetAddr-IP/NetAddr-IP-4.79.0.ebuild
index 730cd28f7772..ede433380a21 100644
--- a/dev-perl/NetAddr-IP/NetAddr-IP-4.79.0.ebuild
+++ b/dev-perl/NetAddr-IP/NetAddr-IP-4.79.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="Manipulation and operations on IP addresses"
 
 SLOT="0"
 LICENSE="|| ( Artistic GPL-2 )"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd"
 IUSE="ipv6 test"
 
 RDEPEND="ipv6? ( dev-perl/Socket6 )"
diff --git a/dev-perl/PDF-Create/Manifest b/dev-perl/PDF-Create/Manifest
index 40ad13c79624..be0e2f4a5f40 100644
--- a/dev-perl/PDF-Create/Manifest
+++ b/dev-perl/PDF-Create/Manifest
@@ -3,5 +3,5 @@ DIST PDF-Create-1.42.tar.gz 120952 BLAKE2B f9a21cb4a21fb9cd570f2addc9a038b767e2b
 DIST PDF-Create-1.43.tar.gz 120986 BLAKE2B 5345f5931e71a7b84f2691ee07493427ff424d98fa282b94e3f85155e908e7dbd8355040d3a2f6250db760c30b540dbd5a91e5a436d29d76eec8337b6dc76a61 SHA512 f63e50ad925459469c9c5bc8f716a0a76d9331702d4da5544f9e179cb6358c4b0550a7ac740bce502ad05cdde24fb6f992496d99f23f3b6b1e41081a1d6bce5d
 EBUILD PDF-Create-1.290.0.ebuild 791 BLAKE2B 1abad8abe7c90105d5b712a2427332b0c29f5e57397b7f57d00b39b9247eb5a185687b006bb8095ab08603b1dfbf3d2897157b392205e006eae762b5373c4c2c SHA512 714b5ffef153ca98f9cf0115c628cc8a229162ead0aed9924a09d0cba1a1ee3fcb94fb83d975840c4de59ec8f99aef74c6d26e0a80198452aa45716bd6dcfe99
 EBUILD PDF-Create-1.420.0.ebuild 773 BLAKE2B 82c8c5967b6e1d8a208602c12253a297a4a763fedd11eae967183854f7bdda24815e502fd73a711274acd5fdfb130f67a4801ee6ff4f1d89b77e2b8781fd1ffb SHA512 cc0c43b3308502654eb01b9eed0310b748d806b88b0a444aabd938f4b9c96c09f5bc5accd83ac0735e2f82e49464235aabf6a1669cefe511e99afa778ea4ea52
-EBUILD PDF-Create-1.430.0.ebuild 768 BLAKE2B db07dd54953d68ece7c20612bd9c06924c309dd948d6c6378a21c370c979a255a3fde83e7f501a01f22481cc17ca5fa17da6e3fb9d725cd462e129d069807751 SHA512 248679ee4803341f35bb1b181529590872ca159a0171b439ed826fc1a0d32824abfdb696044495e27364e4bf7519f9d66c1da4ac2c83e6752f9a4f532491cd2e
+EBUILD PDF-Create-1.430.0.ebuild 764 BLAKE2B 3a305a9dc16a9c5bbca7f6bfa447e65053f2dc443c6e3775d931975038da66098f8a5aa4faa778fb7fc150c040ac9b505ca745685cbf34c775d3dfd839982a0b SHA512 778fdca5fae69c942f1d535b19b8ea257c1bbf79cab3557df25a3634a6058b4619fd15378c4bebef2cf4c4d8a42118c885a74fb036f9760d286cc59d314733d0
 MISC metadata.xml 704 BLAKE2B 9698c19769c37da58ebc5ad0585e70b9ecce90574908a89dd2ae6142f8e090b0fa9aa50a8230e6d600fea49b182c2f284a87fe3c31e8b5e3577e82270840923e SHA512 b632974f5f4f55b4b5bffe25eb74014a5de8afaf4be8f2139c1bf95ce6360ed1e984e9efb6354a3a060fa52c878eb08036657084039f2aa1595218c1ef77e651
diff --git a/dev-perl/PDF-Create/PDF-Create-1.430.0.ebuild b/dev-perl/PDF-Create/PDF-Create-1.430.0.ebuild
index 361f7e070834..ef3fad7ef73f 100644
--- a/dev-perl/PDF-Create/PDF-Create-1.430.0.ebuild
+++ b/dev-perl/PDF-Create/PDF-Create-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="Create PDF documents in Perl"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~ia64 ppc sparc x86"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
 IUSE="test examples"
 
 RDEPEND="
diff --git a/dev-perl/PPI/Manifest b/dev-perl/PPI/Manifest
index 08886c4ee6cb..c3dd833731f0 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 951 BLAKE2B 9012797673f698e09f6102d0a1cce5c2a8d3847d8db60be007f16d0869b3a620e7d75c634b837c7c6f2ed70c4d0f7178438a04ff9b87f3ca8b0edd39ee58fad5 SHA512 2866a09fce509ae04b2643c431dd6a7d72a34d389aa282a6fba7bd2919fba31c0c286fd62f125e13d7f1d315d088eb78ec0cd3a8d3e9be6e6b750d6ef25554c8
+EBUILD PPI-1.236.0.ebuild 945 BLAKE2B e059a17fd78082ec03d0faddc02bb1b20f37a1e3e22d29d7a7d8d21bbf5567dbaba2793423767b275ecf0306f56d3b6395679e85f1c108acdc870353748a2e20 SHA512 cee03548a2fa01b538bf5d09e30c4f038c6f3ea996b996a62cc98a3553fb322d95393c8cc08b6aeba4c7c96e2f569a0b3dec81ceee9e1f6a5aa7034844f16b11
 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 d022b3b6e06c..3ad1fff2c3ee 100644
--- a/dev-perl/PPI/PPI-1.236.0.ebuild
+++ b/dev-perl/PPI/PPI-1.236.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, 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 566a52a1b336..632dad6ad7b7 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 793 BLAKE2B bb72b6bb5411fb664b4a5f84789dd120486c16bb159dedd7c5e558105dd26fded3589a6f38d4ed46e6e2118d70860a6af04d2277fd82301351b9ee1ab334a647 SHA512 18195b2ae6ca4e9b5d3b1a355bca740976a8f820c36d8d8bb5de4fba2acc8b1ed72d181057ea2db37d71aa9173ee290ec60272a7b13a16c2bbbdbefbeddfd570
+EBUILD Package-DeprecationManager-0.170.0.ebuild 789 BLAKE2B 2b53d9195992e2766e87ea112f597cd4bdb64889ca2fe3b95c31271e6c60d2c347eafc0e84b428e7eca8b850c8e626eb72ed12781c752de7b440ec15cdee3537 SHA512 31a48c4ebc72184c9ae9529a3dfb01357c5f188b345d62112ce963482695a7c7282a1e93092de6c2408809d5ff15656d4b7e44e2f6559e3dcfdd294f0bf46bf2
 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 9a395b41db51..efaca52ffc7d 100644
--- a/dev-perl/Package-DeprecationManager/Package-DeprecationManager-0.170.0.ebuild
+++ b/dev-perl/Package-DeprecationManager/Package-DeprecationManager-0.170.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="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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Parallel-ForkManager/Manifest b/dev-perl/Parallel-ForkManager/Manifest
index c6b6c494d7bd..98f14ee75ce3 100644
--- a/dev-perl/Parallel-ForkManager/Manifest
+++ b/dev-perl/Parallel-ForkManager/Manifest
@@ -3,5 +3,5 @@ DIST Parallel-ForkManager-1.18.tar.gz 23400 BLAKE2B e3ebfd159e24d330028b44b33d5c
 DIST Parallel-ForkManager-1.19.tar.gz 24381 BLAKE2B fbd92bdbf69012337419e7d28678dbde291a819ce310fdcd47d05fd150f57a65da3e9e582946adeb95a85b3539447dd315a17746ea9dfa346222ff5a14106e87 SHA512 fdd076de153a09e1e8fb681cadc6c36a05f4c8a6718df61937eb5d26729108a6f2f322a7fb9d4bf6166bbfe52cb857e3ea6cab8368c7b5959500018cc01747c6
 EBUILD Parallel-ForkManager-1.170.0.ebuild 814 BLAKE2B c289d90fb25e395252a958da7a878dcb73e48bca34e3cc8194ced79424066927847f3fb00375df14616b87bb7f3986c39b9ed996f52572d80016fc175833c855 SHA512 23e40ad6a1d7cd4f5fd8c517b8f28ca8456782ad137b028137427f0b94221bfb8c0b8616a21b199a51be48ba6a91cfaf74f23b65ff1a38f5e0f33a839906ef3f
 EBUILD Parallel-ForkManager-1.180.0.ebuild 663 BLAKE2B 97eaf1fec90a728dde57193d3aea6958272fbdc253c7710f4895a268f5a7ad2edb8d8b8483951f1561dbe18ca9a3f1b36070d4f3cbe6625cc9b39db351c6280e SHA512 510db5852633eeedb246625f1846b06fa98ccdb02891092dd2f32304e752b5b11a8f05001831bca5d9bceb590bac65f8bb6b3ec79c0bf05840f0f38190b88665
-EBUILD Parallel-ForkManager-1.190.0.ebuild 659 BLAKE2B 97e710fc671fbb8bc70b7a42a08cb728257a7b8e392212db9c3172ab73e31315863f551ae14ca069fc973072a9463863580bfb9cb19590396154749a1d59335f SHA512 d5ce3d364846dbed2eabbe963575551c8c23bc59a3372c721f8c17cec62b8ca44026ac22d563c28be63ca5e573c3cef95d1e001cdeca278ad42d537571437712
+EBUILD Parallel-ForkManager-1.190.0.ebuild 655 BLAKE2B 2c1aea4af2ce6fad010cdffa0db14d03db424855a0ffb03f59dcad613d645d3b2d7b55fdc089cf6d6866ef1b3ab1b1b509a5484f0b7ca5f676d9a27580829dfb SHA512 1f0f3f157312b8b9c1a302eab5ae3994fde8cbf5fccb2b8cd20241bd9244a9b5ff66acfb2a247d25a9c8f59db7894ae02b39f67ef89d4e3a7c5541999b6a778e
 MISC metadata.xml 412 BLAKE2B f9685f233ad57dc03a506dad17ed7ca7db47574c9c86066925fb083917fee2d75de7b889a50be75a1a0497088b4ec87f8f0a44c3ba1c8cecad5320d10ced06f3 SHA512 3ece8329d77002aa4b494d3546d98dc46561326302daefbb46791da19e1ec0c6d9de654655ca434282202a3772baac665ea2cf4f47ce75464b2d17b5050c250e
diff --git a/dev-perl/Parallel-ForkManager/Parallel-ForkManager-1.190.0.ebuild b/dev-perl/Parallel-ForkManager/Parallel-ForkManager-1.190.0.ebuild
index e7510c88cda7..79fe8438b35e 100644
--- a/dev-perl/Parallel-ForkManager/Parallel-ForkManager-1.190.0.ebuild
+++ b/dev-perl/Parallel-ForkManager/Parallel-ForkManager-1.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="A simple parallel processing fork manager"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~ia64 ~ppc sparc x86 ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ia64 ~ppc sparc x86 ~sparc-solaris ~x86-solaris"
 IUSE="test minimal"
 
 RDEPEND="
diff --git a/dev-perl/Params-Util/Manifest b/dev-perl/Params-Util/Manifest
index bdbc2f72cb39..aacc76e984b6 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 673 BLAKE2B 43547022655aa92fc9fe911ea601ed3bf91a259ad0b6a21ed7e5c400ef137a0cf76fb995fe0a655f957d69fedcb59cb1a121b8c43a50cd18e0192337d57d0c23 SHA512 1a86f61ae53a0e30c038c0af6c72b93ed67405440793f5a99b1cd622a655b6c5f444c3ee4c019b9b4d30aed11ad99ef2ee86970ad2825130c5d3aded5a1a97e1
+EBUILD Params-Util-1.70.0.ebuild 669 BLAKE2B f40791a53238e95b957f494ba72bded0b3883b2bac33ea778fd3f1e29fe22e201e9489e00956f54cca0f3ca199e0f4577fe14d34fec1306ba2540671c75404f7 SHA512 1c7abf7d4087092d25467b3876d98f3e379c05657c7984a8b41cb75effa4f0d65352abcb90253cb6110eb7e10bd345c451ce17dad6f22760b5b382c977735b9a
 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 e16d96264c9a..32cce58cc43d 100644
--- a/dev-perl/Params-Util/Params-Util-1.70.0.ebuild
+++ b/dev-perl/Params-Util/Params-Util-1.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="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 ~sparc-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 f150f840f9b1..4cbc043a80dd 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 925 BLAKE2B 7a856d4d2aa6473a42ab184b509795a57fcd1fdcfed03b487335d7f5aaf09d957f14330318217eb8974e512e7997869e1ac4d3800c0762678f42ad8da28b446a SHA512 6dbb0a7e850e9a8df2a9d261abd610edd429f89c5df190dec5e267800ec0a0fec2de08f57316d7841c60575550dfd0c6fdb6fcccf9b2dd66457e8057d32ebdea
+EBUILD Params-Validate-1.290.0.ebuild 921 BLAKE2B 5adfd3e5e12460a11c487102322922e8aac41d4c7633782e06c7226c62a465dedc27c35f97b533a6ec5d93449d1343422b8c86dd714cc0acc4e65f8b615bd1c6 SHA512 e42933b3a60f1a06752dd69a1e01f2d41741ef13140e453d2cdf13e461b91d079a828dfd172c3db6ac8c0f1e3d17c760ef39b7ccb5f2cb8f11be98612d9a1092
 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 44ec02f60518..7b2de905583e 100644
--- a/dev-perl/Params-Validate/Params-Validate-1.290.0.ebuild
+++ b/dev-perl/Params-Validate/Params-Validate-1.290.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="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 ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Parse-Yapp/Manifest b/dev-perl/Parse-Yapp/Manifest
index 9a962c37a597..058eff002e95 100644
--- a/dev-perl/Parse-Yapp/Manifest
+++ b/dev-perl/Parse-Yapp/Manifest
@@ -1,5 +1,5 @@
 DIST Parse-Yapp-1.05.tar.gz 47776 BLAKE2B 8eb9747ff2f2fe0d9dc1d9a0e79cda477a45b4f77f18f06d6c05c4e7bf7af9a674873f1a1c1dd295db8e14757a29579cd60846fc0c67fdcd6dec1c90b3d87970 SHA512 27375b333bf4358f04354baa1d389b082863e12925bc16425b8b029fa4780a04f6d2e314fd011be4ddcc8dff5f17e9921b257c7a3b1c3cea728220c971bb059b
 DIST Parse-Yapp-1.21.tar.gz 108661 BLAKE2B b5d8e135f8befc4841250c75385fb935757e665b213373c983428809e5990e9f50fed250c3af9a5253da0f6a1494883b23b6ae42e4ae23cff799c3663bd054f0 SHA512 dbf6182d4813ff7e355ea1713c748bfdf8290040a93f123acec645c7a1733fe457ab6e0ab51c4ec83cf82bc43d7fb35cbf89875df7b5c2ffc9635e85458cfeee
-EBUILD Parse-Yapp-1.210.0.ebuild 546 BLAKE2B 2c1ccceb2a2c704e74fab8add826dd0d43f5e11160a32e9530ccf859a49492b33ff19e2f03c0e6c517942690ba903175f81c8da8782e4c3fa186c9dc08ce5cc2 SHA512 7ca5bd27d536582d2cd0f2d134762ab198b8be35deb66e3c21f169d83e9c42664e02b739155c6fdfcd31373376b76481351ee13ac28d17c37f8d3b375fbaab0c
+EBUILD Parse-Yapp-1.210.0.ebuild 542 BLAKE2B 627ef695b8f1c6f1447079a73c24ba2c30e1d86a8c23727efc4cfbfe5c3201c92bb431c1eb954495353a5488c886b88cba36cb1a87f025fee5c4a4cdc05e305f SHA512 7a48e820b3655438fa75c4b718fded2ea726ce48be802cb37a37fa7590f2e539b4a1fbd0fe2eff55f417212ff8401e0f62696d334a813732f3c8fde053214e15
 EBUILD Parse-Yapp-1.50.0-r1.ebuild 546 BLAKE2B 0b4f70ac07e7aa426adcd28cdf80b314aceea8f98c9bca9980bb764d2f9fd0eb14ee40d6867923d1846df5f9b0dd0d78d213de71cf55cc8498e96c27509b3a9b SHA512 4a889d0566fc6017448a71b9dbdda1ed968b180d950e7cbd4c76bf242d76ff562cf860990866253c870a571cf472379ace98e4120425040fa249a018f8116c1f
 MISC metadata.xml 787 BLAKE2B 18e36f0028b449575c6346a0744ccb0b8ed755bfb335ee3d4e694af34057b5f2834140fdf917833f4e929b044415a8e5e5c84e4a93db0a8299df67f3b3adc69a SHA512 18e901c94c1fe62a328678ffa46bffc2b12de70cd38f92f322f68531b3bf05214fbd2b159c6f56cf78202e6be4e6d4f41f83e92da51a66fd99d31fbbab34699c
diff --git a/dev-perl/Parse-Yapp/Parse-Yapp-1.210.0.ebuild b/dev-perl/Parse-Yapp/Parse-Yapp-1.210.0.ebuild
index a11b35b97c06..39bf7ab56cc2 100644
--- a/dev-perl/Parse-Yapp/Parse-Yapp-1.210.0.ebuild
+++ b/dev-perl/Parse-Yapp/Parse-Yapp-1.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
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Compiles yacc-like LALR grammars to generate Perl OO parser modules"
 
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!=net-fs/samba-4*"
diff --git a/dev-perl/Path-Class/Manifest b/dev-perl/Path-Class/Manifest
index 7784bd40cbce..c741876105c6 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 888 BLAKE2B 6956e8e64d5c3dbd857de8db4ec1e152df4c6e11bcba084a74e066d50d3fbca32b10871afde519a3c141dc37bf06961fa747c0148579520b749d5c9c41747192 SHA512 d65f4e047946754864f8358115af55774bcb862829893c6b41dbae283cc4181780fc85ba83656c4ca4967486786367356d780116980528a7a1e5d9c161924fb0
+EBUILD Path-Class-0.370.0.ebuild 884 BLAKE2B 8f01530761dbf762399dd044c5c28a71ddad88c5fc42f7e0e0d9dd717f2a037f12fede4a23697e78922eaf1b1c9a1504865bb4e850923be7c28f9b82b82227bc SHA512 6905e433856a887876da8dec8942e985bd4837072a941ff1fa5b3bc9e75a162e2ae16a74d53a6be5285c3b9152d9639732c35dbf8b3101f69eac20d4ec0869e6
 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 3a1f766e3fb5..7f7eb81767da 100644
--- a/dev-perl/Path-Class/Path-Class-0.370.0.ebuild
+++ b/dev-perl/Path-Class/Path-Class-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="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 ~x86-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Path-Tiny/Manifest b/dev-perl/Path-Tiny/Manifest
index 8882a2f7471c..2d63381d3ea3 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 873 BLAKE2B 6711bfc81ad3f342859e6b8950afaf62e69de896512188837e805af3cb104dcccfbfdfd73fe2e7cf61fa95fa719969a8327084891b53c2116052ac94eecb6f66 SHA512 fdb245ae358914de5bf5c541a1a677351f317682c9ad86b83cbe3fd3e9c84de31a993ab35d145c87ed87510856d596fa84cc2d0e6295f39b90918d6a7c4aaa46
+EBUILD Path-Tiny-0.104.0.ebuild 867 BLAKE2B 50c1288aa5b963025c41a7d85bb247224e169602808cdf9cfa0dd985064125667d50b6d6bcf7fabc5c30007a4a5cf9ef84535aa852720ac84ad6c3b3454c5273 SHA512 0e1fa613af4327f496d916747cd7cd82eca634330be895c74956f92a4cbee7f37e1671ed3e3eddbdadb5b26898f1c6c7868afc55f364fe1aed43e842f97f3428
 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 bfa6e6095071..e8388881e2a9 100644
--- a/dev-perl/Path-Tiny/Path-Tiny-0.104.0.ebuild
+++ b/dev-perl/Path-Tiny/Path-Tiny-0.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
@@ -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/PerlIO-eol/Manifest b/dev-perl/PerlIO-eol/Manifest
index e80ddc2aa90e..73d270b88f74 100644
--- a/dev-perl/PerlIO-eol/Manifest
+++ b/dev-perl/PerlIO-eol/Manifest
@@ -1,5 +1,5 @@
 DIST PerlIO-eol-0.14.tar.gz 17721 BLAKE2B 90f0425f53363904be4eeafa2ebb9e5119091463290f58f7c773f704116ffa305c53c95cab10ea63c442b7b49f708ba3e195840bcb4033d10944dbcf566154be SHA512 d2d13123d71f26e19a7dc4981bd361a4420f49416372abf9c7a16254d03ef7a4595b37cc599883149e2810beccd7d40fff76c7b8982b03c71551d0e1b998fa06
 DIST PerlIO-eol-0.16.tar.gz 18403 BLAKE2B e1dd73c78bb211d28cd42b168b701f5c58c5ba75d44e16c52e0ecd05c1c7ab981058f36728dafb80e88224d81cbcd17ef35313fd8d9492c7caad065ebf1101a4 SHA512 671d0a362eb7d8650adb95bb555851493299607f72f4f88fd3f3c70326825eee0879f6ac837e99f25498d6c32ef14c57f38c8b82de38f1f66a291ab23d733ead
 EBUILD PerlIO-eol-0.140.0-r1.ebuild 538 BLAKE2B 05cdd67da01cbfff6da42369779b8f1ce67ed19a5b348516597995195492dd23ba0b8256b5655175981ad183a3e4353a409fd3c8c6db98c856ec576c7e0fa070 SHA512 220b002ef2b64bb7507e3523d6ef68ceb30ec250e0d245ce7ddb9e77291efded0af32822d302d037958cfe5591cc2aab6055727bd8b834bff43fb8cf16ee9fb8
-EBUILD PerlIO-eol-0.160.0.ebuild 723 BLAKE2B 6ceacb27d728d174c146fce0f750ee8eb53a54b94c8e6af81b29b816631ec24eb748b2480a38818a94d609e5ff4c1ef92473795afed17c43a6d6c290d5211051 SHA512 888cdd908cb3b9e401afaa455f8596fd0a754b7f150e7128effb009dd72de004e47c8cb5bc0b92a3daad181d6229619580388779456299bba744bd84590507a2
+EBUILD PerlIO-eol-0.160.0.ebuild 719 BLAKE2B 5db1fa3cdbe75763b6f3bc6edeb53a4e8d42f1dfabce7fab1940e9b02fdc3899a7ff31d42b9c6a1ce39b94d5c6af721161bba82a27075e4398cb356f31f04856 SHA512 60509491ab33a34e72b380180ec7112db48bc336318b9af5f390ff45b56eb84f62f463886c7833936ab07e26329b29949ff5be2520e09fae693a418d0ecf5f56
 MISC metadata.xml 392 BLAKE2B 0c3240a04404a30973fa4e24f007573d4ced9683ac1f4842309a3763c3546b483951341bde83e29a6424480f42aa74b34359af4a94dc7c527b16f8dfe986d45a SHA512 2fe5b7934930ca0adbca468f8c76a87a013440f57813eeeb6952148b86c1c75c93ba6cca99a4747da18bced10395e7680faa1b84294c7e27ea97d626c0e5c2f4
diff --git a/dev-perl/PerlIO-eol/PerlIO-eol-0.160.0.ebuild b/dev-perl/PerlIO-eol/PerlIO-eol-0.160.0.ebuild
index de6d6b8dbf47..cd6e307763c1 100644
--- a/dev-perl/PerlIO-eol/PerlIO-eol-0.160.0.ebuild
+++ b/dev-perl/PerlIO-eol/PerlIO-eol-0.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="PerlIO layer for normalizing line endings"
 
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 ia64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/PerlIO-gzip/Manifest b/dev-perl/PerlIO-gzip/Manifest
index 8d5694576d2e..6a4c05aa171a 100644
--- a/dev-perl/PerlIO-gzip/Manifest
+++ b/dev-perl/PerlIO-gzip/Manifest
@@ -1,5 +1,5 @@
 DIST PerlIO-gzip-0.19.tar.gz 18956 BLAKE2B 020b5d92a3c20d6be6474632a7f871af505d65894a150aea8b91845b8adf95991ac839c2d756e8847393dfd6cab87966f692609bb5033e452983230855b78588 SHA512 514b4e224bb66f00c1e7e4678ede625b6fd0ce0c2687bb7bf662d8ffe942c6a711426f27399343a9c02b0313dae8aa41a7e4551f7d9e59a178cc1a6d067d8608
 DIST PerlIO-gzip-0.20.tar.gz 19076 BLAKE2B e7ff1dd280bbfe80720c113a26626e222695642bc02730f5271345583784ca3e850d1fbd9958acc43a12dd603ef32cefc786acdc8e86263f9d38fd675df9b7e1 SHA512 b24e8fa99cbcbaf07feabfc09cefc55a10c1dce59b495b59343ff5217536f7108c92f462751e70242e6567be32e69a0cc88a2e66325e926174a64042d4b87966
 EBUILD PerlIO-gzip-0.190.0.ebuild 402 BLAKE2B c7efe22617e764f48cb748cf130d5b30fab7b9c2e7ab9dd9740371a65e5066a92dce13076d333ac7d0ac090b75a546c2a844c918c8b5b2544d1ffa6f2c7707a6 SHA512 0a1fa9980b79688df5e878c405c361c11b0b345b3ba1566ab7d673a1f4f0213c22f8198451ab7fe75f1ce7bf3975b4161355ed2e3a8a19384b4e86a868788ffe
-EBUILD PerlIO-gzip-0.200.0.ebuild 403 BLAKE2B 951f5b34820bb4ae3f523a589ceb323cc2a3e4b489240a76140290de0b561c1d728fa55b8733e14c9e6beee90eb3fac1c99b05752efc14e825565284d20374f4 SHA512 191088858e21b05e359ecf0b9e803606a10a68452951abc7a45ef314d5459b612c7fe61cd4b1dbed83fc4870cb0cc705b7268ed1ab301338dd8ca5c988701f65
+EBUILD PerlIO-gzip-0.200.0.ebuild 399 BLAKE2B e76de762576023057e34419dd8348ba9d41c487fd2a050f2ec0609a115cb0577054e2035cc318a067cc17d227091b720397c9858223827e2cb17a6c597a948ce SHA512 8f8f4c4d9c54b28c272bd70d5d6c4b91fb012244f0a1fadc502b257233fe39ad41cc2569ffeb0e77e07c49d6258ea936b9ca6c1bca52378d0513b47d521768ce
 MISC metadata.xml 394 BLAKE2B 012d2ebbc40191cec5ea10b27824381fcdf4266f868c774605129074ee7af724978e9af79096a324d508ce5f19f1ca0716936dcdb83f375752804bc5e6857f9d SHA512 88240f01b3ade41e854f34495e5ccc8b1144b187a2284e604ece72edc68c0f0ceec580f4b5128ca5908ff5fb75af6701f751570853903904a3a30cbc4d7c37e3
diff --git a/dev-perl/PerlIO-gzip/PerlIO-gzip-0.200.0.ebuild b/dev-perl/PerlIO-gzip/PerlIO-gzip-0.200.0.ebuild
index 246ff8b18b06..6ee093436c27 100644
--- a/dev-perl/PerlIO-gzip/PerlIO-gzip-0.200.0.ebuild
+++ b/dev-perl/PerlIO-gzip/PerlIO-gzip-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="PerlIO layer to gzip/gunzip"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-perl/PlRPC/Manifest b/dev-perl/PlRPC/Manifest
index 4d7e2bd90bc8..e5bd1ad34758 100644
--- a/dev-perl/PlRPC/Manifest
+++ b/dev-perl/PlRPC/Manifest
@@ -4,5 +4,5 @@ AUX Security-notice-on-Storable-and-reply-attack.patch 3844 BLAKE2B 5e58c7fe2f8e
 AUX perldoc-remove.patch 258 BLAKE2B 2efca52930c77c8fa4600aaacaa181bb6ccd88cb7c132de8fab94021e9574b042568900e20bb927a3af8e2cefc22f2a61bbe17e8976e702f02d18160ff7b87cc SHA512 e2fdf9d64b6e8a76eedbbb2eb7677538d3bae0d3eb077ce4f12e8689f39622417532dc51525d9892cb8a990015b01b098df11e8fbb492755f0ba64d26d025ccf
 DIST PlRPC-0.2020.tar.gz 18229 BLAKE2B 1384a4dfe3483e2eeb8c2cd7805a9f1f550a373ba37e328ac57acc0bf1d581fbfffde111b18f5d025cd8bf56e3d8f2171bdd81246c9f54d0151238f0bc264c43 SHA512 2c79c5c27bce7027561f1968023ae4307778f291caa9291fee779537d047a35bb4bd5928fe2b343a2b09dbdcf6450239d79c6898018ea880619a7c69a1498a86
 EBUILD PlRPC-0.202.0-r2.ebuild 845 BLAKE2B b1d02aa79bca84e78040f1e88a7ae313f3b4dd5c7cb30a09297b1f6affad6f88a37d75a8ac08e5248bb3d8d7fc5c5ec1dd24334ccc4bccb67f7471fff9022b65 SHA512 f12d491dfe52f9d3bb82ef18519dfcfb6cb6b92eea2f25e8d0039431b2d81538102b5bf6ef0dd6d71ac09032eacce53fd0636337d5abbf650f393051cfbcb023
-EBUILD PlRPC-0.202.0-r3.ebuild 799 BLAKE2B 00504931a25fef414ee40e64e8fb570b82bd9f4b2c139f87f7fc5463ce3efddf33630d2469d9b726e824929e100071c6f889ff3806b657613a46066496214631 SHA512 7af9a4a6c36ebf8243a27e9da2e65445adfc5b7a1a4d4c5ef085d1fcfe755eca62ebe191ae2eeb78212fac605087e83512db95a4aacd56588572f149b9b99332
+EBUILD PlRPC-0.202.0-r3.ebuild 795 BLAKE2B 07c4d084751a3c7186a89e5b6db4f5628e29e061363bea8622600095134c23a9a575cb05d0cb25eb4932b77945b603d28f98bca322afa6fe4539885a75806d05 SHA512 d62ed90daf14a8be67cad27e3bf4521edfb441a08eafd538beca055f15caad18d576cabda717d3b6ef2c2d82a06b0d00dddee2db99d45b4710a3dca35308d6eb
 MISC metadata.xml 775 BLAKE2B 3a9dbf3274b5c5cc57ea399f21ce356f05c0a9be7eb5c98b7251461450768a1d46e1db6e652bbc620d8b5d9acf60ab0fe19deb2fea6f8f87397997413f4abc7f SHA512 bbaa42d69e787c17cb1bd20bd9db9504377a89c426d6173659e2637df7efe8744dcb37641cc0ebe3041199b221beacd049cda5eb2628fdd6196b8a93c462d583
diff --git a/dev-perl/PlRPC/PlRPC-0.202.0-r3.ebuild b/dev-perl/PlRPC/PlRPC-0.202.0-r3.ebuild
index b65ad7b0dd2e..e0b80d29cfe5 100644
--- a/dev-perl/PlRPC/PlRPC-0.202.0-r3.ebuild
+++ b/dev-perl/PlRPC/PlRPC-0.202.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=6
@@ -13,7 +13,7 @@ S=${WORKDIR}/${PN}
 DESCRIPTION="The Perl RPC Module"
 
 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=""
 
 RDEPEND=">=virtual/perl-Storable-1.0.7
diff --git a/dev-perl/Probe-Perl/Manifest b/dev-perl/Probe-Perl/Manifest
index aeecb6f554ba..dd182fd894b3 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 593 BLAKE2B ee8dd52b4dd5e9a6a61716b384919344d86673898a2ff3f93b9e238d154846696157c6efd3ef1b7f1f9d9c2d10b4eb02d2b91fd4427252c4cb4bd85d44351411 SHA512 eb83c5d6230175999921ca0fb3dbaf08d40894f01c99f598a243dc35ea82c332d301cd7a090bee60393da68dfdf7f0aa8fe1360f1cbda1321197ba6181f4c374
+EBUILD Probe-Perl-0.30.0.ebuild 589 BLAKE2B 43ae4e7b23938643a32f90a91cb44b099ee94d2ad8486618e6bb2098ced92c6e8632cbb57421bd1885bad60a61e57d78df7ab4c5729a171ba76c08368555651e SHA512 8e3caf3e1ea1b1f5023dba04d9d50643cc537753e8fa661c182efe547b13e4df187ecbb0be934454187b54d6f0846b58412b8ebb09e300c9dbd2e71f3ae8244c
 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 582facc1954b..e9f79e7bd6ed 100644
--- a/dev-perl/Probe-Perl/Probe-Perl-0.30.0.ebuild
+++ b/dev-perl/Probe-Perl/Probe-Perl-0.30.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="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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="test"
 
 RDEPEND="virtual/perl-File-Spec"
diff --git a/dev-perl/Readonly/Manifest b/dev-perl/Readonly/Manifest
index 18fd26ab6940..661087a5a4ad 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 487 BLAKE2B 3dc5c9b9d403016407b942eb5695990a2f3d442d4749d37889dd7bbb24984df8c57afab40e4c77624a36d9ac71353b909144dddf89cea0a99498a52153416de6 SHA512 563596cc3d78d076999fa1cd247e3e6f55a99c43244aee7912ceccd102a408b4e7224fdb461fcc80a9804a1072c78f0cf7203b036d5ebf94802e61027ed1620f
+EBUILD Readonly-2.50.0.ebuild 483 BLAKE2B 105ba746e74c0b5553331c9acdaa7194512a6acdc522eff5b4216a75a711e389b3443626751fd1e162ce5ba5bdcc4c75d46369b1bcd6c62eb76bb6fa54acf5f6 SHA512 111effe817da0127a9dade0cb637f8fd1ac6ed21265b306d62dd8081f2b46b68bb9e3f72b846f6a74f46cfd96f9db4cc83dcf3bdc7823a7f7f799f4e09c5edf5
 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 4993f7a76992..91259dddab20 100644
--- a/dev-perl/Readonly/Readonly-2.50.0.ebuild
+++ b/dev-perl/Readonly/Readonly-2.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 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 ~x86-solaris"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-perl/Return-Value/Manifest b/dev-perl/Return-Value/Manifest
index 1a1101121902..c48dcbad6882 100644
--- a/dev-perl/Return-Value/Manifest
+++ b/dev-perl/Return-Value/Manifest
@@ -1,5 +1,5 @@
 DIST Return-Value-1.666001.tar.gz 14554 BLAKE2B 38a01cc6c2b478d50dbe9e595871052a861f6fd1d1752a7d3fe9ce587839cfe4bb7dbf7ae77b04227cca69767b2be24b05a4e5e28fb91bba97745c2bca885caa SHA512 4c187b901af9e4aa4ff37160d67a536809b88d1ca724103740623cd58d76ecdaa8aa05d27ffaa8f0d1c7165cbdc7d551dad99dec330b140c0708f4e66fccc7df
 DIST Return-Value-1.666005.tar.gz 20412 BLAKE2B 9b551d9387338339b02e4cf5d0d9af8b89f3141f8c32bcd883b5e5ac3e24b13f77dbb9d63a02f30bd3a4683b73086547adb1ec750cef417d7ddff013787e293c SHA512 6a2e19a6562fb354a5e5dcaab54629e9b19edfc57206ac5c46cd3428e78d50ec36781685edc7ca28bd8c41cf878334f9e7c1182fd3e82f9a94a21854a5b89797
 EBUILD Return-Value-1.666.1-r1.ebuild 284 BLAKE2B dc5056e92b3b4e5a31a1cef18d7fb22675661fbc3a93b03105605756e8cf2374e5dbac4e9d1fc77ceaa78a7ff65be30680959897f3c14b9c6fc08b2d49d377f9 SHA512 30ca3e9fe8c6332dae45278bc4d909cccf30ac7231aeb55964613bcf981f83e8f922f1e014a25b312a5b133a605c141c6180b3200783705f0c53cacfaf5a38ce
-EBUILD Return-Value-1.666.5.ebuild 660 BLAKE2B 0318dec747aaca66709348c1973043a243f7c3f9ed9d8138409544d818b8358bd09b317952af694ae15806768205117475719e7ef8bb6eb348c2f74f510ed6da SHA512 9c2246d6e37ebee9e1b0b67d33d985f821bda4d19665dce1be6ef792ca1bd373190a90a934b2df0e01d1890c1057e3919d4b5aabc9a45ccf153af9fc4708312b
+EBUILD Return-Value-1.666.5.ebuild 656 BLAKE2B 05a95b5a37f8b9e6cbb3b8d463af2a790a8cea072b30c9ebbaac702dc6b297d06e3f58baf366334d9376ed87a1590d586ef21164994ae4d7bc247d96a92eb4c0 SHA512 c249b8dba806b1b29a4cb607591ba3c3894f91c4302a6560b789087f2b2dc5595aa87b875bbf7a8d45f201f6c7771a6aa6247a740e6d8865e9719cfdb3651d62
 MISC metadata.xml 396 BLAKE2B df4a43e77287d53bf38f65c3e3ad6397e9964baa9132924f9cda9dd4d29f890f89e87977c560416f4f7a292e81ad5c165b808e29eb926255ba43262cf0f25352 SHA512 f6d311cda2c5e59337f961d86202391702103a031311c3aad0228fd966a45eaf28e21c68358d23dba31b734f77e63ef83193ba962cd6f3457c89109f3708b040
diff --git a/dev-perl/Return-Value/Return-Value-1.666.5.ebuild b/dev-perl/Return-Value/Return-Value-1.666.5.ebuild
index 3b277615683b..7ba7b954dc74 100644
--- a/dev-perl/Return-Value/Return-Value-1.666.5.ebuild
+++ b/dev-perl/Return-Value/Return-Value-1.666.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 perl-module
 DESCRIPTION="Polymorphic Return Values"
 
 SLOT="0"
-KEYWORDS="amd64 ~mips ppc ppc64 ~x86"
+KEYWORDS="amd64 ~mips ppc ppc64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Role-Tiny/Manifest b/dev-perl/Role-Tiny/Manifest
index b4d5343667c4..fb6f3c5c5e05 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 527 BLAKE2B 0384157fd5bf3d511f376246d0db36e7208505ae39953d860c77b54a6cd99422b85812987b258d12190473cc2f4e727a7da73e55d368471190d150346032625f SHA512 a6aed414e201c3efeb4c1ebf9c7313a4f438f663359ecf7a92d65ef8b7e0bedbb44fc104b316fa1e3f00b591a5589a08fa32339c11ae201e035220ec1b726a3f
+EBUILD Role-Tiny-2.0.6.ebuild 523 BLAKE2B 6e72800aca5a877dc4c76d7c2a19ac98f1dbd6f883ea50b4890137c1f4d8ad2399ddf0aff53fd92dc41e73031d223dc53991ade2851a630ff5f9da7036a4313b SHA512 391c83e0b78c0c3a6d5307f3905be52e87a51fe2675bd7002cddbf273011be0f71060bc989c67cf04e02ae3e4e160c7a154483041c11874d28e0c35d9d960c33
 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 80a5623ad723..4d99e50e0e61 100644
--- a/dev-perl/Role-Tiny/Role-Tiny-2.0.6.ebuild
+++ b/dev-perl/Role-Tiny/Role-Tiny-2.0.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 @@ 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 ~x86-fbsd ~ppc-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Search-Xapian/Manifest b/dev-perl/Search-Xapian/Manifest
index 7f054eac637d..f681f20af4c1 100644
--- a/dev-perl/Search-Xapian/Manifest
+++ b/dev-perl/Search-Xapian/Manifest
@@ -1,8 +1,5 @@
-DIST Search-Xapian-1.2.23.0.tar.gz 70255 BLAKE2B 7258dde8dd58f3627d1b7fc8a508c8d7a403b3212bbe90e8f2f76e9e77fc4fa522e0dfd04d865435ccae3d6c43446d7fd70361af0036ed10013fb6111a3467b6 SHA512 48d47e4edc5f752fc31c4142ce3c92a8ead122d4d872326a153fcb9f8667da4101384a3e06375ebb8d2e3148df744484e92bedad7bf4743417c84018ccda9526
 DIST Search-Xapian-1.2.25.0.tar.gz 72097 BLAKE2B 9e9f54718bf597c7592cc936e23ce4684ba4104f890ee7216e303af9a075eb895459a46d17bd2c32820eb436545a8a9e008b17f83fa586bf3e9160d80813872d SHA512 2bb0bea59ddfd8159df0b3051034ca28478cb74832cfe7a103b8a4dbeddbd41f6223be6ad56eb3dcb8c7a785d2f7d500844c41f35da3997a843b3ba624a4e795
-DIST Search-Xapian-1.2.25.1.tar.gz 72320 BLAKE2B ffdc57cd70b35ef0ddfa94818d7b34b5d80077380901791b27564e6f544a658221e34e3997ae1412ccb8f1e21d515041959de90859f66c450273432de1d1f9bf SHA512 7cb78c1304b69a733b75c1a9b5ae4197be519e67528214a46e4bb9da660cda79f8e9ecf46219af09f174bf652b6000e0eeb50f736a80f2e6f47be46b2d58ef8d
-EBUILD Search-Xapian-1.2.23.0-r1.ebuild 848 BLAKE2B 56753bc06cb9ea5b59af4eb3b72c2256035597766759fb466cb360c563f08b195e6e6a490a67cc8351017173dbf32d1c17422f1d28929e633553af78d4e5e364 SHA512 3bc66d209ac83199c244c0a2b19f4e05e9f90fcedbdb78110d0838d1d0cd46c312e36ff532bd9e5261e9164d4ef7011b51135188475d529869a94e1fcda68fb8
-EBUILD Search-Xapian-1.2.23.0.ebuild 811 BLAKE2B 1786babd7796e3e96044782b01ab14c375984d6b7ebcbc26809edf9cfc6fbba18ff7dde83e803ace38e70c31193e04c2c093be89dc86075899340ef073386c3c SHA512 6f2d28ebba029857d0a9cdc05b12747b03205b2018a86c9b89b87655d87516d1a936b09025702c687ce69d0b32f27be1ee70f9cb669ae0f8611e9d271a48aef2
+DIST Search-Xapian-1.2.25.2.tar.gz 72424 BLAKE2B b959e1f111def3660f17669e49dfa9bff95bc421bdde35dac22d5cad4d350057cf7b077f030797158c3ae6c7c292775f44e88381e685b9fb5e8364bef3d03403 SHA512 92b92f28cf50d162905ef230a28956a4e57d3baca81d227751e905756239be0f843b58f38a8dfdb6c8b6ae827e37a60d7df7022cfab43164293223dd430d4d2d
 EBUILD Search-Xapian-1.2.25.0.ebuild 846 BLAKE2B be07a4c9f511bbf13bd9ad6a589f803f5e1aa1ac662dd97d55dde8adb58380cd1185a3f7c27f080e4d323ec9d3b380d1e055ac05ee4b7132df10c48ea02876a0 SHA512 b86df2ff4abeb0f3d49c182e7a5133a37c3cdef0ff417c0df326ee7b8245cde39bacf2beb46b8fb4f56e6d46cdb6dfa0a1061c560c601f6988d7c14b9605b3d0
-EBUILD Search-Xapian-1.2.25.1.ebuild 854 BLAKE2B 6f08b04008d6885e162334d1bcc9e54673b6fdcdd895a21f9d43851a4de58ff2d0a0ffd9dee30f4e70df7fc4889705ba2bb05babf5992db24bd63a5407b502ae SHA512 f636e4fbe2c473a6cf4fd793a6f60471abf6d4c5f8457be54158fcb0591b1bf23c8f37ce83bbef1a92838729fe39476b048031f3727879b733125b4a51a57c51
+EBUILD Search-Xapian-1.2.25.2.ebuild 854 BLAKE2B 6f08b04008d6885e162334d1bcc9e54673b6fdcdd895a21f9d43851a4de58ff2d0a0ffd9dee30f4e70df7fc4889705ba2bb05babf5992db24bd63a5407b502ae SHA512 f636e4fbe2c473a6cf4fd793a6f60471abf6d4c5f8457be54158fcb0591b1bf23c8f37ce83bbef1a92838729fe39476b048031f3727879b733125b4a51a57c51
 MISC metadata.xml 3929 BLAKE2B 9b11bf5990a09722eb6a8352791c5df25f6b99c4c877dd381549b875519a5d923c1d55153603a1983941473103d7960b6de4368c99d078a7241302b1e7104594 SHA512 37f1f94a3f429144f0e7e9d801e763d18de8def1b0a066e4acadd168cc9f291103c456b29726b995777554235ebf62f2af20c18db155a13ac9f15955cd6ff077
diff --git a/dev-perl/Search-Xapian/Search-Xapian-1.2.23.0-r1.ebuild b/dev-perl/Search-Xapian/Search-Xapian-1.2.23.0-r1.ebuild
deleted file mode 100644
index cb142fb846fc..000000000000
--- a/dev-perl/Search-Xapian/Search-Xapian-1.2.23.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=OLLY
-inherit perl-module toolchain-funcs versionator
-
-VERSION=$(get_version_component_range 1-3)
-
-SRC_URI+=" http://oligarchy.co.uk/xapian/${VERSION}/${P}.tar.gz"
-DESCRIPTION="Perl XS frontend to the Xapian C++ search library"
-
-LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="examples test"
-
-RDEPEND="dev-libs/xapian:0/1.2.22
-	!dev-libs/xapian-bindings[perl]"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( dev-perl/Devel-Leak )
-"
-
-DIST_TEST=do
-# parallel fails sometimes...
-
-myconf="CXX=$(tc-getCXX) CXXFLAGS=${CXXFLAGS}"
-
-src_install() {
-	perl-module_src_install
-
-	use examples && {
-		docinto examples
-		dodoc "${S}"/examples/*
-	}
-}
diff --git a/dev-perl/Search-Xapian/Search-Xapian-1.2.23.0.ebuild b/dev-perl/Search-Xapian/Search-Xapian-1.2.23.0.ebuild
deleted file mode 100644
index e7f905da0937..000000000000
--- a/dev-perl/Search-Xapian/Search-Xapian-1.2.23.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MODULE_AUTHOR=OLLY
-inherit perl-module toolchain-funcs versionator
-
-VERSION=$(get_version_component_range 1-3)
-
-SRC_URI+=" http://oligarchy.co.uk/xapian/${VERSION}/${P}.tar.gz"
-DESCRIPTION="Perl XS frontend to the Xapian C++ search library"
-
-LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86"
-IUSE="examples"
-
-RDEPEND="dev-libs/xapian:0/1.2.22
-	!dev-libs/xapian-bindings[perl]"
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build"
-
-SRC_TEST=skip
-# missing dependencies; fixed in -r1
-
-myconf="CXX=$(tc-getCXX) CXXFLAGS=${CXXFLAGS}"
-
-src_install() {
-	perl-module_src_install
-
-	use examples && {
-		docinto examples
-		dodoc "${S}"/examples/*
-	}
-}
diff --git a/dev-perl/Search-Xapian/Search-Xapian-1.2.25.1.ebuild b/dev-perl/Search-Xapian/Search-Xapian-1.2.25.2.ebuild
index cc66a7182541..cc66a7182541 100644
--- a/dev-perl/Search-Xapian/Search-Xapian-1.2.25.1.ebuild
+++ b/dev-perl/Search-Xapian/Search-Xapian-1.2.25.2.ebuild
diff --git a/dev-perl/Sys-Virt/Manifest b/dev-perl/Sys-Virt/Manifest
index 7942a35c349f..10ad456c9253 100644
--- a/dev-perl/Sys-Virt/Manifest
+++ b/dev-perl/Sys-Virt/Manifest
@@ -14,5 +14,5 @@ EBUILD Sys-Virt-2.4.0.ebuild 640 BLAKE2B c5038d7f599eab28097b2500b052d43412c13b1
 EBUILD Sys-Virt-2.5.0.ebuild 639 BLAKE2B 8a1901aac65194377dee1f354a126ba5aeb4d6dfcf9382c56bec79f41cc846ede9ceb028e084823f25d7e1fabe6aac66fbcfb13691b4d6f91fbe8acc28053ba6 SHA512 fe8995321f85a11bcc44da6260373a66247c33ba2a9d1f1499f0a9c94cb20530ef68fc99639fafdd4b13189ce3614dff40fa20ee41b43ca54122eaf632222238
 EBUILD Sys-Virt-3.1.0.ebuild 639 BLAKE2B 8a1901aac65194377dee1f354a126ba5aeb4d6dfcf9382c56bec79f41cc846ede9ceb028e084823f25d7e1fabe6aac66fbcfb13691b4d6f91fbe8acc28053ba6 SHA512 fe8995321f85a11bcc44da6260373a66247c33ba2a9d1f1499f0a9c94cb20530ef68fc99639fafdd4b13189ce3614dff40fa20ee41b43ca54122eaf632222238
 EBUILD Sys-Virt-3.3.0.ebuild 639 BLAKE2B 8a1901aac65194377dee1f354a126ba5aeb4d6dfcf9382c56bec79f41cc846ede9ceb028e084823f25d7e1fabe6aac66fbcfb13691b4d6f91fbe8acc28053ba6 SHA512 fe8995321f85a11bcc44da6260373a66247c33ba2a9d1f1499f0a9c94cb20530ef68fc99639fafdd4b13189ce3614dff40fa20ee41b43ca54122eaf632222238
-EBUILD Sys-Virt-3.9.1.ebuild 597 BLAKE2B 5c290a4ef442138bc3305449b562843e0e5ba224d6c5c1e582b43b7bf58c87bcb1c63d0673e376801a870d8e668e29c5dc8fe51c8c0d991e7d9f6ebb38a11f6c SHA512 145c8e06f8edf97d7aa0c70cd7cf272d72f7c0f8543095e0d3f1266264a7ceb65fe427d9b9ee861f53c8f3ab26152bf9d41cfbc828670c0ec5c223c3d6c11997
+EBUILD Sys-Virt-3.9.1.ebuild 593 BLAKE2B 9b464077075004659399694f07540c9369e3ca5f520704d0a653879356415b234e9cc9599efcd5a798a8f5cf10c7ece602e1ac5ee222efa9b96efe7d0e28cb3a SHA512 3622a8864dffca6002830eac80d7268415756f3e9355830eaf45a54b02f1eed0bdb24d7ad958aa95e0923ed8835230285c8384fe40ef56ade3f70ae0d3fb03f0
 MISC metadata.xml 1237 BLAKE2B 7cb495469fb61a3e85c3532cf139efda94ea1aa354eab0951fdbe2d35d49b7bcbbf301043371c40dc64b9c9f8916238254eea57a2fbaab1379b5a1c67ffbc91e SHA512 e4c6ff2fdb1c4010f81d2e2454292fd60e3764bd33071f6294e2cbc7b5aa9688974be83f9939a556b727d03da615a119860b07ee0a2edbab833fba6a677c7cdd
diff --git a/dev-perl/Sys-Virt/Sys-Virt-3.9.1.ebuild b/dev-perl/Sys-Virt/Sys-Virt-3.9.1.ebuild
index 024ad6bd89fe..c519c9f010cf 100644
--- a/dev-perl/Sys-Virt/Sys-Virt-3.9.1.ebuild
+++ b/dev-perl/Sys-Virt/Sys-Virt-3.9.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 @@ inherit perl-module
 DESCRIPTION="API for using the libvirt library from Perl"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="test"
 
 RDEPEND=">=app-emulation/libvirt-${PV}"
diff --git a/dev-perl/Taint-Runtime/Manifest b/dev-perl/Taint-Runtime/Manifest
index 265a0fca61f0..d947e78122ac 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 346 BLAKE2B b4f7c1bc6edec7ef23127e51a0655c50348c48bdcee6de15ea65d1d42ed1fdbb2c98a157b6cbc372a0739a83e113a30302242b232080f2af1f074c28cb310a11 SHA512 b8b13d9f5b5d504bdac72d99201901f7aea0584636f6c03878388d7e12e95d72ceea171bc0d3a644e6565b603f9f56c2a60153be94f2fc6d32d57ab99bbb797f
+EBUILD Taint-Runtime-0.30.0-r1.ebuild 340 BLAKE2B 49579e579dd4e2a80f17564035faa8eb24ceb95919fc6e23769cb5f70519ae0fb8d11a0f8f266ac31a47d4f6aa2dc6c843f1b44fb664b6e1db18643ef5d95918 SHA512 9a0926fd6aadd496ba2a46f52bd1ea1dfbdf90ea1aada39c3a0ca64967c8b36a29ceeafe28ce18961b58e285adc8edd90d6c9fcb25d2b564f086fb244cd84445
 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 708409e6148d..65efb2af14e5 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
@@ -1,4 +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="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/TermReadKey/Manifest b/dev-perl/TermReadKey/Manifest
index 85ed97b43fba..1ed93b47538a 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 581 BLAKE2B 6305b39af621bf33089ec4ae1b8df6455c1deac6d92ba6856e0d0a1bca591c1ca8bb82accfcec5b3580c48800cd18fa440ddfd0f37b70c3b5878880f5f48e693 SHA512 8b14f8f4ea398fc0389650004b97a158135b5ec9d5d5cb975d78712fd18e7b93fd9a22bbde8f419826aae70077328132e4d48178aa1540a07bae01823f3ff452
+EBUILD TermReadKey-2.370.0.ebuild 572 BLAKE2B 85454b8c09edb806f97a4b98070c268917ebfda1160ed815da1d756ecc6d0c041cd72f3e094dffd79b52f524925cad564ee0976c53913d5430d586b7e33ce1fb SHA512 2399bc8dee1cf11f8d81330964780bf02c0c5d752dd5cabb573802605d516f48c994689fedd5bde0a4a44c51870ecb529eb84b943683efedfe136ef6b8cb13e1
 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 b41b3886d329..26300e0c77f2 100644
--- a/dev-perl/TermReadKey/TermReadKey-2.370.0.ebuild
+++ b/dev-perl/TermReadKey/TermReadKey-2.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
@@ -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-CleanNamespaces/Manifest b/dev-perl/Test-CleanNamespaces/Manifest
index c8c97a11e87b..11c5ab90f670 100644
--- a/dev-perl/Test-CleanNamespaces/Manifest
+++ b/dev-perl/Test-CleanNamespaces/Manifest
@@ -1,5 +1,5 @@
 DIST Test-CleanNamespaces-0.18.tar.gz 31439 BLAKE2B bb89bffb89a0adda6552e1f925c7490b0895ee706482966e8fe2ff76fdea9cf497c7066e53443c8ffd4bf8404c8a6925bfdebd5d7c7d7c0d1e04714e1ffb74ca SHA512 5e6d732eedff64990a20c16ca5b54441515bde557d63c9d685080e9e1fe709c7adc63f38dcaa83f9e2d78976754b57b720d22448dd30d20cd9343191229ecd6f
 DIST Test-CleanNamespaces-0.22.tar.gz 34307 BLAKE2B d07e7980870e05a9d16d6a9ac842c6c4374168b72b2351a42b7f5908ddf1fc5bae883c184f9ffd9a52b2c21e48298c0ffe3f8531d2226bf08a130260c4074079 SHA512 9ccb456aa502421e7fe4a5b91f629596cff04fdee2211288e4b8b3b2faeb1a9049d31e2a5ca4ce332914759ffa35d8027a1ccdcd157618e99545cb071d8797cc
 EBUILD Test-CleanNamespaces-0.180.0.ebuild 1396 BLAKE2B a9c86984ab875a665b65f04cbee59167d75f79da70da6e0809d84c8b4196d758dc96e322c5dfe266d875c4123131b28efb18ae22c1f96df5db148e987e69d652 SHA512 f7a8b8c4966cafbd2f3a7cae6ae907f9fb7023be9ace829bee31ea1f57f9be3d7b43fb774f99b14ca793239b1095aa66754506886418f25d390328663501e18d
-EBUILD Test-CleanNamespaces-0.220.0.ebuild 1076 BLAKE2B 546640f6a6f2cd25e1616dd9dad6053aa6f1f17b4a68677bd8338de9f5cb431d921030fdc147012872b47b45e077bf51247dbcc963c54821e3762f42dac8a8bc SHA512 3dbb3412b98df9dfd4858f9d8b65bcaebf8949951192768b84c5dbcdafc415e72aebedb6b033534102bcbef2672652c5c035fd3f476f52568001108dfeaa0386
+EBUILD Test-CleanNamespaces-0.220.0.ebuild 1070 BLAKE2B a24b34700a51bfc28b77960f5cf095afea8f47564f66cf307e63133c4cae4ef5f33834da6016d8b871c7dadff0d6c0fdf61641be02fb6ac676bc6f71ec286f7d SHA512 28189b691f0254f6504d6601c2fba79e119433e726ddee95b176b0a14179276e1cff37e4332a7888d6b84ee496148669ca8d079762ae3fb73b5bd365a4df6db2
 MISC metadata.xml 412 BLAKE2B 17a7dc7d9cc555697f45f99ff40b83d8ce8efb2b7943c66ec9813dbc511f2e7d5e37d794af241b25f7dbbc3e14c0c2d1affbdb3598679058fb54300d8fa012b7 SHA512 eabcc362f81c19f2fce55440c535dcbbb5a22085b18fdba59c974664987480ae93f5f029523ea2281b1d8269aba9c08450ad6b9944874737bc32ae53bea9260c
diff --git a/dev-perl/Test-CleanNamespaces/Test-CleanNamespaces-0.220.0.ebuild b/dev-perl/Test-CleanNamespaces/Test-CleanNamespaces-0.220.0.ebuild
index f65fc6559623..7d8c08b412fd 100644
--- a/dev-perl/Test-CleanNamespaces/Test-CleanNamespaces-0.220.0.ebuild
+++ b/dev-perl/Test-CleanNamespaces/Test-CleanNamespaces-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="Check for uncleaned imports"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ppc ppc64 ~sparc x86"
 IUSE="test minimal"
 
 # r:Test::Builder -> Test-Simple
diff --git a/dev-perl/Test-FailWarnings/Manifest b/dev-perl/Test-FailWarnings/Manifest
index 95e2f3a7f16e..405c23c0ab59 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 697 BLAKE2B 1040454080085beba754f6e61927d0446e90a943ea12db5fe2adf49a7bc1493502ba336e1cfc020a9b20068ec9618d4a6d975c1a7f7caf8f47ab8b382918e184 SHA512 3478a90e7f208482b2ae4e3cac86044eecb18c4764323cb188023029406fd64613164edad5ba1820da6b56d4798aba73a678b060acba2858a9137ecd5e2269e5
+EBUILD Test-FailWarnings-0.8.0-r1.ebuild 691 BLAKE2B 222bf5e01012e4b73bd1470347862c01a644a8b2dc21704219eb2fe44d875caa2126e45aa436d7231de887f7013aab07bbbd050308f8c0373197ed60439ae79d SHA512 6eed0ca2eec4d80c5ba2a8ebcb3d6de177fff1c7cf5bfbe3a1d6790d99216346948e43e3dc4fcb9ec98bba5a996659ccd6e36a8eca5d456cf854b11e1a15487d
 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 2a2b255e47b1..b2a557d8ef0f 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
@@ -1,4 +1,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="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-MockRandom/Manifest b/dev-perl/Test-MockRandom/Manifest
index 378d7eda969f..b9a1e86cc1f8 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 880 BLAKE2B 9026971c09f48005152a715592fc1c8e1070b094e986eee645186c4649001d6b43870d4fa72b78f189294f65968ac926eedaf45b20e43d753a775413f61162f2 SHA512 274f0be077a5efc1ef7ad21733ba7097ce03428d99de9353e2aee76d2eec2b40eda59ecdfec5510143f4d23ca1eac26b20d844105a0da66076645cfa848540d1
+EBUILD Test-MockRandom-1.10.0.ebuild 874 BLAKE2B 727c074b7d5f6850470f2dbd44870f04023816f967e1ae2b68a11091e146cbf43762fa6b18a540d2526eb7219daa3489526760e620d135a8d8a3b3c0e1e47917 SHA512 6b6fb0ab38eb906790441a5459d6c937ac7213d22ed8e1cadde4da496b43c2760760353241a0332cf36bc3dd2b103e5b67fa7696b43265fa4fa83d769cac87c1
 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 a9019d4a7645..c64c23498682 100644
--- a/dev-perl/Test-MockRandom/Test-MockRandom-1.10.0.ebuild
+++ b/dev-perl/Test-MockRandom/Test-MockRandom-1.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 @@ 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-Script/Manifest b/dev-perl/Test-Script/Manifest
index 688734716c60..c860a8f8dda6 100644
--- a/dev-perl/Test-Script/Manifest
+++ b/dev-perl/Test-Script/Manifest
@@ -4,6 +4,6 @@ DIST Test-Script-1.18.tar.gz 23092 BLAKE2B 0150648353772504c3fd315a9487beb9af0d9
 DIST Test-Script-1.23.tar.gz 22974 BLAKE2B 94267dfc75af9aecb02a9cc49f9f41223f85292892db7262bb3d7617dd73dd9a03cb9e98ed58b463b9337af217136d30bfdf29020eeb25947cf0838078534a3d SHA512 996564ba87b12849e86883b970117c9d5806be5b00d42207df1027f823a19497bf878640c46a8286e7d77afb8d1fbb3ef6dcfc0d21c2738a5ef124ddf5bc4834
 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 655 BLAKE2B 4833008cd89bfb2f4d4d11ea52073be04ab850ae7a38155ab6b45926a528d718eb73ec525ef7fa34b3e455ec9cc69e944d45533ec9c9a796bcff1433e7858b74 SHA512 0a2f8f453f5d9d90628a814cc401cf69fccd8cab0b475cfb368431bc45fc46b2fa2716982addd9f10641de213811b4400d0980f7b4f8b738c4c096952823fdf8
+EBUILD Test-Script-1.180.0.ebuild 651 BLAKE2B 538f143964f11fe65032253ff4115829c38f947a97e54f82a5153bf6bc109f8d7fccd10509283f7e654092a56c13afe6b543fabd2a4ad4e37f39f1b6cdc3a903 SHA512 956b673513f4683903a8eaa717865cbda5d8fdff9b7599d88e70fcd6b215913085fe2732063eab0118318aeb50e844c84837d92f7a8df32b20ec87f381b78520
 EBUILD Test-Script-1.230.0.ebuild 649 BLAKE2B d3c0cfd18c96258bc7ab2a5ad277e3a75aca26a61864cd14d41c37e3b8364cbdc4202c3abb0b40103b2b051499a35605b43cd7b02dfc414d6fbee319bdbf68c6 SHA512 79676a38578ce765b1c8aea0448399da2c122c822335801fa717a7664f833454691131e704fd8cda122fc8a15f28328867594603663391770f50d1e0fa9027e5
 MISC metadata.xml 394 BLAKE2B 37e062fb84c0a2fd2277ca3ac7a06e4d76e2dff12a4c9a03ed3704bdeb191fc61762078bfa90a22c9c1a9663c346ada26df66428cdae0114f795521be918b533 SHA512 aada2f2396d768e5b41edf9d6c24f030cf137d3eb3341f560935ca014ff6fb3b747908cc673bfc66a21863dc33a4ed3dbd82c5ee04b0743e6732115d669dd4eb
diff --git a/dev-perl/Test-Script/Test-Script-1.180.0.ebuild b/dev-perl/Test-Script/Test-Script-1.180.0.ebuild
index e1956c33a394..a7cb8225d867 100644
--- a/dev-perl/Test-Script/Test-Script-1.180.0.ebuild
+++ b/dev-perl/Test-Script/Test-Script-1.180.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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Test-SubCalls/Manifest b/dev-perl/Test-SubCalls/Manifest
index 86efe90b1ebc..cc6eac3b788c 100644
--- a/dev-perl/Test-SubCalls/Manifest
+++ b/dev-perl/Test-SubCalls/Manifest
@@ -1,6 +1,6 @@
 AUX Test-SubCalls-1.90.0-dot.patch 213 BLAKE2B 3559c7f300097d2bf76f8086f34808cc0124e9bd3268dfbb458cb26ce947e50764e559935738fd4fabfe81d5d593272a6b54bd7f83078c1b40635b65fae1dc24 SHA512 49d12a29013f504b0432941365bd6be29b85be1194799ad33eeddb256a6f82db5d0264e729259e5de7ef2d4226a1ba073b2cf43aa7361fa8465dd7d62ca96773
 DIST Test-SubCalls-1.09.tar.gz 25727 BLAKE2B 528f8f0c040e384bd765b14401f1340d41c24810d5a36da22886aec31fa5fe098ad5fcb409a74dadd96d89b6a3b3ffffef684f0d143592cb6d7cf12ad967b52b SHA512 d5a5341eb70467c47ea71d54726bf1c5010bca69b30d5347cb682b0feaec7dd17525075b48b48237c256a31cea3b735991e5dea51b8f5d989f09362b11f6dc7a
 DIST Test-SubCalls-1.10.tar.gz 25431 BLAKE2B 5fa320a10896a6db6ba7e2cc7ee12a052e66c9a9b290624677b92055f031251b931d8417c2901f0738fde61112586d0b23e332f5df550abaa95a25f29dc0e586 SHA512 67c64eeb9dbf7ed2f5fd4461316ee44cba4f503c6b822a5fb8c3f100c3d4de7ac09058afc0cdf355549829d8e412d1919bc64a1f3030f16f38775b029936a4f9
-EBUILD Test-SubCalls-1.100.0.ebuild 550 BLAKE2B 96a8002f4f0e6177b247cb172f686b2867b26b801001ff40d7fd1b686b7feef96020360f7a393268a67ce3f996c415d42e253898550fe8e8aa58d4ba2e06573e SHA512 8fa93c14f3123d17678841bd511963566aea9de1bc0191c733a01d2f3c2ccd09352303d38ed0328d6b01d586304a7d972417725c64a5cfc24d6cf8111032e353
+EBUILD Test-SubCalls-1.100.0.ebuild 549 BLAKE2B bbf43a8f0cc4f8570d22e54f5b0c5ce43cc4c902ab2c2bfdf5a593e21dd668564ba51f4a2a0a7c2c4900e02b46a8bf219e374c5eb3ddd8af5066f54aa2a1d115 SHA512 6924b9a39939527a1f7a75451c5c982876f0b1cbbccb1c7645e04cfb3a2c95bb09bfa749e3e3020dfffa9937d509e23c51ade79cab12814badc6face50feaf15
 EBUILD Test-SubCalls-1.90.0-r1.ebuild 476 BLAKE2B b4c03558007d7bef60399842e9e2a8f88dc27c5bcaafb501675a4b748f3363734c53e452e7fc640daea960b5e81316013a448c308ebec775c50a3016bcab4e43 SHA512 2ef3348ab538a050e047fdc47f825a35b3c23ee49bf4d660a4c86864840a838a56a1b7f8fb8ae46455a5ec267e412a9d544edbe84433e051322e4ba91f077c55
 MISC metadata.xml 398 BLAKE2B 9a60ca0aa159c39bb94726b0e4cf12a597cca08a7e64db60bc5734ecae34c5dd51e63dec037615998a280a3567a1d358e09f36b44c038873256a0db5fe2d6f71 SHA512 0f0350017f614665ffd3c1f3bdfc66c9f3a2b43d5004a8f7a032b21dc880c556bd562a375cab9c0cb7158716017273c264e4acbc0fb557e37d4b76bcdc35080b
diff --git a/dev-perl/Test-SubCalls/Test-SubCalls-1.100.0.ebuild b/dev-perl/Test-SubCalls/Test-SubCalls-1.100.0.ebuild
index 1ee2277825e6..98bfa816024f 100644
--- a/dev-perl/Test-SubCalls/Test-SubCalls-1.100.0.ebuild
+++ b/dev-perl/Test-SubCalls/Test-SubCalls-1.100.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Track the number of times subs are called"
 
 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=""
 
 DEPEND="
diff --git a/dev-perl/Test-Warn/Manifest b/dev-perl/Test-Warn/Manifest
index cd344e04b5ad..7dcecb541d25 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 680 BLAKE2B 4a07a03ef5ab2652d9cc9680b05a8c21803f4fd3c0298d4b5d305e0c0ed0138db48b96b8a0760f1e9cda4e47fad8de8a13751a690d0b5d1dadb92fbb561d9249 SHA512 d5a37ab868959a169e86a92c9ea7f81383a7a4a920104a7273fff924bd049c64a8c17d78b4ecbcca0b681a69ee3c668be5f186bd7aca507162ca32766bcf8861
+EBUILD Test-Warn-0.320.0.ebuild 671 BLAKE2B 5adc6c7251e1dc310ab65002f94a75987d8f3197ebcc55ab38e865cb61fa46eab2745a98f9575557f5f09212c7749eb0159735efa185c62c8c3b505399be3e88 SHA512 81ec501dcbc17c404164f720dd8fa9f34663984ee4c8e5725a0909cba08cea211ca28f1999772962d06a0943cd51b4a9e552f0862798ba418c372ecb6aaa2dc1
 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 cba2bedf170d..2afe35aa6d2c 100644
--- a/dev-perl/Test-Warn/Test-Warn-0.320.0.ebuild
+++ b/dev-perl/Test-Warn/Test-Warn-0.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="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/Text-BibTeX/Manifest b/dev-perl/Text-BibTeX/Manifest
index 51189c0befca..58af32d6a31f 100644
--- a/dev-perl/Text-BibTeX/Manifest
+++ b/dev-perl/Text-BibTeX/Manifest
@@ -1,5 +1,5 @@
 DIST Text-BibTeX-0.80.tar.gz 296711 BLAKE2B 65e4402337a25a0f4ee0399d9c6c73a02eb0cfa38a911e824fba934b3075b2e801dbc38dac4c872dc200af78bff99151eebbd24563d00ea0b0640d8488a61658 SHA512 5fe2840ddd644578a5c4757ddaff9f6b0c943c54b5c74a8bbcbf4e9d58a9e204cdba38736251ddb89c1702a524d511651cd016b4cb3d4a714bb389ccf8366b6f
 DIST Text-BibTeX-0.85.tar.gz 299430 BLAKE2B bec61d93a4a0814bf1a6f357481da5ba337dd2ec4699ead948c9d4a48062664e77781babb82279582d04e3aee2ba26eab6c6a5b31af3008a076612c6f8cc4261 SHA512 e9ed337bde11b26626fc43c03bead2be54c0724194e19b4f543923634533220bbd68588f6349892eba0e6df6d305a51350fe82cfcb6cd24ea154284e4819b841
 EBUILD Text-BibTeX-0.800.0.ebuild 953 BLAKE2B 0c7b469b8761646a263478e15c82da5d53b9c9b04b949c8f033c7ca5856a2a8023afb3d9ca093ab3b446c2e6f83dfc0da023b7f7e9fc93ce7dbffef8aa8b6800 SHA512 2735c9382db94913ea700245b5ea215b8576d4b3e33aa6a7f55f5951a3f8da0619e945e24137b8e033262aa04acf51df9e48b3fada99308855d1595893e628d9
-EBUILD Text-BibTeX-0.850.0.ebuild 962 BLAKE2B f8081eeb014bd328da87205e57f687ec62f3ea41e3562e695881cfb953277dbc8df57590fdf952e85f085bf9a574e95a9a23d26a2807638e9b4550a301ea4042 SHA512 a4877d254e6aaf0816d9381e4d866158403624454c21c319653122fbcc8f59e32286be3335256cb2d15fd8b14980b0f59170c4aa7982516f607801ee816e01cf
+EBUILD Text-BibTeX-0.850.0.ebuild 958 BLAKE2B dc85441fc47d4b2b59a20c6731ddce53dcfc352b6d42c07fa948ce101270b29e96a7f772824976dbcd424a67968d3fa463ea5add2c3eaaad92d8eb34d41804a9 SHA512 fd7b433ca5cf06dae1b4d243eb7b9c6cb0d2f7ab44d70d9dbbc0c0abb3474f8d5942b985953e79f0c632badbeb406fbfc93381fdbdb99018182efbcb0b187df9
 MISC metadata.xml 1225 BLAKE2B 19cd79fc193f340c1251b663a74d1d8740bec487f352b665e344df91f76581a679300cbd5c5b01faf3e528c226cf365ed006036f89d9a12deb220677ffb53617 SHA512 f9b3f93b882cdf4d80ecebb0e4cf0d91de4baffa84ddd88708b6c5e3cfdee3791ccb1df40a61e6fcc4142a61909f94e40737d4ec83ff6b15ca9a7e7fc15db886
diff --git a/dev-perl/Text-BibTeX/Text-BibTeX-0.850.0.ebuild b/dev-perl/Text-BibTeX/Text-BibTeX-0.850.0.ebuild
index d06a2acd8f15..186cee752889 100644
--- a/dev-perl/Text-BibTeX/Text-BibTeX-0.850.0.ebuild
+++ b/dev-perl/Text-BibTeX/Text-BibTeX-0.850.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="A Perl library for reading, parsing, and processing BibTeX files"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Tk-JPEG-Lite/Manifest b/dev-perl/Tk-JPEG-Lite/Manifest
index 23314c27f483..d19057838afe 100644
--- a/dev-perl/Tk-JPEG-Lite/Manifest
+++ b/dev-perl/Tk-JPEG-Lite/Manifest
@@ -1,5 +1,5 @@
 DIST Tk-JPEG-Lite-2.01403.tar.gz 19328 BLAKE2B c5b67db84cbc6fa74fb586eadcbf84909d62dd7bc99ea04986e3601c0a51cb5878af1e84452e6a297eb056fcd9fcf7f3bfc00ef091e634cbd814b37ca05e20a1 SHA512 1c90cadbaff4a9ba39eec7e83d82ccba262d320dfe82968a7ed8b9c2eaec76d24f10177fd70425f2072b498fdd0ef19720af737fff667187a7be5712977c42c5
 DIST Tk-JPEG-Lite-2.015.tar.gz 21406 BLAKE2B a9499ef3a8fdec43d184e385885ca18926f70f972b47bc3871b15bf7660e22cd8477ee04c9eaa66548cf435055d283428134523cfd67c33f6bfb4a3e8667635d SHA512 959586f7cdfa516fc05eac352d626367fc5cf37f452713afea1d87e017f427c15c425a722e66db66d90dc98f942831e5437a4c8a2aac3179824105481a28c1a8
 EBUILD Tk-JPEG-Lite-2.14.30-r1.ebuild 612 BLAKE2B 5f0f9e1945757295168dcfe3edd599fb2033ee55613d7a384103649ea86f5b2452fbc54717bee8af8b388d195441c8a08dc748a5668e0e3e9686189296b4c286 SHA512 63fa5eeb4fdb86a048fae5c492bc9f28aae643063be4b06f4937a3d3b899fc280754bb7afdfd89345aa266eb6d03384a6964a7bb3b4bca409b6cf0160a21cc10
-EBUILD Tk-JPEG-Lite-2.15.0.ebuild 470 BLAKE2B f263245c861680336d58765ea08b388c8c036fc2837eed5e0e52b5c9de81d0df965cc5a71b57aa3cca03c3db189d8dadfde7c08d7ecc01d1485d5530a5052ea7 SHA512 b89f3d4e67b69d205f45d17ba6204642678cb98e9640d9bf4a8e050dc10c264eaad7b422e43ef6224654f1bc64742539e20dea5098ade1df637dfdbcbf588c70
+EBUILD Tk-JPEG-Lite-2.15.0.ebuild 464 BLAKE2B d2355d8746be0ac3e24c8c586b6b8c8681f38105f062a3207251412ca5b4a70bfdfc9a06967fefa01aaf15d3b4ef3bfb9e4ebebf384de293c2a245f759c4015a SHA512 ee8ced904fc93284270562e910435b40324caf2ebea1cdaf80cabf42c6a6fbc2afc4fc1cd3b5a324ca520f358f86d86ee7653c94cbed68d14a3977124f25aa3b
 MISC metadata.xml 397 BLAKE2B 0d3b28e02ad403dd3d1234d99778e4ed3612413ff8d514a61af3862335404f2bb97141ae767d722d10b5f1b4b87bab018572a80fca93995613a9abc1d588a2f3 SHA512 e15b8ce29fe42df66a5701c8a739b5c95e03bbf226f2a4962aa872f26119dbc06fc9eb41c39844634bc53d3353ad057d7165b1d80862a62e8478db545ca37d93
diff --git a/dev-perl/Tk-JPEG-Lite/Tk-JPEG-Lite-2.15.0.ebuild b/dev-perl/Tk-JPEG-Lite/Tk-JPEG-Lite-2.15.0.ebuild
index 158ec4b3c11e..ef257be3fb18 100644
--- a/dev-perl/Tk-JPEG-Lite/Tk-JPEG-Lite-2.15.0.ebuild
+++ b/dev-perl/Tk-JPEG-Lite/Tk-JPEG-Lite-2.15.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 virtualx
 DESCRIPTION="lite JPEG loader for Tk::Photo"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ia64 ~ppc sparc x86"
 IUSE=""
 
 RDEPEND="virtual/jpeg:0
diff --git a/dev-perl/URI/Manifest b/dev-perl/URI/Manifest
index 670de381d479..cd1a51f60ef2 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 848 BLAKE2B 15b145f2769b2c33d6bb72fddccab3c11a8eac89be00dce5063d15e820b27812c224f53c24b4ef7d2a83a58742a665d215e6239f78c623aa452298ad05a7dac0 SHA512 fcd9635892b068bde2bec2e24768fd4b9a2b29e9f1a9618d2039d074df3e9ec8d26af6769f30e0abb0f4e9fd4848b386dedf61e995ddab516147d00de536e6d5
+EBUILD URI-1.730.0.ebuild 893 BLAKE2B e6092a0ff1b4f313683e6aacb007caf76a0ee5d0ebce0a00f120b24e448f4960ce61d955d08ab04b69ba9397ee6d5033df4e6361563296fc0a492f0bfbcef676 SHA512 216f29ff14482c5ffdf5c95223e8a6a93559f638e88bd9cc53123e81c5208d6159fcb9793693126b0ea45612f1e8a09816a78c41c895f669713f6487102d3441
 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 6218cabc6999..a2d442d691f7 100644
--- a/dev-perl/URI/URI-1.730.0.ebuild
+++ b/dev-perl/URI/URI-1.730.0.ebuild
@@ -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 ~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 ~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 2f2be6856359..fb958113fda8 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 561 BLAKE2B bde67792a3e119e0e6e9c03dcaf229f0b8c6faa145ace2a24b202eb6edf799bb31f40e51803ddc190af9b5cbea6a489d55bcb32652ce48f56c47f1e27cd46d87 SHA512 d1ff0ddcdac1974816ea4b167d638c056b035e0f60dfb4c3483b6165ea1db01f0f9afb8f51bde77c33b01f8c68c95275c7cfe5a305fdd4dc274893111298c8b8
+EBUILD Unicode-MapUTF8-1.110.0-r2.ebuild 553 BLAKE2B b9bf4190c923cfe8b761c130bcc2b1b50f5310d956f2092da84d20f31789bf38e25ff3a4668db14b4edc628b50f594b524e428aee2ebe54173a19b183706eeed SHA512 3986b4b6ddbf34aeb3e0a4b3aa35e0786dde23b29a10b9cce931746ea730814717d41c88485ef19b605a541c4ad3dcfd7e0346a12d0f93f3bcba5c20ca08d888
 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 56cf2032540d..6d08908f12bd 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
@@ -1,4 +1,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="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 5ea905d441c0..71409a49e7ea 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 745 BLAKE2B 85e33211651b878222500f27b29d160b08eb3afa650bdc072ae49f3574f1c2277df066030d0da60f68ddb239cd335fa9023bbbaf5efe82d0458898644254c135 SHA512 c4247cddda5490abad9c54e2d8d0abeb8d03adc634d8916f88a88717751957b8d1222996f2df39e124247ebced29ad289e6494bd9f4e4102f8b05d75649ad96b
+EBUILD Unicode-UTF8-0.620.0.ebuild 739 BLAKE2B 150fd338017d2f0aea78a5599dc5dd004d3319bb191fd7b14f817eb2ad24bbb4b19814135d9c475fdd13f43b8a118380964932d1a70c22e13fc73ff226b4e346 SHA512 a17b50b96fc84d75361d8dad28dff8a133296b800fab6683d2842b4eb1dc3af5c145803888af0fdcaddc8f012250535765f82e307650bf5217b62088c2006e85
 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 b206df8720c3..18bafd40170a 100644
--- a/dev-perl/Unicode-UTF8/Unicode-UTF8-0.620.0.ebuild
+++ b/dev-perl/Unicode-UTF8/Unicode-UTF8-0.620.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="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 be49d45ce147..1de15e0a13b6 100644
--- a/dev-perl/Variable-Magic/Manifest
+++ b/dev-perl/Variable-Magic/Manifest
@@ -1,5 +1,3 @@
-DIST Variable-Magic-0.61.tar.gz 78663 BLAKE2B cb8153308259b03bd65fb9886edd0ae58d2d892afff403517c799064b19b69106e24872b5505276234dec688b0408469b2b6213d0e624e0e130aba798e7ea73c SHA512 32f27e6faa7f7b6e8ef512eafdab648eb89d11e16b4d5a703523d423d0e6436685a5b6f5751d96f4981872822bbdc5a957cb61b898462c8a4827cbca0f250def
 DIST Variable-Magic-0.62.tar.gz 79009 BLAKE2B e99fc85fa3765475c0393e7c396e3ead5bee3ac49d6d6e82a1ae3ec962367303f85ce0a02dbcfc24189ec29e820650810035c9fe74aebba24ceb24485926f46e SHA512 fdaad8ab1a16a4723e30a155086f7f9ecad60b021b0ca5d449a0bc001b858a53e2857cfdc3fc4e3dcc28e2f59a14f3531afd93e3f71fda3b8fcaa8bc50d0c380
-EBUILD Variable-Magic-0.610.0.ebuild 569 BLAKE2B 921f3fa773bc4727efe1f9fbe81b7c34aeb2b0d5741fae27fba40eebebf51fe202351064fcf9faa09cf2bd0167c1272670a3f2bb8bbef466281a729f5b734009 SHA512 ddb0353a8cff4e8292582d096019cb8128031bc5f008f5c0ad784c73952750eb4fd38b90f64c25962a21aed2afb1381c4f1f5bff7c7587b80fe460796d05618e
-EBUILD Variable-Magic-0.620.0.ebuild 582 BLAKE2B 901b1e4a2ccd3c7b552074ef58e186ff05722350dd3e9206cded1b833c0ed744c92731c2661710cf95b19a53032b06a191978c5d19d951ab61391af2c2f150c3 SHA512 a75241d0b238632eaddd1a34f596cd8ff8d32ffd8f76d5ea76ca5641e849c5180522fe4df39e1436c5515d26672077ea8a868eb2d3f41cfeda7ba40a1ae6d2ed
+EBUILD Variable-Magic-0.620.0.ebuild 576 BLAKE2B 29cc0be70e30ceeed9fe1b7c04e236ec3622e79ae8fcc2f96f240ad036f4ccdf375545d38d2ec61d81f0a57f1c643a04a51fb04e17009c8fe420d0f4d92d9d3a SHA512 1f51e10dc536158a6849d16b66357a346d7f39c60d39bc3e3754f15101d60b0af04c4b0d569dc1880a1cc8d96c5c29762cd386caa41d9247d4a6b0a1b9459fb2
 MISC metadata.xml 400 BLAKE2B d64f4563ea4cd25cb51d26df159071319ed1381cbbe5128198cffa6252493bbb4b89be911080311934b51d736c4a90dd21654b39043f369d95ae3b6c837af660 SHA512 81b3eb37457b11cc8ec0674cc934402d65629ca51726cffa1a5ea7c17744b864fc55d867597f7881464aa4a633daf289eeea8c97b903efbefb2776d6a4148a5f
diff --git a/dev-perl/Variable-Magic/Variable-Magic-0.610.0.ebuild b/dev-perl/Variable-Magic/Variable-Magic-0.610.0.ebuild
deleted file mode 100644
index 0043240f28a7..000000000000
--- a/dev-perl/Variable-Magic/Variable-Magic-0.610.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
-
-DIST_AUTHOR=VPIT
-DIST_VERSION=0.61
-DIST_EXAMPLES=("samples/*")
-inherit perl-module
-
-DESCRIPTION="Associate user-defined magic to variables from Perl"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-macos"
-IUSE="test"
-
-RDEPEND="
-	virtual/perl-Carp
-	virtual/perl-Exporter
-	virtual/perl-XSLoader
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-Test-Simple
-	)
-"
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 dcb76578eee4..8666aba0beba 100644
--- a/dev-perl/Variable-Magic/Variable-Magic-0.620.0.ebuild
+++ b/dev-perl/Variable-Magic/Variable-Magic-0.620.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="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 ~x64-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/X11-XCB/Manifest b/dev-perl/X11-XCB/Manifest
index 4c2f36e0e7d3..170fd23944aa 100644
--- a/dev-perl/X11-XCB/Manifest
+++ b/dev-perl/X11-XCB/Manifest
@@ -1,3 +1,3 @@
 DIST X11-XCB-0.17.tar.gz 90833 BLAKE2B 7de56a99abb27373f0473e4d98c177d3db4f4811bdee358e79a85db26345e59f3dfa0998e10678fce1585ddbf1f58796f75d2adc198ec6d23ae521720b3d93ae SHA512 8a5457afdb3b32fd6d425a27dee1a6afbbded222cf71a9d7201ed2c0db0b0b7c803ae3e69a897c510b9b07b79e880efe0cf062ea025d2d3ff7ee16d364c568bc
-EBUILD X11-XCB-0.170.0-r1.ebuild 935 BLAKE2B 70d7dcf4e35fbb590aae1b3de62c120def846afe7cb3ece50693dbf0332994d53327c95db0fe8eefd106ea1c496200e8a4cca3dd1d5f4d0bafb45f4e1d149edb SHA512 654bc78c21c329c28eb6bf4d12e9dcfcd8c1229fe0d59d95ad4381b8bf1955e9b4931755530487657912e8732f1fa2962f2119b7f95113b9e64731e5e88c3c57
+EBUILD X11-XCB-0.170.0-r1.ebuild 930 BLAKE2B d1d347f5bd499ba9cc3b456497164be4b0989e2db26500eddfcd00b6ba57e075bafc5b952e291b6699b4567789f22bb9f5d5a6d73d1ae64d15704e3de297fd09 SHA512 4589300bf031d0b49660c9f471e1939b45ad235281b34f17c478b54a8c628b62769a1f0807ee90e999274a4cc760d4161d24f28c86ff327a49cc25317caa277c
 MISC metadata.xml 1271 BLAKE2B 0ee20f9f998f19334c078ffdb26e9ec0cb8d7cb14ef8dfa9d7cb0aded10f89655048af8ab91d11079249b73d84e532d590202af181645df1df71b79b56d098fe SHA512 279d8c3522207df5f1fb7ab6188e8f8848bd18c25e127d1f59765ddb5a6b0fcb89e949ccb703513c592c781396f893befe7a46f9083e4c94640c3cd112da29c2
diff --git a/dev-perl/X11-XCB/X11-XCB-0.170.0-r1.ebuild b/dev-perl/X11-XCB/X11-XCB-0.170.0-r1.ebuild
index 7f439ecb1b9b..8704936b210f 100644
--- a/dev-perl/X11-XCB/X11-XCB-0.170.0-r1.ebuild
+++ b/dev-perl/X11-XCB/X11-XCB-0.170.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 @@ inherit perl-module virtualx
 
 DESCRIPTION="Perl bindings for libxcb"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/XML-Descent/Manifest b/dev-perl/XML-Descent/Manifest
index d141834b26f8..bc9a30bb778b 100644
--- a/dev-perl/XML-Descent/Manifest
+++ b/dev-perl/XML-Descent/Manifest
@@ -1,3 +1,3 @@
 DIST XML-Descent-1.04.tar.gz 15212 BLAKE2B be3f129dd27baa07231d5a8929a9f87307f7c7cb4fc12e81a0020b7a309ac68540b4c57c1dbacfb0cc084910ced7b48fbcfd83ce21dbf0afc8d76d29ff45a16e SHA512 779a476907ecfbe9c279fa1f476c3aa64de626c515719643be21fef8b945cdd5c1f654a189bf7ea9a6964a88818e101e1eddc019439a5dcb397f56b13bdfa415
-EBUILD XML-Descent-1.40.0.ebuild 481 BLAKE2B 4533e5a7ba216d095d014678579dec9fbb43ef8af1409ea70de00872ef05c48fbb78e75af534073fe77130b4a8d3a05e2bd1db5955f9cd570ccd38126e351a17 SHA512 60b02fba5a3de8b040c1fe76f49d7b06fc14c7f54e60398354cae10fef1ea5f63b2437d389b1b7c0f2d04cfff7bdfadaa1567eda7df1e0183108f54dbb3a5377
+EBUILD XML-Descent-1.40.0.ebuild 476 BLAKE2B dc5b5126e6ec05cba1aa246a95aa2bd154461710589304189e6ee13ed11ebc072a8ef2f7eb76b3915470067d4657c0f349211210255d39f0d500200b651d1c67 SHA512 671002ac3d6150b89c6defc68afc0fbabf6126523abe1adf3101ae45427588e6337808a14058259eb47e35d28f077aa057f1ff6c402d295addaa9e0a35082597
 MISC metadata.xml 394 BLAKE2B 1d9879e93ce8e960d600870744aaf26691895fc6e242d89de9993a7e9ce264ba326d5378e81ab0f455fce5ecf267de0837ddf8aecffdf22a1b7f4f2682039d8f SHA512 821c81951697ad7164a18538068b5a6e391ce32318bcd5880d393415cb12681e3e66fd94c1e8d872fe9d65d4e47e4f7dff9b68efc31d2fff43cd5ac9a9eb9a46
diff --git a/dev-perl/XML-Descent/XML-Descent-1.40.0.ebuild b/dev-perl/XML-Descent/XML-Descent-1.40.0.ebuild
index 2f8148a41ba2..77dd1dc2cef4 100644
--- a/dev-perl/XML-Descent/XML-Descent-1.40.0.ebuild
+++ b/dev-perl/XML-Descent/XML-Descent-1.40.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="Recursive decent XML parsing"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/XML-TokeParser/Manifest b/dev-perl/XML-TokeParser/Manifest
index 13003de51128..b172cf020cec 100644
--- a/dev-perl/XML-TokeParser/Manifest
+++ b/dev-perl/XML-TokeParser/Manifest
@@ -1,3 +1,3 @@
 DIST XML-TokeParser-0.05.tar.gz 10989 BLAKE2B befe52db43a34d561931908e6bcaede89c93ed37b869a2dd47668af8299cbd3e4f27aa533ad82601546e5a1652841ce9d5ca035b24d6b71a4b6d47c66b55e0b5 SHA512 c19be15013a04908ae863ec1095af34785ad6050c8f895759e98053a0c097c9a80f5c99d33e30675c003cde7eb3b9340e866bc90c5fbcfcad93666df42439a7a
-EBUILD XML-TokeParser-0.50.0.ebuild 367 BLAKE2B 5554ac9e5d5757a2db7b26671512a2c3c25a9c607bf26e88aebdf2ebf3586cf37ece78958b05c8bb1ea084700cb21d236bfb3a012831b1aafa608b16fa174c08 SHA512 55510dbcc14ad38064e5662fc4145bb6a23f95505aaba5cb3a9c1aa2d283f128d8672897101e6d7be86fc5ab9f546a6a923d8860e2ce8fc6edd59deec9ef6e51
+EBUILD XML-TokeParser-0.50.0.ebuild 362 BLAKE2B 4a87612bbc84517ea484485129505ae369688da33777e4d303fcf74c79c9f4e5a01fede798ae284be76444cdfbc8f86f261effa0ac21fe5e8df061a8b8b667b8 SHA512 590055d45e6fbda8a7611a9b8e0fffdc9885268a5e26509e9e77263ba5feeef3e75a822a1f650ae1e123dc81eb4f1bb616edf1ea327bdf949e9dbe4b2999684b
 MISC metadata.xml 469 BLAKE2B 9ad9e50687658d2147fdea29576b2aefadc0025636562706c220254704e3ded1778ffdba6c98bc7a3156836afbf38d4ce0def40e989d436f8af79f6338cd400c SHA512 17d907d75f629440fc25c606626a7c15ec0b37941f8954d9bc46334dc0407957a5f00a807e436ca6a70cfb16ece23e29fd43a1d583c0d478c0b929f3f775c88e
diff --git a/dev-perl/XML-TokeParser/XML-TokeParser-0.50.0.ebuild b/dev-perl/XML-TokeParser/XML-TokeParser-0.50.0.ebuild
index 196835cbf6ad..6f8c6a1bd796 100644
--- a/dev-perl/XML-TokeParser/XML-TokeParser-0.50.0.ebuild
+++ b/dev-perl/XML-TokeParser/XML-TokeParser-0.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
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Simplified interface to XML::Parser"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/XML-XPath/Manifest b/dev-perl/XML-XPath/Manifest
index ddf37f3f2227..7d87fdcb419e 100644
--- a/dev-perl/XML-XPath/Manifest
+++ b/dev-perl/XML-XPath/Manifest
@@ -3,5 +3,5 @@ DIST XML-XPath-1.37.tar.gz 54747 BLAKE2B 20b8c556e5379e6b655a26c16808c76dac60420
 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 662 BLAKE2B 84722e831861c62c1e22a8385c6c3a480cd8b2da65cf632ee04e3f64a44ecf05c9fe6e122e7b0edabcdcf5e45a15ba3faaf86378b55fe789b17a6980bc3dfc29 SHA512 f7e5350fd6bc7ccc3ef92dd076add82bc5a1ffda3a53cd5fcbf47ec3e6502c8b37d139909eccea7ecdd921a3a663a97f3fa419f1ff698140b8ab29ad957baa5a
+EBUILD XML-XPath-1.420.0.ebuild 653 BLAKE2B 553151f93c0bea1d24658d264f4789e0e700fe8a55fdfe3fd56428691796491a586683e5eb4f98cd1a1440e6e415780ef50216e6f515acc742b441b4852095e8 SHA512 5f2f0015c4ea0fba43d51940c17234d117780101f8917a946130460fd7e5dc1d22e09f50f0c2467e64eea4bb1b75dcfe4c5db35e60831ca6c638028d7cfd5331
 MISC metadata.xml 2322 BLAKE2B 764deebac617014956ef0fb69432bea3063f4b5c5b2467394468417e3d5cbf5d3cca0c550d0b8c155f58dca44416c46f9fc43e03f4a17e5a2bbd3f3c90474af6 SHA512 b75e8efc7beb5ad2732323126cd20dad66b01986427a2dd97ace202ab7a65b2d3604df2f2a7c9314659c12ef1f9cb8c5d442b5ba6838dc019ec24edc22d80efc
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 8cff96c88785..5b0927ce6c2f 100644
--- a/dev-perl/XML-XPath/XML-XPath-1.420.0.ebuild
+++ b/dev-perl/XML-XPath/XML-XPath-1.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
@@ -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 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/XS-Object-Magic/Manifest b/dev-perl/XS-Object-Magic/Manifest
index cc5935863475..5eb4e5767b89 100644
--- a/dev-perl/XS-Object-Magic/Manifest
+++ b/dev-perl/XS-Object-Magic/Manifest
@@ -1,3 +1,3 @@
 DIST XS-Object-Magic-0.04.tar.gz 66287 BLAKE2B 74398a71b2a2cd2d867ab6624fe88de19e2730ea1d1ca641f265281de2c5024b38543d171d5505ba6e3271e523d390dcb14a7f0625c988efba472c6bffca4b42 SHA512 315288496c0bab79f16d010f7f140dc1483bb3a1053a7fc41a048308aa1f9ae01b03795be28f132c856360176372d2251315ae62db950e377be88ff222a441dd
-EBUILD XS-Object-Magic-0.40.0-r3.ebuild 713 BLAKE2B 4a9d211e82c70ecb4debdb038e7e229a8eb084f88a4bddfdb25360503cbab68cf706e7148f17b275b48e69c584b76be863933772edc6e0f572da929506622047 SHA512 42b987d5d56fa9b6db63d461861f56e27a3b175987dc9f75465151d8015a558819ab2ff2cc3d85b5e68eda634ae79e515d1b54f2ea2ffd0800d20002f77eaa39
+EBUILD XS-Object-Magic-0.40.0-r3.ebuild 708 BLAKE2B 7fc62b806cc8017e686985e5ec8e25339ae1e7edb2bf49d9b9522030cd03feeae44eeb4813ce2570a08c48fadb0843413a9cf00de7e5bba88d70e203f69bac60 SHA512 89d93205bcb744f59b80455071de7e60d1af4654abf800e90ae3fdc8c898e4690f55e62c96e1ddc3c6cb054f0e4bf9a9f585b52402a52d7664681ab87e670107
 MISC metadata.xml 483 BLAKE2B f0a889008afa432cd8596bf8927de8d92ca6766c16dd9ce168b4bf6306bbcd8ce589a320b595f057c891f019621a1d02f2e2299cf7ecd26c15b05afee1499f57 SHA512 b21aa3118b2cd7810c7cb81febb9a459b05e7daac49026de6497a510cfc8d8acb2739e290860a7f3af007ede273d62976360c70dc40dbc2fc1049ab3a7b4f11b
diff --git a/dev-perl/XS-Object-Magic/XS-Object-Magic-0.40.0-r3.ebuild b/dev-perl/XS-Object-Magic/XS-Object-Magic-0.40.0-r3.ebuild
index bbfecf19eb0a..14b5b52e7d7f 100644
--- a/dev-perl/XS-Object-Magic/XS-Object-Magic-0.40.0-r3.ebuild
+++ b/dev-perl/XS-Object-Magic/XS-Object-Magic-0.40.0-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
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Opaque, extensible XS pointer backed objects using sv_magic"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/gnome2-perl/Manifest b/dev-perl/gnome2-perl/Manifest
index 8654068e1977..0c6e4d25443e 100644
--- a/dev-perl/gnome2-perl/Manifest
+++ b/dev-perl/gnome2-perl/Manifest
@@ -1,4 +1,4 @@
 AUX Gnome2-1.046-no-dot-inc.patch 9535 BLAKE2B 784f1059437726d2e6e93f9b961ea0f712f6a3c2d12938b8b9f01027dec2adfc08c11ccc7466470815fbfdb2be9c3c186b50de441059fbee6d908ccd9bd6d0a0 SHA512 0fdf04f1f71cd365197dc2b641fe7102a1639e70679c902d357eb8c0fc3433d37ef1f519f3029c648587795d17849bad2f9d39e510bcb546c856f03880562991
 DIST Gnome2-1.046.tar.gz 80275 BLAKE2B b6586944ccaa3bb899f7438c32b231846fe89062a94f1031a9d1a9085e81286b7f5694569525c885946c02366bf9afc4a05ce81108a6b9471b35c468c9e3877f SHA512 0e4ee564b4514e63c3b66ef72aad6780e79d0f8d0376d7cbb925c579773d96d5fdf0918c90c0e1cc0f4b0be2c2d0043a54ec700361109c6b4b576627ca1d9efd
-EBUILD gnome2-perl-1.46.0.ebuild 703 BLAKE2B c4147c90782a6bacec466f5f91ba1a934c37fea61f5d213fe467a1f65881b570c87f92b60d6579f38909e4b13d7f1e0c2d7cc0ce3e1e21ffa35cf8f90b7e7bc8 SHA512 0a28d450df461e5213a60905b5a52f2084b17788d55c80142b2166bc196c065330b1488896ebf9c00077354ebc34fb87fb5d59fa01f5f6a91a9ecd55f3444478
+EBUILD gnome2-perl-1.46.0.ebuild 698 BLAKE2B 50c0e82694daa2d5b0bb0734fad2a45ec06a09712d130b4cce9e21e7597f93c2e6d29cba9b99503f6f6eff9476ab534fa78545cd16fb6c02a4812e92882434e3 SHA512 76ec94a4e8ff65fe81683fa407236620756b99c1e3df5213570dd10bf549a2e7ffb7bb4e2c991b5d09d9141c4609b0d7afa01b5922060e33362fba0fc62ecc8a
 MISC metadata.xml 439 BLAKE2B 37defd2c398c16bf6433214635c75f38c9af376bc4fd01c4ab04641b9604b9e784934bf3da9eb1e261cbb47f663e2d4aa600bf27df286d3a587a93893608c891 SHA512 34ba638f9c96d9cec2036725b71c7604e78ad8fdc6057a5f21bacd86422a3c51420146fc8f756071c34e3b5e654da280096c9c0afb86f808fff5f8b1ce84cea6
diff --git a/dev-perl/gnome2-perl/gnome2-perl-1.46.0.ebuild b/dev-perl/gnome2-perl/gnome2-perl-1.46.0.ebuild
index 3c502defb56e..0a63c168ab77 100644
--- a/dev-perl/gnome2-perl/gnome2-perl-1.46.0.ebuild
+++ b/dev-perl/gnome2-perl/gnome2-perl-1.46.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://gtk2-perl.sourceforge.net/ ${HOMEPAGE}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~ppc x86"
+KEYWORDS="alpha amd64 x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/dev-perl/gnome2-vfs-perl/Manifest b/dev-perl/gnome2-vfs-perl/Manifest
index 86c1818b790b..5c1e581c7234 100644
--- a/dev-perl/gnome2-vfs-perl/Manifest
+++ b/dev-perl/gnome2-vfs-perl/Manifest
@@ -1,5 +1,5 @@
 DIST Gnome2-VFS-1.081.tar.gz 59061 BLAKE2B a9fe959052540c3e70e8be7fe7ec7f080cf27e5652771e5ce3f7d9f24320c9b2d1a78efac083e1554714675e35974ee640250274a0e6af5233f79d79e13b7f48 SHA512 4a2e675af01e6d6bfe6ac75d1c2b2e21b28bae284c9fd9ecb60786ed8f9bb9c54113db6edb30039dad4cda522fa15ae22c1364f04421397c2adb1d558d1217f5
 DIST Gnome2-VFS-1.083.tar.gz 59109 BLAKE2B bcc582e2375f41d2550e80a638c7c9fdb2b2dfe03ae984f097ca8b7ac2c19c412d65c92af3e7914a7bbe7ae9db0e7b946eef35fbbebb36c3d41cc0374da4a2f2 SHA512 385bf402ea6493ec3d558e146f5bad754bb17e0c76960336352ed8e928e2fc163077cfd081c11fceae4750eab8d1f60fb532eb25b83a88c0fd93cb9268e9a252
-EBUILD gnome2-vfs-perl-1.81.0-r1.ebuild 589 BLAKE2B 2935515f2aa5ccf74ddcce8942686af3726b897de1e8c3bf7b56c02685dc215f43d398abad65a92e92e7e5a55f0c80c91f946468dcbe54019365ed02c30c2ca5 SHA512 dca17dd4eb330d5a833f54e1e1457669afdd6466c69305230acb5e9e53e6fb9977c4f01c9cacd95fc10047fe8a08691089b751a483021f4447656da8798103d4
-EBUILD gnome2-vfs-perl-1.83.0.ebuild 566 BLAKE2B dc114b84464abd8ed0aa63de120ab6200e8a2ff07a227fc838ab455f203c6a8fae01e9ec1402d2611069cae2ec0e19b0140136cf84061161d6f85086a71c48cd SHA512 e02a4de4206bac5d2b5f70bb532a05c15c79bcf42f18b5a863950c2a6d4ab76a270fac56bc2e575164f4b37b5176c7b8a8e473bc3bbd20040acbd256537d7358
+EBUILD gnome2-vfs-perl-1.81.0-r1.ebuild 585 BLAKE2B 6af6046260835559d3dd91dc46e5f89869cf839f7d4b564a6dd0873a9fd65c925d20f1f12f90436dce3f397f3c305808606c1f32ceecff786ecfc2774b108331 SHA512 041919ea3d1b0495b9844de8ffe1cda7c89393f73361ff685dff7103a7a95304696a69a71252fbd30aac233d21c05a6d67e0add3f6e14d1d59fe04a69bff542f
+EBUILD gnome2-vfs-perl-1.83.0.ebuild 561 BLAKE2B 810b2bfcd48d2d7b9b59cfd25e57e8887cfd2ff44125ab0b4ea5890a9ac6f4168125ca03b7f5c52d4d7b34f1bd3a1d8f4e2af1ee1cc27badb2d10fa4f7a4012a SHA512 0ec1b1c5dafd3e14286ac4d0e97afc8bf112d63cc40df3a58f403dc9a7929376f3ce1c2b7574372aeb118ae5f4d21cb95bc608a424661b8a0f995951d3694c29
 MISC metadata.xml 392 BLAKE2B 0e6e7e770e1f7c5733a3799f8b37b448ca3883b66b9b3cde8f25ba440a0e71847574bdeba33bfc5b1aa090bb62e556aba65868227cfea9143c7dc4f32229420e SHA512 3eca54447ad0723c35de2b73080027981603d5aef81657b869695f34311411dbce36ca4f713ef76cc6c3a49cab839902b5fbe2e6126471348060651c435b3a53
diff --git a/dev-perl/gnome2-vfs-perl/gnome2-vfs-perl-1.81.0-r1.ebuild b/dev-perl/gnome2-vfs-perl/gnome2-vfs-perl-1.81.0-r1.ebuild
index ad46da1011e3..efbb177e4534 100644
--- a/dev-perl/gnome2-vfs-perl/gnome2-vfs-perl-1.81.0-r1.ebuild
+++ b/dev-perl/gnome2-vfs-perl/gnome2-vfs-perl-1.81.0-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Perl interface to the 2.x series of the Gnome Virtual File System l
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=gnome-base/gnome-vfs-2
diff --git a/dev-perl/gnome2-vfs-perl/gnome2-vfs-perl-1.83.0.ebuild b/dev-perl/gnome2-vfs-perl/gnome2-vfs-perl-1.83.0.ebuild
index a985b8b8d154..6c08089fd218 100644
--- a/dev-perl/gnome2-vfs-perl/gnome2-vfs-perl-1.83.0.ebuild
+++ b/dev-perl/gnome2-vfs-perl/gnome2-vfs-perl-1.83.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Perl interface to the 2.x series of the Gnome Virtual File System l
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=gnome-base/gnome-vfs-2
diff --git a/dev-perl/gnome2-wnck/Manifest b/dev-perl/gnome2-wnck/Manifest
index 39f4087a5d06..2fd83ca6d8bc 100644
--- a/dev-perl/gnome2-wnck/Manifest
+++ b/dev-perl/gnome2-wnck/Manifest
@@ -1,4 +1,4 @@
 DIST Gnome2-Wnck-0.16.tar.gz 24865 BLAKE2B 05012a21a3eb0531ecbaaa51db880783b9bb2d58a0eea2d43a5bb9c6b12d71dfac1f62dce7f45cf0c96194b313b3cfddcfec6d609d897b43e91c6796565625bf SHA512 d8ed39cd19ccaeb5995d97b392d1cc97fe0c9bb66781efb70d6160f50a212e263be3bb89c33ca1ff0ed3da3c55fd9968fa4026abcf8593996760831164acd00a
-EBUILD gnome2-wnck-0.160.0-r1.ebuild 564 BLAKE2B 22780771c72e600566cb2bc81a6fe756a126e00ab76f5544d8908cd869db510daf8c2074781e6cd53aefc28c758074e144234499fdba17583f425aaa6d0f465f SHA512 e74f566f92773b7177fc1bc10ed0ac66b1fa492a01094c5a213d8def79a9be12afd8427b7c00b0d0e20fa78b9794330beb058b757182fe1a8288c1ee5714119b
-EBUILD gnome2-wnck-0.160.0-r2.ebuild 651 BLAKE2B b378512c7cbdd70a527d358544f151cf087b5d7c1e3da220e406582c5a4fcc0f90ce04131156a81ac22bde93ff4c8f9829cec160f7ddff0ccb51b3167d8a78e0 SHA512 531e2a5a1019920be99168c94acdad3fc0c547a9d798e3313b4bcc49ad79ca768cd75e0935fe4eae207628d3d2304a178af290745273a26f81acfd62f0cc9d0f
+EBUILD gnome2-wnck-0.160.0-r1.ebuild 560 BLAKE2B 36e0a16bab0026b66f4739bd08153e1b9b9ea9e0e9c754433ca819838b1009c059570adc4edad7adc26459cc8a6e19b77385805b244024fd9d64c10b10cedb5c SHA512 565d94c5d67c875fe4dbcd04700ab39f77f5cda89bd1abd547c02c95666c27205e50f9ec05756944e62a86673c9e769cc05725c3d8d9c2cee5ea3f56d0bb1ac1
+EBUILD gnome2-wnck-0.160.0-r2.ebuild 646 BLAKE2B 373cbc8f72acfbd3b1825f733b10f58d6b9d3ae44549e8edfbc58e95d1185c0e6ceb68fe5b9c5331ef99e2342e43d32fa3f20d42ab6fc4d6a3d37bce4ea0e6ce SHA512 c80bdd8f723f7c513fef6c770bc7d05e5262cdae615121c377cd5c81fa616cc0cebc0a4e4030128e30bebac274af2477af7dddb8f6ec123d7e3a747de281286f
 MISC metadata.xml 450 BLAKE2B 6e0684bbf9d51749219b6389b378d2eaa334404f69d6bc39d5922d2fd0a0b7e959ed26ec6fb2fb6d46f0257526c1fc15083c2a33e86d3e12288c22318a23fe97 SHA512 d4c40c7e5d46352fcffb3c1816df6675816f4469b39281648621526bc45ce47bc2de25eb0416f31eabe29ae4509253eb22fc83d7c18a68a5b2b75da6649840aa
diff --git a/dev-perl/gnome2-wnck/gnome2-wnck-0.160.0-r1.ebuild b/dev-perl/gnome2-wnck/gnome2-wnck-0.160.0-r1.ebuild
index ac9667f4cdda..7b100ffbf40c 100644
--- a/dev-perl/gnome2-wnck/gnome2-wnck-0.160.0-r1.ebuild
+++ b/dev-perl/gnome2-wnck/gnome2-wnck-0.160.0-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://gtk2-perl.sourceforge.net/ ${HOMEPAGE}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-perl/glib-perl-1.180.0
diff --git a/dev-perl/gnome2-wnck/gnome2-wnck-0.160.0-r2.ebuild b/dev-perl/gnome2-wnck/gnome2-wnck-0.160.0-r2.ebuild
index faa6dfa0452a..1bad8aea6f51 100644
--- a/dev-perl/gnome2-wnck/gnome2-wnck-0.160.0-r2.ebuild
+++ b/dev-perl/gnome2-wnck/gnome2-wnck-0.160.0-r2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://gtk2-perl.sourceforge.net/ ${HOMEPAGE}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-perl/glib-perl-1.180.0
diff --git a/dev-perl/gtk2-gladexml/Manifest b/dev-perl/gtk2-gladexml/Manifest
index 5f6ecf13be71..e93afbad2323 100644
--- a/dev-perl/gtk2-gladexml/Manifest
+++ b/dev-perl/gtk2-gladexml/Manifest
@@ -1,4 +1,4 @@
 DIST Gtk2-GladeXML-1.007.tar.gz 38496 BLAKE2B 2a9dbd9fec4dcc40edb311a64d013de726e567bd7dd4218ed169479e2ee20fed1f8ae41cd413aff77917033fa8e25d5a87c29deb9152d00631a07564a869b525 SHA512 e40b859e76f99c5c9497e0c123679c916b3f5615aaeb208f56a9a4758a2a8a5d5078d4bf7b441ffc6080162a04bb146739457bbd71e4a443a2d092ddbb1ed94f
-EBUILD gtk2-gladexml-1.7.0-r1.ebuild 571 BLAKE2B ae33cecb90e88f55347417cb0cef64a78c567556743c2b0ed7969f9b5faddeca82279ef27d287980b98ec7a20640d7c88ce21fc5ad879753e338deee7e7f26de SHA512 c55b57c31178e2ae8940be7b1294f4a327b9377e7d2614d2ad158871b024e56c6b8eef1e9c6582a775b69dc1c4884f45161b929e366ce67b4347cf3ae0b65305
-EBUILD gtk2-gladexml-1.7.0-r2.ebuild 654 BLAKE2B fcf3d8fd337ab57a35d90153314210b72211f5470b879785b84693ed5cc91dfd4e4d9e05e302b0dcf8f0672d3aa5c2adc905fbe97b862b6aba2d095d19dd858e SHA512 708c9524d356e0725a0bbbc9005e596884f81cdbb19bfbd5cab8e58f948bae5a529a2e0dbd909fd4ef92a8d47d120943c3c8ff306dd5e5692ca20e63abb73ba3
+EBUILD gtk2-gladexml-1.7.0-r1.ebuild 567 BLAKE2B de12838e9678cd8a53eb89f028a2911c7092523dafd82d44d0a3a57b737752b61b4b0797248da16125e0cc25b7de955b9e0586edc57264ed89ec1413851d0692 SHA512 5aa559cb03e4b2fb1429dc1481480c0039388a751e825890ae32e82cb1d2e8731578ac056e10ab74428f19f98fb22302f83c497fca7d29ae5d155868b916cd20
+EBUILD gtk2-gladexml-1.7.0-r2.ebuild 649 BLAKE2B 356e9b06d60e1726c94d8c42ce1df09cf635958a9a383611b4e04aaddaab34abd8a9d015a788be16590dcabfe66c5d83ae802e463d80f810357a1fabccba19b6 SHA512 bb210b64c6de8dadac0ab57b0aa97cc2fc2f5f4f9e8df52434deda5a52bafb416561c712a4dcbe8c827b4a44cd0cb848b61f00f7dfb3d7bb182d5a570fcf6c92
 MISC metadata.xml 398 BLAKE2B 956641fe1b96ad91cc19984b4dd0243916e840ef627fd0e945b66bda33d9dd8a062d2886c8d047428f23fb411b7dab8b5139766aecb1a7adc1383f957fe0bc0d SHA512 f2a4335f43f2e5e6951f79ed31bcedacd0b4728670a0b223705cc78a95c9c2e984b314c6af14c8642ee2de86d1f9d67468aafe7410b8b3b1b126ad97bf2e5bc5
diff --git a/dev-perl/gtk2-gladexml/gtk2-gladexml-1.7.0-r1.ebuild b/dev-perl/gtk2-gladexml/gtk2-gladexml-1.7.0-r1.ebuild
index 799ab5f5abc0..2f66848df75e 100644
--- a/dev-perl/gtk2-gladexml/gtk2-gladexml-1.7.0-r1.ebuild
+++ b/dev-perl/gtk2-gladexml/gtk2-gladexml-1.7.0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://gtk2-perl.sf.net/ ${HOMEPAGE}"
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 ppc ppc64 x86"
+KEYWORDS="alpha amd64 ppc64 x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/dev-perl/gtk2-gladexml/gtk2-gladexml-1.7.0-r2.ebuild b/dev-perl/gtk2-gladexml/gtk2-gladexml-1.7.0-r2.ebuild
index 9ded689d9531..23080b6fcbf4 100644
--- a/dev-perl/gtk2-gladexml/gtk2-gladexml-1.7.0-r2.ebuild
+++ b/dev-perl/gtk2-gladexml/gtk2-gladexml-1.7.0-r2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://gtk2-perl.sf.net/ ${HOMEPAGE}"
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 ~ppc ppc64 x86"
+KEYWORDS="alpha amd64 ppc64 x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/dev-perl/gtk2-traymanager/Manifest b/dev-perl/gtk2-traymanager/Manifest
index 416149e5e4df..a99b986cc137 100644
--- a/dev-perl/gtk2-traymanager/Manifest
+++ b/dev-perl/gtk2-traymanager/Manifest
@@ -1,4 +1,4 @@
 DIST Gtk2-TrayManager-0.05.tar.gz 10853 BLAKE2B 7df391d38d2d0107c9263f61e1d1161e40c2257964e92bbf355fd0e0144a00a129edd047da8e25a182ae50fb1ec2d9dce3d0ff0e1e0ad6b529b64c62aaaf3d8a SHA512 1f5e70f86f6c46aede939ed1c2412afbc3abb96176c13a953fdaad8110d9a0403d18f27eebe57eeb7d9d9d25c5ddeb7c74f5be9d89ee51a6a156eb9010025f48
-EBUILD gtk2-traymanager-0.50.0-r1.ebuild 533 BLAKE2B 625d7a83a90bbbff8639f709d6d0f35abac39386c86c003a47b214691f60829729030f3b150b13957dc86c0e51d967abce2e61fbb46820f2c70f4e135d250e73 SHA512 8c043a2188dfa7203bc1039b39ba966e3cbc619176005d27ffedcd638366bbeb61df23426c2034d0af3af640b8f8dd06709a4fd32f5c147ae1ab3a4d4269e2d2
-EBUILD gtk2-traymanager-0.50.0-r2.ebuild 616 BLAKE2B df82e27613706769c5dfd5b3eeab56b4041b3650f0e1e9b26181bf6fc3aab7e86087a12d0a0367fba6d8576617848938b3d69de2dc70953df927f2a63080cff4 SHA512 595091c485831ac41baeac33e839153fdb16de8511360f3637ca3329bce6ba3db22e1ecc7016f52ebf4658c7e7c13b6a559df4da710ba528c739d9b28a4f6557
+EBUILD gtk2-traymanager-0.50.0-r1.ebuild 529 BLAKE2B 5c5b19391d7125a7933007755a6709c55e561d01b9a207df8ccfffa27759a6c483de2656025f87e3be5b57b98e6351896ed7661120d04f8afbfc0039f27f35ff SHA512 b0da1f33f12f004388cf228ed2d20455ca088c65db0687645e76bf38f83c8177a1bed93ebd4096b8f5c704a29d99fffdc3ae0651901e93283aa542ffb2de01a2
+EBUILD gtk2-traymanager-0.50.0-r2.ebuild 611 BLAKE2B 9140c163092fc12a3b62d1d377c72f4839c3ac912b0411cc9b74bc443f2f32b62c0b114ee9147f2ed0f4adfc238ad7daa4d53f9677bebe78e1aa6106388ef709 SHA512 bacc22ad825025ebb0f8cdbce879089ccede783359dabbad09c91e6fd153c98774f81f081aad98ee33cc26372dffa3e9dcf43b6263048b9e50f87039078283a9
 MISC metadata.xml 404 BLAKE2B cf8f8f5611bb763be40fbb723d45752829fe8b49125431821da90796198b3049742ff3e67c35f5264a3442e0247052ebf5ebf2cbe6e4c2197aa1bb235f58775e SHA512 c6b938b50fd65e0cbcb2da6d5e38f0ceb26f5d16c101f9b19a180ec74dfcdec54862e4ed59b27d5af812876fad5ec81aed71ef2d945300f0b2dd704d1100fce9
diff --git a/dev-perl/gtk2-traymanager/gtk2-traymanager-0.50.0-r1.ebuild b/dev-perl/gtk2-traymanager/gtk2-traymanager-0.50.0-r1.ebuild
index 0751bef29a4e..808eca3636be 100644
--- a/dev-perl/gtk2-traymanager/gtk2-traymanager-0.50.0-r1.ebuild
+++ b/dev-perl/gtk2-traymanager/gtk2-traymanager-0.50.0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://gtk2-perl.sf.net/ ${HOMEPAGE}"
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="amd64 ia64 ppc x86"
+KEYWORDS="amd64 ia64 x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/dev-perl/gtk2-traymanager/gtk2-traymanager-0.50.0-r2.ebuild b/dev-perl/gtk2-traymanager/gtk2-traymanager-0.50.0-r2.ebuild
index d494e1a32988..5aafbc4813ac 100644
--- a/dev-perl/gtk2-traymanager/gtk2-traymanager-0.50.0-r2.ebuild
+++ b/dev-perl/gtk2-traymanager/gtk2-traymanager-0.50.0-r2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://gtk2-perl.sf.net/ ${HOMEPAGE}"
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="amd64 ia64 ~ppc x86"
+KEYWORDS="amd64 ia64 x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/dev-perl/libwww-perl/Manifest b/dev-perl/libwww-perl/Manifest
index 5af031862194..52ae0706aa5c 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 1987 BLAKE2B ecfb0a06572097e9e84125c58791a9e1841aa3ec45e64b7dc89ff85a92b3312c34e89956f3d0c1f70342f9b910f17a85694c13bd7188f3a22e700c57666ba289 SHA512 2040fc3852bc2661e914ae604db2eee8ede5aa5fcd2f5d06c6c9691814788feb86da3a0a8fbcb0b69b37e4cf1ed865b397271320d1b23af4f7af067caa33edfb
+EBUILD libwww-perl-6.270.0.ebuild 1980 BLAKE2B ab0ec667168bd9e0810ee9661260d47757d5a8d1fdd396477fbac717c5eeb85803ac081a0a97f7d3d3cb41a500a396f79ccdfb8f0c4d6916c33039fa3e2a969d SHA512 d0b88c719193f23e4678a3681911b8a9ae99f60823049e0dc2c1b08757c72d9fbe9f8f80fb6c16a0786ef5dd22c88b4ad67a84a0ea9e103679a47796439eebb0
 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 e64f033ac0c9..81c8280039ad 100644
--- a/dev-perl/libwww-perl/libwww-perl-6.270.0.ebuild
+++ b/dev-perl/libwww-perl/libwww-perl-6.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="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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ssl test"
 
 RDEPEND="
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index b748f73dfd5b..64232ab9eede 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 802a147d68aa..9dc05fcac2f5 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 1396 BLAKE2B 4139e782f2ec04040a8202db2280f00e75ad5ef8d692515d0afd845944fd150ca7fc70f0d678c9c671e8526231f87edbbe5cd5e0245483b658b4406f8aa8e17e SHA512 92203be17680e6ee7c21fa4f33ca9bbd587758b30141048ed86dbc17006269bb7310591cb3bd943a28f64ccce342a1e9bc6a29b7ef0ea93ea8fe11db6d1a0a1e
+EBUILD ming-php-0.4.8.ebuild 1390 BLAKE2B 902397fe190fe48d63687bc64e8951dbeb408da155f7a7da27aa57edbb232358323d1c36fe24c4aa10bc8307105a3ae9d7121de5aa8048e2f1c7b8d3a4bf0155 SHA512 2055cf88d133dfa890cbe9ece0d579c5a5259149270a91522620472c02b2d1905328fbbfd5be547afc9ef7c82621f34a281228d5dd7e270d9ed73f0d7a22ad59
 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 576b65bf1729..c9c148106640 100644
--- a/dev-php/ming-php/ming-php-0.4.8.ebuild
+++ b/dev-php/ming-php/ming-php-0.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
@@ -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-crack/Manifest b/dev-php/pecl-crack/Manifest
index 4fc3e79aa2fc..15b0b6bc309c 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 592 BLAKE2B 961042f4d06b5e05493fde80a8041d298a2f0430ee626606ea5c5d4013ef9726e38edb156e95ebb3e9e97686922e9c4ee3f2f99268e972b0af585a666b7b0798 SHA512 2bc9aa4c712508e712e9cf70f0c574357fdcde19fd16126d8b1c3f917ee7e83db90e7b526463e4a5cc976c16300d8f972d11bb67d482ceff2d8087100d472f8b
+EBUILD pecl-crack-0.4-r7.ebuild 587 BLAKE2B b15100c8d1273f37af327015ea6af4560a107a9a1fe8b69e7396401b478bcc9274ee0da38ee72629291aae4285cc8dba7a39c84a5f1e551b9ead7c2ea1382448 SHA512 e2afea0e7690ac98679b2f19ebe0a636f34e0b0dff4ed44985acbc6d2807bde66ca34384da8c9d4f60dd0c81c2363abb9d7fc8156e638b8db725fb06e1b039a3
 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 4a90b507cc29..258b1f66c5f9 100644
--- a/dev-php/pecl-crack/pecl-crack-0.4-r7.ebuild
+++ b/dev-php/pecl-crack/pecl-crack-0.4-r7.ebuild
@@ -1,4 +1,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 @@ 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-geoip/Manifest b/dev-php/pecl-geoip/Manifest
index 49b7f92a8c5a..7aee1ae55fca 100644
--- a/dev-php/pecl-geoip/Manifest
+++ b/dev-php/pecl-geoip/Manifest
@@ -1,5 +1,4 @@
 AUX fix-failing-tests-1.1.1.patch 1250 BLAKE2B 587561ec400fe54b21333d09d2ad721b66c321de5a9c1823c0cb9706e63c41a24f81e53eb9fb92bc1f33bc867e141e8f29c26abc1452058dc387d29a53b0c7bc SHA512 9e3c93b337c38feaec29001a5a5b243f376bc7a32caaafa848b51daa3f0efbdecf407de6c8f304801ad106aa0e4906513588c42aa19bc6d5b261ccd6cb00b652
 DIST geoip-1.1.1.tgz 13004 BLAKE2B fe073b9459c434751ea0291ce6802041db47254f9d2d5b930db51751b3a66ce5cf925dc4bd07764920748b1735f26ba8bd136654e08ed9c24ac3b520e842f45d SHA512 395715297726aa8e7ed71297d403bea9cb08417a03adfca29dc6ea68bbc738c176f71ea621f9026109e07cd5a2adc647e2af8e140e18a6af1c8f0fe4ed1a9c6b
-EBUILD pecl-geoip-1.1.1-r3.ebuild 442 BLAKE2B 1d4fa08a29d59bccf3f9ddd2fe68541a0499ee8fcc2c5ab20c1bd76a1deaeedd93941caeee1660d6ae56baf6af56a246f11b5b00b61464715833573b06b1272f SHA512 bc867d855dad8e5bdfd22b7ca4addd614ad1eeab50273759113be8d0ab81d081e1cf1834aec71ed73e7b1aba174902e80f117dd211a4d4695ec06a35f3c7c596
-EBUILD pecl-geoip-1.1.1-r4.ebuild 451 BLAKE2B 9af37a08d093f6569c2a8d1d2c3aa3c238215fc6122ac8ae6c6b88877c99c8a1090b04fa8a7e2e21857fb1879f776f739472ce9f27a54fff97b8757f1fe9fe2f SHA512 c359ae7ad851e763412420607c9bd853a4f7dbaff36e5f49f56f262fdab83d2f762850707360c54fdd976ef8acf69799bf5d225436459e3134f2ca6fb47e0f00
+EBUILD pecl-geoip-1.1.1-r4.ebuild 446 BLAKE2B 78b6421dcbeb18887dc29a6040c462de4c47e6b49df43fec2f0bb3e295a712ecb86c696776d0e90bdb29889b863d7f4b9cecb0b2df84a348c1b909ebc0c080e6 SHA512 04a5ce1c3ffe7788f6add50b50d55323c55ff62b118043d5fa3040494b74b05faf950d3019c2bfd89abe0978921b5208a9f556aed5e91b8bf44cc6b088db739f
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-geoip/pecl-geoip-1.1.1-r3.ebuild b/dev-php/pecl-geoip/pecl-geoip-1.1.1-r3.ebuild
deleted file mode 100644
index 042049847be6..000000000000
--- a/dev-php/pecl-geoip/pecl-geoip-1.1.1-r3.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
-
-PHP_EXT_NAME="geoip"
-DOCS="README ChangeLog"
-USE_PHP="php5-6 php7-0 php7-1"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="amd64 x86"
-
-DESCRIPTION="PHP extension to map IP address to geographic places"
-LICENSE="PHP-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-libs/geoip"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/fix-failing-tests-1.1.1.patch" )
diff --git a/dev-php/pecl-geoip/pecl-geoip-1.1.1-r4.ebuild b/dev-php/pecl-geoip/pecl-geoip-1.1.1-r4.ebuild
index 865b4ebe7166..24bbcb5b0a0e 100644
--- a/dev-php/pecl-geoip/pecl-geoip-1.1.1-r4.ebuild
+++ b/dev-php/pecl-geoip/pecl-geoip-1.1.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
@@ -9,7 +9,7 @@ USE_PHP="php5-6 php7-0 php7-1 php7-2"
 
 inherit php-ext-pecl-r3
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DESCRIPTION="PHP extension to map IP address to geographic places"
 LICENSE="PHP-3"
diff --git a/dev-php/pecl-mailparse/Manifest b/dev-php/pecl-mailparse/Manifest
index a6b21761db49..4aae39a0386e 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 1102 BLAKE2B e2d3415cdf18b60b438eb722965ce005f2eff5a369b2852130f8327371ee8a8ca116c45019c6cc7c3352adca1c270f3e05ab8397b08093cac7b9e9b6133f2c65 SHA512 1abb3679ff2b75393541481a09d5652d4e17a517e1e98e916882f1081906761b66a9469e0971506b4985d1eb22c6c0c033df8c5f8314ab0dabce76858c7ade9e
+EBUILD pecl-mailparse-3.0.2-r1.ebuild 1217 BLAKE2B f68fb5fcc84fa36088a404c2cd8b0134e81e7fd9ef502e82a1b6c8dc70d1a392385dce9dd696c72fd41da604632d51b371b49399aeb815e4abe38c0ea140ed76 SHA512 a7dfe604eda9b46a238f01f6de06ed59b75a0a3d3c323b2ae8268b2927ee0363d0f910dc0975be3d1600f52a5f1dc2ab62f6288e1024f04028960e4be694c4be
 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 9b37d88dcd95..d9d400423ad0 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
@@ -1,4 +1,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 @@ 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"
@@ -34,6 +34,8 @@ RDEPEND="${PHPUSEDEPEND} php_targets_php5-6? ( dev-php/pecl-mailparse:0[php_targ
 
 src_prepare() {
 	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+		# Missing test source files in archive.  Fixed upstream in next release.
+		rm tests/011.phpt tests/bug001.phpt || die
 		php-ext-source-r3_src_prepare
 	else
 		default
diff --git a/dev-php/pecl-ssh2/Manifest b/dev-php/pecl-ssh2/Manifest
index 55c2573f4f28..34449332aab8 100644
--- a/dev-php/pecl-ssh2/Manifest
+++ b/dev-php/pecl-ssh2/Manifest
@@ -1,9 +1,7 @@
 AUX 0.13-parse_url-fix.patch 1777 BLAKE2B db7f6bd23cbe6552fce870044b1839eadba5c9089ffee2da52c1c998856083636c221d7386f52ba689f9796807e2abce447541dfb247c6d20f7898254e0f0dc7 SHA512 9628c0cd1d09d64be3824485ec54ad9bb477a18b9178a120b8fc17ca5e5f2055d23019495741d7e85841f9e0b5f7dc991fb14ead04cc60f95127099e3e5fb205
 DIST ssh2-0.13.tgz 28984 BLAKE2B 3c18cb7aba146801325eeaca3ffb6e3780675a7ce6d78aea5fbc16f75662284f7773de2161789f68af0b5499e9cb813f4046d674758c138849eb6735344249f9 SHA512 c031e22853bf5cf8ee59dc5b99d9e7e60af1507a22e7d0a9e2f54b8f1758a03a6cea91c539e0f667d48ec66185fdc8a28c47e5a1e10a72220c0cb16b3948e1d0
-DIST ssh2-1.1.1.tgz 27551 BLAKE2B 5e8e32c790a1d8646497ea6c4893694b2cc511a9a4753d66788c618ce7f8cb04d37fcd54a21c59dda918ba6ef27a1abd1b32c2d515d07c0925ab26e9a7e58941 SHA512 92cc40627a6114a4b0e7b8437e5e0b219b49dfbed9668937e7d0d37492a101c9f25381b5a1533f91c0530fdebe66af7bcb68ff4231a7ecd806b99d8a04f74d79
 DIST ssh2-1.1.2.tgz 32057 BLAKE2B 88ffb3fb608687a086bbe345677982e944210791acc100312ba56ac7c35188a52cde5529d78caf473d19710e9965fba853ea9ff046715413a0b488ae2d8b690c SHA512 36793191448745b8a9b3cc628fe9fb431480792c7a2ff0bf2eccd58cda1cf944933be1d301c455d4a6f3dabf7e04ffef248bc402a8ff99bfafcba0deddb25c36
 EBUILD pecl-ssh2-0.13-r3.ebuild 707 BLAKE2B 9a32418bac7fd95bbc56f316ff4b8a09f61aa009bc5ce6262b52224672ef2ec6ccef102e1fa6ca15982c736ac1640b57c912d33e555e71f4eeafc17b1e002b5b SHA512 05ee3824bb54b54940f982d4b96bfb9ceb546f40b55067bfb1df24123c662786f87faf12905b58cc24188160f0af4f06e0c150a6c32f5e0b93f1343ea64b179a
-EBUILD pecl-ssh2-1.1.1.ebuild 653 BLAKE2B 4625ade7081cf94d3aadd7f5ecbd299ff962e08547d793a82ecab8e6b167e3ead768a9b4b6141d9790647dc2d0a49af18544165938119bad02145426eacb0dcf SHA512 4e86a46a4d758326de99069c925e46acebb92ab9867b62623c7b90c5a15763dc3900530a4d2d868bd99edb4c5dc5285b493333bae1ba76a635253cbce61e6bea
-EBUILD pecl-ssh2-1.1.2.ebuild 695 BLAKE2B 13cf11fe0e7896048ac96adf5b1be5047b0b04fe038f25ab7e8a21da7024196d3b4d40281819d52c175a69584d9874ec33d5b02329a6674ca305d87ae226ce19 SHA512 47a9bf5e8cf5a56772741aaddf2521fe67a31f5e151b27d3f92d4840d47bf8be77b4cb594ca0f0aecba67e4b6528ad78ea92722b088ddc2184a6ffe54367db4c
+EBUILD pecl-ssh2-1.1.2.ebuild 690 BLAKE2B f97b6c145f9a76863c01ebfa5d8d9096142989d280de7b9b1e6a6b18f45d9696e07c5350f899ff0bc6bcde246e810a375be2dbb1d9a715af55d42d75278f7961 SHA512 3954445c53c7e3d9b3c14723eee375718e4b7c41a17c9deee475a0dcd8534d3259d710791fbb9158969edafacc14053f87b14f23c41ddae3853926427f3e419e
 EBUILD pecl-ssh2-9999.ebuild 744 BLAKE2B ea9fe3fe4b516c25fed214c1a48eb5fb0221048f96540090ea50136489cc91c4dde2407289175b44d4169d71dd723163a8814f784290ee4cfd67d23484903720 SHA512 970871b295857af4ccd1bb68680b883c677c161189025326e32d317aef6867261b34343371003152d60fe7bf40c19a3130bd5f8b748d7d7ba263e70f6fd22e55
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.1.1.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-1.1.1.ebuild
deleted file mode 100644
index 2c2f92bed940..000000000000
--- a/dev-php/pecl-ssh2/pecl-ssh2-1.1.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=6
-
-PHP_EXT_NAME="ssh2"
-
-USE_PHP="php5-6 php7-0 php7-1"
-
-inherit php-ext-pecl-r3
-
-USE_PHP="php7-0 php7-1"
-
-DESCRIPTION="PHP bindings for the libssh2 library"
-LICENSE="PHP-3.01"
-SLOT="7"
-IUSE=""
-KEYWORDS="amd64 x86"
-# Upstream notes say there are errors with gcrypt backend
-DEPEND=">=net-libs/libssh2-1.2[-gcrypt]"
-RDEPEND="${DEPEND}
-	php_targets_php5-6? ( dev-php/pecl-ssh2:0[php_targets_php5-6] )"
-
-src_prepare() {
-	if use php_targets_php7-0 || use php_targets_php7-1; then
-		php-ext-source-r3_src_prepare
-	else
-		default_src_prepare
-	fi
-}
diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild
index 09e08c191229..619e242eff17 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-1.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
@@ -15,7 +15,7 @@ DESCRIPTION="PHP bindings for the libssh2 library"
 LICENSE="PHP-3.01"
 SLOT="7"
 IUSE=""
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 # Upstream notes say there are errors with gcrypt backend
 DEPEND=">=net-libs/libssh2-1.2[-gcrypt]"
 RDEPEND="${DEPEND}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 07fd80e734d6..e19287d75d14 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/bleach/Manifest b/dev-python/bleach/Manifest
index bf367a464705..6691d358fb65 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.1.tar.gz 58491 BLAKE2B bd1efbfa30cee61b5d8bfd029ff107ddc997d38139bf5b25a70a6731193f6d02a81e1e49c9ffe3eef6cbda864464108cb1f65599c68c48f1033ced27fdb65c29 SHA512 dc8ef7b678966bfebddb2d27c78abf50e71f2d90c5807cf788a08b852a085a4d990368da5dfb5f61a49e0f2f1e7d9ac73c2b6967fdacb55663ae2c339016d4c2
 DIST bleach-2.1.3.tar.gz 60141 BLAKE2B 5c04269266007e31e1a01540198177afb6b13362b89815073b7cd68668da26725f2631defdb26d124ae6c74743de0d31b2975a0d19f58e032ac2332e3ea46a75 SHA512 ff74fb3646709f20c79ea02e6d0fb93e2f204d3151a05f259b703050c10d410859af76acb470405f6fb7b55c8fb64595e6f0fcf8e9cb8fd3fc3722fa30a47de5
+DIST bleach-3.0.0.tar.gz 164459 BLAKE2B a9e873428cf629dc98c8adf56ad8a45f63e355ffb5eb495df4d452106e77a5919c90e2f1651f671e8807e0dddbdb7543fbd4c78fd95afad4cf8cee68e7a797d8 SHA512 7bc13af18baed440c0ce39f8caf7a14fc7264aba8a14a1999334d1ddd78183a0f84a17b3f2088453ee20d4873162f2a8cbd273e6f881201744b2a0f47805839e
 EBUILD bleach-1.5.0.ebuild 773 BLAKE2B 6afda52e437aa252b31174f09b7a6f61fa95f4b91f96ec364ac9375e26c2aeec5f5df001b92a8ee6c0f7ffc5a62eaf1830e64d216f3660e43661230000d2f770 SHA512 984382fe1f458fac718dde60f3e6089edb2cafa69296b3e21ef9049907da625ac44af15b87c062801a68a5b15a2fc3a989015cb5ad94c2584f2a8783311dba0f
-EBUILD bleach-2.1.1.ebuild 800 BLAKE2B eb904dc41b78b06242a83a14c30ef34930c58f41a81580499b61352cec3dd4b818c8fad4e6eb5ceda82a17d18e7dc0687ac6a869689af06cd66df4bec45d4390 SHA512 e5c9049d37883777db6930dd74b62e4bd1019e2a71108fdb87ea8479b62b3481e2594e9386543af669fa1f73308893a3d3e8ff0741a5edb383c88426486c1c7d
 EBUILD bleach-2.1.3.ebuild 792 BLAKE2B 62915001c423ea8c8db88bebc2f06a605702dd7caa93fadad76e347c66c47d2cc666657383169895b175f2cd1755489eac685e6c71de0f2b6ae40c34f30f1b0a SHA512 04c8437eed67e4f48a0829316ee5641f49bb77fe1628168b5d5df72dbaa207bba7b9ce7e6528c0c71c98e815312a0c147f717b204710b1a76bc16cc2bc3c70f3
+EBUILD bleach-3.0.0.ebuild 770 BLAKE2B d409b89d4930f5823d06f62945b33bff6b92e97d68eeee07a7735ba1de80997c6e2425a003a8be398a9bad1b145991c88890fe87edfa232d34ed7ca2cae1db98 SHA512 3e809fc9eb92847ae78a2d60052256fa8a0dff512b2ab3ef75bbded0a953dfb0996c7e21f9f1d114b1bfe801cb5850f6f9148a2d6f4b49e7dc6a6fe45a6810f1
 MISC metadata.xml 375 BLAKE2B eb46fe64fd2800b8222ce88a2ef34be12f68a5a014417ebbfcf3466beda9c64f6a6d1ef4431d83b4948c1513de81840d1f5c65961d851213f928fcc6a66045e5 SHA512 9f8329e1fe0a9a7a6268dee15c098bdd7893da00a3c4f4dcab207586dccc5f6b471754be0eacb21fbd7fcce5e3130a631fbf1fe60a27ea525552d7ef2d9c173a
diff --git a/dev-python/bleach/bleach-2.1.1.ebuild b/dev-python/bleach/bleach-2.1.1.ebuild
deleted file mode 100644
index 7b249d5a841f..000000000000
--- a/dev-python/bleach/bleach-2.1.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
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="an easy whitelist-based HTML-sanitizing tool"
-HOMEPAGE="https://github.com/mozilla/bleach https://pypi.org/project/bleach/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/html5lib-0.99999999[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/pytest-3.0.3[${PYTHON_USEDEP}] )
-"
-
-python_test() {
-	py.test -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/bleach/bleach-3.0.0.ebuild b/dev-python/bleach/bleach-3.0.0.ebuild
new file mode 100644
index 000000000000..71d5a9790dcd
--- /dev/null
+++ b/dev-python/bleach/bleach-3.0.0.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 python3_{4,5,6,7} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="an easy whitelist-based HTML-sanitizing tool"
+HOMEPAGE="https://github.com/mozilla/bleach https://pypi.org/project/bleach/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE="test"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/webencodings[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	pytest -v || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/cffi/Manifest b/dev-python/cffi/Manifest
index f0ea8f2af5ee..2e377f6c6feb 100644
--- a/dev-python/cffi/Manifest
+++ b/dev-python/cffi/Manifest
@@ -2,8 +2,8 @@ DIST cffi-1.11.2.tar.gz 435142 BLAKE2B ba90cc377261a75557cef626f1c6b8c0c625c6721
 DIST cffi-1.11.4.tar.gz 436857 BLAKE2B 46b5d1adf4aca2a75ea02ba01ae934821d0e864accd9c355745a681d11a08ed34c33c473204c78ecb2113b2d59fbc762ca0607ff92f6cd2dc411907844bbdaf3 SHA512 184572ab8c1f7a72f00084c23894efe1691aa20f9e822a3f7184ebbed16e757586ac47e7f1d12dd7b14b4322bf5b88e35465dc3bc8b0caf0dc8e2b626a52615e
 DIST cffi-1.11.5.tar.gz 438498 BLAKE2B 2e22cf3c2d50d76f8f25b7ac31a77fac8a49e2b2f4952e3b1a1da79c0ad2ca5c6e450000cadd1efa06df53d14f711e0acd73a075bea45ebd61e667fb650a10ab SHA512 6770d5293cfd7405e733d60c96655641b5bcc5878fc66a737f4a8308f465d459ee0e3fcaa47893d8f57fb195e5534dd7e4728c868f33d7e657688f45e1fb1880
 DIST cffi-1.9.1.tar.gz 407108 BLAKE2B f95e99cbb7a10aacb714d6ddbe85755e24d4fbdebb9ada0ab87c95b58aa56b364df612fbdfbf6fcc3a9dfff6e96fe5e979ee37b1c6c9b62b6ba8d3a9565def2f SHA512 6e76f181b6b7b760a14ad70338edd104a8b8e2eac5680e336d3868e0bd031a1665608e29a65dc0c56806afb8a8c03811586f151f3acef11e54e60c1bfcf902e3
-EBUILD cffi-1.11.2.ebuild 1477 BLAKE2B 9a60ccb178b38795fdbebfcf84ce2121c7a977458298bef4ba4c7afabecade0f60b2b839b2543f9b91e2ccaab359cb4df5adde0c52d2dac5b218ec903ff3c23a SHA512 e2e547c243dca0709a12afd77ce860c05493c7fb168a8769d7f7cce63ea0676dbed886c2522e39a193901d009581216805dc204a2189ad0d1a1f7e4c1a337349
-EBUILD cffi-1.11.4.ebuild 1478 BLAKE2B bd7fbb53eb3a350669d3e13ce1599628ebbd1edfce3914648a0fbe06628f16477117139dda48c3f2021f2df701b49b376e45209883080d70ef8fd9fbd2339f57 SHA512 059b488a6f6f14d439d344e2629cb2a8651a63a094b5709f106e4d668450af5041dcfa4308003c939acb98350b45e46fc9959df4cb32ad8db68450ded3958822
-EBUILD cffi-1.11.5.ebuild 1491 BLAKE2B 1e616c9958cddd57864257b46bbb139db12f8596262e32d92863446f2efd6626898e2d5e7bdf6c2968c8c9ba0c1ec1af2820258cc474230393eaf794afed07b1 SHA512 f367dc7ba8f1eadbc0feb400782ba315e9ef5cbd2268e67e9a49bfb715bcd7c0a5697b4345f8a27ea038916d7a8976166e48825d60676a3a268c7e0502c004ee
-EBUILD cffi-1.9.1.ebuild 1467 BLAKE2B 294f1f7ab2cc16b168493f855c74fd041eaf03d2418c854a16157f540f74f99448f0cde38701c5c5a9f0d35ce53baa1020f3db0b7f759f36d8a822cde43a7167 SHA512 035c9d078beb565cd09f5c86046b5a2466bc1d697afaf7a3cb0ce92a59fa4ef09efc55060be995c9c91e4dfd945001c061d1e4f63672d26d89fb72655bc0b6bf
+EBUILD cffi-1.11.2.ebuild 1476 BLAKE2B 25125ac60f6f4c5d9ff2ef82ba26e125153898a82f4e3320dd0593fc40c7ac8baac95961cdd8fdf1d905608a94f4d90ea72eaae54cafe27effa3f18234937223 SHA512 2b7462558ee2126c40966b17de05010b66b9b2535fa6e31fdc3f1f55527944529d79c6b7404dddc7cafdbffe3058f43493aee5f0651eda693768989ce27c947f
+EBUILD cffi-1.11.4.ebuild 1477 BLAKE2B 8908398c5a76403e7b7157852374d29f287310b11d5afe6164d540d034b50374f497ff3a86118079ca8987117862789aa9822a517c23d77763ceb6b8cc74de6c SHA512 af4121b4931e23497f2593a1265543f61bff092f56e3296121c3b1d4740f86748e8bf3736d4d9aa371b82eeb775aa377ceb8c9bdd80f5afd00cee92bea42b429
+EBUILD cffi-1.11.5.ebuild 1490 BLAKE2B 1134e18fcef9ff89e10d8d047ac552f5667488b05db5ddbd0e9fc72b4e0b576a773fcdf1c74f2ac1aaf0676a5656a6125ea67b15f59d51026c687516b735e1af SHA512 2def086906b75aea4dd0fbefdb9570ec55d3d67d3b1685123845e7f225dbdc494a147f54b0ee1a489b873b3af0bf64d856593618e7677b3a7a99f69d3eb190c6
+EBUILD cffi-1.9.1.ebuild 1466 BLAKE2B 439b6504bdb7b2b6b84dd5580ec4a155361d453ee5de5133102826ff6ac9b42a169c55e3952677f438b3b3087b2cccf57cee785d357c9f7d706db8d9481994ad SHA512 40d33d6e223d157a7e20f9ea96133fbf1d6d49060d9cb8bdb80188075918e864c64cf34062fca7a8ea909b0a6a65f39b8b1a6b6f1aea0f741d7ca779fd466aa5
 MISC metadata.xml 317 BLAKE2B b6416209bd2358c42c2be3bd228238b401bf126919b6e7371d83d7cec8cb55a40f89db562701cc8f3dfa904e225426881b22ff1d3b72085365b5caf9b8c6a403 SHA512 0744ca7b98b2ebe2985bf2a81a337d09be62cfaa51f8380bac52f8d30941e997f09be20e28caf6967226a71369003cf35977790aba56ed0d469cc490cfa089b6
diff --git a/dev-python/cffi/cffi-1.11.2.ebuild b/dev-python/cffi/cffi-1.11.2.ebuild
index 0e086e82f5fb..73252df06fc0 100644
--- a/dev-python/cffi/cffi-1.11.2.ebuild
+++ b/dev-python/cffi/cffi-1.11.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=6
@@ -19,7 +19,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 IUSE="doc test"
 
 RDEPEND="
-	virtual/libffi
+	virtual/libffi:=
 	dev-python/pycparser[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/dev-python/cffi/cffi-1.11.4.ebuild b/dev-python/cffi/cffi-1.11.4.ebuild
index bdcd7280874e..db4fad0ca1f3 100644
--- a/dev-python/cffi/cffi-1.11.4.ebuild
+++ b/dev-python/cffi/cffi-1.11.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 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x
 IUSE="doc test"
 
 RDEPEND="
-	virtual/libffi
+	virtual/libffi:=
 	dev-python/pycparser[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/dev-python/cffi/cffi-1.11.5.ebuild b/dev-python/cffi/cffi-1.11.5.ebuild
index 14fa542c3c9d..a768eb4a28d7 100644
--- a/dev-python/cffi/cffi-1.11.5.ebuild
+++ b/dev-python/cffi/cffi-1.11.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
@@ -19,7 +19,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 IUSE="doc test"
 
 RDEPEND="
-	virtual/libffi
+	virtual/libffi:=
 	dev-python/pycparser[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/dev-python/cffi/cffi-1.9.1.ebuild b/dev-python/cffi/cffi-1.9.1.ebuild
index b8e2ed10c434..fcc131700977 100644
--- a/dev-python/cffi/cffi-1.9.1.ebuild
+++ b/dev-python/cffi/cffi-1.9.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
@@ -19,7 +19,7 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc
 IUSE="doc test"
 
 RDEPEND="
-	virtual/libffi
+	virtual/libffi:=
 	dev-python/pycparser[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/dev-python/diff-cover/Manifest b/dev-python/diff-cover/Manifest
new file mode 100644
index 000000000000..0897da503727
--- /dev/null
+++ b/dev-python/diff-cover/Manifest
@@ -0,0 +1,3 @@
+DIST diff-cover-1.0.4.tar.gz 73907 BLAKE2B 81562c30533739f950e52703ce235b214f66932f806a47b1ab245b69bba8ef46d4333924ddf2ba4ca6b70a7df85ae071805a4fac7181711495f46540c4a20301 SHA512 aa5646c5d097e2b3ace5807bde007c9d8ebcf99578dee2aff1174aaafbdb9777c4794a8e9ddd4dc6edb5af7f1afc812fce4410db87d0bab4159f044489eabb5b
+EBUILD diff-cover-1.0.4.ebuild 1041 BLAKE2B 9e3becf6fde666e9b5d4e982536bd66db45b4d9b8104b0c8bc565da4bbeb7105c0d9534712a094917c8e2ae95f5fea3462b750174a4343d9ebd47654cb160fe8 SHA512 ae06bdf674819b9d0b7ad4eb52b15186a79efd647ccf56d638dfefdfa1c50b661f89ddaccee3f5d85997ad05f223e87f352b8ee88ed8aa6b6b95d4a29e276252
+MISC metadata.xml 380 BLAKE2B b3fee2fecc0de95a5056955412d4f069a57a405a887966c1511c4c63f6c2c77778ace33d439fd37c6b5db62c247fa7fcd71c15f6cc8a97de46e72a841aaa9514 SHA512 80581412380ac1b87077d5e1c74596434ae398bc9b654c5492db7ce60270e9ad40c0e13b5c95a11cae57bef6b2a1dfa8888f8061a2ff221acdfc30c21e57242e
diff --git a/dev-python/diff-cover/diff-cover-1.0.4.ebuild b/dev-python/diff-cover/diff-cover-1.0.4.ebuild
new file mode 100644
index 000000000000..dfca39bedb15
--- /dev/null
+++ b/dev-python/diff-cover/diff-cover-1.0.4.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=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Automatically find diff lines that need test coverage"
+HOMEPAGE="https://github.com/Bachmann1234/diff-cover"
+SRC_URI="https://github.com/Bachmann1234/diff-cover/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.7.1[${PYTHON_USEDEP}]
+	dev-python/jinja2_pluralize[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		<dev-python/pycodestyle-2.4.0[${PYTHON_USEDEP}]
+		dev-python/pyflakes[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	esetup.py test || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/diff-cover/metadata.xml b/dev-python/diff-cover/metadata.xml
new file mode 100644
index 000000000000..f185cd57cab7
--- /dev/null
+++ b/dev-python/diff-cover/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">diff_cover</remote-id>
+		<remote-id type="github">Bachmann1234/diff-cover</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 8f2a775bf66f..eaee1b5b7d41 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,9 +1,13 @@
 AUX django-1.9-bashcomp.patch 1734 BLAKE2B d65bc505e4096fd8d23619f3d76b76d66fc3e68f408906c30a1a8e97a5ef5c0c9c1b352f8c4f4acd1588c639f7b0a489a53e1dbc9763b395ce2488c463e6d5b4 SHA512 d3caa9b77d6c336e131b706411080aa129df83ac60293a2612eb268d08a6c40096b322715766801e16a641134762174ecefcf2b93698f47b022fc31421597403
 AUX django-2.0.7-bashcomp.patch 1507 BLAKE2B 8aeb494087dbccffc69ad43f370e791d9fbfb1908d45f55d5f8be01ec0f3af6b2aff591da84a06c0858fecd44180579a4647d622ef57d8235ccb4b3b80fd3a2a SHA512 5a3867b8e4f2fafe4c53a741d41e8c6e8e28a55463f7d8007afd669a04daa8b93f911e4ef8d5ad38ba300558f21ac8090b00337d0c0bfb93b2aea73a179334a4
 DIST Django-1.11.15.tar.gz 7843843 BLAKE2B b7713de8136302d8d95929ed449ab01173e28c0d5d20529eaae9d6bd6d323f53b674a4fb6e8398da4b57a223f10ef63e7961accc8fd777313f18b4e2b0f225ed SHA512 4ea18c59f7c74d0b6deb9d292d5de068c6dcc53d9596f321f5a7e823ff5fe423cc8d69c88bf53e3acd9c36c4ecc4447148243a127d5114a4894b0fd4d449f37e
+DIST Django-1.11.16.tar.gz 7852514 BLAKE2B a881caa6c31c80d6b0146cb49a08ba63ebfba21637747328adb8ec3afada2182b72c46576a79cc9e163546e5b980a2be516d842492517319deb0a4f5512ad605 SHA512 bf1329ac364c9037fd6cecd0e8565c8bd8d830343671f9ce5415a10e70da37256667675b3f97e4d2508a8a912fa7a06ca7f585586ac18e6734c939bc41a8b455
 DIST Django-2.0.8.tar.gz 7987343 BLAKE2B ab35f50ce1911cb9603c7ac85e7ab01e6019ce9a2dac4cd733b11f35722368946ff3a130c3c791da4d49cf609b5747b4c5de64e29e27a8e12abb7f9e29cd363b SHA512 ac3cc3f58cb977518c6f549834beb35677c2d5541cfb5723045b98165926e826178cb33737c52a0f999be24bc38b84dde489a5f91d1c8d51b8338aa611acb518
-DIST Django-2.1.1.tar.gz 8595422 BLAKE2B b4d46162b8a48ada2e1321e6731afdfac8c6acbc394991178c33a374ea2d61d0b1f91ede6a56f9e88d20ba2ddbe6910fe452f79fc6cfb342fddc6222c454dad1 SHA512 e29180097cda0de35eb3dac77b7f7f3f31771257b9bfcd6d3fd37d421c572e1226bb1760635ccedee357cee7ca3dcb302de6126a771007a2cdef82970a596813
+DIST Django-2.0.9.tar.gz 7992507 BLAKE2B c6f1d79401007d2c83553e885d5e32c7890b3f1ed53c948ea4c55cc2a0272c06d0b7fdafef7be5042ab26b3f8c3ffef64f6f01f49d6e615503f8bfad99b66c3a SHA512 7a766ce0240b19a18dc5a9a4682630c4ce90fa6ed0d02a97303088a990d09e097b609220f4e2806854585724f483cb2ae7e4f29bfd1898f3a0d6e758c2f4ea4a
+DIST Django-2.1.2.tar.gz 8611286 BLAKE2B 5107fd04ee11ae4ded3d8914d840e323e26617b526ab877654de08caa6ce1cb6f053d3afbdbdbda17ab26b1ed1bcb158ef092a63ef14393b87ed98e612cf43aa SHA512 3510f872762e75c7e66987857616d958d15bef91ce2d9e1656abcf4e0221b1c6ff72c59fd29643aa0b0288118db76d58023cffe48f401e7cdcd03d71822a282d
 EBUILD django-1.11.15.ebuild 3226 BLAKE2B 4fe569a5302e8a35933a4a5059930b2a644657599374db2a693a15e1df41b60d54a0a689e63777e2669bb2abbb2c034ae0eeef7b497b35925fce11513262a9e3 SHA512 549d9198a51d786a028d3defde21a66ab45819127c68422517f82a537ccdde36dfdda34999b228b46dbbd84adb0af3fffb353bca147bf148e0a3f071ceae88c0
+EBUILD django-1.11.16.ebuild 3225 BLAKE2B 73493c93c4711c7217aa3f9bbeb1c9ecc6bd51e3b8602142488246bb6e0f6928ba6022eadc0ccd4630247423b12a8c7ecac08332b359e26612ac200b5af1c9b8 SHA512 18f2eb1c50dd478b98ed8dc7a078c4b2702c7314776006e8f09e12fabe67b3522c0bb391dedba179472f6eabc380489a8558f49ef911469fd1f99bb7e6957b14
 EBUILD django-2.0.8.ebuild 3057 BLAKE2B 8374be208eb49d23aa72ab5deada4745954ce46795c08c6b63d2e4d1178c0021fef8bbc115b209d0e94623c30972c14eef23576dda43ec81a5fd4311e08794ca SHA512 1531bca2617ad4a102cd1f07eab6779bed931735ca457b575f4ca1c2f896118c1405e38ed9907d515c69b36efb0ea2d54cba290619a64e7ca1e9bbab82f90fdb
-EBUILD django-2.1.1.ebuild 2492 BLAKE2B a62ab78f1b8bf04e32acc44fc25f4f5d555c9b48592bf23722d37db1059058e930c7fa076316554241cdb038712dab7cd20dbc0852bc5c41cc437d5c0d946a2f SHA512 fb4ef78101d5db8ef5546b256fcf28a6dee888ca1ee2c97dd2de1362a033b99252904b16b70b13d6a83492d9408d9e31a64decb25769075e5a82679bb2e5456c
+EBUILD django-2.0.9.ebuild 3056 BLAKE2B c1d993c2508a178979cbbffaba723733b7e512268c216ad1f175e4da4cdc7764ed88c3c97c83f28a5fd3949f2222436a39115cba08fc10218a4a32f18c6cac56 SHA512 4e867e0d251f83dc155f448f7dd369368d6de9f4aae0f7f146a0d5d007e27505f3c0787f5231238dea3c5fb50040faf520531238ed2f7718debd5f456f5f060d
+EBUILD django-2.1.2.ebuild 2489 BLAKE2B a5fa9e5c8b327c68ec8d5cc2a254e265f0d25ac2e58e5148d6c2e4a4d88c96797afefba176afedf404667ed35cb11f1f7a05b8f0d0c1f918ad5eadb014cd537b SHA512 d31eb055c10c1441be1ac99bc2f29e4e2bbd3340285fea7559e247a0d7ce01d95b38cc2507e956760668a503ebbf9721419c9243cbf5c1d431060acc4f2e2f58
 MISC metadata.xml 488 BLAKE2B b3ffa7cc6bced74a890b71be2bfb3805bb51a523f485079a7da0cb2698f3fa0ee1746922813859ac95df41b3ef3249c413f1692f3635427fa965874287b83d88 SHA512 9091a2e41a992542b38251b12623c0b1ac737cf01a4f46ce63096568bcde4e3d8546705bdb10c14c128b4cb6564e38dbb6d1803611c5197923b847304aa69cdb
diff --git a/dev-python/django/django-1.11.16.ebuild b/dev-python/django/django-1.11.16.ebuild
new file mode 100644
index 000000000000..802b7b5468c2
--- /dev/null
+++ b/dev-python/django/django-1.11.16.ebuild
@@ -0,0 +1,112 @@
+# 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 )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+WEBAPP_NO_AUTO_INSTALL="yes"
+
+inherit bash-completion-r1 distutils-r1 eutils eapi7-ver webapp
+
+MY_PN="Django"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="
+	https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
+	"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc sqlite test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/numpy[$(python_gen_usedep 'python*')]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		virtual/python-enum34[${PYTHON_USEDEP}]
+		)"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9-bashcomp.patch
+)
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+python_prepare_all() {
+	# Prevent d'loading in the doc build
+	sed -e '/^    "sphinx.ext.intersphinx",/d' -i docs/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 --parallel 1 \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	if use doc; then
+		rm -fr docs/_build/html/_sources || die
+		local HTML_DOCS=( docs/_build/html/. )
+	fi
+
+	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+	doins -r django/contrib/admin/static/admin/.
+	distutils-r1_python_install_all
+}
+
+src_install() {
+	distutils-r1_src_install
+	webapp_src_install
+}
+
+pkg_postinst() {
+	elog "Additional Backend support can be enabled via"
+	optfeature "MySQL backend support in python 2.7 only" dev-python/mysql-python
+	optfeature "MySQL backend support in python 2.7 - 3.4" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	echo ""
+	elog "Other features can be enhanced by"
+	optfeature "GEO Django" sci-libs/gdal[geos]
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+	echo ""
+	elog "A copy of the admin media is available to webapp-config for installation in a"
+	elog "webroot, as well as the traditional location in python's site-packages dir"
+	elog "for easy development."
+	webapp_pkg_postinst
+}
diff --git a/dev-python/django/django-2.0.9.ebuild b/dev-python/django/django-2.0.9.ebuild
new file mode 100644
index 000000000000..512fbb933f3f
--- /dev/null
+++ b/dev-python/django/django-2.0.9.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_{4,5,6} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+WEBAPP_NO_AUTO_INSTALL="yes"
+
+inherit bash-completion-r1 distutils-r1 eutils eapi7-ver webapp
+
+MY_PN="Django"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="
+	https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
+	"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc sqlite test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
+)
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+python_prepare_all() {
+	# Prevent d'loading in the doc build
+	sed -e '/^    "sphinx.ext.intersphinx",/d' -i docs/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 --parallel 1 \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	if use doc; then
+		rm -fr docs/_build/html/_sources || die
+		local HTML_DOCS=( docs/_build/html/. )
+	fi
+
+	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+	doins -r django/contrib/admin/static/admin/.
+	distutils-r1_python_install_all
+}
+
+src_install() {
+	distutils-r1_src_install
+	webapp_src_install
+}
+
+pkg_postinst() {
+	elog "Additional Backend support can be enabled via"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	echo ""
+	elog "Other features can be enhanced by"
+	optfeature "GEO Django" sci-libs/gdal[geos]
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+	echo ""
+	elog "A copy of the admin media is available to webapp-config for installation in a"
+	elog "webroot, as well as the traditional location in python's site-packages dir"
+	elog "for easy development."
+	webapp_pkg_postinst
+}
diff --git a/dev-python/django/django-2.1.1.ebuild b/dev-python/django/django-2.1.1.ebuild
deleted file mode 100644
index d2f6650c8d63..000000000000
--- a/dev-python/django/django-2.1.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=7
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 eutils
-
-MY_PN="Django"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
-SRC_URI="https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-# admin fonts: Roboto (media-fonts/roboto)
-LICENSE+=" Apache-2.0"
-# admin icons, jquery, xregexp.js
-LICENSE+=" MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc sqlite test"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
-)
-
-python_prepare_all() {
-	# Prevent d'loading in the doc build
-	sed -e '/^    "sphinx.ext.intersphinx",/d' -i docs/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	if use doc; then
-		rm -fr docs/_build/html/_sources || die
-		local HTML_DOCS=( docs/_build/html/. )
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "Additional Backend support can be enabled via"
-	optfeature "MySQL backend support" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	echo ""
-	elog "Other features can be enhanced by"
-	optfeature "GEO Django" sci-libs/gdal[geos]
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
-}
diff --git a/dev-python/django/django-2.1.2.ebuild b/dev-python/django/django-2.1.2.ebuild
new file mode 100644
index 000000000000..576b624d32e3
--- /dev/null
+++ b/dev-python/django/django-2.1.2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 eutils
+
+MY_PN="Django"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc sqlite test"
+
+RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
+)
+
+python_prepare_all() {
+	# Prevent d'loading in the doc build
+	sed -e '/^    "sphinx.ext.intersphinx",/d' -i docs/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	if use doc; then
+		rm -fr docs/_build/html/_sources || die
+		local HTML_DOCS=( docs/_build/html/. )
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "Additional Backend support can be enabled via"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	echo ""
+	elog "Other features can be enhanced by"
+	optfeature "GEO Django" sci-libs/gdal[geos]
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/dominate/Manifest b/dev-python/dominate/Manifest
index 3b7882c36884..69a887d84ec1 100644
--- a/dev-python/dominate/Manifest
+++ b/dev-python/dominate/Manifest
@@ -1,5 +1,5 @@
-DIST dominate-2.2.1.zip 46460 BLAKE2B b09984978755f9020e78873aec73c09ccdf0113b99f1a0c9dcf43307a5523000f04ef2e063d03e636e2e958aa5dbd69993a8c606838cceb216599b314ab24a2e SHA512 3f79fa4258f98708b1e169693e83f919179c1148f440300426f907e28c26b28c21a1098793a14f7e89e5aba0de61f93c889a4908f0eb6e3641ffe234e215e597
 DIST dominate-2.3.1.tar.gz 27887 BLAKE2B 3ac0820bd0cb79e648dc947d3cb69aa207e3c129cbae05daaca8fd3a6e22c67bd20fa350ce211986451caa7feb5b60c8ff692e568073e007c34de7cb8847b8a1 SHA512 599147cd9aabc7c3bc24e6c82a13b690808899107999a3b0d7d3f2f113b38c90f2c720298ffdcdf1933d2573cced05d730dab53265397b7fc010e57feabc10b3
-EBUILD dominate-2.2.1.ebuild 662 BLAKE2B 664c240b48ecddf85d01f1142b12bf5331d7073425bb7108f783379a02203ebc7a1ca5b1013dbd6f05238e6e267c3facc408695c0f7c426c9fa52c86e4846d94 SHA512 e35a3f04d9673cc915f2776e828c12be6654fd552537f7ed64f02106fdefada4836a3c12ce35b6227786c614ddb62b4b907e13778e34b0e347e9120ac48897dc
+DIST dominate-2.3.4.tar.gz 27834 BLAKE2B 12eadd39e5088768c2cfc15e23093c53c58d90dab6346ac78d47da8b7d41fb50fabf4e186b9fea18ecb54fe8b6dae03a489b27a1942cfdc13437afe9e86919ef SHA512 6cab8d6d795498d70f28c80064407616e74e027ac112f8e097509482dce000e45c3599989430a17f71631616a860e84d842b2bfac39b4be466593b5cfb20123c
 EBUILD dominate-2.3.1.ebuild 606 BLAKE2B e59982d021a5797c993d4ea58bd57c831aca4a9c17901198af5c6477221f06dfe000b69f14f6367380ef95a91ea107318119bc91b122902119e18b904d2a29df SHA512 0319d71125e32159f0672c1c167e4c53f03f2076fab285b68e62a24b78bb93bf2f03e5e3efb8b4f6f65749882508e92cfd22aaddba8032ff953e6e767b1560e4
+EBUILD dominate-2.3.4.ebuild 605 BLAKE2B 48e0b5a55457b2ca26ca15cd356ecd60416abd72bc80f2782699783f2c5e10ed282e13937846a11167259a5320969afa4cb258a3931068a6f7b7d9a678c6652a SHA512 2b8a0b551234934af21f3e312c476c4a50049bbc34c054188140625bd32c440fba48cdb9f3bb012de41dfab001b36fedc01e655356332ed34da0d6bd9a6f7e7d
 MISC metadata.xml 771 BLAKE2B b57440fdd8bad6140d982af019944cc740ba47183908dc2505c1436448e735cd63f537b3ef2158b6014c4dc050128b13881b368ef9ed5e840b37f7e88ac72a25 SHA512 2af8875459291f59c07ece49ac0edeab74408f54031878c1b03581bdbcfcb509caf37ee30d03e2f86f59dd67aba62c54808ca5a6c67037717113c3bfb6f9961e
diff --git a/dev-python/dominate/dominate-2.2.1.ebuild b/dev-python/dominate/dominate-2.2.1.ebuild
deleted file mode 100644
index 12751f810ead..000000000000
--- a/dev-python/dominate/dominate-2.2.1.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
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for creating and manipulating HTML documents using an elegant DOM API"
-HOMEPAGE="https://github.com/Knio/dominate"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-DEPEND="
-	app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND=""
-
-python_test() {
-	py.test || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/dominate/dominate-2.3.4.ebuild b/dev-python/dominate/dominate-2.3.4.ebuild
new file mode 100644
index 000000000000..078ac80b939c
--- /dev/null
+++ b/dev-python/dominate/dominate-2.3.4.ebuild
@@ -0,0 +1,25 @@
+# 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="Library for creating and manipulating HTML documents using an elegant DOM API"
+HOMEPAGE="https://github.com/Knio/dominate"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/ebuildtester/Manifest b/dev-python/ebuildtester/Manifest
index e151a4edda9b..d35f6b32b749 100644
--- a/dev-python/ebuildtester/Manifest
+++ b/dev-python/ebuildtester/Manifest
@@ -1,10 +1,12 @@
 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
 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
diff --git a/dev-python/ebuildtester/ebuildtester-0.1.13.ebuild b/dev-python/ebuildtester/ebuildtester-0.1.13.ebuild
new file mode 100644
index 000000000000..3f9b13bcc09d
--- /dev/null
+++ b/dev-python/ebuildtester/ebuildtester-0.1.13.ebuild
@@ -0,0 +1,31 @@
+# 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/flask-appconfig/Manifest b/dev-python/flask-appconfig/Manifest
index 3ab75e8e9c8a..be22f0f65c63 100644
--- a/dev-python/flask-appconfig/Manifest
+++ b/dev-python/flask-appconfig/Manifest
@@ -1,3 +1,3 @@
 DIST flask-appconfig-0.11.1.tar.gz 14545 BLAKE2B 71cb3252707ee546aaa16ed36f1c605c5e90d49070a64aa381f23fcc1fa9147724a8794b8530738115c3b0505537487c63b3131c586b4383884b58f6141cd515 SHA512 9ebc42be5ef247b1f14b85f7b65600a1595ecdc70e792c0cd495347254b07675a3b7a306df8d2f2663626ceafa4ce7700f6f26cd0f1bcd974ba6bbab293847ee
-EBUILD flask-appconfig-0.11.1-r1.ebuild 1219 BLAKE2B c4990b3715f60bb277c3373413b3cb6eac7c44a8d2804af753e027dbf18e56297dfaa9ed0724bf1902d50ac2c5c4a3a5cef302c94e8a5fa0f55fb5a3901153ef SHA512 28edc3c6370258c78a8c44ee7a401f2eb0f43b37b7386c3343bb15b5b4bc454676630ac7e377134eca050cb66b2e976db9af4fd8414b246debde239711b4320e
+EBUILD flask-appconfig-0.11.1-r1.ebuild 1265 BLAKE2B d0d3ba15a4b6372c6adfa8aecab57945dd959985ea629a8c5457d96bcfbb3d3a1a1b32a397d67b2658e4ab3d4d3ab00ea9821e191971ceba96073f0d40664751 SHA512 3b68ca9755fc3b078a0cdc2e93e781dcdf957a90138d715c17f9aa1dd23289b78b1cee9a47df4a27d72b0c1f9f944656cb24754ef57a4dcb16998c821237f748
 MISC metadata.xml 449 BLAKE2B 062ef689f336373983993c0c666feb9a5fa6a6d6a19d3509a6856c6f75a4b810fbf6ed6ea42511073691d83c23a63c5cf3a78db1f0e41d2001b146d8b950e30c SHA512 6a71fd90326834e06eab6e45aeddf17940a9140d7ac41e9fbd1dd8551042066a7fe4f6eb6840d5e2363deffb9d00d59283aea87c113b4b190590d545cd283122
diff --git a/dev-python/flask-appconfig/flask-appconfig-0.11.1-r1.ebuild b/dev-python/flask-appconfig/flask-appconfig-0.11.1-r1.ebuild
index 2e1c7689325f..85f4e59c812c 100644
--- a/dev-python/flask-appconfig/flask-appconfig-0.11.1-r1.ebuild
+++ b/dev-python/flask-appconfig/flask-appconfig-0.11.1-r1.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=7
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )
 
 inherit distutils-r1
 
@@ -24,7 +24,10 @@ RDEPEND="
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	doc? (
+		dev-python/alabaster[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
 	test? (
 		${RDEPEND}
 		dev-python/pytest[${PYTHON_USEDEP}]
@@ -46,5 +49,5 @@ python_compile_all() {
 }
 
 python_test() {
-	py.test || die "Tests failed with ${EPYTHON}"
+	pytest -vv || die "Tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/git-review/Manifest b/dev-python/git-review/Manifest
index 6f452ca80f78..5f225799e3c9 100644
--- a/dev-python/git-review/Manifest
+++ b/dev-python/git-review/Manifest
@@ -1,3 +1,5 @@
 DIST git-review-1.26.0.tar.gz 56557 BLAKE2B c8af82d7cc222078c1ef470da0ffac7b698df91ed991ba43c8d34a64bbfa3996bdbe475d9965d6d1ef8cca84293613afb92ac6405c0397232e568d2ec2226202 SHA512 74b2366d7884963caaa9b4614301fad56b7997d1cb16ef333cd2dae5df5a5343e5b891fc089078856b57db0083584a8b4ceea98dd67c401651a100fc4fdf7d81
+DIST git-review-1.27.0.tar.gz 58471 BLAKE2B baace809949fb5bdb22c6cca251deca7a200b070573840f391ad24ad045276d376616c58355c5159086dc67b481686d6382c71604f2bdc8adf0b2799240a976d SHA512 e9fff7e54457b300c269378062e5bcce28511dfd6662035dc8d276e33e6a0f6b6c68bae98fb3a8a36e468f669c4eeb461e96cdf073a831c42156f8c0ef14fa0a
 EBUILD git-review-1.26.0.ebuild 665 BLAKE2B 67bac1643c0a04d4708fb79c53a5b0b3c6f26389c1b5e504d5326c890bac91e089952505694459ed454e31696535cc6275a5941f04d4b30a0f649b29ed84fe5c SHA512 5d4877bc51ba70c25cb3177095b2ba48ac34c137ffeaaa4d08149585049f91ac801303988dd5bb267ef24596054279060510b67349ed6aa4ba586012ec80b6a8
+EBUILD git-review-1.27.0.ebuild 664 BLAKE2B 0e15a21e009460d5ee20750df42823101664b6471be12aa429bd40a8b7c3f88d3ee3d5b35f0d1b6f6515e653c9b8a432a431bf937a0b0d29215e06b2031e8dba SHA512 834f2c81f45ebb7a82c69e7fdf15a2b0659755680edd25f0ed8b0468420037af16fbce4d531f37472f4110123d25b84170f18a0cd787e24ae1d380e8b653f8a3
 MISC metadata.xml 337 BLAKE2B abf6866cf38fbd7925eabe5d6f2a4cd5887dc263d419cad65ca4105a20ee975ad41e1a661696520fe016318ce55651dc123ba7e6a735335a70d3aaa1b10f3320 SHA512 5bb1243f031097419ceadb6935e12567d359790e5fe63c19687f1cfe4a64f5dfa23b5704232d5777c6dddc1908b0856a780129dc08b787d786d2b867dc40ff46
diff --git a/dev-python/git-review/git-review-1.27.0.ebuild b/dev-python/git-review/git-review-1.27.0.ebuild
new file mode 100644
index 000000000000..039cad47a078
--- /dev/null
+++ b/dev-python/git-review/git-review-1.27.0.ebuild
@@ -0,0 +1,29 @@
+# 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
+
+DESCRIPTION="Tool to submit code to Gerrit"
+HOMEPAGE="https://git.openstack.org/cgit/openstack-infra/git-review"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.8.0[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/requests-1.1[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^argparse/d' requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/gst-python/Manifest b/dev-python/gst-python/Manifest
index 87d73594e0e0..a62af8dae04b 100644
--- a/dev-python/gst-python/Manifest
+++ b/dev-python/gst-python/Manifest
@@ -1,8 +1,6 @@
 AUX gst-python-0.10.9-lazy.patch 534 BLAKE2B 27019fe8f97a9e364c9851d3faa82195e72e061f7dbc0528c7b1534478b242fe62488275360f312ea16c7da9a714e82b399404c3f94b83d49332df31307444f8 SHA512 b00cb635ae44f4dc42f0d72f5fb49e6540eee6c8b989715df4554dc09e9980ce0d5c91ea7ebd853d552061d1aad1a28b645c831198b9799587debce654f508c1
 DIST gst-python-0.10.22.tar.bz2 632651 BLAKE2B 17c139c2b5514a7a5e4c2351109418a2ed1bcda149e83c0e940dd09619225fa0930bba5f5d42d3c03f5f8567f3c90454b47a51513d609a36887efedcae8ab482 SHA512 bbbd6b661778cca990da0e216294d86da31a6e472049905989a3311459dd1227bf8f2ae3699a3cdbb66a16288569764352f1e1b93e696d3db4b0728bc38e5b12
-DIST gst-python-1.12.3.tar.xz 388220 BLAKE2B ce9cecab7e65c66b43f7363be18299be0e86b1023b0897d735b8526b30290ccd320204f6acce29e512e85b2e5d7298bdc184eec1488d00fc3b2869311b71295e SHA512 f4d0d09a5b068e79496aa5e0d73f09af2d1e929cf6f80874dba8396950952b795a30f5a33c18b42a650f173c80ce342f959d497aa0d9d281bbe36507a71d1b4a
 DIST gst-python-1.14.1.tar.xz 405312 BLAKE2B 29be6f79b20a27e0d21f27cbf29b1881216e412c3c4ea016f3ee6bd921ec7b73139f74a20528f7f704526786347b065d246940f152d61a64e4eb926dbb44bb87 SHA512 32537e6556b69d00cb0b467239c148c0b9c282b76786be395e053a30554b84aea7c22e7fe6fc6faf77b35fca82fb799df4f52c114b282d0a6ea660f67dc40c53
 EBUILD gst-python-0.10.22-r1.ebuild 2148 BLAKE2B 5a99c81cd728afc601e7b8b3f54bd9d8ab8e5c215a6cdf568cf6aa01eba484c1fc16b701bb5d8bf9dc97b0f44b69688e1c8fb7d4a5c9781dd3f4d7c8d6a67071 SHA512 ebc646247140167dff59b882007d1919cfcc03cbc872d2d0db1dba3887287b3f9110a523df844da4b59ac70f764a8cb1f9de570ac660458a29d0802b7791639f
-EBUILD gst-python-1.12.3.ebuild 1126 BLAKE2B b380d585e607b91123da87fff21af321e1dd167465693f539f881d1968104d2635b348f81d40d81c1dc2c8c63797fe4d20bdff6b1125823ce4eaa46324a9e2b5 SHA512 e68bfa562cf78dc2da2b7edf570122e9052b12015fbed8948db9c5e2e5ec29a2ca7daf35fb96ea72a4d44fd5dbe6d13c75330f6734d1d4368ff525b6e4858622
 EBUILD gst-python-1.14.1-r1.ebuild 1985 BLAKE2B dbfdbe037f328152b49d7f792033f1c2d1827711543eb1bab1ba05de100611e95ef431784de14641b0c64837f00bf71035ae8d80aca66c8232395119cc2b8db1 SHA512 37f15dd10b23c7b746e1df82190befa0b2824d6122afab100113238dc0aec0d33b8031d0d00ee2dbfc22a081bd281119f1b569bbc5b7764db4d5149896a5e103
 MISC metadata.xml 272 BLAKE2B b1575d88177572e472e66c7cce4fb4c0d98aeb02edb03e800c2b2f2702b5c81c6c012c264655fce8c3170e44bfa117c81b85cdbb9f409714ab216c7a6f2b4482 SHA512 7dffa3bd729f24f9081f6b1c3db474cb26c54e95752a37140c5a9836299f26b3d0aa73e7c448e6b773478cb0112eaaf70f783d2b2f3d2868b1a2def8e6a9b8ea
diff --git a/dev-python/gst-python/gst-python-1.12.3.ebuild b/dev-python/gst-python/gst-python-1.12.3.ebuild
deleted file mode 100644
index c23317d494e3..000000000000
--- a/dev-python/gst-python/gst-python-1.12.3.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
-
-PYTHON_COMPAT=( python2_7 python{3_4,3_5,3_6} )
-
-inherit eutils python-r1
-
-DESCRIPTION="A Python Interface to GStreamer"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="1.0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/pygobject-3:3[${PYTHON_USEDEP}]
-	>=media-libs/gstreamer-${PV}:1.0[introspection]
-	>=media-libs/gst-plugins-base-${PV}:1.0[introspection]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	prepare_gst() {
-		mkdir -p "${BUILD_DIR}" || die
-	}
-	python_foreach_impl prepare_gst
-}
-
-src_configure() {
-	ECONF_SOURCE="${S}" python_foreach_impl run_in_build_dir econf
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	python_foreach_impl run_in_build_dir default
-	prune_libtool_files --modules
-	einstalldocs
-}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 7bbdc0fa2272..e31e53e638dc 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,5 +1,5 @@
 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 1172 BLAKE2B 828ffd82cb805fec872ce2d1c10fb4029d43591e3463736891967c7336b032c0eaccb6ac1eb73522d7243797eb50036712ff35c2169bb8f18a9e7b8994476467 SHA512 72d91a28763297a7082645f5aeabbbb43e76b1f1febdf6ee1ef1d43a9a75035f73aa462d9556dd7ead4eb41819c4c39a0e8313a638d5c839f905009ea1feb1ba
+EBUILD hypothesis-3.59.1.ebuild 1165 BLAKE2B 6a6f93aba2e1e8e21aaba137c7ce3552f507df5848acfdee1f04faceaf16c8e1bbef2ebfd5eb89931b9ffc2b3ed01371a0789c8a1664c549e4c94b8e0cc95356 SHA512 c55850a992b3088c2b7639bfff783e356b359463df972e8c9efc1670cb3d0c6eb838c885cc0e6b17b30fdde2ccf02e211fd423fd845c91d42f2b917e57b50c54
 EBUILD hypothesis-3.6.0-r1.ebuild 911 BLAKE2B 4107db5cf3dee7f521f54dbfe0488742ddf21876b88b5b637c361d8808fa09686252e5d464391adb3e2e45737c2e347eb963fc0e49c41a04c0ff84536a131885 SHA512 315866abf6fa890934c3125d86beba7c3bd799f1472c5661725418806f68f20c850b3204b687a03c1887ecdf6a535117446a049509050da5f9d6d93cb0f6cd0b
 MISC metadata.xml 379 BLAKE2B 3623a13a813bf71f9474fa018b2f83392ec168193b9853cabcf112267d38e7278e97a415bb8b7e52f9ebb28864b8709a64996dcb0d97e1f03b3ecb31a944d74d SHA512 40bb5c1916d9027ff81cd32073de34753a30d8430f36d0fd16667a111af8fd222379dcd817edd723d362f5ff5578ad7b212f98388c00de6dff1a64bd2c3978b0
diff --git a/dev-python/hypothesis/hypothesis-3.59.1.ebuild b/dev-python/hypothesis/hypothesis-3.59.1.ebuild
index 10b1353da66e..d6a43fd2932a 100644
--- a/dev-python/hypothesis/hypothesis-3.59.1.ebuild
+++ b/dev-python/hypothesis/hypothesis-3.59.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 @@ 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/jinja2_pluralize/Manifest b/dev-python/jinja2_pluralize/Manifest
new file mode 100644
index 000000000000..3d056fe9b387
--- /dev/null
+++ b/dev-python/jinja2_pluralize/Manifest
@@ -0,0 +1,3 @@
+DIST jinja2_pluralize-0.3.0.tar.gz 12638 BLAKE2B bb7399d287cf0d1bfed5398c0ad7e6994dfe1d8e942d82190570d0b40d8bec4939d497cb2d9d4415c913f3f3f9c11b017035941755219effa8d92a6ef188dac9 SHA512 8830c01ff82befa353302cadc305147a950038fdf3808632f22dfce9a564a6ba7967781f579a2d94fecb1b5bb01f80d2a53ff082332b94c6e6e3f5f4106e7313
+EBUILD jinja2_pluralize-0.3.0.ebuild 595 BLAKE2B 04f82c0bffbe4db509a0e1dfe20a2d82e895bd4107f4d3d2786685006163d6bad84c23b755fafd8408668da3338ac252b6086e24d03863fd2cd859988fafe102 SHA512 4978574c5bc3322db34172b3b5536e31f9fc2adf3f6ffed5498a0f60a0b8db591359d5658b0f4cda8e7330ed45d4d1384f2b551cd09c43fe47bfea9494c5932e
+MISC metadata.xml 387 BLAKE2B bbf1f15fabc767c47fdfb69fc1dff3722cde37c075f15404667ed1a9e51ac3147bb093247af3941d9165e26118dd725eae8ad7823be1f9d7a9727ddfc2777e04 SHA512 1b5c9b39ec7a445d8cc673517d3552a9f256804ac8b4f24be6fc7a19d5c7df9613eea3f15e44009c19df3944b9a14a8dd353407bee415883322dc6e973e403eb
diff --git a/dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0.ebuild b/dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0.ebuild
new file mode 100644
index 000000000000..c23fffceeb65
--- /dev/null
+++ b/dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0.ebuild
@@ -0,0 +1,26 @@
+# 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 distutils-r1
+
+DESCRIPTION="Jinja2 pluralize filters"
+HOMEPAGE="https://github.com/audreyr/jinja2_pluralize"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/inflect[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/jinja2_pluralize/metadata.xml b/dev-python/jinja2_pluralize/metadata.xml
new file mode 100644
index 000000000000..f6d818240495
--- /dev/null
+++ b/dev-python/jinja2_pluralize/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">jinja2_pluralize</remote-id>
+		<remote-id type="github">audreyr/jinja2_pluralize</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/kazoo/Manifest b/dev-python/kazoo/Manifest
index 97848a3aa901..746faf33ca87 100644
--- a/dev-python/kazoo/Manifest
+++ b/dev-python/kazoo/Manifest
@@ -1,3 +1,5 @@
 DIST kazoo-2.2.1.tar.gz 108037 BLAKE2B 23b6b762469df40304cb0d9228dee63875e7c062557e0dcfd383db792c7544b19fbb4fc91a62035a2455b5a2715a57bcd4a68521cf698f01815cec20765420c8 SHA512 a2590441a9e3bfb3d14913051453e195d275b82bd6a4ce5e32d0a7bbc09b00e475ffac68fd06cb065aa439ea580b61bbeaa3ccfefa413723e46f4b1d3ce05707
+DIST kazoo-2.5.0.tar.gz 147189 BLAKE2B f90662d78698d4ba8c9a88cd4eba826df104dd746323ce92644707e22ab711ca5fafb79bbec71c4059637232eab4b510b9544871201ba8d6758618d5a79f97c8 SHA512 cb85a33f2d0aa71fc5a82e7046e5d331417df865c1a4bc18266cee65ffd6c36e12cd4058ee591214ec83225a9b3ee193587f3d07b5c1436cc715a403364ec1af
 EBUILD kazoo-2.2.1.ebuild 1118 BLAKE2B af9d452abde829cfd924d4113f5a65e20733081c146ad3ce2c8efb43fd248671cee5c2f3317483a16768c03b1eb87af2c1310c4caf3d087605bcb79c26950c61 SHA512 dc78320cfc9400e0076cd2ab73b98dc2ac7a1947ce09e63faf4942ec1854b62f1762490e8549fc32908d28417f3b41a2db728524a247f0bcd649c9081c6d52c5
+EBUILD kazoo-2.5.0.ebuild 1118 BLAKE2B 6666b94b93970afaeee99abb8e75c66d13c07160d85cceabc7a75c77cbc4840e38d681fae1337517c9e0498d78e7ca348d3075e25e757d574e367fec607165d3 SHA512 001fb52d932b5d228369e37c62aaf370c008d6c77eb6c7805b785e71c4aca42bcda1d10d0a9c12e72ab96f2c9b9b5c8b9a8cff0f17cc0b0b7631a38622392195
 MISC metadata.xml 467 BLAKE2B 289e2184ed4d8b4435da2edd6698d915a26f2dfbbba93aba0aed35a2adc5f5ef20a95d70e673de980e08d58252ea8f540b913a35a46eb1327821dca49ad36f60 SHA512 3028edb8107a980e1573f283e9f47a408b9c4ef9bea0ee452f25d908665220ea6cd43b70e2d85d339d553e60426f9d45a093eece38cd0a67f2f416db7580a6d6
diff --git a/dev-python/kazoo/kazoo-2.5.0.ebuild b/dev-python/kazoo/kazoo-2.5.0.ebuild
new file mode 100644
index 000000000000..acc6d5b4f98d
--- /dev/null
+++ b/dev-python/kazoo/kazoo-2.5.0.ebuild
@@ -0,0 +1,43 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="A high-level Python library that makes it easier to use Apache Zookeeper"
+HOMEPAGE="https://kazoo.readthedocs.org/ https://github.com/python-zk/kazoo/ https://pypi.org/project/kazoo/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc gevent test"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	gevent? ( dev-python/gevent[$(python_gen_usedep 'python2*')] )
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+# not all test deps are in the tree
+RESTRICT="test"
+
+python_compile_all() {
+	use doc && { sphinx-build -b html docs docs/_build/html || die; }
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	local DOCS=( {CHANGES,CONTRIBUTING,README}.md )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/mpmath/Manifest b/dev-python/mpmath/Manifest
index bf2cd33afc76..11ad3efbcef7 100644
--- a/dev-python/mpmath/Manifest
+++ b/dev-python/mpmath/Manifest
@@ -1,8 +1,5 @@
 AUX mpmath-1.0.0.patch 422 BLAKE2B b79a223fb3d6c712a11e225c4f617d68cfda595ad314fb33ba02333eedcf39909f9bf76c98f004619f62cfb4516172615b8e79017362807980b1c61724423543 SHA512 a5c7c8816d7e4ba2dc481480a887d94ca158fee804a01e86f91fcea037372217ed8b029f85f6a0c15558b44aaf56f6fadf36b4f7476713a04a66f18b6f1ab997
 AUX mpmath.patch 434 BLAKE2B 1d7c2a6d8d99efc75fd4e6ab5900ee88c8b75a809a8776c3dd9fd390200e5d184423625f8a9549345892ae985e4237727d39d821ecb2503d29a2d78b6417f967 SHA512 2ffc7ffa375f5c25d044974a8b1fac145a00d9b1f190d12e1ade6cadad44dae11098617de5ee0a523931f046b4cd0e785552a3de6f66f438052955b6987bda39
 DIST mpmath-1.0.0.tar.gz 511349 BLAKE2B 62c6275f76c412043cdafef51815e4b5d055a63ca36f3f63b33957351b19e03419ca27f7d59641c580cf8e47c1ca45240b68b3040e2749b3de679eb45b15a28e SHA512 b225f237008e1cfee52b2f0dca0dce1445b932b6eaef92879d7feca30d728e3f88810bfa80882ad8776ba846a636807e59bebe0b9f690cd878c089e9418bd8b7
-DIST mpmath-all-0.19.tar.gz 2123129 BLAKE2B df7e6255f09362a4203716a5d70036b712d069cc08c09613cabd6d1a88ab5155610f5fe5d2f33db3ed241322e92e93301c54c9cba777c0fbedfb5c891ffa3db0 SHA512 5a6ed0b5fad84c1e8399467ea7a1295f9b77c8e673b821c11e3298e88df6c48d9967eed84e2979bf12868e2f9b42bffba01a0c1836a6d82ac42d5f423fed6580
-EBUILD mpmath-0.19-r1.ebuild 1384 BLAKE2B 6aadcbff6fd2a2907c345a6d2e1025a3f6669b416e19ba06f355df8ab65cd71b2ed3f316a87295ce50a3b38f8974153634d83adeac8033b33bf4473df0e22c4c SHA512 a250ca3659c948dd59a4f3151ee06fb5e0f4b9c9e51ef3edb757ab9f743d4f2ab28865531bc2db486333ddfda0fe0e69184c58af8a33bd8352327849ff0824ef
-EBUILD mpmath-0.19-r2.ebuild 1390 BLAKE2B f820b249bae5761a167af070fe0a3255698ddbccc47eef896db7666aba22f606c7ac975e88bccaa853ebd5bd63a31a12fc08f2089f48fd03f65d43b23aef3015 SHA512 a4128b69fea1a8f4d936645fe9bee6d19e5c9077b088cd377c32c1541d140f1f2da42051fe194abaa914c2d1cf68cdb0e36df71ed09a0b56e6ad42f8ffc2c6a7
 EBUILD mpmath-1.0.0.ebuild 949 BLAKE2B 754a1b4fe71fd30363daa59304106e4887f7fbb8567872d2eff73bd3651516d9b74f664014521580f2696a717e9472301321114ff60d5f4e80032834fed6cfd0 SHA512 1f66dacb4c67b2a132a45727bc2df816760537f69fb3acd109f601c3e0108d793c237546dec4f9bcd26e87b2a2e2817b72436941c473438670491d79482ff08f
 MISC metadata.xml 650 BLAKE2B 520b0399fbbae4307a4b3979202b4d5c8d1b06f739e0c0460a9a0be63b78152b50ab3f7fdc9b46623cf7afaeabbc57cd35f3865462f3b16ce2beeb0b8f8659a5 SHA512 0f999aeb354c73658f916cb8d3a80dcd216f50f77839c0c854e9235566cb197a7d047ad51045996fc0b9e1c47f55e934be9dd52597fee16fcce6360bfcbe8f08
diff --git a/dev-python/mpmath/mpmath-0.19-r1.ebuild b/dev-python/mpmath/mpmath-0.19-r1.ebuild
deleted file mode 100644
index 85fc57bbf397..000000000000
--- a/dev-python/mpmath/mpmath-0.19-r1.ebuild
+++ /dev/null
@@ -1,62 +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 eutils
-
-MY_PN=${PN}-all
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python library for arbitrary-precision floating-point arithmetic"
-HOMEPAGE="http://mpmath.org/"
-SRC_URI="http://mpmath.org/files/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-IUSE="doc examples gmp matplotlib test"
-
-RDEPEND="
-	gmp? ( dev-python/gmpy )
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}.patch"
-		)
-
-	# this fails with the current version of dev-python/py
-	rm ${PN}/conftest.py || die
-
-	# this test requires X
-	rm ${PN}/tests/test_visualization.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		einfo "Generation of documentation"
-		cd doc || die
-		"${PYTHON}" build.py || die "Generation of documentation failed"
-	fi
-}
-
-python_test() {
-	py.test -v || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/. )
-	use examples && local EXAMPLES=( demo/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/mpmath/mpmath-0.19-r2.ebuild b/dev-python/mpmath/mpmath-0.19-r2.ebuild
deleted file mode 100644
index 3bd7c37eb1c2..000000000000
--- a/dev-python/mpmath/mpmath-0.19-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1 eutils
-
-MY_PN=${PN}-all
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python library for arbitrary-precision floating-point arithmetic"
-HOMEPAGE="http://mpmath.org/"
-SRC_URI="http://mpmath.org/files/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-IUSE="doc examples gmp matplotlib test"
-
-RDEPEND="
-	gmp? ( dev-python/gmpy )
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}.patch"
-		)
-
-	# this fails with the current version of dev-python/py
-	rm ${PN}/conftest.py || die
-
-	# this test requires X
-	rm ${PN}/tests/test_visualization.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		einfo "Generation of documentation"
-		cd doc || die
-		"${PYTHON}" build.py || die "Generation of documentation failed"
-	fi
-}
-
-python_test() {
-	py.test -v || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/. )
-	use examples && local EXAMPLES=( demo/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/namespace-google/Manifest b/dev-python/namespace-google/Manifest
index 0db2f739ba1c..cfcba024cd92 100644
--- a/dev-python/namespace-google/Manifest
+++ b/dev-python/namespace-google/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-google-1.ebuild 847 BLAKE2B 8e14c517c55948afb48ba42f129063da193d34144fa038ffa5c65d01d0ac53c89e80bb12334da32efc8a504570e8db6a34fae64267cd601e68108fb10dd8c10e SHA512 e01beb096a8676612a690fed32d9669e69569295a491be5fbf48d661d1717af0d5bbc9a12bd4186cedc43a010e30f421c79cb8e0437ecf36f62bcd964872dbdd
+EBUILD namespace-google-1.ebuild 846 BLAKE2B 3d6433ae0a1dd9d704dce7e89d3393444d89e644b5b7c8cf17d59e45015269d20e9d5d5477a9b8fbd6471f885440e1129baf9a08f1cc45a02015cf3502cce770 SHA512 51e3f0f669fe4f55f949845c62e730b2d0ac31257ab61a114ed261f31c6e47565dccb943066ff1f1a87c7651fc03b4962fa84585299d8555d0cad0b17183a5ad
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/namespace-google/namespace-google-1.ebuild b/dev-python/namespace-google/namespace-google-1.ebuild
index 7f137a69a85e..143da3ffd1fd 100644
--- a/dev-python/namespace-google/namespace-google-1.ebuild
+++ b/dev-python/namespace-google/namespace-google-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=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} pypy )
 inherit python-r1
 
 DESCRIPTION="Namespace package declaration for google"
diff --git a/dev-python/olefile/Manifest b/dev-python/olefile/Manifest
index 3c7b5cb2c95a..8dd7a26473c5 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 673 BLAKE2B d7ccf0305e91e0e000ab4623d1e7d10bb11fd25598fe0b24cf225ca925695433cbe3b5f8c45a74b1f428dc7eb643763e050eb63112e2522f70cc6aa5a22bea49 SHA512 1e877185e201142eb7beb84bb6aa00141411a8d3d98fea677f9134b8ad6c7013c53c6d0bbaccfff83761f5221a8ed717b6527a7b14e242066a67aca185030c32
-EBUILD olefile-0.46.ebuild 674 BLAKE2B fe86bb98670b25b43ca095e580def2d14267e841124432041cd3e720e599e2112cd28b6dee105696c290303c808dfc349413d9f9636786a256270007f571c3ab SHA512 6a1f248d4a49e9c8e94b4a702c99fd6b538ee70a0bc8622fbde2c17654854e7d31dfdf7177be3921ddd79d60d07799bdeb84baaa092494cf0aed5e7facedb1c4
+EBUILD olefile-0.44.ebuild 669 BLAKE2B 7dc78d7b23c50af368ca63085b7a2af810a84fa6d7cef025657da5ca17d340e1d6deacd44941fc142076f8c3740098db4e0bd399d1daf122bd60d8eb9196eba2 SHA512 46556d11118e8053722add7636da336b9770a735c84f11f7c41640a6ca8c4b205a640b3c0123bd1bf6ff9ca8a772c745afeb72edffbb78b933f23623d2daa4ba
+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 e3a01470d4ed..7d8ce108ca3a 100644
--- a/dev-python/olefile/olefile-0.44.ebuild
+++ b/dev-python/olefile/olefile-0.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
@@ -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/olefile/olefile-0.46.ebuild b/dev-python/olefile/olefile-0.46.ebuild
index 7f7a33dc1d09..1497c5970444 100644
--- a/dev-python/olefile/olefile-0.46.ebuild
+++ b/dev-python/olefile/olefile-0.46.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=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} pypy{,3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pandas-datareader/Manifest b/dev-python/pandas-datareader/Manifest
new file mode 100644
index 000000000000..6e08c87c6584
--- /dev/null
+++ b/dev-python/pandas-datareader/Manifest
@@ -0,0 +1,3 @@
+DIST pandas-datareader-0.7.0.tar.gz 341577 BLAKE2B 4169fdb9eb5280be15da23224d25104aaa47f7c328adc6fae6220ac11fc76954f541b8bdb117df977c163229751885e625d3a44923a8c0c2266f0eb3ee57b8af SHA512 2a2d1411fb3724f3e1cebea8a962c1d4f12124d58ba191035583d8d621bdb0dfaf0c0cbaea765ef61f5c23cc221ae2b585b612e97e45795380b70fe672d0b7a5
+EBUILD pandas-datareader-0.7.0.ebuild 1140 BLAKE2B 8f251d4f593a2e0e997750b392604b2093bdf9ef0601e7a7e4ebceb322196b5eb43d57dcdae1c5a6cf70c9bb3fbe642dfa5b5e0e0b0ffc2078305cae9bea77c6 SHA512 aa368d8fde015ad79a0346ac6c74c5507d119ae28f95927389948b24bc13a5bba69e59ce6a07d92defd64519f001a432c12a6cae1598d854935685030df89108
+MISC metadata.xml 753 BLAKE2B 2ecbabdb680770a13686fccdb0c91d7aa11b72db6649dc11395085fffc6712b23ad247355ac0845eff0ff4df306b7ae12151385ffa8871e525decc0f166b825e SHA512 886f97288af0af8c5939874e8d2d24d1614d56419a32c268bee80480f6c1a6921dfc46544bef189616737397feee4cd49cfad895939568127c046c9943c58751
diff --git a/dev-python/pandas-datareader/metadata.xml b/dev-python/pandas-datareader/metadata.xml
new file mode 100644
index 000000000000..777f5ec633c1
--- /dev/null
+++ b/dev-python/pandas-datareader/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">
+		Up to date remote data access for pandas, which works for multiple versions of
+		pandas and lets you extract data from a wide range of Internet sources directly
+		into a pandas DataFrame.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">pydata/pandas-datareader</remote-id>
+		<remote-id type="pypi">pandas-datareader</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pandas-datareader/pandas-datareader-0.7.0.ebuild b/dev-python/pandas-datareader/pandas-datareader-0.7.0.ebuild
new file mode 100644
index 000000000000..875b3856915a
--- /dev/null
+++ b/dev-python/pandas-datareader/pandas-datareader-0.7.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pandas DataFrame extraction from a wide range of Internet sources"
+HOMEPAGE="https://github.com/pydata/pandas-datareader"
+SRC_URI="https://github.com/pydata/pandas-datareader/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+# Test suite depends on outbound network connectivity and is unstable
+# https://github.com/pydata/pandas-datareader/issues/586
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/lxml[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.19.2[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/wrapt[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+		)
+	"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		)
+	"
+
+python_test() {
+	pytest -v -s -r xX pandas_datareader || die
+}
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index 4a8821916c81..92e7341bcb7d 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -3,6 +3,6 @@ DIST paramiko-2.1.2.tar.gz 1196746 BLAKE2B c184e171fe550fc231d67473867db283b706a
 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 1511 BLAKE2B efdf6865d253e622d1d987382581fb7caa20d0bc9f144899c49b184d2b9fb78eb1d43b9cd1b159eef6e41cd26fefcc9359ce5a21cab1fb9416ae8856a9260bbe SHA512 40a35eae3c02b09bdfd30f2fa21536f96ed28d42473639b2734a04b750d4497f16cdbd7320fb023a2146473d93395c03a50b314b57620c86b1e17b8aee2cfe68
-EBUILD paramiko-2.4.2.ebuild 1665 BLAKE2B d2d432532407cb4399fbaf18ef85411658cc58993594190f6178ac2d92e8f9b7ecd460babf36facb562a0b910f29b9684ef9c11b65d4fff33182c11c727c623c SHA512 4e8f7e6f0ad6ddbf472a5241caa1bbb5f01706371993ecdaa33179c3876ae0fe9bbbab5c6d29569103a5fac71df0e9e91cf521e8af97e8e161f276f9f295dca6
+EBUILD paramiko-2.4.1.ebuild 1518 BLAKE2B c59af4d2d001f5d565950a93fd462ba01e18fbb3f034b8a21b9833d3a4964477349fe9f1f1cbe22ad4263ea97296b88b180cbc60211f94fb7d17152138627e0e SHA512 4a4a9021b3f76e0340a89d8c8ae6c4973f8481dd2daa0a449f7f7ae8326a9c79bb512811227c1d1c591b62a0f793135480475b17d025b2c4c8df931e0f256f7e
+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.4.1.ebuild b/dev-python/paramiko/paramiko-2.4.1.ebuild
index 7460d9cfdd48..aba3b71c7215 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="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/paramiko/paramiko-2.4.2.ebuild b/dev-python/paramiko/paramiko-2.4.2.ebuild
index fb8e47b707db..42cc0978f990 100644
--- a/dev-python/paramiko/paramiko-2.4.2.ebuild
+++ b/dev-python/paramiko/paramiko-2.4.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~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 server test"
 
 RDEPEND="
diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
index 79bca2672b5d..9785da032eff 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -3,10 +3,12 @@ DIST pbr-1.10.0.tar.gz 111425 BLAKE2B 2cef589ada2892dd8357ad3248c4b544d58c699d24
 DIST pbr-3.1.1.tar.gz 102665 BLAKE2B 301515d50f8550f5553a29faacb1daef589b41b8116320abd4552bb67886498d89eced1f95e1efdd6ac0511a5587eb479dc9d2963a74e92300463c3c53201e7d SHA512 c01fb83678f8fc3acddc153dd341a17ed9d602b6770f0ff244b1c5b54c37d4ddcbd0c3d726f7d7020865819e02797c1c79a0c15e9ee2ae5c1510fce7112b2a3a
 DIST pbr-4.1.1.tar.gz 108683 BLAKE2B 5c0157ff14590113e7baae0bdca1ff46108a7a10d6eae8bd0a2d06bee62b4aa65eed25c900ae1b67324ac6b416641081c63a274c9694db1877b5d9073c1c04d9 SHA512 ed739901b3a2d1eafa1d4d408a39f1e5d967776571efe0913877145aaccee3114558e107a4e5704403288324c63a08cfbca07a3409bd1baafcbc33105abdf3e4
 DIST pbr-4.2.0.tar.gz 107958 BLAKE2B 716283ceb7b1a8da41e77441c7526bf8cbdb5be7c710013630d3bbddf7de0ce37f3abd063f6103f3ec27fc5c09796f6452d8117df3b533b3c7377bf6dce7d37f SHA512 d46d93333b4d0d3fd5c14e0a474ca7beceddf794a5dbcf66f810993b8d33b48602518072effcd429566f4eede2a38c4aec289df262c2c0e7ab4b82474e14f14d
+DIST pbr-4.3.0.tar.gz 112935 BLAKE2B 460d9f93d66a9381360f3b47beb0fb8a3ffcc21be231e5875019b00d5b60efacd7237c073f9d7850b23aed75ad842fbb6b082d665367dcc5a059b8eb0064641d SHA512 6e87c62ca434a85506f1e9d9e92d29ccccd24484120748fdfae081e3a574a9d9edcd2e3960bd0ecb5d3c8543a919b8b0f829662957ed657693022c8940f76d74
 EBUILD pbr-0.8.2-r1.ebuild 2101 BLAKE2B 4e85eb993ab7e6dc05687c531145441b1627fa61846546bd3c66cc5690bcb1f55b7b49ad0f5dc4cbf86c4e949deb7e66c11e9117a90c7933334477c6eeae6f73 SHA512 bc6d083dadd1d46e7d6f311d43e89e4fef40e7c1a02f826359166c42aa4c075c1336081bea03986519dbc9912785b1f2732326d1bbaa0ddc391c9649356a8b7c
 EBUILD pbr-1.10.0-r1.ebuild 2602 BLAKE2B fcd63f45eba4952178bea076c77e5d6880c27f310a8e2043867bc1f278f5d450f9a75832f90dc482c709d4bad4eadf3c1f150092e546e624a03290fea7390664 SHA512 d516a6d42efebe51e2846721e8292fb402d9ee5a88cea385a281f8f7d828da30c59df9582fac1174c2100f8943b318a52d208d6ee10d294a9a3e915e95c1a589
 EBUILD pbr-3.1.1.ebuild 2828 BLAKE2B 7fc677aa10ce15627e6e6f6857f0d5b1fc336fe139e42b3ff1aa62d2d898eeb6a92a8e7c22e06e5f597025a4ad16e60dfdec60758b6b5f36569bdd67a39566c1 SHA512 58894ca83de7006ee6486d75ee1673c970ccb207d50c84332b215086468e3288b10a38245a92c8a6330f2a26fddd001b70a9d89b8144009459180474774c1cc1
 EBUILD pbr-4.1.1.ebuild 2601 BLAKE2B a2945d95e1ba37c28d86fdd0bff32f0a880c801eeddb2f3f70f6b21fbac7c0bb869021ccb389888c146f5920b7350af1d0c53d34784f9dd0e0934eb937ff1f55 SHA512 c71925bd2db17d18a625ea6510f589c8bf7df9f10031659f7a6c4a63432826639ba6a93c99be229b5f62933051fc00532d53bb0660f89e0d0c804b8bc7af44dc
 EBUILD pbr-4.2.0-r1.ebuild 2747 BLAKE2B b1f4ae987da3a891fe95f9d059b089acb8f75bee89dcfadd981db41de800fdc9432e24530f2f638e0804eef9c0a316244e8b3059074fe797513373d4cfa5640f SHA512 d0cf43215fecf025910e51f22d92fd11501f8d649c31292a1623605f3536552fbb5ecfd84650e8788ec30248ea72c85b8a725a80cda0e4a1207ab8d0ad5318d9
 EBUILD pbr-4.2.0-r2.ebuild 2790 BLAKE2B 7abb3158a404d077fe0742c9ae542db9141b9de42a3c2537ef6ee0bfc7d9f542e2909e3351bdf9a6988cc08603cb24ce07044e49b08ac1f0c438cd8c6320fee5 SHA512 83903d15a678cc80171e0cd49e6bfedaebfa245494d4c2875bc6679d4647e65a816c9f41181f49739fd035b4c93a92a06db899b5a44f0688420035480c111bb5
+EBUILD pbr-4.3.0.ebuild 2787 BLAKE2B f861a99fb83212df43972145b0d2a7b2d182c37322e4d8caec90156d0c515875858027c49c62624ecd9a17234964a3dda6395086da08210aac7e398d0d1900e7 SHA512 4e5f933ecbb05ad987632dc2abd25734e28815c6547fdbaecfe2588a44b75ebd38b12be4ffc4a5921e0066842171ab7184a1a923f44aeb16a54c6bc3a845750c
 MISC metadata.xml 686 BLAKE2B e7638d779ac7aa46c074cf4060bbca595c8e555e972da8b418762bb40237ef0f6d89125f3c0e8f5201a362b2425247ed5a7ecd9d26afe9981f9e51dd005c28fc SHA512 b4bff66d2f42e08f93d723e43bd1b6b32d8bd01a45136a741992af07c11da7fe0db847e46316e5bd237f47cb844fb481e09bff0c6df3d071197686d7dfaa7bc9
diff --git a/dev-python/pbr/pbr-4.3.0.ebuild b/dev-python/pbr/pbr-4.3.0.ebuild
new file mode 100644
index 000000000000..5011d435355b
--- /dev/null
+++ b/dev-python/pbr/pbr-4.3.0.ebuild
@@ -0,0 +1,73 @@
+# 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 pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Inject some useful and sensible default behaviors into setuptools"
+HOMEPAGE="https://github.com/openstack-dev/pbr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~s390 ~x86 ~amd64-linux ~x86-linux"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038
+# docutils is needed for sphinx exceptions... https://bugs.gentoo.org/show_bug.cgi?id=603848
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/virtualenv-14.0.6[${PYTHON_USEDEP}]
+		>=dev-python/stestr-2.1.0[$(python_gen_usedep python{2_7,3_4,3_5,3_6})]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+PDEPEND=""
+
+# This normally actually belongs here.
+python_prepare_all() {
+	# This test passes when run within the source and doesn't represent a failure, but rather
+	# a gentoo sandbox constraint
+	# Rm tests that rely upon the package being already installed and fail
+	sed -e s':test_console_script_develop:_&:' \
+		-e s':test_console_script_install:_&:' \
+		-e s':test_sdist_extra_files:_&:' \
+		-e s':test_command_hooks:_&:' \
+		-e s':test_sdist_git_extra_files:_&:' \
+		-i pbr/tests/test_core.py || die
+	sed -e s':test_command_hooks:_&:' \
+		-e s':test_global_setup_hooks:_&:' \
+		-i pbr/tests/test_hooks.py || die
+	rm pbr/tests/test_wsgi.py || die "couldn't remove wsgi network tests"
+	einfo "rogue tests disabled"
+	sed -i '/^hacking/d' test-requirements.txt || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
+
+	stestr init || die "stestr init failed under ${EPYTHON}"
+	stestr run || die "stestr run failed under ${EPYTHON}"
+}
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 3cc72d106bb9..b1691ef7f837 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,13 +1,9 @@
 AUX pillow-3.4.2-no-scripts.patch 411 BLAKE2B 79a798be9c7fe578a02f25f86cd658c10be36aee581c5d285f21081c17d48cbe0dbacd1098f65f71c4cab147ef77d18b334780810ad8a6c4534f53da2db83345 SHA512 51ac7df4e9c6b76bbaf20e243cb171f9d824c94e183f4bbe5047c6932efe6913527a0a4d328266a8984d51d07aaa18cbdbb98de92dc8f027a3d392d0355cdd70
-AUX pillow-4.3.0-freetype2.9-test-metrics.patch 553 BLAKE2B a5bfdf7789237b583c464f2cbb7cfdf645a272587337da227eeea98e41312bd2a7b3a7f22c182856577350489a849f52271a395f9799410a7a07f77654629197 SHA512 291ced301ee1938dfa19afc7b57285c57e6722e28f3adca492e390b1ac7a0cda43c58fa19b97cac81d2ed6ef928ccfb51de87e60b035e35f923c1a006e80be64
-AUX pillow-4.3.0-no-qt.patch 893 BLAKE2B c41d8ff63a3da5aadd0c7ebdd0c102e2a136c5feeb2bdab9b4a5a0167457b9bd51b617da94e236179bcd07762359c8692477db3af1f26aa8b373c5d19036cc7c SHA512 e67e670fc26ed438c3d00be91f0549e210692934bbaa3c6789b35178ea6c45412a69ddebebe9ea5f38bd748f7d20e4b6bd4f56277133bb470e44756168808582
-AUX pillow-4.3.0-no-scripts.patch 392 BLAKE2B 1443119f49b0c76c75d17414851e7f54d673b804d8d268fea79fe9fcc4f6361d6d2e70cfc6d855c8c374bcc28b67672778f310f38442502bf5c7096e26bf0bc7 SHA512 500706b3736e17bbfdcf18d2e3038a96ab16a5ba1015fd2ee9332ae11d8f98594ac4c50dd0f7cfd5288703970d20d0a4f3174a8071442893903888d828a2d2da
 AUX pillow-5.2.0-fix-lib-paths.patch 675 BLAKE2B 88c552a5b4db246bd63297ebc9f002aa4ed541cc9521e8f651194609d4040e22375149f1d5ce0957e8d4b69ceb5a5cc425894f7c40ba86db4204de4888528f06 SHA512 7ac1e4611e81cc80fd37dbf348fda1ca2707ca9b28c95c328614b91167ae70e477afd1730a585a2834d31d5826ac68d9816c9ecd227670b81af4e7dea238eef3
 DIST Pillow-3.4.2.zip 11042238 BLAKE2B 334af6eeadb3203b51572eca6ad9c196f3eeac14da0f1aedc351db692b33d413fdf5bc5c8564d2f53c324d9485dbdbda664b75a570b779e24f238c21829b4a39 SHA512 5e05206db5bc1b4177384f7e91ee79015c6e1bbdc7c31c997da054391b9b5ec7c1ebdec258a33f598986533894f3324b03d0b4b385b94e72a0517a3437553b39
-DIST Pillow-4.3.0.tar.gz 13874155 BLAKE2B c2258efe2727adeb7ba370fe30ef9bbabe952a1f6690e7904352884951e648d2c0e2037143b7c71a802ea1a04a2f7827a001621480036e43f6c01a96de3edcf7 SHA512 5811252802bd01ac86157235d42138685e746723df48b67ec7c7ebd3f172532b40cf86ca9d3d792e82f03986303a084bf3491c0d511dc068dea1bc631afdeabb
 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-4.3.0-r2.ebuild 2335 BLAKE2B 927d5247c0146ab1a304bdd2985f2606e336b766ec6bcd5718508f0f51b583c27cd8256ce836e7f6100625b36c53ffe11c63cde624d682bff96c45eaa49fa5cd SHA512 4e387bf4d17babe9b33856391a7f66d0849e6d652685faeb8e6afb8770514502ebd5dd10dafd98855891ae1802583b0f8cc51b9a012cc9288146c281eac60d4f
-EBUILD pillow-4.3.0-r3.ebuild 2656 BLAKE2B a5134151a03fdcb4ae3f5e5c5daaa0ec251556ac18fe3b66dc1f8d8ab0be6bfcd571b28f12d98c5ac6740e83941912474b5b5795d9e44b889f9d4f2bca9385d8 SHA512 d32e85250fa166d4d03b437f3ac801d38466878626f6a743e6719295343c6271f067467a78891f8d16c95023851d8e17cf646a9cdd4dfa34bbd2eec54c681023
-EBUILD pillow-5.2.0.ebuild 2726 BLAKE2B 2b0a513576f3dac3ddf69486e6eaa892c90b58f998d2234a114fe96bb0ff98fcd8991bb519623c609531c9d5972e23b17fd86e4604c304a91141806367eecc26 SHA512 15d5dfa2920fffc4d30577f686fcaa74d907d444ee23867aa7286308397ea80c47465a75f712b1a9f62012905c590e32d9ddd362c29e6682194e74ef47488706
+EBUILD pillow-5.2.0.ebuild 2723 BLAKE2B d6ea78cc9c4bcc83d6778397cf441365653bcaa0347ff9392986e5750e186fdfbcd499d53e3dc80f2521008655fc428171fc12301780c63d5b15b358b84602da SHA512 e00fec07dc7fb04064b3de979ccd6ce7cf5f8a96fcba63ccd87dd4b70d09fcd6f4dbdebc2479296d9ad4e1f1b9477922d53267264261e1d01211f865827e41ad
+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/files/pillow-4.3.0-freetype2.9-test-metrics.patch b/dev-python/pillow/files/pillow-4.3.0-freetype2.9-test-metrics.patch
deleted file mode 100644
index 211ef7ac58d3..000000000000
--- a/dev-python/pillow/files/pillow-4.3.0-freetype2.9-test-metrics.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Tests/test_imagefont.py
-+++ b/Tests/test_imagefont.py
-@@ -58,6 +58,9 @@ class TestImageFont(PillowTestCase):
-                 ('2', '8'): {'multiline': 6.2,
-                              'textsize': 2.5,
-                              'getters': (12, 16)},
-+                ('2', '9'): {'multiline': 6.2,
-+                             'textsize': 2.5,
-+                             'getters': (12, 16)},
-                 'Default': {'multiline': 0.5,
-                             'textsize': 0.5,
-                             'getters': (12, 16)},
diff --git a/dev-python/pillow/files/pillow-4.3.0-no-qt.patch b/dev-python/pillow/files/pillow-4.3.0-no-qt.patch
deleted file mode 100644
index 231c605b8347..000000000000
--- a/dev-python/pillow/files/pillow-4.3.0-no-qt.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/PIL/ImageQt.py b/PIL/ImageQt.py
-index 36b4e1eb..ddde2cd9 100644
---- a/PIL/ImageQt.py
-+++ b/PIL/ImageQt.py
-@@ -20,24 +20,7 @@ from . import Image
- from ._util import isPath
- from io import BytesIO
- 
--qt_is_installed = True
--qt_version = None
--try:
--    from PyQt5.QtGui import QImage, qRgba, QPixmap
--    from PyQt5.QtCore import QBuffer, QIODevice
--    qt_version = '5'
--except (ImportError, RuntimeError):
--    try:
--        from PyQt4.QtGui import QImage, qRgba, QPixmap
--        from PyQt4.QtCore import QBuffer, QIODevice
--        qt_version = '4'
--    except (ImportError, RuntimeError):
--        try:
--            from PySide.QtGui import QImage, qRgba, QPixmap
--            from PySide.QtCore import QBuffer, QIODevice
--            qt_version = 'side'
--        except ImportError:
--            qt_is_installed = False
-+qt_is_installed = False
- 
- 
- def rgb(r, g, b, a=255):
diff --git a/dev-python/pillow/files/pillow-4.3.0-no-scripts.patch b/dev-python/pillow/files/pillow-4.3.0-no-scripts.patch
deleted file mode 100644
index c30b00d54d70..000000000000
--- a/dev-python/pillow/files/pillow-4.3.0-no-scripts.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://bugs.gentoo.org/562682
-
---- a/setup.py
-+++ b/setup.py
-@@ -779,7 +779,6 @@ try:
-           ext_modules=[Extension("PIL._imaging", ["_imaging.c"])],
-           include_package_data=True,
-           packages=find_packages(),
--          scripts=glob.glob("Scripts/*.py"),
-           install_requires=['olefile'],
-           test_suite='nose.collector',
-           keywords=["Imaging", ],
diff --git a/dev-python/pillow/pillow-4.3.0-r2.ebuild b/dev-python/pillow/pillow-4.3.0-r2.ebuild
deleted file mode 100644
index 25dddfce611f..000000000000
--- a/dev-python/pillow/pillow-4.3.0-r2.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
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 eutils virtualx
-
-MY_PN=Pillow
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python Imaging Library (fork)"
-HOMEPAGE="https://python-pillow.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib"
-
-REQUIRED_USE="test? ( jpeg tiff )"
-
-RDEPEND="
-	dev-python/olefile[${PYTHON_USEDEP}]
-	imagequant? ( media-gfx/libimagequant:0 )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lcms? ( media-libs/lcms:2= )
-	tiff? ( media-libs/tiff:0=[jpeg,zlib] )
-	truetype? ( media-libs/freetype:2= )
-	webp? ( media-libs/libwebp:0= )
-	zlib? ( sys-libs/zlib:0= )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		media-gfx/imagemagick[png]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/pillow-4.3.0-no-scripts.patch
-	# can be removed at v5, patch already uptream. See bug 593816.
-	"${FILESDIR}"/pillow-4.3.0-freetype2.9-test-metrics.patch
-)
-
-python_configure_all() {
-	# It's important that these flags are also passed during the install phase
-	# as well. Make sure of that if you change the lines below. See bug 661308.
-	mydistutilsargs=(
-		build_ext
-		--disable-platform-guessing
-		$(use_enable truetype freetype)
-		$(use_enable jpeg)
-		$(use_enable jpeg2k jpeg2000)
-		$(use_enable lcms)
-		$(use_enable tiff)
-		$(use_enable imagequant)
-		$(use_enable webp)
-		$(use_enable webp webpmux)
-		$(use_enable zlib)
-	)
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	"${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
-	virtx nosetests -vx Tests/test_*.py
-}
-
-python_install() {
-	python_doheader libImaging/*.h
-	distutils-r1_python_install
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	if use examples ; then
-		docinto examples
-		dodoc Scripts/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pillow/pillow-4.3.0-r3.ebuild b/dev-python/pillow/pillow-4.3.0-r3.ebuild
deleted file mode 100644
index a799e79a1d3a..000000000000
--- a/dev-python/pillow/pillow-4.3.0-r3.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 eutils virtualx
-
-MY_PN=Pillow
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python Imaging Library (fork)"
-HOMEPAGE="https://python-pillow.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples imagequant jpeg jpeg2k lcms qt5 test tiff tk truetype webp zlib"
-
-REQUIRED_USE="test? ( jpeg tiff )"
-
-RDEPEND="
-	dev-python/olefile[${PYTHON_USEDEP}]
-	imagequant? ( media-gfx/libimagequant:0 )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lcms? ( media-libs/lcms:2= )
-	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )
-	tiff? ( media-libs/tiff:0=[jpeg,zlib] )
-	truetype? ( media-libs/freetype:2= )
-	webp? ( media-libs/libwebp:0= )
-	zlib? ( sys-libs/zlib:0= )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		media-gfx/imagemagick[png]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/pillow-4.3.0-no-scripts.patch
-	# can be removed at v5, patch already uptream. See bug 593816.
-	"${FILESDIR}"/pillow-4.3.0-freetype2.9-test-metrics.patch
-)
-
-src_prepare() {
-	if ! use qt5; then
-		# When we don't use qt5, we want to forcibly disable it by patching it
-		# out. Otherwise, we might encounter unexpected problems like in
-		# bug #662236
-		eapply "${FILESDIR}/${PN}-4.3.0-no-qt.patch"
-	fi
-	eapply_user
-}
-
-python_configure_all() {
-	# It's important that these flags are also passed during the install phase
-	# as well. Make sure of that if you change the lines below. See bug 661308.
-	mydistutilsargs=(
-		build_ext
-		--disable-platform-guessing
-		$(use_enable truetype freetype)
-		$(use_enable jpeg)
-		$(use_enable jpeg2k jpeg2000)
-		$(use_enable lcms)
-		$(use_enable tiff)
-		$(use_enable imagequant)
-		$(use_enable webp)
-		$(use_enable webp webpmux)
-		$(use_enable zlib)
-	)
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	"${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
-	virtx nosetests -vx Tests/test_*.py
-}
-
-python_install() {
-	python_doheader libImaging/*.h
-	distutils-r1_python_install
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	if use examples ; then
-		docinto examples
-		dodoc Scripts/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pillow/pillow-5.2.0.ebuild b/dev-python/pillow/pillow-5.2.0.ebuild
index 04ae41085612..2fe691b736fe 100644
--- a/dev-python/pillow/pillow-5.2.0.ebuild
+++ b/dev-python/pillow/pillow-5.2.0.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=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 PYTHON_REQ_USE='tk?,threads(+)'
 
 inherit distutils-r1 virtualx
@@ -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/pillow/pillow-5.3.0.ebuild b/dev-python/pillow/pillow-5.3.0.ebuild
new file mode 100644
index 000000000000..d05df3d9e900
--- /dev/null
+++ b/dev-python/pillow/pillow-5.3.0.ebuild
@@ -0,0 +1,94 @@
+# 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 )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 virtualx
+
+MY_PN=Pillow
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python Imaging Library (fork)"
+HOMEPAGE="https://python-pillow.org/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~amd64 ~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 )"
+
+RDEPEND="
+	dev-python/olefile[${PYTHON_USEDEP}]
+	imagequant? ( media-gfx/libimagequant:0 )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:2= )
+	tiff? ( media-libs/tiff:0=[jpeg,zlib] )
+	truetype? ( media-libs/freetype:2= )
+	webp? ( media-libs/libwebp:0= )
+	zlib? ( sys-libs/zlib:0= )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		media-gfx/imagemagick[png]
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.2.0-fix-lib-paths.patch"
+)
+
+python_configure_all() {
+	# It's important that these flags are also passed during the install phase
+	# as well. Make sure of that if you change the lines below. See bug 661308.
+	mydistutilsargs=(
+		build_ext
+		--disable-platform-guessing
+		$(use_enable truetype freetype)
+		$(use_enable jpeg)
+		$(use_enable jpeg2k jpeg2000)
+		$(use_enable lcms)
+		$(use_enable tiff)
+		$(use_enable imagequant)
+		$(use_enable webp)
+		$(use_enable webp webpmux)
+		$(use_enable zlib)
+	)
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	"${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
+	# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
+	virtx pytest -vx Tests/test_*.py -p no:relaxed
+}
+
+python_install() {
+	python_doheader src/libImaging/*.h
+	distutils-r1_python_install
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	if use examples ; then
+		docinto example
+		dodoc docs/example/*
+		docompress -x /usr/share/doc/${PF}/example
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index 42a905ace56d..af262dfe9bb1 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -1,12 +1,11 @@
-AUX protobuf-python-3.5.2-google.protobuf.pyext._message.MessageMeta.patch 886 BLAKE2B 6b629df5af163ad7e5e835ac7d8ea66401d73297e1ffcf1372b6bdc7285efc1e36cde551381e7b3869a4efb0ec1c07a1a019e86cd477dbf24a25e06545dc401e SHA512 da18027859541cca833a8eed311d4da143be5663544bbf64d24a66fc5ba2db06fedb7110e3bd925736029bfe449e170a4aa904ecdc98eb1b7e269d9f5fd4ef04
-DIST protobuf-3.4.1.tar.gz 4490100 BLAKE2B e2bc1ef2ee1a0af44830b3c65a6c9e73883fe6ec0d07f6a6136f5564f0e85306005440ca6f8c4eb834c7c70f909792c9e2457a761f10f95431981263a9acd7a3 SHA512 471e52198fa878a79183dc8fbc39d9c65239be4d9dff799e12281ee9b1af61a427584534b1baae1773bc6e4c86467f89ca2e7911a21effd86bc5f40cc7d94c34
+AUX protobuf-python-3.5.2-google.protobuf.pyext._message.MessageMeta.patch 895 BLAKE2B de1850bb816a6776876a50c19200f757f9610cbfe9263ce2ffa05d33d44ed765f00b7510c57e763c008af34a260530dd4fd21ccc12b19ef531859f2195fd4eb2 SHA512 1b22d0df90bc602469a59f5ef82f8bbe96c164b7ad3c53ef1a7ba9ee97d8334b4e5c9fe7d57cfe2b1edad85d58f4a89095c8eeac370d6bd043c0d8561e00149d
+AUX protobuf-python-3.6.1-python-3.7.patch 2737 BLAKE2B 46feb8144761db8a089ad2e32ed0a906a4151cad62d13c0a541fc321a3affd70f672c61a32b84d4118e1a9ff7ea5562368b17d89d7681d72a24ce5cb97745949 SHA512 8fe0770f11f20b9cde72b5f862ab77ebcdc0f337886ba458fbc2543896ce6b3f659b68e2550040da246260638c5eb918ade535bf7a1b6db61a6da39232cb4de7
 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
 DIST protobuf-3.6.1.tar.gz 4485582 BLAKE2B 546c49759df784018459809b9db692c5c94aef5d717183af5cd9edd96b4c658e759f23950cdcd5dddceaaad06ea1de2a2357b9fa8c496ed5d538fc5920174da0 SHA512 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839
-EBUILD protobuf-python-3.4.1.ebuild 1239 BLAKE2B 409fb45bd792c7c47b17388b2dc7315863c8545da671d73acb84de9c1188f12627eab1fb2c90989bd53a939792ee2b787c2088553e979ecc2f3a855f0d01f991 SHA512 039c747447eee20a1eb47a1383838086f911622036372bf051a806ed5ea55c3d5c5f58c97f1d2dc8b91c0929f56725c8942ca18274cec1a5fb7e11212a23211a
-EBUILD protobuf-python-3.5.1.1.ebuild 1232 BLAKE2B 09e1116ab940cf48856c8f86b2a67c8b827c39048641f9cb8a574e945b6b0b13d4db4fee9d65235d474e268750a2b29dfced129067043f0cba35310a40a96127 SHA512 16abc5f227c8456e06ec5452b66d09d6e7f2e119fe73da5827c60a30c0430b69521305db230b0343d11fcace74b4b6cf070a385cbf4bb5700324db27c7fb1d5d
-EBUILD protobuf-python-3.5.2-r1.ebuild 1318 BLAKE2B 0c7e8e8d5be76455a8fadb435c29c0685c83ce3e21a29b4c3f25ecf2045b0c6815ba0098051bc470b51c3c2f9b30cdbdd09c0d8f90d6461727a2272011b28242 SHA512 ac44356bef6a3f3faf84ba334a4c07672a8331a7c68edf42fbc44f016a07215b9aabbd1a273d12f58eeee57a01940eb8f96fba4f0327a9dc4134530a7ccfd466
-EBUILD protobuf-python-3.6.0.1.ebuild 1330 BLAKE2B 740647b8311b43aacb89129795fd9a6250c4eeb6c26d6958f8660c78eabc37c9c6b7622eb2a67dfa20043704eba0369934cd26bb7f592020f09bdbd78b126c13 SHA512 d14066231992885cf95aca6c7270d18bcb39f22b7eea31bab9fee19ddca620e91cb8d65459a055e85022376ee44c9800371338bf5ba7fc78eeddc1e62aa8e08e
-EBUILD protobuf-python-3.6.1.ebuild 1330 BLAKE2B f344dfa24be2f4ac134101f3b99a0b89dbf7ec2bf0d4b1b4fa3ff37af70c0526583b102cde86d997a7608dc855909c9636357dbf2655571027da2b43e9200f20 SHA512 ec52fe01e28bcfd5b052251687df8bf98706133469eddf7d920026fd10449889a8551c787856cc3c630d8041e4aa5e08ccaf90d9e847d4409ddccbc4cc06e4c9
-MISC metadata.xml 647 BLAKE2B a24942cbab04e847c0921371c22ac14ffe05b99c5a75ce99f8413e3c98e0ee5951e03b59faae740bdc0fda56e53ad36ab609fa9e4b19a6975725b4e9bf562d38 SHA512 064197fbb9f4857393236d4b4633aa389df5ebb6ab75c59552adbf80157feb20b3e2b2e5f526002652b12ea5033ea50c9db0ec02804a747fa4305505c715a87e
+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
+MISC metadata.xml 656 BLAKE2B e63db63e247b105b51b506a404d8edc821cc0ccc276a3f813df3b06951184218e736e57b577ad2f64880250c55ef09c50a9fe04428f7cec02fb04293c337175a SHA512 5d747585e025672d423690fa2d8df09380a1714c2e0adad5838a41f099e3984b70c7f80c5873ea296101898cd92dea70edee964bf01b9d86acb9a1d0140169fd
diff --git a/dev-python/protobuf-python/files/protobuf-python-3.5.2-google.protobuf.pyext._message.MessageMeta.patch b/dev-python/protobuf-python/files/protobuf-python-3.5.2-google.protobuf.pyext._message.MessageMeta.patch
index d1e1d745ab7c..c29da40ca261 100644
--- a/dev-python/protobuf-python/files/protobuf-python-3.5.2-google.protobuf.pyext._message.MessageMeta.patch
+++ b/dev-python/protobuf-python/files/protobuf-python-3.5.2-google.protobuf.pyext._message.MessageMeta.patch
@@ -1,4 +1,4 @@
-https://github.com/google/protobuf/pull/4365
+https://github.com/protocolbuffers/protobuf/pull/4365
 
 --- /python/google/protobuf/pyext/message.cc
 +++ /python/google/protobuf/pyext/message.cc
diff --git a/dev-python/protobuf-python/files/protobuf-python-3.6.1-python-3.7.patch b/dev-python/protobuf-python/files/protobuf-python-3.6.1-python-3.7.patch
new file mode 100644
index 000000000000..bd4ce9d7fcaf
--- /dev/null
+++ b/dev-python/protobuf-python/files/protobuf-python-3.6.1-python-3.7.patch
@@ -0,0 +1,67 @@
+https://github.com/protocolbuffers/protobuf/pull/4862
+https://github.com/protocolbuffers/protobuf/commit/0a59054c30e4f0ba10f10acfc1d7f3814c63e1a7
+
+--- /python/google/protobuf/pyext/descriptor.cc
++++ /python/google/protobuf/pyext/descriptor.cc
+@@ -56,7 +56,7 @@
+   #endif
+   #define PyString_AsStringAndSize(ob, charpp, sizep) \
+     (PyUnicode_Check(ob)? \
+-       ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
++       ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \
+        PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
+ #endif
+ 
+--- /python/google/protobuf/pyext/descriptor_containers.cc
++++ /python/google/protobuf/pyext/descriptor_containers.cc
+@@ -66,7 +66,7 @@
+   #endif
+   #define PyString_AsStringAndSize(ob, charpp, sizep) \
+     (PyUnicode_Check(ob)? \
+-       ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
++       ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \
+        PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
+ #endif
+ 
+--- /python/google/protobuf/pyext/descriptor_pool.cc
++++ /python/google/protobuf/pyext/descriptor_pool.cc
+@@ -48,7 +48,7 @@
+   #endif
+   #define PyString_AsStringAndSize(ob, charpp, sizep) \
+     (PyUnicode_Check(ob)? \
+-       ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
++       ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \
+        PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
+ #endif
+ 
+--- /python/google/protobuf/pyext/extension_dict.cc
++++ /python/google/protobuf/pyext/extension_dict.cc
+@@ -53,7 +53,7 @@
+   #endif
+   #define PyString_AsStringAndSize(ob, charpp, sizep) \
+     (PyUnicode_Check(ob)? \
+-       ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
++       ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \
+        PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
+ #endif
+ 
+--- /python/google/protobuf/pyext/message.cc
++++ /python/google/protobuf/pyext/message.cc
+@@ -79,7 +79,7 @@
+     (PyUnicode_Check(ob)? PyUnicode_AsUTF8(ob): PyBytes_AsString(ob))
+   #define PyString_AsStringAndSize(ob, charpp, sizep) \
+     (PyUnicode_Check(ob)? \
+-       ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
++       ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \
+        PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
+   #endif
+ #endif
+@@ -1529,7 +1529,7 @@
+     return NULL;
+   }
+ #else
+-  field_name = PyUnicode_AsUTF8AndSize(arg, &size);
++  field_name = const_cast<char*>(PyUnicode_AsUTF8AndSize(arg, &size));
+   if (!field_name) {
+     return NULL;
+   }
diff --git a/dev-python/protobuf-python/metadata.xml b/dev-python/protobuf-python/metadata.xml
index 51258826e2f9..0b20fcb3732e 100644
--- a/dev-python/protobuf-python/metadata.xml
+++ b/dev-python/protobuf-python/metadata.xml
@@ -17,6 +17,6 @@
 		<subslots>Soname version number of Protobuf</subslots>
 	</slots>
 	<upstream>
-		<remote-id type="github">google/protobuf</remote-id>
+		<remote-id type="github">protocolbuffers/protobuf</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/protobuf-python/protobuf-python-3.4.1.ebuild b/dev-python/protobuf-python/protobuf-python-3.4.1.ebuild
deleted file mode 100644
index 53518134445d..000000000000
--- a/dev-python/protobuf-python/protobuf-python-3.4.1.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"
-# pypy fails tests; pypy3 fails even running tests
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Google's Protocol Buffers - Python bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf"
-SRC_URI="https://github.com/google/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/14"
-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}
-	~dev-libs/protobuf-${PV}
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	!<dev-libs/protobuf-3[python(-)]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/protobuf-${PV}/python"
-
-python_configure_all() {
-	mydistutilsargs=(--cpp_implementation)
-}
-
-python_compile() {
-	python_is_python3 || local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${D}" -name "*.pth" -delete || die
-}
diff --git a/dev-python/protobuf-python/protobuf-python-3.5.1.1.ebuild b/dev-python/protobuf-python/protobuf-python-3.5.1.1.ebuild
index 7a43298fb9cf..4dfa6381d438 100644
--- a/dev-python/protobuf-python/protobuf-python-3.5.1.1.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.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"
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Google's Protocol Buffers - Python bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf"
-SRC_URI="https://github.com/google/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/15"
diff --git a/dev-python/protobuf-python/protobuf-python-3.5.2-r1.ebuild b/dev-python/protobuf-python/protobuf-python-3.5.2-r1.ebuild
index 76198330da15..7a1fc1c5c3cc 100644
--- a/dev-python/protobuf-python/protobuf-python-3.5.2-r1.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.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"
@@ -7,8 +7,8 @@ PYTHON_COMPAT=(python2_7 python3_{4,5,6})
 inherit distutils-r1
 
 DESCRIPTION="Google's Protocol Buffers - Python bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf"
-SRC_URI="https://github.com/google/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/15"
diff --git a/dev-python/protobuf-python/protobuf-python-3.6.0.1.ebuild b/dev-python/protobuf-python/protobuf-python-3.6.0.1.ebuild
index 9b40e02cbb3d..d625650122cb 100644
--- a/dev-python/protobuf-python/protobuf-python-3.6.0.1.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.6.0.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,8 +7,8 @@ PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
 inherit distutils-r1
 
 DESCRIPTION="Google's Protocol Buffers - Python bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf"
-SRC_URI="https://github.com/google/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/16"
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 7129c197b7ec..3d8397734fcd 100644
--- a/dev-python/protobuf-python/protobuf-python-3.6.1.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.6.1.ebuild
@@ -1,14 +1,14 @@
-# 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})
 
 inherit distutils-r1
 
 DESCRIPTION="Google's Protocol Buffers - Python bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf"
-SRC_URI="https://github.com/google/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/17"
@@ -27,6 +27,7 @@ S="${WORKDIR}/protobuf-${PV}/python"
 
 python_prepare_all() {
 	eapply -p2 "${FILESDIR}/${PN}-3.5.2-google.protobuf.pyext._message.MessageMeta.patch"
+	eapply -p2 "${FILESDIR}/${PN}-3.6.1-python-3.7.patch"
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-python/pycryptopp/Manifest b/dev-python/pycryptopp/Manifest
index 0cc4a9078c21..e6d9d75d6c79 100644
--- a/dev-python/pycryptopp/Manifest
+++ b/dev-python/pycryptopp/Manifest
@@ -1,5 +1,6 @@
+AUX pycryptopp-0.7.1-abi-change.patch 1777 BLAKE2B c37989ae1e9d2000208bf7d74a9a06953d2273db1ecd976d0726513fe0f74fa5c2fae858e56163929d15fbde7464c8320ce2a9a8d040a39050a7d72ba74efdfd SHA512 cc0730806c637d105c35beaa19c546c31a92126481eba087ae7e055ab794ab8bb3a926f862ae7fc75e9b505c8a2612db3e26dd104046c2503889e1aa9b6614e0
 DIST pycryptopp-0.6.0.1206569328141510525648634803928199668821045408958.tar.gz 2009822 BLAKE2B bf25b9049d131b197352138624cc8d393e8b3b33f76e53b1087ded5cdbb365286d0db692a03eaf8c117981e95d1e2074dbbe49daeeba098c3f4a42e9625365e2 SHA512 bdd7d983bc0f8ef50c140a8da0c532883f0f1461d4a91d2761c872403133e9474d4fdbd78e275adbaacd2066cab4121034002a4730258162a618b3af913fdf7a
 DIST pycryptopp-0.7.1.869544967005693312591928092448767568728501330214.tar.gz 1992756 BLAKE2B 7b458d3143ad4b4d2a3f6dc385241f6ea224429c1b7e56d431dc11134ed12a8bf0c5420e079ab8f62db6fb405e10fb0edcd7bf3d18200445f258834970ac44dd SHA512 8b5996badedcd32345818f95e26487ac938c10e1790495515c74816075261a4fcedd2f80c55beddbdea54ed8899bc7c7b1a192468cb3cf434c50f9a68b65cc25
 EBUILD pycryptopp-0.6.0.ebuild 954 BLAKE2B 6a62771d8707a9cdbc9293cd548406a402f6dc3a462c14cb75bf74e143b20c1202f4f3ecab1f7ca3e95e5e782a5fc03f60a484450cc57976f9290414414c3f77 SHA512 05eb4ddcebc65fb36067867c0cca0c3be573acb5ca3e4829929539a704036058aac20ae94470a9dd3a256f2c64bd7e87352d80e13322b492f4c9db0ab8b32e5f
-EBUILD pycryptopp-0.7.1.ebuild 955 BLAKE2B aaa6f1b64fe35c69158d2eeb5f0c82ea1490a4fcb76095e3b79d7e0a3fcd757109d57839117945b6eb9579653877b86e3cc891cb86379d11df4dde5338bd4b75 SHA512 5d6208832b0c0f10c19fbf05156783ca4a3e748d41d9654e68fc2ad628fe3166612d2aa862c1a9d883b7540c0a486688d413c083aab670d9d2b2247937a69c41
+EBUILD pycryptopp-0.7.1-r1.ebuild 1008 BLAKE2B 620941a0714191bce4d62ee91b852db53ee67ca6f49e064c6b488fc1f2fd73996c52d8a723a24672fb735e7a3a88ada4a9ac3363941521effd3d667dca6f0d31 SHA512 0413078388c6530cc506a477a8fd108ec8b477e8984dae72c3f93da8082a1e4c5a4edb58e0331f2ea9eee6fa5f572a81905d7701f0e43b52a4a35659e04d8cd6
 MISC metadata.xml 313 BLAKE2B 436153bae6b5708f1ec47d315a12328ea8ca013e983787fd41cf319ad4d92a934fef3492d13cd79caa44e6f5dc415eed4f06bcf6590e694bdb3e04eba7e41d2d SHA512 43f568076f481a7172565b251b4e5cd08567a2a0ec204713f9f1d892331d70be656694df66f47961289a99f0aac72733e75d3689054dd88dd52a6d055e19c0dc
diff --git a/dev-python/pycryptopp/files/pycryptopp-0.7.1-abi-change.patch b/dev-python/pycryptopp/files/pycryptopp-0.7.1-abi-change.patch
new file mode 100644
index 000000000000..d6edd2ecc630
--- /dev/null
+++ b/dev-python/pycryptopp/files/pycryptopp-0.7.1-abi-change.patch
@@ -0,0 +1,55 @@
+https://github.com/tahoe-lafs/pycryptopp/issues/42
+
+--- old/src/pycryptopp/cipher/aesmodule.cpp
++++ old/src/pycryptopp/cipher/aesmodule.cpp
+@@ -20,6 +20,8 @@
+ #include <src-cryptopp/aes.h>
+ #endif
+ 
++typedef unsigned char byte;
++
+ static const char*const aes___doc__ = "_aes counter mode cipher\n\
+ You are advised to run aes.start_up_self_test() after importing this module.";
+ 
+--- old/src/pycryptopp/cipher/xsalsa20module.cpp
++++ old/src/pycryptopp/cipher/xsalsa20module.cpp
+@@ -16,6 +16,8 @@
+ #include <src-cryptopp/salsa.h>
+ #endif
+ 
++typedef unsigned char byte;
++
+ static const char* const xsalsa20__doc__ = "_xsalsa20 cipher";
+ 
+ static PyObject *xsalsa20_error;
+--- old/src/pycryptopp/hash/sha256module.cpp
++++ old/src/pycryptopp/hash/sha256module.cpp
+@@ -21,6 +21,8 @@
+ #include <src-cryptopp/filters.h>
+ #endif
+ 
++typedef unsigned char byte;
++
+ static const char*const sha256___doc__ = "_sha256 hash function";
+ 
+ static PyObject *sha256_error;
+--- old/src/pycryptopp/publickey/rsamodule.cpp
++++ old/src/pycryptopp/publickey/rsamodule.cpp
+@@ -87,7 +87,7 @@
+ VerifyingKey_serialize(VerifyingKey *self, PyObject *dummy) {
+     std::string outstr;
+     StringSink ss(outstr);
+-    self->k->DEREncode(ss);
++    self->k->GetMaterial().Save(ss);
+     PyStringObject* result = reinterpret_cast<PyStringObject*>(PyString_FromStringAndSize(outstr.c_str(), outstr.size()));
+     if (!result)
+         return NULL;
+@@ -216,7 +216,7 @@
+ SigningKey_serialize(SigningKey *self, PyObject *dummy) {
+     std::string outstr;
+     StringSink ss(outstr);
+-    self->k->DEREncode(ss);
++    self->k->GetMaterial().Save(ss);
+     PyStringObject* result = reinterpret_cast<PyStringObject*>(PyString_FromStringAndSize(outstr.c_str(), outstr.size()));
+     if (!result)
+         return NULL;
diff --git a/dev-python/pycryptopp/pycryptopp-0.7.1-r1.ebuild b/dev-python/pycryptopp/pycryptopp-0.7.1-r1.ebuild
new file mode 100644
index 000000000000..400c5ec5bc83
--- /dev/null
+++ b/dev-python/pycryptopp/pycryptopp-0.7.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 vcs-snapshot
+
+NUM="869544967005693312591928092448767568728501330214"
+MY_P="${P}.${NUM}"
+
+DESCRIPTION="Python wrappers for a few algorithms from the Crypto++ library"
+HOMEPAGE="https://tahoe-lafs.org/trac/pycryptopp
+	https://pypi.org/project/pycryptopp/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/crypto++"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS="NEWS.rst"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.7.1-abi-change.patch )
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Don't install license files
+	sed -i -e "/data_files=data_files,/d" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	# use system crypto++ library
+	distutils-r1_python_compile --disable-embedded-cryptopp
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/pycryptopp/pycryptopp-0.7.1.ebuild b/dev-python/pycryptopp/pycryptopp-0.7.1.ebuild
deleted file mode 100644
index 3a4257ebfa77..000000000000
--- a/dev-python/pycryptopp/pycryptopp-0.7.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="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 vcs-snapshot
-
-NUM="869544967005693312591928092448767568728501330214"
-MY_P="${P}.${NUM}"
-
-DESCRIPTION="Python wrappers for a few algorithms from the Crypto++ library"
-HOMEPAGE="https://tahoe-lafs.org/trac/pycryptopp
-	https://pypi.org/project/pycryptopp/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/crypto++"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS="NEWS.rst"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Don't install license files
-	sed -i -e "/data_files=data_files,/d" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	# use system crypto++ library
-	distutils-r1_python_compile --disable-embedded-cryptopp
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/pyftpdlib/Manifest b/dev-python/pyftpdlib/Manifest
index e247ae22eb99..1c61717f4e67 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 2536 BLAKE2B 912454d4d019c0efcca4e8a1805050e650172b1f64ace54025be850b3dcb2215febab95e8f71928886d1678675e352db1090be135f5b79b5b101f1d9feb6d257 SHA512 93e045cd4730a84e035f5e75588d637718b1a160dd5f7303ab71407ea84e93ad8a1206ba2c4658b646c8be27e98efe950132fb36d3911ef075b3087df67d3668
+EBUILD pyftpdlib-1.5.4.ebuild 2529 BLAKE2B 0d2be096e13b7d76c204d7c441a4b2ccf41104066da347538ec458a7a2a4a482166fc59bee47ad65c41311d32bc28cb29ffff067ce37e6b3034da2c34cc866dc SHA512 bf67bfe6733a3f432a81c5c1d68284aec3c69e80fdac90c62381339c765581edb25abc8a01398104bcc5883021161b7aed918d0ad8ea1827f4a5b56cf0b64386
 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 b34a8629054b..1633ef26aff6 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.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
@@ -64,9 +64,10 @@ python_test() {
 		test_nlst
 	)
 	skipped_tests=${skipped_tests[@]/%/ or}
-	# Don't load the relaxed plugin, see https://bugs.gentoo.org/661082
-	py.test --ignore ${PN}/test/test_misc.py -k "not (${skipped_tests% or})" \
-		-p no:relaxed || die "Tests failed with ${EPYTHON}"
+	# Tests fail with TZ=GMT, see https://bugs.gentoo.org/666623
+	TZ=UTC+1 pytest -vv \
+		--ignore ${PN}/test/test_misc.py -k "not (${skipped_tests% or})" \
+			|| die "Tests failed with ${EPYTHON}"
 }
 
 python_install_all() {
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index cfecf3c372f0..804ef65e28a4 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,7 +1,5 @@
 DIST pygit2-0.26.4.tar.gz 477318 BLAKE2B d17ef799ff3eab3629194fe0fe90dcc335e40509c13f53bc8f8e0b01e93dc838ca474a5e4ef44c9be2eac7d08e98c735820e936cbbcb7f398f76f9732954bc69 SHA512 e459e47bfa8137421625633a731d49882d95a52d4f2d672f2c8efe7cd6cca4b33335ee77777a353b309df4917d9b29b30c1f9a96b7e226e3e7fe0cd34bbefce6
-DIST pygit2-0.27.1.tar.gz 477820 BLAKE2B e4db7bfa484c28130ce48a2b23a0af26a715d15a789998001182f7d5c426a7f0d432d8e6f598346ce417b2c3532eb2a3407ebcfd9d48723a1e6359a30574d46c SHA512 9d889c13ad55e6c65e24b334f114f7d23b90961ae21c5b1f7bd8d85d44686f7ee8e98c13026c612c9a5feb500a54cf77bfa1e2bd165c657b58d879511622e6f7
 DIST pygit2-0.27.2.tar.gz 477237 BLAKE2B 68fc1e9d9456e4a9d6eaaf00963d02704282de2a9deb1af946ee0c7c69be22fc904b8e80fe243987a3dddb9a0e5365fdf5e336b9dca829dcd9843c2035db42c9 SHA512 f6578a3694babe7837a5ccc4c99e2fa1827b5f67815f2cac6f3b3d0498d94a0ffeb55d3c6e9c9417d47ecbf0ad9a10302e3b59ea0d2e9eec6d9da8426b10175b
 EBUILD pygit2-0.26.4.ebuild 626 BLAKE2B a077ae59833c4adb59a9a2c8eb7c37cc091478d31867e09cf3ae4949231b7f30c0dd605d47009fa40098a8b58277bdd74a744d46f5a38a08a5e2ed0e6e991cf6 SHA512 3c04ded6c6012968dfcf4a36e4c3ac5eec95cab7f558c0fc9574bc1a4ced5b93b1287291bdd84b36c8071ec2394593f70091978eed20091787ec2f53dee15a75
-EBUILD pygit2-0.27.1.ebuild 630 BLAKE2B 414ed5be58f09b29a1948e1d9dd6d13e85a202f1b1187f714aa81cd92ae08ea0611419bf12b3dbd48d375d9f248ea3eaea793464e0724be957ce7a0842669e6f SHA512 bc4509411610f5e03f0ded91332cd5dae987b446bf7ff5346bacb37a2ca5c02a7e868db5b13be7bcd2656585c24dd890e1306cc41d429b82e2772793cea3e213
 EBUILD pygit2-0.27.2.ebuild 739 BLAKE2B a5c0508833bed48cccba3a63fd37f5c3f5d6e0e59773d2ff03f9b7a5f9c13dff9db506b0d505facc72db50ec589b43dc554b69f814ace442a565da3daa4ae236 SHA512 5c60050093502af5dfd107e94a892c06b3cacfeb9eec3c857fb2eabe4638f34f2dbc52b51b6bc13c9867a0caf57271f20795a518ac18318c1e65b2f523d3b100
 MISC metadata.xml 489 BLAKE2B 3733ff314640ab2cbfa07e0ea67041ddb3635b51d339070abe97c95b5b358851b412cca5d8996dc1f25abb986a03095f19e8a50cbaeab7eb156c6b9107108cf6 SHA512 d20b7ebbdb3ea2ec72c3c5ded9874b7506b3ddabb43dbf329891478fcf5d7c4b9487ab0675d735733f463dd897dd5cdcc28080ad597f4f838bbcaa565c26915e
diff --git a/dev-python/pygit2/pygit2-0.27.1.ebuild b/dev-python/pygit2/pygit2-0.27.1.ebuild
deleted file mode 100644
index 5cbd6a17c976..000000000000
--- a/dev-python/pygit2/pygit2-0.27.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
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
-
-inherit distutils-r1 eapi7-ver
-
-DESCRIPTION="Python bindings for libgit2"
-HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	=dev-libs/libgit2-$(ver_cut 1-2)*
-	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	esetup.py test --args='-v'
-}
diff --git a/dev-python/pynacl/Manifest b/dev-python/pynacl/Manifest
index 515ad8a02aa7..e2a9a62887a6 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 b2e14ebf3685d7335b302ac979f999c7f83786cc951add894ba3ecc520aa43ec01cf91d70cf9d09d8e34280e605da728b674121b06cd4ac61392c8d586fb9bb1 SHA512 ac10bb5b7743dcacf868815cf78028c26362a2fa2ea2b7612c0d0d44a8b60219d655dd86c74204bc531a81c4639619cb135dcb6574d76d973813700a91d2fbf2
+EBUILD pynacl-1.2.1.ebuild 1000 BLAKE2B f9e2146586401d230c35cb66dd1e44826d764a6e04437905a289576e91cbb15517bad4e76fbaa90dab20e48005a25b325fdbaacaec15edcb282e608a4bdc782a SHA512 179ec01a1d9f2d4bbb72e231de0cb54d69670ac52d587f1616718501928483d9451cd8fd7ddc67589e2996b09721f5f742b5e09d45b9b1c280c34d76389c167d
 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 7d9759f68b5e..c2cf1214fc3b 100644
--- a/dev-python/pynacl/pynacl-1.2.1.ebuild
+++ b/dev-python/pynacl/pynacl-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=6
@@ -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="~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/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
index ef982a5c9759..fe1111d61e79 100644
--- a/dev-python/pypy-bin/Manifest
+++ b/dev-python/pypy-bin/Manifest
@@ -15,6 +15,16 @@ DIST pypy-bin-6.0.0-amd64+bzip2+jit+libressl+ncurses.tar.lz 12940199 BLAKE2B c37
 DIST pypy-bin-6.0.0-amd64+bzip2+jit+ncurses.tar.lz 12932560 BLAKE2B 97693b27ce350dd35103cf6176e7113503f790de1fc498810bfd23ed70f324fb148f801ec3d5ffcc1c578d49098ff7c4353da10509c0d56a2f3c6c4dad0a0dfa SHA512 03db8101a5aa288eb59b73d849ca0767a2b6cdffe1bfecb5f4ee5a70ceb7d73c4e1ca9be06424e18e62c2939b07c152bad1c762a9d209faa8bac9b91c48b4317
 DIST pypy-bin-6.0.0-amd64+bzip2+libressl+ncurses.tar.lz 7466895 BLAKE2B e199b8330dd4ac2acfe668fd19b2900843c96de961b3ea2fc418ec71c289c98d9c505cd42581e726179441dc877feb7eb57b89ee63c8ec00895302dacb039fbe SHA512 560886744633197abf14c21fb872f41d3d614427861045d6654c72b940e7b16996af4077ef9d531cfecc28c3e65dc64e2db149fe23c370aa8ee446dd5b0359e8
 DIST pypy-bin-6.0.0-amd64+bzip2+ncurses.tar.lz 7547568 BLAKE2B 713cd16e54cdab7e25c091db931a760f51de990bf53e566b711754c5a705507257f1c54abc5f85aba7b2449f6d3967e820d14f55953a3880e7bac3eb028db203 SHA512 e8efb0af8e8ef89c95e5fe73b177f34b9120a172e0af7e52990e428e498e3b84b31eba3dfaa28bffcb121625b5494eaeec71af2a2fa46d6b888c148ca162836b
+DIST pypy-bin-6.0.0-ffi7-amd64+bzip2+jit+libressl+ncurses.tar.lz 13018301 BLAKE2B b851ec3e73d4203a4c1eece2cf81dada7cc2b8f7047c9f4e06bd4f24008c1650d95fbd29697fafbdbed953d19595c8e77143a7bd9c8306ab3a15b2c62be48bcf SHA512 8edaf5fdad14886f4120358066fbb09be17d2b7f10dd7600f256a3f3d4b66c90502b85e8a500a70113135ce408ae2877296e1a9cb82d06ae0d031db26e09066c
+DIST pypy-bin-6.0.0-ffi7-amd64+bzip2+jit+ncurses.tar.lz 12916168 BLAKE2B f23aa0800c48d976f60d6826a424703fed1e1a00b0eb1fa09adce609cd1379f47e42df4669dad6edb59270d708f145049a7342ed73971d33183fef80dbd00539 SHA512 0ec4acf8fa2fb4b7ea409eb21a5dc0dcf14fb5616b8cb11d7892fd99aea6aa0984d0951ac474fd1469fe362e841a684d2292cafe6f69c078d003b90f224f2780
+DIST pypy-bin-6.0.0-ffi7-amd64+bzip2+libressl+ncurses.tar.lz 7546991 BLAKE2B d4e84d839dfa106a4e9b3a60327bae1fa96c326bf219b4f8dddc9dc968412b4be67e80ed1009120cf6a8b14aeede83ebb863bee1296eeafdae95a01ef0efd1eb SHA512 e3775fbf8e2a28d30a90f5bbde84bb03007aa00a6b778834db067d470d97b87c6e15ae792996d801b96d1486aecceff124854f0bd2d2bd8e353c0ee1c12662d4
+DIST pypy-bin-6.0.0-ffi7-amd64+bzip2+ncurses.tar.lz 7558174 BLAKE2B 62dc408c958c18d9751466b24c5dde46bc8705634e7312593c996c9517cc36bbaad7278aa09b179bbcb962c4124399d27647b82356c79e20e13434153b8c79b9 SHA512 8c232c7852f3e8d9e3b5bfcc3785e171ea64c63d3e1658662d9eb0340a21efecd4fa037b15ede155015b262e2f60e4fa0e80d72beb18d5e4b01dcb3e003a516f
+DIST pypy-bin-6.0.0-ffi7-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz 9857459 BLAKE2B a125f68fe7ca8259d614c1d375029df776944a8f14960528d5b96125a1b46c7c014894ca3f952157957cca654dc8143033d04f4db0fdef182a6915304b630dcb SHA512 4fa02202d2ceee6cdbd2473e8f3028695a73577504053eafd87464dd75116028a3b2129be16d422fbac5372cd7623c0ee4d9ab75b87a1423dac9470eecda1227
+DIST pypy-bin-6.0.0-ffi7-x86+bzip2+jit+ncurses+sse2.tar.lz 9859596 BLAKE2B e76d456b931bb9ffd5f5140cf4125ed1446ec81432785a97f7a631adb3b97c7184d174ef928df0089e6327a1818ce70072e6835561877a6a6398bc6c6ab6705d SHA512 80895434011f8ba14cf04cd060e6b022f8f7a92fc11b3005bf92b20c267200aafa98f114eaa7b473ce2a27a44f22882ed20b59b7bff4d1b1eef3540b9154e1e5
+DIST pypy-bin-6.0.0-ffi7-x86+bzip2+libressl+ncurses+sse2.tar.lz 5940394 BLAKE2B 4f83e1bd745e686999c39fc8976c204a95b1e2e2f6a4ec23020e136f0c1046eed4ba4e8327c7bd6c2f11d80abb398fa46fd57ea18f9e9a7ed24577c67e274e7c SHA512 7007867780b9dd8f0501d278a651e0e6e82bdfcf40e66344a4d194ea71d311e0efdb8ac00a7bc413d796cadcbbe10b603707c371bec4fe12f1b090da81e11226
+DIST pypy-bin-6.0.0-ffi7-x86+bzip2+libressl+ncurses.tar.lz 5938624 BLAKE2B 218e2a75d601cad1346d4513f01e8b9544cf2d8e0de68e43e6645758efa94e8f770e06c73be16e53964752e2a747414141a99137e7f6820f33ea1d7f3463736b SHA512 c2d17b21de8fc2658c4ffca3ca02138d2446503427c7fb4d488a2a58e1e0b0bcc1eaa0548dbe176cd7a668cdf296ffdb3a0356b27dbfbd7b6be44d2224779358
+DIST pypy-bin-6.0.0-ffi7-x86+bzip2+ncurses+sse2.tar.lz 5943737 BLAKE2B ba39bff2fcccebed496c12ff85d95ea6f7d6092661b251673b53c061fba831eeab74b1286d4fb3873bbd5daa6f4ad5af2cef2c9db561afecd34285b806e0b794 SHA512 8c6a6dd5adb6a0b80c1ea3cc461ff2316084319e26b3f0c531ccf67bf518f603156624596d94f65a2b307e462cc97cef39dff33d662f847a20620103b78fcc5e
+DIST pypy-bin-6.0.0-ffi7-x86+bzip2+ncurses.tar.lz 5939972 BLAKE2B 86ca6f1dd9f00d993986476fbeb253b2a7efb862dec7c8b90945c32e9418d52460d3d305fd0e182e9351e6de148928cf786f461cb3174601d84f5604ca1ae132 SHA512 4d14693ba0bcf3d6f56c9e8a45959d84ba5aacbccee0a643a8c713569a0e5de1449e726e7c813a93105c8dd145f1be6a7f78eec22bbb5c5a8aba31f15cffdbe5
 DIST pypy-bin-6.0.0-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz 10268326 BLAKE2B 0f0c9b9f9a586b7dfc1099a9dbe28fe56d49c808ffd2e632f428b8992d39db3db7f70fd4f2fd0fb261d8c85202ab4ec2febc35b1bd4dc86f38ab8fba5715541c SHA512 40986918e0ea94053b3adc5594a21acff34d4f18b0f4827ce9cb2646d3ddcda8fb6b107ac17869c2c44f99f153a2829fc3ae89e8d4caf61ead4c4a4c9b8e963d
 DIST pypy-bin-6.0.0-x86+bzip2+jit+ncurses+sse2.tar.lz 9857367 BLAKE2B 48d9271213dfa04991fbefab294cf3ee1a8d69d954315b0b3e543bffaae2134f0ce1e5f3da09e45041b988b0e08359c68b49acaf14c8bf26913cb540ac1928f6 SHA512 deeabbf19d95a6e6e55dea59cb0ff06fdf1ce687d6cd9499ef010d90445e05102056b5c8bfe9f44528cf86f087e4a2b1dee00fb5df1f7526673333cf73d5c8ab
 DIST pypy-bin-6.0.0-x86+bzip2+libressl+ncurses+sse2.tar.lz 6301309 BLAKE2B 8f8e16bd05da671fbe3e762dff33f32b1c50f3ce866432d3bc039724d025192a7116d6aa2590007e3adb52e5b3dd3ad9eadbc7c8f388bc7e02b049fcd980e3f1 SHA512 e6d32352ecb3a17e614f4ddac600f7dafb0a39fa807ba2fcce506eae881ee5c8f959e2d797f8126bfea74b801b76efbd9a3df86dc03c8521ec320fd06d05659e
@@ -25,5 +35,6 @@ DIST pypy2-v5.10.0-src.tar.bz2 19181430 BLAKE2B 4a0808c74fb167a7e98625f1d5b8559b
 DIST pypy2-v6.0.0-src.tar.bz2 19741694 BLAKE2B 55f5000e590613b516b12c3682a658fe6a17fbe264be3d61a81698cdf098b39177cf4355eb3f28980209c7a0e005498201cbad8884e3aa02cc86a228d1552046 SHA512 d3bdcd65fc83f2fda3203a604733fe6765049a17cca2715cd6045dc302a6159b4741a821c53fa4c97acf7297cef4c62e941a6a6eb7f8a253a93a28dcf2aa2ca0
 DIST python-gentoo-patches-2.7.14-0.tar.xz 13428 BLAKE2B 0048e48ddaaa4bef08451354fde95a123042880f26dddc9267c7f9a90fd8abb40955e26ee8c9dfc5a1165556bb3e11585b27288e635d42a4000dd3d7654c41ad SHA512 6da5b52065752b54e9215d0f0809c75167dc3690d0e94fa21dd7595626925bc5c1dd065d31b3bd696d7087f3986de145d3a335a29eb7bd77442637a7ec2863c1
 EBUILD pypy-bin-5.10.0.ebuild 5951 BLAKE2B 08ab9100162de3469727fb08a057d209e3809432e1fde15487f66f97073eff91145da0adeb961f5efb0e045b12a7af892966a121294f0ed6ae4119fedf5ff314 SHA512 9a6672f5702b3858353ed6c53222f427962754d72293f87e0e768806d2624539b48957c02e68cedb292de93e337721deffe2cba121f720ba0a6fde8c6e0bf92e
+EBUILD pypy-bin-6.0.0-r100.ebuild 6332 BLAKE2B 7fb9c4b8870fe696cea77c78ba5d3c6dda2fcfc5eb075ca2054790a0974f539d170a0284188f26dd784911e744a9e9ae029e629de71ea994aab2f5965a01f3d5 SHA512 3127ef12add95a2145afcb08ccc1758833acdf1144d66e240db941d9a2a611716b6b3040e2de8fc3de1bc9958a5f81418cdd69d80cabeb5ea374f004e4fbd833
 EBUILD pypy-bin-6.0.0.ebuild 6277 BLAKE2B 87ff3104c49ddaa0ecdfe85433ab8e258de55487f025dfd849dc48cd6885e4d3365b398a6ec22fa53a71830fbc206bd87270233f355cf903600acd7a0cd0c8e0 SHA512 2158d69a46abb87bea0f7f006ee6ce6a681bada8ca532042416a5d1797e241293988d5070ada0f6cac02ffa822a08397aded11e8009d7c56ef8e7cb9cf4c0bc1
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy-bin/pypy-bin-6.0.0-r100.ebuild b/dev-python/pypy-bin/pypy-bin-6.0.0-r100.ebuild
new file mode 100644
index 000000000000..82d0da2ce0ab
--- /dev/null
+++ b/dev-python/pypy-bin/pypy-bin-6.0.0-r100.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit pax-utils python-utils-r1 unpacker versionator
+
+BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}-ffi7"
+CPY_PATCHSET_VERSION="2.7.14-0"
+MY_P=pypy2-v${PV}
+
+DESCRIPTION="Pre-built version of PyPy"
+HOMEPAGE="http://pypy.org/"
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~floppym/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz
+	amd64? (
+		!libressl? (
+			jit? ( ${BINHOST}/${P}-ffi7-amd64+bzip2+jit+ncurses.tar.lz )
+			!jit? ( ${BINHOST}/${P}-ffi7-amd64+bzip2+ncurses.tar.lz )
+		)
+		libressl? (
+			jit? ( ${BINHOST}/${P}-ffi7-amd64+bzip2+jit+libressl+ncurses.tar.lz )
+			!jit? ( ${BINHOST}/${P}-ffi7-amd64+bzip2+libressl+ncurses.tar.lz )
+		)
+	)
+	x86? (
+		!libressl? (
+			cpu_flags_x86_sse2? (
+				jit? ( ${BINHOST}/${P}-ffi7-x86+bzip2+jit+ncurses+sse2.tar.lz )
+				!jit? ( ${BINHOST}/${P}-ffi7-x86+bzip2+ncurses+sse2.tar.lz )
+			)
+			!cpu_flags_x86_sse2? (
+				!jit? ( ${BINHOST}/${P}-ffi7-x86+bzip2+ncurses.tar.lz )
+			)
+		)
+		libressl? (
+			cpu_flags_x86_sse2? (
+				jit? ( ${BINHOST}/${P}-ffi7-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz )
+				!jit? ( ${BINHOST}/${P}-ffi7-x86+bzip2+libressl+ncurses+sse2.tar.lz )
+			)
+			!cpu_flags_x86_sse2? (
+				!jit? ( ${BINHOST}/${P}-ffi7-x86+bzip2+libressl+ncurses.tar.lz )
+			)
+		)
+	)"
+
+# Supported variants
+REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
+
+LICENSE="MIT"
+# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
+SLOT="0/41"
+KEYWORDS="~amd64 ~x86"
+IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
+
+RDEPEND="
+	app-arch/bzip2:0/1
+	dev-libs/expat:0/0
+	dev-libs/libffi:0/7
+	sys-devel/gcc:*
+	sys-libs/glibc
+	sys-libs/ncurses:0/6
+	sys-libs/zlib:0/1
+	gdbm? ( sys-libs/gdbm:0= )
+	!libressl? ( dev-libs/openssl:0/0[-bindist] )
+	libressl? ( dev-libs/libressl:0/44 )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!dev-python/pypy:0"
+DEPEND="${RDEPEND}
+	app-arch/lzip
+	app-arch/xz-utils"
+
+S=${WORKDIR}/${MY_P}-src
+
+QA_PREBUILT="
+	usr/lib*/pypy/pypy-c
+	usr/lib*/pypy/libpypy-c.so"
+
+src_prepare() {
+	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
+	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-e "s^@libdir@^$(get_libdir)^" \
+		-i lib-python/2.7/distutils/command/install.py || die
+
+	# apply CPython stdlib patches
+	pushd lib-python/2.7 > /dev/null || die
+	# TODO: cpy turkish locale patch now fixes C code
+	# probably needs better port to pypy, if it is broken there
+	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
+	eapply "${WORKDIR}"/patches/62_all_xml.use_pyxml.patch
+	popd > /dev/null || die
+
+	eapply_user
+}
+
+src_compile() {
+	# Tadaam! PyPy compiled!
+	mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die
+	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
+	# (not installed by pypy)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/ || die
+	mv pypy/module/cpyext/parse/*.h include/ || die
+
+	pax-mark m pypy-c libpypy-c.so
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+	cffi_targets=( audioop curses syslog pwdgrp resource )
+	use gdbm && cffi_targets+=( gdbm )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find -name "_cffi_*.[co]" -delete || die
+	find -type d -empty -delete || die
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	local ignored_tests=(
+		# network
+		--ignore=lib-python/2.7/test/test_urllibnet.py
+		--ignore=lib-python/2.7/test/test_urllib2net.py
+		# lots of free space
+		--ignore=lib-python/2.7/test/test_zipfile64.py
+		# no module named 'worker' -- a lot
+		--ignore=lib-python/2.7/test/test_xpickle.py
+	)
+
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
+		"${ignored_tests[@]}" lib-python || die
+}
+
+src_install() {
+	local dest=/usr/$(get_libdir)/pypy
+	einfo "Installing PyPy ..."
+	exeinto "${dest}"
+	doexe pypy-c libpypy-c.so
+	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
+	insinto "${dest}"
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r include lib_pypy lib-python
+	dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
+			"${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
+			"${ED%/}${dest}"/lib_pypy/_sqlite3.py \
+			"${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
+			"${ED%/}${dest}"/lib_pypy/_tkinter \
+			"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	local -x PYTHON=${ED%/}${dest}/pypy-c
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
+	python_export pypy EPYTHON
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	einfo "Byte-compiling Python standard library..."
+
+	# compile the installed modules
+	python_optimize "${ED%/}${dest}"
+}
diff --git a/dev-python/pypy3-bin/Manifest b/dev-python/pypy3-bin/Manifest
index 5a8d1995e778..273f17e22cd4 100644
--- a/dev-python/pypy3-bin/Manifest
+++ b/dev-python/pypy3-bin/Manifest
@@ -9,11 +9,17 @@ DIST pypy3-bin-5.10.1-x86+bzip2+ncurses+sse2.tar.lz 5351320 BLAKE2B e45ede827a98
 DIST pypy3-bin-5.10.1-x86+bzip2+ncurses.tar.lz 5343927 BLAKE2B 27c5842a1f00ff9b56c1417c290ab677bc8e1cff36ce5d226f1e3e262b14c0f0e8a5f3d474e23bcaef467b8210357d0724e752d9249f275c16cc645e59cd1530 SHA512 6f7ff616d6d0532ce4919d5e6cd69a46fd81c548efda2869653ce07d736d83f256f302040726931d85c83a297ab4c7f6e15675a17576fbffa4313a48435e182e
 DIST pypy3-bin-6.0.0-amd64+bzip2+jit+ncurses.tar.lz 10674209 BLAKE2B f9e00ba0cdc113ebe156212c5497e122a45bc9544cb242ad02273e06210eb691f930aee7faf1d4ed3a7b14080905a9cb6d30b309c38a2c3795f2183750b4469f SHA512 52e615e2b51a43a2c91f9a2a8f0cec16a6090bfd230ef08dda462bb530da9ee66acec9c449e77f299e0b3363d6bcbc7150b14e7adbe9862d36f4738dfc6be1ca
 DIST pypy3-bin-6.0.0-amd64+bzip2+ncurses.tar.lz 6703329 BLAKE2B 64ad2b2ae1580833735dc5ce4b821f79458c98c5f761d7c9834624aff172204ac16e23582e3a776baa85accd221a9fd2225c22099de1de9c319b4f29b5f15071 SHA512 57b2e2f0ddc8d6f78beff6c049adb0a8d316db1d9f7bf5e07e4e593fa363e5ced37d212f549c0a5305459207694ac5a6aac9698a1ca3a4bf56a4437899b7e97b
+DIST pypy3-bin-6.0.0-ffi7-amd64+bzip2+jit+ncurses.tar.lz 10697120 BLAKE2B 3e368d0fb6b875472d79b531bef926bedddf73c1f2bb25e00f56cd41c4349be119281d2c2d52239bd2769f3f9810280f8c00d9332e02b8664e46de06f2c112d8 SHA512 2e9c405212d35289a8add374cae185bf9096a46604c4e2935f1a58bee51aa756b311e5b611098e917da7fbd10194706fca809249f627b7d4b8c628bf9b38aa54
+DIST pypy3-bin-6.0.0-ffi7-amd64+bzip2+ncurses.tar.lz 6710567 BLAKE2B 239badab3e3f4cb17116f2d2b3cbf58f7a481bdbc78d813563f5a7c2c67002cce598de70ebdbdd8d5dc348ec5db07559a2f35e712ebe46d1f472f2b2ccb9fa05 SHA512 ae3e76c2df50a2ec39e8f447fcacf913a1e9a3cf1268324ddc303b35e8a7a07413278e313e92579c311238ec185cb61d3d97fcbf6e972846859dc423792f55f0
+DIST pypy3-bin-6.0.0-ffi7-x86+bzip2+jit+ncurses+sse2.tar.lz 8253376 BLAKE2B 6ea95d691a5ccbb89bfd5f9351199f3d3cd4cb855d44937db58ac6327b80b71ed5d15f5dcbdc961ccf5ea1fa945ba31917716a3b9ff79327f4db3a99961569c2 SHA512 e68722eb0004680df884ff98bda906e94a5252c4e6b3ca55fe2df48a5a18d9dccc0218906c6b71a579a7a97da3a4633bb42317a276ee2640a16a9d31c1939f8e
+DIST pypy3-bin-6.0.0-ffi7-x86+bzip2+ncurses+sse2.tar.lz 5384351 BLAKE2B 952676b1ec9c71b5ec477011ec4c5020512508f7c40009d8715972726469319bccb30546105dd68be22a02572f6646f06057495442da12d889ac9695a1b14537 SHA512 c4b4289b9348ad35f79f0581e2d3a8cf1109a3edfb52cccf8e04a0089c706ae12de819d901f875bff3a439680694a98c85605c1b9abfd7fd4ff825846c2c89e3
+DIST pypy3-bin-6.0.0-ffi7-x86+bzip2+ncurses.tar.lz 5384380 BLAKE2B 7e452d0b163f401d0741e95aa2f55e84eb223eb3152f0299b365d1dd53268d315496977d988149c29e0e3439834d7283bfa9a9e05f2d7a8abb3f3d65aa05e567 SHA512 d743c4275abfbce1ef1ae2949e93097faeca8377e38761183ff7d0cc23b92d93700bf370d1511c968743e769a0b41acfeae01543885cc55bef8cdd2c6817af0f
 DIST pypy3-bin-6.0.0-x86+bzip2+jit+ncurses+sse2.tar.lz 8268406 BLAKE2B 8200d7cfc5bd813cf3138017c96cace1c07bc031f68d5a9df2f71cb887a5dd3bb979dbc67d395389c965904037935a518bf6c1492b04ce5a9f21a9bb3bb5504a SHA512 4c09c454b25faa51024c5319ba5e91f4b1883bdd25f504694f83011ef1faffe7aa28a51369d3c5c6bb9f0d8eb53d1292d57608343b731c67ceeb99f41736b044
 DIST pypy3-bin-6.0.0-x86+bzip2+ncurses+sse2.tar.lz 5363942 BLAKE2B d53b89ef73c2d4ee2bc00360a0c4a791fd8b6ac2d28dfeeb7510a465e6302f79c378aacebbaf4993b6ee55dbc6d85876149fe3f5a0d689713f029c928d93a729 SHA512 ce72d84200dd275841e691810dbf402423883b282cacbe8bbdae9285936869d40b3d43d053b0f3d4904c7ced72f35480d1780358180a1c98e8111852fef1f77f
 DIST pypy3-bin-6.0.0-x86+bzip2+ncurses.tar.lz 5366917 BLAKE2B 338a9c221048dabc548250edec05256be64dd5d1aeb5b2fff839d7d5e8dda29e7d4e0a03b1fc0c9cd418685c558bb47598c625e2d28cd4caabc45e21eee9f4f8 SHA512 5274535d01564a9087aea486320921c8784cabcc7bde3634c27b9006988fdc745e6e5e5c2fb8e7b0318fd5ca6fda3fce208743cfa079a7474ea44277237ea873
 DIST pypy3-v5.10.1-src.tar.bz2 29071765 BLAKE2B d5c163697d8dd36a9a61e9a355719628902de0c9a4c038d31cd134d9bb26b8058abfdf85b09715208146295c37e343fae5e1e4a3c8d1999306eeea93791e326c SHA512 91b0ed25130bdbb46d5e577136b5fe63d5162917dcc2d0b69f5cac2a283ece9d0bfd3c7c8dc61ff391e0550fa1603326f6edeb2df3159d71617fefe6c07439f5
 DIST pypy3-v6.0.0-src.tar.bz2 22648140 BLAKE2B b8678859b0c24494788ddf6f410a3ec1a56a04663452e1aba25d3f41c5073a95866d1623f00cb1a6c9d0256df728fa60d1edb5b58d26c0d88577769cc8a6205d SHA512 ea406c4dd1837a6ab13026de01330790f3c18f6e2bfb83e8553e52acf78b43dfb559ce75c2d91395055c771db359356c8183ed950da6f01a21bf09128935af5e
 EBUILD pypy3-bin-5.10.1.ebuild 5543 BLAKE2B d790bc82ec0c0f4e48bbfabc557241fb6eaed1e02678764ac887f498b08e277205d308126a4095a553d0d568499d6062cd76c47af1d887b0dd318a9a66fdb9f8 SHA512 ff0391da50cce922e424f2e5d47bbcd6584327be54eb03fe5570a6df45ddfab3dae510053e820961678dbc5c4c24d85bf59bdf6ce2f7cbe13ea1696a57712dff
+EBUILD pypy3-bin-6.0.0-r100.ebuild 5577 BLAKE2B dffe4b3f16d9af33ac5b7cf651a5147ba284dace9b906e62bd3779c5b6d4ca3e8fb9d2363448598edc120dc95d88df5d32de2f2b52337cc6966faf894f30cb41 SHA512 6b3dfde01104e0ea5e471db9308088adeaae2729f02e8b4271a826efc848d1e6e585b9caad721b2a06a5aaf29210be1cbfeb6ccad68b0bc179f54187d99e0fe7
 EBUILD pypy3-bin-6.0.0.ebuild 5547 BLAKE2B 27f7df0cb40c23e17bf1bca4d350f42fd5583a4c034cf79b8b6e213137089f1254c38f90a81976a194ca908c9046219646b4326a4bd1acfdaabfd67b275cd215 SHA512 23523b49c740d09b4e871e8ecfbf72e40a929be0500153398aadaaf8b17ee9ef92f3d03e8b3ef7d189ad2c377e4ef03dadc4d68716fe36e797c0f360a19962e8
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy3-bin/pypy3-bin-6.0.0-r100.ebuild b/dev-python/pypy3-bin/pypy3-bin-6.0.0-r100.ebuild
new file mode 100644
index 000000000000..d98c618d9ebf
--- /dev/null
+++ b/dev-python/pypy3-bin/pypy3-bin-6.0.0-r100.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Test runner needs Python 2.
+PYTHON_COMPAT=( python2_7 pypy )
+inherit pax-utils python-any-r1 unpacker versionator
+
+BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy3-bin/${PV}-ffi7"
+MY_P=pypy3-v${PV}
+
+DESCRIPTION="A fast, compliant alternative implementation of Python 3.3 (binary package)"
+HOMEPAGE="http://pypy.org/"
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
+	amd64? (
+		jit? ( ${BINHOST}/${P}-ffi7-amd64+bzip2+jit+ncurses.tar.lz )
+		!jit? ( ${BINHOST}/${P}-ffi7-amd64+bzip2+ncurses.tar.lz )
+	)
+	x86? (
+		cpu_flags_x86_sse2? (
+			jit? ( ${BINHOST}/${P}-ffi7-x86+bzip2+jit+ncurses+sse2.tar.lz )
+			!jit? ( ${BINHOST}/${P}-ffi7-x86+bzip2+ncurses+sse2.tar.lz )
+		)
+		!cpu_flags_x86_sse2? (
+			!jit? ( ${BINHOST}/${P}-ffi7-x86+bzip2+ncurses.tar.lz )
+		)
+	)"
+
+# Supported variants
+REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
+
+LICENSE="MIT"
+# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
+SLOT="0/60"
+KEYWORDS="~amd64 ~x86"
+IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
+
+RDEPEND="
+	app-arch/bzip2:0/1
+	dev-libs/expat:0/0
+	dev-libs/libffi:0/7
+	sys-devel/gcc:*
+	sys-libs/glibc
+	sys-libs/ncurses:0/6
+	sys-libs/zlib:0/1
+	gdbm? ( sys-libs/gdbm:0= )
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!dev-python/pypy3:0"
+DEPEND="${RDEPEND}
+	app-arch/lzip
+	app-arch/xz-utils
+	test? ( ${PYTHON_DEPS} )"
+
+S=${WORKDIR}/${MY_P}-src
+
+QA_PREBUILT="
+	usr/lib*/pypy3/pypy3-c
+	usr/lib*/pypy3/libpypy3-c.so"
+
+src_prepare() {
+	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
+	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-e "s^@libdir@^$(get_libdir)^" \
+		-i lib-python/3/distutils/command/install.py || die
+
+	# apply CPython stdlib patches
+	pushd lib-python/3 > /dev/null || die
+	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
+	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
+	popd > /dev/null || die
+
+	eapply_user
+}
+
+src_compile() {
+	# Tadaam! PyPy compiled!
+	mv "${WORKDIR}"/${P}*/{libpypy3-c.so,pypy3-c} . || die
+	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
+	mv pypy/module/cpyext/include/*.h include/ || die
+	mv pypy/module/cpyext/parse/*.h include/ || die
+
+	pax-mark m pypy3-c libpypy3-c.so
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "_gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+#    "lzma": "_lzma_build.py",
+#    "_decimal": "_decimal_build.py",
+#    "ssl": "_ssl_build.py",
+	cffi_targets=( audioop curses syslog pwdgrp resource lzma decimal ssl )
+	use gdbm && cffi_targets+=( gdbm )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find -name "_cffi_*.[co]" -delete || die
+	find -type d -empty -delete || die
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	# Test runner requires Python 2 too. However, it spawns PyPy3
+	# internally so that we end up testing the correct interpreter.
+	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
+}
+
+src_install() {
+	local dest=/usr/$(get_libdir)/pypy3
+	einfo "Installing PyPy ..."
+	exeinto "${dest}"
+	doexe pypy3-c libpypy3-c.so
+	pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/libpypy3-c.so"
+	insinto "${dest}"
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r include lib_pypy lib-python
+	dosym ../$(get_libdir)/pypy3/pypy3-c /usr/bin/pypy3
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED%/}${dest}"/lib_pypy/_gdbm* || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \
+			"${ED%/}${dest}"/lib_pypy/_sqlite3* \
+			"${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \
+			"${ED%/}${dest}"/lib_pypy/_tkinter \
+			"${ED%/}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	einfo "Generating caches and byte-compiling ..."
+
+	local -x PYTHON=${ED%/}${dest}/pypy3-c
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages
+	python_export pypy3 EPYTHON
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	einfo "Byte-compiling Python standard library..."
+
+	# compile the installed modules
+	python_optimize "${ED%/}${dest}"
+}
diff --git a/dev-python/pytest-relaxed/Manifest b/dev-python/pytest-relaxed/Manifest
index e331d2c85959..168b7ff677f2 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 1395 BLAKE2B d90decfb2884710261defa5533c0a73e8f7682e3f8d6727dd79f7e25c520958d42252c9498dc83c551886e3fb3f13fd5f8cef9b6a9aac5d6b30d35fba36820c2 SHA512 3b1649f1f5d5a7bd5bf5ae1a6c14419796725fa57504a6cb41da8cb1f345eba952f2034439ae4ab5703826b7e4fd30b540a30bbaeae6e12198e4a5a240fe6be0
+EBUILD pytest-relaxed-1.1.4.ebuild 1396 BLAKE2B 91498a87b1aa4515af5e5841ce3f545d59b6b54ea15d03598079ee72bfff9ccf778da52a2237720041479159cd0aa93731fbb59d125d75c7aec5a46136b582f7 SHA512 683fe0e89d13928e6e4e772a06fd30cc0468c940acbe4c7854c12cd467ab4a64528c13d33d4e1dc86fc678ffc8dd20ec26b3626fc8826af459818b0796871ea4
 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 0f5f4b758f31..683884b4f05d 100644
--- a/dev-python/pytest-relaxed/pytest-relaxed-1.1.4.ebuild
+++ b/dev-python/pytest-relaxed/pytest-relaxed-1.1.4.ebuild
@@ -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/Manifest b/dev-python/pytest/Manifest
index d0b9a4387a2f..1e8c2f292ba1 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,15 +1,11 @@
 AUX pytest-3.4.2-pypy-syntaxerror-offset.patch 996 BLAKE2B ff6d362d20f6432f73956e1aee4c2bc596e3d8e3347da3624dfd3cbfdd1eabd8872058737e8f9b558f3570878756c7b87a65514956b1e81235c2727e8ff2fc63 SHA512 4a28ddc07389aac79e46528e85229aba126a89c27b7bec73b406766be49f5c8be9bdc2cb3158bfb475b4d6371e2f33960e1ed154e3b9eda15aeb8b151f3d2148
 AUX pytest-3.6.3-pypy-syntaxerror-offset.patch 1055 BLAKE2B 8a92e1300052ed7f178252489d4b687d9d58d5fa9067a1f17a20ddbd698843a5614e7dd729670920a447e189b0e40ed2ae26fd13ad7d9cfebc59889c8cc50d87 SHA512 fa2600e320a74eca59004953aea0ac7607e6b7fcbcb702a5ac709dfcf73d036f47c5a79b01e56061ed6776ccaddd7a261162848218969fd1b462c5e1dd615ad3
-DIST pytest-3.0.3.tar.gz 731934 BLAKE2B 7fb57d75bd54eb8a31d9701fdf739119715c475eaaacae3cd038057c1d2bf43fa86ccdc45b3c84962708ef606976ab39ad41e0c3690c8b5f4c04d870579a384e SHA512 ec0b4a5f0d6673a339c5a70b402c004c23db7001005454329eeaea15d890f53b8f2740f6c6254499d0f915b9058bfdfa535d9f22847bb382a060d65204fce4af
 DIST pytest-3.2.2.tar.gz 786396 BLAKE2B e669da930890e902b0323ec3a6685080ddd889e74655f7b4cb08ec421651f987597021a31471aab5a32d637b99620ce7792cbdf8f85561db3bb10ff06a446ba1 SHA512 6df3a50e7d1efeaf7a283920b16d1daf800798f422bc851b0aacd2bbd5cb0a88c95f9057fae49943b9dfe6527ed552cdf8d983b944ab91d0af252ee4f6eb82db
-DIST pytest-3.4.1.tar.gz 812928 BLAKE2B 27b25fcc5a268b1c92188c01bf16bf1eb4b8ced7d1a3c8095350ec55b1f1845a5d54bd6bd169142ca0d327f2f8d193774643174a356dd95fa07b3195bc1e8713 SHA512 75f728840cde6512619a03ce75fd0b04cb9d57a99f381366a0f9c10ffa3210448e7e85505357bfa9bfb0cca11cdedda2c0e091e5473ed82707a2597f234e659a
 DIST pytest-3.4.2.tar.gz 812719 BLAKE2B 96623d6cdea4bd79778175c18c949938505f1862010f700f9a8cb85f445910381af391a5b69e664fbbfc254bf46502c798c72026772070236a0a3bca7aeeb3d6 SHA512 787065ab76d4482799bb2da9f024c9c383e68cc1cc01f3b80f6ed9444ca6383d20953615696ed4dd01668777b094cf5002b23c4ce51828879dcf8ebf2170c71b
 DIST pytest-3.6.3.tar.gz 830949 BLAKE2B 4c0df5d157b8bb0ac6261a793aac2a8074c869b1a7cbda3eda600c79648b3722eaf2a57514c1fece60e0aac324b8ed09e8e889dda268619204e9e1f1637e1c9b SHA512 e18d8e972cb1b05b037b9441eea5981ce036d8e2c2bab80f6e50f283df9bd08740296133990424cf78449f6d3d2fbd1d59709770aa972af99fe061583f2d79a7
-DIST pytest-3.8.0.tar.gz 865922 BLAKE2B 821051de2c502c892841f59124f6cdbfb6f31ebd8661bf242484c7c3f687ce75f9c4eb0984f7dabed0aff44277dcbbeb9f14c4cde2f6b152aad69f3769e27bc8 SHA512 26efe2bcd6c86c55cb17a17ad3cfe0762ba5d61adf9830fe5780c0c90df65bbeb2346abb8310c6123c308ed0e641d4cf325ca9ac16dcd8994b6a636bcfd386a4
-EBUILD pytest-3.0.3.ebuild 1966 BLAKE2B 50b123408a85c5b283fe1653444472fd467272d99dc944bdf876556fe5e9aa1208e32efbc119cc95ca834bb66a50f195199efd4d04054cf3cc98530eccda710c SHA512 2d6713c361334f2af886827a0918f574512e885fe77cc5a4595ca47d31b37d32f5768989a6bb5447666c8850ca15bca73e7641414d724bb9512d70abb5ea0eba
+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.1-r1.ebuild 2297 BLAKE2B 52af333554c85fff95f0bffe2246cd7e88a6446ddbe8dc4829600d1a018da613c4aed06e039fbd54d621ca45a3dcf454d24ae9bbe302d97c6084ea37d6641945 SHA512 5c06bedcf6b6f8df4f6bba8f5aace83a72ff530f1f0368a0a5b76f0380d02c55cf64e8645362c63f7f6efef5d49eefcdfff2423734a62acb23799a9e3c567200
 EBUILD pytest-3.4.2.ebuild 2509 BLAKE2B 23b2f34e9f2923a0eb143a341f4dff40e88d4ff1bf52cd7637d9354192ebadb58c39050feb00911993f0067d60571598864e5a85644b0adb33cab722594f9ebc SHA512 1958df6b0567c547bf70789836e12929caf3e1f17ac16ebad88aac081dce949888a08efceaba04649feb8098d4373548a5d4de511a8b94d6f50eebbd1d5d7b64
 EBUILD pytest-3.6.3.ebuild 2413 BLAKE2B 56d11541e919a95919ad66efa0b4603ccd61116133381fac8c5ff605fc5f3b53792b611b7c40a6428d81890134c0482fba18e13575d2ffc5f3c96e5c982dd3ae SHA512 ac4a4fe08e095f1a9012346fdfae6fb926e5db595defbf1f3f5a15ef96e7325846536e277513cf3f79242dd26dd726622686bc534e9fbe53a98fd2d9c4285cba
-EBUILD pytest-3.8.0.ebuild 2605 BLAKE2B 3bb1965f31ba5627d0a6ad32bb3e84d4d96d3fd652ec2b31f8b2f5a358fb9309797944093ba2b8222c7dcf2de5725c9f8535ac45f6e5a18605a078909a4faad7 SHA512 ab74df5d15d1be647eb74cb91719d5408a4abf4795b87b5f7367c7f441f9f3b7c7e528a1d598d8999048126bff0075dc030184c49a7ec84782b03dc072b5cc06
+EBUILD pytest-3.8.2.ebuild 2445 BLAKE2B a3b8d228f33317817ddaf3e86091e17647f59279d7ec6ae34bc180c5f12aa43a1a86cc9f832112472237da897b4506daf0b97fe5e74da87028ffdb543b4f0520 SHA512 0c895d526c881e1a20d372833078efdc8ffba3bbe2b8c7d883a670ef4de431296430cf8f47bc6d2d77642b154cc44f346ead8880b891108d7bbe369e5ff1ac35
 MISC metadata.xml 309 BLAKE2B f29391c5f96f44f6329d3665346a5d46ecb4a86d103ae8008769af86126756e76bfa89cfe462e9c219e5f70b64013f662d020c7a2f6015d8cadd0eb25a7614eb SHA512 ba53c13ac716488e3e5dadf5dcfcb697dc9bb13f89e9d0fb98b9a5a6e36cafeeb64d1348008f42497117bf46fb6f3bc288c10a68c4d5ab53c9c02a3ae61b594f
diff --git a/dev-python/pytest/pytest-3.0.3.ebuild b/dev-python/pytest/pytest-3.0.3.ebuild
deleted file mode 100644
index f6d776d3e09f..000000000000
--- a/dev-python/pytest/pytest-3.0.3.ebuild
+++ /dev/null
@@ -1,73 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="http://pytest.org/ https://pypi.org/project/pytest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="doc test"
-
-# When bumping, please check setup.py for the proper py version
-PY_VER="1.4.29"
-COMMON_DEPEND="
-	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	test? (
-		>=dev-python/hypothesis-3.5.2[${PYTHON_USEDEP}]
-		>dev-python/pytest-xdist-1.13[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!<dev-python/logilab-common-1.3.0
-"
-
-python_prepare_all() {
-	chmod o-w *egg*/* || die
-	# Disable versioning of py.test script to avoid collision with
-	# versioning performed by the eclass.
-	sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed"
-	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
-
-	# https://bugs.gentoo.org/598442
-	rm testing/test_pdb.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# test_nose.py not written to suit py3.2 in pypy3
-	if [[ "${EPYTHON}" == pypy3 ]]; then
-		"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -vv \
-			--ignore=testing/BUILD_nose.py \
-			|| die "tests failed with ${EPYTHON}"
-	else
-		"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -v testing || die "tests failed with ${EPYTHON}"
-	fi
-}
-
-python_compile_all(){
-	use doc && emake -C doc/en html
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/en/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pytest/pytest-3.4.1-r1.ebuild b/dev-python/pytest/pytest-3.4.1-r1.ebuild
deleted file mode 100644
index d9b4a24f1a25..000000000000
--- a/dev-python/pytest/pytest-3.4.1-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="http://pytest.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-# When bumping, please check setup.py for the proper py version
-PY_VER="1.5.0"
-COMMON_DEPEND="
-	>=dev-python/attrs-17.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-0.5[${PYTHON_USEDEP}]
-	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)"
-
-DEPEND="${COMMON_DEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hypothesis-3.5.2[${PYTHON_USEDEP}]
-		>dev-python/pytest-xdist-1.13[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	!<dev-python/logilab-common-1.3.0"
-
-python_prepare_all() {
-	chmod o-w *egg*/* || die
-	# Disable versioning of py.test script to avoid collision with
-	# versioning performed by the eclass.
-	sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed"
-	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
-
-	# Something in the ebuild environment causes this to hang/error.
-	# https://bugs.gentoo.org/598442
-	rm testing/test_pdb.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# test_nose.py not written to suit py3.2 in pypy3
-	if [[ "${EPYTHON}" == pypy3 ]]; then
-		"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX \
-			--ignore=testing/BUILD_nose.py \
-			|| die "tests failed with ${EPYTHON}"
-	else
-		"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX testing || die "tests failed with ${EPYTHON}"
-	fi
-}
-
-python_compile_all(){
-	use doc && emake -C doc/en html
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/en/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pytest/pytest-3.8.0.ebuild b/dev-python/pytest/pytest-3.8.0.ebuild
deleted file mode 100644
index 93cc15d8ad4b..000000000000
--- a/dev-python/pytest/pytest-3.8.0.ebuild
+++ /dev/null
@@ -1,89 +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_{4,5,6,7} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="http://pytest.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc64 ~sparc ~x86"
-# doc apparently requires sphinxcontrib_trio, not yet packaged
-IUSE="test" # doc
-
-# When bumping, please check setup.py for the proper py version
-PY_VER="1.5.0"
-
-# pathlib2 has been added to stdlib before py3.6, but pytest needs __fspath__
-# support, which only came in py3.6.
-COMMON_DEPEND="
-	>=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}]
-	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7 python3_{4,5} )
-	>=dev-python/pluggy-0.7[${PYTHON_USEDEP}]
-	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]"
-
-#	doc? (
-#		dev-python/pyyaml[${PYTHON_USEDEP}]
-#		dev-python/sphinx[${PYTHON_USEDEP}]
-#	)"
-
-# flake & pytest-capturelog cause a number of tests to fail
-DEPEND="${COMMON_DEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-1.22.2[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		!!dev-python/flaky
-		!!dev-python/pytest-capturelog
-	)"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	!<dev-python/logilab-common-1.3.0"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}"/pytest-3.6.3-pypy-syntaxerror-offset.patch
-	)
-
-	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
-
-	# Something in the ebuild environment causes this to hang/error.
-	# https://bugs.gentoo.org/598442
-	rm testing/test_pdb.py || die
-
-	# those tests appear to hang with python3.5+;  TODO: investigate why
-	sed -i -e 's:test_runtest_location_shown_before_test_starts:_&:' \
-		testing/test_terminal.py || die
-	sed -i -e 's:test_trial_pdb:_&:' testing/test_unittest.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX \
-		-vv testing || die "tests failed with ${EPYTHON}"
-}
-
-#python_compile_all() {
-#	use doc && emake -C doc/en html
-#}
-#
-#python_install_all() {
-#	use doc && HTML_DOCS=( doc/en/_build/html/. )
-#	distutils-r1_python_install_all
-#}
diff --git a/dev-python/pytest/pytest-3.8.2.ebuild b/dev-python/pytest/pytest-3.8.2.ebuild
new file mode 100644
index 000000000000..17be8889de91
--- /dev/null
+++ b/dev-python/pytest/pytest-3.8.2.ebuild
@@ -0,0 +1,81 @@
+# 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="Simple powerful testing with Python"
+HOMEPAGE="http://pytest.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc64 ~sparc ~x86"
+# doc apparently requires sphinxcontrib_trio, not yet packaged
+IUSE="test" # doc
+
+# When bumping, please check setup.py for the proper py version
+PY_VER="1.5.0"
+
+# pathlib2 has been added to stdlib before py3.6, but pytest needs __fspath__
+# support, which only came in py3.6.
+RDEPEND="
+	>=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}]
+	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7 python3_{4,5} )
+	>=dev-python/pluggy-0.7[${PYTHON_USEDEP}]
+	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	virtual/python-funcsigs[${PYTHON_USEDEP}]"
+
+#	doc? (
+#		dev-python/pyyaml[${PYTHON_USEDEP}]
+#		dev-python/sphinx[${PYTHON_USEDEP}]
+#	)"
+
+# flake & pytest-capturelog cause a number of tests to fail
+DEPEND="${RDEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-1.22.2[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		!!dev-python/flaky
+		!!dev-python/pytest-capturelog
+	)"
+
+python_prepare_all() {
+	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
+
+	# Something in the ebuild environment causes this to hang/error.
+	# https://bugs.gentoo.org/598442
+	rm testing/test_pdb.py || die
+
+	# those tests appear to hang with python3.5+;  TODO: investigate why
+	sed -i -e 's:test_runtest_location_shown_before_test_starts:_&:' \
+		testing/test_terminal.py || die
+	sed -i -e 's:test_trial_pdb:_&:' testing/test_unittest.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX \
+		-vv testing || die "tests failed with ${EPYTHON}"
+}
+
+#python_compile_all() {
+#	use doc && emake -C doc/en html
+#}
+#
+#python_install_all() {
+#	use doc && HTML_DOCS=( doc/en/_build/html/. )
+#	distutils-r1_python_install_all
+#}
diff --git a/dev-python/python-caja/Manifest b/dev-python/python-caja/Manifest
index 84eaff6858e1..a3c5791d2921 100644
--- a/dev-python/python-caja/Manifest
+++ b/dev-python/python-caja/Manifest
@@ -1,9 +1,3 @@
-DIST python-caja-1.12.0.tar.xz 265720 BLAKE2B 6d1d1e9609b24ee0632eda68730aa2ae2aacffb3e4762a9b5269cd76fefde40dfa3cfc20857567a2d2470372695b0356e4329a11ffd159e349231f109d5077e0 SHA512 fbec1a7f5e560cda2b3bba41dcd93c0484f2b7b7527577a2b2114c84019203df92c136fecbbe6c889785c610035a582f1912ad7da9bb1258ada661b56edf4be7
-DIST python-caja-1.14.0.tar.xz 279432 BLAKE2B 15bbf397373125fba85c5ec0ee694be500cab1b4252a73666259bde7984318baa1cc5f760a492f4b930305c99c040f5e3c12b7dc77d82889f5dcea0d4bea3d07 SHA512 835d9c1df112746fb3ecfe2e661e0c36814f3e2b21c763450354ce9bc0119d055b6773efa64d252ea8a618ec6c36e2d9cbfca698ffa6652cad0b94a499167497
-DIST python-caja-1.16.0.tar.xz 280956 BLAKE2B 0850c7aaa4e61a620340bb6f2d8518c423341d2918491519cd7105097c8a226750db6a499eb601b972972e1d0122158a011ee1efb9128f8a75d8efcd31ba9d6f SHA512 ce82fbd6d1127df33153920fbf703f77be2e1dabeb6ba33275fb1b1ba5d8aabc96222cf42280844237f0e182b0eccf764fd8ea33a8de96e844eeb0d5ef0cd5de
 DIST python-caja-1.18.1.tar.xz 284020 BLAKE2B 9513c89450c07330471b2ee9a9d9644eef33858060e66054ab00fb16d3d63292e14704c9f80d7cd5928fcf108bb1cf8c5afd7eb8713814554574cda39b0a8960 SHA512 5907f0769e43b592228aa66f9b51e227a414051975066c16734397afa05c1235d442c625bb00a51e9356768fc3b9f46cfca51e9563e4368b39a8e58a9e514e7d
-EBUILD python-caja-1.12.0-r1.ebuild 1034 BLAKE2B 5d4deb1bad0421e339bd39535a2129f8363eac8b8fac382c6d4b1464ec9f574909d2920a1ffca72b14fdc0dc433294287a8c1a6d94c18eacd826df292b6f8139 SHA512 fb5edef48d7677c1c07b4f941015a2fe666f72ab94312b09c64c16d4e2a76d2fa125b74d1105240c3bf6064615da5ce17a0f7d770d1b495d3f32f6aaf734cad1
-EBUILD python-caja-1.14.0.ebuild 1076 BLAKE2B 4504320a5654c499d0a6e143ff507d175b66afce86d13a39b010673b0581cf63d66a3e973d5ddadbaf126a79bee30fdb836f52dcdf49279c95e8b051e6f5e139 SHA512 35a380ed78eee70e76b77e953b6825ad10fa487f132784a13fbf658b572ec08a32a54cdd548dbb17cc272dc01ebabb1af4d8fc98f528ff4b373bb91bb2d293fe
-EBUILD python-caja-1.16.0.ebuild 1076 BLAKE2B 4504320a5654c499d0a6e143ff507d175b66afce86d13a39b010673b0581cf63d66a3e973d5ddadbaf126a79bee30fdb836f52dcdf49279c95e8b051e6f5e139 SHA512 35a380ed78eee70e76b77e953b6825ad10fa487f132784a13fbf658b572ec08a32a54cdd548dbb17cc272dc01ebabb1af4d8fc98f528ff4b373bb91bb2d293fe
 EBUILD python-caja-1.18.1.ebuild 988 BLAKE2B cd89976f74579d8d85c728d20cbb7fb5882356d6294bd1496c85a38f0107a3683b24e85310193362a0c8a9158234e268ed023d13eca9ec87394848f6edbc23a6 SHA512 4fd88ecc0fb3473e52a70116404233015ed14c7c09bda9da27b0b7d52d3d217d8b2f73dcd93cb1c1af3b1faf19c948200e6cf305a04ef9ead78a3bc587625b71
-MISC metadata.xml 416 BLAKE2B 902d9e55647436228f328ae3b95500de14497e3aa673840f40208a9620061f8cd6855b34aff0902c5271b3e79b16809e81eb4f1f972dbf96808031131a207178 SHA512 10b28795c6b8a02478f4896b97bd65c01521e11e2e40c4c2d8b8d5ecd1813a8d4c267af59f005000181b41d151f332eb4d96571c6110b74f6ca14ed9428ca093
+MISC metadata.xml 340 BLAKE2B 38e2ec7c21175122fe4d2439ef5b70277caef629d7275055ae44146db7d9def0c2af3f4d190a7a4ac426ff6fe19f9cf5a707abf71dd1fab85ec79e5d81e1f075 SHA512 5892ee1cdadbfd6a93d5bea5a6232ce8351373df7a6037ed605a8d66c3367fb7afb39e1b4b31052a599cb1e7ea155ae818e9f8225c7992a21443131e98621b33
diff --git a/dev-python/python-caja/metadata.xml b/dev-python/python-caja/metadata.xml
index 9870e15abde1..2d0b28805873 100644
--- a/dev-python/python-caja/metadata.xml
+++ b/dev-python/python-caja/metadata.xml
@@ -5,9 +5,6 @@
 		<email>mate@gentoo.org</email>
 		<name>Gentoo MATE Desktop</name>
 	</maintainer>
-	<use>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/python-caja</remote-id>
 	</upstream>
diff --git a/dev-python/python-caja/python-caja-1.12.0-r1.ebuild b/dev-python/python-caja/python-caja-1.12.0-r1.ebuild
deleted file mode 100644
index 8e84490ede64..000000000000
--- a/dev-python/python-caja/python-caja-1.12.0-r1.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
-
-MATE_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate python-single-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Python bindings for the Caja file manager"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc gtk3"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="dev-libs/glib:2
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=mate-base/caja-1.8[gtk3(-)=,introspection]
-	!gtk3? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	${PYTHON_DEPS}"
-
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	virtual/pkgconfig:*
-	doc? ( app-text/docbook-xml-dtd:4.1.2 )"
-
-src_install() {
-	mate_src_install
-
-	# Keep the directory for systemwide extensions.
-	keepdir /usr/share/python-caja/extensions/
-
-	# The HTML documentation generation is broken and commented out by upstream.
-	#
-	#if use doc ; then
-	#	insinto /usr/share/gtk-doc/html/nautilus-python # for dev-util/devhelp
-	#	doins -r docs/html/*
-	#fi
-}
diff --git a/dev-python/python-caja/python-caja-1.14.0.ebuild b/dev-python/python-caja/python-caja-1.14.0.ebuild
deleted file mode 100644
index 8e2f6d0374f6..000000000000
--- a/dev-python/python-caja/python-caja-1.14.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate python-single-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Python bindings for the Caja file manager"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc gtk3"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-libs/glib:2
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=mate-base/caja-1.8[gtk3(-)=,introspection]
-	!gtk3? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	virtual/pkgconfig:*
-	doc? ( app-text/docbook-xml-dtd:4.1.2 )"
-
-src_install() {
-	mate_src_install
-
-	# Keep the directory for systemwide extensions.
-	keepdir /usr/share/python-caja/extensions/
-
-	# The HTML documentation generation is broken and commented out by upstream.
-	#
-	#if use doc ; then
-	#	insinto /usr/share/gtk-doc/html/nautilus-python # for dev-util/devhelp
-	#	doins -r docs/html/*
-	#fi
-}
diff --git a/dev-python/python-caja/python-caja-1.16.0.ebuild b/dev-python/python-caja/python-caja-1.16.0.ebuild
deleted file mode 100644
index 8e2f6d0374f6..000000000000
--- a/dev-python/python-caja/python-caja-1.16.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate python-single-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Python bindings for the Caja file manager"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc gtk3"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-libs/glib:2
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=mate-base/caja-1.8[gtk3(-)=,introspection]
-	!gtk3? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	virtual/pkgconfig:*
-	doc? ( app-text/docbook-xml-dtd:4.1.2 )"
-
-src_install() {
-	mate_src_install
-
-	# Keep the directory for systemwide extensions.
-	keepdir /usr/share/python-caja/extensions/
-
-	# The HTML documentation generation is broken and commented out by upstream.
-	#
-	#if use doc ; then
-	#	insinto /usr/share/gtk-doc/html/nautilus-python # for dev-util/devhelp
-	#	doins -r docs/html/*
-	#fi
-}
diff --git a/dev-python/python-evdev/Manifest b/dev-python/python-evdev/Manifest
index 9ae5dd314b72..c20b5e0abe11 100644
--- a/dev-python/python-evdev/Manifest
+++ b/dev-python/python-evdev/Manifest
@@ -1,3 +1,3 @@
 DIST python-evdev-0.7.0.tar.gz 80508 BLAKE2B 9c3048d649d41b7fc0dfa1af14239a0bfbb5b85c577a8de0323cf35eff79324703987b0a5ec27c06fd277f6ddf76bdd1c7b0b2e589d03ec205c8a7eb0afcad70 SHA512 9757ce392d08f9de0446963cf5351a66dbc2373426bef26e63d71623df1f7c47d90f6e454649076ded214878e67f321380646da3f76bc0fb57f7eb9bbecd3e7a
-EBUILD python-evdev-0.7.0.ebuild 467 BLAKE2B 496bc7c239c0eb439c7eea657c02f5a450988dc75a7f5d6adfa9946d3e7d5e5cf8106ad43bba58f14478288657b2e859a4d5999afc36fe5043cfb65d7ea0b7b2 SHA512 1c2f9a874408054dedb27764161f31d5bc41c90927760bbc439433896d8879a2f9fa8b3344fcebc07c91983b4c4101771c743eb6f752db8e1656892a00dbecef
+EBUILD python-evdev-0.7.0-r1.ebuild 645 BLAKE2B e63ee394c6c0728625f05c9d790de54fa3562d8ae7c278fbf9ce3dffbf50a9d845673e383debdd00655e5416aaf34ad609e71686b78ff7c4e971b866e89539a7 SHA512 60ec8e3d83f4be8fd85980177745e606fe5c4c2dd19a9ea7ee56c815a9b44e633ac20bba09a8b390efe58b8690ede1e25af21830138287e37b54e0aeb75e6294
 MISC metadata.xml 257 BLAKE2B 5c2ca1a3b14d55f8b7d0dd09b0811de8e397c4f748a58c4133f02e86e9084da2b2afabee2c7fb38f38d97d1a301c6de2dc6c4cf8ad4f91fe55c35b8580e6ff0f SHA512 2214f84571910c807983e21889732fb6b9619cd62bafc51a3743786f42b2c6248f1717ec5936685e767a70a052ec725a7a62c602b9c95fbb8e45838472146304
diff --git a/dev-python/python-evdev/python-evdev-0.7.0-r1.ebuild b/dev-python/python-evdev/python-evdev-0.7.0-r1.ebuild
new file mode 100644
index 000000000000..8f45fd510f8f
--- /dev/null
+++ b/dev-python/python-evdev/python-evdev-0.7.0-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for 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-evdev/python-evdev-0.7.0.ebuild b/dev-python/python-evdev/python-evdev-0.7.0.ebuild
deleted file mode 100644
index 4a7a95efedad..000000000000
--- a/dev-python/python-evdev/python-evdev-0.7.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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}]"
diff --git a/dev-python/python3-lxc/Manifest b/dev-python/python3-lxc/Manifest
index e9ffe9ce13bf..8931b1c59151 100644
--- a/dev-python/python3-lxc/Manifest
+++ b/dev-python/python3-lxc/Manifest
@@ -1,3 +1,5 @@
 DIST python3-lxc-3.0.1.tar.gz 27424 BLAKE2B ffdf128e06d7b256652588af7c464045479ce907d2119dfe9780737c7bd5f3008c01d834a79f63932bfa51e3094a9d40af46c4cb6c3be72108205d65a8ee3d11 SHA512 7e6b6cb9a02e5af8b3fc8aeefff2954c68d2d1154751fa97a70bce86131021571e15db86bb0d6900a93dda78247e37b75cdfe250bf4d1b7548dc8383ed3d45f6
+DIST python3-lxc-3.0.2.tar.gz 27300 BLAKE2B dc4ba71b156eb0f257bf9d717f07f22afee3d00666601b709341d9091a1a75d237c174f613a93b6ecf7c69b4e6cc75187316e656a02a1d52f0e9970b8f3af6ad SHA512 2fc776decf6248be39f9e8a607a967acf180f3a07e45fadd6be4450f01caa4a854f217dcf7e81e27b5b838c2cea04ef09c8ab8b87c5be5091185bba2eb6b6d23
 EBUILD python3-lxc-3.0.1.ebuild 488 BLAKE2B 2647e70a041e8471ba5c319ba18f68bb2633a7314070b43b28f4a1f8a42730175eca28010d807be9128000439f2decb70b5651bf54f265f3b0de018ee44898a3 SHA512 cd2b832892317b2da908180b99d6ba7b231ebf563aee9e963f445dc2793d1cd3d020a40a22d03379e4ea751c2d28b3cac2b77cd9813bc47acc283aabc763db47
+EBUILD python3-lxc-3.0.2.ebuild 490 BLAKE2B cac2dac3adf8d039562baa723e074357be9214e693ac8122b878abae69749c15b33d63f9c291fc4741c9b71894d3ad83914b3b3710eb0883c7ddc0d66a38cd7a SHA512 18ed28c82b929e283f180f276ba901e6a8dd81091b60e6a11f2ed17d5c9d23309985ca6fda5c1801d633cf020cfb0f53a3c6e668cd2b183be7a116132eb3119b
 MISC metadata.xml 475 BLAKE2B 4542a3c6240d1afce6fc554a255ed7097ab9923879241e73a77e391be5ee7f6638aaeb5f28ee859735c8abe412c3e62726aa64d67ce744ee1805bb7375dc1d87 SHA512 9db5e045665924cdcd5aa9d843be61c602440d2a18328db38733091ed0050e3c21f14c280a49c1db1bdcf9ae095b7bc58e50b5f3690e092502da87b2b5fc984a
diff --git a/dev-python/python3-lxc/python3-lxc-3.0.2.ebuild b/dev-python/python3-lxc/python3-lxc-3.0.2.ebuild
new file mode 100644
index 000000000000..2f5864cdfceb
--- /dev/null
+++ b/dev-python/python3-lxc/python3-lxc-3.0.2.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=( python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for LXC"
+HOMEPAGE="https://linuxcontainers.org/lxc/"
+SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=app-emulation/lxc-3.0"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 134cabd1c514..59fef384a1ce 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,7 +1,9 @@
 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
 MISC metadata.xml 593 BLAKE2B 3c4b5ccd30162027c913070a54eb9b836a7add04532e1c5b03dd83f0e4e58da0d2e19aee90f1fa4a97db0008a06575a5b0fe33986e1b0c9d473e4adff056afdd SHA512 91f8918bffb715bfb1def9aa6717a8c4149b36e6a1f79e7e3d4c56e0edc51a6585dad3a93698e956f1ff0e659c1f975c3f23be5a498479fc5052369840ac83d5
diff --git a/dev-python/sip/sip-4.19.13.ebuild b/dev-python/sip/sip-4.19.13.ebuild
new file mode 100644
index 000000000000..728a604c424b
--- /dev/null
+++ b/dev-python/sip/sip-4.19.13.ebuild
@@ -0,0 +1,112 @@
+# 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} )
+
+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/sphinx/Manifest b/dev-python/sphinx/Manifest
index 5ab1684d0974..bfb538339e6f 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -14,5 +14,5 @@ EBUILD sphinx-1.3.5-r1.ebuild 3577 BLAKE2B 2cb4707c8bb3e1dfec094b359cefd4d03fc2a
 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.7.5-r1.ebuild 3130 BLAKE2B 53e026c5b06f96260cca61aebf6bf64b95c412111174afcce0322bd47961e35bdab380473557001dde488a864bbd44d9cfe2e217ecac0c7bcbb6ddcdbc54268d SHA512 4c169d583d4ef1ed05dd2713a60f2fd912265e4e912d7138aaafd63daac9e043081fa466304fb9f78fd0f9d0fae6e2748a6ae508cdb8d350579d5397649ecd98
+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/sphinx-1.7.5-r1.ebuild b/dev-python/sphinx/sphinx-1.7.5-r1.ebuild
index 68cbe615c4e2..12f6fcda60b4 100644
--- a/dev-python/sphinx/sphinx-1.7.5-r1.ebuild
+++ b/dev-python/sphinx/sphinx-1.7.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
@@ -14,9 +14,13 @@ 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"
+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"
 IUSE="doc latex net test"
 
+# Tests automagically use latex, bug 667414
+#REQUIRED_USE="test? ( latex )"
+RESTRICT="!test? ( test )"
+
 RDEPEND="
 	>=dev-python/alabaster-0.7.9[${PYTHON_USEDEP}]
 	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
@@ -54,6 +58,9 @@ DEPEND="${RDEPEND}
 		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
 		virtual/imagemagick-tools[jpeg,png,svg]
 		virtual/python-enum34[${PYTHON_USEDEP}]
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
 	)"
 
 S="${WORKDIR}/${P^}"
diff --git a/dev-python/sphinxcontrib-websupport/Manifest b/dev-python/sphinxcontrib-websupport/Manifest
index 0036ca90954d..4fcc3bec44e2 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 1175 BLAKE2B d5a4707e36ea8b8b5f2bd80ff0b43b81f006d20f29551e32e5a27973f3db4d7f66232367ae8119d35913e535155c20f3c13e2f497c97b82eb49c9aa137cc51e0 SHA512 f044e361c16720f28bc1d20b7ec81d1522034185d30f364bc43430c2519ef615ae2e480f8d6dba05a439189beb98e6849477ddbdd1f2ba74bb6583818197ff0b
+EBUILD sphinxcontrib-websupport-1.1.0.ebuild 1168 BLAKE2B 1fb6ff315b60be5878bfbdfc93c3b35c04f556c5e43477f65a58fd3151cda904547443b411805e3ae3b83a3b5d10659835c782824ac5958e8bfff63fe7d62d8e SHA512 971dafa099def45c7ca298ce7898dea6b10b11e98eaa1179340accccd6e788be01d9e7f3c6ab32d42f717f3725b7c8b617856d535d221db1f93bdf1f6bff9112
 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 a03f6c0a8cb8..1b01a1560b5a 100644
--- a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild
+++ b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-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
@@ -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/sshtunnel/Manifest b/dev-python/sshtunnel/Manifest
new file mode 100644
index 000000000000..1c9fad45059d
--- /dev/null
+++ b/dev-python/sshtunnel/Manifest
@@ -0,0 +1,3 @@
+DIST sshtunnel-0.1.4.tar.gz 48330 BLAKE2B 5fdc5dd602274a16025f250fcc3a36453a17c921f51367cac0cb0ef36be6251f687b53b1df6072d1e32456a5c0fa5ec6d2fd8e5d4874977a641a6c9ba81ac57c SHA512 c228fe79cf5172c950777a40b27ababd42a31b7aad8a8472d55a2b3babf5aa4c5308799bb271f33f0e943c309eb9adedee321045a03324cb5e30a385178751ca
+EBUILD sshtunnel-0.1.4.ebuild 575 BLAKE2B d6408d3fe496b1eb3b10c5eb11a21b04186895d9b4c0bf3202ce7a986a965a9ee545a99ccd420c2beef8ce9b279add4d7d3a6c7eab68998ceec2ca48edeb81af SHA512 caf5a481bdca8e9ea2cd0227c2f83e07e7973d901c05cacf78d667131baa5cfcae7467eaa52a42323fe2271f2d1daac0498789856496adbfb1704cc947a6e7ac
+MISC metadata.xml 253 BLAKE2B 34807135fdbc8396660d3fa85339e80c0c14693b937e360de963062b40d1a4306d86c3f6fbe60c45146632f934695d26c06083a2977031c36bdee17f57140f72 SHA512 06255a02d9a177532c33fb7a9271f8f538cef82354feb7689c839e2eb1516d53fd0e78aca22fee2f9a19dbf1e3f7ad96dea23c8d97efdac952e4b754314664d9
diff --git a/dev-python/sshtunnel/metadata.xml b/dev-python/sshtunnel/metadata.xml
new file mode 100644
index 000000000000..b3c1d365eaad
--- /dev/null
+++ b/dev-python/sshtunnel/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>titanofold@gentoo.org</email>
+		<name>Aaron W. Swenson</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/sshtunnel/sshtunnel-0.1.4.ebuild b/dev-python/sshtunnel/sshtunnel-0.1.4.ebuild
new file mode 100644
index 000000000000..4aeb081ac92f
--- /dev/null
+++ b/dev-python/sshtunnel/sshtunnel-0.1.4.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=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure python SSH tunnels"
+HOMEPAGE="https://pypi.python.org/pypi/sshtunnel"
+SRC_URI="mirror://pypi/s/sshtunnel/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86 ~arm"
+LICENSE="MIT"
+SLOT="0"
+
+IUSE="test"
+
+RDEPEND="dev-python/paramiko[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/tox[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/statsmodels/Manifest b/dev-python/statsmodels/Manifest
index 78e268773ca4..576dfc3820e5 100644
--- a/dev-python/statsmodels/Manifest
+++ b/dev-python/statsmodels/Manifest
@@ -2,7 +2,9 @@ AUX statsmodels-0.6.1-numpy-1.10.patch 910 BLAKE2B cfff850a68733641fdad5913529e6
 AUX statsmodels-0.6.1-pandas-0.17.0.patch 1043 BLAKE2B 0473214de500e911a36cf3ba645b57536ea6ada17f7123d193d31fb266ba07724aad7297cd705b51b34a394791656a72b891ab94cbf3969935b59324813a0100 SHA512 0a4394d672105337fd03d435a402dbd31862a39b8010658f859114ed9694de9be4d6c3d641b5f385986a6651f0434a3602659d7192bf99f749e49f33f53a634b
 DIST statsmodels-0.6.1.tar.gz 6980841 BLAKE2B 5ac16df0fc06d051cc79d037bd3a9b097526498a48cdc0bf750babd5915f27a0dea23d8869a5101c62bb780ec0c54c503a766c7da6db59fb8d10dc65c70268b1 SHA512 9047b8cf4b9d19bd697867cecef1c4608fd86f3d16e67e44d8c152e1e25918f5aff6b4843c58395e71614be401551e3e48d4dcf158480cbdb45d9735b1c5ea77
 DIST statsmodels-0.8.0.tar.gz 9464851 BLAKE2B f4bcf38c0292dcdfef9e3e34519f4dff004795bf76f54773f551c6c767f16f9cee0a2756408cff6f727df8eebc269bccf2c8bd28915a729eb022eba34831628e SHA512 32bb7f36acc16796c445e5f695d958af4525fbbb2d374376fb4a73c972e3796fad05532456cef4aa5ee59d6fce11921174e17bbfc2e05d2488ce1ceac5175239
+DIST statsmodels-0.9.0.tar.gz 12658359 BLAKE2B 1b451edc281ac8bfd35441d7f31ff02c7068b854c06a5e50fcb6fb2ff3c023bbee264a25407078f99ca08e467676a32c1a0156dec668673bad3e8d7a46a95154 SHA512 a0310129ee915dce5006e4e40190d19c3a09facad398ff089fa4a244d51a035f9591267fd8d34a00ce82e4cab893df96787596f9d350d878e97a0bb3305f1bd5
 EBUILD statsmodels-0.6.1.ebuild 1790 BLAKE2B fcb7c3ad951c5bad5ea3d5bf6e373db02a75b1a210e751c5a98353818103e616114cd86edc3caa42df81bb72cf3e9bd88ee69421913ef0dafc3f7bf49f7f12af SHA512 0db7b9c98d5d9b2a6436c073bcc2172c5b9938f0f4cd5c7256ebe4e5725dc65b3dac80186397d2516b5a5fd29fc6db93afc0caf031d239010b0ef07685c6224a
 EBUILD statsmodels-0.8.0.ebuild 1954 BLAKE2B 660db988aff6c18c625065226a560f3740780ab20afeba4b4deff8a740a789ace1593e420cda8e7503f69fbc2a8f95a01e539fde60d46c3783e81d12948c10e9 SHA512 48f61224be4b2b960a147cdcef7d28e1f1d4eefce6f7526e16816a350fa75a24854fad5b49715081f749b8812f79aac07ae3ff88a031a02b7943191e4780fdc0
-EBUILD statsmodels-9999.ebuild 1919 BLAKE2B 4fc6380ed66d02d713ac95d3e4df8ccd5ccd664728145cbd5efeef37e3582b9fb3c5eb7f7b3dd7d66b00494687e822723dd391fba144cba1ab9dab33e85b3862 SHA512 be09fd1121ea2beee8e307df2bf9c6e822006e22f70d95bd11cdacea2c67962dd39a2c6b17e7f618eacfca354cbd9bf78ae95cc9bcf711c3d6c18f3c2040d6ca
-MISC metadata.xml 1075 BLAKE2B 86672821dcfcd4f52b35f953c2024646ac8bcd937b30ce7fd8c0d1411d5cefe64cc7e8943d1b073c81fbbb4cdee348b30c93fd8145651088f8f88d01ca9e742d SHA512 7e9c385a1820da33e55db49d582d750f01fd11c0dd1616470f2cd71f12c673010cf76c8af984472daa8787704d353f2d42f60798e419d182c9e24ba4dd7dd97f
+EBUILD statsmodels-0.9.0.ebuild 3415 BLAKE2B 015330f04ba36101b8165b3e8c04281dd9f5d8f6614740d655053759618c465e9b569c159340bb7831b9754852406662b807e0c7f20bbec7ba792628e9d4a3d4 SHA512 1f37a380a0b9d2a2b7197f588103d9dbe864fde788dced0652a1c88c03c32a2c8f777904fdad965baed28b80b43b8046d9d6045ccbbe4845ca22da3672658d28
+EBUILD statsmodels-9999.ebuild 1964 BLAKE2B 400467949cd23f02a0ae92ed9d7725236046cfbf640758dd0a36402da54d7e1703d7306f033fe3b52bb9818de2983c8c88fe51299b3bfba7d278c8b0e6d98d78 SHA512 2c3f726e88b257952b396185e378a4ba4dfb0f626b39e27acd88aa0d9d8e55d65171960de882bab107642327af84c0a132cc424fc1d598e2be0a78a14b546f64
+MISC metadata.xml 1318 BLAKE2B 5e5ef8e0dae2bed3ba7d999d824c416d82515a26e6f99968e1cec7de5ef159caa3de7da3c5fc47a1e3e0a5251bbc542a10210204fb5045d35d1acc45b5030090 SHA512 8c554b8e55d88a7c5ed0bd29379ea1fe41b64e9d354ba584756f706ce1fc5857068c546138b49fb8af778c5401aae7169bb30413f6f209db9371441cb956ae91
diff --git a/dev-python/statsmodels/metadata.xml b/dev-python/statsmodels/metadata.xml
index cb9b89704bd8..72014447a73d 100644
--- a/dev-python/statsmodels/metadata.xml
+++ b/dev-python/statsmodels/metadata.xml
@@ -9,6 +9,14 @@
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>
+  <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">
     statsmodels is a Python module that allows users to explore data,
     estimate statistical models, and perform statistical tests. An
diff --git a/dev-python/statsmodels/statsmodels-0.9.0.ebuild b/dev-python/statsmodels/statsmodels-0.9.0.ebuild
new file mode 100644
index 000000000000..95b3326d4d7e
--- /dev/null
+++ b/dev-python/statsmodels/statsmodels-0.9.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Statistical computations and models for use with SciPy"
+HOMEPAGE="https://www.statsmodels.org/stable/index.html"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+COMMON_DEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.23.0[${PYTHON_USEDEP}]
+	dev-python/patsy[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+"
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/jupyter_client[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/nbconvert[${PYTHON_USEDEP}]
+		dev-python/nbformat[${PYTHON_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		)
+"
+
+python_prepare_all() {
+	# Prevent un-needed d'loading
+	sed -e "/sphinx.ext.intersphinx/d" -i docs/source/conf.py || die
+	export VARTEXFONTS="${T}"/fonts
+	export MPLCONFIGDIR="${T}"
+	echo "backend : Agg" > "${MPLCONFIGDIR}"/matplotlibrc || die
+	if use test; then
+		# Errors reported upstream: https://github.com/statsmodels/statsmodels/issues/4850
+		rm statsmodels/tsa/tests/test_tsa_indexes.py || die
+		sed -i -e \
+			"/def test_start_params_bug():/i@pytest.mark.xfail(reason='Known to fail on Gentoo')" \
+			statsmodels/tsa/tests/test_arima.py || die
+		sed -i -e \
+			"s/def test_pandas_endog():/def _test_pandas_endog():/g" \
+			statsmodels/tsa/statespace/tests/test_mlemodel.py || die
+		sed -i -e \
+			"/def test_all_datasets():/i@pytest.mark.xfail(reason='Known to fail on Gentoo')" \
+			statsmodels/datasets/tests/test_data.py || die
+		sed -i -e \
+			"/def test_issue_339():/i@pytest.mark.xfail(reason='Known to fail on Gentoo')" \
+			statsmodels/discrete/tests/test_discrete.py || die
+		sed -i \
+			-e "s/def test_hdr_multiple_alpha():/def _test_hdr_multiple_alpha():/g" \
+			statsmodels/graphics/tests/test_functional.py || die
+		sed -i \
+			-e '1s/^/import pytest \n/' \
+			-e "/def test_single_factor_repeated_measures_anova():/i@pytest.mark.xfail(reason='Known to fail on Gentoo with Python 3')" \
+			-e "/def test_two_factors_repeated_measures_anova():/i@pytest.mark.xfail(reason='Known to fail on Gentoo with Python 3')" \
+			-e "/def test_three_factors_repeated_measures_anova():/i@pytest.mark.xfail(reason='Known to fail on Gentoo with Python 3')" \
+			-e "/def test_repeated_measures_aggregate_compare_with_ezANOVA():/i@pytest.mark.xfail(reason='Known to fail on Gentoo with Python 3')" \
+			statsmodels/stats/tests/test_anova_rm.py || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx -b html --build-dir=docs/build
+}
+
+python_test() {
+	cd "${BUILD_DIR}" || die
+	py.test -v || die
+}
+
+python_install_all() {
+	find . -name \*LICENSE.txt -delete || die
+	use doc && HTML_DOCS=( docs/build/html/. )
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Plotting functionality" "dev-python/matplotlib"
+}
diff --git a/dev-python/statsmodels/statsmodels-9999.ebuild b/dev-python/statsmodels/statsmodels-9999.ebuild
index a3afaa73d94b..51855998071e 100644
--- a/dev-python/statsmodels/statsmodels-9999.ebuild
+++ b/dev-python/statsmodels/statsmodels-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit distutils-r1 git-r3 virtualx
 
@@ -38,7 +38,7 @@ DEPEND="${CDEPEND}
 		dev-python/numpydoc[${PYTHON_USEDEP}]
 		dev-python/sphinx[${PYTHON_USEDEP}]
 	)
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
 
 python_prepare_all() {
@@ -60,7 +60,7 @@ python_compile_all() {
 
 python_test() {
 	cd "${BUILD_DIR}" || die
-	virtx nosetests -v || die
+	${EPYTHON} -c 'import statsmodels; statsmodels.test(exit=True)' || die
 }
 
 python_install_all() {
diff --git a/dev-python/zstandard/Manifest b/dev-python/zstandard/Manifest
index bc1aa804281e..f13738d746b0 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 543 BLAKE2B 8ed93e486db71a00c07b722aefa003579c4e44be9cb4e895b9a4e87fa1c7664ec166d46f5fa545e8a9bf78156f3854ff08714a0f20f1d0b266ed4922919226c2 SHA512 0c48a1ef7fb9c256c32df684e1c4a803daabc54e14b3daf121f494c2675d3ef006c43d2590221a528767919683c50d0312a6ec68d2de4c9749bacb919277574a
+EBUILD zstandard-0.8.1.ebuild 545 BLAKE2B b503b32da86afccb1907dea8a672fa28aeb803c5f5cbf8325b0ea24945b7addce2e30839dff215a1475d0a096ec2299d5e19ad1753a3c0d3e566016f6f218687 SHA512 763315e68624772ca90a35cf70b7995cefeee53af7c2ed6746573446843c6b3c6d998514629084397a36072e3fff8447f7c653c7edf059fa1f21b85ded8162fa
 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 1ec08922ecf0..315469ccdaac 100644
--- a/dev-python/zstandard/zstandard-0.8.1.ebuild
+++ b/dev-python/zstandard/zstandard-0.8.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"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~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 6aa6bc6c433b..fcf82558e126 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest
index 887d17938ef1..c388eba364f2 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/Manifest
@@ -1,5 +1,5 @@
 DIST qtlocation-everywhere-src-5.11.1.tar.xz 5593144 BLAKE2B cd9fe409ecc3f3dde665f4bb77f93d515b88bce382655adcbfc9f60b7f7446abe800a91d612fa4b379efa9a783a4158ed34ff1ce11b3ea929e087062d0fa6f1a SHA512 8b89aae5bb7caa0999c20c86da1a356e5ba21e1e12ac892a695d180f21527846aa45f926828934b83147b851145477028ff1212802c1c21f8f6bb4e616b8b1fd
 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.9.6.ebuild 819 BLAKE2B 5a0fabf81c6e4900505c0c28cfcfe7f70bc61ee1a47c8fd563d0f6de1706a0213fc30c653f14906f7643b090ae23abe8628b8adefccb4761a4e7888d9e20c3a1 SHA512 143e3f568411a3c0ec1af5e8530fdd1485457d14f49bd863f46a3dce9657f4a3292f1ef1c43ec8e9017f58e7e7a73f1b7f5147739e95288a66cb965c227ff582
+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.9.6.ebuild b/dev-qt/qtpositioning/qtpositioning-5.9.6.ebuild
index 00c53b162648..dcec5cc776bb 100644
--- a/dev-qt/qtpositioning/qtpositioning-5.9.6.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.9.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
@@ -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 ~sparc x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 IUSE="geoclue qml"
diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index f5ef2cf43ef2..34a709736e57 100644
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
diff --git a/dev-ros/pr2_dashboard_aggregator/Manifest b/dev-ros/pr2_dashboard_aggregator/Manifest
index 090e865f9aac..3d897cdbf602 100644
--- a/dev-ros/pr2_dashboard_aggregator/Manifest
+++ b/dev-ros/pr2_dashboard_aggregator/Manifest
@@ -6,6 +6,7 @@ DIST pr2_common-1.11.9.tar.gz 33337556 BLAKE2B b743f4fcde9b3688d3630ce42e5f194fd
 DIST pr2_common-1.12.0.tar.gz 33598910 BLAKE2B 3c44fe6ba6214d0c35ca674f5433a89bb6ba703bf5522615bd67912cb077f7ebf1eb9239fa8f076dc4bd813f89fa341617301ac873166ddbd43243d8e5001661 SHA512 da933ff9521a9337198a890e0ba10281510b861b4bff3023e7d251251f7ef7f8579f86b2992238975329c5c63ecdf00b17e895f1e0dec4e180336860fdd0c921
 DIST pr2_common-1.12.1.tar.gz 33597926 BLAKE2B eef3676b2ad029514aef09c09b4e463246397c2fd605b60bdba355e54ce44b1248efe6eef02e0303fd347f8c9b6b8965abafccee07b1f77e70f6e7db4a12a5e5 SHA512 e74be6f0507b1a7ae0fa385a06ff0a960661c5f0ec723bd7ac6d4782d4a61e3b4a95fda5cd09b37ed62ecf72be7c9c55132d3967644211c957c224717bc15485
 DIST pr2_common-1.12.2.tar.gz 33598279 BLAKE2B e381e14b965d675a7cbf14a652f633514dfe72a4bf1d7b8808164da79c7cba63b47b405c8b57482a20a3b6284f0f5f957df1f97ea4699a4c0888936d2d4930a5 SHA512 29794f7ea5aaff0082ec9496f1b29bc7a1ea71694993a03832b039c655f3ba29cd322db3665401b2a1b5715d0d6793d19a7ab93f7fe5e891369ead5fbefed95a
+DIST pr2_common-1.12.3.tar.gz 33597275 BLAKE2B fbbfa933bea8ecd18b988e5bce1c31365718a97ddbfcb698bb901066eff1191293e377d97a3174b501b07ff5f3011b00d19c0843a63e5777a2b5fb6ee4b559cb SHA512 423eb73634a0c2ab9b4f89a902a7dbb8e416f80815e591ad8fd24de4b92c8b7ea0312196ad0697d181fa6157603b082645590d0cdb7216186e4c5cba27fb68da
 EBUILD pr2_dashboard_aggregator-1.11.10.ebuild 542 BLAKE2B e20d9749d106b41ca81569afd435b421b00dfea3120f3307aedcc261251b62864881c535564e740dcc29320ee6070ccd9ede47a21cb81c7b8bfe65d7ba680c0f SHA512 7ebbb6f010406152aafe02eb779568688c39c6ad426cb1c92adaa8656637fb406ac68d97df4849d90b6051a2fe7a4274cc38ec3d6aeed96b529e60347fce5ca4
 EBUILD pr2_dashboard_aggregator-1.11.11.ebuild 542 BLAKE2B e20d9749d106b41ca81569afd435b421b00dfea3120f3307aedcc261251b62864881c535564e740dcc29320ee6070ccd9ede47a21cb81c7b8bfe65d7ba680c0f SHA512 7ebbb6f010406152aafe02eb779568688c39c6ad426cb1c92adaa8656637fb406ac68d97df4849d90b6051a2fe7a4274cc38ec3d6aeed96b529e60347fce5ca4
 EBUILD pr2_dashboard_aggregator-1.11.13.ebuild 542 BLAKE2B e20d9749d106b41ca81569afd435b421b00dfea3120f3307aedcc261251b62864881c535564e740dcc29320ee6070ccd9ede47a21cb81c7b8bfe65d7ba680c0f SHA512 7ebbb6f010406152aafe02eb779568688c39c6ad426cb1c92adaa8656637fb406ac68d97df4849d90b6051a2fe7a4274cc38ec3d6aeed96b529e60347fce5ca4
@@ -14,5 +15,6 @@ EBUILD pr2_dashboard_aggregator-1.11.9.ebuild 542 BLAKE2B e20d9749d106b41ca81569
 EBUILD pr2_dashboard_aggregator-1.12.0.ebuild 542 BLAKE2B e20d9749d106b41ca81569afd435b421b00dfea3120f3307aedcc261251b62864881c535564e740dcc29320ee6070ccd9ede47a21cb81c7b8bfe65d7ba680c0f SHA512 7ebbb6f010406152aafe02eb779568688c39c6ad426cb1c92adaa8656637fb406ac68d97df4849d90b6051a2fe7a4274cc38ec3d6aeed96b529e60347fce5ca4
 EBUILD pr2_dashboard_aggregator-1.12.1.ebuild 542 BLAKE2B c2b9b70732d96c9b4828346afeb160ac782a35680e31d2198f1994f466f11a30d0d1aa2a77e864338f3430a617f74de43a577c61f0543973d67984d25f95c2c2 SHA512 001482e1ee8659473f59a9ba338d759712bc6fa5b775438cece7df5a16a309bd3caa7be436b598e2bc3d825b0f0c215f7dcd28cd87b55aaba2e96737aabe4b4e
 EBUILD pr2_dashboard_aggregator-1.12.2.ebuild 542 BLAKE2B c2b9b70732d96c9b4828346afeb160ac782a35680e31d2198f1994f466f11a30d0d1aa2a77e864338f3430a617f74de43a577c61f0543973d67984d25f95c2c2 SHA512 001482e1ee8659473f59a9ba338d759712bc6fa5b775438cece7df5a16a309bd3caa7be436b598e2bc3d825b0f0c215f7dcd28cd87b55aaba2e96737aabe4b4e
+EBUILD pr2_dashboard_aggregator-1.12.3.ebuild 539 BLAKE2B e42f74b6dff1ad6118836842d37f6d1f8d31591d17c2114d0828df47de870faf013f1e471128f25412c806296f325f5bd8cccc0866d9ccbaac46a897d47c5ff0 SHA512 2467e53e347b739fd7e114238b584f737ec40da4b778c37ff75cf257bd408069f8a7254e4eb8fa05a4f561c68f0a5353f4383201da5ee2430bee0899b9d19344
 EBUILD pr2_dashboard_aggregator-9999.ebuild 542 BLAKE2B e20d9749d106b41ca81569afd435b421b00dfea3120f3307aedcc261251b62864881c535564e740dcc29320ee6070ccd9ede47a21cb81c7b8bfe65d7ba680c0f SHA512 7ebbb6f010406152aafe02eb779568688c39c6ad426cb1c92adaa8656637fb406ac68d97df4849d90b6051a2fe7a4274cc38ec3d6aeed96b529e60347fce5ca4
 MISC metadata.xml 328 BLAKE2B 2d51f6fac18e20274b308b8de5aeb2ad80a4b118697ca1c93dc5c0350e8a7ae2e7c14d7a84692d0b7fb5da114e4fb7ad39d93d7d5831c5a09589add99aa5f6da SHA512 2f52806adfce77e7d54809d57a0b8b59b26f25da96f50f10672ed76ce8bda8e4555f1531af953e61cd1cfa82d46d46a3760b12b537ffcc191407125604abcbbc
diff --git a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.3.ebuild b/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.3.ebuild
new file mode 100644
index 000000000000..dc803c9232fa
--- /dev/null
+++ b/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/pr2/pr2_common"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Aggregates all of the topics that a 'pr2_dashboard' app might be interested in"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/pr2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_description/Manifest b/dev-ros/pr2_description/Manifest
index 53f3413e3804..30d99b8e7b07 100644
--- a/dev-ros/pr2_description/Manifest
+++ b/dev-ros/pr2_description/Manifest
@@ -2,8 +2,10 @@ AUX tests.patch 582 BLAKE2B 33a4ebdb4e3cb56f3dda7d16d8d952bfb72ec883e2ebabd2a19a
 DIST pr2_common-1.12.0.tar.gz 33598910 BLAKE2B 3c44fe6ba6214d0c35ca674f5433a89bb6ba703bf5522615bd67912cb077f7ebf1eb9239fa8f076dc4bd813f89fa341617301ac873166ddbd43243d8e5001661 SHA512 da933ff9521a9337198a890e0ba10281510b861b4bff3023e7d251251f7ef7f8579f86b2992238975329c5c63ecdf00b17e895f1e0dec4e180336860fdd0c921
 DIST pr2_common-1.12.1.tar.gz 33597926 BLAKE2B eef3676b2ad029514aef09c09b4e463246397c2fd605b60bdba355e54ce44b1248efe6eef02e0303fd347f8c9b6b8965abafccee07b1f77e70f6e7db4a12a5e5 SHA512 e74be6f0507b1a7ae0fa385a06ff0a960661c5f0ec723bd7ac6d4782d4a61e3b4a95fda5cd09b37ed62ecf72be7c9c55132d3967644211c957c224717bc15485
 DIST pr2_common-1.12.2.tar.gz 33598279 BLAKE2B e381e14b965d675a7cbf14a652f633514dfe72a4bf1d7b8808164da79c7cba63b47b405c8b57482a20a3b6284f0f5f957df1f97ea4699a4c0888936d2d4930a5 SHA512 29794f7ea5aaff0082ec9496f1b29bc7a1ea71694993a03832b039c655f3ba29cd322db3665401b2a1b5715d0d6793d19a7ab93f7fe5e891369ead5fbefed95a
+DIST pr2_common-1.12.3.tar.gz 33597275 BLAKE2B fbbfa933bea8ecd18b988e5bce1c31365718a97ddbfcb698bb901066eff1191293e377d97a3174b501b07ff5f3011b00d19c0843a63e5777a2b5fb6ee4b559cb SHA512 423eb73634a0c2ab9b4f89a902a7dbb8e416f80815e591ad8fd24de4b92c8b7ea0312196ad0697d181fa6157603b082645590d0cdb7216186e4c5cba27fb68da
 EBUILD pr2_description-1.12.0.ebuild 549 BLAKE2B 261499258b614a14fa77defd99c39031d0c91a1e278f71084ade80392b3fddc89057deaf10847f8d8ef76c12c2a67a412f7c531d88677f7740445dd43cbb1d0e SHA512 7fbcc6f38b7363adcdb226d8b8a30c404f62477f5fbdfd17d89b263ffd2f29fff3d24d6af51145484857a9485d922d3079db06e470b42ef7f05093e7717a1ccf
 EBUILD pr2_description-1.12.1.ebuild 549 BLAKE2B 9dc330a03b139dc0a9d3a4392bffdcc5061761ab85432c10365043c67de4110e52ab66cbee00b5b754f777723dbcf713b9cbcd6fa7b7fdf818674b5f9d77c2ff SHA512 555ea9ae0e9527403c295606b3d1cdded292282fdaf89590ee042915acc08d064a65e1dc8daf74a29e67d8b43e3bb7100b9a6c9e86f2f0c7da82906401c6dc4d
 EBUILD pr2_description-1.12.2.ebuild 549 BLAKE2B 9dc330a03b139dc0a9d3a4392bffdcc5061761ab85432c10365043c67de4110e52ab66cbee00b5b754f777723dbcf713b9cbcd6fa7b7fdf818674b5f9d77c2ff SHA512 555ea9ae0e9527403c295606b3d1cdded292282fdaf89590ee042915acc08d064a65e1dc8daf74a29e67d8b43e3bb7100b9a6c9e86f2f0c7da82906401c6dc4d
-EBUILD pr2_description-9999.ebuild 549 BLAKE2B 261499258b614a14fa77defd99c39031d0c91a1e278f71084ade80392b3fddc89057deaf10847f8d8ef76c12c2a67a412f7c531d88677f7740445dd43cbb1d0e SHA512 7fbcc6f38b7363adcdb226d8b8a30c404f62477f5fbdfd17d89b263ffd2f29fff3d24d6af51145484857a9485d922d3079db06e470b42ef7f05093e7717a1ccf
+EBUILD pr2_description-1.12.3.ebuild 508 BLAKE2B 7f8fd26973b137fa104e5ea8563206776d83dc1f63236897b3b981c484745c77ea6401b44260bf138f0952f28cc164fc1ba8b8ff87e77d388dc1077ed79c07b4 SHA512 c604c0e50604781da7ec5a349b2c16c2a132690212f11ea241230ab446984890326a4ca0cdea0d2d5592e09603c5fd122c29737912fa330ed8b07eafb6b11078
+EBUILD pr2_description-9999.ebuild 508 BLAKE2B 7f8fd26973b137fa104e5ea8563206776d83dc1f63236897b3b981c484745c77ea6401b44260bf138f0952f28cc164fc1ba8b8ff87e77d388dc1077ed79c07b4 SHA512 c604c0e50604781da7ec5a349b2c16c2a132690212f11ea241230ab446984890326a4ca0cdea0d2d5592e09603c5fd122c29737912fa330ed8b07eafb6b11078
 MISC metadata.xml 328 BLAKE2B 2d51f6fac18e20274b308b8de5aeb2ad80a4b118697ca1c93dc5c0350e8a7ae2e7c14d7a84692d0b7fb5da114e4fb7ad39d93d7d5831c5a09589add99aa5f6da SHA512 2f52806adfce77e7d54809d57a0b8b59b26f25da96f50f10672ed76ce8bda8e4555f1531af953e61cd1cfa82d46d46a3760b12b537ffcc191407125604abcbbc
diff --git a/dev-ros/pr2_description/pr2_description-1.12.3.ebuild b/dev-ros/pr2_description/pr2_description-1.12.3.ebuild
new file mode 100644
index 000000000000..3f2d184f517e
--- /dev/null
+++ b/dev-ros/pr2_description/pr2_description-1.12.3.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/pr2/pr2_common"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Description (mechanical, kinematic, visual,  etc.) of the PR2 robot"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/xacro[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-ros/convex_decomposition
+	dev-ros/ivcon
+	test? ( dev-libs/urdfdom dev-cpp/gtest )"
diff --git a/dev-ros/pr2_description/pr2_description-9999.ebuild b/dev-ros/pr2_description/pr2_description-9999.ebuild
index 1a73af70cf05..3f2d184f517e 100644
--- a/dev-ros/pr2_description/pr2_description-9999.ebuild
+++ b/dev-ros/pr2_description/pr2_description-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
@@ -19,4 +19,3 @@ DEPEND="${RDEPEND}
 	dev-ros/convex_decomposition
 	dev-ros/ivcon
 	test? ( dev-libs/urdfdom dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/tests.patch" )
diff --git a/dev-ros/pr2_machine/Manifest b/dev-ros/pr2_machine/Manifest
index 5b027eb4736f..d43c3e0aa7a9 100644
--- a/dev-ros/pr2_machine/Manifest
+++ b/dev-ros/pr2_machine/Manifest
@@ -6,6 +6,7 @@ DIST pr2_common-1.11.9.tar.gz 33337556 BLAKE2B b743f4fcde9b3688d3630ce42e5f194fd
 DIST pr2_common-1.12.0.tar.gz 33598910 BLAKE2B 3c44fe6ba6214d0c35ca674f5433a89bb6ba703bf5522615bd67912cb077f7ebf1eb9239fa8f076dc4bd813f89fa341617301ac873166ddbd43243d8e5001661 SHA512 da933ff9521a9337198a890e0ba10281510b861b4bff3023e7d251251f7ef7f8579f86b2992238975329c5c63ecdf00b17e895f1e0dec4e180336860fdd0c921
 DIST pr2_common-1.12.1.tar.gz 33597926 BLAKE2B eef3676b2ad029514aef09c09b4e463246397c2fd605b60bdba355e54ce44b1248efe6eef02e0303fd347f8c9b6b8965abafccee07b1f77e70f6e7db4a12a5e5 SHA512 e74be6f0507b1a7ae0fa385a06ff0a960661c5f0ec723bd7ac6d4782d4a61e3b4a95fda5cd09b37ed62ecf72be7c9c55132d3967644211c957c224717bc15485
 DIST pr2_common-1.12.2.tar.gz 33598279 BLAKE2B e381e14b965d675a7cbf14a652f633514dfe72a4bf1d7b8808164da79c7cba63b47b405c8b57482a20a3b6284f0f5f957df1f97ea4699a4c0888936d2d4930a5 SHA512 29794f7ea5aaff0082ec9496f1b29bc7a1ea71694993a03832b039c655f3ba29cd322db3665401b2a1b5715d0d6793d19a7ab93f7fe5e891369ead5fbefed95a
+DIST pr2_common-1.12.3.tar.gz 33597275 BLAKE2B fbbfa933bea8ecd18b988e5bce1c31365718a97ddbfcb698bb901066eff1191293e377d97a3174b501b07ff5f3011b00d19c0843a63e5777a2b5fb6ee4b559cb SHA512 423eb73634a0c2ab9b4f89a902a7dbb8e416f80815e591ad8fd24de4b92c8b7ea0312196ad0697d181fa6157603b082645590d0cdb7216186e4c5cba27fb68da
 EBUILD pr2_machine-1.11.10.ebuild 374 BLAKE2B 328603f1a10dcf0c34c63b76515964a0e8514e62c8e356e8df6e4e17ee3765da5326d2a2ec628f577e0628b9f4801c3542c169610c4397c931a817c4caaae25f SHA512 15a3a75c42f9e8994cca266310d20891c03be14996f7ed163e75f8cbee18d0dc433ca4570119069e2b7fc482237955db8dd3672ef11d43bfa925b0a7c904bbe5
 EBUILD pr2_machine-1.11.11.ebuild 374 BLAKE2B 328603f1a10dcf0c34c63b76515964a0e8514e62c8e356e8df6e4e17ee3765da5326d2a2ec628f577e0628b9f4801c3542c169610c4397c931a817c4caaae25f SHA512 15a3a75c42f9e8994cca266310d20891c03be14996f7ed163e75f8cbee18d0dc433ca4570119069e2b7fc482237955db8dd3672ef11d43bfa925b0a7c904bbe5
 EBUILD pr2_machine-1.11.13.ebuild 374 BLAKE2B 328603f1a10dcf0c34c63b76515964a0e8514e62c8e356e8df6e4e17ee3765da5326d2a2ec628f577e0628b9f4801c3542c169610c4397c931a817c4caaae25f SHA512 15a3a75c42f9e8994cca266310d20891c03be14996f7ed163e75f8cbee18d0dc433ca4570119069e2b7fc482237955db8dd3672ef11d43bfa925b0a7c904bbe5
@@ -14,5 +15,6 @@ EBUILD pr2_machine-1.11.9.ebuild 374 BLAKE2B 328603f1a10dcf0c34c63b76515964a0e85
 EBUILD pr2_machine-1.12.0.ebuild 374 BLAKE2B 328603f1a10dcf0c34c63b76515964a0e8514e62c8e356e8df6e4e17ee3765da5326d2a2ec628f577e0628b9f4801c3542c169610c4397c931a817c4caaae25f SHA512 15a3a75c42f9e8994cca266310d20891c03be14996f7ed163e75f8cbee18d0dc433ca4570119069e2b7fc482237955db8dd3672ef11d43bfa925b0a7c904bbe5
 EBUILD pr2_machine-1.12.1.ebuild 374 BLAKE2B 86ba2f0c3dcd06f19e3ea626bc745a5f42ea031ca5d86513661bc410d19d0a4f61b22ce66706ab01eec93e3f1c21d12c6c5b426dfed40a6881fbebaab4835d4f SHA512 62836154f2aee2c4a3167d70ee6ad98472e28f9d603d1e3627bf56e99f6358f4839ef8a355880a156562f03f3bb7e9af52dc64a12f6e648d1100459262b1b251
 EBUILD pr2_machine-1.12.2.ebuild 374 BLAKE2B 86ba2f0c3dcd06f19e3ea626bc745a5f42ea031ca5d86513661bc410d19d0a4f61b22ce66706ab01eec93e3f1c21d12c6c5b426dfed40a6881fbebaab4835d4f SHA512 62836154f2aee2c4a3167d70ee6ad98472e28f9d603d1e3627bf56e99f6358f4839ef8a355880a156562f03f3bb7e9af52dc64a12f6e648d1100459262b1b251
+EBUILD pr2_machine-1.12.3.ebuild 371 BLAKE2B 890080c116eee84c9b928748f20a59362b4c45ad07ceeb3a5f517c30c184d649ef5cbdf43266dee43cd1c5b218c732e7b3be8d7193e25799dc0072f8f4a251b8 SHA512 250bb1143f90cb18517ae4bcc9ad2386b8c256dea0edb40d513bc865366d67ac54928a0a9bc415ed99a14c4cfe9a72fc22e1bde63d37475195b090e20131c802
 EBUILD pr2_machine-9999.ebuild 374 BLAKE2B 328603f1a10dcf0c34c63b76515964a0e8514e62c8e356e8df6e4e17ee3765da5326d2a2ec628f577e0628b9f4801c3542c169610c4397c931a817c4caaae25f SHA512 15a3a75c42f9e8994cca266310d20891c03be14996f7ed163e75f8cbee18d0dc433ca4570119069e2b7fc482237955db8dd3672ef11d43bfa925b0a7c904bbe5
 MISC metadata.xml 328 BLAKE2B 2d51f6fac18e20274b308b8de5aeb2ad80a4b118697ca1c93dc5c0350e8a7ae2e7c14d7a84692d0b7fb5da114e4fb7ad39d93d7d5831c5a09589add99aa5f6da SHA512 2f52806adfce77e7d54809d57a0b8b59b26f25da96f50f10672ed76ce8bda8e4555f1531af953e61cd1cfa82d46d46a3760b12b537ffcc191407125604abcbbc
diff --git a/dev-ros/pr2_machine/pr2_machine-1.12.3.ebuild b/dev-ros/pr2_machine/pr2_machine-1.12.3.ebuild
new file mode 100644
index 000000000000..ba2219be56f3
--- /dev/null
+++ b/dev-ros/pr2_machine/pr2_machine-1.12.3.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/pr2/pr2_common"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="xxx.machine files that describe the different hosts a node can be spawned on"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_msgs/Manifest b/dev-ros/pr2_msgs/Manifest
index 5dd870dd5f66..e31f5db6fa36 100644
--- a/dev-ros/pr2_msgs/Manifest
+++ b/dev-ros/pr2_msgs/Manifest
@@ -1,8 +1,10 @@
 DIST pr2_common-1.12.0.tar.gz 33598910 BLAKE2B 3c44fe6ba6214d0c35ca674f5433a89bb6ba703bf5522615bd67912cb077f7ebf1eb9239fa8f076dc4bd813f89fa341617301ac873166ddbd43243d8e5001661 SHA512 da933ff9521a9337198a890e0ba10281510b861b4bff3023e7d251251f7ef7f8579f86b2992238975329c5c63ecdf00b17e895f1e0dec4e180336860fdd0c921
 DIST pr2_common-1.12.1.tar.gz 33597926 BLAKE2B eef3676b2ad029514aef09c09b4e463246397c2fd605b60bdba355e54ce44b1248efe6eef02e0303fd347f8c9b6b8965abafccee07b1f77e70f6e7db4a12a5e5 SHA512 e74be6f0507b1a7ae0fa385a06ff0a960661c5f0ec723bd7ac6d4782d4a61e3b4a95fda5cd09b37ed62ecf72be7c9c55132d3967644211c957c224717bc15485
 DIST pr2_common-1.12.2.tar.gz 33598279 BLAKE2B e381e14b965d675a7cbf14a652f633514dfe72a4bf1d7b8808164da79c7cba63b47b405c8b57482a20a3b6284f0f5f957df1f97ea4699a4c0888936d2d4930a5 SHA512 29794f7ea5aaff0082ec9496f1b29bc7a1ea71694993a03832b039c655f3ba29cd322db3665401b2a1b5715d0d6793d19a7ab93f7fe5e891369ead5fbefed95a
+DIST pr2_common-1.12.3.tar.gz 33597275 BLAKE2B fbbfa933bea8ecd18b988e5bce1c31365718a97ddbfcb698bb901066eff1191293e377d97a3174b501b07ff5f3011b00d19c0843a63e5777a2b5fb6ee4b559cb SHA512 423eb73634a0c2ab9b4f89a902a7dbb8e416f80815e591ad8fd24de4b92c8b7ea0312196ad0697d181fa6157603b082645590d0cdb7216186e4c5cba27fb68da
 EBUILD pr2_msgs-1.12.0.ebuild 540 BLAKE2B a81dd2fe728a8e08988cdd9003b9d9f3f23d575c68b0745b9f14c273bd61dbfcb675dcdc8793d9092a279f47f113a33c0024beb63634833192ec6af407ffdf0d SHA512 90817efe25563bc7e87d01c02c8a37334b0ee54ca0fdc69e17a2782e7b2f23e31cb3f950143f5f3b4fce0f16fd29035ce85b48241298fb5dacf2f68a48f6b35d
 EBUILD pr2_msgs-1.12.1.ebuild 540 BLAKE2B 886be8024a4e5351b83ee4d068ed91cffa4da3aceb54cf2c8d31f74673db1ce5b50562ff92353f4186709482b15c2732bc104daff1da0b234ed22729bfc7eabf SHA512 e4aa611b2481e9cf136acf0bdf3dec56646a35614d4442ebdc00f4bd1e7e26525fb9321a4a1757ab73383c8ce5a82a4e5eb387c4489e52fcfbd6b14a9c41012d
 EBUILD pr2_msgs-1.12.2.ebuild 540 BLAKE2B 886be8024a4e5351b83ee4d068ed91cffa4da3aceb54cf2c8d31f74673db1ce5b50562ff92353f4186709482b15c2732bc104daff1da0b234ed22729bfc7eabf SHA512 e4aa611b2481e9cf136acf0bdf3dec56646a35614d4442ebdc00f4bd1e7e26525fb9321a4a1757ab73383c8ce5a82a4e5eb387c4489e52fcfbd6b14a9c41012d
+EBUILD pr2_msgs-1.12.3.ebuild 537 BLAKE2B 1b330b07b9a9d4de81feae9be977d16c1787a7a454102028aa93442e7cc5276c252981d143aed5985d815dbf6107e3dd5a39a4b7c82aa27d85564fdcb856bf4d SHA512 65a12537b48e2153fac758a440c6ee2cb064d2af2466e25e8e7772d962ae3b3ab527b9469b4263d86822b88ad0d8015fae1dd2841d0ec20e0b502030f994391b
 EBUILD pr2_msgs-9999.ebuild 540 BLAKE2B a81dd2fe728a8e08988cdd9003b9d9f3f23d575c68b0745b9f14c273bd61dbfcb675dcdc8793d9092a279f47f113a33c0024beb63634833192ec6af407ffdf0d SHA512 90817efe25563bc7e87d01c02c8a37334b0ee54ca0fdc69e17a2782e7b2f23e31cb3f950143f5f3b4fce0f16fd29035ce85b48241298fb5dacf2f68a48f6b35d
 MISC metadata.xml 328 BLAKE2B 2d51f6fac18e20274b308b8de5aeb2ad80a4b118697ca1c93dc5c0350e8a7ae2e7c14d7a84692d0b7fb5da114e4fb7ad39d93d7d5831c5a09589add99aa5f6da SHA512 2f52806adfce77e7d54809d57a0b8b59b26f25da96f50f10672ed76ce8bda8e4555f1531af953e61cd1cfa82d46d46a3760b12b537ffcc191407125604abcbbc
diff --git a/dev-ros/pr2_msgs/pr2_msgs-1.12.3.ebuild b/dev-ros/pr2_msgs/pr2_msgs-1.12.3.ebuild
new file mode 100644
index 000000000000..5e7ff0f15b78
--- /dev/null
+++ b/dev-ros/pr2_msgs/pr2_msgs-1.12.3.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/pr2/pr2_common"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for representing PR2 state, such as battery information and the PR2 fingertip sensors"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index aa88bda46d54..51c6a0443b8f 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/ed25519/Manifest b/dev-ruby/ed25519/Manifest
index 1d0fad9b49bd..da585b386c51 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 793 BLAKE2B 7cf4c520f206d698dd5109c2b2061fe4f1a5a2b232b7a9fc4fe077af5784e149ed750e3862cc09b64ab08c0f6ddef8d0c285ac82e94cd58e5474f684e77dcd26 SHA512 28f05e4c9b963581ca923c8388c8688feec1e8679ed97f91f9d87ea9f68ef5799d69bccc1d613d404e409a763ecb64cb45aa45e22612dd5f5242d5ef2c07d743
+EBUILD ed25519-1.2.4.ebuild 795 BLAKE2B a05ba70b7aa57d3a04e6a2423fa9347ccb42573ec82275d91ac7bf979f390dc75c2c17a252ece7c003fda7b92e4ac5b04a34d815bdab8323ac0ba04dd6c620c5 SHA512 470fb9256085683c029b77411277951690e4c09d4fe1561ce29d49911e46e289d444bc35a45b2b4bef7b2fe0fc52b8577d6f22fd78f8254d8424430fe8185045
 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 ad1b52d61a5b..12c3544c6c08 100644
--- a/dev-ruby/ed25519/ed25519-1.2.4.ebuild
+++ b/dev-ruby/ed25519/ed25519-1.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
@@ -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"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/net-ssh/Manifest b/dev-ruby/net-ssh/Manifest
index 38b770d8f952..50c50a84660c 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 1010 BLAKE2B 2c65a9b9fc1152c60067cb1d50ace523d5e8d19b2f7d43185c7340d0d1748ca9a49be56f307a57390aaf4839085187b08608d254b67ff1057ece4ca17eb49904 SHA512 00052f0adfb567231a99b9bf4e3d09332eb4b73fdeb39302948d4edae6b39b87711cfab349fbfc1fa1837ede2b1f8fbbffe6f1d6fa43022ca6cf6e6643a30a6f
+EBUILD net-ssh-5.0.2.ebuild 1012 BLAKE2B f4b494eb4597df23eb94c1da35cd15a52af2e3d0dc72fe58900a605c45b248706553a76cdb9476cf0679e1eac6300e1308480f2bc0906733b62024ac4fb1124d SHA512 9a2bf303cd377af5bf33db0a52c2bedd4c35b82de4891122a74f5cd44a0aefbb3cbd0cff8ca66baa881d6561a79c817662262a1033988dff8aa060ce9a5ded1d
 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 b2f05b3d0190..6dae9d40dc92 100644
--- a/dev-ruby/net-ssh/net-ssh-5.0.2.ebuild
+++ b/dev-ruby/net-ssh/net-ssh-5.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
@@ -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"
+KEYWORDS="~amd64 ~x86"
 IUSE="ed25519 test"
 
 ruby_add_rdepend "virtual/ruby-ssl ed25519? ( dev-ruby/ed25519 dev-ruby/bcrypt_pbkdf )"
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index a5d97071dde4..ba72214bac4e 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/guile/Manifest b/dev-scheme/guile/Manifest
index e0cd3090d0a9..982f9943f605 100644
--- a/dev-scheme/guile/Manifest
+++ b/dev-scheme/guile/Manifest
@@ -17,7 +17,7 @@ DIST guile-2.0.13.tar.gz 7808173 BLAKE2B e1d59356173b54595512c0322ac596ccf46f566
 DIST guile-2.0.14.tar.gz 7823099 BLAKE2B e7fa5a4ca19dc4adfcc151350b0ed4e211b8470b0d12f65451697a818c3139a4a5992a019bd213114748230cb15ec755d1af70d42b901230854915c0ee7b05de SHA512 d69c9bdf589fedcc227f3203012f6ed11c327cef3a0147d8e016fe276abecdb4272625efe1d0c7aa68219fe8f29bbced44089a4b479e4eafe01976c6b2b83633
 DIST guile-2.2.3.tar.gz 17266587 BLAKE2B 68751b881bca53e7ab04038483aa8c5a689978d1017e4c944a8142e301e2e13d5ffd2aba73f7b0aa27efd84d068558b96a88452d1e0b79dc04db1921e22a621d SHA512 31df17d28177badf63e1eb0d0d64e6a4d2abe64d4d5e69d8ff33a24dfb10abd25109ea9abfa86f5ff303b43665eb5b8127927f683f3b16139c5b3dc99f06f6fd
 EBUILD guile-1.8.8-r3.ebuild 3095 BLAKE2B 49ca14333d66b339e2ff48e5c6524e16d837876be10d28ed47162ddaae7730ccfc98b7d144213a77dac9da9d8c36ba30617658b92aa4eff4ac510a56a8a1c1dd SHA512 10a4e219a91a2359b789d3fe59dda73a811f7aceda66c5d68e3236a878fb748b6b2ac92bdf8bfba277f9fbd9f90e631635b0bd753eb47c83a0c3d19ba0e19c7a
-EBUILD guile-2.0.13-r2.ebuild 2096 BLAKE2B e071e1d091ed5081c9ed4006949a546c6b8a8258b6301c10aaa28bf01f49947b406968b9830f1bec3e3fe51d51bfb91d0dc179aa455f68df871b7aeedc00c41f SHA512 56de5fde01cd5ac9f1fde9550f25a2cc27bc54b5b9e09d64ee3ccc413e891786079bf99cad991b38ffdd65dee686a3516543019021276fdd3f8c0c5f5c6042fd
-EBUILD guile-2.0.14-r3.ebuild 2230 BLAKE2B 154f4b08ee5781f7963c8b86cdf95969cc0dd756217d6a4df18dba1b33e1efa5b1b364323f5ecc8dc2c4ee46e951251645a5657fe9694c5933ddc7cc6f856f62 SHA512 71bb8876ed342a010c12f290c90e19dd0fc09374f42099b95885323e053d55ba996ab8abe59e4dff2916386cd0e922877a120d0b4f93dc8759d6fd03a171f05b
-EBUILD guile-2.2.3.ebuild 2005 BLAKE2B 3b6dbc31c6526fc7a22e13be8243f3773fd155bd8ac519a10d80dcd9fec9c0f6d2e8ea586f535e30fb2eaddb9eceee214aa7cc4b08b6adebd0cbbe80fcb1246d SHA512 de220b0950c1e42e30eb0866b4653c8c6bfe23d0b8366f0dfe0263d6ef385bdb50f20a4d55df210c80b44d356ae283b4adb30bc48dd4d30f4437efba398fd97c
+EBUILD guile-2.0.13-r2.ebuild 2095 BLAKE2B 70468ad087d4294a7d144bea9c515d2c9b9f106a4dbdf323c6df12e4e7216574bbfaceb9fb19d321503a72957ffefa26a37ec9a26daeab6fe4d17265b2deffe8 SHA512 63fc7096d372812cec81ab5f095277fc8133aeb2ecf8a8dcc7d53249aef3198fc8a0db9231a4494cccd1e31ac81b8a0e3062236540470d4762c3e4396e752e9e
+EBUILD guile-2.0.14-r3.ebuild 2229 BLAKE2B a131c9dcd285ac0758d4661d945969e0ad3d6212b56a1958274aa639f2a28f6e5d31df6e04cc3083c3b13b03f083acd46942a05e794a476da6abe478bd06b7ed SHA512 3d64eb50c0276686105d9d74671ba960982da0641505866b3aca0a60a7484578506b051a6397677274024696b32d2576de1645400107dc18a2a6184abe13060c
+EBUILD guile-2.2.3.ebuild 2004 BLAKE2B 76e5bc07734a4c988f5514d673ef0f4a3a52224d357793cefa38f18951cecdd71f98e98577359cb72348a9ed7a9a2a4b5f2aeba4b5380a5946185a4ebe2db027 SHA512 945c2719954092aecff79352f8f0cedfd9ce0f65d8418c53acf28912ba8e7302f25df9cdf1a769c6c741ecf47e5346cacdc8c86bcbf9b18bc5ddd56a38e7786a
 MISC metadata.xml 1040 BLAKE2B ea7db45fc50b1b17b90948224837643278741aa84fe75e7d3fa3716711060f8aef189124d4491238aa0a72c4e0364d940fcf5d38fb4a178ff0ac7c7039138751 SHA512 6c44b82f0c361f23d377e34fd88249c4e601b215c1bb183afb8cac27bf105b314d5138877b05bf3144a3c60f5b240e4e76ca3fabf151e1182cc913825a093cf3
diff --git a/dev-scheme/guile/guile-2.0.13-r2.ebuild b/dev-scheme/guile/guile-2.0.13-r2.ebuild
index cb31417b3809..727bcc48100f 100644
--- a/dev-scheme/guile/guile-2.0.13-r2.ebuild
+++ b/dev-scheme/guile/guile-2.0.13-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
@@ -18,7 +18,7 @@ REQUIRED_USE="regex"
 RDEPEND="
 	>=dev-libs/boehm-gc-7.0:=[threads?]
 	dev-libs/gmp:=
-	virtual/libffi
+	virtual/libffi:=
 	dev-libs/libltdl:=
 	dev-libs/libunistring:0=
 	sys-devel/libtool
diff --git a/dev-scheme/guile/guile-2.0.14-r3.ebuild b/dev-scheme/guile/guile-2.0.14-r3.ebuild
index f9a08a05028c..f3c50eb8357e 100644
--- a/dev-scheme/guile/guile-2.0.14-r3.ebuild
+++ b/dev-scheme/guile/guile-2.0.14-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
@@ -18,7 +18,7 @@ REQUIRED_USE="regex"
 RDEPEND="
 	>=dev-libs/boehm-gc-7.0:=[threads?]
 	dev-libs/gmp:=
-	virtual/libffi
+	virtual/libffi:=
 	dev-libs/libltdl:=
 	dev-libs/libunistring:0=
 	sys-devel/libtool
diff --git a/dev-scheme/guile/guile-2.2.3.ebuild b/dev-scheme/guile/guile-2.2.3.ebuild
index dbe0f04a04ff..7b949d554f8a 100644
--- a/dev-scheme/guile/guile-2.2.3.ebuild
+++ b/dev-scheme/guile/guile-2.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
@@ -20,7 +20,7 @@ RESTRICT="strip"
 RDEPEND="
 	>=dev-libs/boehm-gc-7.0:=[threads?]
 	dev-libs/gmp:=
-	virtual/libffi
+	virtual/libffi:=
 	dev-libs/libltdl:=
 	dev-libs/libunistring:0=
 	sys-devel/libtool
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index a834f0fbffdc..3e6e96c52b4a 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/expect/Manifest b/dev-tcltk/expect/Manifest
index 74cc65ea4645..9d825afa0e96 100644
--- a/dev-tcltk/expect/Manifest
+++ b/dev-tcltk/expect/Manifest
@@ -3,9 +3,9 @@ AUX expect-5.45-darwin-install_name.patch 727 BLAKE2B fca6df8c6d01bd54f26e6a2311
 AUX expect-5.45-format-security.patch 428 BLAKE2B 98e4d1da9f790bb1ab1b0b8481c5c0a747823f0998fff7993316d44cd5b29659467901c9f2e78d6b77342a9f0cb9072730a8600240fa37f240e10cc677162f63 SHA512 b85f0985b908f72d960eeb00567caab048874806c68d259835dc4564e33032524e9026e07ece3ad5f8669d67f7976019efb5dd763ba84b4cc13571ca999c7f06
 AUX expect-5.45-gfbsd.patch 996 BLAKE2B 46183afae664e2995403e36b423e0576022063d8acfb681dd98d6e98e54c86588f0e74067b929fe105bc477fedd8709b749857dcdaf5e57fa28445dad34c4139 SHA512 4fa7c4723c9ad2f5811c5762abe202f1d7584a6050c75cab277fe1b6c697809204a9adcf6f6f6c3c215c8df32f3ac9b083da907777b1ea02e1a4e64b8bf91242
 AUX expect-5.45-headers.patch 2280 BLAKE2B 6326615eee52aaa7307b32d048af21d657cb308e737995944b7e081a06a4d6b6f3409836b28835e6534ef57215542b524061cb731be3b419b23ab2ba38184079 SHA512 ac55ec9d65e87d5c64327d802fa16eab9f218f71e760090b2afc00b5fdb791859e6d1f35b0d1a5f52e7ff6ffb21e538581a1782976754fe8ae3ca5950c8db55c
-AUX expect-5.45.4-examples.patch 807 BLAKE2B 7b102a0fc95324d7b2aae343edf1d5ecd914234d89e8d57f2c1cdb64e707b58969552ded0eacd17373de42aa7ab60ef32e4b0f41c389de93c15bcffbe52ffe2c SHA512 6a9d8b713c0c20b630d4c61373afde76924ac00b7057cab9b42c0a7f81bf9712006ef7f81e82523262a429b960cacf6dc7742c835617a69b0c248a2e13131f50
+AUX expect-5.45.4-examples.patch 935 BLAKE2B df87d211f6693b836e2e8ca2b63c56a9dd073a8e2ab3f71b38523d4797da0c54411d51bd38e5568c0b850b30ce89d7c984945e704486eb61ca5077709de514fc SHA512 0cad9007f82d2e9fb1994e7b8a84858603cca471f34dbbaddadc30b4594c5cb31cb29749629bcea47b1da4abe3526ddc1c5ea36fb816571bc9c6ffadc120667c
 DIST expect5.45.4.tar.gz 632363 BLAKE2B a3a936e7644c922fdd474fa08c45926396ccce9a63e5f65f4d5e157f5160cfe4de47688734b39d13281d9548aac492810f19236e06563903d3d8081e4661048d SHA512 a8dc25e8175f67e029e15cbcfca1705165c1c4cb2dd37eaaaebffb61e3ba132d9519cd73ca5add4c3358a2b0b7a91e878279e8d0b72143ff2c287fce07e4659a
 DIST expect5.45.tar.gz 628808 BLAKE2B d7260d3b2ce1bcd72deef121e1f994f45bfa5397291692d794c9b8ad627d7ac183689ba00ba22f728853ac03b6b083fb6f283dc5c453aa991e04263c217be552 SHA512 be991c68241e607b3a689eae7e7966056dbfb577e857331d54a4911bd178c1816425217603b43918ad1b6d2e966271a0f01e79d7028a22e223562d59d10c8c51
-EBUILD expect-5.45.4.ebuild 2179 BLAKE2B 1804f4383356a7a3e0e1f3d2120740d6fd44e9a043392be3925bd854e35f6fef8d89cc4c368dd68f7f7ebe525265514e14bd3ecc0afb8070e35469746379e90d SHA512 ee66f0c8d8c8cb69d022c2e02b06194a1e52c76874fd2fcc835550890c7c0cb100e27a99e06db7857cc9d056015d57f511c7399c712df52082374d1ed2aa8e9b
+EBUILD expect-5.45.4.ebuild 2339 BLAKE2B 4bbf3336ea71939b00a81752c41a6f7572841160a2caf7b51ced61390d22d1b836a9762cc2da7e78a0cdbde21e67a115a9a019417d1246ecb2db48c4bba3a68a SHA512 d990d458d1477c17ca197bffb05f564232960acb140dcdeaf9b79131b8d4c5d3af9cd58fa91ea25928f14b32b7ba9e337f83cbcc2104d439c9c6deadeedd595b
 EBUILD expect-5.45.ebuild 2323 BLAKE2B a7ddc999f1d2c1b3c8f1a8c5983b94c89e4a4e8dcc3d06e229b63f359d41ea108c3f2d7d92d2427e6ada3fa01c840cc233cc839335d21c41be67cf84378b9808 SHA512 bfef9b4a10fa57845aa223962a457949db55fdcd41fdb507c9413f4fd223bfe37a5cee231394912d0d919dc10641e9f6908cf445e508fc794b5d2dc4c10d3582
 MISC metadata.xml 329 BLAKE2B 9eebe793b4602782f9bd2db8dd7a0cfdfdab3f89400f3ececcf25862220c47e78feebc579b468ae5dc44ae482b8a69f844f141a2f535fbd61dec73f11c8eea83 SHA512 cd5b6144b39381b2b69791171489dd907c3d779ae488b361f744ffacb2459b0c72cb70a72a85dce6bd7a25774e1a42da511dd0d041b25580bf243a515095f3d1
diff --git a/dev-tcltk/expect/expect-5.45.4.ebuild b/dev-tcltk/expect/expect-5.45.4.ebuild
index 7f5402663564..b6d1a0feefe2 100644
--- a/dev-tcltk/expect/expect-5.45.4.ebuild
+++ b/dev-tcltk/expect/expect-5.45.4.ebuild
@@ -72,6 +72,10 @@ src_install() {
 
 	if use doc ; then
 		docinto examples
+		echo dodoc \
+			example/README \
+			$(printf 'example/%s ' $(expect_make_var _SCRIPTS)) \
+			$(printf 'example/%s.man ' $(expect_make_var _SCRIPTS_MANPAGES))
 		dodoc \
 			example/README \
 			$(printf 'example/%s ' $(expect_make_var _SCRIPTS)) \
diff --git a/dev-tcltk/expect/files/expect-5.45.4-examples.patch b/dev-tcltk/expect/files/expect-5.45.4-examples.patch
index 10de8821a01a..cd631b30a5c1 100644
--- a/dev-tcltk/expect/files/expect-5.45.4-examples.patch
+++ b/dev-tcltk/expect/files/expect-5.45.4-examples.patch
@@ -1,21 +1,23 @@
 --- a/Makefile.in	2018-09-26 15:59:09.049279363 +0200
 +++ b/Makefile.in	2018-09-26 16:00:00.514427553 +0200
-@@ -32,16 +32,12 @@
+@@ -32,15 +32,17 @@
  # SCRIPTS is a target. If this is a problem, just comment out the
  # SCRIPTS target itself.
  
 -SCRIPTS = timed-run timed-read ftp-rfc autopasswd lpunlock weather \
--	passmass rftp kibitz rlogin-cwd xpstat tkpasswd dislocate xkibitz \
--	tknewsbiff unbuffer mkpasswd cryptdir decryptdir autoexpect \
--	multixterm
 +SCRIPTS = unbuffer
++_SCRIPTS = timed-run timed-read ftp-rfc autopasswd lpunlock weather \
+ 	passmass rftp kibitz rlogin-cwd xpstat tkpasswd dislocate xkibitz \
+-	tknewsbiff unbuffer mkpasswd cryptdir decryptdir autoexpect \
++	tknewsbiff mkpasswd cryptdir decryptdir autoexpect \
+ 	multixterm
  
  # A couple of the scripts have man pages of their own.
  # You can delete these too if you don't want'em.
  
 -SCRIPTS_MANPAGES = kibitz dislocate xkibitz tknewsbiff unbuffer mkpasswd \
--	passmass cryptdir decryptdir autoexpect multixterm
 +SCRIPTS_MANPAGES = unbuffer
++_SCRIPTS_MANPAGES = kibitz dislocate xkibitz tknewsbiff unbuffer mkpasswd \
+ 	passmass cryptdir decryptdir autoexpect multixterm
  
  
- # allow us to handle null list gracefully, "end_of_list" should not exist
diff --git a/dev-tcltk/iwidgets/Manifest b/dev-tcltk/iwidgets/Manifest
index f73bb1dabbdb..aac1afa066c0 100644
--- a/dev-tcltk/iwidgets/Manifest
+++ b/dev-tcltk/iwidgets/Manifest
@@ -1,6 +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 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
 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
new file mode 100644
index 000000000000..5c4d8362e2ed
--- /dev/null
+++ b/dev-tcltk/iwidgets/iwidgets-4.1.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib
+
+BASE_URI_ITCLTK="mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-4-source"
+ITCL_VER=4.0.3
+ITK_VER=4.0.1
+
+DESCRIPTION="Widget collection for incrTcl/incrTk"
+HOMEPAGE="http://incrtcl.sourceforge.net/itcl/"
+SRC_URI="
+	mirror://sourceforge/incrtcl/%5BIncr%20Widgets%5D/${PV}/${P}.tar.gz
+	${BASE_URI_ITCLTK}/itcl%20${ITCL_VER}/itcl${ITCL_VER}.tar.gz
+	${BASE_URI_ITCLTK}/itk%20${ITK_VER}/itk${ITK_VER}.tar.gz"
+
+LICENSE="HPND Old-MIT tcltk"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="
+	>=dev-tcltk/itcl-${ITCL_VER}
+	>=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
+}
+
+src_configure() {
+	(cd ../itcl${ITCL_VER}; ./configure)
+	econf \
+		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
+		--with-tk="${EPREFIX}"/usr/$(get_libdir) \
+		--with-itcl="${WORKDIR}"/itcl${ITCL_VER} \
+		--with-itk="${WORKDIR}"/itk${ITK_VER}
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	default
+
+	# demos are in the wrong place:
+	mv "${ED}/usr/$(get_libdir)/${PN}${PV}/demos" "${ED}/usr/share/doc/${PF}/"
+}
diff --git a/dev-tcltk/snack/Manifest b/dev-tcltk/snack/Manifest
index c4dceb3a8ce9..f024d6b34417 100644
--- a/dev-tcltk/snack/Manifest
+++ b/dev-tcltk/snack/Manifest
@@ -1,6 +1,7 @@
-AUX alsa-undef-sym.patch 1225 BLAKE2B 330c8e3da69aebe63fff74cdf32ab5fce303d6f2ffc2f5a06d9d2e406064e2758527cf3891a43d9971509c52a2fdcb30a1c1798f41a9c6f7d12004cceb53d68b SHA512 2f925029ca7ebcf0028beb2c303d07831879d9750b5f4f463a8d463964301d0182650b9ad50b103be6c0e5eb4cb58a19e02496b7afee8531dcb2c132a292ff97
+AUX alsa-undef-sym.patch 1230 BLAKE2B 9551a46a1852a8503898d74927cd0b83c2508cb06db5292b557e99a1ad6873d749bf23e69d164ee54bdc68f4b4d60adf7f2bfd425d7bbc40f57e8e98d090131e SHA512 d730d6dbf721eeb46333f52824272cdecc48d975d5ef7eb21f7ba18ab2458dff72e33b3eb2dad489e65d651ddabfb478d4457d60affe172bc2433257863f37a0
 AUX snack-2.2.10-CVE-2012-6303-fix.patch 778 BLAKE2B f6f34248825da751e81f4079d70fa7dec4dcbc5e63931aee58ad1f021e0a47f0bfdc7a52e69693bf32bae618a49f5c35c757694dd14984ebc79cd62acce2bda7 SHA512 6e2f7fcf8ca0c2792cf52432340f2319b8c82677a3568c9e382f91758f5e6bf26c3a05939d4a748c4198c4e50f27141ebd2cb298d8363765ed6582192d64d3e8
 AUX snack-2.2.10-darwin.patch 1108 BLAKE2B 862cd6a36363b45c9a27af08fa4bf347fc3e1a8fbbf972b72dfb4faf4cb135365fbe06377a20a2b77e02126e27de723b642067d8ccedb9947b9aa873069152ce SHA512 0d82270d830c8b7d15dcbead05d80c15666d1bac164f26c045859f7f4dc4c098961b48272ecd0b059a1b36ba8d560c563fe8e40add822f311026faf5f7eeaf0a
 DIST snack2.2.10.tar.gz 1798252 BLAKE2B e27b8e7d6082cdcfc06e7eea5ab832fb78ba104de9e56a69c6c9cd688183f7d4c6bdb974e4d5d2bf5ef2bc5518a913ddf17c90db8d10cef4dbee533307cc7718 SHA512 c17ad332fa4f3ded006b97ceca85cada079e4c7cd933768b289c13dadca1b8803fccaf709ec2def5af4abe92c307f25597ebfa6f94df2d681e40815cd7eccb9b
 EBUILD snack-2.2.10-r6.ebuild 2012 BLAKE2B db70db5649537e2a4fb3d4484eafd6366e016b384415ec40330c4ff345c934c8554fdd34a91734c074d37096401ae883ad8d359deeeb6fb465950c16157cb0bf SHA512 30849b4e77e6177d41d32004ad1026ef44a57d654d25e583ebe6e7a16a08d0224ea3a79e0df62c7238b19b3d92fb1ab51325404e7f1e5e324208e3ccbeb13d62
+EBUILD snack-2.2.10-r7.ebuild 1940 BLAKE2B e6e88ef6cba18d2b1de2cee927c48208a612e2929e47cfe4d4b3d5256984653acc5ebcac712084f3046d540aff81301ce2c4adcf0253a20f4f4d59472a1c37af SHA512 32339642f2f30d41df5f0f381cba807d80f63a6e1d10870c70865ddd11e653422109cdcdd5927cf0c703b314d7499ab578dcd012e528a102fc328d65f9050231
 MISC metadata.xml 259 BLAKE2B 174c3c7b4292350e73a38b09d473abba172ee6e82ca1b5bcb6815a9927609a7fbac063a19498e7c5deaa32530d10d8c493760ff5b6e489f821410cfeccadf566 SHA512 5943f2c9dc9a55862bae4c01be9e1f27304ffc1ce48d67341b4a19793c0bb11fe3d1a419af924ac360aeeafbce28018971602019a559a8a6c5939e05e3567639
diff --git a/dev-tcltk/snack/files/alsa-undef-sym.patch b/dev-tcltk/snack/files/alsa-undef-sym.patch
index 77a222754fe1..c46b9371c752 100644
--- a/dev-tcltk/snack/files/alsa-undef-sym.patch
+++ b/dev-tcltk/snack/files/alsa-undef-sym.patch
@@ -1,5 +1,5 @@
---- unix/jkAudIO_alsa.c   2005-12-14 12:29:38.000000000 +0100
-+++ unix/jkAudIO_alsa.c   2008-09-01 22:51:20.000000000 +0200
+--- a/unix/jkAudIO_alsa.c   2005-12-14 12:29:38.000000000 +0100
++++ b/unix/jkAudIO_alsa.c   2008-09-01 22:51:20.000000000 +0200
 @@ -49,6 +49,8 @@
  
  static int minNumChan = 1;
@@ -46,4 +46,4 @@
 +  return (played);
  }
  
- void 
\ No newline at end of file
+ void 
diff --git a/dev-tcltk/snack/snack-2.2.10-r7.ebuild b/dev-tcltk/snack/snack-2.2.10-r7.ebuild
new file mode 100644
index 000000000000..8e0d447a69cd
--- /dev/null
+++ b/dev-tcltk/snack/snack-2.2.10-r7.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit autotools distutils-r1 multilib
+
+DESCRIPTION="The Snack Sound Toolkit (Tcl)"
+HOMEPAGE="http://www.speech.kth.se/snack/"
+SRC_URI="http://www.speech.kth.se/snack/dist/${PN}${PV}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+SLOT="0"
+IUSE="alsa examples python vorbis"
+
+RESTRICT="test" # Bug 78354
+
+DEPEND="
+	dev-lang/tcl:0=
+	dev-lang/tk:0=
+	alsa? ( media-libs/alsa-lib )
+	python? ( ${PYTHON_DEPS} )
+	vorbis? ( media-libs/libvorbis )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}${PV}/unix"
+
+PATCHES=(
+	"${FILESDIR}"/alsa-undef-sym.patch
+	"${FILESDIR}"/${P}-CVE-2012-6303-fix.patch
+	)
+
+HTML_DOCS="${WORKDIR}/${PN}${PV}/doc/*"
+
+src_prepare() {
+	# adds -install_name (soname on Darwin)
+	[[ ${CHOST} == *-darwin* ]] && PATCHES+=( "${FILESDIR}"/${P}-darwin.patch )
+
+	sed \
+		-e "s:ar cr:$(tc-getAR) cr:g" \
+		-e "s:-O:${CFLAGS}:g" \
+		-i Makefile.in || die
+
+	cd ..
+
+	default
+
+	sed \
+		-e 's|^\(#define roundf(.*\)|//\1|' \
+		-i generic/jkFormatMP3.c || die
+}
+
+src_configure() {
+	local myconf=""
+
+	use alsa && myconf+=" --enable-alsa"
+
+	if use vorbis; then
+		myconf+=" --with-ogg-include="${EPREFIX}"/usr/include"
+		myconf+=" --with-ogg-lib="${EPREFIX}"/usr/$(get_libdir)"
+	fi
+
+	econf \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--includedir="${EPREFIX}"/usr/include \
+		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
+		--with-tk="${EPREFIX}"/usr/$(get_libdir) \
+		$myconf
+}
+
+src_compile() {
+	default
+}
+
+HTMML_DOCS=""
+
+src_install() {
+	default
+
+	if use python ; then
+		cd "${S}"/../python || die
+		distutils-r1_src_install
+	fi
+
+	cd "${S}"/.. || die
+
+	if use examples ; then
+		docinto examples
+		sed -i -e 's/wish[0-9.]+/wish/g' demos/tcl/* || die
+		dodoc -r demos/tcl
+
+		use python && dodoc -r demos/python
+	fi
+}
diff --git a/dev-tcltk/tclperl/Manifest b/dev-tcltk/tclperl/Manifest
index 5df6c9b87eb7..14005b3f48a1 100644
--- a/dev-tcltk/tclperl/Manifest
+++ b/dev-tcltk/tclperl/Manifest
@@ -1,3 +1,3 @@
 DIST tclperl-3.2.tar.bz2 11765 BLAKE2B 408bfa98a706edfed45d57183f2152bfdc9e0a8fa7b53b3d612f1d15e3e3733fc1eb6ef8df501a28446429ec78912b937f143ce43d23ceebc2ced58c6668a6f5 SHA512 aed6fb4b0275cf75e6024336e81e3cd1502d82ae697e79b6142d2f9b3cfb0891541cc585fa83d6219632f11d6eda43b141d009caf5fe7433b2b2ca92aa875c00
-EBUILD tclperl-3.2-r1.ebuild 915 BLAKE2B dd47e4152e19af3e0153c679e7794c77701fb33d28773c5164c33ef66a5cbf34a4ca24c883c8dcdf9317e5dbd34a7744f44587be5795ba29584c47d3b1a2c85f SHA512 aefa222e5c8b1c3dec21158a955e57bbb344f0aed7af2b07140fe1317beb1814379b563d35ff5fa43e554e107d470254daadadf436cef7da39a3349e883fc0db
+EBUILD tclperl-3.2-r1.ebuild 939 BLAKE2B c9693de9764249df6bf7688b063fcd00a5717fe7c14c8e12ce2397b7da61ed15420aa14812a035b0823a7bb54b1494d18ca0df34eb6400184202319910698968 SHA512 dcace10dc901e18cc047f50c57cb34db8a1c93eb9ccf53d45eee8fb1337f40ea359e3fafa2e3aa35c5c6bb90adf2b7b1efeacadde2fb9b4bd5ca8e31b5b08c79
 MISC metadata.xml 259 BLAKE2B 174c3c7b4292350e73a38b09d473abba172ee6e82ca1b5bcb6815a9927609a7fbac063a19498e7c5deaa32530d10d8c493760ff5b6e489f821410cfeccadf566 SHA512 5943f2c9dc9a55862bae4c01be9e1f27304ffc1ce48d67341b4a19793c0bb11fe3d1a419af924ac360aeeafbce28018971602019a559a8a6c5939e05e3567639
diff --git a/dev-tcltk/tclperl/tclperl-3.2-r1.ebuild b/dev-tcltk/tclperl/tclperl-3.2-r1.ebuild
index b151af67051a..64e82c79a3e1 100644
--- a/dev-tcltk/tclperl/tclperl-3.2-r1.ebuild
+++ b/dev-tcltk/tclperl/tclperl-3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,8 @@ IUSE=""
 
 DEPEND="
 	>=dev-lang/tcl-8.3.3:0
-	>=dev-lang/perl-5.6.0"
+	>=dev-lang/perl-5.6.0
+	sys-libs/binutils-libs"
 RDEPEND="${DEPEND}"
 
 src_compile() {
diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index a4912066dee0..3c5206fb5eab 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -1,6 +1,14 @@
 AUX tkimg-1.4-jpeg-9.patch 364 BLAKE2B bc9b3e4e404b49a9909d7198929033ebee4ab839f1f2ec71aea9435637bdcb6a3f0dd9c2ed379d9e0f7215853b0e693337876ac0842a37b32533151ef4d9b739 SHA512 4bb6cf0b7774700d607bccfb1590660344754749c40acefcba23046333b1029006acede784177473c629ab63247402bbbc4ab172946485af950c5e8ec6abb8c9
 AUX tkimg-1.4-png2.patch 1044 BLAKE2B 236e5fa637b4b1cc6c74dd85d4fe73520941af360873b0455ab146c443d844470d6afb67071976cd1850a79e0906b7374947d2c802c8ba85f83682c6ae0f77a5 SHA512 fbf982af5446fc54212745eee8338d5dc4b169f79045963be23a84c7a0ef9e68f54d895156b4f040f6585499f1ead9967ac0ce57106e3ca3615fbaa9adcd1fb7
+AUX tkimg-1.4.7-jpeg-9.patch 364 BLAKE2B bc9b3e4e404b49a9909d7198929033ebee4ab839f1f2ec71aea9435637bdcb6a3f0dd9c2ed379d9e0f7215853b0e693337876ac0842a37b32533151ef4d9b739 SHA512 4bb6cf0b7774700d607bccfb1590660344754749c40acefcba23046333b1029006acede784177473c629ab63247402bbbc4ab172946485af950c5e8ec6abb8c9
+AUX tkimg-1.4.7-jpeg.patch 2806 BLAKE2B 081284be08ef881e48910187b29bdc83f80b24caa62e0f440d1b5b61bf204acbc3db096f918d3e81b0df3182e8cfbcb6f45dc5e67764dac757008ca6b7484e27 SHA512 49afa55a51e5e62358470ff40b5ef89069f9700cad3232744f443c82fc622b56c6890ad80b3a47f38c58637d7327b15f220d5b708845d519ed9638be5d58422c
+AUX tkimg-1.4.7-png.patch 2853 BLAKE2B 5f3b38d8138242a25dad11d96bf8472414549a2509f7f709f21c7205e7cbfab56c1b9397f0e993eb2fe2b243b67818084ccaa81be46b8d5821b6398fb964dc55 SHA512 89230f0a8b3d6ffbe201ce8e66297f7cc5067aecb08eee417c738aed9d6bf0fd6792234a9292f66462df70cf71f4f451956a8da208ce9474a55054a68ac8657d
+AUX tkimg-1.4.7-tclconfig.patch 1330 BLAKE2B df85cad53dcf18168e72f069ccae0125396038c7fcf03fbae7f402d2b580684201ab54e06f06b46fda6deb1c85db6b27f3d86938ca6849c6375fa51fc5ef5876 SHA512 b7d5325a33085a8ddd4dd51d19c2c7e5e46692b40a38bd3314518325a20902035a3ac3f9c56e4b7e532b195674e44b83be6ea5be2ef66c7064680bee3bf3ef93
+AUX tkimg-1.4.7-tiff.patch 36744 BLAKE2B 8c61013cb52af69a7ac8d0f4fdb3b1727711a2f2aa8e31fa09f7e2bdcb53780d02f1e19e9f13a102df7616cc4b359ded068e22ea49918a49a6b39514561452f3 SHA512 2d9723ea1d9c092d77bb2f8bedc9571c4853a158f9f14750e731b926b762dc050e180f96822c610a41d6903c23e2f94ae4e687b5822196c143d6ff6893f0624c
+AUX tkimg-1.4.7-zlib.patch 3248 BLAKE2B f53fe1beff672e53efc2f7c8f2fa3954eced064d9deda0e0d8160aaf8b1a598ffdc35bd1d7be254588a5a8f61c95d41287910ed0a88c15767d53781e2b2e0fa4 SHA512 9723e9b2a5ec8563946b5a608a59ea5ec52b044a0b350cb91e5831d0235a7ae0b93e108b87db84a3b9baf552a12e2452e288dae37e34c3730e4dd81456818d06
+DIST Img-Source-1.4.7.tar.gz 7259144 BLAKE2B 48794a21564864c5b20953d1504acde5512be4aaa8db0834f63b15431af0bfa8bb2050f241e7b2d9b383480b59e17567f26f45c91e9f9a7fc58600cfe6ef6595 SHA512 6a395d6263e2f46151d0d3f5c6044d87a933617981200d2663328b8c7993b8a3aacba45568cee7aa2f5d8c8d020cb63956179aab5147d25d91b8834c0dfa4b9d
 DIST tkimg-1.4-patchset-1.tar.xz 17956 BLAKE2B f6d3e5e5f258434bd02e21271357f2e2013ce7c90f2d1862e8e7ac0f1cf235d39b1713434a00261ec442c1843a70194b4d14081a5d4cec07c8ad6bf45bbf1db3 SHA512 bd20e0beaa224c42e856e6d44d86c2a5f04c28d096c561f44c4afcf8c821bf859c602156a9be60f23f906e8da2f43c89ca358d32e8f9497296e7c5a5bf23ed69
 DIST tkimg1.4.tar.bz2 4912894 BLAKE2B 630ce6b95f42f0883373970ff919493d34cf4a61119af9520702079c6272f9b6ddbc6241197b39ac509d9b2c76c6f3d3bd29944acea4cdc1c82134cba473818a SHA512 b03aba6e21e35b8733dbc4fa66fae67284a05e68248e5afb2a85c1520c74d0c6c5091860a3ab682f4a662a318c562339e9b7b82f050e63bbf48d1b4757d379a1
 EBUILD tkimg-1.4-r9.ebuild 1842 BLAKE2B 470dcd82e9d64a0e809c39679ce8fa602f14d085eba6a665fbb112f0810a216378688a5fdec79e8bd16a6a06f4fa0a6efdac8e6742aa90449e2d674c38debc9d SHA512 35c3e79accf91eb48d577eb019c65125ca4ced5add2c2130599b3d92a8f4970ad1238df0dcf6cc22dadadb51d624338515933a522918b0b3cd1cd39e1f8d1e89
+EBUILD tkimg-1.4.7.ebuild 1850 BLAKE2B 9903b3fb237417316ccebdc7a00ac7f668192a9d5284cb98609b405000b88229c6f79c4ddb22d52835eceb25220015d2f570ce4303c3a8927c06fb08ae3efc14 SHA512 858877fc5ab8a96fb91727bd94cf6a80173cc4b5ae6d05560ebf90d105e11cc00704ee3d8faf8723c0c00a4ac642af6901e9d750aece10599487efbb5f467898
 MISC metadata.xml 436 BLAKE2B 264c09c99797be5f1a242a1146d8552ab4cf632ad404d950829d102b2f3f8a40c5542ff04e9770a4870153843e462298af802e6caaff9e5bbb37abdb32697155 SHA512 d0401ca91110d4ffb90190d7135d3a5e6ef1aa0d3106cd7a84e72e64f3f565ee2ef30ac19aa2f119838a50d9c926132b93f2723a763d25b819db42fc57c16adf
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.7-jpeg-9.patch b/dev-tcltk/tkimg/files/tkimg-1.4.7-jpeg-9.patch
new file mode 100644
index 000000000000..23000ac7922c
--- /dev/null
+++ b/dev-tcltk/tkimg/files/tkimg-1.4.7-jpeg-9.patch
@@ -0,0 +1,18 @@
+Fix build with jpeg-9, bug #520886
+
+--- a/jpeg/jpeg.c	2010-06-17 15:40:24.000000000 +0200
++++ b/jpeg/jpeg.c	2018-02-07 23:26:38.050073397 +0100
+@@ -53,6 +53,13 @@
+  */
+ 
+ #include "tkimg.h"
++#ifndef FALSE
++#define FALSE 0
++#endif
++#ifndef TRUE
++#define TRUE 1
++#endif
++#define HAVE_BOOLEAN
+ #include "jpegtcl.h"
+ 
+ static int SetupJPegLibrary(Tcl_Interp *interp);
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.7-jpeg.patch b/dev-tcltk/tkimg/files/tkimg-1.4.7-jpeg.patch
new file mode 100644
index 000000000000..969b953a19a3
--- /dev/null
+++ b/dev-tcltk/tkimg/files/tkimg-1.4.7-jpeg.patch
@@ -0,0 +1,63 @@
+ libjpeg/Makefile.in    |  2 +-
+ libjpeg/configure.in   | 19 -------------------
+ libjpeg/jpegtclDecls.h |  4 ++--
+ 4 files changed, 4 insertions(+), 39 deletions(-)
+
+diff --git a/libjpeg/Makefile.in b/libjpeg/Makefile.in
+index cf2aca8..2d937b1 100644
+--- a/libjpeg/Makefile.in
++++ b/libjpeg/Makefile.in
+@@ -107,7 +107,7 @@ RANLIB		= @RANLIB@
+ RANLIB_STUB	= @RANLIB_STUB@
+ SHLIB_CFLAGS	= @SHLIB_CFLAGS@
+ SHLIB_LD	= @SHLIB_LD@
+-SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
++SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@ -ljpeg
+ STLIB_LD	= @STLIB_LD@
+ TCL_DEFS	= @TCL_DEFS@
+ TCL_BIN_DIR	= @TCL_BIN_DIR@
+diff --git a/libjpeg/configure.in b/libjpeg/configure.in
+index 378806d..327e2bd 100644
+--- a/libjpeg/configure.in
++++ b/libjpeg/configure.in
+@@ -54,25 +54,6 @@ JPEG_CC=$CC
+ 
+ TEA_ADD_SOURCES([jpegtcl.c jpegtclStubInit.c])
+ 
+-TEA_ADD_SOURCES([
+-	../compat/libjpeg/jcapimin.c	../compat/libjpeg/jcapistd.c	../compat/libjpeg/jccoefct.c
+-	../compat/libjpeg/jccolor.c	../compat/libjpeg/jcdctmgr.c	../compat/libjpeg/jchuff.c
+-	../compat/libjpeg/jcinit.c	../compat/libjpeg/jcmainct.c	../compat/libjpeg/jcmarker.c
+-	../compat/libjpeg/jcmaster.c	../compat/libjpeg/jcomapi.c	../compat/libjpeg/jcparam.c
+-	../compat/libjpeg/jcarith.c	../compat/libjpeg/jcprepct.c	../compat/libjpeg/jcsample.c
+-	../compat/libjpeg/jctrans.c	../compat/libjpeg/jdapimin.c	../compat/libjpeg/jdapistd.c
+-	../compat/libjpeg/jdatadst.c	../compat/libjpeg/jdatasrc.c	../compat/libjpeg/jdcoefct.c
+-	../compat/libjpeg/jdcolor.c	../compat/libjpeg/jddctmgr.c	../compat/libjpeg/jdhuff.c
+-	../compat/libjpeg/jdinput.c	../compat/libjpeg/jdmainct.c	../compat/libjpeg/jdmarker.c
+-	../compat/libjpeg/jdmaster.c	../compat/libjpeg/jdmerge.c	../compat/libjpeg/jdarith.c
+-	../compat/libjpeg/jdpostct.c	../compat/libjpeg/jdsample.c	../compat/libjpeg/jdtrans.c
+-	../compat/libjpeg/jerror.c	../compat/libjpeg/jfdctflt.c	../compat/libjpeg/jfdctfst.c
+-	../compat/libjpeg/jfdctint.c	../compat/libjpeg/jidctflt.c	../compat/libjpeg/jidctfst.c
+-	../compat/libjpeg/jidctint.c	../compat/libjpeg/jaricom.c	../compat/libjpeg/jquant1.c
+-	../compat/libjpeg/jquant2.c	../compat/libjpeg/jutils.c	../compat/libjpeg/jmemmgr.c
+-	../compat/libjpeg/jmemansi.c
+-])
+-
+ TEA_ADD_HEADERS([jpegtcl.h jpegtclDecls.h])
+ 
+ TEA_ADD_INCLUDES([-I\"`\${CYGPATH} \${srcdir}`\"])
+diff --git a/libjpeg/jpegtclDecls.h b/libjpeg/jpegtclDecls.h
+index fef99c2..f751b16 100644
+--- a/libjpeg/jpegtclDecls.h
++++ b/libjpeg/jpegtclDecls.h
+@@ -30,8 +30,8 @@ EXTERN int Jpegtcl_SafeInit(Tcl_Interp *interp);
+ 
+ /* undef Tcl macros that conflict with libjpeg stuff (sigh) */
+ #undef EXTERN
+-#include "../compat/libjpeg/jpeglib.h"
+-#include "../compat/libjpeg/jerror.h"
++#include "@GENTOO_PORTAGE_EPREFIX@/usr/include/jpeglib.h"
++#include "@GENTOO_PORTAGE_EPREFIX@/usr/include/jerror.h"
+ 
+ /* !BEGIN!: Do not edit below this line. */
+ 
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.7-png.patch b/dev-tcltk/tkimg/files/tkimg-1.4.7-png.patch
new file mode 100644
index 000000000000..787bdb3e7d42
--- /dev/null
+++ b/dev-tcltk/tkimg/files/tkimg-1.4.7-png.patch
@@ -0,0 +1,80 @@
+ libpng/Makefile.in      |   4 +-
+ libpng/configure        |   7 +-
+ libpng/configure.in     |   8 -
+ libpng/pngtcl.decls     | 215 +++++++++---------
+ libpng/pngtclDecls.h    | 565 ++++++++++++++++++++++++------------------------
+ libpng/pngtclStubInit.c |   2 +-
+ 6 files changed, 388 insertions(+), 413 deletions(-)
+
+diff --git a/libpng/Makefile.in b/libpng/Makefile.in
+index eb8b87e..008d331 100644
+--- a/libpng/Makefile.in
++++ b/libpng/Makefile.in
+@@ -111,7 +111,7 @@ RANLIB		= @RANLIB@
+ RANLIB_STUB	= @RANLIB_STUB@
+ SHLIB_CFLAGS	= @SHLIB_CFLAGS@
+ SHLIB_LD	= @SHLIB_LD@
+-SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
++SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@ -lpng
+ STLIB_LD	= @STLIB_LD@
+ TCL_DEFS	= @TCL_DEFS@
+ TCL_BIN_DIR	= @TCL_BIN_DIR@
+@@ -154,7 +154,7 @@ CONFIG_CLEAN_FILES = Makefile
+ CPPFLAGS	= @CPPFLAGS@
+ LIBS		= @PKG_LIBS@ @LIBS@
+ AR		= @AR@
+-CFLAGS		= @CFLAGS@ -DPNG_IMPEXP=MODULE_SCOPE -DPNG_EXTERN=MODULE_SCOPE
++CFLAGS		= @CFLAGS@ -DPNG_IMPEXP= -DPNG_EXTERN=MODULE_SCOPE
+ COMPILE		= $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ 
+ #========================================================================
+@@ -179,7 +179,7 @@
+ # of the Makefile, in the "BINARIES" variable.
+ #========================================================================
+ 
+-binaries:	pnglibconf.h $(BINARIES) pkgIndex.tcl
++binaries:	$(BINARIES) pkgIndex.tcl
+ 
+ libraries:
+ 
+diff --git a/libpng/configure.in b/libpng/configure.in
+index c36befe..cd049c0 100644
+--- a/libpng/configure.in
++++ b/libpng/configure.in
+@@ -65,14 +65,6 @@ IMG_SRCPATH(zlibtcl)
+ 
+ TEA_ADD_SOURCES([pngtcl.c pngtclStubInit.c])
+ 
+-TEA_ADD_SOURCES([
+-	../compat/libpng/png.c	../compat/libpng/pngerror.c	../compat/libpng/pngmem.c
+-	../compat/libpng/pngpread.c	../compat/libpng/pngread.c	../compat/libpng/pngrio.c
+-	../compat/libpng/pngrtran.c	../compat/libpng/pngrutil.c	../compat/libpng/pngset.c
+-	../compat/libpng/pngtrans.c	../compat/libpng/pngwio.c	../compat/libpng/pngwrite.c
+-	../compat/libpng/pngwtran.c	../compat/libpng/pngwutil.c	../compat/libpng/pngget.c
+-])
+-
+ TEA_ADD_HEADERS([pngtcl.h pngtclDecls.h])
+ TEA_ADD_INCLUDES([-I\"`\${CYGPATH} \${zlibtcl_SRC_PATH}`\"])
+ TEA_ADD_INCLUDES([-I\"`\${CYGPATH} \${zlibtcl_BUILD_PATH}`\"])
+diff --git a/libpng/pngtclDecls.h b/libpng/pngtclDecls.h
+index adf987d..2b29fa3 100644
+--- a/libpng/pngtclDecls.h
++++ b/libpng/pngtclDecls.h
+@@ -20,7 +20,6 @@
+ #   undef TCL_STORAGE_CLASS
+ #   define TCL_STORAGE_CLASS DLLEXPORT
+ #else
+-#   define PNG_IMPEXP extern
+ #   undef USE_PNGTCL_STUBS
+ #   define USE_PNGTCL_STUBS 1
+ #endif
+@@ -28,7 +27,8 @@
+ EXTERN int Pngtcl_Init(Tcl_Interp *interp);
+ EXTERN int Pngtcl_SafeInit(Tcl_Interp *interp);
+ 
+-#include "../compat/libpng/png.h"
++#include <@GENTOO_PORTAGE_EPREFIX@/usr/include/png.h>
++#include <@GENTOO_PORTAGE_EPREFIX@/usr/include/zlib.h>
+ 
+ /* !BEGIN!: Do not edit below this line. */
+ 
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.7-tclconfig.patch b/dev-tcltk/tkimg/files/tkimg-1.4.7-tclconfig.patch
new file mode 100644
index 000000000000..23aa9429722e
--- /dev/null
+++ b/dev-tcltk/tkimg/files/tkimg-1.4.7-tclconfig.patch
@@ -0,0 +1,39 @@
+--- a/tclconfig/tcl.m4	2018-10-02 11:46:05.621138841 +0200
++++ b/tclconfig/tcl.m4	2018-10-02 11:46:56.041138841 +0200
+@@ -1076,7 +1076,7 @@
+ 	CFLAGS=$hold_cflags])
+     AS_IF([test $tcl_cv_cc_visibility_hidden = yes], [
+ 	AC_DEFINE(MODULE_SCOPE,
+-	    [extern __attribute__((__visibility__("hidden")))],
++	    [extern],
+ 	    [Compiler support for module scope symbols])
+ 	AC_DEFINE(HAVE_HIDDEN, [1], [Compiler support for module scope symbols])
+     ])
+@@ -1298,7 +1298,7 @@
+ 		# mingw gcc mode
+ 		AC_CHECK_TOOL(RC, windres)
+ 		CFLAGS_DEBUG="-g"
+-		CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer"
++		CFLAGS_OPTIMIZE=""
+ 		SHLIB_LD='${CC} -shared'
+ 		UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+ 		LDFLAGS_CONSOLE="-wl,--subsystem,console ${lflags}"
+@@ -1557,7 +1557,7 @@
+ 	    SHLIB_SUFFIX=".so"
+ 
+ 	    # TEA specific:
+-	    CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer"
++	    CFLAGS_OPTIMIZE=""
+ 
+ 	    # TEA specific: use LDFLAGS_DEFAULT instead of LDFLAGS
+ 	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS_DEFAULT}'
+@@ -3290,9 +3290,6 @@
+ 	    hold_cflags=$CFLAGS; CFLAGS="$CFLAGS -pipe"
+ 	    AC_TRY_COMPILE(,, tcl_cv_cc_pipe=yes, tcl_cv_cc_pipe=no)
+ 	    CFLAGS=$hold_cflags])
+-	if test $tcl_cv_cc_pipe = yes; then
+-	    CFLAGS="$CFLAGS -pipe"
+-	fi
+     fi
+ 
+     #--------------------------------------------------------------------
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.7-tiff.patch b/dev-tcltk/tkimg/files/tkimg-1.4.7-tiff.patch
new file mode 100644
index 000000000000..39b97e92bea9
--- /dev/null
+++ b/dev-tcltk/tkimg/files/tkimg-1.4.7-tiff.patch
@@ -0,0 +1,806 @@
+ libtiff/Makefile.in       |   6 +-
+ libtiff/configure         |  17 +--
+ libtiff/configure.in      |   2 +-
+ libtiff/tifftclDecls.h    | 368 ++++++++++++++++++++++------------------------
+ libtiff/tifftclStubInit.c |  20 ++-
+ tests/tiff.test           |   6 +-
+ tiff/configure            |   2 +-
+ tiff/tests/tiff.test      |   6 +-
+ tiff/tiff.c               |  12 +-
+ 9 files changed, 212 insertions(+), 227 deletions(-)
+
+diff --git a/libtiff/Makefile.in b/libtiff/Makefile.in
+index ebd81fc..08062b7 100644
+--- a/libtiff/Makefile.in
++++ b/libtiff/Makefile.in
+@@ -35,8 +35,8 @@
+ 
+ # tif_fax3sm is special. It is generated.
+ 
+-PKG_SOURCES	= @PKG_SOURCES@ tif_fax3sm.c
+-PKG_OBJECTS	= @PKG_OBJECTS@ tif_fax3sm.$(OBJEXT)
++PKG_SOURCES	= @PKG_SOURCES@
++PKG_OBJECTS	= @PKG_OBJECTS@
+ 
+ PKG_STUB_SOURCES = @PKG_STUB_SOURCES@
+ PKG_STUB_OBJECTS = @PKG_STUB_OBJECTS@
+@@ -109,7 +109,7 @@ RANLIB		= @RANLIB@
+ RANLIB_STUB	= @RANLIB_STUB@
+ SHLIB_CFLAGS	= @SHLIB_CFLAGS@
+ SHLIB_LD	= @SHLIB_LD@
+-SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
++SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@ -ltiff
+ STLIB_LD	= @STLIB_LD@
+ TCL_DEFS	= @TCL_DEFS@
+ TCL_BIN_DIR	= @TCL_BIN_DIR@
+diff --git a/libtiff/configure.in b/libtiff/configure.in
+index 4145e65..c7c8a2d 100644
+--- a/libtiff/configure.in
++++ b/libtiff/configure.in
+@@ -81,20 +81,6 @@
+ 
+ TEA_ADD_SOURCES([tifftcl.c tifftclStubInit.c])
+ 
+-TEA_ADD_SOURCES([
+-	../compat/libtiff/libtiff/tif_aux.c		../compat/libtiff/libtiff/tif_close.c		../compat/libtiff/libtiff/tif_codec.c
+-	../compat/libtiff/libtiff/tif_compress.c	../compat/libtiff/libtiff/tif_dir.c		../compat/libtiff/libtiff/tif_dirinfo.c
+-	../compat/libtiff/libtiff/tif_dirread.c	../compat/libtiff/libtiff/tif_dirwrite.c	../compat/libtiff/libtiff/tif_dumpmode.c
+-	../compat/libtiff/libtiff/tif_error.c		../compat/libtiff/libtiff/tif_fax3.c
+-	../compat/libtiff/libtiff/tif_getimage.c	../compat/libtiff/libtiff/tif_flush.c		../compat/libtiff/libtiff/tif_luv.c
+-	../compat/libtiff/libtiff/tif_lzw.c		../compat/libtiff/libtiff/tif_next.c		../compat/libtiff/libtiff/tif_open.c
+-	../compat/libtiff/libtiff/tif_packbits.c	../compat/libtiff/libtiff/tif_predict.c	../compat/libtiff/libtiff/tif_print.c
+-	../compat/libtiff/libtiff/tif_read.c		../compat/libtiff/libtiff/tif_swab.c		../compat/libtiff/libtiff/tif_strip.c
+-	../compat/libtiff/libtiff/tif_thunder.c	../compat/libtiff/libtiff/tif_tile.c		../compat/libtiff/libtiff/tif_version.c
+-	../compat/libtiff/libtiff/tif_warning.c	../compat/libtiff/libtiff/tif_write.c
+-	../compat/libtiff/libtiff/tif_color.c		../compat/libtiff/libtiff/tif_extension.c
+-])
+-
+ TEA_ADD_HEADERS([tifftcl.h tifftclDecls.h])
+ TEA_ADD_INCLUDES([-I\"`\${CYGPATH} \${srcdir}`\"])
+ TEA_ADD_INCLUDES([-I\"./libtiff\"])
+@@ -118,7 +118,6 @@
+     TEA_ADD_SOURCES([../compat/libtiff/libtiff/tif_win32.c])
+ else
+     CLEANFILES=""
+-    TEA_ADD_SOURCES([../compat/libtiff/libtiff/tif_unix.c])
+ fi
+ AC_SUBST(CLEANFILES)
+ 
+diff --git a/libtiff/tifftclDecls.h b/libtiff/tifftclDecls.h
+index 1732cad..1c71857 100644
+--- a/libtiff/tifftclDecls.h
++++ b/libtiff/tifftclDecls.h
+@@ -34,9 +34,13 @@ EXTERN int Tifftcl_SafeInit(Tcl_Interp *interp);
+  */
+ #undef INLINE
+ 
+-#include "../compat/libtiff/libtiff/tiffio.h"
+-#include "../compat/libtiff/libtiff/tiffiop.h"
+-#include "../compat/libtiff/libtiff/tif_predict.h"
++#include <@GENTOO_PORTAGE_EPREFIX@/usr/include/tiffio.h>
++
++/*
++ * Typedefs for ``method pointers'' used internally.
++ */
++typedef unsigned char tidataval_t;	/* internal image data value type */
++typedef tidataval_t* tidata_t;          /* reference to internal image data */
+ 
+ /* !BEGIN!: Do not edit below this line. */
+ 
+@@ -54,18 +58,18 @@ TIFFTCLAPI TIFFCodec *	TIFFRegisterCODEC(uint16 a, const char *b,
+ /* 3 */
+ TIFFTCLAPI void		TIFFUnRegisterCODEC(TIFFCodec *a);
+ /* 4 */
+-TIFFTCLAPI tdata_t	_TIFFmalloc(tsize_t a);
++TIFFTCLAPI tdata_t	_TIFFmalloc(tmsize_t a);
+ /* 5 */
+-TIFFTCLAPI tdata_t	_TIFFrealloc(tdata_t a, tsize_t b);
++TIFFTCLAPI tdata_t	_TIFFrealloc(void *a, tmsize_t b);
+ /* 6 */
+-TIFFTCLAPI void		_TIFFmemset(tdata_t a, int b, tsize_t c);
++TIFFTCLAPI void		_TIFFmemset(void *a, int b, tmsize_t c);
+ /* 7 */
+-TIFFTCLAPI void		_TIFFmemcpy(tdata_t a, const tdata_t b, tsize_t c);
++TIFFTCLAPI void		_TIFFmemcpy(void *a, const void *b, tmsize_t c);
+ /* 8 */
+-TIFFTCLAPI int		_TIFFmemcmp(const tdata_t a, const tdata_t b,
+-				tsize_t c);
++TIFFTCLAPI int		_TIFFmemcmp(const void *a, const void *b,
++				tmsize_t c);
+ /* 9 */
+-TIFFTCLAPI void		_TIFFfree(tdata_t a);
++TIFFTCLAPI void		_TIFFfree(void *a);
+ /* 10 */
+ TIFFTCLAPI void		TIFFClose(TIFF *tiffptr);
+ /* 11 */
+@@ -73,30 +77,30 @@ TIFFTCLAPI int		TIFFFlush(TIFF *tiffptr);
+ /* 12 */
+ TIFFTCLAPI int		TIFFFlushData(TIFF *tiffptr);
+ /* 13 */
+-TIFFTCLAPI int		TIFFGetField(TIFF *tiffptr, ttag_t a, ...);
++TIFFTCLAPI int		TIFFGetField(TIFF *tiffptr, uint32 a, ...);
+ /* 14 */
+-TIFFTCLAPI int		TIFFVGetField(TIFF *tiffptr, ttag_t a, va_list b);
++TIFFTCLAPI int		TIFFVGetField(TIFF *tiffptr, uint32 a, va_list b);
+ /* 15 */
+-TIFFTCLAPI int		TIFFGetFieldDefaulted(TIFF *tiffptr, ttag_t a, ...);
++TIFFTCLAPI int		TIFFGetFieldDefaulted(TIFF *tiffptr, uint32 a, ...);
+ /* 16 */
+-TIFFTCLAPI int		TIFFVGetFieldDefaulted(TIFF *tiffptr, ttag_t a,
++TIFFTCLAPI int		TIFFVGetFieldDefaulted(TIFF *tiffptr, uint32 a,
+ 				va_list b);
+ /* 17 */
+ TIFFTCLAPI int		TIFFReadDirectory(TIFF *tiffptr);
+ /* 18 */
+-TIFFTCLAPI tsize_t	TIFFScanlineSize(TIFF *tiffptr);
++TIFFTCLAPI tmsize_t	TIFFScanlineSize(TIFF *tiffptr);
+ /* 19 */
+-TIFFTCLAPI tsize_t	TIFFRasterScanlineSize(TIFF *tiffptr);
++TIFFTCLAPI tmsize_t	TIFFRasterScanlineSize(TIFF *tiffptr);
+ /* 20 */
+-TIFFTCLAPI tsize_t	TIFFStripSize(TIFF *tiffptr);
++TIFFTCLAPI tmsize_t	TIFFStripSize(TIFF *tiffptr);
+ /* 21 */
+-TIFFTCLAPI tsize_t	TIFFVStripSize(TIFF *tiffptr, uint32 a);
++TIFFTCLAPI tmsize_t	TIFFVStripSize(TIFF *tiffptr, uint32 a);
+ /* 22 */
+-TIFFTCLAPI tsize_t	TIFFTileRowSize(TIFF *tiffptr);
++TIFFTCLAPI tmsize_t	TIFFTileRowSize(TIFF *tiffptr);
+ /* 23 */
+-TIFFTCLAPI tsize_t	TIFFTileSize(TIFF *tiffptr);
++TIFFTCLAPI tmsize_t	TIFFTileSize(TIFF *tiffptr);
+ /* 24 */
+-TIFFTCLAPI tsize_t	TIFFVTileSize(TIFF *tiffptr, uint32 a);
++TIFFTCLAPI tmsize_t	TIFFVTileSize(TIFF *tiffptr, uint32 a);
+ /* 25 */
+ TIFFTCLAPI uint32	TIFFDefaultStripSize(TIFF *tiffptr, uint32 a);
+ /* 26 */
+@@ -117,21 +121,21 @@ TIFFTCLAPI int		TIFFIsMSB2LSB(TIFF *tiffptr);
+ /* 33 */
+ TIFFTCLAPI uint32	TIFFCurrentRow(TIFF *tiffptr);
+ /* 34 */
+-TIFFTCLAPI tdir_t	TIFFCurrentDirectory(TIFF *tiffptr);
++TIFFTCLAPI uint16	TIFFCurrentDirectory(TIFF *tiffptr);
+ /* 35 */
+-TIFFTCLAPI tdir_t	TIFFNumberOfDirectories(TIFF *tiffptr);
++TIFFTCLAPI uint16	TIFFNumberOfDirectories(TIFF *tiffptr);
+ /* 36 */
+-TIFFTCLAPI uint32	TIFFCurrentDirOffset(TIFF *tiffptr);
++TIFFTCLAPI uint64	TIFFCurrentDirOffset(TIFF *tiffptr);
+ /* 37 */
+-TIFFTCLAPI tstrip_t	TIFFCurrentStrip(TIFF *tiffptr);
++TIFFTCLAPI uint32	TIFFCurrentStrip(TIFF *tiffptr);
+ /* 38 */
+-TIFFTCLAPI ttile_t	TIFFCurrentTile(TIFF *tiffptr);
++TIFFTCLAPI uint32	TIFFCurrentTile(TIFF *tiffptr);
+ /* 39 */
+-TIFFTCLAPI int		TIFFReadBufferSetup(TIFF *tiffptr, tdata_t a,
+-				tsize_t b);
++TIFFTCLAPI int		TIFFReadBufferSetup(TIFF *tiffptr, void *a,
++				tmsize_t b);
+ /* 40 */
+-TIFFTCLAPI int		TIFFWriteBufferSetup(TIFF *tiffptr, tdata_t a,
+-				tsize_t b);
++TIFFTCLAPI int		TIFFWriteBufferSetup(TIFF *tiffptr, void *a,
++				tmsize_t b);
+ /* 41 */
+ TIFFTCLAPI int		TIFFWriteCheck(TIFF *tiffptr, int a, const char *b);
+ /* 42 */
+@@ -139,33 +143,31 @@ TIFFTCLAPI int		TIFFCreateDirectory(TIFF *tiffptr);
+ /* 43 */
+ TIFFTCLAPI int		TIFFLastDirectory(TIFF *tiffptr);
+ /* 44 */
+-TIFFTCLAPI int		TIFFSetDirectory(TIFF *tiffptr, tdir_t a);
++TIFFTCLAPI int		TIFFSetDirectory(TIFF *tiffptr, uint16 a);
+ /* 45 */
+-TIFFTCLAPI int		TIFFSetSubDirectory(TIFF *tiffptr, uint32 a);
++TIFFTCLAPI int		TIFFSetSubDirectory(TIFF *tiffptr, uint64 a);
+ /* 46 */
+-TIFFTCLAPI int		TIFFUnlinkDirectory(TIFF *tiffptr, tdir_t a);
++TIFFTCLAPI int		TIFFUnlinkDirectory(TIFF *tiffptr, uint16 a);
+ /* 47 */
+-TIFFTCLAPI int		TIFFSetField(TIFF *tiffptr, ttag_t a, ...);
++TIFFTCLAPI int		TIFFSetField(TIFF *tiffptr, uint32 a, ...);
+ /* 48 */
+-TIFFTCLAPI int		TIFFVSetField(TIFF *tiffptr, ttag_t a, va_list b);
++TIFFTCLAPI int		TIFFVSetField(TIFF *tiffptr, uint32 a, va_list b);
+ /* 49 */
+ TIFFTCLAPI int		TIFFWriteDirectory(TIFF *tiffptr);
+ /* 50 */
+-TIFFTCLAPI int		TIFFReassignTagToIgnore(enum TIFFIgnoreSense a,
+-				int b);
+ /* 51 */
+ TIFFTCLAPI void		TIFFPrintDirectory(TIFF *tiffptr, FILE *a, long b);
+ /* 52 */
+-TIFFTCLAPI int		TIFFReadScanline(TIFF *tiffptr, tdata_t a, uint32 b,
+-				tsample_t c);
++TIFFTCLAPI int		TIFFReadScanline(TIFF *tiffptr, void *a, uint32 b,
++				uint16 c);
+ /* 53 */
+-TIFFTCLAPI int		TIFFWriteScanline(TIFF *tiffptr, tdata_t a, uint32 b,
+-				tsample_t c);
++TIFFTCLAPI int		TIFFWriteScanline(TIFF *tiffptr, void *a, uint32 b,
++				uint16 c);
+ /* 54 */
+ TIFFTCLAPI int		TIFFReadRGBAImage(TIFF *tiffptr, uint32 a, uint32 b,
+ 				uint32 *c, int d);
+ /* 55 */
+-TIFFTCLAPI int		TIFFReadRGBAStrip(TIFF *tiffptr, tstrip_t a,
++TIFFTCLAPI int		TIFFReadRGBAStrip(TIFF *tiffptr, uint32 a,
+ 				uint32 *b);
+ /* 56 */
+ TIFFTCLAPI int		TIFFReadRGBATile(TIFF *tiffptr, uint32 a, uint32 b,
+@@ -203,48 +205,48 @@ TIFFTCLAPI TIFFErrorHandler TIFFSetWarningHandler(TIFFErrorHandler a);
+ /* 69 */
+ TIFFTCLAPI TIFFExtendProc TIFFSetTagExtender(TIFFExtendProc a);
+ /* 70 */
+-TIFFTCLAPI ttile_t	TIFFComputeTile(TIFF *tiffptr, uint32 a, uint32 b,
+-				uint32 c, tsample_t d);
++TIFFTCLAPI uint32	TIFFComputeTile(TIFF *tiffptr, uint32 a, uint32 b,
++				uint32 c, uint16 d);
+ /* 71 */
+ TIFFTCLAPI int		TIFFCheckTile(TIFF *tiffptr, uint32 d, uint32 c,
+-				uint32 b, tsample_t a);
++				uint32 b, uint16 a);
+ /* 72 */
+-TIFFTCLAPI ttile_t	TIFFNumberOfTiles(TIFF *tiffptr);
++TIFFTCLAPI uint32	TIFFNumberOfTiles(TIFF *tiffptr);
+ /* 73 */
+-TIFFTCLAPI tsize_t	TIFFReadTile(TIFF *tiffptr, tdata_t a, uint32 b,
+-				uint32 c, uint32 d, tsample_t e);
++TIFFTCLAPI tmsize_t	TIFFReadTile(TIFF *tiffptr, void *a, uint32 b,
++				uint32 c, uint32 d, uint16 e);
+ /* 74 */
+-TIFFTCLAPI tsize_t	TIFFWriteTile(TIFF *tiffptr, tdata_t e, uint32 d,
+-				uint32 c, uint32 b, tsample_t a);
++TIFFTCLAPI tmsize_t	TIFFWriteTile(TIFF *tiffptr, void *e, uint32 d,
++				uint32 c, uint32 b, uint16 a);
+ /* 75 */
+-TIFFTCLAPI tstrip_t	TIFFComputeStrip(TIFF *tiffptr, uint32 a,
+-				tsample_t b);
++TIFFTCLAPI uint32	TIFFComputeStrip(TIFF *tiffptr, uint32 a,
++				uint16 b);
+ /* 76 */
+-TIFFTCLAPI tstrip_t	TIFFNumberOfStrips(TIFF *tiffptr);
++TIFFTCLAPI uint32	TIFFNumberOfStrips(TIFF *tiffptr);
+ /* 77 */
+-TIFFTCLAPI tsize_t	TIFFReadEncodedStrip(TIFF *tiffptr, tstrip_t a,
+-				tdata_t b, tsize_t c);
++TIFFTCLAPI tmsize_t	TIFFReadEncodedStrip(TIFF *tiffptr, uint32 a,
++				void *b, tmsize_t c);
+ /* 78 */
+-TIFFTCLAPI tsize_t	TIFFReadRawStrip(TIFF *tiffptr, tstrip_t a,
+-				tdata_t b, tsize_t c);
++TIFFTCLAPI tmsize_t	TIFFReadRawStrip(TIFF *tiffptr, uint32 a,
++				void *b, tmsize_t c);
+ /* 79 */
+-TIFFTCLAPI tsize_t	TIFFReadEncodedTile(TIFF *tiffptr, ttile_t a,
+-				tdata_t b, tsize_t c);
++TIFFTCLAPI tmsize_t	TIFFReadEncodedTile(TIFF *tiffptr, uint32 a,
++				void *b, tmsize_t c);
+ /* 80 */
+-TIFFTCLAPI tsize_t	TIFFReadRawTile(TIFF *tiffptr, ttile_t c, tdata_t b,
+-				tsize_t a);
++TIFFTCLAPI tmsize_t	TIFFReadRawTile(TIFF *tiffptr, uint32 c, void *b,
++				tmsize_t a);
+ /* 81 */
+-TIFFTCLAPI tsize_t	TIFFWriteEncodedStrip(TIFF *tiffptr, tstrip_t a,
+-				tdata_t b, tsize_t c);
++TIFFTCLAPI tmsize_t	TIFFWriteEncodedStrip(TIFF *tiffptr, uint32 a,
++				void *b, tmsize_t c);
+ /* 82 */
+-TIFFTCLAPI tsize_t	TIFFWriteRawStrip(TIFF *tiffptr, tstrip_t a,
+-				tdata_t b, tsize_t c);
++TIFFTCLAPI tmsize_t	TIFFWriteRawStrip(TIFF *tiffptr, uint32 a,
++				void *b, tmsize_t c);
+ /* 83 */
+-TIFFTCLAPI tsize_t	TIFFWriteEncodedTile(TIFF *tiffptr, ttile_t a,
+-				tdata_t b, tsize_t c);
++TIFFTCLAPI tmsize_t	TIFFWriteEncodedTile(TIFF *tiffptr, uint32 a,
++				void *b, tmsize_t c);
+ /* 84 */
+-TIFFTCLAPI tsize_t	TIFFWriteRawTile(TIFF *tiffptr, ttile_t c, tdata_t b,
+-				tsize_t a);
++TIFFTCLAPI tmsize_t	TIFFWriteRawTile(TIFF *tiffptr, uint32 c, void *b,
++				tmsize_t a);
+ /* 85 */
+ TIFFTCLAPI void		TIFFSetWriteOffset(TIFF *tiffptr, toff_t a);
+ /* 86 */
+@@ -254,13 +256,13 @@ TIFFTCLAPI void		TIFFSwabLong(uint32 *a);
+ /* 88 */
+ TIFFTCLAPI void		TIFFSwabDouble(double *a);
+ /* 89 */
+-TIFFTCLAPI void		TIFFSwabArrayOfShort(uint16 *a, unsigned long b);
++TIFFTCLAPI void		TIFFSwabArrayOfShort(uint16 *a, tmsize_t b);
+ /* 90 */
+-TIFFTCLAPI void		TIFFSwabArrayOfLong(uint32 *b, unsigned long a);
++TIFFTCLAPI void		TIFFSwabArrayOfLong(uint32 *b, tmsize_t a);
+ /* 91 */
+-TIFFTCLAPI void		TIFFSwabArrayOfDouble(double *a, unsigned long b);
++TIFFTCLAPI void		TIFFSwabArrayOfDouble(double *a, tmsize_t b);
+ /* 92 */
+-TIFFTCLAPI void		TIFFReverseBits(unsigned char *a, unsigned long b);
++TIFFTCLAPI void		TIFFReverseBits(uint8 *a, tmsize_t b);
+ /* 93 */
+ TIFFTCLAPI const unsigned char * TIFFGetBitRevTable(int a);
+ /* Slot 94 is reserved */
+@@ -269,8 +271,6 @@ TIFFTCLAPI const unsigned char * TIFFGetBitRevTable(int a);
+ /* Slot 97 is reserved */
+ /* Slot 98 is reserved */
+ /* Slot 99 is reserved */
+-/* 100 */
+-TIFFTCLAPI int		TIFFPredictorInit(TIFF *tiffptr);
+ /* Slot 101 is reserved */
+ /* Slot 102 is reserved */
+ /* Slot 103 is reserved */
+@@ -281,20 +281,13 @@ TIFFTCLAPI int		TIFFPredictorInit(TIFF *tiffptr);
+ /* Slot 108 is reserved */
+ /* Slot 109 is reserved */
+ /* 110 */
+-TIFFTCLAPI void		_TIFFSetupFieldInfo(TIFF *tiffptr,
+-				const TIFFFieldInfo a[], size_t b);
+ /* 111 */
+-TIFFTCLAPI int		_TIFFMergeFieldInfo(TIFF *tiffptr,
+-				const TIFFFieldInfo *a, int b);
+ /* 112 */
+ TIFFTCLAPI void		_TIFFPrintFieldInfo(TIFF *tiffptr, FILE *a);
+ /* 113 */
+-TIFFTCLAPI const TIFFFieldInfo * TIFFFindFieldInfo(TIFF *tiffptr, ttag_t a,
+-				TIFFDataType b);
+ /* 114 */
+-TIFFTCLAPI const TIFFFieldInfo * TIFFFieldWithTag(TIFF *tiffptr, ttag_t a);
++TIFFTCLAPI const TIFFField * TIFFFieldWithTag(TIFF *tiffptr, uint32 a);
+ /* 115 */
+-TIFFTCLAPI TIFFDataType	 _TIFFSampleToTagType(TIFF *tiffptr);
+ /* Slot 116 is reserved */
+ /* Slot 117 is reserved */
+ /* Slot 118 is reserved */
+@@ -302,43 +295,42 @@ TIFFTCLAPI TIFFDataType	 _TIFFSampleToTagType(TIFF *tiffptr);
+ /* 120 */
+ TIFFTCLAPI int		_TIFFgetMode(const char *a, const char *b);
+ /* 121 */
+-TIFFTCLAPI int		_TIFFNoRowEncode(TIFF *tiffptr, tidata_t a,
+-				tsize_t b, tsample_t c);
++TIFFTCLAPI int		_TIFFNoRowEncode(TIFF *tiffptr, uint8 *a,
++				tmsize_t b, uint16 c);
+ /* 122 */
+-TIFFTCLAPI int		_TIFFNoStripEncode(TIFF *tiffptr, tidata_t c,
+-				tsize_t b, tsample_t a);
++TIFFTCLAPI int		_TIFFNoStripEncode(TIFF *tiffptr, uint8 *c,
++				tmsize_t b, uint16 a);
+ /* 123 */
+-TIFFTCLAPI int		_TIFFNoTileEncode(TIFF *tiffptr, tidata_t a,
+-				tsize_t b, tsample_t c);
++TIFFTCLAPI int		_TIFFNoTileEncode(TIFF *tiffptr, uint8 *a,
++				tmsize_t b, uint16 c);
+ /* 124 */
+-TIFFTCLAPI int		_TIFFNoRowDecode(TIFF *tiffptr, tidata_t c,
+-				tsize_t b, tsample_t a);
++TIFFTCLAPI int		_TIFFNoRowDecode(TIFF *tiffptr, uint8 *c,
++				tmsize_t b, uint16 a);
+ /* 125 */
+-TIFFTCLAPI int		_TIFFNoStripDecode(TIFF *tiffptr, tidata_t a,
+-				tsize_t b, tsample_t c);
++TIFFTCLAPI int		_TIFFNoStripDecode(TIFF *tiffptr, uint8 *a,
++				tmsize_t b, uint16 c);
+ /* 126 */
+-TIFFTCLAPI int		_TIFFNoTileDecode(TIFF *tiffptr, tidata_t c,
+-				tsize_t b, tsample_t a);
++TIFFTCLAPI int		_TIFFNoTileDecode(TIFF *tiffptr, uint8 *c,
++				tmsize_t b, uint16 a);
+ /* 127 */
+-TIFFTCLAPI void		_TIFFNoPostDecode(TIFF *tiffptr, tidata_t a,
+-				tsize_t b);
++TIFFTCLAPI void		_TIFFNoPostDecode(TIFF *tiffptr, uint8 *a,
++				tmsize_t b);
+ /* 128 */
+-TIFFTCLAPI int		_TIFFNoPreCode(TIFF *tiffptr, tsample_t a);
++TIFFTCLAPI int		_TIFFNoPreCode(TIFF *tiffptr, uint16 a);
+ /* 129 */
+ TIFFTCLAPI int		_TIFFNoSeek(TIFF *tiffptr, uint32 a);
+ /* 130 */
+-TIFFTCLAPI void		_TIFFSwab16BitData(TIFF *tiffptr, tidata_t a,
+-				tsize_t b);
++TIFFTCLAPI void		_TIFFSwab16BitData(TIFF *tiffptr, uint8 *a,
++				tmsize_t b);
+ /* 131 */
+-TIFFTCLAPI void		_TIFFSwab32BitData(TIFF *tiffptr, tidata_t b,
+-				tsize_t a);
++TIFFTCLAPI void		_TIFFSwab32BitData(TIFF *tiffptr, uint8 *b,
++				tmsize_t a);
+ /* 132 */
+-TIFFTCLAPI void		_TIFFSwab64BitData(TIFF *tiffptr, tidata_t a,
+-				tsize_t b);
++TIFFTCLAPI void		_TIFFSwab64BitData(TIFF *tiffptr, uint8 *a,
++				tmsize_t b);
+ /* 133 */
+ TIFFTCLAPI int		TIFFFlushData1(TIFF *tiffptr);
+ /* 134 */
+-TIFFTCLAPI void		TIFFFreeDirectory(TIFF *tiffptr);
+ /* 135 */
+ TIFFTCLAPI int		TIFFDefaultDirectory(TIFF *tiffptr);
+ /* 136 */
+@@ -397,6 +389,8 @@ TIFFTCLAPI int		TIFFInitZIP(TIFF *tiffptr, int a);
+ TIFFTCLAPI int		TIFFInitPixarLog(TIFF *tiffptr, int a);
+ /* 162 */
+ TIFFTCLAPI int		TIFFInitSGILog(TIFF *tiffptr, int a);
++/* 163 */
++TIFFTCLAPI int		TIFFInitLZMA(TIFF *tiffptr, int a);
+ 
+ typedef struct TifftclStubs {
+     int magic;
+@@ -406,27 +400,27 @@ typedef struct TifftclStubs {
+     const TIFFCodec * (*tIFFFindCODEC) (uint16 a); /* 1 */
+     TIFFCodec * (*tIFFRegisterCODEC) (uint16 a, const char *b, TIFFInitMethod c); /* 2 */
+     void (*tIFFUnRegisterCODEC) (TIFFCodec *a); /* 3 */
+-    tdata_t (*_TIFFmallocPtr) (tsize_t a); /* 4 */
+-    tdata_t (*_TIFFreallocPtr) (tdata_t a, tsize_t b); /* 5 */
+-    void (*_TIFFmemsetPtr) (tdata_t a, int b, tsize_t c); /* 6 */
+-    void (*_TIFFmemcpyPtr) (tdata_t a, const tdata_t b, tsize_t c); /* 7 */
+-    int (*_TIFFmemcmpPtr) (const tdata_t a, const tdata_t b, tsize_t c); /* 8 */
+-    void (*_TIFFfreePtr) (tdata_t a); /* 9 */
++    tdata_t (*_TIFFmallocPtr) (tmsize_t a); /* 4 */
++    tdata_t (*_TIFFreallocPtr) (void *a, tmsize_t b); /* 5 */
++    void (*_TIFFmemsetPtr) (void *a, int b, tmsize_t c); /* 6 */
++    void (*_TIFFmemcpyPtr) (void *a, const void *b, tmsize_t c); /* 7 */
++    int (*_TIFFmemcmpPtr) (const void *a, const void *b, tmsize_t c); /* 8 */
++    void (*_TIFFfreePtr) (void *a); /* 9 */
+     void (*tIFFClose) (TIFF *tiffptr); /* 10 */
+     int (*tIFFFlush) (TIFF *tiffptr); /* 11 */
+     int (*tIFFFlushData) (TIFF *tiffptr); /* 12 */
+-    int (*tIFFGetField) (TIFF *tiffptr, ttag_t a, ...); /* 13 */
+-    int (*tIFFVGetField) (TIFF *tiffptr, ttag_t a, va_list b); /* 14 */
+-    int (*tIFFGetFieldDefaulted) (TIFF *tiffptr, ttag_t a, ...); /* 15 */
+-    int (*tIFFVGetFieldDefaulted) (TIFF *tiffptr, ttag_t a, va_list b); /* 16 */
++    int (*tIFFGetField) (TIFF *tiffptr, uint32 a, ...); /* 13 */
++    int (*tIFFVGetField) (TIFF *tiffptr, uint32 a, va_list b); /* 14 */
++    int (*tIFFGetFieldDefaulted) (TIFF *tiffptr, uint32 a, ...); /* 15 */
++    int (*tIFFVGetFieldDefaulted) (TIFF *tiffptr, uint32 a, va_list b); /* 16 */
+     int (*tIFFReadDirectory) (TIFF *tiffptr); /* 17 */
+-    tsize_t (*tIFFScanlineSize) (TIFF *tiffptr); /* 18 */
+-    tsize_t (*tIFFRasterScanlineSize) (TIFF *tiffptr); /* 19 */
+-    tsize_t (*tIFFStripSize) (TIFF *tiffptr); /* 20 */
+-    tsize_t (*tIFFVStripSize) (TIFF *tiffptr, uint32 a); /* 21 */
+-    tsize_t (*tIFFTileRowSize) (TIFF *tiffptr); /* 22 */
+-    tsize_t (*tIFFTileSize) (TIFF *tiffptr); /* 23 */
+-    tsize_t (*tIFFVTileSize) (TIFF *tiffptr, uint32 a); /* 24 */
++    tmsize_t (*tIFFScanlineSize) (TIFF *tiffptr); /* 18 */
++    tmsize_t (*tIFFRasterScanlineSize) (TIFF *tiffptr); /* 19 */
++    tmsize_t (*tIFFStripSize) (TIFF *tiffptr); /* 20 */
++    tmsize_t (*tIFFVStripSize) (TIFF *tiffptr, uint32 a); /* 21 */
++    tmsize_t (*tIFFTileRowSize) (TIFF *tiffptr); /* 22 */
++    tmsize_t (*tIFFTileSize) (TIFF *tiffptr); /* 23 */
++    tmsize_t (*tIFFVTileSize) (TIFF *tiffptr, uint32 a); /* 24 */
+     uint32 (*tIFFDefaultStripSize) (TIFF *tiffptr, uint32 a); /* 25 */
+     void (*tIFFDefaultTileSize) (TIFF *tiffptr, uint32 *a, uint32 *b); /* 26 */
+     int (*tIFFFileno) (TIFF *tiffptr); /* 27 */
+@@ -436,28 +430,28 @@ typedef struct TifftclStubs {
+     int (*tIFFIsUpSampled) (TIFF *tiffptr); /* 31 */
+     int (*tIFFIsMSB2LSB) (TIFF *tiffptr); /* 32 */
+     uint32 (*tIFFCurrentRow) (TIFF *tiffptr); /* 33 */
+-    tdir_t (*tIFFCurrentDirectory) (TIFF *tiffptr); /* 34 */
+-    tdir_t (*tIFFNumberOfDirectories) (TIFF *tiffptr); /* 35 */
+-    uint32 (*tIFFCurrentDirOffset) (TIFF *tiffptr); /* 36 */
+-    tstrip_t (*tIFFCurrentStrip) (TIFF *tiffptr); /* 37 */
+-    ttile_t (*tIFFCurrentTile) (TIFF *tiffptr); /* 38 */
+-    int (*tIFFReadBufferSetup) (TIFF *tiffptr, tdata_t a, tsize_t b); /* 39 */
+-    int (*tIFFWriteBufferSetup) (TIFF *tiffptr, tdata_t a, tsize_t b); /* 40 */
++    uint16 (*tIFFCurrentDirectory) (TIFF *tiffptr); /* 34 */
++    uint16 (*tIFFNumberOfDirectories) (TIFF *tiffptr); /* 35 */
++    uint64 (*tIFFCurrentDirOffset) (TIFF *tiffptr); /* 36 */
++    uint32 (*tIFFCurrentStrip) (TIFF *tiffptr); /* 37 */
++    uint32 (*tIFFCurrentTile) (TIFF *tiffptr); /* 38 */
++    int (*tIFFReadBufferSetup) (TIFF *tiffptr, void *a, tmsize_t b); /* 39 */
++    int (*tIFFWriteBufferSetup) (TIFF *tiffptr, void *a, tmsize_t b); /* 40 */
+     int (*tIFFWriteCheck) (TIFF *tiffptr, int a, const char *b); /* 41 */
+     int (*tIFFCreateDirectory) (TIFF *tiffptr); /* 42 */
+     int (*tIFFLastDirectory) (TIFF *tiffptr); /* 43 */
+-    int (*tIFFSetDirectory) (TIFF *tiffptr, tdir_t a); /* 44 */
+-    int (*tIFFSetSubDirectory) (TIFF *tiffptr, uint32 a); /* 45 */
+-    int (*tIFFUnlinkDirectory) (TIFF *tiffptr, tdir_t a); /* 46 */
+-    int (*tIFFSetField) (TIFF *tiffptr, ttag_t a, ...); /* 47 */
+-    int (*tIFFVSetField) (TIFF *tiffptr, ttag_t a, va_list b); /* 48 */
++    int (*tIFFSetDirectory) (TIFF *tiffptr, uint16 a); /* 44 */
++    int (*tIFFSetSubDirectory) (TIFF *tiffptr, uint64 a); /* 45 */
++    int (*tIFFUnlinkDirectory) (TIFF *tiffptr, uint16 a); /* 46 */
++    int (*tIFFSetField) (TIFF *tiffptr, uint32 a, ...); /* 47 */
++    int (*tIFFVSetField) (TIFF *tiffptr, uint32 a, va_list b); /* 48 */
+     int (*tIFFWriteDirectory) (TIFF *tiffptr); /* 49 */
+-    int (*tIFFReassignTagToIgnore) (enum TIFFIgnoreSense a, int b); /* 50 */
++    void (*reserved50)(void);
+     void (*tIFFPrintDirectory) (TIFF *tiffptr, FILE *a, long b); /* 51 */
+-    int (*tIFFReadScanline) (TIFF *tiffptr, tdata_t a, uint32 b, tsample_t c); /* 52 */
+-    int (*tIFFWriteScanline) (TIFF *tiffptr, tdata_t a, uint32 b, tsample_t c); /* 53 */
++    int (*tIFFReadScanline) (TIFF *tiffptr, void *a, uint32 b, uint16 c); /* 52 */
++    int (*tIFFWriteScanline) (TIFF *tiffptr, void *a, uint32 b, uint16 c); /* 53 */
+     int (*tIFFReadRGBAImage) (TIFF *tiffptr, uint32 a, uint32 b, uint32 *c, int d); /* 54 */
+-    int (*tIFFReadRGBAStrip) (TIFF *tiffptr, tstrip_t a, uint32 *b); /* 55 */
++    int (*tIFFReadRGBAStrip) (TIFF *tiffptr, uint32 a, uint32 *b); /* 55 */
+     int (*tIFFReadRGBATile) (TIFF *tiffptr, uint32 a, uint32 b, uint32 *c); /* 56 */
+     int (*tIFFRGBAImageOK) (TIFF *tiffptr, char *a); /* 57 */
+     int (*tIFFRGBAImageBegin) (TIFFRGBAImage *a, TIFF *tiffptr, int b, char *c); /* 58 */
+@@ -472,29 +466,29 @@ typedef struct TifftclStubs {
+     TIFFErrorHandler (*tIFFSetErrorHandler) (TIFFErrorHandler a); /* 67 */
+     TIFFErrorHandler (*tIFFSetWarningHandler) (TIFFErrorHandler a); /* 68 */
+     TIFFExtendProc (*tIFFSetTagExtender) (TIFFExtendProc a); /* 69 */
+-    ttile_t (*tIFFComputeTile) (TIFF *tiffptr, uint32 a, uint32 b, uint32 c, tsample_t d); /* 70 */
+-    int (*tIFFCheckTile) (TIFF *tiffptr, uint32 d, uint32 c, uint32 b, tsample_t a); /* 71 */
+-    ttile_t (*tIFFNumberOfTiles) (TIFF *tiffptr); /* 72 */
+-    tsize_t (*tIFFReadTile) (TIFF *tiffptr, tdata_t a, uint32 b, uint32 c, uint32 d, tsample_t e); /* 73 */
+-    tsize_t (*tIFFWriteTile) (TIFF *tiffptr, tdata_t e, uint32 d, uint32 c, uint32 b, tsample_t a); /* 74 */
+-    tstrip_t (*tIFFComputeStrip) (TIFF *tiffptr, uint32 a, tsample_t b); /* 75 */
+-    tstrip_t (*tIFFNumberOfStrips) (TIFF *tiffptr); /* 76 */
+-    tsize_t (*tIFFReadEncodedStrip) (TIFF *tiffptr, tstrip_t a, tdata_t b, tsize_t c); /* 77 */
+-    tsize_t (*tIFFReadRawStrip) (TIFF *tiffptr, tstrip_t a, tdata_t b, tsize_t c); /* 78 */
+-    tsize_t (*tIFFReadEncodedTile) (TIFF *tiffptr, ttile_t a, tdata_t b, tsize_t c); /* 79 */
+-    tsize_t (*tIFFReadRawTile) (TIFF *tiffptr, ttile_t c, tdata_t b, tsize_t a); /* 80 */
+-    tsize_t (*tIFFWriteEncodedStrip) (TIFF *tiffptr, tstrip_t a, tdata_t b, tsize_t c); /* 81 */
+-    tsize_t (*tIFFWriteRawStrip) (TIFF *tiffptr, tstrip_t a, tdata_t b, tsize_t c); /* 82 */
+-    tsize_t (*tIFFWriteEncodedTile) (TIFF *tiffptr, ttile_t a, tdata_t b, tsize_t c); /* 83 */
+-    tsize_t (*tIFFWriteRawTile) (TIFF *tiffptr, ttile_t c, tdata_t b, tsize_t a); /* 84 */
++    uint32 (*tIFFComputeTile) (TIFF *tiffptr, uint32 a, uint32 b, uint32 c, uint16 d); /* 70 */
++    int (*tIFFCheckTile) (TIFF *tiffptr, uint32 d, uint32 c, uint32 b, uint16 a); /* 71 */
++    uint32 (*tIFFNumberOfTiles) (TIFF *tiffptr); /* 72 */
++    tmsize_t (*tIFFReadTile) (TIFF *tiffptr, void *a, uint32 b, uint32 c, uint32 d, uint16 e); /* 73 */
++    tmsize_t (*tIFFWriteTile) (TIFF *tiffptr, void *e, uint32 d, uint32 c, uint32 b, uint16 a); /* 74 */
++    uint32 (*tIFFComputeStrip) (TIFF *tiffptr, uint32 a, uint16 b); /* 75 */
++    uint32 (*tIFFNumberOfStrips) (TIFF *tiffptr); /* 76 */
++    tmsize_t (*tIFFReadEncodedStrip) (TIFF *tiffptr, uint32 a, void *b, tmsize_t c); /* 77 */
++    tmsize_t (*tIFFReadRawStrip) (TIFF *tiffptr, uint32 a, void *b, tmsize_t c); /* 78 */
++    tmsize_t (*tIFFReadEncodedTile) (TIFF *tiffptr, uint32 a, void *b, tmsize_t c); /* 79 */
++    tmsize_t (*tIFFReadRawTile) (TIFF *tiffptr, uint32 c, void *b, tmsize_t a); /* 80 */
++    tmsize_t (*tIFFWriteEncodedStrip) (TIFF *tiffptr, uint32 a, void *b, tmsize_t c); /* 81 */
++    tmsize_t (*tIFFWriteRawStrip) (TIFF *tiffptr, uint32 a, void *b, tmsize_t c); /* 82 */
++    tmsize_t (*tIFFWriteEncodedTile) (TIFF *tiffptr, uint32 a, void *b, tmsize_t c); /* 83 */
++    tmsize_t (*tIFFWriteRawTile) (TIFF *tiffptr, uint32 c, void *b, tmsize_t a); /* 84 */
+     void (*tIFFSetWriteOffset) (TIFF *tiffptr, toff_t a); /* 85 */
+     void (*tIFFSwabShort) (uint16 *a); /* 86 */
+     void (*tIFFSwabLong) (uint32 *a); /* 87 */
+     void (*tIFFSwabDouble) (double *a); /* 88 */
+-    void (*tIFFSwabArrayOfShort) (uint16 *a, unsigned long b); /* 89 */
+-    void (*tIFFSwabArrayOfLong) (uint32 *b, unsigned long a); /* 90 */
+-    void (*tIFFSwabArrayOfDouble) (double *a, unsigned long b); /* 91 */
+-    void (*tIFFReverseBits) (unsigned char *a, unsigned long b); /* 92 */
++    void (*tIFFSwabArrayOfShort) (uint16 *a, tmsize_t b); /* 89 */
++    void (*tIFFSwabArrayOfLong) (uint32 *b, tmsize_t a); /* 90 */
++    void (*tIFFSwabArrayOfDouble) (double *a, tmsize_t b); /* 91 */
++    void (*tIFFReverseBits) (unsigned char *a, tmsize_t b); /* 92 */
+     const unsigned char * (*tIFFGetBitRevTable) (int a); /* 93 */
+     void (*reserved94)(void);
+     void (*reserved95)(void);
+@@ -502,7 +496,7 @@ typedef struct TifftclStubs {
+     void (*reserved97)(void);
+     void (*reserved98)(void);
+     void (*reserved99)(void);
+-    int (*tIFFPredictorInit) (TIFF *tiffptr); /* 100 */
++    void (*reserved100)(void);
+     void (*reserved101)(void);
+     void (*reserved102)(void);
+     void (*reserved103)(void);
+@@ -512,31 +506,31 @@ typedef struct TifftclStubs {
+     void (*reserved107)(void);
+     void (*reserved108)(void);
+     void (*reserved109)(void);
+-    void (*_TIFFSetupFieldInfoPtr) (TIFF *tiffptr, const TIFFFieldInfo a[], size_t b); /* 110 */
+-    int (*_TIFFMergeFieldInfoPtr) (TIFF *tiffptr, const TIFFFieldInfo *a, int b); /* 111 */
++    void (*reserved110)(void);
++    void (*reserved111)(void);
+     void (*_TIFFPrintFieldInfoPtr) (TIFF *tiffptr, FILE *a); /* 112 */
+-    const TIFFFieldInfo * (*tIFFFindFieldInfo) (TIFF *tiffptr, ttag_t a, TIFFDataType b); /* 113 */
+-    const TIFFFieldInfo * (*tIFFFieldWithTag) (TIFF *tiffptr, ttag_t a); /* 114 */
+-    TIFFDataType (*_TIFFSampleToTagTypePtr) (TIFF *tiffptr); /* 115 */
++    void (*reserved113)(void);
++    const TIFFField * (*tIFFFieldWithTag) (TIFF *tiffptr, uint32 a); /* 114 */
++    void (*reserved115)(void);
+     void (*reserved116)(void);
+     void (*reserved117)(void);
+     void (*reserved118)(void);
+     void (*reserved119)(void);
+     int (*_TIFFgetModePtr) (const char *a, const char *b); /* 120 */
+-    int (*_TIFFNoRowEncodePtr) (TIFF *tiffptr, tidata_t a, tsize_t b, tsample_t c); /* 121 */
+-    int (*_TIFFNoStripEncodePtr) (TIFF *tiffptr, tidata_t c, tsize_t b, tsample_t a); /* 122 */
+-    int (*_TIFFNoTileEncodePtr) (TIFF *tiffptr, tidata_t a, tsize_t b, tsample_t c); /* 123 */
+-    int (*_TIFFNoRowDecodePtr) (TIFF *tiffptr, tidata_t c, tsize_t b, tsample_t a); /* 124 */
+-    int (*_TIFFNoStripDecodePtr) (TIFF *tiffptr, tidata_t a, tsize_t b, tsample_t c); /* 125 */
+-    int (*_TIFFNoTileDecodePtr) (TIFF *tiffptr, tidata_t c, tsize_t b, tsample_t a); /* 126 */
+-    void (*_TIFFNoPostDecodePtr) (TIFF *tiffptr, tidata_t a, tsize_t b); /* 127 */
+-    int (*_TIFFNoPreCodePtr) (TIFF *tiffptr, tsample_t a); /* 128 */
++    int (*_TIFFNoRowEncodePtr) (TIFF *tiffptr, uint8 *a, tmsize_t b, uint16 c); /* 121 */
++    int (*_TIFFNoStripEncodePtr) (TIFF *tiffptr, uint8 *c, tmsize_t b, uint16 a); /* 122 */
++    int (*_TIFFNoTileEncodePtr) (TIFF *tiffptr, uint8 *a, tmsize_t b, uint16 c); /* 123 */
++    int (*_TIFFNoRowDecodePtr) (TIFF *tiffptr, uint8 *c, tmsize_t b, uint16 a); /* 124 */
++    int (*_TIFFNoStripDecodePtr) (TIFF *tiffptr, uint8 *a, tmsize_t b, uint16 c); /* 125 */
++    int (*_TIFFNoTileDecodePtr) (TIFF *tiffptr, uint8 *c, tmsize_t b, uint16 a); /* 126 */
++    void (*_TIFFNoPostDecodePtr) (TIFF *tiffptr, uint8 *a, tmsize_t b); /* 127 */
++    int (*_TIFFNoPreCodePtr) (TIFF *tiffptr, uint16 a); /* 128 */
+     int (*_TIFFNoSeekPtr) (TIFF *tiffptr, uint32 a); /* 129 */
+-    void (*_TIFFSwab16BitDataPtr) (TIFF *tiffptr, tidata_t a, tsize_t b); /* 130 */
+-    void (*_TIFFSwab32BitDataPtr) (TIFF *tiffptr, tidata_t b, tsize_t a); /* 131 */
+-    void (*_TIFFSwab64BitDataPtr) (TIFF *tiffptr, tidata_t a, tsize_t b); /* 132 */
++    void (*_TIFFSwab16BitDataPtr) (TIFF *tiffptr, uint8 *a, tmsize_t b); /* 130 */
++    void (*_TIFFSwab32BitDataPtr) (TIFF *tiffptr, uint8 *b, tmsize_t a); /* 131 */
++    void (*_TIFFSwab64BitDataPtr) (TIFF *tiffptr, uint8 *a, tmsize_t b); /* 132 */
+     int (*tIFFFlushData1) (TIFF *tiffptr); /* 133 */
+-    void (*tIFFFreeDirectory) (TIFF *tiffptr); /* 134 */
++    void (*reserved134)(void);
+     int (*tIFFDefaultDirectory) (TIFF *tiffptr); /* 135 */
+     int (*tIFFSetCompressionScheme) (TIFF *tiffptr, int a); /* 136 */
+     void (*_TIFFSetDefaultCompressionStatePtr) (TIFF *tiffptr); /* 137 */
+@@ -565,6 +559,7 @@ typedef struct TifftclStubs {
+     int (*tIFFInitZIP) (TIFF *tiffptr, int a); /* 160 */
+     int (*tIFFInitPixarLog) (TIFF *tiffptr, int a); /* 161 */
+     int (*tIFFInitSGILog) (TIFF *tiffptr, int a); /* 162 */
++    int (*tIFFInitLZMA) (TIFF *tiffptr, int a); /* 163 */
+ } TifftclStubs;
+ 
+ #ifdef __cplusplus
+@@ -681,8 +676,7 @@ TIFFTCLAPI const TifftclStubs *tifftclStubsPtr;
+ 	(tifftclStubsPtr->tIFFVSetField) /* 48 */
+ #define TIFFWriteDirectory \
+ 	(tifftclStubsPtr->tIFFWriteDirectory) /* 49 */
+-#define TIFFReassignTagToIgnore \
+-	(tifftclStubsPtr->tIFFReassignTagToIgnore) /* 50 */
++/* Slot 50 is reserved */
+ #define TIFFPrintDirectory \
+ 	(tifftclStubsPtr->tIFFPrintDirectory) /* 51 */
+ #define TIFFReadScanline \
+@@ -775,8 +769,7 @@ TIFFTCLAPI const TifftclStubs *tifftclStubsPtr;
+ /* Slot 97 is reserved */
+ /* Slot 98 is reserved */
+ /* Slot 99 is reserved */
+-#define TIFFPredictorInit \
+-	(tifftclStubsPtr->tIFFPredictorInit) /* 100 */
++/* Slot 100 is reserved */
+ /* Slot 101 is reserved */
+ /* Slot 102 is reserved */
+ /* Slot 103 is reserved */
+@@ -786,18 +779,14 @@ TIFFTCLAPI const TifftclStubs *tifftclStubsPtr;
+ /* Slot 107 is reserved */
+ /* Slot 108 is reserved */
+ /* Slot 109 is reserved */
+-#define _TIFFSetupFieldInfo \
+-	(tifftclStubsPtr->_TIFFSetupFieldInfoPtr) /* 110 */
+-#define _TIFFMergeFieldInfo \
+-	(tifftclStubsPtr->_TIFFMergeFieldInfoPtr) /* 111 */
++/* Slot 110 is reserved */
++/* Slot 111 is reserved */
+ #define _TIFFPrintFieldInfo \
+ 	(tifftclStubsPtr->_TIFFPrintFieldInfoPtr) /* 112 */
+-#define TIFFFindFieldInfo \
+-	(tifftclStubsPtr->tIFFFindFieldInfo) /* 113 */
++/* Slot 113 is reserved */
+ #define TIFFFieldWithTag \
+ 	(tifftclStubsPtr->tIFFFieldWithTag) /* 114 */
+-#define _TIFFSampleToTagType \
+-	(tifftclStubsPtr->_TIFFSampleToTagTypePtr) /* 115 */
++/* Slot 115 is reserved */
+ /* Slot 116 is reserved */
+ /* Slot 117 is reserved */
+ /* Slot 118 is reserved */
+@@ -830,8 +819,7 @@ TIFFTCLAPI const TifftclStubs *tifftclStubsPtr;
+ 	(tifftclStubsPtr->_TIFFSwab64BitDataPtr) /* 132 */
+ #define TIFFFlushData1 \
+ 	(tifftclStubsPtr->tIFFFlushData1) /* 133 */
+-#define TIFFFreeDirectory \
+-	(tifftclStubsPtr->tIFFFreeDirectory) /* 134 */
++/* Slot 134 is reserved */
+ #define TIFFDefaultDirectory \
+ 	(tifftclStubsPtr->tIFFDefaultDirectory) /* 135 */
+ #define TIFFSetCompressionScheme \
+@@ -888,6 +876,8 @@ TIFFTCLAPI const TifftclStubs *tifftclStubsPtr;
+ 	(tifftclStubsPtr->tIFFInitPixarLog) /* 161 */
+ #define TIFFInitSGILog \
+ 	(tifftclStubsPtr->tIFFInitSGILog) /* 162 */
++#define TIFFInitLZMA \
++	(tifftclStubsPtr->tIFFInitLZMA) /* 163 */
+ 
+ #endif /* defined(USE_TIFFTCL_STUBS) */
+ 
+diff --git a/libtiff/tifftclStubInit.c b/libtiff/tifftclStubInit.c
+index cf9448f..37d9916 100644
+--- a/libtiff/tifftclStubInit.c
++++ b/libtiff/tifftclStubInit.c
+@@ -70,7 +70,7 @@ const TifftclStubs tifftclStubs = {
+     TIFFSetField, /* 47 */
+     TIFFVSetField, /* 48 */
+     TIFFWriteDirectory, /* 49 */
+-    TIFFReassignTagToIgnore, /* 50 */
++    0, /* 50 */
+     TIFFPrintDirectory, /* 51 */
+     TIFFReadScanline, /* 52 */
+     TIFFWriteScanline, /* 53 */
+@@ -120,7 +120,7 @@ const TifftclStubs tifftclStubs = {
+     0, /* 97 */
+     0, /* 98 */
+     0, /* 99 */
+-    TIFFPredictorInit, /* 100 */
++    0, /* 100 */
+     0, /* 101 */
+     0, /* 102 */
+     0, /* 103 */
+@@ -130,12 +130,12 @@ const TifftclStubs tifftclStubs = {
+     0, /* 107 */
+     0, /* 108 */
+     0, /* 109 */
+-    _TIFFSetupFieldInfo, /* 110 */
+-    _TIFFMergeFieldInfo, /* 111 */
++    0, /* 110 */
++    0, /* 111 */
+     _TIFFPrintFieldInfo, /* 112 */
+-    TIFFFindFieldInfo, /* 113 */
++    0, /* 113 */
+     TIFFFieldWithTag, /* 114 */
+-    _TIFFSampleToTagType, /* 115 */
++    0, /* 115 */
+     0, /* 116 */
+     0, /* 117 */
+     0, /* 118 */
+@@ -154,7 +154,7 @@ const TifftclStubs tifftclStubs = {
+     _TIFFSwab32BitData, /* 131 */
+     _TIFFSwab64BitData, /* 132 */
+     TIFFFlushData1, /* 133 */
+-    TIFFFreeDirectory, /* 134 */
++    0, /* 134 */
+     TIFFDefaultDirectory, /* 135 */
+     TIFFSetCompressionScheme, /* 136 */
+     _TIFFSetDefaultCompressionState, /* 137 */
+@@ -239,6 +239,12 @@ const TifftclStubs tifftclStubs = {
+ #else  /* !LOGLUV_SUPPORT */
+     TIFFInitSGILog, /* 162 */
+ #endif /* !LOGLUV_SUPPORT */
++#if !defined(LZMA_SUPPORT)
++    0, /* 163 */
++#else
++    TIFFInitLZMA, /* 163 */
++#endif /* !LZMA_SUPPORT */
++
+ };
+ 
+ /* !END!: Do not edit above this line. */
+diff --git a/tiff/configure.in b/tiff/configure.in
+index 81851fa..524588d 100755
+--- a/tiff/configure.in
++++ b/tiff/configure.in
+@@ -74,7 +74,7 @@
+ # and PKG_TCL_SOURCES.
+ #-----------------------------------------------------------------------
+ 
+-TEA_ADD_SOURCES([tiff.c tiffJpeg.c tiffZip.c tiffPixar.c])
++TEA_ADD_SOURCES([tiff.c])
+ TEA_ADD_HEADERS([])
+ TEA_ADD_INCLUDES([-I\"`\${CYGPATH} \${srcdir}`\"])
+ TEA_ADD_INCLUDES([-I\"`\${CYGPATH} \${tkimg_SRC_PATH}`\"])
+diff --git a/tiff/tiff.c b/tiff/tiff.c
+index 78dd3b2..8bd5ec7 100644
+--- a/tiff/tiff.c
++++ b/tiff/tiff.c
+@@ -115,8 +115,8 @@ SetupTiffLibrary (interp)
+     if (!initialized) {
+ 	initialized = 1;
+ 	if (
+-	    TIFFRegisterCODEC   && TIFFError        && TIFFPredictorInit &&
+-	    _TIFFMergeFieldInfo  && TIFFFlushData1   && _TIFFNoPostDecode &&
++	    TIFFRegisterCODEC   && TIFFError        &&
++	    TIFFFlushData1   && _TIFFNoPostDecode &&
+ 	    TIFFTileRowSize     && TIFFScanlineSize && _TIFFsetByteArray &&
+ 	    TIFFVSetField       && TIFFSwabArrayOfShort
+ 	    ) {
+@@ -124,14 +124,14 @@ SetupTiffLibrary (interp)
+ 	  if (Zlibtcl_InitStubs(interp, ZLIBTCL_VERSION, 0) == NULL) {
+ 	    return TCL_ERROR;
+ 	  }
+-	  TIFFRegisterCODEC (COMPRESSION_DEFLATE,  "Deflate",  TkimgTIFFInitZip);
+-	  TIFFRegisterCODEC (COMPRESSION_ADOBE_DEFLATE, "AdobeDeflate", TkimgTIFFInitZip);
++	  TIFFRegisterCODEC (COMPRESSION_DEFLATE,  "Deflate", TIFFInitZIP);
++	  TIFFRegisterCODEC (COMPRESSION_ADOBE_DEFLATE, "AdobeDeflate", TIFFInitZIP);
+ 
+ 	  if (Jpegtcl_InitStubs(interp, JPEGTCL_VERSION, 0) == NULL) {
+ 	    return TCL_ERROR;
+ 	  }
+-	  TIFFRegisterCODEC (COMPRESSION_JPEG,     "JPEG",     TkimgTIFFInitJpeg);
+-	  TIFFRegisterCODEC (COMPRESSION_PIXARLOG, "PixarLog", TkimgTIFFInitPixar);
++	  TIFFRegisterCODEC (COMPRESSION_JPEG,     "JPEG",     TIFFInitJPEG);
++	  TIFFRegisterCODEC (COMPRESSION_PIXARLOG, "PixarLog", TIFFInitPixarLog);
+ 	}
+     }
+     return TCL_OK;
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.7-zlib.patch b/dev-tcltk/tkimg/files/tkimg-1.4.7-zlib.patch
new file mode 100644
index 000000000000..3d4845835ff7
--- /dev/null
+++ b/dev-tcltk/tkimg/files/tkimg-1.4.7-zlib.patch
@@ -0,0 +1,90 @@
+ zlib/Makefile.in    |   2 +-
+ zlib/configure.in   |   5 --
+ zlib/zlibtcl.decls  |   2 +-
+ zlib/zlibtclDecls.h |  10 +--
+ 5 files changed, 8 insertions(+), 184 deletions(-)
+
+diff --git a/zlib/Makefile.in b/zlib/Makefile.in
+index e70ec66..c8bf0f3 100644
+--- a/zlib/Makefile.in
++++ b/zlib/Makefile.in
+@@ -107,7 +107,7 @@ RANLIB		= @RANLIB@
+ RANLIB_STUB	= @RANLIB_STUB@
+ SHLIB_CFLAGS	= @SHLIB_CFLAGS@
+ SHLIB_LD	= @SHLIB_LD@
+-SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
++SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@ -lz
+ STLIB_LD	= @STLIB_LD@
+ TCL_DEFS	= @TCL_DEFS@
+ TCL_BIN_DIR	= @TCL_BIN_DIR@
+diff --git a/zlib/configure.in b/zlib/configure.in
+index 6b1e310..f51befa 100644
+--- a/zlib/configure.in
++++ b/zlib/configure.in
+@@ -51,11 +51,6 @@ TEA_SETUP_COMPILER
+ #-----------------------------------------------------------------------
+ 
+ TEA_ADD_SOURCES([zlibtcl.c zlibtclStubInit.c])
+-TEA_ADD_SOURCES([../compat/zlib/adler32.c	../compat/zlib/compress.c	../compat/zlib/crc32.c])
+-TEA_ADD_SOURCES([../compat/zlib/deflate.c	../compat/zlib/gzclose.c	../compat/zlib/gzlib.c])
+-TEA_ADD_SOURCES([../compat/zlib/gzread.c	../compat/zlib/gzwrite.c	../compat/zlib/infback.c])
+-TEA_ADD_SOURCES([../compat/zlib/inffast.c	../compat/zlib/inflate.c	../compat/zlib/inftrees.c])
+-TEA_ADD_SOURCES([../compat/zlib/trees.c	../compat/zlib/uncompr.c	../compat/zlib/zutil.c])
+ 
+ TEA_ADD_HEADERS([zlibtcl.h zlibtclDecls.h])
+ 
+diff --git a/zlib/zlibtcl.decls b/zlib/zlibtcl.decls
+index c4bf22e..b9fb804 100644
+--- a/zlib/zlibtcl.decls
++++ b/zlib/zlibtcl.decls
+@@ -138,7 +138,7 @@ declare 38 {
+     int gzputc(gzFile file, int c)
+ }
+ declare 39 {
+-    int gzgetc(gzFile file)
++    int gzgetc_(gzFile file)
+ }
+ declare 40 {
+     int gzflush(gzFile file, int flush)
+diff --git a/zlib/zlibtclDecls.h b/zlib/zlibtclDecls.h
+index 2f7ecb2..6393821 100644
+--- a/zlib/zlibtclDecls.h
++++ b/zlib/zlibtclDecls.h
+@@ -28,7 +28,7 @@
+ EXTERN int Zlibtcl_Init(Tcl_Interp *interp);
+ EXTERN int Zlibtcl_SafeInit(Tcl_Interp *interp);
+ 
+-#include "../compat/zlib/zlib.h"
++#include "@GENTOO_PORTAGE_EPREFIX@/usr/include/zlib.h"
+ 
+ /* !BEGIN!: Do not edit below this line. */
+ 
+@@ -120,7 +120,7 @@ ZEXTERN char *		gzgets(gzFile file, char *buf, int len);
+ /* 38 */
+ ZEXTERN int		gzputc(gzFile file, int c);
+ /* 39 */
+-ZEXTERN int		gzgetc(gzFile file);
++ZEXTERN int		gzgetc_(gzFile file);
+ /* 40 */
+ ZEXTERN int		gzflush(gzFile file, int flush);
+ /* 41 */
+@@ -179,7 +179,7 @@ typedef struct ZlibtclStubs {
+     int (*gzputsPtr) (gzFile file, const char *s); /* 36 */
+     char * (*gzgetsPtr) (gzFile file, char *buf, int len); /* 37 */
+     int (*gzputcPtr) (gzFile file, int c); /* 38 */
+-    int (*gzgetcPtr) (gzFile file); /* 39 */
++    int (*gzgetc_Ptr) (gzFile file); /* 39 */
+     int (*gzflushPtr) (gzFile file, int flush); /* 40 */
+     z_off_t (*gzseekPtr) (gzFile file, z_off_t offset, int whence); /* 41 */
+     int (*gzrewindPtr) (gzFile file); /* 42 */
+@@ -273,8 +273,8 @@ ZEXTERN const ZlibtclStubs *zlibtclStubsPtr;
+ 	(zlibtclStubsPtr->gzgetsPtr) /* 37 */
+ #define gzputc \
+ 	(zlibtclStubsPtr->gzputcPtr) /* 38 */
+-#define gzgetc \
+-	(zlibtclStubsPtr->gzgetcPtr) /* 39 */
++#define gzgetc_ \
++	(zlibtclStubsPtr->gzgetc_Ptr) /* 39 */
+ #define gzflush \
+ 	(zlibtclStubsPtr->gzflushPtr) /* 40 */
+ #define gzseek \
diff --git a/dev-tcltk/tkimg/tkimg-1.4.7.ebuild b/dev-tcltk/tkimg/tkimg-1.4.7.ebuild
new file mode 100644
index 000000000000..0798c06517db
--- /dev/null
+++ b/dev-tcltk/tkimg/tkimg-1.4.7.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils multilib prefix toolchain-funcs virtualx
+
+MYP=Img-Source-$PV
+
+DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
+HOMEPAGE="http://tkimg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/1.4/${PN}%20${PV}/${MYP}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test static-libs"
+
+RDEPEND="
+	dev-lang/tk:=
+	>=dev-tcltk/tcllib-1.11
+	media-libs/tiff:0=
+	>=media-libs/libpng-1.6:0=
+	>=sys-libs/zlib-1.2.7:=
+	x11-libs/libX11
+	virtual/jpeg:="
+DEPEND="${RDEPEND}
+	test? (
+		x11-apps/xhost
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc )"
+
+# Fails tests
+RESTRICT="test"
+
+S="${WORKDIR}/${MYP}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-tclconfig.patch
+	"${FILESDIR}"/${P}-jpeg.patch
+	"${FILESDIR}"/${P}-zlib.patch
+	"${FILESDIR}"/${P}-png.patch
+	"${FILESDIR}"/${P}-tiff.patch
+	"${FILESDIR}"/${P}-jpeg-9.patch
+)
+
+src_prepare() {
+	default
+	find . -name configure -delete
+	eautoreconf
+	for dir in zlib libpng libtiff libjpeg base bmp gif ico jpeg pcx pixmap png\
+		ppm ps sgi sun tga tiff window xbm xpm dted raw ; do
+		(cd $dir; eautoreconf)
+	done
+
+	find compat/{libjpeg,libpng,zlib,libtiff} -delete
+
+	eprefixify */*.h
+	tc-export AR
+}
+
+src_install() {
+	local l bl
+
+	emake \
+		DESTDIR="${D}" \
+		INSTALL_ROOT="${D}" \
+		install
+
+	if ! use static-libs; then
+		find "${ED}"/usr/$(get_libdir)/ -type f -name "*\.a" -delete || die
+	fi
+
+	# Make library links
+	for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
+		bl=$(basename $l)
+		dosym Img1.4/${bl} /usr/$(get_libdir)/${bl}
+	done
+
+	dodoc ChangeLog README Reorganization.Notes.txt changes ANNOUNCE
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins demo.tcl
+		insinto /usr/share/doc/${PF}/html
+		doins -r doc/*
+	fi
+}
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index 45ce0dc420ac..b06826b8ec36 100644
--- a/dev-tex/Manifest.gz
+++ b/dev-tex/Manifest.gz
diff --git a/dev-tex/pscyr/Manifest b/dev-tex/pscyr/Manifest
index 650c32b1c2e6..0c6013df035e 100644
--- a/dev-tex/pscyr/Manifest
+++ b/dev-tex/pscyr/Manifest
@@ -1,5 +1,5 @@
 AUX 90pscyr.cfg 28 BLAKE2B 407448f7837c3bf5a3e282f034b5db7e1e3f0e94d7cc05438844258a41321f1e43bd92fd24d3248e4ab984d6fdd3817c4dc9381fa569ad1ccdf1c10a09c06506 SHA512 72f8af39dac496fd502471bbdc635add4a6f716be024afd29e42c2ae9c17012bea80e037d1c9b0b06669e7ccce83a8b6aff200c0fd9b50947d517c3d073f92f1
 DIST PSCyr-0.4-beta9-tex.tar.gz 535507 BLAKE2B 0b4e6675c3712c11154e53489288188700290b285eacb8fe9e357fc859f2d5c1ba9fb31ce7669758cd8849a984706cd7f788ed4067c4d17931348df897dd1095 SHA512 2cd1c99b4a85e72cda7824869036374436b82fe787eaa2307263e64237ad5955b22279c33c436e4b1d4c0d065751984f57bbbb91422f1055b1bdff6581631429
 DIST PSCyr-0.4-beta9-type1.tar.gz 2041127 BLAKE2B 00044a5632bb80c32fadc22429a6a1b10f420ff73a2e19622025ced62949cc27bd49a0b6dd62ab6b79122ec3c4656f367e0dbcd3483a57b62d2d4eb2fd20f936 SHA512 b648a60a768f14102e30dcc6d628d1a0f3cf1e2351d973621d3468c2bdf502726f12089cf0ac2d129ca6fbd694b78a48f184ce02e19d4d5641adebfea2e382f2
-EBUILD pscyr-0.4d_beta9.ebuild 1084 BLAKE2B 2637e8a7eae8bde141410a5a4ac10bac0bca07113849328add5304b60d0b3e054d8dafdd32d9c2f13775e6a086bdc08b2b1a1f438db4b54f2ad706d0d1a8d089 SHA512 7b75b9c45663d6c8d8dca760b6bca6c91a995553218a935109aa3b8775818d488e4469345e1a6da5572505f182b90b23cfc48cdfb7820c2821d38036f2459f5c
+EBUILD pscyr-0.4d_beta9.ebuild 1080 BLAKE2B 691ebaba32f7de07d4902b339c938fa148e13061fa64fc8960005af2cdfd7be876dc52651897304fb31caa158c50ca3f615b68cd98fb7bf0102c580f4e52a60c SHA512 a92c11ea38d25991e6e64c5deec9f30af6fa0732af5bb330b83c53e94f7d3b7d46d9d61b8619f3b41be8c05dacded176bad3365f50c8518b845130ae07e6654a
 MISC metadata.xml 357 BLAKE2B 8ea8b8d594efde7511f3320ecc10d13a3404c16186c8f560d82e295ea3a1dc3455c0a9b29b8fb891faafebbcf3b32471435948d7872d69b1028bee0eb780c968 SHA512 cb537c71f75e92e69351d4f3bd23e0caf83c9c7f710ed29934f6b9db3201736ad23027aa31ecc727d30842f6e1df122ec82f43dc534998aef39d149763b576f9
diff --git a/dev-tex/pscyr/pscyr-0.4d_beta9.ebuild b/dev-tex/pscyr/pscyr-0.4d_beta9.ebuild
index 80ada672a8d6..f6011b526184 100644
--- a/dev-tex/pscyr/pscyr-0.4d_beta9.ebuild
+++ b/dev-tex/pscyr/pscyr-0.4d_beta9.ebuild
@@ -1,4 +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
@@ -13,7 +13,7 @@ LICENSE="LPPL-1.2"
 
 SLOT="0"
 IUSE=""
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 SUPPLIER="public"
 
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 52979308c805..03facfb90aa5 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bats/Manifest b/dev-util/bats/Manifest
index 87f0d332e1be..f4b740c562d3 100644
--- a/dev-util/bats/Manifest
+++ b/dev-util/bats/Manifest
@@ -1,5 +1,5 @@
 DIST bats-0.4.0.tar.gz 17258 BLAKE2B e43b29a413194e697c25a3f1dd3dc72a23ab9444e48bbe04434f8d6d48ff754ef1c12a1e1ab936bed8389b8fe970799cca13be932f1852c643a529babdb43420 SHA512 83c6c0e3ceec149708a8db5d33e95cc84852d8189498c22131c00f4288a6c870f9d522bae9230157f442338dc101e1468451d78dfa274afb83a6f0dd614c8bdb
 DIST bats-0.4.0_p20170219.tar.gz 18776 BLAKE2B 994649547424ee2e0859e7a82f9d46266645c6fc5cc3f47313d8780c3f81755b77d0109ad397c77381d04ba30708536acdacd0f158dc000cca9df23e25558653 SHA512 dc0e185b09dab5cc026ec39a2b15485751f038a6bab2e1089e55ea7e2913c0b99262edb54014300a25e0e3b6cad7ca61b4068f6ab328adaa61878dbb8efdf450
 EBUILD bats-0.4.0.ebuild 485 BLAKE2B ef5b83cc2119b9fc9d96b3a3e7bc465fa8ba6d73892a7d63f6f7de531f96c489e3f7692ac0142ba9dabd0f2871004de956032a8809453434fc1f5d26b67dc920 SHA512 48856743881d5bec9e275531d2d50897e3d31401d5f4e189a7f9b62f8fde45b108791f50ae4f6c9a9e3f129cad83c391ba220bd359527e1851ab6a97664e43ef
-EBUILD bats-0.4.0_p20170219.ebuild 658 BLAKE2B 5ca6fe1c1822722ccca8687173d7555539b319c78aecf89869d8266479b5cdeaad97bd1dcda6b677b68d01449174c23e99abf24e584b141c879258d5f85691fa SHA512 92ff0bb55481e30b5c770430681a29dfee5d5db2e56d8c88a4edf2f60e010949034c023b49e3898bd9f728eb6915ae141992b9c3ba7aae91bc5a479ce01dda36
+EBUILD bats-0.4.0_p20170219.ebuild 665 BLAKE2B 825fa4c5da43585551664b7633cef29a75c1c02ee0c804c5bd3a1791f655b0028d64b55c1e300bab6657f956250ef0fdbcdff97dbfcf69182c888d80d1c01dca SHA512 f349a761be563e5b14e6592ffb4710a9e5e38935c3cd4170494149002bd560fd1be4b8b7eaf87b4823f57f5c6fb39557c2b5148ff6e5912db0c06ce678283fad
 MISC metadata.xml 896 BLAKE2B bde071263574d67573e1ff65d1be19ce34a7a91ba8fea97300a296ed163e08ff7693d126cab84109a3669683ce8a4880b0b7d64ff2827d8bce9b3c6ad89c7945 SHA512 da70a0d89d4b892128e2ce7544d2a1db3b11fbd47c17aca53b220af2d3f46c77e99abb02fdfb814bc5010f2a54cd91841ed60b894b3655d0b910b303fa75a482
diff --git a/dev-util/bats/bats-0.4.0_p20170219.ebuild b/dev-util/bats/bats-0.4.0_p20170219.ebuild
index 8bff3f4e87f1..4851fa2b7d39 100644
--- a/dev-util/bats/bats-0.4.0_p20170219.ebuild
+++ b/dev-util/bats/bats-0.4.0_p20170219.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sstephenson/bats/archive/${COMMITHASH}.tar.gz -> ${P
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 
 S="${WORKDIR}/bats-${COMMITHASH}"
 
diff --git a/dev-util/bazel/Manifest b/dev-util/bazel/Manifest
index 66a4ede93d2a..03e566fef39b 100644
--- a/dev-util/bazel/Manifest
+++ b/dev-util/bazel/Manifest
@@ -1,7 +1,3 @@
-DIST bazel-0.16.0-dist.zip 89720984 BLAKE2B be8ad9c94b13dd8d1d1de76ed67a3a695a2541327b8cb8a4d27b9279c065cb351d6b2d5785024d11a163bfd4697fb1375b350c8220387ab79db7e95537def5c3 SHA512 89cefed69df1cae7076673900546199427fab3508aad1f0347b9da38153b6b1566b19a4c205055f41ca431fd9444ec772c86bc32fbff0da0485a5e5f11728932
-DIST bazel-0.17.1-dist.zip 79229870 BLAKE2B 0f149ac881dc1bc02ab5b07590620d19921034d6d5fb88bf46b0a10e0eceac1ba0f33181e9912d342c01e551bf94e38a13e4252762e6b4e7800ec1527a970f76 SHA512 b8c2292baf67b0b8a85811145ac220084975a2bcd2f2a9f461e83589296c56166886f91a32cde343762247a9c3a04100b3f86a8f969d880f641f88183a804e6b
-DIST google-desugar_jdk_libs-f5e6d80c6b4ec6b0a46603f72b015d45cf3c11cd.zip 1056996 BLAKE2B bf168c41a9958bcdc679a40d1e88911c6af0e47207362204326b712e0129b37348360a855f44af8b76acc46108ac89a707d0c0f793500c513a919070248939b9 SHA512 40cb9ffcaa3c57c69bcbec7b070fad5865e7317817049b7588dd42899054eb97cd17cb0019df99ad2324ed8e2efd8334cd83ace758a4c2d3f453503ccf54a91e
-DIST zulu9.0.7.1-jdk9.0.7-linux_x64-allmodules.tar.gz 53360827 BLAKE2B 2cf000a50950d839fec4a0ff871632a18a67e93ff31a430d8af92fb0bf40f11d0d45a4427ec546618620aa1c1fc1078a9e918c540315ef8e5fb3928c9b36019d SHA512 63c3989b97845d9a019be5f20e667d9c96550738502c148b0dbf6cd9c1553df077217cb6fa0a9517d555c53a7a6eadeb7403d94aebca01f67aee3d97517df4fd
-EBUILD bazel-0.16.0.ebuild 3718 BLAKE2B 95348099ab995f8f93b7d040aa6f032ac84fddfb1f0c0f12881ad15bd238a8fb08d912e6f1f3cb4eff124b43e3c04db25d3b400991ebe5c2eee50734a00f63e8 SHA512 bdd0d7a445b08bc9df7babb2fd04b607d366bdc69ac75623f523f0f6d4921ae094b3fcc328d4ec36d9f6352fddc1121e403f8114105c2d370acf0d62578007db
-EBUILD bazel-0.17.1.ebuild 2921 BLAKE2B 4088b739841036045d100e45904d4ca45e8feb466eed72a4732aa69f1ae212ca5d900d6312a04b1bd5c9caa2717f1e3b0741f51010d31c113dda21767e7c0e20 SHA512 53d8207474d7d0b4301484c7d7cb3ef58ba556cbda6436b430714706e69abfb6be6c49d6a3e6d86b55fdf12eda300551f0e6580ed0fb42f1dc3c94de072c71e3
+DIST bazel-0.17.2-dist.zip 79230155 BLAKE2B 62a60011f9605a1d615e648fdbb98b193561e1d86a7562ccb10fdbb8b6986e17a72c4076dbdbf6baf8a7af83e320af2c4e4b65b5b2101d845597ddd688194ba5 SHA512 0d277e20eac6fc972a31be1c77a750f6585d16beabfe7dd096db4103f0f191958aa83b52203b91d4df5b486ff20004c0b4b22125e58379f64f68abc4a87ac326
+EBUILD bazel-0.17.2.ebuild 2921 BLAKE2B 4088b739841036045d100e45904d4ca45e8feb466eed72a4732aa69f1ae212ca5d900d6312a04b1bd5c9caa2717f1e3b0741f51010d31c113dda21767e7c0e20 SHA512 53d8207474d7d0b4301484c7d7cb3ef58ba556cbda6436b430714706e69abfb6be6c49d6a3e6d86b55fdf12eda300551f0e6580ed0fb42f1dc3c94de072c71e3
 MISC metadata.xml 784 BLAKE2B 387004423ccbcb3b2e94cc7824e7a43067f5e455151ad3eaa06baded58ce05ef71203caf8d5a9d89c00046ac0545776bcc6c5a8306a9f76f8a9334b95a92b880 SHA512 188f8323fd19d294e8772391edb87b4a28827b40c42643d6af389f4b3e2d36bc3f0efe637cf572d80dd47a956bd2e51be1993aaf7d080bbfbb6ec4aac2e51ac6
diff --git a/dev-util/bazel/bazel-0.16.0.ebuild b/dev-util/bazel/bazel-0.16.0.ebuild
deleted file mode 100644
index 1a6480e936e3..000000000000
--- a/dev-util/bazel/bazel-0.16.0.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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/"
-
-bazel_external_uris="https://github.com/google/desugar_jdk_libs/archive/f5e6d80c6b4ec6b0a46603f72b015d45cf3c11cd.zip -> google-desugar_jdk_libs-f5e6d80c6b4ec6b0a46603f72b015d45cf3c11cd.zip
-	https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-linux_x64-allmodules.tar.gz"
-SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip
-	${bazel_external_uris}"
-
-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}"
-
-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[*]}"
-}
-
-load_distfiles() {
-	# Populate the bazel distdir to fetch from since it cannot use the network
-	local s d uri rename
-	mkdir -p "${T}/bazel-distdir" || die "failed to create distdir"
-
-	while read uri rename d; do
-		[[ -z "$uri" ]] && continue
-		if [[ "$rename" == "->" ]]; then
-			s="${uri##*/}"
-			einfo "Copying $d to bazel distdir $s ..."
-		else
-			s="${uri##*/}"
-			d="${s}"
-			einfo "Copying $d to bazel distdir ..."
-		fi
-		ln -s "${DISTDIR}/${d}" "${T}/bazel-distdir/${s}" || die
-	done <<< "${bazel_external_uris}"
-}
-
-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() {
-	load_distfiles
-	default
-
-	# 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 --experimental_distdir=${T}/bazel-distdir
-	build --jobs=$(makeopts_jobs) $(bazel-get-flags)
-
-	test --verbose_failures --verbose_test_summary
-	test --spawn_strategy=standalone --genrule_strategy=standalone
-	EOF
-
-	echo "import ${T}/bazelrc" >> "${S}/.bazelrc"
-}
-
-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
-	mv bazel-bin/scripts/bazel-complete.bash output/ || die
-}
-
-src_test() {
-	output/bazel test \
-		--verbose_failures \
-		--spawn_strategy=standalone \
-		--genrule_strategy=standalone \
-		--verbose_test_summary \
-		examples/cpp:hello-success_test || die
-}
-
-src_install() {
-	output/bazel shutdown
-	dobin output/bazel
-	newbashcomp output/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/bazel/bazel-0.17.1.ebuild b/dev-util/bazel/bazel-0.17.2.ebuild
index 79fea4a87e0a..79fea4a87e0a 100644
--- a/dev-util/bazel/bazel-0.17.1.ebuild
+++ b/dev-util/bazel/bazel-0.17.2.ebuild
diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest
index 6fde5d6b2af5..b184bdbe4021 100644
--- a/dev-util/bitcoin-tx/Manifest
+++ b/dev-util/bitcoin-tx/Manifest
@@ -1,10 +1,7 @@
 DIST bitcoin-0.15.1.knots20171111.patches.tar.xz 443024 BLAKE2B 5010c8d0f6a0bc8cd22ca7d7c73d9e4e689e369f0ba39b59f62fa6b6af3dcf938dfc87d33d3fe595a6e54d99734277a34af068dc29a6e984c76d529fbbe2f383 SHA512 455fadeac6ad57be111104680ec6939d6bf235eb49cde89b9716d36f6914c255b1b69cdea459d89b1bbca56099e793be0c8d7aacf592a9d78495068297bb5890
-DIST bitcoin-0.16.0.knots20180322.patches.tar.xz 417544 BLAKE2B f14616c81e0694346fd0714032be501ad0b58e82e2a5fcc623b1fdd316759ae7ac584e6c4ab586e8c9f5a402694a36eceac6b2f1c7441da655479f832a8869bd SHA512 9eca9cbae8ce17b38ddb70326760e33e7812db78e79cfe2d1a3518b34eb8fc87fe4c145e46ab60278b14e70a75b3af238342b4e1808a77cbca4b62b8c72fb1eb
 DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
 DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b7c531ed179f7e3e8b601a69a423fa736238a2caae890fd8850eb505533995e578e676860a4014922fbc238185ebb SHA512 a09b6cb64a1649d11e3fd6deeb13a07b1bf4bed504a2fc1c585919459ca8ac1af8e5ecc89dee487359e831a8f12625d54f408f95bb341033d6380b82c290c0d9
-DIST bitcoin-v0.16.0.tar.gz 6628305 BLAKE2B 69adb5832e2a708431c06bd8ce695f25cfc2b84e7ccf11e77f40c8ec273146208c70a900d0d32f79790cf67fb359c2731b0cecfc1f27ac2d0c4057228a83aed3 SHA512 7a59de44196a3cd5b75bccfe851e8bd7d5a00ae45b6e771e082326d75846e7c6d1f6d449e18b539b95b25aa12b7b79c462367f1c89438bcd1ca6ec84eb42972c
 DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
 EBUILD bitcoin-tx-0.15.1.ebuild 2470 BLAKE2B 0beaf2e85ddbe60e53efed0fcea6877b9799695fac06da2dad962939a48d1a2bff1f530f1bea92799d3a8001e353cb0f08804d827bc145bca602c503eaadf42e SHA512 aba586d5ef584d1d060668a97117e9602ae1a1626b4e867f42f1a58be918678fece96fdb504b96e04317d3ade34382799100a769e00e5057ebd6f8bc738ee888
-EBUILD bitcoin-tx-0.16.0.ebuild 2432 BLAKE2B ed1721e555bcfa9490b7291e9d9dd0e901ec713ecf7a1316a930c13f337076ca27a0757afd562776a124a2553e3690a383884e850aa1156e2f457681ef4f60df SHA512 fb46d29926d4c7a1058a5452f36087c27d916608e853beb25ae79e13ea38bbd70842467a22a2170a1c73c0f1b1edc40c9f93e5e1643d5c96db9571a07973eee3
-EBUILD bitcoin-tx-0.16.3.ebuild 2428 BLAKE2B 81d445eec380ca75c68518af6eace370d598e6a855ec03eba161faee84833a0475abf6acdfd91960fd8a67c5f9ebb99211c2a4ba9e5be7a3582ba754a64a2671 SHA512 0004fb1963ff4b07d9f46c5c578d38fb90391a26e0a9200da557f6f9bb7010695c06d9cebb29dbd730684c297c8d712097e5a2223557b8cd030e09efcf725ced
+EBUILD bitcoin-tx-0.16.3.ebuild 2427 BLAKE2B c3410c5a84de81fcafedae1236e339f034938e7adf817a4dcdeed76f7ea64cc2c84e529785732de392bca904b34563cd80bf40f755a7f5f4d8afb92fcd97cc4d SHA512 0b277b10e5fd15866a07e06bb33f6f398b6fbf88fd4159ab50b33947f42e88870b67b9fc3e3375cf16dd15fe3828a550cb30067ca03eafcc9aa93fd1ad2bdccf
 MISC metadata.xml 620 BLAKE2B e779b6a929a58fad28773a0aba3ef3112df14ce82ce62376b88cbc3519a857faaac6b580d2b5d866b0ec809062cf170e3c29324b03acc005246aea3cef9a0381 SHA512 c253ed29dff90ef2b9cd19b191ad870bd22cbdd371b2f353e724ba950735350225fe6d83c4ca8823ebb395dde9fb5004e781ff78987e2a30c0281ad5e0a4623a
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.16.0.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.16.0.ebuild
deleted file mode 100644
index e0f97bebbc18..000000000000
--- a/dev-util/bitcoin-tx/bitcoin-tx-0.16.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools bash-completion-r1
-
-BITCOINCORE_COMMITHASH="4b4d7eb255ca8f9a94b92479e6061d129c91a991"
-KNOTS_PV="${PV}.knots20180322"
-KNOTS_P="bitcoin-${KNOTS_PV}"
-
-DESCRIPTION="Command-line Bitcoin transaction tool"
-HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
-SRC_URI="
-	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
-	https://bitcoinknots.org/files/0.16.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux"
-IUSE="knots libressl"
-
-DEPEND="
-	>=dev-libs/boost-1.52.0:=[threads(+)]
-	>=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery]
-	dev-libs/univalue:=
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( doc/bips.md doc/release-notes.md )
-
-S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
-
-pkg_pretend() {
-	if use knots; then
-		elog "You are building ${PN} from Bitcoin Knots."
-		elog "For more information, see:"
-		elog "https://bitcoinknots.org/files/0.16.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
-	else
-		elog "You are building ${PN} from Bitcoin Core."
-		elog "For more information, see:"
-		elog "https://bitcoincore.org/en/2017/11/11/release-${PV}/"
-	fi
-}
-
-src_prepare() {
-	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
-
-	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
-
-	if use knots; then
-		eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
-		eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
-		eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
-	fi
-
-	eapply_user
-
-	echo '#!/bin/true' >share/genbuild.sh || die
-	mkdir -p src/obj || die
-	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
-
-	eautoreconf
-	rm -r src/leveldb src/secp256k1 || die
-}
-
-src_configure() {
-	local my_econf=(
-		--disable-asm
-		--without-qtdbus
-		--without-libevent
-		--without-qrencode
-		--without-miniupnpc
-		--disable-tests
-		--disable-wallet
-		--disable-zmq
-		--enable-util-tx
-		--disable-util-cli
-		--disable-bench
-		--without-libs
-		--without-daemon
-		--without-gui
-		--disable-ccache
-		--disable-static
-		--with-system-libsecp256k1
-		--with-system-univalue
-	)
-	econf "${my_econf[@]}"
-}
-
-src_install() {
-	default
-
-	newbashcomp contrib/${PN}.bash-completion ${PN}
-}
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.16.3.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.16.3.ebuild
index e79280e60579..6931759c939b 100644
--- a/dev-util/bitcoin-tx/bitcoin-tx-0.16.3.ebuild
+++ b/dev-util/bitcoin-tx/bitcoin-tx-0.16.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="knots libressl"
 
 DEPEND="
diff --git a/dev-util/cargo/Manifest b/dev-util/cargo/Manifest
index 9097bc2a71f4..be7d800c37a9 100644
--- a/dev-util/cargo/Manifest
+++ b/dev-util/cargo/Manifest
@@ -1,87 +1,38 @@
-DIST aho-corasick-0.5.3.crate 252052 BLAKE2B aba67d996b22c336165be78c89f53a2164605544f82587ceb1145bdb850326c2889d1bdcc3e95a6c5bb1dc0a996902130ab8425a7b0b88b38daffbfc9f58e309 SHA512 cc297b4882b869919edf9023ee2bd7100eb48709f6e7076fd26d1701dab3d8aa2cfb03752a764877cd92177ab7a4ce3dcdae76d16965eca2ff53667832afda31
-DIST aho-corasick-0.6.4.crate 25443 BLAKE2B b866fec3f2d7bf39152b30d4c95c921c3912c832cb5d7016c771bf19cb8bf02851ee942c891cc95f339b35c0545f9b45e26ce893486660b26227129aa7792b84 SHA512 0191f627896469bdb271f1b9d2f3d3b0f7952579cd07c2659996ad66a961dbe605c6a4a929100d6b9c246e65199c0e180b1e8349943f06a6f08250e003e62b65
-DIST aho-corasick-0.6.6.crate 26330 BLAKE2B dbdfcba15832736cf1ec65c9f93943e7ef368fc71e5545e1481788428ce1ebacaf87b4d045cb22695c1738ac6a0c579b38e886a461bd665b07898ca3a7f9e808 SHA512 6ac654a3e670ca53350ae6a4b21f7cc50335a42ac8557f34712575e9e9871991d29e45a45280f8c32a8a44340a54ac33585e7f1ab9b549462002e0ec24da2caa
 DIST aho-corasick-0.6.8.crate 26786 BLAKE2B 877bac172514332ef3c607fa3c9b4708822543f69091b3151d31d9297306dbcb0b6ce9cf5ba02f3c08f5baff337e3525ada8f22477770fd6aa12cce428694a36 SHA512 1adbce716a3082c3fcd3514c49af3872d926df14044767266707862c0ad7ee22848a6ce99903003c04a3e8f8cd91b38ec8ca5d4a2c9031bfec4c93cf71c15556
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST arrayvec-0.4.7.crate 22946 BLAKE2B 93d17ae9e706969e319980b4e00dd0a6c040c8d62cd41d1de34ab997e28798329e00d3dc3893da45ce5bc066fcf70dd5d8e98a79fbac8fc06d33a073a97b7b89 SHA512 195faecd7709eb908227cda7111e1b736ecf96120f9b615f1dc0a9a1cc61947e2ad4fedc7fc81d14405b51a4c8a216f81b8ed1d1d603a9fa451a38b4637e2bae
 DIST atty-0.2.11.crate 5916 BLAKE2B e502c23faaa9dd27cc5865b68a721b0403071edb483fca0c745707f4c0ca1b1787b5677b2d8ad7f327b8f5588ba784126ce78496c1db54f7ca4ce0ccea669499 SHA512 9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79
-DIST atty-0.2.8.crate 5708 BLAKE2B e88f1155f51dd36eb38364994eeffc84683b43b8010909e058d9fd80fa492092ed49d6d05b5b7d10fd2585191dd1b6efdccf30be298f53dcb832027fd6187508 SHA512 d6aac03499b5e8187ecacd6060d34d3ad8747eb680c9f59ba13e00253d422b2d7d092236fc8eced93358f251d46672013463e3bfdc0aaa9e9e7c5c8e08a22195
-DIST backtrace-0.3.5.crate 27636 BLAKE2B db71be18b39a7aa25d2e1850fd907d3ea96d30af66b72c7b2b12a37acf6d6f46cdca1b9de884167e7567584848ea2ca4a1b03468e9158a62a3fde6aacd0746c8 SHA512 b554fd616780c706d8f6e7afef4800625a9fec5f7825e995a534103d1b773f0f28e09d49a1163eef9059681d669953ed1b7a8fb33209ee3b7be1fdeaa2adb3a1
 DIST backtrace-0.3.9.crate 31054 BLAKE2B 5d90d098d149198eabe4665b1eb2cf41c5f392ddc1c5cc499047dd72533d79b679943781445f7d86f269a15d3f8ca2775dfe89123935d32ccef4b8151547283e SHA512 edb485ad27d19e0cccea123cc6a9db5b3222831e48722d8fcec7349fd1c4b62b67ab1f488fea4973da82c8f17a86aeba4ea8f2fc1aa60f6528833cda39efa637
-DIST backtrace-sys-0.1.16.crate 283418 BLAKE2B d15f9c692dd805c61dbd219c70f0b47bb6d2a18bdb2657bd5b5bf6f94f1df621f6be56e2774d2d5d218f044c1358b1af4251705123c5d48ce5575ff3a2f3b50a SHA512 2fd32fee7c13d1c83be5e86341a4c1c0da06876a73a9fb74c680994132510eac9a3444144c97ddcb78919da044e628650d604a20a06ca7852289168da8d754b4
-DIST backtrace-sys-0.1.23.crate 522263 BLAKE2B fa5f2e1929dd4a0fd0c38abb52fee514315e4d8711b17cb880cd78007ef82093796e9249e73fa0296455810059ee4fe9e09ba05c5d2c0a9dde206ab601816455 SHA512 29c3f317ba7907e8cf0f23990f450e0d3a0ba27479c3c7bbedaa3bd3aef177eea6e8393bc1051a60f2e18fff6d329790f2706eddc27bf6558ebc2d05e0f173fc
 DIST backtrace-sys-0.1.24.crate 522332 BLAKE2B aebfee4b257b44ce127f3bc13d7622dcb0d6cb4c1e73d504b8d77b6c0b1ed47e7ca310cb6b41798cd13e6589739c352d9e33072e20fae0547d292312604a27d9 SHA512 7e7b279bbe5f3d8bc2ff3234df11d7b08cb09209c861c24b3fa67dcd89699bd80a6fbf93d3b0b287544f73792983172bfb5e5c86caedee59f09ee66d259fd0c7
-DIST bitflags-0.9.1.crate 12406 BLAKE2B e89527c5411150c09bc16072e0e4e5b2dde4b50fb2ed76984c1b58db225912db580f96c7954cbbf597036e9d743658364977ba24d0d7660312c3b8d38306d879 SHA512 3c106186aa8b5b8d0fba377818618e6428af38f60e4f707873142b44cb6f64d1d7f347840c8bfba084ff569ac8c57d87f2288c4a1d79e282bc02544d69f976c0
-DIST bitflags-1.0.1.crate 13451 BLAKE2B ee1cdfad0af901176ae435f4a7096cde698de4a6ab6a49330870ddfe5a9f9836a91c9866dba9889163e31a68a009fa14c9cbc355a011bf45468a9773022c33fc SHA512 6ca3a06645534769fb5c5ad91958e9e802db5a4b49a2a11b0be5243d7e92e32e552183a7ba8d7052f8543f642bc0e4799ef0f36013f64e5c60f4e98bbb26e465
-DIST bitflags-1.0.3.crate 13838 BLAKE2B d053495250ce43970d4dbca6ec7dd541e5f5ca6597f35b8ac7cae3230e80f95d8f056f3ea030c12dd02228b51184c8020f8d2ab5ee4da4dad88a97638ea3db41 SHA512 c1410967948a0c44c434bcf952c586166cea656f98532980156bce5eb68ea2966ad7457abd2e45e7444d346f47950aad9d6b4d6779486cddfbda70dee5716bd8
 DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de
 DIST bufstream-0.1.3.crate 8375 BLAKE2B 6e64cfb797283f935ccf309fc054eda4c362fc482b68360619b1146698a0db5023013ded3f1c64ecfa29b55f10dcb8c230d853f5088f28da9ea1c018147d9247 SHA512 b615056dbdfb181c622acd734d7b7b67f2604161f90db81043fe109c2c7396cf81fa3a2b4878571968858311e46034072c54e3b181f9a8217aa276b2145c95b1
-DIST cargo-0.25.0-aarch64-unknown-linux-gnu.tar.gz 4858889 BLAKE2B 29ca3920b083264057b9d1d0e7dcb2ad945cd42e791b24cfce353085bcdeeab467530035f3e03fdcd9323097367c8cc20aa6eba96d15421aefe2ad99973efbb4 SHA512 e1d10ff096da535e3bed5275b31d8cb95d7135adadbec4218f77c187a6cb8e992088663bd21cd8e0b40627974cfcff39f508e387e32d07da0b5be486be45c42d
-DIST cargo-0.25.0-arm-unknown-linux-gnueabi.tar.gz 5828897 BLAKE2B 2b9d34839926ac3346eed98a5460551e678276c25b4c5ae62a6a43ac35d335f7ca0174f459049c58f4d7a81aafe8cecc9d2c4c9d07439d15073b2cbe5d220a9c SHA512 2e091155c9599b3a032c9d0698f64a0c1654e88a5c9df6c930063885ff0c3be6e3a8a6f9577982004e4b1c83d1c78727da8d364665da4d1a3e053bfacdaef546
-DIST cargo-0.25.0-arm-unknown-linux-gnueabihf.tar.gz 5826101 BLAKE2B 0bd4bcd574ce42f52698f2fa6d564b1292582f569a8ec547dde33668a4c8c72327fc949ed2b6d925672768ed0b7b47821d1c92d737faa9234d53c185443e0b6a SHA512 f24c4b2509824a8ff25ed6ce0ec011b019f7e6eb16ebc4382ab233db96732fd22c44dcc39d6388bcd6a6b79100eeb13ffe4188d727f4e07ceee4a5777520eaeb
-DIST cargo-0.25.0-armv7-unknown-linux-gnueabihf.tar.gz 5674664 BLAKE2B e9878f6c89bd9545b65f8c1e888fc4c632377bb77a64d4084c68f50aed0553bc65bce61bc732ecabee7fc88754f9e9305d9a8c9abe3629b4e7be490338a6915f SHA512 ef2da09b121374a33a607114ab4bf0a3e87af96cadbd8757076773aea4028e1105232dc9ce0f34a90e3bfc204d2f43c056fb07c54b6b7ca0861ffb2d124de0e6
-DIST cargo-0.25.0-i686-unknown-linux-gnu.tar.gz 6083273 BLAKE2B e27a6372c3a0eb607cdfc82b9e2f2b3e2d4cdb24c4548329a6fdebc0f4568a2c19bc03e1abd0f9b52f30528c8fb3b7595bede2a88de5c61f9ae2d94e55f4cbba SHA512 3bb78ec5041fc84648d94a1f144a5eb0cdb7e80e4f6fb308052d354b1916b6d279e6dcc024e9b0bd25dbc8fb1ffffaeba7b6ad413778058053aae7bdb73a6319
-DIST cargo-0.25.0-x86_64-unknown-linux-gnu.tar.gz 6004007 BLAKE2B dd94d56aba7ae7bb10dc4fe3c230d56f118196d8a9ad93f59c8591da5a2c4e466655cea468eab76ae35d6ece2a1b802090c7832b870b715e2e9affd39dea8cd3 SHA512 378adc19c342cdc54179cef408517ede6075ae6e8040df5c0dd0344c33e1f2697838218c3351000c213b84e97b4cab31f51ea6c1c7c1372621a55106b1f3c5f4
-DIST cargo-0.26.0.tar.gz 698823 BLAKE2B a16b69818c029d9e2f6a704d6c5875d2cd01d4c120b9df18c9e33df56009c58870e7f48a0a3709dabbcc88b535a0762fca3ab11069e4ba2506566f89e8773533 SHA512 0ceba204f6effb0b636b8a4cab38ae876e32d548a158cc2a67f3f80f144d4a05ce5ec44df74eb7e17a3dcd57105298dae1ac599b917c0dbb4b7386d3cf424070
-DIST cargo-0.28.0-aarch64-unknown-linux-gnu.tar.xz 3630240 BLAKE2B a001a4204b964a2a2317833c4edeeb217354847b9db64cad48e3f7cd98f614be4c311690e32f5b4c6b358f5882e684def220c4fb96a83e6fdae14c6b4e143aaa SHA512 be4424dc71ab984b51e74d957254bea9169021f5225dceaef3e808ae7cff262ad951cb164ab12c8b63c4a6d260bfdd0a9de37390aac623c3f0895d28aafbd4d5
-DIST cargo-0.28.0-arm-unknown-linux-gnueabi.tar.xz 4238948 BLAKE2B 2426bedfdb0bdc15a9c64eadca62481cab169c62c6d6093f626a1e17d95083b103b32534f43d28de223d21d35c363a7a79728bb4f6953873e870de158b3656e9 SHA512 f95eca6ebd922dfd3960eaccc950be7aa2e43f60081b88eb830c870d5d3f39e7211c38b7f5b570e3b07b7e13e82229281e8bddf394637a68635237ef6ca48886
-DIST cargo-0.28.0-arm-unknown-linux-gnueabihf.tar.xz 4275940 BLAKE2B 44c1d890dbe4af6097ceb7c289ed5c9cdb65ebb72a92ea49a14ce14efa2da4b90daa71784d18be9a3a0b5bde4e36bb80f8647de9c17b939a719b732d0455b731 SHA512 c1224a81e1446eb423a1cd065115711c8f0f889c7ab458cd80c3bd224e4cf0ddb529debf3f1ddf8ad2aa66370193c24e4f09b1d410bf95c74c386629bfb35fe7
-DIST cargo-0.28.0-armv7-unknown-linux-gnueabihf.tar.xz 4234156 BLAKE2B 2416916ea70f916b9d505e3b3a8c0adbc047312e917590729ac62fbf7a37ddb4a66f4ebd28110619e2045e9446a95824501f9eac695087907d6f603fef3e8331 SHA512 00f6ce2e241177b36dbe868c92ed5bb9c66ce89736060588300d6759ea04b1b782cd412b8231bf0cb83d9eb4c7e00e8d92a334e8c65623c048f46031480cecd3
-DIST cargo-0.28.0-i686-unknown-linux-gnu.tar.xz 4781764 BLAKE2B bddd2d2bf0dc6b30784b390a4810ccd1941d0d92be60ca1c2a1412c81c2578486b8feaddd35fb5654b216594d891f3fbadf19fa3cccff97c9057fe2aa8e78bd6 SHA512 6eba4e64a18df6139e9ff2e1f3ad10bed0211d8fed7633337f9b654276149b1c62f8d3ae2e7bccdea911c712afeacee75a59fb61c50b20d6a3ae2621be8ddf68
-DIST cargo-0.28.0-x86_64-unknown-linux-gnu.tar.xz 4751256 BLAKE2B 48e9198b493d4a2c6564c3618ccb24b0fbfa838b36e8846397d421f19270bec5e4f625a5b544024d7cb32933ae9fb07ec15cffa5c7aa881f48e69cdac5f3b295 SHA512 d1ec117c7be1ad040fd88ef64da9b9c84b11ed6f19ab2c5e60c586c004946d84c26792efdc9946e9a69a878224b5f8d6b4bfdf3100d858f3d2aa170dc7c122ff
 DIST cargo-0.29.0-aarch64-unknown-linux-gnu.tar.xz 4095684 BLAKE2B ab53c0ceba2524727b09a1d76c42e0a6bc434c35d2a530003037f75430d29a8906497981984e8e497a61154ac3b0ff443718570d312a29d125cfa3b292629922 SHA512 6c537bf28bd6b5891c1eae052896cc9b4b1485084a3c384e92c2502a29e4d9465efdaf8b5c7e3ab9724e844345e6fb966234d352428c1b56125d1915e00b87dc
 DIST cargo-0.29.0-arm-unknown-linux-gnueabi.tar.xz 4716672 BLAKE2B f14d8091c4ef34da769b22c2301b423e0f9a120f881dc1db3375413f21372c7cea1fb76b079b7cccf52d68e4813a12881098e9e34feed4725c129204a90a31b5 SHA512 ec732ef951f2f7c70df167d60255409195f4d6c3efeeb7b1469680b919a4218a443bc475bfd08cce7da4a30f937714038625a21d1c17342cc7a14c66345cbe22
 DIST cargo-0.29.0-arm-unknown-linux-gnueabihf.tar.xz 4754612 BLAKE2B 880f97d7081138946c090936171767b8aaa82f5c07f25c53c00572427ccda29d14279cc7209c08891b34787854169185fa1aca89dfe91384002e7672fb585199 SHA512 7675251e5ea163e23e27501ba6e534b5d79a4eb3d411604f42b31f604c21d491ecad77ae40552738ce9c05e630ebf162c47827e9c4c36c3cf960b1e3f3ace2d0
 DIST cargo-0.29.0-armv7-unknown-linux-gnueabihf.tar.xz 4748580 BLAKE2B 3528f3e7412d6562d2551148ba8945cd70de4bb1565fdb184a4aba3d44fee4dae6edeb150a38a70ac4b8fabd056d366e4a3ce68dd20e9cae123362b2a6f48b39 SHA512 db6cb3252b484006c51cfefc0fc6adad04bb29e71892323965072e9b3e2441a760fe268fc46c9272318b7ff60834b41bc0843592371c029ea07dd744be6a1489
 DIST cargo-0.29.0-i686-unknown-linux-gnu.tar.xz 4996976 BLAKE2B 6bc94fcb274ee97bee3f17213f5afef7a7d92276e1865e0648806ea4b8aac663561fc36826ac8f38abf43ee71b0be8f9d3688d759cf638628e3004bf96bf23a6 SHA512 a9d1ad33c1aec30d39354bbafc3976cf6410bc03fd77a6e98c95af39280b9f2a579817429c933e31eaa19170e11a0dfb33147262d04183b9b714d58be8f93b32
 DIST cargo-0.29.0-x86_64-unknown-linux-gnu.tar.xz 4916092 BLAKE2B 0e0816886ef2b5cbfe8e639482b866c634917e1942aad457b69d14ca5ad15c3f655361c271277645b8f485f00fe0b6255a4423c8f45620cba70f0a622c93885e SHA512 f27e1b2cf212b2bfbaff0eca787e5cdb56389504f8e5ecd737a49db977e0c20a54cd2f504b9f6cfebe14bb6880e375ad03db0f1e5dcddd3278590332e9343e76
-DIST cargo-0.29.0.crate 775799 BLAKE2B 27bdf1d49b2bfcb2e2463fee7a0fd3755a11e1bb00c793b8da6c66919d3b6d4fb7ae2060641f0d19aed1ce02188b6f56daf322894ec23bc722dca6ed1953d362 SHA512 2a814ead1b863b2e80fc19ad4722ac2ef8469ada9bb9519ad3c4ed6483dcf5b6d96bf1224fdebc284fa3b884827e18fcaa7bd93544833aa3c5160f80fb33d43d
-DIST cargo-0.29.0.tar.gz 780814 BLAKE2B e0e557a81fe8de8758c07233bb4750b2350449c8eae2de3e407593cc453e702e8751233f2b9ef2a00765b9b688e7d79234572591dfa103e42d0404644daa9ae0 SHA512 e02b9f3f4c5d7a36de3fe5062283e69cf027d6f17370f2afd714e75a1b18ec7e080346a72032547fa36f5826f7898a5012ef27e65123ffa9b35cfd284da97bb6
 DIST cargo-0.30.0.crate 797689 BLAKE2B 4d141fda6fc2ba340a4781cff45bb6becba0a97e63cd2993378ecb5698c44a92c720b67771e2de289aff18e698e43c9dfa0233d14cadbf936a2681dadafe1e65 SHA512 7d6f99710fa7a68de0a36c7f79fee5c1281f626822faa193f2e9c777dafb992cd62dfaa02fab0f274837dd13849b1725a9d8b1f18729062d33cd01f5ffb845af
 DIST cargo-0.30.0.tar.gz 805226 BLAKE2B 325a8cffb0a2b46f84cdb706972cd6c395491b789a6de47c50d1da61e51471b1667efaa3130705e4973d3cda12b3ce9b5752a6bc5a22d5910baae29b5684b183 SHA512 c9e79b6cab06775affc855180e02c503e08e7329240881dfb3677b9bcc8b7d5be5417a04a02ed230980e81676d4d21db551813fd3ce3351da42cb4f7b15637e1
-DIST cc-1.0.18.crate 42127 BLAKE2B 158cddc9672713ed156403cf3a9663046978d692aec6b0a0785508d9ee612546e21afcd4cbaf5c9b76aec4c22cc2083615503aea553336cb01533762336fc4f9 SHA512 7e419ed8ad9dd1cf76ac9e7df82f89d93693299a80925f189b96416fd99b0217dd42918e577c0b9dc64c2fd7b6300b81e3b1b4bb176c940cdae4eff4ea303c76
 DIST cc-1.0.25.crate 43191 BLAKE2B 2f715c36150ea81406ac34224ebc5e0b95ba1bc5f80d36e78af6e6f4027521bd5e163c3ff0f08dac8b0791b797e1498c8a1151dfbc72a8a8008546e0b44ecf83 SHA512 0ae0d47c9ceb67aa0ec25b7b98ab4d378bd7a58fb7bbcd9bcc804a0deadcfae904f9353c218d63b8e7046b388c67d5316248accf1f8b69822c0f58ff465652a3
-DIST cc-1.0.9.crate 41193 BLAKE2B 15643c05698e5e9cfb955495db401b11a28c0047fd35945d17ba4656d44551b73451b8c4399cb1338311228c4fa059318c55e3f59dc0ecae2374ba1b577a8d45 SHA512 7423164d85ac2d57782b6f259ea7e7e581fd8ecb7f3cfe4f8767c05caaf6e25d8cd73031123b60f0df96b2cd4c265d92a66933b7aaef4aae998cdc0e179618f4
-DIST cfg-if-0.1.2.crate 6668 BLAKE2B fd1960dfd30b3514bdb9943dba6418957068aaad3548667216d6dd4e4921a0df07d96cc4131f7b5121cacfb91aa59a802a47663a7b04ff401fa5b25ee1d321ea SHA512 ed6732d8ef2c99d99861f5dcfec3bcd2d1b62dcf6e8e4e88ca25148b5566f86418270dbbe9a7d2fae62a8320d432c5e0474059fa25a11c0f66787084e36f36aa
-DIST cfg-if-0.1.4.crate 7113 BLAKE2B fe63fee332d08ff50384f5e5d90a30281445f339e29a9d0f036ce2202a72f02c7e78ffc166baa681c3b739afbbbe8727ebf5ca16ea0a6fda2f38e08dd8b94996 SHA512 4a7131fdaec1ab63485b016e0b09d538815dee8b64218bc33230910277344e0631bba80e57b1188ca4fd6247595c6c5e3b2381369614574d7ff17cdb5b8546a2
 DIST cfg-if-0.1.5.crate 7363 BLAKE2B ca668ccdb4cf082d2b874976e6ac38e85e2618430cbb5123f9359e328e38b61e59a492116bd6a9f8ed986796095a763d148291378d32ac3a9e7d501c5ac967fb SHA512 48ab0bb1fe89d6e388ac4bf851b9aaed6479f9ca7da62945e2ebe58800b5201897feaf6aabd2b028110b0205b33d5abca7f02826ab3c688647b944e7140e6d94
 DIST clap-2.32.0.crate 196073 BLAKE2B c262241a3ad1d0f944467f4ea9884ca3dc05b5e05656fd7b73700e0daeec035c07a5d06316cc1273e37f74f2c00429b0ee99da298804dc4deff9a252ca56ce07 SHA512 ee2a66cec0d867d73fce35c055bcac77cc3ea9537b355be04be3ee17ddabefebfe3649cbdfc30ea356c54cf9f066369540eac4f5dc67e60cdadc9c66be014ef0
 DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
-DIST cmake-0.1.30.crate 12477 BLAKE2B 23529899687c844e3d0e864272d964d5d4ea1900afbee9e4c323a4712fe9341378f41667463cd3b9e6944bc56c123c6331161e25e8816143a8efc3109164e14b SHA512 c27e7b6e50e77409f1e7481a88839e2de64ce6d94345cd955e9b3ff6f5720a090f02adcc1067113471cd48125b236952c0177920be7e03cf15bf2baa323788b1
-DIST cmake-0.1.31.crate 12480 BLAKE2B a861b9481636ab9ecdcdfa13d599cd081924394fc60268e7baec36ba875e7c61a7ceee423fb97e44a1aa28db005f1ed3f855a8490dcfbcf86f6e637445a9468c SHA512 72523416f52e253fc4d5ab9b4fbf56cf6870ec21d71199c7dbe9c0ea09fd32a226c5eb5677347b32f8e82b40b9335ddbbe77a08ea8fa2c4f0db5f3cb5e6f319a
 DIST commoncrypto-0.2.0.crate 3009 BLAKE2B 174f3099955d595040005ef201361bacc3084f5218efb0f20df8082b9bb683909a10ade64af7062edfafadb9674b27a06836f2333fdaa7d2926b207355f7a40c SHA512 61f567468221cc46b30b31ce96dba26e3dd3a9245a8d37f9f8a615b346d992c261db059bdc678882415c608a806bd45c7b38a5bfb562ad96a111cee8e1082e85
 DIST commoncrypto-sys-0.2.0.crate 4338 BLAKE2B 992a06d56adc97a9d02c547766c2be2f1973507fc0083e50c623dc4ac554681b802f3fb5ef61ef430e4a58bda000170636cf6e38430550e0c0506438901fae20 SHA512 06851fbe0b87224f6c8333964237badf57f32256acb7e647ac2da16561701b7572c12509e042d0d1032a54c94c1663bc2ff19ef5ba3a7daf84276f2544bfba8e
-DIST core-foundation-0.5.1.crate 22519 BLAKE2B bc411c7a7bd1dcb00b4f02d75cbdb9d8422c2802cd6a3aebb7ac5136b19756f7ad5e48553e15b6c5a7ff85fa3f4f3fa98e8644a0eb13b4525fe2edd3a5b3daf4 SHA512 209b06bf889ef75451b9d055505dcd19eeb8ed6b6f57f7b3288556ec9be90fbe716175679f7d0a650c1d55644b3c56eee9b1116f2c8b533b4b4580008c79cdb2
 DIST core-foundation-0.6.1.crate 23398 BLAKE2B dfd3cdecc24229370e746727ac277d21e83dfd48a98a63cd6bec6c4e5c6e37e319ab53db91a929fa1086fdc8e0a572f766fdaacb8e04b46805ce8038ae2652b5 SHA512 631049ad936180bdcedae7cadc79767c62ef133ef728a6877c977017cf4c3efc0bdb6484e0f5ccebb69de3d0f4e49bbb4aa0fcf088b14dfbb5dfd15989e1f3b9
-DIST core-foundation-sys-0.5.1.crate 15974 BLAKE2B 5065520f9d7661523edd7018e77d43346f39bcdef407ffe7bafbdec019e39389118b90a11599d5afb4f78c8b454dbf4530a6c81c834fd9952557529f87cdcb0f SHA512 9cb023399eb660ca318c9d3461b9f177206792c3542564d990c08ba4788dc41da2f2c6070f0b55550b2ded0278c3f3d21a159212a20d18c12997658df3df5052
 DIST core-foundation-sys-0.6.1.crate 16197 BLAKE2B 66e43660b26c9a1f9c9d34817574c2da93f688f542d7e9a1abf7cdc1d4bbf99952425be34838b54a7f82206c12bddccd67296eb38edc396babab754d8fbd5033 SHA512 f633f7d7ba6f8c0797dcb597d1ba306c4713fb1d2b17bd9f8fa5a42a615cf6746628b9921e1a8488dfecd57b327b325538542409cab79658706913b31cf7c975
-DIST crates-io-0.15.0.crate 7833 BLAKE2B b51ed4a15d22a45d94ade26ab3d522ca13449ea1df93ef5ece2d4d7b99b85e95307f4cefaef91e1edb74cf4204ce3e0f3509ecb6597eb57f31f29edf964b6490 SHA512 86cc22ba197085978bd0928402e311bbf4f72356baed452c0f6ccbc7b95912944f4ed86a668d99f3ef7b0a20b20059b31c3b6c587c7c5ff6bedfe39cff5b8c96
-DIST crates-io-0.17.0.crate 7862 BLAKE2B 56a63d3ecddbbf3edec35b65f5cf6519b6d6258f7116f742e82546e40eaef73a181a8f481f0a09ffa7787ffbe6d2fc25415a02d443c57c2574b9a97c5afa2dd8 SHA512 06d31f47c9b05317961f985acf7793e25ae7909f819222c482e099b5ef1e86505be3e7498df896c8623e15c6a130f35910f1b33cf4f46044a3bc0823de8dfcb8
 DIST crates-io-0.18.0.crate 7876 BLAKE2B c5ff23fe969f072d2ad4d76379a7d270e59701bf019734fa33c205d650ca485f9568f65a3f1c4ab969f2fdd93cdd7977117a972b7432b32c584b77326a2ce228 SHA512 07005db0baf95b456735e4fce81642ec509b8a879a0b5a72f382ecabb55a7a1bbc1391cfe78fcf178e4b3047da7b067f2c7cae713c3e78cca6ccb2287fe9f8a9
-DIST crossbeam-0.3.2.crate 33440 BLAKE2B a5fe9d77b3fcb4ac890b3ccf4e2548cf82c99571961d3960326210ce63dbe8b04e4a5917b57dbb657777288942dec1689387b73e41175b86e013307e057e7257 SHA512 e467a84c3a3655ed1108e2af2ee75dc1fd7bd435dc28fa29e43c055edd26d24d8a5d95edac86fb428e52ba70fcca68ac960952442d0a451568877c371057f0e9
 DIST crossbeam-channel-0.2.6.crate 64953 BLAKE2B 281d8ccc60ab2f4afe0e7b5d9fba5fab7cb2f3a36b8a04d4ac445bdd9f0838fea6b41dbe08be7f25e5154ffe2eb0fdb9304034080d881918a84ae3ef46bffd00 SHA512 6c124ebcecc70277b9957d3908acaa7c22c346f99b4e678eeda6a54406e1a6d703da6a95971dca248839cf831a830d172650dbc032de138c2d398f0f80a20c51
 DIST crossbeam-epoch-0.6.0.crate 34764 BLAKE2B 2951e0139490a105ac8c561750c578fe1fa6d5c28a38946b9cae3c14a3101380e54f3e2ccedca0dbde8b3f02d8e1be214511df69e63bf9d738f5a8a6bc92c670 SHA512 272439563448ea0efac8062d821a080c9ec7e5860f3f796ccadbb705e532310e48e5e7b1230b1751593564e11df694fc33739e7c627dc7b7b3b4fe6967d13136
 DIST crossbeam-utils-0.5.0.crate 12162 BLAKE2B 63366fee26c4012ba705ad415db867e0b9bcf81b0880ee3c5ec3c06d2ec8776e64585ddc04ad072d363ddff3acd1382069e591c25daa27141bbbf75412d96113 SHA512 eebb6bf81517c930fdb4c15a8eaf92693907fe58dbf1913a9c2f4315a6c0550eb772cb15c47e2ac4e3f4decdd47f69ea8e42910ea649bd2e2279ad4cbf9d02c4
 DIST crypto-hash-0.3.1.crate 7858 BLAKE2B adcd2b397a0226df7b326625a6ed179eafa2f550395782018b5daece122f0d02c68529dfe802aeb933e7ccbd4c969ad9fc0876673002b57ee23b881abcff6e72 SHA512 4c4002a08e68a03409096da5b3f3c8c4db9a23bb331c54c7f4a615ad0be64e3fdca3291f4a20b682dc4bc6d13b95950f02a306423c4cecb48664df05c46209c3
-DIST curl-0.4.11.crate 70262 BLAKE2B feae6f6cf51fe4ba32b93090bac7c341daee4b973b789e8c130e5e9986864d8ee69950b464aa2b73bc3643b063c47143241434dc85895de32546405855a43cdc SHA512 5ddcc26690e2cf1b655ca8699b8e67da8ee8a57249ba6c8a736c59bf40dce3511ca7442d58b087b42f7422b0bcdf1d4ac6c3522aabe15e575b6a22d8ca21970a
-DIST curl-0.4.14.crate 71005 BLAKE2B 85e6d8f5af8cea96237ebfc95686953ff6337e153c9b6659f6835e6ae9169cff438679a1c981eeb7750fd519857cb144bcdfc37dd64b1e4b16f88ce53cf9e713 SHA512 8065a51a00f02f088dd989cd66df2d8c8b7490368c1aec6374f78144cd3da446d902b643f65a62dd64c6af398c52fbf289c0be10ed38882686f2fe89570f9efe
 DIST curl-0.4.17.crate 72746 BLAKE2B 4d9952b737610cad419c0e2ce53cd5a4a44469d1d708140bd6f089c6a3a055892c40fbe5ee32cebcaa9272ecb0834da82d0e361fac59bb6fb976178695525931 SHA512 05df910c83e90ad7f430b50acd48e17c219758ce159c6c4c1a51b868a2c97ee4dfd137ab1e3c4b10fde1f8dc01b0d85ce9006e2155b7e5cf29b21b1a3a8a8413
-DIST curl-sys-0.4.1.crate 2982935 BLAKE2B 339b91b1634fd502b48d4f26923e1c9d8a3c9071f640442863cc811d02e03b018beca901b2a466467ec6d9ec1206b34db3e406763b8b3934aae1fa95c89f0d44 SHA512 74de40a631db102e73e133c9bad6bc093d7da744090e818e1173f237a410fe173e87fec937a902a6182e224c7e336523b73c42e136ef3b724949d3f407e78f03
 DIST curl-sys-0.4.12.crate 2859726 BLAKE2B 4041c315f629f2f776ed585e791ecf704b87bc51380576b6b24d66086aea328c1762174cc096b7448c551a7e46d22b1562a506e2f38bb92126c1e0c7d65a9f86 SHA512 3ddf0d9f5453fb943ac20cd42599e266c0dca7bf350c4abd673db2ce46e14462364a8503be79e5702e1ad773e244375ccd3d80cfd7f558513bb79cfdfc48ab7b
-DIST curl-sys-0.4.8.crate 3391998 BLAKE2B 580477d0d92a67a5b2142d5a0ada707400161c0362dad1db67905aba669cfe2dbe1f704b1070f02ffe860f652ce229b43d30d579b449238a981046ba15b36304 SHA512 198fbd16722f3a60ee727233c442439519ac0fb9358ad0ac7e65c838dc494ac44d3ba4eb974f326fe67004fe47b38a4246111273c7481907dd8a42f2221ff03c
-DIST docopt-0.8.3.crate 42774 BLAKE2B 91792f94920a39aa1cb1014493bf2a31367e44db62c68386df3112d4f8f058f143d8238048fefb2f2d1a1e489664c1ac7341e9bea17a00fc95ea62cd7c8f5dff SHA512 0af5a548640f06c408ae1ef0eef804aee5154d677648de9bbc3dff0f637c26cf8b2e212f472a6d30353a92e2ad2cf8d8efbda163f9572b28f867f2448a0bed8b
-DIST dtoa-0.4.2.crate 14227 BLAKE2B 7edc0b203a58586aeea84326cce66105e21e3d7efcffab8b80fbd5576dc19a181304571d1edf932873ba05254a36f44bc81377fa4aa79d9bbfd6a90e75a33468 SHA512 a04410f8f67e846dbf3c72c0d15096e529c60174c6403931c9b8df67b41a59b8c06c675bc3222d0111f642d4153f7dd72c0631805d40386bded28695e38c7f0c
-DIST dtoa-0.4.3.crate 14456 BLAKE2B e310c71454a3ebe77e9b3f479b45b8dc15b988823eeea4549198df1ef3dbce05888ca6f34701b27dc5e8c0748d99e03a14af96e4901be740bc98ba1342589ae6 SHA512 e400efb07317fd605e93fad6670bb4569f52abc66139042649a4112ad1eb2bbdf4b819ac5771fae133a60248da7a440e30109e68e919867d3fd29853618d7315
-DIST env_logger-0.5.11.crate 24948 BLAKE2B 4a64465d5a594c416e5b006e52756d5f45e4c43f33ba7ba69bf62a028d4ab2660d46befdd6ee79c6608d78a81279e527d41f54cd1465f245de0b06e3f12a0312 SHA512 4a65e4ff9af4576d659a0362e9bb9005259f3733cdb7241cb9a6926b1584b4a2e47892acef189412b2c9940861ccd62e8deea6bcd19b093f7a06369702d0a1fa
 DIST env_logger-0.5.13.crate 25275 BLAKE2B 02d13c40bafa9e403ba1e3582e296d132061ef020183d39a071f9ab4606a8f45cd211708ab8757d6dd9c04bf4b79b429c0db4bc293a8dbce0506b643d1a6aba5 SHA512 46739cbdcfb34e56b65c7839a5d62ec0f285359dd415bcdcbd2de5ad8e8015aee5a31e92c202c94da5d75235dee4f49ad8585fb852be1f8b2852438922ed4a99
-DIST env_logger-0.5.6.crate 23933 BLAKE2B af51e6dd5eb9a26773ad225346c341e8292f1a1b79bf140660f1c2c10f62750300cd5c3c96bcbcbd832a11b8a14ea1f5e16575e65db602f0eb72896f050714b0 SHA512 3f7507cc5a2251570dc061a0603bc69a91bfd13b5d61cf85547076415140215d3d322408187eb216f1588ceb5fea3579b9645bc6faa3bdfb27a230c9bd1c59cc
-DIST failure-0.1.1.crate 26782 BLAKE2B 6e00d30bc0189325e540a0a9290e517747ebbc79a94a884540de1f46fc0a64d257b59604725cdc30e62731b51e45b6aec215d2d488bffea6511b6ff53be50a0b SHA512 3c4075dc13c3ea6557582455ab3bb35ea81bd43892de5fac103e7dbcdf24ca3614e3b3673f694256d9fb9c6bdf97375ea17fbe290148881599403c01dab0e5e4
 DIST failure-0.1.2.crate 31820 BLAKE2B 8cb6574450790100718d353878da4fc4ed8cf4626b8c95f428ba7a2cde8a422ad053e49e107e153726302318c26bdb480b3dec1b9d85f6ecdbe02a13397593a8 SHA512 248d0e61f7a1d87538e7c774eb294808b1a93325e992ab0a2b2df9c0489506a25c4227b20b706eaa5104fd22cad21b0db8a61cdc4a7def32559b2955a60cb0be
-DIST failure_derive-0.1.1.crate 9312 BLAKE2B 14dcb7bab17f874e5f3efa9abd059e079a4580d918017825de104851fab0b0cfb88aba4f71513f387ca645ab74a3199c5f0268853c156111c67351e1c7e9327d SHA512 885b45ebe5098f04699bc0c7cf2b6816d3afec6f111f8d244b0fa824c0198127ac3062e23c052186e196832755e9e0b271e5efb005df35e6d1e4d671640b8e91
 DIST failure_derive-0.1.2.crate 4326 BLAKE2B 7bd8693ed01e20a70678dab39bf32df8184c79a1f763d75b62cede84316dbb939ff1c69843bc6e3432b6f213f671c1754c896fe9b0c73a89daab0b9e2179943c SHA512 244392baf1923c6a53b7db9cb72f88dc78c74ae4bd5a1df321c54bab7283f5623ae5c4f862156ad4fa32284b4e010d042a27aa4ec4a2881e1d7d1284d4f48c5c
-DIST filetime-0.1.15.crate 11211 BLAKE2B ee1661d356f7b6d7cf20cc0dbc822e04ea7e558118b41c29f060f02df4987ed7bdf69be5dcf66106c1573ed586b03dc0b0196be7716227d97c7fc857f81fbac5 SHA512 81d6e80f3da3ce12295ce8d85bf174eac3ee3dcc7d57e5a65f2ae91ab4f3dcf294582788af24db9ce2f18cb0e43080fb1baac76929dacec32d5ba4d09928b962
 DIST filetime-0.2.1.crate 11797 BLAKE2B fa8f886afa7f7fea0f543e425bc06ab0bdbfbaccafb7a5bf5234fa1a3433d90398dc42bb24832132d042032e20042495fdc2763f81b8b7244c6b8d8a5e660367 SHA512 749770e2b484c7d1e94beec490ceef2552b7294e3cb5ea67033488800babf7d48898b5d6a0874b113dfe95004322476553249d57349dfc3cb575c26d4ebf5a9d
-DIST flate2-1.0.1.crate 61869 BLAKE2B 3f9b94327ae0d044f962759fe498776d7bef014fb93328e3454f5cd8f37c8ac8c8c5d3f38825e4744a07dc873f93ba5fb420450677a55622afca8492c9423057 SHA512 2be6cf3228e9df76643e7b45ab1ea4956e7618e90e9bf8cce62f6d0bac864e2bd7a808aad1b54728797831b170801acf43a6a254d9268c8fc57052f1e2d172b9
 DIST flate2-1.0.2.crate 65153 BLAKE2B c807436553d72045fba72aba284eb351aaa79b08b96833a59aeb8e4a004e33b06284a965fe56fd64753174c35ba49ccb77a79f58fd568b5d4a598551efed1446 SHA512 53a18e56641531443a9f0524d23b7645ea5eee3fb4c76c0322773e4cd423b4107a252a09bcc679a5d384d21b0c8c5dd90e6c7440fc73197ff3907a62a9900ec9
 DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
 DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
@@ -89,202 +40,101 @@ DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672
 DIST fs2-0.4.3.crate 13138 BLAKE2B a8c53130014affc276544360425718c480fe6b6583675e15e8bf25dca0cd2752aeb0793135fce1bdc12bcfc0ef21fb7f6aa298981d61ac150300eb134c2014e0 SHA512 b83fefa9123f304e4813ec1dacbb1aee5dc0c94e1316cd7c8a434aa2a242c9c42523d2bd8232d78e6c84c4e172b5c46ef8605e93b54216a2d4496fdf885dcf50
 DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
 DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
-DIST git2-0.6.11.crate 138769 BLAKE2B 47ff0b7e572cdc87a4e8ea9f7daf2b2e9fcd34e2b8cf0353d355b75d73f8843a9c7762492311aaeb640f1aeedbf25d58b7a57e64ca6f4e9fd92e1ff8b499413d SHA512 3319cb6230c4d2913a2194dd35f1c2a8665c892682ede92e9b5c73b4d53a1dfb572d2e05ffc97ebd1bebba52311a708f4c5697d3238a71d35633a869f495fac2
 DIST git2-0.7.5.crate 145895 BLAKE2B 668dcaf167d5544a165d4609bfe278d84bed307239d0351f5fb1d56ebaedd874f11520a164f956af88281f70b48477df735fbb844b869c4155ca0676fc467580 SHA512 94d6ee17368a8476ff415dd4de61b02a19b756de44084a787d093323fb11692d17d30aadfc5c1037e7f70b0e5f94aa0d1b6639c9f9afa17c19d6638b7cdcee4e
-DIST git2-curl-0.7.0.crate 4097 BLAKE2B 95d80cbb573f8e71bb47317c029b39e309cdd3d113db85334c4ce3f3a48f3bfee17ff1bc67828fa8c2884b2b51620a607f6a18a50901828c77da99c1d6463551 SHA512 b6adfbe6f75afa1fcbbc0a38f9dd13db87bde6e81eb6403a3f47c4d25a26301677614af82f1c7cb4a4a2122910e0f6450d7555f2bbe9ac97dc1da1243eeeaf0e
 DIST git2-curl-0.8.1.crate 8903 BLAKE2B 83f58faa5555a0a3a653db1e0a002008a7e2d6c216d2ac7014b06ddfedaab8f114cfb10d2577d799f77610032b64d786b64a82d31ca38c981192899ddc054496 SHA512 014a3f124ca633a572d4bdfe38742fe4b0fdcdf52ad170b82078c8cfeff1bace87540d3ae41d0457fca922bdcb1a25499fdd30e704eaee69da14e4282a9be1a7
 DIST glob-0.2.11.crate 18065 BLAKE2B 8531890ce378023f0119baccd5c556f297128d3f09c07d320d5cdc3c90032447f2e5a4f2fad0097bd3c6faf93b83256b387d232b3c9f9d3c40e54c48245321eb SHA512 91a1a751bc4ed3b13154aa056180f2b8123c33627cbe972bdd7986fb0b6f1ef90e59abd4128d6e4db5e69523d757440c7df9b9721a61f5ea5a091ffc9843e10e
-DIST globset-0.3.0.crate 21315 BLAKE2B ff971a15dd85f7ab420c60f1ffcd1f2b772ee35e7743b8312fd4b45ee6e2160c783458173dffca540f5f7a4c7feeafaf31932ec775e8a99a6c6aaeebc87e98f1 SHA512 53cce0854058e70c869c4d7803dc040866028bb91ef2a5be59f3d93de18452898ec958b035961d536821fe967ad52c074114dcf23d62e0d0a5317b32d264e8bf
-DIST globset-0.4.1.crate 22363 BLAKE2B 8a2c7fbe083bfdb470866bc954579f50944c11d4460ef3d2115f7e523935ba8375c1073346f42d564d1d55f32e4e8fe51fe42fa2e5c31697bd943befefe7c303 SHA512 3cc7fb4b296ebc8c0a20d8080a9cf913ec61f2ed14bd45c2aebd0c73101514b3895123a93c5e1b5037362a74e18057fd6deefb5c91ff3880aa88ca0e1fb9095c
 DIST globset-0.4.2.crate 22474 BLAKE2B 0ae4fb4dcb52822a7c46d8e078ecac18775c1125c905e0769c0b204c2aa606828d902f4c0996899114e57ca39c42b43fa892d68f6ae7cd25f1ae58b71af74d89 SHA512 53b8d9cce33258882b8ad2bff526b31a94322742553ac2d01e41693a333947e0ed9d8a3c98f3ca2131731eb50935eec8f1f7b161338cf3cd10cb1a9f722570a6
-DIST hamcrest-0.1.1.crate 9217 BLAKE2B aead0773fba00b44ca6634dfafdfdc9c1856cf0fd8c6f32de7dae4be1285021ff097a140b8aed28d1f5d5a279681f95d24de96f45f14aba205fcddd0bf301f0d SHA512 6d6557cec99f482d6a738835d32504252e0a666c1318f6f0ac0f811afa7c087c048960ecd2fad22b403fae9a00b06f742de643a7b5ded1f816c118272232ec2d
-DIST hex-0.3.1.crate 8365 BLAKE2B bce1c771913e57ef72a24fed523a36c1fb741025c24a2ba3a4e236e19b9c575b7553eadaddae2e7f50a6e9078b0d363b0b71311301ed6ae19d064dcf052e4056 SHA512 beeb497718212f5f4683cdcab257c555554f6682eb1a1675738aac849968768d4f3f03bbb00b74bcb391b0559772e6d56ec38496dea5f7aaa45dfaae5e6355d7
 DIST hex-0.3.2.crate 9053 BLAKE2B 3ac67d26ad367df7543967a8153a2ca7c082d5f56df16cf63a37f76157ce94c68f4cb11c14cc75621a9c45d19c38425acb92b552dd6f45b9052d90cde2ea6e5f SHA512 fbb5e86da5c7fd4b7ebc505d4c0da1258b06406d40a5c6c1626f559e1a91525fa747cbb6e35a687c63216158832ceb49dc61d68cd7d74f2df3630b36ac423852
-DIST home-0.3.2.crate 4069 BLAKE2B c6fd346774ea9de716389d33b0884eca9d06bdafab14cc242ab539db287dffa932635dbadb2db277a1e18c0592e4e0b4f42b63dc712f9dd4cfa92ef6ffed6a7a SHA512 e7c1b8bdd1faa65a81594378bf86310aec15b3f57017e11730e84dfe469bf416faed27b253a3a277ca549df42881edddcf7c68b6267e87b41c1f5a2b07a36f13
 DIST home-0.3.3.crate 4043 BLAKE2B cd15b8d83b386fb9ce130edbf21307917050865242230af141805b8892d8a295cfb2be0db09296025d75a9c8ee24f6e83188e525ca0fd8753accf1dddc07c7ba SHA512 674f782528c7fc9087d80ff73c224fb5c43d7e14146026064e633841ac08feb342a6a7cc45f29e7da5585a2c920fac8eadd5f143bcaeaec4bdfadf6653ba7b5b
 DIST humantime-1.1.1.crate 16689 BLAKE2B fe9d8ef8ad396bb8452f1e28c4a122e3918c61042f0cee8c5769683f9b321f82514474a100aecc5bfc39422bfaadacfb35bf9f14bd3814d1de62fd0b7517e67e SHA512 b18608d088519df5e0c531c8756635f41bb6515ed7463891e6145b9a78ca2bc45c0698789015c093463c704b240434d1b54ab327fc4182a06a8b1d01f50430c6
-DIST idna-0.1.4.crate 289112 BLAKE2B dfd3449388dcf894188bbc4bf36f82afd640a13d6aa091a876e6048ccd47f4f4e4c44510a27187ae978c9bb8d71fbd76058c2e501618dcd3b94f8762e2333721 SHA512 45e04b1e4619be105866ed098e486700951e1765ebc4aa84122266fc3995ceb2a99f30465ca9202cc5f35db049c7a64711b77f347e9c983b11c0840f7654a9a0
 DIST idna-0.1.5.crate 258735 BLAKE2B 31f2506f76e9bbab68c0da6222db214865dc37994851d91eab8c6e7f0220e6bcebe50ce3a571866bc03f3ad1b337f25c3a02c7e7f1494553d91e85c1bf042950 SHA512 217bc49f667242bd89eff708fef395fd46cfe3d24440bfb76869086fb93805c4f49d718251fb1c35ac40d5588ec98cf8b8b516fda53d6d7fd3da1ab04b0d173a
-DIST ignore-0.4.1.crate 41806 BLAKE2B 0c311a0c552d0a4fedd6a410d6482815469caf6ba318714e247d1056426eea803ad8fd15c5cc364b779b162467d482d7eadf1cd0fdefbe266983ba5326b51022 SHA512 3ea888576957cde216c07e003e3a2401d7bb27edf8cdf045e8f37f51488c0d9aeafca71281991109a0d291741a948f0577c4d24e189f448e474fa79829f6f79a
-DIST ignore-0.4.3.crate 42827 BLAKE2B 0ce4296d6a16b2b3f17e2e79c372325408f2ffcbf617024720b600843e91499f00088a74b377e98deb712f0b9aa38c19cfc44857f47f5ad21b7736a4f342de0d SHA512 a4372de85ee945e68c503e743f28621d88e19facd2ec0af5dd2cfccc45c8ad25abc655c16020427a4357bd0c07f48348ccd2d19dc7d6b9046d13fcb33973a06a
 DIST ignore-0.4.4.crate 45482 BLAKE2B e810688495dd4e23747c0b9f650688029033f2e49c2acc2f12ee7d11db1888d425267c8e89a661e44c5a5bac1812120db95c87177fd9abf1366f260d0c55a2c4 SHA512 b7dd5de1c14b77483d22235c4738f39123011bc8c19b785fb528d30fbfe9e9c2f8e3b137ad2d3516ce8f59c2ae06bddbe80811423fcc5ef76cb851fa7ad866d9
-DIST itoa-0.4.1.crate 10563 BLAKE2B dd8ba6399c4f9b307c296b83043cf4172463ab361c8edc11ec0486863ce0a7a1be968989e1676821a20de69c383c1aab55a9eb4a61d74d63710811e0463391d4 SHA512 f2efdad4fa250a1a453d3a956b478aebaa4cf0618f77da1f8206d3ef4e37b153a485de6a2873662acd0649fa9b8599cde8c99ed2096b7606166de90fb5ac77ee
-DIST itoa-0.4.2.crate 10581 BLAKE2B 4ef219ac121ff82d0bcb9fbf7a0d44cb268b40564ba656d88ff52217061f33935172e23a76c5e7ee6c0531b4b0fcd551001ab951c0def39ff52350e0681c1b1c SHA512 d7201f9bb44f5dce15a90dedfbe6b722aadecf15c3defe1eb1fcb5f8fe64300a594c9acef4f14538129a787044374c71d69e69dbef76d1bb780309fe7d55a796
 DIST itoa-0.4.3.crate 11061 BLAKE2B 76ab02d37c62453ddfee00788ed83805c3c57a66120fcd266401806c005bb55c00b90e074a39a0cdf99d8018181c5bd3f7c3a4fffcefcdc762e19191f0a362e6 SHA512 da1d1c988c2c81f37de8d048ca8f8fb8787c48c34e815dc64616368cb787990ae0255cf1a3259f87ad02964c9b3e1e20c759072442c18c7d32db1deac11b52c1
 DIST jobserver-0.1.11.crate 19687 BLAKE2B 1ab784f253bc3a0108c30f1ebb02106e6c7d86f1654973d65c84adccc52cf4cc1f48447e8d40bcc8b9ab5cbbc9dc0becf35f9e7c81c8c6340b1dc41121b4dd9a SHA512 daf8e7e994fcbf7df5265e78d3d95f2e1d3e26d2deaa43213d75e33d5a2bc1c7c7bf66aae42a0ecde7aa59514cf70d16bcdc6198fd84f244d197bb1d09f15fd3
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
-DIST lazy_static-1.0.0.crate 12611 BLAKE2B c7ffeb553b82cacfeacf214ab069cd0abbc6b83d670ad84704ecd30919c390055b3679ddc85e9a7d0add530df588f6cba4cfd7c5e44e9158b609edef2fe85e4e SHA512 73044fce4d00002d35931d4b28810feb5c28c3debfb7bd570d9a8434cf15c29c17f0daf29ac04d748a32f52a205d5f52ecf69aa395f49d46b825e3fc0cbcd41b
-DIST lazy_static-1.0.2.crate 11431 BLAKE2B b427dcfd4a1acfd2f3a1e353e5550d439a3a81f038365b6065d21ad74def83d3107abbc6759a22087c59c141612e17b93b54c3e5cbc268f9715a4af82ce5eb94 SHA512 43ceb14b418143ae6bf46d5bee378e419a005ecf772c5ced809ca79be292568a3e70cca8a0652e5d06fbd76e1a9057adf44831705b2fc564bd4ef7446b2097fb
 DIST lazy_static-1.1.0.crate 12317 BLAKE2B 18c1c0312bc9b7835cef8a35797421be17a706f21a9dcb174527807c7617987fc165f1f99b6c7c665099ff90ab022b0aa4727e7764adc3dd23eb70245135cb6c SHA512 82df91ddf79e2c6e46cda92d6dc8afe20d428f40940a16a352db3c3482ec21ec4b5147bf723dd0b16320ebe0fea489d715671c7fecaf8d0d7982edad3b6919c5
-DIST lazycell-0.6.0.crate 10099 BLAKE2B a0746580ca979298416c595c6e5683ec1c1f17c3652a18a393589441b8632a7c8a369af4991b11fd857b5c4cb533219e1e21635159e651ab0dd480936e38b811 SHA512 3e3267c6b64a32142b1ed7533073dff1a9dd4304528a13838efe9fd6165beda40a2ab0613fca44ae639e67d94b4aff1c004039c52f2990a741c84358db1dcd84
 DIST lazycell-1.2.0.crate 11259 BLAKE2B 87eaa99fcdd691237c54c06f870a71e55ecabcd2d2de06551d2b718c138cdd9ea085b445f0d6a7b773b4a025b2fb9a7a04576cbd7f74be23af4916d8e8d2e7e3 SHA512 194e538f8e2be6748ca56463c9b6e83c7a4598bcc9d3f2680f8e35e391f61e36e0d9aba92bcf8e312f286a5d309f0d83be06e879a52e405bf2c89ec13d3a545d
-DIST libc-0.2.40.crate 327272 BLAKE2B fbad5d1e07d6ad43cf0c94d1e5e1ae9dc11490d7a500a796060fadef39b4b58778aaf9eea27c6bf93b9481b3d94cb807e192860eb074c682ac559349de9bf9df SHA512 21dfb230796885d4459b1119de31f2615ee4f1020578e74d2e07fa5340777fde4c2f60aabba7444f00434519c95f12e6e1a3bfc496b83c11cea582a219005dd4
-DIST libc-0.2.42.crate 336080 BLAKE2B 0de0726bfb00ff42d67abf06efa26c1a4f8132b29be2f957b9089da2ef3e4dfddddea49ea23af3449a367d262dc563b70968c6b2b6a1dc81829e6c6a8a1dac63 SHA512 c99a4358805012d7552f416ae68c9651dfd260599bf0cd618b55036acd08ab8eeda8aa18c18b893f074c9613694ef6562e87f032639eb86b86514aa0fd815870
 DIST libc-0.2.43.crate 353810 BLAKE2B 909f92f7014f33404f0525bed202575c7410d19b2383c48faf760c601f88bbd2c61b2b57550d35443483598bd9d213e1f20c2d34ba9619fec2c38c0748c3654d SHA512 d53b9fc460c68ed77b9c1a23c093c927125c0946b5231c343cf239e706d859af42efc2c7a4b95fecb46ab6ea9dd8473f7de308176a7dbab18e220246c5a7a8fe
-DIST libgit2-sys-0.6.19.crate 4663410 BLAKE2B f42d0f08c248ed5783f8a5cc2a08051c6ba881a28bf6af433ea632e88377ccb7acbc01f69cfeb0e3844172c95bd1660d7d92287d4353f0446040733a2e0f6d97 SHA512 3c5823ecadfb8633d3880552e6881265a21a3bc395120bc51c93424ef8fff6be6d4c1b20930d7f94ea5f826e005778878f61512ae4fed2b2b8e35d8fe1852495
-DIST libgit2-sys-0.7.7.crate 1177185 BLAKE2B be1d4b1a20c22b26aa1d96fff9aa96e5f06f883eeffd8593b31e9729f7099cce2a702a468ad4b417f8482aeb92bb767e5e2670b618ff1e7c2c2b208707e6c915 SHA512 05a3755fdc2c3afe85bbc3cd7379311f8eeb628fe0b6df4cfc01a5b09dbdd665a04c99136b8bee825a1079e2750e612c6eb46b14e9c6fbac4230b41bd06b2da7
 DIST libgit2-sys-0.7.8.crate 1176232 BLAKE2B c671bb3032e04ef2220dbe324b4517dbe67ec6f3af431eea544271887dced89bec6269ebce23545c1801ca3c638ff3fab5f4971ea407db5c784057c917aadbae SHA512 21953739a729ba04352c4da3804139fdc717b2230618f8b6976824f8ce52c5578f03e6c7e319c3fd08fa2b935a71f7e5899777aba7c872e3f6a819228c07219a
 DIST libssh2-sys-0.2.11.crate 458377 BLAKE2B b9fa613a518ec21e5b90ef75ce0a4171406feb3be64accdc83b3d5924010d4b94eb95d1698addb44ca6756afd5663461506e3831035b745637741a35719b464f SHA512 4fee372cf5d546e6471177127041313291c7f1aa21777b1e9f0c6027052938fe4c6193b6925815b64248faf9086ea04014b6cdc0420135ca99403016700c15da
-DIST libssh2-sys-0.2.6.crate 412381 BLAKE2B 17b16a73f2c3042891d26bdaac836e35f9839c8e500643d7b2bf8ade562b0af5f2f90dd7728b1b04861b40deaac69184dd8edc9791ff0c9fa97ee0a3b9065091 SHA512 2a02abf0b29025137d73d4b97a6287142f5677383f22085d3d49f76fd0c8324ef1baf5e9d763b6cc2dd1e339f697b9466341ded5ae2c8cfddf6eeb74e870f8ab
-DIST libssh2-sys-0.2.8.crate 417770 BLAKE2B db096951131ef568c8aa3f0323260aac2001e46cf39b42a66eb006f8210fc9fe069da86a99349dbd91aab293e27b956e976031720430bd7b4584734bade30079 SHA512 78390949c1adfde166b164da83e1b4b3c1e6c8fcca339dc12fcb57b96c49159a7aaf375bccbb279fe3fb604541386d242e4c8c5652306c18927f122dd9dc0051
-DIST libz-sys-1.0.18.crate 632715 BLAKE2B 3c88d321f22d8c49a17d2af04361792247f7590e4b21163033e5de7b726b75f91ee15d4e9a8824f4ae894ab8a1856c637982e5f1c70de8dbd543b75de2d1af94 SHA512 fcc9e5bd9ffd5eb4f302d3c271f86370f04fe9fcb3b818ac8d605241a701e9d0c40cfe729ad8fcbe7bbb07df66539503415a00360c56831a511142ff225d0d8c
 DIST libz-sys-1.0.22.crate 649558 BLAKE2B 95e7ff6e57742f36d9bc4d7754bc5e5f43258fa9ae21c8e7a13868a96eb1b925a271b2235d8565f0ef72d617ca305f1253dd952e9687f8ffaf3cbd267d26fe8d SHA512 9f04625ec533699a692904e99f910f37371c1a716068c902dcd64b62c8b6985772a85b1a78ff74e88d461c7b7a2c0f6c32c8a1c1555934f144951e33eb1c0b3a
 DIST lock_api-0.1.3.crate 12167 BLAKE2B d01453c4232ccbab72706f4932af598cf6d6d15482c065f7e900f0246973a130d2db1d01779585a6b99ab9a36e074a787ee49d99947bebc2079201b380f985e0 SHA512 5c088cdc3a5321ac9e9f488acca11c554be5d91b2de0e48171d2ecba15d7e5960ee0a8ed82fef15377ddf17646ca350d9749b2579d5ec74cdb66ffd327e61c5f
-DIST log-0.3.9.crate 16686 BLAKE2B 543a8a2425c88bd3cf00d4cd2b4790ef344f9743b61776d65f1d8aaaa1ee1069933e33aec114a2dcaada5cf698bbd983fb22354aa50bca58b161a36b2f1efc47 SHA512 1d49a0dcff0a17c1238aba6a6cbc485a61986e8c4768805ded912c5014d0fba6ca38c9bd038f3f53900a6309d41fc0216682f137362e63715878195453d2de6f
-DIST log-0.4.1.crate 20731 BLAKE2B 5936919ddf0e218ca42d669b56271836e9eca61afa4145896a55970e5fb768196f18ac6f028caf8eaf505f5bb797700ca2f238970e1ad54edadea566efb6ca16 SHA512 a142f4d230cbe64a4efe2c46055722bf06e7af500c0f14d66f1d7d7fec99d552081ee9541d4a5b3aa5f46bc3be42f7702dff76132cc1eed7734234b2db37c0f0
-DIST log-0.4.3.crate 21629 BLAKE2B 0656ca6931f7be89fb5c551b33ce2800f0c20f804884ea88ea04eaad27ba595988d6f7cfddcf07973bd2a58d6fa6b2092c3736ae353da0323727336116499555 SHA512 bb92f3ce23ef7361116964d2d0d6d9aca192d99c231385da71b23d0e4d1ed71fefc2ebdccf1f40f047916909df26faeef777aea68edb960298c75799765dfa2f
 DIST log-0.4.5.crate 22221 BLAKE2B bf60a62e0fcef107e66cb0f673bdc2d6eabd364424ad82488fb09655258855401f394c4c5fab584560798953e188591524d9c3044d8b42d16bb3f9cb255b747b SHA512 19b1d82ccd929a63d661512dadbb0ce11f6e3679431a40f4c0139d0c2f68d77dcb05be71605eaa23c01c920a38d11e588339ab6d3982418ce61c9df55a4f2b11
-DIST matches-0.1.6.crate 1916 BLAKE2B 0ed7a81450fc9f639755f4dde72c226e107d8f5d9eec7e191efaaa4423d0739e3778ea358294b17eb35f3ac2918bc04b4009aea52d7c5f4335144180b444e881 SHA512 0a613c6daba26056da06cbc4a8a66751412b8e5709bf0e24e45caef76e308b918a2f6038342f3428633e388fe7631fc3978673560829b0842c9ceadb4037fa90
-DIST matches-0.1.7.crate 2262 BLAKE2B 948d30b9031e70a4ceda31c5312a93c4a43d17440dbc4de78805642bafa6949ecd709b5831a4f0e5f07e3df651fe9c5641ca70d74377ebbc3d7d74adb22fd91a SHA512 aed30cadda69ad6013f94b238b7ca499d899e10ae5350b5dfe9e69e95998323d8ad490ccf6a3c4f68ec49815801a6b452b160ba83673ee7d9883bad30627db99
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
-DIST memchr-0.1.11.crate 6977 BLAKE2B 44d270a5ad4916dfeb186b3997168cf80556f2afd1727b1e4c796942d48e8e453ea6182fd47526ecdfe5c6edf33ea9329b5a3864db9e681420e8c76cb726a9bc SHA512 96bbdb69913966326acba4bb82b8dfe0516edba225ac38b3355d60a2337ca620807750682fff3de7a2a38a7f70f0db7d8c1638701aacca7ab4c14098ba0fbcab
-DIST memchr-2.0.1.crate 9858 BLAKE2B ccf5530245bdcf1b892b98858d1cfd8cdeec3765422f6d1503bfaf3e48744dabfbc1767212b310d1951f1594ec3d4ca09447ca72782ed272cc396113a7f9fef8 SHA512 50daeb73062c30b244c8fec965ff0c69c29571022a9228dafd1ed397164956e39fbe260b8adce33522b5cedcd7f9135500ac45d6bc0b5e72bf9e89ebea0954d1
 DIST memchr-2.1.0.crate 21479 BLAKE2B ca97d105cc780f2a22eb1eb7d6bf6755f012b1d15b5c55cffb9a63f3faaf48b5285cc7b4edbdb933c4e81565da163b325a4d570aee5cb479496d8b74c3d52d8e SHA512 6de3056b5fcdf08fcfda34be710d2f4ea326f056450a78a4fd096e5742cc40662d3003f3ef6ced26687dcee7591f5a8323d14df2cc286d732b1b22f05424c476
 DIST memoffset-0.2.1.crate 4618 BLAKE2B f04c4e5e1747d5516dff26fb045d91f01a2eea6011974a342c1830ad2aa6b203d5c6cd4db464177797f799197656085f980c00e78d0257efe5d3377188a8b8ee SHA512 4901eca49eb20acc53d1120548925d691d5e0a0ee899f5c26f55f8b997549cea3b819b1f9b4f5495f4bc73fbcaa386cda50cefdc0036c097c4eeca8086568530
 DIST miniz-sys-0.1.10.crate 53357 BLAKE2B 88c511d46cfd47fc2053bf618180d6da3e7912bc9d0e84e4f904506daeaa5664c5f7c5036f3536c8c6def2a5b2d0615bb3bcd309653544c236ac3be64987cfaa SHA512 d7a6f0bc462cf10a5f630ea20f4c991830059b359f67780e160a662671a8bab21bbc29aae2220694d008817b1227b9b8e0c3c458b99a29ad2e5d141241c60844
-DIST miow-0.3.1.crate 21858 BLAKE2B 2771d7d56f98a4ce264e23367a6d061d3f2b66de2e22978a676d697634a7f26016a616c68eae05e85e099d1b2d22e5036a41cf9a35ee08fa82de0b8d7295f44b SHA512 6ee94f330283b71e7ffbf57a3e522ac346a06a4a3a778c0a18f77bae3ece675db5947460e58d88a227bf9b392ed899bdecf1d56de57aa5e27bfb556941eba0a9
 DIST miow-0.3.3.crate 22850 BLAKE2B edfbbda60206d0e25eaa2d8972290feffe989bc2b6d98099fe3042bd0480d63a0cdb54df1abd55827790996bdbdb61f241b7fad8d325cdd64891513876ae913d SHA512 f2b8c5f31bfa2d831f1a6c0aaa9e526dde3ef8a2ac363da5180592cdf7a30e9e0898de680692db00406a48f4ee068ec97e3d42787c807335f7d47faac9c563aa
 DIST nodrop-0.1.12.crate 3033 BLAKE2B 69792f5ac9722dc570749795b6e0e6c6373c44614bf5861846af08d426d18e5929ad3c5b957adf3480e8c77444cec9d33b3e8b272eea9c7200f0cedf0d78e7ac SHA512 8f2856a6467715565ea5b3be181fc957f6cbc885797c15582ef5be5a71089201292ea58f94877496737dfd427b19523228fa4bde49d9413a8399d2e7888b99aa
-DIST num-0.1.42.crate 8323 BLAKE2B 24c31affacb1a4bdfc30e30afc402d92344d4d17079b9cfc103e5a7fda50b0c62a877180b94af79a8898bb2b81de44324b04c00d5983c8d10d30581f3027464f SHA512 d8d48080f84dbda59d16418f39aca158deda1fabfba2aed1944f77b3c6099a244d7a32e79f28b9b72dad4cd446a8f4f854afaf3f368e3ffbbd124e64e4aef3cc
-DIST num-bigint-0.1.43.crate 63022 BLAKE2B 428c1bb5c0e0ce0c3b5a0658a555ef79496f52384c1df393563c17baca1888d4ffc1088ecfe06028190b3265829887d95cef1839484748361fd0ef3f5625ea7b SHA512 07119e28588b22236fce2f5cbd074ccc1b5a31081a9f5ca3d5981680ebe68231b21c1250d80f656ab1411f0ab3aa942d54889845c03935f28e68fd510ae943cb
-DIST num-complex-0.1.43.crate 17731 BLAKE2B 4b18c7839e7826c16c60b15f9d5c6bbf9f9874e962429cfaad6fc9fc9bca9dfb260ae390e051dac2b2e6cbd4700666851318ccff137badab00bd39f8c4407732 SHA512 e82f3ea86e9725a51e6669aad07b87dfe86cbf2fcbf76629a2479bcb9b7c5ea2cdc2fab7a98091686c15f4ae7ab68c66e01982f35738f9055a41938930e72582
-DIST num-integer-0.1.36.crate 12168 BLAKE2B b492ae16a4143996d447dd2cdd348ebee6237d924e2f756ffb4a236b9de166a9b12355ba8e9027bebb58c50404ec64f392b0c52bf336c6205128e27d1184cca2 SHA512 9f7f8ae499ab181d77d69f6e761457fc170305767a0867142ccd549cf55c24b9731434f6289856d959ac239aee32a6574c77a5a783a701ca583310ed9134911d
-DIST num-iter-0.1.35.crate 9013 BLAKE2B adfc4bfb7f390e2abbed94fb64348f4f4e7d6652f0bd5aab4d7f06a59c1cdeb46a5190ce3868e64705bec208a3ae4292516d99db2aef120153de5eb01a6e4251 SHA512 df4fc06ff7ae28b4576a1004d2284d49865e899ae315c5621258aa1087c951b2927e1e413d2a8fa992ede242c2e73eb40c6efbf3feb1adbbe5aad8ea323d9e4c
-DIST num-rational-0.1.42.crate 17253 BLAKE2B a3aad3fac51192e00f00a4489590c1358adf1bc7d0704dd069375501fb820c1413089f542900ad5593745d4c5f775f7101a38d65c1e2fe892dedf3d6f83245da SHA512 f0ad3c6e807db1cccb5260caa1b2abce354d1aca63e765c0bb2d18401e941d57a47c8edbe485ff0d67ab363c937592e2adcb89538132b5a2d6d4408141f17ef7
-DIST num-traits-0.2.2.crate 34777 BLAKE2B affa210c22e3c27f743d6b23393fc61749e37c066fb4503f7d9d5e634a2236c2632bb9fcb4130be10aea64a583e15160d33e28570fbbaf8ef935b1864fc0a9e8 SHA512 2b2baea40084f4b1c7b4aace26681e92f0d4fc40686ce248849ca9672b2e24f545dd168e37f33ef162b07663e192d81c9b1f2ede1cd45afa5910fe9aa2c365a5
-DIST num-traits-0.2.5.crate 39136 BLAKE2B cbac31ecc18b9617dcac752fcc45ec1d0e46597f5b0030d21a8427d66bac2211254d5783982403fa9376b57019971c8e616590b4ebad45075fd979949d78b3b0 SHA512 0c99188724984b37943b20375f111bcbb1ef5db2a41c6cfb22df4ba4702b43fdb03be6fbeba868761a62a3fd2997922a22db49ba4164d867cac95e765772b10e
 DIST num_cpus-1.8.0.crate 10539 BLAKE2B df0b759bb2e1f6b31081968b190a804f168973a3c12b162106218ab0487421238021f15f6d97c4efdcec712277ab35873439e41ceff7ccc9c0bbc2fea0620bf5 SHA512 cd25a8da1a7c2639f33c3d36382580788d8056bce30f87b89993b92f39ea6ccce0527a907eb38dfdbe9219ae3a2bf86449dcb43ece978f834679dd4a8f8f2ea8
-DIST openssl-0.10.10.crate 162102 BLAKE2B 1b4245daad0f8f8c6c0afa3028bc08c36eaeb95db446f5c06a563a5a45d14c354393198f22db436572802735ded99fb9e0e0aceb9a836206b65c8f8007b85b9d SHA512 1ef29eebb6cd968fd0ded6e68bfa2baf07ddbfa4767f6db250a0b1b5fe36f6f2e756de8f00f4a690509a51dc23fc78d13390055be35bc32c316d33f4b1d36e01
 DIST openssl-0.10.12.crate 165851 BLAKE2B ab6fe074764a991c8e7a8fbaa577e23f696c96599486c664895d62eaaa60f68d1afc50c762065cb43a606e04f3e9e2f91fb65d794ba6f779806963b99e544926 SHA512 f11d8efcd82da322c315206eb7345f5328e3bb4b5ad4cb793532b29d23efcf74e70e0cae4b5eff81c356b4831db053eae14a741813ce7192f3f2252aceb92076
-DIST openssl-0.10.6.crate 158082 BLAKE2B 2a9e6b77e8a6c55c2fce9b0961c2179cd6ce2534e714eff9c3c07d9d70177ec30e5f47092e18040c8dd9396563ea3f05e5a022af035ee359a1f16ec4e2b8c86c SHA512 9e4051c1c4d4b5143c9148f46083fba8df5c9e88e8a2d60398af21012d79b7a65feb5d6a6d1a704445b0ab74e9d23ebcf95d97df33a76ca488c3f188c9126e9f
 DIST openssl-probe-0.1.2.crate 6427 BLAKE2B 8df00c8ab6af7887a88dd1672bf2c40c6aed5867b0b8d07dacc94b80591814e2fee4ac5dc775ea0e98cc33641b9eeebb6d5979d34717ba400b907358ceb2a469 SHA512 4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a
 DIST openssl-src-110.0.7+1.1.0i.crate 5874122 BLAKE2B fa4c6e76403e6f02048728795539e07e6de5edade23e76c06916702108692b7781ff818b47f94a3678d66d2d669eb40248e0e251447c3f411d2c6c5902d1b4d3 SHA512 24f54c5763eb6e13bba7572d7f18c62f85fb0d9cde78e4a50cc059dd80362efb8851fa1b4806514a2376707159be472299d588f8838c5ec3e63b64633e48b44c
-DIST openssl-sys-0.9.28.crate 40560 BLAKE2B c5a1f34ed11f37b8d842b4971810f83eb6e24d74ffae931224a5c9ac992030bd9f034ae057f0ce9efac3d4f2f20898f8c4ec33d5290f8747fed575c0d003c036 SHA512 a156e682dc7c7d8075842623b58a3f3386c330162cd9489ce96a33f72e0368a381e4d0e83c43885d221a29edf1926a11b106dbda273c863845ae28a51e2648b3
-DIST openssl-sys-0.9.33.crate 43333 BLAKE2B b99685e8764fa8863fcb3774a4889d8560c8915460fb74c31de577dbde4ba2b58c471e053f7b688375a4be8f9cf74ca254f17dc77f72bdb530efb1a9a0be9e59 SHA512 6190fee6c28501940f0bf86f9425da92e9936cd331e85968bc3bfad0c492b796842c0d58db8351dbf61c3024fd4fb47aadad0d6ed8ef650f9156c05d43e9fb56
 DIST openssl-sys-0.9.36.crate 44508 BLAKE2B 52a4908b15952f8717d1045559e682c6e3eb5d609d98bb3e6610b486f5161f13d771bd8caadf386181abfd97df8f2327d88137f71f7f57f655e3fb8cdf8c7ae8 SHA512 bc4504db7fe6f1016505cfc2fc7df5bde5768bd6b7c2e9ae004d3a5377cdcab3315632e4fc04182145c967bfa25c871cc06026603df3d7161264ddfe3dce7402
 DIST owning_ref-0.3.3.crate 11710 BLAKE2B adf07d01a82c1eadb5f4e74072a69e0a76603bd5f7a4fe2fe86f71c9733360a769eeaae4bbf830fe125da463a909ad0a690e99a30ffcf766165cf63dc3c43202 SHA512 260f3d77f23b092c5ca96dff6746d378caa1bac965745a71ca18eed30a12c6869af62259daafc91c8666baf95e04619ad0d8fe06b47d5e517688b35f0c59005a
 DIST parking_lot-0.6.4.crate 31890 BLAKE2B 95024d434bc988a3612d231e83808efc96a4184d059b51a1c2a9c86e661fbd3d75ef284381f0fe168e73a1c811754a6386ff6410ea2e248434e524ff9de54de0 SHA512 e2d91dcddb872d09d1f4a9d7fff21ca53c0c8b15f49e46b68e4a59f2ccffe1e852214860bd99d9407a66e4b6ecf102fb96ad792bb3e9676ecde349d728f16028
 DIST parking_lot_core-0.3.1.crate 26635 BLAKE2B c0da77758b3b4a1a5b7982f1304e3cd74b4345bfe4ab1e9dccfcaee828e1024419fc20c6069efad2ee2dcad0180350d240ae689a5b700e4b47a0b3b3808b6539 SHA512 3cca0091e839cb0b63dd17f989c1d3d196e9706b4adb227f9308cd2b43b68806dfdf0b7ea098592cdc520bff249ddcadf23d0c0a7c23eda179ac11594c26e127
 DIST percent-encoding-1.0.1.crate 10057 BLAKE2B 6dbfea557cb7a604a99b6fa694ed24b1555fec34bfed54503d98fa4b285a91aab1405b7156bd00be0001b10bf15706878b7bfb4f73cc34560166e0e8f004d944 SHA512 6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9
-DIST pkg-config-0.3.12.crate 13494 BLAKE2B 1e2d5513138e1dbf4254695f94b27e5fab336d6f9f651b47b0de97c7d24865ba9a0bce55a6958d881038a78665337a102fac02dc6b49859e90d66d2a6cb8d39b SHA512 31f562d7eef569669e32041d46db1f34addb4622f63dafb49209c36aaf3a61c57030d8dca61c7424597943a79b7d561063edf1fc639c48f8743d806e74ec1e22
 DIST pkg-config-0.3.14.crate 13565 BLAKE2B bc457c2bee4034e7b5a5303bddf078e0b3e52018eb7513c5fa610ec9b272b95fab6cbbe35281e86bf0f97883526d91dcf8c156ea83e7dc23da0924a395b6c811 SHA512 bf120f0694f44d7b83b431eb28fe14ef3aca4d08ae0c2c9edbf8f184c145ba3faa479a6ab25e2d7e9f9d9f2d9a3fc21674fd4ddfe88bcc4fadad40bd8285656d
-DIST pkg-config-0.3.9.crate 11055 BLAKE2B 8c8c9a4badcb2d2691a953b06a6c479794eae97e40d95509051ae34665ac467554849f050eafd83c03070c9239709b7873e1c33604a06acce396ddf678c96e34 SHA512 084e18e8c91ba6a1b305624d16c06f8f7df994c93cf86ccf443bc8f2669368a15bfa9875bc4f2933e94aa268e15fef783235c98558ba596cfc79dbd31f0b69d1
-DIST proc-macro2-0.3.6.crate 22845 BLAKE2B 1491c55e9e417900a12e9b2ddef34032f2141eda9f3863bcd0fa0deaddc106157e366976fcc185f2fbf6bd8e5036c378775e39d1ef1b21a1561425f56b374910 SHA512 4999d6f4916005e6691f3d865cd6d58fb26e672319e9d941d9fbc6403e10ca2b6ea761e5e2d84cb60324f235ec6a57dc2acb064997fcfbf63b90b48b1d0df9ff
 DIST proc-macro2-0.4.19.crate 30128 BLAKE2B f90885a589d7092f50a14d5c472198d42cf8c96c13201338f9d63e1b63c277945b93353af89bc5ae7bf7f4bb8088b872dcc7ec242bf4a26364fc6c30c5a15af9 SHA512 8769eb1582a70277605bd62629321f485704a4df6fcb64b571b87e2a1dab60e982fe24504ea08ddbe03f0681bdf4bfd9aafc63d2f7ef38b84429431121f98b52
-DIST proc-macro2-0.4.9.crate 27912 BLAKE2B 9d270b7ddba5407d21b2a2dad1032cc15b7aa11b00fdde467a688dbf9527261c3f95de089c0cbbc86c18885044c17fc3b5e6e5b786ba1b2f04892e2edfc9b963 SHA512 af5f32c2f2147a7b3d5bbecc27427c2f5b7dd572cee0cc550d2fa5b730a7559777660d46a8bf9f3eba8fc1456dc0379650161b21f289295fe3909904d5f5be65
-DIST quick-error-1.2.1.crate 15112 BLAKE2B 615254207c47928c1053a4ecd1b1a64a32e9e550c8d74ad5564b31404469460e063aaeeea3e3a8d48ec2416edecfbeefb8f84fbb8f2d9eaebd6121de2d5ad9b4 SHA512 86242dc5a5b68d4d4df50db54b629256d8d33f9637c457c669d874685dd5218f96d0a2dbb16b5c77cca67480e2bc485b3aca6fdd100f615b4bd00004910d2ce3
 DIST quick-error-1.2.2.crate 15132 BLAKE2B 0c35f1d0145d4a3bc4b835f203cc4348e1d9e8f6f7c1ef887d923bf8a9a63f896929da67e27978f0d797a9455be5aa868078bccfb8eac480569d62ad64e0fee8 SHA512 f4ed283635e1fb72bd30929457ac04b1b79c36b4b08603af6266a3ea6e18f12c834cb88ac090e42bb869c8a608f7521812de81932a81073a34f16fc882c6148b
-DIST quote-0.3.15.crate 12041 BLAKE2B c5796b464539b018351b41b5e2287398681ccb2ca76f46178b4f310e61a8184afe9ea2b8dd7638f27bf5bf37f60458895497e51c82b31326abf6feb4f69404d7 SHA512 2e5dbe725c0f76a81c6624181b43b60b95dceac208e2babaad3fa6d1487794805169e2ffd967659e4bb4e1abebe96505be5a1007c514d10f2a63ef282d699ea7
-DIST quote-0.5.1.crate 14960 BLAKE2B 123e12032797c8335ddc182c2e95016afc866cfc041f26d45e3482c6f689719bbbf6340ed07523acada93953a9ec672914b648d71e45008dacc033f72a7de5a2 SHA512 bbf670fbfdeec126de0a083415f11b2cefbefa30db8390c2b7b80a2e541030cfb8153f2cbd2641dad6d35e25eab9cc3143861ffefe536bd2d119f8d967bbb44b
-DIST quote-0.6.4.crate 14184 BLAKE2B 3edde1a12453d23682133a30cba9f2fa1355417d900890120fd4d8c44e8ddb00ca584a3be5e8c8159078495f531a49e9a9b911d8b76ca049e0d15f9c9468ad1b SHA512 418f95da963e00b262d9ed3f4e31f2644c8aa3bcb0c019d6d30c5df4b0715a940796e354d207e81d5212e97539e9d61a878e1a6bfd9ffc83fa6754212e9484f8
 DIST quote-0.6.8.crate 15530 BLAKE2B c33d890eb5b1fb530d261d49956ddae082129a76d8b3fdadf96df68aa57b05b0e1867b371968def9ea7ae8cbe205c4f696e2b3d5f73bd50c4949c19fc98a8816 SHA512 d436fd7b1a4a16362b5d4a67e051b87ca91012522b0ec2835654dbb15db46953a944521c1c7b7c411b7964ab1ecdab178bf003ef5569c6ab0592d753ab81d6d3
-DIST rand-0.4.2.crate 76170 BLAKE2B 28c9965519db48357f23517b5ac43a641d1f0ffc4396c42933d22181fda3c6df1cfe08dae66a188e60df0708112839781daaa5b5cbf667d6850b10bcc4448f99 SHA512 ac6eaf9f0914fd966c835a04ec644c5a8d62a4a634187d538cecfb711955a977234dc5fe487cd4d351514bc0de4f51cbd0f09a8f6aac56aa0467ae5eb17a4fad
 DIST rand-0.4.3.crate 76094 BLAKE2B 3889a26c9c41fd6b0b5bfdc75961aa4f74dd22aa61060914b0391361129a7557b504f3f23777cfddba6c2f71092ef9f2a76359245c0d594988c5ae7aa2968ad4 SHA512 d287faa583d07134a10db61d1dad30a3ac006624815240d50a8a21faca49085c3ef5c01c3741def25b3e93cb52507fff36497521caacf525e106f419013381d3
-DIST rand-0.5.4.crate 137389 BLAKE2B 90b9e71c8e79e2137c7e6c3e3e73626f5129a2873ffea25bc667e1fc7d0484374c5329a82d635c24637e2149b022efe6c231a6c78b7de7b7e0e07413aa30a59b SHA512 2a4e0d573f49946d736209187938b6750588c0f867cef2a429457d20bbc80be44fc6d1a7e99bc459a834b27a0572da744902bc0dddc0b751ff8240db3b56d797
 DIST rand-0.5.5.crate 137359 BLAKE2B ca594d61b964b3511cc0c995dadf1aa270ea3f962367e2faab3d73ba5caef8557b5404756f7997aaeda0511184d3a8ec0f35197bbf7d3d507152f1f7c63825a1 SHA512 e135a9c97943662bcea9c4730f19ec6e01ea73303801101592c14e97b59adbbc3457ed7a3dd57843776f5febb6fa34890aad9d1c2c596ae89416e1a281062cc8
 DIST rand_core-0.2.1.crate 19262 BLAKE2B 6ab239b11f08b79f5319e0d278ec56985f4c91406f938c206f017f706508d73aa78ed3ef799ca7f20a9bf3ab860f76c5527bf14fb2464db914af3dac55ac0b64 SHA512 5e919f4229ee2e7d00f47f8bbbb7fd27e11f34aa5bd85a9d9e34d45af1601bdbe2507d9b0182b5af7a6eb4d93da3004d2708729f7e864b6c66ce9b3274fe1c64
-DIST redox_syscall-0.1.37.crate 13980 BLAKE2B 9896615b819ccee17b18093c28a778bf6b4e0b4f6986f071e9e956a9bbc9724e151fd497d394c669d0feb8dcb95c3258a4103af9aacfe8381fc930cd5a1acd8a SHA512 147e48d44227cfe8ea190d543f9f8ab1e49fe2336c80f7e2b83546e617d0eeb8a1e94ce6e4d6f633b92ca72241cbfe0aec082425bc5f7b63d5efd164b51d5e48
 DIST redox_syscall-0.1.40.crate 14745 BLAKE2B c63cf49985accd6b6b54291aff7a7950ed3bd862b7833b19d56e8f350bc2772f427bd6d83da9f6b603622008e90cabb2801cd70ebdb3343fdac020e6b4344901 SHA512 86e74bd8bd4fa12eb8d667cc91ab55df573c0a466c7786af76eefe70f7c294db5a307538089e2e3de2d0bbeee5c1691327020cd0eeacd9d6ab95048eea88b012
 DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
-DIST regex-0.1.80.crate 185806 BLAKE2B d1bb6b363584528a11f0de67a0ebcda1d07a43d890acc7b5b8417f946e236d318708c6483fc6c7efdcb82509a116183400b39d939aed227821c9f5badba1c2a6 SHA512 a160d80f4ac9f1e17d1debe163584f2c6c2ba7a8c49c34a7e11ed945614fe1923714880515a31a1501566e254edad23be40307b452f9216915fa03d3dfaebda0
-DIST regex-0.2.10.crate 208632 BLAKE2B 8380f1e91c99c73e12d125bcb7f97c8851d55e509b3c2ee3a87c7cf6c8d432f800535cb200f4c65276a9752ee2a966b30e70af41b20ae70038579ad66d584ff7 SHA512 2f2a2c0f7ffe4c9711a689b156b732b5ba58774a0f2064a64527e1af29ad9fb8ade6580f10b52f912a9bea373422bdaa995b83d0f2620aab9280e43330953614
-DIST regex-1.0.2.crate 245163 BLAKE2B 11db7370515901dd40aab09cf37af555b2a48474b4afbe2bf9bc299b0cc0366c42af4a948cd8fed26d4462c090570edd0c1b0e2e942e148330494d8188c55e82 SHA512 546d38e992c4474d6cec812c1b6f57c7a1991f27cc0d5772d814a21f670128ce11f1ea1750a6ade402fba8b31a8485a61891a9ccbccdc8483054316eca84a047
 DIST regex-1.0.5.crate 245770 BLAKE2B 2bb5dcf7778ff6e6316f80a028e9e0df34d77660dc1fb21250238de250335ea2546050b0c56c077c4e64788a0fd2b27f7ea6de639feb2b99590fe9e8a2d32e1b SHA512 a4ddc78fcae0a2b3c0e041382bc8c85a216ff380212762459637934c863782445cd289f5cd60c2a923ea9161f4dad9891210fe6a86cd6bbc8db8abd98ead34ce
-DIST regex-syntax-0.3.9.crate 117427 BLAKE2B 81b0fbd7565902c6b87619b5f66bab9a7e3fc5d64e4085a2b600daedaaa0a294add31790bfca3c653ec79033272f14c89f34f5f49b32dd9991c0199b209eeb24 SHA512 85513709816b148a163b73495b1e0100203da6c37d50a7d64368efb82fdac45fdd083d31bce4b193e1aa5926943e5278eaec5b23b174c425b5954d7b716fa506
-DIST regex-syntax-0.5.3.crate 233364 BLAKE2B 1862f7545e92a06b156a65a998f6c42009400787875e7728a458868275eeb4564807de5512560c9cc646ea0a0d661c67ea6705252d8adbf5e9ac09558b2076cd SHA512 03034432b2a27c5b7e79ca072405ce4639e097843fe9861f0b8a0f289b37ff28e03c2454be0e815181882da7590ac1e8a356beefccc2bac57d02dfdd1f404d65
 DIST regex-syntax-0.6.2.crate 238572 BLAKE2B 0fcd5a6b20260a2dbd8f4dc611bb8ad8f0eb747ab4ac88682515bbbdeefba5ab149301da4e86e28ccef0fabca7f75258037613ba770b6c45d6024c63bd38f406 SHA512 87ce094b8cf61dd8c026b983199728b8eab876766580d3a8074aee780c8f4f6fc0777f1060652f843e87ba7ed21905bdbcac411f736ff8ae0943900d71f6d068
-DIST remove_dir_all-0.5.0.crate 8651 BLAKE2B 4ce249473bc67b5ab0c3e04665a67b3c73224565071cb2055ddd461a775fef18ce0e973f281e53f5416bdad506e9b53da184078986950be3a07c534360b4544b SHA512 876681ae98ac9a9cf0447397446ca7afb4e254cf0cfdd7a9b8702eb94cfda5230ac4daeaa067a3f07ae303b920d1a97fa4a0da76b80b4545eab1080bee8c1574
 DIST remove_dir_all-0.5.1.crate 8726 BLAKE2B b654deae9905c03b068f07d17b5fe3715393cf7c495ee017467fe1cdf955bf44781516d0e6aaa1dd738ace3b3bdd4fb38f7edaaab062eeba02baf50a1250ed0f SHA512 9ee9a11717d45aebd28cd2f50719a2183cc623bdb1af099701e4edbdb9c98bc14cf2278ba06aca4658bfeddaffff00d0d1464c82d175fba7d6fb272918dd6928
-DIST rustc-demangle-0.1.7.crate 10681 BLAKE2B 2679a27863f3172712d13d24cc76e13c67b61ae018cdb1ce01296625a2aa4b53c3c44572e9d2bc639ce9f663e221fed8e91f79296bf721a3934b8d4267587b86 SHA512 75dd8581fd0dccfcc8cd2afaf18b9f44a5cea95f6c6573bf9e0b23d79cf5e959b3565bea0e9e26ee5b80f3142a16b549eefa99f5f65aa0ca9c780307091358ec
 DIST rustc-demangle-0.1.9.crate 11463 BLAKE2B 3f03fab938d2778f4a74c101da6adec0eed5033bf06e724a5978de16cabf0341790df5da9c68376ba1d85a048575ff644e14297767950ef15d68c337a5d865b8 SHA512 7047907a0246384eb672bb8fd69a201a205b18460bab857e481606d1b9e25c2629c2898118edd72391da1d1f83b6caf4fb2a78eda19edb6dc7025eadebcc13f1
-DIST rustc-serialize-0.3.24.crate 45926 BLAKE2B 11dee8dac7eb007067ee0eb19d122bf45d912e6cefa95fd5ae3db7a4585a3f37e66b123c8c7bb761cc451b402cb9191dd5c974618331bb9aa9efbe9215115abc SHA512 60b40a0b41678287627cf5898e0ff6ac5668865f1ce5a482190ecd7539b59a955a73c675fedac76e68a5126efb92ff0cf1d1b4f24359a932463434bb76d9e884
 DIST rustc-workspace-hack-1.0.0.crate 774 BLAKE2B 521f71467c95554c8a87ab3e10623ea3516932fe4bc9ca95c835c06b8e0bf526291dede3a5e08df8222f365f4d326c4054a99ef0d37aa6fb5210e2a35d7599be SHA512 48e4774a272e717ea571f4c22606ffca78245723ebc3f15ae5d0b28c5d767df9e772b7e2d6c5c3505bb09bf28097aa83a34b182856bb9d74b3a00b292da45315
 DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
 DIST rustfix-0.4.2.crate 12572 BLAKE2B 7bff55d32a3ba87c497ef3a7865e25ceb7b478a6ab7cbdac01ef6f5ec3c889805687317d5da5dfe040b944e2a42b99d99e0820ab8427464d1b34dfa71d13180b SHA512 a789715e3a9d5336e840fbae8127bff36c70a10d5fc28ad31bb75d6994e5687cd9586a00d200c13f592c6e78d0643b0bdc90774e2d7836a21c253e653f592b43
 DIST ryu-0.2.6.crate 39911 BLAKE2B 3dda01a1da474c106d36f63dbc762f5b7eb37e5b0c545bcc4cc992ebabaf02e0649cbbb27f81971cd4c27cc51453f4981eac869768a0cdb31ece3a68a6f8976d SHA512 fa7596d53f3a16673df016aa75a4cc7a637456db595daeb9e4a0a393c7ab7d18b669bcd2886f65a4421897c0261ac57ff85d9c452772e172a4bb6c11b61a8f1f
-DIST same-file-1.0.2.crate 8870 BLAKE2B 0c723d2f7377e7837babe62ee55807943bb12f013d8608c895701e78f873785b0beb4a2ea84e83e3b44848dcf032b36b573a31be7e4ce9932578fb6ea6a51b7f SHA512 56c923ebd529308c5c1efdeae0314c150ec6fc3d68fe3057ae1a9ec78520f96a78e151985bcea2568775d0d59e4e04e262837d2f3965b175b71569fa703b0951
 DIST same-file-1.0.3.crate 8995 BLAKE2B c2df54cdcbcaa3645bb17f3c78bf8f48711534c108d7439b791976224e126911b497049b720186fb5d97bb2207ca1407ed2c2a4f54014afe79ea77ab0c9a7715 SHA512 eba49f77a94d3f46cf063545f31050dcf67216ab7c723381dd75ec25aea22de217c2919ade87970922750bb53a5a6bc2ebed6fd68ecbfcce97cb987e69582402
-DIST schannel-0.1.11.crate 38229 BLAKE2B 37ebced9870387d38d57f83abceb9ee37103fe7141469022c895c7b0beaceb1ae2102d5d29616d75131275b91d0d4ce9c6d8d8a9bf69d44de2f5a9d4ee664e17 SHA512 b46cc854eced92c1e55d97b45459305295c266a9a9a7f71d94bfc5b95fc1f7fe85f02188baca7880fde5ec675fd3e9fd5bd81a8fd1124b24a563be2077212c55
 DIST schannel-0.1.13.crate 38808 BLAKE2B dc74813c2524b29cf27b3e175447ad25f399c3d8e9a1ad2ebb6236e0c3279505c417f953422fa0dda342c30dd8a61b95aa7634393f391a94be8fe52dd64aa21f SHA512 da7a550522e644b719408099671c0193be9f44dcbbdbde9701b6ef620852a0855b3e8c8a0e9d58aff63f0e4141df286f6794e4e372e22241ad2d0b70e82c17a3
-DIST scoped-tls-0.1.1.crate 9080 BLAKE2B f0008e0f08159cf2b8a7cc3c0fa23ce998ba2930cdcffe0b41d7fc0baa7e5f51949049961536b79c29371adbf4af756a24312e7c716b57918ade598796bc3895 SHA512 6feea7f837713c90189d50b06d025db266a81dacfbc0bcd97e4dfed1900cc9d03e74e6d66864236a0652f04c80d57f6f8cb760ee6942c51a3e351e7cb88ad9d8
 DIST scopeguard-0.3.3.crate 9605 BLAKE2B 2379e45123c1c6ef456001cccbcec3298d6d32a5197ee9ac51e0233522cc24e8dff1900f1a70fe4d8a7889348b0c668e8e5c8956ec0add0898c719ae8e2a0a5d SHA512 57ce8e32dbe342040a63ec65fbef3680d66d439f0f704c5d485670041505905cfc602e7e3580748b4b4a55ce892d17a453e6d2f853cf0de4c6a2082f0fe95719
 DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
 DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
-DIST serde-1.0.37.crate 66879 BLAKE2B 6ba8dd40f90ddd8b282654628b98e775a8f51cd22fc51ddfdb93c01e3ffd62cf92055671009dff42eb3207775e406f3844c72b1defd57cd6b473049900aa1c68 SHA512 53a3d08285e1d40707972b7ba1d60109207a49c73322a866485c6d057ef9a23babd1cbe3a9bd693dfe2b477e599b75982103dbd0cca11f8d6fba31b63d5be989
-DIST serde-1.0.70.crate 72036 BLAKE2B 13fb028569082806b88ec8afe308c34f0b41f66d5368e60daeef96106bdcf39d99ed5c3a7090b35d1f081fe7d7c604a9dbe90d2df0b06044bf10d732e82fbf85 SHA512 d74012944b5a1792a173d5c84f98d7a7d75701d02ffd71965f138d7dab87b63a587e680deab075ddf4f93c2de2fb4197e9b9dd90121a637134bad228c7ba11b2
 DIST serde-1.0.79.crate 72864 BLAKE2B 1bedb6e06e04cf97c51d845dc2e657d9a23e2e0c1680d1d1cfd8dab2d72b264da01ec15ed52316023bd3d40732f7c2afcc34ee1ba975376e70035a981184e3ae SHA512 05c876ed220bcf22ce92e205b912e7cd0a42c22f1fca9057bd58f8103bbe671f5930efbcf0bd52bfd8072cfe05834eb464f5555de334595705fdcd2c9b565ff6
-DIST serde_derive-1.0.37.crate 29589 BLAKE2B 9575eed9c305247c4291413d3e504dcc2562ab228abc181358b8a8fce2b565ac6131dd6767499c73b83b9c0e04c07aecbcff5d1c13db21faf84c583476ff0806 SHA512 bb9ed046b4e626a5f0d4e76ecbb74be28f8ffa9d18d2533db493adcca33291416d4eb00161231817e67b93aca91548dd5dff25f4730dd59de8eeac17d394f23a
-DIST serde_derive-1.0.70.crate 46016 BLAKE2B 76158531d7fd4fafffc74aec8b1f5570d04835cbab2dcd3abc743ff6153634703b46c3a5c6a4e9f9d819f665cb84c26e270e4b970ef8fcf844510a26ba34518f SHA512 5856ffafa5b505fa93a59ac5c9e5c72240c0baa56f69c8e0b83f3685bcb2c1e4ac921fee7a978a340cfa01ed7e114b2e51c4ba09980bd5b882ff98daa58a3fa8
 DIST serde_derive-1.0.79.crate 46506 BLAKE2B b6ed9be297b741d252c98d1bac017f2d48e14ffee18dfc6236775afa4922bdc9c988e7650062ec4106577ca96eb09990198c275bb2d422aa932efd3908821b5d SHA512 5c837aecaf05b6048033dc209f6ea49415ea4dc8ad1777e0187addfbb793e242cabaf239805354f3cde22a88b62ca1003cc492676574533f6ad4415902c9c15d
-DIST serde_derive_internals-0.23.0.crate 19939 BLAKE2B 6b13dd310cb6af94ee3021fb85f8aa19d40b183f8cb06e23ea14143439e628ce2a321e80b7b31c3957bd02b21a9f901ea4a06578b340eb7683e9bfe06d7a2dbb SHA512 c976ac6110ac6bc98a0b36c27afb7dda3c3a13afbce291eb912e8d0e48ea9faaa4076a60563b937c9c7b48c7ddc459e7b1b4018135b198e9c345f9e245453434
 DIST serde_ignored-0.0.4.crate 9533 BLAKE2B 07d08459a3333fb30a9413a882169b5c5b49f26f58128dc8f0458c3e7e668948f3a84d3e5c4dff78905f51604f4f317d76f96c3a900da85d669c0c9065e6191d SHA512 29911d05145b33ddfdcd5c86d57af331262393cd445eb5c464df07f8853032a156b0b1be7b90b66666748e0383831272cb53252cad7778fdd3ea20f2a04e23b4
-DIST serde_json-1.0.13.crate 63744 BLAKE2B bd694199e1eddacd6db16ba0b5255c651e4154d5be4771a23e990d51a2894731b4d4831a26dd3c838629b40d7100092f715d4d3d0b41abca5118a3e69f115b69 SHA512 cf9f034d8117b1900cd0f3daecef920b3d4ddf061c9cc8cf42005593621c0460da70ae12608d8704e180578488b5f2e7d57791ac3ec06a2842e47a2e5b7a9eed
-DIST serde_json-1.0.24.crate 65102 BLAKE2B 3b53ec7c95f2be0e5789126a157c0b09854530e8c8da6610405d8a2b7ca58c35b4d9cfd7f3a46cfc376cc110e31e029235b354078f06f1862223491d60812def SHA512 8abf4c13c420f628a80ad47f28cb82185e47ecee5edb93ed7179f0e3787b00663fea7560d231db8e593e6a8f9841890cefde35fbc019faef03fa7b2ff0d8b4c6
 DIST serde_json-1.0.28.crate 65301 BLAKE2B 4d859a59c3ecd1b4055688558da6a7e4e32636c1e3c84880854c1bd2a8617869389824aa0fbea9cd3ef6cfd0b1d444cd4e5b83897453f9c566bab07c71c96475 SHA512 eb2bc6ab130409df9540c58f4a45a94536507746751a2876f0e8a15baf956115b1bf9d61e394641a8684dc4ddee3fb768531bb7ddeedf1857dda44bb34cf7d84
 DIST shell-escape-0.1.4.crate 6764 BLAKE2B cbfaabec7c6b81b802ced02a33e463c39b2f27f004e0e97087adf5712f1ccf4f4405ea9d010afb49153292741aa1d51d985caea5a3c48a601dc4f25b66012135 SHA512 19cd5e79b2b610dbb26098182c1ed3a8a2cb93a88fc623c0a9e3ff719998d6bb1de632f79519905441a4e38275178dd5aebca8b9994efc24e19bac4ebe5d6329
 DIST smallvec-0.6.5.crate 20238 BLAKE2B 2c75f111c37e8327e18b806cb038713f8e3a7358a40d35289a55dbdcb30961c8ea4bf4e243ddd939b6f9f4a4515f11eeb25ad697ffb52f3b7fc88e6ffdf65bef SHA512 8fed4990c761151bfb2d66392505bdb6a5591aee8b90aaf9032079d0a68c2b3e36c4136d307b6eebc714cf0cabc0155080a0f2cc5f59fa099363c5144e7eed31
-DIST socket2-0.3.4.crate 27946 BLAKE2B 13f9ea9aa296dbdd70303f8525b2f8ad90e647456aaf0529bd54e061f4cb248eb9c85d0b9cf6a4c8e3e3787de0273ea337f88ca9f32018d01afb34130295a075 SHA512 460e80bea03bd34b8673146b577d7ddc90a0e00bd4313389a560ab4f7d109bdda68cbebb63232f20b4bd1f772da0070351fb78a1d7cca250273a25005e50016a
-DIST socket2-0.3.7.crate 30361 BLAKE2B 6577c645f23f385948f2eea396a0afdaa6b21ea9e1f69c9aab58c8077e4ce2ee83cbf0eb94ee1ec220aa87a407ace7e0297c38e0a85ff90ad1ad067e1991e6af SHA512 8f1244ff7b8a100026736eb1a873b3de219e9cb9beadc92a889e083579c4eb93145f987cc91a32440f2216402b8a3591de6afd6b0285a4b75dff7711fb3659a3
 DIST socket2-0.3.8.crate 30379 BLAKE2B ab805dbd3bf53e6ee59e117129b064e31a2bd92f3baf472af1975dd67fc97149fafc480fba4f29c0b7e2fe8d8f101c09d2cc5bc7c5d635418277ff7c3a883a42 SHA512 b543633e3acf6e8fe661f0162375619841346d5f1e51eb622e045712153e2d331bf32c90bd9a8c0cd7e84034f5d2827433788b54b3342f3eaacb537013f86a87
 DIST stable_deref_trait-1.1.1.crate 8007 BLAKE2B 35bb1e1b24f36a0958aa3fd3972d0f30b3849f8bcd41f0221e2a893b1d17b0029369e21e8b735b7c29884a67ba6c9b2ff1558f544b500ed7c119d8bcdabe5602 SHA512 ca224226d612e1c4eb178271cee0d18b44fc036959e528d720e33f65c3ecd7a40c20d32f294c029d0d7b74dc6ce57d19aadfe3cf02c5f894e94ddb3bb06898e4
-DIST strsim-0.6.0.crate 8500 BLAKE2B fb5d756691a359d086886bf579445a262d2691285c120670e1b9da828922e43630339d59e4dbc98fe1fd6c92785264bef645be4ca80681059d8ee9f6d7be582b SHA512 43cbcf2cab7f91515f52f20719e8013cff23807ca79a9a69f1997ec1ba2eacf713d64c88e33f4c9ba852fb3dda4b87e943587ae4b6ff5bfbbb81deb6dbf76a97
 DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983
-DIST syn-0.11.11.crate 63309 BLAKE2B ee33d3f02af356faafd0c03539d1c86ade1f46db8bc30054f76536c1cf537b8fa0d990c78f86b1e5187392b31c5d7364ad5767ae96de5844e252c9c7c41ec962 SHA512 285bdc1f9b53fe791bd35b10a06fc106231c4eca908244f7ba7366a865452ec2dc8bbff275a52725d29c48d2065790ff6eb37c6eb9c1968aeb0af38c028d173e
-DIST syn-0.13.1.crate 133086 BLAKE2B 6c23e6c0474c316c8ca420a5463401ab8fa5e8f4e774a5f3041cb2cabfa4ce3894bc36bc077d3dceeec438e3f19725fce71f1c860b74583bb3fd8dcfa05078d3 SHA512 0c08ad8438e2dd2a067ad857128c19719339dd697e5860c6280247229211c5abf56a82ac10a87b1d6fdd3f3c6026a4477cdad1cc63d22db6f407b058ffb5b25d
-DIST syn-0.14.6.crate 135522 BLAKE2B a061efa87391701acdf4f3f8a35488151d45144fc3b6d28b5a848adc1e3f73c34f8411c602604fb83bbba756429bfa5b06898e510613d8c9b6dc6f93528aab75 SHA512 c79e82dc2ef75385f7b27fc494e31d77a1761f2d30353c9408683c185e4f64d71e08015cf70754a22ded0f6d92561c941bb755e98a289591602eae8d5d49b753
 DIST syn-0.14.9.crate 135921 BLAKE2B dcd62de853764e3b481a8613efa6cce15de43575e19119d9b0d504c1294f6937ba776a69f84ea7548793c5a8472ebdfaa8e1f76fa3c40e7b9f558c93d5c05cb4 SHA512 909f2f77e8d90519b005909d5e198c5ba4279a3d430c58cb57b7408a21dbe60fcfce3207e8814149a6fb9482e10e9901706be4b8a617daa0360bcf476800fe2e
 DIST syn-0.15.4.crate 142799 BLAKE2B 46282c3a90fa0fef60f52cca22e7214ea5b861c64b1e6a6e48a2581ec61968e00536fe9db91bc35d7376961a23c5b45fc88abcb075d264093011c99e4fff3218 SHA512 09a691675f69d4b75222c463cf2cab25851f8052e95eb655f22d6991fe7dfc171af50bb94d346688244400ace7c83e78e44914d409de16673d34e1060d39f27d
-DIST synom-0.11.3.crate 17120 BLAKE2B 30c6bdaff48eb2f3c28a348f737ad4b9ebf4b385de75ec2510aa9fef3b426a8a00041d0dd1649d11a9ba39cd4b9363e0e3f7d808cd0b2d588a38edb395be86d5 SHA512 a9c75d667be94c82c7f545e0569bb5858afd1bfca6e045fd52f4ae18ec4fd440e7d374ef45dafc97bda6c749cd4b4e185d8192b833661657323229803ef4a28e
-DIST synstructure-0.6.1.crate 11257 BLAKE2B 28a71b4f0e49a658064dd5b4eee0f1a61ef5502a24de4edb7aaa0f0741529a7640b874d19400757feef527ff78432e29fbe8574732e19a7395d13f2cef23d39d SHA512 e3234d03a99373a7c35a33611e7d5383b282f232a17c592d630dc2ef5613ca272d3f8419a87d40cf1d50f3ff982a01086d9b7a0202c5a819463d157f684d41b9
 DIST synstructure-0.9.0.crate 17651 BLAKE2B 8401b93fcf2db68f69fb1b61a246bc989029aa960dc7ce5d41a22467d275233c26fa75da669a25c0bce65c77df2f53bac87bf114df1bae55415b42742ff0998d SHA512 ad688b367317230b876d0a3fff6539a04d976d3d7025fb6161a0070acd38cc4ac1507a85313c4e1e804c778b3f9973957bb8a80ad2828096a31b5b53a899c605
-DIST tar-0.4.14.crate 41988 BLAKE2B dbbc3f1517c817827f7cebe84918cd3aba9a3aee65a503b9da7647b187f1b4f0a173649c97bbc7ff3dc0e93486881f00a49b9a24c70c9df249d26a9f13cec3a3 SHA512 b46685caadf335ec296a6d7ff5c2bae31a50395a3681a733998dbdf6295a4a55e7b094340b4679f9468f430f5c92734e08b75123de935dc5636b36d06c498b96
 DIST tar-0.4.16.crate 43935 BLAKE2B b6844ea8dc8a974a40cde9931f3417b318e2a2dcea34f36c36dd3ed18623fe9fa185ed0ffe63ee72533ede9b207b4ede210e54733abd2f455dd0be4b3e8c8c58 SHA512 db156b336e522b7b6f94a03cba410e47374a56890fd4c70a53a3afb86085c05e3a22a73123e6f16ad0b19263067296850ebff667a1a02062ba5af82155f493ce
-DIST tempdir-0.3.7.crate 11468 BLAKE2B 65850a69a07c5c7e5c25d77bfc9881c994b1fe8466b1712b904d9758b234f8d12db6e1b740d461a48b13667bdeca8178e75c956fd6eaa0c0d5aca5aa1ac7523b SHA512 e5b02f7d260ff594fc2dbbd441eb8adfa36ede937f32c8c812b458167c0e49f5cf493c6ebf83ce8007a0aeb97016169fda7f5d2996fecc72f9409d6f463d9bbe
-DIST tempfile-3.0.3.crate 20806 BLAKE2B 0eaabedcb1f68dddafa72a454f82e6b1de6f8cceb8af3cb52f459e8775e3df1ada5b51120ecd9f52bb6f6da3fc3e698da339bc7e39d12497fa9f7efc418b018e SHA512 2bcc90ba3eed8a830b33de169419e222c16f9e0209734cdcf919422fdb504b29fc75f30dff7243bf19eb81cca12c80c94b80a622be8bac7b847242a58595873a
 DIST tempfile-3.0.4.crate 21125 BLAKE2B 27781b6755ef3ea66e31f42e89931e9d5439dc71456da95c399c00b1e5dd5037b17a7f5901fb8cfb33284b2bfc506b6dc5890704722f4154947ee413777f2564 SHA512 54890e6632f7fe81914b013fb63951eb651f7c833c6857db7dc701ca719108131acf97dfd5af4c821d32902618bd9e256ec4dd39edaa42f57f9f459a246b2770
-DIST termcolor-0.3.6.crate 13548 BLAKE2B 4d7faffc3be9ffe4e6da0ea20e6b244c0d9e488ff1c97851dfce073622e68f041e1c77d3c49c769a5e6525c28dfcdd998b381a5abcaa5c4ea63b0acf0e28bf2d SHA512 cfb8e0172abad994da27b1474ab0de244db782ac9c7fcd877d9f1727eaa2fb95036638edbab6b69c3302d1b880eba14cc7282ae0ec78ada1d31a9ef682d4cc90
-DIST termcolor-1.0.1.crate 14228 BLAKE2B 795c4c9020d3ab31f59e909640e9de5012d2b2c8af122b072b125172086cccb65743bae6a88e248e9fce62c68b497e33ecbc56d51ede7adbf3d9a71f37e21512 SHA512 4498f619e736501cbad0d242cdb7e64592de8109ed8d2dd1fc51ade5493ce21dfa9110e4ca96a603410348d61a8029e8df33d17e29e53cefd94fa662f0cde320
 DIST termcolor-1.0.4.crate 14416 BLAKE2B 373701dd2b8a3d584a44d1429e5fd3a697eb7b9138ca6c76eadbf642976e73a701d565a93d77ead3f5cc542c204b3bdce9cc5101b2778b3e32272db9c419edd7 SHA512 cc2f90f453834666b3dcf96c48695cc1fc48c6aacf71437bab635678f486cf02ba6e1c040ff011be078a17b50f9f6d2c09fec771e362d8d2d07526b0f040df6b
 DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
 DIST textwrap-0.10.0.crate 15986 BLAKE2B bcbd40fe4c8322e459c505e0f175b5b088322c33ba56d8c4b294788950681c2407ba08fae2c15711f8f0d5e1f0afed38f82deaffe1c2b16a4f4ab14723b71bb4 SHA512 cb50cc73f3f5ab704ef9e6d526b751f7e66de213fa534206e5b4e9da829f19aedda9f23f262f865fdb3247c703aeaa87f38099f6c575d1961ec923d62a9b2293
-DIST thread-id-2.0.0.crate 6108 BLAKE2B 616ecca5907d78d8ce4326d69cea3e4af6d7076f701f59865c0c67f3ef2b62b5d9cdcc5fd0f4806ea4d4010afce2fbc288809d590330308818616faa9f6a862e SHA512 9fc73cb13dd70f6f323161667f7a253b48c4e11d074457fa033b3617dcaf7ba9aa95f12801c4c045e7e9c07dd4b63a83f79701b489a9d97aefde07970064d9b0
-DIST thread_local-0.2.7.crate 10954 BLAKE2B 70a8545a0e9ab525c4246409d7b6c35e8675dffc58799b74f6286ee81f6b3a13a2d2d6a2fa38ed13cb83b5d6aad7e54d9896f004a8e623788d928d6cac975001 SHA512 adc9be75120fd9e27429d0116cc6774a519ed9a2348db122ea90864947e4c1e1c98aeef740e7f8d28861b1db0f4a9340e58e13c1b3ece1fb3320058ea7a47b35
-DIST thread_local-0.3.5.crate 11794 BLAKE2B 775c55a2165b942eec4cfaa78653e3ff06a6b951635e95dd176f8bde9c58f789a4e3698cc7fa5eb7a9d173fb6c1eb8da682c65a36aa29beded1facae01817336 SHA512 c17bb6bb58e8ef5f27cd6b0a4290752ec00c9856753c9800664e1debc347a26930970b073ba87d6f95936b1be540f87559a8410151b18d01ecc3fe77c45d6cb6
 DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
 DIST toml-0.4.6.crate 40203 BLAKE2B 7b26566bd7a94cfb7907867d84cf097ad44158fe59086af82e059b0eb3dea3934831d61db11bd3cd6b2fb8a909e02b6f369d93eeb09dfcc1cba4859a793c5907 SHA512 659a243957649c987a509ad3b410d37ff7b16fb8e0ca5a1de183ea017e5dd63b88dd2f9770f386b739486bea28250c9853020d29b194994a7c22c5b78490ae95
 DIST ucd-util-0.1.1.crate 24221 BLAKE2B b03c4b21f30b1d7497814e22471f0ec94f52bf9815a8d8c454ab998040593e179e869e6e3d2fde61f993fc8d15ad6cd689f878bac9f0e1ea9a658d2dda242bf3 SHA512 3101bb088f9a804f311c23cfbec1b59ed6daebcc985af3c4a25cee5c1a0c0b8fe15a3b95516361cfc75bf0322895f2acc4835ee94122c782abfc8b0a1e6f8738
 DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
-DIST unicode-normalization-0.1.5.crate 290328 BLAKE2B 47611127735629ab5ca8eca6a32754b3d14f0da384310b9915fff3f988c28590ce83b757258c7d09a1640e65b2b4307a1d5af96f39ee4f6a70a7aadfee955905 SHA512 e3a8d69080d7c85c140406fb7514c70c6af3c3c847d2a4d029d6494035d2a77f093b9d96e26bf59ad973187ccc8dfef1a4fadcc2eb2977b16ecad9f64bfca941
 DIST unicode-normalization-0.1.7.crate 330545 BLAKE2B abffe09db26d75c7ff8d09a485c0966e3a6ff1192b5edbbf4fd1e6915bbc9214242d6ae9d99dccf304c0d75b61006b4edbcd680d7823cdd47b8ed5a7075ef685 SHA512 4b4d3737244b1425ef8000318316decf8e167d3c92524e92bdd3c34798cf6fd1388ba7651da67d565f07d4640e9881145334fbcdfb8f20c33873d6e40ef3630e
 DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
-DIST unicode-xid-0.0.4.crate 16034 BLAKE2B 7ce4752eab109f457a1f8cdd3a9bebfe637652d7e2c0625b6c6f76dcd2d5f3e8b66c89dc4ca158282044dc1a2b030adb1b28e3a44b5a462c7e206cd25d925e66 SHA512 7a3a60936a18d54001dc477f6da1c9784bec53263f13e5c21ba00228ae4ff09f7bb8445cfb39febde957b8500bd1a4a998cc5cfd18046aacbc68e9993510e091
 DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
 DIST unreachable-1.0.0.crate 6355 BLAKE2B c41706721e8124c695259c12741ee95f98d3599871bb7fae2f8cb0d63a04f0cff11e01ab0376867de4de8707fd50fbd02f8b6d9c19bedda84bb5938876c5d803 SHA512 054e0a471d1068b7703853d838c7c381ac6865ac1f8abae08747581e3754416ccec5b80a5b04fedbcd01e68bfeba286b849e3b8ea67bbe62444f2974655e4948
-DIST url-1.7.0.crate 67909 BLAKE2B 342d0a01774102625e7411c067e1949d0d5fdcd11e2381aaeaa416c9123f977e5b8c1b988e94007a4abf654fe58c9723f3b1bf8644515473e79976da4c0327c1 SHA512 080c4b3a7e576fd4cd269605a5bd51c3e04fe9157200f7f411fc10d6f5a86b49c0e5c1dbb0bd522fe4be652836785ab716a80fd73474476040a0a7055772d90f
 DIST url-1.7.1.crate 68266 BLAKE2B 306f49703d68cd3f4e0e0ccf7fe3f4e79b176b2dc211ae00ea31e1078254fb129ec6d0873d5976751321c5b8d18eaf5a3cab9e34950491b80746143d6edd4018 SHA512 912632e35c7ec076f29c02b93010d72f56989e2a8155d6b341c95cb79d65ffdeb32d31fa53ef59bf3d39683e1c51f4be1156c1d0c88f6b86a1bf42cd0ae00c71
-DIST userenv-sys-0.2.0.crate 1749 BLAKE2B cbba1af566a05a27ba571b25be6e5bc47b98cc1710d89083023586704e8111158f3433214d7bc6a0d72af40f589679791dca9a99f73d17cd29cbe75281d4d476 SHA512 97065d57b63045876685797b6cfe600d65a7d3a3b66a356ca86df735f19de373eec24d4eb679c013ec8bbc22954e8c258863ddca608bedd830fcb55df01438d2
-DIST utf8-ranges-0.1.3.crate 8422 BLAKE2B c044c53be4ae0ecba9117cfea6a2d8f26c326d4285ae4e3e5920a48c0a7817769dcef72974fdcb06d1428c2cf5a645fcb15268cf6a82de2bc2cbb858a888a338 SHA512 84bd9b67c423923b856452e113f0d786ac438bc7f9b4d4d9f31f6f91f141a8ac4c93f45f722ac5a8a4bac8eac0e355fe7db1eebc62391709326e9817eda8c374
-DIST utf8-ranges-1.0.0.crate 8599 BLAKE2B eb356d94a937f5f7cd6ed17ba85c03fc1ced30ab9215aad1cda3e600dc6efd8bedef744a2dadc9664dc2cac0ef815f451e88db5b75f70eb1f50670dceeb7e244 SHA512 da498433597582970860db1c66ff1cc2ed8b0e2bf816e6aabdb40424ec03c3f28e6ca5e7592e464442004077735dca4144acd13c8f6a2e799d67504699422643
 DIST utf8-ranges-1.0.1.crate 9247 BLAKE2B e1a4a867c32b54b239338ba4c9a209cd5265320349a0a691f70793f1e4f1c9eddfd477cf2f11e4d4cd72e8f78e09fa32562eb0c57a3c7126a37675008b5ce7d8 SHA512 c17ca6aa679f1f974c9673fac6116c5bb48ff59ca65a968520d5e89c52a7d4409d578df4b28dd3feb4aee208d796a47641c4f1de71810de36905c6cd3439ff97
-DIST vcpkg-0.2.2.crate 5870 BLAKE2B 32331747341e7e2bdbb896a6f4997a3f8ce5f261a9f2eed4309ed2639ab55660f9b81496e1f42d6c2ad9d3ffeba6275ed4c7d1d6a29fd148abd1e8784abd29cd SHA512 e56ca76a699a6a857d77e9710c1b0b0ab7a64b6f7128a9221b9a3fafb7365b3a008c7eb2a2323de449ffd5287d4b5664b9e6d0e1204e9b5a722ee848bdcdcb18
-DIST vcpkg-0.2.4.crate 9571 BLAKE2B 1ebd2029c481961f45ea7cc9c62e83eb43b1f8b1c2a1b01019d54773a1143c1f87915f222c515e973ef39cb4c9e82009e2ef6d88ff1acf69faf76ea98bf4d925 SHA512 cf5ecb0fb60f655d36de3e9363f8b7be4b98cf1a99264977364a03bcdb488e2c1fee8d7c9ecbf4b32d3d1acc0952b68578cb1749bc5eeefadf8623c854dacad7
 DIST vcpkg-0.2.6.crate 9866 BLAKE2B c9c6e1a52e54d6d4103e0b833d77cdd4b2463123a5a12d7c15922bf782c7d56f0055ed5dc9d2bd236a14fb0ed6612c7b691d8a31a98e34b48f84228e6c10a567 SHA512 55678e3cbb7b1bf80e2589df3fc580bb595576a5f24e515819906082ed081e47a546d6825bb92fae56ed0157407244e1b77af1677f0380f2fdd15cc54853675e
 DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
 DIST version_check-0.1.4.crate 7946 BLAKE2B 1122354fd571c8879aa29d80aa2011ccbb0fc64545af4eb15a62c84ac81a4aeffe223bf776f48824a52c159f31acaf3501ffc2613a1041a1a1179446d830af0e SHA512 766fd53ddcdb7c60f7a62959c767cc10e498f92ad0eaed7a0ade90e13ee4293121153d5310fb987b9dd9ad32c3f6889339be29444a2bfaa73bb3b6a719f77e46
 DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
-DIST walkdir-2.1.4.crate 22695 BLAKE2B 87d989088a5f4a28c6e7a96c534092ed9574525e711a3d5f7e1abb9a7aa3d347da155f5f0d98cfe6653803b1eabae78dad01594beacd7e5281d6187d7c2db5e4 SHA512 db8a52b2708fc344833a0cf67ef96eea77dd0471337d49c806e7418e18b6c09dafd0034bc3c2ac62dcc360f4292c3634f5a20da3f10a071bb734ec8a121a4387
 DIST walkdir-2.2.5.crate 23985 BLAKE2B 9113b88c4742548040adaa9aae651599f1f3cfc41acb9d50cfbb5b32b379273f14786867d9dca0bf1be5c482379c3a60df6efe3e5521a2df327d64e34e144706 SHA512 2645ce9a0e665d0badf039df14da565e6f904e1b5443b4c60e97b05194e2c2798d8084a45bbd7edda56d58f2b37bbd8124656125338784f379e06fe39d38128b
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
-DIST winapi-0.3.4.crate 905247 BLAKE2B a6dacb223c0f7743af4c16d4256eea6fdab49ef7f48b9d80bd3da8bc25d6c53e12e98d45e50eff17d08c20099fb92ebcf5ed50928ea2e0873df20461f30b9a5a SHA512 4636ceea813181de46c0bb2f837982936a69376e2b3a58d541a982a494ab4e5b52f3baf820f714a81a2e742def2bf07a2d8313e31b45e51dc7e4d350a5b24579
 DIST winapi-0.3.5.crate 997942 BLAKE2B 7482b6c313129b1a574d499393a32b9bf4b857dcb6d380baacf3455fa43ec2d18061fad25b83c2022ffa36e30132358f3abf3bfdc74dd3fba6a5b54cf2eb5d10 SHA512 6d79a5cce1a234b5645fd1798d580602f89a202adb0672a213bd2fe54aec94c75b489d3c47320c6d5f53d415766a7cf628874f0713a347d9e3017e904449bf2f
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.1.crate 7635 BLAKE2B 2a8047d0da762379f8e66578bf95309a7968d52b636a7bb57d98ce827edffcf85b20cf0441487f4fcd91dccc6db9d005a4c3d78140f0d85dcc99534f3b7aacd4 SHA512 003244d94a887d870b8eab7569f6aee432350eb9f13b5b90a0836eb105b05ac83b7835efe90d9915437f295730653b2dafe6251ab9c46011f1d8492fd4ab8a06
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-DIST wincolor-0.1.6.crate 4799 BLAKE2B 37e72b9603d912b65dd59fe74f1158dd87783ef10511527e50795efc28711348a4c34ee27a2cb4ab523389f443c66ede77c471dd8c2e1bfadb6e8f22726e634e SHA512 d8d9e3a16918844d82cf1cddd7ffdd35cbeb8367b661108cc392d5ce636c270a27a307a4d0307553103356db2958114f269b5a007e4271dd1e6039d7c737e374
-DIST wincolor-1.0.0.crate 4777 BLAKE2B 843d2b3f9d56b332504de707879a490169a790ccb515311d32114c43122f0b13dc8c360f9610361f810b2e23424da35b2918fd30480b7daeeb2a9b2689b5ecbb SHA512 c5a6c6c01fd4cadbd0967d95f69e28b5f6aeac38a7e5297f843be4ebdbed2253db3d5d38f58a91eb2cc7055bad5884a199350a52ae17b06ef11232167f610b04
 DIST wincolor-1.0.1.crate 4737 BLAKE2B b1519327a69d71845bc4d7ebf34205d63883aacbeb9284260e5cc89178193aac15525641546582e32c00128ca4a7c1967ba8f076fbfa98bf9d79a5fe2801555e SHA512 f9914b8b416f3810f5199e85b8088c669bff3cbc0f5b86fdb5b600bbd0554465a559bae3ac918fb7197780663e94bf645ede8f35b60ab0e6a6cf2305b1eb99e1
-EBUILD cargo-0.26.0.ebuild 4720 BLAKE2B 98cb19c6199afc28f49fbb7e24a068099aa24d9e87690e4b28b7f81be7f553a1cb06bc8e2fb85e4fa16dc16c34e23111990454dd08368724639fb590c8685cf2 SHA512 2e75c3fa7dfcbf958043f2b53e8f0b27bd5fb37ee07a2aad2ce03a5c428bedf9d0267c2679029927a00e5929e47b5258a3eb56d785b3d965973d263ba9bdbc77
-EBUILD cargo-0.29.0.ebuild 4514 BLAKE2B dc581b01b8422ebe4047f7bd063a517248d67691e8c7e71ff75b7595fa83fc8845aaa766fc07b265b9d73c9d4b76ab2606b5f236ba7d9f86f5d86df0ce3037de SHA512 1daaa1161437113ac18582ec002ad8d441c7f2c4fae98c91d4061c0b517daa203eb1f5e2447a29c1ed738ec2df1606e3edc3aaa1c5c31c7b76dc3e32957a9847
-EBUILD cargo-0.30.0.ebuild 4803 BLAKE2B cb47e91bb776b19d9e6f21c794fec4684832670e4cf394d049e854cbb6d27ed6bbca811c72e50f55ef01fb7b322c262037da386f3da741cae24d4464a3cebcb2 SHA512 b2333f2673f4365fb262b5d0f20c0594bdd589c170fe53b5173468f32c22981d12f3e499937190a76f16586c479a5254a8c6172faa799e337df9c2afce1c89cd
+EBUILD cargo-0.30.0.ebuild 4798 BLAKE2B 905f25c2d14f67860520d965892dec8874d6fd55d45d06ef3b47e0304b76fc1e067a743a2c96afe20d9f6ccdbdb602c54d5686854cfff11f060df7faa6f34fc4 SHA512 3ca5c9b9846d80e2d5bcbd4d71d70ea6c28d18b7e1595e130579b949f623b4e7ee4d71b353c68d40a7711b2a4d7c76088ed5a15f3b436a91f792dd6aba67db0a
 MISC metadata.xml 334 BLAKE2B 492ad458d72b54f13c18357d77a28f82fefde1c581c34a19b5da9d6dc1c32ecf47675aa3198ccf8a934d25f494f9c6ba42bba0dd8d32d2c4f62e6411426ba3bf SHA512 7d50f6dfd848ac87a1411295bc5133289a7576d7cf3b82c88fdc3e17ba5371e25c4ccd5f2f404ca31ab81531d21e8d2023236f81608078a1ed32832d005653ab
diff --git a/dev-util/cargo/cargo-0.26.0.ebuild b/dev-util/cargo/cargo-0.26.0.ebuild
deleted file mode 100644
index d735fe64537c..000000000000
--- a/dev-util/cargo/cargo-0.26.0.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CARGO_SNAPSHOT_DATE="2016-09-01"
-CRATES="
-aho-corasick-0.5.3
-aho-corasick-0.6.4
-atty-0.2.8
-backtrace-0.3.5
-backtrace-sys-0.1.16
-bitflags-0.9.1
-bitflags-1.0.1
-bufstream-0.1.3
-cc-1.0.9
-cfg-if-0.1.2
-cmake-0.1.30
-commoncrypto-0.2.0
-commoncrypto-sys-0.2.0
-core-foundation-0.5.1
-core-foundation-sys-0.5.1
-crates-io-0.15.0
-crossbeam-0.3.2
-crypto-hash-0.3.1
-curl-0.4.11
-curl-sys-0.4.1
-docopt-0.8.3
-dtoa-0.4.2
-env_logger-0.5.6
-failure-0.1.1
-failure_derive-0.1.1
-filetime-0.1.15
-flate2-1.0.1
-fnv-1.0.6
-foreign-types-0.3.2
-foreign-types-shared-0.1.1
-fs2-0.4.3
-fuchsia-zircon-0.3.3
-fuchsia-zircon-sys-0.3.3
-git2-0.6.11
-git2-curl-0.7.0
-glob-0.2.11
-globset-0.3.0
-hamcrest-0.1.1
-hex-0.3.1
-home-0.3.2
-humantime-1.1.1
-idna-0.1.4
-ignore-0.4.1
-itoa-0.4.1
-jobserver-0.1.11
-kernel32-sys-0.2.2
-lazy_static-1.0.0
-lazycell-0.6.0
-libc-0.2.40
-libgit2-sys-0.6.19
-libssh2-sys-0.2.6
-libz-sys-1.0.18
-log-0.3.9
-log-0.4.1
-matches-0.1.6
-memchr-0.1.11
-memchr-2.0.1
-miniz-sys-0.1.10
-miow-0.3.1
-num-0.1.42
-num-bigint-0.1.43
-num-complex-0.1.43
-num-integer-0.1.36
-num-iter-0.1.35
-num-rational-0.1.42
-num-traits-0.2.2
-num_cpus-1.8.0
-openssl-0.10.6
-openssl-probe-0.1.2
-openssl-sys-0.9.28
-percent-encoding-1.0.1
-pkg-config-0.3.9
-proc-macro2-0.3.6
-quick-error-1.2.1
-quote-0.3.15
-quote-0.5.1
-rand-0.4.2
-redox_syscall-0.1.37
-redox_termios-0.1.1
-regex-0.1.80
-regex-0.2.10
-regex-syntax-0.3.9
-regex-syntax-0.5.3
-remove_dir_all-0.5.0
-rustc-demangle-0.1.7
-rustc-serialize-0.3.24
-same-file-1.0.2
-schannel-0.1.11
-scoped-tls-0.1.1
-scopeguard-0.3.3
-semver-0.9.0
-semver-parser-0.7.0
-serde-1.0.37
-serde_derive-1.0.37
-serde_derive_internals-0.23.0
-serde_ignored-0.0.4
-serde_json-1.0.13
-shell-escape-0.1.4
-socket2-0.3.4
-strsim-0.6.0
-syn-0.11.11
-syn-0.13.1
-synom-0.11.3
-synstructure-0.6.1
-tar-0.4.14
-tempdir-0.3.7
-termcolor-0.3.6
-termion-1.5.1
-thread-id-2.0.0
-thread_local-0.2.7
-thread_local-0.3.5
-toml-0.4.6
-ucd-util-0.1.1
-unicode-bidi-0.3.4
-unicode-normalization-0.1.5
-unicode-xid-0.0.4
-unicode-xid-0.1.0
-unreachable-1.0.0
-url-1.7.0
-userenv-sys-0.2.0
-utf8-ranges-0.1.3
-utf8-ranges-1.0.0
-vcpkg-0.2.2
-void-1.0.2
-walkdir-2.1.4
-winapi-0.2.8
-winapi-0.3.4
-winapi-build-0.1.1
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
-wincolor-0.1.6"
-
-inherit cargo bash-completion-r1 versionator
-
-BOOTSTRAP_VERSION="0.$(($(get_version_component_range 2) - 1)).0"
-
-DESCRIPTION="The Rust's package manager"
-HOMEPAGE="http://crates.io"
-SRC_URI="https://github.com/rust-lang/cargo/archive/${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})
-	x86?   (
-		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-i686-unknown-linux-gnu.tar.gz
-	)
-	amd64? (
-		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-x86_64-unknown-linux-gnu.tar.gz
-	)
-	arm? (
-		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-arm-unknown-linux-gnueabi.tar.gz
-		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-arm-unknown-linux-gnueabihf.tar.gz
-		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-armv7-unknown-linux-gnueabihf.tar.gz
-	)
-	arm64? (
-		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-aarch64-unknown-linux-gnu.tar.gz
-	)"
-
-RESTRICT="mirror"
-LICENSE="|| ( MIT Apache-2.0 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-IUSE="doc libressl"
-
-if [[ ${ARCH} = "amd64" ]]; then
-	TRIPLE="x86_64-unknown-linux-gnu"
-elif [[ ${ARCH} = "x86" ]]; then
-	TRIPLE="i686-unknown-linux-gnu"
-elif [[ ${ARCH} = "arm64" ]]; then
-	TRIPLE="aarch64-unknown-linux-gnu"
-elif [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv6* ]]; then
-	TRIPLE="arm-unknown-linux-gnueabi"
-elif [[ ${CHOST} == armv6*h* ]]; then
-	TRIPLE="arm-unknown-linux-gnueabihf"
-elif [[ ${CHOST} == armv7*h* ]]; then
-	TRIPLE="armv7-unknown-linux-gnueabihf"
-fi
-
-COMMON_DEPEND="sys-libs/zlib
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-libs/libssh2
-	net-libs/http-parser:="
-RDEPEND="${COMMON_DEPEND}
-	!dev-util/cargo-bin
-	net-misc/curl[ssl]"
-DEPEND="${COMMON_DEPEND}
-	>=virtual/rust-1.19.0
-	dev-util/cmake
-	sys-apps/coreutils
-	sys-apps/diffutils
-	sys-apps/findutils
-	sys-apps/sed"
-
-PATCHES=()
-
-src_configure() {
-	# Do nothing
-	echo "Configuring cargo..."
-}
-
-src_compile() {
-	export CARGO_HOME="${ECARGO_HOME}"
-	local cargo="${WORKDIR}/cargo-${BOOTSTRAP_VERSION}-${TRIPLE}/cargo/bin/cargo"
-	${cargo} build --release
-
-	# Building HTML documentation
-	use doc && ${cargo} doc
-}
-
-src_install() {
-	dobin target/release/cargo
-
-	# Install HTML documentation
-	use doc && HTML_DOCS=("target/doc")
-	einstalldocs
-
-	newbashcomp src/etc/cargo.bashcomp.sh cargo
-	insinto /usr/share/zsh/site-functions
-	doins src/etc/_cargo
-	doman src/etc/man/*
-}
diff --git a/dev-util/cargo/cargo-0.29.0.ebuild b/dev-util/cargo/cargo-0.29.0.ebuild
deleted file mode 100644
index 15881e6e886e..000000000000
--- a/dev-util/cargo/cargo-0.29.0.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CARGO_SNAPSHOT_DATE="2016-09-01"
-
-CRATES="
-aho-corasick-0.6.6
-ansi_term-0.11.0
-atty-0.2.11
-backtrace-0.3.9
-backtrace-sys-0.1.23
-bitflags-1.0.3
-bufstream-0.1.3
-cargo-0.29.0
-cc-1.0.18
-cfg-if-0.1.4
-clap-2.32.0
-cloudabi-0.0.3
-cmake-0.1.31
-commoncrypto-0.2.0
-commoncrypto-sys-0.2.0
-core-foundation-0.6.1
-core-foundation-sys-0.6.1
-crates-io-0.17.0
-crossbeam-0.3.2
-crypto-hash-0.3.1
-curl-0.4.14
-curl-sys-0.4.8
-dtoa-0.4.3
-env_logger-0.5.11
-failure-0.1.2
-failure_derive-0.1.2
-filetime-0.2.1
-flate2-1.0.2
-fnv-1.0.6
-foreign-types-0.3.2
-foreign-types-shared-0.1.1
-fs2-0.4.3
-fuchsia-zircon-0.3.3
-fuchsia-zircon-sys-0.3.3
-git2-0.7.5
-git2-curl-0.8.1
-glob-0.2.11
-globset-0.4.1
-hex-0.3.2
-home-0.3.3
-humantime-1.1.1
-idna-0.1.5
-ignore-0.4.3
-itoa-0.4.2
-jobserver-0.1.11
-kernel32-sys-0.2.2
-lazy_static-1.0.2
-lazycell-0.6.0
-libc-0.2.42
-libgit2-sys-0.7.7
-libssh2-sys-0.2.8
-libz-sys-1.0.18
-log-0.4.3
-matches-0.1.7
-memchr-2.0.1
-miniz-sys-0.1.10
-miow-0.3.1
-num-traits-0.2.5
-num_cpus-1.8.0
-openssl-0.10.10
-openssl-probe-0.1.2
-openssl-sys-0.9.33
-percent-encoding-1.0.1
-pkg-config-0.3.12
-proc-macro2-0.4.9
-quick-error-1.2.2
-quote-0.6.4
-rand-0.4.2
-rand-0.5.4
-rand_core-0.2.1
-redox_syscall-0.1.40
-redox_termios-0.1.1
-regex-1.0.2
-regex-syntax-0.6.2
-remove_dir_all-0.5.1
-rustc-demangle-0.1.9
-same-file-1.0.2
-schannel-0.1.13
-scopeguard-0.3.3
-semver-0.9.0
-semver-parser-0.7.0
-serde-1.0.70
-serde_derive-1.0.70
-serde_ignored-0.0.4
-serde_json-1.0.24
-shell-escape-0.1.4
-socket2-0.3.7
-strsim-0.7.0
-syn-0.14.6
-synstructure-0.9.0
-tar-0.4.16
-tempfile-3.0.3
-termcolor-0.3.6
-termcolor-1.0.1
-termion-1.5.1
-textwrap-0.10.0
-thread_local-0.3.5
-toml-0.4.6
-ucd-util-0.1.1
-unicode-bidi-0.3.4
-unicode-normalization-0.1.7
-unicode-width-0.1.5
-unicode-xid-0.1.0
-unreachable-1.0.0
-url-1.7.1
-utf8-ranges-1.0.0
-vcpkg-0.2.4
-vec_map-0.8.1
-void-1.0.2
-walkdir-2.1.4
-winapi-0.2.8
-winapi-0.3.5
-winapi-build-0.1.1
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
-wincolor-0.1.6
-wincolor-1.0.0
-"
-
-inherit cargo bash-completion-r1 multiprocessing versionator
-
-BOOTSTRAP_VERSION="0.$(($(get_version_component_range 2) - 1)).0"
-
-DESCRIPTION="The Rust's package manager"
-HOMEPAGE="http://crates.io"
-SRC_URI="https://github.com/rust-lang/cargo/archive/${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})
-	x86?   (
-		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-i686-unknown-linux-gnu.tar.xz
-	)
-	amd64? (
-		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-x86_64-unknown-linux-gnu.tar.xz
-	)
-	arm? (
-		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-arm-unknown-linux-gnueabi.tar.xz
-		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-arm-unknown-linux-gnueabihf.tar.xz
-		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-armv7-unknown-linux-gnueabihf.tar.xz
-	)
-	arm64? (
-		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-aarch64-unknown-linux-gnu.tar.xz
-	)"
-
-RESTRICT="mirror"
-LICENSE="|| ( MIT Apache-2.0 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-IUSE="doc libressl"
-
-if [[ ${ARCH} = "amd64" ]]; then
-	TRIPLE="x86_64-unknown-linux-gnu"
-elif [[ ${ARCH} = "x86" ]]; then
-	TRIPLE="i686-unknown-linux-gnu"
-elif [[ ${ARCH} = "arm64" ]]; then
-	TRIPLE="aarch64-unknown-linux-gnu"
-elif [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv6* ]]; then
-	TRIPLE="arm-unknown-linux-gnueabi"
-elif [[ ${CHOST} == armv6*h* ]]; then
-	TRIPLE="arm-unknown-linux-gnueabihf"
-elif [[ ${CHOST} == armv7*h* ]]; then
-	TRIPLE="armv7-unknown-linux-gnueabihf"
-fi
-
-COMMON_DEPEND="sys-libs/zlib
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-libs/libssh2
-	net-libs/http-parser:="
-RDEPEND="${COMMON_DEPEND}
-	!dev-util/cargo-bin
-	net-misc/curl[ssl]"
-DEPEND="${COMMON_DEPEND}
-	>=virtual/rust-1.27.0
-	dev-util/cmake
-	sys-apps/coreutils
-	sys-apps/diffutils
-	sys-apps/findutils
-	sys-apps/sed"
-
-PATCHES=()
-
-src_configure() {
-	# Do nothing
-	echo "Configuring cargo..."
-}
-
-src_compile() {
-	export CARGO_HOME="${ECARGO_HOME}"
-	local cargo="${WORKDIR}/cargo-${BOOTSTRAP_VERSION}-${TRIPLE}/cargo/bin/cargo"
-	${cargo} build -j$(makeopts_jobs) --release || die
-
-	# Building HTML documentation
-	use doc && ${cargo} doc
-}
-
-src_install() {
-	dobin target/release/cargo
-
-	# Install HTML documentation
-	use doc && HTML_DOCS=("target/doc")
-	einstalldocs
-
-	newbashcomp src/etc/cargo.bashcomp.sh cargo
-	insinto /usr/share/zsh/site-functions
-	doins src/etc/_cargo
-	doman src/etc/man/*
-}
diff --git a/dev-util/cargo/cargo-0.30.0.ebuild b/dev-util/cargo/cargo-0.30.0.ebuild
index 0e553b651794..2ffebd002c90 100644
--- a/dev-util/cargo/cargo-0.30.0.ebuild
+++ b/dev-util/cargo/cargo-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
@@ -165,7 +165,7 @@ SRC_URI="https://github.com/rust-lang/cargo/archive/${PV}.tar.gz -> ${P}.tar.gz
 RESTRICT="mirror"
 LICENSE="|| ( MIT Apache-2.0 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 IUSE="doc libressl"
 
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 985f6f511472..c2353c0c82ad 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -5,10 +5,12 @@ AUX catalyst-2.0.18-stage1-export-ROOT.patch 1274 BLAKE2B 336c159e54f0a629c73b61
 DIST catalyst-2.0.18.tar.bz2 861398 BLAKE2B 70986d312410fb7abb5c8d7eacefa0f0150a3642e92e4f7b7e9944cf3653e7e2ba987ffb34a614b261a22ce3bb964488181c019f92bbc9c73567f89be04c0989 SHA512 5a1408ffe06ce5c06a6bca8f0e3ecd91c17cdc36e2dfa37881d843432bdfe987fd2cfd988cd5719bdf378c18c2e79ee59e281c3b4dba4ae9edfc2dd654b8ee4a
 DIST catalyst-3.0.1.tar.bz2 877731 BLAKE2B 0c0b67b4be26737fa6d81011a8a63cfd7f2f41e49a81ecd45f3c901ef70d04e0a72295b12609df036dd9be09241c33dda8fa7a204ad074683b18685d027efe2a SHA512 be7c4d6fcf1f41087995a1a3621fb0250dce6d0a96101255c70832d5cf727a94e924d86092b33464fc5e284173704d33d5aa0d0d49dfcce7369befa5fc8de4e8
 DIST catalyst-3.0.2.tar.bz2 878157 BLAKE2B 3711e89be416cd79e98b25fbc432375257749af96a1de6401749131a40c2f1f70975d0c449e1a116623c1aec4d3302670ac058fffd80c4f546fae0609d0c3b7f SHA512 02092b39c70095ab49db28c3289a5d3eb4f73cb3aeda79b3e707cbe2710761cf0060493da7d8a5098e1453320b65654bbe34dd37d5f07623fa90d52579869070
+DIST catalyst-3.0.3.tar.bz2 878309 BLAKE2B 38cba740718a034c104d272aa24fa6964a8dd7fc77d5ccbb481308bb0a38c01d3f0d64e48c1708cab4a723b5a4e0f23727d1c2a0dd0ae4832810e09f76aa335c SHA512 26024dbea3afbc843563a0bf2cd68cc953818caccdf8a42c45ac1df25bd396064a604787807e2db847b4467e9a19df6b2f746eb178d99cbe79889070a2fc4b8a
 EBUILD catalyst-2.0.18-r1.ebuild 3100 BLAKE2B 18f15c937c4f3fe3790ad0dd4f665b4c2a5c100ccc8e9669ded1e45bc24bbe8391fcc3a3b0d2f17b3a9494d2fdef529b387037ec7518796e045d59faf516fa18 SHA512 111606cceb268f3f4b8c51ed8d980ef440215d622a7994c773da7b3fe7ead0ad3fb32bd4eac1835bda1fad5389aa4c995dc597fe7ccc6f8b4d7871997df3541d
 EBUILD catalyst-2.0.18-r4.ebuild 3261 BLAKE2B 07fba7e944a03f7bd99c4504aac4014e515c667a6c4b05791ec059e7fa805cc648a228389045b13d71c39b1910fe8016bdde218cdc7b070a9bd7ac8beb8341a9 SHA512 19be49f4b0508aa4f091e5769463d52280693e5540b8ebda4d9745f24d16ba5a8e938081f1b345dfb25d3d7675f90d721c8fff928d3a4f7f40886e2b4cb14ade
 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-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
new file mode 100644
index 000000000000..aa1bef2ffa10
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == *9999* ]]; then
+	SRC_ECLASS="git-r3"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.bz2
+		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"
+fi
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+
+inherit distutils-r1 ${SRC_ECLASS}
+
+DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ccache doc kernel_linux system-bootloader"
+
+DEPEND="
+	app-text/asciidoc
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	app-arch/lbzip2
+	app-crypt/shash
+	>=dev-python/pydecomp-0.2[${PYTHON_USEDEP}]
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+	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 )
+"
+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 )"
+
+python_prepare_all() {
+	python_setup
+	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
+	VERSION="${PV}" "${PYTHON}" setup.py set_version || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# build the man pages and docs
+	emake
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use doc; then
+		dodoc files/HOWTO.html files/docbook-xsl.css
+	fi
+}
diff --git a/dev-util/cgvg/Manifest b/dev-util/cgvg/Manifest
index d7800524bba7..e4df02518e19 100644
--- a/dev-util/cgvg/Manifest
+++ b/dev-util/cgvg/Manifest
@@ -1,3 +1,5 @@
 DIST cgvg-1.6.2.tar.gz 41790 BLAKE2B 7d3313172862c6b1cd41b3ab824b5c164b498012b8c3a9017804569757aaee0f4e20f7dd14c458eafed6629480e6a0e5c450ed16a06f627735f74c57b1156ad2 SHA512 b2b4ec973515a4282c7b5d4ac1009682ac64f632509717fda88c3fa91ee59c21c950b085b86c551d8f2fd75539a319eec0c8837655ad025042cbf6e101c92173
+DIST cgvg-1.6.3.tar.gz 42130 BLAKE2B e272a42cbc2c5edf08459273eb9f71036ec1afde4d20bb39593028eaf40026b83707b327ef8892a39b1e6f0f399dff3b52f9ff023e9092e26439d1e935da99d5 SHA512 9aeebd0952fc6a99ebeca54bbc54f9ff8858baed3b6c16ae391c033ba6ec6c411e34da88e25ec1208c8f0c536a47424ef09af15bf650485d54921b33c652e0ab
 EBUILD cgvg-1.6.2.ebuild 534 BLAKE2B d47e1a4dcacbcd5ea5680463df91bb5c8e630139808e8b573716cb7a0ac04d796bbf88ed75747c71af761e48849188414f0ee6b99ecb35635b4e11df937434bc SHA512 e84627deecc6d68e07356bf7de43ee0dc5d99f3646b7f66454db575cab235daf4c820d78194ef4de2c0897e1b6111a6cf1292b593ba4a1e18c5dcad5d2cce63d
+EBUILD cgvg-1.6.3.ebuild 436 BLAKE2B 6d2f2862768a47a108e43ef98fde04eba0286d0319c42e3be4af2fb3293131ff5984e6c241a69559afd9e8aa1bdb7b93f1591def1ea06741a649920a20e923a7 SHA512 6b4d488e1245b9558df4d991b555a8fdbc11b30de74b3fe87ed9a0dd55b2537ae5fe649fe49fd10158305e19d53b01d12418154cb3135aac0d1b8daae58891e1
 MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/dev-util/cgvg/cgvg-1.6.3.ebuild b/dev-util/cgvg/cgvg-1.6.3.ebuild
new file mode 100644
index 000000000000..e6feba1299f9
--- /dev/null
+++ b/dev-util/cgvg/cgvg-1.6.3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Minimal command-line source browsing tool similar to cscope"
+HOMEPAGE="http://uzix.org/cgvg.html"
+SRC_URI="http://uzix.org/cgvg/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND="dev-lang/perl"
+DEPEND="${RDEPEND}"
diff --git a/dev-util/clazy/Manifest b/dev-util/clazy/Manifest
index d6d32abdf05e..52bcdbd58315 100644
--- a/dev-util/clazy/Manifest
+++ b/dev-util/clazy/Manifest
@@ -1,3 +1,3 @@
-DIST clazy-1.3.tar.xz 159860 BLAKE2B 3860a7f0e2e518fda210e7a4c0de7ea21d52ed5f0e280e1f12dedea2b639dde994621e55b55766e65b9575c275e8ca55c8f6556d1223aee0d642fff2814810bc SHA512 71b69fd28e507f44c5ddc5be8e79fa1511398691cbd8aae920c77171720c6e3e2f308db478e604285a2686aaca0026ff0472547eff98d77c0d4f83c72727563e
-EBUILD clazy-1.3.ebuild 727 BLAKE2B 512415365340f12308adbfa37d0da415edf97fa15b341b543db49213267994fde338b1d7e681b91276ae8492dc9f87adb2d62922f515cdf480b777dc482171c2 SHA512 4b766b1f101f30297fef7f873066734f436edd6892e9bc9ec13beac5847bfb05044f7f97295cffa46e5feecbb47873b3ce982bfc69eabc6d29d29de089681add
+DIST clazy-1.4.tar.xz 339104 BLAKE2B 7740e85c8377f0757a545750d6d35d9b8b7207795a4b49f291a8c07a76e63e167fbd772f8689a1c83d66065a9a166f5dafa68a61923e46c17d6b6b4d74838106 SHA512 6458213a8db03c57dd5c80ecaa9403ce3fafb977e6f7433da728327af81ca52255b95aaceebfd90a43682c19ee63d4751bf23f6dbf343c59d616048f262c9e26
+EBUILD clazy-1.4.ebuild 871 BLAKE2B 07a71b4988f8084fd5f785b8b2900b404111fe09512b5f6c003549c83cc2bfd2c66fd4ea26588b8e397e76ec944307c2e9ec4a456668ac6219c9536903a6883c SHA512 78d658aa42c04e97a3ddb28d75df858ae2971c305de2aeab38d7d77ce544e41cb4f327fe2bbfcd28f2c578197321b234c75cbde9f7d2283720da2afe27216edb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/clazy/clazy-1.3.ebuild b/dev-util/clazy/clazy-1.3.ebuild
deleted file mode 100644
index fc60842b73c9..000000000000
--- a/dev-util/clazy/clazy-1.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Compiler plugin which allows clang to understand Qt semantics"
-HOMEPAGE="https://github.com/KDE/clazy/blob/master/README.md"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	sys-devel/clang:=
-	>=sys-devel/llvm-3.8:=
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-"
-
-DOCS=( README.md )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -e '/install(FILES README.md COPYING-LGPL2.txt DESTINATION/d' \
-		-i CMakeLists.txt || die
-
-	sed -e 's|${MAN_INSTALL_DIR}|share/man/man1|' \
-		-i docs/man/CMakeLists.txt || die
-}
diff --git a/dev-util/clazy/clazy-1.4.ebuild b/dev-util/clazy/clazy-1.4.ebuild
new file mode 100644
index 000000000000..a0fe3e5bc804
--- /dev/null
+++ b/dev-util/clazy/clazy-1.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Compiler plugin which allows clang to understand Qt semantics"
+HOMEPAGE="https://github.com/KDE/clazy/blob/master/README.md"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	sys-devel/clang:=
+	>=sys-devel/llvm-3.8:=
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( README.md )
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -e '/install(FILES README.md COPYING-LGPL2.txt checks.json DESTINATION/d' \
+		-i CMakeLists.txt || die
+
+	sed -e 's|${MAN_INSTALL_DIR}|share/man/man1|' \
+		-i docs/man/CMakeLists.txt || die
+}
+
+src_install() {
+	cmake-utils_src_install
+	mv "${D}"/usr/share/doc/clazy/* "${D}"/usr/share/doc/${PF} || die
+	rmdir "${D}"/usr/share/doc/clazy || die
+}
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 687ecf301db5..16ad3b51661c 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -17,10 +17,12 @@ DIST cmake-3.10.3.tar.gz 7825559 BLAKE2B 1db8c21abdcfac2612fa914d49f9edcf199240b
 DIST cmake-3.11.4.tar.gz 7955301 BLAKE2B 2bad70e9e8b1a4081daf79fbec46d7389f685920d3158d05eae51fb24a0ecaad722c3e8a2eab1bcc75d599bee7a8202d432176e6ac1d87ed8815c84a7a8bb925 SHA512 c5d03ad66a004292038e49e391c390ebc328fbb089ea699742a9b75f0ada9398c3dc971b868f75d8438bf437ecbeaa62541beb53cae14a699bf244ad101a2290
 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.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.9.6.ebuild 5941 BLAKE2B 6fb4f6d9adae179fae54b1e5745db1b584464c19483ea450b04f3dbf47e8d5ef45800fcc8a33f1dce1c139e0acf302aaa4fb190e097e521cec14540aa8ae9c49 SHA512 cb45d92c42aaf89ac39fd786442c2cd5d8f1316d591323fe7ea23bf6c4a27fe18424d55a02093333abf851cbae7f965c0c2c899118464b51a567738a5d6cfd25
 MISC metadata.xml 430 BLAKE2B af8a9e9fbd898224f970f38c42b07ab2a3f31da674056af30a8059d4378c80d201d9fa98fceffed15a5f2130767a782ea72fce642e9c4f6b5709ecf1533455e6 SHA512 9a71665c1654c038746d4cdd8217382d38493a7064cf4b6a6b12aef632b05e40e530ceb923fc389b182e1b513cbe4c149921d8036565ad8247b948640d5fa015
diff --git a/dev-util/cmake/cmake-3.12.3.ebuild b/dev-util/cmake/cmake-3.12.3.ebuild
new file mode 100644
index 000000000000..1b862b5dff30
--- /dev/null
+++ b/dev-util/cmake/cmake-3.12.3.ebuild
@@ -0,0 +1,223 @@
+# 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 ${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/creduce/Manifest b/dev-util/creduce/Manifest
index 24b797495711..c3554d1e6501 100644
--- a/dev-util/creduce/Manifest
+++ b/dev-util/creduce/Manifest
@@ -1,8 +1,10 @@
 AUX creduce-2.7.0-llvm-5.patch 2491 BLAKE2B c2f7fed04c8da9095ad4c4995119181575c644231db6eed46fcfd7097e3ed5c85e46af52accfa8b78c59a3f8e61715df929e0d60c7693a7542fa83eecc9b05ce SHA512 31808043b9a9727632b76a81041a0ddffd318fb5ae8190b7e4cca70b1117c8c938dd7dda9d9785a841c3d62d51dc876a53dce63ab45695ae77d40f834073c08c
+AUX creduce-llvm-7.patch 4046 BLAKE2B 013685de9ad7f364cfff647a6f6783615dcd2289af8ab602f4119401373b6422385e63e1c5aaeec65dd6e922fae945f44f29f18bfe02b581b0a12f129f83e0b9 SHA512 9a0cd0373fa8e0bd14907e5522b97c3c4cdb89a3350e38316edfa6a75dbc5bbe53756c4b605385b1feda5674bbf17d92b4d2e21c58b4a937bd2c61e76e322b0a
 DIST creduce-2.7.0.tar.gz 768832 BLAKE2B ddc471b658a7feb8591dd4e402ac51d7c97a1705ef5b3787eec0b652bba64fb82cc39db21fa7c87ae0104977514f792b77802b6b35cf7afecb79b4cde16a5b52 SHA512 0ded47fdb4303d84619d63fbedd7bc12141b4857679dda8438683199dbdc98b985f848e797b9dc25a31dda591ee54bcb94580285890b23495fcf151aa3636226
 DIST creduce-48e622ba74bc35c5a81299d3a34b9b14038d6a70.tar.gz 720872 BLAKE2B 031104f5e7ca3d3cfb41087f432ec0cf1b1c125171ffac31b6f3b0a9a4483b5ca8a667331aacae7f5acdaaf99e8b688bb62b332405c1266d2b114a4bdceca9cc SHA512 36cc12015d85acfa99f0d04440184517da1f766df7a804ee02719f1208f67aff4f4db7af4066817b17efdc89a6d2cf7ab62b0c622a611bc9b03a89b8d1b68d01
 EBUILD creduce-2.7.0-r1.ebuild 831 BLAKE2B 90b54fbd845dbe404bbb18cde38882f2fdc7adff440d7da52ee23941f538bc8bc95608af410a0b9a7de333387750095b733cddd57829cf4381cdd17a4b7cbe62 SHA512 5526fc208eb9c6d1c3e30db997a0787a80868723443795230f178a3227d4aa5d964f4e3813a76915ab38ed56ef48573671ed976edead59ac199ab24696e3a513
 EBUILD creduce-2.7.0.ebuild 703 BLAKE2B 9e1bb8170ce619ef3fb23a67c8d5987a202a2608e4a366e6eab765b33f960ddbaa55299a4fb29fc79a2cada80809b66bdf58af7a3869c69e1dfb70fbc62b105f SHA512 dc9bb094eb8d54ec90e74a8031289936c0bd3fc5a5e5520bbedb7d457f73aaa458bf0c094542b94a4d32f508df4163b98651c1ead335a91f032478f498d1e0da
-EBUILD creduce-2.8.0_pre20180411.ebuild 905 BLAKE2B a9d06624abb5e882c827048dc2f78fd4ac545bffb0fa356c6a2000e19850c64fe92efdc0f41f605fade209ad9dc3135b7dc77d84f9c44324df831835735e8892 SHA512 3cde436cf4de037d3ddb2885f10252dea84860d33f95f7f0025b4e04078f5031b1bef9ced855f77610f64dac7cf326b3d31fa73065db12fe76584c7ad23822c4
+EBUILD creduce-2.8.0_pre20180411-r1.ebuild 982 BLAKE2B 004a4f77bd8b55f5db067fbf65a56b44a6eb2b171427f1109d88e4be6b3873a445596da80f909515499024d603c8a122d39d526004ab5fec33fa8e6064163f49 SHA512 9063ca1e50144d322d8828efedeacf816b4a77c9169b99097b8032d30010d0e9ba28949153f21b6227ddacb585eae460d42c7f230f785dde6497d84bbb892163
+EBUILD creduce-2.8.0_pre20180411.ebuild 933 BLAKE2B 6160be85dee851d4cc3322d21dbd3e228f65be6ac0b1e21d2911ed5fd3563a00ade8c30cbd95cee57ae20ec0d5d66f4a808c52ec9352f94cfbcb5f839d7fa465 SHA512 741a824defa8c9b2fe010c0471e69b26fb9fad73686d549596b80e7bc7ed2769627f166f513a326b5ae2694939877114db1c26c5330e9939bf9241aee78465fe
 EBUILD creduce-9999.ebuild 765 BLAKE2B 36967f9afcf36c7b72645f87c58c8edd795a49c69b457be719ba176a6416526592bf33503c7b214d17fa2ca391526c3ede457a7ad8f30d1214b8e964327d1d6d SHA512 26e023880d1143b27d11971f2f95e937f210630c9f2899c239d7f7076ac7741e9cde7e9ba2661c08f2b42e8c71f0dc6e4075f6421e927601ce1276616fe51da8
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/creduce/creduce-2.8.0_pre20180411-r1.ebuild b/dev-util/creduce/creduce-2.8.0_pre20180411-r1.ebuild
new file mode 100644
index 000000000000..fec31d8e8913
--- /dev/null
+++ b/dev-util/creduce/creduce-2.8.0_pre20180411-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+: ${CMAKE_MAKEFILE_GENERATOR=ninja}
+inherit cmake-utils llvm
+
+EGIT_COMMIT="48e622ba74bc35c5a81299d3a34b9b14038d6a70"
+
+DESCRIPTION="C-Reduce - a plugin-based C program reducer"
+HOMEPAGE="https://embed.cs.utah.edu/creduce/"
+SRC_URI="https://github.com/csmith-project/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${PN}-${EGIT_COMMIT}.tar.gz"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+LLVM_MAX_SLOT=7
+
+COMMON_DEPEND="
+	>=dev-lang/perl-5.10.0
+	sys-devel/clang:${LLVM_MAX_SLOT}"
+RDEPEND="${COMMON_DEPEND}
+	dev-perl/Benchmark-Timer
+	dev-perl/Exporter-Lite
+	dev-perl/File-Which
+	dev-perl/Getopt-Tabular
+	dev-perl/Regexp-Common
+	dev-perl/Sys-CPU
+	dev-util/astyle
+	dev-util/indent"
+DEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+PATCHES=(
+	"${FILESDIR}"/creduce-llvm-7.patch
+)
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
diff --git a/dev-util/creduce/creduce-2.8.0_pre20180411.ebuild b/dev-util/creduce/creduce-2.8.0_pre20180411.ebuild
index 10d19d7cec06..e7964cd3685d 100644
--- a/dev-util/creduce/creduce-2.8.0_pre20180411.ebuild
+++ b/dev-util/creduce/creduce-2.8.0_pre20180411.ebuild
@@ -17,9 +17,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+LLVM_MAX_SLOT=6
+
 COMMON_DEPEND="
 	>=dev-lang/perl-5.10.0
-	>=sys-devel/clang-6:="
+	sys-devel/clang:${LLVM_MAX_SLOT}"
 RDEPEND="${COMMON_DEPEND}
 	dev-perl/Benchmark-Timer
 	dev-perl/Exporter-Lite
diff --git a/dev-util/creduce/files/creduce-llvm-7.patch b/dev-util/creduce/files/creduce-llvm-7.patch
new file mode 100644
index 000000000000..a005eebff2e2
--- /dev/null
+++ b/dev-util/creduce/files/creduce-llvm-7.patch
@@ -0,0 +1,90 @@
+From c0d9c3a2ef763eb09f0a70b8ad86250598549487 Mon Sep 17 00:00:00 2001
+From: Yang Chen <chenyang@cs.utah.edu>
+Date: Fri, 28 Sep 2018 00:39:22 -0700
+Subject: [PATCH] building with LLVM 7.0
+
+cope with some API changes for LLVM 7.0
+---
+ clang_delta/ExpressionDetector.cpp     | 20 +++++++++++---------
+ clang_delta/RemoveUnusedEnumMember.cpp |  8 ++++----
+ clang_delta/TransformationManager.cpp  |  2 +-
+ 3 files changed, 16 insertions(+), 14 deletions(-)
+
+diff --git a/clang_delta/ExpressionDetector.cpp b/clang_delta/ExpressionDetector.cpp
+index aa87873..dd77068 100644
+--- a/clang_delta/ExpressionDetector.cpp
++++ b/clang_delta/ExpressionDetector.cpp
+@@ -64,7 +64,8 @@ public:
+                           StringRef FileName, bool IsAngled,
+                           CharSourceRange FilenameRange, const FileEntry *File,
+                           StringRef SearchPath, StringRef RelativePath,
+-                          const Module *Imported) override;
++                          const Module *Imported,
++                          SrcMgr::CharacteristicKind FileType) override;
+ 
+ private:
+   SourceManager &SrcManager;
+@@ -77,14 +78,15 @@ private:
+ };
+ 
+ void IncludesPPCallbacks::InclusionDirective(SourceLocation HashLoc,
+-                                            const Token &/*IncludeTok*/,
+-                                            StringRef FileName,
+-                                            bool /*IsAngled*/,
+-                                            CharSourceRange /*FilenameRange*/,
+-                                            const FileEntry * /*File*/,
+-                                            StringRef /*SearchPath*/,
+-                                            StringRef /*RelativePath*/,
+-                                            const Module * /*Imported*/)
++                                        const Token &/*IncludeTok*/,
++                                        StringRef FileName,
++                                        bool /*IsAngled*/,
++                                        CharSourceRange /*FilenameRange*/,
++                                        const FileEntry * /*File*/,
++                                        StringRef /*SearchPath*/,
++                                        StringRef /*RelativePath*/,
++                                        const Module * /*Imported*/,
++                                        SrcMgr::CharacteristicKind /*FileType*/)
+ {
+   if (!SrcManager.isInMainFile(HashLoc))
+     return;
+diff --git a/clang_delta/RemoveUnusedEnumMember.cpp b/clang_delta/RemoveUnusedEnumMember.cpp
+index 8bf8673..469db3f 100644
+--- a/clang_delta/RemoveUnusedEnumMember.cpp
++++ b/clang_delta/RemoveUnusedEnumMember.cpp
+@@ -99,15 +99,15 @@ void RemoveUnusedEnumMember::removeEnumConstantDecl()
+ {
+   SourceLocation StartLoc = (*TheEnumIterator)->getLocStart();
+   if (StartLoc.isMacroID()) {
+-    std::pair<SourceLocation, SourceLocation> Locs =
++    CharSourceRange CSRange =
+       SrcManager->getExpansionRange(StartLoc);
+-    StartLoc = Locs.first;
++    StartLoc = CSRange.getBegin();
+   }
+   SourceLocation EndLoc = (*TheEnumIterator)->getLocEnd();
+   if (EndLoc.isMacroID()) {
+-    std::pair<SourceLocation, SourceLocation> Locs =
++    CharSourceRange CSRange =
+       SrcManager->getExpansionRange(EndLoc);
+-    EndLoc = Locs.second;
++    EndLoc = CSRange.getEnd();
+   }
+   SourceLocation CommaLoc = Lexer::findLocationAfterToken(
+     EndLoc, tok::comma, *SrcManager, Context->getLangOpts(),
+diff --git a/clang_delta/TransformationManager.cpp b/clang_delta/TransformationManager.cpp
+index 89e9d72..1e56b90 100644
+--- a/clang_delta/TransformationManager.cpp
++++ b/clang_delta/TransformationManager.cpp
+@@ -223,7 +223,7 @@ llvm::raw_ostream *TransformationManager::getOutStream()
+ 
+   std::error_code EC;
+   llvm::raw_fd_ostream *Out = new llvm::raw_fd_ostream(
+-      OutputFileName, EC, llvm::sys::fs::F_RW);
++      OutputFileName, EC, llvm::sys::fs::FA_Read | llvm::sys::fs::FA_Write);
+   assert(!EC && "Cannot open output file!");
+   return Out;
+ }
+-- 
+2.19.0
+
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index 15bf39fe09be..22a88c876d19 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -1,7 +1,7 @@
-DIST debhelper_11.3.5.tar.xz 467732 BLAKE2B b5d035b57057f36bbc1e6e09f7a0acc6fab2141e2d99cfcc963101a6f939b6a46fa2a1aff899f4a4f11b064c79221e3b91dff8a3f541988c39d6f221506abbdc SHA512 7c5b37a6c6683964835609ec9a6ea65e5121af017ecaab79a88a55252eee010aae064b2d89f24a957c431ac345cd43376815c9b703d6e43a2a098aff6836864e
+DIST debhelper_11.4.1.tar.xz 475072 BLAKE2B 8220e2e199b174d811c8bf3dd7d1dc34a9d4a371f2ca249c9c210f4abb18e1de29692cbc094a9bdcf17aa2b8b917ced2736109fa8683d128cf50a95233888a62 SHA512 658456cfed3f8549598110b9dd3b9cfec52cddb28d85911d59ee973fbcb8f40b2f430224f48a0a3767a21bca977fface873125ba63f46290b7b696286d53749e
 DIST debhelper_11.4.tar.xz 473968 BLAKE2B 77ca641dfb0b7e10df921ec967e66700c220b6a85588b3a7f6eaccf22b97337e7766d77c06e62de7ee75501dbf98aaf801d7986f88eed8ae03778259135db9ef SHA512 6a6c6ea7cb394381288db8f872ae40de9456a22bf535ae0bc15097b47c41cda799952ffdbbcf6f56d0c3aaa9520a4f3f531106b1a53b329e53a13f8eb70ab1c9
 DIST debhelper_9.20160814.tar.xz 344328 BLAKE2B 38791ab3dfb74d12e44226b79a377889911a08505cdb45cc0a6e653906edbafcac1038d1d9ff9f5fd9f714ed36681562ce7fb1c9c1109a8528523100128fced6 SHA512 63072ba35ec8c62ee4c4d44833712925264c808a91f1522ef6a73377f2da3d11b285a21ad39158fd44693c801916189261186c8c7b28096719328a81a0a65f62
-EBUILD debhelper-11.3.5.ebuild 1510 BLAKE2B 97488758d8f45e3bf1917e238f3b88d472d07852129874273810e90ea7358bb80510c5f0c746cf7ca6db9b17cbf4b6831487bef6f1d32252c8f3840518e4fa2b SHA512 568cf0359d63e344030a31de04ba4ebb1feb60721c66f6e0346544734055c6ab4a152b575fcd67b61b3b6cc9e0c267ec48ba8e4bd1980fd6530a5643225468d4
+EBUILD debhelper-11.4.1.ebuild 1507 BLAKE2B 1d5a6ece28106c6ada5472576252f20a7524eca1e2e90e08803a1798534ddd3f2a8ef1f1393c0c9b9a3a12d9d49b1469a156a0e417b72382faae5754fcd05297 SHA512 e6c826f165111ce1e36810292b9d13664b74356ffefae36905f3e78928e9391af9e67fccd7b9d2017e97bbeba14df3bcaa26100d507be904b8ca2ec130a12a72
 EBUILD debhelper-11.4.ebuild 1510 BLAKE2B 97488758d8f45e3bf1917e238f3b88d472d07852129874273810e90ea7358bb80510c5f0c746cf7ca6db9b17cbf4b6831487bef6f1d32252c8f3840518e4fa2b SHA512 568cf0359d63e344030a31de04ba4ebb1feb60721c66f6e0346544734055c6ab4a152b575fcd67b61b3b6cc9e0c267ec48ba8e4bd1980fd6530a5643225468d4
 EBUILD debhelper-9.20160814.ebuild 1508 BLAKE2B e690fd6e7e568ef0245db0bcc8fbd47131b0bba0bb6c0d0363c2c52b1ab9fbc39b9ff4523c8f48a7a15a0685730fb6af38c82029b35bf3a82ef5fbd7e74d8b5b SHA512 edf4a1242cd0ece4dd3afea0641299fe89be0398a313111ffaaf11f72ce97194e53bcd5cb223d8b271b0e5612704a8f008c06ffc6001198d5e9d39e9a379d411
 MISC metadata.xml 260 BLAKE2B f88f6dac92c60982c9aa64365826d2bc8b5d1933190d4cdb44323f59c2a431add04feceb4e66470e9dd20ae0fab1ac1b5641c8bed429a2d6205b3c7acd6c7738 SHA512 b7f7421081083b48e0aa1d7cff7a776b18d670a32a2af64341332c39d0f531735f86857555e70327e257d51f6e0c97b3e293075bf59b9048ce0c0ec097c36735
diff --git a/dev-util/debhelper/debhelper-11.3.5.ebuild b/dev-util/debhelper/debhelper-11.3.5.ebuild
deleted file mode 100644
index eb7e5fa626c2..000000000000
--- a/dev-util/debhelper/debhelper-11.3.5.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
-HOMEPAGE="https://tracker.debian.org/pkg/debhelper"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
-IUSE="test"
-DH_LANGS=( de es fr )
-IUSE+=" ${DH_LANGS[@]/#/l10n_}"
-
-NLS_DEPEND=$(
-	printf "l10n_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LANGS[@]}
-)
-
-RDEPEND="
-	>=dev-lang/perl-5.10:=
-	>=app-arch/dpkg-1.17
-	dev-perl/TimeDate
-	virtual/perl-Getopt-Long
-"
-DEPEND="
-	${RDEPEND}
-	${NLS_DEPEND}
-	test? (
-		dev-perl/Test-Pod
-		sys-apps/fakeroot
-	)
-"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	tc-export CC
-
-	local LANGS="" USE_NLS=no lang
-	for lang in ${DH_LANGS[@]}; do
-		if use l10n_${lang}; then
-			LANGS+=" ${lang}"
-			USE_NLS=yes
-		fi
-	done
-
-	emake USE_NLS="${USE_NLS}" LANGS="${LANGS}" build
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-	dodoc doc/* debian/changelog
-	docinto examples
-	dodoc examples/*
-	local lang
-	for manfile in *.1 *.7 ; do
-		for lang in ${DH_LANGS[@]}; do
-			case ${manfile} in
-				*.${lang}.?)
-					use l10n_${lang} \
-						&& cp ${manfile} "${T}"/${manfile/.${lang}/} \
-						&& doman -i18n=${lang} "${T}"/${manfile/.${lang}/}
-					;;
-				*)
-					doman ${manfile}
-					;;
-			esac
-		done
-	done
-}
diff --git a/dev-util/debhelper/debhelper-11.4.1.ebuild b/dev-util/debhelper/debhelper-11.4.1.ebuild
new file mode 100644
index 000000000000..9606374c12a7
--- /dev/null
+++ b/dev-util/debhelper/debhelper-11.4.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
+HOMEPAGE="https://tracker.debian.org/pkg/debhelper"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
+IUSE="test"
+DH_LANGS=( de es fr )
+IUSE+=" ${DH_LANGS[@]/#/l10n_}"
+
+NLS_DEPEND=$(
+	printf "l10n_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LANGS[@]}
+)
+
+RDEPEND="
+	>=dev-lang/perl-5.10:=
+	>=app-arch/dpkg-1.17
+	dev-perl/TimeDate
+	virtual/perl-Getopt-Long
+"
+DEPEND="
+	${RDEPEND}
+	${NLS_DEPEND}
+	test? (
+		dev-perl/Test-Pod
+		sys-apps/fakeroot
+	)
+"
+
+S=${WORKDIR}/${PN}
+
+src_compile() {
+	tc-export CC
+
+	local LANGS="" USE_NLS=no lang
+	for lang in ${DH_LANGS[@]}; do
+		if use l10n_${lang}; then
+			LANGS+=" ${lang}"
+			USE_NLS=yes
+		fi
+	done
+
+	emake USE_NLS="${USE_NLS}" LANGS="${LANGS}" build
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+	dodoc doc/* debian/changelog
+	docinto examples
+	dodoc examples/*
+	local lang
+	for manfile in *.1 *.7 ; do
+		for lang in ${DH_LANGS[@]}; do
+			case ${manfile} in
+				*.${lang}.?)
+					use l10n_${lang} \
+						&& cp ${manfile} "${T}"/${manfile/.${lang}/} \
+						&& doman -i18n=${lang} "${T}"/${manfile/.${lang}/}
+					;;
+				*)
+					doman ${manfile}
+					;;
+			esac
+		done
+	done
+}
diff --git a/dev-util/ltrace/Manifest b/dev-util/ltrace/Manifest
index 5f7b6dd96edc..4758bd88beb4 100644
--- a/dev-util/ltrace/Manifest
+++ b/dev-util/ltrace/Manifest
@@ -1,5 +1,6 @@
 AUX ltrace-0.7.3-alpha-protos.patch 849 BLAKE2B 694ebae21ebb658d87455d01cb82376d2a1f4854961d1bd04c351955259f1ae99cf436a8f885b9e1aaad8e842b021dc5818ad5f37667276589d9651d04a4deeb SHA512 014660bf48b7e5bf43b17fd3f82fb8a01f3855c16dc2fed76f6a9e4f348ec28beca0e7429ee10dc3aba3bd0bba143d21ee5b67ccc7057cb006ef694a6d38aa72
 AUX ltrace-0.7.3-ia64.patch 1538 BLAKE2B 2a407d2e19e74ddf22da1371cf72585cec5c630d00670798c6c8e9b3991d3aac641784bceeda544b49e76ae572c487bc5455de4239aa967e25318625e0307e0f SHA512 c6e7576047aa06eca67a80ecaa008854a2e312b1d38693cc802a6b6be6f671003716c6a0d3268fb3f076f3311fb27c228f55220bcb2432afd0210542020764ad
+AUX ltrace-0.7.3-print-test-pie.patch 774 BLAKE2B e67bedbd0ea2470007390634fe588ee7cd074cff4b90f57fe821f6124d4aee9e2cb8f60b46b7007659d5a29d929cf579c38d858c31b8667ba50f64d579909c81 SHA512 9f407805719f21838fa3d2c48aaa96025fb4785a28b5b4e50b2593093067ed6cb406dbb662e0178e84e9db101b4cfa12867127cd212abf6417130e7cb4c21002
 AUX ltrace-0.7.3-test-protos.patch 2551 BLAKE2B 48998f9db4875b8e2af6727b51fc8666cc4f10cbc55bbc4bf32a2b54f1f1032f7c7f07c5196ffff53e23183010eb68df862b4fceaab56d30a580eeaadeeb6f17 SHA512 4652b3f920ad3669d2e6076775b9a598bd999a0fa5319c490f580d93c63f53bd0e3db61cf7a61c5db3a436789802b8fa9646f84ee76e8f37f4f3afb827b84f34
 DIST ltrace-0.7.2.tar.bz2 483806 BLAKE2B 4d635385c1a2ab24ee52c205fd1dfcdab8addc1121cb0d1adb5c4091d87bfdf3687e930246481fb4ff6de0fd787527b1b9dd66054f18619c4878eed6048da8a4 SHA512 ec86f08d0c18579ff05f8be23ef3c7309c76c647a0d952fbc627e8095b6ce52b2552e152dc0ec9c6098039c2d50d549a1d218f56a13f75f28bc7b03eb39e94e0
 DIST ltrace-0.7.3.tar.bz2 482658 BLAKE2B 30d1dbb178a41043e4bbbac17a23676db202b64327c9bb4393ae7ace9f5e1a1e2a5ded56cabc7faf2ea55b22ed17126a94c121147aeefb40250710b7307a50d3 SHA512 a842b16dcb81da869afa0bddc755fdff0d57b35672505bf2c7164fd983b1938d28b126714128930994cc1230ced69d779456d0cfc16f4008c9b6d19f0852285d
@@ -7,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 1245 BLAKE2B f5ce1cc28ebc803cc4813899c3c253fe994d75471fa7a002e566a5ac90c8dfea7f3916bba0d360c10111836c79f703fe469f7cc28192dec43c8e47305d5a13e7 SHA512 69a3af00f9c91061ee92b821013706b323fdda715002f3a8b1975d821ac4c5583c3c632293b9a286f58d2ca3e99d4846efffd0f4a31496f8865c2af5ca980db3
+EBUILD ltrace-0.7.3_p4.ebuild 1297 BLAKE2B 3f07e0ff5ee87cb5bf66effc24bd5d1310233ccdcdf60ec4dd330526ff4dd9b1124afdd8843c194d2ac8686acbe0b5431e6e6c3535ee72714cef20958f4cd4c8 SHA512 93f733aa4ddd4cfb5ce00625a9e126ca13c77c9478562d2b6ae49e2167088506afb3bcb3c868f11bb563e77cb196fb1a6f8d20bc4bddb542157ccc5c8680f7c8
 MISC metadata.xml 357 BLAKE2B 393847ec554b92576d20a2e88b3f89b86d93ad51107161c0e5fe198415ad6f8d941418d89b438237f52c6e2cef942b449e8112f5619e219058a7f797a6b261dc SHA512 fff13f831e3d3994abc654ab5c5cb97e14cbec653d42074300cf81b22da05e5318a55ae4b28198fdc7aa8169464385939f5a889ca5ba86c45aa39dfe24772a95
diff --git a/dev-util/ltrace/files/ltrace-0.7.3-print-test-pie.patch b/dev-util/ltrace/files/ltrace-0.7.3-print-test-pie.patch
new file mode 100644
index 000000000000..5e46135add3e
--- /dev/null
+++ b/dev-util/ltrace/files/ltrace-0.7.3-print-test-pie.patch
@@ -0,0 +1,15 @@
+--- a/testsuite/ltrace.minor/print-instruction-pointer.exp
++++ b/testsuite/ltrace.minor/print-instruction-pointer.exp
+@@ -32,6 +32,12 @@ catch "exec sh -c {objdump -d $objdir/$subdir/$binfile | sed -n '/^\[0-9a-fA-F\]
+ catch "exec sh -c {echo \"$output\" | sed -n '2p'| awk -F' ' '{print \$1}'|awk -F: '{print \$1}'}" addr1
+ catch "exec sh -c {echo \"$output\" | sed -n '5p'| awk -F' ' '{print \$1}'|awk -F: '{print \$1}'}" addr2
+ 
++# Pick at most last 3 digits:
++# PIE binaries randomize address on page level.
++# Let's assume page size is no bigger than 4096 (3 hex digits)
++set addr1 [string range $addr1 3 end]
++set addr2 [string range $addr2 3 end]
++
+ verbose "addr1 = $addr1"
+ verbose "addr2 = $addr2"
+ # Verify the output by checking numbers of print in main.ltrace.
diff --git a/dev-util/ltrace/ltrace-0.7.3_p4.ebuild b/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
index b8d3442e1c11..158e5871be76 100644
--- a/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
+++ b/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
@@ -1,4 +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
@@ -33,6 +33,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.7.3-test-protos.patch #bug 421649
 	epatch "${FILESDIR}"/${PN}-0.7.3-alpha-protos.patch
 	epatch "${FILESDIR}"/${PN}-0.7.3-ia64.patch
+	epatch "${FILESDIR}"/${PN}-0.7.3-print-test-pie.patch
 	sed -i '/^dist_doc_DATA/d' Makefile.am || die
 	eautoreconf
 }
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 7306d0777470..cd879f0785ff 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,9 +1,11 @@
 AUX 0.48.0-multilib.patch 2180 BLAKE2B 8201fe0c2e495671129653ae9fb9ff9135d28d4c49a02d97f0a5d78031272ce34733e95d48cb8b70bd933c939b96b068ab2189856c1281f4c606e9fce419988f SHA512 75facb5b8d668175c75313299ee570028dab266d1e0ce0e7d2d21cec3df1e2308b80008e2af801bfd63b931bf3a8fbc6a70f02dc1f5d371dddaea6365dca0daf
+AUX 0.48.0-test-u.patch 927 BLAKE2B 620c4a1a74f562259e3ca48e409ba7be973e487479bcc14b5e354fda9122bb4d4eca0711f9385b93d4b1b68ee6a890c3948b34d1d43bd2d8768cdfe3cfa86bf0 SHA512 85645439625174469529cccb34b1198c07975141900d63dad40a4ff678c3abbcca44e270ba05f6a9d0e9fa4fa92515f77f56545ca3a3794c9d02dd198d6847a5
+AUX test-llvm.patch 872 BLAKE2B f67b6f266a86a4fe72d8a6c39b2b4df07a5f13404f01e8da790600537e623e6c95be03b73ac48dae0d206cd2b91d8226f857f13c2545f9250c64e3917e729d75 SHA512 dbfa0596751a117f428aff29fc0879b8ca37fcefff96dc2815164bde5cd60ff9f722359a6204bc509e4548ec11a69d9ccd1e1ac99175202434c41c183f045f2d
 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
 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-r1.ebuild 989 BLAKE2B 6f114e3eb92f9012dbf302dde1c555c29aa89674e93198aa039a76509ec60f917547884beda3e635dc4e3c6c07c0694a919f1fb408d3dc8fb37e2d7688d01fa5 SHA512 811e92a31c00d6500130efc8f4abee4b91fed903b55d559e1226e00e0b5750270bd485f36274de4a3841f9e3580a5d74bc4372ecf48fdabe150e24ab12620c2c
-EBUILD meson-9999.ebuild 939 BLAKE2B df8ab6f647468ad3451e69eee5cf84ab98191a124e459ac1a65b37e5813c752a9899114c8722eeabcc9b78d8aea3885bfc11c78d20db7df2c52f89ac11c0c9ce SHA512 243878f66c0eb2009e6e79bdd13cf9e1b87d0a58a3c8b008c62229282f9166fb1b8d73e30e5c55d5a566eec8a67b72d27562e6ba7139b11d1a2f6acebab544c9
+EBUILD meson-0.48.0-r2.ebuild 1196 BLAKE2B 1e36c78920fa7897f72e497dc68c76e127cffc0d5491fc4ff7a23aa6c1e2a67543683ef753ea1b55957b526ac7c206e64c8f4abd83fc32993573d3cf280e8473 SHA512 f7a6f2ceb491a429a2d03e814bc746c318c766aca488a578bb2424999e56c4f5b9b1afa4734af6f88868eb7863c69a3b5f34a6c9535bc6a1772968aa6be23151
+EBUILD meson-9999.ebuild 1124 BLAKE2B 38282459eddadc22bf10e3ba29373f06003b72930f60d74546aba436c164cdb26394f450b3fa85ec972465e2c171682d7cc2b0cf436ff7249bed50c20e9b82fa SHA512 80a17e57a3547bcf5e2f90ca20924d56beb825c57daf5a180196301bd11d1437439742f720bef8e4325f2517bdad8accc862f7b5fe362629b822281c6179ba0c
 MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467
diff --git a/dev-util/meson/files/0.48.0-test-u.patch b/dev-util/meson/files/0.48.0-test-u.patch
new file mode 100644
index 000000000000..099d4686b963
--- /dev/null
+++ b/dev-util/meson/files/0.48.0-test-u.patch
@@ -0,0 +1,28 @@
+From 99ecedc0930a99fb4d084208964e4c7922a6efec Mon Sep 17 00:00:00 2001
+From: Masanori Kakura <kakurasan@gmail.com>
+Date: Tue, 25 Sep 2018 18:04:06 +0900
+Subject: [PATCH] environment: Use os.path.basename() when checking
+ mesonlib.meson_command
+
+Without this, when one of Meson's parent directories contains
+"python", unexpected option "-u" will be passed to Meson.
+---
+ mesonbuild/environment.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
+index 7a44f2fd..a0c2fda4 100644
+--- a/mesonbuild/environment.py
++++ b/mesonbuild/environment.py
+@@ -375,7 +375,7 @@ class Environment:
+ 
+     def get_build_command(self, unbuffered=False):
+         cmd = mesonlib.meson_command[:]
+-        if unbuffered and 'python' in cmd[0]:
++        if unbuffered and 'python' in os.path.basename(cmd[0]):
+             cmd.insert(1, '-u')
+         return cmd
+ 
+-- 
+2.19.0
+
diff --git a/dev-util/meson/files/test-llvm.patch b/dev-util/meson/files/test-llvm.patch
new file mode 100644
index 000000000000..af7b9834bf33
--- /dev/null
+++ b/dev-util/meson/files/test-llvm.patch
@@ -0,0 +1,26 @@
+From 40457b1faa2c5b274447838ff1a041a8030c6c22 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sat, 6 Oct 2018 21:11:36 -0400
+Subject: [PATCH] Disable testing of static llvm linkage
+
+Gentoo doesn't provide static libs for llvm.
+---
+ test cases/frameworks/15 llvm/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test cases/frameworks/15 llvm/meson.build b/test cases/frameworks/15 llvm/meson.build
+index e05fddd2..9b38a454 100644
+--- a/test cases/frameworks/15 llvm/meson.build	
++++ b/test cases/frameworks/15 llvm/meson.build	
+@@ -20,7 +20,7 @@ if not dep_tinfo.found()
+   dep_tinfo = cpp.find_library('tinfo', required: false)
+ endif
+ 
+-foreach static : [true, false]
++foreach static : [false]
+   llvm_dep = dependency(
+     'llvm',
+     modules : ['bitwriter', 'asmprinter', 'executionengine', 'target',
+-- 
+2.19.0
+
diff --git a/dev-util/meson/meson-0.48.0-r1.ebuild b/dev-util/meson/meson-0.48.0-r1.ebuild
deleted file mode 100644
index d0fbb01b4722..000000000000
--- a/dev-util/meson/meson-0.48.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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=""
-RESTRICT="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}"/0.48.0-multilib.patch
-)
-
-python_test() {
-	${EPYTHON} run_tests.py || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles
-	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
-	insinto /usr/share/zsh/site-functions
-	doins data/shell-completions/zsh/_meson
-}
diff --git a/dev-util/meson/meson-0.48.0-r2.ebuild b/dev-util/meson/meson-0.48.0-r2.ebuild
new file mode 100644
index 000000000000..653033f818b0
--- /dev/null
+++ b/dev-util/meson/meson-0.48.0-r2.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=( 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}"/test-llvm.patch
+	"${FILESDIR}"/0.48.0-multilib.patch
+	"${FILESDIR}"/0.48.0-test-u.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 aace7f3caa4f..0d5b9b4711c3 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -20,13 +20,24 @@ HOMEPAGE="http://mesonbuild.com/"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
-RESTRICT="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND=""
 
+PATCHES=(
+	"${FILESDIR}"/test-llvm.patch
+)
+
 python_test() {
-	${EPYTHON} run_tests.py || die
+	(
+		# 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() {
diff --git a/dev-util/mingw64-runtime/Manifest b/dev-util/mingw64-runtime/Manifest
index e49c2b921814..47fd5d0a858f 100644
--- a/dev-util/mingw64-runtime/Manifest
+++ b/dev-util/mingw64-runtime/Manifest
@@ -1,5 +1,5 @@
 DIST mingw-w64-v5.0.4.tar.bz2 9163093 BLAKE2B fd039995c73690c12ddf1612d42edefbb572386b2ca8508fd5a5edd9e715ced41c05c62efec8eda07b9ec7a1e9e658bf3b3dedeb18695a076b5bc2067e86d68d SHA512 5b279222e86475a982e2aeb9fc14853f4fac0ca0c5a2d56f303584d1b348726afd99b0292a5ed050d326e7cb1434e5ad5b5dfdfb37c73fd08f13e7f4f4bcc046
 DIST mingw-w64-v6.0.0.tar.bz2 9045653 BLAKE2B 8a54dca2d06c92ab968a93240996d07ab3b1ed4652555a48b7581c477856d5784ed192c578d78186e171e400bd18b4de3c6cafbdd96109367ad13c37792015c1 SHA512 e3d3663e0cb33a16f90b1a33e81b5a30d26f7e34270b14e865c10068f2a2d32da9ef8cbbb0c3fed9c71429ae11c82152ff3b87d81558929b2a4993dc99cfc11e
 EBUILD mingw64-runtime-5.0.4.ebuild 2597 BLAKE2B 500aecb0c6f8a8fe314c18937515438c730e25d6637d0b641d90cbbef8cb0764ffd690c7313c6cbade86bbf8bdf725f2bc075460a1e96987f9c6c043609f72da SHA512 cca85d0666b28bec6abcd4c4d40b89f9fb6c76077b10b8e8111b1fb6a96f78bc3877392c7f03f17a733e421bb242adcb8b2058af82136fc9c32c18b9fb7120b7
-EBUILD mingw64-runtime-6.0.0.ebuild 2564 BLAKE2B 5223ae19f8d1c6f08b27bbb2373d0fca2a9fac958b0fe98d7f7d5dad25a066ec02e1f3421ca800ad6c3a97b951531b09fe3648b39bcc6e3d0371c0e32ad4c465 SHA512 51261358421fca211c27bcfce201b585eea4a9448d1c749d580deb350f4fc3fb4d858712190faa23b50fdaa23c3300bcbf2fcc8c9522be85c9463f055418d1be
-MISC metadata.xml 544 BLAKE2B 5d2a688f8f644b6893efd4f7a2e756d336c569a6a51fc4a0b0df94623ef7f3e8fa317fe6c971f233883b424e1abeaaf03ef92d56434cfea6eab5bdd3798ad6d5 SHA512 297a90e704de81f41a4f29871f96bed47aa00c703e79fd825b3a06ab8850fe67896c66dee2603f86cd6596a0c5cbd533c87cb94c1c674714f65767954341a3c8
+EBUILD mingw64-runtime-6.0.0-r1.ebuild 2908 BLAKE2B 5402e752fab1dd5c784bc743f1f468e8ab74fa0fa1c695e9bb1793298eb44aab9d8b99bd8e449bcf53c00fa8bad182120fee0b424dcf715b446e4bfdfe67280b SHA512 94e837d5cec4b00971dfb399d61db41f39f3c2f7e5907b04b535617f062be34b7af108bb72878a1608b0635ce60d084c9ad64969b09b089d70dfb2dc74ff17af
+MISC metadata.xml 563 BLAKE2B 84e56e99482d2f7bb1e1095d84915b42190ba74fe7242ffdce548c4249a40be17018a29911d32b9b09df8fc5e04d912dcfe6f473e5eb2478f55d317808b24f4b SHA512 27dca35a3b2d5444b712802c3099c595d9b9fda21f29b6b709222e5bb0aad78f353d0170500eb3b632b254935d35cf43fc43d4ecb61722b711799ca4d28211bd
diff --git a/dev-util/mingw64-runtime/metadata.xml b/dev-util/mingw64-runtime/metadata.xml
index 5d6c0c23c0d6..1b348ca856b1 100644
--- a/dev-util/mingw64-runtime/metadata.xml
+++ b/dev-util/mingw64-runtime/metadata.xml
@@ -6,15 +6,9 @@
     <name>Gentoo Toolchain Project</name>
   </maintainer>
   <use>
-    <flag name="idl">
-    Install idl files.
-  </flag>
-    <flag name="libraries">
-    Build extra libraries.
-  </flag>
-    <flag name="tools">
-    Build extra tools.
-  </flag>
+    <flag name="idl">Install idl files.</flag>
+    <flag name="libraries">Build extra libraries: mangle, pseh, winpthreads.</flag>
+    <flag name="tools">Build extra tools: gendef, genidl.</flag>
   </use>
   <upstream>
     <remote-id type="sourceforge">mingw-w64</remote-id>
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-6.0.0-r1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-6.0.0-r1.ebuild
new file mode 100644
index 000000000000..59982699b753
--- /dev/null
+++ b/dev-util/mingw64-runtime/mingw64-runtime-6.0.0-r1.ebuild
@@ -0,0 +1,113 @@
+# 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}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+inherit autotools flag-o-matic eutils
+
+DESCRIPTION="Free Win64 runtime and import library definitions"
+HOMEPAGE="http://mingw-w64.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# USE=libraries needs working stage2 compiler: bug #665512
+IUSE="headers-only idl libraries tools"
+RESTRICT="strip"
+
+S="${WORKDIR}/mingw-w64-v${PV}"
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+just_headers() {
+	use headers-only
+}
+alt_prefix() {
+	is_crosscompile && echo /usr/${CTARGET}
+}
+crt_with() {
+	just_headers && echo --without-$1 || echo --with-$1
+}
+crt_use_enable() {
+	just_headers && echo --without-$2 || use_enable "$@"
+}
+crt_use_with() {
+	just_headers && echo --without-$2 || use_with "$@"
+}
+
+pkg_setup() {
+	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
+		die "Invalid configuration"
+	fi
+}
+
+src_configure() {
+	CHOST=${CTARGET} strip-unsupported-flags
+	# Normally mingw-64 does not use dynamic linker.
+	# But at configure time it uses $LDFLAGS.
+	# When default -Wl,--hash-style=gnu is passed
+	# __CTORS_LIST__ / __DTORS_LIST__ is mis-detected
+	# for target ld and binaries crash at shutdown.
+	filter-ldflags '-Wl,--hash-style=*'
+
+	if ! just_headers; then
+		mkdir "${WORKDIR}/headers"
+		pushd "${WORKDIR}/headers" > /dev/null
+		CHOST=${CTARGET} "${S}/configure" \
+			--prefix="${T}/tmproot" \
+			--with-headers \
+			--without-crt \
+			|| die
+		popd > /dev/null
+		append-cppflags "-I${T}/tmproot/include"
+	fi
+
+	# By default configure tries to set --sysroot=${prefix}. We disable
+	# this behaviour with --with-sysroot=no to use gcc's sysroot default.
+	# That way we can cross-build mingw64-runtime with cross-emerge.
+	CHOST=${CTARGET} econf \
+		--with-sysroot=no \
+		--prefix="${EPREFIX}"$(alt_prefix)/usr \
+		--with-headers \
+		--enable-sdk \
+		$(crt_with crt) \
+		$(crt_use_enable idl idl) \
+		$(crt_use_with libraries libraries) \
+		$(crt_use_with tools tools) \
+		$(
+			$(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
+				&& echo --disable-lib32 --enable-lib64 \
+				|| echo --enable-lib32 --disable-lib64
+		)
+}
+
+src_compile() {
+	if ! just_headers; then
+		emake -C "${WORKDIR}/headers" install
+	fi
+	default
+}
+
+src_install() {
+	default
+
+	if is_crosscompile ; then
+		# gcc is configured to look at specific hard-coded paths for mingw #419601
+		dosym usr /usr/${CTARGET}/mingw
+		dosym usr /usr/${CTARGET}/${CTARGET}
+		dosym usr/include /usr/${CTARGET}/sys-include
+	fi
+
+	env -uRESTRICT CHOST=${CTARGET} prepallstrip
+	rm -rf "${ED}/usr/share"
+}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-6.0.0.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-6.0.0.ebuild
deleted file mode 100644
index 47cd6c8a3d10..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-6.0.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-inherit autotools flag-o-matic eutils
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE="headers-only idl libraries tools"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only
-}
-alt_prefix() {
-	is_crosscompile && echo /usr/${CTARGET}
-}
-crt_with() {
-	just_headers && echo --without-$1 || echo --with-$1
-}
-crt_use_enable() {
-	just_headers && echo --without-$2 || use_enable "$@"
-}
-crt_use_with() {
-	just_headers && echo --without-$2 || use_with "$@"
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_configure() {
-	CHOST=${CTARGET} strip-unsupported-flags
-
-	if ! just_headers; then
-		mkdir "${WORKDIR}/headers"
-		pushd "${WORKDIR}/headers" > /dev/null
-		CHOST=${CTARGET} "${S}/configure" \
-			--prefix="${T}/tmproot" \
-			--with-headers \
-			--without-crt \
-			|| die
-		popd > /dev/null
-		append-cppflags "-I${T}/tmproot/include"
-	fi
-
-	# By default configure tries to set --sysroot=${prefix}. We disable
-	# this behaviour with --with-sysroot=no to use gcc's sysroot default.
-	# That way we can cross-build mingw64-runtime with cross-emerge.
-	CHOST=${CTARGET} econf \
-		--with-sysroot=no \
-		--prefix="${EPREFIX}"$(alt_prefix)/usr \
-		--with-headers \
-		--enable-sdk \
-		$(crt_with crt) \
-		$(crt_use_enable idl idl) \
-		$(crt_use_with libraries libraries) \
-		$(crt_use_with tools tools) \
-		$(
-			$(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
-				&& echo --disable-lib32 --enable-lib64 \
-				|| echo --enable-lib32 --disable-lib64
-		)
-}
-
-src_compile() {
-	if ! just_headers; then
-		emake -C "${WORKDIR}/headers" install
-	fi
-	default
-}
-
-src_install() {
-	default
-
-	if is_crosscompile ; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	rm -rf "${ED}/usr/share"
-}
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 1e04a00748b6..f5a34301aee1 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 2266 BLAKE2B a68da655172bba2180cc259bae15a13f535ebfa46a4050980158bbb700b6c91466b802c07a3a40ad4e426c88111ce7a3d30b59e392917bcbfde44cd96c864125 SHA512 9471fc12e8ea0ea45a82f64d99098eb6d082b9b8b5ee95c681f2e29703cc8bbd3598f37364b776714691bf86a71589ad21fa9e2b091513860d0580ac6e3c64dd
+EBUILD strace-4.23-r1.ebuild 2256 BLAKE2B b7c7dc1cd0920968aca28cb49ea0469ca6aa368973a8085499c12a0348cbdbfaddc41d1d5ebbc8cf826510095dac0d333fbedd1bcfe8234f1d42b93118eee197 SHA512 607d0e7bd0c335f0751484ed7ed66d3a4c84c752361ec20b3b877a34c045f83eb35647513697442e29059ed3753821d2a3121214e9bfec932e7b96c207c456cd
 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 058032a5025f..acb8321fc72c 100644
--- a/dev-util/strace/strace-4.23-r1.ebuild
+++ b/dev-util/strace/strace-4.23-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
 	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 84e75674e9e0..6bb49f663979 100644
--- a/dev-util/sysdig/Manifest
+++ b/dev-util/sysdig/Manifest
@@ -1,3 +1,7 @@
 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.24.0.ebuild b/dev-util/sysdig/sysdig-0.24.0.ebuild
new file mode 100644
index 000000000000..3ba452c42e38
--- /dev/null
+++ b/dev-util/sysdig/sysdig-0.24.0.ebuild
@@ -0,0 +1,94 @@
+# 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/sysdig/sysdig-0.24.1.ebuild b/dev-util/sysdig/sysdig-0.24.1.ebuild
new file mode 100644
index 000000000000..3ba452c42e38
--- /dev/null
+++ b/dev-util/sysdig/sysdig-0.24.1.ebuild
@@ -0,0 +1,94 @@
+# 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-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 5cbfe52187b0..5aa530c50bdd 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/fossil/Manifest b/dev-vcs/fossil/Manifest
index cbafccadc256..2dfeb2f94c6c 100644
--- a/dev-vcs/fossil/Manifest
+++ b/dev-vcs/fossil/Manifest
@@ -3,5 +3,5 @@ DIST fossil-src-2.5.tar.gz 5036719 BLAKE2B b25067ee79793343a017dee28d3ee2b5eb257
 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
-EBUILD fossil-2.6.ebuild 1533 BLAKE2B d4a50902e83e8540a4f73b3868bfa6422154bc0450c0da25a334765cd7bbbf4a0acc06c1c49a630ab0227405a1753d7b078b411ef7a0970ec2bf9f9ed70de91d SHA512 edfb8a357970407e3d4fde08ea8df40d3c1787ede0ed2983e6a9ec20683846fd025edfb681ac414810a79296da1e066d5a38b48fe7bcd118c06fb724b7bae74f
+EBUILD fossil-2.6.ebuild 1529 BLAKE2B 413e59815f2aeac2d78a80747f35ad135837d304fa65efe9fba934cece7a781d611365e263e96b427c75b656c9b735ccbf11952cbf3d3eab2abe20db983d3bf6 SHA512 06e7f2788aadd5854145427ca7ff5b06639835442deb57c7df23006562269c040d7b23fb3bf27a31677000732743924ae53e61e96583d5acdfa7a46b3cedcf3e
 MISC metadata.xml 1165 BLAKE2B c370f1370c7250945135e56514558acd016742f6d8a9c51e98b9533e094b47dbdc07808abbb1341ad1e987dac6f5f13d2e2f0fef45587935accf082c15227330 SHA512 6ef05c3722bb110e403294b002c253eb1ae4f29a4f5306dccee3abd52ce61c8ae04ed2255f551298d94b8b99d96c799f05bd6df7a9d4e9af08e4c10ce306d0ab
diff --git a/dev-vcs/fossil/fossil-2.6.ebuild b/dev-vcs/fossil/fossil-2.6.ebuild
index 348bc29bb019..ff91fac36116 100644
--- a/dev-vcs/fossil/fossil-2.6.ebuild
+++ b/dev-vcs/fossil/fossil-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="http://www.fossil-scm.org/index.html/uv/fossil-src-${PV}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
+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"
 
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 5fceb27ffa4a..dedd77ab2955 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -14,17 +14,29 @@ AUX git-daemon.socket 116 BLAKE2B 0fbf31de87810ac737adfab21acf87b0d95f62df5208fe
 AUX git-daemon.xinetd 260 BLAKE2B 594a046b5b2b580b7cfed1b620e014160965046c5e5a42359b6134af0a4c03a30a9464db5e19c6027645d9084550743e397af2d6566b7543a2b509e025aeb1e1 SHA512 5e0c85004e7e2b89fd191350022b9970a6ca03129b4c913e159570b99b5797ab924f667cd3dc5693a9d4916b7b5cf36814eda015dbdf46a1354eb50d1c081f9c
 AUX git-daemon_at-r1.service 340 BLAKE2B 879db8b274d8e1d2995a2ea1e4b1d66cac3d6979006fc24721db8b389395ac98a98444f032eaf7c66d6c02ab394a764e16a9cd3b5446b6be9061b9bdd89cf964 SHA512 073d8752dc224ff1130a5290e0f965a04b19f2a8dbd5d50172101099386ad3af0fd5e1abf57030960b750a2adf36a7ae69d18ddc990bab4e694486e65424cfa9
 DIST git-2.16.4.tar.xz 4968252 BLAKE2B 77f76408bde02bfacdb99d22baca05893f63c96d1fb7508c7e92541f8f7ec9ced0dad650be788fd28a1e03b5d88b88708652d07a47bedaae60a9cbd4e2eec858 SHA512 f54e431e78289349dcb927ec34873dfb801c49a41cbb3d0138346d603af26bd7d86f9ac95e7a61a4831017f3503f33374510ccf68b0e62b0691fc5a43283f1ac
+DIST git-2.16.5.tar.xz 4968780 BLAKE2B 9987e15152cce334fdfe2f56705fb2d9d246652010e58879fefc79cb20c05f177f2ed0c4ef8955889684466d2d3fbf9a246351751d6c6d6c3c8b4adeb48fbf06 SHA512 96770035f370808b7b7f3752c938394522fcb699355ed821591a1ef5756903ad0e8830441d230cbead7718b42066ad4e33fedf8b8c948fbacc89c18f3d486e26
 DIST git-2.18.0.tar.xz 5102264 BLAKE2B 94a8469a0e489d517136233301f1af622a3e612967316620800a771721f4e558dfb9159f158ddd07d294fce3ceb256038483f5a8c1fe6a84f661710857945dce SHA512 db19363c9c2042248322d49874a27c0614acfb912183725e5d4f0331d6b44cef66a9a7da6a49bd4a17e5d86d30c5fed6bef7527f386494184595a433c4060e46
+DIST git-2.18.1.tar.xz 5102812 BLAKE2B 43ec86d9aebc73a582f2117ef1c26a6dc820f81ff389a6239ed6e3ea5fd2be0bac54766c3ab8ad1cc9730978e5b73997bb20b24b9f3f43d6eef06bea8a9174c3 SHA512 06bdc54c4ff78b77667b917f2aa46a803bd6561236f4177f41b8730785b5f90f8ca705f028131f9365fb0aae2e51cd92c97380141e97c026c96a020e00b992e1
 DIST git-2.19.0.tar.xz 5227124 BLAKE2B f917b9ca8325ffbdec7d8614fec3874a09b5d3c421a0179f6c77def7e11f5853d821933b13687087b05791531e194178e1e63f51739ece91e32dddb07a127a0b SHA512 305e51f8e22d96847fcdf4169340795aacaf5f4c5b8052cda860a668059d9ef35bb2840c278b7207f3b9f0e1c32915719649edc20bd3cd33b53e97a06159ceac
+DIST git-2.19.1.tar.xz 5227908 BLAKE2B 1702662d7eea2ea5fa9d697eece19bee8a451abb1e85b1c7b111b4126e97340ee0c5691faf37c2d9fbe13bdf4ea894d8a3e0e2f7208e7bce111e53d1da81ef5f SHA512 a1bc1032b1de9eb9ea8b7c385cd009f64247e13066e0a91e9682e35400ded05f88c23b523cca4782f57544060d6ba0f9d3bec944399cda5771a4945c38bb9b98
 DIST git-htmldocs-2.16.4.tar.xz 1164256 BLAKE2B 88a7ab5b094f15bc2b6c0f4d4c3eae185f6e6c0f00f4aca75492f0cc964428d1bf53002e0e43468b60b62058af5f13b061231061247e19b32bc70c2c8adb04eb SHA512 8f4a8c51656559af81296fb064ecf0f88444952c7f8ee91b85e5a61b20d200267d7432f720ded12046bab986361cff48cf7a2f5d21e05c1ac7648cc3168a0049
+DIST git-htmldocs-2.16.5.tar.xz 1164600 BLAKE2B 303f5543a420a78b7731aee7b9977361130edfdcffbf67e3ad652ac1243a22aa13d883337466e95a186977e34a2989f5639af7acd7c0187219b200cf966a83ef SHA512 00ed040e665e817a0543768bb290c47dd553581a18b136a59ca37e656c538f49716e79a533c5063c2a00f16f7ad021a5836f71b805200df07bb8a3923aacddfb
 DIST git-htmldocs-2.18.0.tar.xz 1201076 BLAKE2B f5d592cadf1eb9a24b6d6fb3c68c1ead385a350e4bfc97eee775f1921c7bf47f8790d1eea803d69cde8e381d7aa0ae4c53aebeda464c32cdd7a6558a46a9c8e7 SHA512 e227673216b67cf0e5d0abacc305a3b2a30844a6fe31aab18e37643f27c0fce7d3628366732f1518784d095eb33c1bb60b4eb00024d9ccc662deca2962db5324
+DIST git-htmldocs-2.18.1.tar.xz 1201604 BLAKE2B ae33ac1ec8d2c95f95dbc5965d191f093628633c047c7d52371b7a3142807a4b878be5abcd13a934a453a5b35abb4a7e0ea49823e98c4a682040afc8d7c0817d SHA512 5310a846091bfa66609ce896bdce163bd84f40c14400a53eab662f0c28037b98fef4a8766a716694a5bf9549793a85b57cb665194dff5612277c6603452ea512
 DIST git-htmldocs-2.19.0.tar.xz 1221804 BLAKE2B c3c1e91b05bb5fc777f97973941c97b8c093a94d4dc308527bc6bea7b6cc787bb939d4a5a978a69f1476da8e334f17393bf56a8de64b7e5bd88544d32f858f40 SHA512 61c6c1d64affa2f910c0c01a14f19f49ef496e1a09c223f7fb454031a6388dcd96c69c362e0da167a2e4bf1347d4c30e55d9c476076f1ab8e278f9af07053745
+DIST git-htmldocs-2.19.1.tar.xz 1222052 BLAKE2B 6d63364e0c5c700011ab0b7bc9c207560bc89e6d58e5f8025f30a188b7c90fa1ca58822e0ee129ff531c0702fc0a64e1612b8ff7b41102e5db21eadd0fd01ab9 SHA512 40417e80b291a935be78f143f070c68a9a865b6825f85cddd57cf926c25649630dd6612e7e52edb3ab4d1433aca31d38e3b9c95ff5d52827452d03c96e50e344
 DIST git-manpages-2.16.4.tar.xz 417136 BLAKE2B 9a75913dae62fa2eb31cf48e77e266aa8d91c67b8a753c1740283b1d626dea1e9aa8d7cea06d9b97887f801b4d1f1b927014851105cefd3241ca7ab7330bfc8b SHA512 8029e9fac1eca542e809da1247f4eec3a2c81c0eb12d03aa816dcf120677011d3e409b06c28c8e7dbf41cbbcca873ec93846dc317bc73e57f4d4701ce7abf73d
+DIST git-manpages-2.16.5.tar.xz 417140 BLAKE2B f7b3255fe0ac7ea82273e0718d96e045854b7d3c7ad100befac47cd005139415e56b8e0dd85293bca26f2e1ff12f729c46bfd27ede5ecdda08a1533ed43a8b2f SHA512 38ec66e43055f7121bace4655350e9b617b5586271c4ae73d15966e52e56ac38bec2f5f7f128410d004a2a0db3db9954fcfec1d78eb49579a74a46b404b67396
 DIST git-manpages-2.18.0.tar.xz 425516 BLAKE2B ff979aa0c99716da279cd4001d5907cec95e93ac93f1f2dc5dd79d456a185e0d8610a121b08b07c3c886132e94334114932881d78c7307ff287c256f993938e5 SHA512 8ae353083288e58752e6e6ff505cde6f4fa0be20465443c0517a87af28867d748eb29fc9d3dcb805b29c4e422cf4eae124b7fec5c339888ab4ebaff6360ada15
+DIST git-manpages-2.18.1.tar.xz 425568 BLAKE2B fc0f8aee3d80cba0f84c4ff4cfa342ea3c1ae155f3434b6d1771e03bb14956d5ffd78a5cadfee378534f6cf85265c37eeb1be27eb7801ae798cede249640c478 SHA512 6e6e663d985ef267d556539a43c192138b31dbbc80ffaa4331b8494f6e3e74b5cd4d958c2ae963143946eaa99bfce485ee3726b510b10eaab3599b5284b5fbc1
 DIST git-manpages-2.19.0.tar.xz 431832 BLAKE2B b1493e88b3836cfdbd4f709058f7b287764df52237f2dee054668ce5cd9a547553fb36f2f474debd9bc2a511e73a9967307d8a3d174651d261ddd4176a8ec766 SHA512 463cacfc58dc16d69dc9e374fb840cd2859d69e2a74575437be72159e05cc85ad6c9e89dfe2c20963fce962b9add4ad9694e84ab5792b2c30034f68d52648117
+DIST git-manpages-2.19.1.tar.xz 431852 BLAKE2B e15be2e1680a28c3c57e7b6e022173ef4b006cf21b5464a32f7f7668ea2b8af2ac7ff7466d98ab627320895b92583840159e2fca613be95817656def2654edaa SHA512 1b42c39e39653906b44fbca65991da04493f08479e2162da5f593bee68dbfd3f3b8180f5a2721f1971e3218b0dc842a8a34918fc7724c032597f4fe4b2f506dc
 EBUILD git-2.16.4.ebuild 19308 BLAKE2B c9b9a129e60c18afca00af335bc8098ee24c7ab767d69b75453d5dc223c1d885f6b199868b0155a961eacb39b79bc7d0d9d918f17c581923fec0a352d3e83004 SHA512 b333154f1ed1d0f568f9ca2de3b2ff27210c14ab7e5a6bcf5893eefd1da22578a75b88b18226fd099a21b7768d629f7f08fe3cda49283c5f3ff99d63c9352019
-EBUILD git-2.18.0.ebuild 19295 BLAKE2B 645bd7437bdca23956039e0d5a3976c3c67b862694de8b4f6adecbf72dfc734665709334aa170ccf828d2572a3f3420b4e796a085f8e6ae6ebc8d74525af94cb SHA512 51c128adf0503fd6073b85666f9e1fdc26483434086a170941c572e142975a22914e28fab6f46c37623e3b57689994503d4483ecf4543992741516a09a5f7ec3
+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.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
 EBUILD git-9999-r2.ebuild 18970 BLAKE2B 288408e8e20bbb5b16e714d366af4573b88c906a5af70e9f53c5c1f3dd1f80d7682295066aa8a0b8cde5feb12eafc1e292e63786bed2455e33e58770935be849 SHA512 de17312e00f2c9c412b98056a565329a237960a2a80c0769d4a9481fb10bc3b9273b39ad924fafee08b358165aef161208e5e308a13e5c8d9dc1a678247dbb79
 EBUILD git-9999-r3.ebuild 18972 BLAKE2B 7af0fedb48b1102abed872514f571c5cd73ed72c15dd430fbab72d1d7ddc9e287decb08ed77f3166ef8f008d041e53892a79b2a5b2129a2a01d83da3854290a4 SHA512 e018cbfa4e24825671f1d79014812f998fb0a9f01c960c17f6188211edf07aba95b57bce389bd1a0ceed15f7198ad306a705dbb4ea3f0a4165aea1985fed13da
diff --git a/dev-vcs/git/git-2.16.5.ebuild b/dev-vcs/git/git-2.16.5.ebuild
new file mode 100644
index 000000000000..b51710380b07
--- /dev/null
+++ b/dev-vcs/git/git-2.16.5.ebuild
@@ -0,0 +1,699 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python2_7 )
+PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
+if [[ ${PV} == *9999 ]]; then
+	SCM="git-r3"
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
+	# See https://git-scm.com/docs/gitworkflows#_graduation
+	# In order of stability:
+	# 9999-r0: maint
+	# 9999-r1: master
+	# 9999-r2: next
+	# 9999-r3: pu
+	case "${PVR}" in
+		9999) EGIT_BRANCH=maint ;;
+		9999-r1) EGIT_BRANCH=master ;;
+		9999-r2) EGIT_BRANCH=next;;
+		9999-r3) EGIT_BRANCH=pu ;;
+	esac
+fi
+
+inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
+HOMEPAGE="https://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI_SUFFIX="xz"
+	SRC_URI_KORG="mirror://kernel/software/scm/git"
+	[[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
+	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			doc? (
+			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			)"
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+	gnome-keyring? ( app-crypt/libsecret )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+	sys-libs/zlib
+	pcre? (
+		pcre-jit? ( dev-libs/libpcre2[jit(+)] )
+		!pcre-jit? ( dev-libs/libpcre )
+	)
+	perl? ( dev-lang/perl:=[-build(-)] )
+	tk? ( dev-lang/tk:0= )
+	curl? (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	emacs? ( virtual/emacs )
+"
+
+RDEPEND="${CDEPEND}
+	gpg? ( app-crypt/gnupg )
+	mediawiki? (
+		dev-perl/DateTime-Format-ISO8601
+		dev-perl/HTML-Tree
+		dev-perl/MediaWiki-API
+	)
+	perl? ( dev-perl/Error
+			dev-perl/Net-SMTP-SSL
+			dev-perl/Authen-SASL
+			cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
+			cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
+			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
+			)
+	python? ( ${PYTHON_DEPS} )
+"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+DEPEND="${CDEPEND}
+	doc? (
+		app-text/asciidoc
+		app-text/docbook2X
+		sys-apps/texinfo
+		app-text/xmlto
+	)
+	nls? ( sys-devel/gettext )
+	test? (	app-crypt/gnupg	)"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+	DEPEND="${DEPEND}
+		app-text/asciidoc"
+fi
+
+SITEFILE=50${PN}-gentoo.el
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	cgi? ( perl )
+	cvs? ( perl )
+	mediawiki? ( perl )
+	mediawiki-experimental? ( mediawiki )
+	subversion? ( perl )
+	webdav? ( curl )
+	pcre-jit? ( pcre )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+PATCHES=(
+	# bug #350330 - automagic CVS when we don't want it is bad.
+	"${FILESDIR}"/git-2.12.0-optional-cvs.patch
+
+	# install mediawiki perl modules also in vendor_dir
+	# hack, needs better upstream solution
+	"${FILESDIR}"/git-1.8.5-mw-vendor.patch
+
+	"${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
+
+	# Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
+	"${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
+)
+
+pkg_setup() {
+	if use subversion && has_version "dev-vcs/subversion[dso]"; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned."
+	fi
+	if use python ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+	local myopts
+
+	if use blksha1 ; then
+		myopts+=" BLK_SHA1=YesPlease"
+	elif use ppcsha1 ; then
+		myopts+=" PPC_SHA1=YesPlease"
+	fi
+
+	if use curl ; then
+		use webdav || myopts+=" NO_EXPAT=YesPlease"
+	else
+		myopts+=" NO_CURL=YesPlease"
+	fi
+
+	# broken assumptions, because of static build system ...
+	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
+	myopts+=" INSTALL=install TAR=tar"
+	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
+	myopts+=" SANE_TOOL_PATH="
+	myopts+=" OLD_ICONV="
+	myopts+=" NO_EXTERNAL_GREP="
+
+	# For svn-fe
+	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
+
+	# can't define this to null, since the entire makefile depends on it
+	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
+
+	use iconv \
+		|| myopts+=" NO_ICONV=YesPlease"
+	use nls \
+		|| myopts+=" NO_GETTEXT=YesPlease"
+	use tk \
+		|| myopts+=" NO_TCLTK=YesPlease"
+	if use pcre; then
+		if use pcre-jit; then
+			myopts+=" USE_LIBPCRE2=YesPlease"
+			extlibs+=" -lpcre2-8"
+		else
+			myopts+=" USE_LIBPCRE1=YesPlease"
+			myopts+=" NO_LIBPCRE1_JIT=YesPlease"
+			extlibs+=" -lpcre"
+		fi
+	fi
+	use perl \
+		&& myopts+=" INSTALLDIRS=vendor" \
+		|| myopts+=" NO_PERL=YesPlease"
+	use python \
+		|| myopts+=" NO_PYTHON=YesPlease"
+	use subversion \
+		|| myopts+=" NO_SVN_TESTS=YesPlease"
+	use threads \
+		&& myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
+		|| myopts+=" NO_PTHREADS=YesPlease"
+	use cvs \
+		|| myopts+=" NO_CVS=YesPlease"
+	use elibc_musl \
+		&& myopts+=" NO_REGEX=YesPlease"
+# Disabled until ~m68k-mint can be keyworded again
+#	if [[ ${CHOST} == *-mint* ]] ; then
+#		myopts+=" NO_MMAP=YesPlease"
+#		myopts+=" NO_IPV6=YesPlease"
+#		myopts+=" NO_STRLCPY=YesPlease"
+#		myopts+=" NO_MEMMEM=YesPlease"
+#		myopts+=" NO_MKDTEMP=YesPlease"
+#		myopts+=" NO_MKSTEMPS=YesPlease"
+#	fi
+	if [[ ${CHOST} == ia64-*-hpux* ]]; then
+		myopts+=" NO_NSEC=YesPlease"
+	fi
+	if [[ ${CHOST} == *-*-aix* ]]; then
+		myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
+	fi
+	if [[ ${CHOST} == *-solaris* ]]; then
+		myopts+=" NEEDS_LIBICONV=YesPlease"
+		myopts+=" HAVE_CLOCK_MONOTONIC=1"
+		grep -q getdelim "${ROOT}"/usr/include/stdio.h && \
+			myopts+=" HAVE_GETDELIM=1"
+	fi
+
+	has_version '>=app-text/asciidoc-8.0' \
+		&& myopts+=" ASCIIDOC8=YesPlease"
+	myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
+
+	# Bug 290465:
+	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+	[[ "${CHOST}" == *-uclibc* ]] && \
+		myopts+=" NO_NSEC=YesPlease"
+
+	export MY_MAKEOPTS="${myopts}"
+	export EXTLIBS="${extlibs}"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+		cd "${S}"
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		use doc && \
+			cd "${S}"/Documentation && \
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		cd "${S}"
+	else
+		git-r3_src_unpack
+		cd "${S}"
+		#cp "${FILESDIR}"/GIT-VERSION-GEN .
+	fi
+
+}
+
+src_prepare() {
+	# add experimental patches to improve mediawiki support
+	# see patches for origin
+	if use mediawiki-experimental ; then
+		PATCHES+=(
+			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
+		)
+	fi
+
+	default
+
+	sed -i \
+		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
+		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
+		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		Makefile contrib/svn-fe/Makefile || die "sed failed"
+
+	# Never install the private copy of Error.pm (bug #296310)
+	sed -i \
+		-e '/private-Error.pm/s,^,#,' \
+		perl/Makefile.PL
+
+	# Fix docbook2texi command
+	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+		Documentation/Makefile || die "sed failed"
+
+	# Fix git-subtree missing DESTDIR
+	sed -i \
+		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
+		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
+		contrib/subtree/Makefile
+}
+
+git_emake() {
+	# bug #320647: PYTHON_PATH
+	PYTHON_PATH=""
+	use python && PYTHON_PATH="${PYTHON}"
+	emake ${MY_MAKEOPTS} \
+		DESTDIR="${D}" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		OPTCC="$(tc-getCC)" \
+		OPTAR="$(tc-getAR)" \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		sysconfdir="${EPREFIX}"/etc \
+		PYTHON_PATH="${PYTHON_PATH}" \
+		PERL_PATH="${EPREFIX}/usr/bin/perl" \
+		PERL_MM_OPT="" \
+		GIT_TEST_OPTS="--no-color" \
+		V=1 \
+		"$@"
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	if use perl ; then
+	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
+	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
+	fi
+	git_emake || die "emake failed"
+
+	if use emacs ; then
+		elisp-compile contrib/emacs/git{,-blame}.el
+	fi
+
+	if use perl && use cgi ; then
+		git_emake \
+			gitweb \
+			|| die "emake gitweb (cgi) failed"
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		cd "${S}"/contrib/credential/osxkeychain || die
+		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
+			|| die "emake credential-osxkeychain"
+	fi
+
+	cd "${S}"/Documentation
+	if [[ ${PV} == *9999 ]] ; then
+		git_emake man \
+			|| die "emake man failed"
+		if use doc ; then
+			git_emake info html \
+				|| die "emake info html failed"
+		fi
+	else
+		if use doc ; then
+			git_emake info \
+				|| die "emake info html failed"
+		fi
+	fi
+
+	if use subversion ; then
+		cd "${S}"/contrib/svn-fe
+		# by defining EXTLIBS we override the detection for libintl and
+		# libiconv, bug #516168
+		local nlsiconv=
+		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
+		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
+		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
+		if use doc ; then
+			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
+		fi
+		cd "${S}"
+	fi
+
+	if use gnome-keyring ; then
+		cd "${S}"/contrib/credential/libsecret
+		git_emake || die "emake git-credential-libsecret failed"
+	fi
+
+	cd "${S}"/contrib/subtree || die
+	git_emake
+	use doc && git_emake doc
+
+	cd "${S}"/contrib/diff-highlight || die
+	git_emake
+
+	if use mediawiki ; then
+		cd "${S}"/contrib/mw-to-git
+		git_emake
+	fi
+}
+
+src_install() {
+	git_emake \
+		install || \
+		die "make install failed"
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+	fi
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		if use doc ; then
+			docinto ${d}/html
+			dodoc Documentation${d}*.html
+		fi
+	done
+	docinto /
+	# Upstream does not ship this pre-built :-(
+	use doc && doinfo Documentation/{git,gitman}.info
+
+	newbashcomp contrib/completion/git-completion.bash ${PN}
+	bashcomp_alias git gitk
+	# Not really a bash-completion file (bug #477920)
+	# but still needed uncompressed (bug #507480)
+	insinto /usr/share/${PN}
+	doins contrib/completion/git-prompt.sh
+
+	if use emacs ; then
+		elisp-install ${PN} contrib/emacs/git.{el,elc}
+		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
+		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	#dobin contrib/fast-import/git-p4 # Moved upstream
+	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
+	newbin contrib/fast-import/import-tars.perl import-tars
+	exeinto /usr/libexec/git-core/
+	newexe contrib/git-resurrect.sh git-resurrect
+
+	# git-subtree
+	cd "${S}"/contrib/subtree
+	git_emake install || die "Failed to emake install git-subtree"
+	if use doc ; then
+		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
+	fi
+	newdoc README README.git-subtree
+	dodoc git-subtree.txt
+	cd "${S}"
+
+	if use mediawiki ; then
+		cd "${S}"/contrib/mw-to-git
+		git_emake install
+		cd "${S}"
+	fi
+
+	# diff-highlight
+	dobin contrib/diff-highlight/diff-highlight
+	newdoc contrib/diff-highlight/README README.diff-highlight
+
+	# git-jump
+	exeinto /usr/libexec/git-core/
+	doexe contrib/git-jump/git-jump
+	newdoc contrib/git-jump/README git-jump.txt
+
+	# git-contacts
+	exeinto /usr/libexec/git-core/
+	doexe contrib/contacts/git-contacts
+	dodoc contrib/contacts/git-contacts.txt
+
+	if use gnome-keyring ; then
+		cd "${S}"/contrib/credential/libsecret
+		dobin git-credential-libsecret
+	fi
+
+	if use subversion ; then
+		cd "${S}"/contrib/svn-fe
+		dobin svn-fe
+		dodoc svn-fe.txt
+		if use doc ; then
+			doman svn-fe.1
+			docinto html
+			dodoc svn-fe.html
+		fi
+		cd "${S}"
+	fi
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# completion - installed above
+	# diff-highlight - done above
+	# emacs - installed above
+	# examples - these are stuff that is not used in Git anymore actually
+	# git-jump - done above
+	# gitview - installed above
+	# p4import - excluded because fast-import has a better one
+	# patches - stuff the Git guys made to go upstream to other places
+	# persistent-https - TODO
+	# mw-to-git - TODO
+	# subtree - build  seperately
+	# svnimport - use git-svn
+	# thunderbird-patch-inline - fixes thunderbird
+	local contrib_objects=(
+		buildsystems
+		fast-import
+		hg-to-git
+		hooks
+		remotes2config.sh
+		rerere-train.sh
+		stats
+		workdir
+	)
+	for i in "${contrib_objects[@]}" ; do
+		cp -rf \
+			"${S}"/contrib/${i} \
+			"${ED}"/usr/share/${PN}/contrib \
+			|| die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		# We used to install in /usr/share/${PN}/gitweb
+		# but upstream installs in /usr/share/gitweb
+		# so we will install a symlink and use their location for compat with other
+		# distros
+		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		for d in "${ED}"/usr/lib{64,}/perl5/ ; do
+			if test -d "$d" ; then find "$d" \
+				-name .packlist \
+				-delete || die
+			fi
+		done
+	else
+		rm -rf "${ED}"/usr/share/gitweb
+	fi
+
+	if ! use subversion ; then
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	if use !prefix ; then
+		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
+		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
+		systemd_dounit "${FILESDIR}/git-daemon.socket"
+	fi
+
+	perl_delete_localpod
+
+	# Remove disabled linguas
+	# we could remove sources in src_prepare, but install does not
+	# handle missing locale dir well
+	rm_loc() {
+		if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
+			rm -r "${ED}/usr/share/locale/${1}" || die
+		fi
+	}
+	l10n_for_each_disabled_locale_do rm_loc
+}
+
+src_test() {
+	local disabled=""
+	local tests_cvs="t9200-git-cvsexportcommit.sh \
+					t9400-git-cvsserver-server.sh \
+					t9401-git-cvsserver-crlf.sh \
+					t9402-git-cvsserver-refs.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh \
+					t9604-cvsimport-timestamps.sh"
+	local tests_perl="t3701-add-interactive.sh \
+					t5502-quickfetch.sh \
+					t5512-ls-remote.sh \
+					t5520-pull.sh \
+					t7106-reset-unborn-branch.sh \
+					t7501-commit.sh"
+	# Bug #225601 - t0004 is not suitable for root perm
+	# Bug #219839 - t1004 is not suitable for root perm
+	# t0001-init.sh - check for init notices EPERM*  fails
+	local tests_nonroot="t0001-init.sh \
+		t0004-unwritable.sh \
+		t0070-fundamental.sh \
+		t1004-read-tree-m-u-wf.sh \
+		t3700-add.sh \
+		t7300-clean.sh"
+	# t9100 still fails with symlinks in SVN 1.7
+	local test_svn="t9100-git-svn-basic.sh"
+
+	# Unzip is used only for the testcase code, not by any normal parts of Git.
+	if ! has_version app-arch/unzip ; then
+		einfo "Disabling tar-tree tests"
+		disabled+=" t5000-tar-tree.sh"
+	fi
+
+	cvs=0
+	use cvs && let cvs=$cvs+1
+	if [[ ${EUID} -eq 0 ]]; then
+		if [[ $cvs -eq 1 ]]; then
+			ewarn "Skipping CVS tests because CVS does not work as root!"
+			ewarn "You should retest with FEATURES=userpriv!"
+			disabled+=" ${tests_cvs}"
+		fi
+		einfo "Skipping other tests that require being non-root"
+		disabled+=" ${tests_nonroot}"
+	else
+		[[ $cvs -gt 0 ]] && \
+			has_version dev-vcs/cvs && \
+			let cvs=$cvs+1
+		[[ $cvs -gt 1 ]] && \
+			has_version "dev-vcs/cvs[server]" && \
+			let cvs=$cvs+1
+		if [[ $cvs -lt 3 ]]; then
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+			disabled+=" ${tests_cvs}"
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled+=" ${tests_perl}"
+	fi
+
+	einfo "Disabling tests that fail with SVN 1.7"
+	disabled+=" ${test_svn}"
+
+	# Reset all previously disabled tests
+	cd "${S}/t"
+	for i in *.sh.DISABLED ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+	done
+	einfo "Disabled tests:"
+	for i in ${disabled} ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
+	done
+
+	# Avoid the test system removing the results because we want them ourselves
+	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
+		-i "${S}"/t/Makefile
+
+	# Clean old results first, must always run
+	cd "${S}/t"
+	nonfatal git_emake clean
+
+	# Now run the tests, keep going if we hit an error, and don't terminate on
+	# failure
+	cd "${S}"
+	einfo "Start test run"
+	#MAKEOPTS=-j1
+	nonfatal git_emake --keep-going test
+	rc=$?
+
+	# Display nice results, now print the results
+	cd "${S}/t"
+	nonfatal git_emake aggregate-results
+
+	# And bail if there was a problem
+	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	elog "Please read /usr/share/bash-completion/git for Git bash command completion"
+	elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
+	elog "Note that the prompt bash code is now in that separate script"
+	elog "These additional scripts need some dependencies:"
+	echo
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-instaweb \
+		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
+	echo
+	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/git/git-2.18.0.ebuild b/dev-vcs/git/git-2.18.0.ebuild
index 186cdcff1c84..2ed7063c51c7 100644
--- a/dev-vcs/git/git-2.18.0.ebuild
+++ b/dev-vcs/git/git-2.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
@@ -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/git/git-2.18.1.ebuild b/dev-vcs/git/git-2.18.1.ebuild
new file mode 100644
index 000000000000..2f2de4ae7ec0
--- /dev/null
+++ b/dev-vcs/git/git-2.18.1.ebuild
@@ -0,0 +1,715 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python2_7 )
+PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
+if [[ ${PV} == *9999 ]]; then
+	SCM="git-r3"
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
+	# See https://git-scm.com/docs/gitworkflows#_graduation
+	# In order of stability:
+	# 9999-r0: maint
+	# 9999-r1: master
+	# 9999-r2: next
+	# 9999-r3: pu
+	case "${PVR}" in
+		9999) EGIT_BRANCH=maint ;;
+		9999-r1) EGIT_BRANCH=master ;;
+		9999-r2) EGIT_BRANCH=next;;
+		9999-r3) EGIT_BRANCH=pu ;;
+	esac
+fi
+
+inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
+HOMEPAGE="https://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI_SUFFIX="xz"
+	SRC_URI_KORG="mirror://kernel/software/scm/git"
+	[[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
+	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			doc? (
+			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			)"
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+	gnome-keyring? ( app-crypt/libsecret )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+	sys-libs/zlib
+	pcre? (
+		pcre-jit? ( dev-libs/libpcre2[jit(+)] )
+		!pcre-jit? ( dev-libs/libpcre )
+	)
+	perl? ( dev-lang/perl:=[-build(-)] )
+	tk? ( dev-lang/tk:0= )
+	curl? (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	emacs? ( virtual/emacs )
+"
+
+RDEPEND="${CDEPEND}
+	gpg? ( app-crypt/gnupg )
+	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_DEPS} )
+"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+DEPEND="${CDEPEND}
+	doc? (
+		app-text/asciidoc
+		app-text/docbook2X
+		sys-apps/texinfo
+		app-text/xmlto
+	)
+	nls? ( sys-devel/gettext )
+	test? (	app-crypt/gnupg	)"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+	DEPEND="${DEPEND}
+		app-text/asciidoc"
+fi
+
+SITEFILE="50${PN}-gentoo.el"
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	cgi? ( perl )
+	cvs? ( perl )
+	mediawiki? ( perl )
+	mediawiki-experimental? ( mediawiki )
+	subversion? ( perl )
+	webdav? ( curl )
+	pcre-jit? ( pcre )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+PATCHES=(
+	# bug #350330 - automagic CVS when we don't want it is bad.
+	"${FILESDIR}"/git-2.18.0_rc1-optional-cvs.patch
+
+	"${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
+
+	# Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
+	"${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
+)
+
+pkg_setup() {
+	if use subversion && has_version "dev-vcs/subversion[dso]"; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned."
+	fi
+	if use python ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+	local myopts=(
+		ASCIIDOC_NO_ROFF=YesPlease
+		$(usex cvs '' NO_CVS=YesPlease)
+		$(usex elibc_musl NO_REGEX=YesPlease '')
+		$(usex iconv '' NO_ICONV=YesPlease)
+		$(usex nls '' NO_GETTEXT=YesPlease)
+		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
+		$(usex python '' NO_PYTHON=YesPlease)
+		$(usex subversion '' NO_SVN_TESTS=YesPlease)
+		$(usex threads THREADED_DELTA_SEARCH=YesPlease NO_PTHREAD=YesPlease)
+		$(usex tk '' NO_TCLTK=YesPlease)
+	)
+
+	if use blksha1 ; then
+		myopts+=( BLK_SHA1=YesPlease )
+	elif use ppcsha1 ; then
+		myopts+=( PPC_SHA1=YesPlease )
+	fi
+
+	if use curl ; then
+		use webdav || myopts+=( NO_EXPAT=YesPlease )
+	else
+		myopts+=( NO_CURL=YesPlease )
+	fi
+
+	# broken assumptions, because of static build system ...
+	myopts+=(
+		NO_FINK=YesPlease
+		NO_DARWIN_PORTS=YesPlease
+		INSTALL=install
+		TAR=tar
+		SHELL_PATH="${EPREFIX}/bin/sh"
+		SANE_TOOL_PATH=
+		OLD_ICONV=
+		NO_EXTERNAL_GREP=
+	)
+
+	# For svn-fe
+	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
+
+	# can't define this to null, since the entire makefile depends on it
+	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
+
+	if use pcre; then
+		if use pcre-jit; then
+			myopts+=( USE_LIBPCRE2=YesPlease )
+			extlibs+=" -lpcre2-8"
+		else
+			myopts+=(
+				USE_LIBPCRE1=YesPlease
+				NO_LIBPCRE1_JIT=YesPlease
+			)
+			extlibs+=" -lpcre"
+		fi
+	fi
+# Disabled until ~m68k-mint can be keyworded again
+#	if [[ ${CHOST} == *-mint* ]] ; then
+#		myopts+=(
+#			NO_MMAP=YesPlease
+#			NO_IPV6=YesPlease
+#			NO_STRLCPY=YesPlease
+#			NO_MEMMEM=YesPlease
+#			NO_MKDTEMP=YesPlease
+#			NO_MKSTEMPS=YesPlease
+#		)
+#	fi
+	if [[ ${CHOST} == ia64-*-hpux* ]]; then
+		myopts+=( NO_NSEC=YesPlease )
+	fi
+	if [[ ${CHOST} == *-*-aix* ]]; then
+		myopts+=( NO_FNMATCH_CASEFOLD=YesPlease )
+	fi
+	if [[ ${CHOST} == *-solaris* ]]; then
+		myopts+=(
+			NEEDS_LIBICONV=YesPlease
+			HAVE_CLOCK_MONOTONIC=1
+		)
+		grep -q getdelim "${ROOT}"/usr/include/stdio.h && \
+			myopts+=( HAVE_GETDELIM=1 )
+	fi
+
+	has_version '>=app-text/asciidoc-8.0' \
+		&& myopts+=( ASCIIDOC8=YesPlease )
+
+	# Bug 290465:
+	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+	[[ "${CHOST}" == *-uclibc* ]] && \
+		myopts+=( NO_NSEC=YesPlease )
+
+	export MY_MAKEOPTS="${myopts[@]}"
+	export EXTLIBS="${extlibs}"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+		cd "${S}" || die
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		if use doc ; then
+			pushd "${S}"/Documentation &>/dev/null || die
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			popd &>/dev/null || die
+		fi
+	else
+		git-r3_src_unpack
+		#cp "${FILESDIR}"/GIT-VERSION-GEN .
+	fi
+
+}
+
+src_prepare() {
+	# add experimental patches to improve mediawiki support
+	# see patches for origin
+	if use mediawiki-experimental ; then
+		PATCHES+=(
+			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
+		)
+	fi
+
+	default
+
+	sed -i \
+		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
+		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
+		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		Makefile contrib/svn-fe/Makefile || die
+
+	# Fix docbook2texi command
+	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+		Documentation/Makefile || die
+
+	# Fix git-subtree missing DESTDIR
+	sed -i \
+		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
+		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
+		contrib/subtree/Makefile || die
+}
+
+git_emake() {
+	# bug #320647: PYTHON_PATH
+	local PYTHON_PATH=""
+	use python && PYTHON_PATH="${PYTHON}"
+	emake ${MY_MAKEOPTS} \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		perllibdir="$(perl_get_raw_vendorlib)" \
+		sysconfdir="${EPREFIX}"/etc \
+		DESTDIR="${D}" \
+		GIT_TEST_OPTS="--no-color" \
+		OPTAR="$(tc-getAR)" \
+		OPTCC="$(tc-getCC)" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		PERL_PATH="${EPREFIX}/usr/bin/perl" \
+		PERL_MM_OPT="" \
+		PYTHON_PATH="${PYTHON_PATH}" \
+		V=1 \
+		"$@"
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	git_emake || die "emake failed"
+
+	if use emacs ; then
+		elisp-compile contrib/emacs/git{,-blame}.el
+	fi
+
+	if use perl && use cgi ; then
+		git_emake \
+			gitweb \
+			|| die "emake gitweb (cgi) failed"
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		pushd contrib/credential/osxkeychain &>/dev/null || die
+		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
+			|| die "emake credential-osxkeychain"
+		popd &>/dev/null || die
+	fi
+
+	pushd Documentation &>/dev/null || die
+	if [[ ${PV} == *9999 ]] ; then
+		git_emake man \
+			|| die "emake man failed"
+		if use doc ; then
+			git_emake info html \
+				|| die "emake info html failed"
+		fi
+	else
+		if use doc ; then
+			git_emake info \
+				|| die "emake info html failed"
+		fi
+	fi
+	popd &>/dev/null || die
+
+	if use subversion ; then
+		pushd contrib/svn-fe &>/dev/null || die
+		# by defining EXTLIBS we override the detection for libintl and
+		# libiconv, bug #516168
+		local nlsiconv=
+		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
+		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
+		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
+		if use doc ; then
+			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
+		fi
+		popd &>/dev/null || die
+	fi
+
+	if use gnome-keyring ; then
+		pushd contrib/credential/libsecret &>/dev/null || die
+		git_emake || die "emake git-credential-libsecret failed"
+		popd &>/dev/null || die
+	fi
+
+	pushd contrib/subtree &>/dev/null || die
+	git_emake
+	use doc && git_emake doc
+	popd &>/dev/null || die
+
+	pushd contrib/diff-highlight &>/dev/null || die
+	git_emake
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		pushd contrib/mw-to-git &>/dev/null || die
+		git_emake
+		popd &>/dev/null || die
+
+	fi
+}
+
+src_install() {
+	git_emake \
+		install || \
+		die "make install failed"
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+	fi
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		if use doc ; then
+			docinto ${d}/html
+			dodoc Documentation${d}*.html
+		fi
+	done
+	docinto /
+	# Upstream does not ship this pre-built :-(
+	use doc && doinfo Documentation/{git,gitman}.info
+
+	newbashcomp contrib/completion/git-completion.bash ${PN}
+	bashcomp_alias git gitk
+	# Not really a bash-completion file (bug #477920)
+	# but still needed uncompressed (bug #507480)
+	insinto /usr/share/${PN}
+	doins contrib/completion/git-prompt.sh
+
+	if use emacs ; then
+		elisp-install ${PN} contrib/emacs/git.{el,elc}
+		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
+		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	#dobin contrib/fast-import/git-p4 # Moved upstream
+	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
+	newbin contrib/fast-import/import-tars.perl import-tars
+	exeinto /usr/libexec/git-core/
+	newexe contrib/git-resurrect.sh git-resurrect
+
+	# git-subtree
+	pushd contrib/subtree &>/dev/null || die
+	git_emake install || die "Failed to emake install git-subtree"
+	if use doc ; then
+		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
+	fi
+	newdoc README README.git-subtree
+	dodoc git-subtree.txt
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		pushd contrib/mw-to-git &>/dev/null || die
+		git_emake install
+		popd &>/dev/null || die
+	fi
+
+	# diff-highlight
+	dobin contrib/diff-highlight/diff-highlight
+	newdoc contrib/diff-highlight/README README.diff-highlight
+
+	# git-jump
+	exeinto /usr/libexec/git-core/
+	doexe contrib/git-jump/git-jump
+	newdoc contrib/git-jump/README git-jump.txt
+
+	# git-contacts
+	exeinto /usr/libexec/git-core/
+	doexe contrib/contacts/git-contacts
+	dodoc contrib/contacts/git-contacts.txt
+
+	if use gnome-keyring ; then
+		pushd contrib/credential/libsecret &>/dev/null || die
+		dobin git-credential-libsecret
+		popd &>/dev/null || die
+	fi
+
+	if use subversion ; then
+		pushd contrib/svn-fe &>/dev/null || die
+		dobin svn-fe
+		dodoc svn-fe.txt
+		if use doc ; then
+			doman svn-fe.1
+			docinto html
+			dodoc svn-fe.html
+		fi
+		popd &>/dev/null || die
+	fi
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# completion - installed above
+	# diff-highlight - done above
+	# emacs - installed above
+	# examples - these are stuff that is not used in Git anymore actually
+	# git-jump - done above
+	# gitview - installed above
+	# p4import - excluded because fast-import has a better one
+	# patches - stuff the Git guys made to go upstream to other places
+	# persistent-https - TODO
+	# mw-to-git - TODO
+	# subtree - build  seperately
+	# svnimport - use git-svn
+	# thunderbird-patch-inline - fixes thunderbird
+	local contrib_objects=(
+		buildsystems
+		fast-import
+		hg-to-git
+		hooks
+		remotes2config.sh
+		rerere-train.sh
+		stats
+		workdir
+	)
+	for i in "${contrib_objects[@]}" ; do
+		cp -rf \
+			"${S}"/contrib/${i} \
+			"${ED%/}"/usr/share/${PN}/contrib \
+			|| die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		# We used to install in /usr/share/${PN}/gitweb
+		# but upstream installs in /usr/share/gitweb
+		# so we will install a symlink and use their location for compat with other
+		# distros
+		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do
+			if test -d "$d" ; then find "$d" \
+				-name .packlist \
+				-delete || die
+			fi
+		done
+	else
+		rm -rf "${ED%/}"/usr/share/gitweb
+	fi
+
+	if ! use subversion ; then
+		rm -f "${ED%/}"/usr/libexec/git-core/git-svn \
+			"${ED%/}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	if use !prefix ; then
+		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
+		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
+		systemd_dounit "${FILESDIR}/git-daemon.socket"
+	fi
+
+	perl_delete_localpod
+
+	# Remove disabled linguas
+	# we could remove sources in src_prepare, but install does not
+	# handle missing locale dir well
+	rm_loc() {
+		if [[ -e "${ED%/}/usr/share/locale/${1}" ]]; then
+			rm -r "${ED%/}/usr/share/locale/${1}" || die
+		fi
+	}
+	l10n_for_each_disabled_locale_do rm_loc
+}
+
+src_test() {
+	local disabled=()
+	local tests_cvs=(
+		t9200-git-cvsexportcommit.sh
+		t9400-git-cvsserver-server.sh
+		t9401-git-cvsserver-crlf.sh
+		t9402-git-cvsserver-refs.sh
+		t9600-cvsimport.sh
+		t9601-cvsimport-vendor-branch.sh
+		t9602-cvsimport-branches-tags.sh
+		t9603-cvsimport-patchsets.sh
+		t9604-cvsimport-timestamps.sh
+	)
+	local tests_perl=(
+		t3701-add-interactive.sh
+		t5502-quickfetch.sh
+		t5512-ls-remote.sh
+		t5520-pull.sh
+		t7106-reset-unborn-branch.sh
+		t7501-commit.sh
+	)
+	# Bug #225601 - t0004 is not suitable for root perm
+	# Bug #219839 - t1004 is not suitable for root perm
+	# t0001-init.sh - check for init notices EPERM*  fails
+	local tests_nonroot=(
+		t0001-init.sh
+		t0004-unwritable.sh
+		t0070-fundamental.sh
+		t1004-read-tree-m-u-wf.sh
+		t3700-add.sh
+		t7300-clean.sh
+	)
+	# t9100 still fails with symlinks in SVN 1.7
+	local test_svn=( t9100-git-svn-basic.sh )
+
+	# Unzip is used only for the testcase code, not by any normal parts of Git.
+	if ! has_version app-arch/unzip ; then
+		einfo "Disabling tar-tree tests"
+		disabled+=( t5000-tar-tree.sh )
+	fi
+
+	local cvs=0
+	use cvs && let cvs=${cvs}+1
+	if [[ ${EUID} -eq 0 ]]; then
+		if [[ ${cvs} -eq 1 ]]; then
+			ewarn "Skipping CVS tests because CVS does not work as root!"
+			ewarn "You should retest with FEATURES=userpriv!"
+			disabled+=( ${tests_cvs[@]} )
+		fi
+		einfo "Skipping other tests that require being non-root"
+		disabled+=( ${tests_nonroot[@]} )
+	else
+		[[ ${cvs} -gt 0 ]] && \
+			has_version dev-vcs/cvs && \
+			let cvs=${cvs}+1
+		[[ ${cvs} -gt 1 ]] && \
+			has_version "dev-vcs/cvs[server]" && \
+			let cvs=${cvs}+1
+		if [[ ${cvs} -lt 3 ]]; then
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+			disabled+=( ${tests_cvs[@]} )
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled+=( ${tests_perl[@]} )
+	fi
+
+	einfo "Disabling tests that fail with SVN 1.7"
+	disabled+=( ${test_svn[@]} )
+
+	# Reset all previously disabled tests
+	pushd t &>/dev/null || die
+	local i
+	for i in *.sh.DISABLED ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+	done
+	einfo "Disabled tests:"
+	for i in ${disabled[@]} ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
+	done
+
+	# Avoid the test system removing the results because we want them ourselves
+	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
+		-i Makefile || die
+
+	# Clean old results first, must always run
+	nonfatal git_emake clean
+	popd &>/dev/null || die
+
+	# Now run the tests, keep going if we hit an error, and don't terminate on
+	# failure
+	local rc
+	einfo "Start test run"
+	#MAKEOPTS=-j1
+	nonfatal git_emake --keep-going test
+	rc=$?
+
+	# Display nice results, now print the results
+	pushd t &>/dev/null || die
+	nonfatal git_emake aggregate-results
+
+	# And bail if there was a problem
+	[ ${rc} -eq 0 ] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	elog "Please read /usr/share/bash-completion/git for Git bash command completion"
+	elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
+	elog "Note that the prompt bash code is now in that separate script"
+	elog "These additional scripts need some dependencies:"
+	echo
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-instaweb \
+		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
+	echo
+	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/git/git-2.19.1.ebuild b/dev-vcs/git/git-2.19.1.ebuild
new file mode 100644
index 000000000000..f26b6776b942
--- /dev/null
+++ b/dev-vcs/git/git-2.19.1.ebuild
@@ -0,0 +1,706 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python2_7 )
+PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
+if [[ ${PV} == *9999 ]]; then
+	SCM="git-r3"
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
+	# See https://git-scm.com/docs/gitworkflows#_graduation
+	# In order of stability:
+	# 9999-r0: maint
+	# 9999-r1: master
+	# 9999-r2: next
+	# 9999-r3: pu
+	case "${PVR}" in
+		9999) EGIT_BRANCH=maint ;;
+		9999-r1) EGIT_BRANCH=master ;;
+		9999-r2) EGIT_BRANCH=next;;
+		9999-r3) EGIT_BRANCH=pu ;;
+	esac
+fi
+
+inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
+HOMEPAGE="https://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI_SUFFIX="xz"
+	SRC_URI_KORG="mirror://kernel/software/scm/git"
+	[[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
+	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			doc? (
+			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			)"
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+	gnome-keyring? ( app-crypt/libsecret )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+	sys-libs/zlib
+	pcre? (
+		pcre-jit? ( dev-libs/libpcre2[jit(+)] )
+		!pcre-jit? ( dev-libs/libpcre )
+	)
+	perl? ( dev-lang/perl:=[-build(-)] )
+	tk? ( dev-lang/tk:0= )
+	curl? (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	emacs? ( virtual/emacs )
+"
+
+RDEPEND="${CDEPEND}
+	gpg? ( app-crypt/gnupg )
+	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_DEPS} )
+"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+DEPEND="${CDEPEND}
+	doc? (
+		app-text/asciidoc
+		app-text/docbook2X
+		sys-apps/texinfo
+		app-text/xmlto
+	)
+	nls? ( sys-devel/gettext )
+	test? (	app-crypt/gnupg	)"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+	DEPEND="${DEPEND}
+		app-text/asciidoc"
+fi
+
+SITEFILE="50${PN}-gentoo.el"
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	cgi? ( perl )
+	cvs? ( perl )
+	mediawiki? ( perl )
+	mediawiki-experimental? ( mediawiki )
+	subversion? ( perl )
+	webdav? ( curl )
+	pcre-jit? ( pcre )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+PATCHES=(
+	# bug #350330 - automagic CVS when we don't want it is bad.
+	"${FILESDIR}"/git-2.18.0_rc1-optional-cvs.patch
+
+	"${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
+)
+
+pkg_setup() {
+	if use subversion && has_version "dev-vcs/subversion[dso]"; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned."
+	fi
+	if use python ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+	local myopts=(
+		ASCIIDOC_NO_ROFF=YesPlease
+		$(usex cvs '' NO_CVS=YesPlease)
+		$(usex elibc_musl NO_REGEX=YesPlease '')
+		$(usex iconv '' NO_ICONV=YesPlease)
+		$(usex nls '' NO_GETTEXT=YesPlease)
+		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
+		$(usex python '' NO_PYTHON=YesPlease)
+		$(usex subversion '' NO_SVN_TESTS=YesPlease)
+		$(usex threads THREADED_DELTA_SEARCH=YesPlease NO_PTHREAD=YesPlease)
+		$(usex tk '' NO_TCLTK=YesPlease)
+	)
+
+	if use blksha1 ; then
+		myopts+=( BLK_SHA1=YesPlease )
+	elif use ppcsha1 ; then
+		myopts+=( PPC_SHA1=YesPlease )
+	fi
+
+	if use curl ; then
+		use webdav || myopts+=( NO_EXPAT=YesPlease )
+	else
+		myopts+=( NO_CURL=YesPlease )
+	fi
+
+	# broken assumptions, because of static build system ...
+	myopts+=(
+		NO_FINK=YesPlease
+		NO_DARWIN_PORTS=YesPlease
+		INSTALL=install
+		TAR=tar
+		SHELL_PATH="${EPREFIX}/bin/sh"
+		SANE_TOOL_PATH=
+		OLD_ICONV=
+		NO_EXTERNAL_GREP=
+	)
+
+	# For svn-fe
+	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
+
+	# can't define this to null, since the entire makefile depends on it
+	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
+
+	if use pcre; then
+		if use pcre-jit; then
+			myopts+=( USE_LIBPCRE2=YesPlease )
+			extlibs+=" -lpcre2-8"
+		else
+			myopts+=(
+				USE_LIBPCRE1=YesPlease
+				NO_LIBPCRE1_JIT=YesPlease
+			)
+			extlibs+=" -lpcre"
+		fi
+	fi
+# Disabled until ~m68k-mint can be keyworded again
+#	if [[ ${CHOST} == *-mint* ]] ; then
+#		myopts+=(
+#			NO_MMAP=YesPlease
+#			NO_IPV6=YesPlease
+#			NO_STRLCPY=YesPlease
+#			NO_MEMMEM=YesPlease
+#			NO_MKDTEMP=YesPlease
+#			NO_MKSTEMPS=YesPlease
+#		)
+#	fi
+	if [[ ${CHOST} == ia64-*-hpux* ]]; then
+		myopts+=( NO_NSEC=YesPlease )
+	fi
+	if [[ ${CHOST} == *-*-aix* ]]; then
+		myopts+=( NO_FNMATCH_CASEFOLD=YesPlease )
+	fi
+	if [[ ${CHOST} == *-solaris* ]]; then
+		myopts+=(
+			NEEDS_LIBICONV=YesPlease
+			HAVE_CLOCK_MONOTONIC=1
+		)
+		grep -q getdelim "${ROOT}"/usr/include/stdio.h && \
+			myopts+=( HAVE_GETDELIM=1 )
+	fi
+
+	has_version '>=app-text/asciidoc-8.0' \
+		&& myopts+=( ASCIIDOC8=YesPlease )
+
+	# Bug 290465:
+	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+	[[ "${CHOST}" == *-uclibc* ]] && \
+		myopts+=( NO_NSEC=YesPlease )
+
+	export MY_MAKEOPTS="${myopts[@]}"
+	export EXTLIBS="${extlibs}"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+		cd "${S}" || die
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		if use doc ; then
+			pushd "${S}"/Documentation &>/dev/null || die
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			popd &>/dev/null || die
+		fi
+	else
+		git-r3_src_unpack
+		#cp "${FILESDIR}"/GIT-VERSION-GEN .
+	fi
+
+}
+
+src_prepare() {
+	# add experimental patches to improve mediawiki support
+	# see patches for origin
+	if use mediawiki-experimental ; then
+		PATCHES+=(
+			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
+		)
+	fi
+
+	default
+
+	sed -i \
+		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
+		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
+		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		Makefile contrib/svn-fe/Makefile || die
+
+	# Fix docbook2texi command
+	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+		Documentation/Makefile || die
+}
+
+git_emake() {
+	# bug #320647: PYTHON_PATH
+	local PYTHON_PATH=""
+	use python && PYTHON_PATH="${PYTHON}"
+	emake ${MY_MAKEOPTS} \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		perllibdir="$(perl_get_raw_vendorlib)" \
+		sysconfdir="${EPREFIX}"/etc \
+		DESTDIR="${D}" \
+		GIT_TEST_OPTS="--no-color" \
+		OPTAR="$(tc-getAR)" \
+		OPTCC="$(tc-getCC)" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		PERL_PATH="${EPREFIX}/usr/bin/perl" \
+		PERL_MM_OPT="" \
+		PYTHON_PATH="${PYTHON_PATH}" \
+		V=1 \
+		"$@"
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	git_emake || die "emake failed"
+
+	if use emacs ; then
+		elisp-compile contrib/emacs/git{,-blame}.el
+	fi
+
+	if use perl && use cgi ; then
+		git_emake \
+			gitweb \
+			|| die "emake gitweb (cgi) failed"
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		pushd contrib/credential/osxkeychain &>/dev/null || die
+		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
+			|| die "emake credential-osxkeychain"
+		popd &>/dev/null || die
+	fi
+
+	pushd Documentation &>/dev/null || die
+	if [[ ${PV} == *9999 ]] ; then
+		git_emake man \
+			|| die "emake man failed"
+		if use doc ; then
+			git_emake info html \
+				|| die "emake info html failed"
+		fi
+	else
+		if use doc ; then
+			git_emake info \
+				|| die "emake info html failed"
+		fi
+	fi
+	popd &>/dev/null || die
+
+	if use subversion ; then
+		pushd contrib/svn-fe &>/dev/null || die
+		# by defining EXTLIBS we override the detection for libintl and
+		# libiconv, bug #516168
+		local nlsiconv=
+		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
+		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
+		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
+		if use doc ; then
+			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
+		fi
+		popd &>/dev/null || die
+	fi
+
+	if use gnome-keyring ; then
+		pushd contrib/credential/libsecret &>/dev/null || die
+		git_emake || die "emake git-credential-libsecret failed"
+		popd &>/dev/null || die
+	fi
+
+	pushd contrib/subtree &>/dev/null || die
+	git_emake
+	use doc && git_emake doc
+	popd &>/dev/null || die
+
+	pushd contrib/diff-highlight &>/dev/null || die
+	git_emake
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		pushd contrib/mw-to-git &>/dev/null || die
+		git_emake
+		popd &>/dev/null || die
+
+	fi
+}
+
+src_install() {
+	git_emake \
+		install || \
+		die "make install failed"
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+	fi
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		if use doc ; then
+			docinto ${d}/html
+			dodoc Documentation${d}*.html
+		fi
+	done
+	docinto /
+	# Upstream does not ship this pre-built :-(
+	use doc && doinfo Documentation/{git,gitman}.info
+
+	newbashcomp contrib/completion/git-completion.bash ${PN}
+	bashcomp_alias git gitk
+	# Not really a bash-completion file (bug #477920)
+	# but still needed uncompressed (bug #507480)
+	insinto /usr/share/${PN}
+	doins contrib/completion/git-prompt.sh
+
+	if use emacs ; then
+		elisp-install ${PN} contrib/emacs/git.{el,elc}
+		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
+		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	#dobin contrib/fast-import/git-p4 # Moved upstream
+	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
+	newbin contrib/fast-import/import-tars.perl import-tars
+	exeinto /usr/libexec/git-core/
+	newexe contrib/git-resurrect.sh git-resurrect
+
+	# git-subtree
+	pushd contrib/subtree &>/dev/null || die
+	git_emake install || die "Failed to emake install git-subtree"
+	if use doc ; then
+		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
+	fi
+	newdoc README README.git-subtree
+	dodoc git-subtree.txt
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		pushd contrib/mw-to-git &>/dev/null || die
+		git_emake install
+		popd &>/dev/null || die
+	fi
+
+	# diff-highlight
+	dobin contrib/diff-highlight/diff-highlight
+	newdoc contrib/diff-highlight/README README.diff-highlight
+
+	# git-jump
+	exeinto /usr/libexec/git-core/
+	doexe contrib/git-jump/git-jump
+	newdoc contrib/git-jump/README git-jump.txt
+
+	# git-contacts
+	exeinto /usr/libexec/git-core/
+	doexe contrib/contacts/git-contacts
+	dodoc contrib/contacts/git-contacts.txt
+
+	if use gnome-keyring ; then
+		pushd contrib/credential/libsecret &>/dev/null || die
+		dobin git-credential-libsecret
+		popd &>/dev/null || die
+	fi
+
+	if use subversion ; then
+		pushd contrib/svn-fe &>/dev/null || die
+		dobin svn-fe
+		dodoc svn-fe.txt
+		if use doc ; then
+			doman svn-fe.1
+			docinto html
+			dodoc svn-fe.html
+		fi
+		popd &>/dev/null || die
+	fi
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# completion - installed above
+	# diff-highlight - done above
+	# emacs - installed above
+	# examples - these are stuff that is not used in Git anymore actually
+	# git-jump - done above
+	# gitview - installed above
+	# p4import - excluded because fast-import has a better one
+	# patches - stuff the Git guys made to go upstream to other places
+	# persistent-https - TODO
+	# mw-to-git - TODO
+	# subtree - build  seperately
+	# svnimport - use git-svn
+	# thunderbird-patch-inline - fixes thunderbird
+	local contrib_objects=(
+		buildsystems
+		fast-import
+		hg-to-git
+		hooks
+		remotes2config.sh
+		rerere-train.sh
+		stats
+		workdir
+	)
+	for i in "${contrib_objects[@]}" ; do
+		cp -rf \
+			"${S}"/contrib/${i} \
+			"${ED%/}"/usr/share/${PN}/contrib \
+			|| die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		# We used to install in /usr/share/${PN}/gitweb
+		# but upstream installs in /usr/share/gitweb
+		# so we will install a symlink and use their location for compat with other
+		# distros
+		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do
+			if test -d "$d" ; then find "$d" \
+				-name .packlist \
+				-delete || die
+			fi
+		done
+	else
+		rm -rf "${ED%/}"/usr/share/gitweb
+	fi
+
+	if ! use subversion ; then
+		rm -f "${ED%/}"/usr/libexec/git-core/git-svn \
+			"${ED%/}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	if use !prefix ; then
+		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
+		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
+		systemd_dounit "${FILESDIR}/git-daemon.socket"
+	fi
+
+	perl_delete_localpod
+
+	# Remove disabled linguas
+	# we could remove sources in src_prepare, but install does not
+	# handle missing locale dir well
+	rm_loc() {
+		if [[ -e "${ED%/}/usr/share/locale/${1}" ]]; then
+			rm -r "${ED%/}/usr/share/locale/${1}" || die
+		fi
+	}
+	l10n_for_each_disabled_locale_do rm_loc
+}
+
+src_test() {
+	local disabled=()
+	local tests_cvs=(
+		t9200-git-cvsexportcommit.sh
+		t9400-git-cvsserver-server.sh
+		t9401-git-cvsserver-crlf.sh
+		t9402-git-cvsserver-refs.sh
+		t9600-cvsimport.sh
+		t9601-cvsimport-vendor-branch.sh
+		t9602-cvsimport-branches-tags.sh
+		t9603-cvsimport-patchsets.sh
+		t9604-cvsimport-timestamps.sh
+	)
+	local tests_perl=(
+		t3701-add-interactive.sh
+		t5502-quickfetch.sh
+		t5512-ls-remote.sh
+		t5520-pull.sh
+		t7106-reset-unborn-branch.sh
+		t7501-commit.sh
+	)
+	# Bug #225601 - t0004 is not suitable for root perm
+	# Bug #219839 - t1004 is not suitable for root perm
+	# t0001-init.sh - check for init notices EPERM*  fails
+	local tests_nonroot=(
+		t0001-init.sh
+		t0004-unwritable.sh
+		t0070-fundamental.sh
+		t1004-read-tree-m-u-wf.sh
+		t3700-add.sh
+		t7300-clean.sh
+	)
+	# t9100 still fails with symlinks in SVN 1.7
+	local test_svn=( t9100-git-svn-basic.sh )
+
+	# Unzip is used only for the testcase code, not by any normal parts of Git.
+	if ! has_version app-arch/unzip ; then
+		einfo "Disabling tar-tree tests"
+		disabled+=( t5000-tar-tree.sh )
+	fi
+
+	local cvs=0
+	use cvs && let cvs=${cvs}+1
+	if [[ ${EUID} -eq 0 ]]; then
+		if [[ ${cvs} -eq 1 ]]; then
+			ewarn "Skipping CVS tests because CVS does not work as root!"
+			ewarn "You should retest with FEATURES=userpriv!"
+			disabled+=( ${tests_cvs[@]} )
+		fi
+		einfo "Skipping other tests that require being non-root"
+		disabled+=( ${tests_nonroot[@]} )
+	else
+		[[ ${cvs} -gt 0 ]] && \
+			has_version dev-vcs/cvs && \
+			let cvs=${cvs}+1
+		[[ ${cvs} -gt 1 ]] && \
+			has_version "dev-vcs/cvs[server]" && \
+			let cvs=${cvs}+1
+		if [[ ${cvs} -lt 3 ]]; then
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+			disabled+=( ${tests_cvs[@]} )
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled+=( ${tests_perl[@]} )
+	fi
+
+	einfo "Disabling tests that fail with SVN 1.7"
+	disabled+=( ${test_svn[@]} )
+
+	# Reset all previously disabled tests
+	pushd t &>/dev/null || die
+	local i
+	for i in *.sh.DISABLED ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+	done
+	einfo "Disabled tests:"
+	for i in ${disabled[@]} ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
+	done
+
+	# Avoid the test system removing the results because we want them ourselves
+	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
+		-i Makefile || die
+
+	# Clean old results first, must always run
+	nonfatal git_emake clean
+	popd &>/dev/null || die
+
+	# Now run the tests, keep going if we hit an error, and don't terminate on
+	# failure
+	local rc
+	einfo "Start test run"
+	#MAKEOPTS=-j1
+	nonfatal git_emake --keep-going test
+	rc=$?
+
+	# Display nice results, now print the results
+	pushd t &>/dev/null || die
+	nonfatal git_emake aggregate-results
+
+	# And bail if there was a problem
+	[ ${rc} -eq 0 ] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	elog "Please read /usr/share/bash-completion/git for Git bash command completion"
+	elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
+	elog "Note that the prompt bash code is now in that separate script"
+	elog "These additional scripts need some dependencies:"
+	echo
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-instaweb \
+		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
+	echo
+	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 040d6264489c..5160608b7ef5 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -7,7 +7,7 @@ DIST mercurial-4.7.1.tar.gz 6480135 BLAKE2B de34cdd34d5fa2a6f4e1f24730c99b5764b9
 DIST mercurial-4.7.tar.gz 6476268 BLAKE2B e13458729f06a2516e885abf767989e8df7f3cc743f7f57aa44ca41c6c2c4542a28e6172a7e109395fb76057afc04c2318b10f8b21ae90cb5c9efe6188da0483 SHA512 a08dfc4e296b5d162097769ab38ab85b7c5de16710bce0b6dce2a39f56cb517455c0ed634f689d07e9bd082fb7641501b7da51963844aee7ab28233cf721dec8
 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 3627 BLAKE2B e79df29d0ad4e456659c4c512d886e3ec280bf028d0ab0284341af1afde6007fba4de660521fd2233b51cbfd0a86a304e83f16cd58f4e0fdf307dc14e48c00d6 SHA512 b5f9c365852750077c263727674bbba1a2cd9fe2d384e5063244fa33592e6254a48d5da382845cd4d845c712d7fee37f24e4ae3eb16710cf914afe7d35588d79
+EBUILD mercurial-4.7.1-r1.ebuild 3632 BLAKE2B 6b61aea5806ba482aeab755dfd0630113bfbdbed7cf47920d9b82c10a3ee28bae44e1e47736ded7f66350354a449a33ecd01dea1c5a489a318602061de31b2e5 SHA512 9454a4876d4f284a4400e12c4234401a703d00c30753ca771b0f605c948e47267ee98bc95d7c760b9a71d4c0befdd2fdad5f329f78ff26e9919c3ec0247289ef
 EBUILD mercurial-4.7.1.ebuild 3493 BLAKE2B 9145b0af45da7e9ec4f78e470928a77f0a6aa553283873e406a07940221d386aa95b4b43c0c1a79930d447fd215bcdf8422494e1e6e4f94bce8399d363050011 SHA512 00baba63605300fa052f578186a2e061d98058b59d75b2ed5394af398c8afa86209f450612ea3d39bc3da17111dffea5bd6bb02ddcd21d47f32dc0ec86f937a2
 EBUILD mercurial-4.7.ebuild 3493 BLAKE2B 9145b0af45da7e9ec4f78e470928a77f0a6aa553283873e406a07940221d386aa95b4b43c0c1a79930d447fd215bcdf8422494e1e6e4f94bce8399d363050011 SHA512 00baba63605300fa052f578186a2e061d98058b59d75b2ed5394af398c8afa86209f450612ea3d39bc3da17111dffea5bd6bb02ddcd21d47f32dc0ec86f937a2
 EBUILD mercurial-9999.ebuild 4131 BLAKE2B 55328bbb7ccca04843b595d18c44dbbf5a51e4808a4e9d517355c38f89270551017fdeca45471972210e7246aa970dfa4ae4f5951cd4ff5d33e9ae696ef45b41 SHA512 0f6ee4a02c89c9e08e0a18e1f11169836eb336cf18af01df22d0a8b189c8fa61f0de5fd0b28105f83df55b23f840ad4ea934fac779c64ba5156c042106169c08
diff --git a/dev-vcs/mercurial/mercurial-4.7.1-r1.ebuild b/dev-vcs/mercurial/mercurial-4.7.1-r1.ebuild
index 6bf897f16bfa..b831a8157e2e 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 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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"
 IUSE="bugzilla emacs gpg test tk"
 
 RDEPEND="app-misc/ca-certificates
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 707fa5c59dac..78505268f5e9 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/chromium-2.eclass b/eclass/chromium-2.eclass
index 712e44afc31d..c9cfe5acebee 100644
--- a/eclass/chromium-2.eclass
+++ b/eclass/chromium-2.eclass
@@ -106,8 +106,7 @@ chromium_pkg_die() {
 	fi
 
 	# Prevent user problems like bug #348235.
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
+	if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
 		ewarn
 		ewarn "You have enabled debug info (i.e. -g or -ggdb in your CFLAGS/CXXFLAGS)."
 		ewarn "This produces very large build files causes the linker to consume large"
@@ -116,7 +115,6 @@ chromium_pkg_die() {
 		ewarn "Please try removing -g{,gdb} before reporting a bug."
 		ewarn
 	fi
-	eshopts_pop
 
 	# ccache often causes bogus compile failures, especially when the cache gets
 	# corrupted.
diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass
index b158e345d166..98ec0ac8dabe 100644
--- a/eclass/linux-info.eclass
+++ b/eclass/linux-info.eclass
@@ -548,13 +548,22 @@ get_version() {
 		return 1
 	fi
 
+	[ -d "${OUTPUT_DIR}" ] && KV_OUT_DIR="${OUTPUT_DIR}"
+	if [ -n "${KV_OUT_DIR}" ];
+	then
+		qeinfo "Found kernel object directory:"
+		qeinfo "    ${KV_OUT_DIR}"
+	fi
+	# and if we STILL have not got it, then we better just set it to KV_DIR
+	KV_OUT_DIR="${KV_OUT_DIR:-${KV_DIR}}"
+
 	# Grab the kernel release from the output directory.
 	# TODO: we MUST detect kernel.release being out of date, and 'return 1' from
 	# this function.
-	if [ -s "${KV_DIR}"/include/config/kernel.release ]; then
-		KV_LOCAL=$(<"${KV_DIR}"/include/config/kernel.release)
-	elif [ -s "${KV_DIR}"/.kernelrelease ]; then
-		KV_LOCAL=$(<"${KV_DIR}"/.kernelrelease)
+	if [ -s "${KV_OUT_DIR}"/include/config/kernel.release ]; then
+		KV_LOCAL=$(<"${KV_OUT_DIR}"/include/config/kernel.release)
+	elif [ -s "${KV_OUT_DIR}"/.kernelrelease ]; then
+		KV_LOCAL=$(<"${KV_OUT_DIR}"/.kernelrelease)
 	else
 		KV_LOCAL=
 	fi
@@ -586,15 +595,6 @@ get_version() {
 		done
 	fi
 
-	[ -d "${OUTPUT_DIR}" ] && KV_OUT_DIR="${OUTPUT_DIR}"
-	if [ -n "${KV_OUT_DIR}" ];
-	then
-		qeinfo "Found kernel object directory:"
-		qeinfo "    ${KV_OUT_DIR}"
-	fi
-	# and if we STILL have not got it, then we better just set it to KV_DIR
-	KV_OUT_DIR="${KV_OUT_DIR:-${KV_DIR}}"
-
 	# And we should set KV_FULL to the full expanded version
 	KV_FULL="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${KV_EXTRA}${KV_LOCAL}"
 
diff --git a/eclass/mozconfig-v6.60.eclass b/eclass/mozconfig-v6.60.eclass
index b86fa2a0dc62..de09ebcd6408 100644
--- a/eclass/mozconfig-v6.60.eclass
+++ b/eclass/mozconfig-v6.60.eclass
@@ -101,7 +101,7 @@ RDEPEND=">=app-text/hunspell-1.5.4:=
 	>=x11-libs/pixman-0.19.2
 	>=dev-libs/glib-2.26:2
 	>=sys-libs/zlib-1.2.3
-	>=virtual/libffi-3.0.10
+	>=virtual/libffi-3.0.10:=
 	virtual/ffmpeg
 	x11-libs/libX11
 	x11-libs/libXcomposite
@@ -203,7 +203,7 @@ mozconfig_config() {
 		# Force gcc
 		einfo "Enforcing the use of gcc due to USE=-clang ..."
 		CC=${CHOST}-gcc
-		CXX=${CHOST}-gcc++
+		CXX=${CHOST}-g++
 		strip-unsupported-flags
 	fi
 
@@ -212,9 +212,6 @@ mozconfig_config() {
 		--with-system-zlib \
 		--with-system-bz2
 
-	# 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
 
@@ -331,7 +328,10 @@ mozconfig_config() {
 	mozconfig_use_with system-harfbuzz
 	mozconfig_use_with system-harfbuzz system-graphite2
 
-	if use arm ; then
+	if use clang ; then
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1423822
+		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
 
diff --git a/eclass/mozcoreconf-v6.eclass b/eclass/mozcoreconf-v6.eclass
index 571f195b8e46..862d632cd99d 100644
--- a/eclass/mozcoreconf-v6.eclass
+++ b/eclass/mozcoreconf-v6.eclass
@@ -204,7 +204,14 @@ mozconfig_init() {
 	case "${ARCH}" in
 	arm)
 		# Reduce the memory requirements for linking
-		append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
+		if use clang ; then
+			# Nothing to do
+			:;
+		elif tc-ld-is-gold ; then
+			append-ldflags -Wl,--no-keep-memory
+		else
+			append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
+		fi
 		;;
 	alpha)
 		# Historically we have needed to add -fPIC manually for 64-bit.
@@ -219,7 +226,14 @@ mozconfig_init() {
 	ppc64)
 		append-flags -fPIC -mminimal-toc
 		# Reduce the memory requirements for linking
-		append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
+		if use clang ; then
+			# Nothing to do
+			:;
+		elif tc-ld-is-gold ; then
+			append-ldflags -Wl,--no-keep-memory
+		else
+			append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
+		fi
 		;;
 	esac
 
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index ef0d7ab1f999..0e44d922ebe6 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1350,7 +1350,7 @@ toolchain_src_configure() {
 	addwrite /dev/zero
 	echo "${S}"/configure "${confgcc[@]}"
 	# Older gcc versions did not detect bash and re-exec itself, so force the
-	# use of bash.  Newer ones will auto-detect, but this is not harmeful.
+	# use of bash.  Newer ones will auto-detect, but this is not harmful.
 	CONFIG_SHELL="${EPREFIX}/bin/bash" \
 	bash "${S}"/configure "${confgcc[@]}" || die "failed to run configure"
 
@@ -1507,6 +1507,8 @@ gcc_do_filter_flags() {
 		filter-flags -f{no-,}unit-at-a-time -f{no-,}web -mno-tls-direct-seg-refs
 		filter-flags -f{no-,}stack-protector{,-all}
 		filter-flags -fvisibility-inlines-hidden -fvisibility=hidden
+		# and warning options
+		filter-flags -Wextra -Wstack-protector
 	fi
 	if ! tc_version_is_at_least 4.1 ; then
 		filter-flags -fdiagnostics-show-option
@@ -1625,6 +1627,11 @@ toolchain_src_compile() {
 	[[ ! -x /usr/bin/perl ]] \
 		&& find "${WORKDIR}"/build -name '*.[17]' -exec touch {} +
 
+	# Older gcc versions did not detect bash and re-exec itself, so force the
+	# use of bash.  Newer ones will auto-detect, but this is not harmful.
+	# This needs to be set for compile as well, as it's used in libtool
+	# generation, which will break install otherwise (at least in 3.3.6): #664486
+	CONFIG_SHELL="${EPREFIX}/bin/bash" \
 	gcc_do_make ${GCC_MAKE_TARGET}
 }
 
diff --git a/eclass/xdg-utils.eclass b/eclass/xdg-utils.eclass
index 2c2d2324c2b7..fe1eef213ea4 100644
--- a/eclass/xdg-utils.eclass
+++ b/eclass/xdg-utils.eclass
@@ -6,7 +6,7 @@
 # gnome@gentoo.org
 # @AUTHOR:
 # Original author: Gilles Dartiguelongue <eva@gentoo.org>
-# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6
+# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7
 # @BLURB: Auxiliary functions commonly used by XDG compliant packages.
 # @DESCRIPTION:
 # This eclass provides a set of auxiliary functions needed by most XDG
@@ -16,7 +16,7 @@
 #  * XDG mime information database management
 
 case "${EAPI:-0}" in
-	0|1|2|3|4|5|6) ;;
+	0|1|2|3|4|5|6|7) ;;
 	*) die "EAPI=${EAPI} is not supported" ;;
 esac
 
@@ -67,7 +67,7 @@ xdg_environment_reset() {
 # Updates the .desktop files database.
 # Generates a list of mimetypes linked to applications that can handle them
 xdg_desktop_database_update() {
-	local updater="${EROOT}${DESKTOP_DATABASE_UPDATE_BIN}"
+	local updater="${EROOT%/}${DESKTOP_DATABASE_UPDATE_BIN}"
 
 	if [[ ${EBUILD_PHASE} != post* ]] ; then
 		die "xdg_desktop_database_update must be used in pkg_post* phases."
@@ -79,7 +79,7 @@ xdg_desktop_database_update() {
 	fi
 
 	ebegin "Updating .desktop files database"
-	"${updater}" -q "${EROOT}${DESKTOP_DATABASE_DIR}"
+	"${updater}" -q "${EROOT%/}${DESKTOP_DATABASE_DIR}"
 	eend $?
 }
 
@@ -88,7 +88,7 @@ xdg_desktop_database_update() {
 # Update the mime database.
 # Creates a general list of mime types from several sources
 xdg_mimeinfo_database_update() {
-	local updater="${EROOT}${MIMEINFO_DATABASE_UPDATE_BIN}"
+	local updater="${EROOT%/}${MIMEINFO_DATABASE_UPDATE_BIN}"
 
 	if [[ ${EBUILD_PHASE} != post* ]] ; then
 		die "xdg_mimeinfo_database_update must be used in pkg_post* phases."
@@ -100,6 +100,6 @@ xdg_mimeinfo_database_update() {
 	fi
 
 	ebegin "Updating shared mime info database"
-	"${updater}" "${EROOT}${MIMEINFO_DATABASE_DIR}"
+	"${updater}" "${EROOT%/}${MIMEINFO_DATABASE_DIR}"
 	eend $?
 }
diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index 2aabca412f87..9477be2d85db 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index 12ecf31c8401..4d73aed3d367 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -3,6 +3,6 @@ DIST openrct2-0.2.0.tar.gz 6481521 BLAKE2B b3a17d4dd7b0d3e68d4a0a200a81307fa598a
 DIST openrct2-objects-v1.0.2.zip 2068705 BLAKE2B 4f291289a7f331bad19080ffc63d204819973682710ea62c3fc66fb9d05b63c267e2146d6c533f59eac3baa9760b85953ae344b6da4bb778e5ccd249f6160525 SHA512 814d52ee5c071f33c17d88bc53711a509d7988ece12381996b3d233b9b46c79739fd2dafbed57f00537b19c78e290e2481d72b2824b5574734f6876a0af0c359
 DIST openrct2-objects-v1.0.3.zip 2070513 BLAKE2B 3499b022f1d1f2b05da003f87f5f885de8463ed63d751653b0d8d48e2a339496d84d025eb2e44619012aa76360f6880541a519312e6d339eca862f6274d2b73b SHA512 9012a6337df7abd2743e94e3606266cde306335f33bf4f7869cca90c9c31758806c063b697bc3a6e21af7c733841551f2b29072592850cc51090d58f5f685f99
 DIST openrct2-title-sequence-v0.1.2.zip 4073116 BLAKE2B a36fb07e8da62afce129f2224f4cf5cc226922094132a3dc515fda1f02e0f8bbe07c973363f824ae58a54a26f252ad96f3f673bf5f142be5c964f45b6f712ed6 SHA512 7592c5397ceb27347c127ae5c4f8e11d7ef2ff23c97f627b354f941894420f546ffdcff88e2348e42c82d182ccf620e739c745d894a9b5650a0d7d028b68a106
-EBUILD openrct2-0.2.0.ebuild 2712 BLAKE2B 76a7330279712063c54850f0d05828174f2de6a7e710c6671bd27dc316560219be8c7d08e19363ff5775202954e73dc03e83d7e4b11d304d2891cdf317f78223 SHA512 5a3a4c31d7958b4fca21543ef00f138d9b880534356cbeed5282d15f49ef2e19d15df59f7e28691270b2155dd8151ee5d0f5555e202f406dfd51c4a0c36fc8dc
-EBUILD openrct2-9999.ebuild 2595 BLAKE2B 32e2d9a82abee9c10ab9ca64931975220c404b0eb98499559996fa9c00d8e3d217ae17e03fe8ec5842aabef64a0d79b037a0d8005f90fc104933353a53fd232c SHA512 383d45afc08229e4506c6ed59ea87d841946b624fbd45172333360089bfa36dc96a306972fd0597726953baeb0e3cccae652391cd0ccaa7760a92c6714d65973
+EBUILD openrct2-0.2.0.ebuild 2708 BLAKE2B 638b3a66b3e68f85bc9da8be330da58e550721d24f1e1b0199d1dcf34294933f5fd923821f83722e8fa38b5d2c95e9d74896f8e3f0bc6d83c7df35fc313561ca SHA512 6ea12f1460723acbe7339e9207e7137601d3a0ac37fe4f4f982201e4302cff4ee6049e24912e1975648d815e6248b64e193c5f89c666396a517089f54cb5067f
+EBUILD openrct2-9999.ebuild 2591 BLAKE2B 4bb94328a57009b43ceff04d6ad130eab031e46572f3c934b90729539f4f71627e3ad7deca1fc747e1adde31fa0c64407eac30fcb9755f2869cc231cb5f240fe SHA512 b524918d9e081bfb3439bfe073a53f4adbc7899a0f2cbc696683132b888731aaf395dd7a7795b36ecc536e00f6ea10dc9a3d7ad405bc654063019b3bd506ad24
 MISC metadata.xml 967 BLAKE2B 6dc048c366eb9719d895ab269a207a51f233125ee0861e360bf0d65a2de0d56b8bed7147f71bbf1d8c4b286a843a3542e74e17c8e3231682742435a2b28dfef0 SHA512 874ed9f406c5219bc5c6102b775a53b4e2526ff0f7cfa0dd9b5511717d10ee1fd63012cd19a926904b556195a12a7e2328548de9d1000605afdc471db513198f
diff --git a/games-simulation/openrct2/openrct2-0.2.0.ebuild b/games-simulation/openrct2/openrct2-0.2.0.ebuild
index f8059872fa82..e0f361457bf9 100644
--- a/games-simulation/openrct2/openrct2-0.2.0.ebuild
+++ b/games-simulation/openrct2/openrct2-0.2.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit cmake-utils gnome2-utils xdg-utils
 
 DESCRIPTION="An open source re-implementation of RollerCoaster Tycoon 2"
-HOMEPAGE="https://openrct2.website/"
+HOMEPAGE="https://openrct2.org/"
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/OpenRCT2/OpenRCT2.git"
 	EGIT_BRANCH="develop"
diff --git a/games-simulation/openrct2/openrct2-9999.ebuild b/games-simulation/openrct2/openrct2-9999.ebuild
index d9c56e6aeb0f..813f2f4c1dbb 100644
--- a/games-simulation/openrct2/openrct2-9999.ebuild
+++ b/games-simulation/openrct2/openrct2-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit cmake-utils gnome2-utils xdg-utils
 
 DESCRIPTION="An open source re-implementation of RollerCoaster Tycoon 2"
-HOMEPAGE="https://openrct2.website/"
+HOMEPAGE="https://openrct2.org/"
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/OpenRCT2/OpenRCT2.git"
 	EGIT_BRANCH="develop"
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 59e156840205..6ea52f84dff9 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index c556d2ca1732..906a8c8b9aae 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -4,5 +4,5 @@ AUX gconf-3.2.6-gsettings-data-convert-paths.patch 1370 BLAKE2B 9fdb3c665c8515ca
 AUX gconf-3.2.6-mconvert-crasher.patch 1514 BLAKE2B 3e48d07777268faa3a1c98f168d33baded66df06185e8e1c77ae8f66f0c689c5a358018d1d3c060e5a4796c3f692acf346141db87f3cb6784ddabbe461432a69 SHA512 8b6885098b63077610b929c3b958efc04599a1f891a0d7b5f042f2638dbae7b3c67b97e7f4e34c439e55ff8c5df3bcc7c6edc56f11cd6506a4b28c2338c8511b
 AUX gconf-3.2.6-spew-console-error.patch 2594 BLAKE2B 6a6f27024289b1c578f6718c184e7604f0f1dc285ea58a8095fac06f5fa38273329c8b2535b4de8c17c8359f09f82aa474fa5ebcef739b0e2dd6e7d6fb7726d7 SHA512 abdddbcab24d80870691a45cdf8d4baa7021f363efa26ba140221afef0bd96756b7234fb1d61ea46c4d137854f59d2589f2e1f1d125fdcb1fad3acf9215a8602
 DIST GConf-3.2.6.tar.xz 1559904 BLAKE2B dc71bfc6e334b0a3545b6009fc1a592f3ba6adb1471aacc98aaa1ded9e89676f97415c26a3d17e297a846a7efca7ee695107c136ea28b2431f90dc966a3d64cc SHA512 35f5f659f9d03f7531a7102adacbda0eb310d8a55a831c768c91a82e07dae21247726e00e0e411f63b1de9ade0f042ded572a3ea4a4b2ad3135231f344540b58
-EBUILD gconf-3.2.6-r4.ebuild 3651 BLAKE2B f5a1483ed31e32199d006dd8e01bde63cc5a3f58a4f10bf425dfdd897e5f8d5e1e09507393437a811c5127ad551cde766aa00bbb05451e79ccdaadbb724a0d0f SHA512 a32d4b99d9e096bda03d74163a43b9f267997ca958dd6d0114a07165d411015d5e1a73f2e485e87482762bee384d6843be22eed3abe0a9994538bb3c42cc279f
+EBUILD gconf-3.2.6-r4.ebuild 3669 BLAKE2B a67dc0a4e5edaaa9e4a61d603beae68ec7fd93e7a14cbe22aae215f5dc302e32bf4b5645cb71c6f2316bdf1109e1245ba1be771b84d010251f3711629d8f4978 SHA512 00a3246b3afbde3f2f675edb6a3be08fd05c80277cd65e5de6567dad2747c6f08bea932a9308b5ed86f413a926f53d16c32e3f4f86d259b07713c164dcdfc3c2
 MISC metadata.xml 430 BLAKE2B e2fce04aae8a1df05cb55972ab86e903186e034c0c48115f29d754f215e0be20a9b204aa2be12ed045b3dfc2010eea78be83252a3b86aa7cbbb8cde9b7433923 SHA512 820c350a185014ad888ba9cb43afb5ae7f21a0000a224d68461abbee4efefcbd972db79d7086b8f7f023de0828fa6f01a32502cbf74439160003fad146d33ca4
diff --git a/gnome-base/gconf/gconf-3.2.6-r4.ebuild b/gnome-base/gconf/gconf-3.2.6-r4.ebuild
index 935155f26665..ed94934c040b 100644
--- a/gnome-base/gconf/gconf-3.2.6-r4.ebuild
+++ b/gnome-base/gconf/gconf-3.2.6-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"
@@ -30,6 +30,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-libs/libxslt
+	dev-util/glib-utils
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.35
 	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
diff --git a/gnome-base/libbonobo/Manifest b/gnome-base/libbonobo/Manifest
index 2a863df66969..f8f42a8fc31b 100644
--- a/gnome-base/libbonobo/Manifest
+++ b/gnome-base/libbonobo/Manifest
@@ -1,3 +1,3 @@
 DIST libbonobo-2.24.3.tar.bz2 1354929 BLAKE2B 44f8d7bf4530363dd680fb277dbacabb85a3871fd3645ef7aa4a2a4dbd112a31329c8295637f73e37853035ac0e2cd7b918b2966f58fbcccd5abc943c02a2cc5 SHA512 c97224ba2d4afc07e520399aa04849487a4ec4dd1b80b56e0472b4c3ebbddd0ce0105ba63ca2f823590788754791127dbe86b49cb39239db0019f8104db25716
-EBUILD libbonobo-2.24.3-r1.ebuild 1536 BLAKE2B 64649733ace865324333a93aec10a789eb477c31bac61d3fc46965787c7608e700a4232336c4829189ce1cf86b2892a647b3d17f64669e815d6afd269e1440bd SHA512 c7d376ee9959e9b885ac8cbd53a3029062ecd7f7093f9fddc5075e328cd529e5a5caa298c378c79507f5fe31a305087165681ddced153adbef1161b66bdf53cc
+EBUILD libbonobo-2.24.3-r1.ebuild 1554 BLAKE2B aba479d1104b5c96c54e369c3413b89691970cb2dfeff6a73ecf45f09a455d4594e39ff8d17f060de3074f7181cc3795748d5ec1487c5a1d281dbe0880a44bf4 SHA512 4bfb2829fc703d6bcbe573f3586e31112d4566d4e3529ed2a28439e9740a16472fa51d03f3a25d562acd104da55948d4a7f8231178cee906b9b7bb3008b15086
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libbonobo/libbonobo-2.24.3-r1.ebuild b/gnome-base/libbonobo/libbonobo-2.24.3-r1.ebuild
index 4be2587ea505..4d43751f3952 100644
--- a/gnome-base/libbonobo/libbonobo-2.24.3-r1.ebuild
+++ b/gnome-base/libbonobo/libbonobo-2.24.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"
@@ -26,6 +26,7 @@ RDEPEND="
 	!gnome-base/bonobo-activation
 "
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	dev-util/gtk-doc-am
 	virtual/yacc
 	sys-devel/flex
diff --git a/gnome-base/libgnomecanvas/Manifest b/gnome-base/libgnomecanvas/Manifest
index f6f6ddfdafd8..2bb3c90ee961 100644
--- a/gnome-base/libgnomecanvas/Manifest
+++ b/gnome-base/libgnomecanvas/Manifest
@@ -1,3 +1,3 @@
 DIST libgnomecanvas-2.30.3.tar.bz2 574139 BLAKE2B 25f42bdb24899aaf6b2daf19242ba67a4bdae9a51bffaddc413b65a48843ccea1de11e18a82cc40ddec566ab25bf133811f00a8e7667a66b228ad8c855a8773d SHA512 b5bfa2133f5172abd5228d467db4d980dd4ac125cdbf55dcc1d5055dc3330861320c12cccb52ea63ba7f69824504c9d25781cd78001dc7a92b11c6f7e0c550de
-EBUILD libgnomecanvas-2.30.3-r1.ebuild 1680 BLAKE2B 9f3d6d23419b66e9654a6f0ce3a6fe81c8146dae42f83c3399f6317f3c83b4bcd5f73aca3c05f542721c9a24741023efafe82e0771c612ca2e804f51778b16da SHA512 03257888693cd0379c578cde5ced0ff6f04c43358623b396367de8480289205f7075d87a39aebf9a64ba8d053bf7beff1b52cbca56911d4c69aa5dcb56906669
+EBUILD libgnomecanvas-2.30.3-r1.ebuild 1698 BLAKE2B be182aded1ed792f953fa5a179fb3c3e2d596c1d912ff922b7fb868f9c72c132280bacef46b9ed690f2654377d2e42454fc0377090ac2829c9324ecd2db7027d SHA512 38aa0c01c5d3582bfabfd8b713b35377edc8f9e58ca20b59440718ce48bf2576cd2ed714bd4075f92ef3a7eb00f119175164db9e5818531ae18d88bf3f783b3b
 MISC metadata.xml 310 BLAKE2B bd322cd2300711715469acaec5e2930542ea48dde8e3444d465c9dfc13dbaddbd49885ddf04a643c07d67d75316f080ca587083001a0dc33cfb15b38b9bf7c19 SHA512 15504f6f0f8ba8e905677b293df85f64ec929c96b22a81a57803c47657a0f054039a1257086c02af49ab89a57b16d31d32619ccdf1f53ac2de93ce8fc2f99c12
diff --git a/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild b/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild
index 0f5756bec03a..bc2ea1b97966 100644
--- a/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild
+++ b/gnome-base/libgnomecanvas/libgnomecanvas-2.30.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"
@@ -25,6 +25,7 @@ RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
 DEPEND="${RDEPEND}
 	>=dev-lang/perl-5
 	sys-devel/gettext
+	dev-util/glib-utils
 	>=dev-util/intltool-0.35
 	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
 
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 28e2aa0cdac1..0d45dc1d104b 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/gnome-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest
index b1e53c111199..b7e4c09b8fed 100644
--- a/gnome-extra/gnome-calendar/Manifest
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -1,5 +1,5 @@
 AUX 3.24.3-libical3-compat.patch 1429 BLAKE2B ff22e520aeded89b65db02b511c869b8b76c1be1978b9be750565a6d813c0bdf8054a346849de4e2a8c840506d8fb72d34cf08148878b25839f5454d727a2a64 SHA512 72541436fc604ebb923e4d1d9bd033b22972c7f3305b81a2c4b3b77a9c56513654f382de433112e8327250d901e108b899baed437d871125f1709c21cbcfb370
 AUX 3.24.3-week-grid-fixes.patch 4124 BLAKE2B 99fca623889b10356defd0da2ab2672123dadf98ca0eb4ede729c0a586caf5677249ce541ba2a2a7cc440e5fc209a3a93fd4dd0e92607010f1320f988f3977c6 SHA512 9a4095c13470a1dcd7fef6d1d5e9ce12b54acde103029983ca7bb581efbc2502f74ef1fc53b6c7dfb40cc25d1778a1b5d82852dc674038217d2777e9e5a1d0a0
 DIST gnome-calendar-3.24.3.tar.xz 2425292 BLAKE2B cb859e229b040dd1ef34643e7aac5ddc1d0368d0bc6912effd73bd2c95ecab458294fef866f5718e108ef36f03bfc0dcb5a1140a571b3dc35128125ea8ff8e19 SHA512 979a369a5c5fc7d4621ff1ae69dfb1b53002cc014b2f1c480c0122da5bf4282c1928df9dcdb3528352e9589099184ab51f96d1a065e346be8e639aa5fc96ac67
-EBUILD gnome-calendar-3.24.3.ebuild 1136 BLAKE2B 7a1af8ac832510b41fd73df583ac12f1b695e1f6058102d33cce26d22db69330a3f3c7f54998644f0033958ba46047f07914841068efb8a1a4c0e43eb1109863 SHA512 6febd724b2740904b0821cfec5631f5218dd5e0732fd99bab55b9b7d546f2422f273dccbeb083eda2685115b73be28c5d860b2e9e3f68e8cf222babe27194e73
+EBUILD gnome-calendar-3.24.3.ebuild 1154 BLAKE2B 577693f10c479791872e5ae80006a809547fe53cedc0c4b154ae3e044d525f3aedc2f81fb191cb6eade11fcc67acd7581a2c92bb3352a924285701128bd77263 SHA512 f2b3a07725ee80d4f6bcd98a309637cb40561d8340a6ca797f63983b67a78373fe2830b7172be1454ecb0f7f454444937b1458aa025b87885c4999674ab4a536
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-3.24.3.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.24.3.ebuild
index ffbe2073b8fe..76a86de0f19e 100644
--- a/gnome-extra/gnome-calendar/gnome-calendar-3.24.3.ebuild
+++ b/gnome-extra/gnome-calendar/gnome-calendar-3.24.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
@@ -25,6 +25,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-libs/appstream-glib
 	dev-util/gdbus-codegen
+	dev-util/glib-utils
 	>=dev-util/intltool-0.40.6
 	sys-devel/gettext
 	virtual/pkgconfig
diff --git a/gnome-extra/gtkhtml/Manifest b/gnome-extra/gtkhtml/Manifest
index 965e855bc860..a371d260479c 100644
--- a/gnome-extra/gtkhtml/Manifest
+++ b/gnome-extra/gtkhtml/Manifest
@@ -1,3 +1,3 @@
 DIST gtkhtml-4.10.0.tar.xz 1050628 BLAKE2B 563eab2e81fea2f0d457cd4506f9b91e9ce497f4f8ca8281b3f609fcb8ae3a666b5815133f6590334af31adf5fbeba1d401b8d328ed04439f0f88051c52d5e7c SHA512 efb159f902a910abd259cf38a86894a363dfd6b632aaad5ca88baf278780e653a2efc783ae48d9e4239f9fbfcbab15a5f343b60c910166d04e6663d4e34843e0
-EBUILD gtkhtml-4.10.0.ebuild 970 BLAKE2B 5c8c81303f3d8d0ea64325fd7ae78cb876970983da7c84ed923118019c6526debe71700573eedb074ac2fab017f1902b43fb0c21c057c138dd716e3569953fef SHA512 c1f401b7ab55a2e61c3de3be8c22325a5f75858c207647926b92a0671b76361f59479add8d1b0109e5974ee38eda166936d9a59911f10428b1d61a8a265c5e94
+EBUILD gtkhtml-4.10.0.ebuild 988 BLAKE2B 9c380fa816424cf6f7e238664856cd77bd16bfe964ea47c6702b526d8aecaac546d5c76f471b322703e474a95c545c3d4b237db70b598e6ec143ff6067d6972e SHA512 2e0d36666c93de5f672c8218490220e063675eb0310dec0b26f64223913f36ed904e9e09ca292cdd9f7fc519e18986c28813e2f022ea474e1c73b4c533648c75
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
index b596e147e0ec..b52c93f9763d 100644
--- a/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-4.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="5"
@@ -27,6 +27,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto
 	sys-devel/gettext
+	dev-util/glib-utils
 	>=dev-util/intltool-0.40.0
 	virtual/pkgconfig
 "
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 0001811e9d89..fc0ede92c14b 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/akregator/Manifest b/kde-apps/akregator/Manifest
index 624c9f953260..7b8485e84371 100644
--- a/kde-apps/akregator/Manifest
+++ b/kde-apps/akregator/Manifest
@@ -1,6 +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
 EBUILD akregator-18.04.3.ebuild 1494 BLAKE2B f61953255f5a9da53b9f4f98f24ec9b9b8150f2248c00223c4edc332fb81b326583c686dc057b2badaa131c78adb04a89b511e7caa210484f1c6cb3596569dc0 SHA512 46e4bcb6178e734884715c85d4369dbfdfee7076a520a995c53d06ad89328b0315d12e81474b61dbcde6b1a7c0a163ef700f0593002999b710c9f1e80c21e3c7
 EBUILD akregator-18.08.1.ebuild 1499 BLAKE2B 76a7b2beafdc653da534a410cda6f2119f5e5be1e9d3c14a7505d4da898a74387a2790b12692402a7d8eab955b63ce48000f4c1539517eb67acac7681c849609 SHA512 822f3e15cd1b05dce701cba890bfa484835794397c1045b8b7f8aba7115e3313f7ba55f693d5b4b9c223b4f2bda12b23b8c128f5acb2edda066b4ae66c88df9a
 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
new file mode 100644
index 000000000000..8f0cffe52efc
--- /dev/null
+++ b/kde-apps/akregator/akregator-18.04.3-r1.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"
+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"
+	"${FILESDIR}/${P}-syndication.patch"
+)
diff --git a/kde-apps/akregator/files/akregator-18.04.3-syndication.patch b/kde-apps/akregator/files/akregator-18.04.3-syndication.patch
new file mode 100644
index 000000000000..f20f8fffa93e
--- /dev/null
+++ b/kde-apps/akregator/files/akregator-18.04.3-syndication.patch
@@ -0,0 +1,222 @@
+From d2797fe48b6d4429cd30163fd75003118400511f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@kde.org>
+Date: Sun, 22 Apr 2018 09:13:45 +0200
+Subject: Port away from remove Syndication API
+
+---
+ src/CMakeLists.txt         |  1 +
+ src/akregator_part.cpp     | 10 ------
+ src/feed/feed.cpp          |  3 +-
+ src/feed/feedretriever.cpp | 78 ++++++++++++++++++++++++++++++++++++++++++++++
+ src/feed/feedretriever.h   | 54 ++++++++++++++++++++++++++++++++
+ 5 files changed, 135 insertions(+), 11 deletions(-)
+ create mode 100644 src/feed/feedretriever.cpp
+ create mode 100644 src/feed/feedretriever.h
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 86af10e..312daee 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -86,6 +86,7 @@ set(akregatorprivate_LIB_SRCS
+     article.cpp
+     feed/feed.cpp
+     feed/feedlist.cpp
++    feed/feedretriever.cpp
+     treenode.cpp
+     treenodevisitor.cpp
+     utils.cpp
+diff --git a/src/akregator_part.cpp b/src/akregator_part.cpp
+index 74acfab..afde53f 100644
+--- a/src/akregator_part.cpp
++++ b/src/akregator_part.cpp
+@@ -259,14 +259,6 @@ Part::Part(QWidget *parentWidget, QObject *parent, const QVariantList &)
+     connect(m_autosaveTimer, &QTimer::timeout, this, &Part::slotSaveFeedList);
+     m_autosaveTimer->start(5 * 60 * 1000); // 5 minutes
+ 
+-    QString useragent = QStringLiteral("Akregator/%1; syndication").arg(QStringLiteral(AKREGATOR_VERSION));
+-
+-    if (!Settings::customUserAgent().isEmpty()) {
+-        useragent = Settings::customUserAgent();
+-    }
+-
+-    Syndication::FileRetriever::setUserAgent(useragent);
+-
+     loadPlugins(QStringLiteral("extension"));   // FIXME: also unload them!
+     if (mCentralWidget->previousSessionCrashed()) {
+         mCentralWidget->needToRestoreCrashedSession();
+@@ -361,8 +353,6 @@ void Part::slotSettingsChanged()
+         m_actionManager->setTrayIcon(nullptr);
+     }
+ 
+-    Syndication::FileRetriever::setUseCache(Settings::useHTMLCache());
+-
+     const QStringList fonts {
+         Settings::standardFont(),
+         Settings::fixedFont(),
+diff --git a/src/feed/feed.cpp b/src/feed/feed.cpp
+index 87ba473..774f506 100644
+--- a/src/feed/feed.cpp
++++ b/src/feed/feed.cpp
+@@ -36,6 +36,7 @@
+ #include "treenodevisitor.h"
+ #include "types.h"
+ #include "utils.h"
++#include "feedretriever.h"
+ 
+ #include <Syndication/Syndication>
+ 
+@@ -681,7 +682,7 @@ void Akregator::Feed::tryFetch()
+     d->loader = Syndication::Loader::create(this, SLOT(fetchCompleted(Syndication::Loader *,
+                                                                       Syndication::FeedPtr,
+                                                                       Syndication::ErrorCode)));
+-    d->loader->loadFrom(QUrl(d->xmlUrl));
++    d->loader->loadFrom(QUrl(d->xmlUrl), new FeedRetriever());
+ }
+ 
+ void Akregator::Feed::slotImageFetched(const QPixmap &image)
+diff --git a/src/feed/feedretriever.cpp b/src/feed/feedretriever.cpp
+new file mode 100644
+index 0000000..62526c4
+--- /dev/null
++++ b/src/feed/feedretriever.cpp
+@@ -0,0 +1,78 @@
++/*
++    This file is part of Akregator.
++
++    Copyright (C) 2018 Daniel Vrátil <dvratil@kde.org>
++
++    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
++    the Free Software Foundation; either version 2 of the License, or
++    (at your option) any later version.
++
++    This program is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++    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, write to the Free Software
++    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
++
++    As a special exception, permission is given to link this program
++    with any edition of Qt, and distribute the resulting executable,
++    without including the source code for Qt in the source distribution.
++*/
++
++#include "feedretriever.h"
++#include "akregatorconfig.h"
++#include "akregator-version.h"
++
++#include <KIO/StoredTransferJob>
++
++#include <QUrl>
++
++using namespace Akregator;
++
++FeedRetriever::FeedRetriever()
++    : Syndication::DataRetriever()
++{
++}
++
++void FeedRetriever::retrieveData(const QUrl &url)
++{
++    QString userAgent = QStringLiteral("Akregator/%1; syndication").arg(QStringLiteral(AKREGATOR_VERSION));
++    if (!Settings::customUserAgent().isEmpty()) {
++        userAgent = Settings::customUserAgent();
++    }
++    bool useCache = Settings::useHTMLCache();
++
++    auto job = KIO::storedGet(url, KIO::NoReload, KIO::HideProgressInfo);
++    job->addMetaData(QStringLiteral("UserAgent"), userAgent);
++    job->addMetaData(QStringLiteral("cache"), useCache ? QStringLiteral("refresh") : QStringLiteral("reload"));
++    connect(job, &KJob::result, this, &FeedRetriever::getFinished);
++    mJob = job;
++    mJob->start();
++}
++
++int FeedRetriever::errorCode() const
++{
++    return mError;
++}
++
++void FeedRetriever::abort()
++{
++    if (mJob) {
++        mJob->kill();
++        mJob = nullptr;
++    }
++}
++
++void FeedRetriever::getFinished(KJob *job)
++{
++    if (job->error()) {
++        mError = job->error();
++        Q_EMIT dataRetrieved({}, false);
++        return;
++    }
++
++    Q_EMIT dataRetrieved(static_cast<KIO::StoredTransferJob*>(job)->data(), true);
++}
+diff --git a/src/feed/feedretriever.h b/src/feed/feedretriever.h
+new file mode 100644
+index 0000000..3a0ff3d
+--- /dev/null
++++ b/src/feed/feedretriever.h
+@@ -0,0 +1,54 @@
++/*
++    This file is part of Akregator.
++
++    Copyright (C) 2018 Daniel Vrátil <dvratil@kde.org>
++
++    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
++    the Free Software Foundation; either version 2 of the License, or
++    (at your option) any later version.
++
++    This program is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++    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, write to the Free Software
++    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
++
++    As a special exception, permission is given to link this program
++    with any edition of Qt, and distribute the resulting executable,
++    without including the source code for Qt in the source distribution.
++*/
++
++#ifndef FEEDRETRIEVER_H_
++#define FEEDRETRIEVER_H_
++
++#include <syndication/dataretriever.h>
++
++class KJob;
++
++namespace Akregator {
++
++class FeedRetriever : public Syndication::DataRetriever
++{
++    Q_OBJECT
++public:
++    explicit FeedRetriever();
++
++    void retrieveData(const QUrl &url) override;
++    void abort() override;
++    int errorCode() const override;
++
++private Q_SLOTS:
++    void getFinished(KJob *job);
++
++private:
++    KJob *mJob = nullptr;
++    int mError = 0;
++};
++
++}
++
++#endif
+-- 
+cgit v0.11.2
diff --git a/kde-apps/kblog/Manifest b/kde-apps/kblog/Manifest
index f5a36eb4b704..ce0119a149df 100644
--- a/kde-apps/kblog/Manifest
+++ b/kde-apps/kblog/Manifest
@@ -1,5 +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
 EBUILD kblog-18.04.3.ebuild 530 BLAKE2B 2a664bdebe9aed7515df9eb4535c850245632b331a23548c82421b96b592f4ece00334320e731e99ad7bb32e1d44f68e85770efe21805f4525f8989ec197a602 SHA512 cf8f8b2331184ddfd495519c39f2091e87c249c4662a1a0ec1d07bd00ec72b213f6e059821d6f9958545489fdd05764731a9d5aadfd12ed830ec1e2e8f7d3bf4
 EBUILD kblog-18.08.1.ebuild 535 BLAKE2B 79b2ba3af7a09595f9b4a6547f24390d6af2bd17c7d79ea1dfd2d22b52b031c3bc4f98eb92fca826b7bbf9fbf54418c4ea31ebe8e0d843a570e7db01dc5aba06 SHA512 8ff909c9ca6601742874de8654ad85d03137ac5f97d8eb504ac36f7b8451622e34afdaeb176a7c0315eb052f89fb3aeb58a1f497a98af4c5074f5cebe4c67fc1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kblog/files/kblog-18.04.3-syndication.patch b/kde-apps/kblog/files/kblog-18.04.3-syndication.patch
new file mode 100644
index 000000000000..4771666c0f02
--- /dev/null
+++ b/kde-apps/kblog/files/kblog-18.04.3-syndication.patch
@@ -0,0 +1,219 @@
+From 85fc601b7c622a04c383331841733d681bfc50f3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@kde.org>
+Date: Sun, 22 Apr 2018 15:37:01 +0200
+Subject: Fix build against Syndication
+
+---
+ src/CMakeLists.txt    |  1 +
+ src/feedretriever.cpp | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/feedretriever.h   | 54 ++++++++++++++++++++++++++++++++++++++++
+ src/gdata.cpp         | 11 +++++----
+ 4 files changed, 129 insertions(+), 5 deletions(-)
+ create mode 100644 src/feedretriever.cpp
+ create mode 100644 src/feedretriever.h
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 03cef4e..1742abb 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -4,6 +4,7 @@ set(kblog_SRCS
+    blogcomment.cpp
+    blogmedia.cpp
+    blogger1.cpp
++   feedretriever.cpp
+    gdata.cpp
+    # livejournal.cpp
+    metaweblog.cpp
+diff --git a/src/feedretriever.cpp b/src/feedretriever.cpp
+new file mode 100644
+index 0000000..9d481c6
+--- /dev/null
++++ b/src/feedretriever.cpp
+@@ -0,0 +1,68 @@
++/*
++    This file is part of Akregator.
++
++    Copyright (C) 2018 Daniel Vrátil <dvratil@kde.org>
++
++    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
++    the Free Software Foundation; either version 2 of the License, or
++    (at your option) any later version.
++
++    This program is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++    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, write to the Free Software
++    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
++
++    As a special exception, permission is given to link this program
++    with any edition of Qt, and distribute the resulting executable,
++    without including the source code for Qt in the source distribution.
++*/
++
++#include "feedretriever.h"
++
++#include <KIO/StoredTransferJob>
++
++#include <QUrl>
++
++using namespace KBlog;
++
++FeedRetriever::FeedRetriever()
++    : Syndication::DataRetriever()
++{
++}
++
++void FeedRetriever::retrieveData(const QUrl &url)
++{
++    auto job = KIO::storedGet(url, KIO::NoReload, KIO::HideProgressInfo);
++    connect(job, &KJob::result, this, &FeedRetriever::getFinished);
++    mJob = job;
++    mJob->start();
++}
++
++int FeedRetriever::errorCode() const
++{
++    return mError;
++}
++
++void FeedRetriever::abort()
++{
++    if (mJob) {
++        mJob->kill();
++        mJob = nullptr;
++    }
++}
++
++void FeedRetriever::getFinished(KJob *job)
++{
++    if (job->error()) {
++        mError = job->error();
++        Q_EMIT dataRetrieved({}, false);
++        return;
++    }
++
++    Q_EMIT dataRetrieved(static_cast<KIO::StoredTransferJob*>(job)->data(), true);
++}
+diff --git a/src/feedretriever.h b/src/feedretriever.h
+new file mode 100644
+index 0000000..fb28020
+--- /dev/null
++++ b/src/feedretriever.h
+@@ -0,0 +1,54 @@
++/*
++    This file is part of Akregator.
++
++    Copyright (C) 2018 Daniel Vrátil <dvratil@kde.org>
++
++    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
++    the Free Software Foundation; either version 2 of the License, or
++    (at your option) any later version.
++
++    This program is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++    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, write to the Free Software
++    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
++
++    As a special exception, permission is given to link this program
++    with any edition of Qt, and distribute the resulting executable,
++    without including the source code for Qt in the source distribution.
++*/
++
++#ifndef FEEDRETRIEVER_H_
++#define FEEDRETRIEVER_H_
++
++#include <syndication/dataretriever.h>
++
++class KJob;
++
++namespace KBlog {
++
++class FeedRetriever : public Syndication::DataRetriever
++{
++    Q_OBJECT
++public:
++    explicit FeedRetriever();
++
++    void retrieveData(const QUrl &url) override;
++    void abort() override;
++    int errorCode() const override;
++
++private Q_SLOTS:
++    void getFinished(KJob *job);
++
++private:
++    KJob *mJob = nullptr;
++    int mError = 0;
++};
++
++}
++
++#endif
+diff --git a/src/gdata.cpp b/src/gdata.cpp
+index 9ca5b84..115e0a0 100644
+--- a/src/gdata.cpp
++++ b/src/gdata.cpp
+@@ -23,6 +23,7 @@
+ #include "gdata_p.h"
+ #include "blogpost.h"
+ #include "blogcomment.h"
++#include "feedretriever.h"
+ 
+ #include <syndication/loader.h>
+ #include <syndication/item.h>
+@@ -103,7 +104,7 @@ void GData::listBlogs()
+             SIGNAL(loadingComplete(Syndication::Loader*,Syndication::FeedPtr,Syndication::ErrorCode)),
+             this,
+             SLOT(slotListBlogs(Syndication::Loader*,Syndication::FeedPtr,Syndication::ErrorCode)));
+-    loader->loadFrom(QUrl(QStringLiteral("http://www.blogger.com/feeds/%1/blogs").arg(profileId())));
++    loader->loadFrom(QUrl(QStringLiteral("http://www.blogger.com/feeds/%1/blogs").arg(profileId())), new FeedRetriever);
+ }
+ 
+ void GData::listRecentPosts(const QStringList &labels, int number,
+@@ -145,7 +146,7 @@ void GData::listRecentPosts(const QStringList &labels, int number,
+             SIGNAL(loadingComplete(Syndication::Loader*,Syndication::FeedPtr,Syndication::ErrorCode)),
+             this,
+             SLOT(slotListRecentPosts(Syndication::Loader*,Syndication::FeedPtr,Syndication::ErrorCode)));
+-    loader->loadFrom(url);
++    loader->loadFrom(url, new FeedRetriever);
+ }
+ 
+ void GData::listRecentPosts(int number)
+@@ -165,7 +166,7 @@ void GData::listComments(KBlog::BlogPost *post)
+             this,
+             SLOT(slotListComments(Syndication::Loader*,Syndication::FeedPtr,Syndication::ErrorCode)));
+     loader->loadFrom(QUrl(QStringLiteral("http://www.blogger.com/feeds/") + blogId() + QLatin1Char('/') +
+-                                  post->postId() + QStringLiteral("/comments/default")));
++                                  post->postId() + QStringLiteral("/comments/default")), new FeedRetriever);
+ }
+ 
+ void GData::listAllComments()
+@@ -176,7 +177,7 @@ void GData::listAllComments()
+             SIGNAL(loadingComplete(Syndication::Loader*,Syndication::FeedPtr,Syndication::ErrorCode)),
+             this,
+             SLOT(slotListAllComments(Syndication::Loader*,Syndication::FeedPtr,Syndication::ErrorCode)));
+-    loader->loadFrom(QUrl(QStringLiteral("http://www.blogger.com/feeds/%1/comments/default").arg(blogId())));
++    loader->loadFrom(QUrl(QStringLiteral("http://www.blogger.com/feeds/%1/comments/default").arg(blogId())), new FeedRetriever);
+ }
+ 
+ void GData::fetchPost(KBlog::BlogPost *post)
+@@ -196,7 +197,7 @@ void GData::fetchPost(KBlog::BlogPost *post)
+             SIGNAL(loadingComplete(Syndication::Loader*,Syndication::FeedPtr,Syndication::ErrorCode)),
+             this,
+             SLOT(slotFetchPost(Syndication::Loader*,Syndication::FeedPtr,Syndication::ErrorCode)));
+-    loader->loadFrom(QUrl(QStringLiteral("http://www.blogger.com/feeds/%1/posts/default").arg(blogId())));
++    loader->loadFrom(QUrl(QStringLiteral("http://www.blogger.com/feeds/%1/posts/default").arg(blogId())), new FeedRetriever);
+ }
+ 
+ void GData::modifyPost(KBlog::BlogPost *post)
+-- 
+cgit v0.11.2
diff --git a/kde-apps/kblog/kblog-18.04.3-r1.ebuild b/kde-apps/kblog/kblog-18.04.3-r1.ebuild
new file mode 100644
index 000000000000..1deda67b9ff6
--- /dev/null
+++ b/kde-apps/kblog/kblog-18.04.3-r1.ebuild
@@ -0,0 +1,26 @@
+# 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
+"
+
+PATCHES=( "${FILESDIR}/${P}-syndication.patch" )
diff --git a/kde-apps/kdepim-meta/Manifest b/kde-apps/kdepim-meta/Manifest
index 9e9d87bc77d6..c8cce196209a 100644
--- a/kde-apps/kdepim-meta/Manifest
+++ b/kde-apps/kdepim-meta/Manifest
@@ -1,3 +1,4 @@
+EBUILD kdepim-meta-18.04.3-r1.ebuild 2021 BLAKE2B 5ee762a456e91842594829d0432e64df9bbb6078962f1f927ebd04acaed546f418fef713bbb1915bf55fa77e6dedf825910162a3cad7f884eb2489720ef5d57d SHA512 f6e2b281aa68912f159ae0621838060ae495b3f3efe34a3ceeeb2a538a99d41f917243ea1ee079d214d458e0f44637d57351cccb15b85fb8dec4ab018079deb7
 EBUILD kdepim-meta-18.04.3.ebuild 2054 BLAKE2B 0859f98049ab023b4b7d9ff3c74c05b3823738572bf9f86444bb5a154894c98a31f4a787bf626bdf771c026922f6297d4b5a3c2f1efc0c093b50227b02b6e19d SHA512 7a810fef22bc3a2f0a1e98ec958676b2aa873b5409f597a95f660d1c31601f7ab6863bdea1513507ef7ba725ca3bc26e46d775198d0c1ecb393b1014f5b32cde
 EBUILD kdepim-meta-18.08.1.ebuild 2083 BLAKE2B 762711b74c8b8a41c23617373b8fbfc0af2e9cdb4947fd6b599c7b8a93108dbd9c87c6394d428bc1b028059162437733683f3fae1a16da3b80b3b38ee69946a9 SHA512 b0d422da28d42092b5af654c284bc37e9ec7d7f457c74e5e26fcbea00a317212ae42c22faf2ba3410446fc74f16e3a4f03e24c398a6118d9d25042b65e613240
 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
new file mode 100644
index 000000000000..b2ec2973ba6f
--- /dev/null
+++ b/kde-apps/kdepim-meta/kdepim-meta-18.04.3-r1.ebuild
@@ -0,0 +1,67 @@
+# 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 kldap)
+	$(add_kdeapps_dep kleopatra)
+	$(add_kdeapps_dep kmail)
+	$(add_kdeapps_dep kmail-account-wizard)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmbox)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep knotes)
+	$(add_kdeapps_dep konsolekalendar)
+	$(add_kdeapps_dep kontact)
+	$(add_kdeapps_dep kontactinterface)
+	$(add_kdeapps_dep korganizer)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep ksmtp)
+	$(add_kdeapps_dep libgravatar)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep libkgapi)
+	$(add_kdeapps_dep libkleo)
+	$(add_kdeapps_dep libksieve)
+	$(add_kdeapps_dep libktnef)
+	$(add_kdeapps_dep mailcommon)
+	$(add_kdeapps_dep mailimporter)
+	$(add_kdeapps_dep mbox-importer)
+	$(add_kdeapps_dep messagelib)
+	$(add_kdeapps_dep pim-data-exporter)
+	$(add_kdeapps_dep pim-sieve-editor)
+	$(add_kdeapps_dep pimcommon)
+"
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 6e35b44e616e..29cfc97b69c7 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/krusader/Manifest b/kde-misc/krusader/Manifest
index 7e3c42ae5371..be28c22d60a8 100644
--- a/kde-misc/krusader/Manifest
+++ b/kde-misc/krusader/Manifest
@@ -1,5 +1,3 @@
-DIST krusader-2.7.0.tar.xz 2875080 BLAKE2B 503e40f7c617779b64b2f5600ae99063d0727ed6781b4b86dcc52b57c56589107ca6bed5fdcbfc37f4d4c682e23a926afb6dc3d758d8e573d019d687dbfe76be SHA512 254b1a0a68fca010dfe79d8364ca745dacc2b5899c9b99d6c576b95e9ac8a564a59a291568158ec1f114b0e2c0137e2a9e7a9b4c01497539e6a9a9d5b7411b1d
 DIST krusader-2.7.1.tar.xz 2889568 BLAKE2B f5ed5753d1f5285ff2ff8510429d3b07ef32ab06b37fc20300eb3544f5a44572d5c66067e0031fc767c93cd3517b12062c7c7a91f7ff0bb707d1e20b16d07f55 SHA512 860908fd960ae45d298ade30bd4962eea44d126b5a3bb28d04540a0e4fbc0645de2394490fdb624b5fcc7005841c0ce392cda896dc4b1d3d2de3a1e44171222d
-EBUILD krusader-2.7.0.ebuild 1889 BLAKE2B 40b069be9e32493f0cd994e36f509eb340881ff3a6d73f18dc4bfbb66267fc30ea19efdcef8d20cd213fb2c8c4f6045e92bd5c259dc67af0631a962d8a0127a2 SHA512 7346d5f77032fa474449204e2a1b8211060e4a50cfe93e6305b8bfc966996530017ecbbe94122b326ab3ad627a83ca378b233a1d9c26456c65e7727764eb8caa
-EBUILD krusader-2.7.1.ebuild 1891 BLAKE2B 1c0ddaa10de32a5ca101beeeb22f919ee87988b5fce246c47fba1fb0396763c34626830175e6b045b4526cf741e7c98182ca80efef221f458ac3695d5bd01b33 SHA512 3f3c029b8b36a2f54ff75873d6067431cb69b541e9492a3164379d6966ec33d186962cdb7283db6d94e6c8e671468fe9a79b8b40390571fb2cd61ea257326216
+EBUILD krusader-2.7.1.ebuild 1886 BLAKE2B c40b65a07683ffb114a861442695d27e26c08a115977602197e9e95c89a1d472ba66479c7bbca0e2850ffdf3d44516fd808bd761569a533b8836708d6c634fa7 SHA512 9da57da5bf69c01ad60cba0aa9c7f229f6fb112701d07328a6505cc1b9d69970e1aecb161c4ad0f63ffdbc53c25437f53535baaf2749efdea432dcdb90d778a9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/krusader/krusader-2.7.0.ebuild b/kde-misc/krusader/krusader-2.7.0.ebuild
deleted file mode 100644
index bcdf133335ea..000000000000
--- a/kde-misc/krusader/krusader-2.7.0.ebuild
+++ /dev/null
@@ -1,71 +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
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Advanced twin-panel (commander-style) file-manager with many extras"
-HOMEPAGE="https://krusader.org/"
-LICENSE="GPL-2+"
-IUSE=""
-
-COMMON_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 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 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 qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	sys-apps/acl
-	sys-libs/zlib
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep knotifications)
-	$(add_qt_dep qtconcurrent)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kio-extras)
-	!kde-misc/krusader:4
-"
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version kde-apps/thumbnailers:${SLOT} ||
-			! has_version kde-apps/ffmpegthumbs:${SLOT} ; then
-		elog "For PDF/PS, RAW and video thumbnails support, install:"
-		elog "   kde-apps/thumbnailers:${SLOT}"
-		elog "   kde-apps/ffmpegthumbs:${SLOT}"
-	fi
-
-	if ! has_version kde-apps/keditbookmarks:${SLOT} ; then
-		elog "For bookmarks support, install kde-apps/keditbookmarks:${SLOT}"
-	fi
-}
diff --git a/kde-misc/krusader/krusader-2.7.1.ebuild b/kde-misc/krusader/krusader-2.7.1.ebuild
index 703e24041897..7c25fe853da5 100644
--- a/kde-misc/krusader/krusader-2.7.1.ebuild
+++ b/kde-misc/krusader/krusader-2.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
@@ -8,7 +8,7 @@ inherit kde5
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Advanced twin-panel (commander-style) file-manager with many extras"
diff --git a/kde-misc/latte-dock/Manifest b/kde-misc/latte-dock/Manifest
index 8fe346eb8cd2..b57a715d9e8c 100644
--- a/kde-misc/latte-dock/Manifest
+++ b/kde-misc/latte-dock/Manifest
@@ -1,5 +1,7 @@
 DIST latte-dock-0.7.5.tar.xz 542128 BLAKE2B 802d8b9f5cf961a38715a0ff196e0331a284817e20edc8eb87f04a557c9033d4ffef2c447ce0e8c6f6079814feed822890a66005336e6599a820125fe8affd67 SHA512 11a0faa346ef798d8d9a7a93ea69bbcd7bd206c2ad1a9f2775218371b9b894dc3fc1b52268aaa0bd17e26f7cc05d6cfb06f078f31614abbaad509171addf106f
 DIST latte-dock-0.8.0.tar.xz 633012 BLAKE2B 16bd448362435bbda0ec9ae58f176551c3f1f04d2f8d22a90b4d8f4251acde1b2738d7a36d8eeb138b1ec0f3eb8fc6601d11ed0da1aec9b750b63bb648449aea SHA512 4c3c8c2e5d380ee671e6026feff753b01ac7f232fb2a4a924357cbd25acacfa9f2762d55c7215658d39aadcd13a210e1f70e5688c742ad96e7bb98f1de4e0583
+DIST latte-dock-0.8.1.tar.xz 652000 BLAKE2B 94186fd559d5df987c55333b705c8e9ab955344a6f785f46aac37dc69cabea65279745e5d0d09fbd2d20eba75b902fcbbf5d04bc115f92e163300019ab43c549 SHA512 0df0ed9c1b5989114fa1a703d95d98bd0e2c1002e109abfae61eb77b60f7c7a1ad82981ee7972648de36233d9347cc61dfaf41685e2df0aeb9d2ef3b2d92f77d
 EBUILD latte-dock-0.7.5.ebuild 1281 BLAKE2B ebf188235101aa6e5e24d6b53dc1002316b898e9d0d3bc07fb8860c8b8004d0876ed5317a702cbcc153aec266e99660628d03eabcc2ae80d24838a819b0e0678 SHA512 ba0014b28ab9db95e9a0eb56d4efcf273e6296469a6fe8ecbd5e3d4db2e0933a4da8c639b86d2c8ccf2f3f28e389d0cd1dfadf95e52afe8a82ac387fba924521
 EBUILD latte-dock-0.8.0.ebuild 1271 BLAKE2B a4723229a7b26ffb3452078279a90af35df620459b556f622376e263770387d9f8c96f42e45ae9bdcd9ccebedb54d2668f5c0e933482b0fbd3822467efef3ae6 SHA512 926aa030881b6458f3810a8ff7a04419b63fd3a16ae7addf740ef89c4d3c495a54eb377a1df6f94bce52b2c5b270381d02b67e66ffc5fe330b5de2d66cb0c5ef
+EBUILD latte-dock-0.8.1.ebuild 1268 BLAKE2B 165fef170da3dc66404be7ef812119d565998af53d9ec9ba668f52e45c3803890f28a334c509f6b9c17fa1e1ffcfc699a0bcaee396fb39895d75cfee6b82dd96 SHA512 a3ed2f7fde3633ecfc20009f1cdf30fed1a8228e37dd735da518da26593f385716dfaf7ee0767393b47fdda31f2004c6415be997c6206a827a53336c73b72950
 MISC metadata.xml 453 BLAKE2B a49e759f4ce30c2730a4bf082b8f953e0e93f95f2de3b567798d4bea8229558ed72cd774c5d9b1356bd066dc92400d17f05d830746d87386c8c2921fcc484c80 SHA512 5fd22fbf848fbbc76422a4002e5efdddb8a387c406fc45b580e1ec93c36cd2407582770d5d842367fa0d7dd7fceaec196cf0202f56bd5144f89b4f573c2d9c35
diff --git a/kde-misc/latte-dock/latte-dock-0.8.1.ebuild b/kde-misc/latte-dock/latte-dock-0.8.1.ebuild
new file mode 100644
index 000000000000..476f28f5fdaa
--- /dev/null
+++ b/kde-misc/latte-dock/latte-dock-0.8.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 kde5
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Elegant dock, based on KDE Frameworks"
+HOMEPAGE="https://store.kde.org/p/1169519/
+	https://github.com/psifidotos/Latte-Dock"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kwayland)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma X)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgraphicaleffects)
+	$(add_qt_dep qtgui 'xcb')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libxcb
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 6f6eb2662669..89b995fc67a9 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 3ac49e52562d..b942e547de7e 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,10 +1,11 @@
 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-r1.ebuild 4564 BLAKE2B 55a097db38f5d7c6cbcde5a47993c3ba356f451f6bad41ac70ddb0eef96b5223fd9293305a7b920e8c83edbf006063ae91cc6b9c03e25e77de6b2dbb7dedb3ba SHA512 d8f06624fcec7657efd69834dce3e442cf702a4ce12a4f0ac2ee42ddc45ae8353765c07c18d6b79cd333081fc7b2aff5f36140b8e83967ca915c66fc1d631714
+EBUILD plasma-desktop-5.13.5-r2.ebuild 4617 BLAKE2B e7f678cbb95c53d4eb4e3bf14f344bbc1ef362b426fdccde47b73181093ff10a14afa8e508c0fee94fce332c41e86eacf970d154f06bc4b83cd0f82f75a27873 SHA512 f8c4d788f9cf10460a5398ce38264daa2ec8a76cda106847560f0f57e55913fda8100a1281f093418d7043f22d68055a906cd7e48ace07b2a85cef5130b5f6e3
 MISC metadata.xml 589 BLAKE2B 1638c90163cf31addbeb1f6f58ed68cf7e97da259bc22d4df7123a704bd66b3e628d9cbf1c2b20d67d44539f4d27588d348724510aeb3310e5baea63db79be8d SHA512 e6aece50e632897b8fca637028419eadb6d6fea24388314b5be7f3e915d0ee3c46d7ac09c354ffcc04a50b31d4998033fe21919d19a40368e26ec43987f4d18f
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.13.5-libinput-kcm-ignore-touchpads.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.13.5-libinput-kcm-ignore-touchpads.patch
new file mode 100644
index 000000000000..76b3e1b0f3ed
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.13.5-libinput-kcm-ignore-touchpads.patch
@@ -0,0 +1,139 @@
+From a4c724173b5c6a59331587f2e5db746dffbabdc6 Mon Sep 17 00:00:00 2001
+From: Roman Gilg <subdiff@gmail.com>
+Date: Tue, 4 Sep 2018 00:15:18 +0200
+Subject: [Mouse KCM] Avoid changes to touchpads in libinput backend
+
+Summary:
+Similar to evdev backend we need to ignore touchpad devices explicitly in the
+libinput backend because these are also pointer devices.
+
+XInput2 can do this in theory via input classes, but my touchpad did not set
+the class correctly. So just switch to using XInput like in the evdev backend
+to query all pointer devices and then use the XI_TOUCHPAD atom to filter out
+touchpads.
+
+BUG: 395401
+BUG: 395722
+BUG: 396269
+
+Test Plan: Manually
+
+Reviewers: #plasma, hein
+
+Reviewed By: #plasma, hein
+
+Subscribers: acrouthamel, ngraham, plasma-devel
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D15256
+---
+ .../backends/x11/x11_libinput_dummydevice.cpp      | 32 ++++++++++++++--------
+ 1 file changed, 20 insertions(+), 12 deletions(-)
+
+diff --git a/kcms/mouse/backends/x11/x11_libinput_dummydevice.cpp b/kcms/mouse/backends/x11/x11_libinput_dummydevice.cpp
+index 6efca42..7ec314b 100644
+--- a/kcms/mouse/backends/x11/x11_libinput_dummydevice.cpp
++++ b/kcms/mouse/backends/x11/x11_libinput_dummydevice.cpp
+@@ -20,24 +20,28 @@
+ 
+ #include <libinput-properties.h>
+ 
+-#include <X11/Xlib.h>
+ #include <X11/Xatom.h>
+ #include <X11/extensions/XInput2.h>
++#include <X11/extensions/XInput.h>
++
++static Atom s_touchpadAtom;
+ 
+ template<typename Callback>
+-static void XI2ForallPointerDevices(Display* dpy, const Callback& callback)
++static void XIForallPointerDevices(Display* dpy, const Callback& callback)
+ {
+     int ndevices_return;
+-    XIDeviceInfo* info = XIQueryDevice(dpy, XIAllDevices, &ndevices_return);
++    XDeviceInfo *info = XListInputDevices(dpy, &ndevices_return);
+     if (!info) {
+         return;
+     }
+     for (int i = 0; i < ndevices_return; ++i) {
+-        if ((info + i)->use == XISlavePointer) {
+-            callback(info + i);
++        XDeviceInfo *dev = info + i;
++        if ((dev->use == IsXPointer || dev->use == IsXExtensionPointer) &&
++                dev->type != s_touchpadAtom) {
++            callback(dev);
+         }
+     }
+-    XIFreeDeviceInfo(info);
++    XFreeDeviceList(info);
+ }
+ 
+ struct ScopedXDeleter {
+@@ -61,7 +65,8 @@ void valueWriterPart(T val, Atom valAtom, Display *dpy)
+ template<>
+ void valueWriterPart<bool>(bool val, Atom valAtom, Display *dpy)
+ {
+-    XI2ForallPointerDevices(dpy, [&] (XIDeviceInfo *info) {
++    XIForallPointerDevices(dpy, [&] (XDeviceInfo *info) {
++        int deviceid = info->id;
+         Status status;
+         Atom type_return;
+         int format_return;
+@@ -70,7 +75,7 @@ void valueWriterPart<bool>(bool val, Atom valAtom, Display *dpy)
+ 
+         unsigned char *_data = nullptr;
+         //data returned is an 1 byte boolean
+-        status = XIGetProperty(dpy, info->deviceid, valAtom, 0, 1,
++        status = XIGetProperty(dpy, deviceid, valAtom, 0, 1,
+                                False, XA_INTEGER, &type_return, &format_return,
+                                &num_items_return, &bytes_after_return, &_data);
+         if (status != Success) {
+@@ -87,7 +92,7 @@ void valueWriterPart<bool>(bool val, Atom valAtom, Display *dpy)
+ 
+         unsigned char sendVal = val ? 1 : 0;
+ 
+-        XIChangeProperty(dpy, info->deviceid, valAtom, XA_INTEGER,
++        XIChangeProperty(dpy, deviceid, valAtom, XA_INTEGER,
+                          8, XIPropModeReplace, &sendVal, 1);
+ 
+     });
+@@ -96,7 +101,8 @@ void valueWriterPart<bool>(bool val, Atom valAtom, Display *dpy)
+ template<>
+ void valueWriterPart<qreal>(qreal val, Atom valAtom, Display *dpy)
+ {
+-    XI2ForallPointerDevices(dpy, [&] (XIDeviceInfo *info) {
++    XIForallPointerDevices(dpy, [&] (XDeviceInfo *info) {
++        int deviceid = info->id;
+         Status status;
+         Atom float_type = XInternAtom (dpy, "FLOAT", False);
+         Atom type_return;
+@@ -106,7 +112,7 @@ void valueWriterPart<qreal>(qreal val, Atom valAtom, Display *dpy)
+ 
+         unsigned char *_data = nullptr;
+         //data returned is an 1 byte boolean
+-        status = XIGetProperty(dpy, info->deviceid, valAtom, 0, 1,
++        status = XIGetProperty(dpy, deviceid, valAtom, 0, 1,
+                                False, float_type, &type_return, &format_return,
+                                &num_items_return, &bytes_after_return, &_data);
+         if (status != Success) {
+@@ -125,7 +131,7 @@ void valueWriterPart<qreal>(qreal val, Atom valAtom, Display *dpy)
+         float *sendPtr = (float*)buffer;
+         *sendPtr = val;
+ 
+-        XIChangeProperty(dpy, info->deviceid, valAtom, float_type,
++        XIChangeProperty(dpy, deviceid, valAtom, float_type,
+                          format_return, XIPropModeReplace, buffer, 1);
+ 
+     });
+@@ -161,6 +167,8 @@ X11LibinputDummyDevice::X11LibinputDummyDevice(QObject *parent, Display *dpy)
+ 
+     m_supportsNaturalScroll.val = true;
+     m_naturalScrollEnabledByDefault.val = false;
++
++    s_touchpadAtom = XInternAtom(m_dpy, XI_TOUCHPAD, True);
+ }
+ 
+ X11LibinputDummyDevice::~X11LibinputDummyDevice()
+-- 
+cgit v0.11.2
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.13.5-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.13.5-r1.ebuild
deleted file mode 100644
index 06140e915b17..000000000000
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.13.5-r1.ebuild
+++ /dev/null
@@ -1,168 +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}-activityswitcher.patch"
-	"${FILESDIR}/${P}-kickersearch-nav.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-r2.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.13.5-r2.ebuild
new file mode 100644
index 000000000000..d771236bad50
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.13.5-r2.ebuild
@@ -0,0 +1,169 @@
+# 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/mail-client/Manifest.gz b/mail-client/Manifest.gz
index a6118d009c7f..8ee3f34d72a1 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index d64757f83a47..b623440dfdc2 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -7,6 +7,6 @@ EBUILD neomutt-20180223.ebuild 4032 BLAKE2B 16d3abd69e3c9f8257b84c04409c94726a26
 EBUILD neomutt-20180323.ebuild 4032 BLAKE2B 16d3abd69e3c9f8257b84c04409c94726a2644575021492cb7cc8d6831ab9a6233cbd54e537d8207b6832b45266c62a8b5b974d015f63df8a6d012d2a71459c2 SHA512 88463b0ff97a1c9c14742072b8cfdfda81fceb5bee2c9251a09f6b9959de5a575f6eed7a54f9d00026dd33b52d0e8912e15c841451de7dd22ffe8121014f14d9
 EBUILD neomutt-20180512.ebuild 4151 BLAKE2B de49b44fd2b4eb865b5457e6379e908cfc7f1500cd1ce6a97a1d9d19eb29b59efa595fc92227b4138ae55418b5b0fd32ab600f363adbf2ebf77865099e39a6d9 SHA512 31dfc159c61781e58f3e721b5ba827d6b526ef0fd201cb29b94fbff4affdd8a1a2f77546d56b4fb0deaca60f427f9fe76125c138875a989290e606c161991c75
 EBUILD neomutt-20180622.ebuild 3271 BLAKE2B 37bd175aca2c3d77a365a90df65be546f4724f8af5c13c841459eec58e0b70aee9be9fcbf66cdf47c64884f953fe872341d87cc5f8090dc6785a7106b1f50b81 SHA512 b22729f9cafdac9b477d0cf82e428852a2202f53992eb9ecc341dbc0f6caf95488eb5c47ffcd39f00af0f9ac8e03400375e2eec920d64e0789dad90aeba7b036
-EBUILD neomutt-20180716.ebuild 3271 BLAKE2B 37bd175aca2c3d77a365a90df65be546f4724f8af5c13c841459eec58e0b70aee9be9fcbf66cdf47c64884f953fe872341d87cc5f8090dc6785a7106b1f50b81 SHA512 b22729f9cafdac9b477d0cf82e428852a2202f53992eb9ecc341dbc0f6caf95488eb5c47ffcd39f00af0f9ac8e03400375e2eec920d64e0789dad90aeba7b036
+EBUILD neomutt-20180716.ebuild 3266 BLAKE2B 3d5454b96d2c042e2f16bc817fba9a35b2e04b942c05066ee083109efd801d5350ca56b141b786b54de3bb370aab57670e8b36daed8c37c2e78f68e1f6a51c37 SHA512 ffdd24c85f79fd840d150e2f8529cb6a8b99f4979c434f47957c06cebf8983a6f8fdd76da689a270383124eca2503da242aef93111009942fe74b65f99264967
 EBUILD neomutt-99999999.ebuild 3271 BLAKE2B 37bd175aca2c3d77a365a90df65be546f4724f8af5c13c841459eec58e0b70aee9be9fcbf66cdf47c64884f953fe872341d87cc5f8090dc6785a7106b1f50b81 SHA512 b22729f9cafdac9b477d0cf82e428852a2202f53992eb9ecc341dbc0f6caf95488eb5c47ffcd39f00af0f9ac8e03400375e2eec920d64e0789dad90aeba7b036
 MISC metadata.xml 1430 BLAKE2B cde0fee81787af5d8401b456deafc66ac9427a88b25866abbecbf874c30a6acc69375f4c7705916985b79e052ca2c07e2a0c7ab853dbc562e53230ec11c15e28 SHA512 e19508e8851160c14d2bab48f54b3cf959411b3b0ccfe3555414bc563e8300daf03cf328379569fc516576d0065fb440f3f6426509b599d70555282426163cc3
diff --git a/mail-client/neomutt/neomutt-20180716.ebuild b/mail-client/neomutt/neomutt-20180716.ebuild
index 4d1742196c36..ccd0f97bec9f 100644
--- a/mail-client/neomutt/neomutt-20180716.ebuild
+++ b/mail-client/neomutt/neomutt-20180716.ebuild
@@ -1,4 +1,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} =~ 99999999$ ]]; then
 	EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="A small but very powerful text-based mail client"
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 03f79bdb57e9..42c6957089cc 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -5,131 +5,12 @@ AUX thunderbird-60.0-blessings-TERM.patch 2731 BLAKE2B a11e30f107654dc9cc958f76d
 AUX thunderbird-60.0-rust-1.29-comp.patch 1541 BLAKE2B bb50527b8bb07311d6e40900c45fa628b276475bcd1cc137fda2d5c621baf8939c5c9c5ae27b9ab7e63a0a0aff925ea28424ce4363c81fd7c68fe476544b834b SHA512 022a26844e35aa9881022b8ba9f8686627983f490d67d5d9bcb54e53d2f0a9384d3885fd43fcafc59dd8172e5a990aaa994f53888a27a63e93b16e65ced879dc
 AUX thunderbird-gentoo-default-prefs-1.js-1 426 BLAKE2B 2cade86c23902fe439018a79847ffef69f82041c35b4a473dbf62b59b17bfe3422abdae604026f8ed14dd1fddc525cb2c49516d2d003bfd3edc075021f24576d SHA512 b40e7b4789b7f43c382589f7d0eaa6043072bce86ab79fb3dda4800e9ab6a43af11f43b0cb3b6ab1c71d887aa1cf9356ac858f0a81dad013cef5b8a4b2107983
 AUX thunderbird-gentoo-default-prefs.js-2 461 BLAKE2B a18e1fdbab7ad81feb41af75e60f48adb960800849630a6f9253b7bebcd3e7db33b2517ad0be6302609545a5464b84bd5c5fc67a07fb2ceab0ca1ad98539bee0 SHA512 db115d89a094c395636e5c008307c7864cb084a0a4ebd024d4ce33cac12963cd4a9ff6833227adc6a098430dc3f7ca9e386e26b87400d46920f4ef15741aefa5
-DIST firefox-45.0-patches-12.tar.xz 22040 BLAKE2B d2d82ad6255b1a7d1d56e3a3e5c5c8f248f0b62328508c324f72cd6e2ea46132c20c95009dc647e8335bede36266b49a6162f29b746abaffdc9ebcb20af23eb0 SHA512 be9981818e549d79f8557427dd506b9c473922c0043384563c1fd92e4c6c96c91afb8bb01d4499a3a61b463ecf2875bc776fef0f279c0f2fc3625602cb47880b
 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 gdata-provider-2.6-r1.tar.xz 83836 BLAKE2B 774458132c914cd0165387f2d8c1ebaa228ba4f11b0d52328a5e1f836cc59200aabf6c1002622962073a78cf35330569f8a473cde46d8aa7b3a241b5a460b5fa SHA512 e5fcf60c221590d1d904ce8c6a74da7208b118c2872a26267f4ee6d3e68eea466d44b979b7259a012a21e48eb5b470d52cc9e58584226fe04ce88ff698da495b
 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-4.7.8.tar.xz 1951252 BLAKE2B df8900cacfe660ad17454836893e7199b8590d47ef093699afd135e0a39201cb43dda8d581a36b5375a29c43bb55dd7cb9479dcaf02f52ee8f4a454fe3d426a0 SHA512 37decaf4010e48cf242e76c5d73caf96f7b1e34c67fd465fb8b33055a6986d5fa7b1557862526224ab4ac421df3441e974d297ec4a9454dd63a039683ec46fe6
-DIST lightning-5.4.5.2.tar.xz 1896864 BLAKE2B 545db49edb693696440a48e1b4e0367580284815f918129fe148037312a9950887cfdbc4d41719f8cd8eb47ed193c8e29c10b49dfb919f8bc7d362e07b238ff6 SHA512 544961df074123548c7d71ae195835a17d861d74f838849666380ba6e2975179668d79c2e8053429eb9c52a6b315335e109c942ecf498f48f5729307334a174f
 DIST lightning-5.4.9.tar.xz 1891752 BLAKE2B 90b777814db2962ff669430cea5a29ba1612a842fbb0edaca597539e6e2d728a9d90114ec6196fe0d4758a4738a15bc0c985a345e1062cb125617eb84ecf79e1 SHA512 8e54865d50118154c3918d5dec5dade4fb026c24bc697ad2e360db9741509cbdbb71ba9477508a9b209be6c8a8190fb0b5e03d2e8fedcc2cae18f5c9e5a3a496
 DIST lightning-6.2.tar.xz 1647116 BLAKE2B 88a44c7ee6a1395372e260e8d0a0e00a6b2546398000ca701b74f98f85b73424e4126215c94543534ae1159de6644e81583353d53ae15b0e82592b17bf5fb2da SHA512 d51e56c6b21829dafa59cef086afb23f4afdd7dda5b1fdc1f6ad47ba0945e11dbedc826bb9764f42323275e251a48802eb5af2f0e5da27f3a64c105ee9f0dc4a
-DIST thunderbird-38.0-patches-0.1.tar.xz 684 BLAKE2B 5f55008421169da375e5cca5e3e4944c207e53b194b7d7b6bc0a589cbcb38695ffd4b06c1f9a8adec9c6affc41717f3a4f0e7da2d8aca647cf8164b6f4834a78 SHA512 52c83af301be959e861dfec55b3c4bc60035387c606976bd29232c4cba077230edcadef242491e699fba10027d0408dd4f33fa320bcf96727afe149166ca02de
-DIST thunderbird-45.8.0-ar.xpi 490775 BLAKE2B acd6914f3792b71a2245c8cdb14f143ff3c3b0f8f5176d2808fbaead0c0c57affbc82c26075d7e3c2c31658e29f038200252ca726a4b9ca0eb8fb8e934439301 SHA512 95adc2355a27d916f96c43bee0d4527990a1eba8cee9e4f85cd6da9202ea0ff4fb89fde127abce03962e185b272f5bbd1d8cfb032f6f32c7895bf3dde8d35a2c
-DIST thunderbird-45.8.0-ast.xpi 428059 BLAKE2B c5fae88f8f28689f663a29f260840a3926830085c2aef8f135e2b6b6b1b81f07673e30792a71edeb57be67cca642752f398de7f74cf338fe29d3ffa232a963cf SHA512 eccf877f29099445ef59c833929a50df7424aa475b1ceb432d6c10b28c71b4e25d840a4fedb1afb3106896da0afeb47a3af1b763553dc6ae40f7bda5b0d65040
-DIST thunderbird-45.8.0-be.xpi 469096 BLAKE2B 0f0d064eace3b744a6cfd566981f1071621d0dda9af7a18c60b346598320774cd396057e457f4a83c43a9303c86c75947aa4429c6993ae03d9a1060ec78e48d5 SHA512 76c758a68685f974d174f5787b72e5f1955ba9be00c305e2e1b1adaeb17e4e7bc765d1263d6395cb89656112c936618d84cb80a7dc860684d49a4677638eef56
-DIST thunderbird-45.8.0-bg.xpi 524300 BLAKE2B ae2453ef6b608717162be7ae9c36b701e7dfcb21a3591105f5510162b3b7003fa9852f3a7567b391519ffd47c8652c89b750976e1cb012982a90ffb25adbdcef SHA512 519c1b0555c0bc8e53e28f50fe14c7b5ecd563ab6b6cd1c30886f9d3d7982fe3fd1712c9ea8ca34d2d59dc63ef62fe69bbaf4610c2d25987e4545d82fa611f50
-DIST thunderbird-45.8.0-bn-BD.xpi 581440 BLAKE2B 8d4263bb8e5445cfae7075da85eb99e363e1ef6724edeaf6540945cc34d2775064746aec3dfdd38ef5938b966164a741cc27b2204f17a84309bdbf7e30ab75ff SHA512 de6f8090ebe80131e0d5aeef66287290a6292a12abaa00138d6c7683b8b7d3f619f0b731bc7f45ccabbb670c699404c2c1d606adc6b307c70370224fdd214aeb
-DIST thunderbird-45.8.0-br.xpi 466000 BLAKE2B 9dc6dae3e42037a4a31f8fd7d09f41eb31b33837375ae8e6a313dd87cc462398bc161c9152b041ebe6952286250fd35e78cd7c687e11aa58e90599175d39c860 SHA512 8914cb4869e984ee1207165b5a8ec7fffb822312714dff20e6d1084fad81f596eb310643a34b166dca84739d69a3e8b86ccee2ec0b9dcefe1d6ae39f45ca4f99
-DIST thunderbird-45.8.0-ca.xpi 467980 BLAKE2B 709b220939f9d75a9e4673bd495d7d72f8e85b10e6286ac42dea2d9ff4c4bccd4492b06ac197073f8dbca27f84bb72ee555832a7a5c196a3d327dfd0f16ce322 SHA512 44382e8fb0070dceffeaeff0b78b415da5ff092f3ed50a6a7af67b847ba83245bfa3a37dbbeccaf856fa42de36887b02cf0e2628933e5819e65b8a3d8c856e29
-DIST thunderbird-45.8.0-cs.xpi 474327 BLAKE2B 6bbc7ca5e4fd0a75c3880678324a198a685997f318887ea85a8c11e200365bca2bfe6d26d0a051af7de2c6d45925a2226e69d7a295442bb36be3adf95a094358 SHA512 3c5df605e47145db9687e23fc4b455ce8b8d0e50eb16a8b96e3acd47e7d483721f425cb496e32a211b34d982b4932469da4b4b7cb0ba0a53865aaa5deacacb12
-DIST thunderbird-45.8.0-cy.xpi 456120 BLAKE2B cde270a33eaa7e08e459db9ac767246e43cf7403f73e6b7ed8d8fa24714a9299941c7f6c32f52ffcfa1d0baedce03320529b7ae026e16f251945181a3379b0bf SHA512 9a4ac0048e78ae5e3c0a1305e4f36ea1e1dddb22bc371de77481127273ccd906765dd6add6a7b2ecc8e476a0a9f2caba85c4ce823e5de4e2f211afc17873640d
-DIST thunderbird-45.8.0-da.xpi 445595 BLAKE2B bf83d78ba5b92079ebb678fd78a10c62f9ef05da65a79dcd9bc4bb7bd92d791de86b64376cfbfa7a8078e5d62706a05d3f33fb169fe2a255591dff789942cce6 SHA512 876953576532dd644a1b649c317d29fe9ac89113d9d7ecd8b1ad990f762806e9d90a6b1165041b66b71af288240e7ba7c580b8c3e61572bcb88f7e87810b8a96
-DIST thunderbird-45.8.0-de.xpi 451956 BLAKE2B 4162648755f993b5e2fea4fbc0f0063b403a3eb56b8f257703002a834f122edd5951a1525f4496aa4aea5699245d077afdbec5f6deabaea69ee9b3875b1c79b6 SHA512 73416783898e78d25b716ea36f3d1ae00145eeaf29373fe0c54f1286c229dc791b0d2fad0841049275fa6e078e5ec483fa8ec6acf0ff64f08a54af8cd4d54e23
-DIST thunderbird-45.8.0-el.xpi 514358 BLAKE2B 002193346986d5e72872102283eaedfaf14f147f3d18c4b1d9299979abecb4d3f5cf7a24e80aabba8764cd4a275133b6360293f8105edce34f5df0bc348eb3a1 SHA512 152191eb7008afbd1f7e0c7440643a02d9ff2e1c8fd129322fd928e38acc48e675e0859baa22d53ea36264104e34192ee5533f81ffbd49493b4c1da14b408e97
-DIST thunderbird-45.8.0-en-GB.xpi 437603 BLAKE2B d86d19bfbca1e248d8f569f687b8fd6731650045a96f64388daca40b2d9dc8e7389d974e126fbcec7ba8ba982d109fa7e8be77d902dcee971e0002c3dfbd3f1f SHA512 44438fef8e21c2ab6e1e2ca2558172bb6c30b254f78955e148b5f9d28ef52189573f54a89cecae2cf547606b12497bd36ca007312722069324dc1d9cbe05c1b0
-DIST thunderbird-45.8.0-es-AR.xpi 464684 BLAKE2B e4719006fbfe9c84111f1526219ef9740a3a28bd354210cc20863f050fa0dd885709920c22ec087fdb912b721685a3ea515ec11fd06f4f84f1feedf7be710977 SHA512 60ca7f034f06fda50f90dbbfa7c3d27f54d4eb03cfb570a45e0b3fa2fe59ecb9fbc085ac76fe869f6405538ab28ab0fced785887e190f490f961be60d71fb9b2
-DIST thunderbird-45.8.0-es-ES.xpi 388000 BLAKE2B bd6c07843957edaae4a68bc3f2aa006a05fc20d278c7e8bea21ff15cf8a5f3f1f42652839905a1188914a5da21937dc9f6e3276b8b2c7fe1591c43263812a647 SHA512 08163aefe5686aac1b6b628e5c887d9113a7dcfe8aececbb1861c8c334421816426d234821df34ad6b0e5c79f2b029414b73701c762b0b0b1d272e7ac427c880
-DIST thunderbird-45.8.0-et.xpi 458418 BLAKE2B 56370e368ea0d2888bb24cd581445bcc258ed89c66cc2d3e9e0c30feaf62ba2e27c6abed327c020c46d48b144febe527959f2800a6ec15f1ff675a02518c3168 SHA512 60f69efc44018896f608d11c781a9cd45ab340157d2209ac7741fc0f6346df45fea94a5df0617153cb85fbbd44cd13dfe55adc49a095e0518445fa0ee8dca101
-DIST thunderbird-45.8.0-eu.xpi 456708 BLAKE2B c12d8d102998bd41c69cacbf7644f03c010fc496c76d496640dee29f380840bbdbe3b762e1af1386300aca036b2c98b7f49e0b82661f883dce5b3f9f20dd7ffb SHA512 b33276a681c4c668c5b177ae2d06f47f4e2d92f46d0b878bd16b66ffe941fd777b42291d218040822056c107978a8695e1ba8d901dd5372f4a6dd8cbd0b3e284
-DIST thunderbird-45.8.0-fi.xpi 458335 BLAKE2B e4350b670b84c39efa3156fef6269fdebca7f3e1eb3acea1fb633e5a0a0c0a3b636cfa519d7760f3a5f9960bd866c6c5b61b8ea180c932ba647ccde50a59dc03 SHA512 ecec81fe3b2ca83951e7e464cbc06519b812dc0e6baf7896bc7c89166f839f41a1a707ab16509307141beeeca875522e46d7e97543e5a39f2b42163da0f9ef81
-DIST thunderbird-45.8.0-fr.xpi 475466 BLAKE2B a9c5f0f4e97654a4a0ac97c585a3cb47bb71a16cfe19e294c5c818bbd10b8804ea0476738cd89bcaa7f45465bb57a29c7bf15de191191d57d9ea9556b168c707 SHA512 380aa558c6d248928b7f8cd4d045f6f0e2aeb09700db0a9061a233a935a56f809a14402be561f5d8363c934a4fbbb457c82182a2807da9cf348dc2eb38b60f75
-DIST thunderbird-45.8.0-fy-NL.xpi 464757 BLAKE2B 362a96a64edc42e7d7811881c47932baff14c1caf464a19d6aa67aba75cf38cf037443877955323821c31611ee8f8fb364dbab0111d7a04efbd7fa7d4ae37102 SHA512 9789b24e38aa03240f2e4c3330ec201467b87552fdb94ac1d931d9e3dccba61bf899bf12bbb8a8dc251a787b220056e424597933ca0e9b84e20f40d3dc7422d6
-DIST thunderbird-45.8.0-ga-IE.xpi 480317 BLAKE2B 8ccb8f6fcad3158e1cb4f7e07fc93653ba5d2e5a1908a58dae625dec86fb9fe661dcb29fc188fb72bb64d224091e039580a34ec383b66ca1568ea2af7394c202 SHA512 e3bfe8e7a7dd016a017340d390a8f6f3b62da749995c282da5b0d410b379cc5e2c28e1ed521ad83244c1c75d06839d2d4a1fc88a1d645b40855bdf193392eb68
-DIST thunderbird-45.8.0-gd.xpi 478297 BLAKE2B 307ccc284d2f691ec36e471b2f925edc85978f30617884e3bfff3c25902cd71511305f26f8dd277bbe8dadfefbc5c8312247b8892f748f121ea47a17d17b54f0 SHA512 143e3d210684d35af8bd544259d379a312b9d1c8f06c08021620b1d7d5c929b7e2a90dc16b6248c7162e43e7f86de03530bf357dedd693a0309e3264ab37afde
-DIST thunderbird-45.8.0-gl.xpi 478580 BLAKE2B 5d70a789fddbac18081ceea4590c50c876d99351cdcb2fd7b4061d5c4fabef8eb7f615ac4fb4bdbb36be759a603be38549d992cc420a7e9391a5b765ba9938b8 SHA512 fa533ab715c01d0a4913d09c49db1c95aa1a228bfe260ae7c8d2bb152988719e1b7693f09fac73afe146a726ef5d390b1fa4d194038ae4fa1d0e551d848cbd8d
-DIST thunderbird-45.8.0-he.xpi 497962 BLAKE2B 93e0687d1159c1d4ea92ef7629e8a3722785d88c085b942a8fd1f57cbcb4d3495c8819e8c0dc2c8c39d1f3f4d3c69193586d74fe5316d1dffe66168c4112f41e SHA512 e634831c0d51e82eeafc2e7234da5a3b62b66b2ff17585565ad1a0549b04f334375b05e04a5540723eb2754dd0032ea7f33b15c288600d1587e0bfd699256030
-DIST thunderbird-45.8.0-hr.xpi 463959 BLAKE2B c759f87306a5bf55c53c5b0ac3dd4ce4ddc48ff6bac677b9df3d02c4c357aa25031ab3417470b61b82ca93dc8870ec7381615ee5f57b085404720224990b9a32 SHA512 56161baa7dedd371337b9f49eaafcc72f8ce7f46d72ab1984e27fa8f1ecd442806680752c6d6932a192ac8ac989f514821772c4c5f2db7f55b10bfd14c3f6839
-DIST thunderbird-45.8.0-hsb.xpi 479414 BLAKE2B 1b61d0258a34aa55a04c5da2be18e9965d846a7398b1fcfe0aa9af97b0cdc8b477add5689387ccdfbd6a5fc64177fe661bc11741dbdf75e993f178e52d3c3420 SHA512 18dd3e88a046075c8f10fe96246e322f1adcefaaf0967f119d9ad5f9e3144218c07b13f785041f503ad22eb7e15276e9dbd75dae93c2853771601e2451ccdc7d
-DIST thunderbird-45.8.0-hu.xpi 479583 BLAKE2B a49ffc4122c4d41a8915c439580be4948b6de98183e9d7dbf46ddf186071210771e59955e6b8b5173a5ac6e1f19e2855db7c9611a56be8f980fb4d687ecb9133 SHA512 13deed772fc4ed049342a8ef0be185c28a4b18fed9f145badc8d2c619ba316bdba5bcb10e700aad178b7dcc7f223a62c65489b6001b122667e2ac272b43e6994
-DIST thunderbird-45.8.0-hy-AM.xpi 518883 BLAKE2B 9df3e60070a8bb3b9fe3db89f68b1f0dacb76987a9182f5a3572b117468f031465b5c69b2acb248ce0dfc99a5094d632ae063fee807fffc6646ec591ef77516a SHA512 6444329ff8c906a55b3d2f085a0d8480278761469523225af5f2b02bd167c6ddf6d157aa6d3269ac3a828cc78e6202297cd26e80bce07fd8f87a9fa78e1ff50f
-DIST thunderbird-45.8.0-id.xpi 499982 BLAKE2B a9320a9bfaeb5f421741da2daa0991318aee91261590e639689ba8619dee5e96ba5c647720e9e69a6e0acf41a942c5d7bbc975e9e2460ad51f014a6cb900b047 SHA512 1453f13ae056524bdbfc08d67b44c615d394225d9786b53814b033ce51b8aa4f743e383bb7c754cf12ca61652fbb201670636b2ef324386f47437474074f32a8
-DIST thunderbird-45.8.0-is.xpi 462191 BLAKE2B f6f2f8ca02186cea71906ab3d618bdcf205caa78091904a74e914bbfd548bdc4343da12848cb285212a7bcbd29ef261ec20b5f83b04d08446ce96ba2d7ccaf73 SHA512 f87a537337c651c45f3a9eda2278288ed591539adb1ffe291d8406007502011c5c043e44664b3c93c12036224d3a182c6d0204af06966d32e963db147c64e78f
-DIST thunderbird-45.8.0-it.xpi 376889 BLAKE2B 6872cfd27321c7e8e9753cc90108edd67ab5f02ce9f97691595d2acfb67cc937d897b00be1d4ee4b56628db5ece508a6c3a8b2cb9efdccc77bd95e794434d4a5 SHA512 a2d055136a1c455ba9abfae7dd9d50295ab67e9983f99829652083087bcac14d61e239e92bdaefba3ed4023f51bc1c2e81ebc19d22f90868ec9e11315e8f14d1
-DIST thunderbird-45.8.0-ja.xpi 519552 BLAKE2B 73f0b427709a2464cee6db94e492cf1031c2bebaad7d982d101a3cc36af1aa1183e3e3ae1404fb8c9a3831324fd9722021a4f3c419a062d98a7e25755640bc9e SHA512 45150b526c159cf7d968fd800e552be4c9df2e735ea023ebbb08457d50cebfa5c8f611db0bfe8f43aeb4b1b3d671b4ae20b2722669f6798b4d6d7db4e25cfc9a
-DIST thunderbird-45.8.0-ko.xpi 487418 BLAKE2B 18ae2b872f62b3192a17245846f661f57f557ae8eacc68654a8d416e59c9b63ca28f32d5809e098f3ec31cdc0885bed774efc9029234d92931145066d04cbe1d SHA512 244d7bdc081992362eabb550cd4e1b592d491368ab52b76c0fee6996d52c69b48c3f832dbd3a1f32096e335f8cc7d9bbfeb1c118dba95a9e42502b0d4967dcd3
-DIST thunderbird-45.8.0-lt.xpi 477736 BLAKE2B 2a6669a61ff54018bac9bfc4e3251856424cafb9d83e7d908c73f49804197cb4d9e5690b102c2156c378323a98a72a443443ffc251a51a9d9c2970cfe0dfbd11 SHA512 6d91630b764291191506059019583c07512b1e9182dd9707f6bf8d2b98aba76bb25568699e76c96ddadb969e5312a78635ff0069e75c2d900ede70e71a1c8190
-DIST thunderbird-45.8.0-nb-NO.xpi 460011 BLAKE2B c133ee5cff367d6b247a649df492cbff2cd3653fe5238c65c009539a0c9f9eb71e277959489a349146d3bab3a7e0bebf3c0d02cb097b5dd9a4c8c737ff07cc7d SHA512 00747dc8fca7ddae2d2fee76c1f0bbd6285063f673a3a71c825d86b34d5491f5937e70eee5e9aaa35a9a6b90ff148acfbb34227811f87697ad959601775bb612
-DIST thunderbird-45.8.0-nl.xpi 456664 BLAKE2B b5d5ba384660e9d93bcb10aecb859715b00fd3e53b7a77483fa2514cedca091e7023aef336dde35d5c387e661ead725c81ca46f993df24d42d831059862b870a SHA512 3f6a9c793f263b5cfb00587e42bba85f330fb39b5021ad80471b959280e32513e7f232cbf80366259dfe7119ac7098585c7d213ae62d74a23e84b8f81718a7c5
-DIST thunderbird-45.8.0-nn-NO.xpi 460880 BLAKE2B e80a0cdde8e6d26eba97a005b5583000dc15798eeea14672d57b3c02c392c22273fa2a4e67981b8ffa8438c2805b4a66350739aa4414276589f26511b184c84d SHA512 df073f95c78beb20778082edeb05b9e741e7bda12085b239e8108a6f02e5e453306e016c9f82bd9c866ef4bb3a9decd4697e52f0ed2a1591471da16de8129d56
-DIST thunderbird-45.8.0-pa-IN.xpi 551068 BLAKE2B 062295472818c5cce9aaa9fc93f4e0104ca9cabf7d51b356e7bd8b14ba46ee33c845c480cfa52556bcc99c0a1b1a9a6e8894c2e59960b50a2aa3ffa1c0a3128c SHA512 9e3bb9ee4d43de1ac1635b646db460562d4c243ee62770edb162d029b7bc0ad02d5ce8d72398bd679375c4116a9f3ed2983558521443b433ec69cf3865207393
-DIST thunderbird-45.8.0-pl.xpi 423867 BLAKE2B 113bd30893a924fbcf5ce94e25bfcfd07ecc0914a9d49d52d5ee3394302adf8395ceef57006d448869f4d8a5106021806d289adc5e1b9e39929fd8d7b0ef6ee8 SHA512 779542856f803d0a1873187bee0e60be263300b99aa7b68f081bbd5e269403b90e573f344b3e3a4797b13b796ed8c77e862159e112a6c7bf27f74339d991acfb
-DIST thunderbird-45.8.0-pt-BR.xpi 464682 BLAKE2B d79a193f869baf9579283158ae448c522bef7fbc709611e06af8b457c64df7ef91f4c03970af049ddbc5b3215578f601ce656161e2c03d9aa68ec4802b3b9aee SHA512 c94a56740e41d6aab5bfaec4003ff929b0792193a30107bc60c5a333ef6a07d02f728f6310ccafc88e32735d6d9214ef41041492831f4b16c491d5b8d009b7f9
-DIST thunderbird-45.8.0-pt-PT.xpi 463751 BLAKE2B fbae8ef441558f0ceb6a4808583d4c327fdab5008d87b0719d326a72b22fd647e58645d8479d30e48e5207a10b3340fae30f98125f68cf76e3d5afb647c778dd SHA512 17655a5c35757cbc073253b70114c0b724be62df88158dd2e06455ef62d25d54a96bfb4cfa0616548d6c0d4889c28f1e83de5fb29f068fb0c5de068db78368d1
-DIST thunderbird-45.8.0-rm.xpi 462651 BLAKE2B a2d5ea024aeca39786ce5bdbab1a0770e5be922a82865299a5b38567769437ae5652dd6aa9adb57ccbc630997a6c85da789c84a59faa8be6ebc39a35ec865eda SHA512 e2434f123d5cb49b9654bae9951d75ce9b08d2666299d0e8a89c0d3c64746136c6ea4c6a45b18b637c3ab7c4d38a9256794d532b3173074918b486d2e38f1b9d
-DIST thunderbird-45.8.0-ro.xpi 468518 BLAKE2B 6fa77a7fbf318038249d8d56aaa5a76d7238bdbd64add6603347efdbfbff189b93de9755a2409e1f575016b8e52b43de2e018f1de4dde629e96b49f907eca22b SHA512 d2243647e029c79151de4457c054a1bbb956eac1701a9ef005a1e64a7126ae4f954d09457c28e9d97321675f4d85bac2164210fb14ca8035f9a986ab9e40f206
-DIST thunderbird-45.8.0-ru.xpi 463891 BLAKE2B 7c55401c9df8d05601adea2251db2926236c7a74e8ef255f8b963a2fec3610dc83e9b17a7e3e4422531b814ad18b13b56daac52628632cf1fb9845f5a7aa2d3d SHA512 1186beffbfab301e97a232861e6d38bb772a26642eea1b9b7362eb51df661d1963784023fd7c22b70c858280769f268024dad5aa51a70763bc28854ed1af73a2
-DIST thunderbird-45.8.0-si.xpi 555996 BLAKE2B 9a878ae9f350a257736e5c8be11e1ff726352dce525b6fa2c9379421897574d32c340643a5a734daa970d63b767c2a7a5f96e301e941331732044a3bc347d8c7 SHA512 92096b1d049ba69b0b03de843479b4cd4574f2d1a64582d109329d787d59b6bac97817098a4b1c91e82b55066f761978e1145685b307ebc122ea3db756757756
-DIST thunderbird-45.8.0-sk.xpi 481492 BLAKE2B 9c376b9504feb9ed527eca66e151fd973673daacaff0cf409e74fc72d8699d6a4226eb605745099778ec037e49542724e26878c644fa61b083c38330509f27c7 SHA512 7b91748d06716f3a4baab8d2f2f28d71bd8c878143848d89238559e8a1301c0af8deebeb0158b53da2fcda8fa6a6afc9c58061912a0170ea8de475d25e7b3391
-DIST thunderbird-45.8.0-sl.xpi 462781 BLAKE2B b98c8a3bc28cb7594cf4143c3b2af1a1fea8ef5227f831b82761d6b27504d893f6fe6d674eda4839030af777cd6175a07456f87beca9977f3fa7a638e56a46be SHA512 54f97cddca0d5674ff3338f098fab1f2f5fea07c25acb906fb8c850eb102c8e4205b834c48f1711fe8b658d3980634159b3280d9e6912393b568a81c3f676865
-DIST thunderbird-45.8.0-sq.xpi 469535 BLAKE2B da3a5e92d7da9a542afa79e03ec77ba63016fe3b2c6216fc0727c7871082536a657e41849eba0a30beb36c316bb0e22e065c8c9b9b2e5e6079cb9bdfa92e9cf3 SHA512 dfc9b4da397f7c3a95ec3abdd0632ceaa75de12caf1bdfb5201e4067cb249ab58531f1ab641470d08f3372068cb46734d2a55ab4cccc69706ea439139c07de2b
-DIST thunderbird-45.8.0-sr.xpi 565466 BLAKE2B 05e8fc65f5eafb7d98cf6326b001fcfe0285163d4dd2045a917ac5f63345f74a4825e261c3e789fd4e4a9748ab183addf842c9c6b427b502c474c7091546f059 SHA512 e58e73f3e3143144e48a4431fb4d0089b5232a78b6d2dd50711ed681379522c72d93f005d5bf1c428c99c43f697b22886e351e32faff61a56f27caaa6ac6f955
-DIST thunderbird-45.8.0-sv-SE.xpi 465434 BLAKE2B 3c8ffe588c94a4b919714eafcd6617eed2764bc90f3972b4deb4bfacb84b1f5630807958cecc5a58ab5a0553ae44367362c0b83769aebdcd86475cfee2b50851 SHA512 c35417bf7149cb943f438273fa8b1ba4cbc6399022f7575613318e8440feb4d2fc48eb9fe4d0d3d5fbb52982147f776133aebdcf31ebc9d4bce5d1690da62930
-DIST thunderbird-45.8.0-ta-LK.xpi 579219 BLAKE2B 93ccffc06b68665abb3d34cffcdfbbcd6d286104d429b45d587b012ae78a6ea55cb2e84370403eb536fd2dfa73dc65247f93b58a2882cb0ff28b26602048b392 SHA512 cc4d57b0f2eeae5a6da6389e95f570a4b1ab0259c4784fff6ef6c371c5527459d0c3703bc75427fae593c60eda92e8c20854bacfc87d0b7d7eb81b0ab1e1f5f8
-DIST thunderbird-45.8.0-tr.xpi 467621 BLAKE2B d72e06b9f248311faecfe6e5678a6fc64899e071069204510ed79f072fb58cb78b57e0b20a17da0f43b391d59d2ae8b2fb5fcd223af16d0470120c8050e52e69 SHA512 5a09443dd76e6d46e495a29205131971791e099dab2edbf62104d851efe9adf403e1a69da10804302a858d1b70dfc7c6e8ede36bb3587a550065fe4244a7a306
-DIST thunderbird-45.8.0-uk.xpi 536438 BLAKE2B 8c0bfc720ed1a7a2dda20cbe9fee6e8285c91774a36be27ab68cab6d967240cef1e4ed3eb9e5ddc935427c5fe7df6ba7346cb646bff39988f2063507e26e3860 SHA512 0ab41507494de563e9c1acac7dd97efb566393b1a8cbbddc4e9f473a0d85b816d46bfb24d5c85f6943df7bf59c49d3715baa9209f4e9338407d2d765d1293da0
-DIST thunderbird-45.8.0-vi.xpi 540498 BLAKE2B 196c681c121b0d8aafc34c29e8fb61672479b0b9e8d2fc4ef2761a9e963eab866bee5f25cff95e948cb12a23d9944c7b5fd06d8e7d582478f4a5f2f0205b9070 SHA512 8b25e83624ea59a231af846e4d9baa6d7640c26d70b6e259731f7871af594435d18dd55da1341045b81fc53eb4e9427b5b968d12d6699816911e687a16dcc51e
-DIST thunderbird-45.8.0-zh-CN.xpi 489209 BLAKE2B ddd2b7b6b282a6ce0e2be337fa5d139c2cdeb11a8a61582addbaf1eabb3880de704f2f275976b89f6dd3662f22ad459383358187e3c19629731d268455e382e7 SHA512 346e15d8bec51831c2205a653e84735abfdbc6db1266a8545d138ed11f492d58f3529fc15870eac3c7c28cc60300de2fde85b6927338a2c8fb03ca90449f8a81
-DIST thunderbird-45.8.0-zh-TW.xpi 490850 BLAKE2B ca3c29580b561ee525c2d178dac36a87db12e07c261807d9becb1584b6c3c2a0e14c59f6e3738d65364ee69dc96b19569a0824fa32ce063ac0e23e98b04204df SHA512 0b473f3eadbcc63225c5f2b90d6be26d79a139aa72120d45dcfad4a22a20309f11c4565e72bbe9281f0ea0fe508173e046d3f747975f1619f6717835361ab70f
-DIST thunderbird-45.8.0.source.tar.xz 201199348 BLAKE2B af3f228ca23b1cbaa8fdb37c0cc303f9d54f8767f1b7af4058d93d9b013f8ba501041d104bca4d553dde9cc941b0474024a669bacd454a1cf08b660d5d42d728 SHA512 f8ba08d874fb1a09ac9ba5d4d1f46cefe801783ba4bf82eee682ac2ecc4e231d07033a80e036ad04bda7780c093fb7bc3122a23dc6e19c12f18fb7168dc78deb
-DIST thunderbird-52.5.2-ar.xpi 604235 BLAKE2B e3f465394770c70093d9f55642c5686a07ab2ee9cb9ccc240cb62897cd3468e50e3eabf2fa61784c19cf1d30891fa474564ece3bfdf13e42648a375376b3f23a SHA512 02210011b262f75447f73ed31e584d5ca0774cf4f4a71621e7f0f118f1e5f8007ac362de51bcc1b246103171e5e17e2978b2fdb4b47dc2ffe298e74a6da06084
-DIST thunderbird-52.5.2-ast.xpi 541173 BLAKE2B 536340ece0791c11b67d6b4a23f7ade2fa4e1609a96652bcb7cfd6ee0f3ce3613f5095bf3ae964035cc9bca47ccf66413748a8e1bb53258371e054ea4defd720 SHA512 8dffec5aa3c0a20d7b85fef5160efc38f9296b9099eb3c085fca5528e9eb290a9226ab46097594c5e6799e3b67c13c2075f1ea7b39f039a87b80b1a29e0166bf
-DIST thunderbird-52.5.2-be.xpi 570931 BLAKE2B c21d79d4f2e7eb77710e59b459713e83204f44cfd19084a3a31801f55033ef7cd04448cbc220d33fd1e4a32931554df1ce460046a81d0929a421edde8b545ac0 SHA512 5fc0de75825b5fca44221a838354c74ac39dc72153d1646dfc5f9508fe2d0e54af351bb87cee1ce85b4551571311c223080fbc40a8d95e065e8e9beed08ca1ed
-DIST thunderbird-52.5.2-bg.xpi 634897 BLAKE2B 32cf339ed4c1f0ab6c48f24662682917a283235223f543e7790cd28a8892175d9fb5424a5987b1883f347bea173468103f9aec0f7227d85ce71f21d80c433f11 SHA512 211191e4b0f309e89573801ec74e18bc5fdea89df30ee2283b3a746ddd6a4909d5c8c2b81d222cdf69c36d64573d6f08c36992d1ccbfa6c897bdc538f077b154
-DIST thunderbird-52.5.2-bn-BD.xpi 676900 BLAKE2B 1d9d7a25f782d6f7e685c4521fd0c74730581a259cfb206086c4589d859e99c7f7c92432c5af5538cb2ef6c05f7c083cbb6cc6a0a0e63988ab72818c58e69f3e SHA512 18722a193c17873ff88e8abb206bc0e94868c7755173203489f6082603cfa23b39140665b3c3028dfcd288792fa631aa4baf58eb36ef59435f384a75ffac91b0
-DIST thunderbird-52.5.2-br.xpi 559380 BLAKE2B e34d0d44e6e1fb0199a7124acd785351beaf4e810f4bb77f38da012a35b729ac2eeda2ab4f6f63506a35e090c13760b22d5970476cdc1f33d06c0b4841bafdf7 SHA512 7dc1e29d4f49b7e649a2bdf1e4eeab6b59aa3683fb414beabe6f8ce771cca9f6647739d30f6742f20f8005b52bcf2ae3af2f98c4ef55670c88781d527f2c64e4
-DIST thunderbird-52.5.2-ca.xpi 569910 BLAKE2B d89970dc33faa486ec290bf7a968e6d3335e2c5cdbef38fbfd7486c76a87ef170930c1a4590d79b2eebf157181acea695cdd5fbb765153183aaab04c3281be38 SHA512 1e033db56d0e211bd3999c62fc53efddde70d5f9c7ed3adcee5782b71f06ac21cbef36785938875dba1ff2bff3670e81ced888bf0c4a8c10acecf672f2678623
-DIST thunderbird-52.5.2-cs.xpi 579149 BLAKE2B b252feb937865690a61d0f3395c9869cb013c72f5ae8162a3c37e9c8238d10163e478ee6e78b1b9c0fccccee8298334855b46298d7f84c1a4dd4c299c3892adf SHA512 13645959796cb9bdc90f5418884a9ddfe1c16ff449cc1408199163980eaef0a38c08717c0a63c4028f44677defa04c794a6c6713518720deb83be7314d4c870a
-DIST thunderbird-52.5.2-cy.xpi 554857 BLAKE2B a1dd0fb805a3c222faa3c128b5b392ce33ecfe1b41d723d56781b302c89aba2a61a4a56ee7b722d9cf425aa93c52678ce131164f0ce399ab2c3c58547e99ea77 SHA512 d66380cd6b98bc1ce8910ba35962e2f573b10ca809aba131efe15b3417a43eaf9398403e3ba11de276c66bf3ec65f62c49a2c2e1bd6b3d0df7b9e6ba89a6a172
-DIST thunderbird-52.5.2-da.xpi 543334 BLAKE2B 616af0c6d509a7342266e05286185b938e35c9b2ff427be2d755b22ef692a569605a81a147b6941f37ee3e2b2e5dc64ff2ca16a3be074cfc4dceedc0e92dbe34 SHA512 4e9490db2c1edf8e7e0c9aa7c8f11a348a1432585b07d8fbf072882e0f1f7a46acc9d79a3b0ad84016cf146c30336eded1645f4c390f120c89750ae2c8438725
-DIST thunderbird-52.5.2-de.xpi 555742 BLAKE2B e0ac00b1744dd58078d584ab2c1e4107a8224c217f80aaa559d99528d8b2692dac057c62c64b3dfe394d46ff5eefc2f96d50003d2c80abbc86d4c7d311e68196 SHA512 aff86f3d89004554e5d893548c48d11941ef46114aa513143237da2cc3206014d6769c9885d99e6448337aefcd7d5df57376d9515b268e0c459118493b6ac573
-DIST thunderbird-52.5.2-el.xpi 662964 BLAKE2B f81280db8e759117d4ad42fc50d39df24b3531e47e5b525ea478ac0c98a0ed570fc534dce695f3ad40b3d8484e77236a5040b28b9c0c1e8010814ef130e8a198 SHA512 d7a84df9711dc4b2efb8fea2e9e033558ff5357f1e1aea4096ec877fe75e72becfc535d1dbfa4678bddde7c5835e40e6296a4cb468272f1d475a50cc2148c654
-DIST thunderbird-52.5.2-en-GB.xpi 531234 BLAKE2B d38c668ff79f326fa7ed2cf9bb057f23112ee69e54959d8ec106884ed90c017ea2204bc6231d31ea7a59d8de3a8ffe261f1fdbf72aa3b2cbba352462a1522cf8 SHA512 e2da03639cbb65deed5b0a57cafe703f0c3f3afb6aee2f8f35474ff57b9db9479128b0d509e03684ba8d60739ad3a90288ebbc37a2b01b3ce1de49a407145e54
-DIST thunderbird-52.5.2-es-AR.xpi 565995 BLAKE2B 3c2c722521772f11699a87866e1ab7541711954d6d2f804b17bac482b5a0bb68bfde24f465473b3ca13db4926fddf9aa059f24d7a8f090b9cc9cec7c06dc4ab0 SHA512 541f2d475912e884bc3d8c4a10656154bfd928620020c230b2a39a0ff98dedce9a5c51f37b1513845dce6077051d1abd03cb39c9a9294146538f3c3fbf31773d
-DIST thunderbird-52.5.2-es-ES.xpi 445464 BLAKE2B 9d098011a2b335a21c8065ccc9d6991359936c6c015d52f9f9b2c4eacae30f7d104d3d23bdf811963af7219894bc62b4d6994bdcc380db23593f37f402a504ac SHA512 1860e065c3ecea2233bd100bb6aed98d4d3722135128ebf0b21d13ce8fc07f6e6401d54f3db9a787537f7213b99c466b22f64a3afd45a7d011c54d651a17f37c
-DIST thunderbird-52.5.2-et.xpi 551661 BLAKE2B f2ebf8057be9e80ec9deefee86e629d8f3de9f8663c25b9839917c41704f52e90213ff096377f599477115ec91df230cc1082236b76de0a3107452d30c18ff7d SHA512 8a0e68816d9a34f825e89bac58e4839b106d958a1345dcd88ebe32e2c3ca30c28d028143752b1464643aa3253b3cd4bb2eb19c0568ae81979ae2c15be0e32e51
-DIST thunderbird-52.5.2-eu.xpi 555536 BLAKE2B 230999784972e65eac87944abf95b2abbf04851f356f5d6defd6e9ee11d0d9fd4d4973c8fb912cf68cf1c52bf945639659de07c56e6e4367683c3ed4c5b346c9 SHA512 dd3f6fc78cc6af42d23047269f6ea1aac6a2d095a6143a32a4427aa541b9638b53be5e2c1fe3a9a953c25384079b68f0d490e17296297935f5acbbc756f2aa96
-DIST thunderbird-52.5.2-fi.xpi 550669 BLAKE2B 45907946f7787361142ff7c89260d295f72519c0f0f2fa1533a234cc9777975898a8cbc4ebd5f5454c744b058d066ad35a0ba94fbdf47317a27d48cdd8a852e5 SHA512 4766bffdb5598e9b63a0a3bae318dea0372ddaf1970e02227f1fc4f202c74ff1e614eb9f8a1ede467de73763539fe69a5d3123b5ff3a629d8dd344977f35236e
-DIST thunderbird-52.5.2-fr.xpi 577560 BLAKE2B 54b401165a255694841228c6443b247e44cd16209299346ba490a5c8f44527bc4db4284c081067d7d8e0e19cbb383330f93053dd9a1d35615c47abb2867fbd4c SHA512 01bf169dea44813fb5bbc54eb460b6a17f9e089cda630d0553802163d5f0ea0597b48e24a1252fb8e592ca8b731d9c9c1641065a704a109abbb248e34155692e
-DIST thunderbird-52.5.2-fy-NL.xpi 563631 BLAKE2B f8b20fe95103af8c1660037b489026998a05d6f99af2e1f715791725e64fcab7ddca96bdf74aa546c7cbef3f517c1f0b954d6efa98a012c2f64ec7cc2bcab563 SHA512 68fb685fe1c82b33a81793cba8ee4ff524df3e27be50952dcceabc8c169088b7cd325073f509f247c46980fc1f2ac9ca43ee3d5236340ec91d2c1ab31de68422
-DIST thunderbird-52.5.2-ga-IE.xpi 583555 BLAKE2B 2cd216291eb8a20db81006f23424d1bef4230f949fa9f5865a84e8426aa52aa53ae69ab58e9cde071f3628ba635bf71bfb4b0b13d2e1807f8942b9425314b4b5 SHA512 5c25d164ad4b887a80a320ae473ed8d8d5e5f19850877a991a3bd4e442d922e876cb51218fe49b4ebf02107758f448701047ec83cf2ceea3518c82e80a8561ae
-DIST thunderbird-52.5.2-gd.xpi 574065 BLAKE2B f58a87f1aa97980bee95f790adcdc412e4846730edbcdaa5a5fb1eb2c8325e4e6dd496a9505cff8920ff82320064e086ebe96705b525240284e8eb6d66289920 SHA512 809d86de1a2a02058b4d9a4e08edc02721b851de8bc5bb132f7675239a15a59f14678d203906f61e01c15dbc11d3f7aff948602ecfe0326d619cbff3214ef7ff
-DIST thunderbird-52.5.2-gl.xpi 575150 BLAKE2B a596b4d2a64b40e6ccbd84eed4996e28e98f985d46155930b2b665b796ea51853329f6b5d724c8c8ec051772f3217cbdc39dded961104e48f3cfc4db46851b15 SHA512 64f1e28cc6d32d1a68c70b944993f6511f85f58d2446d2097ce5f9b549a8bfb5fa068f958178c7537128f24479ad143213a0b5dbd252e276377e77a28b8b87a0
-DIST thunderbird-52.5.2-he.xpi 592565 BLAKE2B 438c022cab867aa02e4ea39b2917eae6fc82bcd314d3bec15fed0035b2ca44342228f5d405de263045c87fbf685a4cd5c8f3e919e2eafb45ed3505bbb33cec44 SHA512 b3780199848c5d3042c34addd5817e58145800f02adaf3229765a5eb6115a262e6cd577bb4c25550585f7d9098e7234be92cb9a0ddc0c055d103bfc36c18bda3
-DIST thunderbird-52.5.2-hr.xpi 564778 BLAKE2B ed9aafb9bc6afce3b4c98cc61ee74f6ad76025efd032242fb44fcd865b60321b693aa8e912ff3d3cb07acddb65440ffc40cf89e2795ec293b56eacd9bfb2bb67 SHA512 b806dccab5736cd08658e5e10749b7205d424ebfda361fbd0d103448ce6f54eeb21ad1ed508c57824aa15b62c96a1e1c99bed6b7cc1c7e67e6f4eb70d0209265
-DIST thunderbird-52.5.2-hsb.xpi 582241 BLAKE2B 97c615f22b438f64ad22f1da573e399ea198d3b6b1f42aecc3747966c63d78ebb02c7e61d675bcc4965030a86e7fbc2d6d5eb8381788bf089db52a9a41234089 SHA512 6aabaf035563dca0b44d74a9f058b193f946c4b71b659da97a435eb66b4d64a8fb83a40953225f9e475879aae10f2fa0d194f27ab2012d544896fa67e046ef0d
-DIST thunderbird-52.5.2-hu.xpi 586445 BLAKE2B c0acfa73b81d072f6e2161e58c8bb3c484ec36ea4b987f2e137190bff9183f3e3aca01f8e922bb0eab0069b60bd20cfe98344be4aeabd9e09458427cdd5f87f3 SHA512 c83fb8168856b928130faa7c6efbd36c0bc3a6bb3ca07eb82b41a8795ee2ca938a86ee391a4800d4d33ef66202ad1ec272bcb57359bc421661ea8f565f8fba99
-DIST thunderbird-52.5.2-hy-AM.xpi 629879 BLAKE2B 5d77cb479d03eb0b625624ef5a81f269376a67d046c4e0cabbba3106c10cdf666d0dd8eff2e0e15c842579bd82d51c267d3f8243ce81f7f106fad5f3b9976c9a SHA512 9626e7254717444e8e0415665f263b2c7ca55f6b192e709d5bcc24bd6359d029f3406b1c9b3aac0fe231fa566e2e02fcde596bce0a7668a0af665646f26cd94d
-DIST thunderbird-52.5.2-id.xpi 546525 BLAKE2B 548487d7f429624b9163a206676c2c9c163884057720a84bb4798cc948dcd4e04b8229a2db86edc52aae305df7c4a0c5d0f7f57b75546e03fb684933a6491fb4 SHA512 60583ec6808ed13e0063417686260d7cbccc83b527306b4a73177326ce4c2364bbdc5c109627d3bd3344bd41d94d6721916a5fb8d7b1583cae1cbe4c09b16b63
-DIST thunderbird-52.5.2-is.xpi 555712 BLAKE2B 54e5fa2b07a7d58e1b832541dc5c55f22711f4e665e9556a4e6e79f60254cc8200a376ea19c962cf55be72189b9aa90a19e1cc0df3d1313a5cf1dfd58328bbc6 SHA512 fed94fdc500fb5e4b3fdb9da85c2eb02bce45c4bd8ddaa52ef571562ef4430578156aaaaf89c1a854682232e49afc62787d8958ddec4d45d03f4104a373c371b
-DIST thunderbird-52.5.2-it.xpi 455407 BLAKE2B 2f7a95e3d3e79c78691757839096014cdcacea648bc6b0aa08ccc6a9147fd3a906fbe9c1c43065433c918e4866e5b00f50a3ff513571e7e73dedc4f9ca15d322 SHA512 ed94e588def3be4bcdbf85de073f86db0ddb7d035dd1a11f0f4f06895a9c70ac379b296619644648d626db438f870184f7f5e0d9a5b2899d045d0f4a00db3d3d
-DIST thunderbird-52.5.2-ja.xpi 630052 BLAKE2B 4b0187d7a60a30cb58cb326cced5d810e23db9768e7b2b683dafeb4c2501cdb94b96efef17a9b8d2571e295cf36d15ed67dba2247b428eefaae706a247fa2519 SHA512 15a1ced10c2b3a871ee7cfadb0df30c6e2e34a3cad1d71fdfac4d4f67c31ebae820b585dcd720cd142c0ae1455c25220e084360fbad754ee6f53777765256000
-DIST thunderbird-52.5.2-ko.xpi 595517 BLAKE2B c41a98cc7b2c796b42c4a9af1985f90b9de9d376aca70262e6f14c7a90f638761c3e7ac714ea9a7a494971fd0c50a11cdfa4db78d6ab7b4dc1707253cb18337e SHA512 9315c8806b26187eef91f2be2b0d3edfc2ea94dd93931c267cb38d7340bb4fd85282a67a316e1b1b7b8b1ddc129c21416a3ccc0b89c34a6eb6c0a4c57f7bca41
-DIST thunderbird-52.5.2-lt.xpi 580598 BLAKE2B f49badaf1dae0b2c67d4ad7342eb995e3af6f49f5e2233d2cd701d584fa275b742b3c03d361496642757a90596b18d97acedcffe0bc802d5c0d40b95084c278f SHA512 2f07bf92cda02556c79c219d81022fdf2395c6e3f817e0426a68dcf78e7d40a65072b16be113b65fd83e3dac23d234c4456578a8b2951dd68b03ebdf000502d9
-DIST thunderbird-52.5.2-nb-NO.xpi 551103 BLAKE2B cf7a1161e4b0716a4773711fffcd6125fdfa18b6910418c03641f23c9b04d6f63a86100bee2943060a8cee66c9338b8ef4bdafecc948098a016c7de19773ed94 SHA512 23b4d40c919ca9ff3d00d9cd3382fd8b6c0e6264b10a161ff160cfb817fab189cf62c441c6f721a77749352c388e832b9c13a8decf09277bf598d7c30ef197cf
-DIST thunderbird-52.5.2-nl.xpi 557956 BLAKE2B a8eae91281839eada490902fbb6e27f61f8a8c299b5ce063ffe7f128a2ff08f1431852ba218d1fdb0ad0e926f11585675cb3a58bac56a8fd398430c9b80a2502 SHA512 d2a88424aacee91a66e94eefb5082fd600e17987e173d40677451160acc9e574dad6101dcb9c8c732f2e62bf6972937e1e7386b43884c912aaeaf10611e7bf3a
-DIST thunderbird-52.5.2-nn-NO.xpi 551891 BLAKE2B 6da415512808c3f01600172389bc89000e4ece35bebe4e936b8992c29be084ea06943a39ec41b65d3adff856a1f93a62ef5caadb92be924d8f397b02b7123d56 SHA512 d9a7399bf306e7a016af94321a9078a366a0f6c563180555f4c347fe078a23d526dde7793e7517c9250a401023e4c8b3b5066f886c6965eb5fd461d1aafb6795
-DIST thunderbird-52.5.2-pa-IN.xpi 646568 BLAKE2B 39d82b07405f5d880d8a60a79598f47bba24da34e1bd8dc15f43d01996968b21a8dd43a002ddd70bde86a90cadb773547a45f219cdc8dd4bd15349035ebaf05d SHA512 ad300f12fe808f37a647add7d858b165baecb50714b170bb85255139d5aee291db245afd311855355c2e66e9c6fb7106673de016d99d88bf190b29b67982080e
-DIST thunderbird-52.5.2-pl.xpi 469901 BLAKE2B e364a6d95c3676f4ee67b4aef4bfa1ecb20950dc4b37e040a8877a077edba626b927520f0738f913f4daa670dd0ecea3e7afdef46fe77c6d24bd24b1bb44dc16 SHA512 1377713ff089fd97dbfbf19ce3130e734b7b1812c76f0923f7706d615de96c0ba99b6e0bc324173b640a3da4cfcbc7b4aaa5cbd5ae79b761d25a3cdb7dfa2ad9
-DIST thunderbird-52.5.2-pt-BR.xpi 558223 BLAKE2B 2c45f3793563ba04876506ea3a63bcc37a50f822bf3e7bd5498459b0ba1a329af7a47c4899b9382820197b9bef03897a99b94d24dd8494a12c5b7e185742f499 SHA512 cd8305e02f2da478b47039f755ef0ac2e26085e2c9ccc100ad74970b966729e40aaaf9ba6560c2bfbec65bd917688513a93fa9fdb465b0bb520fec74adc48048
-DIST thunderbird-52.5.2-pt-PT.xpi 565623 BLAKE2B 1daaaf86a36d108db95859b84d279ff01b01c37d61c5b9aaf04cbdcfff346b9f94c5f6f393eccbba293730a1b0a28b8b654291a56c4647e43c9f130a4ca74814 SHA512 9739bfa53e7dbef088efd339acb2f9179d11a45bcfb379a8c8866f7f5dbf0f0c2726d084ed1f1d767baf547bf1c9c87e232483c6b8181dc71ba42f3d7de33475
-DIST thunderbird-52.5.2-rm.xpi 557605 BLAKE2B 7718c6a00e3d2c9c6cdc675e19e79ce0401196edfd0633e6786f16aeba50ab1acc3fda19c6765e840d9f817ef250cbf834ae6f25347cd64706b132044410597e SHA512 33e674f8a06c63c2da1587de36d7382549d6a87e7b16c1d19b158bc4ef7360882d2ba88f09021ba9c0088b63571f753838a437036d761442e193e224c0004671
-DIST thunderbird-52.5.2-ro.xpi 570529 BLAKE2B 2433724d4f0cda267ebc013477385b01e1fe1a726dd250cd690da5163779e27e617b5b995ec8d1b8ff2a4a7005898df50a1c54012f9e99d4dd82bb3522cdb722 SHA512 23748b39d7e713eb0a76186c4a4c7f9a2e91ffb4e79a9de689661dcc7155f768469846ae13622cd0706b29da549e2db0ab405c627859e99d6fd0818210ebd9e6
-DIST thunderbird-52.5.2-ru.xpi 530669 BLAKE2B ec40d7499c9bf239cd532674fddedc7d6597f603265f53343e13a9d861f933de52bf01d05ebe574cb22db7bae9e7d334ecd6690a7dc20513800133ef35fd5d04 SHA512 f62fca78fe5496ee4b5f717f6605084a6c15cf419e05ad36dd3ab85b18ba966f016bb4c28c745c6a6216a38a09078a22bbb65eb23127dec07cabe5fc4381b51a
-DIST thunderbird-52.5.2-si.xpi 649010 BLAKE2B 2cab25eb8ee2ea5fa55d3a900ab9dbebc36bf713c342424cc4868e2ec12a33e1e5341386442b241e11bc5100e017a1acb84907f3ce276cbc7af6ad8508862e1f SHA512 256ff4325008600b2e7dd8eb5292bd29d97a4651d6269cab9cde313086f1743a6c3f4bcbef9b9c9ae3dc33337be7b38f3cbe74438a4c8ce179b2e5a5409140a5
-DIST thunderbird-52.5.2-sk.xpi 583881 BLAKE2B 7bd2fc714eba8de432b163c1fd0b3447e4787eccd3fd1b9626aa50b12c55a52ae066b3c923dd453e7ab6813c21ec9e1f000d2f4aa8232a7f0a0626003dae2e88 SHA512 0df3d8b5bfc76f16f3bdbbb91395b79bb8e75f2e52c5951a797b076b32854e471af826c76a40118108a4cc12a02ae671a639d713c85a79aa5bd570d71750341d
-DIST thunderbird-52.5.2-sl.xpi 562830 BLAKE2B ed615db6d82943508797243bbbb0f9971f22746f6163a55f9bbb1639121b1f92550ddd4103a927a2fb98fbb8c6748ec9b9c60ea7ea7c39343bd87b50392824af SHA512 e12545d9ac9e11c70ba46830f0f3eb5310e8eb79243eabe4c6e37c98a686f5dcbd87a1b8ccc82a84b1632c0f69acd21eb089dbb1fad9a977d11efabed4592052
-DIST thunderbird-52.5.2-sq.xpi 570616 BLAKE2B a76eb0a920dc66049a9bf738b744f23441820b4ebcc924f85c0d2e2b0ce89779602d2e661f744e4be6a5c09e26734b8371b4b216be55b7c5545281225dfff3c0 SHA512 36318b44315136e710ab0f9e8cdfc9fc8b01cc1c572ab1824f220553822d9ecb88bafe4bf542c22af719a3514b7aa3df3614d1c9b24a1ca65f1dba93950fdfde
-DIST thunderbird-52.5.2-sr.xpi 609019 BLAKE2B ebf75d134f5c1068b0af85832189044e276b2d810e8bf04e2b8e88fa2847367ba85039bedd19f023531c03eb6e55ce9440e468d546c693828efd6780658cfeec SHA512 1a363ed44fa7e5fcc45de715b4c2a49b8969232df8fca0e788e1da70a383a3592e248c1a0a86fe008f2a61862b707cccca7780d244920535b78f53ec60cabe72
-DIST thunderbird-52.5.2-sv-SE.xpi 565777 BLAKE2B 5aad813df062ae91a9f5620669596a57f2cb6f4a93bf1c38cbfa20fcf439fad10982198ba03adeff3ab19b92d6d1656493dba8cbb52a2791982ff94b39758b16 SHA512 989c41dc501a110282eeaefb565f77dfbcda431cdf4fc9450a0ffb84b592a66571439a0e3b2f8b7e1b42da4bd974a444217d19ef9d9bc9b01ed64ed5ff33e65a
-DIST thunderbird-52.5.2-ta-LK.xpi 675039 BLAKE2B 7ed5685af0acc38428a20138aaa71ea27ec530b7e747770c0617d5df214a3b5e3a067e041d8d769360e2166074acbf3c28f161e1469ffaf1a0c62a149525d91e SHA512 4d39ee85518d1d31b4976597ea6d639fa0372820fe4c42969855d85b6913bc4c316ae7f1eae53d48c1f9e5219afd3357ed9755533cc57fe37ad3b12e835db641
-DIST thunderbird-52.5.2-tr.xpi 569926 BLAKE2B b5652ee98df2299e0a6349ed83d3cc3cf460bee5555a1dd9331dcde258906f620e76cc29db6e7d109df764992b44439d467dcc881a2dc9258c6168a9c8ec92db SHA512 e5730cd99ea5ec4eff39bb1b3a7a0f65dc44dee0109cbc47f18303371c965733cd9b90d43698e16ed5ccaeceddc1507306f8994e1bc482a71dd07b26d2eb4cdc
-DIST thunderbird-52.5.2-uk.xpi 652854 BLAKE2B 251940a9f696d7b72fcd0171f8f0046c0f7810892b02a987e44b84205757ca32c5f427c4fbade383c8b7a22693d0d4e29710ee7acf7ebe2c1dc0e42e356e0a84 SHA512 c5e52078f06ec77b148d11992bdbab993b6c2cee3dabb66d52a376365960267b2ed29fdce2bc6ee4e1e526d56b97122c242e20f556b79ed93451bcc3d80c9912
-DIST thunderbird-52.5.2-vi.xpi 637163 BLAKE2B 500b5ead1dfee91cb5978ee4d0b30050461ee6d3e35fa5850f677f92a7ede3bebd9922fe03eec40c5fa5d02d5d34ae61b1038f5b4e068ae656e2b2feb8eb4e15 SHA512 c23260b7bd64769b61ff8bd86a8d0d0b5484d6abdc588e1c5b24df4276f0ccccc5e3d78e2a280cba7022ceab578e76ff6808461fecf04280188ece97a0319692
-DIST thunderbird-52.5.2-zh-CN.xpi 593611 BLAKE2B 20f22074684477f55a65b55e19f1d0c619b33dac325eb23bad3e2d57669d92e7a04c96d5fbe45876bd78ee1164df5e45e6bb47cf6497d11e6437c8e5fbaeda8f SHA512 49f429b4fedac5179a5529e8eecfdb1f1872778382ff887c51a57deae2cb8a34680a0d7f7f7dd7684f640d12bbfaefe0d52f4fde272a9cbb9bb7664e3e14f7fc
-DIST thunderbird-52.5.2-zh-TW.xpi 595728 BLAKE2B 65ba2aa3945820cb2fce6a16e7f21cb023da2a867dc414100dfe0f33ba230407495c596b63c96c14fe4976a516a34634b058d42e4d7697d98b871517a93d7249 SHA512 e2dc77c43bdc4c7e8dbf43618c0a526825eda4bf630ae60438878b376b9ac2c36c71dcba7a68f3ac6b41d9fc4fc6e7e79679a53c3f3765fa0ebe4ae6d6b4b73b
-DIST thunderbird-52.5.2.source.tar.xz 230369636 BLAKE2B b1fe2dab986298de590cf7beab9845459ac7582119179599842a4577de7e402d7cdc569dd6b36db017690245df576f96066bf3dfa77be24a35b700559ce56942 SHA512 d626d3d37959539b15b5d2ae4a580fcc160380974bfc1a69a1fc8ff2435932e90a69fa386d5ecb6721d9154603c6b7d063e3368f6f995fea057eb593c06ef4ff
 DIST thunderbird-52.9.1-ar.xpi 604235 BLAKE2B 7981734de83b22d428e4b988adb938cf7b0ad0b54142ca14cc7e7bdf38729b57f4c9c56a22c939d322ce03aed55d6f1b726bf6fa23d5f35347602691a2b435e9 SHA512 03d93c275c0e38b07519bfbd893118ace69928eedde0d236e72c6900aafe2137641f76155a0e02fcb4b9185ff8e49c04937022b75b0e85d7ea9de05b90e2d727
 DIST thunderbird-52.9.1-ast.xpi 541173 BLAKE2B 060a8ee63b93bdd230aa49328f37c109458c4caf3b4b719b10f461ec3b9f5141ce61d67d8ac1ac3c83ef098a8d4b6afdcb695cf895fa94e1de23ecdb555f257b SHA512 689911ecf9a92e3dd25eb305fc3d1179b4739f608e3be67c5367da3fdf0508951b816547333e1b2f16dbc20afd0407996b933309b6eaa3bca2340993a6d475a8
 DIST thunderbird-52.9.1-be.xpi 570931 BLAKE2B f5a58a51bcd00cc256bc7d97813d89c46feef2ffdea07be3f9509b2dd1787fbde81f49d64e1a1c63d2a09d54a07de9fa8f2c958f74609293f61af9fb971c1ff8 SHA512 6ca311620b04a604801771a40a7405aabb2499624dcb3bb10eaa3f0a6dcec1cb8c2db3f9ab51b1f505b164be89bcafaac1dc0cba3f3f8067f48c4dd61852c469
@@ -242,9 +123,6 @@ 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
-EBUILD thunderbird-45.8.0.ebuild 11907 BLAKE2B 9c59384a0af373242f9c0178ce2d9ecfa47d462d35b937ba6f7822db31ab1f7ac0f6c74039f8ac616d10461e7d6a343ecb1e3c17e1f8648b45200d4b6d04a9ee SHA512 fdd92606748e698b21b6f8c3a37aad0e107de5326a5e20cb53b48878b153e7a77c01e30aea3a9e60a187da3265efc36bbbc2783d5edcda921ca3d172b801f1e3
-EBUILD thunderbird-52.5.2.ebuild 10421 BLAKE2B eae5e5b0aa7a10289518343dfc8471a185fcf8bbdd789eca86615be2263fb6e300aee27c82f54133518893060dec53f5488f32c61dde6f585f2e018a9cc2580c SHA512 e1f50c390c7c889c546fbcbe18f1aedf976a3d79ce9531aad20389e736df1b7ca0e7cdd11c9bb140c160e2db537e707b4ba272c9d4b7235eb1cfc2ecfa634930
 EBUILD thunderbird-52.9.1.ebuild 10477 BLAKE2B afcc8251288a25fab08a79fa124a4160885c1f0649c5288c170a87de543144c89086aa1c1299cc7bf73edc2c8ff445d9f4805f7c85e698c307181956017398fe SHA512 0e5ec531150c4803e9fdbed0065ecba4817c5fce5c61cc5c5b89e0cf1e7e66cf77b5d10c441fa8da44242261c42b843a0613bfb119db997163f26e87cb27ef90
-EBUILD thunderbird-60.0-r2.ebuild 11298 BLAKE2B 6d6220ea518a1e295412ab74a08fbe2aff799d2b527bd0e04deea446af5b218e695cfed7e8c4441fe57cc57a2438416ec772045d11c5a484a98005c15271dc9b SHA512 c8f1f840321f889454fbb7e2e6984263749818f4fd7bb30a96e41aa41cca6a822d280cd1dd6289e9787c511a79073b9b21914993a43631ee55fc7fcec0c887e3
-EBUILD thunderbird-60.0-r3.ebuild 17535 BLAKE2B fa4ee07bd1081ce46fb233822eaf3aa4b512f975e266378ce1b36048e832fc8b38e33f073e4efd89e7da05514f76968397905ada4cf90440074ee8ed6c03562f SHA512 98eb42f685d53fdf00b5303486af777ffb1309c81f78bd2aff1821e7280601e880887ab6439ce9ea94ee597c422180511574f3c3dc5fc3228c697d263bdf8c72
-MISC metadata.xml 2079 BLAKE2B ed410923adba7e1f7bc974ea97276ed922c3afdf39aa14c30d83b989fa827527da4360c7e57694c60728a12c3a2be37a5ee3c6a4e0aa9de397077ec6ed70fa04 SHA512 32557048cd4954a940dd22491566d507f23fe8004224b27c951527934c659141aa80552b771b8c8e5e19cda6a72c30e6255e13413764debb3644518b2a2b0fbf
+EBUILD thunderbird-60.0-r3.ebuild 17535 BLAKE2B 54471ae7025b588fd96e8cbb106261d28889a07fcc3980538bee52581d47b21ce92f16381e66f0121eb01edf0e7556fdea8eaefef5e6b33624ffe7c02c7a9aa6 SHA512 c16584a4c375e8f91083dc0fb16086aa1615672cbc973943d1dfeeb54183a253354198e4e3df43a4f7d09af68acf13a4f4fbbdc6760c6571898a22c21023c996
+MISC metadata.xml 1979 BLAKE2B c3d4ba5e77d6e9edfc13cfc90e54526e4e157df85f22953caded074dded690a22f323c1097b609c3b21c5b908816b131b2aeffb271c0b6878e49368d3626a75a SHA512 5960ca9793fb094c4c39cb4777c1be4e0078d74a6b9981427f9cc295931e086fbead0ab28d9c1fe409c6b7215c86e950658092783c1668344bb453e77d26146c
diff --git a/mail-client/thunderbird/metadata.xml b/mail-client/thunderbird/metadata.xml
index 26c62acdb14b..7fdeae0d1242 100644
--- a/mail-client/thunderbird/metadata.xml
+++ b/mail-client/thunderbird/metadata.xml
@@ -17,7 +17,6 @@
 		(-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="jemalloc3">Enable or disable jemalloc3 (forced-on when supported prior to 38.0)</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-45.8.0.ebuild b/mail-client/thunderbird/thunderbird-45.8.0.ebuild
deleted file mode 100644
index b1403696f42a..000000000000
--- a/mail-client/thunderbird/thunderbird-45.8.0.ebuild
+++ /dev/null
@@ -1,369 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WANT_AUTOCONF="2.1"
-MOZ_ESR=""
-MOZ_LIGHTNING_VER="4.7.8"
-MOZ_LIGHTNING_GDATA_VER="2.6"
-
-# This list can be updated using scripts/get_langs.sh from the mozilla overlay
-MOZ_LANGS=(ar ast be bg bn-BD 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 pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK 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
-PATCH="thunderbird-38.0-patches-0.1"
-PATCHFF="firefox-45.0-patches-12"
-
-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}"
-
-MOZCONFIG_OPTIONAL_JIT="enabled"
-inherit flag-o-matic toolchain-funcs mozconfig-v6.45 autotools pax-utils check-reqs nsplugins mozlinguas-v2 xdg-utils gnome2-utils
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
-
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist crypt hardened ldap lightning +minimal mozdom selinux"
-RESTRICT="!bindist? ( bindist )"
-
-PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/{${PATCH},${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}-r1.tar.xz )
-	${PATCH_URIS[@]}"
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-CDEPEND="
-	>=dev-libs/nss-3.21.1
-	>=dev-libs/nspr-4.12
-	crypt? ( >=x11-plugins/enigmail-1.9.6.1-r1 )
-	"
-
-DEPEND="${CDEPEND}
-	amd64? ( ${ASM_DEPEND}
-		virtual/opengl )
-	x86? ( ${ASM_DEPEND}
-		virtual/opengl )"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-thunderbird )
-"
-
-S="${WORKDIR}/${MOZ_P}"
-
-BUILD_OBJ_DIR="${S}/tbird"
-
-pkg_setup() {
-	moz_pkgsetup
-
-	export MOZILLA_DIR="${S}/mozilla"
-
-	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
-}
-
-pkg_pretend() {
-	# Ensure we have enough disk space to compile
-	CHECKREQS_DISK_BUILD="4G"
-	check-reqs_pkg_setup
-
-	if use jit && [[ -n ${PROFILE_IS_HARDENED} ]]; then
-		ewarn "You are emerging this package on a hardened profile with USE=jit enabled."
-		ewarn "This is horribly insecure as it disables all PAGEEXEC restrictions."
-		ewarn "Please ensure you know what you are doing.  If you don't, please consider"
-		ewarn "emerging the package with USE=-jit"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-
-	# this version of lightning is a .tar.xz, no xpi needed
-	#xpi_unpack lightning-${MOZ_LIGHTNING_VER}.xpi
-
-	# this version of gdata-provider is a .tar.xz , no xpi needed
-	#use lightning && xpi_unpack gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.xpi
-}
-
-src_prepare() {
-	# Apply our Thunderbird patchset
-	rm -f "${WORKDIR}"/thunderbird/2001_ldap_respect_cflags.patch
-	eapply "${WORKDIR}/thunderbird"
-
-	# Apply our patchset from firefox to thunderbird as well
-	pushd "${S}"/mozilla &>/dev/null || die
-	eapply "${WORKDIR}/firefox"
-	popd &>/dev/null || die
-
-	# Ensure that are plugins dir is enabled as default
-	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
-		"${S}"/mozilla/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}"/mozilla/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
-
-	# 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}"/mail/installer/Makefile.in || die
-
-	# Don't error out when there's no files to be removed:
-	sed 's@\(xargs rm\)$@\1 -f@' \
-		-i "${S}"/mozilla/toolkit/mozapps/installer/packager.mk || die
-
-	# Shell scripts sometimes contain DOS line endings; bug 391889
-	grep -rlZ --include="*.sh" $'\r$' . |
-	while read -r -d $'\0' file ; do
-		einfo edos2unix "${file}"
-		edos2unix "${file}"
-	done
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Confirm the version of lightning being grabbed for langpacks is the same
-	# as that used in thunderbird
-	local THIS_MOZ_LIGHTNING_VER=$(python "${S}"/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
-
-	eautoreconf
-	# Ensure we run eautoreconf in mozilla to regenerate configure
-	cd "${S}"/mozilla || die
-	eautoconf
-	cd "${S}"/mozilla/js/src || die
-	eautoconf
-}
-
-src_configure() {
-	MEXTENSIONS="default"
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	mozconfig_config
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Add full relro support for hardened
-	use hardened && append-ldflags "-Wl,-z,relro,-z,now"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --disable-mailnews
-	mozconfig_annotate '' --enable-calendar
-
-	# Other tb-specific settings
-	mozconfig_annotate '' --with-user-appdir=.thunderbird
-
-	mozconfig_use_enable ldap
-
-	mozlinguas_mozconfig
-
-	# Bug #72667
-	if use mozdom; then
-		MEXTENSIONS="${MEXTENSIONS},inspector"
-	fi
-
-	# Use an objdir to keep things organized.
-	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.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
-}
-
-src_compile() {
-	mkdir -p "${BUILD_OBJ_DIR}" && cd "${BUILD_OBJ_DIR}" || die
-
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
-	emake -f "${S}"/client.mk
-}
-
-src_install() {
-	declare emid
-	cd "${BUILD_OBJ_DIR}" || die
-
-	# Copy our preference before omnijar is created.
-	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js-1 \
-		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	mozconfig_install_prefs \
-		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js"
-
-	# 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 in_iuse system-sqlite && use system-sqlite ; then
-		echo "lockPref(\"mailnews.database.global.indexer.enabled\", false);" \
-			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
-	fi
-
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
-
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
-	emake DESTDIR="${D}" install
-
-	# Install language packs
-	mozlinguas_src_install
-
-	local size sizes icon_path icon
-	if ! use bindist; then
-		icon_path="${S}/other-licenses/branding/thunderbird"
-		icon="${PN}-icon"
-
-		domenu "${FILESDIR}"/icon/${PN}.desktop
-	else
-		icon_path="${S}/mail/branding/aurora"
-		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}"/mailicon48.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}/mailicon${size}.png" "${icon}.png"
-	done
-
-	local emid
-	# stage extra locales for lightning and install over existing
-	mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/lightning \
-		"${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
-
-	emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
-	mkdir -p "${T}/${emid}" || die
-	cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/lightning/* || 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
-
-	if use crypt ; then
-		emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' "${EPREFIX}"/usr/share/enigmail/install.rdf)
-		if [[ -n ${emid} ]]; then
-			dosym "${EPREFIX}"/usr/share/enigmail ${MOZILLA_FIVE_HOME}/extensions/${emid}
-		else
-			eerror "${EPREFIX}/usr/share/enigmail/install.rdf: No such file or directory"
-			die "<EM:ID> tag for installed enigmail could not be found!"
-		fi
-	fi
-
-	# Required in order for jit to work on hardened, for mozilla-31 and above
-	use jit && pax-mark pm "${ED}"${MOZILLA_FIVE_HOME}/{thunderbird,thunderbird-bin}
-
-	# Plugin-container needs to be pax-marked for hardened to ensure plugins such as flash
-	# continue to work as expected.
-	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
-
-	if use minimal; then
-		rm -r "${ED}"/usr/include "${ED}"${MOZILLA_FIVE_HOME}/{idl,include,lib,sdk} || \
-			die "Failed to remove sdk and headers"
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-
-	# Because PM's dont seem to properly merge a symlink replacing a directory
-	if use crypt ; then
-		local emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' "${EPREFIX}"/usr/share/enigmail/install.rdf)
-		if [[ -z ${emid} ]]; then
-			eerror "${EPREFIX}/usr/share/enigmail/install.rdf: No such file or directory"
-			die "Could not find enigmail on disk during pkg_preinst()"
-		fi
-		if [[ ! -h "${EPREFIX}${MOZILLA_FIVE_HOME}/extensions/${emid}" ]] && \
-		   [[ -d "${EPREFIX}${MOZILLA_FIVE_HOME}/extensions/${emid}" ]]; then
-			rm -Rf "${EPREFIX}${MOZILLA_FIVE_HOME}/extensions/${emid}" || (
-			eerror "Could not remove enigmail directory from previous installation,"
-			eerror "You must remove this by hand and rename the symbolic link yourself:"
-			eerror
-			eerror "\t cd ${EPREFIX}${MOZILLA_FIVE_HOME}/extensions"
-			eerror "\t rm -Rf ${emid}"
-			eerror "\t mv ${emid}.backup* ${emid}" )
-		fi
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-
-	elog "If you experience problems with plugins please issue the"
-	elog "following command : rm \${HOME}/.thunderbird/*/extensions.sqlite ,"
-	elog "then restart thunderbird"
-	if ! use lightning; then
-		elog
-		elog "If calendar fails to show up in extensions please open config editor"
-		elog "and set extensions.lastAppVersion to 38.0.0 to force a reload. If this"
-		elog "fails to show the calendar extension after restarting with above change"
-		elog "please file a bug report."
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/mail-client/thunderbird/thunderbird-52.5.2.ebuild b/mail-client/thunderbird/thunderbird-52.5.2.ebuild
deleted file mode 100644
index eed3239798d3..000000000000
--- a/mail-client/thunderbird/thunderbird-52.5.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
-WANT_AUTOCONF="2.1"
-MOZ_ESR=""
-MOZ_LIGHTNING_VER="5.4.5.2"
-MOZ_LIGHTNING_GDATA_VER="3.3"
-
-# This list can be updated using scripts/get_langs.sh from the mozilla overlay
-MOZ_LANGS=(ar ast be bg bn-BD 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 pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK 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
-PATCHFF="firefox-52.5-patches-02"
-
-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}"
-
-MOZCONFIG_OPTIONAL_GTK2ONLY=1
-MOZCONFIG_OPTIONAL_WIFI=1
-
-inherit flag-o-matic toolchain-funcs mozconfig-v6.52 autotools pax-utils check-reqs nsplugins mozlinguas-v2 xdg-utils gnome2-utils
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
-
-KEYWORDS="~alpha amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist crypt hardened ldap lightning +minimal mozdom rust selinux"
-RESTRICT="!bindist? ( bindist )"
-
-PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/${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.28.3
-	>=dev-libs/nspr-4.13.1
-	"
-
-DEPEND="rust? ( dev-lang/rust )
-	amd64? ( ${ASM_DEPEND}
-		virtual/opengl )
-	x86? ( ${ASM_DEPEND}
-		virtual/opengl )"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-thunderbird )
-	crypt? ( >=x11-plugins/enigmail-1.9.8.3-r1 )
-"
-
-S="${WORKDIR}/${MOZ_P}"
-
-BUILD_OBJ_DIR="${S}/tbird"
-
-pkg_setup() {
-	moz_pkgsetup
-
-	export MOZILLA_DIR="${S}/mozilla"
-
-	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
-}
-
-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
-
-	# this version of lightning is a .tar.xz, no xpi needed
-	#xpi_unpack lightning-${MOZ_LIGHTNING_VER}.xpi
-
-	# this version of gdata-provider is a .tar.xz , no xpi needed
-	#use lightning && xpi_unpack gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.xpi
-}
-
-src_prepare() {
-	# Apply our Thunderbird patchset
-	epatch "${FILESDIR}"/1000_fix_gentoo_preferences.patch
-
-	# Apply our patchset from firefox to thunderbird as well
-	pushd "${S}"/mozilla &>/dev/null || die
-	eapply "${WORKDIR}/firefox"
-	popd &>/dev/null || die
-
-	# Ensure that are plugins dir is enabled as default
-	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
-		"${S}"/mozilla/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}"/mozilla/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
-
-	# 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}"/mail/installer/Makefile.in || die
-
-	# Don't error out when there's no files to be removed:
-	sed 's@\(xargs rm\)$@\1 -f@' \
-		-i "${S}"/mozilla/toolkit/mozapps/installer/packager.mk || die
-
-	# Shell scripts sometimes contain DOS line endings; bug 391889
-	grep -rlZ --include="*.sh" $'\r$' . |
-	while read -r -d $'\0' file ; do
-		einfo edos2unix "${file}"
-		edos2unix "${file}"
-	done
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Confirm the version of lightning being grabbed for langpacks is the same
-	# as that used in thunderbird
-	local THIS_MOZ_LIGHTNING_VER=$(python "${S}"/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
-
-	eautoreconf
-	# Ensure we run eautoreconf in mozilla to regenerate configure
-	cd "${S}"/mozilla || die
-	eautoconf
-	cd "${S}"/mozilla/js/src || die
-	eautoconf
-}
-
-src_configure() {
-	MEXTENSIONS="default"
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	mozconfig_config
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Add full relro support for hardened
-	use hardened && append-ldflags "-Wl,-z,relro,-z,now"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --enable-calendar
-
-	# Other tb-specific settings
-	mozconfig_annotate '' --with-user-appdir=.thunderbird
-
-	mozconfig_use_enable ldap
-	mozconfig_use_enable rust
-
-	mozlinguas_mozconfig
-
-	# Bug #72667
-	if use mozdom; then
-		MEXTENSIONS="${MEXTENSIONS},inspector"
-	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
-
-	# 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}" \
-	emake V=1 -f client.mk configure
-}
-
-src_compile() {
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
-	emake V=1 -f client.mk
-}
-
-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-1.js-1 \
-		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	mozconfig_install_prefs \
-		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js"
-
-	# 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 in_iuse system-sqlite && 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
-
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
-	emake DESTDIR="${D}" install
-
-	# Install language packs
-	mozlinguas_src_install
-
-	local size sizes icon_path icon
-	if ! use bindist; then
-		icon_path="${S}/other-licenses/branding/thunderbird"
-		icon="${PN}-icon"
-
-		domenu "${FILESDIR}"/icon/${PN}.desktop
-	else
-		icon_path="${S}/mail/branding/aurora"
-		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}"/mailicon48.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}/mailicon${size}.png" "${icon}.png"
-	done
-
-	local emid
-	# stage extra locales for lightning and install over existing
-	mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/lightning \
-		"${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
-
-	emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
-	mkdir -p "${T}/${emid}" || die
-	cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/lightning/* || 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
-
-	# Required in order to use plugins and even run thunderbird on hardened.
-	pax-mark pm "${ED}"${MOZILLA_FIVE_HOME}/{thunderbird,thunderbird-bin,plugin-container}
-
-	if use minimal; then
-		rm -r "${ED}"/usr/include "${ED}"${MOZILLA_FIVE_HOME}/{idl,include,lib,sdk} || \
-			die "Failed to remove sdk and headers"
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-
-	if use crypt; then
-		elog
-		elog "USE=crypt will be dropped from thunderbird with version 52.6.0 as"
-		elog "x11-plugins/enigmail-1.9.8.3-r1 and above is now a fully standalone"
-		elog "package.  For continued enigmail support in thunderbird please add"
-		elog "x11-plugins/enigmail to your @world set."
-	fi
-
-	elog
-	elog "If you experience problems with plugins please issue the"
-	elog "following command : rm \${HOME}/.thunderbird/*/extensions.sqlite ,"
-	elog "then restart thunderbird"
-
-	if ! use lightning; then
-		elog
-		elog "If calendar fails to show up in extensions please open config editor"
-		elog "and set extensions.lastAppVersion to 38.0.0 to force a reload. If this"
-		elog "fails to show the calendar extension after restarting with above change"
-		elog "please file a bug report."
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/mail-client/thunderbird/thunderbird-60.0-r2.ebuild b/mail-client/thunderbird/thunderbird-60.0-r2.ebuild
deleted file mode 100644
index 093c38a9f2db..000000000000
--- a/mail-client/thunderbird/thunderbird-60.0-r2.ebuild
+++ /dev/null
@@ -1,365 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WANT_AUTOCONF="2.1"
-MOZ_ESR=""
-MOZ_LIGHTNING_VER="6.2"
-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-02"
-
-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}"
-
-MOZCONFIG_OPTIONAL_WIFI=1
-#MOZ_GENERATE_LANGPACKS=1
-
-inherit check-reqs flag-o-matic toolchain-funcs gnome2-utils mozconfig-v6.60 pax-utils xdg-utils autotools mozlinguas-v2
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
-
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist crypt hardened lightning +minimal mozdom rust selinux"
-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
-	"
-
-DEPEND="rust? ( dev-lang/rust )
-	amd64? ( ${ASM_DEPEND}
-		virtual/opengl )
-	x86? ( ${ASM_DEPEND}
-		virtual/opengl )"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-thunderbird )
-	crypt? ( >=x11-plugins/enigmail-1.9.8.3-r1 )
-"
-
-S="${WORKDIR}/${MOZ_P%b[0-9]*}"
-
-BUILD_OBJ_DIR="${S}/tbird"
-
-pkg_setup() {
-	moz_pkgsetup
-
-	#export MOZILLA_DIR="${S}/mozilla"
-
-	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
-}
-
-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
-
-	# this version of lightning is a .tar.xz, no xpi needed
-	#xpi_unpack lightning-${MOZ_LIGHTNING_VER}.xpi
-
-	# this version of gdata-provider is a .tar.xz , no xpi needed
-	#use lightning && xpi_unpack gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.xpi
-}
-
-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"
-
-	# 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
-
-	# Shell scripts sometimes contain DOS line endings; bug 391889
-#	grep -rlZ --include="*.sh" $'\r$' . |
-#	while read -r -d $'\0' file ; do
-#		einfo edos2unix "${file}"
-#		edos2unix "${file}"
-#	done
-
-	# Apply our Thunderbird patchset
-	pushd "${S}"/comm &>/dev/null || doe
-	eapply "${WORKDIR}"/thunderbird
-
-	# simulate old directory structure just in case it helps eapply_user
-	ln -s .. mozilla || die
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-	# remove the symlink
-	rm -f mozilla
-
-	# 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
-
-	eautoreconf old-configure.in
-	# Ensure we run eautoreconf in spidermonkey to regenerate configure
-	cd "${S}"/js/src || die
-	eautoconf old-configure.in
-}
-
-src_configure() {
-	MEXTENSIONS="default"
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	mozconfig_config
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Add full relro support for hardened
-	use hardened && append-ldflags "-Wl,-z,relro,-z,now"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --enable-calendar
-
-	# Other tb-specific settings
-	mozconfig_annotate '' --with-user-appdir=.thunderbird
-
-	# Disabling ldap support causes build failures with 60.0b10
-	#mozconfig_use_enable ldap
-	mozconfig_annotate '' --enable-ldap
-	if use hardened; then
-		append-ldflags "-Wl,-z,relro,-z,now"
-		mozconfig_use_enable hardened hardening
-	fi
-
-	mozlinguas_mozconfig
-
-	# Bug #72667
-	if use mozdom; then
-		MEXTENSIONS="${MEXTENSIONS},inspector"
-	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
-
-	# Default mozilla_five_home no longer valid option
-	sed '/with-default-mozilla-five-home=/d' -i "${S}"/.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
-
-	mozconfig_install_prefs \
-		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js"
-
-	# 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 in_iuse system-sqlite && 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
-
-#	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
-#	emake DESTDIR="${D}" install
-	cd "${S}" || die
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	DESTDIR="${D}" ./mach install
-
-	# Install language packs
-	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
-	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
-
-	emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
-	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
-
-	# Required in order to use plugins and even run thunderbird on hardened.
-	pax-mark pm "${ED}"${MOZILLA_FIVE_HOME}/{thunderbird,thunderbird-bin,plugin-container}
-
-#	if use minimal; then
-#		rm -r "${ED}"/usr/include "${ED}"${MOZILLA_FIVE_HOME}/{idl,include,lib,sdk} || \
-#			die "Failed to remove sdk and headers"
-#	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-
-	if use crypt; then
-		elog
-		elog "USE=crypt will be dropped from thunderbird with version 52.6.0 as"
-		elog "x11-plugins/enigmail-1.9.8.3-r1 and above is now a fully standalone"
-		elog "package.  For continued enigmail support in thunderbird please add"
-		elog "x11-plugins/enigmail to your @world set."
-	fi
-
-	elog
-	elog "If you experience problems with plugins please issue the"
-	elog "following command : rm \${HOME}/.thunderbird/*/extensions.sqlite ,"
-	elog "then restart thunderbird"
-
-	if ! use lightning; then
-		elog
-		elog "If calendar fails to show up in extensions please open config editor"
-		elog "and set extensions.lastAppVersion to 38.0.0 to force a reload. If this"
-		elog "fails to show the calendar extension after restarting with above change"
-		elog "please file a bug report."
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/mail-client/thunderbird/thunderbird-60.0-r3.ebuild b/mail-client/thunderbird/thunderbird-60.0-r3.ebuild
index 256c7511bb70..b10d1f685493 100644
--- a/mail-client/thunderbird/thunderbird-60.0-r3.ebuild
+++ b/mail-client/thunderbird/thunderbird-60.0-r3.ebuild
@@ -79,7 +79,7 @@ CDEPEND="
 	>=x11-libs/pixman-0.19.2
 	>=dev-libs/glib-2.26:2
 	>=sys-libs/zlib-1.2.3
-	>=virtual/libffi-3.0.10
+	>=virtual/libffi-3.0.10:=
 	virtual/ffmpeg
 	x11-libs/libX11
 	x11-libs/libXcomposite
@@ -264,7 +264,7 @@ src_configure() {
 		# Force gcc
 		einfo "Enforcing the use of gcc due to USE=-clang ..."
 		CC=${CHOST}-gcc
-		CXX=${CHOST}-gcc++
+		CXX=${CHOST}-g++
 		strip-unsupported-flags
 	fi
 
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index ff7a7e29b468..0f0c8107c4bf 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index b645540219c2..062336c6d349 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -1,4 +1,5 @@
 AUX amavis-mc.initd 384 BLAKE2B bc481913a052855add95b0149177754e95742bcafe70b3e44699b2765126d401bb6d406ca09f2252f768b2b8354209fdb35fb9d5c64f6749c83c1d5ca1e52767 SHA512 96bb67ce2088c2c4b3187d55040db4ef9f281506a368ceca54df3b90d3e9c6e8c8be96c8010c581c7b2fc75e8439892db800b361da75ed9549a89d94cf7d95df
+AUX amavisd-2.11.0-dkim.patch 428 BLAKE2B f9c1bcab637febaf0546f204db0260cb7dc6bc35e27092545f99fb13cb2de27638a3cb04177de6dcb406c216a1168f44141e477f460eced830ba4376581005af SHA512 85628ad2b9c1cde478b579865d414fb941798aafe8968d26af5ef9dddf0f9ec4a3ed1e2077a46ee0632a9ce9be159ad9696badad35a1117cb7437c2ab0c4a973
 AUX amavisd-snmp.initd 692 BLAKE2B b47671b5e8962a151cda0369bf13eba302e37e2f014fddff63f1a1d706868cd14d82c9141a79f8d123fb50cd95251f45407a6bb884398899e456dcf972bc37d0 SHA512 0e8513f7bfb03ae6d28190edd0f4f59b87f81b412b68dcfa3c91d77fd138d4e92ff6b36864bb590d214c08d9f73ec5de694e5fbc1b7e1d27ae0e532f052e3910
 AUX amavisd.initd 716 BLAKE2B 1376292c5560add4b85c7fa3e34454d9999e9602997525d85b088c3660093f68027dd9fa95c205d75ea7c2ecfcc2fec200a59b5af3fee2ce87a09419822bee22 SHA512 e7f1f9f233b26402101d501ae09d6774d8483637f2c2180eee706015790ea2ea494a14b1ff17e3b600ca4571bfaa895d8df65682993e1fc9ce5c31d37f9548c3
 AUX amavisd.initd-r1 710 BLAKE2B 46d484e167e45f5a5772373a4d636727ceda2feecf2e6260c737d513f1d7fb563b069c5e79a28459a6c75fd382cf106a260bd4d94c7b0c76bfca7dbf74ac30ef SHA512 0c45276d4b487c9550b36a56e1e296a401fb46985dafe1227bf70ec840fc4a255e959026ef31dffbd0719ebbcec064619e096602ab32da2b95776030772878de
@@ -12,6 +13,7 @@ EBUILD amavisd-new-2.10.1-r4.ebuild 4704 BLAKE2B b9a7a614f3ce46e95818f074a003f3c
 EBUILD amavisd-new-2.10.1.ebuild 4647 BLAKE2B 6a94883de88d63224f6bc126a8db5fbac1f12d1eee0375aa38f99921f097ecd38c4a76585f5b8899e07ba677d55843837f663e93d2991449ceed404723705929 SHA512 34c03fa676550f125dc0445b1e953356566e7a6a8d7d171b0145e21dd030e82a4478fec217fa478ef7df589598529eec114858b9252807edec09d0473d2e8568
 EBUILD amavisd-new-2.11.0-r2.ebuild 4516 BLAKE2B b4ffc91098bc1391b9c2cb0c044e7395d4e2e6872b1fd20322394143bded6374dc61998f0eb976005b74971fdd803456f263a713b2d354770cffea97e7dade0a SHA512 cd507065732fa2a2e2f87830005ef466abec65e58778c1219d560d05ef3b0ee701161ecbf1e045d1f57e47fcab921c5a92d8a1c9420c63adb5536f07b7169b48
 EBUILD amavisd-new-2.11.0-r3.ebuild 4605 BLAKE2B 5e08b390567ea546fa4bb7ab8371dabcef91cb0c39d2ff87cfab4580f2f878c3a066f4d607fb57f214c9b4e837c079ecce80157662df805768f2f1e3db33e469 SHA512 0e349d6bf27c0492688b3715270dcc4e49d2ce2b2050a08d7f8b8854981752efa32361c661982e3eec083efb571a0fa831cba6d040f9799d1facee4b59fa893a
+EBUILD amavisd-new-2.11.0-r4.ebuild 4765 BLAKE2B 686ce5268c24939367746162f50944cd2134e0fb6db5e3377caf9af6928f71c44d6e6b2f8f31984e1b56d1082ae432fc051538b1a8cce068e23a8acdd713e4d4 SHA512 e60e42e868f28dd9768578ab3203cd7153574e7ca32f900126b387c87453f0a5d05d2eee6132ff5e22a0d04ccd83def090871e2ce59a36fda0a2fe3b00999fec
 EBUILD amavisd-new-2.7.2.ebuild 4162 BLAKE2B df8e094ae544f60187d9d0b437c8429ec08de5a89b205bb37fe3e9c164a482023b6ba3599b6081cde4707311e533c4736a683454c38df59013e6b545fd490833 SHA512 39dd3b56f6fce585329eb159228dd2afe354ffd3ec3ac24dfec79b6b569f5345ef98cc9be7587d557f140ac96a0e412941c264545b2d47dec676a409141ff8b4
 EBUILD amavisd-new-2.8.1-r1.ebuild 4804 BLAKE2B a049093a184f387c3c4e7be7ecbba2838279d6461d54956c419e659cdaafbf5712a6bc03c35ca0ac314ae8442d3c52ba9a14b642a46e2b8b0de035702fca0807 SHA512 290fdbe57f59ba560c99e2abad84e0c4456be394986128f42161b67d22586c34f7fc59cd79099f525864565f06fbe7357626cadee5bf1f18cd97f4621852675f
 EBUILD amavisd-new-2.9.1-r2.ebuild 4683 BLAKE2B a76172816b36ccde43c3c4f82d95a558407aac07627dd90676150d4190ce408d310f4d8ca8e314787ff6a2e6fedacc37bfa6ea06f1e1224c6aab00faec007995 SHA512 cd5bbcfa7ba32fb3471d958b49d0c1f4a4a12235c08d12340752bdbaa6d88773c75d1b19b960a1aa33cad72d107eb5de72ca80465f878a53e8cf858c8bae2ac1
diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.0-r4.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.0-r4.ebuild
new file mode 100644
index 000000000000..0efc27e64544
--- /dev/null
+++ b/mail-filter/amavisd-new/amavisd-new-2.11.0-r4.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit systemd user
+
+MY_P="${P/_/-}"
+DESCRIPTION="High-performance interface between the MTA and content checkers"
+HOMEPAGE="https://www.ijs.si/software/amavisd/"
+SRC_URI="https://www.ijs.si/software/amavisd/${MY_P}.tar.xz"
+PORTAGE_DOHTML_WARN_ON_SKIPPED_FILES=yes
+
+LICENSE="GPL-2 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq"
+
+DEPEND=">=sys-apps/sed-4
+	>=dev-lang/perl-5.10.0"
+
+RDEPEND="${DEPEND}
+	>=sys-apps/coreutils-5.0-r3
+	app-arch/cpio
+	app-arch/gzip
+	app-arch/bzip2
+	app-arch/arc
+	app-arch/cabextract
+	app-arch/freeze
+	app-arch/lha
+	app-arch/lrzip
+	app-arch/lzop
+	app-arch/ncompress
+	app-arch/p7zip
+	app-arch/pax
+	app-arch/unarj
+	app-arch/unrar
+	app-arch/xz-utils
+	app-arch/zoo
+	net-mail/ripole
+	>=dev-perl/Archive-Zip-1.14
+	>=virtual/perl-IO-Compress-1.35
+	>=virtual/perl-Compress-Raw-Zlib-2.017
+	net-mail/tnef
+	virtual/perl-MIME-Base64
+	>=dev-perl/MIME-tools-5.415
+	>=dev-perl/MailTools-1.58
+	>=dev-perl/Net-Server-0.91
+	virtual/perl-Digest-MD5
+	dev-perl/IO-stringy
+	virtual/perl-IO-Socket-IP
+	>=virtual/perl-Time-HiRes-1.49
+	dev-perl/Unix-Syslog
+	dev-perl/Net-LibIDN
+	sys-apps/file
+	>=sys-libs/db-4.4.20
+	dev-perl/BerkeleyDB
+	dev-perl/Convert-BinHex
+	>=dev-perl/Mail-DKIM-0.31
+	virtual/perl-File-Temp
+	dev-perl/Net-SSLeay
+	dev-perl/IO-Socket-SSL
+	virtual/mta
+	clamav? ( app-antivirus/clamav )
+	ldap? ( >=dev-perl/perl-ldap-0.33 )
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	razor? ( mail-filter/razor )
+	snmp? ( net-analyzer/net-snmp[perl] )
+	spamassassin? ( mail-filter/spamassassin dev-perl/Image-Info )
+	zmq? ( dev-perl/ZMQ-LibZMQ3 )"
+
+AMAVIS_ROOT="/var/amavis"
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# amavisd-new version 2.11.0 breaks DKIM signing of outbound mail,
+	# see https://bugs.gentoo.org/603582
+	eapply "${FILESDIR}/amavisd-2.11.0-dkim.patch"
+
+	if use courier ; then
+		eapply -p0 amavisd-new-courier.patch
+	fi
+
+	if use qmail ; then
+		eapply -p0 amavisd-new-qmqpqq.patch
+	fi
+
+	sed -i  \
+		-e '/daemon/s/vscan/amavis/' \
+		-e "s:'/var/virusmails':\"\$MYHOME/quarantine\":" \
+		"${S}/amavisd.conf" "${S}/amavis-mc"  || die "missing conf file"
+
+	if ! use dkim ; then
+		sed -i -e '/enable_dkim/s/1/0/' "${S}/amavisd.conf" \
+			|| die "missing conf file - dkim"
+	fi
+
+	if use zmq ; then
+		sed -i -e '/enable_zmq/s/# //' "${S}/amavisd.conf" \
+			|| die "missing conf file - zmq"
+	fi
+
+	if ! use spamassassin ; then
+		sed -i -e \
+			"/^#[[:space:]]*@bypass_spam_checks_maps[[:space:]]*=[[:space:]]*(1)/s/^#//" \
+				"${S}/amavisd.conf" || die "missing conf file - sa"
+	fi
+	eapply_user
+}
+
+src_install() {
+	dosbin amavisd amavisd-agent amavisd-nanny amavisd-release \
+		amavisd-signer amavisd-status
+	dobin p0f-analyzer.pl amavisd-submit
+
+	if use snmp ; then
+		dosbin amavisd-snmp-subagent
+		use zmq && dosbin amavisd-snmp-subagent-zmq
+		dodoc AMAVIS-MIB.txt
+		newinitd "${FILESDIR}"/amavisd-snmp.initd amavisd-snmp
+	fi
+
+	if use zmq ; then
+		dosbin amavis-services amavis-mc
+		newinitd "${FILESDIR}"/amavis-mc.initd amavis-mc
+	fi
+
+	insinto /etc
+	insopts -m0640
+	doins amavisd.conf
+
+	newinitd "${FILESDIR}/amavisd.initd-r1" amavisd
+
+	systemd_dounit "${FILESDIR}/amavisd.service"
+	use clamav || sed -i -e '/Wants=clamd/d' "${ED}"/usr/lib/systemd/system/amavisd.service
+	use spamassassin || sed -i -e '/Wants=spamassassin/d' "${ED}"/usr/lib/systemd/system/amavisd.service
+
+	keepdir "${AMAVIS_ROOT}"
+	keepdir "${AMAVIS_ROOT}/db"
+	keepdir "${AMAVIS_ROOT}/quarantine"
+	keepdir "${AMAVIS_ROOT}/tmp"
+	keepdir "${AMAVIS_ROOT}/var"
+
+	dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES TODO \
+		amavisd.conf-default amavisd-custom.conf
+
+	docinto README_FILES
+	dodoc README_FILES/README*
+	dodoc -r README_FILES/*.{html,css}
+	docinto README_FILES/images
+	dodoc README_FILES/images/*.png
+	docinto README_FILES/images/callouts
+	dodoc README_FILES/images/callouts/*.png
+
+	docinto test-messages
+	dodoc test-messages/README
+	dodoc test-messages/sample.tar.gz.compl
+
+	if use ldap ; then
+		dodir /etc/openldap/schema
+		insinto /etc/openldap/schema
+		insopts -o root -g root -m 644
+		newins LDAP.schema ${PN}.schema || die
+	fi
+}
+
+pkg_preinst() {
+	enewgroup amavis
+	enewuser amavis -1 -1 "${AMAVIS_ROOT}" amavis
+	if use razor ; then
+		if [ ! -d "${ROOT}${AMAVIS_ROOT}/.razor" ] ; then
+			elog "Setting up initial razor config files..."
+
+			razor-admin -create -home="${D}/${AMAVIS_ROOT}/.razor"
+			sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \
+				"${D}/${AMAVIS_ROOT}/.razor/razor-agent.conf" || die
+		fi
+	fi
+}
+
+pkg_postinst() {
+	chown root:amavis "${ROOT}/etc/amavisd.conf"
+	chown -R amavis:amavis "${ROOT}/${AMAVIS_ROOT}"
+}
diff --git a/mail-filter/amavisd-new/files/amavisd-2.11.0-dkim.patch b/mail-filter/amavisd-new/files/amavisd-2.11.0-dkim.patch
new file mode 100644
index 000000000000..d9aa07d732ba
--- /dev/null
+++ b/mail-filter/amavisd-new/files/amavisd-2.11.0-dkim.patch
@@ -0,0 +1,12 @@
+Origin: https://lists.amavis.org/pipermail/amavis-users/2016-July/004428.html
+
+--- a/amavisd
++++ b/amavisd
+@@ -34338,6 +34338,7 @@
+     $sig_ind++;
+   }
+   Amavis::load_policy_bank($_,$msginfo) for @bank_names;
++  $msginfo->originating(c('originating'));
+   $msginfo->dkim_signatures_valid(\@signatures_valid)  if @signatures_valid;
+ # if (ll(5) && $sig_ind > 0) {
+ #   # show which header fields are covered by which signature
diff --git a/mail-filter/bogofilter/Manifest b/mail-filter/bogofilter/Manifest
index eb1a0c41e8fe..c661bde39c5c 100644
--- a/mail-filter/bogofilter/Manifest
+++ b/mail-filter/bogofilter/Manifest
@@ -2,5 +2,5 @@ AUX bogofilter-1.2.2-gcc34.patch 1393 BLAKE2B e5f1c3fca416ab76114aeaa2da700b4c8c
 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 3784 BLAKE2B 3523d28e8d929393a27bbbffeb8062e674538af3e13f3796b99b1b566ba41e14d5742a5f69d324fe2ed959ede637dab278af9c0fcbcdb7447ed2670a3317f4fb SHA512 dbc7dc698e83762e5beeb70a3b00a327ea6f898630b5f4c3e454e7a5dfcdcf524edc33102ac4335fb63f8039d6d32864e0071fc03fd73072875dcc7d531479da
+EBUILD bogofilter-1.2.4-r2.ebuild 3779 BLAKE2B c92a3ef27e359b61fc1f9a27de6c70994796ae59c91560838fdf44f2079ea71ba25aaeba648b94316bae835bb07954b4e6bcf22cb2e58e3d227ee5b00710d9cb SHA512 61b790cca316f76517ae4de404bebd5cf6da3108807db18d15d31fed2e5de18645564316050393ecb995a9ec77af7335c86885cec1f0789afbea2cc295a01b2b
 MISC metadata.xml 681 BLAKE2B 847326098ccdb227a492c2c03c6173e8260db73a91df37ed739511402fc2466476cc7ffb5c356b203b46945524224237bcec8058e2ef19d0436c25a2611003cf SHA512 cce40d35e042c532ccac225225ca6a137a041f9da6f8f0696cfd4b12fa6876662379bf2cc01e36bb91bf32479561be0ca44b20a86a7788448207a35983042277
diff --git a/mail-filter/bogofilter/bogofilter-1.2.4-r2.ebuild b/mail-filter/bogofilter/bogofilter-1.2.4-r2.ebuild
index 0be07cf8a7bf..da01b7d26747 100644
--- a/mail-filter/bogofilter/bogofilter-1.2.4-r2.ebuild
+++ b/mail-filter/bogofilter/bogofilter-1.2.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=6
@@ -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/mate-base/Manifest.gz b/mate-base/Manifest.gz
index 3bebff54fa77..581cc4b77118 100644
--- a/mate-base/Manifest.gz
+++ b/mate-base/Manifest.gz
diff --git a/mate-base/caja/Manifest b/mate-base/caja/Manifest
index b882198159fa..f330596ee4cd 100644
--- a/mate-base/caja/Manifest
+++ b/mate-base/caja/Manifest
@@ -1,9 +1,3 @@
-DIST caja-1.12.7.tar.xz 3645820 BLAKE2B 75f76841b6a14aff27521d9a8db40f5ebfa536a10c727a272439c1ea8d54c9cba191eedcbdf2b8af42c92cd30f4f4b300bc159e3813239e6addd5a11a557945b SHA512 32761370cc419ab8d8f815a291782d1ce380d04bf2450dbcea9d0f17d91a1c0b9a487a67a51a0c769a5fcb11091638a7b60e27b28f3148899ba44fb6feb313da
-DIST caja-1.14.2.tar.xz 3560252 BLAKE2B 6fc45445c279085276a55f718f809db9813fc6602b45018487529a85176915fef5713492448b55703355e422da47d23b60365de1a675403d21b0a3290cd2fc00 SHA512 ef0c42e26fbeb2a2296c67fd0a1f59d18b104ba818761600dec2ab571fbd5a1d659471105b97a9fcd7b0e16afa1dfdf860decad1f65b299964017932f7dfdfbc
-DIST caja-1.16.6.tar.xz 3511140 BLAKE2B 88f965d89ecd027d76c64143d99dd0820f338aa2e6260702eca0f3ec0893fddddd0fffc26e2e678973ed12e27e0e3b9126490d845178d779341c0ddcd18f008b SHA512 21553b44e97f3d294996de59af151471928d0153234f986c0a3cd639ce0661eba5182975d3f03915f7e5ade72266837c9ba5747d02527b65f74f8e0ea6471fb0
 DIST caja-1.18.5.tar.xz 3528228 BLAKE2B c39d7ef97de44c3f57fe622f71291e607cb17b10bebb20e19885413d67d0fccc6e5733739c836b0babbf45c51a0026f1559e7c1ed9656be0ee6b960363474773 SHA512 44bc85e33937f1816cddd78bf72db38b4b43e549cb2680b5d73d252699e9b5d1aace27271729ae310cb9d4f892474164140782713a6fa9f408c78c1b4f0edd73
-EBUILD caja-1.12.7-r2.ebuild 2170 BLAKE2B 42053624182ca2de4c91f5a7ca0a4d2196c0508705b93aab7665ba3fe13f0cd40f6c9ad219f1b97be001446544b4a89507905f5679070cecef54ec8e1a525bd9 SHA512 88a39a9219ecdf4d56f2f03ec0108499f210a8bd85437b698905341df8ef48713a9b796d682f7da7edcda2d2c7f55a6940a32e45b6d75760d78824d9cc4ebbf7
-EBUILD caja-1.14.2.ebuild 2204 BLAKE2B c9cd0c103c2340a8a3ea2a7065017b3625b79f603f7d41fe7d24ea39f7cb03e8f7bdaf3130e0e0a62cffb742cc9a2be232891b2e7a4772a4bfc1d30c22e81919 SHA512 79245d5d02007280262641d001cb545de2bcd5427b02c9179005feb8629031003f4c3f76ba2ec5390a01eaac3d6778ca1466f3567d7fb39664d5fbf121f83500
-EBUILD caja-1.16.6.ebuild 2207 BLAKE2B 8506a9bd9dab659f05ad9e3d7230f5a4eb436203a3b6d3b6fc3d43ae04af7c6eff602d5d929fea0f5b601f2e3bc67c87cc46f59e2b0f46623e4c261db2952683 SHA512 a5aa456c6fb6b89ff7618baa7844c2bbba0feea51c830dd7d27b5438f5a8f737910ff8a8852eef220ec7d699810d03ee61671541b5b114ca6b637a77865d39c6
 EBUILD caja-1.18.5.ebuild 2070 BLAKE2B 0a53984070a8d2f3f67b695301cc71689966bb8d0f0a5d4e31f07d48a6fbdad47b73077adfb8fef3678a06c3b27d41e5e1db0ee68bf8e9127a480564fa84b057 SHA512 587350b7071d903e33e4d23989d48c0c870b103b9d30ef4f13335c83eac9960978470aee18cc2b2b3ab2fa651fd1d232458335a5faa3b89524eedd6aa3e834d8
-MISC metadata.xml 682 BLAKE2B e64e762f92934cacb28463f366ba5e79514fa609445f0524097de46f4983e40b129dfeccc05d37e9be2ff1cd30e4c900579d8cc1a40e6fa35b3b9b4793676e99 SHA512 731fdad4d4e0dd3c862df5dfbbc48817cd434c9c7fca9a5b71d6ccc844caaea871128774f4bc69acd0a0197746870b3a6353dfa1ba06f55e0841b616db7860e1
+MISC metadata.xml 621 BLAKE2B a717b23dad86bcba48b97bec310d1dfb161a3c9ab051e84408f08409c45b1fad5fed38af6af2f75a54e3c29cf635ce5843d54af60a3ad22ed74fbafa0d8fab59 SHA512 95daee371a545e58bcf73daad3261589442121c6f6216d45fcb03e02e8e0d979d45527aa23d4252a60c25b6e9ff2b21d17f504724aaeae3ff97e745e23d963ca
diff --git a/mate-base/caja/caja-1.12.7-r2.ebuild b/mate-base/caja/caja-1.12.7-r2.ebuild
deleted file mode 100644
index ebb0d4bf0506..000000000000
--- a/mate-base/caja/caja-1.12.7-r2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate virtualx
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Caja file manager for the MATE desktop"
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-
-IUSE="gtk3 +introspection +mate packagekit xmp"
-
-RDEPEND="dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.4.7:2
-	gnome-base/dconf:0
-	>=gnome-base/gvfs-1.10.1:0[udisks]
-	>=mate-base/mate-desktop-1.9:0[gtk3(-)=]
-	>=media-libs/libexif-0.6.14:0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	x11-libs/libXext:0
-	x11-libs/libXft:0
-	x11-libs/libXrender:0
-	>=x11-libs/pango-1.1.2:0
-	virtual/libintl:0
-	!gtk3? (
-		>=dev-libs/libunique-1:1
-		>=x11-libs/gtk+-2.24:2[introspection?]
-	)
-	gtk3? (
-		>=dev-libs/libunique-3:3
-		>=x11-libs/gtk+-3.0:3[introspection?]
-	)
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-	packagekit? ( app-admin/packagekit-base )
-	xmp? ( >=media-libs/exempi-1.99.5:2 )"
-
-DEPEND="${RDEPEND}
-	!!mate-base/mate-file-manager
-	>=dev-lang/perl-5:0=
-	dev-util/gdbus-codegen:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PDEPEND="mate? ( >=x11-themes/mate-icon-theme-${MATE_BRANCH} )"
-
-# TODO: Test fails because Caja is not merged yet:
-# GLib-GIO-ERROR **: Settings schema 'org.mate.caja.preferences' is not installed
-RESTRICT="test"
-
-src_prepare() {
-	# Remove unnecessary CFLAGS.
-	sed -i -e 's:-DG.*DISABLE_DEPRECATED::g' \
-		configure{,.ac} eel/Makefile.{am,in} || die
-
-	mate_src_prepare
-}
-
-src_configure() {
-	mate_src_configure \
-		--disable-update-mimedb \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable introspection) \
-		$(use_enable packagekit) \
-		$(use_enable xmp)
-}
-
-src_test() {
-	unset SESSION_MANAGER
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	Xemake check || die "Test phase failed"
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-
-	elog "Caja can use gstreamer to preview audio files. Just make sure"
-	elog "to have the necessary plugins available to play the media type you"
-	elog "want to preview."
-}
diff --git a/mate-base/caja/caja-1.14.2.ebuild b/mate-base/caja/caja-1.14.2.ebuild
deleted file mode 100644
index fc09a87e70f5..000000000000
--- a/mate-base/caja/caja-1.14.2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate virtualx
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Caja file manager for the MATE desktop"
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-
-IUSE="gtk3 +introspection +mate packagekit xmp"
-
-COMMON_DEPEND="dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.4.7:2
-	gnome-base/dconf:0
-	>=gnome-base/gvfs-1.10.1:0[udisks]
-	>=mate-base/mate-desktop-1.9:0[gtk3(-)=]
-	>=media-libs/libexif-0.6.14:0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	x11-libs/libXext:0
-	x11-libs/libXft:0
-	x11-libs/libXrender:0
-	>=x11-libs/pango-1.1.2:0
-	virtual/libintl:0
-	!gtk3? (
-		>=dev-libs/libunique-1:1
-		>=x11-libs/gtk+-2.24:2[introspection?]
-	)
-	gtk3? (
-		>=dev-libs/libunique-3:3
-		>=x11-libs/gtk+-3.0:3[introspection?]
-	)
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-	packagekit? ( app-admin/packagekit-base )
-	xmp? ( >=media-libs/exempi-1.99.5:2 )
-	!!mate-base/mate-file-manager"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5:0=
-	dev-util/gdbus-codegen:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PDEPEND="mate? ( >=x11-themes/mate-icon-theme-${MATE_BRANCH} )"
-
-# TODO: Test fails because Caja is not merged yet:
-# GLib-GIO-ERROR **: Settings schema 'org.mate.caja.preferences' is not installed
-RESTRICT="test"
-
-src_prepare() {
-	# Remove unnecessary CFLAGS.
-	sed -i -e 's:-DG.*DISABLE_DEPRECATED::g' \
-		configure.ac eel/Makefile.am || die
-
-	mate_src_prepare
-}
-
-src_configure() {
-	mate_src_configure \
-		--disable-update-mimedb \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable introspection) \
-		$(use_enable packagekit) \
-		$(use_enable xmp)
-}
-
-src_test() {
-	unset SESSION_MANAGER
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	Xemake check || die "Test phase failed"
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-
-	elog "Caja can use gstreamer to preview audio files. Just make sure"
-	elog "to have the necessary plugins available to play the media type you"
-	elog "want to preview."
-}
diff --git a/mate-base/caja/caja-1.16.6.ebuild b/mate-base/caja/caja-1.16.6.ebuild
deleted file mode 100644
index d0c09026f371..000000000000
--- a/mate-base/caja/caja-1.16.6.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate virtualx
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Caja file manager for the MATE desktop"
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-
-IUSE="gtk3 +introspection +mate packagekit xmp"
-
-COMMON_DEPEND="dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.4.7:2
-	gnome-base/dconf:0
-	>=gnome-base/gvfs-1.10.1:0[udisks]
-	>=mate-base/mate-desktop-1.16.2:0[gtk3(-)=]
-	>=media-libs/libexif-0.6.14:0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	x11-libs/libXext:0
-	x11-libs/libXft:0
-	x11-libs/libXrender:0
-	>=x11-libs/pango-1.1.2:0
-	virtual/libintl:0
-	!gtk3? (
-		>=dev-libs/libunique-1:1
-		>=x11-libs/gtk+-2.24:2[introspection?]
-	)
-	gtk3? (
-		>=dev-libs/libunique-3:3
-		>=x11-libs/gtk+-3.0:3[introspection?]
-	)
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-	packagekit? ( app-admin/packagekit-base )
-	xmp? ( >=media-libs/exempi-1.99.5:2 )
-	!!mate-base/mate-file-manager"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5:0=
-	dev-util/gdbus-codegen:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PDEPEND="mate? ( >=x11-themes/mate-icon-theme-${MATE_BRANCH} )"
-
-# TODO: Test fails because Caja is not merged yet:
-# GLib-GIO-ERROR **: Settings schema 'org.mate.caja.preferences' is not installed
-RESTRICT="test"
-
-src_prepare() {
-	# Remove unnecessary CFLAGS.
-	sed -i -e 's:-DG.*DISABLE_DEPRECATED::g' \
-		configure.ac eel/Makefile.am || die
-
-	mate_src_prepare
-}
-
-src_configure() {
-	mate_src_configure \
-		--disable-update-mimedb \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable introspection) \
-		$(use_enable packagekit) \
-		$(use_enable xmp)
-}
-
-src_test() {
-	unset SESSION_MANAGER
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	Xemake check || die "Test phase failed"
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-
-	elog "Caja can use gstreamer to preview audio files. Just make sure"
-	elog "to have the necessary plugins available to play the media type you"
-	elog "want to preview."
-}
diff --git a/mate-base/caja/metadata.xml b/mate-base/caja/metadata.xml
index fcee9f59fc63..1302ac7693b1 100644
--- a/mate-base/caja/metadata.xml
+++ b/mate-base/caja/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo MATE Desktop</name>
 	</maintainer>
 	<use>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
 		<flag name="mate">Install <pkg>x11-themes/mate-icon-theme</pkg> which 
 		is needed when this package is used in the MATE desktop 
 		environment.</flag>
diff --git a/mate-base/libmatekbd/Manifest b/mate-base/libmatekbd/Manifest
index 74188bb9b4f2..57d0e3a95cbf 100644
--- a/mate-base/libmatekbd/Manifest
+++ b/mate-base/libmatekbd/Manifest
@@ -1,9 +1,3 @@
-DIST libmatekbd-1.12.1.tar.xz 349492 BLAKE2B 8547ae2d7801ff7eb6593558cc2c53133b273df1e003aed96a9343d64f29ac8a692b7ca5694e45df400992d49df1c0f56cca5faf4d1f023ead298ba170aabe05 SHA512 ef07e7b7ff35a17465eb427aafef4c0679ccecf0d96989a66eaf337791dd62d5e85ec72f2c58de5b09e7065eac6df16afb401975fcd727e924e8d3b34b19c0aa
-DIST libmatekbd-1.14.1.tar.xz 367296 BLAKE2B ce5f549cc5c7f41c83b4e498367f7086aad544e372a17c3bf8fa62ccd428b71ca41d9a4a835b5d15bd73c855e3df2cda4bb2881d43fb163227ccead641b9667a SHA512 22e927f7db6c84e57b4bca823513220b305ba8989dabc5af2451be29d35bdc52f12f78dc19b69eb5dd11654cc75647b5ee67f6306162e781920aa58288c25b4c
-DIST libmatekbd-1.16.0.tar.xz 365412 BLAKE2B c7c4b571d581203d59235129d53f20e9ead64117aeb9c1d997c90719540b4923570e489b2fe843dcad2c75f640b01ba5da7f0e188cad97b41bf57b925d1fb872 SHA512 5ced3277e8f9a87407948d2d36fa7aea5a3eb6f2510c29cb53b430cdd202a36e38e48e82177b63bd8ccac6b0f317590ba99645c525b4c0d38b6b80633f62d96e
 DIST libmatekbd-1.18.2.tar.xz 369448 BLAKE2B 25f588dec8926b63f19fb62fc10a3e188c8692875a4dd7c65cd97957aa02e22f33d68644d564e02f114f1f42c818bf09625463086569b97824ed561741aba9c9 SHA512 97971fc406fac09e0a652ccb5f811194eeff695a4a8b093b24225230cb64ceebd221d91aab071b0ca7ffd20b1b38e13d428d68fc8249101a3b3f8342fbb1f71e
-EBUILD libmatekbd-1.12.1-r2.ebuild 901 BLAKE2B c68dbe0374634ae6521be0fc541272c9503cac9c94231c82b50ff81005bdfc17e45ac242f151e4fb9598cd4a1995770559d2467cd85257db103f66df5b970b05 SHA512 c40a03d1079adcfde119a399949672bff21eb5800310c6f78fd03b06c1845e14bacf3316aa37852d4039016c115388386c0535d3bf2df85298e5117211e38848
-EBUILD libmatekbd-1.14.1.ebuild 943 BLAKE2B 2116f9551f956c1c8a434707217d2a76384487e12e758a3de731c7bf33df61d2d7df496f0e93f071eea5a246713d547eb6fb7c38c3ffe577854b869a3f5019e1 SHA512 d51011c9445d229be8ea94a63a5d510b932ea3a5cba0daa922210d18d0815a69522eed1eebaa8c5226bd3c5f299418cb3b20b208d21aeaf4674c3bb65d3995d8
-EBUILD libmatekbd-1.16.0.ebuild 959 BLAKE2B e67da40aec8c94611136322cebf666e655eaf9ef59867f637de1d40985b03307e3390771e605abe0dce26ec1145f4dcfd40246a39acb149793572e73bf5896fd SHA512 0d8349a52d31f9bd754534ac5f4283ed5e125c0a5a6da3a2b4abde9957364371d81f79ae2c49a9bc99100d4fd5f52beca6b4481768d3067b2ec39e52a121c8e5
 EBUILD libmatekbd-1.18.2.ebuild 862 BLAKE2B cabcfcb33fe132b20f1f802142e207e77a5d0752508920edb0811b1330cfed4daf55d06c2062230c20c968da58b88c6b3bd862265a19018a887613b6fa047333 SHA512 def5428afeeb9e1507e4c6236f711b0d5fd88915d30c510a2856fbe337bd8771644c33e2aa5bb9a1efe2c7619e033c148a7acfe57ff9dbc4319bda88913e4d71
-MISC metadata.xml 415 BLAKE2B 42664968654d61a91a453da73b713228811d7b63bbf4b8618fcdad1d502f8d19e7c8cc558cfa0a3b375d6b4b51a5b8cf54e3b4bf6fb9b17642ca1554becbc090 SHA512 1ab91a901f989f1e3491982aa999b22cc64073a3bf0db8b6089d488096cf83bb386d10a04d78131e3a232c7808a01bd435fb6d1e80beee82eea3dbcf1d3fd87a
+MISC metadata.xml 339 BLAKE2B 0ba4a0bd94a0efe3c42d79da9b4f32dc50c577c616d2495a7a3019fb05c398ffdf614afddae5bda5bd1430716391d3991f99005c225e36d2ebc68ff5415ff5cf SHA512 fc767510a57712599986df86d68bf28122b5060b183f94dca26f69abd7a6b4866ab9efc37b85433d2271115374dba3299d2be6cd9461aeadaa2cb02864a6166d
diff --git a/mate-base/libmatekbd/libmatekbd-1.12.1-r2.ebuild b/mate-base/libmatekbd/libmatekbd-1.12.1-r2.ebuild
deleted file mode 100644
index c51d149aaf30..000000000000
--- a/mate-base/libmatekbd/libmatekbd-1.12.1-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="MATE keyboard configuration library"
-LICENSE="LGPL-2"
-SLOT="0"
-
-IUSE="X gtk3 +introspection test"
-
-RDEPEND=">=dev-libs/glib-2.36:2
-	x11-libs/cairo:0
-	>=x11-libs/gdk-pixbuf-2.24:2
-	x11-libs/libX11:0
-	>=x11-libs/libxklavier-5.0:0
-	x11-libs/pango:0
-	virtual/libintl:0
-	!gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] )
-	gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext:*
-	>=dev-util/intltool-0.50.1:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_enable introspection) \
-		$(use_enable test tests)
-}
diff --git a/mate-base/libmatekbd/libmatekbd-1.14.1.ebuild b/mate-base/libmatekbd/libmatekbd-1.14.1.ebuild
deleted file mode 100644
index 01f090d85d5f..000000000000
--- a/mate-base/libmatekbd/libmatekbd-1.14.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE keyboard configuration library"
-LICENSE="LGPL-2"
-SLOT="0"
-
-IUSE="X gtk3 +introspection test"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36:2
-	x11-libs/cairo:0
-	>=x11-libs/gdk-pixbuf-2.24:2
-	x11-libs/libX11:0
-	>=x11-libs/libxklavier-5.0:0
-	x11-libs/pango:0
-	virtual/libintl:0
-	!gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] )
-	gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext:*
-	>=dev-util/intltool-0.50.1:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_enable introspection) \
-		$(use_enable test tests)
-}
diff --git a/mate-base/libmatekbd/libmatekbd-1.16.0.ebuild b/mate-base/libmatekbd/libmatekbd-1.16.0.ebuild
deleted file mode 100644
index 3f50001e430c..000000000000
--- a/mate-base/libmatekbd/libmatekbd-1.16.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE keyboard configuration library"
-LICENSE="LGPL-2"
-SLOT="0"
-
-IUSE="X gtk3 +introspection test"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36:2
-	x11-libs/cairo:0
-	>=x11-libs/gdk-pixbuf-2.24:2
-	x11-libs/libX11:0
-	>=x11-libs/libxklavier-5.2:0[introspection?]
-	x11-libs/pango:0
-	virtual/libintl:0
-	!gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] )
-	gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext:*
-	>=dev-util/intltool-0.50.1:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_enable introspection) \
-		$(use_enable test tests)
-}
diff --git a/mate-base/libmatekbd/metadata.xml b/mate-base/libmatekbd/metadata.xml
index ad1360a0bcce..8743d781458d 100644
--- a/mate-base/libmatekbd/metadata.xml
+++ b/mate-base/libmatekbd/metadata.xml
@@ -5,9 +5,6 @@
 		<email>mate@gentoo.org</email>
 		<name>Gentoo MATE Desktop</name>
 	</maintainer>
-	<use>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/libmatekbd</remote-id>
 	</upstream>
diff --git a/mate-base/mate-applets-meta/Manifest b/mate-base/mate-applets-meta/Manifest
index 470daaea4188..52c39c9c2e9b 100644
--- a/mate-base/mate-applets-meta/Manifest
+++ b/mate-base/mate-applets-meta/Manifest
@@ -1,5 +1,2 @@
-EBUILD mate-applets-meta-1.12.ebuild 749 BLAKE2B e577f4dc52796c9d7af7c57bcf6d8d36275775f3350935e0c04f9ac6db549cbe8c556755fceddfb5efffeae195de3f45a23a82e02106b47bd4f6c1e212a9723b SHA512 be8a46d9aa2cde42c5438144dbe7e14ee8ddd35417d824718a26ae11ecfa78d31a2c2c684f36da2510b320ec10eab7e3b1e6a225f06e18ed523e427f7f65a0f5
-EBUILD mate-applets-meta-1.14.ebuild 673 BLAKE2B 4d2265ad6b60190131743bf33b1caace236b5dc3156ae395087eaa3c80a6fa16d61b4feadd51afd13be0bf9434b67af188bda70a9efdc7adb0d46658a70c1f65 SHA512 b2e175dbf3dc06d31118dd45dc8d1b3d5a26ce3d6ebeef101dd582e52e142a93c41f9010465c37f90c318d923f694331a8e5f65259f749e2d2a5ec663957a8f4
-EBUILD mate-applets-meta-1.16.ebuild 673 BLAKE2B 4d2265ad6b60190131743bf33b1caace236b5dc3156ae395087eaa3c80a6fa16d61b4feadd51afd13be0bf9434b67af188bda70a9efdc7adb0d46658a70c1f65 SHA512 b2e175dbf3dc06d31118dd45dc8d1b3d5a26ce3d6ebeef101dd582e52e142a93c41f9010465c37f90c318d923f694331a8e5f65259f749e2d2a5ec663957a8f4
 EBUILD mate-applets-meta-1.18.ebuild 643 BLAKE2B 42259784e7e525789e22d32285c8c0fb74b591680e6931feb2fddd0a4c9a5c4176eaea4f52b80528458f7a27465f1147e7f422ec96e6ceeef8b528c0b8b4ba66 SHA512 5f0834fe4ac3c47f8cd1623f576cb2be61631a9cf70d63aa6367a6b93b64d469d7b039a6123e256a585ade5d20c7db0b9312d13522dd1a5754513dc85f71aa68
-MISC metadata.xml 680 BLAKE2B 9c8e608bc26dce5877b9ae5cfbf5243b70d9e1cc332ef9e9f17088be5f5d87e0d209b96aba43b16fa9ba15e6086ad3aa170e69899fd0ba83eaa0dc5b7572bc61 SHA512 d128aaeae00867672aac0914cd2031e71a209422cdc92c728f141279dbd7fbb0c99770d421871f7c914013215d8a396cb8aefef1b92d2b105b04dee8bf8c9f18
+MISC metadata.xml 485 BLAKE2B 683574e64bd4bec6a28e6e35eba5dd99f6823d460f1f1c548ad469719e8f68ca2b5a55733f9d146a8f66b654d68ce18747e6cb5532432e9338ea95e757809a1f SHA512 fe08bec233d3be25d3314850882bc8de353b57901e047c0eec5f7a06b83202bc24ad1ddb4271cafed57c760441f8dc235bfbb0cbd8f8bee392deff03946a943e
diff --git a/mate-base/mate-applets-meta/mate-applets-meta-1.12.ebuild b/mate-base/mate-applets-meta/mate-applets-meta-1.12.ebuild
deleted file mode 100644
index 1b98c00bb919..000000000000
--- a/mate-base/mate-applets-meta/mate-applets-meta-1.12.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == 9999 ]]; then
-	MATE_BRANCH=9999
-else
-	inherit versionator
-	MATE_BRANCH="$(get_version_component_range 1-2)"
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Meta package for MATE panel applets"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-IUSE="appindicator gtk3 netspeed sensors"
-
-DEPEND=""
-RDEPEND="=mate-base/mate-applets-${MATE_BRANCH}*[gtk3(-)=]
-	appindicator? ( =mate-extra/mate-indicator-applet-${MATE_BRANCH}*[gtk3(-)=] )
-	netspeed? ( =net-analyzer/mate-netspeed-${MATE_BRANCH}*[gtk3(-)=] )
-	sensors? ( =mate-extra/mate-sensors-applet-${MATE_BRANCH}*[gtk3(-)=] )
-"
diff --git a/mate-base/mate-applets-meta/mate-applets-meta-1.14.ebuild b/mate-base/mate-applets-meta/mate-applets-meta-1.14.ebuild
deleted file mode 100644
index e6c203a6eadd..000000000000
--- a/mate-base/mate-applets-meta/mate-applets-meta-1.14.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == 9999 ]]; then
-	MATE_BRANCH=9999
-else
-	inherit versionator
-	MATE_BRANCH="$(get_version_component_range 1-2)"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Meta package for MATE panel applets"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-IUSE="appindicator gtk3 sensors"
-
-DEPEND=""
-RDEPEND="=mate-base/mate-applets-${MATE_BRANCH}*[gtk3(-)=]
-	appindicator? ( =mate-extra/mate-indicator-applet-${MATE_BRANCH}*[gtk3(-)=] )
-	sensors? ( =mate-extra/mate-sensors-applet-${MATE_BRANCH}*[gtk3(-)=] )
-"
diff --git a/mate-base/mate-applets-meta/mate-applets-meta-1.16.ebuild b/mate-base/mate-applets-meta/mate-applets-meta-1.16.ebuild
deleted file mode 100644
index e6c203a6eadd..000000000000
--- a/mate-base/mate-applets-meta/mate-applets-meta-1.16.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == 9999 ]]; then
-	MATE_BRANCH=9999
-else
-	inherit versionator
-	MATE_BRANCH="$(get_version_component_range 1-2)"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Meta package for MATE panel applets"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-IUSE="appindicator gtk3 sensors"
-
-DEPEND=""
-RDEPEND="=mate-base/mate-applets-${MATE_BRANCH}*[gtk3(-)=]
-	appindicator? ( =mate-extra/mate-indicator-applet-${MATE_BRANCH}*[gtk3(-)=] )
-	sensors? ( =mate-extra/mate-sensors-applet-${MATE_BRANCH}*[gtk3(-)=] )
-"
diff --git a/mate-base/mate-applets-meta/metadata.xml b/mate-base/mate-applets-meta/metadata.xml
index 69703b541d99..1d4f0490d71b 100644
--- a/mate-base/mate-applets-meta/metadata.xml
+++ b/mate-base/mate-applets-meta/metadata.xml
@@ -8,9 +8,6 @@
 	<use>
 		<flag name="appindicator">Pull in <pkg>mate-extra/mate-indicator-applet</pkg>
 			for AppIndicator applet</flag>
-		<flag name="gtk3">Make sure applets are built with GTK+3 instead of GTK+2</flag>
-		<flag name="netspeed">Pull in <pkg>net-analyzer/mate-netspeed</pkg>
-			for net speed monitoring applet</flag>
 		<flag name="sensors">Pull in <pkg>mate-extra/mate-sensors-applet</pkg>
 			for hw sensors applet</flag>
 	</use>
diff --git a/mate-base/mate-applets/Manifest b/mate-base/mate-applets/Manifest
index f0bd8f96ea5e..b7dbc34ce92f 100644
--- a/mate-base/mate-applets/Manifest
+++ b/mate-base/mate-applets/Manifest
@@ -1,16 +1,4 @@
-AUX mate-applets-1.10.4-cpupower-4.7.patch 1216 BLAKE2B 63522e5f4cc775ed3b6e0505f4b2ddbcb6324d3d8f3b3fad8190bb9e88bd9d6922ddc367c3f1d82dd2b493db3e2e61d910f80d7b516bab2896318c48be90aa1a SHA512 6e350080551b959062e4b51c0665c0743fa1064daa441d35abf45ce959be67614fafa90077dfce6cbe10b114420d78b4efdc3ea639eff523195baabd02f1bbdd
-AUX mate-applets-1.14.1-cpupower-4.7.patch 1142 BLAKE2B 0618d0be592cba3430ae3ee86d81e52c11da75dd7b8c3fb800b46e7dd9b38921dbcaa96a3217ed965ad9d93dd6819d1591e1762bcae2f6f40433de97c4eab086 SHA512 b7f2b66f7ac79ccad042704e8e00c5a5b452751aafe3ba19074c5c0e156f56dc89024133f1cfa432b564f2ba497d2444889c46b94af6f8f55d6f9af4102c618a
-AUX mate-applets-1.14.1-revert-upstream-cpupower-4.7-fix.patch 1093 BLAKE2B 9b645da20f66a2c42741da5e272b8deaec754e5d151adde2f487dc5b9f6e2193a39dc6ce0fb75a03ec8727903deb122febfd672e4baa52f10a4e08aed91f9589 SHA512 d47f08a1f983b958bbcaeff5f480752500589ead4cd4fa3eedbf596d48809c3a0a909db82271a5e663d394bed68c6ee395f7315a701c29112ed9b328633bfedc
 AUX mate-applets-1.16.0-cpupower-4.7.patch 1142 BLAKE2B 1222947dd918825d3905aa4c7e95e7c13115ac1aec0d0881b3fcca2f68947ed23a6decebbb0ec94010308ea943696c5d05ceda90803fe14c1bf7b151880e544a SHA512 7845655d2215e91286b19891cb8e6f018b8b11bebcb876d97b5c0a0232063cd030ef14754871f14e09f3e82d714f33d844d41f09f1168a088ac4d83cde527789
-DIST mate-applets-1.12.1.tar.xz 6816716 BLAKE2B 3268a6a4dd1ee1a238a9573315f9450dea4636b40a98f27857dff3cfd9379e5adefa9f2f7f0522837d3bc4fa1c54055d4e65b47165f42cc44400775ed8890b14 SHA512 c9acac98df31386b4016d42d3d1fe0e9ddd5e8fccc291269cff73e2a4c0853fabb85a649ee14f4aef3200c0f731c1d95f48aefdb3d8baaf014ad8776c1e94234
-DIST mate-applets-1.14.1.tar.xz 7151156 BLAKE2B 9b3540ea04c4473f8d9ee081a87d399ebfe74d77d96b96f4c5bf11d954dd53a1e764981eefe593d75480aadf3028626917fd21cdd1b45a5b8f14e4381fcd48ae SHA512 f7657a4dbeed5ff161dae33bd915bf868c95626d661b3d7e4eea9b86776f75449c4060c647d9a040ccf8a01556979b62a9b21c988b33e0cd8d5d90fd663a331d
-DIST mate-applets-1.16.0.tar.xz 7150340 BLAKE2B 0b5554b3e5f250dbc38ec3ecff795dca3d503045fda7f31ea8cb190c8c30a35b5576b990d5005f11b44035b26d6df2ce91e36edd369e983d893bfa2db5e4c00c SHA512 606fd39b95083e7cff2ce95e75b4acb0ec1f3d66621a15fa726891c6d6319f7757b92c8c26efd3ee05da9da3dc315b16a3a9089fd4bb8d420816d4728f8545af
 DIST mate-applets-1.18.2.tar.xz 7163260 BLAKE2B 58d057d1eded3ef26f33e133f86459a75df2903906f27df555640aaf51ca381e8f57b0b4fe6ed7b2d679e08d2a595fc85a6b0d9c4ad51d3ac01552e2875e00bb SHA512 6644a7dfde1dbf65c38cd3a0f52f862e096030f0b9f324f1fbfc34b6167c04b51071f01c322c3c8382e74843332c877b1340fe2129417d6cf9207c32ef2f70be
-EBUILD mate-applets-1.12.1-r4.ebuild 2264 BLAKE2B dec3daf4cb9c1d53b9a317457e4e40eced00956679fec63a9093efc6092b147c170b839208a70fccf62e016036201deb5fa99ec40304d01d03daf5571d01dcb4 SHA512 81b027473726418d372e07896dbfce908e5224c59dd044fcf2fd630c5b799ca02015270ba62751652c7e4deead7686432ddb6f625ae76b73056a78f1bfe6bf37
-EBUILD mate-applets-1.12.1-r5.ebuild 2302 BLAKE2B a8ae9a7e19e6521f99ed9f7c38fb7c9d26899460013e41182c29f862e6b69c754bf548241333dd98ddfc00c33b77e0e2249bc69c5882878b9723f43c71962464 SHA512 2bf780ce08385d2ad2f4266d3f05363bc10289627a4c79623813017633e2da41d6190a754aa11579245727c515ebbc7bd53eacf1022ee6b82c4daffa1c587d93
-EBUILD mate-applets-1.14.1-r1.ebuild 2453 BLAKE2B 879d76df7c9a12e7a2eb8ea3878ce3dc0b41dcea5becb9353e2914c5dcebdd585814b43a7f1ba1456f6bf2b84179b2262aad57ee87464cf7293a638032489fed SHA512 107118f190b7e9baecfe528949a8fa314a957712b4ea26d7599604f45044895ca4dd964dac1e001d09a5350b790a37efae8abc265d055000698094afb3bc5d8a
-EBUILD mate-applets-1.14.1-r2.ebuild 2410 BLAKE2B 862befae14e867cbf2cbe59e3cf2fa5961da8e54863dd4bbb701e984ffd5fc605209d57584ed8789f159e2592e8cdd12018cac14bc221f1510f469735f3b3b40 SHA512 c1a96efd69969b4cb5be6e9342ab365ca9bee4dd3133a56f2bfcaeb243d178ace5bf40dc77c0c603b11bcf5a5b7aa9990e29055c8e0b33ff82b36238c8865046
-EBUILD mate-applets-1.16.0-r1.ebuild 2370 BLAKE2B e973bb109010f615a6652e55487aaad98456b318829a20f8e8ecab9d2d2a880daedc6a796fb79a6da1ee36e85f83908fd60af6054b8de3205e650c15645f2e0e SHA512 cf8eb10cbd2300402a7309561bc3b179710995adfdfa7f70134aaf4aef2ceedd374ceea653905f4645532d8530faaa1a677fff7fc071eb2081c27b223d438ca2
-EBUILD mate-applets-1.16.0.ebuild 2413 BLAKE2B 1635d43378d5f761f840d0a433f188f04d59f69bb9bf9fd49a7471dbd2d21797d22f7d90c3624fb2509ce173fd124507e2d81768596cb9409bbe571a2b862dd3 SHA512 d447fac31a5492be65c6a8dfd1724b6956e1f0c657c1750e175d7476fa75b75411a140706c36c5cb54f8e54c7338da9f94a26a70edb1351f66f2c5f5805464fe
 EBUILD mate-applets-1.18.2.ebuild 2172 BLAKE2B 545fc8ca62d92b684ff4f40958b4534208f16dfdb2aa51c6bb3e779ae69524a9126b71c616618547339efd21547199896422a883e28dfe0e77b2f0250ef551ba SHA512 df63cfd7e0f041bc7c7bd3564799ec063741ebf77b3da970fbdb7bebe518c68f16838b91e1cf350c6d6d3c5fb6ed90d96755fddbe7627b3d2453d25062cb35cb
-MISC metadata.xml 417 BLAKE2B 415a8520ed9bb5dc3fb80e935e607c999254785ce733ada8ac88529876916c6beb0012addeeeacb37df02bc35ea42c1748b6fabc563c40bf4cba2dbb77ccc73e SHA512 8df2d630bab80c248991cb2d57c928b24bfdc92d72d9ecabd06bc362882bb0bc0f3dc376ba54deb77213676eda4fdb8c2a4362c634bdd58f8d2b3060a184309d
+MISC metadata.xml 341 BLAKE2B 5013e079fa6d6c8dca84a8798ce1e360942b8284816842662f0a783895575cc4df2e992d67862928d436b188f87fb29e21b5299b455a838849dac4ecf2588ef1 SHA512 20bc118f3d597db418636c77744f83f398c25ce2dc783bc61f81fda1c0520b3ca9b18ee5f4bed149fecc70436bc3d2a79ac311559e7d1ee085322eac5963e7c9
diff --git a/mate-base/mate-applets/files/mate-applets-1.10.4-cpupower-4.7.patch b/mate-base/mate-applets/files/mate-applets-1.10.4-cpupower-4.7.patch
deleted file mode 100644
index 070b41754ed0..000000000000
--- a/mate-base/mate-applets/files/mate-applets-1.10.4-cpupower-4.7.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index c867af3..4ff5311 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -416,6 +416,8 @@ fi
- AM_CONDITIONAL(HAVE_LIBCPUFREQ, test x$have_libcpufreq = xyes)
- AC_SUBST(LIBCPUFREQ_LIBS)
- 
-+AC_CHECK_HEADERS([cpupower.h])
-+
- build_cpufreq_applet=no
- 
- if test x$disable_cpufreq = xno; then
-diff --git a/cpufreq/src/cpufreq-monitor-libcpufreq.c b/cpufreq/src/cpufreq-monitor-libcpufreq.c
-index 40c44ba..120693c 100644
---- a/cpufreq/src/cpufreq-monitor-libcpufreq.c
-+++ b/cpufreq/src/cpufreq-monitor-libcpufreq.c
-@@ -19,11 +19,16 @@
-  * Authors : Carlos García Campos <carlosgc@gnome.org>
-  */
- 
-+#include <config.h>
-+
- #include <glib.h>
- #include <glib/gi18n.h>
- 
- #include <stdlib.h>
- #include <cpufreq.h>
-+#ifdef HAVE_CPUPOWER_H
-+#include <cpupower.h>
-+#endif
- 
- #include "cpufreq-monitor-libcpufreq.h"
- #include "cpufreq-utils.h"
-@@ -111,7 +114,11 @@ cpufreq_monitor_libcpufreq_run (CPUFreqMonitor *monitor)
- 		/* Check whether it failed because
- 		 * cpu is not online.
- 		 */
-+#ifndef HAVE_CPUPOWER_H
- 		if (!cpufreq_cpu_exists (cpu)) {
-+#else
-+    if (cpupower_is_cpu_online (cpu)) {
-+#endif
- 			g_object_set (G_OBJECT (monitor), "online", FALSE, NULL);
- 			return TRUE;
- 		}
diff --git a/mate-base/mate-applets/files/mate-applets-1.14.1-cpupower-4.7.patch b/mate-base/mate-applets/files/mate-applets-1.14.1-cpupower-4.7.patch
deleted file mode 100644
index 203f1589a1b2..000000000000
--- a/mate-base/mate-applets/files/mate-applets-1.14.1-cpupower-4.7.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index b49d127..6b87389 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -411,6 +411,8 @@ fi
- AM_CONDITIONAL(HAVE_LIBCPUFREQ, test x$have_libcpufreq = xyes)
- AC_SUBST(LIBCPUFREQ_LIBS)
- 
-+AC_CHECK_HEADERS([cpupower.h])
-+
- build_cpufreq_applet=no
- 
- if test x$disable_cpufreq = xno; then
-diff --git a/cpufreq/src/cpufreq-monitor-libcpufreq.c b/cpufreq/src/cpufreq-monitor-libcpufreq.c
-index 4fa9d4c..ba52fde 100644
---- a/cpufreq/src/cpufreq-monitor-libcpufreq.c
-+++ b/cpufreq/src/cpufreq-monitor-libcpufreq.c
-@@ -19,12 +19,16 @@
-  * Authors : Carlos García Campos <carlosgc@gnome.org>
-  */
- 
-+#include <config.h>
-+
- #include <glib.h>
- #include <glib/gi18n.h>
- 
- #include <stdlib.h>
--#include <linux/version.h>
- #include <cpufreq.h>
-+#ifdef HAVE_CPUPOWER_H
-+#include <cpupower.h>
-+#endif
- 
- #include "cpufreq-monitor-libcpufreq.h"
- #include "cpufreq-utils.h"
-@@ -112,7 +116,7 @@
- 		/* Check whether it failed because
- 		 * cpu is not online.
- 		 */
--#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)
-+#ifndef HAVE_CPUPOWER_H
- 		if (!cpufreq_cpu_exists (cpu)) {
- #else
- 		if (cpupower_is_cpu_online (cpu)) {
diff --git a/mate-base/mate-applets/files/mate-applets-1.14.1-revert-upstream-cpupower-4.7-fix.patch b/mate-base/mate-applets/files/mate-applets-1.14.1-revert-upstream-cpupower-4.7-fix.patch
deleted file mode 100644
index 85c2b24bc81b..000000000000
--- a/mate-base/mate-applets/files/mate-applets-1.14.1-revert-upstream-cpupower-4.7-fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From e82b68edbfa8d6e209b9ad7b3e6392a928da776e Mon Sep 17 00:00:00 2001
-From: mudler <mudler@sabayon.org>
-Date: Tue, 13 Sep 2016 23:33:58 +0200
-Subject: [PATCH] fix 1.14.1 on kernel-headers >=4.7
-
----
- cpufreq/src/cpufreq-monitor-libcpufreq.c | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/cpufreq/src/cpufreq-monitor-libcpufreq.c b/cpufreq/src/cpufreq-monitor-libcpufreq.c
-index 228a890..587e316 100644
---- a/cpufreq/src/cpufreq-monitor-libcpufreq.c
-+++ b/cpufreq/src/cpufreq-monitor-libcpufreq.c
-@@ -23,7 +23,7 @@
- #include <glib/gi18n.h>
- 
- #include <stdlib.h>
--#include <linux/version.h>
-+
- #include <cpufreq.h>
- #include "cpufreq-monitor-libcpufreq.h"
- #include "cpufreq-utils.h"
-@@ -111,11 +111,7 @@ cpufreq_monitor_libcpufreq_run (CPUFreqMonitor *monitor)
- 		/* Check whether it failed because
- 		 * cpu is not online.
- 		 */
--#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)
- 		if (!cpufreq_cpu_exists (cpu)) {
--#else
--		if (cpupower_is_cpu_online (cpu)) {
--#endif
- 			g_object_set (G_OBJECT (monitor), "online", FALSE, NULL);
- 			return TRUE;
- 		}
--- 
-2.9.2
-
diff --git a/mate-base/mate-applets/mate-applets-1.12.1-r4.ebuild b/mate-base/mate-applets/mate-applets-1.12.1-r4.ebuild
deleted file mode 100644
index a7a67439797a..000000000000
--- a/mate-base/mate-applets/mate-applets-1.12.1-r4.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate python-single-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Applets for the MATE Desktop and Panel"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X gtk3 ipv6 policykit +upower"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-#cpupower #593470
-RDEPEND="${PYTHON_DEPS}
-	app-text/rarian:0
-	dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.74:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libmateweather-1.6.1[gtk3(-)=]
-	>=dev-libs/libxml2-2.5:2
-	dev-python/pygobject:3
-	>=gnome-base/libgtop-2.11.92:2=
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-	>=mate-base/mate-panel-1.7[gtk3(-)=]
-	>=mate-base/mate-settings-daemon-1.6
-	>=sys-apps/dbus-1.1.2:0
-	<sys-power/cpupower-4.7
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/libnotify-0.7:0
-	x11-libs/libX11:0
-	x11-libs/pango:0
-	virtual/libintl:0
-	!gtk3? (
-		>=gnome-extra/gucharmap-2.32.1:0
-		>=x11-libs/gtk+-2.24:2
-		x11-libs/gtksourceview:2.0
-		>=x11-libs/libwnck-2.30:1
-	)
-	gtk3? (
-		>=gnome-extra/gucharmap-3.0:2.90
-		>=x11-libs/gtk+-3.0:3
-		x11-libs/gtksourceview:3.0
-		>=x11-libs/libwnck-3.0:3
-	)
-	policykit? ( >=sys-auth/polkit-0.92:0 )
-	upower? (
-		|| (
-			>=sys-power/upower-0.9.23
-			>=sys-power/upower-pm-utils-0.9.23
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.3
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.1:*
-	dev-libs/libxslt:0
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--libexecdir=/usr/libexec/mate-applets \
-		--with-cpufreq-lib=cpupower \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_with upower) \
-		$(use_enable ipv6) \
-		$(use_enable policykit polkit)
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	emake check
-}
-
-src_install() {
-	python_fix_shebang invest-applet
-	mate_src_install
-
-	local APPLETS="accessx-status battstat charpick command cpufreq drivemount
-			geyes invest-applet mateweather multiload null_applet stickynotes
-			timerapplet trashapplet"
-
-	for applet in ${APPLETS}; do
-		docinto ${applet}
-
-		for d in AUTHORS ChangeLog NEWS README README.themes TODO; do
-			[ -s ${applet}/${d} ] && dodoc ${applet}/${d}
-		done
-	done
-}
diff --git a/mate-base/mate-applets/mate-applets-1.12.1-r5.ebuild b/mate-base/mate-applets/mate-applets-1.12.1-r5.ebuild
deleted file mode 100644
index 3853add0fe5d..000000000000
--- a/mate-base/mate-applets/mate-applets-1.12.1-r5.ebuild
+++ /dev/null
@@ -1,102 +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 mate python-single-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Applets for the MATE Desktop and Panel"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X gtk3 ipv6 policykit +upower"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	app-text/rarian:0
-	dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.74:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libmateweather-1.6.1[gtk3(-)=]
-	>=dev-libs/libxml2-2.5:2
-	dev-python/pygobject:3
-	>=gnome-base/libgtop-2.11.92:2=
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-	>=mate-base/mate-panel-1.7[gtk3(-)=]
-	>=mate-base/mate-settings-daemon-1.6
-	>=sys-apps/dbus-1.1.2:0
-	sys-power/cpupower
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/libnotify-0.7:0
-	x11-libs/libX11:0
-	x11-libs/pango:0
-	virtual/libintl:0
-	!gtk3? (
-		>=gnome-extra/gucharmap-2.32.1:0
-		>=x11-libs/gtk+-2.24:2
-		x11-libs/gtksourceview:2.0
-		>=x11-libs/libwnck-2.30:1
-	)
-	gtk3? (
-		>=gnome-extra/gucharmap-3.0:2.90
-		>=x11-libs/gtk+-3.0:3
-		x11-libs/gtksourceview:3.0
-		>=x11-libs/libwnck-3.0:3
-	)
-	policykit? ( >=sys-auth/polkit-0.92:0 )
-	upower? (
-		|| (
-			>=sys-power/upower-0.9.23
-			>=sys-power/upower-pm-utils-0.9.23
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.3
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.1:*
-	dev-libs/libxslt:0
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PATCHES=( "${FILESDIR}/${PN}-1.10.4-cpupower-4.7.patch" )
-
-src_configure() {
-	mate_src_configure \
-		--libexecdir=/usr/libexec/mate-applets \
-		--with-cpufreq-lib=cpupower \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_with upower) \
-		$(use_enable ipv6) \
-		$(use_enable policykit polkit)
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	emake check
-}
-
-src_install() {
-	python_fix_shebang invest-applet
-	mate_src_install
-
-	local APPLETS="accessx-status battstat charpick command cpufreq drivemount
-			geyes invest-applet mateweather multiload null_applet stickynotes
-			timerapplet trashapplet"
-
-	for applet in ${APPLETS}; do
-		docinto ${applet}
-
-		for d in AUTHORS ChangeLog NEWS README README.themes TODO; do
-			[ -s ${applet}/${d} ] && dodoc ${applet}/${d}
-		done
-	done
-}
diff --git a/mate-base/mate-applets/mate-applets-1.14.1-r1.ebuild b/mate-base/mate-applets/mate-applets-1.14.1-r1.ebuild
deleted file mode 100644
index a813ac75a5d4..000000000000
--- a/mate-base/mate-applets/mate-applets-1.14.1-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate python-single-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Applets for the MATE Desktop and Panel"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X gtk3 ipv6 policykit +upower"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-#cpupower #593470
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.74:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libmateweather-1.6.1[gtk3(-)=]
-	>=dev-libs/libxml2-2.5:2
-	dev-python/pygobject:3
-	>=gnome-base/libgtop-2.11.92:2=
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-	>=mate-base/mate-panel-1.7[gtk3(-)=]
-	>=net-wireless/wireless-tools-28_pre9:0
-	>=sys-apps/dbus-1.1.2:0
-	<sys-power/cpupower-4.7
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/libnotify-0.7:0
-	x11-libs/libX11:0
-	x11-libs/pango:0
-	virtual/libintl:0
-	!gtk3? (
-		>=gnome-extra/gucharmap-2.32.1:0
-		>=x11-libs/gtk+-2.24:2
-		x11-libs/gtksourceview:2.0
-		>=x11-libs/libwnck-2.30:1
-	)
-	gtk3? (
-		>=gnome-extra/gucharmap-3.0:2.90
-		>=x11-libs/gtk+-3.0:3
-		x11-libs/gtksourceview:3.0
-		>=x11-libs/libwnck-3.0:3
-	)
-	policykit? ( >=sys-auth/polkit-0.92:0 )
-	upower? (
-		|| (
-			>=sys-power/upower-0.9.23
-			>=sys-power/upower-pm-utils-0.9.23
-		)
-	)
-	!!net-analyzer/mate-netspeed"
-
-RDEPEND="${COMMON_DEPEND}
-	>=mate-base/mate-settings-daemon-1.6"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.1:*
-	dev-libs/libxslt:0
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PATCHES=( "${FILESDIR}/${PN}-1.14.1-revert-upstream-cpupower-4.7-fix.patch" )
-
-src_configure() {
-	mate_src_configure \
-		--libexecdir=/usr/libexec/mate-applets \
-		--with-cpufreq-lib=cpupower \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_with upower) \
-		$(use_enable ipv6) \
-		$(use_enable policykit polkit)
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	emake check
-}
-
-src_install() {
-	python_fix_shebang invest-applet
-	mate_src_install
-
-	local APPLETS="accessx-status battstat charpick command cpufreq drivemount
-			geyes invest-applet mateweather multiload netspeed stickynotes
-			timerapplet trashapplet"
-
-	for applet in ${APPLETS}; do
-		docinto ${applet}
-
-		for d in AUTHORS ChangeLog NEWS README README.themes TODO; do
-			[ -s ${applet}/${d} ] && dodoc ${applet}/${d}
-		done
-	done
-}
diff --git a/mate-base/mate-applets/mate-applets-1.14.1-r2.ebuild b/mate-base/mate-applets/mate-applets-1.14.1-r2.ebuild
deleted file mode 100644
index 900d90340920..000000000000
--- a/mate-base/mate-applets/mate-applets-1.14.1-r2.ebuild
+++ /dev/null
@@ -1,106 +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 mate python-single-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Applets for the MATE Desktop and Panel"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X gtk3 ipv6 policykit +upower"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.74:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libmateweather-1.6.1[gtk3(-)=]
-	>=dev-libs/libxml2-2.5:2
-	dev-python/pygobject:3
-	>=gnome-base/libgtop-2.11.92:2=
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-	>=mate-base/mate-panel-1.7[gtk3(-)=]
-	>=net-wireless/wireless-tools-28_pre9:0
-	>=sys-apps/dbus-1.1.2:0
-	sys-power/cpupower
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/libnotify-0.7:0
-	x11-libs/libX11:0
-	x11-libs/pango:0
-	virtual/libintl:0
-	!gtk3? (
-		>=gnome-extra/gucharmap-2.32.1:0
-		>=x11-libs/gtk+-2.24:2
-		x11-libs/gtksourceview:2.0
-		>=x11-libs/libwnck-2.30:1
-	)
-	gtk3? (
-		>=gnome-extra/gucharmap-3.0:2.90
-		>=x11-libs/gtk+-3.0:3
-		x11-libs/gtksourceview:3.0
-		>=x11-libs/libwnck-3.0:3
-	)
-	policykit? ( >=sys-auth/polkit-0.92:0 )
-	upower? (
-		|| (
-			>=sys-power/upower-0.9.23
-			>=sys-power/upower-pm-utils-0.9.23
-		)
-	)
-	!!net-analyzer/mate-netspeed"
-
-RDEPEND="${COMMON_DEPEND}
-	>=mate-base/mate-settings-daemon-1.6"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.1:*
-	dev-libs/libxslt:0
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PATCHES=( "${FILESDIR}/${PN}-1.14.1-cpupower-4.7.patch" )
-
-src_configure() {
-	mate_src_configure \
-		--libexecdir=/usr/libexec/mate-applets \
-		--with-cpufreq-lib=cpupower \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_with upower) \
-		$(use_enable ipv6) \
-		$(use_enable policykit polkit)
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	emake check
-}
-
-src_install() {
-	python_fix_shebang invest-applet
-	mate_src_install
-
-	local APPLETS="accessx-status battstat charpick command cpufreq drivemount
-			geyes invest-applet mateweather multiload netspeed stickynotes
-			timerapplet trashapplet"
-
-	for applet in ${APPLETS}; do
-		docinto ${applet}
-
-		for d in AUTHORS ChangeLog NEWS README README.themes TODO; do
-			[ -s ${applet}/${d} ] && dodoc ${applet}/${d}
-		done
-	done
-}
diff --git a/mate-base/mate-applets/mate-applets-1.16.0-r1.ebuild b/mate-base/mate-applets/mate-applets-1.16.0-r1.ebuild
deleted file mode 100644
index d9c8b7e52daf..000000000000
--- a/mate-base/mate-applets/mate-applets-1.16.0-r1.ebuild
+++ /dev/null
@@ -1,105 +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 mate python-single-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Applets for the MATE Desktop and Panel"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X gtk3 ipv6 policykit +upower"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.74:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libmateweather-1.6.1[gtk3(-)=]
-	>=dev-libs/libxml2-2.5:2
-	dev-python/pygobject:3
-	>=gnome-base/libgtop-2.11.92:2=
-	>=mate-base/mate-panel-1.7[gtk3(-)=]
-	>=net-wireless/wireless-tools-28_pre9:0
-	>=sys-apps/dbus-1.1.2:0
-	sys-power/cpupower
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/libnotify-0.7:0
-	x11-libs/libX11:0
-	x11-libs/pango:0
-	virtual/libintl:0
-	!gtk3? (
-		>=gnome-extra/gucharmap-2.32.1:0
-		>=x11-libs/gtk+-2.24:2
-		x11-libs/gtksourceview:2.0
-		>=x11-libs/libwnck-2.30:1
-	)
-	gtk3? (
-		>=gnome-extra/gucharmap-3.0:2.90
-		>=x11-libs/gtk+-3.0:3
-		x11-libs/gtksourceview:3.0
-		>=x11-libs/libwnck-3.0:3
-	)
-	policykit? ( >=sys-auth/polkit-0.97:0 )
-	upower? (
-		|| (
-			>=sys-power/upower-0.9.23
-			>=sys-power/upower-pm-utils-0.9.23
-		)
-	)
-	!!net-analyzer/mate-netspeed"
-
-RDEPEND="${COMMON_DEPEND}
-	>=mate-base/mate-settings-daemon-1.6"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.1:*
-	dev-libs/libxslt:0
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PATCHES=( "${FILESDIR}/${PN}-1.16.0-cpupower-4.7.patch" )
-
-src_configure() {
-	mate_src_configure \
-		--libexecdir=/usr/libexec/mate-applets \
-		--with-cpufreq-lib=cpupower \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_with upower) \
-		$(use_enable ipv6) \
-		$(use_enable policykit polkit)
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	emake check
-}
-
-src_install() {
-	python_fix_shebang invest-applet
-	mate_src_install
-
-	local APPLETS="accessx-status battstat charpick command cpufreq drivemount
-			geyes invest-applet mateweather multiload netspeed stickynotes
-			timerapplet trashapplet"
-
-	for applet in ${APPLETS}; do
-		docinto ${applet}
-
-		for d in AUTHORS ChangeLog NEWS README README.themes TODO; do
-			[ -s ${applet}/${d} ] && dodoc ${applet}/${d}
-		done
-	done
-}
diff --git a/mate-base/mate-applets/mate-applets-1.16.0.ebuild b/mate-base/mate-applets/mate-applets-1.16.0.ebuild
deleted file mode 100644
index d54b6acf29fb..000000000000
--- a/mate-base/mate-applets/mate-applets-1.16.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate python-single-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Applets for the MATE Desktop and Panel"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X gtk3 ipv6 policykit +upower"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-#cpupower #593470
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.74:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libmateweather-1.6.1[gtk3(-)=]
-	>=dev-libs/libxml2-2.5:2
-	dev-python/pygobject:3
-	>=gnome-base/libgtop-2.11.92:2=
-	>=mate-base/mate-panel-1.7[gtk3(-)=]
-	>=net-wireless/wireless-tools-28_pre9:0
-	>=sys-apps/dbus-1.1.2:0
-	<sys-power/cpupower-4.7
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/libnotify-0.7:0
-	x11-libs/libX11:0
-	x11-libs/pango:0
-	virtual/libintl:0
-	!gtk3? (
-		>=gnome-extra/gucharmap-2.32.1:0
-		>=x11-libs/gtk+-2.24:2
-		x11-libs/gtksourceview:2.0
-		>=x11-libs/libwnck-2.30:1
-	)
-	gtk3? (
-		>=gnome-extra/gucharmap-3.0:2.90
-		>=x11-libs/gtk+-3.0:3
-		x11-libs/gtksourceview:3.0
-		>=x11-libs/libwnck-3.0:3
-	)
-	policykit? ( >=sys-auth/polkit-0.97:0 )
-	upower? (
-		|| (
-			>=sys-power/upower-0.9.23
-			>=sys-power/upower-pm-utils-0.9.23
-		)
-	)
-	!!net-analyzer/mate-netspeed"
-
-RDEPEND="${COMMON_DEPEND}
-	>=mate-base/mate-settings-daemon-1.6"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.1:*
-	dev-libs/libxslt:0
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PATCHES=( "${FILESDIR}/${PN}-1.14.1-revert-upstream-cpupower-4.7-fix.patch" )
-
-src_configure() {
-	mate_src_configure \
-		--libexecdir=/usr/libexec/mate-applets \
-		--with-cpufreq-lib=cpupower \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_with upower) \
-		$(use_enable ipv6) \
-		$(use_enable policykit polkit)
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	emake check
-}
-
-src_install() {
-	python_fix_shebang invest-applet
-	mate_src_install
-
-	local APPLETS="accessx-status battstat charpick command cpufreq drivemount
-			geyes invest-applet mateweather multiload netspeed stickynotes
-			timerapplet trashapplet"
-
-	for applet in ${APPLETS}; do
-		docinto ${applet}
-
-		for d in AUTHORS ChangeLog NEWS README README.themes TODO; do
-			[ -s ${applet}/${d} ] && dodoc ${applet}/${d}
-		done
-	done
-}
diff --git a/mate-base/mate-applets/metadata.xml b/mate-base/mate-applets/metadata.xml
index 80be46261aa9..b0eeaf57aae6 100644
--- a/mate-base/mate-applets/metadata.xml
+++ b/mate-base/mate-applets/metadata.xml
@@ -5,9 +5,6 @@
 		<email>mate@gentoo.org</email>
 		<name>Gentoo MATE Desktop</name>
 	</maintainer>
-	<use>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/mate-applets</remote-id>
 	</upstream>
diff --git a/mate-base/mate-common/Manifest b/mate-base/mate-common/Manifest
index f087815931cb..02eb819942e8 100644
--- a/mate-base/mate-common/Manifest
+++ b/mate-base/mate-common/Manifest
@@ -1,9 +1,3 @@
-DIST mate-common-1.12.0.tar.xz 66156 BLAKE2B bd9c37ebac53d098eaad7620b022c064cda9e5614b2c40791a9bf9ff6f10f3b1ba8b61f609d39b4ac6ad6a793f22913994e4a15a7bb2415fbcba677f848510d8 SHA512 3392cc38ee51dec37330ac7d309bd42dfec5f622b50d92af46e16d059781ed4bc1396cb4525518dfe1f2a913fecb426d3ef047731f2208219ef648f27bf54f32
-DIST mate-common-1.14.0.tar.xz 72368 BLAKE2B 3ef9fc5e38312979a6f6d7a00c07adf3e8dc2f67278c4fd76ce1f3ae54330f967bd3554a99313c6a945cbd3730b3ccfd7aad79f88e9b73b0ff0b7dd85ff0089d SHA512 fe0a824796dd65756f7dcd351370f3f537d9990b422cb365419f2f6ec446b6ec9660be35685847ff8ae295a80cda8780a968ab11441c49ac152eb8e50f30dc6a
-DIST mate-common-1.16.0.tar.xz 72392 BLAKE2B 574e1534a8b0cd5ff031a0f344830d3490f01c7b4092660f6cda0340dfbd4abd11dc0102c506046726b6dd2839e1c7e5370cf6723d80d812125c6cfdaebb0a70 SHA512 3cf13f28c43072a26f48099eeeceb920a88bd86c258ca91e58f36c164ffa12b9c43d379c1130734df5c39070c74ee3f144ef7d81a6561244bd07af2b81173224
 DIST mate-common-1.18.0.tar.xz 72608 BLAKE2B 7a280f440de8964ac725582f545c7ae15152c0fef21897dcacb820d539f74fb3aec1d87e9c75e98bc6053bf3db6a69daf2eca3cf2de0cbc8a32d65a62c43187e SHA512 cdc8d39a78ebb1a0fb0d8179814ce59691006a21cb10d78b818cf62a8f42c89d01c9126e93b5fa3b7ac27adce52d3a2512ac2fb63c41e6c5a698a767e9176563
-EBUILD mate-common-1.12.0.ebuild 524 BLAKE2B 2618c704ee84ad2f719f1f827dc14e18ee1da185da40035539ff8badfff0dadd0c80fef70ce147afaaa4053a3b49fe37571e8725407d4b61b0b7749522768acd SHA512 bda08b37eb4a867e2f9153a7510271c13a2cbf656aa5f926187dc8bcfd1bbe55661947ffb7b8c1822b2978e5991487cda45d3634df4b268013fc9a2b531c6596
-EBUILD mate-common-1.14.0.ebuild 526 BLAKE2B 12d9ab041d0ac6b2b10cc4e31ef6aad1b8d1d822e6fc56631c285dc6d18a79cfb2063ca53fc83340443b051c07af7d67d38b827bd591d399535c30f686ac28a8 SHA512 d5245a390ceadebbb2106ab147283a1dfe26622d72a3ac4580927ab78046eea7b61048be20c94edeaa90f99d058ed28cf2fc333918c95294d3b9802e89537bb2
-EBUILD mate-common-1.16.0.ebuild 526 BLAKE2B 12d9ab041d0ac6b2b10cc4e31ef6aad1b8d1d822e6fc56631c285dc6d18a79cfb2063ca53fc83340443b051c07af7d67d38b827bd591d399535c30f686ac28a8 SHA512 d5245a390ceadebbb2106ab147283a1dfe26622d72a3ac4580927ab78046eea7b61048be20c94edeaa90f99d058ed28cf2fc333918c95294d3b9802e89537bb2
 EBUILD mate-common-1.18.0.ebuild 531 BLAKE2B e7a9eb671fee1c0d0bec46e3b6b240fb9709da0675120b4d7ddb6bb3b8294c7af27042cee3870cb9343903963e9455d777a7b290a55f7e01eedde4df9b906290 SHA512 4e58fc07a4f8043c34609b2ee9b5b03e08f90ad464e1e830595aa6705b7d274c20c0cfba6b456f3bf7bcd58a7e8fda3f7c46070b94c6e1872ce7d56c7c11ea8e
 MISC metadata.xml 340 BLAKE2B df96462b37467cd5298fc394d73cfce122d7aea210e48a678d4c32d5c2b6a792cdfaf1c39e6968b33d6c3b9aecacd95fdbb4478cc98a58b6c0527c6708e404ef SHA512 06a836307e50d0ecf5e85516865436cddffaa2d69492c295bad163f3511ded0b7254b541fa73b8b5f314c1574c755f595c1a5af5f55c87f2c96aaf06fffc6262
diff --git a/mate-base/mate-common/mate-common-1.12.0.ebuild b/mate-base/mate-common/mate-common-1.12.0.ebuild
deleted file mode 100644
index 87e27bd29c5d..000000000000
--- a/mate-base/mate-common/mate-common-1.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate-desktop.org
-
-if [[ ${PV} == 9999 ]]; then
-	inherit autotools
-else
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Common files for development of MATE packages"
-LICENSE="GPL-3"
-SLOT="0"
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
-	fi
-}
-
-src_install() {
-	mv doc-build/README README.doc-build \
-		|| die "Failed to rename doc-build/README."
-
-	default
-
-	dodoc doc/usage.txt
-}
diff --git a/mate-base/mate-common/mate-common-1.14.0.ebuild b/mate-base/mate-common/mate-common-1.14.0.ebuild
deleted file mode 100644
index 6908a4605805..000000000000
--- a/mate-base/mate-common/mate-common-1.14.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate-desktop.org
-
-if [[ ${PV} == 9999 ]]; then
-	inherit autotools
-else
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Common files for development of MATE packages"
-LICENSE="GPL-3"
-SLOT="0"
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
-	fi
-}
-
-src_install() {
-	mv doc-build/README README.doc-build \
-		|| die "Failed to rename doc-build/README."
-
-	default
-
-	dodoc doc/usage.txt
-}
diff --git a/mate-base/mate-common/mate-common-1.16.0.ebuild b/mate-base/mate-common/mate-common-1.16.0.ebuild
deleted file mode 100644
index 6908a4605805..000000000000
--- a/mate-base/mate-common/mate-common-1.16.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate-desktop.org
-
-if [[ ${PV} == 9999 ]]; then
-	inherit autotools
-else
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Common files for development of MATE packages"
-LICENSE="GPL-3"
-SLOT="0"
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
-	fi
-}
-
-src_install() {
-	mv doc-build/README README.doc-build \
-		|| die "Failed to rename doc-build/README."
-
-	default
-
-	dodoc doc/usage.txt
-}
diff --git a/mate-base/mate-control-center/Manifest b/mate-base/mate-control-center/Manifest
index caa9173e5e64..235b5942a6f2 100644
--- a/mate-base/mate-control-center/Manifest
+++ b/mate-base/mate-control-center/Manifest
@@ -1,10 +1,3 @@
-AUX mate-control-center-1.12.1-backport-appindicator-configure.patch 2662 BLAKE2B 8c5bc2cfb66aa4a0b97bda5f95faaaed9d9f347ef17549e46d2a5fdd298a1cab6351574c4505cbf106bdd4f3ab393b5910c1b6bff72e237ebc7f8de48cd8c387 SHA512 ffa139b6966935b22fa0ab59349b944318ba483670187de9b65135d64fdf8e18cafd0c67667b45e4e0450fdb77616c84b9e91eaa933e5ee30c2b6a6900be55d5
-DIST mate-control-center-1.12.1.tar.xz 1304732 BLAKE2B 7556f8b87f6c8e78475d77e7e6e1fde88a81f8c3c795cee2aa8bf0167dec9ed336e632e17b4d2d098fb7fb6fe3d48b01b374934ee2e2898f548e5ccde2eeface SHA512 4023511113c993b2420666803a273923b161cd3fff74b07e02f3dd9a80baea47278ca5c10a5baec673818390174a9f0b5c2d8db81c653f48c411cf5f53cc2dce
-DIST mate-control-center-1.14.1.tar.xz 1371360 BLAKE2B d896ba7733d42d440ef1c8f1518a0e0f71e3ca12f59599c47a6ee65a15ae20ee6884d90c067077ecbb15db18472181b4dbb0369ce7186c75e49a75084a8dac69 SHA512 c871486e69174801e6b509848ae416e1b9aa55ca21ea796f7bc9e408ad59d0dfe5feafde59258c8d0019448b620af2fbd73b75cc644c5dc7b031237e3170a30b
-DIST mate-control-center-1.16.1.tar.xz 1330348 BLAKE2B 3062a3a7dc1ad572ef967e5310a318c010036d9377724e007a9ac20b482e6f34246196f013f4f4e5d18ea608a774ee0d7de87fe9573e0758b900ed05e834c291 SHA512 6bba690455cd4097a6a10ea068627768a242dd68da2375e7ab898cae80fc07f5d3286265422edb13359adf3f2e451e41b1693da836d03f99410beda4951e1610
 DIST mate-control-center-1.18.2.tar.xz 1351644 BLAKE2B 30c093b11f3cbf32e3590368001d8d929b8f611c4efd58f6332a70905ef028b8e573e41cbb20b5342ad2b0f459327d9665c4db77104bf49b2b8be4935adc232c SHA512 0acc6d775aa26dd0265ddab80317b2ddd2f027394b55574e29e6ad233b8711bc0984803f76f2cbaeed2bfd2b4397cd5143d5540908f5078080a1749290dac7ab
-EBUILD mate-control-center-1.12.1-r1.ebuild 1823 BLAKE2B 8410aa55eab25a850696743a4751b1ac15bc16c66a64a1254fa0842362f25b04d7c8f643d1ea509a48079613328a0d9259e83480fd3116ca2492f38c01a13498 SHA512 8d42273826ecc9f967907e6a473894fef700db840c9f670fea8a525c65bcc50c1b1bed105068d213c85646200077c87c61dcc570bcd9d023c1d5da2143657d3c
-EBUILD mate-control-center-1.14.1-r1.ebuild 1869 BLAKE2B 2beee593e96e692271665d013077c235e32caeb5cb3527eb7d141f41e54ff94f4a826b7dba8968361676db0e24852d7314b52f787cdab603dd8df562aee8d235 SHA512 0557b63d62309976edd01cad8d6a7d9fc55130d901e54cd71766809fe92f575192adb698e06e8da866ec05b38e7aba0071335e6d774e6415b51c3b0155219bc3
-EBUILD mate-control-center-1.16.1.ebuild 1794 BLAKE2B 9c4fde7961d3729766836b535e0c5bb9f5daef390fefba01f4bb023bf5cdcb086c4d94a6d1d6bd9579300b06bd56ad726f39d8353f22cff1f061b4d711f79613 SHA512 5b915a4302cfaa97a577a5471fa01fefbb7b607f2492d87e471a1f1a09f24bd32a279bc8940704fe345bed396385b1734cc92f3062fdc25846c254bb80843702
 EBUILD mate-control-center-1.18.2.ebuild 1531 BLAKE2B 499ba1ad00d4be96d3875d6fcd80176ec3e9bcbd9ca7d6775ae83604ed8783a86a135833536811e96fe16f3fb55579986f4e7fef4e4b718f2a36e685fb3cc914 SHA512 cc6ef7367c9b00a8aabfa60581ab1f129ab59a83a417fb434506922a5d95c52269418a6a2c1953794c66f8d9507faa26197cb0632a0dd84be12b148f0f87e13a
-MISC metadata.xml 488 BLAKE2B 6def839521080b9734f402356249b2c318fce40541ff2f5063e829b1022dea8b74c24b8369d35a5fb1137262363b9b230755265a148f968656962beff32249ba SHA512 52b8617cf3bb2e4750d20e3c869f0624b290dc0a2b4dcaf56851fdbc3b978088bca2c616c76a8b161f5bc7c91f22b28bfb1043e415d615ce3ece59f435dbb137
+MISC metadata.xml 427 BLAKE2B 3173ace743875b3fc77146513bea979bb88cfb6fd77845c1a4fdf733d19a32350caa6036b0db1d7c0ea7c9374fa3a862c22b60d99b134bae5827939fff1ba00a SHA512 ce23384af4d89040b75cc52a42890d6a61c2eafaf214a3ccc2137534371bcb7189c2948053b8a76de4cf9653ee422833d2d23a5ec740c9cdabdd95c4083771b3
diff --git a/mate-base/mate-control-center/files/mate-control-center-1.12.1-backport-appindicator-configure.patch b/mate-base/mate-control-center/files/mate-control-center-1.12.1-backport-appindicator-configure.patch
deleted file mode 100644
index b713b7f3a8cc..000000000000
--- a/mate-base/mate-control-center/files/mate-control-center-1.12.1-backport-appindicator-configure.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 90195c0c2e3f45a355286f1640c2f0020a5556b8 Mon Sep 17 00:00:00 2001
-From: raveit65 <chat-to-me@raveit.de>
-Date: Fri, 17 Jun 2016 20:34:06 +0200
-Subject: [PATCH] configure: fix build with libappindicator3
-
----
- configure.ac | 14 +++++++++-----
- 1 file changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9b27671..a11bfdc 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -63,6 +63,8 @@ dnl ==============================================
- dnl Check GTK+ API version
- dnl ==============================================
- 
-+APPINDICATOR_REQUIRED=0.0.13
-+
- AC_MSG_CHECKING([which gtk+ version to compile against])
- AC_ARG_WITH([gtk],
-   [AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to compile against (default: 2.0)])],
-@@ -80,6 +82,7 @@ case "$with_gtk" in
-        LIBCANBERRA_API_VERSION=
-        LIBUNIQUE_API_VERSION=1.0
-        ENGINES_FOLDER="engines"
-+       APPINDICATOR_API_VERSION=
-        ;;
-   3.0) GTK_API_VERSION=3.0
-        GTK_REQUIRED=3.0.0
-@@ -87,6 +90,7 @@ case "$with_gtk" in
-        LIBCANBERRA_API_VERSION=3
-        LIBUNIQUE_API_VERSION=3.0
-        ENGINES_FOLDER="theming-engines"
-+       APPINDICATOR_API_VERSION=3
-        ;;
- esac
- AC_SUBST(GTK_API_VERSION)
-@@ -101,7 +105,7 @@ AM_CONDITIONAL(HAVE_LIBCANBERRA_GTK, test "x$CANBERRA_GTK" = "x1")
- AM_CONDITIONAL(HAVE_TYPING_BREAK, test "x$TYPING_BREAK" = xtyping-break)
- 
- dnl app indicator
--APPINDICATOR_REQUIRED=0.0.7
-+APPINDICATOR_PKG=appindicator$APPINDICATOR_API_VERSION-0.1
- 
- AC_ARG_ENABLE(appindicator,
-                         AS_HELP_STRING([--enable-appindicator[=@<:@no/auto/yes@:>@]],[Build support for application indicators ]),
-@@ -109,16 +113,16 @@ AC_ARG_ENABLE(appindicator,
-                         [enable_appindicator="auto"])
- 
- if test x$enable_appindicator = xauto ; then
--        PKG_CHECK_EXISTS([appindicator-0.1 >= $APPINDICATOR_REQUIRED],
-+        PKG_CHECK_EXISTS([$APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED],
-                          enable_appindicator="yes",
-                          enable_appindicator="no")
- fi
- 
- if test x$enable_appindicator = xyes ; then
--        PKG_CHECK_EXISTS([appindicator-0.1 >= $APPINDICATOR_REQUIRED],,
-+        PKG_CHECK_EXISTS([$APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED],,
-                          AC_MSG_ERROR([appindicator-0.1 is not installed]))
-         PKG_CHECK_MODULES(APP_INDICATOR,
--                        appindicator-0.1 >= $APPINDICATOR_REQUIRED)
-+                        $APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED)
-         AC_SUBST(APP_INDICATOR_CFLAGS)
-         AC_SUBST(APP_INDICATOR_LIBS)
-         AC_DEFINE(HAVE_APP_INDICATOR, 1, [Have AppIndicator])
diff --git a/mate-base/mate-control-center/mate-control-center-1.12.1-r1.ebuild b/mate-base/mate-control-center/mate-control-center-1.12.1-r1.ebuild
deleted file mode 100644
index f51605c92113..000000000000
--- a/mate-base/mate-control-center/mate-control-center-1.12.1-r1.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
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="The MATE Desktop configuration tool"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="appindicator debug gtk3"
-
-RDEPEND="app-text/rarian:0
-	dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.73:0
-	>=dev-libs/glib-2.36:2
-	dev-libs/libxml2:2
-	>=gnome-base/dconf-0.13.4:0
-	>=gnome-base/librsvg-2.0:2
-	>=mate-base/libmatekbd-1.6[gtk3(-)=]
-	>=mate-base/mate-desktop-1.11[gtk3(-)=]
-	>=mate-base/caja-1.8[gtk3(-)=]
-	>=mate-base/mate-menus-1.6
-	>=mate-base/mate-settings-daemon-1.11[gtk3(-)=]
-	>=media-libs/fontconfig-1:1.0
-	media-libs/freetype:2
-	>=sys-apps/dbus-1:0
-	x11-apps/xmodmap:0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libX11:0
-	x11-libs/libXScrnSaver:0
-	x11-libs/libXcursor:0
-	x11-libs/libXext:0
-	>=x11-libs/libXi-1.2:0
-	x11-libs/libXrandr:0
-	x11-libs/libXrender:0
-	x11-libs/libXxf86misc:0
-	>=x11-libs/libxklavier-4:0
-	x11-libs/pango:0
-	>=x11-wm/marco-1.9.1[gtk3(-)=]
-	virtual/libintl:0
-	!gtk3? (
-		>=dev-libs/libunique-1:1
-		media-libs/libcanberra:0[gtk]
-		>=x11-libs/gtk+-2.24:2
-		appindicator? ( dev-libs/libappindicator:2 )
-	)
-	gtk3? (
-		>=dev-libs/libunique-3:3
-		media-libs/libcanberra:0[gtk3]
-		>=x11-libs/gtk+-3.0:3
-		appindicator? ( dev-libs/libappindicator:3 )
-	)"
-
-DEPEND="${RDEPEND}
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	dev-util/desktop-file-utils:0
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto"
-
-PATCHES=( "${FILESDIR}/${PN}-1.12.1-backport-appindicator-configure.patch" )
-
-src_configure() {
-	mate_src_configure \
-		--disable-update-mimedb \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable appindicator) \
-		$(use_enable debug)
-}
diff --git a/mate-base/mate-control-center/mate-control-center-1.14.1-r1.ebuild b/mate-base/mate-control-center/mate-control-center-1.14.1-r1.ebuild
deleted file mode 100644
index 0a2e57bb6083..000000000000
--- a/mate-base/mate-control-center/mate-control-center-1.14.1-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
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="The MATE Desktop configuration tool"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="appindicator debug gtk3"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.73:0
-	>=dev-libs/glib-2.36:2
-	dev-libs/libxml2:2
-	>=gnome-base/dconf-0.13.4:0
-	>=gnome-base/librsvg-2.0:2
-	>=mate-base/libmatekbd-1.6[gtk3(-)=]
-	>=mate-base/mate-desktop-1.11[gtk3(-)=]
-	>=mate-base/caja-1.8[gtk3(-)=]
-	>=mate-base/mate-menus-1.6
-	>=mate-base/mate-settings-daemon-1.13.1[gtk3(-)=]
-	>=media-libs/fontconfig-1:1.0
-	media-libs/freetype:2
-	>=sys-apps/dbus-1:0
-	x11-apps/xmodmap:0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libX11:0
-	x11-libs/libXScrnSaver:0
-	x11-libs/libXcursor:0
-	x11-libs/libXext:0
-	>=x11-libs/libXi-1.2:0
-	x11-libs/libXrandr:0
-	x11-libs/libXrender:0
-	x11-libs/libXxf86misc:0
-	>=x11-libs/libxklavier-4:0
-	x11-libs/pango:0
-	>=x11-wm/marco-1.9.1[gtk3(-)=]
-	virtual/libintl:0
-	!gtk3? (
-		>=dev-libs/libunique-1:1
-		media-libs/libcanberra:0[gtk]
-		>=x11-libs/gtk+-2.24:2
-		appindicator? ( dev-libs/libappindicator:2 )
-	)
-	gtk3? (
-		>=dev-libs/libunique-3:3
-		media-libs/libcanberra:0[gtk3]
-		>=x11-libs/gtk+-3.0:3
-		appindicator? ( dev-libs/libappindicator:3 )
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	dev-util/desktop-file-utils:0
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto"
-
-PATCHES=( "${FILESDIR}/${PN}-1.12.1-backport-appindicator-configure.patch" )
-
-src_configure() {
-	mate_src_configure \
-		--disable-update-mimedb \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable appindicator) \
-		$(use_enable debug)
-}
diff --git a/mate-base/mate-control-center/mate-control-center-1.16.1.ebuild b/mate-base/mate-control-center/mate-control-center-1.16.1.ebuild
deleted file mode 100644
index cf625f137e25..000000000000
--- a/mate-base/mate-control-center/mate-control-center-1.16.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
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="The MATE Desktop configuration tool"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="appindicator debug gtk3"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.73:0
-	>=dev-libs/glib-2.36:2
-	dev-libs/libxml2:2
-	>=gnome-base/dconf-0.13.4:0
-	>=gnome-base/librsvg-2.0:2
-	>=mate-base/libmatekbd-1.6[gtk3(-)=]
-	>=mate-base/mate-desktop-1.15.1[gtk3(-)=]
-	>=mate-base/caja-1.8[gtk3(-)=]
-	>=mate-base/mate-menus-1.6
-	>=mate-base/mate-settings-daemon-1.13.1[gtk3(-)=]
-	>=media-libs/fontconfig-1:1.0
-	media-libs/freetype:2
-	>=sys-apps/dbus-1:0
-	x11-apps/xmodmap:0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libX11:0
-	x11-libs/libXScrnSaver:0
-	x11-libs/libXcursor:0
-	x11-libs/libXext:0
-	>=x11-libs/libXi-1.2:0
-	x11-libs/libXrandr:0
-	x11-libs/libXrender:0
-	x11-libs/libXxf86misc:0
-	>=x11-libs/libxklavier-4:0
-	x11-libs/pango:0
-	>=x11-wm/marco-1.13.1[gtk3(-)=]
-	virtual/libintl:0
-	!gtk3? (
-		>=dev-libs/libunique-1:1
-		media-libs/libcanberra:0[gtk]
-		>=x11-libs/gtk+-2.24:2
-		appindicator? ( dev-libs/libappindicator:2 )
-	)
-	gtk3? (
-		>=dev-libs/libunique-3:3
-		media-libs/libcanberra:0[gtk3]
-		>=x11-libs/gtk+-3.0:3
-		appindicator? ( dev-libs/libappindicator:3 )
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	dev-util/desktop-file-utils:0
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto"
-
-src_configure() {
-	mate_src_configure \
-		--disable-update-mimedb \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable appindicator) \
-		$(use_enable debug)
-}
diff --git a/mate-base/mate-control-center/metadata.xml b/mate-base/mate-control-center/metadata.xml
index 5b149532c5d2..3442f108b7e3 100644
--- a/mate-base/mate-control-center/metadata.xml
+++ b/mate-base/mate-control-center/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="appindicator">Add support for AppIndicator</flag>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/mate-control-center</remote-id>
diff --git a/mate-base/mate-desktop/Manifest b/mate-base/mate-desktop/Manifest
index ec325e5dd0c0..34564bdfd679 100644
--- a/mate-base/mate-desktop/Manifest
+++ b/mate-base/mate-desktop/Manifest
@@ -1,9 +1,3 @@
-DIST mate-desktop-1.12.1.tar.xz 773332 BLAKE2B 90e70929dcf1b3136a17ae658065d823dd052c53677db0b57e6843c4c86da4bd4de1f036c54b0fe0cc29b7c4e3bd83e9583a14ed148f30d67f8631a756891f50 SHA512 bcd3731bded736cdb4e0531d9c35253c025fa654d51f3ffb72ad7768ef62a1407b6ef62c2ff6beb45b0a30c2fe85e8d72c3e13068c92716e85f99f103b562c9e
-DIST mate-desktop-1.14.1.tar.xz 829244 BLAKE2B baecc3f130d095b2f1c679591ac48c28cf5fcb2b785ecd55ff03fde7b7b44b72cdf52dc38d931a2a312ce2999e5d3fc4a48cede4fc19d1ee2aa85f7e6003861e SHA512 b8d9688bfbea83d1264bce32be72fcb629b007e073553af24a9a79895baa29db3137cf6eed6a1bdf1a0b16ba3e02de892e85cbcfa62b84773d02fce71311496d
-DIST mate-desktop-1.16.2.tar.xz 822124 BLAKE2B 5c5ad8048dabfd460662e5c9b0f9ddc08119fc1eda31a6496ba3f344f4625e3243e9c88c1ea9fd2cdb54ffba7957ab0f6907beb5ec82dc81ab854d4e77567cd2 SHA512 da557edae0f5e2ed197b3d4601fa49e791274f7c5e6ba47846ee47d886ac660849786b7b143028826a5c29520465c06f100df7d9999717aace05d78d0da1f6d7
 DIST mate-desktop-1.18.0.tar.xz 827332 BLAKE2B e5a0439c768a388a76f1bd2a7ba819d92fd020565d63d4b412c5edac54c28493e83d9fa9c5b9f7c82dd5d76338f257e7cb8db7318d7743f6101098f20d47db5c SHA512 0490e9810009923fa315e7f191103bc797c37f4417cf41bf317c55d26f7b52a848a65c28dde6903a861694c131ca52f3ed0be05cbbf6b2dd1cb216539f513220
-EBUILD mate-desktop-1.12.1-r2.ebuild 1329 BLAKE2B 2c6bc45253936c8b2bb642be0c355e3592eb2a8d9f7e2cbd11c7ec41499b0dba864fd35be88ece2f6b69066acf6be2d753f68d1e2003de9e8d63ff332c91dc9b SHA512 0e61be636733c845f8e3a473dcf1b9477c713534479f1fa162107242faed887fa274840928b984bb966d0debc792cb89740b86ef55a18ace64fa1f3886c0fbc3
-EBUILD mate-desktop-1.14.1.ebuild 1217 BLAKE2B 1bbff2eea6460d5a714653f6f2d553503796e5993289c57dd8bda80d7e942fead6f9e0e2d9516ca0e499f88a76d0b3e3e351bddabae68a6650f446d5200fb95b SHA512 4c783e9a22216f32926a74fd093ccf400e7693b9ab16a5ae6e1d6b30b278b9a146822e9df55be9b07564503b826540521b43be5442ecf6bf5399de7424681b9d
-EBUILD mate-desktop-1.16.2.ebuild 1217 BLAKE2B 1bbff2eea6460d5a714653f6f2d553503796e5993289c57dd8bda80d7e942fead6f9e0e2d9516ca0e499f88a76d0b3e3e351bddabae68a6650f446d5200fb95b SHA512 4c783e9a22216f32926a74fd093ccf400e7693b9ab16a5ae6e1d6b30b278b9a146822e9df55be9b07564503b826540521b43be5442ecf6bf5399de7424681b9d
 EBUILD mate-desktop-1.18.0.ebuild 1099 BLAKE2B 4860142639df89d4b26afdd0345fb3ca15e731a8374d4afb44ffccc6e9a05a63bf170adce37a48cd7bad8a8020d39e37512b8e68e3d3fe910c67d4dc5a663ead SHA512 4e9d1a5d683ac97ae580bf1a0cd2fa7413b8ee6b074a0882e9c71e3fa4040d1af9585484663c193fd13e8e1d2414551c54eb09c9e65b3d550ebd3eb83af8afa7
-MISC metadata.xml 417 BLAKE2B 947a1abeccf86daa74d6dd42b4b63b32599287585397131e1a51b349bd4fdcd64d934467608cd6cfd682474201ff7b08b9c64553a4b08c09a867cf2d45d5efb6 SHA512 e3bc89370c680206ae9cab86e17bfcb36f4d2efa93b6d5a8b5964e445e95fd3873861a6c10f1069a8c9caae61268973aab97ff9ef72b3fdfe9334ad11ead0a51
+MISC metadata.xml 341 BLAKE2B d5ca73000fca7b5092f767fc927d65f32ab507a08f2d8c6f1a48d1a70ed25653467f75de3b556543512b3d7d9cc4b1704166eea72bd3ca708ad0b40e216e534a SHA512 7d54ddfb1e11f270908131ea9e1287efb589d0015305576d05bb2d57c74ec3778c004fa4a1533140026eeb4774c8b50f79045564877c9c2e06e4e446e101e08b
diff --git a/mate-base/mate-desktop/mate-desktop-1.12.1-r2.ebuild b/mate-base/mate-desktop/mate-desktop-1.12.1-r2.ebuild
deleted file mode 100644
index 59177607a9c1..000000000000
--- a/mate-base/mate-desktop/mate-desktop-1.12.1-r2.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
-
-MATE_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate multilib python-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Libraries for the MATE desktop that are not part of the UI"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X debug gtk3 +introspection startup-notification"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.36:2
-	x11-libs/cairo:0
-	>=x11-libs/gdk-pixbuf-2.4:2[introspection?]
-	x11-libs/libX11:0
-	>=x11-libs/libXrandr-1.3:0
-	virtual/libintl:0
-	!gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] )
-	gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
-	startup-notification? ( >=x11-libs/startup-notification-0.5:0 )"
-
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40:*
-	>=gnome-base/dconf-0.13.4:0
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto"
-
-src_configure() {
-	mate_src_configure \
-		--enable-mate-about \
-		--disable-mate-conf-import \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_enable debug) \
-		$(use_enable introspection) \
-		$(use_enable startup-notification)
-}
diff --git a/mate-base/mate-desktop/mate-desktop-1.14.1.ebuild b/mate-base/mate-desktop/mate-desktop-1.14.1.ebuild
deleted file mode 100644
index 6e2ff4767e73..000000000000
--- a/mate-base/mate-desktop/mate-desktop-1.14.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
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Libraries for the MATE desktop that are not part of the UI"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X debug gtk3 +introspection startup-notification"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.36:2
-	>=gnome-base/dconf-0.13.4:0
-	x11-libs/cairo:0
-	x11-libs/libX11:0
-	>=x11-libs/libXrandr-1.3:0
-	virtual/libintl:0
-	!gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] )
-	gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
-	startup-notification? ( >=x11-libs/startup-notification-0.5:0 )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto"
-
-src_configure() {
-	mate_src_configure \
-		--disable-mpaste \
-		--enable-mate-about \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_enable debug) \
-		$(use_enable introspection) \
-		$(use_enable startup-notification)
-}
diff --git a/mate-base/mate-desktop/mate-desktop-1.16.2.ebuild b/mate-base/mate-desktop/mate-desktop-1.16.2.ebuild
deleted file mode 100644
index 6e2ff4767e73..000000000000
--- a/mate-base/mate-desktop/mate-desktop-1.16.2.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
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Libraries for the MATE desktop that are not part of the UI"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X debug gtk3 +introspection startup-notification"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.36:2
-	>=gnome-base/dconf-0.13.4:0
-	x11-libs/cairo:0
-	x11-libs/libX11:0
-	>=x11-libs/libXrandr-1.3:0
-	virtual/libintl:0
-	!gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] )
-	gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
-	startup-notification? ( >=x11-libs/startup-notification-0.5:0 )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto"
-
-src_configure() {
-	mate_src_configure \
-		--disable-mpaste \
-		--enable-mate-about \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_enable debug) \
-		$(use_enable introspection) \
-		$(use_enable startup-notification)
-}
diff --git a/mate-base/mate-desktop/metadata.xml b/mate-base/mate-desktop/metadata.xml
index 5d6f0fede527..07d2ede1a16b 100644
--- a/mate-base/mate-desktop/metadata.xml
+++ b/mate-base/mate-desktop/metadata.xml
@@ -5,9 +5,6 @@
 		<email>mate@gentoo.org</email>
 		<name>Gentoo MATE Desktop</name>
 	</maintainer>
-	<use>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/mate-desktop</remote-id>
 	</upstream>
diff --git a/mate-base/mate-menus/Manifest b/mate-base/mate-menus/Manifest
index d62aa77f9bd2..6ac547ce9f2f 100644
--- a/mate-base/mate-menus/Manifest
+++ b/mate-base/mate-menus/Manifest
@@ -1,10 +1,4 @@
 AUX 10-xdg-menu-mate 113 BLAKE2B e49a76bdbbe1b08782ccd216afbc40bc49b4b16cb399c29e7a6860154cbd0d6d2712f85bd2edef53e9f53a4d92d29ec9524916f123d44e930a81cca3e60a3cb6 SHA512 8d4c30c79ecca4d1ff4dad7e7946f9e967ac33cf54dcccb1e1325bff298ffef6306bcf5865071e388e3a17ba77bc79896246a4b44b42c72c20ed13c4677fb8ef
-DIST mate-menus-1.12.0.tar.xz 342488 BLAKE2B da9ae8e64d4f498ac360e41646e49ccd0c2d76dddfa417a3bcd07f860e16f66b58679b3aae761fd11d2c9cc1d47a97a444b2de8b2d9d584fc43c1184da38727d SHA512 12788d5b88c1dba7b561a3119e311a9724629d1f9ae7d54a9e4443946b331c532310c79b7b39bcacc791697ac52d4b55338051da66c4d747c371575a03183ba6
-DIST mate-menus-1.14.0.tar.xz 362136 BLAKE2B cb4123add4f5c9e794050e8ee63ce4d8d3f3cf39e68111a8909df5b24ed5c89a1c614c0939616bc2ba0ef73e412d933f694f8e378c09a6fdee959aa04174c79a SHA512 9d82737669b37e85ab76e94e84a464d7cafb837b71d6af90cf08b4286480de901e1a37d279ba7f0af25e655c3c9c67481b1394587b6aad902a284a8ac58559c6
-DIST mate-menus-1.16.0.tar.xz 356832 BLAKE2B 1ef09eedb48424dcd740c37bb83bd7c2e15895506f26faa688f9eb0c4fdeb7c814b039d14e6a26a7ab8ac442e72e8b67a71a09180573ec1b6542b3e49e91be5e SHA512 c6cc3ce73dfdcbe7db4a10c68d1acc5c8433f077576d047b2c3488716ff40733ae86b50480abd5c4fa033275d6f6a04dbe4c6e049a4be85fd132e8291b0d97b5
 DIST mate-menus-1.18.1.tar.xz 359768 BLAKE2B c57095e772610c56a02a5b6b1405c5ccc11cb590ea959efa14bd0ffb5cafbe3a678f8a681e39ae9cf607225f57becfc520ec483e6451f07b7f9e80418496502b SHA512 bfd010735acd3447700a4732da16728d429ca8ba559c6bfc6edfdaea52f4e40552882bb09615fc4f040730bffac7614bb74fe18aee3ab8ee1684dad40a82d572
-EBUILD mate-menus-1.12.0-r1.ebuild 1615 BLAKE2B 32d5ee67192285745ed72daabd089b2e4a0373b36841bdf925a5cca116fc3891e0ac41b7de77452a1fd3c2726abcdee93006a5d0a21fd939015403cefc73a532 SHA512 c432cf2e3bae6db9af492b27b7faea5c7f1d0e1dfb4fffdbaccfad0f1116be8d6de26b224da0cf38342a1b77e09aa6ba8bbe5ab96d77c07c3e91479d9a57cbe6
-EBUILD mate-menus-1.14.0.ebuild 1657 BLAKE2B c5284ed6269c5f8cefe886b28e1bd5bb3179a1db579c9384e2a4a25de8148f02e6db01edef8b7ececcbc6ec58d6aef9608f3df9775c37ce3d01a828bef12b8ea SHA512 0f3d64f451d627ef7ac9fa2e39f391548e30158ea2dc5e7760dcac51df6a0566444e4976626f73435cab78ca9251bc73d4717f4e11747335d328df5819d6ddb3
-EBUILD mate-menus-1.16.0.ebuild 1657 BLAKE2B c5284ed6269c5f8cefe886b28e1bd5bb3179a1db579c9384e2a4a25de8148f02e6db01edef8b7ececcbc6ec58d6aef9608f3df9775c37ce3d01a828bef12b8ea SHA512 0f3d64f451d627ef7ac9fa2e39f391548e30158ea2dc5e7760dcac51df6a0566444e4976626f73435cab78ca9251bc73d4717f4e11747335d328df5819d6ddb3
 EBUILD mate-menus-1.18.1.ebuild 1662 BLAKE2B 769dee26a473f7ac70de68ea19596f888c2552f92be6a1e590caa70e352657b17f89882d5a86389141fbfc07377bf188b09325eccc70c3942e6d5f326d5da7ec SHA512 a34b7ef40a6bef926514bdfebdff1ac3a269aae1c02372c72f95e847cb1ecd5254d841c5795b8b95f912a4b566635fa2330d8115340b8ce8188939e884e442c7
 MISC metadata.xml 339 BLAKE2B 0aa628f37ca885f294c05a4f97ecea8b57a588e02997ef0ab33485ada19abbae35e2c1ed5ed9f18c2b9143d9f0e4cf76ec2adbfec74a96062b5ddee0fb337dfc SHA512 39239eed6c1808d1b279a5924b2c66dfd38a4548b182b79e2a2f9c00f64a799c4e99d510b30a2ca179a918218e4e49b021e7cb3386c30c86b776a36f3800b03c
diff --git a/mate-base/mate-menus/mate-menus-1.12.0-r1.ebuild b/mate-base/mate-menus/mate-menus-1.12.0-r1.ebuild
deleted file mode 100644
index 76d6841fb771..000000000000
--- a/mate-base/mate-menus/mate-menus-1.12.0-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1 mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="MATE menu system, implementing the F.D.O cross-desktop spec"
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-
-IUSE="debug +introspection python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=dev-libs/glib-2.36.0:2
-	virtual/libintl:0
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-	python? (
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_prepare() {
-	mate_src_prepare
-	use python && python_copy_sources
-}
-
-src_configure() {
-	# Do NOT compile with --disable-debug/--enable-debug=no as it disables API
-	# usage checks.
-	mate_py_cond_func_wrap mate_src_configure \
-		--enable-debug=$(usex debug yes minimum) \
-		$(use_enable python) \
-		$(use_enable introspection)
-}
-
-src_compile() {
-	mate_py_cond_func_wrap default
-}
-
-src_test() {
-	mate_py_cond_func_wrap emake check
-}
-
-src_install() {
-	mate_py_cond_func_wrap mate_src_install
-
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}/10-xdg-menu-mate"
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-	einfo "Due to upstream bug"
-	einfo "https://github.com/mate-desktop/mate-menus/issues/2,"
-	einfo "it is highly recommended to run the following command"
-	einfo "once you have logged in to your desktop for the first time:"
-	einfo "cd ~/.config/menus && ln -s {,mate-}applications-merged"
-}
diff --git a/mate-base/mate-menus/mate-menus-1.14.0.ebuild b/mate-base/mate-menus/mate-menus-1.14.0.ebuild
deleted file mode 100644
index f32609d8757d..000000000000
--- a/mate-base/mate-menus/mate-menus-1.14.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1 mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE menu system, implementing the F.D.O cross-desktop spec"
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-
-IUSE="debug +introspection python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36.0:2
-	virtual/libintl:0
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-	python? (
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_prepare() {
-	mate_src_prepare
-	use python && python_copy_sources
-}
-
-src_configure() {
-	# Do NOT compile with --disable-debug/--enable-debug=no as it disables API
-	# usage checks.
-	mate_py_cond_func_wrap mate_src_configure \
-		--enable-debug=$(usex debug yes minimum) \
-		$(use_enable python) \
-		$(use_enable introspection)
-}
-
-src_compile() {
-	mate_py_cond_func_wrap default
-}
-
-src_test() {
-	mate_py_cond_func_wrap emake check
-}
-
-src_install() {
-	mate_py_cond_func_wrap mate_src_install
-
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}/10-xdg-menu-mate"
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-	einfo "Due to upstream bug"
-	einfo "https://github.com/mate-desktop/mate-menus/issues/2,"
-	einfo "it is highly recommended to run the following command"
-	einfo "once you have logged in to your desktop for the first time:"
-	einfo "cd ~/.config/menus && ln -s {,mate-}applications-merged"
-}
diff --git a/mate-base/mate-menus/mate-menus-1.16.0.ebuild b/mate-base/mate-menus/mate-menus-1.16.0.ebuild
deleted file mode 100644
index f32609d8757d..000000000000
--- a/mate-base/mate-menus/mate-menus-1.16.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1 mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE menu system, implementing the F.D.O cross-desktop spec"
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-
-IUSE="debug +introspection python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36.0:2
-	virtual/libintl:0
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-	python? (
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_prepare() {
-	mate_src_prepare
-	use python && python_copy_sources
-}
-
-src_configure() {
-	# Do NOT compile with --disable-debug/--enable-debug=no as it disables API
-	# usage checks.
-	mate_py_cond_func_wrap mate_src_configure \
-		--enable-debug=$(usex debug yes minimum) \
-		$(use_enable python) \
-		$(use_enable introspection)
-}
-
-src_compile() {
-	mate_py_cond_func_wrap default
-}
-
-src_test() {
-	mate_py_cond_func_wrap emake check
-}
-
-src_install() {
-	mate_py_cond_func_wrap mate_src_install
-
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}/10-xdg-menu-mate"
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-	einfo "Due to upstream bug"
-	einfo "https://github.com/mate-desktop/mate-menus/issues/2,"
-	einfo "it is highly recommended to run the following command"
-	einfo "once you have logged in to your desktop for the first time:"
-	einfo "cd ~/.config/menus && ln -s {,mate-}applications-merged"
-}
diff --git a/mate-base/mate-panel/Manifest b/mate-base/mate-panel/Manifest
index 360794683b62..4b6fd591bbf0 100644
--- a/mate-base/mate-panel/Manifest
+++ b/mate-base/mate-panel/Manifest
@@ -1,9 +1,3 @@
-DIST mate-panel-1.12.2.tar.xz 1930792 BLAKE2B 8694e39fb16a5565749cfbf62a23ce068f1656c0c64ee39384d3b184acb02212c9ab758d0c547b557d4710116c9335b3b4f5bb8917f811b54c7cb45a6f5aab9b SHA512 7810c3b3585e9def59c192914a91e2e64173b5b44cf43496808f6be46df798fc97358bb7bc300e52985fc401feb5201daad60bb0181e72e5e2512e7712aba6a4
-DIST mate-panel-1.14.2.tar.xz 1981716 BLAKE2B 1963d0035e8a5abf8940a88123408b089b4c19c9ca7a2d696635c653883d2023aa95de42e30bf40948c48c60ca6f410fa2c76f39879c51e44d734ddc9aecbffa SHA512 296a74fcbdd3a58337987c0e8bcc804a203fbf5f134183c2fe09016c609bbd67bfab4dc6e46e333c7714e9c264965f1c3897c9645a5003405866fbdaf0a04944
-DIST mate-panel-1.16.2.tar.xz 1953812 BLAKE2B 20dec8edb56a13774419f8d43ca4d9df1a12f9188001762edd5cb3ff3d1e93365a2fc825d1094538b0f93ad6d8d224d8d2d0afe302d998e453daff726f86f327 SHA512 4d5ad1a657a2a2f04b4a667b1fc4b13b158a2ee8cf379636ac196b16093589e5bb5d97ed06c0c621f72586e01bff791a364aa17ff16554c844f9d870e3b709bb
 DIST mate-panel-1.18.7.tar.xz 1943216 BLAKE2B c811a299d612e11827f6531f3093addfeeb5a8f18449f76dba0f70233f072bd2666bb4cd8b39111da298fbdd966f5b7f21b37ce3fe4870129da0563faabc5a2f SHA512 6de91f16f5ade7873d2baf3d813bd77304723f27629474fdf37aa9c590b5fcb31452f5b117b52926dd53a38e9f8edd964c654fd29c8271131c6901eec46b5a31
-EBUILD mate-panel-1.12.2-r3.ebuild 1688 BLAKE2B cbbdfa3e872b54ac8fa68d24ada32ba2fd9929a122b828ac8e92aed46ff6cb3868f55c0224b31103b445db518e8d08b527585f155d50b416414c708c350ea1f2 SHA512 a04aba1c58bab130082dedb17c2ac7d70fbf8b3cfae00fdb690b0cff0c9ae6acdf3c45bfef761b53d6a9ffe12423558610e0c1052c8b717859c2c1e9576bcd18
-EBUILD mate-panel-1.14.2.ebuild 1598 BLAKE2B 095c13daeeaf196f5eb268c00bb423b1d8883d9f633cbe4e491d8fd7f43ecf2368cd19f2942d15b7482c424477e4aec7c93919c1eb81fadda60cd4f769ad79f1 SHA512 148fd91c7f9db1bd062b26a9fa2a7fb5bb108e2d3b698bcdf7107d5693939db2a67ff9d36b1e3ec981c76297666cecd7230f78f6c58c016309f3e242f07fa6df
-EBUILD mate-panel-1.16.2.ebuild 1598 BLAKE2B bca60dfcdde93e589f7b737c2138956d97eabea5a3e1578748360b8cfda6495f531828da77d1851eb5a3beceb4dcce3f7aab8c63071e7b6ced45d8a433691861 SHA512 08b4afb3d62b322fbe2cadb83687214960476a9a7f531b40870dc7fed3844a98b1a114c27656df9867bf54cb9dfaca6859354a38445ab3c1179f3aa3f0f6ee09
 EBUILD mate-panel-1.18.7.ebuild 1399 BLAKE2B d73452975ad5ccd4d0cb71b58b0a126fd137fea684af580bbab2c6aeeb869a382112bac1cf56d48c6f104ad80f53feac775f4913d9a81485e664f8c3d307e251 SHA512 3fccd420eab25eaa587c3ce124747c0bc742146d0058602c600fb4d5b7a7ba840cb98c64f4711bf6398d8de514b82c44a42dbb43fefabfd53dcdb7a26c9ae6f9
-MISC metadata.xml 415 BLAKE2B b4ccf02438c98ac33146a6710c89166d57bcb48bc681e5089832e97bdd1373e63ab27e2983f5c15cbb384901acf7b72a5b17fa819d9ccf774ec4409d3b558358 SHA512 bb1d49b6f17d4dbb7115979faed200a7e5cf3953c87dd9326f2b96d48ff6daa1edaff6a50b7ba9c5d0706c2e3a9bcca414218cf9f1fcd1f02a0cbed4c64cc847
+MISC metadata.xml 339 BLAKE2B d4e26fe24b5076b1a78c8de45bab802a438bd5fc171da7a6da6dc2460a7cb53677d4044abefc6c925a1b56d60d1a20fcb2334121ac0750d8347dc8ca3497b9c7 SHA512 788f53b6c90c485f6c8e4de2a9d1fd8f895b7c57cb7beeb0ec295a4710ceac5c8537ec9b3b567fbb5fae95cc08ce8892649a4198d40f30363b98f01267d67d26
diff --git a/mate-base/mate-panel/mate-panel-1.12.2-r3.ebuild b/mate-base/mate-panel/mate-panel-1.12.2-r3.ebuild
deleted file mode 100644
index a9c737776581..000000000000
--- a/mate-base/mate-panel/mate-panel-1.12.2-r3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="The MATE panel"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X gtk3 +introspection"
-
-RDEPEND="
-	dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.80:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libmateweather-1.7[gtk3(-)=]
-	dev-libs/libxml2:2
-	>=gnome-base/dconf-0.10:0
-	gnome-base/librsvg:2
-	>=mate-base/mate-desktop-1.9.3[gtk3(-)=]
-	>=mate-base/mate-menus-1.6
-	>=sys-apps/dbus-1.1.2:0
-	>=x11-libs/cairo-1:0
-	>=x11-libs/gdk-pixbuf-2.7.1:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	>=x11-libs/pango-1.15.4:0[introspection?]
-	x11-libs/libXau:0
-	>=x11-libs/libXrandr-1.3:0
-	virtual/libintl:0
-	!gtk3? (
-		media-libs/libcanberra:0[gtk]
-		>=x11-libs/gtk+-2.19.7:2[introspection?]
-		>=x11-libs/libwnck-2.30:1[introspection?]
-	)
-	gtk3? (
-		media-libs/libcanberra:0[gtk3]
-		>=x11-libs/gtk+-3.0:3[introspection?]
-		>=x11-libs/libwnck-3.0:3[introspection?]
-	)
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )"
-
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools:0
-	>=dev-lang/perl-5:0=
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-MATE_FORCE_AUTORECONF=true
-
-src_prepare() {
-	# Disable python check.
-	sed -e '/AM_PATH_PYTHON/d' -i configure.ac || die
-	mate_src_prepare
-}
-
-src_configure() {
-	mate_src_configure \
-		--libexecdir=/usr/libexec/mate-applets \
-		--disable-deprecation-flags \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_enable introspection)
-}
diff --git a/mate-base/mate-panel/mate-panel-1.14.2.ebuild b/mate-base/mate-panel/mate-panel-1.14.2.ebuild
deleted file mode 100644
index 8fca1161980f..000000000000
--- a/mate-base/mate-panel/mate-panel-1.14.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="The MATE panel"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X gtk3 +introspection"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.80:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libmateweather-1.7[gtk3(-)=]
-	dev-libs/libxml2:2
-	>=gnome-base/dconf-0.10:0
-	>=gnome-base/librsvg-2.36.2:2
-	>=mate-base/mate-desktop-1.9.3[gtk3(-)=]
-	>=mate-base/mate-menus-1.6
-	>=sys-apps/dbus-1.1.2:0
-	>=x11-libs/cairo-1:0
-	>=x11-libs/gdk-pixbuf-2.7.1:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	>=x11-libs/pango-1.15.4:0[introspection?]
-	x11-libs/libXau:0
-	>=x11-libs/libXrandr-1.3:0
-	virtual/libintl:0
-	!gtk3? (
-		media-libs/libcanberra:0[gtk]
-		>=x11-libs/gtk+-2.19.7:2[introspection?]
-		>=x11-libs/libwnck-2.30:1[introspection?]
-	)
-	gtk3? (
-		media-libs/libcanberra:0[gtk3]
-		>=x11-libs/gtk+-3.0:3[introspection?]
-		>=x11-libs/libwnck-3.0:3[introspection?]
-	)
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools:0
-	>=dev-lang/perl-5:0=
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--libexecdir=/usr/libexec/mate-applets \
-		--disable-deprecation-flags \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_enable introspection)
-}
diff --git a/mate-base/mate-panel/mate-panel-1.16.2.ebuild b/mate-base/mate-panel/mate-panel-1.16.2.ebuild
deleted file mode 100644
index 9f90e878faa4..000000000000
--- a/mate-base/mate-panel/mate-panel-1.16.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="The MATE panel"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X gtk3 +introspection"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.80:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libmateweather-1.7[gtk3(-)=]
-	dev-libs/libxml2:2
-	>=gnome-base/dconf-0.10:0
-	>=gnome-base/librsvg-2.36.2:2
-	>=mate-base/mate-desktop-1.9.3[gtk3(-)=]
-	>=mate-base/mate-menus-1.6
-	>=sys-apps/dbus-1.1.2:0
-	>=x11-libs/cairo-1:0
-	>=x11-libs/gdk-pixbuf-2.7.1:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	>=x11-libs/pango-1.15.4:0[introspection?]
-	x11-libs/libXau:0
-	>=x11-libs/libXrandr-1.3:0
-	virtual/libintl:0
-	!gtk3? (
-		media-libs/libcanberra:0[gtk]
-		>=x11-libs/gtk+-2.19.7:2[introspection?]
-		>=x11-libs/libwnck-2.30:1[introspection?]
-	)
-	gtk3? (
-		media-libs/libcanberra:0[gtk3]
-		>=x11-libs/gtk+-3.0:3[introspection?]
-		>=x11-libs/libwnck-3.0:3[introspection?]
-	)
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools:0
-	>=dev-lang/perl-5:0=
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--libexecdir=/usr/libexec/mate-applets \
-		--disable-deprecation-flags \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_enable introspection)
-}
diff --git a/mate-base/mate-panel/metadata.xml b/mate-base/mate-panel/metadata.xml
index a7e9eb414582..834a9f1460e5 100644
--- a/mate-base/mate-panel/metadata.xml
+++ b/mate-base/mate-panel/metadata.xml
@@ -5,9 +5,6 @@
 		<email>mate@gentoo.org</email>
 		<name>Gentoo MATE Desktop</name>
 	</maintainer>
-	<use>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/mate-panel</remote-id>
 	</upstream>
diff --git a/mate-base/mate-session-manager/Manifest b/mate-base/mate-session-manager/Manifest
index ba3677a4716f..90463cc368e2 100644
--- a/mate-base/mate-session-manager/Manifest
+++ b/mate-base/mate-session-manager/Manifest
@@ -2,16 +2,6 @@ AUX 10-user-dirs-update-mate 267 BLAKE2B d1943bd1ee27d95ffd9a09f7d6c4f98681b9c36
 AUX 15-xdg-data-mate 224 BLAKE2B ae38eaf5c0abc088a353d244de928ff12c7da020da0304c5592c7232ae4be69db55083da91fa8d95cdbb6bbc4c4d76ac37df3e011a5a5b984348435a0c615b3c SHA512 a19acef85d510d6244fd29ba7daa6d5cc314392257b47574d8aedea235e4a5273d36bd67c138da9496663c2786ba5f7f433ff4aa6990a91a39be267026e5694d
 AUX MATE 2378 BLAKE2B 824c6e357c90322a499aeeece3e38d25bcfb87c23eab159e1bc3c4dc39aeb535eb86f7833e8d9b9b1d48fc765414ca79120bee81ffde8c7d1f0ea6a112fe2dcc SHA512 dbb162f694eeee806a12b46bf45d47f4887a83562b61d05037b3de5a7778a68d79de5528327588da13a5c17c283c8b7590c10877eba77cea75ebe5113ef2c920
 AUX defaults.list 14293 BLAKE2B b8de50636f845e5ed197968a0f917a3d2c1f59b082ae7d76841c9802ce6182556a29faebcd28f71dfdd778ae73268ebba1d450c9f18ac730aedd5ba0f025e53c SHA512 d3b14a4676bbadb93bc33e94ddf74fc6a2c072c52ada51d8f658008301d795102d47b3e1b71f9884d117111329774deaab1a5c1718c3dab5bcf96df1657f3c9d
-AUX mate-session-manager-1.12.2-save-session-ui.patch 20029 BLAKE2B 11ac604f47ec4b4892666d117d1ad514026fa6d15cdcb973c8d4d0b9051f6505d219ea7bc884ca8b20cf51fcc77913840b7f1adc6b7ea26b993134b7abfa027f SHA512 43501ff0911a3c9e6e007b7b8da771a6bfaac46b33b7b7a7be1570e77cad8222e1b3c0f4db0e23c92e5f3bde593bf52770cb56cad37d78ead028ecce8e5c619d
-DIST mate-session-manager-1.12.2.tar.xz 538832 BLAKE2B 6442fae3076e2ac54b4705326469f1ccc4c4daca8cc06bcfb720a89e347a725e46c18e7b6d987043cb1a9371f73c9cc82324c0d1d6fdf97bbed8c894ae2d398d SHA512 4b4a3ecb0f7cbb25e17db8c5833f789858c94fb236ed60b9e98f59cffa320ec32c2b1960fdcbb9c2c9f476ed76cb1f37c3e07746c7c90e08a0dbcc62aac9793e
-DIST mate-session-manager-1.14.1.tar.xz 574804 BLAKE2B af3ed0abec15a7bf2002d965252b07eb5327c2fc351b1f475c0afc64011a7b18d21d0b4f3d40f56282ea11b8055e21e52ac0a2df9e509442b2e43eeeb549c9af SHA512 993f314c887bca8d8e0b9450f0e62686e133ea16ee2b6675ff69766564d47a4e7d48581867e8d5e8395ee2e3b1735b121f16cb1be22c7da29015a58f98edd638
-DIST mate-session-manager-1.16.1.tar.xz 574540 BLAKE2B 40abb2655acf84c90a8805e967817d1ef4739a1278369f5b632071302d22a9c6cf15d83d69e8ccf7503dc19f8c39844f14afa976a96f905dfd355a7071a609a1 SHA512 fdce8351b5541e7e8455659c1107be2976a24602e61010261fd8d1931d07298033d15fda43163fabc2bfcd6b42120c68e377278b820100686a8ef8e36852ff0e
-DIST mate-session-manager-1.18.0.tar.xz 578256 BLAKE2B ef58007798ac15934b6e8c071ce97ad3bd52d47fdbf639ac7a2e6c1120d67492e77a2d1159700a17a6a6321645b4a63e6de2c493fdc26d65aba4e98f7262c6c5 SHA512 0b1299eed5a745112a9976a85965847fc7a579e161236f4d661cf08a1292037aa8246bd3e3efcf3d0c6ea8b005e9dfc33cec797c8dc48615f7bc88ce5d351ba8
 DIST mate-session-manager-1.18.2.tar.xz 570336 BLAKE2B d1fd8f6a037fa38833d4aae05dcc9ed98ff192c712819342a77d19fb00e09febaa90fd0396048a3cee64ea424c6a72e8ae90f067d61929ef524825c97d500f8e SHA512 e3d3e2524cd0d00930b5c6b81134b969555f00550d23a357d426a6f0d475884ce6ab16be365fd5e95801dd53c250069ad091dec6c93f2ab70818460fbef4765e
-EBUILD mate-session-manager-1.12.2-r1.ebuild 2268 BLAKE2B f1413a4cab927cf550ac419223836dd3b506944c9cd5da37c34c85a4ab945a477d350ff65cdb6482b7ca10b9abb2e12f5e74793cfe364dd8ccc60404a6087b20 SHA512 a4192c79ddbb94ae522d87d304e485e292352b788a0aada7b0003f42b5573948a727deb3e695a5dd58004444ee27054fefca9c0de88c29a9fe43f94d1e3850b8
-EBUILD mate-session-manager-1.14.1.ebuild 2156 BLAKE2B af21c59cc37eb4a955ddd6a168bfe0351f37e8dc8904e510315b7b95da5cc3251a4ae9faf94a3bd32f0a7245ebd5eebacaae17fdbdc6adf1c4dfb85636b4aaad SHA512 ce5408ca30670daedceaa6942ca6097e85ca6cd4167af15d0f075260ab1416da0ed36eefdb46cf9a1854bf22ceea6d20bc88172e15268948fda04c5cfdbbf4e0
-EBUILD mate-session-manager-1.16.1.ebuild 2114 BLAKE2B a7c96a7322526dd5c936179a8b3d5d9d26f97af037aeb3a9ea754fb2c5832decdc4abfde4a79f3cf2bc0c35c69d0d1301cbf31f7bd5c9f107c3edc3aa8c2171f SHA512 b2d2acbab19357943cb195d74ff799435e33016dff4d01b859aa5307f745d4ad81ed1acefa83df8922ff614852b237f42760893b266a22db1819076f6b2713a9
-EBUILD mate-session-manager-1.18.0-r1.ebuild 2052 BLAKE2B aa45fe425cf05f7cd5b4b99d8ede2f8f33d83cc0f5c9d5043317198a591d08ed6fe0f2c508ec72d97148268ec3e551b43789d79228f34f94d19b7646a3a5afc9 SHA512 4ee6d2f4f33b5f2ec093bfec33eea15ef25f205721be118f94a05c95f6d833a3980fd7641a339cf292791dd048c459a2fad31e1045eab31e92d64ec0ac290d09
 EBUILD mate-session-manager-1.18.2-r1.ebuild 2050 BLAKE2B 9863863dcb955c561cd69f67c141608a73e7bfe70804efee79438f5271e342c80da8e2a45e00c25e66ad5092ed8ca944ef9afd8133232e80a181910b5a1fa945 SHA512 cf6cbac9c513aadafa94bbb995bf4ca2f91fde90a0b3f09daab720b3fd73b4fbb349336e8ab96663c3abc557d6eede12e49e37036545f492d67a9775cad5d31a
-EBUILD mate-session-manager-1.18.2.ebuild 2044 BLAKE2B 69a45c09931ab44a5821759ec50d2bc9c1dabbe88c87d92046f2b48d84ecc0b446fd133bee35eac74addd88ffe678b56dbe146d5d6dba098e0d211f9891045b1 SHA512 5538b863f80254dac59b449b453cdfd2468219e0a0274ed64cf628ea24ef6f3dfc8f3651bd3cff6e762825c97186cc1fa64d682dae8aa401b6a5c6b1a2761b17
-MISC metadata.xml 558 BLAKE2B 6c7b3116a26b07af4afe5be2f4635ffeba7a67bddddb5bee3009f20ad215c2fdd4bdd89d3d8f58c02e8edf6ac665da54b35a708936bb6edd12f4c1703360b497 SHA512 3ec5ae6695bb7477bf8384dc31143be21ff5d2f5ac0715309657b14e3b43b8013cfccf701307b2ee1a0f8e2cf0e7956d5db37739578c18006a299e428137ed14
+MISC metadata.xml 497 BLAKE2B 85510300fad0274831fbbb5dbedb00bd3e6347518e0188838f8dce213064db44612ca7e7fbbe922cc46924f02f2fda50120ecba21774231af6e3acea45fc9db4 SHA512 19f431c7d3a9912baaa3df85fd222be5b2649f46a723ffdc084524b172c6c387e4a9928b219d9e73217c7e6ef677f2e5e82473547489001fc20fee7529373568
diff --git a/mate-base/mate-session-manager/files/mate-session-manager-1.12.2-save-session-ui.patch b/mate-base/mate-session-manager/files/mate-session-manager-1.12.2-save-session-ui.patch
deleted file mode 100644
index e7040f47f45a..000000000000
--- a/mate-base/mate-session-manager/files/mate-session-manager-1.12.2-save-session-ui.patch
+++ /dev/null
@@ -1,535 +0,0 @@
-diff -burN a/capplet/gsm-properties-dialog.c b/capplet/gsm-properties-dialog.c
---- a/capplet/gsm-properties-dialog.c	2012-02-29 22:03:08.000000000 +0100
-+++ b/capplet/gsm-properties-dialog.c	2012-08-08 12:16:37.527332034 +0200
-@@ -26,6 +26,8 @@
- #include <glib.h>
- #include <glib/gi18n.h>
- #include <gtk/gtk.h>
-+#include <dbus/dbus-glib.h>
-+#include <dbus/dbus-glib-lowlevel.h>
- 
- #include <mateconf/mateconf-client.h>
- 
-@@ -36,6 +38,11 @@
- #include "gsp-app.h"
- #include "gsp-app-manager.h"
- 
-+
-+#define GSM_SERVICE_DBUS   "org.gnome.SessionManager"
-+#define GSM_PATH_DBUS      "/org.gnome.SessionManager"
-+#define GSM_INTERFACE_DBUS "org.gnome.SessionManager"
-+
- #define GSM_PROPERTIES_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_PROPERTIES_DIALOG, GsmPropertiesDialogPrivate))
- 
- #define IS_STRING_EMPTY(x) ((x)==NULL||(x)[0]=='\0')
-@@ -50,6 +57,7 @@
- #define CAPPLET_DELETE_WIDGET_NAME        "session_properties_delete_button"
- #define CAPPLET_EDIT_WIDGET_NAME          "session_properties_edit_button"
- #define CAPPLET_SAVE_WIDGET_NAME          "session_properties_save_button"
-+#define CAPPLET_SESSION_SAVED_WIDGET_NAME "session_properties_session_saved_label"
- #define CAPPLET_REMEMBER_WIDGET_NAME      "session_properties_remember_toggle"
- 
- #define STARTUP_APP_ICON     "system-run"
-@@ -493,10 +501,66 @@
- }
- 
- static void
-+session_saved_message (GsmPropertiesDialog *dialog,
-+                       const char *msg,
-+                       gboolean is_error)
-+{
-+        GtkLabel *label;
-+        gchar *markup;
-+        
-+        label = GTK_LABEL (gtk_builder_get_object (dialog->priv->xml, CAPPLET_SESSION_SAVED_WIDGET_NAME));
-+        if (is_error)
-+                markup = g_markup_printf_escaped ("<span foreground=\"red\">%s</span>", msg);
-+        else
-+                markup = g_markup_escape_text (msg, -1);
-+
-+        gtk_label_set_markup (label, markup);
-+        g_free (markup);
-+}
-+
-+static void
-+session_saved_cb (DBusGProxy *proxy,
-+                  DBusGProxyCall *call_id,
-+                  void *user_data)
-+{
-+        gboolean res;
-+        GsmPropertiesDialog *dialog = user_data;
-+
-+        res = dbus_g_proxy_end_call (proxy, call_id, NULL, G_TYPE_INVALID);
-+        if (res)
-+                session_saved_message (dialog, _("Your session has been saved."), FALSE);
-+        else
-+                session_saved_message (dialog, _("Failed to save session"), TRUE);
-+
-+        g_object_unref (proxy);
-+}
-+
-+static void
- on_save_session_clicked (GtkWidget           *widget,
-                          GsmPropertiesDialog *dialog)
- {
--        g_debug ("Session saving is not implemented yet!");
-+        DBusGConnection *conn;
-+        DBusGProxy *proxy;
-+        DBusGProxyCall *call;
-+
-+        conn = dbus_g_bus_get (DBUS_BUS_SESSION, NULL);
-+        if (conn == NULL) {
-+                session_saved_message (dialog, _("Could not connect to the session bus"), TRUE);
-+                return;
-+        }
-+
-+        proxy = dbus_g_proxy_new_for_name (conn, GSM_SERVICE_DBUS, GSM_PATH_DBUS, GSM_INTERFACE_DBUS);
-+        if (proxy == NULL) {
-+                session_saved_message (dialog, _("Could not connect to the session manager"), TRUE);
-+                return;
-+        }
-+
-+        call = dbus_g_proxy_begin_call (proxy, "SaveSession", session_saved_cb, dialog, NULL, G_TYPE_INVALID);
-+        if (call == NULL) {
-+                session_saved_message (dialog, _("Failed to save session"), TRUE);
-+                g_object_unref (proxy);
-+                return;
-+        }
- }
- 
- static void
-diff -burN a/configure.ac b/configure.ac
---- a/configure.ac	2012-02-29 22:03:09.000000000 +0100
-+++ b/configure.ac	2012-08-08 12:18:58.740336360 +0200
-@@ -75,6 +75,7 @@
- PKG_CHECK_MODULES(SESSION_PROPERTIES,
-         glib-2.0 >= $GLIB_REQUIRED
-         gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
-+        dbus-glib-1 >= $DBUS_GLIB_REQUIRED
- )
- 
- PKG_CHECK_MODULES(SM, sm)
-diff -burN a/data/session-properties.ui b/data/session-properties.ui
---- a/data/session-properties.ui	2012-02-29 22:03:08.000000000 +0100
-+++ b/data/session-properties.ui	2012-08-08 12:22:36.619343035 +0200
-@@ -148,6 +148,7 @@
-             <property name="visible">True</property>
-             <child>
-               <object class="GtkButton" id="session_properties_save_button">
-+                <property name="visible">True</property>
-                 <property name="can_focus">True</property>
-                 <property name="receives_default">True</property>
-                 <child>
-@@ -191,6 +192,17 @@
-             <property name="position">1</property>
-           </packing>
-         </child>
-+        <child>
-+          <object class="GtkLabel" id="session_properties_session_saved_label">
-+            <property name="visible">True</property>
-+            <property name="wrap">True</property>
-+          </object>
-+          <packing>
-+            <property name="expand">False</property>
-+            <property name="fill">False</property>
-+            <property name="position">2</property>
-+          </packing>
-+        </child>
-       </object>
-       <packing>
-         <property name="position">1</property>
-diff -burN a/mate-session/gsm-client.c b/mate-session/gsm-client.c
---- a/mate-session/gsm-client.c	2012-02-29 22:03:08.000000000 +0100
-+++ b/mate-session/gsm-client.c	2012-08-08 12:24:20.120346205 +0200
-@@ -510,6 +510,17 @@
-         g_signal_emit (client, signals[DISCONNECTED], 0);
- }
- 
-+gboolean
-+gsm_client_request_save (GsmClient *client,
-+                         guint      flags,
-+                         GError   **error)
-+{
-+        g_return_val_if_fail (GSM_IS_CLIENT (client), FALSE);
-+
-+        return GSM_CLIENT_GET_CLASS (client)->impl_request_save (client, flags, error);
-+}
-+
-+
- GKeyFile *
- gsm_client_save (GsmClient *client,
-                  GError   **error)
-diff -burN a/mate-session/gsm-client.h b/mate-session/gsm-client.h
---- a/mate-session/gsm-client.h	2012-02-29 22:03:09.000000000 +0100
-+++ b/mate-session/gsm-client.h	2012-08-08 12:26:38.848350455 +0200
-@@ -94,6 +94,9 @@
-                                                               GError   **error);
-         gboolean              (*impl_stop)                   (GsmClient *client,
-                                                               GError   **error);
-+        gboolean              (*impl_request_save)           (GsmClient *client,
-+                                                              guint      flags,
-+                                                              GError   **error);
-         GKeyFile *            (*impl_save)                   (GsmClient *client,
-                                                               GError   **error);
- };
-@@ -139,6 +142,10 @@
- 
- void                  gsm_client_disconnected               (GsmClient  *client);
- 
-+gboolean              gsm_client_request_save               (GsmClient  *client,
-+                                                             guint       flags,
-+                                                             GError    **error);
-+
- GKeyFile             *gsm_client_save                       (GsmClient  *client,
-                                                              GError    **error);
- /* exported to bus */
-diff -burN a/mate-session/gsm-dbus-client.c b/mate-session/gsm-dbus-client.c
---- a/mate-session/gsm-dbus-client.c	2012-02-29 22:03:08.000000000 +0100
-+++ b/mate-session/gsm-dbus-client.c	2012-08-08 12:38:15.393371794 +0200
-@@ -413,6 +413,19 @@
-         G_OBJECT_CLASS (gsm_dbus_client_parent_class)->finalize (object);
- }
- 
-+static gboolean
-+dbus_client_request_save (GsmClient *client,
-+                          guint      flags,
-+                          GError   **error)
-+{
-+        g_debug ("GsmDBusClient: sending save request to client with id %s",
-+                 gsm_client_peek_id (client));
-+
-+        /* FIXME: The protocol does not support this */
-+
-+        return FALSE;
-+}
-+
- static GKeyFile *
- dbus_client_save (GsmClient *client,
-                   GError   **error)
-@@ -665,6 +678,7 @@
-         object_class->set_property         = gsm_dbus_client_set_property;
-         object_class->dispose              = gsm_dbus_client_dispose;
- 
-+        client_class->impl_request_save           = dbus_client_request_save;
-         client_class->impl_save                   = dbus_client_save;
-         client_class->impl_stop                   = dbus_client_stop;
-         client_class->impl_query_end_session      = dbus_client_query_end_session;
-diff -burN a/mate-session/gsm-manager.c b/mate-session/gsm-manager.c
---- a/mate-session/gsm-manager.c	2012-02-29 22:03:09.000000000 +0100
-+++ b/mate-session/gsm-manager.c	2012-08-08 12:47:24.627388620 +0200
-@@ -68,6 +68,7 @@
- #define GSM_MANAGER_DBUS_NAME "org.gnome.SessionManager"
- 
- #define GSM_MANAGER_PHASE_TIMEOUT 30 /* seconds */
-+#define GSM_MANAGER_SAVE_SESSION_TIMEOUT 2
- 
- #define MDM_FLEXISERVER_COMMAND "mdmflexiserver"
- #define MDM_FLEXISERVER_ARGS    "--startnew Standard"
-@@ -1176,6 +1177,69 @@
- 
- }
- 
-+static gboolean
-+_client_request_save (GsmClient            *client,
-+                      ClientEndSessionData *data)
-+{
-+        gboolean ret;
-+        GError  *error;
-+
-+        error = NULL;
-+        ret = gsm_client_request_save (client, data->flags, &error);
-+        if (ret) {
-+                g_debug ("GsmManager: adding client to query clients: %s", gsm_client_peek_id (client));
-+                data->manager->priv->query_clients = g_slist_prepend (data->manager->priv->query_clients,
-+                                                                      client);
-+        } else if (error) {
-+                g_debug ("GsmManager: unable to query client: %s", error->message);
-+                g_error_free (error);
-+        }
-+
-+        return FALSE;
-+}
-+
-+static gboolean
-+_client_request_save_helper (const char           *id,
-+                             GsmClient            *client,
-+                             ClientEndSessionData *data)
-+{
-+        return _client_request_save (client, data);
-+}
-+
-+static void
-+query_save_session_complete (GsmManager *manager)
-+{
-+        GError *error = NULL;
-+
-+        if (g_slist_length (manager->priv->next_query_clients) > 0) {
-+                ClientEndSessionData data;
-+
-+                data.manager = manager;
-+                data.flags = GSM_CLIENT_END_SESSION_FLAG_LAST;
-+
-+                g_slist_foreach (manager->priv->next_query_clients,
-+                                 (GFunc)_client_request_save,
-+                                 &data);
-+
-+                g_slist_free (manager->priv->next_query_clients);
-+                manager->priv->next_query_clients = NULL;
-+
-+                return;
-+        }
-+
-+        if (manager->priv->query_timeout_id > 0) {
-+                g_source_remove (manager->priv->query_timeout_id);
-+                manager->priv->query_timeout_id = 0;
-+        }
-+
-+        gsm_session_save (manager->priv->clients, &error);
-+
-+        if (error) {
-+                g_warning ("Error saving session: %s", error->message);
-+                g_error_free (error);
-+        }
-+}
-+
- static guint32
- generate_cookie (void)
- {
-@@ -1250,6 +1314,21 @@
-         return FALSE;
- }
- 
-+static gboolean
-+_on_query_save_session_timeout (GsmManager *manager)
-+{
-+        manager->priv->query_timeout_id = 0;
-+
-+        g_debug ("GsmManager: query to save session timed out");
-+
-+        g_slist_free (manager->priv->query_clients);
-+        manager->priv->query_clients = NULL;
-+
-+        query_save_session_complete (manager);
-+
-+        return FALSE;
-+}
-+
- static void
- do_phase_query_end_session (GsmManager *manager)
- {
-@@ -1886,13 +1965,32 @@
-                                 const char *reason,
-                                 GsmManager *manager)
- {
--        /* just ignore if received outside of shutdown */
--        if (manager->priv->phase < GSM_MANAGER_PHASE_QUERY_END_SESSION) {
-+        /* just ignore if we are not yet running */
-+        if (manager->priv->phase < GSM_MANAGER_PHASE_RUNNING) {
-                 return;
-         }
- 
-         g_debug ("GsmManager: Response from end session request: is-ok=%d do-last=%d cancel=%d reason=%s", is_ok, do_last, cancel, reason ? reason :"");
- 
-+        if (manager->priv->phase == GSM_MANAGER_PHASE_RUNNING) {
-+                /* Ignore responses when no requests were sent */
-+                if (manager->priv->query_clients == NULL) {
-+                        return;
-+                }
-+
-+                manager->priv->query_clients = g_slist_remove (manager->priv->query_clients, client);
-+
-+                if (do_last) {
-+                        manager->priv->next_query_clients = g_slist_prepend (manager->priv->next_query_clients,
-+                                                                             client);
-+                }
-+
-+                if (manager->priv->query_clients == NULL) {
-+                        query_save_session_complete (manager);
-+                }
-+                return;
-+        }
-+
-         if (cancel) {
-                 cancel_end_session (manager);
-                 return;
-@@ -1991,6 +2089,15 @@
- }
- 
- static void
-+on_xsmp_client_save_request (GsmXSMPClient *client,
-+                             gboolean       show_dialog,
-+                             GsmManager    *manager)
-+{
-+        g_debug ("GsmManager: save_request");
-+        gsm_manager_save_session (manager, NULL);
-+}
-+
-+static void
- on_store_client_added (GsmStore   *store,
-                        const char *id,
-                        GsmManager *manager)
-@@ -2011,6 +2118,10 @@
-                                   "logout-request",
-                                   G_CALLBACK (on_xsmp_client_logout_request),
-                                   manager);
-+		g_signal_connect (client,
-+				  "save-request",
-+				  G_CALLBACK (on_xsmp_client_save_request),
-+				  manager);
-         }
- 
-         g_signal_connect (client,
-@@ -2968,6 +3079,41 @@
- }
- 
- gboolean
-+gsm_manager_save_session (GsmManager *manager,
-+                          GError     **error)
-+{
-+        ClientEndSessionData data;
-+
-+        g_debug ("GsmManager: SaveSession called");
-+
-+        g_return_val_if_fail (GSM_IS_MANAGER (manager), FALSE);
-+
-+        if (manager->priv->phase != GSM_MANAGER_PHASE_RUNNING) {
-+                g_set_error (error,
-+                             GSM_MANAGER_ERROR,
-+                             GSM_MANAGER_ERROR_NOT_IN_RUNNING,
-+                             "SaveSession interface is only available during the Running phase");
-+                return FALSE;
-+        }
-+
-+        data.manager = manager;
-+        data.flags = 0;
-+        gsm_store_foreach (manager->priv->clients,
-+                           (GsmStoreFunc)_client_request_save_helper,
-+                           &data);
-+
-+        if (manager->priv->query_clients) {
-+                manager->priv->query_timeout_id = g_timeout_add_seconds (GSM_MANAGER_SAVE_SESSION_TIMEOUT,
-+                                                                         (GSourceFunc)_on_query_save_session_timeout,
-+                                                                         manager);
-+                return TRUE;
-+        } else {
-+                g_debug ("GsmManager: Nothing to save");
-+                return FALSE;
-+        }
-+}
-+
-+gboolean
- gsm_manager_can_shutdown (GsmManager *manager,
-                           gboolean   *shutdown_available,
-                           GError    **error)
-diff -burN a/mate-session/gsm-manager.h b/mate-session/gsm-manager.h
---- a/mate-session/gsm-manager.h	2012-02-29 22:03:09.000000000 +0100
-+++ b/mate-session/gsm-manager.h	2012-08-08 12:49:14.262391979 +0200
-@@ -154,6 +154,9 @@
- gboolean            gsm_manager_shutdown                       (GsmManager     *manager,
-                                                                 GError        **error);
- 
-+gboolean            gsm_manager_save_session                   (GsmManager     *manager,
-+                                                                GError        **error);
-+
- gboolean            gsm_manager_can_shutdown                   (GsmManager     *manager,
-                                                                 gboolean       *shutdown_available,
-                                                                 GError        **error);
-diff -burN a/mate-session/gsm-xsmp-client.c b/mate-session/gsm-xsmp-client.c
---- a/mate-session/gsm-xsmp-client.c	2012-02-29 22:03:08.000000000 +0100
-+++ b/mate-session/gsm-xsmp-client.c	2012-08-08 12:52:27.719397905 +0200
-@@ -69,6 +69,7 @@
- enum {
-         REGISTER_REQUEST,
-         LOGOUT_REQUEST,
-+        SAVE_REQUEST,
-         LAST_SIGNAL
- };
- 
-@@ -502,6 +503,31 @@
-         return TRUE;
- }
- 
-+static gboolean
-+xsmp_request_save (GsmClient *client,
-+                   guint      flags,
-+                   GError   **error)
-+{
-+        GsmXSMPClient *xsmp = (GsmXSMPClient *) client;
-+
-+        g_debug ("GsmXSMPClient: xsmp_request_save ('%s')", xsmp->priv->description);
-+
-+        if (xsmp->priv->conn == NULL) {
-+                g_set_error (error,
-+                             GSM_CLIENT_ERROR,
-+                             GSM_CLIENT_ERROR_NOT_REGISTERED,
-+                             "Client is not registered");
-+                return FALSE;
-+        }
-+
-+        if (flags & GSM_CLIENT_END_SESSION_FLAG_LAST)
-+                xsmp_save_yourself_phase2 (client);
-+        else
-+                do_save_yourself (xsmp, SmSaveLocal, FALSE);
-+
-+        return TRUE;
-+}
-+
- static char *
- get_desktop_file_path (GsmXSMPClient *client)
- {
-@@ -976,6 +1002,8 @@
-         object_class->get_property         = gsm_xsmp_client_get_property;
-         object_class->set_property         = gsm_xsmp_client_set_property;
- 
-+
-+        client_class->impl_request_save           = xsmp_request_save;
-         client_class->impl_save                   = xsmp_save;
-         client_class->impl_stop                   = xsmp_stop;
-         client_class->impl_query_end_session      = xsmp_query_end_session;
-@@ -1003,6 +1031,16 @@
-                               NULL,
-                               NULL,
-                               g_cclosure_marshal_VOID__BOOLEAN,
-+                              G_TYPE_NONE,
-+                              1, G_TYPE_BOOLEAN);
-+        signals[SAVE_REQUEST] =
-+		g_signal_new ("save-request",
-+                              G_OBJECT_CLASS_TYPE (object_class),
-+                              G_SIGNAL_RUN_LAST,
-+                              G_STRUCT_OFFSET (GsmXSMPClientClass, save_request),
-+                              NULL,
-+                              NULL,
-+                              g_cclosure_marshal_VOID__BOOLEAN,
-                               G_TYPE_NONE,
-                               1, G_TYPE_BOOLEAN);
- 
-diff -burN a/mate-session/gsm-xsmp-client.h b/mate-session/gsm-xsmp-client.h
---- a/mate-session/gsm-xsmp-client.h	2012-02-29 22:03:09.000000000 +0100
-+++ b/mate-session/gsm-xsmp-client.h	2012-08-08 12:53:39.629400108 +0200
-@@ -57,6 +57,8 @@
-         gboolean (*logout_request)       (GsmXSMPClient  *client,
-                                           gboolean        prompt);
- 
-+        gboolean (*save_request)         (GsmXSMPClient  *client,
-+                                          gboolean        prompt);
- 
-         void     (*saved_state)          (GsmXSMPClient  *client);
- 
-diff -burN a/mate-session/org.gnome.SessionManager.xml b/mate-session/org.gnome.SessionManager.xml
---- a/mate-session/org.gnome.SessionManager.xml	2012-02-29 22:03:09.000000000 +0100
-+++ b/mate-session/org.gnome.SessionManager.xml	2012-08-08 12:57:41.216407509 +0200
-@@ -256,6 +256,14 @@
-       </doc:doc>
-     </method>
- 
-+    <method name="SaveSession">
-+      <doc:doc>
-+	    <doc:description>
-+	      <doc:para>Request to save session</doc:para>
-+	    </doc:description>
-+      </doc:doc>
-+    </method>
-+
-     <method name="CanShutdown">
-       <arg name="is_available" direction="out" type="b">
-         <doc:doc>
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.12.2-r1.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.12.2-r1.ebuild
deleted file mode 100644
index 1f8d061666fe..000000000000
--- a/mate-base/mate-session-manager/mate-session-manager-1.12.2-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="MATE session manager"
-HOMEPAGE="http://mate-desktop.org/"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-
-IUSE="debug elibc_FreeBSD gnome-keyring gtk3 ipv6 systemd upower"
-
-# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
-# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
-# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
-
-RDEPEND=">=dev-libs/dbus-glib-0.76
-	>=dev-libs/glib-2.36:2
-	dev-libs/libxslt
-	sys-apps/dbus
-	x11-apps/xdpyinfo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango
-	x11-libs/xtrans
-	x11-misc/xdg-user-dirs
-	x11-misc/xdg-user-dirs-gtk
-	virtual/libintl
-	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
-	gnome-keyring? ( gnome-base/gnome-keyring )
-	!gtk3? ( >=x11-libs/gtk+-2.14:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3 )
-	systemd? ( sys-apps/systemd )
-	upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40:*
-	>=dev-lang/perl-5
-	>=sys-devel/gettext-0.10.40:*
-	virtual/pkgconfig:*
-	!<gnome-base/gdm-2.20.4"
-
-# Add "session saving" button back,
-# see https://bugzilla.gnome.org/show_bug.cgi?id=575544
-PATCHES=( "${FILESDIR}"/${PN}-1.12.2-save-session-ui.patch )
-
-MATE_FORCE_AUTORECONF=true
-
-src_configure() {
-	mate_src_configure \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with systemd) \
-		$(use_enable debug) \
-		$(use_enable ipv6) \
-		$(use_enable upower)
-}
-
-src_install() {
-	mate_src_install
-
-	dodir /etc/X11/Sessions/
-	exeinto /etc/X11/Sessions/
-	doexe "${FILESDIR}"/MATE
-
-	dodir /usr/share/mate/applications/
-	insinto /usr/share/mate/applications/
-	doins "${FILESDIR}"/defaults.list
-
-	dodir /etc/X11/xinit/xinitrc.d/
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}"/15-xdg-data-mate
-
-	# This should be done in MATE too, see Gentoo bug #270852
-	doexe "${FILESDIR}"/10-user-dirs-update-mate
-}
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.14.1.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.14.1.ebuild
deleted file mode 100644
index 3e193a85805e..000000000000
--- a/mate-base/mate-session-manager/mate-session-manager-1.14.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
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE session manager"
-HOMEPAGE="http://mate-desktop.org/"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-
-IUSE="debug elibc_FreeBSD gnome-keyring gtk3 ipv6 systemd upower"
-
-# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
-# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
-# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.76
-	>=dev-libs/glib-2.36:2
-	dev-libs/libxslt
-	sys-apps/dbus
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango
-	x11-libs/xtrans
-	virtual/libintl
-	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
-	!gtk3? ( >=x11-libs/gtk+-2.14:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3 )
-	systemd? ( sys-apps/systemd )
-	upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) )"
-
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/xdpyinfo
-	x11-misc/xdg-user-dirs
-	x11-misc/xdg-user-dirs-gtk
-	gnome-keyring? ( gnome-base/gnome-keyring )"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40:*
-	>=dev-lang/perl-5
-	>=sys-devel/gettext-0.10.40:*
-	virtual/pkgconfig:*
-	!<gnome-base/gdm-2.20.4"
-
-MATE_FORCE_AUTORECONF=true
-
-src_configure() {
-	mate_src_configure \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with systemd) \
-		$(use_enable debug) \
-		$(use_enable ipv6) \
-		$(use_enable upower)
-}
-
-src_install() {
-	mate_src_install
-
-	dodir /etc/X11/Sessions/
-	exeinto /etc/X11/Sessions/
-	doexe "${FILESDIR}"/MATE
-
-	dodir /usr/share/mate/applications/
-	insinto /usr/share/mate/applications/
-	doins "${FILESDIR}"/defaults.list
-
-	dodir /etc/X11/xinit/xinitrc.d/
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}"/15-xdg-data-mate
-
-	# This should be done in MATE too, see Gentoo bug #270852
-	doexe "${FILESDIR}"/10-user-dirs-update-mate
-}
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.16.1.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.16.1.ebuild
deleted file mode 100644
index 8ca0b8b67a59..000000000000
--- a/mate-base/mate-session-manager/mate-session-manager-1.16.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 mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE session manager"
-HOMEPAGE="http://mate-desktop.org/"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-
-IUSE="debug elibc_FreeBSD gnome-keyring ipv6 systemd upower +xtrans"
-
-# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
-# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
-# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.76
-	>=dev-libs/glib-2.36:2
-	dev-libs/libxslt
-	sys-apps/dbus
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango
-	virtual/libintl
-	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
-	>=x11-libs/gtk+-3.14:3
-	systemd? ( sys-apps/systemd )
-	upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) )
-	xtrans? ( x11-libs/xtrans )"
-
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/xdpyinfo
-	x11-misc/xdg-user-dirs
-	x11-misc/xdg-user-dirs-gtk
-	gnome-keyring? ( gnome-base/gnome-keyring )"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40:*
-	>=dev-lang/perl-5
-	>=sys-devel/gettext-0.10.40:*
-	virtual/pkgconfig:*
-	!<gnome-base/gdm-2.20.4"
-
-MATE_FORCE_AUTORECONF=true
-
-src_configure() {
-	mate_src_configure \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_with systemd) \
-		$(use_with xtrans) \
-		$(use_enable debug) \
-		$(use_enable ipv6) \
-		$(use_enable upower)
-}
-
-src_install() {
-	mate_src_install
-
-	dodir /etc/X11/Sessions/
-	exeinto /etc/X11/Sessions/
-	doexe "${FILESDIR}"/MATE
-
-	dodir /usr/share/mate/applications/
-	insinto /usr/share/mate/applications/
-	doins "${FILESDIR}"/defaults.list
-
-	dodir /etc/X11/xinit/xinitrc.d/
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}"/15-xdg-data-mate
-
-	# This should be done in MATE too, see Gentoo bug #270852
-	doexe "${FILESDIR}"/10-user-dirs-update-mate
-}
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.18.0-r1.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.18.0-r1.ebuild
deleted file mode 100644
index 30752431738a..000000000000
--- a/mate-base/mate-session-manager/mate-session-manager-1.18.0-r1.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 mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="MATE session manager"
-HOMEPAGE="http://mate-desktop.org/"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-
-IUSE="debug elibc_FreeBSD gnome-keyring ipv6 systemd +xtrans"
-
-# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
-# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
-# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.76
-	>=dev-libs/glib-2.36:2
-	dev-libs/libxslt
-	sys-apps/dbus
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.14:3
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango
-	virtual/libintl
-	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
-	systemd? ( sys-apps/systemd )
-	!systemd? ( >=sys-auth/consolekit-0.9.2 )
-	xtrans? ( x11-libs/xtrans )"
-
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/xdpyinfo
-	x11-misc/xdg-user-dirs
-	x11-misc/xdg-user-dirs-gtk
-	gnome-keyring? ( gnome-base/gnome-keyring )"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40:*
-	>=dev-lang/perl-5
-	>=sys-devel/gettext-0.10.40:*
-	virtual/pkgconfig:*
-	!<gnome-base/gdm-2.20.4"
-
-MATE_FORCE_AUTORECONF=true
-
-src_configure() {
-	mate_src_configure \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_with systemd) \
-		$(use_with xtrans)  \
-		$(use_enable debug) \
-		$(use_enable ipv6)
-}
-
-src_install() {
-	mate_src_install
-
-	dodir /etc/X11/Sessions/
-	exeinto /etc/X11/Sessions/
-	doexe "${FILESDIR}"/MATE
-
-	dodir /usr/share/mate/applications/
-	insinto /usr/share/mate/applications/
-	doins "${FILESDIR}"/defaults.list
-
-	dodir /etc/X11/xinit/xinitrc.d/
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}"/15-xdg-data-mate
-
-	# This should be done in MATE too, see Gentoo bug #270852
-	doexe "${FILESDIR}"/10-user-dirs-update-mate
-}
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.18.2.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.18.2.ebuild
deleted file mode 100644
index ce7d45a672d5..000000000000
--- a/mate-base/mate-session-manager/mate-session-manager-1.18.2.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 mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE session manager"
-HOMEPAGE="http://mate-desktop.org/"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-
-IUSE="debug elibc_FreeBSD gnome-keyring ipv6 systemd xtrans"
-
-# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
-# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
-# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.76
-	>=dev-libs/glib-2.36:2
-	dev-libs/libxslt
-	sys-apps/dbus
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.14:3
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango
-	virtual/libintl
-	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
-	systemd? ( sys-apps/systemd )
-	!systemd? ( >=sys-auth/consolekit-0.9.2 )
-	xtrans? ( x11-libs/xtrans )"
-
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/xdpyinfo
-	x11-misc/xdg-user-dirs
-	x11-misc/xdg-user-dirs-gtk
-	gnome-keyring? ( gnome-base/gnome-keyring )"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40:*
-	>=dev-lang/perl-5
-	>=sys-devel/gettext-0.10.40:*
-	virtual/pkgconfig:*
-	!<gnome-base/gdm-2.20.4"
-
-MATE_FORCE_AUTORECONF=true
-
-src_configure() {
-	mate_src_configure \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_with systemd) \
-		$(use_with xtrans)  \
-		$(use_enable debug) \
-		$(use_enable ipv6)
-}
-
-src_install() {
-	mate_src_install
-
-	dodir /etc/X11/Sessions/
-	exeinto /etc/X11/Sessions/
-	doexe "${FILESDIR}"/MATE
-
-	dodir /usr/share/mate/applications/
-	insinto /usr/share/mate/applications/
-	doins "${FILESDIR}"/defaults.list
-
-	dodir /etc/X11/xinit/xinitrc.d/
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}"/15-xdg-data-mate
-
-	# This should be done in MATE too, see Gentoo bug #270852
-	doexe "${FILESDIR}"/10-user-dirs-update-mate
-}
diff --git a/mate-base/mate-session-manager/metadata.xml b/mate-base/mate-session-manager/metadata.xml
index f69aac22ed08..ee3469ab6dba 100644
--- a/mate-base/mate-session-manager/metadata.xml
+++ b/mate-base/mate-session-manager/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo MATE Desktop</name>
 	</maintainer>
 	<use>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
 		<flag name="xtrans">Build with Xtrans support; 
 		WARNING: Disabling this flag will result in ICE binding on all interfaces</flag>
 	</use>
diff --git a/mate-base/mate-settings-daemon/Manifest b/mate-base/mate-settings-daemon/Manifest
index 8461b58f8440..9e35a9f95233 100644
--- a/mate-base/mate-settings-daemon/Manifest
+++ b/mate-base/mate-settings-daemon/Manifest
@@ -1,9 +1,3 @@
-DIST mate-settings-daemon-1.12.1.tar.xz 781388 BLAKE2B dad221eb742f7748b4c3b70123ce3689509752a73d3f090e027f56d9f64a5d4d11e0c49a5c293c6e8569e250cec7d027dd7dc93a76e8541b8e70828f33ec94de SHA512 36c0d2cacef22db1d27e694602ee390fd0a24e3478837fd7fbfe069f55278c7a7ff3f7d280e0bf9cd4e827beeb9b3d40f505e5772686036e47e3d0b7d1e4b47e
-DIST mate-settings-daemon-1.14.1.tar.xz 760936 BLAKE2B dd3365faa55c743cfad7ee5dded7fd4d88c5b5080afd0e806600879e57a7dcbffb4f77217faefa766b1faa85f622ccfdf9e0774604d4e67d68fc8ab0758647da SHA512 e237c1c7df4a42183e3c3079c88dfc94422b604ed9b197363a5ea9bfdf7a16782681f6d82ee3b5b7c5edac6b90b0f2875072a108f5fe9b954bbbf1c8cc27e6d5
-DIST mate-settings-daemon-1.16.2.tar.xz 767820 BLAKE2B 1057d21f88799978a58fb0db8b15e72f4905995f7673c1baa92100b823232ae1ed4886d88b5a37e30cd05e1d1ca72b8fa3c58ee9f3211581bda4845f745e52b7 SHA512 e4b527791f65c500ac0b432744c3b128a6a438077261ee182993c82c175d165c2f67fa60620ac03c6f6f532ef6cb4a2a6df52164022a30015e7a071a03df043e
 DIST mate-settings-daemon-1.18.2.tar.xz 787004 BLAKE2B 4549948a25016389c280e2df190febb9c1fda3a88ee9354ea72a01e4b8fe973bd0d85c1fd1b3533589dcb1b304893099e6e0171a9be9c64c72fef3608375d86d SHA512 2e07f7873d8f1e75391ae6ab7a132ce1f90a3afe661ca263fff9db1b68c0a02dc53255d6382c2d69861f997f22711d062e43468041a0b3476cdd3a051dec7039
-EBUILD mate-settings-daemon-1.12.1.ebuild 1684 BLAKE2B adb2cd736afae30d6472fda63677b098d12d043ff9e73cdd09c3b61a858f26625e8ca988e0b416ae9f2ba662d85a256ec066bbf6eeeaca9a3847a54d7b19e50a SHA512 292415701b750988db63176bcb15e8199030b6e4bb2b177094fff23689a0a7ef9e0fad5490465fd9e5b14457e554115c956dc3060e8d734037ac2c4d066dcbd3
-EBUILD mate-settings-daemon-1.14.1.ebuild 1726 BLAKE2B fb77abe7d9ced8184ace1b3b19d473105b1761a5086a6a69cf6daeae16da317f61a886c0e02777de798dd47e744bed43e2afc040081dce13f30eab1bef6fda89 SHA512 892ad37be146462498f2fc3895bdeab11e3729a59283c6172ec94717fb957fbb538acdd280e42ef650c82ee4c73e294902992d36011a3b663c2ae0daa39d239b
-EBUILD mate-settings-daemon-1.16.2.ebuild 1726 BLAKE2B fb77abe7d9ced8184ace1b3b19d473105b1761a5086a6a69cf6daeae16da317f61a886c0e02777de798dd47e744bed43e2afc040081dce13f30eab1bef6fda89 SHA512 892ad37be146462498f2fc3895bdeab11e3729a59283c6172ec94717fb957fbb538acdd280e42ef650c82ee4c73e294902992d36011a3b663c2ae0daa39d239b
 EBUILD mate-settings-daemon-1.18.2.ebuild 1584 BLAKE2B 96356dd2bafc6daaeec05f58215aaf7000755655b1b9f415322919c289a6268bbd8fd010f800300d2ba2ad9aeee51ae785c2671d237387032b0517cc8233900f SHA512 497272e21ebb9d4ab19e3c955eef5ad54224d2ad69a80c5b86f0c59a072d6448db1ec86d0973a70c6291c1c4ffe88045892599aa90ab21fae89d4bdd94c8dfbf
-MISC metadata.xml 425 BLAKE2B f4dd8aa58084e192d3f20df7f926845f1aabe03c4a03c20177e42c9daeb5f7db7f1ca535ac7131c58a3731e1d250c1de144a00bbd6f2434539fd52b749be55ac SHA512 3849ef93c7ebd9b753a15bab1c1fb3142d4c3270fe1ac29585862c27265a78f389478962475038680e194d976812ecfab398ecb89d26c2372e1fdb060432d932
+MISC metadata.xml 349 BLAKE2B a6f74cac08d50c578b34f35764aaa46fe18c7b0003f19f3492c10fcf8cc3b1618fbb02c460de0d5cc7480e65a39a1e2ddb1029820f304f4b778e42af7589d801 SHA512 60b6cbc98f39edcf1716313dce83ee951c361f4cabf89232f8c0b8f482eb98bc262bdb748e5650d4fed4d7cbf084f02bbd534bb72dbab246abe95ba274f09abc
diff --git a/mate-base/mate-settings-daemon/mate-settings-daemon-1.12.1.ebuild b/mate-base/mate-settings-daemon/mate-settings-daemon-1.12.1.ebuild
deleted file mode 100644
index fff4079c0979..000000000000
--- a/mate-base/mate-settings-daemon/mate-settings-daemon-1.12.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
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="MATE Settings Daemon"
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-
-IUSE="X debug gtk3 libnotify policykit pulseaudio smartcard +sound"
-
-REQUIRED_USE="pulseaudio? ( sound )"
-
-RDEPEND=">=dev-libs/dbus-glib-0.74:0
-	>=dev-libs/glib-2.17.3:2
-	>=gnome-base/dconf-0.13.4:0
-	>=mate-base/libmatekbd-1.7[gtk3(-)=]
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-	media-libs/fontconfig:1.0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libX11:0
-	x11-libs/libXi:0
-	x11-libs/libXext:0
-	x11-libs/libXxf86misc:0
-	>=x11-libs/libxklavier-5:0
-	virtual/libintl:0
-	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3 )
-	libnotify? ( >=x11-libs/libnotify-0.7:0 )
-	policykit? (
-		>=dev-libs/dbus-glib-0.71:0
-		>=sys-apps/dbus-1.1.2:0
-		>=sys-auth/polkit-0.97:0
-	)
-	pulseaudio? (
-		>=media-libs/libmatemixer-1.10:0[pulseaudio]
-		>=media-sound/pulseaudio-0.9.15:0
-	)
-	smartcard? ( >=dev-libs/nss-3.11.2:0 )
-	sound? (
-		>=media-libs/libmatemixer-1.9
-		!gtk3? ( media-libs/libcanberra:0[gtk] )
-		gtk3? ( media-libs/libcanberra:0[gtk3] )
-	)"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.50.1:0
-	sys-devel/gettext:0
-	virtual/pkgconfig:0
-	x11-base/xorg-proto"
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_with libnotify) \
-		$(use_with sound libcanberra) \
-		$(use_with sound libmatemixer) \
-		$(use_enable debug) \
-		$(use_enable policykit polkit) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable smartcard smartcard-support)
-}
diff --git a/mate-base/mate-settings-daemon/mate-settings-daemon-1.14.1.ebuild b/mate-base/mate-settings-daemon/mate-settings-daemon-1.14.1.ebuild
deleted file mode 100644
index 1161e4944d37..000000000000
--- a/mate-base/mate-settings-daemon/mate-settings-daemon-1.14.1.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
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE Settings Daemon"
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-
-IUSE="X debug gtk3 libnotify policykit pulseaudio smartcard +sound"
-
-REQUIRED_USE="pulseaudio? ( sound )"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.74:0
-	>=dev-libs/glib-2.17.3:2
-	>=gnome-base/dconf-0.13.4:0
-	>=mate-base/libmatekbd-1.7[gtk3(-)=]
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-	media-libs/fontconfig:1.0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libX11:0
-	x11-libs/libXi:0
-	x11-libs/libXext:0
-	x11-libs/libXxf86misc:0
-	>=x11-libs/libxklavier-5:0
-	virtual/libintl:0
-	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3 )
-	libnotify? ( >=x11-libs/libnotify-0.7:0 )
-	policykit? (
-		>=dev-libs/dbus-glib-0.71:0
-		>=sys-apps/dbus-1.1.2:0
-		>=sys-auth/polkit-0.97:0
-	)
-	pulseaudio? (
-		>=media-libs/libmatemixer-1.10:0[pulseaudio]
-		>=media-sound/pulseaudio-0.9.15:0
-	)
-	smartcard? ( >=dev-libs/nss-3.11.2:0 )
-	sound? (
-		>=media-libs/libmatemixer-1.9
-		!gtk3? ( media-libs/libcanberra:0[gtk] )
-		gtk3? ( media-libs/libcanberra:0[gtk3] )
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50.1:0
-	sys-devel/gettext:0
-	virtual/pkgconfig:0
-	x11-base/xorg-proto"
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_with libnotify) \
-		$(use_with sound libcanberra) \
-		$(use_with sound libmatemixer) \
-		$(use_enable debug) \
-		$(use_enable policykit polkit) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable smartcard smartcard-support)
-}
diff --git a/mate-base/mate-settings-daemon/mate-settings-daemon-1.16.2.ebuild b/mate-base/mate-settings-daemon/mate-settings-daemon-1.16.2.ebuild
deleted file mode 100644
index 1161e4944d37..000000000000
--- a/mate-base/mate-settings-daemon/mate-settings-daemon-1.16.2.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
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE Settings Daemon"
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-
-IUSE="X debug gtk3 libnotify policykit pulseaudio smartcard +sound"
-
-REQUIRED_USE="pulseaudio? ( sound )"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.74:0
-	>=dev-libs/glib-2.17.3:2
-	>=gnome-base/dconf-0.13.4:0
-	>=mate-base/libmatekbd-1.7[gtk3(-)=]
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-	media-libs/fontconfig:1.0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libX11:0
-	x11-libs/libXi:0
-	x11-libs/libXext:0
-	x11-libs/libXxf86misc:0
-	>=x11-libs/libxklavier-5:0
-	virtual/libintl:0
-	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3 )
-	libnotify? ( >=x11-libs/libnotify-0.7:0 )
-	policykit? (
-		>=dev-libs/dbus-glib-0.71:0
-		>=sys-apps/dbus-1.1.2:0
-		>=sys-auth/polkit-0.97:0
-	)
-	pulseaudio? (
-		>=media-libs/libmatemixer-1.10:0[pulseaudio]
-		>=media-sound/pulseaudio-0.9.15:0
-	)
-	smartcard? ( >=dev-libs/nss-3.11.2:0 )
-	sound? (
-		>=media-libs/libmatemixer-1.9
-		!gtk3? ( media-libs/libcanberra:0[gtk] )
-		gtk3? ( media-libs/libcanberra:0[gtk3] )
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50.1:0
-	sys-devel/gettext:0
-	virtual/pkgconfig:0
-	x11-base/xorg-proto"
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_with libnotify) \
-		$(use_with sound libcanberra) \
-		$(use_with sound libmatemixer) \
-		$(use_enable debug) \
-		$(use_enable policykit polkit) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable smartcard smartcard-support)
-}
diff --git a/mate-base/mate-settings-daemon/metadata.xml b/mate-base/mate-settings-daemon/metadata.xml
index a2f583c4bc9c..d216474cda3b 100644
--- a/mate-base/mate-settings-daemon/metadata.xml
+++ b/mate-base/mate-settings-daemon/metadata.xml
@@ -5,9 +5,6 @@
 		<email>mate@gentoo.org</email>
 		<name>Gentoo MATE Desktop</name>
 	</maintainer>
-	<use>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/mate-settings-daemon</remote-id>
 	</upstream>
diff --git a/mate-base/mate/Manifest b/mate-base/mate/Manifest
index e802d0210f0e..ec4541ab5f43 100644
--- a/mate-base/mate/Manifest
+++ b/mate-base/mate/Manifest
@@ -1,5 +1,2 @@
-EBUILD mate-1.12-r1.ebuild 2843 BLAKE2B 4bd4f16c4ffc1fc606bdf769234afd143cc9a0c1737f7681e91713086cc2907582ce366680ccbe3f0dbed8ea7c19dbe7b52e4feab865e1009caa0353b2d4b859 SHA512 82930d68a25a6aa86207c5548f333d1d7b6e4591fc7be7df41791aecbb36bf26aebcc3979115547ec3b46783f4ffbf6889eadbd2cc3b3b4e4985c8c5d35cc6df
-EBUILD mate-1.14.ebuild 2767 BLAKE2B daa6821e81e933b8edfde83ecaf6035e606e7ec9f427b140ea1de52cff73108470582400e1459750844121efa8cd8f984028669554af31d7b7f983685af074ea SHA512 d4eb265d58f3dcf8606b5c56ac7076136f216e1f3be7bb17d19cb66dee3f6dd3958e8e42c0ed13d2714a9ee346cfa42ae737e7ea19c126fe71385553860456c2
-EBUILD mate-1.16.ebuild 2727 BLAKE2B ba9915063143819c101245db3cacdcf648a435fc7078513f527c766ddb1b71772a2ca01386755d44c32c6aa81a4cf7ec0249d6264f445df1331fc02da294aa05 SHA512 1c56bd9b4f567cbbbdafff3a19af03955b69020995308c13cfdcdff92320a562d17a25136c213cdd4b5448ee18133c660ec1c9c628a7dc57d964cc760b0798ff
 EBUILD mate-1.18.ebuild 2576 BLAKE2B cc156c65df6b3d72b2abb6cc0c49131d0eba04e3c9da771304aa04c51a41cce63f2deaf06393ad689cd3f6985b7c51f51d4fff3b1edd197a78a34d831b9cc8f8 SHA512 75841b52b473e25e4436099963000fab949cd89272d0f68fb664a5f155625b208a900c3463e1d524412dfe951639de597533733923b84aae3e40626011f47fba
-MISC metadata.xml 1418 BLAKE2B 5a9ad3ba8177e5081b7c18da63daa9c3cd00b5bfd5bf710c0ab208dd7ae4ee85f0a3c9c558024a47cb08c9ef1e9d6f369f25b5c77c667fc05aa60390ea08fd80 SHA512 eb85701a1ea94e137810700a7d27bc0a3bb9591aeb7c3af5bbf3c939ec5edfbae68fbf49449e5490444cdc8d6fde7afc755865010a7cffe090c305c7613169e7
+MISC metadata.xml 1342 BLAKE2B da370118ca35235d9015c6fca17a4766067c1bb5393a68cbb84caa724ef970cb30925c6c5b4eb59fdc5d67eebf6c7031173de7bf868a61108cb5bb7354207d3e SHA512 cd369cf3b32404c16975cdda320043b27898838b2d5c3732bbe2a62f16332eab9f55a2c00e7f8bb1f98cc5cf7d00ec6fe40b74a106b7b72db5f252ec576aff85
diff --git a/mate-base/mate/mate-1.12-r1.ebuild b/mate-base/mate/mate-1.12-r1.ebuild
deleted file mode 100644
index de459dbe4178..000000000000
--- a/mate-base/mate/mate-1.12-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == 9999 ]]; then
-	MATE_BRANCH=9999
-	MATE_THEMES_V=9999
-else
-	inherit versionator
-	MATE_BRANCH="$(get_version_component_range 1-2)"
-	MATE_THEMES_V=3
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-SRC_URI=""
-DESCRIPTION="Meta ebuild for MATE, a traditional desktop environment"
-HOMEPAGE="http://mate-desktop.org"
-
-LICENSE="metapackage"
-
-SLOT="0"
-IUSE="+base -bluetooth gtk3 help +notification +themes +extras"
-
-S="${WORKDIR}"
-
-RDEPEND="
-	=mate-base/mate-desktop-${MATE_BRANCH}*:0[gtk3(-)?]
-	=mate-base/mate-menus-${MATE_BRANCH}*:0
-	=mate-base/mate-panel-${MATE_BRANCH}*:0[gtk3(-)?]
-	=mate-base/mate-session-manager-${MATE_BRANCH}*:0[gtk3(-)?]
-	=mate-base/mate-settings-daemon-${MATE_BRANCH}*:0[gtk3(-)?]
-	=x11-wm/marco-${MATE_BRANCH}*:0[gtk3(-)?]
-	base? (
-		=mate-base/caja-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-base/mate-applets-meta-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-base/mate-control-center-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-extra/mate-media-${MATE_BRANCH}*:0[gtk3(-)?]
-		=x11-misc/mozo-${MATE_BRANCH}*:0[gtk3(-)?]
-		=x11-terms/mate-terminal-${MATE_BRANCH}*:0[gtk3(-)?]
-	)
-	bluetooth? ( net-wireless/blueman:0 )
-	themes? (
-		=x11-themes/mate-backgrounds-${MATE_BRANCH}*:0
-		=x11-themes/mate-icon-theme-${MATE_BRANCH}*:0
-		>=x11-themes/mate-themes-meta-${MATE_THEMES_V}:0
-	)
-	extras? (
-		=app-arch/engrampa-${MATE_BRANCH}*:0[gtk3(-)?]
-		=app-editors/pluma-${MATE_BRANCH}*:0[gtk3(-)?]
-		=app-text/atril-${MATE_BRANCH}*:0[gtk3(-)?]
-		gnome-extra/gnome-calculator:0
-		=mate-extra/caja-extensions-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-extra/mate-netbook-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-extra/mate-power-manager-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-extra/mate-screensaver-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-extra/mate-system-monitor-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-extra/mate-utils-${MATE_BRANCH}*:0[gtk3(-)?]
-		=media-gfx/eom-${MATE_BRANCH}*:0[gtk3(-)?]
-		=net-analyzer/mate-netspeed-${MATE_BRANCH}*:0[gtk3(-)?]
-		sys-apps/gnome-disk-utility:0
-	)
-	help? (
-		gnome-extra/yelp:0
-		=mate-extra/mate-user-guide-${MATE_BRANCH}*:0
-	)
-"
-
-PDEPEND="
-	notification? ( =x11-misc/mate-notification-daemon-${MATE_BRANCH}*:0[gtk3(-)?] )
-	virtual/notification-daemon:0"
-
-pkg_postinst() {
-	elog "For installation, usage and troubleshooting details regarding MATE;"
-	elog "read more about it at Gentoo Wiki: https://wiki.gentoo.org/wiki/MATE"
-	elog ""
-	if ! has_version x11-misc/mate-notification-daemon; then
-		elog "If you experience any issues with notifications, please try using"
-		elog "x11-misc/mate-notification-daemon instead your currently installed daemon"
-		elog ""
-	fi
-	elog "Some packages that are not included in this meta-package but may be of interest:"
-	elog "		mate-extra/caja-dropbox"
-	elog "		mate-extra/mate-user-share"
-}
diff --git a/mate-base/mate/mate-1.14.ebuild b/mate-base/mate/mate-1.14.ebuild
deleted file mode 100644
index b889e588bb81..000000000000
--- a/mate-base/mate/mate-1.14.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == 9999 ]]; then
-	MATE_BRANCH=9999
-	MATE_THEMES_V=9999
-else
-	inherit versionator
-	MATE_BRANCH="$(get_version_component_range 1-2)"
-	MATE_THEMES_V=3
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-SRC_URI=""
-DESCRIPTION="Meta ebuild for MATE, a traditional desktop environment"
-HOMEPAGE="http://mate-desktop.org"
-
-LICENSE="metapackage"
-
-SLOT="0"
-IUSE="+base -bluetooth gtk3 help +notification +themes +extras"
-
-S="${WORKDIR}"
-
-RDEPEND="
-	=mate-base/mate-desktop-${MATE_BRANCH}*:0[gtk3(-)?]
-	=mate-base/mate-menus-${MATE_BRANCH}*:0
-	=mate-base/mate-panel-${MATE_BRANCH}*:0[gtk3(-)?]
-	=mate-base/mate-session-manager-${MATE_BRANCH}*:0[gtk3(-)?]
-	=mate-base/mate-settings-daemon-${MATE_BRANCH}*:0[gtk3(-)?]
-	=x11-wm/marco-${MATE_BRANCH}*:0[gtk3(-)?]
-	base? (
-		=mate-base/caja-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-base/mate-applets-meta-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-base/mate-control-center-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-extra/mate-media-${MATE_BRANCH}*:0[gtk3(-)?]
-		=x11-misc/mozo-${MATE_BRANCH}*:0
-		=x11-terms/mate-terminal-${MATE_BRANCH}*:0[gtk3(-)?]
-	)
-	bluetooth? ( net-wireless/blueman:0 )
-	themes? (
-		=x11-themes/mate-backgrounds-${MATE_BRANCH}*:0
-		=x11-themes/mate-icon-theme-${MATE_BRANCH}*:0
-		>=x11-themes/mate-themes-meta-${MATE_THEMES_V}:0
-	)
-	extras? (
-		=app-arch/engrampa-${MATE_BRANCH}*:0[gtk3(-)?]
-		=app-editors/pluma-${MATE_BRANCH}*:0[gtk3(-)?]
-		=app-text/atril-${MATE_BRANCH}*:0[gtk3(-)?]
-		gnome-extra/gnome-calculator:0
-		=mate-extra/caja-extensions-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-extra/mate-netbook-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-extra/mate-power-manager-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-extra/mate-screensaver-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-extra/mate-system-monitor-${MATE_BRANCH}*:0
-		=mate-extra/mate-utils-${MATE_BRANCH}*:0[gtk3(-)?]
-		=media-gfx/eom-${MATE_BRANCH}*:0[gtk3(-)?]
-		sys-apps/gnome-disk-utility:0
-	)
-	help? (
-		gnome-extra/yelp:0
-		=mate-extra/mate-user-guide-${MATE_BRANCH}*:0
-	)
-"
-
-PDEPEND="
-	notification? ( =x11-misc/mate-notification-daemon-${MATE_BRANCH}*:0[gtk3(-)?] )
-	virtual/notification-daemon:0"
-
-pkg_postinst() {
-	elog "For installation, usage and troubleshooting details regarding MATE;"
-	elog "read more about it at Gentoo Wiki: https://wiki.gentoo.org/wiki/MATE"
-	elog ""
-	if ! has_version x11-misc/mate-notification-daemon; then
-		elog "If you experience any issues with notifications, please try using"
-		elog "x11-misc/mate-notification-daemon instead your currently installed daemon"
-		elog ""
-	fi
-	elog "Some packages that are not included in this meta-package but may be of interest:"
-	elog "		mate-extra/caja-dropbox"
-	elog "		mate-extra/mate-user-share"
-}
diff --git a/mate-base/mate/mate-1.16.ebuild b/mate-base/mate/mate-1.16.ebuild
deleted file mode 100644
index 131f68cc80f2..000000000000
--- a/mate-base/mate/mate-1.16.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == 9999 ]]; then
-	MATE_BRANCH=9999
-	MATE_THEMES_V=9999
-else
-	inherit versionator
-	MATE_BRANCH="$(get_version_component_range 1-2)"
-	MATE_THEMES_V=3
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-SRC_URI=""
-DESCRIPTION="Meta ebuild for MATE, a traditional desktop environment"
-HOMEPAGE="http://mate-desktop.org"
-
-LICENSE="metapackage"
-
-SLOT="0"
-IUSE="+base -bluetooth gtk3 help +notification +themes +extras"
-
-S="${WORKDIR}"
-
-RDEPEND="
-	=mate-base/mate-desktop-${MATE_BRANCH}*:0[gtk3(-)?]
-	=mate-base/mate-menus-${MATE_BRANCH}*:0
-	=mate-base/mate-panel-${MATE_BRANCH}*:0[gtk3(-)?]
-	=mate-base/mate-session-manager-${MATE_BRANCH}*:0
-	=mate-base/mate-settings-daemon-${MATE_BRANCH}*:0[gtk3(-)?]
-	=x11-wm/marco-${MATE_BRANCH}*:0[gtk3(-)?]
-	base? (
-		=mate-base/caja-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-base/mate-applets-meta-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-base/mate-control-center-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-extra/mate-media-${MATE_BRANCH}*:0[gtk3(-)?]
-		=x11-misc/mozo-${MATE_BRANCH}*:0
-		=x11-terms/mate-terminal-${MATE_BRANCH}*:0
-	)
-	bluetooth? ( net-wireless/blueman:0 )
-	themes? (
-		=x11-themes/mate-backgrounds-${MATE_BRANCH}*:0
-		=x11-themes/mate-icon-theme-${MATE_BRANCH}*:0
-		>=x11-themes/mate-themes-meta-${MATE_THEMES_V}:0
-	)
-	extras? (
-		=app-arch/engrampa-${MATE_BRANCH}*:0
-		=app-editors/pluma-${MATE_BRANCH}*:0[gtk3(-)?]
-		=app-text/atril-${MATE_BRANCH}*:0[gtk3(-)?]
-		gnome-extra/gnome-calculator:0
-		=mate-extra/caja-extensions-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-extra/mate-netbook-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-extra/mate-power-manager-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-extra/mate-screensaver-${MATE_BRANCH}*:0[gtk3(-)?]
-		=mate-extra/mate-system-monitor-${MATE_BRANCH}*:0
-		=mate-extra/mate-utils-${MATE_BRANCH}*:0[gtk3(-)?]
-		=media-gfx/eom-${MATE_BRANCH}*:0[gtk3(-)?]
-		sys-apps/gnome-disk-utility:0
-	)
-	help? (
-		gnome-extra/yelp:0
-		=mate-extra/mate-user-guide-${MATE_BRANCH}*:0
-	)
-"
-
-PDEPEND="
-	notification? ( =x11-misc/mate-notification-daemon-${MATE_BRANCH}*:0 )
-	virtual/notification-daemon:0"
-
-pkg_postinst() {
-	elog "For installation, usage and troubleshooting details regarding MATE;"
-	elog "read more about it at Gentoo Wiki: https://wiki.gentoo.org/wiki/MATE"
-	elog ""
-	if ! has_version x11-misc/mate-notification-daemon; then
-		elog "If you experience any issues with notifications, please try using"
-		elog "x11-misc/mate-notification-daemon instead your currently installed daemon"
-		elog ""
-	fi
-	elog "Some packages that are not included in this meta-package but may be of interest:"
-	elog "		mate-extra/caja-dropbox"
-	elog "		mate-extra/mate-user-share"
-}
diff --git a/mate-base/mate/metadata.xml b/mate-base/mate/metadata.xml
index 097778096d4d..da90dca1bd5f 100644
--- a/mate-base/mate/metadata.xml
+++ b/mate-base/mate/metadata.xml
@@ -10,7 +10,6 @@
 			recommended for the most common usage; for example, this installs
 			the file manager. Disable this and other USE flags if you want a
 			more minimal MATE Desktop.</flag>
-		<flag name="gtk3">Build all of MATE DE with GTK+3 instead of GTK+2</flag>
 		<flag name="notification">Force notification daemon to default to MATE's
 			notification daemon. Enabled by default. Disable if it causes conflicts
 			with other installed desktop environments.</flag>
diff --git a/mate-extra/Manifest.gz b/mate-extra/Manifest.gz
index ec31b653d76c..4edd3f66b4ad 100644
--- a/mate-extra/Manifest.gz
+++ b/mate-extra/Manifest.gz
diff --git a/mate-extra/caja-dropbox/Manifest b/mate-extra/caja-dropbox/Manifest
index 93f315514cb4..5eb9dd6110c3 100644
--- a/mate-extra/caja-dropbox/Manifest
+++ b/mate-extra/caja-dropbox/Manifest
@@ -1,10 +1,4 @@
 AUX caja-dropbox-1.8.0-system-rst2man.patch 463 BLAKE2B 1a182d2374ecdff9b1e720071f4da9b37bc6a082aff3f7282c24dcfc5c04d66f338671d8da784ed34ca885070a09afcfdea94937aa69106e4291e15c3a3e889e SHA512 c3fcfd5b87f7801c77e8935f20d26c2a32ad60a03f068eb891e4bc491296ee1b19763634a02e387d7cf8b4192c30931a6dd9d9bf44f7ce3f8965db62a184c806
-DIST caja-dropbox-1.12.0.tar.xz 311488 BLAKE2B 823ec57de4ca943914a14aa90bf6bc4c4ce25cde66cf2102cca21f82c39d47e5d0e75440e5c9050ee554db7ce21471f413a2c7050966ca825d73db9bd6100763 SHA512 32d8fcd2d2aa4a03a976c7848cd628e240558b802247ad6a36242ea95628aa97088aa55ae6d9c889616910e5fc36e2db6753c4f8854d6f9e626c990469d71223
-DIST caja-dropbox-1.14.0.tar.xz 310964 BLAKE2B dc58105549291e05b31752a69bed62f1f9a41699c1ef203e7e75937b3961bb188055f7d2b2569a86650a5a799b0af1b046f1e7d78f3cc0e83be187fa367a756f SHA512 e13012bff812d43eb5ddd9ca8a73907bf9aa2d46bd8947f58695b32fe590a4ecd6bea2ac0d30330c8bd1fa8c652681beb964e7bd658525e99cda73e36a207a50
-DIST caja-dropbox-1.16.0.tar.xz 311144 BLAKE2B f64af2c129906517f8d2bb189f0718c6848a298fd5694de09fcc7e5d17720273eee6453c88363018cafb2a8b10ee8116eb8156f1ac43316ed6164fd64397210b SHA512 ba8ec3952be08d520b10f55c3ff5dbfd38a062dcf3c4fa4569e8d68823f8fbebed596e963e5bf7d59161fea138dbc27b299f66e1d0f6064da54499c4023ac1ad
 DIST caja-dropbox-1.18.0.tar.xz 323116 BLAKE2B 1aafb5c15fea5935c7e89964ad4237fc2095a2c81921c14058d3472e4b51a4053327e175b144c17f2bdd0a3c106b32c436593b354db375689259501ec18b679b SHA512 0e240f8f6ef17ad3b6bbe21bede6d911b0ef89d8fd5a9faba6b96bc74f06472dcedf68caa94c6fbfb2c05c10c82e1f025b4022657cacc5b80d55ee41999be560
-EBUILD caja-dropbox-1.12.0-r1.ebuild 2042 BLAKE2B 6a4451bb9609eb3d5f961c1b5484f3d5da88f65d135599a0069907985fbdc7630fa882705215ecf7e6aef313a9af15bba3703954954d43d25e7e2b6a1fe56ddd SHA512 086d27e73708ba49f291d2776b3b0690f73fd7bdfe2439d06bc038b063331e5cc601932ae8710095c60578f745225a357498823c49c9b67810692d1ee5babfca
-EBUILD caja-dropbox-1.14.0.ebuild 2084 BLAKE2B 5089ad24a8b654f3b7b9b55e7a5a516f1bdb9ef5bb2c6b5f8baa998fb04eb275757baad0efc34df935c53845484dccb909ee34e16ba45078372cd4ae0b9be6b1 SHA512 cbbad2e017ebc5628893c4ed600fb10bbfc3772bf9e77a233134e985b42f31122293c4d5a862b34f2c92a4fd8b40dc0febac55358338aa04e70dac289869d43e
-EBUILD caja-dropbox-1.16.0.ebuild 2084 BLAKE2B 5089ad24a8b654f3b7b9b55e7a5a516f1bdb9ef5bb2c6b5f8baa998fb04eb275757baad0efc34df935c53845484dccb909ee34e16ba45078372cd4ae0b9be6b1 SHA512 cbbad2e017ebc5628893c4ed600fb10bbfc3772bf9e77a233134e985b42f31122293c4d5a862b34f2c92a4fd8b40dc0febac55358338aa04e70dac289869d43e
 EBUILD caja-dropbox-1.18.0.ebuild 2032 BLAKE2B c2909097067e16d044248a3ba916fe637ac37a7bd61db241ace065c71618af2aef6183c0cc2649d506cc826f8cb77e6dbde9f5da201320e83a8787cf74cdb291 SHA512 993142b1d96008ab8953b6245c5940e4acbc15375125a437467c7e45e4d13dae17107fb6ccbd5e67f9ab15d1bfb3154902b03d260ecf141290dcc23618917e17
 MISC metadata.xml 341 BLAKE2B b530aa03ccd9e514d43bd1014500548a5931fcd30e288bdc9b6c56e9b4fa8dc42dd4a31074efe3b8ecb5f2f55aab3da8e7edd30fa5f3c1645cc088e594da7761 SHA512 3ef87b907e90f2093cece194a580099964f434ec7a1d43e961f0c00adeaeca085fc6e141f25f4ef7da0399e71093b4e2c12f52d0c29cd2aa3768354380ec1c37
diff --git a/mate-extra/caja-dropbox/caja-dropbox-1.12.0-r1.ebuild b/mate-extra/caja-dropbox/caja-dropbox-1.12.0-r1.ebuild
deleted file mode 100644
index 696da441191b..000000000000
--- a/mate-extra/caja-dropbox/caja-dropbox-1.12.0-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-MATE_LA_PUNT="yes"
-
-inherit mate python-single-r1 linux-info user
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Store, Sync and Share Files Online"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/atk:0
-	>=dev-libs/glib-2.14:2
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	>=mate-base/caja-1.6
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	net-misc/dropbox:0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/libXinerama:0
-	x11-libs/pango:0"
-
-DEPEND="${RDEPEND}
-	dev-python/docutils:0
-	virtual/pkgconfig:*"
-
-CONFIG_CHECK="~INOTIFY_USER"
-
-pkg_setup () {
-	python-single-r1_pkg_setup
-	check_extra_config
-	enewgroup dropbox
-}
-
-MATE_FORCE_AUTORECONF=true
-
-src_prepare() {
-	# Use system dropbox.
-	sed -e "s|~/[.]dropbox-dist|/opt/dropbox|" \
-		-e 's|\(DROPBOXD_PATH = \).*|\1"/opt/dropbox/dropboxd"|' \
-			-i caja-dropbox.in || die
-
-	# Use system rst2man.
-	epatch "${FILESDIR}"/${PN}-1.8.0-system-rst2man.patch
-
-	mate_src_prepare
-}
-
-src_configure() {
-	mate_src_configure \
-		--disable-static \
-		$(use_enable debug)
-}
-
-src_install () {
-	python_fix_shebang caja-dropbox.in
-
-	mate_src_install
-
-	local extensiondir="$(pkg-config --variable=extensiondir libcaja-extension)"
-	[ -z ${extensiondir} ] && die "pkg-config unable to get caja extensions dir"
-
-	# Strip $EPREFIX from $extensiondir as fowners/fperms act on $ED not $D.
-	extensiondir="${extensiondir#${EPREFIX}}"
-	use prefix || fowners root:dropbox "${extensiondir}"/libcaja-dropbox.so
-	fperms o-rwx "${extensiondir}"/libcaja-dropbox.so
-}
-
-pkg_postinst () {
-	mate_pkg_postinst
-
-	elog
-	elog "Add any users who wish to have access to the dropbox caja"
-	elog "plugin to the group 'dropbox'. You need to setup a drobox account"
-	elog "before using this plugin. Visit ${HOMEPAGE} for more information."
-	elog
-}
diff --git a/mate-extra/caja-dropbox/caja-dropbox-1.14.0.ebuild b/mate-extra/caja-dropbox/caja-dropbox-1.14.0.ebuild
deleted file mode 100644
index 192d02aaf1b5..000000000000
--- a/mate-extra/caja-dropbox/caja-dropbox-1.14.0.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 )
-MATE_LA_PUNT="yes"
-
-inherit mate python-single-r1 linux-info user
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Store, Sync and Share Files Online"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	dev-libs/atk:0
-	>=dev-libs/glib-2.14:2
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	>=mate-base/caja-1.6
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/libXinerama:0
-	x11-libs/pango:0"
-
-RDEPEND="${COMMON_DEPEND}
-	net-misc/dropbox:0"
-
-DEPEND="${COMMON_DEPEND}
-	dev-python/docutils:0
-	virtual/pkgconfig:*"
-
-CONFIG_CHECK="~INOTIFY_USER"
-
-pkg_setup () {
-	python-single-r1_pkg_setup
-	check_extra_config
-	enewgroup dropbox
-}
-
-MATE_FORCE_AUTORECONF=true
-
-src_prepare() {
-	# Use system dropbox.
-	sed -e "s|~/[.]dropbox-dist|/opt/dropbox|" \
-		-e 's|\(DROPBOXD_PATH = \).*|\1"/opt/dropbox/dropboxd"|' \
-			-i caja-dropbox.in || die
-
-	# Use system rst2man.
-	epatch "${FILESDIR}"/${PN}-1.8.0-system-rst2man.patch
-
-	mate_src_prepare
-}
-
-src_configure() {
-	mate_src_configure \
-		--disable-static \
-		$(use_enable debug)
-}
-
-src_install () {
-	python_fix_shebang caja-dropbox.in
-
-	mate_src_install
-
-	local extensiondir="$(pkg-config --variable=extensiondir libcaja-extension)"
-	[ -z ${extensiondir} ] && die "pkg-config unable to get caja extensions dir"
-
-	# Strip $EPREFIX from $extensiondir as fowners/fperms act on $ED not $D.
-	extensiondir="${extensiondir#${EPREFIX}}"
-	use prefix || fowners root:dropbox "${extensiondir}"/libcaja-dropbox.so
-	fperms o-rwx "${extensiondir}"/libcaja-dropbox.so
-}
-
-pkg_postinst () {
-	mate_pkg_postinst
-
-	elog
-	elog "Add any users who wish to have access to the dropbox caja"
-	elog "plugin to the group 'dropbox'. You need to setup a drobox account"
-	elog "before using this plugin. Visit ${HOMEPAGE} for more information."
-	elog
-}
diff --git a/mate-extra/caja-dropbox/caja-dropbox-1.16.0.ebuild b/mate-extra/caja-dropbox/caja-dropbox-1.16.0.ebuild
deleted file mode 100644
index 192d02aaf1b5..000000000000
--- a/mate-extra/caja-dropbox/caja-dropbox-1.16.0.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 )
-MATE_LA_PUNT="yes"
-
-inherit mate python-single-r1 linux-info user
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Store, Sync and Share Files Online"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	dev-libs/atk:0
-	>=dev-libs/glib-2.14:2
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	>=mate-base/caja-1.6
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/libXinerama:0
-	x11-libs/pango:0"
-
-RDEPEND="${COMMON_DEPEND}
-	net-misc/dropbox:0"
-
-DEPEND="${COMMON_DEPEND}
-	dev-python/docutils:0
-	virtual/pkgconfig:*"
-
-CONFIG_CHECK="~INOTIFY_USER"
-
-pkg_setup () {
-	python-single-r1_pkg_setup
-	check_extra_config
-	enewgroup dropbox
-}
-
-MATE_FORCE_AUTORECONF=true
-
-src_prepare() {
-	# Use system dropbox.
-	sed -e "s|~/[.]dropbox-dist|/opt/dropbox|" \
-		-e 's|\(DROPBOXD_PATH = \).*|\1"/opt/dropbox/dropboxd"|' \
-			-i caja-dropbox.in || die
-
-	# Use system rst2man.
-	epatch "${FILESDIR}"/${PN}-1.8.0-system-rst2man.patch
-
-	mate_src_prepare
-}
-
-src_configure() {
-	mate_src_configure \
-		--disable-static \
-		$(use_enable debug)
-}
-
-src_install () {
-	python_fix_shebang caja-dropbox.in
-
-	mate_src_install
-
-	local extensiondir="$(pkg-config --variable=extensiondir libcaja-extension)"
-	[ -z ${extensiondir} ] && die "pkg-config unable to get caja extensions dir"
-
-	# Strip $EPREFIX from $extensiondir as fowners/fperms act on $ED not $D.
-	extensiondir="${extensiondir#${EPREFIX}}"
-	use prefix || fowners root:dropbox "${extensiondir}"/libcaja-dropbox.so
-	fperms o-rwx "${extensiondir}"/libcaja-dropbox.so
-}
-
-pkg_postinst () {
-	mate_pkg_postinst
-
-	elog
-	elog "Add any users who wish to have access to the dropbox caja"
-	elog "plugin to the group 'dropbox'. You need to setup a drobox account"
-	elog "before using this plugin. Visit ${HOMEPAGE} for more information."
-	elog
-}
diff --git a/mate-extra/caja-extensions/Manifest b/mate-extra/caja-extensions/Manifest
index 3f7341f2d9f1..a6518ffdffb8 100644
--- a/mate-extra/caja-extensions/Manifest
+++ b/mate-extra/caja-extensions/Manifest
@@ -1,9 +1,3 @@
-DIST caja-extensions-1.12.0.tar.xz 370600 BLAKE2B 5a243eac18112158585c2c856a1e7664e15c5a140cf6e1c414e8b230fd266d1e8487126615bab52a18d7b00814ca09638702bb6831e0a7fd09f1d2d578106827 SHA512 b36f759f21a206d76dada61f9410135c393fea77eaaf387a81788c6c2757aed5536b8129add2b4469b8d18f17de115369d70ec9278e8a4b9b9a3cfbb24ac38fb
-DIST caja-extensions-1.14.1.tar.xz 400108 BLAKE2B 323ae913969b6e11361511633076adcfa172b1f15077e70c799de921eb2ea862afa39e7497bbb309a9ca4dfca28bff0e470f19efd9ea09b0c1bf8f88add2de5d SHA512 622ab7a2175c2eb4ea5153887fb500f7c63e7aea8bcea19d43e891013bceab5bb5e8f1d83eedf7ff167737185a22327e6a085e3c84bce40955d97938fff73527
-DIST caja-extensions-1.16.0.tar.xz 402208 BLAKE2B 47b20289d61e596e17d4d17a80535cd50778749c17fb46dfd59ab250186515866e456feb005dc0a7b4ded37ac0f11a0ec2f04d40f6b55e813afe015d3ecc09a9 SHA512 7f856ec1b087b605b7cb455a7ed5742d44eb79cc6dcd869a680d4a4e2466c795dbb96f556476959d12bea7670e63a2b460d35a6e19f197ef2350c59e157c475c
 DIST caja-extensions-1.18.2.tar.xz 410704 BLAKE2B e13dde75bf616463f34d41df0b3be28d283383bd3ef56e24ce6cc0f319f0a7fea1b8dd75076582a78157c076de26f72235fe7b6f445f150547944a072b62038e SHA512 cbc3e6c02cdf93aa98e17232b9cdc9579355e2a31ea9421e6829eb2ba6fe50c7d6ba33b737f1286c9b0730a8781e8c060140ea47b216ef60b0bbaafabc9d836d
-EBUILD caja-extensions-1.12.0-r2.ebuild 1718 BLAKE2B 0ffb9ebe9c697f87038fed28f48e65f86843794289abc79e5eb607b135c156c8906db2e39dd1a31f8c53fe833e988c2463a1ec470b053ed270b1be3781631224 SHA512 d0041e152633bb58cb2f52c3ffa749fa9386e04c5e1d24246015ab7dfb05d8943af07e21eabeb939806c1da7ffe70d1d7d745fdbf09d7f24c76a605f323bca8a
-EBUILD caja-extensions-1.14.1-r1.ebuild 1797 BLAKE2B fbdf8409bdc607c14d35c35542696969f4a784aa13af5bf30b22e04d075e61b250e9772a73bad18ca2d641c0c029245017a72ea8b93879ed2e38d7024898d3cd SHA512 7b21902c11fea28ca327bb168ec48e46de652af758e01d6fafaac9543fc308c391e479f2c9631de955b9a5f81617d1e4288f9ef9278a4fd835a3276583312f03
-EBUILD caja-extensions-1.16.0-r1.ebuild 1797 BLAKE2B fbdf8409bdc607c14d35c35542696969f4a784aa13af5bf30b22e04d075e61b250e9772a73bad18ca2d641c0c029245017a72ea8b93879ed2e38d7024898d3cd SHA512 7b21902c11fea28ca327bb168ec48e46de652af758e01d6fafaac9543fc308c391e479f2c9631de955b9a5f81617d1e4288f9ef9278a4fd835a3276583312f03
 EBUILD caja-extensions-1.18.2.ebuild 1822 BLAKE2B e2a5a6e007a514c8e7313e38c08ed02733331139d1d49f586ca539d4eb21867f1d74045084b4dab74b6b140631df58e3a4b9f010bbf72689bbf0e8b2572202a8 SHA512 58a86962559d83e42c93416af19ebcb9d5bb2474537b93d4321313cb27b52bf3939e98ef595b4169fbf24bf425fc36ba53d80f8feeaee999c21046f83fdadd17
-MISC metadata.xml 1189 BLAKE2B 76dc7196eec25064224e259439ec6854527c4509931b3c03ad8d797a286b4921f81e2c83604cf23f9d7d818673edc4361905bccfa3bad4ff2f9454cef6575ace SHA512 bcac80f1664702cc3311a2e227d37e21e3042e8c649b8d0ed869ae49f9697206774ad86dcdb16db5b53765dc14609b1048b48c20b70705a34f312b76b5cba095
+MISC metadata.xml 1128 BLAKE2B 5f1862fa666e61097ef40a2f535941e1305a839f012efb0c47f064fa9241c637076500a92cb3458cd8222c7c0178e105fce4ad4574ebb503f39f5f3f7510524e SHA512 9a24726888b752691db1e0edfa8ab56916111ccc52a7754ed03b23037d5f7ecfd41b632364bd739e79122ae9ef3f8cf42a435637b2edf5d02caaabbf4001e019
diff --git a/mate-extra/caja-extensions/caja-extensions-1.12.0-r2.ebuild b/mate-extra/caja-extensions/caja-extensions-1.12.0-r2.ebuild
deleted file mode 100644
index 9f9fcdd3cb98..000000000000
--- a/mate-extra/caja-extensions/caja-extensions-1.12.0-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Several Caja extensions"
-LICENSE="GPL-2"
-SLOT="0"
-
-SENDTO="cdr gajim +mail pidgin upnp"
-IUSE="gksu gtk3 image-converter +open-terminal share +wallpaper ${SENDTO}"
-
-RDEPEND=">=dev-libs/glib-2.36:2
-	>=mate-base/caja-1.7[gtk3(-)=]
-	virtual/libintl:0
-	x11-libs/gdk-pixbuf:2
-	cdr? ( >=app-cdr/brasero-2.32.1:0= )
-	gajim? (
-		net-im/gajim:0
-		>=dev-libs/dbus-glib-0.60:0
-		>=sys-apps/dbus-1:0
-	)
-	gksu? ( x11-libs/gksu )
-	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3 )
-	image-converter? ( virtual/imagemagick-tools )
-	open-terminal? ( >=mate-base/mate-desktop-1.7[gtk3(-)=] )
-	pidgin? ( >=dev-libs/dbus-glib-0.60:0 )
-	upnp? ( >=net-libs/gupnp-0.13:0= )"
-
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.18:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	!!mate-extra/mate-file-manager-open-terminal
-	!!mate-extra/mate-file-manager-sendto
-	!!mate-extra/mate-file-manager-image-converter
-	!!mate-extra/mate-file-manager-share"
-
-src_configure() {
-	local sendto_plugins="removable-devices"
-	use cdr && sendto_plugins+=",caja-burn"
-	use mail && sendto_plugins+=",emailclient"
-	use pidgin && sendto_plugins+=",pidgin"
-	use gajim && sendto_plugins+=",gajim"
-	use upnp && sendto_plugins+=",upnp"
-
-	mate_src_configure \
-		--enable-sendto \
-		--with-sendto-plugins=${sendto_plugins}\
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable gksu) \
-		$(use_enable image-converter) \
-		$(use_enable open-terminal) \
-		$(use_enable share) \
-		$(use_enable wallpaper)
-}
diff --git a/mate-extra/caja-extensions/caja-extensions-1.14.1-r1.ebuild b/mate-extra/caja-extensions/caja-extensions-1.14.1-r1.ebuild
deleted file mode 100644
index e2dc40a1ed0c..000000000000
--- a/mate-extra/caja-extensions/caja-extensions-1.14.1-r1.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
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Several Caja extensions"
-LICENSE="GPL-2"
-SLOT="0"
-
-SENDTO="cdr gajim +mail pidgin upnp"
-IUSE="gksu gtk3 image-converter +open-terminal share +wallpaper ${SENDTO}"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36:2
-	>=mate-base/caja-1.7[gtk3(-)=]
-	virtual/libintl:0
-	x11-libs/gdk-pixbuf:2
-	gajim? (
-		>=dev-libs/dbus-glib-0.60:0
-		>=sys-apps/dbus-1:0
-	)
-	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3 )
-	open-terminal? ( >=mate-base/mate-desktop-1.7[gtk3(-)=] )
-	pidgin? ( >=dev-libs/dbus-glib-0.60:0 )
-	upnp? ( >=net-libs/gupnp-0.13:0= )"
-
-RDEPEND="${COMMON_DEPEND}
-	cdr? ( >=app-cdr/brasero-2.32.1:0= )
-	gajim? ( net-im/gajim:0 )
-	gksu? ( x11-libs/gksu )
-	image-converter? ( virtual/imagemagick-tools )
-	pidgin? ( net-im/pidgin )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.18:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	!!mate-extra/mate-file-manager-open-terminal
-	!!mate-extra/mate-file-manager-sendto
-	!!mate-extra/mate-file-manager-image-converter
-	!!mate-extra/mate-file-manager-share"
-
-src_configure() {
-	local sendto_plugins="removable-devices"
-	use cdr && sendto_plugins+=",caja-burn"
-	use mail && sendto_plugins+=",emailclient"
-	use pidgin && sendto_plugins+=",pidgin"
-	use gajim && sendto_plugins+=",gajim"
-	use upnp && sendto_plugins+=",upnp"
-
-	mate_src_configure \
-		--enable-sendto \
-		--with-sendto-plugins=${sendto_plugins}\
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable gksu) \
-		$(use_enable image-converter) \
-		$(use_enable open-terminal) \
-		$(use_enable share) \
-		$(use_enable wallpaper)
-}
diff --git a/mate-extra/caja-extensions/caja-extensions-1.16.0-r1.ebuild b/mate-extra/caja-extensions/caja-extensions-1.16.0-r1.ebuild
deleted file mode 100644
index e2dc40a1ed0c..000000000000
--- a/mate-extra/caja-extensions/caja-extensions-1.16.0-r1.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
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Several Caja extensions"
-LICENSE="GPL-2"
-SLOT="0"
-
-SENDTO="cdr gajim +mail pidgin upnp"
-IUSE="gksu gtk3 image-converter +open-terminal share +wallpaper ${SENDTO}"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36:2
-	>=mate-base/caja-1.7[gtk3(-)=]
-	virtual/libintl:0
-	x11-libs/gdk-pixbuf:2
-	gajim? (
-		>=dev-libs/dbus-glib-0.60:0
-		>=sys-apps/dbus-1:0
-	)
-	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3 )
-	open-terminal? ( >=mate-base/mate-desktop-1.7[gtk3(-)=] )
-	pidgin? ( >=dev-libs/dbus-glib-0.60:0 )
-	upnp? ( >=net-libs/gupnp-0.13:0= )"
-
-RDEPEND="${COMMON_DEPEND}
-	cdr? ( >=app-cdr/brasero-2.32.1:0= )
-	gajim? ( net-im/gajim:0 )
-	gksu? ( x11-libs/gksu )
-	image-converter? ( virtual/imagemagick-tools )
-	pidgin? ( net-im/pidgin )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.18:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	!!mate-extra/mate-file-manager-open-terminal
-	!!mate-extra/mate-file-manager-sendto
-	!!mate-extra/mate-file-manager-image-converter
-	!!mate-extra/mate-file-manager-share"
-
-src_configure() {
-	local sendto_plugins="removable-devices"
-	use cdr && sendto_plugins+=",caja-burn"
-	use mail && sendto_plugins+=",emailclient"
-	use pidgin && sendto_plugins+=",pidgin"
-	use gajim && sendto_plugins+=",gajim"
-	use upnp && sendto_plugins+=",upnp"
-
-	mate_src_configure \
-		--enable-sendto \
-		--with-sendto-plugins=${sendto_plugins}\
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable gksu) \
-		$(use_enable image-converter) \
-		$(use_enable open-terminal) \
-		$(use_enable share) \
-		$(use_enable wallpaper)
-}
diff --git a/mate-extra/caja-extensions/metadata.xml b/mate-extra/caja-extensions/metadata.xml
index 0852c69ac214..faa723208381 100644
--- a/mate-extra/caja-extensions/metadata.xml
+++ b/mate-extra/caja-extensions/metadata.xml
@@ -9,7 +9,6 @@
 		<flag name="cdr">Add an extension to burn files to cds using <pkg>app-cdr/brasero</pkg>.</flag>
 		<flag name="gajim">Add an extension to support <pkg>net-im/gajim</pkg>.</flag>
 		<flag name="gksu">Add an extension to support opening files as root with <pkg>x11-libs/gksu</pkg>.</flag>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
 		<flag name="image-converter">Add image conversion support.</flag>
 		<flag name="mail">Add an extension to support e-mail functionality.</flag>
 		<flag name="open-terminal">Add an extension to support an open terminal.</flag>
diff --git a/mate-extra/mate-indicator-applet/Manifest b/mate-extra/mate-indicator-applet/Manifest
index 911b7be1751a..0550a19ac1f8 100644
--- a/mate-extra/mate-indicator-applet/Manifest
+++ b/mate-extra/mate-indicator-applet/Manifest
@@ -1,10 +1,3 @@
-AUX mate-indicator-applet-1.14.1-indicator-ng-configure-fix.patch 996 BLAKE2B cfbc8e798a9fa8631be6f61bcec1c1ade67e472c755850d10c0d9a8a66074e4676a94c3029f4b178c7952930f5d125e5dca8d4eb0bade7d63d52a9bbb04f4bbd SHA512 29bb260aa76533dbef27621080502cd3713afb7c825d7bb6c2803aeeb0c1f1873a70f8b8f121659c79878416fff0b13fcd685f98b738e7f5466fe727b7d4a84e
-DIST mate-indicator-applet-1.12.1.tar.xz 317984 BLAKE2B 98c5a52f499c1ed609b4c542aa96a3aecebcca529c66782e54954e3933ba50536ba3266f80522e576eddd1a6c97f1dff50059dfc48f38d4859ac57f370e120c2 SHA512 446ce32e8db22b153c7786292749645715e43c134e7fa00f81b7782a48163745307d396dbdd7765a63ec9514bec2f032f681028c55264e0fcf879c5e26fc9433
-DIST mate-indicator-applet-1.14.1.tar.xz 315480 BLAKE2B 337c216a11faa66332c4591cb8cf7b87dd0b2bf0180a5108f46c517fa8eb5353435c7f297a9f54431893033cb5d4b1f92b866825a304ea7b858a913540c8a2e8 SHA512 868f85546780d52aaadaa63ec14a8e92e673396653cebf7c5a9d0de459fc62d346fb10836298bf604eb50c63e5390cedd08576fb8903aeabdf2e2c4de5fc638f
-DIST mate-indicator-applet-1.16.0.tar.xz 317256 BLAKE2B d9a9da94702a59c225aa7d80ad228fbdafb65bea496dcf681cc4c76b3b16a1b985b33714df585a945076f0bacd7080b1c122021ff05bd86306168924541a488a SHA512 745f10ed20a453b02427982f59c81e85cdf80736aad62c4e149802c4df3646dfcd1dc822476f4d9cbd2f28c48e78c2e9a7e79652c8ba579a3e0bf9f16427b1a2
 DIST mate-indicator-applet-1.18.1.tar.xz 318464 BLAKE2B 989b84e2135ff3307a731b3eff981aea40002cbbd9b9e6ba61053a24e681fe3a3005b55ecf6dd027adf97d2bbfe3a12c0bdfdee2aac4860bac10fe3c03a4d681 SHA512 990cf60ff0b0a3e53f6ebc94abbdc15ce7b55258935763fb2d294a06c725e98e4b3389117e8fd04a9d1ce0ba691bc891542fd12c1ab58b29d99352a8369265d0
-EBUILD mate-indicator-applet-1.12.1-r1.ebuild 630 BLAKE2B 067af6429d8758595e64a35656fd8b4a76356093f047be637cd17baeba7b634f4e3b04f62f234603de612603f89a377fd29bdc86d69a2b71ef1357f2ab6251e0 SHA512 e5b55c8e0199aa4f13a283bb920ccabe113e94283f5dfcfba5ca6b84d63cf3ff653a52f1f5cfea93e5a7ef656763e0fcd68475f6fb16166648aa4fef042d6ef3
-EBUILD mate-indicator-applet-1.14.1-r1.ebuild 737 BLAKE2B 14e6047ce2b023857d310e689ca8978790644bb0863362176eae8d926f4957e2e5526a5a39c8d09fe023acd72420a19848eb8e1cac522b31fa47e079e5781992 SHA512 5f152aad87ec80339cb5c36e2647636af0cd936c86baaa0d5a43af5a03fd8d89b77ddda4a42673c949c677d36d4fdd3c1a708f00c412b1b8184222c457521c15
-EBUILD mate-indicator-applet-1.16.0.ebuild 672 BLAKE2B 104b9be047690211edbe0b7de8fb432855efbac809c9ac0620999b40c14c2a889f3074783dac4a1c34efa80808714024d6172adc55f0d5ce7dda3b293db66010 SHA512 9b32182a77cab459b28ec792fe7e919916f55fb52b3815238e404883c12d387bc3d9cb5ff9a659d878f8a254b3640cbdd59421d77c59902f986a96e71089e30c
 EBUILD mate-indicator-applet-1.18.1.ebuild 493 BLAKE2B a6284cc337a840d4ec5aa2a456a2fbeb6ecaa96f183467ce93278156f5d42ad4ed2a6b1c0e6d5e03c01ea930192b6b46b5fe9cdd5de220c45027f2d2f103ad72 SHA512 fcf317d1f96bdb007998fb2acbd33b66491ecea5e7a8c57ce9778ee02db75276a1db1b7b09985884f2d0dccb9db21c21e216572f0b1df7eab27d5ed35d84ed73
-MISC metadata.xml 426 BLAKE2B d357c7c86d9c19cb83f8bc2ccbe2f726e6f91e9798873ea2191a2b3679607741fd8798f712561a40a4b1d3ca81f2c7574793f12dbcc2491a18b3613a14e3798c SHA512 546adb619dcf891787a65bd23674411653136c82cad39e9937f6300b525049121ee15b94f3f62e555b50f0607367442f585c5f90274da92f506bb58c40b6c522
+MISC metadata.xml 350 BLAKE2B 96082001bda8c5a855c43e0ac4bba9d604b8ec94f66464859a37e30843f8f1ecddff2c3100a49ab465711bb529e288afddbb03aab9b6dde16de35370353a2fe7 SHA512 add12365e457c531f5dc3eec856099b5658f93a3d6ee2b3f80264374a84558566881213b8e8ffad03aeb3720025c385517d777af249a045b9dd2c22ce37b2f32
diff --git a/mate-extra/mate-indicator-applet/files/mate-indicator-applet-1.14.1-indicator-ng-configure-fix.patch b/mate-extra/mate-indicator-applet/files/mate-indicator-applet-1.14.1-indicator-ng-configure-fix.patch
deleted file mode 100644
index b9ae4fc8fecc..000000000000
--- a/mate-extra/mate-indicator-applet/files/mate-indicator-applet-1.14.1-indicator-ng-configure-fix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 06f6db28648cdeff02cc07f9a7f1410b228450a4 Mon Sep 17 00:00:00 2001
-From: monsta <monsta@inbox.ru>
-Date: Wed, 14 Sep 2016 18:20:25 +0300
-Subject: [PATCH] check for libindicator 12.10.2 for new style indicators
- support
-
-fixes build on Gentoo which has 12.10.1 - turned out this version
-had no indicator-ng yet.
-
-note that (as of now) 12.10.2 isn't officially released upstream,
-and Ubuntu has post-12.10.1 repo snapshot packaged and labeled as
-12.10.2. however, that snapshot already has 12.10.2 version in .pc
-file, so the build works with it.
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5e9c505..9b4dafc 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -46,7 +46,7 @@ case "$with_gtk" in
- esac
- 
- INDICATOR_REQUIRED_VERSION=0.3.90
--INDICATOR_NG_VERSION=12.10
-+INDICATOR_NG_VERSION=12.10.2
- INDICATOR_PKG=indicator$INDICATOR_API_VERSION-0.4
- 
- PKG_CHECK_MODULES(APPLET, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED_VERSION
diff --git a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.12.1-r1.ebuild b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.12.1-r1.ebuild
deleted file mode 100644
index f87a16fc0829..000000000000
--- a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.12.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate versionator
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="MATE indicator applet"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="gtk3"
-
-RDEPEND="
-	>=mate-base/mate-panel-1.8[gtk3(-)=]
-	!gtk3? (
-		>=dev-libs/libindicator-0.3.90:0
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		>=dev-libs/libindicator-0.3.90:3
-		>=x11-libs/gtk+-3.0:3
-	)"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig"
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0)
-}
diff --git a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.14.1-r1.ebuild b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.14.1-r1.ebuild
deleted file mode 100644
index 4af07eb73100..000000000000
--- a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.14.1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate versionator
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE indicator applet"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="gtk3"
-
-COMMON_DEPEND="
-	>=mate-base/mate-panel-1.8[gtk3(-)=]
-	!gtk3? (
-		>=dev-libs/libindicator-0.3.90:0
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		>=dev-libs/libindicator-0.3.90:3
-		>=x11-libs/gtk+-3.0:3
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${P}-indicator-ng-configure-fix.patch" )
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0)
-}
diff --git a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.16.0.ebuild b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.16.0.ebuild
deleted file mode 100644
index 2f32c4cab09a..000000000000
--- a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.16.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate versionator
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE indicator applet"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="gtk3"
-
-COMMON_DEPEND="
-	>=mate-base/mate-panel-1.8[gtk3(-)=]
-	!gtk3? (
-		>=dev-libs/libindicator-0.3.90:0
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		>=dev-libs/libindicator-0.3.90:3
-		>=x11-libs/gtk+-3.0:3
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig"
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0)
-}
diff --git a/mate-extra/mate-indicator-applet/metadata.xml b/mate-extra/mate-indicator-applet/metadata.xml
index 9561edc8026c..84f9d6c300e5 100644
--- a/mate-extra/mate-indicator-applet/metadata.xml
+++ b/mate-extra/mate-indicator-applet/metadata.xml
@@ -5,9 +5,6 @@
 		<email>mate@gentoo.org</email>
 		<name>Gentoo MATE Desktop</name>
 	</maintainer>
-	<use>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/mate-indicator-applet</remote-id>
 	</upstream>
diff --git a/mate-extra/mate-media/Manifest b/mate-extra/mate-media/Manifest
index b96039893512..291d86efb65e 100644
--- a/mate-extra/mate-media/Manifest
+++ b/mate-extra/mate-media/Manifest
@@ -1,9 +1,3 @@
-DIST mate-media-1.12.1.tar.xz 507976 BLAKE2B c8a60c499becdf0e680ec3ce67a378ad8eb8b3b52f53f4e817a088c5268ac6b6be2675282b366b4628ec2a081cdc2607d82bc18cc13d7439e8bdbc9f1b33d208 SHA512 04dd05b62ea0fdfcd82321a77fa74d014c11e1a8434b445e42660c55f3158775341b36fe56f402940cef297b906b55fafd6d8eac3cd48ab5e34371b95c01d330
-DIST mate-media-1.14.1.tar.xz 490472 BLAKE2B 6b26d41524d5c2c1fbc1c09f245fa805bd669cefdc60e087c9cf240c4ef9cce4349a4af089c3193d73dce292ac2e324476f3041b6a370c4d8074c125efca37cf SHA512 dde83a93fbedca74c0f719a0a6b344785d6f83941bc0b4b6583d52aff4b9e514bbbc4e576993a573a7aab56e01222eba09ce64b4acea8b35799cfb4b85e6d6da
-DIST mate-media-1.16.0.tar.xz 491576 BLAKE2B 87762803d0b38d3691b0fd9a7995b39a9d4f0011a8b04148dd1a19fcf276b32c68943220225a19550256d6ec198674574fe15142872721b081fb4a48c502f83d SHA512 d5ad7097b100e3736cc7e7c651e40195b068b1db79b563035853e7f7fde439e830b750564cbc52b20828ee4a2d8091304897c5044a5bcb1774124626b000d965
 DIST mate-media-1.18.2.tar.xz 496148 BLAKE2B 5588c3c9d72ca73d7956db4e90b0989b040be59e85f2d93b740c085098cd4e643b0848d53015e7d8dc4da528edf4b7cb90dbf7c7d30e6ec3a7c898190ca90565 SHA512 bfd5933e95aac233354b0124919213cd6aba9f062eb4f240ff2df80447091473d2789ee87960fa00d5672c31daf3ac32b81a190f43f6cb32ca92fc8b6768fb38
-EBUILD mate-media-1.12.1.ebuild 940 BLAKE2B af25fcbe57592459a889afd86ba8bbe5f77388afcdcc6bf7348af923aec5c1e806beb94902bd58ebc2c5a6786410f50737a33a4ee45bd50bcb718e431c2fbdbc SHA512 46d400fede81656a1f7a42befdd6fc771eae4f20d711514fb00ce952b3306fb2e583e85dc5a340be779f56e101b9c34bb527f810521552edcac695de462c31b9
-EBUILD mate-media-1.14.1.ebuild 982 BLAKE2B d06372f2495aa566951294beb992cd1e3909cab8a4518f923d7b757fde43fb022825e5b9a45b2cd148e375464a09a5a588222b1fc20ae4804004174c9432cd23 SHA512 e540c9bd1c107e8dcc0406faac99cf89f54062d0d94e7fa8a4d46dc56be9c601161d76d6d3b22c449be1e34b1532b968b47a8c40548a8219dc67e78e0a0c1fd7
-EBUILD mate-media-1.16.0.ebuild 982 BLAKE2B d06372f2495aa566951294beb992cd1e3909cab8a4518f923d7b757fde43fb022825e5b9a45b2cd148e375464a09a5a588222b1fc20ae4804004174c9432cd23 SHA512 e540c9bd1c107e8dcc0406faac99cf89f54062d0d94e7fa8a4d46dc56be9c601161d76d6d3b22c449be1e34b1532b968b47a8c40548a8219dc67e78e0a0c1fd7
 EBUILD mate-media-1.18.2.ebuild 747 BLAKE2B f1637346bf915651164101b17ea71811a0d6504bb1054a87871daa5baa85e768494dc8a16790ee201fbccc7cc677030ffa472a61b2adef82ec145af29302842a SHA512 081ff51b52a30282dcb20391d9b34e95f2cc3c4985f52e8c01cd8f23220289eb3fb60b628ba5bfb9006459c9012b680f063bee44d61ea3eb8480b4ffa5de685f
-MISC metadata.xml 415 BLAKE2B 6ff09f57928a7bcad44b6830863ebf862eb3c793b202c4be4da91ec0570b26e18519e2235ff1ca71459266d5fbcf6770ddd2b4db69b8ecdb822c207b88ab1e29 SHA512 8021259f41090c51e2a485027cc52cb87a90781f6684c0d8795556b622eb6f4659f0633c7f53778c1fc918a281707a958257775cfdb67d52be262eb5a1da68a7
+MISC metadata.xml 339 BLAKE2B bd032fdad5c46fb56210712a25e50c24959053249e43ebe7da6a6d2cfb099642acc949db166abca0c847cb661c6b20d59f03366abc290b4e0656a547ede52a8b SHA512 6975819ad5dd4234e702e7eaa36a05f3598a830b3f997ea17f299e1e7a40f5d3463b732ca1816e7e9af015c4afeecff2ea94dc0562a20b31698870ffc0489968
diff --git a/mate-extra/mate-media/mate-media-1.12.1.ebuild b/mate-extra/mate-media/mate-media-1.12.1.ebuild
deleted file mode 100644
index e97d1043a69e..000000000000
--- a/mate-extra/mate-media/mate-media-1.12.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Multimedia related programs for the MATE desktop"
-LICENSE="LGPL-2 GPL-2 FDL-1.1"
-SLOT="0"
-
-IUSE="gtk3"
-
-RDEPEND=">=dev-libs/glib-2.36.0:2
-	dev-libs/libxml2:2
-	>=mate-base/mate-panel-1.8[gtk3(-)=]
-	>=mate-base/mate-desktop-1.9.3[gtk3(-)=]
-	>=media-libs/libmatemixer-1.9.1
-	x11-libs/cairo:0
-	x11-libs/pango:0
-	virtual/libintl:0
-	!gtk3? (
-		>=dev-libs/libunique-1:1
-		>=media-libs/libcanberra-0.13:0[gtk]
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		>=dev-libs/libunique-3:3
-		>=media-libs/libcanberra-0.13:0[gtk3]
-		>=x11-libs/gtk+-3.0:3
-	)"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35.0:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	!!<mate-base/mate-applets-1.8:*"
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0)
-}
diff --git a/mate-extra/mate-media/mate-media-1.14.1.ebuild b/mate-extra/mate-media/mate-media-1.14.1.ebuild
deleted file mode 100644
index 7e65f44ccc0d..000000000000
--- a/mate-extra/mate-media/mate-media-1.14.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Multimedia related programs for the MATE desktop"
-LICENSE="LGPL-2 GPL-2 FDL-1.1"
-SLOT="0"
-
-IUSE="gtk3"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36.0:2
-	dev-libs/libxml2:2
-	>=mate-base/mate-panel-1.8[gtk3(-)=]
-	>=mate-base/mate-desktop-1.9.3[gtk3(-)=]
-	>=media-libs/libmatemixer-1.9.1
-	x11-libs/cairo:0
-	x11-libs/pango:0
-	virtual/libintl:0
-	!gtk3? (
-		>=dev-libs/libunique-1:1
-		>=media-libs/libcanberra-0.13:0[gtk]
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		>=dev-libs/libunique-3:3
-		>=media-libs/libcanberra-0.13:0[gtk3]
-		>=x11-libs/gtk+-3.0:3
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35.0:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	!!<mate-base/mate-applets-1.8:*"
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0)
-}
diff --git a/mate-extra/mate-media/mate-media-1.16.0.ebuild b/mate-extra/mate-media/mate-media-1.16.0.ebuild
deleted file mode 100644
index 7e65f44ccc0d..000000000000
--- a/mate-extra/mate-media/mate-media-1.16.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Multimedia related programs for the MATE desktop"
-LICENSE="LGPL-2 GPL-2 FDL-1.1"
-SLOT="0"
-
-IUSE="gtk3"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36.0:2
-	dev-libs/libxml2:2
-	>=mate-base/mate-panel-1.8[gtk3(-)=]
-	>=mate-base/mate-desktop-1.9.3[gtk3(-)=]
-	>=media-libs/libmatemixer-1.9.1
-	x11-libs/cairo:0
-	x11-libs/pango:0
-	virtual/libintl:0
-	!gtk3? (
-		>=dev-libs/libunique-1:1
-		>=media-libs/libcanberra-0.13:0[gtk]
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		>=dev-libs/libunique-3:3
-		>=media-libs/libcanberra-0.13:0[gtk3]
-		>=x11-libs/gtk+-3.0:3
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35.0:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	!!<mate-base/mate-applets-1.8:*"
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0)
-}
diff --git a/mate-extra/mate-media/metadata.xml b/mate-extra/mate-media/metadata.xml
index d28e7fdae6e8..b92685571c01 100644
--- a/mate-extra/mate-media/metadata.xml
+++ b/mate-extra/mate-media/metadata.xml
@@ -5,9 +5,6 @@
 		<email>mate@gentoo.org</email>
 		<name>Gentoo MATE Desktop</name>
 	</maintainer>
-	<use>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/mate-media</remote-id>
 	</upstream>
diff --git a/mate-extra/mate-netbook/Manifest b/mate-extra/mate-netbook/Manifest
index 5a81ea39f66f..fc643f2e13b9 100644
--- a/mate-extra/mate-netbook/Manifest
+++ b/mate-extra/mate-netbook/Manifest
@@ -1,9 +1,3 @@
-DIST mate-netbook-1.12.0.tar.xz 268632 BLAKE2B 8d5ec5ec4eac31f7aa7e93849b7a8d35ec5537cdf75e4c4358f919418b0ffa7addfcbbe7e23f55b9359ac45f9f77899c90e309bfd601d33576f3b22e3c1a0156 SHA512 3f46e537b48833fe3bd599dcaa6af89a265dacac4fc077d46ca87b5a35c2368810824747411d263541e2685e2700311996f8741aa9321122d6d306c1ad8fc15b
-DIST mate-netbook-1.14.0.tar.xz 284248 BLAKE2B 405d278573feaf875edb2e7c02d5e47004be2f137e1ede9ae84850b685b68ff9f315dadda9095eaf340923c1390bc6f04ea3f3f40a5d0a050def9452f41d3bf9 SHA512 aa5d5ed1a8c31df4b7e84cad8efaaf326f7bf2a9a392b34b053c30287404949ddd5f27d438d028bc569cbedc177dc1236af32e869b0418677021e7a6ef17dfe1
-DIST mate-netbook-1.16.2.tar.xz 299112 BLAKE2B 134c92225e4234944d28870bee994bce25967df5f35cb40603bfe2677bc71b71f331433b571543de739bedd4f0ae944f57266f547926ee654e19cb361316af92 SHA512 2a633164b1a4d57b659f6710969bf8d14b99d77351464b171cbb049635fc6bcfcb1925a0b36762c6593c45a7695fe20e981ada5a24816879b4c0b392da2803b4
 DIST mate-netbook-1.18.2.tar.xz 290816 BLAKE2B b12654088fc73f0ed38ea81366f24de5b737a9754a4c68720640ace14d5f8be76fd2d7bf8a5f4cb44b5410c187ce459b01aa72a4ad67eb6f182c1195a055b650 SHA512 0663eeaa47480f16146cce3e34d037c8eafcd6ca0e6d079dcfadfb6e97fca7b13ea7121896ca268238f161f5edc57754f620f9020f4480e23253a57490ec29e7
-EBUILD mate-netbook-1.12.0.ebuild 823 BLAKE2B fa6940772e447c775603d0e005a6fb818dd2022202ec0272714e37e7bbc7067abcc93908a955540e45fb82e51291b4ec586062a72cd38aa728e91afb9883d8de SHA512 c3517ac36aed51ae5875399626cf6f45ad2531cd8fb73500a71e8ca2ae8055bdf118d5eedbc1ad39ce72ae8953159d86e31070f738ed3f97349b22f949e55a2c
-EBUILD mate-netbook-1.14.0.ebuild 865 BLAKE2B 7adc25f80ce602b547a5ab32806d845651f34487a7b427f3a6c2f44740c5f8883906b17fe3988fb751dffbd012c8b00d712d2c48d5417e2d185bb6c0eba49101 SHA512 9d9c9e415576372b84a10b440a0cf6e9b3c35ace747ef673c2b298ad687765de1f19698b4073cfb7c91df56c69f20f80275044aa27df3e2a687551bc59da407a
-EBUILD mate-netbook-1.16.2.ebuild 779 BLAKE2B 918c6311f5caa276df0db09addd82d72f5452558fa8253b817b4624165f73b532744c263eb823a031aa642b6484b9efb87edfa87feeb8fc2ea795b175459b0d5 SHA512 8605b73d7c150d129f13a8bea1b4ab209eeb887f7ff658d0d430868bfd44bff5a37c87531e4bc11862bfbb0b0532f588e953b0710be2d0642d97ad17f238d2b7
 EBUILD mate-netbook-1.18.2.ebuild 637 BLAKE2B 2d986de17950483ece6e79119ef6d8c366ffb1a43c8cf2de49d89e9e5e4f9af057044b7738665d1f085ec3cba31d0097b50edf4e3dad81770f03ae5c0b7cc4a5 SHA512 83e1b8e1826e79f306add4e188f49ea7c97805a03403dfd473822cf35086dd7d1b0645b9b059061e10d850c11d3c862d5cf4dda7bd6722f56014eea43a83f251
-MISC metadata.xml 571 BLAKE2B f402acb0954e2b199d94e0281c4f76795a91f3d5d028a07a546d0ddb54aa134112f39b51dd00b2aa5132f58c21c121864d04c4c7ef4d768258ece8850b965033 SHA512 c615ac4dcce2738757c792d96a5af9db7d745b6587c1c8e36f70ece45128ec1b05141fc787320031559b8819969f1ac661a11876f8185fef2623d039f6832d76
+MISC metadata.xml 495 BLAKE2B 69f4f61082d017e4e92917edcfb1fc9be696c5472641b0cd81714c07a29f4495644f4120fbd0292f8c5d1d40b3642a095969281ed2c2ad8896ff3156c3fba3bd SHA512 8edc358ede2010384cdecc1e430aa9cbf90bb64c3f52d71ad2bf30d4cb84e38bdf48a4b2e45920b35ada734ffe4a46b44f363b6bf18ba2247f6abe290b5131db
diff --git a/mate-extra/mate-netbook/mate-netbook-1.12.0.ebuild b/mate-extra/mate-netbook/mate-netbook-1.12.0.ebuild
deleted file mode 100644
index 4dc8489e18d6..000000000000
--- a/mate-extra/mate-netbook/mate-netbook-1.12.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 mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="MATE utilities for netbooks"
-LICENSE="GPL-3"
-SLOT="0"
-
-IUSE="gtk3"
-
-RDEPEND="
-	>=dev-libs/glib-2.36:2
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-	>=mate-base/mate-panel-1.8[gtk3(-)=]
-	x11-libs/libfakekey:0
-	x11-libs/libXtst:0
-	x11-libs/libX11:0
-	x11-libs/cairo:0
-	virtual/libintl:0
-	!gtk3? (
-		dev-libs/libunique:1
-		x11-libs/gtk+:2
-		x11-libs/libwnck:1
-	)
-	gtk3? (
-		dev-libs/libunique:3
-		x11-libs/gtk+:3
-		x11-libs/libwnck:3
-	)"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto"
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0)
-}
diff --git a/mate-extra/mate-netbook/mate-netbook-1.14.0.ebuild b/mate-extra/mate-netbook/mate-netbook-1.14.0.ebuild
deleted file mode 100644
index 49cee424aaff..000000000000
--- a/mate-extra/mate-netbook/mate-netbook-1.14.0.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 mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE utilities for netbooks"
-LICENSE="GPL-3"
-SLOT="0"
-
-IUSE="gtk3"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.36:2
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-	>=mate-base/mate-panel-1.8[gtk3(-)=]
-	x11-libs/libfakekey:0
-	x11-libs/libXtst:0
-	x11-libs/libX11:0
-	x11-libs/cairo:0
-	virtual/libintl:0
-	!gtk3? (
-		dev-libs/libunique:1
-		x11-libs/gtk+:2
-		x11-libs/libwnck:1
-	)
-	gtk3? (
-		dev-libs/libunique:3
-		x11-libs/gtk+:3
-		x11-libs/libwnck:3
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto"
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0)
-}
diff --git a/mate-extra/mate-netbook/mate-netbook-1.16.2.ebuild b/mate-extra/mate-netbook/mate-netbook-1.16.2.ebuild
deleted file mode 100644
index 3ff9ea5945f3..000000000000
--- a/mate-extra/mate-netbook/mate-netbook-1.16.2.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 mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE utilities for netbooks"
-LICENSE="GPL-3"
-SLOT="0"
-
-IUSE="gtk3"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.36:2
-	>=mate-base/mate-panel-1.8[gtk3(-)=]
-	x11-libs/libfakekey:0
-	x11-libs/libXtst:0
-	x11-libs/libX11:0
-	x11-libs/cairo:0
-	virtual/libintl:0
-	!gtk3? (
-		x11-libs/gtk+:2
-		x11-libs/libwnck:1
-	)
-	gtk3? (
-		x11-libs/gtk+:3
-		x11-libs/libwnck:3
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto"
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0)
-}
diff --git a/mate-extra/mate-netbook/metadata.xml b/mate-extra/mate-netbook/metadata.xml
index 2c589b8e9aed..755bd33a051b 100644
--- a/mate-extra/mate-netbook/metadata.xml
+++ b/mate-extra/mate-netbook/metadata.xml
@@ -9,9 +9,6 @@
 		MATE utilities for netbooks are an applet and a daemon to
 		maximize windows and move their titles on the panel.
 	</longdescription>
-	<use>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/mate-netbook</remote-id>
 	</upstream>
diff --git a/mate-extra/mate-polkit/Manifest b/mate-extra/mate-polkit/Manifest
index a6ffc1246287..b9a45596c5ad 100644
--- a/mate-extra/mate-polkit/Manifest
+++ b/mate-extra/mate-polkit/Manifest
@@ -1,9 +1,3 @@
-DIST mate-polkit-1.12.0.tar.xz 324708 BLAKE2B 088ac84721f1a3274c935c40ed2ee2985a7743851bd3ea85cf5ef8891481d25319c37e6d9900e89ef0b7e9e7e29446028de8c762f7c93cb55fc161ebfbf5b557 SHA512 b6e771062e29d2f4f2823638e39f5e5b349b98fcf8fd8d652d847d568eee919d37956089d7bef1463d96f801f852d10d9423bb8c20f8a54dfe8188d19ab6fb0c
-DIST mate-polkit-1.14.0.tar.xz 339872 BLAKE2B 25bee9752133416d06e46f41e48fc13d71bc8756792a0f33ae582c59a6b0a40e1648157b5e512cd5016cf9dedf9eb1dad641a924076ac51e461ffb3cde018d4c SHA512 f3507380152798af192e3338b5f056b1105fd297e935f098803c21450b04b6d149bc22106f34129a6394655be2e6505c91ad1433e817c68274a1243cc862bcdf
-DIST mate-polkit-1.16.0.tar.xz 340500 BLAKE2B b8a42053af3b895029fda08f5a613301630941855cf229d509d3864e570be46f3adf1e85689a3906e01ac23f08f8336313a027907b914160aa9fdc36bc662d4c SHA512 9b2a1870fdbe828b39ced7b24e1096edb559dcd553bac3fb15a6ab8d5dbc442870916f5105550a0e14cf3e85ac06c798d7daf0b464a182ba686bb3eb1bac1cb4
 DIST mate-polkit-1.18.2.tar.xz 348272 BLAKE2B 38b2359be2f908181805fa213fcd6973d8b208bc52542702b19a7dc8162ea316540ad8c524b102b6fd95d85dd1e87c3eda29023c798dedf39eb301ff7f691d14 SHA512 4150e0a18ecc1ea1d554334ca3725ab62008f9ea5693ab95eb70df408cfd08a46717d3252017f14f99e9389a2e106add1f74fd63d26cd5db9011707a5a4f63f9
-EBUILD mate-polkit-1.12.0-r2.ebuild 1279 BLAKE2B 1b804e8896adb8f869a13485367f60f368e42409304b36d0ac50ec9cf4eb54adddcae1870be0da5e7efdd6aa127c59e638fd5ec504ac932a5b3b2ba5e24af773 SHA512 95dbf9f4ce16fda02fcf36ae58836afb2322685bda7640fc93081fea24092d39c5cd00e92e66604428f6a11f90f460007af4f97de79248c9ba720466118a387a
-EBUILD mate-polkit-1.14.0.ebuild 1321 BLAKE2B d8c4b905805155da433c3f76efef1f99d523fa1498e4a5165d8cd1c93aa59ae369e41375f6299edacd88b6359ff8f132b7e743bfe2788fdad327bdce41620582 SHA512 2a2645a6b926e7330b5396a2f1136e16393d4d1a7a3394b24e55850add872c0f1f21bc7a354af4f5eee9601bdcbb02520707182ecb64bc61f59549bf10b75ef3
-EBUILD mate-polkit-1.16.0.ebuild 1168 BLAKE2B b76bd93f60f65c4905632583fd166f63d9246b18ea138a8573d2851c7e6c60d4de784c3905ab7c0a1ad6976c10faf7d011fa8cf0231430ea2ae98bac045642cf SHA512 95f25b6ad35bd24f471338586aad989c1e66b3f78b99a5792fe501e3bb9e959e6f6e6ffa03dd7754183ba6cbf003c69832f200135941ddad123bb9f4062e062c
 EBUILD mate-polkit-1.18.2.ebuild 1173 BLAKE2B ce9f9edad6a3370ab67d96ae16db4efe03cdce7627110aee20dd65721c4dd828e667206ea58a8c7acc0f644f21fc63575cb1476f5f8c4cfcb9b1277389aa29a3 SHA512 e7ab3d40a8e7112d6f6ce930d78a0aaa573a8dd37593a3d9fd41fc7a0723b33b7bc696407cacf2a259d1759f609f8dd9cebfd181196cdbf96796e555aa86d51b
-MISC metadata.xml 566 BLAKE2B d3334594e1bbe74979176bce038c94caf751fc26a342b5184807398df411daa43f81f26b3d010db536f7f275702d0972049115bfedfdbb3b07b793944a458aba SHA512 3f12eeee64f074b271e1f3c1fc8e8cfd7a6aa2a4ec0e9f4ac0f60aaff31523c182e59291b355a0e2440c9e8a0c2a3dc116ebd84c0cc2d0dbd869072c39da5480
+MISC metadata.xml 505 BLAKE2B 280a6762e6d9c690b5b0e0383e9d7560551d131f72823fdd759175b89f04eb22bbb7c605f26e178cfab65cc63e590997dbc9fd5621afe7ec1a4dbb5acd129683 SHA512 eea439bc1d6d7444abdea4e5ce2ed33bfc4a7bc625d67ccff9b65348d72296f5dddb1c11c86efd7b2ebb84b2fc2f2ed8beab715d6016c8ec94d03626be4497ef
diff --git a/mate-extra/mate-polkit/mate-polkit-1.12.0-r2.ebuild b/mate-extra/mate-polkit/mate-polkit-1.12.0-r2.ebuild
deleted file mode 100644
index 95d9df6dc89f..000000000000
--- a/mate-extra/mate-polkit/mate-polkit-1.12.0-r2.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 mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="A MATE specific DBUS service that is used to bring up authentication dialogs"
-LICENSE="LGPL-2"
-SLOT="0"
-
-IUSE="accountsservice appindicator debug examples gtk3 +introspection"
-
-RDEPEND=">=dev-libs/glib-2.36:2
-	>=sys-auth/polkit-0.102:0[introspection?]
-	x11-libs/gdk-pixbuf:2[introspection?]
-	virtual/libintl:0
-	accountsservice? ( sys-apps/accountsservice:0[introspection?] )
-	!gtk3? (
-		>=x11-libs/gtk+-2.24:2[introspection?]
-		appindicator? ( dev-libs/libappindicator:2 )
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3[introspection?]
-		appindicator? ( dev-libs/libappindicator:3 )
-	)
-	introspection? ( >=dev-libs/gobject-introspection-0.6.2:= )"
-
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35:*
-	sys-devel/gettext:*
-	>=sys-devel/libtool-2.2.6
-	virtual/pkgconfig:*
-	!<gnome-extra/polkit-gnome-0.102:0"
-
-src_configure() {
-	mate_src_configure \
-		--disable-static \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable accountsservice) \
-		$(use_enable appindicator) \
-		$(use_enable debug) \
-		$(use_enable examples) \
-		$(use_enable introspection)
-}
diff --git a/mate-extra/mate-polkit/mate-polkit-1.14.0.ebuild b/mate-extra/mate-polkit/mate-polkit-1.14.0.ebuild
deleted file mode 100644
index 07a5529360d1..000000000000
--- a/mate-extra/mate-polkit/mate-polkit-1.14.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="A MATE specific DBUS service that is used to bring up authentication dialogs"
-LICENSE="LGPL-2"
-SLOT="0"
-
-IUSE="accountsservice appindicator debug examples gtk3 +introspection"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36:2
-	>=sys-auth/polkit-0.102:0[introspection?]
-	x11-libs/gdk-pixbuf:2[introspection?]
-	virtual/libintl:0
-	!gtk3? (
-		>=x11-libs/gtk+-2.24:2[introspection?]
-		appindicator? ( dev-libs/libappindicator:2 )
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3[introspection?]
-		appindicator? ( dev-libs/libappindicator:3 )
-	)
-	introspection? ( >=dev-libs/gobject-introspection-0.6.2:= )"
-
-RDEPEND="${COMMON_DEPEND}
-	accountsservice? ( sys-apps/accountsservice:0[introspection?] )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35:*
-	sys-devel/gettext:*
-	>=sys-devel/libtool-2.2.6
-	virtual/pkgconfig:*
-	!<gnome-extra/polkit-gnome-0.102:0"
-
-src_configure() {
-	mate_src_configure \
-		--disable-static \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable accountsservice) \
-		$(use_enable appindicator) \
-		$(use_enable debug) \
-		$(use_enable examples) \
-		$(use_enable introspection)
-}
diff --git a/mate-extra/mate-polkit/mate-polkit-1.16.0.ebuild b/mate-extra/mate-polkit/mate-polkit-1.16.0.ebuild
deleted file mode 100644
index 294d7edfb02b..000000000000
--- a/mate-extra/mate-polkit/mate-polkit-1.16.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="A MATE specific DBUS service that is used to bring up authentication dialogs"
-LICENSE="LGPL-2"
-SLOT="0"
-
-IUSE="accountsservice appindicator debug examples +introspection"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36:2
-	>=sys-auth/polkit-0.102:0[introspection?]
-	x11-libs/gdk-pixbuf:2[introspection?]
-	virtual/libintl:0
-	>=x11-libs/gtk+-3.14.0:3[introspection?]
-	appindicator? ( dev-libs/libappindicator:3 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.2:= )"
-
-RDEPEND="${COMMON_DEPEND}
-	accountsservice? ( sys-apps/accountsservice:0[introspection?] )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35:*
-	sys-devel/gettext:*
-	>=sys-devel/libtool-2.2.6
-	virtual/pkgconfig:*
-	!<gnome-extra/polkit-gnome-0.102:0"
-
-src_configure() {
-	mate_src_configure \
-		--disable-static \
-		$(use_enable accountsservice) \
-		$(use_enable appindicator) \
-		$(use_enable debug) \
-		$(use_enable examples) \
-		$(use_enable introspection)
-}
diff --git a/mate-extra/mate-polkit/metadata.xml b/mate-extra/mate-polkit/metadata.xml
index a91d00933e6a..29daec0e17ce 100644
--- a/mate-extra/mate-polkit/metadata.xml
+++ b/mate-extra/mate-polkit/metadata.xml
@@ -11,6 +11,5 @@
 	<use>
 		<flag name="accountsservice">Support extraction of data from AccountsService</flag>
 		<flag name="appindicator">Add support for AppIndicator</flag>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
 	</use>
 </pkgmetadata>
diff --git a/mate-extra/mate-power-manager/Manifest b/mate-extra/mate-power-manager/Manifest
index 5016c3efd7ef..4a32631c572e 100644
--- a/mate-extra/mate-power-manager/Manifest
+++ b/mate-extra/mate-power-manager/Manifest
@@ -1,9 +1,3 @@
-DIST mate-power-manager-1.12.1.tar.xz 3197824 BLAKE2B 17f2f7939bfd0cfce433253ca8d4af6c7b98d850aed2c705650ef33e09d01f0f33107612ffbeca0a07a333e31ce736786e1638e32681fef49c95691a67e33290 SHA512 60da8ab6988a4bbef363fcf4571260bc7f70ed90badf85e4233e6ed80cfc13446319bd8686ed6d4bf9752971a6f98021a5d0354e3aa7f9274b6fdbc8f9f920b4
-DIST mate-power-manager-1.14.0.tar.xz 3221144 BLAKE2B c8bf7f263f3c7388cf937bb40d81d016e5e8e227d503c7828029f1d52c48edfeb6d5a9c666c45d752edf26798f69e27199ac6221a0a8a6b84c0a1cf12e216a45 SHA512 b1e6c5c0fe18b8e5d70ad66af450e86e7cf9fd5429973907618a742093fa9dec0c137e598f766824cb092d7c8c90a6d7116bc6b0417c81320dc21f8426d1eae2
-DIST mate-power-manager-1.16.2.tar.xz 3197208 BLAKE2B 80b84f596f3dad097508a2bc155f77ce7858699a8e7f5ed9460934b4f949bed9708b073722a6f680ec2e81f88c44c5db8c252b2b83f8706bccc8c9bad10503ea SHA512 8b5c3141d5e9dde771188ef7fed27073efbe7bfa7c244e3fb97fd2e0cf2e964ed6fcf587f003b3c090267ab0bf77e908eba44038e1b98cbb8d275bde0c08df09
 DIST mate-power-manager-1.18.1.tar.xz 3210144 BLAKE2B 7ab427acefd02b4aeea6fa2dd3052e2eaa9de3231ed9f8aa7b81af3a46fbf15da20925b568364ff802598738a7c3387d1b1fa620bef3ff2fd5522bb6247c2f3c SHA512 f4b42f66607e54020901f1f686cb018962c419294e50e0b37724bfddb462cf98a2e74e7ed980c3fe968873ca3848ff401839b39f53f1b40876773bfbf91b51c1
-EBUILD mate-power-manager-1.12.1-r2.ebuild 2154 BLAKE2B 35bf0d617970cdc338070dc97f2fb13718be8e5084d4120a1a3c6852f435509b57195a1e4023768e65443216f9d0ffa55a1b7e634ab58935fa933a13dcc6147b SHA512 9ad5a638cd4f1809c38fa032d0e20a3b5d5d74a1ba0834c3c5f6bcd69324ea0bbbc846959718e875875e6c49036d62db45b4b8f48a85e7b0d35e04f9e6754d6a
-EBUILD mate-power-manager-1.14.0.ebuild 2156 BLAKE2B 6351bee9ef052b7554d9ef5d8ed8dfde204472474fbe5fd9b270af2d821b6065eb4c79eece76ddb9532b1f22982ff084604365cec780203922b73792be0de68e SHA512 2c8d9693cc967a6850c2a193fee446f5024f6b1105e44c1d88f34a5b1fb317cbf2257664adb82dbb07662347ea56fd2b07f61131cbeffddfd263299dfd34eeb8
-EBUILD mate-power-manager-1.16.2.ebuild 2089 BLAKE2B 0aa85e73ef0c115afecc4af602b8bdc80644bd7da7386db83be4e6175ea928972cf6c816e3714b67f752753a2bebd0e8f93fe665b5868e75068b81402044b521 SHA512 bc4583158898b6e13559b793712b085eb84e53619734d778563244a98f031857cf1571626f5b6eb1415c2333455aa9c6ad82ed6bdd9dd020603e10764282af5d
 EBUILD mate-power-manager-1.18.1.ebuild 1601 BLAKE2B 283e8689669541458cb3a920f9f9b4aa6f9c4f35e0cc63fd2159b43adf1933569b4544d4c7ea6d3f3780cb6ee93c1894fff0708b5499c2be9c4e67bba525622e SHA512 153529596ca37d31b76b2afb4a143bd2ee4614771768ceb02b6a0ae5666efc01cbb09c284961b60e185b0ca25ae0a10a12ea70b76a229869394b821e3e52f793
-MISC metadata.xml 697 BLAKE2B 37cf4e4380833f76e09a7da9f8c6d3d4ddc73aa0d481e9211a2f81ac16ed3978f49fda5511fc5b2c40618c6f06f5a324710ef9e8e9ca0c986d0e4e8905b037ca SHA512 bb4229159bc69879bf967fc082846e75e905ad7fcc772e70de1f3f2cd58117089d7d339903ea44adee01966b1aa04db8192c67b0021196a5fd56f78610a51399
+MISC metadata.xml 578 BLAKE2B 2417d0111c1c380d002b7a569509f58fc365d831e0b0bbcee60742f54208cf4f8d38600e7594efd110b8e5c9528f67e979fd59f4e952bb6728c9a7a6ab685d46 SHA512 fcd2da4970ae106cd4b1157c664196edc50516886815617d16d171b4e269200a0a62d4f968a6755dc8502ac5c289afa19707a3eb5bcaf46bb7730436ca0c8b2d
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.12.1-r2.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.12.1-r2.ebuild
deleted file mode 100644
index 0336f85cae5f..000000000000
--- a/mate-extra/mate-power-manager/mate-power-manager-1.12.1-r2.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 mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="A session daemon for MATE that makes it easy to manage your laptop or desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+applet gnome-keyring gtk3 man pm-utils policykit test"
-
-# Interactive testsuite.
-RESTRICT="test"
-
-COMMON_DEPEND="app-text/rarian:0
-	>=dev-libs/dbus-glib-0.70:0
-	>=dev-libs/glib-2.36:2
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-	>=sys-apps/dbus-1:0
-	>=x11-apps/xrandr-1.3:0
-	>=x11-libs/cairo-1:0
-	>=x11-libs/gdk-pixbuf-2.11:2
-	x11-libs/libX11:0
-	x11-libs/libXext:0
-	x11-libs/libXrandr:0
-	>=x11-libs/libnotify-0.7:0
-	x11-libs/pango:0
-	applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] )
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3:0 )
-	!gtk3? (
-		>=dev-libs/libunique-1:1
-		>=media-libs/libcanberra-0.10:0[gtk]
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		>=dev-libs/libunique-3:3
-		>=media-libs/libcanberra-0.10:0[gtk3]
-		>=x11-libs/gtk+-3.0:3
-	)
-	pm-utils? ( >=sys-power/upower-pm-utils-0.9.23 )
-	!pm-utils? ( >=sys-power/upower-0.9.23:= )"
-
-RDEPEND="${COMMON_DEPEND}
-	policykit? ( >=mate-extra/mate-polkit-1.6 )"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto
-	man? ( app-text/docbook-sgml-utils:0
-		>=app-text/docbook-sgml-dtd-4.3 )"
-
-src_prepare() {
-	mate_src_prepare
-
-	# This needs to be after eautoreconf to prevent problems like bug #356277
-	# Remove the docbook2man rules here since it's not handled by a proper
-	# parameter in configure.in.
-	if ! use man; then
-		sed -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' -i man/Makefile.in \
-			|| die "docbook sed failed"
-	fi
-}
-
-src_configure() {
-	mate_src_configure \
-		--enable-compile-warnings=minimum \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with gnome-keyring keyring) \
-		$(use_enable applet applets) \
-		$(use_enable test tests)
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	dbus-launch Xemake check || die "Test phase failed"
-}
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.14.0.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.14.0.ebuild
deleted file mode 100644
index 30909a7a26c2..000000000000
--- a/mate-extra/mate-power-manager/mate-power-manager-1.14.0.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 mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="A session daemon for MATE that makes it easy to manage your laptop or desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+applet gnome-keyring gtk3 man pm-utils policykit test"
-
-# Interactive testsuite.
-RESTRICT="test"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.70:0
-	>=dev-libs/glib-2.36:2
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-	>=sys-apps/dbus-1:0
-	>=x11-apps/xrandr-1.3:0
-	>=x11-libs/cairo-1:0
-	>=x11-libs/gdk-pixbuf-2.11:2
-	x11-libs/libX11:0
-	x11-libs/libXext:0
-	x11-libs/libXrandr:0
-	>=x11-libs/libnotify-0.7:0
-	x11-libs/pango:0
-	applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] )
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3:0 )
-	!gtk3? (
-		>=dev-libs/libunique-1:1
-		>=media-libs/libcanberra-0.10:0[gtk]
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		>=dev-libs/libunique-3:3
-		>=media-libs/libcanberra-0.10:0[gtk3]
-		>=x11-libs/gtk+-3.0:3
-	)
-	pm-utils? ( >=sys-power/upower-pm-utils-0.9.23 )
-	!pm-utils? ( >=sys-power/upower-0.9.23:= )"
-
-RDEPEND="${COMMON_DEPEND}
-	policykit? ( >=mate-extra/mate-polkit-1.6 )"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	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:*
-	x11-base/xorg-proto
-	man? ( app-text/docbook-sgml-utils:0
-		>=app-text/docbook-sgml-dtd-4.3 )"
-
-src_prepare() {
-	mate_src_prepare
-
-	# This needs to be after eautoreconf to prevent problems like bug #356277
-	# Remove the docbook2man rules here since it's not handled by a proper
-	# parameter in configure.in.
-	if ! use man; then
-		sed -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' -i man/Makefile.in \
-			|| die "docbook sed failed"
-	fi
-}
-
-src_configure() {
-	mate_src_configure \
-		--enable-compile-warnings=minimum \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with gnome-keyring keyring) \
-		$(use_enable applet applets) \
-		$(use_enable test tests)
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	dbus-launch Xemake check || die "Test phase failed"
-}
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.16.2.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.16.2.ebuild
deleted file mode 100644
index 3b51b775714a..000000000000
--- a/mate-extra/mate-power-manager/mate-power-manager-1.16.2.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 mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="A session daemon for MATE that makes it easy to manage your laptop or desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+applet gnome-keyring gtk3 man pm-utils policykit test"
-
-# Interactive testsuite.
-RESTRICT="test"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.70:0
-	>=dev-libs/glib-2.36:2
-	>=sys-apps/dbus-1:0
-	>=x11-apps/xrandr-1.3:0
-	>=x11-libs/cairo-1:0
-	>=x11-libs/gdk-pixbuf-2.11:2
-	x11-libs/libX11:0
-	x11-libs/libXext:0
-	x11-libs/libXrandr:0
-	>=x11-libs/libnotify-0.7:0
-	x11-libs/pango:0
-	applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] )
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3:0 )
-	!gtk3? (
-		>=dev-libs/libunique-1:1
-		>=media-libs/libcanberra-0.10:0[gtk]
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		>=media-libs/libcanberra-0.10:0[gtk3]
-		>=x11-libs/gtk+-3.0:3
-	)
-	pm-utils? ( >=sys-power/upower-pm-utils-0.9.23 )
-	!pm-utils? ( >=sys-power/upower-0.9.23:= )"
-
-RDEPEND="${COMMON_DEPEND}
-	policykit? ( >=mate-extra/mate-polkit-1.6 )"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	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:*
-	x11-base/xorg-proto
-	man? ( app-text/docbook-sgml-utils:0
-		>=app-text/docbook-sgml-dtd-4.3 )"
-
-src_prepare() {
-	mate_src_prepare
-
-	# This needs to be after eautoreconf to prevent problems like bug #356277
-	# Remove the docbook2man rules here since it's not handled by a proper
-	# parameter in configure.in.
-	if ! use man; then
-		sed -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' -i man/Makefile.in \
-			|| die "docbook sed failed"
-	fi
-}
-
-src_configure() {
-	mate_src_configure \
-		--enable-compile-warnings=minimum \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with gnome-keyring keyring) \
-		$(use_enable applet applets) \
-		$(use_enable test tests)
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	dbus-launch Xemake check || die "Test phase failed"
-}
diff --git a/mate-extra/mate-power-manager/metadata.xml b/mate-extra/mate-power-manager/metadata.xml
index aca679d561df..422a1960ab85 100644
--- a/mate-extra/mate-power-manager/metadata.xml
+++ b/mate-extra/mate-power-manager/metadata.xml
@@ -7,8 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="applet">Enable building of the MATE applet.</flag>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
-		<flag name="man">Build power manager's man page.</flag>
 		<flag name="pm-utils">Adds support for suspend/resume using
 			<pkg>sys-power/upower-pm-utils</pkg> instead of
 			<pkg>sys-power/upower</pkg></flag>
diff --git a/mate-extra/mate-screensaver/Manifest b/mate-extra/mate-screensaver/Manifest
index 2f48ae32c817..264d886839d1 100644
--- a/mate-extra/mate-screensaver/Manifest
+++ b/mate-extra/mate-screensaver/Manifest
@@ -1,10 +1,4 @@
 AUX xss-conversion.txt 1026 BLAKE2B 4675ecb7d7ce45b28183ff503739b5d3853e8a68adfb8e4bf92274944c034d4f043c8854cc54a801ad72160bf452c645dfc5a0d35a71b967c9094f2a8464e59a SHA512 149d28bf7ff9dffe75f0a59408d91eff6537ec27a9457bf2419efe78e9b39a11796b341176e6ba4b1a183cc3ead080abe0ba85f51a3d57b0ff54dae8a3ec312a
-DIST mate-screensaver-1.12.0.tar.xz 4868924 BLAKE2B b523e18eed64c7f4521e6ac5fb656479fc9ac15652ca6bb5a832b66944a52ac429bb9dcc73a6ac50fda49fc2ba22beda0ad3e58a7b5e44d96282066ab7d1a151 SHA512 01bdef496560eb8e9118b0ff66863568aaa6df872e7947d0a92fe9fcb1d305618b28928ea95c65a3367e3e4e79e9bdab7a8266287c8e3db2a5210b955d412c8d
-DIST mate-screensaver-1.14.1.tar.xz 4912772 BLAKE2B b317bd9e40d423fc16ec53966a5ca813dd07f250bee171dbbd351bfa14d33f4b28a2c98e71311903eea607c7059c75c12d38b09d91c55a13052bbe5026b46eec SHA512 28b5834450da9d7d2fd3a77504f244e69212e751435bd41a957f30a5231db312dba37ee39442c63a40098bb3d1e1fade81ea423f9d59b29fc5d1201522d1d8f8
-DIST mate-screensaver-1.16.1.tar.xz 4916316 BLAKE2B 0918082568752c52f8e03f52c8423f6d053327868eebca77615e22fcb5bab1225f0cbccdad2f66ec01325ba3b67fa67db617509855a27618be71e8cd9f76d60c SHA512 ac481226ccec9a2785321ecc18ef3ed7ec188ba3fcb6e31515bca97b86b68955b1b1e08d4f72dbb683552877240e2f294b48af6bdea36f23d39a0853e1620085
 DIST mate-screensaver-1.18.2.tar.xz 4926748 BLAKE2B 7790a579991886617accd3f38146b624c81145c588fbc93fe78b0015669ca53e493aca0689e157fc0c11b86248bbc3d00b479ad8c4c1c01288e853c1ef3dd40c SHA512 b8ec5705f1810ecb1b887d1c9ad2a5eca2a39f7a093154d45c8cfdbcef664520b09be0ed4ab5992b001a4445e71e4eefd4e28d83e22c7536788c9d32f703283e
-EBUILD mate-screensaver-1.12.0-r1.ebuild 3080 BLAKE2B eaa79327da7d0696a8a8b5386ba3ec7275331d40f53818272d10e3c72f3f131007e9d5992613f111537320bc7d03d30771277b68748d3afdb771fef96d71bfec SHA512 365e3055e344971d0ffff2a1df404c68e10cfeb9aa7faf1ee62a6e4d259690d50de88d01d83a85384a56a15fc91a78ded3a5599884fda4603e98a1c45bf69da2
-EBUILD mate-screensaver-1.14.1.ebuild 3122 BLAKE2B 6db2403634b30bd9ebcbc74d1b9a95a39f16263b9a74b1664edde9bf832bfb2bd7273d1616dc76836e7ad7b1ce9e55a03614c39c77fc1532f20f7b308578bb8a SHA512 c4a5617cbafc141883ca7885fa75b1aac9d57cf886ce8b297602a6a9d88093adb20f6b45e58992944593362f0c5cf804e44968c43db4e71731fbf8de69526c94
-EBUILD mate-screensaver-1.16.1.ebuild 3122 BLAKE2B 6db2403634b30bd9ebcbc74d1b9a95a39f16263b9a74b1664edde9bf832bfb2bd7273d1616dc76836e7ad7b1ce9e55a03614c39c77fc1532f20f7b308578bb8a SHA512 c4a5617cbafc141883ca7885fa75b1aac9d57cf886ce8b297602a6a9d88093adb20f6b45e58992944593362f0c5cf804e44968c43db4e71731fbf8de69526c94
 EBUILD mate-screensaver-1.18.2.ebuild 3027 BLAKE2B 4fcaa0fc8c5ba82d31fcb8594b46033964ce8aeb71aedbc5f2876bb61bbc7a1681006e3752145d6b072ea5e5f8aeba59e89e8fa7ca52a89ec1411713d0a3754e SHA512 7aff1f0f02fa1a3095405716d53bea7d380bd9acb931bc7bff5dc9775aea9aa7684742f95a4626a506c3731c655a1ce75ef8074c530979ae8d05bfca56ef2e3f
-MISC metadata.xml 508 BLAKE2B 0e4b0470e1a7c5259930d95e36a39314b708d0f9ae46e761fbbc03b6d4594e792f8f894f92787474097bdf012f561ae4952116189b2cf6d1ac982b72eb7d5527 SHA512 03f079381cf35a7c0d33ec93f9aba9e8924dd010e1d67ea64508d1fca59fe56685ccc06b2a721006c1144e16a217b32156b67205c9ee8e8d39410406612cc3e2
+MISC metadata.xml 447 BLAKE2B febc277d7b427ae9a48c3c6e318b779f8a3fb9e27f896b17a3ebafec9bc8b03c4af3f30de7881fcc7feff674fdc0106d0b46f91d72d7267d4c4eeffb1dbe341a SHA512 29d7b99ddd69b2503d91f185679e1811403ba34443e20e2b17782878ee509565dcd62c2e3339709b3d29f568168c9c5c5a9284823d0187392220e781792b73e8
diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.12.0-r1.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.12.0-r1.ebuild
deleted file mode 100644
index d9b6e3f486be..000000000000
--- a/mate-extra/mate-screensaver/mate-screensaver-1.12.0-r1.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 mate multilib readme.gentoo-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Replaces xscreensaver, integrating with the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X debug consolekit gtk3 kernel_linux libnotify opengl pam systemd"
-
-DOC_CONTENTS="
-	Information for converting screensavers is located in
-	/usr/share/doc/${PF}/xss-conversion.txt*
-"
-
-RDEPEND="
-	>=dev-libs/dbus-glib-0.71:0
-	>=dev-libs/glib-2.36:2
-	gnome-base/dconf:0
-	>=mate-base/libmatekbd-1.7.1[gtk3(-)=]
-	>=mate-base/mate-desktop-1.9.4[gtk3(-)=]
-	>=mate-base/mate-menus-1.6
-	>=mate-base/mate-session-manager-1.6
-	>=sys-apps/dbus-0.30:0
-	>=x11-libs/gdk-pixbuf-2.14:2
-	>=x11-libs/libX11-1:0
-	x11-libs/cairo:0
-	x11-libs/libXext:0
-	x11-libs/libXrandr:0
-	x11-libs/libXScrnSaver:0
-	x11-libs/libXxf86misc:0
-	x11-libs/libXxf86vm:0
-	x11-libs/libxklavier:0
-	x11-libs/pango:0
-	virtual/libintl:0
-	consolekit? ( sys-auth/consolekit:0 )
-	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3 )
-	libnotify? ( >=x11-libs/libnotify-0.7:0 )
-	opengl? ( virtual/opengl:0 )
-	pam? ( gnome-base/gnome-keyring:0 virtual/pam:0 )
-	!pam? ( kernel_linux? ( sys-apps/shadow:0 ) )
-	systemd? ( sys-apps/systemd:0= )
-	!!<gnome-extra/gnome-screensaver-3:0"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto"
-
-src_configure() {
-	mate_src_configure \
-		--enable-locking \
-		--with-kbd-layout-indicator \
-		--with-xf86gamma-ext \
-		--with-xscreensaverdir=/usr/share/xscreensaver/config \
-		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_with consolekit console-kit) \
-		$(use_with libnotify) \
-		$(use_with opengl libgl) \
-		$(use_with systemd) \
-		$(use_enable debug) \
-		$(use_enable pam)
-}
-
-src_install() {
-	mate_src_install
-
-	# Install the conversion script in the documentation.
-	dodoc "${S}"/data/migrate-xscreensaver-config.sh
-	dodoc "${S}"/data/xscreensaver-config.xsl
-	dodoc "${FILESDIR}"/xss-conversion.txt
-
-	# Non PAM users will need this suid to read the password hashes.
-	# OpenPAM users will probably need this too when
-	# https://bugzilla.gnome.org/show_bug.cgi?id=370847
-	# is fixed.
-	if ! use pam ; then
-		fperms u+s /usr/libexec/mate-screensaver-dialog
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-
-	if has_version "<x11-base/xorg-server-1.5.3-r4" ; then
-		ewarn "You have a too old xorg-server installation. This will cause"
-		ewarn "mate-screensaver to eat up your CPU. Please consider upgrading."
-		echo
-	fi
-
-	if has_version "<x11-misc/xscreensaver-4.22-r2" ; then
-		ewarn "You have xscreensaver installed, you probably want to disable it."
-		ewarn "To prevent a duplicate screensaver entry in the menu, you need to"
-		ewarn "build xscreensaver with -gnome in the USE flags."
-		ewarn "echo \"x11-misc/xscreensaver -gnome\" >> /etc/portage/package.use"
-		echo
-	fi
-
-	readme.gentoo_print_elog
-}
diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.14.1.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.14.1.ebuild
deleted file mode 100644
index a2f6cdf98a7a..000000000000
--- a/mate-extra/mate-screensaver/mate-screensaver-1.14.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 mate multilib readme.gentoo-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Replaces xscreensaver, integrating with the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X debug consolekit gtk3 kernel_linux libnotify opengl pam systemd"
-
-DOC_CONTENTS="
-	Information for converting screensavers is located in
-	/usr/share/doc/${PF}/xss-conversion.txt*
-"
-
-COMMON_DEPEND="
-	>=dev-libs/dbus-glib-0.71:0
-	>=dev-libs/glib-2.36:2
-	gnome-base/dconf:0
-	>=mate-base/libmatekbd-1.7.1[gtk3(-)=]
-	>=mate-base/mate-desktop-1.9.4[gtk3(-)=]
-	>=mate-base/mate-menus-1.6
-	>=sys-apps/dbus-0.30:0
-	>=x11-libs/gdk-pixbuf-2.14:2
-	>=x11-libs/libX11-1:0
-	x11-libs/cairo:0
-	x11-libs/libXext:0
-	x11-libs/libXrandr:0
-	x11-libs/libXScrnSaver:0
-	x11-libs/libXxf86misc:0
-	x11-libs/libXxf86vm:0
-	x11-libs/libxklavier:0
-	x11-libs/pango:0
-	virtual/libintl:0
-	consolekit? ( sys-auth/consolekit:0 )
-	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3 )
-	libnotify? ( >=x11-libs/libnotify-0.7:0 )
-	opengl? ( virtual/opengl:0 )
-	pam? ( gnome-base/gnome-keyring:0 virtual/pam:0 )
-	!pam? ( kernel_linux? ( sys-apps/shadow:0 ) )
-	systemd? ( sys-apps/systemd:0= )
-	!!<gnome-extra/gnome-screensaver-3:0"
-
-RDEPEND="${COMMON_DEPEND}
-	>=mate-base/mate-session-manager-1.6"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto"
-
-src_configure() {
-	mate_src_configure \
-		--enable-locking \
-		--with-kbd-layout-indicator \
-		--with-xf86gamma-ext \
-		--with-xscreensaverdir=/usr/share/xscreensaver/config \
-		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_with consolekit console-kit) \
-		$(use_with libnotify) \
-		$(use_with opengl libgl) \
-		$(use_with systemd) \
-		$(use_enable debug) \
-		$(use_enable pam)
-}
-
-src_install() {
-	mate_src_install
-
-	# Install the conversion script in the documentation.
-	dodoc "${S}"/data/migrate-xscreensaver-config.sh
-	dodoc "${S}"/data/xscreensaver-config.xsl
-	dodoc "${FILESDIR}"/xss-conversion.txt
-
-	# Non PAM users will need this suid to read the password hashes.
-	# OpenPAM users will probably need this too when
-	# https://bugzilla.gnome.org/show_bug.cgi?id=370847
-	# is fixed.
-	if ! use pam ; then
-		fperms u+s /usr/libexec/mate-screensaver-dialog
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-
-	if has_version "<x11-base/xorg-server-1.5.3-r4" ; then
-		ewarn "You have a too old xorg-server installation. This will cause"
-		ewarn "mate-screensaver to eat up your CPU. Please consider upgrading."
-		echo
-	fi
-
-	if has_version "<x11-misc/xscreensaver-4.22-r2" ; then
-		ewarn "You have xscreensaver installed, you probably want to disable it."
-		ewarn "To prevent a duplicate screensaver entry in the menu, you need to"
-		ewarn "build xscreensaver with -gnome in the USE flags."
-		ewarn "echo \"x11-misc/xscreensaver -gnome\" >> /etc/portage/package.use"
-		echo
-	fi
-
-	readme.gentoo_print_elog
-}
diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.16.1.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.16.1.ebuild
deleted file mode 100644
index a2f6cdf98a7a..000000000000
--- a/mate-extra/mate-screensaver/mate-screensaver-1.16.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 mate multilib readme.gentoo-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Replaces xscreensaver, integrating with the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X debug consolekit gtk3 kernel_linux libnotify opengl pam systemd"
-
-DOC_CONTENTS="
-	Information for converting screensavers is located in
-	/usr/share/doc/${PF}/xss-conversion.txt*
-"
-
-COMMON_DEPEND="
-	>=dev-libs/dbus-glib-0.71:0
-	>=dev-libs/glib-2.36:2
-	gnome-base/dconf:0
-	>=mate-base/libmatekbd-1.7.1[gtk3(-)=]
-	>=mate-base/mate-desktop-1.9.4[gtk3(-)=]
-	>=mate-base/mate-menus-1.6
-	>=sys-apps/dbus-0.30:0
-	>=x11-libs/gdk-pixbuf-2.14:2
-	>=x11-libs/libX11-1:0
-	x11-libs/cairo:0
-	x11-libs/libXext:0
-	x11-libs/libXrandr:0
-	x11-libs/libXScrnSaver:0
-	x11-libs/libXxf86misc:0
-	x11-libs/libXxf86vm:0
-	x11-libs/libxklavier:0
-	x11-libs/pango:0
-	virtual/libintl:0
-	consolekit? ( sys-auth/consolekit:0 )
-	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3 )
-	libnotify? ( >=x11-libs/libnotify-0.7:0 )
-	opengl? ( virtual/opengl:0 )
-	pam? ( gnome-base/gnome-keyring:0 virtual/pam:0 )
-	!pam? ( kernel_linux? ( sys-apps/shadow:0 ) )
-	systemd? ( sys-apps/systemd:0= )
-	!!<gnome-extra/gnome-screensaver-3:0"
-
-RDEPEND="${COMMON_DEPEND}
-	>=mate-base/mate-session-manager-1.6"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto"
-
-src_configure() {
-	mate_src_configure \
-		--enable-locking \
-		--with-kbd-layout-indicator \
-		--with-xf86gamma-ext \
-		--with-xscreensaverdir=/usr/share/xscreensaver/config \
-		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_with consolekit console-kit) \
-		$(use_with libnotify) \
-		$(use_with opengl libgl) \
-		$(use_with systemd) \
-		$(use_enable debug) \
-		$(use_enable pam)
-}
-
-src_install() {
-	mate_src_install
-
-	# Install the conversion script in the documentation.
-	dodoc "${S}"/data/migrate-xscreensaver-config.sh
-	dodoc "${S}"/data/xscreensaver-config.xsl
-	dodoc "${FILESDIR}"/xss-conversion.txt
-
-	# Non PAM users will need this suid to read the password hashes.
-	# OpenPAM users will probably need this too when
-	# https://bugzilla.gnome.org/show_bug.cgi?id=370847
-	# is fixed.
-	if ! use pam ; then
-		fperms u+s /usr/libexec/mate-screensaver-dialog
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-
-	if has_version "<x11-base/xorg-server-1.5.3-r4" ; then
-		ewarn "You have a too old xorg-server installation. This will cause"
-		ewarn "mate-screensaver to eat up your CPU. Please consider upgrading."
-		echo
-	fi
-
-	if has_version "<x11-misc/xscreensaver-4.22-r2" ; then
-		ewarn "You have xscreensaver installed, you probably want to disable it."
-		ewarn "To prevent a duplicate screensaver entry in the menu, you need to"
-		ewarn "build xscreensaver with -gnome in the USE flags."
-		ewarn "echo \"x11-misc/xscreensaver -gnome\" >> /etc/portage/package.use"
-		echo
-	fi
-
-	readme.gentoo_print_elog
-}
diff --git a/mate-extra/mate-screensaver/metadata.xml b/mate-extra/mate-screensaver/metadata.xml
index a0d6c3ac7d57..4be378966bcd 100644
--- a/mate-extra/mate-screensaver/metadata.xml
+++ b/mate-extra/mate-screensaver/metadata.xml
@@ -8,7 +8,6 @@
 	<use>
 		<flag name="consolekit">Enable support for 
 			<pkg>sys-auth/consolekit</pkg></flag>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/mate-screensaver</remote-id>
diff --git a/mate-extra/mate-sensors-applet/Manifest b/mate-extra/mate-sensors-applet/Manifest
index 32deb9e632ba..575e19625092 100644
--- a/mate-extra/mate-sensors-applet/Manifest
+++ b/mate-extra/mate-sensors-applet/Manifest
@@ -1,9 +1,3 @@
-DIST mate-sensors-applet-1.12.1.tar.xz 369492 BLAKE2B cdc0bc46639e5234c9ed37cbd62b9439e1dbf1da9d2b377c57502d370e1f6e19a87e307c00a9bfbcde32812fde2804d3c248805f55dcb29b70d10cd38ca08210 SHA512 2e96708e4e27d545b0ad010dbd04139c5d340be1138236ba1197c2cf16486005905264e381f8dde75ea6c23c29bd1a0dd03afb5726340cad718d06914d4dd994
-DIST mate-sensors-applet-1.14.0.tar.xz 389960 BLAKE2B e220374ac5e56fb0e5fc86c036dd49f509def048421903597d82df8a14ed8877586282880419d168d1319fc05d890f6ffd61cdc49622d53f9dc5d4d51e82332a SHA512 8d1afdb491e3a4a72dbee098ff3383a9562ab47da81d68807cb1fe72ee9f2ccad31cbe355268d7641fc213dcabf8a4527f03e04c4d8a166584730e934f006f5f
-DIST mate-sensors-applet-1.16.1.tar.xz 393360 BLAKE2B 01afa10059a94bcedb0af497203f481dba2fcbf9b9633b3c69ecd1d28ac8894159abc8e26ef61de7ffcfa62d51d7d651adf73f53850b4fe7446aa8b56dadfbd2 SHA512 35ea60f7f63b636dc8d8f6fa6f9a8fac516cea6e3005eaaf715f3f5bc3d03f1d04f24fe9f5bbba3edea41498efaa78fdec085f63d1940bc1265e0b1d70da62cc
 DIST mate-sensors-applet-1.18.3.tar.xz 385728 BLAKE2B 42a38121db367788af906aec08261512b8aa96ad3782c1aca0d29b8371a598855ee0d7a3c63306929d45e4d58fb01e117efd91b4bd6b104c49790ff8e73c292f SHA512 39e23839eebe460a99d002d6f897d3053a6940cb33a24c923790e976b72be7a260cd06be326abbb3917b85b6b6fa779cc5f1c06dbf9c19c45ec3f1bf6a93a96e
-EBUILD mate-sensors-applet-1.12.1.ebuild 1508 BLAKE2B e68ffc6abfd064d9e7a9ead780b581a07085344b317eb0e7c1bdd42218f876392a3ad28e37b56155c9eb30aab83b9a7396912dac7557564cf97780fe551bb05b SHA512 4e5ad947d984975d3915a46150ab450fb932dbb69a92a26170c73f876d6f8d55b3e257f1adfef4c9c53e7699ada8d3e4d8336cc220d7ed970554550991c31287
-EBUILD mate-sensors-applet-1.14.0.ebuild 1550 BLAKE2B 273d425daeffebc84c5780c5c829eb2b429849f6e7eb33ecdd7a2bad3a4a312923df2b1383d0d961bdd12d9084acc091fa91b2932fba16018e62e10deb0f0a72 SHA512 2f216c9e421e42899eb6f7b8646fb56352d9b6589decdcaf8453277b76ad074877871112888d60f97c4fb589a5d5568924207693d235fa07e3253fec66686dc7
-EBUILD mate-sensors-applet-1.16.1.ebuild 1550 BLAKE2B d4d58b9c33f4a609150fb9badaacd8a78e0b1da5b8f6f45f0057137bc4435fa8a49f8c8ec1d505f85b63b6fedfa18bbcd0b0c80f353183acf64e9979a2c0dac7 SHA512 dd0e5257ba32bff392dee3b50c00ba3c49c756d378eeefc7bc1959bddb319013510e47a04d2cf749e0d22c95b661dd3c9744def4ab9df4d579fb67b61e2fb82e
 EBUILD mate-sensors-applet-1.18.3.ebuild 1456 BLAKE2B 82b54b5512e38a9eeea46218b48e84a75b667a7aed23e3babdd3a2e2cdcdcdcbbdf006833ffc7cd14f0ebba84e69882514990f3b4bd65dc9a7fc8166a025fbd6 SHA512 4083091cb8a0b79dc80a9ade6f16c4ca2c6810c04c1b460da42dfdc5aa543b9d4393047f1571b992685e4ff212be52984f25cec251b99c1bc45f5f53214b2ff6
-MISC metadata.xml 424 BLAKE2B 4f531e8f367a68662eb43f995f304b74661ccd2dc00870128252e8cda1a21b5c9b659b2ab32e6a0cc4066243dd724c7ce2b853dbf07234b27aa0a776a4d539ef SHA512 1bcb907fe8786f507b01dcc94309761ed2dba978ee0176d482c461c610b8b2e9876e29be1d0a3b36962ab9a7edd7e505c50851aafdb22e2bdc3588afb4aeaccb
+MISC metadata.xml 348 BLAKE2B 3e34850491c3dce6bfe3771ed94ea37e68d9c8131594f4056c40e754f5556a4dbf03e434a0f3d19eaa6177a0a484a1b50b8de1c67a4eadf1faf6e5b56fa70166 SHA512 32cad99749c326ae12caa346b0bbf85779cbf9f35b85c4f729358dd7171d468f486c761e33d2938fcac445485ec256d733150d7dedc7c9e6b271702ba7c454ab
diff --git a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.12.1.ebuild b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.12.1.ebuild
deleted file mode 100644
index 186a36d76bf3..000000000000
--- a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.12.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="MATE panel applet to display readings from hardware sensors"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+dbus gtk3 hddtemp libnotify lm_sensors video_cards_nvidia"
-
-RDEPEND="app-text/rarian:0
-	>=dev-libs/glib-2.36:2
-	>=mate-base/mate-panel-1.6[gtk3(-)=]
-	>=x11-libs/cairo-1.0.4:0
-	x11-libs/gdk-pixbuf:2
-	virtual/libintl:0
-	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3 )
-	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
-	) )"
-
-DEPEND="${RDEPEND}
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PDEPEND="hddtemp? ( dbus? ( sys-fs/udisks:0 ) )"
-
-src_configure() {
-	local udisks
-
-	if use hddtemp && use dbus; then
-		udisks="--enable-udisks"
-	else
-		udisks="--disable-udisks"
-	fi
-
-	mate_src_configure \
-		--disable-static \
-		--without-aticonfig \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable libnotify) \
-		$(use_with lm_sensors libsensors) \
-		$(use_with video_cards_nvidia nvidia) \
-		${udisks}
-}
diff --git a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.14.0.ebuild b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.14.0.ebuild
deleted file mode 100644
index 4e3e5391b775..000000000000
--- a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.14.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE panel applet to display readings from hardware sensors"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+dbus gtk3 hddtemp libnotify lm_sensors video_cards_nvidia"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36:2
-	>=mate-base/mate-panel-1.6[gtk3(-)=]
-	>=x11-libs/cairo-1.0.4:0
-	x11-libs/gdk-pixbuf:2
-	virtual/libintl:0
-	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3 )
-	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="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	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:*"
-
-PDEPEND="hddtemp? ( dbus? ( sys-fs/udisks:0 ) )"
-
-src_configure() {
-	local udisks
-
-	if use hddtemp && use dbus; then
-		udisks="--enable-udisks"
-	else
-		udisks="--disable-udisks"
-	fi
-
-	mate_src_configure \
-		--disable-static \
-		--without-aticonfig \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable libnotify) \
-		$(use_with lm_sensors libsensors) \
-		$(use_with video_cards_nvidia nvidia) \
-		${udisks}
-}
diff --git a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.16.1.ebuild b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.16.1.ebuild
deleted file mode 100644
index caab01e9f30e..000000000000
--- a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.16.1.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
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE panel applet to display readings from hardware sensors"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+dbus gtk3 hddtemp libnotify lm_sensors video_cards_nvidia"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36:2
-	>=mate-base/mate-panel-1.6[gtk3(-)=]
-	>=x11-libs/cairo-1.0.4:0
-	x11-libs/gdk-pixbuf:2
-	virtual/libintl:0
-	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3 )
-	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="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	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:*"
-
-PDEPEND="hddtemp? ( dbus? ( sys-fs/udisks:0 ) )"
-
-src_configure() {
-	local udisks
-
-	if use hddtemp && use dbus; then
-		udisks="--enable-udisks"
-	else
-		udisks="--disable-udisks"
-	fi
-
-	mate_src_configure \
-		--disable-static \
-		--without-aticonfig \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable libnotify) \
-		$(use_with lm_sensors libsensors) \
-		$(use_with video_cards_nvidia nvidia) \
-		${udisks}
-}
diff --git a/mate-extra/mate-sensors-applet/metadata.xml b/mate-extra/mate-sensors-applet/metadata.xml
index 5cc849549b93..c1da9f712590 100644
--- a/mate-extra/mate-sensors-applet/metadata.xml
+++ b/mate-extra/mate-sensors-applet/metadata.xml
@@ -5,9 +5,6 @@
 		<email>mate@gentoo.org</email>
 		<name>Gentoo MATE Desktop</name>
 	</maintainer>
-	<use>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/mate-sensors-applet</remote-id>
 	</upstream>
diff --git a/mate-extra/mate-system-monitor/Manifest b/mate-extra/mate-system-monitor/Manifest
index 481975696162..bbfc9c18005b 100644
--- a/mate-extra/mate-system-monitor/Manifest
+++ b/mate-extra/mate-system-monitor/Manifest
@@ -1,9 +1,3 @@
-DIST mate-system-monitor-1.12.2.tar.xz 2114504 BLAKE2B ceec8177fa020cf739f132d9970a2f56029d12eb767853b3dce671d483fa661ade6d2190e68fdfc7250fd1cbf03ac5b9845a5337a27a75027ebe664ef756038b SHA512 f001d36b7a343cba68bf76094abad4e07cc89537c71dba873bb5ffc61045f440a319e3db8d5ee55ff301f52dbdad8b275ca71a4ab6c5fbe34d75c2e65edd7c23
-DIST mate-system-monitor-1.14.0.tar.xz 2135464 BLAKE2B e390fcfa7d41aaf2b407f0a4e22acf1c9f3eaccfb1a13d8137cc56964751126c94569cf16427409118f86a8125147f27e59a8db05b20349c7ab18065451fa31d SHA512 f19fa0241228be8ec8600db43e71495750039288292ba5714489a84acb3e5cc9f4c87d39a63d29a0fc6f907af6ecc319382cd4276ae2de1125bba059d5b24be5
-DIST mate-system-monitor-1.16.0.tar.xz 2120984 BLAKE2B 560a811774ffe8ee46876fb7618ff373dc810f0e6e068fef1265dba72c71b4ff808228be5b25c8f22d278e46be074b0a176d6722a3ce0dc3886311b35ed4ef11 SHA512 6ee8e1d1a3af5e3b295c2cca74b3e6bdf8a09eb6aa7d63f13db006829c2df25b580b72cc8d6e34e2844b243999cd4f059a42aa67a88c60825defdb7880150796
 DIST mate-system-monitor-1.18.1.tar.xz 2159100 BLAKE2B babac7ad0dc3a3bccf5c6d4567bee0c95aad1f5fffdb1d6d566316f4712a345e7083c8032c19b6615a9f9d06fbbe8b89357407b897206f3131294b7d2305b45d SHA512 47dd2ba46cd6fbd1beef2e6f0a93332c7142f701d18f6894b4986134c557f63f3e2bed382af17cc5bf45693b556a91ccab36fde940126fdceb5834d4cea08356
-EBUILD mate-system-monitor-1.12.2.ebuild 1015 BLAKE2B 80fa49e73cfca4eaf3e783e3b85966ca477ec832a672e6fdcb02a19d0958315b80669f83885b3f51e47fa1044a120e298d30fee1e4217536c5a136131b54cd8f SHA512 464b7afd1531b963101721317612005ac075f1d4e24ff05d21be93564e52944da949a494d71d3bb2726578ccee126892acd23ef551d01354d7d470920017eca8
-EBUILD mate-system-monitor-1.14.0.ebuild 985 BLAKE2B 365a008303b29c90deaf728fefd8dd00bea98e9151c9c1762b358a79117ed0599b1dbd4c519c427158e16e5e604bad1a9d52a9f6ec2b8b962d004f00ace6db4f SHA512 4fd51f71d477cbb230ac4a072a2f5488e78a9b3de89e0f16da9485e4c954aeca9d1f03e4b817ca9f458e6bbdd666d92a6c46c47b960dc6fae82bf2dfe05f4c62
-EBUILD mate-system-monitor-1.16.0.ebuild 985 BLAKE2B 365a008303b29c90deaf728fefd8dd00bea98e9151c9c1762b358a79117ed0599b1dbd4c519c427158e16e5e604bad1a9d52a9f6ec2b8b962d004f00ace6db4f SHA512 4fd51f71d477cbb230ac4a072a2f5488e78a9b3de89e0f16da9485e4c954aeca9d1f03e4b817ca9f458e6bbdd666d92a6c46c47b960dc6fae82bf2dfe05f4c62
 EBUILD mate-system-monitor-1.18.1.ebuild 1016 BLAKE2B 1bbe2ee50460b8c3db678d658df3228e999fdf10bd887365a72ab8a8b26207db3df6a5b70a93b0e562203c766f3f6e84c46e18ee234ca78374ff8fd1b418cad9 SHA512 1d773cd89876cbbf9c0b3e7a16561b797d1272c5b412e860f7c0e9f5586ef8e4924e810f5629c8ea32cfeb38275a7ea3a21ffda6002e910f262be472d2eabd1c
-MISC metadata.xml 424 BLAKE2B 15e1b8bbe54d362601038fc43a18c7ac25e11ddae7fb992b2123a2e5130a103161d7cd68fb4a0e8c60d0029e273eb2a9bb1faabf9c2f5eb953e58beaa4d38fb6 SHA512 3f930932b1c3bdc51ebc07b28989e3a4c53eeca6479215b9c75c06323fcf95b46dfe3260a7f9e5391bb4dc76df87d0651ba87fdede28e1f816094921d00f31cc
+MISC metadata.xml 348 BLAKE2B fe7ff06b7a0366617fb30e7a98fa7054c32469bf49691855183ee7b9991c1aebd5f431081e5d7efe07ab3a2b2424630bea621c2b3369338f6bb5348d1ba70de7 SHA512 4cb1bd5f11887274393c957be697ce784af74a39258ead2e9ccb586ac8d4bcab06a6aa2a76e8f96a85d2d818092250eede243775b61222493739440c59cc9c9b
diff --git a/mate-extra/mate-system-monitor/mate-system-monitor-1.12.2.ebuild b/mate-extra/mate-system-monitor/mate-system-monitor-1.12.2.ebuild
deleted file mode 100644
index a640204bee9e..000000000000
--- a/mate-extra/mate-system-monitor/mate-system-monitor-1.12.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="The MATE System Monitor"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk3 systemd"
-
-RDEPEND="
-	>=dev-cpp/glibmm-2.26:2
-	>=dev-libs/dbus-glib-0.70:0
-	>=dev-libs/glib-2.36:2
-	dev-libs/libsigc++:2
-	>=dev-libs/libxml2-2:2
-	>=gnome-base/libgtop-2.23.1:2=
-	>=gnome-base/librsvg-2.35:2
-	>=sys-apps/dbus-0.7:0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	virtual/libintl:0
-	!gtk3? (
-		>=dev-cpp/gtkmm-2.22:2.4
-		>=x11-libs/gtk+-2.20:2
-		>=x11-libs/libwnck-2.5:1
-	)
-	gtk3? (
-		>=dev-cpp/gtkmm-3.0:3.0
-		>=x11-libs/gtk+-3.0:3
-		>=x11-libs/libwnck-2.91:3
-	)
-	systemd? ( sys-apps/systemd )"
-
-DEPEND="${RDEPEND}
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	>=sys-devel/autoconf-2.63:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable systemd)
-}
diff --git a/mate-extra/mate-system-monitor/mate-system-monitor-1.14.0.ebuild b/mate-extra/mate-system-monitor/mate-system-monitor-1.14.0.ebuild
deleted file mode 100644
index 5fb7d32fa1f6..000000000000
--- a/mate-extra/mate-system-monitor/mate-system-monitor-1.14.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="The MATE System Monitor"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="systemd"
-
-COMMON_DEPEND="
-	>=dev-cpp/glibmm-2.26:2
-	>=dev-cpp/gtkmm-3.8:3.0
-	>=dev-libs/glib-2.36:2
-	dev-libs/libsigc++:2
-	>=dev-libs/libxml2-2:2
-	>=gnome-base/libgtop-2.23.1:2=
-	>=gnome-base/librsvg-2.35:2
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.14:3
-	>=x11-libs/libwnck-3.0:3
-	virtual/libintl:0
-	systemd? ( sys-apps/systemd )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	>=sys-devel/autoconf-2.63:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		$(use_enable systemd)
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-
-	einfo "${PN} may run commands with escalated privileges using"
-	einfo "x11-libs/gksu."
-}
diff --git a/mate-extra/mate-system-monitor/mate-system-monitor-1.16.0.ebuild b/mate-extra/mate-system-monitor/mate-system-monitor-1.16.0.ebuild
deleted file mode 100644
index 5fb7d32fa1f6..000000000000
--- a/mate-extra/mate-system-monitor/mate-system-monitor-1.16.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="The MATE System Monitor"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="systemd"
-
-COMMON_DEPEND="
-	>=dev-cpp/glibmm-2.26:2
-	>=dev-cpp/gtkmm-3.8:3.0
-	>=dev-libs/glib-2.36:2
-	dev-libs/libsigc++:2
-	>=dev-libs/libxml2-2:2
-	>=gnome-base/libgtop-2.23.1:2=
-	>=gnome-base/librsvg-2.35:2
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.14:3
-	>=x11-libs/libwnck-3.0:3
-	virtual/libintl:0
-	systemd? ( sys-apps/systemd )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	>=sys-devel/autoconf-2.63:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		$(use_enable systemd)
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-
-	einfo "${PN} may run commands with escalated privileges using"
-	einfo "x11-libs/gksu."
-}
diff --git a/mate-extra/mate-system-monitor/metadata.xml b/mate-extra/mate-system-monitor/metadata.xml
index abf6a9f6f1df..4e0e9ce5b40f 100644
--- a/mate-extra/mate-system-monitor/metadata.xml
+++ b/mate-extra/mate-system-monitor/metadata.xml
@@ -5,9 +5,6 @@
 		<email>mate@gentoo.org</email>
 		<name>Gentoo MATE Desktop</name>
 	</maintainer>
-	<use>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/mate-system-monitor</remote-id>
 	</upstream>
diff --git a/mate-extra/mate-user-guide/Manifest b/mate-extra/mate-user-guide/Manifest
index e19fff66ecb1..17efdb9ddaca 100644
--- a/mate-extra/mate-user-guide/Manifest
+++ b/mate-extra/mate-user-guide/Manifest
@@ -1,9 +1,3 @@
-DIST mate-user-guide-1.12.0.tar.xz 8296724 BLAKE2B d6b0b1f50996cccdc25f0be519b115ca3182dce15fc61883db34b1d52c984a3e48d81054b410c6ddc5d9242f649fc71f8a94053f7bfa5323e1fff978b9c2a20b SHA512 b92a58e2104d22007bf61ca2dc71e02acd250886393a9b3ccb397a3172a1f0542a34589ea2c82f9b985af0ae3ce505012f69731d82d8412949f5ffc254356456
-DIST mate-user-guide-1.14.0.tar.xz 8375176 BLAKE2B 31b46111f8e7fcd57fdc961a18c1a60a25992dcd3f8f6df3b1aff773b6788fa447793b6a18958a9045236e1ad534e90a926ca080fd5a2b5ad2b96e657600742b SHA512 62df5ee3372d452f52d7e63f18991b68996081dad05ae04fb4902d65246aeef7fc85686b4c4145974fd5cd2db95178f156b9847003f6f0576939d0afae501e60
-DIST mate-user-guide-1.16.0.tar.xz 8377540 BLAKE2B 82bf0ff92c4e5e6e06052feb4f370433515f483e171f1e19afb6550fe08e4ab93a47c5927c6ac6ce7921e4bf8f5ded8511773c90541ed153b83507596d59b016 SHA512 90dd0af23c2532d401a52442b2837bb43329c18b4c76cf7ac67c84434e9b87fbf75050e5456f1b242755869c8540f5de3abd7a004bd400a1bf81cce66e3ccf80
 DIST mate-user-guide-1.18.0.tar.xz 8375200 BLAKE2B 2e77dbdf713a86dc5b2208de49053c99606d98fa0ca431c91b5d0ee47dc01e63be14e2b5112246baeb64f04c8df93601d1f3d2e24e6120eddac36512a4e38bcf SHA512 023b6ee04764e8a6004ac1cba69427af33be22228d475666cfacd4aa2ef4b61df4c9e269e003345a7073ef5eb7b783850e4efd5b41356052e3b69860d6df054a
-EBUILD mate-user-guide-1.12.0.ebuild 491 BLAKE2B 0f6c3ae86b57651713d3b50516dcf3fc10504aa364a8f9253ec1ec60217fe08e706758532c296e61c517055b98eebe915536b2da56bc52453f48e728212cac66 SHA512 542f80c25d9d72f767f68fc0a4d05ec2bf610c42bcff7716831fe52d818899fce9c8b563ce1ace1eaa4bee07e365cf043a4aa3e228ce2b0e2fc04f40081db2eb
-EBUILD mate-user-guide-1.14.0.ebuild 531 BLAKE2B c144c5deb0ff0317de6faa11f531b8a49f665aa2727d522782700c9d1880de83a1c1eb25300e9fb708f19779c66faee62d6cd1f4b576c70bdfa2b03f6bf82f29 SHA512 b54808782cc92f4bf19e28b9a9cefa3a5b51508441d20a63ac7807abba3ac64583256312386284b72cd3e9ff9cbb53f1bf76c45e465a059c922453492316cac6
-EBUILD mate-user-guide-1.16.0.ebuild 531 BLAKE2B c144c5deb0ff0317de6faa11f531b8a49f665aa2727d522782700c9d1880de83a1c1eb25300e9fb708f19779c66faee62d6cd1f4b576c70bdfa2b03f6bf82f29 SHA512 b54808782cc92f4bf19e28b9a9cefa3a5b51508441d20a63ac7807abba3ac64583256312386284b72cd3e9ff9cbb53f1bf76c45e465a059c922453492316cac6
 EBUILD mate-user-guide-1.18.0.ebuild 529 BLAKE2B 9fac3ae05aacc5109af2a77adbfedd73c05bb5ef956711726a1452aeaabbd2acdf2f1418edf21a4dcc32a5c698bb98aa619d41c155b9bbff39465ec4ebcf8caa SHA512 f1ebfa2e5c1258f65aa53f0c08c6dd4e86d71aa9dcc83326cb043fef717b3bbfb92c5af0aa44c04d39965d9875b0d1277c2faf381e351ae11211fb8c76e514ec
 MISC metadata.xml 344 BLAKE2B daf4b6a1920fba3efa9c5253a08edd91d26b90fe9a81bec69de4c3f21423ad9d7fd8b5ece9036c3e834900fa60b483e7c73b7572bdbbe8a31d16fc81a50aa09b SHA512 d0ce9f32a04fdae27a476a7197b067f85b1a4889ab758af1c761d2d59c6ca295a6d623db51a0296c64d3a6fb9ff9bea9577002f34020009b967d594b540440f4
diff --git a/mate-extra/mate-user-guide/mate-user-guide-1.12.0.ebuild b/mate-extra/mate-user-guide/mate-user-guide-1.12.0.ebuild
deleted file mode 100644
index 5000e6ccf896..000000000000
--- a/mate-extra/mate-user-guide/mate-user-guide-1.12.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="User documentation for MATE Desktop"
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-
-RDEPEND="
-	gnome-extra/yelp
-	virtual/libintl:0"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40:*
-	app-text/yelp-tools
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	!!mate-base/mate-desktop[user-guide]"
diff --git a/mate-extra/mate-user-guide/mate-user-guide-1.14.0.ebuild b/mate-extra/mate-user-guide/mate-user-guide-1.14.0.ebuild
deleted file mode 100644
index 183d448a57fa..000000000000
--- a/mate-extra/mate-user-guide/mate-user-guide-1.14.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="User documentation for MATE Desktop"
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-
-COMMON_DEPEND="virtual/libintl:0"
-
-RDEPEND="${COMMON_DEPEND}
-	gnome-extra/yelp"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40:*
-	app-text/yelp-tools
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	!!mate-base/mate-desktop[user-guide]"
diff --git a/mate-extra/mate-user-guide/mate-user-guide-1.16.0.ebuild b/mate-extra/mate-user-guide/mate-user-guide-1.16.0.ebuild
deleted file mode 100644
index 183d448a57fa..000000000000
--- a/mate-extra/mate-user-guide/mate-user-guide-1.16.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="User documentation for MATE Desktop"
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-
-COMMON_DEPEND="virtual/libintl:0"
-
-RDEPEND="${COMMON_DEPEND}
-	gnome-extra/yelp"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40:*
-	app-text/yelp-tools
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	!!mate-base/mate-desktop[user-guide]"
diff --git a/mate-extra/mate-user-share/Manifest b/mate-extra/mate-user-share/Manifest
index c52d24c0147b..fa0a78771d0e 100644
--- a/mate-extra/mate-user-share/Manifest
+++ b/mate-extra/mate-user-share/Manifest
@@ -1,9 +1,3 @@
-DIST mate-user-share-1.12.0.tar.xz 931776 BLAKE2B 810441690c333b5fcc77904bd39f4bbc3548fccb99852aa6a05a0c6021fec470c636fe34f1c2ecef020ed1499c55648463a40fce23a14168315838849719fdf2 SHA512 928bcfa594ba56b84bde249b71fb6315d7dd20fc46c1300edb4f9ab3296a468f1105934ba8cb351e47cef52dac5ca70bdc2f3f7d2166219ded7b7016bea23c24
-DIST mate-user-share-1.14.0.tar.xz 902728 BLAKE2B 12ca9cf01b7f91bb3e67fdcfd259dc31a4712524404507302f49a88bb2dc9ce1bb8cda480ec6172ecbc4cbe55e6111dae90298bc61a0a9bf4cd6776380b1a1e6 SHA512 a9ad934b0681d1168d7ea3b7d3120cb39f230b7267cd71a91f511f03f132a8e8022bb339fcd017c243988214a82dd337cacb65875d9e35e4c10f014f39eefbe1
-DIST mate-user-share-1.16.0.tar.xz 918148 BLAKE2B 1cb1be82876eb383eb6642ef1f562c0c7d770391524ae15529a1b06f0fa3e48c9b9b1babb7e75c4543f35798b666d8ffefee40c6a4d5ceff86486e610557841b SHA512 fe8994f288360bbecfc7055a0222f18be81b5cd74d620948c7e60365f56869c9dd25efb3262224a3b5d1071ec36419c3fde925c31038d04e60026c63d132252c
 DIST mate-user-share-1.18.0.tar.xz 919404 BLAKE2B fc81dbe17a0ed57eb7baaa385fe786d73a5d64171e51735de061c9c7fbe69f0174f984d75ae39e7b0dcd7bf5562655cf599f394ab7ed50bba520b8472da1111f SHA512 581a53efc115b3b2bac455d828bb689c79bc2a0c5bf3fb2a560ae7eb153b6a8c9589695ca540bb759498c0dc21e016f634a0aabf8e9863c42c5ae7712c91d058
-EBUILD mate-user-share-1.12.0.ebuild 1285 BLAKE2B 2e2d7e66a0a257860787fd9d0c74567953570e212513165df18fb246a08213d1863812708fcd51bc801600c8a4db5502b40fba41852a32f1386b9b6c60c42ecf SHA512 02a6d3c051446f7f35f21bd4ed50dbb8f3929c5437c8e3d2b63ba0ab2b3f30aabe246e9ccc9de7c61b32bdcc794afdc18b66cd89791e819b06c0a650cc678a5e
-EBUILD mate-user-share-1.14.0.ebuild 1327 BLAKE2B 7c340c90b854ec13a807740c085c562004bf8b0b8c5be943aba9c8f1f9c6049e06b9e2e72cf203c2440394c97c6a4555f5119c00938b6ace62381709a98cc0d5 SHA512 03a59fe9da211e02ccd092e941feecae13b67b76c5ebad354d9b2ddbd2a58245203f147c45854f3151974b1205d09d0f92f02c8dd54e893dea349d2dc0d38e34
-EBUILD mate-user-share-1.16.0.ebuild 1300 BLAKE2B 6ab388b9f76abc587bfc6e41455621601bbe24fa5483edd80a1703c912973e39a1ad2e1e58e3aeb23e78f584dbbba6692ca2b9ac41fc1b7011e8cda73f4da474 SHA512 c91304ead3f606cc24c06bbc7564b0da6837bbbc13b05237facc5bddde6a7a51b876f626070502d113d76a8c017b6a3ff250d244c69092bc8c308a91b50bfec3
 EBUILD mate-user-share-1.18.0.ebuild 1140 BLAKE2B ee04b9b2c5405d9eedea9ee634c73aacf715ac3c0c3b7708d4af6c16d95e4a3d48c86ac0f27eb6077fea2ed0b77ae2d8bb4dd4b201a7dd54b0f8aeb95ddef55e SHA512 f3c17574014123ad34e7f64920a1e120dfde11f6be19c9df648fcd44e27581f5c621bc52c486aeb735bdf29bc56e99cc1d1770134137046a64f4197963053f6f
-MISC metadata.xml 420 BLAKE2B 3a8632e2b937d861ccd8462d8ee991201d04413fb36ac12195548de039416c6210173d8e28f2b467463b2e060616133ca18d7a6a0318f134533aaa7d4ad3a0c0 SHA512 9696c73ac68c1c435e300709a7e38e3a77cc5eedbc76957cea7d01b5e3f282c3a22e1db7796911c501b8138ba981ddac590383ecbc405c98e1b7ef89743b90f4
+MISC metadata.xml 344 BLAKE2B 72c35ab850378b1f7386ba3d9da729e2855c20779d23a1a503186706bff164487c5f0d398dcc96f4056c2a670f815e2de874f89ca6ffe0c85749fb61416c9d7d SHA512 866efce9c0b0fbd2b8916c71d07b42a255bda4a2c4f269a6fe3390b9913aa148b44ad4b6f779f964e51715f2cc79dcdfe9e8096f2382b3e35f3bda38d8646001
diff --git a/mate-extra/mate-user-share/mate-user-share-1.12.0.ebuild b/mate-extra/mate-user-share/mate-user-share-1.12.0.ebuild
deleted file mode 100644
index 477b173134ba..000000000000
--- a/mate-extra/mate-user-share/mate-user-share-1.12.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate multilib
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Personal file sharing for the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X gtk3"
-
-RDEPEND="
-	>=dev-libs/dbus-glib-0.70:0
-	>=dev-libs/glib-2.15.2:2
-	>=mate-base/caja-1.6[gtk3(-)=]
-	>=sys-apps/dbus-1.1.1:0
-	>=x11-libs/gdk-pixbuf-2:2
-	x11-libs/libX11:0
-	x11-libs/pango:0
-	>=x11-libs/libnotify-0.7:0
-	>=www-apache/mod_dnssd-0.6:0
-	>=www-servers/apache-2.2:2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile]
-	virtual/libintl:0
-	!gtk3? (
-		>=dev-libs/libunique-1:1
-		media-libs/libcanberra:0[gtk]
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		>=dev-libs/libunique-3:3
-		media-libs/libcanberra:0[gtk3]
-		>=x11-libs/gtk+-3.0:3
-	)"
-
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.35:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--with-httpd=apache2 \
-		--with-modules-path=/usr/$(get_libdir)/apache2/modules/ \
-		--disable-bluetooth \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x)
-}
diff --git a/mate-extra/mate-user-share/mate-user-share-1.14.0.ebuild b/mate-extra/mate-user-share/mate-user-share-1.14.0.ebuild
deleted file mode 100644
index 88e86f04f13b..000000000000
--- a/mate-extra/mate-user-share/mate-user-share-1.14.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
-
-MATE_LA_PUNT="yes"
-
-inherit mate multilib
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Personal file sharing for the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X gtk3"
-
-COMMON_DEPEND="
-	>=dev-libs/dbus-glib-0.70:0
-	>=dev-libs/glib-2.15.2:2
-	>=mate-base/caja-1.6[gtk3(-)=]
-	>=sys-apps/dbus-1.1.1:0
-	>=x11-libs/gdk-pixbuf-2:2
-	x11-libs/libX11:0
-	x11-libs/pango:0
-	>=x11-libs/libnotify-0.7:0
-	virtual/libintl:0
-	!gtk3? (
-		>=dev-libs/libunique-1:1
-		media-libs/libcanberra:0[gtk]
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		>=dev-libs/libunique-3:3
-		media-libs/libcanberra:0[gtk3]
-		>=x11-libs/gtk+-3.0:3
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	>=www-apache/mod_dnssd-0.6:0
-	>=www-servers/apache-2.2:2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile]"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.35:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--with-httpd=apache2 \
-		--with-modules-path=/usr/$(get_libdir)/apache2/modules/ \
-		--disable-bluetooth \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x)
-}
diff --git a/mate-extra/mate-user-share/mate-user-share-1.16.0.ebuild b/mate-extra/mate-user-share/mate-user-share-1.16.0.ebuild
deleted file mode 100644
index 11f1d7fe930e..000000000000
--- a/mate-extra/mate-user-share/mate-user-share-1.16.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate multilib
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Personal file sharing for the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X gtk3"
-
-COMMON_DEPEND="
-	>=dev-libs/dbus-glib-0.70:0
-	>=dev-libs/glib-2.15.2:2
-	>=mate-base/caja-1.6[gtk3(-)=]
-	>=sys-apps/dbus-1.1.1:0
-	>=x11-libs/gdk-pixbuf-2:2
-	x11-libs/libX11:0
-	x11-libs/pango:0
-	>=x11-libs/libnotify-0.7:0
-	virtual/libintl:0
-	!gtk3? (
-		>=dev-libs/libunique-1:1
-		media-libs/libcanberra:0[gtk]
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		media-libs/libcanberra:0[gtk3]
-		>=x11-libs/gtk+-3.0:3
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	>=www-apache/mod_dnssd-0.6:0
-	>=www-servers/apache-2.2:2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile]"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.35:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--with-httpd=apache2 \
-		--with-modules-path=/usr/$(get_libdir)/apache2/modules/ \
-		--disable-bluetooth \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x)
-}
diff --git a/mate-extra/mate-user-share/metadata.xml b/mate-extra/mate-user-share/metadata.xml
index 99735b0bd1f5..e67f167e102a 100644
--- a/mate-extra/mate-user-share/metadata.xml
+++ b/mate-extra/mate-user-share/metadata.xml
@@ -5,9 +5,6 @@
 		<email>mate@gentoo.org</email>
 		<name>Gentoo MATE Desktop</name>
 	</maintainer>
-	<use>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/mate-user-share</remote-id>
 	</upstream>
diff --git a/mate-extra/mate-utils/Manifest b/mate-extra/mate-utils/Manifest
index 064bdaa4ad84..7094c69e1c3f 100644
--- a/mate-extra/mate-utils/Manifest
+++ b/mate-extra/mate-utils/Manifest
@@ -1,11 +1,3 @@
-AUX mate-utils-1.12.0-dict-gtk3.patch 1780 BLAKE2B 9f852c4531437a1868d69f7b62b7dbe0b21283fd7446262cb329f882e71297b46e62b2da3f825b61c10ad1fb116084ceb9da399b2d608b9b8f7e5e20ede84153 SHA512 758eb7b3734852553df9a7c064370241ab3c3b1ba6eaf56a28021ebd7c61b92f1b4c354d4ef05d6647d3549ca518e9c576bd478c6dbcd96bed818dc63522ad7a
-AUX mate-utils-1.12.0-include-correct-header-to-fix-occasional-ftbfs.patch 1029 BLAKE2B d8c2860cd94625d29d02286795e78b4720ac3a439ae044797383bc59acf95e36e1896431f82f2f60e38c20bf8bb58ac4c6bd27ebae38d493360d856718f5482c SHA512 55bea637bfb20995c8bcb2d346fe1a6caadc57bc1cfd2b95c521e9d4e767ae8cf55a2e1e864c28a355928b534ce59bd16be284df25f2a1910cf056128bc12353
-DIST mate-utils-1.12.0.tar.xz 6482900 BLAKE2B a9922a2cd4cb15f5d561c4e07528c265ef759f65fc306490a8f1aebbfd077ece481c6d69485c7df639611b61cbe9ab2789cccd32edc2800be36429718526acca SHA512 fe1db5c04b3adc616fdd0f76ddfb1291bbbfb6fb7d2f9ab11c5ffc33e19e0487ba3581babdfe74dd64553fd07f7d986fbac08fe2b14bcb79fca315e365069e47
-DIST mate-utils-1.14.1.tar.xz 6498448 BLAKE2B 21809b5bfe4e624c9aaafeda2f161acbd5648b237d013ba4098c8a421dcb22e474caeac5148e3b902e9f869655928a619d5282957d508856f909592944881125 SHA512 7c95fe390f83ee90405929025039ccef186ebf268f85e45a0dda0483b5de9bb67a6d3bbbe1a55315787996118c6bdf6a4fb29ad7236428eef89750c058b886e4
-DIST mate-utils-1.16.1.tar.xz 6517092 BLAKE2B 3a9fa4b12d29038872a90841eff36310aeac2834797ad8b4a1cde41c97b4c1f815546a379028ba4559c3dbaf4f6aa91102fd0b80418a0f60d9501da2b7915dbb SHA512 d902362b23b8b26377fa6741e8b96230ee224ef6dc9c4b02dc50e6bd43d87a28c266d2a1bb9c4c7be48cc43162988240257be40a4fb8b7f2569a2520f35b7aa0
 DIST mate-utils-1.18.3.tar.xz 6449580 BLAKE2B e8a892d0f924b37da82a8eb233c24b41609831d84fc706ac0082c05cfc0564ca150e6cbd350af8be48acf1e314253e4afe8123bcf4af189a344b3c51e6ccf7d2 SHA512 c9d80e037d32784b3d376aebe23abc6709e14d1df6f293f43c1fc7978f7903ac8b0fc159cebebb3d8dc471df210469b5dcc5dfebdc906ade30a2c7e8f7ca764a
-EBUILD mate-utils-1.12.0-r2.ebuild 1514 BLAKE2B 360d8ec8d842a5d3a981d183301e72007dd1d75c389e6fc0f769f563640984d554e3caa51050472fbdc2ed4fc9c8a032244e1ab8bd699a37761ee9c52856e8d8 SHA512 fb947fa1645a328fce11b9fda9dab1488ad0c96209bd11c345727ff637126a5092a39cd04b9d55b99f828cb1a0198a835ab8d4ea071cb1a5613561c8ce39e569
-EBUILD mate-utils-1.14.1.ebuild 1436 BLAKE2B 8dbf28ec89d85884404c0ff8d25af5efae640eaf38221208f6dfa73b7230230ba071b3095c91f96c9313be20b026c2335cf75f1a7fb0bb0951e5a1e09d125db1 SHA512 dfb09955c609977855dc9db6274f5f8a70acbfaa2735173097156b374390d643683387ca4262afe5b7e3f09387add300cf102da26c2bb2f910d11eb1382d7877
-EBUILD mate-utils-1.16.1.ebuild 1436 BLAKE2B 8dbf28ec89d85884404c0ff8d25af5efae640eaf38221208f6dfa73b7230230ba071b3095c91f96c9313be20b026c2335cf75f1a7fb0bb0951e5a1e09d125db1 SHA512 dfb09955c609977855dc9db6274f5f8a70acbfaa2735173097156b374390d643683387ca4262afe5b7e3f09387add300cf102da26c2bb2f910d11eb1382d7877
 EBUILD mate-utils-1.18.3.ebuild 1304 BLAKE2B 6b0593b985fa61b397dfb19647f5a4bbea3bb9c601ee702e7fa5ebf08f6a287d5a45e7ae34adba4a2c66d77f9adab1608b93cbb1cb5f7d9bac05f470843582e9 SHA512 c00b6223c110f628bb0563742ae0671c4d3a563d25f234e108b1ed23d4a07c1c8d562b7d418b3a2e9f84c29cff90d1914c343250f222aebd45e1a775e4e72450
-MISC metadata.xml 478 BLAKE2B 2ed326f51a418eb5a2b3bed542f07e97107c3e1f8e1d438b4b757bf81ef34e5762b0ededcbd7474990ac6a6b07dfa58970b05bb1da5ebe2c629a2726534afc98 SHA512 129a8bac28360c9260eca2a8db8e23aa5cef92464905b730952f0508fc8057c12929f590b1f6c2d0dfa72687a2dd63e7300fa01a2b25fb9346add99544e10db9
+MISC metadata.xml 417 BLAKE2B af181dbce0a3bd1d40160da5b7b1be3a4ba345b3d31dc8d4988a146af5318bf473ad2962e9fd63fa2bfa74e61daddb5e84dd977891dee5b3b483189321bf7b1f SHA512 4c4eeb71f1cbd778f48f19da5185d9a75444a87a7abbe5d055e032f38b9891e996af84a383d7bc67ad11113da09ad034a159ec425b106340c696fad479fecee4
diff --git a/mate-extra/mate-utils/files/mate-utils-1.12.0-dict-gtk3.patch b/mate-extra/mate-utils/files/mate-utils-1.12.0-dict-gtk3.patch
deleted file mode 100644
index dff6dbe5582f..000000000000
--- a/mate-extra/mate-utils/files/mate-utils-1.12.0-dict-gtk3.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 5ab184661ff38baca3ea2709d81932a578654392 Mon Sep 17 00:00:00 2001
-From: Kir Kolyshkin <kir@openvz.org>
-Date: Mon, 16 May 2016 14:52:28 -0700
-Subject: [PATCH] mate-dict.pc: depend upon proper gtk version
-
-If the package is built against gtk-3.0 (as in
-./configure --with-gtk=3.0), mate-dict.pc still wants gtk-2.0
-since it's hardcoded it there. This can lead to improper builds
-of packages using libmatedict (although I can't find any now),
-as well as improper RPM dependencies, like this:
-
-	$ rpm -e gtk2-devel
-	error: Failed dependencies:
-	...
-	pkgconfig(gtk+-2.0) is needed by (installed) mate-utils-devel-1.14.0-1gtk3.fc23.x86_64
-
-Fortunately, the file is already generated, so it's trivial to add
-a proper substitution.
-
-[v2: also add min GTK version required]
-
-Signed-off-by: Kir Kolyshkin <kir@openvz.org>
----
- configure.ac                             | 2 ++
- mate-dictionary/libgdict/mate-dict.pc.in | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 64aba70..39cc6f8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -89,6 +89,8 @@ case "$with_gtk" in
- 		LIBCANBERRA_GTK_REQUIRED=0.4
- 		;;
- esac
-+AC_SUBST(GTK_API_VERSION)
-+AC_SUBST(GTK_REQUIRED)
- 
- # common checks
- PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
-diff --git a/mate-dictionary/libgdict/mate-dict.pc.in b/mate-dictionary/libgdict/mate-dict.pc.in
-index e409a0c..8168de2 100644
---- a/mate-dictionary/libgdict/mate-dict.pc.in
-+++ b/mate-dictionary/libgdict/mate-dict.pc.in
-@@ -5,7 +5,7 @@ includedir=@includedir@
- 
- Name: gdict-1.0
- Description: MATE Dictionary Protocol client library
--Requires: gtk+-2.0
-+Requires: gtk+-@GTK_API_VERSION@ >= @GTK_REQUIRED@
- Version: @GDICT_VERSION@
- Libs: -L${libdir} -lmatedict
- Cflags: -I${includedir}/mate-dict
diff --git a/mate-extra/mate-utils/files/mate-utils-1.12.0-include-correct-header-to-fix-occasional-ftbfs.patch b/mate-extra/mate-utils/files/mate-utils-1.12.0-include-correct-header-to-fix-occasional-ftbfs.patch
deleted file mode 100644
index 09d201763f69..000000000000
--- a/mate-extra/mate-utils/files/mate-utils-1.12.0-include-correct-header-to-fix-occasional-ftbfs.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 550229e422cd88fe39473f41cebe6cef12f6c8fb Mon Sep 17 00:00:00 2001
-From: monsta <monsta@inbox.ru>
-Date: Tue, 14 Mar 2017 15:08:47 +0300
-Subject: [PATCH] mate-dictionary: include correct header to fix occasional
- FTBFS
-
-taken from:
-https://git.gnome.org/browse/gnome-dictionary/commit/?id=d529e2dd056f05cb1115c2f68bb6f773b4b14948
----
- mate-dictionary/libgdict/gdict-client-context.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mate-dictionary/libgdict/gdict-client-context.h b/mate-dictionary/libgdict/gdict-client-context.h
-index 2854fed..c52bbb4 100644
---- a/mate-dictionary/libgdict/gdict-client-context.h
-+++ b/mate-dictionary/libgdict/gdict-client-context.h
-@@ -20,7 +20,7 @@
- #ifndef __GDICT_CLIENT_CONTEXT_H__
- #define __GDICT_CLIENT_CONTEXT_H__
- 
--#include <glib-object.h>
-+#include "gdict-context.h"
- 
- #define GDICT_TYPE_CLIENT_CONTEXT		(gdict_client_context_get_type ())
- #define GDICT_CLIENT_CONTEXT(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GDICT_TYPE_CLIENT_CONTEXT, GdictClientContext))
diff --git a/mate-extra/mate-utils/mate-utils-1.12.0-r2.ebuild b/mate-extra/mate-utils/mate-utils-1.12.0-r2.ebuild
deleted file mode 100644
index d933999c86c2..000000000000
--- a/mate-extra/mate-utils/mate-utils-1.12.0-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=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Utilities for the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X applet debug gtk3 ipv6 test"
-
-RDEPEND="app-text/rarian:0
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=gnome-base/libgtop-2.12:2=
-	sys-libs/zlib:0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	x11-libs/libXext:0
-	x11-libs/pango:0
-	applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] )
-	!gtk3? (
-		>=x11-libs/gtk+-2.24:2
-		>=media-libs/libcanberra-0.4:0[gtk]
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3
-		>=media-libs/libcanberra-0.4:0[gtk3]
-	)"
-
-DEPEND="${RDEPEND}
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto"
-
-PATCHES=(
-	"${FILESDIR}/${P}-dict-gtk3.patch"
-	"${FILESDIR}/${P}-include-correct-header-to-fix-occasional-ftbfs.patch"
-)
-
-src_prepare() {
-	# Make apps visible in all DEs.
-	LC_ALL=C find . -iname '*.desktop.in*' -exec \
-		sed -e '/OnlyShowIn/d' -i {} + || die
-
-	mate_src_prepare
-}
-
-src_configure() {
-	mate_src_configure \
-		--disable-maintainer-flags \
-		--enable-zlib \
-		--enable-debug=$(usex debug yes minimum) \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_enable applet gdict-applet) \
-		$(use_enable ipv6)
-}
diff --git a/mate-extra/mate-utils/mate-utils-1.14.1.ebuild b/mate-extra/mate-utils/mate-utils-1.14.1.ebuild
deleted file mode 100644
index 62cb6981a096..000000000000
--- a/mate-extra/mate-utils/mate-utils-1.14.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
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Utilities for the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X applet debug gtk3 ipv6 test"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=gnome-base/libgtop-2.12:2=
-	sys-libs/zlib:0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	x11-libs/libXext:0
-	x11-libs/pango:0
-	applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] )
-	!gtk3? (
-		>=x11-libs/gtk+-2.24:2
-		>=media-libs/libcanberra-0.4:0[gtk]
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3
-		>=media-libs/libcanberra-0.4:0[gtk3]
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto"
-
-src_prepare() {
-	# Make apps visible in all DEs.
-	LC_ALL=C find . -iname '*.desktop.in*' -exec \
-		sed -e '/OnlyShowIn/d' -i {} + || die
-
-	mate_src_prepare
-}
-
-src_configure() {
-	mate_src_configure \
-		--disable-maintainer-flags \
-		--enable-zlib \
-		--enable-debug=$(usex debug yes minimum) \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_enable applet gdict-applet) \
-		$(use_enable ipv6)
-}
diff --git a/mate-extra/mate-utils/mate-utils-1.16.1.ebuild b/mate-extra/mate-utils/mate-utils-1.16.1.ebuild
deleted file mode 100644
index 62cb6981a096..000000000000
--- a/mate-extra/mate-utils/mate-utils-1.16.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
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Utilities for the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X applet debug gtk3 ipv6 test"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=gnome-base/libgtop-2.12:2=
-	sys-libs/zlib:0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	x11-libs/libXext:0
-	x11-libs/pango:0
-	applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] )
-	!gtk3? (
-		>=x11-libs/gtk+-2.24:2
-		>=media-libs/libcanberra-0.4:0[gtk]
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3
-		>=media-libs/libcanberra-0.4:0[gtk3]
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto"
-
-src_prepare() {
-	# Make apps visible in all DEs.
-	LC_ALL=C find . -iname '*.desktop.in*' -exec \
-		sed -e '/OnlyShowIn/d' -i {} + || die
-
-	mate_src_prepare
-}
-
-src_configure() {
-	mate_src_configure \
-		--disable-maintainer-flags \
-		--enable-zlib \
-		--enable-debug=$(usex debug yes minimum) \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_enable applet gdict-applet) \
-		$(use_enable ipv6)
-}
diff --git a/mate-extra/mate-utils/metadata.xml b/mate-extra/mate-utils/metadata.xml
index 516aaa5d49f8..eaae50638534 100644
--- a/mate-extra/mate-utils/metadata.xml
+++ b/mate-extra/mate-utils/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="applet">Enable the mate dictionary applet</flag>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/mate-utils</remote-id>
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 76813fae79c8..12ea92b458f3 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/infinality-ultimate-meta/Manifest b/media-fonts/infinality-ultimate-meta/Manifest
index 48be3f459060..b8972004af2a 100644
--- a/media-fonts/infinality-ultimate-meta/Manifest
+++ b/media-fonts/infinality-ultimate-meta/Manifest
@@ -1,2 +1,2 @@
-EBUILD infinality-ultimate-meta-1.ebuild 2649 BLAKE2B a9a98bf0805cbe4fd416a356c6a47cbd1ff51dbb69e0a9696b0b0d2a0c8da733b1705eb2e341884d7cb8b56d0e2ffba5daf77499d4b4f4371b9047f326c8c5a3 SHA512 1313b36ce878d3b594b31314ee08e64cd5a4eeac5c7359fa6c19881c590c5cefab682e28e277b62b7fdfe6c68f4447d8bec9ac5e6598fd51207b681f0aab4391
+EBUILD infinality-ultimate-meta-1.ebuild 2649 BLAKE2B 1de1c84c8496bf8ff6d40a785061705fe3307e8d195a4996d893628f3b420310862b5dba246f3e8ed5441aee9b68a2e5d3cb18312199a6af26590bc388dde77d SHA512 75e35eb72c9113f4f379c7314d6d05e55fef3a68ec2f1dd09210f89131e89046a11109501a7853dc59af671498483850d24d0f54c9298e2905e072f02b93be4f
 MISC metadata.xml 518 BLAKE2B 9e70f848f87be0f892ac460247c39dee68918bf382bebc70c497754979ceffabeae811c1fecfe61d075832f492683742124626fedbf50fabdb2a09df773682c1 SHA512 405d34014a1578cf3ae30ff5bf42a51cd28309ef080781d193a66082c1d6689155f0592e4663bb83ea6aaecfe9e6b2f33a0a744f7a72273d46fef0167361a08d
diff --git a/media-fonts/infinality-ultimate-meta/infinality-ultimate-meta-1.ebuild b/media-fonts/infinality-ultimate-meta/infinality-ultimate-meta-1.ebuild
index e089f832aba2..13c8306d60b2 100644
--- a/media-fonts/infinality-ultimate-meta/infinality-ultimate-meta-1.ebuild
+++ b/media-fonts/infinality-ultimate-meta/infinality-ultimate-meta-1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 DESCRIPTION="Meta package for infinality-ultimate with fonts"
-HOMEPAGE="http://bohoomil.com/"
+HOMEPAGE="https://www.gentoo.org/"
 
 LICENSE="metapackage"
 SLOT="0"
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 1cd6ea934933..cab6b84edfb3 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
index 838897c5cd58..435a73fa065a 100644
--- a/media-gfx/alembic/Manifest
+++ b/media-gfx/alembic/Manifest
@@ -1,6 +1,12 @@
+AUX alembic-1.7.9-CMakeLists-fix_lib.patch 7317 BLAKE2B 8739f5808cb8821cf8404dcbd492620bd1b0fc4ac09600f345a89b813d07e24fb305a5615a9d58b11ae36f7754a9527bf583586017d1018eff658760370f9777 SHA512 000d31ffd5c5843a33532fbf02c2410cbeb7504fd89d9133f4a91d435682572df0cee7d59f039b0e32e98c05df7685ac2a3880630cebd6782e38161a8bca4c31
+AUX alembic-1.7.9-find-pyilmbase-python-module.patch 542 BLAKE2B 448114ef30e6131229b6e789af7a231e766e2584c64eca9f4e09cd7bae8555d1c9f00b62c3e53136fa20be25530ed15019ea5f55a32ee286b925b726678092fb SHA512 4dfef7da97b1fe82b7c210ff8cfc7e664d56b7379dde0246ab18311fc28188dd59251b745644f75debaffe9e5eeff61c965ee9bcf6102ff6f50af7f9db4c8a2e
+AUX alembic-1.7.9-fix-python-import.patch 1254 BLAKE2B 091d7fa6b55508425b7017f2bc7832e798ccdf65beb885ad0db9e13e8685458696fcc05dc76477a14907799755aeaf71ca748a14452abb0747df210f549a7604 SHA512 e62bbcf20028c57c41b935e49e947f02905e390fbf0788c668b9a517813bbc259f266f9d14fc2197884d9632739eda7d412267aba44a8c7495125c2f06a184d5
+AUX alembic-1.7.9-prman.patch 822 BLAKE2B ed5faf9b8e4eb165b82a5001b129403ce0afcb00c448ce011889d8672ea0df1d666839ff0d515b86bdf01304f0605312bd317140944fc59cbd0fbadab7240655 SHA512 59060bb8b29d2c5e0e2003115e6fecc7744bc11c39419486e3743e810f85256c66af6976b5764cfce04fd87c8b715939ce382e252999ff26a3ad06df2c3550dd
 AUX alembic-CMakeLists-fix_lib.patch 4760 BLAKE2B a5365176200b40a31d274bab9ef126cb0ea380c6afeb2ec152bc5edd4c7abb0cbc514a5324ff6df6ad791b585af8cc48984e0eaaf12f1abd2629d405e39c6e18 SHA512 5ef90e477ceeddd9a1040c024e3775141d693b99361dc3d943ee6014c700b13a2ef8d83d60e53cf32611c828bd1f7b789544468fec97cc4b56963338b3fc604a
 AUX alembic-FindIlmBase-pkgconfig.patch 971 BLAKE2B 946766bceb152a1673737af5158be9f5efce812a70adfe36bf5642f150d2576f14c22670cc1bbf9027834c69ac661ca30d27f06f9fbf73f656dd883ce38a381f SHA512 4f5fa5a33c8fb4edcb3c0a5d0290a912015c0e02ecd6340e5dced1f658302034148a1050aee1dcbf3d7d89f11c5e9ea07637c659414951152dd49081c70560c7
 AUX alembic-fix-importerror.patch 662 BLAKE2B 140f80ff08522ec84a43cb5e988e7e532b2391a002e0aedbd9276d2c3ef34570bb07ec78e470eb3eadc0b9c719263030d0074dd839e37a6ea19de88f5b5cd001 SHA512 a97c3d6854cc9aabfaeaf6ac62669f1ada78edf7ded8ab9cfd7e0b7077288f16cb1537196a14d62f4cdda33ef3c65ff640ff6250a3f40e499eab72913c099efd
 DIST alembic-1.7.4.tar.gz 805503 BLAKE2B b8a8b986d0323dbe3748e1dde5436d66e08620a28852c3331ee612d43a414e381a1cdbbb63200b8f146ce94ebb0e3d0ae6f70f33575bd9ff25e9121f2cd73d1a SHA512 8e752d6d85bea3b6a53582d35a589fc40824456098d950974effe0a6a0e359fec1e056af1ea1379f7e23b7ffed2c05c7f5269fa4b64757631b7d57fb60ee98b0
+DIST alembic-1.7.9.tar.gz 813379 BLAKE2B 599edeb5ad805656755b3e150fba56182d1d60673951b0c1702b3e3e82d9499ec4fcb938303103c27f84458f61ab8de4b872eaa322380ae7713e3b4cd3831af7 SHA512 8025c20525ffbd5bdc9dd5a33ad8238e49f063d244ab9d112e7d1ddb7ee7cf9b36ceb74cb45d658ce22d3033552c89bddf6b818cf466ea46aa1a70a41fdeddb2
 EBUILD alembic-1.7.4.ebuild 2398 BLAKE2B b22d682575c1bd1a75f073d6ad82e92e39bfbd15439848ee9b00ce434a366e1fa0dac7fbb3d079a8dacc6cb088c7d21cbee887d9f1d5f1ffb3d7f65728b1fd26 SHA512 9e9d10622ccda6a79d3bd69a5d5441c9a2612ff9e4ed67c1e80e4a03e270e887860e92f355d057715f62faa8ecba7bb7f5eeeea2f98e0c8d922b90e43e57cf31
-MISC metadata.xml 1044 BLAKE2B e671e00836fe612f62c5548685c4149705e9081ac79c8df895ea37568d10f10cffe042ad3b67c9c29ffdaa3a5fa8b996dbffdffb765f7cce4bf9c792e01753ff SHA512 6adc2cae7c93307f0ed926fa9a0c666ec1484005af80e1239e6b4718d771f32defb2824715783cb906b2fec1becbf76e116fdf6610a75a1740641ecb96932d61
+EBUILD alembic-1.7.9.ebuild 3063 BLAKE2B 5d4c244b3c514a177fcb90e855911fbbc7f765a9a3bd7ecc384913f33cd9c2e08ea2818e6ed6ad2f2b0c0e1543b335994468f56462fa38b08dc692e69169a0f3 SHA512 fb52f995805883489d0359b587fcdb12316c40092d5a5647f2f6775fae9ea03a811322ff66ff00920dd1b4f2099dcfa535d85da72edec6c364a503d76eef16aa
+MISC metadata.xml 1489 BLAKE2B 436a0537ec36495d3c87ced52ed779f60646d57df10e6f04c65d7037f169f865ecc18f4fef2c5b109352427af25206a7ef5913be4e16ef5e6115015aec22fca3 SHA512 91e4fb6528e65716926ef053712f40dcb8d8de4337653edc7f562419c227c4adc4c6837d8790bfdfee2330e90d9e31185f7265b74cba21599e1e4d21b80a82f5
diff --git a/media-gfx/alembic/alembic-1.7.9.ebuild b/media-gfx/alembic/alembic-1.7.9.ebuild
new file mode 100644
index 000000000000..638b12a639b9
--- /dev/null
+++ b/media-gfx/alembic/alembic-1.7.9.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="Open framework for storing and sharing scene data"
+HOMEPAGE="https://www.alembic.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+
+SLOT="0"
+# TODO: ~x86 currently depends on new =dev-python/pyilmbase-2.3.0 which has
+# ~x86 keyword. As soon as it's updated in the tree, the keyword can be
+# added here.
+KEYWORDS="~amd64"
+IUSE="arnold +boost doc examples hdf5 maya prman python test zlib"
+
+# pyalembic python bindings need boost
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	hdf5? ( zlib )
+	python? ( boost )
+"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=media-libs/openexr-2.2.0-r2:=
+	boost? ( >=dev-libs/boost-1.65.0:=[python,${PYTHON_USEDEP}] )
+	hdf5? ( >=sci-libs/hdf5-1.8.18[zlib(+)] )
+	python? ( >=dev-python/pyilmbase-2.2.0[${PYTHON_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.11-r1 )
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-util/cmake-3.9.6
+	doc? ( >=app-doc/doxygen-1.8.13-r1 )
+"
+
+DOCS=( "ACKNOWLEDGEMENTS.txt" "FEEDBACK.txt" "NEWS.txt" "README.txt" )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-FindIlmBase-pkgconfig.patch"
+	"${FILESDIR}/${P}-CMakeLists-fix_lib.patch"
+	"${FILESDIR}/${P}-prman.patch"
+	"${FILESDIR}/${P}-fix-python-import.patch"
+	"${FILESDIR}/${P}-find-pyilmbase-python-module.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DALEMBIC_SHARED_LIBS=ON
+		# The CMakeLists.txt file needs C++11 or C++-0x if none of them
+		# is defined
+		-DALEMBIC_LIB_USES_BOOST=$(usex boost)
+		-DALEMBIC_LIB_USES_TR1=$(usex !boost)
+		-DUSE_ARNOLD=$(usex arnold)
+		-DUSE_BINARIES=ON
+		-DUSE_EXAMPLES=$(usex examples)
+		-DUSE_HDF5=$(usex hdf5)
+		-DUSE_MAYA=$(usex maya)
+		-DUSE_PRMAN=$(usex prman)
+		-DUSE_PYALEMBIC=$(usex python)
+		-DUSE_TESTS=$(usex test)
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	if use doc; then
+		doxygen -u Doxyfile || die
+		doxygen Doxyfile || die
+	fi
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	cmake-utils_src_install
+}
+
+pkg_postinst() {
+	if use arnold; then
+		einfo "NOTE: The arnold plugin is highly experimental and hasn't been"
+		einfo "tested, due to missing license. If you have trouble compiling"
+		einfo "or running it, please file a bug report for the package at"
+		einfo "Gentoo's bugzilla."
+	fi
+	if use maya; then
+		einfo "NOTE: The maya plugin is highly experimental and hasn't been"
+		einfo "tested, due to missing license. If you have trouble compiling"
+		einfo "or running it, please file a bug report for the package at"
+		einfo "Gentoo's bugzilla."
+	fi
+	if use prman; then
+		einfo "NOTE: The renderman plugin is still experimental and has not"
+		einfo "been tested much. If you have trouble running it, please file"
+		einfo "a bug report for the package at Gentoo's bugzilla."
+		einfo "If you're looking for an ebuild for renderman, you may want to"
+		einfo "try the waebbl overlay: 'eselect repository enable waebbl'"
+		einfo "followed by 'emerge renderman'"
+	fi
+}
diff --git a/media-gfx/alembic/files/alembic-1.7.9-CMakeLists-fix_lib.patch b/media-gfx/alembic/files/alembic-1.7.9-CMakeLists-fix_lib.patch
new file mode 100644
index 000000000000..06ebf60b0d67
--- /dev/null
+++ b/media-gfx/alembic/files/alembic-1.7.9-CMakeLists-fix_lib.patch
@@ -0,0 +1,189 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 298f4be..18b3ff5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -80,12 +80,12 @@ OPTION(ALEMBIC_LIB_USES_TR1
+ 
+ # Set static/dynamic build options
+ SET(LIB_TYPE STATIC)
+-SET(RUNTIME_INSTALL_DIR lib)
+-SET(LIBRARY_INSTALL_DIR lib)
+-SET(ARCHIVE_INSTALL_DIR lib)
++SET(RUNTIME_INSTALL_DIR lib${LIB_SUFFIX})
++SET(LIBRARY_INSTALL_DIR lib${LIB_SUFFIX})
++SET(ARCHIVE_INSTALL_DIR lib${LIB_SUFFIX})
+ IF (ALEMBIC_SHARED_LIBS)
+     SET(LIB_TYPE SHARED)
+-    SET(ARCHIVE_INSTALL_DIR lib)
++    SET(ARCHIVE_INSTALL_DIR lib${LIB_SUFFIX})
+     IF (WIN32)
+         ADD_DEFINITIONS(-DALEMBIC_DLL)
+     ENDIF()
+diff --git a/arnold/Procedural/CMakeLists.txt b/arnold/Procedural/CMakeLists.txt
+index 69e00da..47ccf66 100644
+--- a/arnold/Procedural/CMakeLists.txt
++++ b/arnold/Procedural/CMakeLists.txt
+@@ -60,7 +60,7 @@ TARGET_LINK_LIBRARIES( AlembicArnoldProcedural Alembic::Alembic)
+ 
+ set_target_properties(AlembicArnoldProcedural PROPERTIES
+     INSTALL_RPATH_USE_LINK_PATH TRUE
+-    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
++    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+ 
+ INSTALL ( TARGETS
+   AlembicArnoldProcedural
+diff --git a/bin/AbcConvert/CMakeLists.txt b/bin/AbcConvert/CMakeLists.txt
+index 451409c..c882971 100644
+--- a/bin/AbcConvert/CMakeLists.txt
++++ b/bin/AbcConvert/CMakeLists.txt
+@@ -38,6 +38,6 @@ TARGET_LINK_LIBRARIES(abcconvert Alembic::Alembic)
+ 
+ set_target_properties(abcconvert PROPERTIES
+     INSTALL_RPATH_USE_LINK_PATH TRUE
+-    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
++    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+ 
+ INSTALL(TARGETS abcconvert DESTINATION bin)
+diff --git a/bin/AbcDiff/CMakeLists.txt b/bin/AbcDiff/CMakeLists.txt
+index 511864a..bed92b2 100644
+--- a/bin/AbcDiff/CMakeLists.txt
++++ b/bin/AbcDiff/CMakeLists.txt
+@@ -38,6 +38,6 @@ TARGET_LINK_LIBRARIES(abcdiff Alembic::Alembic)
+ 
+ set_target_properties(abcdiff PROPERTIES
+     INSTALL_RPATH_USE_LINK_PATH TRUE
+-    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
++    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+ 
+ INSTALL(TARGETS abcdiff DESTINATION bin)
+diff --git a/bin/AbcEcho/CMakeLists.txt b/bin/AbcEcho/CMakeLists.txt
+index be5f5c1..eca449a 100644
+--- a/bin/AbcEcho/CMakeLists.txt
++++ b/bin/AbcEcho/CMakeLists.txt
+@@ -41,6 +41,6 @@ TARGET_LINK_LIBRARIES(abcechobounds Alembic::Alembic)
+ 
+ set_target_properties(abcecho abcechobounds PROPERTIES
+     INSTALL_RPATH_USE_LINK_PATH TRUE
+-    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
++    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+ 
+ INSTALL(TARGETS abcecho abcechobounds DESTINATION bin)
+diff --git a/bin/AbcLs/CMakeLists.txt b/bin/AbcLs/CMakeLists.txt
+index 815f84f..92f83c4 100644
+--- a/bin/AbcLs/CMakeLists.txt
++++ b/bin/AbcLs/CMakeLists.txt
+@@ -39,6 +39,6 @@ TARGET_LINK_LIBRARIES(abcls Alembic::Alembic)
+ 
+ set_target_properties(abcls PROPERTIES
+     INSTALL_RPATH_USE_LINK_PATH TRUE
+-    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
++    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+ 
+ INSTALL(TARGETS abcls DESTINATION bin)
+diff --git a/bin/AbcStitcher/CMakeLists.txt b/bin/AbcStitcher/CMakeLists.txt
+index a963420..a84e00b 100644
+--- a/bin/AbcStitcher/CMakeLists.txt
++++ b/bin/AbcStitcher/CMakeLists.txt
+@@ -38,6 +38,6 @@ TARGET_LINK_LIBRARIES(abcstitcher Alembic::Alembic)
+ 
+ set_target_properties(abcstitcher PROPERTIES
+     INSTALL_RPATH_USE_LINK_PATH TRUE
+-    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
++    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+ 
+ INSTALL(TARGETS abcstitcher DESTINATION bin)
+diff --git a/bin/AbcTree/CMakeLists.txt b/bin/AbcTree/CMakeLists.txt
+index b4f65f1..74225ac 100644
+--- a/bin/AbcTree/CMakeLists.txt
++++ b/bin/AbcTree/CMakeLists.txt
+@@ -38,6 +38,6 @@ TARGET_LINK_LIBRARIES(abctree Alembic::Alembic)
+ 
+ set_target_properties(abctree PROPERTIES
+     INSTALL_RPATH_USE_LINK_PATH TRUE
+-    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
++    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+ 
+ INSTALL(TARGETS abctree DESTINATION bin)
+diff --git a/lib/Alembic/CMakeLists.txt b/lib/Alembic/CMakeLists.txt
+index fb3def8..d5bbcec 100644
+--- a/lib/Alembic/CMakeLists.txt
++++ b/lib/Alembic/CMakeLists.txt
+@@ -84,7 +84,7 @@ IF ( ${ALEMBIC_LIB_USES_TR1} AND CMAKE_COMPILER_IS_GNUCXX AND
+     TARGET_LINK_LIBRARIES( Alembic atomic )
+ ENDIF()
+ 
+-SET( ALEMBIC_LIB_INSTALL_DIR lib CACHE PATH "Where to install the Alembic libs")
++SET( ALEMBIC_LIB_INSTALL_DIR lib${LIB_SUFFIX} CACHE PATH "Where to install the Alembic libs")
+ INSTALL(TARGETS Alembic
+         EXPORT AlembicTargets
+         LIBRARY DESTINATION ${ALEMBIC_LIB_INSTALL_DIR}
+@@ -117,7 +117,7 @@ EXPORT(TARGETS
+     Alembic::
+     )
+ 
+-SET(ConfigPackageLocation lib/cmake/Alembic CACHE PATH
++SET(ConfigPackageLocation lib${LIB_SUFFIX}/cmake/Alembic CACHE PATH
+     "Where to install the Alembic's cmake files")
+ 
+ INSTALL(FILES
+diff --git a/maya/AbcExport/CMakeLists.txt b/maya/AbcExport/CMakeLists.txt
+index 50d2fd2..f8bc850 100644
+--- a/maya/AbcExport/CMakeLists.txt
++++ b/maya/AbcExport/CMakeLists.txt
+@@ -77,7 +77,7 @@ TARGET_LINK_LIBRARIES(AbcExport
+ 
+ set_target_properties(AbcExport PROPERTIES
+     INSTALL_RPATH_USE_LINK_PATH TRUE
+-    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
++    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+ 
+ INSTALL(TARGETS AbcExport
+         DESTINATION ${ALEMBIC_MAYA_PLUGINS_INSTALL_DIR})
+diff --git a/maya/AbcImport/CMakeLists.txt b/maya/AbcImport/CMakeLists.txt
+index 6826183..e71e612 100644
+--- a/maya/AbcImport/CMakeLists.txt
++++ b/maya/AbcImport/CMakeLists.txt
+@@ -81,7 +81,7 @@ TARGET_LINK_LIBRARIES(AbcImport
+ 
+ set_target_properties(AbcImport PROPERTIES
+     INSTALL_RPATH_USE_LINK_PATH TRUE
+-    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
++    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+ 
+ INSTALL(TARGETS AbcImport
+         DESTINATION ${ALEMBIC_MAYA_PLUGINS_INSTALL_DIR})
+diff --git a/prman/Procedural/CMakeLists.txt b/prman/Procedural/CMakeLists.txt
+index 6b46e91..3635bcc 100644
+--- a/prman/Procedural/CMakeLists.txt
++++ b/prman/Procedural/CMakeLists.txt
+@@ -60,7 +60,7 @@ TARGET_LINK_LIBRARIES(AlembicRiProcedural Alembic::Alembic)
+ 
+ set_target_properties(AlembicRiProcedural PROPERTIES
+     INSTALL_RPATH_USE_LINK_PATH TRUE
+-    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
++    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+ 
+ INSTALL(TARGETS
+     AlembicRiProcedural
+diff --git a/python/PyAlembic/CMakeLists.txt b/python/PyAlembic/CMakeLists.txt
+index 91c45c4..c87eec6 100644
+--- a/python/PyAlembic/CMakeLists.txt
++++ b/python/PyAlembic/CMakeLists.txt
+@@ -128,7 +128,7 @@ IF (Boost_PYTHON_LIBRARY AND ALEMBIC_PYTHON_LIBRARY)
+     )
+ 
+     SET( ALEMBIC_PYTHON_INSTALL_DIR
+-        lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
++        lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
+         CACHE PATH
+         "Alembic's python bindings install directory"
+     )
+@@ -143,7 +143,7 @@ IF (Boost_PYTHON_LIBRARY AND ALEMBIC_PYTHON_LIBRARY)
+ 
+     set_target_properties(alembic PROPERTIES
+         INSTALL_RPATH_USE_LINK_PATH TRUE
+-        INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
++        INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+ ELSE()
+     MESSAGE(FATAL_ERROR "Unable to find Python libs")
+ ENDIF()
diff --git a/media-gfx/alembic/files/alembic-1.7.9-find-pyilmbase-python-module.patch b/media-gfx/alembic/files/alembic-1.7.9-find-pyilmbase-python-module.patch
new file mode 100644
index 000000000000..4acdc5d7d885
--- /dev/null
+++ b/media-gfx/alembic/files/alembic-1.7.9-find-pyilmbase-python-module.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/Modules/FindPyIlmBase.cmake b/cmake/Modules/FindPyIlmBase.cmake
+index 5cb9108..c3f80a2 100644
+--- a/cmake/Modules/FindPyIlmBase.cmake
++++ b/cmake/Modules/FindPyIlmBase.cmake
+@@ -44,7 +44,7 @@ ELSE()
+               SET(ALEMBIC_PYILMBASE_ROOT NOTFOUND)
+             ELSE()
+               # TODO: set to default install path when shipping out
+-              SET(ALEMBIC_PYILMBASE_ROOT "/usr/local/pyilmbase/")
++              SET(ALEMBIC_PYILMBASE_ROOT "/usr")
+             ENDIF()
+         ELSE()
+             IF (${WINDOWS})
diff --git a/media-gfx/alembic/files/alembic-1.7.9-fix-python-import.patch b/media-gfx/alembic/files/alembic-1.7.9-fix-python-import.patch
new file mode 100644
index 000000000000..ca8bedef57ac
--- /dev/null
+++ b/media-gfx/alembic/files/alembic-1.7.9-fix-python-import.patch
@@ -0,0 +1,30 @@
+diff --git a/cmake/Modules/FindPyIlmBase.cmake b/cmake/Modules/FindPyIlmBase.cmake
+index c677549..5cb9108 100644
+--- a/cmake/Modules/FindPyIlmBase.cmake
++++ b/cmake/Modules/FindPyIlmBase.cmake
+@@ -60,11 +60,11 @@ ELSE()
+ 
+     SET(LIBRARY_PATHS
+         ${ALEMBIC_PYILMBASE_ROOT}/lib
+-        ${ALEMBIC_PYILMBASE_MODULE_DIRECTORY}
++#        ${ALEMBIC_PYILMBASE_MODULE_DIRECTORY} # this is defined nowhere
+         ~/Library/Frameworks
+         /Library/Frameworks
+-        /usr/local/lib
+-        /usr/lib
++        /usr/local/lib${LIB_SUFFIX}
++        /usr/lib${LIB_SUFFIX}
+         /sw/lib
+         /opt/local/lib
+         /opt/csw/lib
+@@ -118,8 +118,8 @@ ELSE()
+     FIND_PATH(ALEMBIC_PYIMATH_MODULE_DIRECTORY imathmodule.so
+         PATHS
+         ${LIBRARY_PATHS}
+-        /usr/local/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
+-        ${ALEMBIC_PYILMBASE_ROOT}/lib64/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
++        /usr/local/lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
++        ${ALEMBIC_PYILMBASE_ROOT}/lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
+         DOC "The imathmodule.so module directory"
+     )
+ 
diff --git a/media-gfx/alembic/files/alembic-1.7.9-prman.patch b/media-gfx/alembic/files/alembic-1.7.9-prman.patch
new file mode 100644
index 000000000000..cfd299c79bb0
--- /dev/null
+++ b/media-gfx/alembic/files/alembic-1.7.9-prman.patch
@@ -0,0 +1,26 @@
+diff --git a/cmake/AlembicPRMan.cmake b/cmake/AlembicPRMan.cmake
+index e02b237..fdbf26c 100644
+--- a/cmake/AlembicPRMan.cmake
++++ b/cmake/AlembicPRMan.cmake
+@@ -66,8 +66,8 @@ ELSE()
+ ENDIF()
+ 
+ # Prefer PRMAN_ROOT set from the environment over the CMakeCache'd variable
+-IF(NOT $ENV{PRMAN_ROOT}x STREQUAL "x")
+-  SET( ALEMBIC_PRMAN_ROOT $ENV{PRMAN_ROOT})
++IF(NOT $ENV{RMANTREE}x STREQUAL "x")
++  SET( ALEMBIC_PRMAN_ROOT $ENV{RMANTREE})
+ ENDIF()
+ 
+ 
+diff --git a/prman/Procedural/CMakeLists.txt b/prman/Procedural/CMakeLists.txt
+index 6b46e91..0cb2aa6 100644
+--- a/prman/Procedural/CMakeLists.txt
++++ b/prman/Procedural/CMakeLists.txt
+@@ -65,5 +65,5 @@ set_target_properties(AlembicRiProcedural PROPERTIES
+ INSTALL(TARGETS
+     AlembicRiProcedural
+     DESTINATION
+-    prman/procedurals
++    $ENV{RMANTREE}/lib/plugins
+ )
diff --git a/media-gfx/alembic/metadata.xml b/media-gfx/alembic/metadata.xml
index 3d75399517fe..30e01e315c7e 100644
--- a/media-gfx/alembic/metadata.xml
+++ b/media-gfx/alembic/metadata.xml
@@ -14,9 +14,25 @@
 	developed by Sony Pictures Imageworks Inc. and Lucasfilm Ltd.
 </longdescription>
 <use>
+	<flag name="arnold">
+		Add support for arnold renderer (experimental)
+	</flag>
 	<flag name="boost">Use <pkg>dev-libs/boost</pkg> library</flag>
+	<flag name="examples">Install alembic examples</flag>
 	<flag name="hdf5">Add support <pkg>sci-libs/hdf5</pkg></flag>
-	<flag name="pyalembic">Build pyalembic python bindings (needs <pkg>dev-python/pyilmbase</pkg>)</flag>
+	<flag name="maya">
+		Compile Alembic plugin for Maya (experimental)
+	</flag>
+	<flag name="prman">
+		Compile Alembic plugin for Renderman (experimental)
+	</flag>
+	<flag name="pyalembic">
+		<!-- renamed to python in 1.7.9 -->
+		Build pyalembic python bindings (needs <pkg>dev-python/pyilmbase</pkg>)
+	</flag>
+	<flag name="python">
+		Build pyalembic python bindings (needs <pkg>dev-python/pyilmbase</pkg>)
+	</flag>
 	<flag name="test">Build and run the test-suite</flag>
 	<flag name="zlib">Use <pkg>sys-libs/zlib</pkg> for compressions</flag>
 </use>
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 2710acfcaecf..5d407ee0ea92 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,3 +1,3 @@
 DIST digikam-5.9.0.tar.xz 132931184 BLAKE2B cfbcbae8471c9c00bdf846d13bbc1ce3fbbd2ee4cc86500d011f9e15c1a21d7799638f94708794e8bc36a200df455667f9df8fcefdc38aaa00060630807d11cb SHA512 f6134a957dcd11343e34f0bc90f5560a28ed205c47d2ffd76a5418a4c63f76706045e9179c47f1448304b59081051b524f7a6847c3c1dcee4673047ce5d90e63
-EBUILD digikam-5.9.0.ebuild 4761 BLAKE2B c7ed6da8ce64cc0a08329720c9c7b45c6073deaf624611b060f341908afde553e43d581ea1fb4f3276ee0d8240549aebc6a87380f4951c3797fde070ff28e2d0 SHA512 149d691956d8de7db93550ae7da157fd4a3c495d36df17205522105504203906fa224f4b5a28857e23dd805f4eac64fbe6be7331ad6e230e5f34e2596b980a8b
+EBUILD digikam-5.9.0.ebuild 4758 BLAKE2B 89cb7574f20f3cd08697386b6a0cc25a6bec270062a23d68afe1148c631980f8fe9cde76d5ebf9fc129eafba06dc96c25d92614e3422abc5140d7a0f2364f576 SHA512 f758f3dfb93c15721d27cb6242779a358dbe86b976d84fb5fe7796c959d757dfc9efedecfb344df17eaf0869d5fbab1169d1bcf34cf45c68e8422caf48ccaa6c
 MISC metadata.xml 962 BLAKE2B 918fd2665df0b74bfcac369d306bd8989723db59dd436085ba7ad24e640401b8f39d2005674c4ef85c1875d2b31c9603af9b8ee7465b11f94b09ba9c93a6d9f2 SHA512 c8998f630fca57844cb258b42d6d557c7a6c65f8b0b90caf44225b62827e24eeaaa6defdf1334c7b7c80a1132aac96e178fe3b18ab59035534b605aed4665bab
diff --git a/media-gfx/digikam/digikam-5.9.0.ebuild b/media-gfx/digikam/digikam-5.9.0.ebuild
index 5f2a02c25f95..75e3928b82c8 100644
--- a/media-gfx/digikam/digikam-5.9.0.ebuild
+++ b/media-gfx/digikam/digikam-5.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
@@ -74,7 +74,6 @@ COMMON_DEPEND="
 		$(add_qt_dep qtnetwork)
 	)
 	mediaplayer? ( media-libs/qtav[opengl] )
-	mysql? ( virtual/mysql[server] )
 	opengl? (
 		$(add_qt_dep qtopengl)
 		virtual/opengl
@@ -98,6 +97,7 @@ DEPEND="${COMMON_DEPEND}
 "
 RDEPEND="${COMMON_DEPEND}
 	media-plugins/kipi-plugins:5
+	mysql? ( virtual/mysql[server] )
 	panorama? ( media-gfx/hugin )
 	!media-gfx/digikam:4
 "
diff --git a/media-gfx/eom/Manifest b/media-gfx/eom/Manifest
index 99589c7dc721..1f060a64de72 100644
--- a/media-gfx/eom/Manifest
+++ b/media-gfx/eom/Manifest
@@ -1,10 +1,3 @@
-AUX eom-1.12.2-gtk3-svg.patch 1329 BLAKE2B 4f4660aae9a5376beedd68f7f18738e25fcc4b61704d1efee18680563ee60074dd940db579d7ab3a18e8d66a81f858337265f9db8c57906cc2fcf4971eba181e SHA512 9b9d437a9867ff131c3fbfcff03fa2a85cf1d4d5004f178cc7081ee0dc721e558e98dcb6b977c05cc577985e51623cf9b3d6f2e9d886944645d26ed087448984
-DIST eom-1.12.2.tar.xz 2213260 BLAKE2B f05264c5b0a5185d1bda8a27e140910e8a1bcf23104a20ff9af78052b9b0a513da50e797ac90da7973dab7d868d10f72098c3ac13f22d369b4c2561a981def69 SHA512 03283cb1cae817c7c21219913fe2f3ab64e0fa6662a63193d4fa012bd0b5c286cbd25131a5bd5e52c1d9304b4b10ae8c37d38a88ea985215c5b277303d7b8cc4
-DIST eom-1.14.2.tar.xz 2254180 BLAKE2B 4ee974fa38fb10ae6984bf32bdbe428e6eefd6b9871fb7bc93df809659d3faaff76ef8afe9c0581bb8f34da64a2b58fdbf4a12d520524fde6c94e6387d3e4e06 SHA512 87d7c5e62249d598474324f24bac1f5f3388bb11517fc54531792fc0291ef42199f3339e492dfc1a1caafed575cf3b21e36ea91f15d0a03b8e912a3d16e5f3b7
-DIST eom-1.16.1.tar.xz 2215676 BLAKE2B 78ac0049c36008ae56fe4d59b908728b49925a1e678ad6b61dcc4dcf450633bc56279bc04d9f64c2631f9a78c957a0f51ab385cdb770b48d3c5dad6ab38f2e01 SHA512 6154f8423eb825fea3cba975e15ac46bd9c46c139966c02365c1fe5d0a0144c4a4bffc80801eddd41506ae0ef86909ca8acb1591f39260aedb6cbb0db9335b4f
 DIST eom-1.18.3.tar.xz 2198324 BLAKE2B efdee3c56fec54342184ae75f7ecb3ebda0227ab0586b2cfcd8c1b793e1b9ae2fdea79202c8b3e0bcb45d9cd5c0eaf6ad51d59b5508126d9160806bf4b7c8239 SHA512 64244d5f8c354c53e479027f38c359e38c1dba3cc937440e1af6e4a05f54fc4a65327311998575b90055b5e65bd0dc24dae81e40e0f82b99b3e41c44685d5188
-EBUILD eom-1.12.2-r3.ebuild 1897 BLAKE2B acdf2fa81bae0814e7f9891810b146b58f77a959ae5fab53349868499d58c971c3af040fae0e49500a47253f65638d10beecd11fc84885eec1059f6da357356b SHA512 41e360632bd653ef941714e45bca87f8ff940729070ab1a31046f87726e92ba2c73b71eb092ffc258f7674a3cf420c0bad5726442d35fbd49fbaf354f067e795
-EBUILD eom-1.14.2.ebuild 1892 BLAKE2B 0298f92977d6368dfe624a78cbde84291db5a7f06774f2935b60ed33432dd06ab996661d8fdcc88525b2027d21627c4c7e9f46e30e8d857b1725a8147de4c4d6 SHA512 4d7e22033498bff1cad886de6d850977e913dce452f46d71c580c263103bb66cca9f4ee6ff3331d9b68e294fd52978bbda39df583be7472072957c0db4f56955
-EBUILD eom-1.16.1.ebuild 1892 BLAKE2B ce4075caa97a575077a77657abc68539a5e6076f04dda697cec172dd168bc564698f9853aa88a09175ea238a9ee40107074136d4b56e38dc26d505996ca59759 SHA512 88eb94a745dc8bf09867dbd0671dfb89a931d274a2eb9c95d900b6a7c25d3a79a4afef4c066e18bed09609969d6e1b1f72b2dbd86d6d83fcda1542f57129d713
 EBUILD eom-1.18.3.ebuild 1478 BLAKE2B 648972bae8be6e4e4b564569d2abd953f8bfd5fdf82e1509f89787a7234afb3815067796d9f6fd1a310a5b2b6dd127708476625c01a59748261890b6a9c5648d SHA512 0f9daa87cd84f89ddb0175de079f29acc000161abb2eec166f68a004e1083240e6a791df58099f29532ef1bfd72eed5013190e58402b4a6fefdf6c0e9f5f81ce
-MISC metadata.xml 408 BLAKE2B 3aa045b7f75c60605aead480120e080ce799255190b0ffddb3a204b9fdaad92451bd42717fa70232056dc073a29fca96c96b01cdce2125f9e357c06aaf874880 SHA512 948981426d592856f20cfcf6cfc8d0505acc76144ca32211ed1a5c9d6106aa71e2d7987c1a0ab6373903b5a413da6e22f5fd9d10894bc89eefbac12d48cd7b30
+MISC metadata.xml 332 BLAKE2B f99f5d545ed10be2869ef90b4b80eeb7a8ffbdc291f5808a121842d7f6faa1de8ebd0b2cbe13db7ae04b6073387a29dcf78fa90dc6ef3b31cab07551f7c02f5d SHA512 e915e0cb254f2e1a431eccd93b45be28d85b33f0d988508031dea48a87be182a54cea01fcffecc202c029b0b6156860471841ed871e00c929fde1fb0dceb4317
diff --git a/media-gfx/eom/eom-1.12.2-r3.ebuild b/media-gfx/eom/eom-1.12.2-r3.ebuild
deleted file mode 100644
index fb8419a9fd39..000000000000
--- a/media-gfx/eom/eom-1.12.2-r3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate python-single-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="The MATE image viewer"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X debug dbus exif gtk3 +introspection jpeg lcms python svg tiff xmp"
-
-REQUIRED_USE="
-	gtk3? ( !python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	"
-
-RDEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2:2
-	gnome-base/dconf:0
-	>=mate-base/mate-desktop-1.9.1[gtk3(-)=]
-	sys-libs/zlib:0
-	x11-libs/cairo:0
-	>=x11-libs/gdk-pixbuf-2.4:2[introspection?,jpeg?,tiff?]
-	x11-libs/libX11:0
-	>=x11-misc/shared-mime-info-0.20:0
-	virtual/libintl:0
-	dbus? ( >=dev-libs/dbus-glib-0.71:0 )
-	exif? (
-		>=media-libs/libexif-0.6.14:0
-		virtual/jpeg:0
-	)
-	!gtk3? ( >=x11-libs/gtk+-2.18:2[introspection?] )
-	gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-2.15.1:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.13:2[${PYTHON_USEDEP}]
-	)
-	svg? ( >=gnome-base/librsvg-2.36.2:2 )
-	xmp? ( >=media-libs/exempi-1.99.5:2 )
-	!!media-gfx/mate-image-viewer"
-
-DEPEND="${RDEPEND}
-	app-text/yelp-tools:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PATCHES=( "${FILESDIR}/${P}-gtk3-svg.patch" )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable debug) \
-		$(use_enable introspection) \
-		$(use_enable python) \
-		$(use_with X x) \
-		$(use_with dbus) \
-		$(use_with exif libexif) \
-		$(use_with jpeg libjpeg) \
-		$(use_with lcms cms) \
-		$(use_with svg librsvg) \
-		$(use_with xmp)
-}
diff --git a/media-gfx/eom/eom-1.14.2.ebuild b/media-gfx/eom/eom-1.14.2.ebuild
deleted file mode 100644
index 293481bdcc77..000000000000
--- a/media-gfx/eom/eom-1.14.2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate python-single-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="The MATE image viewer"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X debug dbus exif gtk3 +introspection jpeg lcms python svg tiff xmp"
-
-REQUIRED_USE="
-	gtk3? ( !python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2:2
-	gnome-base/dconf:0
-	>=mate-base/mate-desktop-1.9.1[gtk3(-)=]
-	sys-libs/zlib:0
-	x11-libs/cairo:0
-	>=x11-libs/gdk-pixbuf-2.4:2[introspection?,jpeg?,tiff?]
-	x11-libs/libX11:0
-	>=x11-misc/shared-mime-info-0.20:0
-	virtual/libintl:0
-	dbus? ( >=dev-libs/dbus-glib-0.71:0 )
-	exif? (
-		>=media-libs/libexif-0.6.14:0
-		virtual/jpeg:0
-	)
-	!gtk3? ( >=x11-libs/gtk+-2.18:2[introspection?] )
-	gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-2.15.1:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.13:2[${PYTHON_USEDEP}]
-	)
-	svg? ( >=gnome-base/librsvg-2.36.2:2 )
-	xmp? ( >=media-libs/exempi-1.99.5:2 )
-	!!media-gfx/mate-image-viewer"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable debug) \
-		$(use_enable introspection) \
-		$(use_enable python) \
-		$(use_with X x) \
-		$(use_with dbus) \
-		$(use_with exif libexif) \
-		$(use_with jpeg libjpeg) \
-		$(use_with lcms cms) \
-		$(use_with svg librsvg) \
-		$(use_with xmp)
-}
diff --git a/media-gfx/eom/eom-1.16.1.ebuild b/media-gfx/eom/eom-1.16.1.ebuild
deleted file mode 100644
index 1bf8859a0972..000000000000
--- a/media-gfx/eom/eom-1.16.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 mate python-single-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="The MATE image viewer"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X debug dbus exif gtk3 +introspection jpeg lcms python svg tiff xmp"
-
-REQUIRED_USE="
-	gtk3? ( !python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2:2
-	gnome-base/dconf:0
-	>=mate-base/mate-desktop-1.9.1[gtk3(-)=]
-	sys-libs/zlib:0
-	x11-libs/cairo:0
-	>=x11-libs/gdk-pixbuf-2.4:2[introspection?,jpeg?,tiff?]
-	x11-libs/libX11:0
-	>=x11-misc/shared-mime-info-0.20:0
-	virtual/libintl:0
-	dbus? ( >=dev-libs/dbus-glib-0.71:0 )
-	exif? (
-		>=media-libs/libexif-0.6.14:0
-		virtual/jpeg:0
-	)
-	!gtk3? ( >=x11-libs/gtk+-2.18:2[introspection?] )
-	gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-2.15.1:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.13:2[${PYTHON_USEDEP}]
-	)
-	svg? ( >=gnome-base/librsvg-2.36.2:2 )
-	xmp? ( >=media-libs/exempi-1.99.5:2 )
-	!!media-gfx/mate-image-viewer"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable debug) \
-		$(use_enable introspection) \
-		$(use_enable python) \
-		$(use_with X x) \
-		$(use_with dbus) \
-		$(use_with exif libexif) \
-		$(use_with jpeg libjpeg) \
-		$(use_with lcms cms) \
-		$(use_with svg librsvg) \
-		$(use_with xmp)
-}
diff --git a/media-gfx/eom/files/eom-1.12.2-gtk3-svg.patch b/media-gfx/eom/files/eom-1.12.2-gtk3-svg.patch
deleted file mode 100644
index ccff8ae923a9..000000000000
--- a/media-gfx/eom/files/eom-1.12.2-gtk3-svg.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 038530ed2e9b844f75e2af24e44e0421ad1ccdc8 Mon Sep 17 00:00:00 2001
-From: monsta <monsta@inbox.ru>
-Date: Wed, 24 Feb 2016 16:47:08 +0300
-Subject: [PATCH] fix svg rendering that's broken with GTK+3
-
-from
-https://git.gnome.org/browse/eog/commit/?id=a33950c14d7b8da8e1c6289709022affb910be2a
----
- src/eom-scroll-view.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/eom-scroll-view.c b/src/eom-scroll-view.c
-index 6385f29..6d1b290 100644
---- a/src/eom-scroll-view.c
-+++ b/src/eom-scroll-view.c
-@@ -1306,7 +1306,7 @@ display_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer data)
- 
- #ifdef HAVE_RSVG
- 	if (eom_image_is_svg (view->priv->image)) {
--		cairo_matrix_t matrix, translate, scale;
-+		cairo_matrix_t matrix, translate, scale, original;
- 		EomTransform *transform = eom_image_get_transform (priv->image);
- 		cairo_matrix_init_identity (&matrix);
- 		if (transform) {
-@@ -1343,6 +1343,8 @@ display_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer data)
- 		cairo_matrix_init_translate (&translate, xofs, yofs);
- 		cairo_matrix_multiply (&matrix, &matrix, &translate);
- 
-+		cairo_get_matrix (cr, &original);
-+		cairo_matrix_multiply (&matrix, &matrix, &original);
- 		cairo_set_matrix (cr, &matrix);
- 
- 		rsvg_handle_render_cairo (eom_image_get_svg (priv->image), cr);
diff --git a/media-gfx/eom/metadata.xml b/media-gfx/eom/metadata.xml
index 90e9ee97331c..10a0fa992482 100644
--- a/media-gfx/eom/metadata.xml
+++ b/media-gfx/eom/metadata.xml
@@ -5,9 +5,6 @@
 		<email>mate@gentoo.org</email>
 		<name>Gentoo MATE Desktop</name>
 	</maintainer>
-	<use>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/eom</remote-id>
 	</upstream>
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 82dbc1f7e402..da0e74ac925e 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -4,9 +4,7 @@ AUX exiv2-0.26_p20180319-CVE-2017-18005.patch 17451 BLAKE2B 8003fa352503d287f5f9
 AUX exiv2-0.26_p20180319-CVE-2018-4868.patch 1694 BLAKE2B c288075acac8c2335da2b04cac24ac7b3a414e05d04a1e951cdbd3d90997756fa5c1dae5d2b193583e529a7eacc0cbb88d5c8345c3be76798d1897af7a7f250d SHA512 7506ccc0914dc78e369129efb0736638ee7a4ebf98d76feed0ce6a7c9d2885f5f7c984376df288f0694ec05654b89c39be42a989bcedd64d0fcecd6c605fe601
 AUX exiv2-0.26_p20180319-clang-fix.patch 1793 BLAKE2B 7312324ed80314e28dfdf4066247d64db89928cdf09b186b200efc071d5dd6630e3a22d7ed10f312ccbcace291f6e3a17fdce8bd42d4e094e6c07d85ee42d45b SHA512 54c96c831aabfaca93bfb2fee4b13a080be6bbad4b634890d26e42c6a069571277f75bbc517c0e212e99fc12add77d12fbaa0652e2a1506ac94e2e8c043901ed
 DIST exiv2-0.26_p20180319.tar.gz 28383543 BLAKE2B 753a2ebdb2033490c0f66cb1fb2574f02125f17813f6cbaf5eca66e053af9a2cdbc1266f0a033f0706ec22b31acd6e87271e426a335a58ee947757b52d283489 SHA512 852ce2cffcc0a2d902a939933127fdf5fa0b50020e1faf3ab0a375b129b9f61c7b97b76d4f39e376e7288d7cc045867bd1a96ae15dd0b7c0bcd1ba15259628e1
-DIST exiv2-0.26_p20180811c.tar.xz 1723668 BLAKE2B 0bbba3d04ca063f62797ce5bd9a1a39f87c5ed26ed9eecb73fb11051660c761d2c56dec392d73d3a33573599efa95790d84d59b3c4da3122a1eb564f5978ef65 SHA512 4a7bc11805e204b541819f434defc48ff579b2c84c9504d6c7826a3808f73cda3d68f357a179f14a8277e6a338c3bb94c9e63da9f61a5ea3c548e0ad93df56ce
 DIST exiv2-0.26_p20180811d.tar.xz 1722216 BLAKE2B 9e1c8307eb923c340894c82c37e9f6c31d82ff1b1de3c79d4ec9b0ec9428ad1d05f945e9a4e440028335857e7fc32d50cdc5245842d743e017037bd641b654db SHA512 5453650888440028acb139a02b387eab0232551c97256ce88dd626fa4cc8800ec02ad66e093c314bbfdc60726995b6c8482572d1ffaec73a265209c98c901780
 EBUILD exiv2-0.26_p20180319.ebuild 3321 BLAKE2B 5a4bfe2aa47b7793ae10a39f428422c4aeed62805ab9b7f0c26a0af2c682968941ff9910c5d12eaf50093df593198e0b9bf8f22b194777ce3c79117b390cce81 SHA512 c4a200f82432e06727aef721384a994953ce3adadcfd315ad765927e75ec9f4422c31b98f6b7bd3c9660b31edd551a2c675f90d57d04491441ffb1524171422e
-EBUILD exiv2-0.26_p20180811-r2.ebuild 2965 BLAKE2B 1db92fecf0e2be08f6c4219dc886735f26e3de9883f022a7f617dcee673ea07d3de323f558130b2da6f3180f7fa7455fa47344034ecc20924c78f8a64fbd9b92 SHA512 6086fc058ecb086b31b5a9f178af906c778e371852782f4300c0e4b543e35557792aa8229120882e1401e31c32352bf27855a1f7c822396321ba6aecded8922a
-EBUILD exiv2-0.26_p20180811-r3.ebuild 2961 BLAKE2B 7ac5441be6b96e7ff9191c2f5b7c953d2e381241cd8e05af07a7c558fb8fbd80801ee49fcfd4ff84afcfa071105f137421ef3dba58a57cbd9d931860be80be44 SHA512 54b789d32aeba8b9cbc7f9ed0e78434ec1ea13f937292bce62f8d887baf1b368dc42b3c454bb52705650760a9a4d02f5f0c34b0b2ab4ee220e0ef0b537ac039c
+EBUILD exiv2-0.26_p20180811-r3.ebuild 2958 BLAKE2B e575cfe4350b3da0c49b483c79b710033284c856e94b4d08224676e42f0f49d91e3c18f2c44cd4694a802f415b58f31821ee9cd48499247ed9019ae7ac7b2734 SHA512 1a6c1f9c26671c9ce187b1bbe174900382ed185bced5d4fd123308c1eddb7707632a3282328e48ccc50e3f9b2350a9ff34ef025e17f6563714ecb135da2ba17f
 MISC metadata.xml 612 BLAKE2B f98a074e9e3a4411baf8255cd8cab5be4257469463634218b664bb9e7f159c98615f0721bb4463c6183cecc8b2be00c34a031e7b99d745b9807634cbaab8d479 SHA512 9b4926ba8420a125dc4cefd351ee1ec10a4df2fc4306a56720f6e8de7c5fd9f36a8646c8583958fca9a45ebe1b65b19c053c7da37176546bc19ae64afa87e4f5
diff --git a/media-gfx/exiv2/exiv2-0.26_p20180811-r2.ebuild b/media-gfx/exiv2/exiv2-0.26_p20180811-r2.ebuild
deleted file mode 100644
index ec7d78e78566..000000000000
--- a/media-gfx/exiv2/exiv2-0.26_p20180811-r2.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} )
-inherit cmake-multilib python-any-r1
-
-DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
-HOMEPAGE="http://www.exiv2.org/"
-SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}c.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/26"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="doc examples nls png webready xmp"
-
-RDEPEND="
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
-	png? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	webready? (
-		net-libs/libssh[${MULTILIB_USEDEP}]
-		net-misc/curl[${MULTILIB_USEDEP}]
-	)
-	xmp? ( >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	doc? (
-		${PYTHON_DEPS}
-		app-doc/doxygen
-		dev-libs/libxslt
-		media-gfx/graphviz
-		virtual/pkgconfig
-	)
-	nls? ( sys-devel/gettext )
-"
-
-DOCS=( README doc/ChangeLog doc/cmd.txt )
-
-PATCHES=(
-	# TODO: Take to upstream
-	"${FILESDIR}"/${PN}-0.26-fix-docs.patch
-	"${FILESDIR}"/${PN}-0.26-tools-optional.patch
-)
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} != *9999 ]] ; then
-		if [[ -d po ]] ; then
-			pushd po > /dev/null || die
-			local lang
-			for lang in *.po; do
-				if [[ -e ${lang} ]] \
-						&& ! has ${lang/.po/} ${LINGUAS-${lang/.po/}} ; then
-					case ${lang} in
-						CMakeLists.txt | \
-						${PN}.pot)      ;;
-						*) rm -r ${lang} || die ;;
-					esac
-				fi
-			done
-			popd > /dev/null || die
-		else
-			die "Failed to prepare LINGUAS - po directory moved?"
-		fi
-	fi
-
-	# FIXME @upstream:
-	einfo "Converting doc/cmd.txt to UTF-8"
-	iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die
-	mv -f doc/cmd.txt.tmp doc/cmd.txt || die
-
-	if use doc; then
-		einfo "Updating doxygen config"
-		doxygen &>/dev/null -u config/Doxyfile || die
-	fi
-
-	edos2unix samples/exiv2json.cpp # workaround for CVE-2017-18005 patch
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DEXIV2_ENABLE_BUILD_SAMPLES=NO
-		-DEXIV2_ENABLE_BUILD_PO=$(usex nls)
-		-DEXIV2_ENABLE_NLS=$(usex nls)
-		-DEXIV2_ENABLE_PNG=$(usex png)
-		-DEXIV2_ENABLE_CURL=$(usex webready)
-		-DEXIV2_ENABLE_SSH=$(usex webready)
-		-DEXIV2_ENABLE_WEBREADY=$(usex webready)
-		-DEXIV2_ENABLE_XMP=$(usex xmp)
-		-DEXIV2_ENABLE_LIBXMP=NO
-		$(multilib_is_native_abi || echo -DEXIV2_ENABLE_TOOLS=NO)
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-
-	if multilib_is_native_abi; then
-		use doc && emake -j1 doc
-	fi
-}
-
-multilib_src_install_all() {
-	use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} )
-	use doc && HTML_DOCS=( "${S}"/doc/html/. )
-
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-
-	if use examples; then
-		docinto examples
-		dodoc samples/*.cpp
-	fi
-}
diff --git a/media-gfx/exiv2/exiv2-0.26_p20180811-r3.ebuild b/media-gfx/exiv2/exiv2-0.26_p20180811-r3.ebuild
index abb5993997d6..589539b78afd 100644
--- a/media-gfx/exiv2/exiv2-0.26_p20180811-r3.ebuild
+++ b/media-gfx/exiv2/exiv2-0.26_p20180811-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}d.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/26"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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 ~x64-solaris ~x86-solaris"
 IUSE="doc examples nls png webready xmp"
 
 RDEPEND="
diff --git a/media-gfx/fotowall/Manifest b/media-gfx/fotowall/Manifest
index bfa36f23129e..c75baad5cfb1 100644
--- a/media-gfx/fotowall/Manifest
+++ b/media-gfx/fotowall/Manifest
@@ -1,3 +1,4 @@
+AUX fotowall-1.0-qt-5.11.patch 585 BLAKE2B a630a7bc8b152eb342e96e94febb980852f4f29dfb4465b5fd7e21ab9eaed08cf0d96fca309e732dec09e3e76a69ffabd98bd376f7bd82ac51fcd1fc0d0471ba SHA512 10c7e9a842b5318dd8e0708f5c876b5494ed273d5509dfcfcb428c0c42c5483d82c3239c1c4cbdd60ee5e6cb5d391079fc684f0c4df992511992d20c02fecdd6
 DIST fotowall-1.0.tar.gz 1672398 BLAKE2B 8665f30b11c2fe1e6661e7655dd4de35c3b8bc1d29926d9155958ce5e8875f16281b150e710e4b94e82279e86c510c9933389df32d3255416b6ccdd53fd9c656 SHA512 ae2d887affd28d21b9caabbb3508d8ebd64058d81f84d3b3d67a205341a9cf5b528ca3a02793a4927e2e6b3ddfd73e7698c3df4bad3a7bb4d37fc9fbb226c94c
-EBUILD fotowall-1.0.ebuild 1000 BLAKE2B 436e6e94b3165b48bfdaecfb8d6b05c8015a51769a8a1106586ec3beb3052d1a14ff3414670f6e9eb448c110329574199c0418f8475b88e15120dad084cdcd52 SHA512 e3a3d17f0aea859d72c7ede3b0605bfdaa864359a3536d37f9ed9da270fec253e815d111b8e5cb84b08f76906fb57053c0cfe7e64774c3d9ec8d5d8d13f8f13b
+EBUILD fotowall-1.0.ebuild 1039 BLAKE2B 2394a70ad4bf910e6551972a8f17e584931f62c1004dac270951f1715a61a013e66a0d126308eb7985abbe0fa88f8b892a15724bad51f56bc7c0492629e40ff8 SHA512 b1300687fb639ba2f6b2549016967a5f01d609a2d70294df29beb47d4880a3a13e78d7d0d3c409b17cb1001ccb010df701cddd95140567d09db3c93deed52f7f
 MISC metadata.xml 396 BLAKE2B 0f50c7426ba992e6bf94bbc42cf99ea9f0daf7f4791d46cfea0ad57754692fa9e5d8462984a6357f4897e99b73553c248a1fa2f8048cccdc19083bce2d36c661 SHA512 538a67809974677e2c8f51b7ae7999047fffac2fa25677f0af5590afc061b5bd76f9908718bf8f66a6f9d4eaad4e4d2fa2e12837f5e15750035e879d79f93f59
diff --git a/media-gfx/fotowall/files/fotowall-1.0-qt-5.11.patch b/media-gfx/fotowall/files/fotowall-1.0-qt-5.11.patch
new file mode 100644
index 000000000000..db619771b476
--- /dev/null
+++ b/media-gfx/fotowall/files/fotowall-1.0-qt-5.11.patch
@@ -0,0 +1,28 @@
+Fix build with Qt 5.11.
+
+Bug: https://bugs.gentoo.org/661596
+
+--- a/App/tmp/CanvasAppliance.h
++++ b/App/CanvasAppliance.h
+@@ -17,6 +17,9 @@
+ 
+ #include "Shared/PlugGui/AbstractAppliance.h"
+ #include "ui_CanvasAppliance.h"
++
++#include <QActionGroup>
++
+ class QMenu;
+ class AbstractContent;
+ class Canvas;
+
+--- a/3rdparty/likebackfrontend/LikeBackDialog.cpp
++++ b/3rdparty/likebackfrontend/LikeBackDialog.cpp
+@@ -37,6 +37,7 @@
+ #include "LikeBackDialog.h"
+ 
+ #include <QApplication>
++#include <QButtonGroup>
+ #include <QLocale>
+ #include <QMessageBox>
+ #include <QNetworkAccessManager>
+
diff --git a/media-gfx/fotowall/fotowall-1.0.ebuild b/media-gfx/fotowall/fotowall-1.0.ebuild
index c4b9af4bfab4..660c5442ca6f 100644
--- a/media-gfx/fotowall/fotowall-1.0.ebuild
+++ b/media-gfx/fotowall/fotowall-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
@@ -31,6 +31,8 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	default
 
+	eapply "${FILESDIR}/${P}-qt-5.11.patch"
+
 	sed -i -e "s|linux/videodev.h|libv4l1-videodev.h|" \
 		3rdparty/videocapture/VideoDevice.h || die
 
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index 774cd3a365a9..b581ac5f6c71 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -2,5 +2,5 @@ AUX geeqie-1.3-stdstring.patch 2247 BLAKE2B 4569351aff9f524c17b9ad08634406e21d6e
 DIST geeqie-1.3.tar.xz 1141820 BLAKE2B 7a8639a136797c85d1bf96567ed0cae74c5cd0dacb8fac4832ffcb31ead372ac100948f9b65332d749500327c6ec3e7cb195da15980eaf0771ca6b55879dd8e4 SHA512 b17c4174741acd60261af268f0e9290ee3d7766d18fc0d28ada5730bb50651a6261d0b04b9fbe810d323c8e6a1b5a21a4f1ebf0eb88daf95f123b77b8484e718
 DIST geeqie-1.4.tar.xz 35881152 BLAKE2B 2932ac379abaee2b742b66daff544f29d7bf0aac82ff97f92e10ac7902ad874badcbb143f562c665d94f6297331090d0746373979a745f338a738078b72538a4 SHA512 a88b6dcf30847e38c109f5bc6436d93f6b4e1336a094c6b8a45db117830117120bf58f390afcd8a4b7aaf2934f995c3f75ac33a7faf56bfc2bcc9bd4eebfb205
 EBUILD geeqie-1.3-r1.ebuild 1941 BLAKE2B 2ac0dfaa649219e597b6128fd65cc435edb9fb90f6e1c44defa821f9c282b18c208a3553d11dba175b69806f674b9baa0c2348dd7988971adbeb14d43d521e50 SHA512 9116a91a9459f59c9dab49bfd40b29f57ad042ae740d29809cfd55b6df829c73327ef28e1c8a69cee3b14fee2962edc5b002f2f26adb8c0d72ea1f61c17dc91b
-EBUILD geeqie-1.4-r1.ebuild 2286 BLAKE2B 2bfe4fe172e3d1fe56250c88d3c8e23018e3946f2d02ab00d242cc291da9bc7874acabbfd7c95278fc14a9f075c838fb9f73aaf6a52ff840ce3b5b102d0b2faa SHA512 ed4c5541d847206b0eff954f32cfd842eeb8b0f58edf2f47f058d00c6e13f006217622e233d75fefd7d82d8e4d447bdc1c48028cda0ab212be5e3df5eb1562eb
+EBUILD geeqie-1.4-r1.ebuild 2281 BLAKE2B 71725dd5756b6d4c9db5d109a9f2dc0aa1ecdedacb789a836f139406375fa51938aab8c3ebbc43a93d253207e9591e5e27e404efdd30df9fd8fe3c7148514eb2 SHA512 b6a157767a61bb3bc22107600c6b2e3a55a63d9eabac113da06001d95a740b706da327617ced4ab65ed4cf0ff2861a931020546a3d132d619e7aa5f63d801d8e
 MISC metadata.xml 923 BLAKE2B 49de6dd7b0380b1cc74ccabbc8f84e2c55144b80612e04c4e55c82d052027882cc293a70a52f857bded73246ccbb5351df53dc1e1e08b8c2c08e630bc24f9882 SHA512 752280a5fefc097c5ca8b1fc2e9f05220aa809e45484560edca7baa68d95b0d91fa14973c321aefcdb76052dc02e405e2fb4a32e6322f04cd8223afaa6734d58
diff --git a/media-gfx/geeqie/geeqie-1.4-r1.ebuild b/media-gfx/geeqie/geeqie-1.4-r1.ebuild
index 455f0a263539..3080dded12b0 100644
--- a/media-gfx/geeqie/geeqie-1.4-r1.ebuild
+++ b/media-gfx/geeqie/geeqie-1.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=6
@@ -10,7 +10,7 @@ SRC_URI="http://www.geeqie.org/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="debug doc exif ffmpegthumbnailer gpu-accel gtk3 jpeg lcms lirc lua map tiff xmp"
 
 RDEPEND="gtk3? ( x11-libs/gtk+:3 )
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index a64b3a296917..a2efbecd09af 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -19,5 +19,5 @@ EBUILD gimp-2.10.4.ebuild 5274 BLAKE2B 3b3da266805208b6a2931ee06a9c0a4fab9de8122
 EBUILD gimp-2.10.6-r1.ebuild 5913 BLAKE2B 59a998963e01ec10965cadd57cd7cf0ca10f0455aac4ff45d5df7d71ab8ac407c632ea6ce0288f9cead8ec6fd70ea603c5fdb6b437acfb940f4135f52cd4b559 SHA512 a70f0e04a583a483af0609bb88a62199d28c2088f7fe8ea3f98e2aa5d9be80e1ed7558506c78a8668deeebac308433838a9d7e185adaa7e8e611e0e81c4af7ff
 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 5805 BLAKE2B c26c7b0b46db8f02d42196a988f8010b55e1278da2a4daf3f1db8d7ba073d93d8c8868a7ca4728bf479178c41de7720a068c02cf7148c13c3418fce5ef9266fd SHA512 b3bffc6728f7071bb683e95710cd26552940928b3087cea2d6ef5dfb741be7161b0a237b1c74c958155f1588a90e702c21eab76e2ec01f6b0d6ce5f1a56a6790
+EBUILD gimp-9999.ebuild 5803 BLAKE2B 6c8e88e071f145e1377f00cccd35b5d3f19efdf23738f751835f625e0977852093157df6fc24c2ab2e3da7675b9ea8aed17c5c92ac202bd91718130934a362c8 SHA512 7d75bf322a3742e687260eb9e82fd85e187312dd4da31af726927eb628b6f6cfe23b763273b1f268d1940ea4da5248f5267906fffe1bc6e90faf132b11e14a3b
 MISC metadata.xml 388 BLAKE2B 2e779c672c788e3631b0532be9a6081767215bf9687cb2546c92d3c6f4a00d8e8f6e32cca607019847200ed416336f752cfbfaf43b2f600b4bea63eb985e63d5 SHA512 e3a626ac39cea422d1b4660731048d764c4b6f1985e09577865f0047ecbc61c8677d6f15626dbbc03ceb3cb18887ba58747df5d91f5f4b2126afb9ad12eaccb0
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index ffaa9b6d047e..bce92e6ecef2 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-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
@@ -169,7 +169,7 @@ _rename_plugins() {
 	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
 	local prepend=gimp-org-
 	(
-		cd "${ED%/}"/usr/$(get_libdir)/gimp/2.0/plug-ins || exit 1
+		cd "${ED%/}"/usr/$(get_libdir)/gimp/2.99/plug-ins || exit 1
 		for plugin_slash in $(ls -d1 */); do
 		    plugin=${plugin_slash%/}
 		    if [[ -f ${plugin}/${plugin} ]]; then
diff --git a/media-gfx/gnome-font-viewer/Manifest b/media-gfx/gnome-font-viewer/Manifest
index e98f2e28fc2f..489215b1b8b4 100644
--- a/media-gfx/gnome-font-viewer/Manifest
+++ b/media-gfx/gnome-font-viewer/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-font-viewer-3.24.0.tar.xz 321600 BLAKE2B 85fbd170ccf3b9464f51b6c6d556fa8d9fce155581b37d2db0ff37abb703b4fefad3b2f5db7ed09edd033bc36aacd4a574b84fefdac4cb516c43f1255d9c0d8a SHA512 b951e98161dde808aaea0666c0266a3381c82a264dc7280fcd4e4debcf07bd44c940e738a2dd5134276625e404f87323f57930764ed2faeedad831ba6a8bb591
+DIST gnome-font-viewer-3.30.0.tar.xz 139076 BLAKE2B 0c84b4e8550df6689f69da1f8b968d436721ba3a9cd97fd7f8f71ad7316af8146d368b65b0702bb7c25c4fd210cf8fb9634620b129505cb3f4f78e3e450c3718 SHA512 9ba3dffdd0152c9a1380b39f4f96de7e7d0281c675c0821d4c0be27b7aab9f23d3ca7497b70dcf47807be5cc7fcf252877e5cd0009f6cf1ec231d429477fe600
 EBUILD gnome-font-viewer-3.24.0.ebuild 603 BLAKE2B 2559d1e1155e5f877fbf7b74d662879b3deb7f4ffb65e58f214c86b8f62bba7537cfcb02e36e4974b88d56f249dcb7bb837ecad3b86a7708af874119fc85c7a4 SHA512 fed65120155408b85413622b6bdd607e0806cc32a2b769964119da41625a2c928a0f212ddf8738207e8e5b6a9541f167ae95606c4cf41b6d10a33161b88a1d77
+EBUILD gnome-font-viewer-3.30.0.ebuild 670 BLAKE2B 204c796e325387fcf943898bfb8f7ea6a648061719d7ab6b7cd1972405283c3c098316b6a43544164170efc97cde8201dfce6022138228f8af8891cbeb358e98 SHA512 334d4c79ba81115371fce5dc87fdb35ee882007f06f59c87b8a3d97e8643916a5d7fafa0eb2d3185d3720bab6b591f77ec6364dc81cd6dcbe724eefb927118f1
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-3.30.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-3.30.0.ebuild
new file mode 100644
index 000000000000..fa4b9f210beb
--- /dev/null
+++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-3.30.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome.org meson xdg
+
+DESCRIPTION="Font viewer utility for GNOME"
+HOMEPAGE="https://git.gnome.org/browse/gnome-font-viewer"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-libs/glib-2.35.1:2
+	>=x11-libs/gtk+-3.20:3
+	>=media-libs/harfbuzz-0.9.9
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	gnome-base/gnome-desktop:3=
+"
+DEPEND="${RDEPEND}
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 1db7fe60be32..c7d49c618d26 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -2,8 +2,12 @@ AUX imagemagick-7.0.8.10-quantum-private-compile-fix.patch 778 BLAKE2B c770f89f8
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
 DIST ImageMagick-6.9.10-11.tar.xz 8918436 BLAKE2B f7846b21a68d0e8e462cc7a86322f73ec0df7cfd10fb35e97f6adb375c9291b9571c07da901636bbc933330ec0f4c2ee27b3af673c6af28d30090e78a81b2bbc SHA512 b272eee7c74c3d2e6cdc7b5ba088bf87d7fad87c8828c9d2660986acb05c0ee06566c4b2b82913be9086a51e9b7c64ceb9ecc2bf28691d183b8e478a15384ead
+DIST ImageMagick-6.9.10-12.tar.xz 8928804 BLAKE2B 061a1a855040fb861b200f3b1968c6f976048a09ae94e8881d81cb9b8618404b6c69aab62718285482a7f15826a946af6365af8e731a50bc2812f45396f6241c SHA512 f9f663c399afa3b86c9302607155ca62dd7d519573f61735916147be23ca27dd8bb29dffbdcb542f3433f367cb1cc97af879d18d72dda0d9a18d4c82f1b0f134
 DIST ImageMagick-7.0.8-11.tar.xz 8638236 BLAKE2B 927b9d467635f80d65b53e4d4d5c55e2ca4f8073b110881950d6bd9205a6da3b6ead91c624d1cccabb6c37f5bb841f9584c7c6d65714736898d17a22d9075a50 SHA512 b6f7493095097d3c551c70acd2181fb8e252750916534602646c7c765d756b5483c1bdd08b00d59f8b0bc3963729a2b64bf8cb467e3f23e26a4d35515b6d3b18
-EBUILD imagemagick-6.9.10.11.ebuild 6486 BLAKE2B e898f396578c2fe7b877de1b37e5698e0d982c1d168db9cbcc998d5bf7096175fe770d3f0ee49d72c2cc4b64d863fc63d4fba411a6e24d7931cf14421de33381 SHA512 54e1711e72cdf1c5080cf2b28eceaae64fa6b4c6db819bd1077a898bf182129bab2864ced2f9927970b69d8a1890fb2cd052da748b45e1aaeb0354c30d7b2fec
+DIST ImageMagick-7.0.8-12.tar.xz 8630340 BLAKE2B f2a568ed5c4cb1143a05d0d917969d9e60c1a967369523a0defcc2782e635f867dd49234bc445ceceae5bbabf826eb923e789ae0b4c7e6a6345cea6758a083b0 SHA512 b4b9d252e12fe60cb046e64558465eea5e635fd133053732810f0cbc7e68efb2d2b4a336b28b3e7e985e659bb07eabc4709ed437f0f20e57bcc5a9a13fa3cc31
+EBUILD imagemagick-6.9.10.11.ebuild 6483 BLAKE2B 4c197c04777ee0242c008610dbf7cbf04d7bd0ebfb4aabb6a327a03ac98191402b47156c25fa1a3c46f9ea16a6ab1ccc076c41d49bce83e362732a42d7ebc000 SHA512 6c5e1933716c829ee4e86623e441870def3924b9061168011a3228cae000c3caadfd2c0d4df55768cd4c4e68defec6faa32c3bd770c220d62763f0165e08e44e
+EBUILD imagemagick-6.9.10.12.ebuild 6597 BLAKE2B 786a42c5ae37d50041a7c7af163df940961b68d55d58af3a82b16d23879d0098a87a9880b0b5abc87c1bf0c49f1ad9af85c79a5416aa5fed1aba972a0d6763ba SHA512 3338bd294b68ceb4e56af4b3dc5156ea3dce52daeeb6a869bcf6647bdc4ec85196358631af4501e94b5e2651c2e0244f6bfd19363f22ccc691fa28f9d2d8105b
 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
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.11.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.11.ebuild
index 7c00fe4af0df..a2998e183119 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.10.11.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.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"
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.12.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.12.ebuild
new file mode 100644
index 000000000000..1895f401aabb
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.12.ebuild
@@ -0,0 +1,239 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
+
+MY_P=ImageMagick-$(ver_rs 3 '-')
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
+
+LICENSE="imagemagick"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+RESTRICT="perl? ( userpriv )"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	heif? ( media-libs/libheif:= )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-libs/libraw:= )
+	svg? ( gnome-base/librsvg )
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	virtual/pkgconfig
+	X? ( x11-base/xorg-proto )"
+
+REQUIRED_USE="corefonts? ( truetype )
+	test? ( corefonts )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Apply hardening #664236
+	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+	sed -i -e '/^<policymap>$/ {
+			r policy-hardening.snippet
+			d
+		}' \
+		config/policy.xml || \
+		die "Failed to apply hardening of policy.xml"
+	einfo "policy.xml hardened"
+
+	# Install default (unrestricted) policy in $HOME for test suite #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local mesa_cards ati_cards nvidia_cards render_cards
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--${openmp}-openmp
+		--with-gcc-arch=no-automagic
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
+	emake check
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
+
+pkg_postinst() {
+	local _show_policy_xml_notice=
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		_show_policy_xml_notice=yes
+	else
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
+				# This is an upgrade
+				_show_policy_xml_notice=yes
+
+				# Show this elog only once
+				break
+			fi
+		done
+	fi
+
+	if [[ -n "${_show_policy_xml_notice}" ]]; then
+		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
+		elog "which will prevent the usage of the following coders by default:"
+		elog ""
+		elog "  - PS"
+		elog "  - PS2"
+		elog "  - PS3"
+		elog "  - EPS"
+		elog "  - PDF"
+		elog "  - XPS"
+	fi
+}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.12.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.12.ebuild
new file mode 100644
index 000000000000..428e6d1e2116
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.0.8.12.ebuild
@@ -0,0 +1,243 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
+	inherit git-r3
+	MY_P="imagemagick-9999"
+else
+	MY_P=ImageMagick-$(ver_rs 3 '-')
+	SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+
+LICENSE="imagemagick"
+SLOT="0/${PV}"
+IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	heif? ( media-libs/libheif:= )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-libs/libraw:= )
+	svg? ( gnome-base/librsvg )
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	virtual/pkgconfig
+	X? ( x11-base/xorg-proto )"
+
+REQUIRED_USE="corefonts? ( truetype )
+	test? ( corefonts )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Apply hardening #664236
+	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+	sed -i -e '/^<policymap>$/ {
+			r policy-hardening.snippet
+			d
+		}' \
+		config/policy.xml || \
+		die "Failed to apply hardening of policy.xml"
+	einfo "policy.xml hardened"
+
+	# Install default (unrestricted) policy in $HOME for test suite #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local ati_cards mesa_cards nvidia_cards render_cards
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--${openmp}-openmp
+		--with-gcc-arch=no-automagic
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
+	emake check
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
+
+pkg_postinst() {
+	local _show_policy_xml_notice=
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		_show_policy_xml_notice=yes
+	else
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
+				# This is an upgrade
+				_show_policy_xml_notice=yes
+
+				# Show this elog only once
+				break
+			fi
+		done
+	fi
+
+	if [[ -n "${_show_policy_xml_notice}" ]]; then
+		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
+		elog "which will prevent the usage of the following coders by default:"
+		elog ""
+		elog "  - PS"
+		elog "  - PS2"
+		elog "  - PS3"
+		elog "  - EPS"
+		elog "  - PDF"
+		elog "  - XPS"
+	fi
+}
diff --git a/media-gfx/img2pdf/Manifest b/media-gfx/img2pdf/Manifest
index f1bab70a6caa..a110880dd994 100644
--- a/media-gfx/img2pdf/Manifest
+++ b/media-gfx/img2pdf/Manifest
@@ -1,3 +1,5 @@
 DIST img2pdf-0.2.4.tar.gz 54426 BLAKE2B c645d61ee8eb950bfb15337a2d2be724efe9fdf40ba7b211c9882ea14ec34aa977358e0550a732bf770d9539e7b8f8f0dfe045fa7fe8ce0cd0c1311be570cc23 SHA512 c2d99da7076411cf4acabe8929fc8af4005ef1f3e3d9edc953f2731b8d41159c9e4637a803765e1405c595daebfb3d519d4c7903003ce0118d8b0c6e88f11860
+DIST img2pdf-0.3.1.tar.gz 67954 BLAKE2B d0d6a9927e9b3e7087e562a108157677a46a17a896beddcc424dd2c234fd7c4f1376b824dbf814b42d9a314a8495b149bc9df65ab2864405b9dde0054e7bafdf SHA512 25f788f78e93ed336ed8e31e88350d89263b82477c8d9c36103dfa522a5e661922fc09b59e1d5104161fe1be15114f843172555efa942722d8b093900d38bae1
 EBUILD img2pdf-0.2.4.ebuild 576 BLAKE2B e6c242e6ffa46a84701e5b93959026235885e7a67541aa99d3cd9489ee466b101d3456a5fc90eaade8eee57c5a14d3ea2591556167168d4bab0df69a85c224ca SHA512 b3239673b80292319b7f5e9286d6b9ecf20a0e478e3fc685f3dd448dbbb9d598b28bfb086bf8a3cd5dbb7431e3a2d89f1dc975f87aca56d7bf45897535dd0002
+EBUILD img2pdf-0.3.1.ebuild 573 BLAKE2B 96ddbfb40bb0c5ea8e237f6c8b4e6f005d4583e49340273b7a9fcd7f0c631632931d1ebb3ee0b39de5886db281761552b0bdd64c6509ff1206eeffd17074adfe SHA512 baff293bf9770cbfb004908fbd9d0afee0d25248cbf3fccb92a2cca228675d3784021e50227dfdc2f28edcead9ccc40bba62e5e0916c98dc24f4d520f00ce32f
 MISC metadata.xml 1096 BLAKE2B 18befc3c4c34d0210ad594ba46749dd304d673ecd697d30b3c60a951787a7ac9e8d7371d0c853c8a4cfce896b18dd36a29f15dd12aa4fb6190635e20d2b201e0 SHA512 c4f5e02479a3ca0d6a2a52c58c25197cae533855500327c84c694b82e2ad625e149124c555b8822f79ec8000a4f926b6e21dd59db92b0989a316687d56775531
diff --git a/media-gfx/img2pdf/img2pdf-0.3.1.ebuild b/media-gfx/img2pdf/img2pdf-0.3.1.ebuild
new file mode 100644
index 000000000000..9e0dd7864237
--- /dev/null
+++ b/media-gfx/img2pdf/img2pdf-0.3.1.ebuild
@@ -0,0 +1,25 @@
+# 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
+
+DESCRIPTION="Losslessly convert raster images to PDF"
+HOMEPAGE="https://gitlab.mister-muffin.de/josch/img2pdf"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pdfrw[${PYTHON_USEDEP}] )"
+RDEPEND="dev-python/pillow[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/media-gfx/iscan-data/Manifest b/media-gfx/iscan-data/Manifest
index da14a52fc566..7baa8d81ca4f 100644
--- a/media-gfx/iscan-data/Manifest
+++ b/media-gfx/iscan-data/Manifest
@@ -1,5 +1,5 @@
-DIST iscan-data_1.22.0-1.tar.gz 96626 BLAKE2B e8db0a38b108dafe8a853a34f166c70ee43cddeda7cbd6b034f941cf8051bcf64c9a381e8f9d4efeda2e262c8d70d9a891e32c59ed296256a93907fdd00ffbe3 SHA512 2adc6c125045803ffd269abab4f58d6d1c87ebd4c959985e6689d0b2e7f5a84fb1956d0e559c35b1704a1e330bc639e668c37f718c871e076a7ccf6c35562e6f
 DIST iscan-data_1.36.0-1.tar.gz 100218 BLAKE2B 7731266ae58b44541ca9e39621026aa667707cb46774e8199711e627d773fc1029fecb401de2df7746a476a162774ec1eeec75b9d0bfda82567ccef706547baa SHA512 a9711264c852dd4bdcdb10c1153f725a111bd74b03705c99265b6692bf47236c6e4f5e7e4813991eb5991deb198adeee272c8c3eb53da641ba189d923916d3cb
-EBUILD iscan-data-1.22.0.1.ebuild 965 BLAKE2B 9b90783fb5bb2cea8240c3e0ebf02de6c7f3b30792176ef4d0e54189dae1a0941f094b9125b3e97857855a156057fa78b2b4b3d49b30e732cb047c9c7342c714 SHA512 c6c6e62bbcc930bf9d045be41260312d5e0a693a016a37847a609d0dea7aed1e1f9ead5cb910675f612a88c420b368f79ca1565959f05eb4cef4562471269ebe
+DIST iscan-data_1.37.0-3.tar.gz 100499 BLAKE2B 8710a69702306b50bb4d9a21a924dd9bf14748b5310ecbe53d7b4ba24bf47122da9c4bfb57a0769f166aa1ce9c732a943703fe1bfafb9500636654f480026f28 SHA512 051b5a3de2af3d621a3ebc181314809edd25598d3d2dc3868abd3423562aa5c2c00808c5e22ada6253588036b4072644dcf979012645c1ae580e9f701544bd40
 EBUILD iscan-data-1.36.0.1.ebuild 1265 BLAKE2B 9309392140cf44bbe93ea0f5cf917dcb58656080b8b5cd3088aa080f310f422bb4998c66e532c7dd23bf10da9ed498b83f2446982c7158019df0f37a48ccf0b7 SHA512 4dd435ffc75204b5a87d7dbd144cffe96ee92a25e6bbd5fb19680eac5cf192404d252c5582b4acaf24cb2fe764f25611ab2bd16a4cf63b58ab758166b3315c1a
+EBUILD iscan-data-1.37.0.3.ebuild 1072 BLAKE2B 3aa8ea569f8bfbe597f80cd3ac63437fdcc9a3e3fb19ac3b729c866e366b64719fe99d1913ef8dbcb5b0d848c64114c4f80ebe588308db1d2ac7185c521f4be0 SHA512 0212c3a6f9e5cdab4915c274f06fc7c61392d7a22426184ab8ec5b7f38fc79c32d08ee0949136c2637c863fd9f873c8482ada9f7103647f0b0a99e4378e8f478
 MISC metadata.xml 609 BLAKE2B e0c2521d9bd70daf3bca54713178819db98aea387bc4a6b41c682d044656229ab5cdf2bd3212bd61faabdb5d600dfeb8fa445f57eb0247d694a59b35a663b6b2 SHA512 32ede245d749b0be045e45a5c8a6f68f9487d807f8777c0da84fd93b20ca11aa1ec3d132d2b24a7a58802a112b71ace82fa03f3e618a9d66bc99101eefb7b5df
diff --git a/media-gfx/iscan-data/iscan-data-1.22.0.1.ebuild b/media-gfx/iscan-data/iscan-data-1.22.0.1.ebuild
deleted file mode 100644
index e2901b89af22..000000000000
--- a/media-gfx/iscan-data/iscan-data-1.22.0.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils versionator udev multilib
-
-MY_PV="$(get_version_component_range 1-3)"
-MY_PVR="$(replace_version_separator 3 -)"
-
-DESCRIPTION="Image Scan! for Linux data files"
-HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
-SRC_URI="https://dev.gentoo.org/~flameeyes/avasys/${PN}_${MY_PVR}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="amd64 x86"
-IUSE="udev"
-
-DEPEND="udev? (
-		dev-libs/libxslt
-		media-gfx/sane-backends
-	)"
-RDEPEND=""
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DOCS=( NEWS SUPPORTED-DEVICES KNOWN-PROBLEMS )
-
-src_install() {
-	default
-
-	if use udev; then
-	# create udev rules
-		local rulesdir=$(get_udevdir)/rules.d
-		dodir ${rulesdir}
-		"${D}usr/$(get_libdir)/iscan-data/make-policy-file" \
-			--force --quiet --mode udev \
-			-d "${D}usr/share/iscan-data/epkowa.desc" \
-			-o "${D}${rulesdir}/99-iscan.rules" || die
-	fi
-}
diff --git a/media-gfx/iscan-data/iscan-data-1.37.0.3.ebuild b/media-gfx/iscan-data/iscan-data-1.37.0.3.ebuild
new file mode 100644
index 000000000000..b6288026a6cf
--- /dev/null
+++ b/media-gfx/iscan-data/iscan-data-1.37.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
+
+inherit udev multilib
+
+MY_PV="$(ver_cut 1-3)"
+MY_PVR="$(ver_rs 3 -)"
+
+DESCRIPTION="Image Scan! for Linux data files"
+HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
+SRC_URI="http://support.epson.net/linux/src/scanner/iscan/${PN}_${MY_PVR}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="udev"
+
+DEPEND="udev? (
+		dev-libs/libxslt
+		media-gfx/sane-backends
+	)"
+RDEPEND=""
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+DOCS=( NEWS SUPPORTED-DEVICES KNOWN-PROBLEMS )
+
+src_install() {
+	ewarn ""; ewarn "Some profiles automatically enable udev which will cause install to fail"
+	ewarn "if media-gfx/sane-backends is not already installed."; ewarn ""
+	default
+
+	if use udev; then
+	# create udev rules
+		local rulesdir=$(get_udevdir)/rules.d
+		dodir ${rulesdir}
+		"${D}/usr/$(get_libdir)/iscan-data/make-policy-file" \
+			--force --mode udev \
+			-d "${D}/usr/share/iscan-data/epkowa.desc" \
+			-o "${D}${rulesdir}/99-iscan.rules" || die
+	fi
+}
diff --git a/media-gfx/kgraphviewer/Manifest b/media-gfx/kgraphviewer/Manifest
index 8f950e2aa0e2..7314c4d8a4dc 100644
--- a/media-gfx/kgraphviewer/Manifest
+++ b/media-gfx/kgraphviewer/Manifest
@@ -1,4 +1,6 @@
 AUX kgraphviewer-2.4.2-unused-dependency.patch 1421 BLAKE2B 92206b24d8fff9efbca0a5e847b856fbea313429f0c922107dd23d07bd2868ea24b9849d79cd0e858e95b20d91bf3595c2aa127f9645ae19ee9e9f2e7d69be57 SHA512 f54c2b1806da3e12988e88d593f0a09414ff9574a9f6df0bdaacb340127824292a29425791cfb3ccdff99c03ca1cba0940e3bd8bb49a59c2954ef192cd03facf
 DIST kgraphviewer-2.4.2.tar.xz 1565692 BLAKE2B 53d4822303f7ff99af3b986586bf17d817480d82203b0dcedb775b341c72518f468b9e97c7c72e41201df2274370807b66f17b516905aef2189215220846ac29 SHA512 2a25f8493881ffa057602e7a141ea610b8db7c43da2db007aea118e2ec7b1f069fbfa6ca80b0e1048c9b20535764679c8d77027337c47a4c18e5240c3058d935
+DIST kgraphviewer-2.4.3.tar.xz 1491328 BLAKE2B b51cf825ad4763538139f917a7d16d15a7244c19b3cab9c79bbd938ee3dd80e4e35e37012199e1256bcc9a9404d756cdb0f5ffb975484d527577c208ecf1d3fa SHA512 d18146ba380efe73e1ec716dd1cc310fe1eac23eccb10e2a699b107451637b9332cc25d62a4de762df4706cea182c9474ba1e885801c9832e1bb9bff1648e72d
 EBUILD kgraphviewer-2.4.2.ebuild 1030 BLAKE2B 601473bd2bfc3686572fcf5c17f7207176d1baba6039f5e8612222984fd6adb020575c9ec4b8c2e44a937f87409b1a2af6e5fc9d061e6e36ec5f4627c5efebc6 SHA512 f793f2c2c8bdc522abf9a7d4ae08281090b0e1210c44ad2c5e570502463dedfaa44a02459ab162a1ec0c3372e87016b810bcaa79f37f64a9f1771028964c34a2
+EBUILD kgraphviewer-2.4.3.ebuild 972 BLAKE2B f4d3706fcdb61c2043880f05d15399fa94b858d266d3b29d17e179c4064340e20ab73ad8741f9620e78c15f9470e60796c5dc786fe451b53a8dd66af859cd213 SHA512 c03b2e479b15ebb885104a88ac5cf84565c34782759576982f594792d1a0181d4c4f9607417668a8ca1ef68c56ecdecb6509e336bd90bd13934092175c3c0c72
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-gfx/kgraphviewer/kgraphviewer-2.4.3.ebuild b/media-gfx/kgraphviewer/kgraphviewer-2.4.3.ebuild
new file mode 100644
index 000000000000..c2eb074f242a
--- /dev/null
+++ b/media-gfx/kgraphviewer/kgraphviewer-2.4.3.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="Graphviz dot graph file viewer"
+HOMEPAGE="https://www.kde.org/applications/graphics/kgraphviewer/"
+[[ ${PV} != *9999* ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2 GPL-2+ LGPL-2+ LGPL-2.1+ handbook? ( FDL-1.2 )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kparts)
+	$(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)
+	>=media-gfx/graphviz-2.30
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
+	!media-gfx/kgraphviewer:4
+"
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index b45dd847682a..ce572e4b0213 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,7 +1,7 @@
 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
-DIST krita-4.0.3.tar.gz 241332929 BLAKE2B 222a3425f64c98d964f421c84f48295d5cb72e622631e9b1cb5a2ac9980a6f59cbf12b0815df68a09daf138efc2d4e2e83cb46034c8e12ddd621cb49f1117b72 SHA512 13b3263a09dbb955dea435e97bf12b6f0670fce68c4c2c9e97e7b45b480301119f317e72fac63eec07caff295885b7d62ac7c6255545a139e1e5f4b1106989e8
 DIST krita-4.0.4.tar.gz 241431012 BLAKE2B c8bb51132f089276761d5a6897fee416a23154267fef72ad525660125770d0fe4b6ab93f70b67ba11c8344f2b27f82bbadc96306d111ff77145b4056ec2c7601 SHA512 a1d82366f7b145c5db4c74ea8c31672a96a3dccd1b31fe2758606de50a4a8e5f8fd794e319127f98cc80f067d851edd4bc6e2f842eba76b807cc3a075a997f45
-EBUILD krita-4.0.3.ebuild 3209 BLAKE2B 969d1fed2d60fe9e3dc7a648d3e1fdad7c405e4af03bc339edd8016c0f0fce7dc63c5839286c9f42f02dcb0426fd6bc273909e13e87a47dee6c5e2bda42578a0 SHA512 d4e5d1a9603c6c660f3c0cb03ecefe2707f7c2c05f9664b4702373166e97ca0d953d9b33425d7bfcb145ad91bc75bfc6ee08fc3f4fdd12447e7dbfca35bbddba
-EBUILD krita-4.0.4.ebuild 3096 BLAKE2B 4d54402c4fe4ab7b6802b88338bf436b4d74410191d38e037df4ecb15c101a4a1c9c3b88a36a6c1731ea6df864e45f042bc1c84ed91b4d34c5c3e9a6ff559b21 SHA512 a8a288bd685a1b8f86078d398e35462dadffdb8d2ebb7ca4d967dfed80b1261bebc565e54bb51385e9bdd60e043d129188c147faaba276c39e66bec3d8859f52
-MISC metadata.xml 569 BLAKE2B 7609e8cfc1f63fd04b3306a37a9b429eddaf56bf4bcca32d707b529d0267d7f63979a850edf8fcb5b1043134b1baa7210e849903a65243ac300596ccbdb473bd SHA512 44b2dc2f5d0e737a780e16f4d88cb3c2ff1dbab8b1878ae3561659c3a191040ef0f0f2ef0e7325b16ca6c149e29d417c10bec18bfcf06d8e847000e1e8279b27
+DIST krita-4.1.3.tar.gz 243979838 BLAKE2B 460d7c507b0d86d318b384ad26fd0d2be82d7b60734bd7b1f2016baaf5e0cc3ad91ef7410837aaab207d270745a3a08c1abde11ce3c3543cbf990d922794b606 SHA512 b0d9d8fecdf9f49e6431d0e31fdd6df2f53e654f64e93a05c73afbbdff0625c072a00347e667f1ba87c6d145185fe98d0518df3a4c0c56ccb944216a42d53d5c
+EBUILD krita-4.0.4.ebuild 3092 BLAKE2B d1fbb96ff445244a35e16411cf49fbcd3e81317a1759965ccde6b492568a7b69d30430582fa74e3239c66238fe80ad070456ae4c7b3fda36d9ddf14c81f90ba3 SHA512 4af6eabe2319395ac019a5679ae4176ae5629722ef57544a12a1c7a6b5c3f7ba108099b13c3e304fc6979a2bf9a7a65748321639cfa49ccc3b212897912dbc7a
+EBUILD krita-4.1.3.ebuild 3131 BLAKE2B f2f64de5571c11861bcff90fe335d47c0ff5caeb3b22554d87a0c636d3b602efd3f3e5d91b0b85d03361162ec0233f68bcc7b4e6f4fdb0671f75a41078553777 SHA512 7ef19e4b4267710942e32e18c333eec5d51d51049ab469af507c2bdcf24278ae2e4d5a8de73b0286cc53e239c8388749987dbae619d5fcedeb6073800888a9d4
+MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd
diff --git a/media-gfx/krita/krita-4.0.3.ebuild b/media-gfx/krita/krita-4.0.3.ebuild
deleted file mode 100644
index 839c3b054f8d..000000000000
--- a/media-gfx/krita/krita-4.0.3.ebuild
+++ /dev/null
@@ -1,120 +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"
-PYTHON_COMPAT=( python3_{4,5,6} )
-inherit kde5 python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${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 +jpeg openexr pdf python qtmedia +raw tiff vc"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-	$(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:=
-	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] )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/PyQt5[${PYTHON_USEDEP}]
-		dev-python/sip[${PYTHON_USEDEP}]
-	)
-	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}/${P}-tests-optional.patch"
-	"${FILESDIR}/${P}-libraw-0.19.patch"
-)
-
-pkg_setup() {
-	use python && python-single-r1_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 jpeg JPEG)
-		$(cmake-utils_use_find_package openexr OpenEXR)
-		$(cmake-utils_use_find_package pdf Poppler)
-		$(cmake-utils_use_find_package python PyQt5)
-		$(cmake-utils_use_find_package python SIP)
-		$(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.0.4.ebuild b/media-gfx/krita/krita-4.0.4.ebuild
index b7f682f286eb..8e5ccf9eb204 100644
--- a/media-gfx/krita/krita-4.0.4.ebuild
+++ b/media-gfx/krita/krita-4.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
@@ -10,7 +10,7 @@ inherit kde5 python-single-r1
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
diff --git a/media-gfx/krita/krita-4.1.3.ebuild b/media-gfx/krita/krita-4.1.3.ebuild
new file mode 100644
index 000000000000..1e3252cbd580
--- /dev/null
+++ b/media-gfx/krita/krita-4.1.3.ebuild
@@ -0,0 +1,115 @@
+# 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/metadata.xml b/media-gfx/krita/metadata.xml
index c63335afbc91..0ee0df7f22ce 100644
--- a/media-gfx/krita/metadata.xml
+++ b/media-gfx/krita/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="color-management">Enable color management via <pkg>media-libs/opencolorio</pkg></flag>
+		<flag name="heif">Enable support for ISO/IEC 23008-12:2017 HEIF/HEIC image format using <pkg>media-libs/libheif</pkg></flag>
 		<flag name="qtmedia">Enable sound support for animations via <pkg>dev-qt/qtmultimedia</pkg></flag>
 		<flag name="vc">Enable support for <pkg>dev-libs/vc</pkg>, could be a significant speed boost</flag>
 	</use>
diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index 7d583dfd0948..39e229cc75f3 100644
--- a/media-gfx/libimagequant/Manifest
+++ b/media-gfx/libimagequant/Manifest
@@ -1,5 +1,3 @@
-DIST libimagequant-2.11.4.tar.gz 74117 BLAKE2B 5d42dc876c77694a1d4576e633d2e3aa1e531061aa849a683542cf11b14333f65125bbae699f927bf42896a934ade6d745aa517d6cbc4b7097d96c7579532ec9 SHA512 e9d2aaac2f37968dc93ba0da7d03f0fcf60b3f17d9a0b9edfd6930eade25844dd603de74492d8e1de8dc2da4e7f3e47959a558b5a67588d71e9e1db035eca1cc
 DIST libimagequant-2.11.7.tar.gz 74311 BLAKE2B 204fbe794014c11d767991a03e729b234978fb1edb1fdffcb7d332461ccaa1a536a1e9dbc7b44a8838db61cc76fdbc1eb75087b480f4fc42bf791fea913639a2 SHA512 8816811c06eec27232e39725c581e382b7076f3bc23b017810de0e92236e6e4eb480def7b50347c9b75f7d792245669398c39a17359eb81077badf12e6f0a172
-EBUILD libimagequant-2.11.4.ebuild 1175 BLAKE2B 45ebfb632526601318788fded0c26678026dd518e4168213a523e7baba7a46742fae05cb7db89fa8bca4f7687bdb5faff62da218d236f35c109392d90d7b93c8 SHA512 342ad821a2c7581c1fe603fdbacbe8b72d6f5ee2c3e41c56075056678a9fcaebeba79aa2b68f3c83f8115e1f2b6d2fb839842f67defd9a9fb7f35e30acb80f38
-EBUILD libimagequant-2.11.7.ebuild 1191 BLAKE2B c38dfe15c909c359be1e15b775232a4ff1ee58fb084e7d2c7970e1b18d1f8700ea804a8acb0b2f85c055d9cf23964af73b2ff610571e19f6e34b09a841c12ead SHA512 43af02aa89b4d1b73d876c66460d44a316a09f8d7ae922fec3ab52a345342b2c8f67981342b9a0cb5143aa216c82b7a146067bf3eba73c3de7c6d8fbbbf99430
+EBUILD libimagequant-2.11.7.ebuild 1187 BLAKE2B a3ad23ae37dc3b52ba7a2695d4c7d8a86c249e8a0b9ce69fff7d84d88ab921dc12bf65dae2b5362a94865b11e24a3f338d1c1c4e5350d731e7e25273cd986044 SHA512 783c40640f7af16427f6a57f892efa7a816c89d9095a8cf2e443fb834cb722ed46b8d25cf2a64fec089beae798bac6111b50f8474555787a8214cd1fb0eb2284
 MISC metadata.xml 527 BLAKE2B c3fa42153fa6cfede4de3d59e12063aeb44f67ce89d36be63c7df4671c57ecfdd43d08aee89bd96387ecbee2e41b1d5921e9ad2486b4dd8f06e6e93529afb0a8 SHA512 82b458b27288b6b49df16d5778f6c75b492d958bcc1c2f2950dee741bfddc82f561be50f590d3f891bf736ee67e5325ae297bf49f99c769ca97ac68042beee11
diff --git a/media-gfx/libimagequant/libimagequant-2.11.4.ebuild b/media-gfx/libimagequant/libimagequant-2.11.4.ebuild
deleted file mode 100644
index db64a5c57738..000000000000
--- a/media-gfx/libimagequant/libimagequant-2.11.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="Palette quantization library that powers pngquant and other PNG optimizers"
-HOMEPAGE="https://pngquant.org/lib/"
-SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cpu_flags_x86_sse2 debug openmp static-libs"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_configure() {
-	tc-export AR CC
-	# Hand rolled configure script, so not all flags are supported.
-	./configure \
-		--prefix="${EPREFIX}/usr" \
-		$(use debug && echo --enable-debug) \
-		$(use_enable cpu_flags_x86_sse2 sse) \
-		$(use_with openmp) \
-		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-src_compile() {
-	emake shared || die "make failed"
-	use static-libs && (emake static || die "make failed")
-}
-
-src_install() {
-	dolib.so libimagequant.so
-	dolib.so libimagequant.so.*
-	use static-libs && dolib.a libimagequant.a
-	doheader libimagequant.h
-	einstalldocs
-}
diff --git a/media-gfx/libimagequant/libimagequant-2.11.7.ebuild b/media-gfx/libimagequant/libimagequant-2.11.7.ebuild
index 384149b958a7..e0088b888eaa 100644
--- a/media-gfx/libimagequant/libimagequant-2.11.7.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.11.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
@@ -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/raw-thumbnailer/Manifest b/media-gfx/raw-thumbnailer/Manifest
index 76c417b6d6c2..9efd205de6d3 100644
--- a/media-gfx/raw-thumbnailer/Manifest
+++ b/media-gfx/raw-thumbnailer/Manifest
@@ -1,5 +1,4 @@
 AUX raw-thumbnailer-0.2.1-libopenraw.patch 897 BLAKE2B 26065ada735e744b0bac662110f8f6a8d70f808721452adab0c7b4cf6927152ab255e424b2978147895e36833cf525893d3f601a09871e712a2dcd348d05e1f0 SHA512 c9b582a6f7d8ccd5958da96d4773105e17b9047b1081d5a4e2a48384831f83e79ef32b9fafd3cd2436472ac86554ffa2232b1d039f06d9890425c5b2d6da185d
 DIST raw-thumbnailer-0.2.1.tar.gz 89468 BLAKE2B 8041cfee56f9be900c6f7bfa6dfb9b21b482ee8eb7dacb83ed37603c32edf6e1dee122de3e98b06d158b6725a1900c73c7e1aee1b8e6a53545428ff7aca47b53 SHA512 cc3c107b060add00b4af811bb548b597493ff0d54d863c530d183970ac8bdd4f6b9f4c25cf978e1d2bf80b11424dbbfb20e73c6dd1abeff3a15a08843bcd41e1
 EBUILD raw-thumbnailer-0.2.1-r1.ebuild 665 BLAKE2B c4959322b430f6d3399765ec55c0e0612974c398e355a677f0ec57fd083125204747d6e062db3cd54b2788ad0d0ac95289810c8317ce086c14d7053fd2a1cfd5 SHA512 c0c58237a63610e0c0a94c72d13608e3445d7cc9b20b0b4815f0d90b7830adc025795b62c1923fe5cbc8ffd9d13b271087f2889ce22a592c3405feed7faa211e
-EBUILD raw-thumbnailer-0.2.1.ebuild 540 BLAKE2B e414123881d1b4f1d3aa8b2b8a37e7a9cc7b14ed05337f9f5091f2281f30661541d5bcfbae9b5b96815a88a5fc4cd523ef9adba9b7599dce7c942341002ad292 SHA512 c2c23998a3af64a083872e64654539e02ece59ca37375c81f2c4bdf96e84d57f51129b78cd73bffb67c66edabe9e81dcc2b94c0284b07b7d7a6a4b8d660cae7a
 MISC metadata.xml 407 BLAKE2B 713244da2a69bfc59fb7a82373bba128e0d08fe7c12645245fb01df403e3affc792fc26ca28967dcc6c499145e90f9a34eb7c984164ccf4396a8924c4c153312 SHA512 7383547238ca395a6cffde72366521dd7e3e04218f8840f19f093cfa61d0788d10138d39250702085a5669f715aaf3d0da5e357829a0e0fd44a70d20c14ed46a
diff --git a/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1.ebuild b/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1.ebuild
deleted file mode 100644
index baf2934ea32d..000000000000
--- a/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.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=4
-
-DESCRIPTION="A lightweight and fast raw image thumbnailer"
-HOMEPAGE="https://github.com/erlendd/raw-thumbnailer"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="~media-libs/libopenraw-0.0.9[gtk]
-	x11-libs/gtk+:2
-	!media-gfx/gnome-raw-thumbnailer"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog )
diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest
index 92e822d9b9a3..edb216573d0c 100644
--- a/media-gfx/valentina/Manifest
+++ b/media-gfx/valentina/Manifest
@@ -1,7 +1,9 @@
 DIST valentina-0.5.0.zip 37175844 BLAKE2B 73cfb434c87e7d59efa76c303f4cc13dd9df08b9d5f61becd03943b78ce68e8735d192f2f2d5d5dfe25cda19ba998b0ea4a73bc3d0845bd4a065f7c5b4e66098 SHA512 3e69f965de1f8179850a8c6a5a0d3b5e87384158191b9c4a3647a5421d1efe567e98298bd8f47a8288eac358520469ae7979a4a61df64ccfbeb1a36fb231efcf
+DIST valentina-0.6.0.zip 38305855 BLAKE2B 82733e97cd2ab1c2e0edddc05de228c040c43bd6a21b874b30554c526123ebd26d70f9fb8bb7556062f7df7b8d8f38c370d0f9ccd3d38100dacf841a68d4d1e6 SHA512 3bcc943c155b1b848c5328b53c8148448ede8fd057c8a50570045f61519bbeaaf0831f4a16127a24537feacb5251236c3bdc96e02788729635f4ec072686ca16
 DIST valentina-4798.patch 25302 BLAKE2B 153cc2ccc603703a520b5181e5192bac86410ab51eec305effe43463ce081dbbf3bb48eedb93e8ea5928f3f71351526a175c61a23a7005fda5bf4e14cc57403e SHA512 c3adbd2caa4cfb73960de850b29bee881fc408c9e4032e1fa2f29ba80b91abaa194738ff1cfb607657343990a166ad310387a66ceca546ffae0543d774bc53b4
 DIST valentina-4802.patch 6733 BLAKE2B b7e30b77aab75b45e7bfd06165586f8356cfa438e0f5f5fb708d818f04fe9be7fdd025b8098cb5ca1f45cceef0671abf7014c112ab11da8e6c9c1a640e412ab8 SHA512 5628599c1dd208ba9ea8ea5e518bf6aed5ef11aa750670335478e5af49d6e9f235901c79d6483b1897f8288259fd06b463462eddcd062c4920ff251430998ff4
 DIST valentina-5406.patch 596 BLAKE2B 34c5cf515555e455416500795c2afd96176b3ca3c2c3e278dbb6311e7cfb38bba6556126beef23d8b98ace76f0156250974d95310a6af046c0884580aa1d19d9 SHA512 f504ca766969703a20fc7c16652d4615722afda9156eb07c43845d1a6e9c7d08a2e8f07be7c71b4379326757f95e95e85858add2b1d13b0e4e5e8b1974ce18ae
 EBUILD valentina-0.5.0-r2.ebuild 2569 BLAKE2B f372de37045b9a7ef8e582ed2e15c4f9519bf9b438e8a27b755e9cd33a9fc7caa2cbba8d1d5bf73c99539ce43dc97318154aea9a7a0410fc5607db45d640e17a SHA512 b52157b044ace4638a3610e5e5e5e6dc1ba50b6d9e6ab4183752d97fb0fd9970cc5fe80decaec688dad871343c22e8fb7293cbfe4b9f206f7493bb65d394be30
-EBUILD valentina-9999.ebuild 2018 BLAKE2B fb2b00149fd5dd061a876913024c9ce5605ce7e31afdf84224ce262682146f5768316ee5e9dbf178b58b7dd291b6790a9aeef74bf2e6e2f283cec1b2049fd26c SHA512 753a8e38d86231e63c5653e761eefacd495fb06d741a4c241224d128b15f4a16764addc6184c94d3f7e8637eac7ab85c5402161011d372b56a151a76f9427f6f
+EBUILD valentina-0.6.0.ebuild 2138 BLAKE2B a4c29b1c55c2055565225c448a4ba33fd89a45cf63452e05dc55d9aada619cb45bf2eb0db60cdf6c8fd0d1defd6ae9f78d38239eb2943427bb3bc6175a112997 SHA512 59e5dacfcfa1caea28f6dc5ca59fd9bba9c71cc50b695d4161a8d6c5fc10e83d3cd5ac4a26ffb5432cb1498751b14381f11393fb1f70218a25be08284d0c8c98
+EBUILD valentina-9999.ebuild 2057 BLAKE2B 8f0884308477778a8bdb0ee588b4e976156513fa865c24406acd09079c545b719b82726ed0ec336150e6c26fcfdb97eb3ce71811c55bdffae38a6f0fd4b06525 SHA512 7ae7e33c54c720abd0111783acf5f8ea4c2e4812dc4013176bafc533a33b2359819f386648cef97cea3521329fc55af3f8156b28e4b69353ff1bc882c377fd20
 MISC metadata.xml 334 BLAKE2B 7f146a505a30d4461165308b40383e2b78998411874c8af6113c3040142003868f397872ecd22b9b8f3ec6193c532fa934c8646ee04e8c49157464b58035de09 SHA512 d1264aa0d26ba75466c5572c37ca6fd384d4e6db392aca0e47d4b1d0bd3ef7e035fed51c460af1bb258c500d1cc9211ec2e85db3e3aa158d378fb1389a3ebf03
diff --git a/media-gfx/valentina/valentina-0.6.0.ebuild b/media-gfx/valentina/valentina-0.6.0.ebuild
new file mode 100644
index 000000000000..b063352ab947
--- /dev/null
+++ b/media-gfx/valentina/valentina-0.6.0.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils gnome2-utils xdg-utils
+
+DESCRIPTION="Cloth patternmaking software"
+HOMEPAGE="https://valentinaproject.bitbucket.io/"
+SRC_URI="https://bitbucket.org/dismine/${PN}/get/v${PV}.zip -> ${P}.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome"
+
+LANGS="cs de el en en es fi fr he id it nl pt-BR ro ru uk zh-CN"
+
+for LANG in ${LANGS}; do
+	IUSE="${IUSE} l10n_${LANG}"
+done
+
+CDEPEND="
+	app-text/poppler
+	dev-qt/linguist:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5"
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}/dismine-${PN}-dd3cff212db5
+
+src_configure() {
+	local locales=""
+	local locale
+
+	for LANG in ${LANGS}; do
+		if use l10n_${LANG}; then
+			case ${LANG} in
+			"cs")
+				locale="cs_CZ"
+				;;
+			"de")
+				locale="de_DE"
+				;;
+			"el")
+				locale="el_GR"
+				;;
+			"en")
+				locale="en_CA en_IN en_US"
+				;;
+			"es")
+				locale="es_ES"
+				;;
+			"fi")
+				locale="fi_FI"
+				;;
+			"fr")
+				locale="fr_FR"
+				;;
+			"he")
+				locale="he_IL"
+				;;
+			"id")
+				locale="id_ID"
+				;;
+			"it")
+				locale="it_IT"
+				;;
+			"nl")
+				locale="nl_NL"
+				;;
+			"pt-BR")
+				locale="pt_BR"
+				;;
+			"ro")
+				locale="ro_RO"
+				;;
+			"ru")
+				locale="ru_RU"
+				;;
+			"uk")
+				locale="uk_UA"
+				;;
+			"zh-CN")
+				locale="zh_CN"
+				;;
+			esac
+
+			locales="${locales} ${locale}"
+		fi
+	done
+
+	eqmake5 LOCALES="${locales}" "CONFIG+=noDebugSymbols no_ccache noRunPath noTests noWindowsInstaller" Valentina.pro -r
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+
+	dodoc AUTHORS.txt ChangeLog.txt README.txt
+
+	doman dist/debian/${PN}.1
+	doman dist/debian/tape.1
+
+	cp dist/debian/valentina.sharedmimeinfo dist/debian/${PN}.xml || die
+	insinto /usr/share/mime/packages
+	doins dist/debian/${PN}.xml
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	if use gnome ; then
+		gnome2_icon_cache_update
+	fi
+}
diff --git a/media-gfx/valentina/valentina-9999.ebuild b/media-gfx/valentina/valentina-9999.ebuild
index a08d13776641..5aaeab21f49e 100644
--- a/media-gfx/valentina/valentina-9999.ebuild
+++ b/media-gfx/valentina/valentina-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
@@ -23,6 +23,8 @@ done
 
 CDEPEND="
 	app-text/poppler
+	dev-qt/linguist:5
+	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5[ssl]
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 6bdc31e6ae6a..58940ef75585 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index ef00413bc4bd..2dfabecefb21 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -10,5 +10,5 @@ DIST allegro-5.0.11.tar.gz 3203777 BLAKE2B b8946e58cde38fdf52f42e041fb27ea92e958
 DIST allegro-5.2.4.0.tar.gz 7822903 BLAKE2B 50538e27276fbe1572a660b3f1396bdb9b542dc2aafaa819a4108e0e2771731cb6924cf1d0b7a7bfea1ff5c12b4772ff58dc571c81bb6a601d31a2083f5f9bea SHA512 c5f80191005165331635464ffd345369943d37dcb55345176a7171614e12826b25d9d74ab656333302d6682d404f1b46a5d94c0dd23d7873151e6e488d62c776
 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 2708 BLAKE2B 94e26ea1fd401a320226231df222b6850da1426c2152fbba9233d5594ce6910f29c64aed069050b658238c1644b730d2c78fb1a88739acd8a700c03b901b2a8d SHA512 390d4d7dbdcf5d7430ecc881d3f83ab4919fac61cff0854e83ba287cac1dad48d78e4da804eb9bd78450cd7736386bfd15a189336e6fbf4a234a78897e03b6ac
+EBUILD allegro-5.2.4.0.ebuild 2704 BLAKE2B 00be6767ea9561888a856b5645d62b50b35d52881cfa39e0914e60bffb55409db6eb9c81280deb14307140527830428eb638221dee672eb545912946b04479a4 SHA512 6ed0efe4520dada386b2bf29b660696606afe69a723f64f699980a103e5a4b3206724dee9f4c6c77e43009146747973880ad96610cf410b6f5c698904d6a61e6
 MISC metadata.xml 1089 BLAKE2B 195c71477c57ae4e873d7abec9ab26e8047e88fc8d0ecc5977a9059f990dabcfdb2ea184f6fe873a96868e684936ee1926ab5a9d15b34a7885e5769c981c23b3 SHA512 55c72ad0b2a1f00004f676e8a603551aba34b8a6cbb491ddfde7938d18093e42e4610d3cf1154196625e92a25f3d08cddca19930a20df312c455d3338fe30a1a
diff --git a/media-libs/allegro/allegro-5.2.4.0.ebuild b/media-libs/allegro/allegro-5.2.4.0.ebuild
index 93adbedcd033..ec269bd77e84 100644
--- a/media-libs/allegro/allegro-5.2.4.0.ebuild
+++ b/media-libs/allegro/allegro-5.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/liballeg/allegro5/releases/download/${PV}/${P}.tar.g
 
 LICENSE="BSD ZLIB"
 SLOT="5"
-KEYWORDS="~amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="alsa dumb flac gtk jpeg openal opengl opus oss physfs png pulseaudio test truetype vorbis webp X xinerama"
 
 REQUIRED_USE="X? ( opengl ) xinerama? ( X )"
diff --git a/media-libs/aubio/Manifest b/media-libs/aubio/Manifest
index ce09144203b8..3c4c4ba176b3 100644
--- a/media-libs/aubio/Manifest
+++ b/media-libs/aubio/Manifest
@@ -1,11 +1,3 @@
-AUX aubio-0.4.1-ffmpeg29.patch 709 BLAKE2B 1247aba5a87283e48a7bd312aaf2399d920f4c4684caf84f2203ba3af1219c15a5cb87301bdced313188eafaa9abc725676555ea922b146ee98cc5532b1a2ba7 SHA512 7dfec25471d9d802d747cf13102067de0ff589e51501083cab35cc9e3fc8947e1ccdbd2087cfdc0caa7cf9129dde5dc37a3e90548fb8328322aa7a9ca89a6ae0
-AUX aubio-0.4.6-ffmpeg4.patch 442 BLAKE2B 41daeb41d18f1b964e625ba2199054a3ffd90f73710f40dd061c9c5bf1df6cf7caf90c1e51b8bf323d7c6cd3c0ccb1fb58b2268b955547c31811b8c5b3c12c98 SHA512 3dcaba80b3cd269627e60ad6fe8dc7a884492bca6365e74e55fb5279d8b2f1900ac5b078eb3c574f499389e06cb2aaed3de447cf00a3be46c83b062b970af187
-DIST aubio-0.4.1.tar.bz2 288136 BLAKE2B ba7368fab21fec73dc555ea0d7291eea010a415d8bc77601337cf311277f3c82564c2f021b971a4117a3f99ab69e7a61e55b8ee488ca24b9b5319ab4a00a3a6b SHA512 f36800f1a0cbe72509e05d15d79759ed25975e92701804597ed4c9d93e27d5e7b908e0aa65819ce763882945123ea174a0825c7aacf9f9494f56d72de5b8308c
-DIST aubio-0.4.2.tar.bz2 304216 BLAKE2B aab7e55d580105e6180503503ae2970d150d86e445d5c1b10d3f39c8cdf7496d0c280a57a2fc7ad3ea5142996d56c53cd2e1c6f736fb1a98b9b142438c919e04 SHA512 b57b6d147b305a264f0055726f76a8452f784b556a7fda911f056adbedd2855048e93c0e21b9f359e3f442f1542189aff0c214dd85141e2e06048a07f47703ff
-DIST aubio-0.4.6.tar.bz2 363016 BLAKE2B 3847ed02b7d64d9796bd1f5a06044d945f5859ab87a762978bf2b0b6650cc0e19c9b8eec99a793e14dd25c06f66d2bffd453ecca824fbc5f47700fda7f78854b SHA512 0e5cab0c88d51f2fb70c0d85e1c067a7b3758fbffdbd5026686726379aa36203adb63ed3f8e40c83ea02930e0ffc4e6c246803f1d518d448d47a01984678e77d
 DIST aubio-0.4.7.tar.bz2 372173 BLAKE2B 544239b215dd87d4cf4a6ed6b5dd856411d0a3f1c3242e3e1077fa0780160785a9934884a1f0d0dc80fe21b1d417bc3800db59842ec300a4c29d75b7942cba05 SHA512 30c614f2b502b993df28d4746a99421fe0aada33c98c42ea19c271554b29b360cb4d4f6650c1b1da508da4bc341348c5944cb452f69b2bf354ca6348f84de260
-EBUILD aubio-0.4.1-r1.ebuild 2290 BLAKE2B 8c8dd11e0a1b64a9d5643fd5c212f3afe881c2d58a923dd087008631b6319814d5ef8b40804b24714696dbf21ddd36532f225e6c5bd40450beff129e5623427f SHA512 104687177d18f338d7616995602e04da412aecd184ef2759739cce7e242b138769b0d4ea54baa1730d81fbe4c5b2a371e72f9b9127b9f1a180f5baea81f3db4b
-EBUILD aubio-0.4.2-r1.ebuild 2212 BLAKE2B dbf8a2d51acb131d2ff2ab5a67bc6c560f8fbf45c196f71b5db3efde58f8d7561023087600306ab6870e5696e994299b9aa5c3436328f80a9659e073a352fe99 SHA512 ed2478410501447475bea8474387339a291e6f790672fa4afe2a7ecbf5ab707a7b7c750e02083c705bf8f10da4dc04f0ca94987992c8dae19ccc3fae71323c4d
-EBUILD aubio-0.4.6.ebuild 2293 BLAKE2B 47eac9ff599213674a34161525ba865a67358a0cedf7f0c9c52ca5fdbd3049897c303bab11c328ce97eb66798819e176e45388ba19f07b715813628790044a8b SHA512 fbf5390c609fcac1fc9c544438f4dddc86f03746a392336a823f0a355abe62e2c93e7decadcf9a68d90b2deaa1b3a9657daaaadb87af39091e1e7232fbc437b9
-EBUILD aubio-0.4.7.ebuild 2280 BLAKE2B c489046f7d7b1ae283c31a4c7fb232b2302c58e830e056ef5f5015f890590161c4ad7935f7bdd9ec9ae449cf2aa42838ca8472dcbfa26377fb4bd3aa13f722d0 SHA512 f29514a1d45252a92f3e7fc1f17db8eb96df89785e2ff72e266425c0487678ba2b4349ab2c57475f211f92cb17f9006901a7c28a57369b6f8ac59d543e08ccd9
+EBUILD aubio-0.4.7.ebuild 2450 BLAKE2B 975c2121ba3b505134e3b079e8654f77d16902e2fe6c31b158577922e3a2332909ff78f3eb04e16eef14039e1fdb4ead67a949eecc6f166f5efaf69a17bfc5c9 SHA512 7f26d97bf9de42e2429f797c3af73079a3105822ded2550fcf2852c5e6807fc4b60e9dd1688ef97aed1389161bde2544c94360f9fb82dfd92ba23d072ff90f8d
 MISC metadata.xml 346 BLAKE2B 00429033f506bf3818f26f13062d21d0d04d8fc84185244615a09d008c5da6e350df5f32bdcba2c07103039ed64f802cc563a0ca8cd79e117741b947e421142d SHA512 ff3830c2d2322fabdb34458fd27c3e05ad825b1d707eee6150417e4c21480bdffbe4e639ff33a9914cc28189b91e970719326f065746f4241e186f7b27b168d1
diff --git a/media-libs/aubio/aubio-0.4.1-r1.ebuild b/media-libs/aubio/aubio-0.4.1-r1.ebuild
deleted file mode 100644
index 59a64870fc89..000000000000
--- a/media-libs/aubio/aubio-0.4.1-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-
-inherit distutils-r1 waf-utils multilib eutils
-
-DESCRIPTION="Library for audio labelling"
-HOMEPAGE="https://aubio.org/"
-SRC_URI="https://aubio.org/pub/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 sparc x86"
-IUSE="doc double-precision examples ffmpeg fftw jack libsamplerate sndfile python"
-
-RDEPEND="
-	ffmpeg? ( virtual/ffmpeg )
-	fftw? ( sci-libs/fftw:3.0 )
-	jack? ( virtual/jack )
-	libsamplerate? ( media-libs/libsamplerate )
-	python? ( dev-python/numpy[${PYTHON_USEDEP}] ${PYTHON_DEPS} )
-	sndfile? ( media-libs/libsndfile )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	app-text/txt2man
-	doc? ( app-doc/doxygen )"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DOCS=( AUTHORS ChangeLog README.md )
-PYTHON_SRC_DIR="${S}/python"
-
-src_prepare() {
-	sed -i -e "s:\/lib:\/$(get_libdir):" src/wscript_build || die
-	sed -i -e "s:doxygen:doxygen_disabled:" wscript || die
-	has_version '>=media-video/ffmpeg-2.8' && epatch "${FILESDIR}/${PN}-0.4.1-ffmpeg29.patch"
-}
-
-src_configure() {
-	python_setup
-	waf-utils_src_configure \
-		--enable-complex \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		$(use_enable double-precision double) \
-		$(use_enable fftw fftw3f) \
-		$(use_enable fftw fftw3) \
-		$(use_enable ffmpeg avcodec) \
-		$(use_enable jack) \
-		$(use_enable libsamplerate samplerate) \
-		$(use_enable sndfile)
-
-	if use python ; then
-		cd "${PYTHON_SRC_DIR}" || die
-		distutils-r1_src_configure
-	fi
-}
-
-src_compile() {
-	waf-utils_src_compile --notests
-
-	if use doc; then
-		cd "${S}"/doc || die
-		doxygen full.cfg || die
-	fi
-
-	if use python ; then
-		cd "${PYTHON_SRC_DIR}" || die
-		distutils-r1_src_compile
-	fi
-}
-
-src_test() {
-	waf-utils_src_compile --alltests
-
-	if use python ; then
-		cd "${PYTHON_SRC_DIR}" || die
-		distutils-r1_src_test
-	fi
-}
-
-src_install() {
-	waf-utils_src_install
-
-	if use python ; then
-		cd "${PYTHON_SRC_DIR}" || die
-		DOCS="" distutils-r1_src_install
-		newdoc README README.python
-	fi
-
-	if use doc; then
-		dohtml -r doc/full/html/.
-		dodoc doc/*.txt
-	fi
-
-	if use examples; then
-		# install dist_noinst_SCRIPTS from Makefile.am
-		dodoc -r examples
-	fi
-}
diff --git a/media-libs/aubio/aubio-0.4.2-r1.ebuild b/media-libs/aubio/aubio-0.4.2-r1.ebuild
deleted file mode 100644
index 47feb82207d9..000000000000
--- a/media-libs/aubio/aubio-0.4.2-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-
-inherit distutils-r1 waf-utils multilib eutils
-
-DESCRIPTION="Library for audio labelling"
-HOMEPAGE="https://aubio.org/"
-SRC_URI="https://aubio.org/pub/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc double-precision examples ffmpeg fftw jack libav libsamplerate sndfile python"
-
-RDEPEND="
-	ffmpeg? (
-		!libav? ( >=media-video/ffmpeg-2.6:0= )
-		libav? ( >=media-video/libav-9:0= )
-	)
-	fftw? ( sci-libs/fftw:3.0 )
-	jack? ( virtual/jack )
-	libsamplerate? ( media-libs/libsamplerate )
-	python? ( dev-python/numpy[${PYTHON_USEDEP}] ${PYTHON_DEPS} )
-	sndfile? ( media-libs/libsndfile )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	app-text/txt2man
-	doc? ( app-doc/doxygen )"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DOCS=( AUTHORS ChangeLog README.md )
-PYTHON_SRC_DIR="${S}/python"
-
-src_prepare() {
-	sed -i -e "s:doxygen:doxygen_disabled:" wscript || die
-}
-
-src_configure() {
-	python_setup
-	waf-utils_src_configure \
-		--enable-complex \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		$(use_enable double-precision double) \
-		$(use_enable fftw fftw3f) \
-		$(use_enable fftw fftw3) \
-		$(use_enable ffmpeg avcodec) \
-		$(use_enable jack) \
-		$(use_enable libsamplerate samplerate) \
-		$(use_enable sndfile)
-
-	if use python ; then
-		cd "${PYTHON_SRC_DIR}" || die
-		distutils-r1_src_configure
-	fi
-}
-
-src_compile() {
-	waf-utils_src_compile --notests
-
-	if use doc; then
-		cd "${S}"/doc || die
-		doxygen full.cfg || die
-	fi
-
-	if use python ; then
-		cd "${PYTHON_SRC_DIR}" || die
-		distutils-r1_src_compile
-	fi
-}
-
-src_test() {
-	waf-utils_src_compile --alltests
-
-	if use python ; then
-		cd "${PYTHON_SRC_DIR}" || die
-		distutils-r1_src_test
-	fi
-}
-
-src_install() {
-	waf-utils_src_install
-
-	if use doc; then
-		dohtml -r doc/full/html/.
-		dodoc doc/*.txt
-	fi
-
-	if use examples; then
-		# install dist_noinst_SCRIPTS from Makefile.am
-		dodoc -r examples
-	fi
-
-	if use python ; then
-		cd "${PYTHON_SRC_DIR}" || die
-		DOCS="" distutils-r1_src_install
-		newdoc README README.python
-	fi
-}
diff --git a/media-libs/aubio/aubio-0.4.6.ebuild b/media-libs/aubio/aubio-0.4.6.ebuild
deleted file mode 100644
index 9c6af6537ba0..000000000000
--- a/media-libs/aubio/aubio-0.4.6.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
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-
-inherit distutils-r1 waf-utils multilib eutils
-
-DESCRIPTION="Library for audio labelling"
-HOMEPAGE="https://aubio.org/"
-SRC_URI="https://aubio.org/pub/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0/5"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc double-precision examples ffmpeg fftw jack libav libsamplerate sndfile python"
-
-RDEPEND="
-	ffmpeg? (
-		!libav? ( >=media-video/ffmpeg-2.6:0= )
-		libav? ( >=media-video/libav-9:0= )
-	)
-	fftw? ( sci-libs/fftw:3.0 )
-	jack? ( virtual/jack )
-	libsamplerate? ( media-libs/libsamplerate )
-	python? ( dev-python/numpy[${PYTHON_USEDEP}] ${PYTHON_DEPS} )
-	sndfile? ( media-libs/libsndfile )
-"
-DEPEND="
-	${RDEPEND}
-	${PYTHON_DEPS}
-	app-text/txt2man
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DOCS=( AUTHORS ChangeLog README.md )
-PYTHON_SRC_DIR="${S}"
-PATCHES=( "${FILESDIR}/${PN}-0.4.6-ffmpeg4.patch" )
-
-src_prepare() {
-	default
-	sed -i -e "s:doxygen:doxygen_disabled:" wscript || die
-}
-
-src_configure() {
-	python_setup
-	waf-utils_src_configure \
-		--enable-complex \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		$(use_enable double-precision double) \
-		$(use_enable fftw fftw3f) \
-		$(use_enable fftw fftw3) \
-		$(use_enable ffmpeg avcodec) \
-		$(use_enable jack) \
-		$(use_enable libsamplerate samplerate) \
-		$(use_enable sndfile)
-
-	if use python ; then
-		cd "${PYTHON_SRC_DIR}" || die
-		distutils-r1_src_configure
-	fi
-}
-
-src_compile() {
-	waf-utils_src_compile --notests
-
-	if use doc; then
-		cd "${S}"/doc || die
-		emake dirhtml
-	fi
-
-	if use python ; then
-		cd "${PYTHON_SRC_DIR}" || die
-		distutils-r1_src_compile
-	fi
-}
-
-src_test() {
-	waf-utils_src_compile --alltests
-
-	if use python ; then
-		cd "${PYTHON_SRC_DIR}" || die
-		distutils-r1_src_test
-	fi
-}
-
-src_install() {
-	waf-utils_src_install
-
-	if use examples; then
-		# install dist_noinst_SCRIPTS from Makefile.am
-		dodoc -r examples
-	fi
-
-	if use python ; then
-		cd "${PYTHON_SRC_DIR}" || die
-		DOCS="" distutils-r1_src_install
-		newdoc python/README.md README.python
-	fi
-
-	if use doc; then
-		dodoc doc/*.txt
-		docinto html
-		dodoc -r doc/_build/dirhtml/.
-	fi
-}
diff --git a/media-libs/aubio/aubio-0.4.7.ebuild b/media-libs/aubio/aubio-0.4.7.ebuild
index 9cb10b60097e..8b392873a277 100644
--- a/media-libs/aubio/aubio-0.4.7.ebuild
+++ b/media-libs/aubio/aubio-0.4.7.ebuild
@@ -6,8 +6,7 @@ EAPI=6
 DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE='threads(+)'
-
-inherit distutils-r1 waf-utils multilib eutils
+inherit distutils-r1 waf-utils
 
 DESCRIPTION="Library for audio labelling"
 HOMEPAGE="https://aubio.org/"
@@ -15,49 +14,60 @@ SRC_URI="https://aubio.org/pub/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0/5"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc double-precision examples ffmpeg fftw jack libav libsamplerate sndfile python"
+KEYWORDS="amd64 ~ppc ppc64 sparc x86"
+IUSE="doc double-precision examples ffmpeg fftw jack libav libsamplerate sndfile python test"
 
 RDEPEND="
 	ffmpeg? (
 		!libav? ( >=media-video/ffmpeg-2.6:0= )
 		libav? ( >=media-video/libav-9:0= )
 	)
-	fftw? ( sci-libs/fftw:3.0 )
+	fftw? ( sci-libs/fftw:3.0= )
 	jack? ( virtual/jack )
 	libsamplerate? ( media-libs/libsamplerate )
-	python? ( dev-python/numpy[${PYTHON_USEDEP}] ${PYTHON_DEPS} )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
 	sndfile? ( media-libs/libsndfile )
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	app-text/txt2man
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 "
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	?? ( double-precision libsamplerate )
+"
 
 DOCS=( AUTHORS ChangeLog README.md )
 PYTHON_SRC_DIR="${S}"
 
 src_prepare() {
 	default
-	sed -i -e "s:doxygen:doxygen_disabled:" wscript || die
+	sed -e "s:doxygen:doxygen_disabled:" -i wscript || die
+
+	if ! use test; then
+		sed -e "/bld.*tests/d" -i wscript || die
+	fi
 }
 
 src_configure() {
 	python_setup
-	waf-utils_src_configure \
-		--enable-complex \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		$(use_enable double-precision double) \
-		$(use_enable fftw fftw3f) \
-		$(use_enable fftw fftw3) \
-		$(use_enable ffmpeg avcodec) \
-		$(use_enable jack) \
-		$(use_enable libsamplerate samplerate) \
+	local mywafconfargs=(
+		--enable-complex
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable double-precision double)
+		$(use_enable fftw fftw3)
+		$(use_enable ffmpeg avcodec)
+		$(use_enable jack)
+		$(use_enable libsamplerate samplerate)
 		$(use_enable sndfile)
+	)
+	use double-precision || mywafconfargs+=( $(use_enable fftw fftw3f) )
+
+	waf-utils_src_configure "${mywafconfargs[@]}"
 
 	if use python ; then
 		cd "${PYTHON_SRC_DIR}" || die
diff --git a/media-libs/aubio/files/aubio-0.4.1-ffmpeg29.patch b/media-libs/aubio/files/aubio-0.4.1-ffmpeg29.patch
deleted file mode 100644
index 86562716d3e5..000000000000
--- a/media-libs/aubio/files/aubio-0.4.1-ffmpeg29.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: aubio-0.4.1/src/io/source_avcodec.c
-===================================================================
---- aubio-0.4.1.orig/src/io/source_avcodec.c
-+++ aubio-0.4.1/src/io/source_avcodec.c
-@@ -167,7 +167,7 @@ aubio_source_avcodec_t * new_aubio_sourc
-   }
- 
-   AVFrame *avFrame = s->avFrame;
--  avFrame = avcodec_alloc_frame();
-+  avFrame = av_frame_alloc();
-   if (!avFrame) {
-     AUBIO_ERR("source_avcodec: Could not allocate frame for (%s)\n", s->path);
-   }
-@@ -415,7 +415,7 @@ void del_aubio_source_avcodec(aubio_sour
-   }
-   s->output = NULL;
-   if (s->avFrame != NULL) {
--    avcodec_free_frame( &(s->avFrame) );
-+    av_frame_free( &(s->avFrame) );
-   }
-   s->avFrame = NULL;
-   AUBIO_FREE(s);
diff --git a/media-libs/aubio/files/aubio-0.4.6-ffmpeg4.patch b/media-libs/aubio/files/aubio-0.4.6-ffmpeg4.patch
deleted file mode 100644
index 7df4665655bb..000000000000
--- a/media-libs/aubio/files/aubio-0.4.6-ffmpeg4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: aubio-0.4.6/src/io/source_avcodec.c
-===================================================================
---- aubio-0.4.6.orig/src/io/source_avcodec.c
-+++ aubio-0.4.6/src/io/source_avcodec.c
-@@ -58,7 +58,7 @@
- #include "fmat.h"
- #include "source_avcodec.h"
- 
--#define AUBIO_AVCODEC_MAX_BUFFER_SIZE FF_MIN_BUFFER_SIZE
-+#define AUBIO_AVCODEC_MAX_BUFFER_SIZE AV_INPUT_BUFFER_MIN_SIZE
- 
- struct _aubio_source_avcodec_t {
-   uint_t hop_size;
diff --git a/media-libs/chromaprint/Manifest b/media-libs/chromaprint/Manifest
index 65856e83c3ff..9d2e645b7f8d 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 1461 BLAKE2B a98aca3e4dfd1970f6046ca60a67a0ee3ade96cb9a036f4965e5406dc7474ddb614f8742d7e79a9b6d7906a0f516cae9412f18123aac1c12dfdef270426d622b SHA512 f61f93c6211658095672a8651f9e1abe7b93d8c65c8e55f64a159d9889b93d88defcb743227c39338d8681c233f586e9963ab171e94d665df7c41457e56d389c
+EBUILD chromaprint-1.4.3.ebuild 1460 BLAKE2B 5b2c8921ce4a8a6d5d9e17a9a16746ecde239a8c8f6ef9c63c6c2dd2b28baf2d46b1f8a71cb4f87a11469a48d43bf15f602af875b0888ad41fb8f027f424a681 SHA512 9af43db6c8786fe89f8b4457f357ac67328f81975de7d9c382c74c49b18933b4db5cc1a1c675693f64d7d50ed0086266a46209ef53f3b47c401f0d03ce17edf1
 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 47c4df6743e0..09a8c7a88e94 100644
--- a/media-libs/chromaprint/chromaprint-1.4.3.ebuild
+++ b/media-libs/chromaprint/chromaprint-1.4.3.ebuild
@@ -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/cogl/Manifest b/media-libs/cogl/Manifest
index 6d1d20dca970..48768eb33147 100644
--- a/media-libs/cogl/Manifest
+++ b/media-libs/cogl/Manifest
@@ -1,3 +1,3 @@
 DIST cogl-1.22.2.tar.xz 1682360 BLAKE2B f5a1543266bd87c6835322d5dbf501ec4f9fec52cc18d73d140323fef2f1b6b2293b5998bc8914b0a8cb514e7fefe5a1500793e1c7d8b5e0a4365fe8ef13233f SHA512 2ec99f5ff22683d12925b9a1f748387b47c4506aaf3c5afec851b3b6fe6b7cdfd211fb7e4359bd7a1d1b7cb3cb7fbd257efbcb7d2941d0f133a60bad1c9645e3
-EBUILD cogl-1.22.2.ebuild 3842 BLAKE2B 89b491693e418256646e1275e9ddc04f382503a19a1e4202e97f1db3a694bca232adb7813dc7a667e5c461046c1aded013bbac9e99416f46f41b0d01e73896f2 SHA512 dadca4e241bb29a0fccbc9f48f50480092eccc3f8b3d1edb8bba54b9e774827d0008235392080716f173f3614c97ad726e48ae00ac7e9252b940bcc023c287d6
+EBUILD cogl-1.22.2.ebuild 3860 BLAKE2B b9d54bb15ad24bfea7d35239c1a047ca2b9c7bb323a2e920febe5e9c5c0715a277e7edd067d0401c945f86b455fa93160a5d99e2925a03d80766fee7fa6437ec SHA512 5322d779a49ed67efbadef97588e6b9a23a422f31efc9e5b90c1604605df09a2a2b8dccdb777ed091bb3a354ebdda280676e3142e96f7520fdf35ebda701bba8
 MISC metadata.xml 457 BLAKE2B 79c55fb3e5a1e5772c7b26cea5b54b15d683772204ec2ff2229481085130f4945b877a4608f01308a297571c01fa0da50220cd44b6a333eb34d2aae71c3a9157 SHA512 e0e4be51119ec98c906ca2f5df69c9024d77855fafa53ec00bc30b481f33dfd98708c2c9021737f84a46121788079fdc1d9ecffc2693a3257819f05879318a44
diff --git a/media-libs/cogl/cogl-1.22.2.ebuild b/media-libs/cogl/cogl-1.22.2.ebuild
index 97738b3c5969..0a029d23e07a 100644
--- a/media-libs/cogl/cogl-1.22.2.ebuild
+++ b/media-libs/cogl/cogl-1.22.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=6
@@ -48,6 +48,7 @@ RDEPEND="${COMMON_DEPEND}
 	!<media-libs/clutter-1.7
 "
 DEPEND="${COMMON_DEPEND}
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.13
 	>=sys-devel/gettext-0.19
 	virtual/pkgconfig
diff --git a/media-libs/dav1d/Manifest b/media-libs/dav1d/Manifest
index 093a63f3160d..fe0277b6729e 100644
--- a/media-libs/dav1d/Manifest
+++ b/media-libs/dav1d/Manifest
@@ -1,2 +1,2 @@
-EBUILD dav1d-9999.ebuild 1027 BLAKE2B eae4bb5079e773f5b8947a46410e94d6e509599702e69584ae760d185ecbaa3be42d18d83a8eac8f9afb41c9761cfdc4a842902a7de2232706cb1874462d0935 SHA512 fddcc1f6c07a5e885abf5f68baed1922e12f9ad647df6b71d7c6f300584e18530256b4fcb225de20677fbb78a49e5a791dec1bc7336438cc6e756eaeabeba9aa
-MISC metadata.xml 450 BLAKE2B e0baba38bb5ce93220e5773e6f93d92ac12f10f2c7fc26049e3951ed2da988920256efd517eb8fad9d811677ed74ca0bbb6aca216bbee3edf1cffc6b0143a2a4 SHA512 9c93e96a5fbca416aab7c0ed91b3e9ff3dac5469500ff73001519d56240e1c5576c02d51a5988d9e3a5bdfcd1e82bb9eedce2449fb2e8a0f39d1a4c672f19515
+EBUILD dav1d-9999.ebuild 1131 BLAKE2B 25235518b5199a21871de09f885490df749dd10c2fdb64dd52935a4d0a927eb5ff8b3bedc75ce9abc5f0537de5ccd00bbbd8263df35708f51e2e96fa21d4ea35 SHA512 c1b8af3e802d99af531c6a74e203c22dfe5ab434af292c86f985cb6758a51c79dc63f18bfbe105c18b888b5c7fdc677a2968773a05ac09dec924a56417d736e4
+MISC metadata.xml 529 BLAKE2B 5f4963950bd6dffb3408c3fa16a6f8f48c241fde43312ada259db26454f56cc0076efee69d7dfe1f772e4b9815aa178f889f87a5136697c16b6aec1b5ba8afde SHA512 41e9eb4451c973a11cd9d4601fc74b1b1fafc473bdfff8d041a4f7660374be717396bda14b188bf2183b4da713c0bfed2e0ed3f7346af382e498926d9295fff7
diff --git a/media-libs/dav1d/dav1d-9999.ebuild b/media-libs/dav1d/dav1d-9999.ebuild
index 2f6ff4e339b5..c5eab1165a34 100644
--- a/media-libs/dav1d/dav1d-9999.ebuild
+++ b/media-libs/dav1d/dav1d-9999.ebuild
@@ -36,9 +36,15 @@ multilib_src_configure() {
 	use 8bit  && bits+=( 8 )
 	use 10bit && bits+=( 10 )
 
+	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_x32 ]]; then
+		build_asm=false
+	else
+		build_asm=$(usex asm true false)
+	fi
+
 	local emesonargs=(
 		-D bitdepths=$(IFS=,; echo "${bits[*]}")
-		-D build_asm=$(usex asm true false)
+		-D build_asm=$build_asm
 	)
 	meson_src_configure
 }
diff --git a/media-libs/dav1d/metadata.xml b/media-libs/dav1d/metadata.xml
index 726e757f4b0d..96b9f2cd5594 100644
--- a/media-libs/dav1d/metadata.xml
+++ b/media-libs/dav1d/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>lu_zero@gentoo.org</email>
+	</maintainer>
 	<use>
 		<flag name="8bit">Add support for decoding 8-bit AV1.</flag>
 		<flag name="10bit">Add support for building 10-bit AV1.</flag>
diff --git a/media-libs/exempi/Manifest b/media-libs/exempi/Manifest
index f78b0c6ef333..7bfa1dd8f205 100644
--- a/media-libs/exempi/Manifest
+++ b/media-libs/exempi/Manifest
@@ -1,4 +1,5 @@
 AUX exempi-2.4.2-iconv.patch 1440 BLAKE2B a3fccd3c268c28f1fe0b9e13544ba7b33d433a9a92ad9319301996c162766dac9d3fc14f97c3a3c795d787d0b7b9048dec830e1ce5d809b1a14ffa82097e2ff5 SHA512 09cc5ba46c8e0a0b0c1c3b0c86d9c49c21e64a64ca35a90053bf98ed81652b8d1c91bc29a321b5b3bf032b65af220129860f7d3f8c6e12ce608db19c01841736
+AUX exempi-2.4.5-CVE-2018-12648.patch 1556 BLAKE2B 154787079e9a1b3c747275aadd5fd2e47efd6079508b1f2db12ca5d0a83c1efb31ac87f869703e28e1b638a26d693fec6b6875d762c85c2ea63ff3adba70b036 SHA512 12594e62110d5d0e457102db94822c0920196420ca2321193b79736ed05dde6859723d66bba0177d55b0390c0716debfcf0e074ca27eaa12ef3e29e799d3913e
 DIST exempi-2.4.5.tar.gz 3901474 BLAKE2B 7db80266847a18464ee5d75e2ffa38a05b2b23a30fb02a16c0a4a512f853a625f00db3ee0de3f177af584e12d65c8ecd2acc96cae96ef02d7b39129ab4b5274a SHA512 2b3dd8b2d1763fbbfed1995635f625a8e909a4c3119147385737f349002b2fa038cfaca72b2b877db8f28b9022230e49264b58766a68060b0b7c322cad99b22c
-EBUILD exempi-2.4.5.ebuild 1172 BLAKE2B e0ae5fd94d47b0b71dc668183c39b57218a2de780132e813824e673c8e03f8db85f43b80f655a86fb7558023d78f6c98591a7616ac62686275b7b46443130a15 SHA512 66488219608bd2c493e3f8c254ad9aee87be62c9a92e59fc0fffba930f8e41ca5026b8dd19ecad20c0fd5f88759195cb50948e7bc39342dd4a4de5340838a40f
+EBUILD exempi-2.4.5-r1.ebuild 1223 BLAKE2B c2d247879a8bd65f89a9a957fd2c7be1396b8f65824a64702adea1f5592596d2367310ab57c11d6cf97a2ea0d9029bd4a6caf2bf182938f5fa1d2e53865f9173 SHA512 af2b6995b53ae1c5427eac267ca96fca20c7bc2a3475a370493c9b7022cc6e24488113fc9ea3e382a904b6798bf10611e9457ff348a7e8ef99da575f729db049
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/media-libs/exempi/exempi-2.4.5-r1.ebuild b/media-libs/exempi/exempi-2.4.5-r1.ebuild
new file mode 100644
index 000000000000..85ac5b69d1b6
--- /dev/null
+++ b/media-libs/exempi/exempi-2.4.5-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Port of the Adobe XMP SDK to work on UNIX"
+HOMEPAGE="https://libopenraw.freedesktop.org/wiki/Exempi"
+SRC_URI="https://libopenraw.freedesktop.org/download/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="2/3"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+IUSE="examples static-libs test"
+
+RDEPEND="
+	>=dev-libs/expat-2:=
+	sys-libs/zlib
+	virtual/libiconv
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/autoconf-archive
+	sys-devel/gettext
+	test? ( >=dev-libs/boost-1.48 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.2-iconv.patch
+	"${FILESDIR}"/${P}-CVE-2018-12648.patch
+)
+
+src_prepare() {
+	default
+	cp /usr/share/gettext/config.rpath . || die
+	eautoreconf
+}
+
+src_configure() {
+	# Valgrind detection is "disabled" due to bug #295875
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable test unittest) \
+		VALGRIND=""
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+
+	if use examples; then
+		emake -C samples/source distclean
+		rm samples/{,source,testfiles}/Makefile* || die
+		insinto /usr/share/doc/${PF}/examples
+		doins -r samples/*
+	fi
+}
diff --git a/media-libs/exempi/exempi-2.4.5.ebuild b/media-libs/exempi/exempi-2.4.5.ebuild
deleted file mode 100644
index 4a723cd96269..000000000000
--- a/media-libs/exempi/exempi-2.4.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
-inherit autotools ltprune
-
-DESCRIPTION="Exempi is a port of the Adobe XMP SDK to work on UNIX"
-HOMEPAGE="https://libopenraw.freedesktop.org/wiki/Exempi"
-SRC_URI="https://libopenraw.freedesktop.org/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/3"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="examples static-libs test"
-
-RDEPEND="
-	>=dev-libs/expat-2:=
-	virtual/libiconv
-	sys-libs/zlib:=
-"
-DEPEND="${RDEPEND}
-	sys-devel/autoconf-archive
-	sys-devel/gettext
-	test? ( >=dev-libs/boost-1.48 )
-"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${PN}-2.4.2-iconv.patch
-	cp /usr/share/gettext/config.rpath . || die
-	eautoreconf
-}
-
-src_configure() {
-	# Valgrind detection is "disabled" due to bug #295875
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable test unittest) \
-		VALGRIND=""
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-
-	if use examples; then
-		emake -C samples/source distclean
-		rm samples/{,source,testfiles}/Makefile* || die
-		insinto /usr/share/doc/${PF}/examples
-		doins -r samples/*
-	fi
-}
diff --git a/media-libs/exempi/files/exempi-2.4.5-CVE-2018-12648.patch b/media-libs/exempi/files/exempi-2.4.5-CVE-2018-12648.patch
new file mode 100644
index 000000000000..36f0d0734350
--- /dev/null
+++ b/media-libs/exempi/files/exempi-2.4.5-CVE-2018-12648.patch
@@ -0,0 +1,42 @@
+From 8ed2f034705fd2d032c81383eee8208fd4eee0ac Mon Sep 17 00:00:00 2001
+From: Victor Rodriguez <victor.rodriguez.bahena@intel.com>
+Date: Sat, 18 Aug 2018 13:54:55 +0000
+Subject: [PATCH] Issue #9 - Fix null-pointer-dereference (CVE-2018-12648)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The WEBP::GetLE32 function in
+XMPFiles/source/FormatSupport/WEBP_Support.hpp in Exempi 2.4.5 has a
+NULL pointer dereference.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=106981
+https://gitlab.freedesktop.org/libopenraw/exempi/issues/9
+
+Signed-off-by: Victor Rodriguez <victor.rodriguez.bahena@intel.com>
+Signed-off-by: Hubert Figuière <hub@figuiere.net>
+---
+ XMPFiles/source/FormatSupport/WEBP_Support.cpp | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/XMPFiles/source/FormatSupport/WEBP_Support.cpp b/XMPFiles/source/FormatSupport/WEBP_Support.cpp
+index ffaf220..4fe705b 100644
+--- a/XMPFiles/source/FormatSupport/WEBP_Support.cpp
++++ b/XMPFiles/source/FormatSupport/WEBP_Support.cpp
+@@ -160,9 +160,11 @@ bool VP8XChunk::xmp()
+ }
+ void VP8XChunk::xmp(bool hasXMP)
+ {
+-    XMP_Uns32 flags = GetLE32(&this->data[0]);
+-    flags ^= (-hasXMP ^ flags) & (1 << XMP_FLAG_BIT);
+-    PutLE32(&this->data[0], flags);
++    if (&this->data[0] != NULL) {
++        XMP_Uns32 flags = GetLE32(&this->data[0]);
++        flags ^= (-hasXMP ^ flags) & (1 << XMP_FLAG_BIT);
++        PutLE32(&this->data[0], flags);
++    }
+ }
+ 
+ Container::Container(WEBP_MetaHandler* handler) : Chunk(NULL, handler)
+-- 
+2.18.0
diff --git a/media-libs/faac/Manifest b/media-libs/faac/Manifest
index 05e36c38f705..25e4448b43d8 100644
--- a/media-libs/faac/Manifest
+++ b/media-libs/faac/Manifest
@@ -1,11 +1,3 @@
-AUX faac-1.28-altivec.patch 964 BLAKE2B a8724e77e293694e5792c6dd3932bdc5f2afcfcf2384fa6dc05baa4a655217746935c52645db9e83add7cffe1aee25dafdfb0b5873a1df30cb81546771a47841 SHA512 a2a9a8f0b4ee1bca3f8c22286d64ddac2adf7e08b926536de8a72d84cdf1e2f04bd1b7f79aa625eb9b8772d22ac536a665378cc16836f2a0366ff70d29f3b2ef
-AUX faac-1.28-external-libmp4v2.patch 1766 BLAKE2B b2ca7b8d17f3330bb3532acdf82ce9e2196db88991fec79ddd3bacc46ca30db476ae4e04f8f043b070aa2719087b5ab70334a075223816fabe9419f2540ec4c1 SHA512 aa1ad9a486b21c7528522ad9834d928087b463ceaef2e0f710fae70438661b5e2f285c72d7d82926ea90a7f6b3d452d0978cfcc84d06685e534e325e4edd3ad9
-AUX faac-1.28-inttypes.patch 1392 BLAKE2B a80ed6b0308ebdf29f4a62cb4a0cdcfa46978a79b595641b87260d51246f39c2232a9e72fc3726ec611852cd7cb371d2b3bd90acfea7b525c8a73bbcc027aaa0 SHA512 38262b7103cd61cb718e13cd29fe8fb2d416e2a291bdd248b882ec983274c4d16f5c443c5b13eba3aa4efbfb425441bb4c2658434f7718a3e521cdd9ec6cfe4c
-AUX faac-1.28-libmp4v2_r479_compat.patch 4741 BLAKE2B e903d6f253c4bc66388d2af6b59860e60f89f0b7e35382bb2c4889be9e80fad1bc94954133bea251740d258c90971d21f0ed87c57c28dbbf7a598bc735a7f23f SHA512 7b79664fbd912e069b2c0ce49f97a29db03ed3f339bdf6ef5a4cc668c585a56fbb900b6cf40c014ad40f5e559aa048a9340aab30d393420630c433569393fb5b
-DIST faac-1.28.tar.gz 678891 BLAKE2B c5d173649f3df77af7e9856150c52e3edd4dd6bac9c4d66463fa846edab1df4d209113946658820af6413abcd62a7a1101ad30366fc6cc07541c66f9cc7746ba SHA512 0ef721ad28835e95cad41afc0cb6130e1ebb634cb6dd4b40f649bc2269b7bb5bf2887f6d8f023c74628d521f8bdf55b4dd070f972ecff162a5fe0384e026235b
-DIST faac-1.29.8.3.tar.gz 483404 BLAKE2B b5301fe63da7a059d0d4cf298107585295a3f385262c0c7715f5aa252a7400288b5be85cf26ea1ccf43e017c0f00fbf6942a91b903637660843701e1a28a6799 SHA512 2f17d87245c5cdb1ea37f21fb67f5a239f24133bb863bd635bb1f223d8d54c13d23ad43e93954a89361109c39b01e3b506ee791ffdf52741f76feb8bd1ed316c
 DIST faac-1.29.9.2.tar.gz 483826 BLAKE2B f845e75ec640f2a6ac41ad10dfdf1dbc6a6ddef3cb8cc3fe63450515f888343126cb2ec1df4c4eaaefed3d7d5d56249078f14363fcb9d9484228e9b1754a8b99 SHA512 71aaf060d087e866700a3a7c7d447e85709f65709e148610c4b34f5a3e095fa4a5c19f49450610949fd7db12345422b8a116a1d061899c127ad9a1bc30e79c7c
-EBUILD faac-1.28-r4.ebuild 1587 BLAKE2B 177ab6d68bc3565cc7114d40af48c3c15fd6df223d104f4e657782947e970c86337e177910a582095fa3696dd5752684c9365e948aeaca75ef01ee78708b8482 SHA512 40f3b88d7a797cddafef3ee698c5a1442deeef525a14365407a3a7c6b93f9c0e3ea7b88ce5716a939d0dfeba0f69aae977e670299f07901660ee2946f3e32a93
-EBUILD faac-1.29.8.3.ebuild 1143 BLAKE2B 69f410d878a122a34370885786b1c4c842e96087afefb93205ebc6fcefef071932b9a5421dd13307146a13723e00fc4893ec2ca98f82d7021b9c1b620d55a4f1 SHA512 2c9f0d2767acdba0a5a99e19e741816fd49b01b16e4e49c13a910ea53171f84b165fa53219516fac9b661577a9616debbbd6885713a184dca424ee3ff23339b6
-EBUILD faac-1.29.9.2.ebuild 1136 BLAKE2B 36b0ae3627754afe4b355d619ea315fe9bf95df789ef6b64e02a14b4b59e881ab58bc6b7c9d9223e503ac39edea0ad6b3800da9acb1c3f32a3c3689eecf4d017 SHA512 613fc55959708b4bee112e36ae4338ee0ab5302be35618544aa66353f27b3d2fdb36fb105cc6d244cdecdd8cb92bba7947b86b6f624a9a5439e80a45f0d7e60e
+EBUILD faac-1.29.9.2.ebuild 1109 BLAKE2B e7f4ca189087218d7bfb6add73f34413e6e0e94a9ebe225c180067fe29eebe478c7ef70a3d1bebdfbb72d6fef57238d0d6aa3bd1fd3d85554be0d48fa4bd93e6 SHA512 cc45535b12b7cf91874b73428691bd0045b7a9cc53fde222094a9a2eb534213154d29d222750e743796fbb05bf0a7cab9ba1a0ef602b077c57b7ca8065a2727c
 MISC metadata.xml 327 BLAKE2B 3c3eabbf763b0f521edb87c8d91f43a9e64c22c2ef6b86d4b95b997208a5d575f55575cc97d2c2caf3b759cbfbba7ce91377cba0121dca9f7b1a18cdab7e0162 SHA512 a323b91cffc6e960e52f3aac94763767ba428361b736e635ddc6eaee7dab9bacc36cee8bbd38c4887f3243f3f060707f3533b1c4e4be49d14ba1f602e7bf6f80
diff --git a/media-libs/faac/faac-1.28-r4.ebuild b/media-libs/faac/faac-1.28-r4.ebuild
deleted file mode 100644
index 4196ae0cfde3..000000000000
--- a/media-libs/faac/faac-1.28-r4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-# eutils for einstalldocs
-inherit autotools epatch epunt-cxx eutils ltprune multilib-minimal
-
-DESCRIPTION="Free MPEG-4 audio codecs by AudioCoding.com"
-HOMEPAGE="http://www.audiocoding.com"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1 MPEG-4"
-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 ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND="media-libs/libmp4v2:0="
-DEPEND="${RDEPEND}"
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-external-libmp4v2.patch \
-		"${FILESDIR}"/${P}-altivec.patch \
-		"${FILESDIR}"/${P}-libmp4v2_r479_compat.patch \
-		"${FILESDIR}"/${P}-inttypes.patch
-
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.in || die #466984
-
-	eautoreconf
-	epunt_cxx
-}
-
-multilib_src_configure() {
-	local myconf
-	# only used for the fronted we need only for the default ABI.
-	[ "${ABI}" != "${DEFAULT_ABI}" ] && myconf+=" --without-mp4v2"
-
-	ECONF_SOURCE="${S}"	econf \
-		$(use_enable static-libs static) \
-		${myconf}
-
-	# do not build the frontend for non default abis
-	if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
-		sed -i -e 's/frontend//' Makefile || die
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	prune_libtool_files
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	dohtml docs/*.html
-	insinto /usr/share/doc/${PF}/pdf
-	doins docs/libfaac.pdf
-}
diff --git a/media-libs/faac/faac-1.29.8.3.ebuild b/media-libs/faac/faac-1.29.8.3.ebuild
deleted file mode 100644
index 384836d70d7c..000000000000
--- a/media-libs/faac/faac-1.29.8.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
-# eutils for einstalldocs
-inherit autotools epatch epunt-cxx eutils ltprune multilib-minimal
-
-DESCRIPTION="Free MPEG-4 audio codecs by AudioCoding.com"
-HOMEPAGE="http://www.audiocoding.com"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1 MPEG-4"
-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 ~x86-solaris"
-IUSE="static-libs"
-
-DEPEND="${RDEPEND}"
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-src_prepare() {
-	default
-
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #466984
-
-	eautoreconf
-	epunt_cxx
-}
-
-multilib_src_configure() {
-	local myconf=(
-		$(use_enable static-libs static)
-	)
-
-	ECONF_SOURCE="${S}" econf ${myconf[@]}
-
-	# do not build the frontend for non default abis
-	if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
-		sed -i -e 's/frontend//' Makefile || die
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	prune_libtool_files
-}
diff --git a/media-libs/faac/faac-1.29.9.2.ebuild b/media-libs/faac/faac-1.29.9.2.ebuild
index 5a71c4c2055e..c5d4bb08d1de 100644
--- a/media-libs/faac/faac-1.29.9.2.ebuild
+++ b/media-libs/faac/faac-1.29.9.2.ebuild
@@ -2,16 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-# eutils for einstalldocs
-inherit autotools epatch epunt-cxx eutils ltprune multilib-minimal
+
+inherit autotools epunt-cxx multilib-minimal
 
 DESCRIPTION="Free MPEG-4 audio codecs by AudioCoding.com"
-HOMEPAGE="http://www.audiocoding.com"
+HOMEPAGE="https://www.audiocoding.com"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MPEG-4"
 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 ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND="${RDEPEND}"
@@ -41,5 +41,5 @@ multilib_src_configure() {
 
 multilib_src_install() {
 	emake DESTDIR="${D}" install
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-libs/faac/files/faac-1.28-altivec.patch b/media-libs/faac/files/faac-1.28-altivec.patch
deleted file mode 100644
index ae461efc30d3..000000000000
--- a/media-libs/faac/files/faac-1.28-altivec.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-http://bugs.gentoo.org/306881
-
---- configure.in
-+++ configure.in
-@@ -33,7 +33,12 @@
- AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],
-                AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,
-                             external_mp4v2=no, -lstdc++),
--               external_mp4v2=no, [#include <mp4v2/mp4v2.h>])
-+               external_mp4v2=no, [
-+	       #if defined(__ALTIVEC__)
-+	       #undef bool
-+	       #endif
-+	       #include <mp4v2/mp4v2.h>
-+	       ])
- 
- if test x$external_mp4v2 = xyes; then
-   AC_MSG_NOTICE([*** Building with external mp4v2 ***])
---- frontend/main.c
-+++ frontend/main.c
-@@ -30,6 +30,9 @@
- #endif
- 
- #ifdef HAVE_LIBMP4V2
-+#if defined(__ALTIVEC__)
-+# undef bool
-+#endif
- # include <mp4v2/mp4v2.h>
- #endif
- 
---- common/mp4v2/mpeg4ip.h
-+++ common/mp4v2/mpeg4ip.h
-@@ -123,7 +123,6 @@
- #ifdef __cplusplus
- extern "C" {
- #endif
--char *strcasestr(const char *haystack, const char *needle);
- #ifdef __cplusplus
- }
- #endif
diff --git a/media-libs/faac/files/faac-1.28-external-libmp4v2.patch b/media-libs/faac/files/faac-1.28-external-libmp4v2.patch
deleted file mode 100644
index 54a63347b87a..000000000000
--- a/media-libs/faac/files/faac-1.28-external-libmp4v2.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -ur faac-1.28.orig/configure.in faac-1.28/configure.in
---- faac-1.28.orig/configure.in	2009-02-05 02:55:38.000000000 +0200
-+++ faac-1.28/configure.in	2009-07-10 13:21:34.000000000 +0300
-@@ -28,14 +28,17 @@
- AC_CHECK_LIB(gnugetopt, getopt_long)
- 
- AM_CONDITIONAL(WITH_MP4V2, false)
-+AM_CONDITIONAL(WITH_EXTERNAL_MP4V2, false)
- 
- AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],
-                AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,
-                             external_mp4v2=no, -lstdc++),
--               external_mp4v2=no, [#include <mp4.h>])
-+               external_mp4v2=no, [#include <mp4v2/mp4v2.h>])
- 
- if test x$external_mp4v2 = xyes; then
-   AC_MSG_NOTICE([*** Building with external mp4v2 ***])
-+  MY_DEFINE(HAVE_LIBMP4V2)
-+  AM_CONDITIONAL(WITH_EXTERNAL_MP4V2, true)
- else
-   if test x$WITHMP4V2 = xyes; then
-      AC_MSG_NOTICE([*** Building with internal mp4v2 ***])
-diff -ur faac-1.28.orig/frontend/main.c faac-1.28/frontend/main.c
---- faac-1.28.orig/frontend/main.c	2009-01-24 03:10:20.000000000 +0200
-+++ faac-1.28/frontend/main.c	2009-07-10 13:22:18.000000000 +0300
-@@ -30,7 +30,7 @@
- #endif
- 
- #ifdef HAVE_LIBMP4V2
--# include <mp4.h>
-+# include <mp4v2/mp4v2.h>
- #endif
- 
- #define DEFAULT_TNS     0
-diff -ur faac-1.28.orig/frontend/Makefile.am faac-1.28/frontend/Makefile.am
---- faac-1.28.orig/frontend/Makefile.am	2008-12-16 02:56:00.000000000 +0200
-+++ faac-1.28/frontend/Makefile.am	2009-07-10 13:21:55.000000000 +0300
-@@ -8,5 +8,9 @@
- LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lstdc++
- else
- INCLUDES = -I$(top_srcdir)/include 
-+if WITH_EXTERNAL_MP4V2
-+LDADD = $(top_builddir)/libfaac/libfaac.la -lm -lmp4v2
-+else
- LDADD = $(top_builddir)/libfaac/libfaac.la -lm
- endif
-+endif
diff --git a/media-libs/faac/files/faac-1.28-inttypes.patch b/media-libs/faac/files/faac-1.28-inttypes.patch
deleted file mode 100644
index 09304fb60172..000000000000
--- a/media-libs/faac/files/faac-1.28-inttypes.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-use standard integer types, not linux ones
-
---- frontend/main.c
-+++ frontend/main.c
-@@ -440,13 +440,13 @@
-     MP4TrackId MP4track = 0;
-     unsigned int ntracks = 0, trackno = 0;
-     unsigned int ndiscs = 0, discno = 0;
--    u_int8_t compilation = 0;
-+    uint8_t compilation = 0;
-     const char *artist = NULL, *title = NULL, *album = NULL, *year = NULL,
-       *genre = NULL, *comment = NULL, *writer = NULL;
--    u_int8_t *art = NULL;
--    u_int64_t artSize = 0;
--    u_int64_t total_samples = 0;
--    u_int64_t encoded_samples = 0;
-+    uint8_t *art = NULL;
-+    uint64_t artSize = 0;
-+    uint64_t total_samples = 0;
-+    uint64_t encoded_samples = 0;
-     unsigned int delay_samples;
-     unsigned int frameSize;
- #endif
-@@ -647,7 +647,7 @@
-         FILE *artFile = fopen(optarg, "rb");
- 
-         if(artFile) {
--            u_int64_t r;
-+            uint64_t r;
- 
-             fseek(artFile, 0, SEEK_END);
-         artSize = ftell(artFile);
-@@ -1112,7 +1112,7 @@
-             if (bytesWritten > 0)
-             {
- #ifdef HAVE_LIBMP4V2
--                u_int64_t samples_left = total_samples - encoded_samples + delay_samples;
-+                uint64_t samples_left = total_samples - encoded_samples + delay_samples;
-                 MP4Duration dur = samples_left > frameSize ? frameSize : samples_left;
-                 MP4Duration ofs = encoded_samples > 0 ? 0 : delay_samples;
- 
diff --git a/media-libs/faac/files/faac-1.28-libmp4v2_r479_compat.patch b/media-libs/faac/files/faac-1.28-libmp4v2_r479_compat.patch
deleted file mode 100644
index 6aae0d7793e2..000000000000
--- a/media-libs/faac/files/faac-1.28-libmp4v2_r479_compat.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-http://bugs.gentoo.org/397575
-https://sourceforge.net/tracker/?func=detail&aid=3476707&group_id=704&atid=100704
-
---- configure.in
-+++ configure.in
-@@ -33,8 +33,8 @@ AC_CHECK_LIB(gnugetopt, getopt_long)
- AM_CONDITIONAL(WITH_MP4V2, false)
- AM_CONDITIONAL(WITH_EXTERNAL_MP4V2, false)
- 
--AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],
--               AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,
-+AC_CHECK_DECLS([MP4Create],
-+               AC_CHECK_LIB(mp4v2, MP4Create, external_mp4v2=yes,
-                             external_mp4v2=no, -lstdc++),
-                external_mp4v2=no, [#include <mp4v2/mp4v2.h>])
- 
-@@ -42,6 +42,7 @@ if test x$external_mp4v2 = xyes; then
-   AC_MSG_NOTICE([*** Building with external mp4v2 ***])
-   MY_DEFINE(HAVE_EXTERNAL_LIBMP4V2)
-   AM_CONDITIONAL(WITH_EXTERNAL_MP4V2, true)
-+  AC_CHECK_DECLS([MP4TagsAlloc], [], [], [#include <mp4v2/mp4v2.h>])
- else
-   if test x$WITHMP4V2 = xyes; then
-      AC_MSG_NOTICE([*** Building with internal mp4v2 ***])
---- frontend/main.c
-+++ frontend/main.c
-@@ -873,8 +873,12 @@ int main(int argc, char *argv[])
-     if (!faacEncSetConfiguration(hEncoder, myFormat)) {
-         fprintf(stderr, "Unsupported output format!\n");
- #ifdef HAVE_LIBMP4V2
-+#ifdef MP4_CLOSE_DO_NOT_COMPUTE_BITRATE /* r479 fix */
-+        if (container == MP4_CONTAINER) MP4Close(MP4hFile, 0);
-+#else
-         if (container == MP4_CONTAINER) MP4Close(MP4hFile);
- #endif
-+#endif
-         return 1;
-     }
- 
-@@ -885,12 +889,10 @@ int main(int argc, char *argv[])
-         unsigned long ASCLength = 0;
-     char *version_string;
- 
--#ifdef MP4_CREATE_EXTENSIBLE_FORMAT
--    /* hack to compile against libmp4v2 >= 1.0RC3
--     * why is there no version identifier in mp4.h? */
-+#ifdef MP4_DETAILS_ERROR /* r453 fix */
-         MP4hFile = MP4Create(aacFileName, MP4_DETAILS_ERROR, 0);
- #else
--    MP4hFile = MP4Create(aacFileName, MP4_DETAILS_ERROR, 0, 0);
-+        MP4hFile = MP4Create(aacFileName, 0);
- #endif
-         if (!MP4_IS_VALID_FILE_HANDLE(MP4hFile)) {
-             fprintf(stderr, "Couldn't create output file %s\n", aacFileName);
-@@ -905,12 +907,22 @@ int main(int argc, char *argv[])
-     free(ASC);
- 
-     /* set metadata */
-+#if HAVE_DECL_MP4TAGSALLOC
-+    const MP4Tags* tags;
-+    tags = MP4TagsAlloc();
-+    MP4TagsFetch( tags, MP4hFile );
-+#endif
-     version_string = malloc(strlen(faac_id_string) + 6);
-     strcpy(version_string, "FAAC ");
-     strcpy(version_string + 5, faac_id_string);
-+#if !HAVE_DECL_MP4TAGSALLOC
-     MP4SetMetadataTool(MP4hFile, version_string);
-+#else
-+    MP4TagsSetEncodingTool(tags, version_string);
-+#endif
-     free(version_string);
- 
-+#if !HAVE_DECL_MP4TAGSALLOC
-     if (artist) MP4SetMetadataArtist(MP4hFile, artist);
-     if (writer) MP4SetMetadataWriter(MP4hFile, writer);
-     if (title) MP4SetMetadataName(MP4hFile, title);
-@@ -923,8 +935,40 @@ int main(int argc, char *argv[])
-     if (comment) MP4SetMetadataComment(MP4hFile, comment);
-         if (artSize) {
-         MP4SetMetadataCoverArt(MP4hFile, art, artSize);
-+#else
-+    if (artist) MP4TagsSetArtist(tags, artist);
-+    if (writer) MP4TagsSetComposer(tags, writer);
-+    if (title) MP4TagsSetName(tags, title);
-+    if (album) MP4TagsSetAlbum(tags, album);
-+    if (trackno > 0) {
-+        MP4TagTrack tt;
-+        tt.index = trackno;
-+        tt.total = ntracks;
-+        MP4TagsSetTrack(tags, &tt);
-+    }
-+    if (discno > 0) {
-+        MP4TagDisk td;
-+        td.index = discno;
-+        td.total = ndiscs;
-+        MP4TagsSetDisk(tags, &td);
-+    }
-+    if (compilation) MP4TagsSetCompilation(tags, compilation);
-+    if (year) MP4TagsSetReleaseDate(tags, year);
-+    if (genre) MP4TagsSetGenre(tags, genre);
-+    if (comment) MP4TagsSetComments(tags, comment);
-+    if (artSize) {
-+        MP4TagArtwork mp4art;
-+        mp4art.data = art;
-+        mp4art.size = artSize;
-+        mp4art.type = MP4_ART_UNDEFINED; // delegate typing to libmp4v2
-+        MP4TagsAddArtwork( tags, &mp4art );
-+#endif
-         free(art);
-     }
-+#if HAVE_DECL_MP4TAGSALLOC
-+    MP4TagsStore( tags, MP4hFile );
-+    MP4TagsFree( tags );
-+#endif
-     }
-     else
-     {
-@@ -1141,11 +1185,19 @@ int main(int argc, char *argv[])
-         /* clean up */
-         if (container == MP4_CONTAINER)
-         {
-+#ifdef MP4_CLOSE_DO_NOT_COMPUTE_BITRATE /* r479 fix */
-+            MP4Close(MP4hFile, 0);
-+#else
-             MP4Close(MP4hFile);
-+#endif
-             if (optimizeFlag == 1)
-             {
-                 fprintf(stderr, "\n\nMP4 format optimization... ");
-+#ifdef MP4_DETAILS_ERROR /* r453 fix */
-                 MP4Optimize(aacFileName, NULL, 0);
-+#else
-+                MP4Optimize(aacFileName, NULL);
-+#endif
-                 fprintf(stderr, "Done!");
-             }
-         } else
diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
index 2813275db06c..d7061b3609f3 100644
--- a/media-libs/faad2/Manifest
+++ b/media-libs/faad2/Manifest
@@ -1,11 +1,4 @@
-AUX faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch 305 BLAKE2B 44553f698bf6c1f7d43a3ba0767161d61a1f5ac0ce01bbe3d933ba6cc302154e7fd449a652ae4c1412101dac6f8f57fb6db446e596cffa3918a1c57aafdacebd SHA512 8052728ef8190450837fb2aabf6175bbb7b16e21f88e8d3e0b21b401747957bcf5ae101800b2dab83a2bb23cddc595f0980a97bd72fba4cc0eb0c04a03bcf586
-AUX faad2-2.7-libmp4ff-shared-lib.patch 867 BLAKE2B e66bfc5c6709f114f294013baa6f3d64c5944cdd49d114924db8664c5dcb1c63f16efe0e04b16d6bf72124c10466a9b2e1d0c4fadcff6a34c5231edce73c38dc SHA512 e26a147d539172fb6d1ff64b489d066b8bc9a39b3a0406638aa056210d786c9d02512a4f186d94879994db4ff7e29dbd4dc771afdf37cec4507d1a3dd7d87eab
-AUX faad2-2.7-man1_MANS.patch 405 BLAKE2B f239c7a2391f21c5a056d09a8beb27795bb030a7dc5c40db95d903af8a37d780d611d1c31a27c1041a42e9777fd60ef57c866c9a8fce30e9814a626bcb15aaca SHA512 fff6f5dbc0ad086a4131e3ecd66a5db74dc8d9ce908c51a9e94c138847b91d62c63bbad15d32d94a220246db113cc7d4768efa888c82ae95fe5dd3c83b94cf4a
 AUX faad2-2.8.5-libmp4ff-shared-lib.patch 539 BLAKE2B 3ee6b86534612e6c96bc884e71559521c0ed464a66a07217caef0959eca0e2a0bdc5ef28367340d07d5ca1ab1686408b4c98c7ef718d4bcb0fa3d827c11074d3 SHA512 b5889dec7850ffcffa707a8594ef74f1e33848c22d2eb5e1a397ca57884b984633610f37f111b534724f2d8f0331e40ed90b01c9acf22c34053f740703e33fa4
-DIST faad2-2.7.tar.gz 1137407 BLAKE2B 15f82689e671d8cc4ff21bf6f048aadb407abdaeff9ce59982e17b3b97e56c9e848664624e751fd8f4cc7876ab1a8e4c373e7b4a20d9970f5c085d8a0a9006e2 SHA512 8135370497dfcfee09094a03a4a9545ebc58b9e532b89c5d6e5037042549e12ddb75f8903aa05866afac9fa28df96320f1ed2eebffc0660578e54392a51c1161
-DIST faad2-2.8.6.tar.gz 1025654 BLAKE2B 16d5e08ea8f0ecfff8d1f5eb17f219d481afd9bc774c42b1cf4bc604f1d57eeb9bfedc0d5654e52d887a4bdf3ba8e6a215e51343a34f781613e588502532bbe2 SHA512 9b6d7e0277ae6c93a8a799f75e7fa9b9cde6419d61533a4c5ab4335382d0cb01aa0aa2fe0fe727bb94d66fafcfeb1b6871141ab5d8dff49600775ffde5b239b8
 DIST faad2-2.8.8.tar.gz 1069044 BLAKE2B 3e22e695d89cce0ecb673caec73dd3115b2249d18daf6d0c8cf2b5cc90086889c9da733e037bc8b58c0bdc145c66bd4218b9b5e237adb7ad1c6f0caf0d97d304 SHA512 3275d292b2a9fe984842962f4d81202894bddd17033f7cd6df95466554cc968dfcbf2890ae8b1df37da0cd25d645cca0a687f07e39b9fc37dd004fd5956a82af
-EBUILD faad2-2.7-r3.ebuild 1335 BLAKE2B 6d6aaa794e196cb3b9d1ba0b202284ef9b507020fca2e903b875d7e4bd9093ccbc990079b607c25d0cfbcd674e0553c4f9628e4e9a0bccf5188793c6f410842f SHA512 5eac5e8acd0e4d32784053fd5c3d5130037366687ea17161c77c79bb0a681ae60f673468ee1a38a79f19ec46aad049fe590f28747d87c9b834db4573c1c36901
-EBUILD faad2-2.8.6.ebuild 1246 BLAKE2B 0ed1c6985c411391db68a12c9cc74eb7a41e0c406a06086fb95fb9c0e2241b36eedca9f8df1119d3c2aee079ef3e9ed60e433fbd8c2ff64d6c29c66b0e299b9e SHA512 d9281740cd1aa9fd1bc609e6779f209b894909da092a2485b68cc5f57061a5dd202e77e3c9dddea21d69c64e44196996f1417620d729b9cc5a7ba8d5947ed284
-EBUILD faad2-2.8.8.ebuild 1246 BLAKE2B 263a97b01141afc395afa8c9338b14bf20868dc940d9f2cf57e0fcfb87f85963a1bae96672beba07b023118fb9891b688448f208e84c52c1aef1c0a005e9ac9a SHA512 bcf428f68f7a678efcddcd951d71b7b417abc746a3a6fab6c007c531b91696089957b70bb63a1ca75f878b3c00a0273bba21d21c3babdf4bb224773c9ff82d7d
+EBUILD faad2-2.8.8.ebuild 1245 BLAKE2B a4a188d6a9a80efc7c4565477079a0249d8c8e84fe68454969a684b71a26ebb1134f1473192c8df3c8c854ff2f136ce25b6b29fd2a2120614028f53da517d98d SHA512 99aec1c0d40ba306e2780a5b96e4408db1dd0e0676fea4572639cf26157f3972082dd40b19778d8173ae317fea74ac8bcd9a06912ec80d2b135291e87d5df7e5
 MISC metadata.xml 619 BLAKE2B 3eb4a78c845f019f564e15c8aecc41bac00aa7a814f761a6f6b4b5810e245c4645149defb09c998a615c8e3ba551e569373475e7dd8ebb5f8656e6ac6b2992dc SHA512 b62370a9ce905bb0e96001422baee1b75af853080d9ef795148e56ed8c2b8dca9c7eae3a3ff29869dac4e9af5835327649eafa20bc7831b14bec07cb901960fd
diff --git a/media-libs/faad2/faad2-2.7-r3.ebuild b/media-libs/faad2/faad2-2.7-r3.ebuild
deleted file mode 100644
index d9b34c0d9f3d..000000000000
--- a/media-libs/faad2/faad2-2.7-r3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils multilib-minimal
-
-DESCRIPTION="AAC audio decoding library"
-HOMEPAGE="http://www.audiocoding.com/faad2.html"
-SRC_URI="mirror://sourceforge/faac/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="digitalradio static-libs"
-DOCS=( AUTHORS ChangeLog NEWS README README.linux TODO )
-RDEPEND=""
-DEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libmp4ff-shared-lib.patch \
-		"${FILESDIR}"/${P}-libmp4ff-install-mp4ff_int_types_h.patch \
-		"${FILESDIR}"/${P}-man1_MANS.patch
-
-	sed -i -e 's:iquote :I:' libfaad/Makefile.am || die
-
-	# bug 466986
-	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.in || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
-		--disable-dependency-tracking \
-		$(use_with digitalradio drm) \
-		--without-xmms
-
-	# do not build the frontend for non default abis
-	if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
-		sed -i -e 's/frontend//' Makefile || die
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	einstalldocs
-}
diff --git a/media-libs/faad2/faad2-2.8.6.ebuild b/media-libs/faad2/faad2-2.8.6.ebuild
deleted file mode 100644
index 3429665fa71f..000000000000
--- a/media-libs/faad2/faad2-2.8.6.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools ltprune multilib-minimal
-
-DESCRIPTION="AAC audio decoding library"
-HOMEPAGE="http://www.audiocoding.com/faad2.html"
-SRC_URI="mirror://sourceforge/faac/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="digitalradio static-libs"
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-RDEPEND=""
-DEPEND=""
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.8.5-libmp4ff-shared-lib.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i -e 's:iquote :I:' libfaad/Makefile.am || die
-
-	# bug 466986
-	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--without-xmms
-		$(use_with digitalradio drm)
-		$(use_enable static-libs static)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	# do not build the frontend for non default abis
-	if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
-		sed -i -e 's/frontend//' Makefile || die
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	einstalldocs
-}
diff --git a/media-libs/faad2/faad2-2.8.8.ebuild b/media-libs/faad2/faad2-2.8.8.ebuild
index bcbe5b594ec0..6c2bf827e555 100644
--- a/media-libs/faad2/faad2-2.8.8.ebuild
+++ b/media-libs/faad2/faad2-2.8.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/faac/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="digitalradio static-libs"
 
 RDEPEND=""
diff --git a/media-libs/faad2/files/faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch b/media-libs/faad2/files/faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch
deleted file mode 100644
index 5d39cad95d7e..000000000000
--- a/media-libs/faad2/files/faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Install mp4ff_int_types.h for mythmusic.
-
-http://bugs.gentoo.org/275008
-
---- common/mp4ff/Makefile.am
-+++ common/mp4ff/Makefile.am
-@@ -1,5 +1,5 @@
- lib_LTLIBRARIES = libmp4ff.la
--include_HEADERS = mp4ff.h mp4ffint.h
-+include_HEADERS = mp4ff.h mp4ffint.h mp4ff_int_types.h
- 
- AM_CFLAGS = -DUSE_TAGGING=1
- 
diff --git a/media-libs/faad2/files/faad2-2.7-libmp4ff-shared-lib.patch b/media-libs/faad2/files/faad2-2.7-libmp4ff-shared-lib.patch
deleted file mode 100644
index 56a131192969..000000000000
--- a/media-libs/faad2/files/faad2-2.7-libmp4ff-shared-lib.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Ripped from Debian
-
-Patch to create a shared lib for libmp4ff.
-
---- a/common/mp4ff/Makefile.am
-+++ b/common/mp4ff/Makefile.am
-@@ -1,7 +1,8 @@
--lib_LIBRARIES = libmp4ff.a
-+lib_LTLIBRARIES = libmp4ff.la
- include_HEADERS = mp4ff.h mp4ffint.h
- 
--libmp4ff_a_CFLAGS = -DUSE_TAGGING=1
-+AM_CFLAGS = -DUSE_TAGGING=1
- 
--libmp4ff_a_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
-+libmp4ff_la_LDFLAGS = -version-info 0:0:0
-+libmp4ff_la_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
- 		     mp4tagupdate.c mp4ff.h mp4ffint.h mp4ff_int_types.h
---- a/frontend/Makefile.am
-+++ b/frontend/Makefile.am
-@@ -5,7 +5,7 @@
- 	   -I$(top_srcdir)/common/mp4ff
- 
- faad_LDADD = $(top_builddir)/libfaad/libfaad.la \
--	     $(top_builddir)/common/mp4ff/libmp4ff.a
-+	     $(top_builddir)/common/mp4ff/libmp4ff.la
- 
- faad_SOURCES = main.c \
- 	       audio.c audio.h \
diff --git a/media-libs/faad2/files/faad2-2.7-man1_MANS.patch b/media-libs/faad2/files/faad2-2.7-man1_MANS.patch
deleted file mode 100644
index 9c1ddb01bc31..000000000000
--- a/media-libs/faad2/files/faad2-2.7-man1_MANS.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -ur faad2-2.7.orig/frontend/Makefile.am faad2-2.7/frontend/Makefile.am
---- faad2-2.7.orig/frontend/Makefile.am	2009-02-06 18:03:37.000000000 +0200
-+++ faad2-2.7/frontend/Makefile.am	2009-07-20 20:27:29.000000000 +0300
-@@ -1,5 +1,5 @@
- bin_PROGRAMS = faad
--man_MANS = faad.man
-+man1_MANS = faad.man
- 
- INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/faad \
- 	   -I$(top_srcdir)/common/mp4ff
diff --git a/media-libs/fontconfig-ultimate/Manifest b/media-libs/fontconfig-ultimate/Manifest
index 609f753203d2..ae22f1ef6ff4 100644
--- a/media-libs/fontconfig-ultimate/Manifest
+++ b/media-libs/fontconfig-ultimate/Manifest
@@ -1,5 +1,5 @@
 DIST fontconfig-ultimate-2015.04.tar.gz 455899 BLAKE2B 5b9395da2c9091965ddbd65d536932a925c81d2a872f790bf946b2dbb7eea0ebae3a258f88b3628a67b26022cb489aa4a4cdc98cfb4d67b3f1d83907c9f21e5b SHA512 cdf11c298c9746c720dd6a4e1d361aa16244fdd46630fa00fea03d6d57956b6cee41b3ea439c84d81756a11d63768e4672851c9692a87944b6688a9763a06096
 DIST fontconfig-ultimate-2015.08.01.tar.gz 1241997 BLAKE2B 291a2cefb793dda5b5d5c826dd720cb9eee311d67a8268554911a4581b6e2bd3389079f4383eb32d350c57f9eb854af04734adaac40e3da134a819c77456c03e SHA512 2c1e8c522c94f6db45c63cde610bd2abf95ae913241ebda275d40cda0c0b62a489047749eaefa78fcf25d802ebad442f32f2bbf5629d4fa8ee0c6dbc9f105de9
-EBUILD fontconfig-ultimate-2015.04.ebuild 3127 BLAKE2B 385beabc5a08cf353b70ab6a5dc4bc56fd9477df102b10cad73a234cb66848df5342d9febfebfd761e17b823a23160b6a2b7fcbeec1a026fa9ad179b1239e598 SHA512 4675d001e27b22c6e47c78d7c5db867eccfa9790b2f4c46c4623b790ef2ff4f7d6e05e9e7fbe43e84c0ae85f37651a7a5b824795e60af04447885ad33cbf07a6
-EBUILD fontconfig-ultimate-2015.08.01.ebuild 3127 BLAKE2B 385beabc5a08cf353b70ab6a5dc4bc56fd9477df102b10cad73a234cb66848df5342d9febfebfd761e17b823a23160b6a2b7fcbeec1a026fa9ad179b1239e598 SHA512 4675d001e27b22c6e47c78d7c5db867eccfa9790b2f4c46c4623b790ef2ff4f7d6e05e9e7fbe43e84c0ae85f37651a7a5b824795e60af04447885ad33cbf07a6
+EBUILD fontconfig-ultimate-2015.04.ebuild 3127 BLAKE2B cd26b0c4511edfcd3574a5289c9b6ef628a9008173574ccbd769a0ca8a3eddeac8fc3fc85708fb25fbbbe3379d4c3dcf1356a42faf3cb0437c6b6a12c4b975b6 SHA512 e3bc426f980418d18f159ecd29f989c64b3b70ebe3854addae0e2eea71066eacc33037ae1d83db1a07dda73f5d8692f56bee7700dac5c944e456f4d174014bd5
+EBUILD fontconfig-ultimate-2015.08.01.ebuild 3127 BLAKE2B cd26b0c4511edfcd3574a5289c9b6ef628a9008173574ccbd769a0ca8a3eddeac8fc3fc85708fb25fbbbe3379d4c3dcf1356a42faf3cb0437c6b6a12c4b975b6 SHA512 e3bc426f980418d18f159ecd29f989c64b3b70ebe3854addae0e2eea71066eacc33037ae1d83db1a07dda73f5d8692f56bee7700dac5c944e456f4d174014bd5
 MISC metadata.xml 341 BLAKE2B 609469836f44b2b1afcd253057bb9a2ce0a1cae6a28177d71864b50e7ce8cf320278d3b6c393fac59af62d513018ff587bf8cc8a5d251ab1ec3dfccbcd5b34da SHA512 55d47d4699c323ee47f874f74fd765211068a361b83aaa0016c7dd0b838d2d1902ed0c14b8ae264184e1501c31b10d84c87cd9e27989076b999049177b134272
diff --git a/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.04.ebuild b/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.04.ebuild
index 1ae068284626..fb67d6643e15 100644
--- a/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.04.ebuild
+++ b/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.04.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
@@ -6,7 +6,7 @@ inherit readme.gentoo versionator
 
 MY_PV=$(replace_all_version_separators "-")
 DESCRIPTION="A set of font rendering and replacement rules for fontconfig-infinality"
-HOMEPAGE="http://bohoomil.com/"
+HOMEPAGE="https://www.gentoo.org/"
 SRC_URI="https://github.com/bohoomil/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.08.01.ebuild b/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.08.01.ebuild
index 1ae068284626..fb67d6643e15 100644
--- a/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.08.01.ebuild
+++ b/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.08.01.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
@@ -6,7 +6,7 @@ inherit readme.gentoo versionator
 
 MY_PV=$(replace_all_version_separators "-")
 DESCRIPTION="A set of font rendering and replacement rules for fontconfig-infinality"
-HOMEPAGE="http://bohoomil.com/"
+HOMEPAGE="https://www.gentoo.org/"
 SRC_URI="https://github.com/bohoomil/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/media-libs/game-music-emu/Manifest b/media-libs/game-music-emu/Manifest
index ac8c06ad1144..243ed4c835b2 100644
--- a/media-libs/game-music-emu/Manifest
+++ b/media-libs/game-music-emu/Manifest
@@ -1,5 +1,3 @@
-DIST game-music-emu-0.6.1.tar.bz2 171140 BLAKE2B d42a34fa531cf5da8ddd5b1d72cf7735c9edaad67bf47733d75dd74c201652d4031bdc3d634a5f64317957791db0446e96e788c4c07cbdb1c908bfffd094fee0 SHA512 06b3544086fae51361706b0417ae1bc3769863c7d060ebabdd09b930d37df973314c43afff32aedaa9ebb74cdeafdeadaac4aa5d448700ee961d79d7fc9012b4
 DIST game-music-emu-0.6.2.tar.xz 163052 BLAKE2B 8bce2a5c09eef947f02cfc3521aa380564ddaad5f8a8f40ac38b645fc146332ba1cb6755592892dab00200c169a4d1f94978d80c52976c04e120d9d01c8db9dc SHA512 1808d28b54cbbd8dc5e3240eb27d2e546398fb62ab6577e59430a7543cfdaa06482f70b4750656b73a05f1c1bc0c0254db97d0940271ea2144724e1c44f5da10
-EBUILD game-music-emu-0.6.1.ebuild 490 BLAKE2B ca4d490aaeb4e4a55a45fc7f42d4dc84b761c15c0b14604edfa9d428d2312a24f070fe8bfbdc569935afd77a9f38e237ce4d04a1c0aa47d5acc87e355e80aeb5 SHA512 2a5134fc33a4c54aec96b33b8dc6e695eca618b9fdc853a54aa6c792ec40c511c1578a21704f4c8a5ffaaec2a3f4ba5ef06a31ac39f74298330ea2f9617bd721
 EBUILD game-music-emu-0.6.2.ebuild 490 BLAKE2B 7339dd5fd75dbf29c6ce8573074e3cc79bd0a1a7adcdc2c760c734cf07b3d1d267e0c8750f83d25b24528a2803718f6fcbe718d8bb2a108108ac1e469453f07e SHA512 80ebf21a586f60e97935204c674baa75acb956c40306f70e4100ef62a6934ed3d7c0e215c94e4f24fa960b1c0f6bd2e216d76066aa753724c603841da394c9ea
 MISC metadata.xml 400 BLAKE2B 1dd7cab3e13a3364222e52dc2e4c3dcbeb12e4169aaaa4196bc8ab325e42e04aa7b8aaa6fccb64db1de7ed6163d3060fdddb6df21c7243c4c0b3a7b7f28bd3ed SHA512 2abd1362876b6019d1538a6cd6a5740c29c1920037db3f3c622fb7c533a64b6d559ef8cdead9e2fdecc9c64c799fd1d2f8fc5887d493354604e4a99ed77cbf1d
diff --git a/media-libs/game-music-emu/game-music-emu-0.6.1.ebuild b/media-libs/game-music-emu/game-music-emu-0.6.1.ebuild
deleted file mode 100644
index 116ab63d0cd2..000000000000
--- a/media-libs/game-music-emu/game-music-emu-0.6.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 cmake-multilib
-
-DESCRIPTION="Video game music file emulators"
-HOMEPAGE="https://bitbucket.org/mpyne/game-music-emu/wiki/Home"
-SRC_URI="https://bitbucket.org/mpyne/game-music-emu/downloads/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-DOCS=( changes.txt design.txt gme.txt readme.txt )
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index e62748cc7023..8b15ad353e34 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 2108 BLAKE2B fb02bc3d17047a4915901ff9991dbe028c619166276bc3bf2c5c8e94b22237f6f31f1aec712a62d48af88f99d777d4ac20b1bf1d360b16b60e2614916b9d5a89 SHA512 b44bcf8341a40fac07d5752dd810d439280719d496bda91cb3c2b7da8591db01a3a19fbb5bb7c01d45e4b020f924a2ca8dfada028cad591a50f5738eb026939d
+EBUILD gd-2.2.5-r1.ebuild 2102 BLAKE2B 25f329383efef1c05fdf1e1a22788a0389bfa2f2b843e90bac2029e239529d241ae3e8067f931bac1958871858167a0657c5db2f8c70a8f13bee7f6538c6ba4e SHA512 10c49a0fc8b4fe124882be08fc868f63e0f250ece4ee7aa6b08f9cdde1ed7291b75ea124bf6d7587658a9d2c44e79fac30087b75e9bea2f7886c13fffdb58bf7
 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 c00352325c09..55b5475f63bb 100644
--- a/media-libs/gd/gd-2.2.5-r1.ebuild
+++ b/media-libs/gd/gd-2.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 @@ 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/glew/Manifest b/media-libs/glew/Manifest
index 03acf19a6485..914d2fcb4dbb 100644
--- a/media-libs/glew/Manifest
+++ b/media-libs/glew/Manifest
@@ -1,13 +1,8 @@
 AUX glew-2.0.0-install-headers.patch 457 BLAKE2B 284563a64b8f7c01fb13f0dda57acd3d9ed410035cf1be7a8bf6dd9eb07dd84d0ce6a725b8a1999123e61a8de3cb676340eb1092db048e898b84ebe745906441 SHA512 a1a46eb47b4ccbde3dd11d97e4b0be6000a5dfba87e4c9d65d142e572beabd6b6efad2ee278062bc4dd57bb001b65300245fc301f36b11b429b760b4ad385346
 DIST glew-1.10.0.tgz 567605 BLAKE2B 18e2b3a4d60b69def1e68778554b43b85c69914daa20b8a64adb2e807df391a2eaff9c6cb2a3c46e5bbbf004655561ae4d2cd8a2fb883a2754f23564993a61b2 SHA512 0c998fda9fe01c9296a3453966c0449c9968f4f5f989065ca65f0da3830ae8d805699d0ee0362c3b18765420222ba18842b9db20986212afceb36c971ae1bdca
-DIST glew-1.13.0.tgz 616070 BLAKE2B 73a1fa4f3a49a072c7c23c2976775521c85afe4aec7fad6d91d9e3b4df380b37f5410d3e9b2dd31ac903b6d805635e2e1c3db79d6d4864606bf721304cf00379 SHA512 8fc8d7c0d2cd9235ea51db9972f492701827bff40642fdb3cc54c10b0737dba8e6d8d0dcd8c5aa5bfaaae39c6198ba3d4292cd1662fbe1977eb9a5d187ba635f
 DIST glew-1.6.0.tgz 494713 BLAKE2B 17e47092e2eefcad79220232b3aeaf856541f5024bdaa65be866dd7d63ef19ad88b389dd13c2ccf9bafd175d00d18ae94185f890a3d12d61b2445f7fa9d6ba58 SHA512 5b8ca9e97d01d49fde591b0c55683620e0a6ddfaf5e93e03536e6217bbb548adfcd4e945a39ed3cfddac3f239b3272be1b3491f4071689d02c4bfb7e0ec44904
-DIST glew-2.0.0.tgz 667340 BLAKE2B e44fc13a222d613e2cad4717dce24a86941e7ef60331a4c18ac6aeeea09dd51fd3d1f40ec3a77341158911c26ff2c45eaf2df8e002fafda145ae6e89fae6c440 SHA512 e9bcd5f19a4495ce6511dfd76e64b4e4d958603c513ee9063eb9fe24fc6e0413f168620661230f1baef558f2f907cef7fe7ab2bdf957a6f7bda5fe96e9319c6a
 DIST glew-2.1.0.tgz 764073 BLAKE2B 081fb49ef286681657409f950fa03b97210dac3f90197b792d9128a2b9fa271181c9e64422a867b531683ab23010cfeb2f519adc32355839b67bf41934578fb3 SHA512 9a9b4d81482ccaac4b476c34ed537585ae754a82ebb51c3efa16d953c25cc3931be46ed2e49e79c730cd8afc6a1b78c97d52cd714044a339c3bc29734cd4d2ab
 EBUILD glew-1.10.0-r100.ebuild 1948 BLAKE2B 49358c8d4969c8ed80c551d6a8dc504a2368ddb5a96f6f8a3e41d38bc028e70f88b714913f6b55cf85d101cb4b8f5a1d8eeef0a64803291e3e553dfb3234fb5b SHA512 97b574ef48d5d88bd86299fd6a9cf3fb85440af015e50ecd5ed841b214b0e9fd278c4d9e70b57c3c6224a3105582cbbfd7da1d2fcb48a6165d51a9421d9c797c
-EBUILD glew-1.10.0-r2.ebuild 2315 BLAKE2B 403bf435c4c4ac04b2004771d7693e0798c1b9883d9841c0c334f6c88b57c566c3ad5fb4fd809cff3cabc647544587d2a6e23406dfdf661b8b0abcfbe31d3402 SHA512 45bfd975303ce4874f013ce5a68689dc9bfb9a03208025ea8b5057c689c4ed1c3ff08d0341dfeb05d65f16ced9115513c8b043bb88a44adbcefb5867aa85b151
-EBUILD glew-1.13.0.ebuild 2363 BLAKE2B 7697beed6e91c72651668f22a99fd4056d767a41d49e97bd4b19a2eb62a065d8e12073e3a16ce47afee199d05f0b672a9f6c72e37ff2b942aad8373c08ca2e71 SHA512 2cb6bc63987555d2318beee186cd1067637540e0f9743248cfcb9355dcc65d1c5bd58bdcd31994a42c2d3a20cf25acc7c40bc27399b1d6daf32dd194072882db
 EBUILD glew-1.6.0-r100.ebuild 1921 BLAKE2B 634e76c202e3d4b08ef68b0faf4d8c8c88692b32e0b8536c9a3ab617361ad008030994517dc30146171f61d80bc75fafc1cc8e3e51a1ee76563c443ecc7033d7 SHA512 53e816516b5166ec273a9a722694c7aa0961b63144562630979b2db35d0da697f3bf4f8ff0c1cfa44d95a788d0b5304733db3470b6b245b0e2acd952df67a93f
-EBUILD glew-2.0.0.ebuild 2481 BLAKE2B b5bd5d5548b813dd8a7d3417def5b59d94c51cba7288ece7f54caa7427598afc0671378091f867c5923b95a7dc2965eb615d23ddea1ad3bc9fa07aec715506f4 SHA512 892f40d7db982d74e528570479add88b60b8552339a5762973dab1412061bfa4fe963e2d0c19b7c504f66d966086d4cd23d64244ed62c19c99177602b2c01a50
 EBUILD glew-2.1.0.ebuild 2513 BLAKE2B b8c9f8cac57435196d09f9536a6d2dd11c7236922b99d2df76584c1a04f57fcf505fb21589696e7267b1ab4e63834cad1c84f58cc99f35a9961870950eb431a1 SHA512 40be22ce95d3e618803791ff13ecd40554ceb56cbc8a8cdc1a5cb10800f02b00c22b417fd35b70323a27a718ba68f4a56daec0a0ac06d87a8778b774cbc4c0e3
 MISC metadata.xml 296 BLAKE2B 14e5921f53872e45c3b43dbe5d95fbb36162ce327eadfc41b34cbee17c11d1de02562152920026592f3dc508faf080e4e8b4150490a815cf7629b1ecfccda758 SHA512 60f31ba192f23a74365955e122ab54aae36c45b9158a2a5201bac68c46c07195025a9978fec01fa6e9804bc731bf1f7b495445bafb9e53d94f895c128075aa3d
diff --git a/media-libs/glew/glew-1.10.0-r2.ebuild b/media-libs/glew/glew-1.10.0-r2.ebuild
deleted file mode 100644
index 187ff99392be..000000000000
--- a/media-libs/glew/glew-1.10.0-r2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit multilib multilib-minimal toolchain-funcs versionator
-
-DESCRIPTION="The OpenGL Extension Wrangler Library"
-HOMEPAGE="http://glew.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="BSD MIT"
-SLOT="0/$(get_version_component_range 1-2)"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs"
-
-RDEPEND=">=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
-	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i \
-		-e '/INSTALL/s:-s::' \
-		-e '/$(CC) $(CFLAGS) -o/s:$(CFLAGS):$(CFLAGS) $(LDFLAGS):' \
-		-e '/^.PHONY: .*\.pc$/d' \
-		Makefile || die
-
-	if ! use static-libs ; then
-		sed -i \
-			-e '/glew.lib:/s|lib/$(LIB.STATIC) ||' \
-			-e '/glew.lib.mx:/s|lib/$(LIB.STATIC.MX) ||' \
-			-e '/INSTALL.*LIB.STATIC/d' \
-			Makefile || die
-	fi
-
-	# don't do stupid Solaris specific stuff that won't work in Prefix
-	cp config/Makefile.linux config/Makefile.solaris || die
-	# and let freebsd be built as on linux too
-	cp config/Makefile.linux config/Makefile.freebsd || die
-
-	multilib_copy_sources
-}
-
-glew_system() {
-	# Set the SYSTEM variable instead of probing. #523444 #595280
-	case ${CHOST} in
-	*linux*)          echo "linux" ;;
-	*-freebsd*)       echo "freebsd" ;;
-	*-darwin*)        echo "darwin" ;;
-	*-solaris*)       echo "solaris" ;;
-	mingw*|*-mingw*)  echo "mingw" ;;
-	*) die "Unknown system ${CHOST}" ;;
-	esac
-}
-
-set_opts() {
-	myglewopts=(
-		AR="$(tc-getAR)"
-		STRIP=true
-		CC="$(tc-getCC)"
-		LD="$(tc-getCC) ${LDFLAGS}"
-		SYSTEM="$(glew_system)"
-		M_ARCH=""
-		LDFLAGS.EXTRA=""
-		POPT="${CFLAGS}"
-	)
-}
-
-multilib_src_compile() {
-	set_opts
-	emake GLEW_DEST="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" "${myglewopts[@]}"
-}
-
-multilib_src_install() {
-	set_opts
-	emake \
-		GLEW_DEST="${ED}/usr" \
-		LIBDIR="${ED}/usr/$(get_libdir)" \
-		"${myglewopts[@]}" \
-		install.all
-
-	dodoc TODO.txt
-	use doc && dohtml doc/*
-}
diff --git a/media-libs/glew/glew-1.13.0.ebuild b/media-libs/glew/glew-1.13.0.ebuild
deleted file mode 100644
index ef65901cb773..000000000000
--- a/media-libs/glew/glew-1.13.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal toolchain-funcs versionator
-
-DESCRIPTION="The OpenGL Extension Wrangler Library"
-HOMEPAGE="http://glew.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="BSD MIT"
-SLOT="0/$(get_version_component_range 1-2)"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs"
-
-DEPEND="
-	>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
-	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i \
-		-e '/INSTALL/s:-s::' \
-		-e '/$(CC) $(CFLAGS) -o/s:$(CFLAGS):$(CFLAGS) $(LDFLAGS):' \
-		-e '/^.PHONY: .*\.pc$/d' \
-		Makefile || die
-
-	if ! use static-libs ; then
-		sed -i \
-			-e '/glew.lib:/s|lib/$(LIB.STATIC) ||' \
-			-e '/glew.lib.mx:/s|lib/$(LIB.STATIC.MX) ||' \
-			-e '/INSTALL.*LIB.STATIC/d' \
-			Makefile || die
-	fi
-
-	# don't do stupid Solaris specific stuff that won't work in Prefix
-	cp config/Makefile.linux config/Makefile.solaris || die
-	# and let freebsd be built as on linux too
-	cp config/Makefile.linux config/Makefile.freebsd || die
-
-	default
-	multilib_copy_sources
-}
-
-glew_system() {
-	# Set the SYSTEM variable instead of probing. #523444 #595280
-	case ${CHOST} in
-	*linux*)          echo "linux" ;;
-	*-freebsd*)       echo "freebsd" ;;
-	*-darwin*)        echo "darwin" ;;
-	*-solaris*)       echo "solaris" ;;
-	mingw*|*-mingw*)  echo "mingw" ;;
-	*) die "Unknown system ${CHOST}" ;;
-	esac
-}
-
-set_opts() {
-	myglewopts=(
-		AR="$(tc-getAR)"
-		STRIP=true
-		CC="$(tc-getCC)"
-		LD="$(tc-getCC) ${LDFLAGS}"
-		SYSTEM="$(glew_system)"
-		M_ARCH=""
-		LDFLAGS.EXTRA=""
-		POPT="${CFLAGS}"
-	)
-}
-
-multilib_src_compile() {
-	set_opts
-	emake \
-		GLEW_DEST="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		"${myglewopts[@]}"
-}
-
-multilib_src_install() {
-	set_opts
-	emake \
-		GLEW_DEST="${ED}/usr" \
-		LIBDIR="${ED}/usr/$(get_libdir)" \
-		"${myglewopts[@]}" \
-		install.all
-
-	dodoc TODO.txt
-	if use doc; then
-		docinto html
-		dodoc doc/*
-	fi
-}
diff --git a/media-libs/glew/glew-2.0.0.ebuild b/media-libs/glew/glew-2.0.0.ebuild
deleted file mode 100644
index cff2091e2d37..000000000000
--- a/media-libs/glew/glew-2.0.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal toolchain-funcs versionator
-
-DESCRIPTION="The OpenGL Extension Wrangler Library"
-HOMEPAGE="http://glew.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="BSD MIT"
-SLOT="0/$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs"
-
-DEPEND="
-	>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
-	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	local PATCHES=( "${FILESDIR}"/${P}-install-headers.patch )
-
-	sed -i \
-		-e '/INSTALL/s:-s::' \
-		-e '/$(CC) $(CFLAGS) -o/s:$(CFLAGS):$(CFLAGS) $(LDFLAGS):' \
-		-e '/^.PHONY: .*\.pc$/d' \
-		Makefile || die
-
-	if ! use static-libs ; then
-		sed -i \
-			-e '/glew.lib:/s|lib/$(LIB.STATIC) ||' \
-			-e '/glew.lib.mx:/s|lib/$(LIB.STATIC.MX) ||' \
-			-e '/INSTALL.*LIB.STATIC/d' \
-			Makefile || die
-	fi
-
-	# don't do stupid Solaris specific stuff that won't work in Prefix
-	cp config/Makefile.linux config/Makefile.solaris || die
-	# and let freebsd be built as on linux too
-	cp config/Makefile.linux config/Makefile.freebsd || die
-
-	default
-	multilib_copy_sources
-}
-
-glew_system() {
-	# Set the SYSTEM variable instead of probing. #523444 #595280
-	case ${CHOST} in
-	*linux*)          echo "linux" ;;
-	*-freebsd*)       echo "freebsd" ;;
-	*-darwin*)        echo "darwin" ;;
-	*-solaris*)       echo "solaris" ;;
-	mingw*|*-mingw*)  echo "mingw" ;;
-	*) die "Unknown system ${CHOST}" ;;
-	esac
-}
-
-set_opts() {
-	myglewopts=(
-		AR="$(tc-getAR)"
-		STRIP=true
-		CC="$(tc-getCC)"
-		LD="$(tc-getCC) ${LDFLAGS}"
-		SYSTEM="$(glew_system)"
-		M_ARCH=""
-		LDFLAGS.EXTRA=""
-		POPT="${CFLAGS}"
-	)
-}
-
-multilib_src_compile() {
-	set_opts
-	emake \
-		GLEW_DEST="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		"${myglewopts[@]}"
-}
-
-multilib_src_install() {
-	set_opts
-	emake \
-		GLEW_DEST="${ED}/usr" \
-		LIBDIR="${ED}/usr/$(get_libdir)" \
-		PKGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
-		"${myglewopts[@]}" \
-		install.all
-
-	dodoc README.md
-	if use doc; then
-		docinto html
-		dodoc doc/*
-	fi
-}
diff --git a/media-libs/graphene/Manifest b/media-libs/graphene/Manifest
index 7d198cbe6ee2..0f1d5d8dfd30 100644
--- a/media-libs/graphene/Manifest
+++ b/media-libs/graphene/Manifest
@@ -1,3 +1,3 @@
 DIST graphene-1.8.2.tar.xz 127436 BLAKE2B a22251db7cf4719c8a6cde49e6feb0a998d1ec7296fee549a4797d72fa575d4266e48fb5a6d9ebd204b93954a6278b4fa88dc56e5f86d7cf8625a5edc685a09b SHA512 8d250dccac345251081419f4ad7079c8035cb6225e10b23d25799386b067288831c23be667d608228ef44a2f6107ac47fc86bb495eda7881b1336598d6c43234
-EBUILD graphene-1.8.2.ebuild 1742 BLAKE2B 8c9c2ed9d4f75ed224006453c2d3dc43845f480884cdfcb3903ffdc8dc8c8d5843a3ad790db906870bd5a92186169895ac973fbd64aaf1ee739bf647d5c6db15 SHA512 efb4b11d0189e790abd0926ba97307c9640e19fdcc34e85d14f83d89fa3ce7889137367bf982bda365f74c4e04e63adbf1d083e2cde4e93d1fea0efb0a0858ce
+EBUILD graphene-1.8.2.ebuild 1744 BLAKE2B 269bf053126cba977dc72eae47b8b08845fba52db67df3410526d277e88fdd8d9efda419266d43742d08fcef6feabab7f42b6372739afb0d0db65e06edebec1b SHA512 1d165a467abeb3af9629cf53e93a79e0ab73f4c9e6de1530b88ca71fb69321f27d120553d0dffa59501292140c1fde648867a795928f192e50a99af6a363a227
 MISC metadata.xml 333 BLAKE2B 3d34baf2b84e2ca8cc20638b381fdb4771e94f07df133f5d997b5d7bdf3704f8b8f77d2c79815f70246affa2e399d1118e03eae7c7cf8e419fec3dae89ef0405 SHA512 aef6b787ac7f14b56e4eacd746c91671b9a115cb40b312b415c7302d4339f5d3b3a887bd52a2b30ba31b3e0f027360a9fa55f6d3065cf7baedc4bd28dbbcd056
diff --git a/media-libs/graphene/graphene-1.8.2.ebuild b/media-libs/graphene/graphene-1.8.2.ebuild
index 46dfb28a7dec..3a29408eaf22 100644
--- a/media-libs/graphene/graphene-1.8.2.ebuild
+++ b/media-libs/graphene/graphene-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 @@ SRC_URI="https://github.com/ebassi/graphene/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 doc +introspection test"
 
 RDEPEND="
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index fc5241ba32dd..b7a4a2896fa3 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -1,15 +1,16 @@
 AUX gst-plugins-base-0.10.36-gcc-4.9.patch 387 BLAKE2B 5ff5d2b0ae4a97240f86ef857661cb2a12bfa41796f06afa4b64b2d0d194d4949166529d9c8b0b22729237fcdc84580c4a8b0a9d797481da0171ff8fef187cf9 SHA512 db107ac701928d4f9787724ecca5b1eb087b5319e116a75be7cb5aba024a32336b4e94bb45a4923f97762766e263a3bce832c138fff6d69620b346370d289a97
 AUX gst-plugins-base-0.10.36-resync-ringbuffer.patch 530 BLAKE2B cbf4d51313e94df62ff3c3e4df859c04a91e22e994587e4ca6baba59294dff572a7ed80cceb3944d4070717fd6f9ce680e42e71a95032d54c8ca6693df29e21f SHA512 fbc252f10f4539f0448eb6f652a945ecf522f6100cb63fb362617a8990818efb1ba4bd5f866b25d439f39e32a41fcab7ef9b176d4be0e6e5bbb6c1853aa2a688
 DIST gst-plugins-base-0.10.36.tar.xz 2364108 BLAKE2B a71ef5d5c7462d60937602681c060e85ed086a753b7ef354dad48354d6c3741d809f2c0c6a321ef9ac60fb12d24ec65e1baa63e51211134d2a5e03aae16f73d2 SHA512 ea77778e073515df58229a641b4363df31f0b80204a5a43a8feb31f0b03a5a4b9b79d6e07e1615c773a59927a9b649f1b1d782def1120d581d09a090be8363b8
-DIST gst-plugins-base-1.12.4.tar.xz 3119468 BLAKE2B d5ac157618a25c8f0323d1922d5b26b0b5c49f56cb75df3ceeadd0566f873be1a06c863a1da6afff40901fbbbeb1ec6cd6ef4614309ca7f7ff988c0fa9040a10 SHA512 89a6e92cd294612cf1406eb156416ab4606643f6b43637e64a18f6f28ab789ca8d4cf1308434ed85e5fc679c79cc3ca115db48f37e0065a6ab3cdfdbaaad9f53
 DIST gst-plugins-base-1.14.1.tar.xz 3689184 BLAKE2B 17abcab2c84b113180de55d6c781ae11feec66c215febfffefe4a22353c56e82a585647688e2078603b6c3ece6f26afa99969091a72886880a2f8549dd9cb379 SHA512 bca9db8780fe24c19a2c4eae9a16dc0856cb38077580e4344bd4f7fa9a7a03079b92556ff35475a574f624a5a721d80ef925790670e4cc809361ed01108a141e
 DIST gst-plugins-base-1.14.2.tar.xz 3693856 BLAKE2B 7ed05718bfd1dcb15e05e5a2c8758ad409c4ad7f331146363f264aaf7123c8a14c1db81f482710d1069d33e5281087f66e2e38504e39b214befba73ffdd9295c SHA512 35e7eb5c42fe265d38c433575f88d3306f15ff927a989eb375ed5399cbf92af2e9bf553d6eee349dc13673540cee00e1f879595f25e58c188ea443d8a969682f
 DIST gst-plugins-base-1.14.3.tar.xz 3702184 BLAKE2B 8b13cdcb912968ed51bba91faf70060cced562f374d2b6987a9b9ff9a261b553836394cc4dc16df299c21cb303fd87bb0becb57225767c3502c8c16359430523 SHA512 3b5f0dc46d148dd9f162c651594be740f798c1d6272ecabced544f09900b6f2909a9fc705d42e4e98130d6f7cb1368458bfeee27444b5c43e62551defbc3838a
+DIST gst-plugins-base-1.14.4.tar.xz 3703232 BLAKE2B b22c44b857bc4f1972f03752cc1afb35c8d76e2d0c4a06c574af0ac4f3a91080c584ae4e4fc2a263ee879a53d58505c24a756ebc051d81ec62661c4f9e532f0e SHA512 42c59df9f2d848108f12afa0466acbcfa5ccda64e4d0d44608d4268abed20f2e036713de04e7d71feaed1868ad742c5bcb55ae0eef5dec8e19e053dc8541b8af
 EBUILD gst-plugins-base-0.10.36-r2.ebuild 2120 BLAKE2B 5e670a72e651af6a8ef1e4992fc42a7a444e9a77e708b86cdf5d373d96cc549c2953df5da5b001479938f77498eb09de861e89e705ce555618cd45227209a769 SHA512 bc9f491322b473f7ae2a55a7fab8315584b1ef3f71f94ec4968705fb1063d72e6dd2dd80342bd85b7abb29315abb26adbe3002c94c7a7ec27517c8edcf32eafb
-EBUILD gst-plugins-base-1.12.4.ebuild 2635 BLAKE2B 135ac9f8423f4d994fc90320871716c18bc37afef01fdd8fbadb25b1b37addd05aaf9efe915850a64d041f3d1cb52231cf64af87021cb4cc24205e4618d85536 SHA512 01ccfae2d189a9506ae1261f15126aee3967bf76e91808d88b0d2214083e19d628ceba84e44b6a1f47ef673137d42dcecf13ba7750e4f279dbc4a605948e3f76
 EBUILD gst-plugins-base-1.14.1.ebuild 6097 BLAKE2B ffdd010523329417895d7bb0c084ae057085993389c43579e41099f585bac82ce832d2112a8989e7c7bf10a75441aaccaa469bec023552185acbb23ec8c19a91 SHA512 1c4cc400a46d6ae8cd327854aab74b032e6c8ea6eb0110f3e7f8ddc84f7fbae5305d87340a3c5c841c6cc497f7783f0ce67df3a0b17b91fabf055060d1b79cbf
 EBUILD gst-plugins-base-1.14.2-r1.ebuild 5883 BLAKE2B 3231c2ad0d014b9ef9cb0b5d83fa8dffc476aae306b748baa7e192a3f326eba64ec2e8878438d1e06bed2d0a0dbf77499e261189554d5b4ba8c3f70c26756c70 SHA512 74af429382915c4174a37d51c7a3a5187ceb4a67f24a96fc45463f2a799ec5498c28eb40ae321e9915237a5593b61ac80e056b9a3ea7061593803aada923d736
 EBUILD gst-plugins-base-1.14.2.ebuild 6045 BLAKE2B 2b3b0519874526c0780d01380259a0a4986e613af7a4491941e85e504134c505a343812086f128fe251ec912ff528926d96e9f845a524f73162b78b4682e626b SHA512 e88bab789aeedb188724faaa92f39364219b1e512ce1279c2ad617b8302bea1372bea4a1ff57060e12008e81e8627c3d102ed46b2f89b461fa8c01ecd3afcf3b
-EBUILD gst-plugins-base-1.14.3-r1.ebuild 5904 BLAKE2B e4fc6f05dd8a472965cf71ccce226510b337e4a7d486d44789ceb36e19dd75284109b0fe0fbfbb650c997bc85216dec84f27ecb93ef2bbb817208f28318d3ba2 SHA512 225cf77fc13e39acb95d314de785b9273c049ce71e9d22b373f4ab465e361fa41902d94a62fc13b31ad0c9972e9ef36e443aee21fc95000acae8c1ec9a465db3
+EBUILD gst-plugins-base-1.14.3-r1.ebuild 5906 BLAKE2B 4c912c1f88ed151b00539ef601bee22f5aa26994fd7de90086858365d2799fda21438c80a1424bee380d711e7ec54afd724754b313b11dbdbc35e922294f83a0 SHA512 bcd8ab6a7fa00f6f1ae8aad5f8f8b1595de69e89fa005b91cdc2d641166ff99611e781d8c1eb3e95af5b8052a343f4c8146eb4762e43a7036b5a034a530aeb2e
 EBUILD gst-plugins-base-1.14.3.ebuild 6066 BLAKE2B 2d576249fd69de48586c6b7aba76e6d649ecb631e0a3c39defd4537f75588593914fbc2b0c71c50fcfcce0d1bf3a74b7b2c762d7e22251de326bf7ff56eca3ab SHA512 4e055b2f29096ab3db96c5ecdcf2b50fa867c2adc7698e5a00150514ce26044dbba480308c098ffc38f55d881ef09ff50f4932ba185028acb94b541873edbb8e
+EBUILD gst-plugins-base-1.14.4-r1.ebuild 5906 BLAKE2B 4c912c1f88ed151b00539ef601bee22f5aa26994fd7de90086858365d2799fda21438c80a1424bee380d711e7ec54afd724754b313b11dbdbc35e922294f83a0 SHA512 bcd8ab6a7fa00f6f1ae8aad5f8f8b1595de69e89fa005b91cdc2d641166ff99611e781d8c1eb3e95af5b8052a343f4c8146eb4762e43a7036b5a034a530aeb2e
+EBUILD gst-plugins-base-1.14.4.ebuild 6063 BLAKE2B 62e3e62d940a36da3dca05e9700ffc2a6da8e231eff85360f796e6aaf0e5496234e6755217e7500934689d44009f8b1a5de3383959e755cfd83646f0f2d940a7 SHA512 a0b735fa2538e71355591c79a3427f25eeb1df2a9d40182a7ed98de089db8892c40fd260dfb1ba3967a39fe7ab44a55a4eae32a8ecdae453bb94ddf45c2f07aa
 MISC metadata.xml 1065 BLAKE2B 9736df3218c6157e5cc0f14e96a15ec6ab6140e8774c7361dd4fe9378efd37d1a3da593527313a81591818ad48a5585bd4395fbeb85d357449b00bf7e51bbb5c SHA512 520802b59fc6575e16edd765dacab4ff0ff6e51dd162f03fe7e4e07eb472aeb78f3974a32ba613939932e123179106a450c503234ed806a08416dc6b8dd534c2
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.12.4.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.12.4.ebuild
deleted file mode 100644
index e8f7f84e345f..000000000000
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.12.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
-GST_ORG_MODULE="gst-plugins-base"
-
-inherit flag-o-matic ltprune gstreamer
-
-DESCRIPTION="Basepack of plugins for gstreamer"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-
-LICENSE="GPL-2+ LGPL-2+"
-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 +introspection ivorbis +ogg +orc +pango theora +vorbis X"
-REQUIRED_USE="
-	ivorbis? ( ogg )
-	theora? ( ogg )
-	vorbis? ( ogg )
-"
-
-RDEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/gstreamer-${PV}:1.0[introspection?,${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
-	ivorbis? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
-	ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
-	orc? ( >=dev-lang/orc-0.4.24[${MULTILIB_USEDEP}] )
-	pango? ( >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] )
-	theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] )
-	vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
-	)
-	!<media-libs/gst-plugins-bad-1.11.90:1.0
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-	X? ( x11-base/xorg-proto )
-"
-
-multilib_src_configure() {
-	filter-flags -mno-sse -mno-sse2 -mno-sse4.1 #610340
-
-	gstreamer_multilib_src_configure \
-		$(use_enable alsa) \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable ivorbis) \
-		$(use_enable ogg) \
-		$(use_enable orc) \
-		$(use_enable pango) \
-		$(use_enable theora) \
-		$(use_enable vorbis) \
-		$(use_enable X x) \
-		$(use_enable X xshm) \
-		$(use_enable X xvideo) \
-		--enable-iso-codes \
-		--enable-zlib \
-		--disable-debug \
-		--disable-examples \
-		--disable-static
-	# cdparanoia and libvisual are split out, per leio's request
-
-	# bug #366931, flag-o-matic for the whole thing is overkill
-	if [[ ${CHOST} == *86-*-darwin* ]] ; then
-		sed -i \
-			-e '/FLAGS = /s|-O[23]|-O1|g' \
-			gst/audioconvert/Makefile \
-			gst/volume/Makefile || die
-	fi
-
-	if multilib_is_native_abi; then
-		local x
-		for x in libs plugins; do
-			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS NEWS README RELEASE"
-	einstalldocs
-	prune_libtool_files --modules
-}
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.14.3-r1.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.14.3-r1.ebuild
index 73db5954b48b..b87fbb291fbe 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.14.3-r1.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.14.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=6
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~amd64 ~arm ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 
 # For OpenGL we have three separate concepts, with a list of possibilities in each:
 #  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.14.4-r1.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.14.4-r1.ebuild
new file mode 100644
index 000000000000..b87fbb291fbe
--- /dev/null
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.14.4-r1.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE="gst-plugins-base"
+
+inherit flag-o-matic gstreamer
+
+DESCRIPTION="Basepack of plugins for gstreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="GPL-2+ LGPL-2+"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+
+# For OpenGL we have three separate concepts, with a list of possibilities in each:
+#  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
+#  * opengl platforms - glx and/or egl; also cgl, wgl, eagl for non-linux; USE="X opengl" enables glx platform; USE="egl" enables egl platform. Rest is up for relevant prefix teams.
+#  * opengl windowing system - x11, wayland, win32, cocoa, android, viv_fb, gbm and/or dispmanx; USE=X enables x11 (but for WSI it's automagic - FIXME), USE=wayland enables wayland, USE=gbm enables gbm (automagic upstream - FIXME); rest is up for relevant prefix/arch teams/contributors to test and provide patches
+# With the following limitations:
+#  * If opengl and/or gles2 is enabled, a platform has to be enabled - x11 or egl in our case, but x11 (glx) is acceptable only with opengl
+#  * If opengl and/or gles2 is enabled, a windowing system has to be enabled - x11, wayland or gbm in our case
+#  * glx platform requires opengl API
+#  * wayland, gbm and most other non-glx WSIs require egl platform
+# Additionally there is optional dmabuf support with egl for additional dmabuf based upload/download/eglimage options;
+#  and optional graphene usage for gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader;
+#  and libpng/jpeg are required for gloverlay element;
+
+# Keep default IUSE options for relevant ones mirrored with gst-plugins-gtk and gst-plugins-bad
+IUSE="alsa +egl gbm gles2 +introspection ivorbis +ogg +opengl +orc +pango theora +vorbis wayland +X"
+GL_REQUIRED_USE="
+	|| ( gbm wayland X )
+	wayland? ( egl )
+	gbm? ( egl )
+"
+REQUIRED_USE="
+	ivorbis? ( ogg )
+	theora? ( ogg )
+	vorbis? ( ogg )
+	opengl? ( || ( egl X ) ${GL_REQUIRED_USE} )
+	gles2? ( egl ${GL_REQUIRED_USE} )
+"
+
+# Dependencies needed by opengl library and plugin (enabled via USE gles2 and/or opengl)
+# dmabuf automagic from libdrm headers (drm_fourcc.h) and EGL, so ensure it with USE=egl (platform independent header used only, thus no MULTILIB_USEDEP); provides dmabuf based upload/download/eglimage options
+GL_DEPS="
+	>=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,${MULTILIB_USEDEP}]
+	egl? (
+		x11-libs/libdrm
+	)
+	gbm? (
+		>=dev-libs/libgudev-147[${MULTILIB_USEDEP}]
+		>=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
+	)
+	wayland? (
+		dev-libs/wayland[${MULTILIB_USEDEP}]
+	)
+
+	>=media-libs/graphene-1.4.0[${MULTILIB_USEDEP}]
+	media-libs/libpng:0[${MULTILIB_USEDEP}]
+	virtual/jpeg:0[${MULTILIB_USEDEP}]
+" # graphene for optional gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader; libpng/jpeg for gloverlay element
+
+RDEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${PV}:1.0[introspection?,${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+	ivorbis? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
+	ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
+	orc? ( >=dev-lang/orc-0.4.24[${MULTILIB_USEDEP}] )
+	pango? ( >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] )
+	theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] )
+	vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+	)
+
+	gles2? ( ${GL_DEPS} )
+	opengl? ( ${GL_DEPS} )
+
+	!<media-libs/gst-plugins-bad-1.13.1:1.0
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.12
+	X? ( x11-base/xorg-proto )
+"
+
+src_prepare() {
+	# Disable GL tests for now; prone to fail with EGL_NOT_INITIALIZED, etc
+	sed -i -e '/^@USE_GL_TRUE@/d' tests/check/Makefile.in
+	default
+}
+
+multilib_src_configure() {
+	filter-flags -mno-sse -mno-sse2 -mno-sse4.1 #610340
+
+	local myconf=()
+	# FIXME: Automagic gbm and x11 wsi
+	if use opengl || use gles2; then
+		myconf+=(
+			--enable-gl
+			$(use_enable egl)
+			$(use_enable gles2)
+			$(use_enable opengl)
+			$(use_enable wayland)
+			$(use_enable X x11)
+		)
+	else
+		myconf+=(
+			--disable-gl
+			--disable-egl
+			--disable-gles2
+			--disable-opengl
+			--disable-wayland
+			--disable-x11
+		)
+	fi
+
+	if use opengl && use X; then
+		# GLX requires desktop OpenGL and X
+		myconf+=( --enable-glx )
+	else
+		myconf+=( --disable-glx )
+	fi
+
+	myconf+=(
+		--disable-cocoa
+		--disable-dispmanx
+		--disable-wgl
+	)
+
+	gstreamer_multilib_src_configure \
+		$(use_enable alsa) \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable ivorbis) \
+		$(use_enable ogg) \
+		$(use_enable orc) \
+		$(use_enable pango) \
+		$(use_enable theora) \
+		$(use_enable vorbis) \
+		$(use_enable X x) \
+		$(use_enable X xshm) \
+		$(use_enable X xvideo) \
+		--enable-iso-codes \
+		--enable-zlib \
+		--disable-debug \
+		--disable-examples \
+		--disable-static \
+		"${myconf[@]}"
+
+	# bug #366931, flag-o-matic for the whole thing is overkill
+	if [[ ${CHOST} == *86-*-darwin* ]] ; then
+		sed -i \
+			-e '/FLAGS = /s|-O[23]|-O1|g' \
+			gst/audioconvert/Makefile \
+			gst/volume/Makefile || die
+	fi
+
+	if multilib_is_native_abi; then
+		local x
+		for x in libs plugins; do
+			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS NEWS README RELEASE"
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
+
+multilib_src_test() {
+	unset GSETTINGS_BACKEND
+	emake check
+}
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.14.4.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.14.4.ebuild
new file mode 100644
index 000000000000..888df5ed80b2
--- /dev/null
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.14.4.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE="gst-plugins-base"
+
+inherit flag-o-matic gstreamer
+
+DESCRIPTION="Basepack of plugins for gstreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="GPL-2+ LGPL-2+"
+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"
+
+# For OpenGL we have three separate concepts, with a list of possibilities in each:
+#  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
+#  * opengl platforms - glx and/or egl; also cgl, wgl, eagl for non-linux; USE="X opengl" enables glx platform; USE="egl" enables egl platform. Rest is up for relevant prefix teams.
+#  * opengl windowing system - x11, wayland, win32, cocoa, android, viv_fb, gbm and/or dispmanx; USE=X enables x11 (but for WSI it's automagic - FIXME), USE=wayland enables wayland, USE=gbm enables gbm (automagic upstream - FIXME); rest is up for relevant prefix/arch teams/contributors to test and provide patches
+# With the following limitations:
+#  * If opengl and/or gles2 is enabled, a platform has to be enabled - x11 or egl in our case, but x11 (glx) is acceptable only with opengl
+#  * If opengl and/or gles2 is enabled, a windowing system has to be enabled - x11, wayland or gbm in our case
+#  * glx platform requires opengl API
+#  * wayland, gbm and most other non-glx WSIs require egl platform
+# Additionally there is optional dmabuf support with egl for additional dmabuf based upload/download/eglimage options;
+#  and optional graphene usage for gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader;
+#  and libpng/jpeg are required for gloverlay element;
+
+# Keep default IUSE options for relevant ones mirrored with gst-plugins-gtk and gst-plugins-bad
+IUSE="alsa +egl gbm gles2 +introspection ivorbis +ogg +opengl +orc +pango theora +vorbis wayland +X"
+GL_REQUIRED_USE="
+	|| ( gbm wayland X )
+	wayland? ( egl )
+	gbm? ( egl )
+"
+REQUIRED_USE="
+	ivorbis? ( ogg )
+	theora? ( ogg )
+	vorbis? ( ogg )
+	opengl? ( || ( egl X ) ${GL_REQUIRED_USE} )
+	gles2? ( egl ${GL_REQUIRED_USE} )
+"
+
+# Dependencies needed by opengl library and plugin (enabled via USE gles2 and/or opengl)
+# dmabuf automagic from libdrm headers (drm_fourcc.h) and EGL, so ensure it with USE=egl (platform independent header used only, thus no MULTILIB_USEDEP); provides dmabuf based upload/download/eglimage options
+GL_DEPS="
+	>=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,${MULTILIB_USEDEP}]
+	egl? (
+		x11-libs/libdrm
+	)
+	gbm? (
+		>=dev-libs/libgudev-147[${MULTILIB_USEDEP}]
+		>=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
+	)
+	wayland? (
+		dev-libs/wayland[${MULTILIB_USEDEP}]
+	)
+
+	media-libs/libpng:0[${MULTILIB_USEDEP}]
+	virtual/jpeg:0[${MULTILIB_USEDEP}]
+" # graphene for optional gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader; libpng/jpeg for gloverlay element
+# >=media-libs/graphene-1.4.0[${MULTILIB_USEDEP}]
+
+RDEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${PV}:1.0[introspection?,${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+	ivorbis? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
+	ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
+	orc? ( >=dev-lang/orc-0.4.24[${MULTILIB_USEDEP}] )
+	pango? ( >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] )
+	theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] )
+	vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+	)
+
+	gles2? ( ${GL_DEPS} )
+	opengl? ( ${GL_DEPS} )
+
+	!<media-libs/gst-plugins-bad-1.13.1:1.0
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.12
+	X? ( x11-base/xorg-proto )
+"
+
+src_prepare() {
+	# Disable GL tests for now; prone to fail with EGL_NOT_INITIALIZED, etc
+	sed -i -e '/^@USE_GL_TRUE@/d' tests/check/Makefile.in
+	default
+}
+
+multilib_src_configure() {
+	filter-flags -mno-sse -mno-sse2 -mno-sse4.1 #610340
+
+	local myconf=()
+	# FIXME: Automagic gbm and x11 wsi
+	if use opengl || use gles2; then
+		myconf+=(
+			--enable-gl
+			$(use_enable egl)
+			$(use_enable gles2)
+			$(use_enable opengl)
+			$(use_enable wayland)
+			$(use_enable X x11)
+		)
+	else
+		myconf+=(
+			--disable-gl
+			--disable-egl
+			--disable-gles2
+			--disable-opengl
+			--disable-wayland
+			--disable-x11
+		)
+	fi
+
+	if use opengl && use X; then
+		# GLX requires desktop OpenGL and X
+		myconf+=( --enable-glx )
+	else
+		myconf+=( --disable-glx )
+	fi
+
+	myconf+=(
+		--disable-cocoa
+		--disable-dispmanx
+		--disable-wgl
+	)
+
+	gstreamer_multilib_src_configure \
+		$(use_enable alsa) \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable ivorbis) \
+		$(use_enable ogg) \
+		$(use_enable orc) \
+		$(use_enable pango) \
+		$(use_enable theora) \
+		$(use_enable vorbis) \
+		$(use_enable X x) \
+		$(use_enable X xshm) \
+		$(use_enable X xvideo) \
+		--enable-iso-codes \
+		--enable-zlib \
+		--disable-debug \
+		--disable-examples \
+		--disable-static \
+		"${myconf[@]}"
+
+	# bug #366931, flag-o-matic for the whole thing is overkill
+	if [[ ${CHOST} == *86-*-darwin* ]] ; then
+		sed -i \
+			-e '/FLAGS = /s|-O[23]|-O1|g' \
+			gst/audioconvert/Makefile \
+			gst/volume/Makefile || die
+	fi
+
+	if multilib_is_native_abi; then
+		local x
+		for x in libs plugins; do
+			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS NEWS README RELEASE"
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
+
+multilib_src_test() {
+	unset GSETTINGS_BACKEND
+	emake check
+}
diff --git a/media-libs/gst-plugins-good/Manifest b/media-libs/gst-plugins-good/Manifest
index 983b78385faa..8b02d369aab1 100644
--- a/media-libs/gst-plugins-good/Manifest
+++ b/media-libs/gst-plugins-good/Manifest
@@ -1,13 +1,13 @@
 AUX 1.14.1-fix-32bit-rtpstorage-test.patch 4957 BLAKE2B 2bdd056803ebb1d7f66e7d3e585f0c5d91c52a89992a284c67f8689407f8e5980dc02fc18674fd9215e5ed6e6df0b5ed10dab412f9ea03b1ecd4031cc8231761 SHA512 c97bcece7e14d38f47f75fe78462bee9a580013221e0ad4840bf0d28fe978e1421d1464bef4a2633622dd73faaf4b6aeb605260c8e7c48506e0432c5e5e541e5
 AUX gst-plugins-good-0.10-clang.patch 662 BLAKE2B 19fd6e7bb5bd66e4414360a4b71b1b7594d91d0d4a0665c0b926dcace76cfe75115849b3b6130a4fde6237bc1b07dd87521919fb8be0af35b1158eb22325864b SHA512 773dee80e639e982e71048bb7cbe1b8be2bc94ad6f95403d5cab2e7df97234ccb7be17f9bdfaadcd61f35a47efc8ef616e219a704ec1abcac07c3b989819ac2a
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 BLAKE2B a015ef6993078f1c699badcc9911a835fe1d129b4e0dccb3937d49768d9202549204bbfb0d7ad575bcb77c75f73662a83912936b2664a2b1cd7c331e4d203c4f SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809
-DIST gst-plugins-good-1.12.4.tar.xz 3489992 BLAKE2B 41715d3e9bda183706d87085bc8cca546720f20e32fd5ecf6e284814745f2fe8ba4cfcd244e50d0734e57dde26944539b8273879608d3042262bfc10f82cc2b9 SHA512 18f270c01be80fe5b026e2c26db3ec200117ffd99c1dca55a8a78f0bd6dcc4701126836e52a410f179779e363f11218413c7b4d13e96ef5ee1bfa82e79a81178
 DIST gst-plugins-good-1.14.1.tar.xz 3776168 BLAKE2B 5b17ac49d5bae423ee887f1516ba8bfb542acb17e3f304f489dddbaa728761ee51a08e67bd10a9981f53b5b8424d8013d1723fcbbf6e06d34a39548868d34f85 SHA512 b52d3214f2d32f263637cb9f0838284483e15b8d20bf36d64c349e99b481095734a4dd2c2421176540dfe5129ecc1acc101b89cc898b4773f0f736e8e962b070
 DIST gst-plugins-good-1.14.2.tar.xz 3779912 BLAKE2B d49f82a6be7423d233ec15660470533d6bfc5da3d2ac5912ce7b3f97739b1540424c02593aff269aae3df7c6f15ca37b2d9d45fe85f3b36b910cdac4ba98f093 SHA512 26ff40d949ab95043ed717350fb344a616c72b049cd52c3e7debd9cc37f73eb9d4704b4f437ba257cecb9dba702ce451647279cb821e9405b36210b46ae9aa05
 DIST gst-plugins-good-1.14.3.tar.xz 3790052 BLAKE2B 14f4116ce3eeb20f1f2cc8e835e46a9444ef82291aad90b74e74d0e79c1974bb6f2373f79543a3a3235773c954bd9def67a9e6c64522035fa65e1541695d34e1 SHA512 1077d4ac7332a4bfd58fe5be53104e1404c3a688769520650c030488a184e64a43b301fc1f1d687de668143f849a23cb0ba2b417cf284d20710b9cf32d792e45
+DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 EBUILD gst-plugins-good-0.10.31-r2.ebuild 1661 BLAKE2B 25c45ebacc5a0a532761dcfdf49cdd4dbd1b61a133dbf1845d293570bdc203b4e9b72b917e5e8833ad9fee0f8595d6371615ae5fb0a2d616ac2f0dc3bf31260e SHA512 a66cb0a552686b588d54a962e9888c29edcf49442aaefa665b753658e31a96b108b07b7fa8033eb4bd7f0535a2fd4b3a6fa8ecc1a91649fd3ab0456e91c01f0c
-EBUILD gst-plugins-good-1.12.4.ebuild 1431 BLAKE2B 464355f1ed004290395cb487a31d32c82a61e400cac1b0260c1e4254854db8d4414fda88d849502fcac10faab192018959a6d4386861300c391843d2dee23186 SHA512 1b7e52559dc1287bd8b9b1256464c21662f396f648cf50a66430f712bdcad6baf52c03e78c40153795df74586ab71f4f0cd219b38ab743f00c063a8546d1e568
 EBUILD gst-plugins-good-1.14.1.ebuild 1497 BLAKE2B e0f49de376e0f0da5099159b0c8999d5744995cf45fd5b413544062a112f9dd27667069735508b165acfa141fd10a998a9ddc90b909af6ed18339281be1a1223 SHA512 fc772a0d34287d7d3501820158a9c86c52a04863fd06b79f004cfe38d240195fa295cde407c70aefe379fbce7421af1d50f0598a680e7a7362867da6d988cf16
 EBUILD gst-plugins-good-1.14.2.ebuild 1442 BLAKE2B b2c006b4f5ea87049b61b3f24ff2c256eff3fd4281c640419e95e3a7745e7d92d7070399f4727fa0ab9f750b7964c2870c4aa5308736d45be241c14dc576bde7 SHA512 271bda64072634995858e6c3af499a77a87df4fa3fc60131b4e305058211686ca5a2516a4231725ed44f3dfc82d800c0992aae7f31061d662f616685b7e6e3d6
 EBUILD gst-plugins-good-1.14.3.ebuild 1442 BLAKE2B b2c006b4f5ea87049b61b3f24ff2c256eff3fd4281c640419e95e3a7745e7d92d7070399f4727fa0ab9f750b7964c2870c4aa5308736d45be241c14dc576bde7 SHA512 271bda64072634995858e6c3af499a77a87df4fa3fc60131b4e305058211686ca5a2516a4231725ed44f3dfc82d800c0992aae7f31061d662f616685b7e6e3d6
+EBUILD gst-plugins-good-1.14.4.ebuild 1439 BLAKE2B 0bad8a9b443c3b4bd699577227eb2d50269bf3a97d7a54d2acde28d12175d60bb8fcb726b6928793f102cb0011eb6b09371ccb103a9b97f1faa8e7666623b234 SHA512 bee156bf68598e3fc7664a9c3e1e6bce4aa633cf028e98ed74cba70cc536905c47874fb897d07207b373066c2e9b0645ae5dfdc02f70a1d30da886e02fe36c15
 MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.12.4.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.12.4.ebuild
deleted file mode 100644
index 464f241bcd93..000000000000
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.12.4.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
-GST_ORG_MODULE="gst-plugins-good"
-
-inherit eutils flag-o-matic gstreamer
-
-DESCRIPTION="Basepack of plugins for GStreamer"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-
-LICENSE="LGPL-2.1+"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="+orc"
-
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
-	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP}]
-	>=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-"
-
-multilib_src_configure() {
-	# Always enable optional bz2 support for matroska
-	# Always enable optional zlib support for qtdemux and matroska
-	# Many media files require these to work, as some container headers are often
-	# compressed, bug #291154
-	gstreamer_multilib_src_configure \
-		--enable-bz2 \
-		--enable-zlib \
-		--disable-examples \
-		--with-default-audiosink=autoaudiosink \
-		--with-default-visualizer=goom
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/plugins/html docs/plugins/html || die
-	fi
-
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
-	einstalldocs
-	prune_libtool_files --modules
-}
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.14.4.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.14.4.ebuild
new file mode 100644
index 000000000000..64330fc1aeec
--- /dev/null
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.14.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE="gst-plugins-good"
+
+inherit flag-o-matic gstreamer
+
+DESCRIPTION="Basepack of plugins for GStreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="+orc"
+
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	>=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+"
+
+multilib_src_configure() {
+	# Always enable optional bz2 support for matroska
+	# Always enable optional zlib support for qtdemux and matroska
+	# Many media files require these to work, as some container headers are often
+	# compressed, bug #291154
+	gstreamer_multilib_src_configure \
+		--enable-bz2 \
+		--enable-zlib \
+		--disable-examples \
+		--with-default-audiosink=autoaudiosink \
+		--with-default-visualizer=goom
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/plugins/html docs/plugins/html || die
+	fi
+
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index 58d88b6cb857..1833806398ec 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -2,13 +2,13 @@ AUX 1.14.3-fix-gstsegment-test.patch 1659 BLAKE2B 432239af51fba7f3e0be9bebdb2219
 AUX gstreamer-0.10.36-disable-test_fail_abstract_new.patch 1319 BLAKE2B 6b7fc64688f7b078d5018d0ec9b90dc8aa6c0c48bbdd19873a95fabd4da7ffed5b767ac1756ffa6b802d6dd2f261a9f2170a52c7a029732296d22b45999d5cda SHA512 6d2ef5d837551481c85b75edc9246049ca237d8b7efd462646a39ce5526a9b309a6390f2257930bfc54383c9b13447002b2c61f777d38e717995eee6030f5198
 AUX gstreamer-make-grammar.y-work-with-bison-3.patch 820 BLAKE2B 1809d190e37fde67c1e7108315e477ed05a3602e401013c26aff33dd0a74e2db8fc4e3d72d6e0b2d5fd79b3c4390c2ec5d2140fdcdb60530facc5e546c1dbe31 SHA512 8f5e904cc42be918c0a170c7227e22d0a31b5eb613a44294dbc03e5b1d7315d565f29d3de796ffbca822fe53b10b83bea54694b58ff2bf453af4b8859741ee21
 DIST gstreamer-0.10.36.tar.xz 3025876 BLAKE2B f0f70f483e8ccb2a294fb3bc8b51aac089f5e76522249b64e3e60e7b488a9e03b9300617e2c137bdcc0e3e61668b7b203e899f270f004e2dfcee0927fa7dfc3c SHA512 7468abb578398681d2adb0e9bbc9ee8ae25aaef72369d45a66ada6c67d1759afdce606cb32e68d9e30ae813196bdfef3d4d33202bc77839cc1fbf5fc436c1bd8
-DIST gstreamer-1.12.4.tar.xz 3177208 BLAKE2B cb859503edbe09cebbbfa70cb4edc5d433bbaa5b299e05921d30e6096f8765e17d449c45bd7d5ea3e4603ae46d337d4e3291b1d0456c7b72a7ebb41faad9e73a SHA512 849aa4ddf8ef465f2915e05d36fc0c31c2e31ae28be2fa38f8069a64a91b7347020fac5b881b7f3ee54c2198c3596138d49f27b09f258303834164a5d68b38a2
 DIST gstreamer-1.14.1.tar.xz 3252440 BLAKE2B c2142621b126926dd9ec886f0478154b3f0d9b7adebc6169200b8bc7e4cd089dfe77cab2b436bf3c74cbcae5f84c95afbd05ba282d0afe3e8e226e6bc0f33e33 SHA512 9cf16d79774293dd7fa10c08f6628b83f4e77f0386bebbfd47ded0498e4abd48eee1aee164af53d59fbea2d395e42eb5a12ef4b8f631bc4fd5d4f69545191f9b
 DIST gstreamer-1.14.2.tar.xz 3255404 BLAKE2B 290e8fec3eb6629a0e6e8f01c7c027fcc085f632afeac1ffe7bd4f1d8a9a3d3b78145334a11c91fcabea40b9f202a3b451ca55db13fd23be66c7167c76614932 SHA512 270dba318d15b54fff6e09d09d77dea13be55bbf82a5bb510efb43f954e234230505366cc6f19f5431e2dd24f5a7734daf5a89d9bd94de8302ed722df0e1eb84
 DIST gstreamer-1.14.3.tar.xz 3263036 BLAKE2B 20170b831064ea49565d7a4529563e4e9273def28d33eda779c7e3f4a60989b64844c271da529bdbbaebf80a8a86c37b97af4a18c4d0aae6182be608f3dcf345 SHA512 bfbf76219b5275b00253797323c4fc7b4edb8513d5441c80a8f778b418837c68e9ff37a72a78ac2431a051e813397fb01464bebddd1522b9e4a225ed505342b7
+DIST gstreamer-1.14.4.tar.xz 3264324 BLAKE2B d51febcd7c317964a09dadb4d3bd3ee7a60ac38bef28cdd7d42f49a7b710d6f6180ca7edee1765c8d146f7e3e852e93d0d5f69962089a653cfc3e6bd4ab42f89 SHA512 7ece9f01d40df7c8358482eac94536c5e15261e9568962008e2029e1ee1b3ebb220d2e4802ed1c81c40d897576fafe52234065e273724bfb4df3a3ddf2711abe
 EBUILD gstreamer-0.10.36-r2.ebuild 3843 BLAKE2B 5755f04502e3fd6bb5eafbba0710009fd0dba7f402c4a28c20c768ad6290201a900200a33f21b2d97bf6aa7596df06a0001530f001164eb2777a9f3b5cb0adfb SHA512 3a9be6924cb416b173297ff022edffb6a8c496607a4b5f88c1b81fb8489ec045e9f611a88a736fb67a84418d472e37fbdb078e9e9d8593a03418cb6658de6c67
-EBUILD gstreamer-1.12.4.ebuild 3310 BLAKE2B 3628c62235e16443c6cc95dcdbaaf51b8e5931f6b50553eaa786b21b98fac481bfa27bdec00bfcef0f8abc78f3be5f1652e9996a13d75d8dc2022da1d368f07f SHA512 04ee255b76d7aa2fb18c978baf51dd427586a8255449931165c7e327eb16387e640a1a0f5ff7354dc3080f19dda5610a430994dfbbb41397df43d3155c183133
 EBUILD gstreamer-1.14.1.ebuild 3375 BLAKE2B 6064b6693e8749608990b0a4ca9e5e5c041c84a85c65ee99ce00a9000f67c93440436690b7553b5dc4538555a0c197d7a4c445b48db2d0536440fb5dc1a8862c SHA512 89e5eeefa7bf8389458998466c3eb278a7b5fd62786834ba59b271abd01eaebed407de1d9292f53d3bf9b26fae9310c05e408dc98fb1045f934719c9cc6b0276
 EBUILD gstreamer-1.14.2.ebuild 3406 BLAKE2B d43a2dbf9c0a707b6c03df95f7eb780246d3da03763f6917ebccc65fe5d05ac25b81be4f141aa4c87a62f375b69bc7460e7156831c00f90d8ec28d1b61f50d5f SHA512 88693dd7201ff60a460ce7f43792dc9118d08cfcb699075e99bfdc254276b7288f2296eb0a8444a75b4d3f55a5f9bc1695e7b7d5323397c99d30e02e0a49a887
 EBUILD gstreamer-1.14.3.ebuild 3466 BLAKE2B fcf6a510d66a0529be30d7d14ebe7d38e128bcd6efafb36d595290c595866ff341338b06602e070bb11bc25b30f36a5b0df7722767400069fc52d5b43a29387c SHA512 e0bc3ed6a303778658a05f0d1daa13da234f78d268ef458612be8799a748f80bd7ed3954da80bb38129e0289cd1236ba23caa94d986ac192eb329197bb85be98
+EBUILD gstreamer-1.14.4.ebuild 3403 BLAKE2B 6156e586a0c2efbd368803b94542d376f6d55377a969e277a6db81db97da8752d7b5dac55a05e1e3eab6faaa0cad649a2ecb351e4198b16b3c2b386ab9d5227c SHA512 3480b9531fde97037bfc25b9a2a35a6d41b06803c83e572d66be44b784dbc3b1670600afd77aa94d9fb8793957571c6bd2e612d65909d8b3952401214fb1a4af
 MISC metadata.xml 586 BLAKE2B 319df0c2c013f3018bdb31afddcd80b298f9b74d0a581981f30d483b0773339befe4dc62eb78a267b3a0f5a63a7e6462bd0ece4d4285c0ca91a1329c12ba1b93 SHA512 f7de0325f671119a5b787dcba9572d06d58375ba9d815854beffd668da55e4d4695f586365b3455e63cd56f4469fb8e1a92ab6de4e05847668f56c076dfdaf57
diff --git a/media-libs/gstreamer/gstreamer-1.12.4.ebuild b/media-libs/gstreamer/gstreamer-1.12.4.ebuild
deleted file mode 100644
index eb6202dd1358..000000000000
--- a/media-libs/gstreamer/gstreamer-1.12.4.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
-
-inherit bash-completion-r1 eutils multilib-minimal pax-utils
-
-DESCRIPTION="Open source multimedia framework"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="1.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"
-IUSE="+caps +introspection nls +orc test unwind"
-
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
-	caps? ( sys-libs/libcap[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
-	unwind? (
-		>=sys-libs/libunwind-1.2_rc1[${MULTILIB_USEDEP}]
-		dev-libs/elfutils[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-	sys-devel/bison
-	sys-devel/flex
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	nls? ( sys-devel/gettext )
-"
-# gtk-doc-am to install API docs
-
-src_configure() {
-	if [[ ${CHOST} == *-interix* ]] ; then
-		export ac_cv_lib_dl_dladdr=no
-		export ac_cv_func_poll=no
-	fi
-	if [[ ${CHOST} == powerpc-apple-darwin* ]] ; then
-		# GCC groks this, but then refers to an implementation (___multi3,
-		# ___udivti3) that don't exist (at least I can't find it), so force
-		# this one to be off, such that we use 2x64bit emulation code.
-		export gst_cv_uint128_t=no
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local completiondir=$(get_bashcompdir)
-	# Set 'libexecdir' to ABI-specific location for the library spawns
-	# helpers from there.
-	# Disable static archives and examples to speed up build time
-	# Disable debug, as it only affects -g passing (debugging symbols), this must done through make.conf in gentoo
-	local myconf=(
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		--disable-debug
-		--disable-examples
-		--disable-static
-		--disable-valgrind
-		--enable-check
-		$(use_with unwind)
-		$(use_with unwind dw)
-		$(multilib_native_use_enable introspection)
-		$(use_enable nls)
-		$(use_enable test tests)
-		--with-bash-completion-dir="${completiondir%/*}"
-		--with-package-name="GStreamer ebuild for Gentoo"
-		--with-package-origin="https://packages.gentoo.org/package/media-libs/gstreamer"
-	)
-
-	if use caps ; then
-		myconf+=( --with-ptp-helper-permissions=capabilities )
-	else
-		myconf+=(
-			--with-ptp-helper-permissions=setuid-root
-			--with-ptp-helper-setuid-user=nobody
-			--with-ptp-helper-setuid-group=nobody
-		)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	if multilib_is_native_abi; then
-		local x
-		for x in gst libs plugins; do
-			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
-		done
-	fi
-}
-
-multilib_src_install() {
-	# can't do "default", we want to install docs in multilib_src_install_all
-	emake DESTDIR="${D}" install
-
-	# Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
-	use orc && pax-mark -m "${ED}usr/$(get_libdir)/gstreamer-${SLOT}/gst-plugin-scanner"
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README RELEASE"
-	einstalldocs
-	prune_libtool_files --modules
-
-	# Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
-	use orc && pax-mark -m "${ED}usr/bin/gst-launch-${SLOT}"
-}
diff --git a/media-libs/gstreamer/gstreamer-1.14.4.ebuild b/media-libs/gstreamer/gstreamer-1.14.4.ebuild
new file mode 100644
index 000000000000..a35a13f8437f
--- /dev/null
+++ b/media-libs/gstreamer/gstreamer-1.14.4.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 multilib-minimal pax-utils
+
+DESCRIPTION="Open source multimedia framework"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="1.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"
+IUSE="+caps +introspection nls +orc test unwind"
+
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	caps? ( sys-libs/libcap[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+	unwind? (
+		>=sys-libs/libunwind-1.2_rc1[${MULTILIB_USEDEP}]
+		dev-libs/elfutils[${MULTILIB_USEDEP}]
+	)
+	!<media-libs/gst-plugins-bad-1.13.1:1.0
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.12
+	sys-devel/bison
+	sys-devel/flex
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	nls? ( sys-devel/gettext )
+"
+# gtk-doc-am to install API docs
+
+src_configure() {
+	if [[ ${CHOST} == *-interix* ]] ; then
+		export ac_cv_lib_dl_dladdr=no
+		export ac_cv_func_poll=no
+	fi
+	if [[ ${CHOST} == powerpc-apple-darwin* ]] ; then
+		# GCC groks this, but then refers to an implementation (___multi3,
+		# ___udivti3) that don't exist (at least I can't find it), so force
+		# this one to be off, such that we use 2x64bit emulation code.
+		export gst_cv_uint128_t=no
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local completiondir=$(get_bashcompdir)
+	# Set 'libexecdir' to ABI-specific location for the library spawns
+	# helpers from there.
+	# Disable static archives and examples to speed up build time
+	# Disable debug, as it only affects -g passing (debugging symbols), this must done through make.conf in gentoo
+	local myconf=(
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
+		--disable-benchmarks
+		--disable-debug
+		--disable-examples
+		--disable-static
+		--disable-valgrind
+		--enable-check
+		$(use_with unwind)
+		$(use_with unwind dw)
+		$(multilib_native_use_enable introspection)
+		$(use_enable nls)
+		$(use_enable test tests)
+		--with-bash-completion-dir="${completiondir%/*}"
+		--with-package-name="GStreamer ebuild for Gentoo"
+		--with-package-origin="https://packages.gentoo.org/package/media-libs/gstreamer"
+	)
+
+	if use caps ; then
+		myconf+=( --with-ptp-helper-permissions=capabilities )
+	else
+		myconf+=(
+			--with-ptp-helper-permissions=setuid-root
+			--with-ptp-helper-setuid-user=nobody
+			--with-ptp-helper-setuid-group=nobody
+		)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	if multilib_is_native_abi; then
+		local x
+		for x in gst libs plugins; do
+			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
+		done
+	fi
+}
+
+multilib_src_install() {
+	# can't do "default", we want to install docs in multilib_src_install_all
+	emake DESTDIR="${D}" install
+
+	# Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
+	use orc && pax-mark -m "${ED}usr/$(get_libdir)/gstreamer-${SLOT}/gst-plugin-scanner"
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README RELEASE"
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+
+	# Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
+	use orc && pax-mark -m "${ED}usr/bin/gst-launch-${SLOT}"
+}
diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index aaa8f8c07880..84fe28290071 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -1,5 +1,7 @@
 DIST hamlib-3.1.tar.gz 2130615 BLAKE2B dbc348d5df04015e1706b6f165496f0b0d9a4f7ce5e5ba6c8589349c1c9c1119ef31e8c3d4ba14666d19f3638bf27ad9b4a566af2fd4054faafc0604b8aeafd0 SHA512 befc5c407379e30711bde2affb9c191add6dbb04a36c1309f8771170cf04156c48609a094775638036282e085de6c78d09ef8d2760d69c595471e16e985e0885
 DIST hamlib-3.2.tar.gz 2223125 BLAKE2B c9bffa2b4d2aa4b3f9c590276058c159aa1236f22d3f37a063124af09002dc3034a88fd6f1273b5f4562ae22618222ea50c254fb59384bfae778448fe029ef49 SHA512 9aec2d361980abafdedf7b80f5b8bcf5b71f4f0c32bbfecebc0a50e6f74eb263ddc5188cf77283ed7361baabedb8364a2ce94a12fdda1bbdfaa0a030f510f224
+DIST hamlib-3.3.tar.gz 2192119 BLAKE2B edefd8b8c75876c07fa498c98f7d6760985fdecc477bf6711e948071e45964bf7fdf6705b3172e56951366a7dfb0288e025eab66d3b6436d158649ae53ac39bd SHA512 4cf6c94d0238c8a13aed09413b3f4a027c8ded07f8840cdb2b9d38b39b6395a4a88a8105257015345f6de0658ab8c60292d11a9de3e16a493e153637af630a80
 EBUILD hamlib-3.1.ebuild 2201 BLAKE2B c32627db7df6714ad241a526c0fc18d3a3ee93d7db2a641028610926e1e45e1c27f71ac46f0030a07786b5b19932374d319c0756ae279e2310067a1bf5d4920c SHA512 3b8a200d30cb246aaefc8df5c9b200557abae9632b57e0232757679dba5f92da79e289f72902025fa799401f3b179367ba5004ba29f8118bebd57c3b01c3259e
 EBUILD hamlib-3.2.ebuild 2227 BLAKE2B 23d7ae9e5987706a88d124a3c6731bb82bcf4c8616380b4f57a79b195d4589164148dc20c4bfdcab2ca76353bee0514fdebd7cece62a9f441e65af762d871855 SHA512 b11c5cdc7952aef7a02b3a245ae7d0e139a2bfec3eb4ca682aaa638d155e7825804debda11595c940c30bf4fdef6d8bb3e68ac36f9bb3be1128005305a1c9e21
+EBUILD hamlib-3.3.ebuild 2081 BLAKE2B aa2aa6d7e83e391cf9b2655ff9b4641f5119c1b612b5ba1c9cf100659578c119564e6f97862d1b1fd82af9c131de5dfb618f45a6919e8d98688e56d9e3312522 SHA512 d191e99da6cfb3d90f50161f0185d468fb55eef1f1fca9235e32b5ba9719ee0c56681ae4fe82c7ac5b56aee84af3a6d2bfb0c0c4dd7f78cc7b694a29bf6c5453
 MISC metadata.xml 325 BLAKE2B c1966def562280393eeb5b575d4e136525dc3cf36ef4e6c00dbeff7e0069a4d10eb16706f4b4e929eda1f046d18a8e25fd0025c74695eba1f9c10d19a9f55598 SHA512 fb6d5d77da29969e9b61921ae59e5d5c71b74cebd331867a546a6b2c568650f89191a39a3a1a73c58e1244fa5d13a090b45b866c21b3a3dd71cff0a812c149e5
diff --git a/media-libs/hamlib/hamlib-3.3.ebuild b/media-libs/hamlib/hamlib-3.3.ebuild
new file mode 100644
index 000000000000..fc21384c7338
--- /dev/null
+++ b/media-libs/hamlib/hamlib-3.3.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=( python2_7 python3_{4,5,6} )
+
+inherit autotools python-single-r1
+
+DESCRIPTION="Ham radio backend rig control libraries"
+HOMEPAGE="https://www.hamlib.org"
+SRC_URI="https://www.github.com/${PN}/${PN}/releases/download/${PVR}/${P}.tar.gz"
+
+LICENSE="LGPL-2 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="doc perl python tcl"
+
+RESTRICT="test"
+
+RDEPEND="
+	=virtual/libusb-0*
+	dev-libs/libxml2
+	sys-libs/readline:0=
+	perl? ( dev-lang/perl )
+	python? ( ${PYTHON_DEPS} )
+	tcl? ( dev-lang/tcl:0= )"
+
+DEPEND=" ${RDEPEND}
+	virtual/pkgconfig
+	dev-lang/swig
+	>=sys-devel/libtool-2.2
+	doc? ( app-doc/doxygen )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DOCS=(AUTHORS NEWS PLAN README README.betatester README.developer TODO)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# fix hardcoded libdir paths
+	sed -i -e "s#fix}/lib#fix}/$(get_libdir)/hamlib#" \
+		-e "s#fix}/include#fix}/include/hamlib#" \
+		hamlib.pc.in || die "sed failed"
+
+	# Correct install target to whatever INSTALLDIRS says and use vendor
+	# installdirs everywhere (bug #611550)
+	sed -i -e "s#install_site#install#"	\
+	-e 's#MAKEFILE="Hamlib-pl.mk"#MAKEFILE="Hamlib-pl.mk" INSTALLDIRS=vendor#' \
+	bindings/Makefile.am || die "sed failed patching for perl"
+
+	# make building of documentation compatible with autotools-utils
+	sed -i -e "s/doc:/html:/g" doc/Makefile.am || die "sed failed"
+
+	eautoreconf
+
+	eapply_user
+}
+
+src_configure() {
+	econf \
+		--libdir=/usr/$(get_libdir)/hamlib \
+		--disable-static \
+		--with-xml-support \
+		$(use_with perl perl-binding) \
+		$(use_with python python-binding) \
+		$(use_with tcl tcl-binding)
+}
+
+src_compile() {
+	emake
+	use doc && emake html
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	use doc && HTML_DOCS=( doc/html/ )
+	einstalldocs
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins hamlib.pc || die "doins failed"
+
+	echo "LDPATH=/usr/$(get_libdir)/hamlib" > "${T}"/73hamlib
+	doenvd "${T}"/73hamlib || die "doenvd failed"
+}
diff --git a/media-libs/libbs2b/Manifest b/media-libs/libbs2b/Manifest
index d38ec6bc2170..94ccc4344b33 100644
--- a/media-libs/libbs2b/Manifest
+++ b/media-libs/libbs2b/Manifest
@@ -1,5 +1,5 @@
-AUX 3.1.0-format-security.patch 370 BLAKE2B 2c9352c8ce6dc9882eaee1dcb6c11165ccb4b148a7dacdb0d9e91eb8e1735e338e32e3b2265cfa923635fdf678809d3a8eedaa5186ca2eb1fd924990f205e652 SHA512 43ae6b6819a89ee31603e34f955abe918422558af164d1ef3f90ed22e42bc41d5df984363ed8deeb7810a50599d90e635cb5f98878c03b53e4953137582c2e99
+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 652 BLAKE2B a327a61624492a1a20e618f356b21db5068744e43ca1b08d25ea4de49cf0031c4c42022bfd5b55c5e49cf79bc0364a6f5d63367dd661c67b55307b259f69a008 SHA512 faefcff715cfe47c8ed8a97893128c3de8745fa919a7a7afda37f566ea72a11a051f639a99131e7e2f9c5fc952169dc1fe5776f6b9cfa5f2518fd2a85360e957
+EBUILD libbs2b-3.1.0-r2.ebuild 633 BLAKE2B c6bf795c185236f888447fb2ed85120c3547eef9dc8e817b395b5f20b99e160a53c1b90d2c32c5361913976186bc4b754a78929f3948956b443bac42524ffd1b SHA512 d550b9798b095e8fbc17619548a2f74ae2840caac3c4b180a549b811574b9cdb989f7e715dd6875e2556a853436fc6f4e088af5af38cc4b043e5596dd0d494a0
 MISC metadata.xml 449 BLAKE2B 05ac186d158a3c9ee695b8af52de5f695170ad925c0136422233df9e94010cdcce5224b8938d8b71ff260f4a468ae93898c7999163c8648d10987cdac17f289e SHA512 f9178657883acf1844ac273eaa5af2380f06fbf23641e76f6a32b08f54b410a5be6d6b0d82888637a51ad4ce13396dcdd04907cb1194eb5539be2e6d3c02e99d
diff --git a/media-libs/libbs2b/files/3.1.0-format-security.patch b/media-libs/libbs2b/files/3.1.0-format-security.patch
index 1b9f9f97479b..d5600a5b584e 100644
--- a/media-libs/libbs2b/files/3.1.0-format-security.patch
+++ b/media-libs/libbs2b/files/3.1.0-format-security.patch
@@ -1,5 +1,5 @@
---- src/bs2bconvert.c.orig	2015-03-06 12:24:00.168451618 +0000
-+++ src/bs2bconvert.c	2015-03-06 12:22:20.504446655 +0000
+--- a/src/bs2bconvert.c	2015-03-06 12:24:00.168451618 +0000
++++ b/src/bs2bconvert.c	2015-03-06 12:22:20.504446655 +0000
 @@ -153,7 +153,7 @@
  	if( ( infile = sf_open( infilename, SFM_READ, &sfinfo ) ) == NULL )
  	{
diff --git a/media-libs/libbs2b/libbs2b-3.1.0-r2.ebuild b/media-libs/libbs2b/libbs2b-3.1.0-r2.ebuild
index a20a4be4c6c6..6caaccb7c821 100644
--- a/media-libs/libbs2b/libbs2b-3.1.0-r2.ebuild
+++ b/media-libs/libbs2b/libbs2b-3.1.0-r2.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=5
+EAPI=7
 
-inherit eutils multilib-minimal
+inherit multilib-minimal
 
 DESCRIPTION="Bauer stereophonic-to-binaural DSP library"
 HOMEPAGE="http://bs2b.sourceforge.net/"
@@ -11,16 +11,14 @@ 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}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 # for default_src_configure to work
 ECONF_SOURCE="${S}"
 
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-format-security.patch"
-}
+PATCHES=( "${FILESDIR}/${PV}-format-security.patch" )
diff --git a/media-libs/libcuefile/Manifest b/media-libs/libcuefile/Manifest
index 99f7894f470b..ac54875e6eda 100644
--- a/media-libs/libcuefile/Manifest
+++ b/media-libs/libcuefile/Manifest
@@ -1,3 +1,3 @@
 DIST libcuefile-477.tar.xz 41676 BLAKE2B 01232ed507386809cd7960f06251139fd5c11a251f68e59513b6b5e482b9b7977e5d3fd8d6147a47e4a74b8e5e320019383a4d69c6c3395ead3cee0d8c5c3b43 SHA512 9cf46f9fd1b178758b2d15fa65d67d069bba41a83354a5aedf7b57ed5752bb68ad1d10208ffbb22f2aac7bd5d938e9395f67d4248441743d45e0099638d60d5e
-EBUILD libcuefile-477-r1.ebuild 695 BLAKE2B 9096d690b2048bbf2888ae39c48538917d4480293a037570a83e0019836964b657ecf3a0f4e0f6c89c90569ae46aa0b98aabb6a9427e17e71c1af282ceea1610 SHA512 783edf882ea745056ee91cf961ff778d5ea01f73cd8cd2609d8333de286f1ed0fa198c98d3530be605394ca6b77063cec648d6d700db90ea62ab9d935084dfab
+EBUILD libcuefile-477-r1.ebuild 694 BLAKE2B 04afd1c006aa48fa91c366925267020a4d945fa886ed07d369cbbfc9544b46f77d19fd0e1b61f502ffa6a6e9a16fe12b3f91469649074d9be1fe9afe66975034 SHA512 be5deb209a3b9d977c84acc279c4d2c7d8db9b0ef267f3c315a462786d2f94e1ec32fa4ee9b787e02cf95c8f5651fb21d0c3549ed94ea0a2c0abed2986bb9b16
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-libs/libcuefile/libcuefile-477-r1.ebuild b/media-libs/libcuefile/libcuefile-477-r1.ebuild
index a9a885574d6c..54aee7bbfbfc 100644
--- a/media-libs/libcuefile/libcuefile-477-r1.ebuild
+++ b/media-libs/libcuefile/libcuefile-477-r1.ebuild
@@ -1,14 +1,15 @@
-# 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-multilib
 
 # svn export http://svn.musepack.net/libcuefile/trunk libcuefile-${PV}
 # tar -cJf libcuefile-${PV}.tar.xz libcuefile-${PV}
 
 DESCRIPTION="Cue File library from Musepack"
-HOMEPAGE="http://www.musepack.net/"
+HOMEPAGE="https://www.musepack.net/"
 SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
diff --git a/media-libs/libdvdcss/Manifest b/media-libs/libdvdcss/Manifest
index c16af9b7d251..4e199de8f6c2 100644
--- a/media-libs/libdvdcss/Manifest
+++ b/media-libs/libdvdcss/Manifest
@@ -1,9 +1,3 @@
-DIST libdvdcss-1.3.0.tar.bz2 355417 BLAKE2B 33fa609f8131f7b53d579805fcfcd4aa821f9d9d434f4f34720a4b9a8421bf64206609801da1ca6e36aed63db6c97103cf2303e4b83fbd4a563bf8bbe13147bf SHA512 f3254cb882f03d24e9fbe70fa9aa32ac34c104b57b3ad43727e26a4ab930bddd75de8d9a0e4ba68cdac23e1828f38c2b276679f5386f296cf20db46828836a3d
-DIST libdvdcss-1.4.0.tar.bz2 364373 BLAKE2B bad4bfaa17df33ff665684000d54b91c37b5d924b4b707a47756a2ef9b468256eff966379ab30f0c4d7650c0cd5617f70413a8508fa2279485a14b6b44c38680 SHA512 ad4503a37f47a9563da0b9e387ca3e812f6cdfbf109b8d92f8eccdd879b4270e5b0ee79041d7fb4c86698d72748f7bbf0257db8da6bb1c889dd4f78645e3371b
-DIST libdvdcss-1.4.1.tar.bz2 366169 BLAKE2B 54d3f8ccd76286a5b7082abdc8d134fb47d192bb62ee8d58b04f5eb387b804bdde4ec5c7a48627b9afebbb8d3a783a23189886e50277cf855a819fdd08eefd5e SHA512 4456ebcf8b53a8aaee97643261a14a05c929e9e9120cbe5fc6839ddf62be3dcfe7313fca3ee57c00bea43ddf623dc3d61fff7c2f6316338495df95c9c422f39e
 DIST libdvdcss-1.4.2.tar.bz2 366824 BLAKE2B 106ec0f46eeb4969d0c878ef1e2ad05ac9c0b0ce0d2781c0d68d9d5e08f9c6154b43c4b2e0cd2db0d530eb0a94914161384e788b307af4c4fca3351d270cbe9a SHA512 e46ccded1951046ec481604c5b533c435be14cd0e734cd5315b61868836a20edf4cdc7c1466c2f4ed374de4382c5e758ace700e84aadcb29513001d696f1049c
-EBUILD libdvdcss-1.3.0.ebuild 796 BLAKE2B 46c60fc09583d30961b1526990b8d6f583b9d63acc4c1b2cca1ae44b621d964783ede275c2612f64bea635c2a32e1ad26294282e132e056e551db046883a0498 SHA512 84baa330a130ffd7f0246815ab3c987c9df2f26e59929f8413ea36b0208e5aca607f3865788632a348039cb5f7bcfdf179e5a2f12163ecbfc942007c100094f2
-EBUILD libdvdcss-1.4.0.ebuild 808 BLAKE2B d375b0a634b6efcde6948a5a9b749f6a02b600fa74fd01eb347bfaac5b5f2c5a028af3df89adbc829a8b225dc05247e1dc029f9de8bebb666d464d2e9544f233 SHA512 8448a153f20dca18b8ce3124ee888843525f5f14a60662573b4ce2869fdb6f38368fe62f88b815fa2a4f81f74966e889222c78a2918e638e7deec50d4550fca5
-EBUILD libdvdcss-1.4.1.ebuild 817 BLAKE2B 3ec859850660f9f526587a76c993d1b00fc67624a97d6b88997dd44b201ab8e1f9120080cb2b38e8efe22ca2c996a426cfab1cbd19bde146859de2c5ff2d8f3b SHA512 5b264785c8051592e78c67f00a2bc8c1b3eab7a7d0f330ecdbfdee58f3a43e01c983cbef603ba0f43ad70ced2a40118a64c05c2551f1a2ad82eaa9f03919c2c2
-EBUILD libdvdcss-1.4.2.ebuild 810 BLAKE2B e235722f7988ae620627c043bb5756423623c2de8f62248ae1b36275c693e1d2dce288b5a0c21ffad5081960fb337a6b28e78488a4dd620ecda38ed381e30afb SHA512 37aafbddb55afd3dd6cc153d80ab4e412c7d4ec81a54581ffd62f148859fe2aafb4f6b04b69d09082178f301a71ee896004b3f933e60943be65b761dda12964a
+EBUILD libdvdcss-1.4.2.ebuild 809 BLAKE2B b314501bf264cd37c1dd761eaa6ff1aa253ffd538f99a14451ea9981357c65f2df8b9cacb349ba33ea1f28c969870dbd1700dc3f8f08f68d200c4065719ea779 SHA512 2e9a29278a3b008a6686911cd6ebd17e1e42f5d88405300806fb3abe9716fb099654f087bbfd41193b13016784bda54263cb8f74f6a2f4fc16b3de5a007f2272
 MISC metadata.xml 219 BLAKE2B bca5749b6f2d3541ba2d2635b59056f9ecdc46553991dec3ee5a7bc9f26393bdae62755418850d3cbda0eeb65b7f72029ddf09d4f088b21c84d407d0e6eaa098 SHA512 24793c7fd0e2cef8fa5a0efd9bd55fed1e62ff6810199a969d4c0b869bac9b9ec79b288105b73b1b99734320bb13569a8ee00516b5452dd67d91d14dd17038e2
diff --git a/media-libs/libdvdcss/libdvdcss-1.3.0.ebuild b/media-libs/libdvdcss/libdvdcss-1.3.0.ebuild
deleted file mode 100644
index 230c668d4914..000000000000
--- a/media-libs/libdvdcss/libdvdcss-1.3.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-multilib
-
-DESCRIPTION="A portable abstraction library for DVD decryption"
-HOMEPAGE="https://www.videolan.org/developers/libdvdcss.html"
-SRC_URI="https://www.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="1.2"
-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 ~sparc-solaris ~x86-solaris"
-IUSE="doc static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-#DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable doc)
-		--htmldir=/usr/share/doc/${PF}/html
-	)
-
-	autotools-multilib_src_configure
-}
diff --git a/media-libs/libdvdcss/libdvdcss-1.4.0.ebuild b/media-libs/libdvdcss/libdvdcss-1.4.0.ebuild
deleted file mode 100644
index 2115e0a3a755..000000000000
--- a/media-libs/libdvdcss/libdvdcss-1.4.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
-
-inherit autotools-multilib
-
-DESCRIPTION="A portable abstraction library for DVD decryption"
-HOMEPAGE="https://www.videolan.org/developers/libdvdcss.html"
-SRC_URI="https://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="1.2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-#DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable doc)
-		--htmldir=/usr/share/doc/${PF}/html
-	)
-
-	autotools-multilib_src_configure
-}
diff --git a/media-libs/libdvdcss/libdvdcss-1.4.1.ebuild b/media-libs/libdvdcss/libdvdcss-1.4.1.ebuild
deleted file mode 100644
index bda143969dff..000000000000
--- a/media-libs/libdvdcss/libdvdcss-1.4.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=5
-
-inherit autotools-multilib
-
-DESCRIPTION="A portable abstraction library for DVD decryption"
-HOMEPAGE="https://www.videolan.org/developers/libdvdcss.html"
-SRC_URI="https://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="1.2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-#DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable doc)
-		--htmldir=/usr/share/doc/${PF}/html
-	)
-
-	autotools-multilib_src_configure
-}
diff --git a/media-libs/libdvdcss/libdvdcss-1.4.2.ebuild b/media-libs/libdvdcss/libdvdcss-1.4.2.ebuild
index 77f45a493994..ef7df0099acd 100644
--- a/media-libs/libdvdcss/libdvdcss-1.4.2.ebuild
+++ b/media-libs/libdvdcss/libdvdcss-1.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="1.2"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
 RDEPEND=""
diff --git a/media-libs/libepoxy/Manifest b/media-libs/libepoxy/Manifest
index 8fc92dbfc675..286cb048816b 100644
--- a/media-libs/libepoxy/Manifest
+++ b/media-libs/libepoxy/Manifest
@@ -2,9 +2,11 @@ DIST libepoxy-1.4.2.tar.gz 309973 BLAKE2B 029948aea64db917e782a57c901f537be796b2
 DIST libepoxy-1.4.3.tar.gz 310823 BLAKE2B 6eab12a0ecf68a1bda3484c7cd71c0b3d62391e2bee8efd3c0fe7970ee4c3672f2dd81547d3884b301165accf3a8ce91a7c2a2e9686b1ca43c7f37cd15c5c946 SHA512 41c7a4eea66c89346b0ec71407b2d22bf645ed0ef81ebad560370903f138ed48abb6bc6bcc88c75a3a05497acc6720397db828d61301599c05040263a9f4f7f0
 DIST libepoxy-1.5.1.tar.gz 324985 BLAKE2B 338b558ca3c174c04383dfc1bfe4f444965aef745b3043183d4024df62b37fdfc923c5c1d243a3061201a0f7b6946ce443d4ede3195b85d1022c187f46b08540 SHA512 f839f82e4ffabda42a2bb9c2822ba2e8da6583bdb481daa2e090e62b580fdfb0d11f96af790685769317ff2446d1d8d7cb6374b2049614ee938b84014b604bce
 DIST libepoxy-1.5.2.tar.gz 324905 BLAKE2B bbc1904b99e6674b03259bc2a5f4076f248d698e80a6f57013f5c19dcb5d6c22fe8b821eae3ff014f40c273a6f91ad3efc054ec48ddf5b8e8b5d8e12da3b60cc SHA512 3dfa10b356d6105fc8b1fda62dcf025b20a786b37f82c8275b3f12df8d3a62bbd4a9800abac396cfb48b789f72ff3c5f7a796eb83f046e978f9403a53e6ddf0d
+DIST libepoxy-1.5.3.tar.gz 326768 BLAKE2B 053665429a249adca4c9b3d57797949e3a0ffd0ed3f1c66cb8becfb884431e44a4cccb6b2fd3788a86ee01268ebad3cc36e67e391d2aa5cdea28837a162be9ad SHA512 e831f4f918f08fd5f799501efc0e23b8d404478651634f5e7b35f8ebcc29d91abc447ab20da062dde5be75e18cb39ffea708688e6534f7ab257b949f9c53ddc8
 EBUILD libepoxy-1.4.2.ebuild 1055 BLAKE2B 585d84565beffa47a418913e8b9833c38676f551222dae02c1f0f4a20788a8a27727709ea9bd4df4fa27e136b2f5e3b1c8797abb4ffd761d9e48ec8eb39dd14f SHA512 80291d0d467d736c6e865ad9786ec876a64e6b05ecc22e5df13a7ac60ee48703a514d73bc42562eabf7d54364b8e6a00635904478e551ca4dd70a9694e4e9356
 EBUILD libepoxy-1.4.3.ebuild 1080 BLAKE2B 4546353e099a85502a82a35c551621e1092fa21228ea78c3f02ab8db8ed760472ec42ed08b1a86d29a8a0079912c8e12f8d784fb5bf1064bc78f6af573cba4e4 SHA512 706ca5de96e6833cd77237c95dd9d638e06dd1b266ce0522db3774f37edfd61293c2fbf7fc480ff02484f124042875dca28b630ca6b72806ab945aafb3e23cd8
 EBUILD libepoxy-1.5.1.ebuild 1178 BLAKE2B 3fe4c241de60c0fcd84590411619a7af861e733110aaf3f7f8b01df660a7ba70b4778738590450c37172ddbe7625837a6cedc7f282a3e717895d6e7c27b5cacb SHA512 4ba275c3b91beaf1e71bd17065d1ae846cc351080fa4c061c68e4a62278e64124d9ca98ea2c0aa38dbb568572df7dd8fff41851a7f5cb9bfd81bd314c00c71c6
 EBUILD libepoxy-1.5.2.ebuild 1228 BLAKE2B 196f6451318246a038a14e1456c58a1b1148c75b817cddaf741a0fc99ec216da4499c7fb28e22a01c4bbb6481154a9dba080bd07925b912ab916172e1c0dc3ba SHA512 2c564038d66394dcbe40e75512bb32c5451203119d22a26a2064617d9515291b49ebc8f8de1017894855de573a34152fb720f4b438c3a859eb03a706dd790bae
-EBUILD libepoxy-9999.ebuild 1228 BLAKE2B 196f6451318246a038a14e1456c58a1b1148c75b817cddaf741a0fc99ec216da4499c7fb28e22a01c4bbb6481154a9dba080bd07925b912ab916172e1c0dc3ba SHA512 2c564038d66394dcbe40e75512bb32c5451203119d22a26a2064617d9515291b49ebc8f8de1017894855de573a34152fb720f4b438c3a859eb03a706dd790bae
+EBUILD libepoxy-1.5.3.ebuild 1250 BLAKE2B 7566df5582dca287763302ad9ecf95810cc803eba09108a699a5739076b883f29ba26086fed4760a89147ae337e3a3181f1781bcdd885547b7a2295d6435c0ce SHA512 0c090d202ee0f329ffdc2b1a7e69eb2d46b559d88046ff88c6bf898d1e260898e9089a3228afa079e611377f78aa4afc25ba3aebf498bd7dea5afd3e5c375cc3
+EBUILD libepoxy-9999.ebuild 1250 BLAKE2B 7566df5582dca287763302ad9ecf95810cc803eba09108a699a5739076b883f29ba26086fed4760a89147ae337e3a3181f1781bcdd885547b7a2295d6435c0ce SHA512 0c090d202ee0f329ffdc2b1a7e69eb2d46b559d88046ff88c6bf898d1e260898e9089a3228afa079e611377f78aa4afc25ba3aebf498bd7dea5afd3e5c375cc3
 MISC metadata.xml 314 BLAKE2B ff8d671379855f61b90688f26772026f83f00d3e303bcf1fc7e851c9a2e6f410beb7c9dbd115f57d8613df8ffc043b2994cbc1a134eefd160888a0ac21cac154 SHA512 5d63de65f850f14f37ed4998a3d7f7686dcd999fd6f13be9c528be6423940684e709d08042ba5cbeccad2a38f3752df2580913cdbdfbc569f576cc958cf3bc73
diff --git a/media-libs/libepoxy/libepoxy-1.5.3.ebuild b/media-libs/libepoxy/libepoxy-1.5.3.ebuild
new file mode 100644
index 000000000000..ec896cd974cf
--- /dev/null
+++ b/media-libs/libepoxy/libepoxy-1.5.3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://github.com/anholt/${PN}.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE='xml(+)'
+inherit ${GIT_ECLASS} meson multilib-minimal python-any-r1
+
+DESCRIPTION="Epoxy is a library for handling OpenGL function pointer management for you"
+HOMEPAGE="https://github.com/anholt/libepoxy"
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test +X"
+
+RDEPEND="media-libs/mesa[egl,${MULTILIB_USEDEP}]"
+DEPEND="${PYTHON_DEPS}
+	${RDEPEND}
+	>=dev-util/meson-0.47.0
+	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
+	virtual/pkgconfig"
+
+src_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-r3_src_unpack
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Degl=yes
+		-Dglx=$(usex X)
+		-Dx11=$(usex X true 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/media-libs/libepoxy/libepoxy-9999.ebuild b/media-libs/libepoxy/libepoxy-9999.ebuild
index b6c7a46a052b..ec896cd974cf 100644
--- a/media-libs/libepoxy/libepoxy-9999.ebuild
+++ b/media-libs/libepoxy/libepoxy-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
@@ -29,6 +29,7 @@ IUSE="test +X"
 RDEPEND="media-libs/mesa[egl,${MULTILIB_USEDEP}]"
 DEPEND="${PYTHON_DEPS}
 	${RDEPEND}
+	>=dev-util/meson-0.47.0
 	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
 	virtual/pkgconfig"
 
diff --git a/media-libs/libexif/Manifest b/media-libs/libexif/Manifest
index c2810ac0e078..242b6344c23e 100644
--- a/media-libs/libexif/Manifest
+++ b/media-libs/libexif/Manifest
@@ -2,6 +2,6 @@ AUX libexif-0.6.13-pkgconfig.patch 255 BLAKE2B 397c0e88f951628e697cdd749936b3e4e
 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 1275 BLAKE2B b0223d29126f9e069d98857fa8d52b2bafa5de7ed9883b3d55f5ce33b9f97b4117daab4a1ec070232b8531e094d7efff3d98a85e30f1b1d1d12decd49954b1f6 SHA512 37a47fad73265cc56e55a531013d86984388734015f2debec51a4ff6029c38b2ce1b3c8956ad0c4469c1eb09b9541942a37c7d53f8c4b059f662d094f976a450
+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-r2.ebuild b/media-libs/libexif/libexif-0.6.21-r2.ebuild
index 3eead1121f70..46483967018b 100644
--- a/media-libs/libexif/libexif-0.6.21-r2.ebuild
+++ b/media-libs/libexif/libexif-0.6.21-r2.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="alpha amd64 arm ~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 )"
diff --git a/media-libs/libgig/Manifest b/media-libs/libgig/Manifest
index 914c7cf9d63a..2465450030ae 100644
--- a/media-libs/libgig/Manifest
+++ b/media-libs/libgig/Manifest
@@ -1,7 +1,3 @@
-DIST libgig-3.3.0.tar.bz2 338119 BLAKE2B 71135ae9296977925e7c351579643d1d950e87525072a2210e33a67cdf427ca06d38f7ccfb35df5c2a60158f7e3fb9c01a5adf3c81446576fa2b35e4a031121e SHA512 e46c3746eed234303618cef68e21aee86cfc4be785bbacbb4483169450cd98d379a2598b44c1f90c4d9fb8d87f3fea74e5faa45291561b52c1d0d02de46a52a7
-DIST libgig-4.0.0.tar.bz2 700905 BLAKE2B 909e4c88de0859be29ff52ed2dc366b056388252fefe426add8937ebf9630c6767ef179de6f92176ce2031877c4d4839734ce461396d5bfbdf118157c78cf3f3 SHA512 171eb322a913447708881edad8da5d0d12b873bf36d191cd181dddf67a82446c8400cb4b7a6386b62ac20df8571a1597c6765fa0ef6d443957b5aae03afb345c
 DIST libgig-4.1.0.tar.bz2 538345 BLAKE2B c05a1dfb5a7a3f358008cbde10dc081c9d8593a01bf4458585609cf5736eea3c8cdcedef85d3be6fc3208f27feb253174458f982b51e2e9c7f7b10a81da4c264 SHA512 e88500f5d60d597b383093f904a2356aba7505a3a22b4852fe3fbbe71723fddbfc81029a82edf3c18e46ade519343cdbe87c06c652f982ffd4cfb4c35d5a9a0a
-EBUILD libgig-3.3.0.ebuild 842 BLAKE2B 9350f27caeb6bff7d2d00e6068dbd135b562b07cdf5c1f9fa0a773e291b694a83a33475a535d799c075627ddcf6039d1d785d6121a5e9369631b356254aadb64 SHA512 0b75b80fa1d9f7fce2023ba070fb080a90f2904ca11c9578846adf66e7faaf617ffdcf7e11648a44255f2ffe6811800e517c52f4227d3aa0d8b3ee8783ae0c4e
-EBUILD libgig-4.0.0-r1.ebuild 886 BLAKE2B 0c34df713a7957acee0e4012f49d5ba5ca09d851e85300279500d1d014953e868c9d52e51961b6da4efac5fc395213a7db49dc3f37c781d37e7add85d3d3ce45 SHA512 9209535729cbf1cc17de3e536ea3f192e3d93619920ade383659c0bf8baef8951b607a00cbe874b37afee2023133532ec4cb0bce40f2713339bab828214018ab
 EBUILD libgig-4.1.0.ebuild 777 BLAKE2B 547355e946c1a24e97a6966f04fe1f69bed899ed0b52b187a6212e9700a9c82e6bca5bf14d33c64fd0279fb1c36e8fda7eb0ecb4bffd7b4190e5762704c381d4 SHA512 096d8e9f82f989d5dc8e892c7579328a288809636c171059f635953d237c36fbfc47559791c0d92537e8848a5181a582c954d85c90e789f9ffba29a905b5765b
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libgig/libgig-3.3.0.ebuild b/media-libs/libgig/libgig-3.3.0.ebuild
deleted file mode 100644
index a9607e0a96a3..000000000000
--- a/media-libs/libgig/libgig-3.3.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=0
-
-inherit eutils
-
-DESCRIPTION="a C++ library for loading Gigasampler files and DLS (Downloadable Sounds) Level 1/2 files"
-HOMEPAGE="http://www.linuxsampler.org/libgig/"
-SRC_URI="http://download.linuxsampler.org/packages/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="doc"
-
-RDEPEND=">=media-libs/libsndfile-1.0.2
-	>=media-libs/audiofile-0.2.3"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-src_compile() {
-	econf
-	emake -j1 || die "emake failed."
-
-	if use doc; then
-		emake -j1 docs || die "emake docs failed."
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
-
-	if use doc; then
-		dohtml -r doc/html/*
-	fi
-}
diff --git a/media-libs/libgig/libgig-4.0.0-r1.ebuild b/media-libs/libgig/libgig-4.0.0-r1.ebuild
deleted file mode 100644
index 74520ea90bfc..000000000000
--- a/media-libs/libgig/libgig-4.0.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib
-
-DESCRIPTION="a C++ library for loading Gigasampler files and DLS (Downloadable Sounds) Level 1/2 files"
-HOMEPAGE="http://www.linuxsampler.org/libgig/"
-SRC_URI="http://download.linuxsampler.org/packages/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc"
-
-RDEPEND=">=media-libs/libsndfile-1.0.2
-	>=media-libs/audiofile-0.2.3"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-src_compile() {
-	emake
-
-	if use doc ; then
-		emake docs
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog NEWS README TODO
-
-	# For libgig.so to be found at runtime
-	printf "LDPATH=\"${EPREFIX}/usr/$(get_libdir)/libgig/\"" > 99${PN}
-	doenvd "99${PN}"
-
-	if use doc ; then
-		dohtml -r doc/html/*
-	fi
-}
diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest
index 70b45d460aa8..41563f833a12 100644
--- a/media-libs/libheif/Manifest
+++ b/media-libs/libheif/Manifest
@@ -1,4 +1,5 @@
+AUX libheif-1.3.2-openjpeg-2.patch 2512 BLAKE2B 165576cb3da35534a9e628f3dfb3c47b52718109ffb3582acfde093a22284053fd1e7986216f670491652f1362011409888084b37a79777e393002b1d9ea7237 SHA512 c8bb96ef7091d2f0e46bbe61e05a30e8a3e93f7b5925d45a30a045cac39e26000c04166d5ea0417ebf530b8bff5992de0b46ca112041e1aa87ecf7eb5928e844
 DIST libheif-1.3.2.tar.gz 1328174 BLAKE2B 4c0f82bb90d48f89a4ce9aed525c5823bb5d008e54e580e761f6fa4f5493f265929a0607e7b81046ba7c249bd2ca21a0c5ab91da83b7e7f3a2a63e8f24df88ed SHA512 bcc8b4b2522ef6fe68f5a9ffd5312c2c8f6bc3718394eef1860e199c30fb735bb214f665ed6480b5f5fe5d578b3ed77a4301af93775ae2349ba5038b3f3ef63a
-EBUILD libheif-1.3.2.ebuild 1320 BLAKE2B 59c0088337011cf9db2470f68a32f51d66e18fa09432f5ce75e4f01efe06c33d03cca73fe9910e1dbd2cf081ba87206146bc99809de895b8523522e42dd488c2 SHA512 2e3ed1301604c97c502b16977d7863b175703004193edf48dec44f9c029afdc69f800922da94c10322a9f76ac9f70dfc8f13dd30d573c51a2c5db2ddaec01730
+EBUILD libheif-1.3.2-r1.ebuild 1249 BLAKE2B 233f3d365a62e624a021de959e626e99fb25db14a4b8895f4d27f92ec4e0a6d65cab27484e3b8f2c46c1b4b6035f9a08e3b08350f0d48d8db197da759227cf97 SHA512 0fdbb43b6fe4c1cd485007e27b82c74bdc8b1b050aceb4783172e3b69ac084a0f1cf3cedc21e540d7f6bd3c1d808aaf6dca7da6e526527ceab0936f1203ad452
 EBUILD libheif-9999.ebuild 1325 BLAKE2B b13d52b4593ca62e796208564edb6a6696e86bfe3d0539ca74277027de4d9db7b89867667fb29b9af1f5eed8c583d337b34ed6a4083292ba681963b5ed871fe1 SHA512 ede20f379e5807387acd892472f8190e7ba71a522b027e1297a37bd722832bff6125ad43a94ce5e0ee6d33ec5beb80b1e93793e27e5d2550c8e83f4db24f9504
 MISC metadata.xml 369 BLAKE2B e85296d149b4ebfe852a79ed951dff87e3586617cac09f2e81bc501f2739599e7fda1835f1d677cd923a1324e4f6d85e4f1552eb0589511372dd603d239880c5 SHA512 70bbaa03beb93f3649271be35d4c90e7d79395efefd0cfb9915525a5c736629bcf56bd66e2d1bbf2a746c62a5f21ddb8874cdf28f61180fe9abc3ad22ab51fc8
diff --git a/media-libs/libheif/files/libheif-1.3.2-openjpeg-2.patch b/media-libs/libheif/files/libheif-1.3.2-openjpeg-2.patch
new file mode 100644
index 000000000000..138295965b4c
--- /dev/null
+++ b/media-libs/libheif/files/libheif-1.3.2-openjpeg-2.patch
@@ -0,0 +1,93 @@
+Support building against libjpeg-turbo 2.0.
+
+Backport of https://github.com/strukturag/libheif/pull/85
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -95,6 +95,22 @@ AC_CHECK_LIB([jpeg], [jpeg_destroy_compress], [
+ ], [have_libjpeg="no"])
+ fi
+ AM_CONDITIONAL([HAVE_LIBJPEG], [test "x$have_libjpeg" = "xyes"])
++if eval "test x$have_libjpeg = xyes"; then
++AC_MSG_CHECKING([for jpeg_write_icc_profile])
++AC_LANG_PUSH(C++)
++AC_TRY_COMPILE([
++    #include <stddef.h>
++    #include <stdio.h>
++    #include <jpeglib.h>
++],[
++    jpeg_write_icc_profile(NULL, NULL, 0);
++],[has_jpeg_write_icc_profile=yes],[has_jpeg_write_icc_profile=no]);
++AC_LANG_POP(C++)
++AC_MSG_RESULT([$has_jpeg_write_icc_profile])
++if eval "test x$has_jpeg_write_icc_profile = xyes"; then
++    AC_DEFINE(HAVE_JPEG_WRITE_ICC_PROFILE, 1, [Define to 1 if jpeg_write_icc_profile is available in libjpeg.])
++fi
++fi
+ 
+ PKG_CHECK_MODULES([libpng], [libpng], [
+     AC_DEFINE([HAVE_LIBPNG], [1], [Whether libpng was found.])
+--- a/examples/CMakeLists.txt
++++ b/examples/CMakeLists.txt
+@@ -8,6 +8,24 @@ include (${CMAKE_ROOT}/Modules/FindJPEG.cmake)
+ 
+ if(JPEG_FOUND)
+ add_definitions(-DHAVE_LIBJPEG=1)
++
++include (${CMAKE_ROOT}/Modules/CheckCXXSourceCompiles.cmake)
++
++set(CMAKE_REQUIRED_LIBRARIES ${JPEG_LIBRARIES})
++check_cxx_source_compiles("
++#include <stddef.h>
++#include <stdio.h>
++#include <jpeglib.h>
++
++int main() {
++  jpeg_write_icc_profile(NULL, NULL, 0);
++  return 0;
++}
++" HAVE_JPEG_WRITE_ICC_PROFILE)
++if(HAVE_JPEG_WRITE_ICC_PROFILE)
++  add_definitions(-DHAVE_JPEG_WRITE_ICC_PROFILE=1)
++endif()
++
+ set (heif_convert_sources
+   ${heif_convert_sources}
+   encoder_jpeg.cc
+--- a/examples/encoder_jpeg.cc
++++ b/examples/encoder_jpeg.cc
+@@ -17,6 +17,10 @@
+  * You should have received a copy of the GNU General Public License
+  * along with convert.  If not, see <http://www.gnu.org/licenses/>.
+  */
++#if defined(HAVE_CONFIG_H)
++#include "config.h"
++#endif
++
+ #include <assert.h>
+ #include <errno.h>
+ #include <string.h>
+--- a/examples/encoder_jpeg.h
++++ b/examples/encoder_jpeg.h
+@@ -24,6 +24,9 @@
+ #include <stddef.h>
+ #include <stdio.h>
+ 
++// Prevent duplicate definition for newer versions of libjpeg-turbo.
++#undef HAVE_STDDEF_H
++#undef HAVE_STDLIB_H
+ #include <jpeglib.h>
+ 
+ #include <string>
+--- a/examples/heif_enc.cc
++++ b/examples/heif_enc.cc
+@@ -35,6 +35,9 @@
+ 
+ #if HAVE_LIBJPEG
+ extern "C" {
++// Prevent duplicate definition for newer versions of libjpeg-turbo.
++#undef HAVE_STDDEF_H
++#undef HAVE_STDLIB_H
+ #include <jpeglib.h>
+ }
+ #endif
diff --git a/media-libs/libheif/libheif-1.3.2-r1.ebuild b/media-libs/libheif/libheif-1.3.2-r1.ebuild
new file mode 100644
index 000000000000..aedf7a7e2591
--- /dev/null
+++ b/media-libs/libheif/libheif-1.3.2-r1.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 multilib-minimal
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/strukturag/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/strukturag/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+
+	PATCHES=( "${FILESDIR}"/${P}-openjpeg-2.patch )
+fi
+
+DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
+HOMEPAGE="https://github.com/strukturag/libheif"
+
+LICENSE="GPL-3"
+SLOT="0/1.3"
+IUSE="static-libs +threads"
+
+DEPEND="
+	media-libs/libde265:=[${MULTILIB_USEDEP}]
+	media-libs/libpng:0=[${MULTILIB_USEDEP}]
+	media-libs/x265:=[${MULTILIB_USEDEP}]
+	sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	virtual/jpeg:0=[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i -e 's:-Werror::' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable threads multithreading)
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
diff --git a/media-libs/libheif/libheif-1.3.2.ebuild b/media-libs/libheif/libheif-1.3.2.ebuild
deleted file mode 100644
index 2bce8218a61a..000000000000
--- a/media-libs/libheif/libheif-1.3.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools multilib-minimal
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/strukturag/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/strukturag/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
-HOMEPAGE="https://github.com/strukturag/libheif"
-
-LICENSE="GPL-3"
-SLOT="0/1.3"
-IUSE="static-libs +threads"
-
-# Doesn't yet support libjpeg-turbo-2, https://github.com/strukturag/libheif/issues/70
-DEPEND="
-	media-libs/libde265:=[${MULTILIB_USEDEP}]
-	media-libs/libpng:0=[${MULTILIB_USEDEP}]
-	media-libs/x265:=[${MULTILIB_USEDEP}]
-	sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	virtual/jpeg:0=[${MULTILIB_USEDEP}]
-	!>=media-libs/libjpeg-turbo-2
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-
-	sed -i -e 's:-Werror::' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable threads multithreading)
-		$(use_enable static-libs static)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete || die
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index dabda373263d..1921f34466d7 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -10,7 +10,7 @@ DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70
 EBUILD libjpeg-turbo-1.5.0.ebuild 2850 BLAKE2B c96ad089f1d87d41d4188bb04eca1b2ec9efcfa40a13c41595226a6edd8bf774c7d8daf49c839e1a1bb17969ec725d91c3aea0178fe3c35147c13b690ec849a4 SHA512 6b08ca33b26b5874bb5b4b21e0d14f3476bcbbe4d6ce4fb595761d69e8fedce0a4bdf1ac1e176707c531059073aa5dfc6a51a10707e3bed2a5faf64416b5e76a
 EBUILD libjpeg-turbo-1.5.1.ebuild 2912 BLAKE2B 438a513cd6e32f64f3fea073d8c171db1fed47c73f50e8bb7cc6836edb1a59a99ffed5dca6ef9b8e470428b80e2de3053ecde210dd8b28606187fc6ae701fe35 SHA512 06a9dba84ac1c37c9fe47c370c0f3dc742a222d84b51c2b66080ad893d73b02c320bfdea249f13426927e632d5a1388b6502f46b2548f256a10b1699566ba239
 EBUILD libjpeg-turbo-1.5.2.ebuild 2914 BLAKE2B 20ab888a51ebcef64bb8e8951f98fda703eb864c2f90b16748eb00f8ff4da81245213b267fe07eb88fd3ad38356edc499bac78b6600b14803b231cd2bbf10fa6 SHA512 ae1a705f10f0e2b6e47ecc3f5809111e0d80ba6274e37faabb66509d81002bbc683867e452542c0379c79bc9408e6ee3e899957cfdb3bf82c30866746ca44d69
-EBUILD libjpeg-turbo-1.5.3-r2.ebuild 3003 BLAKE2B 8d1d86e6c8867a1156b43dbdbfb819483a4e78120f8b2771a99391885af8656ab8b6e2ea2c1e8819446c044a3d25b1292e432efc0951f8a4ac21e7cfd7ad4413 SHA512 bc7a7a68951c5d97872fb8920f56c0e2747a8b0cbfb860cb83f8550c995e25c372c5948b39c71e8ada9fbe26141d9a087c751a338a0fc76d0211d0405a2831d4
+EBUILD libjpeg-turbo-1.5.3-r2.ebuild 2999 BLAKE2B c2b3c72a5eeea74b455c2d095d25d2663ced9cd4e53d35d68faede4345eaa2532c9abc64dcad6cf46b82503ab5a6b908b3e268d1f1932a04a2de34bcc383c095 SHA512 0e1532ea6e04cc05fd4f3d303877095dca0095c35632c27e47840e34eb3e153f4953d948b8dbc62edbc02f655114a79e07ce82d557813c58d6f54afda3074c69
 EBUILD libjpeg-turbo-1.5.3.ebuild 2924 BLAKE2B 1b169cba371373b286f789c9c13485987192af85e23a31026c567919e06e4ec486961d9b725759fd3f5466e0c8874a4d7849c3912fd89e89940f19a519ea427a SHA512 43e6b9232a59e3e1478b01d18a9e1485cca5d5bf76b9539d4257a0357f92d1cd1d9777bd9b9844adb2adb4e9d68390018385a20817b1fadc841fa994ba97752d
 EBUILD libjpeg-turbo-2.0.0.ebuild 2684 BLAKE2B 03cb490426cdb79d337759a008fedb6ad641bc93aabbcf850c04c78d8e8da25487f313719b6047c82f03c9ea69df1371b3616ec4410362df46a2590f3ced50bc SHA512 5971b9a7f2b167cac75802a61165b64582528e8166a0c4acfc4a2b856ccdd266ca9f3d371f1bbf49b25df9181da194c79d61a7fb2c79dcadeb7b48416f0e9e82
 MISC metadata.xml 466 BLAKE2B 989b0d905baa9ba6217f871c43b1d06f8ea718ab7250d31cce0d498b219b3d1077638b2fecfaeb747e2505f2608d73390789bd442462a9e2f410b0939e2dbb77 SHA512 2b8725c3493aa2294b43f3328f3506458254f57b8ac2914b96a7bbf987caa4c6a011e7afe72099bd0d33ff605c018853efde3e77faf2bcb012d7e49d229f17ea
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r2.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r2.ebuild
index 4cac1a390b53..8b5aba9b9ad2 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r2.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.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=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="BSD IJG"
 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 ~x64-macos ~x86-macos"
+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 ~x64-macos ~x86-macos"
 IUSE="java static-libs"
 
 ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
diff --git a/media-libs/liblrdf/Manifest b/media-libs/liblrdf/Manifest
index adfd8d7646dc..eb054d0fcb47 100644
--- a/media-libs/liblrdf/Manifest
+++ b/media-libs/liblrdf/Manifest
@@ -1,4 +1,6 @@
 DIST liblrdf-0.5.0.tar.gz 283109 BLAKE2B 057b9fcd5fac28624a7d2a2c9da71bc298fe94a11646cf33f3ac3337959ecb4dbe637ecd9e7e889a6761c38c22c32f11a83b114ea53eec4305ff38f684fdb69c SHA512 d3bd4d83fb1e53f93817bcfe30aec74f74e46dd98f1d573b7d123ee0cdf3162b27a24ffc8430f71b1616d9ba9af7c88b1b625e7459b30f3941804b56c5cc0cd3
+DIST liblrdf-0.6.1.tar.gz 43878 BLAKE2B 98ae1a900ac4f5517fb027984f4bb40c02cd290ce4ed26a0f8207c353946914d5c984e34df85349def08ef34002028f61649f5370f8b36d663160843db9bd13e SHA512 7732813eec704aef984d056de254e4fa049fdd0a7444b6a88f75f012afe9c587cbd1295f027c77361fa42bc097cdce9d9cabdba6b86e99a3c14805d84258df1c
 EBUILD liblrdf-0.5.0-r1.ebuild 1015 BLAKE2B 1c90107b000b4a5b885c085ba51c5784c086fcb7705d3eb15897efb0e6cefb74095b0a9457d6b759ba7db373bf3d3e85116b7ebd3186e4a435ec4ba138a79c41 SHA512 e17e41ed2aa18af65ed4cd8fa02f71fa77f1f7338ccd9e35cd28cab84253d15e5055f6da4413eb73e8ff75baa955a68ea36eb7e42e8829fd7c4c203dcd5e0d1e
-EBUILD liblrdf-0.5.0.ebuild 948 BLAKE2B 5d10b80b0d6ccc9b748d753d9c990bd25d579fd9aa27a080b092bf2c1530c0dbc7491db55b7c31141856f612e8ccfa3cdda402b3739967a8d6cf59be7d408452 SHA512 87cecf81350921722dbd40e21149d55f2886799ac2533ddfa7c38b6849e5bbd02098930e437ba1c8992d64e667bd2c234bf8b83e6d871bdae9381773b1461440
+EBUILD liblrdf-0.5.0.ebuild 946 BLAKE2B 78f36e9fbb476ac73c18885a5142d7138b3278679590a40cda9ae8e605cfa4a6d5573320ba750f03bb029e0549ca36462ec63d9e8789f6cd2fdd9ea3a5db2c96 SHA512 29bb2e208613780578c9113175d1cd459637085251376875ca60c62d83b5286c7405b36435d6be37b07aa1c83e5fd2957c7cadebd6d3dda8f2aa41e683abbf81
+EBUILD liblrdf-0.6.1.ebuild 920 BLAKE2B b063dfbec6e58af7c191e400e6958968e96f68a3d7e4638ec47d5ff9c7bbc6933b5715bb2e3d232a0440e556813c55fb47c4fb8816500eec243f4d28ed97e85e SHA512 ae1f60699f9232382104de287bd80f98599f38c4cd096905644325f3aef65c802afe623b0ceccae68661ed4215f7bd409ad7f9597e51ac411c82358b5dfdd661
 MISC metadata.xml 326 BLAKE2B 82bf43f86bd7fe43691aa0bf15dafd544e6a6f2dd5977849749e42cf8541fdf57d6c3b7b8d80a822ab9258005cbce10b758e15d09ad4ab6ed4379986fde044eb SHA512 e15fd24533cf1d3288870e08f3d9f213e092d5aa16f5568772d3376f572f7c0a07ab7771ac13e1ebe070c88208258ebd993fa6f4025298c6e912e8a91fc1cafc
diff --git a/media-libs/liblrdf/liblrdf-0.5.0.ebuild b/media-libs/liblrdf/liblrdf-0.5.0.ebuild
index 190db870db32..0435ff6a84dd 100644
--- a/media-libs/liblrdf/liblrdf-0.5.0.ebuild
+++ b/media-libs/liblrdf/liblrdf-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/swh/LRDF/tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/openssl-1
diff --git a/media-libs/liblrdf/liblrdf-0.6.1.ebuild b/media-libs/liblrdf/liblrdf-0.6.1.ebuild
new file mode 100644
index 000000000000..6d22fc1c2bcb
--- /dev/null
+++ b/media-libs/liblrdf/liblrdf-0.6.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
+
+DESCRIPTION="Library for manipulation of RDF files in LADSPA plugins"
+HOMEPAGE="https://github.com/swh/LRDF"
+SRC_URI="https://github.com/swh/LRDF/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="static-libs"
+
+RDEPEND="
+	media-libs/ladspa-sdk
+	media-libs/raptor:2
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog README )
+
+S="${WORKDIR}/LRDF-${PV}"
+
+src_prepare() {
+	default
+	sed -i -e 's:usr/local:usr:' examples/{instances,remove}_test.c || die #392221
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_test() {
+	has_version media-plugins/swh-plugins && default #392221
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/liblscp/Manifest b/media-libs/liblscp/Manifest
index ba9603d3a594..f2a437f2b00c 100644
--- a/media-libs/liblscp/Manifest
+++ b/media-libs/liblscp/Manifest
@@ -1,9 +1,3 @@
-DIST liblscp-0.5.5.tar.gz 402096 BLAKE2B da17cae36fe4928e0ed261949b3a65ec36fb188c905d321d7762626bef75dca698de0ee62a65beb12b3ca68c17c324a62a2dada8800b442d6ed9a9346034ba3d SHA512 92cf94b2564e66d8b99e1ead3f585f9f496405e07e93e202a580e227f4502e51fac109ae9f832412f6f57f3dd9ba51ec64617ffacbdd82318c1900feb067b5a1
-DIST liblscp-0.5.6.tar.gz 369550 BLAKE2B cf31f4d475a4c3451f0d7a2a3466459ab41213453d035b246ae52dc958defc170e8dfa4fb9cac4da4df04d02dc400c45638822dcdba8afd0792faa3b16a7dc0f SHA512 3d2b8b8316f39cf082f15475bb0fec7822bda22e9eaabfa79aaf19244c7d364df29a508bd56a592ff2b188c4d1aa82d3a5bec7238d3a0528015ec7c5f70c8403
-DIST liblscp-0.5.7.tar.bz2 529902 BLAKE2B 9aa770d107f94ad3524e61047639e324d8cbba91c8af75617566815da8ac3b63c12c04db69633def4ba5ff049b3f382f96966c92af00dd05497cd3ee6fa05b54 SHA512 10cc43f0670cf264464452eedab6302b2ca837e8fa3df9098f58441045a38e6400a77b989db9363176031abd53917b21823a66f694e7b83f3b957dac391d12dd
 DIST liblscp-0.5.8.tar.gz 670237 BLAKE2B 376fcb10b7762fe9dfc5b7bcb69abd63c1e92f5030925c2f7b1bb63b63ba8b7763141c4edf68ea9a1bfa1a89af73e405c43a0d7de68ec74675a9b23fa70a86cb SHA512 e6cdd029d34aa71d4f025725f07ec3f61ecb772ddda18c6050fa2d6603541b3b1e421ce9ebef6e5f69dcbbcf54fa9b14eada0b95ef0591af16d1fc38ef44e29a
-EBUILD liblscp-0.5.5.ebuild 566 BLAKE2B 9114d04123126d6b6b5c69ae3c893c8ef4cfdbf03836327c3c6ba71c54070ccd116004c9bc8c19f8190db4cf28c0fcf1fe31c67158ad86b4469d46ba10175942 SHA512 5c407cbbaeabd14c14c629ee391977a972144c33ba81be12604a4e10e3add1f137b62a6f8ca1e4ae2a871069719dc7cd6b2a9622b1027f580cfd77a542d74d50
-EBUILD liblscp-0.5.6.ebuild 568 BLAKE2B 48ae5608cfeb9d92a1b78ceb05c9efec49c19c1b8f7092bdf6993577c6e7c89223c4949225f98471e9b6597a902a1639aa92aa7a68c596c6aebf0c31153f8812 SHA512 a291c84c613e69e66263f9578f82531e5f94bf0f2beae5f94a04d938ec03587421caed9114511380227f0e7e400b43f5643349557feda7204456a9be650fc17e
-EBUILD liblscp-0.5.7.ebuild 536 BLAKE2B 6fe84482c8f557563b097bec2b7bf02d416ab95584639052e47333a79727d2468ad6e1a8f79b4a1c52c1558a25d49e8143bb9f5de60ed5e969edf6da26f89772 SHA512 28b092ce2282ec28f352474c10a1c41b3b7571643e23bd0e327722ffb1cf57dba086222a75ae69b13fa2cdb3854d5fa908d064caa53b8b796f518c7ee9715c74
-EBUILD liblscp-0.5.8.ebuild 535 BLAKE2B 1c2176c7f1614f7631f1570cedf3a26f8a83780b59bf82eda1942825e0cccb5f8ce427ec66100db5321b66a8d8d581b88d1848e38457dcd69b775535e039b5c4 SHA512 c3fcb44f6195973aaca5ca0a8d24d6bbbf69126530c853cd0cdf51742c58cb619dae1be78a7d587b97cb6d181dcefd7a0492832da5fd6104c968bd368ded6a49
+EBUILD liblscp-0.5.8-r1.ebuild 500 BLAKE2B a2f5c17a6d8b5233377699e6a595f7316d0d80e7d855062277581cc641b8021c300452dae59fb2335b2b394ed068bac5bc15eec81c2471502e2fa6dc03ef23b4 SHA512 c063de31a1a43ed992b9696f44f1becdf4016cf1ea2031122e39474df6660d354386ec6e9207938f2257fa14e1a99fc5cecc331dd97c06f25576f05dd1992a67
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/liblscp/liblscp-0.5.5.ebuild b/media-libs/liblscp/liblscp-0.5.5.ebuild
deleted file mode 100644
index 33b5627b64ec..000000000000
--- a/media-libs/liblscp/liblscp-0.5.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="a C++ library for the Linux Sampler control protocol"
-HOMEPAGE="http://www.linuxsampler.org"
-SRC_URI="http://download.linuxsampler.org/packages/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND="doc? ( app-doc/doxygen )"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog TODO NEWS README
-
-	if use doc; then
-		dohtml -r doc/html/*
-	fi
-}
diff --git a/media-libs/liblscp/liblscp-0.5.6.ebuild b/media-libs/liblscp/liblscp-0.5.6.ebuild
deleted file mode 100644
index fff1bf28717c..000000000000
--- a/media-libs/liblscp/liblscp-0.5.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=0
-
-DESCRIPTION="a C++ library for the Linux Sampler control protocol"
-HOMEPAGE="http://www.linuxsampler.org"
-SRC_URI="http://download.linuxsampler.org/packages/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND="doc? ( app-doc/doxygen )"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog TODO NEWS README
-
-	if use doc; then
-		dohtml -r doc/html/*
-	fi
-}
diff --git a/media-libs/liblscp/liblscp-0.5.7.ebuild b/media-libs/liblscp/liblscp-0.5.7.ebuild
deleted file mode 100644
index 7cde77e5034f..000000000000
--- a/media-libs/liblscp/liblscp-0.5.7.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="C++ library for the Linux Sampler control protocol"
-HOMEPAGE="http://www.linuxsampler.org"
-SRC_URI="http://download.linuxsampler.org/packages/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND="doc? ( app-doc/doxygen )"
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog TODO NEWS README
-
-	if use doc; then
-		dohtml -r doc/html/*
-	fi
-}
diff --git a/media-libs/liblscp/liblscp-0.5.8-r1.ebuild b/media-libs/liblscp/liblscp-0.5.8-r1.ebuild
new file mode 100644
index 000000000000..571288f0501c
--- /dev/null
+++ b/media-libs/liblscp/liblscp-0.5.8-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="C++ library for the Linux Sampler control protocol"
+HOMEPAGE="https://www.linuxsampler.org"
+SRC_URI="https://download.linuxsampler.org/packages/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="doc"
+
+DEPEND="doc? ( app-doc/doxygen )"
+
+DOCS=( AUTHORS ChangeLog TODO NEWS README )
+
+src_install() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	default
+}
diff --git a/media-libs/liblscp/liblscp-0.5.8.ebuild b/media-libs/liblscp/liblscp-0.5.8.ebuild
deleted file mode 100644
index 6bc2baa48138..000000000000
--- a/media-libs/liblscp/liblscp-0.5.8.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="C++ library for the Linux Sampler control protocol"
-HOMEPAGE="http://www.linuxsampler.org"
-SRC_URI="http://download.linuxsampler.org/packages/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND="doc? ( app-doc/doxygen )"
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog TODO NEWS README
-
-	if use doc; then
-		dohtml -r doc/html/*
-	fi
-}
diff --git a/media-libs/libmad/Manifest b/media-libs/libmad/Manifest
index 2f6e05eb4c76..c96c35baa398 100644
--- a/media-libs/libmad/Manifest
+++ b/media-libs/libmad/Manifest
@@ -1,7 +1,9 @@
+AUX libmad-0.15.1b-CVE-2017-8372_CVE-2017-8373_CVE-2017-8374.patch 5122 BLAKE2B bbdfd8ff85028e9d802659c7cfe4b3ef4102de73a551d38b3185055d210596125687e427fecce1625e1cc1c24b69597e20de5b41dbf551a0cdb04e1cf89707f3 SHA512 86df28733ca0ad92e57244b46dc722ce844d92851039b6ff548515f20373e9e42888b815068e69134686f650a276ef7ff59601d6d193aea25e09c59ea051b63b
 AUX libmad-0.15.1b-cflags-O2.patch 347 BLAKE2B 65476b488c2dca48bf983da739240651e82f448b8e6546dfb68e2a2f29e953fcb6e6b1f498d1e805ccbf32cc8914f5b49c5135eb19388c8711989312a3692e7c SHA512 13a8bac30cea4861f903b4abc8673f9a35b6253aae6a02915f99b67e5e8c56460fc1fb059a0aa52143b665f888928baba098daf0ed022420e46317be4dbc6161
 AUX libmad-0.15.1b-cflags.patch 4867 BLAKE2B adcfc2732f6b8b2310f50d234a695820d8fdd7f292de6621abfc23922cda512d26b1eb64dcb36751ea8cd34784189bcfe8be7cd46ed654f92370071df7598890 SHA512 01dc8421dba2b652aa8ca6d1f1a5c310645465b18190ebfdeaae516de881869957e8e7c0c373d0d09623da33719d01e028f2f6164790b54c43a71271f5b4dbba
 AUX libmad-0.15.1b-gcc44-mips-h-constraint-removal.patch 2377 BLAKE2B aff2507810157aec4062d157546b921a43cdf63a4e0684f5864ea71b36b4fa726f4ce33d558b7aaec8bb927876abe23c017ef3a1ba9b55715202887010cba3a3 SHA512 de08e0ce3c39b76c2838f940279a39c26e9c7e5b1e762c44f0db1ce3f65364e51036ad4f4ccdc160d80660c723a1bede70a4b505a9a01583de43ebc47aaeedb9
 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
 MISC metadata.xml 326 BLAKE2B a9064ce28313804fb873d3e0b4fcb96681a2fcdcf60011d629268f73ab47f6c00ff6e0d95d2d075ec6af89bbe7aea4b6346ef2500815f08a69318a8736e7201d SHA512 b6c3a0765c5d00fd44caf7266edb75a373d8d4e813ac7f68507067f57713090fdc84f95886e73401d9c912f7f64453c975117030692526a49aebd6f5276751c9
diff --git a/media-libs/libmad/files/libmad-0.15.1b-CVE-2017-8372_CVE-2017-8373_CVE-2017-8374.patch b/media-libs/libmad/files/libmad-0.15.1b-CVE-2017-8372_CVE-2017-8373_CVE-2017-8374.patch
new file mode 100644
index 000000000000..9cc8913e159c
--- /dev/null
+++ b/media-libs/libmad/files/libmad-0.15.1b-CVE-2017-8372_CVE-2017-8373_CVE-2017-8374.patch
@@ -0,0 +1,197 @@
+; You can calculate where the next frame will start depending on things
+; like the bitrate. See mad_header_decode().  It seems that when decoding
+; the frame you can go past that boundary.  This attempts to catch those cases,
+; but might not catch all of them.
+; For more info see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=508133
+Index: libmad-0.15.1b/layer12.c
+===================================================================
+--- a/layer12.c	2008-12-23 21:38:07.000000000 +0100
++++ b/layer12.c	2008-12-23 21:38:12.000000000 +0100
+@@ -134,6 +134,12 @@
+   for (sb = 0; sb < bound; ++sb) {
+     for (ch = 0; ch < nch; ++ch) {
+       nb = mad_bit_read(&stream->ptr, 4);
++	if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame)
++	{
++		stream->error = MAD_ERROR_LOSTSYNC;
++		stream->sync = 0;
++		return -1;
++	}
+ 
+       if (nb == 15) {
+ 	stream->error = MAD_ERROR_BADBITALLOC;
+@@ -146,6 +152,12 @@
+ 
+   for (sb = bound; sb < 32; ++sb) {
+     nb = mad_bit_read(&stream->ptr, 4);
++	if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame)
++	{
++		stream->error = MAD_ERROR_LOSTSYNC;
++		stream->sync = 0;
++		return -1;
++	}
+ 
+     if (nb == 15) {
+       stream->error = MAD_ERROR_BADBITALLOC;
+@@ -162,6 +174,12 @@
+     for (ch = 0; ch < nch; ++ch) {
+       if (allocation[ch][sb]) {
+ 	scalefactor[ch][sb] = mad_bit_read(&stream->ptr, 6);
++	if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame)
++	{
++		stream->error = MAD_ERROR_LOSTSYNC;
++		stream->sync = 0;
++		return -1;
++	}
+ 
+ # if defined(OPT_STRICT)
+ 	/*
+@@ -187,6 +205,12 @@
+ 	frame->sbsample[ch][s][sb] = nb ?
+ 	  mad_f_mul(I_sample(&stream->ptr, nb),
+ 		    sf_table[scalefactor[ch][sb]]) : 0;
++	if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame)
++	{
++		stream->error = MAD_ERROR_LOSTSYNC;
++		stream->sync = 0;
++		return -1;
++	}
+       }
+     }
+ 
+@@ -195,6 +219,12 @@
+ 	mad_fixed_t sample;
+ 
+ 	sample = I_sample(&stream->ptr, nb);
++	if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame)
++	{
++		stream->error = MAD_ERROR_LOSTSYNC;
++		stream->sync = 0;
++		return -1;
++	}
+ 
+ 	for (ch = 0; ch < nch; ++ch) {
+ 	  frame->sbsample[ch][s][sb] =
+@@ -403,7 +433,15 @@
+     nbal = bitalloc_table[offsets[sb]].nbal;
+ 
+     for (ch = 0; ch < nch; ++ch)
++    {
+       allocation[ch][sb] = mad_bit_read(&stream->ptr, nbal);
++	if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame)
++	{
++		stream->error = MAD_ERROR_LOSTSYNC;
++		stream->sync = 0;
++		return -1;
++	}
++    }
+   }
+ 
+   for (sb = bound; sb < sblimit; ++sb) {
+@@ -411,6 +449,13 @@
+ 
+     allocation[0][sb] =
+     allocation[1][sb] = mad_bit_read(&stream->ptr, nbal);
++
++	if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame)
++	{
++		stream->error = MAD_ERROR_LOSTSYNC;
++		stream->sync = 0;
++		return -1;
++	}
+   }
+ 
+   /* decode scalefactor selection info */
+@@ -419,6 +464,12 @@
+     for (ch = 0; ch < nch; ++ch) {
+       if (allocation[ch][sb])
+ 	scfsi[ch][sb] = mad_bit_read(&stream->ptr, 2);
++	if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame)
++	{
++		stream->error = MAD_ERROR_LOSTSYNC;
++		stream->sync = 0;
++		return -1;
++	}
+     }
+   }
+ 
+@@ -442,6 +493,12 @@
+     for (ch = 0; ch < nch; ++ch) {
+       if (allocation[ch][sb]) {
+ 	scalefactor[ch][sb][0] = mad_bit_read(&stream->ptr, 6);
++	if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame)
++	{
++		stream->error = MAD_ERROR_LOSTSYNC;
++		stream->sync = 0;
++		return -1;
++	}
+ 
+ 	switch (scfsi[ch][sb]) {
+ 	case 2:
+@@ -452,11 +509,23 @@
+ 
+ 	case 0:
+ 	  scalefactor[ch][sb][1] = mad_bit_read(&stream->ptr, 6);
++		if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame)
++		{
++			stream->error = MAD_ERROR_LOSTSYNC;
++			stream->sync = 0;
++			return -1;
++		}
+ 	  /* fall through */
+ 
+ 	case 1:
+ 	case 3:
+ 	  scalefactor[ch][sb][2] = mad_bit_read(&stream->ptr, 6);
++		if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame)
++		{
++			stream->error = MAD_ERROR_LOSTSYNC;
++			stream->sync = 0;
++			return -1;
++		}
+ 	}
+ 
+ 	if (scfsi[ch][sb] & 1)
+@@ -488,6 +557,12 @@
+ 	  index = offset_table[bitalloc_table[offsets[sb]].offset][index - 1];
+ 
+ 	  II_samples(&stream->ptr, &qc_table[index], samples);
++		if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame)
++		{
++			stream->error = MAD_ERROR_LOSTSYNC;
++			stream->sync = 0;
++			return -1;
++		}
+ 
+ 	  for (s = 0; s < 3; ++s) {
+ 	    frame->sbsample[ch][3 * gr + s][sb] =
+@@ -506,6 +581,12 @@
+ 	index = offset_table[bitalloc_table[offsets[sb]].offset][index - 1];
+ 
+ 	II_samples(&stream->ptr, &qc_table[index], samples);
++	if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame)
++	{
++		stream->error = MAD_ERROR_LOSTSYNC;
++		stream->sync = 0;
++		return -1;
++	}
+ 
+ 	for (ch = 0; ch < nch; ++ch) {
+ 	  for (s = 0; s < 3; ++s) {
+Index: libmad-0.15.1b/layer3.c
+===================================================================
+--- a/layer3.c	2008-12-23 21:38:07.000000000 +0100
++++ b/layer3.c	2008-12-23 21:38:12.000000000 +0100
+@@ -2608,6 +2608,12 @@
+     next_md_begin = 0;
+ 
+   md_len = si.main_data_begin + frame_space - next_md_begin;
++  if (md_len + MAD_BUFFER_GUARD > MAD_BUFFER_MDLEN)
++  {
++	stream->error = MAD_ERROR_LOSTSYNC;
++	stream->sync = 0;
++	return -1;
++  }
+ 
+   frame_used = 0;
+ 
diff --git a/media-libs/libmad/libmad-0.15.1b-r9.ebuild b/media-libs/libmad/libmad-0.15.1b-r9.ebuild
new file mode 100644
index 000000000000..42745664ae16
--- /dev/null
+++ b/media-libs/libmad/libmad-0.15.1b-r9.ebuild
@@ -0,0 +1,80 @@
+# 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
+
+DESCRIPTION="\"M\"peg \"A\"udio \"D\"ecoder library"
+HOMEPAGE="http://mad.sourceforge.net"
+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"
+IUSE="debug static-libs"
+
+DEPEND=""
+RDEPEND=""
+
+DOCS=( CHANGES CREDITS README TODO VERSION )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/mad.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cflags.patch
+	"${FILESDIR}"/${P}-cflags-O2.patch
+	"${FILESDIR}"/${P}-gcc44-mips-h-constraint-removal.patch
+	"${FILESDIR}"/${P}-CVE-2017-8372_CVE-2017-8373_CVE-2017-8374.patch
+)
+
+src_prepare() {
+	default
+
+	# bug 467002
+	sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.ac || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# --enable-speed		 optimize for speed over accuracy
+	# --enable-accuracy		 optimize for accuracy over speed
+	# --enable-experimental	 enable code using the EXPERIMENTAL
+	#						 preprocessor define
+	local myconf=(
+		--enable-accuracy
+		$(use_enable debug debugging)
+		$(use_enable static-libs static)
+	)
+
+	# Fix for b0rked sound on sparc64 (maybe also sparc32?)
+	# default/approx is also possible, uses less cpu but sounds worse
+	use sparc && myconf+=( --enable-fpm=64bit )
+
+	[[ $(tc-arch) == "amd64" ]] && myconf+=( --enable-fpm=64bit )
+	[[ $(tc-arch) == "x86" ]] && myconf+=( --enable-fpm=intel )
+	[[ $(tc-arch) == "ppc" ]] && myconf+=( --enable-fpm=default )
+	[[ $(tc-arch) == "ppc64" ]] && myconf+=( --enable-fpm=64bit )
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	# This file must be updated with each version update
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins "${FILESDIR}"/mad.pc
+
+	# Use correct libdir in pkgconfig file
+	sed -e "s:^libdir.*:libdir=${EPREFIX}/usr/$(get_libdir):" \
+		-i "${ED}"/usr/$(get_libdir)/pkgconfig/mad.pc
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libmatemixer/Manifest b/media-libs/libmatemixer/Manifest
index d79fbd8dd37e..e3148557fe51 100644
--- a/media-libs/libmatemixer/Manifest
+++ b/media-libs/libmatemixer/Manifest
@@ -1,9 +1,3 @@
-DIST libmatemixer-1.12.1.tar.xz 382444 BLAKE2B f315ce58af6001d3412cfbc7b1d0ce5ffbad658749a2ec5720ddd60cfbea39af019db6d0812ec3d8a4ca970da5b0dfda2ef5518d364355c89cd3fc6909b37dd3 SHA512 6aa0a9d7af254ef85051a8052b2f7ffb2a705e07636da1eea358667e8577aad0f459b21b45751f256a58cbcac33d3b6628227e70f55e9ff0cdfe211bdfa7b0da
-DIST libmatemixer-1.14.0.tar.xz 413824 BLAKE2B e9ee4ca65450faeb199919f09403906c62785f084e86003e9b4866d51c62fad7a60b66f419f627aaa72d164c1cafa4fb47fa371c0d4959d82e0dbb7f5b4efc89 SHA512 e7ac0d583d740df87af75f3b590e81d0716e0169ec9021bfe2d0e2065f78905ed96a37b606233b4cfbf190116e111edfca89d912bdb37d37d724d22bfb8d84fb
-DIST libmatemixer-1.16.0.tar.xz 415876 BLAKE2B 64e540134ae2827fa3c9e8ecf7cffc39ee110c44596cafba78d2ae8246c37326e0427a6fd50e2314a1082d87bd757521d2b93689ce255f797bec5a84118eaa0b SHA512 6dbf87ff81f32d6d9dfc5627fa3b97cf24a4b466c74f52958fdab8a889fe3e830dab62520eda72e93a9666dee3c45946cc0e300a1b15b16c70ff839b4faf480b
 DIST libmatemixer-1.18.0.tar.xz 418772 BLAKE2B f37689b9929ac659c6f314f2d5751beff18304575680985f4e3b24b3032237464d2ab32e4675ca3bbb0be796d90ecca47d49925a4a6105bf50907722c4505765 SHA512 254d1ff74f036d813f9ec2b983b86a730fec0d1f2009e7d22a9d779e509aec92409225cec5ff1f7c747c468c5e40affaa67130df4bb7087d5ee61036359b4407
-EBUILD libmatemixer-1.12.1-r1.ebuild 731 BLAKE2B de5e03f7694d0f700014f3806c8b0fbdd050e84333ec6a20c9dbbecf6d2958ae3fe89b61a5c74fa117f5c5f1cfdbdda085b2e9076ed4f46f837d7d8e6c3fb558 SHA512 2e0b39ac87f29ad3ffee3732c5ba68630c3d6952c590ea8959717d288953ab67d7972aa630656d092e353d60baf5a5ab1cacdae1fba860ee84480e7478d80dd9
-EBUILD libmatemixer-1.14.0.ebuild 773 BLAKE2B 1b2f155001729212769c63a772b4f66cbd3d2b5fbf0314b88ebeaae6ec24802c63532c177704cc2c23cc3c63926dc9334352f908c136da5ac155d187a9e0e61e SHA512 67a50d025b0a3806157b7bd362eac25b85ac9a499a6277fc59c21057897f9dd31cdf825b427a840905828c27f99c7454647385e3592c448d27c511cada284e2b
-EBUILD libmatemixer-1.16.0.ebuild 773 BLAKE2B 1b2f155001729212769c63a772b4f66cbd3d2b5fbf0314b88ebeaae6ec24802c63532c177704cc2c23cc3c63926dc9334352f908c136da5ac155d187a9e0e61e SHA512 67a50d025b0a3806157b7bd362eac25b85ac9a499a6277fc59c21057897f9dd31cdf825b427a840905828c27f99c7454647385e3592c448d27c511cada284e2b
 EBUILD libmatemixer-1.18.0.ebuild 778 BLAKE2B 1f503c2e32a091cc8fd598f87d4ebe4b9dcf0666cdeeeffd2ac8bcd1f7d452fd1c18a7986fc905bbd112db0d301f12cfdea72f6eff8e1957d1e4b5b000f13260 SHA512 1c9037c115b9036c4143a2e771d80172aa84ca5475b5e84e7ac9e031656c2d067bc0fc4d0badd6abee48161f1d6faca72e682e9ba9e71da251cfa6c01150d700
 MISC metadata.xml 341 BLAKE2B e060b6c02aaaea5885ec10566d2e3b13fb2f480201b3b43144255fa1f27a93a648a9030fa02f0efd20c8f32ee93e03661f379a63576822ed5c27b094ff6d7d81 SHA512 0c6f04ebdfe4cd26e7fdad53fd184045f6d95c4b9c888883f255ddc566fc02e0cf86138d5557fb71c0e8e9ea12e0d19657b218e1d310ce414e2911470eaa9359
diff --git a/media-libs/libmatemixer/libmatemixer-1.12.1-r1.ebuild b/media-libs/libmatemixer/libmatemixer-1.12.1-r1.ebuild
deleted file mode 100644
index 33b75c474711..000000000000
--- a/media-libs/libmatemixer/libmatemixer-1.12.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Mixer library for MATE Desktop"
-LICENSE="LGPL-2 GPL-2"
-SLOT="0"
-
-IUSE="+alsa oss pulseaudio"
-
-RDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-libs/glib-2.36:2
-	sys-devel/gettext:*
-	alsa? ( >=media-libs/alsa-lib-1.0.5 )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.23:0[alsa?,glib] )"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35.0:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--disable-null \
-		$(use_enable alsa) \
-		$(use_enable oss) \
-		$(use_enable pulseaudio)
-}
diff --git a/media-libs/libmatemixer/libmatemixer-1.14.0.ebuild b/media-libs/libmatemixer/libmatemixer-1.14.0.ebuild
deleted file mode 100644
index f90dbf42fd10..000000000000
--- a/media-libs/libmatemixer/libmatemixer-1.14.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Mixer library for MATE Desktop"
-LICENSE="LGPL-2 GPL-2"
-SLOT="0"
-
-IUSE="+alsa oss pulseaudio"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.36:2
-	sys-devel/gettext:*
-	alsa? ( >=media-libs/alsa-lib-1.0.5 )
-	pulseaudio? ( >=media-sound/pulseaudio-2.0.0:0[alsa?,glib] )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35.0:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--disable-null \
-		$(use_enable alsa) \
-		$(use_enable oss) \
-		$(use_enable pulseaudio)
-}
diff --git a/media-libs/libmatemixer/libmatemixer-1.16.0.ebuild b/media-libs/libmatemixer/libmatemixer-1.16.0.ebuild
deleted file mode 100644
index f90dbf42fd10..000000000000
--- a/media-libs/libmatemixer/libmatemixer-1.16.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Mixer library for MATE Desktop"
-LICENSE="LGPL-2 GPL-2"
-SLOT="0"
-
-IUSE="+alsa oss pulseaudio"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.36:2
-	sys-devel/gettext:*
-	alsa? ( >=media-libs/alsa-lib-1.0.5 )
-	pulseaudio? ( >=media-sound/pulseaudio-2.0.0:0[alsa?,glib] )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35.0:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--disable-null \
-		$(use_enable alsa) \
-		$(use_enable oss) \
-		$(use_enable pulseaudio)
-}
diff --git a/media-libs/libmng/Manifest b/media-libs/libmng/Manifest
index 597a4cdf3da4..a2e5d9968680 100644
--- a/media-libs/libmng/Manifest
+++ b/media-libs/libmng/Manifest
@@ -4,5 +4,5 @@ AUX libmng-2.0.3-jpeg-9a.patch 1231 BLAKE2B 0b9c55af1a88d836cf753410da6299a7c19f
 DIST libmng-2.0.2.tar.xz 951844 BLAKE2B 2d0412b3243762029fd4487dafeee9cbc7a2c13e358e2d66f6a27624dff0d9398a1f7a9b9bdc4e40b7b57ead082b5fd894fcc94782e550d43371f2141996b453 SHA512 76ff107df43297837e075a4b57dac75ece501a57060884720a22518d9514ad0af64d69d22fe12a92d3bce3e50ae8ca3c8081680535743d2bde9ae9fa11e32687
 DIST libmng-2.0.3.tar.xz 951808 BLAKE2B 18f29d270d8c646da1eef41da094271acd5ce86094441f7f4d78dadab9dbc147619c4226bc642722639eb6d1a49567c517acaadea823f38c7bdd8ee3f498b927 SHA512 764efd94643c17c449abcb8f676ec2aa750a2461cf46bc961343f8d443a16ac2caa135c27d846deb2351b9f25d6170c42a500d21f63c13276905fdd743b8fec6
 EBUILD libmng-2.0.2-r1.ebuild 1178 BLAKE2B 3773cc710c8193761d31f7899845b46a9034807b1035db4d3782baac2d79abf33bc993ad7c47e423a08cac435d965b9e6b28bbe1b8fdc3a66dfc8face76067dd SHA512 33f96e47638f83c69dae5860ad39ac889c079570b04ad0194390acd74a022bc9b6fcb6a67e7988988790bf8f91cad31496961a482b21d366d7a86da0533eba02
-EBUILD libmng-2.0.3.ebuild 1173 BLAKE2B 9b3396cc39612b86afd549723796020c8aa33fb910771b04170e8db8d22c3e25989cc8790ae169750486eae7cceab88a5c63e6033973caf3cb6589a4a974687c SHA512 3453b8f2e0c1938c1a062f60133379e9f4b5d8d4d95ab5f97f16a400d4dfbdfb6a7dee6c582b48fe91cdc8eff41c7592bdca27f328b6585003842ce1cd71294c
+EBUILD libmng-2.0.3.ebuild 1172 BLAKE2B 43a1a5fb1cdde913b36edbf5034aec6a250e026aa6df9f6f1db52db527558f8cd2b4d40effd4f01b295488184f9adbe5004d93fd35e0ff601192ceb0f33bcb9a SHA512 85a000bb7757d3745b00819705de38581a90b02d49571b68305ac099bf016be93390d34704ad772b64f0fb4204835afcbf2972d95aec66649d77232988dae30a
 MISC metadata.xml 335 BLAKE2B d1fae8ad219bf09d9bd3588fedaaca1599c795811ea024f726dc3e37e88e5b776e05c3c40eefa6d100e393fcf439aff9d67c77d85010f6e1e8e2319067386fee SHA512 a870b439c25b0dc7d251b15c53eded27ed9a4c708dd81bb4facc7cda49b57abb4a24c013b36c11db4d8a27af2cd55ad012792fe81e8893f5c92007790c4fd8f8
diff --git a/media-libs/libmng/libmng-2.0.3.ebuild b/media-libs/libmng/libmng-2.0.3.ebuild
index 0fe05dafb9de..48566bf2e6b6 100644
--- a/media-libs/libmng/libmng-2.0.3.ebuild
+++ b/media-libs/libmng/libmng-2.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/libmng/${P}.tar.xz"
 
 LICENSE="libmng"
 SLOT="0/2"
-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 ~m68k-mint ~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 ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="lcms static-libs"
 
 RDEPEND="
diff --git a/media-libs/libmodplug/Manifest b/media-libs/libmodplug/Manifest
index 121ed58f8206..f91b9eb89b0f 100644
--- a/media-libs/libmodplug/Manifest
+++ b/media-libs/libmodplug/Manifest
@@ -2,8 +2,6 @@ AUX libmodplug-0.8.4-timidity-patches.patch 592 BLAKE2B 7bbee6d0ff833a6ead5e1a1d
 AUX libmodplug-0.8.8.5-no-fast-math.patch 561 BLAKE2B 366ed73a5c960dff3d4494781c6b53ce621f2828f8b92f584be8d3f9238244151394c7083429c570e6bc877fcae939c02488fce83ca459c2aa5186fc6bc1cee1 SHA512 f02ffb5594d65b601880744576408baa03869a4ffc12182826a6692351863045e9522ff2456744e667223919c10acfa5dbe6e0ada7881ae2e62e818829a20769
 AUX libmodplug-0.8.8.5-psm-omf2097-fixes.patch 4294 BLAKE2B 310ba033d8c49d98eb6d7bbaf71fb352f4524272c1d5da8b817f6c0fc4943bc01f03acab7371a715109064e8cf49cf6e80f234f0f473300140fd7632caf9c4cf SHA512 2aa1256ddb813ec7f578abb848e6b462edb5f41b946c8f30a2c903eec327c53959d01cda90bd306de6536bd8d54e3dad815c8beec54faddc7664c960aa979dff
 AUX libmodplug-0.8.9.0-no-fast-math.patch 515 BLAKE2B d1068b8647b59daecbf60470d7d0f6cf6884438c3a833aefb16181b50201f33879ca0d8dd6f341c1690b5e160e0a6eb706aebd28533aa5fbf5bdde0eb47196f2 SHA512 dfcf1497343f5bb145ac41ada3e313c2eaf8b18827dd1dbb55024a945300eb9054503f20d8a60f835dce50820c99eb4edf20109056ce929e7284f247312cd9c1
-DIST libmodplug-0.8.8.5.tar.gz 546751 BLAKE2B 6a6c246537ef5123c84548f9b1f6092a3af7384f16a5cbb3d8511546d31a25818656b0904f8944a90b0164e50293047f02607f500c77c030527c7771c6519e48 SHA512 aa943b8df5e3fd41b497e55f5d2c493c28a4c90d444d041f74a58ab5f4702eab9bb36f337e4c795561e0006846a5fda0b42bcf96b33e1267b190f6005862b332
 DIST libmodplug-0.8.9.0.tar.gz 576566 BLAKE2B 534ce23f37ae60593fcbf0b8984140badcf7d868a7559ea6aef282a4d14dc6ad05847dc128a0221772e1dc2abb8c870ff8d6d46da0c04232169f905468a3ba19 SHA512 880e10154fd367ee24ace53ca7e32a5c1fee7dfff1f934e6499944c12779427da63e2f55f8d6ce25db0a42a5b4424053bf64305b31dbfc4ef6a8909924d655fd
-EBUILD libmodplug-0.8.8.5.ebuild 823 BLAKE2B 553ee8e443dad1688653717ffd7c8d91ed814ee0f7a8fc6936693651868cc8fb732240d7cc197d3a9b7b4e22b5c3cd700956dc892a34f0fc5f3690f466deb0f4 SHA512 4a29ff9bdd21e8248898c98e3d8b166aca6dcb24f4a1c5033093719fdb3a1ddaa80fd035435f4b4f12d313bea4cc1cc5b83662f3fde575829012bb7c38097a06
-EBUILD libmodplug-0.8.9.0.ebuild 781 BLAKE2B 7a20de9cb82c128c6163b37bcf1023bc3330567b1f68dda113ff5a1c8fe5ad41ed847064036aa3b1c21d7e72e08489bbea3c1f9445a46ca55000bf95bf4bcd09 SHA512 87380af8838985dc59abba041cf490307e532e7af445db8967496c62bd3f5a2aeccb1de2a06c924d93b65c91aaf21a3707793b52ba5547e6e3f117496a59e1ec
+EBUILD libmodplug-0.8.9.0.ebuild 780 BLAKE2B 24ffe6ae1d91d499f79465a30803103a74576e161c04632eb00f8dbd7de4f693401293a1ee51994f39e47a87833a24fc67df54ad038f721cbf842a8bf66a3b85 SHA512 dae2420bb31e9254ce12ec0299607d195849dfd5d830e7be0b093b57b1effd1e72fde6eb0a21b15f35c33c80e831ad7c360300319d8252fa0524679bf6c86e74
 MISC metadata.xml 457 BLAKE2B 2aa3262e69e5eb85c8ee24f912b126c38554bb324652b7a2b91620236a72b1717ce0ada193193d9655883f8ce48be622e85934a8acb69f35e78bc59616d051af SHA512 6b4cb6e098ed3d743e76d98da648ef475288ec82273b7fbdd73bd60cd14e58d98f0798244bbd4432e504402655557aa0ffb5a4104261c5916261e8040430e46d
diff --git a/media-libs/libmodplug/libmodplug-0.8.8.5.ebuild b/media-libs/libmodplug/libmodplug-0.8.8.5.ebuild
deleted file mode 100644
index b1f05b8655d3..000000000000
--- a/media-libs/libmodplug/libmodplug-0.8.8.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-inherit autotools-multilib
-
-DESCRIPTION="Library for playing MOD-like music files"
-SRC_URI="mirror://sourceforge/modplug-xmms/${P}.tar.gz"
-HOMEPAGE="http://modplug-xmms.sourceforge.net/"
-
-LICENSE="public-domain"
-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 ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND=""
-DEPEND="virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-PATCHES=(
-	"${FILESDIR}/${PN}-0.8.4-timidity-patches.patch"
-	"${FILESDIR}/${P}-no-fast-math.patch"
-	"${FILESDIR}/${P}-psm-omf2097-fixes.patch"
-)
diff --git a/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild b/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild
index 1dc50c477a87..da84517cd518 100644
--- a/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild
+++ b/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://modplug-xmms.sourceforge.net/"
 
 LICENSE="public-domain"
 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 ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=""
diff --git a/media-libs/libmp4v2/Manifest b/media-libs/libmp4v2/Manifest
index 25b6b84dc910..167d729cc6f5 100644
--- a/media-libs/libmp4v2/Manifest
+++ b/media-libs/libmp4v2/Manifest
@@ -1,6 +1,8 @@
-AUX gcc7.patch 624 BLAKE2B dac53de5e62c1e074451930e221f71e73cde5f98e075b89b16a3e5628078881df7ac5e3a692c8e34e5475888adfcb1eeabcadd5f9f6f6a7da2ed84dd34e10876 SHA512 2a5ed4c573fb9b5b3fa95d66c4863e831734a32278394fa6ee2c3d4e2972ca330ffd3b9f2dc88f8b7665ee5798795e4413bdf9d840dbf45a9ed17e8add71056d
+AUX libmp4v2-2.0.0-gcc7.patch 747 BLAKE2B 5bed55f8c9e9593261d9738871de162fdfaec6239078e3ffc0fc85352e60687ba93e37f63edd8fbaf576ffa5966aef07fd58171366ec60ac5969a80eb92f6016 SHA512 18433209711b88cf4a09dcf6ad26d7d717d6593d9b006258e80aac85fee01da17bbf7e67e60c75c82e18652eaddcdb2d945dec52f2f75aa0f236bd5328aab760
+AUX libmp4v2-2.0.0-mp4tags-corruption.patch 641 BLAKE2B 2e375382dd8bab2e7a006fe9f80c8d44ee1e2b00ccf9b4a4250782437fe49b6be25e2badb9bff774b5568d175111953f7cdc064d0a1eff8425632eb2221a7ef0 SHA512 479615f92556beb36b2a489c228b1f7b64f8d59d5d0131e414fa82e3961b46c9b99fb6671d8c54c996de58472660ffc4e999a3ff7ce03f6c00b04365947e471a
 DIST mp4v2-1.9.1.tar.bz2 432943 BLAKE2B 529ecc3ebd9192ab61febd0512704b5867abf29dc9755c5e61100522ebecc25189000886b152115c12fedbfbe5cc38bb36adb9281e6e60bbf43e86605432aae0 SHA512 28b6f96c1d44a1601980113767c38f5b5b058e1a1fae25c18632163e948c18fc884af9d146bb68e771303ab3c5c8ef9437f4fffa7d770d29157f2d455ee4b1c8
 DIST mp4v2-2.0.0.tar.bz2 495672 BLAKE2B 966c90b443bd6f7a81c96fd12f95b00c3ec89cd476aa0fff3e0450b315d54543578ef953c5e3f28d52ca800a0768c601dddc8e99a32ff512767cd65c12832bd5 SHA512 15eb882f33d72d4209053b54c883b67715f539c33096705a0e7bc79015b93f6f3ac80ae29c65a0ffe9eab1bf0dedf07198bdee23fa6eafcd6ccb34f984484be0
 EBUILD libmp4v2-1.9.1-r1.ebuild 942 BLAKE2B 5e19a4fabe3ce152f34767003a423d898e39d110f58b7a35d540198dc0182578c7121ed339a3ccbb8dd238333b4d5d1470f0521b625bbb40ad279114d626ab54 SHA512 112c12d3642e06e8a7d0a7ca027840cf39cece7ad20ba555f645b86c8538be8647a313d474cb1019c47b77d235735603194378711778b159a7ea4518e39ae1b3
-EBUILD libmp4v2-2.0.0.ebuild 960 BLAKE2B df78bc60350053fcbdcedce411318bd40a2a156ce53aeaca059fd37a4ba1c3ea9aea9de5ca5d79ff47e004faa5b8ba0a301ef1d001ab34ec9e0d47089f655e2e SHA512 b712567ee122d5aa2642749c21d7c683429b743a7469f24f325efe319354f1a343f579a0efda51e492525a950f39182e50d427efa4101d77bbbfa404e14fc10b
+EBUILD libmp4v2-2.0.0-r1.ebuild 1071 BLAKE2B 0635266a4893ebb9a9f32728408b6eb8f8d8bf14a046c73fa9ee26941965dc2c0d89b2e15ecc61b553996c8544b3cc5b7eed40f3d2649e34eb0bfae24f7dbb92 SHA512 88e05306846b77fe3bcc18ed132c696ec1e14215fb7c01ccc257abd54279510a60cc7c04f648e560de81c3308f97ca8df5cf76c3f621ba0dd77bd8f16df565d2
+EBUILD libmp4v2-2.0.0.ebuild 962 BLAKE2B 7970f6a4fd28c7e76a7f4cdccdb75425949aa98c1dea1b265867d55bb2e6409a2c4b70acdda101649710345899951cd084f1f286cd0fa7f6422be2222ef4955b SHA512 c38f286376dd1e82da888c6b1833485b3c2dc0c657974b58e717d20d05cee6512b9da70d33f9ead9cb43daf128a00f55a57a934cee62dc00e4f209cee1aed7fc
 MISC metadata.xml 402 BLAKE2B ed37dabc480f00cf0f23df37f1e1f9203d81415f9c030f307f1265f9550f5e6a2466de8387b0f16eb7c40dd6e3705bff031df7b264594a7319751ba83c1c7d6b SHA512 63643195e04ecdb3a79a862991760894a4fc52aa073ee1aba1efba4babdd926002fe271d04f82e4e40dbf4cad2fa77fd7853620fe11badb14cc83d27c342ad70
diff --git a/media-libs/libmp4v2/files/gcc7.patch b/media-libs/libmp4v2/files/gcc7.patch
deleted file mode 100644
index fbfae97e58c0..000000000000
--- a/media-libs/libmp4v2/files/gcc7.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=600892
-
---- mp4v2-2.0.0/src/rtphint.cpp	2012-05-20 16:11:53.000000000 -0600
-+++ /tmp/rtphint.cpp	2017-05-16 10:25:26.930705191 -0600
-@@ -339,7 +339,7 @@
-                 pSlash = strchr(pSlash, '/');
-                 if (pSlash != NULL) {
-                     pSlash++;
--                    if (pSlash != '\0') {
-+                    if (*pSlash != '\0') {
-                         length = (uint32_t)strlen(pRtpMap) - (pSlash - pRtpMap);
-                         *ppEncodingParams = (char *)MP4Calloc(length + 1);
-                         strncpy(*ppEncodingParams, pSlash, length);
diff --git a/media-libs/libmp4v2/files/libmp4v2-2.0.0-gcc7.patch b/media-libs/libmp4v2/files/libmp4v2-2.0.0-gcc7.patch
new file mode 100644
index 000000000000..156f0fcbaa0d
--- /dev/null
+++ b/media-libs/libmp4v2/files/libmp4v2-2.0.0-gcc7.patch
@@ -0,0 +1,18 @@
+https://bugs.gentoo.org/show_bug.cgi?id=600892
+
+Description: Fix pointer comparison (FTBFS on GCC 7)
+Author: Philip Chung <philipchung1995@yahoo.com>
+Bug-Debian: https://bugs.debian.org/853560
+Last-Update: 2017-09-04
+
+--- a/src/rtphint.cpp
++++ b/src/rtphint.cpp
+@@ -339,7 +339,7 @@ void MP4RtpHintTrack::GetPayload(
+                 pSlash = strchr(pSlash, '/');
+                 if (pSlash != NULL) {
+                     pSlash++;
+-                    if (pSlash != '\0') {
++                    if (*pSlash != '\0') {
+                         length = (uint32_t)strlen(pRtpMap) - (pSlash - pRtpMap);
+                         *ppEncodingParams = (char *)MP4Calloc(length + 1);
+                         strncpy(*ppEncodingParams, pSlash, length);
diff --git a/media-libs/libmp4v2/files/libmp4v2-2.0.0-mp4tags-corruption.patch b/media-libs/libmp4v2/files/libmp4v2-2.0.0-mp4tags-corruption.patch
new file mode 100644
index 000000000000..1c41a41da988
--- /dev/null
+++ b/media-libs/libmp4v2/files/libmp4v2-2.0.0-mp4tags-corruption.patch
@@ -0,0 +1,20 @@
+From: "Matteo F. Vescovi" <mfv@debian.org>
+Date: Thu, 5 Nov 2015 15:26:00 +0100
+Subject: Fix_mp4tags_corruption
+
+---
+ util/mp4tags.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/util/mp4tags.cpp b/util/mp4tags.cpp
+index 1b9e866..80e89d4 100644
+--- a/util/mp4tags.cpp
++++ b/util/mp4tags.cpp
+@@ -539,6 +539,7 @@ extern "C" int
+                         else {
+                             fprintf( stderr, "Art file %s not found\n", tags[i] );
+                         }
++                        break;
+                     }
+                     case OPT_ALBUM_ARTIST:
+                         MP4TagsSetAlbumArtist( mdata, tags[i] );
\ No newline at end of file
diff --git a/media-libs/libmp4v2/libmp4v2-2.0.0-r1.ebuild b/media-libs/libmp4v2/libmp4v2-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..9f5cac1bf140
--- /dev/null
+++ b/media-libs/libmp4v2/libmp4v2-2.0.0-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P=${P/lib}
+inherit libtool
+
+DESCRIPTION="Functions for accessing ISO-IEC:14496-1:2001 MPEG-4 standard"
+HOMEPAGE="https://code.google.com/p/mp4v2/"
+SRC_URI="https://mp4v2.googlecode.com/files/${MY_P}.tar.bz2"
+
+LICENSE="MPL-1.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 ~x86-solaris"
+IUSE="static-libs test utils"
+
+BDEPEND="sys-apps/sed
+	utils? ( sys-apps/help2man )
+	test? ( dev-util/dejagnu )"
+
+DOCS=( doc/{Authors,BuildSource,Documentation,ReleaseNotes,ToolGuide}.txt README )
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/${P}-gcc7.patch"
+	"${FILESDIR}/${P}-mp4tags-corruption.patch"
+)
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		--disable-gch \
+		$(use_enable utils util) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libmp4v2/libmp4v2-2.0.0.ebuild b/media-libs/libmp4v2/libmp4v2-2.0.0.ebuild
index b52cf1e5e630..cd9550fdec8e 100644
--- a/media-libs/libmp4v2/libmp4v2-2.0.0.ebuild
+++ b/media-libs/libmp4v2/libmp4v2-2.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=4
@@ -25,7 +25,7 @@ DOCS="doc/*.txt README"
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
-	epatch "${FILESDIR}/gcc7.patch"
+	epatch "${FILESDIR}/${P}-gcc7.patch"
 	elibtoolize
 }
 
diff --git a/media-libs/libopenraw/Manifest b/media-libs/libopenraw/Manifest
index 23fd58d82f58..aeb6590b202f 100644
--- a/media-libs/libopenraw/Manifest
+++ b/media-libs/libopenraw/Manifest
@@ -1,11 +1,6 @@
 AUX libopenraw-0.0.9-jpeg-9a.patch 590 BLAKE2B e43ddad7d7c3e48a633bc8e8acc480ac610b505052e267a175acc56c2036d9d2bc2b9127184d30924661243c3a595c2caf3a6eb6443102890d3620095b84108d SHA512 555a4ae729fb4163d7a26bc577fff9257bb326712d8c59f4c4d36c1398bb7ebac26a2f961d22676d9c97812a9fd6433f802ba2d9fc94a5c07e18de60e59c682a
-AUX libopenraw-0.1.0-jpeg-9a.patch 607 BLAKE2B d2dd8df49f0a90c7c3f244ebcfb1993b74aa4e6ef013eccc8d73f1be5e355de17be521690c1933d7bf630d0df977f04974a28838b03ae502e9671cdba1840cda SHA512 b5d9c7ac525863e52e29cde061a7138fe0ec90b021b225b55fd6d4627f074dd9ef410386be250d9c3899984ead123e41de8413949f98dfdceeec9bc89a23d31f
 DIST libopenraw-0.0.9.tar.bz2 478687 BLAKE2B d51410aa2a4ce297c660f80f99c912374faf05c0920be0c9dff78c5979c553cd74aafed0591bd62d479825cb0fd7064b47b86747ecddc75cc177b54184eb42b1 SHA512 88d475d27719212686a0a5a08da04d6879fd456ec8f7531f401217df97f4f3d4c52dc8c4fb1c6ca88c12d6a67ecd516b151c5e9dceba9cbfcd13150fe81d6db5
-DIST libopenraw-0.1.0.tar.bz2 525449 BLAKE2B b2ad6cbeb13bb2ece2c782e404c8ad75a3e0906a6ae7c6dfeee706c0b6adf1df7f0e094c6da129405f06837bfb61ec0d9ca0c4492fa1c876e661a646e46c5d70 SHA512 f3b867d831d03350e487a98f08cadf6a24d5e4296129a401c0066cfdf0e628663e821ed0b7e42613d1533513a9c36a1693d6c3cbbd918246dbdfbb111b5a470a
-DIST libopenraw-0.1.1.tar.bz2 561718 BLAKE2B 90ddf5f3d195954418291251aee52d04c7bb4011c8ed20599c5149c056a41f55df8022ed88d9da97aa4884da4114ee7bcc9226c85a5cda0194d42bc99056503c SHA512 ac8195fddc165d32337f518cc89297b91a8c2805132e380a261e9855f88ecbe074d6090f1f7b547c18fd2016b313a19e04e0428f9ba85b18928115b9dc0c1bc2
 DIST libopenraw-0.1.2.tar.bz2 563981 BLAKE2B 60332274c72602e5b3eea3e41dfee8c62303a2f09028df4a637cea6f07391d912f354752cb6f354e06dd9e223dfabe5dbed1d50e0f325d85be42fb5012ecede6 SHA512 edd7e5a71feecbce1d5a20622bd3c7111acd2d4792038fd19920367ebb55d2cc7614627b9739512bbe34d6b5ae2eb65a4da9cee70c400b5cb846bf5fff08efc8
 EBUILD libopenraw-0.0.9.ebuild 1176 BLAKE2B b9fa4bbf8321a60b9e7ead13e84fcd5db9b4f857519c2af477faa512226904bcdaf41216158098d172d2bbc323e3c75df4f21ed92c55584cbcd751e769c41666 SHA512 29dbb8a80ca71dc8da754e60ef28a858237cf115d73d368acd8100106720fa5f8e12cde3f2a51c40873cb989e63ff3c0f9bb644922f29ce166abcc1dec4f1a43
-EBUILD libopenraw-0.1.0.ebuild 1228 BLAKE2B ca67ba91847658b3c342671b49c16d6980f23a9e000084fd62654d7d652cf17ed0514a817a8bb7688a8609e9d4fe1e848b9812537215edb8296dce29bbec8ffa SHA512 8fbc38c551dca7881bf55aa735c8ef6582cd2cc4eb1a0e122ddd547bed0e01505d59dadd9751f8e93bd3d7a34b69973123463e7d7f65db729d0c91ff4cea4aeb
-EBUILD libopenraw-0.1.1.ebuild 1120 BLAKE2B e26e96d57c6e619d51ce08403eaa14bc40d5b9fa297bdbec29e202ef7da5ddcfddf00191cf4ef711618866d6dc6097f7e8b8863bbe856ceb7897b5cd9c653ba7 SHA512 94a09d76deb2100a1f4d274f33c8e2da7eb7e080a7f57c19a2d354111c58e87eec285d67fbf309d99899439d76a4820e138552b830a5a56d2d6fa5dff715bc04
-EBUILD libopenraw-0.1.2.ebuild 1111 BLAKE2B ec6e50d2e20e471639dd4766d0801b8a12b5893cdf67043fee9526b652d59fef5084466354af22cea96deb9e57460f8420bdb264d7b73cc1b12dde9ecb6f06c7 SHA512 8b905c96e8f510b71781940ba8d3b27ae582ea96348b72b9b1ea248ca7242d8c621cdb3c5a5350a6cbd15cd870e9dcd9fe88edc2b437299e85c457f059bf6470
+EBUILD libopenraw-0.1.2.ebuild 1115 BLAKE2B d3509cb3c2a4d530a2114b3314ce0774e7c662c8e21fbb5a2d814769d7cbb2c6590002f72bcb248f845fb2b3d2f03b73e7082d8aa3c2318d58e0adc94faaf89d SHA512 c2827b3824dd2531de17ff16985fe39ffd883397b745851d7a87e5b00ce9a50581c43b8a8fd14410dccbb9acafb83f8c9703b0515d0ea6ca3609131dc2442238
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/media-libs/libopenraw/files/libopenraw-0.1.0-jpeg-9a.patch b/media-libs/libopenraw/files/libopenraw-0.1.0-jpeg-9a.patch
deleted file mode 100644
index e5156a953211..000000000000
--- a/media-libs/libopenraw/files/libopenraw-0.1.0-jpeg-9a.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://bugs.gentoo.org/520888
-https://sourceforge.net/p/fink/package-submissions/4336/
-
-
---- a/lib/jfifcontainer.cpp
-+++ b/lib/jfifcontainer.cpp
-@@ -157,7 +157,7 @@
-   m_file->seek(0, SEEK_SET);
- 
-   if (::setjmp(m_jpegjmp) == 0) {
--    int ret = JPEG::jpeg_read_header(&m_cinfo, TRUE);
-+    int ret = JPEG::jpeg_read_header(&m_cinfo, JPEG::TRUE);
-     //Trace(DEBUG1) << "jpeg_read_header " << ret << "\n";
- 
-     JPEG::jpeg_calc_output_dimensions(&m_cinfo);
-@@ -194,7 +194,7 @@
-     src->pub.next_input_byte = nullptr;
-     src->pub.bytes_in_buffer = 0;
-   }
--  return TRUE;
-+  return JPEG::TRUE;
- }
- 
- 
diff --git a/media-libs/libopenraw/libopenraw-0.1.0.ebuild b/media-libs/libopenraw/libopenraw-0.1.0.ebuild
deleted file mode 100644
index 0378ec2dc56f..000000000000
--- a/media-libs/libopenraw/libopenraw-0.1.0.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 eutils gnome2-utils
-
-DESCRIPTION="A decoding library for RAW image formats"
-HOMEPAGE="https://libopenraw.freedesktop.org/wiki/"
-SRC_URI="https://${PN}.freedesktop.org/download/${P}.tar.bz2"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0/7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="gtk static-libs test"
-
-RDEPEND="
-	dev-libs/libxml2
-	virtual/jpeg:0
-	gtk? (
-		dev-libs/glib:2
-		>=x11-libs/gdk-pixbuf-2.24.0:2
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.35
-	virtual/pkgconfig
-	test? ( net-misc/curl )
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-src_prepare() {
-	has_version '>=media-libs/jpeg-9a:0' && epatch "${FILESDIR}"/${P}-jpeg-9a.patch
-	default
-}
-
-src_configure() {
-	econf \
-		--with-boost="${EPREFIX}"/usr \
-		$(use_enable static-libs static) \
-		$(use_enable gtk gnome)
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
-
-pkg_preinst() {
-	use gtk && gnome2_gdk_pixbuf_savelist
-}
-
-pkg_postinst() {
-	use gtk && gnome2_gdk_pixbuf_update
-}
-
-pkg_postrm() {
-	use gtk && gnome2_gdk_pixbuf_update
-}
diff --git a/media-libs/libopenraw/libopenraw-0.1.1.ebuild b/media-libs/libopenraw/libopenraw-0.1.1.ebuild
deleted file mode 100644
index 9306d7d2660d..000000000000
--- a/media-libs/libopenraw/libopenraw-0.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 gnome2-utils ltprune
-
-DESCRIPTION="A decoding library for RAW image formats"
-HOMEPAGE="https://libopenraw.freedesktop.org/wiki/"
-SRC_URI="https://${PN}.freedesktop.org/download/${P}.tar.bz2"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0/7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="gtk static-libs test"
-
-RDEPEND="
-	dev-libs/libxml2
-	virtual/jpeg:0
-	gtk? (
-		dev-libs/glib:2
-		>=x11-libs/gdk-pixbuf-2.24.0:2
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.35
-	virtual/pkgconfig
-	test? ( net-misc/curl )
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-src_configure() {
-	econf \
-		--with-boost="${EPREFIX}"/usr \
-		$(use_enable static-libs static) \
-		$(use_enable gtk gnome)
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
-
-pkg_preinst() {
-	use gtk && gnome2_gdk_pixbuf_savelist
-}
-
-pkg_postinst() {
-	use gtk && gnome2_gdk_pixbuf_update
-}
-
-pkg_postrm() {
-	use gtk && gnome2_gdk_pixbuf_update
-}
diff --git a/media-libs/libopenraw/libopenraw-0.1.2.ebuild b/media-libs/libopenraw/libopenraw-0.1.2.ebuild
index bf5a873fea28..571c1c4692d4 100644
--- a/media-libs/libopenraw/libopenraw-0.1.2.ebuild
+++ b/media-libs/libopenraw/libopenraw-0.1.2.ebuild
@@ -1,8 +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 gnome2-utils ltprune
+
+inherit gnome2-utils
 
 DESCRIPTION="A decoding library for RAW image formats"
 HOMEPAGE="https://libopenraw.freedesktop.org/wiki/"
@@ -38,7 +39,7 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 }
 
 pkg_preinst() {
diff --git a/media-libs/libprojectm/Manifest b/media-libs/libprojectm/Manifest
index b169edba195f..08312215ebc6 100644
--- a/media-libs/libprojectm/Manifest
+++ b/media-libs/libprojectm/Manifest
@@ -2,5 +2,5 @@ AUX libprojectm-2.1.0-fix-c++14.patch 1505 BLAKE2B 102d3e8aa719fa42e92e81c5dd4fa
 AUX libprojectm-2.1.0-multilib.patch 1245 BLAKE2B 83f75a317b225816b5649c95fdd04699938f08bfe2b9dbebe95f19abcd1e16c4f7f9619c44639586611f3c7b69784af92d2fbff02ab301503ca626ff9da0d7c0 SHA512 562e9616500a49b52e29d50d7c40b8db2b8eb36dbcf28c2b415975b0ce751d21d8ecc06747c3c810303078a2e83ee1c6ed438818d936ddd86efe94900d1a348d
 AUX libprojectm-2.1.0-path.patch 593 BLAKE2B b4f23ca265e02310e1f7e70ab012e2cdf911182a63108f51957641b02ca7ea782ce1bab506bc7e2df2ebb32a2291256e16d22e776a083ee7d185b4ddd7538fe6 SHA512 c2c7a26de1166dada74e7ee3c50da9548992eaf3e3d3881e637ccbef76649c99639f0e2d64e2db4622ce1beb90670504222de3576efc13c35527f9ef064b5bc3
 DIST projectM-complete-2.1.0-Source.tar.gz 31130351 BLAKE2B ec3540326751aba45b9620adfe1e7aed21347c97278de6d23b53ed7fb03878c2d02982fba17b4cda4f713d2cf624fd24adeb15b28fed9d2ab165567f9ff49eaa SHA512 53f4531208d2594f1c28a7f7842fb5ee3349ca9e48f9f0d999a90b6a62d315c9c0ae9cba1cdfacb8a149eba3e5ddc4517ac406ee2c53718191be8e26ee2cca5f
-EBUILD libprojectm-2.1.0-r2.ebuild 1493 BLAKE2B e1d3da5b90183388067b557915cbccc4bf0e09f2ef61be437c9f3b0d5cbe78e5fd962473c6d7f315051423b26f93d6aec920930b03eb9d97c9c00449692d0731 SHA512 266513fff6f8ee4ed0a7d6800a5c99b8c2bbd4dacbbd77c44e8855dd4a4d8f7885161dbd06efdbed0fe333ce4eb20bfec605426dc05097d9913f2f913ffeeb29
+EBUILD libprojectm-2.1.0-r2.ebuild 1491 BLAKE2B 080aca7bcfebd5b2555803ba5d6482612c564c790dba661cafef7af8414209f5896a5113f9d37719cc9937c3535b4dccffa890f4607e3301899bf7c1573b72d6 SHA512 9cd52fcc3df6926b9ff315c4f077f6fee597c35a75903f136e91c5091e4b37fbed9f6fed341af6d105eb8a857e0a236c3bf20e2b4511e22902d98fca6b361c7d
 MISC metadata.xml 331 BLAKE2B a0d10fc64d4ccd3f2b0074f00f48827ecf31eb22f9823d9ac43e8c5d0074e90263dd507457d2467ed33d6b2c09d872af2e2f28f733d8ae9600ebc1862f1da60c SHA512 59a9da9a791cafc359a9b09d67c4f7bffdf48021e92f2974d0ed1477f5923690f5a40ff82e171a55a86ed997d7c30c445a8f83890396aae00f66656eb082b740
diff --git a/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild b/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
index 9dc70f6ab3b3..bcdcf33bd42a 100644
--- a/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
+++ b/media-libs/libprojectm/libprojectm-2.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
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/projectm/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug openmp video_cards_nvidia"
 
 RDEPEND="media-fonts/dejavu
diff --git a/media-libs/libquicktime/Manifest b/media-libs/libquicktime/Manifest
index 29b3c96cac6e..3308ea055898 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 3848 BLAKE2B 5f43d9f46aee43af6d998bf8261695dcaf99f10f5c9c441b9fadfcd2d9765b811d526cce963eb5072b04a1a606828964e5da8d4ebffb8d4c942328a7f45846ab SHA512 3f52bf9adce8cb60d72579e0c74ee84887f975b5922200c0c0bf1f30d12061f7c53caef2d59eed9cbade3c57b9e67ec3be6e7f9c8fd45b11ae19bc56dd745080
+EBUILD libquicktime-1.2.4-r3.ebuild 3847 BLAKE2B fabeec02ba29ec31cbfd774438ca4f4821b20259fff311883d3e266695e9e69beeaac99dc4c521bb10c7d62c60a6cb341f845f539004720eee9a57e07d7c44ad SHA512 f43fe852b41829bce1c8d04a1e541c889694c9c9ff46f77923c269bd0a925dfee0c874b85d7189ca4bfe0df1c741c02f97599c308521f28c476e2aefa3ca6563
 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 a7f558523e45..93fd2e6a3bd8 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
@@ -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 a7f358b13a93..6de12efe4bfe 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -6,6 +6,6 @@ DIST LibRaw-demosaic-pack-GPL2-0.18.8.tar.gz 30868 BLAKE2B 30cef85c49e066fa4b1d8
 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 1845 BLAKE2B 11c7c67a09743bb9fc283d03e8f4924a96d18b2e84d17513bef7a1db8368844b5e0b1a3264cfc54eee50517a426314d1c8ab92fd4e51f2b3867605a7cd2b2995 SHA512 94f3b67603fda3569af7caaf99c37d18d1bf372b9ccdd66f25257c66d3ef8fe8d239d8214350d1d04557eadbaa0eeac9cd53f641b3cb53cf5859b5d6d6bb7906
+EBUILD libraw-0.18.13.ebuild 1841 BLAKE2B 5c119ff15b7f58f665ffb2dcf150b83ce2b37c8fcf48a4f04b05a5e784445ed755dbd824346b4fed7dad6fb49626ed57cd6a82d67bcd685f54d3632216440d59 SHA512 db2e44241d73c9ec2872fc35a91e6d4954dce90db9d7bb84f21fa0e70221f877319774a04a04b71f9363924ee76863a9bcdbe1da1b6aee8ad09e77361d9c07fc
 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.13.ebuild b/media-libs/libraw/libraw-0.18.13.ebuild
index 363d0ecca622..ed73dec8a403 100644
--- a/media-libs/libraw/libraw-0.18.13.ebuild
+++ b/media-libs/libraw/libraw-0.18.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=7
@@ -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/libreplaygain/Manifest b/media-libs/libreplaygain/Manifest
index 5e188bdf94ec..08bfbbf3c4d8 100644
--- a/media-libs/libreplaygain/Manifest
+++ b/media-libs/libreplaygain/Manifest
@@ -1,3 +1,3 @@
 DIST libreplaygain-477.tar.xz 8272 BLAKE2B 6382984643aad155b3e5e0dac8a7ca698320068c62fa87ac7f466e34e850f05df1e823d87f7cb477bd22f59c97f7e5ac8757e9bd6f59c2f5f1852efe9f083d72 SHA512 9e81deb237e35e63d67efabcbfe40f5a6fd34f4a6b0239a21e6ab8ba3c9ca172297cf323fbc4ada749dcfcdf0b711c354e39f12af9a9576900384c441657ff8e
-EBUILD libreplaygain-477-r1.ebuild 804 BLAKE2B 9e7411e0ec5bb96dbae50da4ae8248c540cfae99de6c0a93c8566e1537ea46f949125e30b777906d47424705d3a017e72171d991275b90e547351831d2fcd9d7 SHA512 6ceb71313d36ea94cb8d4c06423cc288bba25b2a234937391bf5bee04b3c9bdcbfdaf59885969e9f7f3f5e2a351ac6d8b818480e6f3a5f994525d5e865923ca1
+EBUILD libreplaygain-477-r1.ebuild 802 BLAKE2B 0134bb01bbe0406765ea0a2c112bf66f7cbe54417967a2d54ccaa5803dfa85291399cb4a6556dbbefbe7bc8f07074bd1d51ec758253ecc10be4b0f4d5f6129ea SHA512 21ed328820b16d1b1dbc25cf74694a018f530a7ff13c655c96a35a0275d020e31ebde8747a2c4eccc55b397b5cd23ca306560b6312682c63c1c2ad31fae83295
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-libs/libreplaygain/libreplaygain-477-r1.ebuild b/media-libs/libreplaygain/libreplaygain-477-r1.ebuild
index 800279b7b37b..b0c94883cfbd 100644
--- a/media-libs/libreplaygain/libreplaygain-477-r1.ebuild
+++ b/media-libs/libreplaygain/libreplaygain-477-r1.ebuild
@@ -1,7 +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
+EAPI=6
+
 inherit cmake-multilib
 
 # svn export http://svn.musepack.net/libreplaygain libreplaygain-${PV}
diff --git a/media-libs/libsidplay/Manifest b/media-libs/libsidplay/Manifest
index fb8164a9c137..179e7ece2254 100644
--- a/media-libs/libsidplay/Manifest
+++ b/media-libs/libsidplay/Manifest
@@ -7,7 +7,6 @@ AUX libsidplay-2.1.1-gcc43.patch 2057 BLAKE2B b66469b17702fa74fffc6ec55469689876
 AUX libsidplay-2.1.1-no_libtool_reference.patch 558 BLAKE2B 7f115c941dc0f9dd8201fd42368d55ee247032ecc4b70c20b89253593e7f6259d533ac724aed22e2229c0c0168f465ac41cb49f3a634e8c9bd618100a5d98dc0 SHA512 826531798593a0e597d2a8a310da584e0097256fe580f7858aa84d9be70f77e1a0b0f9af7e6c94a91602e73f9aff6197f10f2a22ecf1f6fce85ce1f408e04b86
 DIST libsidplay-1.36.59.tgz 390097 BLAKE2B bcb7e9eab4884270c8047af7f61e0afb2cf6ba24465b4859ac404f34cacec9a8c67ad42f3adf0c5f109cedecaa7710919296e30401c2dc0ca6f337186c9a329a SHA512 e7b0859e1389683d3e6aad7040b78ba37bb0a393c85f68ddb8a064371f978b34cc2e951ec564fa1117d12885cd976d10b02937e132d9a11badecd8652cf4d410
 DIST sidplay-libs-2.1.1.tar.gz 1900252 BLAKE2B f04e34f4cfc641a8222e5d53575108bd52deb2de2dc0b0d58e91581ade7128ac87f320f16e044baa23b54de6b5b6b833e9f6c0d37a1885341a329e778c0a0228 SHA512 754cd41f3d2d76754049522c395022bc090f99ea838e6d1ffb8d7689f3aedad9b3879be0312d0af49ba108563296c1176d1e533d1151d5b33368bfda0a1910e3
-EBUILD libsidplay-1.36.59-r1.ebuild 690 BLAKE2B 4547e74b21f7c3b8a807845ba73505690dfaa7ce05e43d790286fe5d338fb8448c57bd48936e65d2922ae4ee655e6d43fba29d41750c7681abbf2f83be81066a SHA512 ed747cd2eb72f8c1bd967c8ccf49bf8e92e905b8fadfead3bb2b51a41ac848c55b0cc11d0a8f0efbb56f1837fb1f5bf295475fded42aded57a44094f4f9efb70
 EBUILD libsidplay-1.36.59-r2.ebuild 769 BLAKE2B 958c67f849ad398c6f4ea6d685a0b33f924884859a32e199d6dff19d1fb4819403eb3e9455bfaa350864335bc12f51a4a71c748684bf80ff6c4f51dfefad947a SHA512 eb762f63d10c9e4c67b6a51523d8e36bce10a5ee837da7a6841536c9b249a371cb4b1488c9041dbddfa0d04d9adc6508276e8890f57b369eed73ccd3e1d0244e
 EBUILD libsidplay-2.1.1-r4.ebuild 1168 BLAKE2B 8b69bec5f74b52932a64ee8ebaa8195afe5ab5cac8fe899c465f32b125fbaeac0f2d8dc03203e3225aa6ed94cc841124aab4613a71f90e71f95a04f3a35f8db3 SHA512 ee3ef694f09cccc476bf1003441afddadc8f085a311889f6cc6be21414581c833bfad9d898aaf8f92380787e7949899fa07907258ace1d902c1131f70d53a8ad
 MISC metadata.xml 294 BLAKE2B 8fcfebdeea5012bebd45c78bf374aadf8092aa88fe731a66e0ec56e642745d613139b6c2cc080f49394d87ff3d04c2e6f84dcf4538e22cbb4299e0decfa83fa7 SHA512 f2ca3b91c3f0f046bc5fd9eafb91a8acfa5a7987d0db24a6e1e6b79bb54a4a466f660953699ca4a84d500a42542e403e12523220e881a466d54b4ea6a4508998
diff --git a/media-libs/libsidplay/libsidplay-1.36.59-r1.ebuild b/media-libs/libsidplay/libsidplay-1.36.59-r1.ebuild
deleted file mode 100644
index 0ef1eeaf0373..000000000000
--- a/media-libs/libsidplay/libsidplay-1.36.59-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils libtool multilib-minimal
-
-DESCRIPTION="C64 SID player library"
-HOMEPAGE="http://critical.ch/distfiles/"
-SRC_URI="http://critical.ch/distfiles/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="static-libs"
-
-DOCS=( AUTHORS DEVELOPER )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-	elibtoolize # required for fbsd .so versioning
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	einstalldocs
-}
diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index 033d07fa1ca6..a2b6864b3bbb 100644
--- a/media-libs/libsndfile/Manifest
+++ b/media-libs/libsndfile/Manifest
@@ -1,9 +1,13 @@
 AUX libsndfile-1.0.28-CVE-2017-12562.patch 4360 BLAKE2B d668fa5c114e3510ff51e2331593d040e0a69476472d55d2a784ceccc71d880cdcc4cda53210d8e2c62abb2397f13d8129162567df8f5528489190ce7c102172 SHA512 8f07edf06652c56877dc5bc478daf494bcfaa45fa1d5a655719aaa8b363edffb749c4878ca11a7dac602ac5658b17eea9397ad824e2c3be38e9fe6c51cea0c63
-AUX libsndfile-1.0.28-CVE-2018-13139.patch 920 BLAKE2B ac10209a6fa2f0f28b5d36dae9bd4e1afde90ae4db55163c42ea99bd20292c1e2df74f3130030982da13a16df11a1fc10b0138ecebc304351efd1b7852084d72 SHA512 b6a04575730de5a9bf2d1b531d585961a4bb822fbb2441d1cebf75519aa3744eddb3a322fc3b4f8aaf92cbf6fafee24eab6b26fa97d49bd2cbc0e3aec1aea66a
+AUX libsndfile-1.0.28-CVE-2017-14634.patch 1295 BLAKE2B 07d4d12db67151dbd4ad3141c0c0cf4de3ab8110a9e0aea3f21a29bc78f761e36fe997f6155d37f3d7839c1f51507b06813fdce41835f2fea429cb288025738c SHA512 5c8ecd05b85ba12fe4f0f0f423a2a1d2652f7469fbc72b0475f7bd9dce8d3c4e880c5a80ded3a2dffa84d41a7e76bb2d813cde1bd2f9474c5ab42d954cd90f2f
+AUX libsndfile-1.0.28-CVE-2017-6892.patch 868 BLAKE2B e90aa5a20b0bce3f2b41240b4289627ab38d87728e30b5cc59b58bf34a9c18eee07a6242ccae6ae5cdb42bd9a49558f2529ddae7f087784cdc6cb2f5f03fe08d SHA512 9183b79cc9a1c1a6de5826d67d7172010d2c57a1a600cabb3763066277e84dfd44225ff9916fb08639ec90514bebadb46634dac5b7e757f5938bee9755e472cc
+AUX libsndfile-1.0.28-CVE-2017-8362.patch 1951 BLAKE2B bf0e1a9c9cd53b61884a861a3284d9fe02ee6411c16f06000fa56794859f6ce96d4d135723a8cffed10801e04be9c94342501fbf2c4caf4078a0a4b5d5b68ad9 SHA512 dfd4b5f1c7471fc416eed5c6040580a020543f145de9103751adaad6ce1c5c6a22abc1cf0ffd381aed3072644cd5ee03ba3598265aa7d202d63167da251cb595
+AUX libsndfile-1.0.28-CVE-2017-8363.patch 857 BLAKE2B 9b053a582aed746fd00efd11f6887cc81d2ef4130533b75e859bb4bed494a29b9918cf07837b6fbc0e60421c659394a9c4c3e79a8bf76c20cc1304a57ef31bfc SHA512 5ce56647b19721dd60157007d3657444c7901e8ead856fa08b6fef0d74ac39e93295294bd21c43c90a3d305750f270f806ed760cd61c93b04e90d9c53357a56e
+AUX libsndfile-1.0.28-CVE-2017-8365.patch 2577 BLAKE2B 3e9af3996f9e859717281b1e59015df64797cd757bef0ccb280c86990ca8eae2ec2550da35e71fc498bfa119c1912f391372bb4a8ffcf7abe1e82e7dc3320ff1 SHA512 f98c40696fca3e7bca867df993de55bb4145c23428e65d1a669182eb2293046478ac727ae7f94bb77123ef0355c3c53be4f9d6a432665c90c74687d8d3afd9e3
+AUX libsndfile-1.0.28-CVE-2018-13139.patch 921 BLAKE2B 4fe567555b1c6e5a0c8098eee40441671a623f4ba91a03c059babc4a7a49eb4903bde38d52333335749fd6a0f6501bf524add119658226f6b169565a579b8f2d SHA512 33817e7c85180635fa239e4ea38973b18312878522639f43071188a995f0e1a35dbca6d133555fb0875292b4b609950ae38e747a6b1949f8ae840db9dc3a2805
 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-r1.ebuild 1663 BLAKE2B 7c6a0c188b0ffba2b67b87c117ef186e0bbc12dadc61cd4d1e58e8f4d02be44bb63d1244fb41ec1520d66b230c66d7d4a466ada116e1cd3ce7551995353db113 SHA512 9ad9784b4dfddb8f4d1b3f70cc47965e35fa2e3b4469e3906dec6be2dc53841f102603f37cb078438148d6fdecace56696038f04c02ace9c14d0c26ec6a12825
-EBUILD libsndfile-1.0.28-r2.ebuild 1721 BLAKE2B 7239131284eae7494988647171fc30680de5a6d3a916c179f0c56818c1ce9adddf827089bae208c4f1d6aa2e1f42b0e74914756a30ad56653ac211e43e6f5cd7 SHA512 5aa47d7d321bd9b94c5c8f4f8b1cbf604f826bd0c3cd309310de2943711f869c7fc10218a9518bfacafcf78428e6ac915e4c3b3cf86156742ff6474eda8969d2
-EBUILD libsndfile-1.0.28-r3.ebuild 1756 BLAKE2B 71b84e1a3779276f11176d0e15f1bfc064f8bdb2f2e2a31df542c44b3d836af416da9f9b1aa697b808dd8522eec692ab1ab52fe36266989e57f6fe525cb85069 SHA512 229ec31c9ebc6d147e725dac6ea87c98fb8ef5784cadb7dad34ea6cc5017e7cb7365160b070ebb83f27eb103b71169b744c2c5a969fe1ca587d7fbbca2264f36
-EBUILD libsndfile-9999.ebuild 1745 BLAKE2B 597955cb2733c8ba88cbea8c0b6a8539cc3e4cbf4360244cafe669c85068c9a4f5b7fb152ffaf390344629d12909a8d514b06372afb6bed01aa90247e5470ed6 SHA512 37a4087046ba8fe41abd09bc16f485e8ca9ce1938021281ff09a5b2b953ed88f935389d13a9b1f6286bd3d35ebf727b4708cb117c7510ef4067f6fb39758adc7
+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-9999.ebuild 1772 BLAKE2B ca1c5369618ff9a92681c7899722248dd3c2ac13960838f8e7eae709dcc0ddbe2ab7ee935de136e409c5b96f2899c54959b90512b7d01491b062e66146b33e01 SHA512 82049c5932e75b23d14909128b3d051da1857df7d96059b2035d24940641aad37c6e00a39868bae417114fed754744a1aecd7dcaaa39da9143f97553b6e41814
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-14634.patch b/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-14634.patch
new file mode 100644
index 000000000000..9eab370aac47
--- /dev/null
+++ b/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-14634.patch
@@ -0,0 +1,35 @@
+From 85c877d5072866aadbe8ed0c3e0590fbb5e16788 Mon Sep 17 00:00:00 2001
+From: Fabian Greffrath <fabian@greffrath.com>
+Date: Thu, 28 Sep 2017 12:15:04 +0200
+Subject: [PATCH] double64_init: Check psf->sf.channels against upper bound
+
+This prevents division by zero later in the code.
+
+While the trivial case to catch this (i.e. sf.channels < 1) has already
+been covered, a crafted file may report a number of channels that is
+so high (i.e. > INT_MAX/sizeof(double)) that it "somehow" gets
+miscalculated to zero (if this makes sense) in the determination of the
+blockwidth. Since we only support a limited number of channels anyway,
+make sure to check here as well.
+
+CVE-2017-14634
+
+Closes: https://github.com/erikd/libsndfile/issues/318
+Signed-off-by: Erik de Castro Lopo <erikd@mega-nerd.com>
+---
+ src/double64.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/double64.c b/src/double64.c
+index b318ea86..78dfef7f 100644
+--- a/src/double64.c
++++ b/src/double64.c
+@@ -91,7 +91,7 @@ int
+ double64_init	(SF_PRIVATE *psf)
+ {	static int double64_caps ;
+ 
+-	if (psf->sf.channels < 1)
++	if (psf->sf.channels < 1 || psf->sf.channels > SF_MAX_CHANNELS)
+ 	{	psf_log_printf (psf, "double64_init : internal error : channels = %d\n", psf->sf.channels) ;
+ 		return SFE_INTERNAL ;
+ 		} ;
diff --git a/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-6892.patch b/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-6892.patch
new file mode 100644
index 000000000000..d5ccf726684a
--- /dev/null
+++ b/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-6892.patch
@@ -0,0 +1,25 @@
+From f833c53cb596e9e1792949f762e0b33661822748 Mon Sep 17 00:00:00 2001
+From: Erik de Castro Lopo <erikd@mega-nerd.com>
+Date: Tue, 23 May 2017 20:15:24 +1000
+Subject: [PATCH] src/aiff.c: Fix a buffer read overflow
+
+Secunia Advisory SA76717.
+
+Found by: Laurent Delosieres, Secunia Research at Flexera Software
+---
+ src/aiff.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/aiff.c b/src/aiff.c
+index 5b5f9f53..45864b76 100644
+--- a/src/aiff.c
++++ b/src/aiff.c
+@@ -1759,7 +1759,7 @@ aiff_read_chanmap (SF_PRIVATE * psf, unsigned dword)
+ 		psf_binheader_readf (psf, "j", dword - bytesread) ;
+ 
+ 	if (map_info->channel_map != NULL)
+-	{	size_t chanmap_size = psf->sf.channels * sizeof (psf->channel_map [0]) ;
++	{	size_t chanmap_size = SF_MIN (psf->sf.channels, layout_tag & 0xffff) * sizeof (psf->channel_map [0]) ;
+ 
+ 		free (psf->channel_map) ;
+ 
diff --git a/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-8362.patch b/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-8362.patch
new file mode 100644
index 000000000000..54fbfb44c3b1
--- /dev/null
+++ b/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-8362.patch
@@ -0,0 +1,50 @@
+From ef1dbb2df1c0e741486646de40bd638a9c4cd808 Mon Sep 17 00:00:00 2001
+From: Erik de Castro Lopo <erikd@mega-nerd.com>
+Date: Fri, 14 Apr 2017 15:19:16 +1000
+Subject: [PATCH] src/flac.c: Fix a buffer read overflow
+
+A file (generated by a fuzzer) which increased the number of channels
+from one frame to the next could cause a read beyond the end of the
+buffer provided by libFLAC. Only option is to abort the read.
+
+Closes: https://github.com/erikd/libsndfile/issues/231
+---
+ src/flac.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/src/flac.c b/src/flac.c
+index 5a4f8c21..e4f9aaa0 100644
+--- a/src/flac.c
++++ b/src/flac.c
+@@ -169,6 +169,14 @@ flac_buffer_copy (SF_PRIVATE *psf)
+ 	const int32_t* const *buffer = pflac->wbuffer ;
+ 	unsigned i = 0, j, offset, channels, len ;
+ 
++	if (psf->sf.channels != (int) frame->header.channels)
++	{	psf_log_printf (psf, "Error: FLAC frame changed from %d to %d channels\n"
++									"Nothing to do but to error out.\n" ,
++									psf->sf.channels, frame->header.channels) ;
++		psf->error = SFE_FLAC_CHANNEL_COUNT_CHANGED ;
++		return 0 ;
++		} ;
++
+ 	/*
+ 	**	frame->header.blocksize is variable and we're using a constant blocksize
+ 	**	of FLAC__MAX_BLOCK_SIZE.
+@@ -202,7 +210,6 @@ flac_buffer_copy (SF_PRIVATE *psf)
+ 		return 0 ;
+ 		} ;
+ 
+-
+ 	len = SF_MIN (pflac->len, frame->header.blocksize) ;
+ 
+ 	if (pflac->remain % channels != 0)
+@@ -436,7 +443,7 @@ sf_flac_meta_callback (const FLAC__StreamDecoder * UNUSED (decoder), const FLAC_
+ 	{	case FLAC__METADATA_TYPE_STREAMINFO :
+ 			if (psf->sf.channels > 0 && psf->sf.channels != (int) metadata->data.stream_info.channels)
+ 			{	psf_log_printf (psf, "Error: FLAC stream changed from %d to %d channels\n"
+-									"Nothing to be but to error out.\n" ,
++									"Nothing to do but to error out.\n" ,
+ 									psf->sf.channels, metadata->data.stream_info.channels) ;
+ 				psf->error = SFE_FLAC_CHANNEL_COUNT_CHANGED ;
+ 				return ;
diff --git a/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-8363.patch b/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-8363.patch
new file mode 100644
index 000000000000..d0aa400bdd95
--- /dev/null
+++ b/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-8363.patch
@@ -0,0 +1,28 @@
+From cd7da8dbf6ee4310d21d9e44b385d6797160d9e8 Mon Sep 17 00:00:00 2001
+From: Erik de Castro Lopo <erikd@mega-nerd.com>
+Date: Wed, 12 Apr 2017 20:19:34 +1000
+Subject: [PATCH] src/flac.c: Fix another memory leak
+
+When the FLAC decoder was passed a malformed file, the associated
+`FLAC__StreamDecoder` object was not getting released.
+
+Closes: https://github.com/erikd/libsndfile/issues/233
+---
+ src/flac.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/flac.c b/src/flac.c
+index 986a7b8f..5a4f8c21 100644
+--- a/src/flac.c
++++ b/src/flac.c
+@@ -841,7 +841,9 @@ flac_read_header (SF_PRIVATE *psf)
+ 
+ 	psf_log_printf (psf, "End\n") ;
+ 
+-	if (psf->error == 0)
++	if (psf->error != 0)
++		FLAC__stream_decoder_delete (pflac->fsd) ;
++	else
+ 	{	FLAC__uint64 position ;
+ 
+ 		FLAC__stream_decoder_get_decode_position (pflac->fsd, &position) ;
diff --git a/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-8365.patch b/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-8365.patch
new file mode 100644
index 000000000000..1dc5b57f1d39
--- /dev/null
+++ b/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-8365.patch
@@ -0,0 +1,64 @@
+From fd0484aba8e51d16af1e3a880f9b8b857b385eb3 Mon Sep 17 00:00:00 2001
+From: Erik de Castro Lopo <erikd@mega-nerd.com>
+Date: Wed, 12 Apr 2017 19:45:30 +1000
+Subject: [PATCH] FLAC: Fix a buffer read overrun
+
+Buffer read overrun occurs when reading a FLAC file that switches
+from 2 channels to one channel mid-stream. Only option is to
+abort the read.
+
+Closes: https://github.com/erikd/libsndfile/issues/230
+---
+ src/common.h  |  1 +
+ src/flac.c    | 13 +++++++++++++
+ src/sndfile.c |  1 +
+ 3 files changed, 15 insertions(+)
+
+diff --git a/src/common.h b/src/common.h
+index 0bd810c3..e2669b6a 100644
+--- a/src/common.h
++++ b/src/common.h
+@@ -725,6 +725,7 @@ enum
+ 	SFE_FLAC_INIT_DECODER,
+ 	SFE_FLAC_LOST_SYNC,
+ 	SFE_FLAC_BAD_SAMPLE_RATE,
++	SFE_FLAC_CHANNEL_COUNT_CHANGED,
+ 	SFE_FLAC_UNKOWN_ERROR,
+ 
+ 	SFE_WVE_NOT_WVE,
+diff --git a/src/flac.c b/src/flac.c
+index 84de0e26..986a7b8f 100644
+--- a/src/flac.c
++++ b/src/flac.c
+@@ -434,6 +434,19 @@ sf_flac_meta_callback (const FLAC__StreamDecoder * UNUSED (decoder), const FLAC_
+ 
+ 	switch (metadata->type)
+ 	{	case FLAC__METADATA_TYPE_STREAMINFO :
++			if (psf->sf.channels > 0 && psf->sf.channels != (int) metadata->data.stream_info.channels)
++			{	psf_log_printf (psf, "Error: FLAC stream changed from %d to %d channels\n"
++									"Nothing to be but to error out.\n" ,
++									psf->sf.channels, metadata->data.stream_info.channels) ;
++				psf->error = SFE_FLAC_CHANNEL_COUNT_CHANGED ;
++				return ;
++				} ;
++
++			if (psf->sf.channels > 0 && psf->sf.samplerate != (int) metadata->data.stream_info.sample_rate)
++			{	psf_log_printf (psf, "Warning: FLAC stream changed sample rates from %d to %d.\n"
++									"Carrying on as if nothing happened.",
++									psf->sf.samplerate, metadata->data.stream_info.sample_rate) ;
++				} ;
+ 			psf->sf.channels = metadata->data.stream_info.channels ;
+ 			psf->sf.samplerate = metadata->data.stream_info.sample_rate ;
+ 			psf->sf.frames = metadata->data.stream_info.total_samples ;
+diff --git a/src/sndfile.c b/src/sndfile.c
+index 41875610..e2a87be8 100644
+--- a/src/sndfile.c
++++ b/src/sndfile.c
+@@ -245,6 +245,7 @@ ErrorStruct SndfileErrors [] =
+ 	{	SFE_FLAC_INIT_DECODER	, "Error : problem with initialization of the flac decoder." },
+ 	{	SFE_FLAC_LOST_SYNC		, "Error : flac decoder lost sync." },
+ 	{	SFE_FLAC_BAD_SAMPLE_RATE, "Error : flac does not support this sample rate." },
++	{	SFE_FLAC_CHANNEL_COUNT_CHANGED, "Error : flac channel changed mid stream." },
+ 	{	SFE_FLAC_UNKOWN_ERROR	, "Error : unknown error in flac decoder." },
+ 
+ 	{	SFE_WVE_NOT_WVE			, "Error : not a WVE file." },
diff --git a/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2018-13139.patch b/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2018-13139.patch
index 18e6ae76e62c..f75843267b0b 100644
--- a/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2018-13139.patch
+++ b/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2018-13139.patch
@@ -28,4 +28,4 @@ index 53660310..225b4d54 100644
 +
  	state.channels = sfinfo.channels ;
  	sfinfo.channels = 1 ;
- 
\ No newline at end of file
+ 
diff --git a/media-libs/libsndfile/libsndfile-1.0.28-r1.ebuild b/media-libs/libsndfile/libsndfile-1.0.28-r1.ebuild
deleted file mode 100644
index f4a3b0b1d8fe..000000000000
--- a/media-libs/libsndfile/libsndfile-1.0.28-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=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
-
-inherit python-any-r1 multilib-minimal
-
-MY_P=${P/_pre/pre}
-
-DESCRIPTION="A C library for reading and writing files containing sampled sound"
-HOMEPAGE="http://www.mega-nerd.com/libsndfile"
-if [[ ${MY_P} == ${P} ]]; then
-	SRC_URI="http://www.mega-nerd.com/libsndfile/files/${P}.tar.gz"
-else
-	SRC_URI="http://www.mega-nerd.com/tmp/${MY_P}b.tar.gz"
-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"
-IUSE="alsa minimal sqlite static-libs test"
-
-RDEPEND="
-	!minimal? (
-		>=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}]
-		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib )
-	sqlite? ( >=dev-db/sqlite-3.2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${P}-arm-varargs-failure.patch )
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--disable-octave \
-		--enable-gcc-pipe \
-		--enable-gcc-opt \
-		$(use_enable static-libs static) \
-		$(use_enable !minimal external-libs) \
-		$(multilib_native_enable full-suite) \
-		$(multilib_native_use_enable alsa) \
-		$(multilib_native_use_enable sqlite)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libsndfile/libsndfile-1.0.28-r2.ebuild b/media-libs/libsndfile/libsndfile-1.0.28-r2.ebuild
deleted file mode 100644
index fb59074ec723..000000000000
--- a/media-libs/libsndfile/libsndfile-1.0.28-r2.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=( python{2_7,3_4,3_5,3_6} pypy{,3} )
-
-inherit python-any-r1 multilib-minimal
-
-MY_P=${P/_pre/pre}
-
-DESCRIPTION="C library for reading and writing files containing sampled sound"
-HOMEPAGE="http://www.mega-nerd.com/libsndfile"
-if [[ ${MY_P} == ${P} ]]; then
-	SRC_URI="http://www.mega-nerd.com/libsndfile/files/${P}.tar.gz"
-else
-	SRC_URI="http://www.mega-nerd.com/tmp/${MY_P}b.tar.gz"
-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"
-IUSE="alsa minimal sqlite static-libs test"
-
-RDEPEND="
-	!minimal? (
-		>=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}]
-		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib )
-	sqlite? ( >=dev-db/sqlite-3.2 )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-arm-varargs-failure.patch
-	"${FILESDIR}"/${P}-CVE-2017-12562.patch
-)
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--disable-octave \
-		--enable-gcc-pipe \
-		--enable-gcc-opt \
-		$(use_enable static-libs static) \
-		$(use_enable !minimal external-libs) \
-		$(multilib_native_enable full-suite) \
-		$(multilib_native_use_enable alsa) \
-		$(multilib_native_use_enable sqlite)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libsndfile/libsndfile-1.0.28-r3.ebuild b/media-libs/libsndfile/libsndfile-1.0.28-r3.ebuild
index e1bbd26e1f3b..23a9c0f9b706 100644
--- a/media-libs/libsndfile/libsndfile-1.0.28-r3.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.28-r3.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/libsndfile/libsndfile-1.0.28-r4.ebuild b/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild
new file mode 100644
index 000000000000..a4b36932a335
--- /dev/null
+++ b/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild
@@ -0,0 +1,70 @@
+# 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} pypy{,3} )
+
+inherit python-any-r1 multilib-minimal
+
+MY_P=${P/_pre/pre}
+
+DESCRIPTION="C library for reading and writing files containing sampled sound"
+HOMEPAGE="http://www.mega-nerd.com/libsndfile"
+if [[ ${MY_P} == ${P} ]]; then
+	SRC_URI="http://www.mega-nerd.com/libsndfile/files/${P}.tar.gz"
+else
+	SRC_URI="http://www.mega-nerd.com/tmp/${MY_P}b.tar.gz"
+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"
+IUSE="alsa minimal sqlite static-libs test"
+
+RDEPEND="
+	!minimal? (
+		>=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}]
+		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib )
+	sqlite? ( >=dev-db/sqlite-3.2 )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS} )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-arm-varargs-failure.patch
+	"${FILESDIR}"/${P}-CVE-2017-12562.patch
+	"${FILESDIR}"/${P}-CVE-2018-13139.patch
+	"${FILESDIR}"/${P}-CVE-2017-6892.patch
+	"${FILESDIR}"/${P}-CVE-2017-836{3,5,2}.patch
+	"${FILESDIR}"/${P}-CVE-2017-14634.patch
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--disable-octave \
+		--enable-gcc-pipe \
+		--enable-gcc-opt \
+		$(use_enable static-libs static) \
+		$(use_enable !minimal external-libs) \
+		$(multilib_native_enable full-suite) \
+		$(multilib_native_use_enable alsa) \
+		$(multilib_native_use_enable sqlite)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# package provides .pc files
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libsndfile/libsndfile-9999.ebuild b/media-libs/libsndfile/libsndfile-9999.ebuild
index eb28af81fd55..1b23d4798036 100644
--- a/media-libs/libsndfile/libsndfile-9999.ebuild
+++ b/media-libs/libsndfile/libsndfile-9999.ebuild
@@ -1,26 +1,21 @@
-# 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
 
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
 
-inherit python-any-r1 multilib-minimal
-
-DESCRIPTION="A C library for reading and writing files containing sampled sound"
-HOMEPAGE="http://www.mega-nerd.com/libsndfile"
-
 if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/erikd/libsndfile.git"
-
-	DEPEND="
-		${PYTHON_DEPS}
-		sys-devel/autogen"
 else
 	SRC_URI="http://www.mega-nerd.com/libsndfile/files/${P}.tar.gz"
 	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"
 fi
+inherit python-any-r1 multilib-minimal
+
+DESCRIPTION="C library for reading and writing files containing sampled sound"
+HOMEPAGE="http://www.mega-nerd.com/libsndfile"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -34,11 +29,16 @@ RDEPEND="
 	)
 	alsa? ( media-libs/alsa-lib )
 	sqlite? ( >=dev-db/sqlite-3.2 )"
-DEPEND="
-	${DEPEND}
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	test? ( ${PYTHON_DEPS} )"
+if [[ ${PV} == *9999 ]]; then
+	BDEPEND="
+		${PYTHON_DEPS}
+		sys-devel/autogen
+	"
+fi
 
 pkg_setup() {
 	if use test || [[ ${PV} == *9999 ]]; then
diff --git a/media-libs/libtheora/Manifest b/media-libs/libtheora/Manifest
index 6c3cb751d018..f160a76eb13e 100644
--- a/media-libs/libtheora/Manifest
+++ b/media-libs/libtheora/Manifest
@@ -1,6 +1,8 @@
-AUX libtheora-1.0_beta2-flags.patch 763 BLAKE2B 69058f8babeeacd7d382d173376af7093a4972b0e295c42bd4d422595b16ff0a9bd0101bba5eafc3f0cad3f6f98a4fb44fdbd30a7bce38852ae287af8ab6362b SHA512 72916c4ed0f9609b84af7c72b35b558ecfb2ed7533739e170ed088e06d0e82a585dcc1185f3c5a5d0644d30901459813b635df2ba951e2290bcd4303cfebc20b
-AUX libtheora-1.1.1-libpng16.patch 512 BLAKE2B 95b35dbdfce9352e63deacef7dcaa5b6e462e90257eac78e5bb43235aea2ab2b2a8365dcb70309b4427c6ed0693f2ccbef4c92dfe0229b495162542b47ff6d47 SHA512 856da5da7788863c59c9cb6c4fa102d250e60d6b302a5c118799169bcbc5350ab0bf6798f2ae2586f1d361ff9030d1d715214d8df900d7e1aa4a4e1d58f44276
-AUX libtheora-1.1.1-underlinking.patch 477 BLAKE2B 253ec0f7195abd532ebf3f0ec8e0009cbfe19ff6a27391cb4b899215e8a6b38cc9d4c49814de8ee487a4599edf95b9ed74afdf541da52730e35f634940517fc1 SHA512 00d02a773d5c95361d2d582d0147d4469ac4c882e62e25452908329b536261e9f09de82db8280fdc42985d0d8d5cdfa2f4866c76da03aca8f29237799b70a080
+AUX libtheora-1.0_beta2-flags.patch 724 BLAKE2B f8a1bed5d75fdc39ab8e0b04f24e60bbe694e49a08c7f91aaaa94f4aa8c15b3a2b557d686c59d70ff554b3245235f725fdfe845f39e43670d0eef0c6bc7a5d4e SHA512 31463b0b3d7d2b701d3cc5e1aa6dcea4144d7f562727afa0df7d97a49e04f39e7922cff32e3f4b5b3afe8e3e3c1a76dc9eb456bdca8607a0f397380685708f32
+AUX libtheora-1.1.1-fix-UB.patch 1499 BLAKE2B b2336cac99a2810d1ba5733e09dde80d42c1c91addb434fedb816634b8913ebd4ce2cd5e39df5da2813248147018b9053f30f39947e061fc11014fa0d69adf18 SHA512 9fe418951099cb87dc178b06165e7354130fc81914e5b8e77316438eb0a1af23c0c7e79a5650b19f38a8be2789a013be2bdf9b49ab87d1b682fae5f7227f987f
+AUX libtheora-1.1.1-libpng16.patch 516 BLAKE2B 7c4d6fd0e086b74f68cbc3e46e43879b42ef39f0f83d306666caf80808de023e2c4c77de51009c5dd668e230b169e5073539ee11e69e3e0201d6def1a4c7401d SHA512 5ed8c35eee6fb533fbbfc835fe62eddea18ddc956b453b1062a4d1534b6d69db2e70a03bdf3300a8b1a5832feef2c7536bfad4274e8e89769e07a8a3f635b1b5
+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
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-libs/libtheora/files/libtheora-1.0_beta2-flags.patch b/media-libs/libtheora/files/libtheora-1.0_beta2-flags.patch
index a47cc5771680..ffc6ab5802af 100644
--- a/media-libs/libtheora/files/libtheora-1.0_beta2-flags.patch
+++ b/media-libs/libtheora/files/libtheora-1.0_beta2-flags.patch
@@ -1,6 +1,6 @@
 diff -ur libtheora-1.0beta2.orig/configure.ac libtheora-1.0beta2/configure.ac
---- libtheora-1.0beta2.orig/configure.ac	2007-10-13 00:01:38.000000000 +0300
-+++ libtheora-1.0beta2/configure.ac	2007-11-25 22:44:49.000000000 +0200
+--- a/configure.ac	2007-10-13 00:01:38.000000000 +0300
++++ b/configure.ac	2007-11-25 22:44:49.000000000 +0200
 @@ -102,8 +102,8 @@
          case $host in 
          *)
diff --git a/media-libs/libtheora/files/libtheora-1.1.1-fix-UB.patch b/media-libs/libtheora/files/libtheora-1.1.1-fix-UB.patch
new file mode 100644
index 000000000000..862d6a3b8164
--- /dev/null
+++ b/media-libs/libtheora/files/libtheora-1.1.1-fix-UB.patch
@@ -0,0 +1,47 @@
+From 0ae66d565e6bead8604d312bc1a4e9dccf245c88 Mon Sep 17 00:00:00 2001
+From: Tim Terriberry <tterribe@xiph.org>
+Date: Tue, 8 May 2012 02:51:57 +0000
+Subject: [PATCH] Fix pp_sharp_mod calculation.
+
+This was broken when the dequant_tables indexing changed in commit
+ r16102, but it only affected post-processing quality, so we never
+ noticed.
+With gcc 4.8.0, this can now trigger a segfault during decoder
+ initialization.
+
+svn path=/trunk/theora/; revision=18268
+---
+ lib/decode.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+Note: The hunk header was modified from
+
+    @@ -400,10 +400,10 @@
+
+to
+
+    @@ -397,10 +397,10 @@
+
+to match the source code in the libtheora-1.1.1 tar-ball.
+
+diff --git a/lib/decode.c b/lib/decode.c
+index b803505..9f2516a 100644
+--- a/lib/decode.c
++++ b/lib/decode.c
+@@ -397,10 +397,10 @@ static int oc_dec_init(oc_dec_ctx *_dec,const th_info *_info,
+     int qsum;
+     qsum=0;
+     for(qti=0;qti<2;qti++)for(pli=0;pli<3;pli++){
+-      qsum+=_dec->state.dequant_tables[qti][pli][qi][12]+
+-       _dec->state.dequant_tables[qti][pli][qi][17]+
+-       _dec->state.dequant_tables[qti][pli][qi][18]+
+-       _dec->state.dequant_tables[qti][pli][qi][24]<<(pli==0);
++      qsum+=_dec->state.dequant_tables[qi][pli][qti][12]+
++       _dec->state.dequant_tables[qi][pli][qti][17]+
++       _dec->state.dequant_tables[qi][pli][qti][18]+
++       _dec->state.dequant_tables[qi][pli][qti][24]<<(pli==0);
+     }
+     _dec->pp_sharp_mod[qi]=-(qsum>>11);
+   }
+-- 
+2.10.2
diff --git a/media-libs/libtheora/files/libtheora-1.1.1-libpng16.patch b/media-libs/libtheora/files/libtheora-1.1.1-libpng16.patch
index 93da700c4d7a..46d933323909 100644
--- a/media-libs/libtheora/files/libtheora-1.1.1-libpng16.patch
+++ b/media-libs/libtheora/files/libtheora-1.1.1-libpng16.patch
@@ -1,8 +1,8 @@
 http://bugs.gentoo.org/465450
 http://trac.xiph.org/ticket/1947
 
---- examples/png2theora.c
-+++ examples/png2theora.c
+--- a/examples/png2theora.c
++++ b/examples/png2theora.c
 @@ -462,9 +462,9 @@
    png_set_strip_alpha(png_ptr);
  
diff --git a/media-libs/libtheora/files/libtheora-1.1.1-underlinking.patch b/media-libs/libtheora/files/libtheora-1.1.1-underlinking.patch
index b45a368ebd76..7836e3abda23 100644
--- a/media-libs/libtheora/files/libtheora-1.1.1-underlinking.patch
+++ b/media-libs/libtheora/files/libtheora-1.1.1-underlinking.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/504270
 
---- examples/Makefile.am
-+++ examples/Makefile.am
+--- a/examples/Makefile.am
++++ b/examples/Makefile.am
 @@ -22,7 +22,7 @@
  
  player_example_SOURCES = player_example.c
diff --git a/media-libs/libtheora/libtheora-1.1.1-r2.ebuild b/media-libs/libtheora/libtheora-1.1.1-r2.ebuild
new file mode 100644
index 000000000000..2ca7578d0ec0
--- /dev/null
+++ b/media-libs/libtheora/libtheora-1.1.1-r2.ebuild
@@ -0,0 +1,99 @@
+# 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
+
+DESCRIPTION="The Theora Video Compression Codec"
+HOMEPAGE="https://www.theora.org"
+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"
+IUSE="doc +encode examples static-libs"
+
+REQUIRED_USE="examples? ( encode )" #285895
+
+RDEPEND="
+	>=media-libs/libogg-1.3.0:=[${MULTILIB_USEDEP}]
+	encode? ( >=media-libs/libvorbis-1.3.3-r1:=[${MULTILIB_USEDEP}] )
+	examples? (
+		media-libs/libpng:0=
+		>=media-libs/libsdl-0.11.0
+		media-libs/libvorbis:=
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${P/_}
+
+VARTEXFONTS=${T}/fonts
+
+DOCS=( AUTHORS CHANGES README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0_beta2-flags.patch
+	"${FILESDIR}"/${P}-underlinking.patch
+	"${FILESDIR}"/${P}-libpng16.patch # bug 465450
+	"${FILESDIR}"/${P}-fix-UB.patch # bug 620800
+)
+
+src_prepare() {
+	default
+
+	# bug 467006
+	sed -i "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" configure.ac || die
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+multilib_src_configure() {
+	use x86 && filter-flags -fforce-addr -frename-registers #200549
+	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
+
+	local myconf=(
+		--disable-spec
+		$(use_enable encode)
+		$(use_enable static-libs static)
+	)
+
+	if [[ "${ABI}" = "${DEFAULT_ABI}" ]] ; then
+		myconf+=( $(use_enable examples) )
+	else
+		# those will be overwritten anyway
+		myconf+=( --disable-examples )
+	fi
+
+	# --disable-spec because LaTeX documentation has been prebuilt
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		install
+
+	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}
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	find "${D}" -name '*.la' -delete || die
+	einstalldocs
+
+	if use examples && use doc; then
+		docinto examples
+		dodoc examples/*.[ch]
+		docompress -x /usr/share/doc/${PF}/examples
+		docinto .
+	fi
+}
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index d361ad317d49..8528aabad520 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,8 +1,10 @@
 DIST mesa-18.1.9.tar.xz 11146188 BLAKE2B 753f0fa3780502d56927f9b0e6124b4728cb5aa3600de78585487fb8e178c6987a72b79fb56e6c310757d157f9f85f12b73a6889bd361b51b62fb1dc1c20eecd SHA512 22db2950d25a3d9393e7c622c783bd177c21695569c8a95683bf77e92318e1db85672a134d4bea30c1f49a24e52bc3a2c1a0ac15deafb3a8fcbfb6de6a18adc2
 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
 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.ebuild 14438 BLAKE2B e684beb2753a05a833dfbf3c1e1d72e6f8df343f38499ad6f225c66b521c54e970c4957b531a5cedb64ef46e3d803c46a9a22d348251e0cfe812f4f9829cd11a SHA512 22b248c80ea9ab171eb21713a8ded77bab938e06876090683a6db4fea34572cbc695ce72fab67a5c9cbad2325551d572326bcf7f31ebdbc67adfb975f4011107
 EBUILD mesa-9999.ebuild 14489 BLAKE2B 10d1551937ff5cc590af4fb3beaa5134f5017ec3cc7b2d6c690af53673fe3015197866a063707011d5ed173c7cd4993d62225958c7750d1908d1444f0432f35f SHA512 5fab6cf4fd2ac64991e15fab63d8dd4827887a915195f597515238b42564d4b2d1eec54c4ad0706575d396ab03428d02c9ed227c73e3fe3cf4a992cd4a119fdc
 MISC metadata.xml 2095 BLAKE2B c1c858a478bbb1c7e38a45dbf00e380a3d26c56920db1897521a7e9f4eb005157e535207ae2274d744e3ce5514a57654eb0effb2cfc773263a0f417874cdc742 SHA512 c3db8aeb4f4ae7ea27c8b48cb26ee9348d84e6fb4b99df815b177e62e78cd980a7834c152e2c10c6fdbe2b91a032861a0c0503625874bfb6df58ccc3bf54e705
diff --git a/media-libs/mesa/mesa-18.2.2.ebuild b/media-libs/mesa/mesa-18.2.2.ebuild
new file mode 100644
index 000000000000..df9403207de3
--- /dev/null
+++ b/media-libs/mesa/mesa-18.2.2.ebuild
@@ -0,0 +1,548 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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? (
+					app-eselect/eselect-opencl
+					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
+		# opencl stuff
+		if use opencl; then
+			emesonargs+=(
+				-Dgallium-opencl="$(usex opencl standalone disabled)"
+			)
+		fi
+
+		gallium_enable video_cards_virgl virgl
+	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
+
+	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() {
+	einstalldocs
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+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 "--")
+# 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/nas/Manifest b/media-libs/nas/Manifest
index 65bed4ea6b15..eada07e1f94f 100644
--- a/media-libs/nas/Manifest
+++ b/media-libs/nas/Manifest
@@ -4,6 +4,5 @@ AUX nas-1.9.4-remove-abs-fabs.patch 1164 BLAKE2B 1fd8fb65a12cb340c47ee80929e2617
 AUX nas.conf.d 229 BLAKE2B 2ac8a6d914d02bc92258d7dfe3118e89ed6e3fe9d98e7a24eb8d72ded22dbb68a2d8129d066dc1457c0b8959f1762197b61f90502d3c60cdefd8aaeced04bbb3 SHA512 53cb9906d169b63b3592443bc0b63d59c4d0683e4b2194c60b1bc4297e6556f04b3ee9bf81da3a7f144757354de9aebe08c8445fccaa9a458a3b6537da68a2ac
 AUX nas.init.d 347 BLAKE2B 8b87c877fafd0e5993f909a4e132ed9f7042a3d8bdced8c7487afc962dfcad24a586ac754b99cbff815475f1326f44d52effb8eefd65cd0e25e6bc45991233af SHA512 556fc5d5135f789b0691de889aeaadce29319964443052787db5cb4cda480ed68c547c772de97c07ba2e0800f25cfa859376a3d80e9518995aae8136fe171468
 DIST nas-1.9.4.src.tar.gz 1464598 BLAKE2B d79ecda9f86a89d2d61bfadfeee4bb6a9feca6754bb88249b1eb3c1964e784d18098465f30f1b5bbb13d0550aebf48bb1b98aeb1b7c712f344a2eddc7720531b SHA512 3f8bd60f8ce0f25a2605af17caaadfe4f21223ba4cd3fa02078d1427b17cdf33ebda887e5dc30cd68eb7f64bfad80aafc9071ff0a26f0d3a4a93caacac03b5bb
-EBUILD nas-1.9.4-r1.ebuild 2290 BLAKE2B 5b7430bf135bff1254da018c4d430be7a064a021563789fc1c4ad95e8a67fded25c57b4ea310eacb05228575019f65466bcdf0f2fd4710d0dd5241386f0f76cc SHA512 db3dce97cbebeb460f7bde498526cf4b5a0554aca02458fa7a9030e968ff2d59b8d9110e8694cd446276c73f5e53fb2f35b981c2b59c6c6bb5de4e8cf8401187
-EBUILD nas-1.9.4-r2.ebuild 2448 BLAKE2B 8efdde710479e9c14a6553054a2b85787342c74b62529f436a7d23f502ec4b80fde9e910904ba270c58c582ac6778a07db6996b63b97081645ee5f5f33a29e8c SHA512 dc47fbe76ed18322b85c8703e2da04cb902c508618edc6cc035e0c9bc37c9d0eb4fa949557a61e5d083145a23f052ce5b2ccf5f9c1a7aaab550bdb962674f0fd
+EBUILD nas-1.9.4-r2.ebuild 2447 BLAKE2B 39b07e57d7533e3c6c2eb5b4810b68f54a74082637aa3af64a9a715c39cbe76966251eab1e9109b9a40bc811a469b74999e831617995cb710c63699069ac9190 SHA512 38ab9d5070c364e494b517a1a3edaaf001a5e9a865911b222520d70bc0c86ccb4f80b09e809cc8c4fdae3d808ace8904d51cb5492bc7732102bfc3339d635042
 MISC metadata.xml 326 BLAKE2B 837bd2d88bfc59121d0e166ae65c8d4732b8cdc6a898183bfb1fd984b5bc3e8e3a2c3f22d763a26664da7f97c9091fc9c3af8c419b3e9e39a7410989434ed739 SHA512 7a2a048b46af5cfd9167aec79f8a4f4e8a10f8327d1aec4b59330cdfdc7e4b90d9b9ab85e73e2b0a0e5db6b71bb729e7886dc3763a4d75d8ed4602b7b6cb61e7
diff --git a/media-libs/nas/nas-1.9.4-r1.ebuild b/media-libs/nas/nas-1.9.4-r1.ebuild
deleted file mode 100644
index b32a29ee5f5a..000000000000
--- a/media-libs/nas/nas-1.9.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=5
-inherit eutils multilib toolchain-funcs multilib-minimal
-
-DESCRIPTION="Network Audio System"
-HOMEPAGE="http://radscan.com/nas.html"
-SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
-
-LICENSE="HPND MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="doc static-libs"
-
-RDEPEND="x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
-	x11-libs/libXaw
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXpm
-	>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	app-text/rman
-	sys-devel/bison
-	sys-devel/flex
-	x11-base/xorg-proto
-	x11-misc/gccmakedep
-	x11-misc/imake"
-
-DOCS=( BUILDNOTES FAQ HISTORY README RELEASE TODO )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.9.2-asneeded.patch
-	epatch "${FILESDIR}"/${PN}-1.9.4-remove-abs-fabs.patch
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	xmkmf -a || die
-}
-
-multilib_src_compile() {
-	# EXTRA_LDOPTIONS, SHLIBGLOBALSFLAGS #336564#c2
-	local emakeopts=(
-		AR="$(tc-getAR) clq"
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		CDEBUGFLAGS="${CFLAGS}"
-		CXX="$(tc-getCXX)"
-		CXXDEBUFLAGS="${CXXFLAGS}"
-		EXTRA_LDOPTIONS="${LDFLAGS}"
-		LD="$(tc-getLD)"
-		MAKE="${MAKE:-gmake}"
-		RANLIB="$(tc-getRANLIB)"
-		SHLIBGLOBALSFLAGS="${LDFLAGS}"
-		WORLDOPTS=
-	)
-
-	if multilib_is_native_abi ; then
-		# dumb fix for parallel make issue wrt #446598, Imake sux
-		emake "${emakeopts[@]}" -C server/dia all
-		emake "${emakeopts[@]}" -C server/dda/voxware all
-		emake "${emakeopts[@]}" -C server/os all
-	else
-		sed -i \
-			-e 's/SUBDIRS =.*/SUBDIRS = include lib config/' \
-			Makefile || die
-	fi
-
-	emake "${emakeopts[@]}" World
-}
-
-multilib_src_install() {
-	# ranlib is used at install phase too wrt #446600
-	emake RANLIB="$(tc-getRANLIB)" \
-		DESTDIR="${D}" USRLIBDIR=/usr/$(get_libdir) \
-		install install.man
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	if use doc; then
-		docinto doc
-		dodoc doc/{actions,protocol.txt,README}
-		docinto pdf
-		dodoc doc/pdf/*.pdf
-	fi
-
-	mv -vf "${D}"/etc/nas/nasd.conf{.eg,} || die
-
-	newconfd "${FILESDIR}"/nas.conf.d nas
-	newinitd "${FILESDIR}"/nas.init.d nas
-
-	use static-libs || rm -f "${D}"/usr/lib*/libaudio.a
-}
diff --git a/media-libs/nas/nas-1.9.4-r2.ebuild b/media-libs/nas/nas-1.9.4-r2.ebuild
index f7233ec5f968..6da098d928a0 100644
--- a/media-libs/nas/nas-1.9.4-r2.ebuild
+++ b/media-libs/nas/nas-1.9.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
 
 LICENSE="HPND MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
 IUSE="doc static-libs"
 
 RDEPEND="
diff --git a/media-libs/opusfile/Manifest b/media-libs/opusfile/Manifest
index 20e8b1a99f9d..0223d580e435 100644
--- a/media-libs/opusfile/Manifest
+++ b/media-libs/opusfile/Manifest
@@ -2,6 +2,6 @@ DIST opusfile-0.10.tar.gz 467700 BLAKE2B eab1c5eadd13ad574590c5b6a4bf8cc7f82ec0d
 DIST opusfile-0.11.tar.gz 467420 BLAKE2B e3e6ee2d1d4c7030bdd5f7ec14503d46ebbfcbc4481ab4652a0be9171d45fe2e855e0f17801cf28fda66f44496ba9f9a2996af7e5aaf5b008e4c3b14263f3160 SHA512 ec3e282310cc4f25475c27b7bc8d1652dcb25d3ac6badf87bd1b4e5397fbe106a0dab81c60d88d198003a23d8a2c9bae8b661edc9b31433effeca438ce56a349
 DIST opusfile-0.6.tar.gz 437980 BLAKE2B 13250d08f9cc9564541bbe116c5482e5b9a0de1c28a8a9e9509b1019cb75d40caefc2b8eb0ad444bb67e05cc4d0813b7b3f1783e4d136201c71200b04f7690c2 SHA512 6fee48f3da21eeffed1ee5a3852234032aa559335225b07383c1104f5efba2f88aebe41c453ab2de472a69766e0fa9b48bec2f97d2a096b27afa96901802ba02
 EBUILD opusfile-0.10.ebuild 890 BLAKE2B 35e7a73420a5aac646805f1175d627c6e3227b7ae5bea191cbc102da955b3ff319099994d440853e9094d33e02a9307729da28be38ad82a04aa0c6df524f90d9 SHA512 36d9df9967f117c7a65354e949eff47e5e78ae681004c1d5f4a287d39fafe4d943c2b9390eb98a1aeb6c4f142911ec2d83271c477e0da3bf3e4cd8f1641fe6d6
-EBUILD opusfile-0.11.ebuild 957 BLAKE2B feb5d2dcc59911ca4dea9541b5ee43c8833835b61a1d6febf02a50ad5935e484839690b5ae41199f9824c90f1729beb9a9076064ad22ac68f40eaa8334638d20 SHA512 289acafc7cb9ef47733995fb69e295629d1103e8b3e94324a729290dc180f5bb3f2b9e9c59e6c3d763d13ca72028810c87e945870a5d959a9b19785a00569b45
+EBUILD opusfile-0.11.ebuild 969 BLAKE2B 921a57c5851cf74bef6da04f3b769498dd29a21a0bd24f1e1a1f9da95d657f2aa9f6032e3c7b10c4380e73ffa416905646f4fb0480298cb595ef6079863adfd2 SHA512 921a3d7b5d8c47da709b002a1effea03ba2b6ceced1c66a0ff06c54d13cdf1a28e1df807f8efdc1f6411cd358380b2641fdc9950869f9e8f3615eb3da35bb04c
 EBUILD opusfile-0.6.ebuild 776 BLAKE2B ac01c1df72626fbe4e2c0ea46d71ce7a5b22419b2f1a72e334abbb346bbd84fbb92760d1b1cc35947c24ef0e5e01330d3a988c7daba40de703fc1bb5f80a0151 SHA512 e6ab915319a73061ed951fa5c1617c434b2c3df1335fa23860175caa2b6773b7326bad386bcc1aa39b5792c90266b1e7bdfcad85f2d997b2f6625e1670909551
 MISC metadata.xml 371 BLAKE2B 020407fca3397e32a82ee401d9b668f9f99755c7404a4c223b5cf05ff012a27928306d19dc866b39edad657647edd030d11b626882972b9d6455b830284e5656 SHA512 bc5c1673d5ea5c298afbc35a6fd68544c2e7304becda14c71e5b472c55e44285ba55f41043f8efb3ed58137b58a0f39245b6db5069c63536b514bce69517474a
diff --git a/media-libs/opusfile/opusfile-0.11.ebuild b/media-libs/opusfile/opusfile-0.11.ebuild
index 1c16b94fd610..bff77dbcf7e7 100644
--- a/media-libs/opusfile/opusfile-0.11.ebuild
+++ b/media-libs/opusfile/opusfile-0.11.ebuild
@@ -26,7 +26,7 @@ REQUIRED_USE="^^ ( fixed-point float )"
 
 src_configure() {
 	local myeconfargs=(
-		--docdir=/usr/share/doc/${PF}
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
 		$(use_enable doc)
 		$(use_enable fixed-point)\
 		$(use_enable float)
diff --git a/media-libs/portaudio/Manifest b/media-libs/portaudio/Manifest
index 3ab28b7a79dd..d1965b1c7c34 100644
--- a/media-libs/portaudio/Manifest
+++ b/media-libs/portaudio/Manifest
@@ -1,5 +1,3 @@
 DIST pa_stable_v190600_20161030.tgz 1450572 BLAKE2B 3cd63cca55ff222f452d306a1ab9035739545f48dbc9bc58196052cb51e518d86568059c7528533a6932c39c68d1a5210e06470a16343b92c7e4132b71cc552e SHA512 7ec692cbd8c23878b029fad9d9fd63a021f57e60c4921f602995a2fca070c29f17a280c7f2da5966c4aad29d28434538452f4c822eacf3a60af59a6dc8e9704c
-DIST pa_stable_v19_20140130.tgz 1504620 BLAKE2B a07ad305255db982dd719cec8b5c63b2e483c319acc7a9f316162f83f481cdce469ba17f549bbe68d4fc49378a612f22606e6e5369c043e907c504cd0e5f8920 SHA512 078adfdc2cec7fbd4019837eee65f8411b873b51064dfd7334e1c55118c26ea1fb68cb22e46ee69adb69c78d026b00a7ed973c40632e7d79703e12669a62ee3e
-EBUILD portaudio-19.06.00-r1.ebuild 1305 BLAKE2B bf8c4ecedaaa088840d0a4ede5526122b7a0bef2ac3d5b11299a233dc83f709330782ab881da24dec74a37c0495f4815c5e1bd9a5be9fe0f9ef850f235a5ceb2 SHA512 be8468bc6392c70ec7e3dbb8e9d3f80106d310a62984c230a7368e3a4f928885b4780d829733b32e59ba1552d1151f4560a41684faa26ec938cf1b6680efb7c8
-EBUILD portaudio-19_pre20140130.ebuild 1051 BLAKE2B 598277907c68df2b8ca379ed1105fbfd42890e98af7c0294bf9c8e088abc9a2fb48bdead5fded33a5bb87bba0864fd9388d97338f9f5d9a5ee039cddced1566f SHA512 7be06963fdc78ecbbc04e1438904733d1b5a1a19ea3681fd1538c805a0fbc00090b0878143eaae1a79c480062177eef52791dca4444d68a8bf677dabd4c77e34
+EBUILD portaudio-19.06.00-r1.ebuild 1304 BLAKE2B 7b7d5a1df2595d2541f0e4c502f2272bb85977168fd1b2637228fa6ec62694a5923cbaa5d5acd90edc31932dc1c271b3482d0579625a6d4be1b1cafcbb433307 SHA512 acff9301c7e2d2faff2a2c3b702eb29e0f828161ea08bb2395dc829caa5c88ea9a793ae36954dfb33b5782f53c5554d6b577c4f3de250c53130f84197230dfe9
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/portaudio/portaudio-19.06.00-r1.ebuild b/media-libs/portaudio/portaudio-19.06.00-r1.ebuild
index b866cb031edc..8ed072228b92 100644
--- a/media-libs/portaudio/portaudio-19.06.00-r1.ebuild
+++ b/media-libs/portaudio/portaudio-19.06.00-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="alsa +cxx debug doc jack oss static-libs"
 
 RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
diff --git a/media-libs/portaudio/portaudio-19_pre20140130.ebuild b/media-libs/portaudio/portaudio-19_pre20140130.ebuild
deleted file mode 100644
index 15fe80c459f2..000000000000
--- a/media-libs/portaudio/portaudio-19_pre20140130.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-inherit autotools-multilib
-
-MY_P=pa_stable_v${PV/pre}
-
-DESCRIPTION="A free, cross-platform, open-source, audio I/O library"
-HOMEPAGE="http://www.portaudio.com/"
-SRC_URI="http://www.portaudio.com/archives/${MY_P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-IUSE="alsa +cxx debug jack oss static-libs"
-
-RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}
-DOCS=( README.txt )
-HTML_DOCS=( index.html )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug debug-output)
-		$(use_enable cxx)
-		$(use_with alsa)
-		$(use_with jack)
-		$(use_with oss)
-	)
-
-	autotools-multilib_src_configure
-}
-
-src_compile() {
-	autotools-multilib_src_compile lib/libportaudio.la
-	autotools-multilib_src_compile
-}
diff --git a/media-libs/raptor/Manifest b/media-libs/raptor/Manifest
index ace607d6cbef..a9ab8830bcff 100644
--- a/media-libs/raptor/Manifest
+++ b/media-libs/raptor/Manifest
@@ -1,5 +1,6 @@
+AUX raptor-2.0.15-heap-overflow.patch 1708 BLAKE2B cea8df63861760fe55f1320cbc0833d814c38148b3d5f2b7163348de48bd95a37ee3000d312ce76879c798182f74d60f49fcef89f5f051bd40febc0c1da68099 SHA512 f7df0ec3123ac8ec9f2852dfb54e380d210446a36ab2f74aa9d2dcb8346162046d239b4db9a0747b18e3d19f4dc1ce41d194557c5e53027a3618e81b7b251d3d
 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 1656 BLAKE2B 3f078ba215f26a0c116791e43f503d78d23532b868eae53088abaf0aa4463bbd2a5361274b10717fa2971d40e72dd16835c05cadb0144cf125ca3ff9cf74a325 SHA512 1d1ef2c5efea26b8b608603448a2378f5ef5b1cb1214c62044c2f46edf7f13e93bad241eafe5062acc58b26c065c5cee7838f9369d811eb6bfd836a918aefd09
-EBUILD raptor-2.0.15.ebuild 1725 BLAKE2B a09a17c421812ea8967e9199bcc14b990fbe030436bbfaf7c3ce9d2ddad3278383e848a07af5ee0338a5103235193802e298f42e88884f0e48b3d2dd6851decd SHA512 4d2326a6649d4600125c7a0d4befe0c47adf0d77fc788252b3ee725a5f520dd2280f5418ae0c9ab7cc52f64816c8ab1092dc2d4f2dc949443a13251ac5954d15
+EBUILD raptor-2.0.14.ebuild 1654 BLAKE2B fc1cc4bdfca9fe92c0db896255cb21e92461b6c05141afc974d35ec03e6cdfc4821ab3dbb9da15de4365416088244b5078f2d349b1dda90e167dbeaa9640f193 SHA512 5ad6857a52489f1703ca5acbdc460d315906cebd955dd98b2135423f79699ccc6034a8acfd83d144b52a9f39938f7e6bd5cdc1b554953d930ae1e1106242ec1c
+EBUILD raptor-2.0.15-r1.ebuild 1581 BLAKE2B 345991be990091a194dd9605a981ec91fdfe60d427a4bd456e55ca6844d1bc39257909d3d9934023b11488962578c5141ddb526ae339684d1b8c592edd911978 SHA512 c30e4b1da375d0951dc3ae4ea34f90a2b7d6c13be3e48131f4ff8421dcea06be7f94adce2f1afef8c63429427315ccef2b86e2355c2758ce83eac0dcc7ae8f47
 MISC metadata.xml 337 BLAKE2B 6244cd4ab5d8d13437590c4bbb672cb9b5ad47f7e70d30adda368737d745daf4df249eb2166d2ab8335fe0a0fec5b8d3afa9ec091cc6ddcaaf0f2d05f9425741 SHA512 3a2c420495274cfca80f0103066b282b9f1301786a8cbde76b894fac721030bee949fc468c92841698038b991b07fa66f15891392784041a87f655d1860fd11c
diff --git a/media-libs/raptor/files/raptor-2.0.15-heap-overflow.patch b/media-libs/raptor/files/raptor-2.0.15-heap-overflow.patch
new file mode 100644
index 000000000000..3418d4bfd261
--- /dev/null
+++ b/media-libs/raptor/files/raptor-2.0.15-heap-overflow.patch
@@ -0,0 +1,42 @@
+From 590681e546cd9aa18d57dc2ea1858cb734a3863f Mon Sep 17 00:00:00 2001
+From: Dave Beckett <dave@dajobe.org>
+Date: Sun, 16 Apr 2017 23:15:12 +0100
+Subject: [PATCH] Calcualte max nspace declarations correctly for XML writer
+
+(raptor_xml_writer_start_element_common): Calculate max including for
+each attribute a potential name and value.
+
+Fixes Issues #0000617 http://bugs.librdf.org/mantis/view.php?id=617
+and #0000618 http://bugs.librdf.org/mantis/view.php?id=618
+---
+ src/raptor_xml_writer.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c
+index 693b946..0d3a36a 100644
+--- a/src/raptor_xml_writer.c
++++ b/src/raptor_xml_writer.c
+@@ -181,9 +181,10 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer,
+   size_t nspace_declarations_count = 0;  
+   unsigned int i;
+ 
+-  /* max is 1 per element and 1 for each attribute + size of declared */
+   if(nstack) {
+-    int nspace_max_count = element->attribute_count+1;
++    int nspace_max_count = element->attribute_count * 2; /* attr and value */
++    if(element->name->nspace)
++      nspace_max_count++;
+     if(element->declared_nspaces)
+       nspace_max_count += raptor_sequence_size(element->declared_nspaces);
+     if(element->xml_language)
+@@ -237,7 +238,7 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer,
+         }
+       }
+ 
+-      /* Add the attribute + value */
++      /* Add the attribute's value */
+       nspace_declarations[nspace_declarations_count].declaration=
+         raptor_qname_format_as_xml(element->attributes[i],
+                                    &nspace_declarations[nspace_declarations_count].length);
+-- 
+2.9.3
diff --git a/media-libs/raptor/raptor-2.0.14.ebuild b/media-libs/raptor/raptor-2.0.14.ebuild
index ee0d8343793b..a20cbebcfa8b 100644
--- a/media-libs/raptor/raptor-2.0.14.ebuild
+++ b/media-libs/raptor/raptor-2.0.14.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="http://download.librdf.org/source/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="2"
-KEYWORDS="alpha amd64 arm 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 ~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"
 
 RDEPEND="dev-libs/libxml2
diff --git a/media-libs/raptor/raptor-2.0.15-r1.ebuild b/media-libs/raptor/raptor-2.0.15-r1.ebuild
new file mode 100644
index 000000000000..c9104d26d5aa
--- /dev/null
+++ b/media-libs/raptor/raptor-2.0.15-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool
+
+MY_PN=${PN}2
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="The RDF Parser Toolkit"
+HOMEPAGE="http://librdf.org/raptor/"
+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"
+IUSE="+curl debug json static-libs unicode"
+
+DEPEND="
+	dev-libs/libxml2
+	dev-libs/libxslt
+	curl? ( net-misc/curl )
+	json? ( dev-libs/yajl )
+	unicode? ( dev-libs/icu:= )
+"
+RDEPEND="${DEPEND}
+	!media-libs/raptor:0
+"
+BDEPEND="
+	>=sys-devel/bison-3
+	>=sys-devel/flex-2.5.36
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( AUTHORS ChangeLog NEWS NOTICE README )
+HTML_DOCS=( {NEWS,README,RELEASE,UPGRADING}.html )
+
+PATCHES=( "${FILESDIR}/${P}-heap-overflow.patch" )
+
+src_prepare() {
+	default
+	elibtoolize # Keep this for ~*-fbsd
+}
+
+src_configure() {
+	# FIXME: It should be possible to use net-nntp/inn for libinn.h and -linn!
+
+	local myeconfargs=(
+		--with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html
+		$(usex curl --with-www=curl --with-www=xml)
+		$(use_enable debug)
+		$(use_with json yajl)
+		$(use_enable static-libs static)
+		$(usex unicode --with-icu-config="${EPREFIX}"/usr/bin/icu-config '')
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	emake -j1 test
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/raptor/raptor-2.0.15.ebuild b/media-libs/raptor/raptor-2.0.15.ebuild
deleted file mode 100644
index 6cc7c0b3cd51..000000000000
--- a/media-libs/raptor/raptor-2.0.15.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit libtool
-
-MY_PN=${PN}2
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="The RDF Parser Toolkit"
-HOMEPAGE="http://librdf.org/raptor/"
-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"
-IUSE="+curl debug json static-libs unicode"
-
-RDEPEND="dev-libs/libxml2
-	dev-libs/libxslt
-	curl? ( net-misc/curl )
-	json? ( dev-libs/yajl )
-	unicode? ( dev-libs/icu:= )
-	!media-libs/raptor:0"
-DEPEND="${RDEPEND}
-	>=sys-devel/bison-3
-	>=sys-devel/flex-2.5.36
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="AUTHORS ChangeLog NEWS NOTICE README"
-
-src_prepare() {
-	default
-	elibtoolize # Keep this for ~*-fbsd
-}
-
-src_configure() {
-	# FIXME: It should be possible to use net-nntp/inn for libinn.h and -linn!
-
-	local myconf='--with-www=xml'
-	use curl && myconf='--with-www=curl'
-
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable debug) \
-		$(usex unicode "--with-icu-config=\"${EPREFIX}\"/usr/bin/icu-config" '') \
-		$(use_with json yajl) \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		${myconf}
-}
-
-src_test() {
-	emake -j1 test
-}
-
-src_install() {
-	default
-	docinto html
-	dodoc {NEWS,README,RELEASE,UPGRADING}.html
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-
-	# https://bugs.gentoo.org/467768
-	local _rdocdir=/usr/share/doc/${PF}/html/${MY_PN}
-	[[ -d ${ED}/${_rdocdir} ]] && dosym ${_rdocdir} /usr/share/gtk-doc/html/${MY_PN}
-}
diff --git a/media-libs/rubberband/Manifest b/media-libs/rubberband/Manifest
index 65c4360624fb..1bab219e1004 100644
--- a/media-libs/rubberband/Manifest
+++ b/media-libs/rubberband/Manifest
@@ -1,4 +1,6 @@
 DIST rubberband-1.8.1.tar.bz2 177501 BLAKE2B 57ca56abc7db2f2a25ff7c900daf24f32a892a1ef27099d34ab8ad290344ea8c5884cbace9206bfdf75262ee0c30bec8d736ae5398d5aaf92f73d0d5980e6932 SHA512 9721eaa36b80574f90b8ae5cfae388159a239e4257b8c85b9e55e7cf0dbbb9a996b857213a6a172a4ada5ff712e6936a16adbe08396e2ab1df3fd8d5a02a3620
+DIST rubberband-1.8.2.tar.bz2 182232 BLAKE2B 991debac51e0a5516a35e1d063d5ea2c51b9d193b6a183200b0869a6743e184fe4296168d6caaea7b811a4022d25c08ca7909f05491a0e91cfe7dda532ed29cb SHA512 da677f9a843711c44c52c0153faa62e587ac7c010569523ef4fef7ce941b9d292e566f46147700e496f6cfff4c9f22f9901dcc93f2d701fdb9de152ddac0c3a6
 EBUILD rubberband-1.8.1-r1.ebuild 1318 BLAKE2B ef83174727b0932afa5aadd90c0beaf29d099d01dc259cb57803e0c717e1b367ca962034964587fa5743474b057a0a93d32c343c54cdd42d0d637b6071eaad76 SHA512 da3e700e934bec7f7b05382c277c7d6226446052729363503631562b2eedc6a9e88e62595817344f25c153462806c20e77f8d7c2daa13386521192b3d56ba416
 EBUILD rubberband-1.8.1-r2.ebuild 1316 BLAKE2B 87af3d290e0072cc25c4ba54c631926385b0e45c7c7342da5a47b4dd712717073ba89c224cafcd35b8c6899e3016c5024bcd9504e23d95c2b528aeee78564a38 SHA512 76c5b32a5140610bcf957a0417f26ff26365ee4aa8413874077f5f56580b72bf77f9643acfb9b12077144b07267240f8a6cc437966b719e42225b871d8335abb
+EBUILD rubberband-1.8.2.ebuild 1360 BLAKE2B 84b23d28093946829bcff94bf5f95ac806854892925ab851fc2588186b92cf240dfb371c10f552348549e9210a9c24a76002a115ac16af6ff9b58abf43358a24 SHA512 a517ff5485d78855bc5d95723af55e5613ad77bc083d336c9b08abb8d20805a0cbc808266ed44b00076ac0a77031746552daafdee3592a3b3b5606eb2dad44db
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/rubberband/rubberband-1.8.2.ebuild b/media-libs/rubberband/rubberband-1.8.2.ebuild
new file mode 100644
index 000000000000..ae950d2a9928
--- /dev/null
+++ b/media-libs/rubberband/rubberband-1.8.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="An audio time-stretching and pitch-shifting library and utility program"
+HOMEPAGE="https://www.breakfastquay.com/rubberband/"
+SRC_URI="https://breakfastquay.com/files/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static-libs"
+
+RDEPEND="
+	media-libs/ladspa-sdk
+	media-libs/libsamplerate[${MULTILIB_USEDEP}]
+	media-libs/libsndfile
+	media-libs/vamp-plugin-sdk[${MULTILIB_USEDEP}]
+	sci-libs/fftw:3.0[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	if ! use static-libs ; then
+		sed -e '/^all:/s/$(STATIC_TARGET)//' \
+			-e '/^\tcp $(STATIC_TARGET)/d' \
+			-i Makefile.in || die
+	fi
+
+	sed -e '/cp -f.*JNI_TARGET/d' -i Makefile.in || die
+
+	multilib_copy_sources
+}
+
+multilib_src_install() {
+	emake INSTALL_BINDIR="${ED}/usr/bin" \
+		INSTALL_INCDIR="${ED}/usr/include/rubberband" \
+		INSTALL_LIBDIR="${ED}/usr/$(get_libdir)" \
+		INSTALL_VAMPDIR="${ED}/usr/$(get_libdir)/vamp" \
+		INSTALL_LADSPADIR="${ED}/usr/$(get_libdir)/ladspa" \
+		INSTALL_LRDFDIR="${ED}/usr/share/ladspa/rdf" \
+		INSTALL_PKGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
+		install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index 2cb55d69a165..fb4170292ca2 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -13,5 +13,5 @@ DIST tiff-3.9.7.tar.gz 1468097 BLAKE2B 303339acf9bb48558695b13fcc2b41acacbbf2ce6
 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 2349 BLAKE2B efdb739a96b8d68d3b997276b70235d0ac76ea5eceba719703af797e0d646789b8946e4f383f4447079e800bfc125e448b50de83ccda086e5f606f3a83fd0ddb SHA512 c4cc89877f02176a000cccf19bce909c1bc1d2efec8ca793811e68f4eacd294bf23d0fbdd1ec41fee85976f11099dabced068824f7a166e77c54f53f5543d4c3
+EBUILD tiff-4.0.9-r4.ebuild 2348 BLAKE2B 2c0710e9996242def120cd22fb5764a125ed97de0f319b1ccb52c1910f811908979931d5f3b424592cf8cd5ecb6e7f962607c938a29958aa5f50a7beeb8aaef4 SHA512 cb99736a791d372161b048b9468be0eb35c516b5d6d750b56c84ac9031957c7e150b0a548ae999afcdcd3125b851e408aea9fde107316a8dd97a0fefa0eb1162
 MISC metadata.xml 565 BLAKE2B 3d487835599974795ba6007439bf1d08756ab1c5dbe191509832b302f3199e4ffc05be64df3e26b4d4a1c11d1292c48cbb59ffa6e412831d16d7415e076f1062 SHA512 289043206dbb512c97e4bb703b32549ac4a77f40e212548b80ea865052b80fed9d4562f9fc94638fda54da9bc3e0c19ba303c027e66e7b75c772aeec91aebe6f
diff --git a/media-libs/tiff/tiff-4.0.9-r4.ebuild b/media-libs/tiff/tiff-4.0.9-r4.ebuild
index cd518c58ce04..306c44a85853 100644
--- a/media-libs/tiff/tiff-4.0.9-r4.ebuild
+++ b/media-libs/tiff/tiff-4.0.9-r4.ebuild
@@ -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="
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 255b20098cdc..66bb24234187 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,7 +1,4 @@
-AUX vulkan-loader-1.1.70.0-Dont-require-glslang-if-not-building-layers.patch 1736 BLAKE2B 10c31ec7214a64f65daaa265d84b913906f0007a4503a11218f35012aba697b87bef6a93e1120edc3dd33c5951a18abf4b1b54841afdedd7b8dbfb12aed325d1 SHA512 a27135d82d366925487f3fda147c531fe93bb556207fcc36310cc5c361fa5879f812cfbe1c5677da987311e31c09e3f573d69183f60a5788dc0489ac27e63918
 AUX vulkan-loader-1.1.77.0-loader-Rework-include-dependencies.patch 2018 BLAKE2B 354a11d423eabf14ce340117adee3e61e9402997b1894e35661e9c5ef88e85dbe97d65579304359e8484302c69e1bbf0bef22bd98f50ffa74ce1fe6c0355f51e SHA512 91045102cd2b53f2469748b398667d27a23d0a8c56f2a82e454a5634b3a05152af370797eae1153317ec9cf0c854dc9c7547265adf162be2e51f6134fbfa7c58
-AUX vulkan-loader-Fix-layers-install-directory.patch 1021 BLAKE2B deb7ed63d90f67afce300caa421f4a9760bf182caa4e4f4fe1b70bb4a0216f793dab2af2c1ec197f0bd12a55dc413376f500598c48932cf3bcf58bf35433e6fa SHA512 faaf9bb15bc6930655289db77a75494de996e3aa9bbda359794d942546bdd350480137fc43f2c0152ee0b0f25797920e7ada74eaaf70d98c212e83dcf607820f
-AUX vulkan-loader-Use-a-file-to-get-the-spirv-tools-commit-ID.patch 1608 BLAKE2B eadbe49f109ce32c7ad75739ba43f7629a3955fb5a9fdf03ac6e16f890394b13b95c979ee456b75964ff421e016dd7a0c47acbe6c79f3a5f28813dbbad61e874 SHA512 d371cde49a630b7530b25a5fa6ccc2324885048320db0a140f9ba09b490a40edf460602ffc156767b1773a88d642d6917d73cb13ac869f811c68b00cfc00d297
 DIST vulkan-loader-1.1.77.0.tar.gz 1512876 BLAKE2B bf5fbf3623f0ca2b2473d496edd23ce388313d7dbeb8e3f95549da5726a1ab25fcce673d5dd3df094d3abdd2c5ecc4a87759a80e7d05d7b34abf30ee325895f2 SHA512 95fe179c93df1ea36cee8123588b232433c988e9a5889a606e7adbc4192d6a4bc8809f9936cf11ae953090392d0c9e4265697b608adacc7eb7cf6479baf49f48
 DIST vulkan-loader-1.1.82.0.tar.gz 1342427 BLAKE2B 4b2c589e2c1edaa29e13e892cc839f2d7af5bbadf7dda3f50eca2543c1877af175e9640545b886ffe3e8b1c51373502ee272829ddb15c07629ea08ece697e5b9 SHA512 624e493454e622e29bc0de5fdf1c425691b3c98f317660847e95aee6bc42dafa0b4d8caa9de52e8f3229b7e743afa475485cd3affbdb295e16ba49d30d1eb19e
 EBUILD vulkan-loader-1.1.77.0.ebuild 1673 BLAKE2B df999944df1c2192ad1d523e4c1d5273333818ce12efabf5f4ed18c4e48ebc0c7c538e0708b6fea13b5fc95e7f5fb8c586737a645113049e083cf15606884965 SHA512 375e9482d951f3866ca079a7e4a5205ac71fbf3519a91a21b84dd749abea8a6e6b2441b0d0bccbc14f21e3d786aa0ddc6ffc383f63be2054e25e93847b6a4f78
diff --git a/media-libs/vulkan-loader/files/vulkan-loader-1.1.70.0-Dont-require-glslang-if-not-building-layers.patch b/media-libs/vulkan-loader/files/vulkan-loader-1.1.70.0-Dont-require-glslang-if-not-building-layers.patch
deleted file mode 100644
index 3c5a30b10a00..000000000000
--- a/media-libs/vulkan-loader/files/vulkan-loader-1.1.70.0-Dont-require-glslang-if-not-building-layers.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 4efbd5c81cfb9071757e446d57957aa81e9d9374 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Thu, 15 Mar 2018 22:25:19 +0000
-Subject: [PATCH] build: Don't require glslang if not building layers
-
----
- CMakeLists.txt | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 713a9cdfd3..c9f73ce965 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -350,6 +350,10 @@ macro(run_external_revision_generate source_dir symbol_name output)
- endmacro()
- 
- # Custom target for generated vulkan helper file dependencies
-+set(generate_helper_files_DEPENDS)
-+if(BUILD_LAYERS)
-+    LIST(APPEND generate_helper_files_DEPENDS spirv_tools_commit_id.h)
-+endif()
- add_custom_target(generate_helper_files DEPENDS
-     vk_enum_string_helper.h
-     vk_safe_struct.h
-@@ -359,7 +363,7 @@ add_custom_target(generate_helper_files DEPENDS
-     vk_dispatch_table_helper.h
-     vk_extension_helper.h
-     vk_typemap_helper.h
--    spirv_tools_commit_id.h
-+    ${generate_helper_files_DEPENDS}
-     )
- set_target_properties(generate_helper_files PROPERTIES FOLDER ${LVL_TARGET_FOLDER})
- 
-@@ -372,7 +376,9 @@ run_vk_xml_generate(helper_file_generator.py vk_enum_string_helper.h)
- run_vk_xml_generate(helper_file_generator.py vk_object_types.h)
- run_vk_xml_generate(helper_file_generator.py vk_extension_helper.h)
- run_vk_xml_generate(helper_file_generator.py vk_typemap_helper.h)
--run_external_revision_generate(${EXTERNAL_SOURCE_ROOT}/glslang/External/spirv-tools SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h)
-+if(BUILD_LAYERS)
-+    run_external_revision_generate(${EXTERNAL_SOURCE_ROOT}/glslang/External/spirv-tools SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h)
-+endif()
- 
- 
- 
-
diff --git a/media-libs/vulkan-loader/files/vulkan-loader-Fix-layers-install-directory.patch b/media-libs/vulkan-loader/files/vulkan-loader-Fix-layers-install-directory.patch
deleted file mode 100644
index 193a8e55a465..000000000000
--- a/media-libs/vulkan-loader/files/vulkan-loader-Fix-layers-install-directory.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4ae095d8d3e668311b3db3657af753dfb39a149c Mon Sep 17 00:00:00 2001
-From: Nick Sarnie <sarnex@gentoo.org>
-Date: Sun, 22 Apr 2018 18:44:48 -0400
-Subject: [PATCH] Make the layers install into the data root directory
-
-Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
----
- layers/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
-index 9ade6a03..c1a3cedd 100644
---- a/layers/CMakeLists.txt
-+++ b/layers/CMakeLists.txt
-@@ -142,7 +142,7 @@ if(UNIX)
-                 VERBATIM
-                 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/linux/${config_file}.json
-                 )
--            install(FILES ${CMAKE_CURRENT_BINARY_DIR}/staging-json/${config_file}.json DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/vulkan/explicit_layer.d)
-+            install(FILES ${CMAKE_CURRENT_BINARY_DIR}/staging-json/${config_file}.json DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/vulkan/explicit_layer.d)
-         endforeach(config_file)
-     endif()
- endif()
--- 
-2.17.0
-
diff --git a/media-libs/vulkan-loader/files/vulkan-loader-Use-a-file-to-get-the-spirv-tools-commit-ID.patch b/media-libs/vulkan-loader/files/vulkan-loader-Use-a-file-to-get-the-spirv-tools-commit-ID.patch
deleted file mode 100644
index 066f126e437d..000000000000
--- a/media-libs/vulkan-loader/files/vulkan-loader-Use-a-file-to-get-the-spirv-tools-commit-ID.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 58299a001068a28f5d5f6985c2066b7c4caa7b18 Mon Sep 17 00:00:00 2001
-From: Nick Sarnie <commendsarnex@gmail.com>
-Date: Fri, 23 Mar 2018 20:23:54 -0400
-Subject: [PATCH] Use a file to get the spirv-tools commit ID
-
-Signed-off-by: Nick Sarnie <commendsarnex@gmail.com>
----
- CMakeLists.txt | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c9f73ce9..c3e200b3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -349,6 +349,14 @@ macro(run_external_revision_generate source_dir symbol_name output)
-     )
- endmacro()
- 
-+macro(run_external_revision_generate_spirv_tools source_dir symbol_name output)
-+    add_custom_command(OUTPUT ${output}
-+    COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/external_revision_generator.py --rev_file ${source_dir}/spirv-tools-commit.h -s ${symbol_name} -o ${output}
-+    DEPENDS ${SCRIPTS_DIR}/external_revision_generator.py ${source_dir}/spirv-tools-commit.h
-+    )
-+endmacro()
-+
-+
- # Custom target for generated vulkan helper file dependencies
- set(generate_helper_files_DEPENDS)
- if(BUILD_LAYERS)
-@@ -377,7 +385,7 @@ run_vk_xml_generate(helper_file_generator.py vk_object_types.h)
- run_vk_xml_generate(helper_file_generator.py vk_extension_helper.h)
- run_vk_xml_generate(helper_file_generator.py vk_typemap_helper.h)
- if(BUILD_LAYERS)
--    run_external_revision_generate(${EXTERNAL_SOURCE_ROOT}/glslang/External/spirv-tools SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h)
-+    run_external_revision_generate_spirv_tools(/usr/include/spirv-tools SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h)
- endif()
- 
- 
--- 
-2.16.3
-
-
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index f7a856dfd0d2..3f8f6f5567c3 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -9,6 +9,6 @@ DIST x265_2.8.tar.gz 1379551 BLAKE2B c124864a08492739cdde89e44d72c84ad94a0b236d2
 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 5689 BLAKE2B 74720e4fcb3de5a03cdb248c22c9bd9c3c8a9aabb4ea452a1ba6c98cb312aa69fe674216924fba94842880fab3cd4904a6775c7922b99fec80271719e2b54c90 SHA512 2d687d0667db427f7736e0a5a579adcc4170beef388b77d636f782226c1af58da6a43dd290c329b67907c7b627224088e738c6a0d358f5fb8fea0c894f4d1f95
+EBUILD x265-2.8.ebuild 5683 BLAKE2B a3c6fc5a38d1fcdd6a03848bdff86777ca38adb83643eee6a04d11f14c24d2894b859fb1186b9dc2d9719eca74283afb40df9e43a2946bd535bed2dc05677a90 SHA512 333d2ebc2b136c9ce81c2c364c6a49dc3adc07cdf701c612bd64a7ea4def282d08d2e11af5aeb9df97c4406e0fb3474da00242989adfba9984c295e7db608846
 EBUILD x265-9999.ebuild 5661 BLAKE2B c01180df215de891d5f60dd877a0acba88351efe58586ffd1f022e1b337f0b308cfdd096104b4bae667ad2050566ebf6417955ef4f058a804c1cf8a95c36a01a SHA512 d8a48e121ddb761ceec95f85881d4eb164314440af38cd31aec8875aa3f940539838b796fa34da049ad630e3c9f4fe3e9203c7e558dc86e0d3b490fedae808b1
 MISC metadata.xml 703 BLAKE2B c71ecd74be6e4fcdf70dcdc197e6830875f6cae0b1ee4e96b0edc4b16db4e512b2b8e8962fa75c7f4f380d74ff713158fd6124d4a22229b3c213c197124a59c6 SHA512 b9f2ac6ed88fce31fa7459321cc7cc2114caee48066b0ae1773a8711f2d652370d154a6167d8c8eb0dc47f55ca211812b99d11c4a1941a3a2553c62a6f21abf6
diff --git a/media-libs/x265/x265-2.8.ebuild b/media-libs/x265/x265-2.8.ebuild
index 77fe16b7dbf6..5f87da893e5d 100644
--- a/media-libs/x265/x265-2.8.ebuild
+++ b/media-libs/x265/x265-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
@@ -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-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 3ee843be832b..dec88dc7e3ca 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/frei0r-plugins/Manifest b/media-plugins/frei0r-plugins/Manifest
index 58a7f2d30bcf..0ac81332e715 100644
--- a/media-plugins/frei0r-plugins/Manifest
+++ b/media-plugins/frei0r-plugins/Manifest
@@ -1,7 +1,3 @@
-DIST frei0r-plugins-1.5.0.tar.gz 1519006 BLAKE2B 6b47190c2104616536796ee40d9779d8df55fee233983864e9fcbba157b9d242bab73ab25ea6ccb3784cfb3150fb83f57daf3d0621877ac1af5a33caa18328d9 SHA512 9be0384421ff5ac9000dcda9acefb5cb2b6dc05ea72d9771fae990cb5fad4424dcef8dd15c1e5031a89169f914af8c7a30e47934ad007a3bc0150f3c005bc6bf
-DIST frei0r-plugins-1.6.0.tar.gz 1090145 BLAKE2B 8c6bc2ff55109601d5a78f580eca97c846d8aff1660c8118a95d5057e84398713a873d7159cd982a806266f3d55f3cd912ebaa37fd5fa150082ec3a4ea92b2bc SHA512 0736c3e874d9406777e9dd1d7010e6ddd87c656df6d803d2dc689e1d6ee0d053aaaab5991484b58d142f14fe52f8dc51a31d2a6604f06d567fbb3414cb62645d
 DIST frei0r-plugins-1.6.1.tar.gz 1103969 BLAKE2B febcfc0a5918834e38c2aad2016c0b72f3fed731732e482ae8f9564bb5c2e0825ce050149f6728a8263d6caef11810b33ee3edfb697b0f8a212ae996e0085f45 SHA512 843790389e6de83817d1c3744a91d3365864bb0c22cf6598707ccba5ec8933f6209434011cde1303e16edd89f6cde2f22aa1fb6eca3548d892a2c77332c44aac
-EBUILD frei0r-plugins-1.5.0.ebuild 1290 BLAKE2B e7aa6d779fce831eddbd29ce2bd586ad47085d70ba5b0a84450d828215204c91f97939e901de2a00b1c303ab9fe540456282be1212b0628d6005813562c84f12 SHA512 18c84c694aa519e272d5553b7f3a3a5b50d873ab1e9a432614fa344bd5c9d8ac6ad79d28fb640382d6a59c6dc7d1608e7184141c31f5216f38dd1144daffcc44
-EBUILD frei0r-plugins-1.6.0.ebuild 1294 BLAKE2B 3b944f9b5e05689bda50b0fa261a9ea7186c14cf015673bd41d8c8ca500fd914a18a660801b2776bb67e16a08a32cb36cc07c2d672375bdcfc84772b37da07a5 SHA512 aab6a851079c884d0cf24e0f1bf6e826a5839dcf86e8423ad79184390a46c1b883e7fae6f54e25933c2327b3d9756a6f896db871b68345dd293630c15ba30064
-EBUILD frei0r-plugins-1.6.1.ebuild 1299 BLAKE2B d5563097d5a7f0df4af5d32a4ab5de860d7ddfe194737658dacf29ead0e42886eb5e0f28019c12d683b885a3aae8191c7ca287a262b6f9e34d88ac2122e6062a SHA512 3b717929ad2b648e05ea1cba83921d25f1e3b96db707bec06bd1dda4fce0d6e3ac8fcffd490a18296c3715ad6c58a2b073b05f987be033286aa7ca8fb6aff2a2
+EBUILD frei0r-plugins-1.6.1.ebuild 1295 BLAKE2B 92905386f4bd05ee0164a0bedb3f028758a5ffccddfd56da123bc6e4e191f6019005246bc07ff87cafb8a395115c97ecef78f78d378d82df59c18f3614022f6e SHA512 7f8fd134f5b7efc7d2fae5830ccf248fc189fb7cbd8333818c66b7fe528e15fb45a8975290ab88e29af31a57dea506f9eeeae0ecc2c91f0ae802fa044af5f305
 MISC metadata.xml 558 BLAKE2B 3849525e3af111dc1aa936ff68798bcb5080143a2eaff7c9023ddf23b15afff5e3987f2877ca6349de5e029b26e9c50fed4262fe447dfbb74e8991bc4d55e757 SHA512 11b9bc52481fb1db15cce40f024a595598382b50e96ba0d294968739638676d4d7769c26390e7fd7ef84f214d9d83b04c46bad44938bd9485af4497ff14ea131
diff --git a/media-plugins/frei0r-plugins/frei0r-plugins-1.5.0.ebuild b/media-plugins/frei0r-plugins/frei0r-plugins-1.5.0.ebuild
deleted file mode 100644
index 46c0dd3169ab..000000000000
--- a/media-plugins/frei0r-plugins/frei0r-plugins-1.5.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils multilib
-
-DESCRIPTION="A minimalistic plugin API for video effects"
-HOMEPAGE="https://www.dyne.org/software/frei0r/"
-SRC_URI="https://files.dyne.org/frei0r/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="doc +facedetect +scale0tilt"
-
-RDEPEND="x11-libs/cairo
-	facedetect? ( >=media-libs/opencv-2.3.0:= )
-	scale0tilt? ( >=media-libs/gavl-1.2.0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-DOCS=( AUTHORS.txt ChangeLog.txt README.txt TODO.txt )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	local f=CMakeLists.txt
-
-	sed -i \
-		-e '/set(CMAKE_C_FLAGS/d' \
-		-e "/LIBDIR.*frei0r-1/s:lib:$(get_libdir):" \
-		${f} || die
-
-	# https://bugs.gentoo.org/418243
-	sed -i \
-		-e '/set.*CMAKE_C_FLAGS/s:"): ${CMAKE_C_FLAGS}&:' \
-		src/filter/*/${f} || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITHOUT_OPENCV=$(usex !facedetect)
-		-DWITHOUT_GAVL=$(usex !scale0tilt)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc; then
-		pushd doc
-		doxygen || die
-		popd
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	use doc && dodoc -r doc/html
-}
diff --git a/media-plugins/frei0r-plugins/frei0r-plugins-1.6.0.ebuild b/media-plugins/frei0r-plugins/frei0r-plugins-1.6.0.ebuild
deleted file mode 100644
index 59c5f9f4674a..000000000000
--- a/media-plugins/frei0r-plugins/frei0r-plugins-1.6.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils multilib
-
-DESCRIPTION="A minimalistic plugin API for video effects"
-HOMEPAGE="https://www.dyne.org/software/frei0r/"
-SRC_URI="https://files.dyne.org/frei0r/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="doc +facedetect +scale0tilt"
-
-RDEPEND="x11-libs/cairo
-	facedetect? ( >=media-libs/opencv-2.3.0:= )
-	scale0tilt? ( >=media-libs/gavl-1.2.0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-DOCS=( AUTHORS.txt ChangeLog.txt README.txt TODO.txt )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	local f=CMakeLists.txt
-
-	sed -i \
-		-e '/set(CMAKE_C_FLAGS/d' \
-		-e "/LIBDIR.*frei0r-1/s:lib:$(get_libdir):" \
-		${f} || die
-
-	# https://bugs.gentoo.org/418243
-	sed -i \
-		-e '/set.*CMAKE_C_FLAGS/s:"): ${CMAKE_C_FLAGS}&:' \
-		src/filter/*/${f} || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITHOUT_OPENCV=$(usex !facedetect)
-		-DWITHOUT_GAVL=$(usex !scale0tilt)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc; then
-		pushd doc
-		doxygen || die
-		popd
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	use doc && dodoc -r doc/html
-}
diff --git a/media-plugins/frei0r-plugins/frei0r-plugins-1.6.1.ebuild b/media-plugins/frei0r-plugins/frei0r-plugins-1.6.1.ebuild
index 5e6b5d11a882..1de5c86c3d6e 100644
--- a/media-plugins/frei0r-plugins/frei0r-plugins-1.6.1.ebuild
+++ b/media-plugins/frei0r-plugins/frei0r-plugins-1.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
@@ -11,7 +11,7 @@ SRC_URI="https://files.dyne.org/frei0r/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc +facedetect +scale0tilt"
 
 RDEPEND="x11-libs/cairo
diff --git a/media-plugins/gst-plugins-cairo/Manifest b/media-plugins/gst-plugins-cairo/Manifest
new file mode 100644
index 000000000000..19e046ead758
--- /dev/null
+++ b/media-plugins/gst-plugins-cairo/Manifest
@@ -0,0 +1,3 @@
+DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+EBUILD gst-plugins-cairo-1.14.4.ebuild 332 BLAKE2B 00608d0cb0131592e49a8ec528265b74238723a5d042c33b33081c0a426385ec7783329e66c15e399d74e5b9fad131d1a552aa1384411a0a6da250a55226d9ac SHA512 c6a35459b758c89c0ef27f1d096022fb212d665eacd8b8539317e3818a4940cd66c6884b8472a9bf560ece227530c024b7be24ba1a520b177ef4526d3f1498ea
+MISC metadata.xml 478 BLAKE2B e9563654e8e62fab3969a394c62a847c1e87617f8e1bbb0042850709ccb7f450f31283e2bb563aa51b14f0599f69147be29aaa2af2ac57f2b56f162b50f3bc62 SHA512 07528fb30c717b584e9fd9381ad9d71829de406a7f20994876703a7164b84529d21b35e8bdf0880216e6b308e96bb83294ab4ddf9f3ed05a4e20f8d5d2b35708
diff --git a/media-plugins/gst-plugins-cairo/gst-plugins-cairo-1.14.4.ebuild b/media-plugins/gst-plugins-cairo/gst-plugins-cairo-1.14.4.ebuild
new file mode 100644
index 000000000000..9b5c0a8aa029
--- /dev/null
+++ b/media-plugins/gst-plugins-cairo/gst-plugins-cairo-1.14.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="Video overlay plugin based on cairo for GStreamer"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=x11-libs/cairo-1.10[glib,${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-cairo/metadata.xml b/media-plugins/gst-plugins-cairo/metadata.xml
new file mode 100644
index 000000000000..f8bb9f94112e
--- /dev/null
+++ b/media-plugins/gst-plugins-cairo/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
+<longdescription lang="en">
+	GStreamer plugin for rendering overlays on a video stream using Cairo.
+
+	Includes the following element:
+	* cairooverlay - Render overlay on a video stream using Cairo
+</longdescription>
+</pkgmetadata>
diff --git a/media-plugins/gst-plugins-cdparanoia/Manifest b/media-plugins/gst-plugins-cdparanoia/Manifest
index 76ca7b02972c..8726588c970f 100644
--- a/media-plugins/gst-plugins-cdparanoia/Manifest
+++ b/media-plugins/gst-plugins-cdparanoia/Manifest
@@ -1,11 +1,11 @@
 DIST gst-plugins-base-0.10.36.tar.xz 2364108 BLAKE2B a71ef5d5c7462d60937602681c060e85ed086a753b7ef354dad48354d6c3741d809f2c0c6a321ef9ac60fb12d24ec65e1baa63e51211134d2a5e03aae16f73d2 SHA512 ea77778e073515df58229a641b4363df31f0b80204a5a43a8feb31f0b03a5a4b9b79d6e07e1615c773a59927a9b649f1b1d782def1120d581d09a090be8363b8
-DIST gst-plugins-base-1.12.4.tar.xz 3119468 BLAKE2B d5ac157618a25c8f0323d1922d5b26b0b5c49f56cb75df3ceeadd0566f873be1a06c863a1da6afff40901fbbbeb1ec6cd6ef4614309ca7f7ff988c0fa9040a10 SHA512 89a6e92cd294612cf1406eb156416ab4606643f6b43637e64a18f6f28ab789ca8d4cf1308434ed85e5fc679c79cc3ca115db48f37e0065a6ab3cdfdbaaad9f53
 DIST gst-plugins-base-1.14.1.tar.xz 3689184 BLAKE2B 17abcab2c84b113180de55d6c781ae11feec66c215febfffefe4a22353c56e82a585647688e2078603b6c3ece6f26afa99969091a72886880a2f8549dd9cb379 SHA512 bca9db8780fe24c19a2c4eae9a16dc0856cb38077580e4344bd4f7fa9a7a03079b92556ff35475a574f624a5a721d80ef925790670e4cc809361ed01108a141e
 DIST gst-plugins-base-1.14.2.tar.xz 3693856 BLAKE2B 7ed05718bfd1dcb15e05e5a2c8758ad409c4ad7f331146363f264aaf7123c8a14c1db81f482710d1069d33e5281087f66e2e38504e39b214befba73ffdd9295c SHA512 35e7eb5c42fe265d38c433575f88d3306f15ff927a989eb375ed5399cbf92af2e9bf553d6eee349dc13673540cee00e1f879595f25e58c188ea443d8a969682f
 DIST gst-plugins-base-1.14.3.tar.xz 3702184 BLAKE2B 8b13cdcb912968ed51bba91faf70060cced562f374d2b6987a9b9ff9a261b553836394cc4dc16df299c21cb303fd87bb0becb57225767c3502c8c16359430523 SHA512 3b5f0dc46d148dd9f162c651594be740f798c1d6272ecabced544f09900b6f2909a9fc705d42e4e98130d6f7cb1368458bfeee27444b5c43e62551defbc3838a
+DIST gst-plugins-base-1.14.4.tar.xz 3703232 BLAKE2B b22c44b857bc4f1972f03752cc1afb35c8d76e2d0c4a06c574af0ac4f3a91080c584ae4e4fc2a263ee879a53d58505c24a756ebc051d81ec62661c4f9e532f0e SHA512 42c59df9f2d848108f12afa0466acbcfa5ccda64e4d0d44608d4268abed20f2e036713de04e7d71feaed1868ad742c5bcb55ae0eef5dec8e19e053dc8541b8af
 EBUILD gst-plugins-cdparanoia-0.10.36-r1.ebuild 438 BLAKE2B 056dbad1b9473f84356d9fb0f0ba8c0f7a0438e06b0353d4344c879e9092d05e655f2ab4141259412f621bb53218c454dda0033aca1dc204c5eb0a03c0612757 SHA512 8be7db6c102859a541cf40301567414398e0cd7cc51435956490af1a92a403444d252260178de83f48453ce701020d963fa0f95ff3bad03c1b7973a94ab5d4a8
-EBUILD gst-plugins-cdparanoia-1.12.4.ebuild 477 BLAKE2B 146dbd3c217747c7937e01241123a7d7c00f2b4af6f58082fc7a994f5a3e4ec5f0851ea6ac5f54d9bb6c8b408743ff8effc29d9e5897acdac8d542102fba72d2 SHA512 a415e603a083bea57b444fce9263ccf5a78d167ac2daf45918f3b0b40b937a4028f80bcff6b93f0d5b5274dc0daec80003d40c14dd225891abb682fc5d14ce03
 EBUILD gst-plugins-cdparanoia-1.14.1.ebuild 477 BLAKE2B 146dbd3c217747c7937e01241123a7d7c00f2b4af6f58082fc7a994f5a3e4ec5f0851ea6ac5f54d9bb6c8b408743ff8effc29d9e5897acdac8d542102fba72d2 SHA512 a415e603a083bea57b444fce9263ccf5a78d167ac2daf45918f3b0b40b937a4028f80bcff6b93f0d5b5274dc0daec80003d40c14dd225891abb682fc5d14ce03
 EBUILD gst-plugins-cdparanoia-1.14.2.ebuild 484 BLAKE2B 27b2b4bdcf2015c67090d8b829d5df7883b2a00b403aae9adda445359f25afdbe90b6354c9d6ca2bcdfd32f22e2a8f398305cdaf02e4858cfa65bafc41323a9d SHA512 ee7008e83084708242ff7f288d84619cbfcea0d81ea3b547c1a79dc87a55bcd0329ac2d68da3475c6f30fe8c4da6ae9eefa89e0f2e0ce7a44110dc9247c05537
 EBUILD gst-plugins-cdparanoia-1.14.3.ebuild 484 BLAKE2B 27b2b4bdcf2015c67090d8b829d5df7883b2a00b403aae9adda445359f25afdbe90b6354c9d6ca2bcdfd32f22e2a8f398305cdaf02e4858cfa65bafc41323a9d SHA512 ee7008e83084708242ff7f288d84619cbfcea0d81ea3b547c1a79dc87a55bcd0329ac2d68da3475c6f30fe8c4da6ae9eefa89e0f2e0ce7a44110dc9247c05537
+EBUILD gst-plugins-cdparanoia-1.14.4.ebuild 481 BLAKE2B ddd7028357ea7709abd33de624851d5a9d9b43a86968acac26e6691ab6b622e2aa3df33a7be045a1bdf382d72b1b5b7eb3f38010c89e9f5130679cb2c51c4c43 SHA512 6775cb0e302d046faa808241365949eb953a25a82f0aae6908c29ef22365eaee3d7404a36a353ce04e4694aaa665ad4030adeb29e5b10775e41f856b13258b25
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.12.4.ebuild b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.12.4.ebuild
deleted file mode 100644
index 725fd417518f..000000000000
--- a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.12.4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-base
-
-inherit gstreamer
-
-DESCRIPTION="CD Audio Source (cdda) plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=media-sound/cdparanoia-3.10.2-r6[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	gstreamer_system_link gst-libs/gst/audio:gstreamer-audio
-}
diff --git a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.14.4.ebuild b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.14.4.ebuild
new file mode 100644
index 000000000000..d5cbdee29898
--- /dev/null
+++ b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.14.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-base
+
+inherit gstreamer
+
+DESCRIPTION="CD Audio Source (cdda) plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=media-sound/cdparanoia-3.10.2-r6[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	gstreamer_system_link gst-libs/gst/audio:gstreamer-audio
+}
diff --git a/media-plugins/gst-plugins-dv/Manifest b/media-plugins/gst-plugins-dv/Manifest
index 1ff18ed0f29b..d80bc50e4c5a 100644
--- a/media-plugins/gst-plugins-dv/Manifest
+++ b/media-plugins/gst-plugins-dv/Manifest
@@ -1,11 +1,11 @@
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 BLAKE2B a015ef6993078f1c699badcc9911a835fe1d129b4e0dccb3937d49768d9202549204bbfb0d7ad575bcb77c75f73662a83912936b2664a2b1cd7c331e4d203c4f SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809
-DIST gst-plugins-good-1.12.4.tar.xz 3489992 BLAKE2B 41715d3e9bda183706d87085bc8cca546720f20e32fd5ecf6e284814745f2fe8ba4cfcd244e50d0734e57dde26944539b8273879608d3042262bfc10f82cc2b9 SHA512 18f270c01be80fe5b026e2c26db3ec200117ffd99c1dca55a8a78f0bd6dcc4701126836e52a410f179779e363f11218413c7b4d13e96ef5ee1bfa82e79a81178
 DIST gst-plugins-good-1.14.1.tar.xz 3776168 BLAKE2B 5b17ac49d5bae423ee887f1516ba8bfb542acb17e3f304f489dddbaa728761ee51a08e67bd10a9981f53b5b8424d8013d1723fcbbf6e06d34a39548868d34f85 SHA512 b52d3214f2d32f263637cb9f0838284483e15b8d20bf36d64c349e99b481095734a4dd2c2421176540dfe5129ecc1acc101b89cc898b4773f0f736e8e962b070
 DIST gst-plugins-good-1.14.2.tar.xz 3779912 BLAKE2B d49f82a6be7423d233ec15660470533d6bfc5da3d2ac5912ce7b3f97739b1540424c02593aff269aae3df7c6f15ca37b2d9d45fe85f3b36b910cdac4ba98f093 SHA512 26ff40d949ab95043ed717350fb344a616c72b049cd52c3e7debd9cc37f73eb9d4704b4f437ba257cecb9dba702ce451647279cb821e9405b36210b46ae9aa05
 DIST gst-plugins-good-1.14.3.tar.xz 3790052 BLAKE2B 14f4116ce3eeb20f1f2cc8e835e46a9444ef82291aad90b74e74d0e79c1974bb6f2373f79543a3a3235773c954bd9def67a9e6c64522035fa65e1541695d34e1 SHA512 1077d4ac7332a4bfd58fe5be53104e1404c3a688769520650c030488a184e64a43b301fc1f1d687de668143f849a23cb0ba2b417cf284d20710b9cf32d792e45
+DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 EBUILD gst-plugins-dv-0.10.31-r1.ebuild 409 BLAKE2B 317010ff0bc97edbcde420f253bfb746fe524c0d58ee7648fd03d6151b9e0d56ba035c703676791f86756c3af4e961f712529458cdaf7747fdba9b4553539b9c SHA512 5eb3d45d44139eb190c0ce873a62b6543cc88e38ab37205bf33209811675a412d7d5bf3405c10b513f60ead3772299cc5725df3a91788a7c504d7c81251de9c9
-EBUILD gst-plugins-dv-1.12.4.ebuild 420 BLAKE2B 3912731f2241f4686933eb02e03e01b342807eb6fa1e68ba18fccb2651dba8ae4c0eb0dfa64fe832300429d21364151d96f46c93751e9b00d7bae01582834c2a SHA512 6b5cc086a0f0e41c780319d01b0121357aa92f9187b4e2b36252a85a1c7148619b9c36135ffff76f9b6232979a0bbe4f9ff2c5786e40145a88c0a23e4d5f7d5e
 EBUILD gst-plugins-dv-1.14.1.ebuild 420 BLAKE2B 3912731f2241f4686933eb02e03e01b342807eb6fa1e68ba18fccb2651dba8ae4c0eb0dfa64fe832300429d21364151d96f46c93751e9b00d7bae01582834c2a SHA512 6b5cc086a0f0e41c780319d01b0121357aa92f9187b4e2b36252a85a1c7148619b9c36135ffff76f9b6232979a0bbe4f9ff2c5786e40145a88c0a23e4d5f7d5e
 EBUILD gst-plugins-dv-1.14.2.ebuild 425 BLAKE2B b9840b762ee5eb41518ad19a704c5b675851ea3f10b80c1493216a7aea950d570c3cf2a68383a170cd044a1c16debd7ae911e399478dd0067407940ed4f43aa1 SHA512 a9afa128ee5ed299df83c03ff8ff2231093096577a3b2ebc2d4c46ea00c5459067c9367db40aa2ff2c2eaa799d613f06dadc650383b1dfec9aca28e344fddcb7
 EBUILD gst-plugins-dv-1.14.3.ebuild 425 BLAKE2B b9840b762ee5eb41518ad19a704c5b675851ea3f10b80c1493216a7aea950d570c3cf2a68383a170cd044a1c16debd7ae911e399478dd0067407940ed4f43aa1 SHA512 a9afa128ee5ed299df83c03ff8ff2231093096577a3b2ebc2d4c46ea00c5459067c9367db40aa2ff2c2eaa799d613f06dadc650383b1dfec9aca28e344fddcb7
+EBUILD gst-plugins-dv-1.14.4.ebuild 422 BLAKE2B 5dc690346dec6569d583890ab0bb2469de515f4feadb2b06051aee392ad2a85bb0063359290fdd5b0262d0a45975e3eab533410c3e04e045c3740fa2ebfb933b SHA512 3bb669dcdf33f139742017a948404650f3499232f680380208cd12c364d621ee90e88f92277b592cd960a2a043013718e93675308ffa3413bfb29effeb7d3080
 MISC metadata.xml 380 BLAKE2B e30d4f36d092c662f4b2caf33ae705dcee14cadb22174b125686c45a8724a880b291d4683fbf6b06a1e8003cf18be831a368d617d872904a58b1e3fe70ae7ca6 SHA512 bcbeccb0d35ae268383fd3cff3c5739301777233f6769556b5793b3b34a0c5c6e6bbcafcad392e22a8ee441698dc508d9638c1c53eaa17b692ecf5a40ee6f27c
diff --git a/media-plugins/gst-plugins-dv/gst-plugins-dv-1.12.4.ebuild b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.12.4.ebuild
deleted file mode 100644
index ecbe0fa03dac..000000000000
--- a/media-plugins/gst-plugins-dv/gst-plugins-dv-1.12.4.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
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer
-
-DESCRIPTION="DV demuxer and decoder plugin for GStreamer"
-KEYWORDS="alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
-IUSE=""
-
-RDEPEND=">=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-GST_PLUGINS_BUILD="libdv"
diff --git a/media-plugins/gst-plugins-dv/gst-plugins-dv-1.14.4.ebuild b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.14.4.ebuild
new file mode 100644
index 000000000000..f750492791f1
--- /dev/null
+++ b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.14.4.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="DV demuxer and decoder plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+GST_PLUGINS_BUILD="libdv"
diff --git a/media-plugins/gst-plugins-flac/Manifest b/media-plugins/gst-plugins-flac/Manifest
index 7053caf137be..3792fa8f7700 100644
--- a/media-plugins/gst-plugins-flac/Manifest
+++ b/media-plugins/gst-plugins-flac/Manifest
@@ -1,11 +1,11 @@
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 BLAKE2B a015ef6993078f1c699badcc9911a835fe1d129b4e0dccb3937d49768d9202549204bbfb0d7ad575bcb77c75f73662a83912936b2664a2b1cd7c331e4d203c4f SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809
-DIST gst-plugins-good-1.12.4.tar.xz 3489992 BLAKE2B 41715d3e9bda183706d87085bc8cca546720f20e32fd5ecf6e284814745f2fe8ba4cfcd244e50d0734e57dde26944539b8273879608d3042262bfc10f82cc2b9 SHA512 18f270c01be80fe5b026e2c26db3ec200117ffd99c1dca55a8a78f0bd6dcc4701126836e52a410f179779e363f11218413c7b4d13e96ef5ee1bfa82e79a81178
 DIST gst-plugins-good-1.14.1.tar.xz 3776168 BLAKE2B 5b17ac49d5bae423ee887f1516ba8bfb542acb17e3f304f489dddbaa728761ee51a08e67bd10a9981f53b5b8424d8013d1723fcbbf6e06d34a39548868d34f85 SHA512 b52d3214f2d32f263637cb9f0838284483e15b8d20bf36d64c349e99b481095734a4dd2c2421176540dfe5129ecc1acc101b89cc898b4773f0f736e8e962b070
 DIST gst-plugins-good-1.14.2.tar.xz 3779912 BLAKE2B d49f82a6be7423d233ec15660470533d6bfc5da3d2ac5912ce7b3f97739b1540424c02593aff269aae3df7c6f15ca37b2d9d45fe85f3b36b910cdac4ba98f093 SHA512 26ff40d949ab95043ed717350fb344a616c72b049cd52c3e7debd9cc37f73eb9d4704b4f437ba257cecb9dba702ce451647279cb821e9405b36210b46ae9aa05
 DIST gst-plugins-good-1.14.3.tar.xz 3790052 BLAKE2B 14f4116ce3eeb20f1f2cc8e835e46a9444ef82291aad90b74e74d0e79c1974bb6f2373f79543a3a3235773c954bd9def67a9e6c64522035fa65e1541695d34e1 SHA512 1077d4ac7332a4bfd58fe5be53104e1404c3a688769520650c030488a184e64a43b301fc1f1d687de668143f849a23cb0ba2b417cf284d20710b9cf32d792e45
+DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 EBUILD gst-plugins-flac-0.10.31-r1.ebuild 402 BLAKE2B 7dbf745b4d3d9d276df3ca7ea6688b38bb44abd7f32babeacb64ac49bc52f05e73759a89fb53706bcdbcaf66b81fc96fa87dd5e61eb5351c12f69f54626c0873 SHA512 1d0231e51a2320544cb5ff13381b288693f6c43136ebf5452ef3ce46755fe0b4ed976a678d09cb2e4eabff13d3aa1f6b8b28c67b1cf26de93c5111944805474f
-EBUILD gst-plugins-flac-1.12.4.ebuild 414 BLAKE2B 91cc0e95de205d25054b4fee1bc3f889bf4c2e296aa12695dc3393343bf379d546a9e855e6dd6af768983eeceab882ead34b55ba928a0d36d3e0df328ce9775c SHA512 b5b736df81993668aa8aebdc9ec61a066d4b398639de376943fa152df264bc8d1e4ec6fa6a67cc3f21592a51af0945d3a5aa49191fc5e2c3abaa00e1d67d3e9c
 EBUILD gst-plugins-flac-1.14.1.ebuild 414 BLAKE2B 91cc0e95de205d25054b4fee1bc3f889bf4c2e296aa12695dc3393343bf379d546a9e855e6dd6af768983eeceab882ead34b55ba928a0d36d3e0df328ce9775c SHA512 b5b736df81993668aa8aebdc9ec61a066d4b398639de376943fa152df264bc8d1e4ec6fa6a67cc3f21592a51af0945d3a5aa49191fc5e2c3abaa00e1d67d3e9c
 EBUILD gst-plugins-flac-1.14.2.ebuild 421 BLAKE2B ebadfce00b7663e6af57c29b865748efbe00b45f52edae361ec00ba16f74fbb5d402eb5f5c0562133ac843c0d4be6f61ef7f858c2386b2bde3f2f9585496f427 SHA512 02d76b122b2e8c5c7e28e721a2b83ccd9500e20f8df5cf0645c7b78bb12d9c8aa1bf945c660ea5ce40f071f5760331cb3e027c70347fde59381ed604ee1d5fce
 EBUILD gst-plugins-flac-1.14.3.ebuild 421 BLAKE2B ebadfce00b7663e6af57c29b865748efbe00b45f52edae361ec00ba16f74fbb5d402eb5f5c0562133ac843c0d4be6f61ef7f858c2386b2bde3f2f9585496f427 SHA512 02d76b122b2e8c5c7e28e721a2b83ccd9500e20f8df5cf0645c7b78bb12d9c8aa1bf945c660ea5ce40f071f5760331cb3e027c70347fde59381ed604ee1d5fce
+EBUILD gst-plugins-flac-1.14.4.ebuild 418 BLAKE2B ecf5f86a671eaa69e41deaf6c46b8fdfc2c81771f9f9f14e1738c4c8fd9707dae17b88ba693575ec7d42892cd15e4779041fff3e1d3e2134e11edaae365f8236 SHA512 8aadfc49fc9a2e471620391b24223ac8fb15844c6bb979a1995e25a97dd7ea129f8c3e457d6ba6217fcb6058b31087ce1ecafce7ce9033ad86afca19e663ff4d
 MISC metadata.xml 555 BLAKE2B 0a6c97712429505d543caaa732d716a95e4f6f5256aeb202da38bd2399ceb335e1fc6079279c96848d479d3fa3e2b8bb1c92b37ba284204b1936078d0175caf3 SHA512 2ffe5f5f8ef59e30a7da2efe1b5e88858c5f27776b7f48a7748f9cd72a18d5c97ddb239609c7bab808de874f0a51bf886ec24e395641fac995c8d3f041271e7d
diff --git a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.12.4.ebuild b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.12.4.ebuild
deleted file mode 100644
index becdda82122d..000000000000
--- a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.12.4.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
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer
-
-DESCRIPTION="FLAC encoder/decoder/tagger plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.14.4.ebuild b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.14.4.ebuild
new file mode 100644
index 000000000000..2907e2ecd184
--- /dev/null
+++ b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.14.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="FLAC encoder/decoder/tagger plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-gdkpixbuf/Manifest b/media-plugins/gst-plugins-gdkpixbuf/Manifest
index 28b4e386ef99..93c90500ee2a 100644
--- a/media-plugins/gst-plugins-gdkpixbuf/Manifest
+++ b/media-plugins/gst-plugins-gdkpixbuf/Manifest
@@ -1,11 +1,11 @@
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 BLAKE2B a015ef6993078f1c699badcc9911a835fe1d129b4e0dccb3937d49768d9202549204bbfb0d7ad575bcb77c75f73662a83912936b2664a2b1cd7c331e4d203c4f SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809
-DIST gst-plugins-good-1.12.4.tar.xz 3489992 BLAKE2B 41715d3e9bda183706d87085bc8cca546720f20e32fd5ecf6e284814745f2fe8ba4cfcd244e50d0734e57dde26944539b8273879608d3042262bfc10f82cc2b9 SHA512 18f270c01be80fe5b026e2c26db3ec200117ffd99c1dca55a8a78f0bd6dcc4701126836e52a410f179779e363f11218413c7b4d13e96ef5ee1bfa82e79a81178
 DIST gst-plugins-good-1.14.1.tar.xz 3776168 BLAKE2B 5b17ac49d5bae423ee887f1516ba8bfb542acb17e3f304f489dddbaa728761ee51a08e67bd10a9981f53b5b8424d8013d1723fcbbf6e06d34a39548868d34f85 SHA512 b52d3214f2d32f263637cb9f0838284483e15b8d20bf36d64c349e99b481095734a4dd2c2421176540dfe5129ecc1acc101b89cc898b4773f0f736e8e962b070
 DIST gst-plugins-good-1.14.2.tar.xz 3779912 BLAKE2B d49f82a6be7423d233ec15660470533d6bfc5da3d2ac5912ce7b3f97739b1540424c02593aff269aae3df7c6f15ca37b2d9d45fe85f3b36b910cdac4ba98f093 SHA512 26ff40d949ab95043ed717350fb344a616c72b049cd52c3e7debd9cc37f73eb9d4704b4f437ba257cecb9dba702ce451647279cb821e9405b36210b46ae9aa05
 DIST gst-plugins-good-1.14.3.tar.xz 3790052 BLAKE2B 14f4116ce3eeb20f1f2cc8e835e46a9444ef82291aad90b74e74d0e79c1974bb6f2373f79543a3a3235773c954bd9def67a9e6c64522035fa65e1541695d34e1 SHA512 1077d4ac7332a4bfd58fe5be53104e1404c3a688769520650c030488a184e64a43b301fc1f1d687de668143f849a23cb0ba2b417cf284d20710b9cf32d792e45
+DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 EBUILD gst-plugins-gdkpixbuf-0.10.31-r1.ebuild 476 BLAKE2B 3ce84c6bd9e0ae6d0bd7d948e32c4ad63b7f42abe7bebc865010202cdce9c139f9829f6a435be21ba01b8ca78d18b8dc11c187923d2ef58c6db7e0d1b8bc4393 SHA512 a5fcb6e80f02bb9695d8dbad1333aa63ef3a9d24da2bc2f6dc2074f69a5a74369567f4652899837ea496ee2018090f2bb6c86495db045af2e1e8b0ad531d64b6
-EBUILD gst-plugins-gdkpixbuf-1.12.4.ebuild 481 BLAKE2B 2f2530f7d09003a651af7f49c126177a2f3f62b3d8501ffde53b038f8ae3bbb2b4fbbfa037b5227f591fc71a10cc842a31dc0ac6de5ad4c39b6825e58e674846 SHA512 e4c61e725b032215fa32213f6c13698c40477921d039fbb89253f4250ed3d436aa509534b7836f39e7258c13a12e16d94cf052f9494d1b6b94c66dbd7f8c6d6d
 EBUILD gst-plugins-gdkpixbuf-1.14.1.ebuild 481 BLAKE2B 2f2530f7d09003a651af7f49c126177a2f3f62b3d8501ffde53b038f8ae3bbb2b4fbbfa037b5227f591fc71a10cc842a31dc0ac6de5ad4c39b6825e58e674846 SHA512 e4c61e725b032215fa32213f6c13698c40477921d039fbb89253f4250ed3d436aa509534b7836f39e7258c13a12e16d94cf052f9494d1b6b94c66dbd7f8c6d6d
 EBUILD gst-plugins-gdkpixbuf-1.14.2.ebuild 488 BLAKE2B ba4f2f6dce3800b22ed92e5e85a765cddfe10f0b438f79a34cb56da948958525d7dccf70d6b5183b557b53ee8952bf6b7f33c1baf76a33c7157dd03188ecf92d SHA512 ff437e7b969fd523e3b3c3fe8f52f3ffdb582cbcb6aa61d51091ed8c270b446dfeba68125581da60f5d81c9a482e04117992c02ccef9cc02ec8754d97531054c
 EBUILD gst-plugins-gdkpixbuf-1.14.3.ebuild 488 BLAKE2B ba4f2f6dce3800b22ed92e5e85a765cddfe10f0b438f79a34cb56da948958525d7dccf70d6b5183b557b53ee8952bf6b7f33c1baf76a33c7157dd03188ecf92d SHA512 ff437e7b969fd523e3b3c3fe8f52f3ffdb582cbcb6aa61d51091ed8c270b446dfeba68125581da60f5d81c9a482e04117992c02ccef9cc02ec8754d97531054c
+EBUILD gst-plugins-gdkpixbuf-1.14.4.ebuild 485 BLAKE2B 219a12fa5b8229e5d070a528f739e86699557d00d2eede63f7690cee6508a4d320ec3c9a01e32a4dab480e2825c4cb8a31c745f2971a8f80c1f806cf406b2e35 SHA512 6eae398b1b67156b5e425a91de7ed1c5b94371689e87df5e15a78151328d0701cffb01ef694191d7f2f10e319b90251b3618de29473fb9ad1dce34e51a51e45d
 MISC metadata.xml 610 BLAKE2B e0597a0e835fd058d1d172bef6cb6616efbd83b3f97e9b9d644afa6a68956dc97b37385ba7b5996468911f9da16e54b2dec18d9657ad8b1b6a4dcd71cb229f7e SHA512 472dddb540087c89be5a85ab67733d345bf039a95fc1a7bd2ec6ce3b08b8556b2676af77b93ee903bc8ace178963935b21dfcfc6c1c0a6ecab5a7429d60e5cbd
diff --git a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.12.4.ebuild b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.12.4.ebuild
deleted file mode 100644
index 93eec26ed984..000000000000
--- a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.12.4.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
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer
-
-DESCRIPION="Image decoder, overlay and sink plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-libs/gdk-pixbuf-2.30.7:2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-GST_PLUGINS_BUILD="gdk_pixbuf"
-GST_PLUGINS_BUILD_DIR="gdk_pixbuf"
diff --git a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.14.4.ebuild b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.14.4.ebuild
new file mode 100644
index 000000000000..e7740d4c4355
--- /dev/null
+++ b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.14.4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPION="Image decoder, overlay and sink plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-libs/gdk-pixbuf-2.30.7:2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+GST_PLUGINS_BUILD="gdk_pixbuf"
+GST_PLUGINS_BUILD_DIR="gdk_pixbuf"
diff --git a/media-plugins/gst-plugins-gtk/Manifest b/media-plugins/gst-plugins-gtk/Manifest
index 30284233482f..f6a39cfafa75 100644
--- a/media-plugins/gst-plugins-gtk/Manifest
+++ b/media-plugins/gst-plugins-gtk/Manifest
@@ -1,7 +1,9 @@
 DIST gst-plugins-good-1.14.1.tar.xz 3776168 BLAKE2B 5b17ac49d5bae423ee887f1516ba8bfb542acb17e3f304f489dddbaa728761ee51a08e67bd10a9981f53b5b8424d8013d1723fcbbf6e06d34a39548868d34f85 SHA512 b52d3214f2d32f263637cb9f0838284483e15b8d20bf36d64c349e99b481095734a4dd2c2421176540dfe5129ecc1acc101b89cc898b4773f0f736e8e962b070
 DIST gst-plugins-good-1.14.2.tar.xz 3779912 BLAKE2B d49f82a6be7423d233ec15660470533d6bfc5da3d2ac5912ce7b3f97739b1540424c02593aff269aae3df7c6f15ca37b2d9d45fe85f3b36b910cdac4ba98f093 SHA512 26ff40d949ab95043ed717350fb344a616c72b049cd52c3e7debd9cc37f73eb9d4704b4f437ba257cecb9dba702ce451647279cb821e9405b36210b46ae9aa05
 DIST gst-plugins-good-1.14.3.tar.xz 3790052 BLAKE2B 14f4116ce3eeb20f1f2cc8e835e46a9444ef82291aad90b74e74d0e79c1974bb6f2373f79543a3a3235773c954bd9def67a9e6c64522035fa65e1541695d34e1 SHA512 1077d4ac7332a4bfd58fe5be53104e1404c3a688769520650c030488a184e64a43b301fc1f1d687de668143f849a23cb0ba2b417cf284d20710b9cf32d792e45
+DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 EBUILD gst-plugins-gtk-1.14.1.ebuild 1202 BLAKE2B 63e3b1bf3a73c76370e5ea6928374bc78ff118d07fa09a00240754df2051f598887d936a15c5b16f1bde256d42db93badc1e8450aa7e929032a0f5725e46a96e SHA512 593a50c5d12ab7f789a89af7f6540927aebc8e4bb2eecf25d81b699ac21abb8197d6ab7f2ec2191cee22b26fe71127132525b7626d78252ebed4f042f6b23d90
 EBUILD gst-plugins-gtk-1.14.2.ebuild 1209 BLAKE2B afeaa42b77a0240d8f864c42c0b777d238328c2ddee0e99b117113fefa4fd889638d81a28a637f70ca492ded2b5afff4aa0cd1929d617f458df11847e9fe37c8 SHA512 fd99894768d7a90489dd9a227b9298aa1c4f6e933a23fafdbce2b693e63a48f31d6c7677a11f684ca80fdb05841043fe10e63faa5bce1c013c725da71b2f62de
 EBUILD gst-plugins-gtk-1.14.3.ebuild 1209 BLAKE2B afeaa42b77a0240d8f864c42c0b777d238328c2ddee0e99b117113fefa4fd889638d81a28a637f70ca492ded2b5afff4aa0cd1929d617f458df11847e9fe37c8 SHA512 fd99894768d7a90489dd9a227b9298aa1c4f6e933a23fafdbce2b693e63a48f31d6c7677a11f684ca80fdb05841043fe10e63faa5bce1c013c725da71b2f62de
+EBUILD gst-plugins-gtk-1.14.4.ebuild 1206 BLAKE2B d1e34540bf91b5815361a531b89bd5836899a92adc17dd08af6e4ed768f89cc4ce1722150b654fc173fa26a7934d92833144039b2c5abead2ae76905994fe6e6 SHA512 53bda0b86c69da20d064c8bb83facc1d3f9746f753ea908b79bbef3f7259a3201e2c71d15be32064a1943c070bf0ef0b28a6d3c689f21e3716e5b8495e14a058
 MISC metadata.xml 790 BLAKE2B 609210afdad563f5d63ea609ac6a65301907d447a137537aa9451ce6bf5774f9a15a8294a4e11b72697e123a4ffac44cefa5f6cf820a78bd998cd581e7ec720b SHA512 8ca80354a5c57ccbc941bc62cd7fc1b3bfbd2223901c24afac0ade01ab751e790cf9bafc4e0d4a3074606be99ac7aae10a45a9f7c65068342495f2995c956fa5
diff --git a/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.14.4.ebuild b/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.14.4.ebuild
new file mode 100644
index 000000000000..44daa32a0fb5
--- /dev/null
+++ b/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.14.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="Video sink plugin for GStreamer that renders to a GtkWidget"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="+egl gles2 +opengl wayland +X" # Keep default IUSE mirrored with gst-plugins-base
+# egl, wayland and X only matters if gst-plugins-bad is build with USE=opengl and/or USE=gles2
+# We mirror egl/gles2/opengl/wayland/X due to automagic detection from gstreamer-gl.pc variables;
+# we don't care about matching egl/wayland/X if both opengl and gles2 are disabled here and on
+# gst-plugins-base, but no way to express that.
+
+# We only need gtk+ matching backend flags when GL is enabled
+GL_DEPS="
+	>=x11-libs/gtk+-3.15:3[X?,wayland?,${MULTILIB_USEDEP}]
+"
+RDEPEND="
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},egl=,gles2=,opengl=,wayland=,X=]
+	>=x11-libs/gtk+-3.15:3[${MULTILIB_USEDEP}]
+	gles2? ( ${GL_DEPS} )
+	opengl? ( ${GL_DEPS} )
+
+	!<media-libs/gst-plugins-bad-1.13.1:1.0
+"
+DEPEND="${RDEPEND}"
+
+GST_PLUGINS_BUILD="gtk3"
diff --git a/media-plugins/gst-plugins-jack/Manifest b/media-plugins/gst-plugins-jack/Manifest
index 869a5163a5f6..a62308606e28 100644
--- a/media-plugins/gst-plugins-jack/Manifest
+++ b/media-plugins/gst-plugins-jack/Manifest
@@ -1,11 +1,11 @@
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 BLAKE2B a015ef6993078f1c699badcc9911a835fe1d129b4e0dccb3937d49768d9202549204bbfb0d7ad575bcb77c75f73662a83912936b2664a2b1cd7c331e4d203c4f SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809
-DIST gst-plugins-good-1.12.4.tar.xz 3489992 BLAKE2B 41715d3e9bda183706d87085bc8cca546720f20e32fd5ecf6e284814745f2fe8ba4cfcd244e50d0734e57dde26944539b8273879608d3042262bfc10f82cc2b9 SHA512 18f270c01be80fe5b026e2c26db3ec200117ffd99c1dca55a8a78f0bd6dcc4701126836e52a410f179779e363f11218413c7b4d13e96ef5ee1bfa82e79a81178
 DIST gst-plugins-good-1.14.1.tar.xz 3776168 BLAKE2B 5b17ac49d5bae423ee887f1516ba8bfb542acb17e3f304f489dddbaa728761ee51a08e67bd10a9981f53b5b8424d8013d1723fcbbf6e06d34a39548868d34f85 SHA512 b52d3214f2d32f263637cb9f0838284483e15b8d20bf36d64c349e99b481095734a4dd2c2421176540dfe5129ecc1acc101b89cc898b4773f0f736e8e962b070
 DIST gst-plugins-good-1.14.2.tar.xz 3779912 BLAKE2B d49f82a6be7423d233ec15660470533d6bfc5da3d2ac5912ce7b3f97739b1540424c02593aff269aae3df7c6f15ca37b2d9d45fe85f3b36b910cdac4ba98f093 SHA512 26ff40d949ab95043ed717350fb344a616c72b049cd52c3e7debd9cc37f73eb9d4704b4f437ba257cecb9dba702ce451647279cb821e9405b36210b46ae9aa05
 DIST gst-plugins-good-1.14.3.tar.xz 3790052 BLAKE2B 14f4116ce3eeb20f1f2cc8e835e46a9444ef82291aad90b74e74d0e79c1974bb6f2373f79543a3a3235773c954bd9def67a9e6c64522035fa65e1541695d34e1 SHA512 1077d4ac7332a4bfd58fe5be53104e1404c3a688769520650c030488a184e64a43b301fc1f1d687de668143f849a23cb0ba2b417cf284d20710b9cf32d792e45
+DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 EBUILD gst-plugins-jack-0.10.31-r1.ebuild 422 BLAKE2B 7a4fcaf73634137d42bc94a80823c18159092d0fdac3b5bded55777c2c8724073f0eba785b6a41403dff2e328b3ad818f20785b920b35562431841f30979c6d0 SHA512 3cc92fbb1b8d6c8b9a0a1307f3148df3779cd711cd66f5221e75118da6393697d086f6f27364a36fe37ce95f79ffbfb13517a51575c06ba130a2740109375105
-EBUILD gst-plugins-jack-1.12.4.ebuild 381 BLAKE2B 024a1bcf30ad5505909092d2ff06cef4c19b70b32bb7c6a3ccf8c420f1fc291ce2375fc3153ce49553394e8279091020bbf3b0b0994d5887e44452f840321b2d SHA512 95a04726aa6568f05e48d104fcbe0a708be9667b8552d4b7cd1d60b456a3249e7a6eed429849b618924a40acb89c5f31ee9cfd6bff9a8df33a50cc3bf4e32e66
 EBUILD gst-plugins-jack-1.14.1.ebuild 381 BLAKE2B 024a1bcf30ad5505909092d2ff06cef4c19b70b32bb7c6a3ccf8c420f1fc291ce2375fc3153ce49553394e8279091020bbf3b0b0994d5887e44452f840321b2d SHA512 95a04726aa6568f05e48d104fcbe0a708be9667b8552d4b7cd1d60b456a3249e7a6eed429849b618924a40acb89c5f31ee9cfd6bff9a8df33a50cc3bf4e32e66
 EBUILD gst-plugins-jack-1.14.2.ebuild 388 BLAKE2B 03424ac05558f94342d9c6c6dcf4bbddec357d53bc2310a220e4b6c136d845aa64dda8408490d2b215fea557bb4a8e22f1e7c252da8b5c76d1bba6f1e8d9b594 SHA512 7ea915c6c62f3276414aaa9482eddc5dbc1cf78d99fc76c2e02ae0bbf773bc39b279efc7905b49932bdc09b36a3566411cd65e72072726fafd9a8e703d77def5
 EBUILD gst-plugins-jack-1.14.3.ebuild 388 BLAKE2B 03424ac05558f94342d9c6c6dcf4bbddec357d53bc2310a220e4b6c136d845aa64dda8408490d2b215fea557bb4a8e22f1e7c252da8b5c76d1bba6f1e8d9b594 SHA512 7ea915c6c62f3276414aaa9482eddc5dbc1cf78d99fc76c2e02ae0bbf773bc39b279efc7905b49932bdc09b36a3566411cd65e72072726fafd9a8e703d77def5
+EBUILD gst-plugins-jack-1.14.4.ebuild 385 BLAKE2B 9d1d65dbe3b53a1dc66ab474832ba278674db911316568041806f857f4da0f34f20d751661bccfb75003adc207da33d965838d8fc9924fed5b470d2fc6a78bde SHA512 1ea7ffc0d484f72420e934ce5a78511d302382dcb55cc7b53bcef88ea9ca9fda8ffc70fbb969646246398dfa18a199177007e33b5e5ecd1c474c0d2be0e8b646
 MISC metadata.xml 487 BLAKE2B 182c55b79c188f12dcc000cecf9c507933183ab62a78c806b6f43918af528c1c7bf3adf435ad077f689a2b64706b7517b14393500dc4d1b7f2cc14b45dd6b764 SHA512 811374b3dabbff1084c5b1b6fb502197f58da02da195b922ce7556ca6e0f3668f266a14ba1a03ff352edb89a0cff9550e7d59f3f4e116ff63a22c6e8436ef6b8
diff --git a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.12.4.ebuild b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.12.4.ebuild
deleted file mode 100644
index 32af0f736361..000000000000
--- a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.12.4.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
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer
-
-DESCRIPION="JACK audio server source/sink plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd"
-IUSE=""
-
-RDEPEND="virtual/jack[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.14.4.ebuild b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.14.4.ebuild
new file mode 100644
index 000000000000..c9604c40cdeb
--- /dev/null
+++ b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.14.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPION="JACK audio server source/sink plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND="virtual/jack[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-jpeg/Manifest b/media-plugins/gst-plugins-jpeg/Manifest
index 9e271a57b255..9fbbcec5c590 100644
--- a/media-plugins/gst-plugins-jpeg/Manifest
+++ b/media-plugins/gst-plugins-jpeg/Manifest
@@ -1,11 +1,11 @@
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 BLAKE2B a015ef6993078f1c699badcc9911a835fe1d129b4e0dccb3937d49768d9202549204bbfb0d7ad575bcb77c75f73662a83912936b2664a2b1cd7c331e4d203c4f SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809
-DIST gst-plugins-good-1.12.4.tar.xz 3489992 BLAKE2B 41715d3e9bda183706d87085bc8cca546720f20e32fd5ecf6e284814745f2fe8ba4cfcd244e50d0734e57dde26944539b8273879608d3042262bfc10f82cc2b9 SHA512 18f270c01be80fe5b026e2c26db3ec200117ffd99c1dca55a8a78f0bd6dcc4701126836e52a410f179779e363f11218413c7b4d13e96ef5ee1bfa82e79a81178
 DIST gst-plugins-good-1.14.1.tar.xz 3776168 BLAKE2B 5b17ac49d5bae423ee887f1516ba8bfb542acb17e3f304f489dddbaa728761ee51a08e67bd10a9981f53b5b8424d8013d1723fcbbf6e06d34a39548868d34f85 SHA512 b52d3214f2d32f263637cb9f0838284483e15b8d20bf36d64c349e99b481095734a4dd2c2421176540dfe5129ecc1acc101b89cc898b4773f0f736e8e962b070
 DIST gst-plugins-good-1.14.2.tar.xz 3779912 BLAKE2B d49f82a6be7423d233ec15660470533d6bfc5da3d2ac5912ce7b3f97739b1540424c02593aff269aae3df7c6f15ca37b2d9d45fe85f3b36b910cdac4ba98f093 SHA512 26ff40d949ab95043ed717350fb344a616c72b049cd52c3e7debd9cc37f73eb9d4704b4f437ba257cecb9dba702ce451647279cb821e9405b36210b46ae9aa05
 DIST gst-plugins-good-1.14.3.tar.xz 3790052 BLAKE2B 14f4116ce3eeb20f1f2cc8e835e46a9444ef82291aad90b74e74d0e79c1974bb6f2373f79543a3a3235773c954bd9def67a9e6c64522035fa65e1541695d34e1 SHA512 1077d4ac7332a4bfd58fe5be53104e1404c3a688769520650c030488a184e64a43b301fc1f1d687de668143f849a23cb0ba2b417cf284d20710b9cf32d792e45
+DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 EBUILD gst-plugins-jpeg-0.10.31-r1.ebuild 426 BLAKE2B b6689d5335b662aeed278f862e6cbae10463ebaf789768e18d9eeb4728f32c07b4b9600cffd45d26baac82944bdd4c4bdc3dea25d1d4e3991e63da27c0845c9e SHA512 585c281477672f655746d9b0872b825c7cfffdf839ea9940c8c5bb0318aff5a2e4c0284f3c136ba828019170de8824535b5ef8107c885fdcac2cfd6fbfb0b2da
-EBUILD gst-plugins-jpeg-1.12.4.ebuild 376 BLAKE2B 2fd674337aaa61ae88a20d48f3d260b059695b92f0178e011767a3a4ad2c2dd366c338f0a02998d0d4f4424810bb8a9244a1238a3561c221803c6fb0c9db0f9c SHA512 3d98f64e2443bc786c3626894685c193eba597768446032b1e30aa41ea09b0c830f233c5aca27b3941a71d5e9d7095ec960777e46ccd06920c6852212295a26d
 EBUILD gst-plugins-jpeg-1.14.1.ebuild 376 BLAKE2B 2fd674337aaa61ae88a20d48f3d260b059695b92f0178e011767a3a4ad2c2dd366c338f0a02998d0d4f4424810bb8a9244a1238a3561c221803c6fb0c9db0f9c SHA512 3d98f64e2443bc786c3626894685c193eba597768446032b1e30aa41ea09b0c830f233c5aca27b3941a71d5e9d7095ec960777e46ccd06920c6852212295a26d
 EBUILD gst-plugins-jpeg-1.14.2.ebuild 383 BLAKE2B 8f53b6b07d8f23a53a438d08fd3052fa7ea268aeba8a599ca1019464a9a8bc174930311a620f106b37ecf4eb8c8a93bc2c0dd483f6a5a74ee905bde04cbce1a3 SHA512 2ad02b6fa2326165d5d180f444401781514873a4033f2371436f1e26705975c635f3d922c8381940072f5b21cfbdf0767b4f410cfc853553da54283bc15f6450
 EBUILD gst-plugins-jpeg-1.14.3.ebuild 383 BLAKE2B 8f53b6b07d8f23a53a438d08fd3052fa7ea268aeba8a599ca1019464a9a8bc174930311a620f106b37ecf4eb8c8a93bc2c0dd483f6a5a74ee905bde04cbce1a3 SHA512 2ad02b6fa2326165d5d180f444401781514873a4033f2371436f1e26705975c635f3d922c8381940072f5b21cfbdf0767b4f410cfc853553da54283bc15f6450
+EBUILD gst-plugins-jpeg-1.14.4.ebuild 380 BLAKE2B 3af436bd65f995311a35fa8bba8923a2b88eece248eda30bd6164944a860a99b4ce96823780faee47bc4315cd4047ac639aeeeace77fba351b8997ab6c74127d SHA512 3daf523bc058ec7195ac52c69b698cc2c5d7f9a8efea0254a7021e4943615cf04310aacdea0ebc2d7f7ef9ab8344c871302287b426514fcc9d4b89139668c7af
 MISC metadata.xml 659 BLAKE2B 8da81502aaf3eecb4ef62469b494598b329cb7e134511df9bd4269807882564e052ec76ddb50640203d96c08fa80deb3cb96d2b2c3c8dfae21fe296b87351ff5 SHA512 c4d076bdd3a4cf70540a9cc56c91a8e805f0a809065b629970158ca002f3cc03f3b7b91615121813030f510eb2e9a912aa4ca79504a20e023cc36f1fa3acf329
diff --git a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.12.4.ebuild b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.12.4.ebuild
deleted file mode 100644
index 0c798e64b54e..000000000000
--- a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.12.4.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
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer
-
-DESCRIPTION="JPEG image encoder/decoder plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.14.4.ebuild b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.14.4.ebuild
new file mode 100644
index 000000000000..7ec0777d83df
--- /dev/null
+++ b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.14.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="JPEG image encoder/decoder plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-lame/Manifest b/media-plugins/gst-plugins-lame/Manifest
index e68cf1cfd0de..e06a34ce154c 100644
--- a/media-plugins/gst-plugins-lame/Manifest
+++ b/media-plugins/gst-plugins-lame/Manifest
@@ -1,9 +1,11 @@
 DIST gst-plugins-good-1.14.1.tar.xz 3776168 BLAKE2B 5b17ac49d5bae423ee887f1516ba8bfb542acb17e3f304f489dddbaa728761ee51a08e67bd10a9981f53b5b8424d8013d1723fcbbf6e06d34a39548868d34f85 SHA512 b52d3214f2d32f263637cb9f0838284483e15b8d20bf36d64c349e99b481095734a4dd2c2421176540dfe5129ecc1acc101b89cc898b4773f0f736e8e962b070
 DIST gst-plugins-good-1.14.2.tar.xz 3779912 BLAKE2B d49f82a6be7423d233ec15660470533d6bfc5da3d2ac5912ce7b3f97739b1540424c02593aff269aae3df7c6f15ca37b2d9d45fe85f3b36b910cdac4ba98f093 SHA512 26ff40d949ab95043ed717350fb344a616c72b049cd52c3e7debd9cc37f73eb9d4704b4f437ba257cecb9dba702ce451647279cb821e9405b36210b46ae9aa05
 DIST gst-plugins-good-1.14.3.tar.xz 3790052 BLAKE2B 14f4116ce3eeb20f1f2cc8e835e46a9444ef82291aad90b74e74d0e79c1974bb6f2373f79543a3a3235773c954bd9def67a9e6c64522035fa65e1541695d34e1 SHA512 1077d4ac7332a4bfd58fe5be53104e1404c3a688769520650c030488a184e64a43b301fc1f1d687de668143f849a23cb0ba2b417cf284d20710b9cf32d792e45
+DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 DIST gst-plugins-ugly-0.10.19.tar.xz 882452 BLAKE2B df5319481ade22d7acdee6e22ca57a444e104c8540bc4b578cfe7554c79bb4ee33b23a8516940f6504c30d9403c4ced2434e11f3a48548c3721d3d3db2016757 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda
 EBUILD gst-plugins-lame-0.10.19-r1.ebuild 338 BLAKE2B d38330bec07d66569e856ee0f5c36e51cb5a086df745aa71161c442175a00f03fe5d33937bb40a6a1c46e38698061a94acaed332287e1d71686a1e88c1245a5d SHA512 13a168e21fdd2b0651d93d45689b5447b60f47bb98d6c43a2c0de7a4007fa6bef2847df7a2cd881a72655b003034cefcdddf154130cb769ddc5aa91d5ca61455
 EBUILD gst-plugins-lame-1.14.1.ebuild 398 BLAKE2B e0cf2ef0bf9848fe2de288374c2d72e380f96e76bcedbd3654a95dba671f384444b611f50af93fc779c8d1c530292c06353dd4c7804e0738bdd2b68090eab4e0 SHA512 d5ffb8e63d9fb9107d264f75c1a8f686102c64ebd136f8ffb84c91afb34f17771df3d61bfd878239f3bbaecad378a57a5610b6127f8331251c87015e54b06602
 EBUILD gst-plugins-lame-1.14.2.ebuild 403 BLAKE2B 33cafc621c78e3c7282c0148a50bec2253f65e1367f5e57ac511c20f8a10c8f2fe5aabfbf7e13eac64c3f19a3778024a89108084f378c0a53b3900299cfd8345 SHA512 6aef0c39f5f26cc8600c52e8c3264c06d65712f51e484da94587bc7fe836350aa9e16f67076d7b28a4add105de5671878df13e185113d409fb20c7629e585cb5
 EBUILD gst-plugins-lame-1.14.3.ebuild 403 BLAKE2B 33cafc621c78e3c7282c0148a50bec2253f65e1367f5e57ac511c20f8a10c8f2fe5aabfbf7e13eac64c3f19a3778024a89108084f378c0a53b3900299cfd8345 SHA512 6aef0c39f5f26cc8600c52e8c3264c06d65712f51e484da94587bc7fe836350aa9e16f67076d7b28a4add105de5671878df13e185113d409fb20c7629e585cb5
+EBUILD gst-plugins-lame-1.14.4.ebuild 400 BLAKE2B 4d6c2cd32bc1a2f9e876d27f9bcd57ba7a8e381a6d5e92fc13a0e64e36b2aab29556e0e02aaee662d1a790fbe777558808b1ef4aaf20860373d2fa0be1b74869 SHA512 c2c9ec23aaf3199ae8e3cfae81a7b7fc6077be5d9a84b96864b672e164e2bc40054755f725fe89571f6b8a2e3499b24af293fd472540872320589dce5940ee0c
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-lame/gst-plugins-lame-1.14.4.ebuild b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.14.4.ebuild
new file mode 100644
index 000000000000..2aa75463d136
--- /dev/null
+++ b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.14.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="MP3 encoder plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-libpng/Manifest b/media-plugins/gst-plugins-libpng/Manifest
index 5a56f69107dc..b5c437ab07ec 100644
--- a/media-plugins/gst-plugins-libpng/Manifest
+++ b/media-plugins/gst-plugins-libpng/Manifest
@@ -1,11 +1,11 @@
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 BLAKE2B a015ef6993078f1c699badcc9911a835fe1d129b4e0dccb3937d49768d9202549204bbfb0d7ad575bcb77c75f73662a83912936b2664a2b1cd7c331e4d203c4f SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809
-DIST gst-plugins-good-1.12.4.tar.xz 3489992 BLAKE2B 41715d3e9bda183706d87085bc8cca546720f20e32fd5ecf6e284814745f2fe8ba4cfcd244e50d0734e57dde26944539b8273879608d3042262bfc10f82cc2b9 SHA512 18f270c01be80fe5b026e2c26db3ec200117ffd99c1dca55a8a78f0bd6dcc4701126836e52a410f179779e363f11218413c7b4d13e96ef5ee1bfa82e79a81178
 DIST gst-plugins-good-1.14.1.tar.xz 3776168 BLAKE2B 5b17ac49d5bae423ee887f1516ba8bfb542acb17e3f304f489dddbaa728761ee51a08e67bd10a9981f53b5b8424d8013d1723fcbbf6e06d34a39548868d34f85 SHA512 b52d3214f2d32f263637cb9f0838284483e15b8d20bf36d64c349e99b481095734a4dd2c2421176540dfe5129ecc1acc101b89cc898b4773f0f736e8e962b070
 DIST gst-plugins-good-1.14.2.tar.xz 3779912 BLAKE2B d49f82a6be7423d233ec15660470533d6bfc5da3d2ac5912ce7b3f97739b1540424c02593aff269aae3df7c6f15ca37b2d9d45fe85f3b36b910cdac4ba98f093 SHA512 26ff40d949ab95043ed717350fb344a616c72b049cd52c3e7debd9cc37f73eb9d4704b4f437ba257cecb9dba702ce451647279cb821e9405b36210b46ae9aa05
 DIST gst-plugins-good-1.14.3.tar.xz 3790052 BLAKE2B 14f4116ce3eeb20f1f2cc8e835e46a9444ef82291aad90b74e74d0e79c1974bb6f2373f79543a3a3235773c954bd9def67a9e6c64522035fa65e1541695d34e1 SHA512 1077d4ac7332a4bfd58fe5be53104e1404c3a688769520650c030488a184e64a43b301fc1f1d687de668143f849a23cb0ba2b417cf284d20710b9cf32d792e45
+DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 EBUILD gst-plugins-libpng-0.10.31-r1.ebuild 361 BLAKE2B f52a7448f035e37a03d64a68e2119d73c42f0d20ed6331842ae68c7a37fde6220765f87222fe589288115fee1b63a7b3c5041db8171fa1f1801ea5afd6153c5d SHA512 2a43a507e1403266467bb352ab5de0746bbceedf1b9bf72d41a9f86410856f2b4f782acd3ca09b1cae9cc821d60d03508ef63b8d0b313550e650286577939365
-EBUILD gst-plugins-libpng-1.12.4.ebuild 366 BLAKE2B 0f3df80a0a6997889b5da7101deb4dc157360cb2bf342a432199a51bbc136a1b10100ec171c8713246d1b82ff627489902b0463c9d4ce5754f5f0eae148bbc35 SHA512 fe75cbf84a0ac798942749263e4d63ee9cf50365f0a3b3ce2809ed6c0b3f195f3bc0c1aec69b80c777480e4c0413053a3e1a7ab7d91d992fc445623b1394c16b
 EBUILD gst-plugins-libpng-1.14.1.ebuild 366 BLAKE2B 0f3df80a0a6997889b5da7101deb4dc157360cb2bf342a432199a51bbc136a1b10100ec171c8713246d1b82ff627489902b0463c9d4ce5754f5f0eae148bbc35 SHA512 fe75cbf84a0ac798942749263e4d63ee9cf50365f0a3b3ce2809ed6c0b3f195f3bc0c1aec69b80c777480e4c0413053a3e1a7ab7d91d992fc445623b1394c16b
 EBUILD gst-plugins-libpng-1.14.2.ebuild 371 BLAKE2B 2fb0fb7eb3a2d1fd4c4c09b024e0869b05e9723b7c3b1396a1aa14643cf376bb2959c4e58287ebc168c632e66e3aa4afeafeb2ee8e19f365d5c02bce01456506 SHA512 c2e742dea7c1392a8096f86eedc15c27e7565d828a98062f171befb0a2c68b7b80aaaf0d3c134f810aebc61b8d01925d27073c9e3a2896c2a0ae7f611c2c0e2e
 EBUILD gst-plugins-libpng-1.14.3.ebuild 371 BLAKE2B 2fb0fb7eb3a2d1fd4c4c09b024e0869b05e9723b7c3b1396a1aa14643cf376bb2959c4e58287ebc168c632e66e3aa4afeafeb2ee8e19f365d5c02bce01456506 SHA512 c2e742dea7c1392a8096f86eedc15c27e7565d828a98062f171befb0a2c68b7b80aaaf0d3c134f810aebc61b8d01925d27073c9e3a2896c2a0ae7f611c2c0e2e
+EBUILD gst-plugins-libpng-1.14.4.ebuild 368 BLAKE2B 79640720fe67fd075ec2e8c11c51accee4b775088804204244c9481c7a1a03ba18638c459d01b3ffaaf0c2510e79ff5d39e7a7461a6ecccb57c9c0f208aaeaf9 SHA512 8c6a858de2deef53482a8a6feb7d54404d1561ba18016b724565b143ea2ffea83d75a07b1b43df5f6b7c82a6bd01700228c9747414abc3ec28225d434c3031ca
 MISC metadata.xml 483 BLAKE2B 3c07bc4538ab8a6e0f2ca484f7b67a41d60f672714f17a1555eb2ebbcbbf14fe8e16f21360007789400352d3c1540c1644fd1402a12b639306a3068e5c9be822 SHA512 6d536bf8813f1f4d6b402487852ef1372172cb42c01d0a57af6b70166896deea5db36bed91f78ea18c1cdb8f809e5b5514f2b91a7668efeea170bee422d8a3a7
diff --git a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.12.4.ebuild b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.12.4.ebuild
deleted file mode 100644
index fcfb848ced11..000000000000
--- a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.12.4.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
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer
-
-DESCRIPTION="PNG image encoder/decoder plugin for GStreamer"
-KEYWORDS="alpha amd64 ~arm ppc ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.14.4.ebuild b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.14.4.ebuild
new file mode 100644
index 000000000000..6c1be1230d31
--- /dev/null
+++ b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.14.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="PNG image encoder/decoder plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-libvisual/Manifest b/media-plugins/gst-plugins-libvisual/Manifest
index 87db997499af..27b78bb4a486 100644
--- a/media-plugins/gst-plugins-libvisual/Manifest
+++ b/media-plugins/gst-plugins-libvisual/Manifest
@@ -1,11 +1,11 @@
 DIST gst-plugins-base-0.10.36.tar.xz 2364108 BLAKE2B a71ef5d5c7462d60937602681c060e85ed086a753b7ef354dad48354d6c3741d809f2c0c6a321ef9ac60fb12d24ec65e1baa63e51211134d2a5e03aae16f73d2 SHA512 ea77778e073515df58229a641b4363df31f0b80204a5a43a8feb31f0b03a5a4b9b79d6e07e1615c773a59927a9b649f1b1d782def1120d581d09a090be8363b8
-DIST gst-plugins-base-1.12.4.tar.xz 3119468 BLAKE2B d5ac157618a25c8f0323d1922d5b26b0b5c49f56cb75df3ceeadd0566f873be1a06c863a1da6afff40901fbbbeb1ec6cd6ef4614309ca7f7ff988c0fa9040a10 SHA512 89a6e92cd294612cf1406eb156416ab4606643f6b43637e64a18f6f28ab789ca8d4cf1308434ed85e5fc679c79cc3ca115db48f37e0065a6ab3cdfdbaaad9f53
 DIST gst-plugins-base-1.14.1.tar.xz 3689184 BLAKE2B 17abcab2c84b113180de55d6c781ae11feec66c215febfffefe4a22353c56e82a585647688e2078603b6c3ece6f26afa99969091a72886880a2f8549dd9cb379 SHA512 bca9db8780fe24c19a2c4eae9a16dc0856cb38077580e4344bd4f7fa9a7a03079b92556ff35475a574f624a5a721d80ef925790670e4cc809361ed01108a141e
 DIST gst-plugins-base-1.14.2.tar.xz 3693856 BLAKE2B 7ed05718bfd1dcb15e05e5a2c8758ad409c4ad7f331146363f264aaf7123c8a14c1db81f482710d1069d33e5281087f66e2e38504e39b214befba73ffdd9295c SHA512 35e7eb5c42fe265d38c433575f88d3306f15ff927a989eb375ed5399cbf92af2e9bf553d6eee349dc13673540cee00e1f879595f25e58c188ea443d8a969682f
 DIST gst-plugins-base-1.14.3.tar.xz 3702184 BLAKE2B 8b13cdcb912968ed51bba91faf70060cced562f374d2b6987a9b9ff9a261b553836394cc4dc16df299c21cb303fd87bb0becb57225767c3502c8c16359430523 SHA512 3b5f0dc46d148dd9f162c651594be740f798c1d6272ecabced544f09900b6f2909a9fc705d42e4e98130d6f7cb1368458bfeee27444b5c43e62551defbc3838a
+DIST gst-plugins-base-1.14.4.tar.xz 3703232 BLAKE2B b22c44b857bc4f1972f03752cc1afb35c8d76e2d0c4a06c574af0ac4f3a91080c584ae4e4fc2a263ee879a53d58505c24a756ebc051d81ec62661c4f9e532f0e SHA512 42c59df9f2d848108f12afa0466acbcfa5ccda64e4d0d44608d4268abed20f2e036713de04e7d71feaed1868ad742c5bcb55ae0eef5dec8e19e053dc8541b8af
 EBUILD gst-plugins-libvisual-0.10.36-r1.ebuild 517 BLAKE2B 613be0fe785b8e48de8cf992817fb9f3de264430efa63d9067921565af06abd13bfe06c7794e83dd011d4e86f87853a188348558076ce6f97a27228004ec0c6b SHA512 54c26a7c8f82a1e2c7fa1f7fece6112bed1d6205d188a1368c5e101641d81009361b28e67caa8daf827817bbfe33a260eed0fc747b78d9ce18d8dc2ff8f7d9c0
-EBUILD gst-plugins-libvisual-1.12.4.ebuild 630 BLAKE2B 4084a324e5630ba3f4d52fb7eec752ce7148fcfa958db0e58cb331ec987c32b9d3d762d7b996de5514a96714375365c7e2dd4dd165ad94892bc38d27f6f3850b SHA512 4566123585417a4ac83b9bb4373c19eea2186377aa9bd669ca8069477d624310bfdc78d0c3831719036f7db2da362305dc0237443071fe86512b5b30f3424325
 EBUILD gst-plugins-libvisual-1.14.1.ebuild 630 BLAKE2B 4084a324e5630ba3f4d52fb7eec752ce7148fcfa958db0e58cb331ec987c32b9d3d762d7b996de5514a96714375365c7e2dd4dd165ad94892bc38d27f6f3850b SHA512 4566123585417a4ac83b9bb4373c19eea2186377aa9bd669ca8069477d624310bfdc78d0c3831719036f7db2da362305dc0237443071fe86512b5b30f3424325
 EBUILD gst-plugins-libvisual-1.14.2.ebuild 634 BLAKE2B 5c7082ae57c90647b69a0a84afb8719e76849f0055ce92c48e3cb200fd9a5c6360273652fdfee216f434d275d9643186be58eba33fb589f4ca615de6e1bf30c8 SHA512 45af45a46abcfce980631994a8a32beff17d7bf4384a6af2d95547ae7ae6179246aa29bf7b6ee0fcc9408e3babd46ffd862c5601a7353b376970eabe73598c62
 EBUILD gst-plugins-libvisual-1.14.3.ebuild 634 BLAKE2B 5c7082ae57c90647b69a0a84afb8719e76849f0055ce92c48e3cb200fd9a5c6360273652fdfee216f434d275d9643186be58eba33fb589f4ca615de6e1bf30c8 SHA512 45af45a46abcfce980631994a8a32beff17d7bf4384a6af2d95547ae7ae6179246aa29bf7b6ee0fcc9408e3babd46ffd862c5601a7353b376970eabe73598c62
+EBUILD gst-plugins-libvisual-1.14.4.ebuild 631 BLAKE2B 9451e677cebff615a20b42431753f7b380e02fe16e8eade9536f2bcdfafc07b84bdee449763ae85c10a6a07a02ade0f45d600d3dcfd66c998b87ebe140f9a644 SHA512 00cbe0823560768b2ab3676dc217462641dcb60727b138ed6fdc46054da5fbb5253b9fd12e9e9b9a25916fcdf47d034f275b81010522482b1ccc3f8e35d38742
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.12.4.ebuild b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.12.4.ebuild
deleted file mode 100644
index ebfda4e73175..000000000000
--- a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.12.4.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
-GST_ORG_MODULE=gst-plugins-base
-
-inherit gstreamer
-
-DESCRIPTION="Visualization elements for GStreamer"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
-IUSE=""
-
-RDEPEND="
-	>=media-libs/libvisual-0.4.0-r3[${MULTILIB_USEDEP}]
-	>=media-plugins/libvisual-plugins-0.4.0-r3[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	gstreamer_system_link \
-		gst-libs/gst/audio:gstreamer-audio \
-		gst-libs/gst/video:gstreamer-video \
-		gst-libs/gst/pbutils:gstreamer-pbutils
-}
diff --git a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.14.4.ebuild b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.14.4.ebuild
new file mode 100644
index 000000000000..f3a65467a250
--- /dev/null
+++ b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.14.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-base
+
+inherit gstreamer
+
+DESCRIPTION="Visualization elements for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND="
+	>=media-libs/libvisual-0.4.0-r3[${MULTILIB_USEDEP}]
+	>=media-plugins/libvisual-plugins-0.4.0-r3[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	gstreamer_system_link \
+		gst-libs/gst/audio:gstreamer-audio \
+		gst-libs/gst/video:gstreamer-video \
+		gst-libs/gst/pbutils:gstreamer-pbutils
+}
diff --git a/media-plugins/gst-plugins-meta/Manifest b/media-plugins/gst-plugins-meta/Manifest
index b1759d5dc5e5..257cc2b99085 100644
--- a/media-plugins/gst-plugins-meta/Manifest
+++ b/media-plugins/gst-plugins-meta/Manifest
@@ -1,5 +1,4 @@
 EBUILD gst-plugins-meta-0.10-r11.ebuild 4380 BLAKE2B 90b2d3511987d3a9bc6f8cf6f0a44fc616015280a378ca50ea1fbb1e1531305fc8c0331f3b77da8e3d6a03628cbff879d75664cd569f7755c850a271d01ba83a SHA512 e047adac8d873c0568a59afaba4eeac62ff3e1822309096ac0b9a337e730d2ad8b204a3cce0385ac63c36f922a6181ef22be1ed0a0a4f9b7637ee7f34a14e6e3
-EBUILD gst-plugins-meta-1.12.4.ebuild 3758 BLAKE2B e8ef288159540fc4d4996bc3aac63a5b855c48426001d373f946c08973c354ec24e39ce015de128c29341f9c7305d54f523c55821de47af363aa6f66fb01006a SHA512 c9afdb06895118abfcb7e407b561110bfe8085be682dbc891c3fb0c419c465192241a0be62242fea86c51a673086212c81acd5838895effa546f1ccd8cf6b624
 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
diff --git a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.12.4.ebuild b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.12.4.ebuild
deleted file mode 100644
index dcd283104d85..000000000000
--- a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.12.4.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 multilib-build
-
-DESCRIPTION="Meta ebuild to pull in gst plugins for apps"
-HOMEPAGE="https://www.gentoo.org"
-
-LICENSE="metapackage"
-SLOT="1.0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
-IUSE="aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mms mp3 modplug mpeg ogg opus oss pulseaudio taglib theora v4l vaapi vcd vorbis vpx wavpack X x264"
-REQUIRED_USE="opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )"
-
-RDEPEND="
-	>=media-libs/gstreamer-${PV}:1.0[${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-base-${PV}:1.0[alsa?,ogg?,theora?,vorbis?,X?,${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-good-${PV}:1.0[${MULTILIB_USEDEP}]
-	a52? ( >=media-plugins/gst-plugins-a52dec-${PV}:1.0[${MULTILIB_USEDEP}] )
-	aac? ( >=media-plugins/gst-plugins-faad-${PV}:1.0[${MULTILIB_USEDEP}] )
-	cdda? ( || (
-		>=media-plugins/gst-plugins-cdparanoia-${PV}:1.0[${MULTILIB_USEDEP}]
-		>=media-plugins/gst-plugins-cdio-${PV}:1.0[${MULTILIB_USEDEP}] ) )
-	dts? ( >=media-plugins/gst-plugins-dts-${PV}:1.0[${MULTILIB_USEDEP}] )
-	dv? ( >=media-plugins/gst-plugins-dv-${PV}:1.0[${MULTILIB_USEDEP}] )
-	dvb? (
-		>=media-plugins/gst-plugins-dvb-${PV}:1.0[${MULTILIB_USEDEP}]
-		>=media-libs/gst-plugins-bad-${PV}:1.0[${MULTILIB_USEDEP}] )
-	dvd? (
-		>=media-libs/gst-plugins-ugly-${PV}:1.0[${MULTILIB_USEDEP}]
-		>=media-plugins/gst-plugins-a52dec-${PV}:1.0[${MULTILIB_USEDEP}]
-		>=media-plugins/gst-plugins-dvdread-${PV}:1.0[${MULTILIB_USEDEP}]
-		>=media-plugins/gst-plugins-mpeg2dec-${PV}:1.0[${MULTILIB_USEDEP}]
-		>=media-plugins/gst-plugins-resindvd-${PV}:1.0[${MULTILIB_USEDEP}] )
-	ffmpeg? ( >=media-plugins/gst-plugins-libav-${PV}:1.0[${MULTILIB_USEDEP}] )
-	flac? ( >=media-plugins/gst-plugins-flac-${PV}:1.0[${MULTILIB_USEDEP}] )
-	http? ( >=media-plugins/gst-plugins-soup-${PV}:1.0[${MULTILIB_USEDEP}] )
-	jack? ( >=media-plugins/gst-plugins-jack-${PV}:1.0[${MULTILIB_USEDEP}] )
-	lame? ( >=media-plugins/gst-plugins-lame-${PV}:1.0[${MULTILIB_USEDEP}] )
-	libass? ( >=media-plugins/gst-plugins-assrender-${PV}:1.0[${MULTILIB_USEDEP}] )
-	libvisual? ( >=media-plugins/gst-plugins-libvisual-${PV}:1.0[${MULTILIB_USEDEP}] )
-	mms? ( >=media-plugins/gst-plugins-libmms-${PV}:1.0[${MULTILIB_USEDEP}] )
-	modplug? ( >=media-plugins/gst-plugins-modplug-${PV}:1.0[${MULTILIB_USEDEP}] )
-	mp3? (
-		>=media-libs/gst-plugins-ugly-${PV}:1.0[${MULTILIB_USEDEP}]
-		>=media-plugins/gst-plugins-mpg123-${PV}:1.0[${MULTILIB_USEDEP}] )
-	mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-${PV}:1.0[${MULTILIB_USEDEP}] )
-	opus? ( >=media-plugins/gst-plugins-opus-${PV}:1.0[${MULTILIB_USEDEP}] )
-	oss? ( >=media-plugins/gst-plugins-oss-${PV}:1.0[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-plugins/gst-plugins-pulse-${PV}:1.0[${MULTILIB_USEDEP}] )
-	taglib? ( >=media-plugins/gst-plugins-taglib-${PV}:1.0[${MULTILIB_USEDEP}] )
-	v4l? ( >=media-plugins/gst-plugins-v4l2-${PV}:1.0[${MULTILIB_USEDEP}] )
-	vaapi? ( >=media-plugins/gst-plugins-vaapi-${PV}:1.0[${MULTILIB_USEDEP}] )
-	vcd? (
-		>=media-plugins/gst-plugins-mplex-${PV}:1.0[${MULTILIB_USEDEP}]
-		>=media-plugins/gst-plugins-mpeg2dec-${PV}:1.0[${MULTILIB_USEDEP}] )
-	vpx? ( >=media-plugins/gst-plugins-vpx-${PV}:1.0[${MULTILIB_USEDEP}] )
-	wavpack? ( >=media-plugins/gst-plugins-wavpack-${PV}:1.0[${MULTILIB_USEDEP}] )
-	x264? ( >=media-plugins/gst-plugins-x264-${PV}:1.0[${MULTILIB_USEDEP}] )
-"
-
-# Usage note:
-# The idea is that apps depend on this for optional gstreamer plugins.  Then,
-# when USE flags change, no app gets rebuilt, and all apps that can make use of
-# the new plugin automatically do.
-
-# When adding deps here, make sure the keywords on the gst-plugin are valid.
diff --git a/media-plugins/gst-plugins-mpg123/Manifest b/media-plugins/gst-plugins-mpg123/Manifest
index 412dd84353d4..c460156e85fe 100644
--- a/media-plugins/gst-plugins-mpg123/Manifest
+++ b/media-plugins/gst-plugins-mpg123/Manifest
@@ -1,7 +1,9 @@
 DIST gst-plugins-good-1.14.1.tar.xz 3776168 BLAKE2B 5b17ac49d5bae423ee887f1516ba8bfb542acb17e3f304f489dddbaa728761ee51a08e67bd10a9981f53b5b8424d8013d1723fcbbf6e06d34a39548868d34f85 SHA512 b52d3214f2d32f263637cb9f0838284483e15b8d20bf36d64c349e99b481095734a4dd2c2421176540dfe5129ecc1acc101b89cc898b4773f0f736e8e962b070
 DIST gst-plugins-good-1.14.2.tar.xz 3779912 BLAKE2B d49f82a6be7423d233ec15660470533d6bfc5da3d2ac5912ce7b3f97739b1540424c02593aff269aae3df7c6f15ca37b2d9d45fe85f3b36b910cdac4ba98f093 SHA512 26ff40d949ab95043ed717350fb344a616c72b049cd52c3e7debd9cc37f73eb9d4704b4f437ba257cecb9dba702ce451647279cb821e9405b36210b46ae9aa05
 DIST gst-plugins-good-1.14.3.tar.xz 3790052 BLAKE2B 14f4116ce3eeb20f1f2cc8e835e46a9444ef82291aad90b74e74d0e79c1974bb6f2373f79543a3a3235773c954bd9def67a9e6c64522035fa65e1541695d34e1 SHA512 1077d4ac7332a4bfd58fe5be53104e1404c3a688769520650c030488a184e64a43b301fc1f1d687de668143f849a23cb0ba2b417cf284d20710b9cf32d792e45
+DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 EBUILD gst-plugins-mpg123-1.14.1.ebuild 379 BLAKE2B 5eb7ad663a1f8ae2b7baec566c2c24df878d16023f5fa875283d9d2ed286239af19774ecf7977e2e8117e47afa3c2ddd1b68c05d96776dd8f82f5083a8dcbc6e SHA512 a0433112b59e7e20192788e7f7b4df14a7450d6850596ae552a7fbe0ba39d7a38926587f93477673938289a6cfe4b9fb78c627e08c24c7b7917f18a7fb8874ae
 EBUILD gst-plugins-mpg123-1.14.2.ebuild 386 BLAKE2B cbc09e77a55f8ba570750886da91869d5911d8e148cac07fda2e23ce49e64c4a6301ace52de53472baec6a69932aff542583f6ab847fff86bb6c6f3d1f50e71a SHA512 e058400d310ad849eb0e1691b4038d933e4d46a019fdd262cd022f4a96b6a5934502e1e9bb5d31856ba9643b0b2106a1643456dfc896e1d0fb5ff1ce15e813af
 EBUILD gst-plugins-mpg123-1.14.3.ebuild 386 BLAKE2B cbc09e77a55f8ba570750886da91869d5911d8e148cac07fda2e23ce49e64c4a6301ace52de53472baec6a69932aff542583f6ab847fff86bb6c6f3d1f50e71a SHA512 e058400d310ad849eb0e1691b4038d933e4d46a019fdd262cd022f4a96b6a5934502e1e9bb5d31856ba9643b0b2106a1643456dfc896e1d0fb5ff1ce15e813af
+EBUILD gst-plugins-mpg123-1.14.4.ebuild 383 BLAKE2B 8f6b7fd43cf5f60c176e4d43da03dced0728d5610da3ea926d4d68e0a70715f5fbd3f416cdf7d73f8ff8352c6a333c21f283b719f7cd19c3750f14363e95a36d SHA512 febf9de0bffa0b13ea2cfc8c521c5a1ad70766df1b42da06a94263908747077dc90e6934dc46c883588c5df57f1fbb9aa73771b92ba969dc2e7d5c8bbc46630e
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.14.4.ebuild b/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.14.4.ebuild
new file mode 100644
index 000000000000..5d7ed1735d3d
--- /dev/null
+++ b/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.14.4.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="MP3 decoder plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND="
+	>=media-sound/mpg123-1.23[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-opus/Manifest b/media-plugins/gst-plugins-opus/Manifest
index 015993138e06..7bc0e609e26c 100644
--- a/media-plugins/gst-plugins-opus/Manifest
+++ b/media-plugins/gst-plugins-opus/Manifest
@@ -1,11 +1,11 @@
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 BLAKE2B 86ed955fb5c73f2145b8f8ed2daaeffd9975362e81c3ca911be00d18f6b6d975381651071eb54514ef94a931f1fc89e673dc8c1d68e10de132bbe51accb6d165 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4
-DIST gst-plugins-base-1.12.4.tar.xz 3119468 BLAKE2B d5ac157618a25c8f0323d1922d5b26b0b5c49f56cb75df3ceeadd0566f873be1a06c863a1da6afff40901fbbbeb1ec6cd6ef4614309ca7f7ff988c0fa9040a10 SHA512 89a6e92cd294612cf1406eb156416ab4606643f6b43637e64a18f6f28ab789ca8d4cf1308434ed85e5fc679c79cc3ca115db48f37e0065a6ab3cdfdbaaad9f53
 DIST gst-plugins-base-1.14.1.tar.xz 3689184 BLAKE2B 17abcab2c84b113180de55d6c781ae11feec66c215febfffefe4a22353c56e82a585647688e2078603b6c3ece6f26afa99969091a72886880a2f8549dd9cb379 SHA512 bca9db8780fe24c19a2c4eae9a16dc0856cb38077580e4344bd4f7fa9a7a03079b92556ff35475a574f624a5a721d80ef925790670e4cc809361ed01108a141e
 DIST gst-plugins-base-1.14.2.tar.xz 3693856 BLAKE2B 7ed05718bfd1dcb15e05e5a2c8758ad409c4ad7f331146363f264aaf7123c8a14c1db81f482710d1069d33e5281087f66e2e38504e39b214befba73ffdd9295c SHA512 35e7eb5c42fe265d38c433575f88d3306f15ff927a989eb375ed5399cbf92af2e9bf553d6eee349dc13673540cee00e1f879595f25e58c188ea443d8a969682f
 DIST gst-plugins-base-1.14.3.tar.xz 3702184 BLAKE2B 8b13cdcb912968ed51bba91faf70060cced562f374d2b6987a9b9ff9a261b553836394cc4dc16df299c21cb303fd87bb0becb57225767c3502c8c16359430523 SHA512 3b5f0dc46d148dd9f162c651594be740f798c1d6272ecabced544f09900b6f2909a9fc705d42e4e98130d6f7cb1368458bfeee27444b5c43e62551defbc3838a
+DIST gst-plugins-base-1.14.4.tar.xz 3703232 BLAKE2B b22c44b857bc4f1972f03752cc1afb35c8d76e2d0c4a06c574af0ac4f3a91080c584ae4e4fc2a263ee879a53d58505c24a756ebc051d81ec62661c4f9e532f0e SHA512 42c59df9f2d848108f12afa0466acbcfa5ccda64e4d0d44608d4268abed20f2e036713de04e7d71feaed1868ad742c5bcb55ae0eef5dec8e19e053dc8541b8af
 EBUILD gst-plugins-opus-0.10.23-r1.ebuild 483 BLAKE2B 6bb8cdf5374aae793161711f58f645d7dc0a9e0e984dd36ef440c86350d6af56f302acaa34233745509731ac228275b062b4131262baf636b40a6e77f821278f SHA512 5bdc5e46ed34feaa7b63fd6f5dadb6e6c7b623b05a6c22b0f5e893f0f6c1e9a243d6265f865dc509d460822429d446833172ece1549564d676b1154d2ef8cba8
-EBUILD gst-plugins-opus-1.12.4.ebuild 665 BLAKE2B ebef6491b73603b37c607bc0e8822f4af7950118777810132960e710a43b9f93acbfcfba889634ad04847e74e072f102bfba004617b5ab8fbfff05263dfebed5 SHA512 7990b2e951e8378ed15d88acd3b9541364f241f231823ab7f9e6c08398fa09e021ab6a5aadb678f6a0c42c0b33c89e409a6ac1717f429d49e9e505f556e3d3f8
 EBUILD gst-plugins-opus-1.14.1.ebuild 665 BLAKE2B ebef6491b73603b37c607bc0e8822f4af7950118777810132960e710a43b9f93acbfcfba889634ad04847e74e072f102bfba004617b5ab8fbfff05263dfebed5 SHA512 7990b2e951e8378ed15d88acd3b9541364f241f231823ab7f9e6c08398fa09e021ab6a5aadb678f6a0c42c0b33c89e409a6ac1717f429d49e9e505f556e3d3f8
 EBUILD gst-plugins-opus-1.14.2.ebuild 672 BLAKE2B 07b00069a9167ca00348bee6a2a29c8602c678cd0d428cb2b5799f454d0bf1c801f0b6975e2e1f28d99ab8c3a729d9e63d8bbd21edda174e840e64e180896402 SHA512 7d352a1b5ed27e6b3781d46b91aab32ca1bcdca0cda8ed6b296da826ca041bc58418ee77f2212fbd5efd42bebd638a5b301bab4d6a26a92814a5f0064668905b
 EBUILD gst-plugins-opus-1.14.3.ebuild 672 BLAKE2B 07b00069a9167ca00348bee6a2a29c8602c678cd0d428cb2b5799f454d0bf1c801f0b6975e2e1f28d99ab8c3a729d9e63d8bbd21edda174e840e64e180896402 SHA512 7d352a1b5ed27e6b3781d46b91aab32ca1bcdca0cda8ed6b296da826ca041bc58418ee77f2212fbd5efd42bebd638a5b301bab4d6a26a92814a5f0064668905b
+EBUILD gst-plugins-opus-1.14.4.ebuild 669 BLAKE2B ae1947d26264e7a6b91dad4c49b3564bd2773988030d74104ff7a35d9f1a48186ed56138758845a0bf2b03c192a102552a649b39191d3d783678e6f6e034e1d9 SHA512 d31e6bb57bf4b631477a5955452d23ab3c848d73d4f330b0c9f8cbb04d52aa91b84ec75d8e6931676c8c70903a61b5502b5bf45dde02acbce669f0ecd611ec8e
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.12.4.ebuild b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.12.4.ebuild
deleted file mode 100644
index 77406ec28075..000000000000
--- a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.12.4.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
-GST_ORG_MODULE=gst-plugins-base
-
-inherit gstreamer
-
-DESCRIPTION="Opus audio parser plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
-IUSE=""
-
-COMMON_DEPEND=">=media-libs/opus-1.1:=[${MULTILIB_USEDEP}]"
-
-RDEPEND="${COMMON_DEPEND}
-	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},ogg]
-"
-DEPEND="${COMMON_DEPEND}"
-
-src_prepare() {
-	default
-	gstreamer_system_link \
-		gst-libs/gst/tag:gstreamer-tag \
-		gst-libs/gst/pbutils:gstreamer-pbutils \
-		gst-libs/gst/audio:gstreamer-audio
-}
diff --git a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.14.4.ebuild b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.14.4.ebuild
new file mode 100644
index 000000000000..7eb2d6ab64f0
--- /dev/null
+++ b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.14.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-base
+
+inherit gstreamer
+
+DESCRIPTION="Opus audio parser plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+COMMON_DEPEND=">=media-libs/opus-1.1:=[${MULTILIB_USEDEP}]"
+
+RDEPEND="${COMMON_DEPEND}
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},ogg]
+"
+DEPEND="${COMMON_DEPEND}"
+
+src_prepare() {
+	default
+	gstreamer_system_link \
+		gst-libs/gst/tag:gstreamer-tag \
+		gst-libs/gst/pbutils:gstreamer-pbutils \
+		gst-libs/gst/audio:gstreamer-audio
+}
diff --git a/media-plugins/gst-plugins-oss/Manifest b/media-plugins/gst-plugins-oss/Manifest
index 671cb59e39b3..97b0198f3c2a 100644
--- a/media-plugins/gst-plugins-oss/Manifest
+++ b/media-plugins/gst-plugins-oss/Manifest
@@ -1,11 +1,11 @@
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 BLAKE2B a015ef6993078f1c699badcc9911a835fe1d129b4e0dccb3937d49768d9202549204bbfb0d7ad575bcb77c75f73662a83912936b2664a2b1cd7c331e4d203c4f SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809
-DIST gst-plugins-good-1.12.4.tar.xz 3489992 BLAKE2B 41715d3e9bda183706d87085bc8cca546720f20e32fd5ecf6e284814745f2fe8ba4cfcd244e50d0734e57dde26944539b8273879608d3042262bfc10f82cc2b9 SHA512 18f270c01be80fe5b026e2c26db3ec200117ffd99c1dca55a8a78f0bd6dcc4701126836e52a410f179779e363f11218413c7b4d13e96ef5ee1bfa82e79a81178
 DIST gst-plugins-good-1.14.1.tar.xz 3776168 BLAKE2B 5b17ac49d5bae423ee887f1516ba8bfb542acb17e3f304f489dddbaa728761ee51a08e67bd10a9981f53b5b8424d8013d1723fcbbf6e06d34a39548868d34f85 SHA512 b52d3214f2d32f263637cb9f0838284483e15b8d20bf36d64c349e99b481095734a4dd2c2421176540dfe5129ecc1acc101b89cc898b4773f0f736e8e962b070
 DIST gst-plugins-good-1.14.2.tar.xz 3779912 BLAKE2B d49f82a6be7423d233ec15660470533d6bfc5da3d2ac5912ce7b3f97739b1540424c02593aff269aae3df7c6f15ca37b2d9d45fe85f3b36b910cdac4ba98f093 SHA512 26ff40d949ab95043ed717350fb344a616c72b049cd52c3e7debd9cc37f73eb9d4704b4f437ba257cecb9dba702ce451647279cb821e9405b36210b46ae9aa05
 DIST gst-plugins-good-1.14.3.tar.xz 3790052 BLAKE2B 14f4116ce3eeb20f1f2cc8e835e46a9444ef82291aad90b74e74d0e79c1974bb6f2373f79543a3a3235773c954bd9def67a9e6c64522035fa65e1541695d34e1 SHA512 1077d4ac7332a4bfd58fe5be53104e1404c3a688769520650c030488a184e64a43b301fc1f1d687de668143f849a23cb0ba2b417cf284d20710b9cf32d792e45
+DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 EBUILD gst-plugins-oss-0.10.31-r1.ebuild 367 BLAKE2B ee12205502d2dd27d73697107dee57116d4d47f2f45176a56b3e805922201d4a91be11b12ae0f3b65cf10b461ada4054bb0801cd4de1bd80c91b6ccfa15fbbb0 SHA512 cf6f4d422bf392ebe0695262b8468fca446c5451ba36c5ffe4ccbb3ecf867a2f373124edf1670ed211bfa9ea39d8f5afa98e245920ec9a14527037b9d5c8ddfa
-EBUILD gst-plugins-oss-1.12.4.ebuild 380 BLAKE2B 54671349d17924db84f0e68b9a0572e497faa95133e1da01350b928bc5b2767199418ed392fce224b89828a9f68260ef7b076b7490433d26c926e50a55d14d50 SHA512 a08893122f723fcccba5b91de1cbdbf1f25675c73dc04deb50d74ab55e629a549790adb2e3a57a0c5455c001cdfd7e22b2f9ccd59641c269962c6e45a7203551
 EBUILD gst-plugins-oss-1.14.1.ebuild 380 BLAKE2B 54671349d17924db84f0e68b9a0572e497faa95133e1da01350b928bc5b2767199418ed392fce224b89828a9f68260ef7b076b7490433d26c926e50a55d14d50 SHA512 a08893122f723fcccba5b91de1cbdbf1f25675c73dc04deb50d74ab55e629a549790adb2e3a57a0c5455c001cdfd7e22b2f9ccd59641c269962c6e45a7203551
 EBUILD gst-plugins-oss-1.14.2.ebuild 387 BLAKE2B f921f9692c85bfd22bf9027269d0d13a875794a967580400cfcc56b98aca486a670262242da83667773c260825eff1d36ac4af550f7b8867a6d6187260868b4b SHA512 5fb2912059dbe0a03abc2871bbcfc52c15226751b0dbae992da49c61aa685c93503efe903ac72428905f4084e482f7c7b7a1da992f200043a8ed6732fa8393e6
 EBUILD gst-plugins-oss-1.14.3.ebuild 387 BLAKE2B f921f9692c85bfd22bf9027269d0d13a875794a967580400cfcc56b98aca486a670262242da83667773c260825eff1d36ac4af550f7b8867a6d6187260868b4b SHA512 5fb2912059dbe0a03abc2871bbcfc52c15226751b0dbae992da49c61aa685c93503efe903ac72428905f4084e482f7c7b7a1da992f200043a8ed6732fa8393e6
+EBUILD gst-plugins-oss-1.14.4.ebuild 384 BLAKE2B aa3b36f325a68234c7625af4c3eafc054eae233aacc3f68ab32586787351ed1b94ef6fb7203960ea9a321639a104d44d10fe28f76d9219531e3259994edfb8be SHA512 f062efb33168f4b6a35681adbc372258345aed16f34280db58b4368a93c8493d926834004279d1ea27e88220bf4ca52d1f44f9a97839d4b832098b81a0e091c2
 MISC metadata.xml 488 BLAKE2B 72817781f31070fbba548a5a0e724d3a3a419f55b2c1ba1155e88f66b0f779d34fc5705c39d60ecc5c40a9ba47ed568aa2458c0557de1795ddacadf54b39a436 SHA512 6ab36e28308e33d9b2e74a419ed558c913510f23bee1fd1a58ff87c6937dc2c3b4c8c683831e771460258424e89797a6b8c5ebed95cb87506ae7d67c11b2c243
diff --git a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.12.4.ebuild b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.12.4.ebuild
deleted file mode 100644
index c902eb866cf5..000000000000
--- a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.12.4.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
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer
-
-DESCRIPTION="OSS (Open Sound System) support plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=""
-DEPEND="virtual/os-headers"
diff --git a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.14.4.ebuild b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.14.4.ebuild
new file mode 100644
index 000000000000..9fa3615b862c
--- /dev/null
+++ b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.14.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="OSS (Open Sound System) support plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=""
+DEPEND="virtual/os-headers"
diff --git a/media-plugins/gst-plugins-pulse/Manifest b/media-plugins/gst-plugins-pulse/Manifest
index 6764ea5e72bd..114a9145ea8a 100644
--- a/media-plugins/gst-plugins-pulse/Manifest
+++ b/media-plugins/gst-plugins-pulse/Manifest
@@ -1,11 +1,11 @@
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 BLAKE2B a015ef6993078f1c699badcc9911a835fe1d129b4e0dccb3937d49768d9202549204bbfb0d7ad575bcb77c75f73662a83912936b2664a2b1cd7c331e4d203c4f SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809
-DIST gst-plugins-good-1.12.4.tar.xz 3489992 BLAKE2B 41715d3e9bda183706d87085bc8cca546720f20e32fd5ecf6e284814745f2fe8ba4cfcd244e50d0734e57dde26944539b8273879608d3042262bfc10f82cc2b9 SHA512 18f270c01be80fe5b026e2c26db3ec200117ffd99c1dca55a8a78f0bd6dcc4701126836e52a410f179779e363f11218413c7b4d13e96ef5ee1bfa82e79a81178
 DIST gst-plugins-good-1.14.1.tar.xz 3776168 BLAKE2B 5b17ac49d5bae423ee887f1516ba8bfb542acb17e3f304f489dddbaa728761ee51a08e67bd10a9981f53b5b8424d8013d1723fcbbf6e06d34a39548868d34f85 SHA512 b52d3214f2d32f263637cb9f0838284483e15b8d20bf36d64c349e99b481095734a4dd2c2421176540dfe5129ecc1acc101b89cc898b4773f0f736e8e962b070
 DIST gst-plugins-good-1.14.2.tar.xz 3779912 BLAKE2B d49f82a6be7423d233ec15660470533d6bfc5da3d2ac5912ce7b3f97739b1540424c02593aff269aae3df7c6f15ca37b2d9d45fe85f3b36b910cdac4ba98f093 SHA512 26ff40d949ab95043ed717350fb344a616c72b049cd52c3e7debd9cc37f73eb9d4704b4f437ba257cecb9dba702ce451647279cb821e9405b36210b46ae9aa05
 DIST gst-plugins-good-1.14.3.tar.xz 3790052 BLAKE2B 14f4116ce3eeb20f1f2cc8e835e46a9444ef82291aad90b74e74d0e79c1974bb6f2373f79543a3a3235773c954bd9def67a9e6c64522035fa65e1541695d34e1 SHA512 1077d4ac7332a4bfd58fe5be53104e1404c3a688769520650c030488a184e64a43b301fc1f1d687de668143f849a23cb0ba2b417cf284d20710b9cf32d792e45
+DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 EBUILD gst-plugins-pulse-0.10.31-r2.ebuild 451 BLAKE2B cc688af55730de520620886f87f68cb85ebcf476165bbfaed3e46d2afdb46db36eb80432e86ce791a8f25a6041a0b834c4d714e0b3e0f50f5c1e41a38f02a622 SHA512 762cc23f92d89251b3f92c57d796a0acd0c4904d6a0bedc475d54eb5f475949a34cd0d3ed5384922a35a15448e9ed81ed9efe4ebb8aa25f5ef9158a4f981311e
-EBUILD gst-plugins-pulse-1.12.4.ebuild 461 BLAKE2B 915aa168a025f7a7ed8c406eef81273a0cacfe58e279ff5d7373c97b6903604cf3d6a869c521f1a9e8a4f37b04c2554ff8066b045ccb7720f307f6a28b71def1 SHA512 f39b4ab2542eda3a3439623da3922a8af90aeb2c16d876d07a12f34a685f2e77fe633a7fee1f48d51ea7d82b533147ecc1dffd72b91268d9683487f3749b48e1
 EBUILD gst-plugins-pulse-1.14.1.ebuild 461 BLAKE2B 915aa168a025f7a7ed8c406eef81273a0cacfe58e279ff5d7373c97b6903604cf3d6a869c521f1a9e8a4f37b04c2554ff8066b045ccb7720f307f6a28b71def1 SHA512 f39b4ab2542eda3a3439623da3922a8af90aeb2c16d876d07a12f34a685f2e77fe633a7fee1f48d51ea7d82b533147ecc1dffd72b91268d9683487f3749b48e1
 EBUILD gst-plugins-pulse-1.14.2.ebuild 468 BLAKE2B 918f7c432581ebab94d10e940d5b57a7ffa30eada9e8774e8e689e2288aadd52509c3eebee4c29e2c3d3340f225aa01b2d2d679dd8f3782d534d4f65c9c9514a SHA512 95f7c6a95df3509110768d32f7f8b1222a8c4a2e0258283898d1381d3dec4f22407a72857bcfdd69cac4a76b06592cfd160d652083512ed2b74e45a1c40037fd
 EBUILD gst-plugins-pulse-1.14.3.ebuild 468 BLAKE2B 918f7c432581ebab94d10e940d5b57a7ffa30eada9e8774e8e689e2288aadd52509c3eebee4c29e2c3d3340f225aa01b2d2d679dd8f3782d534d4f65c9c9514a SHA512 95f7c6a95df3509110768d32f7f8b1222a8c4a2e0258283898d1381d3dec4f22407a72857bcfdd69cac4a76b06592cfd160d652083512ed2b74e45a1c40037fd
+EBUILD gst-plugins-pulse-1.14.4.ebuild 465 BLAKE2B a4bb55163898939ac79c7e1316c88a0ad66f7f185a1beaf1987a983f0c519bfa45f97edefdd8067e61eab1333cc9de082fc8f536983e5315cfdc71bad0e1275e SHA512 3cc43088ebc125c2526286978b7f10da468edb31b3dcbad908f7845a4db34d5c6e9ecc12ed51f25bfc7a5e31e28886a3a9fb09d6e5af52c208799ef20cda2595
 MISC metadata.xml 610 BLAKE2B c8d30b8baa2a2dc5dc43b2a0f5badcb212567f7ce4873f58b1662b3454c8232a4916f10470bb98c3dae745f818f0e02d7266542d44d3fd4b9eb7edf99bf2a419 SHA512 0f0fa4496446fbaa649c3d76538c4960ca0d7918b40e305aa0da8516e79ef25c10136b0097fd687cb968c37de636b57ae667be1bc3197a571f557400a9c0c478
diff --git a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.12.4.ebuild b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.12.4.ebuild
deleted file mode 100644
index 2a2b0c7ed3e7..000000000000
--- a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.12.4.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
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer
-
-DESCRIPTION="PulseAudio sound server plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86"
-IUSE=""
-
-RDEPEND="
-	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
-	>=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.14.4.ebuild b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.14.4.ebuild
new file mode 100644
index 000000000000..306ee11d8456
--- /dev/null
+++ b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.14.4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="PulseAudio sound server plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	>=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-raw1394/Manifest b/media-plugins/gst-plugins-raw1394/Manifest
index cb1e41e8f0b1..be08df686f83 100644
--- a/media-plugins/gst-plugins-raw1394/Manifest
+++ b/media-plugins/gst-plugins-raw1394/Manifest
@@ -1,11 +1,11 @@
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 BLAKE2B a015ef6993078f1c699badcc9911a835fe1d129b4e0dccb3937d49768d9202549204bbfb0d7ad575bcb77c75f73662a83912936b2664a2b1cd7c331e4d203c4f SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809
-DIST gst-plugins-good-1.12.4.tar.xz 3489992 BLAKE2B 41715d3e9bda183706d87085bc8cca546720f20e32fd5ecf6e284814745f2fe8ba4cfcd244e50d0734e57dde26944539b8273879608d3042262bfc10f82cc2b9 SHA512 18f270c01be80fe5b026e2c26db3ec200117ffd99c1dca55a8a78f0bd6dcc4701126836e52a410f179779e363f11218413c7b4d13e96ef5ee1bfa82e79a81178
 DIST gst-plugins-good-1.14.1.tar.xz 3776168 BLAKE2B 5b17ac49d5bae423ee887f1516ba8bfb542acb17e3f304f489dddbaa728761ee51a08e67bd10a9981f53b5b8424d8013d1723fcbbf6e06d34a39548868d34f85 SHA512 b52d3214f2d32f263637cb9f0838284483e15b8d20bf36d64c349e99b481095734a4dd2c2421176540dfe5129ecc1acc101b89cc898b4773f0f736e8e962b070
 DIST gst-plugins-good-1.14.2.tar.xz 3779912 BLAKE2B d49f82a6be7423d233ec15660470533d6bfc5da3d2ac5912ce7b3f97739b1540424c02593aff269aae3df7c6f15ca37b2d9d45fe85f3b36b910cdac4ba98f093 SHA512 26ff40d949ab95043ed717350fb344a616c72b049cd52c3e7debd9cc37f73eb9d4704b4f437ba257cecb9dba702ce451647279cb821e9405b36210b46ae9aa05
 DIST gst-plugins-good-1.14.3.tar.xz 3790052 BLAKE2B 14f4116ce3eeb20f1f2cc8e835e46a9444ef82291aad90b74e74d0e79c1974bb6f2373f79543a3a3235773c954bd9def67a9e6c64522035fa65e1541695d34e1 SHA512 1077d4ac7332a4bfd58fe5be53104e1404c3a688769520650c030488a184e64a43b301fc1f1d687de668143f849a23cb0ba2b417cf284d20710b9cf32d792e45
+DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 EBUILD gst-plugins-raw1394-0.10.31-r1.ebuild 517 BLAKE2B 1dd965a7a7e5e696b9a2f4a2138e15f2b6443869f08031571c97e0a66b71dcf22abf43e4aeef920fba787e14d70693f67d97ab24c3994c17bf85112d70ecdb2f SHA512 895bf265fa6c2dce27a71b5487c6084bb67f9a12d299e6eeed6171b7bb8fc60357793200426e88fd8a461601e4e5697b2b659dbae85db8e6ee94c07efe6dbdb8
-EBUILD gst-plugins-raw1394-1.12.4.ebuild 517 BLAKE2B b035768c2a3c4f90469bdb1bc994716991b08f181e4d429aa6fbee426c542bc43bdbfe353c116d3b1179a733948f6bd020508ff051a641acd83f958454bf8da4 SHA512 ca8842f89335058b7fa3b479cf8bf7fb260397417d87a4f901b85d2ddf1e379dd4fc217399bc50bd2cdf6703d0a23046bc5e0a9de559fdb58c6988f92a24bcc3
 EBUILD gst-plugins-raw1394-1.14.1.ebuild 517 BLAKE2B b035768c2a3c4f90469bdb1bc994716991b08f181e4d429aa6fbee426c542bc43bdbfe353c116d3b1179a733948f6bd020508ff051a641acd83f958454bf8da4 SHA512 ca8842f89335058b7fa3b479cf8bf7fb260397417d87a4f901b85d2ddf1e379dd4fc217399bc50bd2cdf6703d0a23046bc5e0a9de559fdb58c6988f92a24bcc3
 EBUILD gst-plugins-raw1394-1.14.2.ebuild 521 BLAKE2B 1fa023b790b7cbe705ae89be13f8e5028ce59f9ff0370fafe306e110e905db917d1e791ff16116918043eb44dbac55f3b1aa1fc52968deda91d89cc93df18c3b SHA512 f2548297bb542cc55b1e0c4b021335dbccf9a9056fc82ab0d0642b455b8b23006fd660818530dfddfe9e0f75dace5e474de68c90c297ceccf7a72fd29cc6fedc
 EBUILD gst-plugins-raw1394-1.14.3.ebuild 521 BLAKE2B 1fa023b790b7cbe705ae89be13f8e5028ce59f9ff0370fafe306e110e905db917d1e791ff16116918043eb44dbac55f3b1aa1fc52968deda91d89cc93df18c3b SHA512 f2548297bb542cc55b1e0c4b021335dbccf9a9056fc82ab0d0642b455b8b23006fd660818530dfddfe9e0f75dace5e474de68c90c297ceccf7a72fd29cc6fedc
+EBUILD gst-plugins-raw1394-1.14.4.ebuild 518 BLAKE2B 2be473007f4856ef6e2734c568a74e99378d4992d896005801738a763f7863178ec9420d07ec6a6ec247efa44ecbc80045612f5be4149317c5d7bda0e42176c4 SHA512 5f72e6b7d13ca8a8cd1328dfa86bd1356770e6a59e6f09255124fbaf7f25202ba18405def4c670d6253ba5c528e52e48001710d21073c94dfb9b5b95d562553e
 MISC metadata.xml 548 BLAKE2B affa90bfebf1a2616bfe7262f0850227bdb4aac3580924c58fda8c1c9c89fb288252c921c73404149d02c8f1d38f61840301bdfdea01608a3db14e5e8b0b08a6 SHA512 ad3c3f4e095d868f0df4f869fe521f3c51ada956f578b995bd9e7161ef679c5c395434a76f4ddcfe1242dc37790e8f1ffe0167c8a50c686d434747563c151031
diff --git a/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.12.4.ebuild b/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.12.4.ebuild
deleted file mode 100644
index 8e450889cfe1..000000000000
--- a/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.12.4.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
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer
-
-DESCRIPTION="Fiwewire DV/HDV capture plugin for GStreamer"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
-	>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-GST_PLUGINS_BUILD="dv1394"
-GST_PLUGINS_BUILD_DIR="raw1394"
diff --git a/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.14.4.ebuild b/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.14.4.ebuild
new file mode 100644
index 000000000000..8e7f97f7e79b
--- /dev/null
+++ b/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.14.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="Fiwewire DV/HDV capture plugin for GStreamer"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
+	>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+	>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+GST_PLUGINS_BUILD="dv1394"
+GST_PLUGINS_BUILD_DIR="raw1394"
diff --git a/media-plugins/gst-plugins-shout2/Manifest b/media-plugins/gst-plugins-shout2/Manifest
index 501eef560f52..7429d362bd02 100644
--- a/media-plugins/gst-plugins-shout2/Manifest
+++ b/media-plugins/gst-plugins-shout2/Manifest
@@ -1,11 +1,11 @@
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 BLAKE2B a015ef6993078f1c699badcc9911a835fe1d129b4e0dccb3937d49768d9202549204bbfb0d7ad575bcb77c75f73662a83912936b2664a2b1cd7c331e4d203c4f SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809
-DIST gst-plugins-good-1.12.4.tar.xz 3489992 BLAKE2B 41715d3e9bda183706d87085bc8cca546720f20e32fd5ecf6e284814745f2fe8ba4cfcd244e50d0734e57dde26944539b8273879608d3042262bfc10f82cc2b9 SHA512 18f270c01be80fe5b026e2c26db3ec200117ffd99c1dca55a8a78f0bd6dcc4701126836e52a410f179779e363f11218413c7b4d13e96ef5ee1bfa82e79a81178
 DIST gst-plugins-good-1.14.1.tar.xz 3776168 BLAKE2B 5b17ac49d5bae423ee887f1516ba8bfb542acb17e3f304f489dddbaa728761ee51a08e67bd10a9981f53b5b8424d8013d1723fcbbf6e06d34a39548868d34f85 SHA512 b52d3214f2d32f263637cb9f0838284483e15b8d20bf36d64c349e99b481095734a4dd2c2421176540dfe5129ecc1acc101b89cc898b4773f0f736e8e962b070
 DIST gst-plugins-good-1.14.2.tar.xz 3779912 BLAKE2B d49f82a6be7423d233ec15660470533d6bfc5da3d2ac5912ce7b3f97739b1540424c02593aff269aae3df7c6f15ca37b2d9d45fe85f3b36b910cdac4ba98f093 SHA512 26ff40d949ab95043ed717350fb344a616c72b049cd52c3e7debd9cc37f73eb9d4704b4f437ba257cecb9dba702ce451647279cb821e9405b36210b46ae9aa05
 DIST gst-plugins-good-1.14.3.tar.xz 3790052 BLAKE2B 14f4116ce3eeb20f1f2cc8e835e46a9444ef82291aad90b74e74d0e79c1974bb6f2373f79543a3a3235773c954bd9def67a9e6c64522035fa65e1541695d34e1 SHA512 1077d4ac7332a4bfd58fe5be53104e1404c3a688769520650c030488a184e64a43b301fc1f1d687de668143f849a23cb0ba2b417cf284d20710b9cf32d792e45
+DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 EBUILD gst-plugins-shout2-0.10.31-r1.ebuild 365 BLAKE2B 753c5cc142004f2435062960ef4ef440ab21a63457557dbb34e5af76d38a6edadd6ec70e2e500f6ae37f45991b0ffef70bdc58e3ee9f67cf2bfc89a14150c436 SHA512 c3b6f5fea3129b6345bfbdba61ed39b27d97e1f090780d66a4bad31722a578ab5b5248ffd526ec769fc12a36264d8a2f741a5775e19e919f81618342cf0f68bb
-EBUILD gst-plugins-shout2-1.12.4.ebuild 349 BLAKE2B 54a2d407fc3d3451f1a151f613a8163a59f4769b58490656c0304b175293263a56ab5c7013567ff35f773683ffb2737e59ecdd8962068de5899dc6d3813ab712 SHA512 530aacb197170b45bb6faed86f5ea19f7ac12d20aaacb294217d4cc6dde2327caa6cd0241c551c0adbe0e2c0bcea94b88c6e4d9ca8a8c005b2e6b31db55332d6
 EBUILD gst-plugins-shout2-1.14.1.ebuild 349 BLAKE2B 54a2d407fc3d3451f1a151f613a8163a59f4769b58490656c0304b175293263a56ab5c7013567ff35f773683ffb2737e59ecdd8962068de5899dc6d3813ab712 SHA512 530aacb197170b45bb6faed86f5ea19f7ac12d20aaacb294217d4cc6dde2327caa6cd0241c551c0adbe0e2c0bcea94b88c6e4d9ca8a8c005b2e6b31db55332d6
 EBUILD gst-plugins-shout2-1.14.2.ebuild 354 BLAKE2B 2af5497e6a06a28c696d5e1f447b6417336979387f0354d6fcf7e15e990fe070433f59239159fb4a95e050a672c2ffe8d3012c7006eb34e0cb658f86635e9b95 SHA512 0a1e4356ac2abc6032fe14d26a4994b1762fc77a3334d3a26edcc4c46e6b6d0db52889a0099fc8d1b34980a7fa31806fe8d866b70d2044be50c7d84287b20120
 EBUILD gst-plugins-shout2-1.14.3.ebuild 354 BLAKE2B 2af5497e6a06a28c696d5e1f447b6417336979387f0354d6fcf7e15e990fe070433f59239159fb4a95e050a672c2ffe8d3012c7006eb34e0cb658f86635e9b95 SHA512 0a1e4356ac2abc6032fe14d26a4994b1762fc77a3334d3a26edcc4c46e6b6d0db52889a0099fc8d1b34980a7fa31806fe8d866b70d2044be50c7d84287b20120
+EBUILD gst-plugins-shout2-1.14.4.ebuild 351 BLAKE2B 4656998fe2470c1784d7cb44c539cab16c4964fde49fbcf877985339aaa5a0b9b741780225bb04ac4c7f6488a5abd2fbb37f443872e977f63bb1b9f8fe90021f SHA512 ab6cf586a6ced75f55f2572a72fddb11e1825a6396a58a7708baefc81d4f5c3f8b6ca4879491d5cca008fc3fd14843f6fb3e32cc30a052ebba2569b0dea83e33
 MISC metadata.xml 478 BLAKE2B 4c7e5bbe6d79d01544434b93b998847f6c5e3fa7bf2b979c9ff0238d75c0f1ac5693cb4224073926b6cf098a661fc5064f9ba2db3dd2b121093ee78cf905b1ea SHA512 a24a36ebfdfc159df5e23891118ea4e21855a4db31c1ddee9a081c55597be4f34014adbf0a46712d202f1557f2a63e776382c86ce5193465f35868c91114cc52
diff --git a/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.12.4.ebuild b/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.12.4.ebuild
deleted file mode 100644
index 6b0ad52e64b6..000000000000
--- a/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.12.4.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
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer
-
-DESCRIPTION="Icecast server sink plugin for GStreamer"
-KEYWORDS="alpha amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND=">=media-libs/libshout-2.3.1-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.14.4.ebuild b/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.14.4.ebuild
new file mode 100644
index 000000000000..e0eca7535806
--- /dev/null
+++ b/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.14.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="Icecast server sink plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libshout-2.3.1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-soup/Manifest b/media-plugins/gst-plugins-soup/Manifest
index 2894c9d4ff01..669cddaeb1de 100644
--- a/media-plugins/gst-plugins-soup/Manifest
+++ b/media-plugins/gst-plugins-soup/Manifest
@@ -1,12 +1,12 @@
 AUX gst-plugins-soup-0.10.31-libsoup-gnome.patch 718 BLAKE2B dbc7bcc2dfa9369508d8d8a5ce364a2ba1e3a2e7b60f76321cbc40ca3c4b87d7102b37ebd954403ad7af6fa81330004d3a74de5b9c96e63988d8f85e2f96f43c SHA512 69b545bab6762f227dfc18292415a44995abe79ae34a5f4b6169348def7c086bbf52c24fc799d3d192a36822917cbfb681f299e86c583d75f12a5ef95841d8f4
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 BLAKE2B a015ef6993078f1c699badcc9911a835fe1d129b4e0dccb3937d49768d9202549204bbfb0d7ad575bcb77c75f73662a83912936b2664a2b1cd7c331e4d203c4f SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809
-DIST gst-plugins-good-1.12.4.tar.xz 3489992 BLAKE2B 41715d3e9bda183706d87085bc8cca546720f20e32fd5ecf6e284814745f2fe8ba4cfcd244e50d0734e57dde26944539b8273879608d3042262bfc10f82cc2b9 SHA512 18f270c01be80fe5b026e2c26db3ec200117ffd99c1dca55a8a78f0bd6dcc4701126836e52a410f179779e363f11218413c7b4d13e96ef5ee1bfa82e79a81178
 DIST gst-plugins-good-1.14.1.tar.xz 3776168 BLAKE2B 5b17ac49d5bae423ee887f1516ba8bfb542acb17e3f304f489dddbaa728761ee51a08e67bd10a9981f53b5b8424d8013d1723fcbbf6e06d34a39548868d34f85 SHA512 b52d3214f2d32f263637cb9f0838284483e15b8d20bf36d64c349e99b481095734a4dd2c2421176540dfe5129ecc1acc101b89cc898b4773f0f736e8e962b070
 DIST gst-plugins-good-1.14.2.tar.xz 3779912 BLAKE2B d49f82a6be7423d233ec15660470533d6bfc5da3d2ac5912ce7b3f97739b1540424c02593aff269aae3df7c6f15ca37b2d9d45fe85f3b36b910cdac4ba98f093 SHA512 26ff40d949ab95043ed717350fb344a616c72b049cd52c3e7debd9cc37f73eb9d4704b4f437ba257cecb9dba702ce451647279cb821e9405b36210b46ae9aa05
 DIST gst-plugins-good-1.14.3.tar.xz 3790052 BLAKE2B 14f4116ce3eeb20f1f2cc8e835e46a9444ef82291aad90b74e74d0e79c1974bb6f2373f79543a3a3235773c954bd9def67a9e6c64522035fa65e1541695d34e1 SHA512 1077d4ac7332a4bfd58fe5be53104e1404c3a688769520650c030488a184e64a43b301fc1f1d687de668143f849a23cb0ba2b417cf284d20710b9cf32d792e45
+DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 EBUILD gst-plugins-soup-0.10.31-r2.ebuild 545 BLAKE2B 074f21224146bcd4fa25ad3116cf5c71955900a6608b0041eb9f9c7a20750713e8edbf91f0fb144ba18ddbaa7ae2781ae345f7634a22b17290aaf5dd00aebfbe SHA512 a204577538e6ce251baa4e50148d91800c0a541b07032b8ce9e7ea02b77413add2c8c0409540158e003c9ccd4cbec116d6723473347efc8c8b5227af6ddf9f7a
-EBUILD gst-plugins-soup-1.12.4.ebuild 418 BLAKE2B 6fdf59cad2dbc65cc44e80408216bafa3ae7ab332bcab390ea961259650ffcca8327169248f0d4e81a983bb6ec2e430a6c932370cfbcf3e4978b85c948b2f61e SHA512 32a068a3b0d04f580de5322a8853c4abecf0a745f8753140d4584da04c016aea13c1cde018c719d6f1f0aa0a4b5da118dfbfc24b3b15fd6edc79b136365a9d59
 EBUILD gst-plugins-soup-1.14.1.ebuild 418 BLAKE2B 6fdf59cad2dbc65cc44e80408216bafa3ae7ab332bcab390ea961259650ffcca8327169248f0d4e81a983bb6ec2e430a6c932370cfbcf3e4978b85c948b2f61e SHA512 32a068a3b0d04f580de5322a8853c4abecf0a745f8753140d4584da04c016aea13c1cde018c719d6f1f0aa0a4b5da118dfbfc24b3b15fd6edc79b136365a9d59
 EBUILD gst-plugins-soup-1.14.2.ebuild 425 BLAKE2B 7b7103a6d3a63302d759643cf447eebe184f346d0759a60071ed9ec248586b50f6cc1744448e616d4fac91d73cf84c3533cf587f6a92a9405eaafb1fe556082a SHA512 7ee128c98c3d7ea8219b8e96377841f026e09f8dc355d17cdd461aefdb713e8e4adb13320fb4e9b27e8b9d9ad089e2c3c2f7d74c1286d02c57f29bf50147135e
 EBUILD gst-plugins-soup-1.14.3.ebuild 425 BLAKE2B 7b7103a6d3a63302d759643cf447eebe184f346d0759a60071ed9ec248586b50f6cc1744448e616d4fac91d73cf84c3533cf587f6a92a9405eaafb1fe556082a SHA512 7ee128c98c3d7ea8219b8e96377841f026e09f8dc355d17cdd461aefdb713e8e4adb13320fb4e9b27e8b9d9ad089e2c3c2f7d74c1286d02c57f29bf50147135e
+EBUILD gst-plugins-soup-1.14.4.ebuild 422 BLAKE2B 9e8d38ec90f174988fe3f70883a97432bef64a6f6f76bc58f974c34b796aabfeb824fe289e615e7330cfb1bce02eff5b314cf3ba37dbad3c2d24e9fac1f72da0 SHA512 3f02a746a6e47c71177dc66a35959e3196fef93ca558ddd6ba50e9b03cd8cd167a497fe75a24d4362fdb52253b8664c6af47188d4fc9f316e295236ef2cf2e68
 MISC metadata.xml 552 BLAKE2B d1dddafba0b921d7484d1c52567a8b9fbecc611b5234bc602cef79c7953a2a3a9bb423bc929055127ab894506409ddd8e8a71cb432169b1370e65b83b2e4341e SHA512 ce8b5a2a0d33e00ef141b82b3c6d192e31b681f016f431f1306d2066677d7fac66135129f57d25f9d13644c9d3976baf74fa6e6f65f5feebee045b82d04e2d8c
diff --git a/media-plugins/gst-plugins-soup/gst-plugins-soup-1.12.4.ebuild b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.12.4.ebuild
deleted file mode 100644
index b95f1ce6cde5..000000000000
--- a/media-plugins/gst-plugins-soup/gst-plugins-soup-1.12.4.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
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer
-
-DESCRIPTION="HTTP client source/sink plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
-IUSE=""
-
-RDEPEND=">=net-libs/libsoup-2.48:2.4[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-soup/gst-plugins-soup-1.14.4.ebuild b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.14.4.ebuild
new file mode 100644
index 000000000000..b28c659e743f
--- /dev/null
+++ b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.14.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="HTTP client source/sink plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+IUSE=""
+
+RDEPEND=">=net-libs/libsoup-2.48:2.4[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-speex/Manifest b/media-plugins/gst-plugins-speex/Manifest
index 8c825fc1b641..4b8deeb0f9d2 100644
--- a/media-plugins/gst-plugins-speex/Manifest
+++ b/media-plugins/gst-plugins-speex/Manifest
@@ -1,11 +1,11 @@
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 BLAKE2B a015ef6993078f1c699badcc9911a835fe1d129b4e0dccb3937d49768d9202549204bbfb0d7ad575bcb77c75f73662a83912936b2664a2b1cd7c331e4d203c4f SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809
-DIST gst-plugins-good-1.12.4.tar.xz 3489992 BLAKE2B 41715d3e9bda183706d87085bc8cca546720f20e32fd5ecf6e284814745f2fe8ba4cfcd244e50d0734e57dde26944539b8273879608d3042262bfc10f82cc2b9 SHA512 18f270c01be80fe5b026e2c26db3ec200117ffd99c1dca55a8a78f0bd6dcc4701126836e52a410f179779e363f11218413c7b4d13e96ef5ee1bfa82e79a81178
 DIST gst-plugins-good-1.14.1.tar.xz 3776168 BLAKE2B 5b17ac49d5bae423ee887f1516ba8bfb542acb17e3f304f489dddbaa728761ee51a08e67bd10a9981f53b5b8424d8013d1723fcbbf6e06d34a39548868d34f85 SHA512 b52d3214f2d32f263637cb9f0838284483e15b8d20bf36d64c349e99b481095734a4dd2c2421176540dfe5129ecc1acc101b89cc898b4773f0f736e8e962b070
 DIST gst-plugins-good-1.14.2.tar.xz 3779912 BLAKE2B d49f82a6be7423d233ec15660470533d6bfc5da3d2ac5912ce7b3f97739b1540424c02593aff269aae3df7c6f15ca37b2d9d45fe85f3b36b910cdac4ba98f093 SHA512 26ff40d949ab95043ed717350fb344a616c72b049cd52c3e7debd9cc37f73eb9d4704b4f437ba257cecb9dba702ce451647279cb821e9405b36210b46ae9aa05
 DIST gst-plugins-good-1.14.3.tar.xz 3790052 BLAKE2B 14f4116ce3eeb20f1f2cc8e835e46a9444ef82291aad90b74e74d0e79c1974bb6f2373f79543a3a3235773c954bd9def67a9e6c64522035fa65e1541695d34e1 SHA512 1077d4ac7332a4bfd58fe5be53104e1404c3a688769520650c030488a184e64a43b301fc1f1d687de668143f849a23cb0ba2b417cf284d20710b9cf32d792e45
+DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 EBUILD gst-plugins-speex-0.10.31-r1.ebuild 397 BLAKE2B 9e5bd661cd4645bfac227e49875a57bd7db528aa019b0d47e195cec55d683a763f018546f01b9f9bcef03adee13b8d8be5bceb49aa61d1297cbbaa31a1960251 SHA512 1ae0a70f8ea59bf9f7ffd95c4ae30565db22daa8ca9dfeac0c4207c588d58cd1ec431bdbb4fb33efa233af5a59f6e6f8169b234664fc35dcf33151fb076fa510
-EBUILD gst-plugins-speex-1.12.4.ebuild 383 BLAKE2B 590a3d687ad6416ec0506dea5d2ec5e4434dfa81106eb23e4f728cb08b60f9ffa0a24df578e95395cc774878ca8b3d057aa435168dd31e71d69bf013b1d27534 SHA512 564ad55eeba95302e254d4880ed25e0ddaab91e219dac98e817d3641e8d714dac36e4d9786be99fe650f7f3c65ea6f1a4ba4f220bf5c050569b4471f56e36a8a
 EBUILD gst-plugins-speex-1.14.1.ebuild 383 BLAKE2B 590a3d687ad6416ec0506dea5d2ec5e4434dfa81106eb23e4f728cb08b60f9ffa0a24df578e95395cc774878ca8b3d057aa435168dd31e71d69bf013b1d27534 SHA512 564ad55eeba95302e254d4880ed25e0ddaab91e219dac98e817d3641e8d714dac36e4d9786be99fe650f7f3c65ea6f1a4ba4f220bf5c050569b4471f56e36a8a
 EBUILD gst-plugins-speex-1.14.2.ebuild 389 BLAKE2B 6375e27c6aad6d5c7664f72c887db8b4ae6e1ec2ae972b87f58221049dcd32c1f4e44edaab8ee6f999b7a9ca0de28378a9bd51eaa00a9b6c565196c5c0f8fd25 SHA512 356ebf5eb6501b729e50fce4f1a38bb6e3ce45b2e7b9f028f455fcad89f56c09be626e118592db114ba1da5d09fcc6959995bfe140e3c0ae9371d65738fef449
 EBUILD gst-plugins-speex-1.14.3.ebuild 389 BLAKE2B 6375e27c6aad6d5c7664f72c887db8b4ae6e1ec2ae972b87f58221049dcd32c1f4e44edaab8ee6f999b7a9ca0de28378a9bd51eaa00a9b6c565196c5c0f8fd25 SHA512 356ebf5eb6501b729e50fce4f1a38bb6e3ce45b2e7b9f028f455fcad89f56c09be626e118592db114ba1da5d09fcc6959995bfe140e3c0ae9371d65738fef449
+EBUILD gst-plugins-speex-1.14.4.ebuild 386 BLAKE2B 5a5c2fa2506cd40cbee49912ee4af57c373eb719c6faaec65b1c072d43e90aad2b1b42bbbb1970f6f26f7b90f00c473920a4d69fc25e35eaf4b391beddb339ea SHA512 988b1009ed984e6b266701587972e9e56d9d64d5add520a7be37177f0cff2bd0608cfbe3e9d7b6af5ce99c0c2801ec0f34282724f5b21a284663d05857c81d00
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-speex/gst-plugins-speex-1.12.4.ebuild b/media-plugins/gst-plugins-speex/gst-plugins-speex-1.12.4.ebuild
deleted file mode 100644
index 7c6aa0cb2649..000000000000
--- a/media-plugins/gst-plugins-speex/gst-plugins-speex-1.12.4.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
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer
-
-DESCRIPTION="Speex encoder/decoder plugin for GStreamer"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-speex/gst-plugins-speex-1.14.4.ebuild b/media-plugins/gst-plugins-speex/gst-plugins-speex-1.14.4.ebuild
new file mode 100644
index 000000000000..3084221197a4
--- /dev/null
+++ b/media-plugins/gst-plugins-speex/gst-plugins-speex-1.14.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="Speex encoder/decoder plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-taglib/Manifest b/media-plugins/gst-plugins-taglib/Manifest
index 36f4c56f3eb0..d3c96898e473 100644
--- a/media-plugins/gst-plugins-taglib/Manifest
+++ b/media-plugins/gst-plugins-taglib/Manifest
@@ -1,11 +1,11 @@
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 BLAKE2B a015ef6993078f1c699badcc9911a835fe1d129b4e0dccb3937d49768d9202549204bbfb0d7ad575bcb77c75f73662a83912936b2664a2b1cd7c331e4d203c4f SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809
-DIST gst-plugins-good-1.12.4.tar.xz 3489992 BLAKE2B 41715d3e9bda183706d87085bc8cca546720f20e32fd5ecf6e284814745f2fe8ba4cfcd244e50d0734e57dde26944539b8273879608d3042262bfc10f82cc2b9 SHA512 18f270c01be80fe5b026e2c26db3ec200117ffd99c1dca55a8a78f0bd6dcc4701126836e52a410f179779e363f11218413c7b4d13e96ef5ee1bfa82e79a81178
 DIST gst-plugins-good-1.14.1.tar.xz 3776168 BLAKE2B 5b17ac49d5bae423ee887f1516ba8bfb542acb17e3f304f489dddbaa728761ee51a08e67bd10a9981f53b5b8424d8013d1723fcbbf6e06d34a39548868d34f85 SHA512 b52d3214f2d32f263637cb9f0838284483e15b8d20bf36d64c349e99b481095734a4dd2c2421176540dfe5129ecc1acc101b89cc898b4773f0f736e8e962b070
 DIST gst-plugins-good-1.14.2.tar.xz 3779912 BLAKE2B d49f82a6be7423d233ec15660470533d6bfc5da3d2ac5912ce7b3f97739b1540424c02593aff269aae3df7c6f15ca37b2d9d45fe85f3b36b910cdac4ba98f093 SHA512 26ff40d949ab95043ed717350fb344a616c72b049cd52c3e7debd9cc37f73eb9d4704b4f437ba257cecb9dba702ce451647279cb821e9405b36210b46ae9aa05
 DIST gst-plugins-good-1.14.3.tar.xz 3790052 BLAKE2B 14f4116ce3eeb20f1f2cc8e835e46a9444ef82291aad90b74e74d0e79c1974bb6f2373f79543a3a3235773c954bd9def67a9e6c64522035fa65e1541695d34e1 SHA512 1077d4ac7332a4bfd58fe5be53104e1404c3a688769520650c030488a184e64a43b301fc1f1d687de668143f849a23cb0ba2b417cf284d20710b9cf32d792e45
+DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 EBUILD gst-plugins-taglib-0.10.31-r1.ebuild 382 BLAKE2B e456720302ad92518b49532d7591b5044e5b92a6bcddce9cfc972d666a50ae6b60f1a4adfdcdcf6bf0be3ccbebb18d89a92ff1124c6c9ac0c89a7d97bbce4fca SHA512 169755c78931a29a3f7b0a4b8b0f430b2ad8e4e6990806d49fea709645d8fd90256d34fc734ea04c479872a87b44ad486866bd80c927449b3c8cd0cda7308585
-EBUILD gst-plugins-taglib-1.12.4.ebuild 400 BLAKE2B 275964d3455bd6f3d4b41efff400dd4c0df2863630c37439916f8575294ba96a25261abe5f7cf61dbd87f63f6913bda2854089dd8e42744fbfd55a0512d1e778 SHA512 53ffc1a1001ce584fcd0fd542cb01b11193ae54f58ee63e647dd17f8f1af9e08a75432dd3e2894219282b33bbe327cbcd70f2f9e9835c9b19196e675ae4dae10
 EBUILD gst-plugins-taglib-1.14.1.ebuild 400 BLAKE2B 275964d3455bd6f3d4b41efff400dd4c0df2863630c37439916f8575294ba96a25261abe5f7cf61dbd87f63f6913bda2854089dd8e42744fbfd55a0512d1e778 SHA512 53ffc1a1001ce584fcd0fd542cb01b11193ae54f58ee63e647dd17f8f1af9e08a75432dd3e2894219282b33bbe327cbcd70f2f9e9835c9b19196e675ae4dae10
 EBUILD gst-plugins-taglib-1.14.2.ebuild 407 BLAKE2B 46dbe6d58a88fc5426abd0b7a5e49ec903523d85c432cbaa624ca9c8751588104b3719465466a1b22fc76b3c51ecc8253d43af0bba916ad0062419856a1daf87 SHA512 1c80f258bd8b6318f35374352e67a90ab90c147d1584958f696eaf454b2c392d0845444921f0f5c6cec21f566089dc6d728337e5d39279dab16cae3b33e6f493
 EBUILD gst-plugins-taglib-1.14.3.ebuild 407 BLAKE2B 46dbe6d58a88fc5426abd0b7a5e49ec903523d85c432cbaa624ca9c8751588104b3719465466a1b22fc76b3c51ecc8253d43af0bba916ad0062419856a1daf87 SHA512 1c80f258bd8b6318f35374352e67a90ab90c147d1584958f696eaf454b2c392d0845444921f0f5c6cec21f566089dc6d728337e5d39279dab16cae3b33e6f493
+EBUILD gst-plugins-taglib-1.14.4.ebuild 404 BLAKE2B 4cee4c226bab1d3dc94da93b72ff5968865d37cead6548586b4fbd79da1c248162f619ce5e37b4289531bd3b6f477ba762ed848d4b41e8a4be6d99aea47839e2 SHA512 4e17033acbc121428c061c3e4863ea3143d147ab89d7a33fb57283bd379253619c783b4f5d49e7b4fce6960bca086b03bbf98c64edda36de6a0d573ef9761fa5
 MISC metadata.xml 472 BLAKE2B 2ddad354e550883322f2276a979d7cace56275d6b0ebe9301c40a6204043c0a05b0efae27cea079bdf1c0c04b8f588ab39e080d8b0e4f405c0d0287a00c4c746 SHA512 8ddf53f0cf2e92dbc2adc5f4910b2a6fab0b0ac68eb9c9c33fd94809714d0f10d0d9d546df012a70c5d9a13adce7cccc232be4fc107b63c4649ba3ff0ff32444
diff --git a/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.12.4.ebuild b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.12.4.ebuild
deleted file mode 100644
index 5cf126bea948..000000000000
--- a/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.12.4.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
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer
-
-DESCRIPTION="ID3v2/APEv2 tagger plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=media-libs/taglib-1.9.1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.14.4.ebuild b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.14.4.ebuild
new file mode 100644
index 000000000000..5b2c84c27760
--- /dev/null
+++ b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.14.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="ID3v2/APEv2 tagger plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/taglib-1.9.1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-twolame/Manifest b/media-plugins/gst-plugins-twolame/Manifest
index 9823be10dace..397fec3ebe7a 100644
--- a/media-plugins/gst-plugins-twolame/Manifest
+++ b/media-plugins/gst-plugins-twolame/Manifest
@@ -1,9 +1,11 @@
 DIST gst-plugins-good-1.14.1.tar.xz 3776168 BLAKE2B 5b17ac49d5bae423ee887f1516ba8bfb542acb17e3f304f489dddbaa728761ee51a08e67bd10a9981f53b5b8424d8013d1723fcbbf6e06d34a39548868d34f85 SHA512 b52d3214f2d32f263637cb9f0838284483e15b8d20bf36d64c349e99b481095734a4dd2c2421176540dfe5129ecc1acc101b89cc898b4773f0f736e8e962b070
 DIST gst-plugins-good-1.14.2.tar.xz 3779912 BLAKE2B d49f82a6be7423d233ec15660470533d6bfc5da3d2ac5912ce7b3f97739b1540424c02593aff269aae3df7c6f15ca37b2d9d45fe85f3b36b910cdac4ba98f093 SHA512 26ff40d949ab95043ed717350fb344a616c72b049cd52c3e7debd9cc37f73eb9d4704b4f437ba257cecb9dba702ce451647279cb821e9405b36210b46ae9aa05
 DIST gst-plugins-good-1.14.3.tar.xz 3790052 BLAKE2B 14f4116ce3eeb20f1f2cc8e835e46a9444ef82291aad90b74e74d0e79c1974bb6f2373f79543a3a3235773c954bd9def67a9e6c64522035fa65e1541695d34e1 SHA512 1077d4ac7332a4bfd58fe5be53104e1404c3a688769520650c030488a184e64a43b301fc1f1d687de668143f849a23cb0ba2b417cf284d20710b9cf32d792e45
+DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 DIST gst-plugins-ugly-0.10.19.tar.xz 882452 BLAKE2B df5319481ade22d7acdee6e22ca57a444e104c8540bc4b578cfe7554c79bb4ee33b23a8516940f6504c30d9403c4ced2434e11f3a48548c3721d3d3db2016757 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda
 EBUILD gst-plugins-twolame-0.10.19-r1.ebuild 314 BLAKE2B 9eeec5a6fa1280b33b7d2d3d14a3063875f1f9d84b47b07435b76aafa0ac79056ccf1c9abbc9ee1e41543ddd02480e1a682fd21f26e280227aa97d88fb825f7b SHA512 a8e948e4f0137097c3717a28fc4c506db7bea4635258275a84d9175debf26b7031be85ae44fdfa0ec81ea00923c6ef813786da2a1329b59afa4a9182e8dd0171
 EBUILD gst-plugins-twolame-1.14.1.ebuild 362 BLAKE2B 4330c47b0ed2ece6f6640b88deb537391bcee4945c73b70b6b03d86b27774bfa1da84ccc0f6034ef0eee17f9045e1ba66c3e1e9b63bd1a8058a7ed56bc3e7e6d SHA512 0dff3633e0a426f2bb7a10e1d1118a97344920ad76473a0809b645f5bd2248244ca61d25f350dd1ab3342d8c1b57ee1c369776ed55f6a330c4afa014082dcf1a
 EBUILD gst-plugins-twolame-1.14.2.ebuild 367 BLAKE2B f1bc8f5c9b2c27b8effcdb0f8eccc08494a403bf58487d39f2b234fc6480839f0ba4b67c24353fad25ab42e399461a0b7d183c1decd06076064670fbf7ba023d SHA512 8442c1fdd995af4b2c82674b2bdf256fdbda890b6449e015660f4b4c96c8dbe7562d92542e40235ab185a399abbaad9e9f7064d6eeadab6f6cdc33d2246fd5b0
 EBUILD gst-plugins-twolame-1.14.3.ebuild 367 BLAKE2B f1bc8f5c9b2c27b8effcdb0f8eccc08494a403bf58487d39f2b234fc6480839f0ba4b67c24353fad25ab42e399461a0b7d183c1decd06076064670fbf7ba023d SHA512 8442c1fdd995af4b2c82674b2bdf256fdbda890b6449e015660f4b4c96c8dbe7562d92542e40235ab185a399abbaad9e9f7064d6eeadab6f6cdc33d2246fd5b0
+EBUILD gst-plugins-twolame-1.14.4.ebuild 364 BLAKE2B 3370dc062318b9b1baa29b343529a0337c6980bb18d4a64fa72222a1c7ad968159cc152ceda47df1b52368e755cda8838dac8a1265fd84e3879faedac1ede0ac SHA512 15aeae80fe7a2b6e460034bf623794ad865de4d7d700bca82c27dc2974338c0e34f8c272a094d93b38d3e9c837cac16f2ef3c097af40fb12daa574a3ea9a9fef
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.14.4.ebuild b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.14.4.ebuild
new file mode 100644
index 000000000000..201a18364796
--- /dev/null
+++ b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.14.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="MPEG2 encoder plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-v4l2/Manifest b/media-plugins/gst-plugins-v4l2/Manifest
index 4d35c9c3bbd5..8106466e3f26 100644
--- a/media-plugins/gst-plugins-v4l2/Manifest
+++ b/media-plugins/gst-plugins-v4l2/Manifest
@@ -1,13 +1,13 @@
 AUX gst-plugins-v4l2-0.10.31-linux-headers-3.6.patch 1523 BLAKE2B e1ed443e3b295a9f2a7afdc034e1dab915643d1193bd71447e4d82d73445a25be85ee0ec7d09d5b115669d7dd36e5270c3f03ce64158fd961890f549a896b26c SHA512 a1aab63fcbe6bd62d7675ea0830b6147eb7fe17ebef247d6020586c57048c0162133c1662202ad7ad7376543ac830d1ab9975f98aeb89206cb993e3d4f5d50a8
 AUX gst-plugins-v4l2-0.10.31-linux-headers-3.9.patch 738 BLAKE2B 5b15f98d2afcb33f89b961012b1df257dc8263b2a8abed4d84fb63c75a8cd2b22881b58cf05ce24e99df233e2ef9f338c388f2ebf27e04c5aee47839798a2c51 SHA512 85b6f2fc3257b4aa6a67723eed77b2a30c57bc3ce2a008acef06cd53714af0c17d606e177028b473f21b8f2efff58f95f5e1f447757ac75be9ca2fe611651885
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 BLAKE2B a015ef6993078f1c699badcc9911a835fe1d129b4e0dccb3937d49768d9202549204bbfb0d7ad575bcb77c75f73662a83912936b2664a2b1cd7c331e4d203c4f SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809
-DIST gst-plugins-good-1.12.4.tar.xz 3489992 BLAKE2B 41715d3e9bda183706d87085bc8cca546720f20e32fd5ecf6e284814745f2fe8ba4cfcd244e50d0734e57dde26944539b8273879608d3042262bfc10f82cc2b9 SHA512 18f270c01be80fe5b026e2c26db3ec200117ffd99c1dca55a8a78f0bd6dcc4701126836e52a410f179779e363f11218413c7b4d13e96ef5ee1bfa82e79a81178
 DIST gst-plugins-good-1.14.1.tar.xz 3776168 BLAKE2B 5b17ac49d5bae423ee887f1516ba8bfb542acb17e3f304f489dddbaa728761ee51a08e67bd10a9981f53b5b8424d8013d1723fcbbf6e06d34a39548868d34f85 SHA512 b52d3214f2d32f263637cb9f0838284483e15b8d20bf36d64c349e99b481095734a4dd2c2421176540dfe5129ecc1acc101b89cc898b4773f0f736e8e962b070
 DIST gst-plugins-good-1.14.2.tar.xz 3779912 BLAKE2B d49f82a6be7423d233ec15660470533d6bfc5da3d2ac5912ce7b3f97739b1540424c02593aff269aae3df7c6f15ca37b2d9d45fe85f3b36b910cdac4ba98f093 SHA512 26ff40d949ab95043ed717350fb344a616c72b049cd52c3e7debd9cc37f73eb9d4704b4f437ba257cecb9dba702ce451647279cb821e9405b36210b46ae9aa05
 DIST gst-plugins-good-1.14.3.tar.xz 3790052 BLAKE2B 14f4116ce3eeb20f1f2cc8e835e46a9444ef82291aad90b74e74d0e79c1974bb6f2373f79543a3a3235773c954bd9def67a9e6c64522035fa65e1541695d34e1 SHA512 1077d4ac7332a4bfd58fe5be53104e1404c3a688769520650c030488a184e64a43b301fc1f1d687de668143f849a23cb0ba2b417cf284d20710b9cf32d792e45
+DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 EBUILD gst-plugins-v4l2-0.10.31-r1.ebuild 829 BLAKE2B 695b8b8aba7477541c7425d5a3dc5c50ee6fd62d8480cb8a440a6aa40b5c22861ea701d2ab7c9b355d7e42ef748e7cdc6836568184f0c9eeef4be078145cac99 SHA512 38b460f13965a518bf6910a0ffa60a1bd89c68bed5ee2eb07873bda27dcc55260ef6f4520b6a8dd97a8a4cc62215762b6003441d8df4484133dda6586a13ffb4
-EBUILD gst-plugins-v4l2-1.12.4.ebuild 664 BLAKE2B ca8066b64e60349f550a484502b58bb12ac7706f25cefcb26d1bd09d7e13cbf67cc582dcd67ff9558b2dd35bba5a2b93fb5ec5290d443bf8967690e8fcdcc9a9 SHA512 177b3b852c5f0aa01332d39e9cc3c13dee5d493cd8e7917fc5b54bde3cfd614a2e05cc0c468328480ea44e25726b5add6940eb649e8625170873da567618cf60
 EBUILD gst-plugins-v4l2-1.14.1.ebuild 664 BLAKE2B ca8066b64e60349f550a484502b58bb12ac7706f25cefcb26d1bd09d7e13cbf67cc582dcd67ff9558b2dd35bba5a2b93fb5ec5290d443bf8967690e8fcdcc9a9 SHA512 177b3b852c5f0aa01332d39e9cc3c13dee5d493cd8e7917fc5b54bde3cfd614a2e05cc0c468328480ea44e25726b5add6940eb649e8625170873da567618cf60
 EBUILD gst-plugins-v4l2-1.14.2.ebuild 671 BLAKE2B 1722eca0cdd596914b97f95f58b5963050c745519fa6ffbd66fb3db58b1e6560a3355dbbe8dfacd57d77b11f144becadd8a3bf525b3c2f7ea126c3626aab57da SHA512 f4696033ed481d43a65205b5746847a9c72216ee1e36141b3669070a6c5b75e1290c24522f38c57da9e15cfac0d7f1a38d18d4d2dadcd0c4e9e81c9fc710d98c
 EBUILD gst-plugins-v4l2-1.14.3.ebuild 671 BLAKE2B 1722eca0cdd596914b97f95f58b5963050c745519fa6ffbd66fb3db58b1e6560a3355dbbe8dfacd57d77b11f144becadd8a3bf525b3c2f7ea126c3626aab57da SHA512 f4696033ed481d43a65205b5746847a9c72216ee1e36141b3669070a6c5b75e1290c24522f38c57da9e15cfac0d7f1a38d18d4d2dadcd0c4e9e81c9fc710d98c
+EBUILD gst-plugins-v4l2-1.14.4.ebuild 668 BLAKE2B a356fcb188c394704bd5989f676036f4c0f597bf71e64bdacf4de955991b1bef1470f7ce03ef20aad045157bf8eba488c435a01b91e780fdb670e4c1b7cf783b SHA512 78eabd4e4ceb3acb872e9874660b2bdf7f5a2314daf10fdd560c4974511a636b785547ab026dc35f8d9c16c4e52f54199cce422153102372e66253a065d1aab4
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.12.4.ebuild b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.12.4.ebuild
deleted file mode 100644
index e7a845ad0ac0..000000000000
--- a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.12.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer
-
-DESCRIPION="V4L2 source/sink plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE="udev"
-
-RDEPEND="
-	>=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
-	udev? ( >=virtual/libgudev-208:=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-"
-
-GST_PLUGINS_BUILD="gst_v4l2"
-
-multilib_src_configure() {
-	gstreamer_multilib_src_configure \
-		--with-libv4l2 \
-		$(use_with udev gudev)
-}
diff --git a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.14.4.ebuild b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.14.4.ebuild
new file mode 100644
index 000000000000..cc0c150dd760
--- /dev/null
+++ b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.14.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPION="V4L2 source/sink plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="udev"
+
+RDEPEND="
+	>=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	udev? ( >=virtual/libgudev-208:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	virtual/os-headers
+"
+
+GST_PLUGINS_BUILD="gst_v4l2"
+
+multilib_src_configure() {
+	gstreamer_multilib_src_configure \
+		--with-libv4l2 \
+		$(use_with udev gudev)
+}
diff --git a/media-plugins/gst-plugins-vpx/Manifest b/media-plugins/gst-plugins-vpx/Manifest
index 7c33948cb487..136640f9eb11 100644
--- a/media-plugins/gst-plugins-vpx/Manifest
+++ b/media-plugins/gst-plugins-vpx/Manifest
@@ -1,9 +1,9 @@
-DIST gst-plugins-good-1.12.4.tar.xz 3489992 BLAKE2B 41715d3e9bda183706d87085bc8cca546720f20e32fd5ecf6e284814745f2fe8ba4cfcd244e50d0734e57dde26944539b8273879608d3042262bfc10f82cc2b9 SHA512 18f270c01be80fe5b026e2c26db3ec200117ffd99c1dca55a8a78f0bd6dcc4701126836e52a410f179779e363f11218413c7b4d13e96ef5ee1bfa82e79a81178
 DIST gst-plugins-good-1.14.1.tar.xz 3776168 BLAKE2B 5b17ac49d5bae423ee887f1516ba8bfb542acb17e3f304f489dddbaa728761ee51a08e67bd10a9981f53b5b8424d8013d1723fcbbf6e06d34a39548868d34f85 SHA512 b52d3214f2d32f263637cb9f0838284483e15b8d20bf36d64c349e99b481095734a4dd2c2421176540dfe5129ecc1acc101b89cc898b4773f0f736e8e962b070
 DIST gst-plugins-good-1.14.2.tar.xz 3779912 BLAKE2B d49f82a6be7423d233ec15660470533d6bfc5da3d2ac5912ce7b3f97739b1540424c02593aff269aae3df7c6f15ca37b2d9d45fe85f3b36b910cdac4ba98f093 SHA512 26ff40d949ab95043ed717350fb344a616c72b049cd52c3e7debd9cc37f73eb9d4704b4f437ba257cecb9dba702ce451647279cb821e9405b36210b46ae9aa05
 DIST gst-plugins-good-1.14.3.tar.xz 3790052 BLAKE2B 14f4116ce3eeb20f1f2cc8e835e46a9444ef82291aad90b74e74d0e79c1974bb6f2373f79543a3a3235773c954bd9def67a9e6c64522035fa65e1541695d34e1 SHA512 1077d4ac7332a4bfd58fe5be53104e1404c3a688769520650c030488a184e64a43b301fc1f1d687de668143f849a23cb0ba2b417cf284d20710b9cf32d792e45
-EBUILD gst-plugins-vpx-1.12.4.ebuild 403 BLAKE2B cc27475c9170948906702209d6865360187b54b798d229092c64f9acf2d9606bd6f5fc47dfd290a4a599fbbce0019ab81d298a1cc355bb8eea5178689a3197ef SHA512 ba8c0035bf9b808602eb75e578dd42707460ae72af208201474ec8cb2432ae0f969db68a1abf6874197083956f8e05e476bb543792faa2e155f95eec9760f351
+DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 EBUILD gst-plugins-vpx-1.14.1.ebuild 403 BLAKE2B cc27475c9170948906702209d6865360187b54b798d229092c64f9acf2d9606bd6f5fc47dfd290a4a599fbbce0019ab81d298a1cc355bb8eea5178689a3197ef SHA512 ba8c0035bf9b808602eb75e578dd42707460ae72af208201474ec8cb2432ae0f969db68a1abf6874197083956f8e05e476bb543792faa2e155f95eec9760f351
 EBUILD gst-plugins-vpx-1.14.2.ebuild 410 BLAKE2B c650a0b8fa0c62b0ca3e3fa6b8310e8f92c6727d624b358e953448c3ec252dff9f020a6c6f6abc35f8103e7de7d7c3afd2ef1990cc6b83892d54ab498a67cafc SHA512 8b08e446ad6fd473c6ae2c8a0ebf60ccf92e68538eb8659d62b3568d2a80208bb35b39a5bafcfd686c21762ba40a57eb4a24761dc06e657e3574766395fc72fb
 EBUILD gst-plugins-vpx-1.14.3.ebuild 410 BLAKE2B c650a0b8fa0c62b0ca3e3fa6b8310e8f92c6727d624b358e953448c3ec252dff9f020a6c6f6abc35f8103e7de7d7c3afd2ef1990cc6b83892d54ab498a67cafc SHA512 8b08e446ad6fd473c6ae2c8a0ebf60ccf92e68538eb8659d62b3568d2a80208bb35b39a5bafcfd686c21762ba40a57eb4a24761dc06e657e3574766395fc72fb
+EBUILD gst-plugins-vpx-1.14.4.ebuild 407 BLAKE2B a6705f10235c5ae9f5b1510165bd66745240903d7e27f92ee0a99387f2d66b8b106b9e9f0c637d2106f2025beea5f1b5e9564f70e63f502c59ec1812a65a4680 SHA512 f5d156a26ad1216adfd934a683a348ad02c4d1394f055ed3ce2f4dd4faaf2712a5171211bebf242488a2bfca8be65a727d71ba9378dfcd0146da10bec85d05cc
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.12.4.ebuild b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.12.4.ebuild
deleted file mode 100644
index a466ed141198..000000000000
--- a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.12.4.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
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer
-
-DESCRIPTION="VP8/VP9 video encoder/decoder plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
-IUSE=""
-
-RDEPEND=">=media-libs/libvpx-1.3.0:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.14.4.ebuild b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.14.4.ebuild
new file mode 100644
index 000000000000..a46eaa8fa307
--- /dev/null
+++ b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.14.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="VP8/VP9 video encoder/decoder plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/libvpx-1.3.0:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-wavpack/Manifest b/media-plugins/gst-plugins-wavpack/Manifest
index 4bd10189a9c3..2287bfedb089 100644
--- a/media-plugins/gst-plugins-wavpack/Manifest
+++ b/media-plugins/gst-plugins-wavpack/Manifest
@@ -1,11 +1,11 @@
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 BLAKE2B a015ef6993078f1c699badcc9911a835fe1d129b4e0dccb3937d49768d9202549204bbfb0d7ad575bcb77c75f73662a83912936b2664a2b1cd7c331e4d203c4f SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809
-DIST gst-plugins-good-1.12.4.tar.xz 3489992 BLAKE2B 41715d3e9bda183706d87085bc8cca546720f20e32fd5ecf6e284814745f2fe8ba4cfcd244e50d0734e57dde26944539b8273879608d3042262bfc10f82cc2b9 SHA512 18f270c01be80fe5b026e2c26db3ec200117ffd99c1dca55a8a78f0bd6dcc4701126836e52a410f179779e363f11218413c7b4d13e96ef5ee1bfa82e79a81178
 DIST gst-plugins-good-1.14.1.tar.xz 3776168 BLAKE2B 5b17ac49d5bae423ee887f1516ba8bfb542acb17e3f304f489dddbaa728761ee51a08e67bd10a9981f53b5b8424d8013d1723fcbbf6e06d34a39548868d34f85 SHA512 b52d3214f2d32f263637cb9f0838284483e15b8d20bf36d64c349e99b481095734a4dd2c2421176540dfe5129ecc1acc101b89cc898b4773f0f736e8e962b070
 DIST gst-plugins-good-1.14.2.tar.xz 3779912 BLAKE2B d49f82a6be7423d233ec15660470533d6bfc5da3d2ac5912ce7b3f97739b1540424c02593aff269aae3df7c6f15ca37b2d9d45fe85f3b36b910cdac4ba98f093 SHA512 26ff40d949ab95043ed717350fb344a616c72b049cd52c3e7debd9cc37f73eb9d4704b4f437ba257cecb9dba702ce451647279cb821e9405b36210b46ae9aa05
 DIST gst-plugins-good-1.14.3.tar.xz 3790052 BLAKE2B 14f4116ce3eeb20f1f2cc8e835e46a9444ef82291aad90b74e74d0e79c1974bb6f2373f79543a3a3235773c954bd9def67a9e6c64522035fa65e1541695d34e1 SHA512 1077d4ac7332a4bfd58fe5be53104e1404c3a688769520650c030488a184e64a43b301fc1f1d687de668143f849a23cb0ba2b417cf284d20710b9cf32d792e45
+DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 EBUILD gst-plugins-wavpack-0.10.31-r1.ebuild 397 BLAKE2B bc5868e4a430253b890b6a662334cf199b033a4497aec1764d42d3e12cf470c22e29bd0197cfad64ce8378a917331f610e2b972225bf795d87c9f63b68d37405 SHA512 c68e2de726862d5ced9680237511046c157fc0ea8cfff51bed4f9cc08043b6cc2a9808b6692ae751aaf57484e8543a609955c1cf22ef6c22df28a9d5f9ce2f2a
-EBUILD gst-plugins-wavpack-1.12.4.ebuild 404 BLAKE2B d604fdf86804080704c8ae6e56faa87a8aacef317ef32625ae223b6bee916f7253f19e23f7fb0b6075f0d0f60923b3cc8cacd3866c560b6d25e7f5000c52b607 SHA512 1d4355a1ae44c65390edcc750974cacdb409951cf15d9712fbd5ec97f572f80834e6e3bb8dc1ea6b4e01eb3ea6ea162a23b164072d66ae94d7f894699957b697
 EBUILD gst-plugins-wavpack-1.14.1.ebuild 404 BLAKE2B d604fdf86804080704c8ae6e56faa87a8aacef317ef32625ae223b6bee916f7253f19e23f7fb0b6075f0d0f60923b3cc8cacd3866c560b6d25e7f5000c52b607 SHA512 1d4355a1ae44c65390edcc750974cacdb409951cf15d9712fbd5ec97f572f80834e6e3bb8dc1ea6b4e01eb3ea6ea162a23b164072d66ae94d7f894699957b697
 EBUILD gst-plugins-wavpack-1.14.2.ebuild 409 BLAKE2B e9fe7c9319a8de226634ccdf1b2b669a00395273e992a5b210edeff931a87c899d14b462bfaeb2a859e9ece17474e682ccbd60308a3e48ca71120227465e0b18 SHA512 29250dc1bb1b51f38baf09bf8250406586e45b69cb8dd22370792652c1ac0d8090f363d04ef0fdd07a47f7a2ce4f14c7faa23af806c999821fec12168213b3b3
 EBUILD gst-plugins-wavpack-1.14.3.ebuild 409 BLAKE2B e9fe7c9319a8de226634ccdf1b2b669a00395273e992a5b210edeff931a87c899d14b462bfaeb2a859e9ece17474e682ccbd60308a3e48ca71120227465e0b18 SHA512 29250dc1bb1b51f38baf09bf8250406586e45b69cb8dd22370792652c1ac0d8090f363d04ef0fdd07a47f7a2ce4f14c7faa23af806c999821fec12168213b3b3
+EBUILD gst-plugins-wavpack-1.14.4.ebuild 406 BLAKE2B 5c60b6beeacfaf831f103ec28cade59ae2adf89c4a75296b474404ce9efe0deaed0688671dbb555d839e00ed92db169a817e7ede4cdfa69985077bc2bc922b87 SHA512 48d2022ed01f1b1bf3e940d5cec5e25a4d3406f93ebd6d3fc8b9c4ed72c19a0f928bd6cf5ee9970d117d43cc6ecf5c483467aa6eaee19c8c9d9e27d6a727dfe4
 MISC metadata.xml 529 BLAKE2B 137cd943fda3cba7c57ece2b4eff3c1beb0c694dd564f11a82249171fc2bf17448a18aabd2ebf4eb21dfefef07c9a0a8a749df48e79e7709b56634d4ad8a8250 SHA512 31c1c1b8f7e462a53d6bd6cc68c310f5236c6ba52f3fac37775a30dcc0448b2fba900c1b2ef16f31566f03a3b823aa6de02ccaf033f6ec587d64a175aa57ade4
diff --git a/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.12.4.ebuild b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.12.4.ebuild
deleted file mode 100644
index 32faaad2665a..000000000000
--- a/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.12.4.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
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer
-
-DESCRIPTION="Wavpack audio encoder/decoder plugin for GStreamer"
-KEYWORDS="alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
-IUSE=""
-
-RDEPEND=">=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.14.4.ebuild b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.14.4.ebuild
new file mode 100644
index 000000000000..e2d427f25a29
--- /dev/null
+++ b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.14.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="Wavpack audio encoder/decoder plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND=">=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-ximagesrc/Manifest b/media-plugins/gst-plugins-ximagesrc/Manifest
index 03b51730bea3..34ab7bf9fc2a 100644
--- a/media-plugins/gst-plugins-ximagesrc/Manifest
+++ b/media-plugins/gst-plugins-ximagesrc/Manifest
@@ -1,11 +1,11 @@
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 BLAKE2B a015ef6993078f1c699badcc9911a835fe1d129b4e0dccb3937d49768d9202549204bbfb0d7ad575bcb77c75f73662a83912936b2664a2b1cd7c331e4d203c4f SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809
-DIST gst-plugins-good-1.12.4.tar.xz 3489992 BLAKE2B 41715d3e9bda183706d87085bc8cca546720f20e32fd5ecf6e284814745f2fe8ba4cfcd244e50d0734e57dde26944539b8273879608d3042262bfc10f82cc2b9 SHA512 18f270c01be80fe5b026e2c26db3ec200117ffd99c1dca55a8a78f0bd6dcc4701126836e52a410f179779e363f11218413c7b4d13e96ef5ee1bfa82e79a81178
 DIST gst-plugins-good-1.14.1.tar.xz 3776168 BLAKE2B 5b17ac49d5bae423ee887f1516ba8bfb542acb17e3f304f489dddbaa728761ee51a08e67bd10a9981f53b5b8424d8013d1723fcbbf6e06d34a39548868d34f85 SHA512 b52d3214f2d32f263637cb9f0838284483e15b8d20bf36d64c349e99b481095734a4dd2c2421176540dfe5129ecc1acc101b89cc898b4773f0f736e8e962b070
 DIST gst-plugins-good-1.14.2.tar.xz 3779912 BLAKE2B d49f82a6be7423d233ec15660470533d6bfc5da3d2ac5912ce7b3f97739b1540424c02593aff269aae3df7c6f15ca37b2d9d45fe85f3b36b910cdac4ba98f093 SHA512 26ff40d949ab95043ed717350fb344a616c72b049cd52c3e7debd9cc37f73eb9d4704b4f437ba257cecb9dba702ce451647279cb821e9405b36210b46ae9aa05
 DIST gst-plugins-good-1.14.3.tar.xz 3790052 BLAKE2B 14f4116ce3eeb20f1f2cc8e835e46a9444ef82291aad90b74e74d0e79c1974bb6f2373f79543a3a3235773c954bd9def67a9e6c64522035fa65e1541695d34e1 SHA512 1077d4ac7332a4bfd58fe5be53104e1404c3a688769520650c030488a184e64a43b301fc1f1d687de668143f849a23cb0ba2b417cf284d20710b9cf32d792e45
+DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 EBUILD gst-plugins-ximagesrc-0.10.31-r2.ebuild 666 BLAKE2B e5d07c16456bbfbebc1c0c1af97732c921883baeede744c31f5fbe057b4cebb3dc99ad5547a30fd53c22bddaf9945496a3d9bfc45a52d628d5625d4f04572414 SHA512 adf9acb7f342544bc6cc447c61709afa9d1c9c6e3736bbf0b7dc8b788a85e82dfbc46b6a13011cfaa080848da88b93935179fc7cf1eb3cf4ad40f64fdf0024fb
-EBUILD gst-plugins-ximagesrc-1.12.4.ebuild 678 BLAKE2B d66d2053be387efba2f4abe3269568c027acf6d1204d9fdc715caeb0e10947856b83d2876b57bc70b56815ff61bb77e9242b821e2f1088e6426c471d7dbf7a69 SHA512 0c354d876bedae182f99e17b3d9ea11f3bdb8e06091a45e6c3d59e08b6fca24c348b45cc74e7dbaef9431b48e052f9d5dd2fc650a3a729413db7f186ca1d25ab
 EBUILD gst-plugins-ximagesrc-1.14.1.ebuild 685 BLAKE2B b906367b1abe11e2362575233007103ed2cceff4393a573850bc26fbec253ab484a557a8fdd02342b391556cd7a25d5f35e49971733292ea03a92de466e369f6 SHA512 a1d5aee9b7c86f07efe00cbd7cd470109d6febb63f108f8bac892adc4f09de8981696efc7556e1dec7620af2c7982a812b7f4d74a37bdbd28be557f7e9d30e7f
 EBUILD gst-plugins-ximagesrc-1.14.2.ebuild 682 BLAKE2B 3f3ced18341789ebafc3aa97686075be0caf53ae2a1ec443b93ae1183d9cdfdebcbfb7a730eb4c14f6cc7fb6beb9365a060cce2ad461f964c4e49990098d3da4 SHA512 19eddd36d5b775b70561e0051cd562538e67eae38d90365c85cfe161c1de8c5628325700b39f777a271b1dc5d0e2e8b5694aace4a09451d10d8aa924a7b2560a
 EBUILD gst-plugins-ximagesrc-1.14.3.ebuild 682 BLAKE2B 3f3ced18341789ebafc3aa97686075be0caf53ae2a1ec443b93ae1183d9cdfdebcbfb7a730eb4c14f6cc7fb6beb9365a060cce2ad461f964c4e49990098d3da4 SHA512 19eddd36d5b775b70561e0051cd562538e67eae38d90365c85cfe161c1de8c5628325700b39f777a271b1dc5d0e2e8b5694aace4a09451d10d8aa924a7b2560a
+EBUILD gst-plugins-ximagesrc-1.14.4.ebuild 679 BLAKE2B 68bbb0178fea2b66bf4cafaa151ffaaadf2d1ef602d2ebeabbf8cbcfde61d21e623a3a2afede10e564ed24c1956a9d3fc93dd3c347a7d6f6f3028cf9937cd569 SHA512 8e8d5066f27633f346ae43501a5294d8153aeeaf9aca0b2081d287722ddadd98f621dd77c14d2456474daac57c666611e0d25eb91ca20856b7b1fbb533598689
 MISC metadata.xml 457 BLAKE2B 6af6de3816b28b279400abcc8e9fce070ce8ac5ce2f4ccbecff7d16ba0081bb277db520bd4efaeb07e48b220cf35baf09e0c68e7d99fab59eefc57c0881af49b SHA512 52d8e5e5f48b1e6a0f0e5742307348d66ec3302ffa32dc1dde2f98078621c242d431bf2354902f5ca17b277910cb733336219bc8c1598a1b4ea2c149fcbcf559
diff --git a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.12.4.ebuild b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.12.4.ebuild
deleted file mode 100644
index e9a0f3958ffb..000000000000
--- a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.12.4.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
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer
-
-DESCRIPTION="X11 video capture stream plugin for GStreamer"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
-
-# xshm is a compile time option of ximage
-GST_PLUGINS_BUILD="x xshm"
-GST_PLUGINS_BUILD_DIR="ximage"
diff --git a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.14.4.ebuild b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.14.4.ebuild
new file mode 100644
index 000000000000..b01efa81951d
--- /dev/null
+++ b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.14.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="X11 video capture stream plugin for GStreamer"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
+
+# xshm is a compile time option of ximage
+GST_PLUGINS_BUILD="x xshm"
+GST_PLUGINS_BUILD_DIR="ximage"
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index bb48404528a1..bdd2ab5bf2ea 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/apulse/Manifest b/media-sound/apulse/Manifest
index b22c3e6639b5..e9b470b22ae1 100644
--- a/media-sound/apulse/Manifest
+++ b/media-sound/apulse/Manifest
@@ -3,5 +3,5 @@ AUX sdk.patch 4357 BLAKE2B ad43209ebf78f1f8937bfde54c88034a9c0f426caf62da5aa70b6
 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 1596 BLAKE2B c120689c687e645fe1d3bc93924521b21dcee1c4b63e131c89fea710338838b68573b4d8d3cbc5537988d1a057a65c1f1a0d91711c601d817b30c2953569160c SHA512 770654a65ea7dca987b6e367018e256f1cb52bab940a9935b4aa45933c926062cc211277e918ff697c3efa9b786ba1a0895e59fd7381c924a2c29e774875031e
+EBUILD apulse-0.1.12-r4.ebuild 1427 BLAKE2B ec17b7b6e2851c83bc37c5717116b2bdfc29793ef8cd99c8f2e0666424282170e19e7f56d599266ca6dcbb95ce4c54ed15a0b6f353bac753e318f60764fa8be3 SHA512 5394018fc9c5bea858512980a959067b934e662ac8393cd88b60ed77762d77d0eeeba0dd65ded3d4a528713b2cab95b8d2fb5da1199337536a05c1c22630e680
 MISC metadata.xml 539 BLAKE2B 958678641d39164ac7da9bb779329185aafe5d551dfbabaaa0872b47cbfeba6fa5d545e715ebb1fb4eb730bc192696a1517c4f474a0a51f81136b213ec4fe9ea SHA512 49cce06f24b1c9a5ec42f549fc018517650339347f97e02864ea0e2a4216c092d38c75c46a588bad3896843962b477c2ad94b34cb1f39f8255116fc4b2c92fde
diff --git a/media-sound/apulse/apulse-0.1.12-r4.ebuild b/media-sound/apulse/apulse-0.1.12-r4.ebuild
index 46b1d98a51ad..b4e49def9d58 100644
--- a/media-sound/apulse/apulse-0.1.12-r4.ebuild
+++ b/media-sound/apulse/apulse-0.1.12-r4.ebuild
@@ -49,10 +49,7 @@ multilib_src_test() {
 }
 
 multilib_src_install_all() {
-	cmake-utils_src_install
-	# The easiest way would be setting MULTILIB_CHOST_TOOLS at global scope, depending
-	# on USE=sdk, but this is no longer permitted, so workaround is required.
-	# See bug 666884 for details.
+	# Do not use deprecated MULTILIB_CHOST_TOOLS
 	if ! use sdk; then
 		unset BUILD_DIR
 		_install_wrapper() { newbin "${BUILD_DIR}/apulse" "${CHOST}-apulse"; }
diff --git a/media-sound/bristol/Manifest b/media-sound/bristol/Manifest
index 002559d3206e..d618971f1936 100644
--- a/media-sound/bristol/Manifest
+++ b/media-sound/bristol/Manifest
@@ -1,8 +1,7 @@
 AUX bristol-0.60.11-cflags.patch 7046 BLAKE2B 1b51164828f40f722afeafd955efae25f11cd913bb223f670ea65368a56e8aad1c12480b3d5ec4b0787bebd5425ebc291d71bdc6f74ef1efdcc726d5d388606b SHA512 92881949eeeabd3afa6253f4830bcc3925bd8889ac8335c08b86a3d9c7e53ca097527a51a341d5f7bcb2fd81eda5e038a33eff92af381d8d6b6e0f03e5bcbe1e
+AUX bristol-0.60.11-dontcompress.patch 576 BLAKE2B 78f5629897a3ae3380f5e64ccce6fc485acddf12051a5be33ccde597ba20b8064dc8d597d6e93424c56eacd2ce8cb32bcce7c42bb9530b308136747cf21bbc5b SHA512 dd2fa1859af1e071784138af701caf65d9a076e287d767d64d70cba56462e6ce5c62aea2c50dd617598059372ef1cbe5d9571e3d18110bd64e7789fdb5d9edad
 AUX bristol-0.60.11-implicit-dec.patch 320 BLAKE2B 8fef42ab74f5f6777c86774a7f7c8092b20d8c596ab2118fd862bc32e0f3fa55ceee488cc88d4599f22b4b373d67c2af3ea189f3508e30564ffc71acb5e812a1 SHA512 50a59747c75a8843b06fc412c65d724d8f205be1c6d9d5c0aa0d38c57f0f1401634dd301b531f8a28ca43f3804727d9ded82e6fa49abd5372fc8e70f87f5b341
-AUX bristol-0.60.9-cflags.patch 553 BLAKE2B be5f096b1627d15d90b2c915e45e4f9112d41ff29bcc7121141c91928724af4fec0bc78a85ca79f5f398c4c304fb41f61cb41fcbfd84bae80a31bc2a1f6a89c2 SHA512 a687832402925cf596fdc563496607dd366bb6bd0f0ca6873ab28053eb6f03a164308cbcb2a9da3acce199610b225b3581e2dc3dab723693a57a1498aa32c4f3
+AUX bristol-0.60.11-rm_alsa-iatomic.h.patch 967 BLAKE2B 9da2f53f06e4db83c5fe280e3253c70a83e052304c9e5adcd6e64956c81ea7bfd9eaf1dd5d639aca581c16bb446140fcef591753b3325aa0f700ed3a8649f1db SHA512 a86aefdcb1a6431bce94dc062b4f3e73332196fc71a154c8d171991cd61b3694958229c5d329245e098976732f03f75516dd7521d887b822bd6441e66a1bd64a
 DIST bristol-0.60.11.tar.gz 4218697 BLAKE2B f981b3d54e763092539ff631cbb48c06846a1fdde79db385a904d1af280ffd1520c88cbcfdc7f3d504cc65bde35c55f804545eed5ccac14b1ab17b1dce3e184e SHA512 2485e89cc46922b436e47c28e66a1f5ba032f6ad16bc0bb865ce70b25ffe9658e63dcab7203a982f7610839fd862a0f4dbe905908f22c4ed24e083d9770fc180
-DIST bristol-0.60.9.tar.gz 4323706 BLAKE2B 39c9a834ba9411f7a434dbc8db8630dd0200c25e645a315b57f1ed8626c816b42da6b5473ff882a01f766ed10240cf7bce98d3091be5c2a8e16c4af0cd6afd5f SHA512 216af07af507ecefa4f2ddcd61fda1c1b7456df1d50cd31112fcf2aa6a3aa153557f72d7ec35f5df70b9ce33935f01d27c8ad2cd42fef9622f3645179ae685ff
-EBUILD bristol-0.60.11.ebuild 1080 BLAKE2B f12711b0229ea0a2521e38751900c22837609d96de5a1ae5995b4f99d5b7a6cb62964de14f7a47878e87272b6bfb217f01c434ee327decfdd65f544311b878f2 SHA512 9e5066243a226662bc0909e8336365d46422f94104783db4455edaf3a1708a97606429f6c5e215a989ca94605e1c710ed2f57a1a3a322f38c0c0052d7a39ea13
-EBUILD bristol-0.60.9.ebuild 1025 BLAKE2B 26bc547f9f90b14e036d6eca5518145cab2a67dacba5ab41c1e7efbe74e2d3f01f87ea80b6df0e0c1300e371a966841614b7dd5e0910353e18c849965457134e SHA512 21c3632efc9d820b1f6fd5277117c59d03d941767e67710845eb7913dd49ed2a4d295b282b7ecadf735a559988b5fe87835604cb087bbf08d10c434e86b2f8e4
+EBUILD bristol-0.60.11-r1.ebuild 1196 BLAKE2B e32f880e80f8b418bc7a96b319a8ce108f7b6d1ad904c61b3732b16cc3fc497f8fd746e865679240bdde50fb084d2a8f858b09ace5af1f2d415f65f801927aff SHA512 3ec5ec5cda247f80c95189fa89f8783b4af16892df646e5784b814cc025808f366a57424c6571128ee7729494207ab2ad8b6745dd10840790ed295f89ca43430
 MISC metadata.xml 599 BLAKE2B fa41cf25b04bb687587a736332f3b66a63a52d13c0371b64aaf8c7d12515df8ac9b15c3e70687b6cd8157b493a65992f2e8a1a96db12cd372215b9791b46fc7d SHA512 ca1be472e9a1dce6e55d3313e9b11f0839fbb321c5b662ebf4a9aca0915d10b15cbe3aee3629b285886e84b53f8c7d0c65613e58be32d5d98f04360b368da1ba
diff --git a/media-sound/bristol/bristol-0.60.11-r1.ebuild b/media-sound/bristol/bristol-0.60.11-r1.ebuild
new file mode 100644
index 000000000000..0cb211ac2850
--- /dev/null
+++ b/media-sound/bristol/bristol-0.60.11-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Synthesizer keyboard emulation package: Moog, Hammond and others"
+HOMEPAGE="https://sourceforge.net/projects/bristol"
+SRC_URI="mirror://sourceforge/bristol/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa oss static-libs"
+# osc : configure option but no code it seems...
+# jack: fails to build if disabled
+# pulseaudio: not fully supported
+
+RDEPEND="
+	>=media-sound/jack-audio-connection-kit-0.109.2
+	x11-libs/libX11
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+"
+# osc? ( >=media-libs/liblo-0.22 )
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+
+DOCS=( AUTHORS ChangeLog HOWTO NEWS README )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cflags.patch
+	"${FILESDIR}"/${P}-implicit-dec.patch
+	"${FILESDIR}"/${P}-dontcompress.patch
+	"${FILESDIR}"/${P}-rm_alsa-iatomic.h.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-version-check \
+		$(use_enable alsa) \
+		$(use_enable oss) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-sound/bristol/bristol-0.60.11.ebuild b/media-sound/bristol/bristol-0.60.11.ebuild
deleted file mode 100644
index a5df5a182405..000000000000
--- a/media-sound/bristol/bristol-0.60.11.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 eutils autotools
-
-DESCRIPTION="Synthesizer keyboard emulation package: Moog, Hammond and others"
-HOMEPAGE="https://sourceforge.net/projects/bristol"
-SRC_URI="mirror://sourceforge/bristol/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa oss static-libs"
-# osc : configure option but no code it seems...
-# jack: fails to build if disabled
-# pulseaudio: not fully supported
-
-RDEPEND=">=media-sound/jack-audio-connection-kit-0.109.2
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )
-	x11-libs/libX11"
-# osc? ( >=media-libs/liblo-0.22 )
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-DOCS=( AUTHORS ChangeLog HOWTO NEWS README )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-cflags.patch
-	epatch "${FILESDIR}"/${P}-implicit-dec.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--disable-version-check \
-		$(use_enable oss) \
-		$(use_enable alsa)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/media-sound/bristol/bristol-0.60.9.ebuild b/media-sound/bristol/bristol-0.60.9.ebuild
deleted file mode 100644
index 1b2744c0bfc8..000000000000
--- a/media-sound/bristol/bristol-0.60.9.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils autotools-utils
-
-DESCRIPTION="Synthesizer keyboard emulation package: Moog, Hammond and others"
-HOMEPAGE="https://sourceforge.net/projects/bristol"
-SRC_URI="mirror://sourceforge/bristol/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa oss static-libs"
-# osc : configure option but no code it seems...
-# jack: fails to build if disabled
-
-RDEPEND=">=media-sound/jack-audio-connection-kit-0.109.2
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )
-	x11-libs/libX11"
-# osc? ( >=media-libs/liblo-0.22 )
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-DOCS=( AUTHORS ChangeLog HOWTO NEWS README )
-
-PATCHES=( "${FILESDIR}"/${P}-cflags.patch )
-
-src_prepare() {
-	autotools-utils_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-version-check
-		$(use_enable alsa)
-		$(use_enable oss)
-		#$(use_enable osc liblo)
-	)
-	autotools-utils_src_configure
-}
diff --git a/media-sound/bristol/files/bristol-0.60.11-dontcompress.patch b/media-sound/bristol/files/bristol-0.60.11-dontcompress.patch
new file mode 100644
index 000000000000..0b7cedc9e29d
--- /dev/null
+++ b/media-sound/bristol/files/bristol-0.60.11-dontcompress.patch
@@ -0,0 +1,12 @@
+--- a/Makefile.am	2012-01-12 18:23:23.000000000 +0100
++++ b/Makefile.am	2018-10-04 01:22:03.656483227 +0200
+@@ -9,9 +9,6 @@
+ 	$(INSTALL) -d $(DESTDIR)$(mandir)/man1
+ 	$(INSTALL) -m 0644 $(srcdir)/bristol.1 $(DESTDIR)$(mandir)/man1/
+ 	$(INSTALL) -m 0644 $(srcdir)/bristoljackstats.1 $(DESTDIR)$(mandir)/man1/
+-	gzip -9fn $(DESTDIR)$(mandir)/man1/bristol.1
+-	gzip -9fn $(DESTDIR)$(mandir)/man1/bristoljackstats.1
+-	cd $(DESTDIR)$(mandir)/man1 && ln -sf bristol.1.gz brighton.1.gz && ln -sf bristol.1.gz startBristol.1.gz
+ 
+ installdb:
+ 	mkdir -p -m 0755 $(DESTDIR)$(bristoldir)
diff --git a/media-sound/bristol/files/bristol-0.60.11-rm_alsa-iatomic.h.patch b/media-sound/bristol/files/bristol-0.60.11-rm_alsa-iatomic.h.patch
new file mode 100644
index 000000000000..9d11b4f7d99b
--- /dev/null
+++ b/media-sound/bristol/files/bristol-0.60.11-rm_alsa-iatomic.h.patch
@@ -0,0 +1,26 @@
+Description: Stop using alsa/iatomic.h
+             Technically this is an API breakage in libasound 1.1.2,
+             but it makes sense to me that this header was removed
+             by ALSA upstream.
+             .
+             bristol was the only user in Debian, and even here the
+             code that once used it was already commented out.
+Author: Adrian Bunk <bunk@stusta.de>
+Reviewed-by: James Cowgill <jcowgill@debian.org>
+	     Herbert Parentes Fortes Neto <hpfn@debian.org>
+Bug-Debian: https://bugs.debian.org/834180
+Forwarded: no
+Index: bristol-0.60.11/libbristolaudio/audioEngineJack.c
+===================================================================
+--- a/libbristolaudio/audioEngineJack.c
++++ b/libbristolaudio/audioEngineJack.c
+@@ -38,9 +38,6 @@
+ #include <string.h>
+ 
+ #ifdef _BRISTOL_JACK
+-#if (BRISTOL_HAS_ALSA == 1)
+-#include <alsa/iatomic.h>
+-#endif
+ 
+ /*
+  * Drop this atomic stuff, it comes from the ALSA library and it not present on
diff --git a/media-sound/bristol/files/bristol-0.60.9-cflags.patch b/media-sound/bristol/files/bristol-0.60.9-cflags.patch
deleted file mode 100644
index 502b8eb937fe..000000000000
--- a/media-sound/bristol/files/bristol-0.60.9-cflags.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- bristol-0.60.9/libbrighton/Makefile.am.orig
-+++ bristol-0.60.9/libbrighton/Makefile.am
-@@ -1,6 +1,6 @@
- AUTOMAKE_OPTIONS = foreign
- 
--AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/brighton -I/usr/X11R6/include/ -I. -O0 @BRIGHTON_HAS_X11@ @BRIGHTON_HAS_AUTOZOOM@
-+AM_CFLAGS = -pthread -Wall -I$(srcdir)/../include/brighton -I/usr/X11R6/include/ -I. @BRIGHTON_HAS_X11@ @BRIGHTON_HAS_AUTOZOOM@
- libbrighton_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ @BRIGHTON_LIBXLIBS@ @BRIGHTON_LIBXLIBS@
- 
- lib_LTLIBRARIES = libbrighton.la
diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index 548bc88a0a49..7c119ea7d34e 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -3,5 +3,5 @@ AUX cantata-2.3.2-opusfile.patch 1529 BLAKE2B fdfd27280f757ba4fa017fde4d52514dbb
 DIST cantata-2.2.0.tar.bz2 2251649 BLAKE2B 9b28a4e3a77245fcf00f81780adecdc51e066f068798f92300ef8527872313f5fb56d4b90a6f5511caf951ba9fcd5c094dd5e9062fe3d314b75412b3e8e03d37 SHA512 519a2e24c8b2a1c98a2006a1f590945e1bd5e98a2c3a1b5da23e40f2297f1477d48d69b48ec669219f5ab8fdc955486fe29db6914abeef1fba2a47377f694ecd
 DIST cantata-2.3.2.tar.bz2 2440595 BLAKE2B d77a41752ff9660f27da11748497b394667f456edf52d785b3ebf31446045a4de2bcc9b22ac2d68dfd4e0f00d10a53ae9e79643e116783879eb68bab48b59589 SHA512 d55ee5f2194626db3465d8c499459bac82656e12bdb5f771581eef9d6a42ee25fc9b31e8bb5cea8913cbd47a967141f990efddb353797f81e722b7b99a73b1a4
 EBUILD cantata-2.2.0.ebuild 2906 BLAKE2B afc79b29d42719e018485c8742a21bfe596925b2ff83fd8de69bd699bdff03b7dcf8c4a1b0ac69df26fb140b64457485b62ca542c0632b2ec436a064a29b7532 SHA512 62a3a89fe9661db39cc7a8682fd4df72f8fa911a25a4cb1db66cc8f0cd0acdd00912b60a43442832b2dc01df69ab4015e817b345dbe0dc3b71418f52334ee03a
-EBUILD cantata-2.3.2.ebuild 3178 BLAKE2B 47e139fb262e84e8cd63acdd7634a634bd533c65fd63b15343023ea5ba6b288fc11eaa9e5a99e6eed31a8740532be409b2ff9efafdde9233d17b133b38f3d97c SHA512 e80b43f055b28b5d0c5e8e411b6709c5add03dd35311441ec3d76bd868ae2c5bc9375959c61618b55a4d51d792ec364aaab4c79ff285b6a11a9d146809e73f4e
+EBUILD cantata-2.3.2.ebuild 3231 BLAKE2B eb0e61fe493625c48e813a5bfef9f783ee18228f4d0834e773d090f9e222039827cfad373cec47ac73cf6c588446d5f6097c3388c4e2fd7168519a52d8a10880 SHA512 5a5a92ca899306963e8740a6000b5333ac71bfb10086a1b6e35c7ce598275fc9a21b16b4881b80353a786e13f70b388785119f18bc05c9c2b35cf42b2144a5d0
 MISC metadata.xml 739 BLAKE2B 48f6246515dd08a87d867e69f1d03042ef1018654bcd726e8d91366c15e7b1275ec60f5a6df8bc38c8310d1b24b1b0f355b5339ab30be7c11f57ebe84d8c71f6 SHA512 1e212d1621607ea9a0523146e5eba5e16c9b5ddc7021d409c16ccc93840cffe39a9c601c222e97f37ab38e7c69fa5eac285872fa7a2f52b0f4e8a0cc1e520d97
diff --git a/media-sound/cantata/cantata-2.3.2.ebuild b/media-sound/cantata/cantata-2.3.2.ebuild
index db85ccf2fbc9..e65a73704d8d 100644
--- a/media-sound/cantata/cantata-2.3.2.ebuild
+++ b/media-sound/cantata/cantata-2.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
@@ -12,8 +12,8 @@ SRC_URI="https://github.com/CDrummond/cantata/releases/download/v${PV}/${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain streaming taglib udisks zeroconf"
+KEYWORDS="amd64 x86"
+IUSE="cdda cddb cdio http-server libav mtp musicbrainz replaygain streaming taglib udisks zeroconf"
 REQUIRED_USE="
 	?? ( cdda cdio )
 	cdda? ( udisks || ( cddb musicbrainz ) )
@@ -44,7 +44,8 @@ COMMON_DEPEND="
 	replaygain? (
 		media-libs/libebur128
 		media-sound/mpg123
-		virtual/ffmpeg
+		libav? ( media-video/libav:= )
+		!libav? ( media-video/ffmpeg:0= )
 	)
 	streaming? ( dev-qt/qtmultimedia:5 )
 	taglib? (
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index f6fd89465e09..9ee797e50195 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -3,5 +3,5 @@ DIST clementine-1.3.1_p20180416.tar.gz 8489387 BLAKE2B 37412428cf030a71f0011ba68
 DIST clementine-1.3.1_p20180523.tar.gz 8490122 BLAKE2B 783cd420c8e3cd7423ecb6caa3466efd2c09e9033c2a198f52dc113603233f1bf3e3dc5208491338c0fdc9ab26e5b661e7fced0dd835b4c19a867fa3cacc9ccd SHA512 a47de226108240313fef2ce965726b3afea988030adffe38fdabf5d0dc46b2eda42cfebc32d77e939eb6dd687a99556c9bd8848c6a5e78c434950d00a8833200
 EBUILD clementine-1.3.1_p20180416.ebuild 5173 BLAKE2B 911367e87faa64ca4664a2765ee05d8df3809f86f0dffc560681fc5702b5e562e8ac6db8b8efc85cd9fcf3c574b0be05974353bdf45a9f8636a0d0c3508a6a58 SHA512 ac365714bc8e1477d2d7484816ac834334d9bb861a6fec763ef86ea79f88ab154c70d4bc027264f434bd97e46497d54ee9c68d84e0fd05894e3f33b0f16d0b2e
 EBUILD clementine-1.3.1_p20180523.ebuild 5175 BLAKE2B abd9e0acf98581c7bd9cb1cd4256c1e89401e0f6ae18d63582b0171663865abb26e5680520ed335a455dadae919460eb4bda420f26ae80013b97a951b19e4ede SHA512 6276db36f7e99efb51fe01ff708a46039d33364f6817883d1c9e7b4f47924fbcc8919dd817407be5ef27f1985213e528b940373ec8505d36ebcc628646e5162c
-EBUILD clementine-9999.ebuild 5108 BLAKE2B e5c0ed007db9b57a2934458a540f655bd546504308588b5e387586da1ade150d0562b456de63054c4434725265f0c97d1a17793ed50f6f2e8a689ebafdbe7838 SHA512 7952dd7ea1b9e3b7ddd657d5891791ed66fdbd0c844a317190055a6e08ffbaef1953b58a3cb3980b436a81fd30bb75f71da538ba1b371694b5e00e3f03e473b6
+EBUILD clementine-9999.ebuild 5054 BLAKE2B 3c0eb34b89cdc488a0e5553d43d9a80ab394e336fbee8e79bb322c3e86f0704c59ce30ff8eea96696d211d5f1218cd52aba929218f9f84c5dd8d940e2ba4767a SHA512 99250978824c2b96dc52f9298519be138ded54b60afb2ea17cc6c3133a49676d16f666947e001e31bb18894c78bdc9a4ec080f4eeb877fc7c7af55bffd5174be
 MISC metadata.xml 1052 BLAKE2B 670e37f375845acd8dcbc27339690ab21eeab2328ea04bc089a84ef2f608a04594ab35fc3bab6fc989a535f28321b4bef150374e27f8930326c35e0edcaa7f52 SHA512 cefd5c85937f11065d37c5287cd34a3977eaa4c223089bd9297786701845201d03af6596ac3d88e773baf291e07efe1137ceb29357ec2b0520f37e51a8de301b
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index 53e377c09949..2d1b92dddf91 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -100,8 +100,6 @@ DEPEND="${COMMON_DEPEND}
 
 DOCS=( Changelog README.md )
 
-PATCHES=( "${FILESDIR}"/${PN}-fts3-tokenizer.patch )
-
 src_prepare() {
 	l10n_find_plocales_changes "src/translations" "" ".po"
 
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index 7f556af68897..fc3c89a3f054 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -1,14 +1,6 @@
-AUX csound-6.05-python.patch 661 BLAKE2B 4f0daaf04cafd5daa967409f7e49ae553e8751c05ccb8f451723d2d303cafa7285860c1adb4308a99c58825194721829b8ce4e0c30f16b43969f73a0765497e2 SHA512 db931a76d0b386232d932c87ef30300497145dab3196cc059278947eeefc41723043392d652583f00512b306abbf33db3d7c9bc5203ead81689ed1ea8d0a541c
-AUX csound-6.09.1-python.patch 742 BLAKE2B b872878b91b5ad3200c78e0f5434f490e80f0879bb5cbaf9e2e4a53f9ea8ab29263fea84b81b13aea3dab1e79693901728e514519a3be7ce39c67c0e6bc17118 SHA512 52d2cb16831eb4090f22c7153f76213bbf4dfbf66ec791655714aa84db97dab6271022e64707247d24946ec5e019d20fe479a7a5d1711eac2c030625c4c86cdc
-DIST Csound6.09.1_manual_html.zip 15537547 BLAKE2B 8864cd42e811c596b1c17c68d0552edff39437412ce828772cf8cf13f47390d0edc25fa9a85ecfe1a50a01fe592cb0ee27ce5a11679195f8c1b41da9b1ede8cd SHA512 8ddd821737b003d277eadf5b966907314ee50380ab5cc7b9716588d1bcfac8950f591e076752650508c924d1068bac0334523a3d3b869a4f6d4118b822003afd
-DIST Csound6.09.1_manual_pdf.zip 8647957 BLAKE2B 52209784a08c67284a6481d17eaef8db2abf03f068bf347a40b06d4ba323389371474cb87fd93a318fe6abadeb69afd060be0aa64fdd2b638172ef33a282386a SHA512 1dd2c0058751fe1f176a51741380884db115bdb52416512882c43212fd5ded1c489cc9c423059c1154a1e01528e7bf6e70621eac6ee83a1a4b5e2388ab85ae1b
 DIST Csound6.10.0_manual_html.zip 15944722 BLAKE2B dfb2d00650e8d9ff650c60a5601b63446d0ce6d94eeac54812752039ef1b7c8c161a7694cb3381453f86759a810b81754e99cf5c8805cee61171c24a615114ab SHA512 f61f46705607eb39897fd3b27353fb233acd9da5e00a2b64d63116f74b889f2daafa72d48ed7c5ec1890e32d81331f91455861f2cb3fad3d13b7d27ec203357a
 DIST Csound6.10.0_manual_pdf.zip 8687461 BLAKE2B ff738378e10ce7e3fd9ab44bed67fdbf4a1de62d89d738a35fd46f25996d85dd8e97260af31bb2fbfe199aecd3f16f0adb5bf94d9a15807d6424002d7ab9682c SHA512 cf6ec335782032fb0703a3042c0222316cd215eba2be242e65d4f1ae23d886177620c96cc63c1aace43a72c1d6258a88612c1ffd5ef0e43675729bae39969fa1
-DIST csound-6.08.0.tar.gz 33948686 BLAKE2B 6a81e5806420b63ffd487d71d507d34336c46e91ec7073b4805324d04af31101c1ea65142f22aae2de071f149eb8fe4c88547b6795462aea248b585d029bad6c SHA512 22237f7c8ac875fd44789a729f5513dd7f751bbe0446b8a6e43c6a824b1c40978ef051122632af0c3975761fa7f873c01e88b9de7be313d9d23be09ed52c29ca
-DIST csound-6.09.1.tar.gz 41969942 BLAKE2B 87dd02f61346f95648391c405edc18d08edad9d33c1cd2ab2cf054e0f10b7f987aaedce698a18520a8d8559d1fd78a20fa4f3d7db99e6afb3fdba316207e0495 SHA512 c82d3e4fa5fba2c47f916ee102ba841477a819e1905e578089474ce5a7c4a4e70c4ec2768337621fcd2e3843af9b1129ce50f4a4fd3c33bfa27da52815b99454
 DIST csound-6.10.0.tar.gz 42036496 BLAKE2B 4305eb2aedb076f4a4079e1353f05f9ffe6159311fe905a11998f80eab9ccbbfe57c0601b94762480c486f8edbe0aa0f9b20d18f4db8f9f49d6466a7b2ef4697 SHA512 1ccf0a2d5273da016ec585e788e4af0b91f55c3be081a51c53dc39b0fbcfba0cf1308828784a1e5dfc39250dedbd3f4b48afbb5c4140c11fd469ca6753702ed4
-EBUILD csound-6.08.0.ebuild 5569 BLAKE2B e134b89d7e62ba355621b3b57aa9b2b05df1477dc631ab33c05c5a1fcaa8def783138b6195f82a010e6f989904a2219499365a1fcb69f7579faeae2cd2932d3b SHA512 9bd0981e19af1f0c634d7d0f5a61f9738c65f8ab2cbdfd37d593327e6a8e2feb28be48dea052f6368bc007873ce5c61b17b45c7b381ca7139a8c7e0ef25f05d5
-EBUILD csound-6.09.1.ebuild 5972 BLAKE2B ec879625528671ccd4d82f14b71c2ce525260e8051986825f86ffd747e57dc0ed64af3fea6fe2eb3d316e54a89b235ceebd6577ab24b8834a9c59dc43b137cdb SHA512 e5be516ec79273158ee1b574753047b50ef980e0478a77a0fc73548083a7985b0befc074c9b71eb36fde943ef296b351e584b58adbd38a63276b2c71f2eaacd6
 EBUILD csound-6.10.0.ebuild 5927 BLAKE2B f2915b61df2e5aef642bacc0df54ee96e60b1b3c725852ee9a76e3d1640a55fdb9ebacd9e71f156ce14b083256624d0dd451437ddb016e3120461e277fd92cd9 SHA512 28207d944e58eac4ef03b9f14205928d68947b301620138b3125772d961f2b873c69697c5ab232870aa879be156d24392e79fa469ce08899557d2db9e597c30d
-EBUILD csound-9999.ebuild 5927 BLAKE2B f2915b61df2e5aef642bacc0df54ee96e60b1b3c725852ee9a76e3d1640a55fdb9ebacd9e71f156ce14b083256624d0dd451437ddb016e3120461e277fd92cd9 SHA512 28207d944e58eac4ef03b9f14205928d68947b301620138b3125772d961f2b873c69697c5ab232870aa879be156d24392e79fa469ce08899557d2db9e597c30d
+EBUILD csound-9999.ebuild 5615 BLAKE2B 6701c92c773973a49c0853d6b392c634c6d524c5b5ff661a753bafeb7eae27319d608cf155ec1bbda9c220fe6a65301e71cbd66f1127f4559e0a9ac1cefcd417 SHA512 ad8ee79bde82687414237e241530b940a5b19db5faffebbff69258719cbc671ee97291588924854a238b5a168cb85c38cd12f5743bd9741dc75b79c7074dfaf5
 MISC metadata.xml 1487 BLAKE2B e94fef343f96f5fe68a0fb486b7f8bd9f8af7fb3f585696a4b6d909cc1e87f2da66ab73b24ad1b3c809db472877febb8fbde2c3fc5b2abfab35c3efe9eddf321 SHA512 215f491284f409a299d5c4ef8d9df6f377a4a5e032bce40870fb72c7c6bbcdaa8ea0879a86c3379207e0b69df7f735254936e97ed68ebd2aeecf9498c646037e
diff --git a/media-sound/csound/csound-6.08.0.ebuild b/media-sound/csound/csound-6.08.0.ebuild
deleted file mode 100644
index 56eb7fc9cdf6..000000000000
--- a/media-sound/csound/csound-6.08.0.ebuild
+++ /dev/null
@@ -1,216 +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 java-pkg-opt-2 toolchain-funcs versionator python-single-r1 cmake-utils
-
-if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/csound/csound.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/csound/csound/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A sound design and signal processing system for composition and performance"
-HOMEPAGE="https://csound.github.io/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="+alsa beats chua csoundac curl +cxx debug double-precision dssi examples
-fltk +fluidsynth +image jack java keyboard linear lua luajit nls osc openmp
-portaudio portmidi pulseaudio python samples score static-libs stk tcl test
-+threads +utils vim-syntax websocket"
-
-LANGS=" de en_US es_CO fr it ro ru"
-
-REQUIRED_USE="
-	csoundac? ( || ( lua python ) )
-	java? ( cxx )
-	linear? ( double-precision )
-	lua? ( cxx )
-	python? ( ${PYTHON_REQUIRED_USE} cxx )
-"
-
-RDEPEND="
-	>=media-libs/libsndfile-1.0.16
-	media-libs/libsamplerate
-	alsa? ( media-libs/alsa-lib )
-	csoundac? (
-		x11-libs/fltk:1[threads?]
-		dev-cpp/eigen:3
-		dev-libs/boost:=
-	)
-	curl? ( net-misc/curl )
-	dssi? (
-		media-libs/dssi
-		media-libs/ladspa-sdk
-	)
-	fluidsynth? ( media-sound/fluidsynth )
-	fltk? ( x11-libs/fltk:1[threads?] )
-	image? ( media-libs/libpng:0= )
-	jack? ( media-sound/jack-audio-connection-kit )
-	java? ( virtual/jdk:* )
-	keyboard? ( x11-libs/fltk:1[threads?] )
-	linear? ( sci-mathematics/gmm )
-	lua? (
-		luajit? ( dev-lang/luajit:2 )
-		!luajit? ( dev-lang/lua:0 )
-	)
-	osc? ( media-libs/liblo )
-	portaudio? ( media-libs/portaudio )
-	portmidi? ( media-libs/portmidi )
-	pulseaudio? ( media-sound/pulseaudio )
-	python? ( ${PYTHON_DEPS} )
-	stk? ( media-libs/stk )
-	tcl? (
-		>=dev-lang/tcl-8.5:0=
-		>=dev-lang/tk-8.5:0=
-	)
-	utils? ( !media-sound/snd )
-	websocket? ( net-libs/libwebsockets )
-"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc
-	chua? ( dev-libs/boost )
-	csoundac? ( dev-lang/swig )
-	nls? ( sys-devel/gettext )
-	test? (
-		dev-util/cunit
-		${PYTHON_DEPS}
-	)
-"
-
-# requires specific alsa settings
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/csound-6.05-python.patch )
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-
-	if use python || use test ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
-		-e '/-O3/d' \
-		-i CMakeLists.txt || die
-
-	local lang
-	for lang in ${LANGS} ; do
-		if ! has ${lang} ${LINGUAS-${lang}} ; then
-			sed -i "/compile_po(${lang}/d" po/CMakeLists.txt || die
-		fi
-	done
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_ALSA=$(usex alsa)
-		-DBUILD_CSBEATS=$(usex beats)
-		-DBUILD_CHUA_OPCODES=$(usex chua)
-		-DBUILD_CSOUND_AC=$(usex csoundac)
-		-DBUILD_CSOUND_AC_LUA_INTERFACE=$(usex csoundac $(usex lua))
-		-DBUILD_CSOUND_AC_PYTHON_INTERFACE=$(usex csoundac $(usex python))
-		-DBUILD_CXX_INTERFACE=$(usex cxx)
-		-DUSE_CURL=$(usex curl)
-		-DNEW_PARSER_DEBUG=$(usex debug)
-		-DUSE_DOUBLE=$(usex double-precision)
-		-DBUILD_DSSI_OPCODES=$(usex dssi)
-		-DBUILD_FLUID_OPCODES=$(usex fluidsynth)
-		-DUSE_FLTK=$(usex fltk)
-		-DBUILD_IMAGE_OPCODES=$(usex image)
-		-DUSE_JACK=$(usex jack)
-		-DBUILD_JACK_OPCODES=$(usex jack)
-		-DBUILD_JAVA_INTERFACE=$(usex java)
-		-DBUILD_VIRTUAL_KEYBOARD=$(usex keyboard)
-		-DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear)
-		-DBUILD_LUA_OPCODES=$(usex lua)
-		-DBUILD_LUA_INTERFACE=$(usex lua)
-		-DUSE_GETTEXT=$(usex nls)
-		-DBUILD_OSC_OPCODES=$(usex osc)
-		-DUSE_OPEN_MP=$(usex openmp)
-		-DUSE_PORTAUDIO=$(usex portaudio)
-		-DUSE_PORTMIDI=$(usex portmidi)
-		-DUSE_PULSEAUDIO=$(usex pulseaudio)
-		-DBUILD_PYTHON_OPCODES=$(usex python)
-		-DBUILD_PYTHON_INTERFACE=$(usex python)
-		-DSCORE_PARSER=$(usex score)
-		-DBUILD_STATIC_LIBRARY=$(usex static-libs)
-		-DBUILD_STK_OPCODES=$(usex stk)
-		-DBUILD_TESTS=$(usex test)
-		-DBUILD_STATIC_LIBRARY=$(usex test)
-		-DBUILD_TCLCSOUND=$(usex tcl)
-		-DBUILD_MULTI_CORE=$(usex threads)
-		-DBUILD_UTILITIES=$(usex utils)
-		-DBUILD_WEBSOCKET_OPCODE=$(usex websocket)
-		-DNEED_PORTTIME=OFF
-		-DBUILD_RELEASE=ON
-	)
-
-	use python && mycmakeargs+=(
-		-DPYTHON_MODULE_INSTALL_DIR="$(python_get_sitedir)"
-	)
-
-	[[ $(get_libdir) == "lib64" ]] && mycmakeargs+=(
-		-DUSE_LIB64=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc -r Release_Notes/.
-
-	# Generate env.d file
-	cat > "${T}"/62${PN} <<-_EOF_ || die
-		OPCODEDIR$(usex double-precision 64 '')="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins$(usex double-precision 64 '')"
-		CSSTRNGS="${EPREFIX}/usr/share/locale"
-	_EOF_
-	if use stk ; then
-		echo RAWWAVE_PATH=\"${EPREFIX}/usr/share/csound/rawwaves\" >> "${T}"/62${PN} || die
-	fi
-	doenvd "${T}"/62${PN}
-
-	if use examples ; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	use samples && dodoc -r samples
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins installer/misc/vim/csound_{csd,orc,sco}.vim
-		insinto /usr/share/vim/vimfiles/plugin
-		doins installer/misc/vim/csound.vim
-	fi
-
-	# rename extract to csound_extract (bug #247394)
-	mv "${ED%/}"/usr/bin/{,csound_}extract || die
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "The extract tool is now installed as csound_extract"
-		elog "due to collisions with many other packages (bug #247394)."
-		elog
-	fi
-}
diff --git a/media-sound/csound/csound-6.09.1.ebuild b/media-sound/csound/csound-6.09.1.ebuild
deleted file mode 100644
index 7f018b3a9139..000000000000
--- a/media-sound/csound/csound-6.09.1.ebuild
+++ /dev/null
@@ -1,230 +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 java-pkg-opt-2 toolchain-funcs python-single-r1 cmake-utils
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/csound/csound.git"
-	inherit git-r3
-else
-	DOC_P="Csound${PV}"
-	SRC_URI="https://github.com/csound/csound/archive/${PV}.tar.gz -> ${P}.tar.gz
-		doc? (
-			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip
-			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
-		)"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A sound design and signal processing system for composition and performance"
-HOMEPAGE="https://csound.github.io/"
-
-LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
-SLOT="0"
-IUSE="+alsa beats chua csoundac curl +cxx debug doc double-precision dssi examples
-fltk +fluidsynth +image jack java keyboard linear lua luajit nls osc openmp
-portaudio portmidi pulseaudio python samples score static-libs stk tcl test
-+threads +utils vim-syntax websocket"
-
-IUSE_LANGS=" de en_US es es_CO fr it ro ru"
-
-REQUIRED_USE="
-	csoundac? ( || ( lua python ) )
-	java? ( cxx )
-	linear? ( double-precision )
-	lua? ( cxx )
-	python? ( ${PYTHON_REQUIRED_USE} cxx )
-"
-
-RDEPEND="
-	>=media-libs/libsndfile-1.0.16
-	media-libs/libsamplerate
-	alsa? ( media-libs/alsa-lib )
-	csoundac? (
-		x11-libs/fltk:1[threads?]
-		dev-cpp/eigen:3
-		dev-libs/boost:=
-	)
-	curl? ( net-misc/curl )
-	dssi? (
-		media-libs/dssi
-		media-libs/ladspa-sdk
-	)
-	fluidsynth? ( media-sound/fluidsynth )
-	fltk? ( x11-libs/fltk:1[threads?] )
-	image? ( media-libs/libpng:0= )
-	jack? ( media-sound/jack-audio-connection-kit )
-	java? ( virtual/jdk:* )
-	keyboard? ( x11-libs/fltk:1[threads?] )
-	linear? ( sci-mathematics/gmm )
-	lua? (
-		luajit? ( dev-lang/luajit:2 )
-		!luajit? ( dev-lang/lua:0 )
-	)
-	osc? ( media-libs/liblo )
-	portaudio? ( media-libs/portaudio )
-	portmidi? ( media-libs/portmidi )
-	pulseaudio? ( media-sound/pulseaudio )
-	python? ( ${PYTHON_DEPS} )
-	stk? ( media-libs/stk )
-	tcl? (
-		>=dev-lang/tcl-8.5:0=
-		>=dev-lang/tk-8.5:0=
-	)
-	utils? ( !media-sound/snd )
-	websocket? ( net-libs/libwebsockets )
-"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc
-	chua? ( dev-libs/boost )
-	csoundac? ( dev-lang/swig )
-	nls? ( sys-devel/gettext )
-	test? (
-		dev-util/cunit
-		${PYTHON_DEPS}
-	)
-"
-
-if [[ ${PV} != "9999" ]]; then
-	DEPEND+="doc? ( app-arch/unzip )"
-fi
-
-# requires specific alsa settings
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${P}-python.patch )
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-
-	if use python || use test ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
-		-e '/-O3/d' \
-		-i CMakeLists.txt || die
-
-	local lang
-	for lang in ${IUSE_LANGS} ; do
-		if ! has ${lang} ${LINGUAS-${lang}} ; then
-			sed -i "/compile_po(${lang}/d" po/CMakeLists.txt || die
-		fi
-	done
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_ALSA=$(usex alsa)
-		-DBUILD_CSBEATS=$(usex beats)
-		-DBUILD_CHUA_OPCODES=$(usex chua)
-		-DBUILD_CSOUND_AC=$(usex csoundac)
-		-DBUILD_CSOUND_AC_LUA_INTERFACE=$(usex csoundac $(usex lua))
-		-DBUILD_CSOUND_AC_PYTHON_INTERFACE=$(usex csoundac $(usex python))
-		-DBUILD_CXX_INTERFACE=$(usex cxx)
-		-DUSE_CURL=$(usex curl)
-		-DNEW_PARSER_DEBUG=$(usex debug)
-		-DUSE_DOUBLE=$(usex double-precision)
-		-DBUILD_DSSI_OPCODES=$(usex dssi)
-		-DBUILD_FLUID_OPCODES=$(usex fluidsynth)
-		-DUSE_FLTK=$(usex fltk)
-		-DBUILD_IMAGE_OPCODES=$(usex image)
-		-DUSE_JACK=$(usex jack)
-		-DBUILD_JACK_OPCODES=$(usex jack)
-		-DBUILD_JAVA_INTERFACE=$(usex java)
-		-DBUILD_VIRTUAL_KEYBOARD=$(usex keyboard)
-		-DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear)
-		-DBUILD_LUA_OPCODES=$(usex lua)
-		-DBUILD_LUA_INTERFACE=$(usex lua)
-		-DUSE_GETTEXT=$(usex nls)
-		-DBUILD_OSC_OPCODES=$(usex osc)
-		-DUSE_OPEN_MP=$(usex openmp)
-		-DUSE_PORTAUDIO=$(usex portaudio)
-		-DUSE_PORTMIDI=$(usex portmidi)
-		-DUSE_PULSEAUDIO=$(usex pulseaudio)
-		-DBUILD_PYTHON_OPCODES=$(usex python)
-		-DBUILD_PYTHON_INTERFACE=$(usex python)
-		-DSCORE_PARSER=$(usex score)
-		-DBUILD_STATIC_LIBRARY=$(usex static-libs)
-		-DBUILD_STK_OPCODES=$(usex stk)
-		-DBUILD_TESTS=$(usex test)
-		-DBUILD_STATIC_LIBRARY=$(usex test)
-		-DBUILD_TCLCSOUND=$(usex tcl)
-		-DBUILD_MULTI_CORE=$(usex threads)
-		-DBUILD_UTILITIES=$(usex utils)
-		-DBUILD_WEBSOCKET_OPCODE=$(usex websocket)
-		-DNEED_PORTTIME=OFF
-		-DBUILD_RELEASE=ON
-	)
-
-	use python && mycmakeargs+=(
-		-DPYTHON_MODULE_INSTALL_DIR="$(python_get_sitedir)"
-	)
-
-	[[ $(get_libdir) == "lib64" ]] && mycmakeargs+=(
-		-DUSE_LIB64=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc -r Release_Notes/.
-
-	# generate env.d file
-	cat > "${T}"/62${PN} <<-_EOF_ || die
-		OPCODEDIR$(usex double-precision 64 '')="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins$(usex double-precision 64 '')"
-		CSSTRNGS="${EPREFIX}/usr/share/locale"
-	_EOF_
-	if use stk ; then
-		echo RAWWAVE_PATH=\"${EPREFIX}/usr/share/csound/rawwaves\" >> "${T}"/62${PN} || die
-	fi
-	doenvd "${T}"/62${PN}
-
-	if use examples ; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	use samples && dodoc -r samples
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins installer/misc/vim/csound_{csd,orc,sco}.vim
-		insinto /usr/share/vim/vimfiles/plugin
-		doins installer/misc/vim/csound.vim
-	fi
-
-	# rename extract to csound_extract (bug #247394)
-	mv "${ED%/}"/usr/bin/{,csound_}extract || die
-
-	use python && python_optimize
-
-	# install docs
-	if [[ ${PV} != "9999" ]] && use doc ; then
-		dodoc "${WORKDIR}"/*.pdf
-		dodoc -r "${WORKDIR}"/html
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "The extract tool is now installed as csound_extract"
-		elog "due to collisions with many other packages (bug #247394)."
-		elog
-	fi
-}
diff --git a/media-sound/csound/csound-9999.ebuild b/media-sound/csound/csound-9999.ebuild
index 5906af36652d..b97419c554c2 100644
--- a/media-sound/csound/csound-9999.ebuild
+++ b/media-sound/csound/csound-9999.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=6
-PYTHON_COMPAT=( python2_7 )
 
-inherit java-pkg-opt-2 toolchain-funcs python-single-r1 cmake-utils
+PYTHON_COMPAT=( python2_7 )
+inherit cmake-utils java-pkg-opt-2 python-single-r1 toolchain-funcs
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/csound/csound.git"
@@ -19,15 +19,15 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-DESCRIPTION="A sound design and signal processing system for composition and performance"
+DESCRIPTION="Sound design and signal processing system for composition and performance"
 HOMEPAGE="https://csound.github.io/"
 
 LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
 SLOT="0"
 IUSE="+alsa beats chua csoundac curl +cxx debug doc double-precision dssi examples
-fltk +fluidsynth +image jack java keyboard linear lua luajit nls osc openmp
-portaudio portmidi pulseaudio python samples score static-libs stk tcl test
-+threads +utils vim-syntax websocket"
+fltk +fluidsynth +image jack java keyboard linear lua luajit nls osc portaudio
+portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils
+vim-syntax websocket"
 
 IUSE_LANGS=" de en_US es es_CO fr it ro ru"
 
@@ -70,10 +70,6 @@ RDEPEND="
 	pulseaudio? ( media-sound/pulseaudio )
 	python? ( ${PYTHON_DEPS} )
 	stk? ( media-libs/stk )
-	tcl? (
-		>=dev-lang/tcl-8.5:0=
-		>=dev-lang/tk-8.5:0=
-	)
 	utils? ( !media-sound/snd )
 	websocket? ( net-libs/libwebsockets )
 "
@@ -96,13 +92,7 @@ fi
 # requires specific alsa settings
 RESTRICT="test"
 
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
 pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-
 	if use python || use test ; then
 		python-single-r1_pkg_setup
 	fi
@@ -148,18 +138,15 @@ src_configure() {
 		-DBUILD_LUA_INTERFACE=$(usex lua)
 		-DUSE_GETTEXT=$(usex nls)
 		-DBUILD_OSC_OPCODES=$(usex osc)
-		-DUSE_OPEN_MP=$(usex openmp)
 		-DUSE_PORTAUDIO=$(usex portaudio)
 		-DUSE_PORTMIDI=$(usex portmidi)
 		-DUSE_PULSEAUDIO=$(usex pulseaudio)
 		-DBUILD_PYTHON_OPCODES=$(usex python)
 		-DBUILD_PYTHON_INTERFACE=$(usex python)
-		-DSCORE_PARSER=$(usex score)
 		-DBUILD_STATIC_LIBRARY=$(usex static-libs)
 		-DBUILD_STK_OPCODES=$(usex stk)
 		-DBUILD_TESTS=$(usex test)
 		-DBUILD_STATIC_LIBRARY=$(usex test)
-		-DBUILD_TCLCSOUND=$(usex tcl)
 		-DBUILD_MULTI_CORE=$(usex threads)
 		-DBUILD_UTILITIES=$(usex utils)
 		-DBUILD_WEBSOCKET_OPCODE=$(usex websocket)
diff --git a/media-sound/csound/files/csound-6.05-python.patch b/media-sound/csound/files/csound-6.05-python.patch
deleted file mode 100644
index 3e9ee857fe98..000000000000
--- a/media-sound/csound/files/csound-6.05-python.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- csound-6.05.0.orig/CMakeLists.txt	2015-04-26 03:06:22.941646148 +0800
-+++ csound-6.05.0/CMakeLists.txt	2015-07-08 22:31:16.637995822 +0800
-@@ -41,15 +41,9 @@
-     set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/csound/plugins-${APIVERSION}")
- endif()
-
--
--execute_process (
--     COMMAND python -c
--     "import site, sys; sys.stdout.write(site.getusersitepackages())"
--     OUTPUT_VARIABLE PYTHON_MODULE_INSTALL_DIR
--   )
--
- set(JAVA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR})
- set(LUA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR})
-+set(PYTHON_MODULE_INSTALL_DIR ${REPLACE_ME})
- set(LOCALE_INSTALL_DIR "share/locale")
- set(HEADER_INSTALL_DIR "include/csound")
-
diff --git a/media-sound/csound/files/csound-6.09.1-python.patch b/media-sound/csound/files/csound-6.09.1-python.patch
deleted file mode 100644
index 47461e48aaf4..000000000000
--- a/media-sound/csound/files/csound-6.09.1-python.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Respect externally set PYTHON_MODULE_INSTALL_DIR.
-
---- csound-6.09.1/CMakeLists.txt
-+++ csound-6.09.1/CMakeLists.txt
-@@ -218,11 +218,13 @@
-     set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/csound/plugins-${APIVERSION}")
- endif()
- 
--execute_process (
--     COMMAND python -c
--     "import site, sys; sys.stdout.write(site.getusersitepackages())"
--     OUTPUT_VARIABLE PYTHON_MODULE_INSTALL_DIR
--   )
-+if(NOT DEFINED PYTHON_MODULE_INSTALL_DIR)
-+    execute_process (
-+        COMMAND python -c
-+        "import site, sys; sys.stdout.write(site.getusersitepackages())"
-+        OUTPUT_VARIABLE PYTHON_MODULE_INSTALL_DIR
-+    )
-+endif()
- 
- set(JAVA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR})
- set(LUA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR})
diff --git a/media-sound/darkice/Manifest b/media-sound/darkice/Manifest
index 67810a29d4fa..f09a2a775675 100644
--- a/media-sound/darkice/Manifest
+++ b/media-sound/darkice/Manifest
@@ -1,6 +1,6 @@
 AUX darkice-1.2-gcc47.patch 236 BLAKE2B df44cbc3ce60ff0fee38e4ede7d0321adc2b1fc15dd3bfc322ff08d7eaf4d3405dfce796c0a5f7757f9658ff992d208b12bf0e1b7fa31d1763d75f4d2e24b079 SHA512 4f77a2694f2bb574c600edfe1d2b88dd1d9c932ff8280e8fe0739c50f5ec346c284d49ac34993e351582c1a4909b9dd380073df7a16b62b8db71c66b0f1c7326
 DIST darkice-1.2.tar.gz 357026 BLAKE2B 3553711a05631feca198de83387234dc1ca85429ee69424910352e32d3ec4f8037ff33fcb4946aef0f84f58deb59e073be007856fd9cbe01b1570d4a0244ba98 SHA512 d8959819d70eb9b44a34d087fcf3897be5e4cb23681c049f8d88e251d83dfd86b90fdd37744fe27d861dfcbb6bb6e1521b48c5c7b4967bb061ede75596f0a823
 DIST darkice-1.3.tar.gz 371411 BLAKE2B 45684ba4a14dc7cc6271400af11f4aa610fe3d079d1f497f277af866fef92f58080efb6fa6d230288444e78ea93e5cd1257d441d75cbbb7a9ce1696091ed0fe0 SHA512 710dde580005e999e9b11981affdefab6c01868710e9de29d93fb0f40db3321dfe3ab6ed2dc1887bb22ac9a0789fe1648d948f4453c92feb312f7af97c253674
-EBUILD darkice-1.2.ebuild 1431 BLAKE2B fbc42f6f6551873b2d3dd3b348e0c6b3dc9c99ba06d988b2604ea537de887b298691cca6d97098b82dbcbba323aa7befd39d7d36b8b097810c001aa8d5c54cc1 SHA512 69f6c945a9aab85805bf3a55636f4f2f292fc29ab22bc3f92bd9aa081beceafed55affa811178d5568d8be62d70fbd5749294cbe8d0ab77b2f36808a279282ee
+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
diff --git a/media-sound/darkice/darkice-1.2.ebuild b/media-sound/darkice/darkice-1.2.ebuild
index 3efe53015512..959c5f101b9c 100644
--- a/media-sound/darkice/darkice-1.2.ebuild
+++ b/media-sound/darkice/darkice-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="https://darkice.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc sparc x86"
+KEYWORDS="amd64 ~hppa ppc sparc x86"
 IUSE="aac aacplus alsa debug jack libsamplerate mp3 opus pulseaudio twolame vorbis"
 
 RDEPEND="aac? ( media-libs/faac )
diff --git a/media-sound/id3ted/Manifest b/media-sound/id3ted/Manifest
index 772503f7c8d0..7f303083ce6f 100644
--- a/media-sound/id3ted/Manifest
+++ b/media-sound/id3ted/Manifest
@@ -1,6 +1,4 @@
 AUX id3ted-1.0-outofbounds.patch 713 BLAKE2B f0e61828e73939d3497402d7b37d751e42393ff72d64be20c3c4f7f48ce9b484e1ccaf9915c291b35b0e21efab3c5a2419cff4c101b79176b8603851bced1855 SHA512 942b1858bcd917c2a0c3be023f666bcc38b364edce976ab3f3f9f4d16f1822240aedb33965086f5f67832096fa408e24d6c85cfe91a2adc1cc84bee8d4ebef9a
 DIST id3ted-1.0.tar.gz 32792 BLAKE2B 3df3a5a48302ecac6dbccbf7ddacb3db193e67f8352159d3c31763d03e6bf48c46c2aaf056b0d08649e33c7d4440f72a0dc1869b3d0978cba470bc2b609ff804 SHA512 ba135779ac8bb7e83d77737babc836a2bbf4cd7efd4ffad5aa982ec9f6c57d0479f0bdf017e62d62dddffcadab88ab7b3f07408d173d013b794d20bccd5218ee
-DIST id3ted-1.0b3.tar.gz 33023 BLAKE2B 441a5d7a4d486d87b2479184aadb6e067f878877e5e8ef25d01139b2d59e1603d52a31646fcbab2f2c228652cb0d67434bca9ce584c6ba02d4841fa9310c3174 SHA512 6478ee5b6ba652687dd17828a039e8b6fc2b593285c01309c32dfcd7ec4e0e24c10288a195e9b95c47689c844f342498d5151904bd2e596de0e5ec73afa0bd7f
-EBUILD id3ted-1.0.ebuild 540 BLAKE2B 2613d7481c6632000b39b4a8eefd2be78680d814590f2e16d0d822b2921eb9046c0ba6ac0ee5797060532fb053c5cf16d2caa0c19a66e00e06e99fc1aa9b263d SHA512 bfdc69db5ceb39086d39d3faf25e53c3d0fb4910135b9c597422d24a8ae21402b1a0534f9895d3fba9ed21d23fd6229d343739544636a18f278bf9a502866357
-EBUILD id3ted-1.0_beta3.ebuild 508 BLAKE2B b9f2442474f14acabb299f079da2f9586a2e010ddbab6fa3d58a8d0271641a3439dfe51451ec4932acdce61732e949caed389c33f285a39905cfdd151513e645 SHA512 b1347d06e62eb32d3e72cdfad9b4f8bb682c1090be9d93d182c260b880d1baba71a431c5ea0440fa760534beda4f29000449d22e73014e95c9ef74bb03460fa2
+EBUILD id3ted-1.0.ebuild 535 BLAKE2B 9a7c05902d3c26a1c8c602279878c0af21f82d96af118180c4f23f195e18a29bdfe8ea541f43fc39fa7a264a060882429a18cad7a9c5dbcfc6ea4d769f721f51 SHA512 c91d9f69d9c58394049bce89385557b37bb5b3ba6222422efc77b7df47fa74576a892b01e368f16056a705227d9438c19e1a5826ba5d6f5caaab9bcfd530ed2b
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/id3ted/id3ted-1.0.ebuild b/media-sound/id3ted/id3ted-1.0.ebuild
index 8647777f37f4..d0517031cfc7 100644
--- a/media-sound/id3ted/id3ted-1.0.ebuild
+++ b/media-sound/id3ted/id3ted-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=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/muennich/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-sound/id3ted/id3ted-1.0_beta3.ebuild b/media-sound/id3ted/id3ted-1.0_beta3.ebuild
deleted file mode 100644
index 58bbc2725999..000000000000
--- a/media-sound/id3ted/id3ted-1.0_beta3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit toolchain-funcs
-
-MY_P=${PN}-${PV/_beta/b}
-DESCRIPTION="A Command-line ID3 Tag Editor"
-HOMEPAGE="https://muennich.github.com/id3ted/"
-SRC_URI="mirror://github/muennich/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="media-libs/taglib
-	sys-apps/file"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	export PREFIX="/usr"
-	tc-export CXX
-}
diff --git a/media-sound/lingot/Manifest b/media-sound/lingot/Manifest
index 907c29290a4c..2d977b2576f3 100644
--- a/media-sound/lingot/Manifest
+++ b/media-sound/lingot/Manifest
@@ -1,4 +1,4 @@
-AUX lingot-0.9.1-clean-install.patch 391 BLAKE2B 3b4465ca72b6a091559c3fd6e3cbc2d724292954c6c1994593971ca087cb44cc44972897881a13caf2faaa33227ced0df3406732bfc8eecf97d8d425e09cd842 SHA512 f8b1321e5a7ca97981779f92f33cbc2a8aa79b9d9e0b6352475ab0d150c89b3d93b6b4c92a0ae6644408ab3cbcd0879afe6a80dc9ea5b0b89a4fc492aa895da7
-DIST lingot-0.9.1.tar.gz 440043 BLAKE2B d2e6f3f150b03e934cceb4cc9909911bc55bedaf51254929f0fb4e092bed69606e7432e20b671769d2eac0ca4f05d282172ba2d388af2f8bed837d245d744af3 SHA512 6f4745823436fe24dce8c90c5780691aebf8106380d5d56858bc641448b875feeb97b98603b5839c429d35d8d7e1221cb62c2a0e19dbb41b160b5580dfc9a55f
-EBUILD lingot-0.9.1.ebuild 843 BLAKE2B 1b0add8ba671fbb2896d81249c5d65ddfb5059675e3ec38672927a98f6f1142b516dcf51ee15f07533a9558b2a9baf34ac3909906bf56a7ee0d1fa94da489788 SHA512 e749c8d6d891b0089fcd5a89ed476aa9d4e5fc732c748fa39159c15101756736bb04747336eb777f5e3ff00b76238877332f7b7d68d206668928c2edeb48c7b9
+AUX lingot-1.0.1-configure.patch 6864 BLAKE2B 8673086b4bc2d5f9eab73886685746dfe8488aba86fe8472aebc04ff2883ce641896914cae523f440605d072a2e43313291734be8988056deca0d0459908a159 SHA512 cf8df1ad198c4011153b6c337f35882f1c1ab3b4cff26a3cf6f348b23cce05bbe4cd739489f7bf9080d2557f9a30455ffb2aa70927fa46dc34ca584cb6e10e52
+DIST lingot-1.0.1.tar.gz 510112 BLAKE2B a04ef52cc70dba8af54746419190eedc2f2512120e3c1e8576dab0d6dd20c3470a6f857fd751ed4bcf8e291a993ff1f8fa7b0264a24957dcfab0efd9684ef3ba SHA512 98182721ef68411485b3f2faccbf315f340e549dd7cce0fdfaacab7c34fb708c98eda9b96da00701f1987becefced3a7587ffaaad77d6ef86046fb8c9f5f1cb5
+EBUILD lingot-1.0.1.ebuild 1059 BLAKE2B 5973aecd0c12e3c53a9e0262befc01c1a804a09ce4267e2b8e2260fb5c271ae8a8ec629667ae975bee93b7493e35b88b45761beda033c31f171d94dcae97e6fe SHA512 1c86b5c81724daa34a9a977d33daa6f6230f941452fcd9419aa0714eada328bf6624fe238dc0c3e9ab1c913ed27966aa1a6b0559049379262b8ff9fd737958fa
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/lingot/files/lingot-0.9.1-clean-install.patch b/media-sound/lingot/files/lingot-0.9.1-clean-install.patch
deleted file mode 100644
index 826a9fd29ce2..000000000000
--- a/media-sound/lingot/files/lingot-0.9.1-clean-install.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- lingot-0.9.1.orig/Makefile.am
-+++ lingot-0.9.1/Makefile.am
-@@ -8,19 +8,11 @@
- lingotdocdir = ${docdir}
- lingotdoc_DATA = \
- 	README\
--	COPYING\
- 	AUTHORS\
- 	ChangeLog\
--	INSTALL\
- 	NEWS\
--	TODO\
- 	THANKS\
--	MAINTAINERS\
--	src/lingot-background.xpm\
--	src/lingot-logo.xpm\
--	intltool-extract.in\
--	intltool-merge.in\
--	intltool-update.in
-+	MAINTAINERS
- 
- EXTRA_DIST = $(lingotdoc_DATA)
- 
diff --git a/media-sound/lingot/files/lingot-1.0.1-configure.patch b/media-sound/lingot/files/lingot-1.0.1-configure.patch
new file mode 100644
index 000000000000..f39dc3d9ad55
--- /dev/null
+++ b/media-sound/lingot/files/lingot-1.0.1-configure.patch
@@ -0,0 +1,217 @@
+From 916ed65b3901731fff02eceadcbc5b18f4c27d6f Mon Sep 17 00:00:00 2001
+From: Nicolas Boulenguez <nicolas.boulenguez@free.fr>
+Date: Sat, 14 Jul 2018 09:40:37 +0200
+Subject: [PATCH] Remove unused variables from configure.ac.
+
+Also replace
+  configure.ac: NO_PREFIX_PACKAGE_FOO_DIR = "share/foo"
+  configure.ac: AC_SUBST(NO_PREFIX_PACKAGE_FOO_DIR)
+and
+  Makefile.am : .. = $(prefix)/@NO_PREFIX_PACKAGE_FOO_DIR@
+with
+  Makefile.am : .. = $(datadir)/foo
+for simplicity and conformity with the usual meaning of datadir.
+
+These changes may require regeneration by Anjuta.
+---
+ Makefile.am       |  2 +-
+ configure.ac      | 85 -----------------------------------------------
+ icons/Makefile.am |  2 +-
+ 3 files changed, 2 insertions(+), 87 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index db5ec16..d61162f 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -27,7 +27,7 @@ DISTCLEANFILES = \
+ 	m4/* \
+ 	po/Makefile.in.in
+ 
+-gnomemenudir = $(prefix)/@NO_PREFIX_PACKAGE_MENU_DIR@
++gnomemenudir = $(datadir)/applications
+ gnomemenu_DATA = org.nongnu.lingot.desktop
+ appdatadir = $(datadir)/metainfo
+ appdata_DATA = org.nongnu.lingot.appdata.xml
+diff --git a/configure.ac b/configure.ac
+index 08f208f..cfb1259 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -162,90 +162,6 @@ if test "x$uselibfftw" = "xyes"; then
+  fi
+ fi
+ 
+-
+-dnl PKG_CHECK_MODULES([GLADE], [libglade-2.0])
+-dnl AC_SUBST(GLADE_CFLAGS)
+-dnl AC_SUBST(GLADE_LIBS)
+-
+-dnl Set PACKAGE_LOCALE_DIR in config.h.
+-if test "x${prefix}" = "xNONE"; then
+-  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${ac_default_prefix}/${DATADIRNAME}/locale", [Package local directory])
+-else
+-  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/${DATADIRNAME}/locale", [Package local directory])
+-fi
+-
+-dnl Set PACKAGE SOURCE DIR in config.h.
+-packagesrcdir=`cd $srcdir && pwd`
+-
+-dnl Set PACKAGE PREFIX
+-if test "x${prefix}" = "xNONE"; then
+-  packageprefix=${ac_default_prefix}
+-else
+-  packageprefix=${prefix}
+-fi
+-
+-dnl Set PACKAGE DATA & DOC DIR
+-packagedatadir=share
+-packagedocdir=doc/${PACKAGE}
+-
+-dnl Set PACKAGE DIRs in config.h.
+-packagepixmapsdir=share/pixmaps/${PACKAGE}
+-packageicondir=share/icons/hicolor/scalable/apps/
+-packagehelpdir=share/gnome/help/${PACKAGE}
+-packagemenudir=share/applications
+-
+-dnl Subst PACKAGE_DATA_DIR.
+-NO_PREFIX_PACKAGE_DATA_DIR="${packagedatadir}"
+-AC_SUBST(NO_PREFIX_PACKAGE_DATA_DIR)
+-PACKAGE_DATA_DIR="${packageprefix}/${packagedatadir}"
+-AC_SUBST(PACKAGE_DATA_DIR)
+-
+-dnl Subst PACKAGE_DOC_DIR.
+-NO_PREFIX_PACKAGE_DOC_DIR="${packagedocdir}"
+-AC_SUBST(NO_PREFIX_PACKAGE_DOC_DIR)
+-PACKAGE_DOC_DIR="${packageprefix}/${packagedocdir}"
+-AC_SUBST(PACKAGE_DOC_DIR)
+-
+-dnl Subst PACKAGE_PIXMAPS_DIR.
+-NO_PREFIX_PACKAGE_PIXMAPS_DIR="${packagepixmapsdir}"
+-AC_SUBST(NO_PREFIX_PACKAGE_PIXMAPS_DIR)
+-PACKAGE_PIXMAPS_DIR="${packageprefix}/${packagepixmapsdir}"
+-AC_SUBST(PACKAGE_PIXMAPS_DIR)
+-
+-dnl Subst PACKAGE_ICON_DIR.
+-NO_PREFIX_PACKAGE_ICON_DIR="${packageicondir}"
+-AC_SUBST(NO_PREFIX_PACKAGE_ICON_DIR)
+-PACKAGE_ICON_DIR="${packageprefix}/${packageicondir}"
+-AC_SUBST(PACKAGE_ICON_DIR)
+-
+-dnl Subst PACKAGE_HELP_DIR.
+-NO_PREFIX_PACKAGE_HELP_DIR="${packagehelpdir}"
+-AC_SUBST(NO_PREFIX_PACKAGE_HELP_DIR)
+-PACKAGE_HELP_DIR="${packageprefix}/${packagehelpdir}"
+-AC_SUBST(PACKAGE_HELP_DIR)
+-
+-dnl Subst PACKAGE_MENU_DIR.
+-NO_PREFIX_PACKAGE_MENU_DIR="${packagemenudir}"
+-AC_SUBST(NO_PREFIX_PACKAGE_MENU_DIR)
+-PACKAGE_MENU_DIR="${packageprefix}/${packagemenudir}"
+-AC_SUBST(PACKAGE_MENU_DIR)
+-
+-dnl AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${packageprefix}/${packagedatadir}")
+-dnl AC_DEFINE_UNQUOTED(PACKAGE_DOC_DIR, "${packageprefix}/${packagedocdir}")
+-dnl AC_DEFINE_UNQUOTED(PACKAGE_PIXMAPS_DIR, "${packageprefix}/${packagepixmapsdir}")
+-dnl AC_DEFINE_UNQUOTED(PACKAGE_HELP_DIR, "${packageprefix}/${packagehelpdir}")
+-dnl AC_DEFINE_UNQUOTED(PACKAGE_MENU_DIR, "${packageprefix}/${packagemenudir}")
+-dnl AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}")
+-
+-
+-AC_DEFINE([PACKAGE_DATA_DIR], [share], [Package data dir])
+-AC_DEFINE([PACKAGE_DOC_DIR], [doc], [Package doc dir])
+-AC_DEFINE([PACKAGE_HELP_DIR], [doc], [Help])
+-AC_DEFINE([PACKAGE_MENU_DIR], [], [Menu])
+-AC_DEFINE([PACKAGE_ICON_DIR], [icons], [Icons])
+-AC_DEFINE([PACKAGE_SRC_DIR], [src], [Source])
+-
+-
+ AC_CONFIG_FILES([
+ Makefile
+ po/Makefile.in
+@@ -254,4 +170,3 @@ icons/Makefile
+ test/Makefile
+ ])
+ AC_OUTPUT
+-
+diff --git a/icons/Makefile.am b/icons/Makefile.am
+index 9588562..0b17692 100644
+--- a/icons/Makefile.am
++++ b/icons/Makefile.am
+@@ -4,7 +4,7 @@
+ ## If you don't want it to overwrite it,
+ ## 	Please disable it in the Anjuta project configuration
+ 
+-lingot_iconsdir = $(prefix)/@NO_PREFIX_PACKAGE_ICON_DIR@
++lingot_iconsdir = $(datadir)/icons/hicolor/scalable/apps
+ 
+ lingot_icons_DATA = \
+ 	org.nongnu.lingot.svg
+From 0d65c3c71000a1f234288af4d703af888d569fd1 Mon Sep 17 00:00:00 2001
+From: Nicolas Boulenguez <nicolas.boulenguez@free.fr>
+Date: Sat, 14 Jul 2018 09:07:52 +0200
+Subject: [PATCH] Stop generating the desktop file.
+
+Drop the absolute path, and allow the icon to be found dynamically.
+This makes adding bitmaps additionally to the SVG easier later as well.
+---
+ configure.ac                                              | 1 -
+ org.nongnu.lingot.desktop.in => org.nongnu.lingot.desktop | 2 +-
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+ rename org.nongnu.lingot.desktop.in => org.nongnu.lingot.desktop (86%)
+
+diff --git a/configure.ac b/configure.ac
+index 5f1ea03..08f208f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -252,7 +252,6 @@ po/Makefile.in
+ src/Makefile
+ icons/Makefile
+ test/Makefile
+-org.nongnu.lingot.desktop
+ ])
+ AC_OUTPUT
+ 
+diff --git a/org.nongnu.lingot.desktop.in b/org.nongnu.lingot.desktop
+similarity index 86%
+rename from org.nongnu.lingot.desktop.in
+rename to org.nongnu.lingot.desktop
+index 76842ce..8b3524f 100644
+--- a/org.nongnu.lingot.desktop.in
++++ b/org.nongnu.lingot.desktop
+@@ -6,7 +6,7 @@ Comment=LINGOT Is Not a Guitar-Only Tuner
+ Comment[cs]=(Nejen kytarová) ladi�ka
+ Comment[fr]=Un accordeur de guitare, mais pas que
+ Exec=lingot
+-Icon=@PACKAGE_ICON_DIR@/org.nongnu.lingot.svg
++Icon=org.nongnu.lingot.svg
+ Terminal=false
+ Type=Application
+ Categories=GNOME;GTK;AudioVideo;
+From 29691022bae3180cc021ad7b97023dd483be19de Mon Sep 17 00:00:00 2001
+From: Iban Cereijo <ibancg@users.noreply.github.com>
+Date: Wed, 18 Jul 2018 13:59:25 +0200
+Subject: [PATCH] Putting the desktop file in the distributed files.
+
+---
+ Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile.am b/Makefile.am
+index d61162f..d359df3 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -10,7 +10,6 @@
+ lingotdocdir = ${docdir}
+ lingotdoc_DATA = \
+ 	README \
+-	COPYING \
+ 	AUTHORS \
+ 	ChangeLog \
+ 	NEWS \
+@@ -37,6 +37,7 @@ dist_man_MANS = lingot.1
+ 
+ EXTRA_DIST = \
+ 	$(lingotdoc_DATA) \
++	$(gnomemenu_DATA) \
+ 	$(appdata_DATA) \
+ 	build-aux/gitlog-to-changelog \
+ 	bootstrap
diff --git a/media-sound/lingot/lingot-0.9.1.ebuild b/media-sound/lingot/lingot-0.9.1.ebuild
deleted file mode 100644
index 43092c2c4111..000000000000
--- a/media-sound/lingot/lingot-0.9.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit autotools eutils
-
-DESCRIPTION="LINGOT Is Not a Guitar-Only Tuner"
-HOMEPAGE="http://www.nongnu.org/lingot"
-SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa jack"
-
-RDEPEND="x11-libs/gtk+:2
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango
-	dev-libs/glib:2
-	gnome-base/libglade:2.0
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-clean-install.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable alsa) \
-		$(use_enable jack)
-}
-
-src_install() {
-	emake DESTDIR="${D}" lingotdocdir="/usr/share/doc/${PF}" install
-}
diff --git a/media-sound/lingot/lingot-1.0.1.ebuild b/media-sound/lingot/lingot-1.0.1.ebuild
new file mode 100644
index 000000000000..523ec2ba532c
--- /dev/null
+++ b/media-sound/lingot/lingot-1.0.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Accurate, easy to use, and highly configurable musical instrument tuner"
+HOMEPAGE="https://www.nongnu.org/lingot/"
+SRC_URI="https://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa +fftw jack pulseaudio"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	alsa? ( media-libs/alsa-lib )
+	fftw? ( sci-libs/fftw:3.0= )
+	jack? ( virtual/jack )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/${P}-configure.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myemakeargs=(
+		$(use_enable alsa)
+		$(use_enable fftw libfftw)
+		$(use_enable jack)
+		$(use_enable pulseaudio)
+	)
+
+	econf "${myemakeargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" lingotdocdir="/usr/share/doc/${PF}" install
+}
diff --git a/media-sound/lollypop/Manifest b/media-sound/lollypop/Manifest
new file mode 100644
index 000000000000..193d0b90b5eb
--- /dev/null
+++ b/media-sound/lollypop/Manifest
@@ -0,0 +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
+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
new file mode 100644
index 000000000000..2e53e4c81d53
--- /dev/null
+++ b/media-sound/lollypop/lollypop-0.9.601.ebuild
@@ -0,0 +1,58 @@
+# 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/metadata.xml b/media-sound/lollypop/metadata.xml
new file mode 100644
index 000000000000..15fd2f3a22be
--- /dev/null
+++ b/media-sound/lollypop/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>johu@gentoo.org</email>
+		<name>Johannes Huber</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-sound/musepack-tools/Manifest b/media-sound/musepack-tools/Manifest
index 8e9660de6f6a..e83db43df7e0 100644
--- a/media-sound/musepack-tools/Manifest
+++ b/media-sound/musepack-tools/Manifest
@@ -1,4 +1,4 @@
-AUX musepack-tools-465-gentoo.patch 1550 BLAKE2B 8366eb045ea252e3c375d6ae17a485e4fb1d35bf3768a4c3335cfedb1a7e8d9a9d210a18f09d2800d8a26ec008cba7ac74751dea76257327e37f97ecd8662dec SHA512 464513d49a290967b1fee8f9c27569e4b0b7004ddd5856f80dee9935a8ed4eeacabe48021f403136df0079a216b7da149edfea5079fa41eecd8caeaa13344369
+AUX musepack-tools-465-gentoo.patch 1558 BLAKE2B 292111fc2b795a98cc2c1926b63799114e4b6ea2c11aa9ddee78c24332181ac9d5c4ab403398470014b5f33cf246def98214026d0def5979e11df2a1e2747050 SHA512 c260e1f96fa4ab79f09d78f16ede4522a802f703d565cf6db974b918e8db48233211a561ce64e0e8bc7cbd177ebf2986c46e5c9811ac15515f8126458c15b0af
 DIST musepack-tools-465.tar.bz2 167612 BLAKE2B 0748cbfaecec396a4bf054aac5a451f16386becae75cdbb63821c28f7b7d378723df180d909eb3b9e0c7eafa79996dbe7aaab251721fd139b81755e7f59249f1 SHA512 ce933376bc127f6f4acc8500e50b6318a6bc5bf8443547fc0e25b4e8e5881fd7a73aff155560ffbc5161b5d7d03522c73bfbc31e14e1531fe511036a0f657d54
-EBUILD musepack-tools-465-r1.ebuild 829 BLAKE2B 2e218114b9d16693d01abb12f81b0412c2b03e81b2ab5ea741b1641c79d527950d6df9c7b64dbc2bcc8b0ba15632c7635071f3ccb2ae6d53f38687d8f8a9196a SHA512 dabc121e5154fad169adcfbf91f50f5f68afec703c5b01758fb24ac147f5fd8be652cd9c2a1a30184dc855fca4f52d0ae2ce1599794d63b2771d697171a0f612
+EBUILD musepack-tools-465-r1.ebuild 831 BLAKE2B e7c82080b80a25de3fe681156671deaae8fef0408e133c4ffdef1fe6739a500508a4508faf804a0c5390b9ac1d41b840a8d476a65a36ba826c2eb0eb79401260 SHA512 344fbc7f46cfc66df17e6119880101358c9d4fe1841f91b44f9260c96afc9614d367d62aaea6d2ee32e042e906c6faf000595a3a468c9cfcca4a32d0338852ec
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-sound/musepack-tools/files/musepack-tools-465-gentoo.patch b/media-sound/musepack-tools/files/musepack-tools-465-gentoo.patch
index a93b5ebddadd..51df29910742 100644
--- a/media-sound/musepack-tools/files/musepack-tools-465-gentoo.patch
+++ b/media-sound/musepack-tools/files/musepack-tools-465-gentoo.patch
@@ -1,5 +1,5 @@
---- CMakeLists.txt
-+++ CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -15,10 +15,6 @@
  
  add_definitions(-DFAST_MATH -DCVD_FASTLOG)
@@ -11,8 +11,8 @@
  add_subdirectory(libmpcdec)
  add_subdirectory(libmpcpsy)
  add_subdirectory(libmpcenc)
---- libmpcdec/CMakeLists.txt
-+++ libmpcdec/CMakeLists.txt
+--- a/libmpcdec/CMakeLists.txt
++++ b/libmpcdec/CMakeLists.txt
 @@ -1,7 +1,22 @@
  include_directories(${libmpc_SOURCE_DIR}/include)
  if(SHARED)
diff --git a/media-sound/musepack-tools/musepack-tools-465-r1.ebuild b/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
index f4f7e4eb5104..ebfe9885e1a3 100644
--- a/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
+++ b/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
@@ -1,14 +1,15 @@
-# 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-multilib
 
 # svn export http://svn.musepack.net/libmpc/trunk musepack-tools-${PV}
 # tar -cjf musepack-tools-${PV}.tar.bz2 musepack-tools-${PV}
 
 DESCRIPTION="Musepack SV8 libraries and utilities"
-HOMEPAGE="http://www.musepack.net"
+HOMEPAGE="https://www.musepack.net"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="BSD LGPL-2.1"
@@ -16,10 +17,13 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
-RDEPEND=">=media-libs/libcuefile-${PV}[${MULTILIB_USEDEP}]
+DEPEND="
+	>=media-libs/libcuefile-${PV}[${MULTILIB_USEDEP}]
 	>=media-libs/libreplaygain-${PV}[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}
 	!media-libs/libmpcdec
-	!media-libs/libmpcdecsv7"
-DEPEND="${RDEPEND}"
+	!media-libs/libmpcdecsv7
+"
 
 PATCHES=( "${FILESDIR}/${P}-gentoo.patch" )
diff --git a/media-sound/pasystray/Manifest b/media-sound/pasystray/Manifest
index 0f2a15e36dee..7b707e80137c 100644
--- a/media-sound/pasystray/Manifest
+++ b/media-sound/pasystray/Manifest
@@ -1,7 +1,6 @@
 AUX fix-missing-gint.patch 629 BLAKE2B 934363d22d7f7fb4eb8f0116418a703d83c50847b249623fe313f007d58a54b99691b611b76b6fcee714d5df9e73d21d25ea4914bd66096cf12e645f28fe703c SHA512 66aaa515cbb7a76f6f87fa527723cc60082ed77efeb02cb8fef784be3ab8a8fbec37ec61d7ff67c4b0cc0074cc281dd238c19cb1fb7686e57bb274b226dc25c9
-DIST pasystray-0.2.1.tar.bz2 100456 BLAKE2B 8cf7aa97a20062dffac59969a7b8d1d71e6fdaafd4e944b2ed3444f50fc1a70ab07f1c3e9c349115c8e50d1bf11093649ee41300590934bc4f71fd752b5aa1c2 SHA512 db7c05c2eb5fd3dada2e3c23f28978497d17a2147078390ab3e8c88654c4bd8ce48d07a15e9a5b3834acffcc2d86fa719ce2403255915bdfb2eb610bd0549041
 DIST pasystray-0.6.0.tar.gz 53835 BLAKE2B ef5abab45a17f6445e8cbd1e37c300aa2c1c25bee3d684d05263b02a507badb1d5ce7a1c76bed94d255e4f2d5e2f18bdfd749e83e98273a52d42ffb12a32f115 SHA512 51fdb5aab22ad10ffe73f6de68115ee1559f09f58cfe4d5201a2f262323ca3476a8b09c7fc02c4144414f44444661edd25d2d39b3de54ed4c662660867da622c
-EBUILD pasystray-0.2.1.ebuild 879 BLAKE2B 978299c671a5e877c78db6903b0a00cd89a6c70964bac36c6e3b0fbbab46b5b1b8b0fefb577308d7a8009602d849080121974ccea3cf20e70a66d0cd2d5219d2 SHA512 f74684712b6d36c901c70c69953b98947eda6e79e88e78e743f0de183bd6253d9bc6d71938ceb9f6bcefd9771783555fff1749cef1f8def7dacc2d559e5ad418
-EBUILD pasystray-0.6.0-r1.ebuild 1043 BLAKE2B 780ca6c4f8585e76acfa5e82d78ac757fc22f501c83b0c21feaa522e3ef13300806080f2b11c434dff71d95449e24fc6d4b0c56679d7b0a582e22c879673246c SHA512 534ffc663633ba4cc9c7f539db311e35dd973ffc08a76b5638dc32e4d48999583e73c94863e1937ac8e66af05816e20de447e557569e86f4e06f043698f7d0b7
+DIST pasystray-0.7.0.tar.gz 56014 BLAKE2B cba947895fc71a18a43c314486ec3513e844b1df426d0104f321c8ecd28199b6b4adf69f5c10146470a74c5e6f74f505833bd00c4541399a162ddcfb8aac4701 SHA512 a98dae85640c0640f921173cf5a794963e974af64a7a972bbc2a53e69060895b55494934bc1fcfd957f0c94ca90e4d52634bf444e841b2a0a57434e05500161b
 EBUILD pasystray-0.6.0-r2.ebuild 1098 BLAKE2B db682d8aeb9c5897bd8cfc636d48c08a9836c6a36c9a04dd7ef1c5b05829ddfdec7b122c2021acf0a8999e9c3c0451aae9f47c5385b06243ff6a69fbda86eeb7 SHA512 6a11e33c0ce6cd4f4272978d2371b219e697c554b32a3596519eb9be7b621d3e5aff01ff308b8e912d53be4d767fc2f9e4ded71bf47244ca2d5379fc43e3c4b7
+EBUILD pasystray-0.7.0.ebuild 1003 BLAKE2B 693733b47c7195d7318c89d38873d1895c674c75246ea67ea2cb82a4da21ec694afe08d062a20f2db710144bca3956ef4236911545fa16c01029ccc264c04621 SHA512 3d2c727b59605700b57e5c13cdb8ac1823b871c3efe57a8bf9ad0284c41dfc11aba99b4fc3aecc22842f612551cc07d1a113585688e9f983a9f75830ce6e0fea
 MISC metadata.xml 635 BLAKE2B 54e8f3a6f865a0caafaf253e37c517e84c5a41414c2456d34780522c25b8998cd50b2306e24d55e9c6c45e4e62bf6fc60e2f5098f63fd23e42778b0b067cb922 SHA512 97fb650bc38171c10b3678940a72b5100874aa84820b962e1b892d82555c8527bf19976076fa0017c400d7955716e7eb4747bcd8cc372198b5c84f6ec4086495
diff --git a/media-sound/pasystray/pasystray-0.2.1.ebuild b/media-sound/pasystray/pasystray-0.2.1.ebuild
deleted file mode 100644
index 3ce386fe140d..000000000000
--- a/media-sound/pasystray/pasystray-0.2.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit gnome2-utils
-
-DESCRIPTION="A system tray for pulseaudio controls (replacement for the deprecated padevchooser)"
-HOMEPAGE="https://github.com/christophgysin/pasystray"
-SRC_URI="mirror://github/christophgysin/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libnotify"
-
-RDEPEND="
-	|| ( >=media-sound/pulseaudio-1.0[glib,avahi] >=media-sound/pulseaudio-5.0-r3[glib,zeroconf] )
-	>=net-dns/avahi-0.6
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS="AUTHORS README TODO"
-
-src_configure() {
-	econf $(use_enable libnotify notify)
-}
-
-pkg_preinst() {	gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/media-sound/pasystray/pasystray-0.6.0-r1.ebuild b/media-sound/pasystray/pasystray-0.6.0-r1.ebuild
deleted file mode 100644
index 2730461f08c8..000000000000
--- a/media-sound/pasystray/pasystray-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils autotools vcs-snapshot xdg
-
-DESCRIPTION="PulseAudio system tray"
-HOMEPAGE="https://github.com/christophgysin/pasystray"
-SRC_URI="https://github.com/christophgysin/${PN}/archive/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libnotify zeroconf"
-
-RDEPEND="
-	>=dev-libs/glib-2.48.2
-	>=media-sound/pulseaudio-5.0-r3[glib,zeroconf?]
-	zeroconf? ( >=net-dns/avahi-0.6 )
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable libnotify notify) \
-		$(use_enable zeroconf avahi)
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_icon_savelist
-}
-
-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/media-sound/pasystray/pasystray-0.7.0.ebuild b/media-sound/pasystray/pasystray-0.7.0.ebuild
new file mode 100644
index 000000000000..2a40a2718dc9
--- /dev/null
+++ b/media-sound/pasystray/pasystray-0.7.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils autotools xdg
+
+DESCRIPTION="PulseAudio system tray"
+HOMEPAGE="https://github.com/christophgysin/pasystray"
+SRC_URI="https://github.com/christophgysin/${PN}/archive/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="libnotify zeroconf"
+
+RDEPEND="
+	>=dev-libs/glib-2.48.2
+	>=media-sound/pulseaudio-5.0-r3[glib,zeroconf?]
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	zeroconf? ( >=net-dns/avahi-0.6 )
+	libnotify? ( >=x11-libs/libnotify-0.7 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${PN}-${P}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable libnotify notify) \
+		$(use_enable zeroconf avahi)
+}
+
+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/media-sound/picard/Manifest b/media-sound/picard/Manifest
index 20fe3889c0e6..88d436dc975f 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,8 +1,6 @@
 AUX picard-2.0.3-crashfix.patch 639 BLAKE2B 2476104b4d1cb73cf1a88f006d88dcb598a5394794b9d28281b51a9661e5d8bed3a6693c98d8e84420980b98aabebae8430d6dc92478c2ab2c6d2d4a85a03cc6 SHA512 80380f0151b0ea5c3eea03d4f0e1a318c422d454324bdd403788e1553b129d9e3c41d79ffe4f74f492f752fb8e66ae6a53817ae4469a9066d2adc31e869b4ee8
 AUX picard-2.0.3-iteration-error.patch 904 BLAKE2B dfd8f64219a17cfa3ed5550eb5dfe4b268eaa09b28f493ccdb37da865d8d8d59f218a0c4d87b15013954bf3cf272d5776cc722a6fd47254a35d54f7d17d68e85 SHA512 b13e65e46a8fe0930473a76e414ac55443bf32516728221f902767510442807d5d2ddf70e15df1a851a31458876f578a270e630c0402379ff8f517b84be01865
-DIST picard-2.0.0_beta3.tar.gz 2686246 BLAKE2B e11cc85282bb3dfe7298090e42b62f7e9b2d4ee7df09b040905665694074ede611884e1544abc89aa3d07e0844d6599d5fac7c0db09bad7d9e64439c0c4478c9 SHA512 c8c5bdd84af3946bc24eb495bcb83877dffedb81e6ff64742925f6d1b4f2780f86280dda839d96030ea15ee2a7bf7708c20cc4ac92e97bf9cd372ea36715d156
 DIST picard-2.0.3.tar.gz 2748358 BLAKE2B ff71f9d7836b9f797a539db772e2ffcb8cb9ba4c25997c01590292bf1b7b5d311089174313af86f1eb0e82af48bc8f350578ae6bdffba3c6b3bf98b934481f8d SHA512 759252fa3c43af1bfc09d85ef90fe451e674bfebaee31838bd2779380d1b8ad817f899896baeccf583464566eb2acfe886c8288d1757faaaff2dc17c3b8ef6ae
-EBUILD picard-2.0.0_beta3.ebuild 1774 BLAKE2B 0dd094c47179e50704a8431322051a1942cbebf34ebd171f27823734b34103dc7427b13fce2714297cb7f811a62cbf90595212dc3b0205a0c55cb02be9ebb2fa SHA512 2f6936e6544930d2d60eec787e6a0f8cc36b49f891269448b0b308c9595aa5d9441012fe2f6eafa9d30fc40f647e9c74bc0e844f9323248f5477b562157cb768
-EBUILD picard-2.0.3.ebuild 1864 BLAKE2B 54931c2fcb87851c1e050844297b2f864cc39856afef8c6181a90811b96e97d8b121aa028444b8425dd884ab415cad007cabf9c5b3569f3053cb5e57fc1747fe SHA512 407c1bead0ed119f9ec81d40040c014a4111530e9298b76c57bfe056c8a09b7bd1afe8a4ecbb817563c95aec0b749eacb2a5b663c3a2e968ac91745709e8e957
+EBUILD picard-2.0.3.ebuild 1860 BLAKE2B ae08290f7560ae4cc709c6d09864076b3167c335399ea92950b8ec4464ab700f8285124c77605ada1491404e4509bcf405b040e65316541a91b1f3e434b6b3f0 SHA512 d9113e15846984d10eca61bb0181a2615c80055034aa07b30d54e1aac12865bf4a86bd41e95561dcf59a7676951b244e1c228dedacf8d137bdbd3f050a1859cd
 EBUILD picard-9999.ebuild 1698 BLAKE2B e2a3f8d9f18bc4560afa0dd926487d5a7ba1d609870c67cfd569c71ba25f623613796ee3fe61c3d2884670af6c64a609e12d7ba2667f64a6bcb87eb1724eea6d SHA512 d780f2c5855f59314d86089eed73b60c35dbe0083198b38bb4b61231affa31c3a7fc184083c593e3fde6c39cb4f4e561d2bc10d4bd57cd7226187bd9e3c60b75
 MISC metadata.xml 564 BLAKE2B 0408874b350710d85cd50f27158d074ee0a22c392822bfd7d90ae455906934c6ec1fd5963f4f225d2852a7bcbb5f74ec756b8c5ae449d2159ef52d552f6da954 SHA512 ce79b6abdff9db80eeac888838dea351058b17e90ffc5b13d4b446203531948f80705ef4184b35623fef1a0952f0071d5b4588f2fee5d93cebbc902a1a97577d
diff --git a/media-sound/picard/picard-2.0.0_beta3.ebuild b/media-sound/picard/picard-2.0.0_beta3.ebuild
deleted file mode 100644
index b4fa7700a16a..000000000000
--- a/media-sound/picard/picard-2.0.0_beta3.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=( python3_{5,6} )
-DISTUTILS_SINGLE_IMPL=1
-DISABLE_AUTOFORMATTING=true
-
-inherit distutils-r1 gnome2-utils readme.gentoo-r1 xdg-utils
-
-DESCRIPTION="A cross-platform music tagger"
-HOMEPAGE="https://picard.musicbrainz.org"
-SRC_URI="https://github.com/metabrainz/${PN}/archive/${PV/_beta3/dev6}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-RDEPEND="
-	dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}]
-	dev-qt/qtgui:5[accessibility]
-	>=media-libs/mutagen-1.38"
-DEPEND="
-	nls? ( dev-qt/linguist-tools:5 )
-"
-
-RESTRICT="test" # doesn't work with ebuilds
-
-S="${WORKDIR}/${P/_beta3/dev6}"
-
-python_compile() {
-	local build_args=(
-		--disable-autoupdate
-	)
-	if ! use nls; then
-		build_args+=( --disable-locales )
-	fi
-	distutils-r1_python_compile ${build_args[@]}
-}
-
-python_install() {
-	local install_args=(
-		--disable-autoupdate
-		--skip-build
-	)
-	if ! use nls; then
-		install_args+=( --disable-locales )
-	fi
-	distutils-r1_python_install ${install_args[@]}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local DOC_CONTENTS="Install optional package media-libs/chromaprint[tools] to enable
-calculation and lookup of AcoustID fingerprints.
-
-Install optional package dev-python/python-discid to enable
-calculation and lookup of compact disc identifiers (disc IDs).
-
-If you are upgrading Picard and it does not start, try removing
-Picard's settings:
-	rm ~/.config/MusicBrainz/Picard.conf"
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/picard/picard-2.0.3.ebuild b/media-sound/picard/picard-2.0.3.ebuild
index f3bbe1494326..c81de29bc6b7 100644
--- a/media-sound/picard/picard-2.0.3.ebuild
+++ b/media-sound/picard/picard-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
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/metabrainz/${PN}/archive/release-${PV}.tar.gz -> ${P
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/media-sound/pragha/Manifest b/media-sound/pragha/Manifest
index a7adbf187054..721fceda0576 100644
--- a/media-sound/pragha/Manifest
+++ b/media-sound/pragha/Manifest
@@ -3,9 +3,11 @@ DIST pragha-1.3.90.tar.bz2 760153 BLAKE2B 22cb90225cad5b19ecd95691bafd11f55b35e5
 DIST pragha-1.3.91.1.tar.bz2 755933 BLAKE2B db24a8752cfc52ded17a15555f3e39f2792c4f9717bca75a158d4672812fbee8d502149c08daa15113aa0de0fb1fe6f417d8a36c1b1b98c73f47d0319edca0a9 SHA512 ec0617ce0e1ead5ce2783c7bfb26cc4a2fc3f15a6f79ba887a02fc8a3dd01551ff91a41e90acc7fb23793a2261a340acdb80b9268fd08b5fa7dd26dd337fb07b
 DIST pragha-1.3.91.tar.bz2 740279 BLAKE2B c42f1b6d0c7071b56080d8feb8a11c9ba00b1339bc653a61cc80f09e1f076b2183091dbe2cbc42e7aa7347826492fa77cbbac980c25999ce3968a8e74dbc3623 SHA512 49b03ef69e7d12086e324a2088b4540eaebc01fd56247c43f069bd1b9fadbdd1b5f27af87b5086cc3e9a957281c3f7ff72c8ce3b0a6474514714a017ca5e0ab5
 DIST pragha-1.3.92.tar.bz2 764105 BLAKE2B f90dd45064d9ae7169bcb1f671e22da716560b3eb31caaff962a0eb5aa928f857200c61782bd90a54d660c21c4b3158cd6d224f4824939abdc572e7513c89b67 SHA512 8d166074dd3c1b2fa9a6f75e7bef222e09a2913a441c5ed90df6c431b7d3ab877e586b7df1adbba221656a52cd1630ad7bcfbb3f4fab762a8d8f9fa67b2842b9
+DIST pragha-1.3.99.tar.bz2 781892 BLAKE2B 9d73dd2859db0c7ab7ac66fdafe873bd78b019408682828ddd05aa18a1591576df667e326037a7ca28eaed227fcbce943209fad16c9f55bb38c0c2c808275104 SHA512 df032fe16932ad464417306d8d01373b8e415f5f810a06b1baff647a395b10bdee5c912f36a3f6e3ea6a0e04d399257e202112c1838444d23dfc17b5fd34e12b
 EBUILD pragha-1.3.3.ebuild 2288 BLAKE2B 0cad8db3ec862e8e731135eb2e53c2e6fadcc397476512153b1d72531eb74521b4f97c99c3a929f8968046ec98581a41719e75c0c8bee5dd15e2d77a9c7c0215 SHA512 90a7562ed5be7146fb86ea61befd6d145230235020d88f99a0762d2749b05640591343e680b3580654840ebb34ff1c9b1174ee28f73e28fe79c030ab739c6f73
 EBUILD pragha-1.3.90.ebuild 2502 BLAKE2B ad6086767bf4d14ba02311377ee5009ca66e8a87265119f1476191c81641867804eaa7484b7c04133ca82e4651b4e1cc45f1820227c7d6fa3be609fe2122197f SHA512 27c0cbe0ed8ad4bdb76a0d18dd0d60bdacac7506f36bc68165675c17845b514cdd5a913be34702809b6186a0d26e40fb412e36d1faed1bdd1f86335fcb737d8d
 EBUILD pragha-1.3.91.1.ebuild 2591 BLAKE2B 510d140f805df182ed3313410f798aa004281f9827d7911715e08083b8e88e0d757e4aa51298c3f13e2edd0ad70a35eb6a8b6b8aecde5c342bec57e28dd4280a SHA512 3dd07e0038eed6ec79b6919a63cb6a79feb04a08d3bf44d4b2dda746cea5f7ac35a1b0b80594aa304de275a33d0262753868a83abadcf6d42ef900c961ff2b95
 EBUILD pragha-1.3.91.ebuild 2591 BLAKE2B 510d140f805df182ed3313410f798aa004281f9827d7911715e08083b8e88e0d757e4aa51298c3f13e2edd0ad70a35eb6a8b6b8aecde5c342bec57e28dd4280a SHA512 3dd07e0038eed6ec79b6919a63cb6a79feb04a08d3bf44d4b2dda746cea5f7ac35a1b0b80594aa304de275a33d0262753868a83abadcf6d42ef900c961ff2b95
 EBUILD pragha-1.3.92.ebuild 2591 BLAKE2B 510d140f805df182ed3313410f798aa004281f9827d7911715e08083b8e88e0d757e4aa51298c3f13e2edd0ad70a35eb6a8b6b8aecde5c342bec57e28dd4280a SHA512 3dd07e0038eed6ec79b6919a63cb6a79feb04a08d3bf44d4b2dda746cea5f7ac35a1b0b80594aa304de275a33d0262753868a83abadcf6d42ef900c961ff2b95
+EBUILD pragha-1.3.99.ebuild 2591 BLAKE2B 3ea0da51e0ffe4fee16e69d92e39143666817c9031c037be0fca13de5d457819fa348b0d7258651f67e888d265d9396f4db8ead768bfcd8c4c04f58a06ed50e2 SHA512 d83414ca8e3d34357d9b123dbb4ab19d663ea529f6898437404108d9394b061dde8d1bb0a3219f9a8e3bebe0ff8cfd7973fb80ced341d7955363f8f3d63ff06d
 MISC metadata.xml 1215 BLAKE2B d7a5bf01af7aa7047342f674cc33ee8ad9ea20dd9b0a496f1954830057bc51932530755429d54faa599da6b2817907100057153436a47a731892a8d8f91aece3 SHA512 9700873ef8ee962e9ba0057d8489b22e73ebaf55a6bda1cd58f062167f15f1b8d08e0c9061e45b4fd71040932e394a9006c00a95a944bf45ef7b65d48f922f34
diff --git a/media-sound/pragha/pragha-1.3.99.ebuild b/media-sound/pragha/pragha-1.3.99.ebuild
new file mode 100644
index 000000000000..54229d1b0085
--- /dev/null
+++ b/media-sound/pragha/pragha-1.3.99.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils xdg-utils
+
+DESCRIPTION="A lightweight music player (for Xfce)"
+HOMEPAGE="https://github.com/pragha-music-player/pragha"
+SRC_URI="https://github.com/pragha-music-player/${PN}/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cdda +glyr grilo +keybinder koel lastfm libnotify mtp +peas +playlist rygel soup +udev"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.4:3=
+	>=dev-libs/glib-2.42:=
+	media-libs/gstreamer:1.0=
+	media-libs/gst-plugins-base:1.0=
+	>=media-libs/taglib-1.8:=
+	>=x11-libs/gtk+-3.14:3=
+	>=xfce-base/libxfce4ui-4.11:=[gtk3(+)]
+	cdda? ( >=dev-libs/libcdio-0.90:=
+		>=dev-libs/libcdio-paranoia-0.90:=
+		>=media-libs/libcddb-1.3.0:= )
+	glyr? ( >=media-libs/glyr-1.0.1:= )
+	grilo? ( media-libs/grilo:0.3=[network] )
+	keybinder? ( >=dev-libs/keybinder-0.2.0:3= )
+	koel? ( dev-libs/json-glib:= )
+	lastfm? ( >=media-libs/libclastfm-0.5:= )
+	libnotify? ( >=x11-libs/libnotify-0.7.5:= )
+	mtp? ( >=media-libs/libmtp-1.1.0:= )
+	peas? ( >=dev-libs/libpeas-1.0.0:=[gtk] )
+	playlist? ( >=dev-libs/totem-pl-parser-2.26:= )
+	rygel? ( >=net-misc/rygel-0.26:= )
+	soup? ( >=net-libs/libsoup-2.38:= )
+	udev? ( virtual/libgudev:= )"
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/gst-plugins-meta:1.0"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	>=dev-util/xfce4-dev-tools-4.10
+	sys-devel/gettext
+	virtual/pkgconfig
+	xfce-base/exo"
+REQUIRED_USE="glyr? ( peas )
+	grilo? ( peas )
+	koel? ( soup )
+	libnotify? ( peas )
+	mtp? ( udev )
+	rygel? ( peas )
+	soup? ( peas )
+	udev? ( peas )"
+
+src_configure() {
+	local myconf=(
+		$(use_enable peas libpeas-1.0)
+		$(use_enable glyr libglyr)
+		$(use_enable lastfm libclastfm)
+		$(use_enable cdda libcdio)
+		$(use_enable cdda libcdio_paranoia)
+		$(use_enable cdda libcddb)
+		$(use_enable playlist totem-plparser)
+
+		$(use_enable libnotify)
+		$(use_enable keybinder)
+		$(use_enable udev gudev-1.0)
+		$(use_enable mtp libmtp)
+		$(use_enable koel json-glib-1.0)
+		$(use_enable soup libsoup-2.4)
+		$(use_enable rygel rygel-server-2.6)
+		$(use_enable grilo grilo-0.3)
+		$(use_enable grilo grilo-net-0.3)
+		# avoid trying to use 0.2 & 0.3 simultaneously
+		# https://github.com/pragha-music-player/pragha/issues/124
+		--disable-grilo-0.2
+		--disable-grilo-net-0.2
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -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/quimup/Manifest b/media-sound/quimup/Manifest
index d81dfcdef553..b562d5a958e3 100644
--- a/media-sound/quimup/Manifest
+++ b/media-sound/quimup/Manifest
@@ -1,6 +1,3 @@
-AUX quimup-1.4.0-qdatastream.patch 298 BLAKE2B 4268dead71539c993f1cf3a32e57d4600e71b964ce71d6412589c0c58ec3cfb57adf09d11d4b216ff8501fe2ce983737cfd650b2cc3a3b868207627ed0efeffa SHA512 04cd65acabdeee81a7002a3a9402213d842ae1aea52832549ebfa1037c9279ab4e2e3503f4fc6c0fd410d974b00838da6214fe1f11df311d57c15dc51a7e5abb
-DIST quimup_1.4.0_src.tar.gz 225621 BLAKE2B 2ee93c8bd7a674c2e86b4d6779e76deb0a86abe6ce4794acf416a4f24ce013b6e068718763a97592809bfb89168b98a1450765a7e1ba0e2a0cbff5fbeb10f58a SHA512 e5351d33a8082371fa50914381fcb7d0b15fe2d8d65feab64774c2d85476b6135d199a17bf125d2e39fa64916bc3d31da1ba5eec6b274ff6298e0b93237f8b61
 DIST quimup_1.4.3_source.tar.gz 587260 BLAKE2B ee2ce0d9f71c63db73af00fe385d643f5ec08e322137c0c4d372fec68b875587e0f46ca2a46d9afc366afdd29e5381816457e4b3b3891af8c0113c577385aa23 SHA512 fb3727bf5c0f756c888484f7c061da95a1ece15673079ac8e6ffc82289f78cfce3dda7245ae25b1d705ffe057f1b0930baf2338bdfe0f16c900dc1ffd3fef807
-EBUILD quimup-1.4.0.ebuild 848 BLAKE2B cea8bda4ac4276bf6bd1b48f45304b20eaa2d18a687553628300021dab6a41e550d406bf7c389985d9044893f2b8e2015c7e6acb0afa8c8f0e09cbdf72dea735 SHA512 d45bb1a1a4c0974faadd572b382ba997aaf02d88f0d3febb30bb5623dd9761f49d861a0974a375305f54d65cbcaaa98cb2774860672acea2fa5397da4cda8f8b
-EBUILD quimup-1.4.3.ebuild 797 BLAKE2B 78f5206660a40e18fc2e7ace3abd4ffce8a500470cc96954ffaf07f6f21f75841e1e2c3d2c81c404842f5a51f2a7d13e505cf4d2e2739a258e06f8a0bc4aa6d3 SHA512 5ba2e48f56c8b3a3a3c3d683c26e6a4a8cdaa93457157669a7dbe08434a3f63feb0398cb0689080d65ef9866bcc79d6afab969bf992bd34a95e117a72c8dd7d8
+EBUILD quimup-1.4.3.ebuild 792 BLAKE2B a87e111bc4e8eab3950bf1cce8ae6317bf081d74f4102bfcf7a615990b3d297e39aafaa7bf512f0777c345b30d04bf27f88ff10626e99847b6f1d681e3108d00 SHA512 901c1890a815ecd838b218aea2d55ba939c2dc263bcb52f11e52e2620dbbbc538b8984bb247f025902238d7c6065713708e88aeff7dc69376ea09117cdb8af2b
 MISC metadata.xml 339 BLAKE2B 6bb8fc9b606a6375c7997836909a5396bba8e726e2f0e06820e43574353a83ebe8cfe7fda125c6a1c892eed799195c7b74f1fa5c365686e0335a75f82848bbeb SHA512 02c262de7f82e49ebd91d60aa4e6577b8c4cead1b0b1df8a7bc18b575358e93b17384bc42ace5cf64b13116db9077fbc2262f110f6308cfa3621e994170cebd6
diff --git a/media-sound/quimup/files/quimup-1.4.0-qdatastream.patch b/media-sound/quimup/files/quimup-1.4.0-qdatastream.patch
deleted file mode 100644
index 3f1396fcc704..000000000000
--- a/media-sound/quimup/files/quimup-1.4.0-qdatastream.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/qtlocalpeer.cpp b/src/qtlocalpeer.cpp
-index ddd2c74..52d6e6c 100644
---- a/src/qtlocalpeer.cpp
-+++ b/src/qtlocalpeer.cpp
-@@ -41,6 +41,7 @@
- #include "qtlocalpeer.h"
- #include <QCoreApplication>
- #include <QTime>
-+#include <QDataStream>
- 
- #if defined(Q_OS_WIN)
- #include <QLibrary>
diff --git a/media-sound/quimup/quimup-1.4.0.ebuild b/media-sound/quimup/quimup-1.4.0.ebuild
deleted file mode 100644
index c0bee4f81dfb..000000000000
--- a/media-sound/quimup/quimup-1.4.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils qmake-utils
-
-MY_P=${PN}_${PV}
-
-DESCRIPTION="A Qt5 client for the music player daemon (MPD) written in C++"
-HOMEPAGE="http://mpd.wikia.com/wiki/Client:Quimup"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	>=media-libs/libmpdclient-2.3
-	media-libs/taglib"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN} ${PV}"
-
-DOCS=( changelog FAQ.txt README )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-qdatastream.patch
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	default
-	dobin ${PN}
-
-	newicon src/resources/mn_icon.png ${PN}.png
-	make_desktop_entry ${PN} Quimup
-}
diff --git a/media-sound/quimup/quimup-1.4.3.ebuild b/media-sound/quimup/quimup-1.4.3.ebuild
index f1390ac72f02..2c80b78db1c2 100644
--- a/media-sound/quimup/quimup-1.4.3.ebuild
+++ b/media-sound/quimup/quimup-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=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}_source.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-sound/schismtracker/Manifest b/media-sound/schismtracker/Manifest
index a090ffb7c326..7db9f15dcb0e 100644
--- a/media-sound/schismtracker/Manifest
+++ b/media-sound/schismtracker/Manifest
@@ -1,5 +1,3 @@
-DIST schismtracker-20120105.tar.bz2 1097124 BLAKE2B 978e4b3e81b5c9ed93132aeb12febc2add281060f41d74a52da25799d7ae291d2cbc2401619fd01bc7bba342049d4aef6ac0fbf326443b790c4704301a78a511 SHA512 5b92603af3b6add0e8bd6d0b140b0ddedbaf8e2b434f651ab887e3211ccc8bcfa94be281aabc3b28dbd84e3d91f539eb0939d6d4e0596529133db7ce10aeafd8
 DIST schismtracker-20180810.tar.gz 1064821 BLAKE2B d8016437db7cf6e0087150755090621ba15661753ebcfb8081f0c137a93389d04aa7a5e1ac09fb1366d1d3b3f76c22cb497171a74fb226347eb194c58c1f0f18 SHA512 d131cec7e4749941f0e5806bff14e0782a01f14f8a68605270d09ff40af1d20fffd4c7caf2926c5a63d3e0c0bb1ed24ce4a5e4cccc280ac045a22cfb8544c498
-EBUILD schismtracker-20120105.ebuild 1365 BLAKE2B 8386318c84c7cc74cd744dc8d64ac739e9d109c60626e27400eafce87147c99a7d706a5bfbf5c756ca777f30b3489678764d959380b7f9a5ab577a37460073f7 SHA512 aa012b9e698edfd9a460c80101e573ddc627efeaa2d5a8c65e2bf41600212f0c1dfb44da2f55a57ae7c4e940e187a98c8464ce8092f4de0b1c0bd4cfa827076d
-EBUILD schismtracker-20180810.ebuild 1566 BLAKE2B 790cc5f10cf37da4dd672b0ecd2aa92771898ff8547e912b161e17ed569d9b57f89919dd0af4012ba1c6c520e3748533c6c123b4926ef954784674758eb9ffe4 SHA512 5fac164d9ae0681379f0880d6506a66edb98b7383c0d6d1180247eac5df287d445b1d4895177da60f027868326adbe7c57f60e579ad9617bffcb4929a5a5a3f8
+EBUILD schismtracker-20180810.ebuild 1561 BLAKE2B 1e8699600df0cecc68537ac7d8f55ab8b853ca60c1e50639e7489b35a39e5714947e5e25b41016cf68ca40761128d2865a5d6fa7f6a661bb95cfa48a2726f3d6 SHA512 0cc68fa66cbfeab295863b2637706ef1e6ecdbfa1c438bb3d77f44c58e91eaad24aa6da16a2fcaaa0069c73cbc9c41772aa2fe0adc5b6ebde2877819860f6521
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-sound/schismtracker/schismtracker-20120105.ebuild b/media-sound/schismtracker/schismtracker-20120105.ebuild
deleted file mode 100644
index 14de37e0dfb3..000000000000
--- a/media-sound/schismtracker/schismtracker-20120105.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils
-
-DESCRIPTION="Free implementation of Impulse Tracker, a tool used to create high quality music"
-HOMEPAGE="http://eval.sovietrussia.org//wiki/Schism_Tracker"
-SRC_URI="http://${PN}.org/dl/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2 public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="media-libs/alsa-lib
-	>=media-libs/libsdl-1.2[X]
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXv
-	x11-libs/libXxf86misc"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	x11-base/xorg-proto"
-
-DOCS="AUTHORS NEWS README TODO"
-
-src_prepare() {
-	default
-
-	# workaround for temporary files (missing directory). Fixes:
-	# sh ./scripts/build-font.sh . font/default-lower.fnt font/default-upper-alt.fnt font/default-upper-itf.fnt font/half-width.fnt >auto/default-font.c
-	# /bin/sh: auto/default-font.c: No such file or directory
-	mkdir auto
-
-	#   sys-devel/binutils[multitarget] provides ${CHOST}-windres
-	#   wine provides /usr/bin/windres
-	# and schismtracker fails to use it properly:
-	# sys/win32/schismres.rc:2:20: fatal error: winver.h: No such file or directory
-	[[ ${CHOST} = *mingw32* ]] || export WINDRES= ac_cv_prog_WINDRES= ac_cv_prog_ac_ct_WINDRES=
-}
-
-src_install() {
-	default
-
-	domenu sys/fd.org/*.desktop
-	doicon icons/schism{,-itf}-icon-128.png
-}
diff --git a/media-sound/schismtracker/schismtracker-20180810.ebuild b/media-sound/schismtracker/schismtracker-20180810.ebuild
index 55398fb6ab34..4744ab0d1e18 100644
--- a/media-sound/schismtracker/schismtracker-20180810.ebuild
+++ b/media-sound/schismtracker/schismtracker-20180810.ebuild
@@ -1,4 +1,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}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest
index e39ca95b0bed..d25785b146f5 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 1643 BLAKE2B 5e14d19004d33870fb0351420abd027826a22cb8dc600c6a953bf259785a052de1489abefc761be3b113d9e89c155aa4e9ec5779fcff1e69b9bc9937e17f4d56 SHA512 80b262ff6a7c49bd40f6635934fe39a41157cc290e3e4231b7a05528d59d7b518ef94cb292781137948029b0bbffacaf939d6325261355b831e22f778521066b
-MISC metadata.xml 554 BLAKE2B 162f2f8391a4b5226910cae53834752b14eb003091e7cce4f345f93923a6a09ada4289008efb9e76886f1b7dbd7709f75e010abfb85af71745e06b11394fb9a3 SHA512 25fb52f0a1c11c21f841e68d1485c4e1bcb8194ef16b414f71caa7d378fcea31461f73b0bd064049435d09baf4c90ebb85113f248232c5a933b54f7c971ef017
+EBUILD tomahawk-0.9.0_pre20180501.ebuild 1585 BLAKE2B 35d70ed1b3c8fbe9e96aaa1d3c901a8c41993145142d870577e858970894fce7f9b9cbae5837eff97be334b72975365b02b0c5214e188a7bd96f226e9bfdb086 SHA512 ddbc08c214ab3f17c8dbeea1da2d026f9825257c0020b29089aa0814e2a95f105dac8c29c4aa7d6a8feda5f681f708f4a7f4c93e80534b9f327a9c0469aabed3
+MISC metadata.xml 469 BLAKE2B f1ce874c2e31f6b88d9c91492d08128d7df704724f7db998f1748e2f92c4a02150cbc46eaf9b01c0ebaefc113e30babb34d0759f15d31d5690bf0c65476a54d1 SHA512 1a6df7c09acd55070789d645b4926da6b93095ea9ceea4c593a48140bf86fd0492df908a81350eeaf323478468c7e6814665e0cf6c76dbeb8ba4fddf7efe0986
diff --git a/media-sound/tomahawk/metadata.xml b/media-sound/tomahawk/metadata.xml
index a36075aeec6a..3bc448c2a0a9 100644
--- a/media-sound/tomahawk/metadata.xml
+++ b/media-sound/tomahawk/metadata.xml
@@ -10,7 +10,6 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
-		<flag name="hatchet">Enable support for the synchronisation through Hatchet</flag>
 		<flag name="telepathy">Enable support for the real-time communication framework telepathy</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-sound/tomahawk/tomahawk-0.9.0_pre20180501.ebuild b/media-sound/tomahawk/tomahawk-0.9.0_pre20180501.ebuild
index 78600519cd52..3c553a30e8cd 100644
--- a/media-sound/tomahawk/tomahawk-0.9.0_pre20180501.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.9.0_pre20180501.ebuild
@@ -1,4 +1,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/${PN}-player/${PN}/archive/${COMMIT}.tar.gz -> ${P}.
 LICENSE="GPL-3 BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+hatchet telepathy xmpp"
+IUSE="telepathy xmpp"
 
 CDEPEND="
 	$(add_frameworks_dep attica)
@@ -37,7 +37,6 @@ CDEPEND="
 	media-video/vlc:=[flac,dvbpsi,ffmpeg,mp3]
 	>=net-libs/gnutls-3.2:=
 	x11-libs/libX11
-	hatchet? ( dev-cpp/websocketpp )
 	telepathy? ( >=net-libs/telepathy-qt-0.9.7-r1[qt5(+)] )
 	xmpp? ( >=net-libs/jreen-1.3.0[qt5(+)] )
 "
@@ -57,7 +56,7 @@ src_configure() {
 		-DBUILD_TOOLS=OFF
 		-DBUILD_WITH_QT4=OFF
 		-DWITH_KDE4=OFF
-		-DBUILD_HATCHET=$(usex hatchet)
+		-DBUILD_HATCHET=OFF
 		-DWITH_TelepathyQt=$(usex telepathy)
 		-DWITH_Jreen=$(usex xmpp)
 	)
diff --git a/media-sound/wildmidi/Manifest b/media-sound/wildmidi/Manifest
index ff5fcc5e291c..62b087929502 100644
--- a/media-sound/wildmidi/Manifest
+++ b/media-sound/wildmidi/Manifest
@@ -1,12 +1,4 @@
 AUX wildmidi.cfg 4670 BLAKE2B 09b79b3c179a506b6b1b6bb7f5b271926dc6b03daa755fb33c8116adabbf2e592aec32ced336be2986982adc84b78eb811fb417de3b327df8da70f2993124522 SHA512 978d8aeec23430cc0fbd0d625795a63f0876375e168f3be3294553de4d63c0e930775154c8dfa3a925c87010bb83e9e96b9e897de2166f3dbd40c4c14cd3f3c1
-DIST wildmidi-0.2.3.5.tar.gz 375792 BLAKE2B d4f14df0e46ce59d18fc2949d5e3789831301fa86b3abe9d0d027e4beb15cfde871561851d49bcfe3784db16d1a4433a8b3a19a05e673215d84255e0caaa51d5 SHA512 20bce7c551239944d2f6cd27a0963628e13624e651aabfae62380fe953ac3fc67eb27551a427c41ef2b057ec00903128d6afeccfc2688aefd46709d1f941befc
 DIST wildmidi-0.3.13.tar.gz 132407 BLAKE2B 5f603adb7583d47ca0595a48a385412d09ca8b19e99c93ba474d91076fa17a54e12e08bb39ea73d16c07addeab86e6c9d8b778d19045ef6b7d551d041bbc58fa SHA512 e9ede8a98c97e57a7bd34e63fc725a1b47bbff6b41f5dca101249917f0e7756ce4d93a84b8d5b6f592687fd3deed369c22c727873c9bdd1bea6e8c31fdbb4fdb
-DIST wildmidi-0.3.6.tar.gz 105534 BLAKE2B 4c2a62ec61333c3d9dc7f26e981389f22c6b2b611a548d6ff3fa9bc450490ece42f5b1c636dc53fc05c51b445a0ce8bc68fdfccdd440aa82bef36001049ce9d5 SHA512 e7efb9e9e67ee518dd0cdabbe8d701ec3c0762ea007e52533b82f4a4984e0600f7ba1cd9f9b79dda9e553fa04ca861b0b8d4b21ceb35ed0c8f5a4fe6de66d1d0
-DIST wildmidi-0.3.7.tar.gz 121501 BLAKE2B bae856c00449564f9199f977a4881d51c19769da10bf554a8baf681454a50b67b70feeda19592be91beda65131d4f241e661524f9c65163fb95a8570fee7f779 SHA512 b4d40404891161cb55a71dd790e2dbd2c4ec21730c8aaa6f3a68eeacd36d939f859b55ab535bee2feb9ffed04337332ef1eedcffbff6ae02d7499fec97f7a42b
-DIST wildmidi-0.3.8.tar.gz 121690 BLAKE2B fd11315e930a30f89ca57af0819116f8385fa1a7ecaedf7df1decc39774fa0a98df6b12e47bc8254a6c856bf41083571effa3aa70a448c1fdbcc0bbc7e848178 SHA512 883c5b2db84bee85f14a98729496aa9e15f5c1414dbaed6108d07e649b34937cbd3e8a8823a2b6519fcc7fdd354219c0667615c7b31e8952e13f8635e5284f50
-EBUILD wildmidi-0.2.3.5.ebuild 1108 BLAKE2B f1e1c9d2b7f38959cb423ffafd5ca17c6d979fc73e5ef810112aca00dd23a547dbd7e354bb1a86207dea79a42074475e705386b5fa3badf38f2190bcbe063487 SHA512 3937c9b2f532cd09dfcd656b516d396ec0acaeed010ca09ecf8f3609f71b67591e6aae5b009b8810d2f5684040e64de2ca0000b1404666b844dff78888eebb53
 EBUILD wildmidi-0.3.13.ebuild 1853 BLAKE2B a0d488da7321843e051c5c0512efced597420298e86a89bf8e35bf425921e834135ea13f6d7b30d67897a594eb7dfc418bb9d9881f2ff1ddbd247963c8964abc SHA512 357412f782b044b36024adf9a4b77bc1bda16317ccb18746b75c53991d57519450c929baf19a04bba546c97cdb2cc7557c2e34400cc940bba2ec4304487efcd0
-EBUILD wildmidi-0.3.6.ebuild 1870 BLAKE2B a024316067bde1b90b6397c9127238198cccda88dd958fe9063257030dd58d00ad1ae5c6a11dc4cec0d4c7134be7df3fd878efe8f043213f84a574f0fd61ae32 SHA512 a15e48e3141a238c4237b7c080234f24b27dbadbc22b26cdb957939a94dd257f0bc21c6f98030881b3d6a477050c2a77b12c57dfe1a1ff6b0be5944be82c2738
-EBUILD wildmidi-0.3.7.ebuild 1843 BLAKE2B e3637544044e1b73f9c597cdc3a759d3c6e206f8523f7703cb465707446543c728b58dae5910c0049a9216e62701a6feae5cc56044fb98d2d53354d43781479d SHA512 d16c4718fdfeaf13ab6893a8617a9cae136ed2e2639b5649f038b65a588ca0f25b6e1ef247a4572e3cc96130a2eb82c4133956adb425c7266c986136b76f8092
-EBUILD wildmidi-0.3.8.ebuild 1870 BLAKE2B 1930d55817f98a070c49732ac393829e9a6fe628bd7e458d67fba4c04be42318186c9be8b6a034a97a4b1e3b93ec66721a4db0da712f2de4b64801c6a9065adb SHA512 85d8692fc01977a7358a11d88ad05bda7ef90bb378d49d17020599eb5e542d36f5d72b68c7b13f6b1d6c6266fa166d894b2813d3328f6027becd2364f3df6a5a
 MISC metadata.xml 375 BLAKE2B a642a1b0da135ba37ab54d3fb876f980c2a24725e121c4f0504d4d3e49c294cdc7ef9a7cc0b69f98cf72c3cb5a001a242c4eb821bf8f66876ca63bcb471775c2 SHA512 195e8dd23afe8b774740dc438e442981fc640c7191fa3319af3a811a51f840c73d025ff5d8c9377377ad246449be40e0dd9d117d9f1f20beb4bf7286fe6aee7d
diff --git a/media-sound/wildmidi/wildmidi-0.2.3.5.ebuild b/media-sound/wildmidi/wildmidi-0.2.3.5.ebuild
deleted file mode 100644
index 965c76bff307..000000000000
--- a/media-sound/wildmidi/wildmidi-0.2.3.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit base autotools readme.gentoo
-
-DESCRIPTION="Midi processing library and a midi player using the gus patch set"
-HOMEPAGE="http://wildmidi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 x86"
-IUSE="alsa debug"
-
-DEPEND="alsa? ( media-libs/alsa-lib )"
-RDEPEND="${DEPEND}
-	media-sound/timidity-freepats"
-
-src_prepare() {
-	DOC_CONTENTS="${PN} is using timidity-freepats for midi playback.
-		A default configuration file was placed on /etc/${PN}.cfg.
-		For more information please read the ${PN}.cfg manpage."
-
-	# Workaround for parallel make
-	sed -i -e "/^wildmidi_libs/s:=.*:= libWildMidi.la:" "${S}"/src/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-werror \
-		$(use_enable debug) \
-		$(use alsa || echo --with-oss)
-}
-
-src_install() {
-	base_src_install
-	find "${D}" -name '*.la' -exec rm -f {} +
-	insinto /etc
-	doins "${FILESDIR}"/${PN}.cfg
-	readme.gentoo_create_doc
-}
diff --git a/media-sound/wildmidi/wildmidi-0.3.6.ebuild b/media-sound/wildmidi/wildmidi-0.3.6.ebuild
deleted file mode 100644
index a2e39896724d..000000000000
--- a/media-sound/wildmidi/wildmidi-0.3.6.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils readme.gentoo
-
-DESCRIPTION="Midi processing library and a midi player using the gus patch set"
-HOMEPAGE="http://www.mindwerks.net/projects/wildmidi/"
-SRC_URI="https://github.com/Mindwerks/${PN}/archive/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="+alsa openal oss +player"
-
-DEPEND="player? (
-	alsa? ( media-libs/alsa-lib )
-	openal? ( media-libs/openal )
-	)"
-RDEPEND="${DEPEND}
-	media-sound/timidity-freepats"
-
-REQUIRED_USE="player? ( ^^ ( alsa oss openal ) )"
-
-DOC_CONTENTS="${PN} is using timidity-freepats for midi playback.
-	A default configuration file was placed on /etc/${PN}/${PN}.cfg.
-	For more information please read the ${PN}.cfg manpage."
-
-S="${WORKDIR}"/${PN}-${P}
-
-src_prepare() {
-	# alsa openal oss only make sense if player is enabled. See CMakeLists.txt
-	if ! use player && (use alsa || use openal || use oss); then
-		ewarn
-		ewarn "The 'alsa', 'openal' and 'oss' use flags only make sense if"
-		ewarn "the 'player' use flags is selected and as a result they will be"
-		ewarn "ignored in this build"
-		ewarn
-	fi
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_want alsa)
-		$(cmake-utils_use_want openal)
-		$(cmake-utils_use_want oss)
-		$(cmake-utils_use_want player)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	find "${D}" -name '*.la' -exec rm -f {} +
-	insinto /etc/${PN}/
-	doins cfg/${PN}.cfg
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/${PN}.cfg ]]; then
-		elog
-		elog "Old /etc/${PN}.cfg detected!"
-		elog "Please migrate your configuration file to"
-		elog "/etc/${PN}/ directory which is now the default"
-		elog "location for the ${PN} configuration file."
-		elog
-	fi
-}
diff --git a/media-sound/wildmidi/wildmidi-0.3.7.ebuild b/media-sound/wildmidi/wildmidi-0.3.7.ebuild
deleted file mode 100644
index f580f035724e..000000000000
--- a/media-sound/wildmidi/wildmidi-0.3.7.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils readme.gentoo
-
-DESCRIPTION="Midi processing library and a midi player using the gus patch set"
-HOMEPAGE="http://www.mindwerks.net/projects/wildmidi/"
-SRC_URI="https://github.com/Mindwerks/${PN}/archive/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="+alsa openal oss +player"
-
-DEPEND="player? (
-	alsa? ( media-libs/alsa-lib )
-	openal? ( media-libs/openal )
-	)"
-RDEPEND="${DEPEND}
-	media-sound/timidity-freepats"
-
-REQUIRED_USE="player? ( ^^ ( alsa oss openal ) )"
-
-DOC_CONTENTS="${PN} is using timidity-freepats for midi playback.
-	A default configuration file was placed on /etc/${PN}/${PN}.cfg.
-	For more information please read the ${PN}.cfg manpage."
-
-src_prepare() {
-	# alsa openal oss only make sense if player is enabled. See CMakeLists.txt
-	if ! use player && (use alsa || use openal || use oss); then
-		ewarn
-		ewarn "The 'alsa', 'openal' and 'oss' use flags only make sense if"
-		ewarn "the 'player' use flags is selected and as a result they will be"
-		ewarn "ignored in this build"
-		ewarn
-	fi
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_want alsa)
-		$(cmake-utils_use_want openal)
-		$(cmake-utils_use_want oss)
-		$(cmake-utils_use_want player)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	find "${D}" -name '*.la' -exec rm -f {} +
-	insinto /etc/${PN}/
-	doins cfg/${PN}.cfg
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/${PN}.cfg ]]; then
-		elog
-		elog "Old /etc/${PN}.cfg detected!"
-		elog "Please migrate your configuration file to"
-		elog "/etc/${PN}/ directory which is now the default"
-		elog "location for the ${PN} configuration file."
-		elog
-	fi
-}
diff --git a/media-sound/wildmidi/wildmidi-0.3.8.ebuild b/media-sound/wildmidi/wildmidi-0.3.8.ebuild
deleted file mode 100644
index cf8aa4a65dce..000000000000
--- a/media-sound/wildmidi/wildmidi-0.3.8.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils readme.gentoo
-
-DESCRIPTION="Midi processing library and a midi player using the gus patch set"
-HOMEPAGE="http://www.mindwerks.net/projects/wildmidi/"
-SRC_URI="https://github.com/Mindwerks/${PN}/archive/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="+alsa openal oss +player"
-
-DEPEND="player? (
-	alsa? ( media-libs/alsa-lib )
-	openal? ( media-libs/openal )
-	)"
-RDEPEND="${DEPEND}
-	media-sound/timidity-freepats"
-
-REQUIRED_USE="player? ( ^^ ( alsa oss openal ) )"
-
-DOC_CONTENTS="${PN} is using timidity-freepats for midi playback.
-	A default configuration file was placed on /etc/${PN}/${PN}.cfg.
-	For more information please read the ${PN}.cfg manpage."
-
-S="${WORKDIR}"/${PN}-${P}
-
-src_prepare() {
-	# alsa openal oss only make sense if player is enabled. See CMakeLists.txt
-	if ! use player && (use alsa || use openal || use oss); then
-		ewarn
-		ewarn "The 'alsa', 'openal' and 'oss' use flags only make sense if"
-		ewarn "the 'player' use flags is selected and as a result they will be"
-		ewarn "ignored in this build"
-		ewarn
-	fi
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_want alsa)
-		$(cmake-utils_use_want openal)
-		$(cmake-utils_use_want oss)
-		$(cmake-utils_use_want player)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	find "${D}" -name '*.la' -exec rm -f {} +
-	insinto /etc/${PN}/
-	doins cfg/${PN}.cfg
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/${PN}.cfg ]]; then
-		elog
-		elog "Old /etc/${PN}.cfg detected!"
-		elog "Please migrate your configuration file to"
-		elog "/etc/${PN}/ directory which is now the default"
-		elog "location for the ${PN} configuration file."
-		elog
-	fi
-}
diff --git a/media-sound/yarock/Manifest b/media-sound/yarock/Manifest
new file mode 100644
index 000000000000..c6e7024fdec8
--- /dev/null
+++ b/media-sound/yarock/Manifest
@@ -0,0 +1,5 @@
+AUX yarock-1.3.1-desktop.patch 237 BLAKE2B 3271ee7d08d4a897dcdb51d504653e2472af1db3ba34279d7b101b84c30821a451ccd268ac3d1d7474f1238f3d1bf75ddcd8c9b251558f87ca3333b1591aad8d SHA512 023edebc269b860731a17ff1ae2006b4570848449d9994f61f8d81a1e82779d59fbfb55623fd1855223de74201d3ad4960fbe3a8bc7109c15053f92a29cd0e0d
+AUX yarock-1.3.1-phonon.patch 1259 BLAKE2B 48ee6d115342463015707ad4b79ff2ebb416e36879c365add52c1a6bb0245c8f444c0bb88bd21fa9713d788ef6aeeb2a9a442247fdcc37b92362dfcd142affb7 SHA512 387f88c0f86102fb67fc0914297b5d15f438997f0212d3d9afa19fb00abf2b2aca575493be3f2d7aad42420a1fe6eb092bebcad68e5c195c5875f0f71f9fec1c
+DIST Yarock_1.3.1_Sources.tar.gz 734280 BLAKE2B 3bb8a452a3a7bd27792f67b6fcb2765494738c7a0149248b658333a64f38494880891e8a9d43ef7367d7748e5c0b6a2d9349dc1dd73dd0fecd94d88f21eec020 SHA512 a59837609c5004005360a272b45794143c64373d13c2783f84299ab0b849223aac2be3d87703e1925d66ed4301bcc2e7254228d34f556bce0447d949539acf2e
+EBUILD yarock-1.3.1.ebuild 1056 BLAKE2B 75c7a958102332e39634551cc6bd404c55b4bab67ff4403758381d5868c4f9c638a1a7baae9991647b10ab90420acdbd3dc2c50be4cc0b20749567648806b1a6 SHA512 02bf3138130be288cf16c3a1ef1e73070502b84ef79f73e96d81adaeb752fb642839a4012fc6b55168485167dac987fe37d096e29f47ae1894d393a66e18ad40
+MISC metadata.xml 376 BLAKE2B b3e63f3aed251bf2410912dd48c7933cb85aa4679c3e8dab637d58bff69c018503e68b1e0aabb08734b6101bfa433d4b6a536770537ef077eec4add8f9e1acd8 SHA512 3d21dc4fe86b41b86d253184ae1be5de6c63169b4e0751f22f9733014b5f04895dd09c2ac23bc308ded24fcf61e54e5ab1022307b3a4658187398424a6c3a32a
diff --git a/media-sound/yarock/files/yarock-1.3.1-desktop.patch b/media-sound/yarock/files/yarock-1.3.1-desktop.patch
new file mode 100644
index 000000000000..3131c072dfbb
--- /dev/null
+++ b/media-sound/yarock/files/yarock-1.3.1-desktop.patch
@@ -0,0 +1,8 @@
+--- a/data/yarock.desktop	2017-12-24 08:48:55.000000000 +0100
++++ b/data/yarock.desktop	2018-10-04 18:18:37.700722758 +0200
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Version=1.3.0
+ Name=Yarock
+ Comment=Play your music collection
+ TryExec=yarock
diff --git a/media-sound/yarock/files/yarock-1.3.1-phonon.patch b/media-sound/yarock/files/yarock-1.3.1-phonon.patch
new file mode 100644
index 000000000000..53bbf834cbca
--- /dev/null
+++ b/media-sound/yarock/files/yarock-1.3.1-phonon.patch
@@ -0,0 +1,36 @@
+--- a/src/core/player/phonon/engine_phonon.h	2017-11-04 17:06:43.000000000 +0100
++++ b/src/core/player/phonon/engine_phonon.h	2018-10-04 18:23:29.079923850 +0200
+@@ -27,12 +27,12 @@
+ #include <QPixmap>

+ 

+ // Phonon

+-#include <phonon/mediasource.h>

+-#include <phonon/mediaobject.h>

+-#include <phonon/audiooutput.h>

+-#include <phonon/path.h>

+-#include <phonon/effect.h>

+-#include <phonon/volumefadereffect.h>

++#include <phonon4qt5/phonon/mediasource.h>

++#include <phonon4qt5/phonon/mediaobject.h>

++#include <phonon4qt5/phonon/audiooutput.h>

++#include <phonon4qt5/phonon/path.h>

++#include <phonon4qt5/phonon/effect.h>

++#include <phonon4qt5/phonon/volumefadereffect.h>

+ 

+ #include "core/player/engine_base.h"

+ #include "core/mediaitem/mediaitem.h"

+--- a/src/core/player/phonon/engine_phonon.cpp	2017-11-11 07:29:42.000000000 +0100
++++ b/src/core/player/phonon/engine_phonon.cpp	2018-10-04 18:23:29.084923716 +0200
+@@ -29,9 +29,9 @@
+ #include <QtPlugin>

+ 

+ // phonon

+-#include <phonon/backendcapabilities.h>

+-#include <phonon/effect.h>

+-#include <phonon/effectparameter.h>

++#include <phonon4qt5/phonon/backendcapabilities.h>

++#include <phonon4qt5/phonon/effect.h>

++#include <phonon4qt5/phonon/effectparameter.h>

+ 

+ #include <cmath>

+ 

diff --git a/media-sound/yarock/metadata.xml b/media-sound/yarock/metadata.xml
new file mode 100644
index 000000000000..2263346cdc5d
--- /dev/null
+++ b/media-sound/yarock/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>asturm@gentoo.org</email>
+		<name>Andreas Sturmlechner</name>
+	</maintainer>
+	<use>
+		<flag name="phonon">Use <pkg>media-libs/phonon</pkg> backend instead of <pkg>media-video/vlc</pkg></flag>
+	</use>
+</pkgmetadata>
diff --git a/media-sound/yarock/yarock-1.3.1.ebuild b/media-sound/yarock/yarock-1.3.1.ebuild
new file mode 100644
index 000000000000..97723a60ef20
--- /dev/null
+++ b/media-sound/yarock/yarock-1.3.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 cmake-utils
+
+MY_P="Yarock_${PV}_Sources"
+DESCRIPTION="Qt-based music player"
+HOMEPAGE="https://seb-apps.github.io/yarock/"
+SRC_URI="https://launchpad.net/${PN}/1.x/${PV}/+download/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="phonon"
+
+RDEPEND="
+	dev-cpp/htmlcxx
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/taglib
+	x11-libs/libX11
+	!phonon? ( media-video/vlc:= )
+	phonon? ( >=media-libs/phonon-4.10.1 )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtx11extras:5
+"
+
+DOCS=( CHANGES.md README.md )
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-desktop.patch"
+	"${FILESDIR}/${P}-phonon.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_QT5=ON
+		-DENABLE_MPV=OFF
+		-DENABLE_PHONON=$(usex phonon ON OFF)
+		-DENABLE_VLC=$(usex phonon OFF ON)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index cf8a4e0878c6..b5205b42cf48 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/blinkensim/Manifest b/media-video/blinkensim/Manifest
index 6d5676f2114f..893360f01962 100644
--- a/media-video/blinkensim/Manifest
+++ b/media-video/blinkensim/Manifest
@@ -1,3 +1,3 @@
 DIST blinkensim-2.7.tar.gz 88416 BLAKE2B a1ac70795f1eeb70ef3d4ff4a961a76c591071aaf4278a7a046d317b7c5a7dd2a19595ed0db659735f97143e1dffba3c53edd00521a8b450dbeb17b31d174c0f SHA512 35be6f0d871ede4ed3de1bb2a18e53e8a508a08001d795369cf222122dd9596ac48314d1c386905360be0a46b1fefffa763bdb9874eaaa6e1ed713a48a6fefd4
-EBUILD blinkensim-2.7-r1.ebuild 645 BLAKE2B da4626ab561f75f8532b3d319a5ae77d1c5338b16732b619eb0ec3d5e3b208e2103fd2853fb4a38fd72da724fb17784975d18f9703c2490ee83b9efa6a34e5f8 SHA512 5a478f2e90fc894ca4b12e902b92e76190632a38e4c4c37d4e832bd68c7199a0c6da1e4a581b87b3fe48ac7ef17836c6c498576558a64ccb8faf84601d7f2f21
+EBUILD blinkensim-2.7-r1.ebuild 634 BLAKE2B 21a535a066fc123411567dc7329e4a7b9f6d86bf9adc28efce6333a75571e41fa6601fa3df8c1e1aa833ab3f4d789aca83f84e81ddce4ef666260c9e4b6e2170 SHA512 49dec858034fe4c1d46312d375ea84f3bf5e24375eabfadcf753983950c0fcc0d0e016728c3bc68c69d5ac254b0bf537100875a7e20b736485d16bc23d3043c8
 MISC metadata.xml 360 BLAKE2B f7cfcf7e66ea5a7ae30864099416f896879b5fa28422420e6e597e6c0fe190a8ecda1518c1cc277a13444099f08eb31f27835b07194d8984e7dd04a8df3a4375 SHA512 b8538f19756f7bf5248e4d60916093cb4aba5d06947dfcc152168941d43acedc6079e0c0aee3da4089a06a6956f74320f874b4cf50d50ae8d7476f2838901782
diff --git a/media-video/blinkensim/blinkensim-2.7-r1.ebuild b/media-video/blinkensim/blinkensim-2.7-r1.ebuild
index ab3ed37579a8..a5d76d7a4b6f 100644
--- a/media-video/blinkensim/blinkensim-2.7-r1.ebuild
+++ b/media-video/blinkensim/blinkensim-2.7-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="Graphical Blinkenlights simulator with networking support"
 
-HOMEPAGE="http://www.blinkenlights.net/project/developer-tools"
-SRC_URI="http://www.blinkenlights.de/dist/${P}.tar.gz"
+HOMEPAGE="http://blinkenlights.net/project/developer-tools"
+SRC_URI="http://blinkenlights.de/dist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-video/blinkenthemes/Manifest b/media-video/blinkenthemes/Manifest
index 5d35cd9573b7..87361d97eca3 100644
--- a/media-video/blinkenthemes/Manifest
+++ b/media-video/blinkenthemes/Manifest
@@ -1,3 +1,4 @@
 DIST blinkenthemes-0.10.tar.gz 4059605 BLAKE2B fe56ec9522cbcaa78c45e92461d462739d28bdb96aa9d82ce58b79410e779169ade4d9f8f1c2ca2a333a827edbd2c650301db86a3313bb82fb01597148dc23f4 SHA512 e7bcc2b41046f78750d32ec2f3b37e6f2e16b4bc35a40bc09a8a9ba0a63e54192796cd69491c0517e0ac612d496f0d04ef79a5508da61a2090943bfc94938cf1
-EBUILD blinkenthemes-0.10.ebuild 549 BLAKE2B f521acfa6b82fe7455d7f2c7b7d63e5b607d989cb7b9629667f8538e99bb9ec16174dde2c02aba2adcc2502ccefee369d16fca47f19f3bc35e93e83d90153caf SHA512 8f2dc8b248b9e0d89675f1918d2b4d5bb5903cf650c7cf8987bde4c00b8a874d486dc4e79b9ba9041486f6f81e8f3fee1e398886062e669aed6031c5f714d55b
+EBUILD blinkenthemes-0.10-r1.ebuild 363 BLAKE2B 087836952cbbce61b000a2b556cb31fb143638edc1ca59583b0ad48181252d7c97eeef914dcc1570e063c9b53ca6d771174c927b03cbb2a7c8f9a78260abf1a1 SHA512 092a9c3ed74a441c7afc284565124a65bd63bc0c94c4a7bc8bc3fc1e783fe4bca2cdbf5edc1be065b79bf5afc6b13c98dbf0fc194fa00a3dbf0bdd17bdb6dbf2
+EBUILD blinkenthemes-0.10.ebuild 538 BLAKE2B 4affa1e04bfa0cc909c018052301743122ab4a5fbbaf9c2d9c371f6f206214ef4109c92742b61b5529575130c56174e97dd6332f5ab2591944ac70f815078718 SHA512 0d9dc4d889ffeb2c8143808c2e30a713f7a8d802dd9576e426e021d9610142414febf1ffaab3a8a38206cd0361dc3245a26c5db7b9b2ff6e4cf087acac59fcd4
 MISC metadata.xml 667 BLAKE2B 7505bd3a3b7203d57d974f9edb438ed42617233a590044f983161622f4107eb8cb340c350fd750a128145f1374f89f03bff6e10cec2b6056a30297df8f9ca902 SHA512 11c102eb6ccdb806940c82ca69345ac9acfa113002e5b7ce14426a1107d0a678d8bb444c2f7fda9d25f4b78a35fe022d970471b344e19d0b806ec7bfb454a021
diff --git a/media-video/blinkenthemes/blinkenthemes-0.10-r1.ebuild b/media-video/blinkenthemes/blinkenthemes-0.10-r1.ebuild
new file mode 100644
index 000000000000..9fbddc48b41a
--- /dev/null
+++ b/media-video/blinkenthemes/blinkenthemes-0.10-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Themes for blinkensim"
+HOMEPAGE="http://blinkenlights.net/project/developer-tools"
+SRC_URI="http://blinkenlights.de/dist/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="media-libs/blib"
+BDEPEND="virtual/pkgconfig"
diff --git a/media-video/blinkenthemes/blinkenthemes-0.10.ebuild b/media-video/blinkenthemes/blinkenthemes-0.10.ebuild
index d518284a6c44..2521e9e94a29 100644
--- a/media-video/blinkenthemes/blinkenthemes-0.10.ebuild
+++ b/media-video/blinkenthemes/blinkenthemes-0.10.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=0
 
 DESCRIPTION="Themes for blinkensim"
-HOMEPAGE="http://www.blinkenlights.net/project/developer-tools"
-SRC_URI="http://www.blinkenlights.de/dist/blinkenthemes-0.10.tar.gz"
+HOMEPAGE="http://blinkenlights.net/project/developer-tools"
+SRC_URI="http://blinkenlights.de/dist/blinkenthemes-0.10.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-video/blinkentools/Manifest b/media-video/blinkentools/Manifest
index 23b703f262ec..df8fc8128328 100644
--- a/media-video/blinkentools/Manifest
+++ b/media-video/blinkentools/Manifest
@@ -1,3 +1,4 @@
 DIST blinkentools-2.9.tar.gz 560904 BLAKE2B 86068a9ea2321bb0688ca44a7fed406a38b73d01813d0d39c5ca6e84f690539eb864cafaf1a8e554e298c674d67cbc4f4b892d9393187a0452e381b517043a08 SHA512 ba6fed446bfa757979469ed2894cb7b6a7fa4c1296a3074d75b6ac6c9f17e69d4ae172d1d54bb62d7f05cc20e9e7ca1a6eca5a83f2cfb7e86f7f9070bc2da2dc
-EBUILD blinkentools-2.9.ebuild 580 BLAKE2B 94cf164a8d4eb085c49a086d09f79c688275b8669a0cf92ea84b253fc9408cda14022cf0f80bba98cc82e7e0f3123cb12bd774179b7a4b6955d62f15eaab21a9 SHA512 404e5096b1b30c7e21abe0339856b254c21817de8ab20d8919c237c0a9e82b4e9952d3cae89da9f5852c3aa408f643414120651c99e598579221530c50018a8c
+EBUILD blinkentools-2.9-r1.ebuild 445 BLAKE2B ce230484198e2beaf70ca57888db37f06d4c98141cf99d7ac35c1fab6ae7a708e46f19d732dd68ea16e1dabd8207c7cc5a7165402a7b77a3f8d3677890a619fb SHA512 7dc6ce79c7a65ff718a4f5276488e33343087508d9ec421010a91c187690542d4b883c963e4d288934c0e2772b0cc5ea4ab2d51f79dd491c5735db34d751d295
+EBUILD blinkentools-2.9.ebuild 569 BLAKE2B 37b65f99fe848fe037d8b067a89dcbb696aaa0c7f1f9fa60c602aca1b6778816d0e0ee04c3d916fdf28082c05c05cb3415f3fb3d7f73b527cb6b0d6586447c89 SHA512 f99eefcd415668d4864c9244ae3b0bb3446e48475b18ccb1ae796bcc46739fbd7f300002b8fd99648dd04ad4108fbaa92854fb11059cadd8f856c46fd77e0c43
 MISC metadata.xml 510 BLAKE2B a70382b0ab3630981bb062a9abc97216dc1abd65614af6ca0f4be42360a66bfca9289f242f9e2b693ecb28aaffe20a65ab2c1350905aa1d90dde554398c47acf SHA512 39f50dda7c89cfbab1b4d29ed81c9e832ff41222d4bd219ad574b59d65a11b882e60feffef9a890769f7e234f992d507daac00b394c09c3e3311a2644f91ad8f
diff --git a/media-video/blinkentools/blinkentools-2.9-r1.ebuild b/media-video/blinkentools/blinkentools-2.9-r1.ebuild
new file mode 100644
index 000000000000..684b0baea498
--- /dev/null
+++ b/media-video/blinkentools/blinkentools-2.9-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Provides a set of commandline utilities related to Blinkenlights"
+HOMEPAGE="http://blinkenlights.net/project/developer-tools"
+SRC_URI="http://blinkenlights.de/dist/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="media-libs/blib
+	media-libs/libmng"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
diff --git a/media-video/blinkentools/blinkentools-2.9.ebuild b/media-video/blinkentools/blinkentools-2.9.ebuild
index 28ec8114d50f..81f422d42d60 100644
--- a/media-video/blinkentools/blinkentools-2.9.ebuild
+++ b/media-video/blinkentools/blinkentools-2.9.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=0
 
 DESCRIPTION="blinkentools is a set of commandline utilities related to Blinkenlights"
-HOMEPAGE="http://www.blinkenlights.net/project/developer-tools"
-SRC_URI="http://www.blinkenlights.de/dist/${P}.tar.gz"
+HOMEPAGE="http://blinkenlights.net/project/developer-tools"
+SRC_URI="http://blinkenlights.de/dist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index 10b94f17e656..3df5f62d2bc3 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -6,11 +6,13 @@ DIST fate-12.tar.xz 755165356 BLAKE2B 031cef24bcfae6205cd6546f453cddb17387176ae8
 DIST fate-9.tar.xz 467671500 BLAKE2B df4ef8187f257c91b7b6c3c25c2f204c2d4a476cc73cca199ec1c8af2c4641cbb3a314e39ab38f6d8b68c5fe0b91ff1b4b592dec6b518d544806eaeaca003608 SHA512 8e45539f2512ef915b37c857226c0243940259f269b8f99393b9defa3352d7b8c1fcc5078f4f0d40dc0509737f0c915e179cedcc77f71fe5d96b1b956169a202
 DIST libav-11.8.tar.xz 4865796 BLAKE2B fb0e8f129edee0423252f334b12485d514f9fdfb3d916877d83141e0985ec4efb4de0f5b65d6e3e6d94b835f317a52116b849eec99d023ebb109bdbc2b7a8c5c SHA512 26f9a6bb7312acc08b6785c260220ada3ca2a8db0d0f2bd4621b47082c275fbdb7978457cb423693ba9a61dc4570b05d0dceb5861ff0bcce859c349a6a8f49be
 DIST libav-12.2.tar.xz 5268804 BLAKE2B e25b3dfe1026b9e69c89cbec2090070088a7004dc03e8cc23da2da03824a627c733c16c67e5fc65ec9f19942d93405d5ba6926de83cae04c497597f55220f004 SHA512 4b37cfb18a6cf6f12eddb5175b1751c093f3a495ae1d1b588884c60157cb260479b1d8fa3a6e3e08c00d7a26422b1e78a750eb35cf7bc763c01790f3567cba03
+DIST libav-12.3.tar.xz 5267988 BLAKE2B 92147dde4f41a5aa05d93824d3ffa9a21b067f99cec5fa17bc4b8e3600f2b1913f7e74d4ea766c864cdba686dd14d5d3a8bc8af8f9e6de4c956f14cb8e20ab88 SHA512 fd4838a934792797a975ece034cbd63760c94ee6becc99b8707e8345e41777baf26e30ef6937ab30b7d2f722977e69aabc2cfca3fcdf88373d579f9cc9d69162
 DIST libav-13_pre20171219.tar.xz 5427904 BLAKE2B 074dc5d071aeb656fc14a015c2e3c168aa81d25e2fb08d99e300dc47d7ea28f61500fcfab0b16fa136261a5af27631b7536eb3aefa0e1feb4d615af57f9f5a36 SHA512 0c9b59957f1fbbff8f5b95b02c11014a4efdddf4b7e1b158cd0fda3af8b89bd90d48263ed0239915adfb7abcd7a8b22c278cd5cf1d01822bd22df65cc7f69689
 DIST libav-9.17.tar.xz 4080028 BLAKE2B 206e80835292af9f4c1c65539e69981b6993679c11e8a1feef1e37dc32174e47744ebce319b8709bcd60804f493fab1e524c781e174d60d9ebe35ad01f6fbc60 SHA512 20af83d4b6a23c159c2386b6592ba6a6acf3f2c54e8aeb16dd0c8a64d637fbde24f37b864698b1143c6802b64a7b5e8ddfe0e7601b35c35686a789e2b3232f5a
 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 11367 BLAKE2B 44f05754c5fa9cb2e93ef69804cd04426caced01fa12ab8d51aa0a98d277c5b1c1c5aa551816888a87188934c4155979830d1cd742940cfd877da15499d94e68 SHA512 d52ef20dc17f0cf14f12b8bed6eee953a17b4530b5339d50419a5a17d87b19854cbab224ccd2c0a3e225ed89ed119a70d50cfbe10cd620077f323158bcd1fbf9
+EBUILD libav-12.2.ebuild 11366 BLAKE2B c1f4de539f14e7f9ec9ff590ae245cfa49af199352e39b7f564a50ffa8e378bc6a573003fc9dfe494e7f4981bcf78c9be7baf02d7f9aa4b8c04bfbbbf8581428 SHA512 f90ff7d2052af3332ee626b1bbf73782ee1f1f8f257f342308a775ce35ca7c4d4a30bc445df2b9e7111b33dde8e2c6d577446a3c1bb7a5a509be68b457d63349
+EBUILD libav-12.3.ebuild 11363 BLAKE2B fa78329f11b0dc38fbdd583a3a2319da58c8e4366425fc524363d6cf19a3e07c7d107dd4da0bedb7bca1cc3450f447362fcf726f38cf92e6fb8d9a5fd3c00145 SHA512 65ab897ceb7a20cafd9f5e9b202195f24a5dbd7a4e87f7822594058fb4b0bfbea3553ebf4b5f8a99d4ea3597ac2664cdbbf803b2e82442234623cf968bee8f79
 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
diff --git a/media-video/libav/libav-12.2.ebuild b/media-video/libav/libav-12.2.ebuild
index 588da2ba1e60..d3414e7ba817 100644
--- a/media-video/libav/libav-12.2.ebuild
+++ b/media-video/libav/libav-12.2.ebuild
@@ -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
diff --git a/media-video/libav/libav-12.3.ebuild b/media-video/libav/libav-12.3.ebuild
new file mode 100644
index 000000000000..610966c54b89
--- /dev/null
+++ b/media-video/libav/libav-12.3.ebuild
@@ -0,0 +1,349 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic multilib multilib-minimal toolchain-funcs
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="git://git.libav.org/libav.git"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+fi
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video"
+HOMEPAGE="https://libav.org/"
+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"
+	FATE_VER=${PV%%_*}
+	SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-12-r1.tar.xz )"
+fi
+
+# 9999 does not have fate-*.tar.xz
+
+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"
+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"
+
+# String for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+CPU_FEATURES="altivec armv5te armv6 armv6t2 armvfp:vfp neon"
+X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext mmx mmxext sse sse2 sse3 ssse3 sse4_1:sse4 sse4_2:sse42 avx xop fma3 fma4 avx2"
+for i in ${X86_CPU_FEATURES} ; do
+	CPU_FEATURES+=" cpu_flags_x86_${i%:*}:${i#*:}"
+done
+for i in ${CPU_FEATURES} ; do
+	IUSE+=" ${i%:*}"
+done
+
+RDEPEND="
+	!media-video/ffmpeg:0
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
+	encode? (
+		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
+		amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+		theora? (
+			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
+		vorbis? (
+			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
+		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
+	)
+	nvidia? ( media-video/nvidia-video-codec )
+	fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] )
+	frei0r? ( media-plugins/frei0r-plugins )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+	ieee1394? (
+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+	)
+	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	ssl? (
+		openssl? (
+			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+			libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+		)
+		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
+	)
+	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	truetype? (	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
+	X? ( >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	doc? ( app-text/texi2html )
+	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	cpu_flags_x86_mmx? ( dev-lang/yasm )
+	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	test? ( sys-devel/bc )
+	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	v4l? ( sys-kernel/linux-headers )
+"
+
+# faac can't be binary distributed
+# openssl support marked as nonfree
+# faac and aac are concurent implementations
+# amr and aac require at least lgpl3
+# x264 requires gpl2
+REQUIRED_USE="
+	rtmp? ( network )
+	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) cdio? ( gpl ) x265? ( gpl )
+	test? ( encode zlib )
+	fontconfig? ( truetype )
+"
+RESTRICT="faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist ) nvidia? ( bindist )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libavutil/avconfig.h
+)
+
+src_unpack() {
+	[[ ${PV} == *9999 ]] && git-r3_src_unpack
+	# 9999 does not have fate-*.tar.xz
+	[[ ${PV%9999} != "" ]] && default_src_unpack
+}
+
+src_prepare() {
+	eapply_user
+
+	# if we have snapshot then we need to hardcode the version
+	if [[ ${PV%_p*} != ${PV} ]]; then
+		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
+	fi
+
+	TOOLS=( aviocat graph2dot ismindex pktdumper qt-faststart trasher )
+	use zlib && TOOLS+=( cws2fws )
+
+	MAKEOPTS+=" V=1"
+}
+
+multilib_src_configure() {
+	local myconf=( ${EXTRA_LIBAV_CONF} )
+	local uses i
+
+	# 9999 does not have fate-*.tar.xz
+	[[ ${PV%9999} != "" ]] && use test && myconf+=( --samples="${WORKDIR}/fate" )
+
+	myconf+=(
+		$(use_enable gpl)
+		$(use_enable gpl version3)
+		--enable-avfilter
+	)
+
+	# enabled by default
+	uses="debug doc network zlib"
+	for i in ${uses}; do
+		use ${i} || myconf+=( --disable-${i} )
+	done
+	use bzip2 || myconf+=( --disable-bzlib )
+	use sdl || myconf+=( --disable-avplay )
+
+	if use ssl; then
+		use openssl && myconf+=( --enable-openssl --enable-nonfree ) \
+			|| myconf+=( --enable-gnutls )
+	fi
+
+	use custom-cflags && myconf+=( --disable-optimizations )
+	use cpudetection && myconf+=( --enable-runtime-cpudetect )
+
+	use vdpau || myconf+=( --disable-vdpau )
+
+	use vaapi && myconf+=( --enable-vaapi )
+
+	NVIDIA_INCLUDES="-I/opt/nvidia-video-codec/include -I/opt/cuda/include"
+	NVIDIA_LIBS="-L/opt/cuda/lib64"
+	use nvidia && myconf+=( --enable-nonfree --enable-cuda --enable-libnpp
+						    --extra-cflags="$NVIDIA_INCLUDES" --extra-ldflags="$NVIDIA_LIBS" )
+
+	# Encoders
+	if use encode; then
+		use faac && myconf+=( --enable-nonfree )
+		use mp3 && myconf+=( --enable-libmp3lame )
+		use amr && myconf+=( --enable-libvo-amrwbenc )
+		use aac && myconf+=( --enable-libvo-aacenc )
+		use nvidia && myconf+=( --enable-nvenc )
+		uses="faac theora twolame vorbis wavpack webp x264 x265 xvid"
+		for i in ${uses}; do
+			use ${i} && myconf+=( --enable-lib${i} )
+		done
+	else
+		myconf+=( --disable-encoders )
+	fi
+
+	# libavdevice options
+	use cdio && myconf+=( --enable-libcdio )
+	use ieee1394 && myconf+=( --enable-libdc1394 )
+	use pulseaudio && myconf+=( --enable-libpulse )
+
+	# Indevs
+	# v4l1 is gone since linux-headers-2.6.38
+	myconf+=( --disable-indev=v4l )
+	use v4l || myconf+=( --disable-indev=v4l2 )
+	for i in alsa oss jack; do
+		use ${i} || myconf+=( --disable-indev=${i} )
+	done
+	use X && myconf+=( --enable-libxcb )
+	# Outdevs
+	for i in alsa oss ; do
+		use ${i} || myconf+=( --disable-outdev=${i} )
+	done
+	# libavfilter options
+	use bs2b && myconf+=( --enable-libbs2b )
+	multilib_is_native_abi && use frei0r && myconf+=( --enable-frei0r )
+	use truetype && myconf+=( --enable-libfreetype )
+	use fontconfig && myconf+=( --enable-libfontconfig )
+
+	# Threads; we only support pthread for now
+	use threads && myconf+=( --enable-pthreads )
+
+	# Decoders
+	use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb )
+	use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac )
+	uses="gsm opus rtmp schroedinger speex vpx"
+	for i in ${uses}; do
+		use ${i} && myconf+=( --enable-lib${i} )
+	done
+	use jpeg2k && myconf+=( --enable-libopenjpeg )
+
+	# CPU features
+	for i in ${CPU_FEATURES}; do
+		use ${i%:*} || myconf+=( --disable-${i#*:} )
+	done
+
+	# pass the right -mfpu as extra
+	use neon && use arm && append-cflags -mfpu=neon
+
+	# disable mmx accelerated code if PIC is required
+	# as the provided asm decidedly is not PIC for x86.
+	if use pic && [[ ${ABI} == x86 ]]; then
+		myconf+=( --disable-mmx --disable-mmxext )
+	fi
+
+	# Option to force building pic
+	use pic && myconf+=( --enable-pic )
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
+		case ${CHOST} in
+			*freebsd*)
+				myconf+=( --target-os=freebsd )
+				;;
+			mingw32*)
+				myconf+=( --target-os=mingw32 )
+				;;
+			*linux*)
+				myconf+=( --target-os=linux )
+				;;
+		esac
+	fi
+
+	# Misc stuff
+	use hardcoded-tables && myconf+=( --enable-hardcoded-tables )
+
+	# Forcing arm would make the compiler break left and right
+	if [[ ${ABI} == arm ]]; then
+		filter-flags -marm
+	fi
+
+	# Specific workarounds for too-few-registers arch...
+	if [[ ${ABI} == x86 ]]; then
+		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+		filter-flags -fforce-addr -momit-leaf-frame-pointer
+		append-flags -fomit-frame-pointer
+		is-flag -O? || append-flags -O2
+		if use debug; then
+			# no need to warn about debug if not using debug flag
+			ewarn ""
+			ewarn "Debug information will be almost useless as the frame pointer is omitted."
+			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
+			ewarn "difficult to fix. Please have that in mind."
+			ewarn ""
+		fi
+	fi
+
+	set -- "${S}"/configure \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--shlibdir="${EPREFIX}"/usr/$(get_libdir) \
+		--mandir="${EPREFIX}"/usr/share/man \
+		--enable-shared \
+		--cc="$(tc-getCC)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		--extra-cflags="${CFLAGS}" \
+		$(use_enable static-libs static) \
+		"${myconf[@]}"
+	echo "${@}"
+	"${@}" || die
+}
+
+multilib_src_compile() {
+	emake
+
+	if use tools; then
+		tc-export CC
+
+		emake ${TOOLS[@]/#/tools/}
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install install-man
+	use doc && dodoc doc/*.html
+
+	if use tools; then
+		dobin ${TOOLS[@]/#/tools/}
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README.md INSTALL
+}
+
+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
+}
diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index c45f64c1df9c..eccc7b5ea390 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -1,8 +1,8 @@
 AUX obs-studio-21.0.2-qt-5.11.0.patch 1078 BLAKE2B 4681ae50ae11fed00b227966cbac478d4c9606a0f520fb31c0f736f6dad428222cadee5c46b29e2467928fb5adb43f2c4e18aba31db105f6738c3c3e4dca43c5 SHA512 a640a894921f065c58236c2c09a93984f9f3c32a00934bec3a55ad7636d623a0df2e847bd86d9f184ee62284c5bcfe18cb1a9e4943b05260ee6cc0e38dc1bc2a
 AUX obs-studio-21.1.2-use-less-automagic.patch 5284 BLAKE2B 43e9b7fc9c4699c77037a7e28668137e0ffb24de285b9f560d2ccb6214c54640893a5d34e179087f7b2dfce49a97ea8465df97bbac232ed7c013d580bbb6019a SHA512 00774c36e3437c5828677f71ff33e467fab3957b9622092ba3d2501769796ab5b6e4328b898ee9e92ee32dfef78f9797d03bb602bc68ad294202f180298afb38
-DIST obs-studio-21.0.2.tar.gz 5904469 BLAKE2B e4e7c1f2b445f1db6b76df0c7a12dd41ffd95e7ea5669d7efc3387cc0fd15e268d864b5da3da5c07d04bc57692a88a53a67351a370621b1a6ca648405d030454 SHA512 a22597ac3a85d4c72b9b1ff886367b158498b6b0141acfd2bdb096a2bd9d29cdfad900dfc00f870eaf0aad66836093579f37b278fa90ccd7b49022e849c1c590
 DIST obs-studio-21.1.2.tar.gz 5959232 BLAKE2B 12ae6f5e76093df52f44e7f45c06fe5486c8cea875438b8c78ae429fa82ccd0a6ff9d7ab15139877eca26713ab204158b7f92fb7cbefa52a3950814d28962fe7 SHA512 5143d3a87b3a54d2a06d236fc6f6d5945ab337004c30eda0438026f4b7607776b82771636d55fcc2c8ab34e041d8ecad99dc843b6b3f4371303d1b7dc349d938
-EBUILD obs-studio-21.0.2.ebuild 2698 BLAKE2B 6383b7f1bb453a355a70b7c010f78afbf9f88d51f8e14f5c11717474d944f8023ec5240935e9ce842f3ac11a620a31eb4e3feb7608608b5cb8e5bbf723cb18a4 SHA512 75f5cec89258c5862a3dcfce606edb994c5e72ef750eefcf533c59702fa9270c8ed1700436fa8efe0b8535bda965b0aae91dc741067c289dabcf62e3f96413b0
-EBUILD obs-studio-21.1.2.ebuild 3034 BLAKE2B 28f24d09d1522e5c8ae1d53a12cc542bf89caa3eb8155ccd0a0ac30d7be66db578832e4a7417a06b29ce57956f0514ecac2174ced0d60de35478da1bad85bad2 SHA512 aeab926019077d31a2ff5a38f0f16bc5d25237bce923a292b8b2677cbc3c1e19e84206aba01d730f503337b250661b427f98284e4641968d6dc67eaa2458bb9c
-EBUILD obs-studio-9999.ebuild 2954 BLAKE2B 71c8b8798e707e87624bbbfc35f8dbde6de6fdc5921307932a84eff6bda423b91f71721e2ca959bfd6fa1de7fbe9ffea2f2a89e08a718d2d004aac33740e5f26 SHA512 eb50971179f1790c66a1258af7dc86d74e5f4ab1d442f675eff48733b7f2f0d57f085b614347e04a35b14a1552b5893462536089223570d2474f6dafec36fe74
-MISC metadata.xml 1125 BLAKE2B cbdc7581bf9c0ae676245bfe24e6bba5914286747c338a8fe56842bc65e6d8ac7b7413f429d8c30ef7d05fecefedc1cffdf60a37433510b79819625f30b0d744 SHA512 f64f485a39668d40e5bd0edcc5f19c57954acd96e1631bb3615e472d566091a70b9ee55548e0dca4e435c017ded350d7be5d1d07ad0ec9cefe94b196d8dcd3d4
+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
+MISC metadata.xml 1122 BLAKE2B 608bff24775bd69702b19d9b1db4260ed1e5bf7d932f917d3a27d284a791374211c7fec019bd3a742552cf11142df3d2a4877d81645244bc81a6df5e60ae9f71 SHA512 29291de223d1d70f78b419c05fec1cca18e8dcd52ed5619dff51a130f9e064369378e9e803f3dd5e7c86c9f505ae506917ec04e2c9adadfcc1a23c9aeb27192f
diff --git a/media-video/obs-studio/metadata.xml b/media-video/obs-studio/metadata.xml
index 74a7f582c048..89c066c043bd 100644
--- a/media-video/obs-studio/metadata.xml
+++ b/media-video/obs-studio/metadata.xml
@@ -17,7 +17,7 @@
     <flag name="luajit">Build support for scripting via Luajit.</flag>
     <flag name="nvenc">Enable NVENC encoding for nVidia video cards.</flag>
     <flag name="python">Build support for scripting via Python 3.</flag>
-    <flag name="speexdsp">Enable noise suppression filter support via
+    <flag name="speex">Enable noise suppression filter support via
       <pkg>media-libs/speexdsp</pkg>.</flag>
   </use>
   <upstream>
diff --git a/media-video/obs-studio/obs-studio-21.0.2.ebuild b/media-video/obs-studio/obs-studio-21.0.2.ebuild
deleted file mode 100644
index 208ad0004506..000000000000
--- a/media-video/obs-studio/obs-studio-21.0.2.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
-
-CMAKE_MIN_VERSION=3.9.6
-
-inherit cmake-utils gnome2-utils
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/obsproject/obs-studio.git"
-	EGIT_SUBMODULES=()
-else
-	SRC_URI="https://github.com/obsproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Software for Recording and Streaming Live Video Content"
-HOMEPAGE="https://obsproject.com"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+alsa fdk imagemagick jack nvenc pulseaudio truetype v4l"
-
-COMMON_DEPEND="
-	>=dev-libs/jansson-2.5
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtsql:5
-	dev-qt/qttest:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-video/ffmpeg:=[x264]
-	nvenc? ( media-video/ffmpeg:=[nvenc] )
-	net-misc/curl
-	x11-libs/libXcomposite
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	alsa? ( media-libs/alsa-lib )
-	fdk? ( media-libs/fdk-aac:= )
-	imagemagick? ( media-gfx/imagemagick:= )
-	jack? ( virtual/jack )
-	pulseaudio? ( media-sound/pulseaudio )
-	truetype? (
-		media-libs/fontconfig
-		media-libs/freetype
-	)
-	v4l? ( media-libs/libv4l )
-"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-PATCHES="${FILESDIR}/${PN}-21.0.2-qt-5.11.0.patch"
-
-CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
-
-src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DDISABLE_ALSA=$(usex !alsa)
-		-DDISABLE_FREETYPE=$(usex !truetype)
-		-DDISABLE_JACK=$(usex !jack)
-		-DDISABLE_LIBFDK=$(usex !fdk)
-		-DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
-		-DDISABLE_V4L2=$(usex !v4l)
-		-DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick)
-		-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
-		-DOBS_VERSION_OVERRIDE=${PV}
-		-DUNIX_STRUCTURE=1
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	if ! use alsa && ! use pulseaudio; then
-		elog
-		elog "For the audio capture features to be available,"
-		elog "either the 'alsa' or the 'pulseaudio' USE-flag needs to"
-		elog "be enabled."
-		elog
-	fi
-
-	if ! has_version "sys-apps/dbus"; then
-		elog
-		elog "The 'sys-apps/dbus' package is not installed, but"
-		elog "could be used for disabling hibernating, screensaving,"
-		elog "and sleeping.  Where it is not installed,"
-		elog "'xdg-screensaver reset' is used instead"
-		elog "(if 'x11-misc/xdg-utils' is installed)."
-		elog
-	fi
-
-	if ! has_version "media-libs/speexdsp"; then
-		elog
-		elog "For the speexdsp-based noise suppression filter"
-		elog "to be available, the 'media-libs/speexdsp' package needs"
-		elog "to be installed."
-		elog
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
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 062b0f414089..bba5ad05ece0 100644
--- a/media-video/obs-studio/obs-studio-21.1.2.ebuild
+++ b/media-video/obs-studio/obs-studio-21.1.2.ebuild
@@ -4,9 +4,8 @@
 EAPI=6
 
 PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-CMAKE_MIN_VERSION=3.9.6
 
-inherit cmake-utils gnome2-utils python-any-r1
+inherit cmake-utils gnome2-utils python-single-r1
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -22,7 +21,8 @@ HOMEPAGE="https://obsproject.com"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+alsa fdk imagemagick jack luajit nvenc pulseaudio python speexdsp truetype v4l"
+IUSE="+alsa fdk imagemagick jack luajit nvenc pulseaudio python speex truetype v4l"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 COMMON_DEPEND="
 	>=dev-libs/jansson-2.5
@@ -46,10 +46,10 @@ COMMON_DEPEND="
 	imagemagick? ( media-gfx/imagemagick:= )
 	jack? ( virtual/jack )
 	luajit? ( dev-lang/luajit:2 )
-	nvenc? ( media-video/ffmpeg:=[nvenc(+),video_cards_nvidia(+)] )
+	nvenc? ( media-video/ffmpeg:=[nvenc] )
 	pulseaudio? ( media-sound/pulseaudio )
 	python? ( ${PYTHON_DEPS} )
-	speexdsp? ( media-libs/speexdsp )
+	speex? ( media-libs/speexdsp )
 	truetype? (
 		media-libs/fontconfig
 		media-libs/freetype
@@ -77,7 +77,7 @@ src_configure() {
 		-DDISABLE_JACK=$(usex !jack)
 		-DDISABLE_LIBFDK=$(usex !fdk)
 		-DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
-		-DDISABLE_SPEEXDSP=$(usex !speexdsp)
+		-DDISABLE_SPEEXDSP=$(usex !speex)
 		-DDISABLE_V4L2=$(usex !v4l)
 		-DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick)
 		-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
diff --git a/media-video/obs-studio/obs-studio-22.0.3.ebuild b/media-video/obs-studio/obs-studio-22.0.3.ebuild
new file mode 100644
index 000000000000..987d58bb89bf
--- /dev/null
+++ b/media-video/obs-studio/obs-studio-22.0.3.ebuild
@@ -0,0 +1,122 @@
+# 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 cmake-utils gnome2-utils python-single-r1
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/obsproject/obs-studio.git"
+	EGIT_SUBMODULES=()
+else
+	SRC_URI="https://github.com/obsproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Software for Recording and Streaming Live Video Content"
+HOMEPAGE="https://obsproject.com"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+alsa fdk imagemagick jack luajit nvenc pulseaudio python speex truetype v4l"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+	>=dev-libs/jansson-2.5
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtsql:5
+	dev-qt/qttest:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-video/ffmpeg:=[x264]
+	net-misc/curl
+	x11-libs/libXcomposite
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	alsa? ( media-libs/alsa-lib )
+	fdk? ( media-libs/fdk-aac:= )
+	imagemagick? ( media-gfx/imagemagick:= )
+	jack? ( virtual/jack )
+	luajit? ( dev-lang/luajit:2 )
+	nvenc? ( media-video/ffmpeg:=[nvenc] )
+	pulseaudio? ( media-sound/pulseaudio )
+	python? ( ${PYTHON_DEPS} )
+	speex? ( media-libs/speexdsp )
+	truetype? (
+		media-libs/fontconfig
+		media-libs/freetype
+	)
+	v4l? ( media-libs/libv4l )
+"
+DEPEND="${COMMON_DEPEND}
+	luajit? ( dev-lang/swig )
+	python? ( dev-lang/swig )
+"
+RDEPEND="${COMMON_DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-21.1.2-use-less-automagic.patch" )
+
+CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
+
+src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DDISABLE_ALSA=$(usex !alsa)
+		-DDISABLE_FREETYPE=$(usex !truetype)
+		-DDISABLE_JACK=$(usex !jack)
+		-DDISABLE_LIBFDK=$(usex !fdk)
+		-DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
+		-DDISABLE_SPEEXDSP=$(usex !speex)
+		-DDISABLE_V4L2=$(usex !v4l)
+		-DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick)
+		-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
+		-DOBS_VERSION_OVERRIDE=${PV}
+		-DUNIX_STRUCTURE=1
+	)
+
+	if use luajit || use python; then
+		mycmakeargs+=(
+			-DDISABLE_LUA=$(usex !luajit)
+			-DDISABLE_PYTHON=$(usex !python)
+			-DENABLE_SCRIPTING=yes
+		)
+	else
+		mycmakeargs+=( -DENABLE_SCRIPTING=no )
+	fi
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	if ! use alsa && ! use pulseaudio; then
+		elog
+		elog "For the audio capture features to be available,"
+		elog "either the 'alsa' or the 'pulseaudio' USE-flag needs to"
+		elog "be enabled."
+		elog
+	fi
+
+	if ! has_version "sys-apps/dbus"; then
+		elog
+		elog "The 'sys-apps/dbus' package is not installed, but"
+		elog "could be used for disabling hibernating, screensaving,"
+		elog "and sleeping.  Where it is not installed,"
+		elog "'xdg-screensaver reset' is used instead"
+		elog "(if 'x11-misc/xdg-utils' is installed)."
+		elog
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
index 4558c2f4e954..d3014eda9ede 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-9999.ebuild
@@ -4,9 +4,8 @@
 EAPI=6
 
 PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-CMAKE_MIN_VERSION=3.9.6
 
-inherit cmake-utils gnome2-utils python-any-r1
+inherit cmake-utils gnome2-utils python-single-r1
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -22,7 +21,8 @@ HOMEPAGE="https://obsproject.com"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+alsa fdk imagemagick jack luajit nvenc pulseaudio python speexdsp truetype v4l"
+IUSE="+alsa fdk imagemagick jack luajit nvenc pulseaudio python speex truetype v4l"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 COMMON_DEPEND="
 	>=dev-libs/jansson-2.5
@@ -49,7 +49,7 @@ COMMON_DEPEND="
 	nvenc? ( media-video/ffmpeg:=[nvenc(+),video_cards_nvidia(+)] )
 	pulseaudio? ( media-sound/pulseaudio )
 	python? ( ${PYTHON_DEPS} )
-	speexdsp? ( media-libs/speexdsp )
+	speex? ( media-libs/speexdsp )
 	truetype? (
 		media-libs/fontconfig
 		media-libs/freetype
@@ -62,8 +62,6 @@ DEPEND="${COMMON_DEPEND}
 "
 RDEPEND="${COMMON_DEPEND}"
 
-PATCHES="${FILESDIR}/${PN}-21.1.2-use-less-automagic.patch"
-
 CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
 
 src_configure() {
@@ -74,7 +72,7 @@ src_configure() {
 		-DDISABLE_JACK=$(usex !jack)
 		-DDISABLE_LIBFDK=$(usex !fdk)
 		-DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
-		-DDISABLE_SPEEXDSP=$(usex !speexdsp)
+		-DDISABLE_SPEEXDSP=$(usex !speex)
 		-DDISABLE_V4L2=$(usex !v4l)
 		-DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick)
 		-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
diff --git a/media-video/parole/Manifest b/media-video/parole/Manifest
index b557d15d75bc..4a4c14334ed7 100644
--- a/media-video/parole/Manifest
+++ b/media-video/parole/Manifest
@@ -3,5 +3,5 @@ DIST parole-1.0.0.tar.bz2 900499 BLAKE2B d6a1eb21846426781a712f33b7cf8f412b17b9a
 DIST parole-1.0.1.tar.bz2 903754 BLAKE2B 2bd8a8892c04bc145d7ba0bc08c29ad1f9c4507cce533d554952553e46c408e9f293a19820790541d0a494052ac6024d415bfef4864fc09b8d851664688ace3e SHA512 026ece62e6a8175976e7ce218edbd6955a0cdb5074996adad5bed3e536f90108e4d1106f22edcb06d213fb09dd47b04f81bff94f4534710b61f0f53cb0395f72
 EBUILD parole-0.8.1.ebuild 1284 BLAKE2B add340579bde9e74dad8d327f0a47d72d0275eac9a69f43b034b71b80f6e4f754999f937e6585c8e7494f35172fcfc55258f5eb8d6ed4d095a44efd3d2bef741 SHA512 d315e12d36f1d0c8bbf8a5e2bb4a34e3c9f67e4cfc06fa03ac862a7ac8df349957bb43f15fc75589e9523dda4785142e849f8ababd3cd18ed050f222627fcae2
 EBUILD parole-1.0.0.ebuild 1423 BLAKE2B 2cf11db0e9ceb829b290ccf774f9fb9cf94a0af47f8d896e91cd5660d24f61f321fe4d9b5ee7381138efb739263ae71beae28a07352a700b5f8d781f6e882006 SHA512 f7a862aca1db2e6b234d5276f0fe6ea9febd3b7fef718e758558494dbfa3de1aa5302325431b8601702593ec857a7d8beea3ecb93f29e1716172ecf13f349b38
-EBUILD parole-1.0.1.ebuild 1425 BLAKE2B 14511bc39a817114e35f2f6d349207a54b0a2dfec9fc983de15780acd3b69c34a04ea955e37002556800ae456c33bf821b576250a523aba0d250cde13bea330b SHA512 e8e341d19cbc90b6899462c2fff6fb68388587a2bb33544713c9d7487f24b47bd65448633f09ecfc208bc6b7174cac50f1cb7fd65d1be859cdae118b339ee3f4
+EBUILD parole-1.0.1.ebuild 1447 BLAKE2B 0794e419882880e68ed9ee7a2280d2c5b618b16189c34c62315faea26be0c555074454274095f1804ef9b860e3ad7bd8591de42f1c6c5db62328802e72807db7 SHA512 f1c859fea6e9479a2694e22e1ba5c6308a16a7ec2ed543e66fa71ee976b4a7138512403a8da51576f03b1da949acb2c48e27d0873a1ddd97c5e721335d385529
 MISC metadata.xml 318 BLAKE2B fc559f9ed2dba93e1117e5b01a8e7202b4d8fa64493133ebbe758e4d6c13836ae484b7be986cbcae4d32ec3175d138292aa51a86018cf531c7f12c8f3bd06590 SHA512 412b57b034604b0b6d532fadf5eba6478222b30fe4a003ff1486b59ec1136f440343c4524951cee33b235dfa782c09380326d9cbee17e1406408947d12fc430e
diff --git a/media-video/parole/parole-1.0.1.ebuild b/media-video/parole/parole-1.0.1.ebuild
index e25d25434825..36f2c8f0745b 100644
--- a/media-video/parole/parole-1.0.1.ebuild
+++ b/media-video/parole/parole-1.0.1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A simple Xfce4 media player using GStreamer"
 HOMEPAGE="https://docs.xfce.org/apps/parole/start"
 SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~mips ~x86"
 IUSE="libnotify taglib"
@@ -29,6 +29,7 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:=
 RDEPEND="${COMMON_DEPEND}
 	media-plugins/gst-plugins-meta:1.0"
 DEPEND="${COMMON_DEPEND}
+	dev-util/glib-utils
 	dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig
diff --git a/media-video/xine-ui/Manifest b/media-video/xine-ui/Manifest
index f0448758f55b..f4b859a22bab 100644
--- a/media-video/xine-ui/Manifest
+++ b/media-video/xine-ui/Manifest
@@ -1,5 +1,7 @@
+AUX xine-ui-0.99.10-desktop.patch 996 BLAKE2B 3ea4d4f4c3a9c3fd93f211c949694abef94d9f115d41f45afce07632f96473912e393b14de8fba714f9d11bb351ff8df41d056d6c4aebd680f03f84b5498d60a SHA512 f4d40ff11f851ab2e56e902fd9c5cf51f530c76308d6f7f6675cd5b90486a1e265d29b12375c10a57a8a825b45132fef9ca471dad056c5524e817678ce79626f
+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 1901 BLAKE2B 7266d73e30442b60ffd941f1074fe749d105b1307c15ab1b3587e9f2b1d54502e9ff22ae931bb1a8e0af211d4ddefa85b1f85d81170f7cf5a16839ac8d906c42 SHA512 d948983d5834e1f2f34b02744f04e56c9c57e6ff9cf21bebfcb17436589beac6bc60cfa7d032b6f58dcb6e1eb5cdc2c0dfddc88a9bf4398f9d32ce1d41b73196
+EBUILD xine-ui-0.99.10.ebuild 2041 BLAKE2B 1ce636d83db52cd0796592a8d9f133c30f134fbff8ba4c4118c219a6bc21d70648b2ebfe58083f18bfb1b564c211e4612252944ff2b4cbead78bf18da51bc497 SHA512 599c3110ca5f4b7f03758850be900814229a0d9b24b39084f3393f6aa183b4a349ac8b752cd82fc38e6ee504a238a7c3f7b67971f0e79d54f43bb6c0be81394d
 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/files/xine-ui-0.99.10-desktop.patch b/media-video/xine-ui/files/xine-ui-0.99.10-desktop.patch
new file mode 100644
index 000000000000..04aecb7ccf11
--- /dev/null
+++ b/media-video/xine-ui/files/xine-ui-0.99.10-desktop.patch
@@ -0,0 +1,23 @@
+--- a/misc/desktops/xine.desktop.in	2017-12-28 17:34:15.000000000 +0100
++++ b/misc/desktops/xine.desktop.in	2018-10-03 18:53:23.909196224 +0200
+@@ -6,5 +6,5 @@
+ Icon=xine
+ Terminal=false
+ Type=Application
+-Categories=Application;AudioVideo;Player;
+-MimeType=
+\ No newline at end of file
++Categories=AudioVideo;Player;
++MimeType=
+\ No newline at end of file
+--- a/misc/desktops/Makefile.am	2017-12-28 17:34:15.000000000 +0100
++++ b/misc/desktops/Makefile.am	2018-10-03 19:52:23.262534618 +0200
+@@ -32,7 +32,7 @@
+ if XINE_LIST
+ xine.desktop: xine.desktop.in @XINE_LIST@
+ 	$(AM_V_GEN)cat $< > $@; \
+-	@XINE_LIST@ | perl -ne 'print join(";",sort(split(";")))' >> $@; \
++	@XINE_LIST@ | perl -ne 'print join("\n",split(";"))' | sort -u | xargs | perl -ne 'print join(";",sort(split(" ")))' >> $@; \
+ 	echo ';$(INPUT_MIME_TYPES)' >> $@
+ else
+ XINE_MIME = $(if $(shell test "$(XINE_CONFIG)" = '' && echo y),$(shell pkg-config --variable=plugindir libxine),$(shell $(XINE_CONFIG) --plugindir))/mime.types
diff --git a/media-video/xine-ui/files/xine-ui-0.99.10-libcaca.patch b/media-video/xine-ui/files/xine-ui-0.99.10-libcaca.patch
new file mode 100644
index 000000000000..c5a359758d4a
--- /dev/null
+++ b/media-video/xine-ui/files/xine-ui-0.99.10-libcaca.patch
@@ -0,0 +1,24 @@
+diff -r efe11fb1562e configure.ac
+--- a/configure.ac	Thu Dec 28 18:08:02 2017 +0200
++++ b/configure.ac	Sun Apr 01 23:00:22 2018 -0600
+@@ -374,7 +374,7 @@
+    if test "x$with_caca" = "xyes" && test "x$have_caca" = "xno"; then
+       AC_MSG_ERROR([CACA support requested, but libcaca 0.99 not found])
+    fi
+-   if test test "x$have_caca" = "xyes"; then
++   if test "x$have_caca" = "xyes"; then
+      AM_DL()
+    fi
+    AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[#include <caca.h> 
+
+--- a/configure 	Thu Dec 28 18:08:02 2017 +0200
++++ b/configure 	Sun Apr 01 23:00:22 2018 -0600
+@@ -12651,7 +12651,7 @@
+    if test "x$with_caca" = "xyes" && test "x$have_caca" = "xno"; then
+       as_fn_error $? "CACA support requested, but libcaca 0.99 not found" "$LINENO" 5
+    fi
+-   if test test "x$have_caca" = "xyes"; then
++   if test "x$have_caca" = "xyes"; then
+
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lc" >&5
+ $as_echo_n "checking for dlopen in -lc... " >&6; }
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 90ab46eefcff..ae016e03898e 100644
--- a/media-video/xine-ui/xine-ui-0.99.10.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.10.ebuild
@@ -1,19 +1,21 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit gnome2-utils xdg-utils
+EAPI=6
+
+inherit autotools gnome2-utils xdg-utils
 
 DESCRIPTION="Xine movie player"
-HOMEPAGE="http://xine.sourceforge.net/"
+HOMEPAGE="https://xine-project.org/home"
 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="|| ( app-arch/tar app-arch/libarchive )
+RDEPEND="
+	|| ( app-arch/tar app-arch/libarchive )
 	media-libs/libpng:0=
 	>=media-libs/xine-lib-1.2:=[aalib?,libcaca?]
 	virtual/jpeg:0
@@ -35,17 +37,26 @@ RDEPEND="|| ( app-arch/tar app-arch/libarchive )
 		x11-libs/libXv:=
 		x11-libs/libXxf86vm:=
 		xinerama? ( x11-libs/libXinerama:= )
-		)"
+	)
+"
 DEPEND="${RDEPEND}
+	virtual/pkgconfig
 	nls? ( >=sys-devel/gettext-0.18.3 )
 	X? (
 		x11-base/xorg-proto
 		x11-libs/libXt
-		)
-	virtual/pkgconfig"
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-desktop.patch
+	"${FILESDIR}"/${P}-libcaca.patch
+)
 
 src_prepare() {
-	rm -f misc/xine-bugreport
+	default
+	eautoreconf
+	rm misc/xine-bugreport || die
 }
 
 src_configure() {
@@ -65,16 +76,16 @@ src_configure() {
 }
 
 src_install() {
+	# xine-list apparently may cause sandbox violation, bug 654394
+	addpredict /dev/dri
+
 	emake \
 		DESTDIR="${D}" \
 		docdir="/usr/share/doc/${PF}" \
 		docsdir="/usr/share/doc/${PF}" \
 		install
-	dodoc AUTHORS ChangeLog NEWS README
-}
 
-pkg_preinst() {
-	gnome2_icon_savelist
+	einstalldocs
 }
 
 pkg_postinst() {
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 01ec8b778c89..2b04cfed20f3 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index bc54edd0cd8e..4b5c84dd0035 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 30 Sep 2018 09:38:28 +0000
+Sun, 07 Oct 2018 09:08:36 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 6f5bd9aa2648..8c5348102f55 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 428048 BLAKE2B 5834bbfc1927ee7e2cae3faeae917bb164749c31d96c4c2668b07723f350b9742d5ef21ebbf7f78fbff1cc985eb00ece32e39d04e065bfb0d6824a4107935d0a SHA512 038811f6891b17d7f2be8dde22716fa2af520867cd5808ca4a095d817a75e7d94ee52dc46317f62740ddbc4cd55248f9f02d26404d1805e220ae95187a8b3764
-TIMESTAMP 2018-09-30T09:38:32Z
+MANIFEST Manifest.files.gz 428688 BLAKE2B ad7b0e93dc8d25ffce2b6b151e2b2f9d3f4644e2e0bd01b04b2cf32db642d1d55604ebfba538d50e5bffd72012f36cafeebb5fa8b059c51e9495a17ed7d24e61 SHA512 38eef2b8a964d52745f651dc5c44cb508b253654c94f1704d61e63093636d75a72c2f7e2db78f40261fe9fecdede9dacd2401b62f42b01813651f01c9fe87245
+TIMESTAMP 2018-10-07T09:08:39Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAluwmZhfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlu5zRdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDJARAAh0z1anjPsytfUjKeRgnvIu+i02utg9a9WYiG612J3d5UTXaygQRqozJ2
-bPBi2/1jAvtrRERcxHncKO439qZQqwTTYToeXeN87afmAtk2ZNb0XOhdRwl3pZVk
-Gn8SxtqQVUyPWTXvI+lO2fys4JUEC+goWbIhAp+UNCxlVNXwwJ0HsfjDEEx4L6kA
-nCyrR4P5Dj73BWxIX9N4hPBFo4kv6YNABFbOXqzBiGEr+rtdgl3rUgkWipywHTRQ
-JapTC4j49JJG5aXR+jXhEdGTilo5fSepOcAunIvQtXSaVL0NBLJgPbMcCwhU/zlB
-lJSqjjn4NwPTxQ3IAknB8homdfXCfsqK9gPUeOwXGKk1v4UM4o8zBOHU9DvDgNKh
-UNCv2EQulcpLqkauc+XbAMa8p7ILNODXw2DMNE38FhflmvVdkHXejoJ05ThvAedX
-TVUtfw5HJaV9SHgcwhb6kZjAk2tkZgnF0aDFW+qNNmlQRuivOTQ2XzmswQslbx2R
-3tSSXHKAEvZUugBITvmMYr20fPAoKVLapblSTSBb/UqUIWhbJLd684/zCXC3zhq6
-Ko7ns7/7HrSu3WBUBzs0aYt3f//0kTudChygow2ZZVRA4NfbW/w7nKKsS61KT0ux
-fFjoYaP9G6D4KaL666KAWM8FPbTSt1qTjoi7DHnoDT3qAQwbmaE=
-=MhTS
+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
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/Manifest.files.gz b/metadata/glsa/Manifest.files.gz
index efd7310b81fc..aab66931c134 100644
--- a/metadata/glsa/Manifest.files.gz
+++ b/metadata/glsa/Manifest.files.gz
diff --git a/metadata/glsa/glsa-201810-01.xml b/metadata/glsa/glsa-201810-01.xml
new file mode 100644
index 000000000000..ebe9c30ed5f3
--- /dev/null
+++ b/metadata/glsa/glsa-201810-01.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201810-01">
+  <title>Mozilla Firefox: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in Mozilla Firefox, the
+    worst of which may allow execution of arbitrary code.
+  </synopsis>
+  <product type="ebuild">firefox</product>
+  <announced>2018-10-02</announced>
+  <revised count="1">2018-10-02</revised>
+  <bug>650422</bug>
+  <bug>657976</bug>
+  <bug>659432</bug>
+  <bug>665496</bug>
+  <bug>666760</bug>
+  <bug>667612</bug>
+  <access>remote</access>
+  <affected>
+    <package name="www-client/firefox" auto="yes" arch="*">
+      <unaffected range="ge">60.2.2</unaffected>
+      <vulnerable range="lt">60.2.2</vulnerable>
+    </package>
+    <package name="www-client/firefox-bin" auto="yes" arch="*">
+      <unaffected range="ge">60.2.2</unaffected>
+      <vulnerable range="lt">60.2.2</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Mozilla Firefox is a popular open-source web browser from the Mozilla
+      Project.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Mozilla Firefox. Please
+      review the referenced CVE identifiers for details.
+    </p>
+  </description>
+  <impact type="high">
+    <p>A remote attacker could entice a user to view a specially crafted web
+      page, possibly resulting in the execution of arbitrary code with the
+      privileges of the process or a Denial of Service condition. Furthermore,
+      a remote attacker may be able to perform Man-in-the-Middle attacks,
+      obtain sensitive information, spoof the address bar, conduct clickjacking
+      attacks, bypass security restrictions and protection mechanisms, or have
+      other unspecified impact.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Mozilla Firefox users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=www-client/firefox-60.2.2"
+    </code>
+    
+    <p>All Mozilla Firefox binary users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=www-client/firefox-bin-60.2.2"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2017-16541">CVE-2017-16541</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-12358">CVE-2018-12358</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-12359">CVE-2018-12359</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-12360">CVE-2018-12360</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-12361">CVE-2018-12361</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-12362">CVE-2018-12362</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-12363">CVE-2018-12363</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-12364">CVE-2018-12364</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-12365">CVE-2018-12365</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-12366">CVE-2018-12366</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-12367">CVE-2018-12367</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-12368">CVE-2018-12368</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-12369">CVE-2018-12369</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-12370">CVE-2018-12370</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-12371">CVE-2018-12371</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-12376">CVE-2018-12376</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-12377">CVE-2018-12377</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-12378">CVE-2018-12378</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-12379">CVE-2018-12379</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-12381">CVE-2018-12381</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-12383">CVE-2018-12383</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-12385">CVE-2018-12385</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-12386">CVE-2018-12386</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-12387">CVE-2018-12387</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-5125">CVE-2018-5125</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-5127">CVE-2018-5127</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-5129">CVE-2018-5129</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-5130">CVE-2018-5130</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-5131">CVE-2018-5131</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-5144">CVE-2018-5144</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-5150">CVE-2018-5150</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-5154">CVE-2018-5154</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-5155">CVE-2018-5155</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-5156">CVE-2018-5156</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-5157">CVE-2018-5157</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-5158">CVE-2018-5158</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-5159">CVE-2018-5159</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-5168">CVE-2018-5168</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-5178">CVE-2018-5178</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-5183">CVE-2018-5183</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-5186">CVE-2018-5186</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-5187">CVE-2018-5187</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-5188">CVE-2018-5188</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-6126">CVE-2018-6126</uri>
+  </references>
+  <metadata tag="requester" timestamp="2018-10-02T09:03:17Z">whissi</metadata>
+  <metadata tag="submitter" timestamp="2018-10-02T22:17:52Z">irishluck83</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201810-02.xml b/metadata/glsa/glsa-201810-02.xml
new file mode 100644
index 000000000000..20bc31cf4a1d
--- /dev/null
+++ b/metadata/glsa/glsa-201810-02.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201810-02">
+  <title>SoX: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in SoX, the worst of which
+    may lead to a Denial of Service condition.
+  </synopsis>
+  <product type="ebuild">sox</product>
+  <announced>2018-10-06</announced>
+  <revised count="1">2018-10-06</revised>
+  <bug>626702</bug>
+  <bug>627570</bug>
+  <bug>634450</bug>
+  <bug>634814</bug>
+  <access>remote</access>
+  <affected>
+    <package name="media-sound/sox" auto="yes" arch="*">
+      <unaffected range="ge">14.4.2-r1</unaffected>
+      <vulnerable range="lt">14.4.2-r1</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>SoX is a command line utility that can convert various formats of
+      computer audio files in to other formats.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in SoX. Please review the
+      referenced CVE identifiers for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker, by enticing a user to process a crafted WAV, HCOM,
+      SND, or AIFF file, could cause a Denial of Service condition.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All SoX users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=media-sound/sox-14.4.2-r1"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2017-11332">CVE-2017-11332</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2017-11358">CVE-2017-11358</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2017-11359">CVE-2017-11359</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2017-15370">CVE-2017-15370</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2017-15371">CVE-2017-15371</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2017-15372">CVE-2017-15372</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2017-15642">CVE-2017-15642</uri>
+  </references>
+  <metadata tag="requester" timestamp="2018-09-30T21:36:08Z">BlueKnight</metadata>
+  <metadata tag="submitter" timestamp="2018-10-06T16:59:06Z">irishluck83</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201810-03.xml b/metadata/glsa/glsa-201810-03.xml
new file mode 100644
index 000000000000..9165083ac1cb
--- /dev/null
+++ b/metadata/glsa/glsa-201810-03.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201810-03">
+  <title>OpenSSH: User enumeration vulnerability</title>
+  <synopsis>A vulnerability in OpenSSH might allow remote attackers to
+    determine valid usernames.
+  </synopsis>
+  <product type="ebuild">openssh</product>
+  <announced>2018-10-06</announced>
+  <revised count="1">2018-10-06</revised>
+  <bug>664264</bug>
+  <access>remote</access>
+  <affected>
+    <package name="net-misc/openssh" auto="yes" arch="*">
+      <unaffected range="ge">7.7_p1-r8</unaffected>
+      <vulnerable range="lt">7.7_p1-r8</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>OpenSSH is a complete SSH protocol implementation that includes SFTP
+      client and server support.
+    </p>
+  </background>
+  <description>
+    <p>It was discovered that OpenSSH was prone to a user enumeration
+      vulnerability.
+    </p>
+  </description>
+  <impact type="low">
+    <p>A remote attacker could conduct user enumeration.</p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All OpenSSH users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=net-misc/openssh-7.7_p1-r8"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-15473">CVE-2018-15473</uri>
+  </references>
+  <metadata tag="requester" timestamp="2018-08-23T00:18:32Z">whissi</metadata>
+  <metadata tag="submitter" timestamp="2018-10-06T17:02:32Z">whissi</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201810-04.xml b/metadata/glsa/glsa-201810-04.xml
new file mode 100644
index 000000000000..8b1b96e811df
--- /dev/null
+++ b/metadata/glsa/glsa-201810-04.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201810-04">
+  <title>ImageMagick: Security hardening</title>
+  <synopsis>Due to multiple vulnerabilities in various coders used by
+    ImageMagick, Gentoo Linux now installs a policy.xml file which will
+    restrict coder usage by default.
+  </synopsis>
+  <product type="ebuild">imagemagick</product>
+  <announced>2018-10-06</announced>
+  <revised count="1">2018-10-06</revised>
+  <bug>664236</bug>
+  <access>local, remote</access>
+  <affected>
+    <package name="media-gfx/imagemagick" auto="yes" arch="*">
+      <unaffected range="ge">6.9.10.10-r1</unaffected>
+      <unaffected range="ge">7.0.8.10-r1</unaffected>
+      <vulnerable range="lt">6.9.10.10-r1</vulnerable>
+      <vulnerable range="lt">7.0.8.10-r1</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>ImageMagick is a collection of tools and libraries for many image
+      formats.
+    </p>
+  </background>
+  <description>
+    <p>If you process an image with ImageMagick and don’t validate the file
+      before (e.g. check magic byte), ImageMagick will call any coders found in
+      the given file. So if ImageMagick will find Ghostscript for example, it
+      will call Ghostscript.
+    </p>
+    
+    <p>Due to multiple -dSAFER sandbox bypass vulnerabilities in Ghostscript,
+      this can lead to arbitrary code execution.
+    </p>
+    
+    <p>To mitigate this problem we install a policy.xml file by default which
+      will disable PS, EPS, PDF, and XPS coders.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker, by enticing a user to process a specially crafted
+      image file, could execute arbitrary code with the privileges of the
+      process or cause a Denial of Service condition.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All ImageMagick 6 users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=media-gfx/imagemagick-6.9.10.10-r1"
+    </code>
+    
+    <p>All ImageMagick 7 users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=media-gfx/imagemagick-7.0.8.10-r1"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="https://www.kb.cert.org/vuls/id/332928">Ghostscript contains
+      multiple -dSAFER sandbox bypass vulnerabilities (VU#332928)
+    </uri>
+  </references>
+  <metadata tag="requester" timestamp="2018-08-22T17:43:38Z">whissi</metadata>
+  <metadata tag="submitter" timestamp="2018-10-06T17:09:35Z">whissi</metadata>
+</glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index bc54edd0cd8e..4b5c84dd0035 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 30 Sep 2018 09:38:28 +0000
+Sun, 07 Oct 2018 09:08:36 +0000
diff --git a/metadata/glsa/timestamp.commit b/metadata/glsa/timestamp.commit
index 48b67b89a28e..6add75c1308d 100644
--- a/metadata/glsa/timestamp.commit
+++ b/metadata/glsa/timestamp.commit
@@ -1 +1 @@
-369717e703607f113d1aa3954217fedba2e18a69 1534973538 2018-08-22T21:32:18+00:00
+b914ac7ce64b6f61d701c5cf4173dd03fafdca0e 1538845801 2018-10-06T17:10:01+00:00
diff --git a/metadata/install-qa-check.d/08gentoo-paths b/metadata/install-qa-check.d/08gentoo-paths
new file mode 100644
index 000000000000..3ee887df08f8
--- /dev/null
+++ b/metadata/install-qa-check.d/08gentoo-paths
@@ -0,0 +1,77 @@
+# Check whether ebuilds are not installing new, non-Gentoo-ey paths.
+
+gentoo_path_check() {
+	# allowed path definitions
+	# ------------------------
+
+	# directories common to / and /usr
+	local allowed_common_dirs=(
+		bin lib lib32 lib64 libx32 sbin
+	)
+
+	# toplevel directories which can be installed to by ebuilds
+	# /home is not included as no ebuilds should install files there
+	local allowed_paths_toplevel=(
+		"${allowed_common_dirs[@]}"
+		boot dev etc opt srv usr var
+	)
+
+	# directories in /usr which can be installed to by ebuilds
+	# /usr/games is not included as it is banned nowadays
+	local allowed_paths_usr=(
+		"${allowed_common_dirs[@]}"
+		include libexec share src
+		# toolchain stuff
+		"${CHOST}" "${CTARGET}"
+	)
+
+
+	# the logic
+	# ---------
+	local bad_paths=()
+	local x
+
+	local shopt_save=$(shopt -p nullglob)
+	shopt -s nullglob
+
+	# 1. check for unexpected top-level directories
+	local toplevel_dirs=( "${ED%/}"/* )
+	for x in "${toplevel_dirs[@]##*/}"; do
+		if ! has "${x}" "${allowed_paths_toplevel[@]}"; then
+			bad_paths+=( "/${x}" )
+		fi
+	done
+
+	# 2. check for unexpected /usr subdirectories
+	local usr_dirs=( "${ED%/}"/usr/* )
+	for x in "${usr_dirs[@]##*/}"; do
+		if ! has "${x}" "${allowed_paths_usr[@]}"; then
+			bad_paths+=( "/usr/${x}" )
+		fi
+	done
+
+	# 3. check for unexpected /usr/share/doc subdirectories
+	local doc_dirs=( "${ED%/}"/usr/share/doc/* )
+	for x in "${doc_dirs[@]##*/}"; do
+		if [[ ${x} != ${PF} ]]; then
+			bad_paths+=( "/usr/share/doc/${x}" )
+		fi
+	done
+
+	${shopt_save}
+
+	# report
+	# ------
+	if [[ -n ${bad_paths[@]} ]]; then
+		eqawarn "The ebuild is installing to one or more unexpected paths:"
+		eqawarn
+		eqatag -v non-gentoo-paths "${bad_paths[@]}"
+		eqawarn
+		eqawarn "Please fix the ebuild to use correct FHS/Gentoo policy paths."
+	fi
+}
+
+gentoo_path_check
+: # guarantee successful exit
+
+# vim:ft=sh
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 24d6925d0699..1d174fb86520 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 d9f820f1ede8..6ee04ef3bc65 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/accerciser-3.22.0 b/metadata/md5-cache/app-accessibility/accerciser-3.22.0
index 649cab2aa877..9d2b2fb13655 100644
--- a/metadata/md5-cache/app-accessibility/accerciser-3.22.0
+++ b/metadata/md5-cache/app-accessibility/accerciser-3.22.0
@@ -10,5 +10,5 @@ RDEPEND=>=app-accessibility/at-spi2-core-2.5.2:2 >=dev-python/pygobject-2.90.3:3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/accerciser/3.22/accerciser-3.22.0.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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d824645ab9e59e46288f40f698baa5e7
diff --git a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.22.0 b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.22.0
index b400693451ee..cabb8958ddfd 100644
--- a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.22.0
+++ b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.22.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=app-accessibility/at-spi2-core-2.17.90[abi_x86_32(-)?,abi_x86_64(-)?,abi_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/atk-2.15.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/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_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.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(-)?] !<gnome-extra/at-spi-1.32.0-r1
 SLOT=2
 SRC_URI=mirror://gnome/sources/at-spi2-atk/2.22/at-spi2-atk-2.22.0.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bafeb6e37d795e32df9e3e6d2ea59e43
diff --git a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.24.1 b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.24.1
index fe13b46ac7a2..832553d84edb 100644
--- a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.24.1
+++ b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.24.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=app-accessibility/at-spi2-core-2.17.90[abi_x86_32(-)?,abi_x86_64(-)?,abi_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/atk-2.15.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/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_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.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(-)?] !<gnome-extra/at-spi-1.32.0-r1
 SLOT=2
 SRC_URI=mirror://gnome/sources/at-spi2-atk/2.24/at-spi2-atk-2.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	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0b99ddf348fc0a5dbd06086be101a70b
diff --git a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.26.2 b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.26.2
index 276aa5f5120b..fd9bf4ab5869 100644
--- a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.26.2
+++ b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.26.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=sys-apps/dbus-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(-)?] >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_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/atk-2.25.2[abi_x86_32(-)?,abi_x86_64(-)?,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-accessibility/at-spi2-core-2.25.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=2
 SRC_URI=mirror://gnome/sources/at-spi2-atk/2.26/at-spi2-atk-2.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	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d215d3c2ce918a0b269b016a81107e5f
diff --git a/metadata/md5-cache/app-accessibility/at-spi2-core-2.22.1 b/metadata/md5-cache/app-accessibility/at-spi2-core-2.22.1
index 1d9dfb9ce42d..88de31ad6b89 100644
--- a/metadata/md5-cache/app-accessibility/at-spi2-core-2.22.1
+++ b/metadata/md5-cache/app-accessibility/at-spi2-core-2.22.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.36:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libSM[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/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/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/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/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=2
 SRC_URI=mirror://gnome/sources/at-spi2-core/2.22/at-spi2-core-2.22.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bd463d1bf7df197170a46c648715ade8
diff --git a/metadata/md5-cache/app-accessibility/at-spi2-core-2.24.1 b/metadata/md5-cache/app-accessibility/at-spi2-core-2.24.1
index ebca393ee3d7..c5b4e88e84df 100644
--- a/metadata/md5-cache/app-accessibility/at-spi2-core-2.24.1
+++ b/metadata/md5-cache/app-accessibility/at-spi2-core-2.24.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.36:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libSM[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/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/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/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/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=2
 SRC_URI=mirror://gnome/sources/at-spi2-core/2.24/at-spi2-core-2.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ee7c5c6e5c5cfeed0e6826224ed37a08
diff --git a/metadata/md5-cache/app-accessibility/at-spi2-core-2.26.2 b/metadata/md5-cache/app-accessibility/at-spi2-core-2.26.2
index 28176fcf0c6a..2ded1112409d 100644
--- a/metadata/md5-cache/app-accessibility/at-spi2-core-2.26.2
+++ b/metadata/md5-cache/app-accessibility/at-spi2-core-2.26.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.36:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_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[abi_x86_32(-)?,abi_x86_64(-)?,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.0:= ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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(-)?] )
 SLOT=2
 SRC_URI=mirror://gnome/sources/at-spi2-core/2.26/at-spi2-core-2.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=71f0644e066979ce5e54345db56b5ec0
diff --git a/metadata/md5-cache/app-accessibility/caribou-0.4.21 b/metadata/md5-cache/app-accessibility/caribou-0.4.21
index a0950e30ac9b..b8007cee6b49 100644
--- a/metadata/md5-cache/app-accessibility/caribou-0.4.21
+++ b/metadata/md5-cache/app-accessibility/caribou-0.4.21
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-core >=dev-python/pygobject-2.90.3:3[python_ta
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/caribou/0.4/caribou-0.4.21.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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=850a22228cdfd63ee3ed5bd64e40f8d3
diff --git a/metadata/md5-cache/app-accessibility/espeakup-0.71-r1 b/metadata/md5-cache/app-accessibility/espeakup-0.71-r1
index 7b085bd98413..15be1e9f2765 100644
--- a/metadata/md5-cache/app-accessibility/espeakup-0.71-r1
+++ b/metadata/md5-cache/app-accessibility/espeakup-0.71-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=|| ( app-accessibility/espeak[portaudio] app-accessibility/espeak[pulseaudio] )
 SLOT=0
 SRC_URI=mirror://gentoo/espeakup-0.71.tar.bz2
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=f50e8d1afb0a70d15beb4f3e798df4d1
diff --git a/metadata/md5-cache/app-accessibility/espeakup-0.80 b/metadata/md5-cache/app-accessibility/espeakup-0.80
index b42646f570a1..b1be213b3682 100644
--- a/metadata/md5-cache/app-accessibility/espeakup-0.80
+++ b/metadata/md5-cache/app-accessibility/espeakup-0.80
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=|| ( app-accessibility/espeak[portaudio] app-accessibility/espeak[pulseaudio] )
 SLOT=0
 SRC_URI=https://github.com/williamh/espeakup/archive/v0.80.tar.gz -> espeakup-0.80.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-snapshot	b77011b62e2053c646ad720defe6d921
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-snapshot	b77011b62e2053c646ad720defe6d921
 _md5_=60b78cdd982f72a42c1d740bdcbc6ff4
diff --git a/metadata/md5-cache/app-accessibility/espeakup-9999 b/metadata/md5-cache/app-accessibility/espeakup-9999
index cf6f3316acfa..3e8be2ce562d 100644
--- a/metadata/md5-cache/app-accessibility/espeakup-9999
+++ b/metadata/md5-cache/app-accessibility/espeakup-9999
@@ -7,5 +7,5 @@ IUSE=kernel_linux
 LICENSE=GPL-3
 RDEPEND=|| ( app-accessibility/espeak[portaudio] app-accessibility/espeak[pulseaudio] )
 SLOT=0
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=60b78cdd982f72a42c1d740bdcbc6ff4
diff --git a/metadata/md5-cache/app-accessibility/orca-3.24.0 b/metadata/md5-cache/app-accessibility/orca-3.24.0
index f21354a5c828..b6a3d31ff0fb 100644
--- a/metadata/md5-cache/app-accessibility/orca-3.24.0
+++ b/metadata/md5-cache/app-accessibility/orca-3.24.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4[threads] ) python_target
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/orca/3.24/orca-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	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=24ba3439a538a6f001f290d0e64424ad
diff --git a/metadata/md5-cache/app-accessibility/pocketsphinx-0.8 b/metadata/md5-cache/app-accessibility/pocketsphinx-0.8
index 2e6c91fd77da..d6c2afd8f31c 100644
--- a/metadata/md5-cache/app-accessibility/pocketsphinx-0.8
+++ b/metadata/md5-cache/app-accessibility/pocketsphinx-0.8
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/sphinxbase media-libs/gstreamer:0.10 media-libs/gst-pl
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/cmusphinx/pocketsphinx-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c1ccc27ea60ac294eeda9d0b4e83eeae
diff --git a/metadata/md5-cache/app-accessibility/simon-9999 b/metadata/md5-cache/app-accessibility/simon-9999
index 372c18e9d380..43166745725f 100644
--- a/metadata/md5-cache/app-accessibility/simon-9999
+++ b/metadata/md5-cache/app-accessibility/simon-9999
@@ -7,5 +7,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=61b42c57cadead483bba8a6a8d8e05cb
diff --git a/metadata/md5-cache/app-accessibility/sphinx3-0.8-r1 b/metadata/md5-cache/app-accessibility/sphinx3-0.8-r1
index 7019d4967e19..71fedc81dd85 100644
--- a/metadata/md5-cache/app-accessibility/sphinx3-0.8-r1
+++ b/metadata/md5-cache/app-accessibility/sphinx3-0.8-r1
@@ -10,5 +10,5 @@ RDEPEND=>=app-accessibility/sphinxbase-0.7[static-libs?,python?,python_targets_p
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/cmusphinx/sphinx3-0.8.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	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_=2d82e172cbf8da7613c07e95d2fc8026
diff --git a/metadata/md5-cache/app-accessibility/sphinxbase-0.8 b/metadata/md5-cache/app-accessibility/sphinxbase-0.8
index 129ea6a1514d..4a63198c7f6c 100644
--- a/metadata/md5-cache/app-accessibility/sphinxbase-0.8
+++ b/metadata/md5-cache/app-accessibility/sphinxbase-0.8
@@ -10,5 +10,5 @@ RDEPEND=media-sound/pulseaudio lapack? ( virtual/lapack ) python? ( python_targe
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/cmusphinx/sphinxbase-0.8.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	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_=5dec7b385c8010a79a35215f1d25295c
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index be19abe1e270..afd51cd1965d 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/abrt-2.0.12-r2 b/metadata/md5-cache/app-admin/abrt-2.0.12-r2
index 401645c0553d..599df5a7b27a 100644
--- a/metadata/md5-cache/app-admin/abrt-2.0.12-r2
+++ b/metadata/md5-cache/app-admin/abrt-2.0.12-r2
@@ -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://fedorahosted.org/released/abrt/abrt-2.0.12.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c586e5e4067f86d0d6769699cada6132
diff --git a/metadata/md5-cache/app-admin/abrt-2.10.10-r2 b/metadata/md5-cache/app-admin/abrt-2.10.10-r2
index 2c29e75faa88..837782cb43b9 100644
--- a/metadata/md5-cache/app-admin/abrt-2.10.10-r2
+++ b/metadata/md5-cache/app-admin/abrt-2.10.10-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/abrt/abrt/archive/2.10.10.tar.gz -> abrt-2.10.10.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2767ada7e7b9549bca5d7435db27e8ae
diff --git a/metadata/md5-cache/app-admin/ansible-2.5.6 b/metadata/md5-cache/app-admin/ansible-2.5.6
deleted file mode 100644
index bfb1ef4bb3b7..000000000000
--- a/metadata/md5-cache/app-admin/ansible-2.5.6
+++ /dev/null
@@ -1,15 +0,0 @@
-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 ) 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=Model-driven deployment, config management, and command execution framework
-EAPI=6
-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.6.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=e5b54ac6f5034b4b840567dbe1bb6ff0
diff --git a/metadata/md5-cache/app-admin/ansible-2.6.1 b/metadata/md5-cache/app-admin/ansible-2.6.1
deleted file mode 100644
index d3d17359b525..000000000000
--- a/metadata/md5-cache/app-admin/ansible-2.6.1
+++ /dev/null
@@ -1,15 +0,0 @@
-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 ) 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=Model-driven deployment, config management, and command execution framework
-EAPI=6
-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.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=e5b54ac6f5034b4b840567dbe1bb6ff0
diff --git a/metadata/md5-cache/app-admin/ansible-2.6.4 b/metadata/md5-cache/app-admin/ansible-2.6.4
index 0b5eb22d06d4..4716281e1deb 100644
--- a/metadata/md5-cache/app-admin/ansible-2.6.4
+++ b/metadata/md5-cache/app-admin/ansible-2.6.4
@@ -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.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_=79915a7d0e55cfd014474730cab980cf
+_md5_=a8be47549828b4807ed79305c17d0018
diff --git a/metadata/md5-cache/app-admin/ansible-2.7.0 b/metadata/md5-cache/app-admin/ansible-2.7.0
new file mode 100644
index 000000000000..8b19c5b5d846
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ansible-2.7.0
@@ -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.7.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_=5f23081b11c995c53655a450a33e6eaa
diff --git a/metadata/md5-cache/app-admin/ansible-cmdb-1.28 b/metadata/md5-cache/app-admin/ansible-cmdb-1.28
index f59d52fce776..c0fbe6921425 100644
--- a/metadata/md5-cache/app-admin/ansible-cmdb-1.28
+++ b/metadata/md5-cache/app-admin/ansible-cmdb-1.28
@@ -10,5 +10,5 @@ RDEPEND=dev-python/mako[python_targets_python3_5(-)?,python_targets_python3_6(-)
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible-cmdb/ansible-cmdb-1.28.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=929ac5c1ab5c18e02a9c58e6d53a9964
diff --git a/metadata/md5-cache/app-admin/ansible-lint-3.4.23 b/metadata/md5-cache/app-admin/ansible-lint-3.4.23
index 1d097d30d440..e2e26bb48da8 100644
--- a/metadata/md5-cache/app-admin/ansible-lint-3.4.23
+++ b/metadata/md5-cache/app-admin/ansible-lint-3.4.23
@@ -10,5 +10,5 @@ RDEPEND=app-admin/ansible[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/willthames/ansible-lint/archive/v3.4.23.tar.gz -> ansible-lint-3.4.23.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3108d1e3f1a3c9b28175b260651caa35
diff --git a/metadata/md5-cache/app-admin/ara-0.15.0 b/metadata/md5-cache/app-admin/ara-0.15.0
index 427104b27188..9cd4dc58e196 100644
--- a/metadata/md5-cache/app-admin/ara-0.15.0
+++ b/metadata/md5-cache/app-admin/ara-0.15.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/openstack/ara/archive/0.15.0.tar.gz -> ara-0.15.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c1f117a21fe9fb4d04f9ad2bd1c9ae1c
diff --git a/metadata/md5-cache/app-admin/ara-0.15.0-r1 b/metadata/md5-cache/app-admin/ara-0.15.0-r1
index a8834f5949b9..4cd680f9c0f9 100644
--- a/metadata/md5-cache/app-admin/ara-0.15.0-r1
+++ b/metadata/md5-cache/app-admin/ara-0.15.0-r1
@@ -10,5 +10,5 @@ RDEPEND=app-admin/ansible[python_targets_python2_7(-)?,python_targets_python3_5(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/openstack/ara/archive/0.15.0.tar.gz -> ara-0.15.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cf6295688bc89881cc582a5d3820b4c1
diff --git a/metadata/md5-cache/app-admin/bcfg2-1.2.4-r1 b/metadata/md5-cache/app-admin/bcfg2-1.2.4-r1
index f6a9c64fdee1..d79954216507 100644
--- a/metadata/md5-cache/app-admin/bcfg2-1.2.4-r1
+++ b/metadata/md5-cache/app-admin/bcfg2-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=app-portage/gentoolkit[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=ftp://ftp.mcs.anl.gov/pub/bcfg/bcfg2-1.2.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6e475cac35b358dc4d44c233bfc87782
diff --git a/metadata/md5-cache/app-admin/calamares-3.1.13 b/metadata/md5-cache/app-admin/calamares-3.1.13
index 444942fe0f5e..f1693b7fe09c 100644
--- a/metadata/md5-cache/app-admin/calamares-3.1.13
+++ b/metadata/md5-cache/app-admin/calamares-3.1.13
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	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_=b73d36acc242736d1449d358cc28fed0
diff --git a/metadata/md5-cache/app-admin/calamares-3.2.0-r1 b/metadata/md5-cache/app-admin/calamares-3.2.0-r1
deleted file mode 100644
index af2216b23894..000000000000
--- a/metadata/md5-cache/app-admin/calamares-3.2.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-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/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
-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/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
-REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
-SLOT=5
-SRC_URI=https://github.com/calamares/calamares/releases/download/v3.2.0/calamares-3.2.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	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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=886193e5440df660f07d3342d65f7ca3
diff --git a/metadata/md5-cache/app-admin/calamares-3.2.2 b/metadata/md5-cache/app-admin/calamares-3.2.2
index de81b35de382..af98c45ee1f2 100644
--- a/metadata/md5-cache/app-admin/calamares-3.2.2
+++ b/metadata/md5-cache/app-admin/calamares-3.2.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	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_=98b1165e5e6e8ef86d4effd1a9c3943f
diff --git a/metadata/md5-cache/app-admin/cdist-4.10.1 b/metadata/md5-cache/app-admin/cdist-4.10.1
index 5d41faeee829..21cfb24dbcfd 100644
--- a/metadata/md5-cache/app-admin/cdist-4.10.1
+++ b/metadata/md5-cache/app-admin/cdist-4.10.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cdist/cdist-4.10.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bfbac444b78800731c4264807a9e7e1c
diff --git a/metadata/md5-cache/app-admin/cdist-4.6.1 b/metadata/md5-cache/app-admin/cdist-4.6.1
index 9540e72bb29c..c1039557b886 100644
--- a/metadata/md5-cache/app-admin/cdist-4.6.1
+++ b/metadata/md5-cache/app-admin/cdist-4.6.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cdist/cdist-4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bfbac444b78800731c4264807a9e7e1c
diff --git a/metadata/md5-cache/app-admin/cdist-4.7.3 b/metadata/md5-cache/app-admin/cdist-4.7.3
index edd5847c82d9..6f49cad5b451 100644
--- a/metadata/md5-cache/app-admin/cdist-4.7.3
+++ b/metadata/md5-cache/app-admin/cdist-4.7.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cdist/cdist-4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bfbac444b78800731c4264807a9e7e1c
diff --git a/metadata/md5-cache/app-admin/chroot_safe-1.4-r1 b/metadata/md5-cache/app-admin/chroot_safe-1.4-r1
new file mode 100644
index 000000000000..71acaf05efbe
--- /dev/null
+++ b/metadata/md5-cache/app-admin/chroot_safe-1.4-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install
+DESCRIPTION=Chroot any dynamically linked application in a safe and sane manner
+EAPI=7
+HOMEPAGE=http://chrootsafe.sourceforge.net/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=mirror://sourceforge/chrootsafe/chroot_safe-1.4.tgz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=892ccffa35c3d8138a548a213356db1f
diff --git a/metadata/md5-cache/app-admin/clog-1.3.0 b/metadata/md5-cache/app-admin/clog-1.3.0
index 2470278e032e..4756b2993365 100644
--- a/metadata/md5-cache/app-admin/clog-1.3.0
+++ b/metadata/md5-cache/app-admin/clog-1.3.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86 ~x64-macos ~amd64-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://tasktools.org/download/clog-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=05351df9e6c44969307bdf06cc20fc52
diff --git a/metadata/md5-cache/app-admin/clsync-0.4.2 b/metadata/md5-cache/app-admin/clsync-0.4.2
index 3f4d08151822..724bea286ca5 100644
--- a/metadata/md5-cache/app-admin/clsync-0.4.2
+++ b/metadata/md5-cache/app-admin/clsync-0.4.2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 cgroups? ( dev-libs/libcgroup ) mhash? ( app-crypt/mhash
 REQUIRED_USE=|| ( gio inotify ) extra-debug? ( debug ) extra-hardened? ( hardened ) mhash? ( cluster ) seccomp? ( caps )
 SLOT=0
 SRC_URI=https://github.com/xaionaro/clsync/archive/v0.4.2.tar.gz -> clsync-0.4.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=961a794b17ce4577b29c24906d5166ae
diff --git a/metadata/md5-cache/app-admin/clustershell-1.6 b/metadata/md5-cache/app-admin/clustershell-1.6
index f7b0c3f6e92d..4da4d9f3a5eb 100644
--- a/metadata/md5-cache/app-admin/clustershell-1.6
+++ b/metadata/md5-cache/app-admin/clustershell-1.6
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/openssl python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/cea-hpc/clustershell/archive/v1.6.tar.gz -> clustershell-1.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5238b0e23eb3f3bdf428f11507e8482c
diff --git a/metadata/md5-cache/app-admin/clustershell-1.6-r1 b/metadata/md5-cache/app-admin/clustershell-1.6-r1
index c0b1d209d159..8750cce3f8b6 100644
--- a/metadata/md5-cache/app-admin/clustershell-1.6-r1
+++ b/metadata/md5-cache/app-admin/clustershell-1.6-r1
@@ -10,5 +10,5 @@ RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/cea-hpc/clustershell/archive/v1.6.tar.gz -> clustershell-1.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=52c1ad36e8e704af11dd98ed8639ce1e
diff --git a/metadata/md5-cache/app-admin/clustershell-1.7.3 b/metadata/md5-cache/app-admin/clustershell-1.7.3
index 9bceaeb07f90..be6be662c0e2 100644
--- a/metadata/md5-cache/app-admin/clustershell-1.7.3
+++ b/metadata/md5-cache/app-admin/clustershell-1.7.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/cea-hpc/clustershell/archive/v1.7.3.tar.gz -> clustershell-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6844bdac3679624cee682ee181e0d21f
diff --git a/metadata/md5-cache/app-admin/conky-1.10.8-r1 b/metadata/md5-cache/app-admin/conky-1.10.8-r1
index 2ad0303fa45e..90c42001fdd1 100644
--- a/metadata/md5-cache/app-admin/conky-1.10.8-r1
+++ b/metadata/md5-cache/app-admin/conky-1.10.8-r1
@@ -9,5 +9,5 @@ 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? ( >=virtual/mysql-5.0 ) 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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=b9be7e671803b455f40e4b35c0f014e3
diff --git a/metadata/md5-cache/app-admin/conky-1.10.8-r2 b/metadata/md5-cache/app-admin/conky-1.10.8-r2
index c71f829891ba..45a78c08c636 100644
--- a/metadata/md5-cache/app-admin/conky-1.10.8-r2
+++ b/metadata/md5-cache/app-admin/conky-1.10.8-r2
@@ -9,5 +9,5 @@ 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? ( >=virtual/mysql-5.0 ) 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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=002043cf7d74898c12f2eabc3559f87b
diff --git a/metadata/md5-cache/app-admin/conkyforecast-2.24-r1 b/metadata/md5-cache/app-admin/conkyforecast-2.24-r1
index 19e5f718305a..c51db9fbbb12 100644
--- a/metadata/md5-cache/app-admin/conkyforecast-2.24-r1
+++ b/metadata/md5-cache/app-admin/conkyforecast-2.24-r1
@@ -10,5 +10,5 @@ RDEPEND=app-admin/conky python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://launchpad.net/~conky-companions/+archive/ppa/+files/conkyforecast_2.24.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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e06c266547272f04567fd9641f82960b
diff --git a/metadata/md5-cache/app-admin/denyhosts-2.9 b/metadata/md5-cache/app-admin/denyhosts-2.9
index 1dd792ec2268..008ca4295935 100644
--- a/metadata/md5-cache/app-admin/denyhosts-2.9
+++ b/metadata/md5-cache/app-admin/denyhosts-2.9
@@ -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/denyhosts/denyhosts/archive/v2.9.tar.gz -> denyhosts-2.9.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	readme.gentoo	566393c426fca4615a83df9a982bb9d9	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	readme.gentoo	566393c426fca4615a83df9a982bb9d9	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e36ec6ddda1d4221a665185083c0e53e
diff --git a/metadata/md5-cache/app-admin/denyhosts-3.0 b/metadata/md5-cache/app-admin/denyhosts-3.0
index 41b9e574c4cc..3b57c8930a2b 100644
--- a/metadata/md5-cache/app-admin/denyhosts-3.0
+++ b/metadata/md5-cache/app-admin/denyhosts-3.0
@@ -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/denyhosts/denyhosts/archive/v3.0.tar.gz -> denyhosts-3.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	readme.gentoo	566393c426fca4615a83df9a982bb9d9	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	readme.gentoo	566393c426fca4615a83df9a982bb9d9	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=39ca360141575427014c961f9042e3c4
diff --git a/metadata/md5-cache/app-admin/denyhosts-3.0-r1 b/metadata/md5-cache/app-admin/denyhosts-3.0-r1
index 9134a6b295bf..bce238d17e3d 100644
--- a/metadata/md5-cache/app-admin/denyhosts-3.0-r1
+++ b/metadata/md5-cache/app-admin/denyhosts-3.0-r1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/denyhosts/denyhosts/archive/v3.0.tar.gz -> denyhosts-3.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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0eb116e1cb2532a0a76873473e84c81e
diff --git a/metadata/md5-cache/app-admin/diamond-4.0-r1 b/metadata/md5-cache/app-admin/diamond-4.0-r1
index 30631d942193..646608e8de8a 100644
--- a/metadata/md5-cache/app-admin/diamond-4.0-r1
+++ b/metadata/md5-cache/app-admin/diamond-4.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/configobj dev-python/setproctitle mongo? ( dev-python/pymongo
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/python-diamond/Diamond/archive/v4.0.tar.gz -> python-diamond-4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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_=79acd89829e3c52c64172fd7922d7c57
diff --git a/metadata/md5-cache/app-admin/diamond-4.0.515 b/metadata/md5-cache/app-admin/diamond-4.0.515
index 22b1c17fdc07..81e744bfd211 100644
--- a/metadata/md5-cache/app-admin/diamond-4.0.515
+++ b/metadata/md5-cache/app-admin/diamond-4.0.515
@@ -10,5 +10,5 @@ RDEPEND=dev-python/configobj dev-python/setproctitle mongo? ( dev-python/pymongo
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/python-diamond/Diamond/archive/v4.0.515.tar.gz -> python-diamond-4.0.515.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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_=0d101b970f663be463a1d7b1f2c8df48
diff --git a/metadata/md5-cache/app-admin/diamond-9999 b/metadata/md5-cache/app-admin/diamond-9999
index 6c90daeeca18..3bdf1c511332 100644
--- a/metadata/md5-cache/app-admin/diamond-9999
+++ b/metadata/md5-cache/app-admin/diamond-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-python/configobj dev-python/setproctitle mongo? ( dev-python/pymongo ) mysql? ( dev-python/mysql-python ) snmp? ( dev-python/pysnmp ) redis? ( dev-python/redis-py ) !kernel_linux? ( >=dev-python/psutil-3 ) python_targets_python2_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	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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_=7c0d4c9f143353de2b8bb0ceb484ef89
diff --git a/metadata/md5-cache/app-admin/dxf-7.3.0 b/metadata/md5-cache/app-admin/dxf-7.3.0
index 50881a7c98ce..9eb582c40186 100644
--- a/metadata/md5-cache/app-admin/dxf-7.3.0
+++ b/metadata/md5-cache/app-admin/dxf-7.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/davedoesdev/dxf/archive/v7.3.0.tar.gz -> dxf-7.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=733e3753e677d4263046b3e07a7605dc
diff --git a/metadata/md5-cache/app-admin/dxf-7.4.0 b/metadata/md5-cache/app-admin/dxf-7.4.0
index 7c0170b7cbb8..c57814db30fa 100644
--- a/metadata/md5-cache/app-admin/dxf-7.4.0
+++ b/metadata/md5-cache/app-admin/dxf-7.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/davedoesdev/dxf/archive/v7.4.0.tar.gz -> dxf-7.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=733e3753e677d4263046b3e07a7605dc
diff --git a/metadata/md5-cache/app-admin/dxf-7.4.1 b/metadata/md5-cache/app-admin/dxf-7.4.1
index f4ce848b48ff..1732c7589849 100644
--- a/metadata/md5-cache/app-admin/dxf-7.4.1
+++ b/metadata/md5-cache/app-admin/dxf-7.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/davedoesdev/dxf/archive/v7.4.1.tar.gz -> dxf-7.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=733e3753e677d4263046b3e07a7605dc
diff --git a/metadata/md5-cache/app-admin/eclean-kernel-0.4.2 b/metadata/md5-cache/app-admin/eclean-kernel-0.4.2
index 3b4ab5bcad87..14bff65b7642 100644
--- a/metadata/md5-cache/app-admin/eclean-kernel-0.4.2
+++ b/metadata/md5-cache/app-admin/eclean-kernel-0.4.2
@@ -10,5 +10,5 @@ RDEPEND=kernel_linux? ( dev-python/pymountboot[python_targets_pypy(-)?,python_ta
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://github.com/mgorny/eclean-kernel/releases/download/eclean-kernel-0.4.2/eclean-kernel-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=39b44f2e6723fd6fa40446294d8a216d
diff --git a/metadata/md5-cache/app-admin/elektra-0.8.16 b/metadata/md5-cache/app-admin/elektra-0.8.16
index e65299594aea..3fd267ca1b8d 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _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 450814b87a8e..061e2215fe93 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _md5_=6f3d8b00a3f8859cb52c4be963b9cefc
diff --git a/metadata/md5-cache/app-admin/gixy-0.1.5 b/metadata/md5-cache/app-admin/gixy-0.1.5
index 2f75d224a318..c81171715e3d 100644
--- a/metadata/md5-cache/app-admin/gixy-0.1.5
+++ b/metadata/md5-cache/app-admin/gixy-0.1.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pyparsing-1.5.5[python_targets_python2_7(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gixy/gixy-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5d2c6f22910b5bf7470a31f5d8cff987
diff --git a/metadata/md5-cache/app-admin/gixy-0.1.8 b/metadata/md5-cache/app-admin/gixy-0.1.8
index 1ff26a46aa41..e6368d3dc9e2 100644
--- a/metadata/md5-cache/app-admin/gixy-0.1.8
+++ b/metadata/md5-cache/app-admin/gixy-0.1.8
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pyparsing-1.5.5[python_targets_python2_7(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gixy/gixy-0.1.8.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5d2c6f22910b5bf7470a31f5d8cff987
diff --git a/metadata/md5-cache/app-admin/glance-15.0.1 b/metadata/md5-cache/app-admin/glance-15.0.1
index fc3884c71993..0a136eea82af 100644
--- a/metadata/md5-cache/app-admin/glance-15.0.1
+++ b/metadata/md5-cache/app-admin/glance-15.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://tarballs.openstack.org/glance/glance-15.0.1.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4a3683e15449336fad88022f61587dea
diff --git a/metadata/md5-cache/app-admin/glance-16.0.1 b/metadata/md5-cache/app-admin/glance-16.0.1
index ef78b2e350aa..fe5f0b0fb9ef 100644
--- a/metadata/md5-cache/app-admin/glance-16.0.1
+++ b/metadata/md5-cache/app-admin/glance-16.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://tarballs.openstack.org/glance/glance-16.0.1.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=766dc06da77a6016223887a703a666e5
diff --git a/metadata/md5-cache/app-admin/glance-17.0.0 b/metadata/md5-cache/app-admin/glance-17.0.0
index be469ce685a5..6a83099e2a93 100644
--- a/metadata/md5-cache/app-admin/glance-17.0.0
+++ b/metadata/md5-cache/app-admin/glance-17.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://tarballs.openstack.org/glance/glance-17.0.0.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fad30c06e07dffa065b04acecbd6b5f2
diff --git a/metadata/md5-cache/app-admin/glance-2017.2.9999 b/metadata/md5-cache/app-admin/glance-2017.2.9999
index f594be169841..0b92373ac61c 100644
--- a/metadata/md5-cache/app-admin/glance-2017.2.9999
+++ b/metadata/md5-cache/app-admin/glance-2017.2.9999
@@ -8,5 +8,5 @@ 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 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/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/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/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/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/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/python-sqlparse-0.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/alembic-0.8.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/httplib2-0.7.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/oslo-config-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/oslo-config-4.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-config-4.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/oslo-concurrency-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/oslo-context-2.14.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-utils-3.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/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/futurist-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/futurist-0.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(-)] >=dev-python/taskflow-2.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/keystoneauth-3.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/keystonemiddleware-4.12.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/WSME-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/prettytable-0.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/prettytable-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/paste[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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.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/jsonschema-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/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-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/pyopenssl-0.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/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-db-4.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-i18n-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/oslo-i18n-3.15.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.22.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.24.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-messaging-5.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-middleware-3.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-policy-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/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/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/glance_store-0.22.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/debtcollector-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/cryptography-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/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(-)] >=dev-python/cursive-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/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/monotonic-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( 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	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=eff6d6b54e09d7d7e5a20914523ff3e3
diff --git a/metadata/md5-cache/app-admin/glance-2018.1.9999 b/metadata/md5-cache/app-admin/glance-2018.1.9999
index 18cc6c318fe5..7a7b1cf4537f 100644
--- a/metadata/md5-cache/app-admin/glance-2018.1.9999
+++ b/metadata/md5-cache/app-admin/glance-2018.1.9999
@@ -8,5 +8,5 @@ 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/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(-)] 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/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/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/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/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/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/python-sqlparse-0.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/alembic-0.8.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/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/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-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/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/futurist-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/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/WSME-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/prettytable-0.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/prettytable-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/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/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-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/pyopenssl-16.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/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/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-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-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/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/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/glance_store-0.22.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/debtcollector-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/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(-)] >=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/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/monotonic-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( 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	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8f13d58eff61446c6946cec8cf688bb8
diff --git a/metadata/md5-cache/app-admin/glance-2018.2.9999 b/metadata/md5-cache/app-admin/glance-2018.2.9999
index f0f648685587..db051175a151 100644
--- a/metadata/md5-cache/app-admin/glance-2018.2.9999
+++ b/metadata/md5-cache/app-admin/glance-2018.2.9999
@@ -8,5 +8,5 @@ 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/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(-)] 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/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/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/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/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/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/python-sqlparse-0.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/alembic-0.8.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/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/oslo-config-5.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/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-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-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/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/futurist-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/keystoneauth-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/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/WSME-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/prettytable-0.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/prettytable-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/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/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-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/pyopenssl-17.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/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/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-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-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/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/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/glance_store-0.26.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/debtcollector-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/cryptography-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/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/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/monotonic-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( 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	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5b8b7b9e18f4865d27b56cb6ffad8501
diff --git a/metadata/md5-cache/app-admin/gnome-abrt-1.2.6 b/metadata/md5-cache/app-admin/gnome-abrt-1.2.6
index c7c8c495b592..dc88c3a680fe 100644
--- a/metadata/md5-cache/app-admin/gnome-abrt-1.2.6
+++ b/metadata/md5-cache/app-admin/gnome-abrt-1.2.6
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/abrt/gnome-abrt/archive/1.2.6.tar.gz -> gnome-abrt-1.2.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cd4f981f808c9ee58d22cf8097d4b13c
diff --git a/metadata/md5-cache/app-admin/gnome-system-log-3.9.90 b/metadata/md5-cache/app-admin/gnome-system-log-3.9.90
index cd5b0e7714e3..c91971e96203 100644
--- a/metadata/md5-cache/app-admin/gnome-system-log-3.9.90
+++ b/metadata/md5-cache/app-admin/gnome-system-log-3.9.90
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.31:2 sys-libs/zlib:= >=x11-libs/gtk+-3.9.11:3 x11-libs/pango gnome-base/gsettings-desktop-schemas !<gnome-extra/gnome-utils-3.4
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-system-log/3.9/gnome-system-log-3.9.90.tar.xz
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ca52f1934b9ebeaa5f34208c9fbbf245
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 353912ae535d..fd5bfe98bbff 100644
--- a/metadata/md5-cache/app-admin/hardinfo-0.5.2_pre20130823
+++ b/metadata/md5-cache/app-admin/hardinfo-0.5.2_pre20130823
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/app-admin/installer-0.1.1_beta b/metadata/md5-cache/app-admin/installer-0.1.1_beta
index 7d55d23ca80e..9ce4c27deb48 100644
--- a/metadata/md5-cache/app-admin/installer-0.1.1_beta
+++ b/metadata/md5-cache/app-admin/installer-0.1.1_beta
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4[ncurses(+)] ) python_tar
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/ChrisADR/installer/archive/v0.1.1-beta.tar.gz -> installer-0.1.1_beta.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=049422e998c0d1ab0241318bcf70717c
diff --git a/metadata/md5-cache/app-admin/keepass-2.38 b/metadata/md5-cache/app-admin/keepass-2.38
index 2ceccbecc2f0..d2b39bdf7804 100644
--- a/metadata/md5-cache/app-admin/keepass-2.38
+++ b/metadata/md5-cache/app-admin/keepass-2.38
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/mono dev-dotnet/libgdiplus[cairo]
 SLOT=0
 SRC_URI=mirror://sourceforge/keepass/KeePass-2.38-Source.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e051d8e91b7713454d1f76e57104d526
diff --git a/metadata/md5-cache/app-admin/keepass-2.39.1 b/metadata/md5-cache/app-admin/keepass-2.39.1
index ab60ac18dde5..48c9da8e38cc 100644
--- a/metadata/md5-cache/app-admin/keepass-2.39.1
+++ b/metadata/md5-cache/app-admin/keepass-2.39.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/mono dev-dotnet/libgdiplus[cairo]
 SLOT=0
 SRC_URI=mirror://sourceforge/keepass/KeePass-2.39.1-Source.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e3b851df940e57fa81a0340c992c8627
diff --git a/metadata/md5-cache/app-admin/keepass-2.40 b/metadata/md5-cache/app-admin/keepass-2.40
index 68feb951be1e..2af4e9bb1f78 100644
--- a/metadata/md5-cache/app-admin/keepass-2.40
+++ b/metadata/md5-cache/app-admin/keepass-2.40
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/mono dev-dotnet/libgdiplus[cairo]
 SLOT=0
 SRC_URI=mirror://sourceforge/keepass/KeePass-2.40-Source.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e3b851df940e57fa81a0340c992c8627
diff --git a/metadata/md5-cache/app-admin/keepass-2.40-r1 b/metadata/md5-cache/app-admin/keepass-2.40-r1
new file mode 100644
index 000000000000..271f0ba8db4b
--- /dev/null
+++ b/metadata/md5-cache/app-admin/keepass-2.40-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare
+DEPEND=dev-lang/mono app-arch/unzip >=sys-apps/sed-4
+DESCRIPTION=A free, open source, light-weight and easy-to-use password manager
+EAPI=6
+HOMEPAGE=https://keepass.info/
+IUSE=aot
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/mono dev-dotnet/libgdiplus[cairo]
+SLOT=0
+SRC_URI=mirror://sourceforge/keepass/KeePass-2.40-Source.zip
+_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_=24c1c55dce2f94ba934c6142e98b5f1d
diff --git a/metadata/md5-cache/app-admin/keepassxc-2.2.4 b/metadata/md5-cache/app-admin/keepassxc-2.2.4
index f166a0fd1cc3..892fa9c1d95b 100644
--- a/metadata/md5-cache/app-admin/keepassxc-2.2.4
+++ b/metadata/md5-cache/app-admin/keepassxc-2.2.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 GPL-2 GPL-3
 RDEPEND=dev-libs/libgcrypt:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) yubikey? ( sys-auth/ykpers )
 SLOT=0
 SRC_URI=https://github.com/keepassxreboot/keepassxc/archive/2.2.4.tar.gz -> keepassxc-2.2.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3c6877bedd87cd9e25bbf70d2e8b5475
diff --git a/metadata/md5-cache/app-admin/keepassxc-2.3.3 b/metadata/md5-cache/app-admin/keepassxc-2.3.3
index c00b96b6f7cb..43503806bd18 100644
--- a/metadata/md5-cache/app-admin/keepassxc-2.3.3
+++ b/metadata/md5-cache/app-admin/keepassxc-2.3.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 GPL-2 GPL-3
 RDEPEND=app-crypt/argon2:= dev-libs/libgcrypt:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) browser? ( >=dev-libs/libsodium-1.0.12 ) yubikey? ( sys-auth/ykpers )
 SLOT=0
 SRC_URI=https://github.com/keepassxreboot/keepassxc/releases/download/2.3.3/keepassxc-2.3.3-src.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0d0d48307624300d1b99fe66b2ba7d4e
diff --git a/metadata/md5-cache/app-admin/keepassxc-2.3.4 b/metadata/md5-cache/app-admin/keepassxc-2.3.4
index 52670364c1f1..d5ab913178ee 100644
--- a/metadata/md5-cache/app-admin/keepassxc-2.3.4
+++ b/metadata/md5-cache/app-admin/keepassxc-2.3.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 GPL-2 GPL-3
 RDEPEND=app-crypt/argon2:= dev-libs/libgcrypt:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) browser? ( >=dev-libs/libsodium-1.0.12 ) yubikey? ( sys-auth/ykpers )
 SLOT=0
 SRC_URI=https://github.com/keepassxreboot/keepassxc/releases/download/2.3.4/keepassxc-2.3.4-src.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f5635a6bce7f3c01798ac3b7055da374
diff --git a/metadata/md5-cache/app-admin/keepassxc-9999 b/metadata/md5-cache/app-admin/keepassxc-9999
index 4261985ff2d5..f7ac305c63eb 100644
--- a/metadata/md5-cache/app-admin/keepassxc-9999
+++ b/metadata/md5-cache/app-admin/keepassxc-9999
@@ -7,5 +7,5 @@ IUSE=autotype browser debug network test yubikey
 LICENSE=LGPL-2.1 GPL-2 GPL-3
 RDEPEND=app-crypt/argon2:= dev-libs/libgcrypt:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) browser? ( >=dev-libs/libsodium-1.0.12 ) yubikey? ( sys-auth/ykpers )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=74b8625ac0bfb0918acb11fd15c974b4
diff --git a/metadata/md5-cache/app-admin/lastpass-cli-1.3.1-r1 b/metadata/md5-cache/app-admin/lastpass-cli-1.3.1-r1
index 359804f9faf0..8d06d10167a8 100644
--- a/metadata/md5-cache/app-admin/lastpass-cli-1.3.1-r1
+++ b/metadata/md5-cache/app-admin/lastpass-cli-1.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ GPL-2+-with-openssl-exception
 RDEPEND=X? ( || ( x11-misc/xclip x11-misc/xsel ) ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-misc/curl dev-libs/libxml2 pinentry? ( app-crypt/pinentry )
 SLOT=0
 SRC_URI=https://github.com/lastpass/lastpass-cli/archive/v1.3.1.tar.gz -> lastpass-cli-1.3.1.tar.gz https://dev.gentoo.org/~gokturk/distfiles/app-admin/lastpass-cli/lastpass-cli-man-1.3.1.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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_=1023b67d1ca885ec126009086615318a
diff --git a/metadata/md5-cache/app-admin/logstash-bin-5.6.11 b/metadata/md5-cache/app-admin/logstash-bin-5.6.11
deleted file mode 100644
index f79c683ff57e..000000000000
--- a/metadata/md5-cache/app-admin/logstash-bin-5.6.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare setup
-DEPEND=>=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Tool for managing events and logs
-EAPI=6
-HOMEPAGE=https://www.elastic.co/products/logstash
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 MIT
-RDEPEND=virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://artifacts.elastic.co/downloads/logstash/logstash-5.6.11.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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=0ef73307c027ed39182b0967fdea6058
diff --git a/metadata/md5-cache/app-admin/logstash-bin-5.6.12 b/metadata/md5-cache/app-admin/logstash-bin-5.6.12
new file mode 100644
index 000000000000..2659f6f8d6a2
--- /dev/null
+++ b/metadata/md5-cache/app-admin/logstash-bin-5.6.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst preinst prepare setup
+DEPEND=>=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Tool for managing events and logs
+EAPI=6
+HOMEPAGE=https://www.elastic.co/products/logstash
+IUSE=elibc_FreeBSD
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 MIT
+RDEPEND=virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://artifacts.elastic.co/downloads/logstash/logstash-5.6.12.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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=535f86d32c10fba105937f36d30d3279
diff --git a/metadata/md5-cache/app-admin/logstash-bin-6.4.0 b/metadata/md5-cache/app-admin/logstash-bin-6.4.0
deleted file mode 100644
index 5f882e56e458..000000000000
--- a/metadata/md5-cache/app-admin/logstash-bin-6.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare setup
-DEPEND=>=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Tool for managing events and logs
-EAPI=6
-HOMEPAGE=https://www.elastic.co/products/logstash
-IUSE=x-pack elibc_FreeBSD
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 MIT x-pack? ( Elastic )
-RDEPEND=virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
-RESTRICT=strip
-SLOT=0
-SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-6.4.0.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-oss-6.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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=e7b109041bf388386408ac4425bfb569
diff --git a/metadata/md5-cache/app-admin/logstash-bin-6.4.1 b/metadata/md5-cache/app-admin/logstash-bin-6.4.1
new file mode 100644
index 000000000000..0fddbd253d24
--- /dev/null
+++ b/metadata/md5-cache/app-admin/logstash-bin-6.4.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst preinst prepare setup
+DEPEND=>=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Tool for managing events and logs
+EAPI=6
+HOMEPAGE=https://www.elastic.co/products/logstash
+IUSE=x-pack elibc_FreeBSD
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 MIT x-pack? ( Elastic )
+RDEPEND=virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
+RESTRICT=strip
+SLOT=0
+SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-6.4.1.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-oss-6.4.1.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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=b1610d07e2c0ecb48b03059e60ded616
diff --git a/metadata/md5-cache/app-admin/longrun-0.9-r4 b/metadata/md5-cache/app-admin/longrun-0.9-r4
index 54c9546b859b..84106fc0e8b2 100644
--- a/metadata/md5-cache/app-admin/longrun-0.9-r4
+++ b/metadata/md5-cache/app-admin/longrun-0.9-r4
@@ -8,5 +8,5 @@ KEYWORDS=-ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/cpu/crusoe/longrun-0.9.tar.bz2 mirror://debian/pool/main/l/longrun/longrun_0.9-19.diff.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=e8dc922d1cbe5bf03d864f2e05fc3afb
diff --git a/metadata/md5-cache/app-admin/lsyncd-2.2.0 b/metadata/md5-cache/app-admin/lsyncd-2.2.0
index 1f63cd766572..085e456f1172 100644
--- a/metadata/md5-cache/app-admin/lsyncd-2.2.0
+++ b/metadata/md5-cache/app-admin/lsyncd-2.2.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/lua-5.1[deprecated] net-misc/rsync
 SLOT=0
 SRC_URI=https://github.com/axkibe/lsyncd/archive/release-2.2.0.tar.gz -> lsyncd-2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4981d552786db0e49354b2a94a317d79
diff --git a/metadata/md5-cache/app-admin/lsyncd-2.2.1 b/metadata/md5-cache/app-admin/lsyncd-2.2.1
index 0448fd428349..6eb7fa8578bb 100644
--- a/metadata/md5-cache/app-admin/lsyncd-2.2.1
+++ b/metadata/md5-cache/app-admin/lsyncd-2.2.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/lua-5.1[deprecated] net-misc/rsync
 SLOT=0
 SRC_URI=https://github.com/axkibe/lsyncd/archive/release-2.2.1.tar.gz -> lsyncd-2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4210704e02d6d7eb1de8170c85f7836d
diff --git a/metadata/md5-cache/app-admin/lsyncd-2.2.2 b/metadata/md5-cache/app-admin/lsyncd-2.2.2
index c72d171569d2..cf0c90bd57cc 100644
--- a/metadata/md5-cache/app-admin/lsyncd-2.2.2
+++ b/metadata/md5-cache/app-admin/lsyncd-2.2.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/lua-5.1[deprecated] net-misc/rsync
 SLOT=0
 SRC_URI=https://github.com/axkibe/lsyncd/archive/release-2.2.2.tar.gz -> lsyncd-2.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=4210704e02d6d7eb1de8170c85f7836d
diff --git a/metadata/md5-cache/app-admin/mcelog-154 b/metadata/md5-cache/app-admin/mcelog-154
index 7c0f90c94153..fd0c12f5aa18 100644
--- a/metadata/md5-cache/app-admin/mcelog-154
+++ b/metadata/md5-cache/app-admin/mcelog-154
@@ -10,5 +10,5 @@ RDEPEND=selinux? ( sec-policy/selinux-mcelog )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/andikleen/mcelog/archive/v154.tar.gz -> mcelog-154.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=8e83de01998ea0fd06e33b0a340c7d22
diff --git a/metadata/md5-cache/app-admin/mcelog-160 b/metadata/md5-cache/app-admin/mcelog-160
index 54e99d6c5d30..75114b15a204 100644
--- a/metadata/md5-cache/app-admin/mcelog-160
+++ b/metadata/md5-cache/app-admin/mcelog-160
@@ -10,5 +10,5 @@ RDEPEND=selinux? ( sec-policy/selinux-mcelog )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/andikleen/mcelog/archive/v160.tar.gz -> mcelog-160.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=8b7525d95dc6ffdfb39b349410f4bc81
diff --git a/metadata/md5-cache/app-admin/mcelog-161 b/metadata/md5-cache/app-admin/mcelog-161
index 5d49b44a4c38..976c267b7085 100644
--- a/metadata/md5-cache/app-admin/mcelog-161
+++ b/metadata/md5-cache/app-admin/mcelog-161
@@ -10,5 +10,5 @@ RDEPEND=selinux? ( sec-policy/selinux-mcelog )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/andikleen/mcelog/archive/v161.tar.gz -> mcelog-161.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=5f79d113f90001096a75c64dcbf3fa4f
diff --git a/metadata/md5-cache/app-admin/mei-amt-check-0_p20170515 b/metadata/md5-cache/app-admin/mei-amt-check-0_p20170515
index 30867eb09b6b..2d9c87de68d5 100644
--- a/metadata/md5-cache/app-admin/mei-amt-check-0_p20170515
+++ b/metadata/md5-cache/app-admin/mei-amt-check-0_p20170515
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/mjg59/mei-amt-check/archive/d07672120ce7a0c79e949e537f3d19efecec1700.tar.gz -> mei-amt-check-0_p20170515.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-snapshot	b77011b62e2053c646ad720defe6d921
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-snapshot	b77011b62e2053c646ad720defe6d921
 _md5_=84a83d459cb2c0fefb1aa1a67ec433ff
diff --git a/metadata/md5-cache/app-admin/ngxtop-0.0.2-r1 b/metadata/md5-cache/app-admin/ngxtop-0.0.2-r1
index 6056e978413a..512a7eff623a 100644
--- a/metadata/md5-cache/app-admin/ngxtop-0.0.2-r1
+++ b/metadata/md5-cache/app-admin/ngxtop-0.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/docopt[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://github.com/lebinh/ngxtop/archive/0.0.2.tar.gz -> ngxtop-0.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=976c6b7cfef73c9aa1a6ac26923b5983
diff --git a/metadata/md5-cache/app-admin/ngxtop-0.0.3_pre141201 b/metadata/md5-cache/app-admin/ngxtop-0.0.3_pre141201
index 1bc95a3fa950..d7bcd5eb7457 100644
--- a/metadata/md5-cache/app-admin/ngxtop-0.0.3_pre141201
+++ b/metadata/md5-cache/app-admin/ngxtop-0.0.3_pre141201
@@ -10,5 +10,5 @@ RDEPEND=dev-python/docopt[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/ngxtop-0.0.3_pre141201.tar.xz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a8931f58b8f568a626c90d32185b1582
diff --git a/metadata/md5-cache/app-admin/packagekit-base-1.1.7-r2 b/metadata/md5-cache/app-admin/packagekit-base-1.1.7-r2
index f14c0355d694..7c90d5069668 100644
--- a/metadata/md5-cache/app-admin/packagekit-base-1.1.7-r2
+++ b/metadata/md5-cache/app-admin/packagekit-base-1.1.7-r2
@@ -10,5 +10,5 @@ RDEPEND=>=app-shells/bash-completion-2 dev-db/sqlite:3 >=dev-libs/dbus-glib-0.74
 REQUIRED_USE=python_targets_python2_7 ?? ( elogind systemd ) vala? ( introspection )
 SLOT=0/18
 SRC_URI=https://www.freedesktop.org/software/PackageKit/releases/PackageKit-1.1.7.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=254b8d3c5776981e0de95b5688d7ec79
diff --git a/metadata/md5-cache/app-admin/packagekit-qt-1.0.0 b/metadata/md5-cache/app-admin/packagekit-qt-1.0.0
index 35bc75c812d3..324c15c5439c 100644
--- a/metadata/md5-cache/app-admin/packagekit-qt-1.0.0
+++ b/metadata/md5-cache/app-admin/packagekit-qt-1.0.0
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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/packagekit-qt-1.0.1 b/metadata/md5-cache/app-admin/packagekit-qt-1.0.1
index ca05b99f158f..9802fa2c08c5 100644
--- a/metadata/md5-cache/app-admin/packagekit-qt-1.0.1
+++ b/metadata/md5-cache/app-admin/packagekit-qt-1.0.1
@@ -8,5 +8,5 @@ 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.1.tar.gz -> packagekit-qt-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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/passwordsafe-1.06_beta-r1 b/metadata/md5-cache/app-admin/passwordsafe-1.06_beta-r1
index 77297df22def..255a6a9d8fe5 100644
--- a/metadata/md5-cache/app-admin/passwordsafe-1.06_beta-r1
+++ b/metadata/md5-cache/app-admin/passwordsafe-1.06_beta-r1
@@ -9,5 +9,5 @@ LICENSE=Artistic-2
 RDEPEND=xml? ( dev-libs/xerces-c ) qr? ( media-gfx/qrencode ) sys-apps/util-linux x11-libs/libXt x11-libs/libXtst x11-libs/wxGTK:3.0-gtk3[X] !minimal? ( !!app-misc/pwsafe ) yubikey? ( sys-auth/ykpers )
 SLOT=0
 SRC_URI=https://github.com/pwsafe/pwsafe/archive/1.06BETA.tar.gz -> passwordsafe-1.06_beta.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f1fd569e94b21e259607363aa6401e6f
diff --git a/metadata/md5-cache/app-admin/ps_mem-3.12 b/metadata/md5-cache/app-admin/ps_mem-3.12
index 2b906028b3e2..4afd25a3734c 100644
--- a/metadata/md5-cache/app-admin/ps_mem-3.12
+++ b/metadata/md5-cache/app-admin/ps_mem-3.12
@@ -10,5 +10,5 @@ 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_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/pixelb/ps_mem/archive/v3.12.tar.gz -> ps_mem-3.12.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cdeefa35955a123f68b02497a81e0532
diff --git a/metadata/md5-cache/app-admin/ps_mem-3.12-r1 b/metadata/md5-cache/app-admin/ps_mem-3.12-r1
index be3ec6e6e4ba..7a5c9ec340a8 100644
--- a/metadata/md5-cache/app-admin/ps_mem-3.12-r1
+++ b/metadata/md5-cache/app-admin/ps_mem-3.12-r1
@@ -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_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 )
 SLOT=0
 SRC_URI=https://github.com/pixelb/ps_mem/archive/v3.12.tar.gz -> ps_mem-3.12.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6b9dcfdeb767bb3347dcac3e75453a98
diff --git a/metadata/md5-cache/app-admin/ps_mem-3.13 b/metadata/md5-cache/app-admin/ps_mem-3.13
index 25c2013e37e9..b52e29b178e0 100644
--- a/metadata/md5-cache/app-admin/ps_mem-3.13
+++ b/metadata/md5-cache/app-admin/ps_mem-3.13
@@ -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_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/pixelb/ps_mem/tarball/9f54e1aa3a87ec176ce8b71f02673e0d8293b344 -> ps_mem-3.13.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ac029abeafadd3558c6b6d9275c4034a
diff --git a/metadata/md5-cache/app-admin/puppet-6.0.0 b/metadata/md5-cache/app-admin/puppet-6.0.0
deleted file mode 100644
index 4431c0264010..000000000000
--- a/metadata/md5-cache/app-admin/puppet-6.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] dev-ruby/semantic_puppet[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] dev-ruby/semantic_puppet[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25] dev-ruby/json:=[ruby_targets_ruby25] dev-ruby/semantic_puppet[ruby_targets_ruby25] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25] ) virtual/ruby-ssl[ruby_targets_ruby25] dev-ruby/hocon[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/mocha[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] dev-ruby/rspec-its[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) test? ( dev-ruby/mocha[ruby_targets_ruby24] dev-ruby/rack[ruby_targets_ruby24] dev-ruby/rspec-its[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25] ) test? ( dev-ruby/mocha[ruby_targets_ruby25] dev-ruby/rack[ruby_targets_ruby25] dev-ruby/rspec-its[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/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[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 system automation and configuration management software.
-EAPI=6
-HOMEPAGE=http://puppetlabs.com/
-IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
-LICENSE=Apache-2.0 GPL-2
-PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
-RDEPEND=ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] dev-ruby/semantic_puppet[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] dev-ruby/semantic_puppet[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25] dev-ruby/json:=[ruby_targets_ruby25] dev-ruby/semantic_puppet[ruby_targets_ruby25] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25] ) virtual/ruby-ssl[ruby_targets_ruby25] dev-ruby/hocon[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] dev-ruby/semantic_puppet[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] dev-ruby/semantic_puppet[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25] dev-ruby/json:=[ruby_targets_ruby25] dev-ruby/semantic_puppet[ruby_targets_ruby25] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25] ) virtual/ruby-ssl[ruby_targets_ruby25] dev-ruby/hocon[ruby_targets_ruby25] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 ruby_targets_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=http://downloads.puppetlabs.com/puppet/puppet-6.0.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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ee307e7bcc70d21e08c5386d559e5863
diff --git a/metadata/md5-cache/app-admin/puppet-6.0.2 b/metadata/md5-cache/app-admin/puppet-6.0.2
new file mode 100644
index 000000000000..a572fa5e206e
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppet-6.0.2
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] dev-ruby/semantic_puppet[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] dev-ruby/semantic_puppet[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25] dev-ruby/json:=[ruby_targets_ruby25] dev-ruby/semantic_puppet[ruby_targets_ruby25] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25] ) virtual/ruby-ssl[ruby_targets_ruby25] dev-ruby/hocon[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/mocha[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] dev-ruby/rspec-its[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) test? ( dev-ruby/mocha[ruby_targets_ruby24] dev-ruby/rack[ruby_targets_ruby24] dev-ruby/rspec-its[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25] ) test? ( dev-ruby/mocha[ruby_targets_ruby25] dev-ruby/rack[ruby_targets_ruby25] dev-ruby/rspec-its[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/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[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 system automation and configuration management software.
+EAPI=6
+HOMEPAGE=http://puppetlabs.com/
+IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+LICENSE=Apache-2.0 GPL-2
+PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
+RDEPEND=ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] dev-ruby/semantic_puppet[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] dev-ruby/semantic_puppet[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25] dev-ruby/json:=[ruby_targets_ruby25] dev-ruby/semantic_puppet[ruby_targets_ruby25] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25] ) virtual/ruby-ssl[ruby_targets_ruby25] dev-ruby/hocon[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] dev-ruby/semantic_puppet[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] dev-ruby/semantic_puppet[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25] dev-ruby/json:=[ruby_targets_ruby25] dev-ruby/semantic_puppet[ruby_targets_ruby25] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25] ) virtual/ruby-ssl[ruby_targets_ruby25] dev-ruby/hocon[ruby_targets_ruby25] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 ruby_targets_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=http://downloads.puppetlabs.com/puppet/puppet-6.0.2.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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=67145429bfcb59fa98ee31067b6f2aa5
diff --git a/metadata/md5-cache/app-admin/puppet-agent-6.0.0 b/metadata/md5-cache/app-admin/puppet-agent-6.0.0
deleted file mode 100644
index 872ff9ac3110..000000000000
--- a/metadata/md5-cache/app-admin/puppet-agent-6.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install setup unpack
-DEPEND=!app-admin/augeas !app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-what virtual/pkgconfig
-DESCRIPTION=general puppet client utils along with hiera and facter
-EAPI=6
-HOMEPAGE=https://puppetlabs.com/
-IUSE=puppetdb selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=!app-admin/augeas !app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-what app-portage/eix sys-apps/dmidecode sys-libs/glibc sys-libs/readline:0/7 sys-libs/ncurses:0[tinfo] selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )
-RESTRICT=strip
-SLOT=0
-SRC_URI=amd64? ( http://apt.puppetlabs.com/pool/stretch/puppet/p/puppet-agent/puppet-agent_6.0.0-1stretch_amd64.deb ) x86? ( http://apt.puppetlabs.com/pool/stretch/puppet/p/puppet-agent/puppet-agent_6.0.0-1stretch_i386.deb )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2db33d2f57241fae89e84810463f163f
diff --git a/metadata/md5-cache/app-admin/puppet-agent-6.0.2 b/metadata/md5-cache/app-admin/puppet-agent-6.0.2
new file mode 100644
index 000000000000..5e81a9aa428a
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppet-agent-6.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install setup unpack
+DEPEND=!app-admin/augeas !app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-what virtual/pkgconfig
+DESCRIPTION=general puppet client utils along with hiera and facter
+EAPI=6
+HOMEPAGE=https://puppetlabs.com/
+IUSE=puppetdb selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=!app-admin/augeas !app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-what app-portage/eix sys-apps/dmidecode sys-libs/glibc sys-libs/readline:0/7 sys-libs/ncurses:0[tinfo] selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )
+RESTRICT=strip
+SLOT=0
+SRC_URI=amd64? ( http://apt.puppetlabs.com/pool/stretch/puppet/p/puppet-agent/puppet-agent_6.0.2-1stretch_amd64.deb ) x86? ( http://apt.puppetlabs.com/pool/stretch/puppet/p/puppet-agent/puppet-agent_6.0.2-1stretch_i386.deb )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=131bdc2f52b5eec39008c82937f2dbaa
diff --git a/metadata/md5-cache/app-admin/puppetserver-6.0.0-r1 b/metadata/md5-cache/app-admin/puppetserver-6.0.0-r1
deleted file mode 100644
index d20aa71f19cc..000000000000
--- a/metadata/md5-cache/app-admin/puppetserver-6.0.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Puppet Server is the next-generation application for managing Puppet agents.
-EAPI=6
-HOMEPAGE=http://docs.puppetlabs.com/puppetserver/
-IUSE=puppetdb
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.8.0 app-admin/puppet-agent[puppetdb?] virtual/tmpfiles
-SLOT=0
-SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-6.0.0.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=27b560adb0bd8b228d5c0acec0e8e9bf
diff --git a/metadata/md5-cache/app-admin/puppetserver-6.0.1 b/metadata/md5-cache/app-admin/puppetserver-6.0.1
new file mode 100644
index 000000000000..80cf22ab4cf4
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppetserver-6.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare setup
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Puppet Server is the next-generation application for managing Puppet agents.
+EAPI=6
+HOMEPAGE=http://docs.puppetlabs.com/puppetserver/
+IUSE=puppetdb
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jdk-1.8.0 app-admin/puppet-agent[puppetdb?] virtual/tmpfiles
+SLOT=0
+SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-6.0.1.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=b42fd8bfc7852207b8ccad2ef0457ffe
diff --git a/metadata/md5-cache/app-admin/pwman3-0.9.11 b/metadata/md5-cache/app-admin/pwman3-0.9.11
index 397bcca917c0..970a25d2f015 100644
--- a/metadata/md5-cache/app-admin/pwman3-0.9.11
+++ b/metadata/md5-cache/app-admin/pwman3-0.9.11
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/cryptography-2.3[python_targets_python3_5(-)?,python_target
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/pwman3/pwman3/archive/v0.9.11.tar.gz -> pwman3-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c287eb821f06bcc68731303eafd6bb98
diff --git a/metadata/md5-cache/app-admin/rasdaemon-0.6.1-r1 b/metadata/md5-cache/app-admin/rasdaemon-0.6.1-r1
index 73af71aa53b3..b65088d51a1a 100644
--- a/metadata/md5-cache/app-admin/rasdaemon-0.6.1-r1
+++ b/metadata/md5-cache/app-admin/rasdaemon-0.6.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-devel/gettext dev-db/sqlite sys-apps/dmidecode dev-perl/DBD-SQLite
 SLOT=0
 SRC_URI=http://www.infradead.org/~mchehab/rasdaemon/rasdaemon-0.6.1.tar.bz2
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=489fdeb54636b3e25b20331db0f6ae75
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.35.0-r1 b/metadata/md5-cache/app-admin/rsyslog-8.35.0-r1
index 18ae020107b4..ced243e2d964 100644
--- a/metadata/md5-cache/app-admin/rsyslog-8.35.0-r1
+++ b/metadata/md5-cache/app-admin/rsyslog-8.35.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=dev-libs/libl
 REQUIRED_USE=kubernetes? ( normalize )
 SLOT=0
 SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.35.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.35.0.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7a18647195d980299c7d3517b0929108
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.36.0-r1 b/metadata/md5-cache/app-admin/rsyslog-8.36.0-r1
index c529b276874f..60b27f54f091 100644
--- a/metadata/md5-cache/app-admin/rsyslog-8.36.0-r1
+++ b/metadata/md5-cache/app-admin/rsyslog-8.36.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib
 REQUIRED_USE=kubernetes? ( normalize ) ssl? ( || ( gnutls openssl ) )
 SLOT=0
 SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.36.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.36.0.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a315c8122e5544f893929aa01e58498d
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.37.0 b/metadata/md5-cache/app-admin/rsyslog-8.37.0
index 517149d52973..24ae357116d9 100644
--- a/metadata/md5-cache/app-admin/rsyslog-8.37.0
+++ b/metadata/md5-cache/app-admin/rsyslog-8.37.0
@@ -11,5 +11,5 @@ REQUIRED_USE=kubernetes? ( normalize ) ssl? ( || ( gnutls openssl ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.37.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.37.0.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5313a66945057476f4228653626e9f41
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.38.0 b/metadata/md5-cache/app-admin/rsyslog-8.38.0
index 5bec48e0e8ff..30156288af00 100644
--- a/metadata/md5-cache/app-admin/rsyslog-8.38.0
+++ b/metadata/md5-cache/app-admin/rsyslog-8.38.0
@@ -4,12 +4,12 @@ DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
 EAPI=6
 HOMEPAGE=https://www.rsyslog.com/
 IUSE=curl dbi debug doc elasticsearch +gcrypt grok gnutls jemalloc kafka kerberos kubernetes libressl mdblookup mongodb mysql normalize omhttp omhttpfs omudpspoof openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid xxhash zeromq kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa x86
 LICENSE=GPL-3 LGPL-3 Apache-2.0
 RDEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) grok? ( >=dev-libs/grok-0.9.2 ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( virtual/libmysqlclient:= ) normalize? ( >=dev-libs/libee-0.4.0 >=dev-libs/liblognorm-2.0.3:= ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) libressl? ( dev-libs/libressl:= ) ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-3.0.2 )
 REQUIRED_USE=kubernetes? ( normalize ) ssl? ( || ( gnutls openssl ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.38.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.38.0.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5217de86e7b18ed57e7c02ce6c4fb9a7
+_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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7b4e5cbf7be3b76308301706efa9dbb8
diff --git a/metadata/md5-cache/app-admin/salt-2016.11.9-r2 b/metadata/md5-cache/app-admin/salt-2016.11.9-r2
index b7bd7f8f5e71..5291df34afd1 100644
--- a/metadata/md5-cache/app-admin/salt-2016.11.9-r2
+++ b/metadata/md5-cache/app-admin/salt-2016.11.9-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( raet zeromq ) || ( python_targets_python2_7 )
 RESTRICT=x86? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/salt/salt-2016.11.9.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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=a0f5134fe7bd62880a685e22b2439673
diff --git a/metadata/md5-cache/app-admin/salt-2017.7.7 b/metadata/md5-cache/app-admin/salt-2017.7.7
index e95c31e8bef6..ecfebe8c1cd9 100644
--- a/metadata/md5-cache/app-admin/salt-2017.7.7
+++ b/metadata/md5-cache/app-admin/salt-2017.7.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( raet zeromq ) || ( python_targets_python2_7 )
 RESTRICT=x86? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/salt/salt-2017.7.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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=ac02b82a216f598c0f031ac14a44c20f
diff --git a/metadata/md5-cache/app-admin/salt-2018.3.2 b/metadata/md5-cache/app-admin/salt-2018.3.2
index 0cf83a608a17..401ac468181b 100644
--- a/metadata/md5-cache/app-admin/salt-2018.3.2
+++ b/metadata/md5-cache/app-admin/salt-2018.3.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( raet zeromq ) || ( python_targets_python2_7 python_targets_pyt
 RESTRICT=x86? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/salt/salt-2018.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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=96885f21e8a44b083c93c2a23b16c168
diff --git a/metadata/md5-cache/app-admin/setools-4.1.1 b/metadata/md5-cache/app-admin/setools-4.1.1
index c2ef39477a11..9ac8a5407233 100644
--- a/metadata/md5-cache/app-admin/setools-4.1.1
+++ b/metadata/md5-cache/app-admin/setools-4.1.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/TresysTechnology/setools/archive/4.1.1.tar.gz -> setools-4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f419304217c72f505e88ec9a7b963343
diff --git a/metadata/md5-cache/app-admin/setools-4.1.1-r1 b/metadata/md5-cache/app-admin/setools-4.1.1-r1
index 1e840a7b4cde..2828d5a43459 100644
--- a/metadata/md5-cache/app-admin/setools-4.1.1-r1
+++ b/metadata/md5-cache/app-admin/setools-4.1.1-r1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/TresysTechnology/setools/archive/4.1.1.tar.gz -> setools-4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=08102fd6f3783f14d00631e1f8b5d3f8
diff --git a/metadata/md5-cache/app-admin/setools-9999 b/metadata/md5-cache/app-admin/setools-9999
index 7544b164011b..96311507730d 100644
--- a/metadata/md5-cache/app-admin/setools-9999
+++ b/metadata/md5-cache/app-admin/setools-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=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/libsepol-2.7:= >=sys-libs/libselinux-2.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/networkx-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(-)] 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-libs/libpcre:= X? ( dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=08102fd6f3783f14d00631e1f8b5d3f8
diff --git a/metadata/md5-cache/app-admin/spectre-meltdown-checker-0.40 b/metadata/md5-cache/app-admin/spectre-meltdown-checker-0.40
new file mode 100644
index 000000000000..397f50d581d4
--- /dev/null
+++ b/metadata/md5-cache/app-admin/spectre-meltdown-checker-0.40
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=Spectre & Meltdown vulnerability/mitigation checker for Linux
+EAPI=7
+HOMEPAGE=https://github.com/speed47/spectre-meltdown-checker
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3+
+SLOT=0
+SRC_URI=https://github.com/speed47/spectre-meltdown-checker/archive/v0.40.tar.gz -> spectre-meltdown-checker-0.40.tar.gz
+_md5_=5d0f4475112c4d49add828a4016c7ba2
diff --git a/metadata/md5-cache/app-admin/sudo-1.8.25_p1 b/metadata/md5-cache/app-admin/sudo-1.8.25_p1
deleted file mode 100644
index 5f7c7e5dd312..000000000000
--- a/metadata/md5-cache/app-admin/sudo-1.8.25_p1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=sys-libs/zlib:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) sys-devel/bison >=app-portage/elt-patches-20170815
-DESCRIPTION=Allows users or groups to run commands as other users
-EAPI=6
-HOMEPAGE=https://www.sudo.ws/
-IUSE=gcrypt ldap nls offensive openssl pam sasl selinux +sendmail skey
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris
-LICENSE=ISC BSD
-RDEPEND=sys-libs/zlib:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) >=app-misc/editor-wrapper-3 virtual/editor ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta ) virtual/tmpfiles
-REQUIRED_USE=pam? ( !skey ) skey? ( !pam ) ?? ( gcrypt openssl )
-SLOT=0
-SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.8.25p1.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.8.25p1.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	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4287de7ee7c7b7f86ecbf2c7af70182b
diff --git a/metadata/md5-cache/app-admin/sudo-1.8.25_p1-r1 b/metadata/md5-cache/app-admin/sudo-1.8.25_p1-r1
new file mode 100644
index 000000000000..449e2121d00e
--- /dev/null
+++ b/metadata/md5-cache/app-admin/sudo-1.8.25_p1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=sys-libs/zlib:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) sssd? ( sys-auth/sssd[sudo] ) sys-devel/bison >=app-portage/elt-patches-20170815
+DESCRIPTION=Allows users or groups to run commands as other users
+EAPI=6
+HOMEPAGE=https://www.sudo.ws/
+IUSE=gcrypt ldap nls offensive openssl pam sasl selinux +sendmail skey sssd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris
+LICENSE=ISC BSD
+RDEPEND=sys-libs/zlib:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) sssd? ( sys-auth/sssd[sudo] ) >=app-misc/editor-wrapper-3 virtual/editor ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta ) virtual/tmpfiles
+REQUIRED_USE=pam? ( !skey ) skey? ( !pam ) ?? ( gcrypt openssl )
+SLOT=0
+SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.8.25p1.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.8.25p1.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	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c79a2e793352539bd030e3e0d9355605
diff --git a/metadata/md5-cache/app-admin/supernova-2.2.0 b/metadata/md5-cache/app-admin/supernova-2.2.0
index 621508556d97..890d22aa22c1 100644
--- a/metadata/md5-cache/app-admin/supernova-2.2.0
+++ b/metadata/md5-cache/app-admin/supernova-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/supernova/supernova-2.2.0.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=33c596e0007960eb274f14156296256b
diff --git a/metadata/md5-cache/app-admin/supervisor-3.1.4 b/metadata/md5-cache/app-admin/supervisor-3.1.4
index 37b49cc564d8..1e42973692e9 100644
--- a/metadata/md5-cache/app-admin/supervisor-3.1.4
+++ b/metadata/md5-cache/app-admin/supervisor-3.1.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/meld3[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/supervisor/supervisor-3.1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5eea46651bf2bb0755e94b1ffa74456c
diff --git a/metadata/md5-cache/app-admin/supervisor-3.3.3 b/metadata/md5-cache/app-admin/supervisor-3.3.3
index 943b7b49f166..65a8885dc40e 100644
--- a/metadata/md5-cache/app-admin/supervisor-3.3.3
+++ b/metadata/md5-cache/app-admin/supervisor-3.3.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/meld3[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/supervisor/supervisor-3.3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2ac4945cac374960fb4bdafabad8a40a
diff --git a/metadata/md5-cache/app-admin/supervisor-3.3.4 b/metadata/md5-cache/app-admin/supervisor-3.3.4
index 20c254ed977e..861c98deb227 100644
--- a/metadata/md5-cache/app-admin/supervisor-3.3.4
+++ b/metadata/md5-cache/app-admin/supervisor-3.3.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/meld3[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/supervisor/supervisor-3.3.4.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f44653197cc52ed3a2bd1bb1e027268f
diff --git a/metadata/md5-cache/app-admin/system-config-printer-1.4.8 b/metadata/md5-cache/app-admin/system-config-printer-1.4.8
index 97e7cc03b493..a8cac1e57dde 100644
--- a/metadata/md5-cache/app-admin/system-config-printer-1.4.8
+++ b/metadata/md5-cache/app-admin/system-config-printer-1.4.8
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=test
 SLOT=0
 SRC_URI=http://cyberelk.net/tim/data/system-config-printer/1.4/system-config-printer-1.4.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=6f00f888fbb4caa72544d322f63aa9a9
diff --git a/metadata/md5-cache/app-admin/system-tools-backends-2.10.2 b/metadata/md5-cache/app-admin/system-tools-backends-2.10.2
index b58c06d836f5..fd5a3da694c8 100644
--- a/metadata/md5-cache/app-admin/system-tools-backends-2.10.2
+++ b/metadata/md5-cache/app-admin/system-tools-backends-2.10.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!<app-admin/gnome-system-tools-1.1.91 >=sys-apps/dbus-1.1.2 >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.15.2:2 >=dev-perl/Net-DBus-0.33.4 dev-lang/perl >=sys-auth/polkit-0.94 userland_GNU? ( virtual/shadow )
 SLOT=0
 SRC_URI=mirror://gnome/sources/system-tools-backends/2.10/system-tools-backends-2.10.2.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	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=20afbfd8e5fb43d8cf35c9e97f1dce1f
diff --git a/metadata/md5-cache/app-admin/systemdgenie-0.99.0 b/metadata/md5-cache/app-admin/systemdgenie-0.99.0
index 39089ba259f9..ce6c0792eee6 100644
--- a/metadata/md5-cache/app-admin/systemdgenie-0.99.0
+++ b/metadata/md5-cache/app-admin/systemdgenie-0.99.0
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/testdisk-7.1_pre20180322-r1 b/metadata/md5-cache/app-admin/testdisk-7.1_pre20180322-r1
index 159164daae46..cb25d8e36998 100644
--- a/metadata/md5-cache/app-admin/testdisk-7.1_pre20180322-r1
+++ b/metadata/md5-cache/app-admin/testdisk-7.1_pre20180322-r1
@@ -10,5 +10,5 @@ RDEPEND=!static? ( static? ( sys-apps/util-linux[static-libs] sys-fs/e2fsprogs[s
 REQUIRED_USE=static? ( !qt5 )
 SLOT=0
 SRC_URI=https://git.cgsecurity.org/cgit/testdisk/snapshot/testdisk-9eb2aa12ce051d8d3d31e6b440389d5abf5efaf1.tar.gz -> testdisk-7.1_pre20180322.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=60d770199b6df820733610deb596e074
diff --git a/metadata/md5-cache/app-admin/testdisk-7.1_pre20180922 b/metadata/md5-cache/app-admin/testdisk-7.1_pre20180922
new file mode 100644
index 000000000000..3c3f2aae0722
--- /dev/null
+++ b/metadata/md5-cache/app-admin/testdisk-7.1_pre20180922
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure postinst postrm prepare
+DEPEND=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:= ) ) ) qt5? ( dev-qt/linguist-tools:5 ) >=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=Checks and undeletes partitions + PhotoRec, signature based recovery tool
+EAPI=6
+HOMEPAGE=https://www.cgsecurity.org/wiki/TestDisk
+IUSE=ewf jpeg ntfs qt5 reiserfs static zlib
+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
diff --git a/metadata/md5-cache/app-admin/ulogd-2.0.7 b/metadata/md5-cache/app-admin/ulogd-2.0.7
deleted file mode 100644
index b05fafae7fa8..000000000000
--- a/metadata/md5-cache/app-admin/ulogd-2.0.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=|| ( net-firewall/iptables net-firewall/nftables ) >=net-libs/libnfnetlink-1.0.1 dbi? ( dev-db/libdbi ) json? ( dev-libs/jansson ) nfacct? ( >=net-libs/libmnl-1.0.3 >=net-libs/libnetfilter_acct-1.0.1 ) nfct? ( >=net-libs/libnetfilter_conntrack-1.0.2 ) nflog? ( >=net-libs/libnetfilter_log-1.0.0 ) mysql? ( virtual/mysql ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 ) doc? ( app-text/linuxdoc-tools app-text/texlive-core dev-texlive/texlive-fontsrecommended virtual/latex-base ) virtual/pkgconfig
-DESCRIPTION=A userspace logging daemon for netfilter/iptables related logging
-EAPI=6
-HOMEPAGE=https://netfilter.org/projects/ulogd/index.html
-IUSE=dbi doc json mysql nfacct +nfct +nflog pcap postgres selinux sqlite ulog kernel_linux
-KEYWORDS=amd64 ~ia64 ppc x86
-LICENSE=GPL-2
-RDEPEND=|| ( net-firewall/iptables net-firewall/nftables ) >=net-libs/libnfnetlink-1.0.1 dbi? ( dev-db/libdbi ) json? ( dev-libs/jansson ) nfacct? ( >=net-libs/libmnl-1.0.3 >=net-libs/libnetfilter_acct-1.0.1 ) nfct? ( >=net-libs/libnetfilter_conntrack-1.0.2 ) nflog? ( >=net-libs/libnetfilter_log-1.0.0 ) mysql? ( virtual/mysql ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 ) selinux? ( sec-policy/selinux-ulogd )
-SLOT=0
-SRC_URI=https://www.netfilter.org/projects/ulogd/files/ulogd-2.0.7.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=458ae896005eef4e2c25572f72833af1
diff --git a/metadata/md5-cache/app-admin/ulogd-2.0.7-r1 b/metadata/md5-cache/app-admin/ulogd-2.0.7-r1
new file mode 100644
index 000000000000..42270cc14286
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ulogd-2.0.7-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=|| ( net-firewall/iptables net-firewall/nftables ) >=net-libs/libnfnetlink-1.0.1 dbi? ( dev-db/libdbi ) json? ( dev-libs/jansson ) nfacct? ( >=net-libs/libmnl-1.0.3 >=net-libs/libnetfilter_acct-1.0.1 ) nfct? ( >=net-libs/libnetfilter_conntrack-1.0.2 ) nflog? ( >=net-libs/libnetfilter_log-1.0.0 ) mysql? ( dev-db/mysql-connector-c:= ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 ) doc? ( app-text/linuxdoc-tools app-text/texlive-core dev-texlive/texlive-fontsrecommended virtual/latex-base ) virtual/pkgconfig
+DESCRIPTION=A userspace logging daemon for netfilter/iptables related logging
+EAPI=6
+HOMEPAGE=https://netfilter.org/projects/ulogd/index.html
+IUSE=dbi doc json mysql nfacct +nfct +nflog pcap postgres selinux sqlite ulog kernel_linux
+KEYWORDS=amd64 ~ia64 ppc x86
+LICENSE=GPL-2
+RDEPEND=|| ( net-firewall/iptables net-firewall/nftables ) >=net-libs/libnfnetlink-1.0.1 dbi? ( dev-db/libdbi ) json? ( dev-libs/jansson ) nfacct? ( >=net-libs/libmnl-1.0.3 >=net-libs/libnetfilter_acct-1.0.1 ) nfct? ( >=net-libs/libnetfilter_conntrack-1.0.2 ) nflog? ( >=net-libs/libnetfilter_log-1.0.0 ) mysql? ( dev-db/mysql-connector-c:= ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 ) selinux? ( sec-policy/selinux-ulogd )
+SLOT=0
+SRC_URI=https://www.netfilter.org/projects/ulogd/files/ulogd-2.0.7.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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=b6472085a8bbada313add8d27367943b
diff --git a/metadata/md5-cache/app-admin/usbview-2.0 b/metadata/md5-cache/app-admin/usbview-2.0
index 951525c73623..d76cc3ae3acd 100644
--- a/metadata/md5-cache/app-admin/usbview-2.0
+++ b/metadata/md5-cache/app-admin/usbview-2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3
 SLOT=0
 SRC_URI=http://www.kroah.com/linux-usb/usbview-2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=eb946e79a420adb747b2726cee752fd6
diff --git a/metadata/md5-cache/app-admin/webapp-config-1.52-r1 b/metadata/md5-cache/app-admin/webapp-config-1.52-r1
index 777368abbf4e..d33463aab5fd 100644
--- a/metadata/md5-cache/app-admin/webapp-config-1.52-r1
+++ b/metadata/md5-cache/app-admin/webapp-config-1.52-r1
@@ -10,5 +10,5 @@ RDEPEND=portage? ( sys-apps/portage[python_targets_python2_7(-)?,-python_single_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~twitch153/webapp-config/webapp-config-1.52.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=295c52270b7243f744cff4d784bd6844
diff --git a/metadata/md5-cache/app-admin/webapp-config-1.53-r2 b/metadata/md5-cache/app-admin/webapp-config-1.53-r2
index a98e63eb6b23..b9354921fad2 100644
--- a/metadata/md5-cache/app-admin/webapp-config-1.53-r2
+++ b/metadata/md5-cache/app-admin/webapp-config-1.53-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~twitch153/webapp-config/webapp-config-1.53.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7c1a7926bac7da516af1fdf804a75d34
diff --git a/metadata/md5-cache/app-admin/webapp-config-1.54-r2 b/metadata/md5-cache/app-admin/webapp-config-1.54-r2
index cd17ff579b9f..076c386e876c 100644
--- a/metadata/md5-cache/app-admin/webapp-config-1.54-r2
+++ b/metadata/md5-cache/app-admin/webapp-config-1.54-r2
@@ -10,5 +10,5 @@ RDEPEND=portage? ( sys-apps/portage[python_targets_pypy(-)?,python_targets_pytho
 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://dev.gentoo.org/~twitch153/webapp-config/webapp-config-1.54.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=52e30a22178bc39d71aea5f543d4cd72
diff --git a/metadata/md5-cache/app-admin/webapp-config-1.55-r1 b/metadata/md5-cache/app-admin/webapp-config-1.55-r1
index 189e06f9f9ae..35723ea3e97e 100644
--- a/metadata/md5-cache/app-admin/webapp-config-1.55-r1
+++ b/metadata/md5-cache/app-admin/webapp-config-1.55-r1
@@ -10,5 +10,5 @@ RDEPEND=portage? ( || ( sys-apps/portage[python_targets_pypy(-)?,python_targets_
 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://dev.gentoo.org/~twitch153/webapp-config/webapp-config-1.55.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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_=db9c0912f612126b098eebdb7c980ed6
diff --git a/metadata/md5-cache/app-admin/webapp-config-9999 b/metadata/md5-cache/app-admin/webapp-config-9999
index c21ad6b13621..7939b2ea932c 100644
--- a/metadata/md5-cache/app-admin/webapp-config-9999
+++ b/metadata/md5-cache/app-admin/webapp-config-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=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(-)] ) ) 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
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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_=7f0e175276615f82c87284000d05f152
diff --git a/metadata/md5-cache/app-antivirus/Manifest.gz b/metadata/md5-cache/app-antivirus/Manifest.gz
index a5596016ac76..64c2fdb74c1d 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 9c982709eef5..55d0a74495fd 100644
--- a/metadata/md5-cache/app-antivirus/clamav-0.100.0
+++ b/metadata/md5-cache/app-antivirus/clamav-0.100.0
@@ -1,13 +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 ) ) dev-libs/libtommath >=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
+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 ) ) dev-libs/libtommath >=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 )
+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_=51e723b6dbcc3202cf0313f57a1e8701
+_md5_=5f9dc4cb8cf3551c623c4f246d62ce41
diff --git a/metadata/md5-cache/app-antivirus/clamav-0.100.1 b/metadata/md5-cache/app-antivirus/clamav-0.100.1
index 3c2eb9fe248a..9cb60be1e08e 100644
--- a/metadata/md5-cache/app-antivirus/clamav-0.100.1
+++ b/metadata/md5-cache/app-antivirus/clamav-0.100.1
@@ -1,13 +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 ) ) dev-libs/libtommath >=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
+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 ) ) dev-libs/libtommath >=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 )
+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_=22209c441947ccf5ef9bdfd6ff6e62b7
+_md5_=8a6e5f8724111c64673a610aed876392
diff --git a/metadata/md5-cache/app-antivirus/clamav-0.100.2 b/metadata/md5-cache/app-antivirus/clamav-0.100.2
new file mode 100644
index 000000000000..0bc0f9560534
--- /dev/null
+++ b/metadata/md5-cache/app-antivirus/clamav-0.100.2
@@ -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 ) dev-libs/libmspack xml? ( dev-libs/libxml2 ) !!<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 test uclibc xml
+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 ) dev-libs/libmspack xml? ( dev-libs/libxml2 ) !!<app-antivirus/clamav-0.99 selinux? ( sec-policy/selinux-clamav )
+SLOT=0
+SRC_URI=https://www.clamav.net/downloads/production/clamav-0.100.2.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_=35bfd1842ac3845060d998d11c0ff422
diff --git a/metadata/md5-cache/app-antivirus/clamav-0.99.4-r1 b/metadata/md5-cache/app-antivirus/clamav-0.99.4-r1
index f77b54fdcb35..da51dda4f28b 100644
--- a/metadata/md5-cache/app-antivirus/clamav-0.99.4-r1
+++ b/metadata/md5-cache/app-antivirus/clamav-0.99.4-r1
@@ -1,13 +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 ) ) dev-libs/libtommath >=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
+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 ) ) dev-libs/libtommath >=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 )
+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_=94482a201c6d5fac7bee838fef0bec70
+_md5_=0b00ba553b250ae64d79156073d594af
diff --git a/metadata/md5-cache/app-antivirus/clamtk-5.26 b/metadata/md5-cache/app-antivirus/clamtk-5.26
index 58ccfa6af0cb..b3e8a8307590 100644
--- a/metadata/md5-cache/app-antivirus/clamtk-5.26
+++ b/metadata/md5-cache/app-antivirus/clamtk-5.26
@@ -10,5 +10,5 @@ RDEPEND=app-antivirus/clamav dev-perl/File-chdir dev-perl/Gtk2 dev-perl/JSON dev
 REQUIRED_USE=nautilus? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://bitbucket.org/davem_/clamtk/downloads/clamtk-5.26.tar.xz kde? ( https://bitbucket.org/davem_/clamtk-kde/downloads/clamtk-kde-0.18.tar.xz ) nautilus? ( https://bitbucket.org/davem_/clamtk-gnome/downloads/clamtk-gnome-0.02.tar.xz ) nemo? ( https://bitbucket.org/davem_/nemo-sendto-clamtk/downloads/nemo-sendto-clamtk-0.04.tar.xz ) thunar? ( https://bitbucket.org/davem_/thunar-sendto-clamtk/downloads/thunar-sendto-clamtk-0.06.tar.xz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	b2f01ad412baf81650c23fcf0975fa33	perl-functions	f2e3420aed32cf1abe33b4129b842636	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	b2f01ad412baf81650c23fcf0975fa33	perl-functions	f2e3420aed32cf1abe33b4129b842636	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2b4d6cb6d4ef9fc18bef6ddca86a876d
diff --git a/metadata/md5-cache/app-antivirus/skyldav-0.7 b/metadata/md5-cache/app-antivirus/skyldav-0.7
index 350c84b3c816..a3624e29ac5d 100644
--- a/metadata/md5-cache/app-antivirus/skyldav-0.7
+++ b/metadata/md5-cache/app-antivirus/skyldav-0.7
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=app-antivirus/clamav-0.97.8 sys-apps/util-linux sys-libs/libcap libnotify? ( media-libs/libcanberra[gtk] x11-libs/libnotify x11-libs/gtk+:2 ) kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://github.com/xypron/skyldav/archive/0.7.tar.gz -> skyldav-0.7.tar.gz
-_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	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0b1e22da07652fa0a32fe35589937ade
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 73ebfdbf7bcb..8f2c5162c1af 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/bloscpack-0.11.0 b/metadata/md5-cache/app-arch/bloscpack-0.11.0
index d60d3a799dde..ba5f46d6ffde 100644
--- a/metadata/md5-cache/app-arch/bloscpack-0.11.0
+++ b/metadata/md5-cache/app-arch/bloscpack-0.11.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/blosc[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bloscpack/bloscpack-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a204c30bc9635426c8f48f7e07a342ab
diff --git a/metadata/md5-cache/app-arch/bloscpack-0.5.0 b/metadata/md5-cache/app-arch/bloscpack-0.5.0
index 8e5fb0d0f285..b92a62880d4c 100644
--- a/metadata/md5-cache/app-arch/bloscpack-0.5.0
+++ b/metadata/md5-cache/app-arch/bloscpack-0.5.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/blosc[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bloscpack/bloscpack-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7d179c8184da68e30074cc7e5bfb3d48
diff --git a/metadata/md5-cache/app-arch/bloscpack-0.6.0 b/metadata/md5-cache/app-arch/bloscpack-0.6.0
index d056e4746fc6..992b8199abc2 100644
--- a/metadata/md5-cache/app-arch/bloscpack-0.6.0
+++ b/metadata/md5-cache/app-arch/bloscpack-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/blosc[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bloscpack/bloscpack-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7d179c8184da68e30074cc7e5bfb3d48
diff --git a/metadata/md5-cache/app-arch/brotli-1.0.2 b/metadata/md5-cache/app-arch/brotli-1.0.2
index 6361aad87828..bbbe3243a413 100644
--- a/metadata/md5-cache/app-arch/brotli-1.0.2
+++ b/metadata/md5-cache/app-arch/brotli-1.0.2
@@ -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 ) )
 SLOT=0/1.0.2
 SRC_URI=https://github.com/google/brotli/archive/v1.0.2.tar.gz -> brotli-1.0.2.tar.gz
-_eclasses_=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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a910d6ad7465012d9f8a5aba42cfaab1
diff --git a/metadata/md5-cache/app-arch/brotli-1.0.3 b/metadata/md5-cache/app-arch/brotli-1.0.3
index d994a1d9759b..41ac30999b80 100644
--- a/metadata/md5-cache/app-arch/brotli-1.0.3
+++ b/metadata/md5-cache/app-arch/brotli-1.0.3
@@ -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 ) )
 SLOT=0/1.0.3
 SRC_URI=https://github.com/google/brotli/archive/v1.0.3.tar.gz -> brotli-1.0.3.tar.gz
-_eclasses_=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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=04c6e0f543b86e44ae8f25e41659cd7c
diff --git a/metadata/md5-cache/app-arch/brotli-1.0.3-r1 b/metadata/md5-cache/app-arch/brotli-1.0.3-r1
index efb5254c8183..dd389ffb4156 100644
--- a/metadata/md5-cache/app-arch/brotli-1.0.3-r1
+++ b/metadata/md5-cache/app-arch/brotli-1.0.3-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 ) )
 SLOT=0/1
 SRC_URI=https://github.com/google/brotli/archive/v1.0.3.tar.gz -> brotli-1.0.3.tar.gz
-_eclasses_=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	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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	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_=84070b5cd6862953d8734fe2f2cd3d43
diff --git a/metadata/md5-cache/app-arch/brotli-1.0.4 b/metadata/md5-cache/app-arch/brotli-1.0.4
index 77ab4d714700..12fbf70e7ca7 100644
--- a/metadata/md5-cache/app-arch/brotli-1.0.4
+++ b/metadata/md5-cache/app-arch/brotli-1.0.4
@@ -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 ) )
 SLOT=0/1
 SRC_URI=https://github.com/google/brotli/archive/v1.0.4.tar.gz -> brotli-1.0.4.tar.gz
-_eclasses_=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	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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	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_=84070b5cd6862953d8734fe2f2cd3d43
diff --git a/metadata/md5-cache/app-arch/brotli-1.0.5 b/metadata/md5-cache/app-arch/brotli-1.0.5
index 2040ada2d0b4..e0feb58c0547 100644
--- a/metadata/md5-cache/app-arch/brotli-1.0.5
+++ b/metadata/md5-cache/app-arch/brotli-1.0.5
@@ -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.5.tar.gz -> brotli-1.0.5.tar.gz
-_eclasses_=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	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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	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_=fadf6a4e701a24cae21a912de2e06e9f
diff --git a/metadata/md5-cache/app-arch/brotli-1.0.6 b/metadata/md5-cache/app-arch/brotli-1.0.6
index fc8b37470373..8371da8184e9 100644
--- a/metadata/md5-cache/app-arch/brotli-1.0.6
+++ b/metadata/md5-cache/app-arch/brotli-1.0.6
@@ -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-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	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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	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_=fadf6a4e701a24cae21a912de2e06e9f
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 26819784eae6..7303de39728f 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _md5_=db9bdefd42bc760eeab39355f1fb4871
diff --git a/metadata/md5-cache/app-arch/brotli-9999 b/metadata/md5-cache/app-arch/brotli-9999
index 1070370c3361..b654a6d3589a 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _md5_=db9bdefd42bc760eeab39355f1fb4871
diff --git a/metadata/md5-cache/app-arch/createrepo-0.10.4-r1 b/metadata/md5-cache/app-arch/createrepo-0.10.4-r1
new file mode 100644
index 000000000000..c197b8d19a55
--- /dev/null
+++ b/metadata/md5-cache/app-arch/createrepo-0.10.4-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install setup
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+DESCRIPTION=Creates a common rpm-metadata repository
+EAPI=7
+HOMEPAGE=http://createrepo.baseurl.org/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-python/urlgrabber-2.9.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-arch/rpm-4.1.1[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/libxml2[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-arch/deltarpm-3.6_pre20110223[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/backports-lzma[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_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/yum-3.4.3 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=http://createrepo.baseurl.org/download/createrepo-0.10.4.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=6ad4c36b428118664a84a16ebd2696e8
diff --git a/metadata/md5-cache/app-arch/engrampa-1.12.0-r1 b/metadata/md5-cache/app-arch/engrampa-1.12.0-r1
deleted file mode 100644
index 6b6d134244ac..000000000000
--- a/metadata/md5-cache/app-arch/engrampa-1.12.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.32.0:2 >=dev-libs/json-glib-0.14:0 x11-libs/gdk-pixbuf:2 x11-libs/pango:0 virtual/libintl:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=] ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) magic? ( sys-apps/file ) packagekit? ( app-admin/packagekit-base ) !!app-arch/mate-file-archiver app-text/yelp-tools >=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.12
-DESCRIPTION=Engrampa archive manager for MATE
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=caja gtk3 magic packagekit
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.32.0:2 >=dev-libs/json-glib-0.14:0 x11-libs/gdk-pixbuf:2 x11-libs/pango:0 virtual/libintl:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=] ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) magic? ( sys-apps/file ) packagekit? ( app-admin/packagekit-base ) !!app-arch/mate-file-archiver
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/engrampa-1.12.0.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=25e2fd6a3d2307ef6d0dd6277ae01eba
diff --git a/metadata/md5-cache/app-arch/engrampa-1.12.0-r2 b/metadata/md5-cache/app-arch/engrampa-1.12.0-r2
deleted file mode 100644
index dc6da5bfc92c..000000000000
--- a/metadata/md5-cache/app-arch/engrampa-1.12.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.32.0:2 >=dev-libs/json-glib-0.14:0 x11-libs/gdk-pixbuf:2 x11-libs/pango:0 virtual/libintl:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=] ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3[X] ) magic? ( sys-apps/file ) packagekit? ( app-admin/packagekit-base ) !!app-arch/mate-file-archiver app-text/yelp-tools >=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.12
-DESCRIPTION=Engrampa archive manager for MATE
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=caja gtk3 magic packagekit
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.32.0:2 >=dev-libs/json-glib-0.14:0 x11-libs/gdk-pixbuf:2 x11-libs/pango:0 virtual/libintl:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=] ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3[X] ) magic? ( sys-apps/file ) packagekit? ( app-admin/packagekit-base ) !!app-arch/mate-file-archiver
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/engrampa-1.12.0.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=71862b8de1d9f50f6b385fc061f66559
diff --git a/metadata/md5-cache/app-arch/engrampa-1.14.1-r1 b/metadata/md5-cache/app-arch/engrampa-1.14.1-r1
deleted file mode 100644
index b536e71166b1..000000000000
--- a/metadata/md5-cache/app-arch/engrampa-1.14.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.32.0:2 >=dev-libs/json-glib-0.14:0 x11-libs/gdk-pixbuf:2 x11-libs/pango:0 virtual/libintl:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=] ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3[X] ) magic? ( sys-apps/file ) packagekit? ( app-admin/packagekit-base ) !!app-arch/mate-file-archiver app-text/yelp-tools >=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.14
-DESCRIPTION=Engrampa archive manager for MATE
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=caja gtk3 magic packagekit
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.32.0:2 >=dev-libs/json-glib-0.14:0 x11-libs/gdk-pixbuf:2 x11-libs/pango:0 virtual/libintl:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=] ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3[X] ) magic? ( sys-apps/file ) packagekit? ( app-admin/packagekit-base ) !!app-arch/mate-file-archiver
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.14/engrampa-1.14.1.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=1375e3e772ad81644b99734c533f883d
diff --git a/metadata/md5-cache/app-arch/engrampa-1.16.1 b/metadata/md5-cache/app-arch/engrampa-1.16.1
deleted file mode 100644
index ff6b84ef702f..000000000000
--- a/metadata/md5-cache/app-arch/engrampa-1.16.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.32.0:2 >=dev-libs/json-glib-0.14:0 x11-libs/gdk-pixbuf:2 x11-libs/pango:0 virtual/libintl:0 caja? ( >=mate-base/caja-1.1.0 ) >=x11-libs/gtk+-3.14:3[X] magic? ( sys-apps/file ) packagekit? ( app-admin/packagekit-base ) !!app-arch/mate-file-archiver app-text/yelp-tools >=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.16
-DESCRIPTION=Engrampa archive manager for MATE
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=caja magic packagekit
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.32.0:2 >=dev-libs/json-glib-0.14:0 x11-libs/gdk-pixbuf:2 x11-libs/pango:0 virtual/libintl:0 caja? ( >=mate-base/caja-1.1.0 ) >=x11-libs/gtk+-3.14:3[X] magic? ( sys-apps/file ) packagekit? ( app-admin/packagekit-base ) !!app-arch/mate-file-archiver
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/engrampa-1.16.1.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=cc04cab3fb60ef8c8a85e7edf20be506
diff --git a/metadata/md5-cache/app-arch/engrampa-1.18.3 b/metadata/md5-cache/app-arch/engrampa-1.18.3
index 02efbf4fac5d..e355850a19dc 100644
--- a/metadata/md5-cache/app-arch/engrampa-1.18.3
+++ b/metadata/md5-cache/app-arch/engrampa-1.18.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.32.0:2 >=dev-libs/json-glib-0.14:0 x11-libs/gdk-pixbuf:2 x11-libs/pango:0 virtual/libintl:0 caja? ( >=mate-base/caja-1.17.1 ) >=x11-libs/gtk+-3.14:3[X] magic? ( sys-apps/file ) packagekit? ( app-admin/packagekit-base ) !!app-arch/mate-file-archiver
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.18/engrampa-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9ed8ef30a3b3772686a3a3b7019a45a0
diff --git a/metadata/md5-cache/app-arch/file-roller-3.24.1 b/metadata/md5-cache/app-arch/file-roller-3.24.1
index 2a22041fde17..cf3eb3b20800 100644
--- a/metadata/md5-cache/app-arch/file-roller-3.24.1
+++ b/metadata/md5-cache/app-arch/file-roller-3.24.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=>=app-arch/libarchive-3:= >=dev-libs/glib-2.36:2 >=dev-libs/json-glib-0.14 >=x11-libs/gtk+-3.13.2:3 sys-apps/file x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/pango libnotify? ( >=x11-libs/libnotify-0.4.3:= ) nautilus? ( >=gnome-base/nautilus-2.22.2 ) packagekit? ( app-admin/packagekit-base )
 SLOT=0
 SRC_URI=mirror://gnome/sources/file-roller/3.24/file-roller-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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0f8444a135fd97fbe5a287e73d473b59
diff --git a/metadata/md5-cache/app-arch/file-roller-3.26.2 b/metadata/md5-cache/app-arch/file-roller-3.26.2
index 979511959ceb..5046e63a0ebd 100644
--- a/metadata/md5-cache/app-arch/file-roller-3.26.2
+++ b/metadata/md5-cache/app-arch/file-roller-3.26.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=>=app-arch/libarchive-3:= >=dev-libs/glib-2.36:2 >=dev-libs/json-glib-0.14 >=x11-libs/gtk+-3.13.2:3 sys-apps/file x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/pango libnotify? ( >=x11-libs/libnotify-0.4.3:= ) nautilus? ( >=gnome-base/nautilus-2.22.2 ) packagekit? ( app-admin/packagekit-base )
 SLOT=0
 SRC_URI=mirror://gnome/sources/file-roller/3.26/file-roller-3.26.2.tar.xz
-_eclasses_=desktop	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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=873f4a8a5d4cd5b9864cc1b90b0709cc
diff --git a/metadata/md5-cache/app-arch/gcab-0.7 b/metadata/md5-cache/app-arch/gcab-0.7
index 5dbb89b339b1..f058fc8e015a 100644
--- a/metadata/md5-cache/app-arch/gcab-0.7
+++ b/metadata/md5-cache/app-arch/gcab-0.7
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.22:2 sys-libs/zlib introspection? ( >=dev-libs/gobject
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gcab/0.7/gcab-0.7.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b7be101f7ee7ed15cc29ba2edfb43433
diff --git a/metadata/md5-cache/app-arch/gcab-0.8 b/metadata/md5-cache/app-arch/gcab-0.8
index ec571f06d7e8..699dab47859f 100644
--- a/metadata/md5-cache/app-arch/gcab-0.8
+++ b/metadata/md5-cache/app-arch/gcab-0.8
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.32:2 sys-libs/zlib introspection? ( >=dev-libs/gobject
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gcab/0.8/gcab-0.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=026652039e6b9e28dd5dd2b07d58852f
diff --git a/metadata/md5-cache/app-arch/gnome-autoar-0.2.2 b/metadata/md5-cache/app-arch/gnome-autoar-0.2.2
index bd5b210fe53f..f392dde1df52 100644
--- a/metadata/md5-cache/app-arch/gnome-autoar-0.2.2
+++ b/metadata/md5-cache/app-arch/gnome-autoar-0.2.2
@@ -10,5 +10,5 @@ RDEPEND=>=app-arch/libarchive-3.2.0 >=dev-libs/glib-2.35.6:2 gtk? ( >=x11-libs/g
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-autoar/0.2/gnome-autoar-0.2.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c62cd0c2d69031bb6bbaeeae41e00de2
diff --git a/metadata/md5-cache/app-arch/innoextract-1.6 b/metadata/md5-cache/app-arch/innoextract-1.6
index 817fee862b3e..0d557db74863 100644
--- a/metadata/md5-cache/app-arch/innoextract-1.6
+++ b/metadata/md5-cache/app-arch/innoextract-1.6
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=dev-libs/boost:= iconv? ( virtual/libiconv ) lzma? ( app-arch/xz-utils )
 SLOT=0
 SRC_URI=http://constexpr.org/innoextract/files/innoextract-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e3951f1e6dc377dc3020b82cd2001b3e
diff --git a/metadata/md5-cache/app-arch/innoextract-1.7 b/metadata/md5-cache/app-arch/innoextract-1.7
index da90fd272437..f4ac579cef63 100644
--- a/metadata/md5-cache/app-arch/innoextract-1.7
+++ b/metadata/md5-cache/app-arch/innoextract-1.7
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=dev-libs/boost:= iconv? ( virtual/libiconv ) lzma? ( app-arch/xz-utils )
 SLOT=0
 SRC_URI=http://constexpr.org/innoextract/files/innoextract-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2a4c632ffdc83158e40e5456c4283988
diff --git a/metadata/md5-cache/app-arch/ipkg-utils-1.7.050831-r2 b/metadata/md5-cache/app-arch/ipkg-utils-1.7.050831-r2
index 7a53070a5500..84c9e1c9382f 100644
--- a/metadata/md5-cache/app-arch/ipkg-utils-1.7.050831-r2
+++ b/metadata/md5-cache/app-arch/ipkg-utils-1.7.050831-r2
@@ -10,5 +10,5 @@ RDEPEND=!minimal? ( app-crypt/gnupg net-misc/curl ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://handhelds.org/download/packages/ipkg-utils/ipkg-utils-050831.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e91724444f2ee8b796c761d53b310ccb
diff --git a/metadata/md5-cache/app-arch/ipkg-utils-1.7.050831-r3 b/metadata/md5-cache/app-arch/ipkg-utils-1.7.050831-r3
index ab84e387585a..3faeb8d42d43 100644
--- a/metadata/md5-cache/app-arch/ipkg-utils-1.7.050831-r3
+++ b/metadata/md5-cache/app-arch/ipkg-utils-1.7.050831-r3
@@ -10,5 +10,5 @@ RDEPEND=!minimal? ( app-crypt/gnupg net-misc/curl ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://handhelds.org/download/packages/ipkg-utils/ipkg-utils-050831.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=82ee837107ff570b035db3abff03553f
diff --git a/metadata/md5-cache/app-arch/lha-114i-r9 b/metadata/md5-cache/app-arch/lha-114i-r9
new file mode 100644
index 000000000000..cd66b8f94e25
--- /dev/null
+++ b/metadata/md5-cache/app-arch/lha-114i-r9
@@ -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=configure install prepare
+DESCRIPTION=Utility for creating and opening lzh archives
+EAPI=7
+HOMEPAGE=https://lha.osdn.jp https://github.com/jca02266/lha
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~m68k-mint
+LICENSE=lha
+SLOT=0
+SRC_URI=mirror://sourceforge.jp/lha/22231/lha-1.14i-ac20050924p1.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=4184d478db5588696ad46b9732bcb0a9
diff --git a/metadata/md5-cache/app-arch/lz4-1.8.0 b/metadata/md5-cache/app-arch/lz4-1.8.0
index 5fbd94f26d74..b3286dbcd052 100644
--- a/metadata/md5-cache/app-arch/lz4-1.8.0
+++ b/metadata/md5-cache/app-arch/lz4-1.8.0
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x8
 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	89bb9f083a2590d9b447fd0b78a96186
+_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 2e751d29e990..c6b186460a26 100644
--- a/metadata/md5-cache/app-arch/lz4-1.8.2
+++ b/metadata/md5-cache/app-arch/lz4-1.8.2
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/app-arch/lz4-1.8.3 b/metadata/md5-cache/app-arch/lz4-1.8.3
index ddfed90c1c69..a0396d8bb49d 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b036bd236133e6e27282633b7d81c32d
diff --git a/metadata/md5-cache/app-arch/lz4-9999 b/metadata/md5-cache/app-arch/lz4-9999
index 6fd14137d2e4..fc5b2089760e 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6cc3706f403e6c0c8351a065e42b6449
diff --git a/metadata/md5-cache/app-arch/patool-1.12 b/metadata/md5-cache/app-arch/patool-1.12
index 7d398f12e3e4..543d33ba39e8 100644
--- a/metadata/md5-cache/app-arch/patool-1.12
+++ b/metadata/md5-cache/app-arch/patool-1.12
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/patool/patool-1.12.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=749544014fd0a73e4dfba4b553f45029
diff --git a/metadata/md5-cache/app-arch/rar-5.6.1_p20180930 b/metadata/md5-cache/app-arch/rar-5.6.1_p20180930
new file mode 100644
index 000000000000..13701e8bc7f8
--- /dev/null
+++ b/metadata/md5-cache/app-arch/rar-5.6.1_p20180930
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=all_sfx? ( app-arch/unrar )
+DESCRIPTION=RAR compressor/uncompressor
+EAPI=6
+HOMEPAGE=https://rarlab.com/
+IUSE=all_sfx
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=RAR BSD BSD-2
+RDEPEND=sys-libs/glibc
+RESTRICT=mirror bindist
+SLOT=0
+SRC_URI=x86? ( https://mirror.whissi.de/distfiles/rar/rarlinux-5.6.1_p20180930.tar.gz ) amd64? ( https://mirror.whissi.de/distfiles/rar/rarlinux-x64-5.6.1_p20180930.tar.gz ) all_sfx? ( https://mirror.whissi.de/distfiles/rar/rarlinux-5.6.1_p20180930.tar.gz https://mirror.whissi.de/distfiles/rar/rarlinux-x64-5.6.1_p20180930.tar.gz https://mirror.whissi.de/distfiles/rar/winrar-x64-5.6.1_p20180930.exe )
+_md5_=c0491a73d2c71fb5c97f29f0dbc17cee
diff --git a/metadata/md5-cache/app-arch/snappy-1.1.7 b/metadata/md5-cache/app-arch/snappy-1.1.7
index 3428af99468f..14e6d23e349a 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=97541846d934c7f4f59f7d38eb841000
diff --git a/metadata/md5-cache/app-arch/tardelta-1.0.1 b/metadata/md5-cache/app-arch/tardelta-1.0.1
index 9e156df25448..863d9cf2bb2e 100644
--- a/metadata/md5-cache/app-arch/tardelta-1.0.1
+++ b/metadata/md5-cache/app-arch/tardelta-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/zmedico/tardelta/archive/1.0.1.tar.gz -> tardelta-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9aeddfdceac8ae9863ac318dbc260e74
diff --git a/metadata/md5-cache/app-arch/unrar-5.6.6 b/metadata/md5-cache/app-arch/unrar-5.6.6
index 481e5906eb52..dc66fe46b42b 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_=a79def1aa6dc53c948b31060c1c9cf9f
+_md5_=3d1c10dbcaab79811dd69de7dc129496
diff --git a/metadata/md5-cache/app-arch/unrar-5.6.7 b/metadata/md5-cache/app-arch/unrar-5.6.7
new file mode 100644
index 000000000000..5665bbd845df
--- /dev/null
+++ b/metadata/md5-cache/app-arch/unrar-5.6.7
@@ -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.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/unshield-1.4 b/metadata/md5-cache/app-arch/unshield-1.4
index d8d5fd367c10..c69e935a7243 100644
--- a/metadata/md5-cache/app-arch/unshield-1.4
+++ b/metadata/md5-cache/app-arch/unshield-1.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/twogood/unshield/archive/1.4.tar.gz -> unshield-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=022c282817b6a815c5a5b4914c5a4423
diff --git a/metadata/md5-cache/app-arch/unshield-1.4.2 b/metadata/md5-cache/app-arch/unshield-1.4.2
index 3d51eef3372d..ea738830c737 100644
--- a/metadata/md5-cache/app-arch/unshield-1.4.2
+++ b/metadata/md5-cache/app-arch/unshield-1.4.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/twogood/unshield/archive/1.4.2.tar.gz -> unshield-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=844927fc7a9a4f67aeff062d4fc5bce9
diff --git a/metadata/md5-cache/app-arch/vimball-0.5.1 b/metadata/md5-cache/app-arch/vimball-0.5.1
index 31dbea32807d..33bf19b9f8e6 100644
--- a/metadata/md5-cache/app-arch/vimball-0.5.1
+++ b/metadata/md5-cache/app-arch/vimball-0.5.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/v/vimball/vimball-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8e1388b4d1eb16b2fe04575ce9be35d5
diff --git a/metadata/md5-cache/app-arch/vimball-9999 b/metadata/md5-cache/app-arch/vimball-9999
index ad42e40cc3dd..0c14eb511318 100644
--- a/metadata/md5-cache/app-arch/vimball-9999
+++ b/metadata/md5-cache/app-arch/vimball-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 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 ) python_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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4997b49d3f46c234746945f8b5493bf8
diff --git a/metadata/md5-cache/app-arch/xarchiver-0.5.4.12 b/metadata/md5-cache/app-arch/xarchiver-0.5.4.12
index b8f69a8f451d..801c8e1d626a 100644
--- a/metadata/md5-cache/app-arch/xarchiver-0.5.4.12
+++ b/metadata/md5-cache/app-arch/xarchiver-0.5.4.12
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2:= x11-libs/gtk+:3= !!<app-arch/pigz-2.4[symlink]
 SLOT=0
 SRC_URI=https://github.com/ib/xarchiver/archive/0.5.4.12.tar.gz -> xarchiver-0.5.4.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7d1d51496bbfbef06ef8ab39b56bfc69
diff --git a/metadata/md5-cache/app-arch/xarchiver-0.5.4.13 b/metadata/md5-cache/app-arch/xarchiver-0.5.4.13
index 010068059328..20312ef16915 100644
--- a/metadata/md5-cache/app-arch/xarchiver-0.5.4.13
+++ b/metadata/md5-cache/app-arch/xarchiver-0.5.4.13
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2:= x11-libs/gtk+:3= !!<app-arch/pigz-2.4[symlink]
 SLOT=0
 SRC_URI=https://github.com/ib/xarchiver/archive/0.5.4.13.tar.gz -> xarchiver-0.5.4.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ed2dd267a1a8e58efae40b991b31343e
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 71aaf246ec1f..9203eb6544cc 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 ~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_=cc985c107e97a3debe5713c0fd5c5409
+_md5_=8f59b177ecbaa86ee776460a10583674
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 47a9880ddff6..4a7880664eee 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/attic-0.16-r1 b/metadata/md5-cache/app-backup/attic-0.16-r1
index 2f48133a17a8..1ab9f2140c3c 100644
--- a/metadata/md5-cache/app-backup/attic-0.16-r1
+++ b/metadata/md5-cache/app-backup/attic-0.16-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/msgpack[python_targets_python3_4(-)?,python_targets_python3_5
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/jborg/attic/archive/0.16.tar.gz -> attic-0.16.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=90296cbf47dd1a633132271bdc18c50e
diff --git a/metadata/md5-cache/app-backup/attic-9999 b/metadata/md5-cache/app-backup/attic-9999
index bc97c9cf4a7a..97790dddc8f9 100644
--- a/metadata/md5-cache/app-backup/attic-9999
+++ b/metadata/md5-cache/app-backup/attic-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/msgpack[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-python/llfuse[python_targets_python3_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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=90296cbf47dd1a633132271bdc18c50e
diff --git a/metadata/md5-cache/app-backup/backintime-1.2.0_pre20180221 b/metadata/md5-cache/app-backup/backintime-1.2.0_pre20180221
index 28f8e0aaacf7..47cb16410995 100644
--- a/metadata/md5-cache/app-backup/backintime-1.2.0_pre20180221
+++ b/metadata/md5-cache/app-backup/backintime-1.2.0_pre20180221
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/bit-team/backintime/archive/45ec81c185789b2dbafd7348d1af039b5183c9ff.tar.gz -> backintime-1.2.0_pre20180221.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e7b98f855fc94e558ff729f1f4add7fd
diff --git a/metadata/md5-cache/app-backup/backintime-9999 b/metadata/md5-cache/app-backup/backintime-9999
index d538b9aab813..ddef24acf763 100644
--- a/metadata/md5-cache/app-backup/backintime-9999
+++ b/metadata/md5-cache/app-backup/backintime-9999
@@ -8,5 +8,5 @@ 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(+)?] dev-python/dbus-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/keyring[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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-misc/openssh net-misc/rsync[xattr,acl] qt5? ( dev-python/PyQt5 )
 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=426ae716d3cd2c911eaf1ae3ce68c0f7
diff --git a/metadata/md5-cache/app-backup/borgbackup-1.1.6 b/metadata/md5-cache/app-backup/borgbackup-1.1.6
index ed4db8a80605..000e90c377b5 100644
--- a/metadata/md5-cache/app-backup/borgbackup-1.1.6
+++ b/metadata/md5-cache/app-backup/borgbackup-1.1.6
@@ -10,5 +10,5 @@ RDEPEND=!!app-office/borg app-arch/lz4 dev-python/llfuse[python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/borgbackup/borgbackup-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bdd313f000c21c27eeaa1baff33564b0
diff --git a/metadata/md5-cache/app-backup/borgbackup-1.1.7 b/metadata/md5-cache/app-backup/borgbackup-1.1.7
index 3d2480c8e14e..e1d8f09a0b0b 100644
--- a/metadata/md5-cache/app-backup/borgbackup-1.1.7
+++ b/metadata/md5-cache/app-backup/borgbackup-1.1.7
@@ -10,5 +10,5 @@ RDEPEND=!!app-office/borg app-arch/lz4 dev-python/llfuse[python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/borgbackup/borgbackup-1.1.7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9cd8723db4fbf25037cdb5c1ebc19d5c
diff --git a/metadata/md5-cache/app-backup/borgbackup-9999 b/metadata/md5-cache/app-backup/borgbackup-9999
index a915ecdfad51..e6a50e2d57d6 100644
--- a/metadata/md5-cache/app-backup/borgbackup-9999
+++ b/metadata/md5-cache/app-backup/borgbackup-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=!!app-office/borg app-arch/lz4 dev-python/llfuse[python_targets_python3_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/msgpack[python_targets_python3_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[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=9cd8723db4fbf25037cdb5c1ebc19d5c
diff --git a/metadata/md5-cache/app-backup/borgweb-0.2.0-r2 b/metadata/md5-cache/app-backup/borgweb-0.2.0-r2
index 3f3d757181d6..26af6cc4fd28 100644
--- a/metadata/md5-cache/app-backup/borgweb-0.2.0-r2
+++ b/metadata/md5-cache/app-backup/borgweb-0.2.0-r2
@@ -10,5 +10,5 @@ RDEPEND=app-backup/borgbackup[python_targets_python3_4(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/borgweb/borgweb-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ee133713a142e6b15dd3fda5098941d9
diff --git a/metadata/md5-cache/app-backup/borgweb-0.3.0 b/metadata/md5-cache/app-backup/borgweb-0.3.0
index 9b26c605ab18..a8722a15584e 100644
--- a/metadata/md5-cache/app-backup/borgweb-0.3.0
+++ b/metadata/md5-cache/app-backup/borgweb-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=app-backup/borgbackup[python_targets_python3_4(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/borgweb/borgweb-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=495450fc1695c33214dd7aca3d9e8841
diff --git a/metadata/md5-cache/app-backup/buttersink-0.6.8 b/metadata/md5-cache/app-backup/buttersink-0.6.8
index 88b6b91d567d..e4d931258b7a 100644
--- a/metadata/md5-cache/app-backup/buttersink-0.6.8
+++ b/metadata/md5-cache/app-backup/buttersink-0.6.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/AmesCornish/buttersink/archive/0.6.8.tar.gz -> buttersink-0.6.8.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c9d0c161ad1f43c051dacbb7e6b927df
diff --git a/metadata/md5-cache/app-backup/buttersink-9999 b/metadata/md5-cache/app-backup/buttersink-9999
index 9e22a91a3825..917f3ec7068c 100644
--- a/metadata/md5-cache/app-backup/buttersink-9999
+++ b/metadata/md5-cache/app-backup/buttersink-9999
@@ -9,5 +9,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c9d0c161ad1f43c051dacbb7e6b927df
diff --git a/metadata/md5-cache/app-backup/cachedir-1.4 b/metadata/md5-cache/app-backup/cachedir-1.4
index 975ac61fd29d..4be49d25af9c 100644
--- a/metadata/md5-cache/app-backup/cachedir-1.4
+++ b/metadata/md5-cache/app-backup/cachedir-1.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=http://git.liw.fi/cgi-bin/cgit/cgit.cgi/cachedir/snapshot/cachedir-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=10a177df18b25ef8305c2263ba11906d
diff --git a/metadata/md5-cache/app-backup/dar-2.5.15 b/metadata/md5-cache/app-backup/dar-2.5.15
deleted file mode 100644
index 6267e6a77add..000000000000
--- a/metadata/md5-cache/app-backup/dar-2.5.15
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=sys-libs/zlib-1.2.3:= !static? ( app-arch/bzip2:= app-arch/xz-utils:= sys-libs/libcap gcrypt? ( dev-libs/libgcrypt:0= ) gpg? ( app-crypt/gpgme ) lzo? ( dev-libs/lzo:= ) xattr? ( sys-apps/attr:= ) ) static? ( app-arch/bzip2[static-libs] app-arch/xz-utils[static-libs] sys-libs/libcap[static-libs] sys-libs/zlib[static-libs] gcrypt? ( dev-libs/libgcrypt:0=[static-libs] ) gpg? ( app-crypt/gpgme[static-libs] dev-libs/libassuan[static-libs] dev-libs/libgpg-error[static-libs] ) lzo? ( dev-libs/lzo[static-libs] ) xattr? ( sys-apps/attr[static-libs] ) ) nls? ( sys-devel/gettext virtual/libintl ) doc? ( app-doc/doxygen )
-DESCRIPTION=A full featured backup tool, aimed for disks
-EAPI=6
-HOMEPAGE=http://dar.linux.free.fr/
-IUSE=dar32 dar64 doc gcrypt gpg lzo nls static static-libs xattr
-KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/zlib-1.2.3:= !static? ( app-arch/bzip2:= app-arch/xz-utils:= sys-libs/libcap gcrypt? ( dev-libs/libgcrypt:0= ) gpg? ( app-crypt/gpgme ) lzo? ( dev-libs/lzo:= ) xattr? ( sys-apps/attr:= ) )
-REQUIRED_USE=?? ( dar32 dar64 ) gpg? ( gcrypt )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/dar/dar-2.5.15.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_=a495082e7fb9a4388aee47b0ee2c05c5
diff --git a/metadata/md5-cache/app-backup/dar-2.5.17 b/metadata/md5-cache/app-backup/dar-2.5.17
new file mode 100644
index 000000000000..56b34bef11a2
--- /dev/null
+++ b/metadata/md5-cache/app-backup/dar-2.5.17
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install
+DEPEND=>=sys-libs/zlib-1.2.3:= !static? ( app-arch/bzip2:= app-arch/xz-utils:= sys-libs/libcap gcrypt? ( dev-libs/libgcrypt:0= ) gpg? ( app-crypt/gpgme ) lzo? ( dev-libs/lzo:= ) xattr? ( sys-apps/attr:= ) ) static? ( app-arch/bzip2[static-libs] app-arch/xz-utils[static-libs] sys-libs/libcap[static-libs] sys-libs/zlib[static-libs] gcrypt? ( dev-libs/libgcrypt:0=[static-libs] ) gpg? ( app-crypt/gpgme[static-libs] dev-libs/libassuan[static-libs] dev-libs/libgpg-error[static-libs] ) lzo? ( dev-libs/lzo[static-libs] ) xattr? ( sys-apps/attr[static-libs] ) ) nls? ( sys-devel/gettext virtual/libintl ) doc? ( app-doc/doxygen )
+DESCRIPTION=A full featured backup tool, aimed for disks
+EAPI=7
+HOMEPAGE=http://dar.linux.free.fr/
+IUSE=dar32 dar64 doc gcrypt gpg lzo nls static static-libs xattr
+KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux
+LICENSE=GPL-2
+RDEPEND=>=sys-libs/zlib-1.2.3:= !static? ( app-arch/bzip2:= app-arch/xz-utils:= sys-libs/libcap gcrypt? ( dev-libs/libgcrypt:0= ) gpg? ( app-crypt/gpgme ) lzo? ( dev-libs/lzo:= ) xattr? ( sys-apps/attr:= ) )
+REQUIRED_USE=?? ( dar32 dar64 ) gpg? ( gcrypt )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/dar/dar-2.5.17.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=a8815c61c80931f7e28b87eef05cc453
diff --git a/metadata/md5-cache/app-backup/deja-dup-34.3 b/metadata/md5-cache/app-backup/deja-dup-34.3
index 400a18f1b89f..7a87450d1899 100644
--- a/metadata/md5-cache/app-backup/deja-dup-34.3
+++ b/metadata/md5-cache/app-backup/deja-dup-34.3
@@ -10,5 +10,5 @@ RDEPEND=app-admin/packagekit-base app-crypt/libsecret[vala] >=dev-libs/glib-2.34
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/deja-dup/34/34.3/+download/deja-dup-34.3.tar.xz
-_eclasses_=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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=716ac7db0c5fa733e510251cda649237
diff --git a/metadata/md5-cache/app-backup/duplicity-0.7.10 b/metadata/md5-cache/app-backup/duplicity-0.7.10
index 2fdf28c57f87..3e749bc30eff 100644
--- a/metadata/md5-cache/app-backup/duplicity-0.7.10
+++ b/metadata/md5-cache/app-backup/duplicity-0.7.10
@@ -10,5 +10,5 @@ RDEPEND=net-libs/librsync app-crypt/gnupg dev-python/lockfile dev-python/paramik
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://code.launchpad.net/duplicity/0.7-series/0.7.10/+download/duplicity-0.7.10.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c35ef623ef9e6d0ac32cfc5f4aa2ce2f
diff --git a/metadata/md5-cache/app-backup/duplicity-0.7.11 b/metadata/md5-cache/app-backup/duplicity-0.7.11
index e22f23765052..0501787602ff 100644
--- a/metadata/md5-cache/app-backup/duplicity-0.7.11
+++ b/metadata/md5-cache/app-backup/duplicity-0.7.11
@@ -10,5 +10,5 @@ RDEPEND=net-libs/librsync app-crypt/gnupg dev-python/lockfile dev-python/paramik
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://code.launchpad.net/duplicity/0.7-series/0.7.11/+download/duplicity-0.7.11.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=14a71c4b5150ab8d75e2829b3060c1ee
diff --git a/metadata/md5-cache/app-backup/duplicity-0.7.12 b/metadata/md5-cache/app-backup/duplicity-0.7.12
index 394445b417ed..22d0084f9475 100644
--- a/metadata/md5-cache/app-backup/duplicity-0.7.12
+++ b/metadata/md5-cache/app-backup/duplicity-0.7.12
@@ -10,5 +10,5 @@ RDEPEND=net-libs/librsync app-crypt/gnupg dev-python/lockfile dev-python/paramik
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://code.launchpad.net/duplicity/0.7-series/0.7.12/+download/duplicity-0.7.12.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=14a71c4b5150ab8d75e2829b3060c1ee
diff --git a/metadata/md5-cache/app-backup/duplicity-0.7.13.1 b/metadata/md5-cache/app-backup/duplicity-0.7.13.1
index b2c4e87bebf8..ae3eea0b0b54 100644
--- a/metadata/md5-cache/app-backup/duplicity-0.7.13.1
+++ b/metadata/md5-cache/app-backup/duplicity-0.7.13.1
@@ -10,5 +10,5 @@ RDEPEND=net-libs/librsync app-crypt/gnupg dev-python/fasteners[python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://code.launchpad.net/duplicity/0.7-series/0.7.13.1/+download/duplicity-0.7.13.1.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cf4fb1a57e18ab9925b0052527092a51
diff --git a/metadata/md5-cache/app-backup/duplicity-0.7.14 b/metadata/md5-cache/app-backup/duplicity-0.7.14
index 95776f9d223e..1553eb47b8fb 100644
--- a/metadata/md5-cache/app-backup/duplicity-0.7.14
+++ b/metadata/md5-cache/app-backup/duplicity-0.7.14
@@ -10,5 +10,5 @@ RDEPEND=net-libs/librsync app-crypt/gnupg dev-python/fasteners[python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://code.launchpad.net/duplicity/0.7-series/0.7.14/+download/duplicity-0.7.14.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cf4fb1a57e18ab9925b0052527092a51
diff --git a/metadata/md5-cache/app-backup/duplicity-0.7.15 b/metadata/md5-cache/app-backup/duplicity-0.7.15
index de9bff6fe53f..4a5519b2708d 100644
--- a/metadata/md5-cache/app-backup/duplicity-0.7.15
+++ b/metadata/md5-cache/app-backup/duplicity-0.7.15
@@ -10,5 +10,5 @@ RDEPEND=net-libs/librsync app-crypt/gnupg dev-python/fasteners[python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://code.launchpad.net/duplicity/0.7-series/0.7.15/+download/duplicity-0.7.15.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3fb4061b8c74074e4df0df886e44de59
diff --git a/metadata/md5-cache/app-backup/duplicity-0.7.16 b/metadata/md5-cache/app-backup/duplicity-0.7.16
index 645333d5424c..546a9a0ad5a8 100644
--- a/metadata/md5-cache/app-backup/duplicity-0.7.16
+++ b/metadata/md5-cache/app-backup/duplicity-0.7.16
@@ -10,5 +10,5 @@ RDEPEND=net-libs/librsync app-crypt/gnupg dev-python/fasteners[python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://code.launchpad.net/duplicity/0.7-series/0.7.16/+download/duplicity-0.7.16.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3fb4061b8c74074e4df0df886e44de59
diff --git a/metadata/md5-cache/app-backup/duplicity-0.7.17 b/metadata/md5-cache/app-backup/duplicity-0.7.17
index 760d5b28a1bd..3ce9b01cc218 100644
--- a/metadata/md5-cache/app-backup/duplicity-0.7.17
+++ b/metadata/md5-cache/app-backup/duplicity-0.7.17
@@ -10,5 +10,5 @@ RDEPEND=net-libs/librsync app-crypt/gnupg dev-python/fasteners[python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://code.launchpad.net/duplicity/0.7-series/0.7.17/+download/duplicity-0.7.17.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3fb4061b8c74074e4df0df886e44de59
diff --git a/metadata/md5-cache/app-backup/genbackupdata-1.9 b/metadata/md5-cache/app-backup/genbackupdata-1.9
index 25580d2226bb..e7eaa8baa3f0 100644
--- a/metadata/md5-cache/app-backup/genbackupdata-1.9
+++ b/metadata/md5-cache/app-backup/genbackupdata-1.9
@@ -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 )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/g/genbackupdata/genbackupdata_1.9.orig.tar.xz
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=edc9645abb9d467a4654f544c65a4698
diff --git a/metadata/md5-cache/app-backup/holland-1.0.10 b/metadata/md5-cache/app-backup/holland-1.0.10
index 97824592228b..2d2758250a72 100644
--- a/metadata/md5-cache/app-backup/holland-1.0.10
+++ b/metadata/md5-cache/app-backup/holland-1.0.10
@@ -10,5 +10,5 @@ RDEPEND=postgres? ( ~app-backup/holland-backup-pgdump-1.0.10[python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://hollandbackup.org/releases/stable/1.0/holland-1.0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5aa2d950ef2698dc505f5760067ddaa1
diff --git a/metadata/md5-cache/app-backup/holland-backup-example-1.0.10 b/metadata/md5-cache/app-backup/holland-backup-example-1.0.10
index 75170e79bbfa..34df075be75d 100644
--- a/metadata/md5-cache/app-backup/holland-backup-example-1.0.10
+++ b/metadata/md5-cache/app-backup/holland-backup-example-1.0.10
@@ -11,5 +11,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=http://hollandbackup.org/releases/stable/1.0/holland-1.0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=aac86b125f494bee7bf31c414293ec8c
diff --git a/metadata/md5-cache/app-backup/holland-backup-pgdump-1.0.10 b/metadata/md5-cache/app-backup/holland-backup-pgdump-1.0.10
index ffa9b05ba46e..6634f698a888 100644
--- a/metadata/md5-cache/app-backup/holland-backup-pgdump-1.0.10
+++ b/metadata/md5-cache/app-backup/holland-backup-pgdump-1.0.10
@@ -11,5 +11,5 @@ RDEPEND=~app-backup/holland-lib-common-1.0.10[python_targets_python2_7(-)?,-pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://hollandbackup.org/releases/stable/1.0/holland-1.0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f20c4732dfeb74ba12b441b9b9698624
diff --git a/metadata/md5-cache/app-backup/holland-backup-random-1.0.10 b/metadata/md5-cache/app-backup/holland-backup-random-1.0.10
index 78bb4dd73da0..67496fdf35d7 100644
--- a/metadata/md5-cache/app-backup/holland-backup-random-1.0.10
+++ b/metadata/md5-cache/app-backup/holland-backup-random-1.0.10
@@ -11,5 +11,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=http://hollandbackup.org/releases/stable/1.0/holland-1.0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d94e51417dcb2846926819b89073b2ed
diff --git a/metadata/md5-cache/app-backup/holland-backup-sqlite-1.0.10 b/metadata/md5-cache/app-backup/holland-backup-sqlite-1.0.10
index 52b5258dfeb8..b51fe2329e9d 100644
--- a/metadata/md5-cache/app-backup/holland-backup-sqlite-1.0.10
+++ b/metadata/md5-cache/app-backup/holland-backup-sqlite-1.0.10
@@ -11,5 +11,5 @@ RDEPEND=~app-backup/holland-lib-common-1.0.10[python_targets_python2_7(-)?,-pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://hollandbackup.org/releases/stable/1.0/holland-1.0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cda5ed2e673393144b38f2dfbc36baa2
diff --git a/metadata/md5-cache/app-backup/holland-lib-common-1.0.10 b/metadata/md5-cache/app-backup/holland-lib-common-1.0.10
index 5061aef26542..75015454463e 100644
--- a/metadata/md5-cache/app-backup/holland-lib-common-1.0.10
+++ b/metadata/md5-cache/app-backup/holland-lib-common-1.0.10
@@ -11,5 +11,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=http://hollandbackup.org/releases/stable/1.0/holland-1.0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3c58f13ac52095bff02ef2c9da75d150
diff --git a/metadata/md5-cache/app-backup/holland-lib-lvm-1.0.10 b/metadata/md5-cache/app-backup/holland-lib-lvm-1.0.10
index 4924d7bb68c5..420162366d37 100644
--- a/metadata/md5-cache/app-backup/holland-lib-lvm-1.0.10
+++ b/metadata/md5-cache/app-backup/holland-lib-lvm-1.0.10
@@ -11,5 +11,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=http://hollandbackup.org/releases/stable/1.0/holland-1.0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=38ee29ab792df5a754296120689ecd76
diff --git a/metadata/md5-cache/app-backup/kfoldersync-3.4.1 b/metadata/md5-cache/app-backup/kfoldersync-3.4.1
index b3b3c1beaa97..8ffc8de92e18 100644
--- a/metadata/md5-cache/app-backup/kfoldersync-3.4.1
+++ b/metadata/md5-cache/app-backup/kfoldersync-3.4.1
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/untangle-https-backup-0.0.10 b/metadata/md5-cache/app-backup/untangle-https-backup-0.0.10
new file mode 100644
index 000000000000..aa49daffacc7
--- /dev/null
+++ b/metadata/md5-cache/app-backup/untangle-https-backup-0.0.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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_python3_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=Back up Untangle configurations via the web admin UI
+EAPI=6
+HOMEPAGE=http://michael.orlitzky.com/code/untangle-https-backup.php
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3
+RDEPEND=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_python3_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=http://michael.orlitzky.com/code/releases/untangle-https-backup-0.0.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_=5826231774cf3573d466f27889d02a42
diff --git a/metadata/md5-cache/app-backup/untangle-https-backup-0.0.8 b/metadata/md5-cache/app-backup/untangle-https-backup-0.0.8
deleted file mode 100644
index d864fa48bd4d..000000000000
--- a/metadata/md5-cache/app-backup/untangle-https-backup-0.0.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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_python3_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=Back up Untangle configurations via the web admin UI
-EAPI=6
-HOMEPAGE=http://michael.orlitzky.com/code/untangle-https-backup.php
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3
-RDEPEND=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_python3_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=http://michael.orlitzky.com/code/releases/untangle-https-backup-0.0.8.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=5826231774cf3573d466f27889d02a42
diff --git a/metadata/md5-cache/app-backup/zbackup-1.4.4-r1 b/metadata/md5-cache/app-backup/zbackup-1.4.4-r1
index a694cccc8742..1b84e072c997 100644
--- a/metadata/md5-cache/app-backup/zbackup-1.4.4-r1
+++ b/metadata/md5-cache/app-backup/zbackup-1.4.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+-with-openssl-exception
 RDEPEND=app-arch/lzma dev-libs/lzo:2 dev-libs/protobuf:0= sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 SLOT=0
 SRC_URI=https://github.com/zbackup/zbackup/archive/1.4.4.tar.gz -> zbackup-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b54df4997fc0f9c539b420a9ff3e1d82
diff --git a/metadata/md5-cache/app-backup/zbackup-9999 b/metadata/md5-cache/app-backup/zbackup-9999
index d0a59499b9a7..5c991709db07 100644
--- a/metadata/md5-cache/app-backup/zbackup-9999
+++ b/metadata/md5-cache/app-backup/zbackup-9999
@@ -7,5 +7,5 @@ IUSE=libressl tartool
 LICENSE=GPL-2+-with-openssl-exception
 RDEPEND=app-arch/lzma dev-libs/lzo:2 dev-libs/protobuf:0= sys-libs/libunwind:7 sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7dbb8e7bce7b916dd6d33ae6661a8191
diff --git a/metadata/md5-cache/app-benchmarks/Manifest.gz b/metadata/md5-cache/app-benchmarks/Manifest.gz
index 5321a5847d0c..d911d80e52f3 100644
--- a/metadata/md5-cache/app-benchmarks/Manifest.gz
+++ b/metadata/md5-cache/app-benchmarks/Manifest.gz
diff --git a/metadata/md5-cache/app-benchmarks/bootchart2-0.14.7-r1 b/metadata/md5-cache/app-benchmarks/bootchart2-0.14.7-r1
index 54bde9f8af14..6f03008e168e 100644
--- a/metadata/md5-cache/app-benchmarks/bootchart2-0.14.7-r1
+++ b/metadata/md5-cache/app-benchmarks/bootchart2-0.14.7-r1
@@ -10,5 +10,5 @@ RDEPEND=!app-benchmarks/bootchart X? ( dev-python/pycairo[svg(+)?,python_targets
 REQUIRED_USE=X? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) ) test? ( X )
 SLOT=0
 SRC_URI=https://github.com/mmeeks/bootchart/archive/0.14.7.tar.gz -> bootchart2-0.14.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	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_=c3d8c60ed3915ccfa30a5035d030cd43
diff --git a/metadata/md5-cache/app-benchmarks/bootchart2-0.14.8 b/metadata/md5-cache/app-benchmarks/bootchart2-0.14.8
index feb0eef3af19..e08bbcb2e70f 100644
--- a/metadata/md5-cache/app-benchmarks/bootchart2-0.14.8
+++ b/metadata/md5-cache/app-benchmarks/bootchart2-0.14.8
@@ -10,5 +10,5 @@ RDEPEND=!app-benchmarks/bootchart X? ( dev-python/pycairo[svg(+)?,python_targets
 REQUIRED_USE=X? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) test? ( X )
 SLOT=0
 SRC_URI=https://github.com/mmeeks/bootchart/archive/0.14.8.tar.gz -> bootchart2-0.14.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	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_=444984e76373f86307fd3a29fe47ae6c
diff --git a/metadata/md5-cache/app-benchmarks/stress-1.0.4-r2 b/metadata/md5-cache/app-benchmarks/stress-1.0.4-r2
new file mode 100644
index 000000000000..a00ce772554b
--- /dev/null
+++ b/metadata/md5-cache/app-benchmarks/stress-1.0.4-r2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure
+DESCRIPTION=A deliberately simple workload generator for POSIX systems
+EAPI=7
+HOMEPAGE=https://people.seas.harvard.edu/~apw/stress
+IUSE=static
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+SLOT=0
+SRC_URI=https://people.seas.harvard.edu/~apw/stress/stress-1.0.4.tar.gz -> stress-1.0.4-r1.tar.gz
+_md5_=ebd725f33ffd7fd5427c7ea46f317c67
diff --git a/metadata/md5-cache/app-benchmarks/stress-ng-0.09.42 b/metadata/md5-cache/app-benchmarks/stress-ng-0.09.42
new file mode 100644
index 000000000000..e182c47d4e47
--- /dev/null
+++ b/metadata/md5-cache/app-benchmarks/stress-ng-0.09.42
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= net-misc/lksctp-tools sys-apps/attr sys-apps/keyutils sys-libs/libapparmor sys-libs/libcap sys-libs/zlib:=
+DESCRIPTION=Stress test for a computer system with various selectable ways
+EAPI=7
+HOMEPAGE=http://kernel.ubuntu.com/~cking/stress-ng/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= net-misc/lksctp-tools sys-apps/attr sys-apps/keyutils sys-libs/libapparmor sys-libs/libcap sys-libs/zlib:=
+SLOT=0
+SRC_URI=http://kernel.ubuntu.com/~cking/tarballs/stress-ng/stress-ng-0.09.42.tar.xz
+_md5_=6af977ecdaf190d8d5db44d6ce832330
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index 63a30b4be252..d998b73abbec 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/brasero-3.12.2-r1 b/metadata/md5-cache/app-cdr/brasero-3.12.2-r1
index bad8604fb738..07f5e293cf63 100644
--- a/metadata/md5-cache/app-cdr/brasero-3.12.2-r1
+++ b/metadata/md5-cache/app-cdr/brasero-3.12.2-r1
@@ -10,5 +10,5 @@ PDEPEND=gnome-base/gvfs
 RDEPEND=>=dev-libs/glib-2.29.14:2 >=x11-libs/gtk+-3:3[introspection?] media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=dev-libs/libxml2-2.6:2 >=x11-libs/libnotify-0.6.1:= media-libs/libcanberra[gtk3] x11-libs/libICE x11-libs/libSM introspection? ( >=dev-libs/gobject-introspection-1.30:= ) libburn? ( >=dev-libs/libburn-0.4:= >=dev-libs/libisofs-0.6.4:= ) nautilus? ( >=gnome-base/nautilus-2.91.90 ) playlist? ( >=dev-libs/totem-pl-parser-2.29.1:= ) tracker? ( >=app-misc/tracker-1:0= ) media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-meta:1.0[mp3?] x11-themes/hicolor-icon-theme css? ( media-libs/libdvdcss:1.2 ) !libburn? ( app-cdr/cdrdao app-cdr/dvd+rw-tools virtual/cdrtools ) packagekit? ( app-admin/packagekit-base )
 SLOT=0/3.1
 SRC_URI=mirror://gnome/sources/brasero/3.12/brasero-3.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ac72dc2cbe2270ecf0b6753950ca862c
diff --git a/metadata/md5-cache/app-cdr/cdemu-3.1.0 b/metadata/md5-cache/app-cdr/cdemu-3.1.0
deleted file mode 100644
index bdc7a11de778..000000000000
--- a/metadata/md5-cache/app-cdr/cdemu-3.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] 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(+)?] cdemu-daemon? ( app-cdr/cdemu-daemon:0/7 ) dev-util/desktop-file-utils >=dev-util/intltool-0.21 >=sys-devel/gettext-0.18 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Command-line tool for controlling cdemu-daemon
-EAPI=6
-HOMEPAGE=http://cdemu.org
-IUSE=+cdemu-daemon python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~hppa x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/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(+)?] cdemu-daemon? ( app-cdr/cdemu-daemon:0/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_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/cdemu/cdemu-client-3.1.0.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=e558c26ad9b14ef75a503ecda08c39b1
diff --git a/metadata/md5-cache/app-cdr/cdemu-3.2.0 b/metadata/md5-cache/app-cdr/cdemu-3.2.0
index 84a9c5b6a969..d3cf05de9a79 100644
--- a/metadata/md5-cache/app-cdr/cdemu-3.2.0
+++ b/metadata/md5-cache/app-cdr/cdemu-3.2.0
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/cdemu/cdemu-client-3.2.0.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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_=7ba84c45fdcebe031ef90e3d48973600
diff --git a/metadata/md5-cache/app-cdr/cdemu-daemon-3.1.0 b/metadata/md5-cache/app-cdr/cdemu-daemon-3.1.0
deleted file mode 100644
index 4c113492f281..000000000000
--- a/metadata/md5-cache/app-cdr/cdemu-daemon-3.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/libmirage-3.1.0:= >=media-libs/libao-0.8.0:= sys-apps/dbus >=sys-fs/vhba-20130607 dev-util/intltool sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Daemon of the CDEmu optical media image mounting suite
-EAPI=6
-HOMEPAGE=http://cdemu.org
-KEYWORDS=amd64 ~hppa x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/libmirage-3.1.0:= >=media-libs/libao-0.8.0:= sys-apps/dbus >=sys-fs/vhba-20130607
-SLOT=0/7
-SRC_URI=mirror://sourceforge/cdemu/cdemu-daemon-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=24fed8bf8b9bdb9cb3a12fddcc396b04
diff --git a/metadata/md5-cache/app-cdr/cdemu-daemon-3.2.1 b/metadata/md5-cache/app-cdr/cdemu-daemon-3.2.1
index ae55e369f64d..098055aab09e 100644
--- a/metadata/md5-cache/app-cdr/cdemu-daemon-3.2.1
+++ b/metadata/md5-cache/app-cdr/cdemu-daemon-3.2.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/libmirage-3.2.0:= >=media-libs/libao-0.8.0:= sys-apps/dbus >=sys-fs/vhba-20130607
 SLOT=0/7
 SRC_URI=mirror://sourceforge/cdemu/cdemu-daemon-3.2.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7ecb87707e5376d7103d28cdb0a25b82
diff --git a/metadata/md5-cache/app-cdr/dvdisaster-0.72.4 b/metadata/md5-cache/app-cdr/dvdisaster-0.72.4
index c2ec0ad0a643..6f3b0a104ad4 100644
--- a/metadata/md5-cache/app-cdr/dvdisaster-0.72.4
+++ b/metadata/md5-cache/app-cdr/dvdisaster-0.72.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/bzip2 >=dev-libs/glib-2.20 media-libs/libpng:0 sys-libs/zlib >=x11-libs/gtk+-2.14:2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/dvdisaster/dvdisaster_0.72.4.orig.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c3f39730431eac3a44fb4b98dcdfd1f8
diff --git a/metadata/md5-cache/app-cdr/dvdisaster-0.79.5 b/metadata/md5-cache/app-cdr/dvdisaster-0.79.5
index da61f65974f0..7f43520f9f09 100644
--- a/metadata/md5-cache/app-cdr/dvdisaster-0.79.5
+++ b/metadata/md5-cache/app-cdr/dvdisaster-0.79.5
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst
-DEPEND=>=dev-libs/glib-2.32 nls? ( virtual/libintl ) >=x11-libs/gtk+-2.6:2 x11-libs/gdk-pixbuf nls? ( sys-devel/gettext ) virtual/os-headers virtual/pkgconfig >=sys-apps/sed-4
+DEFINED_PHASES=compile configure install postinst postrm
+DEPEND=>=dev-libs/glib-2.32:2 nls? ( virtual/libintl ) >=x11-libs/gtk+-2.6:2 x11-libs/gdk-pixbuf nls? ( sys-devel/gettext ) virtual/os-headers virtual/pkgconfig >=sys-apps/sed-4
 DESCRIPTION=Tool for creating error correction data (ecc) for optical media (DVD, CD, BD)
-EAPI=5
+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 nls? ( virtual/libintl ) >=x11-libs/gtk+-2.6:2 x11-libs/gdk-pixbuf
+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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=b5d3d496e6c326baa2289c11a1752636
+_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
diff --git a/metadata/md5-cache/app-cdr/gcdemu-3.1.0 b/metadata/md5-cache/app-cdr/gcdemu-3.1.0
deleted file mode 100644
index d8d97273242d..000000000000
--- a/metadata/md5-cache/app-cdr/gcdemu-3.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-util/desktop-file-utils >=dev-util/intltool-0.21 sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Gtk+ GUI for controlling cdemu-daemon
-EAPI=6
-HOMEPAGE=http://cdemu.org/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=amd64 x86
-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(+)?] app-cdr/cdemu-daemon:0/7 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(+)?] gnome-base/librsvg:2 x11-libs/gdk-pixbuf[introspection] x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection]
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://sourceforge/cdemu/gcdemu-3.1.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=e1bf730e710762dfb9af1e12deda116e
diff --git a/metadata/md5-cache/app-cdr/gcdemu-3.2.0 b/metadata/md5-cache/app-cdr/gcdemu-3.2.0
index 9d91c386b992..3ebf62c5afd6 100644
--- a/metadata/md5-cache/app-cdr/gcdemu-3.2.0
+++ b/metadata/md5-cache/app-cdr/gcdemu-3.2.0
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/cdemu/gcdemu-3.2.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=394bd321e31b86cf493a6b7f23f6e369
diff --git a/metadata/md5-cache/app-cdr/graveman-0.3.12_p5-r2 b/metadata/md5-cache/app-cdr/graveman-0.3.12_p5-r2
index c986e5bc972f..759ba38c1e00 100644
--- a/metadata/md5-cache/app-cdr/graveman-0.3.12_p5-r2
+++ b/metadata/md5-cache/app-cdr/graveman-0.3.12_p5-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-cdr/cdrdao >=dev-libs/glib-2.4:2 >=gnome-base/libglade-2.4:2.0 media-libs/libmng:= virtual/cdrtools x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.4:2 dvdr? ( app-cdr/dvd+rw-tools ) flac? ( media-libs/flac ) mp3? ( media-libs/libid3tag media-libs/libmad media-sound/sox ) nls? ( virtual/libintl ) vorbis? ( media-libs/libogg media-libs/libvorbis media-sound/sox )
 SLOT=0
 SRC_URI=http://graveman.tuxfamily.org/sources/graveman-0.3.12-5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9602a60b7b915f50c093bbea031ae09a
diff --git a/metadata/md5-cache/app-cdr/isoimagewriter-0.2 b/metadata/md5-cache/app-cdr/isoimagewriter-0.2
index b8739fac6732..9589f6ce620b 100644
--- a/metadata/md5-cache/app-cdr/isoimagewriter-0.2
+++ b/metadata/md5-cache/app-cdr/isoimagewriter-0.2
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/isomaster-1.3.13 b/metadata/md5-cache/app-cdr/isomaster-1.3.13
index 0962bcab277a..e2287e17e7ab 100644
--- a/metadata/md5-cache/app-cdr/isomaster-1.3.13
+++ b/metadata/md5-cache/app-cdr/isomaster-1.3.13
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/iniparser-3.0.0:0 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://littlesvr.ca/isomaster/releases/isomaster-1.3.13.tar.bz2
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1b3fec1f9cdcb643d74d2423cdd7fd97
diff --git a/metadata/md5-cache/app-cdr/isomaster-1.3.14 b/metadata/md5-cache/app-cdr/isomaster-1.3.14
index d0bddb896d92..4b1b35d8afdd 100644
--- a/metadata/md5-cache/app-cdr/isomaster-1.3.14
+++ b/metadata/md5-cache/app-cdr/isomaster-1.3.14
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/iniparser-4.1:4 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://littlesvr.ca/isomaster/releases/isomaster-1.3.14.tar.bz2
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a7362618fa2fed12b9fe50d4da9bda6a
diff --git a/metadata/md5-cache/app-cdr/kcdemu-0.7.2 b/metadata/md5-cache/app-cdr/kcdemu-0.7.2
index 0fb4bd4d0cf9..754b5398ad4f 100644
--- a/metadata/md5-cache/app-cdr/kcdemu-0.7.2
+++ b/metadata/md5-cache/app-cdr/kcdemu-0.7.2
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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-cdr/nero-4.0.0.0b-r2 b/metadata/md5-cache/app-cdr/nero-4.0.0.0b-r2
index eb03a9d4d9f0..3867c564a259 100644
--- a/metadata/md5-cache/app-cdr/nero-4.0.0.0b-r2
+++ b/metadata/md5-cache/app-cdr/nero-4.0.0.0b-r2
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXinerama x11-libs/pango[X]
 RESTRICT=strip mirror test fetch
 SLOT=0
 SRC_URI=x86? ( nerolinux-4.0.0.0b-x86.rpm ) amd64? ( nero/nerolinux-4.0.0.0b-x86_64.rpm )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d45be684e6640cc779b38f1e8c600e1e
diff --git a/metadata/md5-cache/app-cdr/sync2cd-1.3-r1 b/metadata/md5-cache/app-cdr/sync2cd-1.3-r1
index c38b9aa643a7..e8693e28a243 100644
--- a/metadata/md5-cache/app-cdr/sync2cd-1.3-r1
+++ b/metadata/md5-cache/app-cdr/sync2cd-1.3-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/eject cdr? ( virtual/cdrtools ) dvdr? ( app-cdr/dvd+rw-tools ) p
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.calins.ch/download/sync2cd/sync2cd-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f83a321d1d1de9c6b6a900574d133c58
diff --git a/metadata/md5-cache/app-cdr/xcdroast-0.98_alpha16-r3 b/metadata/md5-cache/app-cdr/xcdroast-0.98_alpha16-r3
index f47fa84b51b0..983eca9f7f30 100644
--- a/metadata/md5-cache/app-cdr/xcdroast-0.98_alpha16-r3
+++ b/metadata/md5-cache/app-cdr/xcdroast-0.98_alpha16-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2:2 app-cdr/cdrtools
 SLOT=0
 SRC_URI=mirror://sourceforge/xcdroast/xcdroast-0.98alpha16.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b63c54809b5aa7e6df5d1351f5ae1b74
diff --git a/metadata/md5-cache/app-cdr/xfburn-0.5.5 b/metadata/md5-cache/app-cdr/xfburn-0.5.5
index f81f32937259..8c31561cac98 100644
--- a/metadata/md5-cache/app-cdr/xfburn-0.5.5
+++ b/metadata/md5-cache/app-cdr/xfburn-0.5.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.32:= >=dev-libs/libburn-0.4.2:= >=dev-libs/libisofs-0.6.2:= >=x11-libs/gtk+-2.24:2= >=xfce-base/exo-0.6:= >=xfce-base/libxfce4ui-4.10:= gstreamer? ( media-libs/gstreamer:1.0= media-libs/gst-plugins-base:1.0= ) udev? ( virtual/libgudev:= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfburn/0.5/xfburn-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=96964ad9ccf44eb7341892a8aca641dc
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 0dc0dba7881c..ded0285c3a06 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-0.24.0 b/metadata/md5-cache/app-crypt/acme-0.24.0
deleted file mode 100644
index 659efa27e0ca..000000000000
--- a/metadata/md5-cache/app-crypt/acme-0.24.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=dev-python/cryptography-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/josepy-1.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/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/pyopenssl-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/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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.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/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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-xdist[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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-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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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 implementation of the ACME protocol
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm ~ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/cryptography-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/josepy-1.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/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/pyopenssl-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/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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.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/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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/certbot/certbot/archive/v0.24.0.tar.gz -> certbot-0.24.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=23b04df47634a50e31466fa2eef8b826
diff --git a/metadata/md5-cache/app-crypt/acme-0.25.1 b/metadata/md5-cache/app-crypt/acme-0.25.1
index 3c775291ec97..2e02b6331554 100644
--- a/metadata/md5-cache/app-crypt/acme-0.25.1
+++ b/metadata/md5-cache/app-crypt/acme-0.25.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/cryptography-0.8[python_targets_python2_7(-)?,python_target
 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/certbot/certbot/archive/v0.25.1.tar.gz -> certbot-0.25.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=47f48870a792a829fb406c2802385848
diff --git a/metadata/md5-cache/app-crypt/acme-0.26.0 b/metadata/md5-cache/app-crypt/acme-0.26.0
deleted file mode 100644
index 90c1055e60bc..000000000000
--- a/metadata/md5-cache/app-crypt/acme-0.26.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=dev-python/cryptography-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/josepy-1.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/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/pyopenssl-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/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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.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/requests-toolbelt-0.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/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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-xdist[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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-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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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 implementation of the ACME protocol
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/cryptography-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/josepy-1.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/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/pyopenssl-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/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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.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/requests-toolbelt-0.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/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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/certbot/certbot/archive/v0.26.0.tar.gz -> certbot-0.26.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=d1a7abec592349f646d918532d93eb3f
diff --git a/metadata/md5-cache/app-crypt/acme-0.27.1 b/metadata/md5-cache/app-crypt/acme-0.27.1
index 73898bdd94a7..326d52062cff 100644
--- a/metadata/md5-cache/app-crypt/acme-0.27.1
+++ b/metadata/md5-cache/app-crypt/acme-0.27.1
@@ -4,11 +4,11 @@ DESCRIPTION=An implementation of the ACME protocol
 EAPI=6
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/cryptography-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/josepy-1.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/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/pyopenssl-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/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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.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/requests-toolbelt-0.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/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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/certbot/certbot/archive/v0.27.1.tar.gz -> certbot-0.27.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=d1a7abec592349f646d918532d93eb3f
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=909ea6adaa595298267fa985a70e527a
diff --git a/metadata/md5-cache/app-crypt/acme-9999 b/metadata/md5-cache/app-crypt/acme-9999
index eb1a8885a8cc..0e6a56879c26 100644
--- a/metadata/md5-cache/app-crypt/acme-9999
+++ b/metadata/md5-cache/app-crypt/acme-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-python/cryptography-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/josepy-1.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/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/pyopenssl-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/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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.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/requests-toolbelt-0.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/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=1571888aef854a3e1f7e1cd74c71a2ed
diff --git a/metadata/md5-cache/app-crypt/acme-tiny-4.0.3 b/metadata/md5-cache/app-crypt/acme-tiny-4.0.3
index 67593a062182..e628835d0b5b 100644
--- a/metadata/md5-cache/app-crypt/acme-tiny-4.0.3
+++ b/metadata/md5-cache/app-crypt/acme-tiny-4.0.3
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/openssl:0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r
 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/diafygi/acme-tiny/archive/4.0.3.tar.gz -> acme-tiny-4.0.3.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ef1cb9643ad314b134f8203d6af5a7ba
diff --git a/metadata/md5-cache/app-crypt/af_alg-0.0.1 b/metadata/md5-cache/app-crypt/af_alg-0.0.1
index 401eb33fa419..7039203480fe 100644
--- a/metadata/md5-cache/app-crypt/af_alg-0.0.1
+++ b/metadata/md5-cache/app-crypt/af_alg-0.0.1
@@ -9,5 +9,5 @@ LICENSE=openssl
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gentoo/af_alg-0.0.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=e069a3c7ff19db2a2ee1a528f35a9526
diff --git a/metadata/md5-cache/app-crypt/bestcrypt-2.0.11 b/metadata/md5-cache/app-crypt/bestcrypt-2.0.11
index 119f80b026fd..58ea29639e94 100644
--- a/metadata/md5-cache/app-crypt/bestcrypt-2.0.11
+++ b/metadata/md5-cache/app-crypt/bestcrypt-2.0.11
@@ -9,5 +9,5 @@ LICENSE=bestcrypt
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://www.jetico.com/linux/BestCrypt-2.0.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=44ecd6614ad9bb31dc1fa8409cb992a6
diff --git a/metadata/md5-cache/app-crypt/bestcrypt-2.0.14 b/metadata/md5-cache/app-crypt/bestcrypt-2.0.14
index 065f09d1a5a7..2708f0fe6923 100644
--- a/metadata/md5-cache/app-crypt/bestcrypt-2.0.14
+++ b/metadata/md5-cache/app-crypt/bestcrypt-2.0.14
@@ -9,5 +9,5 @@ LICENSE=bestcrypt
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://www.jetico.com/linux/BestCrypt-2.0.14.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=ff6b421728ab3d4968ecd1a6df1c0d94
diff --git a/metadata/md5-cache/app-crypt/certbot-0.24.0 b/metadata/md5-cache/app-crypt/certbot-0.24.0
deleted file mode 100644
index 6b1bfcb56abe..000000000000
--- a/metadata/md5-cache/app-crypt/certbot-0.24.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_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/astroid-1.3.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/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/ipdb[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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-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(-)] dev-python/pytest-xdist[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pylint-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/wheel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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=Let's encrypt client to automate deployment of X.509 certificates
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm ~ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >app-crypt/acme-0.21.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/configargparse-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(-)] dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/josepy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/parsedatetime-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/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v0.24.0.tar.gz -> certbot-0.24.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=cc4373e421ce8bc7bf2afb23fff184c5
diff --git a/metadata/md5-cache/app-crypt/certbot-0.25.1 b/metadata/md5-cache/app-crypt/certbot-0.25.1
index 79ea32b2cd41..873639fd1792 100644
--- a/metadata/md5-cache/app-crypt/certbot-0.25.1
+++ b/metadata/md5-cache/app-crypt/certbot-0.25.1
@@ -10,5 +10,5 @@ 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
 SRC_URI=https://github.com/certbot/certbot/archive/v0.25.1.tar.gz -> certbot-0.25.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d46d55f38adc5cec22362797f2bb6004
diff --git a/metadata/md5-cache/app-crypt/certbot-0.26.1 b/metadata/md5-cache/app-crypt/certbot-0.26.1
deleted file mode 100644
index bc6f920ec6a0..000000000000
--- a/metadata/md5-cache/app-crypt/certbot-0.26.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_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/astroid-1.3.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/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/ipdb[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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-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(-)] dev-python/pytest-xdist[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pylint-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/wheel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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=Let's encrypt client to automate deployment of X.509 certificates
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >app-crypt/acme-0.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/configargparse-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(-)] dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/josepy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/parsedatetime-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/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v0.26.1.tar.gz -> certbot-0.26.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=188004de7038c831c043aa7890e5023e
diff --git a/metadata/md5-cache/app-crypt/certbot-0.27.1 b/metadata/md5-cache/app-crypt/certbot-0.27.1
index 342a8cc671c0..ff5d2c993a22 100644
--- a/metadata/md5-cache/app-crypt/certbot-0.27.1
+++ b/metadata/md5-cache/app-crypt/certbot-0.27.1
@@ -4,11 +4,11 @@ DESCRIPTION=Let's encrypt client to automate deployment of X.509 certificates
 EAPI=6
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.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/configargparse-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(-)] dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/josepy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/parsedatetime-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/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v0.27.1.tar.gz -> certbot-0.27.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=c863970dc8b46dfefdaecad3697994c0
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d92dd42a4964c9cf580b882b9d799674
diff --git a/metadata/md5-cache/app-crypt/certbot-9999 b/metadata/md5-cache/app-crypt/certbot-9999
index bd2435e047a3..1dbdf48eb029 100644
--- a/metadata/md5-cache/app-crypt/certbot-9999
+++ b/metadata/md5-cache/app-crypt/certbot-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >app-crypt/acme-0.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/configargparse-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(-)] dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/josepy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/parsedatetime-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/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=188004de7038c831c043aa7890e5023e
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-0.24.0 b/metadata/md5-cache/app-crypt/certbot-apache-0.24.0
deleted file mode 100644
index 4bd25fa9be7b..000000000000
--- a/metadata/md5-cache/app-crypt/certbot-apache-0.24.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=app-crypt/certbot-0.21.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.21.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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/python-augeas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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/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=Apache plugin for certbot (Let's Encrypt Client)
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=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=>=app-crypt/certbot-0.21.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.21.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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/python-augeas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v0.24.0.tar.gz -> certbot-0.24.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=d87198043c9a15f93e724bcb070e9d60
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-0.25.1 b/metadata/md5-cache/app-crypt/certbot-apache-0.25.1
index 7dd3af9ed37d..a687e6444454 100644
--- a/metadata/md5-cache/app-crypt/certbot-apache-0.25.1
+++ b/metadata/md5-cache/app-crypt/certbot-apache-0.25.1
@@ -10,5 +10,5 @@ RDEPEND=>=app-crypt/certbot-0.21.1[python_targets_python2_7(-)?,python_targets_p
 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/certbot/certbot/archive/v0.25.1.tar.gz -> certbot-0.25.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7ba8a64a4edde722f5a7be01250b4860
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-0.26.0 b/metadata/md5-cache/app-crypt/certbot-apache-0.26.0
deleted file mode 100644
index 6a2227dc49e7..000000000000
--- a/metadata/md5-cache/app-crypt/certbot-apache-0.26.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=app-crypt/certbot-0.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(-)] >=app-crypt/acme-0.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/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/python-augeas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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/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=Apache plugin for certbot (Let's Encrypt Client)
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=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=>=app-crypt/certbot-0.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(-)] >=app-crypt/acme-0.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/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/python-augeas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v0.26.0.tar.gz -> certbot-0.26.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=2d06eaba6604e6d3852e1619759ed996
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-0.27.1 b/metadata/md5-cache/app-crypt/certbot-apache-0.27.1
index 8b00247ed941..b7475f0639c1 100644
--- a/metadata/md5-cache/app-crypt/certbot-apache-0.27.1
+++ b/metadata/md5-cache/app-crypt/certbot-apache-0.27.1
@@ -4,11 +4,11 @@ DESCRIPTION=Apache plugin for certbot (Let's Encrypt Client)
 EAPI=6
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=app-crypt/certbot-0.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(-)] >=app-crypt/acme-0.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/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/python-augeas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v0.27.1.tar.gz -> certbot-0.27.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=2d06eaba6604e6d3852e1619759ed996
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=fb8eec82621910392ca603f30f9e46ad
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-9999 b/metadata/md5-cache/app-crypt/certbot-apache-9999
index 3cf1366ac581..fba0c174a601 100644
--- a/metadata/md5-cache/app-crypt/certbot-apache-9999
+++ b/metadata/md5-cache/app-crypt/certbot-apache-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=app-crypt/certbot-0.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(-)] >=app-crypt/acme-0.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/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/python-augeas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=2d06eaba6604e6d3852e1619759ed996
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-0.24.0 b/metadata/md5-cache/app-crypt/certbot-nginx-0.24.0
deleted file mode 100644
index 9d1e5939221a..000000000000
--- a/metadata/md5-cache/app-crypt/certbot-nginx-0.24.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_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=Nginx plugin for certbot (Let's Encrypt Client)
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/certbot-0.21.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.21.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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/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/pyparsing-1.5.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/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v0.24.0.tar.gz -> certbot-0.24.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=4d10a6ca3b06619b627a8f374462c332
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-0.25.1 b/metadata/md5-cache/app-crypt/certbot-nginx-0.25.1
index f384c400d5aa..8ad0ed50ef84 100644
--- a/metadata/md5-cache/app-crypt/certbot-nginx-0.25.1
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-0.25.1
@@ -10,5 +10,5 @@ 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
 SRC_URI=https://github.com/certbot/certbot/archive/v0.25.1.tar.gz -> certbot-0.25.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=175bf3ded377a3cfbba30ad2b68a196e
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-0.26.0 b/metadata/md5-cache/app-crypt/certbot-nginx-0.26.0
deleted file mode 100644
index 144a583cd964..000000000000
--- a/metadata/md5-cache/app-crypt/certbot-nginx-0.26.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_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=Nginx plugin for certbot (Let's Encrypt Client)
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/certbot-0.22.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(-)] >=app-crypt/acme-0.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/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/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/pyparsing-1.5.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/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v0.26.0.tar.gz -> certbot-0.26.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=0a22d3ab5aebaf2d3ded91c3fb7caa9f
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-0.27.1 b/metadata/md5-cache/app-crypt/certbot-nginx-0.27.1
index ec747c65d021..6b25848cf0d6 100644
--- a/metadata/md5-cache/app-crypt/certbot-nginx-0.27.1
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-0.27.1
@@ -4,11 +4,11 @@ DESCRIPTION=Nginx plugin for certbot (Let's Encrypt Client)
 EAPI=6
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/certbot-0.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(-)] >=app-crypt/acme-0.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/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/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/pyparsing-1.5.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/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v0.27.1.tar.gz -> certbot-0.27.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=9be5ac5e32840648d59d9d03fe8a9261
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=8d39e6e2d7cf3f5cfcd82006fd2d93d2
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-9999 b/metadata/md5-cache/app-crypt/certbot-nginx-9999
index d5f46ebc4a0f..095bed84539e 100644
--- a/metadata/md5-cache/app-crypt/certbot-nginx-9999
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/certbot-0.22.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(-)] >=app-crypt/acme-0.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/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/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/pyparsing-1.5.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/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=0a22d3ab5aebaf2d3ded91c3fb7caa9f
diff --git a/metadata/md5-cache/app-crypt/easy-rsa-3.0.5 b/metadata/md5-cache/app-crypt/easy-rsa-3.0.5
new file mode 100644
index 000000000000..72a8b471258c
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/easy-rsa-3.0.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=!libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl )
+DESCRIPTION=Small RSA key management package, based on OpenSSL
+EAPI=7
+HOMEPAGE=https://openvpn.net/
+IUSE=libressl
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) !<net-vpn/openvpn-2.3
+SLOT=0
+SRC_URI=https://github.com/OpenVPN/easy-rsa/archive/v3.0.5.tar.gz -> easy-rsa-3.0.5.tar.gz
+_md5_=e1780ebebd0ecdabc011bf96797303a7
diff --git a/metadata/md5-cache/app-crypt/eid-mw-4.3.6 b/metadata/md5-cache/app-crypt/eid-mw-4.3.6
index d47c0d4d891b..26b5bfabafe5 100644
--- a/metadata/md5-cache/app-crypt/eid-mw-4.3.6
+++ b/metadata/md5-cache/app-crypt/eid-mw-4.3.6
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/pcsc-lite-1.2.9 gtk? ( x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk
 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	89bb9f083a2590d9b447fd0b78a96186
+_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/eid-mw-4.4.1 b/metadata/md5-cache/app-crypt/eid-mw-4.4.1
index 1fb2670dfdab..337bc381d5a9 100644
--- a/metadata/md5-cache/app-crypt/eid-mw-4.4.1
+++ b/metadata/md5-cache/app-crypt/eid-mw-4.4.1
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/pcsc-lite-1.2.9 gtk? ( x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk
 REQUIRED_USE=dialogs? ( gtk )
 SLOT=0
 SRC_URI=https://codeload.github.com/fedict/eid-mw/tar.gz/v4.4.1 -> eid-mw-4.4.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2c5cabd31324c6e83754ac1a86b24efd
diff --git a/metadata/md5-cache/app-crypt/eid-mw-9999 b/metadata/md5-cache/app-crypt/eid-mw-9999
index d49da88a6b68..a9727ddb81da 100644
--- a/metadata/md5-cache/app-crypt/eid-mw-9999
+++ b/metadata/md5-cache/app-crypt/eid-mw-9999
@@ -8,5 +8,5 @@ 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
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozextension	f47f008a138943f9e40e37c1fca10b24	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozextension	f47f008a138943f9e40e37c1fca10b24	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5f647d5e99a0095d76d77eb63a4c915a
diff --git a/metadata/md5-cache/app-crypt/ekeyd-1.1.4-r2 b/metadata/md5-cache/app-crypt/ekeyd-1.1.4-r2
index e2f2b768f6f8..cef7c6413c81 100644
--- a/metadata/md5-cache/app-crypt/ekeyd-1.1.4-r2
+++ b/metadata/md5-cache/app-crypt/ekeyd-1.1.4-r2
@@ -10,5 +10,5 @@ RDEPEND=!minimal? ( dev-lang/lua usb? ( virtual/libusb:0 ) dev-lua/luasocket ker
 REQUIRED_USE=minimal? ( !munin !usb )
 SLOT=0
 SRC_URI=http://www.entropykey.co.uk/res/download/ekeyd-1.1.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e40ad0dd489383040576c38f1b449860
diff --git a/metadata/md5-cache/app-crypt/ekeyd-1.1.5 b/metadata/md5-cache/app-crypt/ekeyd-1.1.5
index 5b963ca09791..2ff91020e128 100644
--- a/metadata/md5-cache/app-crypt/ekeyd-1.1.5
+++ b/metadata/md5-cache/app-crypt/ekeyd-1.1.5
@@ -10,5 +10,5 @@ RDEPEND=!minimal? ( dev-lang/lua dev-lua/luasocket kernel_linux? ( virtual/udev
 REQUIRED_USE=minimal? ( !munin )
 SLOT=0
 SRC_URI=mirror://ubuntu/pool/universe/e/ekeyd/ekeyd_1.1.5.orig.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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_=fa6826ad0a375a1eb18214ff83571967
diff --git a/metadata/md5-cache/app-crypt/ekeyd-1.1.5-r1 b/metadata/md5-cache/app-crypt/ekeyd-1.1.5-r1
index b42c466e298d..5da27d95c6e6 100644
--- a/metadata/md5-cache/app-crypt/ekeyd-1.1.5-r1
+++ b/metadata/md5-cache/app-crypt/ekeyd-1.1.5-r1
@@ -10,5 +10,5 @@ RDEPEND=!minimal? ( dev-lang/lua dev-lua/luasocket kernel_linux? ( virtual/udev
 REQUIRED_USE=minimal? ( !munin )
 SLOT=0
 SRC_URI=mirror://ubuntu/pool/universe/e/ekeyd/ekeyd_1.1.5.orig.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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_=4ab23db1c80ae14668711bdc8c633f99
diff --git a/metadata/md5-cache/app-crypt/gcr-3.20.0 b/metadata/md5-cache/app-crypt/gcr-3.20.0
index 891382fb905c..74f79b3db6ff 100644
--- a/metadata/md5-cache/app-crypt/gcr-3.20.0
+++ b/metadata/md5-cache/app-crypt/gcr-3.20.0
@@ -10,5 +10,5 @@ RDEPEND=>=app-crypt/p11-kit-0.19 >=dev-libs/glib-2.38:2 >=dev-libs/libgcrypt-1.2
 REQUIRED_USE=vala? ( introspection )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/gcr/3.20/gcr-3.20.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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8b2e435932978c30cac5f1722fc3c52c
diff --git a/metadata/md5-cache/app-crypt/gcr-3.28.0 b/metadata/md5-cache/app-crypt/gcr-3.28.0
index 4f702074f639..508f50fb85fe 100644
--- a/metadata/md5-cache/app-crypt/gcr-3.28.0
+++ b/metadata/md5-cache/app-crypt/gcr-3.28.0
@@ -10,5 +10,5 @@ RDEPEND=>=app-crypt/p11-kit-0.19 >=dev-libs/glib-2.38:2 >=dev-libs/libgcrypt-1.2
 REQUIRED_USE=vala? ( introspection )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/gcr/3.28/gcr-3.28.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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8c1c92fba4c22e6d8fe271c7241c7735
diff --git a/metadata/md5-cache/app-crypt/gkeys-0.2 b/metadata/md5-cache/app-crypt/gkeys-0.2
index dfb5e620468e..eb484fcd96bb 100644
--- a/metadata/md5-cache/app-crypt/gkeys-0.2
+++ b/metadata/md5-cache/app-crypt/gkeys-0.2
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/gnupg >=dev-python/pyGPG-0.2[python_targets_python2_7(-)?,pyth
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dolsen/releases/gkeys/gkeys-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e63225bcb144cd2521312dca4a2fdd96
diff --git a/metadata/md5-cache/app-crypt/gkeys-9999 b/metadata/md5-cache/app-crypt/gkeys-9999
index 30d3d3f65e52..dc6903d03368 100644
--- a/metadata/md5-cache/app-crypt/gkeys-9999
+++ b/metadata/md5-cache/app-crypt/gkeys-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-crypt/gnupg =dev-python/pyGPG-9999[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/ssl-fetch-9999[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/snakeoil-0.6.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(-)] >=app-crypt/gentoo-keys-201501052117 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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_=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	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ba79912344aef74571dd7b04a1467eb1
diff --git a/metadata/md5-cache/app-crypt/glep63-check-6 b/metadata/md5-cache/app-crypt/glep63-check-6
index 2b15226afd6e..ecd1d8458f04 100644
--- a/metadata/md5-cache/app-crypt/glep63-check-6
+++ b/metadata/md5-cache/app-crypt/glep63-check-6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mgorny/glep63-check/archive/v6.tar.gz -> glep63-check-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fdd6c88b3244cbf7110e109d3967a6c3
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.2.10-r1 b/metadata/md5-cache/app-crypt/gnupg-2.2.10-r1
new file mode 100644
index 000000000000..7fd48441a94a
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/gnupg-2.2.10-r1
@@ -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 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/libnitrokey-3.3 b/metadata/md5-cache/app-crypt/libnitrokey-3.3
index 3e71cc631938..af39c2a82b66 100644
--- a/metadata/md5-cache/app-crypt/libnitrokey-3.3
+++ b/metadata/md5-cache/app-crypt/libnitrokey-3.3
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/hidapi:= virtual/udev
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Nitrokey/libnitrokey/archive/v3.3.tar.gz -> libnitrokey-3.3.tar.gz
-_eclasses_=cmake-utils	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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=167b4440d5c1743588c6d2c4def9994b
diff --git a/metadata/md5-cache/app-crypt/libnitrokey-9999 b/metadata/md5-cache/app-crypt/libnitrokey-9999
index 0c4c355d6981..0e3393844541 100644
--- a/metadata/md5-cache/app-crypt/libnitrokey-9999
+++ b/metadata/md5-cache/app-crypt/libnitrokey-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/hidapi:= virtual/udev
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=167b4440d5c1743588c6d2c4def9994b
diff --git a/metadata/md5-cache/app-crypt/libsecret-0.18.6 b/metadata/md5-cache/app-crypt/libsecret-0.18.6
index d3d079f23ef8..77ea58ba64b3 100644
--- a/metadata/md5-cache/app-crypt/libsecret-0.18.6
+++ b/metadata/md5-cache/app-crypt/libsecret-0.18.6
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.38:2 crypt? ( >=dev-libs/libgcrypt-1.2.2:0= ) introspe
 REQUIRED_USE=test? ( introspection ) vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libsecret/0.18/libsecret-0.18.6.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-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=968be2b813deb845abb5411369d8750c
diff --git a/metadata/md5-cache/app-crypt/libsecret-0.18.6-r1 b/metadata/md5-cache/app-crypt/libsecret-0.18.6-r1
index f78fc74acd1b..5f2d3961ccc7 100644
--- a/metadata/md5-cache/app-crypt/libsecret-0.18.6-r1
+++ b/metadata/md5-cache/app-crypt/libsecret-0.18.6-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi
 REQUIRED_USE=test? ( introspection ) vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libsecret/0.18/libsecret-0.18.6.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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=903f109f5cac6fdf92d47bf417b2d765
diff --git a/metadata/md5-cache/app-crypt/libu2f-host-1.1.1 b/metadata/md5-cache/app-crypt/libu2f-host-1.1.1
index c26fafc71c4d..7b32b026d86b 100644
--- a/metadata/md5-cache/app-crypt/libu2f-host-1.1.1
+++ b/metadata/md5-cache/app-crypt/libu2f-host-1.1.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-libs/hidapi dev-libs/json-c:= systemd? ( sys-apps/systemd[acl] )
 SLOT=0
 SRC_URI=https://developers.yubico.com/libu2f-host/Releases/libu2f-host-1.1.1.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3262a9d96900598c6820399ebc328b5d
diff --git a/metadata/md5-cache/app-crypt/libu2f-host-1.1.3 b/metadata/md5-cache/app-crypt/libu2f-host-1.1.3
index d78ce7a8d144..654d5d99129a 100644
--- a/metadata/md5-cache/app-crypt/libu2f-host-1.1.3
+++ b/metadata/md5-cache/app-crypt/libu2f-host-1.1.3
@@ -10,5 +10,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-libs/hidapi dev-libs/json-c:= systemd? ( sys-apps/systemd[acl] )
 SLOT=0
 SRC_URI=https://developers.yubico.com/libu2f-host/Releases/libu2f-host-1.1.3.tar.xz
-_eclasses_=linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=777c8a7b3c0a1e0bb530d1bb7f4acc9b
diff --git a/metadata/md5-cache/app-crypt/libu2f-host-1.1.6 b/metadata/md5-cache/app-crypt/libu2f-host-1.1.6
new file mode 100644
index 000000000000..cb69dc39fb54
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/libu2f-host-1.1.6
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=install postinst prepare setup
+DEPEND=dev-libs/hidapi dev-libs/json-c:=
+DESCRIPTION=Yubico Universal 2nd Factor (U2F) Host C Library
+EAPI=7
+HOMEPAGE=https://developers.yubico.com/libu2f-host/
+IUSE=kernel_linux static-libs systemd kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2
+RDEPEND=dev-libs/hidapi dev-libs/json-c:= systemd? ( sys-apps/systemd[acl] )
+SLOT=0
+SRC_URI=https://developers.yubico.com/libu2f-host/Releases/libu2f-host-1.1.6.tar.xz
+_eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=6c54e10a4ab1ed652430ddd2f91c7d1c
diff --git a/metadata/md5-cache/app-crypt/manuale-1.1.0 b/metadata/md5-cache/app-crypt/manuale-1.1.0
index 21bae47cd2fa..2f98ce63bfc9 100644
--- a/metadata/md5-cache/app-crypt/manuale-1.1.0
+++ b/metadata/md5-cache/app-crypt/manuale-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/veeti/manuale/archive/1.1.0.tar.gz -> manuale-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f283838ee1396614370387a491dc7d8f
diff --git a/metadata/md5-cache/app-crypt/moolticute-0.18.1 b/metadata/md5-cache/app-crypt/moolticute-0.18.1
index 1355137d009c..20bc9253cde7 100644
--- a/metadata/md5-cache/app-crypt/moolticute-0.18.1
+++ b/metadata/md5-cache/app-crypt/moolticute-0.18.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/libusb-1.0.20 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qttest:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://github.com/mooltipass/moolticute/archive/v0.18.1.tar.gz -> moolticute-0.18.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e18b831bbaccfbc5746f7c210949d7db
diff --git a/metadata/md5-cache/app-crypt/moolticute-9999 b/metadata/md5-cache/app-crypt/moolticute-9999
index 317ac398d65e..eba358cd1542 100644
--- a/metadata/md5-cache/app-crypt/moolticute-9999
+++ b/metadata/md5-cache/app-crypt/moolticute-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/mooltipass/moolticute
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/libusb-1.0.20 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qttest:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e18b831bbaccfbc5746f7c210949d7db
diff --git a/metadata/md5-cache/app-crypt/nitrokey-app-1.3 b/metadata/md5-cache/app-crypt/nitrokey-app-1.3
index 34c8c4c8e959..b2ada3ab68f0 100644
--- a/metadata/md5-cache/app-crypt/nitrokey-app-1.3
+++ b/metadata/md5-cache/app-crypt/nitrokey-app-1.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=app-crypt/libnitrokey:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://github.com/Nitrokey/nitrokey-app/archive/v1.3.tar.gz -> nitrokey-app-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2c722e1253570c5afc0f7f41d8db1c22
diff --git a/metadata/md5-cache/app-crypt/nitrokey-app-1.3.1 b/metadata/md5-cache/app-crypt/nitrokey-app-1.3.1
index 19269bc4b414..8e5fe5f3894e 100644
--- a/metadata/md5-cache/app-crypt/nitrokey-app-1.3.1
+++ b/metadata/md5-cache/app-crypt/nitrokey-app-1.3.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=app-crypt/libnitrokey:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://github.com/Nitrokey/nitrokey-app/archive/v1.3.1.tar.gz -> nitrokey-app-1.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=77942073d099ae2fcb8b4a07c4bba4aa
diff --git a/metadata/md5-cache/app-crypt/nitrokey-app-9999 b/metadata/md5-cache/app-crypt/nitrokey-app-9999
index 536f4f12abd7..76042b15bc8f 100644
--- a/metadata/md5-cache/app-crypt/nitrokey-app-9999
+++ b/metadata/md5-cache/app-crypt/nitrokey-app-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/Nitrokey/nitrokey-app
 LICENSE=GPL-3
 RDEPEND=app-crypt/libnitrokey:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=77942073d099ae2fcb8b4a07c4bba4aa
diff --git a/metadata/md5-cache/app-crypt/p11-kit-0.23.12 b/metadata/md5-cache/app-crypt/p11-kit-0.23.12
index 67adca102db0..023df56f8d79 100644
--- a/metadata/md5-cache/app-crypt/p11-kit-0.23.12
+++ b/metadata/md5-cache/app-crypt/p11-kit-0.23.12
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=asn1? ( >=dev-libs/libtasn1-3.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(-)?] ) libffi? ( >=dev-libs/libffi-3.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(-)?] ) trust? ( app-misc/ca-certificates )
+DEPEND=asn1? ( >=dev-libs/libtasn1-3.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(-)?] ) libffi? ( >=virtual/libffi-3.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(-)?] ) trust? ( app-misc/ca-certificates )
 DESCRIPTION=Provides a standard configuration setup for installing PKCS#11
 EAPI=7
 HOMEPAGE=https://p11-glue.freedesktop.org/p11-kit.html https://github.com/p11-glue/p11-kit
 IUSE=+asn1 debug +libffi +trust abi_x86_32 abi_x86_64 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=asn1? ( >=dev-libs/libtasn1-3.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(-)?] ) libffi? ( >=dev-libs/libffi-3.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(-)?] ) trust? ( app-misc/ca-certificates )
+RDEPEND=asn1? ( >=dev-libs/libtasn1-3.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(-)?] ) libffi? ( >=virtual/libffi-3.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(-)?] ) trust? ( app-misc/ca-certificates )
 REQUIRED_USE=trust? ( asn1 )
 SLOT=0
 SRC_URI=https://github.com/p11-glue/p11-kit/releases/download/0.23.12/p11-kit-0.23.12.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=627cf71ed5dcb2f8e6fab9a19da62321
+_md5_=39a01d76655bce35efc0e71572e432db
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 dbc4a174cd28..798de6bcb974 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_=63eb69bc035730dd456e082f57077072
+_md5_=74aeb1f6131a894a30350fa4c3edc8b3
diff --git a/metadata/md5-cache/app-crypt/pinentry-1.1.0-r3 b/metadata/md5-cache/app-crypt/pinentry-1.1.0-r3
new file mode 100644
index 000000000000..e6684497949a
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/pinentry-1.1.0-r3
@@ -0,0 +1,15 @@
+BDEPEND=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
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=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] )
+DESCRIPTION=Simple passphrase entry dialogs which utilize the Assuan protocol
+EAPI=7
+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
+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	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=6dd3681e4e09c9261433e39dfcaa09ec
diff --git a/metadata/md5-cache/app-crypt/qca-2.1.3-r2 b/metadata/md5-cache/app-crypt/qca-2.1.3-r2
index 25d73b3ce852..2b99a061373b 100644
--- a/metadata/md5-cache/app-crypt/qca-2.1.3-r2
+++ b/metadata/md5-cache/app-crypt/qca-2.1.3-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-qt/qtcore:5 botan? ( dev-libs/botan:0 ) gcrypt? ( dev-libs/libgcrypt:= ) gpg? ( app-crypt/gnupg ) nss? ( dev-libs/nss ) pkcs11? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) dev-libs/pkcs11-helper ) sasl? ( dev-libs/cyrus-sasl:2 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0= ) libressl? ( dev-libs/libressl:= ) ) !app-crypt/qca-cyrus-sasl !app-crypt/qca-gnupg !app-crypt/qca-logger !app-crypt/qca-ossl !app-crypt/qca-pkcs11
 SLOT=2
 SRC_URI=mirror://kde/stable/qca/2.1.3/src/qca-2.1.3.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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8727e469a476712aa4c4d9499c33f3dd
diff --git a/metadata/md5-cache/app-crypt/qca-2.2.0_pre20180606 b/metadata/md5-cache/app-crypt/qca-2.2.0_pre20180606
index 5a629e1f36a7..11a9a51cee4e 100644
--- a/metadata/md5-cache/app-crypt/qca-2.2.0_pre20180606
+++ b/metadata/md5-cache/app-crypt/qca-2.2.0_pre20180606
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-qt/qtcore:5 botan? ( dev-libs/botan:= ) gcrypt? ( dev-libs/libgcrypt:= ) gpg? ( app-crypt/gnupg ) nss? ( dev-libs/nss ) pkcs11? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) dev-libs/pkcs11-helper ) sasl? ( dev-libs/cyrus-sasl:2 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0= ) libressl? ( dev-libs/libressl:= ) )
 SLOT=2
 SRC_URI=https://dev.gentoo.org/~asturm/distfiles/qca-2.2.0_pre20180606.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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=80ced1181c2daef1fd07885072f8be45
diff --git a/metadata/md5-cache/app-crypt/seahorse-3.20.0 b/metadata/md5-cache/app-crypt/seahorse-3.20.0
index 9c11b9481cf7..a122f78b74e8 100644
--- a/metadata/md5-cache/app-crypt/seahorse-3.20.0
+++ b/metadata/md5-cache/app-crypt/seahorse-3.20.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ FDL-1.1+
 RDEPEND=>=app-crypt/gcr-3.11.91:= >=dev-libs/glib-2.10:2 >=x11-libs/gtk+-3.4:3 >=app-crypt/libsecret-0.16 >=net-libs/libsoup-2.33.92:2.4 x11-misc/shared-mime-info net-misc/openssh >=app-crypt/gpgme-1 >=app-crypt/gnupg-2.0.12 ldap? ( net-nds/openldap:= ) zeroconf? ( >=net-dns/avahi-0.6:= ) !<app-crypt/seahorse-plugins-2.91.0_pre20110114
 SLOT=0
 SRC_URI=mirror://gnome/sources/seahorse/3.20/seahorse-3.20.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8514b9ee7c24319ba3a6c73078ea61c7
diff --git a/metadata/md5-cache/app-crypt/seahorse-sharing-3.8.0_p20151117 b/metadata/md5-cache/app-crypt/seahorse-sharing-3.8.0_p20151117
index 7bef6c453b8f..31b6781ea01b 100644
--- a/metadata/md5-cache/app-crypt/seahorse-sharing-3.8.0_p20151117
+++ b/metadata/md5-cache/app-crypt/seahorse-sharing-3.8.0_p20151117
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=app-crypt/seahorse dev-libs/glib:2 >=net-dns/avahi-0.6:= net-libs/libsoup:2.4 >=x11-libs/gtk+-3:3 >=app-crypt/gpgme-1 >=app-crypt/gnupg-1.4 !<app-crypt/seahorse-3.2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~eva/distfiles/seahorse-sharing/seahorse-sharing-3.8.0-19-g61de83c.tar.gz -> seahorse-sharing-3.8.0_p20151117.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=18a51e0343a7545102a2052e529bcfcd
diff --git a/metadata/md5-cache/app-crypt/tpm-emulator-0.7.5 b/metadata/md5-cache/app-crypt/tpm-emulator-0.7.5
index dea7fe86daf7..b4d20371224a 100644
--- a/metadata/md5-cache/app-crypt/tpm-emulator-0.7.5
+++ b/metadata/md5-cache/app-crypt/tpm-emulator-0.7.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) modules? ( kernel_linux? ( virtual/modutils ) )
 SLOT=0
 SRC_URI=https://github.com/PeterHuewe/tpm-emulator/archive/v0.7.5.tar.gz -> tpm-emulator-0.7.5.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2360d117c1d03b464024c5a2936ccf11
diff --git a/metadata/md5-cache/app-crypt/trousers-0.3.14-r1 b/metadata/md5-cache/app-crypt/trousers-0.3.14-r1
index 1a88f414e7ec..54d9a3e445dc 100644
--- a/metadata/md5-cache/app-crypt/trousers-0.3.14-r1
+++ b/metadata/md5-cache/app-crypt/trousers-0.3.14-r1
@@ -10,5 +10,5 @@ LICENSE=CPL-1.0 GPL-2
 RDEPEND=>=dev-libs/glib-2 !libressl? ( >=dev-libs/openssl-0.9.7:0 ) libressl? ( dev-libs/libressl ) selinux? ( sec-policy/selinux-tcsd )
 SLOT=0
 SRC_URI=mirror://sourceforge/trousers/trousers/trousers-0.3.14.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=3dee1cd99aca465bd4fa35af0a248130
diff --git a/metadata/md5-cache/app-crypt/veracrypt-1.19 b/metadata/md5-cache/app-crypt/veracrypt-1.19
index de1104c0bc8b..e361451407db 100644
--- a/metadata/md5-cache/app-crypt/veracrypt-1.19
+++ b/metadata/md5-cache/app-crypt/veracrypt-1.19
@@ -10,5 +10,5 @@ RDEPEND=sys-fs/lvm2 sys-fs/fuse x11-libs/wxGTK:3.0[X?] app-admin/sudo dev-libs/p
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=https://github.com/veracrypt/VeraCrypt/archive/VeraCrypt_1.19.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89
 _md5_=a3a3368901287391d5b11eb4bf52020b
diff --git a/metadata/md5-cache/app-crypt/veracrypt-1.21 b/metadata/md5-cache/app-crypt/veracrypt-1.21
index f55ed685f974..ba6210dc8de5 100644
--- a/metadata/md5-cache/app-crypt/veracrypt-1.21
+++ b/metadata/md5-cache/app-crypt/veracrypt-1.21
@@ -10,5 +10,5 @@ RDEPEND=sys-fs/lvm2 sys-fs/fuse:0 x11-libs/wxGTK:3.0[X?] app-admin/sudo dev-libs
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://github.com/veracrypt/VeraCrypt/archive/VeraCrypt_1.21.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89
 _md5_=9bd7101b0f2b609caa7997622da74126
diff --git a/metadata/md5-cache/app-crypt/veracrypt-1.22 b/metadata/md5-cache/app-crypt/veracrypt-1.22
index 91180549197a..0e6cb84a2c77 100644
--- a/metadata/md5-cache/app-crypt/veracrypt-1.22
+++ b/metadata/md5-cache/app-crypt/veracrypt-1.22
@@ -10,5 +10,5 @@ RDEPEND=sys-fs/lvm2 sys-fs/fuse:0 x11-libs/wxGTK:3.0[X?] app-admin/sudo dev-libs
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://github.com/veracrypt/VeraCrypt/archive/VeraCrypt_1.22.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89
 _md5_=b629e6d3b51ab0f09d06c5a2909956ca
diff --git a/metadata/md5-cache/app-crypt/xca-1.4.1 b/metadata/md5-cache/app-crypt/xca-1.4.1
index 6b991931d02f..adab9067c2a3 100644
--- a/metadata/md5-cache/app-crypt/xca-1.4.1
+++ b/metadata/md5-cache/app-crypt/xca-1.4.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/libltdl:0= dev-qt/qtgui:5 dev-qt/qtwidgets:5 !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:0= ) doc? ( app-text/linuxdoc-tools )
 SLOT=0
 SRC_URI=https://github.com/chris2511/xca/releases/download/RELEASE.1.4.1/xca-1.4.1.tar.gz
-_eclasses_=xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=276e5d22a2ae8b693b5672b68f1dcb7f
diff --git a/metadata/md5-cache/app-crypt/xca-2.1.0 b/metadata/md5-cache/app-crypt/xca-2.1.0
index 875f36c83a40..3f3787c489d6 100644
--- a/metadata/md5-cache/app-crypt/xca-2.1.0
+++ b/metadata/md5-cache/app-crypt/xca-2.1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/libltdl:0= dev-qt/qtgui:5 dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:0= ) doc? ( app-text/linuxdoc-tools )
 SLOT=0
 SRC_URI=https://github.com/chris2511/xca/releases/download/RELEASE.2.1.0/xca-2.1.0.tar.gz
-_eclasses_=xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=859cab36ebe5b3f640f10c6ec28864bd
diff --git a/metadata/md5-cache/app-crypt/xca-2.1.1 b/metadata/md5-cache/app-crypt/xca-2.1.1
index d554d88b7b20..30a5292fc96c 100644
--- a/metadata/md5-cache/app-crypt/xca-2.1.1
+++ b/metadata/md5-cache/app-crypt/xca-2.1.1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst postrm
 DEPEND=dev-libs/libltdl:0= dev-qt/qtgui:5 dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:0= ) doc? ( app-text/linuxdoc-tools ) dev-qt/linguist-tools:5
 DESCRIPTION=A GUI to OpenSSL, RSA public keys, certificates, signing requests etc
-EAPI=6
+EAPI=7
 HOMEPAGE=https://hohnstaedt.de/xca/
 IUSE=bindist doc libressl
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/libltdl:0= dev-qt/qtgui:5 dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:0= ) doc? ( app-text/linuxdoc-tools )
 SLOT=0
 SRC_URI=https://github.com/chris2511/xca/releases/download/RELEASE.2.1.1/xca-2.1.1.tar.gz
-_eclasses_=xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=859cab36ebe5b3f640f10c6ec28864bd
+_eclasses_=xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=02910f69b7bdfff18c21862fbcdf3d58
diff --git a/metadata/md5-cache/app-crypt/yubikey-manager-0.3.3 b/metadata/md5-cache/app-crypt/yubikey-manager-0.3.3
index 9c31256db75e..c0495fba354b 100644
--- a/metadata/md5-cache/app-crypt/yubikey-manager-0.3.3
+++ b/metadata/md5-cache/app-crypt/yubikey-manager-0.3.3
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/libu2f-host dev-python/six[python_targets_python2_7(-)?,python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://developers.yubico.com/yubikey-manager/Releases/yubikey-manager-0.3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b900bc7e8db4d7f0506645b87dd4a457
diff --git a/metadata/md5-cache/app-crypt/yubikey-manager-0.4.5 b/metadata/md5-cache/app-crypt/yubikey-manager-0.4.5
index 9c510aefd10c..eda5ef3212ed 100644
--- a/metadata/md5-cache/app-crypt/yubikey-manager-0.4.5
+++ b/metadata/md5-cache/app-crypt/yubikey-manager-0.4.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://developers.yubico.com/yubikey-manager/Releases/yubikey-manager-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d19ba0191ed14eae98b6b243b1735f64
diff --git a/metadata/md5-cache/app-crypt/yubikey-manager-0.4.6 b/metadata/md5-cache/app-crypt/yubikey-manager-0.4.6
index ec66d6fb40e0..b4eb83c9cc66 100644
--- a/metadata/md5-cache/app-crypt/yubikey-manager-0.4.6
+++ b/metadata/md5-cache/app-crypt/yubikey-manager-0.4.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://developers.yubico.com/yubikey-manager/Releases/yubikey-manager-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d19ba0191ed14eae98b6b243b1735f64
diff --git a/metadata/md5-cache/app-crypt/yubikey-manager-0.5.0 b/metadata/md5-cache/app-crypt/yubikey-manager-0.5.0
index b352245944ad..96234f3b01e9 100644
--- a/metadata/md5-cache/app-crypt/yubikey-manager-0.5.0
+++ b/metadata/md5-cache/app-crypt/yubikey-manager-0.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://developers.yubico.com/yubikey-manager/Releases/yubikey-manager-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d19ba0191ed14eae98b6b243b1735f64
diff --git a/metadata/md5-cache/app-crypt/yubikey-manager-0.6.0 b/metadata/md5-cache/app-crypt/yubikey-manager-0.6.0
index 11f1aecd9a38..47083119f043 100644
--- a/metadata/md5-cache/app-crypt/yubikey-manager-0.6.0
+++ b/metadata/md5-cache/app-crypt/yubikey-manager-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/libu2f-host dev-python/six[python_targets_python2_7(-)?,python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://developers.yubico.com/yubikey-manager/Releases/yubikey-manager-0.6.0.tar.gz
-_eclasses_=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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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_=4eeeafbbf8db34967b5ec170e25d21de
diff --git a/metadata/md5-cache/app-crypt/yubikey-manager-0.7.0 b/metadata/md5-cache/app-crypt/yubikey-manager-0.7.0
index c96b374e16fd..768cee594517 100644
--- a/metadata/md5-cache/app-crypt/yubikey-manager-0.7.0
+++ b/metadata/md5-cache/app-crypt/yubikey-manager-0.7.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/fido2[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://developers.yubico.com/yubikey-manager/Releases/yubikey-manager-0.7.0.tar.gz
-_eclasses_=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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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_=8af1f590fefc56794d7b3261bc712e11
diff --git a/metadata/md5-cache/app-crypt/yubikey-manager-0.7.1 b/metadata/md5-cache/app-crypt/yubikey-manager-0.7.1
index 570973fa8a66..ee1f29da7034 100644
--- a/metadata/md5-cache/app-crypt/yubikey-manager-0.7.1
+++ b/metadata/md5-cache/app-crypt/yubikey-manager-0.7.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/fido2[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://developers.yubico.com/yubikey-manager/Releases/yubikey-manager-0.7.1.tar.gz test? ( https://dev.gentoo.org/~gokturk/distfiles/app-crypt/yubikey-manager/yubikey-manager-0.7.1-test-files.tar.xz )
-_eclasses_=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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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_=b49bbc4a414c15927d08f75f8af515b8
diff --git a/metadata/md5-cache/app-crypt/yubikey-manager-1.0.0-r1 b/metadata/md5-cache/app-crypt/yubikey-manager-1.0.0-r1
new file mode 100644
index 000000000000..72f8c9a7b7aa
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/yubikey-manager-1.0.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=test? ( dev-python/fido2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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(-)] dev-python/pyscard[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyusb[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=sys-auth/ykpers-1.19.0 python_targets_python2_7? ( dev-python/mock[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(-)]
+DESCRIPTION=Python library and command line tool for configuring a YubiKey
+EAPI=6
+HOMEPAGE=https://developers.yubico.com/yubikey-manager/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=BSD-2
+RDEPEND=dev-python/fido2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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(-)] dev-python/pyscard[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyusb[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=sys-auth/ykpers-1.19.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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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://developers.yubico.com/yubikey-manager/Releases/yubikey-manager-1.0.0.tar.gz test? ( https://dev.gentoo.org/~gokturk/distfiles/app-crypt/yubikey-manager/yubikey-manager-0.7.1-test-files.tar.xz )
+_eclasses_=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_=36028e185a139adffd792e37c5be868e
diff --git a/metadata/md5-cache/app-crypt/yubikey-manager-qt-1.0.0 b/metadata/md5-cache/app-crypt/yubikey-manager-qt-1.0.0
new file mode 100644
index 000000000000..0dff7ba62e46
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/yubikey-manager-qt-1.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=>=app-crypt/yubikey-manager-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/cryptography[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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/pyotherside[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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/qtsingleapplication[qt5(+),X] dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtsvg:5 dev-qt/qtquickcontrols2:5[widgets] dev-qt/qtwidgets:5
+DESCRIPTION=Cross-platform application for configuring any YubiKey over all USB transports
+EAPI=6
+HOMEPAGE=https://developers.yubico.com/yubikey-manager-qt https://github.com/Yubico/yubikey-manager-qt
+IUSE=python_targets_python3_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
+LICENSE=BSD-2
+RDEPEND=>=app-crypt/yubikey-manager-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/cryptography[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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/pyotherside[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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/qtsingleapplication[qt5(+),X] dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtsvg:5 dev-qt/qtquickcontrols2:5[widgets] dev-qt/qtwidgets:5
+SLOT=0
+SRC_URI=https://github.com/Yubico/yubikey-manager-qt/archive/yubikey-manager-qt-1.0.0.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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=5fee78a7109bec23aa143d24d9cc7e6e
diff --git a/metadata/md5-cache/app-crypt/zulucrypt-5.1.0 b/metadata/md5-cache/app-crypt/zulucrypt-5.1.0
index 4c651245a63f..96ee9c107120 100644
--- a/metadata/md5-cache/app-crypt/zulucrypt-5.1.0
+++ b/metadata/md5-cache/app-crypt/zulucrypt-5.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libgcrypt:0= sys-fs/cryptsetup:= gnome? ( app-crypt/libsecret )
 REQUIRED_USE=kwallet? ( qt5 )
 SLOT=0
 SRC_URI=https://github.com/mhogomchungu/zuluCrypt/releases/download/5.1.0/zuluCrypt-5.1.0.tar.bz2 -> zulucrypt-5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6395d08fc541b747a5a14c3fe67fedd4
diff --git a/metadata/md5-cache/app-crypt/zulucrypt-5.4.0 b/metadata/md5-cache/app-crypt/zulucrypt-5.4.0
index 5d932b27c247..2ee84a07aa88 100644
--- a/metadata/md5-cache/app-crypt/zulucrypt-5.4.0
+++ b/metadata/md5-cache/app-crypt/zulucrypt-5.4.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libgcrypt:0= sys-fs/cryptsetup:= gnome? ( app-crypt/libsecret )
 REQUIRED_USE=kwallet? ( qt5 )
 SLOT=0
 SRC_URI=https://github.com/mhogomchungu/zuluCrypt/releases/download/5.4.0/zuluCrypt-5.4.0.tar.bz2 -> zulucrypt-5.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=dbfc6f2b244bff16698a431147406742
diff --git a/metadata/md5-cache/app-crypt/zulucrypt-5.4.0_pre20180223 b/metadata/md5-cache/app-crypt/zulucrypt-5.4.0_pre20180223
index 2a3b3e06d663..828936df6dfe 100644
--- a/metadata/md5-cache/app-crypt/zulucrypt-5.4.0_pre20180223
+++ b/metadata/md5-cache/app-crypt/zulucrypt-5.4.0_pre20180223
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libgcrypt:0= sys-fs/cryptsetup:= gnome? ( app-crypt/libsecret )
 REQUIRED_USE=kwallet? ( qt5 )
 SLOT=0
 SRC_URI=https://github.com/mhogomchungu/zuluCrypt/archive/76637bb05af13744bf1734b56f67d6d5cc2343b1.tar.gz -> zulucrypt-5.4.0_pre20180223.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3f5c0a1337bd6f7baff4b5ce89b149e0
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index 0255f1e57e21..6b0c076d0532 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 09d682817cc3..1eb567937b97 100644
--- a/metadata/md5-cache/app-dicts/dikt-2s_p1
+++ b/metadata/md5-cache/app-dicts/dikt-2s_p1
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 475d4cdec216..a581efe91ba0 100644
--- a/metadata/md5-cache/app-dicts/gnome-dictionary-3.24.1
+++ b/metadata/md5-cache/app-dicts/gnome-dictionary-3.24.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+ FDL-1.1+
 RDEPEND=>=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:= ) gnome-base/gsettings-desktop-schemas !<gnome-extra/gnome-utils-3.4
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/app-dicts/gwaei-3.6.2 b/metadata/md5-cache/app-dicts/gwaei-3.6.2
index 68b2d14934f8..0f909d1508f9 100644
--- a/metadata/md5-cache/app-dicts/gwaei-3.6.2
+++ b/metadata/md5-cache/app-dicts/gwaei-3.6.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=net-misc/curl-7.20.0 >=dev-libs/glib-2.31 gtk? ( x11-libs/gtk+:3 >=app-text/gnome-doc-utils-0.14.0 ) hunspell? ( app-text/hunspell ) nls? ( virtual/libintl ) mecab? ( app-text/mecab )
 SLOT=0
 SRC_URI=mirror://sourceforge/gwaei/gwaei-3.6.2.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-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=ac52830e0fa62b5f182435c918df8a58
diff --git a/metadata/md5-cache/app-dicts/myspell-el-0.8 b/metadata/md5-cache/app-dicts/myspell-el-0.8
deleted file mode 100644
index 3454d5d51fe5..000000000000
--- a/metadata/md5-cache/app-dicts/myspell-el-0.8
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Greek dictionaries for myspell/hunspell
-EAPI=4
-HOMEPAGE=http://www.elspell.gr/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-2 LGPL-2.1 MPL-1.1
-SLOT=0
-SRC_URI=http://elspell.math.upatras.gr/files/ooffice/el_GR-0.8.zip http://elspell.math.upatras.gr/files/ooffice/hyph_el.zip
-_eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=6fdba7ed72a138f69640ab7178c134a4
diff --git a/metadata/md5-cache/app-dicts/myspell-el-0.9 b/metadata/md5-cache/app-dicts/myspell-el-0.9
index f2a5daac7833..e8eb8e039fcf 100644
--- a/metadata/md5-cache/app-dicts/myspell-el-0.9
+++ b/metadata/md5-cache/app-dicts/myspell-el-0.9
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Greek dictionaries for myspell/hunspell
 EAPI=6
 HOMEPAGE=http://www.elspell.gr/
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2 LGPL-2.1 MPL-1.1
 SLOT=0
 SRC_URI=http://elspell.math.upatras.gr/files/ooffice/el_GR-0.9.zip http://elspell.math.upatras.gr/files/ooffice/hyph_el.zip
 _eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=15b70ebb37851bc26c810ba93bf3ad90
+_md5_=3b151984c746ba7750bc0bfa5be34c0b
diff --git a/metadata/md5-cache/app-dicts/opendict-0.6.7 b/metadata/md5-cache/app-dicts/opendict-0.6.7
index 4ea1bb4b63dd..99177469d7e3 100644
--- a/metadata/md5-cache/app-dicts/opendict-0.6.7
+++ b/metadata/md5-cache/app-dicts/opendict-0.6.7
@@ -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=mirror://sourceforge/opendict/files/opendict-0.6.7.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-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d53b4b3e46f145382187b0159dfbbdbb
diff --git a/metadata/md5-cache/app-dicts/verbiste-0.1.38-r1 b/metadata/md5-cache/app-dicts/verbiste-0.1.38-r1
index c3ace04af377..d630b3269008 100644
--- a/metadata/md5-cache/app-dicts/verbiste-0.1.38-r1
+++ b/metadata/md5-cache/app-dicts/verbiste-0.1.38-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libxml2-2.4.0:2 gtk? ( >=x11-libs/gtk+-2.6:2 )
 SLOT=0
 SRC_URI=http://sarrazip.com/dev/verbiste-0.1.38.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=29bbf48181bcbdc26e50c06b13bb6b44
diff --git a/metadata/md5-cache/app-dicts/verbiste-0.1.41 b/metadata/md5-cache/app-dicts/verbiste-0.1.41
index a6f0e32052fa..46357edaee36 100644
--- a/metadata/md5-cache/app-dicts/verbiste-0.1.41
+++ b/metadata/md5-cache/app-dicts/verbiste-0.1.41
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libxml2-2.4.0:2 gtk? ( >=x11-libs/gtk+-2.6:2 )
 SLOT=0
 SRC_URI=http://sarrazip.com/dev/verbiste-0.1.41.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7391eeb3e6b289c5df2c150d1b40ad94
diff --git a/metadata/md5-cache/app-dicts/verbiste-0.1.44 b/metadata/md5-cache/app-dicts/verbiste-0.1.44
index 3ddf9e7bc52c..2b85cb3af0e1 100644
--- a/metadata/md5-cache/app-dicts/verbiste-0.1.44
+++ b/metadata/md5-cache/app-dicts/verbiste-0.1.44
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libxml2-2.4.0:2 gtk? ( >=x11-libs/gtk+-2.6:2 )
 SLOT=0
 SRC_URI=http://sarrazip.com/dev/verbiste-0.1.44.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=da27f2d1f9bef6a67dcf7b02809a8e10
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index c575d01a0fbe..732e73779d53 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/cppman-0.4.8 b/metadata/md5-cache/app-doc/cppman-0.4.8
index 235112d44a1a..83213419bae3 100644
--- a/metadata/md5-cache/app-doc/cppman-0.4.8
+++ b/metadata/md5-cache/app-doc/cppman-0.4.8
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/groff dev-python/beautifulsoup:4[python_targets_python3_4(-)?,p
 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/aitjcize/cppman/archive/0.4.8.tar.gz -> cppman-0.4.8.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=570aab2dbb38174bf1aad686039fb1df
diff --git a/metadata/md5-cache/app-doc/doxygen-1.8.13-r1 b/metadata/md5-cache/app-doc/doxygen-1.8.13-r1
deleted file mode 100644
index cf69161522f6..000000000000
--- a/metadata/md5-cache/app-doc/doxygen-1.8.13-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=sys-devel/flex sys-devel/bison 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 ) ) app-text/ghostscript-gpl dev-lang/perl media-libs/libpng:0= virtual/libiconv clang? ( sys-devel/clang:= ) dot? ( media-gfx/graphviz media-libs/freetype ) doxysearch? ( =dev-libs/xapian-1.2* ) latex? ( app-text/texlive[extra] ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sqlite? ( dev-db/sqlite:3 ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Documentation system for most programming languages
-EAPI=6
-HOMEPAGE=https://www.stack.nl/~dimitri/doxygen/
-IUSE=clang debug doc dot doxysearch latex qt5 sqlite userland_GNU
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=app-text/ghostscript-gpl dev-lang/perl media-libs/libpng:0= virtual/libiconv clang? ( sys-devel/clang:= ) dot? ( media-gfx/graphviz media-libs/freetype ) doxysearch? ( =dev-libs/xapian-1.2* ) latex? ( app-text/texlive[extra] ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sqlite? ( dev-db/sqlite:3 )
-REQUIRED_USE=doc? ( latex )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.13.src.tar.gz https://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png
-_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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=c8685d20b1da26d5ec25bc30377f85ad
diff --git a/metadata/md5-cache/app-doc/doxygen-1.8.14-r1 b/metadata/md5-cache/app-doc/doxygen-1.8.14-r1
index 17201b7ae95e..c748ffda1848 100644
--- a/metadata/md5-cache/app-doc/doxygen-1.8.14-r1
+++ b/metadata/md5-cache/app-doc/doxygen-1.8.14-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-devel/flex sys-devel/bison 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 ) ) app-text/ghostscript-gpl dev-lang/perl media-libs/libpng:0= virtual/libiconv clang? ( >=sys-devel/clang-4.0.0:= ) dot? ( media-gfx/graphviz media-libs/freetype ) doxysearch? ( dev-libs/xapian ) latex? ( dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) sqlite? ( dev-db/sqlite:3 ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=sys-devel/flex sys-devel/bison 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 ) ) app-text/ghostscript-gpl dev-lang/perl media-libs/libpng:0= virtual/libiconv clang? ( >=sys-devel/clang-4.0.0:= ) dot? ( media-gfx/graphviz media-libs/freetype ) doxysearch? ( dev-libs/xapian:= ) latex? ( dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) sqlite? ( dev-db/sqlite:3 ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Documentation system for most programming languages
 EAPI=6
 HOMEPAGE=https://www.stack.nl/~dimitri/doxygen/
 IUSE=clang debug doc dot doxysearch latex qt5 sqlite userland_GNU
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=app-text/ghostscript-gpl dev-lang/perl media-libs/libpng:0= virtual/libiconv clang? ( >=sys-devel/clang-4.0.0:= ) dot? ( media-gfx/graphviz media-libs/freetype ) doxysearch? ( dev-libs/xapian ) latex? ( dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) sqlite? ( dev-db/sqlite:3 )
+RDEPEND=app-text/ghostscript-gpl dev-lang/perl media-libs/libpng:0= virtual/libiconv clang? ( >=sys-devel/clang-4.0.0:= ) dot? ( media-gfx/graphviz media-libs/freetype ) doxysearch? ( dev-libs/xapian:= ) latex? ( dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) sqlite? ( dev-db/sqlite:3 )
 REQUIRED_USE=doc? ( latex )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.14.src.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=7766dd3009ddd3c3411a5afdbe54ee8c
+_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_=a0ed2362b32049188e6766e6947b33ee
diff --git a/metadata/md5-cache/app-doc/doxygen-9999 b/metadata/md5-cache/app-doc/doxygen-9999
index a6a14b247e8f..1350ab8da131 100644
--- a/metadata/md5-cache/app-doc/doxygen-9999
+++ b/metadata/md5-cache/app-doc/doxygen-9999
@@ -9,5 +9,5 @@ RDEPEND=app-text/ghostscript-gpl dev-lang/perl media-libs/libpng:0= virtual/libi
 REQUIRED_USE=doc? ( latex )
 RESTRICT=test
 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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=d9bc667c97af64ba7a9e211910a8adaf
+_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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=db792940c14c4b4c5b250dbea4925305
diff --git a/metadata/md5-cache/app-doc/gnucash-docs-3.0 b/metadata/md5-cache/app-doc/gnucash-docs-3.0
index ee9a65d122bc..7e0aa03623fb 100644
--- a/metadata/md5-cache/app-doc/gnucash-docs-3.0
+++ b/metadata/md5-cache/app-doc/gnucash-docs-3.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
index ffa285d76b21..0f38f8d1a3fe 100644
--- a/metadata/md5-cache/app-doc/gnucash-docs-3.1
+++ b/metadata/md5-cache/app-doc/gnucash-docs-3.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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.2-r1 b/metadata/md5-cache/app-doc/gnucash-docs-3.2-r1
index ea1ddd45fc2a..29686520b09f 100644
--- a/metadata/md5-cache/app-doc/gnucash-docs-3.2-r1
+++ b/metadata/md5-cache/app-doc/gnucash-docs-3.2-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Documentation package for GnuCash
 EAPI=6
 HOMEPAGE=http://www.gnucash.org/
 IUSE=l10n_C l10n_de l10n_it l10n_ja l10n_pt l10n_ru
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2 FDL-1.1
 SLOT=0
 SRC_URI=https://github.com/Gnucash/gnucash-docs/archive/3.2.tar.gz -> gnucash-docs-3.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=2dafbb09f193bd9f5233df26cf0ebfee
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a7d47c3117463c1acfaaddfc8f849b73
diff --git a/metadata/md5-cache/app-doc/gnucash-docs-3.3 b/metadata/md5-cache/app-doc/gnucash-docs-3.3
new file mode 100644
index 000000000000..0e5ef707d8f5
--- /dev/null
+++ b/metadata/md5-cache/app-doc/gnucash-docs-3.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-text/docbook-xml-dtd app-text/docbook-xsl-stylesheets app-text/rarian dev-libs/libxml2 dev-libs/libxslt >=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=l10n_C l10n_de l10n_it l10n_ja l10n_pt l10n_ru
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2 FDL-1.1
+SLOT=0
+SRC_URI=https://github.com/Gnucash/gnucash-docs/archive/3.3.tar.gz -> gnucash-docs-3.3.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=2dafbb09f193bd9f5233df26cf0ebfee
diff --git a/metadata/md5-cache/app-doc/kicad-doc-4.0.7 b/metadata/md5-cache/app-doc/kicad-doc-4.0.7
index 9ee51fad359a..439bd9a3ff75 100644
--- a/metadata/md5-cache/app-doc/kicad-doc-4.0.7
+++ b/metadata/md5-cache/app-doc/kicad-doc-4.0.7
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-3+ CC-BY-3.0 ) GPL-2
 REQUIRED_USE=|| ( html pdf ) ^^ ( l10n_en l10n_fr l10n_it l10n_ja l10n_nl l10n_pl )
 SLOT=0
 SRC_URI=https://github.com/KiCad/kicad-doc/archive/4.0.7.tar.gz -> kicad-doc-4.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0301da89dee3296f18d051ef99ce1480
diff --git a/metadata/md5-cache/app-doc/kicad-doc-4.0.7-r1 b/metadata/md5-cache/app-doc/kicad-doc-4.0.7-r1
index e31926651a52..b793e34c468d 100644
--- a/metadata/md5-cache/app-doc/kicad-doc-4.0.7-r1
+++ b/metadata/md5-cache/app-doc/kicad-doc-4.0.7-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-3+ CC-BY-3.0 ) GPL-2
 REQUIRED_USE=|| ( html pdf ) ^^ ( l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_id l10n_it l10n_ja l10n_pl )
 SLOT=0
 SRC_URI=https://github.com/KiCad/kicad-doc/archive/4.0.7.tar.gz -> kicad-doc-4.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4ee0eca7fca97f27f7c20635645fd2bf
diff --git a/metadata/md5-cache/app-doc/kicad-doc-5.0.0 b/metadata/md5-cache/app-doc/kicad-doc-5.0.0
index a3f1b9e7cc81..1a96accdb039 100644
--- a/metadata/md5-cache/app-doc/kicad-doc-5.0.0
+++ b/metadata/md5-cache/app-doc/kicad-doc-5.0.0
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-3+ CC-BY-3.0 ) GPL-2
 REQUIRED_USE=|| ( html pdf ) ^^ ( l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_id l10n_it l10n_ja l10n_pl )
 SLOT=0
 SRC_URI=https://github.com/KiCad/kicad-doc/archive/5.0.0.tar.gz -> kicad-doc-5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4ee0eca7fca97f27f7c20635645fd2bf
diff --git a/metadata/md5-cache/app-doc/votca-csg-manual-9999 b/metadata/md5-cache/app-doc/votca-csg-manual-9999
index 83787bf85355..50df63eadc6e 100644
--- a/metadata/md5-cache/app-doc/votca-csg-manual-9999
+++ b/metadata/md5-cache/app-doc/votca-csg-manual-9999
@@ -5,5 +5,5 @@ EAPI=6
 HOMEPAGE=http://www.votca.org
 LICENSE=Apache-2.0
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=35412a21a93928420afff65c0f380a81
diff --git a/metadata/md5-cache/app-doc/zeal-0.4.0 b/metadata/md5-cache/app-doc/zeal-0.4.0
index 7bb07c31b7b9..b38849e0531b 100644
--- a/metadata/md5-cache/app-doc/zeal-0.4.0
+++ b/metadata/md5-cache/app-doc/zeal-0.4.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=app-arch/libarchive dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=x11-libs/xcb-util-keysyms-0.3.9 x11-themes/hicolor-icon-theme
 SLOT=0
 SRC_URI=https://github.com/zealdocs/zeal/archive/v0.4.0.tar.gz -> zeal-0.4.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7507ffb0d520721e81d7958e634341bb
diff --git a/metadata/md5-cache/app-doc/zeal-0.6.0 b/metadata/md5-cache/app-doc/zeal-0.6.0
index 3b82f0879389..bdc067c6e746 100644
--- a/metadata/md5-cache/app-doc/zeal-0.6.0
+++ b/metadata/md5-cache/app-doc/zeal-0.6.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=app-arch/libarchive dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/extra-cmake-modules:5 >=x11-libs/xcb-util-keysyms-0.3.9 x11-themes/hicolor-icon-theme
 SLOT=0
 SRC_URI=https://github.com/zealdocs/zeal/archive/v0.6.0.tar.gz -> zeal-0.6.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=9c7adcbf221bb980bdbec4b5f5961384
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 07e672a037a6..fc3cb380f336 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/atom-1.23.3 b/metadata/md5-cache/app-editors/atom-1.23.3
index 1746f8b6a455..827a99695a79 100644
--- a/metadata/md5-cache/app-editors/atom-1.23.3
+++ b/metadata/md5-cache/app-editors/atom-1.23.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=0
 SRC_URI=https://github.com/atom/atom/releases/download/v1.23.3/atom.x86_64.rpm -> atom-bin-1.23.3.rpm https://github.com/atom/atom/archive/v1.23.3.tar.gz -> atom-1.23.3.tar.gz https://github.com/elprans/asar/releases/download/v0.13.0-gentoo/asar-build.tar.gz -> asar-0.13.0.tar.gz https://github.com/nodejs/nan/archive/v2.6.2.tar.gz -> nodejs-nan-2.6.2.tar.gz https://registry.npmjs.org/@atom/nsfw/-/nsfw-1.0.18.tgz -> atomdep-atom--nsfw-1.0.18.tar.gz https://registry.npmjs.org/cached-run-in-this-context/-/cached-run-in-this-context-0.4.1.tgz -> atomdep-cached-run-in-this-context-0.4.1.tar.gz https://registry.npmjs.org/ctags/-/ctags-3.0.0.tgz -> atomdep-ctags-3.0.0.tar.gz https://registry.npmjs.org/fs-admin/-/fs-admin-0.1.6.tgz -> atomdep-fs-admin-0.1.6.tar.gz https://registry.npmjs.org/git-utils/-/git-utils-5.1.0.tgz -> atomdep-git-utils-5.1.0.tar.gz https://registry.npmjs.org/keyboard-layout/-/keyboard-layout-2.0.13.tgz -> atomdep-keyboard-layout-2.0.13.tar.gz https://registry.npmjs.org/keytar/-/keytar-4.1.0.tgz -> atomdep-keytar-4.1.0.tar.gz https://registry.npmjs.org/nsfw/-/nsfw-1.0.16.tgz -> atomdep-nsfw-1.0.16.tar.gz https://registry.npmjs.org/nslog/-/nslog-3.0.0.tgz -> atomdep-nslog-3.0.0.tar.gz https://registry.npmjs.org/oniguruma/-/oniguruma-6.2.1.tgz -> atomdep-oniguruma-6.2.1.tar.gz https://registry.npmjs.org/pathwatcher/-/pathwatcher-8.0.1.tgz -> atomdep-pathwatcher-8.0.1.tar.gz https://registry.npmjs.org/scrollbar-style/-/scrollbar-style-3.2.0.tgz -> atomdep-scrollbar-style-3.2.0.tar.gz https://registry.npmjs.org/spellchecker/-/spellchecker-3.4.4.tgz -> atomdep-spellchecker-3.4.4.tar.gz https://registry.npmjs.org/superstring/-/superstring-2.2.16.tgz -> atomdep-superstring-2.2.16.tar.gz
-_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	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7ac6e9d77886ab62054a3255beecae63
diff --git a/metadata/md5-cache/app-editors/atom-1.24.0_beta3 b/metadata/md5-cache/app-editors/atom-1.24.0_beta3
index 1fbb29930d27..1237ce78fbf5 100644
--- a/metadata/md5-cache/app-editors/atom-1.24.0_beta3
+++ b/metadata/md5-cache/app-editors/atom-1.24.0_beta3
@@ -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=beta
 SRC_URI=https://github.com/atom/atom/releases/download/v1.24.0-beta3/atom.x86_64.rpm -> atom-bin-1.24.0-beta3.rpm https://github.com/atom/atom/archive/v1.24.0-beta3.tar.gz -> atom-1.24.0-beta3.tar.gz https://github.com/elprans/asar/releases/download/v0.13.0-gentoo/asar-build.tar.gz -> asar-0.13.0.tar.gz https://github.com/nodejs/nan/archive/v2.6.2.tar.gz -> nodejs-nan-2.6.2.tar.gz https://registry.npmjs.org/@atom/nsfw/-/nsfw-1.0.18.tgz -> atomdep-atom--nsfw-1.0.18.tar.gz https://registry.npmjs.org/cached-run-in-this-context/-/cached-run-in-this-context-0.4.1.tgz -> atomdep-cached-run-in-this-context-0.4.1.tar.gz https://registry.npmjs.org/ctags/-/ctags-3.0.0.tgz -> atomdep-ctags-3.0.0.tar.gz https://registry.npmjs.org/fs-admin/-/fs-admin-0.1.6.tgz -> atomdep-fs-admin-0.1.6.tar.gz https://registry.npmjs.org/git-utils/-/git-utils-5.1.0.tgz -> atomdep-git-utils-5.1.0.tar.gz https://registry.npmjs.org/keyboard-layout/-/keyboard-layout-2.0.13.tgz -> atomdep-keyboard-layout-2.0.13.tar.gz https://registry.npmjs.org/keytar/-/keytar-4.1.0.tgz -> atomdep-keytar-4.1.0.tar.gz https://registry.npmjs.org/nsfw/-/nsfw-1.0.16.tgz -> atomdep-nsfw-1.0.16.tar.gz https://registry.npmjs.org/nslog/-/nslog-3.0.0.tgz -> atomdep-nslog-3.0.0.tar.gz https://registry.npmjs.org/oniguruma/-/oniguruma-6.2.1.tgz -> atomdep-oniguruma-6.2.1.tar.gz https://registry.npmjs.org/pathwatcher/-/pathwatcher-8.0.1.tgz -> atomdep-pathwatcher-8.0.1.tar.gz https://registry.npmjs.org/scrollbar-style/-/scrollbar-style-3.2.0.tgz -> atomdep-scrollbar-style-3.2.0.tar.gz https://registry.npmjs.org/spellchecker/-/spellchecker-3.4.4.tgz -> atomdep-spellchecker-3.4.4.tar.gz https://registry.npmjs.org/superstring/-/superstring-2.2.16.tgz -> atomdep-superstring-2.2.16.tar.gz
-_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	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=757958fa0c17df06e67bf9b1d7ab0c43
diff --git a/metadata/md5-cache/app-editors/beaver-0.4.1 b/metadata/md5-cache/app-editors/beaver-0.4.1
index 14ed4dc9440b..9cd837e4f461 100644
--- a/metadata/md5-cache/app-editors/beaver-0.4.1
+++ b/metadata/md5-cache/app-editors/beaver-0.4.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.14:2 >=x11-libs/gtk+-2.10:2
 SLOT=0
 SRC_URI=mirror://sourceforge/beaver-editor/beaver-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7d5dada028f278c3678360117ec246c1
diff --git a/metadata/md5-cache/app-editors/bluefish-2.2.10 b/metadata/md5-cache/app-editors/bluefish-2.2.10
index f7cdca730451..a43dba909445 100644
--- a/metadata/md5-cache/app-editors/bluefish-2.2.10
+++ b/metadata/md5-cache/app-editors/bluefish-2.2.10
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.bennewitz.com/bluefish/stable/source/bluefish-2.2.10.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c53f00b3eab0173ce6f5eaf6e1b4b500
diff --git a/metadata/md5-cache/app-editors/bluefish-2.2.6 b/metadata/md5-cache/app-editors/bluefish-2.2.6
index 9682787d93de..5f920a7379b1 100644
--- a/metadata/md5-cache/app-editors/bluefish-2.2.6
+++ b/metadata/md5-cache/app-editors/bluefish-2.2.6
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.bennewitz.com/bluefish/stable/source/bluefish-2.2.6.tar.bz2
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=77b5eefabf665f5ab3e2df65dde7d365
diff --git a/metadata/md5-cache/app-editors/bluefish-2.2.8 b/metadata/md5-cache/app-editors/bluefish-2.2.8
index b56a0cdc8a18..b19bdbdc7284 100644
--- a/metadata/md5-cache/app-editors/bluefish-2.2.8
+++ b/metadata/md5-cache/app-editors/bluefish-2.2.8
@@ -11,5 +11,5 @@ REQUIRED_USE=gtk2? ( !gtk3 !gucharmap ) gtk3? ( !gtk2 ) python? ( python_targets
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.bennewitz.com/bluefish/stable/source/bluefish-2.2.8.tar.bz2
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=38ee37494f66c2374c140566464dd635
diff --git a/metadata/md5-cache/app-editors/bluefish-2.2.9 b/metadata/md5-cache/app-editors/bluefish-2.2.9
index fe4711162aa5..db295ffbde5a 100644
--- a/metadata/md5-cache/app-editors/bluefish-2.2.9
+++ b/metadata/md5-cache/app-editors/bluefish-2.2.9
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.bennewitz.com/bluefish/stable/source/bluefish-2.2.9.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4444a27a3158c9ef837efe0418591d10
diff --git a/metadata/md5-cache/app-editors/editra-0.7.20-r2 b/metadata/md5-cache/app-editors/editra-0.7.20-r2
index 299f7fa0ef98..0311d259b973 100644
--- a/metadata/md5-cache/app-editors/editra-0.7.20-r2
+++ b/metadata/md5-cache/app-editors/editra-0.7.20-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://editra.org/uploads/src/Editra-0.7.20.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	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_=f49f78075f06733e8b530fa4dfb2ab7b
diff --git a/metadata/md5-cache/app-editors/efte-1.1-r1 b/metadata/md5-cache/app-editors/efte-1.1-r1
index 1c15332a7e44..800f6b9e7bb3 100644
--- a/metadata/md5-cache/app-editors/efte-1.1-r1
+++ b/metadata/md5-cache/app-editors/efte-1.1-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 Artistic )
 RDEPEND=sys-libs/ncurses:0= gpm? ( sys-libs/gpm ) X? ( x11-libs/libX11 x11-libs/libXpm x11-libs/libXdmcp x11-libs/libXau media-fonts/font-misc-misc )
 SLOT=0
 SRC_URI=mirror://sourceforge/efte/efte-1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=eabdf26f0b710ba9e5c686438a01ef11
diff --git a/metadata/md5-cache/app-editors/emacs-24.5-r7 b/metadata/md5-cache/app-editors/emacs-24.5-r7
index 647d60df15a6..6c5551b7cae4 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_=a9a7184a72ea288548c60719690a1804
+_md5_=1ba785c15a44f4ff372b98ae72f4f542
diff --git a/metadata/md5-cache/app-editors/emacs-25.3-r6 b/metadata/md5-cache/app-editors/emacs-25.3-r6
index 57a05f0e9248..ba9cda352b73 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_=257acfeeeb5bf04ca18473883bb46594
+_md5_=61cb2022993d1378c4dcfa13614bd75d
diff --git a/metadata/md5-cache/app-editors/emacs-26.1-r3 b/metadata/md5-cache/app-editors/emacs-26.1-r3
index bbd244b81cf3..4fd419d0eac5 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_=d1894a2ead7be836270b67a20079c690
+_md5_=350952edf8de9ea8586068810c32e682
diff --git a/metadata/md5-cache/app-editors/focuswriter-1.6.10 b/metadata/md5-cache/app-editors/focuswriter-1.6.10
index 3829103263b4..d04b1e6d5447 100644
--- a/metadata/md5-cache/app-editors/focuswriter-1.6.10
+++ b/metadata/md5-cache/app-editors/focuswriter-1.6.10
@@ -8,5 +8,5 @@ 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.10-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6f58c3b04ab7c8dac769e96e9a7fcf78
diff --git a/metadata/md5-cache/app-editors/focuswriter-1.6.13 b/metadata/md5-cache/app-editors/focuswriter-1.6.13
index 3bab0b43e61f..95c4bba9ff2b 100644
--- a/metadata/md5-cache/app-editors/focuswriter-1.6.13
+++ b/metadata/md5-cache/app-editors/focuswriter-1.6.13
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/app-editors/gedit-3.22.1 b/metadata/md5-cache/app-editors/gedit-3.22.1
index 58f29028b06f..6d46b8dcb536 100644
--- a/metadata/md5-cache/app-editors/gedit-3.22.1
+++ b/metadata/md5-cache/app-editors/gedit-3.22.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libxml2-2.5.0:2 >=dev-libs/glib-2.44:2[dbus] >=x11-libs/gtk+-
 REQUIRED_USE=python? ( introspection ^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gedit/3.22/gedit-3.22.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a7dcd8892694aaff05765ffcb8558958
diff --git a/metadata/md5-cache/app-editors/gedit-3.28.1 b/metadata/md5-cache/app-editors/gedit-3.28.1
index 4cbc42a9f13c..9901fcd0134b 100644
--- a/metadata/md5-cache/app-editors/gedit-3.28.1
+++ b/metadata/md5-cache/app-editors/gedit-3.28.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libxml2-2.5.0:2 >=dev-libs/glib-2.44:2[dbus] >=x11-libs/gtk+-
 REQUIRED_USE=python? ( introspection ^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gedit/3.28/gedit-3.28.1.tar.xz
-_eclasses_=desktop	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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/app-editors/gedit-plugins-3.22.0 b/metadata/md5-cache/app-editors/gedit-plugins-3.22.0
index 36992ddd1cd6..cb34468e7251 100644
--- a/metadata/md5-cache/app-editors/gedit-plugins-3.22.0
+++ b/metadata/md5-cache/app-editors/gedit-plugins-3.22.0
@@ -10,5 +10,5 @@ RDEPEND=>=app-editors/gedit-3.16 >=dev-libs/glib-2.32:2 >=dev-libs/libpeas-1.7.0
 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.22/gedit-plugins-3.22.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=c3733702d2e9534a5b5b0859f94c0d69
diff --git a/metadata/md5-cache/app-editors/ghex-3.18.3 b/metadata/md5-cache/app-editors/ghex-3.18.3
index b1a7cf63678b..4616aac30b2f 100644
--- a/metadata/md5-cache/app-editors/ghex-3.18.3
+++ b/metadata/md5-cache/app-editors/ghex-3.18.3
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/app-editors/gummi-0.6.6-r2 b/metadata/md5-cache/app-editors/gummi-0.6.6-r2
index ba3471503fa1..fa2233b64e4a 100644
--- a/metadata/md5-cache/app-editors/gummi-0.6.6-r2
+++ b/metadata/md5-cache/app-editors/gummi-0.6.6-r2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=app-text/gtkspell:2 app-text/poppler[cairo] dev-libs/glib:2 dev-texlive/texlive-latex dev-texlive/texlive-latexextra x11-libs/gtk+:2 x11-libs/gtksourceview:2.0 x11-libs/pango
 SLOT=0
 SRC_URI=https://github.com/alexandervdm/gummi/archive/0.6.6.tar.gz -> gummi-0.6.6.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6877d41a8c9c24001d8d8e99947fab4e
diff --git a/metadata/md5-cache/app-editors/gvim-8.0.1298 b/metadata/md5-cache/app-editors/gvim-8.0.1298
index 173ec12ef34f..2e4bd08ef7b6 100644
--- a/metadata/md5-cache/app-editors/gvim-8.0.1298
+++ b/metadata/md5-cache/app-editors/gvim-8.0.1298
@@ -10,5 +10,5 @@ RDEPEND=~app-editors/vim-core-8.0.1298 >=app-eselect/eselect-vi-1.1 >=sys-libs/n
 REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.0.1298.tar.gz -> vim-8.0.1298.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=853c968852dde03f7298c8be7f9f94dd
diff --git a/metadata/md5-cache/app-editors/gvim-8.0.1699-r1 b/metadata/md5-cache/app-editors/gvim-8.0.1699-r1
index 952a2326c94c..8cd59f7e8c59 100644
--- a/metadata/md5-cache/app-editors/gvim-8.0.1699-r1
+++ b/metadata/md5-cache/app-editors/gvim-8.0.1699-r1
@@ -10,5 +10,5 @@ RDEPEND=~app-editors/vim-core-8.0.1699 >=app-eselect/eselect-vi-1.1 >=sys-libs/n
 REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.0.1699.tar.gz -> vim-8.0.1699.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=234d1acedfbd47858ceaa7717f8336ff
diff --git a/metadata/md5-cache/app-editors/gvim-8.1.0034 b/metadata/md5-cache/app-editors/gvim-8.1.0034
index 01efc5effb50..b34f35b5d3e2 100644
--- a/metadata/md5-cache/app-editors/gvim-8.1.0034
+++ b/metadata/md5-cache/app-editors/gvim-8.1.0034
@@ -10,5 +10,5 @@ RDEPEND=~app-editors/vim-core-8.1.0034 >=app-eselect/eselect-vi-1.1 >=sys-libs/n
 REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.1.0034.tar.gz -> vim-8.1.0034.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=479614607d94f5b5b81a3ea977fe20b5
diff --git a/metadata/md5-cache/app-editors/gvim-8.1.0412 b/metadata/md5-cache/app-editors/gvim-8.1.0412
index 33ac9e619ca4..c087bb3884ee 100644
--- a/metadata/md5-cache/app-editors/gvim-8.1.0412
+++ b/metadata/md5-cache/app-editors/gvim-8.1.0412
@@ -10,5 +10,5 @@ RDEPEND=~app-editors/vim-core-8.1.0412 >=app-eselect/eselect-vi-1.1 >=sys-libs/n
 REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.1.0412.tar.gz -> vim-8.1.0412.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2d5504f19d85ee1767117a700bdb5094
diff --git a/metadata/md5-cache/app-editors/gvim-9999 b/metadata/md5-cache/app-editors/gvim-9999
index 2bdac147c207..0f1603a49b33 100644
--- a/metadata/md5-cache/app-editors/gvim-9999
+++ b/metadata/md5-cache/app-editors/gvim-9999
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=~app-editors/vim-core-9999 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk3? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk3? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_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_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(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= )
 REQUIRED_USE=luajit? ( lua ) 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
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2d5504f19d85ee1767117a700bdb5094
diff --git a/metadata/md5-cache/app-editors/jasspa-microemacs-20091011-r3 b/metadata/md5-cache/app-editors/jasspa-microemacs-20091011-r3
index b4defd46a440..58c7d5370c55 100644
--- a/metadata/md5-cache/app-editors/jasspa-microemacs-20091011-r3
+++ b/metadata/md5-cache/app-editors/jasspa-microemacs-20091011-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=sys-libs/ncurses:0= X? ( x11-libs/libX11 xpm? ( x11-libs/libXpm ) ) nanoemacs? ( !app-editors/ne )
 SLOT=0
 SRC_URI=http://www.jasspa.com/release_20090909/jasspa-mesrc-20091011.tar.gz !nanoemacs? ( http://www.jasspa.com/release_20090909/jasspa-memacros-20091017.tar.gz http://www.jasspa.com/release_20090909/jasspa-mehtml-20091011.tar.gz http://www.jasspa.com/release_20060909/meicons-extra.tar.gz )
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b88acd8cee25ffb5c2bf8943c4b5ce3f
diff --git a/metadata/md5-cache/app-editors/jedit-5.2.0-r1 b/metadata/md5-cache/app-editors/jedit-5.2.0-r1
index 5db24768d531..086a9b9d3554 100644
--- a/metadata/md5-cache/app-editors/jedit-5.2.0-r1
+++ b/metadata/md5-cache/app-editors/jedit-5.2.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=dev-java/bsh:0 dev-java/jsr305:0 dev-java/ant-contrib:0 dev-java/ant-apache-bsf:0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://sourceforge/jedit/jedit5.2.0source.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7760eec716cb10e10b228a73c691d297
diff --git a/metadata/md5-cache/app-editors/jedit-5.4.0 b/metadata/md5-cache/app-editors/jedit-5.4.0
index 1a7d4a6b641c..bca3e17817bf 100644
--- a/metadata/md5-cache/app-editors/jedit-5.4.0
+++ b/metadata/md5-cache/app-editors/jedit-5.4.0
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=dev-java/jsr305:0 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://sourceforge/jedit/jedit5.4.0source.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c443e73b58ac0d64096f78ef00a85e9f
diff --git a/metadata/md5-cache/app-editors/joe-4.6 b/metadata/md5-cache/app-editors/joe-4.6
index 679ff4ed1b0d..ab40bcda3903 100644
--- a/metadata/md5-cache/app-editors/joe-4.6
+++ b/metadata/md5-cache/app-editors/joe-4.6
@@ -9,5 +9,5 @@ LICENSE=GPL-1+ CC-BY-3.0
 RDEPEND=>=sys-libs/ncurses-5.2-r2:0= xterm? ( >=x11-terms/xterm-239 )
 SLOT=0
 SRC_URI=mirror://sourceforge/joe-editor/joe-4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2b59998ec994c407b10da4639dfcfc3a
diff --git a/metadata/md5-cache/app-editors/juffed-0.10_p20160323-r1 b/metadata/md5-cache/app-editors/juffed-0.10_p20160323-r1
index 618063fe0a21..d73db1cee437 100644
--- a/metadata/md5-cache/app-editors/juffed-0.10_p20160323-r1
+++ b/metadata/md5-cache/app-editors/juffed-0.10_p20160323-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-i18n/enca dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=x11-libs/qscintilla-2.9.4:=[qt5(+)]
 SLOT=0
 SRC_URI=https://github.com/Mezomish/juffed/tarball/5ba17f90ec173e773470bc80ea26bca9a3f093fd -> juffed-0.10_p20160323.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7778308b332b0109fa33a7354357dbff
diff --git a/metadata/md5-cache/app-editors/kile-2.9.92 b/metadata/md5-cache/app-editors/kile-2.9.92
index b73ef9bc168b..30e96f40928d 100644
--- a/metadata/md5-cache/app-editors/kile-2.9.92
+++ b/metadata/md5-cache/app-editors/kile-2.9.92
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/latexila-3.22.1 b/metadata/md5-cache/app-editors/latexila-3.22.1
index 5c3fddd414da..295450922dac 100644
--- a/metadata/md5-cache/app-editors/latexila-3.22.1
+++ b/metadata/md5-cache/app-editors/latexila-3.22.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=|| ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) app-text/enchant >=app-text/gspell-1.0:0= >=dev-libs/glib-2.40:2[dbus] >=dev-libs/libgee-0.10:0.8= gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.20:3 >=x11-libs/gtksourceview-3.18:3.0= x11-libs/gdk-pixbuf:2 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) virtual/latex-base x11-themes/hicolor-icon-theme latexmk? ( dev-tex/latexmk ) rubber? ( dev-tex/rubber )
 SLOT=0
 SRC_URI=mirror://gnome/sources/latexila/3.22/latexila-3.22.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8b37d407402f8e03872e4ad1a21169c8
diff --git a/metadata/md5-cache/app-editors/latexila-3.24.3 b/metadata/md5-cache/app-editors/latexila-3.24.3
index b9989b41c1a9..3cdb0082c419 100644
--- a/metadata/md5-cache/app-editors/latexila-3.24.3
+++ b/metadata/md5-cache/app-editors/latexila-3.24.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=|| ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] ) app-text/enchant >=app-text/gspell-1.0:0= >=dev-libs/glib-2.50:2[dbus] >=dev-libs/libgee-0.10:0.8= gnome-base/gsettings-desktop-schemas >=x11-libs/gtef-2.0 >=x11-libs/gtk+-3.20:3 >=x11-libs/gtksourceview-3.24:3.0= x11-libs/gdk-pixbuf:2 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) virtual/latex-base x11-themes/hicolor-icon-theme latexmk? ( dev-tex/latexmk ) rubber? ( dev-tex/rubber )
 SLOT=0
 SRC_URI=mirror://gnome/sources/latexila/3.24/latexila-3.24.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=29beecf66493685f2af77fe273dfd799
diff --git a/metadata/md5-cache/app-editors/leafpad-0.8.18.1 b/metadata/md5-cache/app-editors/leafpad-0.8.18.1
index dfe1d8a9dca0..8f2674d88eb9 100644
--- a/metadata/md5-cache/app-editors/leafpad-0.8.18.1
+++ b/metadata/md5-cache/app-editors/leafpad-0.8.18.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0e3f3f4d91c82c3be7510ae3fc40f338
diff --git a/metadata/md5-cache/app-editors/leo-5.6 b/metadata/md5-cache/app-editors/leo-5.6
index 9b4b76a18756..7ec204baf45e 100644
--- a/metadata/md5-cache/app-editors/leo-5.6
+++ b/metadata/md5-cache/app-editors/leo-5.6
@@ -10,5 +10,5 @@ RDEPEND=app-text/silvercity[python_targets_python2_7(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/leo-editor/leo-editor/archive/5.6.tar.gz -> leo-5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c3f1e7cccfe38390a8760968bcbedb0f
diff --git a/metadata/md5-cache/app-editors/mousepad-0.4.0-r1 b/metadata/md5-cache/app-editors/mousepad-0.4.0-r1
index 8eaeb4ccdb8c..d8080084a95f 100644
--- a/metadata/md5-cache/app-editors/mousepad-0.4.0-r1
+++ b/metadata/md5-cache/app-editors/mousepad-0.4.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.30:2= dbus? ( >=dev-libs/dbus-glib-0.100:0= ) !gtk3? ( >=x11-libs/gtk+-2.24:2= x11-libs/gtksourceview:2.0= ) gtk3? ( x11-libs/gtk+:3= x11-libs/gtksourceview:3.0= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/mousepad/0.4/mousepad-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8f557a6ada1833c703bfd1f19eb822db
diff --git a/metadata/md5-cache/app-editors/mousepad-0.4.1 b/metadata/md5-cache/app-editors/mousepad-0.4.1
index 3d209a7f2395..3001c73b77c1 100644
--- a/metadata/md5-cache/app-editors/mousepad-0.4.1
+++ b/metadata/md5-cache/app-editors/mousepad-0.4.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.30:2= dbus? ( >=dev-libs/dbus-glib-0.100:0= ) !gtk3? ( >=x11-libs/gtk+-2.24:2= x11-libs/gtksourceview:2.0= ) gtk3? ( >=x11-libs/gtk+-3.20:3= x11-libs/gtksourceview:3.0= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/mousepad/0.4/mousepad-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d2619f1edeb1975a2a021cd6c00be50e
diff --git a/metadata/md5-cache/app-editors/nano-2.9.8 b/metadata/md5-cache/app-editors/nano-2.9.8
index 87083f952983..de0de802c582 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_=f0ac8a38a0063fa9aff4f2d5dfa945be
+_md5_=1a7fd5f0221cbfbcbf8eed89607efe1f
diff --git a/metadata/md5-cache/app-editors/neovim-0.2.0-r1 b/metadata/md5-cache/app-editors/neovim-0.2.0-r1
index 6acf602b3b5f..131919a6eb62 100644
--- a/metadata/md5-cache/app-editors/neovim-0.2.0-r1
+++ b/metadata/md5-cache/app-editors/neovim-0.2.0-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 vim
 RDEPEND=>=dev-libs/libuv-1.2.0 >=dev-libs/msgpack-1.0.0 luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:= dev-lua/LuaBitOp ) tui? ( >=dev-libs/libtermkey-0.19 >=dev-libs/unibilium-1.1.1 ) dev-libs/libvterm dev-lua/lpeg[luajit=] dev-lua/mpack[luajit=] jemalloc? ( dev-libs/jemalloc ) python? ( dev-python/neovim-python-client ) ruby? ( dev-ruby/neovim-ruby-client ) remote? ( dev-python/neovim-remote ) clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )
 SLOT=0
 SRC_URI=https://github.com/neovim/neovim/archive/v0.2.0.tar.gz -> neovim-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c171e0cac0ee41b751e40693835e7e67
diff --git a/metadata/md5-cache/app-editors/neovim-0.2.2-r1 b/metadata/md5-cache/app-editors/neovim-0.2.2-r1
index 97a5606e9737..1f3feebb520c 100644
--- a/metadata/md5-cache/app-editors/neovim-0.2.2-r1
+++ b/metadata/md5-cache/app-editors/neovim-0.2.2-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 vim
 RDEPEND=>=dev-libs/libuv-1.2.0 >=dev-libs/msgpack-1.0.0 luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:= dev-lua/LuaBitOp ) tui? ( >=dev-libs/libtermkey-0.19 >=dev-libs/unibilium-1.1.1:= ) dev-libs/libvterm dev-lua/lpeg[luajit=] dev-lua/mpack[luajit=] jemalloc? ( dev-libs/jemalloc ) python? ( dev-python/neovim-python-client ) ruby? ( dev-ruby/neovim-ruby-client ) remote? ( dev-python/neovim-remote ) clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )
 SLOT=0
 SRC_URI=https://github.com/neovim/neovim/archive/v0.2.2.tar.gz -> neovim-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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=2c845405fbeea36e19715a463044f224
diff --git a/metadata/md5-cache/app-editors/neovim-0.3.0 b/metadata/md5-cache/app-editors/neovim-0.3.0
index 7fad55f6a3a6..3b6dc4f846f8 100644
--- a/metadata/md5-cache/app-editors/neovim-0.3.0
+++ b/metadata/md5-cache/app-editors/neovim-0.3.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 vim
 RDEPEND=>=dev-libs/libuv-1.2.0 >=dev-libs/msgpack-1.0.0 luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:= dev-lua/LuaBitOp ) tui? ( >=dev-libs/libtermkey-0.19 >=dev-libs/unibilium-1.1.1:= ) dev-libs/libvterm dev-lua/lpeg[luajit=] dev-lua/mpack[luajit=] jemalloc? ( dev-libs/jemalloc ) net-libs/libnsl python? ( dev-python/neovim-python-client ) ruby? ( dev-ruby/neovim-ruby-client ) remote? ( dev-python/neovim-remote ) clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )
 SLOT=0
 SRC_URI=https://github.com/neovim/neovim/archive/v0.3.0.tar.gz -> neovim-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a889bacd1e4d28f16dbe755814377746
diff --git a/metadata/md5-cache/app-editors/neovim-0.3.1 b/metadata/md5-cache/app-editors/neovim-0.3.1
index 2617ce242073..9486cd22bfa9 100644
--- a/metadata/md5-cache/app-editors/neovim-0.3.1
+++ b/metadata/md5-cache/app-editors/neovim-0.3.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 vim
 RDEPEND=dev-libs/libuv dev-libs/msgpack luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:= dev-lua/LuaBitOp ) tui? ( dev-libs/libtermkey dev-libs/unibilium ) dev-libs/libvterm dev-lua/lpeg[luajit=] dev-lua/mpack[luajit=] jemalloc? ( dev-libs/jemalloc ) net-libs/libnsl python? ( dev-python/neovim-python-client ) ruby? ( dev-ruby/neovim-ruby-client ) remote? ( dev-python/neovim-remote ) clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )
 SLOT=0
 SRC_URI=https://github.com/neovim/neovim/archive/v0.3.1.tar.gz -> neovim-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3f9417f5109a58e7ba34c9437b5712b1
diff --git a/metadata/md5-cache/app-editors/neovim-9999 b/metadata/md5-cache/app-editors/neovim-9999
index 188bf7cdc6a3..c3b7d60b0363 100644
--- a/metadata/md5-cache/app-editors/neovim-9999
+++ b/metadata/md5-cache/app-editors/neovim-9999
@@ -7,5 +7,5 @@ IUSE=+clipboard +luajit +nvimpager python remote ruby +tui +jemalloc
 LICENSE=Apache-2.0 vim
 RDEPEND=>=dev-libs/libuv-1.2.0 >=dev-libs/msgpack-1.0.0 luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:= dev-lua/LuaBitOp ) tui? ( >=dev-libs/libtermkey-0.19 >=dev-libs/unibilium-1.1.1 ) dev-libs/libvterm dev-lua/lpeg[luajit=] dev-lua/mpack[luajit=] jemalloc? ( dev-libs/jemalloc ) python? ( dev-python/neovim-python-client ) ruby? ( dev-ruby/neovim-ruby-client ) remote? ( dev-python/neovim-remote ) clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c171e0cac0ee41b751e40693835e7e67
diff --git a/metadata/md5-cache/app-editors/notepadqq-1.2.0 b/metadata/md5-cache/app-editors/notepadqq-1.2.0
index e83a1480b91a..ff178e6c51f4 100644
--- a/metadata/md5-cache/app-editors/notepadqq-1.2.0
+++ b/metadata/md5-cache/app-editors/notepadqq-1.2.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://github.com/notepadqq/notepadqq/archive/v1.2.0.tar.gz -> notepadqq-1.2.0.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8d82fa39276a276e7a59943a1fd2a753
diff --git a/metadata/md5-cache/app-editors/notepadqq-1.4.8 b/metadata/md5-cache/app-editors/notepadqq-1.4.8
index 7ce331631f3e..0c5d4be1b6bf 100644
--- a/metadata/md5-cache/app-editors/notepadqq-1.4.8
+++ b/metadata/md5-cache/app-editors/notepadqq-1.4.8
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4cb6e74b023c28d5f18ee658e48bdfab
diff --git a/metadata/md5-cache/app-editors/notepadqq-9999 b/metadata/md5-cache/app-editors/notepadqq-9999
index 8b6786ed7059..f5611e39be35 100644
--- a/metadata/md5-cache/app-editors/notepadqq-9999
+++ b/metadata/md5-cache/app-editors/notepadqq-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://notepadqq.altervista.org
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cf6957556d844213174afe26cf4e3a55
diff --git a/metadata/md5-cache/app-editors/okteta-0.25.1 b/metadata/md5-cache/app-editors/okteta-0.25.1
deleted file mode 100644
index 7f3994a667c8..000000000000
--- a/metadata/md5-cache/app-editors/okteta-0.25.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.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtscript-5.9.4:5[scripttools] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 crypt? ( app-crypt/qca:2[qt5(+)] ) designer? ( >=dev-qt/designer-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Hex editor by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/okteta https://utils.kde.org/projects/okteta
-IUSE=crypt designer test debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtscript-5.9.4:5[scripttools] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 crypt? ( app-crypt/qca:2[qt5(+)] ) designer? ( >=dev-qt/designer-5.9.4:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/okteta/0.25.1/src/okteta-0.25.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=a003aa5f73d8ee00783d93fb64cd4113
diff --git a/metadata/md5-cache/app-editors/okteta-0.25.3 b/metadata/md5-cache/app-editors/okteta-0.25.3
index 2cd4a3c4c912..656968f5670f 100644
--- a/metadata/md5-cache/app-editors/okteta-0.25.3
+++ b/metadata/md5-cache/app-editors/okteta-0.25.3
@@ -4,10 +4,10 @@ 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
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtscript-5.9.4:5[scripttools] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 crypt? ( app-crypt/qca:2[qt5(+)] ) designer? ( >=dev-qt/designer-5.9.4:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/okteta/0.25.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=8a00154d78ebfac36da89a31711755fb
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/pluma-1.12.2-r1 b/metadata/md5-cache/app-editors/pluma-1.12.2-r1
deleted file mode 100644
index 1f28feda7844..000000000000
--- a/metadata/md5-cache/app-editors/pluma-1.12.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=app-text/rarian:0 dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 >=mate-base/mate-desktop-1.9[gtk3(-)=] x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libX11:0 >=x11-libs/libSM-1.0 x11-libs/pango:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 >=x11-libs/gtksourceview-2.9.7:2.0 ) gtk3? ( >=x11-libs/gtk+-3.0:3 >=x11-libs/gtksourceview-2.9.7:3.0 ) spell? ( >=app-text/enchant-1.2:0 >=app-text/iso-codes-0.35: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/pygobject-2.15.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/pygtk-2.12:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_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/pygtksourceview-2.9.2:2 ) !!app-editors/mate-text-editor ~app-text/docbook-xml-dtd-4.1.2 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* >=sys-devel/libtool-2.2.6:2 >=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 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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.12 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Pluma text editor for the MATE desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=gtk3 python spell python_targets_python2_7 test
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=app-text/rarian:0 dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 >=mate-base/mate-desktop-1.9[gtk3(-)=] x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libX11:0 >=x11-libs/libSM-1.0 x11-libs/pango:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 >=x11-libs/gtksourceview-2.9.7:2.0 ) gtk3? ( >=x11-libs/gtk+-3.0:3 >=x11-libs/gtksourceview-2.9.7:3.0 ) spell? ( >=app-text/enchant-1.2:0 >=app-text/iso-codes-0.35: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/pygobject-2.15.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/pygtk-2.12:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_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/pygtksourceview-2.9.2:2 ) !!app-editors/mate-text-editor
-REQUIRED_USE=gtk3? ( !python ) python? ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/pluma-1.12.2.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=d5549e0bb728370bfd872f04639c912f
diff --git a/metadata/md5-cache/app-editors/pluma-1.14.1 b/metadata/md5-cache/app-editors/pluma-1.14.1
deleted file mode 100644
index 66ae37cd0056..000000000000
--- a/metadata/md5-cache/app-editors/pluma-1.14.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 >=mate-base/mate-desktop-1.9[gtk3(-)=] x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libX11:0 >=x11-libs/libSM-1.0 x11-libs/pango:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 >=x11-libs/gtksourceview-2.9.7:2.0 ) gtk3? ( >=x11-libs/gtk+-3.0:3 >=x11-libs/gtksourceview-2.9.7:3.0 ) spell? ( >=app-text/enchant-1.2:0 >=app-text/iso-codes-0.35: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/pygobject-2.15.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/pygtk-2.12:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_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/pygtksourceview-2.9.2:2 ) !!app-editors/mate-text-editor ~app-text/docbook-xml-dtd-4.1.2 app-text/rarian:0 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* >=sys-devel/libtool-2.2.6:2 >=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 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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.14 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Pluma text editor for the MATE desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=gtk3 python spell python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 >=mate-base/mate-desktop-1.9[gtk3(-)=] x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libX11:0 >=x11-libs/libSM-1.0 x11-libs/pango:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 >=x11-libs/gtksourceview-2.9.7:2.0 ) gtk3? ( >=x11-libs/gtk+-3.0:3 >=x11-libs/gtksourceview-2.9.7:3.0 ) spell? ( >=app-text/enchant-1.2:0 >=app-text/iso-codes-0.35: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/pygobject-2.15.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/pygtk-2.12:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_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/pygtksourceview-2.9.2:2 ) !!app-editors/mate-text-editor
-REQUIRED_USE=gtk3? ( !python ) python? ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.14/pluma-1.14.1.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=3ca5d52c7b21ff73bd9c97ed56a8def1
diff --git a/metadata/md5-cache/app-editors/pluma-1.16.2 b/metadata/md5-cache/app-editors/pluma-1.16.2
deleted file mode 100644
index 8af1e8c3a09f..000000000000
--- a/metadata/md5-cache/app-editors/pluma-1.16.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libX11:0 >=x11-libs/libSM-1.0 x11-libs/pango:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 >=x11-libs/gtksourceview-2.9.7:2.0 ) gtk3? ( >=x11-libs/gtk+-3.0:3 >=x11-libs/gtksourceview-2.9.7:3.0 ) spell? ( >=app-text/enchant-1.2:0 >=app-text/iso-codes-0.35: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/pygobject-2.15.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/pygtk-2.12:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_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/pygtksourceview-2.9.2:2 ) !!app-editors/mate-text-editor ~app-text/docbook-xml-dtd-4.1.2 app-text/rarian:0 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* >=sys-devel/libtool-2.2.6:2 >=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 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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.16 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Pluma text editor for the MATE desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=gtk3 python spell python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libX11:0 >=x11-libs/libSM-1.0 x11-libs/pango:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 >=x11-libs/gtksourceview-2.9.7:2.0 ) gtk3? ( >=x11-libs/gtk+-3.0:3 >=x11-libs/gtksourceview-2.9.7:3.0 ) spell? ( >=app-text/enchant-1.2:0 >=app-text/iso-codes-0.35: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/pygobject-2.15.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/pygtk-2.12:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_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/pygtksourceview-2.9.2:2 ) !!app-editors/mate-text-editor >=mate-base/mate-desktop-1.9[gtk3(-)=]
-REQUIRED_USE=gtk3? ( !python ) python? ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/pluma-1.16.2.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=35d32634098bef51cb8614e0551e86b9
diff --git a/metadata/md5-cache/app-editors/pluma-1.18.3 b/metadata/md5-cache/app-editors/pluma-1.18.3
index 0414e265a24e..ca4912699188 100644
--- a/metadata/md5-cache/app-editors/pluma-1.18.3
+++ b/metadata/md5-cache/app-editors/pluma-1.18.3
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=test
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.18/pluma-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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ecc48a51dc1816b11853f1c4cd599c5c
diff --git a/metadata/md5-cache/app-editors/qhexedit2-0.8.4 b/metadata/md5-cache/app-editors/qhexedit2-0.8.4
index 602cf002629f..cf39d59c6df4 100644
--- a/metadata/md5-cache/app-editors/qhexedit2-0.8.4
+++ b/metadata/md5-cache/app-editors/qhexedit2-0.8.4
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 python? ( dev-python/P
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://github.com/lancos/qhexedit2/archive/v0.8.4.tar.gz -> qhexedit2-0.8.4.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=05d1b6096a36248bb9368b73ab65df49
diff --git a/metadata/md5-cache/app-editors/qhexedit2-0.8.4_p20170719 b/metadata/md5-cache/app-editors/qhexedit2-0.8.4_p20170719
index 00e26fe397b5..53fc738e1f71 100644
--- a/metadata/md5-cache/app-editors/qhexedit2-0.8.4_p20170719
+++ b/metadata/md5-cache/app-editors/qhexedit2-0.8.4_p20170719
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 python? ( dev-python/P
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://github.com/lancos/qhexedit2/archive/5f3ca79dbe8c765b685636a1751d242a6bfabb7d.tar.gz -> qhexedit2-0.8.4_p20170719.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=05c80a270cedfc60be25f4cc9f0b6365
diff --git a/metadata/md5-cache/app-editors/qxmledit-0.9.10 b/metadata/md5-cache/app-editors/qxmledit-0.9.10
index 9e26a45a974a..d3be9cc00c6d 100644
--- a/metadata/md5-cache/app-editors/qxmledit-0.9.10
+++ b/metadata/md5-cache/app-editors/qxmledit-0.9.10
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscxml:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 media-libs/glu virtual/opengl
 SLOT=0
 SRC_URI=mirror://sourceforge/qxmledit/qxmledit-0.9.10-src.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b1fa00380103498f1c5fd8407397e31c
diff --git a/metadata/md5-cache/app-editors/qxmledit-0.9.7 b/metadata/md5-cache/app-editors/qxmledit-0.9.7
index 941d79e95e02..ecdd7a1db514 100644
--- a/metadata/md5-cache/app-editors/qxmledit-0.9.7
+++ b/metadata/md5-cache/app-editors/qxmledit-0.9.7
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscxml:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 media-libs/glu virtual/opengl
 SLOT=0
 SRC_URI=mirror://sourceforge/qxmledit/qxmledit-0.9.7-1-src.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a9204d17a506e4ced61cc6fcf00696dc
diff --git a/metadata/md5-cache/app-editors/qxmledit-0.9.8 b/metadata/md5-cache/app-editors/qxmledit-0.9.8
index d595ac195ea4..da56804daeb0 100644
--- a/metadata/md5-cache/app-editors/qxmledit-0.9.8
+++ b/metadata/md5-cache/app-editors/qxmledit-0.9.8
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscxml:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 media-libs/glu virtual/opengl
 SLOT=0
 SRC_URI=mirror://sourceforge/qxmledit/qxmledit-0.9.8-src.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=844580256685c22d5a7cfd6bbe58c0cf
diff --git a/metadata/md5-cache/app-editors/qxmledit-0.9.9 b/metadata/md5-cache/app-editors/qxmledit-0.9.9
index d1d0401de7c5..beb4918ff120 100644
--- a/metadata/md5-cache/app-editors/qxmledit-0.9.9
+++ b/metadata/md5-cache/app-editors/qxmledit-0.9.9
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscxml:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 media-libs/glu virtual/opengl
 SLOT=0
 SRC_URI=mirror://sourceforge/qxmledit/qxmledit-0.9.9-src.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=44d2929b80e5e3c5f1c6f0a5492ab807
diff --git a/metadata/md5-cache/app-editors/qxmledit-0.9.9.2 b/metadata/md5-cache/app-editors/qxmledit-0.9.9.2
index a7138e082de9..9b682ef4f1c1 100644
--- a/metadata/md5-cache/app-editors/qxmledit-0.9.9.2
+++ b/metadata/md5-cache/app-editors/qxmledit-0.9.9.2
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscxml:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 media-libs/glu virtual/opengl
 SLOT=0
 SRC_URI=mirror://sourceforge/qxmledit/qxmledit-0.9.9.2-src.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b1fa00380103498f1c5fd8407397e31c
diff --git a/metadata/md5-cache/app-editors/retext-7.0.0 b/metadata/md5-cache/app-editors/retext-7.0.0
index e05ecd54595e..eaf126d14304 100644
--- a/metadata/md5-cache/app-editors/retext-7.0.0
+++ b/metadata/md5-cache/app-editors/retext-7.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/docutils[python_targets_python3_4(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/R/ReText/ReText-7.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=50e54e5a7809f0773e4b2a0ec8737945
diff --git a/metadata/md5-cache/app-editors/retext-7.0.0-r2 b/metadata/md5-cache/app-editors/retext-7.0.0-r2
index fdcb2171efff..81fb48d973cf 100644
--- a/metadata/md5-cache/app-editors/retext-7.0.0-r2
+++ b/metadata/md5-cache/app-editors/retext-7.0.0-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/docutils[python_targets_python3_4(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/R/ReText/ReText-7.0.0.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=546594bac20f1c05a2e18bdd547624b5
diff --git a/metadata/md5-cache/app-editors/retext-7.0.1-r2 b/metadata/md5-cache/app-editors/retext-7.0.1-r2
index b0c815c9ff8b..087a84901346 100644
--- a/metadata/md5-cache/app-editors/retext-7.0.1-r2
+++ b/metadata/md5-cache/app-editors/retext-7.0.1-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/docutils[python_targets_python3_4(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/R/ReText/ReText-7.0.1.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=546594bac20f1c05a2e18bdd547624b5
diff --git a/metadata/md5-cache/app-editors/retext-7.0.3 b/metadata/md5-cache/app-editors/retext-7.0.3
index 333979a46918..39df265d7e58 100644
--- a/metadata/md5-cache/app-editors/retext-7.0.3
+++ b/metadata/md5-cache/app-editors/retext-7.0.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/chardet-2.3[python_targets_python3_4(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/R/ReText/ReText-7.0.3.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=34dbc82689824ed72a9288d72d829122
diff --git a/metadata/md5-cache/app-editors/retext-9999 b/metadata/md5-cache/app-editors/retext-9999
index 6d9a1cb67d3f..d518b1e52d6e 100644
--- a/metadata/md5-cache/app-editors/retext-9999
+++ b/metadata/md5-cache/app-editors/retext-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=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/markdown[python_targets_python3_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/markups-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/chardet-2.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/pygments[python_targets_python3_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[gui,network,printsupport,webengine,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(-)] spell? ( dev-python/pyenchant[python_targets_python3_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_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=546594bac20f1c05a2e18bdd547624b5
diff --git a/metadata/md5-cache/app-editors/scite-3.5.5 b/metadata/md5-cache/app-editors/scite-3.5.5
index 3c61a5d41c68..39c7869389b1 100644
--- a/metadata/md5-cache/app-editors/scite-3.5.5
+++ b/metadata/md5-cache/app-editors/scite-3.5.5
@@ -9,5 +9,5 @@ LICENSE=HPND lua? ( MIT )
 RDEPEND=dev-libs/glib:2 x11-libs/cairo x11-libs/gtk+:2 x11-libs/gdk-pixbuf x11-libs/pango lua? ( >=dev-lang/lua-5:0= )
 SLOT=0
 SRC_URI=mirror://sourceforge/scintilla/scite355.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=edc63136e26bef4774de714d28e5e47e
diff --git a/metadata/md5-cache/app-editors/scite-4.0.2 b/metadata/md5-cache/app-editors/scite-4.0.2
index 9681754e209e..9a957a5c9222 100644
--- a/metadata/md5-cache/app-editors/scite-4.0.2
+++ b/metadata/md5-cache/app-editors/scite-4.0.2
@@ -9,5 +9,5 @@ LICENSE=HPND lua? ( MIT )
 RDEPEND=dev-libs/glib:= x11-libs/cairo x11-libs/gtk+:3= x11-libs/gdk-pixbuf x11-libs/pango lua? ( >=dev-lang/lua-5:= )
 SLOT=0
 SRC_URI=mirror://sourceforge/scintilla/scite402.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9d4c8b3dfdf6bd46e2e6ccf5f82f81ff
diff --git a/metadata/md5-cache/app-editors/sublime-text-3_p3143 b/metadata/md5-cache/app-editors/sublime-text-3_p3143
index ab4c501a4c91..0fbddd16a60e 100644
--- a/metadata/md5-cache/app-editors/sublime-text-3_p3143
+++ b/metadata/md5-cache/app-editors/sublime-text-3_p3143
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libX11 dbus? ( sys-apps/dbus )
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=amd64? ( https://download.sublimetext.com/sublime_text_3_build_3143_x64.tar.bz2 ) x86? ( https://download.sublimetext.com/sublime_text_3_build_3143_x32.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=eeda45d1ec00f1e258d1cf57239633e5
diff --git a/metadata/md5-cache/app-editors/sublime-text-3_p3176 b/metadata/md5-cache/app-editors/sublime-text-3_p3176
index 6d71eea2db8e..98370c12cc02 100644
--- a/metadata/md5-cache/app-editors/sublime-text-3_p3176
+++ b/metadata/md5-cache/app-editors/sublime-text-3_p3176
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libX11 dbus? ( sys-apps/dbus )
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=amd64? ( https://download.sublimetext.com/sublime_text_3_build_3176_x64.tar.bz2 ) x86? ( https://download.sublimetext.com/sublime_text_3_build_3176_x32.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e98e5ccdd2cf553386c2620dfcdc847c
diff --git a/metadata/md5-cache/app-editors/tea-44.1.1 b/metadata/md5-cache/app-editors/tea-44.1.1
index 10338232d477..c432b16289be 100644
--- a/metadata/md5-cache/app-editors/tea-44.1.1
+++ b/metadata/md5-cache/app-editors/tea-44.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 sys-libs/zlib aspell? ( app-text/aspell ) djvu? ( app-text/djvu ) hunspell? ( app-text/hunspell:= ) pdf? ( app-text/poppler[qt5] ) qml? ( dev-qt/qtdeclarative:5 )
 SLOT=0
 SRC_URI=https://tea.ourproject.org/dloads/tea-44.1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=455318ae5863e333c63d139ecef36f51
diff --git a/metadata/md5-cache/app-editors/ted-2.23 b/metadata/md5-cache/app-editors/ted-2.23
index fff740f29f0b..6ed6a4411bbf 100644
--- a/metadata/md5-cache/app-editors/ted-2.23
+++ b/metadata/md5-cache/app-editors/ted-2.23
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 media-libs/tiff:= virtual/jpeg:= media-libs/libpng:= x11-libs/libXft x11-libs/libXpm
 SLOT=0
 SRC_URI=ftp://ftp.nluug.nl/pub/editors/ted/ted-2.23.src.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=371add749fef968ed832c875fe3dae78
diff --git a/metadata/md5-cache/app-editors/xemacs-21.4.24 b/metadata/md5-cache/app-editors/xemacs-21.4.24
index ef3903b30218..824f732f1cf6 100644
--- a/metadata/md5-cache/app-editors/xemacs-21.4.24
+++ b/metadata/md5-cache/app-editors/xemacs-21.4.24
@@ -10,5 +10,5 @@ PDEPEND=app-xemacs/xemacs-base mule? ( app-xemacs/mule-base )
 RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3 ) >=sys-libs/zlib-1.1.4 >=dev-libs/openssl-0.9.6:0 >=media-libs/audiofile-0.2.3 gpm? ( >=sys-libs/gpm-1.19.6 ) postgres? ( dev-db/postgresql:= ) ldap? ( net-nds/openldap ) nas? ( media-libs/nas ) X? ( x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) dnd? ( x11-libs/dnd ) motif? ( >=x11-libs/motif-2.3:0 ) athena? ( x11-libs/libXaw ) Xaw3d? ( x11-libs/libXaw3d ) neXt? ( x11-libs/neXtaw ) xface? ( media-libs/compface ) tiff? ( media-libs/tiff:0 ) png? ( >=media-libs/libpng-1.2:0 ) jpeg? ( virtual/jpeg:0 ) canna? ( app-i18n/canna ) !amd64? ( freewnn? ( app-i18n/freewnn ) ) >=sys-libs/ncurses-5.2:= >=app-eselect/eselect-emacs-1.15
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/xemacs-21.4/xemacs-21.4.24.tar.gz http://www.malfunction.de/afterstep/files/NeXT_XEmacs.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=87b51b693ea3ee7f2329e741d84be721
diff --git a/metadata/md5-cache/app-editors/xemacs-21.4.24-r1 b/metadata/md5-cache/app-editors/xemacs-21.4.24-r1
index c37a447b6687..72d26014bfe3 100644
--- a/metadata/md5-cache/app-editors/xemacs-21.4.24-r1
+++ b/metadata/md5-cache/app-editors/xemacs-21.4.24-r1
@@ -10,5 +10,5 @@ PDEPEND=app-xemacs/xemacs-base mule? ( app-xemacs/mule-base )
 RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb] ) >=sys-libs/zlib-1.1.4 >=dev-libs/openssl-0.9.6:0 >=media-libs/audiofile-0.2.3 gpm? ( >=sys-libs/gpm-1.19.6 ) postgres? ( dev-db/postgresql:= ) ldap? ( net-nds/openldap ) nas? ( media-libs/nas ) X? ( x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) dnd? ( x11-libs/dnd ) motif? ( >=x11-libs/motif-2.3:0 ) athena? ( x11-libs/libXaw ) Xaw3d? ( x11-libs/libXaw3d ) neXt? ( x11-libs/neXtaw ) xface? ( media-libs/compface ) tiff? ( media-libs/tiff:0 ) png? ( >=media-libs/libpng-1.2:0 ) jpeg? ( virtual/jpeg:0 ) canna? ( app-i18n/canna ) !amd64? ( freewnn? ( app-i18n/freewnn ) ) >=sys-libs/ncurses-5.2:= >=app-eselect/eselect-emacs-1.15
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/xemacs-21.4/xemacs-21.4.24.tar.gz http://www.malfunction.de/afterstep/files/NeXT_XEmacs.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2ac85dff007794a223bd37c21a3b7b33
diff --git a/metadata/md5-cache/app-editors/xemacs-21.5.34-r4 b/metadata/md5-cache/app-editors/xemacs-21.5.34-r4
index ccbdcaf0ecb3..08c2187fc2ca 100644
--- a/metadata/md5-cache/app-editors/xemacs-21.5.34-r4
+++ b/metadata/md5-cache/app-editors/xemacs-21.5.34-r4
@@ -10,5 +10,5 @@ PDEPEND=app-xemacs/xemacs-base mule? ( app-xemacs/mule-base )
 RDEPEND=berkdb? ( >=sys-libs/db-4:= !!<sys-libs/db-4 ) gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb(+)] ) >=sys-libs/zlib-1.1.4 !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) >=media-libs/audiofile-0.2.3 gpm? ( >=sys-libs/gpm-1.19.6 ) postgres? ( dev-db/postgresql:= ) ldap? ( net-nds/openldap ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) X? ( x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) dnd? ( x11-libs/dnd ) motif? ( >=x11-libs/motif-2.3:0[xft=] ) athena? ( x11-libs/libXaw ) Xaw3d? ( x11-libs/libXaw3d ) xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 ) neXt? ( x11-libs/neXtaw ) xface? ( media-libs/compface ) tiff? ( media-libs/tiff:0 ) png? ( >=media-libs/libpng-1.2:0 ) jpeg? ( virtual/jpeg:0 ) canna? ( app-i18n/canna ) freewnn? ( app-i18n/freewnn ) >=sys-libs/ncurses-5.2:= >=app-eselect/eselect-emacs-1.15
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/xemacs-21.5/xemacs-21.5.34.tar.gz http://www.malfunction.de/afterstep/files/NeXT_XEmacs.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-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=4e3c74a7c91d5a0c5ceea1e20b74621c
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 5326c14ac8ab..dd2237f95d4e 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/emacs-common-gentoo-1.6-r1 b/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6-r1
index d39320c9c2c3..f93cf5612271 100644
--- a/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6-r1
+++ b/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 PDEPEND=virtual/emacs
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/emacs-common-gentoo-1.6.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=679a5f9c0096e79f2cfd2977f3fee2c2
diff --git a/metadata/md5-cache/app-emacs/gnuserv-3.12.8-r4 b/metadata/md5-cache/app-emacs/gnuserv-3.12.8-r4
index 634b8e5638ab..ffa105c48d2f 100644
--- a/metadata/md5-cache/app-emacs/gnuserv-3.12.8-r4
+++ b/metadata/md5-cache/app-emacs/gnuserv-3.12.8-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-eselect/eselect-emacs-1.15 X? ( x11-libs/libXau ) >=virtual/emacs-23
 SLOT=0
 SRC_URI=http://meltin.net/hacks/emacs/src/gnuserv-3.12.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	efe1c459331d853614b12c63ab169a32	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	efe1c459331d853614b12c63ab169a32	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9b278294180524d8d7f52ed42e664960
diff --git a/metadata/md5-cache/app-emacs/pymacs-0.25-r2 b/metadata/md5-cache/app-emacs/pymacs-0.25-r2
index 14acf9c3b941..fb984dd13d3c 100644
--- a/metadata/md5-cache/app-emacs/pymacs-0.25-r2
+++ b/metadata/md5-cache/app-emacs/pymacs-0.25-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/emacs-23 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r
 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/pinard/Pymacs/tarball/v0.25 -> pymacs-0.25.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	elisp	efe1c459331d853614b12c63ab169a32	elisp-common	23f47b2e1de7abf387105eddd1318738	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	elisp	efe1c459331d853614b12c63ab169a32	elisp-common	23f47b2e1de7abf387105eddd1318738	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_=0c83fd58e7feccc536ef542ee445103f
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 9913cdf97780..11f12a8190b4 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/aqemu-0.9.2 b/metadata/md5-cache/app-emulation/aqemu-0.9.2
index 4b3615ef47df..d8961daf146d 100644
--- a/metadata/md5-cache/app-emulation/aqemu-0.9.2
+++ b/metadata/md5-cache/app-emulation/aqemu-0.9.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-emulation/qemu vnc? ( net-libs/libvncserver ) dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qttest:5 dev-qt/qtprintsupport:5
 SLOT=0
 SRC_URI=https://github.com/tobimensch/aqemu/archive/v0.9.2.tar.gz -> aqemu-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c22b0a5b053afed272abf0097d769fe0
diff --git a/metadata/md5-cache/app-emulation/cloud-init-0.7.6-r1 b/metadata/md5-cache/app-emulation/cloud-init-0.7.6-r1
index 0fec71a45493..d9ca71d0e049 100644
--- a/metadata/md5-cache/app-emulation/cloud-init-0.7.6-r1
+++ b/metadata/md5-cache/app-emulation/cloud-init-0.7.6-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://launchpad.net/cloud-init/trunk/0.7.6/+download/cloud-init-0.7.6.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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=5c1a03b81e7e517993d292d57c51d3e0
diff --git a/metadata/md5-cache/app-emulation/cloud-init-0.7.6-r2 b/metadata/md5-cache/app-emulation/cloud-init-0.7.6-r2
index 9108010a715a..b6f34c6a4aa4 100644
--- a/metadata/md5-cache/app-emulation/cloud-init-0.7.6-r2
+++ b/metadata/md5-cache/app-emulation/cloud-init-0.7.6-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://launchpad.net/cloud-init/trunk/0.7.6/+download/cloud-init-0.7.6.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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=39b382fd3297e78a9cd5d81aaf6bc6c7
diff --git a/metadata/md5-cache/app-emulation/cloud-init-0.7.6_p1212 b/metadata/md5-cache/app-emulation/cloud-init-0.7.6_p1212
index 764eedf69681..affc6845a7ea 100644
--- a/metadata/md5-cache/app-emulation/cloud-init-0.7.6_p1212
+++ b/metadata/md5-cache/app-emulation/cloud-init-0.7.6_p1212
@@ -10,5 +10,5 @@ RDEPEND=dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gentoo/cloud-init-0.7.6_p1212.tar.gz https://dev.gentoo.org/~robbat2/distfiles/cloud-init-0.7.6_p1212.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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=9e63018289d7f9cbcb3614f40ab6118c
diff --git a/metadata/md5-cache/app-emulation/cloud-init-0.7.6_p1212-r1 b/metadata/md5-cache/app-emulation/cloud-init-0.7.6_p1212-r1
index 721ca55552da..eec428a74de9 100644
--- a/metadata/md5-cache/app-emulation/cloud-init-0.7.6_p1212-r1
+++ b/metadata/md5-cache/app-emulation/cloud-init-0.7.6_p1212-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gentoo/cloud-init-0.7.6_p1212.tar.gz https://dev.gentoo.org/~robbat2/distfiles/cloud-init-0.7.6_p1212.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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=43320d3dfc9eea00f05a1048722708be
diff --git a/metadata/md5-cache/app-emulation/cloud-init-0.7.7 b/metadata/md5-cache/app-emulation/cloud-init-0.7.7
index 058b04d7c4e9..4049ea8bb6be 100644
--- a/metadata/md5-cache/app-emulation/cloud-init-0.7.7
+++ b/metadata/md5-cache/app-emulation/cloud-init-0.7.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://gentoo/cloud-init-0.7.7.tar.gz https://dev.gentoo.org/~prometheanfire/dist/cloud-init/cloud-init-0.7.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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=6a51dd1f90487e374e69cd4944d77778
diff --git a/metadata/md5-cache/app-emulation/cloud-init-0.7.8-r2 b/metadata/md5-cache/app-emulation/cloud-init-0.7.8-r2
index 7a544a2fdfae..90084db13569 100644
--- a/metadata/md5-cache/app-emulation/cloud-init-0.7.8-r2
+++ b/metadata/md5-cache/app-emulation/cloud-init-0.7.8-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://launchpad.net/cloud-init/trunk/0.7.8/+download/cloud-init-0.7.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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=f7947ee68fcc9e742fda270749ba17e0
diff --git a/metadata/md5-cache/app-emulation/cloud-init-0.7.9 b/metadata/md5-cache/app-emulation/cloud-init-0.7.9
index 61c7d375c4a5..c932447773ce 100644
--- a/metadata/md5-cache/app-emulation/cloud-init-0.7.9
+++ b/metadata/md5-cache/app-emulation/cloud-init-0.7.9
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://launchpad.net/cloud-init/trunk/0.7.9/+download/cloud-init-0.7.9.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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=2a1791c7f616cbb6f80c12c517dcba31
diff --git a/metadata/md5-cache/app-emulation/cloud-init-17.1 b/metadata/md5-cache/app-emulation/cloud-init-17.1
index 98647ace233f..0aef7f71c906 100644
--- a/metadata/md5-cache/app-emulation/cloud-init-17.1
+++ b/metadata/md5-cache/app-emulation/cloud-init-17.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/cloud-init/trunk/17.1/+download/cloud-init-17.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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=72611cdc32b462e007bff4c3b07f9cc1
diff --git a/metadata/md5-cache/app-emulation/cloud-init-17.2 b/metadata/md5-cache/app-emulation/cloud-init-17.2
index 529ef8b8465d..b4e9824ef536 100644
--- a/metadata/md5-cache/app-emulation/cloud-init-17.2
+++ b/metadata/md5-cache/app-emulation/cloud-init-17.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/cloud-init/trunk/17.2/+download/cloud-init-17.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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=f723b4cf15c17bf56f90496e7d758f55
diff --git a/metadata/md5-cache/app-emulation/cloud-init-9999 b/metadata/md5-cache/app-emulation/cloud-init-9999
index 50d15576068d..9b1c10321822 100644
--- a/metadata/md5-cache/app-emulation/cloud-init-9999
+++ b/metadata/md5-cache/app-emulation/cloud-init-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 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/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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/jsonpatch[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/oauthlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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/pyserial[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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(-)] sys-apps/iproute2 sys-fs/growpart virtual/logger python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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_=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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=eaf7d601747dd69c58f7120586315e2b
diff --git a/metadata/md5-cache/app-emulation/diskimage-builder-2.16.0 b/metadata/md5-cache/app-emulation/diskimage-builder-2.16.0
index 84dfa28b6597..b9e1625643e7 100644
--- a/metadata/md5-cache/app-emulation/diskimage-builder-2.16.0
+++ b/metadata/md5-cache/app-emulation/diskimage-builder-2.16.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/diskimage-builder/diskimage-builder-2.16.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8b5b0af10b445457212ccb8034826e06
diff --git a/metadata/md5-cache/app-emulation/diskimage-builder-2.17.0 b/metadata/md5-cache/app-emulation/diskimage-builder-2.17.0
index fbad237bdb22..b337fa67849e 100644
--- a/metadata/md5-cache/app-emulation/diskimage-builder-2.17.0
+++ b/metadata/md5-cache/app-emulation/diskimage-builder-2.17.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/diskimage-builder/diskimage-builder-2.17.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0490dda404715900f3feeed3a2ea5d6c
diff --git a/metadata/md5-cache/app-emulation/docker-18.03.1 b/metadata/md5-cache/app-emulation/docker-18.03.1
index 0bb08c22ffa9..50c97a2bd992 100644
--- a/metadata/md5-cache/app-emulation/docker-18.03.1
+++ b/metadata/md5-cache/app-emulation/docker-18.03.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) s
 RESTRICT=installsources strip
 SLOT=0
 SRC_URI=https://github.com/docker/docker-ce/archive/v18.03.1-ce.tar.gz -> docker-18.03.1.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=22198cd8e8200f61174fc6be6585e169
diff --git a/metadata/md5-cache/app-emulation/docker-18.06.0 b/metadata/md5-cache/app-emulation/docker-18.06.0
index 6b7ce1927502..ac9ac0e10f29 100644
--- a/metadata/md5-cache/app-emulation/docker-18.06.0
+++ b/metadata/md5-cache/app-emulation/docker-18.06.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) s
 RESTRICT=installsources strip
 SLOT=0
 SRC_URI=https://github.com/docker/docker-ce/archive/v18.06.0-ce.tar.gz -> docker-18.06.0.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=957a2e552db0a4bf0f5bc95eeda832bd
diff --git a/metadata/md5-cache/app-emulation/docker-18.06.1 b/metadata/md5-cache/app-emulation/docker-18.06.1
index 5ea2a3b502e5..2a9e019313ea 100644
--- a/metadata/md5-cache/app-emulation/docker-18.06.1
+++ b/metadata/md5-cache/app-emulation/docker-18.06.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) s
 RESTRICT=installsources strip
 SLOT=0
 SRC_URI=https://github.com/docker/docker-ce/archive/v18.06.1-ce.tar.gz -> docker-18.06.1.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=75443f505e0a6655ef0b756869a7e821
diff --git a/metadata/md5-cache/app-emulation/docker-9999 b/metadata/md5-cache/app-emulation/docker-9999
index d95ea98ccf22..10b56878dac4 100644
--- a/metadata/md5-cache/app-emulation/docker-9999
+++ b/metadata/md5-cache/app-emulation/docker-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) apparmor? ( sys-libs/libapparmor ) !app-emulation/docker-bin >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 >=app-emulation/containerd-1.0.0 app-emulation/runc[apparmor?,seccomp?] app-emulation/docker-proxy container-init? ( >=sys-process/tini-0.13.0[static] )
 RESTRICT=installsources strip
 SLOT=0
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	0d4635eeb5a96cd5315597a47eba25c9	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	0d4635eeb5a96cd5315597a47eba25c9	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=facc44632d7c791e3fc9944228968cbb
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.19.0 b/metadata/md5-cache/app-emulation/docker-compose-1.19.0
index 1b859091bfb9..2a10686b58bd 100644
--- a/metadata/md5-cache/app-emulation/docker-compose-1.19.0
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.19.0
@@ -10,5 +10,5 @@ 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
 SRC_URI=mirror://pypi/d/docker-compose/docker-compose-1.19.0.tar.gz -> docker-compose-1.19.0.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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_=8ef9c0532ce1823a5018ffffa37533c3
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.21.2-r1 b/metadata/md5-cache/app-emulation/docker-compose-1.21.2-r1
index 244a4105b304..9b81503ee1f3 100644
--- a/metadata/md5-cache/app-emulation/docker-compose-1.21.2-r1
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.21.2-r1
@@ -10,5 +10,5 @@ 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
 SRC_URI=https://github.com/docker/compose/archive/1.21.2.tar.gz -> docker-compose-1.21.2.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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_=dbf3205e66050f53a87b6aea9d573d2c
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.22.0 b/metadata/md5-cache/app-emulation/docker-compose-1.22.0
index 4a23462c7224..374605beb973 100644
--- a/metadata/md5-cache/app-emulation/docker-compose-1.22.0
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.22.0
@@ -10,5 +10,5 @@ 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
 SRC_URI=https://github.com/docker/compose/archive/1.22.0.tar.gz -> docker-compose-1.22.0.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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_=a56858991d593bed09bfad07020f8151
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.22.0-r1 b/metadata/md5-cache/app-emulation/docker-compose-1.22.0-r1
index 201aa2330cf7..87205d2b5428 100644
--- a/metadata/md5-cache/app-emulation/docker-compose-1.22.0-r1
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.22.0-r1
@@ -10,5 +10,5 @@ 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
 SRC_URI=https://github.com/docker/compose/archive/1.22.0.tar.gz -> docker-compose-1.22.0.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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_=51a6c0d94dae04ca4db0de72e7b06680
diff --git a/metadata/md5-cache/app-emulation/dynamips-0.2.12 b/metadata/md5-cache/app-emulation/dynamips-0.2.12
deleted file mode 100644
index c161e4ecd258..000000000000
--- a/metadata/md5-cache/app-emulation/dynamips-0.2.12
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-libs/elfutils net-libs/libpcap app-arch/unzip
-DESCRIPTION=Cisco 7200/3600 Simulator
-EAPI=5
-HOMEPAGE=http://www.gns3.net/dynamips/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/elfutils net-libs/libpcap
-SLOT=0
-SRC_URI=mirror://sourceforge/project/gns-3/Dynamips/0.2.12/dynamips-0.2.12-source.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d3fcef2ae6d91f38f151a223e3d47e1c
diff --git a/metadata/md5-cache/app-emulation/dynamips-0.2.14-r1 b/metadata/md5-cache/app-emulation/dynamips-0.2.14-r1
index cd67da0ce55b..e19937047980 100644
--- a/metadata/md5-cache/app-emulation/dynamips-0.2.14-r1
+++ b/metadata/md5-cache/app-emulation/dynamips-0.2.14-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/elfutils net-libs/libpcap
 SLOT=0
 SRC_URI=mirror://sourceforge/project/gns-3/Dynamips/0.2.14/dynamips-0.2.14-source.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=27742ddbf874138bea82f8807e099f7d
diff --git a/metadata/md5-cache/app-emulation/dynamips-0.2.14-r2 b/metadata/md5-cache/app-emulation/dynamips-0.2.14-r2
new file mode 100644
index 000000000000..9783494c36b0
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/dynamips-0.2.14-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/elfutils net-libs/libpcap app-arch/unzip sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Cisco 7200/3600 Simulator
+EAPI=6
+HOMEPAGE=http://www.gns3.net/dynamips/
+IUSE=ipv6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/elfutils net-libs/libpcap
+SLOT=0
+SRC_URI=mirror://sourceforge/project/gns-3/Dynamips/0.2.14/dynamips-0.2.14-source.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_=f03b7147cab4a8b0e16c3391036b3ca7
diff --git a/metadata/md5-cache/app-emulation/dynamips-0.2.18 b/metadata/md5-cache/app-emulation/dynamips-0.2.18
new file mode 100644
index 000000000000..d14c38b8f561
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/dynamips-0.2.18
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/elfutils net-libs/libpcap app-arch/unzip sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Cisco 7200/3600 Simulator
+EAPI=6
+HOMEPAGE=https://github.com/GNS3/dynamips
+IUSE=ipv6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/elfutils net-libs/libpcap
+SLOT=0
+SRC_URI=https://github.com/GNS3/dynamips/archive/v0.2.18.tar.gz -> dynamips-0.2.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_=326b072bc0d970cc889038bb3f80b2fa
diff --git a/metadata/md5-cache/app-emulation/glean-1.10.3 b/metadata/md5-cache/app-emulation/glean-1.10.3
index 552866a8e2fa..c1d73068c69a 100644
--- a/metadata/md5-cache/app-emulation/glean-1.10.3
+++ b/metadata/md5-cache/app-emulation/glean-1.10.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/glean/glean-1.10.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7287a2353efaeabd00461112e39355ea
diff --git a/metadata/md5-cache/app-emulation/libguestfs-1.28.5-r3 b/metadata/md5-cache/app-emulation/libguestfs-1.28.5-r3
index adbdaaabd9fd..6e3441fb9acc 100644
--- a/metadata/md5-cache/app-emulation/libguestfs-1.28.5-r3
+++ b/metadata/md5-cache/app-emulation/libguestfs-1.28.5-r3
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/li
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) )
 SLOT=0/1.28
 SRC_URI=http://libguestfs.org/download/1.28-stable/libguestfs-1.28.5.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=8c100934ee0bd299ca9d3791a8eb8347
diff --git a/metadata/md5-cache/app-emulation/libguestfs-1.36.13 b/metadata/md5-cache/app-emulation/libguestfs-1.36.13
index a16ad3686dc7..d0728173ad30 100644
--- a/metadata/md5-cache/app-emulation/libguestfs-1.36.13
+++ b/metadata/md5-cache/app-emulation/libguestfs-1.36.13
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/li
 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/1.36
 SRC_URI=http://libguestfs.org/download/1.36-stable/libguestfs-1.36.13.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	perl-functions	f2e3420aed32cf1abe33b4129b842636	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	perl-functions	f2e3420aed32cf1abe33b4129b842636	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=6ccab457190bf644ae9e420946a80f18
diff --git a/metadata/md5-cache/app-emulation/libguestfs-1.36.5 b/metadata/md5-cache/app-emulation/libguestfs-1.36.5
index 7828b705f1d3..1fd042e69751 100644
--- a/metadata/md5-cache/app-emulation/libguestfs-1.36.5
+++ b/metadata/md5-cache/app-emulation/libguestfs-1.36.5
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/li
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) )
 SLOT=0/1.36
 SRC_URI=http://libguestfs.org/download/1.36-stable/libguestfs-1.36.5.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=ea536ea1bd86e77b075c83665bd70beb
diff --git a/metadata/md5-cache/app-emulation/libvirt-4.3.0 b/metadata/md5-cache/app-emulation/libvirt-4.3.0
index d042d74dd9c3..03724a034e52 100644
--- a/metadata/md5-cache/app-emulation/libvirt-4.3.0
+++ b/metadata/md5-cache/app-emulation/libvirt-4.3.0
@@ -10,5 +10,5 @@ RDEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) policykit? ( dbus ) qemu? ( libvirtd ) uml? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0/4.3.0
 SRC_URI=https://libvirt.org/sources/libvirt-4.3.0.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8943d1fc15fe136c62745dec545aef84
diff --git a/metadata/md5-cache/app-emulation/libvirt-4.4.0-r1 b/metadata/md5-cache/app-emulation/libvirt-4.4.0-r1
index d4ed326ac6ee..f9798c2f9421 100644
--- a/metadata/md5-cache/app-emulation/libvirt-4.4.0-r1
+++ b/metadata/md5-cache/app-emulation/libvirt-4.4.0-r1
@@ -10,5 +10,5 @@ RDEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) policykit? ( dbus ) qemu? ( libvirtd ) uml? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0/4.4.0
 SRC_URI=https://libvirt.org/sources/libvirt-4.4.0.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e0f65ac9d54175c23481f1fe622b1766
diff --git a/metadata/md5-cache/app-emulation/libvirt-4.5.0-r1 b/metadata/md5-cache/app-emulation/libvirt-4.5.0-r1
index 6fd639b27c18..b9374b585246 100644
--- a/metadata/md5-cache/app-emulation/libvirt-4.5.0-r1
+++ b/metadata/md5-cache/app-emulation/libvirt-4.5.0-r1
@@ -10,5 +10,5 @@ RDEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) policykit? ( dbus ) qemu? ( libvirtd ) uml? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0/4.5.0
 SRC_URI=https://libvirt.org/sources/libvirt-4.5.0.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e51bc14fafaa86fe6d0c6e32a4b22ee9
diff --git a/metadata/md5-cache/app-emulation/libvirt-4.6.0-r1 b/metadata/md5-cache/app-emulation/libvirt-4.6.0-r1
index 3cb1239202aa..8fd32729e799 100644
--- a/metadata/md5-cache/app-emulation/libvirt-4.6.0-r1
+++ b/metadata/md5-cache/app-emulation/libvirt-4.6.0-r1
@@ -10,5 +10,5 @@ RDEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) policykit? ( dbus ) qemu? ( libvirtd ) uml? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0/4.6.0
 SRC_URI=https://libvirt.org/sources/libvirt-4.6.0.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9aa4b973c4576199bdef9522c360698d
diff --git a/metadata/md5-cache/app-emulation/libvirt-9999 b/metadata/md5-cache/app-emulation/libvirt-9999
index 0d4a7f9086fc..3189d5ff9048 100644
--- a/metadata/md5-cache/app-emulation/libvirt-9999
+++ b/metadata/md5-cache/app-emulation/libvirt-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 || ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 ) >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( app-emulation/xen app-emulation/xen-tools ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) zfs? ( sys-fs/zfs )
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) policykit? ( dbus ) qemu? ( libvirtd ) uml? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9c877bedc52d5698e26ea77302479f96
diff --git a/metadata/md5-cache/app-emulation/libvirt-glib-1.0.0 b/metadata/md5-cache/app-emulation/libvirt-glib-1.0.0
index 3cf8095f2df7..4651338a6cf0 100644
--- a/metadata/md5-cache/app-emulation/libvirt-glib-1.0.0
+++ b/metadata/md5-cache/app-emulation/libvirt-glib-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( python_targets_python2_7 ) vala? ( introspection )
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://libvirt.org/libvirt/glib/libvirt-glib-1.0.0.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-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=231d2132ec4b80638010b70fdd03fd7c
diff --git a/metadata/md5-cache/app-emulation/libvirt-glib-1.0.0-r1 b/metadata/md5-cache/app-emulation/libvirt-glib-1.0.0-r1
index 0f7f315a9a0c..0ed8b04ab2cf 100644
--- a/metadata/md5-cache/app-emulation/libvirt-glib-1.0.0-r1
+++ b/metadata/md5-cache/app-emulation/libvirt-glib-1.0.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://libvirt.org/libvirt/glib/libvirt-glib-1.0.0.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2c8d21f97a26e001931f6259dab7e72c
diff --git a/metadata/md5-cache/app-emulation/lxc-2.1.1-r1 b/metadata/md5-cache/app-emulation/lxc-2.1.1-r1
index 783a9b3edfee..389807947b05 100644
--- a/metadata/md5-cache/app-emulation/lxc-2.1.1-r1
+++ b/metadata/md5-cache/app-emulation/lxc-2.1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=net-libs/gnutls sys-libs/libcap cgmanager? ( app-admin/cgmanager ) lua?
 REQUIRED_USE=python? ( || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxc/lxc-2.1.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7e65a7a3777362b9a2dcb7d749295685
diff --git a/metadata/md5-cache/app-emulation/lxc-3.0.1-r1 b/metadata/md5-cache/app-emulation/lxc-3.0.1-r1
deleted file mode 100644
index ed8bfedc57fa..000000000000
--- a/metadata/md5-cache/app-emulation/lxc-3.0.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=net-libs/gnutls sys-libs/libcap pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) >=app-text/docbook-sgml-utils-0.6.14-r2 >=sys-kernel/linux-headers-3.2 >=app-portage/elt-patches-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=LinuX Containers userspace utilities
-EAPI=6
-HOMEPAGE=https://linuxcontainers.org/
-IUSE=examples pam python seccomp selinux +templates kernel_linux
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=LGPL-3
-PDEPEND=templates? ( app-emulation/lxc-templates ) python? ( dev-python/python3-lxc )
-RDEPEND=net-libs/gnutls sys-libs/libcap pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) sys-apps/util-linux app-misc/pax-utils virtual/awk
-SLOT=0
-SRC_URI=https://linuxcontainers.org/downloads/lxc/lxc-3.0.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ae6f2bb5b4186c6db8512123afef67ea
diff --git a/metadata/md5-cache/app-emulation/lxc-3.0.2 b/metadata/md5-cache/app-emulation/lxc-3.0.2
index 2369ea3ee623..8b8773ac11c8 100644
--- a/metadata/md5-cache/app-emulation/lxc-3.0.2
+++ b/metadata/md5-cache/app-emulation/lxc-3.0.2
@@ -5,11 +5,11 @@ DESCRIPTION=LinuX Containers userspace utilities
 EAPI=7
 HOMEPAGE=https://linuxcontainers.org/
 IUSE=apparmor examples pam python seccomp selinux +templates kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=LGPL-3
 PDEPEND=templates? ( app-emulation/lxc-templates ) python? ( dev-python/python3-lxc )
 RDEPEND=net-libs/gnutls sys-libs/libcap pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) sys-apps/util-linux app-misc/pax-utils virtual/awk
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxc/lxc-3.0.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=52e1b76d09fd47d27a6a48e9996c57ca
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=464c6eaa9e847cd91a615293359ba14c
diff --git a/metadata/md5-cache/app-emulation/lxc-templates-3.0.2 b/metadata/md5-cache/app-emulation/lxc-templates-3.0.2
new file mode 100644
index 000000000000..f80e4586f9fa
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/lxc-templates-3.0.2
@@ -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=prepare
+DEPEND=>=app-emulation/lxc-3.0
+DESCRIPTION=Old style template scripts for LXC
+EAPI=7
+HOMEPAGE=https://linuxcontainers.org/
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-3
+RDEPEND=>=app-emulation/lxc-3.0
+SLOT=0
+SRC_URI=https://linuxcontainers.org/downloads/lxc/lxc-templates-3.0.2.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=0af8fc7942c592afc00953fa584d722a
diff --git a/metadata/md5-cache/app-emulation/lxd-3.3 b/metadata/md5-cache/app-emulation/lxd-3.3
index 5cf3d804fdf6..360277dbf3d7 100644
--- a/metadata/md5-cache/app-emulation/lxd-3.3
+++ b/metadata/md5-cache/app-emulation/lxd-3.3
@@ -9,5 +9,5 @@ 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	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_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
index d298a7c4b6f7..2ceeef47283f 100644
--- a/metadata/md5-cache/app-emulation/lxd-3.4
+++ b/metadata/md5-cache/app-emulation/lxd-3.4
@@ -9,5 +9,5 @@ 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	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_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
index a18fd8ef6a16..e9181d383197 100644
--- a/metadata/md5-cache/app-emulation/lxd-3.4-r1
+++ b/metadata/md5-cache/app-emulation/lxd-3.4-r1
@@ -9,5 +9,5 @@ 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	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_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 8391f5ef99d7..beca9fab661d 100644
--- a/metadata/md5-cache/app-emulation/lxd-3.5
+++ b/metadata/md5-cache/app-emulation/lxd-3.5
@@ -9,5 +9,5 @@ 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	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_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
diff --git a/metadata/md5-cache/app-emulation/nemu-1.1.0 b/metadata/md5-cache/app-emulation/nemu-1.1.0
index 2ee73fec7932..4daee3ed5506 100644
--- a/metadata/md5-cache/app-emulation/nemu-1.1.0
+++ b/metadata/md5-cache/app-emulation/nemu-1.1.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=virtual/udev virtual/libusb:1= dev-db/sqlite:3= sys-libs/ncurses:0=[unicode] app-emulation/qemu[vnc] vnc? ( net-misc/tigervnc )
 SLOT=0
 SRC_URI=http://unixdev.ru/src/nemu-1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2e788ea15f0bf276b2907f1d00f00598
diff --git a/metadata/md5-cache/app-emulation/nemu-1.2.0 b/metadata/md5-cache/app-emulation/nemu-1.2.0
index 3b1a9d49c110..17825575bb2e 100644
--- a/metadata/md5-cache/app-emulation/nemu-1.2.0
+++ b/metadata/md5-cache/app-emulation/nemu-1.2.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=virtual/udev virtual/libusb:1= dev-db/sqlite:3= sys-libs/ncurses:0=[unicode] app-emulation/qemu[vnc] vnc? ( net-misc/tigervnc )
 SLOT=0
 SRC_URI=http://unixdev.ru/src/nemu-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2e788ea15f0bf276b2907f1d00f00598
diff --git a/metadata/md5-cache/app-emulation/nemu-1.3.0 b/metadata/md5-cache/app-emulation/nemu-1.3.0
index f25ba165ad9c..a2a20e7a906a 100644
--- a/metadata/md5-cache/app-emulation/nemu-1.3.0
+++ b/metadata/md5-cache/app-emulation/nemu-1.3.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=virtual/udev virtual/libusb:1= dev-db/sqlite:3= sys-libs/ncurses:0=[unicode] app-emulation/qemu[vnc] vnc? ( net-misc/tigervnc )
 SLOT=0
 SRC_URI=http://unixdev.ru/src/nemu-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2e788ea15f0bf276b2907f1d00f00598
diff --git a/metadata/md5-cache/app-emulation/nemu-1.4.0 b/metadata/md5-cache/app-emulation/nemu-1.4.0
index b3e5bf051036..fb56571b37f2 100644
--- a/metadata/md5-cache/app-emulation/nemu-1.4.0
+++ b/metadata/md5-cache/app-emulation/nemu-1.4.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=virtual/udev:= dev-db/sqlite:3= virtual/libusb:1 app-emulation/qemu[vnc,virtfs] sys-libs/ncurses:0=[unicode] ovf? ( dev-libs/libxml2 app-arch/libarchive ) vnc-client? ( net-misc/tigervnc )
 SLOT=0
 SRC_URI=http://lib.void.so/src/nemu-1.4.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d5fe4e765614e606118ce1e6b4a6c667
diff --git a/metadata/md5-cache/app-emulation/nemu-1.4.1 b/metadata/md5-cache/app-emulation/nemu-1.4.1
index 69ba03048753..c901e71f3db5 100644
--- a/metadata/md5-cache/app-emulation/nemu-1.4.1
+++ b/metadata/md5-cache/app-emulation/nemu-1.4.1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=virtual/udev:= dev-db/sqlite:3= virtual/libusb:1 app-emulation/qemu[vnc,virtfs] sys-libs/ncurses:0=[unicode] ovf? ( dev-libs/libxml2 app-arch/libarchive ) vnc-client? ( net-misc/tigervnc )
 SLOT=0
 SRC_URI=http://lib.void.so/src/nemu-1.4.1.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8423b5719b919d52c9dc73614a095667
diff --git a/metadata/md5-cache/app-emulation/nemu-2.0.0 b/metadata/md5-cache/app-emulation/nemu-2.0.0
index 93c6ce59ca20..8d9a52cb8a97 100644
--- a/metadata/md5-cache/app-emulation/nemu-2.0.0
+++ b/metadata/md5-cache/app-emulation/nemu-2.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=virtual/udev:= dev-db/sqlite:3= virtual/libusb:1 app-emulation/qemu[vnc,virtfs] sys-libs/ncurses:0=[unicode] ovf? ( dev-libs/libxml2 app-arch/libarchive ) vnc-client? ( net-misc/tigervnc )
 SLOT=0
 SRC_URI=http://lib.void.so/src/nemu-2.0.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8423b5719b919d52c9dc73614a095667
diff --git a/metadata/md5-cache/app-emulation/nemu-2.1.0 b/metadata/md5-cache/app-emulation/nemu-2.1.0
new file mode 100644
index 000000000000..7fdc27933a17
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/nemu-2.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=virtual/udev:= dev-db/sqlite:3= virtual/libusb:1 app-emulation/qemu[vnc,virtfs] sys-libs/ncurses:0=[unicode] ovf? ( dev-libs/libxml2 app-arch/libarchive ) vnc-client? ( net-misc/tigervnc ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=ncurses interface for QEMU
+EAPI=6
+HOMEPAGE=https://lib.void.so/nemu
+IUSE=+vnc-client +ovf savevm debug kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=virtual/udev:= dev-db/sqlite:3= virtual/libusb:1 app-emulation/qemu[vnc,virtfs] sys-libs/ncurses:0=[unicode] ovf? ( dev-libs/libxml2 app-arch/libarchive ) vnc-client? ( net-misc/tigervnc )
+SLOT=0
+SRC_URI=http://lib.void.so/src/nemu-2.1.0.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=8423b5719b919d52c9dc73614a095667
diff --git a/metadata/md5-cache/app-emulation/nemu-9999 b/metadata/md5-cache/app-emulation/nemu-9999
index 78fb2bfc0ff8..326e34361ef9 100644
--- a/metadata/md5-cache/app-emulation/nemu-9999
+++ b/metadata/md5-cache/app-emulation/nemu-9999
@@ -7,5 +7,5 @@ IUSE=+vnc-client +ovf savevm debug kernel_linux
 LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:0=[unicode] dev-db/sqlite:3= virtual/libusb:1 || ( sys-fs/eudev sys-fs/udev ) app-emulation/qemu[vnc,virtfs] ovf? ( dev-libs/libxml2 app-arch/libarchive ) vnc-client? ( net-misc/tigervnc )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b5a41e2df84db2777c88f2118fc1ab84
diff --git a/metadata/md5-cache/app-emulation/open-vm-tools-10.1.10 b/metadata/md5-cache/app-emulation/open-vm-tools-10.1.10
index edb68e0c1a6e..1a9fd2368a23 100644
--- a/metadata/md5-cache/app-emulation/open-vm-tools-10.1.10
+++ b/metadata/md5-cache/app-emulation/open-vm-tools-10.1.10
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-libs/glib:2 dev-libs/libdnet sys-fs/fuse:0 >=sys-process/procps-3.3.2 grabbitmqproxy? ( dev-libs/openssl:0 ) icu? ( dev-libs/icu:= ) pam? ( virtual/pam ) vgauth? ( dev-libs/openssl:0 dev-libs/xerces-c dev-libs/xml-security-c ) X? ( dev-cpp/gtkmm:3.0 x11-libs/gtk+:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXrandr x11-libs/libXtst xinerama? ( x11-libs/libXinerama ) ) modules? ( kernel_linux? ( virtual/modutils ) )
 SLOT=0
 SRC_URI=https://github.com/vmware/open-vm-tools/releases/download/stable-10.1.10/open-vm-tools-10.1.10-6082533.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ce7b2b22db8519034fbd60c4b4c2e847
diff --git a/metadata/md5-cache/app-emulation/open-vm-tools-10.1.15 b/metadata/md5-cache/app-emulation/open-vm-tools-10.1.15
index e4c36a00e53e..42c76590e225 100644
--- a/metadata/md5-cache/app-emulation/open-vm-tools-10.1.15
+++ b/metadata/md5-cache/app-emulation/open-vm-tools-10.1.15
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-libs/glib:2 dev-libs/libdnet net-libs/libtirpc:0= sys-fs/fuse:0 >=sys-process/procps-3.3.2 grabbitmqproxy? ( dev-libs/openssl:0 ) icu? ( dev-libs/icu:= ) pam? ( virtual/pam ) vgauth? ( dev-libs/openssl:0 dev-libs/xerces-c dev-libs/xml-security-c ) X? ( dev-cpp/gtkmm:3.0 x11-libs/gtk+:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXrandr x11-libs/libXtst xinerama? ( x11-libs/libXinerama ) ) modules? ( kernel_linux? ( virtual/modutils ) )
 SLOT=0
 SRC_URI=https://github.com/vmware/open-vm-tools/releases/download/stable-10.1.15/open-vm-tools-10.1.15-6677369.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7941941ae48ae7a3d6c074252dedc69d
diff --git a/metadata/md5-cache/app-emulation/open-vm-tools-10.2.5 b/metadata/md5-cache/app-emulation/open-vm-tools-10.2.5
index d415fb39f0b7..97837efa76c6 100644
--- a/metadata/md5-cache/app-emulation/open-vm-tools-10.2.5
+++ b/metadata/md5-cache/app-emulation/open-vm-tools-10.2.5
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib net-libs/libtirpc deploypkg? ( dev-libs/libmspack ) fuse?
 REQUIRED_USE=multimon? ( X ) vgauth? ( ^^ ( xmlsec xml-security-c ) ssl ) caf? ( vgauth ssl ) grabbitmqproxy? ( ssl )
 SLOT=0
 SRC_URI=https://github.com/vmware/open-vm-tools/releases/download/stable-10.2.5/open-vm-tools-10.2.5-8068406.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=19396974b0547ee0a4b23544bf950445
diff --git a/metadata/md5-cache/app-emulation/openstack-guest-agents-unix-1.39.1_p20170227 b/metadata/md5-cache/app-emulation/openstack-guest-agents-unix-1.39.1_p20170227
index b893837b0a90..1deb344ee451 100644
--- a/metadata/md5-cache/app-emulation/openstack-guest-agents-unix-1.39.1_p20170227
+++ b/metadata/md5-cache/app-emulation/openstack-guest-agents-unix-1.39.1_p20170227
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=https://github.com/rackerlabs/openstack-guest-agents-unix/archive/c9a4f15b8c8f2349601d3073cc95e30d3b91af13.zip -> openstack-guest-agents-unix-1.39.1_p20170227.zip
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=95b11fe675182ad612741b361700f5c9
diff --git a/metadata/md5-cache/app-emulation/playonlinux-4.2.12 b/metadata/md5-cache/app-emulation/playonlinux-4.2.12
index 61a36c4706c6..2c851f31592e 100644
--- a/metadata/md5-cache/app-emulation/playonlinux-4.2.12
+++ b/metadata/md5-cache/app-emulation/playonlinux-4.2.12
@@ -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=http://www.playonlinux.com/script_files/PlayOnLinux/4.2.12/PlayOnLinux_4.2.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=51e1c41f2f33877085af95c01d3b112c
diff --git a/metadata/md5-cache/app-emulation/punes-0.102 b/metadata/md5-cache/app-emulation/punes-0.102
index 55a0b76c77f0..356c6ab3d3da 100644
--- a/metadata/md5-cache/app-emulation/punes-0.102
+++ b/metadata/md5-cache/app-emulation/punes-0.102
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 cg? ( media-gfx/nvidia-cg-toolkit ) media-libs/alsa-lib media-libs/libsdl[opengl] virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/punesemu/puNES/archive/v0.102.tar.gz -> punes-0.102.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c388a6be3c9d2153f7eef6e10ba1db1f
diff --git a/metadata/md5-cache/app-emulation/q4wine-1.3.6-r1 b/metadata/md5-cache/app-emulation/q4wine-1.3.6-r1
index 89fe365a4cc5..d83268ccbff3 100644
--- a/metadata/md5-cache/app-emulation/q4wine-1.3.6-r1
+++ b/metadata/md5-cache/app-emulation/q4wine-1.3.6-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 dev-qt/qtxml:5 dbus? ( dev-qt/qtdbus:5 ) ico? ( >=media-gfx/icoutils-0.26.0 ) app-admin/sudo >=sys-apps/which-2.19 iso? ( sys-fs/fuseiso )
 SLOT=0
 SRC_URI=mirror://sourceforge/q4wine/q4wine-1.3.6.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=592ee117dd94c867c7992decd1eb7d5a
diff --git a/metadata/md5-cache/app-emulation/qemu-2.12.0-r3 b/metadata/md5-cache/app-emulation/qemu-2.12.0-r3
index 53514e2ab573..f5b72d8aa9cf 100644
--- a/metadata/md5-cache/app-emulation/qemu-2.12.0-r3
+++ b/metadata/md5-cache/app-emulation/qemu-2.12.0-r3
@@ -10,5 +10,5 @@ RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) gtk2? ( gtk ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) sdl2? ( sdl ) static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio !snappy ) virtfs? ( xattr ) vte? ( gtk )
 SLOT=0
 SRC_URI=http://wiki.qemu-project.org/download/qemu-2.12.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/qemu-2.12.0-patches-r5.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	55aaa148741116aa54ad0d80e361818e	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	55aaa148741116aa54ad0d80e361818e	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=6ef7bfa2d39a46a52ace8d66a1693e06
diff --git a/metadata/md5-cache/app-emulation/qemu-2.12.1 b/metadata/md5-cache/app-emulation/qemu-2.12.1
index 0423f138a558..3376cc624daa 100644
--- a/metadata/md5-cache/app-emulation/qemu-2.12.1
+++ b/metadata/md5-cache/app-emulation/qemu-2.12.1
@@ -10,5 +10,5 @@ RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) gtk2? ( gtk ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) sdl2? ( sdl ) static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio !snappy ) virtfs? ( xattr ) vte? ( gtk )
 SLOT=0
 SRC_URI=http://wiki.qemu-project.org/download/qemu-2.12.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/qemu-2.12.1-patches-r1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	55aaa148741116aa54ad0d80e361818e	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	55aaa148741116aa54ad0d80e361818e	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=2df3d03820ae506583448a031b3a13c5
diff --git a/metadata/md5-cache/app-emulation/qemu-3.0.0 b/metadata/md5-cache/app-emulation/qemu-3.0.0
index 93fbce026f64..01506ffd3375 100644
--- a/metadata/md5-cache/app-emulation/qemu-3.0.0
+++ b/metadata/md5-cache/app-emulation/qemu-3.0.0
@@ -10,5 +10,5 @@ RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) gtk2? ( gtk ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) sdl2? ( sdl ) static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio !snappy ) virtfs? ( xattr ) vte? ( gtk )
 SLOT=0
 SRC_URI=http://wiki.qemu-project.org/download/qemu-3.0.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	55aaa148741116aa54ad0d80e361818e	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	55aaa148741116aa54ad0d80e361818e	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=ccd4580659353211cd393bd2c90cd416
diff --git a/metadata/md5-cache/app-emulation/qemu-9999 b/metadata/md5-cache/app-emulation/qemu-9999
index c531804fd910..4646bf8b6f5b 100644
--- a/metadata/md5-cache/app-emulation/qemu-9999
+++ b/metadata/md5-cache/app-emulation/qemu-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2 BSD-2
 RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 x11-libs/libxkbcommon >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.2 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_p20180211[binary] ~sys-firmware/ipxe-1.0.0_p20180211[binary] ~sys-firmware/seabios-1.11.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_p20180211[binary] ~sys-firmware/ipxe-1.0.0_p20180211[binary] ~sys-firmware/seabios-1.11.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.11.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) selinux? ( sec-policy/selinux-qemu )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) gtk2? ( gtk ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) sdl2? ( sdl ) static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio !snappy ) virtfs? ( xattr ) vte? ( gtk )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=1169668928436c695e143e327ec713e1
diff --git a/metadata/md5-cache/app-emulation/qemu-guest-agent-2.12.0-r1 b/metadata/md5-cache/app-emulation/qemu-guest-agent-2.12.0-r1
index 80391b013638..1013202ad6cf 100644
--- a/metadata/md5-cache/app-emulation/qemu-guest-agent-2.12.0-r1
+++ b/metadata/md5-cache/app-emulation/qemu-guest-agent-2.12.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/pytho
 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
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~x86-fbsd
 LICENSE=GPL-2 BSD-2
 RDEPEND=dev-libs/glib
 SLOT=0
 SRC_URI=http://wiki.qemu.org/download/qemu-2.12.0.tar.bz2
 _eclasses_=desktop	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_=0f35aa135db7a86acd4ed312093c77c1
+_md5_=d19caa24c871664841bb8eac82e0bc98
diff --git a/metadata/md5-cache/app-emulation/qt-virt-manager-9999 b/metadata/md5-cache/app-emulation/qt-virt-manager-9999
index 786b0031e9b8..889236d5f0e0 100644
--- a/metadata/md5-cache/app-emulation/qt-virt-manager-9999
+++ b/metadata/md5-cache/app-emulation/qt-virt-manager-9999
@@ -7,5 +7,5 @@ IUSE=smartcard
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtnetwork:5 >=x11-libs/qtermwidget-0.7.0 smartcard? ( >=app-emulation/libcacard-2.5.0 ) dev-libs/glib net-misc/spice-gtk net-libs/libvncserver app-emulation/libvirt
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a801eb74f3afb07cfe15862cbf440785
diff --git a/metadata/md5-cache/app-emulation/sen-0.5.1 b/metadata/md5-cache/app-emulation/sen-0.5.1
index e58ccdb2f8b3..c4301b4ce498 100644
--- a/metadata/md5-cache/app-emulation/sen-0.5.1
+++ b/metadata/md5-cache/app-emulation/sen-0.5.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/urwid[python_targets_python3_4(-)?,python_targets_python3_5(-
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sen/sen-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f777ac8899306be751529cb2983c9aad
diff --git a/metadata/md5-cache/app-emulation/sen-0.6.0 b/metadata/md5-cache/app-emulation/sen-0.6.0
index 493ecda88670..a9b2646bb005 100644
--- a/metadata/md5-cache/app-emulation/sen-0.6.0
+++ b/metadata/md5-cache/app-emulation/sen-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/urwid[python_targets_python3_4(-)?,python_targets_python3_5(-
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sen/sen-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ccc9d1fc3f2cbaa09e30aacd8f6719a1
diff --git a/metadata/md5-cache/app-emulation/spice-0.14.0-r2 b/metadata/md5-cache/app-emulation/spice-0.14.0-r2
index b510cee3b550..b0672cfe2ad0 100644
--- a/metadata/md5-cache/app-emulation/spice-0.14.0-r2
+++ b/metadata/md5-cache/app-emulation/spice-0.14.0-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-lang/orc[static-libs(+)?] >=dev-libs/glib-2.22:2[static-libs(+)?] media-libs/opus[static-libs(+)?] sys-libs/zlib[static-libs(+)?] virtual/jpeg:0=[static-libs(+)?] >=x11-libs/pixman-0.17.7[static-libs(+)?] !libressl? ( dev-libs/openssl:0=[static-libs(+)?] ) libressl? ( dev-libs/libressl:0=[static-libs(+)?] ) lz4? ( app-arch/lz4:0=[static-libs(+)?] ) smartcard? ( >=app-emulation/libcacard-0.1.2 ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 )
 SLOT=0
 SRC_URI=https://www.spice-space.org/download/releases/spice-0.14.0.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=533e3cc60dffdeed2870b982590097b7
diff --git a/metadata/md5-cache/app-emulation/spice-9999 b/metadata/md5-cache/app-emulation/spice-9999
index c2c6d4729af3..7bcc34ef6c95 100644
--- a/metadata/md5-cache/app-emulation/spice-9999
+++ b/metadata/md5-cache/app-emulation/spice-9999
@@ -7,5 +7,5 @@ IUSE=libressl lz4 sasl smartcard static-libs gstreamer
 LICENSE=LGPL-2.1
 RDEPEND=dev-lang/orc[static-libs(+)?] >=dev-libs/glib-2.22:2[static-libs(+)?] media-libs/opus[static-libs(+)?] sys-libs/zlib[static-libs(+)?] virtual/jpeg:0=[static-libs(+)?] >=x11-libs/pixman-0.17.7[static-libs(+)?] !libressl? ( dev-libs/openssl:0=[static-libs(+)?] ) libressl? ( dev-libs/libressl:0=[static-libs(+)?] ) lz4? ( app-arch/lz4:0=[static-libs(+)?] ) smartcard? ( >=app-emulation/libcacard-0.1.2 ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 )
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=159c1cb0a096de84fda9ba7ec86e183b
diff --git a/metadata/md5-cache/app-emulation/spice-vdagent-0.17.0_p20180319-r1 b/metadata/md5-cache/app-emulation/spice-vdagent-0.17.0_p20180319-r1
index 9fb58b2f170e..68a5e2a89534 100644
--- a/metadata/md5-cache/app-emulation/spice-vdagent-0.17.0_p20180319-r1
+++ b/metadata/md5-cache/app-emulation/spice-vdagent-0.17.0_p20180319-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=app-emulation/spice-protocol-0.12.8 media-libs/alsa-lib >=x11-libs/libpciaccess-0.10 x11-libs/libXfixes x11-libs/libXrandr x11-libs/libX11 x11-libs/libXinerama consolekit? ( sys-auth/consolekit sys-apps/dbus ) systemd? ( sys-apps/systemd ) selinux? ( sec-policy/selinux-vdagent )
 SLOT=0
 SRC_URI=https://www.spice-space.org/download/releases/spice-vdagent-0.17.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/spice-vdagent-0.17.0-patches-20180319.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=77a9149c6ea46c8bd266596df85ac75a
diff --git a/metadata/md5-cache/app-emulation/virt-manager-1.4.3-r1 b/metadata/md5-cache/app-emulation/virt-manager-1.4.3-r1
index 864f02141940..338fb199e954 100644
--- a/metadata/md5-cache/app-emulation/virt-manager-1.4.3-r1
+++ b/metadata/md5-cache/app-emulation/virt-manager-1.4.3-r1
@@ -10,5 +10,5 @@ RDEPEND=!app-emulation/virtinst dev-python/libvirt-python[python_targets_python2
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://virt-manager.org/download/sources/virt-manager/virt-manager-1.4.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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_=3b5f8ab9616ae18e9eda7d96c2f27cfa
diff --git a/metadata/md5-cache/app-emulation/virt-manager-1.5.1-r1 b/metadata/md5-cache/app-emulation/virt-manager-1.5.1-r1
index 65ee9702479c..140e4a3ddcf5 100644
--- a/metadata/md5-cache/app-emulation/virt-manager-1.5.1-r1
+++ b/metadata/md5-cache/app-emulation/virt-manager-1.5.1-r1
@@ -10,5 +10,5 @@ RDEPEND=!app-emulation/virtinst python_targets_python2_7? ( >=dev-lang/python-2.
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://virt-manager.org/download/sources/virt-manager/virt-manager-1.5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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_=c636c7f99ffa0a8473d8592c2adde4f5
diff --git a/metadata/md5-cache/app-emulation/virt-manager-9999 b/metadata/md5-cache/app-emulation/virt-manager-9999
index 0846a7a5c582..611ec9ff9eda 100644
--- a/metadata/md5-cache/app-emulation/virt-manager-9999
+++ b/metadata/md5-cache/app-emulation/virt-manager-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!app-emulation/virtinst 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-cdr/cdrtools >=app-emulation/libvirt-glib-1.0.0[introspection] dev-libs/libxml2[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/ipaddr[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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/libvirt-python[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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-libs/libosinfo-0.2.10[introspection] gtk? ( gnome-base/dconf >=net-libs/gtk-vnc-0.3.8[gtk3(+),introspection] net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?] net-misc/x11-ssh-askpass x11-libs/gtk+:3[introspection] x11-libs/vte:2.91[introspection] gnome-keyring? ( gnome-base/libgnome-keyring ) policykit? ( sys-auth/polkit[introspection] ) ) 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_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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/app-emulation/virt-viewer-6.0-r1 b/metadata/md5-cache/app-emulation/virt-viewer-6.0-r1
index 7bb4461c1bda..ba666b6b825b 100644
--- a/metadata/md5-cache/app-emulation/virt-viewer-6.0-r1
+++ b/metadata/md5-cache/app-emulation/virt-viewer-6.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=app-emulation/libvirt-0.10.0[sasl?] app-emulation/libvirt-glib >=dev-l
 REQUIRED_USE=|| ( spice vnc )
 SLOT=0
 SRC_URI=http://virt-manager.org/download/sources/virt-viewer/virt-viewer-6.0.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=6f66fef738d2c88c028ed3c2fc49a963
diff --git a/metadata/md5-cache/app-emulation/virt-viewer-7.0 b/metadata/md5-cache/app-emulation/virt-viewer-7.0
index 2bc683c6a21c..ad1143cf6652 100644
--- a/metadata/md5-cache/app-emulation/virt-viewer-7.0
+++ b/metadata/md5-cache/app-emulation/virt-viewer-7.0
@@ -10,5 +10,5 @@ RDEPEND=>=app-emulation/libvirt-0.10.0[sasl?] app-emulation/libvirt-glib >=dev-l
 REQUIRED_USE=|| ( spice vnc )
 SLOT=0
 SRC_URI=http://virt-manager.org/download/sources/virt-viewer/virt-viewer-7.0.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=2f31fb3f4b9ae209711045d021d36014
diff --git a/metadata/md5-cache/app-emulation/virtualbox-5.1.36 b/metadata/md5-cache/app-emulation/virtualbox-5.1.36
index 58594767d0c9..da02775e2ac2 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-5.1.36
+++ b/metadata/md5-cache/app-emulation/virtualbox-5.1.36
@@ -10,5 +10,5 @@ RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.1.36 d
 REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) python_targets_python2_7
 SLOT=0
 SRC_URI=https://download.virtualbox.org/virtualbox/5.1.36/VirtualBox-5.1.36.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.1.32-patches-01.tar.xz
-_eclasses_=desktop	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	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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
index a714d6bcbab6..05a4d476809a 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-5.1.38
+++ b/metadata/md5-cache/app-emulation/virtualbox-5.1.38
@@ -10,5 +10,5 @@ RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.1.38 d
 REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) python_targets_python2_7
 SLOT=0
 SRC_URI=https://download.virtualbox.org/virtualbox/5.1.38/VirtualBox-5.1.38.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.1.32-patches-01.tar.xz
-_eclasses_=desktop	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	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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.14-r1 b/metadata/md5-cache/app-emulation/virtualbox-5.2.14-r1
index c219ceaaeca7..7cf539acfb91 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-5.2.14-r1
+++ b/metadata/md5-cache/app-emulation/virtualbox-5.2.14-r1
@@ -10,5 +10,5 @@ RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.2.14 d
 REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) python_targets_python2_7
 SLOT=0
 SRC_URI=https://download.virtualbox.org/virtualbox/5.2.14/VirtualBox-5.2.14.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.2.12-patches-01.tar.xz
-_eclasses_=desktop	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	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=db02e69860e34af9adf55edf95f72413
diff --git a/metadata/md5-cache/app-emulation/virtualbox-5.2.16 b/metadata/md5-cache/app-emulation/virtualbox-5.2.16
index ef11bf725f3c..c4c21ba2815e 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-5.2.16
+++ b/metadata/md5-cache/app-emulation/virtualbox-5.2.16
@@ -10,5 +10,5 @@ RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.2.16 d
 REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) python_targets_python2_7
 SLOT=0
 SRC_URI=https://download.virtualbox.org/virtualbox/5.2.16/VirtualBox-5.2.16.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.2.16-patches-02.tar.xz
-_eclasses_=desktop	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	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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.18 b/metadata/md5-cache/app-emulation/virtualbox-5.2.18
index 40e306d3a282..f7467ea21214 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-5.2.18
+++ b/metadata/md5-cache/app-emulation/virtualbox-5.2.18
@@ -10,5 +10,5 @@ RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.2.18 d
 REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) python_targets_python2_7
 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-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	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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-bin-5.1.36.122089 b/metadata/md5-cache/app-emulation/virtualbox-bin-5.1.36.122089
index 30400eed16e6..a530a5343588 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-5.1.36.122089
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-5.1.36.122089
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=amd64? ( https://download.virtualbox.org/virtualbox/5.1.36/VirtualBox-5.1.36-122089-Linux_amd64.run ) x86? ( https://download.virtualbox.org/virtualbox/5.1.36/VirtualBox-5.1.36-122089-Linux_x86.run ) https://download.virtualbox.org/virtualbox/5.1.36/Oracle_VM_VirtualBox_Extension_Pack-5.1.36-122089.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.1.36-122089.tar.gz sdk? ( https://download.virtualbox.org/virtualbox/5.1.36/VirtualBoxSDK-5.1.36-122089.zip )
-_eclasses_=desktop	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	89bb9f083a2590d9b447fd0b78a96186
+_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
index 3b608f807191..1a9ebda9d1ea 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-5.1.38.122592
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-5.1.38.122592
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=amd64? ( https://download.virtualbox.org/virtualbox/5.1.38/VirtualBox-5.1.38-122592-Linux_amd64.run ) x86? ( https://download.virtualbox.org/virtualbox/5.1.38/VirtualBox-5.1.38-122592-Linux_x86.run ) https://download.virtualbox.org/virtualbox/5.1.38/Oracle_VM_VirtualBox_Extension_Pack-5.1.38-122592.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.1.38-122592.tar.gz sdk? ( https://download.virtualbox.org/virtualbox/5.1.38/VirtualBoxSDK-5.1.38-122592.zip )
-_eclasses_=desktop	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	89bb9f083a2590d9b447fd0b78a96186
+_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.14.123301 b/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.14.123301
index 19b539a9531e..c6ac8e9103f2 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.14.123301
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.14.123301
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=amd64? ( https://download.virtualbox.org/virtualbox/5.2.14/VirtualBox-5.2.14-123301-Linux_amd64.run ) x86? ( https://download.virtualbox.org/virtualbox/5.2.14/VirtualBox-5.2.14-123301-Linux_x86.run ) https://download.virtualbox.org/virtualbox/5.2.14/Oracle_VM_VirtualBox_Extension_Pack-5.2.14-123301.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.2.14-123301.tar.gz sdk? ( https://download.virtualbox.org/virtualbox/5.2.14/VirtualBoxSDK-5.2.14-123301.zip )
-_eclasses_=desktop	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=eb778bac753476545c9050c0db9d8257
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.16.123759 b/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.16.123759
index 0d76a0909438..a5f7af7df81b 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.16.123759
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.16.123759
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=amd64? ( https://download.virtualbox.org/virtualbox/5.2.16/VirtualBox-5.2.16-123759-Linux_amd64.run ) x86? ( https://download.virtualbox.org/virtualbox/5.2.16/VirtualBox-5.2.16-123759-Linux_x86.run ) https://download.virtualbox.org/virtualbox/5.2.16/Oracle_VM_VirtualBox_Extension_Pack-5.2.16-123759.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.2.16-123759.tar.gz sdk? ( https://download.virtualbox.org/virtualbox/5.2.16/VirtualBoxSDK-5.2.16-123759.zip )
-_eclasses_=desktop	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	89bb9f083a2590d9b447fd0b78a96186
+_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.18.124319 b/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.18.124319
index 0d2760f5fbf4..2b4a75d70514 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.18.124319
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.18.124319
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=amd64? ( https://download.virtualbox.org/virtualbox/5.2.18/VirtualBox-5.2.18-124319-Linux_amd64.run ) x86? ( https://download.virtualbox.org/virtualbox/5.2.18/VirtualBox-5.2.18-124319-Linux_x86.run ) https://download.virtualbox.org/virtualbox/5.2.18/Oracle_VM_VirtualBox_Extension_Pack-5.2.18-124319.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.2.18-124319.tar.gz sdk? ( https://download.virtualbox.org/virtualbox/5.2.18/VirtualBoxSDK-5.2.18-124319.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	89bb9f083a2590d9b447fd0b78a96186
+_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-guest-additions-5.1.36 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.36
index e2198bf1db83..84a97038e281 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.36
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.36
@@ -10,5 +10,5 @@ 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	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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
index bc8f1fba10bd..b0816bb7ff9f 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.38
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.38
@@ -10,5 +10,5 @@ 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	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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 19afbe1849cd..afc11a2979eb 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
@@ -10,5 +10,5 @@ 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.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	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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
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
index ace9f44f22d7..cfad35149a83 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.16
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.16
@@ -10,5 +10,5 @@ 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	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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 dc495b9f5551..5417922ada7d 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
@@ -10,5 +10,5 @@ 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.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	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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-modules-5.1.36 b/metadata/md5-cache/app-emulation/virtualbox-modules-5.1.36
index 5d436b7b95da..abb45e33829f 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-5.1.36
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-5.1.36
@@ -9,5 +9,5 @@ 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	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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
index cbe625a34c56..b092055fc4b2 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-5.1.38
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-5.1.38
@@ -9,5 +9,5 @@ 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	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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.14 b/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.14
index 07994b0a7495..1767bfc2dc64 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.14
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.14
@@ -9,5 +9,5 @@ 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.14.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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_=ed559a820bd64ae11a379dd6baa86028
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.16 b/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.16
index 687e98e2542a..763068c91a40 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.16
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.16
@@ -9,5 +9,5 @@ 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	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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.18 b/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.18
index 0f69dad7c8aa..5f679b4b5fa1 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.18
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.18
@@ -9,5 +9,5 @@ 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.18.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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/wine-any-3.13-r1 b/metadata/md5-cache/app-emulation/wine-any-3.13-r1
deleted file mode 100644
index bf06e08687f1..000000000000
--- a/metadata/md5-cache/app-emulation/wine-any-3.13-r1
+++ /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.13
-SRC_URI=https://dl.winehq.org/wine/source/3.x/wine-3.13.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz staging? ( https://github.com/wine-staging/wine-staging/archive/v3.13.tar.gz -> wine-staging-3.13.tar.gz ) d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-3.13.tar.gz )
-_eclasses_=autotools	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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=5f465ddd16dba9306b4d6af72d03a751
diff --git a/metadata/md5-cache/app-emulation/wine-any-3.14 b/metadata/md5-cache/app-emulation/wine-any-3.14
index c1740dc0de32..bd44df4ea636 100644
--- a/metadata/md5-cache/app-emulation/wine-any-3.14
+++ b/metadata/md5-cache/app-emulation/wine-any-3.14
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 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	89bb9f083a2590d9b447fd0b78a96186
+_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.15 b/metadata/md5-cache/app-emulation/wine-any-3.15
index 260fadf44d10..14467aabfa31 100644
--- a/metadata/md5-cache/app-emulation/wine-any-3.15
+++ b/metadata/md5-cache/app-emulation/wine-any-3.15
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=3.15
 SRC_URI=https://dl.winehq.org/wine/source/3.x/wine-3.15.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.15.tar.gz -> wine-staging-3.15.tar.gz ) d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-3.15.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	89bb9f083a2590d9b447fd0b78a96186
+_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.16 b/metadata/md5-cache/app-emulation/wine-any-3.16
index fe93cf279d7b..6029be5b4fbf 100644
--- a/metadata/md5-cache/app-emulation/wine-any-3.16
+++ b/metadata/md5-cache/app-emulation/wine-any-3.16
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=3.16
 SRC_URI=https://dl.winehq.org/wine/source/3.x/wine-3.16.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.16.tar.gz -> wine-staging-3.16.tar.gz ) d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-3.16.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	89bb9f083a2590d9b447fd0b78a96186
+_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.17 b/metadata/md5-cache/app-emulation/wine-any-3.17
new file mode 100644
index 000000000000..50940b184a08
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-any-3.17
@@ -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.17
+SRC_URI=https://dl.winehq.org/wine/source/3.x/wine-3.17.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.17.tar.gz -> wine-staging-3.17.tar.gz ) d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-3.17.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-any-9999 b/metadata/md5-cache/app-emulation/wine-any-9999
index 54eb8c79fc1d..5eec1eb56340 100644
--- a/metadata/md5-cache/app-emulation/wine-any-9999
+++ b/metadata/md5-cache/app-emulation/wine-any-9999
@@ -10,5 +10,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=9999
 SRC_URI=https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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-d3d9-3.13-r1 b/metadata/md5-cache/app-emulation/wine-d3d9-3.13-r1
deleted file mode 100644
index 3086fd8ac726..000000000000
--- a/metadata/md5-cache/app-emulation/wine-d3d9-3.13-r1
+++ /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.13
-SRC_URI=https://dl.winehq.org/wine/source/3.x/wine-3.13.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-3.13.tar.gz )
-_eclasses_=autotools	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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=db32ff685a7acc2ecb3afee0fe8db1e2
diff --git a/metadata/md5-cache/app-emulation/wine-d3d9-3.14 b/metadata/md5-cache/app-emulation/wine-d3d9-3.14
index 64ef4674653e..fd6b4a57bc85 100644
--- a/metadata/md5-cache/app-emulation/wine-d3d9-3.14
+++ b/metadata/md5-cache/app-emulation/wine-d3d9-3.14
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 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	89bb9f083a2590d9b447fd0b78a96186
+_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.15 b/metadata/md5-cache/app-emulation/wine-d3d9-3.15
index ed6a6226959c..cb2f358a79bf 100644
--- a/metadata/md5-cache/app-emulation/wine-d3d9-3.15
+++ b/metadata/md5-cache/app-emulation/wine-d3d9-3.15
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=3.15
 SRC_URI=https://dl.winehq.org/wine/source/3.x/wine-3.15.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.15.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	89bb9f083a2590d9b447fd0b78a96186
+_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.16 b/metadata/md5-cache/app-emulation/wine-d3d9-3.16
index 446aaddbc361..565d8ef23170 100644
--- a/metadata/md5-cache/app-emulation/wine-d3d9-3.16
+++ b/metadata/md5-cache/app-emulation/wine-d3d9-3.16
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=3.16
 SRC_URI=https://dl.winehq.org/wine/source/3.x/wine-3.16.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.16.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	89bb9f083a2590d9b447fd0b78a96186
+_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.17 b/metadata/md5-cache/app-emulation/wine-d3d9-3.17
new file mode 100644
index 000000000000..f1571c9e4142
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-d3d9-3.17
@@ -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.17
+SRC_URI=https://dl.winehq.org/wine/source/3.x/wine-3.17.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.17.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-d3d9-9999 b/metadata/md5-cache/app-emulation/wine-d3d9-9999
index 5cea95f6e02f..2255bc84bd8c 100644
--- a/metadata/md5-cache/app-emulation/wine-d3d9-9999
+++ b/metadata/md5-cache/app-emulation/wine-d3d9-9999
@@ -10,5 +10,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=9999
 SRC_URI=https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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-desktop-common-20150204 b/metadata/md5-cache/app-emulation/wine-desktop-common-20150204
index 1effce81434a..271819c40918 100644
--- a/metadata/md5-cache/app-emulation/wine-desktop-common-20150204
+++ b/metadata/md5-cache/app-emulation/wine-desktop-common-20150204
@@ -9,5 +9,5 @@ PDEPEND=app-eselect/eselect-wine
 RDEPEND=!!app-emulation/wine:0
 SLOT=0
 SRC_URI=https://github.com/NP-Hardass/wine-desktop-common/archive/20150204.tar.gz -> wine-desktop-common-20150204.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d9d5b8b824fbd4cebcb8058c0b5b47c0
diff --git a/metadata/md5-cache/app-emulation/wine-staging-3.13-r1 b/metadata/md5-cache/app-emulation/wine-staging-3.13-r1
deleted file mode 100644
index da70baad7bdc..000000000000
--- a/metadata/md5-cache/app-emulation/wine-staging-3.13-r1
+++ /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.13
-SRC_URI=https://dl.winehq.org/wine/source/3.x/wine-3.13.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz staging? ( https://github.com/wine-staging/wine-staging/archive/v3.13.tar.gz -> wine-staging-3.13.tar.gz )
-_eclasses_=autotools	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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=7bb7c87fb60617d5368dc9b26ef0bcb7
diff --git a/metadata/md5-cache/app-emulation/wine-staging-3.14 b/metadata/md5-cache/app-emulation/wine-staging-3.14
index 7ed519bc67f4..dd04c1155613 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-3.14
+++ b/metadata/md5-cache/app-emulation/wine-staging-3.14
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 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	89bb9f083a2590d9b447fd0b78a96186
+_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.15 b/metadata/md5-cache/app-emulation/wine-staging-3.15
index e31b7b9c8dfb..0f2773556f02 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-3.15
+++ b/metadata/md5-cache/app-emulation/wine-staging-3.15
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=3.15
 SRC_URI=https://dl.winehq.org/wine/source/3.x/wine-3.15.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.15.tar.gz -> wine-staging-3.15.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	89bb9f083a2590d9b447fd0b78a96186
+_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.16 b/metadata/md5-cache/app-emulation/wine-staging-3.16
index 2ede3b57aaee..8fb283e0132b 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-3.16
+++ b/metadata/md5-cache/app-emulation/wine-staging-3.16
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=3.16
 SRC_URI=https://dl.winehq.org/wine/source/3.x/wine-3.16.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.16.tar.gz -> wine-staging-3.16.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	89bb9f083a2590d9b447fd0b78a96186
+_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.17 b/metadata/md5-cache/app-emulation/wine-staging-3.17
new file mode 100644
index 000000000000..cbfb70e79fcd
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-staging-3.17
@@ -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.17
+SRC_URI=https://dl.winehq.org/wine/source/3.x/wine-3.17.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.17.tar.gz -> wine-staging-3.17.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-staging-9999 b/metadata/md5-cache/app-emulation/wine-staging-9999
index b019472baf94..11315c1919ba 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-9999
+++ b/metadata/md5-cache/app-emulation/wine-staging-9999
@@ -10,5 +10,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=9999
 SRC_URI=https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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-vanilla-3.0.2 b/metadata/md5-cache/app-emulation/wine-vanilla-3.0.2
index 11af90e552e4..04dcd09917e5 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-3.0.2
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-3.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=3.0.2
 SRC_URI=https://dl.winehq.org/wine/source/3.0/wine-3.0.2.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
-_eclasses_=autotools	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5ddf679eda0af24ed344182feacbb517
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 74ca99dc4c36..355bf84268c1 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-3.0.3
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-3.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-3.13-r1 b/metadata/md5-cache/app-emulation/wine-vanilla-3.13-r1
deleted file mode 100644
index 6637ca2d5bc2..000000000000
--- a/metadata/md5-cache/app-emulation/wine-vanilla-3.13-r1
+++ /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.13
-SRC_URI=https://dl.winehq.org/wine/source/3.x/wine-3.13.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
-_eclasses_=autotools	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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=3ae5ec1eb7f0d6d9dbd6b78d102821a3
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-3.14 b/metadata/md5-cache/app-emulation/wine-vanilla-3.14
index 0dc720645f99..593b0bbed179 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-3.14
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-3.14
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 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	89bb9f083a2590d9b447fd0b78a96186
+_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.15 b/metadata/md5-cache/app-emulation/wine-vanilla-3.15
index 84e55a781a00..e30adc6b4b93 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-3.15
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-3.15
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=3.15
 SRC_URI=https://dl.winehq.org/wine/source/3.x/wine-3.15.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	89bb9f083a2590d9b447fd0b78a96186
+_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.16 b/metadata/md5-cache/app-emulation/wine-vanilla-3.16
index 9e8287e0893a..c21c9e8d83de 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-3.16
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-3.16
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=3.16
 SRC_URI=https://dl.winehq.org/wine/source/3.x/wine-3.16.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	89bb9f083a2590d9b447fd0b78a96186
+_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.17 b/metadata/md5-cache/app-emulation/wine-vanilla-3.17
new file mode 100644
index 000000000000..6bf89f266538
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-3.17
@@ -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.17
+SRC_URI=https://dl.winehq.org/wine/source/3.x/wine-3.17.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/wine-vanilla-9999 b/metadata/md5-cache/app-emulation/wine-vanilla-9999
index 11848c33bdf2..a0157b8783c5 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-9999
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-9999
@@ -10,5 +10,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads
 RESTRICT=test
 SLOT=9999
 SRC_URI=https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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/winetricks-20170823 b/metadata/md5-cache/app-emulation/winetricks-20170823
index 99d558fd8791..180f57f421d4 100644
--- a/metadata/md5-cache/app-emulation/winetricks-20170823
+++ b/metadata/md5-cache/app-emulation/winetricks-20170823
@@ -10,5 +10,5 @@ RDEPEND=app-arch/cabextract app-arch/p7zip app-arch/unzip net-misc/wget virtual/
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/Winetricks/winetricks/archive/20170823.tar.gz -> winetricks-20170823.tar.gz gtk? ( https://dev.gentoo.org/~tetromino/distfiles/wine/winetricks-gentoo-2012.11.24.tar.bz2 ) kde? ( https://dev.gentoo.org/~tetromino/distfiles/wine/winetricks-gentoo-2012.11.24.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9a4cbca419ef1676ecd370dc4a5557e6
diff --git a/metadata/md5-cache/app-emulation/winetricks-20180217 b/metadata/md5-cache/app-emulation/winetricks-20180217
index 629a463c2343..2a835a49e426 100644
--- a/metadata/md5-cache/app-emulation/winetricks-20180217
+++ b/metadata/md5-cache/app-emulation/winetricks-20180217
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=app-arch/cabextract app-arch/p7zip app-arch/unzip net-misc/wget virtual/wine x11-misc/xdg-utils gtk? ( gnome-extra/zenity ) kde? ( kde-apps/kdialog ) rar? ( app-arch/unrar )
 SLOT=0
 SRC_URI=https://github.com/Winetricks/winetricks/archive/20180217.tar.gz -> winetricks-20180217.tar.gz gtk? ( https://dev.gentoo.org/~tetromino/distfiles/wine/winetricks-gentoo-2012.11.24.tar.bz2 ) kde? ( https://dev.gentoo.org/~tetromino/distfiles/wine/winetricks-gentoo-2012.11.24.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=49eccc815d5cc291901befbec1a71806
diff --git a/metadata/md5-cache/app-emulation/winetricks-20180513 b/metadata/md5-cache/app-emulation/winetricks-20180513
index a296a7da8b97..fc8a5d95461e 100644
--- a/metadata/md5-cache/app-emulation/winetricks-20180513
+++ b/metadata/md5-cache/app-emulation/winetricks-20180513
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=app-arch/cabextract app-arch/p7zip app-arch/unzip net-misc/wget virtual/wine x11-misc/xdg-utils gtk? ( gnome-extra/zenity ) kde? ( kde-apps/kdialog ) rar? ( app-arch/unrar )
 SLOT=0
 SRC_URI=https://github.com/Winetricks/winetricks/archive/20180513.tar.gz -> winetricks-20180513.tar.gz gtk? ( https://dev.gentoo.org/~tetromino/distfiles/wine/winetricks-gentoo-2012.11.24.tar.bz2 ) kde? ( https://dev.gentoo.org/~tetromino/distfiles/wine/winetricks-gentoo-2012.11.24.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=49eccc815d5cc291901befbec1a71806
diff --git a/metadata/md5-cache/app-emulation/winetricks-20180603 b/metadata/md5-cache/app-emulation/winetricks-20180603
index 00da25c8d03d..c7460b822dcd 100644
--- a/metadata/md5-cache/app-emulation/winetricks-20180603
+++ b/metadata/md5-cache/app-emulation/winetricks-20180603
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=app-arch/cabextract app-arch/p7zip app-arch/unzip net-misc/wget virtual/wine x11-misc/xdg-utils gtk? ( gnome-extra/zenity ) kde? ( kde-apps/kdialog ) rar? ( app-arch/unrar )
 SLOT=0
 SRC_URI=https://github.com/Winetricks/winetricks/archive/20180603.tar.gz -> winetricks-20180603.tar.gz gtk? ( https://dev.gentoo.org/~tetromino/distfiles/wine/winetricks-gentoo-2012.11.24.tar.bz2 ) kde? ( https://dev.gentoo.org/~tetromino/distfiles/wine/winetricks-gentoo-2012.11.24.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=49eccc815d5cc291901befbec1a71806
diff --git a/metadata/md5-cache/app-emulation/winetricks-20180815 b/metadata/md5-cache/app-emulation/winetricks-20180815
index 47eadbca5e36..279b9922d1a6 100644
--- a/metadata/md5-cache/app-emulation/winetricks-20180815
+++ b/metadata/md5-cache/app-emulation/winetricks-20180815
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=app-arch/cabextract app-arch/p7zip app-arch/unzip net-misc/wget virtual/wine x11-misc/xdg-utils gtk? ( gnome-extra/zenity ) kde? ( kde-apps/kdialog ) rar? ( app-arch/unrar )
 SLOT=0
 SRC_URI=https://github.com/Winetricks/winetricks/archive/20180815.tar.gz -> winetricks-20180815.tar.gz gtk? ( https://dev.gentoo.org/~tetromino/distfiles/wine/winetricks-gentoo-2012.11.24.tar.bz2 ) kde? ( https://dev.gentoo.org/~tetromino/distfiles/wine/winetricks-gentoo-2012.11.24.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=49eccc815d5cc291901befbec1a71806
diff --git a/metadata/md5-cache/app-emulation/winetricks-99999999 b/metadata/md5-cache/app-emulation/winetricks-99999999
index 2a09937964aa..753b1108b92e 100644
--- a/metadata/md5-cache/app-emulation/winetricks-99999999
+++ b/metadata/md5-cache/app-emulation/winetricks-99999999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=app-arch/cabextract app-arch/p7zip app-arch/unzip net-misc/wget virtual/wine x11-misc/xdg-utils gtk? ( gnome-extra/zenity ) kde? ( kde-apps/kdialog ) rar? ( app-arch/unrar )
 SLOT=0
 SRC_URI=gtk? ( https://dev.gentoo.org/~tetromino/distfiles/wine/winetricks-gentoo-2012.11.24.tar.bz2 ) kde? ( https://dev.gentoo.org/~tetromino/distfiles/wine/winetricks-gentoo-2012.11.24.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=49eccc815d5cc291901befbec1a71806
diff --git a/metadata/md5-cache/app-emulation/xe-guest-utilities-5.6.0_p595 b/metadata/md5-cache/app-emulation/xe-guest-utilities-5.6.0_p595
index bcfbdb705d95..5c464076163e 100644
--- a/metadata/md5-cache/app-emulation/xe-guest-utilities-5.6.0_p595
+++ b/metadata/md5-cache/app-emulation/xe-guest-utilities-5.6.0_p595
@@ -9,5 +9,5 @@ LICENSE=LGPL-3 LGPL-2.1
 RDEPEND=!xenstore? ( app-emulation/xen-tools ) xenstore? ( !app-emulation/xen-tools )
 SLOT=0
 SRC_URI=http://updates.vmd.citrix.com/XenServer/5.6.0/rhel4x/SRPMS/xe-guest-utilities-5.6.0-595.src.rpm
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d3b55ebdd6a726bf7e723bfa2eb44ca0
diff --git a/metadata/md5-cache/app-emulation/xe-guest-utilities-6.1.0_p1033 b/metadata/md5-cache/app-emulation/xe-guest-utilities-6.1.0_p1033
index 0cb4ce9723d7..fd6fd721b8d0 100644
--- a/metadata/md5-cache/app-emulation/xe-guest-utilities-6.1.0_p1033
+++ b/metadata/md5-cache/app-emulation/xe-guest-utilities-6.1.0_p1033
@@ -9,5 +9,5 @@ LICENSE=LGPL-3 LGPL-2.1
 RDEPEND=!xenstore? ( app-emulation/xen-tools ) xenstore? ( !app-emulation/xen-tools )
 SLOT=0
 SRC_URI=http://updates.vmd.citrix.com/XenServer/6.1.0/rhel4x/SRPMS/xe-guest-utilities-6.1.0-1033.src.rpm
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=afff06c400ab807477c261bb11bd6222
diff --git a/metadata/md5-cache/app-emulation/xe-guest-utilities-6.2.0_p1120 b/metadata/md5-cache/app-emulation/xe-guest-utilities-6.2.0_p1120
index c4ac5206dc26..cf54602647c8 100644
--- a/metadata/md5-cache/app-emulation/xe-guest-utilities-6.2.0_p1120
+++ b/metadata/md5-cache/app-emulation/xe-guest-utilities-6.2.0_p1120
@@ -9,5 +9,5 @@ LICENSE=LGPL-3 LGPL-2.1
 RDEPEND=!xenstore? ( app-emulation/xen-tools ) xenstore? ( !app-emulation/xen-tools )
 SLOT=0
 SRC_URI=http://updates.vmd.citrix.com/XenServer/6.2.0/rhel4x/SRPMS/xe-guest-utilities-6.2.0-1120.src.rpm
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=61158e01a8f3e256b1f3fc30744443e8
diff --git a/metadata/md5-cache/app-emulation/xen-4.10.0 b/metadata/md5-cache/app-emulation/xen-4.10.0
deleted file mode 100644
index 96eb41561b4f..000000000000
--- a/metadata/md5-cache/app-emulation/xen-4.10.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
-DEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) efi? ( >=sys-devel/binutils-2.22[multitarget] ) !efi? ( >=sys-devel/binutils-2.22 )
-DESCRIPTION=The Xen virtual machine monitor
-EAPI=6
-HOMEPAGE=https://www.xenproject.org
-IUSE=custom-cflags debug efi flask
-KEYWORDS=~amd64 ~arm -x86
-LICENSE=GPL-2
-PDEPEND=~app-emulation/xen-tools-4.10.0
-REQUIRED_USE=arm? ( debug )
-RESTRICT=test splitdebug strip
-SLOT=0
-SRC_URI=https://downloads.xenproject.org/release/xen/4.10.0/xen-4.10.0.tar.gz https://dev.gentoo.org/~dlan/distfiles/xen-4.10.0-upstream-patches-0.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.10.0-upstream-patches-0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f3d1b4254814525ae78d2dad6a1e8c27
diff --git a/metadata/md5-cache/app-emulation/xen-4.10.1-r1 b/metadata/md5-cache/app-emulation/xen-4.10.1-r1
deleted file mode 100644
index f6284c82e60b..000000000000
--- a/metadata/md5-cache/app-emulation/xen-4.10.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
-DEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) efi? ( >=sys-devel/binutils-2.22[multitarget] ) !efi? ( >=sys-devel/binutils-2.22 )
-DESCRIPTION=The Xen virtual machine monitor
-EAPI=6
-HOMEPAGE=https://www.xenproject.org
-IUSE=custom-cflags debug efi flask
-KEYWORDS=~amd64 ~arm -x86
-LICENSE=GPL-2
-PDEPEND=~app-emulation/xen-tools-4.10.1
-REQUIRED_USE=arm? ( debug )
-RESTRICT=test splitdebug strip
-SLOT=0
-SRC_URI=https://downloads.xenproject.org/release/xen/4.10.1/xen-4.10.1.tar.gz https://dev.gentoo.org/~dlan/distfiles/xen-4.10.1-upstream-patches-1.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.10.1-upstream-patches-1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=34d6b700f7b4594ae7a9bf4a90c9f62b
diff --git a/metadata/md5-cache/app-emulation/xen-4.10.2 b/metadata/md5-cache/app-emulation/xen-4.10.2
new file mode 100644
index 000000000000..38b22d4084a7
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-4.10.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
+DEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) efi? ( >=sys-devel/binutils-2.22[multitarget] ) !efi? ( >=sys-devel/binutils-2.22 )
+DESCRIPTION=The Xen virtual machine monitor
+EAPI=7
+HOMEPAGE=https://www.xenproject.org
+IUSE=custom-cflags debug efi flask
+KEYWORDS=~amd64 ~arm -x86
+LICENSE=GPL-2
+PDEPEND=~app-emulation/xen-tools-4.10.2
+REQUIRED_USE=arm? ( debug )
+RESTRICT=test splitdebug strip
+SLOT=0
+SRC_URI=https://downloads.xenproject.org/release/xen/4.10.2/xen-4.10.2.tar.gz https://dev.gentoo.org/~dlan/distfiles/xen-4.10.2-upstream-patches-0.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.10.2-upstream-patches-0.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=0df1a043fecd7c5a7f128deb5baf5fa8
diff --git a/metadata/md5-cache/app-emulation/xen-4.11.0-r1 b/metadata/md5-cache/app-emulation/xen-4.11.0-r1
deleted file mode 100644
index 92d8ce424443..000000000000
--- a/metadata/md5-cache/app-emulation/xen-4.11.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
-DEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) efi? ( >=sys-devel/binutils-2.22[multitarget] ) !efi? ( >=sys-devel/binutils-2.22 )
-DESCRIPTION=The Xen virtual machine monitor
-EAPI=6
-HOMEPAGE=https://www.xenproject.org
-IUSE=custom-cflags debug efi flask
-KEYWORDS=~amd64 ~arm -x86
-LICENSE=GPL-2
-PDEPEND=~app-emulation/xen-tools-4.11.0
-REQUIRED_USE=arm? ( debug )
-RESTRICT=test splitdebug strip
-SLOT=0
-SRC_URI=https://downloads.xenproject.org/release/xen/4.11.0/xen-4.11.0.tar.gz https://dev.gentoo.org/~dlan/distfiles/xen-4.11.0-upstream-patches-0.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.11.0-upstream-patches-0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f3d1b4254814525ae78d2dad6a1e8c27
diff --git a/metadata/md5-cache/app-emulation/xen-4.9.2 b/metadata/md5-cache/app-emulation/xen-4.9.2
deleted file mode 100644
index 27b9553c14a2..000000000000
--- a/metadata/md5-cache/app-emulation/xen-4.9.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
-DEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) efi? ( >=sys-devel/binutils-2.22[multitarget] ) !efi? ( >=sys-devel/binutils-2.22 )
-DESCRIPTION=The Xen virtual machine monitor
-EAPI=6
-HOMEPAGE=https://www.xenproject.org
-IUSE=custom-cflags debug efi flask
-KEYWORDS=amd64 ~arm -x86
-LICENSE=GPL-2
-PDEPEND=~app-emulation/xen-tools-4.9.2
-REQUIRED_USE=arm? ( debug )
-RESTRICT=test splitdebug strip
-SLOT=0
-SRC_URI=https://downloads.xenproject.org/release/xen/4.9.2/xen-4.9.2.tar.gz https://dev.gentoo.org/~dlan/distfiles/xen-4.9.2-upstream-patches-1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7c3923e478d56606c4a951b0b4910a92
diff --git a/metadata/md5-cache/app-emulation/xen-pvgrub-4.10.2 b/metadata/md5-cache/app-emulation/xen-pvgrub-4.10.2
new file mode 100644
index 000000000000..de18948db128
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-pvgrub-4.10.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=sys-devel/gettext sys-devel/bin86 sys-apps/texinfo x11-libs/pixman
+DESCRIPTION=allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem
+EAPI=7
+HOMEPAGE=https://www.xenproject.org
+IUSE=custom-cflags python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-emulation/xen-tools-4.10.2
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://downloads.xenproject.org/release/xen/4.10.2/xen-4.10.2.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz http://xenbits.xensource.com/xen-extfiles/zlib-1.2.3.tar.gz ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-2.2.9.tar.bz2 http://xenbits.xensource.com/xen-extfiles/lwip-1.3.0.tar.gz http://xenbits.xensource.com/xen-extfiles/newlib/newlib-1.16.0.tar.gz http://xenbits.xensource.com/xen-extfiles/polarssl-1.1.4-gpl.tgz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=5a8ab5b92dea976ccfd4e556898b75f6
diff --git a/metadata/md5-cache/app-emulation/xen-pvgrub-4.9.2 b/metadata/md5-cache/app-emulation/xen-pvgrub-4.9.2
deleted file mode 100644
index e1a76019abf6..000000000000
--- a/metadata/md5-cache/app-emulation/xen-pvgrub-4.9.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=sys-devel/gettext sys-devel/bin86 sys-apps/texinfo x11-libs/pixman
-DESCRIPTION=allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem
-EAPI=6
-HOMEPAGE=https://www.xenproject.org
-IUSE=custom-cflags python_targets_python2_7
-KEYWORDS=amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-emulation/xen-tools-4.9.2
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://downloads.xenproject.org/release/xen/4.9.2/xen-4.9.2.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz http://xenbits.xensource.com/xen-extfiles/zlib-1.2.3.tar.gz ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-2.2.9.tar.bz2 http://xenbits.xensource.com/xen-extfiles/lwip-1.3.0.tar.gz http://xenbits.xensource.com/xen-extfiles/newlib/newlib-1.16.0.tar.gz http://xenbits.xensource.com/xen-extfiles/polarssl-1.1.4-gpl.tgz
-_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_=2a00ff29ba5c6f3eed4d3070b10926be
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.10.0 b/metadata/md5-cache/app-emulation/xen-tools-4.10.0
deleted file mode 100644
index ae603d06abd0..000000000000
--- a/metadata/md5-cache/app-emulation/xen-tools-4.10.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=sys-kernel/linux-headers-4.11 dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] x86? ( sys-devel/dev86 sys-power/iasl ) pam? ( dev-python/pypam[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-devel/bin86 system-seabios? ( sys-firmware/seabios ) sys-firmware/ipxe sys-devel/dev86 sys-power/iasl ) dev-lang/perl app-misc/pax-utils doc? ( app-text/ghostscript-gpl app-text/pandoc dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-texlive/texlive-latexextra media-gfx/transfig ) hvm? ( x11-base/xorg-proto !net-libs/libiscsi ) qemu? ( app-arch/snappy:= x11-libs/pixman sdl? ( media-libs/libsdl[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 )
-DESCRIPTION=Xen tools including QEMU and xl
-EAPI=6
-HOMEPAGE=https://www.xenproject.org
-IUSE=api custom-cflags debug doc flask hvm ocaml ovmf +pam pygrub python +qemu +qemu-traditional screen sdl static-libs system-qemu system-seabios python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sys-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate )
-REQUIRED_USE=python_targets_python2_7 pygrub? ( python ) ovmf? ( hvm ) ^^ ( qemu system-qemu )
-RESTRICT=test
-SLOT=0/4.10
-SRC_URI=https://downloads.xenproject.org/release/xen/4.10.0/xen-4.10.0.tar.gz http://code.coreboot.org/p/seabios/downloads/get/seabios-1.10.0.tar.gz https://dev.gentoo.org/~dlan/distfiles/seabios-1.10.0.tar.gz ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-20170321.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-ovmf-patches-3.tar.xz ) https://dev.gentoo.org/~dlan/distfiles/xen-4.10.0-upstream-patches-0.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.10.0-upstream-patches-0.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-12.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-gentoo-patches-12.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=e4efbb2f1a03653ec235130c58821a82
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.10.1-r1 b/metadata/md5-cache/app-emulation/xen-tools-4.10.1-r1
deleted file mode 100644
index 98baad47d9ce..000000000000
--- a/metadata/md5-cache/app-emulation/xen-tools-4.10.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=sys-kernel/linux-headers-4.11 dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] x86? ( sys-devel/dev86 sys-power/iasl ) pam? ( dev-python/pypam[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-devel/bin86 system-seabios? ( sys-firmware/seabios ) sys-firmware/ipxe sys-devel/dev86 sys-power/iasl ) dev-lang/perl app-misc/pax-utils doc? ( app-text/ghostscript-gpl app-text/pandoc dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-texlive/texlive-latexextra media-gfx/transfig ) hvm? ( x11-base/xorg-proto !net-libs/libiscsi ) qemu? ( app-arch/snappy:= x11-libs/pixman sdl? ( media-libs/libsdl[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 )
-DESCRIPTION=Xen tools including QEMU and xl
-EAPI=6
-HOMEPAGE=https://www.xenproject.org
-IUSE=api custom-cflags debug doc flask hvm ocaml ovmf +pam pygrub python +qemu +qemu-traditional screen sdl static-libs system-qemu system-seabios python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sys-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate )
-REQUIRED_USE=python_targets_python2_7 pygrub? ( python ) ovmf? ( hvm ) ^^ ( qemu system-qemu )
-RESTRICT=test
-SLOT=0/4.10
-SRC_URI=https://downloads.xenproject.org/release/xen/4.10.1/xen-4.10.1.tar.gz http://code.coreboot.org/p/seabios/downloads/get/seabios-1.10.0.tar.gz https://dev.gentoo.org/~dlan/distfiles/seabios-1.10.0.tar.gz ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-20170321.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-ovmf-patches-3.tar.xz ) https://dev.gentoo.org/~dlan/distfiles/xen-4.10.1-upstream-patches-1.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.10.1-upstream-patches-1.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-14.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-gentoo-patches-14.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=f254930afbb8770dad624672c4a766ba
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.10.2 b/metadata/md5-cache/app-emulation/xen-tools-4.10.2
new file mode 100644
index 000000000000..4f4ce4b77421
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.10.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=sys-kernel/linux-headers-4.11 dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] x86? ( sys-devel/dev86 sys-power/iasl ) pam? ( dev-python/pypam[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-devel/bin86 system-seabios? ( sys-firmware/seabios ) sys-firmware/ipxe sys-devel/dev86 sys-power/iasl ) dev-lang/perl app-misc/pax-utils doc? ( app-text/ghostscript-gpl app-text/pandoc dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-texlive/texlive-latexextra media-gfx/transfig ) hvm? ( x11-base/xorg-proto !net-libs/libiscsi ) qemu? ( app-arch/snappy:= x11-libs/pixman sdl? ( media-libs/libsdl[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 )
+DESCRIPTION=Xen tools including QEMU and xl
+EAPI=7
+HOMEPAGE=https://www.xenproject.org
+IUSE=api custom-cflags debug doc flask hvm ocaml ovmf +pam pygrub python +qemu +qemu-traditional screen sdl static-libs system-qemu system-seabios python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sys-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate )
+REQUIRED_USE=python_targets_python2_7 pygrub? ( python ) ovmf? ( hvm ) ^^ ( qemu system-qemu )
+RESTRICT=test
+SLOT=0/4.10
+SRC_URI=https://downloads.xenproject.org/release/xen/4.10.2/xen-4.10.2.tar.gz http://code.coreboot.org/p/seabios/downloads/get/seabios-1.10.0.tar.gz https://dev.gentoo.org/~dlan/distfiles/seabios-1.10.0.tar.gz ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-20170321.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-ovmf-patches-3.tar.xz ) https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-14.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-gentoo-patches-14.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=b1ca37d2d38394654554273bf7e12191
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.11.0-r1 b/metadata/md5-cache/app-emulation/xen-tools-4.11.0-r1
deleted file mode 100644
index d124b7a39868..000000000000
--- a/metadata/md5-cache/app-emulation/xen-tools-4.11.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=sys-kernel/linux-headers-4.11 dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] x86? ( sys-devel/dev86 sys-power/iasl ) pam? ( dev-python/pypam[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-devel/bin86 system-seabios? ( sys-firmware/seabios ) sys-firmware/ipxe sys-devel/dev86 sys-power/iasl ) dev-lang/perl app-misc/pax-utils doc? ( app-text/ghostscript-gpl app-text/pandoc dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-texlive/texlive-latexextra media-gfx/transfig ) hvm? ( x11-base/xorg-proto ) qemu? ( app-arch/snappy:= x11-libs/pixman sdl? ( media-libs/libsdl[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 )
-DESCRIPTION=Xen tools including QEMU and xl
-EAPI=6
-HOMEPAGE=https://www.xenproject.org
-IUSE=api custom-cflags debug doc flask hvm ocaml ovmf +pam pygrub python +qemu +qemu-traditional screen sdl static-libs system-qemu system-seabios python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sys-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate )
-REQUIRED_USE=python_targets_python2_7 pygrub? ( python ) ovmf? ( hvm ) ^^ ( qemu system-qemu )
-RESTRICT=test
-SLOT=0/4.11
-SRC_URI=https://downloads.xenproject.org/release/xen/4.11.0/xen-4.11.0.tar.gz http://code.coreboot.org/p/seabios/downloads/get/seabios-1.10.0.tar.gz https://dev.gentoo.org/~dlan/distfiles/seabios-1.10.0.tar.gz ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-20170321.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-ovmf-patches-3.tar.xz ) https://dev.gentoo.org/~dlan/distfiles/xen-4.11.0-upstream-patches-0.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.11.0-upstream-patches-0.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-14.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-gentoo-patches-14.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=2632753080a0e40299e34b5f5f177e25
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.9.2-r1 b/metadata/md5-cache/app-emulation/xen-tools-4.9.2-r1
deleted file mode 100644
index 864433d5ed71..000000000000
--- a/metadata/md5-cache/app-emulation/xen-tools-4.9.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=sys-kernel/linux-headers-4.11 dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] x86? ( sys-devel/dev86 sys-power/iasl ) pam? ( dev-python/pypam[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-devel/bin86 system-seabios? ( sys-firmware/seabios ) sys-firmware/ipxe sys-devel/dev86 sys-power/iasl ) dev-lang/perl app-misc/pax-utils doc? ( app-text/ghostscript-gpl app-text/pandoc dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-texlive/texlive-latexextra media-gfx/transfig ) hvm? ( x11-base/xorg-proto !net-libs/libiscsi ) qemu? ( app-arch/snappy:= x11-libs/pixman sdl? ( media-libs/libsdl[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 )
-DESCRIPTION=Xen tools including QEMU and xl
-EAPI=6
-HOMEPAGE=https://www.xenproject.org
-IUSE=api custom-cflags debug doc flask hvm ocaml ovmf +pam pygrub python +qemu +qemu-traditional screen sdl static-libs system-qemu system-seabios python_targets_python2_7
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sys-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate )
-REQUIRED_USE=python_targets_python2_7 pygrub? ( python ) ovmf? ( hvm ) ^^ ( qemu system-qemu )
-RESTRICT=test
-SLOT=0/4.9
-SRC_URI=https://downloads.xenproject.org/release/xen/4.9.2/xen-4.9.2.tar.gz http://code.coreboot.org/p/seabios/downloads/get/seabios-1.10.0.tar.gz https://dev.gentoo.org/~dlan/distfiles/seabios-1.10.0.tar.gz ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-20170321.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-ovmf-patches-3.tar.xz ) https://dev.gentoo.org/~dlan/distfiles/xen-4.9.2-upstream-patches-2.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-12.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=25bbab270d626a67dcc618252d08220c
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index 5c33a9642b96..c8a8f53d143d 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-5 b/metadata/md5-cache/app-eselect/eselect-repository-5
new file mode 100644
index 000000000000..d4ceacdf48c5
--- /dev/null
+++ b/metadata/md5-cache/app-eselect/eselect-repository-5
@@ -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/v5.tar.gz -> eselect-repository-5.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 5ecfc0238d44..955befcfcd5a 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-r3 b/metadata/md5-cache/app-forensics/foremost-1.5.7-r3
index 7a59702f9570..c1702715210b 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_=034645399b434b5ee92499f3f5ac8655
+_md5_=65c3b46e2b536ad4411ed7a982e2404e
diff --git a/metadata/md5-cache/app-forensics/volatility-2.4.1 b/metadata/md5-cache/app-forensics/volatility-2.4.1
index c844072c3f00..ff9b50e87888 100644
--- a/metadata/md5-cache/app-forensics/volatility-2.4.1
+++ b/metadata/md5-cache/app-forensics/volatility-2.4.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/distorm64-3[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gentoo/volatility-2.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=edf3f59929f673df6f212dc36f536f8d
diff --git a/metadata/md5-cache/app-forensics/volatility-2.6 b/metadata/md5-cache/app-forensics/volatility-2.6
index 9532aa1f169c..e869e23d1425 100644
--- a/metadata/md5-cache/app-forensics/volatility-2.6
+++ b/metadata/md5-cache/app-forensics/volatility-2.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/distorm64-3[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://downloads.volatilityfoundation.org/releases/2.6/volatility-2.6.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bcffdae60a4c4a1ce35cc822ec85b40b
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index dd4bef8080b0..21c0b816f6cd 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/atokx3-3.0.0-r12 b/metadata/md5-cache/app-i18n/atokx3-3.0.0-r12
index 93778a2fec06..8565cdd696a3 100644
--- a/metadata/md5-cache/app-i18n/atokx3-3.0.0-r12
+++ b/metadata/md5-cache/app-i18n/atokx3-3.0.0-r12
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=https://gate.justsystems.com/download/atok/up/lin/atokx3up2.tar.gz https://gate.justsystems.com/download/atok/up/lin/atokx3gtk216.tar.gz https://gate.justsystems.com/download/zipcode/up/lin/a20y1406lx.tgz
-_eclasses_=cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6088bd096521136e4e4827a621a81b36
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 42e39b0eefd3..b720daa138f6 100644
--- a/metadata/md5-cache/app-i18n/fcitx-4.2.9.6
+++ b/metadata/md5-cache/app-i18n/fcitx-4.2.9.6
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 sys-apps/dbus sys-apps/util-linux virtual/libiconv virtu
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/app-i18n/fcitx-4.9999 b/metadata/md5-cache/app-i18n/fcitx-4.9999
index 844595d21ea3..a34b6cbf7921 100644
--- a/metadata/md5-cache/app-i18n/fcitx-4.9999
+++ b/metadata/md5-cache/app-i18n/fcitx-4.9999
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/glib:2 sys-apps/dbus sys-apps/util-linux virtual/libiconv virtu
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/app-i18n/fcitx-anthy-0.2.3 b/metadata/md5-cache/app-i18n/fcitx-anthy-0.2.3
index a114c753d3b7..452c20a26b8b 100644
--- a/metadata/md5-cache/app-i18n/fcitx-anthy-0.2.3
+++ b/metadata/md5-cache/app-i18n/fcitx-anthy-0.2.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-i18n/fcitx-4.2.9:4[X,xml] app-i18n/anthy:= virtual/libintl
 SLOT=4
 SRC_URI=https://download.fcitx-im.org/fcitx-anthy/fcitx-anthy-0.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=df9c8bbf2f66770c5f63e92867f4bb6f
diff --git a/metadata/md5-cache/app-i18n/fcitx-anthy-4.9999 b/metadata/md5-cache/app-i18n/fcitx-anthy-4.9999
index 908ef706ac6c..de6697bc1db1 100644
--- a/metadata/md5-cache/app-i18n/fcitx-anthy-4.9999
+++ b/metadata/md5-cache/app-i18n/fcitx-anthy-4.9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-anthy
 LICENSE=GPL-2+
 RDEPEND=>=app-i18n/fcitx-4.2.9:4[X,xml] app-i18n/anthy:= virtual/libintl
 SLOT=4
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9fe6aeae749df191d026ae0a9e1f3a77
diff --git a/metadata/md5-cache/app-i18n/fcitx-chewing-0.2.3 b/metadata/md5-cache/app-i18n/fcitx-chewing-0.2.3
index 05adb1cf6cdc..9a13bc8557fe 100644
--- a/metadata/md5-cache/app-i18n/fcitx-chewing-0.2.3
+++ b/metadata/md5-cache/app-i18n/fcitx-chewing-0.2.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/libchewing-0.5.0:= virtual/libintl
 SLOT=4
 SRC_URI=https://download.fcitx-im.org/fcitx-chewing/fcitx-chewing-0.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=35411ec9348e3ec239bae969f89f36e8
diff --git a/metadata/md5-cache/app-i18n/fcitx-chewing-4.9999 b/metadata/md5-cache/app-i18n/fcitx-chewing-4.9999
index 40a9579d42e6..74fd7548f6fa 100644
--- a/metadata/md5-cache/app-i18n/fcitx-chewing-4.9999
+++ b/metadata/md5-cache/app-i18n/fcitx-chewing-4.9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-chewing
 LICENSE=GPL-2+
 RDEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/libchewing-0.5.0:= virtual/libintl
 SLOT=4
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=58e9dca180bace1b0ff304a4a94bb63e
diff --git a/metadata/md5-cache/app-i18n/fcitx-cloudpinyin-0.3.6 b/metadata/md5-cache/app-i18n/fcitx-cloudpinyin-0.3.6
index adc1c2e7ae43..7e9acd7a2251 100644
--- a/metadata/md5-cache/app-i18n/fcitx-cloudpinyin-0.3.6
+++ b/metadata/md5-cache/app-i18n/fcitx-cloudpinyin-0.3.6
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-i18n/fcitx-4.2.9:4 net-misc/curl:= virtual/libiconv virtual/libintl
 SLOT=4
 SRC_URI=https://download.fcitx-im.org/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=dd651d6a346a612ed21f101808e431b6
diff --git a/metadata/md5-cache/app-i18n/fcitx-cloudpinyin-4.9999 b/metadata/md5-cache/app-i18n/fcitx-cloudpinyin-4.9999
index 8717587d24c0..07747bf4be3c 100644
--- a/metadata/md5-cache/app-i18n/fcitx-cloudpinyin-4.9999
+++ b/metadata/md5-cache/app-i18n/fcitx-cloudpinyin-4.9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-cloudpinyin
 LICENSE=GPL-2+
 RDEPEND=>=app-i18n/fcitx-4.2.9:4 net-misc/curl:= virtual/libiconv virtual/libintl
 SLOT=4
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e3c342e93d8e7619d8c9cc7cc0eb8de3
diff --git a/metadata/md5-cache/app-i18n/fcitx-configtool-0.4.10 b/metadata/md5-cache/app-i18n/fcitx-configtool-0.4.10
index 059772701cce..5104566f2b60 100644
--- a/metadata/md5-cache/app-i18n/fcitx-configtool-0.4.10
+++ b/metadata/md5-cache/app-i18n/fcitx-configtool-0.4.10
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=app-i18n/fcitx-4.2.9:4 app-text/iso-codes dev-libs/glib:2 x11-libs/gtk+:3
 SLOT=4
 SRC_URI=https://download.fcitx-im.org/fcitx-configtool/fcitx-configtool-0.4.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=14d9086ac46d8bf6d71ea9297b17fae4
diff --git a/metadata/md5-cache/app-i18n/fcitx-configtool-4.9999 b/metadata/md5-cache/app-i18n/fcitx-configtool-4.9999
index 98c09f42d502..f88924d4d501 100644
--- a/metadata/md5-cache/app-i18n/fcitx-configtool-4.9999
+++ b/metadata/md5-cache/app-i18n/fcitx-configtool-4.9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-configtool
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=app-i18n/fcitx-4.2.9:4 app-text/iso-codes dev-libs/glib:2 x11-libs/gtk+:3
 SLOT=4
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=67c58793994fc5524bb59072deb5375f
diff --git a/metadata/md5-cache/app-i18n/fcitx-hangul-0.3.1 b/metadata/md5-cache/app-i18n/fcitx-hangul-0.3.1
index a6d04a3bd611..7896aaf4d479 100644
--- a/metadata/md5-cache/app-i18n/fcitx-hangul-0.3.1
+++ b/metadata/md5-cache/app-i18n/fcitx-hangul-0.3.1
@@ -8,5 +8,5 @@ LICENSE=BSD GPL-2+
 RDEPEND=>=app-i18n/fcitx-4.2.9:4 app-i18n/libhangul:= virtual/libiconv virtual/libintl
 SLOT=4
 SRC_URI=https://download.fcitx-im.org/fcitx-hangul/fcitx-hangul-0.3.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=00d3ef2ad917b0acbd69b76ffb7924bd
diff --git a/metadata/md5-cache/app-i18n/fcitx-hangul-4.9999 b/metadata/md5-cache/app-i18n/fcitx-hangul-4.9999
index 203619b8b50f..ae5e41147a4f 100644
--- a/metadata/md5-cache/app-i18n/fcitx-hangul-4.9999
+++ b/metadata/md5-cache/app-i18n/fcitx-hangul-4.9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-hangul
 LICENSE=BSD GPL-2+
 RDEPEND=>=app-i18n/fcitx-4.2.9:4 app-i18n/libhangul:= virtual/libiconv virtual/libintl
 SLOT=4
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1184e70319aed17d5357817199d902fb
diff --git a/metadata/md5-cache/app-i18n/fcitx-libpinyin-0.5.3 b/metadata/md5-cache/app-i18n/fcitx-libpinyin-0.5.3
index e3cd81154850..de415e490dd1 100644
--- a/metadata/md5-cache/app-i18n/fcitx-libpinyin-0.5.3
+++ b/metadata/md5-cache/app-i18n/fcitx-libpinyin-0.5.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ GPL-3+
 RDEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/libpinyin-2.1.0:= dev-libs/glib:2 sys-apps/dbus virtual/libintl dictionary-manager? ( >=app-i18n/fcitx-qt5-1.1:4 >=dev-qt/qtcore-5.7:5 >=dev-qt/qtdbus-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtnetwork-5.7:5 >=dev-qt/qtwebengine-5.7:5[widgets] >=dev-qt/qtwidgets-5.7:5 )
 SLOT=4
 SRC_URI=https://download.fcitx-im.org/fcitx-libpinyin/fcitx-libpinyin-0.5.3_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9fc22822398886b295a2e58b526d7b65
diff --git a/metadata/md5-cache/app-i18n/fcitx-libpinyin-4.9999 b/metadata/md5-cache/app-i18n/fcitx-libpinyin-4.9999
index 775a942688df..30534391afe5 100644
--- a/metadata/md5-cache/app-i18n/fcitx-libpinyin-4.9999
+++ b/metadata/md5-cache/app-i18n/fcitx-libpinyin-4.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ GPL-3+
 RDEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/libpinyin-2.1.0:= dev-libs/glib:2 sys-apps/dbus virtual/libintl dictionary-manager? ( >=app-i18n/fcitx-qt5-1.1:4 >=dev-qt/qtcore-5.7:5 >=dev-qt/qtdbus-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtnetwork-5.7:5 >=dev-qt/qtwebengine-5.7:5[widgets] >=dev-qt/qtwidgets-5.7:5 )
 SLOT=4
 SRC_URI=https://download.fcitx-im.org/data/model.text.20161206.tar.gz -> fcitx-data-model.text.20161206.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=35b881f7e34ea38de34e5b5892d7c1a4
diff --git a/metadata/md5-cache/app-i18n/fcitx-m17n-0.2.4 b/metadata/md5-cache/app-i18n/fcitx-m17n-0.2.4
index 00789b38b901..ad4d86117653 100644
--- a/metadata/md5-cache/app-i18n/fcitx-m17n-0.2.4
+++ b/metadata/md5-cache/app-i18n/fcitx-m17n-0.2.4
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=app-i18n/fcitx-4.2.9:4 dev-libs/m17n-lib virtual/libintl
 SLOT=4
 SRC_URI=https://download.fcitx-im.org/fcitx-m17n/fcitx-m17n-0.2.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e93f32424acec20da4baa11615a206cd
diff --git a/metadata/md5-cache/app-i18n/fcitx-m17n-4.9999 b/metadata/md5-cache/app-i18n/fcitx-m17n-4.9999
index 636f5b5dbf28..854d037a60cb 100644
--- a/metadata/md5-cache/app-i18n/fcitx-m17n-4.9999
+++ b/metadata/md5-cache/app-i18n/fcitx-m17n-4.9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-m17n
 LICENSE=LGPL-2.1+
 RDEPEND=>=app-i18n/fcitx-4.2.9:4 dev-libs/m17n-lib virtual/libintl
 SLOT=4
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ddb6febff96f4d841293bed20c11c2ff
diff --git a/metadata/md5-cache/app-i18n/fcitx-qt5-1.2.3 b/metadata/md5-cache/app-i18n/fcitx-qt5-1.2.3
index 1f6798660afe..039e841fc8db 100644
--- a/metadata/md5-cache/app-i18n/fcitx-qt5-1.2.3
+++ b/metadata/md5-cache/app-i18n/fcitx-qt5-1.2.3
@@ -8,5 +8,5 @@ LICENSE=BSD GPL-2+ GPL-3+ LGPL-2+
 RDEPEND=>=app-i18n/fcitx-4.2.9:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 virtual/libintl x11-libs/libxkbcommon
 SLOT=4
 SRC_URI=https://download.fcitx-im.org/fcitx-qt5/fcitx-qt5-1.2.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0183d0c25112b654576b3d9ac88806de
diff --git a/metadata/md5-cache/app-i18n/fcitx-qt5-4.9999 b/metadata/md5-cache/app-i18n/fcitx-qt5-4.9999
index 3425a44290fd..88b675755b3b 100644
--- a/metadata/md5-cache/app-i18n/fcitx-qt5-4.9999
+++ b/metadata/md5-cache/app-i18n/fcitx-qt5-4.9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-qt5
 LICENSE=BSD GPL-2+ GPL-3+ LGPL-2+
 RDEPEND=>=app-i18n/fcitx-4.2.9:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 virtual/libintl x11-libs/libxkbcommon
 SLOT=4
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c91ff62a4a360664c8d99a8e99e0d5b1
diff --git a/metadata/md5-cache/app-i18n/fcitx-rime-0.3.2 b/metadata/md5-cache/app-i18n/fcitx-rime-0.3.2
index 720ac83f4f13..caf5086ba9b4 100644
--- a/metadata/md5-cache/app-i18n/fcitx-rime-0.3.2
+++ b/metadata/md5-cache/app-i18n/fcitx-rime-0.3.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/librime-1.0.0:= app-i18n/rime-data virtual/libintl
 SLOT=4
 SRC_URI=https://download.fcitx-im.org/fcitx-rime/fcitx-rime-0.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=07e68003d464267cbf3d2678bbf815ad
diff --git a/metadata/md5-cache/app-i18n/fcitx-rime-4.9999 b/metadata/md5-cache/app-i18n/fcitx-rime-4.9999
index a825703b5b92..969da504fc17 100644
--- a/metadata/md5-cache/app-i18n/fcitx-rime-4.9999
+++ b/metadata/md5-cache/app-i18n/fcitx-rime-4.9999
@@ -7,5 +7,5 @@ IUSE=+configuration_tool
 LICENSE=GPL-2
 RDEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/librime-1.0.0:= app-i18n/rime-data virtual/libintl configuration_tool? ( >=app-i18n/fcitx-qt5-1.1:4 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 SLOT=4
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2283526d293a9402278036795b07e5ca
diff --git a/metadata/md5-cache/app-i18n/fcitx-sayura-0.1.2 b/metadata/md5-cache/app-i18n/fcitx-sayura-0.1.2
index 62112e0c9e62..c0f90c4a2f76 100644
--- a/metadata/md5-cache/app-i18n/fcitx-sayura-0.1.2
+++ b/metadata/md5-cache/app-i18n/fcitx-sayura-0.1.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-i18n/fcitx-4.2.9:4 virtual/libiconv virtual/libintl
 SLOT=4
 SRC_URI=https://download.fcitx-im.org/fcitx-sayura/fcitx-sayura-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a98274b0154c127fea9352047677ecfe
diff --git a/metadata/md5-cache/app-i18n/fcitx-sayura-4.9999 b/metadata/md5-cache/app-i18n/fcitx-sayura-4.9999
index 80db2ed8b162..a0ca71abd1e9 100644
--- a/metadata/md5-cache/app-i18n/fcitx-sayura-4.9999
+++ b/metadata/md5-cache/app-i18n/fcitx-sayura-4.9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-sayura
 LICENSE=GPL-2+
 RDEPEND=>=app-i18n/fcitx-4.2.9:4 virtual/libiconv virtual/libintl
 SLOT=4
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=14c958473db91482bf925e235cb0b4c6
diff --git a/metadata/md5-cache/app-i18n/fcitx-sunpinyin-0.4.2 b/metadata/md5-cache/app-i18n/fcitx-sunpinyin-0.4.2
index a563d33c39d1..8aaddc1d2fa1 100644
--- a/metadata/md5-cache/app-i18n/fcitx-sunpinyin-0.4.2
+++ b/metadata/md5-cache/app-i18n/fcitx-sunpinyin-0.4.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/sunpinyin-2.0.4_alpha:= virtual/libintl
 SLOT=4
 SRC_URI=https://download.fcitx-im.org/fcitx-sunpinyin/fcitx-sunpinyin-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6a90d03ce1977a5abc8ce47a99e58039
diff --git a/metadata/md5-cache/app-i18n/fcitx-sunpinyin-4.9999 b/metadata/md5-cache/app-i18n/fcitx-sunpinyin-4.9999
index 77573a2c313c..199b81d53d83 100644
--- a/metadata/md5-cache/app-i18n/fcitx-sunpinyin-4.9999
+++ b/metadata/md5-cache/app-i18n/fcitx-sunpinyin-4.9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-sunpinyin
 LICENSE=GPL-2+
 RDEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/sunpinyin-2.0.4_alpha:= virtual/libintl
 SLOT=4
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f04a35d5efe844b6b4233c1ad2bc5069
diff --git a/metadata/md5-cache/app-i18n/fcitx-table-extra-0.3.8 b/metadata/md5-cache/app-i18n/fcitx-table-extra-0.3.8
index f5e525035116..32786ef35842 100644
--- a/metadata/md5-cache/app-i18n/fcitx-table-extra-0.3.8
+++ b/metadata/md5-cache/app-i18n/fcitx-table-extra-0.3.8
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-i18n/fcitx-4.2.9:4[table]
 SLOT=4
 SRC_URI=https://download.fcitx-im.org/fcitx-table-extra/fcitx-table-extra-0.3.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7480f46b1c7009a91d71fee9d5da716a
diff --git a/metadata/md5-cache/app-i18n/fcitx-table-extra-4.9999 b/metadata/md5-cache/app-i18n/fcitx-table-extra-4.9999
index d3f09c94f31f..bb83a58ecdde 100644
--- a/metadata/md5-cache/app-i18n/fcitx-table-extra-4.9999
+++ b/metadata/md5-cache/app-i18n/fcitx-table-extra-4.9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-table-extra
 LICENSE=GPL-2+
 RDEPEND=>=app-i18n/fcitx-4.2.9:4[table]
 SLOT=4
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=aacad16e7f8ef8f47cfa18d715ed6151
diff --git a/metadata/md5-cache/app-i18n/fcitx-unikey-0.2.7 b/metadata/md5-cache/app-i18n/fcitx-unikey-0.2.7
index 318b1b99592d..2f2efcf4a148 100644
--- a/metadata/md5-cache/app-i18n/fcitx-unikey-0.2.7
+++ b/metadata/md5-cache/app-i18n/fcitx-unikey-0.2.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ GPL-3+ LGPL-2+
 RDEPEND=>=app-i18n/fcitx-4.2.9:4 virtual/libintl macro-editor? ( >=app-i18n/fcitx-qt5-1.1:4 >=dev-qt/qtcore-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtwidgets-5.7:5 )
 SLOT=4
 SRC_URI=https://download.fcitx-im.org/fcitx-unikey/fcitx-unikey-0.2.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=033aa5d6e4b2c9fe93aae6652f147385
diff --git a/metadata/md5-cache/app-i18n/fcitx-unikey-4.9999 b/metadata/md5-cache/app-i18n/fcitx-unikey-4.9999
index 42c8d03ed27e..99227ac8ecfd 100644
--- a/metadata/md5-cache/app-i18n/fcitx-unikey-4.9999
+++ b/metadata/md5-cache/app-i18n/fcitx-unikey-4.9999
@@ -7,5 +7,5 @@ IUSE=+macro-editor
 LICENSE=GPL-2+ GPL-3+ LGPL-2+
 RDEPEND=>=app-i18n/fcitx-4.2.9:4 virtual/libintl macro-editor? ( >=app-i18n/fcitx-qt5-1.1:4 >=dev-qt/qtcore-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtwidgets-5.7:5 )
 SLOT=4
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6482fea68c6acfed816a3e6a61b3e86e
diff --git a/metadata/md5-cache/app-i18n/ibus-1.5.12 b/metadata/md5-cache/app-i18n/ibus-1.5.12
index 3d74127c3986..d9d2463afeca 100644
--- a/metadata/md5-cache/app-i18n/ibus-1.5.12
+++ b/metadata/md5-cache/app-i18n/ibus-1.5.12
@@ -10,5 +10,5 @@ RDEPEND=app-text/iso-codes dev-libs/glib:2 gnome-base/dconf gnome-base/librsvg:2
 REQUIRED_USE=gtk2? ( gtk ) libnotify? ( gtk ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) introspection ) test? ( gtk ) vala? ( introspection )
 SLOT=0
 SRC_URI=https://github.com/ibus/ibus/releases/download/1.5.12/ibus-1.5.12.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=163b1d28bf6d5560b139400bfe662e7b
diff --git a/metadata/md5-cache/app-i18n/ibus-1.5.16 b/metadata/md5-cache/app-i18n/ibus-1.5.16
index 37177e45a31e..f7474a512711 100644
--- a/metadata/md5-cache/app-i18n/ibus-1.5.16
+++ b/metadata/md5-cache/app-i18n/ibus-1.5.16
@@ -10,5 +10,5 @@ RDEPEND=app-text/iso-codes dev-libs/glib:2 gnome-base/dconf gnome-base/librsvg:2
 REQUIRED_USE=emoji? ( gtk ) gtk2? ( gtk ) kde? ( gtk ) libnotify? ( gtk ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) introspection ) test? ( gtk ) vala? ( introspection )
 SLOT=0
 SRC_URI=https://github.com/ibus/ibus/releases/download/1.5.16/ibus-1.5.16.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4208fc869400e039d391fb6414d0d5df
diff --git a/metadata/md5-cache/app-i18n/ibus-1.5.18 b/metadata/md5-cache/app-i18n/ibus-1.5.18
index 45a1fe0402b5..dee2a0958b27 100644
--- a/metadata/md5-cache/app-i18n/ibus-1.5.18
+++ b/metadata/md5-cache/app-i18n/ibus-1.5.18
@@ -4,11 +4,11 @@ DESCRIPTION=Intelligent Input Bus for Linux / Unix OS
 EAPI=6
 HOMEPAGE=https://github.com/ibus/ibus/wiki
 IUSE=+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test +unicode vala wayland python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
-KEYWORDS=alpha amd64 ~arm ~arm64 ia64 ~ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=app-text/iso-codes dev-libs/glib:2 gnome-base/dconf gnome-base/librsvg:2 sys-apps/dbus[X?] X? ( x11-libs/libX11 !gtk? ( x11-libs/gtk+:2 ) ) gconf? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXi gtk2? ( x11-libs/gtk+:2 ) ) introspection? ( dev-libs/gobject-introspection ) kde? ( dev-qt/qtgui:5 ) libnotify? ( x11-libs/libnotify ) nls? ( virtual/libintl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) python? ( gtk? ( x11-libs/gtk+:3[introspection] ) )
 REQUIRED_USE=emoji? ( gtk ) gtk2? ( gtk ) kde? ( gtk ) libnotify? ( gtk ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) introspection ) test? ( gtk ) vala? ( introspection )
 SLOT=0
 SRC_URI=https://github.com/ibus/ibus/releases/download/1.5.18/ibus-1.5.18.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=e78b1070994dddc5dd9b0b25162e0df3
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f8611bae3fa6c2e55a5ea26524ae9277
diff --git a/metadata/md5-cache/app-i18n/ibus-1.5.19 b/metadata/md5-cache/app-i18n/ibus-1.5.19
index 5b15a8f07505..82b3e913d4ac 100644
--- a/metadata/md5-cache/app-i18n/ibus-1.5.19
+++ b/metadata/md5-cache/app-i18n/ibus-1.5.19
@@ -10,5 +10,5 @@ RDEPEND=app-text/iso-codes dev-libs/glib:2 gnome-base/dconf gnome-base/librsvg:2
 REQUIRED_USE=emoji? ( gtk ) gtk2? ( gtk ) kde? ( gtk ) libnotify? ( gtk ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) introspection ) test? ( gtk ) vala? ( introspection )
 SLOT=0
 SRC_URI=https://github.com/ibus/ibus/releases/download/1.5.19/ibus-1.5.19.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9d5ffb37d7af43bab6042e24ac8d00a3
diff --git a/metadata/md5-cache/app-i18n/ibus-anthy-1.5.10 b/metadata/md5-cache/app-i18n/ibus-anthy-1.5.10
index 921716b95ebc..a6c0fb7a6faa 100644
--- a/metadata/md5-cache/app-i18n/ibus-anthy-1.5.10
+++ b/metadata/md5-cache/app-i18n/ibus-anthy-1.5.10
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/ibus/ibus-anthy/releases/download/1.5.10/ibus-anthy-1.5.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5c75cf8878e70703df5f0975807d5338
diff --git a/metadata/md5-cache/app-i18n/ibus-anthy-1.5.9 b/metadata/md5-cache/app-i18n/ibus-anthy-1.5.9
index e9ee3948163d..eec448f4643e 100644
--- a/metadata/md5-cache/app-i18n/ibus-anthy-1.5.9
+++ b/metadata/md5-cache/app-i18n/ibus-anthy-1.5.9
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/ibus/ibus-anthy/releases/download/1.5.9/ibus-anthy-1.5.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=912873a493eecf8deaa4da292dc9534b
diff --git a/metadata/md5-cache/app-i18n/ibus-cangjie-2.4-r1 b/metadata/md5-cache/app-i18n/ibus-cangjie-2.4-r1
index 7f632a374bd3..1d4b16390b6a 100644
--- a/metadata/md5-cache/app-i18n/ibus-cangjie-2.4-r1
+++ b/metadata/md5-cache/app-i18n/ibus-cangjie-2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/Cangjians/ibus-cangjie/releases/download/v2.4/ibus-cangjie-2.4.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f6d4cfa4df0884f5b51098dce6491acf
diff --git a/metadata/md5-cache/app-i18n/ibus-chewing-1.5.1-r1 b/metadata/md5-cache/app-i18n/ibus-chewing-1.5.1-r1
index 8a9a39167f7c..da8576458e96 100644
--- a/metadata/md5-cache/app-i18n/ibus-chewing-1.5.1-r1
+++ b/metadata/md5-cache/app-i18n/ibus-chewing-1.5.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-i18n/ibus app-i18n/libchewing dev-libs/glib:2 dev-util/gob:2 x11-libs/gtk+:2 x11-libs/libX11 gconf? ( gnome-base/gconf ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=https://github.com/definite/ibus-chewing/releases/download/1.5.1/ibus-chewing-1.5.1-Source.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cbe1f0eaf10f86798da8e0d4d62a169b
diff --git a/metadata/md5-cache/app-i18n/ibus-chewing-1.6.1 b/metadata/md5-cache/app-i18n/ibus-chewing-1.6.1
index 25c89c5bb6cd..377280c5e4cc 100644
--- a/metadata/md5-cache/app-i18n/ibus-chewing-1.6.1
+++ b/metadata/md5-cache/app-i18n/ibus-chewing-1.6.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-i18n/ibus app-i18n/libchewing dev-libs/glib:2 dev-util/gob:2 x11-libs/gtk+:2 x11-libs/libX11 gconf? ( gnome-base/gconf ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=https://github.com/definite/ibus-chewing/archive/1.6.1.tar.gz -> ibus-chewing-1.6.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=857eb588962e6b88b327a808bf4a103b
diff --git a/metadata/md5-cache/app-i18n/ibus-hangul-1.5.0-r1 b/metadata/md5-cache/app-i18n/ibus-hangul-1.5.0-r1
index ca70647d7865..abbebece6238 100644
--- a/metadata/md5-cache/app-i18n/ibus-hangul-1.5.0-r1
+++ b/metadata/md5-cache/app-i18n/ibus-hangul-1.5.0-r1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/libhangul/ibus-hangul/releases/download/1.5.0/ibus-hangul-1.5.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=1aa0f622b2c68fd2ac34eef3caf63a57
diff --git a/metadata/md5-cache/app-i18n/ibus-hangul-1.5.1 b/metadata/md5-cache/app-i18n/ibus-hangul-1.5.1
index d457347be2cc..a1253232ee2a 100644
--- a/metadata/md5-cache/app-i18n/ibus-hangul-1.5.1
+++ b/metadata/md5-cache/app-i18n/ibus-hangul-1.5.1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/libhangul/ibus-hangul/releases/download/1.5.1/ibus-hangul-1.5.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=77d5620632257ab84307ddb754ba7f89
diff --git a/metadata/md5-cache/app-i18n/ibus-libpinyin-1.10.0 b/metadata/md5-cache/app-i18n/ibus-libpinyin-1.10.0
index f1e2a1fd4021..1d66d8d9dbc0 100644
--- a/metadata/md5-cache/app-i18n/ibus-libpinyin-1.10.0
+++ b/metadata/md5-cache/app-i18n/ibus-libpinyin-1.10.0
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite(
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/libpinyin/ibus-libpinyin/archive/1.10.0.tar.gz -> ibus-libpinyin-1.10.0.tar.gz boost? ( https://github.com/tsuna/boost.m4/raw/282b1e01f5bc5ae94347474fd8c35cb2f7a7e65d/build-aux/boost.m4 -> boost.282b1e01f5bc5ae94347474fd8c35cb2f7a7e65d.m4 )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=977b1ec5d1508f433d8cb0514ddefdcb
diff --git a/metadata/md5-cache/app-i18n/ibus-libpinyin-1.9.2 b/metadata/md5-cache/app-i18n/ibus-libpinyin-1.9.2
index a77ddcccee33..0285f27ac822 100644
--- a/metadata/md5-cache/app-i18n/ibus-libpinyin-1.9.2
+++ b/metadata/md5-cache/app-i18n/ibus-libpinyin-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite(
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/libpinyin/ibus-libpinyin/archive/1.9.2.tar.gz -> ibus-libpinyin-1.9.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bba3fd81208fd30939ea76ebfbc4c17b
diff --git a/metadata/md5-cache/app-i18n/ibus-table-chinese-1.8.2 b/metadata/md5-cache/app-i18n/ibus-table-chinese-1.8.2
index 4c1bfd79f8cf..4a3630510276 100644
--- a/metadata/md5-cache/app-i18n/ibus-table-chinese-1.8.2
+++ b/metadata/md5-cache/app-i18n/ibus-table-chinese-1.8.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=app-i18n/ibus-table
 SLOT=0
 SRC_URI=https://github.com/definite/ibus-table-chinese/archive/1.8.2.tar.gz -> ibus-table-chinese-1.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ff382bdd3974a4395184acbdefe79cd3
diff --git a/metadata/md5-cache/app-i18n/im-canna-0.3.2.2 b/metadata/md5-cache/app-i18n/im-canna-0.3.2.2
index d6600c7ef45c..f7292781f5f2 100644
--- a/metadata/md5-cache/app-i18n/im-canna-0.3.2.2
+++ b/metadata/md5-cache/app-i18n/im-canna-0.3.2.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-i18n/canna x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://bonobo.gnome.gr.jp/~nakai/immodule/im-canna-0.3.2.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7cfc7253da9e285ce1f722899adc802f
diff --git a/metadata/md5-cache/app-i18n/im-canna-0.3.2.2-r1 b/metadata/md5-cache/app-i18n/im-canna-0.3.2.2-r1
index af437d2e6b82..5a5e5c4dd9ea 100644
--- a/metadata/md5-cache/app-i18n/im-canna-0.3.2.2-r1
+++ b/metadata/md5-cache/app-i18n/im-canna-0.3.2.2-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-i18n/canna x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://bonobo.gnome.gr.jp/~nakai/immodule/im-canna-0.3.2.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=9a2992c882e96d839b8cd4377cda469b
diff --git a/metadata/md5-cache/app-i18n/im-freewnn-0.0.2-r2 b/metadata/md5-cache/app-i18n/im-freewnn-0.0.2-r2
index 0cb14cca71e1..e746f07fefd1 100644
--- a/metadata/md5-cache/app-i18n/im-freewnn-0.0.2-r2
+++ b/metadata/md5-cache/app-i18n/im-freewnn-0.0.2-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-i18n/freewnn x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://bonobo.gnome.gr.jp/~nakai/immodule/im-freewnn-0.0.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ece45dc0b4cb95e3b042b0aa511a4bdc
diff --git a/metadata/md5-cache/app-i18n/im-freewnn-0.0.2-r3 b/metadata/md5-cache/app-i18n/im-freewnn-0.0.2-r3
index 9e7a104af5f3..5ef3e1de8e23 100644
--- a/metadata/md5-cache/app-i18n/im-freewnn-0.0.2-r3
+++ b/metadata/md5-cache/app-i18n/im-freewnn-0.0.2-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-i18n/freewnn x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://bonobo.gnome.gr.jp/~nakai/immodule/im-freewnn-0.0.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8d5e529589872daf698c52071f8dd167
diff --git a/metadata/md5-cache/app-i18n/imhangul-2.1.0-r1 b/metadata/md5-cache/app-i18n/imhangul-2.1.0-r1
index fbe22e1ac108..73c9dc2873cf 100644
--- a/metadata/md5-cache/app-i18n/imhangul-2.1.0-r1
+++ b/metadata/md5-cache/app-i18n/imhangul-2.1.0-r1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=app-i18n/libhangul x11-libs/gtk+:2 virtual/libintl
 SLOT=0
 SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/imhangul/imhangul-2.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=02dc19f081a5b68c7d610d7ec30935fe
diff --git a/metadata/md5-cache/app-i18n/imhangul-2.1.1 b/metadata/md5-cache/app-i18n/imhangul-2.1.1
index 4c96ca38cdb6..a4dc081c5912 100644
--- a/metadata/md5-cache/app-i18n/imhangul-2.1.1
+++ b/metadata/md5-cache/app-i18n/imhangul-2.1.1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=app-i18n/libhangul x11-libs/gtk+:2 virtual/libintl
 SLOT=0
 SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/imhangul/imhangul-2.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=45e03343ffff8df52a4302a0a8e29eb2
diff --git a/metadata/md5-cache/app-i18n/imhangul-3.1.1 b/metadata/md5-cache/app-i18n/imhangul-3.1.1
index 8c2f345133ae..23d768d3c0b7 100644
--- a/metadata/md5-cache/app-i18n/imhangul-3.1.1
+++ b/metadata/md5-cache/app-i18n/imhangul-3.1.1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=app-i18n/libhangul x11-libs/gtk+:3 virtual/libintl
 SLOT=3
 SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/imhangul/imhangul-3.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a817075f01c1b0ae4065d13605f7c764
diff --git a/metadata/md5-cache/app-i18n/imsettings-1.7.2 b/metadata/md5-cache/app-i18n/imsettings-1.7.2
index 1cf1e919742d..15788fe6b9b7 100644
--- a/metadata/md5-cache/app-i18n/imsettings-1.7.2
+++ b/metadata/md5-cache/app-i18n/imsettings-1.7.2
@@ -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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=118ca0587cc40d0c02576ae25d099e81
diff --git a/metadata/md5-cache/app-i18n/kcm-fcitx-0.5.5 b/metadata/md5-cache/app-i18n/kcm-fcitx-0.5.5
index d848a6a7e9f5..8adc23824b7d 100644
--- a/metadata/md5-cache/app-i18n/kcm-fcitx-0.5.5
+++ b/metadata/md5-cache/app-i18n/kcm-fcitx-0.5.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/fcitx-qt5-1.1:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kitemviews:5 kde-frameworks/knewstuff:5 kde-frameworks/kwidgetsaddons:5 virtual/libintl x11-libs/libX11 x11-libs/libxkbfile !app-i18n/kcm-fcitx:4[-minimal(-)]
 SLOT=4-plasma5
 SRC_URI=https://download.fcitx-im.org/kcm-fcitx/kcm-fcitx-0.5.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6289fc09e49ed277a4e307d4b295e2f3
diff --git a/metadata/md5-cache/app-i18n/kcm-fcitx-4.5.9999 b/metadata/md5-cache/app-i18n/kcm-fcitx-4.5.9999
index 69359a67e863..dfd9b616de3c 100644
--- a/metadata/md5-cache/app-i18n/kcm-fcitx-4.5.9999
+++ b/metadata/md5-cache/app-i18n/kcm-fcitx-4.5.9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/kcm-fcitx
 LICENSE=GPL-2+
 RDEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/fcitx-qt5-1.1:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kitemviews:5 kde-frameworks/knewstuff:5 kde-frameworks/kwidgetsaddons:5 virtual/libintl x11-libs/libX11 x11-libs/libxkbfile !app-i18n/kcm-fcitx:4[-minimal(-)]
 SLOT=4-plasma5
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e868ac963a7548a474ef0c7fd0deda95
diff --git a/metadata/md5-cache/app-i18n/libkkc-0.3.5 b/metadata/md5-cache/app-i18n/libkkc-0.3.5
index 6e6ed19fd5e4..d35fc72be8bc 100644
--- a/metadata/md5-cache/app-i18n/libkkc-0.3.5
+++ b/metadata/md5-cache/app-i18n/libkkc-0.3.5
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libgee:0.8 dev-libs/marisa[python(+)] introspection? ( dev-libs/gobject-introspection ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=https://github.com/ueno/libkkc/releases/download/v0.3.5/libkkc-0.3.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e2bbbe45ca5b9dd5d947772d5792c78e
diff --git a/metadata/md5-cache/app-i18n/librime-1.2.9 b/metadata/md5-cache/app-i18n/librime-1.2.9
index 7e1178e34ecf..d3857c7a4d24 100644
--- a/metadata/md5-cache/app-i18n/librime-1.2.9
+++ b/metadata/md5-cache/app-i18n/librime-1.2.9
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=app-i18n/opencc:= dev-cpp/glog:= dev-cpp/yaml-cpp:= dev-libs/boost:=[threads] dev-libs/leveldb:= dev-libs/marisa:=
 SLOT=0/1
 SRC_URI=https://github.com/rime/librime/archive/rime-1.2.9.tar.gz -> librime-1.2.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cba78c938a56457b77e1b16a20334e80
diff --git a/metadata/md5-cache/app-i18n/librime-1.3.1 b/metadata/md5-cache/app-i18n/librime-1.3.1
index 973545059781..9ba05dd5223d 100644
--- a/metadata/md5-cache/app-i18n/librime-1.3.1
+++ b/metadata/md5-cache/app-i18n/librime-1.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=app-i18n/opencc:= dev-cpp/glog:= dev-cpp/yaml-cpp:= dev-libs/boost:=[threads] dev-libs/leveldb:= dev-libs/marisa:=
 SLOT=0/1
 SRC_URI=https://github.com/rime/librime/archive/1.3.1.tar.gz -> librime-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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=63fd6bc2b908148e374c4d328e27963e
diff --git a/metadata/md5-cache/app-i18n/nkf-2.1.3-r2 b/metadata/md5-cache/app-i18n/nkf-2.1.3-r2
index 1002a60cf95f..f372f3729398 100644
--- a/metadata/md5-cache/app-i18n/nkf-2.1.3-r2
+++ b/metadata/md5-cache/app-i18n/nkf-2.1.3-r2
@@ -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=mirror://sourceforge.jp/nkf/59912/nkf-2.1.3.tar.gz l10n_ja? ( https://dev.gentoo.org/~naota/files/nkf.1j ) python? ( https://dev.gentoo.org/~naota/files/NKF_python20090602.tgz )
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cf98bc3180373c529fd2b4f6664113b9
diff --git a/metadata/md5-cache/app-i18n/nkf-2.1.4 b/metadata/md5-cache/app-i18n/nkf-2.1.4
index 8fe3e2a58e64..b779a85d8528 100644
--- a/metadata/md5-cache/app-i18n/nkf-2.1.4
+++ b/metadata/md5-cache/app-i18n/nkf-2.1.4
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/nkf/64158/nkf-2.1.4.tar.gz python? ( https://github.com/fumiyas/python-nkf/archive/000915e115acac57a1fdbceb1e6361788af83a3d.tar.gz -> python-nkf-0.2.0_p20141211.tar.gz )
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d118cbd3b431331616ac520dac1afda3
diff --git a/metadata/md5-cache/app-i18n/opencc-1.0.5 b/metadata/md5-cache/app-i18n/opencc-1.0.5
index a586cb1b562c..6333390c7865 100644
--- a/metadata/md5-cache/app-i18n/opencc-1.0.5
+++ b/metadata/md5-cache/app-i18n/opencc-1.0.5
@@ -8,5 +8,5 @@ KEYWORDS=amd64 hppa ppc ppc64 x86
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/app-i18n/opencc-9999 b/metadata/md5-cache/app-i18n/opencc-9999
index c510329d28a3..d913cbbcc870 100644
--- a/metadata/md5-cache/app-i18n/opencc-9999
+++ b/metadata/md5-cache/app-i18n/opencc-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/BYVoid/OpenCC
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/app-i18n/poedit-2.0.9 b/metadata/md5-cache/app-i18n/poedit-2.0.9
index 1e9d69586831..6e17503eb48a 100644
--- a/metadata/md5-cache/app-i18n/poedit-2.0.9
+++ b/metadata/md5-cache/app-i18n/poedit-2.0.9
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=app-text/gtkspell:3 x11-libs/gtk+:3 >=dev-cpp/lucene++-3.0.5 dev-libs/boost:=[nls] dev-libs/icu:= >=x11-libs/wxGTK-3.0.3:3.0-gtk3[X]
 SLOT=0
 SRC_URI=https://github.com/vslavik/poedit/releases/download/v2.0.9-oss/poedit-2.0.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9f4977420237bb2a7d574abc4a263ef8
diff --git a/metadata/md5-cache/app-i18n/poedit-2.1.1 b/metadata/md5-cache/app-i18n/poedit-2.1.1
index 3ac51126405d..e98a3dd8518d 100644
--- a/metadata/md5-cache/app-i18n/poedit-2.1.1
+++ b/metadata/md5-cache/app-i18n/poedit-2.1.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=app-text/gtkspell:3 x11-libs/gtk+:3 >=dev-cpp/lucene++-3.0.5 >=dev-libs/pugixml-1.9 dev-libs/boost:=[nls] dev-libs/icu:= >=x11-libs/wxGTK-3.0.3:3.0-gtk3[X]
 SLOT=0
 SRC_URI=https://github.com/vslavik/poedit/releases/download/v2.1.1-oss/poedit-2.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b016c7edd5b8f9f9e29143f644b09ed1
diff --git a/metadata/md5-cache/app-i18n/pology-0.12 b/metadata/md5-cache/app-i18n/pology-0.12
index 830dac4eee1e..a25890afd3eb 100644
--- a/metadata/md5-cache/app-i18n/pology-0.12
+++ b/metadata/md5-cache/app-i18n/pology-0.12
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libxslt dev-libs/libxml2 dev-python/dbus-python[python_targets_
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://pology.nedohodnik.net//release/pology-0.12.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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_=9d3978f96a05d6c75c55d92adaa985b9
diff --git a/metadata/md5-cache/app-i18n/pology-9999 b/metadata/md5-cache/app-i18n/pology-9999
index 6dddef89923a..1cefb4c3f37a 100644
--- a/metadata/md5-cache/app-i18n/pology-9999
+++ b/metadata/md5-cache/app-i18n/pology-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/libxslt dev-libs/libxml2 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-devel/gettext python_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
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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	subversion	3d1eb4b41d7190570a84f786958ebb13	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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	subversion	3d1eb4b41d7190570a84f786958ebb13	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=efd598db3def9a4d768869fcbe7f9625
diff --git a/metadata/md5-cache/app-i18n/scim-1.4.17 b/metadata/md5-cache/app-i18n/scim-1.4.17
index b29c3f730a0e..8dc0b89b0bc1 100644
--- a/metadata/md5-cache/app-i18n/scim-1.4.17
+++ b/metadata/md5-cache/app-i18n/scim-1.4.17
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 dev-libs/glib:2 gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) >=dev-libs/atk-1 >=x11-libs/pango-1
 SLOT=0
 SRC_URI=mirror://sourceforge/scim/scim-1.4.17.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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=769262ee6bc610e1bc6b77dea84e6080
diff --git a/metadata/md5-cache/app-i18n/scim-1.4.18 b/metadata/md5-cache/app-i18n/scim-1.4.18
index 239724f92272..2d36f311ae14 100644
--- a/metadata/md5-cache/app-i18n/scim-1.4.18
+++ b/metadata/md5-cache/app-i18n/scim-1.4.18
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 dev-libs/glib:2 gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) >=dev-libs/atk-1 >=x11-libs/pango-1
 SLOT=0
 SRC_URI=https://github.com/scim-im/scim/archive/1.4.18.tar.gz -> scim-1.4.18.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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=82cebd5b79eb47e7e761f8fed4e44ebb
diff --git a/metadata/md5-cache/app-i18n/scim-bridge-0.4.16-r3 b/metadata/md5-cache/app-i18n/scim-bridge-0.4.16-r3
index 95d3907fd040..737b95b1926a 100644
--- a/metadata/md5-cache/app-i18n/scim-bridge-0.4.16-r3
+++ b/metadata/md5-cache/app-i18n/scim-bridge-0.4.16-r3
@@ -10,5 +10,5 @@ RDEPEND=>=app-i18n/scim-1.4.6 gtk? ( >=x11-libs/gtk+-2.2:2 >=x11-libs/pango-1.1
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/scim/scim-bridge-0.4.16.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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8132c09d4a4c0edb02a1ab3ce0adbf86
diff --git a/metadata/md5-cache/app-i18n/tagainijisho-1.2.0_pre20180610092832 b/metadata/md5-cache/app-i18n/tagainijisho-1.2.0_pre20180610092832
index 2bbb4357a631..1f56d1314a46 100644
--- a/metadata/md5-cache/app-i18n/tagainijisho-1.2.0_pre20180610092832
+++ b/metadata/md5-cache/app-i18n/tagainijisho-1.2.0_pre20180610092832
@@ -9,5 +9,5 @@ LICENSE=GPL-3+ public-domain
 RDEPEND=>=dev-db/sqlite-3.12:3 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://github.com/Gnurou/tagainijisho/archive/dde2ad85dc6dc47ac7862e728878a7c8d9d4faf6.tar.gz -> tagainijisho-1.2.0_pre20180610092832.tar.gz https://home.apache.org/~arfrever/distfiles/JMdict-2018-06-12.gz https://home.apache.org/~arfrever/distfiles/kanjidic2-2018-06-12.xml.gz https://github.com/KanjiVG/kanjivg/releases/download/r20160426/kanjivg-20160426.xml.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4cf57fd404a12047094fd49c3fcbf08e
diff --git a/metadata/md5-cache/app-i18n/tagainijisho-9999 b/metadata/md5-cache/app-i18n/tagainijisho-9999
index a0f4a1d63ab9..b47800deec69 100644
--- a/metadata/md5-cache/app-i18n/tagainijisho-9999
+++ b/metadata/md5-cache/app-i18n/tagainijisho-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ public-domain
 RDEPEND=>=dev-db/sqlite-3.12:3 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://github.com/KanjiVG/kanjivg/releases/download/r20160426/kanjivg-20160426.xml.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e89d99ed5b560b4b7298f55f1633ef47
diff --git a/metadata/md5-cache/app-i18n/transifex-client-0.10 b/metadata/md5-cache/app-i18n/transifex-client-0.10
index faf48348c8b8..dfb781ef9bff 100644
--- a/metadata/md5-cache/app-i18n/transifex-client-0.10
+++ b/metadata/md5-cache/app-i18n/transifex-client-0.10
@@ -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/transifex/transifex-client/archive/0.10.tar.gz -> transifex-client-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b720f5f364dd6ee5a6af760a0f3c844e
diff --git a/metadata/md5-cache/app-i18n/transifex-client-0.12.2 b/metadata/md5-cache/app-i18n/transifex-client-0.12.2
index abbbd64cb326..1b1406031cfc 100644
--- a/metadata/md5-cache/app-i18n/transifex-client-0.12.2
+++ b/metadata/md5-cache/app-i18n/transifex-client-0.12.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/urllib3[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/t/transifex-client/transifex-client-0.12.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=24f9995512dccd732924d9fa0b5d4477
diff --git a/metadata/md5-cache/app-i18n/transifex-client-0.12.4 b/metadata/md5-cache/app-i18n/transifex-client-0.12.4
index aa5fa5fd6258..80949f2413c0 100644
--- a/metadata/md5-cache/app-i18n/transifex-client-0.12.4
+++ b/metadata/md5-cache/app-i18n/transifex-client-0.12.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/t/transifex-client/transifex-client-0.12.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=36cbf7a2752b6e11f48077775cd8256b
diff --git a/metadata/md5-cache/app-i18n/uchardet-0.0.6-r2 b/metadata/md5-cache/app-i18n/uchardet-0.0.6-r2
index 7f16dc6dd2e6..78bb0f744a0e 100644
--- a/metadata/md5-cache/app-i18n/uchardet-0.0.6-r2
+++ b/metadata/md5-cache/app-i18n/uchardet-0.0.6-r2
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86
 LICENSE=|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/uchardet/releases/uchardet-0.0.6.tar.xz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=582c1d6cc2eccb2eca156e537191b671
diff --git a/metadata/md5-cache/app-i18n/uchardet-9999 b/metadata/md5-cache/app-i18n/uchardet-9999
index bf9435b99e32..f61bc5b8cfd0 100644
--- a/metadata/md5-cache/app-i18n/uchardet-9999
+++ b/metadata/md5-cache/app-i18n/uchardet-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://www.freedesktop.org/wiki/Software/uchardet/
 IUSE=cpu_flags_x86_sse2 static-libs test
 LICENSE=|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c94ee6c97c68c1477914943b3a71c5df
diff --git a/metadata/md5-cache/app-i18n/uim-1.8.6-r1 b/metadata/md5-cache/app-i18n/uim-1.8.6-r1
index 61bb3c6ce9bb..0320ffba5eef 100644
--- a/metadata/md5-cache/app-i18n/uim-1.8.6-r1
+++ b/metadata/md5-cache/app-i18n/uim-1.8.6-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=gtk? ( X ) gtk2? ( X ) xft? ( X )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/uim/uim/releases/download/uim-1.8.6/uim-1.8.6.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a38f896d9da9b88d845effb2e733fbfc
diff --git a/metadata/md5-cache/app-i18n/uim-1.8.6-r2 b/metadata/md5-cache/app-i18n/uim-1.8.6-r2
index 756a51eefbd7..437975e53d1d 100644
--- a/metadata/md5-cache/app-i18n/uim-1.8.6-r2
+++ b/metadata/md5-cache/app-i18n/uim-1.8.6-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=gtk? ( X ) gtk2? ( X ) xft? ( X )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/uim/uim/releases/download/uim-1.8.6/uim-1.8.6.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=76def567596f5ed6dc6b4239b39393ad
diff --git a/metadata/md5-cache/app-i18n/uim-1.8.8 b/metadata/md5-cache/app-i18n/uim-1.8.8
index d5eb4bafd8ab..20c0e5da5d0e 100644
--- a/metadata/md5-cache/app-i18n/uim-1.8.8
+++ b/metadata/md5-cache/app-i18n/uim-1.8.8
@@ -11,5 +11,5 @@ REQUIRED_USE=gtk? ( X ) gtk2? ( X ) qt5? ( X ) xft? ( X )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/uim/uim/releases/download/1.8.8/uim-1.8.8.tar.bz2
-_eclasses_=autotools	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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/app-i18n/unicode-cldr-33.0 b/metadata/md5-cache/app-i18n/unicode-cldr-33.0
index 0cfa31fd79d1..b876b0c71f0b 100644
--- a/metadata/md5-cache/app-i18n/unicode-cldr-33.0
+++ b/metadata/md5-cache/app-i18n/unicode-cldr-33.0
@@ -3,8 +3,8 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Unicode Common Locale Data Repository
 EAPI=6
 HOMEPAGE=http://cldr.unicode.org/
-KEYWORDS=alpha amd64 ~arm ~arm64 ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=unicode
 SLOT=0
 SRC_URI=https://unicode.org/Public/cldr/33/cldr-common-33.0.zip -> unicode-cldr-common-33.0.zip
-_md5_=1c8492c527ee1e117685225f87f5b95c
+_md5_=1021f53b84597562d0a6a3ae0e2450bd
diff --git a/metadata/md5-cache/app-i18n/unicode-emoji-11.0 b/metadata/md5-cache/app-i18n/unicode-emoji-11.0
index f0591dda1459..d68a9ed3dbdd 100644
--- a/metadata/md5-cache/app-i18n/unicode-emoji-11.0
+++ b/metadata/md5-cache/app-i18n/unicode-emoji-11.0
@@ -2,8 +2,8 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=UTS #51 Unicode Emoji
 EAPI=6
 HOMEPAGE=https://unicode.org/emoji/
-KEYWORDS=alpha amd64 ~arm ~arm64 ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=unicode
 SLOT=0
 SRC_URI=https://unicode.org/Public/emoji/11.0/emoji-data.txt -> unicode-emoji-data-11.0.txt https://unicode.org/Public/emoji/11.0/emoji-sequences.txt -> unicode-emoji-sequences-11.0.txt https://unicode.org/Public/emoji/11.0/emoji-test.txt -> unicode-emoji-test-11.0.txt https://unicode.org/Public/emoji/11.0/emoji-variation-sequences.txt -> unicode-emoji-variation-sequences-11.0.txt https://unicode.org/Public/emoji/11.0/emoji-zwj-sequences.txt -> unicode-emoji-zwj-sequences-11.0.txt
-_md5_=c752a8ac8f84ac9759db5d1273494df3
+_md5_=a7d730d5bf8b794e27f6eba3ec972b1b
diff --git a/metadata/md5-cache/app-laptop/Manifest.gz b/metadata/md5-cache/app-laptop/Manifest.gz
index afacf2ac1a00..dce86d27ec30 100644
--- a/metadata/md5-cache/app-laptop/Manifest.gz
+++ b/metadata/md5-cache/app-laptop/Manifest.gz
diff --git a/metadata/md5-cache/app-laptop/batti-0.3.8-r4 b/metadata/md5-cache/app-laptop/batti-0.3.8-r4
index 2f8f25ece4ef..aad28d48f463 100644
--- a/metadata/md5-cache/app-laptop/batti-0.3.8-r4
+++ b/metadata/md5-cache/app-laptop/batti-0.3.8-r4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://batti-gtk.googlecode.com/files/batti-0.3.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e5fe800cd2912d9afaa0d82e86b3e126
diff --git a/metadata/md5-cache/app-laptop/hdapsd-20141203 b/metadata/md5-cache/app-laptop/hdapsd-20141203
index 1a87a0a3c936..8ce19cca40f3 100644
--- a/metadata/md5-cache/app-laptop/hdapsd-20141203
+++ b/metadata/md5-cache/app-laptop/hdapsd-20141203
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=libconfig? ( dev-libs/libconfig )
 SLOT=0
 SRC_URI=https://github.com/evgeni/hdapsd/releases/download/20141203/hdapsd-20141203.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a60284b23589bb146d0a4dfd168096c4
diff --git a/metadata/md5-cache/app-laptop/mbpfan-1.9.1 b/metadata/md5-cache/app-laptop/mbpfan-1.9.1
index daa9418611de..555b4eced58d 100644
--- a/metadata/md5-cache/app-laptop/mbpfan-1.9.1
+++ b/metadata/md5-cache/app-laptop/mbpfan-1.9.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/dgraziotin/mbpfan/archive/v1.9.1.tar.gz -> mbpfan-1.9.1.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=44e1b9a8425610f190ad8864139c0c4b
diff --git a/metadata/md5-cache/app-laptop/mbpfan-2.0.0 b/metadata/md5-cache/app-laptop/mbpfan-2.0.0
index 012e17c7bbdd..b304e73895fa 100644
--- a/metadata/md5-cache/app-laptop/mbpfan-2.0.0
+++ b/metadata/md5-cache/app-laptop/mbpfan-2.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/dgraziotin/mbpfan/archive/v2.0.0.tar.gz -> mbpfan-2.0.0.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=6cc7951d6ba3224af9a9cfd92e4c6c97
diff --git a/metadata/md5-cache/app-laptop/mbpfan-2.0.1 b/metadata/md5-cache/app-laptop/mbpfan-2.0.1
index 4cc350df0ca5..e241efe040d8 100644
--- a/metadata/md5-cache/app-laptop/mbpfan-2.0.1
+++ b/metadata/md5-cache/app-laptop/mbpfan-2.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/dgraziotin/mbpfan/archive/v2.0.1.tar.gz -> mbpfan-2.0.1.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=a0d5a8cf8e0c71466837bd76a3c07693
diff --git a/metadata/md5-cache/app-laptop/mbpfan-2.1.0 b/metadata/md5-cache/app-laptop/mbpfan-2.1.0
index d5861f9e36f9..afed606b3919 100644
--- a/metadata/md5-cache/app-laptop/mbpfan-2.1.0
+++ b/metadata/md5-cache/app-laptop/mbpfan-2.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/dgraziotin/mbpfan/archive/v2.1.0.tar.gz -> mbpfan-2.1.0.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=de7dca4a10c96903fb73e2e69449aba6
diff --git a/metadata/md5-cache/app-laptop/mbpfan-9999 b/metadata/md5-cache/app-laptop/mbpfan-9999
index 648b85b4aed2..0de16fe95aed 100644
--- a/metadata/md5-cache/app-laptop/mbpfan-9999
+++ b/metadata/md5-cache/app-laptop/mbpfan-9999
@@ -7,5 +7,5 @@ IUSE=kernel_linux
 LICENSE=GPL-3+
 RESTRICT=test
 SLOT=0
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=a0d5a8cf8e0c71466837bd76a3c07693
diff --git a/metadata/md5-cache/app-laptop/nvidiabl-0.83 b/metadata/md5-cache/app-laptop/nvidiabl-0.83
index a795b36d82ac..31a72d0e23d4 100644
--- a/metadata/md5-cache/app-laptop/nvidiabl-0.83
+++ b/metadata/md5-cache/app-laptop/nvidiabl-0.83
@@ -10,5 +10,5 @@ RDEPEND=kernel_linux? ( virtual/modutils )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/guillaumezin/nvidiabl/archive/v0.83.tar.gz -> nvidiabl-0.83.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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_=a08935f81e897db5c7d6a2c3592dfbaf
diff --git a/metadata/md5-cache/app-laptop/nvidiabl-0.87 b/metadata/md5-cache/app-laptop/nvidiabl-0.87
index 871af0ed2881..5068136217c0 100644
--- a/metadata/md5-cache/app-laptop/nvidiabl-0.87
+++ b/metadata/md5-cache/app-laptop/nvidiabl-0.87
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://github.com/guillaumezin/nvidiabl/archive/v0.87.tar.gz -> nvidiabl-0.87.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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_=d7383141872533c28a028b9b5b15ee8d
diff --git a/metadata/md5-cache/app-laptop/pommed-1.39-r1 b/metadata/md5-cache/app-laptop/pommed-1.39-r1
index 26dbf0f1cdc1..83c987074047 100644
--- a/metadata/md5-cache/app-laptop/pommed-1.39-r1
+++ b/metadata/md5-cache/app-laptop/pommed-1.39-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/alsa-lib x86? ( sys-apps/pciutils ) amd64? ( sys-apps/pciutils ) dev-libs/confuse >=sys-apps/dbus-1.1 dev-libs/dbus-glib sys-libs/zlib media-libs/audiofile gtk? ( x11-libs/gtk+:2 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXpm ) media-sound/alsa-utils virtual/eject
 SLOT=0
 SRC_URI=http://alioth.debian.org/frs/download.php/3583/pommed-1.39.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1995755252f1db45c17208d41fc41138
diff --git a/metadata/md5-cache/app-laptop/thinkfan-0.9.3 b/metadata/md5-cache/app-laptop/thinkfan-0.9.3
index b1b2c2f1d224..af89451177ef 100644
--- a/metadata/md5-cache/app-laptop/thinkfan-0.9.3
+++ b/metadata/md5-cache/app-laptop/thinkfan-0.9.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=atasmart? ( dev-libs/libatasmart )
 SLOT=0
 SRC_URI=mirror://sourceforge/thinkfan/thinkfan-0.9.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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c4a48e349cc8591588e4945c68d93c1e
diff --git a/metadata/md5-cache/app-laptop/tp_smapi-0.42-r1 b/metadata/md5-cache/app-laptop/tp_smapi-0.42-r1
index aa362d8c16e9..3e499357d164 100644
--- a/metadata/md5-cache/app-laptop/tp_smapi-0.42-r1
+++ b/metadata/md5-cache/app-laptop/tp_smapi-0.42-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/dmidecode kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://github.com/evgeni/tp_smapi/releases/download/tp-smapi/0.42/tp_smapi-0.42.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6134569d57a9e55d27ce14003f91f0b0
diff --git a/metadata/md5-cache/app-laptop/tp_smapi-0.43 b/metadata/md5-cache/app-laptop/tp_smapi-0.43
index c2683bc2b195..aab57bc14bf9 100644
--- a/metadata/md5-cache/app-laptop/tp_smapi-0.43
+++ b/metadata/md5-cache/app-laptop/tp_smapi-0.43
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/dmidecode kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://github.com/evgeni/tp_smapi/releases/download/tp-smapi/0.43/tp_smapi-0.43.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=afce0f0e14218e4aad80fde497c798c9
diff --git a/metadata/md5-cache/app-laptop/tpb-0.6.4-r1 b/metadata/md5-cache/app-laptop/tpb-0.6.4-r1
index 6d6718999af7..992d8308fc45 100644
--- a/metadata/md5-cache/app-laptop/tpb-0.6.4-r1
+++ b/metadata/md5-cache/app-laptop/tpb-0.6.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libXt x11-libs/libXext xosd? ( >=x11-libs/xosd-2.2.0 )
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/tpb/tpb-0.6.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a3f76a90131031f7f3a7c408ba96bb43
diff --git a/metadata/md5-cache/app-leechcraft/Manifest.gz b/metadata/md5-cache/app-leechcraft/Manifest.gz
index 6cbf06c14e6e..786d34c60256 100644
--- a/metadata/md5-cache/app-leechcraft/Manifest.gz
+++ b/metadata/md5-cache/app-leechcraft/Manifest.gz
diff --git a/metadata/md5-cache/app-leechcraft/laretz-9999 b/metadata/md5-cache/app-leechcraft/laretz-9999
index 9acfe2ffa6f7..097e7bf59895 100644
--- a/metadata/md5-cache/app-leechcraft/laretz-9999
+++ b/metadata/md5-cache/app-leechcraft/laretz-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://leechcraft.org
 LICENSE=Boost-1.0
 RDEPEND=dev-libs/boost ~app-leechcraft/liblaretz-9999 dev-db/mongodb
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e7289d2ff17b669edbff11f0320f9137
diff --git a/metadata/md5-cache/app-leechcraft/lc-advancednotifications-9999 b/metadata/md5-cache/app-leechcraft/lc-advancednotifications-9999
index 8e35f9dd38a8..acf9ed0aadce 100644
--- a/metadata/md5-cache/app-leechcraft/lc-advancednotifications-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-advancednotifications-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdeclarative:5
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d5713a45a47553272c1097fa9ccd607d
diff --git a/metadata/md5-cache/app-leechcraft/lc-aggregator-9999 b/metadata/md5-cache/app-leechcraft/lc-aggregator-9999
index 083202f6d2d1..87dba054df70 100644
--- a/metadata/md5-cache/app-leechcraft/lc-aggregator-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-aggregator-9999
@@ -8,5 +8,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999[postgres?,sqlite?] dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5[sqlite?,postgres?,mysql?] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 virtual/leechcraft-downloader-http
 REQUIRED_USE=|| ( mysql sqlite postgres )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fb97e85b82e9848f884d8ec2fda5d785
diff --git a/metadata/md5-cache/app-leechcraft/lc-anhero-9999 b/metadata/md5-cache/app-leechcraft/lc-anhero-9999
index 0adf52a6bc52..a96b03f838ac 100644
--- a/metadata/md5-cache/app-leechcraft/lc-anhero-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-anhero-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 sys-devel/gdb
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b6c79094d3e0dce173528caea8101248
diff --git a/metadata/md5-cache/app-leechcraft/lc-auscrie-9999 b/metadata/md5-cache/app-leechcraft/lc-auscrie-9999
index 4cf26318fab5..93abdcb5948a 100644
--- a/metadata/md5-cache/app-leechcraft/lc-auscrie-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-auscrie-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d162e6b3d716632f540c4f44530f536a
diff --git a/metadata/md5-cache/app-leechcraft/lc-azoth-9999 b/metadata/md5-cache/app-leechcraft/lc-azoth-9999
index bea572dc1722..54e7ffd797e0 100644
--- a/metadata/md5-cache/app-leechcraft/lc-azoth-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-azoth-9999
@@ -8,5 +8,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdbus:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtxml:5 astrality? ( net-libs/telepathy-qt[qt5(+)] ) autoidler? ( dev-qt/qtx11extras:5 x11-libs/libXScrnSaver ) crypt? ( app-crypt/qca:2[qt5(+)] ) lastseen? ( dev-qt/qtconcurrent:5 ) media? ( dev-qt/qtmultimedia:5 ) otroid? ( dev-qt/qtconcurrent:5 net-libs/libotr ) sarin? ( dev-qt/qtconcurrent:5 net-libs/tox ) woodpecker? ( dev-libs/kqoauth ) xmpp? ( >=net-libs/qxmpp-0.9.3-r1 media? ( net-libs/qxmpp[speex] ) ) xtazy? ( ~app-leechcraft/lc-xtazy-9999 ) astrality? ( net-im/telepathy-mission-control net-voip/telepathy-haze ) crypt? ( app-crypt/qca:2[gpg] ) latex? ( virtual/imagemagick-tools virtual/latex-base ) spell? ( ~app-leechcraft/lc-rosenthal-9999 )
 REQUIRED_USE=|| ( standardstyles adiumstyles )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4b91907938a333c58b3f6f07c789c4ad
diff --git a/metadata/md5-cache/app-leechcraft/lc-bittorrent-9999 b/metadata/md5-cache/app-leechcraft/lc-bittorrent-9999
index 6b99dc25ade5..6a961b0f2234 100644
--- a/metadata/md5-cache/app-leechcraft/lc-bittorrent-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-bittorrent-9999
@@ -7,5 +7,5 @@ IUSE=debug geoip
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 net-libs/libtorrent-rasterbar dev-qt/qtxml:5 dev-qt/qtwidgets:5 virtual/leechcraft-task-show geoip? ( dev-libs/geoip )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=58eacc5efbd7375c07eac882027bf651
diff --git a/metadata/md5-cache/app-leechcraft/lc-blasq-9999 b/metadata/md5-cache/app-leechcraft/lc-blasq-9999
index 68bcc8ec8041..4a3bae700f77 100644
--- a/metadata/md5-cache/app-leechcraft/lc-blasq-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-blasq-9999
@@ -7,5 +7,5 @@ IUSE=debug +deathnote +rappor +spegnersi +vangog
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdeclarative:5 rappor? ( dev-qt/qtxml:5 ) deathnote? ( dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 ) spegnersi? ( dev-libs/kqoauth dev-qt/qtxml:5 ) vangog? ( dev-qt/qtxml:5 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cb61dc4268226622e5b102144d5f50cd
diff --git a/metadata/md5-cache/app-leechcraft/lc-blogique-9999 b/metadata/md5-cache/app-leechcraft/lc-blogique-9999
index 4c08df9dc909..3aec3ea75986 100644
--- a/metadata/md5-cache/app-leechcraft/lc-blogique-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-blogique-9999
@@ -7,5 +7,5 @@ IUSE=debug +metida +hestia
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtxml:5 dev-qt/qtprintsupport:5 dev-qt/qtdeclarative:5 metida? ( dev-qt/qtnetwork:5 dev-qt/qtxmlpatterns:5 ) virtual/leechcraft-wysiwyg-editor
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d768715382d49d7e038d059e01db022d
diff --git a/metadata/md5-cache/app-leechcraft/lc-certmgr-9999 b/metadata/md5-cache/app-leechcraft/lc-certmgr-9999
index 9fbe4e5dac8c..e2d5b57ec7e9 100644
--- a/metadata/md5-cache/app-leechcraft/lc-certmgr-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-certmgr-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=df335d92d5ea39309b31607e7330b8ee
diff --git a/metadata/md5-cache/app-leechcraft/lc-core-9999 b/metadata/md5-cache/app-leechcraft/lc-core-9999
index 4371e0186a47..63ef9a6f9d20 100644
--- a/metadata/md5-cache/app-leechcraft/lc-core-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-core-9999
@@ -8,5 +8,5 @@ LICENSE=Boost-1.0
 RDEPEND=>=dev-libs/boost-1.62 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 dev-qt/qtdeclarative:5 dev-qt/qtscript:5 dev-qt/qtsql:5[postgres?,sqlite?] dev-qt/qtdbus:5 dev-qt/qtwebkit:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtconcurrent:5 dev-qt/linguist-tools:5 qwt? ( x11-libs/qwt:6 ) dev-qt/qtsvg:5 || ( kde-frameworks/oxygen-icons x11-themes/kfaenza )
 REQUIRED_USE=|| ( postgres sqlite )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=56dce148af3c091a45825d1fdad596cc
diff --git a/metadata/md5-cache/app-leechcraft/lc-cpuload-9999 b/metadata/md5-cache/app-leechcraft/lc-cpuload-9999
index 62649c2e0ee9..b5c003a46ca0 100644
--- a/metadata/md5-cache/app-leechcraft/lc-cpuload-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-cpuload-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdeclarative:5 virtual/leechcraft-quark-sideprovider
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=341839aff32d8fd13e6238f9bde41bc0
diff --git a/metadata/md5-cache/app-leechcraft/lc-cstp-9999 b/metadata/md5-cache/app-leechcraft/lc-cstp-9999
index 1ce431052f2c..503bb04e3603 100644
--- a/metadata/md5-cache/app-leechcraft/lc-cstp-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-cstp-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 virtual/leechcraft-task-show
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=491c390a4a38cbd4bffd27abae952deb
diff --git a/metadata/md5-cache/app-leechcraft/lc-dbusmanager-9999 b/metadata/md5-cache/app-leechcraft/lc-dbusmanager-9999
index 9a32cc6dacfd..09b0dc0c16fa 100644
--- a/metadata/md5-cache/app-leechcraft/lc-dbusmanager-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-dbusmanager-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdbus:5
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9c1b6f5b66d9c6050651edb579a4fce1
diff --git a/metadata/md5-cache/app-leechcraft/lc-deadlyrics-9999 b/metadata/md5-cache/app-leechcraft/lc-deadlyrics-9999
index 73e82d29fd96..4e0cca2878ac 100644
--- a/metadata/md5-cache/app-leechcraft/lc-deadlyrics-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-deadlyrics-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtxml:5 virtual/leechcraft-search-show virtual/leechcraft-downloader-http
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=273f13fa74d72d57ad3bf342c0c79adc
diff --git a/metadata/md5-cache/app-leechcraft/lc-devmon-9999 b/metadata/md5-cache/app-leechcraft/lc-devmon-9999
index ac9f5bc894ac..8a70118b571b 100644
--- a/metadata/md5-cache/app-leechcraft/lc-devmon-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-devmon-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 virtual/udev
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8766902f9963e8f97cb7ecfaf50c883d
diff --git a/metadata/md5-cache/app-leechcraft/lc-dolozhee-9999 b/metadata/md5-cache/app-leechcraft/lc-dolozhee-9999
index 9d92be8d63d7..532e83c62233 100644
--- a/metadata/md5-cache/app-leechcraft/lc-dolozhee-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-dolozhee-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4edd8d620c7c8050162efd5dbe021ed3
diff --git a/metadata/md5-cache/app-leechcraft/lc-eleeminator-9999 b/metadata/md5-cache/app-leechcraft/lc-eleeminator-9999
index 13b1aab4671b..a22f3bc00d2b 100644
--- a/metadata/md5-cache/app-leechcraft/lc-eleeminator-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-eleeminator-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtwidgets:5 x11-libs/qtermwidget
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=06289c7ed963f3a293c6175bb5b6dc49
diff --git a/metadata/md5-cache/app-leechcraft/lc-fenet-9999 b/metadata/md5-cache/app-leechcraft/lc-fenet-9999
index fe1d830a65fe..049762f92cd7 100644
--- a/metadata/md5-cache/app-leechcraft/lc-fenet-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-fenet-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtwidgets:5
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a95334231a85264e36b85bd0c73fee0e
diff --git a/metadata/md5-cache/app-leechcraft/lc-gacts-9999 b/metadata/md5-cache/app-leechcraft/lc-gacts-9999
index ceae6cc750ff..d9f6d315425c 100644
--- a/metadata/md5-cache/app-leechcraft/lc-gacts-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-gacts-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d4e7feed1cc9b252fe2711d6063de450
diff --git a/metadata/md5-cache/app-leechcraft/lc-glance-9999 b/metadata/md5-cache/app-leechcraft/lc-glance-9999
index 2983cbc8b6ee..8119e748f947 100644
--- a/metadata/md5-cache/app-leechcraft/lc-glance-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-glance-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtwidgets:5
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=41011e77cc6e5a76a3715c7a519a9913
diff --git a/metadata/md5-cache/app-leechcraft/lc-gmailnotifier-9999 b/metadata/md5-cache/app-leechcraft/lc-gmailnotifier-9999
index e38c5a327eca..d91a2ffc2eef 100644
--- a/metadata/md5-cache/app-leechcraft/lc-gmailnotifier-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-gmailnotifier-9999
@@ -7,5 +7,5 @@ IUSE=debug notify quark
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtxml:5 quark? ( ~virtual/leechcraft-quark-sideprovider-9999 ) notify? ( ~virtual/leechcraft-notifier-9999 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c778b1b0f8b41190f22697b38b7d3515
diff --git a/metadata/md5-cache/app-leechcraft/lc-historyholder-9999 b/metadata/md5-cache/app-leechcraft/lc-historyholder-9999
index 710655f98d51..b705b406cbfa 100644
--- a/metadata/md5-cache/app-leechcraft/lc-historyholder-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-historyholder-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtsql:5[sqlite] ~virtual/leechcraft-search-show-9999
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3a61160d363e0a2c3764dc07b034f1e7
diff --git a/metadata/md5-cache/app-leechcraft/lc-hotsensors-9999 b/metadata/md5-cache/app-leechcraft/lc-hotsensors-9999
index 0ed7e688bd69..58708cb39d4a 100644
--- a/metadata/md5-cache/app-leechcraft/lc-hotsensors-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-hotsensors-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-3
 RDEPEND=~app-leechcraft/lc-core-9999[qwt] sys-apps/lm_sensors dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtdeclarative:5[widgets] ~virtual/leechcraft-quark-sideprovider-9999
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e2264fc2a5a2f8086f6093d5f1cb13ca
diff --git a/metadata/md5-cache/app-leechcraft/lc-hotstreams-9999 b/metadata/md5-cache/app-leechcraft/lc-hotstreams-9999
index e1c2a92765f8..96ef6d1551aa 100644
--- a/metadata/md5-cache/app-leechcraft/lc-hotstreams-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-hotstreams-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtxml:5
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=680f343917beaac6a0a878592a684f5b
diff --git a/metadata/md5-cache/app-leechcraft/lc-htthare-9999 b/metadata/md5-cache/app-leechcraft/lc-htthare-9999
index 6a9996167c3c..58f8b6e9dfc6 100644
--- a/metadata/md5-cache/app-leechcraft/lc-htthare-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-htthare-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtnetwork:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e86881166a41e6a72cfd0f4f0f80ab04
diff --git a/metadata/md5-cache/app-leechcraft/lc-imgaste-9999 b/metadata/md5-cache/app-leechcraft/lc-imgaste-9999
index 22032eee452b..2b0b802c2cdf 100644
--- a/metadata/md5-cache/app-leechcraft/lc-imgaste-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-imgaste-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=269c3f1dc898733bededac7fb79e7099
diff --git a/metadata/md5-cache/app-leechcraft/lc-intermutko-9999 b/metadata/md5-cache/app-leechcraft/lc-intermutko-9999
index c996fb8ccdb6..a88b3e835397 100644
--- a/metadata/md5-cache/app-leechcraft/lc-intermutko-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-intermutko-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=72647f8c31783374322641aac4132465
diff --git a/metadata/md5-cache/app-leechcraft/lc-kbswitch-9999 b/metadata/md5-cache/app-leechcraft/lc-kbswitch-9999
index 99bfaf6d7c57..cd3e3517caa3 100644
--- a/metadata/md5-cache/app-leechcraft/lc-kbswitch-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-kbswitch-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtdeclarative:5[widgets] x11-apps/setxkbmap
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=36f9d2450b6b191c99a49f2d1debdde4
diff --git a/metadata/md5-cache/app-leechcraft/lc-kinotify-9999 b/metadata/md5-cache/app-leechcraft/lc-kinotify-9999
index 9182d1a5ccd1..47aa63879d6f 100644
--- a/metadata/md5-cache/app-leechcraft/lc-kinotify-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-kinotify-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtnetwork:5 dev-qt/qtwebkit:5
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=72223f59791c63fc52743995df775754
diff --git a/metadata/md5-cache/app-leechcraft/lc-knowhow-9999 b/metadata/md5-cache/app-leechcraft/lc-knowhow-9999
index faf9f9413506..bd43ccdeb992 100644
--- a/metadata/md5-cache/app-leechcraft/lc-knowhow-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-knowhow-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8ee0f43298334a81da85635e53e84961
diff --git a/metadata/md5-cache/app-leechcraft/lc-krigstask-9999 b/metadata/md5-cache/app-leechcraft/lc-krigstask-9999
index 379fc5bd740c..312a2595a0f3 100644
--- a/metadata/md5-cache/app-leechcraft/lc-krigstask-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-krigstask-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 x11-libs/libXcomposite dev-qt/qtwidgets:5 dev-qt/qtdeclarative:5 ~virtual/leechcraft-quark-sideprovider-9999
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=09adb0e86f3a53acd15725f7006614c5
diff --git a/metadata/md5-cache/app-leechcraft/lc-lackman-9999 b/metadata/md5-cache/app-leechcraft/lc-lackman-9999
index 7ed69e6eef38..d3d04d9e69a8 100644
--- a/metadata/md5-cache/app-leechcraft/lc-lackman-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-lackman-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtsql:5[sqlite] dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 ~virtual/leechcraft-downloader-http-9999
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=94aadcf00e6c2847f0c5334c140704c3
diff --git a/metadata/md5-cache/app-leechcraft/lc-lastfmscrobble-9999 b/metadata/md5-cache/app-leechcraft/lc-lastfmscrobble-9999
index 8e7570dd2334..8fcc20853e6f 100644
--- a/metadata/md5-cache/app-leechcraft/lc-lastfmscrobble-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-lastfmscrobble-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 media-libs/liblastfm[qt5(+)] dev-qt/qtnetwork:5 dev-qt/qtwidgets:5
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=572c79784309a8e838d5b3349a95d823
diff --git a/metadata/md5-cache/app-leechcraft/lc-laughty-9999 b/metadata/md5-cache/app-leechcraft/lc-laughty-9999
index 07f737798c13..e884c95880b9 100644
--- a/metadata/md5-cache/app-leechcraft/lc-laughty-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-laughty-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtnetwork:5 dev-qt/qtgui:5 dev-qt/qtdbus:5 ~virtual/leechcraft-notifier-9999
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=40ecf59bfb04d1c6817277231313076a
diff --git a/metadata/md5-cache/app-leechcraft/lc-launchy-9999 b/metadata/md5-cache/app-leechcraft/lc-launchy-9999
index c8aff72a8c4c..a164560e5def 100644
--- a/metadata/md5-cache/app-leechcraft/lc-launchy-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-launchy-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtnetwork:5 dev-qt/qtgui:5 dev-qt/qtdeclarative:5[widgets] ~virtual/leechcraft-trayarea-9999
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3ccca78fbf65953978478417fdf63b63
diff --git a/metadata/md5-cache/app-leechcraft/lc-lemon-9999 b/metadata/md5-cache/app-leechcraft/lc-lemon-9999
index 393b77e1f7be..280a59d741fa 100644
--- a/metadata/md5-cache/app-leechcraft/lc-lemon-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-lemon-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 x11-libs/qwt:6[qt5] dev-libs/libnl:3 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtdeclarative:5[widgets] ~virtual/leechcraft-quark-sideprovider-9999
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fb9a6fdaa6ef25f01ff10be97384d8a1
diff --git a/metadata/md5-cache/app-leechcraft/lc-lhtr-9999 b/metadata/md5-cache/app-leechcraft/lc-lhtr-9999
index 0373cb06e1fd..92e877cfbafa 100644
--- a/metadata/md5-cache/app-leechcraft/lc-lhtr-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-lhtr-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 app-text/tidy-html5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtwebkit:5
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fc5020058954ebec513426cb7549d1d9
diff --git a/metadata/md5-cache/app-leechcraft/lc-liznoo-9999 b/metadata/md5-cache/app-leechcraft/lc-liznoo-9999
index 1d7d88b549ff..3ccadbc58341 100644
--- a/metadata/md5-cache/app-leechcraft/lc-liznoo-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-liznoo-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 x11-libs/qwt:6 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtdbus:5 dev-qt/qtconcurrent:5 ~virtual/leechcraft-trayarea-9999 || ( sys-power/upower sys-power/upower-pm-utils )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=57c7493b84588b7f7a32eaf59ae1674d
diff --git a/metadata/md5-cache/app-leechcraft/lc-lmp-9999 b/metadata/md5-cache/app-leechcraft/lc-lmp-9999
index 5d275b8e3d3f..8cd40ad2338a 100644
--- a/metadata/md5-cache/app-leechcraft/lc-lmp-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-lmp-9999
@@ -7,5 +7,5 @@ IUSE=debug +fradj +graffiti +mpris +mtp +mp3tunes potorchu
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtconcurrent:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/gstreamer:1.0 media-libs/taglib mpris? ( dev-qt/qtdbus:5 ) mtp? ( media-libs/libmtp ) potorchu? ( media-libs/libprojectm ) graffiti? ( media-libs/flac ) mtp? ( ~app-leechcraft/lc-devmon-9999 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a2ee3e9734cff61e0e40740fb001c133
diff --git a/metadata/md5-cache/app-leechcraft/lc-mellonetray-9999 b/metadata/md5-cache/app-leechcraft/lc-mellonetray-9999
index 908b5b19b7b5..a23bebc3bfaa 100644
--- a/metadata/md5-cache/app-leechcraft/lc-mellonetray-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-mellonetray-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtdeclarative:5 dev-qt/qtx11extras:5 x11-libs/libXdamage x11-libs/libXrender ~virtual/leechcraft-quark-sideprovider-9999
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6d13ae2c5ce181e354f37699ebf8006c
diff --git a/metadata/md5-cache/app-leechcraft/lc-monocle-9999 b/metadata/md5-cache/app-leechcraft/lc-monocle-9999
index 31276d331ce1..7617eaa1386d 100644
--- a/metadata/md5-cache/app-leechcraft/lc-monocle-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-monocle-9999
@@ -8,5 +8,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtprintsupport:5 dev-qt/qtxml:5 pdf? ( app-text/poppler[qt5] ) djvu? ( app-text/djvu ) postscript? ( app-text/ghostscript-gpl )
 REQUIRED_USE=postscript? ( pdf )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d96c0553549d06ba2d0d252f2cba3df0
diff --git a/metadata/md5-cache/app-leechcraft/lc-musiczombie-9999 b/metadata/md5-cache/app-leechcraft/lc-musiczombie-9999
index be92213363b1..d1b6fee4c2e0 100644
--- a/metadata/md5-cache/app-leechcraft/lc-musiczombie-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-musiczombie-9999
@@ -7,5 +7,5 @@ IUSE=debug acoustid
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 acoustid? ( media-libs/chromaprint )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bab49ab7662e6a93cd90ba0c0e40295a
diff --git a/metadata/md5-cache/app-leechcraft/lc-nacheku-9999 b/metadata/md5-cache/app-leechcraft/lc-nacheku-9999
index 3c0d3e7a3df4..be31aad8b828 100644
--- a/metadata/md5-cache/app-leechcraft/lc-nacheku-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-nacheku-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtwidgets:5
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0d727bd41d5a1bb79ee29b3f3f61bc23
diff --git a/metadata/md5-cache/app-leechcraft/lc-netstoremanager-9999 b/metadata/md5-cache/app-leechcraft/lc-netstoremanager-9999
index 20ac99a0bbbb..465e3b7441f8 100644
--- a/metadata/md5-cache/app-leechcraft/lc-netstoremanager-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-netstoremanager-9999
@@ -7,5 +7,5 @@ IUSE=+dropbox +googledrive
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=94e7eeed8f0c46720e16f2f431523077
diff --git a/metadata/md5-cache/app-leechcraft/lc-networkmonitor-9999 b/metadata/md5-cache/app-leechcraft/lc-networkmonitor-9999
index 37527c6cf471..349c6570c7c7 100644
--- a/metadata/md5-cache/app-leechcraft/lc-networkmonitor-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-networkmonitor-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=df67fa0fae10fedbb8f9dffef029008b
diff --git a/metadata/md5-cache/app-leechcraft/lc-newlife-9999 b/metadata/md5-cache/app-leechcraft/lc-newlife-9999
index cb8255b450b1..0cf344b117aa 100644
--- a/metadata/md5-cache/app-leechcraft/lc-newlife-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-newlife-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtsql:5[sqlite]
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a29301a1a8478614f3eb534f6091fb4b
diff --git a/metadata/md5-cache/app-leechcraft/lc-ooronee-9999 b/metadata/md5-cache/app-leechcraft/lc-ooronee-9999
index 27e69063d5de..b284d6795659 100644
--- a/metadata/md5-cache/app-leechcraft/lc-ooronee-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-ooronee-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtdeclarative:5 ~virtual/leechcraft-quark-sideprovider-9999
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0b2e8750450266102279ea8e519f6e91
diff --git a/metadata/md5-cache/app-leechcraft/lc-otlozhu-9999 b/metadata/md5-cache/app-leechcraft/lc-otlozhu-9999
index a4fd5b1162d1..60c6b5acebb5 100644
--- a/metadata/md5-cache/app-leechcraft/lc-otlozhu-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-otlozhu-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c04c9aee04f242c0942990a4a905a52e
diff --git a/metadata/md5-cache/app-leechcraft/lc-pintab-9999 b/metadata/md5-cache/app-leechcraft/lc-pintab-9999
index 4a1113710fbc..fbf13ff5b887 100644
--- a/metadata/md5-cache/app-leechcraft/lc-pintab-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-pintab-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtwidgets:5
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9e8fa959d0da0f5c64b0d1bf02378f41
diff --git a/metadata/md5-cache/app-leechcraft/lc-pogooglue-9999 b/metadata/md5-cache/app-leechcraft/lc-pogooglue-9999
index 19ca44c983d6..f0af9bbc3266 100644
--- a/metadata/md5-cache/app-leechcraft/lc-pogooglue-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-pogooglue-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtnetwork:5
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b18bc7c93338bf85420408c0c4ebc0b8
diff --git a/metadata/md5-cache/app-leechcraft/lc-popishu-9999 b/metadata/md5-cache/app-leechcraft/lc-popishu-9999
index b52c4e610a09..1d9dc48b2680 100644
--- a/metadata/md5-cache/app-leechcraft/lc-popishu-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-popishu-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 x11-libs/qscintilla[qt5(+)]
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8581c56bfd15bd97ff1a8c567ca49fc9
diff --git a/metadata/md5-cache/app-leechcraft/lc-poshuku-9999 b/metadata/md5-cache/app-leechcraft/lc-poshuku-9999
index e0a69cb19adf..e7e70bdb347c 100644
--- a/metadata/md5-cache/app-leechcraft/lc-poshuku-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-poshuku-9999
@@ -8,5 +8,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999[postgres?,sqlite?] dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 dev-qt/qtprintsupport:5 cleanweb? ( dev-qt/qtconcurrent:5 ) idn? ( net-dns/libidn ) qrd? ( media-gfx/qrencode ) webkit? ( dev-qt/qtwebkit:5 ) webengine? ( dev-qt/qtwebengine:5 ) virtual/leechcraft-downloader-http
 REQUIRED_USE=|| ( postgres sqlite ) || ( webkit webengine )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3a437612b29188e896cd22be51a43c6e
diff --git a/metadata/md5-cache/app-leechcraft/lc-qrosp-9999 b/metadata/md5-cache/app-leechcraft/lc-qrosp-9999
index 7c790d106dc9..e11b177bd2e9 100644
--- a/metadata/md5-cache/app-leechcraft/lc-qrosp-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-qrosp-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 >=dev-libs/qrosscore-0.3.2
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=85f7334b36265df0b9efd1c85e11aa19
diff --git a/metadata/md5-cache/app-leechcraft/lc-rosenthal-9999 b/metadata/md5-cache/app-leechcraft/lc-rosenthal-9999
index 9703f3e13395..af0d2903059c 100644
--- a/metadata/md5-cache/app-leechcraft/lc-rosenthal-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-rosenthal-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtgui:5 app-text/hunspell
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7efffd8e4d42459759e812eb374fb0a7
diff --git a/metadata/md5-cache/app-leechcraft/lc-sb2-9999 b/metadata/md5-cache/app-leechcraft/lc-sb2-9999
index c85430633308..c8afe18fa9b8 100644
--- a/metadata/md5-cache/app-leechcraft/lc-sb2-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-sb2-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtdeclarative:5[widgets]
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f76bc5d02c451e2baa2660abe556f293
diff --git a/metadata/md5-cache/app-leechcraft/lc-scroblibre-9999 b/metadata/md5-cache/app-leechcraft/lc-scroblibre-9999
index 688f78f5d5e9..54218f14ea86 100644
--- a/metadata/md5-cache/app-leechcraft/lc-scroblibre-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-scroblibre-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2f890e4355066a69c67fa7633a79e1c7
diff --git a/metadata/md5-cache/app-leechcraft/lc-secman-9999 b/metadata/md5-cache/app-leechcraft/lc-secman-9999
index b0d39cf3f097..f52903487bfa 100644
--- a/metadata/md5-cache/app-leechcraft/lc-secman-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-secman-9999
@@ -7,5 +7,5 @@ IUSE=debug crypt exposecontents
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 crypt? ( dev-libs/openssl:0 ) dev-qt/qtwidgets:5
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d531e0f9fc16a356301c9d80b00a158b
diff --git a/metadata/md5-cache/app-leechcraft/lc-seekthru-9999 b/metadata/md5-cache/app-leechcraft/lc-seekthru-9999
index eceb784ef9e2..b02cf6c1927e 100644
--- a/metadata/md5-cache/app-leechcraft/lc-seekthru-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-seekthru-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ~virtual/leechcraft-search-show-9999 ~virtual/leechcraft-downloader-http-9999
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a324fd76772953077814a713618e0a3e
diff --git a/metadata/md5-cache/app-leechcraft/lc-summary-9999 b/metadata/md5-cache/app-leechcraft/lc-summary-9999
index 39d65e5a93db..17770537f9f0 100644
--- a/metadata/md5-cache/app-leechcraft/lc-summary-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-summary-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtwidgets:5
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f04061282ceec4c49083e71b93d203f8
diff --git a/metadata/md5-cache/app-leechcraft/lc-sysnotify-9999 b/metadata/md5-cache/app-leechcraft/lc-sysnotify-9999
index f7aa9efa65b6..9fd89c57b9b2 100644
--- a/metadata/md5-cache/app-leechcraft/lc-sysnotify-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-sysnotify-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtgui:5 dev-qt/qtdbus:5
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6f5fdf6c0f8a371567e7efad143355d9
diff --git a/metadata/md5-cache/app-leechcraft/lc-tabsessmanager-9999 b/metadata/md5-cache/app-leechcraft/lc-tabsessmanager-9999
index 86c2284bbf5f..5b9276bddf6b 100644
--- a/metadata/md5-cache/app-leechcraft/lc-tabsessmanager-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-tabsessmanager-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtwidgets:5
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fa564e24990c6d87efd60f70f6d38154
diff --git a/metadata/md5-cache/app-leechcraft/lc-tabslist-9999 b/metadata/md5-cache/app-leechcraft/lc-tabslist-9999
index a004a337f8c5..76325f4e15bb 100644
--- a/metadata/md5-cache/app-leechcraft/lc-tabslist-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-tabslist-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtwidgets:5
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ccbcfed2105c1bbe75acf37459b863e9
diff --git a/metadata/md5-cache/app-leechcraft/lc-touchstreams-9999 b/metadata/md5-cache/app-leechcraft/lc-touchstreams-9999
index 59ac9d71b3e0..630f58543604 100644
--- a/metadata/md5-cache/app-leechcraft/lc-touchstreams-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-touchstreams-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtconcurrent:5
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8155c7aaedd5f48f15efd4c8a9a58d80
diff --git a/metadata/md5-cache/app-leechcraft/lc-tpi-9999 b/metadata/md5-cache/app-leechcraft/lc-tpi-9999
index 80412fa72129..989f6a0e19d5 100644
--- a/metadata/md5-cache/app-leechcraft/lc-tpi-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-tpi-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtgui:5 ~virtual/leechcraft-quark-sideprovider-9999
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6db5877fe027de6e77c2e4e7b1decbdb
diff --git a/metadata/md5-cache/app-leechcraft/lc-vgrabber-9999 b/metadata/md5-cache/app-leechcraft/lc-vgrabber-9999
index 1afb0c81cb4d..5ea55bc97175 100644
--- a/metadata/md5-cache/app-leechcraft/lc-vgrabber-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-vgrabber-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 virtual/leechcraft-downloader-http
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f48f6bdeaad6a286d9fda5b329f88229
diff --git a/metadata/md5-cache/app-leechcraft/lc-vrooby-9999 b/metadata/md5-cache/app-leechcraft/lc-vrooby-9999
index 608fd395803c..729ea0e9bd08 100644
--- a/metadata/md5-cache/app-leechcraft/lc-vrooby-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-vrooby-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtwidgets:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] sys-fs/udisks:2
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d768449845d03799d0ab6b6c275be694
diff --git a/metadata/md5-cache/app-leechcraft/lc-xproxy-9999 b/metadata/md5-cache/app-leechcraft/lc-xproxy-9999
index 2ec69cfb2dcc..7bfdc5edb11b 100644
--- a/metadata/md5-cache/app-leechcraft/lc-xproxy-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-xproxy-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0193d52d9d209713aae41998e02159dc
diff --git a/metadata/md5-cache/app-leechcraft/lc-xtazy-9999 b/metadata/md5-cache/app-leechcraft/lc-xtazy-9999
index b078abafed21..f2955f0ad45c 100644
--- a/metadata/md5-cache/app-leechcraft/lc-xtazy-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-xtazy-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdbus:5
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	leechcraft	af4ad66b94e1c7e5787849e91f37f538	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cec84ec3c33c58bae119dcf31f03163a
diff --git a/metadata/md5-cache/app-leechcraft/lcpackgen-1.3.1 b/metadata/md5-cache/app-leechcraft/lcpackgen-1.3.1
index bf9b7c543dab..5e1ba7ecbf14 100644
--- a/metadata/md5-cache/app-leechcraft/lcpackgen-1.3.1
+++ b/metadata/md5-cache/app-leechcraft/lcpackgen-1.3.1
@@ -8,5 +8,5 @@ LICENSE=Boost-1.0
 RDEPEND=dev-libs/boost dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 dev-qt/qtsvg:5
 SLOT=0
 SRC_URI=https://github.com/0xd34df00d/lcpackgen/archive/1.3.1.tar.gz -> lcpackgen-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3b25d71850eb7c1f399d2373073b02b2
diff --git a/metadata/md5-cache/app-leechcraft/liblaretz-0.1.0 b/metadata/md5-cache/app-leechcraft/liblaretz-0.1.0
index b08dff131c87..c6b43a8df055 100644
--- a/metadata/md5-cache/app-leechcraft/liblaretz-0.1.0
+++ b/metadata/md5-cache/app-leechcraft/liblaretz-0.1.0
@@ -8,5 +8,5 @@ LICENSE=Boost-1.0
 RDEPEND=dev-libs/boost
 SLOT=0
 SRC_URI=https://github.com/0xd34df00d/laretz/archive/0.1.0.tar.gz -> liblaretz-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0bb8a795738b3b0e024b56486d5631cc
diff --git a/metadata/md5-cache/app-leechcraft/liblaretz-9999 b/metadata/md5-cache/app-leechcraft/liblaretz-9999
index 1b4afdccb787..3d276076eaf6 100644
--- a/metadata/md5-cache/app-leechcraft/liblaretz-9999
+++ b/metadata/md5-cache/app-leechcraft/liblaretz-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://leechcraft.org
 LICENSE=Boost-1.0
 RDEPEND=dev-libs/boost
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c2774956a8b5736fb109ba9a3f038862
diff --git a/metadata/md5-cache/app-metrics/Manifest.gz b/metadata/md5-cache/app-metrics/Manifest.gz
index 3f9001823561..644e402d2524 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/buildbot-prometheus-17.7.2-r2 b/metadata/md5-cache/app-metrics/buildbot-prometheus-17.7.2-r2
index c61a429d5b0f..29782bfbe7f4 100644
--- a/metadata/md5-cache/app-metrics/buildbot-prometheus-17.7.2-r2
+++ b/metadata/md5-cache/app-metrics/buildbot-prometheus-17.7.2-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/prometheus_client[python_targets_python2_7(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/claws/buildbot-prometheus/archive/17.7.2.tar.gz -> buildbot-prometheus-17.7.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=06b7caef6227c9fc8f83190884ba88c5
diff --git a/metadata/md5-cache/app-metrics/collectd-5.8.0-r1 b/metadata/md5-cache/app-metrics/collectd-5.8.0-r1
index bb5cc3ee141b..8078a7a81a76 100644
--- a/metadata/md5-cache/app-metrics/collectd-5.8.0-r1
+++ b/metadata/md5-cache/app-metrics/collectd-5.8.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=dev-libs/libgcrypt:= dev-libs/libltdl:0= perl? ( dev-lang/perl:=[ithreads] ) udev? ( virtual/udev ) xfs? ( sys-fs/xfsprogs ) collectd_plugins_amqp? ( net-libs/rabbitmq-c ) collectd_plugins_apache? ( net-misc/curl:0= ) collectd_plugins_ascent? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_bind? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_ceph? ( dev-libs/yajl:= ) collectd_plugins_curl? ( net-misc/curl:0= ) collectd_plugins_curl_json? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_curl_xml? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_dbi? ( dev-db/libdbi ) collectd_plugins_dns? ( net-libs/libpcap ) collectd_plugins_gmond? ( sys-cluster/ganglia ) collectd_plugins_gps? ( sci-geosciences/gpsd:= ) collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13:0= ) collectd_plugins_log_logstash? ( dev-libs/yajl:= ) collectd_plugins_lua? ( dev-lang/lua:0= ) collectd_plugins_lvm? ( sys-fs/lvm2 ) collectd_plugins_memcachec? ( dev-libs/libmemcached ) collectd_plugins_modbus? ( dev-libs/libmodbus ) collectd_plugins_mqtt? ( app-misc/mosquitto ) collectd_plugins_mysql? ( virtual/libmysqlclient:= ) collectd_plugins_netlink? ( net-libs/libmnl ) collectd_plugins_nginx? ( net-misc/curl:0= ) collectd_plugins_notify_desktop? ( x11-libs/libnotify ) collectd_plugins_notify_email? ( net-libs/libesmtp ) collectd_plugins_nut? ( >=sys-power/nut-2.7.2-r2 ) collectd_plugins_openldap? ( net-nds/openldap ) collectd_plugins_onewire? ( >=sys-fs/owfs-3.1:= ) collectd_plugins_oracle? ( dev-db/oracle-instantclient-basic ) collectd_plugins_ovs_events? ( dev-libs/yajl:= ) collectd_plugins_ovs_stats? ( dev-libs/yajl:= ) collectd_plugins_perl? ( dev-lang/perl:=[ithreads] ) collectd_plugins_ping? ( net-libs/liboping ) collectd_plugins_postgresql? ( dev-db/postgresql:= ) collectd_plugins_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(+)?] ) collectd_plugins_redis? ( dev-libs/hiredis:= ) collectd_plugins_routeros? ( net-libs/librouteros ) collectd_plugins_rrdcached? ( net-analyzer/rrdtool:= ) collectd_plugins_rrdtool? ( net-analyzer/rrdtool:= ) collectd_plugins_sensors? ( sys-apps/lm_sensors ) collectd_plugins_sigrok? ( <sci-libs/libsigrok-0.4:= dev-libs/glib:2 ) collectd_plugins_smart? ( dev-libs/libatasmart ) collectd_plugins_snmp? ( net-analyzer/net-snmp ) collectd_plugins_snmp_agent? ( net-analyzer/net-snmp ) collectd_plugins_tokyotyrant? ( net-misc/tokyotyrant ) collectd_plugins_varnish? ( www-servers/varnish ) collectd_plugins_virt? ( app-emulation/libvirt:= dev-libs/libxml2:2= ) collectd_plugins_write_http? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_write_kafka? ( >=dev-libs/librdkafka-0.9.0.99:= dev-libs/yajl:= ) collectd_plugins_write_mongodb? ( >=dev-libs/mongo-c-driver-1.8.2:= ) collectd_plugins_write_prometheus? ( >=dev-libs/protobuf-c-1.2.1-r1:= net-libs/libmicrohttpd:= ) collectd_plugins_write_redis? ( dev-libs/hiredis:= ) collectd_plugins_xencpu? ( app-emulation/xen-tools:= ) kernel_FreeBSD? ( collectd_plugins_disk? ( sys-libs/libstatgrab:= ) collectd_plugins_interface? ( sys-libs/libstatgrab:= ) collectd_plugins_load? ( sys-libs/libstatgrab:= ) collectd_plugins_memory? ( sys-libs/libstatgrab:= ) collectd_plugins_swap? ( sys-libs/libstatgrab:= ) collectd_plugins_users? ( sys-libs/libstatgrab:= ) ) collectd_plugins_iptables? ( || ( <=sys-kernel/linux-headers-4.4 >=sys-kernel/linux-headers-4.6 ) ) collectd_plugins_java? ( >=virtual/jdk-1.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 filecaps? ( sys-libs/libcap ) collectd_plugins_java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DEPEND=dev-libs/libgcrypt:= dev-libs/libltdl:0= perl? ( dev-lang/perl:=[ithreads] ) udev? ( virtual/udev ) xfs? ( sys-fs/xfsprogs ) collectd_plugins_amqp? ( net-libs/rabbitmq-c ) collectd_plugins_apache? ( net-misc/curl:0= ) collectd_plugins_ascent? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_bind? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_ceph? ( dev-libs/yajl:= ) collectd_plugins_curl? ( net-misc/curl:0= ) collectd_plugins_curl_json? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_curl_xml? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_dbi? ( dev-db/libdbi ) collectd_plugins_dns? ( net-libs/libpcap ) collectd_plugins_gmond? ( sys-cluster/ganglia ) collectd_plugins_gps? ( sci-geosciences/gpsd:= ) collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13:0= ) collectd_plugins_log_logstash? ( dev-libs/yajl:= ) collectd_plugins_lua? ( dev-lang/lua:0= ) collectd_plugins_lvm? ( sys-fs/lvm2 ) collectd_plugins_memcachec? ( dev-libs/libmemcached ) collectd_plugins_modbus? ( dev-libs/libmodbus ) collectd_plugins_mqtt? ( app-misc/mosquitto ) collectd_plugins_mysql? ( virtual/libmysqlclient:= ) collectd_plugins_netlink? ( net-libs/libmnl ) collectd_plugins_nginx? ( net-misc/curl:0= ) collectd_plugins_notify_desktop? ( x11-libs/libnotify ) collectd_plugins_notify_email? ( net-libs/libesmtp ) collectd_plugins_nut? ( >=sys-power/nut-2.7.2-r2 ) collectd_plugins_openldap? ( net-nds/openldap ) collectd_plugins_onewire? ( >=sys-fs/owfs-3.1:= ) collectd_plugins_oracle? ( dev-db/oracle-instantclient-basic ) collectd_plugins_ovs_events? ( dev-libs/yajl:= ) collectd_plugins_ovs_stats? ( dev-libs/yajl:= ) collectd_plugins_perl? ( dev-lang/perl:=[ithreads] ) collectd_plugins_ping? ( net-libs/liboping ) collectd_plugins_postgresql? ( dev-db/postgresql:= ) collectd_plugins_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(+)?] ) collectd_plugins_redis? ( dev-libs/hiredis:= ) collectd_plugins_routeros? ( net-libs/librouteros ) collectd_plugins_rrdcached? ( net-analyzer/rrdtool:= ) collectd_plugins_rrdtool? ( net-analyzer/rrdtool:= ) collectd_plugins_sensors? ( sys-apps/lm_sensors ) collectd_plugins_sigrok? ( <sci-libs/libsigrok-0.4:= dev-libs/glib:2 ) collectd_plugins_smart? ( dev-libs/libatasmart ) collectd_plugins_snmp? ( net-analyzer/net-snmp ) collectd_plugins_snmp_agent? ( net-analyzer/net-snmp ) collectd_plugins_tokyotyrant? ( net-misc/tokyotyrant ) collectd_plugins_varnish? ( www-servers/varnish:= ) collectd_plugins_virt? ( app-emulation/libvirt:= dev-libs/libxml2:2= ) collectd_plugins_write_http? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_write_kafka? ( >=dev-libs/librdkafka-0.9.0.99:= dev-libs/yajl:= ) collectd_plugins_write_mongodb? ( >=dev-libs/mongo-c-driver-1.8.2:= ) collectd_plugins_write_prometheus? ( >=dev-libs/protobuf-c-1.2.1-r1:= net-libs/libmicrohttpd:= ) collectd_plugins_write_redis? ( dev-libs/hiredis:= ) collectd_plugins_xencpu? ( app-emulation/xen-tools:= ) kernel_FreeBSD? ( collectd_plugins_disk? ( sys-libs/libstatgrab:= ) collectd_plugins_interface? ( sys-libs/libstatgrab:= ) collectd_plugins_load? ( sys-libs/libstatgrab:= ) collectd_plugins_memory? ( sys-libs/libstatgrab:= ) collectd_plugins_swap? ( sys-libs/libstatgrab:= ) collectd_plugins_users? ( sys-libs/libstatgrab:= ) ) collectd_plugins_iptables? ( || ( <=sys-kernel/linux-headers-4.4 >=sys-kernel/linux-headers-4.6 ) ) collectd_plugins_java? ( >=virtual/jdk-1.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 filecaps? ( sys-libs/libcap ) collectd_plugins_java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
 DESCRIPTION=Collects system statistics and provides mechanisms to store the values
 EAPI=6
 HOMEPAGE=https://collectd.org/
 IUSE=contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux static-libs udev xfs collectd_plugins_aggregation collectd_plugins_amqp collectd_plugins_apache collectd_plugins_apcups collectd_plugins_ascent collectd_plugins_battery collectd_plugins_bind collectd_plugins_ceph collectd_plugins_cgroups collectd_plugins_chrony collectd_plugins_conntrack collectd_plugins_contextswitch collectd_plugins_cpu collectd_plugins_cpufreq collectd_plugins_cpusleep collectd_plugins_csv collectd_plugins_curl collectd_plugins_curl_json collectd_plugins_curl_xml collectd_plugins_dbi collectd_plugins_df collectd_plugins_disk collectd_plugins_dns collectd_plugins_drbd collectd_plugins_email collectd_plugins_entropy collectd_plugins_ethstat collectd_plugins_exec collectd_plugins_fhcount collectd_plugins_filecount collectd_plugins_fscache collectd_plugins_gmond collectd_plugins_gps collectd_plugins_hddtemp collectd_plugins_hugepages collectd_plugins_interface collectd_plugins_ipc collectd_plugins_ipmi collectd_plugins_iptables collectd_plugins_ipvs collectd_plugins_irq collectd_plugins_java collectd_plugins_lua collectd_plugins_load collectd_plugins_logfile collectd_plugins_log_logstash collectd_plugins_lvm collectd_plugins_madwifi collectd_plugins_match_empty_counter collectd_plugins_match_hashed collectd_plugins_match_regex collectd_plugins_match_timediff collectd_plugins_match_value collectd_plugins_mbmon collectd_plugins_mcelog collectd_plugins_md collectd_plugins_memcachec collectd_plugins_memcached collectd_plugins_memory collectd_plugins_modbus collectd_plugins_mqtt collectd_plugins_multimeter collectd_plugins_mysql collectd_plugins_netlink collectd_plugins_network collectd_plugins_network collectd_plugins_nfs collectd_plugins_nginx collectd_plugins_notify_desktop collectd_plugins_notify_email collectd_plugins_notify_nagios collectd_plugins_ntpd collectd_plugins_numa collectd_plugins_nut collectd_plugins_olsrd collectd_plugins_onewire collectd_plugins_openldap collectd_plugins_openvpn collectd_plugins_oracle collectd_plugins_ovs_events collectd_plugins_ovs_stats collectd_plugins_perl collectd_plugins_ping collectd_plugins_postgresql collectd_plugins_powerdns collectd_plugins_processes collectd_plugins_protocols collectd_plugins_python collectd_plugins_python collectd_plugins_redis collectd_plugins_routeros collectd_plugins_rrdcached collectd_plugins_rrdtool collectd_plugins_sensors collectd_plugins_serial collectd_plugins_sigrok collectd_plugins_smart collectd_plugins_snmp collectd_plugins_snmp_agent collectd_plugins_statsd collectd_plugins_swap collectd_plugins_syslog collectd_plugins_table collectd_plugins_tail collectd_plugins_tail_csv collectd_plugins_target_notification collectd_plugins_target_replace collectd_plugins_target_scale collectd_plugins_target_set collectd_plugins_tcpconns collectd_plugins_teamspeak2 collectd_plugins_ted collectd_plugins_thermal collectd_plugins_threshold collectd_plugins_tokyotyrant collectd_plugins_turbostat collectd_plugins_unixsock collectd_plugins_uptime collectd_plugins_users collectd_plugins_uuid collectd_plugins_varnish collectd_plugins_virt collectd_plugins_vmem collectd_plugins_vserver collectd_plugins_wireless collectd_plugins_write_graphite collectd_plugins_write_http collectd_plugins_write_kafka collectd_plugins_write_log collectd_plugins_write_mongodb collectd_plugins_write_prometheus collectd_plugins_write_redis collectd_plugins_write_sensu collectd_plugins_write_tsdb collectd_plugins_xencpu collectd_plugins_zfs_arc collectd_plugins_zookeeper +filecaps elibc_FreeBSD collectd_plugins_java 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 x86
 LICENSE=MIT GPL-2 GPL-2+ GPL-3 GPL-3+
-RDEPEND=dev-libs/libgcrypt:= dev-libs/libltdl:0= perl? ( dev-lang/perl:=[ithreads] ) udev? ( virtual/udev ) xfs? ( sys-fs/xfsprogs ) collectd_plugins_amqp? ( net-libs/rabbitmq-c ) collectd_plugins_apache? ( net-misc/curl:0= ) collectd_plugins_ascent? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_bind? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_ceph? ( dev-libs/yajl:= ) collectd_plugins_curl? ( net-misc/curl:0= ) collectd_plugins_curl_json? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_curl_xml? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_dbi? ( dev-db/libdbi ) collectd_plugins_dns? ( net-libs/libpcap ) collectd_plugins_gmond? ( sys-cluster/ganglia ) collectd_plugins_gps? ( sci-geosciences/gpsd:= ) collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13:0= ) collectd_plugins_log_logstash? ( dev-libs/yajl:= ) collectd_plugins_lua? ( dev-lang/lua:0= ) collectd_plugins_lvm? ( sys-fs/lvm2 ) collectd_plugins_memcachec? ( dev-libs/libmemcached ) collectd_plugins_modbus? ( dev-libs/libmodbus ) collectd_plugins_mqtt? ( app-misc/mosquitto ) collectd_plugins_mysql? ( virtual/libmysqlclient:= ) collectd_plugins_netlink? ( net-libs/libmnl ) collectd_plugins_nginx? ( net-misc/curl:0= ) collectd_plugins_notify_desktop? ( x11-libs/libnotify ) collectd_plugins_notify_email? ( net-libs/libesmtp ) collectd_plugins_nut? ( >=sys-power/nut-2.7.2-r2 ) collectd_plugins_openldap? ( net-nds/openldap ) collectd_plugins_onewire? ( >=sys-fs/owfs-3.1:= ) collectd_plugins_oracle? ( dev-db/oracle-instantclient-basic ) collectd_plugins_ovs_events? ( dev-libs/yajl:= ) collectd_plugins_ovs_stats? ( dev-libs/yajl:= ) collectd_plugins_perl? ( dev-lang/perl:=[ithreads] ) collectd_plugins_ping? ( net-libs/liboping ) collectd_plugins_postgresql? ( dev-db/postgresql:= ) collectd_plugins_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(+)?] ) collectd_plugins_redis? ( dev-libs/hiredis:= ) collectd_plugins_routeros? ( net-libs/librouteros ) collectd_plugins_rrdcached? ( net-analyzer/rrdtool:= ) collectd_plugins_rrdtool? ( net-analyzer/rrdtool:= ) collectd_plugins_sensors? ( sys-apps/lm_sensors ) collectd_plugins_sigrok? ( <sci-libs/libsigrok-0.4:= dev-libs/glib:2 ) collectd_plugins_smart? ( dev-libs/libatasmart ) collectd_plugins_snmp? ( net-analyzer/net-snmp ) collectd_plugins_snmp_agent? ( net-analyzer/net-snmp ) collectd_plugins_tokyotyrant? ( net-misc/tokyotyrant ) collectd_plugins_varnish? ( www-servers/varnish ) collectd_plugins_virt? ( app-emulation/libvirt:= dev-libs/libxml2:2= ) collectd_plugins_write_http? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_write_kafka? ( >=dev-libs/librdkafka-0.9.0.99:= dev-libs/yajl:= ) collectd_plugins_write_mongodb? ( >=dev-libs/mongo-c-driver-1.8.2:= ) collectd_plugins_write_prometheus? ( >=dev-libs/protobuf-c-1.2.1-r1:= net-libs/libmicrohttpd:= ) collectd_plugins_write_redis? ( dev-libs/hiredis:= ) collectd_plugins_xencpu? ( app-emulation/xen-tools:= ) kernel_FreeBSD? ( collectd_plugins_disk? ( sys-libs/libstatgrab:= ) collectd_plugins_interface? ( sys-libs/libstatgrab:= ) collectd_plugins_load? ( sys-libs/libstatgrab:= ) collectd_plugins_memory? ( sys-libs/libstatgrab:= ) collectd_plugins_swap? ( sys-libs/libstatgrab:= ) collectd_plugins_users? ( sys-libs/libstatgrab:= ) ) collectd_plugins_java? ( >=virtual/jre-1.6 ) collectd_plugins_syslog? ( virtual/logger ) selinux? ( sec-policy/selinux-collectd ) !<sys-apps/openrc-0.18.2 collectd_plugins_java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+RDEPEND=dev-libs/libgcrypt:= dev-libs/libltdl:0= perl? ( dev-lang/perl:=[ithreads] ) udev? ( virtual/udev ) xfs? ( sys-fs/xfsprogs ) collectd_plugins_amqp? ( net-libs/rabbitmq-c ) collectd_plugins_apache? ( net-misc/curl:0= ) collectd_plugins_ascent? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_bind? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_ceph? ( dev-libs/yajl:= ) collectd_plugins_curl? ( net-misc/curl:0= ) collectd_plugins_curl_json? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_curl_xml? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_dbi? ( dev-db/libdbi ) collectd_plugins_dns? ( net-libs/libpcap ) collectd_plugins_gmond? ( sys-cluster/ganglia ) collectd_plugins_gps? ( sci-geosciences/gpsd:= ) collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13:0= ) collectd_plugins_log_logstash? ( dev-libs/yajl:= ) collectd_plugins_lua? ( dev-lang/lua:0= ) collectd_plugins_lvm? ( sys-fs/lvm2 ) collectd_plugins_memcachec? ( dev-libs/libmemcached ) collectd_plugins_modbus? ( dev-libs/libmodbus ) collectd_plugins_mqtt? ( app-misc/mosquitto ) collectd_plugins_mysql? ( virtual/libmysqlclient:= ) collectd_plugins_netlink? ( net-libs/libmnl ) collectd_plugins_nginx? ( net-misc/curl:0= ) collectd_plugins_notify_desktop? ( x11-libs/libnotify ) collectd_plugins_notify_email? ( net-libs/libesmtp ) collectd_plugins_nut? ( >=sys-power/nut-2.7.2-r2 ) collectd_plugins_openldap? ( net-nds/openldap ) collectd_plugins_onewire? ( >=sys-fs/owfs-3.1:= ) collectd_plugins_oracle? ( dev-db/oracle-instantclient-basic ) collectd_plugins_ovs_events? ( dev-libs/yajl:= ) collectd_plugins_ovs_stats? ( dev-libs/yajl:= ) collectd_plugins_perl? ( dev-lang/perl:=[ithreads] ) collectd_plugins_ping? ( net-libs/liboping ) collectd_plugins_postgresql? ( dev-db/postgresql:= ) collectd_plugins_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(+)?] ) collectd_plugins_redis? ( dev-libs/hiredis:= ) collectd_plugins_routeros? ( net-libs/librouteros ) collectd_plugins_rrdcached? ( net-analyzer/rrdtool:= ) collectd_plugins_rrdtool? ( net-analyzer/rrdtool:= ) collectd_plugins_sensors? ( sys-apps/lm_sensors ) collectd_plugins_sigrok? ( <sci-libs/libsigrok-0.4:= dev-libs/glib:2 ) collectd_plugins_smart? ( dev-libs/libatasmart ) collectd_plugins_snmp? ( net-analyzer/net-snmp ) collectd_plugins_snmp_agent? ( net-analyzer/net-snmp ) collectd_plugins_tokyotyrant? ( net-misc/tokyotyrant ) collectd_plugins_varnish? ( www-servers/varnish:= ) collectd_plugins_virt? ( app-emulation/libvirt:= dev-libs/libxml2:2= ) collectd_plugins_write_http? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_write_kafka? ( >=dev-libs/librdkafka-0.9.0.99:= dev-libs/yajl:= ) collectd_plugins_write_mongodb? ( >=dev-libs/mongo-c-driver-1.8.2:= ) collectd_plugins_write_prometheus? ( >=dev-libs/protobuf-c-1.2.1-r1:= net-libs/libmicrohttpd:= ) collectd_plugins_write_redis? ( dev-libs/hiredis:= ) collectd_plugins_xencpu? ( app-emulation/xen-tools:= ) kernel_FreeBSD? ( collectd_plugins_disk? ( sys-libs/libstatgrab:= ) collectd_plugins_interface? ( sys-libs/libstatgrab:= ) collectd_plugins_load? ( sys-libs/libstatgrab:= ) collectd_plugins_memory? ( sys-libs/libstatgrab:= ) collectd_plugins_swap? ( sys-libs/libstatgrab:= ) collectd_plugins_users? ( sys-libs/libstatgrab:= ) ) collectd_plugins_java? ( >=virtual/jre-1.6 ) collectd_plugins_syslog? ( virtual/logger ) selinux? ( sec-policy/selinux-collectd ) !<sys-apps/openrc-0.18.2 collectd_plugins_java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
 REQUIRED_USE=collectd_plugins_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 ) ) collectd_plugins_smart? ( udev )
 SLOT=0
 SRC_URI=https://collectd.org/files/collectd-5.8.0.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	perl-functions	f2e3420aed32cf1abe33b4129b842636	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=30ba5813a00ae04ce14815e86cd11b70
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	perl-functions	f2e3420aed32cf1abe33b4129b842636	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=4835a2226ae4a04bc3e299c376644724
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 2da97efafb16..82cdaf4711e0 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/actkbd-0.2.8-r2 b/metadata/md5-cache/app-misc/actkbd-0.2.8-r2
index f8234c08e551..09f098bdb1dd 100644
--- a/metadata/md5-cache/app-misc/actkbd-0.2.8-r2
+++ b/metadata/md5-cache/app-misc/actkbd-0.2.8-r2
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/files/actkbd-0.2.8.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=479d3fb46f1b83f33d7b60050bdc34cb
diff --git a/metadata/md5-cache/app-misc/anki-2.1.0_beta25 b/metadata/md5-cache/app-misc/anki-2.1.0_beta25
index 380724004e36..5651a64b4241 100644
--- a/metadata/md5-cache/app-misc/anki-2.1.0_beta25
+++ b/metadata/md5-cache/app-misc/anki-2.1.0_beta25
@@ -9,5 +9,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/pyt
 REQUIRED_USE=python_targets_python3_6
 SLOT=0
 SRC_URI=https://apps.ankiweb.net/downloads/beta/anki-2.1.0beta25-source.tgz -> anki-2.1.0_beta25.tgz
-_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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f065a4d27f75db9e0c5f3509c6b2db56
diff --git a/metadata/md5-cache/app-misc/anki-2.1.0_beta27 b/metadata/md5-cache/app-misc/anki-2.1.0_beta27
index 3297b791e988..1e87cfecb88c 100644
--- a/metadata/md5-cache/app-misc/anki-2.1.0_beta27
+++ b/metadata/md5-cache/app-misc/anki-2.1.0_beta27
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/pyt
 REQUIRED_USE=python_targets_python3_6
 SLOT=0
 SRC_URI=https://apps.ankiweb.net/downloads/beta/anki-2.1.0beta27-source.tgz -> anki-2.1.0_beta27.tgz
-_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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9c0ad7a51a4a575350b921486e06f48d
diff --git a/metadata/md5-cache/app-misc/asciinema-2.0.1 b/metadata/md5-cache/app-misc/asciinema-2.0.1
index bb1210073951..20f9e2d05ed8 100644
--- a/metadata/md5-cache/app-misc/asciinema-2.0.1
+++ b/metadata/md5-cache/app-misc/asciinema-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/asciinema/asciinema/archive/v2.0.1.tar.gz -> asciinema-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4158ce8c3b083c7314e11caeee1a965c
diff --git a/metadata/md5-cache/app-misc/bijiben-3.24.2 b/metadata/md5-cache/app-misc/bijiben-3.24.2
index 44b10fe3f647..00ca68ff82dc 100644
--- a/metadata/md5-cache/app-misc/bijiben-3.24.2
+++ b/metadata/md5-cache/app-misc/bijiben-3.24.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.28:2 >=x11-libs/gtk+-3.11.4:3 >=gnome-extra/evolution-data-server-3.13.90:= >=net-libs/webkit-gtk-2.10.0:4 net-libs/gnome-online-accounts:= dev-libs/libxml2 >=app-misc/tracker-1:= sys-apps/util-linux
 SLOT=0
 SRC_URI=mirror://gnome/sources/bijiben/3.24/bijiben-3.24.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=325f1dd053c834c1f6fa8db4b9552dbe
diff --git a/metadata/md5-cache/app-misc/bijiben-3.26.1 b/metadata/md5-cache/app-misc/bijiben-3.26.1
index ff12b0413f10..2cdf5082ffd6 100644
--- a/metadata/md5-cache/app-misc/bijiben-3.26.1
+++ b/metadata/md5-cache/app-misc/bijiben-3.26.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.53.4:2 >=x11-libs/gtk+-3.11.4:3 >=gnome-extra/evolution-data-server-3.13.90:= >=net-libs/webkit-gtk-2.10.0:4 net-libs/gnome-online-accounts:= dev-libs/libxml2:2 >=app-misc/tracker-1:= sys-apps/util-linux
 SLOT=0
 SRC_URI=mirror://gnome/sources/bijiben/3.26/bijiben-3.26.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bcf89d36fc48da31e25d69dd03050ba4
diff --git a/metadata/md5-cache/app-misc/binwalk-2.1.1 b/metadata/md5-cache/app-misc/binwalk-2.1.1
index b7473c99ccbd..3c7674bb1065 100644
--- a/metadata/md5-cache/app-misc/binwalk-2.1.1
+++ b/metadata/md5-cache/app-misc/binwalk-2.1.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( dev-python/backports-lzma[python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/devttys0/binwalk/archive/v2.1.1.tar.gz -> binwalk-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b6b85d4b3636c19aff5bbb96b90d1a0f
diff --git a/metadata/md5-cache/app-misc/binwalk-9999 b/metadata/md5-cache/app-misc/binwalk-9999
index 4b484d790b0d..ff28d6d7829c 100644
--- a/metadata/md5-cache/app-misc/binwalk-9999
+++ b/metadata/md5-cache/app-misc/binwalk-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( dev-python/backports-lzma[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) graph? ( dev-python/pyqtgraph[opengl,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=78c8c0a735240e71cda9a8127cf6e8f6
diff --git a/metadata/md5-cache/app-misc/blink1-1.98 b/metadata/md5-cache/app-misc/blink1-1.98
index 802464bcc734..6459de3cb404 100644
--- a/metadata/md5-cache/app-misc/blink1-1.98
+++ b/metadata/md5-cache/app-misc/blink1-1.98
@@ -9,5 +9,5 @@ LICENSE=CC-BY-SA-3.0
 RDEPEND=dev-libs/hidapi virtual/libusb:1 virtual/libudev sys-apps/attr sys-libs/libcap
 SLOT=0
 SRC_URI=https://github.com/todbot/blink1/archive/v1.98.tar.gz -> blink1-1.98.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=0e05d4308b6ed358e6649515a2b7e163
diff --git a/metadata/md5-cache/app-misc/brewtarget-2.3.1 b/metadata/md5-cache/app-misc/brewtarget-2.3.1
index fb9c997e880e..80c004cd3bb3 100644
--- a/metadata/md5-cache/app-misc/brewtarget-2.3.1
+++ b/metadata/md5-cache/app-misc/brewtarget-2.3.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3 WTFPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
 SLOT=0
 SRC_URI=https://github.com/Brewtarget/brewtarget/releases/download/v2.3.1/brewtarget_2.3.1.orig.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3757372b4d1aa8dd315df90d700fecd4
diff --git a/metadata/md5-cache/app-misc/ca-certificates-20180409.3.37 b/metadata/md5-cache/app-misc/ca-certificates-20180409.3.37
index 542a5f47c3a2..65c87fbc3f44 100644
--- a/metadata/md5-cache/app-misc/ca-certificates-20180409.3.37
+++ b/metadata/md5-cache/app-misc/ca-certificates-20180409.3.37
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prepare setup unpack
-DEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 )
+DEPEND=|| ( 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=Common CA Certificates PEM files
 EAPI=6
 HOMEPAGE=https://packages.debian.org/sid/ca-certificates
@@ -10,4 +10,4 @@ RDEPEND=app-misc/c_rehash sys-apps/debianutils
 SLOT=0
 SRC_URI=mirror://debian/pool/main/c/ca-certificates/ca-certificates_20180409.tar.xz https://archive.mozilla.org/pub/security/nss/releases/NSS_3_37_RTM/src/nss-3.37.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=78eedde1f15d12f7bb4a285734d1713f
+_md5_=86e9b533d2e3e3a379b479dfdf16a61b
diff --git a/metadata/md5-cache/app-misc/cdcat-0.3 b/metadata/md5-cache/app-misc/cdcat-0.3
deleted file mode 100644
index 0c95c6c92228..000000000000
--- a/metadata/md5-cache/app-misc/cdcat-0.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=virtual/cdrtools !app-backup/cdbkup
-DESCRIPTION=simple yet effective CD indexing program
-EAPI=0
-HOMEPAGE=http://cdcatalog.sourceforge.net/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=virtual/cdrtools !app-backup/cdbkup
-SLOT=0
-SRC_URI=mirror://sourceforge/cdcatalog/cdcat-0.3.tar.gz
-_md5_=6ae6881858f6a4ed9ae27cdc5b10d514
diff --git a/metadata/md5-cache/app-misc/cdcat-0.3-r1 b/metadata/md5-cache/app-misc/cdcat-0.3-r1
index 28e62131d89e..baa96fbc909c 100644
--- a/metadata/md5-cache/app-misc/cdcat-0.3-r1
+++ b/metadata/md5-cache/app-misc/cdcat-0.3-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Simple yet effective CD indexing program
 EAPI=7
 HOMEPAGE=http://cdcatalog.sourceforge.net/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=virtual/cdrtools !app-backup/cdbkup
 SLOT=0
 SRC_URI=mirror://sourceforge/cdcatalog/cdcat-0.3.tar.gz
-_md5_=8abc26bca2fd6ec20a418331a6d98337
+_md5_=071e2a6133996b603a030aae66d93dac
diff --git a/metadata/md5-cache/app-misc/chkcrontab-1.6 b/metadata/md5-cache/app-misc/chkcrontab-1.6
index 961823ee93a6..eb6fbd708042 100644
--- a/metadata/md5-cache/app-misc/chkcrontab-1.6
+++ b/metadata/md5-cache/app-misc/chkcrontab-1.6
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/lyda/chkcrontab/archive/v1.6.tar.gz -> chkcrontab-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=565ec97b39912065880fa5fafebdc430
diff --git a/metadata/md5-cache/app-misc/chkcrontab-1.7 b/metadata/md5-cache/app-misc/chkcrontab-1.7
index 5bfbfa17c531..d5749a4728e9 100644
--- a/metadata/md5-cache/app-misc/chkcrontab-1.7
+++ b/metadata/md5-cache/app-misc/chkcrontab-1.7
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/lyda/chkcrontab/archive/v1.7.tar.gz -> chkcrontab-1.7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4056d971ff0094c5635dbd96cad496a7
diff --git a/metadata/md5-cache/app-misc/cpipe-3.0.3 b/metadata/md5-cache/app-misc/cpipe-3.0.3
index e1450062ff98..4a5569ae13a5 100644
--- a/metadata/md5-cache/app-misc/cpipe-3.0.3
+++ b/metadata/md5-cache/app-misc/cpipe-3.0.3
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Counting pipe, measures data transfered over pipe
 EAPI=6
 HOMEPAGE=https://github.com/HaraldKi/cpipe
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86 ~amd64-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/HaraldKi/cpipe/archive/3.0.3.tar.gz -> cpipe-3.0.3.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=5169dfaeb06f4c7a8a8fae070a6433bc
+_md5_=5f0f89e2bd2b0e4ac6f3afcf6094247a
diff --git a/metadata/md5-cache/app-misc/datovka-4.10.3 b/metadata/md5-cache/app-misc/datovka-4.10.3
index eb13dc0f0123..621794528c6d 100644
--- a/metadata/md5-cache/app-misc/datovka-4.10.3
+++ b/metadata/md5-cache/app-misc/datovka-4.10.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/openssl-1.0.2 >=dev-qt/qtcore-5.3.2:5 >=dev-qt/qtgui-5.3.2:5 >=dev-qt/qtnetwork-5.3.2:5 >=dev-qt/qtprintsupport-5.3.2:5 >=dev-qt/qtsql-5.3.2:5[sqlite] >=dev-qt/qtsvg-5.3.2:5 >=dev-qt/qtwidgets-5.3.2:5 >=net-libs/libisds-0.10.8
 SLOT=0
 SRC_URI=https://secure.nic.cz/files/datove_schranky/4.10.3/datovka-4.10.3.tar.xz
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c5f237631e5e87840f5f2865465e0083
diff --git a/metadata/md5-cache/app-misc/datovka-4.11.0 b/metadata/md5-cache/app-misc/datovka-4.11.0
index 4bc60b44c86b..d563ebb8f1fc 100644
--- a/metadata/md5-cache/app-misc/datovka-4.11.0
+++ b/metadata/md5-cache/app-misc/datovka-4.11.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/openssl-1.0.2 >=dev-qt/qtcore-5.3.2:5 >=dev-qt/qtgui-5.3.2:5 >=dev-qt/qtnetwork-5.3.2:5 >=dev-qt/qtprintsupport-5.3.2:5 >=dev-qt/qtsql-5.3.2:5[sqlite] >=dev-qt/qtsvg-5.3.2:5 >=dev-qt/qtwidgets-5.3.2:5 >=net-libs/libisds-0.10.8
 SLOT=0
 SRC_URI=https://secure.nic.cz/files/datove_schranky/4.11.0/datovka-4.11.0.tar.xz
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e00bce29c07e0b104f53a6622f3324c5
diff --git a/metadata/md5-cache/app-misc/ddate-0.2.1 b/metadata/md5-cache/app-misc/ddate-0.2.1
index 93654de240b1..be86660fd14d 100644
--- a/metadata/md5-cache/app-misc/ddate-0.2.1
+++ b/metadata/md5-cache/app-misc/ddate-0.2.1
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=!<sys-apps/util-linux-2.20 !<sys-apps/util-linux-2.23[ddate]
 SLOT=0
 SRC_URI=https://github.com/bo0ts/ddate/archive/v0.2.1.tar.gz -> ddate-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=296b3c10dbbc5a47d2b026f2880b4a83
diff --git a/metadata/md5-cache/app-misc/ddate-0.2.2 b/metadata/md5-cache/app-misc/ddate-0.2.2
new file mode 100644
index 000000000000..5200f4b2e2f3
--- /dev/null
+++ b/metadata/md5-cache/app-misc/ddate-0.2.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Perpetual date converter from gregorian to poee calendar
+EAPI=6
+HOMEPAGE=https://github.com/bo0ts/ddate
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=public-domain
+RDEPEND=!sys-apps/util-linux[ddate]
+SLOT=0
+SRC_URI=https://github.com/bo0ts/ddate/archive/v0.2.2.tar.gz -> ddate-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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d620fd909367ee620549720e8d67dc5f
diff --git a/metadata/md5-cache/app-misc/ddcutil-0.8.4 b/metadata/md5-cache/app-misc/ddcutil-0.8.4
index 48efad36614d..e96d0546a8c6 100644
--- a/metadata/md5-cache/app-misc/ddcutil-0.8.4
+++ b/metadata/md5-cache/app-misc/ddcutil-0.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libXrandr x11-libs/libX11 dev-libs/glib:2 sys-apps/i2c-tools virtual/udev usb-monitor? ( dev-libs/hidapi virtual/libusb:1 sys-apps/usbutils )
 SLOT=0
 SRC_URI=https://github.com/rockowitz/ddcutil/archive/v0.8.4.tar.gz -> ddcutil-0.8.4.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c0c476c90eff701544c725271effb6d0
diff --git a/metadata/md5-cache/app-misc/ddcutil-0.8.6 b/metadata/md5-cache/app-misc/ddcutil-0.8.6
index cef5a6a0f779..7366e2ff11ee 100644
--- a/metadata/md5-cache/app-misc/ddcutil-0.8.6
+++ b/metadata/md5-cache/app-misc/ddcutil-0.8.6
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 sys-apps/i2c-tools virtual/udev drm? ( x11-libs/libdrm )
 REQUIRED_USE=drm? ( X )
 SLOT=0
 SRC_URI=https://github.com/rockowitz/ddcutil/archive/v0.8.6.tar.gz -> ddcutil-0.8.6.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1db6c0c81e273f9e91b42a4acd7d6c30
diff --git a/metadata/md5-cache/app-misc/ddcutil-0.8.6-r1 b/metadata/md5-cache/app-misc/ddcutil-0.8.6-r1
index 9a4d4ff123f6..889186604ba5 100644
--- a/metadata/md5-cache/app-misc/ddcutil-0.8.6-r1
+++ b/metadata/md5-cache/app-misc/ddcutil-0.8.6-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 sys-apps/i2c-tools virtual/udev drm? ( x11-libs/libdrm )
 REQUIRED_USE=drm? ( X )
 SLOT=0
 SRC_URI=https://github.com/rockowitz/ddcutil/archive/v0.8.6.tar.gz -> ddcutil-0.8.6.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f14d2f6e7eb06a525e52611cc8157cc9
diff --git a/metadata/md5-cache/app-misc/ddcutil-0.9.1 b/metadata/md5-cache/app-misc/ddcutil-0.9.1
index f56644bba944..75ca5c0eacb3 100644
--- a/metadata/md5-cache/app-misc/ddcutil-0.9.1
+++ b/metadata/md5-cache/app-misc/ddcutil-0.9.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 sys-apps/i2c-tools virtual/udev drm? ( x11-libs/libdrm )
 REQUIRED_USE=drm? ( X )
 SLOT=0
 SRC_URI=https://github.com/rockowitz/ddcutil/archive/v0.9.1.tar.gz -> ddcutil-0.9.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1669443a1ff788ba80064f995d31262a
diff --git a/metadata/md5-cache/app-misc/elasticsearch-5.6.11 b/metadata/md5-cache/app-misc/elasticsearch-5.6.11
deleted file mode 100644
index 8f6dbad2c960..000000000000
--- a/metadata/md5-cache/app-misc/elasticsearch-5.6.11
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Open Source, Distributed, RESTful, Search Engine
-EAPI=6
-HOMEPAGE=https://www.elastic.co/products/elasticsearch
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 BSD-2 LGPL-3 MIT public-domain
-RDEPEND=virtual/jre:1.8
-SLOT=0
-SRC_URI=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.6.11.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=4a4e34365567d0f6455ba48d3dcbc9d7
diff --git a/metadata/md5-cache/app-misc/elasticsearch-5.6.12 b/metadata/md5-cache/app-misc/elasticsearch-5.6.12
new file mode 100644
index 000000000000..0ea8dca6d2e3
--- /dev/null
+++ b/metadata/md5-cache/app-misc/elasticsearch-5.6.12
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst prepare setup
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Open Source, Distributed, RESTful, Search Engine
+EAPI=6
+HOMEPAGE=https://www.elastic.co/products/elasticsearch
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD-2 LGPL-3 MIT public-domain
+RDEPEND=virtual/jre:1.8
+SLOT=0
+SRC_URI=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.6.12.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=17bb6c33c9898ee997ec04da4592eb46
diff --git a/metadata/md5-cache/app-misc/elasticsearch-6.4.0 b/metadata/md5-cache/app-misc/elasticsearch-6.4.0
deleted file mode 100644
index 26f62060e5b9..000000000000
--- a/metadata/md5-cache/app-misc/elasticsearch-6.4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Open Source, Distributed, RESTful, Search Engine
-EAPI=6
-HOMEPAGE=https://www.elastic.co/products/elasticsearch
-IUSE=x-pack
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 BSD-2 LGPL-3 MIT public-domain x-pack? ( Elastic )
-RDEPEND=virtual/jre:1.8
-SLOT=0
-SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.4.0.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-6.4.0.tar.gz )
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=bab357cc4f12482b4080e88a7dbcab65
diff --git a/metadata/md5-cache/app-misc/elasticsearch-6.4.1 b/metadata/md5-cache/app-misc/elasticsearch-6.4.1
new file mode 100644
index 000000000000..f994a7062779
--- /dev/null
+++ b/metadata/md5-cache/app-misc/elasticsearch-6.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare setup
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Open Source, Distributed, RESTful, Search Engine
+EAPI=6
+HOMEPAGE=https://www.elastic.co/products/elasticsearch
+IUSE=x-pack
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD-2 LGPL-3 MIT public-domain x-pack? ( Elastic )
+RDEPEND=virtual/jre:1.8
+SLOT=0
+SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.4.1.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-6.4.1.tar.gz )
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=2d3960141a89fe9c94c825a58fc5a814
diff --git a/metadata/md5-cache/app-misc/g15daemon-1.9.5.3-r13 b/metadata/md5-cache/app-misc/g15daemon-1.9.5.3-r13
index 2a13cad346fe..66f284f3896e 100644
--- a/metadata/md5-cache/app-misc/g15daemon-1.9.5.3-r13
+++ b/metadata/md5-cache/app-misc/g15daemon-1.9.5.3-r13
@@ -10,5 +10,5 @@ RDEPEND=virtual/libusb:0 >=dev-libs/libg15-1.2.4 >=dev-libs/libg15render-1.2 per
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/g15daemon/g15daemon-1.9.5.3.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	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	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	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	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3d525e5f7e352abed194a778c8749e38
diff --git a/metadata/md5-cache/app-misc/g15daemon-1.9.5.3-r21 b/metadata/md5-cache/app-misc/g15daemon-1.9.5.3-r21
index a18dad50ea3d..db84dbc29ad4 100644
--- a/metadata/md5-cache/app-misc/g15daemon-1.9.5.3-r21
+++ b/metadata/md5-cache/app-misc/g15daemon-1.9.5.3-r21
@@ -9,5 +9,5 @@ RDEPEND=virtual/libusb:0 >=dev-libs/libg15-9999 >=dev-libs/libg15render-1.2 perl
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/g15daemon/g15daemon-1.9.5.3.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	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	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	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	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c704f6638b909432d5f6e7e39b369675
diff --git a/metadata/md5-cache/app-misc/g15daemon-9999 b/metadata/md5-cache/app-misc/g15daemon-9999
index 7ddfe8dab4b6..d90d946524e0 100644
--- a/metadata/md5-cache/app-misc/g15daemon-9999
+++ b/metadata/md5-cache/app-misc/g15daemon-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libusb:0 >=dev-libs/libg15-9999 >=dev-libs/libg15render-9999 perl? ( dev-lang/perl dev-perl/GDGraph >=dev-perl/Inline-0.4 ) 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? ( || ( python_targets_python2_7 ) )
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	subversion	3d1eb4b41d7190570a84f786958ebb13	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	subversion	3d1eb4b41d7190570a84f786958ebb13	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f86fcc3e254caa6926c0ed7729ed022c
diff --git a/metadata/md5-cache/app-misc/gcstar-1.7.0 b/metadata/md5-cache/app-misc/gcstar-1.7.0
index b0d1a3a634d9..061e27778cf0 100644
--- a/metadata/md5-cache/app-misc/gcstar-1.7.0
+++ b/metadata/md5-cache/app-misc/gcstar-1.7.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl dev-perl/Archive-Zip dev-perl/DateTime-Format-Strptime dev-perl/Gtk2 dev-perl/HTML-Parser dev-perl/libwww-perl dev-perl/URI dev-perl/XML-Parser dev-perl/XML-Simple virtual/perl-Archive-Tar virtual/perl-Encode virtual/perl-Getopt-Long virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-IO-Compress virtual/perl-libnet virtual/perl-Storable virtual/perl-Time-Piece cddb? ( dev-perl/Net-FreeDB ) gnome? ( dev-perl/gnome2-vfs-perl ) mp3? ( dev-perl/MP3-Info dev-perl/MP3-Tag ) spell? ( dev-perl/gtk2-spell ) stats? ( dev-perl/Date-Calc dev-perl/GD[png,truetype] ) tellico? ( virtual/perl-Digest-MD5 virtual/perl-MIME-Base64 ) vorbis? ( dev-perl/Ogg-Vorbis-Header-PurePerl )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~tetromino/distfiles/gcstar/gcstar-1.7.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b935c7677395e2e490d9e4748a23b9c0
diff --git a/metadata/md5-cache/app-misc/gcstar-1.7.1 b/metadata/md5-cache/app-misc/gcstar-1.7.1
index 3c87e2c9e361..6a13c1f24486 100644
--- a/metadata/md5-cache/app-misc/gcstar-1.7.1
+++ b/metadata/md5-cache/app-misc/gcstar-1.7.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl dev-perl/Archive-Zip dev-perl/DateTime-Format-Strptime dev-perl/Gtk2 dev-perl/HTML-Parser dev-perl/libwww-perl dev-perl/URI dev-perl/XML-Parser dev-perl/XML-Simple virtual/perl-Archive-Tar virtual/perl-Encode virtual/perl-Getopt-Long virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-IO-Compress virtual/perl-libnet virtual/perl-Storable virtual/perl-Time-Piece cddb? ( dev-perl/Net-FreeDB ) gnome? ( dev-perl/gnome2-vfs-perl ) mp3? ( dev-perl/MP3-Info dev-perl/MP3-Tag ) spell? ( dev-perl/gtk2-spell ) stats? ( dev-perl/Date-Calc dev-perl/GD[png,truetype] ) tellico? ( virtual/perl-Digest-MD5 virtual/perl-MIME-Base64 ) vorbis? ( dev-perl/Ogg-Vorbis-Header-PurePerl )
 SLOT=0
 SRC_URI=https://launchpad.net/gcstar/1.7/1.7.1/+download/gcstar-1.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bd581bf7e2e7bd9ee3906078ce534bd9
diff --git a/metadata/md5-cache/app-misc/geoclue-2.4.8 b/metadata/md5-cache/app-misc/geoclue-2.4.8
index a9afc72e058c..fa9e34ec8885 100644
--- a/metadata/md5-cache/app-misc/geoclue-2.4.8
+++ b/metadata/md5-cache/app-misc/geoclue-2.4.8
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.34:2 >=dev-libs/json-glib-0.14 >=net-libs/libsoup-2.42:2.4 sys-apps/dbus introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) modemmanager? ( >=net-misc/modemmanager-1.6 ) zeroconf? ( >=net-dns/avahi-0.6.10[dbus] ) !<sci-geosciences/geocode-glib-3.10.0
 SLOT=2.0
 SRC_URI=https://www.freedesktop.org/software/geoclue/releases/2.4/geoclue-2.4.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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b61b5a2d0d4e214496bb1c2b2f810935
diff --git a/metadata/md5-cache/app-misc/gnote-3.24.1 b/metadata/md5-cache/app-misc/gnote-3.24.1
index db5e08c38b2e..12e31ccfd66d 100644
--- a/metadata/md5-cache/app-misc/gnote-3.24.1
+++ b/metadata/md5-cache/app-misc/gnote-3.24.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+ FDL-1.1
 RDEPEND=>=app-crypt/libsecret-0.8 >=app-text/gtkspell-3.0:3 >=dev-cpp/glibmm-2.32:2 >=dev-cpp/gtkmm-3.18:3.0 >=dev-libs/glib-2.32:2[dbus] >=dev-libs/libxml2-2:2 dev-libs/libxslt >=sys-apps/util-linux-2.16:= >=x11-libs/gtk+-3.20:3 gnome-base/gsettings-desktop-schemas
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnote/3.24/gnote-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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=24f5bce254983a50aab65510496b51b8
diff --git a/metadata/md5-cache/app-misc/golly-2.7-r1 b/metadata/md5-cache/app-misc/golly-2.7-r1
index d13a1b6f6472..1246c9df00a8 100644
--- a/metadata/md5-cache/app-misc/golly-2.7-r1
+++ b/metadata/md5-cache/app-misc/golly-2.7-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl sys-libs/zlib x11-libs/wxGTK:3.0[X] python_targets_python2
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://sourceforge/golly/golly-2.7-src.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9927a894aa1722c1cda2e81542431f93
diff --git a/metadata/md5-cache/app-misc/golly-2.8 b/metadata/md5-cache/app-misc/golly-2.8
index 2a54d779de20..f3c3fd63616c 100644
--- a/metadata/md5-cache/app-misc/golly-2.8
+++ b/metadata/md5-cache/app-misc/golly-2.8
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl virtual/opengl sys-libs/zlib x11-libs/wxGTK:3.0[X] python_
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://sourceforge/golly/golly-2.8-src.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c0b58c7bfc0d6b88d39d10df8184f6bd
diff --git a/metadata/md5-cache/app-misc/goobook-1.9 b/metadata/md5-cache/app-misc/goobook-1.9
index a3c456d14d66..9b7568b18688 100644
--- a/metadata/md5-cache/app-misc/goobook-1.9
+++ b/metadata/md5-cache/app-misc/goobook-1.9
@@ -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 ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/goobook/goobook-1.9.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	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8ac4935b2e0c67d470acbecabedc27df
diff --git a/metadata/md5-cache/app-misc/gourmet-0.17.4-r2 b/metadata/md5-cache/app-misc/gourmet-0.17.4-r2
index 39b410abbb35..cb0d768a18cf 100644
--- a/metadata/md5-cache/app-misc/gourmet-0.17.4-r2
+++ b/metadata/md5-cache/app-misc/gourmet-0.17.4-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pygtk-2.22.0:2[python_targets_python2_7(-)?,-python_single_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/thinkle/gourmet/archive/0.17.4.tar.gz -> gourmet-0.17.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=32b3c320f718b00018a6a883ef169707
diff --git a/metadata/md5-cache/app-misc/gramps-4.2.5 b/metadata/md5-cache/app-misc/gramps-4.2.5
index 3c3bbd2d5e8a..63b235e64591 100644
--- a/metadata/md5-cache/app-misc/gramps-4.2.5
+++ b/metadata/md5-cache/app-misc/gramps-4.2.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/bsddb3[python_targets_python3_4(-)?,python_targets_python3_5(
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/gramps-project/gramps/archive/v4.2.5.tar.gz -> gramps-4.2.5.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=774fd0ac4e9b1b59442ae6aeb2bdae93
diff --git a/metadata/md5-cache/app-misc/gramps-4.2.8 b/metadata/md5-cache/app-misc/gramps-4.2.8
index b56093a68805..0f545ba5b433 100644
--- a/metadata/md5-cache/app-misc/gramps-4.2.8
+++ b/metadata/md5-cache/app-misc/gramps-4.2.8
@@ -10,5 +10,5 @@ RDEPEND=dev-python/bsddb3[python_targets_python3_4(-)?,python_targets_python3_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 )
 SLOT=0
 SRC_URI=https://github.com/gramps-project/gramps/archive/v4.2.8.tar.gz -> gramps-4.2.8.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e9e347a55de96527b068a865feec86cd
diff --git a/metadata/md5-cache/app-misc/hachoir-metadata-1.3.3-r1 b/metadata/md5-cache/app-misc/hachoir-metadata-1.3.3-r1
index b2b25ae76466..ad19e4ba7fde 100644
--- a/metadata/md5-cache/app-misc/hachoir-metadata-1.3.3-r1
+++ b/metadata/md5-cache/app-misc/hachoir-metadata-1.3.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/hachoir-core-1.3[python_targets_python2_7(-)?,-python_singl
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hachoir-metadata/hachoir-metadata-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=62a8904126acf3ec7527923c968e4991
diff --git a/metadata/md5-cache/app-misc/hachoir-subfile-0.5.3-r1 b/metadata/md5-cache/app-misc/hachoir-subfile-0.5.3-r1
index 451351c5c78e..db0dda2495dc 100644
--- a/metadata/md5-cache/app-misc/hachoir-subfile-0.5.3-r1
+++ b/metadata/md5-cache/app-misc/hachoir-subfile-0.5.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/hachoir-core-1.1[python_targets_python2_7(-)?,-python_singl
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hachoir-subfile/hachoir-subfile-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c0eb94add3ca8ce68b2d7276c68eeab6
diff --git a/metadata/md5-cache/app-misc/hachoir-urwid-1.1-r1 b/metadata/md5-cache/app-misc/hachoir-urwid-1.1-r1
index 8d09913b4017..14ceb35eb104 100644
--- a/metadata/md5-cache/app-misc/hachoir-urwid-1.1-r1
+++ b/metadata/md5-cache/app-misc/hachoir-urwid-1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/hachoir-core-1.2[python_targets_python2_7(-)?,-python_singl
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hachoir-urwid/hachoir-urwid-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8bfed100e5d821019750a8c83485ac12
diff --git a/metadata/md5-cache/app-misc/i2bits-0.0.2 b/metadata/md5-cache/app-misc/i2bits-0.0.2
index d8c7e027546f..4081ed276f87 100644
--- a/metadata/md5-cache/app-misc/i2bits-0.0.2
+++ b/metadata/md5-cache/app-misc/i2bits-0.0.2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=WTFPL-2
 SLOT=0
 SRC_URI=http://unixdev.ru/src/i2bits-0.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=efd73732bf9152a041b355be33bf2fd9
diff --git a/metadata/md5-cache/app-misc/i2bits-0.1.0 b/metadata/md5-cache/app-misc/i2bits-0.1.0
index 2ee03dca2ab9..0268d9c76f82 100644
--- a/metadata/md5-cache/app-misc/i2bits-0.1.0
+++ b/metadata/md5-cache/app-misc/i2bits-0.1.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=WTFPL-2
 SLOT=0
 SRC_URI=http://unixdev.ru/src/i2bits-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=60759718d17455fe2c09498e61a5b466
diff --git a/metadata/md5-cache/app-misc/icdiff-1.7.3 b/metadata/md5-cache/app-misc/icdiff-1.7.3
index 59f8ab6f5325..094db74645bd 100644
--- a/metadata/md5-cache/app-misc/icdiff-1.7.3
+++ b/metadata/md5-cache/app-misc/icdiff-1.7.3
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/jeffkaufman/icdiff/archive/release-1.7.3.tar.gz -> icdiff-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d8b8a30ea15e6a381f15a37370950a9e
diff --git a/metadata/md5-cache/app-misc/icdiff-1.9.1 b/metadata/md5-cache/app-misc/icdiff-1.9.1
index 8fc492d75154..11601a006333 100644
--- a/metadata/md5-cache/app-misc/icdiff-1.9.1
+++ b/metadata/md5-cache/app-misc/icdiff-1.9.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/jeffkaufman/icdiff/archive/release-1.9.1.tar.gz -> icdiff-1.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6a8cf5da6763a6eefbf153c1d5203874
diff --git a/metadata/md5-cache/app-misc/ignuit-2.24.3 b/metadata/md5-cache/app-misc/ignuit-2.24.3
index 6a5b68c24e34..e5a01b512484 100644
--- a/metadata/md5-cache/app-misc/ignuit-2.24.3
+++ b/metadata/md5-cache/app-misc/ignuit-2.24.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=app-text/gnome-doc-utils-0.3.2 dev-libs/glib:2 dev-libs/libxml2:2 >=dev-libs/libxslt-1.1.28 >=gnome-base/libgnomeui-2.24.5 >=gnome-base/gconf-3.2.6:2 gnome-base/libglade:2.0 >=media-libs/gstreamer-1.8.2:1.0 x11-libs/gtk+:2 x11-libs/pango latex? ( app-text/dvipng virtual/latex-base )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~leio/distfiles/ignuit-2.24.3.testing.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f35de1370f6a9deb3cb79f658d586a0f
diff --git a/metadata/md5-cache/app-misc/irtrans-irclient-6.01.05 b/metadata/md5-cache/app-misc/irtrans-irclient-6.01.05
deleted file mode 100644
index 218ac7b0ac13..000000000000
--- a/metadata/md5-cache/app-misc/irtrans-irclient-6.01.05
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=IRTrans Server
-EAPI=2
-HOMEPAGE=http://www.irtrans.de
-KEYWORDS=~x86 ~amd64 ~arm
-LICENSE=BSD
-RESTRICT=strip
-SLOT=0
-SRC_URI=http://www.irtrans.de/download/Client/irclient-src.tar.gz -> irclient-src-6.01.05.tar.gz http://ftp.disconnected-by-peer.at/irtrans/irtrans-irclient-5.11.04-ip_assign-1.patch.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_=9cc6a9e7a8dc200bbad9e520870d9503
diff --git a/metadata/md5-cache/app-misc/kanatest-0.4.8 b/metadata/md5-cache/app-misc/kanatest-0.4.8
index 84d91313aebb..eb3b9276b7e5 100644
--- a/metadata/md5-cache/app-misc/kanatest-0.4.8
+++ b/metadata/md5-cache/app-misc/kanatest-0.4.8
@@ -8,5 +8,5 @@ LICENSE=GPL-2 GPL-2+
 RDEPEND=>=x11-libs/gtk+-2.12:2= dev-libs/libxml2:=
 SLOT=0
 SRC_URI=http://www.clayo.org/kanatest/kanatest-0.4.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=966ae3e4cc91f968301c6dd7ed8a2977
diff --git a/metadata/md5-cache/app-misc/khal-0.9.7 b/metadata/md5-cache/app-misc/khal-0.9.7
index 53735c660eec..79ce36a5e120 100644
--- a/metadata/md5-cache/app-misc/khal-0.9.7
+++ b/metadata/md5-cache/app-misc/khal-0.9.7
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/click-3.2[python_targets_python3_4(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/k/khal/khal-0.9.7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1c7ddcc401edfe5005e44e4299764de2
diff --git a/metadata/md5-cache/app-misc/khal-0.9.8 b/metadata/md5-cache/app-misc/khal-0.9.8
index e72b562e1e73..4deec7f8125a 100644
--- a/metadata/md5-cache/app-misc/khal-0.9.8
+++ b/metadata/md5-cache/app-misc/khal-0.9.8
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/click-3.2[python_targets_python3_4(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/k/khal/khal-0.9.8.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=888eed75323edea9b685e234a7743664
diff --git a/metadata/md5-cache/app-misc/khal-0.9.9-r1 b/metadata/md5-cache/app-misc/khal-0.9.9-r1
index 9b2446f3523d..687d1f5bce95 100644
--- a/metadata/md5-cache/app-misc/khal-0.9.9-r1
+++ b/metadata/md5-cache/app-misc/khal-0.9.9-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/click-3.2[python_targets_python3_4(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/k/khal/khal-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b344b795e67b6a6ccabb4ece49072e9c
diff --git a/metadata/md5-cache/app-misc/khard-0.11.4 b/metadata/md5-cache/app-misc/khard-0.11.4
index b0176a34196f..0c5fcd69d566 100644
--- a/metadata/md5-cache/app-misc/khard-0.11.4
+++ b/metadata/md5-cache/app-misc/khard-0.11.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/atomicwrites[python_targets_python3_4(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/k/khard/khard-0.11.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=877c63135f06c7af1e357e52bb14e1ae
diff --git a/metadata/md5-cache/app-misc/khard-0.12.2 b/metadata/md5-cache/app-misc/khard-0.12.2
index 28091e405331..cb9a088d4fc1 100644
--- a/metadata/md5-cache/app-misc/khard-0.12.2
+++ b/metadata/md5-cache/app-misc/khard-0.12.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/atomicwrites[python_targets_python3_4(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/k/khard/khard-0.12.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6cc0cf33d8cbf14bcfa98d2bc43cdb48
diff --git a/metadata/md5-cache/app-misc/kryoflux-dtc-2.6 b/metadata/md5-cache/app-misc/kryoflux-dtc-2.6
index 1ddfe6680cbc..b95f378fdfd2 100644
--- a/metadata/md5-cache/app-misc/kryoflux-dtc-2.6
+++ b/metadata/md5-cache/app-misc/kryoflux-dtc-2.6
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/spsdeclib virtual/libusb:1 virtual/udev gui? ( virtual/jre )
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://www.kryoflux.com/download/kryoflux_2.6_linux.tar.bz2 gui? ( https://www.kryoflux.com/kryoflux-ui.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=13d5ae8bebccc43974d0fc4b5cd8944c
diff --git a/metadata/md5-cache/app-misc/lfm-2.3-r1 b/metadata/md5-cache/app-misc/lfm-2.3-r1
index 5c735f5034e5..3761fe102d30 100644
--- a/metadata/md5-cache/app-misc/lfm-2.3-r1
+++ b/metadata/md5-cache/app-misc/lfm-2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) >=
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://inigo.katxi.org/devel/lfm/lfm-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=6adeb9c9cd5c235a7acbc0da8bd1d0ac
diff --git a/metadata/md5-cache/app-misc/lirc-0.10.1 b/metadata/md5-cache/app-misc/lirc-0.10.1
index dd0bb90d4c73..6ade7d7bbe30 100644
--- a/metadata/md5-cache/app-misc/lirc-0.10.1
+++ b/metadata/md5-cache/app-misc/lirc-0.10.1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_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	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/app-misc/lirc-0.9.0-r6 b/metadata/md5-cache/app-misc/lirc-0.9.0-r6
index cc5b861fa88e..c016a481a40e 100644
--- a/metadata/md5-cache/app-misc/lirc-0.9.0-r6
+++ b/metadata/md5-cache/app-misc/lirc-0.9.0-r6
@@ -10,5 +10,5 @@ RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) lirc_devices_alsa_
 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	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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/metromap-0.1.4-r1 b/metadata/md5-cache/app-misc/metromap-0.1.4-r1
index 6a7f7f50cf37..cb4013e7c12c 100644
--- a/metadata/md5-cache/app-misc/metromap-0.1.4-r1
+++ b/metadata/md5-cache/app-misc/metromap-0.1.4-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=http://metromap.antex.ru/metromap-0.1.4.tar.bz2
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4e51b740e2bf906e695fb94ca1ff8c3a
diff --git a/metadata/md5-cache/app-misc/openastro-1.1.56 b/metadata/md5-cache/app-misc/openastro-1.1.56
index 5cc9040c8ad1..b62a2fc92c9b 100644
--- a/metadata/md5-cache/app-misc/openastro-1.1.56
+++ b/metadata/md5-cache/app-misc/openastro-1.1.56
@@ -10,5 +10,5 @@ RDEPEND=app-misc/openastro-data[python_targets_python3_5(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://ppa.launchpad.net/pellesimon/ubuntu/pool/main/o/openastro.org/openastro.org_1.1.56.orig.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=44a380456d6bb350a94b3a6659e6c9b6
diff --git a/metadata/md5-cache/app-misc/openastro-data-1.6 b/metadata/md5-cache/app-misc/openastro-data-1.6
index e742204466e6..10e01af2c660 100644
--- a/metadata/md5-cache/app-misc/openastro-data-1.6
+++ b/metadata/md5-cache/app-misc/openastro-data-1.6
@@ -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=http://ppa.launchpad.net/pellesimon/ubuntu/pool/main/o/openastro.org-data/openastro.org-data_1.6.orig.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1eb1d7549b8bd3e7664361d367c7e4bc
diff --git a/metadata/md5-cache/app-misc/openastro-data-1.7 b/metadata/md5-cache/app-misc/openastro-data-1.7
index 49b77a42e677..3761dc8442ed 100644
--- a/metadata/md5-cache/app-misc/openastro-data-1.7
+++ b/metadata/md5-cache/app-misc/openastro-data-1.7
@@ -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=http://ppa.launchpad.net/pellesimon/ubuntu/pool/main/o/openastro.org-data/openastro.org-data_1.7.orig.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=67b6ffeef836bfddcdd5c3e88f3a2364
diff --git a/metadata/md5-cache/app-misc/openastro-data-1.8 b/metadata/md5-cache/app-misc/openastro-data-1.8
index b8b6d22cc96b..fd041934ea42 100644
--- a/metadata/md5-cache/app-misc/openastro-data-1.8
+++ b/metadata/md5-cache/app-misc/openastro-data-1.8
@@ -10,5 +10,5 @@ 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_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://ppa.launchpad.net/pellesimon/ubuntu/pool/main/o/openastro.org-data/openastro.org-data_1.8.orig.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fa228cbbf5ec1eb8f2fb759eb58e7730
diff --git a/metadata/md5-cache/app-misc/pdfpc-4.1.1 b/metadata/md5-cache/app-misc/pdfpc-4.1.1
index 21875a51810a..f34fd8cceae9 100644
--- a/metadata/md5-cache/app-misc/pdfpc-4.1.1
+++ b/metadata/md5-cache/app-misc/pdfpc-4.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/poppler[cairo] dev-libs/glib:2 dev-libs/libgee:0.8 gnome-base/librsvg gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) sys-apps/dbus x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://github.com/pdfpc/pdfpc/archive/v4.1.1.tar.gz -> pdfpc-4.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=06b0fc2b078a15572027ebfab47580f0
diff --git a/metadata/md5-cache/app-misc/pysmssend-1.48-r2 b/metadata/md5-cache/app-misc/pysmssend-1.48-r2
index b60765bbe1ff..231f1d0da020 100644
--- a/metadata/md5-cache/app-misc/pysmssend-1.48-r2
+++ b/metadata/md5-cache/app-misc/pysmssend-1.48-r2
@@ -10,5 +10,5 @@ RDEPEND=>dev-python/mechanize-0.1.7b[python_targets_python2_7(-)?,-python_single
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://pysmssend.silverarrow.org/files/pysmssend-1.48.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4b0db142ec966494cd4998de28db5f29
diff --git a/metadata/md5-cache/app-misc/qlcplus-4.11.1 b/metadata/md5-cache/app-misc/qlcplus-4.11.1
index 4dd22705a73b..9b25d35e47a6 100644
--- a/metadata/md5-cache/app-misc/qlcplus-4.11.1
+++ b/metadata/md5-cache/app-misc/qlcplus-4.11.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=|| ( dev-embedded/libftdi:1 dev-embedded/libftdi:0 ) dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 media-libs/alsa-lib media-libs/libmad media-libs/libsndfile sci-libs/fftw:3.0 virtual/libusb:0 virtual/libusb:1 virtual/udev
 SLOT=0
 SRC_URI=https://github.com/mcallegari/qlcplus/archive/QLC+_4.11.1.tar.gz -> qlcplus-4.11.1.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-snapshot	b77011b62e2053c646ad720defe6d921	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-snapshot	b77011b62e2053c646ad720defe6d921	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f0dccac9acc84a70a4b726e313e2cab5
diff --git a/metadata/md5-cache/app-misc/ranger-1.9.1 b/metadata/md5-cache/app-misc/ranger-1.9.1
index 0493ab705e82..ef471c4f9cb6 100644
--- a/metadata/md5-cache/app-misc/ranger-1.9.1
+++ b/metadata/md5-cache/app-misc/ranger-1.9.1
@@ -10,5 +10,5 @@ RDEPEND=virtual/pager python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/ranger/ranger/archive/v1.9.1.tar.gz -> ranger-1.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3cbcba8ce9027126a510d43de5505551
diff --git a/metadata/md5-cache/app-misc/ranger-1.9.2 b/metadata/md5-cache/app-misc/ranger-1.9.2
index 30de506a386c..994f69521aa2 100644
--- a/metadata/md5-cache/app-misc/ranger-1.9.2
+++ b/metadata/md5-cache/app-misc/ranger-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=virtual/pager python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/ranger/ranger/archive/v1.9.2.tar.gz -> ranger-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=40da20f6f3abd0e13e18d99cc5b693a9
diff --git a/metadata/md5-cache/app-misc/ranger-9999 b/metadata/md5-cache/app-misc/ranger-9999
index 577abe97d3a9..4704f22127c6 100644
--- a/metadata/md5-cache/app-misc/ranger-9999
+++ b/metadata/md5-cache/app-misc/ranger-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=virtual/pager python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) 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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=40da20f6f3abd0e13e18d99cc5b693a9
diff --git a/metadata/md5-cache/app-misc/rbutil-1.4.0 b/metadata/md5-cache/app-misc/rbutil-1.4.0
index dd73e8c2d106..723e8175d74b 100644
--- a/metadata/md5-cache/app-misc/rbutil-1.4.0
+++ b/metadata/md5-cache/app-misc/rbutil-1.4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/quazip dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtnetwork:5= dev-qt/qtwidgets:5= media-libs/speex media-libs/speexdsp virtual/libusb:1
 SLOT=0
 SRC_URI=https://download.rockbox.org/rbutil/source/RockboxUtility-v1.4.0-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=521bc3761b43955e032aee15b8772e13
diff --git a/metadata/md5-cache/app-misc/recoll-1.24.1 b/metadata/md5-cache/app-misc/recoll-1.24.1
index 162344094b72..826120c94fdd 100644
--- a/metadata/md5-cache/app-misc/recoll-1.24.1
+++ b/metadata/md5-cache/app-misc/recoll-1.24.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/xapian:= sys-libs/zlib:= virtual/libiconv qt5? ( dev-qt/qtcore:
 REQUIRED_USE=session? ( inotify ) python_targets_python2_7
 SLOT=0
 SRC_URI=http://www.lesbonscomptes.com/recoll/recoll-1.24.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=34d9ff29c165ce6db7287e21d3a52e43
diff --git a/metadata/md5-cache/app-misc/resolve-march-native-0.9 b/metadata/md5-cache/app-misc/resolve-march-native-0.9
index 5e5ecb16a759..970e9c269a93 100644
--- a/metadata/md5-cache/app-misc/resolve-march-native-0.9
+++ b/metadata/md5-cache/app-misc/resolve-march-native-0.9
@@ -10,5 +10,5 @@ RDEPEND=>=sys-devel/gcc-4.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/hartwork/resolve-march-native/archive/0.9.tar.gz -> resolve-march-native-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=df2c98996153b95c704015d70a4bfc90
diff --git a/metadata/md5-cache/app-misc/resolve-march-native-0.9.2 b/metadata/md5-cache/app-misc/resolve-march-native-0.9.2
index a15cd1ee80d4..43b5c5a84dec 100644
--- a/metadata/md5-cache/app-misc/resolve-march-native-0.9.2
+++ b/metadata/md5-cache/app-misc/resolve-march-native-0.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=sys-devel/gcc-4.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/hartwork/resolve-march-native/archive/0.9.2.tar.gz -> resolve-march-native-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5557afd506dbbe2673f943d541dc0d39
diff --git a/metadata/md5-cache/app-misc/solaar-0.9.2-r3 b/metadata/md5-cache/app-misc/solaar-0.9.2-r3
index a22188f27344..cb5bb46dd2e5 100644
--- a/metadata/md5-cache/app-misc/solaar-0.9.2-r3
+++ b/metadata/md5-cache/app-misc/solaar-0.9.2-r3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pyudev-0.13[python_targets_python2_7(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/pwr/Solaar/archive/0.9.2.tar.gz -> solaar-0.9.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=93c649bb9d87f764248e10900af21dff
diff --git a/metadata/md5-cache/app-misc/spacenavd-0.5-r5 b/metadata/md5-cache/app-misc/spacenavd-0.5-r5
index de53f8839e93..53c5129bc2cc 100644
--- a/metadata/md5-cache/app-misc/spacenavd-0.5-r5
+++ b/metadata/md5-cache/app-misc/spacenavd-0.5-r5
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=X? ( x11-apps/xdpyinfo )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/spacenav/spacenav%20daemon/spacenavd%200.5/spacenavd-0.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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_=13321087eb56f24ea9b07719f4171a13
diff --git a/metadata/md5-cache/app-misc/spacenavd-0.5-r6 b/metadata/md5-cache/app-misc/spacenavd-0.5-r6
index 70f978349d57..164e6eb4cd98 100644
--- a/metadata/md5-cache/app-misc/spacenavd-0.5-r6
+++ b/metadata/md5-cache/app-misc/spacenavd-0.5-r6
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=X? ( x11-apps/xdpyinfo )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/spacenav/spacenav%20daemon/spacenavd%200.5/spacenavd-0.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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_=287314a7a951831a4b076abbd81bfd9e
diff --git a/metadata/md5-cache/app-misc/spacenavd-0.6 b/metadata/md5-cache/app-misc/spacenavd-0.6
index aa6b95381dcf..cbc160b5a0bc 100644
--- a/metadata/md5-cache/app-misc/spacenavd-0.6
+++ b/metadata/md5-cache/app-misc/spacenavd-0.6
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=X? ( x11-apps/xdpyinfo )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/spacenav/spacenav%20daemon/spacenavd%200.6/spacenavd-0.6.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac
 _md5_=acd4fce33880461ffc6a6000f75c54c5
diff --git a/metadata/md5-cache/app-misc/tails-installer-4.4.11 b/metadata/md5-cache/app-misc/tails-installer-4.4.11
index c97f39cbed7c..b88a90f34488 100644
--- a/metadata/md5-cache/app-misc/tails-installer-4.4.11
+++ b/metadata/md5-cache/app-misc/tails-installer-4.4.11
@@ -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://deb.tails.boum.org/pool/main/t/tails-installer/tails-installer_4.4.11+dfsg.orig.tar.gz -> tails-installer-4.4.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=05afcbe58537c0775216e8750a17b6d8
diff --git a/metadata/md5-cache/app-misc/tails-installer-4.4.8 b/metadata/md5-cache/app-misc/tails-installer-4.4.8
index ba914cff47a7..0e2210181557 100644
--- a/metadata/md5-cache/app-misc/tails-installer-4.4.8
+++ b/metadata/md5-cache/app-misc/tails-installer-4.4.8
@@ -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://deb.tails.boum.org/pool/main/t/tails-installer/tails-installer_4.4.8+dfsg.orig.tar.gz -> tails-installer-4.4.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f96660eb3bfcbac91f7824a8c8850230
diff --git a/metadata/md5-cache/app-misc/task-2.5.1-r1 b/metadata/md5-cache/app-misc/task-2.5.1-r1
index d4705b63449c..eb4551aea5cd 100644
--- a/metadata/md5-cache/app-misc/task-2.5.1-r1
+++ b/metadata/md5-cache/app-misc/task-2.5.1-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=sys-libs/readline:0 sync? ( net-libs/gnutls:0= ) elibc_glibc? ( sys-apps/util-linux )
 SLOT=0
 SRC_URI=https://taskwarrior.org/download/task-2.5.1.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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_=06d49e3201230a2b0be2fd52db9e7367
diff --git a/metadata/md5-cache/app-misc/taskd-1.1.0-r2 b/metadata/md5-cache/app-misc/taskd-1.1.0-r2
index ca04a9f87b01..a8817d30bed4 100644
--- a/metadata/md5-cache/app-misc/taskd-1.1.0-r2
+++ b/metadata/md5-cache/app-misc/taskd-1.1.0-r2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=net-libs/gnutls:= sys-apps/util-linux sys-libs/readline:0=
 SLOT=0
 SRC_URI=https://taskwarrior.org/download/taskd-1.1.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=44a96694ca021381bf9f231a5de0b1ae
diff --git a/metadata/md5-cache/app-misc/timew-1.0.0 b/metadata/md5-cache/app-misc/timew-1.0.0
index b859115db20e..49ce0d88febd 100644
--- a/metadata/md5-cache/app-misc/timew-1.0.0
+++ b/metadata/md5-cache/app-misc/timew-1.0.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://taskwarrior.org/download/timew-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=32fd2f8647747571f98f826ab4b949a8
diff --git a/metadata/md5-cache/app-misc/timew-1.1.1 b/metadata/md5-cache/app-misc/timew-1.1.1
index 4d29b4cfd93c..1770b3c8ac40 100644
--- a/metadata/md5-cache/app-misc/timew-1.1.1
+++ b/metadata/md5-cache/app-misc/timew-1.1.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://taskwarrior.org/download/timew-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7c49fedf27184405d2c7aa382eb238e8
diff --git a/metadata/md5-cache/app-misc/tmux-2.7 b/metadata/md5-cache/app-misc/tmux-2.7
index 23b5fd13c714..79bc0c1a22bc 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_=894c7738bd261b9ad49ba3acbc6be5f4
+_md5_=64f6d683ea38b7a23a81b825af46bec6
diff --git a/metadata/md5-cache/app-misc/tmux-mem-cpu-load-3.4.0 b/metadata/md5-cache/app-misc/tmux-mem-cpu-load-3.4.0
index 3acd89196265..dd02682b8a94 100644
--- a/metadata/md5-cache/app-misc/tmux-mem-cpu-load-3.4.0
+++ b/metadata/md5-cache/app-misc/tmux-mem-cpu-load-3.4.0
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/thewtex/tmux-mem-cpu-load/archive/v3.4.0.tar.gz -> tmux-mem-cpu-load-3.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ab23875e338deb5b5d820833910e5281
diff --git a/metadata/md5-cache/app-misc/tmux-mem-cpu-load-9999 b/metadata/md5-cache/app-misc/tmux-mem-cpu-load-9999
index 32aeffce7b68..cfafc52e2ec9 100644
--- a/metadata/md5-cache/app-misc/tmux-mem-cpu-load-9999
+++ b/metadata/md5-cache/app-misc/tmux-mem-cpu-load-9999
@@ -5,5 +5,5 @@ EAPI=6
 HOMEPAGE=https://github.com/thewtex/tmux-mem-cpu-load/
 LICENSE=Apache-2.0
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c7728100d5681899f34c5604268b22fb
diff --git a/metadata/md5-cache/app-misc/tracker-1.12.4 b/metadata/md5-cache/app-misc/tracker-1.12.4
index 437116f3cb5e..a40d35d0f0dd 100644
--- a/metadata/md5-cache/app-misc/tracker-1.12.4
+++ b/metadata/md5-cache/app-misc/tracker-1.12.4
@@ -11,5 +11,5 @@ RDEPEND=>=app-i18n/enca-1.9 >=dev-db/sqlite-3.20:= >=dev-libs/glib-2.44:2 >=dev-
 REQUIRED_USE=?? ( gstreamer ffmpeg ) cue? ( gstreamer ) upnp-av? ( gstreamer ) !miner-fs? ( !cue !exif !flac !gif !gsf !iptc !iso !jpeg !mp3 !pdf !playlist !tiff !vorbis !xml !xmp !xps )
 SLOT=0/100
 SRC_URI=mirror://gnome/sources/tracker/1.12/tracker-1.12.4.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0abe9fe8e5c01e926bac1ed139f0b420
diff --git a/metadata/md5-cache/app-misc/trash-cli-0.12.9.14-r2 b/metadata/md5-cache/app-misc/trash-cli-0.12.9.14-r2
index 9dac4e4002bf..152fa1f78dc5 100644
--- a/metadata/md5-cache/app-misc/trash-cli-0.12.9.14-r2
+++ b/metadata/md5-cache/app-misc/trash-cli-0.12.9.14-r2
@@ -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/andreafrancia/trash-cli/tarball/0.12.9.14 -> trash-cli-0.12.9.14.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c125bec99e1de6b669cee6cae2c2f125
diff --git a/metadata/md5-cache/app-misc/trash-cli-0.16.12.29 b/metadata/md5-cache/app-misc/trash-cli-0.16.12.29
index 262239f51382..7dc57949cc0b 100644
--- a/metadata/md5-cache/app-misc/trash-cli-0.16.12.29
+++ b/metadata/md5-cache/app-misc/trash-cli-0.16.12.29
@@ -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/andreafrancia/trash-cli/tarball/0.16.12.29 -> trash-cli-0.16.12.29.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=80f5c55bffcc8b936e5d1a411582f200
diff --git a/metadata/md5-cache/app-misc/trash-cli-0.17.1.14 b/metadata/md5-cache/app-misc/trash-cli-0.17.1.14
index 43001edd8d02..191750a76fe3 100644
--- a/metadata/md5-cache/app-misc/trash-cli-0.17.1.14
+++ b/metadata/md5-cache/app-misc/trash-cli-0.17.1.14
@@ -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/andreafrancia/trash-cli/archive/0.17.1.14.tar.gz -> trash-cli-0.17.1.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=43d590eb9a1f3355dc04819ff62ee392
diff --git a/metadata/md5-cache/app-misc/trash-cli-0.17.1.14_p20170816 b/metadata/md5-cache/app-misc/trash-cli-0.17.1.14_p20170816
index d140766a1c46..e256930d3faf 100644
--- a/metadata/md5-cache/app-misc/trash-cli-0.17.1.14_p20170816
+++ b/metadata/md5-cache/app-misc/trash-cli-0.17.1.14_p20170816
@@ -10,5 +10,5 @@ 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_6 )
 SLOT=0
 SRC_URI=https://github.com/andreafrancia/trash-cli/archive/5abecd53e1d84f2a5fd3fc60d2f5d71e518826c5.tar.gz -> trash-cli-0.17.1.14_p20170816.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ad79785c71b8e7984d7f1a3dcf2f032e
diff --git a/metadata/md5-cache/app-misc/vcontrold-0.98.5 b/metadata/md5-cache/app-misc/vcontrold-0.98.5
index 8286a7a0f63e..6c73d85fad56 100644
--- a/metadata/md5-cache/app-misc/vcontrold-0.98.5
+++ b/metadata/md5-cache/app-misc/vcontrold-0.98.5
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/libxml2
 SLOT=0
 SRC_URI=https://github.com/openv/vcontrold/archive/v0.98.5.tar.gz -> vcontrold-0.98.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=85030ade1f83c41f9a9abda824df2b0f
diff --git a/metadata/md5-cache/app-misc/vifm-0.9.1 b/metadata/md5-cache/app-misc/vifm-0.9.1
index 0366c8f11996..8ff066bfe384 100644
--- a/metadata/md5-cache/app-misc/vifm-0.9.1
+++ b/metadata/md5-cache/app-misc/vifm-0.9.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.9-r3:0 magic? ( sys-apps/file ) gtk? ( x11-libs/gtk+:2 ) X? ( x11-libs/libX11 ) vim? ( || ( app-editors/vim app-editors/gvim ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/vifm/vifm-0.9.1.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=62649f0264fc11e4e4fa7e314000c9d1
diff --git a/metadata/md5-cache/app-misc/webcomics-collector-0.7.3-r1 b/metadata/md5-cache/app-misc/webcomics-collector-0.7.3-r1
index 897aab0dcbcf..e35651ef39ab 100644
--- a/metadata/md5-cache/app-misc/webcomics-collector-0.7.3-r1
+++ b/metadata/md5-cache/app-misc/webcomics-collector-0.7.3-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[gdbm] ) >=dev
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://collector.skumleren.net/releases/collector-0.7.3.tar.bz2
-_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=adf332d3ab84d86c8831576583afc5f2
diff --git a/metadata/md5-cache/app-misc/workrave-1.10.20 b/metadata/md5-cache/app-misc/workrave-1.10.20
index 111bfb8dee99..613e5f59b66c 100644
--- a/metadata/md5-cache/app-misc/workrave-1.10.20
+++ b/metadata/md5-cache/app-misc/workrave-1.10.20
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.0:3[introspection?,X] >=dev-cpp/gtkmm-3.18.0:3.0 >=dev-cpp/glibmm-2.28.0:2 >=dev-libs/libsigc++-2.2.4.2:2 ayatana? ( >=dev-libs/libdbusmenu-0.4[gtk3,introspection] >=dev-libs/libindicator-0.4:3 ) gnome? ( >=gnome-base/gnome-shell-3.6.2 ) gstreamer? ( media-libs/gstreamer:1.0[introspection?] media-libs/gst-plugins-base:1.0[introspection?] media-plugins/gst-plugins-meta:1.0 ) introspection? ( dev-libs/gobject-introspection:= ) mate? ( mate-base/mate-applets ) pulseaudio? ( >=media-sound/pulseaudio-0.9.15 ) xfce? ( >=x11-libs/gtk+-2.6.0:2[introspection?] >=xfce-base/xfce4-panel-4.4 ) x11-libs/libXScrnSaver x11-libs/libSM x11-libs/libX11 x11-libs/libXtst x11-libs/libXt x11-libs/libXmu python_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/cheetah >=dev-util/intltool-0.40.0 sys-devel/autoconf-archive x11-base/xorg-proto virtual/pkgconfig doc? ( app-text/docbook-sgml-utils app-text/xmlto ) nls? ( >=sys-devel/gettext-0.17 ) >=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.28.0:2 >=x11-libs/gtk+-3.0:3[introspection?,X] >=dev-cpp/gtkmm-3.18.0:3.0 >=dev-cpp/glibmm-2.28.0:2 >=dev-libs/libsigc++-2.2.4.2:2 ayatana? ( >=dev-libs/libdbusmenu-0.4[gtk3,introspection] >=dev-libs/libindicator-0.4:3 ) gnome? ( >=gnome-base/gnome-shell-3.6.2 ) gstreamer? ( media-libs/gstreamer:1.0[introspection?] media-libs/gst-plugins-base:1.0[introspection?] media-plugins/gst-plugins-meta:1.0 ) introspection? ( dev-libs/gobject-introspection:= ) mate? ( mate-base/mate-applets ) pulseaudio? ( >=media-sound/pulseaudio-0.9.15 ) xfce? ( >=x11-libs/gtk+-2.6.0:2[introspection?] >=xfce-base/xfce4-panel-4.4 ) x11-libs/libXScrnSaver x11-libs/libSM x11-libs/libX11 x11-libs/libXtst x11-libs/libXt x11-libs/libXmu python_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/cheetah dev-util/glib-utils >=dev-util/intltool-0.40.0 sys-devel/autoconf-archive x11-base/xorg-proto virtual/pkgconfig doc? ( app-text/docbook-sgml-utils app-text/xmlto ) nls? ( >=sys-devel/gettext-0.17 ) >=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=Helpful utility to attack Repetitive Strain Injury (RSI)
 EAPI=6
 HOMEPAGE=http://www.workrave.org/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.0:3[introspection?,X] >=dev-c
 REQUIRED_USE=ayatana? ( introspection ) python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/rcaelers/workrave/archive/v1_10_20.tar.gz -> workrave-1.10.20.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=ce737b2f519a856b0b0758e2492ce39b
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=2a7cd079825ae2639f3d8bd3175bc2bd
diff --git a/metadata/md5-cache/app-misc/xmind-3.5.3.201506180105-r2 b/metadata/md5-cache/app-misc/xmind-3.5.3.201506180105-r2
index 900a0599649c..e2f6447d7a43 100644
--- a/metadata/md5-cache/app-misc/xmind-3.5.3.201506180105-r2
+++ b/metadata/md5-cache/app-misc/xmind-3.5.3.201506180105-r2
@@ -8,5 +8,5 @@ LICENSE=EPL-1.0 LGPL-3
 RDEPEND=>=virtual/jre-1.5 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://dl2.xmind.net/xmind-downloads/xmind-portable-3.5.3.201506180105.zip https://dev.gentoo.org/~creffett/distfiles/xmind-icons.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-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=b61b2695899d930261580226def15a24
diff --git a/metadata/md5-cache/app-misc/xmind-3.7.6_p201801311814 b/metadata/md5-cache/app-misc/xmind-3.7.6_p201801311814
index 209838f6af61..1af4690e26bc 100644
--- a/metadata/md5-cache/app-misc/xmind-3.7.6_p201801311814
+++ b/metadata/md5-cache/app-misc/xmind-3.7.6_p201801311814
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0 LGPL-3
 RDEPEND=>=virtual/jre-1.8 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://dl2.xmind.net/xmind-downloads/xmind-8-update7-linux.zip https://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e64b2bf1d92151d2ecba9a0a3844d7f8
diff --git a/metadata/md5-cache/app-misc/yagtd-0.3.4-r1 b/metadata/md5-cache/app-misc/yagtd-0.3.4-r1
index bba61e4afd99..cdd260c2d46b 100644
--- a/metadata/md5-cache/app-misc/yagtd-0.3.4-r1
+++ b/metadata/md5-cache/app-misc/yagtd-0.3.4-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=http://download.gna.org/yagtd/yagtd-0.3.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8bd2f7ed1219c9d8360a5a909e31de7b
diff --git a/metadata/md5-cache/app-misc/yq-2.1.2 b/metadata/md5-cache/app-misc/yq-2.1.2
index 89cd0e125810..f35c340c3d33 100644
--- a/metadata/md5-cache/app-misc/yq-2.1.2
+++ b/metadata/md5-cache/app-misc/yq-2.1.2
@@ -10,5 +10,5 @@ RDEPEND=app-misc/jq >=dev-python/pyyaml-3.11[python_targets_python2_7(-)?,python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/y/yq/yq-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2d7aa65ab62825fbe21be5d48d2ccac4
diff --git a/metadata/md5-cache/app-misc/yq-2.3.0 b/metadata/md5-cache/app-misc/yq-2.3.0
index 260475498aa5..8a4791aa67e1 100644
--- a/metadata/md5-cache/app-misc/yq-2.3.0
+++ b/metadata/md5-cache/app-misc/yq-2.3.0
@@ -10,5 +10,5 @@ RDEPEND=app-misc/jq >=dev-python/pyyaml-3.11[python_targets_python2_7(-)?,python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/y/yq/yq-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=51fd84d0aed7bbaccff3702fd698721e
diff --git a/metadata/md5-cache/app-misc/yq-2.3.3 b/metadata/md5-cache/app-misc/yq-2.3.3
index 120ae56a2d58..4aa1f9cb36bc 100644
--- a/metadata/md5-cache/app-misc/yq-2.3.3
+++ b/metadata/md5-cache/app-misc/yq-2.3.3
@@ -10,5 +10,5 @@ RDEPEND=app-misc/jq >=dev-python/pyyaml-3.11[python_targets_python2_7(-)?,python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/y/yq/yq-2.3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=51fd84d0aed7bbaccff3702fd698721e
diff --git a/metadata/md5-cache/app-misc/yq-2.3.4 b/metadata/md5-cache/app-misc/yq-2.3.4
index 78cdd91f4a2b..420e5009e8c7 100644
--- a/metadata/md5-cache/app-misc/yq-2.3.4
+++ b/metadata/md5-cache/app-misc/yq-2.3.4
@@ -10,5 +10,5 @@ RDEPEND=app-misc/jq >=dev-python/pyyaml-3.11[python_targets_python2_7(-)?,python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/y/yq/yq-2.3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2d7aa65ab62825fbe21be5d48d2ccac4
diff --git a/metadata/md5-cache/app-misc/yworklog-0.0.7 b/metadata/md5-cache/app-misc/yworklog-0.0.7
index 961ad24b26ce..4a29763c2947 100644
--- a/metadata/md5-cache/app-misc/yworklog-0.0.7
+++ b/metadata/md5-cache/app-misc/yworklog-0.0.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/sqlalchemy dev-python/cement[python_targets_python2_7(-)?,-py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/y/yworklog/yworklog-0.0.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=c385af190a0e6288f97a89a8a8a6f014
diff --git a/metadata/md5-cache/app-mobilephone/Manifest.gz b/metadata/md5-cache/app-mobilephone/Manifest.gz
index 222877d28b2d..04d75eb19bed 100644
--- a/metadata/md5-cache/app-mobilephone/Manifest.gz
+++ b/metadata/md5-cache/app-mobilephone/Manifest.gz
diff --git a/metadata/md5-cache/app-mobilephone/gammu-1.38.5 b/metadata/md5-cache/app-mobilephone/gammu-1.38.5
index 31f3e97e4dba..d9897a8786f8 100644
--- a/metadata/md5-cache/app-mobilephone/gammu-1.38.5
+++ b/metadata/md5-cache/app-mobilephone/gammu-1.38.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2= virtual/libgudev:= bluetooth? ( net-wireless/bluez:= ) curl? ( net-misc/curl:= ) dbi? ( >=dev-db/libdbi-0.8.3:= ) mysql? ( virtual/mysql:= ) postgres? ( dev-db/postgresql:= ) usb? ( virtual/libusb:1= ) dev-util/dialog virtual/libiconv
 SLOT=0
 SRC_URI=https://dl.cihar.com/gammu/releases/gammu-1.38.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=576dfb7aaebef9bd486f533d99f1b68f
diff --git a/metadata/md5-cache/app-mobilephone/gammu-1.39.0 b/metadata/md5-cache/app-mobilephone/gammu-1.39.0
index e5d8629a2b77..35536b669b2b 100644
--- a/metadata/md5-cache/app-mobilephone/gammu-1.39.0
+++ b/metadata/md5-cache/app-mobilephone/gammu-1.39.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2= virtual/libgudev:= bluetooth? ( net-wireless/bluez:= ) curl? ( net-misc/curl:= ) dbi? ( >=dev-db/libdbi-0.8.3:= ) mysql? ( virtual/mysql:= ) postgres? ( dev-db/postgresql:= ) usb? ( virtual/libusb:1= ) dev-util/dialog virtual/libiconv
 SLOT=0
 SRC_URI=https://dl.cihar.com/gammu/releases/gammu-1.39.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f0ed962562e235efbb7c0b4f79c0f70d
diff --git a/metadata/md5-cache/app-mobilephone/gnokii-0.6.31-r1 b/metadata/md5-cache/app-mobilephone/gnokii-0.6.31-r1
index de5b7c18f698..18bc330cb78f 100644
--- a/metadata/md5-cache/app-mobilephone/gnokii-0.6.31-r1
+++ b/metadata/md5-cache/app-mobilephone/gnokii-0.6.31-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!app-mobilephone/smstools bluetooth? ( kernel_linux? ( net-wireless/bluez ) ) ical? ( dev-libs/libical:= ) pcsc-lite? ( sys-apps/pcsc-lite ) sms? ( dev-libs/glib:2 postgres? ( dev-db/postgresql:* ) mysql? ( virtual/mysql:= ) ) usb? ( virtual/libusb:0 ) X? ( x11-libs/gtk+:2 )
 SLOT=0
 SRC_URI=http://www.gnokii.org/download/gnokii/gnokii-0.6.31.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e3b2a16259100547c759e314f3a22d7b
diff --git a/metadata/md5-cache/app-mobilephone/gnokii-9999 b/metadata/md5-cache/app-mobilephone/gnokii-9999
index 3536fc267ffd..9d1199a57b86 100644
--- a/metadata/md5-cache/app-mobilephone/gnokii-9999
+++ b/metadata/md5-cache/app-mobilephone/gnokii-9999
@@ -7,5 +7,5 @@ IUSE=bluetooth debug ical irda mysql nls +pcsc-lite postgres sms usb X kernel_li
 LICENSE=GPL-2
 RDEPEND=!app-mobilephone/smstools bluetooth? ( kernel_linux? ( net-wireless/bluez ) ) ical? ( dev-libs/libical:= ) pcsc-lite? ( sys-apps/pcsc-lite ) sms? ( dev-libs/glib:2 postgres? ( dev-db/postgresql:* ) mysql? ( virtual/mysql:= ) ) usb? ( virtual/libusb:0 ) X? ( x11-libs/gtk+:2 )
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=af1ad7b144d0b22fabadcc237e14e085
diff --git a/metadata/md5-cache/app-mobilephone/heimdall-1.4.2 b/metadata/md5-cache/app-mobilephone/heimdall-1.4.2
index 8cce90ae85fe..73cdacc15375 100644
--- a/metadata/md5-cache/app-mobilephone/heimdall-1.4.2
+++ b/metadata/md5-cache/app-mobilephone/heimdall-1.4.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/libusb-1.0.18:1= qt5? ( dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtwidgets:5= ) sys-libs/zlib
 SLOT=0
 SRC_URI=https://gitlab.com/BenjaminDobell/Heimdall/-/archive/v1.4.2/Heimdall-v1.4.2.tar.gz -> heimdall-1.4.2.tar.gz
-_eclasses_=cmake-utils	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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=91cf1956f60d9c0ac7d5a52f9772e1a4
diff --git a/metadata/md5-cache/app-mobilephone/heimdall-9999 b/metadata/md5-cache/app-mobilephone/heimdall-9999
index 1295d7bcadb0..0e3016ba944b 100644
--- a/metadata/md5-cache/app-mobilephone/heimdall-9999
+++ b/metadata/md5-cache/app-mobilephone/heimdall-9999
@@ -7,5 +7,5 @@ IUSE=qt5
 LICENSE=MIT
 RDEPEND=>=dev-libs/libusb-1.0.18:1= qt5? ( dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtwidgets:5= ) sys-libs/zlib
 SLOT=0
-_eclasses_=cmake-utils	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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=91cf1956f60d9c0ac7d5a52f9772e1a4
diff --git a/metadata/md5-cache/app-mobilephone/lightblue-0.4-r1 b/metadata/md5-cache/app-mobilephone/lightblue-0.4-r1
index a44c4ee1a703..6608b44d7739 100644
--- a/metadata/md5-cache/app-mobilephone/lightblue-0.4-r1
+++ b/metadata/md5-cache/app-mobilephone/lightblue-0.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/openobex-1.3 >=dev-python/pybluez-0.9[python_targets_pypy(-)?
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/lightblue/lightblue-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cb6743dfd2943283a5b77f20fee13039
diff --git a/metadata/md5-cache/app-mobilephone/obexftp-0.24.2 b/metadata/md5-cache/app-mobilephone/obexftp-0.24.2
index 30a9a5d95dfb..deedc5397fff 100644
--- a/metadata/md5-cache/app-mobilephone/obexftp-0.24.2
+++ b/metadata/md5-cache/app-mobilephone/obexftp-0.24.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/openobex-1.7 net-wireless/bluez perl? ( dev-lang/perl:= ) pyt
 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 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/openobex/obexftp-0.24.2-Source.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	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=71cdf1caeb1d72eb6123518c2864c07b
diff --git a/metadata/md5-cache/app-mobilephone/pysms-0.9.4-r1 b/metadata/md5-cache/app-mobilephone/pysms-0.9.4-r1
index a622e02c7e3a..3f92645a14bd 100644
--- a/metadata/md5-cache/app-mobilephone/pysms-0.9.4-r1
+++ b/metadata/md5-cache/app-mobilephone/pysms-0.9.4-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pysms/pysms-0.9.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ffc48973beaf30c1a0ef10dd17c20b68
diff --git a/metadata/md5-cache/app-mobilephone/wammu-0.43 b/metadata/md5-cache/app-mobilephone/wammu-0.43
index 4414de065191..dba16f94c705 100644
--- a/metadata/md5-cache/app-mobilephone/wammu-0.43
+++ b/metadata/md5-cache/app-mobilephone/wammu-0.43
@@ -10,5 +10,5 @@ RDEPEND=>=app-mobilephone/gammu-1.36 dev-python/python-gammu >=dev-python/wxpyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://dl.cihar.com/wammu/v0/wammu-0.43.tar.xz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=29d2e5a448d5a24fc02c4482fff6f1d0
diff --git a/metadata/md5-cache/app-mobilephone/wammu-0.44 b/metadata/md5-cache/app-mobilephone/wammu-0.44
index 640bf886f70f..133558fa847c 100644
--- a/metadata/md5-cache/app-mobilephone/wammu-0.44
+++ b/metadata/md5-cache/app-mobilephone/wammu-0.44
@@ -10,5 +10,5 @@ RDEPEND=>=app-mobilephone/gammu-1.36 dev-python/python-gammu >=dev-python/wxpyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://dl.cihar.com/wammu/v0/wammu-0.44.tar.xz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=92d4358f47ed28a36e048e60a2fbe69c
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index a56e33685a97..4b57cb045e73 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/abiword-3.0.2 b/metadata/md5-cache/app-office/abiword-3.0.2
index 83c83ddd25c7..ee5ccc941f31 100644
--- a/metadata/md5-cache/app-office/abiword-3.0.2
+++ b/metadata/md5-cache/app-office/abiword-3.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=app-text/wv-1.2 >=dev-libs/fribidi-0.10.4 >=dev-libs/glib-2.16:2 >=dev
 REQUIRED_USE=!plugins? ( !collab !grammar !latex !math !ots !readline !thesaurus !wordperfect !wmf )
 SLOT=2
 SRC_URI=http://www.abisource.com/downloads/abiword/3.0.2/source/abiword-3.0.2.tar.gz https://dev.gentoo.org/~mgorny/dist/abiword-3.0.2-patchset.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5194600c6467edf37e73276e2beb48af
diff --git a/metadata/md5-cache/app-office/abiword-3.0.2-r1 b/metadata/md5-cache/app-office/abiword-3.0.2-r1
index 0c2e8f51eb4c..7d4cd470d811 100644
--- a/metadata/md5-cache/app-office/abiword-3.0.2-r1
+++ b/metadata/md5-cache/app-office/abiword-3.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=app-text/wv-1.2 >=dev-libs/fribidi-0.10.4 >=dev-libs/glib-2.16:2 >=dev
 REQUIRED_USE=!plugins? ( !collab !grammar !latex !math !ots !readline !thesaurus !wordperfect !wmf )
 SLOT=2
 SRC_URI=http://www.abisource.com/downloads/abiword/3.0.2/source/abiword-3.0.2.tar.gz https://dev.gentoo.org/~mgorny/dist/abiword-3.0.2-patchset.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b06e78f95ce3877990d75946961902f7
diff --git a/metadata/md5-cache/app-office/abiword-docs-3.0.1 b/metadata/md5-cache/app-office/abiword-docs-3.0.1
index e0acd46c2ecc..a0b77f328769 100644
--- a/metadata/md5-cache/app-office/abiword-docs-3.0.1
+++ b/metadata/md5-cache/app-office/abiword-docs-3.0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-office/abiword-3.0.1
 SLOT=0
 SRC_URI=http://www.abisource.com/downloads/abiword/3.0.1/source/abiword-docs-3.0.1.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=9a76de4c3e5406bae82f2e33b8f06c09
diff --git a/metadata/md5-cache/app-office/abiword-docs-3.0.2 b/metadata/md5-cache/app-office/abiword-docs-3.0.2
index 8c689ea299c2..5985d7c09ee1 100644
--- a/metadata/md5-cache/app-office/abiword-docs-3.0.2
+++ b/metadata/md5-cache/app-office/abiword-docs-3.0.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-office/abiword-3.0.2
 SLOT=0
 SRC_URI=http://www.abisource.com/downloads/abiword/3.0.2/source/abiword-docs-3.0.2.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=8d50450a4b63fc5f1bb6248a96c7146e
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 88eaac18748a..f46d838cdb5f 100644
--- a/metadata/md5-cache/app-office/calligra-3.1.0-r2
+++ b/metadata/md5-cache/app-office/calligra-3.1.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0: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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _md5_=497357cd86107413c6617ee8dd31efe4
diff --git a/metadata/md5-cache/app-office/dia-0.97.3 b/metadata/md5-cache/app-office/dia-0.97.3
index 4809d88991d7..0ba731f64241 100644
--- a/metadata/md5-cache/app-office/dia-0.97.3
+++ b/metadata/md5-cache/app-office/dia-0.97.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2:2 dev-libs/libxml2 dev-libs/libxslt dev-libs/popt >=me
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/dia/0.97/dia-0.97.3.tar.xz
-_eclasses_=autotools	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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d151546f2deae804f15e4598e7caf9c1
diff --git a/metadata/md5-cache/app-office/dia2code-1.0.0 b/metadata/md5-cache/app-office/dia2code-1.0.0
index cefef38cb3b6..89dabc423b3d 100644
--- a/metadata/md5-cache/app-office/dia2code-1.0.0
+++ b/metadata/md5-cache/app-office/dia2code-1.0.0
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~ia64 ~ppc ~sparc x86
 LICENSE=GPL-3+
 SLOT=0
 SRC_URI=mirror://sourceforge/dia2code/dia2code-1.0.0.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=8730590a0e78dbf464a6dd99f5c574bd
diff --git a/metadata/md5-cache/app-office/glabels-3.4.0 b/metadata/md5-cache/app-office/glabels-3.4.0
index e4c52edb0cfd..95aa44466a89 100644
--- a/metadata/md5-cache/app-office/glabels-3.4.0
+++ b/metadata/md5-cache/app-office/glabels-3.4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 FDL-1.1 LGPL-2
 RDEPEND=>=dev-libs/glib-2.42.0:2 >=x11-libs/gtk+-3.14.0:3 >=dev-libs/libxml2-2.9.0:2 >=gnome-base/librsvg-2.39.0:2 >=x11-libs/cairo-1.14.0 >=x11-libs/pango-1.36.1 barcode? ( >=app-text/barcode-0.98 >=media-gfx/qrencode-3.1 ) eds? ( >=gnome-extra/evolution-data-server-3.12.0:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glabels/3.4/glabels-3.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ecda2ab7b3b1b1e837376c8c3f6a8570
diff --git a/metadata/md5-cache/app-office/glabels-3.4.1 b/metadata/md5-cache/app-office/glabels-3.4.1
index 2ccbc5e8e0fe..adee1c2455ec 100644
--- a/metadata/md5-cache/app-office/glabels-3.4.1
+++ b/metadata/md5-cache/app-office/glabels-3.4.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+ LGPL-3+ CC-BY-SA-3.0 MIT
 RDEPEND=>=dev-libs/glib-2.42.0:2 >=x11-libs/gtk+-3.14.0:3 >=dev-libs/libxml2-2.9.0:2 >=gnome-base/librsvg-2.39.0:2 >=x11-libs/cairo-1.14.0 >=x11-libs/pango-1.36.1 barcode? ( >=app-text/barcode-0.98 >=media-gfx/qrencode-3.1 ) eds? ( >=gnome-extra/evolution-data-server-3.12.0:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glabels/3.4/glabels-3.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=98c1a0c506a99828e911b7539f29052f
diff --git a/metadata/md5-cache/app-office/gnucash-2.7.4-r1 b/metadata/md5-cache/app-office/gnucash-2.7.4-r1
index bb497906bf35..0912874f213e 100644
--- a/metadata/md5-cache/app-office/gnucash-2.7.4-r1
+++ b/metadata/md5-cache/app-office/gnucash-2.7.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/libxml2-2.7.0:2 >=dev-scheme/guile-2
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
index 1348795b0c89..9d8102dd9cde 100644
--- a/metadata/md5-cache/app-office/gnucash-3.2
+++ b/metadata/md5-cache/app-office/gnucash-3.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/libxml2-2.7.0:2 >=dev-scheme/guile-2
 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	89bb9f083a2590d9b447fd0b78a96186
+_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/gnucash-3.2-r2 b/metadata/md5-cache/app-office/gnucash-3.2-r2
index 47a93f3c73ea..264c6f162e02 100644
--- a/metadata/md5-cache/app-office/gnucash-3.2-r2
+++ b/metadata/md5-cache/app-office/gnucash-3.2-r2
@@ -4,12 +4,12 @@ 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 +gui python_targets_python3_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
+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 >=sys-libs/zlib-1.1.4 >=dev-scheme/guile-2.0.0:12=[regex] dev-libs/boost:=[icu,nls] dev-libs/icu:= dev-libs/libxslt aqbanking? ( >=net-libs/aqbanking-5[gtk,ofx?] sys-libs/gwenhywfar[gtk] chipcard? ( sys-libs/libchipcard ) ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gui? ( gnome-base/dconf net-libs/webkit-gtk:4= >=x11-libs/gtk+-3.14.0:3 ) 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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=7f2af2d752725a753a905134e597852e
+_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_=584d976a9373f92662e5a5cfcf241107
diff --git a/metadata/md5-cache/app-office/gnucash-3.3 b/metadata/md5-cache/app-office/gnucash-3.3
new file mode 100644
index 000000000000..6a0b15f3336a
--- /dev/null
+++ b/metadata/md5-cache/app-office/gnucash-3.3
@@ -0,0 +1,15 @@
+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 >=sys-libs/zlib-1.1.4 >=dev-scheme/guile-2.0.0:12=[regex] dev-libs/boost:=[icu,nls] dev-libs/icu:= dev-libs/libxslt aqbanking? ( >=net-libs/aqbanking-5[gtk,ofx?] sys-libs/gwenhywfar[gtk] chipcard? ( sys-libs/libchipcard ) ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gui? ( gnome-base/dconf net-libs/webkit-gtk:4= >=x11-libs/gtk+-3.14.0:3 ) 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 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 +gui python_targets_python3_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.3 gnome-extra/yelp )
+RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/libxml2-2.7.0:2 >=sys-libs/zlib-1.1.4 >=dev-scheme/guile-2.0.0:12=[regex] dev-libs/boost:=[icu,nls] dev-libs/icu:= dev-libs/libxslt aqbanking? ( >=net-libs/aqbanking-5[gtk,ofx?] sys-libs/gwenhywfar[gtk] chipcard? ( sys-libs/libchipcard ) ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gui? ( gnome-base/dconf net-libs/webkit-gtk:4= >=x11-libs/gtk+-3.14.0:3 ) 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.3/gnucash-3.3.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_=7f2af2d752725a753a905134e597852e
diff --git a/metadata/md5-cache/app-office/gnumeric-1.12.38 b/metadata/md5-cache/app-office/gnumeric-1.12.38
index 8da1282173e2..88fc8fcdaeb4 100644
--- a/metadata/md5-cache/app-office/gnumeric-1.12.38
+++ b/metadata/md5-cache/app-office/gnumeric-1.12.38
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnumeric/1.12/gnumeric-1.12.38.tar.xz
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=3feacd488dde92718847b84b22683795
diff --git a/metadata/md5-cache/app-office/gnumeric-1.12.39 b/metadata/md5-cache/app-office/gnumeric-1.12.39
index 36b86b87d670..958bb673521d 100644
--- a/metadata/md5-cache/app-office/gnumeric-1.12.39
+++ b/metadata/md5-cache/app-office/gnumeric-1.12.39
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnumeric/1.12/gnumeric-1.12.39.tar.xz
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=c197703b9374936be9c8f25d58e81d14
diff --git a/metadata/md5-cache/app-office/grisbi-1.0.2 b/metadata/md5-cache/app-office/grisbi-1.0.2
index d40b5d026547..70812173937f 100644
--- a/metadata/md5-cache/app-office/grisbi-1.0.2
+++ b/metadata/md5-cache/app-office/grisbi-1.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2:2 >=dev-libs/glib-2.18.0:2 >=x11-libs/gtk+-2.12.0:2 x11-misc/xdg-utils ssl? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( >=dev-libs/openssl-0.9.5:0= ) ) ofx? ( >=dev-libs/libofx-0.7.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/grisbi/grisbi%20stable/1.0.x/grisbi-1.0.2.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=ecf3631cafc25ffe19a480e591e15e36
diff --git a/metadata/md5-cache/app-office/grisbi-1.0.4 b/metadata/md5-cache/app-office/grisbi-1.0.4
index 4ca0fb0f1ea4..aad3d4833f5d 100644
--- a/metadata/md5-cache/app-office/grisbi-1.0.4
+++ b/metadata/md5-cache/app-office/grisbi-1.0.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2:2 >=dev-libs/glib-2.18.0:2 >=x11-libs/gtk+-2.12.0:2 x11-misc/xdg-utils ssl? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( >=dev-libs/openssl-0.9.5:0= ) ) ofx? ( >=dev-libs/libofx-0.7.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/grisbi/grisbi%20stable/1.0.x/grisbi-1.0.4.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=f56355f84ed78c575b587b86c38f4b46
diff --git a/metadata/md5-cache/app-office/gtg-0.3.1 b/metadata/md5-cache/app-office/gtg-0.3.1
index f01a1be88c38..0d3bd5332315 100644
--- a/metadata/md5-cache/app-office/gtg-0.3.1
+++ b/metadata/md5-cache/app-office/gtg-0.3.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://launchpad.net/gtg/0.3/0.3.1/+download/gtg-0.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=aeb6d5493f8ac9369a0fb9cf929bbdfe
diff --git a/metadata/md5-cache/app-office/homebank-5.1.3 b/metadata/md5-cache/app-office/homebank-5.1.3
index 5b91e7568867..cbf7a70f7470 100644
--- a/metadata/md5-cache/app-office/homebank-5.1.3
+++ b/metadata/md5-cache/app-office/homebank-5.1.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.39 >=net-libs/libsoup-2.26 x11-libs/cairo x11-libs/gdk-pixbuf >=x11-libs/gtk+-3.12:3 x11-libs/pango ofx? ( >=dev-libs/libofx-0.8.3 )
 SLOT=0
 SRC_URI=http://homebank.free.fr/public/homebank-5.1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d8c4247ca5e0348d339f10ee288099b2
diff --git a/metadata/md5-cache/app-office/homebank-5.1.8 b/metadata/md5-cache/app-office/homebank-5.1.8
index 45f8dea1356a..9503bb8117c9 100644
--- a/metadata/md5-cache/app-office/homebank-5.1.8
+++ b/metadata/md5-cache/app-office/homebank-5.1.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.39 >=net-libs/libsoup-2.26 x11-libs/cairo x11-libs/gdk-pixbuf >=x11-libs/gtk+-3.22:3 x11-libs/pango ofx? ( >=dev-libs/libofx-0.8.3 )
 SLOT=0
 SRC_URI=http://homebank.free.fr/public/homebank-5.1.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=15cb3f25264a89f8249decb50176ca3b
diff --git a/metadata/md5-cache/app-office/kexi-3.1.0 b/metadata/md5-cache/app-office/kexi-3.1.0
index 4eb2d05f6729..b586ba4b5951 100644
--- a/metadata/md5-cache/app-office/kexi-3.1.0
+++ b/metadata/md5-cache/app-office/kexi-3.1.0
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 988de8a86fbe..8c9065ae0d89 100644
--- a/metadata/md5-cache/app-office/kmymoney-5.0.1-r2
+++ b/metadata/md5-cache/app-office/kmymoney-5.0.1-r2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0: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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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_=9cdf06ea896ec55483f15c445cdcfc47
diff --git a/metadata/md5-cache/app-office/kraft-0.80 b/metadata/md5-cache/app-office/kraft-0.80
index ab8dc7b7bc64..6972b37f0e5c 100644
--- a/metadata/md5-cache/app-office/kraft-0.80
+++ b/metadata/md5-cache/app-office/kraft-0.80
@@ -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 >=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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/ledger-3.1.1 b/metadata/md5-cache/app-office/ledger-3.1.1
index eb2b4897ab71..30a6f5c194d4 100644
--- a/metadata/md5-cache/app-office/ledger-3.1.1
+++ b/metadata/md5-cache/app-office/ledger-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[python?] dev-libs/gmp:0= dev-libs/mpfr:0= emacs? ( virt
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ledger/ledger/archive/v3.1.1.tar.gz -> ledger-3.1.1.tar.gz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	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_=1f5fe91e87a6a5e38aae52f720940f88
diff --git a/metadata/md5-cache/app-office/ledger-3.1.1-r1 b/metadata/md5-cache/app-office/ledger-3.1.1-r1
index e1b116f3d66d..b8780de94206 100644
--- a/metadata/md5-cache/app-office/ledger-3.1.1-r1
+++ b/metadata/md5-cache/app-office/ledger-3.1.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ledger/ledger/archive/v3.1.1.tar.gz -> ledger-3.1.1.tar.gz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	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_=d448be7468bd047b11e15abcb7900f15
diff --git a/metadata/md5-cache/app-office/ledger-3.1.1-r2 b/metadata/md5-cache/app-office/ledger-3.1.1-r2
index 64f69c1ef59a..526ca28d0326 100644
--- a/metadata/md5-cache/app-office/ledger-3.1.1-r2
+++ b/metadata/md5-cache/app-office/ledger-3.1.1-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ledger/ledger/archive/v3.1.1.tar.gz -> ledger-3.1.1.tar.gz https://github.com/ledger/ledger/commit/de1b48a013b6f4bdf68f7edf333db63a0994ef20.patch
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	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_=24fec2d2b57c26977dfd66916192e18f
diff --git a/metadata/md5-cache/app-office/libalkimia-7.0.1 b/metadata/md5-cache/app-office/libalkimia-7.0.1
index 9843053eff33..74d3c600e461 100644
--- a/metadata/md5-cache/app-office/libalkimia-7.0.1
+++ b/metadata/md5-cache/app-office/libalkimia-7.0.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 80a253d1eb11..9f5046d527ce 100644
--- a/metadata/md5-cache/app-office/libalkimia-7.0.2
+++ b/metadata/md5-cache/app-office/libalkimia-7.0.2
@@ -9,5 +9,5 @@ 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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/app-office/libreoffice-6.0.3.2 b/metadata/md5-cache/app-office/libreoffice-6.0.3.2
deleted file mode 100644
index 52ee2e2b12f8..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-6.0.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.13.3 dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !<sys-devel/make-3.82 >=dev-libs/libatomic_ops-7.2d >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3 dev-util/intltool >=dev-util/mdds-1.2.3:1= media-libs/glm sys-devel/bison sys-devel/flex sys-devel/gettext sys-devel/ucpp sys-libs/zlib virtual/pkgconfig x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core >=virtual/jdk-1.6 ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( app-crypt/gnupg dev-util/cppunit media-fonts/dejavu ) >=app-portage/elt-patches-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 java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=A full office productivity suite
-EAPI=6
-HOMEPAGE=https://www.libreoffice.org
-IUSE=bluetooth +branding coinmp +cups dbus debug eds firebird googledrive gstreamer +gtk gtk2 jemalloc kde libressl mysql odk pdfimport postgres test vlc libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( LGPL-3 MPL-1.1 )
-PDEPEND==app-office/libreoffice-l10n-6.0*
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.13.3 dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/dejavu media-fonts/liberation-fonts media-fonts/libertine || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) kde? ( kde-frameworks/breeze-icons:* ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) bluetooth? ( dbus ) kde? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
-SLOT=0
-SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev.gentoo.org/~asturm/distfiles/libreoffice-6.0.3.2-patchset-01.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-6.0.3.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-6.0.3.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.0.3//libreoffice-6.0.3.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.0.3//libreoffice-help-6.0.3.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.0.3.2/src/libreoffice-6.0.3.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.0.3.2/src/libreoffice-help-6.0.3.2.tar.xz java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=19be265842375245a16f2418cfc8e6d2
diff --git a/metadata/md5-cache/app-office/libreoffice-6.0.6.2 b/metadata/md5-cache/app-office/libreoffice-6.0.6.2
index 92af146b514b..ca6f495dadfe 100644
--- a/metadata/md5-cache/app-office/libreoffice-6.0.6.2
+++ b/metadata/md5-cache/app-office/libreoffice-6.0.6.2
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) bluetooth? ( dbus ) kde? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev.gentoo.org/~asturm/distfiles/libreoffice-6.0.5.2-patchset-01.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-6.0.6.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-6.0.6.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.0.6//libreoffice-6.0.6.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.0.6//libreoffice-help-6.0.6.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.0.6.2/src/libreoffice-6.0.6.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.0.6.2/src/libreoffice-help-6.0.6.2.tar.xz java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	2c6f909675083dce8430b648bf737cb0	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	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	2c6f909675083dce8430b648bf737cb0	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	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=921d3faf29bd735b93dd88a7cf7dee0b
diff --git a/metadata/md5-cache/app-office/libreoffice-6.1.1.2 b/metadata/md5-cache/app-office/libreoffice-6.1.1.2
deleted file mode 100644
index 38415c496aba..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-6.1.1.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 app-text/libnumbertext >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error =dev-libs/liborcus-0.13* dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve sys-libs/zlib:= virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( dev-python/lxml[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(+)?] ) bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 x11-libs/pango ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) >=dev-libs/libatomic_ops-7.2d dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3 dev-util/intltool =dev-util/mdds-1.3*:1= media-libs/glm sys-devel/bison sys-devel/flex sys-devel/gettext sys-devel/ucpp virtual/pkgconfig x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core >=virtual/jdk-1.6 ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( app-crypt/gnupg dev-util/cppunit media-fonts/dejavu ) >=app-portage/elt-patches-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 java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=A full office productivity suite
-EAPI=6
-HOMEPAGE=https://www.libreoffice.org
-IUSE=accessibility bluetooth +branding coinmp +cups dbus debug eds firebird googledrive gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( LGPL-3 MPL-1.1 )
-PDEPEND==app-office/libreoffice-l10n-6.1*
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 app-text/libnumbertext >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error =dev-libs/liborcus-0.13* dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve sys-libs/zlib:= virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( dev-python/lxml[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(+)?] ) bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 x11-libs/pango ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/dejavu media-fonts/liberation-fonts media-fonts/libertine || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) kde? ( kde-frameworks/breeze-icons:* ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) bluetooth? ( dbus ) kde? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
-SLOT=0
-SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-6.1.1.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-6.1.1.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.1.1//libreoffice-6.1.1.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.1.1//libreoffice-help-6.1.1.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.1.1.2/src/libreoffice-6.1.1.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.1.1.2/src/libreoffice-help-6.1.1.2.tar.xz java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	2c6f909675083dce8430b648bf737cb0	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	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=4696a5fa8a7252d44b699af5ae9c5be1
diff --git a/metadata/md5-cache/app-office/libreoffice-6.1.2.1 b/metadata/md5-cache/app-office/libreoffice-6.1.2.1
new file mode 100644
index 000000000000..975a217b76a2
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-6.1.2.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 app-text/libnumbertext >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error =dev-libs/liborcus-0.13* dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve sys-libs/zlib:= virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( dev-python/lxml[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(+)?] ) bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 x11-libs/pango ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) >=dev-libs/libatomic_ops-7.2d dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3 dev-util/intltool =dev-util/mdds-1.3*:1= media-libs/glm sys-devel/bison sys-devel/flex sys-devel/gettext sys-devel/ucpp virtual/pkgconfig x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core >=virtual/jdk-1.6 ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( app-crypt/gnupg dev-util/cppunit media-fonts/dejavu ) >=app-portage/elt-patches-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 java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=A full office productivity suite
+EAPI=6
+HOMEPAGE=https://www.libreoffice.org
+IUSE=accessibility bluetooth +branding coinmp +cups dbus debug eds firebird googledrive gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( LGPL-3 MPL-1.1 )
+PDEPEND==app-office/libreoffice-l10n-6.1*
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 app-text/libnumbertext >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error =dev-libs/liborcus-0.13* dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve sys-libs/zlib:= virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( dev-python/lxml[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(+)?] ) bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 x11-libs/pango ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/dejavu media-fonts/liberation-fonts media-fonts/libertine || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) kde? ( kde-frameworks/breeze-icons:* ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) bluetooth? ( dbus ) kde? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
+SLOT=0
+SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-6.1.2.1.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-6.1.2.1.tar.xz https://download.documentfoundation.org/libreoffice/src/6.1.2//libreoffice-6.1.2.1.tar.xz https://download.documentfoundation.org/libreoffice/src/6.1.2//libreoffice-help-6.1.2.1.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.1.2.1/src/libreoffice-6.1.2.1.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.1.2.1/src/libreoffice-help-6.1.2.1.tar.xz java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	2c6f909675083dce8430b648bf737cb0	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	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=7466ee4139b038f3ef5447d8ddb24796
diff --git a/metadata/md5-cache/app-office/libreoffice-6.1.9999 b/metadata/md5-cache/app-office/libreoffice-6.1.9999
index 3c993a16a041..6902e20fab7c 100644
--- a/metadata/md5-cache/app-office/libreoffice-6.1.9999
+++ b/metadata/md5-cache/app-office/libreoffice-6.1.9999
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) bluetooth? ( dbus ) kde? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=db94177320d17143d316034f109b372f
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=7466ee4139b038f3ef5447d8ddb24796
diff --git a/metadata/md5-cache/app-office/libreoffice-9999 b/metadata/md5-cache/app-office/libreoffice-9999
index 437c89d39738..ff4d510f23f4 100644
--- a/metadata/md5-cache/app-office/libreoffice-9999
+++ b/metadata/md5-cache/app-office/libreoffice-9999
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) bluetooth? ( dbus ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=9208abcffdf61f6cdc3a6cd23924b58a
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=87fba22798c6fbfe60ccedc3d7211668
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-6.0.3.2 b/metadata/md5-cache/app-office/libreoffice-bin-6.0.3.2
deleted file mode 100644
index b9c1c3cbc9fc..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-bin-6.0.3.2
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=dev-util/xdelta:3 >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=A full office productivity suite. Binary package
-EAPI=6
-HOMEPAGE=https://www.libreoffice.org
-IUSE=gnome java kde elibc_FreeBSD java python_targets_python3_5
-KEYWORDS=-* amd64 x86
-LICENSE=LGPL-3
-PDEPEND==app-office/libreoffice-l10n-6.0.3.2*
-RDEPEND=app-text/hunspell:0/1.6 =app-text/libexttextcat-3.4* =app-text/libmwaw-0.3* dev-libs/boost:0/1.65.0 dev-libs/icu:0/60.2 >=media-gfx/graphite2-1.3.10 media-libs/harfbuzz:0/0.9.18[icu] media-libs/libpng:0/16 >=sys-devel/gcc-6.4.0 >=sys-libs/glibc-2.25 virtual/jpeg:62 python_targets_python3_5? ( dev-lang/python:3.5[threads,xml] ) >=dev-lang/python-exec-2:=[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_4(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.13.3 dev-libs/librevenge dev-libs/nspr dev-libs/nss >=dev-libs/openssl-1.0.0d:0 >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender net-print/cups dev-libs/dbus-glib gnome? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 gnome? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) kde? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) !app-office/libreoffice !app-office/openoffice media-fonts/dejavu media-fonts/liberation-fonts media-fonts/libertine || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) kde? ( kde-frameworks/breeze-icons:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=kde? ( !gnome ) gnome? ( !kde ) python_targets_python3_5
-RESTRICT=test strip
-SLOT=0
-SRC_URI=amd64? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-6.0.3.2.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-kde-6.0.3.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-kde-java-6.0.3.2.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-gnome-6.0.3.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-gnome-java-6.0.3.2.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-java-6.0.3.2.xd3 ) ) ) ) x86? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-6.0.3.2.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-kde-6.0.3.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-kde-java-6.0.3.2.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-gnome-6.0.3.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-gnome-java-6.0.3.2.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-java-6.0.3.2.xd3 ) ) ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=18a3a9cf97347a1a8cb4ec36fc7faccf
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-6.0.6.2 b/metadata/md5-cache/app-office/libreoffice-bin-6.0.6.2
index 1175eea44318..598013f34f1c 100644
--- a/metadata/md5-cache/app-office/libreoffice-bin-6.0.6.2
+++ b/metadata/md5-cache/app-office/libreoffice-bin-6.0.6.2
@@ -12,5 +12,5 @@ REQUIRED_USE=kde? ( !gnome ) gnome? ( !kde ) python_targets_python3_6
 RESTRICT=test strip
 SLOT=0
 SRC_URI=amd64? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-bin-libreoffice-6.0.6.2.tar.xz kde? ( !java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-bin-libreoffice-kde-6.0.6.2.xd3 ) java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-bin-libreoffice-kde-java-6.0.6.2.xd3 ) ) gnome? ( !java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-bin-libreoffice-gnome-6.0.6.2.xd3 ) java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-bin-libreoffice-gnome-java-6.0.6.2.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-bin-libreoffice-java-6.0.6.2.xd3 ) ) ) ) x86? ( https://tamiko.kyomu.43-1.org/distfiles/x86-bin-libreoffice-6.0.6.2.tar.xz kde? ( !java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-bin-libreoffice-kde-6.0.6.2.xd3 ) java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-bin-libreoffice-kde-java-6.0.6.2.xd3 ) ) gnome? ( !java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-bin-libreoffice-gnome-6.0.6.2.xd3 ) java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-bin-libreoffice-gnome-java-6.0.6.2.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-bin-libreoffice-java-6.0.6.2.xd3 ) ) ) )
-_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	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b005e508869ef137c7918679bfa7af79
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-debug-6.0.3.2 b/metadata/md5-cache/app-office/libreoffice-bin-debug-6.0.3.2
deleted file mode 100644
index da16ca5e5f6d..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-bin-debug-6.0.3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install unpack
-DEPEND=dev-util/xdelta:3
-DESCRIPTION=LibreOffice, a full office productivity suite. Binary package, debug info
-EAPI=6
-HOMEPAGE=https://www.libreoffice.org
-IUSE=gnome java kde
-KEYWORDS=-* amd64 x86
-LICENSE=LGPL-3
-RDEPEND==app-office/libreoffice-bin-6.0.3.2[gnome=,java=,kde=]
-RESTRICT=test strip
-SLOT=0
-SRC_URI=amd64? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-6.0.3.2.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-kde-6.0.3.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-kde-java-6.0.3.2.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-gnome-6.0.3.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-gnome-java-6.0.3.2.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-java-6.0.3.2.xd3 ) ) ) ) x86? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-6.0.3.2.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-kde-6.0.3.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-kde-java-6.0.3.2.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-gnome-6.0.3.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-gnome-java-6.0.3.2.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-java-6.0.3.2.xd3 ) ) ) )
-_md5_=e038bdcfc6c1bd6bcbc04efb2cff4f87
diff --git a/metadata/md5-cache/app-office/libreoffice-l10n-6.0.3.2 b/metadata/md5-cache/app-office/libreoffice-l10n-6.0.3.2
deleted file mode 100644
index 022d776fb9f2..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-l10n-6.0.3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=app-arch/rpm2targz-9.0.0.3g
-DESCRIPTION=Translations for the Libreoffice suite
-EAPI=6
-HOMEPAGE=https://www.libreoffice.org
-IUSE=offlinehelp l10n_am l10n_ast l10n_bg l10n_bn-IN l10n_bn l10n_bo l10n_bs l10n_ca-valencia l10n_ca l10n_cs l10n_da l10n_de l10n_dz l10n_el l10n_en-GB l10n_en l10n_en-ZA l10n_eo l10n_es l10n_et l10n_eu l10n_fi l10n_fr l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_km l10n_ko l10n_mk l10n_nb l10n_ne l10n_nl l10n_nn l10n_om l10n_pl l10n_pt-BR l10n_pt l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sv l10n_tg l10n_tr l10n_ug l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW l10n_af l10n_ar l10n_as l10n_be l10n_br l10n_brx l10n_cy l10n_dgo l10n_fa l10n_ga l10n_gd l10n_gug l10n_kk l10n_kmr-Latn l10n_kn l10n_kok l10n_ks l10n_lb l10n_lo l10n_lt l10n_lv l10n_mai l10n_ml l10n_mn l10n_mni l10n_mr l10n_my l10n_nr l10n_nso l10n_oc l10n_or l10n_pa l10n_ro l10n_rw l10n_sa l10n_sat l10n_sd l10n_sid l10n_sr-Latn l10n_sr l10n_ss l10n_st l10n_sw-TZ l10n_ta l10n_te l10n_th l10n_tn l10n_ts l10n_tt l10n_uz l10n_ve l10n_xh l10n_zu
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( LGPL-3 MPL-1.1 )
-RDEPEND=app-text/hunspell
-RESTRICT=strip
-SLOT=0
-SRC_URI=l10n_am? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_am.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_am.tar.gz ) ) l10n_ast? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_ast.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ast.tar.gz ) ) l10n_bg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_bg.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_bg.tar.gz ) ) l10n_bn-IN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_bn-IN.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_bn-IN.tar.gz ) ) l10n_bn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_bn.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_bn.tar.gz ) ) l10n_bo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_bo.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_bo.tar.gz ) ) l10n_bs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_bs.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_bs.tar.gz ) ) l10n_ca-valencia? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz ) ) l10n_ca? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_ca.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ca.tar.gz ) ) l10n_cs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_cs.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_cs.tar.gz ) ) l10n_da? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_da.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_da.tar.gz ) ) l10n_de? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_de.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_de.tar.gz ) ) l10n_dz? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_dz.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_dz.tar.gz ) ) l10n_el? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_el.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_el.tar.gz ) ) l10n_en-GB? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_en-GB.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_en-GB.tar.gz ) ) l10n_en? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_en-US.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_en-US.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_en-US.tar.gz ) ) l10n_en-ZA? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_en-ZA.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_en-ZA.tar.gz ) ) l10n_eo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_eo.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_eo.tar.gz ) ) l10n_es? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_es.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_es.tar.gz ) ) l10n_et? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_et.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_et.tar.gz ) ) l10n_eu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_eu.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_eu.tar.gz ) ) l10n_fi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_fi.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_fi.tar.gz ) ) l10n_fr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_fr.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_fr.tar.gz ) ) l10n_gl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_gl.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_gl.tar.gz ) ) l10n_gu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_gu.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_gu.tar.gz ) ) l10n_he? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_he.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_he.tar.gz ) ) l10n_hi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_hi.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_hi.tar.gz ) ) l10n_hr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_hr.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_hr.tar.gz ) ) l10n_hu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_hu.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_hu.tar.gz ) ) l10n_id? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_id.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_id.tar.gz ) ) l10n_is? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_is.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_is.tar.gz ) ) l10n_it? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_it.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_it.tar.gz ) ) l10n_ja? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_ja.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ja.tar.gz ) ) l10n_ka? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_ka.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ka.tar.gz ) ) l10n_km? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_km.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_km.tar.gz ) ) l10n_ko? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_ko.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ko.tar.gz ) ) l10n_mk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_mk.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_mk.tar.gz ) ) l10n_nb? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_nb.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_nb.tar.gz ) ) l10n_ne? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_ne.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ne.tar.gz ) ) l10n_nl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_nl.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_nl.tar.gz ) ) l10n_nn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_nn.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_nn.tar.gz ) ) l10n_om? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_om.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_om.tar.gz ) ) l10n_pl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_pl.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_pl.tar.gz ) ) l10n_pt-BR? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_pt-BR.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_pt-BR.tar.gz ) ) l10n_pt? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_pt.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_pt.tar.gz ) ) l10n_ru? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_ru.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ru.tar.gz ) ) l10n_si? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_si.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_si.tar.gz ) ) l10n_sk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_sk.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_sk.tar.gz ) ) l10n_sl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_sl.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_sl.tar.gz ) ) l10n_sq? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_sq.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_sq.tar.gz ) ) l10n_sv? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_sv.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_sv.tar.gz ) ) l10n_tg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_tg.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_tg.tar.gz ) ) l10n_tr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_tr.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_tr.tar.gz ) ) l10n_ug? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_ug.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ug.tar.gz ) ) l10n_uk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_uk.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_uk.tar.gz ) ) l10n_vi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_vi.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_vi.tar.gz ) ) l10n_zh-CN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_zh-CN.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_zh-CN.tar.gz ) ) l10n_zh-TW? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_zh-TW.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_zh-TW.tar.gz ) ) l10n_am? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_am.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_am.tar.gz ) l10n_ast? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ast.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ast.tar.gz ) l10n_bg? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_bg.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_bg.tar.gz ) l10n_bn-IN? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_bn-IN.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_bn-IN.tar.gz ) l10n_bn? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_bn.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_bn.tar.gz ) l10n_bo? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_bo.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_bo.tar.gz ) l10n_bs? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_bs.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_bs.tar.gz ) l10n_ca-valencia? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz ) l10n_ca? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ca.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ca.tar.gz ) l10n_cs? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_cs.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_cs.tar.gz ) l10n_da? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_da.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_da.tar.gz ) l10n_de? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_de.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_de.tar.gz ) l10n_dz? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_dz.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_dz.tar.gz ) l10n_el? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_el.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_el.tar.gz ) l10n_en-GB? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_en-GB.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_en-GB.tar.gz ) l10n_en-ZA? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_en-ZA.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_en-ZA.tar.gz ) l10n_eo? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_eo.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_eo.tar.gz ) l10n_es? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_es.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_es.tar.gz ) l10n_et? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_et.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_et.tar.gz ) l10n_eu? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_eu.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_eu.tar.gz ) l10n_fi? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_fi.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_fi.tar.gz ) l10n_fr? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_fr.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_fr.tar.gz ) l10n_gl? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_gl.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_gl.tar.gz ) l10n_gu? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_gu.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_gu.tar.gz ) l10n_he? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_he.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_he.tar.gz ) l10n_hi? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_hi.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_hi.tar.gz ) l10n_hr? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_hr.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_hr.tar.gz ) l10n_hu? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_hu.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_hu.tar.gz ) l10n_id? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_id.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_id.tar.gz ) l10n_is? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_is.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_is.tar.gz ) l10n_it? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_it.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_it.tar.gz ) l10n_ja? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ja.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ja.tar.gz ) l10n_ka? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ka.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ka.tar.gz ) l10n_km? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_km.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_km.tar.gz ) l10n_ko? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ko.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ko.tar.gz ) l10n_mk? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_mk.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_mk.tar.gz ) l10n_nb? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_nb.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_nb.tar.gz ) l10n_ne? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ne.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ne.tar.gz ) l10n_nl? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_nl.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_nl.tar.gz ) l10n_nn? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_nn.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_nn.tar.gz ) l10n_om? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_om.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_om.tar.gz ) l10n_pl? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_pl.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_pl.tar.gz ) l10n_pt-BR? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_pt-BR.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_pt-BR.tar.gz ) l10n_pt? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_pt.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_pt.tar.gz ) l10n_ru? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ru.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ru.tar.gz ) l10n_si? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_si.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_si.tar.gz ) l10n_sk? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_sk.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sk.tar.gz ) l10n_sl? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_sl.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sl.tar.gz ) l10n_sq? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_sq.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sq.tar.gz ) l10n_sv? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_sv.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sv.tar.gz ) l10n_tg? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_tg.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_tg.tar.gz ) l10n_tr? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_tr.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_tr.tar.gz ) l10n_ug? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ug.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ug.tar.gz ) l10n_uk? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_uk.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_uk.tar.gz ) l10n_vi? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_vi.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_vi.tar.gz ) l10n_zh-CN? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_zh-CN.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_zh-CN.tar.gz ) l10n_zh-TW? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_zh-TW.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_zh-TW.tar.gz ) l10n_af? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_af.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_af.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_af.tar.gz ) l10n_ar? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ar.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ar.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ar.tar.gz ) l10n_as? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_as.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_as.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_as.tar.gz ) l10n_be? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_be.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_be.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_be.tar.gz ) l10n_br? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_br.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_br.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_br.tar.gz ) l10n_brx? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_brx.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_brx.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_brx.tar.gz ) l10n_cy? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_cy.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_cy.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_cy.tar.gz ) l10n_dgo? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_dgo.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_dgo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_dgo.tar.gz ) l10n_fa? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_fa.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_fa.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_fa.tar.gz ) l10n_ga? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ga.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ga.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ga.tar.gz ) l10n_gd? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_gd.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_gd.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_gd.tar.gz ) l10n_gug? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_gug.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_gug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_gug.tar.gz ) l10n_kk? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_kk.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_kk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_kk.tar.gz ) l10n_kmr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz ) l10n_kn? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_kn.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_kn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_kn.tar.gz ) l10n_kok? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_kok.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_kok.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_kok.tar.gz ) l10n_ks? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ks.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ks.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ks.tar.gz ) l10n_lb? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_lb.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_lb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_lb.tar.gz ) l10n_lo? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_lo.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_lo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_lo.tar.gz ) l10n_lt? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_lt.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_lt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_lt.tar.gz ) l10n_lv? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_lv.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_lv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_lv.tar.gz ) l10n_mai? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_mai.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_mai.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_mai.tar.gz ) l10n_ml? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ml.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ml.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ml.tar.gz ) l10n_mn? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_mn.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_mn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_mn.tar.gz ) l10n_mni? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_mni.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_mni.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_mni.tar.gz ) l10n_mr? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_mr.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_mr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_mr.tar.gz ) l10n_my? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_my.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_my.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_my.tar.gz ) l10n_nr? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_nr.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_nr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_nr.tar.gz ) l10n_nso? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_nso.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_nso.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_nso.tar.gz ) l10n_oc? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_oc.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_oc.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_oc.tar.gz ) l10n_or? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_or.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_or.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_or.tar.gz ) l10n_pa? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_pa-IN.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_pa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_pa-IN.tar.gz ) l10n_ro? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ro.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ro.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ro.tar.gz ) l10n_rw? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_rw.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_rw.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_rw.tar.gz ) l10n_sa? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_sa-IN.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sa-IN.tar.gz ) l10n_sat? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_sat.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sat.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sat.tar.gz ) l10n_sd? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_sd.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sd.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sd.tar.gz ) l10n_sid? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_sid.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sid.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sid.tar.gz ) l10n_sr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz ) l10n_sr? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_sr.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sr.tar.gz ) l10n_ss? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ss.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ss.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ss.tar.gz ) l10n_st? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_st.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_st.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_st.tar.gz ) l10n_sw-TZ? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz ) l10n_ta? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ta.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ta.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ta.tar.gz ) l10n_te? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_te.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_te.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_te.tar.gz ) l10n_th? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_th.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_th.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_th.tar.gz ) l10n_tn? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_tn.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_tn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_tn.tar.gz ) l10n_ts? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ts.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ts.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ts.tar.gz ) l10n_tt? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_tt.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_tt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_tt.tar.gz ) l10n_uz? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_uz.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_uz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_uz.tar.gz ) l10n_ve? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ve.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ve.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ve.tar.gz ) l10n_xh? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_xh.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_xh.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_xh.tar.gz ) l10n_zu? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_zu.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_zu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_zu.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	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=282f3803470f7e9646bc04a8a91e4e82
diff --git a/metadata/md5-cache/app-office/libreoffice-l10n-6.1.1.2 b/metadata/md5-cache/app-office/libreoffice-l10n-6.1.1.2
deleted file mode 100644
index 08f17e23426f..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-l10n-6.1.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=app-arch/rpm2targz-9.0.0.3g
-DESCRIPTION=Translations for the Libreoffice suite
-EAPI=6
-HOMEPAGE=https://www.libreoffice.org
-IUSE=offlinehelp l10n_am l10n_ast l10n_bg l10n_bn-IN l10n_bn l10n_bo l10n_bs l10n_ca-valencia l10n_ca l10n_cs l10n_da l10n_de l10n_dz l10n_el l10n_en-GB l10n_en l10n_en-ZA l10n_eo l10n_es l10n_et l10n_eu l10n_fi l10n_fr l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_km l10n_ko l10n_mk l10n_nb l10n_ne l10n_nl l10n_nn l10n_om l10n_pl l10n_pt-BR l10n_pt l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sv l10n_tg l10n_tr l10n_ug l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW l10n_af l10n_ar l10n_as l10n_be l10n_br l10n_brx l10n_cy l10n_dgo l10n_fa l10n_ga l10n_gd l10n_gug l10n_kk l10n_kmr-Latn l10n_kn l10n_kok l10n_ks l10n_lb l10n_lo l10n_lt l10n_lv l10n_mai l10n_ml l10n_mn l10n_mni l10n_mr l10n_my l10n_nr l10n_nso l10n_oc l10n_or l10n_pa l10n_ro l10n_rw l10n_sa l10n_sat l10n_sd l10n_sid l10n_sr-Latn l10n_sr l10n_ss l10n_st l10n_sw-TZ l10n_ta l10n_te l10n_th l10n_tn l10n_ts l10n_tt l10n_uz l10n_ve l10n_xh l10n_zu
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( LGPL-3 MPL-1.1 )
-RDEPEND=app-text/hunspell
-RESTRICT=strip
-SLOT=0
-SRC_URI=l10n_am? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_am.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_am.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_am.tar.gz ) ) l10n_ast? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_ast.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_ast.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_ast.tar.gz ) ) l10n_bg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_bg.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_bg.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_bg.tar.gz ) ) l10n_bn-IN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_bn-IN.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_bn-IN.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_bn-IN.tar.gz ) ) l10n_bn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_bn.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_bn.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_bn.tar.gz ) ) l10n_bo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_bo.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_bo.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_bo.tar.gz ) ) l10n_bs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_bs.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_bs.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_bs.tar.gz ) ) l10n_ca-valencia? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz ) ) l10n_ca? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_ca.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_ca.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_ca.tar.gz ) ) l10n_cs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_cs.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_cs.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_cs.tar.gz ) ) l10n_da? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_da.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_da.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_da.tar.gz ) ) l10n_de? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_de.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_de.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_de.tar.gz ) ) l10n_dz? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_dz.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_dz.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_dz.tar.gz ) ) l10n_el? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_el.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_el.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_el.tar.gz ) ) l10n_en-GB? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_en-GB.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_en-GB.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_en-GB.tar.gz ) ) l10n_en? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_en-US.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_en-US.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_en-US.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_en-US.tar.gz ) ) l10n_en-ZA? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_en-ZA.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_en-ZA.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_en-ZA.tar.gz ) ) l10n_eo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_eo.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_eo.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_eo.tar.gz ) ) l10n_es? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_es.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_es.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_es.tar.gz ) ) l10n_et? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_et.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_et.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_et.tar.gz ) ) l10n_eu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_eu.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_eu.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_eu.tar.gz ) ) l10n_fi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_fi.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_fi.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_fi.tar.gz ) ) l10n_fr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_fr.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_fr.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_fr.tar.gz ) ) l10n_gl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_gl.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_gl.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_gl.tar.gz ) ) l10n_gu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_gu.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_gu.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_gu.tar.gz ) ) l10n_he? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_he.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_he.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_he.tar.gz ) ) l10n_hi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_hi.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_hi.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_hi.tar.gz ) ) l10n_hr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_hr.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_hr.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_hr.tar.gz ) ) l10n_hu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_hu.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_hu.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_hu.tar.gz ) ) l10n_id? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_id.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_id.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_id.tar.gz ) ) l10n_is? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_is.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_is.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_is.tar.gz ) ) l10n_it? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_it.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_it.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_it.tar.gz ) ) l10n_ja? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_ja.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_ja.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_ja.tar.gz ) ) l10n_ka? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_ka.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_ka.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_ka.tar.gz ) ) l10n_km? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_km.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_km.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_km.tar.gz ) ) l10n_ko? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_ko.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_ko.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_ko.tar.gz ) ) l10n_mk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_mk.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_mk.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_mk.tar.gz ) ) l10n_nb? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_nb.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_nb.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_nb.tar.gz ) ) l10n_ne? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_ne.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_ne.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_ne.tar.gz ) ) l10n_nl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_nl.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_nl.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_nl.tar.gz ) ) l10n_nn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_nn.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_nn.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_nn.tar.gz ) ) l10n_om? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_om.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_om.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_om.tar.gz ) ) l10n_pl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_pl.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_pl.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_pl.tar.gz ) ) l10n_pt-BR? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_pt-BR.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_pt-BR.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_pt-BR.tar.gz ) ) l10n_pt? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_pt.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_pt.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_pt.tar.gz ) ) l10n_ru? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_ru.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_ru.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_ru.tar.gz ) ) l10n_si? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_si.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_si.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_si.tar.gz ) ) l10n_sk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_sk.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_sk.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_sk.tar.gz ) ) l10n_sl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_sl.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_sl.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_sl.tar.gz ) ) l10n_sq? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_sq.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_sq.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_sq.tar.gz ) ) l10n_sv? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_sv.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_sv.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_sv.tar.gz ) ) l10n_tg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_tg.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_tg.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_tg.tar.gz ) ) l10n_tr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_tr.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_tr.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_tr.tar.gz ) ) l10n_ug? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_ug.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_ug.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_ug.tar.gz ) ) l10n_uk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_uk.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_uk.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_uk.tar.gz ) ) l10n_vi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_vi.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_vi.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_vi.tar.gz ) ) l10n_zh-CN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_zh-CN.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_zh-CN.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_zh-CN.tar.gz ) ) l10n_zh-TW? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_helppack_zh-TW.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_zh-TW.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_helppack_zh-TW.tar.gz ) ) l10n_am? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_am.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_am.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_am.tar.gz ) l10n_ast? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_ast.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ast.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ast.tar.gz ) l10n_bg? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_bg.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_bg.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_bg.tar.gz ) l10n_bn-IN? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_bn-IN.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_bn-IN.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_bn-IN.tar.gz ) l10n_bn? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_bn.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_bn.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_bn.tar.gz ) l10n_bo? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_bo.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_bo.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_bo.tar.gz ) l10n_bs? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_bs.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_bs.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_bs.tar.gz ) l10n_ca-valencia? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz ) l10n_ca? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_ca.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ca.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ca.tar.gz ) l10n_cs? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_cs.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_cs.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_cs.tar.gz ) l10n_da? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_da.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_da.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_da.tar.gz ) l10n_de? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_de.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_de.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_de.tar.gz ) l10n_dz? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_dz.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_dz.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_dz.tar.gz ) l10n_el? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_el.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_el.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_el.tar.gz ) l10n_en-GB? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_en-GB.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_en-GB.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_en-GB.tar.gz ) l10n_en-ZA? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_en-ZA.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_en-ZA.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_en-ZA.tar.gz ) l10n_eo? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_eo.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_eo.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_eo.tar.gz ) l10n_es? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_es.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_es.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_es.tar.gz ) l10n_et? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_et.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_et.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_et.tar.gz ) l10n_eu? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_eu.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_eu.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_eu.tar.gz ) l10n_fi? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_fi.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_fi.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_fi.tar.gz ) l10n_fr? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_fr.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_fr.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_fr.tar.gz ) l10n_gl? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_gl.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_gl.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_gl.tar.gz ) l10n_gu? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_gu.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_gu.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_gu.tar.gz ) l10n_he? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_he.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_he.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_he.tar.gz ) l10n_hi? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_hi.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_hi.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_hi.tar.gz ) l10n_hr? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_hr.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_hr.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_hr.tar.gz ) l10n_hu? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_hu.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_hu.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_hu.tar.gz ) l10n_id? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_id.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_id.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_id.tar.gz ) l10n_is? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_is.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_is.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_is.tar.gz ) l10n_it? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_it.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_it.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_it.tar.gz ) l10n_ja? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_ja.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ja.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ja.tar.gz ) l10n_ka? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_ka.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ka.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ka.tar.gz ) l10n_km? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_km.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_km.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_km.tar.gz ) l10n_ko? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_ko.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ko.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ko.tar.gz ) l10n_mk? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_mk.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_mk.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_mk.tar.gz ) l10n_nb? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_nb.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_nb.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_nb.tar.gz ) l10n_ne? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_ne.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ne.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ne.tar.gz ) l10n_nl? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_nl.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_nl.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_nl.tar.gz ) l10n_nn? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_nn.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_nn.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_nn.tar.gz ) l10n_om? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_om.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_om.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_om.tar.gz ) l10n_pl? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_pl.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_pl.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_pl.tar.gz ) l10n_pt-BR? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_pt-BR.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_pt-BR.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_pt-BR.tar.gz ) l10n_pt? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_pt.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_pt.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_pt.tar.gz ) l10n_ru? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_ru.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ru.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ru.tar.gz ) l10n_si? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_si.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_si.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_si.tar.gz ) l10n_sk? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_sk.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sk.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sk.tar.gz ) l10n_sl? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_sl.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sl.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sl.tar.gz ) l10n_sq? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_sq.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sq.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sq.tar.gz ) l10n_sv? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_sv.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sv.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sv.tar.gz ) l10n_tg? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_tg.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_tg.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_tg.tar.gz ) l10n_tr? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_tr.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_tr.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_tr.tar.gz ) l10n_ug? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_ug.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ug.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ug.tar.gz ) l10n_uk? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_uk.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_uk.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_uk.tar.gz ) l10n_vi? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_vi.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_vi.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_vi.tar.gz ) l10n_zh-CN? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_zh-CN.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_zh-CN.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_zh-CN.tar.gz ) l10n_zh-TW? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_zh-TW.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_zh-TW.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_zh-TW.tar.gz ) l10n_af? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_af.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_af.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_af.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_af.tar.gz ) l10n_ar? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_ar.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ar.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ar.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ar.tar.gz ) l10n_as? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_as.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_as.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_as.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_as.tar.gz ) l10n_be? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_be.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_be.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_be.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_be.tar.gz ) l10n_br? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_br.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_br.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_br.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_br.tar.gz ) l10n_brx? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_brx.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_brx.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_brx.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_brx.tar.gz ) l10n_cy? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_cy.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_cy.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_cy.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_cy.tar.gz ) l10n_dgo? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_dgo.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_dgo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_dgo.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_dgo.tar.gz ) l10n_fa? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_fa.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_fa.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_fa.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_fa.tar.gz ) l10n_ga? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_ga.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ga.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ga.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ga.tar.gz ) l10n_gd? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_gd.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_gd.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_gd.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_gd.tar.gz ) l10n_gug? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_gug.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_gug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_gug.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_gug.tar.gz ) l10n_kk? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_kk.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_kk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_kk.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_kk.tar.gz ) l10n_kmr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz ) l10n_kn? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_kn.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_kn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_kn.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_kn.tar.gz ) l10n_kok? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_kok.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_kok.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_kok.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_kok.tar.gz ) l10n_ks? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_ks.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ks.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ks.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ks.tar.gz ) l10n_lb? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_lb.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_lb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_lb.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_lb.tar.gz ) l10n_lo? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_lo.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_lo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_lo.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_lo.tar.gz ) l10n_lt? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_lt.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_lt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_lt.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_lt.tar.gz ) l10n_lv? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_lv.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_lv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_lv.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_lv.tar.gz ) l10n_mai? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_mai.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_mai.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_mai.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_mai.tar.gz ) l10n_ml? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_ml.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ml.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ml.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ml.tar.gz ) l10n_mn? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_mn.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_mn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_mn.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_mn.tar.gz ) l10n_mni? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_mni.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_mni.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_mni.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_mni.tar.gz ) l10n_mr? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_mr.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_mr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_mr.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_mr.tar.gz ) l10n_my? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_my.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_my.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_my.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_my.tar.gz ) l10n_nr? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_nr.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_nr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_nr.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_nr.tar.gz ) l10n_nso? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_nso.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_nso.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_nso.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_nso.tar.gz ) l10n_oc? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_oc.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_oc.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_oc.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_oc.tar.gz ) l10n_or? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_or.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_or.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_or.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_or.tar.gz ) l10n_pa? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_pa-IN.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_pa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_pa-IN.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_pa-IN.tar.gz ) l10n_ro? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_ro.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ro.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ro.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ro.tar.gz ) l10n_rw? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_rw.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_rw.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_rw.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_rw.tar.gz ) l10n_sa? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_sa-IN.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sa-IN.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sa-IN.tar.gz ) l10n_sat? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_sat.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sat.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sat.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sat.tar.gz ) l10n_sd? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_sd.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sd.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sd.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sd.tar.gz ) l10n_sid? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_sid.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sid.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sid.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sid.tar.gz ) l10n_sr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz ) l10n_sr? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_sr.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sr.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sr.tar.gz ) l10n_ss? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_ss.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ss.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ss.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ss.tar.gz ) l10n_st? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_st.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_st.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_st.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_st.tar.gz ) l10n_sw-TZ? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz ) l10n_ta? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_ta.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ta.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ta.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ta.tar.gz ) l10n_te? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_te.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_te.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_te.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_te.tar.gz ) l10n_th? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_th.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_th.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_th.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_th.tar.gz ) l10n_tn? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_tn.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_tn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_tn.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_tn.tar.gz ) l10n_ts? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_ts.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ts.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ts.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ts.tar.gz ) l10n_tt? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_tt.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_tt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_tt.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_tt.tar.gz ) l10n_uz? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_uz.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_uz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_uz.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_uz.tar.gz ) l10n_ve? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_ve.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ve.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ve.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_ve.tar.gz ) l10n_xh? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_xh.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_xh.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_xh.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_xh.tar.gz ) l10n_zu? ( https://download.documentfoundation.org/libreoffice/stable/6.1.1/rpm/x86/LibreOffice_6.1.1_Linux_x86_rpm_langpack_zu.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_zu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.1/rpm/x86/LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_zu.tar.gz -> LibreOffice_6.1.1.2_Linux_x86_rpm_langpack_zu.tar.gz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7a4e67c041ac8ace5a452dea25e0174a
diff --git a/metadata/md5-cache/app-office/libreoffice-l10n-6.1.2.1 b/metadata/md5-cache/app-office/libreoffice-l10n-6.1.2.1
new file mode 100644
index 000000000000..bef6058344a7
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-l10n-6.1.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=>=app-arch/rpm2targz-9.0.0.3g
+DESCRIPTION=Translations for the Libreoffice suite
+EAPI=6
+HOMEPAGE=https://www.libreoffice.org
+IUSE=offlinehelp l10n_am l10n_ast l10n_bg l10n_bn-IN l10n_bn l10n_bo l10n_bs l10n_ca-valencia l10n_ca l10n_cs l10n_da l10n_de l10n_dz l10n_el l10n_en-GB l10n_en l10n_en-ZA l10n_eo l10n_es l10n_et l10n_eu l10n_fi l10n_fr l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_km l10n_ko l10n_mk l10n_nb l10n_ne l10n_nl l10n_nn l10n_om l10n_pl l10n_pt-BR l10n_pt l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sv l10n_tg l10n_tr l10n_ug l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW l10n_af l10n_ar l10n_as l10n_be l10n_br l10n_brx l10n_cy l10n_dgo l10n_fa l10n_ga l10n_gd l10n_gug l10n_kk l10n_kmr-Latn l10n_kn l10n_kok l10n_ks l10n_lb l10n_lo l10n_lt l10n_lv l10n_mai l10n_ml l10n_mn l10n_mni l10n_mr l10n_my l10n_nr l10n_nso l10n_oc l10n_or l10n_pa l10n_ro l10n_rw l10n_sa l10n_sat l10n_sd l10n_sid l10n_sr-Latn l10n_sr l10n_ss l10n_st l10n_sw-TZ l10n_ta l10n_te l10n_th l10n_tn l10n_ts l10n_tt l10n_uz l10n_ve l10n_xh l10n_zu
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( LGPL-3 MPL-1.1 )
+RDEPEND=app-text/hunspell
+RESTRICT=strip
+SLOT=0
+SRC_URI=l10n_am? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_am.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_am.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_am.tar.gz ) ) l10n_ast? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_ast.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_ast.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_ast.tar.gz ) ) l10n_bg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_bg.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_bg.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_bg.tar.gz ) ) l10n_bn-IN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_bn-IN.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_bn-IN.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_bn-IN.tar.gz ) ) l10n_bn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_bn.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_bn.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_bn.tar.gz ) ) l10n_bo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_bo.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_bo.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_bo.tar.gz ) ) l10n_bs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_bs.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_bs.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_bs.tar.gz ) ) l10n_ca-valencia? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_ca-valencia.tar.gz ) ) l10n_ca? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_ca.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_ca.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_ca.tar.gz ) ) l10n_cs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_cs.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_cs.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_cs.tar.gz ) ) l10n_da? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_da.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_da.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_da.tar.gz ) ) l10n_de? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_de.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_de.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_de.tar.gz ) ) l10n_dz? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_dz.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_dz.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_dz.tar.gz ) ) l10n_el? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_el.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_el.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_el.tar.gz ) ) l10n_en-GB? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_en-GB.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_en-GB.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_en-GB.tar.gz ) ) l10n_en? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_en-US.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_en-US.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_en-US.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_en-US.tar.gz ) ) l10n_en-ZA? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_en-ZA.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_en-ZA.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_en-ZA.tar.gz ) ) l10n_eo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_eo.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_eo.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_eo.tar.gz ) ) l10n_es? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_es.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_es.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_es.tar.gz ) ) l10n_et? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_et.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_et.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_et.tar.gz ) ) l10n_eu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_eu.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_eu.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_eu.tar.gz ) ) l10n_fi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_fi.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_fi.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_fi.tar.gz ) ) l10n_fr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_fr.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_fr.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_fr.tar.gz ) ) l10n_gl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_gl.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_gl.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_gl.tar.gz ) ) l10n_gu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_gu.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_gu.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_gu.tar.gz ) ) l10n_he? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_he.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_he.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_he.tar.gz ) ) l10n_hi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_hi.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_hi.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_hi.tar.gz ) ) l10n_hr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_hr.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_hr.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_hr.tar.gz ) ) l10n_hu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_hu.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_hu.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_hu.tar.gz ) ) l10n_id? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_id.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_id.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_id.tar.gz ) ) l10n_is? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_is.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_is.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_is.tar.gz ) ) l10n_it? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_it.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_it.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_it.tar.gz ) ) l10n_ja? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_ja.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_ja.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_ja.tar.gz ) ) l10n_ka? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_ka.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_ka.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_ka.tar.gz ) ) l10n_km? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_km.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_km.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_km.tar.gz ) ) l10n_ko? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_ko.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_ko.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_ko.tar.gz ) ) l10n_mk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_mk.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_mk.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_mk.tar.gz ) ) l10n_nb? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_nb.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_nb.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_nb.tar.gz ) ) l10n_ne? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_ne.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_ne.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_ne.tar.gz ) ) l10n_nl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_nl.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_nl.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_nl.tar.gz ) ) l10n_nn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_nn.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_nn.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_nn.tar.gz ) ) l10n_om? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_om.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_om.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_om.tar.gz ) ) l10n_pl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_pl.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_pl.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_pl.tar.gz ) ) l10n_pt-BR? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_pt-BR.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_pt-BR.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_pt-BR.tar.gz ) ) l10n_pt? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_pt.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_pt.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_pt.tar.gz ) ) l10n_ru? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_ru.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_ru.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_ru.tar.gz ) ) l10n_si? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_si.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_si.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_si.tar.gz ) ) l10n_sk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_sk.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_sk.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_sk.tar.gz ) ) l10n_sl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_sl.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_sl.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_sl.tar.gz ) ) l10n_sq? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_sq.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_sq.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_sq.tar.gz ) ) l10n_sv? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_sv.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_sv.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_sv.tar.gz ) ) l10n_tg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_tg.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_tg.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_tg.tar.gz ) ) l10n_tr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_tr.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_tr.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_tr.tar.gz ) ) l10n_ug? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_ug.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_ug.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_ug.tar.gz ) ) l10n_uk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_uk.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_uk.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_uk.tar.gz ) ) l10n_vi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_vi.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_vi.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_vi.tar.gz ) ) l10n_zh-CN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_zh-CN.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_zh-CN.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_zh-CN.tar.gz ) ) l10n_zh-TW? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_helppack_zh-TW.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_zh-TW.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_helppack_zh-TW.tar.gz ) ) l10n_am? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_am.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_am.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_am.tar.gz ) l10n_ast? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_ast.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ast.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ast.tar.gz ) l10n_bg? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_bg.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_bg.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_bg.tar.gz ) l10n_bn-IN? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_bn-IN.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_bn-IN.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_bn-IN.tar.gz ) l10n_bn? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_bn.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_bn.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_bn.tar.gz ) l10n_bo? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_bo.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_bo.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_bo.tar.gz ) l10n_bs? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_bs.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_bs.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_bs.tar.gz ) l10n_ca-valencia? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ca-valencia.tar.gz ) l10n_ca? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_ca.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ca.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ca.tar.gz ) l10n_cs? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_cs.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_cs.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_cs.tar.gz ) l10n_da? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_da.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_da.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_da.tar.gz ) l10n_de? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_de.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_de.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_de.tar.gz ) l10n_dz? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_dz.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_dz.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_dz.tar.gz ) l10n_el? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_el.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_el.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_el.tar.gz ) l10n_en-GB? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_en-GB.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_en-GB.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_en-GB.tar.gz ) l10n_en-ZA? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_en-ZA.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_en-ZA.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_en-ZA.tar.gz ) l10n_eo? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_eo.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_eo.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_eo.tar.gz ) l10n_es? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_es.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_es.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_es.tar.gz ) l10n_et? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_et.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_et.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_et.tar.gz ) l10n_eu? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_eu.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_eu.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_eu.tar.gz ) l10n_fi? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_fi.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_fi.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_fi.tar.gz ) l10n_fr? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_fr.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_fr.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_fr.tar.gz ) l10n_gl? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_gl.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_gl.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_gl.tar.gz ) l10n_gu? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_gu.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_gu.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_gu.tar.gz ) l10n_he? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_he.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_he.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_he.tar.gz ) l10n_hi? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_hi.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_hi.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_hi.tar.gz ) l10n_hr? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_hr.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_hr.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_hr.tar.gz ) l10n_hu? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_hu.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_hu.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_hu.tar.gz ) l10n_id? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_id.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_id.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_id.tar.gz ) l10n_is? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_is.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_is.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_is.tar.gz ) l10n_it? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_it.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_it.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_it.tar.gz ) l10n_ja? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_ja.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ja.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ja.tar.gz ) l10n_ka? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_ka.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ka.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ka.tar.gz ) l10n_km? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_km.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_km.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_km.tar.gz ) l10n_ko? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_ko.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ko.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ko.tar.gz ) l10n_mk? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_mk.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_mk.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_mk.tar.gz ) l10n_nb? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_nb.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_nb.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_nb.tar.gz ) l10n_ne? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_ne.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ne.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ne.tar.gz ) l10n_nl? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_nl.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_nl.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_nl.tar.gz ) l10n_nn? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_nn.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_nn.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_nn.tar.gz ) l10n_om? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_om.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_om.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_om.tar.gz ) l10n_pl? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_pl.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_pl.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_pl.tar.gz ) l10n_pt-BR? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_pt-BR.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_pt-BR.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_pt-BR.tar.gz ) l10n_pt? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_pt.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_pt.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_pt.tar.gz ) l10n_ru? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_ru.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ru.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ru.tar.gz ) l10n_si? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_si.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_si.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_si.tar.gz ) l10n_sk? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_sk.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sk.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sk.tar.gz ) l10n_sl? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_sl.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sl.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sl.tar.gz ) l10n_sq? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_sq.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sq.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sq.tar.gz ) l10n_sv? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_sv.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sv.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sv.tar.gz ) l10n_tg? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_tg.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_tg.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_tg.tar.gz ) l10n_tr? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_tr.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_tr.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_tr.tar.gz ) l10n_ug? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_ug.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ug.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ug.tar.gz ) l10n_uk? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_uk.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_uk.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_uk.tar.gz ) l10n_vi? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_vi.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_vi.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_vi.tar.gz ) l10n_zh-CN? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_zh-CN.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_zh-CN.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_zh-CN.tar.gz ) l10n_zh-TW? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_zh-TW.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_zh-TW.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_zh-TW.tar.gz ) l10n_af? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_af.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_af.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_af.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_af.tar.gz ) l10n_ar? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_ar.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ar.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ar.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ar.tar.gz ) l10n_as? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_as.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_as.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_as.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_as.tar.gz ) l10n_be? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_be.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_be.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_be.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_be.tar.gz ) l10n_br? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_br.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_br.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_br.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_br.tar.gz ) l10n_brx? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_brx.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_brx.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_brx.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_brx.tar.gz ) l10n_cy? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_cy.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_cy.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_cy.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_cy.tar.gz ) l10n_dgo? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_dgo.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_dgo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_dgo.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_dgo.tar.gz ) l10n_fa? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_fa.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_fa.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_fa.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_fa.tar.gz ) l10n_ga? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_ga.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ga.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ga.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ga.tar.gz ) l10n_gd? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_gd.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_gd.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_gd.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_gd.tar.gz ) l10n_gug? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_gug.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_gug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_gug.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_gug.tar.gz ) l10n_kk? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_kk.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_kk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_kk.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_kk.tar.gz ) l10n_kmr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_kmr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_kmr-Latn.tar.gz ) l10n_kn? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_kn.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_kn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_kn.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_kn.tar.gz ) l10n_kok? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_kok.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_kok.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_kok.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_kok.tar.gz ) l10n_ks? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_ks.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ks.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ks.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ks.tar.gz ) l10n_lb? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_lb.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_lb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_lb.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_lb.tar.gz ) l10n_lo? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_lo.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_lo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_lo.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_lo.tar.gz ) l10n_lt? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_lt.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_lt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_lt.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_lt.tar.gz ) l10n_lv? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_lv.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_lv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_lv.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_lv.tar.gz ) l10n_mai? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_mai.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_mai.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_mai.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_mai.tar.gz ) l10n_ml? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_ml.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ml.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ml.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ml.tar.gz ) l10n_mn? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_mn.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_mn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_mn.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_mn.tar.gz ) l10n_mni? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_mni.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_mni.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_mni.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_mni.tar.gz ) l10n_mr? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_mr.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_mr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_mr.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_mr.tar.gz ) l10n_my? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_my.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_my.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_my.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_my.tar.gz ) l10n_nr? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_nr.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_nr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_nr.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_nr.tar.gz ) l10n_nso? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_nso.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_nso.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_nso.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_nso.tar.gz ) l10n_oc? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_oc.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_oc.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_oc.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_oc.tar.gz ) l10n_or? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_or.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_or.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_or.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_or.tar.gz ) l10n_pa? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_pa-IN.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_pa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_pa-IN.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_pa-IN.tar.gz ) l10n_ro? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_ro.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ro.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ro.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ro.tar.gz ) l10n_rw? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_rw.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_rw.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_rw.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_rw.tar.gz ) l10n_sa? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_sa-IN.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sa-IN.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sa-IN.tar.gz ) l10n_sat? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_sat.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sat.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sat.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sat.tar.gz ) l10n_sd? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_sd.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sd.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sd.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sd.tar.gz ) l10n_sid? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_sid.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sid.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sid.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sid.tar.gz ) l10n_sr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sr-Latn.tar.gz ) l10n_sr? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_sr.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sr.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sr.tar.gz ) l10n_ss? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_ss.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ss.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ss.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ss.tar.gz ) l10n_st? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_st.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_st.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_st.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_st.tar.gz ) l10n_sw-TZ? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sw-TZ.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_sw-TZ.tar.gz ) l10n_ta? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_ta.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ta.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ta.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ta.tar.gz ) l10n_te? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_te.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_te.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_te.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_te.tar.gz ) l10n_th? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_th.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_th.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_th.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_th.tar.gz ) l10n_tn? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_tn.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_tn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_tn.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_tn.tar.gz ) l10n_ts? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_ts.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ts.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ts.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ts.tar.gz ) l10n_tt? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_tt.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_tt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_tt.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_tt.tar.gz ) l10n_uz? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_uz.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_uz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_uz.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_uz.tar.gz ) l10n_ve? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_ve.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ve.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ve.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_ve.tar.gz ) l10n_xh? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_xh.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_xh.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_xh.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_xh.tar.gz ) l10n_zu? ( https://download.documentfoundation.org/libreoffice/stable/6.1.2/rpm/x86/LibreOffice_6.1.2_Linux_x86_rpm_langpack_zu.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_zu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.2/rpm/x86/LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_zu.tar.gz -> LibreOffice_6.1.2.1_Linux_x86_rpm_langpack_zu.tar.gz )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=2d23e4ca37177903db4ec417dd80267c
diff --git a/metadata/md5-cache/app-office/lyx-2.3.0 b/metadata/md5-cache/app-office/lyx-2.3.0
index baa840ca51e9..565d03141506 100644
--- a/metadata/md5-cache/app-office/lyx-2.3.0
+++ b/metadata/md5-cache/app-office/lyx-2.3.0
@@ -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=ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/lyx-2.3.0.tar.xz ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.3/lyx-2.3.0/lyx-2.3.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	font	773ed921fdd08bed71cb1103c45748a0	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-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	font	773ed921fdd08bed71cb1103c45748a0	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-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=42aea1c6ddc68abdb5f0f63e19ea4be0
diff --git a/metadata/md5-cache/app-office/openerp-7.0.20140125 b/metadata/md5-cache/app-office/openerp-7.0.20140125
index 536dac912773..34533a6e8429 100644
--- a/metadata/md5-cache/app-office/openerp-7.0.20140125
+++ b/metadata/md5-cache/app-office/openerp-7.0.20140125
@@ -10,5 +10,5 @@ RDEPEND=!app-office/openerp-web postgres? ( dev-db/postgresql[server] ) dev-pyth
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://nightly.openerp.com/7.0/nightly/src/openerp-7.0-20140125-002455.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=27e33e28a6f9cf6bce0ab7e188693487
diff --git a/metadata/md5-cache/app-office/openerp-8.0.20140125 b/metadata/md5-cache/app-office/openerp-8.0.20140125
index 89bfc5286055..a958eebbc9cb 100644
--- a/metadata/md5-cache/app-office/openerp-8.0.20140125
+++ b/metadata/md5-cache/app-office/openerp-8.0.20140125
@@ -9,5 +9,5 @@ RDEPEND=!app-office/openerp-web postgres? ( dev-db/postgresql[server] ) dev-pyth
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://nightly.openerp.com/trunk/nightly/src/openerp-8.0dev-20140125-000101.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bd5e6d65f4ac0d7918d64040fc9f2454
diff --git a/metadata/md5-cache/app-office/openoffice-bin-4.1.4 b/metadata/md5-cache/app-office/openoffice-bin-4.1.4
index a1483004de92..5f48ee2883f1 100644
--- a/metadata/md5-cache/app-office/openoffice-bin-4.1.4
+++ b/metadata/md5-cache/app-office/openoffice-bin-4.1.4
@@ -11,5 +11,5 @@ RDEPEND=!app-office/openoffice !prefix? ( sys-libs/glibc ) app-arch/unzip app-ar
 RESTRICT=strip
 SLOT=0
 SRC_URI=amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_install-rpm_en-US.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_install-rpm_en-US.tar.gz ) l10n_ast? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_ast.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_ast.tar.gz ) ) l10n_eu? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_eu.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_eu.tar.gz ) ) l10n_bg? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_bg.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_bg.tar.gz ) ) l10n_ca? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_ca.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_ca.tar.gz ) ) l10n_ca-valencia? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_ca-XV.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_ca-XV.tar.gz ) ) l10n_zh-CN? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_zh-CN.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_zh-CN.tar.gz ) ) l10n_zh-TW? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_zh-TW.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_zh-TW.tar.gz ) ) l10n_cs? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_cs.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_cs.tar.gz ) ) l10n_da? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_da.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_da.tar.gz ) ) l10n_nl? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_nl.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_nl.tar.gz ) ) l10n_en-GB? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_en-GB.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_en-GB.tar.gz ) ) l10n_fi? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_fi.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_fi.tar.gz ) ) l10n_fr? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_fr.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_fr.tar.gz ) ) l10n_gd? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_gd.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_gd.tar.gz ) ) l10n_gl? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_gl.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_gl.tar.gz ) ) l10n_de? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_de.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_de.tar.gz ) ) l10n_el? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_el.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_el.tar.gz ) ) l10n_he? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_he.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_he.tar.gz ) ) l10n_hi? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_hi.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_hi.tar.gz ) ) l10n_hu? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_hu.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_hu.tar.gz ) ) l10n_it? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_it.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_it.tar.gz ) ) l10n_ja? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_ja.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_ja.tar.gz ) ) l10n_km? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_km.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_km.tar.gz ) ) l10n_ko? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_ko.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_ko.tar.gz ) ) l10n_lt? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_lt.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_lt.tar.gz ) ) l10n_nb? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_nb.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_nb.tar.gz ) ) l10n_pl? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_pl.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_pl.tar.gz ) ) l10n_pt-BR? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_pt-BR.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_pt-BR.tar.gz ) ) l10n_pt? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_pt.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_pt.tar.gz ) ) l10n_ru? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_ru.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_ru.tar.gz ) ) l10n_sr? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_sr.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_sr.tar.gz ) ) l10n_sk? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_sk.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_sk.tar.gz ) ) l10n_sl? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_sl.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_sl.tar.gz ) ) l10n_es? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_es.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_es.tar.gz ) ) l10n_sv? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_sv.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_sv.tar.gz ) ) l10n_ta? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_ta.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_ta.tar.gz ) ) l10n_th? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_th.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_th.tar.gz ) ) l10n_tr? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_tr.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_tr.tar.gz ) ) l10n_vi? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86-64_langpack-rpm_vi.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_vi.tar.gz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=14ae7a5baf07f3561519bee185d8fb2c
diff --git a/metadata/md5-cache/app-office/openoffice-bin-4.1.5 b/metadata/md5-cache/app-office/openoffice-bin-4.1.5
index c0bc9dc4193c..6ffb7d656c52 100644
--- a/metadata/md5-cache/app-office/openoffice-bin-4.1.5
+++ b/metadata/md5-cache/app-office/openoffice-bin-4.1.5
@@ -11,5 +11,5 @@ RDEPEND=!app-office/openoffice !prefix? ( sys-libs/glibc ) app-arch/unzip app-ar
 RESTRICT=strip
 SLOT=0
 SRC_URI=amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_install-rpm_en-US.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_install-rpm_en-US.tar.gz ) l10n_ast? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_ast.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_ast.tar.gz ) ) l10n_eu? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_eu.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_eu.tar.gz ) ) l10n_bg? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_bg.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_bg.tar.gz ) ) l10n_ca? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_ca.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_ca.tar.gz ) ) l10n_ca-valencia? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_ca-XV.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_ca-XV.tar.gz ) ) l10n_zh-CN? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_zh-CN.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_zh-CN.tar.gz ) ) l10n_zh-TW? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_zh-TW.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_zh-TW.tar.gz ) ) l10n_cs? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_cs.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_cs.tar.gz ) ) l10n_da? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_da.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_da.tar.gz ) ) l10n_nl? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_nl.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_nl.tar.gz ) ) l10n_en-GB? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_en-GB.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_en-GB.tar.gz ) ) l10n_fi? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_fi.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_fi.tar.gz ) ) l10n_fr? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_fr.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_fr.tar.gz ) ) l10n_gd? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_gd.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_gd.tar.gz ) ) l10n_gl? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_gl.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_gl.tar.gz ) ) l10n_de? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_de.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_de.tar.gz ) ) l10n_el? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_el.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_el.tar.gz ) ) l10n_he? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_he.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_he.tar.gz ) ) l10n_hi? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_hi.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_hi.tar.gz ) ) l10n_hu? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_hu.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_hu.tar.gz ) ) l10n_it? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_it.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_it.tar.gz ) ) l10n_ja? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_ja.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_ja.tar.gz ) ) l10n_km? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_km.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_km.tar.gz ) ) l10n_ko? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_ko.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_ko.tar.gz ) ) l10n_lt? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_lt.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_lt.tar.gz ) ) l10n_nb? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_nb.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_nb.tar.gz ) ) l10n_pl? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_pl.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_pl.tar.gz ) ) l10n_pt-BR? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_pt-BR.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_pt-BR.tar.gz ) ) l10n_pt? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_pt.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_pt.tar.gz ) ) l10n_ru? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_ru.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_ru.tar.gz ) ) l10n_sr? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_sr.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_sr.tar.gz ) ) l10n_sk? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_sk.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_sk.tar.gz ) ) l10n_sl? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_sl.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_sl.tar.gz ) ) l10n_es? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_es.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_es.tar.gz ) ) l10n_sv? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_sv.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_sv.tar.gz ) ) l10n_ta? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_ta.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_ta.tar.gz ) ) l10n_th? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_th.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_th.tar.gz ) ) l10n_tr? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_tr.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_tr.tar.gz ) ) l10n_vi? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_vi.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_vi.tar.gz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=49baaacefcf7a03235b9ba5dad87706b
diff --git a/metadata/md5-cache/app-office/orage-4.12.1-r1 b/metadata/md5-cache/app-office/orage-4.12.1-r1
index a61a5c8da6c1..b20ce6561c43 100644
--- a/metadata/md5-cache/app-office/orage-4.12.1-r1
+++ b/metadata/md5-cache/app-office/orage-4.12.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libical-0.48:= dev-libs/popt:= >=x11-libs/gtk+-2.10:2= berkdb? ( >=sys-libs/db-4:= ) clock-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) dbus? ( >=dev-libs/dbus-glib-0.100:= ) libnotify? ( >=x11-libs/libnotify-0.7:= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/orage/4.12/orage-4.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=dcbc3d04efdcd254ef856c8920b6d199
diff --git a/metadata/md5-cache/app-office/pinpoint-0.1.8-r1 b/metadata/md5-cache/app-office/pinpoint-0.1.8-r1
index ff9c8a7d0807..c3cdb52d64f9 100644
--- a/metadata/md5-cache/app-office/pinpoint-0.1.8-r1
+++ b/metadata/md5-cache/app-office/pinpoint-0.1.8-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=media-libs/clutter-1.23.7:1.0 >=media-libs/clutter-gtk-1.6:1.0 >=dev-libs/glib-2.28:2 >=x11-libs/cairo-1.9.4 x11-libs/pango x11-libs/gdk-pixbuf:2 gstreamer? ( media-libs/clutter-gst:3.0 ) pdf? ( gnome-base/librsvg:2 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/pinpoint/0.1/pinpoint-0.1.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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=66f2ce4fc43a28a2940c8d0aa8659640
diff --git a/metadata/md5-cache/app-office/planner-0.14.6_p20130520 b/metadata/md5-cache/app-office/planner-0.14.6_p20130520
index 29d382517bfa..7f5ef420f127 100644
--- a/metadata/md5-cache/app-office/planner-0.14.6_p20130520
+++ b/metadata/md5-cache/app-office/planner-0.14.6_p20130520
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.6:2 >=x11-libs/gtk+-2.14:2 >=gnome-base/libgnomecanvas
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~eva/distfiles/planner/planner-0.14.6_p20130520.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b93dd8a993cc40a4fd0b40a0363c293c
diff --git a/metadata/md5-cache/app-office/pybliographer-1.2.15-r1 b/metadata/md5-cache/app-office/pybliographer-1.2.15-r1
index c9d1aa26bed6..8986293d81a7 100644
--- a/metadata/md5-cache/app-office/pybliographer-1.2.15-r1
+++ b/metadata/md5-cache/app-office/pybliographer-1.2.15-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=mirror://sourceforge/pybliographer/pybliographer-1.2.15.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0c8ade08e9e9934b5a0a0685dada13f1
diff --git a/metadata/md5-cache/app-office/pybliographer-1.2.18 b/metadata/md5-cache/app-office/pybliographer-1.2.18
index 765e6bce61eb..475ea88f69c9 100644
--- a/metadata/md5-cache/app-office/pybliographer-1.2.18
+++ b/metadata/md5-cache/app-office/pybliographer-1.2.18
@@ -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=mirror://sourceforge/pybliographer/pybliographer-1.2.18.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e057726df3ef3572c63c3bbb5f55b524
diff --git a/metadata/md5-cache/app-office/scribus-1.5.3-r1 b/metadata/md5-cache/app-office/scribus-1.5.3-r1
deleted file mode 100644
index c4c0bb89d6db..000000000000
--- a/metadata/md5-cache/app-office/scribus-1.5.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-text/libmspub app-text/poppler:= dev-libs/hyphen >=dev-libs/icu-58.2:0= dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:0=[icu] media-libs/lcms:2 media-libs/libcdr media-libs/libfreehand media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( >=dev-libs/boost-1.62:= ) hunspell? ( app-text/hunspell ) graphicsmagick? ( media-gfx/graphicsmagick ) osg? ( dev-games/openscenegraph ) pdf? ( app-text/podofo:0= ) scripts? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) tk? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) dev-qt/linguist-tools:5 virtual/pkgconfig 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
-DESCRIPTION=Desktop publishing (DTP) and layout program
-EAPI=6
-HOMEPAGE=https://www.scribus.net/
-IUSE=+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts templates tk l10n_af l10n_ar l10n_bg l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_de-1901 l10n_de-CH l10n_de-DE l10n_el l10n_en-AU l10n_en-GB l10n_en-US l10n_eo l10n_es l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_gl l10n_he l10n_hr l10n_hu l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_kab l10n_kn l10n_ko l10n_ku l10n_la l10n_lt l10n_nb l10n_nl l10n_nn l10n_pl l10n_pt l10n_pt-BR l10n_pt-PT l10n_ro l10n_ru l10n_sa l10n_sk l10n_sl l10n_so l10n_sq l10n_sr l10n_sv l10n_te l10n_th l10n_tr l10n_uk l10n_zh-CN l10n_zh-TW python_targets_python2_7
-KEYWORDS=amd64 ~hppa ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-text/libmspub app-text/poppler:= dev-libs/hyphen >=dev-libs/icu-58.2:0= dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:0=[icu] media-libs/lcms:2 media-libs/libcdr media-libs/libfreehand media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( >=dev-libs/boost-1.62:= ) hunspell? ( app-text/hunspell ) graphicsmagick? ( media-gfx/graphicsmagick ) osg? ( dev-games/openscenegraph ) pdf? ( app-text/podofo:0= ) scripts? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) tk? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) app-text/ghostscript-gpl
-REQUIRED_USE=python_targets_python2_7 tk? ( scripts )
-SLOT=0
-SRC_URI=mirror://sourceforge/project/scribus/scribus-devel/1.5.3/scribus-1.5.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/scribus-1.5.3.patches.tar.xz
-_eclasses_=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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=f6c588cc3da821d2abc021d696ab7f91
diff --git a/metadata/md5-cache/app-office/scribus-1.5.4 b/metadata/md5-cache/app-office/scribus-1.5.4
index db01d8897ade..7ae11bdf1d21 100644
--- a/metadata/md5-cache/app-office/scribus-1.5.4
+++ b/metadata/md5-cache/app-office/scribus-1.5.4
@@ -4,11 +4,11 @@ DESCRIPTION=Desktop publishing (DTP) and layout program
 EAPI=6
 HOMEPAGE=https://www.scribus.net/
 IUSE=+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts templates tk l10n_af l10n_ar l10n_bg l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_de-1901 l10n_de-CH l10n_de-DE l10n_el l10n_en-AU l10n_en-GB l10n_en-US l10n_eo l10n_es l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_gl l10n_he l10n_hr l10n_hu l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_kab l10n_kn l10n_ko l10n_ku l10n_la l10n_lt l10n_nb l10n_nl l10n_nn l10n_pl l10n_pt l10n_pt-BR l10n_pt-PT l10n_ro l10n_ru l10n_sa l10n_sk l10n_sl l10n_so l10n_sq l10n_sr l10n_sv l10n_te l10n_th l10n_tr l10n_uk l10n_zh-CN l10n_zh-TW python_targets_python2_7
-KEYWORDS=amd64 ~hppa ~ppc ppc64 ~sparc x86
+KEYWORDS=amd64 ~hppa ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-text/libmspub app-text/poppler:= dev-libs/hyphen >=dev-libs/icu-58.2:0= dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:0=[icu] media-libs/lcms:2 media-libs/libcdr media-libs/libfreehand media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( >=dev-libs/boost-1.62:= ) hunspell? ( app-text/hunspell ) graphicsmagick? ( media-gfx/graphicsmagick ) osg? ( dev-games/openscenegraph ) pdf? ( app-text/podofo:0= ) scripts? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) tk? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) app-text/ghostscript-gpl
 REQUIRED_USE=python_targets_python2_7 tk? ( scripts )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/scribus/scribus-devel/1.5.4/scribus-1.5.4.tar.xz https://dev.gentoo.org/~asturm/distfiles/scribus-1.5.4-poppler-0.64.0.patch.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=202c1d0a565c7b8a29fa99f74a9927ac
+_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_=09da3c802a5d4f82e2f56857c734c892
diff --git a/metadata/md5-cache/app-office/scribus-9999 b/metadata/md5-cache/app-office/scribus-9999
index 4319cf099dda..dad9b558c699 100644
--- a/metadata/md5-cache/app-office/scribus-9999
+++ b/metadata/md5-cache/app-office/scribus-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-text/libmspub app-text/poppler:= dev-libs/hyphen >=dev-libs/icu-58.2:0= dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:0=[icu] media-libs/lcms:2 media-libs/libcdr media-libs/libfreehand media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( >=dev-libs/boost-1.62:= ) hunspell? ( app-text/hunspell ) graphicsmagick? ( media-gfx/graphicsmagick ) osg? ( dev-games/openscenegraph ) pdf? ( app-text/podofo:0= ) scripts? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) tk? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) app-text/ghostscript-gpl
 REQUIRED_USE=python_targets_python2_7 tk? ( scripts )
 SLOT=0
-_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	subversion	3d1eb4b41d7190570a84f786958ebb13	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	subversion	3d1eb4b41d7190570a84f786958ebb13	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2ed97939146004182ffb7e882bb9f3ce
diff --git a/metadata/md5-cache/app-office/skrooge-2.13.0 b/metadata/md5-cache/app-office/skrooge-2.13.0
deleted file mode 100644
index 521de1f862cf..000000000000
--- a/metadata/md5-cache/app-office/skrooge-2.13.0
+++ /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/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
-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
-REQUIRED_USE=test? ( designer )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/skrooge/skrooge-2.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	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=0a7e0787f94bdfeef0d2a2436d8c9088
diff --git a/metadata/md5-cache/app-office/skrooge-2.14.0 b/metadata/md5-cache/app-office/skrooge-2.14.0
index 674c7d89d2ec..2f475667a614 100644
--- a/metadata/md5-cache/app-office/skrooge-2.14.0
+++ b/metadata/md5-cache/app-office/skrooge-2.14.0
@@ -11,5 +11,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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 c3f3d17e0e61..607dd6125415 100644
--- a/metadata/md5-cache/app-office/skrooge-2.15.0
+++ b/metadata/md5-cache/app-office/skrooge-2.15.0
@@ -11,5 +11,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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/taskcoach-1.4.3-r1 b/metadata/md5-cache/app-office/taskcoach-1.4.3-r1
index ed9f317a905e..4636a5a847d6 100644
--- a/metadata/md5-cache/app-office/taskcoach-1.4.3-r1
+++ b/metadata/md5-cache/app-office/taskcoach-1.4.3-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/taskcoach/TaskCoach-1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e7b66087b9f75f3bada817911283f73d
diff --git a/metadata/md5-cache/app-office/texmacs-1.99.6-r2 b/metadata/md5-cache/app-office/texmacs-1.99.6-r2
index c75f7e916eaf..c42d0fa2cef4 100644
--- a/metadata/md5-cache/app-office/texmacs-1.99.6-r2
+++ b/metadata/md5-cache/app-office/texmacs-1.99.6-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=app-text/ghostscript-gpl <dev-scheme/guile-1.9[deprecated] media-libs/freetype x11-apps/xmodmap x11-libs/libXext virtual/latex-base >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 sqlite? ( dev-db/sqlite ) jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) ) netpbm? ( media-libs/netpbm ) spell? ( app-text/aspell ) svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) )
 SLOT=0
 SRC_URI=ftp://ftp.texmacs.org/pub/TeXmacs/tmftp/source/TeXmacs-1.99.6-src.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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=aa98f7e06e23330c3cf43725154e2416
diff --git a/metadata/md5-cache/app-office/texstudio-2.11.2-r2 b/metadata/md5-cache/app-office/texstudio-2.11.2-r2
index 4af782381d49..0fa3dfa8a101 100644
--- a/metadata/md5-cache/app-office/texstudio-2.11.2-r2
+++ b/metadata/md5-cache/app-office/texstudio-2.11.2-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/hunspell:= app-text/poppler[qt5] >=dev-libs/quazip-0.7.2[qt5(+)] dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext video? ( media-libs/phonon[qt5(+)] ) app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
 SLOT=0
 SRC_URI=mirror://sourceforge/texstudio/texstudio/TeXstudio%202.11.2/texstudio-2.11.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=505a608ea3d7694fc73d2314f589215e
diff --git a/metadata/md5-cache/app-office/texstudio-2.12.10 b/metadata/md5-cache/app-office/texstudio-2.12.10
index 374828dc84e1..59b9b328adaa 100644
--- a/metadata/md5-cache/app-office/texstudio-2.12.10
+++ b/metadata/md5-cache/app-office/texstudio-2.12.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/hunspell:= app-text/poppler[qt5] >=dev-libs/quazip-0.7.2[qt5(+)] dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext video? ( media-libs/phonon[qt5(+)] ) app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
 SLOT=0
 SRC_URI=https://github.com/texstudio-org/texstudio/archive/2.12.10.tar.gz -> texstudio-2.12.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b50d7ccf0bc4f0adcc7a42e6a8fe6c42
diff --git a/metadata/md5-cache/app-office/texstudio-2.12.2-r1 b/metadata/md5-cache/app-office/texstudio-2.12.2-r1
index 10960280e055..f4dfef2abc81 100644
--- a/metadata/md5-cache/app-office/texstudio-2.12.2-r1
+++ b/metadata/md5-cache/app-office/texstudio-2.12.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/hunspell:= app-text/poppler[qt5] >=dev-libs/quazip-0.7.2[qt5(+)] dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext video? ( media-libs/phonon[qt5(+)] ) app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
 SLOT=0
 SRC_URI=mirror://sourceforge/texstudio/texstudio/TeXstudio%202.12.2/texstudio-2.12.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3767e420d583108f3e83db4ef2aaf9f9
diff --git a/metadata/md5-cache/app-office/texstudio-2.12.4-r1 b/metadata/md5-cache/app-office/texstudio-2.12.4-r1
index d82ee5d2c69e..6e0ab8fd8134 100644
--- a/metadata/md5-cache/app-office/texstudio-2.12.4-r1
+++ b/metadata/md5-cache/app-office/texstudio-2.12.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/hunspell:= app-text/poppler[qt5] >=dev-libs/quazip-0.7.2[qt5(+)] dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext video? ( media-libs/phonon[qt5(+)] ) app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
 SLOT=0
 SRC_URI=mirror://sourceforge/texstudio/texstudio/TeXstudio%202.12.4/texstudio-2.12.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3767e420d583108f3e83db4ef2aaf9f9
diff --git a/metadata/md5-cache/app-office/texstudio-2.12.6-r1 b/metadata/md5-cache/app-office/texstudio-2.12.6-r1
index dac27e3d0252..306420868262 100644
--- a/metadata/md5-cache/app-office/texstudio-2.12.6-r1
+++ b/metadata/md5-cache/app-office/texstudio-2.12.6-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/hunspell:= app-text/poppler[qt5] >=dev-libs/quazip-0.7.2[qt5(+)] dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext video? ( media-libs/phonon[qt5(+)] ) app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jstein/dist/texstudio-2.12.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7f290dd9c584fcb8fd6a00de696138cd
diff --git a/metadata/md5-cache/app-office/texstudio-2.12.8-r1 b/metadata/md5-cache/app-office/texstudio-2.12.8-r1
index eba598aafc2c..8e1071197e20 100644
--- a/metadata/md5-cache/app-office/texstudio-2.12.8-r1
+++ b/metadata/md5-cache/app-office/texstudio-2.12.8-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/hunspell:= app-text/poppler[qt5] >=dev-libs/quazip-0.7.2[qt5(+)] dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext video? ( media-libs/phonon[qt5(+)] ) app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
 SLOT=0
 SRC_URI=https://github.com/texstudio-org/texstudio/archive/2.12.8.tar.gz -> texstudio-2.12.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6cfde06d32159dec2439cfdfe2743220
diff --git a/metadata/md5-cache/app-office/wps-office-10.1.0.5707_alpha21-r2 b/metadata/md5-cache/app-office/wps-office-10.1.0.5707_alpha21-r2
index bb59b15e18fc..2806dad78910 100644
--- a/metadata/md5-cache/app-office/wps-office-10.1.0.5707_alpha21-r2
+++ b/metadata/md5-cache/app-office/wps-office-10.1.0.5707_alpha21-r2
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=x86? ( http://kdl.cc.ksosoft.com/wps-community/download/a21/wps-office_10.1.0.5707~a21_i386.deb ) amd64? ( http://kdl.cc.ksosoft.com/wps-community/download/a21/wps-office_10.1.0.5707~a21_amd64.deb )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3560d502b0190cf3e16fd0253c9d3ec2
diff --git a/metadata/md5-cache/app-office/wps-office-10.1.0.6757 b/metadata/md5-cache/app-office/wps-office-10.1.0.6757
index eb21b70fd037..a09c213d4bfc 100644
--- a/metadata/md5-cache/app-office/wps-office-10.1.0.6757
+++ b/metadata/md5-cache/app-office/wps-office-10.1.0.6757
@@ -9,5 +9,5 @@ RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=amd64? ( http://kdl.cc.ksosoft.com/wps-community/download/6757/wps-office_10.1.0.6757_x86_64.tar.xz ) x86? ( http://kdl.cc.ksosoft.com/wps-community/download/6757/wps-office_10.1.0.6757_x86.tar.xz )
-_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	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1b385e127207118aeeac580b6b5763fb
diff --git a/metadata/md5-cache/app-officeext/Manifest.gz b/metadata/md5-cache/app-officeext/Manifest.gz
index 9bb59aa9f3d5..602e59ab1663 100644
--- a/metadata/md5-cache/app-officeext/Manifest.gz
+++ b/metadata/md5-cache/app-officeext/Manifest.gz
diff --git a/metadata/md5-cache/app-officeext/texmaths-0.46.1 b/metadata/md5-cache/app-officeext/texmaths-0.46.1
new file mode 100644
index 000000000000..7376a350f28e
--- /dev/null
+++ b/metadata/md5-cache/app-officeext/texmaths-0.46.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm unpack
+DEPEND=office_implementation_libreoffice? ( || ( app-office/libreoffice app-office/libreoffice-bin ) ) office_implementation_openoffice? ( app-office/openoffice-bin ) app-arch/unzip
+DESCRIPTION=LaTeX Equation Editor for LibreOffice
+EAPI=6
+HOMEPAGE=http://roland65.free.fr/texmaths/
+IUSE=office_implementation_libreoffice office_implementation_openoffice
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/dvisvgm virtual/tex-base office_implementation_libreoffice? ( || ( app-office/libreoffice app-office/libreoffice-bin ) ) office_implementation_openoffice? ( app-office/openoffice-bin )
+REQUIRED_USE=|| ( office_implementation_libreoffice office_implementation_openoffice )
+SLOT=0
+SRC_URI=mirror://sourceforge/texmaths/TexMaths-0.46.1.oxt
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	office-ext-r1	a0b032c38013ee0eac7b9cb2145d22b3	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f806b63f4dff1cd8f23e185dc7fa12b0
diff --git a/metadata/md5-cache/app-pda/Manifest.gz b/metadata/md5-cache/app-pda/Manifest.gz
index dcc6d78d7b38..dca1c1989628 100644
--- a/metadata/md5-cache/app-pda/Manifest.gz
+++ b/metadata/md5-cache/app-pda/Manifest.gz
diff --git a/metadata/md5-cache/app-pda/barry-0.18.3 b/metadata/md5-cache/app-pda/barry-0.18.3
index 96470780f2cc..14ff5d4ec88b 100644
--- a/metadata/md5-cache/app-pda/barry-0.18.3
+++ b/metadata/md5-cache/app-pda/barry-0.18.3
@@ -9,5 +9,5 @@ LICENSE=CC-BY-SA-3.0 GPL-2
 RDEPEND=>=dev-cpp/libxmlpp-2.6:2.6 dev-libs/glib:2 >=dev-libs/libtar-1.2.11-r2 >=media-libs/libsdl-1.2 >=sys-fs/fuse-2.5:= sys-libs/zlib virtual/libusb:1 boost? ( >=dev-libs/boost-1.33 ) gui? ( dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-cpp/libglademm:2.4 )
 SLOT=0
 SRC_URI=mirror://sourceforge/barry/barry-0.18.3.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e685e5c3ab37849b5e9a74076f9a1db8
diff --git a/metadata/md5-cache/app-pda/gtkpod-2.1.5 b/metadata/md5-cache/app-pda/gtkpod-2.1.5
index 02bb2cdd7fa0..7a75f7628009 100644
--- a/metadata/md5-cache/app-pda/gtkpod-2.1.5
+++ b/metadata/md5-cache/app-pda/gtkpod-2.1.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gdl-3.6:3 >=dev-libs/glib-2.31:2 >=dev-libs/libxml2-2.7.7:2 >
 REQUIRED_USE=cdr? ( gstreamer )
 SLOT=0
 SRC_URI=mirror://sourceforge/gtkpod/gtkpod-2.1.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d875a64a537dcc0ea61e0bcbeaa5d38f
diff --git a/metadata/md5-cache/app-pda/pilot-link-0.12.5-r1 b/metadata/md5-cache/app-pda/pilot-link-0.12.5-r1
index 18f92f4d6af5..8e949f14c6cf 100644
--- a/metadata/md5-cache/app-pda/pilot-link-0.12.5-r1
+++ b/metadata/md5-cache/app-pda/pilot-link-0.12.5-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/popt >=sys-libs/ncurses-5.7-r7:0= virtual/libiconv bluetooth? (
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://pilot-link.org/source/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	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ebacfedb8041f09fcb0c9d3ceeb496c4
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 6bdc36915fc9..12ecf5f08042 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/distpatch-0.1.2-r1 b/metadata/md5-cache/app-portage/distpatch-0.1.2-r1
index 93c092cebc6c..4289d709b4ac 100644
--- a/metadata/md5-cache/app-portage/distpatch-0.1.2-r1
+++ b/metadata/md5-cache/app-portage/distpatch-0.1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=|| ( >=sys-apps/portage-2.1.8.3[python_targets_python2_7(-)?,-python_sin
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/rafaelmartins/distpatch/releases/download/v0.1.2/distpatch-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5da1b28dd2e1514a519ded2e3707d42c
diff --git a/metadata/md5-cache/app-portage/eix-0.33.2 b/metadata/md5-cache/app-portage/eix-0.33.2
index 0c6413b164c2..d84ec3e91cf7 100644
--- a/metadata/md5-cache/app-portage/eix-0.33.2
+++ b/metadata/md5-cache/app-portage/eix-0.33.2
@@ -4,10 +4,10 @@ DESCRIPTION=Search and query ebuilds
 EAPI=6
 HOMEPAGE=https://github.com/vaeth/eix/
 IUSE=debug doc nls sqlite
-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-2
 RDEPEND=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= ) >=app-shells/push-2.0-r1 >=app-shells/quoter-3.0_p2-r1 virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/vaeth/eix/releases/download/v0.33.2/eix-0.33.2.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d1f86f41a9fe8d8fa1453d11fd64872c
+_md5_=a6f96002164718d90e3aaeba63dcec28
diff --git a/metadata/md5-cache/app-portage/elogv-0.7.6.1-r1 b/metadata/md5-cache/app-portage/elogv-0.7.6.1-r1
index 1a04c587390b..c1e958d043bb 100644
--- a/metadata/md5-cache/app-portage/elogv-0.7.6.1-r1
+++ b/metadata/md5-cache/app-portage/elogv-0.7.6.1-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) >=
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/gentoo/elogv/archive/0.7.6.1.tar.gz -> elogv-0.7.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7426251a67ef09c68df05077b8ad2b47
diff --git a/metadata/md5-cache/app-portage/elogv-0.7.6.2 b/metadata/md5-cache/app-portage/elogv-0.7.6.2
index 96893187d25e..b60f50ec1409 100644
--- a/metadata/md5-cache/app-portage/elogv-0.7.6.2
+++ b/metadata/md5-cache/app-portage/elogv-0.7.6.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) >=
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/gentoo/elogv/archive/0.7.6.2.tar.gz -> elogv-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d04b885a4ee95c1d74b04cf797cc5d65
diff --git a/metadata/md5-cache/app-portage/elogv-0.7.6.3 b/metadata/md5-cache/app-portage/elogv-0.7.6.3
index 43f4401ff17a..262c20c70df6 100644
--- a/metadata/md5-cache/app-portage/elogv-0.7.6.3
+++ b/metadata/md5-cache/app-portage/elogv-0.7.6.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) >=
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/gentoo/elogv/archive/0.7.6.3.tar.gz -> elogv-0.7.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=d04b885a4ee95c1d74b04cf797cc5d65
diff --git a/metadata/md5-cache/app-portage/elogv-0.7.6.4 b/metadata/md5-cache/app-portage/elogv-0.7.6.4
index cb1ba6ab2f28..9c2d313e00a0 100644
--- a/metadata/md5-cache/app-portage/elogv-0.7.6.4
+++ b/metadata/md5-cache/app-portage/elogv-0.7.6.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) >=
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/gentoo/elogv/archive/0.7.6.4.tar.gz -> elogv-0.7.6.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d04b885a4ee95c1d74b04cf797cc5d65
diff --git a/metadata/md5-cache/app-portage/elogv-0.7.6.5 b/metadata/md5-cache/app-portage/elogv-0.7.6.5
index a17ad1ed7a70..cb98a8b6903c 100644
--- a/metadata/md5-cache/app-portage/elogv-0.7.6.5
+++ b/metadata/md5-cache/app-portage/elogv-0.7.6.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) >=
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/gentoo/elogv/archive/0.7.6.5.tar.gz -> elogv-0.7.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=d04b885a4ee95c1d74b04cf797cc5d65
diff --git a/metadata/md5-cache/app-portage/elogv-0.7.6.6 b/metadata/md5-cache/app-portage/elogv-0.7.6.6
index a82a59e735db..485677705c06 100644
--- a/metadata/md5-cache/app-portage/elogv-0.7.6.6
+++ b/metadata/md5-cache/app-portage/elogv-0.7.6.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) >=
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/gentoo/elogv/archive/0.7.6.6.tar.gz -> elogv-0.7.6.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d04b885a4ee95c1d74b04cf797cc5d65
diff --git a/metadata/md5-cache/app-portage/elogv-0.7.7.1 b/metadata/md5-cache/app-portage/elogv-0.7.7.1
index 75b8a1a2a9d7..2e32cbb6f725 100644
--- a/metadata/md5-cache/app-portage/elogv-0.7.7.1
+++ b/metadata/md5-cache/app-portage/elogv-0.7.7.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) python_target
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/gentoo/elogv/archive/0.7.7.1.tar.gz -> elogv-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b80929507fa2de3887374f6600d99bf8
diff --git a/metadata/md5-cache/app-portage/elogv-0.7.8 b/metadata/md5-cache/app-portage/elogv-0.7.8
index fcf31e17eebd..26b5ee3b4022 100644
--- a/metadata/md5-cache/app-portage/elogv-0.7.8
+++ b/metadata/md5-cache/app-portage/elogv-0.7.8
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) python_target
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/gentoo/elogv/archive/0.7.8.tar.gz -> elogv-0.7.8.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b80929507fa2de3887374f6600d99bf8
diff --git a/metadata/md5-cache/app-portage/esearch-1.3-r2 b/metadata/md5-cache/app-portage/esearch-1.3-r2
index 0659d92f6f45..8d42c5a7ae3c 100644
--- a/metadata/md5-cache/app-portage/esearch-1.3-r2
+++ b/metadata/md5-cache/app-portage/esearch-1.3-r2
@@ -10,5 +10,5 @@ RDEPEND=|| ( sys-apps/portage sys-apps/portage-mgorny ) python_targets_python2_7
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://github/fuzzyray/esearch/esearch-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b1dcf2621996ab17576dac7b5490b7a4
diff --git a/metadata/md5-cache/app-portage/esearch-9999 b/metadata/md5-cache/app-portage/esearch-9999
index 9f8fbb49fb36..583d9d65981d 100644
--- a/metadata/md5-cache/app-portage/esearch-9999
+++ b/metadata/md5-cache/app-portage/esearch-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( sys-apps/portage sys-apps/portage-mgorny ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[readline(+)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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_=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	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d2283ac7d623474b9448cf8123b75e04
diff --git a/metadata/md5-cache/app-portage/etc-proposals-1.4.3-r3 b/metadata/md5-cache/app-portage/etc-proposals-1.4.3-r3
index c0a0a36c852c..b5a73c990a46 100644
--- a/metadata/md5-cache/app-portage/etc-proposals-1.4.3-r3
+++ b/metadata/md5-cache/app-portage/etc-proposals-1.4.3-r3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pygtk-2.10 python_targets_python2_7? ( >=dev-lang/python-2.
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/etc-proposals.berlios/etc-proposals-1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=053ce392e5e3bdb558a9fd8c072237ca
diff --git a/metadata/md5-cache/app-portage/euscan-0.1.1-r2 b/metadata/md5-cache/app-portage/euscan-0.1.1-r2
index da09bb92418b..4a15e1df19ee 100644
--- a/metadata/md5-cache/app-portage/euscan-0.1.1-r2
+++ b/metadata/md5-cache/app-portage/euscan-0.1.1-r2
@@ -10,5 +10,5 @@ RDEPEND=|| ( sys-apps/portage[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~hwoarang/distfiles/euscan-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=836fd137dc4c16bbe03de2c0ed37f391
diff --git a/metadata/md5-cache/app-portage/euscan-9999 b/metadata/md5-cache/app-portage/euscan-9999
index f8e219058fc3..23de1910d64e 100644
--- a/metadata/md5-cache/app-portage/euscan-9999
+++ b/metadata/md5-cache/app-portage/euscan-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( sys-apps/portage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-apps/portage-mgorny[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=app-portage/gentoolkit-0.2.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/beautifulsoup[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c3f99c6284b9bc9acd6dad99de91e026
diff --git a/metadata/md5-cache/app-portage/fetchcommandwrapper-0.7.1 b/metadata/md5-cache/app-portage/fetchcommandwrapper-0.7.1
index 9d87b17d59c3..a05bd1e06108 100644
--- a/metadata/md5-cache/app-portage/fetchcommandwrapper-0.7.1
+++ b/metadata/md5-cache/app-portage/fetchcommandwrapper-0.7.1
@@ -10,5 +10,5 @@ RDEPEND=>=net-misc/aria2-1.10.2 python_targets_python2_7? ( >=dev-lang/python-2.
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.hartwork.org/public/fetchcommandwrapper-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=504848557f5122b5dce69a36841f0d79
diff --git a/metadata/md5-cache/app-portage/fetchcommandwrapper-0.7.2 b/metadata/md5-cache/app-portage/fetchcommandwrapper-0.7.2
index 27d994cc4c87..0d1cebf6f45e 100644
--- a/metadata/md5-cache/app-portage/fetchcommandwrapper-0.7.2
+++ b/metadata/md5-cache/app-portage/fetchcommandwrapper-0.7.2
@@ -10,5 +10,5 @@ RDEPEND=>=net-misc/aria2-1.10.2 python_targets_python2_7? ( >=dev-lang/python-2.
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.hartwork.org/public/fetchcommandwrapper-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=504848557f5122b5dce69a36841f0d79
diff --git a/metadata/md5-cache/app-portage/fetchcommandwrapper-0.7.3 b/metadata/md5-cache/app-portage/fetchcommandwrapper-0.7.3
index d259e4415382..3ffde943ad60 100644
--- a/metadata/md5-cache/app-portage/fetchcommandwrapper-0.7.3
+++ b/metadata/md5-cache/app-portage/fetchcommandwrapper-0.7.3
@@ -10,5 +10,5 @@ RDEPEND=>=net-misc/aria2-1.10.2 python_targets_python2_7? ( >=dev-lang/python-2.
 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/gentoo/fetchcommandwrapper/archive/0.7.3.tar.gz -> fetchcommandwrapper-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bbf60311affb73a491309456f568c4c2
diff --git a/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8 b/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8
index 7cf8e9f35b3e..07ed3dc9c699 100644
--- a/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8
+++ b/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8
@@ -10,5 +10,5 @@ RDEPEND=>=net-misc/aria2-1.10.2 python_targets_python2_7? ( >=dev-lang/python-2.
 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/gentoo/fetchcommandwrapper/archive/0.8.tar.gz -> fetchcommandwrapper-0.8.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bbf60311affb73a491309456f568c4c2
diff --git a/metadata/md5-cache/app-portage/flaggie-0.2.1-r1 b/metadata/md5-cache/app-portage/flaggie-0.2.1-r1
index f68298b15dd7..1d56ff3044ee 100644
--- a/metadata/md5-cache/app-portage/flaggie-0.2.1-r1
+++ b/metadata/md5-cache/app-portage/flaggie-0.2.1-r1
@@ -10,5 +10,5 @@ RDEPEND=|| ( sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-
 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/mgorny/flaggie/releases/download/flaggie-0.2.1/flaggie-0.2.1.tar.bz2
-_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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0ebcaaeb1a6b0cb938cd52b853066bb5
diff --git a/metadata/md5-cache/app-portage/flaggie-9999 b/metadata/md5-cache/app-portage/flaggie-9999
index c2e3a48933e7..10ef92240a94 100644
--- a/metadata/md5-cache/app-portage/flaggie-9999
+++ b/metadata/md5-cache/app-portage/flaggie-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=|| ( 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(-)] sys-apps/portage-mgorny[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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_=464d6486a595c480217c96d186b6d6d8
diff --git a/metadata/md5-cache/app-portage/g-octave-0.4.1-r6 b/metadata/md5-cache/app-portage/g-octave-0.4.1-r6
index 7e330aca18e1..27a27b933c0f 100644
--- a/metadata/md5-cache/app-portage/g-octave-0.4.1-r6
+++ b/metadata/md5-cache/app-portage/g-octave-0.4.1-r6
@@ -10,5 +10,5 @@ RDEPEND=|| ( sys-apps/portage sys-apps/portage-mgorny ) python_targets_python2_7
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://github/rafaelmartins/g-octave/g-octave-0.4.1.tar.gz https://github.com/rafaelmartins/g-octave-db/tarball/bdf02cbf0a8d017c6c1bddeffd6f03d5d90695ed -> g-octave-db-bdf02cb.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=23e707393aab1432bd640e01729d570c
diff --git a/metadata/md5-cache/app-portage/g-sorcery-0.1-r1 b/metadata/md5-cache/app-portage/g-sorcery-0.1-r1
index 4c781851411c..98e3d55b7976 100644
--- a/metadata/md5-cache/app-portage/g-sorcery-0.1-r1
+++ b/metadata/md5-cache/app-portage/g-sorcery-0.1-r1
@@ -11,5 +11,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/jauhien/g-sorcery/archive/v0.1.tar.gz -> g-sorcery-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=26f768cc1426df16504b4055d2bd7157
diff --git a/metadata/md5-cache/app-portage/g-sorcery-0.2-r1 b/metadata/md5-cache/app-portage/g-sorcery-0.2-r1
index d5fe5fa37e5c..e129a36322ec 100644
--- a/metadata/md5-cache/app-portage/g-sorcery-0.2-r1
+++ b/metadata/md5-cache/app-portage/g-sorcery-0.2-r1
@@ -11,5 +11,5 @@ RDEPEND=bson? ( dev-python/pymongo[python_targets_python2_7(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://github.com/jauhien/g-sorcery/archive/0.2.tar.gz -> g-sorcery-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=94973ff6eaf9e00c286d4be7c7efc0bc
diff --git a/metadata/md5-cache/app-portage/g-sorcery-0.2.1 b/metadata/md5-cache/app-portage/g-sorcery-0.2.1
index 807592cc6b97..e50ad943589f 100644
--- a/metadata/md5-cache/app-portage/g-sorcery-0.2.1
+++ b/metadata/md5-cache/app-portage/g-sorcery-0.2.1
@@ -11,5 +11,5 @@ RDEPEND=bson? ( dev-python/pymongo[python_targets_python2_7(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://github.com/jauhien/g-sorcery/archive/0.2.1.tar.gz -> g-sorcery-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7d8fb8feba609d808ecba152d4f49d4e
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 0b59bb7d791c..89e2f9fdc18c 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
@@ -11,5 +11,5 @@ RDEPEND=bson? ( dev-python/pymongo[python_targets_python2_7(-)?,python_targets_p
 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/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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/app-portage/g-sorcery-9999 b/metadata/md5-cache/app-portage/g-sorcery-9999
index 7ea170332e18..c938272f86ea 100644
--- a/metadata/md5-cache/app-portage/g-sorcery-9999
+++ b/metadata/md5-cache/app-portage/g-sorcery-9999
@@ -9,5 +9,5 @@ PDEPEND=>=app-portage/layman-2.2.0[g-sorcery(-),python_targets_python2_7(-)?,pyt
 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(-)] sys-apps/portage-mgorny[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=e2722e93634bc89ee6214cc288a7879c
diff --git a/metadata/md5-cache/app-portage/gemato-14.0 b/metadata/md5-cache/app-portage/gemato-14.0
index 96c1ae2dbc1c..e2428b6a9b62 100644
--- a/metadata/md5-cache/app-portage/gemato-14.0
+++ b/metadata/md5-cache/app-portage/gemato-14.0
@@ -10,5 +10,5 @@ RDEPEND=blake2? ( python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy
 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/g/gemato/gemato-14.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fc3f8449793231e7db005a41935c5153
diff --git a/metadata/md5-cache/app-portage/gemato-14.0m b/metadata/md5-cache/app-portage/gemato-14.0m
index 77c0a319b93e..adfb288db05b 100644
--- a/metadata/md5-cache/app-portage/gemato-14.0m
+++ b/metadata/md5-cache/app-portage/gemato-14.0m
@@ -10,5 +10,5 @@ RDEPEND=blake2? ( python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy
 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/mgorny/gemato/archive/v14.0+multiprocessing.tar.gz -> gemato-14.0-multiprocessing.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a202c168207cf5f2e19461def9dcf38b
diff --git a/metadata/md5-cache/app-portage/gemato-9999 b/metadata/md5-cache/app-portage/gemato-9999
index a411ba7fe097..2be35607c653 100644
--- a/metadata/md5-cache/app-portage/gemato-9999
+++ b/metadata/md5-cache/app-portage/gemato-9999
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=blake2? ( python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) bzip2? ( python_targets_pypy? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_pypy? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_pypy? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_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=[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(-)]
 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
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=89cd2b282463218d23eee762a6e81df0
diff --git a/metadata/md5-cache/app-portage/gemato-9999m b/metadata/md5-cache/app-portage/gemato-9999m
index 84aca30d0e1f..0a3c43b228b6 100644
--- a/metadata/md5-cache/app-portage/gemato-9999m
+++ b/metadata/md5-cache/app-portage/gemato-9999m
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=blake2? ( python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) bzip2? ( python_targets_pypy? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_pypy? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_pypy? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_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=[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(-)]
 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
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=897e5ea3ec180747779853073d7b5c96
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.3.3 b/metadata/md5-cache/app-portage/gentoolkit-0.3.3
index 226298460905..1d232e784a0b 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-0.3.3
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.3.3
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,py
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~fuzzyray/distfiles/gentoolkit-0.3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e7bb0247dfa627275726afc9604470ee
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.4.0 b/metadata/md5-cache/app-portage/gentoolkit-0.4.0
index 983a3cb243e7..a4e3448de844 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-0.4.0
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.4.0
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,py
 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://dev.gentoo.org/~dolsen/releases/gentoolkit/gentoolkit-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=15f656671a4b81e905257e5b95834a82
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.4.1 b/metadata/md5-cache/app-portage/gentoolkit-0.4.1
index 869ac0b9b9d6..e6b4d621d2e7 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-0.4.1
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.4.1
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,py
 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://dev.gentoo.org/~fuzzyray/releases/gentoolkit/gentoolkit-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=385923e48c7ceccb2325ccc9039fc3b6
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.4.2-r1 b/metadata/md5-cache/app-portage/gentoolkit-0.4.2-r1
index b8c4c67fbccd..237b2791131e 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-0.4.2-r1
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.4.2-r1
@@ -10,5 +10,5 @@ RDEPEND=|| ( sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_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://dev.gentoo.org/~mgorny/dist/gentoolkit-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dcfa2fe1b73b642d52564e546eded2e0
diff --git a/metadata/md5-cache/app-portage/gentoolkit-9999 b/metadata/md5-cache/app-portage/gentoolkit-9999
index 659e2c017d2b..6f1d8c2ecbd7 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-9999
+++ b/metadata/md5-cache/app-portage/gentoolkit-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( 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(-)] ) !app-portage/gentoolkit-dev sys-apps/gawk sys-apps/gentoo-functions python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy 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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=65283b5157823e42f3dcd7c5ae17f5b3
diff --git a/metadata/md5-cache/app-portage/gentoopm-0.3.0 b/metadata/md5-cache/app-portage/gentoopm-0.3.0
index b9e6deb66806..0444798d9c5c 100644
--- a/metadata/md5-cache/app-portage/gentoopm-0.3.0
+++ b/metadata/md5-cache/app-portage/gentoopm-0.3.0
@@ -11,5 +11,5 @@ RDEPEND=|| ( >=sys-apps/pkgcore-0.9.4[python_targets_pypy(-)?,python_targets_pyt
 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/mgorny/gentoopm/archive/v0.3.0.tar.gz -> gentoopm-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=72441c650d1a85275ca3d6fa22d8a08f
diff --git a/metadata/md5-cache/app-portage/gentoopm-9999 b/metadata/md5-cache/app-portage/gentoopm-9999
index ff445211cf75..02f123c31503 100644
--- a/metadata/md5-cache/app-portage/gentoopm-9999
+++ b/metadata/md5-cache/app-portage/gentoopm-9999
@@ -9,5 +9,5 @@ PDEPEND=app-eselect/eselect-package-manager
 RDEPEND=|| ( >=sys-apps/pkgcore-0.9.4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=sys-apps/portage-2.1.10.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(-)] sys-apps/portage-mgorny[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_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
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=414001a645e42bc1055efbafbc2d32ca
diff --git a/metadata/md5-cache/app-portage/gpytage-0.3.0_rc1-r1 b/metadata/md5-cache/app-portage/gpytage-0.3.0_rc1-r1
index 1f03a0db8db1..514d7fd178e9 100644
--- a/metadata/md5-cache/app-portage/gpytage-0.3.0_rc1-r1
+++ b/metadata/md5-cache/app-portage/gpytage-0.3.0_rc1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pygtk-2.14 python_targets_python2_7? ( >=dev-lang/python-2.
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://download.gna.org/gpytage/gpytage-0.3.0_rc1.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7943135e51e32fdcbe351ca46790d60e
diff --git a/metadata/md5-cache/app-portage/gpyutils-0.2.2 b/metadata/md5-cache/app-portage/gpyutils-0.2.2
index fed0755ca560..f4c23225eb10 100644
--- a/metadata/md5-cache/app-portage/gpyutils-0.2.2
+++ b/metadata/md5-cache/app-portage/gpyutils-0.2.2
@@ -10,5 +10,5 @@ RDEPEND=>=app-portage/gentoopm-0.2.9[python_targets_pypy(-)?,python_targets_pyth
 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/mgorny/gpyutils/archive/v0.2.2.tar.gz -> gpyutils-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e78cc086b182774fb42f77a67cdb659a
diff --git a/metadata/md5-cache/app-portage/gpyutils-9999 b/metadata/md5-cache/app-portage/gpyutils-9999
index 44a9bcb85af8..e6c3218a48db 100644
--- a/metadata/md5-cache/app-portage/gpyutils-9999
+++ b/metadata/md5-cache/app-portage/gpyutils-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=app-portage/gentoopm-0.2.9[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
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=69bd5f63e228c02285230d35763728ca
diff --git a/metadata/md5-cache/app-portage/grs-0.5 b/metadata/md5-cache/app-portage/grs-0.5
index 8189143ef7aa..b90b021a641e 100644
--- a/metadata/md5-cache/app-portage/grs-0.5
+++ b/metadata/md5-cache/app-portage/grs-0.5
@@ -10,5 +10,5 @@ RDEPEND=app-arch/tar[xattr] app-crypt/md5deep dev-libs/libcgroup dev-vcs/git net
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/grs/grs-0.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3931f5356713860ed4442c6cce189ebe
diff --git a/metadata/md5-cache/app-portage/grs-0.6-r1 b/metadata/md5-cache/app-portage/grs-0.6-r1
index d07b4c0d047c..6afd40ca2e6d 100644
--- a/metadata/md5-cache/app-portage/grs-0.6-r1
+++ b/metadata/md5-cache/app-portage/grs-0.6-r1
@@ -10,5 +10,5 @@ RDEPEND=|| ( sys-apps/portage sys-apps/portage-mgorny ) server? ( app-arch/tar[x
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/grs/grs-0.6.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=45c49b0ccd011ad9e45d3c181792bb93
diff --git a/metadata/md5-cache/app-portage/grs-9999 b/metadata/md5-cache/app-portage/grs-9999
index e10304482ba2..841b02bf55b3 100644
--- a/metadata/md5-cache/app-portage/grs-9999
+++ b/metadata/md5-cache/app-portage/grs-9999
@@ -9,5 +9,5 @@ RDEPEND=|| ( sys-apps/portage sys-apps/portage-mgorny ) server? ( app-arch/tar[x
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/grs/ISO-1.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	915cae3d7d636732918d18827fb1c226	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0d6b654a8bf01193ab020a7cfd08befc
diff --git a/metadata/md5-cache/app-portage/gs-elpa-0.1.3 b/metadata/md5-cache/app-portage/gs-elpa-0.1.3
index 5b259b1d8b95..24e043e080ec 100644
--- a/metadata/md5-cache/app-portage/gs-elpa-0.1.3
+++ b/metadata/md5-cache/app-portage/gs-elpa-0.1.3
@@ -10,5 +10,5 @@ RDEPEND=app-portage/g-sorcery[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://github.com/jauhien/gs-elpa/archive/0.1.3.tar.gz -> gs-elpa-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=51f7580ff5fe65a79b876111da260adf
diff --git a/metadata/md5-cache/app-portage/gs-elpa-0.1.3-r1 b/metadata/md5-cache/app-portage/gs-elpa-0.1.3-r1
index e953c56c2fb0..6d51b7e5f434 100644
--- a/metadata/md5-cache/app-portage/gs-elpa-0.1.3-r1
+++ b/metadata/md5-cache/app-portage/gs-elpa-0.1.3-r1
@@ -10,5 +10,5 @@ RDEPEND=app-portage/g-sorcery[python_targets_python2_7(-)?,-python_single_target
 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/jauhien/gs-elpa/archive/0.1.3.tar.gz -> gs-elpa-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3b26b2f4baeeaee323edbe37547ffae5
diff --git a/metadata/md5-cache/app-portage/gs-elpa-9999 b/metadata/md5-cache/app-portage/gs-elpa-9999
index 040185726e8a..cbf27649709b 100644
--- a/metadata/md5-cache/app-portage/gs-elpa-9999
+++ b/metadata/md5-cache/app-portage/gs-elpa-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-portage/g-sorcery-0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sexpdata[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=518a7e30683ebd4d7628bac59366fe27
diff --git a/metadata/md5-cache/app-portage/gs-pypi-0.1 b/metadata/md5-cache/app-portage/gs-pypi-0.1
index c0e1c5d759f0..ae9ceba91bd3 100644
--- a/metadata/md5-cache/app-portage/gs-pypi-0.1
+++ b/metadata/md5-cache/app-portage/gs-pypi-0.1
@@ -10,5 +10,5 @@ RDEPEND=app-portage/g-sorcery[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://github.com/jauhien/gs-pypi/archive/v0.1.tar.gz -> gs-pypi-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=32e300c15aba277d1e7ca4f5da2e8d43
diff --git a/metadata/md5-cache/app-portage/gs-pypi-0.2 b/metadata/md5-cache/app-portage/gs-pypi-0.2
index c9543e333277..007e8aabb146 100644
--- a/metadata/md5-cache/app-portage/gs-pypi-0.2
+++ b/metadata/md5-cache/app-portage/gs-pypi-0.2
@@ -10,5 +10,5 @@ RDEPEND=>=app-portage/g-sorcery-0.2[bson(-),python_targets_python2_7(-)?,-python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://github.com/jauhien/gs-pypi/archive/0.2.tar.gz -> gs-pypi-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=591fd8aa5af22919faf164841879c874
diff --git a/metadata/md5-cache/app-portage/gs-pypi-0.2.1 b/metadata/md5-cache/app-portage/gs-pypi-0.2.1
index 3d43116bcdf1..49bfba7a8e65 100644
--- a/metadata/md5-cache/app-portage/gs-pypi-0.2.1
+++ b/metadata/md5-cache/app-portage/gs-pypi-0.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=app-portage/g-sorcery-0.2.1[bson(-),git(-),python_targets_python2_7(-)
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://github.com/jauhien/gs-pypi/archive/0.2.1.tar.gz -> gs-pypi-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=86bea19bf32196d680041dc33875002a
diff --git a/metadata/md5-cache/app-portage/gs-pypi-0.2.1-r1 b/metadata/md5-cache/app-portage/gs-pypi-0.2.1-r1
index d6f766e7d824..f25c964fb0bb 100644
--- a/metadata/md5-cache/app-portage/gs-pypi-0.2.1-r1
+++ b/metadata/md5-cache/app-portage/gs-pypi-0.2.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=app-portage/g-sorcery-0.2.1[bson(-),git(-),python_targets_python2_7(-)
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/jauhien/gs-pypi/archive/0.2.1.tar.gz -> gs-pypi-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=12c285b781c931202b0f5d25d91cad39
diff --git a/metadata/md5-cache/app-portage/gs-pypi-9999 b/metadata/md5-cache/app-portage/gs-pypi-9999
index 44945da6a414..21fb7703e7c4 100644
--- a/metadata/md5-cache/app-portage/gs-pypi-9999
+++ b/metadata/md5-cache/app-portage/gs-pypi-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-portage/g-sorcery-9999[bson(-),git(-),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/beautifulsoup:4[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-lang/python-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
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c4456cd1e31b9d91a2eb552afe09ef46
diff --git a/metadata/md5-cache/app-portage/install-mask-0.1.1 b/metadata/md5-cache/app-portage/install-mask-0.1.1
index a490ecd3bcf3..05e99e621068 100644
--- a/metadata/md5-cache/app-portage/install-mask-0.1.1
+++ b/metadata/md5-cache/app-portage/install-mask-0.1.1
@@ -10,5 +10,5 @@ RDEPEND=app-portage/flaggie[python_targets_python2_7(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://www.bitbucket.org/mgorny/install-mask/downloads/install-mask-0.1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=99e86c9ada9c84cd9914214e4b33dd47
diff --git a/metadata/md5-cache/app-portage/install-mask-9999 b/metadata/md5-cache/app-portage/install-mask-9999
index 7bcee1be3e82..cad6036444b1 100644
--- a/metadata/md5-cache/app-portage/install-mask-9999
+++ b/metadata/md5-cache/app-portage/install-mask-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=app-portage/flaggie[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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_=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	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=45bf6fb480c7073bb48afa8efadc575b
diff --git a/metadata/md5-cache/app-portage/kuroo-0.90.5_p20180410 b/metadata/md5-cache/app-portage/kuroo-0.90.5_p20180410
index 9210c6c29541..d29c5496bb43 100644
--- a/metadata/md5-cache/app-portage/kuroo-0.90.5_p20180410
+++ b/metadata/md5-cache/app-portage/kuroo-0.90.5_p20180410
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-db/sqlite:3 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kdelibs4support:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kitemviews:5 kde-frameworks/knotifications:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/threadweaver:5 app-portage/gentoolkit kde-apps/kompare:5 kde-plasma/kde-cli-tools:5[kdesu]
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~asturm/distfiles/kuroo-0.90.5_p20180410.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c6efedab331059326d9f1233f085c0da
diff --git a/metadata/md5-cache/app-portage/kuroo-9999 b/metadata/md5-cache/app-portage/kuroo-9999
index e1d47c74b8e7..62fd864f3421 100644
--- a/metadata/md5-cache/app-portage/kuroo-9999
+++ b/metadata/md5-cache/app-portage/kuroo-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://sourceforge.net/projects/kuroo/
 LICENSE=GPL-2
 RDEPEND=dev-db/sqlite:3 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kdelibs4support:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kitemviews:5 kde-frameworks/knotifications:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/threadweaver:5 app-portage/gentoolkit kde-apps/kompare:5 kde-plasma/kde-cli-tools:5[kdesu]
 SLOT=0
-_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	subversion	3d1eb4b41d7190570a84f786958ebb13	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	subversion	3d1eb4b41d7190570a84f786958ebb13	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2b26024259e8b58c2dcd9665a5b89bfc
diff --git a/metadata/md5-cache/app-portage/layman-2.0.0-r1 b/metadata/md5-cache/app-portage/layman-2.0.0-r1
index 89f1b251ef9e..ce13518bace0 100644
--- a/metadata/md5-cache/app-portage/layman-2.0.0-r1
+++ b/metadata/md5-cache/app-portage/layman-2.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=bazaar? ( dev-vcs/bzr ) cvs? ( dev-vcs/cvs ) darcs? ( dev-vcs/darcs ) gi
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/layman/layman-2.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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_=ae2db2fcdd97eec8e3113c3d4ade569c
diff --git a/metadata/md5-cache/app-portage/layman-2.0.0-r3 b/metadata/md5-cache/app-portage/layman-2.0.0-r3
index fdb0d10493ba..658c99137b3e 100644
--- a/metadata/md5-cache/app-portage/layman-2.0.0-r3
+++ b/metadata/md5-cache/app-portage/layman-2.0.0-r3
@@ -10,5 +10,5 @@ RDEPEND=bazaar? ( dev-vcs/bzr ) cvs? ( dev-vcs/cvs ) darcs? ( dev-vcs/darcs ) gi
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/layman/layman-2.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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_=6356b0d115d2b1d28c723454f05cda74
diff --git a/metadata/md5-cache/app-portage/layman-2.2.0-r7 b/metadata/md5-cache/app-portage/layman-2.2.0-r7
index acb00957104f..db76f63455d6 100644
--- a/metadata/md5-cache/app-portage/layman-2.2.0-r7
+++ b/metadata/md5-cache/app-portage/layman-2.2.0-r7
@@ -10,5 +10,5 @@ RDEPEND=bazaar? ( dev-vcs/bzr ) cvs? ( dev-vcs/cvs ) darcs? ( dev-vcs/darcs ) gi
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://sourceforge/layman/layman-2.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=730f4aaabff8b41825dc723f2c4b45bc
diff --git a/metadata/md5-cache/app-portage/layman-2.4.1-r1 b/metadata/md5-cache/app-portage/layman-2.4.1-r1
index 08689ff373d5..f3ea5bb0a9fc 100644
--- a/metadata/md5-cache/app-portage/layman-2.4.1-r1
+++ b/metadata/md5-cache/app-portage/layman-2.4.1-r1
@@ -10,5 +10,5 @@ RDEPEND=bazaar? ( dev-vcs/bzr ) cvs? ( dev-vcs/cvs ) darcs? ( dev-vcs/darcs ) gi
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://sourceforge/layman/layman-2.4.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=890bcefa865c0e82d18942585b496fd6
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 23b3c525e4e2..6d72c45cad31 100644
--- a/metadata/md5-cache/app-portage/layman-2.4.2-r1
+++ b/metadata/md5-cache/app-portage/layman-2.4.2-r1
@@ -10,5 +10,5 @@ RDEPEND=bazaar? ( dev-vcs/bzr ) cvs? ( dev-vcs/cvs ) darcs? ( dev-vcs/darcs ) gi
 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	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/app-portage/layman-9999 b/metadata/md5-cache/app-portage/layman-9999
index 5a897af2cdd5..223d3ffbcf36 100644
--- a/metadata/md5-cache/app-portage/layman-9999
+++ b/metadata/md5-cache/app-portage/layman-9999
@@ -8,5 +8,5 @@ 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
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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_=1709f1ba7c60ef129170eab7a31224fc
diff --git a/metadata/md5-cache/app-portage/metagen-0.6.2-r1 b/metadata/md5-cache/app-portage/metagen-0.6.2-r1
index 39096a5e153c..7bc95891277a 100644
--- a/metadata/md5-cache/app-portage/metagen-0.6.2-r1
+++ b/metadata/md5-cache/app-portage/metagen-0.6.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/jaxml-3.01[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~neurogeek/metagen_releases/metagen-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8a96b285dca8de2ea0a8ee304e8e3419
diff --git a/metadata/md5-cache/app-portage/metagen-0.6.3 b/metadata/md5-cache/app-portage/metagen-0.6.3
index 2b80b2115f48..47cc636f096e 100644
--- a/metadata/md5-cache/app-portage/metagen-0.6.3
+++ b/metadata/md5-cache/app-portage/metagen-0.6.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/jaxml-3.01[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://cgit.gentoo.org/proj/metagen.git/snapshot/metagen-0.6.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=addd36ddf25cd93e6833b519e5ad6246
diff --git a/metadata/md5-cache/app-portage/metagen-0.6.4.2 b/metadata/md5-cache/app-portage/metagen-0.6.4.2
index 287e9f478e97..9776640a689c 100644
--- a/metadata/md5-cache/app-portage/metagen-0.6.4.2
+++ b/metadata/md5-cache/app-portage/metagen-0.6.4.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/jaxml-3.01[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://cgit.gentoo.org/proj/metagen.git/snapshot/metagen-0.6.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b1517286fdea20a1d8992a0651b49b56
diff --git a/metadata/md5-cache/app-portage/metagen-0.6.5 b/metadata/md5-cache/app-portage/metagen-0.6.5
index 3e808206c112..e3dcb818b199 100644
--- a/metadata/md5-cache/app-portage/metagen-0.6.5
+++ b/metadata/md5-cache/app-portage/metagen-0.6.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/jaxml-3.01[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://cgit.gentoo.org/proj/metagen.git/snapshot/metagen-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=acbfc14d43c44068204526620bcbcc39
diff --git a/metadata/md5-cache/app-portage/metagen-0.6.5-r1 b/metadata/md5-cache/app-portage/metagen-0.6.5-r1
index de03a6704676..73fb8bd11e99 100644
--- a/metadata/md5-cache/app-portage/metagen-0.6.5-r1
+++ b/metadata/md5-cache/app-portage/metagen-0.6.5-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/jaxml-3.01[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://cgit.gentoo.org/proj/metagen.git/snapshot/metagen-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=523aca59b2b49e98fce14a0c5b9986df
diff --git a/metadata/md5-cache/app-portage/metagen-0.6.6-r1 b/metadata/md5-cache/app-portage/metagen-0.6.6-r1
index 97d711ea80ee..1e33599e8cd4 100644
--- a/metadata/md5-cache/app-portage/metagen-0.6.6-r1
+++ b/metadata/md5-cache/app-portage/metagen-0.6.6-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/jaxml-3.01[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://cgit.gentoo.org/proj/metagen.git/snapshot/metagen-0.6.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=06e7d68c16bec9ca910400fd671a9c7c
diff --git a/metadata/md5-cache/app-portage/metagen-9999 b/metadata/md5-cache/app-portage/metagen-9999
index 7f556a6150ce..2b6f861f0435 100644
--- a/metadata/md5-cache/app-portage/metagen-9999
+++ b/metadata/md5-cache/app-portage/metagen-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-python/jaxml-3.01[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( ( >=sys-apps/portage-2.3.0_rc1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-portage/repoman[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-apps/portage-mgorny[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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0f210aba4fb8f9b8e4b381727a1348da
diff --git a/metadata/md5-cache/app-portage/mirrorselect-2.2.0.1 b/metadata/md5-cache/app-portage/mirrorselect-2.2.0.1
index 7d68c1bc52a3..f812727ebc9f 100644
--- a/metadata/md5-cache/app-portage/mirrorselect-2.2.0.1
+++ b/metadata/md5-cache/app-portage/mirrorselect-2.2.0.1
@@ -10,5 +10,5 @@ RDEPEND=dev-util/dialog net-analyzer/netselect python_targets_python2_7? ( >=dev
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dolsen/distfiles/mirrorselect-2.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	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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_=4b8bb6457b41d95727b3e7a621bfccb8
diff --git a/metadata/md5-cache/app-portage/mirrorselect-2.2.2 b/metadata/md5-cache/app-portage/mirrorselect-2.2.2
index fc3d205081bb..31a6292ef49e 100644
--- a/metadata/md5-cache/app-portage/mirrorselect-2.2.2
+++ b/metadata/md5-cache/app-portage/mirrorselect-2.2.2
@@ -10,5 +10,5 @@ RDEPEND=dev-util/dialog net-analyzer/netselect >=dev-python/ssl-fetch-0.2[python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-2.2.2.tar.gz https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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_=366bcad0e5e6ec83a410ab7b60679c1d
diff --git a/metadata/md5-cache/app-portage/mirrorselect-2.2.2-r2 b/metadata/md5-cache/app-portage/mirrorselect-2.2.2-r2
index 95d8d30cf4cf..d218b6c61c4e 100644
--- a/metadata/md5-cache/app-portage/mirrorselect-2.2.2-r2
+++ b/metadata/md5-cache/app-portage/mirrorselect-2.2.2-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-util/dialog net-analyzer/netselect >=dev-python/ssl-fetch-0.3[python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-2.2.2.tar.gz https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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_=0fac07cca7bbae1e89d3ef9ff0f18df3
diff --git a/metadata/md5-cache/app-portage/mirrorselect-2.2.3 b/metadata/md5-cache/app-portage/mirrorselect-2.2.3
index f5f03070490c..fa1da50a2e7d 100644
--- a/metadata/md5-cache/app-portage/mirrorselect-2.2.3
+++ b/metadata/md5-cache/app-portage/mirrorselect-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=dev-util/dialog net-analyzer/netselect >=dev-python/ssl-fetch-0.3[python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-2.2.3.tar.gz https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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_=666ee2b0c092a11ceb930fabdbe5c2ab
diff --git a/metadata/md5-cache/app-portage/mirrorselect-9999 b/metadata/md5-cache/app-portage/mirrorselect-9999
index cef97cbc7c55..c0f6d0b18216 100644
--- a/metadata/md5-cache/app-portage/mirrorselect-9999
+++ b/metadata/md5-cache/app-portage/mirrorselect-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-util/dialog net-analyzer/netselect =dev-python/ssl-fetch-9999[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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_=4c79bb8271ae1091f212501c1ddabce4
diff --git a/metadata/md5-cache/app-portage/overlint-0.5.2 b/metadata/md5-cache/app-portage/overlint-0.5.2
index 715616da46a1..7f75622fc57a 100644
--- a/metadata/md5-cache/app-portage/overlint-0.5.2
+++ b/metadata/md5-cache/app-portage/overlint-0.5.2
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/portage python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=http://www.hartwork.org/public/overlint-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a9e4714fae3862503b4320c301dca03c
diff --git a/metadata/md5-cache/app-portage/overlint-0.5.3-r1 b/metadata/md5-cache/app-portage/overlint-0.5.3-r1
index 4f5b6d351340..7fc403f3ef63 100644
--- a/metadata/md5-cache/app-portage/overlint-0.5.3-r1
+++ b/metadata/md5-cache/app-portage/overlint-0.5.3-r1
@@ -10,5 +10,5 @@ RDEPEND=|| ( sys-apps/portage[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
 SRC_URI=http://www.hartwork.org/public/overlint-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=28345130396ab26d34692b7992c3c51a
diff --git a/metadata/md5-cache/app-portage/pfl-2.4-r5 b/metadata/md5-cache/app-portage/pfl-2.4-r5
index 23bbc9426feb..af53871658b8 100644
--- a/metadata/md5-cache/app-portage/pfl-2.4-r5
+++ b/metadata/md5-cache/app-portage/pfl-2.4-r5
@@ -10,5 +10,5 @@ RDEPEND=net-misc/curl || ( sys-apps/portage[python_targets_python2_7(-)?,-python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://files.portagefilelist.de/pfl-2.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d235ae5e3d3b6e8ebcdb164e3b1c8e57
diff --git a/metadata/md5-cache/app-portage/pfl-3.0-r1 b/metadata/md5-cache/app-portage/pfl-3.0-r1
index f79dd4641be6..cff0ffca2996 100644
--- a/metadata/md5-cache/app-portage/pfl-3.0-r1
+++ b/metadata/md5-cache/app-portage/pfl-3.0-r1
@@ -10,5 +10,5 @@ RDEPEND=net-misc/curl || ( sys-apps/portage[python_targets_python3_5(-)?,python_
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://files.portagefilelist.de/pfl-3.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=44099ed24cdf322718bc3ba6655bd91d
diff --git a/metadata/md5-cache/app-portage/porthole-0.6.1-r5 b/metadata/md5-cache/app-portage/porthole-0.6.1-r5
index 730a6b57bd84..6a6c9644ed37 100644
--- a/metadata/md5-cache/app-portage/porthole-0.6.1-r5
+++ b/metadata/md5-cache/app-portage/porthole-0.6.1-r5
@@ -10,5 +10,5 @@ RDEPEND=|| ( >=sys-apps/portage-2.1[python_targets_python2_7(-)?,-python_single_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/porthole/porthole-0.6.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ee949381222296e6fc858b30dda35d60
diff --git a/metadata/md5-cache/app-portage/repoman-2.3.0-r1 b/metadata/md5-cache/app-portage/repoman-2.3.0-r1
index e3a87eb5a160..60c1d7ac11b5 100644
--- a/metadata/md5-cache/app-portage/repoman-2.3.0-r1
+++ b/metadata/md5-cache/app-portage/repoman-2.3.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/python-exec:2 !<sys-apps/portage-2.3.0_rc >=dev-python/lxml-3.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://gentoo/repoman-2.3.0.tar.bz2 https://dev.gentoo.org/~dolsen/releases/repoman/repoman-2.3.0.tar.bz2 https://gitweb.gentoo.org/proj/portage.git/patch/?id=ef33db45a0c1d462411d4ced1857a322c0ab28f6 -> repoman-2.3.0-bug-586864.patch
-_eclasses_=desktop	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=777bd01c93e961ba48abeadfeb0f700a
diff --git a/metadata/md5-cache/app-portage/repoman-2.3.10 b/metadata/md5-cache/app-portage/repoman-2.3.10
index 351bdbb52c77..098030ce01d8 100644
--- a/metadata/md5-cache/app-portage/repoman-2.3.10
+++ b/metadata/md5-cache/app-portage/repoman-2.3.10
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/portage-2.3.43[python_targets_python2_7(-)?,python_targets_py
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/app-portage/repoman-2.3.11 b/metadata/md5-cache/app-portage/repoman-2.3.11
index dcac665935b1..bee34def1f5d 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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=d240a278ec662ff2dd8b99e773dfe8b0
+_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
diff --git a/metadata/md5-cache/app-portage/repoman-2.3.6 b/metadata/md5-cache/app-portage/repoman-2.3.6
index f410420bd23b..b0e0f43cba4a 100644
--- a/metadata/md5-cache/app-portage/repoman-2.3.6
+++ b/metadata/md5-cache/app-portage/repoman-2.3.6
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/portage-2.3.14[python_targets_python2_7(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zmedico/portage/archives/repoman-2.3.6.tar.bz2
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c6b40bb11c2be417e480d30788aa8833
diff --git a/metadata/md5-cache/app-portage/repoman-2.3.9 b/metadata/md5-cache/app-portage/repoman-2.3.9
index 5b00e60c50b0..c972c1ed9503 100644
--- a/metadata/md5-cache/app-portage/repoman-2.3.9
+++ b/metadata/md5-cache/app-portage/repoman-2.3.9
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/portage-2.3.27[python_targets_python2_7(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zmedico/portage/archives/repoman-2.3.9.tar.bz2
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=962399b058f8c74de2120517b24fe2e6
diff --git a/metadata/md5-cache/app-portage/repoman-9999 b/metadata/md5-cache/app-portage/repoman-9999
index d0229e52b4c5..b95c6a777b79 100644
--- a/metadata/md5-cache/app-portage/repoman-9999
+++ b/metadata/md5-cache/app-portage/repoman-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/portage-2.3.0_rc[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
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=03fceec18420043e152b54563aadd647
diff --git a/metadata/md5-cache/app-portage/smart-live-rebuild-1.3.6 b/metadata/md5-cache/app-portage/smart-live-rebuild-1.3.6
index f2e31e33e306..a243dc90b616 100644
--- a/metadata/md5-cache/app-portage/smart-live-rebuild-1.3.6
+++ b/metadata/md5-cache/app-portage/smart-live-rebuild-1.3.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mgorny/smart-live-rebuild/archive/v1.3.6.tar.gz -> smart-live-rebuild-1.3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=74bbaea360df69718d500422e21099b7
diff --git a/metadata/md5-cache/app-portage/smart-live-rebuild-9999 b/metadata/md5-cache/app-portage/smart-live-rebuild-9999
index 05671fdfd494..989dc0f4ccf1 100644
--- a/metadata/md5-cache/app-portage/smart-live-rebuild-9999
+++ b/metadata/md5-cache/app-portage/smart-live-rebuild-9999
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=>=app-portage/gentoopm-0.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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_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
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=95a6537099d896df27d20f6ecec5a932
diff --git a/metadata/md5-cache/app-portage/tatt-0.4 b/metadata/md5-cache/app-portage/tatt-0.4
index cf33c55184c7..a1150e8d17e5 100644
--- a/metadata/md5-cache/app-portage/tatt-0.4
+++ b/metadata/md5-cache/app-portage/tatt-0.4
@@ -10,5 +10,5 @@ RDEPEND=app-portage/eix app-portage/gentoolkit dev-python/configobj[python_targe
 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/kensington/tatt/archive/v0.4.tar.gz -> tatt-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=346b8a8ccb6150d1b4093db4d2601500
diff --git a/metadata/md5-cache/app-portage/tatt-0.5 b/metadata/md5-cache/app-portage/tatt-0.5
index d124bde86ad9..59b2ec4ffdec 100644
--- a/metadata/md5-cache/app-portage/tatt-0.5
+++ b/metadata/md5-cache/app-portage/tatt-0.5
@@ -10,5 +10,5 @@ RDEPEND=app-portage/eix app-portage/gentoolkit dev-python/configobj[python_targe
 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/gentoo/tatt/archive/v0.5.tar.gz -> tatt-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=928d77ca7585dea201635e9f191205ef
diff --git a/metadata/md5-cache/app-portage/tatt-9999 b/metadata/md5-cache/app-portage/tatt-9999
index 984192070f60..c3374c0c1173 100644
--- a/metadata/md5-cache/app-portage/tatt-9999
+++ b/metadata/md5-cache/app-portage/tatt-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-portage/eix app-portage/gentoolkit dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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(-)] www-client/pybugz python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=409409af3565b1b6f1fb964a57981f51
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index c87af7f63d3c..d850828416c9 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/gentoo-zsh-completions-20180228 b/metadata/md5-cache/app-shells/gentoo-zsh-completions-20180228
index 6d091046eb8b..5beb1a9195e8 100644
--- a/metadata/md5-cache/app-shells/gentoo-zsh-completions-20180228
+++ b/metadata/md5-cache/app-shells/gentoo-zsh-completions-20180228
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Gentoo specific zsh completion support (includes emerge and ebuild commands)
 EAPI=6
 HOMEPAGE=https://github.com/gentoo/gentoo-zsh-completions
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris
 LICENSE=ZSH
 RDEPEND=>=app-shells/zsh-4.3.5
 SLOT=0
 SRC_URI=https://github.com/gentoo/gentoo-zsh-completions/archive/20180228.tar.gz -> gentoo-zsh-completions-20180228.tar.gz
-_md5_=e71f0e265d469e0d85e1155fa62158fc
+_md5_=bb3c5c8c3ba51d1ffc5fa15f88652499
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 095235700044..e5cd6dcfc806 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/apvlv-0.1.5-r2 b/metadata/md5-cache/app-text/apvlv-0.1.5-r2
index 1c8fef6da176..1f080d812df9 100644
--- a/metadata/md5-cache/app-text/apvlv-0.1.5-r2
+++ b/metadata/md5-cache/app-text/apvlv-0.1.5-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-text/poppler-0.18[cairo,xpdf-headers(+)] dev-libs/glib:2 x11-libs/gtk+:3 djvu? ( app-text/djvu:= )
 SLOT=0
 SRC_URI=https://github.com/naihe2010/apvlv/archive/v0.1.5.tar.gz -> apvlv-0.1.5.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e5edfcd14362047dba5483c4dbb8d111
diff --git a/metadata/md5-cache/app-text/atril-1.12.2-r5 b/metadata/md5-cache/app-text/atril-1.12.2-r5
deleted file mode 100644
index 2bfdb2fbaa0c..000000000000
--- a/metadata/md5-cache/app-text/atril-1.12.2-r5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-text/poppler-0.16[cairo] app-text/rarian:0 dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 >=mate-base/mate-desktop-1.9[gtk3(-)=] sys-libs/zlib:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 >=x11-libs/libSM-1:0 x11-libs/libX11:0 >=x11-libs/cairo-1.9.10:0 x11-libs/pango:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base:0 t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( dev-libs/mathjax ) gnome-keyring? ( >=app-crypt/libsecret-0.5:0 ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] epub? ( >=net-libs/webkit-gtk-2.4.3:4 ) ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2:0 ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.2.0:0 ) !!app-text/mate-document-viewer app-text/docbook-xml-dtd:4.1.2 app-text/yelp-tools:0 >=app-text/scrollkeeper-dtd-1:1.0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* virtual/pkgconfig:* sys-devel/gettext:* >=app-portage/elt-patches-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.12
-DESCRIPTION=Atril document viewer for MATE
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=caja dbus debug djvu dvi epub +introspection gnome-keyring gtk3 +postscript t1lib tiff xps
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/poppler-0.16[cairo] app-text/rarian:0 dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 >=mate-base/mate-desktop-1.9[gtk3(-)=] sys-libs/zlib:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 >=x11-libs/libSM-1:0 x11-libs/libX11:0 >=x11-libs/cairo-1.9.10:0 x11-libs/pango:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base:0 t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( dev-libs/mathjax ) gnome-keyring? ( >=app-crypt/libsecret-0.5:0 ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] epub? ( >=net-libs/webkit-gtk-2.4.3:4 ) ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2:0 ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.2.0:0 ) !!app-text/mate-document-viewer
-REQUIRED_USE=t1lib? ( dvi ) !gtk3? ( !epub )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/atril-1.12.2.tar.xz
-_eclasses_=autotools	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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=00c47a2d4925c1a2e47bbfc28872cad5
diff --git a/metadata/md5-cache/app-text/atril-1.14.2-r2 b/metadata/md5-cache/app-text/atril-1.14.2-r2
deleted file mode 100644
index 2aeef361de76..000000000000
--- a/metadata/md5-cache/app-text/atril-1.14.2-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-text/poppler-0.16[cairo] dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 >=mate-base/mate-desktop-1.9[gtk3(-)=] sys-libs/zlib:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 >=x11-libs/libSM-1:0 x11-libs/libX11:0 >=x11-libs/cairo-1.9.10:0 x11-libs/pango:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base:0 t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( dev-libs/mathjax ) gnome-keyring? ( >=app-crypt/libsecret-0.5:0 ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] epub? ( >=net-libs/webkit-gtk-2.4.3:4 ) ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2:0 ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.2.0:0 ) !!app-text/mate-document-viewer app-text/docbook-xml-dtd:4.1.2 app-text/rarian:0 app-text/yelp-tools:0 >=app-text/scrollkeeper-dtd-1:1.0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* virtual/pkgconfig:* sys-devel/gettext:* >=app-portage/elt-patches-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.14
-DESCRIPTION=Atril document viewer for MATE
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=caja dbus debug djvu dvi epub +introspection gnome-keyring gtk3 +postscript t1lib tiff xps
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/poppler-0.16[cairo] dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 >=mate-base/mate-desktop-1.9[gtk3(-)=] sys-libs/zlib:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 >=x11-libs/libSM-1:0 x11-libs/libX11:0 >=x11-libs/cairo-1.9.10:0 x11-libs/pango:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base:0 t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( dev-libs/mathjax ) gnome-keyring? ( >=app-crypt/libsecret-0.5:0 ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] epub? ( >=net-libs/webkit-gtk-2.4.3:4 ) ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2:0 ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.2.0:0 ) !!app-text/mate-document-viewer
-REQUIRED_USE=t1lib? ( dvi ) !gtk3? ( !epub )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.14/atril-1.14.2.tar.xz
-_eclasses_=autotools	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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=4494a3c6930c58b79c8d096a0278d9c5
diff --git a/metadata/md5-cache/app-text/atril-1.16.1-r2 b/metadata/md5-cache/app-text/atril-1.16.1-r2
deleted file mode 100644
index d5d5ad89a7d8..000000000000
--- a/metadata/md5-cache/app-text/atril-1.16.1-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-text/poppler-0.22[cairo] dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 sys-libs/zlib:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 >=x11-libs/libSM-1:0 x11-libs/libX11:0 >=x11-libs/cairo-1.9.10:0 x11-libs/pango:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base:0 t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( dev-libs/mathjax ) gnome-keyring? ( >=app-crypt/libsecret-0.5:0 ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] epub? ( >=net-libs/webkit-gtk-2.4.3:4 ) ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2:0 ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.2.1:0 ) !!app-text/mate-document-viewer app-text/docbook-xml-dtd:4.1.2 app-text/rarian:0 app-text/yelp-tools:0 >=app-text/scrollkeeper-dtd-1:1.0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* virtual/pkgconfig:* sys-devel/gettext:* >=app-portage/elt-patches-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.16
-DESCRIPTION=Atril document viewer for MATE
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=caja dbus debug djvu dvi epub +introspection gnome-keyring gtk3 +postscript t1lib tiff xps
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/poppler-0.22[cairo] dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 sys-libs/zlib:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 >=x11-libs/libSM-1:0 x11-libs/libX11:0 >=x11-libs/cairo-1.9.10:0 x11-libs/pango:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base:0 t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( dev-libs/mathjax ) gnome-keyring? ( >=app-crypt/libsecret-0.5:0 ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] epub? ( >=net-libs/webkit-gtk-2.4.3:4 ) ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2:0 ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.2.1:0 ) !!app-text/mate-document-viewer
-REQUIRED_USE=t1lib? ( dvi ) !gtk3? ( !epub )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/atril-1.16.1.tar.xz
-_eclasses_=autotools	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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=e768349b174c57663f9015e8fea9dc75
diff --git a/metadata/md5-cache/app-text/atril-1.18.3 b/metadata/md5-cache/app-text/atril-1.18.3
index c414ead729cb..816d260534c6 100644
--- a/metadata/md5-cache/app-text/atril-1.18.3
+++ b/metadata/md5-cache/app-text/atril-1.18.3
@@ -11,5 +11,5 @@ REQUIRED_USE=t1lib? ( dvi )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.18/atril-1.18.3.tar.xz
-_eclasses_=autotools	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=73a4c1b3064b982b4a8c22803247fe58
diff --git a/metadata/md5-cache/app-text/bibletime-2.11.0 b/metadata/md5-cache/app-text/bibletime-2.11.0
index 802295e13915..3b776c02c532 100644
--- a/metadata/md5-cache/app-text/bibletime-2.11.0
+++ b/metadata/md5-cache/app-text/bibletime-2.11.0
@@ -10,5 +10,5 @@ RDEPEND=>=app-text/sword-1.7.0 dev-cpp/clucene dev-qt/qtcore:5 dev-qt/qtgui:5 de
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/bibletime/bibletime/releases/download/v2.11.0/bibletime-2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=dab65683e351bd1052e6bfa0c5f27b63
diff --git a/metadata/md5-cache/app-text/bibletime-2.11.2 b/metadata/md5-cache/app-text/bibletime-2.11.2
index a53dbd9f523a..dbb16107c9de 100644
--- a/metadata/md5-cache/app-text/bibletime-2.11.2
+++ b/metadata/md5-cache/app-text/bibletime-2.11.2
@@ -10,5 +10,5 @@ RDEPEND=>=app-text/sword-1.7.0 dev-cpp/clucene dev-qt/qtcore:5 dev-qt/qtgui:5 de
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/bibletime/bibletime/releases/download/v2.11.2/bibletime-2.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=93561d95b70deca71b7e3adbb79118f0
diff --git a/metadata/md5-cache/app-text/bibus-1.5.2-r3 b/metadata/md5-cache/app-text/bibus-1.5.2-r3
index b26c3c73d8ce..9b4a3035fa2e 100644
--- a/metadata/md5-cache/app-text/bibus-1.5.2-r3
+++ b/metadata/md5-cache/app-text/bibus-1.5.2-r3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=d
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/bibus-biblio/bibus_1.5.2.orig.tar.gz https://dev.gentoo.org/~jlec/distfiles/bibus-1.5.2-lo-4.patch.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4686d74d58d9f36c606e809ba0228b4c
diff --git a/metadata/md5-cache/app-text/calibre-3.15.0 b/metadata/md5-cache/app-text/calibre-3.15.0
index f9799e4c5846..e39f85cd12fe 100644
--- a/metadata/md5-cache/app-text/calibre-3.15.0
+++ b/metadata/md5-cache/app-text/calibre-3.15.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://download.calibre-ebook.com/3.15.0/calibre-3.15.0.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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_=c02805fd825c4ecbb9c0d7a0b4f7e471
diff --git a/metadata/md5-cache/app-text/calibre-3.26.1 b/metadata/md5-cache/app-text/calibre-3.26.1
index 1b8b158979f9..5208cd8621f3 100644
--- a/metadata/md5-cache/app-text/calibre-3.26.1
+++ b/metadata/md5-cache/app-text/calibre-3.26.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://download.calibre-ebook.com/3.26.1/calibre-3.26.1.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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_=c02805fd825c4ecbb9c0d7a0b4f7e471
diff --git a/metadata/md5-cache/app-text/cherrytree-0.37.0 b/metadata/md5-cache/app-text/cherrytree-0.37.0
index 09e678672a80..c6c81de325d0 100644
--- a/metadata/md5-cache/app-text/cherrytree-0.37.0
+++ b/metadata/md5-cache/app-text/cherrytree-0.37.0
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/libX11 dev-python/dbus-python[python_targets_python2_7(-)?,-pyt
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/giuspen/cherrytree/archive/0.37.0.tar.gz -> cherrytree-0.37.0.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=50151a6c6e696f5530ea2def3b8aab4f
diff --git a/metadata/md5-cache/app-text/cmark-0.28.0 b/metadata/md5-cache/app-text/cmark-0.28.0
index 30fa65a002d3..59240ae9a65a 100644
--- a/metadata/md5-cache/app-text/cmark-0.28.0
+++ b/metadata/md5-cache/app-text/cmark-0.28.0
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=https://github.com/commonmark/cmark/archive/0.28.0.tar.gz -> cmark-0.28.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5a932b7ffdd6738113f19af361aa2ed1
diff --git a/metadata/md5-cache/app-text/cmark-0.28.3 b/metadata/md5-cache/app-text/cmark-0.28.3
index 05a11bc759b2..f6b365f34faf 100644
--- a/metadata/md5-cache/app-text/cmark-0.28.3
+++ b/metadata/md5-cache/app-text/cmark-0.28.3
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=https://github.com/commonmark/cmark/archive/0.28.3.tar.gz -> cmark-0.28.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-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=bd3c753787faff5148f625e14d2c2ef6
diff --git a/metadata/md5-cache/app-text/coolreader-3.2.2.1-r1 b/metadata/md5-cache/app-text/coolreader-3.2.2.1-r1
index 08895857d44b..8f0b1f09d8d8 100644
--- a/metadata/md5-cache/app-text/coolreader-3.2.2.1-r1
+++ b/metadata/md5-cache/app-text/coolreader-3.2.2.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype wxwidgets? ( x11-libs/wxGTK:3.0 ) !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )
 SLOT=0
 SRC_URI=https://github.com/buggins/coolreader/archive/cr3.2.2-1.tar.gz -> coolreader-3.2.2.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	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7b99f3e7e955ec50cddc2275bb91d09e
diff --git a/metadata/md5-cache/app-text/cuneiform-1.1.0-r2 b/metadata/md5-cache/app-text/cuneiform-1.1.0-r2
index 1bfd80f04f5d..459709bd68a0 100644
--- a/metadata/md5-cache/app-text/cuneiform-1.1.0-r2
+++ b/metadata/md5-cache/app-text/cuneiform-1.1.0-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=!graphicsmagick? ( media-gfx/imagemagick:= ) graphicsmagick? ( media-gfx/graphicsmagick:= )
 SLOT=0
 SRC_URI=https://launchpad.net/cuneiform-linux/1.1/1.1/+download/cuneiform-linux-1.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=b0f6cdb66c23f805c333b5cb7127ffd5
diff --git a/metadata/md5-cache/app-text/dblatex-0.3.10-r1 b/metadata/md5-cache/app-text/dblatex-0.3.10-r1
index ddb10f88e1ae..754eac5e6287 100644
--- a/metadata/md5-cache/app-text/dblatex-0.3.10-r1
+++ b/metadata/md5-cache/app-text/dblatex-0.3.10-r1
@@ -10,5 +10,5 @@ RDEPEND=app-text/docbook-xml-dtd:4.5 dev-libs/kpathsea dev-libs/libxslt dev-libs
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/dblatex/dblatex-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=48149bbca12d4d1ba26d74b037f23d06
diff --git a/metadata/md5-cache/app-text/dblatex-0.3.7 b/metadata/md5-cache/app-text/dblatex-0.3.7
index 96d6464c2f94..fd5bcccd9ba0 100644
--- a/metadata/md5-cache/app-text/dblatex-0.3.7
+++ b/metadata/md5-cache/app-text/dblatex-0.3.7
@@ -10,5 +10,5 @@ RDEPEND=app-text/texlive dev-texlive/texlive-latexextra dev-texlive/texlive-late
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/dblatex/dblatex-0.3.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c87ccdf82f2c4a9a0efa18f10b769639
diff --git a/metadata/md5-cache/app-text/discount-2.2.4 b/metadata/md5-cache/app-text/discount-2.2.4
new file mode 100644
index 000000000000..fb48784d97c4
--- /dev/null
+++ b/metadata/md5-cache/app-text/discount-2.2.4
@@ -0,0 +1,11 @@
+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.4.tar.bz2
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=3f7e35b975c7fc84a20559958a6eeec7
diff --git a/metadata/md5-cache/app-text/djview-4.10.6-r1 b/metadata/md5-cache/app-text/djview-4.10.6-r1
index c837e798dedf..1a4b4f63dd04 100644
--- a/metadata/md5-cache/app-text/djview-4.10.6-r1
+++ b/metadata/md5-cache/app-text/djview-4.10.6-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-text/djvu-3.5.22-r1 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=mirror://sourceforge/djvu/djview-4.10.6.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozextension	f47f008a138943f9e40e37c1fca10b24	multilib	b2f01ad412baf81650c23fcf0975fa33	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozextension	f47f008a138943f9e40e37c1fca10b24	multilib	b2f01ad412baf81650c23fcf0975fa33	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=664119cafc3942de09fc7fafbe341a37
diff --git a/metadata/md5-cache/app-text/djvu-3.5.25.3 b/metadata/md5-cache/app-text/djvu-3.5.25.3
index 2cfffcafbac4..e94aea609797 100644
--- a/metadata/md5-cache/app-text/djvu-3.5.25.3
+++ b/metadata/md5-cache/app-text/djvu-3.5.25.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=jpeg? ( virtual/jpeg:0 ) tiff? ( media-libs/tiff:0= )
 SLOT=0
 SRC_URI=mirror://sourceforge/djvu/djvulibre-3.5.25.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9422ca5a0018fac60e48b5d4a0d115b5
diff --git a/metadata/md5-cache/app-text/djvu-3.5.27 b/metadata/md5-cache/app-text/djvu-3.5.27
index 93dda776921e..e65591e1df28 100644
--- a/metadata/md5-cache/app-text/djvu-3.5.27
+++ b/metadata/md5-cache/app-text/djvu-3.5.27
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=jpeg? ( virtual/jpeg:0 ) tiff? ( media-libs/tiff:0= )
 SLOT=0
 SRC_URI=mirror://sourceforge/djvu/djvulibre-3.5.27.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-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=779681dc1ca440c2c2bb33ac3c82bf3f
diff --git a/metadata/md5-cache/app-text/djvusmooth-0.2.18 b/metadata/md5-cache/app-text/djvusmooth-0.2.18
index a46ad8194e26..2e5bbe6af94c 100644
--- a/metadata/md5-cache/app-text/djvusmooth-0.2.18
+++ b/metadata/md5-cache/app-text/djvusmooth-0.2.18
@@ -10,5 +10,5 @@ RDEPEND=dev-python/python-djvulibre[python_targets_python2_7(-)?,-python_single_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/jwilk/djvusmooth/releases/download/0.2.18/djvusmooth-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1a4aee1dcf8c2a6c4631046ecd6c5f10
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 1f9c58482efd..334d08465fc7 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_=3afa422b8d4c3e7a39e67da6afc732f5
+_md5_=25427dcdd1d9d00b3049db90ef416214
diff --git a/metadata/md5-cache/app-text/doconce-1.3 b/metadata/md5-cache/app-text/doconce-1.3
index 187b7cb126e0..8ac49aa07492 100644
--- a/metadata/md5-cache/app-text/doconce-1.3
+++ b/metadata/md5-cache/app-text/doconce-1.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/future python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~grozin/doconce-1.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bead51ba34376af0feb7bda23c72d7e0
diff --git a/metadata/md5-cache/app-text/doconce-1.4.4 b/metadata/md5-cache/app-text/doconce-1.4.4
index e0203bc1ec69..a7fc75a9b26a 100644
--- a/metadata/md5-cache/app-text/doconce-1.4.4
+++ b/metadata/md5-cache/app-text/doconce-1.4.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~grozin/doconce-1.4.4.tar.bz2
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8e766b931b073f355a712ab6dc5d0b96
diff --git a/metadata/md5-cache/app-text/ebook-tools-0.2.2-r1 b/metadata/md5-cache/app-text/ebook-tools-0.2.2-r1
index bfc504550ff9..eb63ced141c9 100644
--- a/metadata/md5-cache/app-text/ebook-tools-0.2.2-r1
+++ b/metadata/md5-cache/app-text/ebook-tools-0.2.2-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/libxml2 dev-libs/libzip:= lit2epub? ( app-text/convertlit )
 SLOT=0
 SRC_URI=mirror://sourceforge/ebook-tools/ebook-tools-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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=e5abaafb227ae9b2eb8c90160a6df65f
diff --git a/metadata/md5-cache/app-text/editorconfig-core-c-0.12.1 b/metadata/md5-cache/app-text/editorconfig-core-c-0.12.1
index afb7b6fed5ab..1f090c9705da 100644
--- a/metadata/md5-cache/app-text/editorconfig-core-c-0.12.1
+++ b/metadata/md5-cache/app-text/editorconfig-core-c-0.12.1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=dev-libs/libpcre:= cli? ( !dev-python/editorconfig-core-py[cli] )
 SLOT=0
 SRC_URI=https://github.com/editorconfig/editorconfig-core-c/archive/v0.12.1.tar.gz -> editorconfig-core-c-0.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=44e910141a78fcc28fcc6871eb262d5e
diff --git a/metadata/md5-cache/app-text/editorconfig-core-c-0.12.2 b/metadata/md5-cache/app-text/editorconfig-core-c-0.12.2
index 5fd57e35f2ec..8629f7a465c2 100644
--- a/metadata/md5-cache/app-text/editorconfig-core-c-0.12.2
+++ b/metadata/md5-cache/app-text/editorconfig-core-c-0.12.2
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=dev-libs/libpcre:= cli? ( !dev-python/editorconfig-core-py[cli] )
 SLOT=0
 SRC_URI=https://github.com/editorconfig/editorconfig-core-c/archive/v0.12.2.tar.gz -> editorconfig-core-c-0.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=deff12bc1f252aa0eb7da601ecbcba74
diff --git a/metadata/md5-cache/app-text/evince-3.24.2-r1 b/metadata/md5-cache/app-text/evince-3.24.2-r1
index 2212835afa96..6425a31c6b43 100644
--- a/metadata/md5-cache/app-text/evince-3.24.2-r1
+++ b/metadata/md5-cache/app-text/evince-3.24.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=dev-libs/atk >=dev-libs/glib-2.36:2[dbus] >=dev-libs/libxml2-2.5:2 sys-libs/zlib:= x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.16.0:3[introspection?] gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.10:= >=app-text/poppler-0.33[cairo] djvu? ( >=app-text/djvu-3.5.22:= ) dvi? ( virtual/tex-base dev-libs/kpathsea:= t1lib? ( >=media-libs/t1lib-5:= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) gnome? ( gnome-base/gnome-desktop:3= ) gnome-keyring? ( >=app-crypt/libsecret-0.5 ) introspection? ( >=dev-libs/gobject-introspection-1:= ) nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] ) postscript? ( >=app-text/libspectre-0.2:= ) tiff? ( >=media-libs/tiff-3.6:0= ) xps? ( >=app-text/libgxps-0.2.1:= ) gnome-base/gvfs gnome-base/librsvg || ( >=x11-themes/adwaita-icon-theme-2.17.1 >=x11-themes/hicolor-icon-theme-0.10 )
 SLOT=0/evd3.4-evv3.3
 SRC_URI=mirror://gnome/sources/evince/3.24/evince-3.24.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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6ef88ba0f87514c0d6f90d31dcf0f520
diff --git a/metadata/md5-cache/app-text/evince-3.28.2 b/metadata/md5-cache/app-text/evince-3.28.2
index f4304e231826..aa1f0d52cf7e 100644
--- a/metadata/md5-cache/app-text/evince-3.28.2
+++ b/metadata/md5-cache/app-text/evince-3.28.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=dev-libs/atk >=dev-libs/glib-2.36:2[dbus] >=dev-libs/libxml2-2.5:2 sys-libs/zlib:= >=x11-libs/gdk-pixbuf-2.36.5:2 >=x11-libs/gtk+-3.16.0:3[introspection?] gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.10:= >=app-text/poppler-0.33[cairo] >=app-arch/libarchive-3.2.0 djvu? ( >=app-text/djvu-3.5.22:= ) dvi? ( virtual/tex-base dev-libs/kpathsea:= t1lib? ( >=media-libs/t1lib-5:= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) gnome? ( gnome-base/gnome-desktop:3= ) gnome-keyring? ( >=app-crypt/libsecret-0.5 ) introspection? ( >=dev-libs/gobject-introspection-1:= ) nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] ) postscript? ( >=app-text/libspectre-0.2:= ) tiff? ( >=media-libs/tiff-3.6:0= ) xps? ( >=app-text/libgxps-0.2.1:= ) gnome-base/gvfs gnome-base/librsvg || ( >=x11-themes/adwaita-icon-theme-2.17.1 >=x11-themes/hicolor-icon-theme-0.10 )
 SLOT=0/evd3.4-evv3.3
 SRC_URI=mirror://gnome/sources/evince/3.28/evince-3.28.2.tar.xz
-_eclasses_=desktop	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	89bb9f083a2590d9b447fd0b78a96186
+_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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e47f6735e02ce13b02b53c6f920fe3ba
diff --git a/metadata/md5-cache/app-text/evince-3.28.4 b/metadata/md5-cache/app-text/evince-3.28.4
new file mode 100644
index 000000000000..43a2b3d2e8b5
--- /dev/null
+++ b/metadata/md5-cache/app-text/evince-3.28.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=dev-libs/atk >=dev-libs/glib-2.36:2[dbus] >=dev-libs/libxml2-2.5:2 sys-libs/zlib:= >=x11-libs/gdk-pixbuf-2.36.5:2 >=x11-libs/gtk+-3.16.0:3[introspection?] gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.10:= >=app-text/poppler-0.33[cairo] >=app-arch/libarchive-3.2.0 djvu? ( >=app-text/djvu-3.5.22:= ) dvi? ( virtual/tex-base dev-libs/kpathsea:= t1lib? ( >=media-libs/t1lib-5:= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) gnome? ( gnome-base/gnome-desktop:3= ) gnome-keyring? ( >=app-crypt/libsecret-0.5 ) introspection? ( >=dev-libs/gobject-introspection-1:= ) nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] ) postscript? ( >=app-text/libspectre-0.2:= ) tiff? ( >=media-libs/tiff-3.6:0= ) xps? ( >=app-text/libgxps-0.2.1:= ) app-text/docbook-xml-dtd:4.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.35 dev-util/itstool 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 virtual/pkgconfig
+DESCRIPTION=Simple document viewer for GNOME
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Evince
+IUSE=djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin +postscript t1lib tiff xps
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
+LICENSE=GPL-2+ CC-BY-SA-3.0
+RDEPEND=dev-libs/atk >=dev-libs/glib-2.36:2[dbus] >=dev-libs/libxml2-2.5:2 sys-libs/zlib:= >=x11-libs/gdk-pixbuf-2.36.5:2 >=x11-libs/gtk+-3.16.0:3[introspection?] gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.10:= >=app-text/poppler-0.33[cairo] >=app-arch/libarchive-3.2.0 djvu? ( >=app-text/djvu-3.5.22:= ) dvi? ( virtual/tex-base dev-libs/kpathsea:= t1lib? ( >=media-libs/t1lib-5:= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) gnome? ( gnome-base/gnome-desktop:3= ) gnome-keyring? ( >=app-crypt/libsecret-0.5 ) introspection? ( >=dev-libs/gobject-introspection-1:= ) nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] ) postscript? ( >=app-text/libspectre-0.2:= ) tiff? ( >=media-libs/tiff-3.6:0= ) xps? ( >=app-text/libgxps-0.2.1:= ) gnome-base/gvfs gnome-base/librsvg || ( >=x11-themes/adwaita-icon-theme-2.17.1 >=x11-themes/hicolor-icon-theme-0.10 )
+SLOT=0/evd3.4-evv3.3
+SRC_URI=mirror://gnome/sources/evince/3.28/evince-3.28.4.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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d04cfac93b00228ef1ffb907a873d8b0
diff --git a/metadata/md5-cache/app-text/fbless-0.2.3 b/metadata/md5-cache/app-text/fbless-0.2.3
index 709558de393d..d3f4adef209c 100644
--- a/metadata/md5-cache/app-text/fbless-0.2.3
+++ b/metadata/md5-cache/app-text/fbless-0.2.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/matimatik/fbless/archive/0.2.3.tar.gz -> fbless-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c4bf01ff1a2e6856aa804f1c3993acd1
diff --git a/metadata/md5-cache/app-text/fictionup-0.1 b/metadata/md5-cache/app-text/fictionup-0.1
index 1cac0e0e60b1..6ff122ada06a 100644
--- a/metadata/md5-cache/app-text/fictionup-0.1
+++ b/metadata/md5-cache/app-text/fictionup-0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/libyaml
 SLOT=0
 SRC_URI=http://cdslow.org.ru/files/fictionup/fictionup-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2b1b82ed1d38f6d6d386d7d8cb7b1f15
diff --git a/metadata/md5-cache/app-text/ghostscript-gpl-9.25 b/metadata/md5-cache/app-text/ghostscript-gpl-9.25
index 146bf9472989..10b13b35b63d 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_=0981c473be8c58275fb294a289b6f984
+_md5_=930b5279eb956f33bbdc366f861171f9
diff --git a/metadata/md5-cache/app-text/gnome-doc-utils-0.20.10-r1 b/metadata/md5-cache/app-text/gnome-doc-utils-0.20.10-r1
index 99d96a827ca6..6a6b7bf40a90 100644
--- a/metadata/md5-cache/app-text/gnome-doc-utils-0.20.10-r1
+++ b/metadata/md5-cache/app-text/gnome-doc-utils-0.20.10-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=mirror://gnome/sources/gnome-doc-utils/0.20/gnome-doc-utils-0.20.10.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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5d6d1c055f754b5ea6d2be80c8edb32e
diff --git a/metadata/md5-cache/app-text/grip-4.2.0 b/metadata/md5-cache/app-text/grip-4.2.0
index 889f888f92e5..28b2a5929fdf 100644
--- a/metadata/md5-cache/app-text/grip-4.2.0
+++ b/metadata/md5-cache/app-text/grip-4.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/docopt-0.6.2 >=dev-python/flask-0.10.1 >=dev-python/markdow
 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/g/grip/grip-4.2.0.zip
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3f4f80562746152c995a696790661bc2
diff --git a/metadata/md5-cache/app-text/gspell-1.4.2 b/metadata/md5-cache/app-text/gspell-1.4.2
index f6267e8793dc..e9e87d10dd14 100644
--- a/metadata/md5-cache/app-text/gspell-1.4.2
+++ b/metadata/md5-cache/app-text/gspell-1.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-text/iso-codes >=app-text/enchant-1.6.0 >=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.20:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.42.0:= ) vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) >=dev-util/gtk-doc-am-1.25 >=sys-devel/gettext-0.19.4 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=app-text/iso-codes >=app-text/enchant-1.6.0 >=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.20:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.42.0:= ) vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) dev-util/glib-utils >=dev-util/gtk-doc-am-1.25 >=sys-devel/gettext-0.19.4 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=Spell check library for GTK+ applications
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/gspell
@@ -10,5 +10,5 @@ RDEPEND=app-text/iso-codes >=app-text/enchant-1.6.0 >=dev-libs/glib-2.44:2 >=x11
 REQUIRED_USE=vala? ( introspection )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/gspell/1.4/gspell-1.4.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=4e169d6edf795eb50a6a3b3fe9f4c2a7
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=8415ce6695b27c4ea8e1d51dc75f71b6
diff --git a/metadata/md5-cache/app-text/gspell-1.6.1 b/metadata/md5-cache/app-text/gspell-1.6.1
index fa99ca35ef22..78f8c8de099c 100644
--- a/metadata/md5-cache/app-text/gspell-1.6.1
+++ b/metadata/md5-cache/app-text/gspell-1.6.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-text/iso-codes >=app-text/enchant-1.6.0 >=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.20:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.42.0:= ) vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) dev-libs/libxml2:2 >=dev-util/gtk-doc-am-1.25 >=sys-devel/gettext-0.19.4 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=app-text/iso-codes >=app-text/enchant-1.6.0 >=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.20:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.42.0:= ) vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) dev-libs/libxml2:2 dev-util/glib-utils >=dev-util/gtk-doc-am-1.25 >=sys-devel/gettext-0.19.4 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=Spell check library for GTK+ applications
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/gspell
@@ -10,5 +10,5 @@ RDEPEND=app-text/iso-codes >=app-text/enchant-1.6.0 >=dev-libs/glib-2.44:2 >=x11
 REQUIRED_USE=vala? ( introspection )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/gspell/1.6/gspell-1.6.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=4252a8aa33f85673887df200e21c07d1
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=9c1cc5cf2b89209efa34da27f3c1ec19
diff --git a/metadata/md5-cache/app-text/gtkspell-3.0.9 b/metadata/md5-cache/app-text/gtkspell-3.0.9
index b870b6dc870d..3c676ad714d7 100644
--- a/metadata/md5-cache/app-text/gtkspell-3.0.9
+++ b/metadata/md5-cache/app-text/gtkspell-3.0.9
@@ -10,5 +10,5 @@ RDEPEND=>=app-text/enchant-1.1.6 app-text/iso-codes dev-libs/glib:2 x11-libs/gtk
 REQUIRED_USE=vala? ( introspection )
 SLOT=3/0
 SRC_URI=mirror://sourceforge/project/gtkspell/3.0.9/gtkspell3-3.0.9.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e5b173e163c84b808dbaf264e8bee285
diff --git a/metadata/md5-cache/app-text/gtranslator-2.91.7-r1 b/metadata/md5-cache/app-text/gtranslator-2.91.7-r1
index 3029959993a5..6fbb1c91ea7e 100644
--- a/metadata/md5-cache/app-text/gtranslator-2.91.7-r1
+++ b/metadata/md5-cache/app-text/gtranslator-2.91.7-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.32:2[dbus] >=x11-libs/gtk+-3.4.2:3[introspection?] >=x
 REQUIRED_USE=gucharmap? ( introspection ^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtranslator/2.91/gtranslator-2.91.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=10916eeb2e9424f7c0642f9c39e3ed4c
diff --git a/metadata/md5-cache/app-text/htmlmin-0.1.11_pre20170909 b/metadata/md5-cache/app-text/htmlmin-0.1.11_pre20170909
index d3ccefc55627..2e6f398ef784 100644
--- a/metadata/md5-cache/app-text/htmlmin-0.1.11_pre20170909
+++ b/metadata/md5-cache/app-text/htmlmin-0.1.11_pre20170909
@@ -10,5 +10,5 @@ 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
 SRC_URI=https://github.com/mankyd/htmlmin/archive/7bcbb995778fc07e427872dc74af9646fd0c907d.tar.gz -> htmlmin-0.1.11_pre20170909.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ae67d295b4e051291815ce07b41744d0
diff --git a/metadata/md5-cache/app-text/htmlmin-0.1.12 b/metadata/md5-cache/app-text/htmlmin-0.1.12
index 003048bb30c7..f185544397f2 100644
--- a/metadata/md5-cache/app-text/htmlmin-0.1.12
+++ b/metadata/md5-cache/app-text/htmlmin-0.1.12
@@ -10,5 +10,5 @@ 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
 SRC_URI=mirror://pypi/h/htmlmin/htmlmin-0.1.12.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1ece3ddddb1e046a4863a9bb38aab249
diff --git a/metadata/md5-cache/app-text/kbibtex-0.8.1 b/metadata/md5-cache/app-text/kbibtex-0.8.1
index 9f5671828e49..d452eb094533 100644
--- a/metadata/md5-cache/app-text/kbibtex-0.8.1
+++ b/metadata/md5-cache/app-text/kbibtex-0.8.1
@@ -11,5 +11,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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kchmviewer-7.7-r1 b/metadata/md5-cache/app-text/kchmviewer-7.7-r1
index bfc28563ba29..40c480099cee 100644
--- a/metadata/md5-cache/app-text/kchmviewer-7.7-r1
+++ b/metadata/md5-cache/app-text/kchmviewer-7.7-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-libs/chmlib dev-libs/libzip:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
 SLOT=0
 SRC_URI=mirror://sourceforge/kchmviewer/kchmviewer-7.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=01c758910f04bae6463036e9edf3c5a2
diff --git a/metadata/md5-cache/app-text/keepnote-0.7.9-r2 b/metadata/md5-cache/app-text/keepnote-0.7.9-r2
index 5e5eace8dd4b..56459ae5ba53 100644
--- a/metadata/md5-cache/app-text/keepnote-0.7.9-r2
+++ b/metadata/md5-cache/app-text/keepnote-0.7.9-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://keepnote.org/download-test/keepnote-0.7.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=874902d0957236962e0ef10b0b546e4e
diff --git a/metadata/md5-cache/app-text/krop-0.4.13.5 b/metadata/md5-cache/app-text/krop-0.4.13.5
index 38195f17f81e..9613dbef577b 100644
--- a/metadata/md5-cache/app-text/krop-0.4.13.5
+++ b/metadata/md5-cache/app-text/krop-0.4.13.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/python-poppler-qt5[python_targets_python2_7(-)?,python_target
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/krop-0.4.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=13fa8abc2c94ce29bbe0626a9ceed2d3
diff --git a/metadata/md5-cache/app-text/landslide-1.1.3 b/metadata/md5-cache/app-text/landslide-1.1.3
index 8ae9210b5961..e394a410ba11 100644
--- a/metadata/md5-cache/app-text/landslide-1.1.3
+++ b/metadata/md5-cache/app-text/landslide-1.1.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_
 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/adamzap/landslide/tarball/v1.1.3 -> landslide-1.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c3e744c893017b0d325c1049d517a86b
diff --git a/metadata/md5-cache/app-text/libetonyek-0.1.8 b/metadata/md5-cache/app-text/libetonyek-0.1.8
index 9beeec3f976e..1a73f5781b3d 100644
--- a/metadata/md5-cache/app-text/libetonyek-0.1.8
+++ b/metadata/md5-cache/app-text/libetonyek-0.1.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib:= dev-libs/boost >=dev-util/mdds-1.2.2:1 media-libs/glm sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-util/cppunit ) >=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-text/liblangtag dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib:= dev-libs/boost >=dev-util/mdds-1.2.2:1/1.2 media-libs/glm sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-util/cppunit ) >=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 parsing Apple Keynote presentations
 EAPI=6
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libetonyek
@@ -10,4 +10,4 @@ RDEPEND=app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib:=
 SLOT=0
 SRC_URI=https://dev-www.libreoffice.org/src/libetonyek/libetonyek-0.1.8.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=e9a07760f4e05e6b2c7c34b392e48bb1
+_md5_=8453384916288769117dcaef1f616cb3
diff --git a/metadata/md5-cache/app-text/libetonyek-0.1.8-r1 b/metadata/md5-cache/app-text/libetonyek-0.1.8-r1
new file mode 100644
index 000000000000..39dca132751e
--- /dev/null
+++ b/metadata/md5-cache/app-text/libetonyek-0.1.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=app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib dev-libs/boost >=dev-util/mdds-1.2.2:1= media-libs/glm sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-util/cppunit )
+DESCRIPTION=Library parsing Apple Keynote presentations
+EAPI=7
+HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libetonyek
+IUSE=doc static-libs test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=|| ( GPL-2+ LGPL-2.1 MPL-1.1 )
+RDEPEND=app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib
+SLOT=0
+SRC_URI=https://dev-www.libreoffice.org/src/libetonyek/libetonyek-0.1.8.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=25b7074da20abd94449cd2ff638ef4af
diff --git a/metadata/md5-cache/app-text/libetonyek-9999 b/metadata/md5-cache/app-text/libetonyek-9999
index 0f6d3da05504..9ee0e8963f53 100644
--- a/metadata/md5-cache/app-text/libetonyek-9999
+++ b/metadata/md5-cache/app-text/libetonyek-9999
@@ -1,11 +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 prepare unpack
-DEPEND=app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib dev-libs/boost >=dev-util/mdds-1.2.2:1 media-libs/glm sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-util/cppunit ) >=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=app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib dev-libs/boost >=dev-util/mdds-1.4.2:1= media-libs/glm sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-util/cppunit )
 DESCRIPTION=Library parsing Apple Keynote presentations
-EAPI=6
+EAPI=7
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libetonyek
 IUSE=doc static-libs test
 LICENSE=|| ( GPL-2+ LGPL-2.1 MPL-1.1 )
 RDEPEND=app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=1249abec8caf6698fa36a9f4969e6268
+_md5_=13c13b08b16f8b33a9fe465ab49174ec
diff --git a/metadata/md5-cache/app-text/libgepub-0.4 b/metadata/md5-cache/app-text/libgepub-0.4
index aa4a970aa702..0d8c925b9163 100644
--- a/metadata/md5-cache/app-text/libgepub-0.4
+++ b/metadata/md5-cache/app-text/libgepub-0.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=app-arch/libarchive dev-libs/glib:2 dev-libs/libxml2 net-libs/libsoup:2.4 net-libs/webkit-gtk:4 x11-libs/gtk+:3 introspection? ( >=dev-libs/gobject-introspection-1.30:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgepub/0.4/libgepub-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e2c413c6a2fb8892068c4a232e4dfe55
diff --git a/metadata/md5-cache/app-text/libgxps-0.3.0 b/metadata/md5-cache/app-text/libgxps-0.3.0
index 3d34062f30f1..da49086556cf 100644
--- a/metadata/md5-cache/app-text/libgxps-0.3.0
+++ b/metadata/md5-cache/app-text/libgxps-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=app-arch/libarchive-2.8 >=dev-libs/glib-2.36:2 media-libs/freetype:2 m
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgxps/0.3/libgxps-0.3.0.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4113e566613036100fbb60914d9a6f8b
diff --git a/metadata/md5-cache/app-text/liblangtag-0.6.2 b/metadata/md5-cache/app-text/liblangtag-0.6.2
index 105c340c9c3d..3595b17a5244 100644
--- a/metadata/md5-cache/app-text/liblangtag-0.6.2
+++ b/metadata/md5-cache/app-text/liblangtag-0.6.2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libxml2 introspection? ( dev-libs/gobject-introspection )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://bitbucket.org/tagoh/liblangtag/downloads/liblangtag-0.6.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1203f29720ee925293363e33f571a757
diff --git a/metadata/md5-cache/app-text/libspectre-0.2.8 b/metadata/md5-cache/app-text/libspectre-0.2.8
index 21f3a54d8691..70d5540e0c23 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_=7eb98ba4c712b901fbcfa86ecd51f5df
+_md5_=148180a07b582dfeff1dc30544cc8acd
diff --git a/metadata/md5-cache/app-text/linuxdoc-tools-0.9.73 b/metadata/md5-cache/app-text/linuxdoc-tools-0.9.73
new file mode 100644
index 000000000000..0497acfd4fc1
--- /dev/null
+++ b/metadata/md5-cache/app-text/linuxdoc-tools-0.9.73
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare prerm unpack
+DEPEND=|| ( app-text/openjade app-text/opensp ) app-text/sgml-common dev-lang/perl:= sys-apps/groff sys-devel/flex virtual/awk doc? ( dev-texlive/texlive-fontsrecommended virtual/latex-base ) >=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/latex-base >=sys-apps/texinfo-4.2-r5 >=app-text/sgml-common-0.6.3-r2
+DESCRIPTION=A toolset for processing LinuxDoc DTD SGML files
+EAPI=5
+HOMEPAGE=https://gitlab.com/agmartin/linuxdoc-tools
+IUSE=doc
+KEYWORDS=~amd64 ~ia64 ~ppc ~x86 ~x86-fbsd
+LICENSE=GPL-3+ MIT SGMLUG
+RDEPEND=|| ( app-text/openjade app-text/opensp ) app-text/sgml-common dev-lang/perl:= sys-apps/groff virtual/latex-base
+SLOT=0
+SRC_URI=https://gitlab.com/agmartin/linuxdoc-tools/-/archive/0.9.73/linuxdoc-tools-0.9.73.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	latex-package	17f13abe0de88340745e52e6b627aee7	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	perl-functions	f2e3420aed32cf1abe33b4129b842636	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=5ef8206d12a63b12dd09a3ad88d7aa44
diff --git a/metadata/md5-cache/app-text/lv-4.51-r4 b/metadata/md5-cache/app-text/lv-4.51-r4
index c5a78f9fb5f6..0f2a1bcc0409 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_=76c668083c84ed557e79375d14597a67
+_md5_=752b759e2e2268574ddcdbd05341b759
diff --git a/metadata/md5-cache/app-text/master-pdf-editor-5.1.30 b/metadata/md5-cache/app-text/master-pdf-editor-5.1.30
index 7a8b5916d389..6b84feafe3dd 100644
--- a/metadata/md5-cache/app-text/master-pdf-editor-5.1.30
+++ b/metadata/md5-cache/app-text/master-pdf-editor-5.1.30
@@ -8,5 +8,5 @@ RDEPEND=>=media-gfx/sane-backends-1.0 >=dev-qt/qtsvg-5.4.1:5 >=dev-qt/qtnetwork-
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://code-industry.net/public/master-pdf-editor-5.1.30_qt5.amd64.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e51835cfff34c18145da4e636d89db3c
diff --git a/metadata/md5-cache/app-text/master-pdf-editor-5.1.36 b/metadata/md5-cache/app-text/master-pdf-editor-5.1.36
index 439387fd9c8b..219f86ebcfae 100644
--- a/metadata/md5-cache/app-text/master-pdf-editor-5.1.36
+++ b/metadata/md5-cache/app-text/master-pdf-editor-5.1.36
@@ -8,5 +8,5 @@ RDEPEND=>=media-gfx/sane-backends-1.0 >=dev-qt/qtsvg-5.4.1:5 >=dev-qt/qtnetwork-
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://code-industry.net/public/master-pdf-editor-5.1.36_qt5.amd64.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e51835cfff34c18145da4e636d89db3c
diff --git a/metadata/md5-cache/app-text/master-pdf-editor-5.1.42 b/metadata/md5-cache/app-text/master-pdf-editor-5.1.42
index c50c710f9332..993dbac08917 100644
--- a/metadata/md5-cache/app-text/master-pdf-editor-5.1.42
+++ b/metadata/md5-cache/app-text/master-pdf-editor-5.1.42
@@ -8,5 +8,5 @@ RDEPEND=>=media-gfx/sane-backends-1.0 >=dev-qt/qtsvg-5.4.1:5 >=dev-qt/qtnetwork-
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://code-industry.net/public/master-pdf-editor-5.1.42_qt5.amd64.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e51835cfff34c18145da4e636d89db3c
diff --git a/metadata/md5-cache/app-text/mupdf-1.13.0 b/metadata/md5-cache/app-text/mupdf-1.13.0
index 6cb97073e29d..82dbfcc48e96 100644
--- a/metadata/md5-cache/app-text/mupdf-1.13.0
+++ b/metadata/md5-cache/app-text/mupdf-1.13.0
@@ -10,5 +10,5 @@ RDEPEND=!libressl? ( dev-libs/openssl:0=[static-libs?] ) libressl? ( dev-libs/li
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
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 60708c1ab703..7cfae62fe6f9 100644
--- a/metadata/md5-cache/app-text/mupdf-1.13.0-r1
+++ b/metadata/md5-cache/app-text/mupdf-1.13.0-r1
@@ -10,5 +10,5 @@ RDEPEND=!libressl? ( dev-libs/openssl:0=[static-libs?] ) libressl? ( dev-libs/li
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/app-text/nfoview-1.23 b/metadata/md5-cache/app-text/nfoview-1.23
index 0738a57de6a0..825b57da2cd4 100644
--- a/metadata/md5-cache/app-text/nfoview-1.23
+++ b/metadata/md5-cache/app-text/nfoview-1.23
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/otsaloma/nfoview/archive/1.23.tar.gz -> nfoview-1.23.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5c4e62f85edb8eb0248f6d8c24ed93fa
diff --git a/metadata/md5-cache/app-text/nfoview-1.24 b/metadata/md5-cache/app-text/nfoview-1.24
index 0e199677373e..1fdc646c26c3 100644
--- a/metadata/md5-cache/app-text/nfoview-1.24
+++ b/metadata/md5-cache/app-text/nfoview-1.24
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/otsaloma/nfoview/archive/1.24.tar.gz -> nfoview-1.24.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5c4e62f85edb8eb0248f6d8c24ed93fa
diff --git a/metadata/md5-cache/app-text/nfoview-9999 b/metadata/md5-cache/app-text/nfoview-9999
index a842ecd7a615..5dbbd8260b7f 100644
--- a/metadata/md5-cache/app-text/nfoview-9999
+++ b/metadata/md5-cache/app-text/nfoview-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=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(-)] media-fonts/terminus-font python_targets_python3_4? ( dev-lang/python:3.4 ) python_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5c4e62f85edb8eb0248f6d8c24ed93fa
diff --git a/metadata/md5-cache/app-text/openlp-2.4.6 b/metadata/md5-cache/app-text/openlp-2.4.6
index c17eca0a99d5..3ee0cf663c04 100644
--- a/metadata/md5-cache/app-text/openlp-2.4.6
+++ b/metadata/md5-cache/app-text/openlp-2.4.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/alembic[python_targets_python3_4(-)?,python_targets_python3_5
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://get.openlp.org/2.4.6/OpenLP-2.4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=82e2875d95be94ff95ce87e082b05666
diff --git a/metadata/md5-cache/app-text/paperwork-1.2.4 b/metadata/md5-cache/app-text/paperwork-1.2.4
index 3036e1e4354e..fb6cc44be3e2 100644
--- a/metadata/md5-cache/app-text/paperwork-1.2.4
+++ b/metadata/md5-cache/app-text/paperwork-1.2.4
@@ -10,5 +10,5 @@ RDEPEND=~app-text/paperwork-backend-1.2.4[python_targets_python3_4(-)?,python_ta
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/paperwork/paperwork-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b575658ca8aa60084be78e077c683bc0
diff --git a/metadata/md5-cache/app-text/paperwork-1.2.4-r1 b/metadata/md5-cache/app-text/paperwork-1.2.4-r1
index 70c2bb0f689a..45601cb4d831 100644
--- a/metadata/md5-cache/app-text/paperwork-1.2.4-r1
+++ b/metadata/md5-cache/app-text/paperwork-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=~app-text/paperwork-backend-1.2.4[python_targets_python3_4(-)?,python_ta
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/paperwork/paperwork-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c31b891cc15523811fbd94a5ec1ba75c
diff --git a/metadata/md5-cache/app-text/paperwork-1.2.4-r2 b/metadata/md5-cache/app-text/paperwork-1.2.4-r2
index 4530091ce1b4..e76ab84d4106 100644
--- a/metadata/md5-cache/app-text/paperwork-1.2.4-r2
+++ b/metadata/md5-cache/app-text/paperwork-1.2.4-r2
@@ -10,5 +10,5 @@ RDEPEND=~app-text/paperwork-backend-1.2.4[python_targets_python3_4(-)?,python_ta
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/paperwork/paperwork-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f9efde442d464baf504e7bda49f19f1b
diff --git a/metadata/md5-cache/app-text/paperwork-backend-1.2.4 b/metadata/md5-cache/app-text/paperwork-backend-1.2.4
index abdb971270f1..9666ea21aff7 100644
--- a/metadata/md5-cache/app-text/paperwork-backend-1.2.4
+++ b/metadata/md5-cache/app-text/paperwork-backend-1.2.4
@@ -10,5 +10,5 @@ RDEPEND=app-text/poppler[introspection] dev-python/natsort[python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/paperwork-backend/paperwork-backend-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d3ec1d25d4e7dab4500dfbc3ff289582
diff --git a/metadata/md5-cache/app-text/pdf2htmlEX-0.14.6.2 b/metadata/md5-cache/app-text/pdf2htmlEX-0.14.6.2
index 53b9eba8372c..0e091646dc26 100644
--- a/metadata/md5-cache/app-text/pdf2htmlEX-0.14.6.2
+++ b/metadata/md5-cache/app-text/pdf2htmlEX-0.14.6.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-text/poppler-0.61.1:=[jpeg,png] <app-text/poppler-0.64.0 app-text/poppler-data ~media-gfx/fontforge-20170731 media-libs/freetype x11-libs/cairo[svg]
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/pdf2htmlEX-0.14.6.2.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=5d88509f1a2d8af0fd1e0c8fa5477579
diff --git a/metadata/md5-cache/app-text/pdf2htmlEX-9999 b/metadata/md5-cache/app-text/pdf2htmlEX-9999
index 3ba73a7cb507..6a4c7b54dce4 100644
--- a/metadata/md5-cache/app-text/pdf2htmlEX-9999
+++ b/metadata/md5-cache/app-text/pdf2htmlEX-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/akhuettel/pdf2htmlEX
 LICENSE=GPL-3+
 RDEPEND=>=app-text/poppler-0.61.1:=[jpeg,png] app-text/poppler-data ~media-gfx/fontforge-20170731[cairo,png] media-libs/freetype x11-libs/cairo[svg]
 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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9001b18a6bf82a854b03219f024c6b45
diff --git a/metadata/md5-cache/app-text/pdfminer-20131113 b/metadata/md5-cache/app-text/pdfminer-20131113
index a63250bfe752..7711ab066aa2 100644
--- a/metadata/md5-cache/app-text/pdfminer-20131113
+++ b/metadata/md5-cache/app-text/pdfminer-20131113
@@ -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=mirror://pypi/p/pdfminer/pdfminer-20131113.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8be43602fb5611dc7c19d512870f366b
diff --git a/metadata/md5-cache/app-text/pdfminer-20140328 b/metadata/md5-cache/app-text/pdfminer-20140328
index 25586ad381de..0e6ba6cc78c2 100644
--- a/metadata/md5-cache/app-text/pdfminer-20140328
+++ b/metadata/md5-cache/app-text/pdfminer-20140328
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pdfminer/pdfminer-20140328.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5fd5d19364c084d66c3d509563938d78
diff --git a/metadata/md5-cache/app-text/pdfminer-20140328-r1 b/metadata/md5-cache/app-text/pdfminer-20140328-r1
index 67cda21c4597..fd1dbebe27db 100644
--- a/metadata/md5-cache/app-text/pdfminer-20140328-r1
+++ b/metadata/md5-cache/app-text/pdfminer-20140328-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pdfminer/pdfminer-20140328.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=24a09b3fef06f4619420327b3996a8a9
diff --git a/metadata/md5-cache/app-text/pdfshuffler-0.6.0-r1 b/metadata/md5-cache/app-text/pdfshuffler-0.6.0-r1
index edb4b1caa53a..1e6a2068893c 100644
--- a/metadata/md5-cache/app-text/pdfshuffler-0.6.0-r1
+++ b/metadata/md5-cache/app-text/pdfshuffler-0.6.0-r1
@@ -10,5 +10,5 @@ RDEPEND=|| ( dev-python/PyPDF2 dev-python/pyPdf ) dev-python/python-poppler pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pdfshuffler/pdfshuffler-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f50c6edc11f980085eca16051e345a68
diff --git a/metadata/md5-cache/app-text/pelican-3.6.0 b/metadata/md5-cache/app-text/pelican-3.6.0
index 1697df96b595..f23114af612a 100644
--- a/metadata/md5-cache/app-text/pelican-3.6.0
+++ b/metadata/md5-cache/app-text/pelican-3.6.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/getpelican/pelican/archive/3.6.0.tar.gz -> pelican-3.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=21ab1f1211c8dcef6baba6d75d20a1eb
diff --git a/metadata/md5-cache/app-text/pelican-3.6.3 b/metadata/md5-cache/app-text/pelican-3.6.3
index 0893c2d36967..6bd79b865e23 100644
--- a/metadata/md5-cache/app-text/pelican-3.6.3
+++ b/metadata/md5-cache/app-text/pelican-3.6.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/getpelican/pelican/archive/3.6.3.tar.gz -> pelican-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=496bba3fd88d91f2e7fb8a39345f7f51
diff --git a/metadata/md5-cache/app-text/pelican-3.7.0 b/metadata/md5-cache/app-text/pelican-3.7.0
index d4e3a0479778..0b933ace1356 100644
--- a/metadata/md5-cache/app-text/pelican-3.7.0
+++ b/metadata/md5-cache/app-text/pelican-3.7.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/getpelican/pelican/archive/3.7.0.tar.gz -> pelican-3.7.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=687c7028dcb3a2d2fc6e96031b354590
diff --git a/metadata/md5-cache/app-text/pelican-3.7.1 b/metadata/md5-cache/app-text/pelican-3.7.1
index f486af13e2f2..2134e7bb7efb 100644
--- a/metadata/md5-cache/app-text/pelican-3.7.1
+++ b/metadata/md5-cache/app-text/pelican-3.7.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/getpelican/pelican/archive/3.7.1.tar.gz -> pelican-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=344f781f5d1f69df92ea25685c708641
diff --git a/metadata/md5-cache/app-text/pelican-9999 b/metadata/md5-cache/app-text/pelican-9999
index c3b12c31285b..b40967288f57 100644
--- a/metadata/md5-cache/app-text/pelican-9999
+++ b/metadata/md5-cache/app-text/pelican-9999
@@ -9,5 +9,5 @@ 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 )
 RESTRICT=test
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4e71112de5873c5ac2031a958fc095dc
diff --git a/metadata/md5-cache/app-text/podofo-0.9.6_p20180715 b/metadata/md5-cache/app-text/podofo-0.9.6_p20180715
index 4f7d3cd9922a..0f808100823e 100644
--- a/metadata/md5-cache/app-text/podofo-0.9.6_p20180715
+++ b/metadata/md5-cache/app-text/podofo-0.9.6_p20180715
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/lua:= idn? ( net-dns/libidn:= ) !libressl? ( dev-libs/openssl:0
 REQUIRED_USE=test? ( tools )
 SLOT=0/0.9.6
 SRC_URI=mirror://gentoo/podofo-0.9.6_p20180715.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7966badf294a456d44dc7a09afcfb66a
diff --git a/metadata/md5-cache/app-text/podofo-0.9.6_pre20170508-r1 b/metadata/md5-cache/app-text/podofo-0.9.6_pre20170508-r1
index fa1758ea8644..4099eb79d903 100644
--- a/metadata/md5-cache/app-text/podofo-0.9.6_pre20170508-r1
+++ b/metadata/md5-cache/app-text/podofo-0.9.6_pre20170508-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/lua:= idn? ( net-dns/libidn:= ) !libressl? ( dev-libs/openssl:0
 REQUIRED_USE=test? ( tools )
 SLOT=0/0.9.6_pre20170508-r1
 SRC_URI=mirror://gentoo/podofo-0.9.6_pre20170508.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e5b8ed096f81153167380cfab067d2b7
diff --git a/metadata/md5-cache/app-text/podofo-0.9.6_pre20171027 b/metadata/md5-cache/app-text/podofo-0.9.6_pre20171027
index ca11dd4a80e5..acb2701fc601 100644
--- a/metadata/md5-cache/app-text/podofo-0.9.6_pre20171027
+++ b/metadata/md5-cache/app-text/podofo-0.9.6_pre20171027
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/lua:= idn? ( net-dns/libidn:= ) !libressl? ( dev-libs/openssl:0
 REQUIRED_USE=test? ( tools )
 SLOT=0/0.9.6_pre20171027
 SRC_URI=mirror://gentoo/podofo-0.9.6_pre20171027.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=05e0bd4aa9c5b7809e8a05492508febb
diff --git a/metadata/md5-cache/app-text/poppler-0.62.0-r1 b/metadata/md5-cache/app-text/poppler-0.62.0-r1
index 6e2f41d63b7f..16302a02e784 100644
--- a/metadata/md5-cache/app-text/poppler-0.62.0-r1
+++ b/metadata/md5-cache/app-text/poppler-0.62.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib
 RESTRICT=test
 SLOT=0/73
 SRC_URI=https://poppler.freedesktop.org/poppler-0.62.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3dd7049092d54e4015ad7a98fa2b7734
diff --git a/metadata/md5-cache/app-text/poppler-0.65.0 b/metadata/md5-cache/app-text/poppler-0.65.0
index f196911a2e4b..a0528a63dcb8 100644
--- a/metadata/md5-cache/app-text/poppler-0.65.0
+++ b/metadata/md5-cache/app-text/poppler-0.65.0
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib
 RESTRICT=test
 SLOT=0/76
 SRC_URI=https://poppler.freedesktop.org/poppler-0.65.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5f449182824275c9882fe6b8d6c9475e
diff --git a/metadata/md5-cache/app-text/poppler-0.66.0 b/metadata/md5-cache/app-text/poppler-0.66.0
index 6483e38c08e4..19339861a624 100644
--- a/metadata/md5-cache/app-text/poppler-0.66.0
+++ b/metadata/md5-cache/app-text/poppler-0.66.0
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib
 RESTRICT=test
 SLOT=0/77
 SRC_URI=https://poppler.freedesktop.org/poppler-0.66.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4caef0578b6719f08560d0b14278460f
diff --git a/metadata/md5-cache/app-text/poppler-0.67.0 b/metadata/md5-cache/app-text/poppler-0.67.0
index 24e92045c8f7..ae62e118ea86 100644
--- a/metadata/md5-cache/app-text/poppler-0.67.0
+++ b/metadata/md5-cache/app-text/poppler-0.67.0
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib
 RESTRICT=test
 SLOT=0/78
 SRC_URI=https://poppler.freedesktop.org/poppler-0.67.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ec094fc52c9ad6918a4f0d7dbb9d5bba
diff --git a/metadata/md5-cache/app-text/poppler-9999 b/metadata/md5-cache/app-text/poppler-9999
index 9c8dd2e6c334..868ff62a0f8f 100644
--- a/metadata/md5-cache/app-text/poppler-9999
+++ b/metadata/md5-cache/app-text/poppler-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib cairo? ( dev-libs/glib:2 >=x11-libs/cairo-1.10.0 introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( >=app-text/poppler-data-0.4.7 )
 RESTRICT=test
 SLOT=0/9999
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=099dd68739539bd1f399f6e8308e7695
diff --git a/metadata/md5-cache/app-text/pybookreader-0.5.0-r1 b/metadata/md5-cache/app-text/pybookreader-0.5.0-r1
index f7c8c19d7f14..335227e01e48 100644
--- a/metadata/md5-cache/app-text/pybookreader-0.5.0-r1
+++ b/metadata/md5-cache/app-text/pybookreader-0.5.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pybookreader/PyBookReader-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ad0cc85134f542c95594c827f66201e7
diff --git a/metadata/md5-cache/app-text/pylize-1.3b-r1 b/metadata/md5-cache/app-text/pylize-1.3b-r1
index ae0cb5d6eae5..d67191d1ca3a 100644
--- a/metadata/md5-cache/app-text/pylize-1.3b-r1
+++ b/metadata/md5-cache/app-text/pylize-1.3b-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/empy[python_targets_python2_7(-)?,-python_single_target_jytho
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://www.chrisarndt.de/en/software/pylize/download/pylize-1.3b.tar.bz2
-_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=02671d1deab59d8a88e5c9767cf72494
diff --git a/metadata/md5-cache/app-text/pytextile-2.1.8 b/metadata/md5-cache/app-text/pytextile-2.1.8
index 0af929b04472..f8eee9542234 100644
--- a/metadata/md5-cache/app-text/pytextile-2.1.8
+++ b/metadata/md5-cache/app-text/pytextile-2.1.8
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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	89bb9f083a2590d9b447fd0b78a96186
+_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 186bc996d2c6..de6a6cf900b4 100644
--- a/metadata/md5-cache/app-text/pytextile-2.3.3
+++ b/metadata/md5-cache/app-text/pytextile-2.3.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/regex[python_targets_pypy(-)?,python_targets_python2_7(-)?,py
 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/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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/app-text/qpdfview-0.4.18_pre2 b/metadata/md5-cache/app-text/qpdfview-0.4.18_pre2
index 995369f8daeb..496869b6f9c8 100644
--- a/metadata/md5-cache/app-text/qpdfview-0.4.18_pre2
+++ b/metadata/md5-cache/app-text/qpdfview-0.4.18_pre2
@@ -10,5 +10,5 @@ RDEPEND=cups? ( net-print/cups ) djvu? ( app-text/djvu ) fitz? ( >=app-text/mupd
 REQUIRED_USE=?? ( fitz pdf )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~grozin/qpdfview-0.4.18_pre2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ca051361bc4aa1d77bbec3fe74f10b5a
diff --git a/metadata/md5-cache/app-text/qpdfview-0.4.18_pre3 b/metadata/md5-cache/app-text/qpdfview-0.4.18_pre3
index ce4025617365..15151f1b57aa 100644
--- a/metadata/md5-cache/app-text/qpdfview-0.4.18_pre3
+++ b/metadata/md5-cache/app-text/qpdfview-0.4.18_pre3
@@ -10,5 +10,5 @@ RDEPEND=cups? ( net-print/cups ) djvu? ( app-text/djvu ) fitz? ( >=app-text/mupd
 REQUIRED_USE=?? ( fitz pdf )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~grozin/qpdfview-0.4.18_pre3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cc511dcf892f036237da44940e33e565
diff --git a/metadata/md5-cache/app-text/qpdfview-0.4.18_pre3-r1 b/metadata/md5-cache/app-text/qpdfview-0.4.18_pre3-r1
new file mode 100644
index 000000000000..e24939218c57
--- /dev/null
+++ b/metadata/md5-cache/app-text/qpdfview-0.4.18_pre3-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=cups? ( net-print/cups ) djvu? ( app-text/djvu ) fitz? ( >=app-text/mupdf-1.7:= ) postscript? ( app-text/libspectre ) dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5[cups?] dev-qt/qtwidgets:5 dbus? ( dev-qt/qtdbus:5 ) pdf? ( >=app-text/poppler-0.35[qt5] dev-qt/qtxml:5 ) sqlite? ( dev-qt/qtsql:5[sqlite] ) svg? ( dev-qt/qtsvg:5 ) !svg? ( virtual/freedesktop-icon-theme ) synctex? ( app-text/texlive-core ) dev-qt/linguist-tools:5 virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=A tabbed document viewer
+EAPI=6
+HOMEPAGE=https://launchpad.net/qpdfview
+IUSE=cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+
+RDEPEND=cups? ( net-print/cups ) djvu? ( app-text/djvu ) fitz? ( >=app-text/mupdf-1.7:= ) postscript? ( app-text/libspectre ) dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5[cups?] dev-qt/qtwidgets:5 dbus? ( dev-qt/qtdbus:5 ) pdf? ( >=app-text/poppler-0.35[qt5] dev-qt/qtxml:5 ) sqlite? ( dev-qt/qtsql:5[sqlite] ) svg? ( dev-qt/qtsvg:5 ) !svg? ( virtual/freedesktop-icon-theme ) synctex? ( app-text/texlive-core )
+REQUIRED_USE=?? ( fitz pdf )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~grozin/qpdfview-0.4.18_pre3.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b64f18088c1e7b3aa4013fced3046bd5
diff --git a/metadata/md5-cache/app-text/referencer-1.2.2 b/metadata/md5-cache/app-text/referencer-1.2.2
index 9b9bd409874c..7d38fde7ec22 100644
--- a/metadata/md5-cache/app-text/referencer-1.2.2
+++ b/metadata/md5-cache/app-text/referencer-1.2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-text/poppler-0.12.3-r3[cairo] >=dev-cpp/gtkmm-2.8:* >=dev-cpp/libglademm-2.6.0 >=dev-cpp/gconfmm-2.14.0 >=dev-libs/boost-1.52.0-r4
 SLOT=0
 SRC_URI=https://launchpad.net/referencer/1./1.2.2/+download/referencer-1.2.2.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8c2aa25b6f0eb2020c8a5a8f3e61474c
diff --git a/metadata/md5-cache/app-text/restview-2.7.0 b/metadata/md5-cache/app-text/restview-2.7.0
index 97c9a517d966..b912fe93b9df 100644
--- a/metadata/md5-cache/app-text/restview-2.7.0
+++ b/metadata/md5-cache/app-text/restview-2.7.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/restview/restview-2.7.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=25b0003131ddeb095a8aa0f20c2f0ad6
diff --git a/metadata/md5-cache/app-text/restview-2.8.0 b/metadata/md5-cache/app-text/restview-2.8.0
index aa829c09265e..bc74f8a20ca7 100644
--- a/metadata/md5-cache/app-text/restview-2.8.0
+++ b/metadata/md5-cache/app-text/restview-2.8.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/restview/restview-2.8.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=25b0003131ddeb095a8aa0f20c2f0ad6
diff --git a/metadata/md5-cache/app-text/restview-2.8.1 b/metadata/md5-cache/app-text/restview-2.8.1
index 04e8e85b375c..07e7b3f1d93e 100644
--- a/metadata/md5-cache/app-text/restview-2.8.1
+++ b/metadata/md5-cache/app-text/restview-2.8.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/restview/restview-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2c896dcf97708da6ed2f60f8045016a3
diff --git a/metadata/md5-cache/app-text/rpl-1.5.5-r1 b/metadata/md5-cache/app-text/rpl-1.5.5-r1
index 41c71c39cc0a..4964c26f8c1f 100644
--- a/metadata/md5-cache/app-text/rpl-1.5.5-r1
+++ b/metadata/md5-cache/app-text/rpl-1.5.5-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=mirror://sourceforge/rpl/rpl-1.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=38ea701415ced81ad9b831f8827873a3
diff --git a/metadata/md5-cache/app-text/sdcv-0.5.0_beta2-r1 b/metadata/md5-cache/app-text/sdcv-0.5.0_beta2-r1
index 44783a5f2587..1302c2d9e49c 100644
--- a/metadata/md5-cache/app-text/sdcv-0.5.0_beta2-r1
+++ b/metadata/md5-cache/app-text/sdcv-0.5.0_beta2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib sys-libs/readline:= >=dev-libs/glib-2.6.1
 SLOT=0
 SRC_URI=mirror://sourceforge/sdcv/sdcv-0.5.0-beta2-Source.tar.bz2
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=eb8b900f374b01ba321441ec3b52b934
diff --git a/metadata/md5-cache/app-text/sdcv-0.5.2 b/metadata/md5-cache/app-text/sdcv-0.5.2
index b17b6d0725b9..ea4ba457951a 100644
--- a/metadata/md5-cache/app-text/sdcv-0.5.2
+++ b/metadata/md5-cache/app-text/sdcv-0.5.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.6.1 sys-libs/zlib readline? ( sys-libs/readline:= )
 SLOT=0
 SRC_URI=https://github.com/Dushistov/sdcv/archive/v0.5.2.tar.gz -> sdcv-0.5.2.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c89157b834b18bf9b277f9dd92b282ac
diff --git a/metadata/md5-cache/app-text/sigil-0.9.8 b/metadata/md5-cache/app-text/sigil-0.9.8
index 50c529cfdae3..677a1202dbbd 100644
--- a/metadata/md5-cache/app-text/sigil-0.9.8
+++ b/metadata/md5-cache/app-text/sigil-0.9.8
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/Sigil-Ebook/Sigil/releases/download/0.9.8/Sigil-0.9.8-Code.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=a292c047029a9c08ce14a721959311c3
diff --git a/metadata/md5-cache/app-text/silvercity-0.9.7-r1 b/metadata/md5-cache/app-text/silvercity-0.9.7-r1
index 020b78e3dfad..ba48deefaad0 100644
--- a/metadata/md5-cache/app-text/silvercity-0.9.7-r1
+++ b/metadata/md5-cache/app-text/silvercity-0.9.7-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=mirror://sourceforge/silvercity/SilverCity-0.9.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=8da9982aa53c345a6b931a28008f9a42
diff --git a/metadata/md5-cache/app-text/stardict-3.0.6-r3 b/metadata/md5-cache/app-text/stardict-3.0.6-r3
index f678db783c0e..4a7d64853ba3 100644
--- a/metadata/md5-cache/app-text/stardict-3.0.6-r3
+++ b/metadata/md5-cache/app-text/stardict-3.0.6-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=tools? ( python? ( python_targets_python2_7 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict-4/stardict-3.0.6.tar.bz2 pronounce? ( https://stardict-3.googlecode.com/files/WyabdcRealPeopleTTS.tar.bz2 ) qqwry? ( mirror://gentoo/QQWry.Dat.bz2 )
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=5d710b0d352a4acbd9454bff936d470a
diff --git a/metadata/md5-cache/app-text/stardict-4.0.0_pre20170304 b/metadata/md5-cache/app-text/stardict-4.0.0_pre20170304
index a161f5c8daae..b2147004cba3 100644
--- a/metadata/md5-cache/app-text/stardict-4.0.0_pre20170304
+++ b/metadata/md5-cache/app-text/stardict-4.0.0_pre20170304
@@ -11,5 +11,5 @@ REQUIRED_USE=tools? ( python? ( python_targets_python2_7 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~bircoph/distfiles/stardict-4.0.0_pre20170304.tar.xz pronounce? ( https://stardict-3.googlecode.com/files/WyabdcRealPeopleTTS.tar.bz2 ) qqwry? ( mirror://gentoo/QQWry.Dat.bz2 )
-_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=2ef63c19aef085f31b926e86f1fdff39
diff --git a/metadata/md5-cache/app-text/texlive-core-2017-r4 b/metadata/md5-cache/app-text/texlive-core-2017-r4
index b5cc178941d1..a1533369d905 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 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LPPL-1.3c TeX
 RDEPEND=X? ( x11-libs/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_=804efa4d5e95c91f96db396248f08ddf
+_md5_=8b9123066821cd575cc3af5ac0afa1a8
diff --git a/metadata/md5-cache/app-text/tidy-html5-5.6.0 b/metadata/md5-cache/app-text/tidy-html5-5.6.0
index e6652727c2f0..341b45da95f5 100644
--- a/metadata/md5-cache/app-text/tidy-html5-5.6.0
+++ b/metadata/md5-cache/app-text/tidy-html5-5.6.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!app-text/htmltidy
 SLOT=0
 SRC_URI=https://github.com/htacg/tidy-html5/archive/5.6.0.tar.gz -> tidy-html5-5.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=52f843d001b9e01cfc70dc0ebf366684
diff --git a/metadata/md5-cache/app-text/winefish-1.3.3-r2 b/metadata/md5-cache/app-text/winefish-1.3.3-r2
index 7eeed7c70b11..ed6241abe246 100644
--- a/metadata/md5-cache/app-text/winefish-1.3.3-r2
+++ b/metadata/md5-cache/app-text/winefish-1.3.3-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libpcre-6.3 >=x11-libs/gtk+-2.4:2 spell? ( app-text/aspell )
 SLOT=0
 SRC_URI=https://github.com/viettug/winefish/archive/1.3.3.tar.gz -> winefish-1.3.3.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0fcc927597b8f1acc397ae3dccb53df5
diff --git a/metadata/md5-cache/app-text/wv2-0.4.2-r2 b/metadata/md5-cache/app-text/wv2-0.4.2-r2
index 4ddcc4137191..9795371930af 100644
--- a/metadata/md5-cache/app-text/wv2-0.4.2-r2
+++ b/metadata/md5-cache/app-text/wv2-0.4.2-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-libs/glib >=gnome-extra/libgsf-1.8:= virtual/libiconv zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://sourceforge/wvware/wv2-0.4.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=be670ae54a5cac317c973333bda347ad
diff --git a/metadata/md5-cache/app-text/xchm-1.23-r1 b/metadata/md5-cache/app-text/xchm-1.23-r1
index 607d25c8c8a1..d723bf6f8b77 100644
--- a/metadata/md5-cache/app-text/xchm-1.23-r1
+++ b/metadata/md5-cache/app-text/xchm-1.23-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/chmlib-0.36 x11-libs/wxGTK:3.0[X]
 SLOT=0
 SRC_URI=mirror://sourceforge/xchm/xchm-1.23.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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2bd5c575d9f2d7ab7902568158114bf1
diff --git a/metadata/md5-cache/app-text/xchm-1.23-r2 b/metadata/md5-cache/app-text/xchm-1.23-r2
index 9b568f15c835..46884ba1686b 100644
--- a/metadata/md5-cache/app-text/xchm-1.23-r2
+++ b/metadata/md5-cache/app-text/xchm-1.23-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/chmlib-0.36 x11-libs/wxGTK:3.0-gtk3[X]
 SLOT=0
 SRC_URI=mirror://sourceforge/xchm/xchm-1.23.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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a2f0543d73179a5c86e347b6a65d6d64
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 7c742ee542cb..8c6283f42f79 100644
--- a/metadata/md5-cache/app-text/xdvik-22.87.03-r1
+++ b/metadata/md5-cache/app-text/xdvik-22.87.03-r1
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/app-text/xfbib-0.0.2-r2 b/metadata/md5-cache/app-text/xfbib-0.0.2-r2
index 72817e88839b..788ff2e9be52 100644
--- a/metadata/md5-cache/app-text/xfbib-0.0.2-r2
+++ b/metadata/md5-cache/app-text/xfbib-0.0.2-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.12 >=x11-libs/gtk+-2.10:2 >=xfce-base/libxfcegui4-4.2 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8
 SLOT=0
 SRC_URI=https://goodies.xfce.org/releases/xfbib/xfbib-0.0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=53b5d03ce264a97be4d0669c50d77cf7
diff --git a/metadata/md5-cache/app-text/xiphos-4.0.6a-r1 b/metadata/md5-cache/app-text/xiphos-4.0.6a-r1
index a2b08da728fa..2f6c6686815b 100644
--- a/metadata/md5-cache/app-text/xiphos-4.0.6a-r1
+++ b/metadata/md5-cache/app-text/xiphos-4.0.6a-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/crosswire/xiphos/releases/download/4.0.6a/xiphos-4.0.6a-20170820.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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_=aa316129610cac1c51464738e7f5f5b0
diff --git a/metadata/md5-cache/app-text/xiphos-4.1.0-r1 b/metadata/md5-cache/app-text/xiphos-4.1.0-r1
index 82f2eb72e8cb..1456618a6e80 100644
--- a/metadata/md5-cache/app-text/xiphos-4.1.0-r1
+++ b/metadata/md5-cache/app-text/xiphos-4.1.0-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/crosswire/xiphos/releases/download/4.1.0/xiphos-4.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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_=bf70a1d96722ca0d612d563e41d7b603
diff --git a/metadata/md5-cache/app-text/xlsx2csv-0.7.2 b/metadata/md5-cache/app-text/xlsx2csv-0.7.2
index 281f458103b9..c3be56cb577a 100644
--- a/metadata/md5-cache/app-text/xlsx2csv-0.7.2
+++ b/metadata/md5-cache/app-text/xlsx2csv-0.7.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/x/xlsx2csv/xlsx2csv-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2854e17aac0367938fad4786164c9b0a
diff --git a/metadata/md5-cache/app-text/xlsx2csv-0.7.3 b/metadata/md5-cache/app-text/xlsx2csv-0.7.3
index d34ad5ec1971..562e970808ab 100644
--- a/metadata/md5-cache/app-text/xlsx2csv-0.7.3
+++ b/metadata/md5-cache/app-text/xlsx2csv-0.7.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/x/xlsx2csv/xlsx2csv-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cdd1f54366922f6475d55f9ff07eeeca
diff --git a/metadata/md5-cache/app-text/xmldiff-0.6.10-r2 b/metadata/md5-cache/app-text/xmldiff-0.6.10-r2
index 4cd17b2b3165..f7ee3f42d700 100644
--- a/metadata/md5-cache/app-text/xmldiff-0.6.10-r2
+++ b/metadata/md5-cache/app-text/xmldiff-0.6.10-r2
@@ -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=ftp://ftp.logilab.fr/pub/xmldiff/xmldiff-0.6.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2299a4d580e98ff9b7166459897534cf
diff --git a/metadata/md5-cache/app-text/xmldiff-1.1.1 b/metadata/md5-cache/app-text/xmldiff-1.1.1
index f27349a8f65a..ff86250568f8 100644
--- a/metadata/md5-cache/app-text/xmldiff-1.1.1
+++ b/metadata/md5-cache/app-text/xmldiff-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/future dev-python/lxml dev-python/six python_targets_python2_
 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/Shoobx/xmldiff/archive/1.1.1.tar.gz -> xmldiff-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=64c9602d44c4fa563792c0bfe49ebe02
diff --git a/metadata/md5-cache/app-text/xournal-0.4.8 b/metadata/md5-cache/app-text/xournal-0.4.8
index f0aad7204466..3932c3228989 100644
--- a/metadata/md5-cache/app-text/xournal-0.4.8
+++ b/metadata/md5-cache/app-text/xournal-0.4.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/poppler[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl )
 SLOT=0
 SRC_URI=mirror://sourceforge/xournal/xournal-0.4.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=c88eaff09d7b72f235915658a22ec12e
diff --git a/metadata/md5-cache/app-text/xournal-0.4.8-r1 b/metadata/md5-cache/app-text/xournal-0.4.8-r1
index afd8f68acb46..96a661ea6ad3 100644
--- a/metadata/md5-cache/app-text/xournal-0.4.8-r1
+++ b/metadata/md5-cache/app-text/xournal-0.4.8-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/poppler[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl )
 SLOT=0
 SRC_URI=mirror://sourceforge/xournal/xournal-0.4.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=1cf01cf555b10d303b1e7d087fdcc057
diff --git a/metadata/md5-cache/app-text/xournal-0.4.8.2016 b/metadata/md5-cache/app-text/xournal-0.4.8.2016
index 0c0107c8382b..99a3fe75a856 100644
--- a/metadata/md5-cache/app-text/xournal-0.4.8.2016
+++ b/metadata/md5-cache/app-text/xournal-0.4.8.2016
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/poppler[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl )
 SLOT=0
 SRC_URI=mirror://sourceforge/xournal/xournal-0.4.8.2016.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=9bdc31e32bc1a15fdcc5cedb1e7df683
diff --git a/metadata/md5-cache/app-text/xournal-9999 b/metadata/md5-cache/app-text/xournal-9999
index 50a310f0b1e1..d3c4b2be3690 100644
--- a/metadata/md5-cache/app-text/xournal-9999
+++ b/metadata/md5-cache/app-text/xournal-9999
@@ -7,5 +7,5 @@ IUSE=+pdf vanilla
 LICENSE=GPL-2
 RDEPEND=app-text/poppler[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl )
 SLOT=0
-_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9bdc31e32bc1a15fdcc5cedb1e7df683
diff --git a/metadata/md5-cache/app-text/yelp-tools-3.18.0 b/metadata/md5-cache/app-text/yelp-tools-3.18.0
index 544ded3007a8..5834285b3799 100644
--- a/metadata/md5-cache/app-text/yelp-tools-3.18.0
+++ b/metadata/md5-cache/app-text/yelp-tools-3.18.0
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2+ freedist ) GPL-2+
 RDEPEND=>=dev-libs/libxml2-2.6.12 >=dev-libs/libxslt-1.1.8 dev-util/itstool >=gnome-extra/yelp-xsl-3.17.3 virtual/awk
 SLOT=0
 SRC_URI=mirror://gnome/sources/yelp-tools/3.18/yelp-tools-3.18.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=eea2fbbd6dd2fc1d5ac67fa622274c9c
diff --git a/metadata/md5-cache/app-text/zathura-0.3.7 b/metadata/md5-cache/app-text/zathura-0.3.7
index 8ce856f89dc1..7f4ae67005ef 100644
--- a/metadata/md5-cache/app-text/zathura-0.3.7
+++ b/metadata/md5-cache/app-text/zathura-0.3.7
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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 1fc7d80b3b40..53c875d72800 100644
--- a/metadata/md5-cache/app-text/zathura-0.3.8
+++ b/metadata/md5-cache/app-text/zathura-0.3.8
@@ -9,5 +9,5 @@ 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 )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/app-text/zathura-9999 b/metadata/md5-cache/app-text/zathura-9999
index 7ddbe9a13f04..c66b06313436 100644
--- a/metadata/md5-cache/app-text/zathura-9999
+++ b/metadata/md5-cache/app-text/zathura-9999
@@ -7,5 +7,5 @@ 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 )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/app-text/zathura-cb-0.1.7 b/metadata/md5-cache/app-text/zathura-cb-0.1.7
index e915be30c7ec..6e71e8c202d6 100644
--- a/metadata/md5-cache/app-text/zathura-cb-0.1.7
+++ b/metadata/md5-cache/app-text/zathura-cb-0.1.7
@@ -8,5 +8,5 @@ LICENSE=ZLIB
 RDEPEND=>=app-text/zathura-0.3.8 dev-libs/glib:2= app-arch/libarchive:= x11-libs/cairo:= x11-libs/gdk-pixbuf:=
 SLOT=0
 SRC_URI=https://pwmt.org/projects/zathura/plugins/download/zathura-cb-0.1.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7ac33fef07e54c99ee682c4d80e4cebd
diff --git a/metadata/md5-cache/app-text/zathura-cb-9999 b/metadata/md5-cache/app-text/zathura-cb-9999
index 9f9cb2151bb9..6c7ec01acbcc 100644
--- a/metadata/md5-cache/app-text/zathura-cb-9999
+++ b/metadata/md5-cache/app-text/zathura-cb-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://pwmt.org/projects/zathura/
 LICENSE=ZLIB
 RDEPEND=>=app-text/zathura-0.3.8 dev-libs/glib:2= app-arch/libarchive:= x11-libs/cairo:= x11-libs/gdk-pixbuf:=
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=06aa9a66efe49585aec7a0790da2cef0
diff --git a/metadata/md5-cache/app-text/zathura-djvu-0.2.7 b/metadata/md5-cache/app-text/zathura-djvu-0.2.7
index a5345122e3ef..d8297f02646d 100644
--- a/metadata/md5-cache/app-text/zathura-djvu-0.2.7
+++ b/metadata/md5-cache/app-text/zathura-djvu-0.2.7
@@ -8,5 +8,5 @@ LICENSE=ZLIB
 RDEPEND=>=app-text/djvu-3.5.24-r1:= >=app-text/zathura-0.3.8 dev-libs/glib:2= x11-libs/cairo:=
 SLOT=0
 SRC_URI=http://pwmt.org/projects/zathura/plugins/download/zathura-djvu-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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=28a29c62186b792f747f8112e05b9fd2
diff --git a/metadata/md5-cache/app-text/zathura-djvu-9999 b/metadata/md5-cache/app-text/zathura-djvu-9999
index e2ce20b4660d..22d4150f839d 100644
--- a/metadata/md5-cache/app-text/zathura-djvu-9999
+++ b/metadata/md5-cache/app-text/zathura-djvu-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://pwmt.org/projects/zathura/
 LICENSE=ZLIB
 RDEPEND=>=app-text/djvu-3.5.24-r1:= >=app-text/zathura-0.3.8 dev-libs/glib:2= x11-libs/cairo:=
 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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cedaa401f4cc5de153ff331d736eb589
diff --git a/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.2 b/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.2
index 331856de0bd6..ad149bf1d90b 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.2
+++ b/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.2
@@ -8,5 +8,5 @@ LICENSE=ZLIB
 RDEPEND=!app-text/zathura-pdf-poppler >=app-text/mupdf-1.12.0:= >=app-text/zathura-0.3.8 media-libs/jbig2dec:= media-libs/openjpeg:2= virtual/jpeg:0 x11-libs/cairo:=
 SLOT=0
 SRC_URI=https://pwmt.org/projects/zathura/plugins/download/zathura-pdf-mupdf-0.3.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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9ebc489bf0655d655627ee5c52016c85
diff --git a/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999 b/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999
index 4949537485e2..69847ed64e6e 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999
+++ b/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://pwmt.org/projects/zathura/
 LICENSE=ZLIB
 RDEPEND=!app-text/zathura-pdf-poppler >=app-text/mupdf-1.12.0:= >=app-text/zathura-0.3.8 media-libs/jbig2dec:= media-libs/openjpeg:2= virtual/jpeg:0 x11-libs/cairo:=
 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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b03110e5bf26b38ec131520b570bfba9
diff --git a/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.8 b/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.8
index 4fd43b03a8d0..1f59196dc21c 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.8
+++ b/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.8
@@ -8,5 +8,5 @@ LICENSE=ZLIB
 RDEPEND=app-text/poppler[cairo] >=app-text/zathura-0.3.8 x11-libs/cairo:=
 SLOT=0
 SRC_URI=http://pwmt.org/projects/zathura/plugins/download/zathura-pdf-poppler-0.2.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bad2ee3fb50ee794189768822a72d3f3
diff --git a/metadata/md5-cache/app-text/zathura-pdf-poppler-9999 b/metadata/md5-cache/app-text/zathura-pdf-poppler-9999
index 9622275d29b2..d5a614b5b74d 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-poppler-9999
+++ b/metadata/md5-cache/app-text/zathura-pdf-poppler-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://pwmt.org/projects/zathura/
 LICENSE=ZLIB
 RDEPEND=app-text/poppler[cairo] >=app-text/zathura-0.3.8 x11-libs/cairo:=
 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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f3e948f382cad5272e9e4c672cfa6352
diff --git a/metadata/md5-cache/app-text/zathura-ps-0.2.5 b/metadata/md5-cache/app-text/zathura-ps-0.2.5
index 7ceec4b8fc26..715fe9977824 100644
--- a/metadata/md5-cache/app-text/zathura-ps-0.2.5
+++ b/metadata/md5-cache/app-text/zathura-ps-0.2.5
@@ -8,5 +8,5 @@ LICENSE=ZLIB
 RDEPEND=>=app-text/libspectre-0.2.6:= >=app-text/zathura-0.3.8 dev-libs/glib:2= x11-libs/cairo:=
 SLOT=0
 SRC_URI=https://pwmt.org/projects/zathura/plugins/download/zathura-ps-0.2.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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6437b696bd93ac8e6fa282401d82ba9c
diff --git a/metadata/md5-cache/app-text/zathura-ps-9999 b/metadata/md5-cache/app-text/zathura-ps-9999
index 9fd662528d49..7eeff7499e83 100644
--- a/metadata/md5-cache/app-text/zathura-ps-9999
+++ b/metadata/md5-cache/app-text/zathura-ps-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://pwmt.org/projects/zathura/
 LICENSE=ZLIB
 RDEPEND=>=app-text/libspectre-0.2.6:= >=app-text/zathura-0.3.8 dev-libs/glib:2= x11-libs/cairo:=
 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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a72e0184b11e76e5bb02311c22065294
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index 3d07c6c05a8e..ab3c0748ce82 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/breakpts-4.0-r2 b/metadata/md5-cache/app-vim/breakpts-4.0-r2
new file mode 100644
index 000000000000..e90c0fbbd3ce
--- /dev/null
+++ b/metadata/md5-cache/app-vim/breakpts-4.0-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm
+DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: sets vim breakpoints visually
+EAPI=7
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=618
+KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=|| ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 ) >=app-vim/multvals-3.6.1 >=app-vim/genutils-1.13 >=app-vim/foldutil-1.6 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=8142 -> breakpts-4.0.zip
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=a59ea1334da51d96b7ce61008011eae2
diff --git a/metadata/md5-cache/app-vim/gentoo-syntax-20180821 b/metadata/md5-cache/app-vim/gentoo-syntax-20180821
index 0c93d2549efc..c2c0f4f0f08b 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_=7fa937ce5296e4d395ab99c6856a3430
+_md5_=57a93cd2ac3c5935d98a39d76378f0e7
diff --git a/metadata/md5-cache/app-vim/pyclewn-2.0.1 b/metadata/md5-cache/app-vim/pyclewn-2.0.1
index 19f5dd7111f5..903712b55022 100644
--- a/metadata/md5-cache/app-vim/pyclewn-2.0.1
+++ b/metadata/md5-cache/app-vim/pyclewn-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=|| ( >=app-editors/vim-7.3[python_targets_python2_7(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyclewn/pyclewn-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	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f5cbd76333df0181d8408e23dbb3cc4b
diff --git a/metadata/md5-cache/app-vim/pyclewn-2.1-r1 b/metadata/md5-cache/app-vim/pyclewn-2.1-r1
index 39080f1ce89f..b89923ad8837 100644
--- a/metadata/md5-cache/app-vim/pyclewn-2.1-r1
+++ b/metadata/md5-cache/app-vim/pyclewn-2.1-r1
@@ -10,5 +10,5 @@ RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3[netbeans] ) app-arch/v
 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/pyclewn/pyclewn-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	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=352d067177c19bc6446ac8964b8d47f7
diff --git a/metadata/md5-cache/app-vim/youcompleteme-20130910 b/metadata/md5-cache/app-vim/youcompleteme-20130910
index d65ec3789cd4..16e7d2f12ed6 100644
--- a/metadata/md5-cache/app-vim/youcompleteme-20130910
+++ b/metadata/md5-cache/app-vim/youcompleteme-20130910
@@ -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://dev.gentoo.org/~radhermit/vim/youcompleteme-20130910.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	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a3fb258035ce35d52d68b7b6405b03b2
diff --git a/metadata/md5-cache/app-vim/youcompleteme-99999999 b/metadata/md5-cache/app-vim/youcompleteme-99999999
index 355e5db8bf31..56bc24d9af82 100644
--- a/metadata/md5-cache/app-vim/youcompleteme-99999999
+++ b/metadata/md5-cache/app-vim/youcompleteme-99999999
@@ -8,5 +8,5 @@ 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(+)] clang? ( >=sys-devel/clang-3.3 ) dev-libs/boost[python,threads,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_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/bottle[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_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/python-futures[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_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/jedi[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_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/requests[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_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/sh[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_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/waitress[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_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
-_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a02867f107d14fc6cecdc1cce308275e
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 6cdae8b6feb0..77a4728ac2a7 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/antlr-cpp-4.7.1 b/metadata/md5-cache/dev-cpp/antlr-cpp-4.7.1
index c8313fe8aa54..2e8bf774dd45 100644
--- a/metadata/md5-cache/dev-cpp/antlr-cpp-4.7.1
+++ b/metadata/md5-cache/dev-cpp/antlr-cpp-4.7.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 SLOT=4
 SRC_URI=https://www.antlr.org/download/antlr4-cpp-runtime-4.7.1-source.zip -> antlr-cpp-4.7.1.zip
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a1d16fc2a9dede422a192216aa510c5c
diff --git a/metadata/md5-cache/dev-cpp/atkmm-2.24.2 b/metadata/md5-cache/dev-cpp/atkmm-2.24.2
index 7c08a05386d3..82239d5921fc 100644
--- a/metadata/md5-cache/dev-cpp/atkmm-2.24.2
+++ b/metadata/md5-cache/dev-cpp/atkmm-2.24.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-cpp/glibmm-2.46.2:2[doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/atk-2.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(-)?] >=dev-libs/libsigc++-2.3.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-cpp/gtkmm-2.22.0
 SLOT=0
 SRC_URI=mirror://gnome/sources/atkmm/2.24/atkmm-2.24.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=59bc6fa62053b41fc3e08295669f7b8a
diff --git a/metadata/md5-cache/dev-cpp/cairomm-1.12.0-r1 b/metadata/md5-cache/dev-cpp/cairomm-1.12.0-r1
index 263c3a270f0b..a091a891b1c0 100644
--- a/metadata/md5-cache/dev-cpp/cairomm-1.12.0-r1
+++ b/metadata/md5-cache/dev-cpp/cairomm-1.12.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=x11-libs/cairo-1.12.10[aqua=,svg=,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/libsigc++-2.5.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(-)?]
 SLOT=0
 SRC_URI=mirror://gnome/sources/cairomm/1.12/cairomm-1.12.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d30f2e9c59d87ac89b66417041ee13bf
diff --git a/metadata/md5-cache/dev-cpp/catch-1.11.0 b/metadata/md5-cache/dev-cpp/catch-1.11.0
index e57d7f4428fa..07df2aa7e792 100644
--- a/metadata/md5-cache/dev-cpp/catch-1.11.0
+++ b/metadata/md5-cache/dev-cpp/catch-1.11.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Boost-1.0
 SLOT=0
 SRC_URI=https://github.com/catchorg/Catch2/archive/v1.11.0.tar.gz -> Catch-1.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=98985c73a0f06c9bc63aa215699af297
diff --git a/metadata/md5-cache/dev-cpp/catch-1.9999 b/metadata/md5-cache/dev-cpp/catch-1.9999
index 047c4af8a611..02c332594ac2 100644
--- a/metadata/md5-cache/dev-cpp/catch-1.9999
+++ b/metadata/md5-cache/dev-cpp/catch-1.9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/catchorg/Catch2
 IUSE=test
 LICENSE=Boost-1.0
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9893bc9a366b475112b345978b1e9152
diff --git a/metadata/md5-cache/dev-cpp/catch-2.2.2 b/metadata/md5-cache/dev-cpp/catch-2.2.2
index 6f566ecf78da..bc9e4a040aeb 100644
--- a/metadata/md5-cache/dev-cpp/catch-2.2.2
+++ b/metadata/md5-cache/dev-cpp/catch-2.2.2
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/catchorg/Catch2/archive/v2.2.2.tar.gz -> Catch2-2.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-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=51e1c71c07ee04c9c8e55bbfa6539306
diff --git a/metadata/md5-cache/dev-cpp/catch-2.3.0 b/metadata/md5-cache/dev-cpp/catch-2.3.0
index 299efe0f99f6..72362202d686 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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=b870fdb7e2c93ecbb68e5baf2e477117
+_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
diff --git a/metadata/md5-cache/dev-cpp/catch-9999 b/metadata/md5-cache/dev-cpp/catch-9999
index 9570a2d0bbd0..789aba67076a 100644
--- a/metadata/md5-cache/dev-cpp/catch-9999
+++ b/metadata/md5-cache/dev-cpp/catch-9999
@@ -7,5 +7,5 @@ IUSE=test
 LICENSE=Boost-1.0
 RESTRICT=!test? ( test )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=86abc7bbffd8c7d6e38c0b9f18a4ef47
diff --git a/metadata/md5-cache/dev-cpp/clucene-2.3.3.4-r6 b/metadata/md5-cache/dev-cpp/clucene-2.3.3.4-r6
index a351544a5dde..8827532f4845 100644
--- a/metadata/md5-cache/dev-cpp/clucene-2.3.3.4-r6
+++ b/metadata/md5-cache/dev-cpp/clucene-2.3.3.4-r6
@@ -9,5 +9,5 @@ LICENSE=|| ( Apache-2.0 LGPL-2.1 )
 RESTRICT=test
 SLOT=1
 SRC_URI=mirror://sourceforge/clucene/clucene-core-2.3.3.4.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a58cb2f73b52a332d256cad2733708c4
diff --git a/metadata/md5-cache/dev-cpp/cpp-hocon-0.1.4 b/metadata/md5-cache/dev-cpp/cpp-hocon-0.1.4
index 7ae8c10a9d09..8b370a8956ba 100644
--- a/metadata/md5-cache/dev-cpp/cpp-hocon-0.1.4
+++ b/metadata/md5-cache/dev-cpp/cpp-hocon-0.1.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=sys-devel/gcc-4.9.3:* >=dev-libs/boost-1.54[nls] >=dev-libs/leatherman-0.9.3
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/cpp-hocon/archive/0.1.4.tar.gz -> cpp-hocon-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b0a3f8368f56ed6b5ff211d901b9a828
diff --git a/metadata/md5-cache/dev-cpp/eigen-3.2.8-r2 b/metadata/md5-cache/dev-cpp/eigen-3.2.8-r2
index 8a8ef1f67ae4..5cd2c0ba29e2 100644
--- a/metadata/md5-cache/dev-cpp/eigen-3.2.8-r2
+++ b/metadata/md5-cache/dev-cpp/eigen-3.2.8-r2
@@ -10,5 +10,5 @@ RDEPEND=!dev-cpp/eigen:0
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://bitbucket.org/eigen/eigen/get/3.2.8.tar.bz2 -> eigen-3.2.8.tar.bz2
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2f6bf4fd0fdceaded26b846bfe689446
diff --git a/metadata/md5-cache/dev-cpp/eigen-3.3.3 b/metadata/md5-cache/dev-cpp/eigen-3.3.3
index fdc553422a2d..5d092debff5e 100644
--- a/metadata/md5-cache/dev-cpp/eigen-3.3.3
+++ b/metadata/md5-cache/dev-cpp/eigen-3.3.3
@@ -10,5 +10,5 @@ RDEPEND=!dev-cpp/eigen:0
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://bitbucket.org/eigen/eigen/get/3.3.3.tar.bz2 -> eigen-3.3.3.tar.bz2
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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_=26afdbd994009ec9ce046c12e2077357
diff --git a/metadata/md5-cache/dev-cpp/eigen-3.3.4 b/metadata/md5-cache/dev-cpp/eigen-3.3.4
index 6fb4a0ec09a5..f30b2b187199 100644
--- a/metadata/md5-cache/dev-cpp/eigen-3.3.4
+++ b/metadata/md5-cache/dev-cpp/eigen-3.3.4
@@ -10,5 +10,5 @@ RDEPEND=!dev-cpp/eigen:0
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://bitbucket.org/eigen/eigen/get/3.3.4.tar.bz2 -> eigen-3.3.4.tar.bz2
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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_=26afdbd994009ec9ce046c12e2077357
diff --git a/metadata/md5-cache/dev-cpp/eigen-3.3.5-r1 b/metadata/md5-cache/dev-cpp/eigen-3.3.5-r1
index f961d4e4c331..4a516abfd56e 100644
--- a/metadata/md5-cache/dev-cpp/eigen-3.3.5-r1
+++ b/metadata/md5-cache/dev-cpp/eigen-3.3.5-r1
@@ -10,5 +10,5 @@ RDEPEND=!dev-cpp/eigen:0
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://bitbucket.org/eigen/eigen/get/3.3.5.tar.bz2 -> eigen-3.3.5.tar.bz2
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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_=c279d28a6682e656d14e7a7885c36461
diff --git a/metadata/md5-cache/dev-cpp/gccxml-0.9.0_pre20131217 b/metadata/md5-cache/dev-cpp/gccxml-0.9.0_pre20131217
index 9eddbf3486a7..179b44d05139 100644
--- a/metadata/md5-cache/dev-cpp/gccxml-0.9.0_pre20131217
+++ b/metadata/md5-cache/dev-cpp/gccxml-0.9.0_pre20131217
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm ~mips ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/gccxml-0.9.0_pre20131217.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8b7b11d15db1f5dd296e9d45647a0010
diff --git a/metadata/md5-cache/dev-cpp/gconfmm-2.28.3-r1 b/metadata/md5-cache/dev-cpp/gconfmm-2.28.3-r1
index af3f2f33bc95..1297b754aecc 100644
--- a/metadata/md5-cache/dev-cpp/gconfmm-2.28.3-r1
+++ b/metadata/md5-cache/dev-cpp/gconfmm-2.28.3-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=gnome-base/gconf-2.4:2 >=dev-cpp/glibmm-2.12:2[doc?] >=dev-cpp/gtkmm-2.4:2.4
 SLOT=0
 SRC_URI=mirror://gnome/sources/gconfmm/2.28/gconfmm-2.28.3.tar.bz2
-_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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1dd692102fe726ceea04ee98864c203f
diff --git a/metadata/md5-cache/dev-cpp/gflags-2.2.0 b/metadata/md5-cache/dev-cpp/gflags-2.2.0
index 5270d8360f36..5c638396aac1 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a223537406dbd8b487957086e65f917b
diff --git a/metadata/md5-cache/dev-cpp/gflags-2.2.1 b/metadata/md5-cache/dev-cpp/gflags-2.2.1
index e070271128ee..e1b75a854ee7 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=73cd89372f1f6349670580170790163c
diff --git a/metadata/md5-cache/dev-cpp/gflags-9999 b/metadata/md5-cache/dev-cpp/gflags-9999
index dac4bf0134d3..2518ed77fb10 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=73cd89372f1f6349670580170790163c
diff --git a/metadata/md5-cache/dev-cpp/glibmm-2.50.1 b/metadata/md5-cache/dev-cpp/glibmm-2.50.1
index f95bffb19912..25397e27f2b2 100644
--- a/metadata/md5-cache/dev-cpp/glibmm-2.50.1
+++ b/metadata/md5-cache/dev-cpp/glibmm-2.50.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+ GPL-2+
 RDEPEND=>=dev-libs/libsigc++-2.9.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/glib-2.50.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(-)?]
 SLOT=2
 SRC_URI=mirror://gnome/sources/glibmm/2.50/glibmm-2.50.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1b5e8af3ff8a25cf03c5a5c1c016c34c
diff --git a/metadata/md5-cache/dev-cpp/glibmm-2.52.1 b/metadata/md5-cache/dev-cpp/glibmm-2.52.1
index d6b97818f162..1fca10252355 100644
--- a/metadata/md5-cache/dev-cpp/glibmm-2.52.1
+++ b/metadata/md5-cache/dev-cpp/glibmm-2.52.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+ GPL-2+
 RDEPEND=>=dev-libs/libsigc++-2.9.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/glib-2.50.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(-)?]
 SLOT=2
 SRC_URI=mirror://gnome/sources/glibmm/2.52/glibmm-2.52.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9a028a5bfa7a60467f736653a3c531f6
diff --git a/metadata/md5-cache/dev-cpp/glibmm-2.54.1 b/metadata/md5-cache/dev-cpp/glibmm-2.54.1
index 5cc3260ef1e2..729e3dbd9be1 100644
--- a/metadata/md5-cache/dev-cpp/glibmm-2.54.1
+++ b/metadata/md5-cache/dev-cpp/glibmm-2.54.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+ GPL-2+
 RDEPEND=>=dev-libs/libsigc++-2.9.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/glib-2.50.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(-)?]
 SLOT=2
 SRC_URI=mirror://gnome/sources/glibmm/2.54/glibmm-2.54.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7fcd5232bd03bcb676629a6c5009fb59
diff --git a/metadata/md5-cache/dev-cpp/glibmm-2.56.0 b/metadata/md5-cache/dev-cpp/glibmm-2.56.0
index 35fa5faf441d..4c837d386386 100644
--- a/metadata/md5-cache/dev-cpp/glibmm-2.56.0
+++ b/metadata/md5-cache/dev-cpp/glibmm-2.56.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+ GPL-2+
 RDEPEND=>=dev-libs/libsigc++-2.9.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/glib-2.55.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(-)?]
 SLOT=2
 SRC_URI=mirror://gnome/sources/glibmm/2.56/glibmm-2.56.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c23429a458a426f793720cc7441492c0
diff --git a/metadata/md5-cache/dev-cpp/gnome-vfsmm-2.26.0-r1 b/metadata/md5-cache/dev-cpp/gnome-vfsmm-2.26.0-r1
index 3e58428a6445..3ef2cfb739ca 100644
--- a/metadata/md5-cache/dev-cpp/gnome-vfsmm-2.26.0-r1
+++ b/metadata/md5-cache/dev-cpp/gnome-vfsmm-2.26.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=gnome-base/gnome-vfs-2.8.1 >=dev-cpp/glibmm-2.12
 SLOT=1.1
 SRC_URI=mirror://gnome/sources/gnome-vfsmm/2.26/gnome-vfsmm-2.26.0.tar.bz2
-_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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4f3372a9a341011564e0b0075ba8288a
diff --git a/metadata/md5-cache/dev-cpp/gstreamermm-0.10.11 b/metadata/md5-cache/dev-cpp/gstreamermm-0.10.11
index d3cb4218148f..b39caaab5a01 100644
--- a/metadata/md5-cache/dev-cpp/gstreamermm-0.10.11
+++ b/metadata/md5-cache/dev-cpp/gstreamermm-0.10.11
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=media-libs/gstreamer-0.10.36:0.10 >=media-libs/gst-plugins-base-0.10.36:0.10 >=dev-cpp/glibmm-2.33.4:2 >=dev-cpp/libxmlpp-2.14:2.6 >=dev-libs/libsigc++-2:2
 SLOT=0.10
 SRC_URI=mirror://gnome/sources/gstreamermm/0.10/gstreamermm-0.10.11.tar.xz
-_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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9c2ce65f4b97c87b05b162257604e2dc
diff --git a/metadata/md5-cache/dev-cpp/gstreamermm-1.10.0 b/metadata/md5-cache/dev-cpp/gstreamermm-1.10.0
index 466de9f9e510..40b1ae39c527 100644
--- a/metadata/md5-cache/dev-cpp/gstreamermm-1.10.0
+++ b/metadata/md5-cache/dev-cpp/gstreamermm-1.10.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=media-libs/gstreamer-1.10.0:1.0 >=media-libs/gst-plugins-base-1.10.0:1.0 >=dev-cpp/glibmm-2.47.6:2 >=dev-cpp/libxmlpp-2.14:2.6 >=dev-libs/libsigc++-2:2
 SLOT=1.0/1
 SRC_URI=mirror://gnome/sources/gstreamermm/1.10/gstreamermm-1.10.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3d61505c6c7c4129620b53b50fc3b6a3
diff --git a/metadata/md5-cache/dev-cpp/gtest-1.8.0 b/metadata/md5-cache/dev-cpp/gtest-1.8.0
index 6ee0d6c9f78c..2f71a84bfc75 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _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 141c16126492..c53276a72d0f 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _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 cfca765ed62f..ab0260cea88e 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _md5_=9210763b863d6c43f582001d2652d6ad
diff --git a/metadata/md5-cache/dev-cpp/gtest-9999 b/metadata/md5-cache/dev-cpp/gtest-9999
index 444ddb29d770..64baf976e01a 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _md5_=9210763b863d6c43f582001d2652d6ad
diff --git a/metadata/md5-cache/dev-cpp/gtkglextmm-1.2.0-r1 b/metadata/md5-cache/dev-cpp/gtkglextmm-1.2.0-r1
index 221f8a70bb15..7f55d4e90120 100644
--- a/metadata/md5-cache/dev-cpp/gtkglextmm-1.2.0-r1
+++ b/metadata/md5-cache/dev-cpp/gtkglextmm-1.2.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=x11-libs/gtkglext-1 >=dev-libs/libsigc++-2.0 >=dev-cpp/glibmm-2.4:2 >=dev-cpp/gtkmm-2.4:2.4 virtual/opengl
 SLOT=1.0
 SRC_URI=mirror://sourceforge/gtkglext/gtkglextmm-1.2.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=95909718af06e1108d0e2860d6da23e9
diff --git a/metadata/md5-cache/dev-cpp/gtkglextmm-1.2.0-r2 b/metadata/md5-cache/dev-cpp/gtkglextmm-1.2.0-r2
index 2ef0228465d1..6ddc11f4858d 100644
--- a/metadata/md5-cache/dev-cpp/gtkglextmm-1.2.0-r2
+++ b/metadata/md5-cache/dev-cpp/gtkglextmm-1.2.0-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=x11-libs/gtkglext-1 >=dev-libs/libsigc++-2.0 >=dev-cpp/glibmm-2.4:2 >=dev-cpp/gtkmm-2.4:2.4 virtual/opengl
 SLOT=1.0
 SRC_URI=mirror://sourceforge/gtkglext/gtkglextmm-1.2.0.tar.bz2
-_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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ef8842acf90729c9432e83bc4e85c281
diff --git a/metadata/md5-cache/dev-cpp/gtkmm-2.24.5 b/metadata/md5-cache/dev-cpp/gtkmm-2.24.5
index 01bd17b27e72..6283575321e9 100644
--- a/metadata/md5-cache/dev-cpp/gtkmm-2.24.5
+++ b/metadata/md5-cache/dev-cpp/gtkmm-2.24.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-cpp/glibmm-2.34.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/gtk+-2.24.15:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_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.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(-)?] >=dev-cpp/atkmm-2.22.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-cpp/cairomm-1.10.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-cpp/pangomm-2.34.0: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(-)?] >=dev-libs/libsigc++-2.3.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(-)?]
 SLOT=2.4
 SRC_URI=mirror://gnome/sources/gtkmm/2.24/gtkmm-2.24.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e5dfd07034e5e086ff0a3d236fcbcd94
diff --git a/metadata/md5-cache/dev-cpp/gtkmm-3.22.2 b/metadata/md5-cache/dev-cpp/gtkmm-3.22.2
index d4fb744343a8..1c51e5296fad 100644
--- a/metadata/md5-cache/dev-cpp/gtkmm-3.22.2
+++ b/metadata/md5-cache/dev-cpp/gtkmm-3.22.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-cpp/glibmm-2.49.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 REQUIRED_USE=|| ( aqua wayland X )
 SLOT=3.0
 SRC_URI=mirror://gnome/sources/gtkmm/3.22/gtkmm-3.22.2.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=704c0b17e52e35a032ec65584b20299f
diff --git a/metadata/md5-cache/dev-cpp/gtksourceviewmm-2.10.3-r1 b/metadata/md5-cache/dev-cpp/gtksourceviewmm-2.10.3-r1
index b220b144a663..b2b70cbe6f9b 100644
--- a/metadata/md5-cache/dev-cpp/gtksourceviewmm-2.10.3-r1
+++ b/metadata/md5-cache/dev-cpp/gtksourceviewmm-2.10.3-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-cpp/gtkmm-2.12:2.4 dev-cpp/atkmm >=x11-libs/gtksourceview-2.10.0:2.0 !>=dev-cpp/libgtksourceviewmm-1
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/gtksourceviewmm/2.10/gtksourceviewmm-2.10.3.tar.xz
-_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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=611a5337011a2cc30b4143f441509e1b
diff --git a/metadata/md5-cache/dev-cpp/gtksourceviewmm-3.18.0 b/metadata/md5-cache/dev-cpp/gtksourceviewmm-3.18.0
index 5c5ffa79874c..a80dd29398b7 100644
--- a/metadata/md5-cache/dev-cpp/gtksourceviewmm-3.18.0
+++ b/metadata/md5-cache/dev-cpp/gtksourceviewmm-3.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-cpp/glibmm-2.46.1:2 >=dev-cpp/gtkmm-3.18.0:3.0 >=x11-libs/gtksourceview-3.18.0:3.0 dev-cpp/atkmm dev-cpp/cairomm dev-cpp/pangomm:1.4
 SLOT=3.0
 SRC_URI=mirror://gnome/sources/gtksourceviewmm/3.18/gtksourceviewmm-3.18.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=74c6e10242891f8e39c8b81956aeabbd
diff --git a/metadata/md5-cache/dev-cpp/icnc-1.0.100 b/metadata/md5-cache/dev-cpp/icnc-1.0.100
index 3c0c0115277f..2cf49d1d2e5f 100644
--- a/metadata/md5-cache/dev-cpp/icnc-1.0.100
+++ b/metadata/md5-cache/dev-cpp/icnc-1.0.100
@@ -10,5 +10,5 @@ RDEPEND=>=dev-cpp/tbb-4.2 sys-libs/glibc mpi? ( virtual/mpi )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/icnc/icnc/archive/v1.0.100.tar.gz -> icnc-1.0.100.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d5c465e781e8dd10006baba5407175c5
diff --git a/metadata/md5-cache/dev-cpp/libglademm-2.6.7-r2 b/metadata/md5-cache/dev-cpp/libglademm-2.6.7-r2
index 06b551ea73a2..aab1fb081c8e 100644
--- a/metadata/md5-cache/dev-cpp/libglademm-2.6.7-r2
+++ b/metadata/md5-cache/dev-cpp/libglademm-2.6.7-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=gnome-base/libglade-2.6.4-r1: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(-)?] >=dev-cpp/gtkmm-2.24.3:2.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/glibmm-2.34.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(-)?]
 SLOT=2.4
 SRC_URI=mirror://gnome/sources/libglademm/2.6/libglademm-2.6.7.tar.bz2
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=961d8debbaa0fd4acaacbd016e586ab0
diff --git a/metadata/md5-cache/dev-cpp/libgnomecanvasmm-2.26.0-r1 b/metadata/md5-cache/dev-cpp/libgnomecanvasmm-2.26.0-r1
index 8c0bef9dbaa8..7d2c0bd70344 100644
--- a/metadata/md5-cache/dev-cpp/libgnomecanvasmm-2.26.0-r1
+++ b/metadata/md5-cache/dev-cpp/libgnomecanvasmm-2.26.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=gnome-base/libgnomecanvas-2.6 >=dev-cpp/gtkmm-2.4:2.4
 SLOT=2.6
 SRC_URI=mirror://gnome/sources/libgnomecanvasmm/2.26/libgnomecanvasmm-2.26.0.tar.bz2
-_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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=51af496bbbb234277a1c7d261139bb8b
diff --git a/metadata/md5-cache/dev-cpp/libjson-rpc-cpp-1.1.0-r1 b/metadata/md5-cache/dev-cpp/libjson-rpc-cpp-1.1.0-r1
index 66d48e33d169..aacfeb318637 100644
--- a/metadata/md5-cache/dev-cpp/libjson-rpc-cpp-1.1.0-r1
+++ b/metadata/md5-cache/dev-cpp/libjson-rpc-cpp-1.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/jsoncpp:= http-client? ( net-misc/curl:= ) http-server? ( net-l
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/cinemast/libjson-rpc-cpp/archive/v1.1.0.tar.gz -> libjson-rpc-cpp-1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1469ff05beb276304f6f70e0c73c1886
diff --git a/metadata/md5-cache/dev-cpp/libjson-rpc-cpp-9999 b/metadata/md5-cache/dev-cpp/libjson-rpc-cpp-9999
index 61ac98a83f55..2451f8c2cffd 100644
--- a/metadata/md5-cache/dev-cpp/libjson-rpc-cpp-9999
+++ b/metadata/md5-cache/dev-cpp/libjson-rpc-cpp-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/jsoncpp:= http-client? ( net-misc/curl:= ) http-server? ( net-libs/libmicrohttpd:= ) redis-client? ( dev-libs/hiredis:= ) redis-server? ( dev-libs/hiredis:= ) stubgen? ( dev-libs/argtable:= )
 RESTRICT=!test? ( test )
 SLOT=0/1
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d551894c5d58dba6cf066b95d79d8006
diff --git a/metadata/md5-cache/dev-cpp/libxmlpp-2.40.1 b/metadata/md5-cache/dev-cpp/libxmlpp-2.40.1
index 3d55bb12cb95..0a50c075f13c 100644
--- a/metadata/md5-cache/dev-cpp/libxmlpp-2.40.1
+++ b/metadata/md5-cache/dev-cpp/libxmlpp-2.40.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/libxml2-2.7.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-cpp/glibmm-2.32[abi_x86_32(-)?,abi_x86_64(-)?,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=2.6
 SRC_URI=mirror://gnome/sources/libxml++/2.40/libxml++-2.40.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=97fe56e908b8950ea0a02ba48809b245
diff --git a/metadata/md5-cache/dev-cpp/libxmlpp-3.0.1 b/metadata/md5-cache/dev-cpp/libxmlpp-3.0.1
index ae1425c84451..9ad32566ee3d 100644
--- a/metadata/md5-cache/dev-cpp/libxmlpp-3.0.1
+++ b/metadata/md5-cache/dev-cpp/libxmlpp-3.0.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/libxml2-2.7.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-cpp/glibmm-2.32[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=3.0
 SRC_URI=mirror://gnome/sources/libxml++/3.0/libxml++-3.0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8d57fe7fe8c3ff90f5fd82038254db80
diff --git a/metadata/md5-cache/dev-cpp/lucene++-3.0.7 b/metadata/md5-cache/dev-cpp/lucene++-3.0.7
index e40f8ab2f191..e2114c48b4a1 100644
--- a/metadata/md5-cache/dev-cpp/lucene++-3.0.7
+++ b/metadata/md5-cache/dev-cpp/lucene++-3.0.7
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/luceneplusplus/LucenePlusPlus/archive/rel_3.0.7.tar.gz -> lucene++-3.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4920c8974b21ad77cfc5f13bdbd56452
diff --git a/metadata/md5-cache/dev-cpp/mm-common-0.9.12 b/metadata/md5-cache/dev-cpp/mm-common-0.9.12
index 563e31742022..8548a96d1fdb 100644
--- a/metadata/md5-cache/dev-cpp/mm-common-0.9.12
+++ b/metadata/md5-cache/dev-cpp/mm-common-0.9.12
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnome/sources/mm-common/0.9/mm-common-0.9.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4f35063dc63058e2e0ca7193345cef0d
diff --git a/metadata/md5-cache/dev-cpp/ms-gsl-1.0.0 b/metadata/md5-cache/dev-cpp/ms-gsl-1.0.0
index c90d93a21804..ff2f578a776f 100644
--- a/metadata/md5-cache/dev-cpp/ms-gsl-1.0.0
+++ b/metadata/md5-cache/dev-cpp/ms-gsl-1.0.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/Microsoft/GSL/archive/v1.0.0.tar.gz -> ms-gsl-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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=2076221f2c6e6b0f4446c1cebca69df5
diff --git a/metadata/md5-cache/dev-cpp/pangomm-2.40.1 b/metadata/md5-cache/dev-cpp/pangomm-2.40.1
index c2ea78ef2a6f..ad300fe50f80 100644
--- a/metadata/md5-cache/dev-cpp/pangomm-2.40.1
+++ b/metadata/md5-cache/dev-cpp/pangomm-2.40.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=x11-libs/pango-1.38.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/glibmm-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(-)?] >=dev-cpp/cairomm-1.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(-)?] >=dev-libs/libsigc++-2.3.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-cpp/gtkmm-2.13:2.4
 SLOT=1.4
 SRC_URI=mirror://gnome/sources/pangomm/2.40/pangomm-2.40.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=079e1e821b65332b3d6a497aeb310b55
diff --git a/metadata/md5-cache/dev-cpp/sourcetrail-2018.3.55 b/metadata/md5-cache/dev-cpp/sourcetrail-2018.3.55
index 17d95a353616..1d23f5429b7b 100644
--- a/metadata/md5-cache/dev-cpp/sourcetrail-2018.3.55
+++ b/metadata/md5-cache/dev-cpp/sourcetrail-2018.3.55
@@ -9,5 +9,5 @@ LICENSE=Sourcetrail || ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3 BSD
 RDEPEND=dev-libs/openssl media-libs/fontconfig media-libs/freetype media-libs/libpng:1.2 sys-libs/libudev-compat virtual/opengl x11-libs/libdrm x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrender x11-libs/libXxf86vm selinux? ( sys-libs/libselinux )
 SLOT=0
 SRC_URI=https://www.sourcetrail.com/downloads/2018.3.55/linux/64bit -> sourcetrail-2018.3.55.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f90ec95c57b41c80abb3b757f398fe38
diff --git a/metadata/md5-cache/dev-cpp/waylandpp-0.1.4 b/metadata/md5-cache/dev-cpp/waylandpp-0.1.4
index 5de8edaffecf..c53b6f4b4837 100644
--- a/metadata/md5-cache/dev-cpp/waylandpp-0.1.4
+++ b/metadata/md5-cache/dev-cpp/waylandpp-0.1.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/wayland-1.11.0 media-libs/mesa[wayland]
 SLOT=0/0
 SRC_URI=https://github.com/NilsBrause/waylandpp/archive/0.1.4.tar.gz -> waylandpp-0.1.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=792e7ec1cab6bc7e59bfba43e8150656
diff --git a/metadata/md5-cache/dev-cpp/waylandpp-0.1.5 b/metadata/md5-cache/dev-cpp/waylandpp-0.1.5
index 7a94dea22f29..2b09d9658e06 100644
--- a/metadata/md5-cache/dev-cpp/waylandpp-0.1.5
+++ b/metadata/md5-cache/dev-cpp/waylandpp-0.1.5
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/wayland-1.11.0 media-libs/mesa[wayland]
 SLOT=0/0
 SRC_URI=https://github.com/NilsBrause/waylandpp/archive/0.1.5.tar.gz -> waylandpp-0.1.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=792e7ec1cab6bc7e59bfba43e8150656
diff --git a/metadata/md5-cache/dev-cpp/waylandpp-0.1.6 b/metadata/md5-cache/dev-cpp/waylandpp-0.1.6
index 24de25ec9250..3dd4cdb5f67f 100644
--- a/metadata/md5-cache/dev-cpp/waylandpp-0.1.6
+++ b/metadata/md5-cache/dev-cpp/waylandpp-0.1.6
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/wayland-1.11.0 media-libs/mesa[wayland]
 SLOT=0/0
 SRC_URI=https://github.com/NilsBrause/waylandpp/archive/0.1.6.tar.gz -> waylandpp-0.1.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=792e7ec1cab6bc7e59bfba43e8150656
diff --git a/metadata/md5-cache/dev-cpp/waylandpp-0.2.2 b/metadata/md5-cache/dev-cpp/waylandpp-0.2.2
index 75e2e014a5be..5d95acef65cc 100644
--- a/metadata/md5-cache/dev-cpp/waylandpp-0.2.2
+++ b/metadata/md5-cache/dev-cpp/waylandpp-0.2.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/wayland-1.11.0 media-libs/mesa[wayland]
 SLOT=0/0.2
 SRC_URI=https://github.com/NilsBrause/waylandpp/archive/0.2.2.tar.gz -> waylandpp-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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=a337ff3ab3cdbae38d50ec595cba3046
diff --git a/metadata/md5-cache/dev-cpp/waylandpp-0.2.3 b/metadata/md5-cache/dev-cpp/waylandpp-0.2.3
index 489f37f5fb3a..7f9141de9614 100644
--- a/metadata/md5-cache/dev-cpp/waylandpp-0.2.3
+++ b/metadata/md5-cache/dev-cpp/waylandpp-0.2.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/wayland-1.11.0 media-libs/mesa[wayland]
 SLOT=0/0.2
 SRC_URI=https://github.com/NilsBrause/waylandpp/archive/0.2.3.tar.gz -> waylandpp-0.2.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=a337ff3ab3cdbae38d50ec595cba3046
diff --git a/metadata/md5-cache/dev-cpp/waylandpp-9999 b/metadata/md5-cache/dev-cpp/waylandpp-9999
index 0e17e25c1abb..c29ae36dfacf 100644
--- a/metadata/md5-cache/dev-cpp/waylandpp-9999
+++ b/metadata/md5-cache/dev-cpp/waylandpp-9999
@@ -7,5 +7,5 @@ IUSE=doc
 LICENSE=MIT
 RDEPEND=>=dev-libs/wayland-1.11.0 media-libs/mesa[wayland]
 SLOT=0/9999
-_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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a337ff3ab3cdbae38d50ec595cba3046
diff --git a/metadata/md5-cache/dev-cpp/websocketpp-0.7.0-r2 b/metadata/md5-cache/dev-cpp/websocketpp-0.7.0-r2
index 3fd1e6d39854..4d47ee01e369 100644
--- a/metadata/md5-cache/dev-cpp/websocketpp-0.7.0-r2
+++ b/metadata/md5-cache/dev-cpp/websocketpp-0.7.0-r2
@@ -2,7 +2,7 @@ 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=http://www.zaphoyd.com/websocketpp
+HOMEPAGE=https://www.zaphoyd.com/websocketpp
 IUSE=boost examples test
 KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86
 LICENSE=BSD
@@ -10,5 +10,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=4948cc1249fc8ed60df964b28aa1a882
+_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 cfeb03239109..16ebc92bd413 100644
--- a/metadata/md5-cache/dev-cpp/websocketpp-0.8.1
+++ b/metadata/md5-cache/dev-cpp/websocketpp-0.8.1
@@ -2,7 +2,7 @@ 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=http://www.zaphoyd.com/websocketpp
+HOMEPAGE=https://www.zaphoyd.com/websocketpp
 IUSE=boost examples test
 KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86
 LICENSE=BSD
@@ -10,5 +10,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=719c4cf4932796d5f3c1fe99380f6678
+_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
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 c1967f6f16a8..654caa0858d3 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c00472685ea70831bc6d85e968740d0e
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 957683a3dc45..24bc91eccdc5 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/SchemaSync-0.9.2-r1 b/metadata/md5-cache/dev-db/SchemaSync-0.9.2-r1
index 3f040fcfe28d..b4e648686cb2 100644
--- a/metadata/md5-cache/dev-db/SchemaSync-0.9.2-r1
+++ b/metadata/md5-cache/dev-db/SchemaSync-0.9.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gentoo/SchemaSync-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9bb3dc21fa3a000650d6b2fb8d054f68
diff --git a/metadata/md5-cache/dev-db/SchemaSync-0.9.4 b/metadata/md5-cache/dev-db/SchemaSync-0.9.4
index 996e375699e3..ddc57d4a6801 100644
--- a/metadata/md5-cache/dev-db/SchemaSync-0.9.4
+++ b/metadata/md5-cache/dev-db/SchemaSync-0.9.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/S/SchemaSync/SchemaSync-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5204b56864e6fa16f7e83c2cec680f78
diff --git a/metadata/md5-cache/dev-db/SchemaSync-0.9.5 b/metadata/md5-cache/dev-db/SchemaSync-0.9.5
index 572b30ddf4e5..652ff5c7110a 100644
--- a/metadata/md5-cache/dev-db/SchemaSync-0.9.5
+++ b/metadata/md5-cache/dev-db/SchemaSync-0.9.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/S/SchemaSync/SchemaSync-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=18b7043a70251f9f6e6da8a87358d4b0
diff --git a/metadata/md5-cache/dev-db/barman-2.1 b/metadata/md5-cache/dev-db/barman-2.1
index 9cb6e3fa1b2c..4226c5742200 100644
--- a/metadata/md5-cache/dev-db/barman-2.1
+++ b/metadata/md5-cache/dev-db/barman-2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/argh[python_targets_python2_7(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://downloads.sourceforge.net/project/pgbarman/2.1/barman-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9da696368ecd6d1eb1d3cae71720942c
diff --git a/metadata/md5-cache/dev-db/barman-2.3 b/metadata/md5-cache/dev-db/barman-2.3
index 4c3e7b106403..8629e5aa2ebd 100644
--- a/metadata/md5-cache/dev-db/barman-2.3
+++ b/metadata/md5-cache/dev-db/barman-2.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/argh[python_targets_python2_7(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://downloads.sourceforge.net/project/pgbarman/2.3/barman-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=9da696368ecd6d1eb1d3cae71720942c
diff --git a/metadata/md5-cache/dev-db/barman-2.4 b/metadata/md5-cache/dev-db/barman-2.4
index 3230763b6ca8..d0c7a0c47d67 100644
--- a/metadata/md5-cache/dev-db/barman-2.4
+++ b/metadata/md5-cache/dev-db/barman-2.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/argh[python_targets_python2_7(-)?,python_targets_python3_4(-)
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://downloads.sourceforge.net/project/pgbarman/2.4/barman-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=359934cb55ee4a73d28445af4b8e7d8f
diff --git a/metadata/md5-cache/dev-db/clickhouse-18.10.3 b/metadata/md5-cache/dev-db/clickhouse-18.10.3
index a847d0a858fc..41de4f13c6dc 100644
--- a/metadata/md5-cache/dev-db/clickhouse-18.10.3
+++ b/metadata/md5-cache/dev-db/clickhouse-18.10.3
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:
 REQUIRED_USE=server? ( cpu_flags_x86_sse4_2 ) static? ( client server tools )
 SLOT=0/stable
 SRC_URI=https://github.com/yandex/ClickHouse/archive/v18.10.3-stable.tar.gz -> clickhouse-18.10.3.tar.gz https://github.com/google/cctz/archive/4f9776a.tar.gz -> cctz-4f9776a.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=de7aae4f254778f550cb8f1cebc524f7
diff --git a/metadata/md5-cache/dev-db/clickhouse-18.12.17 b/metadata/md5-cache/dev-db/clickhouse-18.12.17
index 67f54b5d5d90..f01a354cf040 100644
--- a/metadata/md5-cache/dev-db/clickhouse-18.12.17
+++ b/metadata/md5-cache/dev-db/clickhouse-18.12.17
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:
 REQUIRED_USE=server? ( cpu_flags_x86_sse4_2 ) static? ( client server tools )
 SLOT=0/stable
 SRC_URI=https://github.com/yandex/ClickHouse/archive/v18.12.17-stable.tar.gz -> clickhouse-18.12.17.tar.gz https://github.com/google/cctz/archive/4f9776a.tar.gz -> cctz-4f9776a.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c49090335927a6a254442ff5ce6bc714
diff --git a/metadata/md5-cache/dev-db/clickhouse-18.6.0 b/metadata/md5-cache/dev-db/clickhouse-18.6.0
index 6bf9ffc385d1..1a7305c5cc35 100644
--- a/metadata/md5-cache/dev-db/clickhouse-18.6.0
+++ b/metadata/md5-cache/dev-db/clickhouse-18.6.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:
 REQUIRED_USE=server? ( cpu_flags_x86_sse4_2 ) static? ( client server tools )
 SLOT=0/stable
 SRC_URI=https://github.com/yandex/ClickHouse/archive/v18.6.0-stable.tar.gz -> clickhouse-18.6.0.tar.gz https://github.com/google/cctz/archive/4f9776a.tar.gz -> cctz-4f9776a.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=433a2b382a92fe10f9a61f030b7f77fb
diff --git a/metadata/md5-cache/dev-db/cpp-driver-2.8.1 b/metadata/md5-cache/dev-db/cpp-driver-2.8.1
index f1ff4d122808..c8e89900c419 100644
--- a/metadata/md5-cache/dev-db/cpp-driver-2.8.1
+++ b/metadata/md5-cache/dev-db/cpp-driver-2.8.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/libuv:= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://github.com/datastax/cpp-driver/archive/2.8.1.tar.gz -> cpp-driver-2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4bc0b14ae7434187b2b055d85025efee
diff --git a/metadata/md5-cache/dev-db/cpp-driver-2.9.0 b/metadata/md5-cache/dev-db/cpp-driver-2.9.0
index f2f8a3e669c3..ea4a2c45d71b 100644
--- a/metadata/md5-cache/dev-db/cpp-driver-2.9.0
+++ b/metadata/md5-cache/dev-db/cpp-driver-2.9.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/libuv:= ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) )
 SLOT=0
 SRC_URI=https://github.com/datastax/cpp-driver/archive/2.9.0.tar.gz -> cpp-driver-2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e3daa7fdd4d755e0949fe6118010c8e3
diff --git a/metadata/md5-cache/dev-db/cppdb-0.3.1-r2 b/metadata/md5-cache/dev-db/cppdb-0.3.1-r2
index 53082e6f9bdc..1a4d722d1871 100644
--- a/metadata/md5-cache/dev-db/cppdb-0.3.1-r2
+++ b/metadata/md5-cache/dev-db/cppdb-0.3.1-r2
@@ -9,5 +9,5 @@ LICENSE=|| ( Boost-1.0 MIT )
 RDEPEND=mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 )
 SLOT=0
 SRC_URI=mirror://sourceforge/cppcms/cppdb-0.3.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=813ffbb6947c5bcc6af3ea1008e0b79d
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 c25a65d2888e..250ece5bb2d5 100644
--- a/metadata/md5-cache/dev-db/kdb-3.1.0-r1
+++ b/metadata/md5-cache/dev-db/kdb-3.1.0-r1
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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_=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
new file mode 100644
index 000000000000..32b8eb873b17
--- /dev/null
+++ b/metadata/md5-cache/dev-db/kdb-3.1.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=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
+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
+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
+_md5_=1e73e351975a232bc21385a77f0a4b6a
diff --git a/metadata/md5-cache/dev-db/mariadb-10.0.35-r2 b/metadata/md5-cache/dev-db/mariadb-10.0.35-r2
index c3ee8b11d2a1..6d84f568bcdf 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.0.35-r2
+++ b/metadata/md5-cache/dev-db/mariadb-10.0.35-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !
 RESTRICT=!bindist? ( bindist ) libressl? ( test )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.0.35/source/mariadb-10.0.35.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=de9ea7cf43d8da4fc27aa2f3d9af20ba
diff --git a/metadata/md5-cache/dev-db/mariadb-10.0.36 b/metadata/md5-cache/dev-db/mariadb-10.0.36
index 01d6042d6caf..85a022e22150 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.0.36
+++ b/metadata/md5-cache/dev-db/mariadb-10.0.36
@@ -12,5 +12,5 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !
 RESTRICT=!bindist? ( bindist ) libressl? ( test )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.0.36/source/mariadb-10.0.36.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7af5175dac1f05ae64a5bba82d8110fb
diff --git a/metadata/md5-cache/dev-db/mariadb-10.1.34 b/metadata/md5-cache/dev-db/mariadb-10.1.34
index ecaf999357c3..e70235d3e0e6 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.1.34
+++ b/metadata/md5-cache/dev-db/mariadb-10.1.34
@@ -12,5 +12,5 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !
 RESTRICT=!bindist? ( bindist ) libressl? ( test )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.1.34/source/mariadb-10.1.34.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b974c5efb2b16b4e26c41136e4af2ea0
diff --git a/metadata/md5-cache/dev-db/mariadb-10.1.35 b/metadata/md5-cache/dev-db/mariadb-10.1.35
index 8eced384f70b..9018551d255b 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.1.35
+++ b/metadata/md5-cache/dev-db/mariadb-10.1.35
@@ -12,5 +12,5 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !
 RESTRICT=!bindist? ( bindist ) libressl? ( test )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.1.35/source/mariadb-10.1.35.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c19d65c88e63628a8570788d145fefd6
diff --git a/metadata/md5-cache/dev-db/mariadb-10.1.36 b/metadata/md5-cache/dev-db/mariadb-10.1.36
index 7e0cb36d7b12..27b554324bb5 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.1.36
+++ b/metadata/md5-cache/dev-db/mariadb-10.1.36
@@ -12,5 +12,5 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !
 RESTRICT=!bindist? ( bindist ) libressl? ( test )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.1.36/source/mariadb-10.1.36.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4f2466e3615bd59eed67f40e8dd7e3bb
diff --git a/metadata/md5-cache/dev-db/mariadb-10.2.17 b/metadata/md5-cache/dev-db/mariadb-10.2.17
index 13eef449a835..7440f945edc9 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.2.17
+++ b/metadata/md5-cache/dev-db/mariadb-10.2.17
@@ -12,5 +12,5 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-db/mariadb-10.3.8 b/metadata/md5-cache/dev-db/mariadb-10.3.8
index 6686bff92a9d..d9b2596efa8a 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.3.8
+++ b/metadata/md5-cache/dev-db/mariadb-10.3.8
@@ -12,5 +12,5 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-db/mariadb-10.3.9 b/metadata/md5-cache/dev-db/mariadb-10.3.9
index b3dd67847d54..64e525a56db0 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.3.9
+++ b/metadata/md5-cache/dev-db/mariadb-10.3.9
@@ -12,5 +12,5 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-db/mariadb-5.5.61 b/metadata/md5-cache/dev-db/mariadb-5.5.61
index 801f395328b5..c67d018177ea 100644
--- a/metadata/md5-cache/dev-db/mariadb-5.5.61
+++ b/metadata/md5-cache/dev-db/mariadb-5.5.61
@@ -12,5 +12,5 @@ REQUIRED_USE=server? ( tokudb? ( jemalloc !tcmalloc ) ) ?? ( tcmalloc jemalloc )
 RESTRICT=!bindist? ( bindist ) libressl? ( test )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-5.5.61/source/mariadb-5.5.61.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	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7cd63e96f40d8b26bb5583da1bb2c149
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
index 0835b7d76853..3d64c2c77f43 100644
--- 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
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
index 22e1c04acd18..0969b1effb89 100644
--- 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
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
index 0b25d26bb099..0c93bad4ea16 100644
--- a/metadata/md5-cache/dev-db/mariadb-connector-c-3.0.6
+++ b/metadata/md5-cache/dev-db/mariadb-connector-c-3.0.6
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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-9999 b/metadata/md5-cache/dev-db/mariadb-connector-c-9999
index 0b3ce7caeac7..0b392de658cc 100644
--- a/metadata/md5-cache/dev-db/mariadb-connector-c-9999
+++ b/metadata/md5-cache/dev-db/mariadb-connector-c-9999
@@ -7,5 +7,5 @@ IUSE=+curl gnutls kerberos libressl mysqlcompat +ssl static-libs test abi_x86_32
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-db/mariadb-galera-10.0.35-r1 b/metadata/md5-cache/dev-db/mariadb-galera-10.0.35-r1
index 46262e4a5595..5c1ec398fe8e 100644
--- a/metadata/md5-cache/dev-db/mariadb-galera-10.0.35-r1
+++ b/metadata/md5-cache/dev-db/mariadb-galera-10.0.35-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !
 RESTRICT=!bindist? ( bindist ) libressl? ( test )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-galera-10.0.35/source/mariadb-galera-10.0.35.tar.gz mirror://gentoo/mysql-extras-20180515-1334Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20180515-1334Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20180515-1334Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20180515-1334Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20180515-1334Z.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	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a3b37a67d1e88573de13a40bafdcd26d
diff --git a/metadata/md5-cache/dev-db/mycli-1.15.0-r2 b/metadata/md5-cache/dev-db/mycli-1.15.0-r2
index e11466f38a90..7eb27aa3ab9c 100644
--- a/metadata/md5-cache/dev-db/mycli-1.15.0-r2
+++ b/metadata/md5-cache/dev-db/mycli-1.15.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/cli_helpers-1.0.1[python_targets_python2_7(-)?,python_targe
 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/dbcli/mycli/archive/v1.15.0.tar.gz -> mycli-1.15.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2f45ce3f7a50fa0f816508c61bdf1c91
diff --git a/metadata/md5-cache/dev-db/mydumper-0.9.3-r1 b/metadata/md5-cache/dev-db/mydumper-0.9.3-r1
index 3115d60b4ef5..87d51061f48d 100644
--- a/metadata/md5-cache/dev-db/mydumper-0.9.3-r1
+++ b/metadata/md5-cache/dev-db/mydumper-0.9.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/glib:= dev-libs/libpcre:= dev-libs/openssl:= sys-libs/zlib:= virtual/mysql
 SLOT=0
 SRC_URI=https://github.com/maxbube/mydumper/archive/v0.9.3.tar.gz -> mydumper-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5459ed584a8aed4e67c3da0adbfe0fa9
diff --git a/metadata/md5-cache/dev-db/mydumper-0.9.5 b/metadata/md5-cache/dev-db/mydumper-0.9.5
index d713cd1bfde3..4dd4de629ff7 100644
--- a/metadata/md5-cache/dev-db/mydumper-0.9.5
+++ b/metadata/md5-cache/dev-db/mydumper-0.9.5
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/glib:= dev-libs/libpcre:= dev-libs/openssl:= sys-libs/zlib:= virtual/mysql
 SLOT=0
 SRC_URI=https://github.com/maxbube/mydumper/archive/v0.9.5.tar.gz -> mydumper-0.9.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=5a0fb45cc51a60aa399539602f4325ee
diff --git a/metadata/md5-cache/dev-db/mydumper-0.9.5-r1 b/metadata/md5-cache/dev-db/mydumper-0.9.5-r1
new file mode 100644
index 000000000000..78c2d1babd8d
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mydumper-0.9.5-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-db/mysql-connector-c:= dev-libs/glib:= dev-libs/libpcre:= dev-libs/openssl:= sys-libs/zlib:= virtual/pkgconfig doc? ( dev-python/sphinx ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A high-performance multi-threaded backup (and restore) toolset for MySQL
+EAPI=6
+HOMEPAGE=https://github.com/maxbube/mydumper
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-db/mysql-connector-c:= dev-libs/glib:= dev-libs/libpcre:= dev-libs/openssl:= sys-libs/zlib:=
+SLOT=0
+SRC_URI=https://github.com/maxbube/mydumper/archive/v0.9.5.tar.gz -> mydumper-0.9.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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=fe66201849d1f90b1fdec148768817ee
diff --git a/metadata/md5-cache/dev-db/myodbc-5.2.7-r1 b/metadata/md5-cache/dev-db/myodbc-5.2.7-r1
index 1a2e283c3700..d9f8bf4fe1fb 100644
--- a/metadata/md5-cache/dev-db/myodbc-5.2.7-r1
+++ b/metadata/md5-cache/dev-db/myodbc-5.2.7-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
index 6b443c1b85d8..1d7b9c36b153 100644
--- a/metadata/md5-cache/dev-db/myodbc-5.2.7-r3
+++ b/metadata/md5-cache/dev-db/myodbc-5.2.7-r3
@@ -10,5 +10,5 @@ RDEPEND=dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n
 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	89bb9f083a2590d9b447fd0b78a96186
+_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 913d0e1887af..4841d7244314 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6a8c490ff61251092aea2fff5cfd5a95
diff --git a/metadata/md5-cache/dev-db/mysql-5.5.61 b/metadata/md5-cache/dev-db/mysql-5.5.61
index 3234f1138eef..63d5def6b97f 100644
--- a/metadata/md5-cache/dev-db/mysql-5.5.61
+++ b/metadata/md5-cache/dev-db/mysql-5.5.61
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) static? ( yassl )
 RESTRICT=!bindist? ( bindist ) libressl? ( test )
 SLOT=0/18
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-5.5/mysql-5.5.61.tar.gz https://downloads.mysql.com/archives/MySQL-5.5/mysql-5.5.61.tar.gz mirror://gentoo/mysql-extras-20180804-2323Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20180804-2323Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20180804-2323Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20180804-2323Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20180804-2323Z.tar.bz2
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bd22ecac4e3402af71617494b8c7b2f0
diff --git a/metadata/md5-cache/dev-db/mysql-5.6.40-r2 b/metadata/md5-cache/dev-db/mysql-5.6.40-r2
index 92949c89ea92..2dbe359ad3f5 100644
--- a/metadata/md5-cache/dev-db/mysql-5.6.40-r2
+++ b/metadata/md5-cache/dev-db/mysql-5.6.40-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) static? ( yassl )
 RESTRICT=libressl? ( test )
 SLOT=0/18
 SRC_URI=http://cdn.mysql.com/Downloads/MySQL-5.6/mysql-5.6.40.tar.gz https://cdn.mysql.com/archives/mysql-5.6/mysql-5.6.40.tar.gz http://downloads.mysql.com/archives/MySQL-5.6/mysql-5.6.40.tar.gz mirror://gentoo/mysql-extras-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	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9ee9516870b780db21490a4430da175b
diff --git a/metadata/md5-cache/dev-db/mysql-5.6.41 b/metadata/md5-cache/dev-db/mysql-5.6.41
index 11856d2e4a16..156459536551 100644
--- a/metadata/md5-cache/dev-db/mysql-5.6.41
+++ b/metadata/md5-cache/dev-db/mysql-5.6.41
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) static? ( yassl )
 RESTRICT=libressl? ( test )
 SLOT=0/18
 SRC_URI=http://cdn.mysql.com/Downloads/MySQL-5.6/mysql-5.6.41.tar.gz https://cdn.mysql.com/archives/mysql-5.6/mysql-5.6.41.tar.gz http://downloads.mysql.com/archives/MySQL-5.6/mysql-5.6.41.tar.gz mirror://gentoo/mysql-extras-20180804-2323Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20180804-2323Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20180804-2323Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20180804-2323Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20180804-2323Z.tar.bz2
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=806f7a84ef6dd5b4098bb6863f8d93e8
diff --git a/metadata/md5-cache/dev-db/mysql-5.7.23 b/metadata/md5-cache/dev-db/mysql-5.7.23
index 76cce01975d2..60469b00ccd9 100644
--- a/metadata/md5-cache/dev-db/mysql-5.7.23
+++ b/metadata/md5-cache/dev-db/mysql-5.7.23
@@ -12,5 +12,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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-cluster-7.2.31 b/metadata/md5-cache/dev-db/mysql-cluster-7.2.31
index db8f87ddc9db..0a49d3d29ea6 100644
--- a/metadata/md5-cache/dev-db/mysql-cluster-7.2.31
+++ b/metadata/md5-cache/dev-db/mysql-cluster-7.2.31
@@ -12,5 +12,5 @@ REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) minimal? ( !cluster
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=http://downloads.mysql.com/archives/mysql-cluster-gpl-7.2/mysql-cluster-gpl-7.2.31.tar.gz https://downloads.skysql.com/files/mysql-cluster-gpl-7.2/mysql-cluster-gpl-7.2.31.tar.gz mirror://mysql/Downloads/MySQL-Cluster-7.2/mysql-cluster-gpl-7.2.31.tar.gz mirror://gentoo/mysql-extras-20171108-2050Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20171108-2050Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20171108-2050Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20171108-2050Z.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	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	mysql-cmake	39849cc54381eee7c8d7333058ea7132	mysql-v2	354ddf6fb693d8bd734d7561ea03fefe	mysql_fx	fd803e05287868299aac78823b68920e	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	mysql-cmake	39849cc54381eee7c8d7333058ea7132	mysql-v2	354ddf6fb693d8bd734d7561ea03fefe	mysql_fx	fd803e05287868299aac78823b68920e	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=034d6b5cf66d009f3bb014418886b259
diff --git a/metadata/md5-cache/dev-db/mysql-cluster-7.3.19 b/metadata/md5-cache/dev-db/mysql-cluster-7.3.19
index d9f4a7a86040..fd0093ee6c59 100644
--- a/metadata/md5-cache/dev-db/mysql-cluster-7.3.19
+++ b/metadata/md5-cache/dev-db/mysql-cluster-7.3.19
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( yassl openssl libressl ) !server? ( !extraengine !embedded ) ?
 RESTRICT=libressl? ( test )
 SLOT=0/18
 SRC_URI=http://cdn.mysql.com/Downloads/MySQL-Cluster-7.3/mysql-cluster-gpl-7.3.19.tar.gz http://downloads.mysql.com/archives/MySQL-Cluster-7.3/mysql-cluster-gpl-7.3.19.tar.gz mirror://gentoo/mysql-extras-20171121-1518Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20171121-1518Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20171121-1518Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20171121-1518Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20171121-1518Z.tar.bz2
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	mysql-multilib-r1	43e11ab205efba6b5167c71d37077d9d	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	mysql-multilib-r1	43e11ab205efba6b5167c71d37077d9d	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b4f6aaa3b031a4e298ccc2fc8d8c3905
diff --git a/metadata/md5-cache/dev-db/mysql-cluster-7.4.17 b/metadata/md5-cache/dev-db/mysql-cluster-7.4.17
index 7c65ac7ab686..3eddd1b6c66a 100644
--- a/metadata/md5-cache/dev-db/mysql-cluster-7.4.17
+++ b/metadata/md5-cache/dev-db/mysql-cluster-7.4.17
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( yassl openssl libressl ) !server? ( !extraengine !embedded ) ?
 RESTRICT=libressl? ( test )
 SLOT=0/18
 SRC_URI=http://cdn.mysql.com/Downloads/MySQL-Cluster-7.4/mysql-cluster-gpl-7.4.17.tar.gz http://downloads.mysql.com/archives/MySQL-Cluster-7.4/mysql-cluster-gpl-7.4.17.tar.gz mirror://gentoo/mysql-extras-20171121-1518Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20171121-1518Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20171121-1518Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20171121-1518Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20171121-1518Z.tar.bz2
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	mysql-multilib-r1	43e11ab205efba6b5167c71d37077d9d	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	mysql-multilib-r1	43e11ab205efba6b5167c71d37077d9d	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b4f6aaa3b031a4e298ccc2fc8d8c3905
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.9 b/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.9
index 7dace5cdf442..aed7c6cc6299 100644
--- a/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.9
+++ b/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libmysqlclient:= dev-libs/boost:= dev-libs/openssl:0= !<dev-db/mysql-connector-c-6.1.8
 SLOT=0
 SRC_URI=https://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-1.1.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5dd36226d859d3230bdfbd3dd07a0887
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.11 b/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.11
index 8d3e634110dd..1fd5cae24a46 100644
--- a/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.11
+++ b/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.11
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/openssl:0= dev-libs/protobuf:= legacy? ( dev-libs/boost:= >=dev-db/mysql-connector-c-6.1.8:= )
 SLOT=0
 SRC_URI=https://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-8.0.11-src.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=76fae047aa2f74bc74977c96ebab9d5f
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 757577853107..8d437e627c91 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=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 16b717f77ff6..f9d90cddd804 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d25cc4d6efc93576090b810a6d74e0e7
diff --git a/metadata/md5-cache/dev-db/mysql-workbench-6.3.10 b/metadata/md5-cache/dev-db/mysql-workbench-6.3.10
index 261b10935109..3eaad6a657e2 100644
--- a/metadata/md5-cache/dev-db/mysql-workbench-6.3.10
+++ b/metadata/md5-cache/dev-db/mysql-workbench-6.3.10
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=d
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://mysql/Downloads/MySQLGUITools/mysql-workbench-community-6.3.10-src.tar.gz https://github.com/antlr/website-antlr3/blob/gh-pages/download/antlr-3.4-complete.jar?raw=true -> antlr-3.4-complete.jar
-_eclasses_=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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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	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_=89521c47e5d77d026c85c90f5e378907
diff --git a/metadata/md5-cache/dev-db/mysql-workbench-6.3.4-r1 b/metadata/md5-cache/dev-db/mysql-workbench-6.3.4-r1
index 2743ebb85a65..1b55b5759a3a 100644
--- a/metadata/md5-cache/dev-db/mysql-workbench-6.3.4-r1
+++ b/metadata/md5-cache/dev-db/mysql-workbench-6.3.4-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=d
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://mysql/Downloads/MySQLGUITools/mysql-workbench-community-6.3.4-src.tar.gz https://github.com/antlr/website-antlr3/blob/gh-pages/download/antlr-3.4-complete.jar?raw=true -> antlr-3.4-complete.jar
-_eclasses_=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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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	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_=ca05143a23b904a79c4babd4113bfc5a
diff --git a/metadata/md5-cache/dev-db/mysql-workbench-6.3.4-r2 b/metadata/md5-cache/dev-db/mysql-workbench-6.3.4-r2
index ec87690e80e2..55ffdee3e29f 100644
--- a/metadata/md5-cache/dev-db/mysql-workbench-6.3.4-r2
+++ b/metadata/md5-cache/dev-db/mysql-workbench-6.3.4-r2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=d
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://mysql/Downloads/MySQLGUITools/mysql-workbench-community-6.3.4-src.tar.gz
-_eclasses_=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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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	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_=01170d073c1cfd0c93875cdb496e8ed1
diff --git a/metadata/md5-cache/dev-db/mysql-workbench-6.3.9 b/metadata/md5-cache/dev-db/mysql-workbench-6.3.9
index 1989c9a330b2..69eef3a5bf19 100644
--- a/metadata/md5-cache/dev-db/mysql-workbench-6.3.9
+++ b/metadata/md5-cache/dev-db/mysql-workbench-6.3.9
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=d
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://mysql/Downloads/MySQLGUITools/mysql-workbench-community-6.3.9-src.tar.gz https://github.com/antlr/website-antlr3/blob/gh-pages/download/antlr-3.4-complete.jar?raw=true -> antlr-3.4-complete.jar
-_eclasses_=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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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	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_=f809419857ab5f2c5141b3ec1412b23b
diff --git a/metadata/md5-cache/dev-db/percona-server-5.6.40.84.0 b/metadata/md5-cache/dev-db/percona-server-5.6.40.84.0
index a6e185ee3a56..23ae16bff7bf 100644
--- a/metadata/md5-cache/dev-db/percona-server-5.6.40.84.0
+++ b/metadata/md5-cache/dev-db/percona-server-5.6.40.84.0
@@ -12,5 +12,5 @@ REQUIRED_USE=tokudb-backup-plugin? ( tokudb ) tokudb? ( jemalloc !tcmalloc ) ??
 RESTRICT=libressl? ( test )
 SLOT=0/18
 SRC_URI=https://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-5.6.40-84.0/source/tarball/percona-server-5.6.40-84.0.tar.gz mirror://gentoo/mysql-extras-20180628-0201Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20180628-0201Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20180628-0201Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20180628-0201Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20180628-0201Z.tar.bz2
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e426fea7aa269a1823a69315cb8d175a
diff --git a/metadata/md5-cache/dev-db/percona-server-5.6.41.84.1 b/metadata/md5-cache/dev-db/percona-server-5.6.41.84.1
index 42b51b378e95..f632f0c40ef2 100644
--- a/metadata/md5-cache/dev-db/percona-server-5.6.41.84.1
+++ b/metadata/md5-cache/dev-db/percona-server-5.6.41.84.1
@@ -12,5 +12,5 @@ REQUIRED_USE=tokudb-backup-plugin? ( tokudb ) tokudb? ( jemalloc !tcmalloc ) ??
 RESTRICT=libressl? ( test ) !test? ( test )
 SLOT=0/18
 SRC_URI=https://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-5.6.41-84.1/source/tarball/percona-server-5.6.41-84.1.tar.gz mirror://gentoo/mysql-extras-20180628-0201Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20180628-0201Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20180628-0201Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20180628-0201Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20180628-0201Z.tar.bz2
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7b2fda4330c2992838ea37c4a249f72b
diff --git a/metadata/md5-cache/dev-db/percona-toolkit-3.0.12 b/metadata/md5-cache/dev-db/percona-toolkit-3.0.12
new file mode 100644
index 000000000000..7842ac223b8a
--- /dev/null
+++ b/metadata/md5-cache/dev-db/percona-toolkit-3.0.12
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/DBI dev-perl/DBD-mysql virtual/perl-Time-HiRes virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
+DESCRIPTION=Advanced command-line tools to perform a variety of MySQL and system tasks
+EAPI=6
+HOMEPAGE=https://www.percona.com/software/mysql-tools/percona-toolkit
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( GPL-2 Artistic )
+RDEPEND=dev-perl/DBI dev-perl/DBD-mysql virtual/perl-Time-HiRes dev-perl/JSON dev-perl/libwww-perl dev-perl/Role-Tiny virtual/perl-File-Path virtual/perl-Getopt-Long virtual/perl-Time-Local virtual/perl-Digest-MD5 virtual/perl-IO-Compress virtual/perl-File-Temp virtual/perl-File-Spec virtual/perl-Scalar-List-Utils dev-perl/TermReadKey dev-lang/perl:=
+SLOT=0
+SRC_URI=https://www.percona.com/downloads/percona-toolkit/3.0.12/source/tarball/percona-toolkit-3.0.12.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
+_md5_=f1027674d0dc6eedae7a749c3f6de62f
diff --git a/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.10 b/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.10
index eec3c60d5314..3a46cab67194 100644
--- a/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.10
+++ b/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.10
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/lz4:0= app-editors/vim-core <dev-libs/boost-1.65.0:= dev-libs/libaio <dev-libs/libedit-20170329.3.1 dev-libs/libev dev-libs/libevent:0= dev-libs/libgcrypt:0= dev-libs/libgpg-error dev-python/sphinx net-misc/curl sys-libs/zlib:= !dev-db/xtrabackup-bin dev-perl/DBD-mysql
 SLOT=0
 SRC_URI=https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-2.4.10/source/tarball/percona-xtrabackup-2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2168719343ce5f734f58a300e99891bb
diff --git a/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.11 b/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.11
index c8a96958cab6..faf7f9e46a16 100644
--- a/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.11
+++ b/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.11
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/lz4:0= app-editors/vim-core <dev-libs/boost-1.65.0:= dev-libs/libaio <dev-libs/libedit-20170329.3.1 dev-libs/libev dev-libs/libevent:0= dev-libs/libgcrypt:0= dev-libs/libgpg-error dev-python/sphinx net-misc/curl sys-libs/zlib:= !dev-db/xtrabackup-bin dev-perl/DBD-mysql
 SLOT=0
 SRC_URI=https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-2.4.11/source/tarball/percona-xtrabackup-2.4.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=26fa56202f8d3baf9701c9fafeae7f4b
diff --git a/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.12 b/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.12
index 242108663132..b73b9e2b7a02 100644
--- a/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.12
+++ b/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.12
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/lz4:0= app-editors/vim-core <dev-libs/boost-1.65.0:= dev-libs/libaio <dev-libs/libedit-20170329.3.1 dev-libs/libev dev-libs/libevent:0= dev-libs/libgcrypt:0= dev-libs/libgpg-error dev-python/sphinx net-misc/curl sys-libs/zlib:= !dev-db/xtrabackup-bin dev-perl/DBD-mysql
 SLOT=0
 SRC_URI=https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-2.4.12/source/tarball/percona-xtrabackup-2.4.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=26fa56202f8d3baf9701c9fafeae7f4b
diff --git a/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.9 b/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.9
index 72ef8d72dc44..cb158935b949 100644
--- a/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.9
+++ b/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.9
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/lz4:0= app-editors/vim-core <dev-libs/boost-1.65.0:= dev-libs/libaio <dev-libs/libedit-20170329.3.1 dev-libs/libev dev-libs/libevent:0= dev-libs/libgcrypt:0= dev-libs/libgpg-error dev-python/sphinx net-misc/curl sys-libs/zlib !dev-db/xtrabackup-bin dev-perl/DBD-mysql
 SLOT=0
 SRC_URI=https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-2.4.9/source/tarball/percona-xtrabackup-2.4.9.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bcdeead9783a1bc580037c06a3a45324
diff --git a/metadata/md5-cache/dev-db/pg_activity-1.2.0 b/metadata/md5-cache/dev-db/pg_activity-1.2.0
index a013ef7128f8..08232be27ba8 100644
--- a/metadata/md5-cache/dev-db/pg_activity-1.2.0
+++ b/metadata/md5-cache/dev-db/pg_activity-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/julmon/pg_activity/archive/v1.2.0.tar.gz -> pg_activity-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2b4affcf624ed4a7fbc4f74a05b8ca55
diff --git a/metadata/md5-cache/dev-db/pgadmin4-3.3 b/metadata/md5-cache/dev-db/pgadmin4-3.3
new file mode 100644
index 000000000000..c3ab5b5f9f02
--- /dev/null
+++ b/metadata/md5-cache/dev-db/pgadmin4-3.3
@@ -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/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/pgagent-3.4.0-r3 b/metadata/md5-cache/dev-db/pgagent-3.4.0-r3
index fa2478e1cd69..f3f655276fa7 100644
--- a/metadata/md5-cache/dev-db/pgagent-3.4.0-r3
+++ b/metadata/md5-cache/dev-db/pgagent-3.4.0-r3
@@ -8,5 +8,5 @@ LICENSE=POSTGRESQL GPL-2
 RDEPEND=dev-db/postgresql:* x11-libs/wxGTK:3.0
 SLOT=0
 SRC_URI=mirror://postgresql/pgadmin3/release/pgagent/pgAgent-3.4.0-Source.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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3ca0791c9d8a8426761fb89dc99fea9b
diff --git a/metadata/md5-cache/dev-db/pgbouncer-1.8.1 b/metadata/md5-cache/dev-db/pgbouncer-1.8.1
deleted file mode 100644
index 259b39e5f4ce..000000000000
--- a/metadata/md5-cache/dev-db/pgbouncer-1.8.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=>=dev-libs/libevent-2.0 >=sys-libs/glibc-2.10 c-ares? ( >=net-dns/c-ares-1.10 ) ssl? ( >=dev-libs/openssl-1.0.1:=[-bindist] ) udns? ( >=net-libs/udns-0.1 )
-DESCRIPTION=Lightweight connection pooler for PostgreSQL
-EAPI=6
-HOMEPAGE=https://pgbouncer.github.io
-IUSE=+c-ares debug doc pam ssl -udns
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=dev-libs/libevent-2.0 >=sys-libs/glibc-2.10 c-ares? ( >=net-dns/c-ares-1.10 ) ssl? ( >=dev-libs/openssl-1.0.1:=[-bindist] ) udns? ( >=net-libs/udns-0.1 )
-REQUIRED_USE=?? ( c-ares udns )
-SLOT=0
-SRC_URI=https://pgbouncer.github.io/downloads/files/1.8.1/pgbouncer-1.8.1.tar.gz
-_eclasses_=user	8bc2845510e2109af75e3eeac607ec81
-_md5_=82f64d37ddc8e13652b3089389c84c85
diff --git a/metadata/md5-cache/dev-db/pgbouncer-1.9.0 b/metadata/md5-cache/dev-db/pgbouncer-1.9.0
index 9249ba5b9281..a0fb88e0c748 100644
--- a/metadata/md5-cache/dev-db/pgbouncer-1.9.0
+++ b/metadata/md5-cache/dev-db/pgbouncer-1.9.0
@@ -4,11 +4,11 @@ DESCRIPTION=Lightweight connection pooler for PostgreSQL
 EAPI=6
 HOMEPAGE=https://pgbouncer.github.io
 IUSE=+c-ares debug doc pam ssl -udns
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-2.0 >=sys-libs/glibc-2.10 c-ares? ( >=net-dns/c-ares-1.10 ) ssl? ( >=dev-libs/openssl-1.0.1:=[-bindist] ) udns? ( >=net-libs/udns-0.1 )
 REQUIRED_USE=?? ( c-ares udns )
 SLOT=0
 SRC_URI=https://pgbouncer.github.io/downloads/files/1.9.0/pgbouncer-1.9.0.tar.gz
 _eclasses_=user	8bc2845510e2109af75e3eeac607ec81
-_md5_=4bdf8593b23687bbaa50c6f3022181ec
+_md5_=f0ef772cd139dfad82e5548efc5a5630
diff --git a/metadata/md5-cache/dev-db/pgrouting-2.5.2 b/metadata/md5-cache/dev-db/pgrouting-2.5.2
index 7c2bb1356a62..18666d567acd 100644
--- a/metadata/md5-cache/dev-db/pgrouting-2.5.2
+++ b/metadata/md5-cache/dev-db/pgrouting-2.5.2
@@ -11,5 +11,5 @@ REQUIRED_USE=html? ( doc ) pdf? ( doc )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/pgRouting/pgrouting/archive/v2.5.2.tar.gz -> pgrouting-2.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	postgres	1d395ef92a41175c81bf7da2cb7fb8cb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	postgres	1d395ef92a41175c81bf7da2cb7fb8cb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=54f52629a1a1414f0b260eefed9af87d
diff --git a/metadata/md5-cache/dev-db/pgxnclient-1.2-r1 b/metadata/md5-cache/dev-db/pgxnclient-1.2-r1
index 999e8be5e046..7f2b04349712 100644
--- a/metadata/md5-cache/dev-db/pgxnclient-1.2-r1
+++ b/metadata/md5-cache/dev-db/pgxnclient-1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/postgresql-9.1[server] python_targets_python2_7? ( >=dev-lang/p
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pgxnclient/pgxnclient-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b4c1f9a9d1c07b8f68e84789bfe8f53d
diff --git a/metadata/md5-cache/dev-db/pgxnclient-1.2.1 b/metadata/md5-cache/dev-db/pgxnclient-1.2.1
index 71b28d4b7409..04f2b33491c7 100644
--- a/metadata/md5-cache/dev-db/pgxnclient-1.2.1
+++ b/metadata/md5-cache/dev-db/pgxnclient-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/postgresql-9.1[server] python_targets_python2_7? ( >=dev-lang/p
 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/pgxnclient/pgxnclient-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7fd93003e0a26a4f44ccb1b088f3a5a2
diff --git a/metadata/md5-cache/dev-db/postgresql-10.5 b/metadata/md5-cache/dev-db/postgresql-10.5
index 3898d1be1748..ecb69070a853 100644
--- a/metadata/md5-cache/dev-db/postgresql-10.5
+++ b/metadata/md5-cache/dev-db/postgresql-10.5
@@ -10,5 +10,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerbe
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=10
 SRC_URI=mirror://postgresql/source/v10.5/postgresql-10.5.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	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
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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_=91231ec0ab4ab405e334252839f94ec2
diff --git a/metadata/md5-cache/dev-db/postgresql-11_beta3 b/metadata/md5-cache/dev-db/postgresql-11_beta3
index aadc60c19345..4549146331c9 100644
--- a/metadata/md5-cache/dev-db/postgresql-11_beta3
+++ b/metadata/md5-cache/dev-db/postgresql-11_beta3
@@ -10,5 +10,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerbe
 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	915cae3d7d636732918d18827fb1c226	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
+_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
index 3c2eae6c2bb8..171cb9b3f8e9 100644
--- a/metadata/md5-cache/dev-db/postgresql-11_beta4
+++ b/metadata/md5-cache/dev-db/postgresql-11_beta4
@@ -10,5 +10,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerbe
 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	915cae3d7d636732918d18827fb1c226	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
+_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-9.3.24 b/metadata/md5-cache/dev-db/postgresql-9.3.24
index dd268433e0ac..fc83d5b4e916 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.3.24
+++ b/metadata/md5-cache/dev-db/postgresql-9.3.24
@@ -10,5 +10,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerbe
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=9.3
 SRC_URI=mirror://postgresql/source/v9.3.24/postgresql-9.3.24.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	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
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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_=4d6290a256d65d87f457006161579894
diff --git a/metadata/md5-cache/dev-db/postgresql-9.4.19 b/metadata/md5-cache/dev-db/postgresql-9.4.19
index bd87399c12a4..82389f4370a6 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.4.19
+++ b/metadata/md5-cache/dev-db/postgresql-9.4.19
@@ -10,5 +10,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerbe
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=9.4
 SRC_URI=mirror://postgresql/source/v9.4.19/postgresql-9.4.19.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	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
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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_=b2407a41f3f00269f3897617372adbe2
diff --git a/metadata/md5-cache/dev-db/postgresql-9.5.14 b/metadata/md5-cache/dev-db/postgresql-9.5.14
index 3fc4266c2912..b375e282d607 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.5.14
+++ b/metadata/md5-cache/dev-db/postgresql-9.5.14
@@ -10,5 +10,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerbe
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=9.5
 SRC_URI=mirror://postgresql/source/v9.5.14/postgresql-9.5.14.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	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
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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_=43784dd583275cbce52f3f805283d605
diff --git a/metadata/md5-cache/dev-db/postgresql-9.6.10 b/metadata/md5-cache/dev-db/postgresql-9.6.10
index 0837d5a965e5..90aa9385a8d4 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.6.10
+++ b/metadata/md5-cache/dev-db/postgresql-9.6.10
@@ -10,5 +10,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerbe
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=9.6
 SRC_URI=mirror://postgresql/source/v9.6.10/postgresql-9.6.10.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	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
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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_=e08a9acb34aa3bb90c8c28bda1d848bc
diff --git a/metadata/md5-cache/dev-db/postgresql-9999 b/metadata/md5-cache/dev-db/postgresql-9999
index acccfa79e8e8..e69cec679a81 100644
--- a/metadata/md5-cache/dev-db/postgresql-9999
+++ b/metadata/md5-cache/dev-db/postgresql-9999
@@ -8,5 +8,5 @@ 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= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) systemd? ( sys-apps/systemd ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) 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:12 !dev-db/postgresql-base:12 !dev-db/postgresql-server:12 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=12
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	915cae3d7d636732918d18827fb1c226	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
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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_=640a35474c64ddfe93cfecbda56e3aa1
diff --git a/metadata/md5-cache/dev-db/qt5-sqlcipher-1.0.1-r3 b/metadata/md5-cache/dev-db/qt5-sqlcipher-1.0.1-r3
index d37f82b60ca9..987118251951 100644
--- a/metadata/md5-cache/dev-db/qt5-sqlcipher-1.0.1-r3
+++ b/metadata/md5-cache/dev-db/qt5-sqlcipher-1.0.1-r3
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-db/sqlcipher-3.4.1 >=dev-qt/qtcore-5.7.1:5= >=dev-qt/qtsql-5.7.1:5=[sqlite] <dev-qt/qtsql-5.12:5=[sqlite]
 SLOT=0
 SRC_URI=https://github.com/blizzard4591/qt5-sqlcipher/archive/1.0.1.tar.gz -> qt5-sqlcipher-1.0.1.tar.gz https://dev.gentoo.org/~ulm/distfiles/qt5-sqlcipher-1.0.1-qt-5.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9861995a79cf302debbdb5c9038d9ddd
diff --git a/metadata/md5-cache/dev-db/sadisplay-0.4.8 b/metadata/md5-cache/dev-db/sadisplay-0.4.8
index 8f960a4d76c5..39ab8979d004 100644
--- a/metadata/md5-cache/dev-db/sadisplay-0.4.8
+++ b/metadata/md5-cache/dev-db/sadisplay-0.4.8
@@ -10,5 +10,5 @@ RDEPEND=dev-python/sqlalchemy[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
 SRC_URI=https://bitbucket.org/estin/sadisplay/get/d67d12894ebd.tar.gz -> sadisplay-0.4.8.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=66822bcc5e4d8ec58cce7efe9e81841e
diff --git a/metadata/md5-cache/dev-db/soci-3.2.3 b/metadata/md5-cache/dev-db/soci-3.2.3
index d92c50cb7fb6..f409c7cd5315 100644
--- a/metadata/md5-cache/dev-db/soci-3.2.3
+++ b/metadata/md5-cache/dev-db/soci-3.2.3
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=firebird? ( dev-db/firebird ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
 SLOT=0
 SRC_URI=mirror://sourceforge/soci/soci-3.2.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9e707d8c6fc431bcc39f50f1c354b115
diff --git a/metadata/md5-cache/dev-db/sqlite-3.25.2 b/metadata/md5-cache/dev-db/sqlite-3.25.2
new file mode 100644
index 000000000000..b2573b5218b5
--- /dev/null
+++ b/metadata/md5-cache/dev-db/sqlite-3.25.2
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( app-arch/unzip ) tcl? ( app-arch/unzip >=dev-lang/tcl-8.6:0 ) test? ( app-arch/unzip >=dev-lang/tcl-8.6:0 ) tools? ( app-arch/unzip >=dev-lang/tcl-8.6: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
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( >=dev-lang/tcl-8.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(-)?] )
+DESCRIPTION=SQL database engine
+EAPI=7
+HOMEPAGE=https://sqlite.org/
+IUSE=debug doc icu +readline secure-delete static-libs tcl test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=public-domain
+RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
+SLOT=3
+SRC_URI=doc? ( https://sqlite.org/2018/sqlite-doc-3250200.zip ) tcl? ( https://sqlite.org/2018/sqlite-src-3250200.zip ) test? ( https://sqlite.org/2018/sqlite-src-3250200.zip ) tools? ( https://sqlite.org/2018/sqlite-src-3250200.zip ) !tcl? ( !test? ( !tools? ( https://sqlite.org/2018/sqlite-autoconf-3250200.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_=95eb5fb89629eb0832ab5fde09e958b5
diff --git a/metadata/md5-cache/dev-db/sqlitebrowser-3.10.1 b/metadata/md5-cache/dev-db/sqlitebrowser-3.10.1
index 35181694289a..83df7a296db1 100644
--- a/metadata/md5-cache/dev-db/sqlitebrowser-3.10.1
+++ b/metadata/md5-cache/dev-db/sqlitebrowser-3.10.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3 MPL-2.0
 RDEPEND=dev-cpp/antlr-cpp:2 dev-db/sqlite:3 >=dev-libs/qcustomplot-2.0.0[qt5(+)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
 SLOT=0
 SRC_URI=https://github.com/sqlitebrowser/sqlitebrowser/archive/v3.10.1.tar.gz -> sqlitebrowser-3.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=07b75203ff8cba04d651eb45b6d59ba8
diff --git a/metadata/md5-cache/dev-db/sqlitebrowser-3.9.1-r1 b/metadata/md5-cache/dev-db/sqlitebrowser-3.9.1-r1
index b5c5793a7818..962859d86926 100644
--- a/metadata/md5-cache/dev-db/sqlitebrowser-3.9.1-r1
+++ b/metadata/md5-cache/dev-db/sqlitebrowser-3.9.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3 MPL-2.0
 RDEPEND=dev-cpp/antlr-cpp:2 dev-db/sqlite:3 dev-libs/qcustomplot[qt5(+)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=x11-libs/qscintilla-2.9.3-r2:=[qt5(+)]
 SLOT=0
 SRC_URI=https://github.com/sqlitebrowser/sqlitebrowser/archive/v3.9.1.tar.gz -> sqlitebrowser-3.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=39bc90376145044b227fef2dde4379e5
diff --git a/metadata/md5-cache/dev-db/sqliteman-1.2.2-r4 b/metadata/md5-cache/dev-db/sqliteman-1.2.2-r4
index 29834fe6192a..91955fcecac3 100644
--- a/metadata/md5-cache/dev-db/sqliteman-1.2.2-r4
+++ b/metadata/md5-cache/dev-db/sqliteman-1.2.2-r4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5[sqlite] >=dev-qt/qtwidgets-5.7.1:5 >=x11-libs/qscintilla-2.9.4:=[qt5(+)]
 SLOT=0
 SRC_URI=mirror://sourceforge/sqliteman/sqliteman-1.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=fde3bfa7961308ec299762a190e25250
diff --git a/metadata/md5-cache/dev-db/sqlitestudio-3.1.1 b/metadata/md5-cache/dev-db/sqlitestudio-3.1.1
index fd9e800637d7..01cdaf105ec1 100644
--- a/metadata/md5-cache/dev-db/sqlitestudio-3.1.1
+++ b/metadata/md5-cache/dev-db/sqlitestudio-3.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-db/sqlite:3 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 cli? ( sys-libs/readline:* ) cups? ( dev-qt/qtprintsupport:5 ) tcl? ( dev-lang/tcl:* )
 SLOT=0
 SRC_URI=https://sqlitestudio.pl/files/sqlitestudio3/complete/tar/sqlitestudio-3.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c4560010f4c0972bab444a03966d4cc4
diff --git a/metadata/md5-cache/dev-db/tokumx-1.5.0-r2 b/metadata/md5-cache/dev-db/tokumx-1.5.0-r2
index 52a4f7d882e1..36c7d0f575cb 100644
--- a/metadata/md5-cache/dev-db/tokumx-1.5.0-r2
+++ b/metadata/md5-cache/dev-db/tokumx-1.5.0-r2
@@ -10,5 +10,5 @@ RDEPEND=!dev-db/mongodb python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gentoo/tokumx-git-tag-1.5.0.tar.bz2
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9bcde1b23dec61f2e7ddfdecbcbe4539
diff --git a/metadata/md5-cache/dev-db/tokumx-2.0.2-r2 b/metadata/md5-cache/dev-db/tokumx-2.0.2-r2
index db35f16cb674..c8a188592b8b 100644
--- a/metadata/md5-cache/dev-db/tokumx-2.0.2-r2
+++ b/metadata/md5-cache/dev-db/tokumx-2.0.2-r2
@@ -10,5 +10,5 @@ RDEPEND=!app-admin/mongo-tools !dev-db/mongodb !dev-libs/mongo-cxx-driver python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://www.percona.com/downloads/percona-tokumx/tokumx-enterprise-2.0.2/source/tarball/tokumx-enterprise-2.0.2.tar.gz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3a3cfd6de9bc2f667117fd3c054d61a0
diff --git a/metadata/md5-cache/dev-db/tora-3.2-r1 b/metadata/md5-cache/dev-db/tora-3.2-r1
index eb501795c1e1..e99c14895c7a 100644
--- a/metadata/md5-cache/dev-db/tora-3.2-r1
+++ b/metadata/md5-cache/dev-db/tora-3.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/ferrisloki dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 de
 REQUIRED_USE=|| ( mysql oracle postgres )
 SLOT=0
 SRC_URI=https://github.com/tora-tool/tora/archive/v3.2.tar.gz -> tora-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=ca337005d021bde3d800a62a448b4947
diff --git a/metadata/md5-cache/dev-db/tora-9999 b/metadata/md5-cache/dev-db/tora-9999
index 043d13e22c84..6839419080cd 100644
--- a/metadata/md5-cache/dev-db/tora-9999
+++ b/metadata/md5-cache/dev-db/tora-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/ferrisloki dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5[mysql?,postgres?] dev-qt/qtwidgets:5 >=x11-libs/qscintilla-2.10.1:=[qt5(+)] oracle? ( || ( =dev-db/oracle-instantclient-basic-11* dev-db/oracle-instantclient ) ) postgres? ( dev-db/postgresql:* )
 REQUIRED_USE=|| ( mysql oracle postgres )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c9b53e6e80a1ede6463f2c06fa1b8b0f
diff --git a/metadata/md5-cache/dev-dotnet/Manifest.gz b/metadata/md5-cache/dev-dotnet/Manifest.gz
index b32f3397863a..83354576c985 100644
--- a/metadata/md5-cache/dev-dotnet/Manifest.gz
+++ b/metadata/md5-cache/dev-dotnet/Manifest.gz
diff --git a/metadata/md5-cache/dev-dotnet/pe-format-2.1.2-r1 b/metadata/md5-cache/dev-dotnet/pe-format-2.1.2-r1
index cd64e38aabfe..55e7dccf1dc1 100644
--- a/metadata/md5-cache/dev-dotnet/pe-format-2.1.2-r1
+++ b/metadata/md5-cache/dev-dotnet/pe-format-2.1.2-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!<sys-apps/openrc-0.9.4
 SLOT=0
 SRC_URI=https://www.bitbucket.org/mgorny/pe-format2/downloads/pe-format-2.1.2.tar.bz2
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5dfb65489415b2c03d68e5f56a2e4baa
diff --git a/metadata/md5-cache/dev-dotnet/pe-format-9999 b/metadata/md5-cache/dev-dotnet/pe-format-9999
index f68d6427330b..286adb553b97 100644
--- a/metadata/md5-cache/dev-dotnet/pe-format-9999
+++ b/metadata/md5-cache/dev-dotnet/pe-format-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://bitbucket.org/mgorny/pe-format2/
 LICENSE=GPL-2
 RDEPEND=!<sys-apps/openrc-0.9.4
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bc91679c184eef7972f9b29ca152de15
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index 034fc657ecba..ac7b53c82271 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 6315b77795f3..191fed9ef501 100644
--- a/metadata/md5-cache/dev-embedded/arduino-1.8.5-r2
+++ b/metadata/md5-cache/dev-embedded/arduino-1.8.5-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-embedded/arduino-builder >=dev-util/astyle-3.1[java] dev-embedded/ar
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-embedded/bitbake-1.17.0 b/metadata/md5-cache/dev-embedded/bitbake-1.17.0
index a06595e0ef74..90586cf7380c 100644
--- a/metadata/md5-cache/dev-embedded/bitbake-1.17.0
+++ b/metadata/md5-cache/dev-embedded/bitbake-1.17.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/ply[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/openembedded/bitbake/archive/1.17.0.tar.gz -> bitbake-1.17.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cdbf53f912c60aac1ebb8ee867f83609
diff --git a/metadata/md5-cache/dev-embedded/bitbake-9999 b/metadata/md5-cache/dev-embedded/bitbake-9999
index 00a505a9c04d..45355ce18740 100644
--- a/metadata/md5-cache/dev-embedded/bitbake-9999
+++ b/metadata/md5-cache/dev-embedded/bitbake-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-python/ply[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/progressbar[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
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f93b67c297b5fdcd3b15792b6fe768e1
diff --git a/metadata/md5-cache/dev-embedded/esptool-2.1 b/metadata/md5-cache/dev-embedded/esptool-2.1
index a95843c301a4..ccf546c84856 100644
--- a/metadata/md5-cache/dev-embedded/esptool-2.1
+++ b/metadata/md5-cache/dev-embedded/esptool-2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/e/esptool/esptool-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d6258afcaa17999f922c7af60a48cd35
diff --git a/metadata/md5-cache/dev-embedded/esptool-2.2 b/metadata/md5-cache/dev-embedded/esptool-2.2
index 346a0cafba67..cfb4efe60a03 100644
--- a/metadata/md5-cache/dev-embedded/esptool-2.2
+++ b/metadata/md5-cache/dev-embedded/esptool-2.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/e/esptool/esptool-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9d4a24e8f2e8bb78a611a1c543b2195d
diff --git a/metadata/md5-cache/dev-embedded/esptool-2.3.1 b/metadata/md5-cache/dev-embedded/esptool-2.3.1
index a15ed8005774..c82db32ab153 100644
--- a/metadata/md5-cache/dev-embedded/esptool-2.3.1
+++ b/metadata/md5-cache/dev-embedded/esptool-2.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/e/esptool/esptool-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8b219ad5f85fc7aaa9ed72152bea307a
diff --git a/metadata/md5-cache/dev-embedded/gnome-avrdude-0.1 b/metadata/md5-cache/dev-embedded/gnome-avrdude-0.1
index 9262385d67da..c674cd6f7260 100644
--- a/metadata/md5-cache/dev-embedded/gnome-avrdude-0.1
+++ b/metadata/md5-cache/dev-embedded/gnome-avrdude-0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2 x11-libs/gtk+:2 gnome-base/gconf gnome-base/libgnome gnome-base/libgnomeui gnome-base/libglade x11-libs/pango dev-embedded/avrdude
 SLOT=0
 SRC_URI=mirror://sourceforge/gnome-avrdude/gnome-avrdude-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=061a4105d6c1b7a58b899b2be5d14543
diff --git a/metadata/md5-cache/dev-embedded/libftdi-0.20-r1 b/metadata/md5-cache/dev-embedded/libftdi-0.20-r1
index 9b5f557b86e0..961dbf2009a9 100644
--- a/metadata/md5-cache/dev-embedded/libftdi-0.20-r1
+++ b/metadata/md5-cache/dev-embedded/libftdi-0.20-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/libusb:0 cxx? ( dev-libs/boost ) python? ( python_single_target_
 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=http://www.intra2net.com/en/developer/libftdi/download/libftdi-0.20.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c106f917b67056c63fb850cb966447fb
diff --git a/metadata/md5-cache/dev-embedded/libftdi-1.2-r1 b/metadata/md5-cache/dev-embedded/libftdi-1.2-r1
index 7bc7c079df6a..e2a827138347 100644
--- a/metadata/md5-cache/dev-embedded/libftdi-1.2-r1
+++ b/metadata/md5-cache/dev-embedded/libftdi-1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( python_single_target_
 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=1
 SRC_URI=http://www.intra2net.com/en/developer/libftdi/download/libftdi1-1.2.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=04fa923bd2a0a86cd05562bcafad6561
diff --git a/metadata/md5-cache/dev-embedded/libftdi-1.2-r2 b/metadata/md5-cache/dev-embedded/libftdi-1.2-r2
index 1fbfd3c3f2a7..dc08724986b7 100644
--- a/metadata/md5-cache/dev-embedded/libftdi-1.2-r2
+++ b/metadata/md5-cache/dev-embedded/libftdi-1.2-r2
@@ -10,5 +10,5 @@ RDEPEND=virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( python_single_target_
 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=1
 SRC_URI=http://www.intra2net.com/en/developer/libftdi/download/libftdi1-1.2.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=89093bc8f7abd5f2456a059e8acf552b
diff --git a/metadata/md5-cache/dev-embedded/libftdi-1.4 b/metadata/md5-cache/dev-embedded/libftdi-1.4
index ebd1a1c23250..bb6693090ffd 100644
--- a/metadata/md5-cache/dev-embedded/libftdi-1.4
+++ b/metadata/md5-cache/dev-embedded/libftdi-1.4
@@ -10,5 +10,5 @@ RDEPEND=virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( python_single_target_
 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=1
 SRC_URI=http://www.intra2net.com/en/developer/libftdi/download/libftdi1-1.4.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=9c1915a029c9620d47b86476f55fe1ab
diff --git a/metadata/md5-cache/dev-embedded/libftdi-9999 b/metadata/md5-cache/dev-embedded/libftdi-9999
index b7b4ae18ac87..c8b84bf6c3b4 100644
--- a/metadata/md5-cache/dev-embedded/libftdi-9999
+++ b/metadata/md5-cache/dev-embedded/libftdi-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=virtual/libusb:1 cxx? ( dev-libs/boost ) 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(+)?] ) tools? ( !<dev-embedded/ftdi_eeprom-1.0 dev-libs/confuse:= )
 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=1
-_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=89093bc8f7abd5f2456a059e8acf552b
diff --git a/metadata/md5-cache/dev-embedded/mcu8051ide-1.4.10 b/metadata/md5-cache/dev-embedded/mcu8051ide-1.4.10
index 019ea31fbeda..ab51c22e8924 100644
--- a/metadata/md5-cache/dev-embedded/mcu8051ide-1.4.10
+++ b/metadata/md5-cache/dev-embedded/mcu8051ide-1.4.10
@@ -8,5 +8,5 @@ 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
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-embedded/platformio-3.5.4 b/metadata/md5-cache/dev-embedded/platformio-3.5.4
index 559d46caab0f..2a05982db9e1 100644
--- a/metadata/md5-cache/dev-embedded/platformio-3.5.4
+++ b/metadata/md5-cache/dev-embedded/platformio-3.5.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://pypi/p/platformio/platformio-3.5.4.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=141779745d2e371615608e0b1409b959
diff --git a/metadata/md5-cache/dev-embedded/platformio-3.6.0 b/metadata/md5-cache/dev-embedded/platformio-3.6.0
index 41a8b280d1be..64d95a82a913 100644
--- a/metadata/md5-cache/dev-embedded/platformio-3.6.0
+++ b/metadata/md5-cache/dev-embedded/platformio-3.6.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://pypi/p/platformio/platformio-3.6.0.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=141779745d2e371615608e0b1409b959
diff --git a/metadata/md5-cache/dev-embedded/ponyprog-3.0.0 b/metadata/md5-cache/dev-embedded/ponyprog-3.0.0
index 22a869716fb9..bd0856b26957 100644
--- a/metadata/md5-cache/dev-embedded/ponyprog-3.0.0
+++ b/metadata/md5-cache/dev-embedded/ponyprog-3.0.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=app-editors/qhexedit2-0.8.4_p20170719 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5
 SLOT=0
 SRC_URI=https://github.com/lancos/ponyprog/archive/v3.0.0.tar.gz -> ponyprog-3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3a8b30747e74bfcec0c5c7caf1226dc4
diff --git a/metadata/md5-cache/dev-embedded/stlink-1.4.0 b/metadata/md5-cache/dev-embedded/stlink-1.4.0
index 5762780a7192..ba7d71894349 100644
--- a/metadata/md5-cache/dev-embedded/stlink-1.4.0
+++ b/metadata/md5-cache/dev-embedded/stlink-1.4.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=virtual/libusb:1 >=dev-libs/glib-2.32.0:2 x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://github.com/texane/stlink/archive/1.4.0/stlink-1.4.0.tar.gz
-_eclasses_=cmake-utils	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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2d50c7976847da80ba8561a3fcf83ee2
diff --git a/metadata/md5-cache/dev-embedded/stlink-1.5.0 b/metadata/md5-cache/dev-embedded/stlink-1.5.0
index 04251284c97c..fcc3cd5fdad1 100644
--- a/metadata/md5-cache/dev-embedded/stlink-1.5.0
+++ b/metadata/md5-cache/dev-embedded/stlink-1.5.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=virtual/libusb:1 >=dev-libs/glib-2.32.0:2 x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://github.com/texane/stlink/archive/1.5.0/stlink-1.5.0.tar.gz
-_eclasses_=cmake-utils	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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7b8604b148d5297c50478f44cd696ced
diff --git a/metadata/md5-cache/dev-embedded/stlink-9999 b/metadata/md5-cache/dev-embedded/stlink-9999
index 5b2bbbca3089..ac8b2cfaedd8 100644
--- a/metadata/md5-cache/dev-embedded/stlink-9999
+++ b/metadata/md5-cache/dev-embedded/stlink-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/texane/stlink
 LICENSE=BSD
 RDEPEND=virtual/libusb:1 >=dev-libs/glib-2.32.0:2 x11-libs/gtk+:3
 SLOT=0
-_eclasses_=cmake-utils	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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=75fe97e13f6219c742448206d9d6c87e
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index 35a1b7b6ba22..a5216e1b5645 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/aseprite-1.1.6 b/metadata/md5-cache/dev-games/aseprite-1.1.6
index b45f94022d3a..9a56d18e4abb 100644
--- a/metadata/md5-cache/dev-games/aseprite-1.1.6
+++ b/metadata/md5-cache/dev-games/aseprite-1.1.6
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2 MIT
 RDEPEND=dev-libs/tinyxml media-libs/allegro:0[X,png] media-libs/freetype media-libs/giflib:= webp? ( media-libs/libwebp ) media-libs/libpng:0= net-misc/curl sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 x11-libs/pixman gtk3? ( dev-cpp/gtkmm:3.0 ) kde? ( dev-qt/qtcore:5 kde-frameworks/kio:5 )
 SLOT=0
 SRC_URI=https://github.com/aseprite/aseprite/releases/download/v1.1.6/Aseprite-v1.1.6-Source.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3e7e329db3649f0fc2e584d5b63dfb1b
diff --git a/metadata/md5-cache/dev-games/aseprite-1.1.7 b/metadata/md5-cache/dev-games/aseprite-1.1.7
index 453128207fd9..667dfba179e7 100644
--- a/metadata/md5-cache/dev-games/aseprite-1.1.7
+++ b/metadata/md5-cache/dev-games/aseprite-1.1.7
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2 MIT
 RDEPEND=dev-libs/tinyxml !bundled-libs? ( media-libs/allegro:0[X,png] ) media-libs/freetype media-libs/giflib:= webp? ( media-libs/libwebp ) media-libs/libpng:0= net-misc/curl sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 x11-libs/pixman gtk3? ( dev-cpp/gtkmm:3.0 ) kde? ( dev-qt/qtcore:5 kde-frameworks/kio:5 )
 SLOT=0
 SRC_URI=https://github.com/aseprite/aseprite/releases/download/v1.1.7/Aseprite-v1.1.7-Source.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=094db423657874c4360b654d234c3f43
diff --git a/metadata/md5-cache/dev-games/cegui-0.8.7 b/metadata/md5-cache/dev-games/cegui-0.8.7
index a603e4b1855f..afe1c7c3503f 100644
--- a/metadata/md5-cache/dev-games/cegui-0.8.7
+++ b/metadata/md5-cache/dev-games/cegui-0.8.7
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= virtual/libiconv bidi? ( dev-libs/fribidi ) devil? ( me
 REQUIRED_USE=|| ( expat tinyxml xerces-c xml ) python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://sourceforge/crayzedsgui/cegui-0.8.7.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=0fd5c3c227d8000707f8fbec9b194f30
diff --git a/metadata/md5-cache/dev-games/mygui-3.2.2 b/metadata/md5-cache/dev-games/mygui-3.2.2
index c25bcc54269c..b61f3c328b6c 100644
--- a/metadata/md5-cache/dev-games/mygui-3.2.2
+++ b/metadata/md5-cache/dev-games/mygui-3.2.2
@@ -10,5 +10,5 @@ RDEPEND=media-libs/freetype:2 ogre? ( dev-games/ogre:=[freeimage,opengl] samples
 REQUIRED_USE=ogre? ( !opengl ) opengl? ( !ogre )
 SLOT=0
 SRC_URI=https://github.com/MyGUI/mygui/archive/MyGUI3.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=a8a564247c03a4cdec49b19b0b877538
diff --git a/metadata/md5-cache/dev-games/newton-3.14 b/metadata/md5-cache/dev-games/newton-3.14
index d0a8a904b163..b4c7c3a84cf7 100644
--- a/metadata/md5-cache/dev-games/newton-3.14
+++ b/metadata/md5-cache/dev-games/newton-3.14
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=ZLIB
 SLOT=0
 SRC_URI=https://github.com/MADEAPPS/newton-dynamics/archive/newton-3.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=acdbdca106382595dcb8258dd9ba98b9
diff --git a/metadata/md5-cache/dev-games/ogre-1.10.12 b/metadata/md5-cache/dev-games/ogre-1.10.12
index c27239e73879..598999c9a0fc 100644
--- a/metadata/md5-cache/dev-games/ogre-1.10.12
+++ b/metadata/md5-cache/dev-games/ogre-1.10.12
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( gles2 opengl ) ?? ( resman-pedantic resman-strict ) examples?
 RESTRICT=test
 SLOT=0/1.10.0
 SRC_URI=https://github.com/OGRECave/ogre/archive/v1.10.12.zip -> ogre-1.10.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b414db3ca2145dd7f308337d8f5dadb3
diff --git a/metadata/md5-cache/dev-games/ogre-1.9.0-r1 b/metadata/md5-cache/dev-games/ogre-1.9.0-r1
index 79daffd90f35..d3f5a1f59f00 100644
--- a/metadata/md5-cache/dev-games/ogre-1.9.0-r1
+++ b/metadata/md5-cache/dev-games/ogre-1.9.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=threads? ( ^^ ( boost poco tbb ) ) examples? ( ois ) poco? ( thread
 RESTRICT=test
 SLOT=0/1.9.0
 SRC_URI=https://bitbucket.org/sinbad/ogre/get/v1-9-0.tar.bz2 -> ogre-1.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ce5941c889704814e723755d5e0eba21
diff --git a/metadata/md5-cache/dev-games/openscenegraph-3.5.5 b/metadata/md5-cache/dev-games/openscenegraph-3.5.5
index fbc75cb0ac35..12489eb56db5 100644
--- a/metadata/md5-cache/dev-games/openscenegraph-3.5.5
+++ b/metadata/md5-cache/dev-games/openscenegraph-3.5.5
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/libSM x11-libs/libXext virtual/glu virtual/opengl asio? ( dev-c
 REQUIRED_USE=sdl2? ( sdl )
 SLOT=0/145
 SRC_URI=https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-3.5.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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c7f952b6920913aa5a6f2598813664dc
diff --git a/metadata/md5-cache/dev-games/openscenegraph-qt-3.5.5 b/metadata/md5-cache/dev-games/openscenegraph-qt-3.5.5
index 7707253e4392..c9af81ba85d6 100644
--- a/metadata/md5-cache/dev-games/openscenegraph-qt-3.5.5
+++ b/metadata/md5-cache/dev-games/openscenegraph-qt-3.5.5
@@ -9,5 +9,5 @@ LICENSE=wxWinLL-3 LGPL-2.1
 RDEPEND=dev-games/openscenegraph:0/145 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwebkit:5 examples? ( dev-qt/qtwidgets:5 )
 SLOT=0/145
 SRC_URI=https://github.com/openscenegraph/osgQt/archive/3.5.5.tar.gz -> osgQt-3.5.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=0963ff735325676af6600d4d5cdb7f64
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 62d522239c2c..50f4a19a87a4 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0f92cbb7d89ab2f3cd651c30359c469a
diff --git a/metadata/md5-cache/dev-games/physfs-3.0.1 b/metadata/md5-cache/dev-games/physfs-3.0.1
index 609b1c39a8cb..ce6fc67dfa49 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=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 80376689d7ef..c007cba53e19 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=aa9169b947530461f7b87150c851f405
diff --git a/metadata/md5-cache/dev-games/physfs-9999 b/metadata/md5-cache/dev-games/physfs-9999
index 1141e837b361..4e83c1e2b231 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _md5_=f69c386eb258a184729f4d6f202b16b2
diff --git a/metadata/md5-cache/dev-games/simgear-2018.1.1 b/metadata/md5-cache/dev-games/simgear-2018.1.1
index 1a56ae01d164..ee7af16ca91d 100644
--- a/metadata/md5-cache/dev-games/simgear-2018.1.1
+++ b/metadata/md5-cache/dev-games/simgear-2018.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/expat >=dev-games/openscenegraph-3.2.0 media-libs/openal net-misc/curl sys-libs/zlib virtual/opengl dns? ( net-libs/udns ) gdal? ( sci-libs/gdal ) subversion? ( dev-vcs/subversion )
 SLOT=0
 SRC_URI=mirror://sourceforge/flightgear/simgear-2018.1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=76358d990f3cf51027a07e897b8491a4
diff --git a/metadata/md5-cache/dev-games/simgear-2018.2.1 b/metadata/md5-cache/dev-games/simgear-2018.2.1
index 51bf9714cd6b..9ef7a2794f4d 100644
--- a/metadata/md5-cache/dev-games/simgear-2018.2.1
+++ b/metadata/md5-cache/dev-games/simgear-2018.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/expat >=dev-games/openscenegraph-3.2.0 media-libs/openal net-misc/curl sys-libs/zlib virtual/opengl dns? ( net-libs/udns ) gdal? ( sci-libs/gdal ) subversion? ( dev-vcs/subversion )
 SLOT=0
 SRC_URI=mirror://sourceforge/flightgear/simgear-2018.2.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=60f6accf74526053724ca4cabce2ba61
diff --git a/metadata/md5-cache/dev-games/simgear-9999 b/metadata/md5-cache/dev-games/simgear-9999
index e5846cb108fe..4f55523a0efd 100644
--- a/metadata/md5-cache/dev-games/simgear-9999
+++ b/metadata/md5-cache/dev-games/simgear-9999
@@ -7,5 +7,5 @@ IUSE=+dns debug gdal openmp subversion test
 LICENSE=GPL-2
 RDEPEND=dev-libs/expat >=dev-games/openscenegraph-3.2.0 media-libs/openal net-misc/curl sys-libs/zlib virtual/opengl dns? ( net-libs/udns ) gdal? ( sci-libs/gdal ) subversion? ( dev-vcs/subversion )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2b78b1ebb3e127ad8c96bdbfe2d1f4b7
diff --git a/metadata/md5-cache/dev-games/tiled-1.1.6 b/metadata/md5-cache/dev-games/tiled-1.1.6
index 3cec1136a2f5..cdef3bb0dba5 100644
--- a/metadata/md5-cache/dev-games/tiled-1.1.6
+++ b/metadata/md5-cache/dev-games/tiled-1.1.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtcore-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtnetwork-5.7:5 >=de
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/bjorn/tiled/archive/v1.1.6/tiled-1.1.6.tar.gz
-_eclasses_=desktop	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=771d473f25e4908d3ebdb7661950d584
diff --git a/metadata/md5-cache/dev-games/tiled-1.2.0 b/metadata/md5-cache/dev-games/tiled-1.2.0
index 27b78f1fe73a..82a52c8dc5ed 100644
--- a/metadata/md5-cache/dev-games/tiled-1.2.0
+++ b/metadata/md5-cache/dev-games/tiled-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtcore-5.9:5 >=dev-qt/qtgui-5.9:5 >=dev-qt/qtnetwork-5.9:5 >=de
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index eccd3652a91c..b52c7b5f98df 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/gcj-jdk-5.4.0-r1 b/metadata/md5-cache/dev-java/gcj-jdk-5.4.0-r1
index 34419967ef38..507ca3694092 100644
--- a/metadata/md5-cache/dev-java/gcj-jdk-5.4.0-r1
+++ b/metadata/md5-cache/dev-java/gcj-jdk-5.4.0-r1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-java/ecj-gcj:* dev-lang/perl ~sys-devel/gcc-5.4.0[awt?,gcj] >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
 SLOT=0
-_eclasses_=java-vm-2	8e35974e63a8fdd757a751760871e3db	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=java-vm-2	8e35974e63a8fdd757a751760871e3db	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f46d2f52bd5860c1666574872420e4b3
diff --git a/metadata/md5-cache/dev-java/icedtea-3.8.0 b/metadata/md5-cache/dev-java/icedtea-3.8.0
index 8d2421ebda4f..2be0b98d6745 100644
--- a/metadata/md5-cache/dev-java/icedtea-3.8.0
+++ b/metadata/md5-cache/dev-java/icedtea-3.8.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.26:2= >=dev-util/systemtap-1 media-libs/fontconfig:1.0
 REQUIRED_USE=gtk? ( !headless-awt )
 SLOT=8
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea-3.8.0.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.8.0/openjdk.tar.xz -> icedtea-3.8-openjdk-499b993b345a.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.8.0/corba.tar.xz -> icedtea-3.8-corba-75fd375dd38a.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.8.0/jaxp.tar.xz -> icedtea-3.8-jaxp-2b279bb3475b.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.8.0/jaxws.tar.xz -> icedtea-3.8-jaxws-c54a27559acb.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.8.0/jdk.tar.xz -> icedtea-3.8-jdk-9c9ff65b03b6.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.8.0/hotspot.tar.xz -> icedtea-3.8-hotspot-cb5711bf53d9.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.8.0/nashorn.tar.xz -> icedtea-3.8-nashorn-bb3e3345d3ec.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.8.0/langtools.tar.xz -> icedtea-3.8-langtools-21524ad5b914.tar.xz shenandoah? ( http://icedtea.classpath.org/download/drops/icedtea8/3.8.0/shenandoah.tar.xz -> icedtea-3.8-shenandoah-c44a9eef4985.tar.xz ) arm? ( http://icedtea.classpath.org/download/drops/icedtea8/3.8.0/aarch32.tar.xz -> icedtea-3.8-aarch32-bd08b7f27e11.tar.xz ) http://icedtea.classpath.org/download/drops/cacao/cacao-c182f119eaad.tar.xz -> icedtea-cacao-c182f119eaad.tar.xz http://icedtea.classpath.org/download/drops/jamvm/jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz -> icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz
-_eclasses_=check-reqs	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	89bb9f083a2590d9b447fd0b78a96186
+_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-bin-3.7.0 b/metadata/md5-cache/dev-java/icedtea-bin-3.7.0
index d92a7f95ee3b..d81bd2dfbce4 100644
--- a/metadata/md5-cache/dev-java/icedtea-bin-3.7.0
+++ b/metadata/md5-cache/dev-java/icedtea-bin-3.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=gtk? ( !headless-awt ) nsplugin? ( !headless-awt )
 RESTRICT=preserve-libs strip
 SLOT=8
 SRC_URI=doc? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-doc-3.7.0.tar.xz ) source? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-src-3.7.0.tar.xz ) multilib? ( amd64? ( abi_x86_32? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.7.0-x86.tar.xz ) ) ) big-endian? ( ppc64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.7.0-ppc64.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.7.0-ppc64.tar.xz ) ) ) !big-endian? ( ppc64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.7.0-ppc64le.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.7.0-ppc64le.tar.xz ) ) ) amd64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.7.0-amd64.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.7.0-amd64.tar.xz ) ) arm? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.7.0-arm.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.7.0-arm.tar.xz ) ) arm64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.7.0-arm64.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.7.0-arm64.tar.xz ) ) x86? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.7.0-x86.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.7.0-x86.tar.xz ) )
-_eclasses_=java-vm-2	8e35974e63a8fdd757a751760871e3db	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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.8.0 b/metadata/md5-cache/dev-java/icedtea-bin-3.8.0
index 2295ca82bb3c..53fa4eb01e15 100644
--- a/metadata/md5-cache/dev-java/icedtea-bin-3.8.0
+++ b/metadata/md5-cache/dev-java/icedtea-bin-3.8.0
@@ -12,5 +12,5 @@ REQUIRED_USE=gtk? ( !headless-awt ) nsplugin? ( !headless-awt )
 RESTRICT=preserve-libs strip
 SLOT=8
 SRC_URI=doc? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-doc-3.8.0.tar.xz ) source? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-src-3.8.0.tar.xz ) multilib? ( amd64? ( abi_x86_32? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.8.0-x86.tar.xz ) ) ) big-endian? ( ppc64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.8.0-ppc64.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.8.0-ppc64.tar.xz ) ) ) !big-endian? ( ppc64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.8.0-ppc64le.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.8.0-ppc64le.tar.xz ) ) ) amd64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.8.0-amd64.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.8.0-amd64.tar.xz ) ) arm? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.8.0-arm.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.8.0-arm.tar.xz ) ) arm64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.8.0-arm64.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.8.0-arm64.tar.xz ) ) x86? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.8.0-x86.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.8.0-x86.tar.xz ) )
-_eclasses_=java-vm-2	8e35974e63a8fdd757a751760871e3db	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=java-vm-2	8e35974e63a8fdd757a751760871e3db	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e5cc4ff22c0df37c90740b6fcbefbc7e
diff --git a/metadata/md5-cache/dev-java/icedtea-web-1.6.1-r1 b/metadata/md5-cache/dev-java/icedtea-web-1.6.1-r1
index acc98e87d54e..d200b2abcdae 100644
--- a/metadata/md5-cache/dev-java/icedtea-web-1.6.1-r1
+++ b/metadata/md5-cache/dev-java/icedtea-web-1.6.1-r1
@@ -10,5 +10,5 @@ RDEPEND=javascript? ( dev-java/rhino:1.6 ) nsplugin? ( >=dev-libs/glib-2.16:2= )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea-web-1.6.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8c7139bfe2bf53f7d6b515d492244d80
diff --git a/metadata/md5-cache/dev-java/icedtea-web-1.6.2 b/metadata/md5-cache/dev-java/icedtea-web-1.6.2
index 49f0198f45c8..18b596af93b3 100644
--- a/metadata/md5-cache/dev-java/icedtea-web-1.6.2
+++ b/metadata/md5-cache/dev-java/icedtea-web-1.6.2
@@ -10,5 +10,5 @@ RDEPEND=javascript? ( dev-java/rhino:1.6 ) nsplugin? ( >=dev-libs/glib-2.16:2= )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea-web-1.6.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7c0972e2ccaea8e3e0c8faea372f2983
diff --git a/metadata/md5-cache/dev-java/jamvm-2.0.0-r1 b/metadata/md5-cache/dev-java/jamvm-2.0.0-r1
index b5eba30b291a..bf1178456094 100644
--- a/metadata/md5-cache/dev-java/jamvm-2.0.0-r1
+++ b/metadata/md5-cache/dev-java/jamvm-2.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/gnu-classpath:0.98 || ( dev-java/eclipse-ecj:* dev-java/ecj-gcj:* ) libffi? ( virtual/libffi ) ppc64? ( virtual/libffi ) sparc? ( virtual/libffi ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jamvm/jamvm-2.0.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-vm-2	8e35974e63a8fdd757a751760871e3db	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-vm-2	8e35974e63a8fdd757a751760871e3db	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=da533340fee43eee318c7b76810c59e6
diff --git a/metadata/md5-cache/dev-java/java-config-2.2.0-r4 b/metadata/md5-cache/dev-java/java-config-2.2.0-r4
index 86deb809e78e..d37e1eaea46b 100644
--- a/metadata/md5-cache/dev-java/java-config-2.2.0-r4
+++ b/metadata/md5-cache/dev-java/java-config-2.2.0-r4
@@ -10,5 +10,5 @@ RDEPEND=!dev-java/java-config-wrapper sys-apps/baselayout-java || ( sys-apps/por
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=2
 SRC_URI=https://dev.gentoo.org/~sera/distfiles/java-config-2.2.0.tar.bz2
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c0099d8dd305aa6e0d8cd598b0d13f4e
diff --git a/metadata/md5-cache/dev-java/javatoolkit-0.3.0-r9 b/metadata/md5-cache/dev-java/javatoolkit-0.3.0-r9
index b0268bb44cff..5736e5070ed4 100644
--- a/metadata/md5-cache/dev-java/javatoolkit-0.3.0-r9
+++ b/metadata/md5-cache/dev-java/javatoolkit-0.3.0-r9
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) >=d
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gentoo/javatoolkit-0.3.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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_=d9c9ad22d5b6e20ed3b2a38b763174d1
diff --git a/metadata/md5-cache/dev-java/javatoolkit-0.6.0 b/metadata/md5-cache/dev-java/javatoolkit-0.6.0
index 4f58ea6d53a0..f93af5b75473 100644
--- a/metadata/md5-cache/dev-java/javatoolkit-0.6.0
+++ b/metadata/md5-cache/dev-java/javatoolkit-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/javatoolkit.git/snapshot/javatoolkit-0.6.0.tar.bz2
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=91fba0e416ce9b2303476265038225ad
diff --git a/metadata/md5-cache/dev-java/javatoolkit-9999 b/metadata/md5-cache/dev-java/javatoolkit-9999
index 0616a11b1783..aa67e02a0120 100644
--- a/metadata/md5-cache/dev-java/javatoolkit-9999
+++ b/metadata/md5-cache/dev-java/javatoolkit-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=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_python3_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_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=37a1d7946cd012caaa682714db6f5e86
diff --git a/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.181 b/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.181
index e1aee680550c..f089bd15208f 100644
--- a/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.181
+++ b/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.181
@@ -11,5 +11,5 @@ REQUIRED_USE=javafx? ( alsa fontconfig )
 RESTRICT=fetch preserve-libs strip
 SLOT=1.8
 SRC_URI=amd64? ( jdk-8u181-linux-x64.tar.gz examples? ( jdk-8u181-linux-x64-demos.tar.gz ) ) arm? ( jdk-8u181-linux-arm32-vfp-hflt.tar.gz examples? ( jdk-8u181-linux-arm32-vfp-hflt-demos.tar.gz ) ) arm64? ( jdk-8u181-linux-arm64-vfp-hflt.tar.gz examples? ( jdk-8u181-linux-arm64-vfp-hflt-demos.tar.gz ) ) x86? ( jdk-8u181-linux-i586.tar.gz examples? ( jdk-8u181-linux-i586-demos.tar.gz ) ) x64-macos? ( jdk-8u181-macosx-x64.dmg examples? ( jdk-8u181-macosx-x86_64-demos.zip ) ) sparc64-solaris? ( jdk-8u181-solaris-sparcv9.tar.gz examples? ( jdk-8u181-solaris-sparcv9-demos.tar.gz ) ) x64-solaris? ( jdk-8u181-solaris-x64.tar.gz examples? ( jdk-8u181-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=58d06651d8dd906e8ee6735b71405fa2
diff --git a/metadata/md5-cache/dev-java/oracle-jdk-bin-9.0.4-r2 b/metadata/md5-cache/dev-java/oracle-jdk-bin-9.0.4-r2
index 600442543b20..086ca63b1a73 100644
--- a/metadata/md5-cache/dev-java/oracle-jdk-bin-9.0.4-r2
+++ b/metadata/md5-cache/dev-java/oracle-jdk-bin-9.0.4-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=javafx? ( alsa fontconfig ^^ ( gtk2 gtk3 ) )
 RESTRICT=fetch preserve-libs strip
 SLOT=9
 SRC_URI=amd64? ( jdk-9.0.4_linux-x64_bin.tar.gz ) x64-macos? ( jdk-9.0.4_osx-x64_bin.dmg ) sparc64-solaris? ( jdk-9.0.4_solaris-sparcv9_bin.tar.gz )
-_eclasses_=desktop	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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c2072596e6d95192bc67da39d547f24b
diff --git a/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.181 b/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.181
index 1b91fa47f7ee..3d71f1e488dc 100644
--- a/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.181
+++ b/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.181
@@ -10,5 +10,5 @@ RDEPEND=!x64-macos? ( !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs
 RESTRICT=fetch preserve-libs strip
 SLOT=1.8
 SRC_URI=amd64? ( jre-8u181-linux-x64.tar.gz ) x86? ( jre-8u181-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fe5596c81be25f7854a6e5fe958bc6fb
diff --git a/metadata/md5-cache/dev-java/oracle-jre-bin-9.0.4-r1 b/metadata/md5-cache/dev-java/oracle-jre-bin-9.0.4-r1
index 9b0bc9e21a13..13b79fbe5698 100644
--- a/metadata/md5-cache/dev-java/oracle-jre-bin-9.0.4-r1
+++ b/metadata/md5-cache/dev-java/oracle-jre-bin-9.0.4-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=javafx? ( alsa fontconfig ^^ ( gtk2 gtk3 ) )
 RESTRICT=fetch preserve-libs strip
 SLOT=9
 SRC_URI=amd64? ( jre-9.0.4_linux-x64_bin.tar.gz ) x64-macos? ( jre-9.0.4_osx-x64_bin.tar.gz ) sparc64-solaris? ( jre-9.0.4_solaris-sparcv9_bin.tar.gz )
-_eclasses_=desktop	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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=812def0a25058ee503df09c4b6c47563
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.4.1 b/metadata/md5-cache/dev-java/protobuf-java-3.4.1
deleted file mode 100644
index 6e8141495f55..000000000000
--- a/metadata/md5-cache/dev-java/protobuf-java-3.4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 ~dev-libs/protobuf-3.4.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Google's Protocol Buffers - Java bindings
-EAPI=6
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf
-IUSE=nano elibc_FreeBSD doc source elibc_FreeBSD
-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/14
-SRC_URI=https://github.com/google/protobuf/archive/v3.4.1.tar.gz -> protobuf-3.4.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_=74e1c9c0f38f44352598d9b94837d6d0
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.5.1.1 b/metadata/md5-cache/dev-java/protobuf-java-3.5.1.1
index 92c465db4102..b1269b912d28 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-3.5.1.1
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.5.1.1
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile install preinst prepare setup
 DEPEND=>=virtual/jdk-1.7 ~dev-libs/protobuf-3.5.1.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Google's Protocol Buffers - Java bindings
 EAPI=6
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf
+HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
 IUSE=nano elibc_FreeBSD doc source elibc_FreeBSD
 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/15
-SRC_URI=https://github.com/google/protobuf/archive/v3.5.1.1.tar.gz -> protobuf-3.5.1.1.tar.gz
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.5.1.1.tar.gz -> protobuf-3.5.1.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_=1e0008fdb694b88ac3b0bd7f5ddaa499
+_md5_=1d4b285fce3587a537f3a7f0959e3500
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.5.2 b/metadata/md5-cache/dev-java/protobuf-java-3.5.2
index cdfc55f651d3..0b855e670ced 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-3.5.2
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.5.2
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile install preinst prepare setup
 DEPEND=~dev-libs/protobuf-3.5.2 >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Google's Protocol Buffers - Java bindings
 EAPI=6
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf
+HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
 IUSE=nano elibc_FreeBSD doc source elibc_FreeBSD
 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/15
-SRC_URI=https://github.com/google/protobuf/archive/v3.5.2.tar.gz -> protobuf-3.5.2.tar.gz
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.5.2.tar.gz -> protobuf-3.5.2.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_=342ab5a4fc3d24f7437b771f0a11ac20
+_md5_=10aaa39f7579d9d544b5f6357e5328bf
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.6.0.1 b/metadata/md5-cache/dev-java/protobuf-java-3.6.0.1
index fad2aec44173..3cbbf0d18f8d 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-3.6.0.1
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.6.0.1
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile install preinst prepare setup
 DEPEND=~dev-libs/protobuf-3.6.0.1 >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Google's Protocol Buffers - Java bindings
 EAPI=6
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf
+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
 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/16
-SRC_URI=https://github.com/google/protobuf/archive/v3.6.0.1.tar.gz -> protobuf-3.6.0.1.tar.gz
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.6.0.1.tar.gz -> protobuf-3.6.0.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_=0943fb50cef1fea7533c9e398278a737
+_md5_=1772e04078ea2c52f2539dd0600cce31
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 81c5bd0749be..784a4a455377 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-3.6.1
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.6.1
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile install preinst prepare setup
 DEPEND=~dev-libs/protobuf-3.6.1 >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Google's Protocol Buffers - Java bindings
 EAPI=6
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf
+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
 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/google/protobuf/archive/v3.6.1.tar.gz -> protobuf-3.6.1.tar.gz
+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_=d1cecb90bb573085e677da94a8954cfe
+_md5_=59fcb3af83967d169295c74cb1409b6c
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 09a1f2c68dcb..44c9a0c206b2 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/erlang-21.1 b/metadata/md5-cache/dev-lang/erlang-21.1
new file mode 100644
index 000000000000..2f85a7295255
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/erlang-21.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=sys-libs/ncurses:0 sys-libs/zlib emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) tk? ( dev-lang/tk:0 ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) 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 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DESCRIPTION=Erlang programming language, runtime environment and libraries (OTP)
+EAPI=6
+HOMEPAGE=https://www.erlang.org/
+IUSE=doc emacs +hipe java +kpoll libressl odbc pgo sctp ssl systemd tk +wxwidgets elibc_FreeBSD java
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
+LICENSE=Apache-2.0
+RDEPEND=sys-libs/ncurses:0 sys-libs/zlib emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) tk? ( dev-lang/tk:0 ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
+SLOT=0
+SRC_URI=https://github.com/erlang/otp/archive/OTP-21.1.tar.gz -> erlang-21.1.tar.gz http://erlang.org/download/otp_doc_man_21.1.tar.gz -> erlang_doc_man_21.1.tar.gz doc? ( http://erlang.org/download/otp_doc_html_21.1.tar.gz -> erlang_doc_html_21.1.tar.gz )
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	ed63935305b6de2210ae97a407719d89
+_md5_=bc151aefb23e6f0f42ded9b67186d97a
diff --git a/metadata/md5-cache/dev-lang/gdl-0.9.6-r2 b/metadata/md5-cache/dev-lang/gdl-0.9.6-r2
index fde764479412..4a9dc57950c5 100644
--- a/metadata/md5-cache/dev-lang/gdl-0.9.6-r2
+++ b/metadata/md5-cache/dev-lang/gdl-0.9.6-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-cpp/antlr-cpp:2= sci-libs/gsl:0= sci-libs/plplot:0=[-dynamic] sys-li
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/gnudatalanguage/gdl-0.9.6v2.tgz
-_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f7682701003b4a9d94a8d0646d28acc8
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2016 b/metadata/md5-cache/dev-lang/gnat-gpl-2016
index b5000cd7b220..81f1349b0f06 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2016
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2016
@@ -11,5 +11,5 @@ RDEPEND=!sys-devel/gcc:4.9.4 sys-libs/zlib nls? ( virtual/libintl ) virtual/libi
 RESTRICT=strip
 SLOT=4.9.4
 SRC_URI=mirror://gnu/gcc/gcc-4.9.4/gcc-4.9.4.tar.bz2 mirror://gentoo/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.9.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-patches-1.2.tar.bz2 mirror://gentoo/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar ) http://mirrors.cdn.adacore.com/art/57399304c7a447658e0aff7f -> gnat-gpl-2016-src.tar.gz http://mirrors.cdn.adacore.com/art/573992d4c7a447658d00e1db -> gcc-4.9-gpl-2016-src.tar.gz http://mirrors.cdn.adacore.com/art/57399232c7a447658e0aff7d -> gcc-interface-4.9-gpl-2016-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) )
-_eclasses_=desktop	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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=983e385e2de3398dbd0183cf4028b324
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2017 b/metadata/md5-cache/dev-lang/gnat-gpl-2017
index e26a3d03c037..6720cf41a749 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2017
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2017
@@ -11,5 +11,5 @@ RDEPEND=!sys-devel/gcc:6.3.0 sys-libs/zlib nls? ( virtual/libintl ) virtual/libi
 RESTRICT=strip
 SLOT=6.3.0
 SRC_URI=mirror://gnu/gcc/gcc-6.3.0/gcc-6.3.0.tar.bz2 mirror://gentoo/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.3.0-patches-1.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar ) http://mirrors.cdn.adacore.com/art/591adbb4c7a4473fcc4532a3 -> gnat-gpl-2017-src.tar.gz http://mirrors.cdn.adacore.com/art/591adb65c7a4473fcbb153ac -> gcc-6-gpl-2017-src.tar.gz http://mirrors.cdn.adacore.com/art/591adbc5c7a4473fcbb153ae -> gcc-interface-6-gpl-2017-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) )
-_eclasses_=desktop	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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=5682622ce85edd1070e015505e663423
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2018 b/metadata/md5-cache/dev-lang/gnat-gpl-2018
index faf90e90b322..38bae99fdda8 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2018
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2018
@@ -11,5 +11,5 @@ RDEPEND=!sys-devel/gcc:7.3.1 sys-libs/zlib nls? ( virtual/libintl ) virtual/libi
 RESTRICT=strip
 SLOT=7.3.1
 SRC_URI=mirror://gnu/gcc/gcc-7.3.0/gcc-7.3.0.tar.xz mirror://gentoo/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.3.0-patches-1.4.tar.bz2 http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa5 -> gnat-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa7 -> gcc-7-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa6 -> gcc-interface-7-gpl-2018-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) )
-_eclasses_=desktop	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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=39a88d38d08b2306089d70c54fd11278
diff --git a/metadata/md5-cache/dev-lang/hy-0.10.0 b/metadata/md5-cache/dev-lang/hy-0.10.0
index aae71d74cd5d..3541e53af92a 100644
--- a/metadata/md5-cache/dev-lang/hy-0.10.0
+++ b/metadata/md5-cache/dev-lang/hy-0.10.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hylang/hy/archive/0.10.0.tar.gz -> hy-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0229dd3ea74cabffa9449da655d85b4f
diff --git a/metadata/md5-cache/dev-lang/hy-0.10.1 b/metadata/md5-cache/dev-lang/hy-0.10.1
index 2bb39551fbf7..1a58b4a5b200 100644
--- a/metadata/md5-cache/dev-lang/hy-0.10.1
+++ b/metadata/md5-cache/dev-lang/hy-0.10.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hylang/hy/archive/0.10.1.tar.gz -> hy-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9d352ddccc4c37742266464ad84e985a
diff --git a/metadata/md5-cache/dev-lang/hy-0.11.1 b/metadata/md5-cache/dev-lang/hy-0.11.1
index 146abfc9686f..23df24f14f1e 100644
--- a/metadata/md5-cache/dev-lang/hy-0.11.1
+++ b/metadata/md5-cache/dev-lang/hy-0.11.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hylang/hy/archive/0.11.1.tar.gz -> hy-0.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=440cb18fc565f34996e934204a3e3d3a
diff --git a/metadata/md5-cache/dev-lang/hy-0.12.0 b/metadata/md5-cache/dev-lang/hy-0.12.0
index d14f0cb47534..8f08fd380c03 100644
--- a/metadata/md5-cache/dev-lang/hy-0.12.0
+++ b/metadata/md5-cache/dev-lang/hy-0.12.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hylang/hy/archive/0.12.0.tar.gz -> hy-0.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=837709073ccd58895b21cf76df49a7d2
diff --git a/metadata/md5-cache/dev-lang/hy-0.12.1 b/metadata/md5-cache/dev-lang/hy-0.12.1
index 8437e3ad1915..4e9dd5ba7f78 100644
--- a/metadata/md5-cache/dev-lang/hy-0.12.1
+++ b/metadata/md5-cache/dev-lang/hy-0.12.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hylang/hy/archive/0.12.1.tar.gz -> hy-0.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b5a49874e46d8500422057409e27398b
diff --git a/metadata/md5-cache/dev-lang/hy-0.13.0 b/metadata/md5-cache/dev-lang/hy-0.13.0
index 6973e2c81565..a987ad34658c 100644
--- a/metadata/md5-cache/dev-lang/hy-0.13.0
+++ b/metadata/md5-cache/dev-lang/hy-0.13.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hylang/hy/archive/0.13.0.tar.gz -> hy-0.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0cc18c9342e0e435d6c48b6705e5a5b8
diff --git a/metadata/md5-cache/dev-lang/hy-0.13.1 b/metadata/md5-cache/dev-lang/hy-0.13.1
index 4f0875bfb5ba..ea98d41e4b5e 100644
--- a/metadata/md5-cache/dev-lang/hy-0.13.1
+++ b/metadata/md5-cache/dev-lang/hy-0.13.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hylang/hy/archive/0.13.1.tar.gz -> hy-0.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0cc18c9342e0e435d6c48b6705e5a5b8
diff --git a/metadata/md5-cache/dev-lang/hy-0.14.0 b/metadata/md5-cache/dev-lang/hy-0.14.0
index b608465aee21..0e9fd89640d8 100644
--- a/metadata/md5-cache/dev-lang/hy-0.14.0
+++ b/metadata/md5-cache/dev-lang/hy-0.14.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hylang/hy/archive/0.14.0.tar.gz -> hy-0.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=57454884ec49de0d9d02110330e1dc79
diff --git a/metadata/md5-cache/dev-lang/julia-1.0.0 b/metadata/md5-cache/dev-lang/julia-1.0.0
deleted file mode 100644
index 018dd44392b1..000000000000
--- a/metadata/md5-cache/dev-lang/julia-1.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND==sys-devel/llvm-6*:= =sys-devel/clang-6*:= dev-libs/double-conversion:0= dev-libs/gmp:0= dev-libs/libgit2:0= >=dev-libs/libpcre2-10.23:0=[jit] dev-libs/mpfr:0= dev-libs/openspecfun sci-libs/amd:0= sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/fftw:3.0=[threads] sci-libs/openlibm:0= sci-libs/spqr:0= sci-libs/umfpack:0= sci-mathematics/glpk:0= >=sys-libs/libunwind-1.1:7= sys-libs/readline:0= sys-libs/zlib:0= >=virtual/blas-3.6 virtual/lapack dev-vcs/git dev-util/patchelf virtual/pkgconfig
-DESCRIPTION=High-performance programming language for technical computing
-EAPI=6
-HOMEPAGE=https://julialang.org/
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND==sys-devel/llvm-6*:= =sys-devel/clang-6*:= dev-libs/double-conversion:0= dev-libs/gmp:0= dev-libs/libgit2:0= >=dev-libs/libpcre2-10.23:0=[jit] dev-libs/mpfr:0= dev-libs/openspecfun sci-libs/amd:0= sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/fftw:3.0=[threads] sci-libs/openlibm:0= sci-libs/spqr:0= sci-libs/umfpack:0= sci-mathematics/glpk:0= >=sys-libs/libunwind-1.1:7= sys-libs/readline:0= sys-libs/zlib:0= >=virtual/blas-3.6 virtual/lapack
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/JuliaLang/julia/releases/download/v1.0.0/julia-1.0.0.tar.gz https://api.github.com/repos/JuliaLang/libuv/tarball/ed3700c849289ed01fe04273a7bf865340b2bd7e -> julia-libuv-ed3700c849289ed01fe04273a7bf865340b2bd7e.tar.gz https://api.github.com/repos/JuliaLang/utf8proc/tarball/97ef668b312b96382714dbb8eaac4affce0816e6 -> julia-utf8proc-97ef668b312b96382714dbb8eaac4affce0816e6.tar.gz https://api.github.com/repos/vtjnash/libwhich/tarball/81e9723c0273d78493dc8c8ed570f68d9ce7e89e -> julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-2.2.3.tar.gz -> julia-dsfmt-2.2.3.tar.gz
-_eclasses_=llvm	01fccd3367b527770b74bfbf59d616c6	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=7bb1495647d8b640fb41aafd06c5780c
diff --git a/metadata/md5-cache/dev-lang/julia-1.0.1 b/metadata/md5-cache/dev-lang/julia-1.0.1
new file mode 100644
index 000000000000..7b51f51b2d1e
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/julia-1.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND==sys-devel/llvm-6*:= =sys-devel/clang-6*:= dev-libs/double-conversion:0= dev-libs/gmp:0= dev-libs/libgit2:0= >=dev-libs/libpcre2-10.23:0=[jit] dev-libs/mpfr:0= dev-libs/openspecfun sci-libs/amd:0= sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/fftw:3.0=[threads] sci-libs/openlibm:0= sci-libs/spqr:0= sci-libs/umfpack:0= sci-mathematics/glpk:0= >=sys-libs/libunwind-1.1:7= sys-libs/readline:0= sys-libs/zlib:0= >=virtual/blas-3.6 virtual/lapack dev-vcs/git dev-util/patchelf virtual/pkgconfig
+DESCRIPTION=High-performance programming language for technical computing
+EAPI=6
+HOMEPAGE=https://julialang.org/
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND==sys-devel/llvm-6*:= =sys-devel/clang-6*:= dev-libs/double-conversion:0= dev-libs/gmp:0= dev-libs/libgit2:0= >=dev-libs/libpcre2-10.23:0=[jit] dev-libs/mpfr:0= dev-libs/openspecfun sci-libs/amd:0= sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/fftw:3.0=[threads] sci-libs/openlibm:0= sci-libs/spqr:0= sci-libs/umfpack:0= sci-mathematics/glpk:0= >=sys-libs/libunwind-1.1:7= sys-libs/readline:0= sys-libs/zlib:0= >=virtual/blas-3.6 virtual/lapack
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/JuliaLang/julia/releases/download/v1.0.1/julia-1.0.1.tar.gz https://api.github.com/repos/JuliaLang/libuv/tarball/ed3700c849289ed01fe04273a7bf865340b2bd7e -> julia-libuv-ed3700c849289ed01fe04273a7bf865340b2bd7e.tar.gz https://api.github.com/repos/JuliaLang/utf8proc/tarball/97ef668b312b96382714dbb8eaac4affce0816e6 -> julia-utf8proc-97ef668b312b96382714dbb8eaac4affce0816e6.tar.gz https://api.github.com/repos/vtjnash/libwhich/tarball/81e9723c0273d78493dc8c8ed570f68d9ce7e89e -> julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-2.2.3.tar.gz -> julia-dsfmt-2.2.3.tar.gz
+_eclasses_=llvm	01fccd3367b527770b74bfbf59d616c6	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=cc48f41b96b6e58d54056eb986e25e81
diff --git a/metadata/md5-cache/dev-lang/logtalk-3.11.2 b/metadata/md5-cache/dev-lang/logtalk-3.11.2
index 8b5883c4c4de..e73a43f804f6 100644
--- a/metadata/md5-cache/dev-lang/logtalk-3.11.2
+++ b/metadata/md5-cache/dev-lang/logtalk-3.11.2
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=xslt? ( dev-libs/libxslt ) fop? ( dev-java/fop )
 SLOT=0
 SRC_URI=http://logtalk.org/files/logtalk-3.11.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2682d302589e798129455dd734b3cc10
diff --git a/metadata/md5-cache/dev-lang/logtalk-3.18.0 b/metadata/md5-cache/dev-lang/logtalk-3.18.0
index d0aeb3d27e5a..eb44c23db649 100644
--- a/metadata/md5-cache/dev-lang/logtalk-3.18.0
+++ b/metadata/md5-cache/dev-lang/logtalk-3.18.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=xslt? ( dev-libs/libxslt ) fop? ( dev-java/fop )
 SLOT=0
 SRC_URI=http://logtalk.org/files/logtalk-3.18.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=11418652fb812840e801f19e2d3b2bb0
diff --git a/metadata/md5-cache/dev-lang/mercury-13.05.2 b/metadata/md5-cache/dev-lang/mercury-13.05.2
index 4150b42b72e4..8414a77e223d 100644
--- a/metadata/md5-cache/dev-lang/mercury-13.05.2
+++ b/metadata/md5-cache/dev-lang/mercury-13.05.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=!dev-libs/mpatrol !dev-util/mono-debugger readline? ( sys-libs/readline ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.5 ) emacs? ( virtual/emacs ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=http://dl.mercurylang.org/release/mercury-srcdist-13.05.2.tar.gz mirror://gentoo/mercury-13.05.2-gentoo-patchset-1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5dd52c7551ac74b827d85bf37c73cbc4
diff --git a/metadata/md5-cache/dev-lang/mercury-14.01 b/metadata/md5-cache/dev-lang/mercury-14.01
index 6d06eefdf160..241f65ecb322 100644
--- a/metadata/md5-cache/dev-lang/mercury-14.01
+++ b/metadata/md5-cache/dev-lang/mercury-14.01
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=!dev-libs/mpatrol !dev-util/mono-debugger net-libs/libnsl:0= readline? ( sys-libs/readline:= ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.6:= ) emacs? ( virtual/emacs ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=http://dl.mercurylang.org/release/mercury-srcdist-14.01.tar.gz mirror://gentoo/mercury-14.01-gentoo-patchset-0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=df8344469da55422c20fbba3abcb89c1
diff --git a/metadata/md5-cache/dev-lang/mercury-14.01.1 b/metadata/md5-cache/dev-lang/mercury-14.01.1
index 730e19762787..f5499d3b4f65 100644
--- a/metadata/md5-cache/dev-lang/mercury-14.01.1
+++ b/metadata/md5-cache/dev-lang/mercury-14.01.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=!dev-libs/mpatrol !dev-util/mono-debugger net-libs/libnsl:0= readline? ( sys-libs/readline:= ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.6:= ) mono? ( dev-lang/mono ) emacs? ( virtual/emacs ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=http://dl.mercurylang.org/release/mercury-srcdist-14.01.1.tar.gz mirror://gentoo/mercury-14.01.1-gentoo-patchset-3.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dcb484b54f5b0356941597c00e636646
diff --git a/metadata/md5-cache/dev-lang/mono-4.4.1.0 b/metadata/md5-cache/dev-lang/mono-4.4.1.0
index fd0b5d6ec2a0..9ab6565c6c82 100644
--- a/metadata/md5-cache/dev-lang/mono-4.4.1.0
+++ b/metadata/md5-cache/dev-lang/mono-4.4.1.0
@@ -9,5 +9,5 @@ LICENSE=MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL
 RDEPEND=!minimal? ( >=dev-dotnet/libgdiplus-2.10 ) ia64? ( sys-libs/libunwind ) nls? ( sys-devel/gettext ) || ( www-client/links www-client/lynx )
 SLOT=0
 SRC_URI=https://download.mono-project.com/sources/mono/mono-4.4.1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	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
+_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_=75c2da6b8d18118e42c004ad59a2eb52
diff --git a/metadata/md5-cache/dev-lang/mono-4.6.1.5-r1 b/metadata/md5-cache/dev-lang/mono-4.6.1.5-r1
index 0114f9300d55..5901b8319813 100644
--- a/metadata/md5-cache/dev-lang/mono-4.6.1.5-r1
+++ b/metadata/md5-cache/dev-lang/mono-4.6.1.5-r1
@@ -9,5 +9,5 @@ LICENSE=MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL
 RDEPEND=!minimal? ( >=dev-dotnet/libgdiplus-2.10 ) ia64? ( sys-libs/libunwind ) nls? ( sys-devel/gettext ) || ( www-client/links www-client/lynx )
 SLOT=0
 SRC_URI=https://download.mono-project.com/sources/mono/mono-4.6.1.5.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	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
+_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-4.8.0.524 b/metadata/md5-cache/dev-lang/mono-4.8.0.524
index 065caee734e4..078fcb2fa9cc 100644
--- a/metadata/md5-cache/dev-lang/mono-4.8.0.524
+++ b/metadata/md5-cache/dev-lang/mono-4.8.0.524
@@ -9,5 +9,5 @@ LICENSE=MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL
 RDEPEND=!minimal? ( >=dev-dotnet/libgdiplus-2.10 ) ia64? ( sys-libs/libunwind ) nls? ( sys-devel/gettext ) || ( www-client/links www-client/lynx )
 SLOT=0
 SRC_URI=https://download.mono-project.com/sources/mono/mono-4.8.0.524.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	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
+_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_=da862850e39f48367106aa18d5095f06
diff --git a/metadata/md5-cache/dev-lang/mono-5.12.0.226 b/metadata/md5-cache/dev-lang/mono-5.12.0.226
index 70b74a5dddc6..a7fa7c1dbb65 100644
--- a/metadata/md5-cache/dev-lang/mono-5.12.0.226
+++ b/metadata/md5-cache/dev-lang/mono-5.12.0.226
@@ -10,5 +10,5 @@ RDEPEND=!minimal? ( >=dev-dotnet/libgdiplus-2.10 ) ia64? ( sys-libs/libunwind )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://download.mono-project.com/sources/mono/mono-5.12.0.226.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	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
+_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 4e522ecb5277..f112af1013b7 100644
--- a/metadata/md5-cache/dev-lang/mono-5.14.0.177
+++ b/metadata/md5-cache/dev-lang/mono-5.14.0.177
@@ -10,5 +10,5 @@ RDEPEND=!minimal? ( >=dev-dotnet/libgdiplus-2.10 ) ia64? ( sys-libs/libunwind )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://download.mono-project.com/sources/mono/mono-5.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	915cae3d7d636732918d18827fb1c226	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
+_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.4.1.6 b/metadata/md5-cache/dev-lang/mono-5.4.1.6
index bfc2f38f8868..5a22c5cfc884 100644
--- a/metadata/md5-cache/dev-lang/mono-5.4.1.6
+++ b/metadata/md5-cache/dev-lang/mono-5.4.1.6
@@ -9,5 +9,5 @@ LICENSE=MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL
 RDEPEND=!minimal? ( >=dev-dotnet/libgdiplus-2.10 ) ia64? ( sys-libs/libunwind ) nls? ( sys-devel/gettext ) || ( www-client/links www-client/lynx )
 SLOT=0
 SRC_URI=https://download.mono-project.com/sources/mono/mono-5.4.1.6.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	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
+_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/mujs-1.0.4 b/metadata/md5-cache/dev-lang/mujs-1.0.4
new file mode 100644
index 000000000000..f13393788dd8
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/mujs-1.0.4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+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
+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
diff --git a/metadata/md5-cache/dev-lang/php-7.3.0_rc1 b/metadata/md5-cache/dev-lang/php-7.3.0_rc1
deleted file mode 100644
index 26d9f5b0fad0..000000000000
--- a/metadata/md5-cache/dev-lang/php-7.3.0_rc1
+++ /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/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 ) 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 ) 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.0RC1.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_=e74d629b76ffd93bd3258696e037097f
diff --git a/metadata/md5-cache/dev-lang/php-7.3.0_rc2 b/metadata/md5-cache/dev-lang/php-7.3.0_rc2
new file mode 100644
index 000000000000..1d89cde641ad
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-7.3.0_rc2
@@ -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.0RC2.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.14-r1 b/metadata/md5-cache/dev-lang/python-2.7.14-r1
index e10846d5ad2e..934e4cab073f 100644
--- a/metadata/md5-cache/dev-lang/python-2.7.14-r1
+++ b/metadata/md5-cache/dev-lang/python-2.7.14-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=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 virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi(-)] >=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
+DEPEND=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 virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi(-)] >=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
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=5
 HOMEPAGE=https://www.python.org/
@@ -7,8 +7,8 @@ IUSE=-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurse
 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 )
+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.14/Python-2.7.14.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-2.7.14-0.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bbd53e23e22879f54c9faaf7d55ad388
+_md5_=e81cd3cd2f9ed48e35a52d435da20be2
diff --git a/metadata/md5-cache/dev-lang/python-2.7.14-r2 b/metadata/md5-cache/dev-lang/python-2.7.14-r2
index 78148a1cf2bf..4c33f6d7d2e2 100644
--- a/metadata/md5-cache/dev-lang/python-2.7.14-r2
+++ b/metadata/md5-cache/dev-lang/python-2.7.14-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=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 bluetooth? ( net-wireless/bluez ) virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi(-)] >=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
+DEPEND=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 bluetooth? ( net-wireless/bluez ) virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi(-)] >=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
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=5
 HOMEPAGE=https://www.python.org/
@@ -7,8 +7,8 @@ IUSE=-berkdb bluetooth build doc elibc_uclibc examples gdbm hardened ipv6 libres
 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 )
+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.14/Python-2.7.14.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-2.7.14-0.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cb12dfee63cad92d91252b06f143c14f
+_md5_=e2568186af5034e0dc2e56971bd2bc76
diff --git a/metadata/md5-cache/dev-lang/python-2.7.15 b/metadata/md5-cache/dev-lang/python-2.7.15
index d2adc81ed3c2..433448ae21a8 100644
--- a/metadata/md5-cache/dev-lang/python-2.7.15
+++ b/metadata/md5-cache/dev-lang/python-2.7.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=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 bluetooth? ( net-wireless/bluez ) virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi(-)] >=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
+DEPEND=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 bluetooth? ( net-wireless/bluez ) virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi(-)] >=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
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=6
 HOMEPAGE=https://www.python.org/
@@ -7,8 +7,8 @@ IUSE=-berkdb bluetooth build doc elibc_uclibc examples gdbm hardened ipv6 libres
 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 )
+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_=d85c9f17d6ee847bcac17d604304a77a
+_md5_=763b004925932f414db730c31e446351
diff --git a/metadata/md5-cache/dev-lang/python-3.4.5-r1 b/metadata/md5-cache/dev-lang/python-3.4.5-r1
index 0c238e70a3fe..ad0d275e4693 100644
--- a/metadata/md5-cache/dev-lang/python-3.4.5-r1
+++ b/metadata/md5-cache/dev-lang/python-3.4.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi(-)] >=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
+DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi(-)] >=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
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=5
 HOMEPAGE=https://www.python.org/
@@ -7,9 +7,9 @@ IUSE=build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline
 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= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
+RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
 RESTRICT=!test? ( test )
 SLOT=3.4/3.4m
 SRC_URI=https://www.python.org/ftp/python/3.4.5/Python-3.4.5.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.4.5-0.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ec9ffabfab8822df8599a5f1b863cbbc
+_md5_=522812be246fffc926eac5ad66d0467c
diff --git a/metadata/md5-cache/dev-lang/python-3.4.6-r1 b/metadata/md5-cache/dev-lang/python-3.4.6-r1
index c8a0fcf50bbe..108a1abe2817 100644
--- a/metadata/md5-cache/dev-lang/python-3.4.6-r1
+++ b/metadata/md5-cache/dev-lang/python-3.4.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi(-)] >=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
+DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi(-)] >=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
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=5
 HOMEPAGE=https://www.python.org/
@@ -7,8 +7,8 @@ IUSE=build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline
 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= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
+RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
 SLOT=3.4/3.4m
 SRC_URI=https://www.python.org/ftp/python/3.4.6/Python-3.4.6.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.4.6-0.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b1b9f4d4f8280392da57fd43a71d1451
+_md5_=073a851096bf0a2094c744f9fd5cf07b
diff --git a/metadata/md5-cache/dev-lang/python-3.4.8 b/metadata/md5-cache/dev-lang/python-3.4.8
index 45f58d7e36a9..b2c23d4362e5 100644
--- a/metadata/md5-cache/dev-lang/python-3.4.8
+++ b/metadata/md5-cache/dev-lang/python-3.4.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi(-)] >=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
+DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi(-)] >=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
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=5
 HOMEPAGE=https://www.python.org/
@@ -7,8 +7,8 @@ IUSE=build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline
 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= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
+RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
 SLOT=3.4/3.4m
 SRC_URI=https://www.python.org/ftp/python/3.4.8/Python-3.4.8.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.4.6-0.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e005803b0c54f6f44f934f0a85e3fc90
+_md5_=21af87dde5dbe9b2b632162d8977711c
diff --git a/metadata/md5-cache/dev-lang/python-3.4.8-r1 b/metadata/md5-cache/dev-lang/python-3.4.8-r1
index 6bf61543cb32..ad302a85e345 100644
--- a/metadata/md5-cache/dev-lang/python-3.4.8-r1
+++ b/metadata/md5-cache/dev-lang/python-3.4.8-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 bluetooth? ( net-wireless/bluez ) virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi(-)] >=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
+DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 bluetooth? ( net-wireless/bluez ) virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi(-)] >=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
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=5
 HOMEPAGE=https://www.python.org/
@@ -7,8 +7,8 @@ IUSE=bluetooth build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses
 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= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
+RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
 SLOT=3.4/3.4m
 SRC_URI=https://www.python.org/ftp/python/3.4.8/Python-3.4.8.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.4.6-0.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fbc1f0a56e175f1fba11e685942e29ca
+_md5_=ef7dcec7b3c53acfea5e066210d05a8d
diff --git a/metadata/md5-cache/dev-lang/python-3.5.4-r1 b/metadata/md5-cache/dev-lang/python-3.5.4-r1
index b5aacaad7946..99c6732d52d0 100644
--- a/metadata/md5-cache/dev-lang/python-3.5.4-r1
+++ b/metadata/md5-cache/dev-lang/python-3.5.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)] >=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
+DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)] >=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
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=5
 HOMEPAGE=https://www.python.org/
@@ -7,9 +7,9 @@ IUSE=build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline
 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= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
+RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
 RESTRICT=!test? ( test )
 SLOT=3.5/3.5m
 SRC_URI=https://www.python.org/ftp/python/3.5.4/Python-3.5.4.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.5.4-0.tar.xz
 _eclasses_=autotools	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_=9ee1cecf927554b44b850ddd7a55a95d
+_md5_=89b88e2525a39d3f4b579ad12fdabc6b
diff --git a/metadata/md5-cache/dev-lang/python-3.5.5 b/metadata/md5-cache/dev-lang/python-3.5.5
index 3aa3c18d709e..080dd5cbb7d7 100644
--- a/metadata/md5-cache/dev-lang/python-3.5.5
+++ b/metadata/md5-cache/dev-lang/python-3.5.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl: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:0= ) !!<sys-apps/sandbox-2.6-r1 test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)] >=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
+DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl: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:0= ) !!<sys-apps/sandbox-2.6-r1 test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)] >=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
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=5
 HOMEPAGE=https://www.python.org/
@@ -7,9 +7,9 @@ IUSE=build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline
 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= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl: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:0= ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
+RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl: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:0= ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
 RESTRICT=!test? ( test )
 SLOT=3.5/3.5m
 SRC_URI=https://www.python.org/ftp/python/3.5.5/Python-3.5.5.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.5.4-0.tar.xz
 _eclasses_=autotools	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_=cf7324beb9f1b89049463d304188440f
+_md5_=68fb49adcd1e8a508e79690931f6610e
diff --git a/metadata/md5-cache/dev-lang/python-3.5.5-r1 b/metadata/md5-cache/dev-lang/python-3.5.5-r1
index 678dd959ae01..7219b07f017d 100644
--- a/metadata/md5-cache/dev-lang/python-3.5.5-r1
+++ b/metadata/md5-cache/dev-lang/python-3.5.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl: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:0= ) !!<sys-apps/sandbox-2.6-r1 bluetooth? ( net-wireless/bluez ) virtual/pkgconfig !sys-devel/gcc[libffi(-)] >=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
+DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl: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:0= ) !!<sys-apps/sandbox-2.6-r1 bluetooth? ( net-wireless/bluez ) virtual/pkgconfig !sys-devel/gcc[libffi(-)] >=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
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=5
 HOMEPAGE=https://www.python.org/
@@ -7,9 +7,9 @@ IUSE=bluetooth build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses
 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= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl: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:0= ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
+RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl: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:0= ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
 RESTRICT=!test? ( test )
 SLOT=3.5/3.5m
 SRC_URI=https://www.python.org/ftp/python/3.5.5/Python-3.5.5.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.5.4-0.tar.xz
 _eclasses_=autotools	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_=b84bcca1e5ad0a3854b89fe3a7ae4a9e
+_md5_=9564259a00c851dcb031343abb2a011f
diff --git a/metadata/md5-cache/dev-lang/python-3.6.3-r1 b/metadata/md5-cache/dev-lang/python-3.6.3-r1
index a3748a5bbe90..3e4100c914b8 100644
--- a/metadata/md5-cache/dev-lang/python-3.6.3-r1
+++ b/metadata/md5-cache/dev-lang/python-3.6.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)] >=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
+DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)] >=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
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=5
 HOMEPAGE=https://www.python.org/
@@ -7,9 +7,9 @@ IUSE=build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl t
 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= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
+RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
 RESTRICT=!test? ( test )
 SLOT=3.6/3.6m
 SRC_URI=https://www.python.org/ftp/python/3.6.3/Python-3.6.3.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.6.2-0.tar.xz
 _eclasses_=autotools	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_=f4096522b0cfda2ecba0f6e442896db8
+_md5_=346b49f074c4995d539d6b25fac1470a
diff --git a/metadata/md5-cache/dev-lang/python-3.6.4 b/metadata/md5-cache/dev-lang/python-3.6.4
index 035c50634b79..b5625221fbce 100644
--- a/metadata/md5-cache/dev-lang/python-3.6.4
+++ b/metadata/md5-cache/dev-lang/python-3.6.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)] >=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
+DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)] >=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
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=6
 HOMEPAGE=https://www.python.org/
@@ -7,9 +7,9 @@ IUSE=build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl t
 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= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
+RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
 RESTRICT=!test? ( test )
 SLOT=3.6/3.6m
 SRC_URI=https://www.python.org/ftp/python/3.6.4/Python-3.6.4.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.6.4.tar.xz
 _eclasses_=autotools	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_=bb0570fb82b5d282733aa41327ce32c5
+_md5_=7523c87e00e50cc1ae37f01b62dbf583
diff --git a/metadata/md5-cache/dev-lang/python-3.6.5 b/metadata/md5-cache/dev-lang/python-3.6.5
index 4a8da41d7835..6dbeebe12a43 100644
--- a/metadata/md5-cache/dev-lang/python-3.6.5
+++ b/metadata/md5-cache/dev-lang/python-3.6.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl: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:0= ) !!<sys-apps/sandbox-2.6-r1 test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)] >=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
+DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl: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:0= ) !!<sys-apps/sandbox-2.6-r1 test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)] >=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
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=6
 HOMEPAGE=https://www.python.org/
@@ -7,9 +7,9 @@ IUSE=build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl t
 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= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl: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:0= ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
+RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl: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:0= ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
 RESTRICT=!test? ( test )
 SLOT=3.6/3.6m
 SRC_URI=https://www.python.org/ftp/python/3.6.5/Python-3.6.5.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.6.4.tar.xz
 _eclasses_=autotools	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_=e17dfef086bbb409c8cec446e561f64d
+_md5_=6a3840c9b1ceabece7ec1d3b0be00301
diff --git a/metadata/md5-cache/dev-lang/python-3.6.5-r1 b/metadata/md5-cache/dev-lang/python-3.6.5-r1
index d93f74c4ca80..84309363761c 100644
--- a/metadata/md5-cache/dev-lang/python-3.6.5-r1
+++ b/metadata/md5-cache/dev-lang/python-3.6.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl: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:0= ) !!<sys-apps/sandbox-2.6-r1 bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)] >=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
+DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl: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:0= ) !!<sys-apps/sandbox-2.6-r1 bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)] >=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
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=6
 HOMEPAGE=https://www.python.org/
@@ -7,9 +7,9 @@ IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sql
 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= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl: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:0= ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
+RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl: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:0= ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
 RESTRICT=!test? ( test )
 SLOT=3.6/3.6m
 SRC_URI=https://www.python.org/ftp/python/3.6.5/Python-3.6.5.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.6.4.tar.xz
 _eclasses_=autotools	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_=c7d7336785b45ca5dd9309a3be5b692a
+_md5_=751836ebb1fe1d00396431459b11782f
diff --git a/metadata/md5-cache/dev-lang/python-3.6.6 b/metadata/md5-cache/dev-lang/python-3.6.6
index cbbd02b6a403..e54b27c03868 100644
--- a/metadata/md5-cache/dev-lang/python-3.6.6
+++ b/metadata/md5-cache/dev-lang/python-3.6.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl: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:0= ) !!<sys-apps/sandbox-2.6-r1 bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)] >=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
+DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl: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:0= ) !!<sys-apps/sandbox-2.6-r1 bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)] >=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
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=6
 HOMEPAGE=https://www.python.org/
@@ -7,9 +7,9 @@ IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sql
 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= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl: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:0= ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
+RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl: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:0= ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
 RESTRICT=!test? ( test )
 SLOT=3.6/3.6m
 SRC_URI=https://www.python.org/ftp/python/3.6.6/Python-3.6.6.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.6.6.tar.xz
 _eclasses_=autotools	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_=dc6718f67146c88860b8c5053251e368
+_md5_=45376ea7026d2476b1b6b255cc16a300
diff --git a/metadata/md5-cache/dev-lang/python-3.7.0 b/metadata/md5-cache/dev-lang/python-3.7.0
index c8bc48ee1e95..94753c563415 100644
--- a/metadata/md5-cache/dev-lang/python-3.7.0
+++ b/metadata/md5-cache/dev-lang/python-3.7.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl: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:0= ) !!<sys-apps/sandbox-2.6-r1 bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)] >=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
+DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl: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:0= ) !!<sys-apps/sandbox-2.6-r1 bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)] >=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
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=6
 HOMEPAGE=https://www.python.org/
@@ -7,9 +7,9 @@ IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sql
 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= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl: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:0= ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
+RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl: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:0= ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
 RESTRICT=!test? ( test )
 SLOT=3.7/3.7m
 SRC_URI=https://www.python.org/ftp/python/3.7.0/Python-3.7.0.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.7.0.tar.xz
 _eclasses_=autotools	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_=688d043e2279f60e7f2dae1e6cbbd731
+_md5_=b59e72b4753b6a54d8c55814450e184c
diff --git a/metadata/md5-cache/dev-lang/ruby-2.3.7 b/metadata/md5-cache/dev-lang/ruby-2.3.7
index 0cf76556945e..3c365e89ebcd 100644
--- a/metadata/md5-cache/dev-lang/ruby-2.3.7
+++ b/metadata/md5-cache/dev-lang/ruby-2.3.7
@@ -1,5 +1,5 @@
 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
+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/
@@ -7,8 +7,8 @@ IUSE=berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks
 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
+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.7.tar.xz https://dev.gentoo.org/~flameeyes/ruby-team/ruby-patches-2.3.7.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_=3c4ab28a23f008ab89e55b3d0d078e6d
+_md5_=f3058d8904bbbc6d56c32ee0edef2fd6
diff --git a/metadata/md5-cache/dev-lang/ruby-2.4.4 b/metadata/md5-cache/dev-lang/ruby-2.4.4
index c23e38ef9570..efa327d8d1ff 100644
--- a/metadata/md5-cache/dev-lang/ruby-2.4.4
+++ b/metadata/md5-cache/dev-lang/ruby-2.4.4
@@ -1,5 +1,5 @@
 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 >=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=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 >=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=6
 HOMEPAGE=http://www.ruby-lang.org/
@@ -7,8 +7,8 @@ IUSE=berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks
 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
+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.4.tar.xz https://dev.gentoo.org/~graaff/ruby-team/ruby-patches-2.4.4.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_=7ab738a1223f75c7de169d59e465f66a
+_md5_=889b110ca48f1aec99a15c386050a071
diff --git a/metadata/md5-cache/dev-lang/ruby-2.4.4-r1 b/metadata/md5-cache/dev-lang/ruby-2.4.4-r1
index 5015443ff18c..c7364df750d3 100644
--- a/metadata/md5-cache/dev-lang/ruby-2.4.4-r1
+++ b/metadata/md5-cache/dev-lang/ruby-2.4.4-r1
@@ -1,6 +1,6 @@
 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
+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/
@@ -8,8 +8,8 @@ IUSE=berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks
 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
+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.4.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=6d693f2e05d56d5095cac594c28cac18
+_md5_=6757526b4ea4c54b9b7189366d583d3a
diff --git a/metadata/md5-cache/dev-lang/ruby-2.5.1 b/metadata/md5-cache/dev-lang/ruby-2.5.1
index 56eaea8a8950..bb0f6f4db5c0 100644
--- a/metadata/md5-cache/dev-lang/ruby-2.5.1
+++ b/metadata/md5-cache/dev-lang/ruby-2.5.1
@@ -1,5 +1,5 @@
 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 >=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=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 >=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=6
 HOMEPAGE=http://www.ruby-lang.org/
@@ -7,8 +7,8 @@ IUSE=berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks
 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
+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.1.tar.xz https://dev.gentoo.org/~graaff/ruby-team/ruby-patches-2.5.1.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_=7200f5610c9f480cd84da4e2ccdedafe
+_md5_=f458499386b4dd98762a028a171b99c9
diff --git a/metadata/md5-cache/dev-lang/ruby-2.5.1-r1 b/metadata/md5-cache/dev-lang/ruby-2.5.1-r1
index a63328f44eba..51dca1de695d 100644
--- a/metadata/md5-cache/dev-lang/ruby-2.5.1-r1
+++ b/metadata/md5-cache/dev-lang/ruby-2.5.1-r1
@@ -1,6 +1,6 @@
 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
+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/
@@ -8,8 +8,8 @@ IUSE=berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks
 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
+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.1.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=bb01607ddf33d9762bb3b435edc96e60
+_md5_=4b2ec72262903b48030fd1109c187a3e
diff --git a/metadata/md5-cache/dev-lang/rust-1.25.0 b/metadata/md5-cache/dev-lang/rust-1.25.0
deleted file mode 100644
index 3d2e82e66c95..000000000000
--- a/metadata/md5-cache/dev-lang/rust-1.25.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 jemalloc? ( dev-libs/jemalloc ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) dev-util/cmake
-DESCRIPTION=Systems programming language from Mozilla
-EAPI=6
-HOMEPAGE=https://www.rust-lang.org/
-IUSE=debug doc extended +jemalloc
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
-PDEPEND=!extended? ( >=dev-util/cargo-0.26.0 )
-RDEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 jemalloc? ( dev-libs/jemalloc )
-SLOT=stable/1.25
-SRC_URI=https://static.rust-lang.org/dist/rustc-1.25.0-src.tar.gz -> rustc-1.25.0-src.tar.gz amd64? ( https://static.rust-lang.org/dist/rust-1.24.0-x86_64-unknown-linux-gnu.tar.gz ) x86? ( https://static.rust-lang.org/dist/rust-1.24.0-i686-unknown-linux-gnu.tar.gz ) arm64? ( https://static.rust-lang.org/dist/rust-1.24.0-aarch64-unknown-linux-gnu.tar.gz )
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=4a8bae8f2989648a294a360f810d10c7
diff --git a/metadata/md5-cache/dev-lang/rust-1.28.0 b/metadata/md5-cache/dev-lang/rust-1.28.0
deleted file mode 100644
index 45460c9ab73a..000000000000
--- a/metadata/md5-cache/dev-lang/rust-1.28.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 jemalloc? ( dev-libs/jemalloc ) || ( dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy-5:0 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) cargo? ( !dev-util/cargo ) rustfmt? ( !dev-util/rustfmt ) dev-util/cmake
-DESCRIPTION=Systems programming language from Mozilla
-EAPI=6
-HOMEPAGE=https://www.rust-lang.org/
-IUSE=cargo debug doc +jemalloc rls rustfmt wasm llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
-PDEPEND=!cargo? ( >=dev-util/cargo-0.29.0 )
-RDEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 jemalloc? ( dev-libs/jemalloc )
-REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
-SLOT=stable/1.28
-SRC_URI=https://static.rust-lang.org/dist/rustc-1.28.0-src.tar.xz -> rustc-1.28.0-src.tar.xz amd64? ( https://static.rust-lang.org/dist/rust-1.27.2-x86_64-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.27.2-i686-unknown-linux-gnu.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.27.2-aarch64-unknown-linux-gnu.tar.xz )
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=40a8b9c98c17d5970c191adb0ad13121
diff --git a/metadata/md5-cache/dev-lang/rust-1.28.0-r1 b/metadata/md5-cache/dev-lang/rust-1.28.0-r1
deleted file mode 100644
index 3ca8a8b7179a..000000000000
--- a/metadata/md5-cache/dev-lang/rust-1.28.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 jemalloc? ( dev-libs/jemalloc ) cargo? ( sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser net-misc/curl[ssl] ) || ( dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy-5:0 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) cargo? ( !dev-util/cargo ) rustfmt? ( !dev-util/rustfmt ) dev-util/cmake
-DESCRIPTION=Systems programming language from Mozilla
-EAPI=6
-HOMEPAGE=https://www.rust-lang.org/
-IUSE=cargo debug doc +jemalloc libressl rls rustfmt wasm llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm64 ~x86
-LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
-PDEPEND=!cargo? ( >=dev-util/cargo-0.29.0 )
-RDEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 jemalloc? ( dev-libs/jemalloc ) cargo? ( sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser net-misc/curl[ssl] )
-REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
-SLOT=stable/1.28
-SRC_URI=https://static.rust-lang.org/dist/rustc-1.28.0-src.tar.xz -> rustc-1.28.0-src.tar.xz amd64? ( https://static.rust-lang.org/dist/rust-1.27.2-x86_64-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.27.2-i686-unknown-linux-gnu.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.27.2-aarch64-unknown-linux-gnu.tar.xz )
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=5cdeeed26caaecdb402dbe3e7d42e234
diff --git a/metadata/md5-cache/dev-lang/rust-1.29.1 b/metadata/md5-cache/dev-lang/rust-1.29.1
index 3a5e32bad3a9..d2bfcebb83f6 100644
--- a/metadata/md5-cache/dev-lang/rust-1.29.1
+++ b/metadata/md5-cache/dev-lang/rust-1.29.1
@@ -3,13 +3,13 @@ DEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 jemalloc? ( dev-libs/jemalloc
 DESCRIPTION=Systems programming language from Mozilla
 EAPI=6
 HOMEPAGE=https://www.rust-lang.org/
-IUSE=cargo clippy 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
+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 )
+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.1-src.tar.xz -> rustc-1.29.1-src.tar.xz amd64? ( https://static.rust-lang.org/dist/rust-1.28.0-x86_64-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.28.0-i686-unknown-linux-gnu.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.28.0-aarch64-unknown-linux-gnu.tar.xz )
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=e862c204abad955712552c62c1751318
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=d35dd6f9d61840a08ad5d7d8cdee774f
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.25.0 b/metadata/md5-cache/dev-lang/rust-bin-1.25.0
deleted file mode 100644
index 53451341431f..000000000000
--- a/metadata/md5-cache/dev-lang/rust-bin-1.25.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm pretend unpack
-DEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 !dev-lang/rust:0
-DESCRIPTION=Systems programming language from Mozilla
-EAPI=5
-HOMEPAGE=https://www.rust-lang.org/
-IUSE=doc
-KEYWORDS=amd64 x86
-LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
-RDEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 !dev-lang/rust:0
-SLOT=stable
-SRC_URI=amd64? ( https://static.rust-lang.org/dist/rust-1.25.0-x86_64-unknown-linux-gnu.tar.gz ) arm? ( https://static.rust-lang.org/dist/rust-1.25.0-arm-unknown-linux-gnueabi.tar.gz https://static.rust-lang.org/dist/rust-1.25.0-arm-unknown-linux-gnueabihf.tar.gz https://static.rust-lang.org/dist/rust-1.25.0-armv7-unknown-linux-gnueabihf.tar.gz ) x86? ( https://static.rust-lang.org/dist/rust-1.25.0-i686-unknown-linux-gnu.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_=99562245f63f6a80ede4738752168a5a
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.28.0-r1 b/metadata/md5-cache/dev-lang/rust-bin-1.28.0-r1
deleted file mode 100644
index 4ba177483c2d..000000000000
--- a/metadata/md5-cache/dev-lang/rust-bin-1.28.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm pretend unpack
-DEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 !dev-lang/rust:0 cargo? ( !dev-util/cargo ) rustfmt? ( !dev-util/rustfmt )
-DESCRIPTION=Systems programming language from Mozilla
-EAPI=6
-HOMEPAGE=https://www.rust-lang.org/
-IUSE=cargo doc libressl rustfmt
-KEYWORDS=amd64 ~arm64 ~x86
-LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
-PDEPEND=!cargo? ( >=dev-util/cargo-0.29.0 )
-RDEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 !dev-lang/rust:0 cargo? ( !dev-util/cargo ) rustfmt? ( !dev-util/rustfmt ) cargo? ( sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser net-misc/curl[ssl] )
-SLOT=stable
-SRC_URI=amd64? ( https://static.rust-lang.org/dist/rust-1.28.0-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.28.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.28.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.28.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.28.0-aarch64-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.28.0-i686-unknown-linux-gnu.tar.xz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=8163e48f580326bcfb7045c79563cbbe
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.29.1 b/metadata/md5-cache/dev-lang/rust-bin-1.29.1
index 41953ae8cf92..7e0ef1cb8b84 100644
--- a/metadata/md5-cache/dev-lang/rust-bin-1.29.1
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.29.1
@@ -3,12 +3,13 @@ DEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 !dev-lang/rust:0 cargo? ( !dev
 DESCRIPTION=Systems programming language from Mozilla
 EAPI=6
 HOMEPAGE=https://www.rust-lang.org/
-IUSE=cargo clippy doc libressl rustfmt
-KEYWORDS=~amd64 ~arm64 ~x86
+IUSE=cargo clippy cpu_flags_x86_sse2 doc libressl rustfmt
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
 PDEPEND=!cargo? ( >=dev-util/cargo-0.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-libs/http-parser:= net-misc/curl[ssl] )
+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.1-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.29.1-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.29.1-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.29.1-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.29.1-aarch64-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.29.1-i686-unknown-linux-gnu.tar.xz )
 _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	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=e18a3ef530948866e3cd8a53fa4e88ad
+_md5_=6ae3be55d9d5271da705f91ada6d63cf
diff --git a/metadata/md5-cache/dev-lang/solidity-0.4.18 b/metadata/md5-cache/dev-lang/solidity-0.4.18
index 116bc4433cc1..5d24d56e6aa4 100644
--- a/metadata/md5-cache/dev-lang/solidity-0.4.18
+++ b/metadata/md5-cache/dev-lang/solidity-0.4.18
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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/spidermonkey-1.8.5-r6 b/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r6
index f337001bbb9d..56c1c215c502 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r6
+++ b/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r6
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/nspr-4.7.0 sys-libs/readline:0= x64-macos? ( dev-libs/jemallo
 SLOT=0/mozjs185
 SRC_URI=https://archive.mozilla.org/pub/js/js185-1.0.0.tar.gz https://dev.gentoo.org/~axs/distfiles/spidermonkey-slot0-patches-01.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=044a7f860d6e5713b7b0940a4158d0dd
+_md5_=e35e6d2611df242f2bb08bc72c75b82b
diff --git a/metadata/md5-cache/dev-lang/squirrel-3.1 b/metadata/md5-cache/dev-lang/squirrel-3.1
index c6e737fc7d8e..dce9004f1b79 100644
--- a/metadata/md5-cache/dev-lang/squirrel-3.1
+++ b/metadata/md5-cache/dev-lang/squirrel-3.1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=ZLIB
 SLOT=0
 SRC_URI=https://github.com/albertodemichelis/squirrel/archive/v3.1.tar.gz -> squirrel-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e0439aa9a0acdb22bce3667cf7daa238
diff --git a/metadata/md5-cache/dev-lang/vala-0.32.1 b/metadata/md5-cache/dev-lang/vala-0.32.1
index b49fe1b5ac13..e67d634ee17d 100644
--- a/metadata/md5-cache/dev-lang/vala-0.32.1
+++ b/metadata/md5-cache/dev-lang/vala-0.32.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/vala-common-0.32.1
 SLOT=0.32
 SRC_URI=mirror://gnome/sources/vala/0.32/vala-0.32.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2e3fcc42b11b399a6c40d280481fddf9
diff --git a/metadata/md5-cache/dev-lang/vala-0.34.16 b/metadata/md5-cache/dev-lang/vala-0.34.16
index 55fcef58f496..0ca945ae0f49 100644
--- a/metadata/md5-cache/dev-lang/vala-0.34.16
+++ b/metadata/md5-cache/dev-lang/vala-0.34.16
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/vala-common-0.34.16
 SLOT=0.34
 SRC_URI=mirror://gnome/sources/vala/0.34/vala-0.34.16.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7aa3dcfea42f17d41fcffb2acd20c36a
diff --git a/metadata/md5-cache/dev-lang/vala-0.34.9 b/metadata/md5-cache/dev-lang/vala-0.34.9
index 8035313402f7..3d8c4726ec69 100644
--- a/metadata/md5-cache/dev-lang/vala-0.34.9
+++ b/metadata/md5-cache/dev-lang/vala-0.34.9
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/vala-common-0.34.9
 SLOT=0.34
 SRC_URI=mirror://gnome/sources/vala/0.34/vala-0.34.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9f74931df60e102e601ad782e9124aab
diff --git a/metadata/md5-cache/dev-lang/vala-0.36.13 b/metadata/md5-cache/dev-lang/vala-0.36.13
index 14a89353989d..18b80cbca593 100644
--- a/metadata/md5-cache/dev-lang/vala-0.36.13
+++ b/metadata/md5-cache/dev-lang/vala-0.36.13
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/vala-common-0.36.13
 SLOT=0.36
 SRC_URI=mirror://gnome/sources/vala/0.36/vala-0.36.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1ece3141436fb28468d76c2fb46fe938
diff --git a/metadata/md5-cache/dev-lang/vala-0.36.14 b/metadata/md5-cache/dev-lang/vala-0.36.14
index e61985d71153..95c6c29dc162 100644
--- a/metadata/md5-cache/dev-lang/vala-0.36.14
+++ b/metadata/md5-cache/dev-lang/vala-0.36.14
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/vala-common-0.36.14
 SLOT=0.36
 SRC_URI=mirror://gnome/sources/vala/0.36/vala-0.36.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=8b88f0b395d323b9f4c1b521b115b3f9
diff --git a/metadata/md5-cache/dev-lang/vala-0.36.15 b/metadata/md5-cache/dev-lang/vala-0.36.15
index d38459f53d8c..50a94d19c2dc 100644
--- a/metadata/md5-cache/dev-lang/vala-0.36.15
+++ b/metadata/md5-cache/dev-lang/vala-0.36.15
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/vala-common-0.36.15
 SLOT=0.36
 SRC_URI=mirror://gnome/sources/vala/0.36/vala-0.36.15.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8b88f0b395d323b9f4c1b521b115b3f9
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 382e758db335..4f119dff2b89 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/MicroJSON-0.3.1 b/metadata/md5-cache/dev-libs/MicroJSON-0.3.1
index f662694eb000..c55afec78af5 100644
--- a/metadata/md5-cache/dev-libs/MicroJSON-0.3.1
+++ b/metadata/md5-cache/dev-libs/MicroJSON-0.3.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/UTF8Strings-1.12.0
 SLOT=0
 SRC_URI=http://grigory.info/distfiles/MicroJSON-0.3.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=65b3b4f8fdc456b3ba494cd637b2f644
diff --git a/metadata/md5-cache/dev-libs/MicroJSON-0.3.2 b/metadata/md5-cache/dev-libs/MicroJSON-0.3.2
index 37389b13d1c7..f83abc39c3fa 100644
--- a/metadata/md5-cache/dev-libs/MicroJSON-0.3.2
+++ b/metadata/md5-cache/dev-libs/MicroJSON-0.3.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/UTF8Strings-1.12.0
 SLOT=0
 SRC_URI=http://grigory.info/distfiles/MicroJSON-0.3.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b5e1cb7947ced422e90eca304a8083fb
diff --git a/metadata/md5-cache/dev-libs/UTF8Strings-1.14.2 b/metadata/md5-cache/dev-libs/UTF8Strings-1.14.2
index 61fb4a212cd5..49c5cf048721 100644
--- a/metadata/md5-cache/dev-libs/UTF8Strings-1.14.2
+++ b/metadata/md5-cache/dev-libs/UTF8Strings-1.14.2
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~mips x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=http://grigory.info/distfiles/UTF8Strings-1.14.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=95e1bd743cdc196a6f203a85fcdb564d
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 fa43ec51d75c..f07dd3d77776 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=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 fe698fd5d229..f4c6c955e654 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9d5ba0b8c4e6df30a3f1e5a9dceb73bf
diff --git a/metadata/md5-cache/dev-libs/appstream-0.10.6-r1 b/metadata/md5-cache/dev-libs/appstream-0.10.6-r1
index 58e5a79cef46..5c41b119a34e 100644
--- a/metadata/md5-cache/dev-libs/appstream-0.10.6-r1
+++ b/metadata/md5-cache/dev-libs/appstream-0.10.6-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+ GPL-2+
 RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/libxml2:2 dev-libs/libyaml dev-libs/snowball-stemmer qt5? ( dev-qt/qtcore:5 )
 SLOT=0/4
 SRC_URI=https://github.com/ximion/appstream/archive/APPSTREAM_0_10_6.tar.gz -> appstream-0.10.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=cec365a16cc94d122b84442378338301
diff --git a/metadata/md5-cache/dev-libs/appstream-0.11.5 b/metadata/md5-cache/dev-libs/appstream-0.11.5
index c69e09823c6d..b22e8f5934d6 100644
--- a/metadata/md5-cache/dev-libs/appstream-0.11.5
+++ b/metadata/md5-cache/dev-libs/appstream-0.11.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+ GPL-2+
 RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/libxml2:2 dev-libs/libyaml dev-libs/snowball-stemmer qt5? ( dev-qt/qtcore:5 )
 SLOT=0/4
 SRC_URI=https://github.com/ximion/appstream/archive/APPSTREAM_0_11_5.tar.gz -> appstream-0.11.5.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=280e450f2650693b1339a0340f89ffbf
diff --git a/metadata/md5-cache/dev-libs/appstream-0.12.2 b/metadata/md5-cache/dev-libs/appstream-0.12.2
index 0e0579f5ce39..cf4e13f38ddd 100644
--- a/metadata/md5-cache/dev-libs/appstream-0.12.2
+++ b/metadata/md5-cache/dev-libs/appstream-0.12.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+ GPL-2+
 RDEPEND=dev-libs/glib:2 dev-libs/libxml2:2 dev-libs/libyaml dev-libs/snowball-stemmer introspection? ( >=dev-libs/gobject-introspection-1.56:= ) qt5? ( dev-qt/qtcore:5 )
 SLOT=0/4
 SRC_URI=https://www.freedesktop.org/software/appstream/releases/AppStream-0.12.2.tar.xz
-_eclasses_=meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=42a77c1931d8d0f3199339878f250657
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 e46bbe8446b8..e1bd0c3a9649 100644
--- a/metadata/md5-cache/dev-libs/appstream-glib-0.6.13
+++ b/metadata/md5-cache/dev-libs/appstream-glib-0.6.13
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
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 c15a78a774ff..ca03170f1fcc 100644
--- a/metadata/md5-cache/dev-libs/appstream-glib-0.7.9
+++ b/metadata/md5-cache/dev-libs/appstream-glib-0.7.9
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=82ab10f4755fac4a44e0761f8945e5d2
diff --git a/metadata/md5-cache/dev-libs/apr-util-1.6.1-r3 b/metadata/md5-cache/dev-libs/apr-util-1.6.1-r3
index fa5528bf7b07..037c6db9a9e8 100644
--- a/metadata/md5-cache/dev-libs/apr-util-1.6.1-r3
+++ b/metadata/md5-cache/dev-libs/apr-util-1.6.1-r3
@@ -5,10 +5,10 @@ DESCRIPTION=Apache Portable Runtime Utility Library
 EAPI=7
 HOMEPAGE=https://apr.apache.org/
 IUSE=berkdb doc gdbm ldap libressl mysql nss odbc openssl postgres sqlite static-libs
-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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/expat >=dev-libs/apr-1.6.2:1= berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm:= ) ldap? ( =net-nds/openldap-2* ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) ) nss? ( dev-libs/nss ) odbc? ( dev-db/unixODBC ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
 SLOT=1
 SRC_URI=mirror://apache/apr/apr-util-1.6.1.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	db-use	501a5d0963e0d17f30260023f292ae8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=32bace4c1f15290ecf0f90c4ae7088ce
+_md5_=6538c47749d04d21e82886f64e58721c
diff --git a/metadata/md5-cache/dev-libs/atcore-1.0.0 b/metadata/md5-cache/dev-libs/atcore-1.0.0
index 41cecc3da18a..cbd3fc983bce 100644
--- a/metadata/md5-cache/dev-libs/atcore-1.0.0
+++ b/metadata/md5-cache/dev-libs/atcore-1.0.0
@@ -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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _md5_=0421301772e3d1e0621937ae8a9493b2
diff --git a/metadata/md5-cache/dev-libs/atk-2.22.0 b/metadata/md5-cache/dev-libs/atk-2.22.0
index 5555de990dd0..7bd6a2b2def5 100644
--- a/metadata/md5-cache/dev-libs/atk-2.22.0
+++ b/metadata/md5-cache/dev-libs/atk-2.22.0
@@ -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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/atk/2.22/atk-2.22.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c846c62afb501914a1635d392bb9383a
diff --git a/metadata/md5-cache/dev-libs/atk-2.24.0 b/metadata/md5-cache/dev-libs/atk-2.24.0
index 7d4e061938c3..adeef20ae13f 100644
--- a/metadata/md5-cache/dev-libs/atk-2.24.0
+++ b/metadata/md5-cache/dev-libs/atk-2.24.0
@@ -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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/atk/2.24/atk-2.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6256ef92ee8735bb6c648e97fac5fe5a
diff --git a/metadata/md5-cache/dev-libs/atk-2.28.1 b/metadata/md5-cache/dev-libs/atk-2.28.1
index 0c6ea8a97aed..4e4442f09d69 100644
--- a/metadata/md5-cache/dev-libs/atk-2.28.1
+++ b/metadata/md5-cache/dev-libs/atk-2.28.1
@@ -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(-)?] introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/atk/2.28/atk-2.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7cfee17d15a4884c07a5d9d0c7d378c3
diff --git a/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.5.17 b/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.5.17
index 06efb470cf83..e0159fef438c 100644
--- a/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.5.17
+++ b/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.5.17
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/aws/aws-sdk-cpp/archive/1.5.17.tar.gz -> aws-sdk-cpp-1.5.17.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=33a5fd0e8ea5608e5301df67564c4482
diff --git a/metadata/md5-cache/dev-libs/beignet-1.3.2 b/metadata/md5-cache/dev-libs/beignet-1.3.2
index 0b2b88ddbd38..d3783c733517 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _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 b77f6fd7bcef..4716d7af261d 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _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 ffb1b4eb7153..20f2dbfef3ca 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _md5_=ac07311900560eaf74d5bee29a87e346
diff --git a/metadata/md5-cache/dev-libs/beignet-9999 b/metadata/md5-cache/dev-libs/beignet-9999
index d080f7e82458..3ceb7edb99a9 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _md5_=e90fdbc23a2131ab6144c2864d9000fe
diff --git a/metadata/md5-cache/dev-libs/boost-numpy-9999 b/metadata/md5-cache/dev-libs/boost-numpy-9999
index 3e35cacd0d5e..19d5ac4cb7ee 100644
--- a/metadata/md5-cache/dev-libs/boost-numpy-9999
+++ b/metadata/md5-cache/dev-libs/boost-numpy-9999
@@ -8,5 +8,5 @@ LICENSE=Boost-1.0
 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/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-libs/boost[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
 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
-_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=43e315e9a419d769b3a5fbc06a42a8ff
diff --git a/metadata/md5-cache/dev-libs/botan-1.10.17 b/metadata/md5-cache/dev-libs/botan-1.10.17
deleted file mode 100644
index f9ef0ec6850e..000000000000
--- a/metadata/md5-cache/dev-libs/botan-1.10.17
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/python:* doc? ( dev-python/sphinx )
-DEFINED_PHASES=compile configure install prepare 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 python bzip2 gmp libressl ssl static-libs threads 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 ) 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-libs/boost-1.48[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(-)] ) gmp? ( >=dev-libs/gmp-4.2.2:* ) ssl? ( !libressl? ( <dev-libs/openssl-1.1: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=0
-SRC_URI=https://botan.randombit.net/releases/Botan-1.10.17.tgz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=754694885cf39237afa207d409a61f90
diff --git a/metadata/md5-cache/dev-libs/botan-1.10.17-r2 b/metadata/md5-cache/dev-libs/botan-1.10.17-r2
new file mode 100644
index 000000000000..88b68a1075f9
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/botan-1.10.17-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/python:* doc? ( dev-python/sphinx )
+DEFINED_PHASES=compile configure install prepare 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 python bzip2 gmp libressl ssl static-libs threads 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 ) 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-libs/boost-1.48[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(-)] ) gmp? ( >=dev-libs/gmp-4.2.2:* ) ssl? ( !libressl? ( <dev-libs/openssl-1.1: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=0
+SRC_URI=https://botan.randombit.net/releases/Botan-1.10.17.tgz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=f78288a0b87a8b49564d76f35b23f5ce
diff --git a/metadata/md5-cache/dev-libs/botan-2.7.0 b/metadata/md5-cache/dev-libs/botan-2.7.0
index 23274adb44f9..9693390f523c 100644
--- a/metadata/md5-cache/dev-libs/botan-2.7.0
+++ b/metadata/md5-cache/dev-libs/botan-2.7.0
@@ -5,11 +5,11 @@ 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
+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.7
 SRC_URI=https://botan.randombit.net/releases/Botan-2.7.0.tgz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=400eb153cd7d09760c61a167d3ff01da
+_md5_=e7b764f6b5cf91a939e0696ef8cb0fa1
diff --git a/metadata/md5-cache/dev-libs/btparser-0.25 b/metadata/md5-cache/dev-libs/btparser-0.25
index e59164b027fe..0bcde3869e18 100644
--- a/metadata/md5-cache/dev-libs/btparser-0.25
+++ b/metadata/md5-cache/dev-libs/btparser-0.25
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=test
 SLOT=0/2
 SRC_URI=https://fedorahosted.org/released/btparser/btparser-0.25.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8bb6f17b9e87b7a0d28eac05449e727e
diff --git a/metadata/md5-cache/dev-libs/btparser-0.26 b/metadata/md5-cache/dev-libs/btparser-0.26
index 7466a66a2efb..0021be76ec31 100644
--- a/metadata/md5-cache/dev-libs/btparser-0.26
+++ b/metadata/md5-cache/dev-libs/btparser-0.26
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=test
 SLOT=0/2
 SRC_URI=https://github.com/abrt/btparser/archive/0.26.tar.gz -> btparser-0.26.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6b5f30bb14a886ef7c6c3f414cbe2b1e
diff --git a/metadata/md5-cache/dev-libs/c-blosc-1.11.2 b/metadata/md5-cache/dev-libs/c-blosc-1.11.2
index 3bdc07f4ce78..1ea0208d7c27 100644
--- a/metadata/md5-cache/dev-libs/c-blosc-1.11.2
+++ b/metadata/md5-cache/dev-libs/c-blosc-1.11.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=lz4? ( >=app-arch/lz4-1.7.5:= ) snappy? ( app-arch/snappy ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd )
 SLOT=0/1
 SRC_URI=https://github.com/Blosc/c-blosc/archive/v1.11.2.tar.gz -> c-blosc-1.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ada74c8eccd1742c869592e520132e9d
diff --git a/metadata/md5-cache/dev-libs/caliper-1.5.0 b/metadata/md5-cache/dev-libs/caliper-1.5.0
index e293c02b6be9..dc17571b79a6 100644
--- a/metadata/md5-cache/dev-libs/caliper-1.5.0
+++ b/metadata/md5-cache/dev-libs/caliper-1.5.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=net-misc/curl sys-libs/libunwind dev-libs/papi
 SLOT=0
 SRC_URI=https://github.com/LLNL/caliper/archive/v1.5.0.tar.gz -> caliper-1.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=1bdd47a2cf827d6b42970482c8191f97
diff --git a/metadata/md5-cache/dev-libs/capstone-3.0.5_rc2-r1 b/metadata/md5-cache/dev-libs/capstone-3.0.5_rc2-r1
index 5595cb318448..b0ed8a8f2804 100644
--- a/metadata/md5-cache/dev-libs/capstone-3.0.5_rc2-r1
+++ b/metadata/md5-cache/dev-libs/capstone-3.0.5_rc2-r1
@@ -10,5 +10,5 @@ RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) p
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0/3
 SRC_URI=https://github.com/aquynh/capstone/archive/3.0.5-rc2.tar.gz -> capstone-3.0.5_rc2.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0218c2978ec2600d68e33347c1d5b752
diff --git a/metadata/md5-cache/dev-libs/cereal-1.2.1 b/metadata/md5-cache/dev-libs/cereal-1.2.1
index 22b62708a795..676280e55d74 100644
--- a/metadata/md5-cache/dev-libs/cereal-1.2.1
+++ b/metadata/md5-cache/dev-libs/cereal-1.2.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/USCiLab/cereal/archive/v1.2.1.tar.gz -> cereal-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=65ad45ba77e2b182b46eb802e3d675cc
diff --git a/metadata/md5-cache/dev-libs/cereal-1.2.2 b/metadata/md5-cache/dev-libs/cereal-1.2.2
index 8b6c3248d1ee..2a410aef4694 100644
--- a/metadata/md5-cache/dev-libs/cereal-1.2.2
+++ b/metadata/md5-cache/dev-libs/cereal-1.2.2
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/USCiLab/cereal/archive/v1.2.2.tar.gz -> cereal-1.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=ad345526d77d24847f955b06730282e3
diff --git a/metadata/md5-cache/dev-libs/collada-dom-2.5.0 b/metadata/md5-cache/dev-libs/collada-dom-2.5.0
index 62e06d957aa3..1e0a19d3bcbd 100644
--- a/metadata/md5-cache/dev-libs/collada-dom-2.5.0
+++ b/metadata/md5-cache/dev-libs/collada-dom-2.5.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/boost:= sys-libs/zlib:=[minizip] dev-libs/libxml2 dev-libs/libpcre[cxx]
 SLOT=0/25
 SRC_URI=https://github.com/rdiankov/collada-dom/archive/v2.5.0.tar.gz -> collada-dom-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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=ef441eeab2e2a32fbe1ade89ceded941
diff --git a/metadata/md5-cache/dev-libs/collada-dom-9999 b/metadata/md5-cache/dev-libs/collada-dom-9999
index c79d65e03684..b43b10c2b704 100644
--- a/metadata/md5-cache/dev-libs/collada-dom-9999
+++ b/metadata/md5-cache/dev-libs/collada-dom-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/rdiankov/collada-dom
 LICENSE=MIT
 RDEPEND=dev-libs/boost:= sys-libs/zlib:=[minizip] dev-libs/libxml2:= dev-libs/libpcre:=[cxx]
 SLOT=0/25
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6952f3c6e949caa0ec0449dada0dbe30
diff --git a/metadata/md5-cache/dev-libs/console_bridge-0.4.0 b/metadata/md5-cache/dev-libs/console_bridge-0.4.0
index 7ca2bc237d97..8c287f33bba1 100644
--- a/metadata/md5-cache/dev-libs/console_bridge-0.4.0
+++ b/metadata/md5-cache/dev-libs/console_bridge-0.4.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost:=[threads]
 SLOT=0/4
 SRC_URI=https://github.com/ros/console_bridge/archive/0.4.0.tar.gz -> console_bridge-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c41890e6a6483cac7e67175e1b9907e1
diff --git a/metadata/md5-cache/dev-libs/console_bridge-9999 b/metadata/md5-cache/dev-libs/console_bridge-9999
index 393eee1ba0b0..79307a263c70 100644
--- a/metadata/md5-cache/dev-libs/console_bridge-9999
+++ b/metadata/md5-cache/dev-libs/console_bridge-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://wiki.ros.org/console_bridge
 LICENSE=BSD
 RDEPEND=dev-libs/boost:=[threads]
 SLOT=0/4
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c41890e6a6483cac7e67175e1b9907e1
diff --git a/metadata/md5-cache/dev-libs/cppcodec-0.1 b/metadata/md5-cache/dev-libs/cppcodec-0.1
index dbe881ed74d1..11f608310dba 100644
--- a/metadata/md5-cache/dev-libs/cppcodec-0.1
+++ b/metadata/md5-cache/dev-libs/cppcodec-0.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tplgy/cppcodec/archive/v0.1.tar.gz -> cppcodec-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0f668bf77563d1362e5a3924d7d4257c
diff --git a/metadata/md5-cache/dev-libs/cppcodec-0.2 b/metadata/md5-cache/dev-libs/cppcodec-0.2
index 9e2c13958046..03b27b677095 100644
--- a/metadata/md5-cache/dev-libs/cppcodec-0.2
+++ b/metadata/md5-cache/dev-libs/cppcodec-0.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tplgy/cppcodec/archive/v0.2.tar.gz -> cppcodec-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ebc8959d543b30c6b2e9eb2cdaee5688
diff --git a/metadata/md5-cache/dev-libs/cppcodec-9999 b/metadata/md5-cache/dev-libs/cppcodec-9999
index bff02d6bb3ad..e3a68fc02b45 100644
--- a/metadata/md5-cache/dev-libs/cppcodec-9999
+++ b/metadata/md5-cache/dev-libs/cppcodec-9999
@@ -7,5 +7,5 @@ IUSE=test
 LICENSE=MIT
 RESTRICT=!test? ( test )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0f668bf77563d1362e5a3924d7d4257c
diff --git a/metadata/md5-cache/dev-libs/crypto++-7.0.0-r2 b/metadata/md5-cache/dev-libs/crypto++-7.0.0-r2
index 67c8a525a2eb..0b35de1809ef 100644
--- a/metadata/md5-cache/dev-libs/crypto++-7.0.0-r2
+++ b/metadata/md5-cache/dev-libs/crypto++-7.0.0-r2
@@ -4,9 +4,9 @@ DESCRIPTION=C++ class library of cryptographic schemes
 EAPI=7
 HOMEPAGE=https://cryptopp.com
 IUSE=+asm static-libs
-KEYWORDS=alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc ~x86 ~x64-macos
+KEYWORDS=alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86 ~x64-macos
 LICENSE=Boost-1.0
 SLOT=0/7
 SRC_URI=https://www.cryptopp.com/cryptopp700.zip
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=8c91e706764ae476f60495ec374159cc
+_md5_=12209982a1da3e5663015b7b5ca0e145
diff --git a/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p03-r1 b/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p03-r1
index 726acc323003..69b71082a042 100644
--- a/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p03-r1
+++ b/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p03-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=sys-apps/pcsc-lite virtual/libusb:1 fox? ( >=x11-libs/fox-1.6 ) xml? ( dev-libs/libxml2 ) udev? ( virtual/udev )
 SLOT=0
 SRC_URI=http://support.reiner-sct.de/downloads/LINUX/V3.99.5_SP03/pcsc-cyberjack_3.99.5final.SP03.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e0909e29be7a32f464ab6a7a3687401c
diff --git a/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p10 b/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p10
index 49dbe588ed5f..5920068e2024 100644
--- a/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p10
+++ b/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p10
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=sys-apps/pcsc-lite usb? ( virtual/libusb:1 ) udev? ( virtual/udev )
 SLOT=0
 SRC_URI=http://support.reiner-sct.de/downloads/LINUX/V3.99.5_SP10/pcsc-cyberjack-3.99.5final.SP10.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=09d17465522890d801e5357782316a9b
diff --git a/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p11 b/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p11
index e5c9892b8d7e..7e4f08bd1329 100644
--- a/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p11
+++ b/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p11
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=sys-apps/pcsc-lite usb? ( virtual/libusb:1 ) udev? ( virtual/udev )
 SLOT=0
 SRC_URI=http://support.reiner-sct.de/downloads/LINUX/V3.99.5_SP11/pcsc-cyberjack-3.99.5final.SP11.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=6f84b3908d82c54ab749d209ccd24725
diff --git a/metadata/md5-cache/dev-libs/dbus-glib-0.110 b/metadata/md5-cache/dev-libs/dbus-glib-0.110
index c896e6ef7989..994dfa22392b 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_=705c49dad4bdf4b79d9adeb9150fd23c
+_md5_=a77ee91777e82297347acaee204d6765
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 6683265eab73..b121f77dec0e 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=213f9c18c1eed9dd8dd58e052c22b565
diff --git a/metadata/md5-cache/dev-libs/distorm64-3.3.3 b/metadata/md5-cache/dev-libs/distorm64-3.3.3
index de2561a08f9f..7cc221bf78f7 100644
--- a/metadata/md5-cache/dev-libs/distorm64-3.3.3
+++ b/metadata/md5-cache/dev-libs/distorm64-3.3.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=0
 SRC_URI=https://github.com/gdabah/distorm/archive/v3.3.3.tar.gz -> distorm-3.3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d5cf3900e1f1e93c2f46a23ceebf2553
diff --git a/metadata/md5-cache/dev-libs/distorm64-3.3.4 b/metadata/md5-cache/dev-libs/distorm64-3.3.4
index 5639bdfddd2b..bedd4a5ce3ef 100644
--- a/metadata/md5-cache/dev-libs/distorm64-3.3.4
+++ b/metadata/md5-cache/dev-libs/distorm64-3.3.4
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/gdabah/distorm/archive/v3.3.4.tar.gz -> distorm-3.3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c4fa7f4de7ec41ed6bb77bac91626b9a
diff --git a/metadata/md5-cache/dev-libs/double-conversion-3.0.0 b/metadata/md5-cache/dev-libs/double-conversion-3.0.0
index 71789ffe4930..98b0861e5aa0 100644
--- a/metadata/md5-cache/dev-libs/double-conversion-3.0.0
+++ b/metadata/md5-cache/dev-libs/double-conversion-3.0.0
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linu
 LICENSE=BSD
 SLOT=0/1
 SRC_URI=https://github.com/google/double-conversion/archive/v3.0.0.tar.gz -> double-conversion-3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=800ce55c594f88b905cd34d31a3dc7e5
diff --git a/metadata/md5-cache/dev-libs/double-conversion-3.0.0-r1 b/metadata/md5-cache/dev-libs/double-conversion-3.0.0-r1
index ea3f136e97c5..91294fbe2f18 100644
--- a/metadata/md5-cache/dev-libs/double-conversion-3.0.0-r1
+++ b/metadata/md5-cache/dev-libs/double-conversion-3.0.0-r1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd
 LICENSE=BSD
 SLOT=0/1
 SRC_URI=https://github.com/google/double-conversion/archive/v3.0.0.tar.gz -> double-conversion-3.0.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	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=258cc140026cee62d1b9b11c93cd4bbb
diff --git a/metadata/md5-cache/dev-libs/eekboard-1.0.8_p20121001 b/metadata/md5-cache/dev-libs/eekboard-1.0.8_p20121001
index 4014b11d08f5..774e230d2f6a 100644
--- a/metadata/md5-cache/dev-libs/eekboard-1.0.8_p20121001
+++ b/metadata/md5-cache/dev-libs/eekboard-1.0.8_p20121001
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-core dev-libs/glib:2 dev-libs/libcroco virtual
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=https://github.com/ueno/eekboard/archive/e212262f29e022bdf7047861263ceea0c373e916.tar.gz -> eekboard-1.0.8_p20121001.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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1f07bdc5193b427e609306d816b1e2bb
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 7dd3bf3ee9f0..62b12c1ed7e1 100644
--- a/metadata/md5-cache/dev-libs/efl-1.20.7-r1
+++ b/metadata/md5-cache/dev-libs/efl-1.20.7-r1
@@ -10,5 +10,5 @@ RDEPEND=media-libs/libpng:0= sys-apps/dbus sys-apps/util-linux sys-libs/zlib:= v
 REQUIRED_USE=?? ( opengl egl ) ?? ( opengl gles ) fbcon? ( !tslib ) gles? ( || ( X wayland ) !sdl egl ) ibus? ( glib ) opengl? ( X ) pulseaudio? ( sound ) sdl? ( opengl ) vnc? ( X fbcon ) wayland? ( egl gles !opengl ) xim? ( X )
 SLOT=0
 SRC_URI=https://download.enlightenment.org/rel/libs/efl/efl-1.20.7.tar.xz
-_eclasses_=desktop	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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-libs/efl-1.21.0 b/metadata/md5-cache/dev-libs/efl-1.21.0
index e740a0d9f2cd..b63bbcb1665d 100644
--- a/metadata/md5-cache/dev-libs/efl-1.21.0
+++ b/metadata/md5-cache/dev-libs/efl-1.21.0
@@ -10,5 +10,5 @@ RDEPEND=net-misc/curl media-libs/libpng:0= sys-apps/dbus sys-apps/util-linux sys
 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	89bb9f083a2590d9b447fd0b78a96186
+_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 f17d65e91f39..c36c2b747e6c 100644
--- a/metadata/md5-cache/dev-libs/efl-1.21.1
+++ b/metadata/md5-cache/dev-libs/efl-1.21.1
@@ -10,5 +10,5 @@ RDEPEND=net-misc/curl media-libs/libpng:0= sys-apps/dbus sys-apps/util-linux sys
 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.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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-libs/fddl-20111124-r1 b/metadata/md5-cache/dev-libs/fddl-20111124-r1
index cffdbbc5b3f5..389e7b437a9c 100644
--- a/metadata/md5-cache/dev-libs/fddl-20111124-r1
+++ b/metadata/md5-cache/dev-libs/fddl-20111124-r1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/fddl-20111124.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e2eabfc350779e711a9f3a82fb40155e
diff --git a/metadata/md5-cache/dev-libs/flatbuffers-1.10.0 b/metadata/md5-cache/dev-libs/flatbuffers-1.10.0
new file mode 100644
index 000000000000..195055b34e86
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/flatbuffers-1.10.0
@@ -0,0 +1,12 @@
+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.10.0.tar.gz -> flatbuffers-1.10.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_=5205eaee5eda6bc2c977d9bfa83640f1
diff --git a/metadata/md5-cache/dev-libs/flatbuffers-1.8.0-r1 b/metadata/md5-cache/dev-libs/flatbuffers-1.8.0-r1
index d2f81224f8f0..74649eaf96fe 100644
--- a/metadata/md5-cache/dev-libs/flatbuffers-1.8.0-r1
+++ b/metadata/md5-cache/dev-libs/flatbuffers-1.8.0-r1
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
index 7d17568b9252..a55db29f22eb 100644
--- a/metadata/md5-cache/dev-libs/flatbuffers-1.9.0
+++ b/metadata/md5-cache/dev-libs/flatbuffers-1.9.0
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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/folks-0.11.4 b/metadata/md5-cache/dev-libs/folks-0.11.4
index 4272e0153b16..523bf4dfee2b 100644
--- a/metadata/md5-cache/dev-libs/folks-0.11.4
+++ b/metadata/md5-cache/dev-libs/folks-0.11.4
@@ -10,5 +10,5 @@ RDEPEND=|| ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-l
 REQUIRED_USE=bluetooth? ( eds )
 SLOT=0/25
 SRC_URI=mirror://gnome/sources/folks/0.11/folks-0.11.4.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f2f70f4c555b92c8da0d90e8fd91cde6
diff --git a/metadata/md5-cache/dev-libs/gdl-3.22.0 b/metadata/md5-cache/dev-libs/gdl-3.22.0
index b4b15fffbdbe..3e2247fc2168 100644
--- a/metadata/md5-cache/dev-libs/gdl-3.22.0
+++ b/metadata/md5-cache/dev-libs/gdl-3.22.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib:2 >=x11-libs/gtk+-3.0.0:3[introspection?] >=dev-libs/libxml2-2.4:2 introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
 SLOT=3/5
 SRC_URI=mirror://gnome/sources/gdl/3.22/gdl-3.22.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6818a1c35b33ebc22f9546899cd30730
diff --git a/metadata/md5-cache/dev-libs/gdl-3.28.0 b/metadata/md5-cache/dev-libs/gdl-3.28.0
index 08a19113ceea..d1cbcc6e6f7e 100644
--- a/metadata/md5-cache/dev-libs/gdl-3.28.0
+++ b/metadata/md5-cache/dev-libs/gdl-3.28.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib:2 >=x11-libs/gtk+-3.0.0:3[introspection?] >=dev-libs/libxml2-2.4:2 introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
 SLOT=3/5
 SRC_URI=mirror://gnome/sources/gdl/3.28/gdl-3.28.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=eb976386d7281148561aac9be049b0b6
diff --git a/metadata/md5-cache/dev-libs/gjs-1.46.0 b/metadata/md5-cache/dev-libs/gjs-1.46.0
index 0e8b082fdc60..b37bc2c39645 100644
--- a/metadata/md5-cache/dev-libs/gjs-1.46.0
+++ b/metadata/md5-cache/dev-libs/gjs-1.46.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/gobject-introspection-1.41.4:= sys-libs/readline:0 dev-lang/spidermonkey:24 virtual/libffi cairo? ( x11-libs/cairo[X] ) gtk? ( x11-libs/gtk+:3 ) gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig test? ( sys-apps/dbus ) >=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/glib-2.36:2 >=dev-libs/gobject-introspection-1.41.4:= sys-libs/readline:0 dev-lang/spidermonkey:24 virtual/libffi:= cairo? ( x11-libs/cairo[X] ) gtk? ( x11-libs/gtk+:3 ) gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig test? ( sys-apps/dbus ) >=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=Javascript bindings for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Gjs
 IUSE=+cairo examples gtk test test
 KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86
 LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
-RDEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/gobject-introspection-1.41.4:= sys-libs/readline:0 dev-lang/spidermonkey:24 virtual/libffi cairo? ( x11-libs/cairo[X] ) gtk? ( x11-libs/gtk+:3 )
+RDEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/gobject-introspection-1.41.4:= sys-libs/readline:0 dev-lang/spidermonkey:24 virtual/libffi:= cairo? ( x11-libs/cairo[X] ) gtk? ( x11-libs/gtk+:3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gjs/1.46/gjs-1.46.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=c703289be07c85402ee67fb4635968f2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=2ab32951746fbcbfc4f5a08a271432ef
diff --git a/metadata/md5-cache/dev-libs/gjs-1.48.7 b/metadata/md5-cache/dev-libs/gjs-1.48.7
index 1907c6f4f424..19940b3b368e 100644
--- a/metadata/md5-cache/dev-libs/gjs-1.48.7
+++ b/metadata/md5-cache/dev-libs/gjs-1.48.7
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.52.1 >=dev-libs/gobject-introspection-1.52.1:= sys-libs/readline:0= dev-lang/spidermonkey:38 virtual/libffi cairo? ( x11-libs/cairo[X] ) gtk? ( >=x11-libs/gtk+-3.20:3 ) gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig test? ( sys-apps/dbus ) >=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/glib-2.52.1 >=dev-libs/gobject-introspection-1.52.1:= sys-libs/readline:0= dev-lang/spidermonkey:38 virtual/libffi:= cairo? ( x11-libs/cairo[X] ) gtk? ( >=x11-libs/gtk+-3.20:3 ) gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig test? ( sys-apps/dbus ) >=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=Javascript bindings for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Gjs
 IUSE=+cairo examples gtk test test
-KEYWORDS=alpha amd64 ~arm ia64 ~ppc ~ppc64 sparc x86
+KEYWORDS=alpha amd64 ~arm ia64 ppc ~ppc64 sparc x86
 LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
-RDEPEND=>=dev-libs/glib-2.52.1 >=dev-libs/gobject-introspection-1.52.1:= sys-libs/readline:0= dev-lang/spidermonkey:38 virtual/libffi cairo? ( x11-libs/cairo[X] ) gtk? ( >=x11-libs/gtk+-3.20:3 )
+RDEPEND=>=dev-libs/glib-2.52.1 >=dev-libs/gobject-introspection-1.52.1:= sys-libs/readline:0= dev-lang/spidermonkey:38 virtual/libffi:= cairo? ( x11-libs/cairo[X] ) gtk? ( >=x11-libs/gtk+-3.20:3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gjs/1.48/gjs-1.48.7.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=f5fa7192fb2c88ec90f53a7b4c9c97b0
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=037c8166cddb45672eddea7b6e2c9b75
diff --git a/metadata/md5-cache/dev-libs/gjs-1.50.4 b/metadata/md5-cache/dev-libs/gjs-1.50.4
index 3ae4313d994e..679874c2d03c 100644
--- a/metadata/md5-cache/dev-libs/gjs-1.50.4
+++ b/metadata/md5-cache/dev-libs/gjs-1.50.4
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.52.1 >=dev-libs/gobject-introspection-1.53.4:= sys-libs/readline:0= dev-lang/spidermonkey:52 virtual/libffi cairo? ( x11-libs/cairo[X] ) gtk? ( >=x11-libs/gtk+-3.20:3 ) gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig test? ( sys-apps/dbus ) >=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/glib-2.52.1 >=dev-libs/gobject-introspection-1.53.4:= sys-libs/readline:0= dev-lang/spidermonkey:52 virtual/libffi:= cairo? ( x11-libs/cairo[X] ) gtk? ( >=x11-libs/gtk+-3.20:3 ) gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig test? ( sys-apps/dbus ) >=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=Javascript bindings for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Gjs
 IUSE=+cairo examples gtk test test
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
-RDEPEND=>=dev-libs/glib-2.52.1 >=dev-libs/gobject-introspection-1.53.4:= sys-libs/readline:0= dev-lang/spidermonkey:52 virtual/libffi cairo? ( x11-libs/cairo[X] ) gtk? ( >=x11-libs/gtk+-3.20:3 )
+RDEPEND=>=dev-libs/glib-2.52.1 >=dev-libs/gobject-introspection-1.53.4:= sys-libs/readline:0= dev-lang/spidermonkey:52 virtual/libffi:= cairo? ( x11-libs/cairo[X] ) gtk? ( >=x11-libs/gtk+-3.20:3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gjs/1.50/gjs-1.50.4.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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=0fbcb4e146ccb437b9708b14b4cc3895
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4bd54440b926cf57bf72f4dedc4059df
diff --git a/metadata/md5-cache/dev-libs/glib-2.52.3 b/metadata/md5-cache/dev-libs/glib-2.52.3
index 636c9543db34..5044494221dd 100644
--- a/metadata/md5-cache/dev-libs/glib-2.52.3
+++ b/metadata/md5-cache/dev-libs/glib-2.52.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=!<dev-util/gdbus-codegen-2.52.3 >=dev-libs/libpcre-8.13: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(-)?,static-libs?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/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(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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(-)?] kernel_linux? ( 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(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-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(-)?] ) xattr? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fam? ( >=virtual/fam-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(-)?] ) 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_python2_7(-)] >=dev-util/gdbus-codegen-2.52.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/libelf:0= ) app-text/docbook-xml-dtd:4.1.2 >=dev-libs/libxslt-1.0 >=sys-devel/gettext-0.11 >=dev-util/gtk-doc-am-1.20 systemtap? ( >=dev-util/systemtap-1.3 ) test? ( sys-devel/gdb python_targets_python2_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/gdbus-codegen-2.52.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-apps/dbus-1.2.14 ) !<dev-util/gtk-doc-1.15-r2 >=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-portage/elt-patches-20170317 app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=!<dev-util/gdbus-codegen-2.52.3 >=dev-libs/libpcre-8.13: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(-)?,static-libs?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/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(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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(-)?] kernel_linux? ( 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(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-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(-)?] ) xattr? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fam? ( >=virtual/fam-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(-)?] ) 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_python2_7(-)] >=dev-util/gdbus-codegen-2.52.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/libelf:0= ) app-text/docbook-xml-dtd:4.1.2 >=dev-libs/libxslt-1.0 >=sys-devel/gettext-0.11 >=dev-util/gtk-doc-am-1.20 systemtap? ( >=dev-util/systemtap-1.3 ) test? ( sys-devel/gdb python_targets_python2_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/gdbus-codegen-2.52.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-apps/dbus-1.2.14 ) !<dev-util/gtk-doc-1.15-r2 >=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-portage/elt-patches-20170317 app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=The GLib library of C routines
 EAPI=6
 HOMEPAGE=https://www.gtk.org/
@@ -7,9 +7,9 @@ IUSE=dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
 PDEPEND=!<gnome-base/gvfs-1.6.4-r990 dbus? ( gnome-base/dconf ) mime? ( x11-misc/shared-mime-info )
-RDEPEND=!<dev-util/gdbus-codegen-2.52.3 >=dev-libs/libpcre-8.13: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(-)?,static-libs?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/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(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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(-)?] kernel_linux? ( 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(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-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(-)?] ) xattr? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fam? ( >=virtual/fam-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(-)?] ) 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_python2_7(-)] >=dev-util/gdbus-codegen-2.52.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/libelf:0= )
+RDEPEND=!<dev-util/gdbus-codegen-2.52.3 >=dev-libs/libpcre-8.13: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(-)?,static-libs?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/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(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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(-)?] kernel_linux? ( 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(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-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(-)?] ) xattr? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fam? ( >=virtual/fam-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(-)?] ) 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_python2_7(-)] >=dev-util/gdbus-codegen-2.52.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/libelf:0= )
 REQUIRED_USE=utils? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.52/glib-2.52.3.tar.xz https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=ac64d8ebf00d8194df2a915511fa1aae
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ef562fe6515c70eb6a4a1ffbb77cae32
diff --git a/metadata/md5-cache/dev-libs/glib-2.54.3-r6 b/metadata/md5-cache/dev-libs/glib-2.54.3-r6
index 2d1963827428..f746897c4577 100644
--- a/metadata/md5-cache/dev-libs/glib-2.54.3-r6
+++ b/metadata/md5-cache/dev-libs/glib-2.54.3-r6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=!<dev-util/gdbus-codegen-2.54.3 >=dev-libs/libpcre-8.13: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(-)?,static-libs?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/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(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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(-)?] kernel_linux? ( 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(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-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(-)?] ) xattr? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fam? ( >=virtual/fam-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(-)?] ) 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 ) python_single_target_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] utils? ( >=dev-util/gdbus-codegen-2.54.3 virtual/libelf:0= ) app-text/docbook-xml-dtd:4.1.2 >=dev-libs/libxslt-1.0 >=sys-devel/gettext-0.11 >=dev-util/gtk-doc-am-1.20 systemtap? ( >=dev-util/systemtap-1.3 ) test? ( sys-devel/gdb 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 ) python_single_target_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-util/gdbus-codegen-2.54.3 >=sys-apps/dbus-1.2.14 ) !<dev-util/gtk-doc-1.15-r2 >=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-portage/elt-patches-20170317 app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=!<dev-util/gdbus-codegen-2.54.3 >=dev-libs/libpcre-8.13: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(-)?,static-libs?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/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(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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(-)?] kernel_linux? ( 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(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-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(-)?] ) xattr? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fam? ( >=virtual/fam-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(-)?] ) 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 ) python_single_target_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] utils? ( >=dev-util/gdbus-codegen-2.54.3 virtual/libelf:0= ) app-text/docbook-xml-dtd:4.1.2 >=dev-libs/libxslt-1.0 >=sys-devel/gettext-0.11 >=dev-util/gtk-doc-am-1.20 systemtap? ( >=dev-util/systemtap-1.3 ) test? ( sys-devel/gdb 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 ) python_single_target_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-util/gdbus-codegen-2.54.3 >=sys-apps/dbus-1.2.14 ) !<dev-util/gtk-doc-1.15-r2 >=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-portage/elt-patches-20170317 app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=The GLib library of C routines
 EAPI=6
 HOMEPAGE=https://www.gtk.org/
@@ -7,9 +7,9 @@ IUSE=dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
 PDEPEND=!<gnome-base/gvfs-1.6.4-r990 dbus? ( gnome-base/dconf ) mime? ( x11-misc/shared-mime-info )
-RDEPEND=!<dev-util/gdbus-codegen-2.54.3 >=dev-libs/libpcre-8.13: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(-)?,static-libs?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/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(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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(-)?] kernel_linux? ( 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(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-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(-)?] ) xattr? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fam? ( >=virtual/fam-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(-)?] ) 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 ) python_single_target_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] utils? ( >=dev-util/gdbus-codegen-2.54.3 virtual/libelf:0= )
+RDEPEND=!<dev-util/gdbus-codegen-2.54.3 >=dev-libs/libpcre-8.13: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(-)?,static-libs?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/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(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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(-)?] kernel_linux? ( 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(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-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(-)?] ) xattr? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fam? ( >=virtual/fam-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(-)?] ) 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 ) python_single_target_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] utils? ( >=dev-util/gdbus-codegen-2.54.3 virtual/libelf:0= )
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) test? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.54/glib-2.54.3.tar.xz https://dev.gentoo.org/~leio/distfiles/glib-2.54.3-patchset.tar.xz https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	e85f015e815dd463b0c206d781ef45a5	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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=9947d2e9e457e86d40ad4ad2d0545039
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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	pax-utils	e85f015e815dd463b0c206d781ef45a5	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_=6968e6ebe429c15de8a60b38c461175e
diff --git a/metadata/md5-cache/dev-libs/glib-2.56.2 b/metadata/md5-cache/dev-libs/glib-2.56.2
index 47eb9e46c48c..ca7f9cb77cc8 100644
--- a/metadata/md5-cache/dev-libs/glib-2.56.2
+++ b/metadata/md5-cache/dev-libs/glib-2.56.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=!<dev-util/gdbus-codegen-2.56.2 >=dev-libs/libpcre-8.13: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(-)?,static-libs?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/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(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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(-)?] kernel_linux? ( 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(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-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(-)?] ) xattr? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fam? ( >=virtual/fam-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(-)?] ) utils? ( >=dev-util/gdbus-codegen-2.56.2 virtual/libelf:0= ) app-text/docbook-xml-dtd:4.1.2 >=dev-libs/libxslt-1.0 >=sys-devel/gettext-0.11 >=dev-util/gtk-doc-am-1.20 systemtap? ( >=dev-util/systemtap-1.3 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) test? ( sys-devel/gdb >=dev-util/gdbus-codegen-2.56.2 >=sys-apps/dbus-1.2.14 ) !<dev-util/gtk-doc-1.15-r2 >=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-portage/elt-patches-20170317 app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=!<dev-util/gdbus-codegen-2.56.2 >=dev-libs/libpcre-8.13: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(-)?,static-libs?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/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(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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(-)?] kernel_linux? ( 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(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-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(-)?] ) xattr? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fam? ( >=virtual/fam-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(-)?] ) utils? ( >=dev-util/gdbus-codegen-2.56.2 virtual/libelf:0= ) app-text/docbook-xml-dtd:4.1.2 >=dev-libs/libxslt-1.0 >=sys-devel/gettext-0.11 >=dev-util/gtk-doc-am-1.20 systemtap? ( >=dev-util/systemtap-1.3 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) test? ( sys-devel/gdb >=dev-util/gdbus-codegen-2.56.2 >=sys-apps/dbus-1.2.14 ) !<dev-util/gtk-doc-1.15-r2 >=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-portage/elt-patches-20170317 app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=The GLib library of C routines
 EAPI=6
 HOMEPAGE=https://www.gtk.org/
@@ -7,8 +7,8 @@ IUSE=dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
 PDEPEND=dbus? ( gnome-base/dconf ) mime? ( x11-misc/shared-mime-info )
-RDEPEND=!<dev-util/gdbus-codegen-2.56.2 >=dev-libs/libpcre-8.13: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(-)?,static-libs?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/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(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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(-)?] kernel_linux? ( 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(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-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(-)?] ) xattr? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fam? ( >=virtual/fam-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(-)?] ) utils? ( >=dev-util/gdbus-codegen-2.56.2 virtual/libelf:0= ) >=dev-util/glib-utils-2.56.2
+RDEPEND=!<dev-util/gdbus-codegen-2.56.2 >=dev-libs/libpcre-8.13: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(-)?,static-libs?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/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(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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(-)?] kernel_linux? ( 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(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-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(-)?] ) xattr? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fam? ( >=virtual/fam-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(-)?] ) utils? ( >=dev-util/gdbus-codegen-2.56.2 virtual/libelf:0= ) >=dev-util/glib-utils-2.56.2
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.56/glib-2.56.2.tar.xz https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=6360011c52c7bb708b9211f442ecc94b
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=15f18cbbb6186ef4f490390a4b071983
diff --git a/metadata/md5-cache/dev-libs/gmime-2.6.23 b/metadata/md5-cache/dev-libs/gmime-2.6.23
index dee4e5dd734d..5a22b0eed49f 100644
--- a/metadata/md5-cache/dev-libs/gmime-2.6.23
+++ b/metadata/md5-cache/dev-libs/gmime-2.6.23
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.32.0:2 sys-libs/zlib mono? ( dev-lang/mono >=dev-dotnet/gtk-sharp-2.12.21:2 ) smime? ( >=app-crypt/gpgme-1.1.6:1= ) vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) >=dev-libs/gobject-introspection-1.30.0:= )
 SLOT=2.6
 SRC_URI=mirror://gnome/sources/gmime/2.6/gmime-2.6.23.tar.xz
-_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	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=54b2972a3bc5baab8a642a2ca7845f5d
diff --git a/metadata/md5-cache/dev-libs/gmime-3.2.0 b/metadata/md5-cache/dev-libs/gmime-3.2.0
index daf2c32a9edc..1ed521996d21 100644
--- a/metadata/md5-cache/dev-libs/gmime-3.2.0
+++ b/metadata/md5-cache/dev-libs/gmime-3.2.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.32.0:2 sys-libs/zlib crypt? ( >=app-crypt/gpgme-1.8.0:1= ) idn? ( net-dns/libidn:= ) vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) >=dev-libs/gobject-introspection-1.30.0:= )
 SLOT=3.0
 SRC_URI=mirror://gnome/sources/gmime/3.2/gmime-3.2.0.tar.xz
-_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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a17c0a61ad7646c9e0345332bbf03b9a
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-1.50.0 b/metadata/md5-cache/dev-libs/gobject-introspection-1.50.0
index 256a82aa190e..5e496fa99fed 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-1.50.0
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-1.50.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gobject-introspection-common-1.50.0 >=dev-libs/glib-2.50:2 do
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) test? ( cairo )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.50/gobject-introspection-1.50.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=d42d04c6fe421090939588bdb7cf01d8
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-1.52.1 b/metadata/md5-cache/dev-libs/gobject-introspection-1.52.1
index 668f7972b363..197e811c3446 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-1.52.1
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-1.52.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gobject-introspection-common-1.52.1 >=dev-libs/glib-2.52:2 do
 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 ) test? ( cairo )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.52/gobject-introspection-1.52.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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=dfb72673244b9cf506e620deb4c902fa
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-1.56.1 b/metadata/md5-cache/dev-libs/gobject-introspection-1.56.1
index a019f1026302..93b8930ac619 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-1.56.1
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-1.56.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gobject-introspection-common-1.56.1 >=dev-libs/glib-2.56.1:2
 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 ) test? ( cairo )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.56/gobject-introspection-1.56.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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=5993ade9d3fae100a1a7b132a519c93c
diff --git a/metadata/md5-cache/dev-libs/gom-0.3.2 b/metadata/md5-cache/dev-libs/gom-0.3.2
index 83e19db08fb1..11a8edd55c58 100644
--- a/metadata/md5-cache/dev-libs/gom-0.3.2
+++ b/metadata/md5-cache/dev-libs/gom-0.3.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/sqlite-3.7:3 >=dev-libs/glib-2.36:2 introspection? ( >=dev-libs
 REQUIRED_USE=python? ( || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gom/0.3/gom-0.3.2.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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2a3e6a9e3a65f424f916baedacec6bc2
diff --git a/metadata/md5-cache/dev-libs/granite-0.5.0 b/metadata/md5-cache/dev-libs/granite-0.5.0
index 4dca4d9fa73f..e32e7eb5bb52 100644
--- a/metadata/md5-cache/dev-libs/granite-0.5.0
+++ b/metadata/md5-cache/dev-libs/granite-0.5.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=dev-libs/glib:2 dev-libs/libgee:0.8[introspection] >=x11-libs/gtk+-3.14:3[introspection]
 SLOT=0
 SRC_URI=https://github.com/elementary/granite/archive/0.5.tar.gz -> granite-0.5.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0ed2e1ffbaaadce42c484c55e2daf7ee
diff --git a/metadata/md5-cache/dev-libs/grantlee-5.1.0 b/metadata/md5-cache/dev-libs/grantlee-5.1.0
index 46098fc2773b..85a0564dcfc8 100644
--- a/metadata/md5-cache/dev-libs/grantlee-5.1.0
+++ b/metadata/md5-cache/dev-libs/grantlee-5.1.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtscript:5
 SLOT=5
 SRC_URI=http://downloads.grantlee.org/grantlee-5.1.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=f3c8f042b9152331077b0a58819c0a77
diff --git a/metadata/md5-cache/dev-libs/handystats-1.11.0 b/metadata/md5-cache/dev-libs/handystats-1.11.0
index 0530429cd0e4..c591067d8f76 100644
--- a/metadata/md5-cache/dev-libs/handystats-1.11.0
+++ b/metadata/md5-cache/dev-libs/handystats-1.11.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/shindo/handystats/archive/1.11.0.zip -> handystats-1.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=724fcb7b27ba87bf29a273675d62f30f
diff --git a/metadata/md5-cache/dev-libs/handystats-1.11.1 b/metadata/md5-cache/dev-libs/handystats-1.11.1
index 7e0d92955f11..2f749bcd6680 100644
--- a/metadata/md5-cache/dev-libs/handystats-1.11.1
+++ b/metadata/md5-cache/dev-libs/handystats-1.11.1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/shindo/handystats/archive/1.11.1.zip -> handystats-1.11.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=724fcb7b27ba87bf29a273675d62f30f
diff --git a/metadata/md5-cache/dev-libs/handystats-1.11.3 b/metadata/md5-cache/dev-libs/handystats-1.11.3
index 3453f11b7d34..465cd356c7fc 100644
--- a/metadata/md5-cache/dev-libs/handystats-1.11.3
+++ b/metadata/md5-cache/dev-libs/handystats-1.11.3
@@ -8,5 +8,5 @@ LICENSE=BSD
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/shindo/handystats/archive/1.11.3.zip -> handystats-1.11.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=724fcb7b27ba87bf29a273675d62f30f
diff --git a/metadata/md5-cache/dev-libs/hashit-0.9.8 b/metadata/md5-cache/dev-libs/hashit-0.9.8
index c68d597aec66..d717bd829c50 100644
--- a/metadata/md5-cache/dev-libs/hashit-0.9.8
+++ b/metadata/md5-cache/dev-libs/hashit-0.9.8
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://launchpad.net/hashit/trunk/0.9.8/+download/hashit-0.9.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f31e6a8b75b91dfae26667e7325f293c
diff --git a/metadata/md5-cache/dev-libs/hyperscan-4.6.0 b/metadata/md5-cache/dev-libs/hyperscan-4.6.0
index 1e150f11b41f..6f567e0601a9 100644
--- a/metadata/md5-cache/dev-libs/hyperscan-4.6.0
+++ b/metadata/md5-cache/dev-libs/hyperscan-4.6.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 REQUIRED_USE=cpu_flags_x86_ssse3
 SLOT=0
 SRC_URI=https://github.com/01org/hyperscan/archive/v4.6.0.tar.gz -> hyperscan-4.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=10203be88debd21d6fc88b1bc2d5594d
diff --git a/metadata/md5-cache/dev-libs/hyperscan-4.7.0 b/metadata/md5-cache/dev-libs/hyperscan-4.7.0
index aa0f219e79eb..52305c68bb0e 100644
--- a/metadata/md5-cache/dev-libs/hyperscan-4.7.0
+++ b/metadata/md5-cache/dev-libs/hyperscan-4.7.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 REQUIRED_USE=cpu_flags_x86_ssse3
 SLOT=0
 SRC_URI=https://github.com/01org/hyperscan/archive/v4.7.0.tar.gz -> hyperscan-4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2d3b9a24f9ad8ac95c9dd9ffa885aadb
diff --git a/metadata/md5-cache/dev-libs/injeqt-1.2.0 b/metadata/md5-cache/dev-libs/injeqt-1.2.0
index d4c964a23b8a..bb7df7aa204a 100644
--- a/metadata/md5-cache/dev-libs/injeqt-1.2.0
+++ b/metadata/md5-cache/dev-libs/injeqt-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtcore-5.4.2:5
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vogel/injeqt/archive/1.2.0.tar.gz -> injeqt-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3efdcbba619deed1de8fd47edf5be248
diff --git a/metadata/md5-cache/dev-libs/input-pad-1.0.99_pre20140916 b/metadata/md5-cache/dev-libs/input-pad-1.0.99_pre20140916
index 0cacfa772090..fc9fa091e2ab 100644
--- a/metadata/md5-cache/dev-libs/input-pad-1.0.99_pre20140916
+++ b/metadata/md5-cache/dev-libs/input-pad-1.0.99_pre20140916
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2 dev-libs/libxml2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile x11-libs/libxklavier virtual/libintl eekboard? ( dev-libs/eekboard ) introspection? ( dev-libs/gobject-introspection ) xtest? ( x11-libs/libXtst )
 SLOT=0
 SRC_URI=https://github.com/fujiwarat/input-pad/releases/download/1.0.99.20140916/input-pad-1.0.99.20140916.tar.gz
-_eclasses_=ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=aaa7afde2404917cac3c61e4fba9bbe8
diff --git a/metadata/md5-cache/dev-libs/json-glib-1.2.8 b/metadata/md5-cache/dev-libs/json-glib-1.2.8
index 3c0a3bc3843e..ce0b0d5f19c8 100644
--- a/metadata/md5-cache/dev-libs/json-glib-1.2.8
+++ b/metadata/md5-cache/dev-libs/json-glib-1.2.8
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.37.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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/json-glib/1.2/json-glib-1.2.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=90508356e971257eeae82197b0a8428d
diff --git a/metadata/md5-cache/dev-libs/json-glib-1.4.4 b/metadata/md5-cache/dev-libs/json-glib-1.4.4
index 7326f42b822e..a43ffde22325 100644
--- a/metadata/md5-cache/dev-libs/json-glib-1.4.4
+++ b/metadata/md5-cache/dev-libs/json-glib-1.4.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.44.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/json-glib/1.4/json-glib-1.4.4.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	meson	29ef682942c6ff558de2f797a61790c2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	meson	29ef682942c6ff558de2f797a61790c2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7a1e01b4f9cae11796cb8df25d1acfdc
diff --git a/metadata/md5-cache/dev-libs/jsoncpp-1.8.4 b/metadata/md5-cache/dev-libs/jsoncpp-1.8.4
index ae580b7e709f..56f4e33d4e02 100644
--- a/metadata/md5-cache/dev-libs/jsoncpp-1.8.4
+++ b/metadata/md5-cache/dev-libs/jsoncpp-1.8.4
@@ -9,5 +9,5 @@ LICENSE=|| ( public-domain MIT )
 RESTRICT=!test? ( test )
 SLOT=0/19
 SRC_URI=https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz -> jsoncpp-1.8.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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=9ff4bdc0feea1b64b7cb8ed8fa3528ea
diff --git a/metadata/md5-cache/dev-libs/jsonrpc-glib-3.28.1 b/metadata/md5-cache/dev-libs/jsonrpc-glib-3.28.1
index a7192a425808..77ce1ae7581d 100644
--- a/metadata/md5-cache/dev-libs/jsonrpc-glib-3.28.1
+++ b/metadata/md5-cache/dev-libs/jsonrpc-glib-3.28.1
@@ -11,5 +11,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/jsonrpc-glib/3.28/jsonrpc-glib-3.28.1.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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d7d6b6c7cb8d48eaca610110c8369dde
diff --git a/metadata/md5-cache/dev-libs/jthread-1.3.3 b/metadata/md5-cache/dev-libs/jthread-1.3.3
index d3f96135cc53..62c4c329aa5d 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c75a7a699120e1a5d96e615f4f026a2c
diff --git a/metadata/md5-cache/dev-libs/kasync-0.2.0 b/metadata/md5-cache/dev-libs/kasync-0.2.0
index 25784962561b..439579192d6d 100644
--- a/metadata/md5-cache/dev-libs/kasync-0.2.0
+++ b/metadata/md5-cache/dev-libs/kasync-0.2.0
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 11d2f7c842ef..48a80398bfc7 100644
--- a/metadata/md5-cache/dev-libs/kdiagram-2.6.0
+++ b/metadata/md5-cache/dev-libs/kdiagram-2.6.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 3be279a6a49a..b115137d64ad 100644
--- a/metadata/md5-cache/dev-libs/kdiagram-2.6.1
+++ b/metadata/md5-cache/dev-libs/kdiagram-2.6.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/dev-libs/keystone-0.9.1 b/metadata/md5-cache/dev-libs/keystone-0.9.1
index 4450d3b55050..e502a99d8b26 100644
--- a/metadata/md5-cache/dev-libs/keystone-0.9.1
+++ b/metadata/md5-cache/dev-libs/keystone-0.9.1
@@ -10,5 +10,5 @@ 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 ) || ( llvm_targets_AArch64 llvm_targets_ARM llvm_targets_Hexagon llvm_targets_Mips llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 )
 SLOT=0
 SRC_URI=https://github.com/keystone-engine/keystone/archive/0.9.1.tar.gz -> keystone-0.9.1.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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_=f757164b5917f63a11a68d805b1713bd
diff --git a/metadata/md5-cache/dev-libs/keystone-9999 b/metadata/md5-cache/dev-libs/keystone-9999
index 1e5e40fd5687..e8ed6ae8156b 100644
--- a/metadata/md5-cache/dev-libs/keystone-9999
+++ b/metadata/md5-cache/dev-libs/keystone-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-devel/llvm:=[llvm_targets_AArch64?,llvm_targets_ARM?,llvm_targets_Hexagon?,llvm_targets_Mips?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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 ) || ( llvm_targets_AArch64 llvm_targets_ARM llvm_targets_Hexagon llvm_targets_Mips llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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_=480340df7ec5eba33c3caa7eb36e0070
diff --git a/metadata/md5-cache/dev-libs/kproperty-3.1.0 b/metadata/md5-cache/dev-libs/kproperty-3.1.0
index 3867e264101d..215e4c32225e 100644
--- a/metadata/md5-cache/dev-libs/kproperty-3.1.0
+++ b/metadata/md5-cache/dev-libs/kproperty-3.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0: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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 a22fa8b389b1..212b5a63ba16 100644
--- a/metadata/md5-cache/dev-libs/kreport-3.1.0
+++ b/metadata/md5-cache/dev-libs/kreport-3.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0: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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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_=65681b5946185d651f2744c1f610c5c2
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.3.0 b/metadata/md5-cache/dev-libs/leatherman-1.3.0
index 01ab1b2e2950..8653401bf80c 100644
--- a/metadata/md5-cache/dev-libs/leatherman-1.3.0
+++ b/metadata/md5-cache/dev-libs/leatherman-1.3.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=net-misc/curl
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.3.0.tar.gz -> leatherman-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2c4fa1470d5b71709629622851b8ea10
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.4.2 b/metadata/md5-cache/dev-libs/leatherman-1.4.2
index a50dde12d6b5..08a5747a594f 100644
--- a/metadata/md5-cache/dev-libs/leatherman-1.4.2
+++ b/metadata/md5-cache/dev-libs/leatherman-1.4.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=net-misc/curl
 SLOT=0/1.4
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=25845c48e0a442a63c8230d714da49bf
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.4.2-r1 b/metadata/md5-cache/dev-libs/leatherman-1.4.2-r1
index 80de8042606e..2e03187ed35d 100644
--- a/metadata/md5-cache/dev-libs/leatherman-1.4.2-r1
+++ b/metadata/md5-cache/dev-libs/leatherman-1.4.2-r1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
index 776adfe8fdfa..c6e3ddd3ee9e 100644
--- a/metadata/md5-cache/dev-libs/leatherman-1.4.3
+++ b/metadata/md5-cache/dev-libs/leatherman-1.4.3
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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.0 b/metadata/md5-cache/dev-libs/leatherman-1.5.0
deleted file mode 100644
index 8f5b00db03a0..000000000000
--- a/metadata/md5-cache/dev-libs/leatherman-1.5.0
+++ /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.0
-SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.5.0.tar.gz -> leatherman-1.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=51f4f05e0159adaf295ad00e79895cd2
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.5.1 b/metadata/md5-cache/dev-libs/leatherman-1.5.1
new file mode 100644
index 000000000000..ce870f1fb4bb
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/leatherman-1.5.1
@@ -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.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/libIDL-0.8.14 b/metadata/md5-cache/dev-libs/libIDL-0.8.14
index 1dd0c507fe29..b967bf4b458e 100644
--- a/metadata/md5-cache/dev-libs/libIDL-0.8.14
+++ b/metadata/md5-cache/dev-libs/libIDL-0.8.14
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.4:2
 SLOT=0
 SRC_URI=mirror://gnome/sources/libIDL/0.8/libIDL-0.8.14.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=395d0c179877aa66900d1e977527a290
diff --git a/metadata/md5-cache/dev-libs/libIDL-0.8.14-r2 b/metadata/md5-cache/dev-libs/libIDL-0.8.14-r2
index 0ead71198783..9363dce0249c 100644
--- a/metadata/md5-cache/dev-libs/libIDL-0.8.14-r2
+++ b/metadata/md5-cache/dev-libs/libIDL-0.8.14-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.44.1-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(-)?]
 SLOT=0
 SRC_URI=mirror://gnome/sources/libIDL/0.8/libIDL-0.8.14.tar.bz2
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=05cf7216e34794514ee9a42f56e0b9bf
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 cf0fa27d2ecf..87bbd7db03f7 100644
--- a/metadata/md5-cache/dev-libs/libappindicator-12.10.0-r201
+++ b/metadata/md5-cache/dev-libs/libappindicator-12.10.0-r201
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/dbus-glib-0.98[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
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 d371dc3f854e..c7b9a25e0f5b 100644
--- a/metadata/md5-cache/dev-libs/libappindicator-12.10.0-r301
+++ b/metadata/md5-cache/dev-libs/libappindicator-12.10.0-r301
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-libs/libarcus-3.3.0 b/metadata/md5-cache/dev-libs/libarcus-3.3.0
index 96390264d1b8..91e8890b9426 100644
--- a/metadata/md5-cache/dev-libs/libarcus-3.3.0
+++ b/metadata/md5-cache/dev-libs/libarcus-3.3.0
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_ta
 REQUIRED_USE=python? ( ^^ ( 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/3
 SRC_URI=https://github.com/Ultimaker/libArcus/archive/3.3.0.tar.gz -> libarcus-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fde8e01f716b04dcd32ce9dda1599452
diff --git a/metadata/md5-cache/dev-libs/libarcus-3.4.1 b/metadata/md5-cache/dev-libs/libarcus-3.4.1
index e698ca92883a..0a4ecb9e6acf 100644
--- a/metadata/md5-cache/dev-libs/libarcus-3.4.1
+++ b/metadata/md5-cache/dev-libs/libarcus-3.4.1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_ta
 REQUIRED_USE=python? ( ^^ ( 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/3
 SRC_URI=https://github.com/Ultimaker/libArcus/archive/3.4.1.tar.gz -> libarcus-3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fde8e01f716b04dcd32ce9dda1599452
diff --git a/metadata/md5-cache/dev-libs/libassuan-2.5.1-r1 b/metadata/md5-cache/dev-libs/libassuan-2.5.1-r1
new file mode 100644
index 000000000000..222653eec93e
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libassuan-2.5.1-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure install prepare
+DEPEND=>=dev-libs/libgpg-error-1.8
+DESCRIPTION=IPC library used by GnuPG and GPGME
+EAPI=7
+HOMEPAGE=http://www.gnupg.org/related_software/libassuan/index.en.html
+IUSE=static-libs
+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-3 LGPL-2.1
+RDEPEND=>=dev-libs/libgpg-error-1.8
+SLOT=0
+SRC_URI=mirror://gnupg/libassuan/libassuan-2.5.1.tar.bz2
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=119ea2efd8724545aea74efbed383010
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 6c1a799f0ab4..d9a709a4a16a 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_=13bf11016f05e8b81ffe17a0da35f9bb
+_md5_=3782129203a9072901f515e1744bec1a
diff --git a/metadata/md5-cache/dev-libs/libbsd-0.9.1 b/metadata/md5-cache/dev-libs/libbsd-0.9.1
index c13bff58ede9..45d24d256a10 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_=51ad79a6878dd2e6db3129f6c88fb06f
+_md5_=763941135190e6e9e139310b0c13cae7
diff --git a/metadata/md5-cache/dev-libs/libbson-1.10.3 b/metadata/md5-cache/dev-libs/libbson-1.10.3
index edb07e4b5773..82a3250060a2 100644
--- a/metadata/md5-cache/dev-libs/libbson-1.10.3
+++ b/metadata/md5-cache/dev-libs/libbson-1.10.3
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~hppa ~ppc ~x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-c-driver/archive/1.10.3.tar.gz -> libbson-1.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e7548ca91069f22ac81cccee51c02f3e
diff --git a/metadata/md5-cache/dev-libs/libbson-1.11.0 b/metadata/md5-cache/dev-libs/libbson-1.11.0
index 4f04c47276c9..db535a087d3d 100644
--- a/metadata/md5-cache/dev-libs/libbson-1.11.0
+++ b/metadata/md5-cache/dev-libs/libbson-1.11.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~hppa ~ppc ~x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-c-driver/archive/1.11.0.tar.gz -> libbson-1.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e7548ca91069f22ac81cccee51c02f3e
diff --git a/metadata/md5-cache/dev-libs/libbson-1.12.0 b/metadata/md5-cache/dev-libs/libbson-1.12.0
index 991b7b587486..a43e2f6b5b2a 100644
--- a/metadata/md5-cache/dev-libs/libbson-1.12.0
+++ b/metadata/md5-cache/dev-libs/libbson-1.12.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~hppa ~ppc ~x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-c-driver/archive/1.12.0.tar.gz -> libbson-1.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e7548ca91069f22ac81cccee51c02f3e
diff --git a/metadata/md5-cache/dev-libs/libcec-3.1.0-r1 b/metadata/md5-cache/dev-libs/libcec-3.1.0-r1
index adf9ce12c04e..56ea3c0a81c7 100644
--- a/metadata/md5-cache/dev-libs/libcec-3.1.0-r1
+++ b/metadata/md5-cache/dev-libs/libcec-3.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/udev >=dev-libs/libplatform-2.0.0 raspberry-pi? ( >=media-libs/r
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) )
 SLOT=0
 SRC_URI=https://github.com/Pulse-Eight/libcec/archive/libcec-3.1.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8667b1b1ca9a50fc95f17ef0db693b80
diff --git a/metadata/md5-cache/dev-libs/libcec-4.0.2 b/metadata/md5-cache/dev-libs/libcec-4.0.2
index a1264323f5bb..9cc65057ef44 100644
--- a/metadata/md5-cache/dev-libs/libcec-4.0.2
+++ b/metadata/md5-cache/dev-libs/libcec-4.0.2
@@ -10,5 +10,5 @@ RDEPEND=virtual/udev >=dev-libs/libplatform-2.0.0 sys-libs/ncurses:= raspberry-p
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) )
 SLOT=0
 SRC_URI=https://github.com/Pulse-Eight/libcec/archive/libcec-4.0.2.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=992a2b154c44c43e4bf2f1e82b144eea
diff --git a/metadata/md5-cache/dev-libs/libcec-4.0.2-r1 b/metadata/md5-cache/dev-libs/libcec-4.0.2-r1
index b54587056997..e64b4377e110 100644
--- a/metadata/md5-cache/dev-libs/libcec-4.0.2-r1
+++ b/metadata/md5-cache/dev-libs/libcec-4.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/udev >=dev-libs/libplatform-2.0.0 sys-libs/ncurses:= raspberry-p
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) )
 SLOT=0
 SRC_URI=https://github.com/Pulse-Eight/libcec/archive/libcec-4.0.2.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3b0ea7f1b580473a169e32e5660cabda
diff --git a/metadata/md5-cache/dev-libs/libcec-4.0.2-r2 b/metadata/md5-cache/dev-libs/libcec-4.0.2-r2
index 42e45a3a26f8..3ec876959f73 100644
--- a/metadata/md5-cache/dev-libs/libcec-4.0.2-r2
+++ b/metadata/md5-cache/dev-libs/libcec-4.0.2-r2
@@ -10,5 +10,5 @@ RDEPEND=virtual/udev >=dev-libs/libplatform-2.0.0 sys-libs/ncurses:= raspberry-p
 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=https://github.com/Pulse-Eight/libcec/archive/libcec-4.0.2.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4f47c5e1b963132de5fa17db344a65c6
diff --git a/metadata/md5-cache/dev-libs/libcgroup-0.41-r5 b/metadata/md5-cache/dev-libs/libcgroup-0.41-r5
index 6724a6fe6526..ed8db871d0f8 100644
--- a/metadata/md5-cache/dev-libs/libcgroup-0.41-r5
+++ b/metadata/md5-cache/dev-libs/libcgroup-0.41-r5
@@ -10,5 +10,5 @@ RDEPEND=pam? ( virtual/pam )
 REQUIRED_USE=daemon? ( tools )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/libcg/libcgroup/v0.41/libcgroup-0.41.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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
 _md5_=049c84cddcefd7caa36c3a7b460a9995
diff --git a/metadata/md5-cache/dev-libs/libcharon-3.3.0 b/metadata/md5-cache/dev-libs/libcharon-3.3.0
index 17758345b7e4..9ddc5a01248b 100644
--- a/metadata/md5-cache/dev-libs/libcharon-3.3.0
+++ b/metadata/md5-cache/dev-libs/libcharon-3.3.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
 SLOT=0/3
 SRC_URI=https://github.com/Ultimaker/libCharon/archive/3.3.0.tar.gz -> libcharon-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a1086ba28c4444e99104664fd860df14
diff --git a/metadata/md5-cache/dev-libs/libcharon-3.4.1 b/metadata/md5-cache/dev-libs/libcharon-3.4.1
index 62c1203035b0..42a0ec47428d 100644
--- a/metadata/md5-cache/dev-libs/libcharon-3.4.1
+++ b/metadata/md5-cache/dev-libs/libcharon-3.4.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
 SLOT=0/3
 SRC_URI=https://github.com/Ultimaker/libCharon/archive/3.4.1.tar.gz -> libcharon-3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4cb2eb6b52f68e375bda1353ff30a16d
diff --git a/metadata/md5-cache/dev-libs/libcroco-0.6.12-r1 b/metadata/md5-cache/dev-libs/libcroco-0.6.12-r1
index fd68e2cddf72..b2fc7bafa569 100644
--- a/metadata/md5-cache/dev-libs/libcroco-0.6.12-r1
+++ b/metadata/md5-cache/dev-libs/libcroco-0.6.12-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0.6
 SRC_URI=mirror://gnome/sources/libcroco/0.6/libcroco-0.6.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d4127b2ad642dd93efaeb8f1cba83eda
diff --git a/metadata/md5-cache/dev-libs/libdazzle-3.28.5 b/metadata/md5-cache/dev-libs/libdazzle-3.28.5
index c7b354f243da..7b66a1e47ea1 100644
--- a/metadata/md5-cache/dev-libs/libdazzle-3.28.5
+++ b/metadata/md5-cache/dev-libs/libdazzle-3.28.5
@@ -11,5 +11,5 @@ REQUIRED_USE=vala? ( introspection )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-libs/libdbusmenu-16.04.0 b/metadata/md5-cache/dev-libs/libdbusmenu-16.04.0
index 9f42c3ccb886..3bb80118cf26 100644
--- a/metadata/md5-cache/dev-libs/libdbusmenu-16.04.0
+++ b/metadata/md5-cache/dev-libs/libdbusmenu-16.04.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/dbus-glib-0.100[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-libs/libdbusmenu-qt-0.9.3_pre20160218-r2 b/metadata/md5-cache/dev-libs/libdbusmenu-qt-0.9.3_pre20160218-r2
index b95f8e318bc1..ea089952577e 100644
--- a/metadata/md5-cache/dev-libs/libdbusmenu-qt-0.9.3_pre20160218-r2
+++ b/metadata/md5-cache/dev-libs/libdbusmenu-qt-0.9.3_pre20160218-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/ubuntu/+archive/primary/+files/libdbusmenu-qt_0.9.3+16.04.20160218.orig.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=a70aed8ebf62e35b5ffc0769f8973f89
diff --git a/metadata/md5-cache/dev-libs/libdivsufsort-2.0.1 b/metadata/md5-cache/dev-libs/libdivsufsort-2.0.1
index 7356a80ae380..43b679d1b1bb 100644
--- a/metadata/md5-cache/dev-libs/libdivsufsort-2.0.1
+++ b/metadata/md5-cache/dev-libs/libdivsufsort-2.0.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/y-256/libdivsufsort/archive/2.0.1.tar.gz -> libdivsufsort-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=537ae457f430af9c4fd0803af3d19250
diff --git a/metadata/md5-cache/dev-libs/libdivsufsort-9999 b/metadata/md5-cache/dev-libs/libdivsufsort-9999
index 092f7a1ac891..2b7d20d90ef0 100644
--- a/metadata/md5-cache/dev-libs/libdivsufsort-9999
+++ b/metadata/md5-cache/dev-libs/libdivsufsort-9999
@@ -5,5 +5,5 @@ EAPI=6
 HOMEPAGE=https://github.com/y-256/libdivsufsort
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=29f0f9e71a068bc7764952eb6269d376
diff --git a/metadata/md5-cache/dev-libs/libdnet-1.12 b/metadata/md5-cache/dev-libs/libdnet-1.12
index 2d64f1b19ee8..e86523993b65 100644
--- a/metadata/md5-cache/dev-libs/libdnet-1.12
+++ b/metadata/md5-cache/dev-libs/libdnet-1.12
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://libdnet.googlecode.com/files/libdnet-1.12.tgz ipv6? ( https://fragroute-ipv6.googlecode.com/files/libdnet-1.12.ipv6-1.patch.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	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_=36c9bfa208536c9dbfb4bc1564e83bb0
diff --git a/metadata/md5-cache/dev-libs/libdynd-0.7.2 b/metadata/md5-cache/dev-libs/libdynd-0.7.2
index a3737db88a3d..95f405f14851 100644
--- a/metadata/md5-cache/dev-libs/libdynd-0.7.2
+++ b/metadata/md5-cache/dev-libs/libdynd-0.7.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/c-blosc:0= cuda? ( dev-util/nvidia-cuda-toolkit ) fftw? ( sci-libs/fftw:3.0 )
 SLOT=0/0.7.2
 SRC_URI=https://github.com/libdynd/libdynd/archive/v0.7.2.tar.gz -> libdynd-0.7.2.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	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_=393202cfb89bfbc728a0880769e1ea2c
diff --git a/metadata/md5-cache/dev-libs/libffi-3.3_rc0 b/metadata/md5-cache/dev-libs/libffi-3.3_rc0
new file mode 100644
index 000000000000..da87292264ac
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libffi-3.3_rc0
@@ -0,0 +1,12 @@
+BDEPEND=test? ( dev-util/dejagnu )
+DEFINED_PHASES=compile configure install setup test
+DESCRIPTION=a portable, high level programming interface to various calling conventions
+EAPI=7
+HOMEPAGE=https://sourceware.org/libffi/
+IUSE=debug pax_kernel 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 ~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
+SLOT=0/7
+SRC_URI=https://github.com/libffi/libffi/releases/download/v3.3-rc0/libffi-3.3-rc0.tar.gz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=90c2ed726ebaf11a718e270ba86ed51b
diff --git a/metadata/md5-cache/dev-libs/libflatarray-0.3.0 b/metadata/md5-cache/dev-libs/libflatarray-0.3.0
index 0293be190fcb..430041266a39 100644
--- a/metadata/md5-cache/dev-libs/libflatarray-0.3.0
+++ b/metadata/md5-cache/dev-libs/libflatarray-0.3.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Boost-1.0
 SLOT=0
 SRC_URI=http://www.libgeodecomp.org/archive/libflatarray-0.3.0.tar.bz2
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	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_=2050b81b400ee22851f7d461852ab613
diff --git a/metadata/md5-cache/dev-libs/libfmt-4.1.0 b/metadata/md5-cache/dev-libs/libfmt-4.1.0
index 7d1f9caf4ab9..d2ec3dbe4712 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=30f4d4d6ca77de549fb5ec5343d42283
diff --git a/metadata/md5-cache/dev-libs/libfmt-5.1.0 b/metadata/md5-cache/dev-libs/libfmt-5.1.0
index e7fc73a76225..ca39ebc1acd7 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=30f4d4d6ca77de549fb5ec5343d42283
diff --git a/metadata/md5-cache/dev-libs/libfmt-5.2.0 b/metadata/md5-cache/dev-libs/libfmt-5.2.0
index 2f207b1e01ea..1a4d3fef2827 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c0f819bb4757b52f724ca1090a18356f
diff --git a/metadata/md5-cache/dev-libs/libfmt-5.2.1 b/metadata/md5-cache/dev-libs/libfmt-5.2.1
index 182f0df3bb04..5f7e0d868946 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c0f819bb4757b52f724ca1090a18356f
diff --git a/metadata/md5-cache/dev-libs/libfmt-9999 b/metadata/md5-cache/dev-libs/libfmt-9999
index 9711864a0c16..7fc460ae1aa9 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _md5_=c0f819bb4757b52f724ca1090a18356f
diff --git a/metadata/md5-cache/dev-libs/libgaminggear-0.15.1 b/metadata/md5-cache/dev-libs/libgaminggear-0.15.1
index 6528222e227a..0ba0546b9d79 100644
--- a/metadata/md5-cache/dev-libs/libgaminggear-0.15.1
+++ b/metadata/md5-cache/dev-libs/libgaminggear-0.15.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-db/sqlite-3.17:3 dev-libs/glib:2 media-libs/libcanberra x11-libs/cairo x11-libs/gtk+:2 x11-libs/libnotify x11-libs/pango
 SLOT=0
 SRC_URI=mirror://sourceforge/libgaminggear/libgaminggear-0.15.1.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=14c7e350a5470cd75b630a866a97c318
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.8.3-r1 b/metadata/md5-cache/dev-libs/libgcrypt-1.8.3-r1
new file mode 100644
index 000000000000..7a6aa4550240
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.8.3-r1
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( virtual/texi2dvi ) >=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/libgpg-error-1.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(-)?]
+DESCRIPTION=General purpose crypto library based on the code used in GnuPG
+EAPI=7
+HOMEPAGE=http://www.gnupg.org/
+IUSE=doc o-flag-munging 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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2.1 MIT
+RDEPEND=>=dev-libs/libgpg-error-1.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/20
+SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.8.3.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_=1722358bf7adfadc69e67b1c18d87ca9
diff --git a/metadata/md5-cache/dev-libs/libgdata-0.17.8 b/metadata/md5-cache/dev-libs/libgdata-0.17.8
index aebfad60422e..abd784df0ef2 100644
--- a/metadata/md5-cache/dev-libs/libgdata-0.17.8
+++ b/metadata/md5-cache/dev-libs/libgdata-0.17.8
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.38.0:2 >=dev-libs/json-glib-0.15 >=dev-libs/libxml2-2:
 REQUIRED_USE=gnome-online-accounts? ( crypt ) vala? ( introspection )
 SLOT=0/22
 SRC_URI=mirror://gnome/sources/libgdata/0.17/libgdata-0.17.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=697804b84ea03a764c7b5451e0492520
diff --git a/metadata/md5-cache/dev-libs/libgdata-0.17.9-r1 b/metadata/md5-cache/dev-libs/libgdata-0.17.9-r1
index 28d8c25d26a2..5f3882cd158d 100644
--- a/metadata/md5-cache/dev-libs/libgdata-0.17.9-r1
+++ b/metadata/md5-cache/dev-libs/libgdata-0.17.9-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.44.0:2 >=dev-libs/json-glib-0.15[introspection?] >=dev
 REQUIRED_USE=gnome-online-accounts? ( crypt ) vala? ( introspection )
 SLOT=0/22
 SRC_URI=mirror://gnome/sources/libgdata/0.17/libgdata-0.17.9.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e16d951eab1b4dcf482314ee9d89785b
diff --git a/metadata/md5-cache/dev-libs/libgee-0.20.1 b/metadata/md5-cache/dev-libs/libgee-0.20.1
index cc5864783fee..b091512a5071 100644
--- a/metadata/md5-cache/dev-libs/libgee-0.20.1
+++ b/metadata/md5-cache/dev-libs/libgee-0.20.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.36:2 introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
 SLOT=0.8/2
 SRC_URI=mirror://gnome/sources/libgee/0.20/libgee-0.20.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b5168e3040b544c87f59f659c361e602
diff --git a/metadata/md5-cache/dev-libs/libgee-0.6.8 b/metadata/md5-cache/dev-libs/libgee-0.6.8
index bd73b9e24859..a14ccd82f2e0 100644
--- a/metadata/md5-cache/dev-libs/libgee-0.6.8
+++ b/metadata/md5-cache/dev-libs/libgee-0.6.8
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.12:2 introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgee/0.6/libgee-0.6.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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=c1ca399912ac1ba606662839b36bcffd
diff --git a/metadata/md5-cache/dev-libs/libgit2-0.26.6 b/metadata/md5-cache/dev-libs/libgit2-0.26.6
deleted file mode 100644
index 2aae7dce29fc..000000000000
--- a/metadata/md5-cache/dev-libs/libgit2-0.26.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib net-libs/http-parser:= curl? ( !libressl? ( net-misc/curl:=[curl_ssl_openssl(-)] ) libressl? ( net-misc/curl:=[curl_ssl_libressl(-)] ) ) gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A linkable library for Git
-EAPI=6
-HOMEPAGE=https://libgit2.github.com/
-IUSE=+curl examples gssapi libressl +ssh test +threads trace
-KEYWORDS=amd64 ~arm ~arm64 ~ppc x86 ~ppc-macos
-LICENSE=GPL-2-with-linking-exception
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib net-libs/http-parser:= curl? ( !libressl? ( net-misc/curl:=[curl_ssl_openssl(-)] ) libressl? ( net-misc/curl:=[curl_ssl_libressl(-)] ) ) gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
-SLOT=0/26
-SRC_URI=https://github.com/libgit2/libgit2/archive/v0.26.6.tar.gz -> libgit2-0.26.6.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=251d423291fb0b578e77b60d84ae2ea7
diff --git a/metadata/md5-cache/dev-libs/libgit2-0.26.7 b/metadata/md5-cache/dev-libs/libgit2-0.26.7
new file mode 100644
index 000000000000..4e70e1bc3c2f
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgit2-0.26.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib net-libs/http-parser:= curl? ( !libressl? ( net-misc/curl:=[curl_ssl_openssl(-)] ) libressl? ( net-misc/curl:=[curl_ssl_libressl(-)] ) ) gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A linkable library for Git
+EAPI=6
+HOMEPAGE=https://libgit2.github.com/
+IUSE=+curl examples gssapi libressl +ssh test +threads trace
+KEYWORDS=amd64 ~arm ~arm64 ~ppc x86 ~ppc-macos
+LICENSE=GPL-2-with-linking-exception
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib net-libs/http-parser:= curl? ( !libressl? ( net-misc/curl:=[curl_ssl_openssl(-)] ) libressl? ( net-misc/curl:=[curl_ssl_libressl(-)] ) ) gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
+SLOT=0/26
+SRC_URI=https://github.com/libgit2/libgit2/archive/v0.26.7.tar.gz -> libgit2-0.26.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-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c47775f454614a24c42949342b42fdf1
diff --git a/metadata/md5-cache/dev-libs/libgit2-0.27.4 b/metadata/md5-cache/dev-libs/libgit2-0.27.4
deleted file mode 100644
index 76711081e48c..000000000000
--- a/metadata/md5-cache/dev-libs/libgit2-0.27.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib net-libs/http-parser:= curl? ( !libressl? ( net-misc/curl:=[curl_ssl_openssl(-)] ) libressl? ( net-misc/curl:=[curl_ssl_libressl(-)] ) ) gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A linkable library for Git
-EAPI=6
-HOMEPAGE=https://libgit2.github.com/
-IUSE=+curl examples gssapi libressl +ssh test +threads trace
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86 ~ppc-macos
-LICENSE=GPL-2-with-linking-exception
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib net-libs/http-parser:= curl? ( !libressl? ( net-misc/curl:=[curl_ssl_openssl(-)] ) libressl? ( net-misc/curl:=[curl_ssl_libressl(-)] ) ) gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
-SLOT=0/27
-SRC_URI=https://github.com/libgit2/libgit2/archive/v0.27.4.tar.gz -> libgit2-0.27.4.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=5c4a0073c710a813be5aa9314f57bc24
diff --git a/metadata/md5-cache/dev-libs/libgit2-0.27.5 b/metadata/md5-cache/dev-libs/libgit2-0.27.5
new file mode 100644
index 000000000000..af810f9703f8
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgit2-0.27.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib net-libs/http-parser:= curl? ( !libressl? ( net-misc/curl:=[curl_ssl_openssl(-)] ) libressl? ( net-misc/curl:=[curl_ssl_libressl(-)] ) ) gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A linkable library for Git
+EAPI=6
+HOMEPAGE=https://libgit2.github.com/
+IUSE=+curl examples gssapi libressl +ssh test +threads trace
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86 ~ppc-macos
+LICENSE=GPL-2-with-linking-exception
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib net-libs/http-parser:= curl? ( !libressl? ( net-misc/curl:=[curl_ssl_openssl(-)] ) libressl? ( net-misc/curl:=[curl_ssl_libressl(-)] ) ) gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
+SLOT=0/27
+SRC_URI=https://github.com/libgit2/libgit2/archive/v0.27.5.tar.gz -> libgit2-0.27.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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=5c4a0073c710a813be5aa9314f57bc24
diff --git a/metadata/md5-cache/dev-libs/libgit2-9999 b/metadata/md5-cache/dev-libs/libgit2-9999
index f120f4f13a49..60a4b15f8887 100644
--- a/metadata/md5-cache/dev-libs/libgit2-9999
+++ b/metadata/md5-cache/dev-libs/libgit2-9999
@@ -7,5 +7,5 @@ IUSE=+curl examples gssapi libressl +ssh test +threads trace
 LICENSE=GPL-2-with-linking-exception
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib net-libs/http-parser:= curl? ( !libressl? ( net-misc/curl:=[curl_ssl_openssl(-)] ) libressl? ( net-misc/curl:=[curl_ssl_libressl(-)] ) ) gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
 SLOT=0/27
-_eclasses_=cmake-utils	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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5c4a0073c710a813be5aa9314f57bc24
diff --git a/metadata/md5-cache/dev-libs/libgit2-glib-0.26.2 b/metadata/md5-cache/dev-libs/libgit2-glib-0.26.2
index 988e58a7586c..5547321936a9 100644
--- a/metadata/md5-cache/dev-libs/libgit2-glib-0.26.2
+++ b/metadata/md5-cache/dev-libs/libgit2-glib-0.26.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/gobject-introspection-0.10.1:= >=dev-libs/glib-2.44.0:2 >=dev-libs/libgit2-0.26.0:0/26[ssh?] python? ( python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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-util/gtk-doc-am-1.11 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
+DEPEND=>=dev-libs/gobject-introspection-0.10.1:= >=dev-libs/glib-2.44.0:2 >=dev-libs/libgit2-0.26.0:0/26[ssh?] python? ( python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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-util/glib-utils >=dev-util/gtk-doc-am-1.11 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
 DESCRIPTION=Git library for GLib
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Libgit2-glib
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gobject-introspection-0.10.1:= >=dev-libs/glib-2.44.0:2 >=dev
 REQUIRED_USE=python? ( || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgit2-glib/0.26/libgit2-glib-0.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	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=a3b93a7bdb258975817ff9e988017526
+_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=383bbaa4aa9d9e3db1a1067ed6d61eb9
diff --git a/metadata/md5-cache/dev-libs/libgnome-games-support-1.2.3 b/metadata/md5-cache/dev-libs/libgnome-games-support-1.2.3
index 29baf7f5252c..2ca5490690e6 100644
--- a/metadata/md5-cache/dev-libs/libgnome-games-support-1.2.3
+++ b/metadata/md5-cache/dev-libs/libgnome-games-support-1.2.3
@@ -8,5 +8,5 @@ LICENSE=LGPL-3+
 RDEPEND=dev-libs/libgee:0.8= >=dev-libs/glib-2.40:2 >=x11-libs/gtk+-3.19.2:3
 SLOT=1/2
 SRC_URI=mirror://gnome/sources/libgnome-games-support/1.2/libgnome-games-support-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1e017b3430368248694ccc986ba11c1f
diff --git a/metadata/md5-cache/dev-libs/libgpg-error-1.32-r1 b/metadata/md5-cache/dev-libs/libgpg-error-1.32-r1
new file mode 100644
index 000000000000..45d9dd489b59
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgpg-error-1.32-r1
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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(-)?] )
+DESCRIPTION=Contains error handling functions used by GnuPG software
+EAPI=7
+HOMEPAGE=http://www.gnupg.org/related_software/libgpg-error
+IUSE=common-lisp 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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1
+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(-)?] )
+SLOT=0
+SRC_URI=mirror://gnupg/libgpg-error/libgpg-error-1.32.tar.bz2
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=c3a869e3640ca703f8bde449244ac362
diff --git a/metadata/md5-cache/dev-libs/libgpuarray-0.6.0 b/metadata/md5-cache/dev-libs/libgpuarray-0.6.0
index 0024cb63abd9..136b5cb915a9 100644
--- a/metadata/md5-cache/dev-libs/libgpuarray-0.6.0
+++ b/metadata/md5-cache/dev-libs/libgpuarray-0.6.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=cuda? ( amd64? ( >=dev-util/nvidia-cuda-toolkit-7 ) ) opencl? ( virtual/opencl || ( sci-libs/clblast sci-libs/clblas ) )
 SLOT=0
 SRC_URI=https://github.com/Theano/libgpuarray/archive/v0.6.0.tar.gz -> libgpuarray-0.6.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	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_=0099c1b95f0d8a767fb987f86c552ffe
diff --git a/metadata/md5-cache/dev-libs/libgpuarray-0.6.7 b/metadata/md5-cache/dev-libs/libgpuarray-0.6.7
index 97f6aebf5f9e..1f79ff63dfc8 100644
--- a/metadata/md5-cache/dev-libs/libgpuarray-0.6.7
+++ b/metadata/md5-cache/dev-libs/libgpuarray-0.6.7
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=cuda? ( amd64? ( >=dev-util/nvidia-cuda-toolkit-7 ) ) opencl? ( virtual/opencl || ( sci-libs/clblast sci-libs/clblas ) )
 SLOT=0/2
 SRC_URI=https://github.com/Theano/libgpuarray/archive/v0.6.7.tar.gz -> libgpuarray-0.6.7.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	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_=ca3adc4acc94d4ff54470159a0e8d682
diff --git a/metadata/md5-cache/dev-libs/libgudev-232 b/metadata/md5-cache/dev-libs/libgudev-232
index 106a74b4ddaa..2068324c960e 100644
--- a/metadata/md5-cache/dev-libs/libgudev-232
+++ b/metadata/md5-cache/dev-libs/libgudev-232
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.30.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=virtual/libudev-199:=[abi_x86_32(-)?,abi_x86_64(-)?,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?] introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) >=dev-util/gtk-doc-am-1.18 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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.30.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=virtual/libudev-199:=[abi_x86_32(-)?,abi_x86_64(-)?,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?] introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) dev-util/glib-utils >=dev-util/gtk-doc-am-1.18 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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=GObject bindings for libudev
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/libgudev
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.30.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 RESTRICT=test
 SLOT=0/0
 SRC_URI=mirror://gnome/sources/libgudev/232/libgudev-232.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=1407fdf9479aa0c83110e4cb389c5b27
+_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_=99913c2c4c9bd0ef1f8a2d8da060dd7f
diff --git a/metadata/md5-cache/dev-libs/libgusb-0.2.11 b/metadata/md5-cache/dev-libs/libgusb-0.2.11
index d9184af73e20..7394654b554e 100644
--- a/metadata/md5-cache/dev-libs/libgusb-0.2.11
+++ b/metadata/md5-cache/dev-libs/libgusb-0.2.11
@@ -11,5 +11,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://people.freedesktop.org/~hughsient/releases/libgusb-0.2.11.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5d905abe398701fcb3b2b4c8ad53052a
diff --git a/metadata/md5-cache/dev-libs/libgweather-3.24.1 b/metadata/md5-cache/dev-libs/libgweather-3.24.1
index 13b2c64b9a0a..9695ceb05bd8 100644
--- a/metadata/md5-cache/dev-libs/libgweather-3.24.1
+++ b/metadata/md5-cache/dev-libs/libgweather-3.24.1
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/gtk+-3.13.5:3[introspection?] >=dev-libs/glib-2.35.1:2 >=net-
 REQUIRED_USE=vala? ( introspection )
 SLOT=2/3-6
 SRC_URI=mirror://gnome/sources/libgweather/3.24/libgweather-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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d8fb7dd5e114484e77295f8397480343
diff --git a/metadata/md5-cache/dev-libs/libgweather-3.26.2 b/metadata/md5-cache/dev-libs/libgweather-3.26.2
index 285647deef7a..097f73d3d85d 100644
--- a/metadata/md5-cache/dev-libs/libgweather-3.26.2
+++ b/metadata/md5-cache/dev-libs/libgweather-3.26.2
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/gtk+-3.13.5:3[introspection?] >=dev-libs/glib-2.35.1:2 >=net-
 REQUIRED_USE=vala? ( introspection )
 SLOT=2/3-6
 SRC_URI=mirror://gnome/sources/libgweather/3.26/libgweather-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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9ecf9a442f24759b99c84c7fc0c04983
diff --git a/metadata/md5-cache/dev-libs/libical-2.0.0-r3 b/metadata/md5-cache/dev-libs/libical-2.0.0-r3
index cc8795e90d58..bc12a4c87d51 100644
--- a/metadata/md5-cache/dev-libs/libical-2.0.0-r3
+++ b/metadata/md5-cache/dev-libs/libical-2.0.0-r3
@@ -9,5 +9,5 @@ LICENSE=|| ( MPL-1.0 LGPL-2.1 )
 RDEPEND=dev-libs/icu:=
 SLOT=0/2
 SRC_URI=https://github.com/libical/libical/archive/v2.0.0.tar.gz -> libical-2.0.0.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c99946816bb6963c952f411af02be115
diff --git a/metadata/md5-cache/dev-libs/libical-3.0.3 b/metadata/md5-cache/dev-libs/libical-3.0.3
index 0c4db052ff13..65c9889a8471 100644
--- a/metadata/md5-cache/dev-libs/libical-3.0.3
+++ b/metadata/md5-cache/dev-libs/libical-3.0.3
@@ -9,5 +9,5 @@ LICENSE=|| ( MPL-2.0 LGPL-2.1 )
 RDEPEND=dev-libs/icu:= berkdb? ( sys-libs/db:= ) sys-libs/timezone-data
 SLOT=0/3
 SRC_URI=https://github.com/libical/libical/archive/v3.0.3.tar.gz -> libical-3.0.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-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=3b9246f9dae67b3fa9e1e288e2344363
diff --git a/metadata/md5-cache/dev-libs/libindicate-12.10.1-r2 b/metadata/md5-cache/dev-libs/libindicate-12.10.1-r2
index 88214d88966e..75e6cfa0ce4a 100644
--- a/metadata/md5-cache/dev-libs/libindicate-12.10.1-r2
+++ b/metadata/md5-cache/dev-libs/libindicate-12.10.1-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.30 >=dev-libs/libdbusmenu-0
 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	89bb9f083a2590d9b447fd0b78a96186
+_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 f51832f2f1be..110ea32e48cc 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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=f90603ab3af748b51e5781201850d36c
+_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
diff --git a/metadata/md5-cache/dev-libs/libinput-1.12.1 b/metadata/md5-cache/dev-libs/libinput-1.12.1
new file mode 100644
index 000000000000..9db29169b5e0
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libinput-1.12.1
@@ -0,0 +1,14 @@
+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.1.tar.xz
+_eclasses_=meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac
+_md5_=a2febf4591d5731d3548a09d29f8f48f
diff --git a/metadata/md5-cache/dev-libs/libksba-1.3.5-r2 b/metadata/md5-cache/dev-libs/libksba-1.3.5-r2
new file mode 100644
index 000000000000..28bb5a6221e4
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libksba-1.3.5-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=dev-libs/libgpg-error-1.8
+DESCRIPTION=X.509 and CMS (PKCS#7) library
+EAPI=7
+HOMEPAGE=http://www.gnupg.org/related_software/libksba
+IUSE=static-libs
+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=LGPL-3+ GPL-2+ GPL-3
+RDEPEND=>=dev-libs/libgpg-error-1.8
+SLOT=0
+SRC_URI=mirror://gnupg/libksba/libksba-1.3.5.tar.bz2
+_md5_=124557cf20384b6e0815d90fa1709578
diff --git a/metadata/md5-cache/dev-libs/liblouis-2.5.3 b/metadata/md5-cache/dev-libs/liblouis-2.5.3
index 288d8fb3a2f0..76a23dd8f0fb 100644
--- a/metadata/md5-cache/dev-libs/liblouis-2.5.3
+++ b/metadata/md5-cache/dev-libs/liblouis-2.5.3
@@ -10,5 +10,5 @@ RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[wid
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://liblouis.googlecode.com/files/liblouis-2.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=23526dca138c02512cb42e315b2f43d2
diff --git a/metadata/md5-cache/dev-libs/liblzw-0.2-r1 b/metadata/md5-cache/dev-libs/liblzw-0.2-r1
new file mode 100644
index 000000000000..f6e9fdc9d56b
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/liblzw-0.2-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=small C library for reading LZW compressed files (.Z)
+EAPI=7
+HOMEPAGE=https://github.com/vapier/liblzw
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~m68k ~s390 ~sh ~x86
+LICENSE=public-domain
+SLOT=0
+SRC_URI=mirror://sourceforge/freestdf/liblzw-0.2.tar.lzma
+_md5_=b601558e8ce6af2182af8518dce40556
diff --git a/metadata/md5-cache/dev-libs/libmateweather-1.12.2-r1 b/metadata/md5-cache/dev-libs/libmateweather-1.12.2-r1
deleted file mode 100644
index 6da28533ad59..000000000000
--- a/metadata/md5-cache/dev-libs/libmateweather-1.12.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.6:2 >=net-libs/libsoup-2.34:2.4 >=sys-libs/timezone-data-2010k:0 x11-libs/gdk-pixbuf:2 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) 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(-)] >=dev-python/pygobject-2:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygtk-2:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* sys-devel/gettext:* >=sys-devel/libtool-2.2.6:2 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.12
-DESCRIPTION=MATE library to access weather information from online services
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=debug gtk3 python python_targets_python2_7
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.6:2 >=net-libs/libsoup-2.34:2.4 >=sys-libs/timezone-data-2010k:0 x11-libs/gdk-pixbuf:2 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) 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(-)] >=dev-python/pygobject-2:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygtk-2:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=gtk3? ( !python ) python? ( || ( python_targets_python2_7 ) )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/libmateweather-1.12.2.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	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=35b4a872fa642a292a2c2435152b8808
diff --git a/metadata/md5-cache/dev-libs/libmateweather-1.14.3-r1 b/metadata/md5-cache/dev-libs/libmateweather-1.14.3-r1
deleted file mode 100644
index c16c543c3926..000000000000
--- a/metadata/md5-cache/dev-libs/libmateweather-1.14.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.6:2 >=net-libs/libsoup-2.34:2.4 >=sys-libs/timezone-data-2010k:0 x11-libs/gdk-pixbuf:2 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) 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(-)] >=dev-python/pygobject-2:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygtk-2:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* sys-devel/gettext:* >=sys-devel/libtool-2.2.6:2 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.14
-DESCRIPTION=MATE library to access weather information from online services
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=debug gtk3 python python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.6:2 >=net-libs/libsoup-2.34:2.4 >=sys-libs/timezone-data-2010k:0 x11-libs/gdk-pixbuf:2 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) 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(-)] >=dev-python/pygobject-2:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygtk-2:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=gtk3? ( !python ) python? ( || ( python_targets_python2_7 ) )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.14/libmateweather-1.14.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	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=5849c880ab7eb3bb5f9ed525e1a4f90b
diff --git a/metadata/md5-cache/dev-libs/libmateweather-1.16.1-r1 b/metadata/md5-cache/dev-libs/libmateweather-1.16.1-r1
deleted file mode 100644
index a90a2a73ba18..000000000000
--- a/metadata/md5-cache/dev-libs/libmateweather-1.16.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.6:2 >=net-libs/libsoup-2.34:2.4 >=sys-libs/timezone-data-2010k:0 x11-libs/gdk-pixbuf:2 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) 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(-)] >=dev-python/pygobject-2:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygtk-2:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* sys-devel/gettext:* >=sys-devel/libtool-2.2.6:2 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.16
-DESCRIPTION=MATE library to access weather information from online services
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=debug gtk3 python python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.6:2 >=net-libs/libsoup-2.34:2.4 >=sys-libs/timezone-data-2010k:0 x11-libs/gdk-pixbuf:2 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) 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(-)] >=dev-python/pygobject-2:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygtk-2:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=gtk3? ( !python ) python? ( || ( python_targets_python2_7 ) )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/libmateweather-1.16.1.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	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=5849c880ab7eb3bb5f9ed525e1a4f90b
diff --git a/metadata/md5-cache/dev-libs/libmateweather-1.18.2 b/metadata/md5-cache/dev-libs/libmateweather-1.18.2
index 19720f2a8451..af788eb0568e 100644
--- a/metadata/md5-cache/dev-libs/libmateweather-1.18.2
+++ b/metadata/md5-cache/dev-libs/libmateweather-1.18.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.6:2 >=net-libs/libsoup-2.34:2.4 >=sys-libs/timezone-data-2010k:0 x11-libs/gdk-pixbuf:2 virtual/libintl:0 >=x11-libs/gtk+-3.0:3
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.18/libmateweather-1.18.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ff7f4a7f3164d7a06b5e20381b70563d
diff --git a/metadata/md5-cache/dev-libs/libmirage-3.1.0 b/metadata/md5-cache/dev-libs/libmirage-3.1.0
deleted file mode 100644
index ac6b5d41f711..000000000000
--- a/metadata/md5-cache/dev-libs/libmirage-3.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-arch/bzip2-1:= >=app-arch/xz-utils-5:= >=dev-libs/glib-2.28:2 >=media-libs/libsamplerate-0.1:= >=media-libs/libsndfile-1.0:= sys-libs/zlib:= introspection? ( >=dev-libs/gobject-introspection-1.30 ) dev-util/desktop-file-utils dev-util/intltool sys-devel/gettext virtual/pkgconfig doc? ( dev-util/gtk-doc ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=CD and DVD image access library
-EAPI=6
-HOMEPAGE=http://cdemu.org
-IUSE=doc +introspection
-KEYWORDS=amd64 ~hppa x86
-LICENSE=GPL-2+
-RDEPEND=>=app-arch/bzip2-1:= >=app-arch/xz-utils-5:= >=dev-libs/glib-2.28:2 >=media-libs/libsamplerate-0.1:= >=media-libs/libsndfile-1.0:= sys-libs/zlib:= introspection? ( >=dev-libs/gobject-introspection-1.30 )
-SLOT=0/11
-SRC_URI=mirror://sourceforge/cdemu/libmirage-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=8ae54f56ccebe409d9f72390273805a4
diff --git a/metadata/md5-cache/dev-libs/libmirage-3.2.0 b/metadata/md5-cache/dev-libs/libmirage-3.2.0
index 35e1b5f1d0de..6bd7feb76208 100644
--- a/metadata/md5-cache/dev-libs/libmirage-3.2.0
+++ b/metadata/md5-cache/dev-libs/libmirage-3.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-arch/bzip2-1:= >=app-arch/xz-utils-5:= >=dev-libs/glib-2.28:2 >=media-libs/libsamplerate-0.1:= >=media-libs/libsndfile-1.0:= sys-libs/zlib:= introspection? ( >=dev-libs/gobject-introspection-1.30 )
 SLOT=0/11
 SRC_URI=mirror://sourceforge/cdemu/libmirage-3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e5a6329b92970b78ea0774144c52e4c8
diff --git a/metadata/md5-cache/dev-libs/libmspack-0.7.1_alpha b/metadata/md5-cache/dev-libs/libmspack-0.7.1_alpha
new file mode 100644
index 000000000000..b7d4b439a3ca
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libmspack-0.7.1_alpha
@@ -0,0 +1,12 @@
+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
+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
diff --git a/metadata/md5-cache/dev-libs/libnl-3.4.0 b/metadata/md5-cache/dev-libs/libnl-3.4.0
index 936799e02c6b..5846622435bf 100644
--- a/metadata/md5-cache/dev-libs/libnl-3.4.0
+++ b/metadata/md5-cache/dev-libs/libnl-3.4.0
@@ -10,5 +10,5 @@ RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) p
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=3
 SRC_URI=https://github.com/thom311/libnl/releases/download/libnl3_4_0/libnl-3.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7fa891115a0863a5a135ebff96678e2c
diff --git a/metadata/md5-cache/dev-libs/libnl-99999999 b/metadata/md5-cache/dev-libs/libnl-99999999
index c3813459e75a..69df064f9603 100644
--- a/metadata/md5-cache/dev-libs/libnl-99999999
+++ b/metadata/md5-cache/dev-libs/libnl-99999999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1 utils? ( GPL-2 )
 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(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=3
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0a2c3c28c8d32d1b77896929e55e9f35
diff --git a/metadata/md5-cache/dev-libs/liboobs-3.0.0 b/metadata/md5-cache/dev-libs/liboobs-3.0.0
index 3925171087f6..b6e1b17f292a 100644
--- a/metadata/md5-cache/dev-libs/liboobs-3.0.0
+++ b/metadata/md5-cache/dev-libs/liboobs-3.0.0
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.14:2 >=dev-libs/dbus-glib-0.70 >=app-admin/system-tools-backends-2.10.1
 SLOT=0
 SRC_URI=mirror://gnome/sources/liboobs/3.0/liboobs-3.0.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=825e02df1a332d2be0b5a54ee25a06de
diff --git a/metadata/md5-cache/dev-libs/libpeas-1.20.0-r1 b/metadata/md5-cache/dev-libs/libpeas-1.20.0-r1
index ec5cf494380d..67352633c73b 100644
--- a/metadata/md5-cache/dev-libs/libpeas-1.20.0-r1
+++ b/metadata/md5-cache/dev-libs/libpeas-1.20.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-1.39:= glade? ( >=dev-util/glade-3.9.1:3.10 ) gtk? ( >=x11-libs/gtk+-3:3[introspection] ) lua? ( >=dev-lua/lgi-0.9.0 luajit? ( >=dev-lang/luajit-2:2 ) !luajit? ( =dev-lang/lua-5.1*:0 ) ) 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 ) 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-python/pygobject-3.2:3[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-util/gtk-doc-am-1.11 >=dev-util/intltool-0.40 virtual/pkgconfig dev-libs/gobject-introspection-common 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 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/glib-2.38:2 >=dev-libs/gobject-introspection-1.39:= glade? ( >=dev-util/glade-3.9.1:3.10 ) gtk? ( >=x11-libs/gtk+-3:3[introspection] ) lua? ( >=dev-lua/lgi-0.9.0 luajit? ( >=dev-lang/luajit-2:2 ) !luajit? ( =dev-lang/lua-5.1*:0 ) ) 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 ) 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-python/pygobject-3.2:3[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-util/glib-utils >=dev-util/gtk-doc-am-1.11 >=dev-util/intltool-0.40 virtual/pkgconfig dev-libs/gobject-introspection-common 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 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 GObject plugins library
 EAPI=6
 HOMEPAGE=https://developer.gnome.org/libpeas/stable/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-1.39:= glade? (
 REQUIRED_USE=python? ( ^^ ( 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=mirror://gnome/sources/libpeas/1.20/libpeas-1.20.0.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=31ca52313c12421f360d10906eb8b18b
+_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_=56499617f4a2f6f68616775875094e3d
diff --git a/metadata/md5-cache/dev-libs/libpeas-1.22.0 b/metadata/md5-cache/dev-libs/libpeas-1.22.0
index 0a8063d4694c..b02e0d10f8da 100644
--- a/metadata/md5-cache/dev-libs/libpeas-1.22.0
+++ b/metadata/md5-cache/dev-libs/libpeas-1.22.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-1.39:= glade? ( >=dev-util/glade-3.9.1:3.10 ) gtk? ( >=x11-libs/gtk+-3:3[introspection] ) lua? ( >=dev-lua/lgi-0.9.0 luajit? ( >=dev-lang/luajit-2:2 ) !luajit? ( =dev-lang/lua-5.1*:0 ) ) 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 ) 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-python/pygobject-3.2:3[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-util/gtk-doc-am-1.11 >=dev-util/intltool-0.40 virtual/pkgconfig dev-libs/gobject-introspection-common 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 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/glib-2.38:2 >=dev-libs/gobject-introspection-1.39:= glade? ( >=dev-util/glade-3.9.1:3.10 ) gtk? ( >=x11-libs/gtk+-3:3[introspection] ) lua? ( >=dev-lua/lgi-0.9.0 luajit? ( >=dev-lang/luajit-2:2 ) !luajit? ( =dev-lang/lua-5.1*:0 ) ) 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 ) 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-python/pygobject-3.2:3[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-util/glib-utils >=dev-util/gtk-doc-am-1.11 >=dev-util/intltool-0.40 virtual/pkgconfig dev-libs/gobject-introspection-common 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 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 GObject plugins library
 EAPI=6
 HOMEPAGE=https://developer.gnome.org/libpeas/stable/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-1.39:= glade? (
 REQUIRED_USE=python? ( ^^ ( 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=mirror://gnome/sources/libpeas/1.22/libpeas-1.22.0.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=dd99d606f871e61a888830df8df136c5
+_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_=f6ade53ed503863cbbe893a503e44a75
diff --git a/metadata/md5-cache/dev-libs/libplatform-2.0.1 b/metadata/md5-cache/dev-libs/libplatform-2.0.1
index ba6e06f31741..f94c7fce2dc6 100644
--- a/metadata/md5-cache/dev-libs/libplatform-2.0.1
+++ b/metadata/md5-cache/dev-libs/libplatform-2.0.1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://github.com/Pulse-Eight/platform/archive/p8-platform-2.0.1.tar.gz -> libplatform-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=52270b37151278334991453498bdf66a
diff --git a/metadata/md5-cache/dev-libs/libplatform-2.1.0.1 b/metadata/md5-cache/dev-libs/libplatform-2.1.0.1
index 4b4f2b7685fa..6401929efb83 100644
--- a/metadata/md5-cache/dev-libs/libplatform-2.1.0.1
+++ b/metadata/md5-cache/dev-libs/libplatform-2.1.0.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://github.com/Pulse-Eight/platform/archive/p8-platform-2.1.0.1.tar.gz -> libplatform-2.1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ff47290bfbc38a2e9af5b9b7db04c5aa
diff --git a/metadata/md5-cache/dev-libs/libprelude-4.0.0 b/metadata/md5-cache/dev-libs/libprelude-4.0.0
index 938db7da9e4f..c04df15e3b66 100644
--- a/metadata/md5-cache/dev-libs/libprelude-4.0.0
+++ b/metadata/md5-cache/dev-libs/libprelude-4.0.0
@@ -10,5 +10,5 @@ RDEPEND=net-libs/gnutls:= lua? ( dev-lang/lua:* ) perl? ( dev-lang/perl:= virtua
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/4.0.0/libprelude-4.0.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1b6d3a9d92439dfa9c313db70b8fb961
diff --git a/metadata/md5-cache/dev-libs/libprelude-4.1.0 b/metadata/md5-cache/dev-libs/libprelude-4.1.0
index 051d2e8c1f33..6763c9af15dc 100644
--- a/metadata/md5-cache/dev-libs/libprelude-4.1.0
+++ b/metadata/md5-cache/dev-libs/libprelude-4.1.0
@@ -10,5 +10,5 @@ RDEPEND=net-libs/gnutls:= lua? ( dev-lang/lua:* ) perl? ( dev-lang/perl:= virtua
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/4.1.0/libprelude-4.1.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=14f2f4d7a24ca6cd4f5dd1d26c5b72d5
diff --git a/metadata/md5-cache/dev-libs/libpreludedb-4.0.0 b/metadata/md5-cache/dev-libs/libpreludedb-4.0.0
index b9890fe89785..7d96d757aaa1 100644
--- a/metadata/md5-cache/dev-libs/libpreludedb-4.0.0
+++ b/metadata/md5-cache/dev-libs/libpreludedb-4.0.0
@@ -10,5 +10,5 @@ RDEPEND=~dev-libs/libprelude-4.0.0 net-libs/gnutls:= mysql? ( virtual/libmysqlcl
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/4.0.0/libpreludedb-4.0.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=72a3691a9e31777a11312d51c1ff174e
diff --git a/metadata/md5-cache/dev-libs/libpreludedb-4.1.0 b/metadata/md5-cache/dev-libs/libpreludedb-4.1.0
index 8ce0d850bc0f..8ef5e1b46f88 100644
--- a/metadata/md5-cache/dev-libs/libpreludedb-4.1.0
+++ b/metadata/md5-cache/dev-libs/libpreludedb-4.1.0
@@ -10,5 +10,5 @@ RDEPEND=~dev-libs/libprelude-4.1.0 net-libs/gnutls:= mysql? ( virtual/libmysqlcl
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/4.1.0/libpreludedb-4.1.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3707172df4bcd0f47e5d3a6a29ae7bb0
diff --git a/metadata/md5-cache/dev-libs/libproccpuinfo-0.0.8-r1 b/metadata/md5-cache/dev-libs/libproccpuinfo-0.0.8-r1
index ebfd5b911edf..380b6ce369e6 100644
--- a/metadata/md5-cache/dev-libs/libproccpuinfo-0.0.8-r1
+++ b/metadata/md5-cache/dev-libs/libproccpuinfo-0.0.8-r1
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 ~hppa ~mips x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://nongnu/proccpuinfo/libproccpuinfo-0.0.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9cf354e815f918d87b1b8c3a9c0c919c
diff --git a/metadata/md5-cache/dev-libs/libqtxdg-2.0.0 b/metadata/md5-cache/dev-libs/libqtxdg-2.0.0
index 3e0e245b0fb8..cf41aa765ce0 100644
--- a/metadata/md5-cache/dev-libs/libqtxdg-2.0.0
+++ b/metadata/md5-cache/dev-libs/libqtxdg-2.0.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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 a01e93d0d965..c5a4582acd63 100644
--- a/metadata/md5-cache/dev-libs/libqtxdg-3.2.0
+++ b/metadata/md5-cache/dev-libs/libqtxdg-3.2.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-libs/librdkafka-0.11.5 b/metadata/md5-cache/dev-libs/librdkafka-0.11.5
index 483860b0e2ac..b4b09a515900 100644
--- a/metadata/md5-cache/dev-libs/librdkafka-0.11.5
+++ b/metadata/md5-cache/dev-libs/librdkafka-0.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Apache Kafka C/C++ client library
 EAPI=7
 HOMEPAGE=https://github.com/edenhill/librdkafka
 IUSE=lz4 sasl ssl static-libs
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc x86
 LICENSE=BSD-2
 RDEPEND=lz4? ( app-arch/lz4:=[static-libs(-)?] ) sasl? ( dev-libs/cyrus-sasl:= ) ssl? ( dev-libs/openssl:0= ) sys-libs/zlib
 SLOT=0/1
 SRC_URI=https://github.com/edenhill/librdkafka/archive/v0.11.5.tar.gz -> librdkafka-0.11.5.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=09375aa81b6896307c5fd4a04ddd6307
+_md5_=1fa238de70118d4861b01e398b050ef3
diff --git a/metadata/md5-cache/dev-libs/librelp-1.2.18 b/metadata/md5-cache/dev-libs/librelp-1.2.18
index b3d7f2f4967c..6403fcf72962 100644
--- a/metadata/md5-cache/dev-libs/librelp-1.2.18
+++ b/metadata/md5-cache/dev-libs/librelp-1.2.18
@@ -5,11 +5,11 @@ DESCRIPTION=An easy to use library for the RELP protocol
 EAPI=7
 HOMEPAGE=http://www.librelp.com/
 IUSE=debug doc +ssl +gnutls libressl openssl static-libs
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~sparc x86
 LICENSE=GPL-3+ doc? ( FDL-1.3 )
 RDEPEND=ssl? ( gnutls? ( >=net-libs/gnutls-3.3.17.1:0= ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) )
 REQUIRED_USE=ssl? ( ^^ ( gnutls openssl ) ) gnutls? ( ssl ) openssl? ( ssl ) libressl? ( openssl )
 SLOT=0/0.4.0
 SRC_URI=http://download.rsyslog.com/librelp/librelp-1.2.18.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=dcc8fb647462cea8475595e740ce6119
+_md5_=a430f20f704fd983a4afc162d3636f21
diff --git a/metadata/md5-cache/dev-libs/libsavitar-3.3.0-r1 b/metadata/md5-cache/dev-libs/libsavitar-3.3.0-r1
index aa0c19b390d2..350895dec3f4 100644
--- a/metadata/md5-cache/dev-libs/libsavitar-3.3.0-r1
+++ b/metadata/md5-cache/dev-libs/libsavitar-3.3.0-r1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_ta
 REQUIRED_USE=python? ( ^^ ( 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/3
 SRC_URI=https://github.com/Ultimaker/libSavitar/archive/3.3.0.tar.gz -> libsavitar-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b90a0aef7b1e1ec2d7d01518ac9a1577
diff --git a/metadata/md5-cache/dev-libs/libsavitar-3.4.1 b/metadata/md5-cache/dev-libs/libsavitar-3.4.1
index d8c59036e7b4..2d61317e14c9 100644
--- a/metadata/md5-cache/dev-libs/libsavitar-3.4.1
+++ b/metadata/md5-cache/dev-libs/libsavitar-3.4.1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_ta
 REQUIRED_USE=python? ( ^^ ( 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/3
 SRC_URI=https://github.com/Ultimaker/libSavitar/archive/3.4.1.tar.gz -> libsavitar-3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=90c75d3ff80b0ba3f6133a4dad3fc45b
diff --git a/metadata/md5-cache/dev-libs/libsigc++-1.2.7 b/metadata/md5-cache/dev-libs/libsigc++-1.2.7
index b65498a0c74a..721c7b64af90 100644
--- a/metadata/md5-cache/dev-libs/libsigc++-1.2.7
+++ b/metadata/md5-cache/dev-libs/libsigc++-1.2.7
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86
 LICENSE=GPL-2 LGPL-2.1+
 SLOT=1.2
 SRC_URI=mirror://gnome/sources/libsigc++/1.2/libsigc++-1.2.7.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=c4bfa182765dc809d150db03a7955bbd
diff --git a/metadata/md5-cache/dev-libs/libsigc++-2.10.0 b/metadata/md5-cache/dev-libs/libsigc++-2.10.0
index 19f7815ccf25..c8931f5851fe 100644
--- a/metadata/md5-cache/dev-libs/libsigc++-2.10.0
+++ b/metadata/md5-cache/dev-libs/libsigc++-2.10.0
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x
 LICENSE=LGPL-2.1+
 SLOT=2
 SRC_URI=mirror://gnome/sources/libsigc++/2.10/libsigc++-2.10.0.tar.xz
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ee69c9228a1dc2a6b9ab6e5918212c97
diff --git a/metadata/md5-cache/dev-libs/libsodium-1.0.11 b/metadata/md5-cache/dev-libs/libsodium-1.0.11
deleted file mode 100644
index 50c8be064f3a..000000000000
--- a/metadata/md5-cache/dev-libs/libsodium-1.0.11
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-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=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
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=ISC
-SLOT=0/18
-SRC_URI=http://download.libsodium.org/libsodium/releases/libsodium-1.0.11.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_=4fe0bf78b055bccbedb1b2b811e55431
diff --git a/metadata/md5-cache/dev-libs/libsodium-1.0.11-r1 b/metadata/md5-cache/dev-libs/libsodium-1.0.11-r1
new file mode 100644
index 000000000000..81a2e10c925c
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libsodium-1.0.11-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+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=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
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+LICENSE=ISC
+SLOT=0/18
+SRC_URI=http://download.libsodium.org/libsodium/releases/libsodium-1.0.11.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_=00d64fd9621d50fb79d7792eed9efd0c
diff --git a/metadata/md5-cache/dev-libs/libsodium-1.0.13 b/metadata/md5-cache/dev-libs/libsodium-1.0.13
deleted file mode 100644
index 64756ba7cc97..000000000000
--- a/metadata/md5-cache/dev-libs/libsodium-1.0.13
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-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=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
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=ISC
-SLOT=0/18
-SRC_URI=http://download.libsodium.org/libsodium/releases/libsodium-1.0.13.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_=0168e49b949e76ee5b441c96d0deb456
diff --git a/metadata/md5-cache/dev-libs/libsodium-1.0.14 b/metadata/md5-cache/dev-libs/libsodium-1.0.14
deleted file mode 100644
index 86d91ce424bd..000000000000
--- a/metadata/md5-cache/dev-libs/libsodium-1.0.14
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-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=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
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=ISC
-SLOT=0/18
-SRC_URI=http://download.libsodium.org/libsodium/releases/libsodium-1.0.14.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_=0168e49b949e76ee5b441c96d0deb456
diff --git a/metadata/md5-cache/dev-libs/libsodium-1.0.14-r1 b/metadata/md5-cache/dev-libs/libsodium-1.0.14-r1
new file mode 100644
index 000000000000..de61856ad834
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libsodium-1.0.14-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+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=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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=ISC
+SLOT=0/18
+SRC_URI=http://download.libsodium.org/libsodium/releases/libsodium-1.0.14.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_=e60daed8e0323cd35d558c1e64ec7e8b
diff --git a/metadata/md5-cache/dev-libs/libsodium-1.0.15 b/metadata/md5-cache/dev-libs/libsodium-1.0.15
deleted file mode 100644
index 6c7beeb14747..000000000000
--- a/metadata/md5-cache/dev-libs/libsodium-1.0.15
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-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=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
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=ISC
-SLOT=0/23
-SRC_URI=http://download.libsodium.org/libsodium/releases/libsodium-1.0.15.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_=3eb3df011fa7962554d620f771e5a826
diff --git a/metadata/md5-cache/dev-libs/libsodium-1.0.15-r1 b/metadata/md5-cache/dev-libs/libsodium-1.0.15-r1
new file mode 100644
index 000000000000..3eaa5b735a2d
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libsodium-1.0.15-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+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=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
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
+LICENSE=ISC
+SLOT=0/23
+SRC_URI=http://download.libsodium.org/libsodium/releases/libsodium-1.0.15.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_=6b9d7d67717cd69f372896808f5c8119
diff --git a/metadata/md5-cache/dev-libs/libsodium-1.0.16 b/metadata/md5-cache/dev-libs/libsodium-1.0.16
deleted file mode 100644
index a48b804a688a..000000000000
--- a/metadata/md5-cache/dev-libs/libsodium-1.0.16
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-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=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
-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	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=79e7ed00311a41e8e45246871c2d44ee
diff --git a/metadata/md5-cache/dev-libs/libsodium-1.0.16-r1 b/metadata/md5-cache/dev-libs/libsodium-1.0.16-r1
deleted file mode 100644
index fe1208d9c429..000000000000
--- a/metadata/md5-cache/dev-libs/libsodium-1.0.16-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install 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
-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
-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_=ec871f7a395fdffc6b76cd32f3b02c6c
diff --git a/metadata/md5-cache/dev-libs/libsodium-1.0.16-r2 b/metadata/md5-cache/dev-libs/libsodium-1.0.16-r2
new file mode 100644
index 000000000000..5cefb84f2403
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libsodium-1.0.16-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install 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
+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
+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
diff --git a/metadata/md5-cache/dev-libs/libsolv-0.6.22 b/metadata/md5-cache/dev-libs/libsolv-0.6.22
index 55ec23abcf56..6c08b4135af0 100644
--- a/metadata/md5-cache/dev-libs/libsolv-0.6.22
+++ b/metadata/md5-cache/dev-libs/libsolv-0.6.22
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat sys-libs/zlib bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://github.com/openSUSE/libsolv/archive/0.6.22.tar.gz -> libsolv-0.6.22.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f5a6b440f5e7cd4e0dd1987dc4dfac76
diff --git a/metadata/md5-cache/dev-libs/libunique-1.1.6-r2 b/metadata/md5-cache/dev-libs/libunique-1.1.6-r2
index ea627f31b676..2cbee52370ec 100644
--- a/metadata/md5-cache/dev-libs/libunique-1.1.6-r2
+++ b/metadata/md5-cache/dev-libs/libunique-1.1.6-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.12:2 >=x11-libs/gtk+-2.11:2[introspection?] x11-libs/libX11 dbus? ( >=dev-libs/dbus-glib-0.70 sys-apps/dbus[X] ) introspection? ( >=dev-libs/gobject-introspection-0.6.3:= )
 SLOT=1
 SRC_URI=mirror://gnome/sources/libunique/1.1/libunique-1.1.6.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=18de3273184113e0d54504aa7ecea8ed
diff --git a/metadata/md5-cache/dev-libs/libunique-3.0.2-r1 b/metadata/md5-cache/dev-libs/libunique-3.0.2-r1
index c4fb5f423f63..5bbbc8c5e5d6 100644
--- a/metadata/md5-cache/dev-libs/libunique-3.0.2-r1
+++ b/metadata/md5-cache/dev-libs/libunique-3.0.2-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.25.7:2 sys-apps/dbus[X] >=x11-libs/gtk+-2.90.0:3[introspection?] x11-libs/libX11 introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
 SLOT=3
 SRC_URI=mirror://gnome/sources/libunique/3.0/libunique-3.0.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0f319badfbe3328ebe08abb1b87d60f7
diff --git a/metadata/md5-cache/dev-libs/libwbxml-0.11.2 b/metadata/md5-cache/dev-libs/libwbxml-0.11.2
index 5b78528bed29..121246e77443 100644
--- a/metadata/md5-cache/dev-libs/libwbxml-0.11.2
+++ b/metadata/md5-cache/dev-libs/libwbxml-0.11.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/expat virtual/libiconv
 SLOT=0
 SRC_URI=mirror://sourceforge/libwbxml/libwbxml-0.11.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=49264e4bc25cf5621fe5a0c3ce8e0076
diff --git a/metadata/md5-cache/dev-libs/link-grammar-5.3.11 b/metadata/md5-cache/dev-libs/link-grammar-5.3.11
index 3232ecf8c5b8..a3fed4ab3c84 100644
--- a/metadata/md5-cache/dev-libs/link-grammar-5.3.11
+++ b/metadata/md5-cache/dev-libs/link-grammar-5.3.11
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspel
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=http://www.abisource.com/downloads/link-grammar/5.3.11/link-grammar-5.3.11.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=97958960ebab50d20dd0135dab2c1ee3
diff --git a/metadata/md5-cache/dev-libs/marisa-0.2.4 b/metadata/md5-cache/dev-libs/marisa-0.2.4
index 707b74ffb6d6..a849aa155ca8 100644
--- a/metadata/md5-cache/dev-libs/marisa-0.2.4
+++ b/metadata/md5-cache/dev-libs/marisa-0.2.4
@@ -10,5 +10,5 @@ RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) p
 REQUIRED_USE=cpu_flags_x86_popcnt? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse4a? ( cpu_flags_x86_popcnt cpu_flags_x86_sse3 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_popcnt cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://marisa-trie.googlecode.com/files/marisa-0.2.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3e244644b418b0e141bf4a2b33c1b6eb
diff --git a/metadata/md5-cache/dev-libs/mongo-c-driver-1.10.3 b/metadata/md5-cache/dev-libs/mongo-c-driver-1.10.3
index 848fc771a567..8a4099ec33fb 100644
--- a/metadata/md5-cache/dev-libs/mongo-c-driver-1.10.3
+++ b/metadata/md5-cache/dev-libs/mongo-c-driver-1.10.3
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( static-libs )
 RESTRICT=x86? ( test )
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-c-driver/archive/1.10.3.tar.gz -> mongo-c-driver-1.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bf568dabfaeeac0cddb9338a949c10b4
diff --git a/metadata/md5-cache/dev-libs/mongo-c-driver-1.11.0 b/metadata/md5-cache/dev-libs/mongo-c-driver-1.11.0
index bece01408d3a..666a50405a66 100644
--- a/metadata/md5-cache/dev-libs/mongo-c-driver-1.11.0
+++ b/metadata/md5-cache/dev-libs/mongo-c-driver-1.11.0
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( static-libs )
 RESTRICT=x86? ( test )
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-c-driver/archive/1.11.0.tar.gz -> mongo-c-driver-1.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6430b8342b575dc735b8e39bfac7563c
diff --git a/metadata/md5-cache/dev-libs/mongo-c-driver-1.12.0 b/metadata/md5-cache/dev-libs/mongo-c-driver-1.12.0
index 04b21791463a..145467531039 100644
--- a/metadata/md5-cache/dev-libs/mongo-c-driver-1.12.0
+++ b/metadata/md5-cache/dev-libs/mongo-c-driver-1.12.0
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( static-libs )
 RESTRICT=x86? ( test )
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-c-driver/archive/1.12.0.tar.gz -> mongo-c-driver-1.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c08483d3067401cb2834501ddf5015bc
diff --git a/metadata/md5-cache/dev-libs/msgpack-1.1.0 b/metadata/md5-cache/dev-libs/msgpack-1.1.0
index 693e9ec175c8..9ab256a590d7 100644
--- a/metadata/md5-cache/dev-libs/msgpack-1.1.0
+++ b/metadata/md5-cache/dev-libs/msgpack-1.1.0
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=test? ( >=dev-cpp/gtest-1.6.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(-)?] 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/make >=dev-util/cmake-3.9.6
 DESCRIPTION=MessagePack is a binary-based efficient data interchange format
-EAPI=5
+EAPI=6
 HOMEPAGE=https://msgpack.org/ https://github.com/msgpack/msgpack-c/
 IUSE=+cxx static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~x86 ~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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=9ceb35b929d201e21f60394ebf68ca2e
+_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_=56457b7f6ad1f8fd7a1154c44424edf8
diff --git a/metadata/md5-cache/dev-libs/msgpack-1.4.2 b/metadata/md5-cache/dev-libs/msgpack-1.4.2
index d6d8ff89720d..0e0b1ad59b3d 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3e6e660f7d5ab2f7a5a8ec39146199c1
diff --git a/metadata/md5-cache/dev-libs/msgpack-2.0.0 b/metadata/md5-cache/dev-libs/msgpack-2.0.0
index db561bd3b475..b713629a9d4f 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7800ee84bad1f73109ec72810d42bad5
diff --git a/metadata/md5-cache/dev-libs/msgpack-2.1.1 b/metadata/md5-cache/dev-libs/msgpack-2.1.1
index a5d1501268ec..ccdc6cd466dc 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=faaa18e48c8a68f5ba0f0af147d0cf07
diff --git a/metadata/md5-cache/dev-libs/nanomsg-1.1.4 b/metadata/md5-cache/dev-libs/nanomsg-1.1.4
index 1c610683c89a..2e759d57e60f 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=aae17416b878094bd758753ebc236056
diff --git a/metadata/md5-cache/dev-libs/npth-1.6-r1 b/metadata/md5-cache/dev-libs/npth-1.6-r1
new file mode 100644
index 000000000000..19992c177c53
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/npth-1.6-r1
@@ -0,0 +1,12 @@
+BDEPEND=>=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure install prepare
+DESCRIPTION=New GNU Portable Threads Library
+EAPI=7
+HOMEPAGE=https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git
+IUSE=static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2.1+
+SLOT=0
+SRC_URI=mirror://gnupg/npth/npth-1.6.tar.bz2
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=e640d09a42816fb0ddc0031fb07adcc7
diff --git a/metadata/md5-cache/dev-libs/nsync-1.20.1 b/metadata/md5-cache/dev-libs/nsync-1.20.1
index 1f5b5e2814aa..49ef71b5f494 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=347a6f8271d55c9359566dda823bbc13
diff --git a/metadata/md5-cache/dev-libs/openobex-1.7.2 b/metadata/md5-cache/dev-libs/openobex-1.7.2
index cc57e2f67de2..4674ed2567eb 100644
--- a/metadata/md5-cache/dev-libs/openobex-1.7.2
+++ b/metadata/md5-cache/dev-libs/openobex-1.7.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=bluetooth? ( net-wireless/bluez:= ) usb? ( virtual/libusb:= )
 SLOT=0/2
 SRC_URI=mirror://sourceforge/openobex/1.7.2/openobex-1.7.2-Source.tar.gz
-_eclasses_=cmake-utils	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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=62b2743bc57759be1db3c683bfbc20bc
diff --git a/metadata/md5-cache/dev-libs/pegtl-2.0.0 b/metadata/md5-cache/dev-libs/pegtl-2.0.0
index b91e854f97ac..d659314b6a1d 100644
--- a/metadata/md5-cache/dev-libs/pegtl-2.0.0
+++ b/metadata/md5-cache/dev-libs/pegtl-2.0.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/taocpp/PEGTL/archive/2.0.0.tar.gz -> pegtl-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9a0a542dab2e864b29bfcd83ee45e480
diff --git a/metadata/md5-cache/dev-libs/pegtl-2.0_pre1 b/metadata/md5-cache/dev-libs/pegtl-2.0_pre1
index cada6583dce3..f184d3c64e00 100644
--- a/metadata/md5-cache/dev-libs/pegtl-2.0_pre1
+++ b/metadata/md5-cache/dev-libs/pegtl-2.0_pre1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/taocpp/PEGTL/archive/bce83a6c7928c4cc8f9a5e18efbca40d18394d32.tar.gz -> pegtl-2.0_pre1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b7859f0f2554cfc337aa656084249357
diff --git a/metadata/md5-cache/dev-libs/pegtl-2.1.4 b/metadata/md5-cache/dev-libs/pegtl-2.1.4
index 93eb3a1b25e9..a4e1afebbf08 100644
--- a/metadata/md5-cache/dev-libs/pegtl-2.1.4
+++ b/metadata/md5-cache/dev-libs/pegtl-2.1.4
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/taocpp/PEGTL/archive/2.1.4.tar.gz -> pegtl-2.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9a0a542dab2e864b29bfcd83ee45e480
diff --git a/metadata/md5-cache/dev-libs/pigpio-67 b/metadata/md5-cache/dev-libs/pigpio-67
index 6575e2e51309..bfdddf97e5a7 100644
--- a/metadata/md5-cache/dev-libs/pigpio-67
+++ b/metadata/md5-cache/dev-libs/pigpio-67
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targ
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/joan2937/pigpio/archive/V67.tar.gz -> pigpio-67.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1bf24f81741dbc83da590c44cd64abef
diff --git a/metadata/md5-cache/dev-libs/poco-1.7.6 b/metadata/md5-cache/dev-libs/poco-1.7.6
index 096464ac7601..a6c007e16500 100644
--- a/metadata/md5-cache/dev-libs/poco-1.7.6
+++ b/metadata/md5-cache/dev-libs/poco-1.7.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libpcre-8.13 xml? ( dev-libs/expat ) apache? ( dev-libs/apr d
 REQUIRED_USE=7z? ( xml ) apache? ( net util ) file2pagecompiler? ( pagecompiler ) iodbc? ( odbc ) mongodb? ( data ) mysql? ( data ) odbc? ( data ) pagecompiler? ( json net util xml ) pocodoc? ( cppparser util xml ) sqlite? ( data ) test? ( data? ( sqlite ) json util xml )
 SLOT=0
 SRC_URI=https://github.com/pocoproject/poco/archive/poco-1.7.6-release.tar.gz -> poco-1.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=dff36f10e3c054e9cb668fa83cc8bef8
diff --git a/metadata/md5-cache/dev-libs/poco-1.9.0 b/metadata/md5-cache/dev-libs/poco-1.9.0
index a66799061e85..9a16710dee63 100644
--- a/metadata/md5-cache/dev-libs/poco-1.9.0
+++ b/metadata/md5-cache/dev-libs/poco-1.9.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libpcre-8.13 xml? ( dev-libs/expat ) apache? ( dev-libs/apr d
 REQUIRED_USE=7z? ( xml ) apache? ( net util ) file2pagecompiler? ( pagecompiler ) iodbc? ( odbc ) mongodb? ( data ) mysql? ( data ) odbc? ( data ) pagecompiler? ( json net util xml ) pocodoc? ( cppparser util xml ) sqlite? ( data ) test? ( data? ( sqlite ) json util xml )
 SLOT=0
 SRC_URI=https://github.com/pocoproject/poco/archive/poco-1.9.0-release.tar.gz -> poco-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=dff36f10e3c054e9cb668fa83cc8bef8
diff --git a/metadata/md5-cache/dev-libs/processor-trace-1.6.1 b/metadata/md5-cache/dev-libs/processor-trace-1.6.1
index 45c74b5928dc..dafb421cdaac 100644
--- a/metadata/md5-cache/dev-libs/processor-trace-1.6.1
+++ b/metadata/md5-cache/dev-libs/processor-trace-1.6.1
@@ -8,5 +8,5 @@ KEYWORDS=-* ~amd64
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/01org/processor-trace/archive/v1.6.1.tar.gz -> processor-trace-1.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=64471ac5e575b8876771899434ad5456
diff --git a/metadata/md5-cache/dev-libs/processor-trace-1.6.2 b/metadata/md5-cache/dev-libs/processor-trace-1.6.2
new file mode 100644
index 000000000000..06aeef36dc9d
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/processor-trace-1.6.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=doc? ( app-text/pandoc ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Intel(R) Processor Trace decoder library
+EAPI=6
+HOMEPAGE=https://github.com/01org/processor-trace
+IUSE=doc test
+KEYWORDS=-* ~amd64
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://github.com/01org/processor-trace/archive/v1.6.2.tar.gz -> processor-trace-1.6.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_=29b767ecf4fecb0ae5f67a18eb360102
diff --git a/metadata/md5-cache/dev-libs/processor-trace-2.0 b/metadata/md5-cache/dev-libs/processor-trace-2.0
new file mode 100644
index 000000000000..0c2f01c2c496
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/processor-trace-2.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=doc? ( app-text/pandoc ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Intel(R) Processor Trace decoder library
+EAPI=6
+HOMEPAGE=https://github.com/01org/processor-trace
+IUSE=doc test
+KEYWORDS=-* ~amd64
+LICENSE=BSD
+SLOT=0/2
+SRC_URI=https://github.com/01org/processor-trace/archive/v2.0.tar.gz -> processor-trace-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_=8b051bb7d5010a5408200dade7a411b5
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.4.1 b/metadata/md5-cache/dev-libs/protobuf-3.4.1
deleted file mode 100644
index 23cd1f2bf8ac..000000000000
--- a/metadata/md5-cache/dev-libs/protobuf-3.4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=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(-)?] ) test? ( >=dev-cpp/gtest-1.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(-)?] ) >=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=Google's Protocol Buffers - Extensible mechanism for serializing structured data
-EAPI=6
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/google/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
-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/14
-SRC_URI=https://github.com/google/protobuf/archive/v3.4.1.tar.gz -> protobuf-3.4.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_=9237dc0f7215be28b2f966227ecdfb16
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.5.1.1 b/metadata/md5-cache/dev-libs/protobuf-3.5.1.1
index a3333c5be606..1d37739a8ad7 100644
--- a/metadata/md5-cache/dev-libs/protobuf-3.5.1.1
+++ b/metadata/md5-cache/dev-libs/protobuf-3.5.1.1
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=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(-)?] ) test? ( >=dev-cpp/gtest-1.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(-)?] ) >=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=Google's Protocol Buffers - Extensible mechanism for serializing structured data
 EAPI=6
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf
+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
 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/15
-SRC_URI=https://github.com/google/protobuf/archive/v3.5.1.1.tar.gz -> protobuf-3.5.1.1.tar.gz
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.5.1.1.tar.gz -> protobuf-3.5.1.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_=c3cf49bbf74dd65d30e03abdc6dc8e4c
+_md5_=58fd27dc477e4741a220f2f8e806d5f3
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.5.2 b/metadata/md5-cache/dev-libs/protobuf-3.5.2
index 1195d8530cd0..d4d0bfbc1460 100644
--- a/metadata/md5-cache/dev-libs/protobuf-3.5.2
+++ b/metadata/md5-cache/dev-libs/protobuf-3.5.2
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=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(-)?] ) test? ( >=dev-cpp/gtest-1.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(-)?] ) >=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=Google's Protocol Buffers - Extensible mechanism for serializing structured data
 EAPI=6
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf
+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
 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/15
-SRC_URI=https://github.com/google/protobuf/archive/v3.5.2.tar.gz -> protobuf-3.5.2.tar.gz
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.5.2.tar.gz -> protobuf-3.5.2.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_=5a755d5c33c2016dec6ea49ba533f997
+_md5_=8bd7bcbca66d434c99fbff40a73a29b1
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.6.0.1 b/metadata/md5-cache/dev-libs/protobuf-3.6.0.1
index b3a2b63724df..667041f36bfe 100644
--- a/metadata/md5-cache/dev-libs/protobuf-3.6.0.1
+++ b/metadata/md5-cache/dev-libs/protobuf-3.6.0.1
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=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(-)?] ) test? ( >=dev-cpp/gtest-1.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(-)?] ) >=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=Google's Protocol Buffers - Extensible mechanism for serializing structured data
 EAPI=6
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf
+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
 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/16
-SRC_URI=https://github.com/google/protobuf/archive/v3.6.0.1.tar.gz -> protobuf-3.6.0.1.tar.gz
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.6.0.1.tar.gz -> protobuf-3.6.0.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_=5e0e98a65ab16cce86e0e44c96bf6382
+_md5_=b71a7faa734f237e6e2e799e7446cce0
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.6.1 b/metadata/md5-cache/dev-libs/protobuf-3.6.1
index c33f3184c57e..0a7715044d41 100644
--- a/metadata/md5-cache/dev-libs/protobuf-3.6.1
+++ b/metadata/md5-cache/dev-libs/protobuf-3.6.1
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=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(-)?] ) test? ( >=dev-cpp/gtest-1.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(-)?] ) >=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=Google's Protocol Buffers - Extensible mechanism for serializing structured data
 EAPI=6
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf
+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
 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/google/protobuf/archive/v3.6.1.tar.gz -> protobuf-3.6.1.tar.gz
+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_=7098fc5d20ddd241464f9359593937f0
+_md5_=2cfa8c3239b9e9d08b15ac45b2386f88
diff --git a/metadata/md5-cache/dev-libs/pugixml-1.8 b/metadata/md5-cache/dev-libs/pugixml-1.8
index 99dcb6137c27..5309bfb349e6 100644
--- a/metadata/md5-cache/dev-libs/pugixml-1.8
+++ b/metadata/md5-cache/dev-libs/pugixml-1.8
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/zeux/pugixml/releases/download/v1.8/pugixml-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=96cb907c8fe9da1415b103d47879023f
diff --git a/metadata/md5-cache/dev-libs/pugixml-1.9 b/metadata/md5-cache/dev-libs/pugixml-1.9
index f6715689d40d..eaf418e93f93 100644
--- a/metadata/md5-cache/dev-libs/pugixml-1.9
+++ b/metadata/md5-cache/dev-libs/pugixml-1.9
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/zeux/pugixml/releases/download/v1.9/pugixml-1.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a2fcf41c1316f03bfa9f07c42a4403b6
diff --git a/metadata/md5-cache/dev-libs/qof-0.8.8-r1 b/metadata/md5-cache/dev-libs/qof-0.8.8-r1
index 9339aefee179..ed4c29909b7d 100644
--- a/metadata/md5-cache/dev-libs/qof-0.8.8-r1
+++ b/metadata/md5-cache/dev-libs/qof-0.8.8-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 dev-libs/glib:2
 SLOT=2
 SRC_URI=mirror://debian//pool/main/q/qof/qof_0.8.8.orig.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4c50046e7d0bc0f054dcfd5b33cd9452
diff --git a/metadata/md5-cache/dev-libs/qrosscore-0.3.2 b/metadata/md5-cache/dev-libs/qrosscore-0.3.2
index 34ad3e8b44d9..01624849cbeb 100644
--- a/metadata/md5-cache/dev-libs/qrosscore-0.3.2
+++ b/metadata/md5-cache/dev-libs/qrosscore-0.3.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/designer:5 dev-qt/qtscript:5
 SLOT=0
 SRC_URI=https://github.com/0xd34df00d/Qross/archive/0.3.2.tar.gz -> qrosscore-0.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=1a305522aa18cac434374239cb8294ae
diff --git a/metadata/md5-cache/dev-libs/qrosscore-9999 b/metadata/md5-cache/dev-libs/qrosscore-9999
index 2ab3a4f2ba06..a883ee562e44 100644
--- a/metadata/md5-cache/dev-libs/qrosscore-9999
+++ b/metadata/md5-cache/dev-libs/qrosscore-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/designer:5 dev-qt/qtscript:5
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b575660a6f530cbb292809f648fa1532
diff --git a/metadata/md5-cache/dev-libs/qrosspython-0.3.2 b/metadata/md5-cache/dev-libs/qrosspython-0.3.2
index 078ab1750486..906ddb054f2f 100644
--- a/metadata/md5-cache/dev-libs/qrosspython-0.3.2
+++ b/metadata/md5-cache/dev-libs/qrosspython-0.3.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-libs/qrosscore-0.3.2 dev-python/sip dev-qt/qtcore:5 dev-qt/qtgui:5
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/0xd34df00d/Qross/archive/0.3.2.tar.gz -> qrosscore-0.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=0751df3b00a09b9baa4e671043d90a68
diff --git a/metadata/md5-cache/dev-libs/qrosspython-9999 b/metadata/md5-cache/dev-libs/qrosspython-9999
index f027d95c8a78..3ad4e82e0731 100644
--- a/metadata/md5-cache/dev-libs/qrosspython-9999
+++ b/metadata/md5-cache/dev-libs/qrosspython-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=~dev-libs/qrosscore-9999 dev-python/sip dev-qt/qtcore:5 dev-qt/qtgui: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=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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8f30c93c5f6882654f959acc55e17bc9
diff --git a/metadata/md5-cache/dev-libs/qtkeychain-0.8.0 b/metadata/md5-cache/dev-libs/qtkeychain-0.8.0
index 887b7b2bff6a..a8ca51f6d043 100644
--- a/metadata/md5-cache/dev-libs/qtkeychain-0.8.0
+++ b/metadata/md5-cache/dev-libs/qtkeychain-0.8.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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 577dd83c0a6d..99ed1b5129db 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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=8a1a39fd906db44c4c71fa5b32690f84
+_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
diff --git a/metadata/md5-cache/dev-libs/quazip-0.7.6 b/metadata/md5-cache/dev-libs/quazip-0.7.6
index 94e00be9e3d6..30208390aecf 100644
--- a/metadata/md5-cache/dev-libs/quazip-0.7.6
+++ b/metadata/md5-cache/dev-libs/quazip-0.7.6
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5 sys-libs/zlib[minizip]
 SLOT=0
 SRC_URI=https://github.com/stachenov/quazip/archive/0.7.6.tar.gz -> quazip-0.7.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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=80549ca8e57cc235d78a42ff97c9bc98
diff --git a/metadata/md5-cache/dev-libs/rapidjson-1.1.0 b/metadata/md5-cache/dev-libs/rapidjson-1.1.0
index 11dc278febcd..8e5df6819789 100644
--- a/metadata/md5-cache/dev-libs/rapidjson-1.1.0
+++ b/metadata/md5-cache/dev-libs/rapidjson-1.1.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/miloyip/rapidjson/archive/v1.1.0.tar.gz -> rapidjson-1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cbee6d9d80313ef9d341a8b4f481b067
diff --git a/metadata/md5-cache/dev-libs/rapidjson-1.1.0-r1 b/metadata/md5-cache/dev-libs/rapidjson-1.1.0-r1
index f3d9a51a45a2..c6c46afba811 100644
--- a/metadata/md5-cache/dev-libs/rapidjson-1.1.0-r1
+++ b/metadata/md5-cache/dev-libs/rapidjson-1.1.0-r1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/miloyip/rapidjson/archive/v1.1.0.tar.gz -> rapidjson-1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e23557b7766a36e70a30fc98f046c105
diff --git a/metadata/md5-cache/dev-libs/rapidjson-9999 b/metadata/md5-cache/dev-libs/rapidjson-9999
index 76a574f25c02..bceb7d5236ac 100644
--- a/metadata/md5-cache/dev-libs/rapidjson-9999
+++ b/metadata/md5-cache/dev-libs/rapidjson-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://rapidjson.org/
 IUSE=doc examples 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9ad095dfbe9ff197f5634321730491b6
diff --git a/metadata/md5-cache/dev-libs/rasqal-0.9.29 b/metadata/md5-cache/dev-libs/rasqal-0.9.29
deleted file mode 100644
index 02e3dd2b68d3..000000000000
--- a/metadata/md5-cache/dev-libs/rasqal-0.9.29
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=media-libs/raptor-2.0.7:2 kernel_linux? ( >=sys-apps/util-linux-2.19 ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 ) !gmp? ( dev-libs/mpfr ) gmp? ( dev-libs/gmp ) crypt? ( !mhash? ( dev-libs/libgcrypt:0 ) mhash? ( app-crypt/mhash ) ) virtual/pkgconfig sys-devel/flex test? ( dev-perl/XML-DOM ) >=app-portage/elt-patches-20170815
-DESCRIPTION=library that handles Resource Description Framework (RDF)
-EAPI=4
-HOMEPAGE=http://librdf.org/rasqal/
-IUSE=+crypt doc gmp kernel_linux +mhash pcre static-libs test xml
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=Apache-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=media-libs/raptor-2.0.7:2 kernel_linux? ( >=sys-apps/util-linux-2.19 ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 ) !gmp? ( dev-libs/mpfr ) gmp? ( dev-libs/gmp ) crypt? ( !mhash? ( dev-libs/libgcrypt:0 ) mhash? ( app-crypt/mhash ) )
-SLOT=0
-SRC_URI=http://download.librdf.org/source/rasqal-0.9.29.tar.gz
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=660acaf151dc43bc64297abd4d88fdfc
diff --git a/metadata/md5-cache/dev-libs/rasqal-0.9.32 b/metadata/md5-cache/dev-libs/rasqal-0.9.32
index d83bc2a005a8..5c7565da85c1 100644
--- a/metadata/md5-cache/dev-libs/rasqal-0.9.32
+++ b/metadata/md5-cache/dev-libs/rasqal-0.9.32
@@ -4,10 +4,10 @@ DESCRIPTION=library that handles Resource Description Framework (RDF)
 EAPI=5
 HOMEPAGE=http://librdf.org/rasqal/
 IUSE=+crypt gmp kernel_linux +mhash pcre static-libs test xml
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=Apache-2.0 GPL-2 LGPL-2.1
 RDEPEND=>=media-libs/raptor-2.0.14 kernel_linux? ( >=sys-apps/util-linux-2.19 ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 ) !gmp? ( dev-libs/mpfr ) gmp? ( dev-libs/gmp ) crypt? ( !mhash? ( dev-libs/libgcrypt:0 ) mhash? ( app-crypt/mhash ) )
 SLOT=0
 SRC_URI=http://download.librdf.org/source/rasqal-0.9.32.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_=316608c33c784fc231c396d109a058aa
+_md5_=8f552d03c09493c6051e6cad8299c21f
diff --git a/metadata/md5-cache/dev-libs/rasqal-0.9.33 b/metadata/md5-cache/dev-libs/rasqal-0.9.33
new file mode 100644
index 000000000000..91cc31a81779
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/rasqal-0.9.33
@@ -0,0 +1,14 @@
+BDEPEND=>=sys-devel/bison-3 >=sys-devel/flex-2.5.36 virtual/pkgconfig test? ( dev-perl/XML-DOM ) >=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure install prepare
+DEPEND=>=media-libs/raptor-2.0.15 crypt? ( !mhash? ( dev-libs/libgcrypt:0 ) mhash? ( app-crypt/mhash ) ) !gmp? ( dev-libs/mpfr:= ) gmp? ( dev-libs/gmp:= ) kernel_linux? ( >=sys-apps/util-linux-2.19 ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 )
+DESCRIPTION=Library that handles Resource Description Framework (RDF)
+EAPI=7
+HOMEPAGE=http://librdf.org/rasqal/
+IUSE=+crypt gmp kernel_linux +mhash pcre static-libs test xml
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=Apache-2.0 GPL-2 LGPL-2.1
+RDEPEND=>=media-libs/raptor-2.0.15 crypt? ( !mhash? ( dev-libs/libgcrypt:0 ) mhash? ( app-crypt/mhash ) ) !gmp? ( dev-libs/mpfr:= ) gmp? ( dev-libs/gmp:= ) kernel_linux? ( >=sys-apps/util-linux-2.19 ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 )
+SLOT=0
+SRC_URI=http://download.librdf.org/source/rasqal-0.9.33.tar.gz
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=b438bf6a8a9bb87ddabaac685168778b
diff --git a/metadata/md5-cache/dev-libs/re2-0.2018.10.01 b/metadata/md5-cache/dev-libs/re2-0.2018.10.01
new file mode 100644
index 000000000000..a725c4c86cc4
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/re2-0.2018.10.01
@@ -0,0 +1,14 @@
+BDEPEND=icu? ( virtual/pkgconfig )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=An efficient, principled regular expression library
+EAPI=7
+HOMEPAGE=https://github.com/google/re2
+IUSE=icu abi_x86_32 abi_x86_64 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
+LICENSE=BSD
+RDEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0/gentoo-2017-03-01
+SRC_URI=https://github.com/google/re2/archive/2018-10-01.tar.gz -> re2-2018-10-01.tar.gz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=62b487db9d052f1e9b72d382034b0829
diff --git a/metadata/md5-cache/dev-libs/redland-1.0.15 b/metadata/md5-cache/dev-libs/redland-1.0.15
index f60b71743e51..fbcab33be1ed 100644
--- a/metadata/md5-cache/dev-libs/redland-1.0.15
+++ b/metadata/md5-cache/dev-libs/redland-1.0.15
@@ -4,10 +4,10 @@ DESCRIPTION=High-level interface for the Resource Description Framework
 EAPI=4
 HOMEPAGE=http://librdf.org/
 IUSE=berkdb iodbc mysql odbc postgres sqlite ssl static-libs +xml
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=Apache-2.0 GPL-2 LGPL-2.1
 RDEPEND=dev-libs/libltdl:0 mysql? ( virtual/mysql ) sqlite? ( =dev-db/sqlite-3* ) berkdb? ( sys-libs/db ) xml? ( dev-libs/libxml2 ) !xml? ( >=dev-libs/expat-2 ) ssl? ( dev-libs/openssl:0 ) >=media-libs/raptor-2.0.7 >=dev-libs/rasqal-0.9.28 postgres? ( dev-db/postgresql ) iodbc? ( dev-db/libiodbc ) odbc? ( dev-db/unixODBC )
 SLOT=0
 SRC_URI=http://download.librdf.org/source/redland-1.0.15.tar.gz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=81a35b3e3a8af4d7d27b6247bc9e9173
+_md5_=03e65794f6ad761c6a3cc5acf3d72cb0
diff --git a/metadata/md5-cache/dev-libs/redland-1.0.16 b/metadata/md5-cache/dev-libs/redland-1.0.16
index e6a7e51f7899..7c0ce727c5b0 100644
--- a/metadata/md5-cache/dev-libs/redland-1.0.16
+++ b/metadata/md5-cache/dev-libs/redland-1.0.16
@@ -4,10 +4,10 @@ DESCRIPTION=High-level interface for the Resource Description Framework
 EAPI=4
 HOMEPAGE=http://librdf.org/
 IUSE=berkdb iodbc mysql odbc postgres sqlite static-libs +xml
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=Apache-2.0 GPL-2 LGPL-2.1
 RDEPEND=dev-libs/libltdl:0 mysql? ( virtual/mysql ) sqlite? ( =dev-db/sqlite-3* ) berkdb? ( sys-libs/db ) xml? ( dev-libs/libxml2 ) !xml? ( >=dev-libs/expat-2 ) >=media-libs/raptor-2.0.7 >=dev-libs/rasqal-0.9.28 postgres? ( dev-db/postgresql ) iodbc? ( dev-db/libiodbc ) odbc? ( dev-db/unixODBC )
 SLOT=0
 SRC_URI=http://download.librdf.org/source/redland-1.0.16.tar.gz
 _eclasses_=db-use	501a5d0963e0d17f30260023f292ae8e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=9fb06eb5e04cffa5078e848315ce97c1
+_md5_=17af373ac82f41cf7a9b00b9b4724899
diff --git a/metadata/md5-cache/dev-libs/redland-1.0.17-r1 b/metadata/md5-cache/dev-libs/redland-1.0.17-r1
index 90f9fd77a51c..b0d0a2388afd 100644
--- a/metadata/md5-cache/dev-libs/redland-1.0.17-r1
+++ b/metadata/md5-cache/dev-libs/redland-1.0.17-r1
@@ -4,10 +4,10 @@ DESCRIPTION=High-level interface for the Resource Description Framework
 EAPI=5
 HOMEPAGE=http://librdf.org/
 IUSE=berkdb iodbc mysql odbc postgres sqlite static-libs
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=Apache-2.0 GPL-2 LGPL-2.1
 RDEPEND=dev-libs/libltdl:0 mysql? ( virtual/mysql ) sqlite? ( =dev-db/sqlite-3* ) berkdb? ( sys-libs/db ) >=media-libs/raptor-2.0.14 >=dev-libs/rasqal-0.9.32 postgres? ( dev-db/postgresql ) iodbc? ( dev-db/libiodbc ) odbc? ( dev-db/unixODBC )
 SLOT=0
 SRC_URI=http://download.librdf.org/source/redland-1.0.17.tar.gz
 _eclasses_=db-use	501a5d0963e0d17f30260023f292ae8e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=4421a8838b1eeb9fdc430f6458d7a7fb
+_md5_=0a7150e6d0cbf3046eb4f1c1f41627c5
diff --git a/metadata/md5-cache/dev-libs/sdformat-5.2.0 b/metadata/md5-cache/dev-libs/sdformat-5.2.0
index d95445607808..7dbffd976141 100644
--- a/metadata/md5-cache/dev-libs/sdformat-5.2.0
+++ b/metadata/md5-cache/dev-libs/sdformat-5.2.0
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
index f5081ba3a51c..6373a690ea20 100644
--- a/metadata/md5-cache/dev-libs/sdformat-5.3.0
+++ b/metadata/md5-cache/dev-libs/sdformat-5.3.0
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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.0.0 b/metadata/md5-cache/dev-libs/sdformat-6.0.0
index b8a63bc5a657..2c7b930452d2 100644
--- a/metadata/md5-cache/dev-libs/sdformat-6.0.0
+++ b/metadata/md5-cache/dev-libs/sdformat-6.0.0
@@ -8,5 +8,5 @@ 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.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=456077ee5fd53e38e06592582d649daa
diff --git a/metadata/md5-cache/dev-libs/shhopt-1.1.7-r3 b/metadata/md5-cache/dev-libs/shhopt-1.1.7-r3
new file mode 100644
index 000000000000..17e9a29a3585
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/shhopt-1.1.7-r3
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=library for parsing command line options
+EAPI=7
+HOMEPAGE=http://shh.thathost.com/pub-unix/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Artistic
+SLOT=0
+SRC_URI=http://shh.thathost.com/pub-unix/files/shhopt-1.1.7.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=cc6f886bd522e9feab573a07b4640361
diff --git a/metadata/md5-cache/dev-libs/sink-0.5.0 b/metadata/md5-cache/dev-libs/sink-0.5.0
index e67fe406df3e..1b35b166d41a 100644
--- a/metadata/md5-cache/dev-libs/sink-0.5.0
+++ b/metadata/md5-cache/dev-libs/sink-0.5.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-apps/kcontacts-17.12.3:5 >=k
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/smack-0.5.0 b/metadata/md5-cache/dev-libs/smack-0.5.0
index d6bc190b5c2e..02fa8899a30a 100644
--- a/metadata/md5-cache/dev-libs/smack-0.5.0
+++ b/metadata/md5-cache/dev-libs/smack-0.5.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=app-arch/snappy dev-libs/boost
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~patrick/smack-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1a5e9df1514806ff9314c1e0c95e6191
diff --git a/metadata/md5-cache/dev-libs/spdlog-0.17.0 b/metadata/md5-cache/dev-libs/spdlog-0.17.0
index 6f96484f228b..9c03b3e66670 100644
--- a/metadata/md5-cache/dev-libs/spdlog-0.17.0
+++ b/metadata/md5-cache/dev-libs/spdlog-0.17.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=<=dev-libs/libfmt-4.1.0
 SLOT=0
 SRC_URI=https://github.com/gabime/spdlog/archive/v0.17.0.tar.gz -> spdlog-0.17.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ed0b84b6da98bb807f48b132e551d8fe
diff --git a/metadata/md5-cache/dev-libs/spdlog-1.0.0 b/metadata/md5-cache/dev-libs/spdlog-1.0.0
index b618b7ccc9f7..ef5fd0afee95 100644
--- a/metadata/md5-cache/dev-libs/spdlog-1.0.0
+++ b/metadata/md5-cache/dev-libs/spdlog-1.0.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/libfmt-5.0.0
 SLOT=0/1
 SRC_URI=https://github.com/gabime/spdlog/archive/v1.0.0.tar.gz -> spdlog-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	89bb9f083a2590d9b447fd0b78a96186
+_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/spdlog-1.1.0 b/metadata/md5-cache/dev-libs/spdlog-1.1.0
index 1ef721daa04f..a93eed85824e 100644
--- a/metadata/md5-cache/dev-libs/spdlog-1.1.0
+++ b/metadata/md5-cache/dev-libs/spdlog-1.1.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/libfmt-5.0.0
 SLOT=0/1
 SRC_URI=https://github.com/gabime/spdlog/archive/v1.1.0.tar.gz -> spdlog-1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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/spdlog-9999 b/metadata/md5-cache/dev-libs/spdlog-9999
index 0479f48e96c4..d5f76f002533 100644
--- a/metadata/md5-cache/dev-libs/spdlog-9999
+++ b/metadata/md5-cache/dev-libs/spdlog-9999
@@ -7,5 +7,5 @@ IUSE=test
 LICENSE=MIT
 RDEPEND=>=dev-libs/libfmt-5.0.0
 SLOT=0/1
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3e19701d31dd851be9b55d243c0de35a
diff --git a/metadata/md5-cache/dev-libs/sway-0.15.2 b/metadata/md5-cache/dev-libs/sway-0.15.2
index 29b267212f95..e4e82fccfe22 100644
--- a/metadata/md5-cache/dev-libs/sway-0.15.2
+++ b/metadata/md5-cache/dev-libs/sway-0.15.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/wlc-0.0.8[systemd=] dev-libs/json-c:0= dev-libs/libpcre dev-l
 REQUIRED_USE=tray? ( swaybar )
 SLOT=0
 SRC_URI=https://github.com/swaywm/sway/archive/0.15.2.tar.gz -> sway-0.15.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6e6e4aa5198caf0540e57f607e99d783
diff --git a/metadata/md5-cache/dev-libs/sway-9999 b/metadata/md5-cache/dev-libs/sway-9999
index bdc3702b220f..03110c20ffd1 100644
--- a/metadata/md5-cache/dev-libs/sway-9999
+++ b/metadata/md5-cache/dev-libs/sway-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND==dev-libs/wlc-9999[systemd=] dev-libs/json-c:0= dev-libs/libpcre dev-libs/libinput dev-libs/wayland sys-libs/libcap x11-libs/libxkbcommon x11-libs/cairo x11-libs/pango gdk-pixbuf? ( x11-libs/gdk-pixbuf[jpeg] ) swaylock? ( virtual/pam ) tray? ( sys-apps/dbus )
 REQUIRED_USE=tray? ( swaybar )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c21278187d764958939f0ebdae8d658f
diff --git a/metadata/md5-cache/dev-libs/template-glib-3.28.0 b/metadata/md5-cache/dev-libs/template-glib-3.28.0
index 94369ff210e5..9434d0cab229 100644
--- a/metadata/md5-cache/dev-libs/template-glib-3.28.0
+++ b/metadata/md5-cache/dev-libs/template-glib-3.28.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection:=
 REQUIRED_USE=vala? ( introspection )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/template-glib/3.28/template-glib-3.28.0.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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=863f789c794f3d75a86c45bf402fbd25
diff --git a/metadata/md5-cache/dev-libs/tinyxml2-6.2.0 b/metadata/md5-cache/dev-libs/tinyxml2-6.2.0
index 095960cb3be3..4cf39157c43b 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=87a714701ec0fd2eda946541c2d411f8
diff --git a/metadata/md5-cache/dev-libs/totem-pl-parser-3.10.8 b/metadata/md5-cache/dev-libs/totem-pl-parser-3.10.8
index f55708924e02..ea19e5744b6f 100644
--- a/metadata/md5-cache/dev-libs/totem-pl-parser-3.10.8
+++ b/metadata/md5-cache/dev-libs/totem-pl-parser-3.10.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.36:2 dev-libs/gmime:2.6 >=net-libs/libsoup-2.43:2.4 archive? ( >=app-arch/libarchive-3 ) crypt? ( dev-libs/libgcrypt:0= ) introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) quvi? ( >=media-libs/libquvi-0.9.1:0= ) !<media-video/totem-2.21 dev-libs/gobject-introspection-common >=dev-util/intltool-0.35 >=dev-util/gtk-doc-am-1.14 sys-devel/autoconf-archive >=sys-devel/gettext-0.17 virtual/pkgconfig test? ( gnome-base/gvfs[http] 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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.36:2 dev-libs/gmime:2.6 >=net-libs/libsoup-2.43:2.4 archive? ( >=app-arch/libarchive-3 ) crypt? ( dev-libs/libgcrypt:0= ) introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) quvi? ( >=media-libs/libquvi-0.9.1:0= ) !<media-video/totem-2.21 dev-libs/gobject-introspection-common >=dev-util/intltool-0.35 dev-util/glib-utils >=dev-util/gtk-doc-am-1.14 sys-devel/autoconf-archive >=sys-devel/gettext-0.17 virtual/pkgconfig test? ( gnome-base/gvfs[http] 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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Playlist parsing library
 EAPI=6
 HOMEPAGE=https://developer.gnome.org/totem-pl-parser/stable/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.36:2 dev-libs/gmime:2.6 >=net-libs/libsoup-2.43:2.4 archive? ( >=app-arch/libarchive-3 ) crypt? ( dev-libs/libgcrypt:0= ) introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) quvi? ( >=media-libs/libquvi-0.9.1:0= )
 SLOT=0/18
 SRC_URI=mirror://gnome/sources/totem-pl-parser/3.10/totem-pl-parser-3.10.8.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=90afab21d0afaf27d3f9ffc0a3092a3e
+_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_=b3c2fcd9dbd7fa358f844983fd1c8137
diff --git a/metadata/md5-cache/dev-libs/unittest++-1.6.1 b/metadata/md5-cache/dev-libs/unittest++-1.6.1
index d3126a227576..1b70fff5b9bb 100644
--- a/metadata/md5-cache/dev-libs/unittest++-1.6.1
+++ b/metadata/md5-cache/dev-libs/unittest++-1.6.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/unittest-cpp/unittest-cpp/archive/v1.6.1.tar.gz -> unittest++-1.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1fce0ec9f60afa66da738632eeec0524
diff --git a/metadata/md5-cache/dev-libs/unittest++-2.0.0 b/metadata/md5-cache/dev-libs/unittest++-2.0.0
index 131e87c9ac32..04af7fe83813 100644
--- a/metadata/md5-cache/dev-libs/unittest++-2.0.0
+++ b/metadata/md5-cache/dev-libs/unittest++-2.0.0
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/unittest-cpp/unittest-cpp/archive/v2.0.0.tar.gz -> unittest++-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=12cc8009a9ad0b014312728efb260b40
diff --git a/metadata/md5-cache/dev-libs/urdfdom-1.0.0-r1 b/metadata/md5-cache/dev-libs/urdfdom-1.0.0-r1
index 0e8a25d2cbf3..3660c1acc9d5 100644
--- a/metadata/md5-cache/dev-libs/urdfdom-1.0.0-r1
+++ b/metadata/md5-cache/dev-libs/urdfdom-1.0.0-r1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/urdfdom_headers-1.0.0 >=dev-libs/console_bridge-0.3:= dev-libs/tinyxml dev-libs/boost:=[threads]
 SLOT=0/1
 SRC_URI=https://github.com/ros/urdfdom/archive/1.0.0.tar.gz -> urdfdom-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d6f203c43196614927ce9428bb0d8beb
diff --git a/metadata/md5-cache/dev-libs/urdfdom-9999 b/metadata/md5-cache/dev-libs/urdfdom-9999
index 905f1759d0ec..e89200626982 100644
--- a/metadata/md5-cache/dev-libs/urdfdom-9999
+++ b/metadata/md5-cache/dev-libs/urdfdom-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://ros.org/wiki/urdf
 LICENSE=BSD
 RDEPEND=>=dev-libs/urdfdom_headers-1.0.0 >=dev-libs/console_bridge-0.3:= dev-libs/tinyxml dev-libs/boost:=[threads]
 SLOT=0/1
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d6f203c43196614927ce9428bb0d8beb
diff --git a/metadata/md5-cache/dev-libs/urdfdom_headers-0.4.2 b/metadata/md5-cache/dev-libs/urdfdom_headers-0.4.2
index 3d027a884267..1e5ae402c57b 100644
--- a/metadata/md5-cache/dev-libs/urdfdom_headers-0.4.2
+++ b/metadata/md5-cache/dev-libs/urdfdom_headers-0.4.2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/ros/urdfdom_headers/archive/0.4.2.tar.gz -> urdfdom_headers-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=274323788fa25e4deddb7d8f553a2613
diff --git a/metadata/md5-cache/dev-libs/urdfdom_headers-1.0.0 b/metadata/md5-cache/dev-libs/urdfdom_headers-1.0.0
index 65422da87bf9..72a38bebaba7 100644
--- a/metadata/md5-cache/dev-libs/urdfdom_headers-1.0.0
+++ b/metadata/md5-cache/dev-libs/urdfdom_headers-1.0.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/ros/urdfdom_headers/archive/1.0.0.tar.gz -> urdfdom_headers-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=274323788fa25e4deddb7d8f553a2613
diff --git a/metadata/md5-cache/dev-libs/urdfdom_headers-9999 b/metadata/md5-cache/dev-libs/urdfdom_headers-9999
index 641bee839531..319b7b2ceb18 100644
--- a/metadata/md5-cache/dev-libs/urdfdom_headers-9999
+++ b/metadata/md5-cache/dev-libs/urdfdom_headers-9999
@@ -5,5 +5,5 @@ EAPI=5
 HOMEPAGE=http://ros.org/wiki/urdf
 LICENSE=BSD
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6c2492407a0ae62e021e3e5f5d58d7ab
diff --git a/metadata/md5-cache/dev-libs/vc-0.7.4 b/metadata/md5-cache/dev-libs/vc-0.7.4
index f8dc37de31cb..c0fdfe94abe4 100644
--- a/metadata/md5-cache/dev-libs/vc-0.7.4
+++ b/metadata/md5-cache/dev-libs/vc-0.7.4
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
 SLOT=0
 SRC_URI=test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-acos-dp.dat -> vc-0.7.4-reference-acos-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-acos-sp.dat -> vc-0.7.4-reference-acos-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-asin-dp.dat -> vc-0.7.4-reference-asin-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-asin-sp.dat -> vc-0.7.4-reference-asin-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-atan-dp.dat -> vc-0.7.4-reference-atan-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-atan-sp.dat -> vc-0.7.4-reference-atan-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-ln-dp.dat -> vc-0.7.4-reference-ln-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-ln-sp.dat -> vc-0.7.4-reference-ln-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-log2-dp.dat -> vc-0.7.4-reference-log2-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-log2-sp.dat -> vc-0.7.4-reference-log2-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-log10-dp.dat -> vc-0.7.4-reference-log10-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-log10-sp.dat -> vc-0.7.4-reference-log10-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-sincos-dp.dat -> vc-0.7.4-reference-sincos-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-sincos-sp.dat -> vc-0.7.4-reference-sincos-sp.dat ) https://github.com/VcDevel/Vc/archive/0.7.4.tar.gz -> vc-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=47af6420ebcdf290b1daf16e70a805ba
diff --git a/metadata/md5-cache/dev-libs/vc-1.3.0 b/metadata/md5-cache/dev-libs/vc-1.3.0
index adae858cb3e2..8170dd5e0a31 100644
--- a/metadata/md5-cache/dev-libs/vc-1.3.0
+++ b/metadata/md5-cache/dev-libs/vc-1.3.0
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=LGPL-3
 SLOT=0
 SRC_URI=test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-acos-dp.dat -> vc-1.3.0-reference-acos-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-acos-sp.dat -> vc-1.3.0-reference-acos-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-asin-dp.dat -> vc-1.3.0-reference-asin-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-asin-sp.dat -> vc-1.3.0-reference-asin-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-atan-dp.dat -> vc-1.3.0-reference-atan-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-atan-sp.dat -> vc-1.3.0-reference-atan-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-ln-dp.dat -> vc-1.3.0-reference-ln-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-ln-sp.dat -> vc-1.3.0-reference-ln-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-log2-dp.dat -> vc-1.3.0-reference-log2-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-log2-sp.dat -> vc-1.3.0-reference-log2-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-log10-dp.dat -> vc-1.3.0-reference-log10-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-log10-sp.dat -> vc-1.3.0-reference-log10-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-sincos-dp.dat -> vc-1.3.0-reference-sincos-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-sincos-sp.dat -> vc-1.3.0-reference-sincos-sp.dat ) https://github.com/VcDevel/Vc/archive/1.3.0.tar.gz -> vc-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b7798ceb8bcc64866a0e51b1d61c1de6
diff --git a/metadata/md5-cache/dev-libs/vc-1.3.2 b/metadata/md5-cache/dev-libs/vc-1.3.2
index 36f1444c707f..7e217a574380 100644
--- a/metadata/md5-cache/dev-libs/vc-1.3.2
+++ b/metadata/md5-cache/dev-libs/vc-1.3.2
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=LGPL-3
 SLOT=0
 SRC_URI=test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-acos-dp.dat -> vc-1.3.2-reference-acos-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-acos-sp.dat -> vc-1.3.2-reference-acos-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-asin-dp.dat -> vc-1.3.2-reference-asin-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-asin-sp.dat -> vc-1.3.2-reference-asin-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-atan-dp.dat -> vc-1.3.2-reference-atan-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-atan-sp.dat -> vc-1.3.2-reference-atan-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-ln-dp.dat -> vc-1.3.2-reference-ln-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-ln-sp.dat -> vc-1.3.2-reference-ln-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-log2-dp.dat -> vc-1.3.2-reference-log2-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-log2-sp.dat -> vc-1.3.2-reference-log2-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-log10-dp.dat -> vc-1.3.2-reference-log10-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-log10-sp.dat -> vc-1.3.2-reference-log10-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-sincos-dp.dat -> vc-1.3.2-reference-sincos-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-sincos-sp.dat -> vc-1.3.2-reference-sincos-sp.dat ) https://github.com/VcDevel/Vc/archive/1.3.2.tar.gz -> vc-1.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=2bfa8ea29a7fed4d68260d5e880b24f0
diff --git a/metadata/md5-cache/dev-libs/vc-1.3.3 b/metadata/md5-cache/dev-libs/vc-1.3.3
index 6d4da928b330..5a48831feed5 100644
--- a/metadata/md5-cache/dev-libs/vc-1.3.3
+++ b/metadata/md5-cache/dev-libs/vc-1.3.3
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=LGPL-3
 SLOT=0
 SRC_URI=test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-acos-dp.dat -> vc-1.3.3-reference-acos-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-acos-sp.dat -> vc-1.3.3-reference-acos-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-asin-dp.dat -> vc-1.3.3-reference-asin-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-asin-sp.dat -> vc-1.3.3-reference-asin-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-atan-dp.dat -> vc-1.3.3-reference-atan-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-atan-sp.dat -> vc-1.3.3-reference-atan-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-ln-dp.dat -> vc-1.3.3-reference-ln-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-ln-sp.dat -> vc-1.3.3-reference-ln-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-log2-dp.dat -> vc-1.3.3-reference-log2-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-log2-sp.dat -> vc-1.3.3-reference-log2-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-log10-dp.dat -> vc-1.3.3-reference-log10-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-log10-sp.dat -> vc-1.3.3-reference-log10-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-sincos-dp.dat -> vc-1.3.3-reference-sincos-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-sincos-sp.dat -> vc-1.3.3-reference-sincos-sp.dat ) https://github.com/VcDevel/Vc/archive/1.3.3.tar.gz -> vc-1.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2bfa8ea29a7fed4d68260d5e880b24f0
diff --git a/metadata/md5-cache/dev-libs/wlc-0.0.10 b/metadata/md5-cache/dev-libs/wlc-0.0.10
index b8a86b203168..4273c56a4d84 100644
--- a/metadata/md5-cache/dev-libs/wlc-0.0.10
+++ b/metadata/md5-cache/dev-libs/wlc-0.0.10
@@ -9,5 +9,5 @@ LICENSE=MIT ZLIB
 RDEPEND=virtual/opengl virtual/libudev media-libs/mesa[wayland,gbm,gles2,egl] x11-libs/libdrm x11-libs/pixman x11-libs/libxkbcommon x11-misc/xkeyboard-config dev-libs/libinput dev-libs/wayland X? ( x11-libs/libX11 x11-libs/libxcb[xkb] x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-libs/libXfixes ) xwayland? ( x11-libs/libxcb[xkb] x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-base/xorg-server[wayland] ) systemd? ( sys-apps/systemd sys-apps/dbus )
 SLOT=0
 SRC_URI=https://github.com/Cloudef/wlc/releases/download/v0.0.10/wlc-0.0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=dda545d6f55a198fdb1d57e8ddecaec8
diff --git a/metadata/md5-cache/dev-libs/wlc-0.0.11 b/metadata/md5-cache/dev-libs/wlc-0.0.11
index 9969acba812c..87273eb75fde 100644
--- a/metadata/md5-cache/dev-libs/wlc-0.0.11
+++ b/metadata/md5-cache/dev-libs/wlc-0.0.11
@@ -9,5 +9,5 @@ LICENSE=MIT ZLIB
 RDEPEND=virtual/opengl virtual/libudev media-libs/mesa[wayland,gbm,gles2,egl] x11-libs/libdrm x11-libs/pixman x11-libs/libxkbcommon x11-misc/xkeyboard-config dev-libs/libinput dev-libs/wayland X? ( x11-libs/libX11 x11-libs/libxcb[xkb] x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-libs/libXfixes ) xwayland? ( x11-libs/libxcb[xkb] x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-base/xorg-server[wayland] ) systemd? ( sys-apps/systemd sys-apps/dbus )
 SLOT=0
 SRC_URI=https://github.com/Cloudef/wlc/releases/download/v0.0.11/wlc-0.0.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=379af8e661bf7358f80b7da02f9d54d9
diff --git a/metadata/md5-cache/dev-libs/wlc-9999 b/metadata/md5-cache/dev-libs/wlc-9999
index 0b148dd95ede..ff5b9c253360 100644
--- a/metadata/md5-cache/dev-libs/wlc-9999
+++ b/metadata/md5-cache/dev-libs/wlc-9999
@@ -7,5 +7,5 @@ IUSE=X static-libs systemd +xwayland
 LICENSE=MIT ZLIB
 RDEPEND=virtual/opengl virtual/libudev media-libs/mesa[wayland,gbm,gles2,egl] x11-libs/libdrm x11-libs/pixman x11-libs/libxkbcommon x11-misc/xkeyboard-config dev-libs/libinput dev-libs/wayland X? ( x11-libs/libX11 x11-libs/libxcb[xkb] x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-libs/libXfixes ) xwayland? ( x11-libs/libxcb[xkb] x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-base/xorg-server[wayland] ) systemd? ( sys-apps/systemd sys-apps/dbus )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5a75e031d43d5f184489a2d4c318b7d3
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.4 b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.4
index d6aadc8a3fa7..81dae50739a1 100644
--- a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.4
+++ b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.4
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/xapian:0/30 lua? ( dev-lang/lua:= ) perl? ( dev-lang/perl:= ) p
 REQUIRED_USE=|| ( java lua mono perl php python ruby tcl ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) php? ( || ( php_targets_php5-6 ) )
 SLOT=0
 SRC_URI=http://oligarchy.co.uk/xapian/1.4.4/xapian-bindings-1.4.4.tar.xz
-_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	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	php-ext-source-r2	bba5e9c6aaf088fd15faa2e767506125	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	php-ext-source-r2	bba5e9c6aaf088fd15faa2e767506125	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f37b7bc5b164bd1e88d5d17edc24a149
diff --git a/metadata/md5-cache/dev-libs/xxhash-0.6.5 b/metadata/md5-cache/dev-libs/xxhash-0.6.5
index 677564612d4f..358934148066 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=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_=d41888314525dcbde18b41fbfcad2042
+_md5_=cd45e34c74bcecb085584c6c0a94234b
diff --git a/metadata/md5-cache/dev-libs/yajl-2.1.0 b/metadata/md5-cache/dev-libs/yajl-2.1.0
deleted file mode 100644
index e1c4eddaef2e..000000000000
--- a/metadata/md5-cache/dev-libs/yajl-2.1.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=Small event-driven (SAX-style) JSON parser
-EAPI=5
-HOMEPAGE=https://lloyd.github.com/yajl/
-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 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=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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=dbebaea21a4b917f0435321ace4ecb2c
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 9895167d3164..3deef0dbb3f2 100644
--- a/metadata/md5-cache/dev-libs/yajl-2.1.0-r1
+++ b/metadata/md5-cache/dev-libs/yajl-2.1.0-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Small event-driven (SAX-style) JSON parser
 EAPI=6
 HOMEPAGE=https://lloyd.github.com/yajl/
 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 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=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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=f0fd56ab64accd97c6204434715c67ee
+_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_=20a23737bea3947c24f3d339bc89b528
diff --git a/metadata/md5-cache/dev-lisp/Manifest.gz b/metadata/md5-cache/dev-lisp/Manifest.gz
index 50666440ede7..70aa9ce44a59 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/cl-unicode-0.1.5 b/metadata/md5-cache/dev-lisp/cl-unicode-0.1.5
index f8c4f920a464..8de5a8301c5b 100644
--- a/metadata/md5-cache/dev-lisp/cl-unicode-0.1.5
+++ b/metadata/md5-cache/dev-lisp/cl-unicode-0.1.5
@@ -9,5 +9,5 @@ PDEPEND=virtual/commonlisp
 RDEPEND=dev-lisp/cl-ppcre
 SLOT=0
 SRC_URI=https://github.com/edicl/cl-unicode/archive/v0.1.5.tar.gz -> cl-unicode-0.1.5.tar.gz
-_eclasses_=common-lisp-3	3f23602a5efddf587c5205de7b6de7f8	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=common-lisp-3	3f23602a5efddf587c5205de7b6de7f8	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=24dd4a26e02a9e53256deca583e60d88
diff --git a/metadata/md5-cache/dev-lisp/clisp-2.48-r1 b/metadata/md5-cache/dev-lisp/clisp-2.48-r1
index 87d681b23cd6..8fc46c0e59f5 100644
--- a/metadata/md5-cache/dev-lisp/clisp-2.48-r1
+++ b/metadata/md5-cache/dev-lisp/clisp-2.48-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libiconv >=dev-libs/libsigsegv-2.4 >=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:2.0 ) postgres? ( >=dev-db/postgresql-8.0 ) readline? ( >=sys-libs/readline-5.0 ) pcre? ( dev-libs/libpcre ) svm? ( sci-libs/libsvm ) zlib? ( sys-libs/zlib ) X? ( new-clx? ( x11-libs/libXpm ) ) hyperspec? ( dev-lisp/hyperspec ) berkdb? ( sys-libs/db:4.5 )
 SLOT=2
 SRC_URI=mirror://sourceforge/clisp/clisp-2.48.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=12e2edc2b10bc1f1e391958ccbfd14a2
diff --git a/metadata/md5-cache/dev-lisp/clisp-2.49-r9 b/metadata/md5-cache/dev-lisp/clisp-2.49-r9
index df6d069cd357..0ac079a066f8 100644
--- a/metadata/md5-cache/dev-lisp/clisp-2.49-r9
+++ b/metadata/md5-cache/dev-lisp/clisp-2.49-r9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lisp/asdf-2.33-r3 virtual/libiconv >=dev-libs/libsigsegv-2.4 >=dev-libs/ffcall-1.10 dbus? ( sys-apps/dbus ) fastcgi? ( dev-libs/fcgi ) gdbm? ( sys-libs/gdbm ) gtk? ( >=x11-libs/gtk+-2.10 >=gnome-base/libglade-2.6 ) postgres? ( >=dev-db/postgresql-8.0 ) readline? ( >=sys-libs/readline-5.0 <sys-libs/readline-7.0 ) pcre? ( dev-libs/libpcre ) svm? ( sci-libs/libsvm ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXpm ) hyperspec? ( dev-lisp/hyperspec ) berkdb? ( sys-libs/db:4.8 )
 SLOT=2/2.49
 SRC_URI=mirror://sourceforge/clisp/clisp-2.49.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b15c3b91f1b77c3e7a32133b7e10e728
diff --git a/metadata/md5-cache/dev-lisp/clisp-2.49.90 b/metadata/md5-cache/dev-lisp/clisp-2.49.90
index bc833fdeef9e..a89dca7238a6 100644
--- a/metadata/md5-cache/dev-lisp/clisp-2.49.90
+++ b/metadata/md5-cache/dev-lisp/clisp-2.49.90
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-lisp/clisp-2.49.92 b/metadata/md5-cache/dev-lisp/clisp-2.49.92
index def5e858a78f..6eb09f667124 100644
--- a/metadata/md5-cache/dev-lisp/clisp-2.49.92
+++ b/metadata/md5-cache/dev-lisp/clisp-2.49.92
@@ -9,5 +9,5 @@ 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=mirror://gentoo/clisp-2.49.92.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5fa96a8df1b8fbb6df0d89e7d3b56d65
diff --git a/metadata/md5-cache/dev-lisp/sbcl-1.4.12 b/metadata/md5-cache/dev-lisp/sbcl-1.4.12
new file mode 100644
index 000000000000..f46aa825b9b0
--- /dev/null
+++ b/metadata/md5-cache/dev-lisp/sbcl-1.4.12
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-lisp/asdf-3.1:= doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 ) pax_kernel? ( sys-apps/elfix )
+DESCRIPTION=Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp
+EAPI=6
+HOMEPAGE=http://sbcl.sourceforge.net/
+IUSE=debug doc source +threads +unicode pax_kernel zlib
+KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=MIT
+RDEPEND=>=dev-lisp/asdf-3.1:= !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )
+SLOT=0/1.4.12
+SRC_URI=mirror://sourceforge/sbcl/sbcl-1.4.12-source.tar.bz2 x86? ( mirror://sourceforge/sbcl/sbcl-1.4.3-x86-linux-binary.tar.bz2 ) amd64? ( mirror://sourceforge/sbcl/sbcl-1.4.12-x86-64-linux-binary.tar.bz2 ) ppc? ( mirror://sourceforge/sbcl/sbcl-1.2.7-powerpc-linux-binary.tar.bz2 ) sparc? ( mirror://sourceforge/sbcl/sbcl-1.0.28-sparc-linux-binary.tar.bz2 ) alpha? ( mirror://sourceforge/sbcl/sbcl-1.0.28-alpha-linux-binary.tar.bz2 ) arm? ( mirror://sourceforge/sbcl/sbcl-1.4.11-armhf-linux-binary.tar.bz2 ) arm64? ( mirror://sourceforge/sbcl/sbcl-1.4.2-arm64-linux-binary.tar.bz2 ) x86-macos? ( mirror://sourceforge/sbcl/sbcl-1.1.6-x86-darwin-binary.tar.bz2 ) x64-macos? ( mirror://sourceforge/sbcl/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 ) ppc-macos? ( mirror://sourceforge/sbcl/sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 ) x86-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-solaris-binary.tar.bz2 ) x64-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 ) sparc-solaris? ( mirror://sourceforge/sbcl/sbcl-1.0.23-sparc-solaris-binary.tar.bz2 )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=127875a95d5cce1cb000b07107648e22
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index 8ded6fdf7306..9645eb7abe1f 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/lua-cjson-2.1.0 b/metadata/md5-cache/dev-lua/lua-cjson-2.1.0
index 3b42c7e3bf4c..37e990d6a0d7 100644
--- a/metadata/md5-cache/dev-lua/lua-cjson-2.1.0
+++ b/metadata/md5-cache/dev-lua/lua-cjson-2.1.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/lua-5.1:0
 SLOT=0
 SRC_URI=https://www.kyne.com.au/~mark/software/download/lua-cjson-2.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=81ccf810d140a31b7616c47ae5ffa2b1
diff --git a/metadata/md5-cache/dev-lua/lua-openssl-0.7.3 b/metadata/md5-cache/dev-lua/lua-openssl-0.7.3
new file mode 100644
index 000000000000..f5c396ef93ad
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/lua-openssl-0.7.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install unpack
+DEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( >=dev-lang/lua-5.1:0 ) libressl? ( <dev-libs/libressl-2.7.0:0= ) !libressl? ( dev-libs/openssl:0=[-bindist] ) !dev-lua/luaossl virtual/pkgconfig
+DESCRIPTION=OpenSSL binding for Lua
+EAPI=7
+HOMEPAGE=https://github.com/zhaozg/lua-openssl
+IUSE=libressl luajit
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT openssl PHP-3
+RDEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( >=dev-lang/lua-5.1:0 ) libressl? ( <dev-libs/libressl-2.7.0:0= ) !libressl? ( dev-libs/openssl:0=[-bindist] ) !dev-lua/luaossl
+SLOT=0
+SRC_URI=https://github.com/zhaozg/lua-openssl/archive/0.7.3.tar.gz -> lua-openssl-0.7.3.tar.gz https://github.com/zhaozg/lua-auxiliar/archive/b56f6937096acea34ddf241ec7ea08ac52414d18.tar.gz -> lua-openssl-aux-b56f6937096acea34ddf241ec7ea08ac52414d18.tar.gz https://github.com/keplerproject/lua-compat-5.3/archive/daebe77a2f498817713df37f0bb316db1d82222f.tar.gz -> lua-openssl-compat-daebe77a2f498817713df37f0bb316db1d82222f.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=97df885100a36a18542f9103e4931447
diff --git a/metadata/md5-cache/dev-lua/lua-zlib-0.3 b/metadata/md5-cache/dev-lua/lua-zlib-0.3
index c7f3513408a6..c67adb2596be 100644
--- a/metadata/md5-cache/dev-lua/lua-zlib-0.3
+++ b/metadata/md5-cache/dev-lua/lua-zlib-0.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-lang/lua:0 sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/brimworks/lua-zlib/tarball/v0.3 -> lua-zlib-0.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ebfb8ff07b1d9b22355a0b19784462fd
diff --git a/metadata/md5-cache/dev-lua/lua-zlib-1.1 b/metadata/md5-cache/dev-lua/lua-zlib-1.1
index 3e3471b813bc..eb68182ec1b3 100644
--- a/metadata/md5-cache/dev-lua/lua-zlib-1.1
+++ b/metadata/md5-cache/dev-lua/lua-zlib-1.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-lang/lua:0 sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/brimworks/lua-zlib/archive/v1.1.tar.gz -> lua-zlib-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6dbf37ed3af446b0ffa1299ecc16766b
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 30510e297d79..beb1ca35b3b5 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/llvm-ocaml-4.0.1 b/metadata/md5-cache/dev-ml/llvm-ocaml-4.0.1
index 85f5df847816..74c0111c9f64 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-4.0.1
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-4.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-4.0.1:=
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
 SLOT=0/4.0.1
 SRC_URI=https://releases.llvm.org/4.0.1/llvm-4.0.1.src.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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_=a87913004b08a415b168591759b4383e
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-5.0.2 b/metadata/md5-cache/dev-ml/llvm-ocaml-5.0.2
index 3e62d0d2cb6a..e7dc9e09fb81 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-5.0.2
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-5.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-5.0.2:=
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
 SLOT=0/5.0.2
 SRC_URI=https://releases.llvm.org/5.0.2/llvm-5.0.2.src.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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_=b43a74182fa50885f22cd00b5d3e1fc1
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-6.0.1 b/metadata/md5-cache/dev-ml/llvm-ocaml-6.0.1
index 2de0baee206f..08ef8a546165 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-6.0.1
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-6.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/6.0.1
 SRC_URI=https://releases.llvm.org/6.0.1/llvm-6.0.1.src.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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_=51ff3d0f7375bd578e35a9ef3c01d5e6
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-7.0.0 b/metadata/md5-cache/dev-ml/llvm-ocaml-7.0.0
index b8d1790310ff..df8f42acbc4c 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-7.0.0
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-7.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/7.0.0
 SRC_URI=https://releases.llvm.org/7.0.0/llvm-7.0.0.src.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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_=51ff3d0f7375bd578e35a9ef3c01d5e6
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-7.0.9999 b/metadata/md5-cache/dev-ml/llvm-ocaml-7.0.9999
index 607ac7a7a2f2..d071d97b3ff2 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-7.0.9999
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-7.0.9999
@@ -9,5 +9,5 @@ RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-7.0.999
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
 RESTRICT=!test? ( test )
 SLOT=0/7.0.9999
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	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_=7465a5962553eb8885ac0d107a949154
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-9999 b/metadata/md5-cache/dev-ml/llvm-ocaml-9999
index fc0da13e800c..a3be4b00e5b5 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-9999
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-9999
@@ -9,5 +9,5 @@ RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-9999:=[
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore llvm_targets_AVR llvm_targets_Nios2 llvm_targets_RISCV llvm_targets_WebAssembly )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	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_=48c4d131674844f5c73428cb3bb8afa1
diff --git a/metadata/md5-cache/dev-perl/App-pwhich-1.140.0 b/metadata/md5-cache/dev-perl/App-pwhich-1.140.0
index e47ee275fc24..c065413c67bc 100644
--- a/metadata/md5-cache/dev-perl/App-pwhich-1.140.0
+++ b/metadata/md5-cache/dev-perl/App-pwhich-1.140.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 ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86
 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.14.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=f0327eb131546b82b5e94a828d2f62f3
+_md5_=fb7b5381d767da156de86d3c549ad8d3
diff --git a/metadata/md5-cache/dev-perl/CGI-4.400.0 b/metadata/md5-cache/dev-perl/CGI-4.400.0
index 1bc097fb55b5..16cdad430885 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_=1a6996244c79e6670a70ad62e42c0478
+_md5_=82c1ea8c950db076bf8d3c904a0d4fe5
diff --git a/metadata/md5-cache/dev-perl/CGI-Session-4.480.0-r2 b/metadata/md5-cache/dev-perl/CGI-Session-4.480.0-r2
index bfbe4be8ee9e..1d3287412898 100644
--- a/metadata/md5-cache/dev-perl/CGI-Session-4.480.0-r2
+++ b/metadata/md5-cache/dev-perl/CGI-Session-4.480.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=persistent session data in CGI applications
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/CGI-Session
 IUSE=test
-KEYWORDS=~amd64 ~hppa ~ppc ~x86
+KEYWORDS=~amd64 ~hppa ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Digest-MD5 virtual/perl-Scalar-List-Utils >=dev-perl/CGI-3.26 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKSTOS/CGI-Session-4.48.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=dede70f82c368a541a351bd25d4cbf9e
+_md5_=b45330f00579c10467fddff160e9f8c2
diff --git a/metadata/md5-cache/dev-perl/Cwd-Guard-0.50.0 b/metadata/md5-cache/dev-perl/Cwd-Guard-0.50.0
index 275eed15c2ae..25079087ecd0 100644
--- a/metadata/md5-cache/dev-perl/Cwd-Guard-0.50.0
+++ b/metadata/md5-cache/dev-perl/Cwd-Guard-0.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Temporary changing working directory (chdir)
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Cwd-Guard
 IUSE=test minimal
-KEYWORDS=amd64 hppa ~ppc ~x86
+KEYWORDS=amd64 hppa ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec virtual/perl-Exporter virtual/perl-if virtual/perl-parent dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KAZEBURO/Cwd-Guard-0.05.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=efdc3041682868ab585806f85ccd9979
+_md5_=5050a200462c07a6a250f1770dad87d6
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 49b4c95a1542..37bf5b7efa16 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_=fba088bc22e2452f4c19ecae8eabff38
+_md5_=2c5f83e6a9eeaedb0fc59aceedf5a1d7
diff --git a/metadata/md5-cache/dev-perl/DateTime-1.280.0 b/metadata/md5-cache/dev-perl/DateTime-1.280.0
index 29e731a80511..ce1825e92636 100644
--- a/metadata/md5-cache/dev-perl/DateTime-1.280.0
+++ b/metadata/md5-cache/dev-perl/DateTime-1.280.0
@@ -4,10 +4,10 @@ DESCRIPTION=A date and time object
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/DateTime
 IUSE=test
-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 ~x86-solaris
+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 ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-Carp >=dev-perl/DateTime-Locale-0.410.0 >=dev-perl/DateTime-TimeZone-1.740.0 >=dev-perl/Params-Validate-1.30.0 virtual/perl-Scalar-List-Utils dev-perl/Try-Tiny virtual/perl-XSLoader dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.28.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=a307b056a7ff910ccf2f87ee3b93703c
+_md5_=1a0b627082ff61bc57afae94f7c6e473
diff --git a/metadata/md5-cache/dev-perl/DateTime-Locale-1.30.0 b/metadata/md5-cache/dev-perl/DateTime-Locale-1.30.0
index 361e21252bcb..13801f7ea29d 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Locale-1.30.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Locale-1.30.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 ~x86-solaris
 LICENSE=|| ( Artistic GPL-2+ ) unicode
 RDEPEND=virtual/perl-Carp >=dev-perl/Dist-CheckConflicts-0.20.0 virtual/perl-Exporter dev-perl/List-MoreUtils dev-perl/Params-Validate dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Locale-1.03.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=0a35685c3bc13efbff000723f49c02c2
+_md5_=ea106d9849a0d0e0d309f2d4f41cf657
diff --git a/metadata/md5-cache/dev-perl/DateTime-TimeZone-2.10.0 b/metadata/md5-cache/dev-perl/DateTime-TimeZone-2.10.0
index 4d832981d653..ad10064b44f4 100644
--- a/metadata/md5-cache/dev-perl/DateTime-TimeZone-2.10.0
+++ b/metadata/md5-cache/dev-perl/DateTime-TimeZone-2.10.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=~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 ~x86-solaris
+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 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-Singleton-1.30.0 virtual/perl-File-Spec >=virtual/perl-Scalar-List-Utils-1.330.0 dev-perl/Module-Runtime >=dev-perl/Params-Validate-0.720.0 dev-perl/Try-Tiny virtual/perl-parent dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-2.01.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=91a4b9517ff754f4a122d6e38b5d888b
+_md5_=c89dd0deb68e399f2f2e17be743528b9
diff --git a/metadata/md5-cache/dev-perl/Devel-CheckCompiler-0.70.0 b/metadata/md5-cache/dev-perl/Devel-CheckCompiler-0.70.0
index 623cdda9eb84..469c8a85c741 100644
--- a/metadata/md5-cache/dev-perl/Devel-CheckCompiler-0.70.0
+++ b/metadata/md5-cache/dev-perl/Devel-CheckCompiler-0.70.0
@@ -4,10 +4,10 @@ DESCRIPTION=Check the compiler's availability
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Devel-CheckCompiler
 IUSE=test
-KEYWORDS=amd64 hppa ~ppc ~x86
+KEYWORDS=amd64 hppa ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter virtual/perl-ExtUtils-CBuilder virtual/perl-File-Temp virtual/perl-parent dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SY/SYOHEX/Devel-CheckCompiler-0.07.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=4f1ed4603b1eb77a5719b6c43efd4474
+_md5_=1befb2b8af5560d004c21dc6ed93dbec
diff --git a/metadata/md5-cache/dev-perl/Devel-CheckLib-1.110.0 b/metadata/md5-cache/dev-perl/Devel-CheckLib-1.110.0
index 36ef1539b352..e2d0cb871dc1 100644
--- a/metadata/md5-cache/dev-perl/Devel-CheckLib-1.110.0
+++ b/metadata/md5-cache/dev-perl/Devel-CheckLib-1.110.0
@@ -4,10 +4,10 @@ DESCRIPTION=check that a library is available
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Devel-CheckLib
 IUSE=test
-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=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-File-Temp-0.160.0 virtual/perl-Exporter virtual/perl-File-Spec dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MATTN/Devel-CheckLib-1.11.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=7793e26c44ac778f8fb75bc3b0f4677f
+_md5_=7ef095cddfd62632ba5a94c85be304aa
diff --git a/metadata/md5-cache/dev-perl/Email-Address-XS-1.10.0 b/metadata/md5-cache/dev-perl/Email-Address-XS-1.10.0
index f3b5b8aca113..d2d62e16fb15 100644
--- a/metadata/md5-cache/dev-perl/Email-Address-XS-1.10.0
+++ b/metadata/md5-cache/dev-perl/Email-Address-XS-1.10.0
@@ -4,10 +4,10 @@ DESCRIPTION=Parse and format RFC 2822 email addresses and groups
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Email-Address-XS
 IUSE=test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ppc ppc64 x86
 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/P/PA/PALI/Email-Address-XS-1.01.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=a5509aaef8c46910a7c3ff99bbd1eb8e
+_md5_=10be1ce957ff2f9d19e9ea45c327667c
diff --git a/metadata/md5-cache/dev-perl/Error-0.170.250 b/metadata/md5-cache/dev-perl/Error-0.170.250
index 6902c300085b..53683c566822 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_=c76bee678523796d6cdc50f6a3bd3f2c
+_md5_=91241e1e8e012751f2928a9abadeacdb
diff --git a/metadata/md5-cache/dev-perl/Expect-1.350.0 b/metadata/md5-cache/dev-perl/Expect-1.350.0
index 471186b69714..7d0185c7aa94 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_=9a2745570f06aab41900890438b586d2
+_md5_=58b78d4f5c40ae0c85dfaa0078e5a5dc
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 8b59970457e9..fe671254de3f 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 ~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_=b980cda8baf5dbad6b13a3e1addbc603
+_md5_=63bb8b2d68135c7e263fa30b4cc44753
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 e11aa9ef3cfa..393aa5da43c4 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_=1321c336c90c6bf110a0ed8ca92e7e9f
+_md5_=62924508a8f738bb5c1cc092b96067d7
diff --git a/metadata/md5-cache/dev-perl/Festival-Client-Async-0.30.300-r2 b/metadata/md5-cache/dev-perl/Festival-Client-Async-0.30.300-r2
index 1b8cf1b1a66d..7a8e11edc59e 100644
--- a/metadata/md5-cache/dev-perl/Festival-Client-Async-0.30.300-r2
+++ b/metadata/md5-cache/dev-perl/Festival-Client-Async-0.30.300-r2
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=
 DESCRIPTION=Non-blocking interface to a Festival server
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Festival-Client-Async
-KEYWORDS=~amd64 ~ia64 ~sparc ~x86
+KEYWORDS=~amd64 ia64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DJ/DJHD/Festival-Client-Async-0.0303.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=1b2132d9539e3c4b395b2800ee5d7bf7
+_md5_=77740ad92fcf3de438387db6b19b0f63
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 f803087fb801..0f541b0cc3b7 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 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-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_=4740708aa1c540816f0b4f14af426767
+_md5_=b812278789254a648a2158bfd3145311
diff --git a/metadata/md5-cache/dev-perl/File-Copy-Link-0.140.0 b/metadata/md5-cache/dev-perl/File-Copy-Link-0.140.0
index b0e2400ba3ac..699730ec687d 100644
--- a/metadata/md5-cache/dev-perl/File-Copy-Link-0.140.0
+++ b/metadata/md5-cache/dev-perl/File-Copy-Link-0.140.0
@@ -4,10 +4,10 @@ DESCRIPTION=Perl extension for replacing a link by a copy of the linked file
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/File-Copy-Link
 IUSE=test
-KEYWORDS=amd64 hppa ~ppc ~x86
+KEYWORDS=amd64 hppa ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RM/RMBARKER/File-Copy-Link-0.140.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=bcb83b9c81817cc9f31b5adcd4b6cd08
+_md5_=78cc8b05f42de143753e7fc055c3c6ff
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 6c3d0f11cb66..f0a248b2b99e 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_=9d9c5129e48a29c1f89614da3789bd4f
+_md5_=40293645d3057804b9a86cbe0a38dc4a
diff --git a/metadata/md5-cache/dev-perl/File-Share-0.250.0 b/metadata/md5-cache/dev-perl/File-Share-0.250.0
index a5bb88b0ffa9..60c5f69e0b93 100644
--- a/metadata/md5-cache/dev-perl/File-Share-0.250.0
+++ b/metadata/md5-cache/dev-perl/File-Share-0.250.0
@@ -4,10 +4,10 @@ DESCRIPTION=Extend File::ShareDir to local libraries
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/File-Share
 IUSE=test
-KEYWORDS=alpha amd64 ~ia64 ppc sparc x86
+KEYWORDS=alpha amd64 ia64 ppc sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/File-ShareDir-1.30.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IN/INGY/File-Share-0.25.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=9276fc53e800328efe5fa52899c49e80
+_md5_=46c4c466885cc6ab6a46cad60315f2ab
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 a9cfa562004e..8c6be9f5be9e 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 ~sparc-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_=0429a2fa743ee07408bab60ece5b3eaf
+_md5_=ed5c3f860ba9167d17e21ffdb2520fb2
diff --git a/metadata/md5-cache/dev-perl/Glib-Object-Introspection-0.43.0 b/metadata/md5-cache/dev-perl/Glib-Object-Introspection-0.43.0
index d3182f5fa081..8ec2d2e8c5f9 100644
--- a/metadata/md5-cache/dev-perl/Glib-Object-Introspection-0.43.0
+++ b/metadata/md5-cache/dev-perl/Glib-Object-Introspection-0.43.0
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-perl/glib-perl-1.320.0 >=dev-libs/gobject-introspection-1.0 >=dev-libs/libffi-3.0.0 >=dev-libs/glib-2.0.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Glib-Object-Introspection-0.043.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fef21147c42ba44d8b0570f8cdacd760
diff --git a/metadata/md5-cache/dev-perl/Hook-LexWrap-0.260.0 b/metadata/md5-cache/dev-perl/Hook-LexWrap-0.260.0
index 783990d4f2aa..9bd116080e13 100644
--- a/metadata/md5-cache/dev-perl/Hook-LexWrap-0.260.0
+++ b/metadata/md5-cache/dev-perl/Hook-LexWrap-0.260.0
@@ -4,10 +4,10 @@ DESCRIPTION=Lexically scoped subroutine wrappers
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Hook-LexWrap
 IUSE=test examples
-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=virtual/perl-Carp dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Hook-LexWrap-0.26.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=e34db66c79a18bd0e774804d029ab8ce
+_md5_=6b96ea6005e00cabdfeeae3ab8c9206f
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 ffab7c06780f..bca9dd4e9fde 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 ~x86-linux
 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_=35cdddb4b60faf7968562e882bcb52a2
+_md5_=383bb7b43c0abaa66db333c1d0fae691
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 34f1f9485661..c00a3c1ace24 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_=0fa0678be78e2eb4619c5ecafbbe0f05
+_md5_=46cb8ae47ad361081ce7b4d31b7a08d1
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 359b2691e61a..df604b6787c5 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 ~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 ~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_=63fc3b5b6c289500920e9fb02b967dd3
+_md5_=1a7f1de2bfee372035c7308fbb366a1f
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 4caf5c4a5dc0..312459ad71a8 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_=ecb0396030af5d6722576cf9f1cfad26
+_md5_=2f14c07ccf5b3e4245dc7b813b071926
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 4194dad97103..161de1fc1d03 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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 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_=e8adc54b308e535d9f932993944d3368
+_md5_=7a986ad389936f79044e37938544a85d
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 fc39b594badc..b9c50c84b333 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 ~amd64-fbsd
 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_=76924a2413f6f714a285e91627ae20a5
+_md5_=451b2bb57b49df6ac5f33e3f5c3ea330
diff --git a/metadata/md5-cache/dev-perl/Linux-Smaps-0.130.0 b/metadata/md5-cache/dev-perl/Linux-Smaps-0.130.0
index 589484765f7b..83f20ba79040 100644
--- a/metadata/md5-cache/dev-perl/Linux-Smaps-0.130.0
+++ b/metadata/md5-cache/dev-perl/Linux-Smaps-0.130.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OP/OPI/Linux-Smaps-0.13.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3309229be486a8c8af31c055dcfba27f
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 86a06b6c7fb8..a6e17aceecb2 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/Mock-Config-0.30.0 b/metadata/md5-cache/dev-perl/Mock-Config-0.30.0
index 6e860a446760..28142a63d12f 100644
--- a/metadata/md5-cache/dev-perl/Mock-Config-0.30.0
+++ b/metadata/md5-cache/dev-perl/Mock-Config-0.30.0
@@ -4,10 +4,10 @@ DESCRIPTION=Temporarily set Config or XSConfig values
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Mock-Config
 IUSE=test
-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=Artistic-2
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/Mock-Config-0.03.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=1425566e577f707032ae48267f15fc54
+_md5_=e84b6e633cf0c3388e4131d402532ebd
diff --git a/metadata/md5-cache/dev-perl/Module-Build-XSUtil-0.180.0 b/metadata/md5-cache/dev-perl/Module-Build-XSUtil-0.180.0
index 86faf53311ab..618c0d19288c 100644
--- a/metadata/md5-cache/dev-perl/Module-Build-XSUtil-0.180.0
+++ b/metadata/md5-cache/dev-perl/Module-Build-XSUtil-0.180.0
@@ -4,10 +4,10 @@ DESCRIPTION=A Module::Build class for building XS modules
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Module-Build-XSUtil
 IUSE=test examples
-KEYWORDS=amd64 hppa ~ppc ~x86
+KEYWORDS=amd64 hppa ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Devel-CheckCompiler virtual/perl-Devel-PPPort virtual/perl-Exporter virtual/perl-ExtUtils-CBuilder virtual/perl-File-Path virtual/perl-XSLoader virtual/perl-parent dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HI/HIDEAKIO/Module-Build-XSUtil-0.18.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=ad2dd0fe05bcd463d1c91e9216d57e8e
+_md5_=7717d838ef2bfb043da2313eba10988a
diff --git a/metadata/md5-cache/dev-perl/Mouse-2.4.10 b/metadata/md5-cache/dev-perl/Mouse-2.4.10
index 09d3f58023c2..cbd61b08bfae 100644
--- a/metadata/md5-cache/dev-perl/Mouse-2.4.10
+++ b/metadata/md5-cache/dev-perl/Mouse-2.4.10
@@ -4,10 +4,10 @@ DESCRIPTION=Moose minus the antlers
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Mouse
 IUSE=test examples
-KEYWORDS=amd64 hppa ~ppc ~x86
+KEYWORDS=amd64 hppa ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Scalar-List-Utils-1.140.0 >=virtual/perl-XSLoader-0.20.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GF/GFUJI/Mouse-v2.4.10.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=00c999c839c121872cc379e19bdc9b06
+_md5_=e63a81d2e3f1d87038f985c792356edc
diff --git a/metadata/md5-cache/dev-perl/MouseX-NativeTraits-1.90.0-r2 b/metadata/md5-cache/dev-perl/MouseX-NativeTraits-1.90.0-r2
index fd96dea81655..1db91922b98d 100644
--- a/metadata/md5-cache/dev-perl/MouseX-NativeTraits-1.90.0-r2
+++ b/metadata/md5-cache/dev-perl/MouseX-NativeTraits-1.90.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Extend your attribute interfaces for Mouse
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/MouseX-NativeTraits
 IUSE=test examples
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Mouse-0.820.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GF/GFUJI/MouseX-NativeTraits-1.09.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=3cd161a2bc99a173e9027e3999058e8d
+_md5_=b7e310ac72e7e1e29a996a631516db7b
diff --git a/metadata/md5-cache/dev-perl/Net-CIDR-Lite-0.210.0-r1 b/metadata/md5-cache/dev-perl/Net-CIDR-Lite-0.210.0-r1
index 80d0ea3a4e5a..ee645a507225 100644
--- a/metadata/md5-cache/dev-perl/Net-CIDR-Lite-0.210.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-CIDR-Lite-0.210.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Perl extension for merging IPv4 or IPv6 CIDR addresses
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Net-CIDR-Lite
 IUSE=test
-KEYWORDS=alpha amd64 arm hppa ~ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DOUGW/Net-CIDR-Lite-0.21.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=dc5385846400911e36e27d36b78d764b
+_md5_=d60b16b16d08890cb882a6df3ab3dd3e
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 10cf1e8e9878..bd502c5c0579 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_=df353d872fd1649dac33029544b96171
+_md5_=54ca965fad9374eca1bcf95533186cc0
diff --git a/metadata/md5-cache/dev-perl/Net-DNS-Resolver-Programmable-0.9.0 b/metadata/md5-cache/dev-perl/Net-DNS-Resolver-Programmable-0.9.0
index e0f8a7438af9..ed254f9c3815 100644
--- a/metadata/md5-cache/dev-perl/Net-DNS-Resolver-Programmable-0.9.0
+++ b/metadata/md5-cache/dev-perl/Net-DNS-Resolver-Programmable-0.9.0
@@ -4,10 +4,10 @@ DESCRIPTION=programmable DNS resolver class for offline emulation of DNS
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Net-DNS-Resolver-Programmable
 IUSE=test
-KEYWORDS=alpha amd64 arm hppa ~ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Net-DNS-0.690.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BIGPRESH/Net-DNS-Resolver-Programmable-0.009.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=f5ba3f5906419b0456e1160931448d28
+_md5_=7d502cb6d22649b4a199bdccb36b4a6a
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 20ef69d90470..72adf8e3a3d9 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 ~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_=5b6121930b8a03faf0d2a72d81d36106
+_md5_=a17d256e5614d320de3f170d6127825d
diff --git a/metadata/md5-cache/dev-perl/Net-Ident-1.240.0-r1 b/metadata/md5-cache/dev-perl/Net-Ident-1.240.0-r1
index 34e17e5d100a..27d08cf9e043 100644
--- a/metadata/md5-cache/dev-perl/Net-Ident-1.240.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-Ident-1.240.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=lookup the username on the remote end of a TCP/IP connection
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Net-Ident
 IUSE=test
-KEYWORDS=amd64 hppa ~ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-Socket dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/Net-Ident-1.24.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=ca36e4c5ee05171363e6fa4d76c6e051
+_md5_=8acd2205b78e9d135ad5b351a9b98f1f
diff --git a/metadata/md5-cache/dev-perl/Net-RawIP-0.250.0-r2 b/metadata/md5-cache/dev-perl/Net-RawIP-0.250.0-r2
index 6572396f5962..cee7a7fde6dd 100644
--- a/metadata/md5-cache/dev-perl/Net-RawIP-0.250.0-r2
+++ b/metadata/md5-cache/dev-perl/Net-RawIP-0.250.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Raw IP packets manipulation Module
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Net-RawIP
 IUSE=examples
-KEYWORDS=alpha amd64 hppa ~ia64 ppc sparc x86
+KEYWORDS=alpha amd64 hppa ia64 ppc sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=net-libs/libpcap dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SAPER/Net-RawIP-0.25.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=f64f25fe7f065df0d35002bb7cfbf5de
+_md5_=dfc981165adfdfb728adda3882e9ba90
diff --git a/metadata/md5-cache/dev-perl/Net-SMTP-SSL-1.40.0 b/metadata/md5-cache/dev-perl/Net-SMTP-SSL-1.40.0
index 423735feb9b5..90dc27cb4a5f 100644
--- a/metadata/md5-cache/dev-perl/Net-SMTP-SSL-1.40.0
+++ b/metadata/md5-cache/dev-perl/Net-SMTP-SSL-1.40.0
@@ -4,10 +4,10 @@ DESCRIPTION=(Deprecated) SSL support for Net::SMTP
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Net-SMTP-SSL
 IUSE=test
-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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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-libnet dev-perl/IO-Socket-SSL dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Net-SMTP-SSL-1.04.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=50786ae8081515dcbee6c4d1b5a00a39
+_md5_=35390b0e05efec80ea4bda0437839d7e
diff --git a/metadata/md5-cache/dev-perl/Net-SNMP-6.0.1-r2 b/metadata/md5-cache/dev-perl/Net-SNMP-6.0.1-r2
index 9a4504aa42a5..5f61a50524c0 100644
--- a/metadata/md5-cache/dev-perl/Net-SNMP-6.0.1-r2
+++ b/metadata/md5-cache/dev-perl/Net-SNMP-6.0.1-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A SNMP Perl Module
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Net-SNMP
 IUSE=examples test minimal
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( >=dev-perl/Crypt-DES-2.30.0 >=dev-perl/Crypt-Rijndael-1.20.0 >=dev-perl/Digest-HMAC-1.0 >=virtual/perl-Digest-MD5-2.110.0 >=dev-perl/Digest-SHA1-1.20.0 >=dev-perl/Socket6-0.230.0 ) virtual/perl-Carp virtual/perl-Exporter virtual/perl-IO virtual/perl-Math-BigInt dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DT/DTOWN/Net-SNMP-v6.0.1.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=8416e6d8d527f78f138106cea4b05d82
+_md5_=25fa9d43d2a963eef1b0749606554c25
diff --git a/metadata/md5-cache/dev-perl/Net-SNPP-1.170.0-r2 b/metadata/md5-cache/dev-perl/Net-SNPP-1.170.0-r2
index a096e18a1eac..b00aac824af0 100644
--- a/metadata/md5-cache/dev-perl/Net-SNPP-1.170.0-r2
+++ b/metadata/md5-cache/dev-perl/Net-SNPP-1.170.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=libnet SNPP component
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Net-SNPP
 IUSE=examples
-KEYWORDS=amd64 ~ia64 ppc sparc x86
+KEYWORDS=amd64 ia64 ppc sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-libnet dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOBEYA/Net-SNPP-1.17.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=269b740289ac86f58512dbfcc5314a4b
+_md5_=f1e5da93bcbd02912b2af28cb80d63b7
diff --git a/metadata/md5-cache/dev-perl/Net-Telnet-Cisco-1.110.0 b/metadata/md5-cache/dev-perl/Net-Telnet-Cisco-1.110.0
index 429d6ac26a51..db012619a31b 100644
--- a/metadata/md5-cache/dev-perl/Net-Telnet-Cisco-1.110.0
+++ b/metadata/md5-cache/dev-perl/Net-Telnet-Cisco-1.110.0
@@ -4,10 +4,10 @@ DESCRIPTION=Automate telnet sessions w/ routers&switches
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Net-Telnet-Cisco
 IUSE=test
-KEYWORDS=alpha amd64 hppa ~ia64 ~mips ~ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 hppa ia64 ~mips ~ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Net-Telnet-3.20.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/V/VI/VINSWORLD/Net-Telnet-Cisco-1.11.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=e193c2af18aa04ddbfe0db91dd4619ac
+_md5_=14012c89d02bda8193f11c4e31c7aaa4
diff --git a/metadata/md5-cache/dev-perl/NetAddr-IP-4.79.0 b/metadata/md5-cache/dev-perl/NetAddr-IP-4.79.0
index 60921003de14..0e0d4f4b28a3 100644
--- a/metadata/md5-cache/dev-perl/NetAddr-IP-4.79.0
+++ b/metadata/md5-cache/dev-perl/NetAddr-IP-4.79.0
@@ -4,10 +4,10 @@ DESCRIPTION=Manipulation and operations on IP addresses
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/NetAddr-IP
 IUSE=ipv6 test
-KEYWORDS=alpha amd64 arm hppa ~ia64 ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd
 LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=ipv6? ( dev-perl/Socket6 ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIKER/NetAddr-IP-4.079.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=d11ac4a3e4dd72ff4c3420ce704cecb3
+_md5_=dd484125df7ee72d2177fbe6cfa6e7b1
diff --git a/metadata/md5-cache/dev-perl/PDF-Create-1.430.0 b/metadata/md5-cache/dev-perl/PDF-Create-1.430.0
index 17d78448f77e..fa95b918e6e5 100644
--- a/metadata/md5-cache/dev-perl/PDF-Create-1.430.0
+++ b/metadata/md5-cache/dev-perl/PDF-Create-1.430.0
@@ -4,10 +4,10 @@ DESCRIPTION=Create PDF documents in Perl
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/PDF-Create
 IUSE=test examples examples
-KEYWORDS=alpha amd64 ~ia64 ppc sparc x86
+KEYWORDS=alpha amd64 ia64 ppc sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper >=dev-perl/File-Share-0.250.0 dev-perl/JSON virtual/perl-Scalar-List-Utils dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MANWAR/PDF-Create-1.43.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=3de2c314f1d8a6af518bf82e6cd6737a
+_md5_=9b72f7349cc71cc7dfc7e2f715baed30
diff --git a/metadata/md5-cache/dev-perl/PPI-1.236.0 b/metadata/md5-cache/dev-perl/PPI-1.236.0
index 01732871c171..9a0bc50ea06d 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_=b5fbea5ca2d259a2a7aa09984b14d70a
+_md5_=e38281c18bc04d655531b2cef2376463
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 0d2fa5256853..5718a7abfac9 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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_=9fab0896065e594d1b239eee89458597
+_md5_=e671e3f2602b7f9df764bdd8b6f3cd59
diff --git a/metadata/md5-cache/dev-perl/Parallel-ForkManager-1.190.0 b/metadata/md5-cache/dev-perl/Parallel-ForkManager-1.190.0
index 955f2d716d1d..e580eb0af891 100644
--- a/metadata/md5-cache/dev-perl/Parallel-ForkManager-1.190.0
+++ b/metadata/md5-cache/dev-perl/Parallel-ForkManager-1.190.0
@@ -4,10 +4,10 @@ DESCRIPTION=A simple parallel processing fork manager
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Parallel-ForkManager
 IUSE=test minimal examples
-KEYWORDS=alpha amd64 ~ia64 ~ppc sparc x86 ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ia64 ~ppc sparc x86 ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-File-Path virtual/perl-File-Temp virtual/perl-Storable dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Y/YA/YANICK/Parallel-ForkManager-1.19.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=e8a90bbf0d59682df7c5975ec40f9216
+_md5_=1803e5d2d4b5d74aeec61b275207e44c
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 811894bb79d0..310daea6ad15 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 ~sparc-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_=19041d9850d241dc0aa111db7c6cae66
+_md5_=527acd935a081abd5c6462c3ce61f4c5
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 a7f97c7b160b..8867c06c4796 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 ~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_=e2527957963983bd1f4b766a19a581bf
+_md5_=55b7d539b86633ef36efb0950fce3619
diff --git a/metadata/md5-cache/dev-perl/Parse-Yapp-1.210.0 b/metadata/md5-cache/dev-perl/Parse-Yapp-1.210.0
index 4dcac65866e9..b3998c44e8db 100644
--- a/metadata/md5-cache/dev-perl/Parse-Yapp-1.210.0
+++ b/metadata/md5-cache/dev-perl/Parse-Yapp-1.210.0
@@ -4,10 +4,10 @@ DESCRIPTION=Compiles yacc-like LALR grammars to generate Perl OO parser modules
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Parse-Yapp
 IUSE=examples
-KEYWORDS=alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!=net-fs/samba-4* dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/W/WB/WBRASWELL/Parse-Yapp-1.21.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=6ad1204ca31023fdd1ce5873e25ba2b9
+_md5_=a15294b73ad4d8cdca1838f852dcf6e2
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 57f245069582..3fd48260515f 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 ~x86-macos ~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_=b2b1e1587ea53a11de88ab6d8437965c
+_md5_=64a4c0cf590b65e93fa6c8100cb8db0d
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 27f13c83e27e..6ea9142a457f 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_=ac89e7bc0af714164e866fc3d77248de
+_md5_=edb65571e5c758f54db1b212cbb19363
diff --git a/metadata/md5-cache/dev-perl/PerlIO-eol-0.160.0 b/metadata/md5-cache/dev-perl/PerlIO-eol-0.160.0
index 55b5fdb8fe7a..7c711a6d676b 100644
--- a/metadata/md5-cache/dev-perl/PerlIO-eol-0.160.0
+++ b/metadata/md5-cache/dev-perl/PerlIO-eol-0.160.0
@@ -4,10 +4,10 @@ DESCRIPTION=PerlIO layer for normalizing line endings
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/PerlIO-eol
 IUSE=test
-KEYWORDS=amd64 ~ia64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=amd64 ia64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter virtual/perl-XSLoader dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/PerlIO-eol-0.16.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=34bb959fd449e670ad83a6d69076ce86
+_md5_=240a24153ede73a656720ba2f07be0ce
diff --git a/metadata/md5-cache/dev-perl/PerlIO-gzip-0.200.0 b/metadata/md5-cache/dev-perl/PerlIO-gzip-0.200.0
index 869908114b49..8e84f04ae0f5 100644
--- a/metadata/md5-cache/dev-perl/PerlIO-gzip-0.200.0
+++ b/metadata/md5-cache/dev-perl/PerlIO-gzip-0.200.0
@@ -3,10 +3,10 @@ DEPEND=sys-libs/zlib dev-lang/perl:=
 DESCRIPTION=PerlIO layer to gzip/gunzip
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/PerlIO-gzip
-KEYWORDS=alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=sys-libs/zlib virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NW/NWCLARK/PerlIO-gzip-0.20.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=9bc1680399ba58990d836f9b7016afce
+_md5_=04b4be8a0c0f3ec512acebd51064877a
diff --git a/metadata/md5-cache/dev-perl/PlRPC-0.202.0-r3 b/metadata/md5-cache/dev-perl/PlRPC-0.202.0-r3
index f3dd0cb8eafb..b159df3a4107 100644
--- a/metadata/md5-cache/dev-perl/PlRPC-0.202.0-r3
+++ b/metadata/md5-cache/dev-perl/PlRPC-0.202.0-r3
@@ -3,10 +3,10 @@ DEPEND=>=virtual/perl-Storable-1.0.7 >=dev-perl/Net-Daemon-0.34 dev-lang/perl:=
 DESCRIPTION=The Perl RPC Module
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/PlRPC
-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=>=virtual/perl-Storable-1.0.7 >=dev-perl/Net-Daemon-0.34 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MN/MNOONING/PlRPC/PlRPC-0.2020.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=183b2aa6de5048f435b81df4cdea4f99
+_md5_=1be86a64fb36365dde28152e24d5749f
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 cca7e07c9c12..489bd93f74c7 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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 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_=ca9cba4c0f0732d04ccd9250ca148923
+_md5_=531c0ef238e4f5f89e18e57512c53085
diff --git a/metadata/md5-cache/dev-perl/Readonly-2.50.0 b/metadata/md5-cache/dev-perl/Readonly-2.50.0
index 811893987a67..a6740d80bdfc 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 ~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_=07e7955fa40d3178f010b5130b5361b3
+_md5_=6e44f8112d2d25f7c9c418aae33e5153
diff --git a/metadata/md5-cache/dev-perl/Return-Value-1.666.5 b/metadata/md5-cache/dev-perl/Return-Value-1.666.5
index afd46f0d2ca6..8d86807e4721 100644
--- a/metadata/md5-cache/dev-perl/Return-Value-1.666.5
+++ b/metadata/md5-cache/dev-perl/Return-Value-1.666.5
@@ -4,10 +4,10 @@ DESCRIPTION=Polymorphic Return Values
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Return-Value
 IUSE=test
-KEYWORDS=amd64 ~mips ppc ppc64 ~x86
+KEYWORDS=amd64 ~mips ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-Exporter-5.570.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Return-Value-1.666005.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=a1239fab1d117a8e00a2e3cd7f8f84fe
+_md5_=15d365b0f3df184906112c86c76b395c
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 0e36709054f1..98921b10b2e6 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 ~x86-fbsd ~ppc-macos ~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_=36c0e4a62d841181354822dd64412374
+_md5_=32560bb26f0c2612880d60b8a0a44a52
diff --git a/metadata/md5-cache/dev-perl/Search-Xapian-1.2.23.0 b/metadata/md5-cache/dev-perl/Search-Xapian-1.2.23.0
deleted file mode 100644
index 9ef240afaa85..000000000000
--- a/metadata/md5-cache/dev-perl/Search-Xapian-1.2.23.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/xapian:0/1.2.22 !dev-libs/xapian-bindings[perl] dev-perl/Module-Build dev-lang/perl:=[-build(-)]
-DESCRIPTION=Perl XS frontend to the Xapian C++ search library
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Search-Xapian
-IUSE=examples
-KEYWORDS=alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=dev-libs/xapian:0/1.2.22 !dev-libs/xapian-bindings[perl] dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/O/OL/OLLY/Search-Xapian-1.2.23.0.tar.gz http://oligarchy.co.uk/xapian/1.2.23/Search-Xapian-1.2.23.0.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	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=aa6c86ccd382589b2f806a3fd84cb12f
diff --git a/metadata/md5-cache/dev-perl/Search-Xapian-1.2.23.0-r1 b/metadata/md5-cache/dev-perl/Search-Xapian-1.2.23.0-r1
deleted file mode 100644
index c0c36e7ee68f..000000000000
--- a/metadata/md5-cache/dev-perl/Search-Xapian-1.2.23.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/xapian:0/1.2.22 !dev-libs/xapian-bindings[perl] virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/Devel-Leak ) dev-lang/perl:=
-DESCRIPTION=Perl XS frontend to the Xapian C++ search library
-EAPI=6
-HOMEPAGE=http://metacpan.org/release/Search-Xapian
-IUSE=examples test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=dev-libs/xapian:0/1.2.22 !dev-libs/xapian-bindings[perl] dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/O/OL/OLLY/Search-Xapian-1.2.23.0.tar.gz http://oligarchy.co.uk/xapian/1.2.23/Search-Xapian-1.2.23.0.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=64ad0939006daae7f379e216bdd04156
diff --git a/metadata/md5-cache/dev-perl/Search-Xapian-1.2.25.1 b/metadata/md5-cache/dev-perl/Search-Xapian-1.2.25.1
deleted file mode 100644
index 959af3869388..000000000000
--- a/metadata/md5-cache/dev-perl/Search-Xapian-1.2.25.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/xapian:0/1.2.22 !dev-libs/xapian-bindings[perl] virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/Devel-Leak ) dev-lang/perl:=
-DESCRIPTION=Perl XS frontend to the Xapian C++ search library
-EAPI=6
-HOMEPAGE=http://metacpan.org/release/Search-Xapian
-IUSE=examples test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=dev-libs/xapian:0/1.2.22 !dev-libs/xapian-bindings[perl] dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/O/OL/OLLY/Search-Xapian-1.2.25.1.tar.gz http://oligarchy.co.uk/xapian/1.2.25/Search-Xapian-1.2.25.1.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ba45b9cbe5438211053b685e9a0b5f4a
diff --git a/metadata/md5-cache/dev-perl/Search-Xapian-1.2.25.2 b/metadata/md5-cache/dev-perl/Search-Xapian-1.2.25.2
new file mode 100644
index 000000000000..18a69bfc749e
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Search-Xapian-1.2.25.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/xapian:0/1.2.22 !dev-libs/xapian-bindings[perl] virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/Devel-Leak ) dev-lang/perl:=
+DESCRIPTION=Perl XS frontend to the Xapian C++ search library
+EAPI=6
+HOMEPAGE=http://metacpan.org/release/Search-Xapian
+IUSE=examples test
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
+RDEPEND=dev-libs/xapian:0/1.2.22 !dev-libs/xapian-bindings[perl] dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/O/OL/OLLY/Search-Xapian-1.2.25.2.tar.gz http://oligarchy.co.uk/xapian/1.2.25/Search-Xapian-1.2.25.2.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=ba45b9cbe5438211053b685e9a0b5f4a
diff --git a/metadata/md5-cache/dev-perl/Sys-Virt-3.9.1 b/metadata/md5-cache/dev-perl/Sys-Virt-3.9.1
index a72bf6e88fda..4fb6cc1c23a4 100644
--- a/metadata/md5-cache/dev-perl/Sys-Virt-3.9.1
+++ b/metadata/md5-cache/dev-perl/Sys-Virt-3.9.1
@@ -4,10 +4,10 @@ DESCRIPTION=API for using the libvirt library from Perl
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Sys-Virt
 IUSE=test examples
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=app-emulation/libvirt-3.9.1 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANBERR/Sys-Virt-3.9.1.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=b769f22fc9167e45f4e0ecb377570583
+_md5_=cf47aa4ca9f9b1a129ee1714d701d76a
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 af247d19c334..83f3b4a7109c 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_=b2cb4c00f201d7d8417e0b09c4587e52
+_md5_=803d3525ea76c1d0f8fead9d218821b8
diff --git a/metadata/md5-cache/dev-perl/TermReadKey-2.370.0 b/metadata/md5-cache/dev-perl/TermReadKey-2.370.0
index e8c510ff9acb..3e34ffcf9ca5 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_=7502c7022d5a6f26868368c1e181437e
+_md5_=bf283624b94d5df347865cef821343bc
diff --git a/metadata/md5-cache/dev-perl/Test-CleanNamespaces-0.220.0 b/metadata/md5-cache/dev-perl/Test-CleanNamespaces-0.220.0
index d96289cb1064..d54c7eedc053 100644
--- a/metadata/md5-cache/dev-perl/Test-CleanNamespaces-0.220.0
+++ b/metadata/md5-cache/dev-perl/Test-CleanNamespaces-0.220.0
@@ -4,10 +4,10 @@ DESCRIPTION=Check for uncleaned imports
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Test-CleanNamespaces
 IUSE=test minimal
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~hppa ppc ppc64 ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/Package-Stash-XS ) >=virtual/perl-Exporter-5.570.0 virtual/perl-File-Spec dev-perl/Module-Runtime >=dev-perl/Package-Stash-0.140.0 dev-perl/Sub-Identify virtual/perl-Test-Simple dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Test-CleanNamespaces-0.22.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=1b8037afda50b749725878e01233d1d6
+_md5_=9d1146ba7128b13dd48bf840087e7f82
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 80cedb8b9a96..ee56819b8cd1 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_=9a21ff86f05bf4b0e9bc29acd5e332f7
+_md5_=cec2bf04819391b2c65fd2047d334986
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 644230b38f59..c745cd35af56 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_=e72dd976661bc7aca7dbf3eb614d0b4c
+_md5_=acf6750b742cb0924b4d771735bfe3fe
diff --git a/metadata/md5-cache/dev-perl/Test-Script-1.180.0 b/metadata/md5-cache/dev-perl/Test-Script-1.180.0
index 3ca916528fc5..c0fed9f4b005 100644
--- a/metadata/md5-cache/dev-perl/Test-Script-1.180.0
+++ b/metadata/md5-cache/dev-perl/Test-Script-1.180.0
@@ -3,10 +3,10 @@ DEPEND=>=virtual/perl-File-Spec-0.800.0 >=dev-perl/Probe-Perl-0.10.0 >=dev-perl/
 DESCRIPTION=Cross-platform basic tests for scripts
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Test-Script
-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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-File-Spec-0.800.0 >=dev-perl/Probe-Perl-0.10.0 >=dev-perl/IPC-Run3-0.34.0 >=virtual/perl-Test-Simple-0.960.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/Test-Script-1.18.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=e308dd3bba44a4690a25d68b5f99e65e
+_md5_=0e8c774b96a22e14b317eadb9ee6a037
diff --git a/metadata/md5-cache/dev-perl/Test-SubCalls-1.100.0 b/metadata/md5-cache/dev-perl/Test-SubCalls-1.100.0
index dcc48753dc29..5bca83ab2a1b 100644
--- a/metadata/md5-cache/dev-perl/Test-SubCalls-1.100.0
+++ b/metadata/md5-cache/dev-perl/Test-SubCalls-1.100.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-Exporter >=virtual/perl-File-Spec-0.800.0 >=dev-perl/Hook-Le
 DESCRIPTION=Track the number of times subs are called
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Test-SubCalls
-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=virtual/perl-Exporter >=virtual/perl-File-Spec-0.800.0 >=dev-perl/Hook-LexWrap-0.200.0 >=virtual/perl-Test-Simple-0.420.0 virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Test-SubCalls-1.10.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=cf104d65aee0e9c2ce59a7c4d95fa1e2
+_md5_=aeaca98164cc0e9a551c131a744aa934
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 8395a70f5e5e..721843decda1 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_=081569f6c26167963f0ce7abcbeb305d
+_md5_=8837c239409c919ccbd85a8ff043e0ff
diff --git a/metadata/md5-cache/dev-perl/Text-BibTeX-0.850.0 b/metadata/md5-cache/dev-perl/Text-BibTeX-0.850.0
index 4739c368dcea..ec631ff2a085 100644
--- a/metadata/md5-cache/dev-perl/Text-BibTeX-0.850.0
+++ b/metadata/md5-cache/dev-perl/Text-BibTeX-0.850.0
@@ -4,10 +4,10 @@ DESCRIPTION=A Perl library for reading, parsing, and processing BibTeX files
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Text-BibTeX
 IUSE=test examples
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!dev-libs/btparse virtual/perl-Encode virtual/perl-Scalar-List-Utils virtual/perl-Unicode-Normalize dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AM/AMBS/Text-BibTeX-0.85.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=a333a7bdcbd71a2a5aab5d15ed78a6f4
+_md5_=381aae1cbf2dd3d43c9b08e540e060ff
diff --git a/metadata/md5-cache/dev-perl/Tk-JPEG-Lite-2.15.0 b/metadata/md5-cache/dev-perl/Tk-JPEG-Lite-2.15.0
index d8ac9e985edd..f6085918bd00 100644
--- a/metadata/md5-cache/dev-perl/Tk-JPEG-Lite-2.15.0
+++ b/metadata/md5-cache/dev-perl/Tk-JPEG-Lite-2.15.0
@@ -4,10 +4,10 @@ DESCRIPTION=lite JPEG loader for Tk::Photo
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Tk-JPEG-Lite
 IUSE=test
-KEYWORDS=~amd64 ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ia64 ~ppc sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/jpeg:0 >=dev-perl/Tk-800.15.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SR/SREZIC/Tk-JPEG-Lite-2.015.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=21b20f3ce51ef22b80b771e6f25d095b
+_md5_=62982f1a1c0fffa5b89cf47cd2b3e3a2
diff --git a/metadata/md5-cache/dev-perl/URI-1.730.0 b/metadata/md5-cache/dev-perl/URI-1.730.0
index 4e861e006a93..65f02c7cd62f 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 ~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 ~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_=4a1b26cae591de1f4bf92c1640195741
+_md5_=b44111f19d12733d02772ae98e9c78fd
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 d2e7a202d5cc..deddb67c2668 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_=123e87e4213a8fab8e5ebaae66d03d32
+_md5_=fd729e5af67918d043c4a82403445175
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 52d7553a9398..2019be3242e6 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_=71dc00b93033c9c8eb713f5eede540cf
+_md5_=50597ac333d7fd99b29d95046b165c98
diff --git a/metadata/md5-cache/dev-perl/Variable-Magic-0.610.0 b/metadata/md5-cache/dev-perl/Variable-Magic-0.610.0
deleted file mode 100644
index d5c37d156ce2..000000000000
--- a/metadata/md5-cache/dev-perl/Variable-Magic-0.610.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-XSLoader virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl:=
-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 ppc ppc64 ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-macos
-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.61.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=52c4486b00f5babe5206080b9b5f2ab7
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 f4800432c41d..bcbee7e52b01 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 ~x64-macos
 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_=dd479071c297ba438883fb084181086c
+_md5_=cfce93a1d69cb36f459344509e5959de
diff --git a/metadata/md5-cache/dev-perl/X11-XCB-0.170.0-r1 b/metadata/md5-cache/dev-perl/X11-XCB-0.170.0-r1
index 68a54fae28f8..6ab391c606c8 100644
--- a/metadata/md5-cache/dev-perl/X11-XCB-0.170.0-r1
+++ b/metadata/md5-cache/dev-perl/X11-XCB-0.170.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Perl bindings for libxcb
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/X11-XCB
 IUSE=test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Data-Dump dev-perl/Mouse dev-perl/MouseX-NativeTraits dev-perl/Try-Tiny dev-perl/XML-Descent dev-perl/XML-Simple >=virtual/perl-XSLoader-0.20.0 >=x11-libs/libxcb-1.2 x11-libs/xcb-util x11-libs/xcb-util-wm dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSTPLBG/X11-XCB-0.17.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=67524b44a95bd96441b8ac1932db1996
+_md5_=79319099f6d6b80ab1140d5b33da2425
diff --git a/metadata/md5-cache/dev-perl/XML-Descent-1.40.0 b/metadata/md5-cache/dev-perl/XML-Descent-1.40.0
index 37224512c319..9f34d14bdc3b 100644
--- a/metadata/md5-cache/dev-perl/XML-Descent-1.40.0
+++ b/metadata/md5-cache/dev-perl/XML-Descent-1.40.0
@@ -4,10 +4,10 @@ DESCRIPTION=Recursive decent XML parsing
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/XML-Descent
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/XML-TokeParser dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AN/ANDYA/XML-Descent-1.04.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=e9b4b8d02d44cb52ed5b79862cf55f49
+_md5_=4587c5e080c29972a493015e42b69f6d
diff --git a/metadata/md5-cache/dev-perl/XML-TokeParser-0.50.0 b/metadata/md5-cache/dev-perl/XML-TokeParser-0.50.0
index cf9d6dd1de0d..c78f501b3f2c 100644
--- a/metadata/md5-cache/dev-perl/XML-TokeParser-0.50.0
+++ b/metadata/md5-cache/dev-perl/XML-TokeParser-0.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Simplified interface to XML::Parser
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/XML-TokeParser
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-Parser-2.0.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PO/PODMASTER/XML-TokeParser-0.05.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=cfcf4c3452d0baad2be4a43f3e38babd
+_md5_=fd301b978577d34e4645f52ec7c48447
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 e5fb8ba5fab9..13c2e1be3b5c 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 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_=dca127248550d339c766752ca8beb109
+_md5_=ea305668a44b6416480c27525622fb49
diff --git a/metadata/md5-cache/dev-perl/XS-Object-Magic-0.40.0-r3 b/metadata/md5-cache/dev-perl/XS-Object-Magic-0.40.0-r3
index 83a9b2fcb4b2..a5c1628628fb 100644
--- a/metadata/md5-cache/dev-perl/XS-Object-Magic-0.40.0-r3
+++ b/metadata/md5-cache/dev-perl/XS-Object-Magic-0.40.0-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Opaque, extensible XS pointer backed objects using sv_magic
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/XS-Object-Magic
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-parent dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FL/FLORA/XS-Object-Magic-0.04.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=01de6afa46b2d31b547d40113f72988a
+_md5_=179b1313850837fb520d0debf438f3fe
diff --git a/metadata/md5-cache/dev-perl/gnome2-perl-1.46.0 b/metadata/md5-cache/dev-perl/gnome2-perl-1.46.0
index 6ed59c4a1243..06ef5cc5c540 100644
--- a/metadata/md5-cache/dev-perl/gnome2-perl-1.46.0
+++ b/metadata/md5-cache/dev-perl/gnome2-perl-1.46.0
@@ -3,10 +3,10 @@ DEPEND=x11-libs/gtk+:2 dev-perl/Gtk2 gnome-base/libgnomeui gnome-base/libbonobou
 DESCRIPTION=Perl interface to the 2.x series of the Gnome libraries
 EAPI=6
 HOMEPAGE=http://gtk2-perl.sourceforge.net/ http://metacpan.org/release/Gnome2
-KEYWORDS=alpha amd64 ~ppc x86
+KEYWORDS=alpha amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=x11-libs/gtk+:2 dev-perl/Gtk2 gnome-base/libgnomeui gnome-base/libbonoboui dev-perl/gnome2-canvas >=dev-perl/glib-perl-1.40.0 dev-perl/gnome2-vfs-perl dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Gnome2-1.046.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=fbe6cf8cdc55ea606f7d28f8b5a8b422
+_md5_=9ca3a82ba73e9afcde503f5f0c8db452
diff --git a/metadata/md5-cache/dev-perl/gnome2-vfs-perl-1.81.0-r1 b/metadata/md5-cache/dev-perl/gnome2-vfs-perl-1.81.0-r1
index 1ee9d0ec5fff..c8685926d2ea 100644
--- a/metadata/md5-cache/dev-perl/gnome2-vfs-perl-1.81.0-r1
+++ b/metadata/md5-cache/dev-perl/gnome2-vfs-perl-1.81.0-r1
@@ -3,10 +3,10 @@ DEPEND=>=gnome-base/gnome-vfs-2 >=dev-perl/glib-perl-1.120 >=dev-perl/ExtUtils-D
 DESCRIPTION=Perl interface to the 2.x series of the Gnome Virtual File System libraries
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Gnome2-VFS
-KEYWORDS=alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=alpha amd64 x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=gnome-base/gnome-vfs-2 >=dev-perl/glib-perl-1.120 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TS/TSCH/Gnome2-VFS-1.081.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_=813348ba3ddf403c54f867c26a72f12c
+_md5_=35975f1c9aada0e1807b098e043a6eeb
diff --git a/metadata/md5-cache/dev-perl/gnome2-vfs-perl-1.83.0 b/metadata/md5-cache/dev-perl/gnome2-vfs-perl-1.83.0
index 05d7ab8f97d4..8594fd55fc99 100644
--- a/metadata/md5-cache/dev-perl/gnome2-vfs-perl-1.83.0
+++ b/metadata/md5-cache/dev-perl/gnome2-vfs-perl-1.83.0
@@ -3,10 +3,10 @@ DEPEND=>=gnome-base/gnome-vfs-2 >=dev-perl/glib-perl-1.120 >=dev-perl/ExtUtils-D
 DESCRIPTION=Perl interface to the 2.x series of the Gnome Virtual File System libraries
 EAPI=6
 HOMEPAGE=http://metacpan.org/release/Gnome2-VFS
-KEYWORDS=alpha amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=alpha amd64 x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=gnome-base/gnome-vfs-2 >=dev-perl/glib-perl-1.120 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Gnome2-VFS-1.083.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a
-_md5_=7e468ec405cc0804cbcc3b222402cb0f
+_md5_=73d64c2e02b0242bb3c388bccb5a5f82
diff --git a/metadata/md5-cache/dev-perl/gnome2-wnck-0.160.0-r1 b/metadata/md5-cache/dev-perl/gnome2-wnck-0.160.0-r1
index 74cccdfb2a1f..d35d53213868 100644
--- a/metadata/md5-cache/dev-perl/gnome2-wnck-0.160.0-r1
+++ b/metadata/md5-cache/dev-perl/gnome2-wnck-0.160.0-r1
@@ -3,10 +3,10 @@ DEPEND=>=dev-perl/glib-perl-1.180.0 >=dev-perl/Gtk2-1.42.0 >=x11-libs/libwnck-2.
 DESCRIPTION=Perl interface to the Window Navigator Construction Kit
 EAPI=5
 HOMEPAGE=http://gtk2-perl.sourceforge.net/ https://metacpan.org/release/Gnome2-Wnck
-KEYWORDS=amd64 ppc x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-perl/glib-perl-1.180.0 >=dev-perl/Gtk2-1.42.0 >=x11-libs/libwnck-2.20:1 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TS/TSCH/Gnome2-Wnck-0.16.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_=3026c3a0cd8a98a5c3ad03625ce9d91c
+_md5_=553962e92f05ca879cc9f3dce39120c1
diff --git a/metadata/md5-cache/dev-perl/gnome2-wnck-0.160.0-r2 b/metadata/md5-cache/dev-perl/gnome2-wnck-0.160.0-r2
index 7c22ac72e01e..c4ad7dd3bdec 100644
--- a/metadata/md5-cache/dev-perl/gnome2-wnck-0.160.0-r2
+++ b/metadata/md5-cache/dev-perl/gnome2-wnck-0.160.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Perl interface to the Window Navigator Construction Kit
 EAPI=6
 HOMEPAGE=http://gtk2-perl.sourceforge.net/ http://metacpan.org/release/Gnome2-Wnck
 IUSE=test
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-perl/glib-perl-1.180.0 >=dev-perl/Gtk2-1.42.0 >=x11-libs/libwnck-2.20:1 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TS/TSCH/Gnome2-Wnck-0.16.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=a5e73a6cba5ca04c6d139cc6c528020c
+_md5_=8bb749e03537a4c2c80da97716c497d1
diff --git a/metadata/md5-cache/dev-perl/gtk2-gladexml-1.7.0-r1 b/metadata/md5-cache/dev-perl/gtk2-gladexml-1.7.0-r1
index ad0344f606f6..eb3481aa3f4b 100644
--- a/metadata/md5-cache/dev-perl/gtk2-gladexml-1.7.0-r1
+++ b/metadata/md5-cache/dev-perl/gtk2-gladexml-1.7.0-r1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/gtk+:2 gnome-base/libglade:2.0 >=dev-perl/glib-perl-1.020 >=dev-
 DESCRIPTION=Create user interfaces directly from Glade XML files
 EAPI=5
 HOMEPAGE=http://gtk2-perl.sf.net/ https://metacpan.org/release/Gtk2-GladeXML
-KEYWORDS=alpha amd64 ppc ppc64 x86
+KEYWORDS=alpha amd64 ppc64 x86
 LICENSE=LGPL-2
 RDEPEND=x11-libs/gtk+:2 gnome-base/libglade:2.0 >=dev-perl/glib-perl-1.020 >=dev-perl/Gtk2-1.012 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TS/TSCH/Gtk2-GladeXML-1.007.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_=efe0a67bd0a0a2c765ee029804ae3e98
+_md5_=c041ea813faf83e82a342d94b917b5d0
diff --git a/metadata/md5-cache/dev-perl/gtk2-gladexml-1.7.0-r2 b/metadata/md5-cache/dev-perl/gtk2-gladexml-1.7.0-r2
index 7d72e7efccf0..2f55c6f34348 100644
--- a/metadata/md5-cache/dev-perl/gtk2-gladexml-1.7.0-r2
+++ b/metadata/md5-cache/dev-perl/gtk2-gladexml-1.7.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Create user interfaces directly from Glade XML files
 EAPI=6
 HOMEPAGE=http://gtk2-perl.sf.net/ http://metacpan.org/release/Gtk2-GladeXML
 IUSE=examples test
-KEYWORDS=alpha amd64 ~ppc ppc64 x86
+KEYWORDS=alpha amd64 ppc64 x86
 LICENSE=LGPL-2
 RDEPEND=x11-libs/gtk+:2 gnome-base/libglade:2.0 >=dev-perl/glib-perl-1.020 >=dev-perl/Gtk2-1.012 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TS/TSCH/Gtk2-GladeXML-1.007.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=ee9fddbf0810d309ae78ed254adfd83f
+_md5_=dadab36d6d6b5616e9107ed716404884
diff --git a/metadata/md5-cache/dev-perl/gtk2-traymanager-0.50.0-r1 b/metadata/md5-cache/dev-perl/gtk2-traymanager-0.50.0-r1
index 781628810f4d..f0dfcd42b68e 100644
--- a/metadata/md5-cache/dev-perl/gtk2-traymanager-0.50.0-r1
+++ b/metadata/md5-cache/dev-perl/gtk2-traymanager-0.50.0-r1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/gtk+:2 >=dev-perl/glib-perl-1.012 >=dev-perl/Gtk2-1.012 dev-perl
 DESCRIPTION=Perl bindings for EggTrayManager
 EAPI=5
 HOMEPAGE=http://gtk2-perl.sf.net/ https://metacpan.org/release/Gtk2-TrayManager
-KEYWORDS=amd64 ia64 ppc x86
+KEYWORDS=amd64 ia64 x86
 LICENSE=LGPL-2
 RDEPEND=x11-libs/gtk+:2 >=dev-perl/glib-perl-1.012 >=dev-perl/Gtk2-1.012 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BO/BORUP/Gtk2-TrayManager-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_=9adc5f95b8cd8a6e1fd34a7513ef6ba1
+_md5_=f65f00fedef465bb844bbbfe39db6114
diff --git a/metadata/md5-cache/dev-perl/gtk2-traymanager-0.50.0-r2 b/metadata/md5-cache/dev-perl/gtk2-traymanager-0.50.0-r2
index a3bde9c08969..e2f0040361d0 100644
--- a/metadata/md5-cache/dev-perl/gtk2-traymanager-0.50.0-r2
+++ b/metadata/md5-cache/dev-perl/gtk2-traymanager-0.50.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Perl bindings for EggTrayManager
 EAPI=6
 HOMEPAGE=http://gtk2-perl.sf.net/ http://metacpan.org/release/Gtk2-TrayManager
 IUSE=examples test
-KEYWORDS=amd64 ia64 ~ppc x86
+KEYWORDS=amd64 ia64 x86
 LICENSE=LGPL-2
 RDEPEND=x11-libs/gtk+:2 >=dev-perl/glib-perl-1.012 >=dev-perl/Gtk2-1.012 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BO/BORUP/Gtk2-TrayManager-0.05.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=704c524818d882282de6beb52a00c335
+_md5_=d888493d50f8011e62203e5c385bef7c
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 60fabfd046d9..dfd5775f5f42 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 ~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_=181f61da0704d3dcf3336291d8a63bf4
+_md5_=7823ae452c7e35e59249806dc13355f1
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index 80d20967daa8..4c6db68c5968 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 aa81d6245853..92747c75c11e 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_=c8e96759ab14a08e9cd893e994dd32d5
+_md5_=fc926512da80177076f6098baca0d1e3
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 669d64f8732f..1213c70bac2a 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_=1e67db36f8d365f8f42097081001fc91
+_md5_=a935b2cfe806184c567216efd5a27b31
diff --git a/metadata/md5-cache/dev-php/pecl-geoip-1.1.1-r3 b/metadata/md5-cache/dev-php/pecl-geoip-1.1.1-r3
deleted file mode 100644
index 7a2f7b49185c..000000000000
--- a/metadata/md5-cache/dev-php/pecl-geoip-1.1.1-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/geoip >=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_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 )
-DESCRIPTION=PHP extension to map IP address to geographic places
-EAPI=6
-HOMEPAGE=https://pecl.php.net/geoip
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
-KEYWORDS=amd64 x86
-LICENSE=PHP-3
-RDEPEND=dev-libs/geoip php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/geoip-1.1.1.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	378dc4ea30db21411f4d1a32d21a6302	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=0f643708aab708e3ddf75a902a29031c
diff --git a/metadata/md5-cache/dev-php/pecl-geoip-1.1.1-r4 b/metadata/md5-cache/dev-php/pecl-geoip-1.1.1-r4
index ae15b05ee347..7c96704030b7 100644
--- a/metadata/md5-cache/dev-php/pecl-geoip-1.1.1-r4
+++ b/metadata/md5-cache/dev-php/pecl-geoip-1.1.1-r4
@@ -4,11 +4,11 @@ DESCRIPTION=PHP extension to map IP address to geographic places
 EAPI=6
 HOMEPAGE=https://pecl.php.net/geoip
 IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=PHP-3
 RDEPEND=dev-libs/geoip 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/geoip-1.1.1.tgz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	378dc4ea30db21411f4d1a32d21a6302	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=bcc4bdd2d0c0891e1462a9cd4426f787
+_md5_=ef9eca6e58e1400950bd72f93e866380
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 ba242827ff23..bfd99367873b 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_=888dcd01209006bd0df368b3918f2b29
+_md5_=359b8dc287bb57679a657c9707ae953c
diff --git a/metadata/md5-cache/dev-php/pecl-ssh2-1.1.1 b/metadata/md5-cache/dev-php/pecl-ssh2-1.1.1
deleted file mode 100644
index cc5696d4fc52..000000000000
--- a/metadata/md5-cache/dev-php/pecl-ssh2-1.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=net-libs/libssh2-1.2[-gcrypt] >=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_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 )
-DESCRIPTION=PHP bindings for the libssh2 library
-EAPI=6
-HOMEPAGE=https://pecl.php.net/ssh2
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
-KEYWORDS=amd64 x86
-LICENSE=PHP-3.01
-RDEPEND=>=net-libs/libssh2-1.2[-gcrypt] php_targets_php5-6? ( dev-php/pecl-ssh2: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 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/ssh2-1.1.1.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	378dc4ea30db21411f4d1a32d21a6302	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=6f983a1ffece80017ea5486c8407db47
diff --git a/metadata/md5-cache/dev-php/pecl-ssh2-1.1.2 b/metadata/md5-cache/dev-php/pecl-ssh2-1.1.2
index 6e161a0c4b1b..116ff095c755 100644
--- a/metadata/md5-cache/dev-php/pecl-ssh2-1.1.2
+++ b/metadata/md5-cache/dev-php/pecl-ssh2-1.1.2
@@ -4,11 +4,11 @@ DESCRIPTION=PHP bindings for the libssh2 library
 EAPI=6
 HOMEPAGE=https://pecl.php.net/ssh2
 IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=PHP-3.01
 RDEPEND=>=net-libs/libssh2-1.2[-gcrypt] php_targets_php5-6? ( dev-php/pecl-ssh2: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 )
 REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
 SLOT=7
 SRC_URI=https://pecl.php.net/get/ssh2-1.1.2.tgz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	378dc4ea30db21411f4d1a32d21a6302	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=c16e310fd56a066f4e814376f541455b
+_md5_=27ffad970e84e7b8bed20512147d39cf
diff --git a/metadata/md5-cache/dev-python/3to2-1.1.1 b/metadata/md5-cache/dev-python/3to2-1.1.1
index d6b7e25f7a79..d20340dc4280 100644
--- a/metadata/md5-cache/dev-python/3to2-1.1.1
+++ b/metadata/md5-cache/dev-python/3to2-1.1.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/3/3to2/3to2-1.1.1.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=49876316779fedf22af114c2cc86e589
diff --git a/metadata/md5-cache/dev-python/3to2-1.1.1-r1 b/metadata/md5-cache/dev-python/3to2-1.1.1-r1
index 3319c4bc07e4..3cd458041756 100644
--- a/metadata/md5-cache/dev-python/3to2-1.1.1-r1
+++ b/metadata/md5-cache/dev-python/3to2-1.1.1-r1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/3/3to2/3to2-1.1.1.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4320f141c5cad0b0254d925d9bdd96d0
diff --git a/metadata/md5-cache/dev-python/APScheduler-3.1.0 b/metadata/md5-cache/dev-python/APScheduler-3.1.0
index e2108040bb80..e7b3f2c76d94 100644
--- a/metadata/md5-cache/dev-python/APScheduler-3.1.0
+++ b/metadata/md5-cache/dev-python/APScheduler-3.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/A/APScheduler/APScheduler-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c1df45bb6674a86e620d75fb21768431
diff --git a/metadata/md5-cache/dev-python/APScheduler-3.2.0 b/metadata/md5-cache/dev-python/APScheduler-3.2.0
index 2ec57c599b96..bf78c21fa7d6 100644
--- a/metadata/md5-cache/dev-python/APScheduler-3.2.0
+++ b/metadata/md5-cache/dev-python/APScheduler-3.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/A/APScheduler/APScheduler-3.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c1df45bb6674a86e620d75fb21768431
diff --git a/metadata/md5-cache/dev-python/APScheduler-3.3.1 b/metadata/md5-cache/dev-python/APScheduler-3.3.1
index bb28cdc64945..6d8816db043a 100644
--- a/metadata/md5-cache/dev-python/APScheduler-3.3.1
+++ b/metadata/md5-cache/dev-python/APScheduler-3.3.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/A/APScheduler/APScheduler-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=12ff3bff2e8f4845332eab80c6587995
diff --git a/metadata/md5-cache/dev-python/Babel-2.5.0 b/metadata/md5-cache/dev-python/Babel-2.5.0
index c92d44a06e75..6e11f743d17d 100644
--- a/metadata/md5-cache/dev-python/Babel-2.5.0
+++ b/metadata/md5-cache/dev-python/Babel-2.5.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pytz[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/B/Babel/Babel-2.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e9baafa7d4cbbc633a771084a8d7e32b
diff --git a/metadata/md5-cache/dev-python/Babel-2.5.3 b/metadata/md5-cache/dev-python/Babel-2.5.3
index f0391839e548..330b6db9b9a5 100644
--- a/metadata/md5-cache/dev-python/Babel-2.5.3
+++ b/metadata/md5-cache/dev-python/Babel-2.5.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pytz[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/B/Babel/Babel-2.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2e3e27acfde551efbdec6cdae9727ee1
diff --git a/metadata/md5-cache/dev-python/Babel-2.5.3-r1 b/metadata/md5-cache/dev-python/Babel-2.5.3-r1
index f750bfc94f0f..5815450191e6 100644
--- a/metadata/md5-cache/dev-python/Babel-2.5.3-r1
+++ b/metadata/md5-cache/dev-python/Babel-2.5.3-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pytz[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/B/Babel/Babel-2.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a1053d6aa48f6e714a077e3e34e7a885
diff --git a/metadata/md5-cache/dev-python/BitVector-3.4.4 b/metadata/md5-cache/dev-python/BitVector-3.4.4
index ffbbcf978fdf..e4ac9e5571b8 100644
--- a/metadata/md5-cache/dev-python/BitVector-3.4.4
+++ b/metadata/md5-cache/dev-python/BitVector-3.4.4
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://engineering.purdue.edu/kak/dist/BitVector-3.4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=adadb614846a2425201831cee5b7032e
diff --git a/metadata/md5-cache/dev-python/BitVector-3.4.6 b/metadata/md5-cache/dev-python/BitVector-3.4.6
index 62cb38055a25..19c0cdbed7ee 100644
--- a/metadata/md5-cache/dev-python/BitVector-3.4.6
+++ b/metadata/md5-cache/dev-python/BitVector-3.4.6
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://engineering.purdue.edu/kak/dist/BitVector-3.4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f726692b47d0211840e2a468fafb651c
diff --git a/metadata/md5-cache/dev-python/BitVector-3.4.7 b/metadata/md5-cache/dev-python/BitVector-3.4.7
index ba5ece902430..6626d0ed35d7 100644
--- a/metadata/md5-cache/dev-python/BitVector-3.4.7
+++ b/metadata/md5-cache/dev-python/BitVector-3.4.7
@@ -10,5 +10,5 @@ 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_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://engineering.purdue.edu/kak/dist/BitVector-3.4.7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7ccd3370cdb594229c0f7f05c1384a32
diff --git a/metadata/md5-cache/dev-python/BitVector-3.4.8 b/metadata/md5-cache/dev-python/BitVector-3.4.8
index 33914ef90406..898b6ef33d91 100644
--- a/metadata/md5-cache/dev-python/BitVector-3.4.8
+++ b/metadata/md5-cache/dev-python/BitVector-3.4.8
@@ -10,5 +10,5 @@ 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_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://engineering.purdue.edu/kak/dist/BitVector-3.4.8.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5f9d5731b91801f2af9bb43b60a637d4
diff --git a/metadata/md5-cache/dev-python/CacheControl-0.11.5 b/metadata/md5-cache/dev-python/CacheControl-0.11.5
index 71befa89dafe..4517ca2f3951 100644
--- a/metadata/md5-cache/dev-python/CacheControl-0.11.5
+++ b/metadata/md5-cache/dev-python/CacheControl-0.11.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/C/CacheControl/CacheControl-0.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6d6592d450ddfa7250fee7c1838f2aeb
diff --git a/metadata/md5-cache/dev-python/CacheControl-0.11.7 b/metadata/md5-cache/dev-python/CacheControl-0.11.7
index 8a54aba89c78..f920dbc15f05 100644
--- a/metadata/md5-cache/dev-python/CacheControl-0.11.7
+++ b/metadata/md5-cache/dev-python/CacheControl-0.11.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/C/CacheControl/CacheControl-0.11.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=7ee57f5aaf76191c0409e8cc39f9932e
diff --git a/metadata/md5-cache/dev-python/CommonMark-0.5.4 b/metadata/md5-cache/dev-python/CommonMark-0.5.4
index 0b850d7fc35a..802848c597f7 100644
--- a/metadata/md5-cache/dev-python/CommonMark-0.5.4
+++ b/metadata/md5-cache/dev-python/CommonMark-0.5.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
index f1ba4d06ea53..e7d392ea30d6 100644
--- a/metadata/md5-cache/dev-python/CommonMark-0.7.3
+++ b/metadata/md5-cache/dev-python/CommonMark-0.7.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/future[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/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	89bb9f083a2590d9b447fd0b78a96186
+_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
index 104c732aeacc..50caa3be0370 100644
--- a/metadata/md5-cache/dev-python/CommonMark-0.7.4
+++ b/metadata/md5-cache/dev-python/CommonMark-0.7.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/future[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/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	89bb9f083a2590d9b447fd0b78a96186
+_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
index c89c3e9b2a30..57c8b50f87f6 100644
--- a/metadata/md5-cache/dev-python/CommonMark-0.7.5
+++ b/metadata/md5-cache/dev-python/CommonMark-0.7.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/future[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 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	89bb9f083a2590d9b447fd0b78a96186
+_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/CoverageTestRunner-1.10 b/metadata/md5-cache/dev-python/CoverageTestRunner-1.10
index 54807225ff57..1d0ba3953e5d 100644
--- a/metadata/md5-cache/dev-python/CoverageTestRunner-1.10
+++ b/metadata/md5-cache/dev-python/CoverageTestRunner-1.10
@@ -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=http://code.liw.fi/debian/pool/main/p/python-coverage-test-runner/python-coverage-test-runner_1.10.orig.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=224f5fc953ccb24c10476d0dd37cdc57
diff --git a/metadata/md5-cache/dev-python/CoverageTestRunner-1.11 b/metadata/md5-cache/dev-python/CoverageTestRunner-1.11
index 78860edbc791..35f63cc48a03 100644
--- a/metadata/md5-cache/dev-python/CoverageTestRunner-1.11
+++ b/metadata/md5-cache/dev-python/CoverageTestRunner-1.11
@@ -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=http://code.liw.fi/debian/pool/main/p/python-coverage-test-runner/python-coverage-test-runner_1.11.orig.tar.xz
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=05b0da64802c5c6daa9a3fca3027fe03
diff --git a/metadata/md5-cache/dev-python/CoverageTestRunner-1.9-r1 b/metadata/md5-cache/dev-python/CoverageTestRunner-1.9-r1
index 83698e61925e..d677604124bd 100644
--- a/metadata/md5-cache/dev-python/CoverageTestRunner-1.9-r1
+++ b/metadata/md5-cache/dev-python/CoverageTestRunner-1.9-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=http://code.liw.fi/debian/pool/main/p/python-coverage-test-runner/python-coverage-test-runner_1.9.orig.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bb7c60bbd29ce1dd65095956a7242728
diff --git a/metadata/md5-cache/dev-python/Flask-KVSession-0.6.1 b/metadata/md5-cache/dev-python/Flask-KVSession-0.6.1
index 3257044a5e53..e81dd38f9b5f 100644
--- a/metadata/md5-cache/dev-python/Flask-KVSession-0.6.1
+++ b/metadata/md5-cache/dev-python/Flask-KVSession-0.6.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/flask-0.8[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-KVSession/Flask-KVSession-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=620fc8f30aaed6b13392f2a2520194f1
diff --git a/metadata/md5-cache/dev-python/Flask-KVSession-0.6.2 b/metadata/md5-cache/dev-python/Flask-KVSession-0.6.2
index 363c56179cc7..2564fe12907c 100644
--- a/metadata/md5-cache/dev-python/Flask-KVSession-0.6.2
+++ b/metadata/md5-cache/dev-python/Flask-KVSession-0.6.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/flask-0.8[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-KVSession/Flask-KVSession-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=62415693881a299ff23430ff90673f90
diff --git a/metadata/md5-cache/dev-python/GridDataFormats-0.4.0 b/metadata/md5-cache/dev-python/GridDataFormats-0.4.0
index 97ea69627bac..204adfc039fd 100644
--- a/metadata/md5-cache/dev-python/GridDataFormats-0.4.0
+++ b/metadata/md5-cache/dev-python/GridDataFormats-0.4.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/numpy-1.0.3[python_targets_python2_7(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/G/GridDataFormats/GridDataFormats-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=caa395be0880ce1c05651081ff468677
diff --git a/metadata/md5-cache/dev-python/HeapDict-1.0.0 b/metadata/md5-cache/dev-python/HeapDict-1.0.0
index 715abd54a1b0..cefcd6c39cc2 100644
--- a/metadata/md5-cache/dev-python/HeapDict-1.0.0
+++ b/metadata/md5-cache/dev-python/HeapDict-1.0.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/H/HeapDict/HeapDict-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f47e364eea38c30562fa0bc239462173
diff --git a/metadata/md5-cache/dev-python/ImageHash-3.4 b/metadata/md5-cache/dev-python/ImageHash-3.4
index 0815bea6a62d..2ae1e4312a4f 100644
--- a/metadata/md5-cache/dev-python/ImageHash-3.4
+++ b/metadata/md5-cache/dev-python/ImageHash-3.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/I/ImageHash/ImageHash-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1b887145bcb88b536f930183f8847036
diff --git a/metadata/md5-cache/dev-python/ImageHash-3.7 b/metadata/md5-cache/dev-python/ImageHash-3.7
index 2a8db732ea3f..c6744f09d686 100644
--- a/metadata/md5-cache/dev-python/ImageHash-3.7
+++ b/metadata/md5-cache/dev-python/ImageHash-3.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/I/ImageHash/ImageHash-3.7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1b887145bcb88b536f930183f8847036
diff --git a/metadata/md5-cache/dev-python/ImageHash-4.0 b/metadata/md5-cache/dev-python/ImageHash-4.0
index 139c667770fc..1892f2187f79 100644
--- a/metadata/md5-cache/dev-python/ImageHash-4.0
+++ b/metadata/md5-cache/dev-python/ImageHash-4.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/I/ImageHash/ImageHash-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0eeb7a3d3c3efec003efc62be63db6f3
diff --git a/metadata/md5-cache/dev-python/Kivy-1.10.0 b/metadata/md5-cache/dev-python/Kivy-1.10.0
index 5e6e71968c30..72ad9f9d9c8d 100644
--- a/metadata/md5-cache/dev-python/Kivy-1.10.0
+++ b/metadata/md5-cache/dev-python/Kivy-1.10.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/kivy/Kivy/archive/1.10.0.tar.gz -> Kivy-1.10.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a17575f08d454a3c78112f677b3f2c04
diff --git a/metadata/md5-cache/dev-python/Kivy-1.10.1 b/metadata/md5-cache/dev-python/Kivy-1.10.1
index 062848901ff1..f75ab2415454 100644
--- a/metadata/md5-cache/dev-python/Kivy-1.10.1
+++ b/metadata/md5-cache/dev-python/Kivy-1.10.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/kivy/Kivy/archive/1.10.1.tar.gz -> Kivy-1.10.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=22f143bec1d805d103f0789582dfd9ed
diff --git a/metadata/md5-cache/dev-python/Kivy-1.9.1 b/metadata/md5-cache/dev-python/Kivy-1.9.1
index 03c0c66790b8..25f67e7a3a7c 100644
--- a/metadata/md5-cache/dev-python/Kivy-1.9.1
+++ b/metadata/md5-cache/dev-python/Kivy-1.9.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://pypi.io/packages/source/K/Kivy/kivy-1.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e5ed7e3217ecbcf9ad05ff08ee07f3c8
diff --git a/metadata/md5-cache/dev-python/Kivy-1.9.1-r1 b/metadata/md5-cache/dev-python/Kivy-1.9.1-r1
index c220d2ed3ae4..30a4dea87eb8 100644
--- a/metadata/md5-cache/dev-python/Kivy-1.9.1-r1
+++ b/metadata/md5-cache/dev-python/Kivy-1.9.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://pypi.io/packages/source/K/Kivy/kivy-1.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b2c0b5adb84de620ab9c889daad6d9a4
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 4a29875421bc..4583b684682b 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/MechanicalSoup-0.6.0 b/metadata/md5-cache/dev-python/MechanicalSoup-0.6.0
index f3cf1066f3f0..e71f41fbc921 100644
--- a/metadata/md5-cache/dev-python/MechanicalSoup-0.6.0
+++ b/metadata/md5-cache/dev-python/MechanicalSoup-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/beautifulsoup-4.0[python_targets_python2_7(-)?,python_targe
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/M/MechanicalSoup/MechanicalSoup-0.6.0.zip
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=12d544ef355e9b8215ca04c2f789d09e
diff --git a/metadata/md5-cache/dev-python/Ming-0.5.4 b/metadata/md5-cache/dev-python/Ming-0.5.4
index 15eb10ad8b05..c21527805830 100644
--- a/metadata/md5-cache/dev-python/Ming-0.5.4
+++ b/metadata/md5-cache/dev-python/Ming-0.5.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/formencode-1.2.1[python_targets_python2_7(-)?,-python_singl
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/M/Ming/Ming-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d6cecc408b9e63d0cb781ac8d1a46f13
diff --git a/metadata/md5-cache/dev-python/Numdifftools-0.9.12 b/metadata/md5-cache/dev-python/Numdifftools-0.9.12
index ad854c885ecd..b49bf593bdf3 100644
--- a/metadata/md5-cache/dev-python/Numdifftools-0.9.12
+++ b/metadata/md5-cache/dev-python/Numdifftools-0.9.12
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/N/Numdifftools/numdifftools-0.9.12.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3f58652da0e56d9d4cc524e1deae2738
diff --git a/metadata/md5-cache/dev-python/Numdifftools-0.9.13 b/metadata/md5-cache/dev-python/Numdifftools-0.9.13
index 025c6f272a97..bbf8850f67d6 100644
--- a/metadata/md5-cache/dev-python/Numdifftools-0.9.13
+++ b/metadata/md5-cache/dev-python/Numdifftools-0.9.13
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/algopy-0.4[python_targets_python2_7(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/N/Numdifftools/numdifftools-0.9.13.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=79069d95a021f1e2e9af4b6e6af004e2
diff --git a/metadata/md5-cache/dev-python/Numdifftools-0.9.14 b/metadata/md5-cache/dev-python/Numdifftools-0.9.14
index 4bc426628798..1be4adefeba0 100644
--- a/metadata/md5-cache/dev-python/Numdifftools-0.9.14
+++ b/metadata/md5-cache/dev-python/Numdifftools-0.9.14
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/algopy-0.4[python_targets_python2_7(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/N/Numdifftools/numdifftools-0.9.14.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=54a5089dffa8d0a84a23146b12487602
diff --git a/metadata/md5-cache/dev-python/Numdifftools-0.9.17 b/metadata/md5-cache/dev-python/Numdifftools-0.9.17
index e77f982aee71..5d9dd907cd46 100644
--- a/metadata/md5-cache/dev-python/Numdifftools-0.9.17
+++ b/metadata/md5-cache/dev-python/Numdifftools-0.9.17
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/algopy-0.4[python_targets_python2_7(-)?,python_targets_pyth
 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/Numdifftools/numdifftools-0.9.17.zip
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bcaabf86e4ac1cdc5db36aa9d9d7d5e8
diff --git a/metadata/md5-cache/dev-python/PyContracts-1.7.9 b/metadata/md5-cache/dev-python/PyContracts-1.7.9
index affd2372d981..096f82a3e925 100644
--- a/metadata/md5-cache/dev-python/PyContracts-1.7.9
+++ b/metadata/md5-cache/dev-python/PyContracts-1.7.9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/P/PyContracts/PyContracts-1.7.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=92a49d5bc6b44ea3275b968bcfffc7a7
diff --git a/metadata/md5-cache/dev-python/PyContracts-1.8.0 b/metadata/md5-cache/dev-python/PyContracts-1.8.0
index 23d0afc98062..7ec15b778584 100644
--- a/metadata/md5-cache/dev-python/PyContracts-1.8.0
+++ b/metadata/md5-cache/dev-python/PyContracts-1.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/P/PyContracts/PyContracts-1.8.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9977097681dc35a6969c418c5b7cdde9
diff --git a/metadata/md5-cache/dev-python/PyDbLite-3.0.4 b/metadata/md5-cache/dev-python/PyDbLite-3.0.4
index 3a13ad3fcdb2..4349ecc52045 100644
--- a/metadata/md5-cache/dev-python/PyDbLite-3.0.4
+++ b/metadata/md5-cache/dev-python/PyDbLite-3.0.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/PyDbLite/PyDbLite-3.0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1f3a5ca72a3273628537029499f3d98e
diff --git a/metadata/md5-cache/dev-python/PyECLib-1.5.0 b/metadata/md5-cache/dev-python/PyECLib-1.5.0
index 042fa83d0a44..9638925f6746 100644
--- a/metadata/md5-cache/dev-python/PyECLib-1.5.0
+++ b/metadata/md5-cache/dev-python/PyECLib-1.5.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/liberasurecode dev-libs/jerasure python_targets_python2_7? ( >=
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyeclib/pyeclib-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e41c6f64291ae178d169eb8bbc18b441
diff --git a/metadata/md5-cache/dev-python/PyGithub-1.39 b/metadata/md5-cache/dev-python/PyGithub-1.39
index 797275dc407e..d5a452962232 100644
--- a/metadata/md5-cache/dev-python/PyGithub-1.39
+++ b/metadata/md5-cache/dev-python/PyGithub-1.39
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyjwt[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/PyGithub/PyGithub/archive/v1.39.tar.gz -> PyGithub-1.39.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=729ab235365f5fe0b8f90a3871d044bd
diff --git a/metadata/md5-cache/dev-python/PyGithub-1.40_alpha4 b/metadata/md5-cache/dev-python/PyGithub-1.40_alpha4
index 268df352f5bd..2e155ea45d83 100644
--- a/metadata/md5-cache/dev-python/PyGithub-1.40_alpha4
+++ b/metadata/md5-cache/dev-python/PyGithub-1.40_alpha4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyjwt[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/PyGithub/PyGithub/archive/v1.40a4.tar.gz -> PyGithub-1.40a4.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9753aed2d1deb6348b75ca740ddda97a
diff --git a/metadata/md5-cache/dev-python/PyPDF2-1.26.0 b/metadata/md5-cache/dev-python/PyPDF2-1.26.0
index 727e2a665409..6ce1b6ce76e3 100644
--- a/metadata/md5-cache/dev-python/PyPDF2-1.26.0
+++ b/metadata/md5-cache/dev-python/PyPDF2-1.26.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyPDF2/PyPDF2-1.26.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3e4d81ae444237971951e03deddc1a75
diff --git a/metadata/md5-cache/dev-python/PyRSS2Gen-1.0.0-r1 b/metadata/md5-cache/dev-python/PyRSS2Gen-1.0.0-r1
index 7c644170a929..36e806abc515 100644
--- a/metadata/md5-cache/dev-python/PyRSS2Gen-1.0.0-r1
+++ b/metadata/md5-cache/dev-python/PyRSS2Gen-1.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.dalkescientific.com/Python/PyRSS2Gen-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=df15635eceb42a016d15d051ff62fd0e
diff --git a/metadata/md5-cache/dev-python/PyRSS2Gen-1.1 b/metadata/md5-cache/dev-python/PyRSS2Gen-1.1
index af1336919aaf..f0a2e3bb1957 100644
--- a/metadata/md5-cache/dev-python/PyRSS2Gen-1.1
+++ b/metadata/md5-cache/dev-python/PyRSS2Gen-1.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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=http://www.dalkescientific.com/Python/PyRSS2Gen-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=906f54ab205e05b59a4ca9ac9927514c
diff --git a/metadata/md5-cache/dev-python/PySDL2-0.9.6 b/metadata/md5-cache/dev-python/PySDL2-0.9.6
index 359304c56c74..547537a33ec7 100644
--- a/metadata/md5-cache/dev-python/PySDL2-0.9.6
+++ b/metadata/md5-cache/dev-python/PySDL2-0.9.6
@@ -10,5 +10,5 @@ RDEPEND=media-libs/libsdl2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r
 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/PySDL2/PySDL2-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=be21d02f00df27e5804fa0607cde58cd
diff --git a/metadata/md5-cache/dev-python/PySensors-0.0.3 b/metadata/md5-cache/dev-python/PySensors-0.0.3
index 443e9e4e9693..20cceabc43f7 100644
--- a/metadata/md5-cache/dev-python/PySensors-0.0.3
+++ b/metadata/md5-cache/dev-python/PySensors-0.0.3
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/lm_sensors-3 python_targets_pypy? ( >=virtual/pypy-5:0= ) pyt
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PySensors/PySensors-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6c3be4fedcdfae8f746fd52450588c20
diff --git a/metadata/md5-cache/dev-python/PySocks-1.6.7 b/metadata/md5-cache/dev-python/PySocks-1.6.7
index 6ee7baf16318..a0f9fec4049b 100644
--- a/metadata/md5-cache/dev-python/PySocks-1.6.7
+++ b/metadata/md5-cache/dev-python/PySocks-1.6.7
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/PySocks/PySocks-1.6.7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=55b25edc51b3ac645e0d6c5f7c5e26fc
diff --git a/metadata/md5-cache/dev-python/PySocks-1.6.8 b/metadata/md5-cache/dev-python/PySocks-1.6.8
index b053828766d6..46913ad1dc43 100644
--- a/metadata/md5-cache/dev-python/PySocks-1.6.8
+++ b/metadata/md5-cache/dev-python/PySocks-1.6.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/P/PySocks/PySocks-1.6.8.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=73a95d88089e296e40f4f9987c70045a
diff --git a/metadata/md5-cache/dev-python/PyZilla-0.1.0-r1 b/metadata/md5-cache/dev-python/PyZilla-0.1.0-r1
index f4cf032bb3fa..bdee52d7ae37 100644
--- a/metadata/md5-cache/dev-python/PyZilla-0.1.0-r1
+++ b/metadata/md5-cache/dev-python/PyZilla-0.1.0-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=mirror://pypi/P/PyZilla/PyZilla-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=12a6c8d02a99c1ba09fa07dedeffc248
diff --git a/metadata/md5-cache/dev-python/QtPy-1.3.1-r1 b/metadata/md5-cache/dev-python/QtPy-1.3.1-r1
index 140e08c09365..0131af0afab5 100644
--- a/metadata/md5-cache/dev-python/QtPy-1.3.1-r1
+++ b/metadata/md5-cache/dev-python/QtPy-1.3.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/Q/QtPy/QtPy-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cd3e267811931960e21ef28c3dd11d76
diff --git a/metadata/md5-cache/dev-python/QtPy-1.4.0-r1 b/metadata/md5-cache/dev-python/QtPy-1.4.0-r1
index 277899dbcf1f..220cb2f1a284 100644
--- a/metadata/md5-cache/dev-python/QtPy-1.4.0-r1
+++ b/metadata/md5-cache/dev-python/QtPy-1.4.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/Q/QtPy/QtPy-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e2ec5c254557164c4de1295f928aa04a
diff --git a/metadata/md5-cache/dev-python/ReParser-1.4.3 b/metadata/md5-cache/dev-python/ReParser-1.4.3
index 6f46238df547..54124a7a9425 100644
--- a/metadata/md5-cache/dev-python/ReParser-1.4.3
+++ b/metadata/md5-cache/dev-python/ReParser-1.4.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/R/ReParser/ReParser-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f44835f98aa34b5fe56c50975d154fea
diff --git a/metadata/md5-cache/dev-python/RecSQL-0.7.11 b/metadata/md5-cache/dev-python/RecSQL-0.7.11
index 6769aae5626d..3f15e58f7772 100644
--- a/metadata/md5-cache/dev-python/RecSQL-0.7.11
+++ b/metadata/md5-cache/dev-python/RecSQL-0.7.11
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/orbeckst/RecSQL/archive/release-0.7.11.tar.gz -> RecSQL-0.7.11.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7ddd0023db904867814732e608692fa0
diff --git a/metadata/md5-cache/dev-python/Rx-1.6.1 b/metadata/md5-cache/dev-python/Rx-1.6.1
index c2e1acaf37c7..55bf00b742d2 100644
--- a/metadata/md5-cache/dev-python/Rx-1.6.1
+++ b/metadata/md5-cache/dev-python/Rx-1.6.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/R/Rx/Rx-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9b1d024f56b65ed0b20da7429e7b76d0
diff --git a/metadata/md5-cache/dev-python/SaltTesting-2017.6.1 b/metadata/md5-cache/dev-python/SaltTesting-2017.6.1
index 7dd39e707a79..a4dd15f244b6 100644
--- a/metadata/md5-cache/dev-python/SaltTesting-2017.6.1
+++ b/metadata/md5-cache/dev-python/SaltTesting-2017.6.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/S/SaltTesting/SaltTesting-2017.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=606bde3878a2150cbdb29400ddb09ada
diff --git a/metadata/md5-cache/dev-python/SaltTesting-2018.1.16 b/metadata/md5-cache/dev-python/SaltTesting-2018.1.16
index 471e4e6db799..1483f0b050df 100644
--- a/metadata/md5-cache/dev-python/SaltTesting-2018.1.16
+++ b/metadata/md5-cache/dev-python/SaltTesting-2018.1.16
@@ -10,5 +10,5 @@ RDEPEND=dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_6(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/S/SaltTesting/SaltTesting-2018.1.16.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0811a91c933dcdc800d4eeaed0de54a3
diff --git a/metadata/md5-cache/dev-python/SchemaObject-0.5.3-r1 b/metadata/md5-cache/dev-python/SchemaObject-0.5.3-r1
index 0860b8c2afd3..bd466d7a95a2 100644
--- a/metadata/md5-cache/dev-python/SchemaObject-0.5.3-r1
+++ b/metadata/md5-cache/dev-python/SchemaObject-0.5.3-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=mirror://gentoo/SchemaObject-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5bd27cd84b675cb46afaae175921c5e1
diff --git a/metadata/md5-cache/dev-python/SchemaObject-0.5.7 b/metadata/md5-cache/dev-python/SchemaObject-0.5.7
index 8df3d2004932..cd645abf7bbb 100644
--- a/metadata/md5-cache/dev-python/SchemaObject-0.5.7
+++ b/metadata/md5-cache/dev-python/SchemaObject-0.5.7
@@ -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=mirror://pypi/S/SchemaObject/SchemaObject-0.5.7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6cecc9ef1b7b40508b17c158b4ef17c2
diff --git a/metadata/md5-cache/dev-python/SchemaObject-0.5.8 b/metadata/md5-cache/dev-python/SchemaObject-0.5.8
index b3ed5b3d821c..1e50765fbc4a 100644
--- a/metadata/md5-cache/dev-python/SchemaObject-0.5.8
+++ b/metadata/md5-cache/dev-python/SchemaObject-0.5.8
@@ -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=mirror://pypi/S/SchemaObject/SchemaObject-0.5.8.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3cb9d492d3d0c6e4b5a143a2299bc7b1
diff --git a/metadata/md5-cache/dev-python/URLObject-2.4.0 b/metadata/md5-cache/dev-python/URLObject-2.4.0
index 4b4dbcdbff87..498ae2491e72 100644
--- a/metadata/md5-cache/dev-python/URLObject-2.4.0
+++ b/metadata/md5-cache/dev-python/URLObject-2.4.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/U/URLObject/URLObject-2.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a8283ff071b8eeab4de9082a03dbd2e8
diff --git a/metadata/md5-cache/dev-python/URLObject-2.4.2-r1 b/metadata/md5-cache/dev-python/URLObject-2.4.2-r1
index e23e88e195bc..63429c30a44a 100644
--- a/metadata/md5-cache/dev-python/URLObject-2.4.2-r1
+++ b/metadata/md5-cache/dev-python/URLObject-2.4.2-r1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/zacharyvoase/urlobject/archive/v2.4.2.tar.gz -> urlobject-2.4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7baff2f80d16b5388d2929bfac23ec1c
diff --git a/metadata/md5-cache/dev-python/WSME-0.8.0 b/metadata/md5-cache/dev-python/WSME-0.8.0
index de747ceb1403..cc3e6dfb6509 100644
--- a/metadata/md5-cache/dev-python/WSME-0.8.0
+++ b/metadata/md5-cache/dev-python/WSME-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.3[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/W/WSME/WSME-0.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3457ecd2c3c2a3d2a4a74673ca107d6b
diff --git a/metadata/md5-cache/dev-python/WSME-0.9.1 b/metadata/md5-cache/dev-python/WSME-0.9.1
index 63b8aa3e1e24..efc0cd14ad51 100644
--- a/metadata/md5-cache/dev-python/WSME-0.9.1
+++ b/metadata/md5-cache/dev-python/WSME-0.9.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.3[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/W/WSME/WSME-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b2a168c0ef270528b0201ab20668305e
diff --git a/metadata/md5-cache/dev-python/WSME-0.9.2 b/metadata/md5-cache/dev-python/WSME-0.9.2
index 31bcf69a92bb..0d1dcb74c41e 100644
--- a/metadata/md5-cache/dev-python/WSME-0.9.2
+++ b/metadata/md5-cache/dev-python/WSME-0.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.3[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/W/WSME/WSME-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d794bf2126aaeae5952bb622a576709f
diff --git a/metadata/md5-cache/dev-python/XenAPI-1.2 b/metadata/md5-cache/dev-python/XenAPI-1.2
index 59201de8c5ff..7a5dd020c9fd 100644
--- a/metadata/md5-cache/dev-python/XenAPI-1.2
+++ b/metadata/md5-cache/dev-python/XenAPI-1.2
@@ -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=mirror://pypi/X/XenAPI/XenAPI-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=168b26b55a955844585ef04509c07e94
diff --git a/metadata/md5-cache/dev-python/YURL-0.13 b/metadata/md5-cache/dev-python/YURL-0.13
index 302e88ccdf3b..7936ce2803e1 100644
--- a/metadata/md5-cache/dev-python/YURL-0.13
+++ b/metadata/md5-cache/dev-python/YURL-0.13
@@ -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=mirror://pypi/Y/YURL/YURL-0.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a37eeceff996a9185b96d91ce8e2a55f
diff --git a/metadata/md5-cache/dev-python/aadict-0.2.3 b/metadata/md5-cache/dev-python/aadict-0.2.3
index 45e791d8b349..23cd1b0ba2c1 100644
--- a/metadata/md5-cache/dev-python/aadict-0.2.3
+++ b/metadata/md5-cache/dev-python/aadict-0.2.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/six-1.6.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,
 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/aadict/aadict-0.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=e16109d48dba924129e5aea11755b10d
diff --git a/metadata/md5-cache/dev-python/abstract_rendering-0.5.1 b/metadata/md5-cache/dev-python/abstract_rendering-0.5.1
index f5d52af919ee..87cd530b4a1b 100644
--- a/metadata/md5-cache/dev-python/abstract_rendering-0.5.1
+++ b/metadata/md5-cache/dev-python/abstract_rendering-0.5.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/abstract_rendering/abstract_rendering-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9f5d2be75516bdecc39b3659fe9716a1
diff --git a/metadata/md5-cache/dev-python/addons-0.7 b/metadata/md5-cache/dev-python/addons-0.7
index c9f0d11d81d7..cd94dd61aa4b 100644
--- a/metadata/md5-cache/dev-python/addons-0.7
+++ b/metadata/md5-cache/dev-python/addons-0.7
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/A/AddOns/AddOns-0.7.zip -> addons-0.7.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fc1e96d2baadb8729bc43d465b0fdfa0
diff --git a/metadata/md5-cache/dev-python/aiodns-1.1.1 b/metadata/md5-cache/dev-python/aiodns-1.1.1
index f33a770cbc99..fbb0a03488a6 100644
--- a/metadata/md5-cache/dev-python/aiodns-1.1.1
+++ b/metadata/md5-cache/dev-python/aiodns-1.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/aiodns/aiodns-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4d2ad2739bab258e6317718a8d128f6a
diff --git a/metadata/md5-cache/dev-python/aioeventlet-0.5.1-r1 b/metadata/md5-cache/dev-python/aioeventlet-0.5.1-r1
index b470bce18a9f..3e5889620d3d 100644
--- a/metadata/md5-cache/dev-python/aioeventlet-0.5.1-r1
+++ b/metadata/md5-cache/dev-python/aioeventlet-0.5.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/eventlet[python_targets_python2_7(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/aioeventlet/aioeventlet-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b15ff37e0e1d334c3e81549cfd8e2d07
diff --git a/metadata/md5-cache/dev-python/aiohttp-1.3.3 b/metadata/md5-cache/dev-python/aiohttp-1.3.3
index 804618a35eb4..5b5479b47884 100644
--- a/metadata/md5-cache/dev-python/aiohttp-1.3.3
+++ b/metadata/md5-cache/dev-python/aiohttp-1.3.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/async_timeout[python_targets_python3_4(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiohttp/aiohttp-1.3.3.tar.gz -> aiohttp-1.3.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7f1f5e55da39bc94aadba94480a3ea26
diff --git a/metadata/md5-cache/dev-python/aiohttp-1.3.5 b/metadata/md5-cache/dev-python/aiohttp-1.3.5
index c6eeb9c50cdd..79a63552d38a 100644
--- a/metadata/md5-cache/dev-python/aiohttp-1.3.5
+++ b/metadata/md5-cache/dev-python/aiohttp-1.3.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/async_timeout[python_targets_python3_4(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiohttp/aiohttp-1.3.5.tar.gz -> aiohttp-1.3.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7f1f5e55da39bc94aadba94480a3ea26
diff --git a/metadata/md5-cache/dev-python/aiohttp-2.3.10 b/metadata/md5-cache/dev-python/aiohttp-2.3.10
index ce2809181755..24e3f93a5618 100644
--- a/metadata/md5-cache/dev-python/aiohttp-2.3.10
+++ b/metadata/md5-cache/dev-python/aiohttp-2.3.10
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/aiohttp/aiohttp-2.3.10.tar.gz -> aiohttp-2.3.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e43ad9840fe4f53941be4dc0380a2c9a
diff --git a/metadata/md5-cache/dev-python/aiohttp-2.3.2 b/metadata/md5-cache/dev-python/aiohttp-2.3.2
index d7e53e19673a..1eb79fc73f2c 100644
--- a/metadata/md5-cache/dev-python/aiohttp-2.3.2
+++ b/metadata/md5-cache/dev-python/aiohttp-2.3.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/async_timeout-1.2.0[python_targets_python3_4(-)?,python_tar
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiohttp/aiohttp-2.3.2.tar.gz -> aiohttp-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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=e704d51e883ebe45b2e6637807186eec
diff --git a/metadata/md5-cache/dev-python/aiohttp-3.0.6 b/metadata/md5-cache/dev-python/aiohttp-3.0.6
index 5bed036996b4..0e6fbff4e22c 100644
--- a/metadata/md5-cache/dev-python/aiohttp-3.0.6
+++ b/metadata/md5-cache/dev-python/aiohttp-3.0.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/async_timeout-1.2.0[python_targets_python3_5(-)?,python_tar
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiohttp/aiohttp-3.0.6.tar.gz -> aiohttp-3.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=90316cea8786dbfe12e62da1080c2f3a
diff --git a/metadata/md5-cache/dev-python/aiohttp-3.3.0 b/metadata/md5-cache/dev-python/aiohttp-3.3.0
index 3f1fccf58780..216066d4c53e 100644
--- a/metadata/md5-cache/dev-python/aiohttp-3.3.0
+++ b/metadata/md5-cache/dev-python/aiohttp-3.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/async_timeout-3.0.0[python_targets_python3_5(-)?,python_tar
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiohttp/aiohttp-3.3.0.tar.gz -> aiohttp-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=487ebb22e61057ff46a2219422fc29d6
diff --git a/metadata/md5-cache/dev-python/aiohttp-3.4.4 b/metadata/md5-cache/dev-python/aiohttp-3.4.4
index a05cf802269e..a64b1910f602 100644
--- a/metadata/md5-cache/dev-python/aiohttp-3.4.4
+++ b/metadata/md5-cache/dev-python/aiohttp-3.4.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/async_timeout-3.0.0[python_targets_python3_5(-)?,python_tar
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiohttp/aiohttp-3.4.4.tar.gz -> aiohttp-3.4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a3e5d6b611f728f0248496571870f55e
diff --git a/metadata/md5-cache/dev-python/aiohttp-cors-0.5.0 b/metadata/md5-cache/dev-python/aiohttp-cors-0.5.0
index 3368290ac6e5..c8ef7c0b3f89 100644
--- a/metadata/md5-cache/dev-python/aiohttp-cors-0.5.0
+++ b/metadata/md5-cache/dev-python/aiohttp-cors-0.5.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/aiohttp-1.1.1[python_targets_python3_4(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/aio-libs/aiohttp-cors/archive/v0.5.0.tar.gz -> aiohttp-cors-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b1bccf9e1cd8e8dcde3f313749253138
diff --git a/metadata/md5-cache/dev-python/aiohttp-cors-0.5.1 b/metadata/md5-cache/dev-python/aiohttp-cors-0.5.1
index 4125a9b49ca2..aaed1f394714 100644
--- a/metadata/md5-cache/dev-python/aiohttp-cors-0.5.1
+++ b/metadata/md5-cache/dev-python/aiohttp-cors-0.5.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/aiohttp-1.1.1[python_targets_python3_4(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/aio-libs/aiohttp-cors/archive/v0.5.1.tar.gz -> aiohttp-cors-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e7a2e8ea14eda8f9424312461e2fed29
diff --git a/metadata/md5-cache/dev-python/aiohttp-cors-0.5.3 b/metadata/md5-cache/dev-python/aiohttp-cors-0.5.3
index e72492b8d333..86884dde8793 100644
--- a/metadata/md5-cache/dev-python/aiohttp-cors-0.5.3
+++ b/metadata/md5-cache/dev-python/aiohttp-cors-0.5.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/aiohttp-1.1.1[python_targets_python3_4(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/aio-libs/aiohttp-cors/archive/v0.5.3.tar.gz -> aiohttp-cors-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6d059d16d288909ce93ff3e0738db316
diff --git a/metadata/md5-cache/dev-python/aiohttp-cors-0.6.0 b/metadata/md5-cache/dev-python/aiohttp-cors-0.6.0
index 4eee4ef64356..9f8b8c63410b 100644
--- a/metadata/md5-cache/dev-python/aiohttp-cors-0.6.0
+++ b/metadata/md5-cache/dev-python/aiohttp-cors-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/aiohttp-1.1.1[python_targets_python3_4(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/aio-libs/aiohttp-cors/archive/v0.6.0.tar.gz -> aiohttp-cors-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=60a5e432c69817b3a8f1a4789d65e673
diff --git a/metadata/md5-cache/dev-python/aiohttp-jinja2-0.15.0 b/metadata/md5-cache/dev-python/aiohttp-jinja2-0.15.0
index 71177e953c8f..d8c1f159d562 100644
--- a/metadata/md5-cache/dev-python/aiohttp-jinja2-0.15.0
+++ b/metadata/md5-cache/dev-python/aiohttp-jinja2-0.15.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/aiohttp-2.3.9[python_targets_python3_4(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiohttp-jinja2/aiohttp-jinja2-0.15.0.tar.gz -> aiohttp-jinja2-0.15.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=06c3efa6779b25bf0ebed111d7533336
diff --git a/metadata/md5-cache/dev-python/aiosmtpd-1.0 b/metadata/md5-cache/dev-python/aiosmtpd-1.0
index 7a99ff09a50e..742e8f6dfbbe 100644
--- a/metadata/md5-cache/dev-python/aiosmtpd-1.0
+++ b/metadata/md5-cache/dev-python/aiosmtpd-1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/atpublic[python_targets_python3_4(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiosmtpd/aiosmtpd-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=57b0c91380e2df9b7d704cbefd9ffc7b
diff --git a/metadata/md5-cache/dev-python/aiosmtpd-1.1 b/metadata/md5-cache/dev-python/aiosmtpd-1.1
index 46a9593116b7..d100c8259614 100644
--- a/metadata/md5-cache/dev-python/aiosmtpd-1.1
+++ b/metadata/md5-cache/dev-python/aiosmtpd-1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/atpublic[python_targets_python3_4(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiosmtpd/aiosmtpd-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=57b0c91380e2df9b7d704cbefd9ffc7b
diff --git a/metadata/md5-cache/dev-python/aiotest-0.3 b/metadata/md5-cache/dev-python/aiotest-0.3
index a118ac658bea..e787733c0199 100644
--- a/metadata/md5-cache/dev-python/aiotest-0.3
+++ b/metadata/md5-cache/dev-python/aiotest-0.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( dev-python/trollius[python_targets_python2_7
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiotest/aiotest-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2f285083e534844ba143a8a4dd1bfa87
diff --git a/metadata/md5-cache/dev-python/alabaster-0.7.10 b/metadata/md5-cache/dev-python/alabaster-0.7.10
index 03380bb90041..ff1a3b71a87c 100644
--- a/metadata/md5-cache/dev-python/alabaster-0.7.10
+++ b/metadata/md5-cache/dev-python/alabaster-0.7.10
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9df1e274f63cb1a51f4df2e9505b4d20
diff --git a/metadata/md5-cache/dev-python/alabaster-0.7.11 b/metadata/md5-cache/dev-python/alabaster-0.7.11
index cdc32d29b96c..07d2ab272b60 100644
--- a/metadata/md5-cache/dev-python/alabaster-0.7.11
+++ b/metadata/md5-cache/dev-python/alabaster-0.7.11
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/alabaster/alabaster-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=38434d7cffe1fbf4832b9c677950b261
diff --git a/metadata/md5-cache/dev-python/alabaster-0.7.9 b/metadata/md5-cache/dev-python/alabaster-0.7.9
index 157a8d2418d2..c1599be9c323 100644
--- a/metadata/md5-cache/dev-python/alabaster-0.7.9
+++ b/metadata/md5-cache/dev-python/alabaster-0.7.9
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-python/aldryn-boilerplates-0.7.5 b/metadata/md5-cache/dev-python/aldryn-boilerplates-0.7.5
index 0e3def9809e0..5c3303060316 100644
--- a/metadata/md5-cache/dev-python/aldryn-boilerplates-0.7.5
+++ b/metadata/md5-cache/dev-python/aldryn-boilerplates-0.7.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/django-1.5[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/a/aldryn-boilerplates/aldryn-boilerplates-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4aa7b232dce8effc4552776a54d1b2b6
diff --git a/metadata/md5-cache/dev-python/aldryn-bootstrap3-1.2.2 b/metadata/md5-cache/dev-python/aldryn-bootstrap3-1.2.2
index f55b7db55179..cb6cf28ca123 100644
--- a/metadata/md5-cache/dev-python/aldryn-bootstrap3-1.2.2
+++ b/metadata/md5-cache/dev-python/aldryn-bootstrap3-1.2.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/django-cms-3.3.0[python_targets_python2_7(-)?,python_target
 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/aldryn/aldryn-bootstrap3/archive/1.2.2.tar.gz -> aldryn-bootstrap3-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4824d26df50714fba39c21eba78f0306
diff --git a/metadata/md5-cache/dev-python/aldryn-common-1.0.4 b/metadata/md5-cache/dev-python/aldryn-common-1.0.4
index 60eedc833d80..13bae77f6fce 100644
--- a/metadata/md5-cache/dev-python/aldryn-common-1.0.4
+++ b/metadata/md5-cache/dev-python/aldryn-common-1.0.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/aldryn-boilerplates[python_targets_python2_7(-)?,-python_sing
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/a/aldryn-common/aldryn-common-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=74ce31044b2e4bebc6911be8a3471928
diff --git a/metadata/md5-cache/dev-python/aldryn-search-0.3.0 b/metadata/md5-cache/dev-python/aldryn-search-0.3.0
index c685b7c3f25f..88fdfeb99747 100644
--- a/metadata/md5-cache/dev-python/aldryn-search-0.3.0
+++ b/metadata/md5-cache/dev-python/aldryn-search-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/aldryn/aldryn-search/archive/0.3.0.tar.gz -> aldryn-search-0.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=79098c02f65a06ffef0d38f8a5d6eba1
diff --git a/metadata/md5-cache/dev-python/alembic-0.9.3 b/metadata/md5-cache/dev-python/alembic-0.9.3
index 34bfff129bef..327fe0c75b8f 100644
--- a/metadata/md5-cache/dev-python/alembic-0.9.3
+++ b/metadata/md5-cache/dev-python/alembic-0.9.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/sqlalchemy-0.8.4[python_targets_python2_7(-)?,python_target
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/alembic/alembic-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=937243f973d542f7a92949ff7b1d97a1
diff --git a/metadata/md5-cache/dev-python/alembic-0.9.5 b/metadata/md5-cache/dev-python/alembic-0.9.5
index 9849cc09e4d3..70b6760ae2a2 100644
--- a/metadata/md5-cache/dev-python/alembic-0.9.5
+++ b/metadata/md5-cache/dev-python/alembic-0.9.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/sqlalchemy-0.8.4[python_targets_python2_7(-)?,python_target
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/alembic/alembic-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a85818ed962745f39b37c2444f8e55f0
diff --git a/metadata/md5-cache/dev-python/alembic-0.9.7 b/metadata/md5-cache/dev-python/alembic-0.9.7
index 900dd0e13c1e..de9202690d64 100644
--- a/metadata/md5-cache/dev-python/alembic-0.9.7
+++ b/metadata/md5-cache/dev-python/alembic-0.9.7
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/sqlalchemy-0.8.4[python_targets_python2_7(-)?,python_target
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/alembic/alembic-0.9.7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=35d013d3726699c7fcc9f105c47564b9
diff --git a/metadata/md5-cache/dev-python/algopy-0.5.3 b/metadata/md5-cache/dev-python/algopy-0.5.3
index 9e3596a01e11..a878ecc93c9f 100644
--- a/metadata/md5-cache/dev-python/algopy-0.5.3
+++ b/metadata/md5-cache/dev-python/algopy-0.5.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/algopy/algopy-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=00b888e514a99d86884ec8a62df1f34f
diff --git a/metadata/md5-cache/dev-python/amodem-1.13 b/metadata/md5-cache/dev-python/amodem-1.13
index bfc2f37d3bcb..0562bc005d23 100644
--- a/metadata/md5-cache/dev-python/amodem-1.13
+++ b/metadata/md5-cache/dev-python/amodem-1.13
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/romanz/amodem/archive/v1.13.tar.gz -> amodem-1.13.tar.gz mirror://pypi/a/amodem/amodem-1.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=06b65c7bc99c20d7d8190611badd8ced
diff --git a/metadata/md5-cache/dev-python/amodem-1.13.1 b/metadata/md5-cache/dev-python/amodem-1.13.1
index ad2271b2fb02..a8e1287f0f53 100644
--- a/metadata/md5-cache/dev-python/amodem-1.13.1
+++ b/metadata/md5-cache/dev-python/amodem-1.13.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/romanz/amodem/archive/v1.13.1.tar.gz -> amodem-1.13.1.tar.gz mirror://pypi/a/amodem/amodem-1.13.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=631f95d71272ee691fa7459e0600ebce
diff --git a/metadata/md5-cache/dev-python/amodem-1.14.0 b/metadata/md5-cache/dev-python/amodem-1.14.0
index db8014f0bae8..6df19bb9f209 100644
--- a/metadata/md5-cache/dev-python/amodem-1.14.0
+++ b/metadata/md5-cache/dev-python/amodem-1.14.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/romanz/amodem/archive/v1.14.0.tar.gz -> amodem-1.14.0.tar.gz mirror://pypi/a/amodem/amodem-1.14.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=631f95d71272ee691fa7459e0600ebce
diff --git a/metadata/md5-cache/dev-python/amodem-1.15.0 b/metadata/md5-cache/dev-python/amodem-1.15.0
index 8c6f447e61e4..d3c860a1a688 100644
--- a/metadata/md5-cache/dev-python/amodem-1.15.0
+++ b/metadata/md5-cache/dev-python/amodem-1.15.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/romanz/amodem/archive/v1.15.0.tar.gz -> amodem-1.15.0.tar.gz mirror://pypi/a/amodem/amodem-1.15.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=631f95d71272ee691fa7459e0600ebce
diff --git a/metadata/md5-cache/dev-python/amqplib-1.0.2-r1 b/metadata/md5-cache/dev-python/amqplib-1.0.2-r1
index 45328cb5b6da..0f6127fabb4b 100644
--- a/metadata/md5-cache/dev-python/amqplib-1.0.2-r1
+++ b/metadata/md5-cache/dev-python/amqplib-1.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/amqplib/amqplib-1.0.2.tgz
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9f3d6429a9a3b2f0ab4ce4a65618c3c0
diff --git a/metadata/md5-cache/dev-python/aniso8601-1.3.0 b/metadata/md5-cache/dev-python/aniso8601-1.3.0
index ab86dd6fae46..080800394d9f 100644
--- a/metadata/md5-cache/dev-python/aniso8601-1.3.0
+++ b/metadata/md5-cache/dev-python/aniso8601-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/python-dateutil[python_targets_pypy(-)?,python_targets_pypy3(
 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/aniso8601/aniso8601-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5009ab4abe5223e9e45d34a806a58ae9
diff --git a/metadata/md5-cache/dev-python/aniso8601-3.0.0 b/metadata/md5-cache/dev-python/aniso8601-3.0.0
index 1aae59656eb6..7f36a1acb72d 100644
--- a/metadata/md5-cache/dev-python/aniso8601-3.0.0
+++ b/metadata/md5-cache/dev-python/aniso8601-3.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/python-dateutil[python_targets_pypy(-)?,python_targets_pypy3(
 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/aniso8601/aniso8601-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=277c7d0c4353d7a152f11f4bd31716c4
diff --git a/metadata/md5-cache/dev-python/aniso8601-3.0.2 b/metadata/md5-cache/dev-python/aniso8601-3.0.2
index c04cb1d147ca..a847df4741d2 100644
--- a/metadata/md5-cache/dev-python/aniso8601-3.0.2
+++ b/metadata/md5-cache/dev-python/aniso8601-3.0.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/python-dateutil[python_targets_pypy(-)?,python_targets_pypy3(
 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/aniso8601/aniso8601-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1da21c5a35ba27e57c9742db286ce97a
diff --git a/metadata/md5-cache/dev-python/ansi2html-1.1.1 b/metadata/md5-cache/dev-python/ansi2html-1.1.1
index 79f270b041c1..9877fdd89ef1 100644
--- a/metadata/md5-cache/dev-python/ansi2html-1.1.1
+++ b/metadata/md5-cache/dev-python/ansi2html-1.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/ansi2html/ansi2html-1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f3196c369c48db74201e950b2cca3042
diff --git a/metadata/md5-cache/dev-python/ansi2html-1.2.0 b/metadata/md5-cache/dev-python/ansi2html-1.2.0
index cda95c57ad7e..7a4045b325cf 100644
--- a/metadata/md5-cache/dev-python/ansi2html-1.2.0
+++ b/metadata/md5-cache/dev-python/ansi2html-1.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/ansi2html/ansi2html-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=90b2b2c3d221415217737c21406ed0c2
diff --git a/metadata/md5-cache/dev-python/ansi2html-1.3.0 b/metadata/md5-cache/dev-python/ansi2html-1.3.0
index 7e4a0ed40eb3..718f2dfb1ff6 100644
--- a/metadata/md5-cache/dev-python/ansi2html-1.3.0
+++ b/metadata/md5-cache/dev-python/ansi2html-1.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/ansi2html/ansi2html-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cdb1238d5f32ea6d69c8d3480be652eb
diff --git a/metadata/md5-cache/dev-python/ansi2html-1.4.2 b/metadata/md5-cache/dev-python/ansi2html-1.4.2
index 3af84843ce2f..04c38ae52e71 100644
--- a/metadata/md5-cache/dev-python/ansi2html-1.4.2
+++ b/metadata/md5-cache/dev-python/ansi2html-1.4.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/ansi2html/ansi2html-1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4eea2facd9b4442eaf22e852db3ed4b1
diff --git a/metadata/md5-cache/dev-python/ansicolor-0.2.6 b/metadata/md5-cache/dev-python/ansicolor-0.2.6
index c915752cd833..c563f46df88c 100644
--- a/metadata/md5-cache/dev-python/ansicolor-0.2.6
+++ b/metadata/md5-cache/dev-python/ansicolor-0.2.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/ansicolor/ansicolor-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c8622492d6f67aa7c79bc13e8f0c4f05
diff --git a/metadata/md5-cache/dev-python/ansicolor-9999 b/metadata/md5-cache/dev-python/ansicolor-9999
index c357810528d0..5f1be2980025 100644
--- a/metadata/md5-cache/dev-python/ansicolor-9999
+++ b/metadata/md5-cache/dev-python/ansicolor-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6c9e09803e8dc9e3c59ccf432866894b
diff --git a/metadata/md5-cache/dev-python/anyjson-0.3.3-r1 b/metadata/md5-cache/dev-python/anyjson-0.3.3-r1
index a935e400e116..ba20b8879e34 100644
--- a/metadata/md5-cache/dev-python/anyjson-0.3.3-r1
+++ b/metadata/md5-cache/dev-python/anyjson-0.3.3-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/anyjson/anyjson-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5467de551832e5d06841ff7dac7a49e2
diff --git a/metadata/md5-cache/dev-python/anyqt-0.0.8-r1 b/metadata/md5-cache/dev-python/anyqt-0.0.8-r1
index af9afa073b43..ac8d3c3c3d08 100644
--- a/metadata/md5-cache/dev-python/anyqt-0.0.8-r1
+++ b/metadata/md5-cache/dev-python/anyqt-0.0.8-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/ales-erjavec/anyqt/archive/0.0.8.tar.gz -> anyqt-0.0.8.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ab94b2ffe9f8b20423b0bb229ca1b797
diff --git a/metadata/md5-cache/dev-python/anyvc-0.3.7.1-r1 b/metadata/md5-cache/dev-python/anyvc-0.3.7.1-r1
index 5e7a7a8e2794..ef85a1f71116 100644
--- a/metadata/md5-cache/dev-python/anyvc-0.3.7.1-r1
+++ b/metadata/md5-cache/dev-python/anyvc-0.3.7.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/apipkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/a/anyvc/anyvc-0.3.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e75b58bf1f396f602d0a09d62d4a61a3
diff --git a/metadata/md5-cache/dev-python/aodhclient-0.8.0 b/metadata/md5-cache/dev-python/aodhclient-0.8.0
index 78b0a9a6ba6a..abc3b2d5dd4f 100644
--- a/metadata/md5-cache/dev-python/aodhclient-0.8.0
+++ b/metadata/md5-cache/dev-python/aodhclient-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/a/aodhclient/aodhclient-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=db406b167fcf85c8cab4766343ea9ab7
diff --git a/metadata/md5-cache/dev-python/aodhclient-1.0.0 b/metadata/md5-cache/dev-python/aodhclient-1.0.0
index 9a7b4bd5e71a..33042a9081ce 100644
--- a/metadata/md5-cache/dev-python/aodhclient-1.0.0
+++ b/metadata/md5-cache/dev-python/aodhclient-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/aodhclient/aodhclient-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=288fdba566f9bc4d60a88494e1eb58dc
diff --git a/metadata/md5-cache/dev-python/apipkg-1.4 b/metadata/md5-cache/dev-python/apipkg-1.4
index ab54c1c84062..e6afa9bfefd4 100644
--- a/metadata/md5-cache/dev-python/apipkg-1.4
+++ b/metadata/md5-cache/dev-python/apipkg-1.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/apipkg/apipkg-1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f6f1d0815e909fac808bc7110bdfb1fd
diff --git a/metadata/md5-cache/dev-python/apispec-0.35.0 b/metadata/md5-cache/dev-python/apispec-0.35.0
index 499c9096a7d9..3fa0e99278d2 100644
--- a/metadata/md5-cache/dev-python/apispec-0.35.0
+++ b/metadata/md5-cache/dev-python/apispec-0.35.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pyyaml-3.10[python_targets_python2_7(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/apispec/apispec-0.35.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a1732c70afc3a6761f98c68e6d3905de
diff --git a/metadata/md5-cache/dev-python/aplpy-1.0 b/metadata/md5-cache/dev-python/aplpy-1.0
index 2bb9c5fc43ba..e7f8ab1dac88 100644
--- a/metadata/md5-cache/dev-python/aplpy-1.0
+++ b/metadata/md5-cache/dev-python/aplpy-1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/A/APLpy/APLpy-1.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=90cab21ff6e78676f57ac4fdb38dd0f6
diff --git a/metadata/md5-cache/dev-python/aplpy-1.1.1 b/metadata/md5-cache/dev-python/aplpy-1.1.1
index dedc5ecd3055..e168fb5b30fc 100644
--- a/metadata/md5-cache/dev-python/aplpy-1.1.1
+++ b/metadata/md5-cache/dev-python/aplpy-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/A/APLpy/APLpy-1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=86a87c7302b0f32a69dff29f9dc89f3b
diff --git a/metadata/md5-cache/dev-python/appdirs-1.4.3 b/metadata/md5-cache/dev-python/appdirs-1.4.3
index 54aa777400de..70ccd2159438 100644
--- a/metadata/md5-cache/dev-python/appdirs-1.4.3
+++ b/metadata/md5-cache/dev-python/appdirs-1.4.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/ActiveState/appdirs/archive/1.4.3.tar.gz -> appdirs-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=45161c0f2052e0eb688af80aefc12a76
diff --git a/metadata/md5-cache/dev-python/apptools-4.2.1 b/metadata/md5-cache/dev-python/apptools-4.2.1
index fc72902186ad..6243541672aa 100644
--- a/metadata/md5-cache/dev-python/apptools-4.2.1
+++ b/metadata/md5-cache/dev-python/apptools-4.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.enthought.com/repo/ets/apptools-4.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=59bdef49fe49b8c07d46aefec264160d
diff --git a/metadata/md5-cache/dev-python/apptools-4.3.0 b/metadata/md5-cache/dev-python/apptools-4.3.0
index d33418b7ef31..158ed2a59be0 100644
--- a/metadata/md5-cache/dev-python/apptools-4.3.0
+++ b/metadata/md5-cache/dev-python/apptools-4.3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/a/apptools/apptools-4.3.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=892a3a8b74facf0b0ee9a30b211aded2
diff --git a/metadata/md5-cache/dev-python/apsw-3.19.3_p1 b/metadata/md5-cache/dev-python/apsw-3.19.3_p1
index f7fe7651b341..93122b896675 100644
--- a/metadata/md5-cache/dev-python/apsw-3.19.3_p1
+++ b/metadata/md5-cache/dev-python/apsw-3.19.3_p1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/sqlite-3.19.3 python_targets_python2_7? ( >=dev-lang/python-2.7
 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/rogerbinns/apsw/releases/download/3.19.3-r1/apsw-3.19.3-r1.zip -> apsw-3.19.3_p1.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=18077b5f23865b3dd6e2a6d88649784b
diff --git a/metadata/md5-cache/dev-python/apsw-3.21.0_p1 b/metadata/md5-cache/dev-python/apsw-3.21.0_p1
index d9c5e7a32889..a74a604f67d6 100644
--- a/metadata/md5-cache/dev-python/apsw-3.21.0_p1
+++ b/metadata/md5-cache/dev-python/apsw-3.21.0_p1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/sqlite-3.21.0 python_targets_python2_7? ( >=dev-lang/python-2.7
 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/rogerbinns/apsw/releases/download/3.21.0-r1/apsw-3.21.0-r1.zip -> apsw-3.21.0_p1.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fa8e3e331ff70aa0a4555c8cb4173591
diff --git a/metadata/md5-cache/dev-python/apsw-3.22.0_p1 b/metadata/md5-cache/dev-python/apsw-3.22.0_p1
index c9b0bcac5eba..a95407d6694a 100644
--- a/metadata/md5-cache/dev-python/apsw-3.22.0_p1
+++ b/metadata/md5-cache/dev-python/apsw-3.22.0_p1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/sqlite-3.22.0 python_targets_python2_7? ( >=dev-lang/python-2.7
 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/rogerbinns/apsw/releases/download/3.22.0-r1/apsw-3.22.0-r1.zip -> apsw-3.22.0_p1.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=39efab0a4230484ec1fc2ce0e512eeb7
diff --git a/metadata/md5-cache/dev-python/apsw-3.23.1_p1 b/metadata/md5-cache/dev-python/apsw-3.23.1_p1
index 8c7ef8e567d7..a9c0d141b1ae 100644
--- a/metadata/md5-cache/dev-python/apsw-3.23.1_p1
+++ b/metadata/md5-cache/dev-python/apsw-3.23.1_p1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/sqlite-3.23.1 python_targets_python2_7? ( >=dev-lang/python-2.7
 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/rogerbinns/apsw/releases/download/3.23.1-r1/apsw-3.23.1-r1.zip -> apsw-3.23.1_p1.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=39efab0a4230484ec1fc2ce0e512eeb7
diff --git a/metadata/md5-cache/dev-python/aquarium-2.3-r1 b/metadata/md5-cache/dev-python/aquarium-2.3-r1
index 7b9488c9f34a..0edf85d0ffc9 100644
--- a/metadata/md5-cache/dev-python/aquarium-2.3-r1
+++ b/metadata/md5-cache/dev-python/aquarium-2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/aquarium/aquarium-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=d7ff6811dc0cb53af74bc88cf350af9c
diff --git a/metadata/md5-cache/dev-python/argcomplete-1.4.1 b/metadata/md5-cache/dev-python/argcomplete-1.4.1
index 59fea9592053..e0477c413edc 100644
--- a/metadata/md5-cache/dev-python/argcomplete-1.4.1
+++ b/metadata/md5-cache/dev-python/argcomplete-1.4.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/a/argcomplete/argcomplete-1.4.1.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ca070ea8233438185c20779f5d2e2358
diff --git a/metadata/md5-cache/dev-python/argcomplete-1.9.4 b/metadata/md5-cache/dev-python/argcomplete-1.9.4
index 5eeeebce3d31..bc4d30f31e45 100644
--- a/metadata/md5-cache/dev-python/argcomplete-1.9.4
+++ b/metadata/md5-cache/dev-python/argcomplete-1.9.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/argcomplete/argcomplete-1.9.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bfd3141d46f612842983a241f00a373b
diff --git a/metadata/md5-cache/dev-python/argh-0.26.2 b/metadata/md5-cache/dev-python/argh-0.26.2
index 5fcae6a89f7d..0a948c1eb45c 100644
--- a/metadata/md5-cache/dev-python/argh-0.26.2
+++ b/metadata/md5-cache/dev-python/argh-0.26.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/a/argh/argh-0.26.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2a4e468250dc9ab8aa7eac1b6d12e519
diff --git a/metadata/md5-cache/dev-python/argh-0.26.2-r1 b/metadata/md5-cache/dev-python/argh-0.26.2-r1
index 9b4d58bddfe4..69a4dd047c27 100644
--- a/metadata/md5-cache/dev-python/argh-0.26.2-r1
+++ b/metadata/md5-cache/dev-python/argh-0.26.2-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/argh/argh-0.26.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5eb51a02002705a1389339c21223bd84
diff --git a/metadata/md5-cache/dev-python/args-0.1.0 b/metadata/md5-cache/dev-python/args-0.1.0
index 33290820d558..5b18aea80b01 100644
--- a/metadata/md5-cache/dev-python/args-0.1.0
+++ b/metadata/md5-cache/dev-python/args-0.1.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/a/args/args-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7c93cc7e5098e9acdc43ed66a8878f78
diff --git a/metadata/md5-cache/dev-python/arpeggio-1.5 b/metadata/md5-cache/dev-python/arpeggio-1.5
index 16fac4317162..79b593bd1b93 100644
--- a/metadata/md5-cache/dev-python/arpeggio-1.5
+++ b/metadata/md5-cache/dev-python/arpeggio-1.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/A/Arpeggio/Arpeggio-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1b5852cfe81fe5aaae30ac414ca3fba2
diff --git a/metadata/md5-cache/dev-python/arrayterator-1.0.1-r1 b/metadata/md5-cache/dev-python/arrayterator-1.0.1-r1
index bad37f463356..b1d928d2281e 100644
--- a/metadata/md5-cache/dev-python/arrayterator-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/arrayterator-1.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/numpy-1.0_rc1[python_targets_python2_7(-)?,-python_single_t
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/a/arrayterator/arrayterator-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d47988889ac556fdf2cbfe92504f0c4a
diff --git a/metadata/md5-cache/dev-python/arrow-0.10.0 b/metadata/md5-cache/dev-python/arrow-0.10.0
index 0b1067c85416..f78c555ffdec 100644
--- a/metadata/md5-cache/dev-python/arrow-0.10.0
+++ b/metadata/md5-cache/dev-python/arrow-0.10.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/arrow/arrow-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9d4fd7495777e72dd66cd6f5581b79d4
diff --git a/metadata/md5-cache/dev-python/arrow-0.12.1 b/metadata/md5-cache/dev-python/arrow-0.12.1
index b7dd25622009..dd9dff82c48e 100644
--- a/metadata/md5-cache/dev-python/arrow-0.12.1
+++ b/metadata/md5-cache/dev-python/arrow-0.12.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/arrow/arrow-0.12.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=06757122fa3d6937f8f760232d629998
diff --git a/metadata/md5-cache/dev-python/asciimatics-1.10.0 b/metadata/md5-cache/dev-python/asciimatics-1.10.0
index ab019c3546ca..62cc4c27f4a0 100644
--- a/metadata/md5-cache/dev-python/asciimatics-1.10.0
+++ b/metadata/md5-cache/dev-python/asciimatics-1.10.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/peterbrittain/asciimatics/archive/1.10.0.tar.gz -> asciimatics-1.10.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=958db94859174882d61be45fbf10041f
diff --git a/metadata/md5-cache/dev-python/asciitable-0.8.0-r1 b/metadata/md5-cache/dev-python/asciitable-0.8.0-r1
index 6c5c0ce06ef9..e1d735b42667 100644
--- a/metadata/md5-cache/dev-python/asciitable-0.8.0-r1
+++ b/metadata/md5-cache/dev-python/asciitable-0.8.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/asciitable/asciitable-0.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=37a910238f24d36b67b18340c070580e
diff --git a/metadata/md5-cache/dev-python/asdf-1.2.1 b/metadata/md5-cache/dev-python/asdf-1.2.1
index 2fc0730cb7e8..b78b9e96cd51 100644
--- a/metadata/md5-cache/dev-python/asdf-1.2.1
+++ b/metadata/md5-cache/dev-python/asdf-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/asdf/asdf-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0291036ad7baeaecbfcf1b075a3209ed
diff --git a/metadata/md5-cache/dev-python/asn1crypto-0.22.0 b/metadata/md5-cache/dev-python/asn1crypto-0.22.0
index 0f24d1c467be..019ae96cbe21 100644
--- a/metadata/md5-cache/dev-python/asn1crypto-0.22.0
+++ b/metadata/md5-cache/dev-python/asn1crypto-0.22.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_
 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/asn1crypto/asn1crypto-0.22.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8cf72026451a848be8d02127a7d3f7f1
diff --git a/metadata/md5-cache/dev-python/asn1crypto-0.24.0 b/metadata/md5-cache/dev-python/asn1crypto-0.24.0
index 6bb5fdd15b96..135aec4cc2bd 100644
--- a/metadata/md5-cache/dev-python/asn1crypto-0.24.0
+++ b/metadata/md5-cache/dev-python/asn1crypto-0.24.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_
 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/wbond/asn1crypto/archive/0.24.0.tar.gz -> asn1crypto-0.24.0.gh.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1658c70b16e1d33d18bd4e28f25c28f5
diff --git a/metadata/md5-cache/dev-python/asset-0.6.11 b/metadata/md5-cache/dev-python/asset-0.6.11
index f82b608fd4a6..df21dd132acb 100644
--- a/metadata/md5-cache/dev-python/asset-0.6.11
+++ b/metadata/md5-cache/dev-python/asset-0.6.11
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/aadict-0.2.2[python_targets_python2_7(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/asset/asset-0.6.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=25b81c6d0317de6e88610846aa31fc43
diff --git a/metadata/md5-cache/dev-python/assets-0.1.1-r1 b/metadata/md5-cache/dev-python/assets-0.1.1-r1
index f0caf9e64904..d00d791eedd6 100644
--- a/metadata/md5-cache/dev-python/assets-0.1.1-r1
+++ b/metadata/md5-cache/dev-python/assets-0.1.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://launchpad.net/web-assets/trunk/0.1.1/+download/assets-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5ccf49b5ef9d6881a2f6487e2264fcdb
diff --git a/metadata/md5-cache/dev-python/astlib-0.8.0 b/metadata/md5-cache/dev-python/astlib-0.8.0
index d44340cc4de4..97e4fd339892 100644
--- a/metadata/md5-cache/dev-python/astlib-0.8.0
+++ b/metadata/md5-cache/dev-python/astlib-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=sci-astronomy/wcstools dev-python/astropy[python_targets_python2_7(-)?,p
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/astlib/astLib-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5fba55cfffb0838873f063d9cd7f8347
diff --git a/metadata/md5-cache/dev-python/astng-0.24.3 b/metadata/md5-cache/dev-python/astng-0.24.3
index 5831e9aa2554..51a2f6525ce3 100644
--- a/metadata/md5-cache/dev-python/astng-0.24.3
+++ b/metadata/md5-cache/dev-python/astng-0.24.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
index 35d5899e0a25..8588d9c26922 100644
--- a/metadata/md5-cache/dev-python/astng-0.24.3-r1
+++ b/metadata/md5-cache/dev-python/astng-0.24.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 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	89bb9f083a2590d9b447fd0b78a96186
+_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/astor-0.5 b/metadata/md5-cache/dev-python/astor-0.5
index b9e5dee60972..5caaf2c5a7e9 100644
--- a/metadata/md5-cache/dev-python/astor-0.5
+++ b/metadata/md5-cache/dev-python/astor-0.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/astor/astor-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b26c27306b73724d946b5e7705f4be6c
diff --git a/metadata/md5-cache/dev-python/astor-0.6 b/metadata/md5-cache/dev-python/astor-0.6
index fc64ee1de966..2f5c2b0c4825 100644
--- a/metadata/md5-cache/dev-python/astor-0.6
+++ b/metadata/md5-cache/dev-python/astor-0.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/astor/astor-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0ac75f11ce61e947cd31e21a0fa4f3a6
diff --git a/metadata/md5-cache/dev-python/astor-0.7.1 b/metadata/md5-cache/dev-python/astor-0.7.1
index e0a6b90adeaf..dd554a664f12 100644
--- a/metadata/md5-cache/dev-python/astor-0.7.1
+++ b/metadata/md5-cache/dev-python/astor-0.7.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/a/astor/astor-0.7.1.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=69f389f4b94945d7538aecd4f2c6a023
diff --git a/metadata/md5-cache/dev-python/astrodendro-0.2.0 b/metadata/md5-cache/dev-python/astrodendro-0.2.0
index 6a448e38e59b..c72366795c0f 100644
--- a/metadata/md5-cache/dev-python/astrodendro-0.2.0
+++ b/metadata/md5-cache/dev-python/astrodendro-0.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/astrodendro/astrodendro-0.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=6073299243ffde0a4ce7b88d445feea4
diff --git a/metadata/md5-cache/dev-python/astroid-1.4.8 b/metadata/md5-cache/dev-python/astroid-1.4.8
index ca3a8e3d98c1..8266c01b29b4 100644
--- a/metadata/md5-cache/dev-python/astroid-1.4.8
+++ b/metadata/md5-cache/dev-python/astroid-1.4.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/astroid/astroid-1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9f0df2b1c7927f218d0cadc954cd5231
diff --git a/metadata/md5-cache/dev-python/astroid-1.5.3 b/metadata/md5-cache/dev-python/astroid-1.5.3
index d2bacb7ebb9b..da4ccb76c937 100644
--- a/metadata/md5-cache/dev-python/astroid-1.5.3
+++ b/metadata/md5-cache/dev-python/astroid-1.5.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/lazy-object-proxy[python_targets_pypy(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/astroid/astroid-1.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=079a10afaa3113ab1cbd6056d4e18c7a
diff --git a/metadata/md5-cache/dev-python/astroid-1.6.0 b/metadata/md5-cache/dev-python/astroid-1.6.0
index 2dc9c3e5383e..0199e2a455b0 100644
--- a/metadata/md5-cache/dev-python/astroid-1.6.0
+++ b/metadata/md5-cache/dev-python/astroid-1.6.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/lazy-object-proxy[python_targets_pypy(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/astroid/astroid-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=22dbb225d4280b64455992967e2b609c
diff --git a/metadata/md5-cache/dev-python/astroid-1.6.5 b/metadata/md5-cache/dev-python/astroid-1.6.5
index 21a5cd22dfb8..f964d711824f 100644
--- a/metadata/md5-cache/dev-python/astroid-1.6.5
+++ b/metadata/md5-cache/dev-python/astroid-1.6.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/lazy-object-proxy[python_targets_pypy(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/astroid/astroid-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2a35a3e75382b2e0545d526b9eb2162a
diff --git a/metadata/md5-cache/dev-python/astroml-0.3 b/metadata/md5-cache/dev-python/astroml-0.3
index 8d26999a5d39..06e3d6854d3e 100644
--- a/metadata/md5-cache/dev-python/astroml-0.3
+++ b/metadata/md5-cache/dev-python/astroml-0.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/astroML/astroML-0.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=be8313198277587bd780067023686b18
diff --git a/metadata/md5-cache/dev-python/astroml-addons-0.2.2 b/metadata/md5-cache/dev-python/astroml-addons-0.2.2
index 41f2ab3334f5..8a26712b9713 100644
--- a/metadata/md5-cache/dev-python/astroml-addons-0.2.2
+++ b/metadata/md5-cache/dev-python/astroml-addons-0.2.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/astroml[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/astroML_addons/astroML_addons-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=abac15c7e26203071ff5a8ae07a5786d
diff --git a/metadata/md5-cache/dev-python/astroplan-0.2 b/metadata/md5-cache/dev-python/astroplan-0.2
index e7ec285b7693..ae17398f3a81 100644
--- a/metadata/md5-cache/dev-python/astroplan-0.2
+++ b/metadata/md5-cache/dev-python/astroplan-0.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/a/astroplan/astroplan-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fafa9a558773403f1bd0e28c9c47ee70
diff --git a/metadata/md5-cache/dev-python/astroplan-0.2.1 b/metadata/md5-cache/dev-python/astroplan-0.2.1
index be070fee0181..d5ee11160bc5 100644
--- a/metadata/md5-cache/dev-python/astroplan-0.2.1
+++ b/metadata/md5-cache/dev-python/astroplan-0.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/astroplan/astroplan-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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=682ee348ab023d97699717f19d516633
diff --git a/metadata/md5-cache/dev-python/astropy-1.2.1 b/metadata/md5-cache/dev-python/astropy-1.2.1
index 7e39b4aa13bf..fd605d62466b 100644
--- a/metadata/md5-cache/dev-python/astropy-1.2.1
+++ b/metadata/md5-cache/dev-python/astropy-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat:0= dev-python/configobj[python_targets_python2_7(-)?,pyth
 REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/a/astropy/astropy-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3ac03c2cc18a46529b474b6bc8735d40
diff --git a/metadata/md5-cache/dev-python/astropy-1.3.3 b/metadata/md5-cache/dev-python/astropy-1.3.3
index 014127d41d98..41271b35df8f 100644
--- a/metadata/md5-cache/dev-python/astropy-1.3.3
+++ b/metadata/md5-cache/dev-python/astropy-1.3.3
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat:0= dev-python/configobj[python_targets_python2_7(-)?,pyth
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/astropy/astropy-1.3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=535a603f802686a823920c5aebe6680a
diff --git a/metadata/md5-cache/dev-python/astropy-2.0.1 b/metadata/md5-cache/dev-python/astropy-2.0.1
index b9a4078d03ab..c7f8a9c5d6aa 100644
--- a/metadata/md5-cache/dev-python/astropy-2.0.1
+++ b/metadata/md5-cache/dev-python/astropy-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat:0= dev-python/beautifulsoup:4[python_targets_python2_7(-)
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/astropy/astropy-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0e8ecd80bc39552a52000c105b87a4a9
diff --git a/metadata/md5-cache/dev-python/astropy-helpers-1.2 b/metadata/md5-cache/dev-python/astropy-helpers-1.2
index 2bd6c4d92dd1..168e9e0b0f28 100644
--- a/metadata/md5-cache/dev-python/astropy-helpers-1.2
+++ b/metadata/md5-cache/dev-python/astropy-helpers-1.2
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/a/astropy-helpers/astropy-helpers-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=19e554b6711fa9d3871d39f2908fc8d9
diff --git a/metadata/md5-cache/dev-python/astropy-helpers-1.3.1 b/metadata/md5-cache/dev-python/astropy-helpers-1.3.1
index 39060bb3c588..103f43498d80 100644
--- a/metadata/md5-cache/dev-python/astropy-helpers-1.3.1
+++ b/metadata/md5-cache/dev-python/astropy-helpers-1.3.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/a/astropy-helpers/astropy-helpers-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=41021c3edd8feafde1361f14badabd68
diff --git a/metadata/md5-cache/dev-python/astropy-helpers-2.0.1 b/metadata/md5-cache/dev-python/astropy-helpers-2.0.1
index 245fe4492627..78c4d33f37f5 100644
--- a/metadata/md5-cache/dev-python/astropy-helpers-2.0.1
+++ b/metadata/md5-cache/dev-python/astropy-helpers-2.0.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/a/astropy-helpers/astropy-helpers-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f13b132417803e8b11532d935b83578e
diff --git a/metadata/md5-cache/dev-python/astroquery-0.3.6 b/metadata/md5-cache/dev-python/astroquery-0.3.6
index 632e5910b65d..8c971743c52f 100644
--- a/metadata/md5-cache/dev-python/astroquery-0.3.6
+++ b/metadata/md5-cache/dev-python/astroquery-0.3.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/astropy/astroquery/archive/v0.3.6.tar.gz -> astroquery-0.3.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f0e1f2a1a48e785154aed38e6737e484
diff --git a/metadata/md5-cache/dev-python/astroscrappy-1.0.3 b/metadata/md5-cache/dev-python/astroscrappy-1.0.3
index 6c83a0f70797..456008aaa1dd 100644
--- a/metadata/md5-cache/dev-python/astroscrappy-1.0.3
+++ b/metadata/md5-cache/dev-python/astroscrappy-1.0.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/a/astroscrappy/astroscrappy-1.0.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3ab1ff788c8185d223cd8535b620836a
diff --git a/metadata/md5-cache/dev-python/astroscrappy-1.0.5 b/metadata/md5-cache/dev-python/astroscrappy-1.0.5
index f594d139a0dc..618b42317465 100644
--- a/metadata/md5-cache/dev-python/astroscrappy-1.0.5
+++ b/metadata/md5-cache/dev-python/astroscrappy-1.0.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/astroscrappy/astroscrappy-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=65a1c763e3ef4971c3354906e2b8dd44
diff --git a/metadata/md5-cache/dev-python/async_generator-1.10 b/metadata/md5-cache/dev-python/async_generator-1.10
index ac0734077710..66e5dcba6d0c 100644
--- a/metadata/md5-cache/dev-python/async_generator-1.10
+++ b/metadata/md5-cache/dev-python/async_generator-1.10
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/async_generator/async_generator-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1705b7278730865396079818a011fe83
diff --git a/metadata/md5-cache/dev-python/async_timeout-1.0.0 b/metadata/md5-cache/dev-python/async_timeout-1.0.0
index 474bcf6a2dcc..5f253689597e 100644
--- a/metadata/md5-cache/dev-python/async_timeout-1.0.0
+++ b/metadata/md5-cache/dev-python/async_timeout-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/async_timeout/async_timeout-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4cca78abd31db26fd80f064c534a6c30
diff --git a/metadata/md5-cache/dev-python/async_timeout-1.1.0 b/metadata/md5-cache/dev-python/async_timeout-1.1.0
index 53286f47826c..8333563a37af 100644
--- a/metadata/md5-cache/dev-python/async_timeout-1.1.0
+++ b/metadata/md5-cache/dev-python/async_timeout-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/async_timeout/async-timeout-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1d69f1c4d8053acdc537b827a946361d
diff --git a/metadata/md5-cache/dev-python/async_timeout-1.2.0 b/metadata/md5-cache/dev-python/async_timeout-1.2.0
index cd195ee52d51..c8138be9892f 100644
--- a/metadata/md5-cache/dev-python/async_timeout-1.2.0
+++ b/metadata/md5-cache/dev-python/async_timeout-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/async_timeout/async-timeout-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9cf20028608e1e2d976e54acbe55a625
diff --git a/metadata/md5-cache/dev-python/async_timeout-1.2.1 b/metadata/md5-cache/dev-python/async_timeout-1.2.1
index 939b043996df..d8574a7d7b07 100644
--- a/metadata/md5-cache/dev-python/async_timeout-1.2.1
+++ b/metadata/md5-cache/dev-python/async_timeout-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/async_timeout/async-timeout-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cb3badc8c0161edef692a97a75cdc490
diff --git a/metadata/md5-cache/dev-python/async_timeout-3.0.0 b/metadata/md5-cache/dev-python/async_timeout-3.0.0
index ff811356bef4..02735f45745d 100644
--- a/metadata/md5-cache/dev-python/async_timeout-3.0.0
+++ b/metadata/md5-cache/dev-python/async_timeout-3.0.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/async_timeout/async-timeout-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2764ca90d211db2d45777d422fbfe291
diff --git a/metadata/md5-cache/dev-python/atom-0.4.1 b/metadata/md5-cache/dev-python/atom-0.4.1
index db24c5486734..a39763d6497c 100644
--- a/metadata/md5-cache/dev-python/atom-0.4.1
+++ b/metadata/md5-cache/dev-python/atom-0.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/atom/atom-0.4.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=90819fa58e756269b7e0433c78416400
diff --git a/metadata/md5-cache/dev-python/atomicwrites-1.1.5-r2 b/metadata/md5-cache/dev-python/atomicwrites-1.1.5-r2
index be228fef1706..7bb62f939cf6 100644
--- a/metadata/md5-cache/dev-python/atomicwrites-1.1.5-r2
+++ b/metadata/md5-cache/dev-python/atomicwrites-1.1.5-r2
@@ -10,5 +10,5 @@ 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 )
 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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8d2d88610faa48752555eacc54e545e2
diff --git a/metadata/md5-cache/dev-python/atpublic-1.0 b/metadata/md5-cache/dev-python/atpublic-1.0
index 15bc94bafa70..d24c495e9cf4 100644
--- a/metadata/md5-cache/dev-python/atpublic-1.0
+++ b/metadata/md5-cache/dev-python/atpublic-1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/atpublic/atpublic-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7a8b8a6cb76be757e841b54a2b97e6aa
diff --git a/metadata/md5-cache/dev-python/atpy-0.9.7 b/metadata/md5-cache/dev-python/atpy-0.9.7
index 23ff8b367894..de51506c8079 100644
--- a/metadata/md5-cache/dev-python/atpy-0.9.7
+++ b/metadata/md5-cache/dev-python/atpy-0.9.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/A/ATpy/ATpy-0.9.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=2b66a519cc8953d41cc38a188de0e274
diff --git a/metadata/md5-cache/dev-python/attrdict-2.0.0 b/metadata/md5-cache/dev-python/attrdict-2.0.0
index a327b42ac6e4..02f226a27e88 100644
--- a/metadata/md5-cache/dev-python/attrdict-2.0.0
+++ b/metadata/md5-cache/dev-python/attrdict-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/attrdict/attrdict-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0036419632a84ba1ae132e81c21c6082
diff --git a/metadata/md5-cache/dev-python/attrs-16.3.0-r1 b/metadata/md5-cache/dev-python/attrs-16.3.0-r1
index e2acdd0bc521..709c47a0506a 100644
--- a/metadata/md5-cache/dev-python/attrs-16.3.0-r1
+++ b/metadata/md5-cache/dev-python/attrs-16.3.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/zope-interface[python_targets_pypy(-)?,python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/attrs/attrs-16.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=668d0cba68bccdea559cdec90380aa1c
diff --git a/metadata/md5-cache/dev-python/attrs-17.4.0 b/metadata/md5-cache/dev-python/attrs-17.4.0
index a475be21f857..6dfc084ba4c6 100644
--- a/metadata/md5-cache/dev-python/attrs-17.4.0
+++ b/metadata/md5-cache/dev-python/attrs-17.4.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/zope-interface[python_targets_pypy(-)?,python_targets_pypy3(-
 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/attrs/attrs-17.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=11dbb4399510505feb52c0c7c5a390a4
diff --git a/metadata/md5-cache/dev-python/attrs-18.1.0 b/metadata/md5-cache/dev-python/attrs-18.1.0
index e6af68aa65d6..9cbd4dec8bc8 100644
--- a/metadata/md5-cache/dev-python/attrs-18.1.0
+++ b/metadata/md5-cache/dev-python/attrs-18.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/zope-interface[python_targets_pypy(-)?,python_targets_pypy3(-
 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/attrs/attrs-18.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=83513a50768e80253ccf1f38f40491a1
diff --git a/metadata/md5-cache/dev-python/audioread-1.0.1-r1 b/metadata/md5-cache/dev-python/audioread-1.0.1-r1
index 407e207c75b8..5fa1bf39b141 100644
--- a/metadata/md5-cache/dev-python/audioread-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/audioread-1.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=|| ( dev-python/pymad media-video/ffmpeg ) python_targets_python2_7? ( >
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/audioread/audioread-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1e562c4e40b0974738e80a22d5deb702
diff --git a/metadata/md5-cache/dev-python/authres-0.800 b/metadata/md5-cache/dev-python/authres-0.800
index abe6757cf174..209532b67000 100644
--- a/metadata/md5-cache/dev-python/authres-0.800
+++ b/metadata/md5-cache/dev-python/authres-0.800
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/authres/authres-0.800.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f3e8351c702815485ac5d524d0fce450
diff --git a/metadata/md5-cache/dev-python/autobahn-17.10.1 b/metadata/md5-cache/dev-python/autobahn-17.10.1
index 4b610c0a2923..ad371273afe7 100644
--- a/metadata/md5-cache/dev-python/autobahn-17.10.1
+++ b/metadata/md5-cache/dev-python/autobahn-17.10.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-python/trollius-2.0[python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/autobahn/autobahn-17.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f800990b109633fff408394f3ae7e41b
diff --git a/metadata/md5-cache/dev-python/autobahn-17.5.1-r2 b/metadata/md5-cache/dev-python/autobahn-17.5.1-r2
index 36325599f027..e1ea15b7e402 100644
--- a/metadata/md5-cache/dev-python/autobahn-17.5.1-r2
+++ b/metadata/md5-cache/dev-python/autobahn-17.5.1-r2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-python/trollius-2.0[python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/autobahn/autobahn-17.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8b38fb146a2072acd2029d7120d688f3
diff --git a/metadata/md5-cache/dev-python/autobahn-17.9.1 b/metadata/md5-cache/dev-python/autobahn-17.9.1
index b4ab9186d930..b0a285752758 100644
--- a/metadata/md5-cache/dev-python/autobahn-17.9.1
+++ b/metadata/md5-cache/dev-python/autobahn-17.9.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-python/trollius-2.0[python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/autobahn/autobahn-17.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f800990b109633fff408394f3ae7e41b
diff --git a/metadata/md5-cache/dev-python/autobahn-17.9.2 b/metadata/md5-cache/dev-python/autobahn-17.9.2
index 91d955707ad9..362c3e9d894d 100644
--- a/metadata/md5-cache/dev-python/autobahn-17.9.2
+++ b/metadata/md5-cache/dev-python/autobahn-17.9.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-python/trollius-2.0[python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/autobahn/autobahn-17.9.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=f800990b109633fff408394f3ae7e41b
diff --git a/metadata/md5-cache/dev-python/autobahn-18.3.1 b/metadata/md5-cache/dev-python/autobahn-18.3.1
index 1833855479c5..d320d2ccc1c5 100644
--- a/metadata/md5-cache/dev-python/autobahn-18.3.1
+++ b/metadata/md5-cache/dev-python/autobahn-18.3.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-python/trollius-2.0[python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/autobahn/autobahn-18.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c488c965c24fd8288162c932624c2c70
diff --git a/metadata/md5-cache/dev-python/automat-0.5.0 b/metadata/md5-cache/dev-python/automat-0.5.0
index 8dcd962296e5..8dc304746b30 100644
--- a/metadata/md5-cache/dev-python/automat-0.5.0
+++ b/metadata/md5-cache/dev-python/automat-0.5.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/attrs[python_targets_pypy(-)?,python_targets_python2_7(-)?,py
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/A/Automat/Automat-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5e1b25796adef6ab8cd43d343f10a4ca
diff --git a/metadata/md5-cache/dev-python/automat-0.6.0 b/metadata/md5-cache/dev-python/automat-0.6.0
index 509427e009f5..5f297648abdf 100644
--- a/metadata/md5-cache/dev-python/automat-0.6.0
+++ b/metadata/md5-cache/dev-python/automat-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/attrs[python_targets_pypy(-)?,python_targets_python2_7(-)?,py
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/A/Automat/Automat-0.6.0.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=19fca607c0fa219fd9f3d9e2b3d0c322
diff --git a/metadata/md5-cache/dev-python/automat-0.7.0 b/metadata/md5-cache/dev-python/automat-0.7.0
index 3d41cb8f9e2f..b154ac95c9f1 100644
--- a/metadata/md5-cache/dev-python/automat-0.7.0
+++ b/metadata/md5-cache/dev-python/automat-0.7.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/attrs[python_targets_pypy(-)?,python_targets_python2_7(-)?,py
 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/Automat/Automat-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cf4376bef0d5f5a78d2a15b8dc4ba331
diff --git a/metadata/md5-cache/dev-python/automaton-0.8.0 b/metadata/md5-cache/dev-python/automaton-0.8.0
index 76fa4825169b..4e639e573f24 100644
--- a/metadata/md5-cache/dev-python/automaton-0.8.0
+++ b/metadata/md5-cache/dev-python/automaton-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/a/automaton/automaton-0.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7e2b77c12c151d821385444247acdb42
diff --git a/metadata/md5-cache/dev-python/automaton-1.12.1 b/metadata/md5-cache/dev-python/automaton-1.12.1
index f876fee44869..27ffeb966f88 100644
--- a/metadata/md5-cache/dev-python/automaton-1.12.1
+++ b/metadata/md5-cache/dev-python/automaton-1.12.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/automaton/automaton-1.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=aa67fa6820bcd2dade4aaa93d524b9fb
diff --git a/metadata/md5-cache/dev-python/autopep8-1.3.2 b/metadata/md5-cache/dev-python/autopep8-1.3.2
index a55afd35e96c..9b109467e639 100644
--- a/metadata/md5-cache/dev-python/autopep8-1.3.2
+++ b/metadata/md5-cache/dev-python/autopep8-1.3.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pep8-1.5.7[python_targets_pypy(-)?,python_targets_pypy3(-)?
 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/autopep8/autopep8-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8c0650dcb3e4ac8294eda9081dcbc914
diff --git a/metadata/md5-cache/dev-python/autopep8-1.3.3 b/metadata/md5-cache/dev-python/autopep8-1.3.3
index bbca9c7ec4dd..9f33813571ca 100644
--- a/metadata/md5-cache/dev-python/autopep8-1.3.3
+++ b/metadata/md5-cache/dev-python/autopep8-1.3.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pep8-1.5.7[python_targets_pypy(-)?,python_targets_pypy3(-)?
 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/autopep8/autopep8-1.3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=44184c4e1528b6f4409728b548fda8a5
diff --git a/metadata/md5-cache/dev-python/autopep8-1.3.5 b/metadata/md5-cache/dev-python/autopep8-1.3.5
index 486434aaac10..75fd25f15c8e 100644
--- a/metadata/md5-cache/dev-python/autopep8-1.3.5
+++ b/metadata/md5-cache/dev-python/autopep8-1.3.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pep8-1.5.7[python_targets_pypy(-)?,python_targets_pypy3(-)?
 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/autopep8/autopep8-1.3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d00f101b03d6fdea66a59872eecbec3d
diff --git a/metadata/md5-cache/dev-python/autopep8-1.4 b/metadata/md5-cache/dev-python/autopep8-1.4
index ec07044e5caf..b8830b121ca8 100644
--- a/metadata/md5-cache/dev-python/autopep8-1.4
+++ b/metadata/md5-cache/dev-python/autopep8-1.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pep8-1.5.7[python_targets_pypy(-)?,python_targets_pypy3(-)?
 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/autopep8/autopep8-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d00f101b03d6fdea66a59872eecbec3d
diff --git a/metadata/md5-cache/dev-python/autopep8-9999 b/metadata/md5-cache/dev-python/autopep8-9999
index 402f4b10995b..59fc44cb9435 100644
--- a/metadata/md5-cache/dev-python/autopep8-9999
+++ b/metadata/md5-cache/dev-python/autopep8-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=dev-python/pep8-1.5.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/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ce7d0b6dbbf6a62f2244a59acff336f9
diff --git a/metadata/md5-cache/dev-python/awscli-1.10.51 b/metadata/md5-cache/dev-python/awscli-1.10.51
index 49f66f33eb95..9e7388a7d7ce 100644
--- a/metadata/md5-cache/dev-python/awscli-1.10.51
+++ b/metadata/md5-cache/dev-python/awscli-1.10.51
@@ -10,5 +10,5 @@ RDEPEND=dev-python/botocore[python_targets_python2_7(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/a/awscli/awscli-1.10.51.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0006c26d908c9cb98cf9b3e72fa6e2a2
diff --git a/metadata/md5-cache/dev-python/awscli-1.10.53 b/metadata/md5-cache/dev-python/awscli-1.10.53
index 45c3be601112..46a30bbf3a7b 100644
--- a/metadata/md5-cache/dev-python/awscli-1.10.53
+++ b/metadata/md5-cache/dev-python/awscli-1.10.53
@@ -10,5 +10,5 @@ RDEPEND=dev-python/botocore[python_targets_python2_7(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/a/awscli/awscli-1.10.53.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0006c26d908c9cb98cf9b3e72fa6e2a2
diff --git a/metadata/md5-cache/dev-python/awscli-1.10.59 b/metadata/md5-cache/dev-python/awscli-1.10.59
index 23ee7384617f..5dbe3ad30d0f 100644
--- a/metadata/md5-cache/dev-python/awscli-1.10.59
+++ b/metadata/md5-cache/dev-python/awscli-1.10.59
@@ -10,5 +10,5 @@ RDEPEND=dev-python/botocore[python_targets_python2_7(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/a/awscli/awscli-1.10.59.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0006c26d908c9cb98cf9b3e72fa6e2a2
diff --git a/metadata/md5-cache/dev-python/awscli-1.11.0 b/metadata/md5-cache/dev-python/awscli-1.11.0
index e46253efb290..f08fbcf13f0b 100644
--- a/metadata/md5-cache/dev-python/awscli-1.11.0
+++ b/metadata/md5-cache/dev-python/awscli-1.11.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/botocore[python_targets_python2_7(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/a/awscli/awscli-1.11.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=65f3150276cd4456828bc9e8146762f0
diff --git a/metadata/md5-cache/dev-python/awscli-1.11.154 b/metadata/md5-cache/dev-python/awscli-1.11.154
index 9e0e6e1fcd3c..2e56db76495a 100644
--- a/metadata/md5-cache/dev-python/awscli-1.11.154
+++ b/metadata/md5-cache/dev-python/awscli-1.11.154
@@ -10,5 +10,5 @@ RDEPEND=dev-python/botocore[python_targets_python2_7(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/a/awscli/awscli-1.11.154.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7171d5f1828be8daecf1a3eb863780fd
diff --git a/metadata/md5-cache/dev-python/awscli-1.11.158 b/metadata/md5-cache/dev-python/awscli-1.11.158
index 8648c41bd37f..54ce5de60577 100644
--- a/metadata/md5-cache/dev-python/awscli-1.11.158
+++ b/metadata/md5-cache/dev-python/awscli-1.11.158
@@ -10,5 +10,5 @@ RDEPEND=dev-python/botocore[python_targets_python2_7(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/a/awscli/awscli-1.11.158.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7171d5f1828be8daecf1a3eb863780fd
diff --git a/metadata/md5-cache/dev-python/awscli-1.11.81 b/metadata/md5-cache/dev-python/awscli-1.11.81
index 07ea46fb94bd..730a32c8edfc 100644
--- a/metadata/md5-cache/dev-python/awscli-1.11.81
+++ b/metadata/md5-cache/dev-python/awscli-1.11.81
@@ -10,5 +10,5 @@ RDEPEND=dev-python/botocore[python_targets_python2_7(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/a/awscli/awscli-1.11.81.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=65f3150276cd4456828bc9e8146762f0
diff --git a/metadata/md5-cache/dev-python/awscli-1.14.16 b/metadata/md5-cache/dev-python/awscli-1.14.16
index fb7943308adf..955a80133c10 100644
--- a/metadata/md5-cache/dev-python/awscli-1.14.16
+++ b/metadata/md5-cache/dev-python/awscli-1.14.16
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/botocore-1.8.20[python_targets_python2_7(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/a/awscli/awscli-1.14.16.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=475ea8b4d02b121125de57592466e7e0
diff --git a/metadata/md5-cache/dev-python/awscli-1.14.50 b/metadata/md5-cache/dev-python/awscli-1.14.50
index 5e4a1fe3ce9a..cefd6c83990f 100644
--- a/metadata/md5-cache/dev-python/awscli-1.14.50
+++ b/metadata/md5-cache/dev-python/awscli-1.14.50
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/botocore-1.8.20[python_targets_python2_7(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/a/awscli/awscli-1.14.50.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=000095c11a9b7f2d7924a2d0cefbdca3
diff --git a/metadata/md5-cache/dev-python/awscli-1.15.10 b/metadata/md5-cache/dev-python/awscli-1.15.10
index b7fde804c9df..43d4e703e12a 100644
--- a/metadata/md5-cache/dev-python/awscli-1.15.10
+++ b/metadata/md5-cache/dev-python/awscli-1.15.10
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/botocore-1.8.20[python_targets_python2_7(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/awscli/awscli-1.15.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5e12a222188818586f065b7269d24623
diff --git a/metadata/md5-cache/dev-python/axiom-0.7.2 b/metadata/md5-cache/dev-python/axiom-0.7.2
index 457c6708fd5e..6f764223a1b8 100644
--- a/metadata/md5-cache/dev-python/axiom-0.7.2
+++ b/metadata/md5-cache/dev-python/axiom-0.7.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/epsilon-0.7.0[python_targets_python2_7(-)?,-python_single_t
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/A/Axiom/Axiom-0.7.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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f4bd87d59ef8d267a31694dd0d8cd964
diff --git a/metadata/md5-cache/dev-python/axiom-0.7.5 b/metadata/md5-cache/dev-python/axiom-0.7.5
index 2c6513ff3742..1064e33f68e6 100644
--- a/metadata/md5-cache/dev-python/axiom-0.7.5
+++ b/metadata/md5-cache/dev-python/axiom-0.7.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/epsilon-0.7.0[python_targets_python2_7(-)?,-python_single_t
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/A/Axiom/Axiom-0.7.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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=19cdd90c147f402e5f6c6ad6f7754724
diff --git a/metadata/md5-cache/dev-python/babelfish-0.5.5-r1 b/metadata/md5-cache/dev-python/babelfish-0.5.5-r1
index 132771b14311..2912dec0084b 100644
--- a/metadata/md5-cache/dev-python/babelfish-0.5.5-r1
+++ b/metadata/md5-cache/dev-python/babelfish-0.5.5-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-
 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/b/babelfish/babelfish-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=41b5c1c1288f678f2a719fa5062c8c9f
diff --git a/metadata/md5-cache/dev-python/babelfish-9999 b/metadata/md5-cache/dev-python/babelfish-9999
index 4b5b014f5534..a8aed9f6f56c 100644
--- a/metadata/md5-cache/dev-python/babelfish-9999
+++ b/metadata/md5-cache/dev-python/babelfish-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d3b2f2d8b7752060a89cdda2c0d312b6
diff --git a/metadata/md5-cache/dev-python/backports-1.0 b/metadata/md5-cache/dev-python/backports-1.0
index 5d23f3ddd6ea..7e2d132cce8a 100644
--- a/metadata/md5-cache/dev-python/backports-1.0
+++ b/metadata/md5-cache/dev-python/backports-1.0
@@ -10,5 +10,5 @@ RDEPEND=!<dev-python/backports-lzma-0.0.2-r1 python_targets_pypy? ( >=virtual/py
 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://dev.gentoo.org/~radhermit/dist/backports-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=da7ea390ddcef3a2be5b69eaf913cc46
diff --git a/metadata/md5-cache/dev-python/backports-abc-0.4 b/metadata/md5-cache/dev-python/backports-abc-0.4
index ce0ba2c9d800..21a2ffa9c76f 100644
--- a/metadata/md5-cache/dev-python/backports-abc-0.4
+++ b/metadata/md5-cache/dev-python/backports-abc-0.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports_abc/backports_abc-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5a9df74dc03b1b55a067445bc153f34d
diff --git a/metadata/md5-cache/dev-python/backports-csv-1.0.5 b/metadata/md5-cache/dev-python/backports-csv-1.0.5
index 56446043a381..b9fb5f27a26e 100644
--- a/metadata/md5-cache/dev-python/backports-csv-1.0.5
+++ b/metadata/md5-cache/dev-python/backports-csv-1.0.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/backports[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.csv/backports.csv-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=155b5a1f9e6666005f2902105f0a3a8d
diff --git a/metadata/md5-cache/dev-python/backports-functools-lru-cache-1.3 b/metadata/md5-cache/dev-python/backports-functools-lru-cache-1.3
index 508d1d5eae08..873ac0bababc 100644
--- a/metadata/md5-cache/dev-python/backports-functools-lru-cache-1.3
+++ b/metadata/md5-cache/dev-python/backports-functools-lru-cache-1.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=0
 SRC_URI=mirror://pypi/b/backports.functools_lru_cache/backports.functools_lru_cache-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2c99a51a3cf1355c646c60ccc4da7c78
diff --git a/metadata/md5-cache/dev-python/backports-functools-lru-cache-1.4-r1 b/metadata/md5-cache/dev-python/backports-functools-lru-cache-1.4-r1
index 418acb28cd58..9be37ee7851a 100644
--- a/metadata/md5-cache/dev-python/backports-functools-lru-cache-1.4-r1
+++ b/metadata/md5-cache/dev-python/backports-functools-lru-cache-1.4-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/backports[python_targets_pypy(-)?,python_targets_python2_7(-)
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.functools_lru_cache/backports.functools_lru_cache-1.4.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d4c66cad19bd0decc2687f35c7850928
diff --git a/metadata/md5-cache/dev-python/backports-functools-lru-cache-1.5 b/metadata/md5-cache/dev-python/backports-functools-lru-cache-1.5
index 81bd1642d5a5..e9ace094dce7 100644
--- a/metadata/md5-cache/dev-python/backports-functools-lru-cache-1.5
+++ b/metadata/md5-cache/dev-python/backports-functools-lru-cache-1.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/backports[python_targets_pypy(-)?,python_targets_python2_7(-)
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.functools_lru_cache/backports.functools_lru_cache-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b60fa8c88ee556861c7d02889ef89062
diff --git a/metadata/md5-cache/dev-python/backports-lzma-0.0.10 b/metadata/md5-cache/dev-python/backports-lzma-0.0.10
index 4f43b9622ce1..563e5663aec2 100644
--- a/metadata/md5-cache/dev-python/backports-lzma-0.0.10
+++ b/metadata/md5-cache/dev-python/backports-lzma-0.0.10
@@ -10,5 +10,5 @@ RDEPEND=app-arch/xz-utils:0= dev-python/backports[python_targets_pypy(-)?,python
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.lzma/backports.lzma-0.0.10.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=61e51c446b9f9a430605de43f5b927a4
diff --git a/metadata/md5-cache/dev-python/backports-lzma-0.0.12 b/metadata/md5-cache/dev-python/backports-lzma-0.0.12
index a7683c08810a..d755420329fd 100644
--- a/metadata/md5-cache/dev-python/backports-lzma-0.0.12
+++ b/metadata/md5-cache/dev-python/backports-lzma-0.0.12
@@ -10,5 +10,5 @@ RDEPEND=app-arch/xz-utils:0= dev-python/backports[python_targets_pypy(-)?,python
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.lzma/backports.lzma-0.0.12.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=43f7b14b96a9a30ed7a5f3461444318d
diff --git a/metadata/md5-cache/dev-python/backports-shutil_get_terminal_size-1.0.0-r1 b/metadata/md5-cache/dev-python/backports-shutil_get_terminal_size-1.0.0-r1
index 6ee2b07783e1..4d091043577f 100644
--- a/metadata/md5-cache/dev-python/backports-shutil_get_terminal_size-1.0.0-r1
+++ b/metadata/md5-cache/dev-python/backports-shutil_get_terminal_size-1.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/backports[python_targets_python2_7(-)?,-python_single_target_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.shutil_get_terminal_size/backports.shutil_get_terminal_size-1.0.0.tar.gz
-_eclasses_=desktop	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8597a6bfe9d9593d6cfff52fffaf54cf
diff --git a/metadata/md5-cache/dev-python/backports-shutil_which-3.5.1 b/metadata/md5-cache/dev-python/backports-shutil_which-3.5.1
index 577f27b4cd45..3ecf3b89f82c 100644
--- a/metadata/md5-cache/dev-python/backports-shutil_which-3.5.1
+++ b/metadata/md5-cache/dev-python/backports-shutil_which-3.5.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/backports[python_targets_python2_7(-)?,-python_single_target_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.shutil_which/backports.shutil_which-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8c83f7ec7c35bc29f3df2d1e2c323ef2
diff --git a/metadata/md5-cache/dev-python/backports-ssl-match-hostname-3.5.0.1-r1 b/metadata/md5-cache/dev-python/backports-ssl-match-hostname-3.5.0.1-r1
index edb5d94af21d..67cec86a5880 100644
--- a/metadata/md5-cache/dev-python/backports-ssl-match-hostname-3.5.0.1-r1
+++ b/metadata/md5-cache/dev-python/backports-ssl-match-hostname-3.5.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/backports[python_targets_pypy(-)?,python_targets_python2_7(-)
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.ssl_match_hostname/backports.ssl_match_hostname-3.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7c777d436b485837d8c84fcfa68d1d22
diff --git a/metadata/md5-cache/dev-python/backports-unittest-mock-1.3 b/metadata/md5-cache/dev-python/backports-unittest-mock-1.3
index 264ad3e71a67..033e7a373583 100644
--- a/metadata/md5-cache/dev-python/backports-unittest-mock-1.3
+++ b/metadata/md5-cache/dev-python/backports-unittest-mock-1.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/backports[python_targets_pypy(-)?,python_targets_pypy3(-)?,py
 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/backports.unittest_mock/backports.unittest_mock-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8832b2bc6f06c0d9d6d3204830ffc586
diff --git a/metadata/md5-cache/dev-python/bandit-0.13.2-r1 b/metadata/md5-cache/dev-python/bandit-0.13.2-r1
index f6bb9f2fba55..7a891b2abdb3 100644
--- a/metadata/md5-cache/dev-python/bandit-0.13.2-r1
+++ b/metadata/md5-cache/dev-python/bandit-0.13.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.3.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bandit/bandit-0.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5728e092f9e775485809ae54afd90a8c
diff --git a/metadata/md5-cache/dev-python/bandit-1.0.1 b/metadata/md5-cache/dev-python/bandit-1.0.1
index ea0f515a047d..b8f046e76b3c 100644
--- a/metadata/md5-cache/dev-python/bandit-1.0.1
+++ b/metadata/md5-cache/dev-python/bandit-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bandit/bandit-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=508787fd58c7da627be131d30728d0c9
diff --git a/metadata/md5-cache/dev-python/bandit-1.1.0 b/metadata/md5-cache/dev-python/bandit-1.1.0
index 0333d35ba6c7..2e85c6a95cd9 100644
--- a/metadata/md5-cache/dev-python/bandit-1.1.0
+++ b/metadata/md5-cache/dev-python/bandit-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bandit/bandit-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4ca7006703d61db6f8b3cda177ba4b72
diff --git a/metadata/md5-cache/dev-python/bandit-1.2.0 b/metadata/md5-cache/dev-python/bandit-1.2.0
index 2d2060ddef98..4db0ea1fa1cf 100644
--- a/metadata/md5-cache/dev-python/bandit-1.2.0
+++ b/metadata/md5-cache/dev-python/bandit-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bandit/bandit-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fe2e2924954ce44f542605437c4add97
diff --git a/metadata/md5-cache/dev-python/bandit-1.3.0 b/metadata/md5-cache/dev-python/bandit-1.3.0
index c21616787754..fe0d798916f3 100644
--- a/metadata/md5-cache/dev-python/bandit-1.3.0
+++ b/metadata/md5-cache/dev-python/bandit-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bandit/bandit-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9b065ee8f3afd224bf6d2088a544fc3e
diff --git a/metadata/md5-cache/dev-python/bandit-1.4.0 b/metadata/md5-cache/dev-python/bandit-1.4.0
index 747a92b55aa9..fa07fe34ea87 100644
--- a/metadata/md5-cache/dev-python/bandit-1.4.0
+++ b/metadata/md5-cache/dev-python/bandit-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bandit/bandit-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=05121f52d0a61962e0039362f9cbd047
diff --git a/metadata/md5-cache/dev-python/basemap-1.0.7-r1 b/metadata/md5-cache/dev-python/basemap-1.0.7-r1
index 5e3ebd565ec9..e09beb088909 100644
--- a/metadata/md5-cache/dev-python/basemap-1.0.7-r1
+++ b/metadata/md5-cache/dev-python/basemap-1.0.7-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/matplotlib/basemap-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=460ca4056d85679f5798278461042ce1
diff --git a/metadata/md5-cache/dev-python/basemap-1.0.7-r2 b/metadata/md5-cache/dev-python/basemap-1.0.7-r2
index 5e27d30a0070..e2550de4c311 100644
--- a/metadata/md5-cache/dev-python/basemap-1.0.7-r2
+++ b/metadata/md5-cache/dev-python/basemap-1.0.7-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/matplotlib/basemap-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e9d1af2cdde4c731940ae69b53611b25
diff --git a/metadata/md5-cache/dev-python/bashate-0.3.1 b/metadata/md5-cache/dev-python/bashate-0.3.1
index 59c2544391bd..73540911dfa5 100644
--- a/metadata/md5-cache/dev-python/bashate-0.3.1
+++ b/metadata/md5-cache/dev-python/bashate-0.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/bashate/bashate-0.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=61269972e959a26f5f8e508948d7fb1b
diff --git a/metadata/md5-cache/dev-python/basho-erlastic-2.1.1 b/metadata/md5-cache/dev-python/basho-erlastic-2.1.1
index f07b6bccf7eb..35eb42889aa0 100644
--- a/metadata/md5-cache/dev-python/basho-erlastic-2.1.1
+++ b/metadata/md5-cache/dev-python/basho-erlastic-2.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/basho-erlastic/basho-erlastic-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=41636dc5bbb88daf9074b96cf852f035
diff --git a/metadata/md5-cache/dev-python/batinfo-0.3 b/metadata/md5-cache/dev-python/batinfo-0.3
index b10c32e51a0a..c502578901fd 100644
--- a/metadata/md5-cache/dev-python/batinfo-0.3
+++ b/metadata/md5-cache/dev-python/batinfo-0.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/batinfo/batinfo-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fd7b7e7090212e8731ca054bfed39e32
diff --git a/metadata/md5-cache/dev-python/batinfo-0.4.2 b/metadata/md5-cache/dev-python/batinfo-0.4.2
index 86d9e3e395af..f75aa03ef6e7 100644
--- a/metadata/md5-cache/dev-python/batinfo-0.4.2
+++ b/metadata/md5-cache/dev-python/batinfo-0.4.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/batinfo/batinfo-0.4.2.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8c92916b43b5856192fb486b1985599f
diff --git a/metadata/md5-cache/dev-python/bcolz-1.1.0 b/metadata/md5-cache/dev-python/bcolz-1.1.0
index fa14f98271cc..f25ff474a3ba 100644
--- a/metadata/md5-cache/dev-python/bcolz-1.1.0
+++ b/metadata/md5-cache/dev-python/bcolz-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/numpy-1.7[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bcolz/bcolz-1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0aaba9932ad784b024369e5ad823b3e2
diff --git a/metadata/md5-cache/dev-python/bcolz-1.1.2 b/metadata/md5-cache/dev-python/bcolz-1.1.2
index 439c932edfad..e4ba1c8e4056 100644
--- a/metadata/md5-cache/dev-python/bcolz-1.1.2
+++ b/metadata/md5-cache/dev-python/bcolz-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/c-blosc:= dev-python/numpy[python_targets_python2_7(-)?,python_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bcolz/bcolz-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3f4d9763a6739fb13fd0e39b9948f0c5
diff --git a/metadata/md5-cache/dev-python/bcrypt-3.1.3 b/metadata/md5-cache/dev-python/bcrypt-3.1.3
index d9183454f340..02be49a9b43c 100644
--- a/metadata/md5-cache/dev-python/bcrypt-3.1.3
+++ b/metadata/md5-cache/dev-python/bcrypt-3.1.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-python/cffi-1.1:=[python_targets_pytho
 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/b/bcrypt/bcrypt-3.1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=799b7d05f6aaab89d800daf4c06be284
diff --git a/metadata/md5-cache/dev-python/bcrypt-3.1.4 b/metadata/md5-cache/dev-python/bcrypt-3.1.4
index 32b37c0bc7e8..3ebff4c2ac94 100644
--- a/metadata/md5-cache/dev-python/bcrypt-3.1.4
+++ b/metadata/md5-cache/dev-python/bcrypt-3.1.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-python/cffi-1.1:=[python_targets_pytho
 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/b/bcrypt/bcrypt-3.1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3ef3502bb252340e94b126ebeabb55f1
diff --git a/metadata/md5-cache/dev-python/beagle-0.2.1 b/metadata/md5-cache/dev-python/beagle-0.2.1
index 348fca67eb44..7bf03785045f 100644
--- a/metadata/md5-cache/dev-python/beagle-0.2.1
+++ b/metadata/md5-cache/dev-python/beagle-0.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_5(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/beagle/beagle-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=79c12f64738944ca2805fd51f967ec99
diff --git a/metadata/md5-cache/dev-python/beaker-1.6.4-r1 b/metadata/md5-cache/dev-python/beaker-1.6.4-r1
index b466aa1c362c..dedf2e8aaf96 100644
--- a/metadata/md5-cache/dev-python/beaker-1.6.4-r1
+++ b/metadata/md5-cache/dev-python/beaker-1.6.4-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=mirror://pypi/B/Beaker/Beaker-1.6.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a3e4de1f96e810ad746c9dd2131baf0b
diff --git a/metadata/md5-cache/dev-python/beaker-1.8.1 b/metadata/md5-cache/dev-python/beaker-1.8.1
index fb81e0937599..8b46af4a1f78 100644
--- a/metadata/md5-cache/dev-python/beaker-1.8.1
+++ b/metadata/md5-cache/dev-python/beaker-1.8.1
@@ -10,5 +10,5 @@ RDEPEND=virtual/python-funcsigs[python_targets_python2_7(-)?,python_targets_pyth
 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/bbangert/beaker/archive/1.8.1.tar.gz -> beaker-1.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=da769b8504ebabd63af8fc90d64fd308
diff --git a/metadata/md5-cache/dev-python/beanstalkc-0.4.0 b/metadata/md5-cache/dev-python/beanstalkc-0.4.0
index c23800f33b07..6ae85d4b8c8e 100644
--- a/metadata/md5-cache/dev-python/beanstalkc-0.4.0
+++ b/metadata/md5-cache/dev-python/beanstalkc-0.4.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/beanstalkc/beanstalkc-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b0b78a3973ace868697d23b6c5886e0c
diff --git a/metadata/md5-cache/dev-python/beanstalkc-0.4.0-r1 b/metadata/md5-cache/dev-python/beanstalkc-0.4.0-r1
index 4a750d7a1cee..a5fbdb7a6e84 100644
--- a/metadata/md5-cache/dev-python/beanstalkc-0.4.0-r1
+++ b/metadata/md5-cache/dev-python/beanstalkc-0.4.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyyaml[python_targets_pypy(-)?,python_targets_python2_7(-)?,-
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/beanstalkc/beanstalkc-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8c4988893569763470fc4051d0d97bf5
diff --git a/metadata/md5-cache/dev-python/beautifulsoup-3.2.1-r1 b/metadata/md5-cache/dev-python/beautifulsoup-3.2.1-r1
index b2bf37dd8855..2c160668666d 100644
--- a/metadata/md5-cache/dev-python/beautifulsoup-3.2.1-r1
+++ b/metadata/md5-cache/dev-python/beautifulsoup-3.2.1-r1
@@ -10,5 +10,5 @@ RDEPEND=!dev-python/beautifulsoup:0 python_targets_pypy? ( >=virtual/pypy-5:0= )
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=python-2
 SRC_URI=https://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=59f131ce348777a4fa105930bbdeec73
diff --git a/metadata/md5-cache/dev-python/beautifulsoup-4.5.1 b/metadata/md5-cache/dev-python/beautifulsoup-4.5.1
index 7a360d70c595..66b71c537b86 100644
--- a/metadata/md5-cache/dev-python/beautifulsoup-4.5.1
+++ b/metadata/md5-cache/dev-python/beautifulsoup-4.5.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( dev-python/html5lib[python_targets_pypy(-)?,-pyth
 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=4
 SRC_URI=mirror://pypi/b/beautifulsoup4/beautifulsoup4-4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=371a25c1c1a344df58ce911aab9e5d00
diff --git a/metadata/md5-cache/dev-python/behave-1.2.5-r1 b/metadata/md5-cache/dev-python/behave-1.2.5-r1
index b468ce2e3433..aab868bb95b4 100644
--- a/metadata/md5-cache/dev-python/behave-1.2.5-r1
+++ b/metadata/md5-cache/dev-python/behave-1.2.5-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/parse-1.6.3[python_targets_python2_7(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/behave/behave-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=94b3b4d14efcd3e420afb7d1e31a0971
diff --git a/metadata/md5-cache/dev-python/bert-2.0.0 b/metadata/md5-cache/dev-python/bert-2.0.0
index bd0b76115927..f9c11304b2af 100644
--- a/metadata/md5-cache/dev-python/bert-2.0.0
+++ b/metadata/md5-cache/dev-python/bert-2.0.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bert/bert-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=193f0243d556b8efa7bb2fde242a3b31
diff --git a/metadata/md5-cache/dev-python/betamax-0.8.0 b/metadata/md5-cache/dev-python/betamax-0.8.0
index b1af719d8f32..5353c267395b 100644
--- a/metadata/md5-cache/dev-python/betamax-0.8.0
+++ b/metadata/md5-cache/dev-python/betamax-0.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/betamax/betamax-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b901f07ff618e20a61911a299edac4b7
diff --git a/metadata/md5-cache/dev-python/bibtexparser-0.6.2 b/metadata/md5-cache/dev-python/bibtexparser-0.6.2
index c769018a409a..a1188f7d72fa 100644
--- a/metadata/md5-cache/dev-python/bibtexparser-0.6.2
+++ b/metadata/md5-cache/dev-python/bibtexparser-0.6.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3
 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/sciunto-org/python-bibtexparser/archive/v0.6.2.tar.gz -> bibtexparser-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cc128c98abc87d55f17fbd77672db53c
diff --git a/metadata/md5-cache/dev-python/bicyclerepair-0.9-r3 b/metadata/md5-cache/dev-python/bicyclerepair-0.9-r3
index da067924bc85..1f34e555435f 100644
--- a/metadata/md5-cache/dev-python/bicyclerepair-0.9-r3
+++ b/metadata/md5-cache/dev-python/bicyclerepair-0.9-r3
@@ -10,5 +10,5 @@ RDEPEND=emacs? ( app-emacs/pymacs[python_targets_python2_7(-)?,-python_single_ta
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/bicyclerepair/bicyclerepair-0.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	elisp-common	23f47b2e1de7abf387105eddd1318738	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	elisp-common	23f47b2e1de7abf387105eddd1318738	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_=9ee8de2b3a79e2f228935cf28d8fce31
diff --git a/metadata/md5-cache/dev-python/billiard-3.3.0.23 b/metadata/md5-cache/dev-python/billiard-3.3.0.23
index fd47ad8e6f1a..005500f4cfda 100644
--- a/metadata/md5-cache/dev-python/billiard-3.3.0.23
+++ b/metadata/md5-cache/dev-python/billiard-3.3.0.23
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/b/billiard/billiard-3.3.0.23.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=38a20d535fb7530c76f5a965e29195e6
diff --git a/metadata/md5-cache/dev-python/billiard-3.5.0.0 b/metadata/md5-cache/dev-python/billiard-3.5.0.0
index 0f87751dad73..eba03111d88c 100644
--- a/metadata/md5-cache/dev-python/billiard-3.5.0.0
+++ b/metadata/md5-cache/dev-python/billiard-3.5.0.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/billiard/billiard-3.5.0.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4a805ea3cf47a3d74a98349503c7ee89
diff --git a/metadata/md5-cache/dev-python/billiard-3.5.0.2 b/metadata/md5-cache/dev-python/billiard-3.5.0.2
index 8613af0b8465..9eb4a3dff25c 100644
--- a/metadata/md5-cache/dev-python/billiard-3.5.0.2
+++ b/metadata/md5-cache/dev-python/billiard-3.5.0.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/billiard/billiard-3.5.0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2e5f66c18643be991166709918855faf
diff --git a/metadata/md5-cache/dev-python/binaryornot-0.4.3 b/metadata/md5-cache/dev-python/binaryornot-0.4.3
index 9670f852d6a9..80303bfb50bc 100644
--- a/metadata/md5-cache/dev-python/binaryornot-0.4.3
+++ b/metadata/md5-cache/dev-python/binaryornot-0.4.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/chardet-3.0.2[python_targets_python2_7(-)?,python_targets_p
 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/audreyr/binaryornot/archive/0.4.3.tar.gz -> binaryornot-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c675fde8740df982e738f19b312a6c59
diff --git a/metadata/md5-cache/dev-python/biplist-1.0.1 b/metadata/md5-cache/dev-python/biplist-1.0.1
index db7108089953..44a97728f06b 100644
--- a/metadata/md5-cache/dev-python/biplist-1.0.1
+++ b/metadata/md5-cache/dev-python/biplist-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,pyth
 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/b/biplist/biplist-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=99c6084ad40c31d46ecf4fcb79448f62
diff --git a/metadata/md5-cache/dev-python/biplist-1.0.2 b/metadata/md5-cache/dev-python/biplist-1.0.2
index 82af4461b802..ef11413af7b0 100644
--- a/metadata/md5-cache/dev-python/biplist-1.0.2
+++ b/metadata/md5-cache/dev-python/biplist-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,pyth
 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/b/biplist/biplist-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=66ce9cde18a8e981ab8f8c2e796a13fb
diff --git a/metadata/md5-cache/dev-python/bitarray-0.8.1 b/metadata/md5-cache/dev-python/bitarray-0.8.1
index 59d4ffd29f4d..8b556e3622ac 100644
--- a/metadata/md5-cache/dev-python/bitarray-0.8.1
+++ b/metadata/md5-cache/dev-python/bitarray-0.8.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bitarray/bitarray-0.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=be82568e5ef99bd866e38adf30fcec29
diff --git a/metadata/md5-cache/dev-python/bitarray-0.8.3 b/metadata/md5-cache/dev-python/bitarray-0.8.3
index 798a9b888ea2..1bc9aabf7f84 100644
--- a/metadata/md5-cache/dev-python/bitarray-0.8.3
+++ b/metadata/md5-cache/dev-python/bitarray-0.8.3
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bitarray/bitarray-0.8.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=98510925585e6cc62231f8b5a1546721
diff --git a/metadata/md5-cache/dev-python/bitstring-3.1.5 b/metadata/md5-cache/dev-python/bitstring-3.1.5
index dede72a6c121..6833d5be7c29 100644
--- a/metadata/md5-cache/dev-python/bitstring-3.1.5
+++ b/metadata/md5-cache/dev-python/bitstring-3.1.5
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/scott-griffiths/bitstring/archive/bitstring-3.1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=108765361f2ae67566b386249fd5d592
diff --git a/metadata/md5-cache/dev-python/bjoern-1.3.2 b/metadata/md5-cache/dev-python/bjoern-1.3.2
index c6684fa313bd..4bf41c127821 100644
--- a/metadata/md5-cache/dev-python/bjoern-1.3.2
+++ b/metadata/md5-cache/dev-python/bjoern-1.3.2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libev net-libs/http-parser python_targets_python2_7? ( >=dev-la
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bjoern/bjoern-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5362cc037d7c0303d9c7e743a62bc0af
diff --git a/metadata/md5-cache/dev-python/bjoern-1.4.3 b/metadata/md5-cache/dev-python/bjoern-1.4.3
index 7a2edd75e3ec..22c675e18612 100644
--- a/metadata/md5-cache/dev-python/bjoern-1.4.3
+++ b/metadata/md5-cache/dev-python/bjoern-1.4.3
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libev net-libs/http-parser python_targets_python2_7? ( >=dev-la
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bjoern/bjoern-1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bc0c539bd393f5ff21588b603448c15c
diff --git a/metadata/md5-cache/dev-python/blaze-0.10.2 b/metadata/md5-cache/dev-python/blaze-0.10.2
index 23c3d1b7b562..3b44b51b7cd7 100644
--- a/metadata/md5-cache/dev-python/blaze-0.10.2
+++ b/metadata/md5-cache/dev-python/blaze-0.10.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/datashape[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/ContinuumIO/blaze/archive/0.10.2.tar.gz -> blaze-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=132c17db7be19347410282003eda3d34
diff --git a/metadata/md5-cache/dev-python/blaze-0.11.3 b/metadata/md5-cache/dev-python/blaze-0.11.3
index c55f3424d224..2c1bc0dde8d6 100644
--- a/metadata/md5-cache/dev-python/blaze-0.11.3
+++ b/metadata/md5-cache/dev-python/blaze-0.11.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/bcolz[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/blaze/blaze/archive/0.11.3.tar.gz -> blaze-0.11.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=893402a4a4bda1776ea230611781723f
diff --git a/metadata/md5-cache/dev-python/bleach-1.5.0 b/metadata/md5-cache/dev-python/bleach-1.5.0
index 352a6fa3310d..bc56503b9f31 100644
--- a/metadata/md5-cache/dev-python/bleach-1.5.0
+++ b/metadata/md5-cache/dev-python/bleach-1.5.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/html5lib-0.999[python_targets_pypy(-)?,python_targets_pypy3
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bleach/bleach-1.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d712a10b15db677690051ce6f92caa4f
diff --git a/metadata/md5-cache/dev-python/bleach-2.1.1 b/metadata/md5-cache/dev-python/bleach-2.1.1
deleted file mode 100644
index 61a0f8640d47..000000000000
--- a/metadata/md5-cache/dev-python/bleach-2.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/html5lib-0.99999999[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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/pytest-3.0.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(-)] ) 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=an easy whitelist-based HTML-sanitizing tool
-EAPI=6
-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
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/html5lib-0.99999999[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/b/bleach/bleach-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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=f118819a08b338f81694bf531b8ee15f
diff --git a/metadata/md5-cache/dev-python/bleach-2.1.3 b/metadata/md5-cache/dev-python/bleach-2.1.3
index fa5daccb8c36..a6ca2777a725 100644
--- a/metadata/md5-cache/dev-python/bleach-2.1.3
+++ b/metadata/md5-cache/dev-python/bleach-2.1.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/html5lib-0.99999999[python_targets_pypy(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bleach/bleach-2.1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=99e54d604f13ed7f9c3c0780376047bc
diff --git a/metadata/md5-cache/dev-python/bleach-3.0.0 b/metadata/md5-cache/dev-python/bleach-3.0.0
new file mode 100644
index 000000000000..da6ca4b4581b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/bleach-3.0.0
@@ -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.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/blessings-1.6-r1 b/metadata/md5-cache/dev-python/blessings-1.6-r1
index ae8f62203a00..d6cabefeecb2 100644
--- a/metadata/md5-cache/dev-python/blessings-1.6-r1
+++ b/metadata/md5-cache/dev-python/blessings-1.6-r1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/b/blessings/blessings-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e0e90578af0e0a10aaf5c1a2d728529d
diff --git a/metadata/md5-cache/dev-python/blessings-1.6.1 b/metadata/md5-cache/dev-python/blessings-1.6.1
index 89a1c297e765..f6656f466517 100644
--- a/metadata/md5-cache/dev-python/blessings-1.6.1
+++ b/metadata/md5-cache/dev-python/blessings-1.6.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/b/blessings/blessings-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9a16dccbf9406ffe0551f9b9f88bdf10
diff --git a/metadata/md5-cache/dev-python/blinker-1.4 b/metadata/md5-cache/dev-python/blinker-1.4
index e63e74a42002..39531a40d3ca 100644
--- a/metadata/md5-cache/dev-python/blinker-1.4
+++ b/metadata/md5-cache/dev-python/blinker-1.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/blinker/blinker-1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=57cccc86b150847de998bd1b9e527778
diff --git a/metadata/md5-cache/dev-python/blockcanvas-4.0.3-r1 b/metadata/md5-cache/dev-python/blockcanvas-4.0.3-r1
index 93f077a19a18..b02b91749b1f 100644
--- a/metadata/md5-cache/dev-python/blockcanvas-4.0.3-r1
+++ b/metadata/md5-cache/dev-python/blockcanvas-4.0.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.enthought.com/repo/ets/blockcanvas-4.0.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5a68853c24decc4f1c5610e4cea2af43
diff --git a/metadata/md5-cache/dev-python/blockdiag-1.5.3-r1 b/metadata/md5-cache/dev-python/blockdiag-1.5.3-r1
index 6839a09d2beb..9ddf116b8c2a 100644
--- a/metadata/md5-cache/dev-python/blockdiag-1.5.3-r1
+++ b/metadata/md5-cache/dev-python/blockdiag-1.5.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/funcparserlib-0.3.6[python_targets_python2_7(-)?,python_tar
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/blockdiag/blockdiag-1.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=07f8799d768851fcb81b7af98550e08d
diff --git a/metadata/md5-cache/dev-python/blosc-1.2.8 b/metadata/md5-cache/dev-python/blosc-1.2.8
index 6b18eaafe23f..f1e93e85a62e 100644
--- a/metadata/md5-cache/dev-python/blosc-1.2.8
+++ b/metadata/md5-cache/dev-python/blosc-1.2.8
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/c-blosc-1.3.5 python_targets_python2_7? ( >=dev-lang/python-2
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/blosc/blosc-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=dbbf16781d7c6e2e18756db330b88578
diff --git a/metadata/md5-cache/dev-python/blosc-1.4.4 b/metadata/md5-cache/dev-python/blosc-1.4.4
index 709b306f26ad..b03ce357015c 100644
--- a/metadata/md5-cache/dev-python/blosc-1.4.4
+++ b/metadata/md5-cache/dev-python/blosc-1.4.4
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/c-blosc:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/blosc/blosc-1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0dd503e35bd7baff05b665d7f18258ad
diff --git a/metadata/md5-cache/dev-python/blosc-1.5.0 b/metadata/md5-cache/dev-python/blosc-1.5.0
index 0fe1eb1bec1e..88a91d4b4ce4 100644
--- a/metadata/md5-cache/dev-python/blosc-1.5.0
+++ b/metadata/md5-cache/dev-python/blosc-1.5.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/c-blosc:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/blosc/blosc-1.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f302bc0deced4b942f1723c88e18c909
diff --git a/metadata/md5-cache/dev-python/blosc-1.5.1 b/metadata/md5-cache/dev-python/blosc-1.5.1
index 6c38009a8b51..d0209a9d0233 100644
--- a/metadata/md5-cache/dev-python/blosc-1.5.1
+++ b/metadata/md5-cache/dev-python/blosc-1.5.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/c-blosc:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/blosc/blosc-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f302bc0deced4b942f1723c88e18c909
diff --git a/metadata/md5-cache/dev-python/bluelet-0.2.0 b/metadata/md5-cache/dev-python/bluelet-0.2.0
index 081f310603bd..8ea435d44149 100644
--- a/metadata/md5-cache/dev-python/bluelet-0.2.0
+++ b/metadata/md5-cache/dev-python/bluelet-0.2.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/sampsyo/bluelet/archive/v0.2.0.tar.gz -> bluelet-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d2c42865f12ce171d6a05819817f6608
diff --git a/metadata/md5-cache/dev-python/bokeh-0.11.1 b/metadata/md5-cache/dev-python/bokeh-0.11.1
index b181969f60a9..c83583757cd0 100644
--- a/metadata/md5-cache/dev-python/bokeh-0.11.1
+++ b/metadata/md5-cache/dev-python/bokeh-0.11.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/abstract_rendering[python_targets_python2_7(-)?,python_target
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bokeh/bokeh-0.11.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9c2c02a61c476afca186ce7fbc4a12a3
diff --git a/metadata/md5-cache/dev-python/bokeh-0.12.6 b/metadata/md5-cache/dev-python/bokeh-0.12.6
index 37d3568fcb6e..a7c3c286bf19 100644
--- a/metadata/md5-cache/dev-python/bokeh-0.12.6
+++ b/metadata/md5-cache/dev-python/bokeh-0.12.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bokeh/bokeh-0.12.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f8990ef40aeeb49b24fe6fe84fe40b4e
diff --git a/metadata/md5-cache/dev-python/boto-2.41.0 b/metadata/md5-cache/dev-python/boto-2.41.0
index fc71adab2a43..8a0565e3c6ca 100644
--- a/metadata/md5-cache/dev-python/boto-2.41.0
+++ b/metadata/md5-cache/dev-python/boto-2.41.0
@@ -11,5 +11,5 @@ REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/boto/boto-2.41.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=da3bf4a7acab88a8b8c8af6c647f0f81
diff --git a/metadata/md5-cache/dev-python/boto-2.48.0 b/metadata/md5-cache/dev-python/boto-2.48.0
index 8db8bf2d0bc7..47aa18b913ee 100644
--- a/metadata/md5-cache/dev-python/boto-2.48.0
+++ b/metadata/md5-cache/dev-python/boto-2.48.0
@@ -11,5 +11,5 @@ REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/boto/boto-2.48.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3f3efb8e48110c983711cd5fc2eb8c2e
diff --git a/metadata/md5-cache/dev-python/boto3-1.7.19 b/metadata/md5-cache/dev-python/boto3-1.7.19
index 2e6821168dc6..1c2f7e4d7790 100644
--- a/metadata/md5-cache/dev-python/boto3-1.7.19
+++ b/metadata/md5-cache/dev-python/boto3-1.7.19
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/botocore-1.10.19[python_targets_python2_7(-)?,python_target
 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/boto/boto3/archive/1.7.19.tar.gz -> boto3-1.7.19.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=35e803b63910464211a4fb23c88c8631
diff --git a/metadata/md5-cache/dev-python/boto3-1.7.35 b/metadata/md5-cache/dev-python/boto3-1.7.35
index 06c6c1391a4d..318a5d1e0030 100644
--- a/metadata/md5-cache/dev-python/boto3-1.7.35
+++ b/metadata/md5-cache/dev-python/boto3-1.7.35
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/botocore-1.10.35[python_targets_python2_7(-)?,python_target
 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/boto/boto3/archive/1.7.35.tar.gz -> boto3-1.7.35.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e5dd06b76d9d6085494782aeecf384b5
diff --git a/metadata/md5-cache/dev-python/boto3-1.9.4 b/metadata/md5-cache/dev-python/boto3-1.9.4
index 978fd9b92264..6f9b47fffc98 100644
--- a/metadata/md5-cache/dev-python/boto3-1.9.4
+++ b/metadata/md5-cache/dev-python/boto3-1.9.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/botocore-1.12.4[python_targets_python2_7(-)?,python_targets
 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/boto/boto3/archive/1.9.4.tar.gz -> boto3-1.9.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9fde4d39ec1070c1ea141692aaaa71a5
diff --git a/metadata/md5-cache/dev-python/boto3-1.9.4-r1 b/metadata/md5-cache/dev-python/boto3-1.9.4-r1
index 6f22eaf8bac0..01ff2786eef8 100644
--- a/metadata/md5-cache/dev-python/boto3-1.9.4-r1
+++ b/metadata/md5-cache/dev-python/boto3-1.9.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/botocore-1.12.4[python_targets_python2_7(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/boto/boto3/archive/1.9.4.tar.gz -> boto3-1.9.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4c991de8ec49c8313ab12dae1b3fc319
diff --git a/metadata/md5-cache/dev-python/boto3-9999 b/metadata/md5-cache/dev-python/boto3-9999
index 17e2a0859fa3..8ec205c69c97 100644
--- a/metadata/md5-cache/dev-python/boto3-9999
+++ b/metadata/md5-cache/dev-python/boto3-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-python/botocore-1.12.4[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/jmespath[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/s3transfer[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
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4c991de8ec49c8313ab12dae1b3fc319
diff --git a/metadata/md5-cache/dev-python/botocore-1.10.19 b/metadata/md5-cache/dev-python/botocore-1.10.19
index 3378ab4b3c07..d88fa8bca038 100644
--- a/metadata/md5-cache/dev-python/botocore-1.10.19
+++ b/metadata/md5-cache/dev-python/botocore-1.10.19
@@ -10,5 +10,5 @@ RDEPEND=dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/botocore/botocore-1.10.19.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=33eb8eaddcfbc31ca285a856159424e3
diff --git a/metadata/md5-cache/dev-python/botocore-1.10.35 b/metadata/md5-cache/dev-python/botocore-1.10.35
index 4db373f1ed50..628070cbf95f 100644
--- a/metadata/md5-cache/dev-python/botocore-1.10.35
+++ b/metadata/md5-cache/dev-python/botocore-1.10.35
@@ -10,5 +10,5 @@ RDEPEND=dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/botocore/botocore-1.10.35.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e15608f88b0861669d42730783734f82
diff --git a/metadata/md5-cache/dev-python/bottle-0.12.12 b/metadata/md5-cache/dev-python/bottle-0.12.12
index aa26a0568417..06826ca6a18d 100644
--- a/metadata/md5-cache/dev-python/bottle-0.12.12
+++ b/metadata/md5-cache/dev-python/bottle-0.12.12
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bottle/bottle-0.12.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2a0fce3d9a518afac21b85f83154f3d7
diff --git a/metadata/md5-cache/dev-python/bottle-0.12.13 b/metadata/md5-cache/dev-python/bottle-0.12.13
index eb6b731a1091..50b1f5e72c94 100644
--- a/metadata/md5-cache/dev-python/bottle-0.12.13
+++ b/metadata/md5-cache/dev-python/bottle-0.12.13
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/bottle/bottle-0.12.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e23ba794e5c2d0404c2404b4b1c7570a
diff --git a/metadata/md5-cache/dev-python/bottleneck-1.0.0 b/metadata/md5-cache/dev-python/bottleneck-1.0.0
index 61c68e37c345..7f3eeac19264 100644
--- a/metadata/md5-cache/dev-python/bottleneck-1.0.0
+++ b/metadata/md5-cache/dev-python/bottleneck-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/numpy-1.9.1[python_targets_python2_7(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/B/Bottleneck/Bottleneck-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=73128a4a876f58f90cd0c803f4394e4e
diff --git a/metadata/md5-cache/dev-python/bpython-0.16 b/metadata/md5-cache/dev-python/bpython-0.16
index be352129d80f..71eb16b252c4 100644
--- a/metadata/md5-cache/dev-python/bpython-0.16
+++ b/metadata/md5-cache/dev-python/bpython-0.16
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/curtsies-0.2.10[python_targets_python2_7(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bpython/bpython-0.16.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=dae0c11d00889542266181731805cb2c
diff --git a/metadata/md5-cache/dev-python/bpython-0.16-r1 b/metadata/md5-cache/dev-python/bpython-0.16-r1
index 04cd4bdbc0f3..5840aa40b6c3 100644
--- a/metadata/md5-cache/dev-python/bpython-0.16-r1
+++ b/metadata/md5-cache/dev-python/bpython-0.16-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/curtsies-0.2.11[python_targets_python2_7(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bpython/bpython-0.16.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3b744467c5b9a16c2940923b572e1735
diff --git a/metadata/md5-cache/dev-python/bpython-0.17 b/metadata/md5-cache/dev-python/bpython-0.17
index e6213b1522be..e81af761111c 100644
--- a/metadata/md5-cache/dev-python/bpython-0.17
+++ b/metadata/md5-cache/dev-python/bpython-0.17
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/curtsies-0.2.11[python_targets_python2_7(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bpython/bpython-0.17.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8f321d5a5a6962a64b56a7aa96ab46a9
diff --git a/metadata/md5-cache/dev-python/bpython-0.17.1 b/metadata/md5-cache/dev-python/bpython-0.17.1
index 125a3ca283ae..7fff160399d5 100644
--- a/metadata/md5-cache/dev-python/bpython-0.17.1
+++ b/metadata/md5-cache/dev-python/bpython-0.17.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/bpython/bpython-0.17.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ac73ec07da8d86df6e06cb75753794cf
diff --git a/metadata/md5-cache/dev-python/breathe-4.6.0 b/metadata/md5-cache/dev-python/breathe-4.6.0
index 4e7b5aae6ec2..8c5c79581bc4 100644
--- a/metadata/md5-cache/dev-python/breathe-4.6.0
+++ b/metadata/md5-cache/dev-python/breathe-4.6.0
@@ -10,5 +10,5 @@ RDEPEND=app-doc/doxygen[latex] dev-python/docutils[python_targets_python2_7(-)?,
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/breathe/breathe-4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=19182b76ece4baeae6fb020670b148bf
diff --git a/metadata/md5-cache/dev-python/brotlipy-0.7.0 b/metadata/md5-cache/dev-python/brotlipy-0.7.0
index 870682c06532..cd745f4e1e20 100644
--- a/metadata/md5-cache/dev-python/brotlipy-0.7.0
+++ b/metadata/md5-cache/dev-python/brotlipy-0.7.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/python-cffi[python_targets_python2_7(-)?,python_targets_python3_
 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/python-hyper/brotlipy/archive/v0.7.0.tar.gz -> brotlipy-0.7.0.tar.gz https://github.com/google/brotli/archive/46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz -> brotli-46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5a7d2b6eda4a7e311d3ebbc91b07b387
diff --git a/metadata/md5-cache/dev-python/bsddb3-6.1.1 b/metadata/md5-cache/dev-python/bsddb3-6.1.1
index 6fb261df0e92..e79b6c62e1d1 100644
--- a/metadata/md5-cache/dev-python/bsddb3-6.1.1
+++ b/metadata/md5-cache/dev-python/bsddb3-6.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/db-4.7:= <sys-libs/db-6.2:= python_targets_python2_7? ( >=dev
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bsddb3/bsddb3-6.1.1.tar.gz
-_eclasses_=db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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_=8afc4e73b7d41319bb3dbc04b3ab3d88
diff --git a/metadata/md5-cache/dev-python/bsddb3-6.2.4 b/metadata/md5-cache/dev-python/bsddb3-6.2.4
index ebe69087b99b..03b627fa5ccd 100644
--- a/metadata/md5-cache/dev-python/bsddb3-6.2.4
+++ b/metadata/md5-cache/dev-python/bsddb3-6.2.4
@@ -10,5 +10,5 @@ RDEPEND=<sys-libs/db-6.3:= || ( sys-libs/db:6.2 sys-libs/db:6.1 sys-libs/db:5.3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bsddb3/bsddb3-6.2.4.tar.gz
-_eclasses_=db-use	501a5d0963e0d17f30260023f292ae8e	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=db-use	501a5d0963e0d17f30260023f292ae8e	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0b041d1da1458f7eb10ef6f2bd23244c
diff --git a/metadata/md5-cache/dev-python/buzhug-1.8-r1 b/metadata/md5-cache/dev-python/buzhug-1.8-r1
index b55399ef6888..fcd1501cb125 100644
--- a/metadata/md5-cache/dev-python/buzhug-1.8-r1
+++ b/metadata/md5-cache/dev-python/buzhug-1.8-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=mirror://sourceforge/buzhug/buzhug-1.8.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1fea1362484f666f1cb30ec5d97a425f
diff --git a/metadata/md5-cache/dev-python/bz2file-0.98 b/metadata/md5-cache/dev-python/bz2file-0.98
index 6734d73d27a1..42dbd6724c17 100644
--- a/metadata/md5-cache/dev-python/bz2file-0.98
+++ b/metadata/md5-cache/dev-python/bz2file-0.98
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bz2file/bz2file-0.98.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=78b9a63d088f2cf51a98ccc3c65984bc
diff --git a/metadata/md5-cache/dev-python/cached-property-1.3.1 b/metadata/md5-cache/dev-python/cached-property-1.3.1
index a1df922395c3..d94a2655bb68 100644
--- a/metadata/md5-cache/dev-python/cached-property-1.3.1
+++ b/metadata/md5-cache/dev-python/cached-property-1.3.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cached-property/cached-property-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0c1fe99db5303e803957b4eca0a3e27c
diff --git a/metadata/md5-cache/dev-python/cached-property-1.5.1 b/metadata/md5-cache/dev-python/cached-property-1.5.1
index 7342e681f7bb..4af8569ec53f 100644
--- a/metadata/md5-cache/dev-python/cached-property-1.5.1
+++ b/metadata/md5-cache/dev-python/cached-property-1.5.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cached-property/cached-property-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6e496d78b66cae9e253f92b43c1aa942
diff --git a/metadata/md5-cache/dev-python/cachetools-2.0.1 b/metadata/md5-cache/dev-python/cachetools-2.0.1
index 629276fb670e..3973e7edb8a6 100644
--- a/metadata/md5-cache/dev-python/cachetools-2.0.1
+++ b/metadata/md5-cache/dev-python/cachetools-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/c/cachetools/cachetools-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fc553f711dbf9ee8cef45509fedbd58c
diff --git a/metadata/md5-cache/dev-python/cachetools-2.1.0 b/metadata/md5-cache/dev-python/cachetools-2.1.0
index 1637f683bcf1..e577e050d774 100644
--- a/metadata/md5-cache/dev-python/cachetools-2.1.0
+++ b/metadata/md5-cache/dev-python/cachetools-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/c/cachetools/cachetools-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0fa1ffb232e0625fe9f1dc8b8d81f984
diff --git a/metadata/md5-cache/dev-python/cairocffi-0.7.2 b/metadata/md5-cache/dev-python/cairocffi-0.7.2
index e69bdcc1526a..23c6636c0406 100644
--- a/metadata/md5-cache/dev-python/cairocffi-0.7.2
+++ b/metadata/md5-cache/dev-python/cairocffi-0.7.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-python/cffi-1.1.0:=[python_targets_pyt
 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/c/cairocffi/cairocffi-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6f2620a1f35f469704f1321a2a1c66f8
diff --git a/metadata/md5-cache/dev-python/cairocffi-0.8.0 b/metadata/md5-cache/dev-python/cairocffi-0.8.0
index 5d447405409c..2ed92b848f49 100644
--- a/metadata/md5-cache/dev-python/cairocffi-0.8.0
+++ b/metadata/md5-cache/dev-python/cairocffi-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-python/cffi-1.1.0:=[python_targets_pyt
 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/c/cairocffi/cairocffi-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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=d83ab2460d218e96784e5522154f7a0c
diff --git a/metadata/md5-cache/dev-python/carbon-0.9.13 b/metadata/md5-cache/dev-python/carbon-0.9.13
index b67a7c4059fe..b435e857dda5 100644
--- a/metadata/md5-cache/dev-python/carbon-0.9.13
+++ b/metadata/md5-cache/dev-python/carbon-0.9.13
@@ -10,5 +10,5 @@ RDEPEND=dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/carbon/carbon-0.9.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3bed27e34d50829fbe71280f45427100
diff --git a/metadata/md5-cache/dev-python/carbon-0.9.13-r1 b/metadata/md5-cache/dev-python/carbon-0.9.13-r1
index 65521b3bf235..f8f518b2f0dc 100644
--- a/metadata/md5-cache/dev-python/carbon-0.9.13-r1
+++ b/metadata/md5-cache/dev-python/carbon-0.9.13-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/carbon/carbon-0.9.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=154c6daefcf28086b917e022db19f67a
diff --git a/metadata/md5-cache/dev-python/carbon-0.9.14-r1 b/metadata/md5-cache/dev-python/carbon-0.9.14-r1
index 1d00f4718bc5..97d9784f99e6 100644
--- a/metadata/md5-cache/dev-python/carbon-0.9.14-r1
+++ b/metadata/md5-cache/dev-python/carbon-0.9.14-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/carbon/carbon-0.9.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3f3478bab8cfb4f650bdbd4ca885453e
diff --git a/metadata/md5-cache/dev-python/carbon-0.9.15-r1 b/metadata/md5-cache/dev-python/carbon-0.9.15-r1
index bd806aad6925..d15a0b02556c 100644
--- a/metadata/md5-cache/dev-python/carbon-0.9.15-r1
+++ b/metadata/md5-cache/dev-python/carbon-0.9.15-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/carbon/carbon-0.9.15.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=efac1dd869aed425186657a2ee199076
diff --git a/metadata/md5-cache/dev-python/carbon-1.1.3-r1 b/metadata/md5-cache/dev-python/carbon-1.1.3-r1
index becbf0d96277..5b816ff43a7d 100644
--- a/metadata/md5-cache/dev-python/carbon-1.1.3-r1
+++ b/metadata/md5-cache/dev-python/carbon-1.1.3-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/twisted[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/carbon/carbon-1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d7b12a221d6813e11d8e7a50bbe406c7
diff --git a/metadata/md5-cache/dev-python/carrot-0.10.7-r1 b/metadata/md5-cache/dev-python/carrot-0.10.7-r1
index 3ced921b52fa..a40a3bc0671c 100644
--- a/metadata/md5-cache/dev-python/carrot-0.10.7-r1
+++ b/metadata/md5-cache/dev-python/carrot-0.10.7-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/anyjson[python_targets_python2_7(-)?,-python_single_target_py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/carrot/carrot-0.10.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=f76dce2967c55aba3b9daf6afc7fb2d8
diff --git a/metadata/md5-cache/dev-python/case-1.5.2-r1 b/metadata/md5-cache/dev-python/case-1.5.2-r1
index e5da55602640..c930868acff4 100644
--- a/metadata/md5-cache/dev-python/case-1.5.2-r1
+++ b/metadata/md5-cache/dev-python/case-1.5.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/nose-1.3.7[python_targets_pypy(-)?,python_targets_pypy3(-)?
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/case/case-1.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8d0307d9e3e3342a7d49323b1917ba76
diff --git a/metadata/md5-cache/dev-python/case-1.5.3 b/metadata/md5-cache/dev-python/case-1.5.3
index 597f27fa5fb7..0587d7348123 100644
--- a/metadata/md5-cache/dev-python/case-1.5.3
+++ b/metadata/md5-cache/dev-python/case-1.5.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/nose-1.3.7[python_targets_pypy(-)?,python_targets_pypy3(-)?
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/case/case-1.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=98be1a7613984b81d1346d8d3f186b80
diff --git a/metadata/md5-cache/dev-python/castellan-0.12.2 b/metadata/md5-cache/dev-python/castellan-0.12.2
index 48874fc96a48..933b97b600e5 100644
--- a/metadata/md5-cache/dev-python/castellan-0.12.2
+++ b/metadata/md5-cache/dev-python/castellan-0.12.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/c/castellan/castellan-0.12.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3976289b0195bcd521f6b91cb484f413
diff --git a/metadata/md5-cache/dev-python/castellan-0.17.0 b/metadata/md5-cache/dev-python/castellan-0.17.0
index 76f6bb9a9641..066b869e8dfd 100644
--- a/metadata/md5-cache/dev-python/castellan-0.17.0
+++ b/metadata/md5-cache/dev-python/castellan-0.17.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 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/castellan/castellan-0.17.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c5ef0d82e013e5d5c1f9a18a773a49c1
diff --git a/metadata/md5-cache/dev-python/casuarius-1.1 b/metadata/md5-cache/dev-python/casuarius-1.1
index 1bad09bb06ae..6e563d39e1b6 100644
--- a/metadata/md5-cache/dev-python/casuarius-1.1
+++ b/metadata/md5-cache/dev-python/casuarius-1.1
@@ -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=mirror://pypi/c/casuarius/casuarius-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6bc912a2ac124f1044de50a1dbc5e58b
diff --git a/metadata/md5-cache/dev-python/catkin_pkg-0.4.7 b/metadata/md5-cache/dev-python/catkin_pkg-0.4.7
index 5ba49e6da8a8..980f0401cb3f 100644
--- a/metadata/md5-cache/dev-python/catkin_pkg-0.4.7
+++ b/metadata/md5-cache/dev-python/catkin_pkg-0.4.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,p
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/ros-infrastructure/catkin_pkg/archive/0.4.7.tar.gz -> catkin_pkg-0.4.7-gh.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c009373b313a6b4ca717fe2e58a56393
diff --git a/metadata/md5-cache/dev-python/cbor-1.0.0 b/metadata/md5-cache/dev-python/cbor-1.0.0
index 25b56fedc8e6..b8bac04571cf 100644
--- a/metadata/md5-cache/dev-python/cbor-1.0.0
+++ b/metadata/md5-cache/dev-python/cbor-1.0.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cbor/cbor-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cf78dcc587ce39b7e5fa6173d21fb8c3
diff --git a/metadata/md5-cache/dev-python/ccdproc-1.1.0 b/metadata/md5-cache/dev-python/ccdproc-1.1.0
index b130b88aecff..e3e1a24d1f18 100644
--- a/metadata/md5-cache/dev-python/ccdproc-1.1.0
+++ b/metadata/md5-cache/dev-python/ccdproc-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/c/ccdproc/ccdproc-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e918cd15a423f38d54cafd4ddb32df9c
diff --git a/metadata/md5-cache/dev-python/ccdproc-1.2.0 b/metadata/md5-cache/dev-python/ccdproc-1.2.0
index ac3610573adf..d7bcd6fede77 100644
--- a/metadata/md5-cache/dev-python/ccdproc-1.2.0
+++ b/metadata/md5-cache/dev-python/ccdproc-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/ccdproc/ccdproc-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=97fe75a4ac35506aafee85b9cbe2e1dc
diff --git a/metadata/md5-cache/dev-python/cddb-py-1.4-r1 b/metadata/md5-cache/dev-python/cddb-py-1.4-r1
index fcec394b5c6e..b6012065bad5 100644
--- a/metadata/md5-cache/dev-python/cddb-py-1.4-r1
+++ b/metadata/md5-cache/dev-python/cddb-py-1.4-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=mirror://sourceforge/cddb-py/CDDB-1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=21949a0d8984566bdbe241949e84efd9
diff --git a/metadata/md5-cache/dev-python/celementtree-1.0.5-r2 b/metadata/md5-cache/dev-python/celementtree-1.0.5-r2
index f8218256a7d8..60af04682bc6 100644
--- a/metadata/md5-cache/dev-python/celementtree-1.0.5-r2
+++ b/metadata/md5-cache/dev-python/celementtree-1.0.5-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/elementtree-1.2[python_targets_python2_7(-)?,-python_single
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://effbot.org/downloads/cElementTree-1.0.5-20051216.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=612467f0d406a40510f8c4149eadbf35
diff --git a/metadata/md5-cache/dev-python/celery-4.1.0 b/metadata/md5-cache/dev-python/celery-4.1.0
index 9b6e6b70fdad..73be8472218e 100644
--- a/metadata/md5-cache/dev-python/celery-4.1.0
+++ b/metadata/md5-cache/dev-python/celery-4.1.0
@@ -10,5 +10,5 @@ RDEPEND=<dev-python/kombu-4.2[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
 SRC_URI=mirror://pypi/c/celery/celery-4.1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b7b7fa3afa6fc1c63c02213145df0b8d
diff --git a/metadata/md5-cache/dev-python/cement-2.0.2 b/metadata/md5-cache/dev-python/cement-2.0.2
index e04b4e68b7b5..4ba51ebe8b30 100644
--- a/metadata/md5-cache/dev-python/cement-2.0.2
+++ b/metadata/md5-cache/dev-python/cement-2.0.2
@@ -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=http://builtoncement.com/cement/2.0/source/cement-2.0.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=5edc3867683cd5b5dc8f2e4071434f55
diff --git a/metadata/md5-cache/dev-python/cement-2.10.0 b/metadata/md5-cache/dev-python/cement-2.10.0
index 9f4cfc67d11a..30f1a902316e 100644
--- a/metadata/md5-cache/dev-python/cement-2.10.0
+++ b/metadata/md5-cache/dev-python/cement-2.10.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://builtoncement.com/cement/2.10/source/cement-2.10.0.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=24394558ee67949c30df5ae252ee2786
diff --git a/metadata/md5-cache/dev-python/certifi-2018.4.16 b/metadata/md5-cache/dev-python/certifi-2018.4.16
index 4dc48f9696fd..0362f7191c30 100644
--- a/metadata/md5-cache/dev-python/certifi-2018.4.16
+++ b/metadata/md5-cache/dev-python/certifi-2018.4.16
@@ -10,5 +10,5 @@ RDEPEND=app-misc/ca-certificates python_targets_pypy? ( >=virtual/pypy-5:0= ) py
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/certifi/certifi-2018.4.16.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d837a09cf327f1be5417ba17244774fe
diff --git a/metadata/md5-cache/dev-python/certifi-2018.8.24 b/metadata/md5-cache/dev-python/certifi-2018.8.24
index ea1eabf80de9..7c064e415e3b 100644
--- a/metadata/md5-cache/dev-python/certifi-2018.8.24
+++ b/metadata/md5-cache/dev-python/certifi-2018.8.24
@@ -10,5 +10,5 @@ RDEPEND=app-misc/ca-certificates python_targets_pypy? ( >=virtual/pypy-5:0= ) py
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/certifi/certifi-2018.8.24.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=daadff57670107b3116b1d75d8be4248
diff --git a/metadata/md5-cache/dev-python/cffi-1.11.2 b/metadata/md5-cache/dev-python/cffi-1.11.2
index b45c3ec5d0b2..04dad3734b05 100644
--- a/metadata/md5-cache/dev-python/cffi-1.11.2
+++ b/metadata/md5-cache/dev-python/cffi-1.11.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/libffi dev-python/pycparser[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/pkgconfig 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(-)] ) 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=virtual/libffi:= dev-python/pycparser[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/pkgconfig 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(-)] ) 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=Foreign Function Interface for Python calling C code
 EAPI=6
 HOMEPAGE=https://cffi.readthedocs.io/ https://pypi.org/project/cffi/
 IUSE=doc 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 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=MIT
-RDEPEND=virtual/libffi dev-python/pycparser[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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=virtual/libffi:= dev-python/pycparser[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/1.11.2
 SRC_URI=mirror://pypi/c/cffi/cffi-1.11.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=5e1748f7cef72fe88e8f15ef01c8c6b4
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1d56b04bce12833b16f234de53c9bceb
diff --git a/metadata/md5-cache/dev-python/cffi-1.11.4 b/metadata/md5-cache/dev-python/cffi-1.11.4
index 80a3d501c451..0126231c40ac 100644
--- a/metadata/md5-cache/dev-python/cffi-1.11.4
+++ b/metadata/md5-cache/dev-python/cffi-1.11.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/libffi dev-python/pycparser[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/pkgconfig 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(-)] ) 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=virtual/libffi:= dev-python/pycparser[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/pkgconfig 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(-)] ) 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=Foreign Function Interface for Python calling C code
 EAPI=6
 HOMEPAGE=https://cffi.readthedocs.io/ https://pypi.org/project/cffi/
 IUSE=doc 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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=MIT
-RDEPEND=virtual/libffi dev-python/pycparser[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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=virtual/libffi:= dev-python/pycparser[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/1.11.4
 SRC_URI=mirror://pypi/c/cffi/cffi-1.11.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=d4dd27840218da43ae4976ca76c75d6e
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=931085aabf2ffa23d99f6232b981ac30
diff --git a/metadata/md5-cache/dev-python/cffi-1.11.5 b/metadata/md5-cache/dev-python/cffi-1.11.5
index df83e176b290..4c14028778a7 100644
--- a/metadata/md5-cache/dev-python/cffi-1.11.5
+++ b/metadata/md5-cache/dev-python/cffi-1.11.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/libffi dev-python/pycparser[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(-)] virtual/pkgconfig 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(-)] ) 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=virtual/libffi:= dev-python/pycparser[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(-)] virtual/pkgconfig 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(-)] ) 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=Foreign Function Interface for Python calling C code
 EAPI=6
 HOMEPAGE=https://cffi.readthedocs.io/ https://pypi.org/project/cffi/
 IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~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 ~x64-solaris
 LICENSE=MIT
-RDEPEND=virtual/libffi dev-python/pycparser[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=virtual/libffi:= dev-python/pycparser[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/1.11.5
 SRC_URI=mirror://pypi/c/cffi/cffi-1.11.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=423f0ba7a1d199e96e5da93604bc4f1e
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=cdc24873ff15945ebd4d239748fd3b64
diff --git a/metadata/md5-cache/dev-python/cffi-1.9.1 b/metadata/md5-cache/dev-python/cffi-1.9.1
index 05115bb1040b..441dd3b709da 100644
--- a/metadata/md5-cache/dev-python/cffi-1.9.1
+++ b/metadata/md5-cache/dev-python/cffi-1.9.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/libffi dev-python/pycparser[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/pkgconfig 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(-)] ) 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=virtual/libffi:= dev-python/pycparser[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/pkgconfig 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(-)] ) 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=Foreign Function Interface for Python calling C code
 EAPI=6
 HOMEPAGE=https://cffi.readthedocs.io/ https://pypi.org/project/cffi/
 IUSE=doc 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 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=MIT
-RDEPEND=virtual/libffi dev-python/pycparser[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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=virtual/libffi:= dev-python/pycparser[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/1.9.1
 SRC_URI=mirror://pypi/c/cffi/cffi-1.9.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=52b9641c746fa78e2371e6d6d397777a
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=8615bf30ae31652dba03b8587eaf2e0b
diff --git a/metadata/md5-cache/dev-python/cfgio-0.1.2 b/metadata/md5-cache/dev-python/cfgio-0.1.2
index 2535d2ea108e..9c9ef36b3919 100644
--- a/metadata/md5-cache/dev-python/cfgio-0.1.2
+++ b/metadata/md5-cache/dev-python/cfgio-0.1.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/ercpe/cfgio/archive/0.1.2.tar.gz -> cfgio-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=86e34f74fa73f607a3ea429f518b3de4
diff --git a/metadata/md5-cache/dev-python/cfgparse-1.3-r1 b/metadata/md5-cache/dev-python/cfgparse-1.3-r1
index daf95f984077..04d4ea3723f4 100644
--- a/metadata/md5-cache/dev-python/cfgparse-1.3-r1
+++ b/metadata/md5-cache/dev-python/cfgparse-1.3-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=mirror://pypi/c/cfgparse/cfgparse-1.3.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fdaeb8d9ef4abf382b74fd8464784165
diff --git a/metadata/md5-cache/dev-python/cgkit-2.0.0-r1 b/metadata/md5-cache/dev-python/cgkit-2.0.0-r1
index 23fecb8eadf6..c18f80b57593 100644
--- a/metadata/md5-cache/dev-python/cgkit-2.0.0-r1
+++ b/metadata/md5-cache/dev-python/cgkit-2.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/boost-1.48[python,python_targets_python2_7(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=python_targets_python2_7? ( mirror://sourceforge/cgkit/cgkit/cgkit-2.0.0/cgkit-2.0.0-py2k.tar.gz ) python_targets_python3_4? ( mirror://sourceforge/cgkit/cgkit/cgkit-2.0.0/cgkit-2.0.0-py3k.tar.gz ) python_targets_python3_5? ( mirror://sourceforge/cgkit/cgkit/cgkit-2.0.0/cgkit-2.0.0-py3k.tar.gz )
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=392a2f389547a055c1aedc8ed8c2e8c9
diff --git a/metadata/md5-cache/dev-python/cgkit-2.0.0-r2 b/metadata/md5-cache/dev-python/cgkit-2.0.0-r2
index 1220826eda5b..a81afc8ba050 100644
--- a/metadata/md5-cache/dev-python/cgkit-2.0.0-r2
+++ b/metadata/md5-cache/dev-python/cgkit-2.0.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/boost-1.48[python,python_targets_python2_7(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=python_targets_python2_7? ( mirror://sourceforge/cgkit/cgkit/cgkit-2.0.0/cgkit-2.0.0-py2k.tar.gz ) python_targets_python3_4? ( mirror://sourceforge/cgkit/cgkit/cgkit-2.0.0/cgkit-2.0.0-py3k.tar.gz ) python_targets_python3_5? ( mirror://sourceforge/cgkit/cgkit/cgkit-2.0.0/cgkit-2.0.0-py3k.tar.gz ) python_targets_python3_6? ( mirror://sourceforge/cgkit/cgkit/cgkit-2.0.0/cgkit-2.0.0-py3k.tar.gz )
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0c1072008436fce57a18d10d05abc540
diff --git a/metadata/md5-cache/dev-python/cgroup-utils-0.6 b/metadata/md5-cache/dev-python/cgroup-utils-0.6
index 6e7099cb0704..a6a572033320 100644
--- a/metadata/md5-cache/dev-python/cgroup-utils-0.6
+++ b/metadata/md5-cache/dev-python/cgroup-utils-0.6
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/peo3/cgroup-utils/archive/v0.6.tar.gz -> cgroup-utils-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=825c896885f56ec76606e39d2e7b4ba3
diff --git a/metadata/md5-cache/dev-python/chaco-4.5.0 b/metadata/md5-cache/dev-python/chaco-4.5.0
index b2caa6edf82d..5c82e29ec427 100644
--- a/metadata/md5-cache/dev-python/chaco-4.5.0
+++ b/metadata/md5-cache/dev-python/chaco-4.5.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/enable-4.4.0[python_targets_python2_7(-)?,-python_single_ta
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/chaco/chaco-4.5.0.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8646db5076eaa66942dd21d8ad0e8f4a
diff --git a/metadata/md5-cache/dev-python/chai-1.1.1 b/metadata/md5-cache/dev-python/chai-1.1.1
index 29bc0d629d02..cc5f6cfb5fd5 100644
--- a/metadata/md5-cache/dev-python/chai-1.1.1
+++ b/metadata/md5-cache/dev-python/chai-1.1.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/c/chai/chai-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=00305d7d1ffb6b22a393e269c9fb2667
diff --git a/metadata/md5-cache/dev-python/chameleon-2.25 b/metadata/md5-cache/dev-python/chameleon-2.25
index 122eb2701f69..5f1128cd53de 100644
--- a/metadata/md5-cache/dev-python/chameleon-2.25
+++ b/metadata/md5-cache/dev-python/chameleon-2.25
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/C/Chameleon/Chameleon-2.25.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=05585c703d7161a46078deefad954800
diff --git a/metadata/md5-cache/dev-python/characteristic-14.3.0-r1 b/metadata/md5-cache/dev-python/characteristic-14.3.0-r1
index b8b67f237e20..a3212c430755 100644
--- a/metadata/md5-cache/dev-python/characteristic-14.3.0-r1
+++ b/metadata/md5-cache/dev-python/characteristic-14.3.0-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/characteristic/characteristic-14.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3320a5211a0b72955ed957014993be42
diff --git a/metadata/md5-cache/dev-python/chardet-3.0.4 b/metadata/md5-cache/dev-python/chardet-3.0.4
index 7ea4991524e7..994c7bfbeb29 100644
--- a/metadata/md5-cache/dev-python/chardet-3.0.4
+++ b/metadata/md5-cache/dev-python/chardet-3.0.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/chardet/chardet/archive/3.0.4.tar.gz -> chardet-3.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=73d14065c22e945ca71aaf856b5d19c0
diff --git a/metadata/md5-cache/dev-python/cheetah-2.4.4-r1 b/metadata/md5-cache/dev-python/cheetah-2.4.4-r1
index 955bbe6cadb7..16d9ecc9af9a 100644
--- a/metadata/md5-cache/dev-python/cheetah-2.4.4-r1
+++ b/metadata/md5-cache/dev-python/cheetah-2.4.4-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/C/Cheetah/Cheetah-2.4.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d4d6861d128683689c88bea6a5e23d47
diff --git a/metadata/md5-cache/dev-python/cheroot-6.0.0 b/metadata/md5-cache/dev-python/cheroot-6.0.0
index e289cfcc3113..674859007e00 100644
--- a/metadata/md5-cache/dev-python/cheroot-6.0.0
+++ b/metadata/md5-cache/dev-python/cheroot-6.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/six-1.11.0[python_targets_pypy(-)?,python_targets_pypy3(-)?
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/C/Cheroot/cheroot-6.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d29745d149fa010ebf2411228856ac91
diff --git a/metadata/md5-cache/dev-python/cherrypy-13.1.0 b/metadata/md5-cache/dev-python/cherrypy-13.1.0
index 27a4a5e62652..5e329a4d8623 100644
--- a/metadata/md5-cache/dev-python/cherrypy-13.1.0
+++ b/metadata/md5-cache/dev-python/cherrypy-13.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/cheroot-5.9.1[python_targets_pypy(-)?,python_targets_pypy3(
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/C/CherryPy/CherryPy-13.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d19d41c146e8e1b04724461620ba2658
diff --git a/metadata/md5-cache/dev-python/cherrypy-3.8.0 b/metadata/md5-cache/dev-python/cherrypy-3.8.0
index fbbaddf46b6b..f72d61702339 100644
--- a/metadata/md5-cache/dev-python/cherrypy-3.8.0
+++ b/metadata/md5-cache/dev-python/cherrypy-3.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/C/CherryPy/CherryPy-3.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a93faa6d63de4f2d9b38f0c99504eea8
diff --git a/metadata/md5-cache/dev-python/cherrytemplate-1.0.0-r1 b/metadata/md5-cache/dev-python/cherrytemplate-1.0.0-r1
index 44f130f35a00..934ea8c07daa 100644
--- a/metadata/md5-cache/dev-python/cherrytemplate-1.0.0-r1
+++ b/metadata/md5-cache/dev-python/cherrytemplate-1.0.0-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=mirror://sourceforge/cherrypy/CherryTemplate-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cc0ff5e54b9be547845a47a8a09a6364
diff --git a/metadata/md5-cache/dev-python/chump-1.5.1 b/metadata/md5-cache/dev-python/chump-1.5.1
index db66a998ea8e..af57c3524c8c 100644
--- a/metadata/md5-cache/dev-python/chump-1.5.1
+++ b/metadata/md5-cache/dev-python/chump-1.5.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/c/chump/chump-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a01e5c5242b14ee8dd9d2c40220f73b0
diff --git a/metadata/md5-cache/dev-python/chump-1.5.2 b/metadata/md5-cache/dev-python/chump-1.5.2
index 2ab38bc64f0b..6e2a21a13a56 100644
--- a/metadata/md5-cache/dev-python/chump-1.5.2
+++ b/metadata/md5-cache/dev-python/chump-1.5.2
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/karanlyons/chump/archive/0cd59e14267858ab6623d7aa42badc6caa9b8edf.tar.gz -> chump-1.5.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0c5b203e01ca1fb1438368dcccf979c7
diff --git a/metadata/md5-cache/dev-python/citeproc-py-0.4.0 b/metadata/md5-cache/dev-python/citeproc-py-0.4.0
index 3a9133ab83ac..b8580ad8d7ea 100644
--- a/metadata/md5-cache/dev-python/citeproc-py-0.4.0
+++ b/metadata/md5-cache/dev-python/citeproc-py-0.4.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/c/citeproc-py/citeproc-py-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a4d71a13eb0d880683d336dca608d440
diff --git a/metadata/md5-cache/dev-python/cjkwrap-2.2 b/metadata/md5-cache/dev-python/cjkwrap-2.2
index 4aa6232f4f03..5af38b28d637 100644
--- a/metadata/md5-cache/dev-python/cjkwrap-2.2
+++ b/metadata/md5-cache/dev-python/cjkwrap-2.2
@@ -10,5 +10,5 @@ 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_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/fgallaire/cjkwrap/archive/v2.2.tar.gz -> cjkwrap-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4895a02845645e6a9703ad5eff1b503a
diff --git a/metadata/md5-cache/dev-python/cli_helpers-0.2.0 b/metadata/md5-cache/dev-python/cli_helpers-0.2.0
index 07617d53e6c5..0767a526a001 100644
--- a/metadata/md5-cache/dev-python/cli_helpers-0.2.0
+++ b/metadata/md5-cache/dev-python/cli_helpers-0.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/terminaltables[python_targets_python2_7(-)?,python_targets_py
 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/dbcli/cli_helpers/archive/v0.2.0.tar.gz -> cli_helpers-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4aca43fbbd65abebe5cca4750b8a4a1f
diff --git a/metadata/md5-cache/dev-python/cli_helpers-1.0.0 b/metadata/md5-cache/dev-python/cli_helpers-1.0.0
index ca2e0cae8e57..b0a30bf3fea3 100644
--- a/metadata/md5-cache/dev-python/cli_helpers-1.0.0
+++ b/metadata/md5-cache/dev-python/cli_helpers-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/tabulate-0.8.0[python_targets_python2_7(-)?,python_targets_
 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/dbcli/cli_helpers/archive/v1.0.0.tar.gz -> cli_helpers-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2e7b647361b185277c811ea5181ef475
diff --git a/metadata/md5-cache/dev-python/cli_helpers-1.0.1 b/metadata/md5-cache/dev-python/cli_helpers-1.0.1
index 9a0eaaae085d..8cd969f83115 100644
--- a/metadata/md5-cache/dev-python/cli_helpers-1.0.1
+++ b/metadata/md5-cache/dev-python/cli_helpers-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/backports-csv-1.0[python_targets_python2_7(-)?,python_targe
 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/dbcli/cli_helpers/archive/v1.0.1.tar.gz -> cli_helpers-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=274a73796ed4706b2e7149f8acbaa61b
diff --git a/metadata/md5-cache/dev-python/cli_helpers-9999 b/metadata/md5-cache/dev-python/cli_helpers-9999
index 86c8d7fa42bc..bfb0abf1bea3 100644
--- a/metadata/md5-cache/dev-python/cli_helpers-9999
+++ b/metadata/md5-cache/dev-python/cli_helpers-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-python/backports-csv-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/tabulate-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/terminaltables-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/pygments-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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=ea38cb357a675589f07d1e0e3947829d
diff --git a/metadata/md5-cache/dev-python/cliapp-1.20140315 b/metadata/md5-cache/dev-python/cliapp-1.20140315
index 837aa6c6dc02..b51e193dda92 100644
--- a/metadata/md5-cache/dev-python/cliapp-1.20140315
+++ b/metadata/md5-cache/dev-python/cliapp-1.20140315
@@ -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=http://code.liw.fi/debian/pool/main/p/python-cliapp/python-cliapp_1.20140315.orig.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=41ca358e6e9730c83271edfda65d89c3
diff --git a/metadata/md5-cache/dev-python/cliapp-1.20150305 b/metadata/md5-cache/dev-python/cliapp-1.20150305
index 6be0082fef91..290fb3ef47e9 100644
--- a/metadata/md5-cache/dev-python/cliapp-1.20150305
+++ b/metadata/md5-cache/dev-python/cliapp-1.20150305
@@ -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=http://git.liw.fi/cgi-bin/cgit/cgit.cgi/cliapp/snapshot/cliapp-1.20150305.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4720e6eea185d051b6b4e996dd239fe9
diff --git a/metadata/md5-cache/dev-python/cliapp-1.20160724-r1 b/metadata/md5-cache/dev-python/cliapp-1.20160724-r1
index 413f5f67b7e8..0b9778a6b325 100644
--- a/metadata/md5-cache/dev-python/cliapp-1.20160724-r1
+++ b/metadata/md5-cache/dev-python/cliapp-1.20160724-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://git.liw.fi/cgi-bin/cgit/cgit.cgi/cliapp/snapshot/cliapp-1.20160724.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=00c8b7a2c1434462867d8d0fe081257e
diff --git a/metadata/md5-cache/dev-python/cliapp-1.20170823 b/metadata/md5-cache/dev-python/cliapp-1.20170823
index 7b6497d483cd..203cd05242a0 100644
--- a/metadata/md5-cache/dev-python/cliapp-1.20170823
+++ b/metadata/md5-cache/dev-python/cliapp-1.20170823
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://git.liw.fi/cgi-bin/cgit/cgit.cgi/cliapp/snapshot/cliapp-1.20170823.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=72c2668cbe238927ce4162ba1f33e4e2
diff --git a/metadata/md5-cache/dev-python/click-5.1 b/metadata/md5-cache/dev-python/click-5.1
index 7c08e3cc6a6c..4790263f2b0d 100644
--- a/metadata/md5-cache/dev-python/click-5.1
+++ b/metadata/md5-cache/dev-python/click-5.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/click/click-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e0b5d753bb573e52aa5b6a8758e5ab9e
diff --git a/metadata/md5-cache/dev-python/click-6.6 b/metadata/md5-cache/dev-python/click-6.6
index 4aabea189293..b307adc39a19 100644
--- a/metadata/md5-cache/dev-python/click-6.6
+++ b/metadata/md5-cache/dev-python/click-6.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/click/click-6.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f60d1ad5da2df31cc8ffd17737b49f71
diff --git a/metadata/md5-cache/dev-python/click-6.7 b/metadata/md5-cache/dev-python/click-6.7
index 1b9423cb8adb..b64966816d68 100644
--- a/metadata/md5-cache/dev-python/click-6.7
+++ b/metadata/md5-cache/dev-python/click-6.7
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/click/click-6.7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5c2f60f7f2b1e8959d09fd599b8e949a
diff --git a/metadata/md5-cache/dev-python/click-log-0.1.8 b/metadata/md5-cache/dev-python/click-log-0.1.8
index 8940033e0cf3..b32fe2e16f2e 100644
--- a/metadata/md5-cache/dev-python/click-log-0.1.8
+++ b/metadata/md5-cache/dev-python/click-log-0.1.8
@@ -10,5 +10,5 @@ RDEPEND=dev-python/click[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/click-log/click-log-0.1.8.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=18bd985fdf25976cc1e8fb23712f41b9
diff --git a/metadata/md5-cache/dev-python/click-log-0.2.1 b/metadata/md5-cache/dev-python/click-log-0.2.1
index 9d0ebb6c513e..7c1099f8ac83 100644
--- a/metadata/md5-cache/dev-python/click-log-0.2.1
+++ b/metadata/md5-cache/dev-python/click-log-0.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/click[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/click-log/click-log-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=52ed19651a85c3b8e043847fb847fd07
diff --git a/metadata/md5-cache/dev-python/click-log-0.3.2 b/metadata/md5-cache/dev-python/click-log-0.3.2
index a516b3e162ea..28f6b07be0e3 100644
--- a/metadata/md5-cache/dev-python/click-log-0.3.2
+++ b/metadata/md5-cache/dev-python/click-log-0.3.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/click[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/click-log/click-log-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=52ed19651a85c3b8e043847fb847fd07
diff --git a/metadata/md5-cache/dev-python/click-plugins-1.0.3 b/metadata/md5-cache/dev-python/click-plugins-1.0.3
index a52fb7448ca9..976b98a94ae7 100644
--- a/metadata/md5-cache/dev-python/click-plugins-1.0.3
+++ b/metadata/md5-cache/dev-python/click-plugins-1.0.3
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/c/click-plugins/click-plugins-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9bc0a9f162c3601b17476e9d9b9dacf0
diff --git a/metadata/md5-cache/dev-python/click-threading-0.3.0 b/metadata/md5-cache/dev-python/click-threading-0.3.0
index ce35b5f58504..cfc7562cd6cb 100644
--- a/metadata/md5-cache/dev-python/click-threading-0.3.0
+++ b/metadata/md5-cache/dev-python/click-threading-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/click-5.0[python_targets_python2_7(-)?,python_targets_pytho
 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/click-contrib/click-threading/archive/0.3.0.tar.gz -> click-threading-0.3.0-gh.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=25451dd8f2c8b3d2e00e2c2c14a48f6f
diff --git a/metadata/md5-cache/dev-python/click-threading-0.4.4 b/metadata/md5-cache/dev-python/click-threading-0.4.4
index 7e8606e3611b..441d662b14bb 100644
--- a/metadata/md5-cache/dev-python/click-threading-0.4.4
+++ b/metadata/md5-cache/dev-python/click-threading-0.4.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/click-5.0[python_targets_python2_7(-)?,python_targets_pytho
 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/click-contrib/click-threading/archive/0.4.4.tar.gz -> click-threading-0.4.4-gh.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ac4fea93d4b7268f9b9ccdb8e678c375
diff --git a/metadata/md5-cache/dev-python/clientcookie-1.3.0-r1 b/metadata/md5-cache/dev-python/clientcookie-1.3.0-r1
index 33a0ca22c370..04eff7d56339 100644
--- a/metadata/md5-cache/dev-python/clientcookie-1.3.0-r1
+++ b/metadata/md5-cache/dev-python/clientcookie-1.3.0-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=http://wwwsearch.sourceforge.net/ClientCookie/src/ClientCookie-1.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=143a895776435f2e4ff54bf6a609b66c
diff --git a/metadata/md5-cache/dev-python/cliff-2.11.1 b/metadata/md5-cache/dev-python/cliff-2.11.1
index c2b18c37d42c..a2b80f787f36 100644
--- a/metadata/md5-cache/dev-python/cliff-2.11.1
+++ b/metadata/md5-cache/dev-python/cliff-2.11.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 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/cliff/cliff-2.11.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e2e82261658f575e81774b7f03d5c784
diff --git a/metadata/md5-cache/dev-python/cliff-2.12.0 b/metadata/md5-cache/dev-python/cliff-2.12.0
index cad242bd72f3..cd99b272dd8f 100644
--- a/metadata/md5-cache/dev-python/cliff-2.12.0
+++ b/metadata/md5-cache/dev-python/cliff-2.12.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 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/cliff/cliff-2.12.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a09d960394dfea1020e113272e0be45e
diff --git a/metadata/md5-cache/dev-python/cliff-2.12.0-r2 b/metadata/md5-cache/dev-python/cliff-2.12.0-r2
index 81e405e5940d..818923bb4298 100644
--- a/metadata/md5-cache/dev-python/cliff-2.12.0-r2
+++ b/metadata/md5-cache/dev-python/cliff-2.12.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 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/cliff/cliff-2.12.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=918790e86f092bf5556c9a431385f34a
diff --git a/metadata/md5-cache/dev-python/cligj-0.4.0 b/metadata/md5-cache/dev-python/cligj-0.4.0
index c4eaa57e5c6c..fc91a514237a 100644
--- a/metadata/md5-cache/dev-python/cligj-0.4.0
+++ b/metadata/md5-cache/dev-python/cligj-0.4.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/click[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cligj/cligj-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=be6fcecee510165e69476460fbd7810d
diff --git a/metadata/md5-cache/dev-python/clint-0.5.1 b/metadata/md5-cache/dev-python/clint-0.5.1
index 6229214f1942..93f157386cff 100644
--- a/metadata/md5-cache/dev-python/clint-0.5.1
+++ b/metadata/md5-cache/dev-python/clint-0.5.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/args[python_targets_python2_7(-)?,python_targets_python3_4(-)
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/kennethreitz/clint/archive/v0.5.1.tar.gz -> clint-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d6a21c73348f72ea02337dd61e5448eb
diff --git a/metadata/md5-cache/dev-python/cloudlib-0.5.0 b/metadata/md5-cache/dev-python/cloudlib-0.5.0
index c9a174962abd..5a9d5e4e4254 100644
--- a/metadata/md5-cache/dev-python/cloudlib-0.5.0
+++ b/metadata/md5-cache/dev-python/cloudlib-0.5.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/prettytable-0.7.0[python_targets_python2_7(-)?,python_targe
 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/cloudlib/cloudlib-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e9fc6dc494c0a293fe82ee000801880e
diff --git a/metadata/md5-cache/dev-python/cloudpickle-0.3.1 b/metadata/md5-cache/dev-python/cloudpickle-0.3.1
index 9982bad4ff61..aac1c94bc309 100644
--- a/metadata/md5-cache/dev-python/cloudpickle-0.3.1
+++ b/metadata/md5-cache/dev-python/cloudpickle-0.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/c/cloudpickle/cloudpickle-0.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=1020b66713130fed173909e4111da812
diff --git a/metadata/md5-cache/dev-python/cmd2-0.7.5 b/metadata/md5-cache/dev-python/cmd2-0.7.5
index c7dd8d497fb0..3dbefaf036ec 100644
--- a/metadata/md5-cache/dev-python/cmd2-0.7.5
+++ b/metadata/md5-cache/dev-python/cmd2-0.7.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/c/cmd2/cmd2-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=58977e23625617cc63a2438ff983feba
diff --git a/metadata/md5-cache/dev-python/cmd2-0.7.9 b/metadata/md5-cache/dev-python/cmd2-0.7.9
index 05b449de74e7..fd48b4fc7446 100644
--- a/metadata/md5-cache/dev-python/cmd2-0.7.9
+++ b/metadata/md5-cache/dev-python/cmd2-0.7.9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/c/cmd2/cmd2-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7e5cd4ef8123b89f11e58be6186aaecd
diff --git a/metadata/md5-cache/dev-python/codetools-4.2.0 b/metadata/md5-cache/dev-python/codetools-4.2.0
index 54d8e94984ec..b7e304ad8a0e 100644
--- a/metadata/md5-cache/dev-python/codetools-4.2.0
+++ b/metadata/md5-cache/dev-python/codetools-4.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/codetools/codetools-4.2.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a4caef2bdbe2de80e0751f9d71ad26ce
diff --git a/metadata/md5-cache/dev-python/colander-1.3.1 b/metadata/md5-cache/dev-python/colander-1.3.1
index c5c1c199bade..116c518e5bb7 100644
--- a/metadata/md5-cache/dev-python/colander-1.3.1
+++ b/metadata/md5-cache/dev-python/colander-1.3.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/translationstring-1.1[python_targets_pypy(-)?,python_target
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/colander/colander-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=407abb3112e33da4fc121e220e332493
diff --git a/metadata/md5-cache/dev-python/collectd-rabbitmq-1.19.0-r1 b/metadata/md5-cache/dev-python/collectd-rabbitmq-1.19.0-r1
index 1f6ee25d9ae4..670149a201a4 100644
--- a/metadata/md5-cache/dev-python/collectd-rabbitmq-1.19.0-r1
+++ b/metadata/md5-cache/dev-python/collectd-rabbitmq-1.19.0-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=mirror://pypi/c/collectd-rabbitmq/collectd-rabbitmq-1.19.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a54d85598c36ceab46b291ab103a64e5
diff --git a/metadata/md5-cache/dev-python/collective-checkdocs-0.2 b/metadata/md5-cache/dev-python/collective-checkdocs-0.2
index 780572711054..7ccb61586f84 100644
--- a/metadata/md5-cache/dev-python/collective-checkdocs-0.2
+++ b/metadata/md5-cache/dev-python/collective-checkdocs-0.2
@@ -10,5 +10,5 @@ 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
 SRC_URI=mirror://pypi/c/collective.checkdocs/collective.checkdocs-0.2.zip
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=68f9ef112dc470744ef0d4617f23abb9
diff --git a/metadata/md5-cache/dev-python/colorama-0.3.3 b/metadata/md5-cache/dev-python/colorama-0.3.3
index 2b4ec1f491b5..cc2ee4b9a2b7 100644
--- a/metadata/md5-cache/dev-python/colorama-0.3.3
+++ b/metadata/md5-cache/dev-python/colorama-0.3.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/colorama/colorama-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e99265de791a4523ae30abdeade340c4
diff --git a/metadata/md5-cache/dev-python/colorama-0.3.9 b/metadata/md5-cache/dev-python/colorama-0.3.9
index 58a6e28e9f59..2f5f7ec56bf9 100644
--- a/metadata/md5-cache/dev-python/colorama-0.3.9
+++ b/metadata/md5-cache/dev-python/colorama-0.3.9
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/colorama/colorama-0.3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3d3be79e945c66bfee8e78f62c8fdc9a
diff --git a/metadata/md5-cache/dev-python/coloredlogs-6.1 b/metadata/md5-cache/dev-python/coloredlogs-6.1
index d73c3ee9bd49..ff8c11d7c97c 100644
--- a/metadata/md5-cache/dev-python/coloredlogs-6.1
+++ b/metadata/md5-cache/dev-python/coloredlogs-6.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/humanfriendly-2.1[python_targets_python2_7(-)?,python_targe
 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/coloredlogs/coloredlogs-6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bb2f5c9f33d1ffe0117a04a4ff8dda0b
diff --git a/metadata/md5-cache/dev-python/colorful-0.4.1 b/metadata/md5-cache/dev-python/colorful-0.4.1
index 21e86cc03c34..54d0e3b6d46a 100644
--- a/metadata/md5-cache/dev-python/colorful-0.4.1
+++ b/metadata/md5-cache/dev-python/colorful-0.4.1
@@ -10,5 +10,5 @@ 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_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/colorful/colorful-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dfaef751d3ee91fff4a5787b8f7f923e
diff --git a/metadata/md5-cache/dev-python/colorlog-2.7.0 b/metadata/md5-cache/dev-python/colorlog-2.7.0
index 15399b81355b..ec9076e1ff00 100644
--- a/metadata/md5-cache/dev-python/colorlog-2.7.0
+++ b/metadata/md5-cache/dev-python/colorlog-2.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/c/colorlog/colorlog-2.7.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=05d5e03b768d31e0d2bfb646936968d0
diff --git a/metadata/md5-cache/dev-python/colorspacious-1.1.0 b/metadata/md5-cache/dev-python/colorspacious-1.1.0
index 8faa781bc08d..4d070a09bbd9 100644
--- a/metadata/md5-cache/dev-python/colorspacious-1.1.0
+++ b/metadata/md5-cache/dev-python/colorspacious-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/colorspacious/colorspacious-1.1.0.zip
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c5654164e7f7e20281a16bfff1062b80
diff --git a/metadata/md5-cache/dev-python/columnize-0.3.5-r1 b/metadata/md5-cache/dev-python/columnize-0.3.5-r1
index 7b3765403c9a..1301daa10590 100644
--- a/metadata/md5-cache/dev-python/columnize-0.3.5-r1
+++ b/metadata/md5-cache/dev-python/columnize-0.3.5-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=mirror://pypi/c/columnize/columnize-0.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=f56daa2bdc054c272314c4f41ba223a8
diff --git a/metadata/md5-cache/dev-python/columnize-0.3.9 b/metadata/md5-cache/dev-python/columnize-0.3.9
index 16cd5e228176..4b67e5dc6c0d 100644
--- a/metadata/md5-cache/dev-python/columnize-0.3.9
+++ b/metadata/md5-cache/dev-python/columnize-0.3.9
@@ -10,5 +10,5 @@ RDEPEND=dev-python/backports-shutil_get_terminal_size[python_targets_python2_7(-
 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/columnize/columnize-0.3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1e347d099c79978d6d4fbb334596586a
diff --git a/metadata/md5-cache/dev-python/common-0.1.2 b/metadata/md5-cache/dev-python/common-0.1.2
index 7858a356d18b..2c26cc679006 100644
--- a/metadata/md5-cache/dev-python/common-0.1.2
+++ b/metadata/md5-cache/dev-python/common-0.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=mirror://pypi/c/common/common-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=32e06fb778836120fb885762bb4aa76c
diff --git a/metadata/md5-cache/dev-python/configargparse-0.11.0 b/metadata/md5-cache/dev-python/configargparse-0.11.0
index 631451b6c4f2..f50087089d91 100644
--- a/metadata/md5-cache/dev-python/configargparse-0.11.0
+++ b/metadata/md5-cache/dev-python/configargparse-0.11.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/C/ConfigArgParse/ConfigArgParse-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=de521d9a91f4d152ca8e4f806b1b6a84
diff --git a/metadata/md5-cache/dev-python/configargparse-0.12.0 b/metadata/md5-cache/dev-python/configargparse-0.12.0
index ac7ce9a7bd98..a385454cfad3 100644
--- a/metadata/md5-cache/dev-python/configargparse-0.12.0
+++ b/metadata/md5-cache/dev-python/configargparse-0.12.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/C/ConfigArgParse/ConfigArgParse-0.12.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e1402091ac0113c637412f43b85fdaec
diff --git a/metadata/md5-cache/dev-python/configclass-0.1.0 b/metadata/md5-cache/dev-python/configclass-0.1.0
index f154ede35344..bbccee36ff8a 100644
--- a/metadata/md5-cache/dev-python/configclass-0.1.0
+++ b/metadata/md5-cache/dev-python/configclass-0.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/mergedict-0.2.0[python_targets_pypy(-)?,python_targets_pyth
 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/c/configclass/configclass-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=158ddd797f96096c64d7bc3a73904b73
diff --git a/metadata/md5-cache/dev-python/configobj-5.0.6 b/metadata/md5-cache/dev-python/configobj-5.0.6
index 2d753e1c227e..abd3f28e2b55 100644
--- a/metadata/md5-cache/dev-python/configobj-5.0.6
+++ b/metadata/md5-cache/dev-python/configobj-5.0.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,pyth
 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/c/configobj/configobj-5.0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0525adb80421fc744b8d4ad3587af6c2
diff --git a/metadata/md5-cache/dev-python/configparser-3.3.0.2 b/metadata/md5-cache/dev-python/configparser-3.3.0.2
index d2dd4986bb50..73ec02787674 100644
--- a/metadata/md5-cache/dev-python/configparser-3.3.0.2
+++ b/metadata/md5-cache/dev-python/configparser-3.3.0.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/configparser/configparser-3.3.0r2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c789bce72f8780eb6250d9c1bc2dd518
diff --git a/metadata/md5-cache/dev-python/configparser-3.5.0 b/metadata/md5-cache/dev-python/configparser-3.5.0
index cd1c78db9ebe..88f61afa2707 100644
--- a/metadata/md5-cache/dev-python/configparser-3.5.0
+++ b/metadata/md5-cache/dev-python/configparser-3.5.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/configparser/configparser-3.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2e44dee0caae164fd50b999c4ab1083e
diff --git a/metadata/md5-cache/dev-python/configparser-3.5.0-r1 b/metadata/md5-cache/dev-python/configparser-3.5.0-r1
index 60f3e18e2e05..aac8c911c5b4 100644
--- a/metadata/md5-cache/dev-python/configparser-3.5.0-r1
+++ b/metadata/md5-cache/dev-python/configparser-3.5.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/backports[python_targets_pypy(-)?,python_targets_python2_7(-)
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/configparser/configparser-3.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1eea567fb7dc6c0732b00257c96bc136
diff --git a/metadata/md5-cache/dev-python/configshell-1.6 b/metadata/md5-cache/dev-python/configshell-1.6
index c02c533cc102..bc46def21806 100644
--- a/metadata/md5-cache/dev-python/configshell-1.6
+++ b/metadata/md5-cache/dev-python/configshell-1.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/epydoc[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/Datera/configshell/archive/1.6.tar.gz -> configshell-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=561d9438e1caaff3fc7233545e90d4ed
diff --git a/metadata/md5-cache/dev-python/configshell-9999 b/metadata/md5-cache/dev-python/configshell-9999
index 013747db368d..542a159dd86d 100644
--- a/metadata/md5-cache/dev-python/configshell-9999
+++ b/metadata/md5-cache/dev-python/configshell-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-python/epydoc[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyparsing[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/urwid[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_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=561d9438e1caaff3fc7233545e90d4ed
diff --git a/metadata/md5-cache/dev-python/configshell-fb-1.1.24 b/metadata/md5-cache/dev-python/configshell-fb-1.1.24
index 54eda6886897..671663153e43 100644
--- a/metadata/md5-cache/dev-python/configshell-fb-1.1.24
+++ b/metadata/md5-cache/dev-python/configshell-fb-1.1.24
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3
 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/configshell-fb/configshell-fb-1.1.24.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ae10c8761ae82a49bd1389e4cd89101d
diff --git a/metadata/md5-cache/dev-python/constantly-15.1.0 b/metadata/md5-cache/dev-python/constantly-15.1.0
index b8984343b70d..21d53a9adf00 100644
--- a/metadata/md5-cache/dev-python/constantly-15.1.0
+++ b/metadata/md5-cache/dev-python/constantly-15.1.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/c/constantly/constantly-15.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0da5bbf474eb13b13439e2c81c947872
diff --git a/metadata/md5-cache/dev-python/constantly-15.1.0-r1 b/metadata/md5-cache/dev-python/constantly-15.1.0-r1
index 6bd8edc61560..569be8e2d85e 100644
--- a/metadata/md5-cache/dev-python/constantly-15.1.0-r1
+++ b/metadata/md5-cache/dev-python/constantly-15.1.0-r1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/twisted/constantly/archive/15.1.0.tar.gz -> constantly-15.1.0.gh.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d9b644010c3f023d96be81919611aeca
diff --git a/metadata/md5-cache/dev-python/construct-2.8.21 b/metadata/md5-cache/dev-python/construct-2.8.21
index 24a49c43354c..34ade2479d12 100644
--- a/metadata/md5-cache/dev-python/construct-2.8.21
+++ b/metadata/md5-cache/dev-python/construct-2.8.21
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/construct/construct/archive/v2.8.21.tar.gz -> construct-2.8.21.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a9b7b2213d7da081385c8c13fd0fe0cd
diff --git a/metadata/md5-cache/dev-python/contextlib2-0.5.4 b/metadata/md5-cache/dev-python/contextlib2-0.5.4
index 18e6f7a045ce..a661d6f9d98b 100644
--- a/metadata/md5-cache/dev-python/contextlib2-0.5.4
+++ b/metadata/md5-cache/dev-python/contextlib2-0.5.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/c/contextlib2/contextlib2-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5b832321c4f0fce2a0c2950aac211e4d
diff --git a/metadata/md5-cache/dev-python/contextlib2-0.5.5 b/metadata/md5-cache/dev-python/contextlib2-0.5.5
index f7168f56c7fc..856a54187ed0 100644
--- a/metadata/md5-cache/dev-python/contextlib2-0.5.5
+++ b/metadata/md5-cache/dev-python/contextlib2-0.5.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/contextlib2/contextlib2-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cea3887b9c43e847778d3475c0bf6ec7
diff --git a/metadata/md5-cache/dev-python/cookies-2.2.1 b/metadata/md5-cache/dev-python/cookies-2.2.1
index 29274a53bde7..1686c9f90c99 100644
--- a/metadata/md5-cache/dev-python/cookies-2.2.1
+++ b/metadata/md5-cache/dev-python/cookies-2.2.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cookies/cookies-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2c1d9bf6a888da2938c8af43271aa91a
diff --git a/metadata/md5-cache/dev-python/corner-2.0.1 b/metadata/md5-cache/dev-python/corner-2.0.1
index 6af3e749d133..4c85914eb8fa 100644
--- a/metadata/md5-cache/dev-python/corner-2.0.1
+++ b/metadata/md5-cache/dev-python/corner-2.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/c/corner/corner-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ffbdfd69228b80cf66b9aa6b24cdb4a9
diff --git a/metadata/md5-cache/dev-python/cosmolopy-0.1.104-r1 b/metadata/md5-cache/dev-python/cosmolopy-0.1.104-r1
index 30179833765f..139af16a1f4c 100644
--- a/metadata/md5-cache/dev-python/cosmolopy-0.1.104-r1
+++ b/metadata/md5-cache/dev-python/cosmolopy-0.1.104-r1
@@ -10,5 +10,5 @@ RDEPEND=sci-libs/scipy[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/C/CosmoloPy/CosmoloPy-0.1.104.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7b0be4670e3a3b0f5ecedbaca17cd8ef
diff --git a/metadata/md5-cache/dev-python/couchdb-python-1.1 b/metadata/md5-cache/dev-python/couchdb-python-1.1
index 83372c926129..957fd27584e9 100644
--- a/metadata/md5-cache/dev-python/couchdb-python-1.1
+++ b/metadata/md5-cache/dev-python/couchdb-python-1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/C/CouchDB/CouchDB-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3c7bc89a3cc871cdbc62caaabd1cb2ef
diff --git a/metadata/md5-cache/dev-python/cov-core-1.15.0 b/metadata/md5-cache/dev-python/cov-core-1.15.0
index c66594ab5653..a60007406d8b 100644
--- a/metadata/md5-cache/dev-python/cov-core-1.15.0
+++ b/metadata/md5-cache/dev-python/cov-core-1.15.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/coverage-3.6[python_targets_pypy(-)?,python_targets_pypy3(-
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cov-core/cov-core-1.15.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=02827b4a3e1ced958be1e0d3027da197
diff --git a/metadata/md5-cache/dev-python/cov-core-1.7 b/metadata/md5-cache/dev-python/cov-core-1.7
index e4074646ed55..5995baa4a893 100644
--- a/metadata/md5-cache/dev-python/cov-core-1.7
+++ b/metadata/md5-cache/dev-python/cov-core-1.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/coverage[python_targets_pypy(-)?,python_targets_pypy3(-)?,pyt
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cov-core/cov-core-1.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=abbb6646d475565aa74ab57e07351802
diff --git a/metadata/md5-cache/dev-python/coverage-4.2 b/metadata/md5-cache/dev-python/coverage-4.2
index 35e739e10751..f71c7010b625 100644
--- a/metadata/md5-cache/dev-python/coverage-4.2
+++ b/metadata/md5-cache/dev-python/coverage-4.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/coverage/coverage-4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ec7e657ad92eafb07cc1f8739a2391a4
diff --git a/metadata/md5-cache/dev-python/crcmod-1.7-r2 b/metadata/md5-cache/dev-python/crcmod-1.7-r2
index 11abf8fe6620..dd895b39d4e0 100644
--- a/metadata/md5-cache/dev-python/crcmod-1.7-r2
+++ b/metadata/md5-cache/dev-python/crcmod-1.7-r2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/crcmod/crcmod-1.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=9d592b9e75735fe2a53d938f91a0454a
diff --git a/metadata/md5-cache/dev-python/croniter-0.3.11 b/metadata/md5-cache/dev-python/croniter-0.3.11
index 75e0dda2e3e9..d17a564d37da 100644
--- a/metadata/md5-cache/dev-python/croniter-0.3.11
+++ b/metadata/md5-cache/dev-python/croniter-0.3.11
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/c/croniter/croniter-0.3.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=029cc012f2ba012dbce12770d9131bc9
diff --git a/metadata/md5-cache/dev-python/croniter-0.3.15 b/metadata/md5-cache/dev-python/croniter-0.3.15
index 39c297837c43..a3296c2b0ba9 100644
--- a/metadata/md5-cache/dev-python/croniter-0.3.15
+++ b/metadata/md5-cache/dev-python/croniter-0.3.15
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/c/croniter/croniter-0.3.15.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1659ab1a7b4cea416a1f6909475e9c16
diff --git a/metadata/md5-cache/dev-python/croniter-0.3.17 b/metadata/md5-cache/dev-python/croniter-0.3.17
index 30ddd93318eb..93b736ad85c4 100644
--- a/metadata/md5-cache/dev-python/croniter-0.3.17
+++ b/metadata/md5-cache/dev-python/croniter-0.3.17
@@ -10,5 +10,5 @@ RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_p
 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/croniter/croniter-0.3.17.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6816997edbb9933a31d1677ac9deaa8e
diff --git a/metadata/md5-cache/dev-python/crumbs-2.1.0 b/metadata/md5-cache/dev-python/crumbs-2.1.0
index 873edce3a2ea..27f5cda51bdf 100644
--- a/metadata/md5-cache/dev-python/crumbs-2.1.0
+++ b/metadata/md5-cache/dev-python/crumbs-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyinotify[python_targets_python2_7(-)?,python_targets_python3
 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/crumbs/crumbs-2.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b9873442ac650b8c7523655e9c0d7d9d
diff --git a/metadata/md5-cache/dev-python/cryptography-2.2.2-r1 b/metadata/md5-cache/dev-python/cryptography-2.2.2-r1
index ab95f7c400d3..4fe8fb0b949f 100644
--- a/metadata/md5-cache/dev-python/cryptography-2.2.2-r1
+++ b/metadata/md5-cache/dev-python/cryptography-2.2.2-r1
@@ -10,5 +10,5 @@ RDEPEND=!libressl? ( dev-libs/openssl:0= ( || ( dev-libs/openssl:0[-bindist(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cryptography/cryptography-2.2.2.tar.gz
-_eclasses_=desktop	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bec7fd07f176250a438690b84c3101cf
diff --git a/metadata/md5-cache/dev-python/cryptography-2.3 b/metadata/md5-cache/dev-python/cryptography-2.3
index 5ea9fb86241f..0544eb7a165b 100644
--- a/metadata/md5-cache/dev-python/cryptography-2.3
+++ b/metadata/md5-cache/dev-python/cryptography-2.3
@@ -10,5 +10,5 @@ RDEPEND=!libressl? ( dev-libs/openssl:0= ( || ( dev-libs/openssl:0[-bindist(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cryptography/cryptography-2.3.tar.gz
-_eclasses_=desktop	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f615c55a1ee70c09c7cad5f377a7db3b
diff --git a/metadata/md5-cache/dev-python/cryptography-vectors-2.2.2 b/metadata/md5-cache/dev-python/cryptography-vectors-2.2.2
index 2449363ba74a..95182aa8b4aa 100644
--- a/metadata/md5-cache/dev-python/cryptography-vectors-2.2.2
+++ b/metadata/md5-cache/dev-python/cryptography-vectors-2.2.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cryptography-vectors/cryptography_vectors-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a7f1bbd22dcac5cb5cc340994900ad44
diff --git a/metadata/md5-cache/dev-python/cryptography-vectors-2.3 b/metadata/md5-cache/dev-python/cryptography-vectors-2.3
index 3a9d7fec6417..0213d742d50d 100644
--- a/metadata/md5-cache/dev-python/cryptography-vectors-2.3
+++ b/metadata/md5-cache/dev-python/cryptography-vectors-2.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cryptography-vectors/cryptography_vectors-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bba67401da30f4cac980c55c97cde3f8
diff --git a/metadata/md5-cache/dev-python/cssselect-0.9.1 b/metadata/md5-cache/dev-python/cssselect-0.9.1
index 87f101ac608e..3884ddfca638 100644
--- a/metadata/md5-cache/dev-python/cssselect-0.9.1
+++ b/metadata/md5-cache/dev-python/cssselect-0.9.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cssselect/cssselect-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2397d3e8ba97cfe8c0586d9575d3492f
diff --git a/metadata/md5-cache/dev-python/cssselect-1.0.1 b/metadata/md5-cache/dev-python/cssselect-1.0.1
index 165b90c8922b..dd7e1390e891 100644
--- a/metadata/md5-cache/dev-python/cssselect-1.0.1
+++ b/metadata/md5-cache/dev-python/cssselect-1.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/c/cssselect/cssselect-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3cfac4135a213529c8e3b8171298835f
diff --git a/metadata/md5-cache/dev-python/cssselect-1.0.3 b/metadata/md5-cache/dev-python/cssselect-1.0.3
index 3e0d40ff8354..e3e9e29f964c 100644
--- a/metadata/md5-cache/dev-python/cssselect-1.0.3
+++ b/metadata/md5-cache/dev-python/cssselect-1.0.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_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/scrapy/cssselect/archive/v1.0.3.tar.gz -> cssselect-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=81983c658bbc4ec250f01c228f68fbca
diff --git a/metadata/md5-cache/dev-python/cssselect2-0.2.0 b/metadata/md5-cache/dev-python/cssselect2-0.2.0
index 6c5f42bcc87f..cdc33ce3c5dc 100644
--- a/metadata/md5-cache/dev-python/cssselect2-0.2.0
+++ b/metadata/md5-cache/dev-python/cssselect2-0.2.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cssselect2/cssselect2-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d2cb7ec4406ff424e7095887e7a45d9c
diff --git a/metadata/md5-cache/dev-python/cssutils-1.0.1 b/metadata/md5-cache/dev-python/cssutils-1.0.1
index 34dab44caf90..3344ba2aec6b 100644
--- a/metadata/md5-cache/dev-python/cssutils-1.0.1
+++ b/metadata/md5-cache/dev-python/cssutils-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-
 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/c/cssutils/cssutils-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=96729959d221282d198c8e52d093e2ba
diff --git a/metadata/md5-cache/dev-python/cssutils-1.0.2 b/metadata/md5-cache/dev-python/cssutils-1.0.2
index b9b1f09b2b0f..2a0b9f84c2ec 100644
--- a/metadata/md5-cache/dev-python/cssutils-1.0.2
+++ b/metadata/md5-cache/dev-python/cssutils-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-
 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/c/cssutils/cssutils-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0a2290f28242e18f50924150c21f3b43
diff --git a/metadata/md5-cache/dev-python/ctypesgen-0_p72-r1 b/metadata/md5-cache/dev-python/ctypesgen-0_p72-r1
index c292f119ed18..c8ee063257f4 100644
--- a/metadata/md5-cache/dev-python/ctypesgen-0_p72-r1
+++ b/metadata/md5-cache/dev-python/ctypesgen-0_p72-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=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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-python/cursive-0.1.1 b/metadata/md5-cache/dev-python/cursive-0.1.1
index dc9f630b9302..cb005be85447 100644
--- a/metadata/md5-cache/dev-python/cursive-0.1.1
+++ b/metadata/md5-cache/dev-python/cursive-0.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cursive/cursive-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=148f8d320853ce5fc7b5fd6f599d73c0
diff --git a/metadata/md5-cache/dev-python/cursive-0.1.2 b/metadata/md5-cache/dev-python/cursive-0.1.2
index 51f5ddac661f..c99f58ffbd4e 100644
--- a/metadata/md5-cache/dev-python/cursive-0.1.2
+++ b/metadata/md5-cache/dev-python/cursive-0.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cursive/cursive-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=af0f32b516918fe53bfbba4b1f0c00e8
diff --git a/metadata/md5-cache/dev-python/cursive-0.2.1 b/metadata/md5-cache/dev-python/cursive-0.2.1
index f20e086841cd..7efb4d65934f 100644
--- a/metadata/md5-cache/dev-python/cursive-0.2.1
+++ b/metadata/md5-cache/dev-python/cursive-0.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3
 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/cursive/cursive-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=19df6d28d345fb437ec946e75bed6802
diff --git a/metadata/md5-cache/dev-python/curtsies-0.2.10 b/metadata/md5-cache/dev-python/curtsies-0.2.10
index e0168a2bf20a..abbdc6093a45 100644
--- a/metadata/md5-cache/dev-python/curtsies-0.2.10
+++ b/metadata/md5-cache/dev-python/curtsies-0.2.10
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/blessings-1.5[python_targets_python2_7(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/c/curtsies/curtsies-0.2.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=55c68e2d305f79308149a6fe0851b477
diff --git a/metadata/md5-cache/dev-python/curtsies-0.2.11 b/metadata/md5-cache/dev-python/curtsies-0.2.11
index 8721fdfa12a4..aa60f9561c5e 100644
--- a/metadata/md5-cache/dev-python/curtsies-0.2.11
+++ b/metadata/md5-cache/dev-python/curtsies-0.2.11
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/blessings-1.5[python_targets_python2_7(-)?,python_targets_p
 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/curtsies/curtsies-0.2.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e2e52c0de36398ba8ff69023308b8103
diff --git a/metadata/md5-cache/dev-python/cvxopt-1.1.9 b/metadata/md5-cache/dev-python/cvxopt-1.1.9
index b6ba4ecd7f95..a97e094658ca 100644
--- a/metadata/md5-cache/dev-python/cvxopt-1.1.9
+++ b/metadata/md5-cache/dev-python/cvxopt-1.1.9
@@ -10,5 +10,5 @@ RDEPEND=virtual/blas virtual/lapack sci-libs/amd:0= sci-libs/cholmod:0= sci-libs
 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/cvxopt/cvxopt/archive/1.1.9.tar.gz -> cvxopt-1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5d29d302e26de70a73c1873e5ba3e4fd
diff --git a/metadata/md5-cache/dev-python/cx_Freeze-4.3.4 b/metadata/md5-cache/dev-python/cx_Freeze-4.3.4
index 9ac54f6b2c00..3c067faf8102 100644
--- a/metadata/md5-cache/dev-python/cx_Freeze-4.3.4
+++ b/metadata/md5-cache/dev-python/cx_Freeze-4.3.4
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cx_Freeze/cx_Freeze-4.3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=232b8adf83d428e6bbe2c7e359804b15
diff --git a/metadata/md5-cache/dev-python/cx_Freeze-5.0.2 b/metadata/md5-cache/dev-python/cx_Freeze-5.0.2
index 0d57c6c20a86..cbb04ec13e74 100644
--- a/metadata/md5-cache/dev-python/cx_Freeze-5.0.2
+++ b/metadata/md5-cache/dev-python/cx_Freeze-5.0.2
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cx_Freeze/cx_Freeze-5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e01f9bd71557c37d07c4fa5f00a4086d
diff --git a/metadata/md5-cache/dev-python/cycler-0.10.0 b/metadata/md5-cache/dev-python/cycler-0.10.0
index 3622a483cd6a..b4ee8290f9ed 100644
--- a/metadata/md5-cache/dev-python/cycler-0.10.0
+++ b/metadata/md5-cache/dev-python/cycler-0.10.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/C/Cycler/cycler-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c4b850f41a6cdead22e07a9169e31367
diff --git a/metadata/md5-cache/dev-python/cython-0.25.2 b/metadata/md5-cache/dev-python/cython-0.25.2
index 66bf27822c1f..966a5b2a9162 100644
--- a/metadata/md5-cache/dev-python/cython-0.25.2
+++ b/metadata/md5-cache/dev-python/cython-0.25.2
@@ -10,5 +10,5 @@ RDEPEND=emacs? ( virtual/emacs ) python_targets_python2_7? ( >=dev-lang/python-2
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/C/Cython/Cython-0.25.2.tar.gz
-_eclasses_=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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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_=18646b92319067bc9bc994af2e063ff3
diff --git a/metadata/md5-cache/dev-python/cython-0.26.1 b/metadata/md5-cache/dev-python/cython-0.26.1
index 4fb55ca88392..39743cbfeff8 100644
--- a/metadata/md5-cache/dev-python/cython-0.26.1
+++ b/metadata/md5-cache/dev-python/cython-0.26.1
@@ -10,5 +10,5 @@ RDEPEND=emacs? ( virtual/emacs ) python_targets_python2_7? ( >=dev-lang/python-2
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/C/Cython/Cython-0.26.1.tar.gz
-_eclasses_=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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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_=c5699b14caecfb356d23d932c6f577be
diff --git a/metadata/md5-cache/dev-python/cython-0.28.2 b/metadata/md5-cache/dev-python/cython-0.28.2
index e4df2a4631ac..a823e7ab225a 100644
--- a/metadata/md5-cache/dev-python/cython-0.28.2
+++ b/metadata/md5-cache/dev-python/cython-0.28.2
@@ -10,5 +10,5 @@ RDEPEND=emacs? ( virtual/emacs ) python_targets_python2_7? ( >=dev-lang/python-2
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/C/Cython/Cython-0.28.2.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	elisp-common	23f47b2e1de7abf387105eddd1318738	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	elisp-common	23f47b2e1de7abf387105eddd1318738	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f46e0293a644fe5db029c1208699e5ca
diff --git a/metadata/md5-cache/dev-python/cython-0.28.4 b/metadata/md5-cache/dev-python/cython-0.28.4
index a98e23fbfad9..97dcaa661dfd 100644
--- a/metadata/md5-cache/dev-python/cython-0.28.4
+++ b/metadata/md5-cache/dev-python/cython-0.28.4
@@ -10,5 +10,5 @@ RDEPEND=emacs? ( virtual/emacs ) python_targets_python2_7? ( >=dev-lang/python-2
 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/Cython/Cython-0.28.4.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	elisp-common	23f47b2e1de7abf387105eddd1318738	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	elisp-common	23f47b2e1de7abf387105eddd1318738	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1d943df8526af7584df630894f25f731
diff --git a/metadata/md5-cache/dev-python/cytoolz-0.8.0 b/metadata/md5-cache/dev-python/cytoolz-0.8.0
index 970ed18a03a9..2b8ea1bc8f95 100644
--- a/metadata/md5-cache/dev-python/cytoolz-0.8.0
+++ b/metadata/md5-cache/dev-python/cytoolz-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cytoolz/cytoolz-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dffd9e003190c04138d30ca697d724c9
diff --git a/metadata/md5-cache/dev-python/cytoolz-0.8.2 b/metadata/md5-cache/dev-python/cytoolz-0.8.2
index 3d2bc5b8e44e..bed040787dca 100644
--- a/metadata/md5-cache/dev-python/cytoolz-0.8.2
+++ b/metadata/md5-cache/dev-python/cytoolz-0.8.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cytoolz/cytoolz-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=140946309618ae705b6eb12ec47737d0
diff --git a/metadata/md5-cache/dev-python/d2to1-0.2.12_p1 b/metadata/md5-cache/dev-python/d2to1-0.2.12_p1
index fd57534215c6..9f89cfb2ca13 100644
--- a/metadata/md5-cache/dev-python/d2to1-0.2.12_p1
+++ b/metadata/md5-cache/dev-python/d2to1-0.2.12_p1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,pyth
 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/d/d2to1/d2to1-0.2.12.post1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=688c34ed45f0e4525059a9f39b1265a0
diff --git a/metadata/md5-cache/dev-python/dap-2.2.6.7-r1 b/metadata/md5-cache/dev-python/dap-2.2.6.7-r1
index 1229f51e092b..50e162d9d0f6 100644
--- a/metadata/md5-cache/dev-python/dap-2.2.6.7-r1
+++ b/metadata/md5-cache/dev-python/dap-2.2.6.7-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/dap/dap-2.2.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=2084ee58ef0a0af8cce78ce9a8de22db
diff --git a/metadata/md5-cache/dev-python/dask-0.10.2 b/metadata/md5-cache/dev-python/dask-0.10.2
index 35f628dc1ef7..f17bed215650 100644
--- a/metadata/md5-cache/dev-python/dask-0.10.2
+++ b/metadata/md5-cache/dev-python/dask-0.10.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/bokeh[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/d/dask/dask-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=18950bad0fb4501b2ca0b512bb713063
diff --git a/metadata/md5-cache/dev-python/dask-0.15.1 b/metadata/md5-cache/dev-python/dask-0.15.1
index 713dbec51003..3784e23fabed 100644
--- a/metadata/md5-cache/dev-python/dask-0.15.1
+++ b/metadata/md5-cache/dev-python/dask-0.15.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/cloudpickle-0.2.1[python_targets_python2_7(-)?,python_targe
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/dask/dask-0.15.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5a0a4e5310d3a80ddb3207a2488fe49b
diff --git a/metadata/md5-cache/dev-python/dask-0.18.2 b/metadata/md5-cache/dev-python/dask-0.18.2
index 620c39502b72..7f9038be5054 100644
--- a/metadata/md5-cache/dev-python/dask-0.18.2
+++ b/metadata/md5-cache/dev-python/dask-0.18.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/cloudpickle-0.2.1[python_targets_python2_7(-)?,python_targe
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/dask/dask-0.18.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f3da9b5d75a538afd84757e5db1369f5
diff --git a/metadata/md5-cache/dev-python/datashape-0.5.4 b/metadata/md5-cache/dev-python/datashape-0.5.4
index d7e24dd80082..4c19e372e795 100644
--- a/metadata/md5-cache/dev-python/datashape-0.5.4
+++ b/metadata/md5-cache/dev-python/datashape-0.5.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/numpy-1.7[python_targets_python2_7(-)?,python_targets_pytho
 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/blaze/datashape/archive/0.5.4.tar.gz -> datashape-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a922e5d381c7b12213de8e552464f609
diff --git a/metadata/md5-cache/dev-python/dbusmock-0.16.9 b/metadata/md5-cache/dev-python/dbusmock-0.16.9
index daf361d38b7f..858b19c75156 100644
--- a/metadata/md5-cache/dev-python/dbusmock-0.16.9
+++ b/metadata/md5-cache/dev-python/dbusmock-0.16.9
@@ -10,5 +10,5 @@ RDEPEND=dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_pytho
 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/python-dbusmock/python-dbusmock-0.16.9.tar.gz -> dbusmock-0.16.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d7dee73a27ccf868344e5c5a633e5afe
diff --git a/metadata/md5-cache/dev-python/dbutils-1.1-r1 b/metadata/md5-cache/dev-python/dbutils-1.1-r1
index 004e5bcd7d0d..05949d9a7fb6 100644
--- a/metadata/md5-cache/dev-python/dbutils-1.1-r1
+++ b/metadata/md5-cache/dev-python/dbutils-1.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=mirror://pypi/d/dbutils/DBUtils-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fdf7c2580c93e118a4b9ce3a1884265a
diff --git a/metadata/md5-cache/dev-python/ddt-1.1.1 b/metadata/md5-cache/dev-python/ddt-1.1.1
index 9244fd17854d..72f3b412ff11 100644
--- a/metadata/md5-cache/dev-python/ddt-1.1.1
+++ b/metadata/md5-cache/dev-python/ddt-1.1.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/d/ddt/ddt-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4027a5a8dbcf1797ad9efc2d40b4cc9d
diff --git a/metadata/md5-cache/dev-python/debtcollector-1.11.0 b/metadata/md5-cache/dev-python/debtcollector-1.11.0
index 2c7fce94e7b2..bc8a6d671e6d 100644
--- a/metadata/md5-cache/dev-python/debtcollector-1.11.0
+++ b/metadata/md5-cache/dev-python/debtcollector-1.11.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/debtcollector/debtcollector-1.11.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ea662ea6c30c59921410ebeb3e74faed
diff --git a/metadata/md5-cache/dev-python/debtcollector-1.17.1 b/metadata/md5-cache/dev-python/debtcollector-1.17.1
index 1bb2c8a0411c..ff0a47a742a2 100644
--- a/metadata/md5-cache/dev-python/debtcollector-1.17.1
+++ b/metadata/md5-cache/dev-python/debtcollector-1.17.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/debtcollector/debtcollector-1.17.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9163f76361c6ad7ac56a42feec4d70b2
diff --git a/metadata/md5-cache/dev-python/debtcollector-1.19.0 b/metadata/md5-cache/dev-python/debtcollector-1.19.0
index 15fba9ab1a2b..bdf2bc80f1ba 100644
--- a/metadata/md5-cache/dev-python/debtcollector-1.19.0
+++ b/metadata/md5-cache/dev-python/debtcollector-1.19.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/debtcollector/debtcollector-1.19.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=09dfaf00b6d6f12f09d0e12d925b6fe1
diff --git a/metadata/md5-cache/dev-python/decorator-4.1.2 b/metadata/md5-cache/dev-python/decorator-4.1.2
index 5a259ada18c6..31d69422b586 100644
--- a/metadata/md5-cache/dev-python/decorator-4.1.2
+++ b/metadata/md5-cache/dev-python/decorator-4.1.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/d/decorator/decorator-4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bacf76ce89de3880039d6c802a563824
diff --git a/metadata/md5-cache/dev-python/decorator-4.2.1 b/metadata/md5-cache/dev-python/decorator-4.2.1
index 279bf75e1db7..226d6198f217 100644
--- a/metadata/md5-cache/dev-python/decorator-4.2.1
+++ b/metadata/md5-cache/dev-python/decorator-4.2.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/d/decorator/decorator-4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bacf76ce89de3880039d6c802a563824
diff --git a/metadata/md5-cache/dev-python/decoratortools-1.8-r1 b/metadata/md5-cache/dev-python/decoratortools-1.8-r1
index 963f78a25991..4ac09a931c70 100644
--- a/metadata/md5-cache/dev-python/decoratortools-1.8-r1
+++ b/metadata/md5-cache/dev-python/decoratortools-1.8-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/D/DecoratorTools/DecoratorTools-1.8.zip
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=42b5fe1c045cf1060f6ea15b228db559
diff --git a/metadata/md5-cache/dev-python/deform-0.9.9 b/metadata/md5-cache/dev-python/deform-0.9.9
index d74e6b22d63b..f72c68587cd9 100644
--- a/metadata/md5-cache/dev-python/deform-0.9.9
+++ b/metadata/md5-cache/dev-python/deform-0.9.9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/d/deform/deform-0.9.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a01c6dcdbb0f1c2585eaed839f37b7f8
diff --git a/metadata/md5-cache/dev-python/defusedxml-0.5.0 b/metadata/md5-cache/dev-python/defusedxml-0.5.0
index 708811e3d91c..bef3c05113d5 100644
--- a/metadata/md5-cache/dev-python/defusedxml-0.5.0
+++ b/metadata/md5-cache/dev-python/defusedxml-0.5.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy
 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/d/defusedxml/defusedxml-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0811868a4ed2a22f433f2af4010c0fc4
diff --git a/metadata/md5-cache/dev-python/demjson-2.2.4 b/metadata/md5-cache/dev-python/demjson-2.2.4
index a271577da753..3b4d47bed653 100644
--- a/metadata/md5-cache/dev-python/demjson-2.2.4
+++ b/metadata/md5-cache/dev-python/demjson-2.2.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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://deron.meranda.us/python/demjson/dist/demjson-2.2.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=32fd6274f80306070ca9ee03c79aefcf
diff --git a/metadata/md5-cache/dev-python/deprecation-1.0.1 b/metadata/md5-cache/dev-python/deprecation-1.0.1
index 736bd26d0e0c..606b7d8f6713 100644
--- a/metadata/md5-cache/dev-python/deprecation-1.0.1
+++ b/metadata/md5-cache/dev-python/deprecation-1.0.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/d/deprecation/deprecation-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f2518bb6ff62355f4f550c75c4982db1
diff --git a/metadata/md5-cache/dev-python/detox-0.11 b/metadata/md5-cache/dev-python/detox-0.11
index a25ceb034ab1..32ec9804f419 100644
--- a/metadata/md5-cache/dev-python/detox-0.11
+++ b/metadata/md5-cache/dev-python/detox-0.11
@@ -10,5 +10,5 @@ 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
 SRC_URI=mirror://pypi/d/detox/detox-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bae02627b81bf00c16334ea51387ef6c
diff --git a/metadata/md5-cache/dev-python/dexml-0.5.1 b/metadata/md5-cache/dev-python/dexml-0.5.1
index 1eecba46a15c..2a275c31c02d 100644
--- a/metadata/md5-cache/dev-python/dexml-0.5.1
+++ b/metadata/md5-cache/dev-python/dexml-0.5.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/d/dexml/dexml-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ae1e6e712b7715b8ef5c078b3917ff3b
diff --git a/metadata/md5-cache/dev-python/dib-utils-0.0.10 b/metadata/md5-cache/dev-python/dib-utils-0.0.10
index d1f4c4bd5c70..174e0122498b 100644
--- a/metadata/md5-cache/dev-python/dib-utils-0.0.10
+++ b/metadata/md5-cache/dev-python/dib-utils-0.0.10
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,-python_single_target_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/dib-utils/dib-utils-0.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ce462688233c64540f7738e66e4bfcc2
diff --git a/metadata/md5-cache/dev-python/dib-utils-0.0.8 b/metadata/md5-cache/dev-python/dib-utils-0.0.8
index 6571828082c0..de13c6a0a54b 100644
--- a/metadata/md5-cache/dev-python/dib-utils-0.0.8
+++ b/metadata/md5-cache/dev-python/dib-utils-0.0.8
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,-python_single_target_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/dib-utils/dib-utils-0.0.8.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=15618ce00aedd5a9f1ff22679100e932
diff --git a/metadata/md5-cache/dev-python/dicttoxml-1.7.4 b/metadata/md5-cache/dev-python/dicttoxml-1.7.4
index f12e8ed59b7f..502fc73d8b3e 100644
--- a/metadata/md5-cache/dev-python/dicttoxml-1.7.4
+++ b/metadata/md5-cache/dev-python/dicttoxml-1.7.4
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/d/dicttoxml/dicttoxml-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a4887c6d60f43abef1f38b3d2248d78c
diff --git a/metadata/md5-cache/dev-python/diff-cover-1.0.4 b/metadata/md5-cache/dev-python/diff-cover-1.0.4
new file mode 100644
index 000000000000..6ba9e0093035
--- /dev/null
+++ b/metadata/md5-cache/dev-python/diff-cover-1.0.4
@@ -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(-)] >=dev-python/jinja-2.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/jinja2_pluralize[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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(-)] 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/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/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/pycodestyle-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/pyflakes[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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=Automatically find diff lines that need test coverage
+EAPI=6
+HOMEPAGE=https://github.com/Bachmann1234/diff-cover
+IUSE=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/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/jinja-2.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/jinja2_pluralize[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Bachmann1234/diff-cover/archive/v1.0.4.tar.gz -> diff-cover-1.0.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_=df140ed23dddebedddfb0fe13ae05c08
diff --git a/metadata/md5-cache/dev-python/diff-match-patch-20121119 b/metadata/md5-cache/dev-python/diff-match-patch-20121119
index 690d2d88bf53..3d4b6816abdb 100644
--- a/metadata/md5-cache/dev-python/diff-match-patch-20121119
+++ b/metadata/md5-cache/dev-python/diff-match-patch-20121119
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-
 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/d/diff-match-patch/diff-match-patch-20121119.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a6f4bc1b2d5e9818bc4b37143d5aee89
diff --git a/metadata/md5-cache/dev-python/dill-0.2.5 b/metadata/md5-cache/dev-python/dill-0.2.5
index cc44d3af8450..feb0c02fee82 100644
--- a/metadata/md5-cache/dev-python/dill-0.2.5
+++ b/metadata/md5-cache/dev-python/dill-0.2.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/d/dill/dill-0.2.5.tgz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fe877e47499ab2ded76c606df4f89ce9
diff --git a/metadata/md5-cache/dev-python/dingus-0.3.4-r1 b/metadata/md5-cache/dev-python/dingus-0.3.4-r1
index b88624f6f146..fa13818f5616 100644
--- a/metadata/md5-cache/dev-python/dingus-0.3.4-r1
+++ b/metadata/md5-cache/dev-python/dingus-0.3.4-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/dingus/dingus-0.3.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ecd72d391266f24294a528ce1494ea70
diff --git a/metadata/md5-cache/dev-python/dirq-1.7.1 b/metadata/md5-cache/dev-python/dirq-1.7.1
index 232529427bdc..1edecab1499d 100644
--- a/metadata/md5-cache/dev-python/dirq-1.7.1
+++ b/metadata/md5-cache/dev-python/dirq-1.7.1
@@ -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 ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/dirq/dirq-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cbeeac771c0eca56c37b32b4ffb79548
diff --git a/metadata/md5-cache/dev-python/discogs-client-2.0.2 b/metadata/md5-cache/dev-python/discogs-client-2.0.2
index af319f03d4e2..7b6b6f0ce929 100644
--- a/metadata/md5-cache/dev-python/discogs-client-2.0.2
+++ b/metadata/md5-cache/dev-python/discogs-client-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/requests[python_targets_pypy(-)?,python_targets_python2_7(-)?
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/discogs/discogs_client/archive/v2.0.2.tar.gz -> discogs-client-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=12a6202928eea11b8a05754326328cc2
diff --git a/metadata/md5-cache/dev-python/discogs-client-2.2.1 b/metadata/md5-cache/dev-python/discogs-client-2.2.1
index 2570cb457e06..40cfbde224c5 100644
--- a/metadata/md5-cache/dev-python/discogs-client-2.2.1
+++ b/metadata/md5-cache/dev-python/discogs-client-2.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/discogs-client/discogs-client-2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e01075ce65831a4bff28c8ea43fb4974
diff --git a/metadata/md5-cache/dev-python/diskcache-2.8.3 b/metadata/md5-cache/dev-python/diskcache-2.8.3
index de923cbe774e..325e6da922c8 100644
--- a/metadata/md5-cache/dev-python/diskcache-2.8.3
+++ b/metadata/md5-cache/dev-python/diskcache-2.8.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/django[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/diskcache/diskcache-2.8.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fbb2989b0261de16788abe28ea9d39af
diff --git a/metadata/md5-cache/dev-python/disqus-python-0.4.2 b/metadata/md5-cache/dev-python/disqus-python-0.4.2
index 339220aa169e..ca4ff3bd84b2 100644
--- a/metadata/md5-cache/dev-python/disqus-python-0.4.2
+++ b/metadata/md5-cache/dev-python/disqus-python-0.4.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/disqus-python/disqus-python-0.4.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f3e1adbad5e957042ebed8c9131ff875
diff --git a/metadata/md5-cache/dev-python/distlib-0.2.1 b/metadata/md5-cache/dev-python/distlib-0.2.1
index dd9cd37b202d..fddd88fd8878 100644
--- a/metadata/md5-cache/dev-python/distlib-0.2.1
+++ b/metadata/md5-cache/dev-python/distlib-0.2.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_
 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/d/distlib/distlib-0.2.1.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=84554426f262d3537fef4bd3896d0d5c
diff --git a/metadata/md5-cache/dev-python/distlib-0.2.4 b/metadata/md5-cache/dev-python/distlib-0.2.4
index 65af45fbe123..31d12bd1069e 100644
--- a/metadata/md5-cache/dev-python/distlib-0.2.4
+++ b/metadata/md5-cache/dev-python/distlib-0.2.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_
 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/d/distlib/distlib-0.2.4.zip
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=06124f4954cc1f8d56a605749989bb05
diff --git a/metadata/md5-cache/dev-python/distributed-1.18.0 b/metadata/md5-cache/dev-python/distributed-1.18.0
index fdc0785a0105..7d292de4c632 100644
--- a/metadata/md5-cache/dev-python/distributed-1.18.0
+++ b/metadata/md5-cache/dev-python/distributed-1.18.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/click[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/distributed/distributed-1.18.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c9229c538f2473600283e6b518a72ced
diff --git a/metadata/md5-cache/dev-python/distro-1.0.4 b/metadata/md5-cache/dev-python/distro-1.0.4
index 378fc9c37b00..a4cd8f348780 100644
--- a/metadata/md5-cache/dev-python/distro-1.0.4
+++ b/metadata/md5-cache/dev-python/distro-1.0.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/d/distro/distro-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2e2ba2627f1fc982ad683700b1eaad28
diff --git a/metadata/md5-cache/dev-python/dj-database-url-0.4.2 b/metadata/md5-cache/dev-python/dj-database-url-0.4.2
index 1bdbbce6d8ec..883eea6a2b8c 100644
--- a/metadata/md5-cache/dev-python/dj-database-url-0.4.2
+++ b/metadata/md5-cache/dev-python/dj-database-url-0.4.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/d/dj-database-url/dj-database-url-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c6a328699b1fdfe71401989f757e95e6
diff --git a/metadata/md5-cache/dev-python/django-1.11.15 b/metadata/md5-cache/dev-python/django-1.11.15
index dc6e781f42aa..ab0d2031d4cf 100644
--- a/metadata/md5-cache/dev-python/django-1.11.15
+++ b/metadata/md5-cache/dev-python/django-1.11.15
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[sqlite?,threads(+)] ) python_
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://www.djangoproject.com/m/releases/1.11/Django-1.11.15.tar.gz mirror://pypi/D/Django/Django-1.11.15.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	webapp	6ae2395d7f341093c36057cb4f69101a	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	webapp	6ae2395d7f341093c36057cb4f69101a	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d4b315d387e9583a669a55b11df09a20
diff --git a/metadata/md5-cache/dev-python/django-1.11.16 b/metadata/md5-cache/dev-python/django-1.11.16
new file mode 100644
index 000000000000..d76cfd81841a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-1.11.16
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm setup test
+DEPEND=dev-python/pytz[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( >=dev-python/sphinx-1.0.7[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( python_targets_pypy? ( >=virtual/pypy-5:0=[sqlite] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) dev-python/docutils[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pillow[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[sqlite?,threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-admin/webapp-config-1.50.15
+DESCRIPTION=High-level Python web framework
+EAPI=6
+HOMEPAGE=https://www.djangoproject.com/ https://pypi.org/project/Django/
+IUSE=doc sqlite test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=BSD Apache-2.0 MIT
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[sqlite?,threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://www.djangoproject.com/m/releases/1.11/Django-1.11.16.tar.gz mirror://pypi/D/Django/Django-1.11.16.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	webapp	6ae2395d7f341093c36057cb4f69101a	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=5cd106d6f6a5bd7ec15e4e552409c79d
diff --git a/metadata/md5-cache/dev-python/django-2.0.8 b/metadata/md5-cache/dev-python/django-2.0.8
index 32dddfaab2fd..db14a0a70953 100644
--- a/metadata/md5-cache/dev-python/django-2.0.8
+++ b/metadata/md5-cache/dev-python/django-2.0.8
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4[sqlite?,threads(+)] ) py
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://www.djangoproject.com/m/releases/2.0/Django-2.0.8.tar.gz mirror://pypi/D/Django/Django-2.0.8.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	webapp	6ae2395d7f341093c36057cb4f69101a	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	webapp	6ae2395d7f341093c36057cb4f69101a	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5cfb7f454886bb8e4042fed38fe18afb
diff --git a/metadata/md5-cache/dev-python/django-2.0.9 b/metadata/md5-cache/dev-python/django-2.0.9
new file mode 100644
index 000000000000..700618e0f02a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-2.0.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm setup test
+DEPEND=dev-python/pytz[python_targets_python3_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(-)] doc? ( >=dev-python/sphinx-1.0.7[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) dev-python/docutils[python_targets_python3_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[python_targets_python3_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/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_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/mock[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_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/webapp-config-1.50.15
+DESCRIPTION=High-level Python web framework
+EAPI=6
+HOMEPAGE=https://www.djangoproject.com/ https://pypi.org/project/Django/
+IUSE=doc sqlite test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=BSD Apache-2.0 MIT
+RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4[sqlite?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_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/webapp-config-1.50.15
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://www.djangoproject.com/m/releases/2.0/Django-2.0.9.tar.gz mirror://pypi/D/Django/Django-2.0.9.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	webapp	6ae2395d7f341093c36057cb4f69101a	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c8dc6c27591fcef3639b6a592e64dde4
diff --git a/metadata/md5-cache/dev-python/django-2.1.1 b/metadata/md5-cache/dev-python/django-2.1.1
deleted file mode 100644
index b7cd5193eb47..000000000000
--- a/metadata/md5-cache/dev-python/django-2.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=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(-)] doc? ( >=dev-python/sphinx-1.0.7[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(-)] ) test? ( python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) dev-python/docutils[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(-)] dev-python/numpy[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(-)] dev-python/pillow[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(-)] dev-python/pyyaml[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(-)] dev-python/mock[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[sqlite?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?,threads(+)] ) >=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(-)]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=High-level Python web framework
-EAPI=7
-HOMEPAGE=https://www.djangoproject.com/ https://pypi.org/project/Django/
-IUSE=doc sqlite test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD Apache-2.0 MIT
-RDEPEND=dev-python/pytz[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[sqlite?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?,threads(+)] ) >=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=https://www.djangoproject.com/m/releases/2.1/Django-2.1.1.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=3f90c6ca1e47d1cff6de300b636d0e49
diff --git a/metadata/md5-cache/dev-python/django-2.1.2 b/metadata/md5-cache/dev-python/django-2.1.2
new file mode 100644
index 000000000000..348c9f4c5908
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-2.1.2
@@ -0,0 +1,14 @@
+BDEPEND=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(-)] doc? ( >=dev-python/sphinx-1.0.7[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(-)] ) test? ( python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) dev-python/docutils[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(-)] dev-python/numpy[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(-)] dev-python/pillow[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(-)] dev-python/pyyaml[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(-)] dev-python/mock[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[sqlite?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?,threads(+)] ) >=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(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=High-level Python web framework
+EAPI=7
+HOMEPAGE=https://www.djangoproject.com/ https://pypi.org/project/Django/
+IUSE=doc sqlite test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=BSD Apache-2.0 MIT
+RDEPEND=dev-python/pytz[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[sqlite?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?,threads(+)] ) >=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=https://www.djangoproject.com/m/releases/2.1/Django-2.1.2.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=ce3e337aaf05c2dfd0654369bfd0ba7b
diff --git a/metadata/md5-cache/dev-python/django-annoying-0.7.7 b/metadata/md5-cache/dev-python/django-annoying-0.7.7
index 62463dfd38dd..5eacd82e3d5b 100644
--- a/metadata/md5-cache/dev-python/django-annoying-0.7.7
+++ b/metadata/md5-cache/dev-python/django-annoying-0.7.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/django[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-annoying/django-annoying-0.7.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=a306ec433748d610a12dcc4729c11e48
diff --git a/metadata/md5-cache/dev-python/django-annoying-0.8.7 b/metadata/md5-cache/dev-python/django-annoying-0.8.7
index 417091e20c1b..eb8730f73d78 100644
--- a/metadata/md5-cache/dev-python/django-annoying-0.8.7
+++ b/metadata/md5-cache/dev-python/django-annoying-0.8.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/django[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-annoying/django-annoying-0.8.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=95518def7b545ef1fc6cc91f3c3cc216
diff --git a/metadata/md5-cache/dev-python/django-appconf-1.0.1 b/metadata/md5-cache/dev-python/django-appconf-1.0.1
index d9a37fe211cb..febbe4005801 100644
--- a/metadata/md5-cache/dev-python/django-appconf-1.0.1
+++ b/metadata/md5-cache/dev-python/django-appconf-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/django-1.4.1[python_targets_python2_7(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-appconf/django-appconf-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=249a5d13ffb2a4f08b2d12064eeb8f51
diff --git a/metadata/md5-cache/dev-python/django-auth-ldap-1.2.2 b/metadata/md5-cache/dev-python/django-auth-ldap-1.2.2
index 49a9402b545d..d5586ef38d26 100644
--- a/metadata/md5-cache/dev-python/django-auth-ldap-1.2.2
+++ b/metadata/md5-cache/dev-python/django-auth-ldap-1.2.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/django[python_targets_pypy(-)?,python_targets_python2_7(-)?,-
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-auth-ldap/django-auth-ldap-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2a62d5bd38c9f8cf6d59b810bdeb8a39
diff --git a/metadata/md5-cache/dev-python/django-auth-ldap-1.2.7 b/metadata/md5-cache/dev-python/django-auth-ldap-1.2.7
index aad5b7ec20c7..ffdc4f605541 100644
--- a/metadata/md5-cache/dev-python/django-auth-ldap-1.2.7
+++ b/metadata/md5-cache/dev-python/django-auth-ldap-1.2.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/django[python_targets_pypy(-)?,python_targets_python2_7(-)?,-
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-auth-ldap/django-auth-ldap-1.2.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=7bc1804f3c5175b3072d2cd5867a6538
diff --git a/metadata/md5-cache/dev-python/django-baker-0.11-r2 b/metadata/md5-cache/dev-python/django-baker-0.11-r2
index 39f3a2a2905f..af1655e1bcd0 100644
--- a/metadata/md5-cache/dev-python/django-baker-0.11-r2
+++ b/metadata/md5-cache/dev-python/django-baker-0.11-r2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/d/django-baker/django-baker-0.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c7ed9e6bc2a27ad9a9e1e4965910f504
diff --git a/metadata/md5-cache/dev-python/django-classy-tags-0.7.2 b/metadata/md5-cache/dev-python/django-classy-tags-0.7.2
index 4f60e92d5eff..f32b69d944be 100644
--- a/metadata/md5-cache/dev-python/django-classy-tags-0.7.2
+++ b/metadata/md5-cache/dev-python/django-classy-tags-0.7.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/django-1.6 python_targets_python2_7? ( >=dev-lang/python-2.
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-classy-tags/django-classy-tags-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=87322bebc5629cc302311e60c5eeb70d
diff --git a/metadata/md5-cache/dev-python/django-classy-tags-0.8.0 b/metadata/md5-cache/dev-python/django-classy-tags-0.8.0
index fd38b95eccb1..8dcef33fe262 100644
--- a/metadata/md5-cache/dev-python/django-classy-tags-0.8.0
+++ b/metadata/md5-cache/dev-python/django-classy-tags-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/django-1.6[python_targets_python2_7(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-classy-tags/django-classy-tags-0.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=12a07be7928d3956deb147fcceed41f5
diff --git a/metadata/md5-cache/dev-python/django-cms-3.4.3 b/metadata/md5-cache/dev-python/django-cms-3.4.3
index 5ac30d9b4554..ef353c50855d 100644
--- a/metadata/md5-cache/dev-python/django-cms-3.4.3
+++ b/metadata/md5-cache/dev-python/django-cms-3.4.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/django-1.8[python_targets_python2_7(-)?,python_targets_pyth
 REQUIRED_USE=admin-style ckeditor || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/divio/django-cms/archive/3.4.3.tar.gz -> django-cms-3.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5fe31d4c319a73e2be0f347cfa5d1c62
diff --git a/metadata/md5-cache/dev-python/django-crispy-forms-1.6.0 b/metadata/md5-cache/dev-python/django-crispy-forms-1.6.0
index 7c151d472e78..2108ce0e1737 100644
--- a/metadata/md5-cache/dev-python/django-crispy-forms-1.6.0
+++ b/metadata/md5-cache/dev-python/django-crispy-forms-1.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/d/django-crispy-forms/django-crispy-forms-1.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=94dff80a5fb6175af42d2b54c1f1eaa1
diff --git a/metadata/md5-cache/dev-python/django-debug-toolbar-1.5 b/metadata/md5-cache/dev-python/django-debug-toolbar-1.5
index 18a642e790e7..afaa55e99e66 100644
--- a/metadata/md5-cache/dev-python/django-debug-toolbar-1.5
+++ b/metadata/md5-cache/dev-python/django-debug-toolbar-1.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/django-1.8[python_targets_pypy(-)?,python_targets_python2_7
 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/django-debug-toolbar/django-debug-toolbar/archive/1.5.tar.gz -> django-debug-toolbar-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=29e2e201847301f8140bd69fb77edcc8
diff --git a/metadata/md5-cache/dev-python/django-discover-runner-1.0 b/metadata/md5-cache/dev-python/django-discover-runner-1.0
index 406db3042299..f7e5b7d9a548 100644
--- a/metadata/md5-cache/dev-python/django-discover-runner-1.0
+++ b/metadata/md5-cache/dev-python/django-discover-runner-1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-
 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/d/django-discover-runner/django-discover-runner-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3d67323c04fbff8a55a15778f7e00d70
diff --git a/metadata/md5-cache/dev-python/django-durationfield-0.5.2 b/metadata/md5-cache/dev-python/django-durationfield-0.5.2
index ff800d571ee4..b6fedde27764 100644
--- a/metadata/md5-cache/dev-python/django-durationfield-0.5.2
+++ b/metadata/md5-cache/dev-python/django-durationfield-0.5.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/django-1.4[python_targets_python2_7(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-durationfield/django-durationfield-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b4f69b4453ddef74939c3784e909cfe0
diff --git a/metadata/md5-cache/dev-python/django-durationfield-0.5.4 b/metadata/md5-cache/dev-python/django-durationfield-0.5.4
index 0399f2822179..2cbeb8186a1e 100644
--- a/metadata/md5-cache/dev-python/django-durationfield-0.5.4
+++ b/metadata/md5-cache/dev-python/django-durationfield-0.5.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/django-1.4[python_targets_python2_7(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-durationfield/django-durationfield-0.5.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f420c999707a062e6967563753a13a1d
diff --git a/metadata/md5-cache/dev-python/django-endless-pagination-2.0 b/metadata/md5-cache/dev-python/django-endless-pagination-2.0
index ec4e599b2154..eb15e13a39d1 100644
--- a/metadata/md5-cache/dev-python/django-endless-pagination-2.0
+++ b/metadata/md5-cache/dev-python/django-endless-pagination-2.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/django-1.3[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/frankban/django-endless-pagination/archive/v2.0.tar.gz -> django-endless-pagination-2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=797b053b6082222eb772e30cbbc0e44a
diff --git a/metadata/md5-cache/dev-python/django-extensions-1.5.6 b/metadata/md5-cache/dev-python/django-extensions-1.5.6
index 037e9be8759c..dac27c647e14 100644
--- a/metadata/md5-cache/dev-python/django-extensions-1.5.6
+++ b/metadata/md5-cache/dev-python/django-extensions-1.5.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/d/django-extensions/django-extensions-1.5.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fb1d072ab2b232c3cad7e33763ef3e15
diff --git a/metadata/md5-cache/dev-python/django-extensions-1.5.7 b/metadata/md5-cache/dev-python/django-extensions-1.5.7
index 5f3df187a945..329341033b84 100644
--- a/metadata/md5-cache/dev-python/django-extensions-1.5.7
+++ b/metadata/md5-cache/dev-python/django-extensions-1.5.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/d/django-extensions/django-extensions-1.5.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=fb1d072ab2b232c3cad7e33763ef3e15
diff --git a/metadata/md5-cache/dev-python/django-extensions-1.5.9 b/metadata/md5-cache/dev-python/django-extensions-1.5.9
index 07a432df4f88..8edcc9d5b41e 100644
--- a/metadata/md5-cache/dev-python/django-extensions-1.5.9
+++ b/metadata/md5-cache/dev-python/django-extensions-1.5.9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/d/django-extensions/django-extensions-1.5.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fb1d072ab2b232c3cad7e33763ef3e15
diff --git a/metadata/md5-cache/dev-python/django-extensions-1.6.1 b/metadata/md5-cache/dev-python/django-extensions-1.6.1
index c9fc5cf7d0d7..0efdb8f555d8 100644
--- a/metadata/md5-cache/dev-python/django-extensions-1.6.1
+++ b/metadata/md5-cache/dev-python/django-extensions-1.6.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/d/django-extensions/django-extensions-1.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8a36e05e05a0cb988df09f57cf41c56c
diff --git a/metadata/md5-cache/dev-python/django-filer-1.2.0 b/metadata/md5-cache/dev-python/django-filer-1.2.0
index 3a15ed8d3816..655af68a86c8 100644
--- a/metadata/md5-cache/dev-python/django-filer-1.2.0
+++ b/metadata/md5-cache/dev-python/django-filer-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/django-1.5 >=dev-python/django_polymorphic-0.2 >=dev-python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-filer/django-filer-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b5b3fc057f14f08d272671fa16cb9e9c
diff --git a/metadata/md5-cache/dev-python/django-filer-1.2.7 b/metadata/md5-cache/dev-python/django-filer-1.2.7
index 9b0ab33e9666..5339f786e236 100644
--- a/metadata/md5-cache/dev-python/django-filer-1.2.7
+++ b/metadata/md5-cache/dev-python/django-filer-1.2.7
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/django-1.5[python_targets_python2_7(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-filer/django-filer-1.2.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=bcb3a77d04886fa754bb6389a252756e
diff --git a/metadata/md5-cache/dev-python/django-formtools-1.0 b/metadata/md5-cache/dev-python/django-formtools-1.0
index 8d469dfdd8ff..8b83105bd912 100644
--- a/metadata/md5-cache/dev-python/django-formtools-1.0
+++ b/metadata/md5-cache/dev-python/django-formtools-1.0
@@ -10,5 +10,5 @@ RDEPEND=!<dev-python/django-1.8 python_targets_python2_7? ( >=dev-lang/python-2.
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-formtools/django-formtools-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ef4c1affdffa27ab54cd2e2646f3934b
diff --git a/metadata/md5-cache/dev-python/django-grappelli-2.7.3 b/metadata/md5-cache/dev-python/django-grappelli-2.7.3
index a14438ca8f31..df79a18edcb3 100644
--- a/metadata/md5-cache/dev-python/django-grappelli-2.7.3
+++ b/metadata/md5-cache/dev-python/django-grappelli-2.7.3
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-grappelli/django-grappelli-2.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2686762102ebdab55877ce100981ec0d
diff --git a/metadata/md5-cache/dev-python/django-haystack-2.4.1 b/metadata/md5-cache/dev-python/django-haystack-2.4.1
index fd32aee9df54..cda6de42726a 100644
--- a/metadata/md5-cache/dev-python/django-haystack-2.4.1
+++ b/metadata/md5-cache/dev-python/django-haystack-2.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/d/django-haystack/django-haystack-2.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=34ff983eb6eccbabe11b926e65e944e9
diff --git a/metadata/md5-cache/dev-python/django-international-0.0.6 b/metadata/md5-cache/dev-python/django-international-0.0.6
index d84cd093c56b..9d5cfcc25ac9 100644
--- a/metadata/md5-cache/dev-python/django-international-0.0.6
+++ b/metadata/md5-cache/dev-python/django-international-0.0.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/django[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-international/django-international-0.0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=106520bf47e3b810307cba6e0d5b3dee
diff --git a/metadata/md5-cache/dev-python/django-ldap-groups-0.1.3-r1 b/metadata/md5-cache/dev-python/django-ldap-groups-0.1.3-r1
index af446b56823c..da7588a54020 100644
--- a/metadata/md5-cache/dev-python/django-ldap-groups-0.1.3-r1
+++ b/metadata/md5-cache/dev-python/django-ldap-groups-0.1.3-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=mirror://pypi/d/django-ldap-groups/django-ldap-groups-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=eb752460bc4048bddcf31ed0f95b4917
diff --git a/metadata/md5-cache/dev-python/django-ldapdb-0.3.2 b/metadata/md5-cache/dev-python/django-ldapdb-0.3.2
index 98ec988a6d21..821b3808656e 100644
--- a/metadata/md5-cache/dev-python/django-ldapdb-0.3.2
+++ b/metadata/md5-cache/dev-python/django-ldapdb-0.3.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/django[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-ldapdb/django-ldapdb-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6f8441fe4102fa674797113886481a25
diff --git a/metadata/md5-cache/dev-python/django-ldapdb-0.4.0 b/metadata/md5-cache/dev-python/django-ldapdb-0.4.0
index 33a4f6ec6de4..ce4fcc502147 100644
--- a/metadata/md5-cache/dev-python/django-ldapdb-0.4.0
+++ b/metadata/md5-cache/dev-python/django-ldapdb-0.4.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/django[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-ldapdb/django-ldapdb-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b45aced687fa3aefb3e0a4a4e7a6c839
diff --git a/metadata/md5-cache/dev-python/django-mptt-0.7.4 b/metadata/md5-cache/dev-python/django-mptt-0.7.4
index ce231a088211..03921fe64698 100644
--- a/metadata/md5-cache/dev-python/django-mptt-0.7.4
+++ b/metadata/md5-cache/dev-python/django-mptt-0.7.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/django-1.4 python_targets_python2_7? ( >=dev-lang/python-2.
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-mptt/django-mptt-0.7.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=46f4d8edbaa2f6709cbdee04a7f79d70
diff --git a/metadata/md5-cache/dev-python/django-mptt-0.8.4 b/metadata/md5-cache/dev-python/django-mptt-0.8.4
index dddeb090051e..f2e4ad695958 100644
--- a/metadata/md5-cache/dev-python/django-mptt-0.8.4
+++ b/metadata/md5-cache/dev-python/django-mptt-0.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/django-1.8 python_targets_python2_7? ( >=dev-lang/python-2.
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-mptt/django-mptt-0.8.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=628aa03dd1ee57ad979f57f39812ddc1
diff --git a/metadata/md5-cache/dev-python/django-nose-1.4.4 b/metadata/md5-cache/dev-python/django-nose-1.4.4
index e4657dce1f26..302d0e985d0c 100644
--- a/metadata/md5-cache/dev-python/django-nose-1.4.4
+++ b/metadata/md5-cache/dev-python/django-nose-1.4.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/nose-1.2.1[python_targets_pypy(-)?,python_targets_python2_7
 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/d/django-nose/django-nose-1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=53bc59d46ae68b17e7d19ab8437ce67a
diff --git a/metadata/md5-cache/dev-python/django-oauth-plus-2.2.8 b/metadata/md5-cache/dev-python/django-oauth-plus-2.2.8
index b736026860c2..a51026ab139f 100644
--- a/metadata/md5-cache/dev-python/django-oauth-plus-2.2.8
+++ b/metadata/md5-cache/dev-python/django-oauth-plus-2.2.8
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/django-1.3[python_targets_pypy(-)?,python_targets_python2_7
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-oauth-plus/django-oauth-plus-2.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5c67c1f3e75bd199723c672c20b6d01e
diff --git a/metadata/md5-cache/dev-python/django-openid-auth-0.5 b/metadata/md5-cache/dev-python/django-openid-auth-0.5
index 9696f66f505f..418928c4d8c1 100644
--- a/metadata/md5-cache/dev-python/django-openid-auth-0.5
+++ b/metadata/md5-cache/dev-python/django-openid-auth-0.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/django-1.3[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://launchpad.net/django-openid-auth/trunk/0.5/+download/django-openid-auth-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=949ba1bfcc35f77dbbca508b0ae7afb1
diff --git a/metadata/md5-cache/dev-python/django-opensearch-0.2.5 b/metadata/md5-cache/dev-python/django-opensearch-0.2.5
index 09c46eca3ec6..3387d1ccc0e5 100644
--- a/metadata/md5-cache/dev-python/django-opensearch-0.2.5
+++ b/metadata/md5-cache/dev-python/django-opensearch-0.2.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/django-1.7[python_targets_python2_7(-)?,python_targets_pyth
 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/vint21h/django-opensearch/archive/0.2.5.tar.gz -> django-opensearch-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=756f10383958473fc9193cd54f30b1c7
diff --git a/metadata/md5-cache/dev-python/django-otp-0.3.4 b/metadata/md5-cache/dev-python/django-otp-0.3.4
index 9f8b700c67f4..50131518888c 100644
--- a/metadata/md5-cache/dev-python/django-otp-0.3.4
+++ b/metadata/md5-cache/dev-python/django-otp-0.3.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/django-1.4.2[python_targets_python2_7(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-otp/django-otp-0.3.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e1f1ee037f53d16b56864688150e539e
diff --git a/metadata/md5-cache/dev-python/django-otp-yubikey-0.3.3 b/metadata/md5-cache/dev-python/django-otp-yubikey-0.3.3
index 68bc2279d96f..c55deca1e554 100644
--- a/metadata/md5-cache/dev-python/django-otp-yubikey-0.3.3
+++ b/metadata/md5-cache/dev-python/django-otp-yubikey-0.3.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/django-otp-0.3.0[python_targets_python2_7(-)?,python_target
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-otp-yubikey/django-otp-yubikey-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=99dd8b51d9eeb9ed4306459b5329b4d1
diff --git a/metadata/md5-cache/dev-python/django-phonenumber-field-0.7.2 b/metadata/md5-cache/dev-python/django-phonenumber-field-0.7.2
index 0fe957d83607..a2dd1b38d65f 100644
--- a/metadata/md5-cache/dev-python/django-phonenumber-field-0.7.2
+++ b/metadata/md5-cache/dev-python/django-phonenumber-field-0.7.2
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-phonenumber-field/django-phonenumber-field-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f517faeb4c850b55bfb13a8258802168
diff --git a/metadata/md5-cache/dev-python/django-phonenumber-field-1.3.0 b/metadata/md5-cache/dev-python/django-phonenumber-field-1.3.0
index d2bbd04dad49..b89f8fba93fc 100644
--- a/metadata/md5-cache/dev-python/django-phonenumber-field-1.3.0
+++ b/metadata/md5-cache/dev-python/django-phonenumber-field-1.3.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-phonenumber-field/django-phonenumber-field-1.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7148015dea0551b8f3fd74428e6a751b
diff --git a/metadata/md5-cache/dev-python/django-picklefield-0.3.2 b/metadata/md5-cache/dev-python/django-picklefield-0.3.2
index 1f8fe92a56f9..783493dbc600 100644
--- a/metadata/md5-cache/dev-python/django-picklefield-0.3.2
+++ b/metadata/md5-cache/dev-python/django-picklefield-0.3.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/django-1.1.1[python_targets_python2_7(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-picklefield/django-picklefield-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4c9712466614ca06ef605047338a9599
diff --git a/metadata/md5-cache/dev-python/django-piston-0.2.3-r1 b/metadata/md5-cache/dev-python/django-piston-0.2.3-r1
index e38fc2f64da6..bd533bf73c80 100644
--- a/metadata/md5-cache/dev-python/django-piston-0.2.3-r1
+++ b/metadata/md5-cache/dev-python/django-piston-0.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/django[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-piston/django-piston-0.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=c433581c772209b942c95d13abffe8f0
diff --git a/metadata/md5-cache/dev-python/django-piston-9999 b/metadata/md5-cache/dev-python/django-piston-9999
index 016ebc63d9d5..8d6f43623946 100644
--- a/metadata/md5-cache/dev-python/django-piston-9999
+++ b/metadata/md5-cache/dev-python/django-piston-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/django[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	89bb9f083a2590d9b447fd0b78a96186
+_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_=96b5fca742277745155af28387b25b46
diff --git a/metadata/md5-cache/dev-python/django-recaptcha-1.0.5 b/metadata/md5-cache/dev-python/django-recaptcha-1.0.5
index 58307bfef00a..0120d7c84747 100644
--- a/metadata/md5-cache/dev-python/django-recaptcha-1.0.5
+++ b/metadata/md5-cache/dev-python/django-recaptcha-1.0.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/django[python_targets_pypy(-)?,python_targets_python2_7(-)?,p
 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/praekelt/django-recaptcha/archive/1.0.5.tar.gz -> django-recaptcha-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5cdad51003a0e14b5f45787d7041b169
diff --git a/metadata/md5-cache/dev-python/django-registration-1.0 b/metadata/md5-cache/dev-python/django-registration-1.0
index 89c0b624673a..137448abccde 100644
--- a/metadata/md5-cache/dev-python/django-registration-1.0
+++ b/metadata/md5-cache/dev-python/django-registration-1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/django[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-registration/django-registration-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9c9943893c86977986f12539c79c397c
diff --git a/metadata/md5-cache/dev-python/django-sekizai-0.10.0 b/metadata/md5-cache/dev-python/django-sekizai-0.10.0
index e79cc2497628..cff5008bf77b 100644
--- a/metadata/md5-cache/dev-python/django-sekizai-0.10.0
+++ b/metadata/md5-cache/dev-python/django-sekizai-0.10.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/django-1.6[python_targets_python2_7(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-sekizai/django-sekizai-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c1c07d487b5756704a3b97259e0e6324
diff --git a/metadata/md5-cache/dev-python/django-select2-4.2.2 b/metadata/md5-cache/dev-python/django-select2-4.2.2
index 92a1e97787be..910ebccb3c49 100644
--- a/metadata/md5-cache/dev-python/django-select2-4.2.2
+++ b/metadata/md5-cache/dev-python/django-select2-4.2.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/django[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/D/Django-Select2/Django-Select2-4.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=97ec2062e095c28c8a96560304ad579c
diff --git a/metadata/md5-cache/dev-python/django-select2-5.5.0 b/metadata/md5-cache/dev-python/django-select2-5.5.0
index b1a2c190915d..f85b81f749e7 100644
--- a/metadata/md5-cache/dev-python/django-select2-5.5.0
+++ b/metadata/md5-cache/dev-python/django-select2-5.5.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/django[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/D/Django-Select2/Django-Select2-5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0ce18f792d8a85d05eeb812197b7647a
diff --git a/metadata/md5-cache/dev-python/django-setuptest-0.2.1 b/metadata/md5-cache/dev-python/django-setuptest-0.2.1
index f50e6b5794bd..a9b9173f6f4b 100644
--- a/metadata/md5-cache/dev-python/django-setuptest-0.2.1
+++ b/metadata/md5-cache/dev-python/django-setuptest-0.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pep8[python_targets_pypy(-)?,python_targets_python2_7(-)?,pyt
 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/praekelt/django-setuptest/archive/0.2.1.tar.gz -> django-setuptest-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=89e069e8a2b86f08162936d42b0cd5a2
diff --git a/metadata/md5-cache/dev-python/django-sortedm2m-1.3.0 b/metadata/md5-cache/dev-python/django-sortedm2m-1.3.0
index 096923f1a7cb..466a3072ba65 100644
--- a/metadata/md5-cache/dev-python/django-sortedm2m-1.3.0
+++ b/metadata/md5-cache/dev-python/django-sortedm2m-1.3.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-sortedm2m/django-sortedm2m-1.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f2e62f95ed07eedb05df77506a75d127
diff --git a/metadata/md5-cache/dev-python/django-sortedm2m-1.3.2 b/metadata/md5-cache/dev-python/django-sortedm2m-1.3.2
index 9d60039271c8..2760359200f1 100644
--- a/metadata/md5-cache/dev-python/django-sortedm2m-1.3.2
+++ b/metadata/md5-cache/dev-python/django-sortedm2m-1.3.2
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-sortedm2m/django-sortedm2m-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=938cd086565b0b9619c4e18232a2461f
diff --git a/metadata/md5-cache/dev-python/django-spurl-0.6.4 b/metadata/md5-cache/dev-python/django-spurl-0.6.4
index 4736747a22bf..0c26fa04f0cf 100644
--- a/metadata/md5-cache/dev-python/django-spurl-0.6.4
+++ b/metadata/md5-cache/dev-python/django-spurl-0.6.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/django-1.4 dev-python/six dev-python/nose dev-python/URLObj
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-spurl/django-spurl-0.6.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5bac5e1fad456b86fc98aafc5cdaf6bc
diff --git a/metadata/md5-cache/dev-python/django-standard-form-1.1.1 b/metadata/md5-cache/dev-python/django-standard-form-1.1.1
index 00f7702b9050..0d9d65a89ea9 100644
--- a/metadata/md5-cache/dev-python/django-standard-form-1.1.1
+++ b/metadata/md5-cache/dev-python/django-standard-form-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/django-1.3[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-standard-form/django-standard-form-1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b7e2c2d0b387d3409a44649fe925202f
diff --git a/metadata/md5-cache/dev-python/django-tables2-1.1.2 b/metadata/md5-cache/dev-python/django-tables2-1.1.2
index 6a96f211fa9f..1e802245f6d6 100644
--- a/metadata/md5-cache/dev-python/django-tables2-1.1.2
+++ b/metadata/md5-cache/dev-python/django-tables2-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,pyth
 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/d/django-tables2/django-tables2-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7c73163ff48d89301895bf5c3ba1cfab
diff --git a/metadata/md5-cache/dev-python/django-tagging-0.4.1 b/metadata/md5-cache/dev-python/django-tagging-0.4.1
index 1585afd8b998..89d369173b04 100644
--- a/metadata/md5-cache/dev-python/django-tagging-0.4.1
+++ b/metadata/md5-cache/dev-python/django-tagging-0.4.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/django-1.0[python_targets_python2_7(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-tagging/django-tagging-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fe30e0267b64c7e5b2030985fb2c1bda
diff --git a/metadata/md5-cache/dev-python/django-tinymce-1.5.3 b/metadata/md5-cache/dev-python/django-tinymce-1.5.3
index af3e330d8212..03e16fcf8944 100644
--- a/metadata/md5-cache/dev-python/django-tinymce-1.5.3
+++ b/metadata/md5-cache/dev-python/django-tinymce-1.5.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/django[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/aljosa/django-tinymce/archive/release-1.5.3.tar.gz -> django-tinymce-1.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0b1388b198b2dcc2abb27b07290cd12e
diff --git a/metadata/md5-cache/dev-python/django-treebeard-4.1.0 b/metadata/md5-cache/dev-python/django-treebeard-4.1.0
index b50756d230e4..b58794ac92d5 100644
--- a/metadata/md5-cache/dev-python/django-treebeard-4.1.0
+++ b/metadata/md5-cache/dev-python/django-treebeard-4.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/django-1.6[python_targets_python2_7(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-treebeard/django-treebeard-4.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e6c424021401e80f8d63d933ec98871f
diff --git a/metadata/md5-cache/dev-python/django-xslt-0.4.5-r1 b/metadata/md5-cache/dev-python/django-xslt-0.4.5-r1
index d244a1c6eb09..88c2a66b2fd0 100644
--- a/metadata/md5-cache/dev-python/django-xslt-0.4.5-r1
+++ b/metadata/md5-cache/dev-python/django-xslt-0.4.5-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=mirror://pypi/d/django-xslt/django-xslt-0.4.5.tar.gz test? ( https://dev.gentoo.org/~tampakrap/tarballs/django-xslt-demoapp-0.4.5_p20120427.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2affea4921c34c2c4f57cc52b76a7d36
diff --git a/metadata/md5-cache/dev-python/django_polymorphic-0.7.2 b/metadata/md5-cache/dev-python/django_polymorphic-0.7.2
index 0e450eb9d59b..2c177c4a8f45 100644
--- a/metadata/md5-cache/dev-python/django_polymorphic-0.7.2
+++ b/metadata/md5-cache/dev-python/django_polymorphic-0.7.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/django-1.4 python_targets_python2_7? ( >=dev-lang/python-2.
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django_polymorphic/django_polymorphic-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b38f594bbbed3e0990bf0e20b8fe844a
diff --git a/metadata/md5-cache/dev-python/django_polymorphic-0.9.2 b/metadata/md5-cache/dev-python/django_polymorphic-0.9.2
index 1fdbc60edd87..5bb3c50df1cb 100644
--- a/metadata/md5-cache/dev-python/django_polymorphic-0.9.2
+++ b/metadata/md5-cache/dev-python/django_polymorphic-0.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/django-1.4 python_targets_python2_7? ( >=dev-lang/python-2.
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django_polymorphic/django_polymorphic-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=957d6ef0b367d3f091006453ce6cbd0c
diff --git a/metadata/md5-cache/dev-python/django_polymorphic-1.2 b/metadata/md5-cache/dev-python/django_polymorphic-1.2
index 4d35dedb439c..aa87bb8fd17a 100644
--- a/metadata/md5-cache/dev-python/django_polymorphic-1.2
+++ b/metadata/md5-cache/dev-python/django_polymorphic-1.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/django-1.4[python_targets_python2_7(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django_polymorphic/django-polymorphic-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6e7fe93db626cb99bb5536e4eac6cc72
diff --git a/metadata/md5-cache/dev-python/django_polymorphic-2.0.2 b/metadata/md5-cache/dev-python/django_polymorphic-2.0.2
index 2ca6bbe819ae..011239a4ab5d 100644
--- a/metadata/md5-cache/dev-python/django_polymorphic-2.0.2
+++ b/metadata/md5-cache/dev-python/django_polymorphic-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/django-1.11[python_targets_python2_7(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django_polymorphic/django-polymorphic-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=31705a056f49e76c8572d6f960dbc45c
diff --git a/metadata/md5-cache/dev-python/djangocms-admin-style-1.2.7 b/metadata/md5-cache/dev-python/djangocms-admin-style-1.2.7
index 220e01d76b6d..7d6e082c5562 100644
--- a/metadata/md5-cache/dev-python/djangocms-admin-style-1.2.7
+++ b/metadata/md5-cache/dev-python/djangocms-admin-style-1.2.7
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/d/djangocms-admin-style/djangocms-admin-style-1.2.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=2c8043cad4e55753f02b793d285e7f7e
diff --git a/metadata/md5-cache/dev-python/djangocms-attributes-field-0.2.0 b/metadata/md5-cache/dev-python/djangocms-attributes-field-0.2.0
index 5496c3ff515d..d9a84410df2b 100644
--- a/metadata/md5-cache/dev-python/djangocms-attributes-field-0.2.0
+++ b/metadata/md5-cache/dev-python/djangocms-attributes-field-0.2.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/divio/djangocms-attributes-field/archive/0.2.0.tar.gz -> djangocms-attributes-field-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7084e012a4e637c5271e6bf2b2944052
diff --git a/metadata/md5-cache/dev-python/djangocms-file-2.0.1 b/metadata/md5-cache/dev-python/djangocms-file-2.0.1
index 3365038b8ce1..75c0bda72c16 100644
--- a/metadata/md5-cache/dev-python/djangocms-file-2.0.1
+++ b/metadata/md5-cache/dev-python/djangocms-file-2.0.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/djangocms-attributes-field-0.1.1[python_targets_python2_7(-
 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/divio/djangocms-file/archive/2.0.1.tar.gz -> djangocms-file-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=34cfb15820b5dcda861ee279ccca2ebe
diff --git a/metadata/md5-cache/dev-python/djangocms-flash-0.2.0 b/metadata/md5-cache/dev-python/djangocms-flash-0.2.0
index d9a24378de8d..7fa9e6140e7a 100644
--- a/metadata/md5-cache/dev-python/djangocms-flash-0.2.0
+++ b/metadata/md5-cache/dev-python/djangocms-flash-0.2.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/d/djangocms-flash/djangocms-flash-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e8ed49d4f74f154f39211556a20cbceb
diff --git a/metadata/md5-cache/dev-python/djangocms-flash-0.3.0 b/metadata/md5-cache/dev-python/djangocms-flash-0.3.0
index e1ee3ddcbb0d..46a147a2d16d 100644
--- a/metadata/md5-cache/dev-python/djangocms-flash-0.3.0
+++ b/metadata/md5-cache/dev-python/djangocms-flash-0.3.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/d/djangocms-flash/djangocms-flash-0.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8f39d5b6709f92269eb85f564600ef25
diff --git a/metadata/md5-cache/dev-python/djangocms-inherit-0.2.2 b/metadata/md5-cache/dev-python/djangocms-inherit-0.2.2
index b59ecbc8e282..12d8a3fc37db 100644
--- a/metadata/md5-cache/dev-python/djangocms-inherit-0.2.2
+++ b/metadata/md5-cache/dev-python/djangocms-inherit-0.2.2
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/d/djangocms-inherit/djangocms-inherit-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6fa1b9ac6c867348ff5247e15ea444d1
diff --git a/metadata/md5-cache/dev-python/djangocms-link-2.1.2 b/metadata/md5-cache/dev-python/djangocms-link-2.1.2
index 67caf6052763..72048af04f82 100644
--- a/metadata/md5-cache/dev-python/djangocms-link-2.1.2
+++ b/metadata/md5-cache/dev-python/djangocms-link-2.1.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/djangocms-attributes-field-0.1.1[python_targets_python2_7(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/djangocms-link/djangocms-link-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8b205014a2f2205732ec62cc7a77dcfb
diff --git a/metadata/md5-cache/dev-python/djangocms-picture-2.0.5 b/metadata/md5-cache/dev-python/djangocms-picture-2.0.5
index 8f9442ca656e..c502bd293eaa 100644
--- a/metadata/md5-cache/dev-python/djangocms-picture-2.0.5
+++ b/metadata/md5-cache/dev-python/djangocms-picture-2.0.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/djangocms-attributes-field-0.1.1[python_targets_python2_7(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/djangocms-picture/djangocms-picture-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=46a6c33859e8720b739ca608f7c13451
diff --git a/metadata/md5-cache/dev-python/djangocms-snippet-1.9.1 b/metadata/md5-cache/dev-python/djangocms-snippet-1.9.1
index b9ad9f2c3738..7d64ac5320dc 100644
--- a/metadata/md5-cache/dev-python/djangocms-snippet-1.9.1
+++ b/metadata/md5-cache/dev-python/djangocms-snippet-1.9.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/d/djangocms-snippet/djangocms-snippet-1.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e2b047f8cd7f7c01c89839bbfe6c13f8
diff --git a/metadata/md5-cache/dev-python/djangocms-teaser-0.1 b/metadata/md5-cache/dev-python/djangocms-teaser-0.1
index 5e5362aff816..54015f506900 100644
--- a/metadata/md5-cache/dev-python/djangocms-teaser-0.1
+++ b/metadata/md5-cache/dev-python/djangocms-teaser-0.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/d/djangocms-teaser/djangocms-teaser-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=47299250173e833a419b0d0915204479
diff --git a/metadata/md5-cache/dev-python/djangocms-teaser-0.2.0 b/metadata/md5-cache/dev-python/djangocms-teaser-0.2.0
index 2af8f5b7f553..b6b2dcb28b8f 100644
--- a/metadata/md5-cache/dev-python/djangocms-teaser-0.2.0
+++ b/metadata/md5-cache/dev-python/djangocms-teaser-0.2.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/d/djangocms-teaser/djangocms-teaser-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5c7fb2aa4d13a83dab42787ee553e470
diff --git a/metadata/md5-cache/dev-python/djangocms-text-ckeditor-3.3.1 b/metadata/md5-cache/dev-python/djangocms-text-ckeditor-3.3.1
index 7564a5afc862..2873af955868 100644
--- a/metadata/md5-cache/dev-python/djangocms-text-ckeditor-3.3.1
+++ b/metadata/md5-cache/dev-python/djangocms-text-ckeditor-3.3.1
@@ -11,5 +11,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/d/djangocms-text-ckeditor/djangocms-text-ckeditor-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=89767c3e805ac07cb42a6845b06338a2
diff --git a/metadata/md5-cache/dev-python/djangocms-text-ckeditor-3.5.0 b/metadata/md5-cache/dev-python/djangocms-text-ckeditor-3.5.0
index d17ba7e97039..d6bd130ef968 100644
--- a/metadata/md5-cache/dev-python/djangocms-text-ckeditor-3.5.0
+++ b/metadata/md5-cache/dev-python/djangocms-text-ckeditor-3.5.0
@@ -11,5 +11,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/d/djangocms-text-ckeditor/djangocms-text-ckeditor-3.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8a702f8165e263ceb23781b03546d3b0
diff --git a/metadata/md5-cache/dev-python/djangocms-video-2.0.2 b/metadata/md5-cache/dev-python/djangocms-video-2.0.2
index 7b1f17230186..f4c2bf7421ca 100644
--- a/metadata/md5-cache/dev-python/djangocms-video-2.0.2
+++ b/metadata/md5-cache/dev-python/djangocms-video-2.0.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/djangocms-attributes-field-0.1.1[python_targets_python2_7(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/djangocms-video/djangocms-video-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=61d7ba36e9114ab2e2cb669976539218
diff --git a/metadata/md5-cache/dev-python/dkimpy-0.6.2 b/metadata/md5-cache/dev-python/dkimpy-0.6.2
index 96df6088e0fd..bc61e0204042 100644
--- a/metadata/md5-cache/dev-python/dkimpy-0.6.2
+++ b/metadata/md5-cache/dev-python/dkimpy-0.6.2
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/d/dkimpy/dkimpy-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=64893f9f43df712ea5afc2d519657c22
diff --git a/metadata/md5-cache/dev-python/dnslib-0.9.6 b/metadata/md5-cache/dev-python/dnslib-0.9.6
index 1bb240a54be7..caa7c8c441af 100644
--- a/metadata/md5-cache/dev-python/dnslib-0.9.6
+++ b/metadata/md5-cache/dev-python/dnslib-0.9.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/d/dnslib/dnslib-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2faae087c301bccad7c00830715be33e
diff --git a/metadata/md5-cache/dev-python/dnspython-1.15.0-r1 b/metadata/md5-cache/dev-python/dnspython-1.15.0-r1
index d52ce2041f23..71c4dfbdb47b 100644
--- a/metadata/md5-cache/dev-python/dnspython-1.15.0-r1
+++ b/metadata/md5-cache/dev-python/dnspython-1.15.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pycrypto[python_targets_python2_7(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/dnspython/dnspython-1.15.0.zip
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c6a600db64ed7c0a996a97267b28d335
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 7d10869c35ca..216e2e681b87 100644
--- a/metadata/md5-cache/dev-python/dnspython-1.16.0_pre20180731
+++ b/metadata/md5-cache/dev-python/dnspython-1.16.0_pre20180731
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pycryptodome[python_targets_python2_7(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/rthalley/dnspython/archive/be7e71e54a6edc87ead1b15af8981b8921e0e83d.tar.gz -> dnspython-1.16.0_pre20180731.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-python/doc8-0.6.0 b/metadata/md5-cache/dev-python/doc8-0.6.0
index 7d9a74b9dc93..dfb3e30976bc 100644
--- a/metadata/md5-cache/dev-python/doc8-0.6.0
+++ b/metadata/md5-cache/dev-python/doc8-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/doc8/doc8-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6de42e4e09414d8517d0e8b033d4742f
diff --git a/metadata/md5-cache/dev-python/docker-py-2.4.2 b/metadata/md5-cache/dev-python/docker-py-2.4.2
index df4310b87eaa..3e53af74ca78 100644
--- a/metadata/md5-cache/dev-python/docker-py-2.4.2
+++ b/metadata/md5-cache/dev-python/docker-py-2.4.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/docker-pycreds-0.2.1[python_targets_python2_7(-)?,python_ta
 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/docker/docker-py/archive/2.4.2.tar.gz -> docker-py-2.4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ec9d92e72f4f81f04e0cbb0a0d0afffe
diff --git a/metadata/md5-cache/dev-python/docker-py-2.7.0 b/metadata/md5-cache/dev-python/docker-py-2.7.0
index ec64bdeca386..96b18a9e2d3e 100644
--- a/metadata/md5-cache/dev-python/docker-py-2.7.0
+++ b/metadata/md5-cache/dev-python/docker-py-2.7.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/docker-pycreds-0.2.1[python_targets_python2_7(-)?,python_ta
 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/docker/docker-py/archive/2.7.0.tar.gz -> docker-py-2.7.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a816ab74ba78d4d1daa9e26176a3dd41
diff --git a/metadata/md5-cache/dev-python/docker-py-3.4.1 b/metadata/md5-cache/dev-python/docker-py-3.4.1
index 58fdf4cacfb1..6034e96ef8aa 100644
--- a/metadata/md5-cache/dev-python/docker-py-3.4.1
+++ b/metadata/md5-cache/dev-python/docker-py-3.4.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/docker-pycreds-0.3.0[python_targets_python2_7(-)?,python_ta
 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/docker/docker-py/archive/3.4.1.tar.gz -> docker-py-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6e6d305e525490a2a03892b729050751
diff --git a/metadata/md5-cache/dev-python/docker-py-3.5.0 b/metadata/md5-cache/dev-python/docker-py-3.5.0
index f2014ac6b2fd..58c99422740c 100644
--- a/metadata/md5-cache/dev-python/docker-py-3.5.0
+++ b/metadata/md5-cache/dev-python/docker-py-3.5.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/docker-pycreds-0.3.0[python_targets_python2_7(-)?,python_ta
 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/docker/docker-py/archive/3.5.0.tar.gz -> docker-py-3.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6e6d305e525490a2a03892b729050751
diff --git a/metadata/md5-cache/dev-python/docker-pycreds-0.2.1 b/metadata/md5-cache/dev-python/docker-pycreds-0.2.1
index b0967783e96b..73496a56c7e8 100644
--- a/metadata/md5-cache/dev-python/docker-pycreds-0.2.1
+++ b/metadata/md5-cache/dev-python/docker-pycreds-0.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/six-1.4.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/docker-pycreds/docker-pycreds-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=17e51110bd784552a6e73bdbab449bcf
diff --git a/metadata/md5-cache/dev-python/docker-pycreds-0.2.3 b/metadata/md5-cache/dev-python/docker-pycreds-0.2.3
index 2e9217622e67..fe37cd16d676 100644
--- a/metadata/md5-cache/dev-python/docker-pycreds-0.2.3
+++ b/metadata/md5-cache/dev-python/docker-pycreds-0.2.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/six-1.4.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/docker-pycreds/docker-pycreds-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1f414caf618b25f9c2668d4929140aaf
diff --git a/metadata/md5-cache/dev-python/docker-pycreds-0.3.0 b/metadata/md5-cache/dev-python/docker-pycreds-0.3.0
index 173bb6fbf4b4..e1ef8d924827 100644
--- a/metadata/md5-cache/dev-python/docker-pycreds-0.3.0
+++ b/metadata/md5-cache/dev-python/docker-pycreds-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/six-1.4.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/docker-pycreds/docker-pycreds-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1f414caf618b25f9c2668d4929140aaf
diff --git a/metadata/md5-cache/dev-python/dockerpty-0.4.1 b/metadata/md5-cache/dev-python/dockerpty-0.4.1
index e499eaf0d5eb..a555116c05b2 100644
--- a/metadata/md5-cache/dev-python/dockerpty-0.4.1
+++ b/metadata/md5-cache/dev-python/dockerpty-0.4.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/six-1.3.0[python_targets_python2_7(-)?,python_targets_pytho
 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/d11wtq/dockerpty/archive/v0.4.1.tar.gz -> dockerpty-0.4.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e271873a786765f5a9cf963affc20c7f
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 8fe5c92ee04f..da0502591eed 100644
--- a/metadata/md5-cache/dev-python/docopt-0.6.2-r2
+++ b/metadata/md5-cache/dev-python/docopt-0.6.2-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-python/doctest-ignore-unicode-0.1.2 b/metadata/md5-cache/dev-python/doctest-ignore-unicode-0.1.2
index 8fb5d021944f..50faa9906be9 100644
--- a/metadata/md5-cache/dev-python/doctest-ignore-unicode-0.1.2
+++ b/metadata/md5-cache/dev-python/doctest-ignore-unicode-0.1.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_
 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/d/doctest-ignore-unicode/doctest-ignore-unicode-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=38fef6dbc3d63797a867155eca4cc1a6
diff --git a/metadata/md5-cache/dev-python/docutils-0.11 b/metadata/md5-cache/dev-python/docutils-0.11
index bec17dbcfd19..008dc128b986 100644
--- a/metadata/md5-cache/dev-python/docutils-0.11
+++ b/metadata/md5-cache/dev-python/docutils-0.11
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygments[python_targets_pypy(-)?,python_targets_python2_7(-)?
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://sourceforge/docutils/docutils-0.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ae79668c2674e94a1a577f1c88f79996
diff --git a/metadata/md5-cache/dev-python/docutils-0.12 b/metadata/md5-cache/dev-python/docutils-0.12
index 0207c5f39d0d..ae5ead4c9563 100644
--- a/metadata/md5-cache/dev-python/docutils-0.12
+++ b/metadata/md5-cache/dev-python/docutils-0.12
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygments[python_targets_pypy(-)?,python_targets_pypy3(-)?,pyt
 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://sourceforge/docutils/docutils-0.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9b8a92737fa4619ede02934a46a9d532
diff --git a/metadata/md5-cache/dev-python/docutils-0.13.1 b/metadata/md5-cache/dev-python/docutils-0.13.1
index 36d2dd35d60e..66607579255a 100644
--- a/metadata/md5-cache/dev-python/docutils-0.13.1
+++ b/metadata/md5-cache/dev-python/docutils-0.13.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygments[python_targets_pypy(-)?,python_targets_pypy3(-)?,pyt
 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://sourceforge/docutils/docutils-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4cecaf2fed7fdde3a862fba728874df4
diff --git a/metadata/md5-cache/dev-python/docutils-0.14 b/metadata/md5-cache/dev-python/docutils-0.14
index 814eaa0d8976..b8bbcf95aab2 100644
--- a/metadata/md5-cache/dev-python/docutils-0.14
+++ b/metadata/md5-cache/dev-python/docutils-0.14
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygments[python_targets_pypy(-)?,python_targets_pypy3(-)?,pyt
 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://sourceforge/docutils/docutils-0.14.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ebb8849ab665178cd956c6fa39cc965b
diff --git a/metadata/md5-cache/dev-python/docutils-glep-1.1 b/metadata/md5-cache/dev-python/docutils-glep-1.1
index 5c4c5e9df8ed..1d3b61715d03 100644
--- a/metadata/md5-cache/dev-python/docutils-glep-1.1
+++ b/metadata/md5-cache/dev-python/docutils-glep-1.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/docutils-0.10[python_targets_pypy(-)?,python_targets_python
 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/d/docutils_glep/docutils_glep-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0073fd2ba469f6297e3c766c86034c01
diff --git a/metadata/md5-cache/dev-python/docutils-glep-9999 b/metadata/md5-cache/dev-python/docutils-glep-9999
index bc8e4ce437d4..0616edbaae92 100644
--- a/metadata/md5-cache/dev-python/docutils-glep-9999
+++ b/metadata/md5-cache/dev-python/docutils-glep-9999
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=>=dev-python/docutils-0.10[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(-)] 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
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c866abca287444a290b72cfd85cdc690
diff --git a/metadata/md5-cache/dev-python/dogpile-cache-0.6.4 b/metadata/md5-cache/dev-python/dogpile-cache-0.6.4
index b9e03d676fab..fb42e2a5067e 100644
--- a/metadata/md5-cache/dev-python/dogpile-cache-0.6.4
+++ b/metadata/md5-cache/dev-python/dogpile-cache-0.6.4
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/d/dogpile.cache/dogpile.cache-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=67cef10ed8da9b27b543461c8eb65265
diff --git a/metadata/md5-cache/dev-python/dogpile-core-0.4.1 b/metadata/md5-cache/dev-python/dogpile-core-0.4.1
index beb8f18f8b31..ece2e251bfe9 100644
--- a/metadata/md5-cache/dev-python/dogpile-core-0.4.1
+++ b/metadata/md5-cache/dev-python/dogpile-core-0.4.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/d/dogpile.core/dogpile.core-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=db7f68373d34d8c5fdd543f4e770f0ce
diff --git a/metadata/md5-cache/dev-python/doit-0.23.0-r1 b/metadata/md5-cache/dev-python/doit-0.23.0-r1
index d873bae7062d..ee144765b858 100644
--- a/metadata/md5-cache/dev-python/doit-0.23.0-r1
+++ b/metadata/md5-cache/dev-python/doit-0.23.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyinotify[python_targets_pypy(-)?,python_targets_python2_7(-)
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/d/doit/doit-0.23.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9bce6a1bbb6250cc11344a4778286e12
diff --git a/metadata/md5-cache/dev-python/doit-0.29.0 b/metadata/md5-cache/dev-python/doit-0.29.0
index 2400b1cbfecf..af5c7389716a 100644
--- a/metadata/md5-cache/dev-python/doit-0.29.0
+++ b/metadata/md5-cache/dev-python/doit-0.29.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/d/doit/doit-0.29.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a9c24d84fd5afda4f3ea3a18474e12eb
diff --git a/metadata/md5-cache/dev-python/doit-py-0.4.0 b/metadata/md5-cache/dev-python/doit-py-0.4.0
index d46b92d0c1d9..2e71aa7234e2 100644
--- a/metadata/md5-cache/dev-python/doit-py-0.4.0
+++ b/metadata/md5-cache/dev-python/doit-py-0.4.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/python-pathlib[python_targets_pypy(-)?,python_targets_python2_7(
 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/d/doit-py/doit-py-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=90d5f37ce806ee26ccbc3692cdc05156
diff --git a/metadata/md5-cache/dev-python/dominate-2.2.1 b/metadata/md5-cache/dev-python/dominate-2.2.1
deleted file mode 100644
index 53d19b6f5989..000000000000
--- a/metadata/md5-cache/dev-python/dominate-2.2.1
+++ /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_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( 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(-)] dev-python/pytest[python_targets_python2_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=Library for creating and manipulating HTML documents using an elegant DOM API
-EAPI=6
-HOMEPAGE=https://github.com/Knio/dominate
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 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 ) >=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/d/dominate/dominate-2.2.1.zip
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=f95bc1eec2b58ec8d9410b6859c16511
diff --git a/metadata/md5-cache/dev-python/dominate-2.3.4 b/metadata/md5-cache/dev-python/dominate-2.3.4
new file mode 100644
index 000000000000..9d39379002c2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/dominate-2.3.4
@@ -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(-)] )
+DESCRIPTION=Library for creating and manipulating HTML documents using an elegant DOM API
+EAPI=7
+HOMEPAGE=https://github.com/Knio/dominate
+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 ~x86
+LICENSE=GPL-3+
+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/d/dominate/dominate-2.3.4.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=9d4df5043727b23b5fc6d18c1023c313
diff --git a/metadata/md5-cache/dev-python/doublex-1.8.1 b/metadata/md5-cache/dev-python/doublex-1.8.1
index cb12436147ca..b329d58feeb4 100644
--- a/metadata/md5-cache/dev-python/doublex-1.8.1
+++ b/metadata/md5-cache/dev-python/doublex-1.8.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyhamcrest[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
 SRC_URI=https://bitbucket.org/DavidVilla/python-doublex/get/v1.8.1.tar.gz -> doublex-1.8.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=669d56543fbbcc4c08fcdcd6ee09db0d
diff --git a/metadata/md5-cache/dev-python/doublex-expects-0.7.0_rc2 b/metadata/md5-cache/dev-python/doublex-expects-0.7.0_rc2
index fb733866ba0c..423efa25c01d 100644
--- a/metadata/md5-cache/dev-python/doublex-expects-0.7.0_rc2
+++ b/metadata/md5-cache/dev-python/doublex-expects-0.7.0_rc2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/doublex[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/jaimegildesagredo/doublex-expects/archive/v0.7.0rc2.tar.gz -> doublex-expects-0.7.0_rc2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=58e25c7689d6d28479c2da9549e2c672
diff --git a/metadata/md5-cache/dev-python/dpkt-1.8-r1 b/metadata/md5-cache/dev-python/dpkt-1.8-r1
index 3e21ee549a09..7cf11a12937b 100644
--- a/metadata/md5-cache/dev-python/dpkt-1.8-r1
+++ b/metadata/md5-cache/dev-python/dpkt-1.8-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=mirror://gentoo/dpkt-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=37745d633a0d90fc8efccb294d2981a5
diff --git a/metadata/md5-cache/dev-python/dpkt-1.8.8 b/metadata/md5-cache/dev-python/dpkt-1.8.8
index 9ce82399f4db..beccc0c3087a 100644
--- a/metadata/md5-cache/dev-python/dpkt-1.8.8
+++ b/metadata/md5-cache/dev-python/dpkt-1.8.8
@@ -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=mirror://pypi/d/dpkt/dpkt-1.8.8.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e5a05f36bac0a1ec1b7db4b2c8109138
diff --git a/metadata/md5-cache/dev-python/dpkt-1.9.1 b/metadata/md5-cache/dev-python/dpkt-1.9.1
index aea6d39107f5..b9883dd9aa2d 100644
--- a/metadata/md5-cache/dev-python/dpkt-1.9.1
+++ b/metadata/md5-cache/dev-python/dpkt-1.9.1
@@ -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=mirror://pypi/d/dpkt/dpkt-1.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a72a292be4d3ff76e7944e1b38541193
diff --git a/metadata/md5-cache/dev-python/drpython-3.11.4 b/metadata/md5-cache/dev-python/drpython-3.11.4
index 7260f8b93543..b487928be7e4 100644
--- a/metadata/md5-cache/dev-python/drpython-3.11.4
+++ b/metadata/md5-cache/dev-python/drpython-3.11.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/wxpython-2.6 python_targets_python2_7? ( >=dev-lang/python-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/drpython/DrPython_3.11.4.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=52ff90cdaf54ecb5db5f17b60ed6fd33
diff --git a/metadata/md5-cache/dev-python/duecredit-0.6.4 b/metadata/md5-cache/dev-python/duecredit-0.6.4
index eb6ef5d51cb6..a97e82fb0426 100644
--- a/metadata/md5-cache/dev-python/duecredit-0.6.4
+++ b/metadata/md5-cache/dev-python/duecredit-0.6.4
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/d/duecredit/duecredit-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e476acfabaa6ac86ac028f8d26b33d0d
diff --git a/metadata/md5-cache/dev-python/dugong-3.7.1 b/metadata/md5-cache/dev-python/dugong-3.7.1
index a1ad21106eee..6c405339c493 100644
--- a/metadata/md5-cache/dev-python/dugong-3.7.1
+++ b/metadata/md5-cache/dev-python/dugong-3.7.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/dugong/dugong-3.7.1.tar.bz2
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6ef45eb93bd3ad0e8b4761848a8542ec
diff --git a/metadata/md5-cache/dev-python/dugong-3.7.2 b/metadata/md5-cache/dev-python/dugong-3.7.2
index 563fe2cd446d..88905586ffb0 100644
--- a/metadata/md5-cache/dev-python/dugong-3.7.2
+++ b/metadata/md5-cache/dev-python/dugong-3.7.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/dugong/dugong-3.7.2.tar.bz2
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3b1457df41f11855f1255353bb601bb1
diff --git a/metadata/md5-cache/dev-python/dugong-3.7.3 b/metadata/md5-cache/dev-python/dugong-3.7.3
index 27d2e11a90a4..634358f67bac 100644
--- a/metadata/md5-cache/dev-python/dugong-3.7.3
+++ b/metadata/md5-cache/dev-python/dugong-3.7.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/dugong/dugong-3.7.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3b1457df41f11855f1255353bb601bb1
diff --git a/metadata/md5-cache/dev-python/dulwich-0.18.5 b/metadata/md5-cache/dev-python/dulwich-0.18.5
index a9ad88733e0d..73eb97161eeb 100644
--- a/metadata/md5-cache/dev-python/dulwich-0.18.5
+++ b/metadata/md5-cache/dev-python/dulwich-0.18.5
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/d/dulwich/dulwich-0.18.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e027c386a541116c5113d17fde757ddd
diff --git a/metadata/md5-cache/dev-python/dulwich-0.18.6 b/metadata/md5-cache/dev-python/dulwich-0.18.6
index 25ec5792d1c7..d24357fa48b1 100644
--- a/metadata/md5-cache/dev-python/dulwich-0.18.6
+++ b/metadata/md5-cache/dev-python/dulwich-0.18.6
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/d/dulwich/dulwich-0.18.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=739baba147f6210ff89f23e535823c67
diff --git a/metadata/md5-cache/dev-python/dynd-python-0.7.2-r1 b/metadata/md5-cache/dev-python/dynd-python-0.7.2-r1
index decc0702393b..09d3ef8c757a 100644
--- a/metadata/md5-cache/dev-python/dynd-python-0.7.2-r1
+++ b/metadata/md5-cache/dev-python/dynd-python-0.7.2-r1
@@ -10,5 +10,5 @@ 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_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/libdynd/dynd-python/archive/v0.7.2.tar.gz -> dynd-python-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4d773157f4f45c6b031f3c7ec29788db
diff --git a/metadata/md5-cache/dev-python/e4u-0.1_rc5 b/metadata/md5-cache/dev-python/e4u-0.1_rc5
index 672aa31ab7d3..24418e9b6b9c 100644
--- a/metadata/md5-cache/dev-python/e4u-0.1_rc5
+++ b/metadata/md5-cache/dev-python/e4u-0.1_rc5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/beautifulsoup:python-2[python_targets_python2_7(-)?,-python_s
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/lambdalisue/e4u/archive/0.1rc5.tar.gz -> e4u-0.1rc5.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2e6a53a500d8bf1b91229d982fe5874b
diff --git a/metadata/md5-cache/dev-python/easy-thumbnails-2.2 b/metadata/md5-cache/dev-python/easy-thumbnails-2.2
index 380964d71ba4..ff3e995acd64 100644
--- a/metadata/md5-cache/dev-python/easy-thumbnails-2.2
+++ b/metadata/md5-cache/dev-python/easy-thumbnails-2.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/django-1.4 python_targets_python2_7? ( >=dev-lang/python-2.
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/e/easy-thumbnails/easy-thumbnails-2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9bde9d921dd1acd9afd929f4ceb18ee1
diff --git a/metadata/md5-cache/dev-python/easy-thumbnails-2.3 b/metadata/md5-cache/dev-python/easy-thumbnails-2.3
index b325dc030851..a4f9a07ab12a 100644
--- a/metadata/md5-cache/dev-python/easy-thumbnails-2.3
+++ b/metadata/md5-cache/dev-python/easy-thumbnails-2.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/django-1.4[python_targets_python2_7(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/e/easy-thumbnails/easy-thumbnails-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=74c072fbb23ac6a43b2920dc307b9904
diff --git a/metadata/md5-cache/dev-python/easy-thumbnails-2.4.1 b/metadata/md5-cache/dev-python/easy-thumbnails-2.4.1
index 0a819db1fe39..66ba19839bfd 100644
--- a/metadata/md5-cache/dev-python/easy-thumbnails-2.4.1
+++ b/metadata/md5-cache/dev-python/easy-thumbnails-2.4.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/django-1.4.2[python_targets_python2_7(-)?,python_targets_py
 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/easy-thumbnails/easy-thumbnails-2.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e283b4348c7a036e618be0e1f7983426
diff --git a/metadata/md5-cache/dev-python/ebuildtester-0.1.10 b/metadata/md5-cache/dev-python/ebuildtester-0.1.10
index 5c11379ea607..5a39f92ed56b 100644
--- a/metadata/md5-cache/dev-python/ebuildtester-0.1.10
+++ b/metadata/md5-cache/dev-python/ebuildtester-0.1.10
@@ -10,5 +10,5 @@ RDEPEND=app-emulation/docker python_targets_python2_7? ( >=dev-lang/python-2.7.5
 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	89bb9f083a2590d9b447fd0b78a96186
+_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.12 b/metadata/md5-cache/dev-python/ebuildtester-0.1.12
index 10ebfe91456b..4d725e1ad226 100644
--- a/metadata/md5-cache/dev-python/ebuildtester-0.1.12
+++ b/metadata/md5-cache/dev-python/ebuildtester-0.1.12
@@ -10,5 +10,5 @@ RDEPEND=app-emulation/docker python_targets_python2_7? ( >=dev-lang/python-2.7.5
 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.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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.13 b/metadata/md5-cache/dev-python/ebuildtester-0.1.13
new file mode 100644
index 000000000000..1aee04791db0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ebuildtester-0.1.13
@@ -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.13.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.6 b/metadata/md5-cache/dev-python/ebuildtester-0.1.6
index 6a7336bc777a..103b5db7925e 100644
--- a/metadata/md5-cache/dev-python/ebuildtester-0.1.6
+++ b/metadata/md5-cache/dev-python/ebuildtester-0.1.6
@@ -10,5 +10,5 @@ RDEPEND=app-emulation/docker python_targets_python2_7? ( >=dev-lang/python-2.7.5
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
index 8ac5a0039608..3a9a072c15ed 100644
--- a/metadata/md5-cache/dev-python/ebuildtester-0.1.6-r1
+++ b/metadata/md5-cache/dev-python/ebuildtester-0.1.6-r1
@@ -10,5 +10,5 @@ RDEPEND=app-emulation/docker python_targets_python2_7? ( >=dev-lang/python-2.7.5
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
index 15543d66522f..b89b2ae94192 100644
--- a/metadata/md5-cache/dev-python/ebuildtester-0.1.7
+++ b/metadata/md5-cache/dev-python/ebuildtester-0.1.7
@@ -10,5 +10,5 @@ RDEPEND=app-emulation/docker python_targets_python2_7? ( >=dev-lang/python-2.7.5
 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	89bb9f083a2590d9b447fd0b78a96186
+_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 0e3ed179d07e..9226dd84f73c 100644
--- a/metadata/md5-cache/dev-python/ecdsa-0.13
+++ b/metadata/md5-cache/dev-python/ecdsa-0.13
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-python/ed25519ll-0.6 b/metadata/md5-cache/dev-python/ed25519ll-0.6
index cbc1f4021bb9..a4d9df2fa8ba 100644
--- a/metadata/md5-cache/dev-python/ed25519ll-0.6
+++ b/metadata/md5-cache/dev-python/ed25519ll-0.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/e/ed25519ll/ed25519ll-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=85c36f848ceb3807557bd245a177101a
diff --git a/metadata/md5-cache/dev-python/editobj-0.5.7-r2 b/metadata/md5-cache/dev-python/editobj-0.5.7-r2
index 47ef735a1f2e..e9ce6ae3ee68 100644
--- a/metadata/md5-cache/dev-python/editobj-0.5.7-r2
+++ b/metadata/md5-cache/dev-python/editobj-0.5.7-r2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] ) >=dev-l
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://download.gna.org/songwrite/EditObj-0.5.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=8533070aca4d1b9fbdc26edd141a435c
diff --git a/metadata/md5-cache/dev-python/editorconfig-core-py-0.12.0 b/metadata/md5-cache/dev-python/editorconfig-core-py-0.12.0
index 394026ba8357..a174a3c9d6ec 100644
--- a/metadata/md5-cache/dev-python/editorconfig-core-py-0.12.0
+++ b/metadata/md5-cache/dev-python/editorconfig-core-py-0.12.0
@@ -10,5 +10,5 @@ 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
 SRC_URI=https://github.com/editorconfig/editorconfig-core-py/archive/v0.12.0.tar.gz -> editorconfig-core-py-0.12.0.tar.gz test? ( https://github.com/editorconfig/editorconfig-core-test/archive/abb579e00f2deeede91cb485e53512efab9c6474.tar.gz -> editorconfig-core-test-abb579e00f2deeede91cb485e53512efab9c6474.tar.gz )
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=abfcc4119ea867d8887ccb690bb027e2
diff --git a/metadata/md5-cache/dev-python/egenix-mx-base-3.2.5 b/metadata/md5-cache/dev-python/egenix-mx-base-3.2.5
index 3b9785f4f8a1..3d90fce785d0 100644
--- a/metadata/md5-cache/dev-python/egenix-mx-base-3.2.5
+++ b/metadata/md5-cache/dev-python/egenix-mx-base-3.2.5
@@ -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://downloads.egenix.com/python/egenix-mx-base-3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1e4bb50c5db56b48d6ef78d457325793
diff --git a/metadata/md5-cache/dev-python/egenix-mx-base-3.2.8 b/metadata/md5-cache/dev-python/egenix-mx-base-3.2.8
index 32934ab980ab..b72b92bf2072 100644
--- a/metadata/md5-cache/dev-python/egenix-mx-base-3.2.8
+++ b/metadata/md5-cache/dev-python/egenix-mx-base-3.2.8
@@ -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://downloads.egenix.com/python/egenix-mx-base-3.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d7e92913b59f7034cea72ef187a0791c
diff --git a/metadata/md5-cache/dev-python/egenix-mx-base-3.2.9 b/metadata/md5-cache/dev-python/egenix-mx-base-3.2.9
index 8e83e028a025..bff944d766fd 100644
--- a/metadata/md5-cache/dev-python/egenix-mx-base-3.2.9
+++ b/metadata/md5-cache/dev-python/egenix-mx-base-3.2.9
@@ -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://downloads.egenix.com/python/egenix-mx-base-3.2.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=59dd347a50bb258fe249ec7ddbd1013e
diff --git a/metadata/md5-cache/dev-python/egg-python-2.25.3-r1 b/metadata/md5-cache/dev-python/egg-python-2.25.3-r1
index ded1eb3cfeb3..583465c3ab50 100644
--- a/metadata/md5-cache/dev-python/egg-python-2.25.3-r1
+++ b/metadata/md5-cache/dev-python/egg-python-2.25.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-python-extras/2.25/gnome-python-extras-2.25.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome-python-common-r1	4b3f4780086f96814cde64b8e5ea23c5	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome-python-common-r1	4b3f4780086f96814cde64b8e5ea23c5	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cbf3dffc6a3f944f5d7fac77a0fce5d7
diff --git a/metadata/md5-cache/dev-python/elasticsearch-curator-5.1.2 b/metadata/md5-cache/dev-python/elasticsearch-curator-5.1.2
index 0d7dc0f7dbc5..638324954264 100644
--- a/metadata/md5-cache/dev-python/elasticsearch-curator-5.1.2
+++ b/metadata/md5-cache/dev-python/elasticsearch-curator-5.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 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	89bb9f083a2590d9b447fd0b78a96186
+_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.4.1 b/metadata/md5-cache/dev-python/elasticsearch-curator-5.4.1
index a18c6619844e..1843c0d119b7 100644
--- a/metadata/md5-cache/dev-python/elasticsearch-curator-5.4.1
+++ b/metadata/md5-cache/dev-python/elasticsearch-curator-5.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/elasticsearch/curator/archive/v5.4.1.tar.gz -> elasticsearch-curator-5.4.1.tar.gz test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=23b1faa176857ed89c5336492b33644a
diff --git a/metadata/md5-cache/dev-python/elasticsearch-curator-5.5.1 b/metadata/md5-cache/dev-python/elasticsearch-curator-5.5.1
index 554186df251f..80440999e1de 100644
--- a/metadata/md5-cache/dev-python/elasticsearch-curator-5.5.1
+++ b/metadata/md5-cache/dev-python/elasticsearch-curator-5.5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
index cc79e9a0373c..db4b3b3c1498 100644
--- a/metadata/md5-cache/dev-python/elasticsearch-curator-5.5.4
+++ b/metadata/md5-cache/dev-python/elasticsearch-curator-5.5.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 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	89bb9f083a2590d9b447fd0b78a96186
+_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-py-5.5.2 b/metadata/md5-cache/dev-python/elasticsearch-py-5.5.2
index 06a19d005e76..d39cfdc4ddc7 100644
--- a/metadata/md5-cache/dev-python/elasticsearch-py-5.5.2
+++ b/metadata/md5-cache/dev-python/elasticsearch-py-5.5.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/elasticsearch/elasticsearch-py/archive/5.5.2.tar.gz -> elasticsearch-py-5.5.2.tar.gz test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.6.7.tar.gz )
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2d3f0e72471a91311ac495dd9189d86e
diff --git a/metadata/md5-cache/dev-python/elasticsearch-py-5.5.3 b/metadata/md5-cache/dev-python/elasticsearch-py-5.5.3
index ccee40b3adba..6d88d646c859 100644
--- a/metadata/md5-cache/dev-python/elasticsearch-py-5.5.3
+++ b/metadata/md5-cache/dev-python/elasticsearch-py-5.5.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/elasticsearch/elasticsearch-py/archive/5.5.3.tar.gz -> elasticsearch-py-5.5.3.tar.gz test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.6.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=75127ae6a6506b91ac0c19b5363406d2
diff --git a/metadata/md5-cache/dev-python/elasticsearch-py-6.0.0 b/metadata/md5-cache/dev-python/elasticsearch-py-6.0.0
index 5727489d19e9..42abd4183bd5 100644
--- a/metadata/md5-cache/dev-python/elasticsearch-py-6.0.0
+++ b/metadata/md5-cache/dev-python/elasticsearch-py-6.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/elasticsearch/elasticsearch-py/archive/6.0.0.tar.gz -> elasticsearch-py-6.0.0.tar.gz test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=661b39e925fd09cfa8e664a05c4b58a4
diff --git a/metadata/md5-cache/dev-python/elasticsearch-py-6.1.1 b/metadata/md5-cache/dev-python/elasticsearch-py-6.1.1
index 420ef8f105ef..30caca8efe53 100644
--- a/metadata/md5-cache/dev-python/elasticsearch-py-6.1.1
+++ b/metadata/md5-cache/dev-python/elasticsearch-py-6.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/elasticsearch/elasticsearch-py/archive/6.1.1.tar.gz -> elasticsearch-py-6.1.1.tar.gz test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6ea73a87fe98e954c71fa2ca9e4f0a41
diff --git a/metadata/md5-cache/dev-python/elasticsearch-py-6.2.0 b/metadata/md5-cache/dev-python/elasticsearch-py-6.2.0
index 44a1344969fb..4597b35a6ded 100644
--- a/metadata/md5-cache/dev-python/elasticsearch-py-6.2.0
+++ b/metadata/md5-cache/dev-python/elasticsearch-py-6.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/elasticsearch/elasticsearch-py/archive/6.2.0.tar.gz -> elasticsearch-py-6.2.0.tar.gz test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a5441c63e59266da9233c93a2f6ec7e4
diff --git a/metadata/md5-cache/dev-python/elasticsearch-py-6.3.0 b/metadata/md5-cache/dev-python/elasticsearch-py-6.3.0
index fb05e0cb3979..a28cf8d1b83b 100644
--- a/metadata/md5-cache/dev-python/elasticsearch-py-6.3.0
+++ b/metadata/md5-cache/dev-python/elasticsearch-py-6.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/elasticsearch/elasticsearch-py/archive/6.3.0.tar.gz -> elasticsearch-py-6.3.0.tar.gz test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-6.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4b7beb71f60bafb4cd57507c47315454
diff --git a/metadata/md5-cache/dev-python/elementtree-1.2.6-r3 b/metadata/md5-cache/dev-python/elementtree-1.2.6-r3
index 0e811a41a056..6bc3ceea6381 100644
--- a/metadata/md5-cache/dev-python/elementtree-1.2.6-r3
+++ b/metadata/md5-cache/dev-python/elementtree-1.2.6-r3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://effbot.org/downloads/elementtree-1.2.6-20050316.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=25ff5efc71f0596cf93ae38360ac148a
diff --git a/metadata/md5-cache/dev-python/elib-intl-0_pre20110711 b/metadata/md5-cache/dev-python/elib-intl-0_pre20110711
index 16a2ac1a36a4..fecc0410f3bc 100644
--- a/metadata/md5-cache/dev-python/elib-intl-0_pre20110711
+++ b/metadata/md5-cache/dev-python/elib-intl-0_pre20110711
@@ -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=mirror://gentoo/elib-intl-0_pre20110711.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9e87e3042a7b21ec8368fdd30f17cefd
diff --git a/metadata/md5-cache/dev-python/embedly-0.5.0-r1 b/metadata/md5-cache/dev-python/embedly-0.5.0-r1
index e7a9506efba1..4c8096916b6c 100644
--- a/metadata/md5-cache/dev-python/embedly-0.5.0-r1
+++ b/metadata/md5-cache/dev-python/embedly-0.5.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/E/Embedly/Embedly-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=727c5b900f3348f6950c6d37a34e45fe
diff --git a/metadata/md5-cache/dev-python/emcee-2.1.0 b/metadata/md5-cache/dev-python/emcee-2.1.0
index dd282047fc62..dcb7f532081d 100644
--- a/metadata/md5-cache/dev-python/emcee-2.1.0
+++ b/metadata/md5-cache/dev-python/emcee-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/e/emcee/emcee-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ee2b9cb3c3ae2945f300accd76864be9
diff --git a/metadata/md5-cache/dev-python/emcee-2.2.1 b/metadata/md5-cache/dev-python/emcee-2.2.1
index 7b65a88444ae..c31d400fad75 100644
--- a/metadata/md5-cache/dev-python/emcee-2.2.1
+++ b/metadata/md5-cache/dev-python/emcee-2.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/e/emcee/emcee-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3c51dbb82b0ff4553be8ff2ee9d37c45
diff --git a/metadata/md5-cache/dev-python/empy-3.3-r1 b/metadata/md5-cache/dev-python/empy-3.3-r1
index 19f0173fd60a..814271f7727d 100644
--- a/metadata/md5-cache/dev-python/empy-3.3-r1
+++ b/metadata/md5-cache/dev-python/empy-3.3-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.alcyone.com/software/empy/empy-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e9380903e149efc243d59d0ae1d5890f
diff --git a/metadata/md5-cache/dev-python/empy-3.3.2 b/metadata/md5-cache/dev-python/empy-3.3.2
index becb1cca652b..d774616b3b61 100644
--- a/metadata/md5-cache/dev-python/empy-3.3.2
+++ b/metadata/md5-cache/dev-python/empy-3.3.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://www.alcyone.com/software/empy/empy-3.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3dee5e6430494fd09c4c0baabc4c7574
diff --git a/metadata/md5-cache/dev-python/empy-3.3.3 b/metadata/md5-cache/dev-python/empy-3.3.3
index ad65e6a1fb78..369f2c5ec552 100644
--- a/metadata/md5-cache/dev-python/empy-3.3.3
+++ b/metadata/md5-cache/dev-python/empy-3.3.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://www.alcyone.com/software/empy/empy-3.3.3.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4ec1502c77a06daa4a89163414edd5bb
diff --git a/metadata/md5-cache/dev-python/enable-4.4.1 b/metadata/md5-cache/dev-python/enable-4.4.1
index 1cdc3dbb5db0..130320129973 100644
--- a/metadata/md5-cache/dev-python/enable-4.4.1
+++ b/metadata/md5-cache/dev-python/enable-4.4.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/e/enable/enable-4.4.1.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4b1623ea270c57a4991ef37c9a2820ca
diff --git a/metadata/md5-cache/dev-python/enable-4.5.1 b/metadata/md5-cache/dev-python/enable-4.5.1
index b87aa875ff42..3d00ffdd2475 100644
--- a/metadata/md5-cache/dev-python/enable-4.5.1
+++ b/metadata/md5-cache/dev-python/enable-4.5.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/apptools[python_targets_python2_7(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/enthought/enable/archive/4.5.1.tar.gz -> enable-4.5.1.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=314b403c0334694aa84ed1268bb643c2
diff --git a/metadata/md5-cache/dev-python/enable-4.7.1 b/metadata/md5-cache/dev-python/enable-4.7.1
index 94c1bbddf07e..087be8702234 100644
--- a/metadata/md5-cache/dev-python/enable-4.7.1
+++ b/metadata/md5-cache/dev-python/enable-4.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/enthought/enable/archive/4.7.1.tar.gz -> enable-4.7.1.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fc10a522d5d72902928bb262802a58fe
diff --git a/metadata/md5-cache/dev-python/enaml-0.10.2 b/metadata/md5-cache/dev-python/enaml-0.10.2
index 1150c6440115..932b7ddcfad8 100644
--- a/metadata/md5-cache/dev-python/enaml-0.10.2
+++ b/metadata/md5-cache/dev-python/enaml-0.10.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/e/enaml/enaml-0.10.2.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0f7fc4f70cf13b16ee41c9513217d0c2
diff --git a/metadata/md5-cache/dev-python/encore-0.5.1 b/metadata/md5-cache/dev-python/encore-0.5.1
index 75c23530bca7..b3bae8237005 100644
--- a/metadata/md5-cache/dev-python/encore-0.5.1
+++ b/metadata/md5-cache/dev-python/encore-0.5.1
@@ -10,5 +10,5 @@ RDEPEND=virtual/python-futures[python_targets_pypy(-)?,python_targets_python2_7(
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/e/encore/encore-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0acbde1684986ef8ee2d63b289099f06
diff --git a/metadata/md5-cache/dev-python/entrypoints-0.2.3 b/metadata/md5-cache/dev-python/entrypoints-0.2.3
index 4d71411f898b..2a0da7342a86 100644
--- a/metadata/md5-cache/dev-python/entrypoints-0.2.3
+++ b/metadata/md5-cache/dev-python/entrypoints-0.2.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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//takluyver/entrypoints/archive/0.2.3.tar.gz -> entrypoints-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a1ca8c6d9a51e2d577317be511610d9f
diff --git a/metadata/md5-cache/dev-python/enum34-1.1.6 b/metadata/md5-cache/dev-python/enum34-1.1.6
index 20358e8f429a..d52cff40a999 100644
--- a/metadata/md5-cache/dev-python/enum34-1.1.6
+++ b/metadata/md5-cache/dev-python/enum34-1.1.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/e/enum34/enum34-1.1.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2d7dc7dfa85d6cbeacc750f15adca880
diff --git a/metadata/md5-cache/dev-python/envisage-4.4.0 b/metadata/md5-cache/dev-python/envisage-4.4.0
index 9c5c2d43d821..ca8db4497d7c 100644
--- a/metadata/md5-cache/dev-python/envisage-4.4.0
+++ b/metadata/md5-cache/dev-python/envisage-4.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/e/envisage/envisage-4.4.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8ab3bdb5f7ea1ec1d1c5ec71374530ef
diff --git a/metadata/md5-cache/dev-python/envoy-0.0.3 b/metadata/md5-cache/dev-python/envoy-0.0.3
index 91c6c144b030..7918e07bba9e 100644
--- a/metadata/md5-cache/dev-python/envoy-0.0.3
+++ b/metadata/md5-cache/dev-python/envoy-0.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/e/envoy/envoy-0.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=10283641f9ea1558e0f77b88e7a50fc2
diff --git a/metadata/md5-cache/dev-python/envoy-0.0.3-r1 b/metadata/md5-cache/dev-python/envoy-0.0.3-r1
index 7e63cd45c4c7..9bb24a1c578e 100644
--- a/metadata/md5-cache/dev-python/envoy-0.0.3-r1
+++ b/metadata/md5-cache/dev-python/envoy-0.0.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/e/envoy/envoy-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2ebe52b84c076ee53e3b336b70328962
diff --git a/metadata/md5-cache/dev-python/enzyme-0.4.1-r2 b/metadata/md5-cache/dev-python/enzyme-0.4.1-r2
index 54ee2b38acce..39adf7c9df94 100644
--- a/metadata/md5-cache/dev-python/enzyme-0.4.1-r2
+++ b/metadata/md5-cache/dev-python/enzyme-0.4.1-r2
@@ -10,5 +10,5 @@ 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
 SRC_URI=mirror://pypi/e/enzyme/enzyme-0.4.1.tar.gz test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2f8f8ca78a06889bed0bf24eebeea7b5
diff --git a/metadata/md5-cache/dev-python/enzyme-9999 b/metadata/md5-cache/dev-python/enzyme-9999
index 5eaff14b5dc6..f9e7c072f414 100644
--- a/metadata/md5-cache/dev-python/enzyme-9999
+++ b/metadata/md5-cache/dev-python/enzyme-9999
@@ -9,5 +9,5 @@ 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
 SRC_URI=test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=760a3accfd58338c1787f1a23d9d55e7
diff --git a/metadata/md5-cache/dev-python/epsilon-0.7.0 b/metadata/md5-cache/dev-python/epsilon-0.7.0
index 16a88f288c4f..4e03d143a7d6 100644
--- a/metadata/md5-cache/dev-python/epsilon-0.7.0
+++ b/metadata/md5-cache/dev-python/epsilon-0.7.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/twisted-core-13.2.0[python_targets_python2_7(-)?,-python_si
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/E/Epsilon/Epsilon-0.7.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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6d01f3d8503b61b38a569403932e4879
diff --git a/metadata/md5-cache/dev-python/epsilon-0.7.1 b/metadata/md5-cache/dev-python/epsilon-0.7.1
index 9e7ee28b721f..29ebfe56eb30 100644
--- a/metadata/md5-cache/dev-python/epsilon-0.7.1
+++ b/metadata/md5-cache/dev-python/epsilon-0.7.1
@@ -10,5 +10,5 @@ RDEPEND=|| ( dev-python/twisted[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/E/Epsilon/Epsilon-0.7.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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3c01c463a2bb003aaeb73b3f2bc5740d
diff --git a/metadata/md5-cache/dev-python/epydoc-3.0.1-r2 b/metadata/md5-cache/dev-python/epydoc-3.0.1-r2
index 3af9185e318e..623e1a6352d4 100644
--- a/metadata/md5-cache/dev-python/epydoc-3.0.1-r2
+++ b/metadata/md5-cache/dev-python/epydoc-3.0.1-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/epydoc/epydoc-3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=30bb39291e1765358a04a248e3656d8f
diff --git a/metadata/md5-cache/dev-python/errorhandler-1.1.1-r2 b/metadata/md5-cache/dev-python/errorhandler-1.1.1-r2
index 25c645ab9d84..c9f6ce932746 100644
--- a/metadata/md5-cache/dev-python/errorhandler-1.1.1-r2
+++ b/metadata/md5-cache/dev-python/errorhandler-1.1.1-r2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/e/errorhandler/errorhandler-1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f4bc888e27e71a93b56e268a8b01abde
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 126a1056a304..9e5674b7e7ba 100644
--- a/metadata/md5-cache/dev-python/et_xmlfile-1.0.1
+++ b/metadata/md5-cache/dev-python/et_xmlfile-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-python/ets-4.4.1-r1 b/metadata/md5-cache/dev-python/ets-4.4.1-r1
index 66eb9e7b17af..aabe9996268a 100644
--- a/metadata/md5-cache/dev-python/ets-4.4.1-r1
+++ b/metadata/md5-cache/dev-python/ets-4.4.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/apptools-4.2.0[python_targets_python2_7(-)?,-python_single_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/e/ets/ets-4.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3afb88bbb450a18af0ba15b46dee3e76
diff --git a/metadata/md5-cache/dev-python/etsdevtools-4.0.2-r1 b/metadata/md5-cache/dev-python/etsdevtools-4.0.2-r1
index 3235f3c20ac6..ea29ac1bfe4b 100644
--- a/metadata/md5-cache/dev-python/etsdevtools-4.0.2-r1
+++ b/metadata/md5-cache/dev-python/etsdevtools-4.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.enthought.com/repo/ets/etsdevtools-4.0.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9b30a96f3fc262e3ea61b4a4aace9cb3
diff --git a/metadata/md5-cache/dev-python/etsproxy-0.1.2-r1 b/metadata/md5-cache/dev-python/etsproxy-0.1.2-r1
index fb12efa79e8f..1f41c925cfda 100644
--- a/metadata/md5-cache/dev-python/etsproxy-0.1.2-r1
+++ b/metadata/md5-cache/dev-python/etsproxy-0.1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=!<dev-python/apptools-4 !<dev-python/blockcanvas-4 !<dev-python/chaco-4
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.enthought.com/repo/ets/etsproxy-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5a7c29ebebe1680997fa3ecf546630bc
diff --git a/metadata/md5-cache/dev-python/eunuchs-20050320.1-r1 b/metadata/md5-cache/dev-python/eunuchs-20050320.1-r1
index 65359b887967..77b17d2da56a 100644
--- a/metadata/md5-cache/dev-python/eunuchs-20050320.1-r1
+++ b/metadata/md5-cache/dev-python/eunuchs-20050320.1-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/e/eunuchs/eunuchs_20050320.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=95d19b0f3bcf64d5800ebb3a16a33d9f
diff --git a/metadata/md5-cache/dev-python/eventlet-0.18.4 b/metadata/md5-cache/dev-python/eventlet-0.18.4
index f47384e3cc98..6b3ad64d985a 100644
--- a/metadata/md5-cache/dev-python/eventlet-0.18.4
+++ b/metadata/md5-cache/dev-python/eventlet-0.18.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/greenlet-0.3[python_targets_python2_7(-)?,python_targets_py
 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.18.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6d5d88e11b2401d555f6ab2cdde11ce8
diff --git a/metadata/md5-cache/dev-python/eventlet-0.20.0-r1 b/metadata/md5-cache/dev-python/eventlet-0.20.0-r1
index 4ec4bd0912ca..611fcfc902fa 100644
--- a/metadata/md5-cache/dev-python/eventlet-0.20.0-r1
+++ b/metadata/md5-cache/dev-python/eventlet-0.20.0-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/python-enum34 >=dev-python/greenlet-0.3[python_targets_python2_7
 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.20.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1706998c83cd129563c0c18f235ff7d0
diff --git a/metadata/md5-cache/dev-python/eventlet-0.20.1-r1 b/metadata/md5-cache/dev-python/eventlet-0.20.1-r1
index 4585a4813ed8..15a260829a7c 100644
--- a/metadata/md5-cache/dev-python/eventlet-0.20.1-r1
+++ b/metadata/md5-cache/dev-python/eventlet-0.20.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/greenlet-0.3[python_targets_python2_7(-)?,python_targets_py
 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.20.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6ba851e28ce36d032e6aefe9f39224dc
diff --git a/metadata/md5-cache/dev-python/eventlet-0.21.0-r1 b/metadata/md5-cache/dev-python/eventlet-0.21.0-r1
index 6dd415c00b80..8b50f39a135a 100644
--- a/metadata/md5-cache/dev-python/eventlet-0.21.0-r1
+++ b/metadata/md5-cache/dev-python/eventlet-0.21.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/greenlet-0.3[python_targets_python2_7(-)?,python_targets_py
 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.21.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c5b4f8bb6c7d975e2e2842ad9eb1aedb
diff --git a/metadata/md5-cache/dev-python/execnet-1.4.1 b/metadata/md5-cache/dev-python/execnet-1.4.1
index f15e039d2c14..ad88ba67c835 100644
--- a/metadata/md5-cache/dev-python/execnet-1.4.1
+++ b/metadata/md5-cache/dev-python/execnet-1.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/e/execnet/execnet-1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ca411e2bcd3b282dbf3175d15b77c161
diff --git a/metadata/md5-cache/dev-python/execnet-1.5.0 b/metadata/md5-cache/dev-python/execnet-1.5.0
index 6083dc8241d1..bfa6132423fe 100644
--- a/metadata/md5-cache/dev-python/execnet-1.5.0
+++ b/metadata/md5-cache/dev-python/execnet-1.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/e/execnet/execnet-1.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3f923497e1abc38da110e6be79829a4d
diff --git a/metadata/md5-cache/dev-python/expects-0.8.0 b/metadata/md5-cache/dev-python/expects-0.8.0
index d392cceb6078..bfd23f8b15af 100644
--- a/metadata/md5-cache/dev-python/expects-0.8.0
+++ b/metadata/md5-cache/dev-python/expects-0.8.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/e/expects/expects-0.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5aa4ed6809371f4987d55d8d5538fcb7
diff --git a/metadata/md5-cache/dev-python/extras-0.0.3 b/metadata/md5-cache/dev-python/extras-0.0.3
index 3527e2beda52..66b343c3c18c 100644
--- a/metadata/md5-cache/dev-python/extras-0.0.3
+++ b/metadata/md5-cache/dev-python/extras-0.0.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/extras/extras-0.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5230bf597fa7a4c674733ae0f08a84db
diff --git a/metadata/md5-cache/dev-python/extras-1.0.0 b/metadata/md5-cache/dev-python/extras-1.0.0
index aadb548a5442..b82eaf87d194 100644
--- a/metadata/md5-cache/dev-python/extras-1.0.0
+++ b/metadata/md5-cache/dev-python/extras-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/extras/extras-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1f62b684422bdc636a10a7c3c0204d2c
diff --git a/metadata/md5-cache/dev-python/extremes-1.1.1 b/metadata/md5-cache/dev-python/extremes-1.1.1
index d831cb8ecc4b..4b5e1baf35d8 100644
--- a/metadata/md5-cache/dev-python/extremes-1.1.1
+++ b/metadata/md5-cache/dev-python/extremes-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/E/Extremes/Extremes-1.1.1.zip -> extremes-1.1.1.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b848ab034113138b9901d47e077f5e29
diff --git a/metadata/md5-cache/dev-python/eyeD3-0.7.5 b/metadata/md5-cache/dev-python/eyeD3-0.7.5
index 722814bc8e1d..1b7e454721ca 100644
--- a/metadata/md5-cache/dev-python/eyeD3-0.7.5
+++ b/metadata/md5-cache/dev-python/eyeD3-0.7.5
@@ -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.7
 SRC_URI=http://eyed3.nicfit.net/releases/eyeD3-0.7.5.tgz
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=91ba05b23b7bff8dd76a4f3baa892fe2
diff --git a/metadata/md5-cache/dev-python/fabric-1.14.0 b/metadata/md5-cache/dev-python/fabric-1.14.0
index f0c7a1770f7a..96468b05d476 100644
--- a/metadata/md5-cache/dev-python/fabric-1.14.0
+++ b/metadata/md5-cache/dev-python/fabric-1.14.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/paramiko-1.10[python_targets_python2_7(-)?,-python_single_t
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/F/Fabric/Fabric-1.14.0.tar.gz https://raw.githubusercontent.com/kbakulin/fabric-completion/83d303e9fb352deaf4885b6db0781b3d9115e9c6/fabric-completion.bash -> fabric-1.14.0-completion.bash
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9dee84e3db9ff431cd5bacd31b58859e
diff --git a/metadata/md5-cache/dev-python/falcon-0.1.6 b/metadata/md5-cache/dev-python/falcon-0.1.6
index 618bdd437397..28241d455159 100644
--- a/metadata/md5-cache/dev-python/falcon-0.1.6
+++ b/metadata/md5-cache/dev-python/falcon-0.1.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,-pyt
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/racker/falcon/archive/0.1.6.tar.gz -> falcon-0.1.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2079047c9d04f6a4c1ebd3eddeb5d505
diff --git a/metadata/md5-cache/dev-python/falcon-0.1.7 b/metadata/md5-cache/dev-python/falcon-0.1.7
index 39fddb857c22..93680e034bd4 100644
--- a/metadata/md5-cache/dev-python/falcon-0.1.7
+++ b/metadata/md5-cache/dev-python/falcon-0.1.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,-pyt
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/racker/falcon/archive/0.1.7.tar.gz -> falcon-0.1.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=2ac4ae827c3b158a086405626fc7f4fb
diff --git a/metadata/md5-cache/dev-python/falcon-0.1.8 b/metadata/md5-cache/dev-python/falcon-0.1.8
index da03c0f3f723..303bb8328c5a 100644
--- a/metadata/md5-cache/dev-python/falcon-0.1.8
+++ b/metadata/md5-cache/dev-python/falcon-0.1.8
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,pyth
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://github.com/racker/falcon/archive/0.1.8.tar.gz -> falcon-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d3d72f9792867840a1214fd786fc3a6e
diff --git a/metadata/md5-cache/dev-python/falcon-0.1.9 b/metadata/md5-cache/dev-python/falcon-0.1.9
index 914eb9695d42..08c0ac9a1241 100644
--- a/metadata/md5-cache/dev-python/falcon-0.1.9
+++ b/metadata/md5-cache/dev-python/falcon-0.1.9
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,pyth
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/racker/falcon/archive/0.1.9.tar.gz -> falcon-0.1.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=502f3c1a4227fcc2635d4090d59c2a4e
diff --git a/metadata/md5-cache/dev-python/falcon-1.3.0 b/metadata/md5-cache/dev-python/falcon-1.3.0
index 41289484eac0..bfcfb39e1e1d 100644
--- a/metadata/md5-cache/dev-python/falcon-1.3.0
+++ b/metadata/md5-cache/dev-python/falcon-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,pyth
 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/racker/falcon/archive/1.3.0.tar.gz -> falcon-1.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7860395cd41d8a773b3436fc7c9b88d0
diff --git a/metadata/md5-cache/dev-python/fasteners-0.13.0 b/metadata/md5-cache/dev-python/fasteners-0.13.0
index e8a56dd673fd..1c46067513a1 100644
--- a/metadata/md5-cache/dev-python/fasteners-0.13.0
+++ b/metadata/md5-cache/dev-python/fasteners-0.13.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/f/fasteners/fasteners-0.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=010a80e22d3fd9db6607e11cd5266084
diff --git a/metadata/md5-cache/dev-python/fasteners-0.14.1 b/metadata/md5-cache/dev-python/fasteners-0.14.1
index 51954b1d0bbc..b93db9591170 100644
--- a/metadata/md5-cache/dev-python/fasteners-0.14.1
+++ b/metadata/md5-cache/dev-python/fasteners-0.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/monotonic-0.1[python_targets_pypy(-)?,python_targets_python
 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/f/fasteners/fasteners-0.14.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8388a0589830862826e7f2ab5c5885a3
diff --git a/metadata/md5-cache/dev-python/fastparquet-0.1.1 b/metadata/md5-cache/dev-python/fastparquet-0.1.1
index fe216bb7f789..35000c13d329 100644
--- a/metadata/md5-cache/dev-python/fastparquet-0.1.1
+++ b/metadata/md5-cache/dev-python/fastparquet-0.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numba[python_targets_python2_7(-)?,python_targets_python3_5(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/f/fastparquet/fastparquet-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4ac968ea82af64e6346f6a95e7142075
diff --git a/metadata/md5-cache/dev-python/fastparquet-0.1.5 b/metadata/md5-cache/dev-python/fastparquet-0.1.5
index a30f97881f49..2b1493525a79 100644
--- a/metadata/md5-cache/dev-python/fastparquet-0.1.5
+++ b/metadata/md5-cache/dev-python/fastparquet-0.1.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numba[python_targets_python2_7(-)?,python_targets_python3_5(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/f/fastparquet/fastparquet-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c1eb572b374306ca976a7be5291769d8
diff --git a/metadata/md5-cache/dev-python/faulthandler-2.6 b/metadata/md5-cache/dev-python/faulthandler-2.6
index eee15c40841c..1659ab47c6a9 100644
--- a/metadata/md5-cache/dev-python/faulthandler-2.6
+++ b/metadata/md5-cache/dev-python/faulthandler-2.6
@@ -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=mirror://pypi/f/faulthandler/faulthandler-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dca2c9b2770d646ded50b8b3460239db
diff --git a/metadata/md5-cache/dev-python/faulthandler-3.0 b/metadata/md5-cache/dev-python/faulthandler-3.0
index 16c735c6324a..e5ae7097b49b 100644
--- a/metadata/md5-cache/dev-python/faulthandler-3.0
+++ b/metadata/md5-cache/dev-python/faulthandler-3.0
@@ -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=mirror://pypi/f/faulthandler/faulthandler-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bd1199a3a596334a79ca3fe5b876f7d9
diff --git a/metadata/md5-cache/dev-python/faulthandler-3.1 b/metadata/md5-cache/dev-python/faulthandler-3.1
index 4259333ef9cd..97a3c78593bb 100644
--- a/metadata/md5-cache/dev-python/faulthandler-3.1
+++ b/metadata/md5-cache/dev-python/faulthandler-3.1
@@ -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=mirror://pypi/f/faulthandler/faulthandler-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a74a49d9c6352355ec3b305b2b48b9ad
diff --git a/metadata/md5-cache/dev-python/fdsend-0.1 b/metadata/md5-cache/dev-python/fdsend-0.1
index 3d692b0cf935..6eeccf3e4ecf 100644
--- a/metadata/md5-cache/dev-python/fdsend-0.1
+++ b/metadata/md5-cache/dev-python/fdsend-0.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://pilcrow.madison.wi.us/sw/fdsend-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2751b445e6508ea841f4c73f607e54f6
diff --git a/metadata/md5-cache/dev-python/fedmsg-0.18.3 b/metadata/md5-cache/dev-python/fedmsg-0.18.3
index 61a2d3d89c03..c1a75f88025a 100644
--- a/metadata/md5-cache/dev-python/fedmsg-0.18.3
+++ b/metadata/md5-cache/dev-python/fedmsg-0.18.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyzmq[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/f/fedmsg/fedmsg-0.18.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6bdeb1a3c3bf2eae4ea960beb6960c9f
diff --git a/metadata/md5-cache/dev-python/feedgenerator-1.9 b/metadata/md5-cache/dev-python/feedgenerator-1.9
index 6b16afc8cab1..7986cc81f4df 100644
--- a/metadata/md5-cache/dev-python/feedgenerator-1.9
+++ b/metadata/md5-cache/dev-python/feedgenerator-1.9
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/f/feedgenerator/feedgenerator-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ba750a9b02cb70f29b08af3c7aba0365
diff --git a/metadata/md5-cache/dev-python/feedparser-5.2.1 b/metadata/md5-cache/dev-python/feedparser-5.2.1
index 52e14c90965e..8b374282dfc6 100644
--- a/metadata/md5-cache/dev-python/feedparser-5.2.1
+++ b/metadata/md5-cache/dev-python/feedparser-5.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/f/feedparser/feedparser-5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5cbd2b326525aac0236042c025c63d34
diff --git a/metadata/md5-cache/dev-python/fexpect-0.2 b/metadata/md5-cache/dev-python/fexpect-0.2
index b4e6a68ad097..b4cdd7292935 100644
--- a/metadata/md5-cache/dev-python/fexpect-0.2
+++ b/metadata/md5-cache/dev-python/fexpect-0.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/fabric[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ilogue/fexpect/archive/0.2.tar.gz -> fexpect-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f9bd6925adbe984c0bd200aa7a095e0c
diff --git a/metadata/md5-cache/dev-python/fido2-0.3.0 b/metadata/md5-cache/dev-python/fido2-0.3.0
index ec5946cb3e6f..442f26f265ed 100644
--- a/metadata/md5-cache/dev-python/fido2-0.3.0
+++ b/metadata/md5-cache/dev-python/fido2-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/Yubico/python-fido2/releases/download/0.3.0/fido2-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f934e868b5e7cb70918b2560e04d7e53
diff --git a/metadata/md5-cache/dev-python/fields-5.0.0 b/metadata/md5-cache/dev-python/fields-5.0.0
index 5e4eebc645e1..7df618468ae1 100644
--- a/metadata/md5-cache/dev-python/fields-5.0.0
+++ b/metadata/md5-cache/dev-python/fields-5.0.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/f/fields/fields-5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f63cddb14889d022d54074b4b04d528a
diff --git a/metadata/md5-cache/dev-python/figleaf-0.6.1-r1 b/metadata/md5-cache/dev-python/figleaf-0.6.1-r1
index 4cff2d60a595..903fb62f1203 100644
--- a/metadata/md5-cache/dev-python/figleaf-0.6.1-r1
+++ b/metadata/md5-cache/dev-python/figleaf-0.6.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=http://darcs.idyll.org/~t/projects/figleaf-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ccfea379f6d8ca404bf65cc5316fe655
diff --git a/metadata/md5-cache/dev-python/filemagic-1.6 b/metadata/md5-cache/dev-python/filemagic-1.6
index 9647bcda2b8d..3f0a1c10b9b0 100644
--- a/metadata/md5-cache/dev-python/filemagic-1.6
+++ b/metadata/md5-cache/dev-python/filemagic-1.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/f/filemagic/filemagic-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7fd64239084eb7f300db5691aec8dada
diff --git a/metadata/md5-cache/dev-python/fitsio-0.9.11 b/metadata/md5-cache/dev-python/fitsio-0.9.11
index 070c5f2da3db..a8db9aa4a3ad 100644
--- a/metadata/md5-cache/dev-python/fitsio-0.9.11
+++ b/metadata/md5-cache/dev-python/fitsio-0.9.11
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/numpy-1.11[python_targets_python2_7(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/esheldon/fitsio/archive/v0.9.11.tar.gz -> fitsio-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6ed5dff7ad389658087fb33cd7190acd
diff --git a/metadata/md5-cache/dev-python/fixtures-1.4.0 b/metadata/md5-cache/dev-python/fixtures-1.4.0
index 2c7b1f8a1449..c6f17af80603 100644
--- a/metadata/md5-cache/dev-python/fixtures-1.4.0
+++ b/metadata/md5-cache/dev-python/fixtures-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-0.11[python_targets_pypy(-)?,python_targets_pypy3(-)?,p
 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/f/fixtures/fixtures-1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=df8eae96fc232aa823acde3397baf27b
diff --git a/metadata/md5-cache/dev-python/fixtures-3.0.0 b/metadata/md5-cache/dev-python/fixtures-3.0.0
index 945d6d076368..4fde39efb869 100644
--- a/metadata/md5-cache/dev-python/fixtures-3.0.0
+++ b/metadata/md5-cache/dev-python/fixtures-3.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-0.11[python_targets_pypy(-)?,python_targets_pypy3(-)?,p
 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/fixtures/fixtures-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=392104abba444770e5fdc8e3bd82de46
diff --git a/metadata/md5-cache/dev-python/flake8-2.1.0 b/metadata/md5-cache/dev-python/flake8-2.1.0
index e785670ffd6a..8ff5b978222d 100644
--- a/metadata/md5-cache/dev-python/flake8-2.1.0
+++ b/metadata/md5-cache/dev-python/flake8-2.1.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pyflakes-0.7.3[python_targets_python2_7(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/f/flake8/flake8-2.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d63d3e0792e887b279396862ea339bc7
diff --git a/metadata/md5-cache/dev-python/flake8-2.2.5 b/metadata/md5-cache/dev-python/flake8-2.2.5
index 36855e86cccb..2f423dc637ee 100644
--- a/metadata/md5-cache/dev-python/flake8-2.2.5
+++ b/metadata/md5-cache/dev-python/flake8-2.2.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pyflakes-0.7.3[python_targets_python2_7(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/f/flake8/flake8-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=05b115bfa8b32180243c7f16a9969caf
diff --git a/metadata/md5-cache/dev-python/flake8-2.5.4 b/metadata/md5-cache/dev-python/flake8-2.5.4
index 31cbe0d4dfce..69d7e8a839fe 100644
--- a/metadata/md5-cache/dev-python/flake8-2.5.4
+++ b/metadata/md5-cache/dev-python/flake8-2.5.4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pyflakes-0.8.1[python_targets_python2_7(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/f/flake8/flake8-2.5.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7c9cad3b7e59f7461c8d808b09a2cdec
diff --git a/metadata/md5-cache/dev-python/flake8-3.5.0 b/metadata/md5-cache/dev-python/flake8-3.5.0
index e6f2d18164c6..7070d1553ffb 100644
--- a/metadata/md5-cache/dev-python/flake8-3.5.0
+++ b/metadata/md5-cache/dev-python/flake8-3.5.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pyflakes-1.5.0[python_targets_pypy(-)?,python_targets_pypy3
 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/f/flake8/flake8-3.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9ed4a7d4c8f855b609c07445c61fe96e
diff --git a/metadata/md5-cache/dev-python/flake8-polyfill-1.0.1 b/metadata/md5-cache/dev-python/flake8-polyfill-1.0.1
index 80d65232d9c5..79b0d7835cb8 100644
--- a/metadata/md5-cache/dev-python/flake8-polyfill-1.0.1
+++ b/metadata/md5-cache/dev-python/flake8-polyfill-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/flake8[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/f/flake8-polyfill/flake8-polyfill-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=063976e62f8c004c0cb592f917a9e5db
diff --git a/metadata/md5-cache/dev-python/flaky-3.1.1 b/metadata/md5-cache/dev-python/flaky-3.1.1
index 79147adee815..f493ab79e051 100644
--- a/metadata/md5-cache/dev-python/flaky-3.1.1
+++ b/metadata/md5-cache/dev-python/flaky-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/f/flaky/flaky-3.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=51a2653ea89d2399dd1d4ad266b2aeb7
diff --git a/metadata/md5-cache/dev-python/flaky-3.4.0 b/metadata/md5-cache/dev-python/flaky-3.4.0
index bb2d124f1b21..4f1466487b69 100644
--- a/metadata/md5-cache/dev-python/flaky-3.4.0
+++ b/metadata/md5-cache/dev-python/flaky-3.4.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/flaky/flaky-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fcbb49500ab91cc89b3e7eddb582c387
diff --git a/metadata/md5-cache/dev-python/flask-0.12.2 b/metadata/md5-cache/dev-python/flask-0.12.2
index 4a75a4d27554..2dc9c297b72b 100644
--- a/metadata/md5-cache/dev-python/flask-0.12.2
+++ b/metadata/md5-cache/dev-python/flask-0.12.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/click-2[python_targets_pypy(-)?,python_targets_pypy3(-)?,py
 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/F/Flask/Flask-0.12.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=327ad37f5dd1f7ad030a30681161043c
diff --git a/metadata/md5-cache/dev-python/flask-admin-1.0.6 b/metadata/md5-cache/dev-python/flask-admin-1.0.6
index 0f10e835e27e..da2b062fc2c9 100644
--- a/metadata/md5-cache/dev-python/flask-admin-1.0.6
+++ b/metadata/md5-cache/dev-python/flask-admin-1.0.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/flask[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Admin/Flask-Admin-1.0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=83e168deb390a4296a5eeb2cdb2117f6
diff --git a/metadata/md5-cache/dev-python/flask-admin-1.5.0 b/metadata/md5-cache/dev-python/flask-admin-1.5.0
index 1ea21d2b5a32..0e37a3ff6201 100644
--- a/metadata/md5-cache/dev-python/flask-admin-1.5.0
+++ b/metadata/md5-cache/dev-python/flask-admin-1.5.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/flask-0.7[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Admin/Flask-Admin-1.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a74bf4387ec5252babb3d4e7d873eff4
diff --git a/metadata/md5-cache/dev-python/flask-admin-1.5.1 b/metadata/md5-cache/dev-python/flask-admin-1.5.1
index 808f97a8559f..014abdc7d3d8 100644
--- a/metadata/md5-cache/dev-python/flask-admin-1.5.1
+++ b/metadata/md5-cache/dev-python/flask-admin-1.5.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/flask-0.7[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Admin/Flask-Admin-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8616d287a939c5edbebda4ab883dc5b4
diff --git a/metadata/md5-cache/dev-python/flask-appconfig-0.11.1-r1 b/metadata/md5-cache/dev-python/flask-appconfig-0.11.1-r1
index 98b5e7f7b622..1eb24389b37b 100644
--- a/metadata/md5-cache/dev-python/flask-appconfig-0.11.1-r1
+++ b/metadata/md5-cache/dev-python/flask-appconfig-0.11.1-r1
@@ -1,15 +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 ) >=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(-)]
+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_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/click[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-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/flask[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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(-)] )
+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/alabaster[python_targets_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[python_targets_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/click[python_targets_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/flask[python_targets_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[python_targets_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=Configures Flask applications in a canonical way
 EAPI=7
 HOMEPAGE=https://github.com/mbr/flask-appconfig
-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
+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=dev-python/click[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-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/flask[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=dev-python/click[python_targets_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/flask[python_targets_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=https://github.com/mbr/flask-appconfig/archive/0.11.1.tar.gz -> flask-appconfig-0.11.1.tar.gz
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=7bb08f64d4e4ccdc21ba732aa585d616
+_md5_=7aa846b05ef060e7009df3e40ccb69d8
diff --git a/metadata/md5-cache/dev-python/flask-babel-0.11.2 b/metadata/md5-cache/dev-python/flask-babel-0.11.2
index 7e5e56a4a527..0012514b8267 100644
--- a/metadata/md5-cache/dev-python/flask-babel-0.11.2
+++ b/metadata/md5-cache/dev-python/flask-babel-0.11.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/flask[python_targets_pypy(-)?,python_targets_python2_7(-)?,py
 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-Babel/Flask-Babel-0.11.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bee58f9c137e5b5305e4ed0d7781f03c
diff --git a/metadata/md5-cache/dev-python/flask-babelex-0.9.3 b/metadata/md5-cache/dev-python/flask-babelex-0.9.3
index cf0d4ede867b..5f15e5f6edc7 100644
--- a/metadata/md5-cache/dev-python/flask-babelex-0.9.3
+++ b/metadata/md5-cache/dev-python/flask-babelex-0.9.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-BabelEx/Flask-BabelEx-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=748b7bacb0b3b23cf894f4c3a90f8784
diff --git a/metadata/md5-cache/dev-python/flask-bootstrap-3.3.6.0 b/metadata/md5-cache/dev-python/flask-bootstrap-3.3.6.0
index 44622bd016ce..d2a6a08ad1db 100644
--- a/metadata/md5-cache/dev-python/flask-bootstrap-3.3.6.0
+++ b/metadata/md5-cache/dev-python/flask-bootstrap-3.3.6.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/dominate[python_targets_python2_7(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/mbr/flask-bootstrap/archive/3.3.6.0.tar.gz -> flask-bootstrap-3.3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d04d19ce5b8b391172a7cc8b1c8a29f9
diff --git a/metadata/md5-cache/dev-python/flask-bootstrap-3.3.7.0 b/metadata/md5-cache/dev-python/flask-bootstrap-3.3.7.0
index 02c02964859f..7aa200e38ecb 100644
--- a/metadata/md5-cache/dev-python/flask-bootstrap-3.3.7.0
+++ b/metadata/md5-cache/dev-python/flask-bootstrap-3.3.7.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/dominate[python_targets_python2_7(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/mbr/flask-bootstrap/archive/3.3.7.0.tar.gz -> flask-bootstrap-3.3.7.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d04d19ce5b8b391172a7cc8b1c8a29f9
diff --git a/metadata/md5-cache/dev-python/flask-cors-1.8.0 b/metadata/md5-cache/dev-python/flask-cors-1.8.0
index b6cb939454f8..94ab22c37e55 100644
--- a/metadata/md5-cache/dev-python/flask-cors-1.8.0
+++ b/metadata/md5-cache/dev-python/flask-cors-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/flask[python_targets_pypy(-)?,python_targets_python2_7(-)?,py
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Cors/Flask-Cors-1.8.0.tar.gz -> flask-cors-1.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=50326d345567533757d7004416ec3812
diff --git a/metadata/md5-cache/dev-python/flask-cors-1.9.0 b/metadata/md5-cache/dev-python/flask-cors-1.9.0
index 47e7592da8af..fc6eb4cd04bd 100644
--- a/metadata/md5-cache/dev-python/flask-cors-1.9.0
+++ b/metadata/md5-cache/dev-python/flask-cors-1.9.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/flask[python_targets_pypy(-)?,python_targets_python2_7(-)?,py
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Cors/Flask-Cors-1.9.0.tar.gz -> flask-cors-1.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=50ccac9a5dd65073707d45b6ea87d3b6
diff --git a/metadata/md5-cache/dev-python/flask-cors-2.1.0 b/metadata/md5-cache/dev-python/flask-cors-2.1.0
index e68a036c2bc0..603a4e1a40a8 100644
--- a/metadata/md5-cache/dev-python/flask-cors-2.1.0
+++ b/metadata/md5-cache/dev-python/flask-cors-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/flask[python_targets_pypy(-)?,python_targets_python2_7(-)?,py
 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/F/Flask-Cors/Flask-Cors-2.1.0.tar.gz -> flask-cors-2.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5d348efc40f0eb6b47a21a1bd1e8ef13
diff --git a/metadata/md5-cache/dev-python/flask-dashed-0.1b_p2 b/metadata/md5-cache/dev-python/flask-dashed-0.1b_p2
index f2a8400e8574..68515d78a916 100644
--- a/metadata/md5-cache/dev-python/flask-dashed-0.1b_p2
+++ b/metadata/md5-cache/dev-python/flask-dashed-0.1b_p2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/flask[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Dashed/Flask-Dashed-0.1b2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e722c6a8da85460f892aeae89ba16bec
diff --git a/metadata/md5-cache/dev-python/flask-evolution-0.5-r1 b/metadata/md5-cache/dev-python/flask-evolution-0.5-r1
index 0fd8f70d3111..12ecd85ec15e 100644
--- a/metadata/md5-cache/dev-python/flask-evolution-0.5-r1
+++ b/metadata/md5-cache/dev-python/flask-evolution-0.5-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Evolution/Flask-Evolution-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6fe717e9e97ad01f594da77dae607b71
diff --git a/metadata/md5-cache/dev-python/flask-evolution-0.6 b/metadata/md5-cache/dev-python/flask-evolution-0.6
index ddff24e8d25c..bcfc1109bb4f 100644
--- a/metadata/md5-cache/dev-python/flask-evolution-0.6
+++ b/metadata/md5-cache/dev-python/flask-evolution-0.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Evolution/Flask-Evolution-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=55c49dadd8a0c61994033b1272a889a5
diff --git a/metadata/md5-cache/dev-python/flask-gravatar-0.4.2 b/metadata/md5-cache/dev-python/flask-gravatar-0.4.2
index a67f279c7b82..ec67a77ac068 100644
--- a/metadata/md5-cache/dev-python/flask-gravatar-0.4.2
+++ b/metadata/md5-cache/dev-python/flask-gravatar-0.4.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Gravatar/Flask-Gravatar-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e8fbdd3be976e94a2fcc4c7b8df1ca08
diff --git a/metadata/md5-cache/dev-python/flask-gravatar-0.5.0 b/metadata/md5-cache/dev-python/flask-gravatar-0.5.0
index e5e03bba7e98..39679d0aec3f 100644
--- a/metadata/md5-cache/dev-python/flask-gravatar-0.5.0
+++ b/metadata/md5-cache/dev-python/flask-gravatar-0.5.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Gravatar/Flask-Gravatar-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cb874351e514d3c527ce4f9e560a3773
diff --git a/metadata/md5-cache/dev-python/flask-htmlmin-1.2.1 b/metadata/md5-cache/dev-python/flask-htmlmin-1.2.1
index 31cf1e14d9ae..8dcf71e4838b 100644
--- a/metadata/md5-cache/dev-python/flask-htmlmin-1.2.1
+++ b/metadata/md5-cache/dev-python/flask-htmlmin-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=app-text/htmlmin dev-python/flask python_targets_python2_7? ( >=dev-lang
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-HTMLmin/Flask-HTMLmin-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e6166b84c6533a95bd8a2032c5df80fb
diff --git a/metadata/md5-cache/dev-python/flask-htmlmin-1.3.2 b/metadata/md5-cache/dev-python/flask-htmlmin-1.3.2
index e1a92d7e4fca..82d290e64685 100644
--- a/metadata/md5-cache/dev-python/flask-htmlmin-1.3.2
+++ b/metadata/md5-cache/dev-python/flask-htmlmin-1.3.2
@@ -10,5 +10,5 @@ RDEPEND=app-text/htmlmin dev-python/flask python_targets_python2_7? ( >=dev-lang
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-HTMLmin/Flask-HTMLmin-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=66a32d688842db6855e2b8ae1fd772be
diff --git a/metadata/md5-cache/dev-python/flask-login-0.3.2-r1 b/metadata/md5-cache/dev-python/flask-login-0.3.2-r1
index 10795196f4f1..c8f95728f463 100644
--- a/metadata/md5-cache/dev-python/flask-login-0.3.2-r1
+++ b/metadata/md5-cache/dev-python/flask-login-0.3.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/flask-0.10[python_targets_pypy(-)?,python_targets_python2_7
 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/maxcountryman/flask-login/archive/0.3.2.tar.gz -> flask-login-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3c598a7def57ea43356cde466c684378
diff --git a/metadata/md5-cache/dev-python/flask-mail-0.9.1-r1 b/metadata/md5-cache/dev-python/flask-mail-0.9.1-r1
index e779e8d00cde..b4569ad049f2 100644
--- a/metadata/md5-cache/dev-python/flask-mail-0.9.1-r1
+++ b/metadata/md5-cache/dev-python/flask-mail-0.9.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/flask[python_targets_pypy(-)?,python_targets_python2_7(-)?,py
 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/F/Flask-Mail/Flask-Mail-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e6d15e9cab61bdf5787dd2253c710b5a
diff --git a/metadata/md5-cache/dev-python/flask-migrate-2.1.1 b/metadata/md5-cache/dev-python/flask-migrate-2.1.1
index 4719581039d9..b6e674f8aad3 100644
--- a/metadata/md5-cache/dev-python/flask-migrate-2.1.1
+++ b/metadata/md5-cache/dev-python/flask-migrate-2.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/flask-0.9[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Migrate/Flask-Migrate-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=881c3c35a594af603138aa4cbd235562
diff --git a/metadata/md5-cache/dev-python/flask-migrate-2.1.1-r1 b/metadata/md5-cache/dev-python/flask-migrate-2.1.1-r1
index 7e38545fbd33..9c8c28d69df5 100644
--- a/metadata/md5-cache/dev-python/flask-migrate-2.1.1-r1
+++ b/metadata/md5-cache/dev-python/flask-migrate-2.1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/flask-0.9[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Migrate/Flask-Migrate-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=86f235d3e10cefe13cfbbf7b60a3e43c
diff --git a/metadata/md5-cache/dev-python/flask-mongoengine-0.9.3 b/metadata/md5-cache/dev-python/flask-mongoengine-0.9.3
index bfe31efaa8f5..738c4101f801 100644
--- a/metadata/md5-cache/dev-python/flask-mongoengine-0.9.3
+++ b/metadata/md5-cache/dev-python/flask-mongoengine-0.9.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/f/flask-mongoengine/flask-mongoengine-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=28ecc245d5a5818912ebe6d9d629e70d
diff --git a/metadata/md5-cache/dev-python/flask-mongoengine-0.9.3-r1 b/metadata/md5-cache/dev-python/flask-mongoengine-0.9.3-r1
index 128201741e8c..49f211b23808 100644
--- a/metadata/md5-cache/dev-python/flask-mongoengine-0.9.3-r1
+++ b/metadata/md5-cache/dev-python/flask-mongoengine-0.9.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/f/flask-mongoengine/flask-mongoengine-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=80a17ce6abfaebd30bed099c6bb97ab4
diff --git a/metadata/md5-cache/dev-python/flask-nav-0.5 b/metadata/md5-cache/dev-python/flask-nav-0.5
index 56b4315279d4..5a5b4a3e9e11 100644
--- a/metadata/md5-cache/dev-python/flask-nav-0.5
+++ b/metadata/md5-cache/dev-python/flask-nav-0.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/dominate[python_targets_python2_7(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/mbr/flask-nav/archive/0.5.tar.gz -> flask-nav-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=308890195220b92bd6331fa3c588a7ce
diff --git a/metadata/md5-cache/dev-python/flask-openid-1.2.4 b/metadata/md5-cache/dev-python/flask-openid-1.2.4
index 109bddc68b5e..de024b51bed4 100644
--- a/metadata/md5-cache/dev-python/flask-openid-1.2.4
+++ b/metadata/md5-cache/dev-python/flask-openid-1.2.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/flask-0.3[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-OpenID/Flask-OpenID-1.2.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f36fdf9bef45d117a974e0b3736c55bc
diff --git a/metadata/md5-cache/dev-python/flask-openid-1.2.5 b/metadata/md5-cache/dev-python/flask-openid-1.2.5
index 0f21baad32e0..4774c9a683a4 100644
--- a/metadata/md5-cache/dev-python/flask-openid-1.2.5
+++ b/metadata/md5-cache/dev-python/flask-openid-1.2.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/flask-0.3[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-OpenID/Flask-OpenID-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=249f9153c2d022afdf2275792859ab83
diff --git a/metadata/md5-cache/dev-python/flask-paranoid-0.1.0 b/metadata/md5-cache/dev-python/flask-paranoid-0.1.0
index f8b267b0b27d..962c55c4655d 100644
--- a/metadata/md5-cache/dev-python/flask-paranoid-0.1.0
+++ b/metadata/md5-cache/dev-python/flask-paranoid-0.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Paranoid/Flask-Paranoid-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=33a4c10cc24c5a50392b9da3625a91f2
diff --git a/metadata/md5-cache/dev-python/flask-paranoid-0.2.0 b/metadata/md5-cache/dev-python/flask-paranoid-0.2.0
index ae6a64fd6803..a1f80a919274 100644
--- a/metadata/md5-cache/dev-python/flask-paranoid-0.2.0
+++ b/metadata/md5-cache/dev-python/flask-paranoid-0.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Paranoid/Flask-Paranoid-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6ea2583cf515b7bec79d7d2846055157
diff --git a/metadata/md5-cache/dev-python/flask-paranoid-0.2.0-r1 b/metadata/md5-cache/dev-python/flask-paranoid-0.2.0-r1
index 83b727db8c8b..ca52befb5127 100644
--- a/metadata/md5-cache/dev-python/flask-paranoid-0.2.0-r1
+++ b/metadata/md5-cache/dev-python/flask-paranoid-0.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/miguelgrinberg/flask-paranoid/archive/v0.2.tar.gz -> flask-paranoid-0.2.0.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e77374fd3730a14ade8e22a9d39b6e47
diff --git a/metadata/md5-cache/dev-python/flask-peewee-0.6.5 b/metadata/md5-cache/dev-python/flask-peewee-0.6.5
index 5c549585c5de..7f6acc648b53 100644
--- a/metadata/md5-cache/dev-python/flask-peewee-0.6.5
+++ b/metadata/md5-cache/dev-python/flask-peewee-0.6.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/f/flask-peewee/flask-peewee-0.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=ef4f76949548c16716549d67df7fb91a
diff --git a/metadata/md5-cache/dev-python/flask-peewee-0.6.7 b/metadata/md5-cache/dev-python/flask-peewee-0.6.7
index 111d03d30682..500c4343824a 100644
--- a/metadata/md5-cache/dev-python/flask-peewee-0.6.7
+++ b/metadata/md5-cache/dev-python/flask-peewee-0.6.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/f/flask-peewee/flask-peewee-0.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=23446855e77a2d3fe8b77da14688a061
diff --git a/metadata/md5-cache/dev-python/flask-principal-0.4.0-r1 b/metadata/md5-cache/dev-python/flask-principal-0.4.0-r1
index d0b9555940dc..8b3835a46ab9 100644
--- a/metadata/md5-cache/dev-python/flask-principal-0.4.0-r1
+++ b/metadata/md5-cache/dev-python/flask-principal-0.4.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/flask[python_targets_pypy(-)?,python_targets_python2_7(-)?,py
 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/mattupstate/flask-principal/archive/0.4.0.tar.gz -> flask-principal-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e18ac2939ab8dcd93e4cbe4e9fe543e6
diff --git a/metadata/md5-cache/dev-python/flask-pymongo-0.3.0 b/metadata/md5-cache/dev-python/flask-pymongo-0.3.0
index e1132be6bc7d..87c6a62f4719 100644
--- a/metadata/md5-cache/dev-python/flask-pymongo-0.3.0
+++ b/metadata/md5-cache/dev-python/flask-pymongo-0.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/dcrosta/flask-pymongo/archive/0.3.0.tar.gz -> flask-pymongo-0.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=196650960c6321391ffdd579112912e3
diff --git a/metadata/md5-cache/dev-python/flask-pymongo-0.4.1 b/metadata/md5-cache/dev-python/flask-pymongo-0.4.1
index 20e804136fac..65fea729fe76 100644
--- a/metadata/md5-cache/dev-python/flask-pymongo-0.4.1
+++ b/metadata/md5-cache/dev-python/flask-pymongo-0.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/dcrosta/flask-pymongo/archive/0.4.1.tar.gz -> flask-pymongo-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3c540aa1ad2a9635930625c6823c061c
diff --git a/metadata/md5-cache/dev-python/flask-restful-0.3.5-r1 b/metadata/md5-cache/dev-python/flask-restful-0.3.5-r1
index 6761fbf9a2b1..e4f0149c7815 100644
--- a/metadata/md5-cache/dev-python/flask-restful-0.3.5-r1
+++ b/metadata/md5-cache/dev-python/flask-restful-0.3.5-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/aniso8601-0.82[python_targets_python2_7(-)?,python_targets_
 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/twilio/flask-restful/archive/0.3.5.tar.gz -> flask-restful-0.3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=94d55d3e0a219417e30165a1bf0d51bb
diff --git a/metadata/md5-cache/dev-python/flask-restful-0.3.6 b/metadata/md5-cache/dev-python/flask-restful-0.3.6
index e68902632a23..9e1a6face7c9 100644
--- a/metadata/md5-cache/dev-python/flask-restful-0.3.6
+++ b/metadata/md5-cache/dev-python/flask-restful-0.3.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/aniso8601-0.82[python_targets_python2_7(-)?,python_targets_
 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/twilio/flask-restful/archive/0.3.6.tar.gz -> flask-restful-0.3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f50a3963486db0523e6542640af92741
diff --git a/metadata/md5-cache/dev-python/flask-restless-0.17.0 b/metadata/md5-cache/dev-python/flask-restless-0.17.0
index dd750a87a2fd..424933229619 100644
--- a/metadata/md5-cache/dev-python/flask-restless-0.17.0
+++ b/metadata/md5-cache/dev-python/flask-restless-0.17.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/flask-0.7[python_targets_pypy(-)?,python_targets_python2_7(
 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/jfinkels/flask-restless/archive/0.17.0.tar.gz -> flask-restless-0.17.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9cef0ac3564c7c174bf0e63ecec1514f
diff --git a/metadata/md5-cache/dev-python/flask-script-2.0.5-r1 b/metadata/md5-cache/dev-python/flask-script-2.0.5-r1
index f106b467a1ae..c15dfe0332c3 100644
--- a/metadata/md5-cache/dev-python/flask-script-2.0.5-r1
+++ b/metadata/md5-cache/dev-python/flask-script-2.0.5-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/flask-0.10.1-r1[python_targets_pypy(-)?,python_targets_pyth
 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-Script/Flask-Script-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1e58183dfecfa9a9fc7d387713abdef9
diff --git a/metadata/md5-cache/dev-python/flask-script-2.0.6 b/metadata/md5-cache/dev-python/flask-script-2.0.6
index c56632dac88b..553bf2df99d1 100644
--- a/metadata/md5-cache/dev-python/flask-script-2.0.6
+++ b/metadata/md5-cache/dev-python/flask-script-2.0.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/flask-0.10.1-r1[python_targets_pypy(-)?,python_targets_pyth
 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/F/Flask-Script/Flask-Script-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=366315f619ae25e07cc6542388165bac
diff --git a/metadata/md5-cache/dev-python/flask-security-1.7.5-r1 b/metadata/md5-cache/dev-python/flask-security-1.7.5-r1
index 4f602014f09e..e73cc8d2db9b 100644
--- a/metadata/md5-cache/dev-python/flask-security-1.7.5-r1
+++ b/metadata/md5-cache/dev-python/flask-security-1.7.5-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Security/Flask-Security-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ecbc82469501b675b36fff8c788d4889
diff --git a/metadata/md5-cache/dev-python/flask-security-3.0.0 b/metadata/md5-cache/dev-python/flask-security-3.0.0
index a7e29d8f5abe..a66dd9773dec 100644
--- a/metadata/md5-cache/dev-python/flask-security-3.0.0
+++ b/metadata/md5-cache/dev-python/flask-security-3.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Security/Flask-Security-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=03b2a8e761cb1d2d55e89cd218a57c11
diff --git a/metadata/md5-cache/dev-python/flask-socketio-2.9.2 b/metadata/md5-cache/dev-python/flask-socketio-2.9.2
index 626e945783a7..4eedd08b2f9b 100644
--- a/metadata/md5-cache/dev-python/flask-socketio-2.9.2
+++ b/metadata/md5-cache/dev-python/flask-socketio-2.9.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-SocketIO/Flask-SocketIO-2.9.2.tar.gz -> flask-socketio-2.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=00e81a96fc9029485003223679ea1450
diff --git a/metadata/md5-cache/dev-python/flask-socketio-3.0.1 b/metadata/md5-cache/dev-python/flask-socketio-3.0.1
index bd7b9e925458..8343c26bb864 100644
--- a/metadata/md5-cache/dev-python/flask-socketio-3.0.1
+++ b/metadata/md5-cache/dev-python/flask-socketio-3.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-SocketIO/Flask-SocketIO-3.0.1.tar.gz -> flask-socketio-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9abbf91a49b04f04900aa7695a94361e
diff --git a/metadata/md5-cache/dev-python/flask-sphinx-themes-1.0.1 b/metadata/md5-cache/dev-python/flask-sphinx-themes-1.0.1
index c22ba1e9a89e..78dfa40d600a 100644
--- a/metadata/md5-cache/dev-python/flask-sphinx-themes-1.0.1
+++ b/metadata/md5-cache/dev-python/flask-sphinx-themes-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Sphinx-Themes/Flask-Sphinx-Themes-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ca10c48af7dc53f82e1f7071877f396d
diff --git a/metadata/md5-cache/dev-python/flask-sqlalchemy-2.1 b/metadata/md5-cache/dev-python/flask-sqlalchemy-2.1
index 13b58f13bf0b..3e47d965a578 100644
--- a/metadata/md5-cache/dev-python/flask-sqlalchemy-2.1
+++ b/metadata/md5-cache/dev-python/flask-sqlalchemy-2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-
 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/F/Flask-SQLAlchemy/Flask-SQLAlchemy-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1604f4c927672a475a778c92dc1872f5
diff --git a/metadata/md5-cache/dev-python/flask-sqlalchemy-2.3.2 b/metadata/md5-cache/dev-python/flask-sqlalchemy-2.3.2
index 53e2a4e621fd..e03f81728734 100644
--- a/metadata/md5-cache/dev-python/flask-sqlalchemy-2.3.2
+++ b/metadata/md5-cache/dev-python/flask-sqlalchemy-2.3.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-
 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/F/Flask-SQLAlchemy/Flask-SQLAlchemy-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8896023c0242574f52e16ee2c618e29b
diff --git a/metadata/md5-cache/dev-python/flask-testing-0.4.2 b/metadata/md5-cache/dev-python/flask-testing-0.4.2
index 2499a9de1d3c..2a996416f349 100644
--- a/metadata/md5-cache/dev-python/flask-testing-0.4.2
+++ b/metadata/md5-cache/dev-python/flask-testing-0.4.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/flask[python_targets_pypy(-)?,python_targets_python2_7(-)?,py
 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-Testing/Flask-Testing-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4b86ec8cc282a6f908bbb65b510e7f6c
diff --git a/metadata/md5-cache/dev-python/flask-testing-0.6.2 b/metadata/md5-cache/dev-python/flask-testing-0.6.2
index 88a1898c982e..609eebc36923 100644
--- a/metadata/md5-cache/dev-python/flask-testing-0.6.2
+++ b/metadata/md5-cache/dev-python/flask-testing-0.6.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/flask[python_targets_pypy(-)?,python_targets_python2_7(-)?,py
 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/F/Flask-Testing/Flask-Testing-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=706222f642e558facb29d2a53cc06eb9
diff --git a/metadata/md5-cache/dev-python/flask-themes-0.1.3-r1 b/metadata/md5-cache/dev-python/flask-themes-0.1.3-r1
index 8b16d52d67b6..2817742646ef 100644
--- a/metadata/md5-cache/dev-python/flask-themes-0.1.3-r1
+++ b/metadata/md5-cache/dev-python/flask-themes-0.1.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/flask-0.6[python_targets_pypy(-)?,python_targets_python2_7(
 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/F/Flask-Themes/Flask-Themes-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a1cb996d872d016f2489d8a54c82e45d
diff --git a/metadata/md5-cache/dev-python/flask-uploads-0.2.0-r1 b/metadata/md5-cache/dev-python/flask-uploads-0.2.0-r1
index e3f3c5fb949d..02ff1e3d0e52 100644
--- a/metadata/md5-cache/dev-python/flask-uploads-0.2.0-r1
+++ b/metadata/md5-cache/dev-python/flask-uploads-0.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/flask-0.5[python_targets_pypy(-)?,python_targets_python2_7(
 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/maxcountryman/flask-uploads/archive/0.2.0.tar.gz -> flask-uploads-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a230a537a6d41fc102778d00d9f3cc0b
diff --git a/metadata/md5-cache/dev-python/flask-wtf-0.14.2 b/metadata/md5-cache/dev-python/flask-wtf-0.14.2
index 7f96061d76c8..f8c58c333cc5 100644
--- a/metadata/md5-cache/dev-python/flask-wtf-0.14.2
+++ b/metadata/md5-cache/dev-python/flask-wtf-0.14.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/flask[python_targets_pypy(-)?,python_targets_python2_7(-)?,py
 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	89bb9f083a2590d9b447fd0b78a96186
+_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/flask-xml-rpc-0.1.2-r1 b/metadata/md5-cache/dev-python/flask-xml-rpc-0.1.2-r1
index 4a07c16d34f8..15628979b6fc 100644
--- a/metadata/md5-cache/dev-python/flask-xml-rpc-0.1.2-r1
+++ b/metadata/md5-cache/dev-python/flask-xml-rpc-0.1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/flask[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-XML-RPC/Flask-XML-RPC-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5deaf68260018b323e0c28021111c7a7
diff --git a/metadata/md5-cache/dev-python/flexmock-0.10.2 b/metadata/md5-cache/dev-python/flexmock-0.10.2
index 5e076f1cc102..7694a0e01083 100644
--- a/metadata/md5-cache/dev-python/flexmock-0.10.2
+++ b/metadata/md5-cache/dev-python/flexmock-0.10.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/f/flexmock/flexmock-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a4b917b62f6fdedf748be0d6cf8d401a
diff --git a/metadata/md5-cache/dev-python/flexx-0.3.1 b/metadata/md5-cache/dev-python/flexx-0.3.1
index 94970bed6a92..6a3827957ddc 100644
--- a/metadata/md5-cache/dev-python/flexx-0.3.1
+++ b/metadata/md5-cache/dev-python/flexx-0.3.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/f/flexx/flexx-0.3.1.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5cfc7f9847a765f639227658ace7422f
diff --git a/metadata/md5-cache/dev-python/flexx-0.4.1 b/metadata/md5-cache/dev-python/flexx-0.4.1
index f0a928dc2e17..d1f440cac837 100644
--- a/metadata/md5-cache/dev-python/flexx-0.4.1
+++ b/metadata/md5-cache/dev-python/flexx-0.4.1
@@ -10,5 +10,5 @@ RDEPEND=www-servers/tornado[python_targets_python2_7(-)?,python_targets_python3_
 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/zoofIO//flexx/archive/v0.4.1.tar.gz -> flexx-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1965a44fa00fa88f4eaa5141395f1d11
diff --git a/metadata/md5-cache/dev-python/flower-0.9.1-r1 b/metadata/md5-cache/dev-python/flower-0.9.1-r1
index b5f228885e79..da49efa807d1 100644
--- a/metadata/md5-cache/dev-python/flower-0.9.1-r1
+++ b/metadata/md5-cache/dev-python/flower-0.9.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/f/flower/flower-0.9.1.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0d8d00d5b2786e0757334f04b6e97187
diff --git a/metadata/md5-cache/dev-python/flufl-bounce-3.0 b/metadata/md5-cache/dev-python/flufl-bounce-3.0
index 513ceafbb1d1..c048ef1aa4fa 100644
--- a/metadata/md5-cache/dev-python/flufl-bounce-3.0
+++ b/metadata/md5-cache/dev-python/flufl-bounce-3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/atpublic[python_targets_python3_4(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/f/flufl.bounce/flufl.bounce-3.0.tar.gz -> flufl-bounce-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=11633db15c43db2c8f339b04f61b64eb
diff --git a/metadata/md5-cache/dev-python/flufl-i18n-2.0.1 b/metadata/md5-cache/dev-python/flufl-i18n-2.0.1
index e48aa29904a8..cdc766433d8c 100644
--- a/metadata/md5-cache/dev-python/flufl-i18n-2.0.1
+++ b/metadata/md5-cache/dev-python/flufl-i18n-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/atpublic[python_targets_python3_4(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/f/flufl.i18n/flufl.i18n-2.0.1.tar.gz -> flufl-i18n-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=289aa701221c416e4616e2bdf3f34494
diff --git a/metadata/md5-cache/dev-python/flufl-lock-3.2 b/metadata/md5-cache/dev-python/flufl-lock-3.2
index 6f3e92eccb56..d399d15e56fe 100644
--- a/metadata/md5-cache/dev-python/flufl-lock-3.2
+++ b/metadata/md5-cache/dev-python/flufl-lock-3.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/atpublic[python_targets_python3_4(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/f/flufl.lock/flufl.lock-3.2.tar.gz -> flufl-lock-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d39555e6fa2129f2be5007c71f6f7363
diff --git a/metadata/md5-cache/dev-python/flup-1.0.2-r1 b/metadata/md5-cache/dev-python/flup-1.0.2-r1
index fbe127215b27..21fa588e673e 100644
--- a/metadata/md5-cache/dev-python/flup-1.0.2-r1
+++ b/metadata/md5-cache/dev-python/flup-1.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://www.saddi.com/software/flup/dist/flup-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=37426d3b5feb0150e22acff7606c125f
diff --git a/metadata/md5-cache/dev-python/fonttools-3.0 b/metadata/md5-cache/dev-python/fonttools-3.0
index a90473ab0598..d03bc01c3645 100644
--- a/metadata/md5-cache/dev-python/fonttools-3.0
+++ b/metadata/md5-cache/dev-python/fonttools-3.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/numpy-1.0.2[python_targets_python2_7(-)?,-python_single_tar
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/fonttools/fonttools/archive/3.0.tar.gz -> fonttools-3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=08559fc23a8c5f86fec72dc0a35d55c5
diff --git a/metadata/md5-cache/dev-python/fonttools-3.20.1 b/metadata/md5-cache/dev-python/fonttools-3.20.1
index 5234f8bd4c34..83e42e74b8f3 100644
--- a/metadata/md5-cache/dev-python/fonttools-3.20.1
+++ b/metadata/md5-cache/dev-python/fonttools-3.20.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/fonttools/fonttools/archive/3.20.1.tar.gz -> fonttools-3.20.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=faace857993a4795b3470a1a6d129a0b
diff --git a/metadata/md5-cache/dev-python/fonttools-3.21.1 b/metadata/md5-cache/dev-python/fonttools-3.21.1
index 35222f8695d1..ed335f253940 100644
--- a/metadata/md5-cache/dev-python/fonttools-3.21.1
+++ b/metadata/md5-cache/dev-python/fonttools-3.21.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/fonttools/fonttools/archive/3.21.1.tar.gz -> fonttools-3.21.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0890677e1279a0a60759e678de0f8b72
diff --git a/metadata/md5-cache/dev-python/fonttools-3.24.0 b/metadata/md5-cache/dev-python/fonttools-3.24.0
index 0e7b73fd7133..edf1e01fe106 100644
--- a/metadata/md5-cache/dev-python/fonttools-3.24.0
+++ b/metadata/md5-cache/dev-python/fonttools-3.24.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/fonttools/fonttools/archive/3.24.0.tar.gz -> fonttools-3.24.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0890677e1279a0a60759e678de0f8b72
diff --git a/metadata/md5-cache/dev-python/fonttools-3.24.1 b/metadata/md5-cache/dev-python/fonttools-3.24.1
index 6918c3e6f28b..b664f2a967e3 100644
--- a/metadata/md5-cache/dev-python/fonttools-3.24.1
+++ b/metadata/md5-cache/dev-python/fonttools-3.24.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/fonttools/fonttools/archive/3.24.1.tar.gz -> fonttools-3.24.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a5ae3a00f85991d01ae75731516cdc59
diff --git a/metadata/md5-cache/dev-python/fonttools-3.24.2 b/metadata/md5-cache/dev-python/fonttools-3.24.2
index deed95b7967d..bc2d279289a9 100644
--- a/metadata/md5-cache/dev-python/fonttools-3.24.2
+++ b/metadata/md5-cache/dev-python/fonttools-3.24.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/fonttools/fonttools/archive/3.24.2.tar.gz -> fonttools-3.24.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a5ae3a00f85991d01ae75731516cdc59
diff --git a/metadata/md5-cache/dev-python/fonttools-3.28.0 b/metadata/md5-cache/dev-python/fonttools-3.28.0
index d293df2cc41d..f664feb16ca6 100644
--- a/metadata/md5-cache/dev-python/fonttools-3.28.0
+++ b/metadata/md5-cache/dev-python/fonttools-3.28.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/fonttools/fonttools/archive/3.28.0.tar.gz -> fonttools-3.28.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=133126d5c89fc50a7a90bb570e9b099c
diff --git a/metadata/md5-cache/dev-python/foolscap-0.11.0 b/metadata/md5-cache/dev-python/foolscap-0.11.0
index 28933c01af36..969c13390bdf 100644
--- a/metadata/md5-cache/dev-python/foolscap-0.11.0
+++ b/metadata/md5-cache/dev-python/foolscap-0.11.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://foolscap.lothar.com/releases/foolscap-0.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0a35d443ebddff9529d11e73ea8b6db9
diff --git a/metadata/md5-cache/dev-python/foolscap-0.7.0 b/metadata/md5-cache/dev-python/foolscap-0.7.0
index 5be074c6a662..a851b48af124 100644
--- a/metadata/md5-cache/dev-python/foolscap-0.7.0
+++ b/metadata/md5-cache/dev-python/foolscap-0.7.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/twisted-core-2.5.0[python_targets_python2_7(-)?,-python_sin
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://foolscap.lothar.com/releases/foolscap-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f64a381476a62bd7a9b683213723aab2
diff --git a/metadata/md5-cache/dev-python/formencode-1.3.0-r2 b/metadata/md5-cache/dev-python/formencode-1.3.0-r2
index b8c9474b2f67..0233f36c094f 100644
--- a/metadata/md5-cache/dev-python/formencode-1.3.0-r2
+++ b/metadata/md5-cache/dev-python/formencode-1.3.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/F/FormEncode/FormEncode-1.3.0.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=61fa2c9713f9ed50be61406b6b54befd
diff --git a/metadata/md5-cache/dev-python/fpconst-0.7.3-r1 b/metadata/md5-cache/dev-python/fpconst-0.7.3-r1
index b722ba2657a4..c99078ad2221 100644
--- a/metadata/md5-cache/dev-python/fpconst-0.7.3-r1
+++ b/metadata/md5-cache/dev-python/fpconst-0.7.3-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/rsoap/fpconst-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c2ead4ee6c95496e8932d87b41d2fe7b
diff --git a/metadata/md5-cache/dev-python/freezegun-0.3.10 b/metadata/md5-cache/dev-python/freezegun-0.3.10
index f4fa4d9ec318..4bad2fe10fe9 100644
--- a/metadata/md5-cache/dev-python/freezegun-0.3.10
+++ b/metadata/md5-cache/dev-python/freezegun-0.3.10
@@ -10,5 +10,5 @@ RDEPEND=>dev-python/python-dateutil-2.0[python_targets_pypy(-)?,python_targets_p
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-python/freezegun-0.3.9 b/metadata/md5-cache/dev-python/freezegun-0.3.9
index d0d44bd7de16..428691da6672 100644
--- a/metadata/md5-cache/dev-python/freezegun-0.3.9
+++ b/metadata/md5-cache/dev-python/freezegun-0.3.9
@@ -10,5 +10,5 @@ RDEPEND=>dev-python/python-dateutil-2.0 dev-python/six python_targets_pypy? ( >=
 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/f/freezegun/freezegun-0.3.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c853bbe492fba8d155a6c53ecdf5f8d3
diff --git a/metadata/md5-cache/dev-python/frozen-flask-0.11-r1 b/metadata/md5-cache/dev-python/frozen-flask-0.11-r1
index a7374a3c3ab2..1bf7154585ce 100644
--- a/metadata/md5-cache/dev-python/frozen-flask-0.11-r1
+++ b/metadata/md5-cache/dev-python/frozen-flask-0.11-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/flask-0.7[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/F/Frozen-Flask/Frozen-Flask-0.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d54465921cec2ea1e861d1426e6e9b9f
diff --git a/metadata/md5-cache/dev-python/fs-0.5.4 b/metadata/md5-cache/dev-python/fs-0.5.4
index 4c8443527d3a..57950a238f43 100644
--- a/metadata/md5-cache/dev-python/fs-0.5.4
+++ b/metadata/md5-cache/dev-python/fs-0.5.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/f/fs/fs-0.5.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d138e49aece6b178454ec44414468813
diff --git a/metadata/md5-cache/dev-python/fs-2.0.21 b/metadata/md5-cache/dev-python/fs-2.0.21
index 0d5f2d8f3ec1..c792084fdd48 100644
--- a/metadata/md5-cache/dev-python/fs-2.0.21
+++ b/metadata/md5-cache/dev-python/fs-2.0.21
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/f/fs/fs-2.0.21.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d138e49aece6b178454ec44414468813
diff --git a/metadata/md5-cache/dev-python/fs-2.0.26 b/metadata/md5-cache/dev-python/fs-2.0.26
index 4d4bfa7ef1e1..818aca3e9c1d 100644
--- a/metadata/md5-cache/dev-python/fs-2.0.26
+++ b/metadata/md5-cache/dev-python/fs-2.0.26
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/f/fs/fs-2.0.26.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d138e49aece6b178454ec44414468813
diff --git a/metadata/md5-cache/dev-python/fudge-0.9.6-r1 b/metadata/md5-cache/dev-python/fudge-0.9.6-r1
index 1baa14b4ed0c..4ed2cfd526da 100644
--- a/metadata/md5-cache/dev-python/fudge-0.9.6-r1
+++ b/metadata/md5-cache/dev-python/fudge-0.9.6-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/f/fudge/fudge-0.9.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b9cbf310624afef87f37e445934d0afb
diff --git a/metadata/md5-cache/dev-python/fudge-1.1.0 b/metadata/md5-cache/dev-python/fudge-1.1.0
index 3a8726605d01..d13218b88e92 100644
--- a/metadata/md5-cache/dev-python/fudge-1.1.0
+++ b/metadata/md5-cache/dev-python/fudge-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/f/fudge/fudge-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b94ae0a08815dd623ef5f030861439b0
diff --git a/metadata/md5-cache/dev-python/funcparserlib-0.3.6 b/metadata/md5-cache/dev-python/funcparserlib-0.3.6
index fc0286db775b..061dd6361e22 100644
--- a/metadata/md5-cache/dev-python/funcparserlib-0.3.6
+++ b/metadata/md5-cache/dev-python/funcparserlib-0.3.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/f/funcparserlib/funcparserlib-0.3.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=df5b040a7c7ab58b6c278244ebf91ffb
diff --git a/metadata/md5-cache/dev-python/funcsigs-0.4 b/metadata/md5-cache/dev-python/funcsigs-0.4
index a08821e0f6d9..f6c13e08c37f 100644
--- a/metadata/md5-cache/dev-python/funcsigs-0.4
+++ b/metadata/md5-cache/dev-python/funcsigs-0.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/f/funcsigs/funcsigs-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=eb2cc92b7c6176f73327e6b10191de72
diff --git a/metadata/md5-cache/dev-python/funcsigs-1.0.2-r1 b/metadata/md5-cache/dev-python/funcsigs-1.0.2-r1
index f5ca1679a4b6..7638841f2fff 100644
--- a/metadata/md5-cache/dev-python/funcsigs-1.0.2-r1
+++ b/metadata/md5-cache/dev-python/funcsigs-1.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/funcsigs/funcsigs-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e74c4562de67974ffcfe3b17842606e0
diff --git a/metadata/md5-cache/dev-python/functest-0.8.8-r1 b/metadata/md5-cache/dev-python/functest-0.8.8-r1
index 53eb4bf45712..d1e00efa87a2 100644
--- a/metadata/md5-cache/dev-python/functest-0.8.8-r1
+++ b/metadata/md5-cache/dev-python/functest-0.8.8-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=mirror://pypi/f/functest/functest-0.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=806595500dbd4ea3961e86e99fa90c9a
diff --git a/metadata/md5-cache/dev-python/functools32-3.2.3 b/metadata/md5-cache/dev-python/functools32-3.2.3
index a8a08ced236d..7dbb4ba660ca 100644
--- a/metadata/md5-cache/dev-python/functools32-3.2.3
+++ b/metadata/md5-cache/dev-python/functools32-3.2.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/f/functools32/functools32-3.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=370f589a5f142c245cb26fc4b5c608ab
diff --git a/metadata/md5-cache/dev-python/funcy-1.10.1 b/metadata/md5-cache/dev-python/funcy-1.10.1
index dfa03e359376..7bc0cf670062 100644
--- a/metadata/md5-cache/dev-python/funcy-1.10.1
+++ b/metadata/md5-cache/dev-python/funcy-1.10.1
@@ -10,5 +10,5 @@ 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_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/f/funcy/funcy-1.10.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2e7767445af0b42b9466f184cab0f3aa
diff --git a/metadata/md5-cache/dev-python/funcy-1.8 b/metadata/md5-cache/dev-python/funcy-1.8
index ea2d77eca7fa..14b4c7a9e216 100644
--- a/metadata/md5-cache/dev-python/funcy-1.8
+++ b/metadata/md5-cache/dev-python/funcy-1.8
@@ -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=mirror://pypi/f/funcy/funcy-1.8.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d3e168fdc1c342745fc2676af1ed3fb1
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 8c7894e5ba29..1ae4a5314bbb 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
@@ -10,5 +10,5 @@ RDEPEND=>=sys-fs/fuse-2.0 python_targets_pypy? ( >=virtual/pypy-5:0= ) python_ta
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-python/fusepy-2.0.4-r1 b/metadata/md5-cache/dev-python/fusepy-2.0.4-r1
index 8b0de731e8dd..f7bdb84f42b4 100644
--- a/metadata/md5-cache/dev-python/fusepy-2.0.4-r1
+++ b/metadata/md5-cache/dev-python/fusepy-2.0.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=sys-fs/fuse-2.9.7 !dev-python/fuse-python python_targets_python2_7? (
 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/fusepy/fusepy/archive/v2.0.4.tar.gz -> fusepy-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=36a6c13233e3302fd2044973c4cd8fbb
diff --git a/metadata/md5-cache/dev-python/fusil-1.5 b/metadata/md5-cache/dev-python/fusil-1.5
index ca4b0bdb2517..e2872f47db56 100644
--- a/metadata/md5-cache/dev-python/fusil-1.5
+++ b/metadata/md5-cache/dev-python/fusil-1.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/python-ptrace-0.7[python_targets_pypy(-)?,python_targets_py
 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/f/fusil/fusil-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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=185b2f99f5e5b8e60ab20d3064165d72
diff --git a/metadata/md5-cache/dev-python/fusil-1.5-r1 b/metadata/md5-cache/dev-python/fusil-1.5-r1
index 4007078db1fc..afcec7df66b8 100644
--- a/metadata/md5-cache/dev-python/fusil-1.5-r1
+++ b/metadata/md5-cache/dev-python/fusil-1.5-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/python-ptrace-0.7[python_targets_pypy(-)?,python_targets_py
 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/f/fusil/fusil-1.5.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d38d191a0d4499f48eca808b2f207b99
diff --git a/metadata/md5-cache/dev-python/future-0.15.2 b/metadata/md5-cache/dev-python/future-0.15.2
index 99cacab16c8f..f9c4ab0c14c7 100644
--- a/metadata/md5-cache/dev-python/future-0.15.2
+++ b/metadata/md5-cache/dev-python/future-0.15.2
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/f/future/future-0.15.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fefcee95700854c3a7a6359774a88f68
diff --git a/metadata/md5-cache/dev-python/future-0.16.0 b/metadata/md5-cache/dev-python/future-0.16.0
index bacd59de421e..3602d7dd9394 100644
--- a/metadata/md5-cache/dev-python/future-0.16.0
+++ b/metadata/md5-cache/dev-python/future-0.16.0
@@ -10,5 +10,5 @@ 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 )
 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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=867456dd9d12e6767659155659055820
diff --git a/metadata/md5-cache/dev-python/futures-3.1.1 b/metadata/md5-cache/dev-python/futures-3.1.1
index 063a237d8790..28b618350f95 100644
--- a/metadata/md5-cache/dev-python/futures-3.1.1
+++ b/metadata/md5-cache/dev-python/futures-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/f/futures/futures-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=310eb4dbb94a8e4ad66bc02da7562991
diff --git a/metadata/md5-cache/dev-python/futures-3.2.0 b/metadata/md5-cache/dev-python/futures-3.2.0
index 4d9ac32cf5ca..3dd1d015d9f5 100644
--- a/metadata/md5-cache/dev-python/futures-3.2.0
+++ b/metadata/md5-cache/dev-python/futures-3.2.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/f/futures/futures-3.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=28efaf32e3469fe00334189b2ccad7f2
diff --git a/metadata/md5-cache/dev-python/futurist-1.3.1 b/metadata/md5-cache/dev-python/futurist-1.3.1
index a31c1cce8b72..a349190ea359 100644
--- a/metadata/md5-cache/dev-python/futurist-1.3.1
+++ b/metadata/md5-cache/dev-python/futurist-1.3.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/f/futurist/futurist-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=af3a270caa4c448008ba0f0dffb1e956
diff --git a/metadata/md5-cache/dev-python/futurist-1.6.0 b/metadata/md5-cache/dev-python/futurist-1.6.0
index 8ee5a2a6ea86..b1f4e00e7a36 100644
--- a/metadata/md5-cache/dev-python/futurist-1.6.0
+++ b/metadata/md5-cache/dev-python/futurist-1.6.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/f/futurist/futurist-1.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ff58c07329b729dd221e90dc5f67a6f4
diff --git a/metadata/md5-cache/dev-python/gammapy-0.6 b/metadata/md5-cache/dev-python/gammapy-0.6
index ae4515568bd5..36ecef677cad 100644
--- a/metadata/md5-cache/dev-python/gammapy-0.6
+++ b/metadata/md5-cache/dev-python/gammapy-0.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gammapy/gammapy-0.6.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1c4b5d45ac761c87484516af0775831a
diff --git a/metadata/md5-cache/dev-python/gconf-python-2.28.1-r1 b/metadata/md5-cache/dev-python/gconf-python-2.28.1-r1
index dce1d81eafa7..fc9414b84d79 100644
--- a/metadata/md5-cache/dev-python/gconf-python-2.28.1-r1
+++ b/metadata/md5-cache/dev-python/gconf-python-2.28.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-python/2.28/gnome-python-2.28.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome-python-common-r1	4b3f4780086f96814cde64b8e5ea23c5	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome-python-common-r1	4b3f4780086f96814cde64b8e5ea23c5	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=db0d49b3a3a0ef40aef2cd4293f50c2c
diff --git a/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-1.14 b/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-1.14
index 54cecc40f81b..ad17d0636801 100644
--- a/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-1.14
+++ b/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-1.14
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/g/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e419a211409c8dfcf08ad5cfde92ab2b
diff --git a/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-1.8-r1 b/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-1.8-r1
index 84e390882919..e9540ae80af6 100644
--- a/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-1.8-r1
+++ b/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-1.8-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=mirror://pypi/g/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f8060211b4b58bd719d505032e5c968c
diff --git a/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.1 b/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.1
index fade2cb9178c..9af6c51887da 100644
--- a/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.1
+++ b/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e8ef376c2745559346fe8f219bea63ba
diff --git a/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.1-r1 b/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.1-r1
index b1a82d9a746f..0dbd05bb7f01 100644
--- a/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.1-r1
+++ b/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.1-r1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=10a8dd0d598446df12f10d04ecbf39c9
diff --git a/metadata/md5-cache/dev-python/gdata-2.0.18 b/metadata/md5-cache/dev-python/gdata-2.0.18
index d0f2be305723..72d45a49ebd9 100644
--- a/metadata/md5-cache/dev-python/gdata-2.0.18
+++ b/metadata/md5-cache/dev-python/gdata-2.0.18
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[ssl(+),xml(+)] ) python_targe
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gdata/gdata-2.0.18.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6325ae6d28c13659646d979b870fb1e7
diff --git a/metadata/md5-cache/dev-python/gdmodule-0.56-r2 b/metadata/md5-cache/dev-python/gdmodule-0.56-r2
index 9bd81d85fae7..16431fae4036 100644
--- a/metadata/md5-cache/dev-python/gdmodule-0.56-r2
+++ b/metadata/md5-cache/dev-python/gdmodule-0.56-r2
@@ -10,5 +10,5 @@ RDEPEND=media-libs/gd[jpeg?,png?,truetype?,xpm?] media-libs/giflib jpeg? ( virtu
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://newcenturycomputers.net/projects/download.cgi/gdmodule-0.56.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b57ebf170cbe572fd51a32b6e11c9d8a
diff --git a/metadata/md5-cache/dev-python/genshi-0.7 b/metadata/md5-cache/dev-python/genshi-0.7
index 03bc91f3ad65..dd3de9256856 100644
--- a/metadata/md5-cache/dev-python/genshi-0.7
+++ b/metadata/md5-cache/dev-python/genshi-0.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://ftp.edgewall.com/pub/genshi/Genshi-0.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=26d6c53889459bfb5f8a87cfc66e19f5
diff --git a/metadata/md5-cache/dev-python/genshi-0.7-r1 b/metadata/md5-cache/dev-python/genshi-0.7-r1
index 23649af635a3..7566663d3c86 100644
--- a/metadata/md5-cache/dev-python/genshi-0.7-r1
+++ b/metadata/md5-cache/dev-python/genshi-0.7-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-
 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=http://ftp.edgewall.com/pub/genshi/Genshi-0.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=2a5dfc706d7d1e250f4e1d8cc3659886
diff --git a/metadata/md5-cache/dev-python/genty-1.3.2 b/metadata/md5-cache/dev-python/genty-1.3.2
index 686085f304fc..df6cffbdcbee 100644
--- a/metadata/md5-cache/dev-python/genty-1.3.2
+++ b/metadata/md5-cache/dev-python/genty-1.3.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_t
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-python/geoalchemy2-0.3 b/metadata/md5-cache/dev-python/geoalchemy2-0.3
index 70f3dd10d4d7..dce5857bf5a0 100644
--- a/metadata/md5-cache/dev-python/geoalchemy2-0.3
+++ b/metadata/md5-cache/dev-python/geoalchemy2-0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/geoalchemy/geoalchemy2/archive/0.3.tar.gz -> geoalchemy2-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3cd3b2763d4c5b13c88403445d2d0588
diff --git a/metadata/md5-cache/dev-python/geoip-python-1.3.2 b/metadata/md5-cache/dev-python/geoip-python-1.3.2
index 8166c235e989..6ff5bcd89bfe 100644
--- a/metadata/md5-cache/dev-python/geoip-python-1.3.2
+++ b/metadata/md5-cache/dev-python/geoip-python-1.3.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/geoip-1.4.8 python_targets_pypy? ( >=virtual/pypy-5:0= ) pyth
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://github.com/maxmind/geoip-api-python/archive/v1.3.2.tar.gz -> geoip-api-python-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a890da7b2784480a998531fa6995e2e4
diff --git a/metadata/md5-cache/dev-python/geoip-python-1.3.2-r1 b/metadata/md5-cache/dev-python/geoip-python-1.3.2-r1
index 93184838715b..e9a50ddafc06 100644
--- a/metadata/md5-cache/dev-python/geoip-python-1.3.2-r1
+++ b/metadata/md5-cache/dev-python/geoip-python-1.3.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/geoip-1.4.8 python_targets_pypy? ( >=virtual/pypy-5:0= ) pyth
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/maxmind/geoip-api-python/archive/v1.3.2.tar.gz -> geoip-api-python-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e9df4b3f4cf20536448aeb6c8440643f
diff --git a/metadata/md5-cache/dev-python/geopy-1.11.0 b/metadata/md5-cache/dev-python/geopy-1.11.0
index 6b861722e292..0bd9aea04cce 100644
--- a/metadata/md5-cache/dev-python/geopy-1.11.0
+++ b/metadata/md5-cache/dev-python/geopy-1.11.0
@@ -10,5 +10,5 @@ RDEPEND=yahoo? ( >=dev-python/requests-oauthlib-0.4.0[python_targets_python2_7(-
 REQUIRED_USE=test? ( yahoo timezone ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/geopy/geopy/archive/1.11.0.tar.gz -> geopy-1.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cf514b2589af428fac0b9db5b80ba2d0
diff --git a/metadata/md5-cache/dev-python/gevent-1.0.1 b/metadata/md5-cache/dev-python/gevent-1.0.1
index 05141ec4f985..af1c8d0b0d53 100644
--- a/metadata/md5-cache/dev-python/gevent-1.0.1
+++ b/metadata/md5-cache/dev-python/gevent-1.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/surfly/gevent/releases/download/1.0.1/gevent-1.0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d0fbe7d4a0e2d518811669b48590b740
diff --git a/metadata/md5-cache/dev-python/gevent-1.2.1 b/metadata/md5-cache/dev-python/gevent-1.2.1
index 28075efdcfad..00a2eacf7de5 100644
--- a/metadata/md5-cache/dev-python/gevent-1.2.1
+++ b/metadata/md5-cache/dev-python/gevent-1.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/g/gevent/gevent-1.2.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=03030fc3cb876a9122c44848e359d0a2
diff --git a/metadata/md5-cache/dev-python/gevent-1.2.2 b/metadata/md5-cache/dev-python/gevent-1.2.2
index 0a7f3a250445..36668f259bbc 100644
--- a/metadata/md5-cache/dev-python/gevent-1.2.2
+++ b/metadata/md5-cache/dev-python/gevent-1.2.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/g/gevent/gevent-1.2.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5a9122612d09d43effa714f64c3e2e1f
diff --git a/metadata/md5-cache/dev-python/gevent-1.3.5 b/metadata/md5-cache/dev-python/gevent-1.3.5
index 2f1e81ca9a71..5ef3b31d11a9 100644
--- a/metadata/md5-cache/dev-python/gevent-1.3.5
+++ b/metadata/md5-cache/dev-python/gevent-1.3.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/g/gevent/gevent-1.3.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5a90cc1dfff9d9811ae853a393caf4ce
diff --git a/metadata/md5-cache/dev-python/gevent-socketio-0.3.5_rc2-r1 b/metadata/md5-cache/dev-python/gevent-socketio-0.3.5_rc2-r1
index b96bb963997a..625f233f7566 100644
--- a/metadata/md5-cache/dev-python/gevent-socketio-0.3.5_rc2-r1
+++ b/metadata/md5-cache/dev-python/gevent-socketio-0.3.5_rc2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/gevent-websocket[python_targets_python2_7(-)?,-python_single_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gevent-socketio/gevent-socketio-0.3.5-rc2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5191485479bd6c2cd27c86a1c323cb6b
diff --git a/metadata/md5-cache/dev-python/gevent-socketio-0.3.6 b/metadata/md5-cache/dev-python/gevent-socketio-0.3.6
index 6d691edcdad1..50e2a6897c1b 100644
--- a/metadata/md5-cache/dev-python/gevent-socketio-0.3.6
+++ b/metadata/md5-cache/dev-python/gevent-socketio-0.3.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/gevent-websocket[python_targets_python2_7(-)?,-python_single_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gevent-socketio/gevent-socketio-0.3.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8d4f24ed3494d362f0e56cdbfb8f32fc
diff --git a/metadata/md5-cache/dev-python/gevent-websocket-0.10.1 b/metadata/md5-cache/dev-python/gevent-websocket-0.10.1
index 324732966b4e..647f4ac74598 100644
--- a/metadata/md5-cache/dev-python/gevent-websocket-0.10.1
+++ b/metadata/md5-cache/dev-python/gevent-websocket-0.10.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/gevent[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gevent-websocket/gevent-websocket-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=92c8b66e96506fc2ac230057c36d9b42
diff --git a/metadata/md5-cache/dev-python/gevent-websocket-0.9.3 b/metadata/md5-cache/dev-python/gevent-websocket-0.9.3
index dbc7cfb2a695..dffdb521b1a2 100644
--- a/metadata/md5-cache/dev-python/gevent-websocket-0.9.3
+++ b/metadata/md5-cache/dev-python/gevent-websocket-0.9.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gevent-websocket/gevent-websocket-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7088b0b4b11338bc2b1c09ec4e9f6526
diff --git a/metadata/md5-cache/dev-python/geventhttpclient-1.3.1 b/metadata/md5-cache/dev-python/geventhttpclient-1.3.1
index 3464482b35f0..5340b5fcbbec 100644
--- a/metadata/md5-cache/dev-python/geventhttpclient-1.3.1
+++ b/metadata/md5-cache/dev-python/geventhttpclient-1.3.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/certifi[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/geventhttpclient/geventhttpclient-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cca95888d0c87627c2769ba08ba018ff
diff --git a/metadata/md5-cache/dev-python/ghp-import-0.4.1-r1 b/metadata/md5-cache/dev-python/ghp-import-0.4.1-r1
index 23c2d0132444..c64297e16b27 100644
--- a/metadata/md5-cache/dev-python/ghp-import-0.4.1-r1
+++ b/metadata/md5-cache/dev-python/ghp-import-0.4.1-r1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/g/ghp-import/ghp-import-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ba7fe34b7fd869c7a5e00f7f3f9f43cd
diff --git a/metadata/md5-cache/dev-python/ginga-2.6.5 b/metadata/md5-cache/dev-python/ginga-2.6.5
index 1b1b221ed6e5..61956fb67c57 100644
--- a/metadata/md5-cache/dev-python/ginga-2.6.5
+++ b/metadata/md5-cache/dev-python/ginga-2.6.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_5
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/ginga/ginga-2.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7a397b7a495fa202607cf1e4b1251fad
diff --git a/metadata/md5-cache/dev-python/girder-client-2.3.0 b/metadata/md5-cache/dev-python/girder-client-2.3.0
index ead25c3fa0ac..af984f7f2c10 100644
--- a/metadata/md5-cache/dev-python/girder-client-2.3.0
+++ b/metadata/md5-cache/dev-python/girder-client-2.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/click-6.7[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/girder-client/girder-client-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e178d8876881d1312b54a83f27ecd3c3
diff --git a/metadata/md5-cache/dev-python/git-python-1.0.2 b/metadata/md5-cache/dev-python/git-python-1.0.2
index 6db5f24057fd..f310cef9d80a 100644
--- a/metadata/md5-cache/dev-python/git-python-1.0.2
+++ b/metadata/md5-cache/dev-python/git-python-1.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/G/GitPython/GitPython-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e71eaba5593e875e6f7d8bbde91200b3
diff --git a/metadata/md5-cache/dev-python/git-python-2.1.7 b/metadata/md5-cache/dev-python/git-python-2.1.7
index 303796ecff2a..a89d289e8247 100644
--- a/metadata/md5-cache/dev-python/git-python-2.1.7
+++ b/metadata/md5-cache/dev-python/git-python-2.1.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/G/GitPython/GitPython-2.1.7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0678030a56ac6a884f3692fddd4d6f90
diff --git a/metadata/md5-cache/dev-python/git-review-1.26.0 b/metadata/md5-cache/dev-python/git-review-1.26.0
index 4064deb4c302..bc747217a8bd 100644
--- a/metadata/md5-cache/dev-python/git-review-1.26.0
+++ b/metadata/md5-cache/dev-python/git-review-1.26.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/requests-1.1[python_targets_python2_7(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/git-review/git-review-1.26.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3a0cc07838dfdf621b93d6ac1f770da2
diff --git a/metadata/md5-cache/dev-python/git-review-1.27.0 b/metadata/md5-cache/dev-python/git-review-1.27.0
new file mode 100644
index 000000000000..c979f2a12219
--- /dev/null
+++ b/metadata/md5-cache/dev-python/git-review-1.27.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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=Tool to submit code to Gerrit
+EAPI=6
+HOMEPAGE=https://git.openstack.org/cgit/openstack-infra/git-review
+IUSE=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/requests-1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/g/git-review/git-review-1.27.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_=7345bfb4ae00a2934605bd9d28cb0286
diff --git a/metadata/md5-cache/dev-python/gitdb-0.6.4 b/metadata/md5-cache/dev-python/gitdb-0.6.4
index 1ed886f5bfa2..757eb3fd946a 100644
--- a/metadata/md5-cache/dev-python/gitdb-0.6.4
+++ b/metadata/md5-cache/dev-python/gitdb-0.6.4
@@ -10,5 +10,5 @@ RDEPEND=dev-vcs/git >=dev-python/smmap-0.8.5[python_targets_python2_7(-)?,python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gitdb/gitdb-0.6.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2ec745ee5dba06bc6b58060083dec045
diff --git a/metadata/md5-cache/dev-python/gitdb2-2.0.3 b/metadata/md5-cache/dev-python/gitdb2-2.0.3
index 3c0c8b180454..dfa20558dcfd 100644
--- a/metadata/md5-cache/dev-python/gitdb2-2.0.3
+++ b/metadata/md5-cache/dev-python/gitdb2-2.0.3
@@ -10,5 +10,5 @@ RDEPEND=!dev-python/gitdb[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gitdb2/gitdb2-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ba069632b1362343b951eaf832bea413
diff --git a/metadata/md5-cache/dev-python/github3-0.9.3 b/metadata/md5-cache/dev-python/github3-0.9.3
index c56427c491fe..b6db176f5b25 100644
--- a/metadata/md5-cache/dev-python/github3-0.9.3
+++ b/metadata/md5-cache/dev-python/github3-0.9.3
@@ -10,5 +10,5 @@ RDEPEND=dev-vcs/git dev-python/requests[python_targets_python2_7(-)?,python_targ
 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/sigmavirus24/github3.py/archive/0.9.3.tar.gz -> github3-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0e3fee385989d38c72ef7e0b1edce508
diff --git a/metadata/md5-cache/dev-python/glance_store-0.22.0 b/metadata/md5-cache/dev-python/glance_store-0.22.0
index c45376fd0678..ca5fa98d1062 100644
--- a/metadata/md5-cache/dev-python/glance_store-0.22.0
+++ b/metadata/md5-cache/dev-python/glance_store-0.22.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/g/glance_store/glance_store-0.22.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=389e5572a0839797a62bd6eff3a40311
diff --git a/metadata/md5-cache/dev-python/glance_store-0.23.0 b/metadata/md5-cache/dev-python/glance_store-0.23.0
index c834f1c1b2cc..0a716ff24d51 100644
--- a/metadata/md5-cache/dev-python/glance_store-0.23.0
+++ b/metadata/md5-cache/dev-python/glance_store-0.23.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/glance_store/glance_store-0.23.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e679b68e6f30b2fa4e262c638e8f9090
diff --git a/metadata/md5-cache/dev-python/glance_store-0.26.1 b/metadata/md5-cache/dev-python/glance_store-0.26.1
index e3ef8ace9603..3a997b60df86 100644
--- a/metadata/md5-cache/dev-python/glance_store-0.26.1
+++ b/metadata/md5-cache/dev-python/glance_store-0.26.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/glance_store/glance_store-0.26.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9800bff4c4ba25a2823ea84a997b2252
diff --git a/metadata/md5-cache/dev-python/globre-0.1.4 b/metadata/md5-cache/dev-python/globre-0.1.4
index d683e919f3cb..d61aedf4028c 100644
--- a/metadata/md5-cache/dev-python/globre-0.1.4
+++ b/metadata/md5-cache/dev-python/globre-0.1.4
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/g/globre/globre-0.1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=79461080805c982436c1b3d9753a1d95
diff --git a/metadata/md5-cache/dev-python/globre-0.1.5 b/metadata/md5-cache/dev-python/globre-0.1.5
index c3769e35ac36..fd6f148c67e5 100644
--- a/metadata/md5-cache/dev-python/globre-0.1.5
+++ b/metadata/md5-cache/dev-python/globre-0.1.5
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/g/globre/globre-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=662a316b16f34ab8b3e1f9d8be86056a
diff --git a/metadata/md5-cache/dev-python/glue-vispy-viewers-0.7.2 b/metadata/md5-cache/dev-python/glue-vispy-viewers-0.7.2
index ea08d6400109..e7f3c28a2046 100644
--- a/metadata/md5-cache/dev-python/glue-vispy-viewers-0.7.2
+++ b/metadata/md5-cache/dev-python/glue-vispy-viewers-0.7.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/glue-vispy-viewers/glue-vispy-viewers-0.7.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b534dcaa7767a40e5a9a3b57fbae135e
diff --git a/metadata/md5-cache/dev-python/glueviz-0.10.4 b/metadata/md5-cache/dev-python/glueviz-0.10.4
index 76b32517a748..7949e9351181 100644
--- a/metadata/md5-cache/dev-python/glueviz-0.10.4
+++ b/metadata/md5-cache/dev-python/glueviz-0.10.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/glueviz/glueviz-0.10.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ec4271bbd28a8f228e856f0a3577f48c
diff --git a/metadata/md5-cache/dev-python/glymur-0.8.10 b/metadata/md5-cache/dev-python/glymur-0.8.10
index 0cd5c396733b..3cf1382af4e4 100644
--- a/metadata/md5-cache/dev-python/glymur-0.8.10
+++ b/metadata/md5-cache/dev-python/glymur-0.8.10
@@ -10,5 +10,5 @@ RDEPEND=dev-python/contextlib2[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/G/Glymur/Glymur-0.8.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0ba8bc0df8358422ea654d7157a12599
diff --git a/metadata/md5-cache/dev-python/gmpy-2.0.8 b/metadata/md5-cache/dev-python/gmpy-2.0.8
index 975c1ec6e83c..5c48a9f04e7d 100644
--- a/metadata/md5-cache/dev-python/gmpy-2.0.8
+++ b/metadata/md5-cache/dev-python/gmpy-2.0.8
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/mpc-1.0.2:= >=dev-libs/mpfr-3.1.2:= !mpir? ( dev-libs/gmp:0=
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=2
 SRC_URI=mirror://pypi/g/gmpy2/gmpy2-2.0.8.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=68a3c3e717ef2eb5893269a49ea9f017
diff --git a/metadata/md5-cache/dev-python/gnome-keyring-python-2.32.0-r1 b/metadata/md5-cache/dev-python/gnome-keyring-python-2.32.0-r1
index 3a87c45ad750..3dd9effdfb2c 100644
--- a/metadata/md5-cache/dev-python/gnome-keyring-python-2.32.0-r1
+++ b/metadata/md5-cache/dev-python/gnome-keyring-python-2.32.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-python-desktop/2.32/gnome-python-desktop-2.32.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome-python-common-r1	4b3f4780086f96814cde64b8e5ea23c5	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome-python-common-r1	4b3f4780086f96814cde64b8e5ea23c5	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=33d51039b722f19a5ccf805d9f768fac
diff --git a/metadata/md5-cache/dev-python/gnome-python-base-2.28.1-r1 b/metadata/md5-cache/dev-python/gnome-python-base-2.28.1-r1
index 7ceba0c4b26e..960720ab126d 100644
--- a/metadata/md5-cache/dev-python/gnome-python-base-2.28.1-r1
+++ b/metadata/md5-cache/dev-python/gnome-python-base-2.28.1-r1
@@ -9,5 +9,5 @@ RDEPEND=>=x11-libs/gtk+-2.6:2 >=dev-libs/glib-2.6:2 || ( ( >=dev-lang/python-2.7
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-python/2.28/gnome-python-2.28.1.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-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=f0757ca51f6cee8979032f490a9995c9
diff --git a/metadata/md5-cache/dev-python/gnome-python-desktop-base-2.32.0-r1 b/metadata/md5-cache/dev-python/gnome-python-desktop-base-2.32.0-r1
index c0d5d5fba9e5..a9db015b7777 100644
--- a/metadata/md5-cache/dev-python/gnome-python-desktop-base-2.32.0-r1
+++ b/metadata/md5-cache/dev-python/gnome-python-desktop-base-2.32.0-r1
@@ -9,5 +9,5 @@ RDEPEND=|| ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/pygtk-2.10.3:2[python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-python-desktop/2.32/gnome-python-desktop-2.32.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-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=73fbb9b7ddb155aba30f31f113b48d0a
diff --git a/metadata/md5-cache/dev-python/gnome-python-extras-base-2.25.3-r1 b/metadata/md5-cache/dev-python/gnome-python-extras-base-2.25.3-r1
index c9f1adeb8dc3..0710994c2791 100644
--- a/metadata/md5-cache/dev-python/gnome-python-extras-base-2.25.3-r1
+++ b/metadata/md5-cache/dev-python/gnome-python-extras-base-2.25.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/gtk+-2.4:2 >=dev-libs/glib-2.6:2 || ( ( >=dev-lang/python-2.7
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-python-extras/2.25/gnome-python-extras-2.25.3.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-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7efe4234b9611201665e666f79434767
diff --git a/metadata/md5-cache/dev-python/gnome-vfs-python-2.28.1-r1 b/metadata/md5-cache/dev-python/gnome-vfs-python-2.28.1-r1
index 90eb8c311a20..4cd67c2ee88b 100644
--- a/metadata/md5-cache/dev-python/gnome-vfs-python-2.28.1-r1
+++ b/metadata/md5-cache/dev-python/gnome-vfs-python-2.28.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-python/2.28/gnome-python-2.28.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome-python-common-r1	4b3f4780086f96814cde64b8e5ea23c5	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome-python-common-r1	4b3f4780086f96814cde64b8e5ea23c5	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=13abf8989db68e41e06990d5d815edd3
diff --git a/metadata/md5-cache/dev-python/gntp-1.0.3 b/metadata/md5-cache/dev-python/gntp-1.0.3
index 60953ecc8162..7cc514921cca 100644
--- a/metadata/md5-cache/dev-python/gntp-1.0.3
+++ b/metadata/md5-cache/dev-python/gntp-1.0.3
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gntp/gntp-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=183c8a2a81f44dff2c6eba3551d965d1
diff --git a/metadata/md5-cache/dev-python/gnuplot-py-1.8-r1 b/metadata/md5-cache/dev-python/gnuplot-py-1.8-r1
index 58f803645498..96cf66f1fd1f 100644
--- a/metadata/md5-cache/dev-python/gnuplot-py-1.8-r1
+++ b/metadata/md5-cache/dev-python/gnuplot-py-1.8-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/gnuplot-py/gnuplot-py-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7302d8341a075b3920395668ba445d06
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-1.5.3 b/metadata/md5-cache/dev-python/google-api-python-client-1.5.3
index 9bdea523fefd..5d83d2b2a0e2 100644
--- a/metadata/md5-cache/dev-python/google-api-python-client-1.5.3
+++ b/metadata/md5-cache/dev-python/google-api-python-client-1.5.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/httplib2-0.8[python_targets_pypy(-)?,python_targets_python2
 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/google/google-api-python-client/archive/v1.5.3.tar.gz -> google-api-python-client-1.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9ec2b0f8b4898314cb1eb0f0cdf4ef88
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-1.6.2 b/metadata/md5-cache/dev-python/google-api-python-client-1.6.2
index 5dc5da9c202d..a71a3f43accc 100644
--- a/metadata/md5-cache/dev-python/google-api-python-client-1.6.2
+++ b/metadata/md5-cache/dev-python/google-api-python-client-1.6.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/httplib2-0.9.2[python_targets_pypy(-)?,python_targets_pytho
 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/google/google-api-python-client/archive/v1.6.2.tar.gz -> google-api-python-client-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=307c5e8d102a8c909d21b19290dbc52d
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-1.6.5 b/metadata/md5-cache/dev-python/google-api-python-client-1.6.5
index 5676535c96f9..0f9aeabf0794 100644
--- a/metadata/md5-cache/dev-python/google-api-python-client-1.6.5
+++ b/metadata/md5-cache/dev-python/google-api-python-client-1.6.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/httplib2-0.9.2[python_targets_pypy(-)?,python_targets_pytho
 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/google/google-api-python-client/archive/v1.6.5.tar.gz -> google-api-python-client-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=56d2f7d28d434838633e5b40734a5dde
diff --git a/metadata/md5-cache/dev-python/google-apitools-0.5.16 b/metadata/md5-cache/dev-python/google-apitools-0.5.16
index 67ae16963daa..5c450a5e4775 100644
--- a/metadata/md5-cache/dev-python/google-apitools-0.5.16
+++ b/metadata/md5-cache/dev-python/google-apitools-0.5.16
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/httplib2-0.8[python_targets_python2_7(-)?,-python_single_ta
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/google/apitools/archive/v0.5.16.tar.gz -> google-apitools-0.5.16.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3ac9161b5176fb06ea54fd584581b9ab
diff --git a/metadata/md5-cache/dev-python/google-apitools-0.5.22 b/metadata/md5-cache/dev-python/google-apitools-0.5.22
index 501c0b28c44a..05fdd732309b 100644
--- a/metadata/md5-cache/dev-python/google-apitools-0.5.22
+++ b/metadata/md5-cache/dev-python/google-apitools-0.5.22
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/httplib2-0.8[python_targets_python2_7(-)?,-python_single_ta
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/google/apitools/archive/v0.5.22.tar.gz -> google-apitools-0.5.22.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d1ccdc05f0a4504a1bc7a5949422455d
diff --git a/metadata/md5-cache/dev-python/google-apitools-0.5.22-r1 b/metadata/md5-cache/dev-python/google-apitools-0.5.22-r1
index 6a92b9cd866c..3ad9562c18eb 100644
--- a/metadata/md5-cache/dev-python/google-apitools-0.5.22-r1
+++ b/metadata/md5-cache/dev-python/google-apitools-0.5.22-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/google/apitools/archive/v0.5.22.tar.gz -> google-apitools-0.5.22.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=73c5ee9651b103da0186253afe254fcd
diff --git a/metadata/md5-cache/dev-python/google-apputils-0.4.2-r1 b/metadata/md5-cache/dev-python/google-apputils-0.4.2-r1
index e7880391b0d9..dc615f48455e 100644
--- a/metadata/md5-cache/dev-python/google-apputils-0.4.2-r1
+++ b/metadata/md5-cache/dev-python/google-apputils-0.4.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/python-dateutil-1.4[python_targets_python2_7(-)?,-python_si
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/google-apputils/google-apputils-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c6ae69870c28a5465cf9fed9146c8220
diff --git a/metadata/md5-cache/dev-python/google-apputils-0.4.2-r2 b/metadata/md5-cache/dev-python/google-apputils-0.4.2-r2
index b8a8d9e44279..f8cc91cb4cbe 100644
--- a/metadata/md5-cache/dev-python/google-apputils-0.4.2-r2
+++ b/metadata/md5-cache/dev-python/google-apputils-0.4.2-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/namespace-google[python_targets_python2_7(-)?,-python_single_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/google-apputils/google-apputils-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=627d2a2c68841787d0c3ccda1dabcc42
diff --git a/metadata/md5-cache/dev-python/google-auth-1.0.1 b/metadata/md5-cache/dev-python/google-auth-1.0.1
index 53c6de6a698a..44329bb8f8dd 100644
--- a/metadata/md5-cache/dev-python/google-auth-1.0.1
+++ b/metadata/md5-cache/dev-python/google-auth-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/namespace-google[python_targets_pypy(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/google-auth/google-auth-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=860340306f47bd99ca4eae37206ad5fa
diff --git a/metadata/md5-cache/dev-python/google-auth-1.1.0 b/metadata/md5-cache/dev-python/google-auth-1.1.0
index 6766ac96b728..10bc1ab5d4a9 100644
--- a/metadata/md5-cache/dev-python/google-auth-1.1.0
+++ b/metadata/md5-cache/dev-python/google-auth-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/namespace-google[python_targets_pypy(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/google-auth/google-auth-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=240128cec70bd911ec2d23b85b314d7c
diff --git a/metadata/md5-cache/dev-python/google-auth-1.4.1 b/metadata/md5-cache/dev-python/google-auth-1.4.1
index 3aee2714a063..e13ddf69bb98 100644
--- a/metadata/md5-cache/dev-python/google-auth-1.4.1
+++ b/metadata/md5-cache/dev-python/google-auth-1.4.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/namespace-google[python_targets_pypy(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/google-auth/google-auth-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a9ea2557a975964eb1790472fc387525
diff --git a/metadata/md5-cache/dev-python/google-auth-httplib2-0.0.2 b/metadata/md5-cache/dev-python/google-auth-httplib2-0.0.2
index 7301a9622276..6ea57a3cffaf 100644
--- a/metadata/md5-cache/dev-python/google-auth-httplib2-0.0.2
+++ b/metadata/md5-cache/dev-python/google-auth-httplib2-0.0.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/httplib2[python_targets_pypy(-)?,python_targets_python2_7(-)?
 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/GoogleCloudPlatform/google-auth-library-python-httplib2/archive/607e86011141e8885b1f52826d57c8b5ff588ffc.tar.gz -> google-auth-httplib2-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8a611e2e2bdd347b2b115df96322a75d
diff --git a/metadata/md5-cache/dev-python/google-reauth-python-0.1.0 b/metadata/md5-cache/dev-python/google-reauth-python-0.1.0
index 42a174dabc94..15e67d26a8e5 100644
--- a/metadata/md5-cache/dev-python/google-reauth-python-0.1.0
+++ b/metadata/md5-cache/dev-python/google-reauth-python-0.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/oauth2client[python_targets_python2_7(-)?,python_targets_pyth
 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/google/google-reauth-python/archive/0.1.0.tar.gz -> google-reauth-python-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dcb99ec83bb2eba1e4653b6b526c7ae7
diff --git a/metadata/md5-cache/dev-python/gql-0.1.0 b/metadata/md5-cache/dev-python/gql-0.1.0
index cb7cf01bed15..9de3dd1d64f5 100644
--- a/metadata/md5-cache/dev-python/gql-0.1.0
+++ b/metadata/md5-cache/dev-python/gql-0.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gql/gql-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c8a8acd4004c477d8f4072c9f3e8bfa1
diff --git a/metadata/md5-cache/dev-python/grafanalib-0.4.0 b/metadata/md5-cache/dev-python/grafanalib-0.4.0
index f7fed9bbffdd..873f24026294 100644
--- a/metadata/md5-cache/dev-python/grafanalib-0.4.0
+++ b/metadata/md5-cache/dev-python/grafanalib-0.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/g/grafanalib/grafanalib-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1f6126cf8407fea6697d5951e7b4b3b9
diff --git a/metadata/md5-cache/dev-python/graphcanvas-4.0.2-r1 b/metadata/md5-cache/dev-python/graphcanvas-4.0.2-r1
index a9dcfda32d09..600438c5e337 100644
--- a/metadata/md5-cache/dev-python/graphcanvas-4.0.2-r1
+++ b/metadata/md5-cache/dev-python/graphcanvas-4.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/networkx[python_targets_python2_7(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.enthought.com/repo/ets/graphcanvas-4.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2fb1991f98020d5667c9bd202fe51983
diff --git a/metadata/md5-cache/dev-python/graphql-core-2.0.0 b/metadata/md5-cache/dev-python/graphql-core-2.0.0
index 7dbb22eb27f0..e11eb8bebf4d 100644
--- a/metadata/md5-cache/dev-python/graphql-core-2.0.0
+++ b/metadata/md5-cache/dev-python/graphql-core-2.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/graphql-python/graphql-core/archive/v2.0.0.tar.gz -> graphql-core-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=20eef50367cd7391cbaa40a558877728
diff --git a/metadata/md5-cache/dev-python/graphviz-0.7.1 b/metadata/md5-cache/dev-python/graphviz-0.7.1
index 99ff1c65c7da..d873e9552373 100644
--- a/metadata/md5-cache/dev-python/graphviz-0.7.1
+++ b/metadata/md5-cache/dev-python/graphviz-0.7.1
@@ -10,5 +10,5 @@ RDEPEND=media-gfx/graphviz python_targets_python2_7? ( >=dev-lang/python-2.7.5-r
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/graphviz/graphviz-0.7.1.zip
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bcd90334c8b86d795f1806493c431700
diff --git a/metadata/md5-cache/dev-python/graphy-1.0-r1 b/metadata/md5-cache/dev-python/graphy-1.0-r1
index 9e66a6680d45..fbb4e92b63c3 100644
--- a/metadata/md5-cache/dev-python/graphy-1.0-r1
+++ b/metadata/md5-cache/dev-python/graphy-1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://graphy.googlecode.com/files/graphy_1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=69a678a746715d004acea0acc1d3cdfe
diff --git a/metadata/md5-cache/dev-python/greenlet-0.4.12 b/metadata/md5-cache/dev-python/greenlet-0.4.12
index b5a22432a8e0..be6eafc92d26 100644
--- a/metadata/md5-cache/dev-python/greenlet-0.4.12
+++ b/metadata/md5-cache/dev-python/greenlet-0.4.12
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/g/greenlet/greenlet-0.4.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4489fc85fe3b1fb7203d81bef74aa5ba
diff --git a/metadata/md5-cache/dev-python/greenlet-0.4.13 b/metadata/md5-cache/dev-python/greenlet-0.4.13
index 46b0af21f42c..c5808aea6c60 100644
--- a/metadata/md5-cache/dev-python/greenlet-0.4.13
+++ b/metadata/md5-cache/dev-python/greenlet-0.4.13
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/g/greenlet/greenlet-0.4.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ae66db2d7d4f9f39d022dc9011705bfa
diff --git a/metadata/md5-cache/dev-python/gsd-1.5.3 b/metadata/md5-cache/dev-python/gsd-1.5.3
index c9587b0f2ddf..da0bd65fdca0 100644
--- a/metadata/md5-cache/dev-python/gsd-1.5.3
+++ b/metadata/md5-cache/dev-python/gsd-1.5.3
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://glotzerlab.engin.umich.edu/Downloads/gsd/gsd-v1.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=84e689dd2718236e70c129eec130faca
diff --git a/metadata/md5-cache/dev-python/gst-python-1.12.3 b/metadata/md5-cache/dev-python/gst-python-1.12.3
deleted file mode 100644
index 32e1fee4ac5a..000000000000
--- a/metadata/md5-cache/dev-python/gst-python-1.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygobject-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(-)] >=media-libs/gstreamer-1.12.3:1.0[introspection] >=media-libs/gst-plugins-base-1.12.3:1.0[introspection] virtual/pkgconfig
-DESCRIPTION=A Python Interface to GStreamer
-EAPI=6
-HOMEPAGE=https://gstreamer.freedesktop.org/
-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 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-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-python/pygobject-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(-)] >=media-libs/gstreamer-1.12.3:1.0[introspection] >=media-libs/gst-plugins-base-1.12.3:1.0[introspection]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=1.0
-SRC_URI=https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.12.3.tar.xz
-_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=080df82163fe68edbfb9fc3e9b5abafb
diff --git a/metadata/md5-cache/dev-python/gst-python-1.14.1-r1 b/metadata/md5-cache/dev-python/gst-python-1.14.1-r1
index e477e3d1d7ab..e6f4d83cd20c 100644
--- a/metadata/md5-cache/dev-python/gst-python-1.14.1-r1
+++ b/metadata/md5-cache/dev-python/gst-python-1.14.1-r1
@@ -10,5 +10,5 @@ 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 )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.14.1.tar.xz
-_eclasses_=ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b6a2f3ae5877917ecd72e129e2187b0f
diff --git a/metadata/md5-cache/dev-python/gtkspell-python-2.25.3-r1 b/metadata/md5-cache/dev-python/gtkspell-python-2.25.3-r1
index bed0ac617d6b..15b0d1b91048 100644
--- a/metadata/md5-cache/dev-python/gtkspell-python-2.25.3-r1
+++ b/metadata/md5-cache/dev-python/gtkspell-python-2.25.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-python-extras/2.25/gnome-python-extras-2.25.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome-python-common-r1	4b3f4780086f96814cde64b8e5ea23c5	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome-python-common-r1	4b3f4780086f96814cde64b8e5ea23c5	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cd5c2ffc6b09d0f7ca1e0641bbc53476
diff --git a/metadata/md5-cache/dev-python/guessit-2.1.4 b/metadata/md5-cache/dev-python/guessit-2.1.4
index 16d2c3dda7cf..52510e86f9da 100644
--- a/metadata/md5-cache/dev-python/guessit-2.1.4
+++ b/metadata/md5-cache/dev-python/guessit-2.1.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/babelfish-0.5.5[python_targets_python2_7(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/guessit/guessit-2.1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6096d5a8f2e6d87fe0efc2ebba643223
diff --git a/metadata/md5-cache/dev-python/guessit-3.0.0 b/metadata/md5-cache/dev-python/guessit-3.0.0
index bdeff53ee230..efa12be1c184 100644
--- a/metadata/md5-cache/dev-python/guessit-3.0.0
+++ b/metadata/md5-cache/dev-python/guessit-3.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/babelfish-0.5.5[python_targets_python2_7(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/guessit/guessit-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f55e35f1f2548902c45ab358dd332372
diff --git a/metadata/md5-cache/dev-python/guessit-9999 b/metadata/md5-cache/dev-python/guessit-9999
index fc1fd4ba5a86..592881577e0c 100644
--- a/metadata/md5-cache/dev-python/guessit-9999
+++ b/metadata/md5-cache/dev-python/guessit-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-3
 RDEPEND=>=dev-python/babelfish-0.5.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/rebulk-0.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-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/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=eecb1d214a9c63f1cad063b64358b7d8
diff --git a/metadata/md5-cache/dev-python/guppy-0.1.10-r1 b/metadata/md5-cache/dev-python/guppy-0.1.10-r1
index 3b1fc00d0a7b..bc5c015deca0 100644
--- a/metadata/md5-cache/dev-python/guppy-0.1.10-r1
+++ b/metadata/md5-cache/dev-python/guppy-0.1.10-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=mirror://pypi/g/guppy/guppy-0.1.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=601ee383c3ff373442236fbbac21de2e
diff --git a/metadata/md5-cache/dev-python/guzzle_sphinx_theme-0.7.10 b/metadata/md5-cache/dev-python/guzzle_sphinx_theme-0.7.10
index 5c186ba5968e..7cc9c5dca790 100644
--- a/metadata/md5-cache/dev-python/guzzle_sphinx_theme-0.7.10
+++ b/metadata/md5-cache/dev-python/guzzle_sphinx_theme-0.7.10
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/sphinx-1.2[python_targets_python2_7(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=015837ece55606bb7369806ef80b596a
diff --git a/metadata/md5-cache/dev-python/guzzle_sphinx_theme-0.7.11 b/metadata/md5-cache/dev-python/guzzle_sphinx_theme-0.7.11
index 0c4cac5b52a6..4d92e38ed41d 100644
--- a/metadata/md5-cache/dev-python/guzzle_sphinx_theme-0.7.11
+++ b/metadata/md5-cache/dev-python/guzzle_sphinx_theme-0.7.11
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/sphinx-1.2[python_targets_python2_7(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9f0492430764b57a9653442e375658e2
diff --git a/metadata/md5-cache/dev-python/h11-0.7.0 b/metadata/md5-cache/dev-python/h11-0.7.0
index e29289050aed..f6cb59cabc52 100644
--- a/metadata/md5-cache/dev-python/h11-0.7.0
+++ b/metadata/md5-cache/dev-python/h11-0.7.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/h/h11/h11-0.7.0.zip
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2f8575d9ba60af6e18c73af01129c78d
diff --git a/metadata/md5-cache/dev-python/h11-0.8.1 b/metadata/md5-cache/dev-python/h11-0.8.1
index db829fbcedfc..bc95f151199f 100644
--- a/metadata/md5-cache/dev-python/h11-0.8.1
+++ b/metadata/md5-cache/dev-python/h11-0.8.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/h/h11/h11-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b30a2e215a4a21a35acc92e319c01e3e
diff --git a/metadata/md5-cache/dev-python/h5py-2.7.0 b/metadata/md5-cache/dev-python/h5py-2.7.0
index dc4d7be29205..8bb74584b352 100644
--- a/metadata/md5-cache/dev-python/h5py-2.7.0
+++ b/metadata/md5-cache/dev-python/h5py-2.7.0
@@ -10,5 +10,5 @@ RDEPEND=sci-libs/hdf5:=[mpi=,hl(+)] dev-python/numpy[python_targets_python2_7(-)
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/h/h5py/h5py-2.7.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=30cc6181db28bc0bbaf2635bb7bef7a9
diff --git a/metadata/md5-cache/dev-python/h5py-2.7.1 b/metadata/md5-cache/dev-python/h5py-2.7.1
index 756f20431cbb..b4471524e571 100644
--- a/metadata/md5-cache/dev-python/h5py-2.7.1
+++ b/metadata/md5-cache/dev-python/h5py-2.7.1
@@ -10,5 +10,5 @@ RDEPEND=sci-libs/hdf5:=[mpi=,hl(+)] dev-python/numpy[python_targets_python2_7(-)
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/h/h5py/h5py-2.7.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=53410eef7893128858147a07410b9d13
diff --git a/metadata/md5-cache/dev-python/hachoir-core-1.3.3-r1 b/metadata/md5-cache/dev-python/hachoir-core-1.3.3-r1
index 8f160fd56f9c..693ebe71f09f 100644
--- a/metadata/md5-cache/dev-python/hachoir-core-1.3.3-r1
+++ b/metadata/md5-cache/dev-python/hachoir-core-1.3.3-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hachoir-core/hachoir-core-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9645c17e9677cdc9d0fa962b5e84352e
diff --git a/metadata/md5-cache/dev-python/hachoir-parser-1.3.4-r1 b/metadata/md5-cache/dev-python/hachoir-parser-1.3.4-r1
index c67b4a6b39e8..70010d2546c2 100644
--- a/metadata/md5-cache/dev-python/hachoir-parser-1.3.4-r1
+++ b/metadata/md5-cache/dev-python/hachoir-parser-1.3.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/hachoir-core-1.3[python_targets_pypy(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hachoir-parser/hachoir-parser-1.3.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2d6e9bbf12eb66268adaa0fb50986cad
diff --git a/metadata/md5-cache/dev-python/hachoir-regex-1.0.5-r1 b/metadata/md5-cache/dev-python/hachoir-regex-1.0.5-r1
index 43d02439ba3a..55af7195295d 100644
--- a/metadata/md5-cache/dev-python/hachoir-regex-1.0.5-r1
+++ b/metadata/md5-cache/dev-python/hachoir-regex-1.0.5-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=mirror://pypi/h/hachoir-regex/hachoir-regex-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=109fb5d28144f933415c46c1ea4143ed
diff --git a/metadata/md5-cache/dev-python/hacking-0.10.3 b/metadata/md5-cache/dev-python/hacking-0.10.3
index 3e9259d76f50..71be9c96cf61 100644
--- a/metadata/md5-cache/dev-python/hacking-0.10.3
+++ b/metadata/md5-cache/dev-python/hacking-0.10.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-python/pep8-1.5.7[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hacking/hacking-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c381ddfc4feca81d88c2547b3170e2e0
diff --git a/metadata/md5-cache/dev-python/hacking-0.13.0 b/metadata/md5-cache/dev-python/hacking-0.13.0
index 6a6fb3fab7bc..b8b7dae8a43c 100644
--- a/metadata/md5-cache/dev-python/hacking-0.13.0
+++ b/metadata/md5-cache/dev-python/hacking-0.13.0
@@ -10,5 +10,5 @@ RDEPEND=~dev-python/pep8-1.5.7[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hacking/hacking-0.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bab04fd40917542e9971fda9cc073703
diff --git a/metadata/md5-cache/dev-python/hacking-0.9.2 b/metadata/md5-cache/dev-python/hacking-0.9.2
index c0e50042763b..3e72d5946d42 100644
--- a/metadata/md5-cache/dev-python/hacking-0.9.2
+++ b/metadata/md5-cache/dev-python/hacking-0.9.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-python/pep8-1.5.6[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hacking/hacking-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ac05009c6174fbc8a5ae1225b53cd17e
diff --git a/metadata/md5-cache/dev-python/hacking-0.9.6 b/metadata/md5-cache/dev-python/hacking-0.9.6
index 1be70ba21f61..58ec0c863ef4 100644
--- a/metadata/md5-cache/dev-python/hacking-0.9.6
+++ b/metadata/md5-cache/dev-python/hacking-0.9.6
@@ -10,5 +10,5 @@ RDEPEND=~dev-python/pep8-1.5.6[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hacking/hacking-0.9.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f37686b15dc4ef35e9ab2e048a229562
diff --git a/metadata/md5-cache/dev-python/happydoc-3.1-r2 b/metadata/md5-cache/dev-python/happydoc-3.1-r2
index 8dd7e8a6c2d7..16f2c92687a9 100644
--- a/metadata/md5-cache/dev-python/happydoc-3.1-r2
+++ b/metadata/md5-cache/dev-python/happydoc-3.1-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/happydoc/HappyDoc_r3_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=324dc62dcf8fd3379c7dd813edd6413f
diff --git a/metadata/md5-cache/dev-python/hcluster-0.2.0-r1 b/metadata/md5-cache/dev-python/hcluster-0.2.0-r1
index d3ad88c5a24c..890a3b38d398 100644
--- a/metadata/md5-cache/dev-python/hcluster-0.2.0-r1
+++ b/metadata/md5-cache/dev-python/hcluster-0.2.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/h/hcluster/hcluster-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a4ac2764497fd3e30b96b59123b3b529
diff --git a/metadata/md5-cache/dev-python/hcs-utils-1.5 b/metadata/md5-cache/dev-python/hcs-utils-1.5
index 6e62840ac858..ad9e225c1724 100644
--- a/metadata/md5-cache/dev-python/hcs-utils-1.5
+++ b/metadata/md5-cache/dev-python/hcs-utils-1.5
@@ -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=mirror://pypi/h/hcs_utils/hcs_utils-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=14c99e5c8556dd75fec6b85b722f429e
diff --git a/metadata/md5-cache/dev-python/hcs-utils-2.0 b/metadata/md5-cache/dev-python/hcs-utils-2.0
index 939822a82c9e..241cf463f6f2 100644
--- a/metadata/md5-cache/dev-python/hcs-utils-2.0
+++ b/metadata/md5-cache/dev-python/hcs-utils-2.0
@@ -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=mirror://pypi/h/hcs_utils/hcs_utils-2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a2b9a70c421685e2c433148656da35a4
diff --git a/metadata/md5-cache/dev-python/healpy-1.10.3 b/metadata/md5-cache/dev-python/healpy-1.10.3
index c03cadd0de9f..851bed2bbe46 100644
--- a/metadata/md5-cache/dev-python/healpy-1.10.3
+++ b/metadata/md5-cache/dev-python/healpy-1.10.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/h/healpy/healpy-1.10.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fc2437145afc84d2c837400a829e1917
diff --git a/metadata/md5-cache/dev-python/healpy-1.11.0 b/metadata/md5-cache/dev-python/healpy-1.11.0
index f878bf72de53..4cecd6b513ec 100644
--- a/metadata/md5-cache/dev-python/healpy-1.11.0
+++ b/metadata/md5-cache/dev-python/healpy-1.11.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/h/healpy/healpy-1.11.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=98bac04b60ba137ec305312094e3c6aa
diff --git a/metadata/md5-cache/dev-python/hgdistver-0.25 b/metadata/md5-cache/dev-python/hgdistver-0.25
index 1c336ed7b7a1..b3ffdfab1be7 100644
--- a/metadata/md5-cache/dev-python/hgdistver-0.25
+++ b/metadata/md5-cache/dev-python/hgdistver-0.25
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/h/hgdistver/hgdistver-0.25.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=60416b94372df47bdd1665e15a5093aa
diff --git a/metadata/md5-cache/dev-python/hglib-1.5 b/metadata/md5-cache/dev-python/hglib-1.5
index 8fe0e3eac888..3ca80315f455 100644
--- a/metadata/md5-cache/dev-python/hglib-1.5
+++ b/metadata/md5-cache/dev-python/hglib-1.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-vcs/mercurial-2.4.2 python_targets_pypy? ( >=virtual/pypy-5:0=[thr
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-hglib/python-hglib-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=441dc93476bbb26b1530c61ac858db92
diff --git a/metadata/md5-cache/dev-python/hglib-2.1 b/metadata/md5-cache/dev-python/hglib-2.1
index 0b23cfd78d59..7c6744b05376 100644
--- a/metadata/md5-cache/dev-python/hglib-2.1
+++ b/metadata/md5-cache/dev-python/hglib-2.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-vcs/mercurial-2.4.2 python_targets_pypy? ( >=virtual/pypy-5:0=[thr
 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/python-hglib/python-hglib-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bedef3146f0d056d7da33d27f8872dc6
diff --git a/metadata/md5-cache/dev-python/hiredis-0.2.0 b/metadata/md5-cache/dev-python/hiredis-0.2.0
index 6b5e80b98251..c6a01b633fb7 100644
--- a/metadata/md5-cache/dev-python/hiredis-0.2.0
+++ b/metadata/md5-cache/dev-python/hiredis-0.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/hiredis-0.13.1 python_targets_python2_7? ( >=dev-lang/python-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hiredis/hiredis-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=06c39287bd993161755a8072c3cfe3be
diff --git a/metadata/md5-cache/dev-python/hiro-0.2 b/metadata/md5-cache/dev-python/hiro-0.2
index 33f40c3892a6..5b8807c5a96b 100644
--- a/metadata/md5-cache/dev-python/hiro-0.2
+++ b/metadata/md5-cache/dev-python/hiro-0.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hiro/hiro-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=afe95219fc81c4d0c8512f1e94b67639
diff --git a/metadata/md5-cache/dev-python/hiro-0.3 b/metadata/md5-cache/dev-python/hiro-0.3
index 0834912a0867..eb69553e1320 100644
--- a/metadata/md5-cache/dev-python/hiro-0.3
+++ b/metadata/md5-cache/dev-python/hiro-0.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hiro/hiro-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e7f57ff051f5d5702b0fecbc95e32597
diff --git a/metadata/md5-cache/dev-python/hiro-0.5 b/metadata/md5-cache/dev-python/hiro-0.5
index 4f06b207f7e9..38681542b0ef 100644
--- a/metadata/md5-cache/dev-python/hiro-0.5
+++ b/metadata/md5-cache/dev-python/hiro-0.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hiro/hiro-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f092d4923995776a76d0603bb59da336
diff --git a/metadata/md5-cache/dev-python/hp3parclient-2.0.0 b/metadata/md5-cache/dev-python/hp3parclient-2.0.0
index e23e20e45e89..88d2f7ce07c8 100644
--- a/metadata/md5-cache/dev-python/hp3parclient-2.0.0
+++ b/metadata/md5-cache/dev-python/hp3parclient-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/httplib2-0.6.0 python_targets_python2_7? ( >=dev-lang/pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hp3parclient/hp3parclient-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ccf00e46ace4bd3cebd9fb535ea084df
diff --git a/metadata/md5-cache/dev-python/hp3parclient-3.0.0 b/metadata/md5-cache/dev-python/hp3parclient-3.0.0
index ea36c5913cef..e5ad90eff160 100644
--- a/metadata/md5-cache/dev-python/hp3parclient-3.0.0
+++ b/metadata/md5-cache/dev-python/hp3parclient-3.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/httplib2-0.6.0 python_targets_python2_7? ( >=dev-lang/pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hp3parclient/hp3parclient-3.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3f7272a5a8e35e06a95d6b07d97f2c4e
diff --git a/metadata/md5-cache/dev-python/hpack-2.3.0-r1 b/metadata/md5-cache/dev-python/hpack-2.3.0-r1
index a709262bf66e..2c03c31733de 100644
--- a/metadata/md5-cache/dev-python/hpack-2.3.0-r1
+++ b/metadata/md5-cache/dev-python/hpack-2.3.0-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hpack/hpack-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2c15ebfb1f4a699f97f8d1b67f30906e
diff --git a/metadata/md5-cache/dev-python/hpack-3.0.0 b/metadata/md5-cache/dev-python/hpack-3.0.0
index de59aa0a1a57..c742319d1f94 100644
--- a/metadata/md5-cache/dev-python/hpack-3.0.0
+++ b/metadata/md5-cache/dev-python/hpack-3.0.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_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/python-hyper/hpack/archive/v3.0.0.tar.gz -> hpack-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=51a7fe8b2dad97d6c871d60169e56f57
diff --git a/metadata/md5-cache/dev-python/html2text-2016.5.29 b/metadata/md5-cache/dev-python/html2text-2016.5.29
index 4ff7beb4faaa..8b414df2f4bf 100644
--- a/metadata/md5-cache/dev-python/html2text-2016.5.29
+++ b/metadata/md5-cache/dev-python/html2text-2016.5.29
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/Alir3z4/html2text/archive/2016.5.29.tar.gz -> html2text-2016.5.29.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=83e66e85f2c4671a1eec92b516f0a581
diff --git a/metadata/md5-cache/dev-python/html2text-2017.10.4 b/metadata/md5-cache/dev-python/html2text-2017.10.4
index b36346ac0eaa..8c2730b01c67 100644
--- a/metadata/md5-cache/dev-python/html2text-2017.10.4
+++ b/metadata/md5-cache/dev-python/html2text-2017.10.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,p
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/Alir3z4/html2text/archive/2017.10.4.tar.gz -> html2text-2017.10.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5407f01a871807ddc3d3bfbfb90fd455
diff --git a/metadata/md5-cache/dev-python/html2text-2018.1.9 b/metadata/md5-cache/dev-python/html2text-2018.1.9
index 09ce6c44c2bb..53f2d1581d79 100644
--- a/metadata/md5-cache/dev-python/html2text-2018.1.9
+++ b/metadata/md5-cache/dev-python/html2text-2018.1.9
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,p
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/Alir3z4/html2text/archive/2018.1.9.tar.gz -> html2text-2018.1.9-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0ec56654a53bc1c008797b7612b34ec2
diff --git a/metadata/md5-cache/dev-python/html5-parser-0.4.4-r1 b/metadata/md5-cache/dev-python/html5-parser-0.4.4-r1
index ca7fe693ab92..58b48ce651b1 100644
--- a/metadata/md5-cache/dev-python/html5-parser-0.4.4-r1
+++ b/metadata/md5-cache/dev-python/html5-parser-0.4.4-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libxml2:= dev-python/chardet[python_targets_python2_7(-)?,pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/h/html5-parser/html5-parser-0.4.4.tar.gz -> html5-parser-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5e09bc169289c54b328050546a95e5ce
diff --git a/metadata/md5-cache/dev-python/html5lib-0.9999999 b/metadata/md5-cache/dev-python/html5lib-0.9999999
index 62ec24f3b0ec..f5c777d45ba6 100644
--- a/metadata/md5-cache/dev-python/html5lib-0.9999999
+++ b/metadata/md5-cache/dev-python/html5lib-0.9999999
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_t
 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/h/html5lib/html5lib-0.9999999.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=22cc1c72b59b47ec403b32b96a24a1cc
diff --git a/metadata/md5-cache/dev-python/html5lib-0.999999999 b/metadata/md5-cache/dev-python/html5lib-0.999999999
index e6328672007f..febc04fabc84 100644
--- a/metadata/md5-cache/dev-python/html5lib-0.999999999
+++ b/metadata/md5-cache/dev-python/html5lib-0.999999999
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_t
 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/h/html5lib/html5lib-0.999999999.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3f6a4a0b4a0d4ce0731abc0e588f3ff7
diff --git a/metadata/md5-cache/dev-python/html5lib-1.0.1 b/metadata/md5-cache/dev-python/html5lib-1.0.1
index 62ace40bf9a4..25233c5ac99a 100644
--- a/metadata/md5-cache/dev-python/html5lib-1.0.1
+++ b/metadata/md5-cache/dev-python/html5lib-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/six-1.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,py
 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/h/html5lib/html5lib-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1fc601ce99aa34e0feb09a1f421158c3
diff --git a/metadata/md5-cache/dev-python/httmock-1.2.2 b/metadata/md5-cache/dev-python/httmock-1.2.2
index b5f4e6467b0a..6b16b22c5f74 100644
--- a/metadata/md5-cache/dev-python/httmock-1.2.2
+++ b/metadata/md5-cache/dev-python/httmock-1.2.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/requests[python_targets_pypy(-)?,python_targets_python2_7(-)?
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://github.com/patrys/httmock/archive/1.2.2.tar.gz -> httmock-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a51ac802975453ef602f94f2efd355b6
diff --git a/metadata/md5-cache/dev-python/httmock-1.2.3 b/metadata/md5-cache/dev-python/httmock-1.2.3
index 8da4b8162c10..cb5e6f0e69d1 100644
--- a/metadata/md5-cache/dev-python/httmock-1.2.3
+++ b/metadata/md5-cache/dev-python/httmock-1.2.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/requests-1.0.0[python_targets_pypy(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/patrys/httmock/archive/1.2.3.tar.gz -> httmock-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=2416e00b9ff1f9e82b35d2c1b3689860
diff --git a/metadata/md5-cache/dev-python/httmock-1.2.4 b/metadata/md5-cache/dev-python/httmock-1.2.4
index c71a24430bad..a9d96d45b5cb 100644
--- a/metadata/md5-cache/dev-python/httmock-1.2.4
+++ b/metadata/md5-cache/dev-python/httmock-1.2.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/requests-1.0.0[python_targets_pypy(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/patrys/httmock/archive/1.2.4.tar.gz -> httmock-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d8e06af81a88960eef1fbf7be02a9d58
diff --git a/metadata/md5-cache/dev-python/httmock-1.2.5 b/metadata/md5-cache/dev-python/httmock-1.2.5
index e92be70f82e9..dc419f888d07 100644
--- a/metadata/md5-cache/dev-python/httmock-1.2.5
+++ b/metadata/md5-cache/dev-python/httmock-1.2.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/requests-1.0.0[python_targets_pypy(-)?,python_targets_pytho
 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/patrys/httmock/archive/1.2.5.tar.gz -> httmock-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=652998364a263cf32e249afdde718a01
diff --git a/metadata/md5-cache/dev-python/http-parser-0.8.3 b/metadata/md5-cache/dev-python/http-parser-0.8.3
index 93fb2f78cd9e..bd321e38b9cb 100644
--- a/metadata/md5-cache/dev-python/http-parser-0.8.3
+++ b/metadata/md5-cache/dev-python/http-parser-0.8.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/h/http-parser/http-parser-0.8.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bb430f1fc7e9c46a043de0dbc86c079c
diff --git a/metadata/md5-cache/dev-python/httpbin-0.4.1 b/metadata/md5-cache/dev-python/httpbin-0.4.1
index cf1bf26971f9..eea776dcf8e5 100644
--- a/metadata/md5-cache/dev-python/httpbin-0.4.1
+++ b/metadata/md5-cache/dev-python/httpbin-0.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/h/httpbin/httpbin-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e8fb2306b75edef6a2724d3eced3974d
diff --git a/metadata/md5-cache/dev-python/httplib2-0.10.3-r1 b/metadata/md5-cache/dev-python/httplib2-0.10.3-r1
index 83ff0e78836f..99852336a0af 100644
--- a/metadata/md5-cache/dev-python/httplib2-0.10.3-r1
+++ b/metadata/md5-cache/dev-python/httplib2-0.10.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/h/httplib2/httplib2-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6913748495df0bbcf1c30020d6fc03de
diff --git a/metadata/md5-cache/dev-python/httplib2-0.11.3 b/metadata/md5-cache/dev-python/httplib2-0.11.3
index 9d25bd4debdf..911bd7e03bdb 100644
--- a/metadata/md5-cache/dev-python/httplib2-0.11.3
+++ b/metadata/md5-cache/dev-python/httplib2-0.11.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/h/httplib2/httplib2-0.11.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=772e29c52a849426f18be971a3398f02
diff --git a/metadata/md5-cache/dev-python/httpretty-0.7.0 b/metadata/md5-cache/dev-python/httpretty-0.7.0
index 70084dc0c666..dbdc7cb1cefa 100644
--- a/metadata/md5-cache/dev-python/httpretty-0.7.0
+++ b/metadata/md5-cache/dev-python/httpretty-0.7.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/urllib3[python_targets_python2_7(-)?,-python_single_target_py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/h/httpretty/httpretty-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3f6a591c8fd86071884b55f285216fa4
diff --git a/metadata/md5-cache/dev-python/httpretty-0.7.1 b/metadata/md5-cache/dev-python/httpretty-0.7.1
index f9bf1aaf7983..9c138ff86471 100644
--- a/metadata/md5-cache/dev-python/httpretty-0.7.1
+++ b/metadata/md5-cache/dev-python/httpretty-0.7.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/urllib3[python_targets_python2_7(-)?,-python_single_target_py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/h/httpretty/httpretty-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d72e720d09fe3b963fe1e8bf7679a434
diff --git a/metadata/md5-cache/dev-python/httpretty-0.8.0 b/metadata/md5-cache/dev-python/httpretty-0.8.0
index c76003f5d285..af254879c25f 100644
--- a/metadata/md5-cache/dev-python/httpretty-0.8.0
+++ b/metadata/md5-cache/dev-python/httpretty-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/urllib3[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/h/httpretty/httpretty-0.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e1e57083ed6db61a3768ea8275f0ab6f
diff --git a/metadata/md5-cache/dev-python/httpretty-0.8.0-r1 b/metadata/md5-cache/dev-python/httpretty-0.8.0-r1
index 93935d5abd93..fb0408aaf26f 100644
--- a/metadata/md5-cache/dev-python/httpretty-0.8.0-r1
+++ b/metadata/md5-cache/dev-python/httpretty-0.8.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/urllib3[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/h/httpretty/httpretty-0.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3080c2b2f2de4afd1accb7ab43baa197
diff --git a/metadata/md5-cache/dev-python/httpretty-0.8.10 b/metadata/md5-cache/dev-python/httpretty-0.8.10
index 208d5c96087a..466ac00aec85 100644
--- a/metadata/md5-cache/dev-python/httpretty-0.8.10
+++ b/metadata/md5-cache/dev-python/httpretty-0.8.10
@@ -10,5 +10,5 @@ RDEPEND=dev-python/urllib3[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/h/httpretty/httpretty-0.8.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=951d4e3aef6ea8b69533be52bb06119a
diff --git a/metadata/md5-cache/dev-python/httpretty-0.8.12 b/metadata/md5-cache/dev-python/httpretty-0.8.12
index 89bde0dc5cf2..2e31f75fbd24 100644
--- a/metadata/md5-cache/dev-python/httpretty-0.8.12
+++ b/metadata/md5-cache/dev-python/httpretty-0.8.12
@@ -10,5 +10,5 @@ RDEPEND=dev-python/urllib3[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/h/httpretty/httpretty-0.8.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6ab1ffa798e4ad5784c8b9165b717eb7
diff --git a/metadata/md5-cache/dev-python/httpretty-0.8.14 b/metadata/md5-cache/dev-python/httpretty-0.8.14
index 5a20ea7bf912..4023f16b080f 100644
--- a/metadata/md5-cache/dev-python/httpretty-0.8.14
+++ b/metadata/md5-cache/dev-python/httpretty-0.8.14
@@ -10,5 +10,5 @@ RDEPEND=dev-python/urllib3[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/h/httpretty/httpretty-0.8.14.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9dfe97be862246bd702e527cd8e9a2c7
diff --git a/metadata/md5-cache/dev-python/httpretty-0.8.6 b/metadata/md5-cache/dev-python/httpretty-0.8.6
index 83b72ff80e30..7dc4ef7468e5 100644
--- a/metadata/md5-cache/dev-python/httpretty-0.8.6
+++ b/metadata/md5-cache/dev-python/httpretty-0.8.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/urllib3[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/h/httpretty/httpretty-0.8.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c0c819e1d855db0169b5a7b27fd61b5d
diff --git a/metadata/md5-cache/dev-python/humanfriendly-2.4 b/metadata/md5-cache/dev-python/humanfriendly-2.4
index ddf9e0db19fa..f4aa4133b162 100644
--- a/metadata/md5-cache/dev-python/humanfriendly-2.4
+++ b/metadata/md5-cache/dev-python/humanfriendly-2.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/monotonic[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/h/humanfriendly/humanfriendly-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f0cdb096926685a5e44cbca0077a6b56
diff --git a/metadata/md5-cache/dev-python/hyper-h2-2.5.1 b/metadata/md5-cache/dev-python/hyper-h2-2.5.1
index 9a26678d15da..136043e0623d 100644
--- a/metadata/md5-cache/dev-python/hyper-h2-2.5.1
+++ b/metadata/md5-cache/dev-python/hyper-h2-2.5.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/hyperframe-4.0.1[python_targets_pypy(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/h/h2/h2-2.5.1.tar.gz -> hyper-h2-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=102557359f7ed75ac81ad69f5a55a177
diff --git a/metadata/md5-cache/dev-python/hyper-h2-3.0.1 b/metadata/md5-cache/dev-python/hyper-h2-3.0.1
index b7e6fe49273f..daf24d7316e0 100644
--- a/metadata/md5-cache/dev-python/hyper-h2-3.0.1
+++ b/metadata/md5-cache/dev-python/hyper-h2-3.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-hyper/hyper-h2/archive/v3.0.1.tar.gz -> hyper-h2-3.0.1.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7bc738e01f999269fad10d899258ae2d
diff --git a/metadata/md5-cache/dev-python/hyperframe-4.0.1 b/metadata/md5-cache/dev-python/hyperframe-4.0.1
index fdb68c8678a5..45ce73581f5c 100644
--- a/metadata/md5-cache/dev-python/hyperframe-4.0.1
+++ b/metadata/md5-cache/dev-python/hyperframe-4.0.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hyperframe/hyperframe-4.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1251bf45a97b1e24d0778d8a78206f91
diff --git a/metadata/md5-cache/dev-python/hyperframe-5.1.0 b/metadata/md5-cache/dev-python/hyperframe-5.1.0
index 16740315e10d..5dc9c002a4f5 100644
--- a/metadata/md5-cache/dev-python/hyperframe-5.1.0
+++ b/metadata/md5-cache/dev-python/hyperframe-5.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/hyperframe/hyperframe-5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=51b77cfbed9cdeb73f2543d528ed6b9f
diff --git a/metadata/md5-cache/dev-python/hyperlink-17.1.1 b/metadata/md5-cache/dev-python/hyperlink-17.1.1
index 415a8c7e4cfd..6b482d717eb4 100644
--- a/metadata/md5-cache/dev-python/hyperlink-17.1.1
+++ b/metadata/md5-cache/dev-python/hyperlink-17.1.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hyperlink/hyperlink-17.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d1000bf296ea932e03080999d59743ed
diff --git a/metadata/md5-cache/dev-python/hyperlink-17.3.1 b/metadata/md5-cache/dev-python/hyperlink-17.3.1
index b3e8dfade0a9..800be6c82103 100644
--- a/metadata/md5-cache/dev-python/hyperlink-17.3.1
+++ b/metadata/md5-cache/dev-python/hyperlink-17.3.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hyperlink/hyperlink-17.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d6099a8f0f42593f1106240f55af8a3f
diff --git a/metadata/md5-cache/dev-python/hyperlink-18.0.0 b/metadata/md5-cache/dev-python/hyperlink-18.0.0
index ca66632a9ad4..130bda5a6d5c 100644
--- a/metadata/md5-cache/dev-python/hyperlink-18.0.0
+++ b/metadata/md5-cache/dev-python/hyperlink-18.0.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_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/h/hyperlink/hyperlink-18.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ecc8fe80b495814872e801ca3d84ead6
diff --git a/metadata/md5-cache/dev-python/hypothesis-3.59.1 b/metadata/md5-cache/dev-python/hypothesis-3.59.1
index d3d566522bf1..88ab579a20ed 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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=3c192b9d82d74c28be7fd925088adf20
+_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
diff --git a/metadata/md5-cache/dev-python/hypothesis-3.6.0-r1 b/metadata/md5-cache/dev-python/hypothesis-3.6.0-r1
index 325d36de7410..05c55e2e412c 100644
--- a/metadata/md5-cache/dev-python/hypothesis-3.6.0-r1
+++ b/metadata/md5-cache/dev-python/hypothesis-3.6.0-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hypothesis/hypothesis-3.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6cdcb679d34e2eecc609bc906c8b450c
diff --git a/metadata/md5-cache/dev-python/icalendar-3.11.7 b/metadata/md5-cache/dev-python/icalendar-3.11.7
index 47767aee7e5c..9c758071d0ba 100644
--- a/metadata/md5-cache/dev-python/icalendar-3.11.7
+++ b/metadata/md5-cache/dev-python/icalendar-3.11.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pytz[python_targets_pypy(-)?,python_targets_python2_7(-)?,pyt
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/icalendar/icalendar-3.11.7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e2557760e146e1fa2ac496dcb1236f51
diff --git a/metadata/md5-cache/dev-python/icalendar-3.11.7-r1 b/metadata/md5-cache/dev-python/icalendar-3.11.7-r1
index 45b9aa047975..b838dc0097c3 100644
--- a/metadata/md5-cache/dev-python/icalendar-3.11.7-r1
+++ b/metadata/md5-cache/dev-python/icalendar-3.11.7-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pytz[python_targets_pypy(-)?,python_targets_python2_7(-)?,pyt
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/icalendar/icalendar-3.11.7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=38929f1b3b7a8410eaad3cf037615030
diff --git a/metadata/md5-cache/dev-python/icalendar-3.9.2 b/metadata/md5-cache/dev-python/icalendar-3.9.2
index 338ce98bea6f..62a20453fbca 100644
--- a/metadata/md5-cache/dev-python/icalendar-3.9.2
+++ b/metadata/md5-cache/dev-python/icalendar-3.9.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pytz[python_targets_pypy(-)?,python_targets_python2_7(-)?,pyt
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/icalendar/icalendar-3.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=955d9cb4209626efde1d613be1f1441a
diff --git a/metadata/md5-cache/dev-python/id3-py-1.2-r1 b/metadata/md5-cache/dev-python/id3-py-1.2-r1
index 05ae12a89385..eeadffa11e1d 100644
--- a/metadata/md5-cache/dev-python/id3-py-1.2-r1
+++ b/metadata/md5-cache/dev-python/id3-py-1.2-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=mirror://sourceforge/id3-py/id3-py_1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d14fd84d57f23b3e820ac9d3a804702f
diff --git a/metadata/md5-cache/dev-python/idna-2.5 b/metadata/md5-cache/dev-python/idna-2.5
index 88cd230989ae..040fe017b6dc 100644
--- a/metadata/md5-cache/dev-python/idna-2.5
+++ b/metadata/md5-cache/dev-python/idna-2.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/idna/idna-2.5.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6c852677b76020b2776fe1007f0bbd5e
diff --git a/metadata/md5-cache/dev-python/idna-2.6 b/metadata/md5-cache/dev-python/idna-2.6
index 973c01824aaa..0d576edca305 100644
--- a/metadata/md5-cache/dev-python/idna-2.6
+++ b/metadata/md5-cache/dev-python/idna-2.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/idna/idna-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ef9a394ea272e00c8015ae80590b7185
diff --git a/metadata/md5-cache/dev-python/idna-2.7 b/metadata/md5-cache/dev-python/idna-2.7
index 4db434d70634..5388caaa4949 100644
--- a/metadata/md5-cache/dev-python/idna-2.7
+++ b/metadata/md5-cache/dev-python/idna-2.7
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/i/idna/idna-2.7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f59be92eae81d6b3ee786b0fc562a1cb
diff --git a/metadata/md5-cache/dev-python/idna-ssl-1.0.0 b/metadata/md5-cache/dev-python/idna-ssl-1.0.0
index 74829822691b..ecb5cad8f1e4 100644
--- a/metadata/md5-cache/dev-python/idna-ssl-1.0.0
+++ b/metadata/md5-cache/dev-python/idna-ssl-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/idna[python_targets_python3_4(-)?,python_targets_python3_5(-)
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/idna_ssl/idna_ssl-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=248320cf14f92dca3c4d21a4a8acac66
diff --git a/metadata/md5-cache/dev-python/idna-ssl-1.0.1 b/metadata/md5-cache/dev-python/idna-ssl-1.0.1
index 3c548d586ea9..0240d4c1d33c 100644
--- a/metadata/md5-cache/dev-python/idna-ssl-1.0.1
+++ b/metadata/md5-cache/dev-python/idna-ssl-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/idna[python_targets_python3_4(-)?,python_targets_python3_5(-)
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/idna-ssl/idna-ssl-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e74820c263ae90e5e214c4df5150c731
diff --git a/metadata/md5-cache/dev-python/ijson-2.3 b/metadata/md5-cache/dev-python/ijson-2.3
index 32021aeb0089..3848be25ded1 100644
--- a/metadata/md5-cache/dev-python/ijson-2.3
+++ b/metadata/md5-cache/dev-python/ijson-2.3
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/yajl python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/isagalaev/ijson/archive/2.3.tar.gz -> ijson-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c14f798a4d95658abfeda483ba77ab4b
diff --git a/metadata/md5-cache/dev-python/imageio-1.5 b/metadata/md5-cache/dev-python/imageio-1.5
index c90dfa2f0eb1..bbf7beceed96 100644
--- a/metadata/md5-cache/dev-python/imageio-1.5
+++ b/metadata/md5-cache/dev-python/imageio-1.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/imageio/imageio/archive/v1.5.tar.gz -> imageio-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c748eb5f08a0dd14319bed13fd4cdc69
diff --git a/metadata/md5-cache/dev-python/imageio-1.6 b/metadata/md5-cache/dev-python/imageio-1.6
index b6ac4fa17b0f..0e35dca95d5d 100644
--- a/metadata/md5-cache/dev-python/imageio-1.6
+++ b/metadata/md5-cache/dev-python/imageio-1.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/imageio/imageio/archive/v1.6.tar.gz -> imageio-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c748eb5f08a0dd14319bed13fd4cdc69
diff --git a/metadata/md5-cache/dev-python/imageio-2.0.1 b/metadata/md5-cache/dev-python/imageio-2.0.1
index e562922218c5..13a1d0219491 100644
--- a/metadata/md5-cache/dev-python/imageio-2.0.1
+++ b/metadata/md5-cache/dev-python/imageio-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/imageio/imageio/archive/v2.0.1.tar.gz -> imageio-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c748eb5f08a0dd14319bed13fd4cdc69
diff --git a/metadata/md5-cache/dev-python/imageio-2.1.1 b/metadata/md5-cache/dev-python/imageio-2.1.1
index b6e3cb20ab42..421278e23169 100644
--- a/metadata/md5-cache/dev-python/imageio-2.1.1
+++ b/metadata/md5-cache/dev-python/imageio-2.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/imageio/imageio/archive/v2.1.1.tar.gz -> imageio-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2fbfd128e585be824a879af5dcfe1f90
diff --git a/metadata/md5-cache/dev-python/imagesize-0.7.1 b/metadata/md5-cache/dev-python/imagesize-0.7.1
index a376476dc781..a1fe045cb18d 100644
--- a/metadata/md5-cache/dev-python/imagesize-0.7.1
+++ b/metadata/md5-cache/dev-python/imagesize-0.7.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://pypi.python.org/packages/53/72/6c6f1e787d9cab2cc733cf042f125abec07209a58308831c9f292504e826/imagesize-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=057b4a74578fcccefc67cedb57a94acd
diff --git a/metadata/md5-cache/dev-python/imapclient-0.13 b/metadata/md5-cache/dev-python/imapclient-0.13
index 90f47d379cb4..eaf0ee2815bf 100644
--- a/metadata/md5-cache/dev-python/imapclient-0.13
+++ b/metadata/md5-cache/dev-python/imapclient-0.13
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,pyth
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/I/IMAPClient/IMAPClient-0.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cbcec90b3850add49503e0c9c9a09009
diff --git a/metadata/md5-cache/dev-python/imdbpy-5.0 b/metadata/md5-cache/dev-python/imdbpy-5.0
index fee5534c2c86..12d1864d6828 100644
--- a/metadata/md5-cache/dev-python/imdbpy-5.0
+++ b/metadata/md5-cache/dev-python/imdbpy-5.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/I/IMDbPY/IMDbPY-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cd1864f3c45ef898f419f84429e9555b
diff --git a/metadata/md5-cache/dev-python/imexam-0.7.1 b/metadata/md5-cache/dev-python/imexam-0.7.1
index 7e39e7bd6062..57d3828e7704 100644
--- a/metadata/md5-cache/dev-python/imexam-0.7.1
+++ b/metadata/md5-cache/dev-python/imexam-0.7.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_5
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/imexam/imexam-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1c48f57e0788b0bd555e4246d5aff4af
diff --git a/metadata/md5-cache/dev-python/iminuit-1.2 b/metadata/md5-cache/dev-python/iminuit-1.2
index e3ae5337d381..b9e8714c32ea 100644
--- a/metadata/md5-cache/dev-python/iminuit-1.2
+++ b/metadata/md5-cache/dev-python/iminuit-1.2
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/i/iminuit/iminuit-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8f4ec00d0b2e92e8e4248fbbfce096ec
diff --git a/metadata/md5-cache/dev-python/importing-1.10 b/metadata/md5-cache/dev-python/importing-1.10
index 32e3eb6f1a46..d7a6f064c61b 100644
--- a/metadata/md5-cache/dev-python/importing-1.10
+++ b/metadata/md5-cache/dev-python/importing-1.10
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/I/Importing/Importing-1.10.zip -> importing-1.10.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2c9d758085ac94dd8995472742fa03ef
diff --git a/metadata/md5-cache/dev-python/incremental-16.10.1 b/metadata/md5-cache/dev-python/incremental-16.10.1
index ae1ffb30709f..581d230c9525 100644
--- a/metadata/md5-cache/dev-python/incremental-16.10.1
+++ b/metadata/md5-cache/dev-python/incremental-16.10.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/incremental/incremental-16.10.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8262212f3e8015d911210e50d2ee50a5
diff --git a/metadata/md5-cache/dev-python/incremental-17.5.0 b/metadata/md5-cache/dev-python/incremental-17.5.0
index a9da33e6e2db..33b81b9d1afa 100644
--- a/metadata/md5-cache/dev-python/incremental-17.5.0
+++ b/metadata/md5-cache/dev-python/incremental-17.5.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_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/i/incremental/incremental-17.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=177bc03102a5723e5cdd81d6d2c9037c
diff --git a/metadata/md5-cache/dev-python/inflect-0.2.5 b/metadata/md5-cache/dev-python/inflect-0.2.5
index e87defe76487..6c229aa974d7 100644
--- a/metadata/md5-cache/dev-python/inflect-0.2.5
+++ b/metadata/md5-cache/dev-python/inflect-0.2.5
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/i/inflect/inflect-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=afdd62420a4a92a77c0c885315ffe40e
diff --git a/metadata/md5-cache/dev-python/iniparse-0.4-r2 b/metadata/md5-cache/dev-python/iniparse-0.4-r2
index eb0b64fc62b8..377f230927ed 100644
--- a/metadata/md5-cache/dev-python/iniparse-0.4-r2
+++ b/metadata/md5-cache/dev-python/iniparse-0.4-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/iniparse/iniparse-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5bfba5a8b12e5a0f123f73d8c9061103
diff --git a/metadata/md5-cache/dev-python/inotifyx-0.2.2 b/metadata/md5-cache/dev-python/inotifyx-0.2.2
index 25fd79ac502c..e73cda316618 100644
--- a/metadata/md5-cache/dev-python/inotifyx-0.2.2
+++ b/metadata/md5-cache/dev-python/inotifyx-0.2.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://launchpad.net/inotifyx/dev/v0.2.2/+download/inotifyx-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=219215bd114d3749a017c46d60a08ef2
diff --git a/metadata/md5-cache/dev-python/intervaltree-2.1.0 b/metadata/md5-cache/dev-python/intervaltree-2.1.0
index b861d17359b3..72d10db8120f 100644
--- a/metadata/md5-cache/dev-python/intervaltree-2.1.0
+++ b/metadata/md5-cache/dev-python/intervaltree-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/sortedcontainers[python_targets_python2_7(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/intervaltree/intervaltree-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=84ebcd6c6b18a1bf106bcbdcc1e42860
diff --git a/metadata/md5-cache/dev-python/iocapture-0.1.2 b/metadata/md5-cache/dev-python/iocapture-0.1.2
index 9a47a6bda72c..0630da71ee3d 100644
--- a/metadata/md5-cache/dev-python/iocapture-0.1.2
+++ b/metadata/md5-cache/dev-python/iocapture-0.1.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/oinume/iocapture/archive/0.1.2.tar.gz -> iocapture-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e57df0ae8e51cb904bf980d7a0d193d4
diff --git a/metadata/md5-cache/dev-python/iocapture-0.1.2-r1 b/metadata/md5-cache/dev-python/iocapture-0.1.2-r1
index 8e2d823fc66c..6714ad03f311 100644
--- a/metadata/md5-cache/dev-python/iocapture-0.1.2-r1
+++ b/metadata/md5-cache/dev-python/iocapture-0.1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/oinume/iocapture/archive/0.1.2.tar.gz -> iocapture-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b11b3a008605f0b96eda551f879dfea8
diff --git a/metadata/md5-cache/dev-python/ioflo-1.5.0 b/metadata/md5-cache/dev-python/ioflo-1.5.0
index c280fef89b5e..da239c008d2d 100644
--- a/metadata/md5-cache/dev-python/ioflo-1.5.0
+++ b/metadata/md5-cache/dev-python/ioflo-1.5.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/ioflo/ioflo/archive/v1.5.0.tar.gz -> ioflo-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=febbb38b7222598e64aa2ab166d2e783
diff --git a/metadata/md5-cache/dev-python/ioflo-1.7.4 b/metadata/md5-cache/dev-python/ioflo-1.7.4
index 45ce38ac39e0..86f273b81ec8 100644
--- a/metadata/md5-cache/dev-python/ioflo-1.7.4
+++ b/metadata/md5-cache/dev-python/ioflo-1.7.4
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/ioflo/ioflo/archive/v1.7.4.tar.gz -> ioflo-1.7.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0473795fe98839ba311a1b1e3b43f352
diff --git a/metadata/md5-cache/dev-python/ipaddr-2.1.11-r1 b/metadata/md5-cache/dev-python/ipaddr-2.1.11-r1
index fff67e27ef86..3f6d7234c9dd 100644
--- a/metadata/md5-cache/dev-python/ipaddr-2.1.11-r1
+++ b/metadata/md5-cache/dev-python/ipaddr-2.1.11-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipaddr/ipaddr-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1c088a95faf39e97bb326cfa587e469d
diff --git a/metadata/md5-cache/dev-python/ipaddr-2.2.0 b/metadata/md5-cache/dev-python/ipaddr-2.2.0
index 9979ceded0cb..024ef329464a 100644
--- a/metadata/md5-cache/dev-python/ipaddr-2.2.0
+++ b/metadata/md5-cache/dev-python/ipaddr-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipaddr/ipaddr-2.2.0.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6eea1f8110b6c317d4f158059a6ef6c1
diff --git a/metadata/md5-cache/dev-python/ipaddress-1.0.14 b/metadata/md5-cache/dev-python/ipaddress-1.0.14
index b7d74e013b92..858edb2602ed 100644
--- a/metadata/md5-cache/dev-python/ipaddress-1.0.14
+++ b/metadata/md5-cache/dev-python/ipaddress-1.0.14
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipaddress/ipaddress-1.0.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=aaadb8fd34eb8a32fe5dc19668548d7c
diff --git a/metadata/md5-cache/dev-python/ipaddress-1.0.18 b/metadata/md5-cache/dev-python/ipaddress-1.0.18
index 4283fad89288..5d2713c7626f 100644
--- a/metadata/md5-cache/dev-python/ipaddress-1.0.18
+++ b/metadata/md5-cache/dev-python/ipaddress-1.0.18
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipaddress/ipaddress-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=67d7b2fed9dd8b1bd4df9575a0467851
diff --git a/metadata/md5-cache/dev-python/ipaddress-1.0.19 b/metadata/md5-cache/dev-python/ipaddress-1.0.19
index 423f887c26fc..3a906bcd62f0 100644
--- a/metadata/md5-cache/dev-python/ipaddress-1.0.19
+++ b/metadata/md5-cache/dev-python/ipaddress-1.0.19
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipaddress/ipaddress-1.0.19.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f0e646e0ec08172d6603ad6aa21eb41c
diff --git a/metadata/md5-cache/dev-python/ipcalc-1.1.3 b/metadata/md5-cache/dev-python/ipcalc-1.1.3
index 5a7eb2ef7ed0..7f8030108842 100644
--- a/metadata/md5-cache/dev-python/ipcalc-1.1.3
+++ b/metadata/md5-cache/dev-python/ipcalc-1.1.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipcalc/ipcalc-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9c94fa10cd7480f5e16dee437fa659d7
diff --git a/metadata/md5-cache/dev-python/ipcalc-1.99.0 b/metadata/md5-cache/dev-python/ipcalc-1.99.0
index 93ef683be9bf..a8a3891a7070 100644
--- a/metadata/md5-cache/dev-python/ipcalc-1.99.0
+++ b/metadata/md5-cache/dev-python/ipcalc-1.99.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_t
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/tehmaze/ipcalc/archive/ipcalc-1.99.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5df63312317966394098e6f655dc4061
diff --git a/metadata/md5-cache/dev-python/ipdb-0.10.3 b/metadata/md5-cache/dev-python/ipdb-0.10.3
index 95f7de7e5c61..8d00743e34b9 100644
--- a/metadata/md5-cache/dev-python/ipdb-0.10.3
+++ b/metadata/md5-cache/dev-python/ipdb-0.10.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipdb/ipdb-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c8752bf5ff40447d71553a13c0e23fe4
diff --git a/metadata/md5-cache/dev-python/ipdbplugin-1.4 b/metadata/md5-cache/dev-python/ipdbplugin-1.4
index 9485608f7fbd..b0624814c633 100644
--- a/metadata/md5-cache/dev-python/ipdbplugin-1.4
+++ b/metadata/md5-cache/dev-python/ipdbplugin-1.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipdbplugin/ipdbplugin-1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=de6f7a7fa0f385f479a7bcecc91925d5
diff --git a/metadata/md5-cache/dev-python/ipdbplugin-9999 b/metadata/md5-cache/dev-python/ipdbplugin-9999
index 59ac802f6918..ba02fa72b61d 100644
--- a/metadata/md5-cache/dev-python/ipdbplugin-9999
+++ b/metadata/md5-cache/dev-python/ipdbplugin-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipdb dev-python/nose python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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_=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	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=de6f7a7fa0f385f479a7bcecc91925d5
diff --git a/metadata/md5-cache/dev-python/ipy-0.83 b/metadata/md5-cache/dev-python/ipy-0.83
index 8e8a0c728368..b280098c755c 100644
--- a/metadata/md5-cache/dev-python/ipy-0.83
+++ b/metadata/md5-cache/dev-python/ipy-0.83
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/I/IPy/IPy-0.83.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2483c1c12297a47d6a4868f9aa29ea7a
diff --git a/metadata/md5-cache/dev-python/ipykernel-4.6.1-r2 b/metadata/md5-cache/dev-python/ipykernel-4.6.1-r2
index 762e5e64013d..45948d720d7c 100644
--- a/metadata/md5-cache/dev-python/ipykernel-4.6.1-r2
+++ b/metadata/md5-cache/dev-python/ipykernel-4.6.1-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/ipython-4.0.0[python_targets_python2_7(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipykernel/ipykernel-4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=73df9223e0e5d6bbce4d47287be36d78
diff --git a/metadata/md5-cache/dev-python/ipykernel-4.8.2 b/metadata/md5-cache/dev-python/ipykernel-4.8.2
index c1e5753a28e2..2f9ac0e51784 100644
--- a/metadata/md5-cache/dev-python/ipykernel-4.8.2
+++ b/metadata/md5-cache/dev-python/ipykernel-4.8.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/ipython-4.0.0[python_targets_python2_7(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipykernel/ipykernel-4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dc7ec6355089cb8c298441a8c2817565
diff --git a/metadata/md5-cache/dev-python/ipynb-0.5.1 b/metadata/md5-cache/dev-python/ipynb-0.5.1
index 93a253cffd59..704044089e64 100644
--- a/metadata/md5-cache/dev-python/ipynb-0.5.1
+++ b/metadata/md5-cache/dev-python/ipynb-0.5.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/ipython/ipynb/archive/0.5.1.tar.gz -> ipynb-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=21f88e463ae790cee931d4c49cedfcf8
diff --git a/metadata/md5-cache/dev-python/ipyparallel-6.0.2-r1 b/metadata/md5-cache/dev-python/ipyparallel-6.0.2-r1
index 559637898906..2a0f9e53c8fc 100644
--- a/metadata/md5-cache/dev-python/ipyparallel-6.0.2-r1
+++ b/metadata/md5-cache/dev-python/ipyparallel-6.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipyparallel/ipyparallel-6.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fbf8bf14cfebc4e0e5b79415b34cee3c
diff --git a/metadata/md5-cache/dev-python/ipython-5.4.1-r1 b/metadata/md5-cache/dev-python/ipython-5.4.1-r1
index ae7cebd58dec..94d4c7998de2 100644
--- a/metadata/md5-cache/dev-python/ipython-5.4.1-r1
+++ b/metadata/md5-cache/dev-python/ipython-5.4.1-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipython/ipython-5.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6e8a2419861d61f866a9f1fe074e574f
diff --git a/metadata/md5-cache/dev-python/ipython-5.8.0 b/metadata/md5-cache/dev-python/ipython-5.8.0
index 3fae17a222d5..650c7504a017 100644
--- a/metadata/md5-cache/dev-python/ipython-5.8.0
+++ b/metadata/md5-cache/dev-python/ipython-5.8.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipython/ipython-5.8.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cc702243c9a26c830229450db18994c4
diff --git a/metadata/md5-cache/dev-python/ipython-6.1.0-r1 b/metadata/md5-cache/dev-python/ipython-6.1.0-r1
index f347a330a220..1e3cd41c7a75 100644
--- a/metadata/md5-cache/dev-python/ipython-6.1.0-r1
+++ b/metadata/md5-cache/dev-python/ipython-6.1.0-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/decorator[python_targets_python3_4(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipython/ipython-6.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=68927a6290f59334e6b0ec7d00e9c018
diff --git a/metadata/md5-cache/dev-python/ipython_genutils-0.2.0 b/metadata/md5-cache/dev-python/ipython_genutils-0.2.0
index 77250c9706f0..48bfb8bb52f0 100644
--- a/metadata/md5-cache/dev-python/ipython_genutils-0.2.0
+++ b/metadata/md5-cache/dev-python/ipython_genutils-0.2.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipython_genutils/ipython_genutils-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c3bb7226a1025c63c83c1dfd8553a69d
diff --git a/metadata/md5-cache/dev-python/ipywidgets-7.0.0 b/metadata/md5-cache/dev-python/ipywidgets-7.0.0
index d9f40711d43d..8c9d5f807586 100644
--- a/metadata/md5-cache/dev-python/ipywidgets-7.0.0
+++ b/metadata/md5-cache/dev-python/ipywidgets-7.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/ipykernel-4.5.1[python_targets_python2_7(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipywidgets/ipywidgets-7.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=720818941dfb969844ccccee653cac61
diff --git a/metadata/md5-cache/dev-python/irman-python-0.1-r1 b/metadata/md5-cache/dev-python/irman-python-0.1-r1
index e388e1444bca..2a7bdf7deb21 100644
--- a/metadata/md5-cache/dev-python/irman-python-0.1-r1
+++ b/metadata/md5-cache/dev-python/irman-python-0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=media-libs/libirman python_targets_python2_7? ( >=dev-lang/python-2.7.5-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://bluweb.com/chouser/proj/irman-python/irman-python-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=61fe85ccef87610e583136193d95cf4d
diff --git a/metadata/md5-cache/dev-python/iso8601-0.1.10 b/metadata/md5-cache/dev-python/iso8601-0.1.10
index 26a911d9cbea..2f7f6dafe007 100644
--- a/metadata/md5-cache/dev-python/iso8601-0.1.10
+++ b/metadata/md5-cache/dev-python/iso8601-0.1.10
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/iso8601/iso8601-0.1.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1d77fb8f5de27b837579cf24edd48839
diff --git a/metadata/md5-cache/dev-python/iso8601-0.1.11 b/metadata/md5-cache/dev-python/iso8601-0.1.11
index 912fc22e1016..013371bc06d0 100644
--- a/metadata/md5-cache/dev-python/iso8601-0.1.11
+++ b/metadata/md5-cache/dev-python/iso8601-0.1.11
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/iso8601/iso8601-0.1.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=edcaa312c4a533c8ab73196cf3217646
diff --git a/metadata/md5-cache/dev-python/iso8601-0.1.12 b/metadata/md5-cache/dev-python/iso8601-0.1.12
index fd39f0fea32f..b9af4d956a7c 100644
--- a/metadata/md5-cache/dev-python/iso8601-0.1.12
+++ b/metadata/md5-cache/dev-python/iso8601-0.1.12
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/i/iso8601/iso8601-0.1.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5954b2f543c366afdd523dee0cef12d2
diff --git a/metadata/md5-cache/dev-python/isodate-0.5.4 b/metadata/md5-cache/dev-python/isodate-0.5.4
index 9d5e6208a7ba..9dcefd4092e9 100644
--- a/metadata/md5-cache/dev-python/isodate-0.5.4
+++ b/metadata/md5-cache/dev-python/isodate-0.5.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/isodate/isodate-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=532b33e5c843bde4c5336a784d9edb8e
diff --git a/metadata/md5-cache/dev-python/isodate-0.6.0 b/metadata/md5-cache/dev-python/isodate-0.6.0
index e59d5350af68..5794854ff38d 100644
--- a/metadata/md5-cache/dev-python/isodate-0.6.0
+++ b/metadata/md5-cache/dev-python/isodate-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_t
 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/i/isodate/isodate-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8c11748d79dd14942b6e896eb6c2b685
diff --git a/metadata/md5-cache/dev-python/isort-4.2.5 b/metadata/md5-cache/dev-python/isort-4.2.5
index c73bd09249c3..ab30321bb9b6 100644
--- a/metadata/md5-cache/dev-python/isort-4.2.5
+++ b/metadata/md5-cache/dev-python/isort-4.2.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/isort/isort-4.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e759a7700878a0a62f8efff41a7ea1c1
diff --git a/metadata/md5-cache/dev-python/isort-4.3.4 b/metadata/md5-cache/dev-python/isort-4.3.4
index 706bbac0abc1..1f1fec0714f3 100644
--- a/metadata/md5-cache/dev-python/isort-4.3.4
+++ b/metadata/md5-cache/dev-python/isort-4.3.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/isort/isort-4.3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d85f2ac81e928f6d863e91b6cc025f20
diff --git a/metadata/md5-cache/dev-python/itsdangerous-0.24 b/metadata/md5-cache/dev-python/itsdangerous-0.24
index af72feaac97a..c93a2982851c 100644
--- a/metadata/md5-cache/dev-python/itsdangerous-0.24
+++ b/metadata/md5-cache/dev-python/itsdangerous-0.24
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/itsdangerous/itsdangerous-0.24.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ef3f4d37233230ad7224ee959fae8164
diff --git a/metadata/md5-cache/dev-python/jaraco-classes-1.4 b/metadata/md5-cache/dev-python/jaraco-classes-1.4
index 8f0f321fe0d0..8fd364c78eae 100644
--- a/metadata/md5-cache/dev-python/jaraco-classes-1.4
+++ b/metadata/md5-cache/dev-python/jaraco-classes-1.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.classes/jaraco.classes-1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0281887ecaf97500b1e8fed5729e3ef7
diff --git a/metadata/md5-cache/dev-python/jaraco-collections-1.5 b/metadata/md5-cache/dev-python/jaraco-collections-1.5
index e4d220d964c3..29a634942a25 100644
--- a/metadata/md5-cache/dev-python/jaraco-collections-1.5
+++ b/metadata/md5-cache/dev-python/jaraco-collections-1.5
@@ -11,5 +11,5 @@ RDEPEND=dev-python/jaraco-classes[python_targets_python2_7(-)?,python_targets_py
 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	89bb9f083a2590d9b447fd0b78a96186
+_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-logging-1.5 b/metadata/md5-cache/dev-python/jaraco-logging-1.5
index dccce68d3899..bc697556c52f 100644
--- a/metadata/md5-cache/dev-python/jaraco-logging-1.5
+++ b/metadata/md5-cache/dev-python/jaraco-logging-1.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.logging/jaraco.logging-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=335e9683a3a4e15c70817c08d46fe8ae
diff --git a/metadata/md5-cache/dev-python/jaraco-packaging-4.1 b/metadata/md5-cache/dev-python/jaraco-packaging-4.1
index 905d06f421f4..2fc2a6fe702f 100644
--- a/metadata/md5-cache/dev-python/jaraco-packaging-4.1
+++ b/metadata/md5-cache/dev-python/jaraco-packaging-4.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/six-1.4[python_targets_pypy(-)?,python_targets_pypy3(-)?,py
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.packaging/jaraco.packaging-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0e57459efd1184012ebeaa232a2ad38a
diff --git a/metadata/md5-cache/dev-python/jaraco-stream-1.1 b/metadata/md5-cache/dev-python/jaraco-stream-1.1
index 7d5b0749bbde..73f344e9c77a 100644
--- a/metadata/md5-cache/dev-python/jaraco-stream-1.1
+++ b/metadata/md5-cache/dev-python/jaraco-stream-1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.stream/jaraco.stream-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4e22bf9ab8ec3d1576cd43e078d077f1
diff --git a/metadata/md5-cache/dev-python/jaraco-stream-1.1.1 b/metadata/md5-cache/dev-python/jaraco-stream-1.1.1
index 8d6f2767b7e0..11c96b7c296c 100644
--- a/metadata/md5-cache/dev-python/jaraco-stream-1.1.1
+++ b/metadata/md5-cache/dev-python/jaraco-stream-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/more-itertools[python_targets_python2_7(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.stream/jaraco.stream-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e9d6bf73d03263ef3f7c540797485dd3
diff --git a/metadata/md5-cache/dev-python/jaraco-text-1.8 b/metadata/md5-cache/dev-python/jaraco-text-1.8
index 648e73900f45..2d4757ea028c 100644
--- a/metadata/md5-cache/dev-python/jaraco-text-1.8
+++ b/metadata/md5-cache/dev-python/jaraco-text-1.8
@@ -11,5 +11,5 @@ RDEPEND=dev-python/jaraco-functools[python_targets_python2_7(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.text/jaraco.text-1.8.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ae3b2222522853515063ac1d15e1fa83
diff --git a/metadata/md5-cache/dev-python/jaxml-3.02-r1 b/metadata/md5-cache/dev-python/jaxml-3.02-r1
index abc498d377dc..858e60b96fed 100644
--- a/metadata/md5-cache/dev-python/jaxml-3.02-r1
+++ b/metadata/md5-cache/dev-python/jaxml-3.02-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaxml/jaxml-3.02.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3bb87b612286920ecb543389b265c031
diff --git a/metadata/md5-cache/dev-python/jdcal-1.0 b/metadata/md5-cache/dev-python/jdcal-1.0
index f669c6b11a53..b95a501a1070 100644
--- a/metadata/md5-cache/dev-python/jdcal-1.0
+++ b/metadata/md5-cache/dev-python/jdcal-1.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jdcal/jdcal-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5a10e70fe2dea2cf45fa3b74471d181f
diff --git a/metadata/md5-cache/dev-python/jdcal-1.2 b/metadata/md5-cache/dev-python/jdcal-1.2
index 290a0d05fc33..2f58146f160b 100644
--- a/metadata/md5-cache/dev-python/jdcal-1.2
+++ b/metadata/md5-cache/dev-python/jdcal-1.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jdcal/jdcal-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7d6a2d74495a61be76326d000ad12120
diff --git a/metadata/md5-cache/dev-python/jedi-0.10.2 b/metadata/md5-cache/dev-python/jedi-0.10.2
index ef7c7221383a..d8f4d38f6b91 100644
--- a/metadata/md5-cache/dev-python/jedi-0.10.2
+++ b/metadata/md5-cache/dev-python/jedi-0.10.2
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/davidhalter/jedi/archive/v0.10.2.tar.gz -> jedi-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5d348bc1c9f096fbccda6f7c6e642970
diff --git a/metadata/md5-cache/dev-python/jedi-0.11.1 b/metadata/md5-cache/dev-python/jedi-0.11.1
index 76410b935312..b705fa05cc99 100644
--- a/metadata/md5-cache/dev-python/jedi-0.11.1
+++ b/metadata/md5-cache/dev-python/jedi-0.11.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/davidhalter/jedi/archive/v0.11.1.tar.gz -> jedi-0.11.1.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=60d2eb95bfa589d713343489cf5e2fe1
diff --git a/metadata/md5-cache/dev-python/jedi-0.12.0 b/metadata/md5-cache/dev-python/jedi-0.12.0
index 7e3a578f4ecf..92e7bd19709b 100644
--- a/metadata/md5-cache/dev-python/jedi-0.12.0
+++ b/metadata/md5-cache/dev-python/jedi-0.12.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/davidhalter/jedi/archive/v0.12.0.tar.gz -> jedi-0.12.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7644c27d033bfa69440bdd7bff870566
diff --git a/metadata/md5-cache/dev-python/jedi-0.12.1 b/metadata/md5-cache/dev-python/jedi-0.12.1
index 3caea26c9d68..beef7c4b5f78 100644
--- a/metadata/md5-cache/dev-python/jedi-0.12.1
+++ b/metadata/md5-cache/dev-python/jedi-0.12.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/parso-0.3.1[python_targets_python2_7(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/davidhalter/jedi/archive/v0.12.1.tar.gz -> jedi-0.12.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8a724f3f50ed48e4e0009ae9daa4751f
diff --git a/metadata/md5-cache/dev-python/jellyfish-0.5.6 b/metadata/md5-cache/dev-python/jellyfish-0.5.6
index 0caee13afecb..42106223e331 100644
--- a/metadata/md5-cache/dev-python/jellyfish-0.5.6
+++ b/metadata/md5-cache/dev-python/jellyfish-0.5.6
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jellyfish/jellyfish-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4fd5a547d51b0fe908234cbd78c5ac89
diff --git a/metadata/md5-cache/dev-python/jenkins-webapi-0.5.0 b/metadata/md5-cache/dev-python/jenkins-webapi-0.5.0
index c62a4b678351..39f527ea3dd1 100644
--- a/metadata/md5-cache/dev-python/jenkins-webapi-0.5.0
+++ b/metadata/md5-cache/dev-python/jenkins-webapi-0.5.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/requests-2.7.0[python_targets_pypy(-)?,python_targets_pytho
 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/gvalkov/jenkins-webapi/archive/v0.5.0.tar.gz -> jenkins-webapi-0.5.0.tar.gz test? ( http://mirrors.jenkins-ci.org/war-stable/1.596.3/jenkins.war -> jenkins-1.596.3.war )
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ecf053f484fc81277fcd7036f1e6817b
diff --git a/metadata/md5-cache/dev-python/jenkinsapi-0.2.26 b/metadata/md5-cache/dev-python/jenkinsapi-0.2.26
index 85d1843213ee..c582c01ce2f7 100644
--- a/metadata/md5-cache/dev-python/jenkinsapi-0.2.26
+++ b/metadata/md5-cache/dev-python/jenkinsapi-0.2.26
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pytz-2014.4[python_targets_pypy(-)?,python_targets_python2_
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://github.com/salimfadhley/jenkinsapi/archive/v0.2.26.tar.gz -> jenkinsapi-0.2.26.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=91926803a496be979756caab87ed236b
diff --git a/metadata/md5-cache/dev-python/jenkinsapi-0.2.29 b/metadata/md5-cache/dev-python/jenkinsapi-0.2.29
index 7c6b4f8e00fa..fe3c26326952 100644
--- a/metadata/md5-cache/dev-python/jenkinsapi-0.2.29
+++ b/metadata/md5-cache/dev-python/jenkinsapi-0.2.29
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pytz-2014.4[python_targets_pypy(-)?,python_targets_python2_
 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/salimfadhley/jenkinsapi/archive/v0.2.29.tar.gz -> jenkinsapi-0.2.29.tar.gz test? ( http://mirrors.jenkins-ci.org/war-stable/1.596.3/jenkins.war -> jenkins-1.596.3.war )
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=66dbb3102298acd18bcb6980d7b66961
diff --git a/metadata/md5-cache/dev-python/jinja-2.10 b/metadata/md5-cache/dev-python/jinja-2.10
index fc7c48ee6aed..17c702c2bb1e 100644
--- a/metadata/md5-cache/dev-python/jinja-2.10
+++ b/metadata/md5-cache/dev-python/jinja-2.10
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pallets/jinja/archive/2.10.tar.gz -> jinja-2.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c47bc0e75987925fd33584fb70c338a9
diff --git a/metadata/md5-cache/dev-python/jinja-2.9.5 b/metadata/md5-cache/dev-python/jinja-2.9.5
index a5d5a328dba7..e3c20eafd91a 100644
--- a/metadata/md5-cache/dev-python/jinja-2.9.5
+++ b/metadata/md5-cache/dev-python/jinja-2.9.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pallets/jinja/archive/2.9.5.tar.gz -> jinja-2.9.5.tar.gz
-_eclasses_=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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6a6289da8b0de30c46abdbc63f62d4ff
diff --git a/metadata/md5-cache/dev-python/jinja2-time-0.2.0 b/metadata/md5-cache/dev-python/jinja2-time-0.2.0
index 02e84d9b060b..017b76bdb7ce 100644
--- a/metadata/md5-cache/dev-python/jinja2-time-0.2.0
+++ b/metadata/md5-cache/dev-python/jinja2-time-0.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/arrow[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jinja2-time/jinja2-time-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8a2972d29acae463d1732c80df5f0da9
diff --git a/metadata/md5-cache/dev-python/jinja2_pluralize-0.3.0 b/metadata/md5-cache/dev-python/jinja2_pluralize-0.3.0
new file mode 100644
index 000000000000..334451d0cf2c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jinja2_pluralize-0.3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/inflect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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=Jinja2 pluralize filters
+EAPI=6
+HOMEPAGE=https://github.com/audreyr/jinja2_pluralize
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/inflect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/j/jinja2_pluralize/jinja2_pluralize-0.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_=96f16b83806a416ec223c73ff749f029
diff --git a/metadata/md5-cache/dev-python/jira-1.0.10 b/metadata/md5-cache/dev-python/jira-1.0.10
index 48ea68c74360..541efb6a9b0d 100644
--- a/metadata/md5-cache/dev-python/jira-1.0.10
+++ b/metadata/md5-cache/dev-python/jira-1.0.10
@@ -10,5 +10,5 @@ RDEPEND=dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jira/jira-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=33e56cb24d4073f32746ccf4cb94bbf7
diff --git a/metadata/md5-cache/dev-python/jira-1.0.10-r1 b/metadata/md5-cache/dev-python/jira-1.0.10-r1
index 96eeb979f5b9..a6dac61b621e 100644
--- a/metadata/md5-cache/dev-python/jira-1.0.10-r1
+++ b/metadata/md5-cache/dev-python/jira-1.0.10-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jira/jira-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fea4b1f94dafb800ea9286f87f111610
diff --git a/metadata/md5-cache/dev-python/jira-1.0.14 b/metadata/md5-cache/dev-python/jira-1.0.14
index c5866c5797bc..0a616d3546b9 100644
--- a/metadata/md5-cache/dev-python/jira-1.0.14
+++ b/metadata/md5-cache/dev-python/jira-1.0.14
@@ -10,5 +10,5 @@ RDEPEND=dev-python/defusedxml[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
 SRC_URI=mirror://pypi/j/jira/jira-1.0.14.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=73ffbdfa9847481300d0e56ce4482d9d
diff --git a/metadata/md5-cache/dev-python/jira-1.0.14-r1 b/metadata/md5-cache/dev-python/jira-1.0.14-r1
index 7059fdfb8d37..83da0853660e 100644
--- a/metadata/md5-cache/dev-python/jira-1.0.14-r1
+++ b/metadata/md5-cache/dev-python/jira-1.0.14-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/defusedxml[python_targets_python2_7(-)?,python_targets_python
 REQUIRED_USE=kerberos? ( !python_targets_python2_7 ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jira/jira-1.0.14.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4339d7b1fce5d066083e648fd5085593
diff --git a/metadata/md5-cache/dev-python/jira-1.0.5 b/metadata/md5-cache/dev-python/jira-1.0.5
index 983efbb2fcd2..7c346294291c 100644
--- a/metadata/md5-cache/dev-python/jira-1.0.5
+++ b/metadata/md5-cache/dev-python/jira-1.0.5
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/pycontribs/jira/archive/1.0.5.tar.gz -> jira-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b7712a14bd97f117c01dc8e0eed98a3a
diff --git a/metadata/md5-cache/dev-python/jmespath-0.9.3 b/metadata/md5-cache/dev-python/jmespath-0.9.3
index 8c8f26b73590..660c2dcf1062 100644
--- a/metadata/md5-cache/dev-python/jmespath-0.9.3
+++ b/metadata/md5-cache/dev-python/jmespath-0.9.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jmespath/jmespath-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=55f5502f39568711d8b9ff4e30b5c4f0
diff --git a/metadata/md5-cache/dev-python/joblib-0.10.0 b/metadata/md5-cache/dev-python/joblib-0.10.0
index 710b5b372989..3023fd954b3d 100644
--- a/metadata/md5-cache/dev-python/joblib-0.10.0
+++ b/metadata/md5-cache/dev-python/joblib-0.10.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/j/joblib/joblib-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1c8b96da02fb7d121746ac2b78f65835
diff --git a/metadata/md5-cache/dev-python/joblib-0.11 b/metadata/md5-cache/dev-python/joblib-0.11
index 1be98e4a8fbc..8e34b8d12894 100644
--- a/metadata/md5-cache/dev-python/joblib-0.11
+++ b/metadata/md5-cache/dev-python/joblib-0.11
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/j/joblib/joblib-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7e3175063e41f56a8c52ddea422a5666
diff --git a/metadata/md5-cache/dev-python/joblib-0.12.2 b/metadata/md5-cache/dev-python/joblib-0.12.2
index b0402fa635a6..39f95523aa6d 100644
--- a/metadata/md5-cache/dev-python/joblib-0.12.2
+++ b/metadata/md5-cache/dev-python/joblib-0.12.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/j/joblib/joblib-0.12.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6ae9fd02affdc13d2f781a4d75c66738
diff --git a/metadata/md5-cache/dev-python/jonpy-0.11 b/metadata/md5-cache/dev-python/jonpy-0.11
index a9bdcc70d154..9c3118de8857 100644
--- a/metadata/md5-cache/dev-python/jonpy-0.11
+++ b/metadata/md5-cache/dev-python/jonpy-0.11
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jonpy/jonpy-0.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=59b6aa8faeedd89639c8cbe68f8b8a86
diff --git a/metadata/md5-cache/dev-python/jonpy-0.13 b/metadata/md5-cache/dev-python/jonpy-0.13
index bb135b9ea6e7..e4b1eeba5026 100644
--- a/metadata/md5-cache/dev-python/jonpy-0.13
+++ b/metadata/md5-cache/dev-python/jonpy-0.13
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jonpy/jonpy-0.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a0f550520c60866f36cb904949f51b74
diff --git a/metadata/md5-cache/dev-python/josepy-1.0.1 b/metadata/md5-cache/dev-python/josepy-1.0.1
index c5c48bd17979..57f7fc314408 100644
--- a/metadata/md5-cache/dev-python/josepy-1.0.1
+++ b/metadata/md5-cache/dev-python/josepy-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/setuptools-1.0[python_targets_python2_7(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/j/josepy/josepy-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ca69fd4d4296963765bc08dc9bcf9792
diff --git a/metadata/md5-cache/dev-python/josepy-1.1.0 b/metadata/md5-cache/dev-python/josepy-1.1.0
index 5f189a2fbb39..d9e068286da8 100644
--- a/metadata/md5-cache/dev-python/josepy-1.1.0
+++ b/metadata/md5-cache/dev-python/josepy-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/setuptools-1.0[python_targets_python2_7(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/j/josepy/josepy-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ca69fd4d4296963765bc08dc9bcf9792
diff --git a/metadata/md5-cache/dev-python/jplephem-2.6 b/metadata/md5-cache/dev-python/jplephem-2.6
index 8c95caee7436..c8f13fdae4ae 100644
--- a/metadata/md5-cache/dev-python/jplephem-2.6
+++ b/metadata/md5-cache/dev-python/jplephem-2.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jplephem/jplephem-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1051ed53e42d067be86dd188d0ec46fc
diff --git a/metadata/md5-cache/dev-python/jpype-0.6.1 b/metadata/md5-cache/dev-python/jpype-0.6.1
index 4560a30acc2d..49a606e0b67a 100644
--- a/metadata/md5-cache/dev-python/jpype-0.6.1
+++ b/metadata/md5-cache/dev-python/jpype-0.6.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.2.0-r3 python_targets_python2_7? ( >=dev-lang/p
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/originell/jpype/archive/v0.6.1.zip -> jpype-0.6.1.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	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_=15cee1683cd3c9362b919b4641331bda
diff --git a/metadata/md5-cache/dev-python/jpype-0.6.2 b/metadata/md5-cache/dev-python/jpype-0.6.2
index 3365d9afe31b..c3951e865ea9 100644
--- a/metadata/md5-cache/dev-python/jpype-0.6.2
+++ b/metadata/md5-cache/dev-python/jpype-0.6.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.2.0-r3 python_targets_python2_7? ( >=dev-lang/p
 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/originell/jpype/archive/v0.6.2.zip -> jpype-0.6.2.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	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_=94aaf4aaee226c09a785393abcaf09da
diff --git a/metadata/md5-cache/dev-python/jpype-0.6.3 b/metadata/md5-cache/dev-python/jpype-0.6.3
index e2e17e8cfa08..7042cbff9564 100644
--- a/metadata/md5-cache/dev-python/jpype-0.6.3
+++ b/metadata/md5-cache/dev-python/jpype-0.6.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.2.0-r3 python_targets_python2_7? ( >=dev-lang/p
 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/originell/jpype/archive/v0.6.3.tar.gz -> jpype-0.6.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	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_=0ea188844ea4dc5798ffa1bef3ec7666
diff --git a/metadata/md5-cache/dev-python/jsmin-2.2.1 b/metadata/md5-cache/dev-python/jsmin-2.2.1
index 2aff3134ccff..3f2d742cacb2 100644
--- a/metadata/md5-cache/dev-python/jsmin-2.2.1
+++ b/metadata/md5-cache/dev-python/jsmin-2.2.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/j/jsmin/jsmin-2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=470a7e8a5c710de61f415ede05329bb5
diff --git a/metadata/md5-cache/dev-python/jsmin-2.2.2 b/metadata/md5-cache/dev-python/jsmin-2.2.2
index a9369106ced4..3cf718ae3dfd 100644
--- a/metadata/md5-cache/dev-python/jsmin-2.2.2
+++ b/metadata/md5-cache/dev-python/jsmin-2.2.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/j/jsmin/jsmin-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5f2675ddf1eb4a56d8f91f86a34bc98a
diff --git a/metadata/md5-cache/dev-python/json-rpc-1.11.0 b/metadata/md5-cache/dev-python/json-rpc-1.11.0
index c188407002fb..fe1fa55c1a7a 100644
--- a/metadata/md5-cache/dev-python/json-rpc-1.11.0
+++ b/metadata/md5-cache/dev-python/json-rpc-1.11.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/j/json-rpc/json-rpc-1.11.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4162c01713491b8e046ab933db626a22
diff --git a/metadata/md5-cache/dev-python/json-tools-0.4.0 b/metadata/md5-cache/dev-python/json-tools-0.4.0
index e263c04fc84a..7aed68db151d 100644
--- a/metadata/md5-cache/dev-python/json-tools-0.4.0
+++ b/metadata/md5-cache/dev-python/json-tools-0.4.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/colorama[python_targets_python2_7(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/j/json_tools/json_tools-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=08307251bcccce0b3f4af1dcaa3d5193
diff --git a/metadata/md5-cache/dev-python/json-tools-0.4.1 b/metadata/md5-cache/dev-python/json-tools-0.4.1
index ed1847d78fe4..0436503fefa4 100644
--- a/metadata/md5-cache/dev-python/json-tools-0.4.1
+++ b/metadata/md5-cache/dev-python/json-tools-0.4.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/colorama[python_targets_python2_7(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/j/json_tools/json_tools-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dd8a41b85839da4627ad1d52db8c8bca
diff --git a/metadata/md5-cache/dev-python/jsonmerge-1.1.0 b/metadata/md5-cache/dev-python/jsonmerge-1.1.0
index 878dccad92a4..b2346704285b 100644
--- a/metadata/md5-cache/dev-python/jsonmerge-1.1.0
+++ b/metadata/md5-cache/dev-python/jsonmerge-1.1.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonmerge/jsonmerge-1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=89985bfc701395ab9de6c13cee1a4b24
diff --git a/metadata/md5-cache/dev-python/jsonmerge-1.3.0 b/metadata/md5-cache/dev-python/jsonmerge-1.3.0
index fee355129519..4dc21fdecc9f 100644
--- a/metadata/md5-cache/dev-python/jsonmerge-1.3.0
+++ b/metadata/md5-cache/dev-python/jsonmerge-1.3.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonmerge/jsonmerge-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a15f24e992667482b2d9574ff8e5fa59
diff --git a/metadata/md5-cache/dev-python/jsonmerge-1.4.0 b/metadata/md5-cache/dev-python/jsonmerge-1.4.0
index 873ab41feae2..1c5a5034979a 100644
--- a/metadata/md5-cache/dev-python/jsonmerge-1.4.0
+++ b/metadata/md5-cache/dev-python/jsonmerge-1.4.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonmerge/jsonmerge-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8eb9e87655838a957f407b8affcef7a8
diff --git a/metadata/md5-cache/dev-python/jsonpatch-1.13 b/metadata/md5-cache/dev-python/jsonpatch-1.13
index f7f8b7bf9469..70fba8990f93 100644
--- a/metadata/md5-cache/dev-python/jsonpatch-1.13
+++ b/metadata/md5-cache/dev-python/jsonpatch-1.13
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonpatch/jsonpatch-1.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=32d80474d6fbddeb775a40307351c992
diff --git a/metadata/md5-cache/dev-python/jsonpatch-1.15 b/metadata/md5-cache/dev-python/jsonpatch-1.15
index 648ef47ac7b1..af7d5d626528 100644
--- a/metadata/md5-cache/dev-python/jsonpatch-1.15
+++ b/metadata/md5-cache/dev-python/jsonpatch-1.15
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonpatch/jsonpatch-1.15.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7dc421a90babf1625fcd3445a35b2d65
diff --git a/metadata/md5-cache/dev-python/jsonpatch-1.21 b/metadata/md5-cache/dev-python/jsonpatch-1.21
index 3c44a185ce12..0262716ebb8c 100644
--- a/metadata/md5-cache/dev-python/jsonpatch-1.21
+++ b/metadata/md5-cache/dev-python/jsonpatch-1.21
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonpatch/jsonpatch-1.21.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c1ce5992923218fd9d699b3a4bf564c4
diff --git a/metadata/md5-cache/dev-python/jsonpickle-0.9.3 b/metadata/md5-cache/dev-python/jsonpickle-0.9.3
index bc3bc848b2ce..893716b8032e 100644
--- a/metadata/md5-cache/dev-python/jsonpickle-0.9.3
+++ b/metadata/md5-cache/dev-python/jsonpickle-0.9.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/simplejson[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
 SRC_URI=mirror://pypi/j/jsonpickle/jsonpickle-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e9374f549ab2acbce7d856644c9dc5a2
diff --git a/metadata/md5-cache/dev-python/jsonpointer-1.10 b/metadata/md5-cache/dev-python/jsonpointer-1.10
index 94517bb3ec77..209da90a583c 100644
--- a/metadata/md5-cache/dev-python/jsonpointer-1.10
+++ b/metadata/md5-cache/dev-python/jsonpointer-1.10
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonpointer/jsonpointer-1.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=792f5e1fa27fee61b1b30194de47f51b
diff --git a/metadata/md5-cache/dev-python/jsonpointer-2.0 b/metadata/md5-cache/dev-python/jsonpointer-2.0
index 0048edb8c3c3..7b93cf84eb6a 100644
--- a/metadata/md5-cache/dev-python/jsonpointer-2.0
+++ b/metadata/md5-cache/dev-python/jsonpointer-2.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonpointer/jsonpointer-2.0.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d544c36dd472f076c1b741692db4bf8b
diff --git a/metadata/md5-cache/dev-python/jsonref-0.1 b/metadata/md5-cache/dev-python/jsonref-0.1
index 7f7446a44387..3e5bb00c8450 100644
--- a/metadata/md5-cache/dev-python/jsonref-0.1
+++ b/metadata/md5-cache/dev-python/jsonref-0.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/j/jsonref/jsonref-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=014373e07e44406eb6935d5935140537
diff --git a/metadata/md5-cache/dev-python/jsonrpclib-0.3.1 b/metadata/md5-cache/dev-python/jsonrpclib-0.3.1
index 214512fabca8..d9edbd219337 100644
--- a/metadata/md5-cache/dev-python/jsonrpclib-0.3.1
+++ b/metadata/md5-cache/dev-python/jsonrpclib-0.3.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/simplejson python_targets_python2_7? ( >=dev-lang/python-2.7.
 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/tcalmant/jsonrpclib/archive/v0.3.1.tar.gz -> jsonrpclib-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e597ca449e0da00f3f9c6562199f3cb1
diff --git a/metadata/md5-cache/dev-python/jsonrpclib-0_pre20110820-r1 b/metadata/md5-cache/dev-python/jsonrpclib-0_pre20110820-r1
index 5424625c0a5e..554e6e747f9d 100644
--- a/metadata/md5-cache/dev-python/jsonrpclib-0_pre20110820-r1
+++ b/metadata/md5-cache/dev-python/jsonrpclib-0_pre20110820-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/simplejson python_targets_python2_7? ( >=dev-lang/python-2.7.
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gentoo/jsonrpclib-0_pre20110820.tar.bz2
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e904edb8ae57e00d39d2608cdd720804
diff --git a/metadata/md5-cache/dev-python/jsonrpclib-9999 b/metadata/md5-cache/dev-python/jsonrpclib-9999
index bef7a98536fb..b36d94e6dc1d 100644
--- a/metadata/md5-cache/dev-python/jsonrpclib-9999
+++ b/metadata/md5-cache/dev-python/jsonrpclib-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-python/simplejson python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=d3dcc09a28153770bb4947050e72f334
diff --git a/metadata/md5-cache/dev-python/jsonschema-2.3.0 b/metadata/md5-cache/dev-python/jsonschema-2.3.0
index 297fc4f50436..462c8af62a8f 100644
--- a/metadata/md5-cache/dev-python/jsonschema-2.3.0
+++ b/metadata/md5-cache/dev-python/jsonschema-2.3.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonschema/jsonschema-2.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=758426c1a66ef382021846b5af7f6421
diff --git a/metadata/md5-cache/dev-python/jsonschema-2.4.0 b/metadata/md5-cache/dev-python/jsonschema-2.4.0
index 15cc7da9df9c..7b8e27083cca 100644
--- a/metadata/md5-cache/dev-python/jsonschema-2.4.0
+++ b/metadata/md5-cache/dev-python/jsonschema-2.4.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/j/jsonschema/jsonschema-2.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=222177a378eb720d46ef47b08579d9d0
diff --git a/metadata/md5-cache/dev-python/jsonschema-2.5.1-r2 b/metadata/md5-cache/dev-python/jsonschema-2.5.1-r2
index 6b996d848b10..111da31140d1 100644
--- a/metadata/md5-cache/dev-python/jsonschema-2.5.1-r2
+++ b/metadata/md5-cache/dev-python/jsonschema-2.5.1-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rfc3986[python_targets_pypy(-)?,python_targets_pypy3(-)?,pyth
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonschema/jsonschema-2.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6c29c027397ae03c45741659d27f3301
diff --git a/metadata/md5-cache/dev-python/jsonschema-2.6.0 b/metadata/md5-cache/dev-python/jsonschema-2.6.0
index 6875973b85bb..0bfc8d92314a 100644
--- a/metadata/md5-cache/dev-python/jsonschema-2.6.0
+++ b/metadata/md5-cache/dev-python/jsonschema-2.6.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rfc3987[python_targets_pypy(-)?,python_targets_pypy3(-)?,pyth
 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/j/jsonschema/jsonschema-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7cc766afc689df35fb70925556e0a3fe
diff --git a/metadata/md5-cache/dev-python/jsonxs-0.6 b/metadata/md5-cache/dev-python/jsonxs-0.6
index d1ef2b743d56..a7858e47c64b 100644
--- a/metadata/md5-cache/dev-python/jsonxs-0.6
+++ b/metadata/md5-cache/dev-python/jsonxs-0.6
@@ -10,5 +10,5 @@ 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_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonxs/jsonxs-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c61f1d3d94b411f5e19a946170b8ba9f
diff --git a/metadata/md5-cache/dev-python/junit-xml-1.8 b/metadata/md5-cache/dev-python/junit-xml-1.8
index de58bfe5e5ba..73db9faa385e 100644
--- a/metadata/md5-cache/dev-python/junit-xml-1.8
+++ b/metadata/md5-cache/dev-python/junit-xml-1.8
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/j/junit-xml/junit-xml-1.8.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dccb1580e58cc0ae85c309e3d164c0c4
diff --git a/metadata/md5-cache/dev-python/jupyter-1.0.0 b/metadata/md5-cache/dev-python/jupyter-1.0.0
index 080476674bb8..23f450ea05b9 100644
--- a/metadata/md5-cache/dev-python/jupyter-1.0.0
+++ b/metadata/md5-cache/dev-python/jupyter-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/notebook[python_targets_python2_7(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter/jupyter-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f2b795f4d57cd90a35e79743a3013665
diff --git a/metadata/md5-cache/dev-python/jupyter-1.0.0-r1 b/metadata/md5-cache/dev-python/jupyter-1.0.0-r1
index c3f869039399..0fe2eeadffa4 100644
--- a/metadata/md5-cache/dev-python/jupyter-1.0.0-r1
+++ b/metadata/md5-cache/dev-python/jupyter-1.0.0-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/notebook[python_targets_python2_7(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter/jupyter-1.0.0.tar.gz https://patch-diff.githubusercontent.com/raw/jupyter/jupyter/pull/198.patch -> jupyter-1.0.0-file-colision.patch
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cdd5032a2390d043194ba17a2e1bcd12
diff --git a/metadata/md5-cache/dev-python/jupyter_client-5.1.0-r1 b/metadata/md5-cache/dev-python/jupyter_client-5.1.0-r1
index 5407d8a323a1..676b25958503 100644
--- a/metadata/md5-cache/dev-python/jupyter_client-5.1.0-r1
+++ b/metadata/md5-cache/dev-python/jupyter_client-5.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_client/jupyter_client-5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=43e7e1515d4e422c4eb5d5d8a952c5a8
diff --git a/metadata/md5-cache/dev-python/jupyter_client-5.2.3 b/metadata/md5-cache/dev-python/jupyter_client-5.2.3
index b5298907ae1e..491eeff7d9fd 100644
--- a/metadata/md5-cache/dev-python/jupyter_client-5.2.3
+++ b/metadata/md5-cache/dev-python/jupyter_client-5.2.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_client/jupyter_client-5.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7aaf18ac8cb503f6d62d1edd7795b045
diff --git a/metadata/md5-cache/dev-python/jupyter_console-4.0.3 b/metadata/md5-cache/dev-python/jupyter_console-4.0.3
index ab2dff9a460e..98a51dfe5969 100644
--- a/metadata/md5-cache/dev-python/jupyter_console-4.0.3
+++ b/metadata/md5-cache/dev-python/jupyter_console-4.0.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_console/jupyter_console-4.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bb4d3487beb5626cea6372c3d80b3843
diff --git a/metadata/md5-cache/dev-python/jupyter_console-4.1.1 b/metadata/md5-cache/dev-python/jupyter_console-4.1.1
index 70373fad0ed6..5b5044ab9ee4 100644
--- a/metadata/md5-cache/dev-python/jupyter_console-4.1.1
+++ b/metadata/md5-cache/dev-python/jupyter_console-4.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_console/jupyter_console-4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e0a36aaa6ec535eebc92c23cdebb7784
diff --git a/metadata/md5-cache/dev-python/jupyter_console-5.0.0 b/metadata/md5-cache/dev-python/jupyter_console-5.0.0
index ee5e032231ab..0ed808c45a86 100644
--- a/metadata/md5-cache/dev-python/jupyter_console-5.0.0
+++ b/metadata/md5-cache/dev-python/jupyter_console-5.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_console/jupyter_console-5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=deb086a9f505e435897296ea4f6c67ca
diff --git a/metadata/md5-cache/dev-python/jupyter_console-5.1.0 b/metadata/md5-cache/dev-python/jupyter_console-5.1.0
index c7c0273cf3ca..59ec3b4d725b 100644
--- a/metadata/md5-cache/dev-python/jupyter_console-5.1.0
+++ b/metadata/md5-cache/dev-python/jupyter_console-5.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_console/jupyter_console-5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d8be756c7475c991f500e483b5a3d00d
diff --git a/metadata/md5-cache/dev-python/jupyter_core-4.4.0 b/metadata/md5-cache/dev-python/jupyter_core-4.4.0
index 1bce020fe6d4..b76975fce076 100644
--- a/metadata/md5-cache/dev-python/jupyter_core-4.4.0
+++ b/metadata/md5-cache/dev-python/jupyter_core-4.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_core/jupyter_core-4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bc462c2d2eb19c71f4d7f0d418dcba34
diff --git a/metadata/md5-cache/dev-python/jwcrypto-0.4.2 b/metadata/md5-cache/dev-python/jwcrypto-0.4.2
index cf22cf1b2f5c..8177857efc43 100644
--- a/metadata/md5-cache/dev-python/jwcrypto-0.4.2
+++ b/metadata/md5-cache/dev-python/jwcrypto-0.4.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/cryptography-1.5[python_targets_python2_7(-)?,python_target
 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/latchset/jwcrypto/archive/v0.4.2.tar.gz -> jwcrypto-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=897c038cf61a5589fa9157349411fe8f
diff --git a/metadata/md5-cache/dev-python/kaa-base-0.6.0-r1 b/metadata/md5-cache/dev-python/kaa-base-0.6.0-r1
index fc03568cdcd9..ad185f236f9d 100644
--- a/metadata/md5-cache/dev-python/kaa-base-0.6.0-r1
+++ b/metadata/md5-cache/dev-python/kaa-base-0.6.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.4.0:2 sqlite? ( dev-python/dbus-python[python_targets_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/freevo/kaa-base-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=40b50747dd2beadaea2d330c23675697
diff --git a/metadata/md5-cache/dev-python/kaa-display-0.1.0-r1 b/metadata/md5-cache/dev-python/kaa-display-0.1.0-r1
index 626151d18f96..47fc4c3eb0cf 100644
--- a/metadata/md5-cache/dev-python/kaa-display-0.1.0-r1
+++ b/metadata/md5-cache/dev-python/kaa-display-0.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/kaa-base-0.3.0[python_targets_python2_7(-)?,-python_single_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/freevo/kaa-display-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f17613beb8744f27482acda165df64f0
diff --git a/metadata/md5-cache/dev-python/kaa-imlib2-0.2.3-r2 b/metadata/md5-cache/dev-python/kaa-imlib2-0.2.3-r2
index 2476a66747f7..af207de23543 100644
--- a/metadata/md5-cache/dev-python/kaa-imlib2-0.2.3-r2
+++ b/metadata/md5-cache/dev-python/kaa-imlib2-0.2.3-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/kaa-base-0.3.0[python_targets_python2_7(-)?,-python_single_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/freevo/kaa-imlib2-0.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=aacfc803acee64b0a3cab8ddb075c3b4
diff --git a/metadata/md5-cache/dev-python/kaa-metadata-0.7.7-r1 b/metadata/md5-cache/dev-python/kaa-metadata-0.7.7-r1
index f58156b1ce62..bd357dd23a48 100644
--- a/metadata/md5-cache/dev-python/kaa-metadata-0.7.7-r1
+++ b/metadata/md5-cache/dev-python/kaa-metadata-0.7.7-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/kaa-base-0.3.0[python_targets_python2_7(-)?,-python_single_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/freevo/kaa-metadata-0.7.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=265589d50182c5a0dfac1510dc879848
diff --git a/metadata/md5-cache/dev-python/kafka-python-1.1.1 b/metadata/md5-cache/dev-python/kafka-python-1.1.1
index 1b9e8b95ea42..0de27915a3ba 100644
--- a/metadata/md5-cache/dev-python/kafka-python-1.1.1
+++ b/metadata/md5-cache/dev-python/kafka-python-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=snappy? ( dev-python/snappy[python_targets_python2_7(-)?,-python_single_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/dpkp/kafka-python/archive/1.1.1.tar.gz -> kafka-python-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=00557acea517e3a605d13eaa7c6dface
diff --git a/metadata/md5-cache/dev-python/kafka-python-1.2.0 b/metadata/md5-cache/dev-python/kafka-python-1.2.0
index 6f60a0690ead..c471bcd3a749 100644
--- a/metadata/md5-cache/dev-python/kafka-python-1.2.0
+++ b/metadata/md5-cache/dev-python/kafka-python-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=snappy? ( dev-python/snappy[python_targets_python2_7(-)?,-python_single_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/dpkp/kafka-python/archive/1.2.0.tar.gz -> kafka-python-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=00557acea517e3a605d13eaa7c6dface
diff --git a/metadata/md5-cache/dev-python/kafka-python-1.2.1 b/metadata/md5-cache/dev-python/kafka-python-1.2.1
index 2ed9ea5e3d41..c49b07603b3d 100644
--- a/metadata/md5-cache/dev-python/kafka-python-1.2.1
+++ b/metadata/md5-cache/dev-python/kafka-python-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=snappy? ( dev-python/snappy[python_targets_python2_7(-)?,-python_single_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/dpkp/kafka-python/archive/1.2.1.tar.gz -> kafka-python-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=00557acea517e3a605d13eaa7c6dface
diff --git a/metadata/md5-cache/dev-python/kafka-python-1.3.3 b/metadata/md5-cache/dev-python/kafka-python-1.3.3
index 02f803ce9f95..14251c0afe5f 100644
--- a/metadata/md5-cache/dev-python/kafka-python-1.3.3
+++ b/metadata/md5-cache/dev-python/kafka-python-1.3.3
@@ -10,5 +10,5 @@ RDEPEND=snappy? ( dev-python/snappy[python_targets_python2_7(-)?,python_targets_
 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/dpkp/kafka-python/archive/1.3.3.tar.gz -> kafka-python-1.3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2f59bfdeda9c9437d971c8d9858131a3
diff --git a/metadata/md5-cache/dev-python/kaitaistruct-0.8 b/metadata/md5-cache/dev-python/kaitaistruct-0.8
index 651ea4d39a1f..f2523d9af2d8 100644
--- a/metadata/md5-cache/dev-python/kaitaistruct-0.8
+++ b/metadata/md5-cache/dev-python/kaitaistruct-0.8
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/k/kaitaistruct/kaitaistruct-0.8.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=25737a3a834cccad8d655e9204ce1cab
diff --git a/metadata/md5-cache/dev-python/kazoo-2.2.1 b/metadata/md5-cache/dev-python/kazoo-2.2.1
index 46959e7ac032..11048cb97100 100644
--- a/metadata/md5-cache/dev-python/kazoo-2.2.1
+++ b/metadata/md5-cache/dev-python/kazoo-2.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/k/kazoo/kazoo-2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2d6e4341bb9721c1ccf14319d1e07669
diff --git a/metadata/md5-cache/dev-python/kazoo-2.5.0 b/metadata/md5-cache/dev-python/kazoo-2.5.0
new file mode 100644
index 000000000000..a81a5ae16aca
--- /dev/null
+++ b/metadata/md5-cache/dev-python/kazoo-2.5.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_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(-)] gevent? ( dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_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(-)] 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(-)] ) test? ( dev-python/mock[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=A high-level Python library that makes it easier to use Apache Zookeeper
+EAPI=6
+HOMEPAGE=https://kazoo.readthedocs.org/ https://github.com/python-zk/kazoo/ https://pypi.org/project/kazoo/
+IUSE=doc gevent 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
+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_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(-)] gevent? ( dev-python/gevent[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 ) 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
+SLOT=0
+SRC_URI=mirror://pypi/k/kazoo/kazoo-2.5.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_=74a342f0a5ada8769a2982b7776401b5
diff --git a/metadata/md5-cache/dev-python/keepassx-0.1.0-r1 b/metadata/md5-cache/dev-python/keepassx-0.1.0-r1
index 5dfa1b495b3c..4d6bcdc5f482 100644
--- a/metadata/md5-cache/dev-python/keepassx-0.1.0-r1
+++ b/metadata/md5-cache/dev-python/keepassx-0.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=|| ( dev-python/pycryptodome[python_targets_python2_7(-)?,python_targets
 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/jamesls/python-keepassx/archive/0.1.0.tar.gz -> keepassx-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=413de68ba5e340209fc61b13f1b75dc8
diff --git a/metadata/md5-cache/dev-python/keyczar-0.715 b/metadata/md5-cache/dev-python/keyczar-0.715
index 6a7344d69a47..745386115280 100644
--- a/metadata/md5-cache/dev-python/keyczar-0.715
+++ b/metadata/md5-cache/dev-python/keyczar-0.715
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-keyczar/python-keyczar-0.715.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0c3d928c4c18f426a8ad3d8a9e8e6398
diff --git a/metadata/md5-cache/dev-python/keyring-12.2.1 b/metadata/md5-cache/dev-python/keyring-12.2.1
index fa7dabe20e57..be59c53afc95 100644
--- a/metadata/md5-cache/dev-python/keyring-12.2.1
+++ b/metadata/md5-cache/dev-python/keyring-12.2.1
@@ -10,5 +10,5 @@ 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_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/k/keyring/keyring-12.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f272e0d4e5238298c921294dbf793bce
diff --git a/metadata/md5-cache/dev-python/keyring-13.2.1 b/metadata/md5-cache/dev-python/keyring-13.2.1
index c35b79a7692f..e1f9db119e97 100644
--- a/metadata/md5-cache/dev-python/keyring-13.2.1
+++ b/metadata/md5-cache/dev-python/keyring-13.2.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/k/keyring/keyring-13.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=450f98cb4f1ea896dec6a5eb75f10843
diff --git a/metadata/md5-cache/dev-python/keyrings_alt-2.3 b/metadata/md5-cache/dev-python/keyrings_alt-2.3
index 05991f1314ef..c1d0b43e28e9 100644
--- a/metadata/md5-cache/dev-python/keyrings_alt-2.3
+++ b/metadata/md5-cache/dev-python/keyrings_alt-2.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/k/keyrings.alt/keyrings.alt-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5ad8a6d3e2361477518b040078ed6838
diff --git a/metadata/md5-cache/dev-python/keystoneauth-3.1.0 b/metadata/md5-cache/dev-python/keystoneauth-3.1.0
index 3853bfced679..a3f9497e2248 100644
--- a/metadata/md5-cache/dev-python/keystoneauth-3.1.0
+++ b/metadata/md5-cache/dev-python/keystoneauth-3.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/k/keystoneauth1/keystoneauth1-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4807ea4842df0930fb1f566926e5e7f7
diff --git a/metadata/md5-cache/dev-python/keystoneauth-3.10.0 b/metadata/md5-cache/dev-python/keystoneauth-3.10.0
index 866f355af684..820cbed5f1ca 100644
--- a/metadata/md5-cache/dev-python/keystoneauth-3.10.0
+++ b/metadata/md5-cache/dev-python/keystoneauth-3.10.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/k/keystoneauth1/keystoneauth1-3.10.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1f374caef5ee9ba1beb67926592842e7
diff --git a/metadata/md5-cache/dev-python/keystoneauth-3.4.0 b/metadata/md5-cache/dev-python/keystoneauth-3.4.0
index 20938be8b402..cddb89f9071f 100644
--- a/metadata/md5-cache/dev-python/keystoneauth-3.4.0
+++ b/metadata/md5-cache/dev-python/keystoneauth-3.4.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/k/keystoneauth1/keystoneauth1-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=377eb0fbfbb6d6e106c55db8f4875a64
diff --git a/metadata/md5-cache/dev-python/keystonemiddleware-4.17.0 b/metadata/md5-cache/dev-python/keystonemiddleware-4.17.0
index f001173d07d5..36cb8ae7bedc 100644
--- a/metadata/md5-cache/dev-python/keystonemiddleware-4.17.0
+++ b/metadata/md5-cache/dev-python/keystonemiddleware-4.17.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/k/keystonemiddleware/keystonemiddleware-4.17.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ec5bc65b8d48cf233503b2273891f928
diff --git a/metadata/md5-cache/dev-python/keystonemiddleware-4.21.0 b/metadata/md5-cache/dev-python/keystonemiddleware-4.21.0
index 9f5f7f04e546..937d24ced468 100644
--- a/metadata/md5-cache/dev-python/keystonemiddleware-4.21.0
+++ b/metadata/md5-cache/dev-python/keystonemiddleware-4.21.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/k/keystonemiddleware/keystonemiddleware-4.21.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=21d56f9359a1c73949a3bc89f88c0a61
diff --git a/metadata/md5-cache/dev-python/kid-0.9.6-r1 b/metadata/md5-cache/dev-python/kid-0.9.6-r1
index 0c11799d400a..2235428337ec 100644
--- a/metadata/md5-cache/dev-python/kid-0.9.6-r1
+++ b/metadata/md5-cache/dev-python/kid-0.9.6-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=http://www.kid-templating.org/dist/0.9.6/kid-0.9.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=301b6cac5f4387f4362ce0127c0dc9ea
diff --git a/metadata/md5-cache/dev-python/kitchen-1.2.4 b/metadata/md5-cache/dev-python/kitchen-1.2.4
index 0fab9505ee30..83433aef7d7d 100644
--- a/metadata/md5-cache/dev-python/kitchen-1.2.4
+++ b/metadata/md5-cache/dev-python/kitchen-1.2.4
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/k/kitchen/kitchen-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d5d1c8156a5b746bb61ec1b90366661e
diff --git a/metadata/md5-cache/dev-python/kitchen-1.2.5 b/metadata/md5-cache/dev-python/kitchen-1.2.5
index 7aa982b74d6b..003246cb3704 100644
--- a/metadata/md5-cache/dev-python/kitchen-1.2.5
+++ b/metadata/md5-cache/dev-python/kitchen-1.2.5
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/k/kitchen/kitchen-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0779146e974d0823764441f3360a8940
diff --git a/metadata/md5-cache/dev-python/kivy-garden-0.1.1 b/metadata/md5-cache/dev-python/kivy-garden-0.1.1
index 8440fef15fca..ea65b9b73378 100644
--- a/metadata/md5-cache/dev-python/kivy-garden-0.1.1
+++ b/metadata/md5-cache/dev-python/kivy-garden-0.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/k/kivy-garden/kivy-garden-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=650df564dd8a66126dfefa6ba903a45b
diff --git a/metadata/md5-cache/dev-python/kivy-garden-0.1.4 b/metadata/md5-cache/dev-python/kivy-garden-0.1.4
index b4fb421d3177..0c96fd77c843 100644
--- a/metadata/md5-cache/dev-python/kivy-garden-0.1.4
+++ b/metadata/md5-cache/dev-python/kivy-garden-0.1.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://pypi.io/packages/source/k/kivy-garden/kivy-garden-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f1c17d2ccad2ad52cbf578eeb71be15c
diff --git a/metadata/md5-cache/dev-python/kiwisolver-1.0.1 b/metadata/md5-cache/dev-python/kiwisolver-1.0.1
index a9a22e2c4814..5d976c3a883f 100644
--- a/metadata/md5-cache/dev-python/kiwisolver-1.0.1
+++ b/metadata/md5-cache/dev-python/kiwisolver-1.0.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/nucleic/kiwi/archive/1.0.1.tar.gz -> kiwisolver-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=db8ef815453d63750526abcfbbab9971
diff --git a/metadata/md5-cache/dev-python/kombu-4.1.0-r1 b/metadata/md5-cache/dev-python/kombu-4.1.0-r1
index e865d8a1f852..ac1825f59ee6 100644
--- a/metadata/md5-cache/dev-python/kombu-4.1.0-r1
+++ b/metadata/md5-cache/dev-python/kombu-4.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/py-amqp-2.1.4[python_targets_python2_7(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/k/kombu/kombu-4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6467ef2413effc00da8fc557a187f6b0
diff --git a/metadata/md5-cache/dev-python/kombu-4.2.1 b/metadata/md5-cache/dev-python/kombu-4.2.1
index 792fd82220a2..64028bbf43d6 100644
--- a/metadata/md5-cache/dev-python/kombu-4.2.1
+++ b/metadata/md5-cache/dev-python/kombu-4.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/py-amqp-2.1.4[python_targets_python2_7(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/k/kombu/kombu-4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=751c88d07b29057d2abd5a2df3168085
diff --git a/metadata/md5-cache/dev-python/larch-1.20130808 b/metadata/md5-cache/dev-python/larch-1.20130808
index cad52a9b5df4..bfdbda1574c2 100644
--- a/metadata/md5-cache/dev-python/larch-1.20130808
+++ b/metadata/md5-cache/dev-python/larch-1.20130808
@@ -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=http://code.liw.fi/debian/pool/main/p/python-larch/python-larch_1.20130808.orig.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=342cae3d0c53c0c7ab648bd65d40b888
diff --git a/metadata/md5-cache/dev-python/larch-1.20131130 b/metadata/md5-cache/dev-python/larch-1.20131130
index 91eb13e6d93e..598af21281b4 100644
--- a/metadata/md5-cache/dev-python/larch-1.20131130
+++ b/metadata/md5-cache/dev-python/larch-1.20131130
@@ -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=http://code.liw.fi/debian/pool/main/p/python-larch/python-larch_1.20131130.orig.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=342cae3d0c53c0c7ab648bd65d40b888
diff --git a/metadata/md5-cache/dev-python/lazr-config-2.2.1 b/metadata/md5-cache/dev-python/lazr-config-2.2.1
index fcf805266c33..c44d3b04802e 100644
--- a/metadata/md5-cache/dev-python/lazr-config-2.2.1
+++ b/metadata/md5-cache/dev-python/lazr-config-2.2.1
@@ -10,5 +10,5 @@ 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
 SRC_URI=mirror://pypi/l/lazr.config/lazr.config-2.2.1.tar.gz -> lazr-config-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=03e50fd32f091ea422c1f6e4a8d017a1
diff --git a/metadata/md5-cache/dev-python/lazr-delegates-2.0.4 b/metadata/md5-cache/dev-python/lazr-delegates-2.0.4
index a9e247989875..dc75e07872fd 100644
--- a/metadata/md5-cache/dev-python/lazr-delegates-2.0.4
+++ b/metadata/md5-cache/dev-python/lazr-delegates-2.0.4
@@ -10,5 +10,5 @@ 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
 SRC_URI=mirror://pypi/l/lazr.delegates/lazr.delegates-2.0.4.tar.gz -> lazr-delegates-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b0ff0dd9def17cb1bd56e256f76dd5b0
diff --git a/metadata/md5-cache/dev-python/lazy-object-proxy-1.2.1 b/metadata/md5-cache/dev-python/lazy-object-proxy-1.2.1
index 2c5bbcad5769..e14229ff27ac 100644
--- a/metadata/md5-cache/dev-python/lazy-object-proxy-1.2.1
+++ b/metadata/md5-cache/dev-python/lazy-object-proxy-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/l/lazy-object-proxy/lazy-object-proxy-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6a66c98fee85fbffd0bd07491c2167bc
diff --git a/metadata/md5-cache/dev-python/lazy-object-proxy-1.3.1 b/metadata/md5-cache/dev-python/lazy-object-proxy-1.3.1
index c9d77ee1586a..50bfcd6a8887 100644
--- a/metadata/md5-cache/dev-python/lazy-object-proxy-1.3.1
+++ b/metadata/md5-cache/dev-python/lazy-object-proxy-1.3.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/l/lazy-object-proxy/lazy-object-proxy-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=55b8e8beccfa26042ddd837ce01cb2c1
diff --git a/metadata/md5-cache/dev-python/ldap3-2.2.3 b/metadata/md5-cache/dev-python/ldap3-2.2.3
index 25718be458b1..e05e217ab50d 100644
--- a/metadata/md5-cache/dev-python/ldap3-2.2.3
+++ b/metadata/md5-cache/dev-python/ldap3-2.2.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/l/ldap3/ldap3-2.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4bdf7b16b2468a8f1a97ac4363679b21
diff --git a/metadata/md5-cache/dev-python/ldap3-2.4.1 b/metadata/md5-cache/dev-python/ldap3-2.4.1
index 47757ae4ccd6..a58467bbd4f5 100644
--- a/metadata/md5-cache/dev-python/ldap3-2.4.1
+++ b/metadata/md5-cache/dev-python/ldap3-2.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/l/ldap3/ldap3-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a427ca00e3c4c9e51621bb6bd39ae2be
diff --git a/metadata/md5-cache/dev-python/ldap3-2.5.1 b/metadata/md5-cache/dev-python/ldap3-2.5.1
index e856ccb6b00c..aa7eea3b13a7 100644
--- a/metadata/md5-cache/dev-python/ldap3-2.5.1
+++ b/metadata/md5-cache/dev-python/ldap3-2.5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/l/ldap3/ldap3-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a427ca00e3c4c9e51621bb6bd39ae2be
diff --git a/metadata/md5-cache/dev-python/ldappool-1.0 b/metadata/md5-cache/dev-python/ldappool-1.0
index 434a5c54b2f1..6205d17bc791 100644
--- a/metadata/md5-cache/dev-python/ldappool-1.0
+++ b/metadata/md5-cache/dev-python/ldappool-1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/l/ldappool/ldappool-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bb4efce07ab0fadc80d98272e4f6d6d1
diff --git a/metadata/md5-cache/dev-python/ldappool-2.0.0 b/metadata/md5-cache/dev-python/ldappool-2.0.0
index ba381120d6f8..ef034d6dc9fc 100644
--- a/metadata/md5-cache/dev-python/ldappool-2.0.0
+++ b/metadata/md5-cache/dev-python/ldappool-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pyldap-2.4[python_targets_python2_7(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/l/ldappool/ldappool-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7d1137794fadfa14adf9219fb935addd
diff --git a/metadata/md5-cache/dev-python/ldappool-2.1.0 b/metadata/md5-cache/dev-python/ldappool-2.1.0
index aca844d63248..ac8dd7321985 100644
--- a/metadata/md5-cache/dev-python/ldappool-2.1.0
+++ b/metadata/md5-cache/dev-python/ldappool-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pyldap-2.4.20[python_targets_python2_7(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/l/ldappool/ldappool-2.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d62d8396d3298cf320b3cecc29d73e52
diff --git a/metadata/md5-cache/dev-python/lesscpy-0.11.1 b/metadata/md5-cache/dev-python/lesscpy-0.11.1
index 9a0e2c077311..8219dacc48f8 100644
--- a/metadata/md5-cache/dev-python/lesscpy-0.11.1
+++ b/metadata/md5-cache/dev-python/lesscpy-0.11.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/l/lesscpy/lesscpy-0.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=92022f521979ee7d517fb480b974c1c2
diff --git a/metadata/md5-cache/dev-python/lesscpy-0.13.0 b/metadata/md5-cache/dev-python/lesscpy-0.13.0
index d43d2ddf2290..8304d15ee39c 100644
--- a/metadata/md5-cache/dev-python/lesscpy-0.13.0
+++ b/metadata/md5-cache/dev-python/lesscpy-0.13.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/l/lesscpy/lesscpy-0.13.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8e99619ccf33e25a01a0c8b56dcf8d4b
diff --git a/metadata/md5-cache/dev-python/lesscpy-0.9j b/metadata/md5-cache/dev-python/lesscpy-0.9j
index f1f31a7b18f3..360dbd9d858a 100644
--- a/metadata/md5-cache/dev-python/lesscpy-0.9j
+++ b/metadata/md5-cache/dev-python/lesscpy-0.9j
@@ -10,5 +10,5 @@ RDEPEND=dev-python/ply[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/l/lesscpy/lesscpy-0.9j.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=314caca486a3acf0e410bcf3f08c6129
diff --git a/metadata/md5-cache/dev-python/libarchive-c-2.7 b/metadata/md5-cache/dev-python/libarchive-c-2.7
index ee38bef6deb7..6c5bf655a02e 100644
--- a/metadata/md5-cache/dev-python/libarchive-c-2.7
+++ b/metadata/md5-cache/dev-python/libarchive-c-2.7
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/l/libarchive-c/libarchive-c-2.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=c59f8e2acf03092dfd7bb3b430310f34
diff --git a/metadata/md5-cache/dev-python/libasyncns-python-0.7.1-r1 b/metadata/md5-cache/dev-python/libasyncns-python-0.7.1-r1
index 9b23985e550a..0d61a35f3d3a 100644
--- a/metadata/md5-cache/dev-python/libasyncns-python-0.7.1-r1
+++ b/metadata/md5-cache/dev-python/libasyncns-python-0.7.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/libasyncns-0.4 python_targets_pypy? ( >=virtual/pypy-5:0= ) p
 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://launchpad.net/libasyncns-python/trunk/0.7.1/+download/libasyncns-python-0.7.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1297800e179e180364af1c95acab529a
diff --git a/metadata/md5-cache/dev-python/libbonobo-python-2.28.1-r1 b/metadata/md5-cache/dev-python/libbonobo-python-2.28.1-r1
index d7e6931ec6d7..b6345748a97a 100644
--- a/metadata/md5-cache/dev-python/libbonobo-python-2.28.1-r1
+++ b/metadata/md5-cache/dev-python/libbonobo-python-2.28.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-python/2.28/gnome-python-2.28.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome-python-common-r1	4b3f4780086f96814cde64b8e5ea23c5	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome-python-common-r1	4b3f4780086f96814cde64b8e5ea23c5	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ee83b073ea3dc0177bd639605ca7d444
diff --git a/metadata/md5-cache/dev-python/libcloud-0.15.1 b/metadata/md5-cache/dev-python/libcloud-0.15.1
index ba2472909c09..ac36e5b3c37d 100644
--- a/metadata/md5-cache/dev-python/libcloud-0.15.1
+++ b/metadata/md5-cache/dev-python/libcloud-0.15.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[ssl(+)] ) python_targets_pyth
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://apache/libcloud/apache-libcloud-0.15.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4279e9825e4a0be3fac803b5db3b06c7
diff --git a/metadata/md5-cache/dev-python/libcloud-1.2.1 b/metadata/md5-cache/dev-python/libcloud-1.2.1
index 84030dbb1c73..a078ccced0f3 100644
--- a/metadata/md5-cache/dev-python/libcloud-1.2.1
+++ b/metadata/md5-cache/dev-python/libcloud-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[ssl(+)] ) python_targets_pyth
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://apache/libcloud/apache-libcloud-1.2.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d8f0ee82a09c51b986459c5951f5935d
diff --git a/metadata/md5-cache/dev-python/libcloud-1.5.0 b/metadata/md5-cache/dev-python/libcloud-1.5.0
index 1ccf69cc8501..8f033e99338f 100644
--- a/metadata/md5-cache/dev-python/libcloud-1.5.0
+++ b/metadata/md5-cache/dev-python/libcloud-1.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/libcloud/apache-libcloud-1.5.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5bacdc9888c355f5dd9a618ed689a18e
diff --git a/metadata/md5-cache/dev-python/libextractor-python-0.6-r1 b/metadata/md5-cache/dev-python/libextractor-python-0.6-r1
index aa7a8c3bb3a8..a4acb1d08523 100644
--- a/metadata/md5-cache/dev-python/libextractor-python-0.6-r1
+++ b/metadata/md5-cache/dev-python/libextractor-python-0.6-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libextractor-0.6.3 python_targets_pypy? ( >=virtual/pypy-5:
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gnu/libextractor/libextractor-python-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9f4a7fc9c28087a8d398350aada735fc
diff --git a/metadata/md5-cache/dev-python/libgnome-python-2.28.1-r1 b/metadata/md5-cache/dev-python/libgnome-python-2.28.1-r1
index 3641afbefd0a..5d6ff570679a 100644
--- a/metadata/md5-cache/dev-python/libgnome-python-2.28.1-r1
+++ b/metadata/md5-cache/dev-python/libgnome-python-2.28.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-python/2.28/gnome-python-2.28.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome-python-common-r1	4b3f4780086f96814cde64b8e5ea23c5	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome-python-common-r1	4b3f4780086f96814cde64b8e5ea23c5	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=830ec66eb11ae33cdf9ad4da73a5f733
diff --git a/metadata/md5-cache/dev-python/libgnomecanvas-python-2.28.1-r1 b/metadata/md5-cache/dev-python/libgnomecanvas-python-2.28.1-r1
index 8f9725a6a2c3..61cde4c58271 100644
--- a/metadata/md5-cache/dev-python/libgnomecanvas-python-2.28.1-r1
+++ b/metadata/md5-cache/dev-python/libgnomecanvas-python-2.28.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-python/2.28/gnome-python-2.28.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome-python-common-r1	4b3f4780086f96814cde64b8e5ea23c5	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome-python-common-r1	4b3f4780086f96814cde64b8e5ea23c5	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0b547f3fbea472a5c10e150eeae31c4d
diff --git a/metadata/md5-cache/dev-python/libiscsi-python-0_pre160211 b/metadata/md5-cache/dev-python/libiscsi-python-0_pre160211
index 4d171a187dc0..592a1cf656df 100644
--- a/metadata/md5-cache/dev-python/libiscsi-python-0_pre160211
+++ b/metadata/md5-cache/dev-python/libiscsi-python-0_pre160211
@@ -10,5 +10,5 @@ RDEPEND=net-libs/libiscsi python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/sahlberg/libiscsi-python/archive/a8f548c2700dbe3dadfe048fa2491c7b77cf7846.zip -> libiscsi-python-0_pre160211.zip
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=77865c499622a61e03a24641912e8ab5
diff --git a/metadata/md5-cache/dev-python/libiscsi-python-9999 b/metadata/md5-cache/dev-python/libiscsi-python-9999
index ea9b52e6f382..a7ea9f4067d9 100644
--- a/metadata/md5-cache/dev-python/libiscsi-python-9999
+++ b/metadata/md5-cache/dev-python/libiscsi-python-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=net-libs/libiscsi python_targets_python2_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_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=20a7200be8afd4f03a3fac0ae4ccb98b
diff --git a/metadata/md5-cache/dev-python/liblarch-2.1.0 b/metadata/md5-cache/dev-python/liblarch-2.1.0
index 176eaa1c5bee..1550d083520f 100644
--- a/metadata/md5-cache/dev-python/liblarch-2.1.0
+++ b/metadata/md5-cache/dev-python/liblarch-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://gtg.fritalk.com/publique/gtg.fritalk.com/liblarch/2.1.0/liblarch-2.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=666cfea545838d6bd8044c6bb21a83a2
diff --git a/metadata/md5-cache/dev-python/libnacl-1.4.4 b/metadata/md5-cache/dev-python/libnacl-1.4.4
index df631d92e762..2384dd1e6fd5 100644
--- a/metadata/md5-cache/dev-python/libnacl-1.4.4
+++ b/metadata/md5-cache/dev-python/libnacl-1.4.4
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libsodium python_targets_python2_7? ( >=dev-lang/python-2.7.5-r
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/l/libnacl/libnacl-1.4.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7f142c3c7a4ff5aa5e6778a4a324b694
diff --git a/metadata/md5-cache/dev-python/libnacl-1.6.1 b/metadata/md5-cache/dev-python/libnacl-1.6.1
index 68b9a49e3e6b..20c1ef8ffbfd 100644
--- a/metadata/md5-cache/dev-python/libnacl-1.6.1
+++ b/metadata/md5-cache/dev-python/libnacl-1.6.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libsodium python_targets_python2_7? ( >=dev-lang/python-2.7.5-r
 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/saltstack/libnacl/archive/v1.6.1.tar.gz -> libnacl-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=17eaa5ab23551b1eb2f24e13e95f9a48
diff --git a/metadata/md5-cache/dev-python/libnatpmp-20130911 b/metadata/md5-cache/dev-python/libnatpmp-20130911
index f416c54288d6..f56f91e5cfc5 100644
--- a/metadata/md5-cache/dev-python/libnatpmp-20130911
+++ b/metadata/md5-cache/dev-python/libnatpmp-20130911
@@ -10,5 +10,5 @@ RDEPEND==net-libs/libnatpmp-20130911 python_targets_pypy? ( >=virtual/pypy-5:0=
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://miniupnp.free.fr/files/download.php?file=libnatpmp-20130911.tar.gz -> libnatpmp-20130911.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c2816ad25d406f275afad2b116dc89a8
diff --git a/metadata/md5-cache/dev-python/libnatpmp-20140401-r1 b/metadata/md5-cache/dev-python/libnatpmp-20140401-r1
index 817c27e3d5d3..fbd0a6a09ece 100644
--- a/metadata/md5-cache/dev-python/libnatpmp-20140401-r1
+++ b/metadata/md5-cache/dev-python/libnatpmp-20140401-r1
@@ -10,5 +10,5 @@ RDEPEND=~net-libs/libnatpmp-20140401 python_targets_pypy? ( >=virtual/pypy-5:0=
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://miniupnp.free.fr/files/download.php?file=libnatpmp-20140401.tar.gz -> libnatpmp-20140401.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b375f5ba273b0550fae28751709d79d9
diff --git a/metadata/md5-cache/dev-python/libnatpmp-20150609 b/metadata/md5-cache/dev-python/libnatpmp-20150609
index 594f5f897304..645e1e7b1608 100644
--- a/metadata/md5-cache/dev-python/libnatpmp-20150609
+++ b/metadata/md5-cache/dev-python/libnatpmp-20150609
@@ -10,5 +10,5 @@ RDEPEND=~net-libs/libnatpmp-20150609 python_targets_pypy? ( >=virtual/pypy-5:0=
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://miniupnp.free.fr/files/download.php?file=libnatpmp-20150609.tar.gz -> libnatpmp-20150609.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b375f5ba273b0550fae28751709d79d9
diff --git a/metadata/md5-cache/dev-python/libpillowfight-0.2.2 b/metadata/md5-cache/dev-python/libpillowfight-0.2.2
index 20f7779e6c64..8ba2a3414caa 100644
--- a/metadata/md5-cache/dev-python/libpillowfight-0.2.2
+++ b/metadata/md5-cache/dev-python/libpillowfight-0.2.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/openpaperwork/libpillowfight/archive/0.2.2.tar.gz -> libpillowfight-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3a5de6ad16c725d4f84606903756da56
diff --git a/metadata/md5-cache/dev-python/libpillowfight-0.2.3-r1 b/metadata/md5-cache/dev-python/libpillowfight-0.2.3-r1
index 28563e48c0fa..dd1d267ffc7f 100644
--- a/metadata/md5-cache/dev-python/libpillowfight-0.2.3-r1
+++ b/metadata/md5-cache/dev-python/libpillowfight-0.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pypillowfight/pypillowfight-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fc66c5b2844c26f3a6e54debb190757c
diff --git a/metadata/md5-cache/dev-python/libpillowfight-0.2.4 b/metadata/md5-cache/dev-python/libpillowfight-0.2.4
index f2ac0e622dcf..9af953c95299 100644
--- a/metadata/md5-cache/dev-python/libpillowfight-0.2.4
+++ b/metadata/md5-cache/dev-python/libpillowfight-0.2.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pypillowfight/pypillowfight-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fc66c5b2844c26f3a6e54debb190757c
diff --git a/metadata/md5-cache/dev-python/librharris-0.1.14-r1 b/metadata/md5-cache/dev-python/librharris-0.1.14-r1
index 2cfd500c1ee4..ad8277b335f6 100644
--- a/metadata/md5-cache/dev-python/librharris-0.1.14-r1
+++ b/metadata/md5-cache/dev-python/librharris-0.1.14-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=mirror://pypi/l/lib_rharris/lib_rharris-0.1.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f697424862cbc35641ed7c362ad1ff8b
diff --git a/metadata/md5-cache/dev-python/librsvg-python-2.32.0-r1 b/metadata/md5-cache/dev-python/librsvg-python-2.32.0-r1
index 705912857632..8101d3182a9e 100644
--- a/metadata/md5-cache/dev-python/librsvg-python-2.32.0-r1
+++ b/metadata/md5-cache/dev-python/librsvg-python-2.32.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-python-desktop/2.32/gnome-python-desktop-2.32.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome-python-common-r1	4b3f4780086f96814cde64b8e5ea23c5	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome-python-common-r1	4b3f4780086f96814cde64b8e5ea23c5	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=996fb1e05c7139c471fbe41ee7694755
diff --git a/metadata/md5-cache/dev-python/libvirt-python-4.3.0-r1 b/metadata/md5-cache/dev-python/libvirt-python-4.3.0-r1
index aaea79770c67..62602070f12c 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-4.3.0-r1
+++ b/metadata/md5-cache/dev-python/libvirt-python-4.3.0-r1
@@ -10,5 +10,5 @@ RDEPEND=app-emulation/libvirt:0/4.3.0 python_targets_python2_7? ( >=dev-lang/pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://libvirt.org/sources/python/libvirt-python-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2b57d7b440fa88a9a665c84e7fa6caf4
diff --git a/metadata/md5-cache/dev-python/libvirt-python-4.4.0 b/metadata/md5-cache/dev-python/libvirt-python-4.4.0
index 0d5c08ceeb61..548380bd4dec 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-4.4.0
+++ b/metadata/md5-cache/dev-python/libvirt-python-4.4.0
@@ -10,5 +10,5 @@ RDEPEND=app-emulation/libvirt:0/4.4.0 python_targets_python2_7? ( >=dev-lang/pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://libvirt.org/sources/python/libvirt-python-4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2ab66a99c4a3d44509d7422a57f19368
diff --git a/metadata/md5-cache/dev-python/libvirt-python-4.5.0 b/metadata/md5-cache/dev-python/libvirt-python-4.5.0
index 1f4ee30428e3..116a61aa4afe 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-4.5.0
+++ b/metadata/md5-cache/dev-python/libvirt-python-4.5.0
@@ -10,5 +10,5 @@ RDEPEND=app-emulation/libvirt:0/4.5.0 python_targets_python2_7? ( >=dev-lang/pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://libvirt.org/sources/python/libvirt-python-4.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3e3b875e221072a55a2cb9dc9198d849
diff --git a/metadata/md5-cache/dev-python/libvirt-python-4.6.0 b/metadata/md5-cache/dev-python/libvirt-python-4.6.0
index 4892f9c6048d..c48a9d7cd4ef 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-4.6.0
+++ b/metadata/md5-cache/dev-python/libvirt-python-4.6.0
@@ -10,5 +10,5 @@ RDEPEND=app-emulation/libvirt:0/4.6.0 python_targets_python2_7? ( >=dev-lang/pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://libvirt.org/sources/python/libvirt-python-4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2ab66a99c4a3d44509d7422a57f19368
diff --git a/metadata/md5-cache/dev-python/libvirt-python-9999 b/metadata/md5-cache/dev-python/libvirt-python-9999
index de07578f0450..685818fcf63a 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-9999
+++ b/metadata/md5-cache/dev-python/libvirt-python-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=app-emulation/libvirt:=[-python(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2ab66a99c4a3d44509d7422a57f19368
diff --git a/metadata/md5-cache/dev-python/libwnck-python-2.32.0-r1 b/metadata/md5-cache/dev-python/libwnck-python-2.32.0-r1
index 9572d934ad89..23c83e959a60 100644
--- a/metadata/md5-cache/dev-python/libwnck-python-2.32.0-r1
+++ b/metadata/md5-cache/dev-python/libwnck-python-2.32.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-python-desktop/2.32/gnome-python-desktop-2.32.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome-python-common-r1	4b3f4780086f96814cde64b8e5ea23c5	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome-python-common-r1	4b3f4780086f96814cde64b8e5ea23c5	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e4024af74c9a7e1facfc37dc3c9ac276
diff --git a/metadata/md5-cache/dev-python/libzilla-1.4 b/metadata/md5-cache/dev-python/libzilla-1.4
index d101cb933802..6da7a9d9e820 100644
--- a/metadata/md5-cache/dev-python/libzilla-1.4
+++ b/metadata/md5-cache/dev-python/libzilla-1.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/docopt[python_targets_python3_4(-)?,python_targets_python3_5(
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/monsieurp/libzilla/archive/v1.4.tar.gz -> libzilla-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fbbabcc6f0ea953cf898b4752913d1ab
diff --git a/metadata/md5-cache/dev-python/libzilla-1.5 b/metadata/md5-cache/dev-python/libzilla-1.5
index efaa4dac8bdc..d3cb6e9283e9 100644
--- a/metadata/md5-cache/dev-python/libzilla-1.5
+++ b/metadata/md5-cache/dev-python/libzilla-1.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/docopt[python_targets_python3_4(-)?,python_targets_python3_5(
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/monsieurp/libzilla/archive/v1.5.tar.gz -> libzilla-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=260f6b2e721619d586c1a045e2cb107f
diff --git a/metadata/md5-cache/dev-python/line_profiler-2.0 b/metadata/md5-cache/dev-python/line_profiler-2.0
index b1db340717bd..ce40e9b199e1 100644
--- a/metadata/md5-cache/dev-python/line_profiler-2.0
+++ b/metadata/md5-cache/dev-python/line_profiler-2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/l/line_profiler/line_profiler-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c75e21d769b1e2d730567a1c47b86902
diff --git a/metadata/md5-cache/dev-python/line_profiler-2.1.2 b/metadata/md5-cache/dev-python/line_profiler-2.1.2
index 1c95c9137b59..03261e22ecab 100644
--- a/metadata/md5-cache/dev-python/line_profiler-2.1.2
+++ b/metadata/md5-cache/dev-python/line_profiler-2.1.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/l/line_profiler/line_profiler-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6084bdf75adf02eef4c34d1b9f651fbb
diff --git a/metadata/md5-cache/dev-python/line_profiler-9999 b/metadata/md5-cache/dev-python/line_profiler-9999
index 997e36851de2..3dce458768d0 100644
--- a/metadata/md5-cache/dev-python/line_profiler-9999
+++ b/metadata/md5-cache/dev-python/line_profiler-9999
@@ -8,5 +8,5 @@ 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
-_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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9ec616df250002c39248c2e9c3d16467
diff --git a/metadata/md5-cache/dev-python/linecache2-1.0.0 b/metadata/md5-cache/dev-python/linecache2-1.0.0
index f271fcbc0eaf..69978d725365 100644
--- a/metadata/md5-cache/dev-python/linecache2-1.0.0
+++ b/metadata/md5-cache/dev-python/linecache2-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/l/linecache2/linecache2-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2989d71565d92c71e550caea5a710fbc
diff --git a/metadata/md5-cache/dev-python/lit-3.9.0 b/metadata/md5-cache/dev-python/lit-3.9.0
index 2d9f941e759e..9d0930b123a1 100644
--- a/metadata/md5-cache/dev-python/lit-3.9.0
+++ b/metadata/md5-cache/dev-python/lit-3.9.0
@@ -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://llvm.org/releases/3.9.0/llvm-3.9.0.src.tar.xz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=de1000a2bf14c68527516e99ad0316c9
diff --git a/metadata/md5-cache/dev-python/lit-4.0.1 b/metadata/md5-cache/dev-python/lit-4.0.1
index f3f41f74e8bb..f717ea4c00a8 100644
--- a/metadata/md5-cache/dev-python/lit-4.0.1
+++ b/metadata/md5-cache/dev-python/lit-4.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://releases.llvm.org/4.0.1/llvm-4.0.1.src.tar.xz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8757a346c3f9841a88e45447612f54ab
diff --git a/metadata/md5-cache/dev-python/lit-5.0.2 b/metadata/md5-cache/dev-python/lit-5.0.2
index be6143e466aa..60c690a7302a 100644
--- a/metadata/md5-cache/dev-python/lit-5.0.2
+++ b/metadata/md5-cache/dev-python/lit-5.0.2
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://releases.llvm.org/5.0.2/llvm-5.0.2.src.tar.xz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6729e3129af04c68e8b5e61a8654640a
diff --git a/metadata/md5-cache/dev-python/lit-6.0.1 b/metadata/md5-cache/dev-python/lit-6.0.1
index ae96de7586ac..0a9497b2fef2 100644
--- a/metadata/md5-cache/dev-python/lit-6.0.1
+++ b/metadata/md5-cache/dev-python/lit-6.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/6.0.1/llvm-6.0.1.src.tar.xz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=27c2962084f660c58945ccf5f9a6210e
diff --git a/metadata/md5-cache/dev-python/lit-7.0.0 b/metadata/md5-cache/dev-python/lit-7.0.0
index 892f03491adf..641ad6fc83ad 100644
--- a/metadata/md5-cache/dev-python/lit-7.0.0
+++ b/metadata/md5-cache/dev-python/lit-7.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/7.0.0/llvm-7.0.0.src.tar.xz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=030f0702601392f8c49e4bd2ba820ff8
diff --git a/metadata/md5-cache/dev-python/lit-7.0.9999 b/metadata/md5-cache/dev-python/lit-7.0.9999
index 831fccba39f5..6af785afd1d5 100644
--- a/metadata/md5-cache/dev-python/lit-7.0.9999
+++ b/metadata/md5-cache/dev-python/lit-7.0.9999
@@ -9,5 +9,5 @@ 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 )
 RESTRICT=!test? ( test )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0c0a05711bdd8e363c3842baa9cd0a02
diff --git a/metadata/md5-cache/dev-python/lit-9999 b/metadata/md5-cache/dev-python/lit-9999
index 98858d021e9b..f4a179c51085 100644
--- a/metadata/md5-cache/dev-python/lit-9999
+++ b/metadata/md5-cache/dev-python/lit-9999
@@ -9,5 +9,5 @@ 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 )
 RESTRICT=!test? ( test )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d68aa104a6f60ae926bbbb5acf78a486
diff --git a/metadata/md5-cache/dev-python/livereload-2.4.1 b/metadata/md5-cache/dev-python/livereload-2.4.1
index 7f0dcb72c095..1a410e88e63e 100644
--- a/metadata/md5-cache/dev-python/livereload-2.4.1
+++ b/metadata/md5-cache/dev-python/livereload-2.4.1
@@ -10,5 +10,5 @@ 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
 SRC_URI=https://github.com/lepture/python-livereload/archive/v2.4.1.tar.gz -> livereload-2.4.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4b8fdc10ea811d5fd8b87218f1bda3b4
diff --git a/metadata/md5-cache/dev-python/livereload-2.5.2 b/metadata/md5-cache/dev-python/livereload-2.5.2
index 555ee00ba01a..b69ff2e348cd 100644
--- a/metadata/md5-cache/dev-python/livereload-2.5.2
+++ b/metadata/md5-cache/dev-python/livereload-2.5.2
@@ -10,5 +10,5 @@ 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
 SRC_URI=https://github.com/lepture/python-livereload/archive/v2.5.2.tar.gz -> livereload-2.5.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fe55eadebf1e987e0d3b65434557409c
diff --git a/metadata/md5-cache/dev-python/llfuse-1.3.2 b/metadata/md5-cache/dev-python/llfuse-1.3.2
index ae4146dfa2af..115411e1fa07 100644
--- a/metadata/md5-cache/dev-python/llfuse-1.3.2
+++ b/metadata/md5-cache/dev-python/llfuse-1.3.2
@@ -10,5 +10,5 @@ RDEPEND=>=sys-fs/fuse-2.8.0:0 python_targets_pypy? ( dev-python/contextlib2[pyth
 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/l/llfuse/llfuse-1.3.2.tar.bz2
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6f8aa52ff3d253b3ac4cafd0f26159c6
diff --git a/metadata/md5-cache/dev-python/llfuse-1.3.4 b/metadata/md5-cache/dev-python/llfuse-1.3.4
index c425772885e8..ec205a1ace01 100644
--- a/metadata/md5-cache/dev-python/llfuse-1.3.4
+++ b/metadata/md5-cache/dev-python/llfuse-1.3.4
@@ -10,5 +10,5 @@ RDEPEND=>=sys-fs/fuse-2.8.0:0 python_targets_pypy? ( dev-python/contextlib2[pyth
 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/l/llfuse/llfuse-1.3.4.tar.bz2
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d5f2b985e46ff7c848d4e9ffd39799e7
diff --git a/metadata/md5-cache/dev-python/llvmlite-0.20.0 b/metadata/md5-cache/dev-python/llvmlite-0.20.0
index d9365144e688..ceab9a7b8d98 100644
--- a/metadata/md5-cache/dev-python/llvmlite-0.20.0
+++ b/metadata/md5-cache/dev-python/llvmlite-0.20.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/l/llvmlite/llvmlite-0.20.0.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	llvm	01fccd3367b527770b74bfbf59d616c6	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	llvm	01fccd3367b527770b74bfbf59d616c6	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0285500a135aae5cc9162f2c65d10656
diff --git a/metadata/md5-cache/dev-python/llvmlite-0.22.0 b/metadata/md5-cache/dev-python/llvmlite-0.22.0
index 42f65c40e454..89ea7e61e1a2 100644
--- a/metadata/md5-cache/dev-python/llvmlite-0.22.0
+++ b/metadata/md5-cache/dev-python/llvmlite-0.22.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/numba/llvmlite/archive/v0.22.0.tar.gz -> llvmlite-0.22.0.gh.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	llvm	01fccd3367b527770b74bfbf59d616c6	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	llvm	01fccd3367b527770b74bfbf59d616c6	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=437087976747ad50996a457fde12d117
diff --git a/metadata/md5-cache/dev-python/llvmlite-0.24.0 b/metadata/md5-cache/dev-python/llvmlite-0.24.0
index 5b4cd8f911a1..c0204f3dbcc6 100644
--- a/metadata/md5-cache/dev-python/llvmlite-0.24.0
+++ b/metadata/md5-cache/dev-python/llvmlite-0.24.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/numba/llvmlite/archive/v0.24.0.tar.gz -> llvmlite-0.24.0.gh.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	llvm	01fccd3367b527770b74bfbf59d616c6	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	llvm	01fccd3367b527770b74bfbf59d616c6	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=19dbb9056f63bba5599d3fcbced4c30c
diff --git a/metadata/md5-cache/dev-python/llvmlite-0.25.0 b/metadata/md5-cache/dev-python/llvmlite-0.25.0
index a498d825448f..be3452fef2cd 100644
--- a/metadata/md5-cache/dev-python/llvmlite-0.25.0
+++ b/metadata/md5-cache/dev-python/llvmlite-0.25.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/numba/llvmlite/archive/v0.25.0.tar.gz -> llvmlite-0.25.0.gh.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	llvm	01fccd3367b527770b74bfbf59d616c6	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	llvm	01fccd3367b527770b74bfbf59d616c6	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2cef891e7dfc2c72662f38969275f35d
diff --git a/metadata/md5-cache/dev-python/lmdb-0.92 b/metadata/md5-cache/dev-python/lmdb-0.92
index 314a269e7933..918e373b2f16 100644
--- a/metadata/md5-cache/dev-python/lmdb-0.92
+++ b/metadata/md5-cache/dev-python/lmdb-0.92
@@ -10,5 +10,5 @@ RDEPEND=dev-db/lmdb:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/l/lmdb/lmdb-0.92.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5ccd7545d29280160020fd22f8c96511
diff --git a/metadata/md5-cache/dev-python/locket-0.2.0 b/metadata/md5-cache/dev-python/locket-0.2.0
index f0356b568a1b..1752b0601f46 100644
--- a/metadata/md5-cache/dev-python/locket-0.2.0
+++ b/metadata/md5-cache/dev-python/locket-0.2.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/l/locket/locket-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=201b40cb80d5ef73c1a9b300e5036c0b
diff --git a/metadata/md5-cache/dev-python/lockfile-0.11.0-r1 b/metadata/md5-cache/dev-python/lockfile-0.11.0-r1
index fce608f18e22..2f3777cc4a16 100644
--- a/metadata/md5-cache/dev-python/lockfile-0.11.0-r1
+++ b/metadata/md5-cache/dev-python/lockfile-0.11.0-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_
 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/l/lockfile/lockfile-0.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6e425b3f138e89dd088c77980c39d26c
diff --git a/metadata/md5-cache/dev-python/lockfile-0.12.2-r1 b/metadata/md5-cache/dev-python/lockfile-0.12.2-r1
index 808bb968311c..8ef65998da98 100644
--- a/metadata/md5-cache/dev-python/lockfile-0.12.2-r1
+++ b/metadata/md5-cache/dev-python/lockfile-0.12.2-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_
 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/l/lockfile/lockfile-0.12.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bf942c7ba19b055f726dbff3c7c26c9a
diff --git a/metadata/md5-cache/dev-python/locustio-0.7.3-r1 b/metadata/md5-cache/dev-python/locustio-0.7.3-r1
index 15d3a27641af..fd7b90a073f3 100644
--- a/metadata/md5-cache/dev-python/locustio-0.7.3-r1
+++ b/metadata/md5-cache/dev-python/locustio-0.7.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/gevent-1.0.1[python_targets_python2_7(-)?,-python_single_ta
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/l/locustio/locustio-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=57823f24bf1cc9ba2b19fa7b00369b84
diff --git a/metadata/md5-cache/dev-python/locustio-0.9.0 b/metadata/md5-cache/dev-python/locustio-0.9.0
index f1958387043c..d63e20cc953a 100644
--- a/metadata/md5-cache/dev-python/locustio-0.9.0
+++ b/metadata/md5-cache/dev-python/locustio-0.9.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/locustio/locustio-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=91aa7cc04f9c6c124fe9087a195a5c6f
diff --git a/metadata/md5-cache/dev-python/log4py-1.3-r1 b/metadata/md5-cache/dev-python/log4py-1.3-r1
index ccaee2699bab..0790ff00d05b 100644
--- a/metadata/md5-cache/dev-python/log4py-1.3-r1
+++ b/metadata/md5-cache/dev-python/log4py-1.3-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=http://www.its4you.at/downloads/files/log4py-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b8766263577d6612840b460ca8d969e2
diff --git a/metadata/md5-cache/dev-python/logbook-0.9.1 b/metadata/md5-cache/dev-python/logbook-0.9.1
index f6ca7a0d8fa1..3af4ec0d6cb0 100644
--- a/metadata/md5-cache/dev-python/logbook-0.9.1
+++ b/metadata/md5-cache/dev-python/logbook-0.9.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/redis-py[python_targets_pypy(-)?,python_targets_python2_7(-)?
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/getlogbook/logbook/archive/0.9.1.tar.gz -> logbook-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=80c10e02b1742392a38f9a520c1266d1
diff --git a/metadata/md5-cache/dev-python/logbook-1.1.0 b/metadata/md5-cache/dev-python/logbook-1.1.0
index 657797bc5442..5e74e11e7a93 100644
--- a/metadata/md5-cache/dev-python/logbook-1.1.0
+++ b/metadata/md5-cache/dev-python/logbook-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/redis-py[python_targets_pypy(-)?,python_targets_python2_7(-)?
 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/getlogbook/logbook/archive/1.1.0.tar.gz -> logbook-1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7bf951eac76dffbf5f61038a34abdb01
diff --git a/metadata/md5-cache/dev-python/logbook-1.4.0 b/metadata/md5-cache/dev-python/logbook-1.4.0
index a42420e5e235..a9a8af319ab0 100644
--- a/metadata/md5-cache/dev-python/logbook-1.4.0
+++ b/metadata/md5-cache/dev-python/logbook-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/redis-py[python_targets_pypy(-)?,python_targets_python2_7(-)?
 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/getlogbook/logbook/archive/1.4.0.tar.gz -> logbook-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8c74f415749d96e5408787dd20ac84d6
diff --git a/metadata/md5-cache/dev-python/logfury-0.1.2 b/metadata/md5-cache/dev-python/logfury-0.1.2
index eed475def18d..ebe3579640c5 100644
--- a/metadata/md5-cache/dev-python/logfury-0.1.2
+++ b/metadata/md5-cache/dev-python/logfury-0.1.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/l/logfury/logfury-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fb5e004016ebbae48e5c52a4da1c78ae
diff --git a/metadata/md5-cache/dev-python/logilab-common-1.2.2 b/metadata/md5-cache/dev-python/logilab-common-1.2.2
index e1eb529e0c13..3361c7ea0a8c 100644
--- a/metadata/md5-cache/dev-python/logilab-common-1.2.2
+++ b/metadata/md5-cache/dev-python/logilab-common-1.2.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/six-1.4.0[python_targets_pypy(-)?,python_targets_python2_7(
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
index 9b65632b02b3..9560488c7dc9 100644
--- a/metadata/md5-cache/dev-python/logilab-common-1.4.1
+++ b/metadata/md5-cache/dev-python/logilab-common-1.4.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/six-1.4.0[python_targets_pypy(-)?,python_targets_python2_7(
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
index ce60140d076c..7457ae4994f8 100644
--- a/metadata/md5-cache/dev-python/logilab-constraint-0.5.0-r1
+++ b/metadata/md5-cache/dev-python/logilab-constraint-0.5.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/logilab-common[python_targets_python2_7(-)?,-python_single_ta
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
index a18b6a3fc159..c4f15286de8c 100644
--- a/metadata/md5-cache/dev-python/logilab-constraint-0.5.0-r2
+++ b/metadata/md5-cache/dev-python/logilab-constraint-0.5.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/logilab-common-1.2.2-r1[python_targets_python2_7(-)?,-pytho
 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	89bb9f083a2590d9b447fd0b78a96186
+_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/logutils-0.3.3 b/metadata/md5-cache/dev-python/logutils-0.3.3
index 44006e556233..594f5521e821 100644
--- a/metadata/md5-cache/dev-python/logutils-0.3.3
+++ b/metadata/md5-cache/dev-python/logutils-0.3.3
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/l/logutils/logutils-0.3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f5d7645b2d2e67fe67e0e94ac62b7336
diff --git a/metadata/md5-cache/dev-python/louie-1.1-r1 b/metadata/md5-cache/dev-python/louie-1.1-r1
index 1af94b42d6cc..71e3c8c35287 100644
--- a/metadata/md5-cache/dev-python/louie-1.1-r1
+++ b/metadata/md5-cache/dev-python/louie-1.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=mirror://pypi/L/Louie/Louie-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=df705e4667ee937bf0e4f92c20432170
diff --git a/metadata/md5-cache/dev-python/lp_solve-5.5.2.0-r1 b/metadata/md5-cache/dev-python/lp_solve-5.5.2.0-r1
index f92828541c10..76501be566d0 100644
--- a/metadata/md5-cache/dev-python/lp_solve-5.5.2.0-r1
+++ b/metadata/md5-cache/dev-python/lp_solve-5.5.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/lpsolve/lp_solve_5.5.2.0_Python_source.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7806b6f0cf6ad28d3c29b33ef99daed7
diff --git a/metadata/md5-cache/dev-python/lupy-0.2.1-r2 b/metadata/md5-cache/dev-python/lupy-0.2.1-r2
index b43042009e18..b37b5e2ba6be 100644
--- a/metadata/md5-cache/dev-python/lupy-0.2.1-r2
+++ b/metadata/md5-cache/dev-python/lupy-0.2.1-r2
@@ -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=mirror://sourceforge/lupy/Lupy-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0677b9cc2b00466cb11ada8915b6b853
diff --git a/metadata/md5-cache/dev-python/lxml-4.1.1 b/metadata/md5-cache/dev-python/lxml-4.1.1
index 886e6218a163..c33156fbe835 100644
--- a/metadata/md5-cache/dev-python/lxml-4.1.1
+++ b/metadata/md5-cache/dev-python/lxml-4.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libxml2-2.9.2 >=dev-libs/libxslt-1.1.28 python_targets_pypy?
 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/l/lxml/lxml-4.1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5feef894e267fe47f239345e7f6b2226
diff --git a/metadata/md5-cache/dev-python/lz4-0.10.1 b/metadata/md5-cache/dev-python/lz4-0.10.1
index d555d2466223..bae8f34b3012 100644
--- a/metadata/md5-cache/dev-python/lz4-0.10.1
+++ b/metadata/md5-cache/dev-python/lz4-0.10.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/l/lz4/lz4-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1472cd4a98d768f2405fb8364ce93a6f
diff --git a/metadata/md5-cache/dev-python/lz4-0.8.2 b/metadata/md5-cache/dev-python/lz4-0.8.2
index c806d6c4abb8..8d3d3167267a 100644
--- a/metadata/md5-cache/dev-python/lz4-0.8.2
+++ b/metadata/md5-cache/dev-python/lz4-0.8.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/l/lz4/lz4-0.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=92bb72a959f773d0655619a7fa4bd62d
diff --git a/metadata/md5-cache/dev-python/m2crypto-0.24.0 b/metadata/md5-cache/dev-python/m2crypto-0.24.0
index 11b8f3a8b423..b5806dc5ccd8 100644
--- a/metadata/md5-cache/dev-python/m2crypto-0.24.0
+++ b/metadata/md5-cache/dev-python/m2crypto-0.24.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/M/M2Crypto/M2Crypto-0.24.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=294bd7e320253b92776c9628a2b4bf82
diff --git a/metadata/md5-cache/dev-python/m2crypto-0.27.0 b/metadata/md5-cache/dev-python/m2crypto-0.27.0
index 4457abeda8db..a01652d7f1e0 100644
--- a/metadata/md5-cache/dev-python/m2crypto-0.27.0
+++ b/metadata/md5-cache/dev-python/m2crypto-0.27.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/M/M2Crypto/M2Crypto-0.27.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a9390914780cd49580bf4ac311759e7d
diff --git a/metadata/md5-cache/dev-python/m2crypto-0.27.0-r2 b/metadata/md5-cache/dev-python/m2crypto-0.27.0-r2
index 37e2bc79d0c5..8ff9ebc490d8 100644
--- a/metadata/md5-cache/dev-python/m2crypto-0.27.0-r2
+++ b/metadata/md5-cache/dev-python/m2crypto-0.27.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/M/M2Crypto/M2Crypto-0.27.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=aa07b3e4db68403806b61e1b3576a6cc
diff --git a/metadata/md5-cache/dev-python/m2r-0.1.12 b/metadata/md5-cache/dev-python/m2r-0.1.12
index d9ff6aec195b..b1e59fd79a03 100644
--- a/metadata/md5-cache/dev-python/m2r-0.1.12
+++ b/metadata/md5-cache/dev-python/m2r-0.1.12
@@ -10,5 +10,5 @@ RDEPEND=dev-python/mistune[python_targets_pypy(-)?,python_targets_python2_7(-)?,
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/m2r/m2r-0.1.12.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=999659d3d88b3b1e75b9721124ea2415
diff --git a/metadata/md5-cache/dev-python/m2r-0.1.14 b/metadata/md5-cache/dev-python/m2r-0.1.14
index a3bd26975e9e..047bc02a75f6 100644
--- a/metadata/md5-cache/dev-python/m2r-0.1.14
+++ b/metadata/md5-cache/dev-python/m2r-0.1.14
@@ -10,5 +10,5 @@ RDEPEND=dev-python/mistune[python_targets_pypy(-)?,python_targets_python2_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/m2r/m2r-0.1.14.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=270e3329aeb923ff56ef138da59c59f1
diff --git a/metadata/md5-cache/dev-python/m2r-0.1.5 b/metadata/md5-cache/dev-python/m2r-0.1.5
index e7aebc62afc3..b4cfc710b0fe 100644
--- a/metadata/md5-cache/dev-python/m2r-0.1.5
+++ b/metadata/md5-cache/dev-python/m2r-0.1.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/mistune[python_targets_pypy(-)?,python_targets_python2_7(-)?,
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/m2r/m2r-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7c102afc05bd10630e766283b3604fd3
diff --git a/metadata/md5-cache/dev-python/m2r-0.1.6 b/metadata/md5-cache/dev-python/m2r-0.1.6
index 42ca0c546bb6..c6eca0e560c6 100644
--- a/metadata/md5-cache/dev-python/m2r-0.1.6
+++ b/metadata/md5-cache/dev-python/m2r-0.1.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/mistune[python_targets_pypy(-)?,python_targets_python2_7(-)?,
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/m2r/m2r-0.1.6.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7c102afc05bd10630e766283b3604fd3
diff --git a/metadata/md5-cache/dev-python/m2secret-0.1.1-r1 b/metadata/md5-cache/dev-python/m2secret-0.1.1-r1
index 557216f61895..17c7e52f2a02 100644
--- a/metadata/md5-cache/dev-python/m2secret-0.1.1-r1
+++ b/metadata/md5-cache/dev-python/m2secret-0.1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/m2secret/m2secret-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4cf800f1a1d0f59a52c48f4513771506
diff --git a/metadata/md5-cache/dev-python/mailmanclient-3.1.1 b/metadata/md5-cache/dev-python/mailmanclient-3.1.1
index eb9a8cd7ac92..6d0ee8dedb8e 100644
--- a/metadata/md5-cache/dev-python/mailmanclient-3.1.1
+++ b/metadata/md5-cache/dev-python/mailmanclient-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mailmanclient/mailmanclient-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a061d55f92baadd22b2827e33d9f600d
diff --git a/metadata/md5-cache/dev-python/maintboot-0.1.0 b/metadata/md5-cache/dev-python/maintboot-0.1.0
index 2e5f35f50af0..283c2f974ca3 100644
--- a/metadata/md5-cache/dev-python/maintboot-0.1.0
+++ b/metadata/md5-cache/dev-python/maintboot-0.1.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/m/maintboot/maintboot-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0fe1477a5838048df5603634dad3b1ac
diff --git a/metadata/md5-cache/dev-python/mako-1.0.3 b/metadata/md5-cache/dev-python/mako-1.0.3
index 8e9895e12501..6f7ad63b89e4 100644
--- a/metadata/md5-cache/dev-python/mako-1.0.3
+++ b/metadata/md5-cache/dev-python/mako-1.0.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/markupsafe-0.9.2[python_targets_pypy(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/M/Mako/Mako-1.0.3.tar.gz
-_eclasses_=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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5a22fbf57fb96f41c817a62aa4af9839
diff --git a/metadata/md5-cache/dev-python/mako-1.0.6 b/metadata/md5-cache/dev-python/mako-1.0.6
index d9e177a2c86b..4330fe8498b8 100644
--- a/metadata/md5-cache/dev-python/mako-1.0.6
+++ b/metadata/md5-cache/dev-python/mako-1.0.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/markupsafe-0.9.2[python_targets_pypy(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/M/Mako/Mako-1.0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=24679fdd631f885fd5f1639a3a6914c3
diff --git a/metadata/md5-cache/dev-python/mamba-0.8.6 b/metadata/md5-cache/dev-python/mamba-0.8.6
index 76427077043e..00f19b31dad1 100644
--- a/metadata/md5-cache/dev-python/mamba-0.8.6
+++ b/metadata/md5-cache/dev-python/mamba-0.8.6
@@ -10,5 +10,5 @@ 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
 SRC_URI=mirror://pypi/m/mamba/mamba-0.8.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=31a910593a8eff7812caddffb08ce162
diff --git a/metadata/md5-cache/dev-python/mando-0.3.2 b/metadata/md5-cache/dev-python/mando-0.3.2
index 490ae825d90d..eb002504f533 100644
--- a/metadata/md5-cache/dev-python/mando-0.3.2
+++ b/metadata/md5-cache/dev-python/mando-0.3.2
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/rubik/mando/archive/v0.3.2.tar.gz -> mando-0.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ac4cbd43522d7deeaba5c2d9b8bb6c2f
diff --git a/metadata/md5-cache/dev-python/mantissa-0.7.0-r1 b/metadata/md5-cache/dev-python/mantissa-0.7.0-r1
index 0667d717751e..22102033741a 100644
--- a/metadata/md5-cache/dev-python/mantissa-0.7.0-r1
+++ b/metadata/md5-cache/dev-python/mantissa-0.7.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/axiom-0.6.0-r1[python_targets_python2_7(-)?,-python_single_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/M/Mantissa/Mantissa-0.7.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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=77c99b99874c6bed650182d372289916
diff --git a/metadata/md5-cache/dev-python/mantissa-0.8.4 b/metadata/md5-cache/dev-python/mantissa-0.8.4
index afd7bbd6058b..d8c70ec5bc21 100644
--- a/metadata/md5-cache/dev-python/mantissa-0.8.4
+++ b/metadata/md5-cache/dev-python/mantissa-0.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,-python_single_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/M/Mantissa/Mantissa-0.8.4.tar.gz -> mantissa-0.8.4.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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ae8ce10d2f92e6fa2232878594d7bda1
diff --git a/metadata/md5-cache/dev-python/manuel-1.8.0 b/metadata/md5-cache/dev-python/manuel-1.8.0
index 88d014739446..fdfe856d9e10 100644
--- a/metadata/md5-cache/dev-python/manuel-1.8.0
+++ b/metadata/md5-cache/dev-python/manuel-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,pyth
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/manuel/manuel-1.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=17c9d8702274fc33296167bd7c4f975d
diff --git a/metadata/md5-cache/dev-python/manuel-1.9.0 b/metadata/md5-cache/dev-python/manuel-1.9.0
index 8524edfb66a9..21e0965352da 100644
--- a/metadata/md5-cache/dev-python/manuel-1.9.0
+++ b/metadata/md5-cache/dev-python/manuel-1.9.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,pyth
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/manuel/manuel-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4ded1063bd647ac554b6cf13b41e4e68
diff --git a/metadata/md5-cache/dev-python/markdown-2.6.5 b/metadata/md5-cache/dev-python/markdown-2.6.5
index ac240fce98ae..266e8f19e02f 100644
--- a/metadata/md5-cache/dev-python/markdown-2.6.5
+++ b/metadata/md5-cache/dev-python/markdown-2.6.5
@@ -10,5 +10,5 @@ RDEPEND=pygments? ( dev-python/pygments[python_targets_pypy(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/M/Markdown/Markdown-2.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=76a54bdf77891f0a8c37ab00e9f28b29
diff --git a/metadata/md5-cache/dev-python/markdown-2.6.8 b/metadata/md5-cache/dev-python/markdown-2.6.8
index 5d2df6ba1552..c4eca287dabd 100644
--- a/metadata/md5-cache/dev-python/markdown-2.6.8
+++ b/metadata/md5-cache/dev-python/markdown-2.6.8
@@ -10,5 +10,5 @@ RDEPEND=pygments? ( dev-python/pygments[python_targets_pypy(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/M/Markdown/Markdown-2.6.8.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=21dacbbea8dbfdd74a6fb57fd5794f3f
diff --git a/metadata/md5-cache/dev-python/markdown-2.6.9 b/metadata/md5-cache/dev-python/markdown-2.6.9
index 99e87f14d16e..8da72bfbf185 100644
--- a/metadata/md5-cache/dev-python/markdown-2.6.9
+++ b/metadata/md5-cache/dev-python/markdown-2.6.9
@@ -10,5 +10,5 @@ RDEPEND=pygments? ( dev-python/pygments[python_targets_pypy(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/M/Markdown/Markdown-2.6.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4e7844e15b885baa485646292096bbdb
diff --git a/metadata/md5-cache/dev-python/markdown2-2.3.0 b/metadata/md5-cache/dev-python/markdown2-2.3.0
index 46ce86c46902..d84fcecda583 100644
--- a/metadata/md5-cache/dev-python/markdown2-2.3.0
+++ b/metadata/md5-cache/dev-python/markdown2-2.3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygments[python_targets_pypy(-)?,python_targets_python2_7(-)?
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/markdown2/markdown2-2.3.0.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e51e3074aad4e4aa045aef20efea7443
diff --git a/metadata/md5-cache/dev-python/markups-2.0.0 b/metadata/md5-cache/dev-python/markups-2.0.0
index 7680604b6a71..c3eca475b0c9 100644
--- a/metadata/md5-cache/dev-python/markups-2.0.0
+++ b/metadata/md5-cache/dev-python/markups-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/markdown[python_targets_pypy(-)?,python_targets_python2_7(-)?
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/M/Markups/Markups-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=27b54dfa4269f949dd06e51fe972a6cc
diff --git a/metadata/md5-cache/dev-python/markupsafe-0.23 b/metadata/md5-cache/dev-python/markupsafe-0.23
index 1178da76e658..4eab98a5a882 100644
--- a/metadata/md5-cache/dev-python/markupsafe-0.23
+++ b/metadata/md5-cache/dev-python/markupsafe-0.23
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/MarkupSafe/MarkupSafe-0.23.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3d0c09bf483bf2fa5bfad14dae04aef7
diff --git a/metadata/md5-cache/dev-python/markupsafe-1.0 b/metadata/md5-cache/dev-python/markupsafe-1.0
index 12f87b7d6910..5033217174f8 100644
--- a/metadata/md5-cache/dev-python/markupsafe-1.0
+++ b/metadata/md5-cache/dev-python/markupsafe-1.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/MarkupSafe/MarkupSafe-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3c89af760ec32faf305a6696b9c8cac3
diff --git a/metadata/md5-cache/dev-python/marshmallow-3.0.0_beta12 b/metadata/md5-cache/dev-python/marshmallow-3.0.0_beta12
index 4a3166f95d33..e9874eeb3da5 100644
--- a/metadata/md5-cache/dev-python/marshmallow-3.0.0_beta12
+++ b/metadata/md5-cache/dev-python/marshmallow-3.0.0_beta12
@@ -10,5 +10,5 @@ RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/marshmallow/marshmallow-3.0.0b12.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0b4607cb049622cc7d8da523d4fdd3f7
diff --git a/metadata/md5-cache/dev-python/marshmallow-3.0.0_beta8 b/metadata/md5-cache/dev-python/marshmallow-3.0.0_beta8
index 48a229f6be2e..75285b9a6833 100644
--- a/metadata/md5-cache/dev-python/marshmallow-3.0.0_beta8
+++ b/metadata/md5-cache/dev-python/marshmallow-3.0.0_beta8
@@ -10,5 +10,5 @@ RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/marshmallow/marshmallow-3.0.0b8.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=26751bab19666c0b6d748ec66b959765
diff --git a/metadata/md5-cache/dev-python/matplotlib-2.2.2-r1 b/metadata/md5-cache/dev-python/matplotlib-2.2.2-r1
index a261589e4ff6..66cfacc7906f 100644
--- a/metadata/md5-cache/dev-python/matplotlib-2.2.2-r1
+++ b/metadata/md5-cache/dev-python/matplotlib-2.2.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/cycler[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) excel? ( || ( python_targets_python2_7 ) ) gtk2? ( || ( python_targets_python2_7 ) ) wxwidgets? ( || ( python_targets_python2_7 ) ) test? ( cairo latex qt5 tk wxwidgets || ( gtk2 gtk3 ) ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/matplotlib/matplotlib-2.2.2.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	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=584351931e8439909d07fd9ad51a417e
diff --git a/metadata/md5-cache/dev-python/matplotlib-9999 b/metadata/md5-cache/dev-python/matplotlib-9999
index 33ef1a1c141e..c2f37ff03c87 100644
--- a/metadata/md5-cache/dev-python/matplotlib-9999
+++ b/metadata/md5-cache/dev-python/matplotlib-9999
@@ -8,5 +8,5 @@ LICENSE=BitstreamVera BSD matplotlib MIT OFL-1.1
 RDEPEND=dev-python/cycler[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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.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/python-dateutil: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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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.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(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 media-libs/qhull cairo? ( || ( dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cairocffi[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ) gtk2? ( dev-libs/glib:2= x11-libs/gdk-pixbuf x11-libs/gtk+:2 dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pyparsing-1.5.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(-)] excel? ( dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) fltk? ( dev-python/pyfltk[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) gtk3? ( dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/ghostscript-gpl app-text/dvipng app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) excel? ( || ( python_targets_python2_7 ) ) fltk? ( || ( python_targets_python2_7 ) ) gtk2? ( || ( python_targets_python2_7 ) ) wxwidgets? ( || ( python_targets_python2_7 ) ) test? ( cairo fltk latex qt5 tk wxwidgets || ( gtk2 gtk3 ) ) || ( python_targets_python2_7 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	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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5cbe15e059b0194826d7a3ad8d9a2ebc
diff --git a/metadata/md5-cache/dev-python/matplotlib2tikz-0.6.18 b/metadata/md5-cache/dev-python/matplotlib2tikz-0.6.18
index 07d10e4568d7..4fb40ab7ac89 100644
--- a/metadata/md5-cache/dev-python/matplotlib2tikz-0.6.18
+++ b/metadata/md5-cache/dev-python/matplotlib2tikz-0.6.18
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/nschloe/matplotlib2tikz/archive/v0.6.18.tar.gz -> matplotlib2tikz-0.6.18.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=30154c0fcf3304c973615b081b49f75c
diff --git a/metadata/md5-cache/dev-python/matterhook-0.1 b/metadata/md5-cache/dev-python/matterhook-0.1
index ffe651bf322d..d5b3013fdc2f 100644
--- a/metadata/md5-cache/dev-python/matterhook-0.1
+++ b/metadata/md5-cache/dev-python/matterhook-0.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/matterhook/matterhook-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c1a180a5c71751868627d9104d07e072
diff --git a/metadata/md5-cache/dev-python/maybe-0.3.0 b/metadata/md5-cache/dev-python/maybe-0.3.0
index 649c5f6d000a..f5c9253edc18 100644
--- a/metadata/md5-cache/dev-python/maybe-0.3.0
+++ b/metadata/md5-cache/dev-python/maybe-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/blessings[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/m/maybe/maybe-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bae27400c7d1b0c70c6bdd072e00fc4a
diff --git a/metadata/md5-cache/dev-python/maybe-0.4.0 b/metadata/md5-cache/dev-python/maybe-0.4.0
index ebfa45d5d49d..b4fae5d82941 100644
--- a/metadata/md5-cache/dev-python/maybe-0.4.0
+++ b/metadata/md5-cache/dev-python/maybe-0.4.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/blessings[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/maybe/maybe-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3770d64fdce52012ba22f5737679a213
diff --git a/metadata/md5-cache/dev-python/mccabe-0.2.1 b/metadata/md5-cache/dev-python/mccabe-0.2.1
index 328f692c0341..e3ae1f3c89fb 100644
--- a/metadata/md5-cache/dev-python/mccabe-0.2.1
+++ b/metadata/md5-cache/dev-python/mccabe-0.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pep8-1.4.3[python_targets_python2_7(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mccabe/mccabe-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b57bcda52f09b69fb348f3ed410409bb
diff --git a/metadata/md5-cache/dev-python/mccabe-0.6.1 b/metadata/md5-cache/dev-python/mccabe-0.6.1
index 75f48335d35e..7061b219b186 100644
--- a/metadata/md5-cache/dev-python/mccabe-0.6.1
+++ b/metadata/md5-cache/dev-python/mccabe-0.6.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/flake8[python_targets_pypy(-)?,python_targets_pypy3(-)?,pytho
 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/mccabe/mccabe-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b15dfad846a9beb8f82b38ca73905d18
diff --git a/metadata/md5-cache/dev-python/mecab-python-0.996 b/metadata/md5-cache/dev-python/mecab-python-0.996
index 13b5d2593dc7..13e0742f4f0e 100644
--- a/metadata/md5-cache/dev-python/mecab-python-0.996
+++ b/metadata/md5-cache/dev-python/mecab-python-0.996
@@ -10,5 +10,5 @@ RDEPEND=~app-text/mecab-0.996 python_targets_python2_7? ( >=dev-lang/python-2.7.
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mecab/mecab-python-0.996.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=32b536e0cfb30896d727a48b2baa2787
diff --git a/metadata/md5-cache/dev-python/mechanize-0.2.5-r1 b/metadata/md5-cache/dev-python/mechanize-0.2.5-r1
index 1a1a7adca07b..269bf150f6bd 100644
--- a/metadata/md5-cache/dev-python/mechanize-0.2.5-r1
+++ b/metadata/md5-cache/dev-python/mechanize-0.2.5-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://wwwsearch.sourceforge.net/mechanize/src/mechanize-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1e654642e55d76ecce11b6a75ee68e86
diff --git a/metadata/md5-cache/dev-python/medusa-0.5.4-r1 b/metadata/md5-cache/dev-python/medusa-0.5.4-r1
index 07b9446c5740..b1e30ac967d2 100644
--- a/metadata/md5-cache/dev-python/medusa-0.5.4-r1
+++ b/metadata/md5-cache/dev-python/medusa-0.5.4-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/medusa/medusa-0.5.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c5cdd19db2f69339b2f6a10f12291dd8
diff --git a/metadata/md5-cache/dev-python/meld3-1.0.2-r1 b/metadata/md5-cache/dev-python/meld3-1.0.2-r1
index f4e458e9411b..1c5870c4d908 100644
--- a/metadata/md5-cache/dev-python/meld3-1.0.2-r1
+++ b/metadata/md5-cache/dev-python/meld3-1.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/m/meld3/meld3-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9d0f9379616e7a1238123156ed240261
diff --git a/metadata/md5-cache/dev-python/mem_top-0.1.6 b/metadata/md5-cache/dev-python/mem_top-0.1.6
index 7ac8902e0a84..6e06587b7e65 100644
--- a/metadata/md5-cache/dev-python/mem_top-0.1.6
+++ b/metadata/md5-cache/dev-python/mem_top-0.1.6
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mem_top/mem_top-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2ac830e360e452c901d86ea40f1c63e2
diff --git a/metadata/md5-cache/dev-python/memory_profiler-0.47 b/metadata/md5-cache/dev-python/memory_profiler-0.47
index 7a18a1ca5b40..ad3b7b4ea413 100644
--- a/metadata/md5-cache/dev-python/memory_profiler-0.47
+++ b/metadata/md5-cache/dev-python/memory_profiler-0.47
@@ -10,5 +10,5 @@ RDEPEND=dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/memory_profiler/memory_profiler-0.47.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3d3bc911b404d4bc86e85c376cfaec31
diff --git a/metadata/md5-cache/dev-python/mergedict-0.2.0 b/metadata/md5-cache/dev-python/mergedict-0.2.0
index 466075f50d81..71d9acca98e3 100644
--- a/metadata/md5-cache/dev-python/mergedict-0.2.0
+++ b/metadata/md5-cache/dev-python/mergedict-0.2.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/python-singledispatch[python_targets_pypy(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mergedict/mergedict-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7080a6716c817fe6ed78e18740a83a5e
diff --git a/metadata/md5-cache/dev-python/metakernel-0.20.4 b/metadata/md5-cache/dev-python/metakernel-0.20.4
index 513bab85e64b..6bbe6bcdeeb0 100644
--- a/metadata/md5-cache/dev-python/metakernel-0.20.4
+++ b/metadata/md5-cache/dev-python/metakernel-0.20.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/metakernel/metakernel-0.20.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b4bdc4b86df0d1173053761ef4cdab9a
diff --git a/metadata/md5-cache/dev-python/micawber-0.3.3 b/metadata/md5-cache/dev-python/micawber-0.3.3
index 1667aefdb99b..23a5c4ab2ab9 100644
--- a/metadata/md5-cache/dev-python/micawber-0.3.3
+++ b/metadata/md5-cache/dev-python/micawber-0.3.3
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/coleifer/micawber/archive/0.3.3.tar.gz -> micawber-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1aa5710eea7dfa6372f40c5a9d60e50d
diff --git a/metadata/md5-cache/dev-python/microversion-parse-0.1.4 b/metadata/md5-cache/dev-python/microversion-parse-0.1.4
index 14d0ecafe140..4cfa50d4fedc 100644
--- a/metadata/md5-cache/dev-python/microversion-parse-0.1.4
+++ b/metadata/md5-cache/dev-python/microversion-parse-0.1.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/microversion_parse/microversion_parse-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=26b7805ab9fb3a0ef88fcd75e8adbca1
diff --git a/metadata/md5-cache/dev-python/microversion-parse-0.2.1 b/metadata/md5-cache/dev-python/microversion-parse-0.2.1
index f889356c4f52..078678749980 100644
--- a/metadata/md5-cache/dev-python/microversion-parse-0.2.1
+++ b/metadata/md5-cache/dev-python/microversion-parse-0.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/microversion_parse/microversion_parse-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=79441c589817b543445b0b4bb4d820a3
diff --git a/metadata/md5-cache/dev-python/milk-0.5.1 b/metadata/md5-cache/dev-python/milk-0.5.1
index d9f78d7b59d3..0921e89f3ee7 100644
--- a/metadata/md5-cache/dev-python/milk-0.5.1
+++ b/metadata/md5-cache/dev-python/milk-0.5.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/milk/milk-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=33fb06b735f4eeb3bf4c0f2a3791d1b7
diff --git a/metadata/md5-cache/dev-python/milk-0.5.3 b/metadata/md5-cache/dev-python/milk-0.5.3
index 3e6456920679..0b1d2ece53ea 100644
--- a/metadata/md5-cache/dev-python/milk-0.5.3
+++ b/metadata/md5-cache/dev-python/milk-0.5.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/milk/milk-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c30e7da36851451177f8a0b7c0d62b02
diff --git a/metadata/md5-cache/dev-python/milk-0.6.1 b/metadata/md5-cache/dev-python/milk-0.6.1
index 29e9eb5f5f24..d4a373439be0 100644
--- a/metadata/md5-cache/dev-python/milk-0.6.1
+++ b/metadata/md5-cache/dev-python/milk-0.6.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/milk/milk-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c30e7da36851451177f8a0b7c0d62b02
diff --git a/metadata/md5-cache/dev-python/milksets-0.1.3-r1 b/metadata/md5-cache/dev-python/milksets-0.1.3-r1
index 8bc95784915b..fbdc0bac2857 100644
--- a/metadata/md5-cache/dev-python/milksets-0.1.3-r1
+++ b/metadata/md5-cache/dev-python/milksets-0.1.3-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/milksets/milksets-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=037ba5f8fc1df174a902b5891147c0ce
diff --git a/metadata/md5-cache/dev-python/mimeparse-0.1.4-r1 b/metadata/md5-cache/dev-python/mimeparse-0.1.4-r1
index 0fd5e9e5d9c8..b904bd786b1d 100644
--- a/metadata/md5-cache/dev-python/mimeparse-0.1.4-r1
+++ b/metadata/md5-cache/dev-python/mimeparse-0.1.4-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-mimeparse/python-mimeparse-0.1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f8f86c1b8a7bf8461149bf1549edeabb
diff --git a/metadata/md5-cache/dev-python/mimeparse-1.6.0 b/metadata/md5-cache/dev-python/mimeparse-1.6.0
index d22eaaff091a..96bf81e1b578 100644
--- a/metadata/md5-cache/dev-python/mimeparse-1.6.0
+++ b/metadata/md5-cache/dev-python/mimeparse-1.6.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/python-mimeparse/python-mimeparse-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8ef6896712a47ad0f58d4dfe47565d15
diff --git a/metadata/md5-cache/dev-python/mimerender-0.6.0 b/metadata/md5-cache/dev-python/mimerender-0.6.0
index 7f39ba0173e4..0268cc10c7ef 100644
--- a/metadata/md5-cache/dev-python/mimerender-0.6.0
+++ b/metadata/md5-cache/dev-python/mimerender-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/mimeparse[python_targets_pypy(-)?,python_targets_python2_7(-)
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mimerender/mimerender-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4e0e88bab8b6c18a9dd37df7b516a445
diff --git a/metadata/md5-cache/dev-python/minidb-2.0.2 b/metadata/md5-cache/dev-python/minidb-2.0.2
index 553fe030614d..1a59c9a26f30 100644
--- a/metadata/md5-cache/dev-python/minidb-2.0.2
+++ b/metadata/md5-cache/dev-python/minidb-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/minidb/minidb-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b5be830fda069d3ac18f476dc61d6334
diff --git a/metadata/md5-cache/dev-python/minimock-1.2.8-r1 b/metadata/md5-cache/dev-python/minimock-1.2.8-r1
index a00fd7a48537..b25626d12d88 100644
--- a/metadata/md5-cache/dev-python/minimock-1.2.8-r1
+++ b/metadata/md5-cache/dev-python/minimock-1.2.8-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( !!dev-python/future[python_targets_python2_7
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/M/MiniMock/MiniMock-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8a5129e796ab570c689711d0db84c582
diff --git a/metadata/md5-cache/dev-python/miniupnpc-2.0.20180222 b/metadata/md5-cache/dev-python/miniupnpc-2.0.20180222
index e9178bcf211f..d96e79bff991 100644
--- a/metadata/md5-cache/dev-python/miniupnpc-2.0.20180222
+++ b/metadata/md5-cache/dev-python/miniupnpc-2.0.20180222
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/miniupnpc-2.0.20180222:0= python_targets_pypy? ( >=virtual/py
 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	89bb9f083a2590d9b447fd0b78a96186
+_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/miniupnpc-2.0.20180503 b/metadata/md5-cache/dev-python/miniupnpc-2.0.20180503
index 0b80911d97be..645f832d8730 100644
--- a/metadata/md5-cache/dev-python/miniupnpc-2.0.20180503
+++ b/metadata/md5-cache/dev-python/miniupnpc-2.0.20180503
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/miniupnpc-2.0.20180503:0= python_targets_pypy? ( >=virtual/py
 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.20180503.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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/misaka-1.0.2 b/metadata/md5-cache/dev-python/misaka-1.0.2
index 0ed21b85746d..b3c6b594ec24 100644
--- a/metadata/md5-cache/dev-python/misaka-1.0.2
+++ b/metadata/md5-cache/dev-python/misaka-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/urllib3[python_targets_python2_7(-)?,-python_single_target_py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/misaka/misaka-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=674f43e245d2e478ee1b4954047970d0
diff --git a/metadata/md5-cache/dev-python/mkdocs-0.15.3 b/metadata/md5-cache/dev-python/mkdocs-0.15.3
index e48b722a2a81..d9befe0b6ef1 100644
--- a/metadata/md5-cache/dev-python/mkdocs-0.15.3
+++ b/metadata/md5-cache/dev-python/mkdocs-0.15.3
@@ -10,5 +10,5 @@ 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
 SRC_URI=https://github.com/tomchristie/mkdocs/archive/0.15.3.tar.gz -> mkdocs-0.15.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0b6a44a6cb57b2b090b3d63f4eefb094
diff --git a/metadata/md5-cache/dev-python/mkdocs-0.17.4 b/metadata/md5-cache/dev-python/mkdocs-0.17.4
index 6eb2e1797c6c..5b41ef41d77f 100644
--- a/metadata/md5-cache/dev-python/mkdocs-0.17.4
+++ b/metadata/md5-cache/dev-python/mkdocs-0.17.4
@@ -10,5 +10,5 @@ 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
 SRC_URI=https://github.com/tomchristie/mkdocs/archive/0.17.4.tar.gz -> mkdocs-0.17.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3723a9815a531656f7bb6140b85d0d31
diff --git a/metadata/md5-cache/dev-python/mkdocs-1.0.1 b/metadata/md5-cache/dev-python/mkdocs-1.0.1
index d5b830b0ae6e..37ec7ff8ed60 100644
--- a/metadata/md5-cache/dev-python/mkdocs-1.0.1
+++ b/metadata/md5-cache/dev-python/mkdocs-1.0.1
@@ -10,5 +10,5 @@ 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
 SRC_URI=https://github.com/tomchristie/mkdocs/archive/1.0.1.tar.gz -> mkdocs-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3723a9815a531656f7bb6140b85d0d31
diff --git a/metadata/md5-cache/dev-python/mkdocs-bootstrap-0.1.1 b/metadata/md5-cache/dev-python/mkdocs-bootstrap-0.1.1
index e0f4baa7cd9b..40aa6d0ce676 100644
--- a/metadata/md5-cache/dev-python/mkdocs-bootstrap-0.1.1
+++ b/metadata/md5-cache/dev-python/mkdocs-bootstrap-0.1.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mkdocs-bootstrap/mkdocs-bootstrap-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=02b3d851a525f6336c9dea5fd7a8ea2e
diff --git a/metadata/md5-cache/dev-python/mkdocs-bootswatch-0.4.0 b/metadata/md5-cache/dev-python/mkdocs-bootswatch-0.4.0
index 40f57c2799cd..42bdc18dad78 100644
--- a/metadata/md5-cache/dev-python/mkdocs-bootswatch-0.4.0
+++ b/metadata/md5-cache/dev-python/mkdocs-bootswatch-0.4.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mkdocs-bootswatch/mkdocs-bootswatch-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3cf3eca8048289612d7547d320e4cf39
diff --git a/metadata/md5-cache/dev-python/mkpythonproj-1.9 b/metadata/md5-cache/dev-python/mkpythonproj-1.9
index 044204c7dd85..2d9564a40c1f 100644
--- a/metadata/md5-cache/dev-python/mkpythonproj-1.9
+++ b/metadata/md5-cache/dev-python/mkpythonproj-1.9
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.seanet.com/~hgg9140/comp/download/mkpythonproj-1.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=934c6e62cb45af95ad6de4ded0a1db63
diff --git a/metadata/md5-cache/dev-python/mmh3-2.3.1 b/metadata/md5-cache/dev-python/mmh3-2.3.1
index a54b36870401..cece5a7a133d 100644
--- a/metadata/md5-cache/dev-python/mmh3-2.3.1
+++ b/metadata/md5-cache/dev-python/mmh3-2.3.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mmh3/mmh3-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e5552eb6381bc883f20f08bb98b925f1
diff --git a/metadata/md5-cache/dev-python/mmh3-2.5.1 b/metadata/md5-cache/dev-python/mmh3-2.5.1
index 8db268d3c69d..acce941c37d3 100644
--- a/metadata/md5-cache/dev-python/mmh3-2.5.1
+++ b/metadata/md5-cache/dev-python/mmh3-2.5.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mmh3/mmh3-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2ff944a0043cedae539772a064aafd5d
diff --git a/metadata/md5-cache/dev-python/mmtf-python-1.1.2 b/metadata/md5-cache/dev-python/mmtf-python-1.1.2
index 4ef1c6db8645..f20070d47c7b 100644
--- a/metadata/md5-cache/dev-python/mmtf-python-1.1.2
+++ b/metadata/md5-cache/dev-python/mmtf-python-1.1.2
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mmtf-python/mmtf-python-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=86bd5ae22c1bbb4adf45f021dcb88d15
diff --git a/metadata/md5-cache/dev-python/mock-1.0.1-r2 b/metadata/md5-cache/dev-python/mock-1.0.1-r2
index c20defb22587..4d369bbb992a 100644
--- a/metadata/md5-cache/dev-python/mock-1.0.1-r2
+++ b/metadata/md5-cache/dev-python/mock-1.0.1-r2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/mock/mock-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cc0c4b43f6d40029e4d37edba46995e2
diff --git a/metadata/md5-cache/dev-python/mock-1.3.0-r2 b/metadata/md5-cache/dev-python/mock-1.3.0-r2
index ab04c20b46ff..a058f3825a8e 100644
--- a/metadata/md5-cache/dev-python/mock-1.3.0-r2
+++ b/metadata/md5-cache/dev-python/mock-1.3.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.3[python_targets_pypy(-)?,python_targets_pypy3(-)?,py
 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/mock/mock-1.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=570c5855bafe1bb61b00a182bb27a020
diff --git a/metadata/md5-cache/dev-python/mock-2.0.0 b/metadata/md5-cache/dev-python/mock-2.0.0
index fac682de0f6e..e23d8e25a7af 100644
--- a/metadata/md5-cache/dev-python/mock-2.0.0
+++ b/metadata/md5-cache/dev-python/mock-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.3[python_targets_pypy(-)?,python_targets_pypy3(-)?,py
 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/mock/mock-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=993796855fd10af13a9af8f08927cc6f
diff --git a/metadata/md5-cache/dev-python/mocker-1.1.1-r1 b/metadata/md5-cache/dev-python/mocker-1.1.1-r1
index 4c250d1019e8..6f32e8d769bf 100644
--- a/metadata/md5-cache/dev-python/mocker-1.1.1-r1
+++ b/metadata/md5-cache/dev-python/mocker-1.1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mocker/mocker-1.1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7429c845c5fbbf8469344ca14c5d43d3
diff --git a/metadata/md5-cache/dev-python/mockldap-0.2.3 b/metadata/md5-cache/dev-python/mockldap-0.2.3
index 12b1b6035fd4..e4c552141d7e 100644
--- a/metadata/md5-cache/dev-python/mockldap-0.2.3
+++ b/metadata/md5-cache/dev-python/mockldap-0.2.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-python/funcparserlib-0.3.6[python_targets_pypy(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mockldap/mockldap-0.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=967f38df023b221d05029b16f12f8a1c
diff --git a/metadata/md5-cache/dev-python/mockldap-0.2.6 b/metadata/md5-cache/dev-python/mockldap-0.2.6
index 4a9f253af232..ca7760840525 100644
--- a/metadata/md5-cache/dev-python/mockldap-0.2.6
+++ b/metadata/md5-cache/dev-python/mockldap-0.2.6
@@ -10,5 +10,5 @@ RDEPEND=~dev-python/funcparserlib-0.3.6[python_targets_pypy(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mockldap/mockldap-0.2.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=245148a1d3d2bf727a3a7059dc216d1d
diff --git a/metadata/md5-cache/dev-python/mockredispy-2.9.3 b/metadata/md5-cache/dev-python/mockredispy-2.9.3
index 87cff558890f..bc84ab6964aa 100644
--- a/metadata/md5-cache/dev-python/mockredispy-2.9.3
+++ b/metadata/md5-cache/dev-python/mockredispy-2.9.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/locationlabs/mockredis/archive/2.9.3.tar.gz -> mockredispy-2.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1cccf7e80da8f738bd8ece3399a8002b
diff --git a/metadata/md5-cache/dev-python/mongoengine-0.10.6 b/metadata/md5-cache/dev-python/mongoengine-0.10.6
index f4ba859dfa08..2785c7e7a72b 100644
--- a/metadata/md5-cache/dev-python/mongoengine-0.10.6
+++ b/metadata/md5-cache/dev-python/mongoengine-0.10.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/MongoEngine/mongoengine/archive/v0.10.6.tar.gz -> mongoengine-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d26f7460ae4ab41880c31d1cc4c64f9d
diff --git a/metadata/md5-cache/dev-python/monotonic-1.3 b/metadata/md5-cache/dev-python/monotonic-1.3
index cec494762cb4..b4bbfea18b18 100644
--- a/metadata/md5-cache/dev-python/monotonic-1.3
+++ b/metadata/md5-cache/dev-python/monotonic-1.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/monotonic/monotonic-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=592becf3980f4cf2b2cac9b5145597d0
diff --git a/metadata/md5-cache/dev-python/monotonic-1.4 b/metadata/md5-cache/dev-python/monotonic-1.4
index dadfc2d647e3..e1a951b4c4fb 100644
--- a/metadata/md5-cache/dev-python/monotonic-1.4
+++ b/metadata/md5-cache/dev-python/monotonic-1.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/monotonic/monotonic-1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f691f91b8fdfeffa15272a4ac01ec6fb
diff --git a/metadata/md5-cache/dev-python/montage-wrapper-0.9.8 b/metadata/md5-cache/dev-python/montage-wrapper-0.9.8
index 7228cbe6815c..8420018ab935 100644
--- a/metadata/md5-cache/dev-python/montage-wrapper-0.9.8
+++ b/metadata/md5-cache/dev-python/montage-wrapper-0.9.8
@@ -10,5 +10,5 @@ RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/m/montage-wrapper/montage-wrapper-0.9.8.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0fb15252ca0c6c0c40942e5559a19e9c
diff --git a/metadata/md5-cache/dev-python/montage-wrapper-0.9.9 b/metadata/md5-cache/dev-python/montage-wrapper-0.9.9
index f9ae6bcff649..c1d6543c458a 100644
--- a/metadata/md5-cache/dev-python/montage-wrapper-0.9.9
+++ b/metadata/md5-cache/dev-python/montage-wrapper-0.9.9
@@ -10,5 +10,5 @@ RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/montage-wrapper/montage-wrapper-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=503013db8e708e2be441bfe776e56d0a
diff --git a/metadata/md5-cache/dev-python/morbid-0.8.7.3-r1 b/metadata/md5-cache/dev-python/morbid-0.8.7.3-r1
index 165ac19b1c7a..d0ba3603507c 100644
--- a/metadata/md5-cache/dev-python/morbid-0.8.7.3-r1
+++ b/metadata/md5-cache/dev-python/morbid-0.8.7.3-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/stomper[python_targets_python2_7(-)?,-python_single_target_py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/morbid/morbid-0.8.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=33e0ca6a74b2d209c68d93ae5adb1e2f
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 8790082a31d1..1497fcd7e8cf 100644
--- a/metadata/md5-cache/dev-python/more-itertools-3.0.0
+++ b/metadata/md5-cache/dev-python/more-itertools-3.0.0
@@ -10,5 +10,5 @@ RDEPEND=<dev-python/six-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,pyt
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-python/moto-0.4.30 b/metadata/md5-cache/dev-python/moto-0.4.30
index 2361db7c29fa..4bb4e3d0cabf 100644
--- a/metadata/md5-cache/dev-python/moto-0.4.30
+++ b/metadata/md5-cache/dev-python/moto-0.4.30
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/jinja-2.8[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/m/moto/moto-0.4.30.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=80aff90e65ca0528070720e77203b580
diff --git a/metadata/md5-cache/dev-python/moto-1.0.1-r1 b/metadata/md5-cache/dev-python/moto-1.0.1-r1
index b923a95e01e1..2b5cfc2cd7db 100644
--- a/metadata/md5-cache/dev-python/moto-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/moto-1.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/cookies[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/moto/moto-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6a24aaad364d557b73bf815c4f3c2b2b
diff --git a/metadata/md5-cache/dev-python/moviepy-0.2.2 b/metadata/md5-cache/dev-python/moviepy-0.2.2
index 0ec3e51ecd0b..90b127dc57b1 100644
--- a/metadata/md5-cache/dev-python/moviepy-0.2.2
+++ b/metadata/md5-cache/dev-python/moviepy-0.2.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3
 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/Zulko/moviepy/archive/v0.2.2.tar.gz -> moviepy-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c6fa21019f239aa97c826df8a40874e1
diff --git a/metadata/md5-cache/dev-python/mox-0.5.3-r1 b/metadata/md5-cache/dev-python/mox-0.5.3-r1
index 6190644cee21..cb97fe8d0f7e 100644
--- a/metadata/md5-cache/dev-python/mox-0.5.3-r1
+++ b/metadata/md5-cache/dev-python/mox-0.5.3-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=mirror://pypi/m/mox/mox-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ae531befd94da54e9d7c9dfef2eab9f9
diff --git a/metadata/md5-cache/dev-python/mox3-0.10.0 b/metadata/md5-cache/dev-python/mox3-0.10.0
index a0b402123a29..d00626067c8c 100644
--- a/metadata/md5-cache/dev-python/mox3-0.10.0
+++ b/metadata/md5-cache/dev-python/mox3-0.10.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mox3/mox3-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4e9d67e0573ca60f154f96c19c6084d3
diff --git a/metadata/md5-cache/dev-python/mox3-0.12.0 b/metadata/md5-cache/dev-python/mox3-0.12.0
index ba24d980ff3b..477a31a650bd 100644
--- a/metadata/md5-cache/dev-python/mox3-0.12.0
+++ b/metadata/md5-cache/dev-python/mox3-0.12.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mox3/mox3-0.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=61e1028e5a3b9bf2332c3d1056e7002e
diff --git a/metadata/md5-cache/dev-python/mox3-0.24.0 b/metadata/md5-cache/dev-python/mox3-0.24.0
index 2d0490a0d2fd..8c48a20b9734 100644
--- a/metadata/md5-cache/dev-python/mox3-0.24.0
+++ b/metadata/md5-cache/dev-python/mox3-0.24.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mox3/mox3-0.24.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2014d4d4a0f8418834cf31d6f3ca1ccf
diff --git a/metadata/md5-cache/dev-python/mpi4py-2.0.0 b/metadata/md5-cache/dev-python/mpi4py-2.0.0
index cfc9a91be675..a055537c21d1 100644
--- a/metadata/md5-cache/dev-python/mpi4py-2.0.0
+++ b/metadata/md5-cache/dev-python/mpi4py-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/mpi python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mpi4py/mpi4py-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0cf23d97d3e2a5186056bea20a58c3b3
diff --git a/metadata/md5-cache/dev-python/mpi4py-3.0.0 b/metadata/md5-cache/dev-python/mpi4py-3.0.0
index 006017f0c3e8..0754c4c05a73 100644
--- a/metadata/md5-cache/dev-python/mpi4py-3.0.0
+++ b/metadata/md5-cache/dev-python/mpi4py-3.0.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/mpi python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mpi4py/mpi4py-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5a8173713d15e383153184d1c3eb853d
diff --git a/metadata/md5-cache/dev-python/mpmath-0.19-r1 b/metadata/md5-cache/dev-python/mpmath-0.19-r1
deleted file mode 100644
index a4ae1a4307eb..000000000000
--- a/metadata/md5-cache/dev-python/mpmath-0.19-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=gmp? ( dev-python/gmpy ) matplotlib? ( dev-python/matplotlib[python_targets_python2_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(-)] ) test? ( dev-python/pytest[python_targets_python2_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=Python library for arbitrary-precision floating-point arithmetic
-EAPI=5
-HOMEPAGE=http://mpmath.org/
-IUSE=doc examples gmp matplotlib test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=gmp? ( dev-python/gmpy ) matplotlib? ( dev-python/matplotlib[python_targets_python2_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=http://mpmath.org/files/mpmath-all-0.19.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=f3a45888ffa6bc117d2bb40a0ec75021
diff --git a/metadata/md5-cache/dev-python/mpmath-0.19-r2 b/metadata/md5-cache/dev-python/mpmath-0.19-r2
deleted file mode 100644
index 28346c320107..000000000000
--- a/metadata/md5-cache/dev-python/mpmath-0.19-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=gmp? ( dev-python/gmpy ) matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) 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(-)] ) test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python library for arbitrary-precision floating-point arithmetic
-EAPI=5
-HOMEPAGE=http://mpmath.org/
-IUSE=doc examples gmp matplotlib test 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 ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=gmp? ( dev-python/gmpy ) matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=http://mpmath.org/files/mpmath-all-0.19.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=dcf241de064bc0498991619e4f93016c
diff --git a/metadata/md5-cache/dev-python/mpmath-1.0.0 b/metadata/md5-cache/dev-python/mpmath-1.0.0
index d1e8b5d0fb34..a00033a83b4c 100644
--- a/metadata/md5-cache/dev-python/mpmath-1.0.0
+++ b/metadata/md5-cache/dev-python/mpmath-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=gmp? ( dev-python/gmpy ) matplotlib? ( dev-python/matplotlib[python_targ
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://mpmath.org/files/mpmath-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=da223580b93bdef5beb65be0c37fa670
diff --git a/metadata/md5-cache/dev-python/msgpack-0.4.8 b/metadata/md5-cache/dev-python/msgpack-0.4.8
index 74dc4639fe56..02de90d0b0da 100644
--- a/metadata/md5-cache/dev-python/msgpack-0.4.8
+++ b/metadata/md5-cache/dev-python/msgpack-0.4.8
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/msgpack-python/msgpack-python-0.4.8.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b03e0a8355cd5c8ee6be22e9aa51a028
diff --git a/metadata/md5-cache/dev-python/msgpack-0.5.1 b/metadata/md5-cache/dev-python/msgpack-0.5.1
index 802b792e59e4..475b4e93a8b3 100644
--- a/metadata/md5-cache/dev-python/msgpack-0.5.1
+++ b/metadata/md5-cache/dev-python/msgpack-0.5.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/m/msgpack-python/msgpack-python-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=901388853d6ed2a4846d111c02233a7b
diff --git a/metadata/md5-cache/dev-python/msgpack-0.5.6 b/metadata/md5-cache/dev-python/msgpack-0.5.6
index 5188f2e6d05d..b4417157092e 100644
--- a/metadata/md5-cache/dev-python/msgpack-0.5.6
+++ b/metadata/md5-cache/dev-python/msgpack-0.5.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/msgpack/msgpack-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0e17978deec18dd00f06363a226f5154
diff --git a/metadata/md5-cache/dev-python/multidict-1.3.0_alpha1 b/metadata/md5-cache/dev-python/multidict-1.3.0_alpha1
index 54a72458e609..9cd8ba42957d 100644
--- a/metadata/md5-cache/dev-python/multidict-1.3.0_alpha1
+++ b/metadata/md5-cache/dev-python/multidict-1.3.0_alpha1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/aio-libs/multidict/archive/v1.3.0a1.tar.gz -> multidict-1.3.0_alpha1.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b0456570b588dee28d82df87c1e15da6
diff --git a/metadata/md5-cache/dev-python/multidict-2.0.1 b/metadata/md5-cache/dev-python/multidict-2.0.1
index 9aaab66bafbe..aa551926118b 100644
--- a/metadata/md5-cache/dev-python/multidict-2.0.1
+++ b/metadata/md5-cache/dev-python/multidict-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/aio-libs/multidict/archive/v2.0.1.tar.gz -> multidict-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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fb611887b050e8bd063f67b0a50523f4
diff --git a/metadata/md5-cache/dev-python/multidict-2.1.0 b/metadata/md5-cache/dev-python/multidict-2.1.0
index ef159aaa09f6..08c6bc37ce48 100644
--- a/metadata/md5-cache/dev-python/multidict-2.1.0
+++ b/metadata/md5-cache/dev-python/multidict-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/aio-libs/multidict/archive/v2.1.0.tar.gz -> multidict-2.1.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fb611887b050e8bd063f67b0a50523f4
diff --git a/metadata/md5-cache/dev-python/multidict-2.1.2 b/metadata/md5-cache/dev-python/multidict-2.1.2
index d8044743f0ba..b751961be9e0 100644
--- a/metadata/md5-cache/dev-python/multidict-2.1.2
+++ b/metadata/md5-cache/dev-python/multidict-2.1.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/aio-libs/multidict/archive/v2.1.2.tar.gz -> multidict-2.1.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fb611887b050e8bd063f67b0a50523f4
diff --git a/metadata/md5-cache/dev-python/multidict-2.1.4 b/metadata/md5-cache/dev-python/multidict-2.1.4
index f820d4f647db..ad6aa714dacc 100644
--- a/metadata/md5-cache/dev-python/multidict-2.1.4
+++ b/metadata/md5-cache/dev-python/multidict-2.1.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/aio-libs/multidict/archive/v2.1.4.tar.gz -> multidict-2.1.4.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0e9cba21c6473c2d75819bc5d4543cc1
diff --git a/metadata/md5-cache/dev-python/multidict-2.1.5 b/metadata/md5-cache/dev-python/multidict-2.1.5
index 7a238561b0ca..1162504e0f6b 100644
--- a/metadata/md5-cache/dev-python/multidict-2.1.5
+++ b/metadata/md5-cache/dev-python/multidict-2.1.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/aio-libs/multidict/archive/v2.1.5.tar.gz -> multidict-2.1.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cd48b861b4acf959982fcc089eff19f6
diff --git a/metadata/md5-cache/dev-python/multidict-3.3.2 b/metadata/md5-cache/dev-python/multidict-3.3.2
index d0b93c3ef24d..d6c663756bab 100644
--- a/metadata/md5-cache/dev-python/multidict-3.3.2
+++ b/metadata/md5-cache/dev-python/multidict-3.3.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/aio-libs/multidict/archive/v3.3.2.tar.gz -> multidict-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9e7fb4cf64aeacb982e6b73218cc7c69
diff --git a/metadata/md5-cache/dev-python/multidict-4.1.0 b/metadata/md5-cache/dev-python/multidict-4.1.0
index 01511c119696..85be9f4520c8 100644
--- a/metadata/md5-cache/dev-python/multidict-4.1.0
+++ b/metadata/md5-cache/dev-python/multidict-4.1.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/aio-libs/multidict/archive/v4.1.0.tar.gz -> multidict-4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d13148bff20d7de634c1178ef02b659a
diff --git a/metadata/md5-cache/dev-python/multidict-4.3.1 b/metadata/md5-cache/dev-python/multidict-4.3.1
index 65660caaae1e..3cdc179f27c6 100644
--- a/metadata/md5-cache/dev-python/multidict-4.3.1
+++ b/metadata/md5-cache/dev-python/multidict-4.3.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/aio-libs/multidict/archive/v4.3.1.tar.gz -> multidict-4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e9ad2ed43c18a52e53091375a84283ab
diff --git a/metadata/md5-cache/dev-python/multipledispatch-0.4.9 b/metadata/md5-cache/dev-python/multipledispatch-0.4.9
index 48e102f844d2..c8b699b147c4 100644
--- a/metadata/md5-cache/dev-python/multipledispatch-0.4.9
+++ b/metadata/md5-cache/dev-python/multipledispatch-0.4.9
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/multipledispatch/multipledispatch-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=072b969cdda1de07a5fb824afa8ac3c5
diff --git a/metadata/md5-cache/dev-python/munch-2.1.1 b/metadata/md5-cache/dev-python/munch-2.1.1
index 5079b29c989c..8c2265b68934 100644
--- a/metadata/md5-cache/dev-python/munch-2.1.1
+++ b/metadata/md5-cache/dev-python/munch-2.1.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/m/munch/munch-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dc068da34dd79be8d9e88085147a8b69
diff --git a/metadata/md5-cache/dev-python/munch-2.2.0 b/metadata/md5-cache/dev-python/munch-2.2.0
index 8b1e5ef7fed3..3515491be5c9 100644
--- a/metadata/md5-cache/dev-python/munch-2.2.0
+++ b/metadata/md5-cache/dev-python/munch-2.2.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/m/munch/munch-2.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=78b304e46dee32010a754156d2047b26
diff --git a/metadata/md5-cache/dev-python/munkres-1.0.12 b/metadata/md5-cache/dev-python/munkres-1.0.12
index 0274fb0a78a5..36ceee3cec78 100644
--- a/metadata/md5-cache/dev-python/munkres-1.0.12
+++ b/metadata/md5-cache/dev-python/munkres-1.0.12
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/bmc/munkres/archive/release-1.0.12.tar.gz -> munkres-1.0.12.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=52a2fe94a5afe25aa016a969b7302f3d
diff --git a/metadata/md5-cache/dev-python/munkres-1.0.5.4-r2 b/metadata/md5-cache/dev-python/munkres-1.0.5.4-r2
index ea4c6b797013..b879add804c6 100644
--- a/metadata/md5-cache/dev-python/munkres-1.0.5.4-r2
+++ b/metadata/md5-cache/dev-python/munkres-1.0.5.4-r2
@@ -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=mirror://pypi/m/munkres/munkres-1.0.5.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=151dce851bf9534f30bdb2700e43e01c
diff --git a/metadata/md5-cache/dev-python/munkres-1.0.8 b/metadata/md5-cache/dev-python/munkres-1.0.8
index 1803f9bcf5a5..ba08a50ccb67 100644
--- a/metadata/md5-cache/dev-python/munkres-1.0.8
+++ b/metadata/md5-cache/dev-python/munkres-1.0.8
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/m/munkres/munkres-1.0.8.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6a2612773bd261a06267896c55a74d78
diff --git a/metadata/md5-cache/dev-python/mwlib-ext-0.13.2 b/metadata/md5-cache/dev-python/mwlib-ext-0.13.2
index 2028afedfde8..fa4dd17c3c90 100644
--- a/metadata/md5-cache/dev-python/mwlib-ext-0.13.2
+++ b/metadata/md5-cache/dev-python/mwlib-ext-0.13.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/reportlab-2.6[python_targets_python2_7(-)?,-python_single_t
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mwlib.ext/mwlib.ext-0.13.2.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a52c142df09608668f4a9576d7e94ed0
diff --git a/metadata/md5-cache/dev-python/myghty-1.2-r1 b/metadata/md5-cache/dev-python/myghty-1.2-r1
index 1dde8459546d..54d6e52b1424 100644
--- a/metadata/md5-cache/dev-python/myghty-1.2-r1
+++ b/metadata/md5-cache/dev-python/myghty-1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/routes-1.0[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/M/Myghty/Myghty-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cc647740e8dd9abd46be610af851f57f
diff --git a/metadata/md5-cache/dev-python/myghtyutils-0.52-r1 b/metadata/md5-cache/dev-python/myghtyutils-0.52-r1
index b39232d40654..1eacd2b20005 100644
--- a/metadata/md5-cache/dev-python/myghtyutils-0.52-r1
+++ b/metadata/md5-cache/dev-python/myghtyutils-0.52-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/myghty[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/M/MyghtyUtils/MyghtyUtils-0.52.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=80e2564e275cb03bd205bb76e42880e5
diff --git a/metadata/md5-cache/dev-python/mygpoclient-1.7-r1 b/metadata/md5-cache/dev-python/mygpoclient-1.7-r1
index 95bbcec095a7..cb6a002c2ef7 100644
--- a/metadata/md5-cache/dev-python/mygpoclient-1.7-r1
+++ b/metadata/md5-cache/dev-python/mygpoclient-1.7-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/simplejson python_targets_pypy? ( >=virtual/pypy-5:0= ) pytho
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/gpodder/mygpoclient/archive/1.7.tar.gz -> mygpoclient-1.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=c7b4bc770fc58e758ed7ce7ec0470691
diff --git a/metadata/md5-cache/dev-python/mypy-0.570 b/metadata/md5-cache/dev-python/mypy-0.570
index 2ea0e6ba7eeb..d641d3e816cc 100644
--- a/metadata/md5-cache/dev-python/mypy-0.570
+++ b/metadata/md5-cache/dev-python/mypy-0.570
@@ -10,5 +10,5 @@ RDEPEND=!dev-util/stubgen >=dev-python/psutil-5.4.0[python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/python/mypy/archive/v0.570.tar.gz -> mypy-0.570.tar.gz https://api.github.com/repos/python/typeshed/tarball/9b6df1d -> mypy-typeshed-0.570.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0d7f83e0a540c2a739a40c4d9a130922
diff --git a/metadata/md5-cache/dev-python/mypy-0.590 b/metadata/md5-cache/dev-python/mypy-0.590
index 0f3ccdf1466b..863a3063420b 100644
--- a/metadata/md5-cache/dev-python/mypy-0.590
+++ b/metadata/md5-cache/dev-python/mypy-0.590
@@ -10,5 +10,5 @@ RDEPEND=!dev-util/stubgen >=dev-python/psutil-5.4.0[python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/python/mypy/archive/v0.590.tar.gz -> mypy-0.590.tar.gz https://api.github.com/repos/python/typeshed/tarball/9b6df1d -> mypy-typeshed-0.590.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0d7f83e0a540c2a739a40c4d9a130922
diff --git a/metadata/md5-cache/dev-python/mypy-0.600 b/metadata/md5-cache/dev-python/mypy-0.600
index 1c73b9ca956c..afd11703f4d1 100644
--- a/metadata/md5-cache/dev-python/mypy-0.600
+++ b/metadata/md5-cache/dev-python/mypy-0.600
@@ -10,5 +10,5 @@ RDEPEND=!dev-util/stubgen >=dev-python/psutil-5.4.0[python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/python/mypy/archive/v0.600.tar.gz -> mypy-0.600.tar.gz https://api.github.com/repos/python/typeshed/tarball/2dc7d39 -> mypy-typeshed-0.600-2dc7d39.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=96cbd5ec6d0f107adb353f6b956809f2
diff --git a/metadata/md5-cache/dev-python/mypy-0.630 b/metadata/md5-cache/dev-python/mypy-0.630
index 10a22267cb0c..24848f1811fe 100644
--- a/metadata/md5-cache/dev-python/mypy-0.630
+++ b/metadata/md5-cache/dev-python/mypy-0.630
@@ -10,5 +10,5 @@ RDEPEND=!dev-util/stubgen >=dev-python/psutil-5.4.0[python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/python/mypy/archive/v0.630.tar.gz -> mypy-0.630.tar.gz https://api.github.com/repos/python/typeshed/tarball/8ed0159 -> mypy-typeshed-0.630-8ed0159.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b470001c474a35ff34c93834ff7a7907
diff --git a/metadata/md5-cache/dev-python/mysql-connector-python-2.1.7 b/metadata/md5-cache/dev-python/mysql-connector-python-2.1.7
index 40f5618d220f..2bc70947e625 100644
--- a/metadata/md5-cache/dev-python/mysql-connector-python-2.1.7
+++ b/metadata/md5-cache/dev-python/mysql-connector-python-2.1.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.mysql.com/get/Downloads/Connector-Python/mysql-connector-python-2.1.7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5b18ad20cbcf863848b9a548b43999bc
diff --git a/metadata/md5-cache/dev-python/mysql-connector-python-2.1.7-r1 b/metadata/md5-cache/dev-python/mysql-connector-python-2.1.7-r1
index f083e857cd83..f21bb1d92c66 100644
--- a/metadata/md5-cache/dev-python/mysql-connector-python-2.1.7-r1
+++ b/metadata/md5-cache/dev-python/mysql-connector-python-2.1.7-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.mysql.com/get/Downloads/Connector-Python/mysql-connector-python-2.1.7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6d77b4ef3b111b0a65035fa387955acd
diff --git a/metadata/md5-cache/dev-python/mysql-python-1.2.3-r1 b/metadata/md5-cache/dev-python/mysql-python-1.2.3-r1
index 06c611228574..52c25913edfc 100644
--- a/metadata/md5-cache/dev-python/mysql-python-1.2.3-r1
+++ b/metadata/md5-cache/dev-python/mysql-python-1.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/mysql python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/mysql-python/MySQL-python-1.2.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=49b647cb4d15f0b5911926c80589e93b
diff --git a/metadata/md5-cache/dev-python/mysql-python-1.2.5-r1 b/metadata/md5-cache/dev-python/mysql-python-1.2.5-r1
index 383995185fbc..52961e18e4bc 100644
--- a/metadata/md5-cache/dev-python/mysql-python-1.2.5-r1
+++ b/metadata/md5-cache/dev-python/mysql-python-1.2.5-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/mysql python_targets_pypy? ( >=virtual/pypy-5:0= ) python_target
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/M/MySQL-python/MySQL-python-1.2.5.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c711ebafc302b5a001b1353b17c8c474
diff --git a/metadata/md5-cache/dev-python/mysqlclient-1.3.12 b/metadata/md5-cache/dev-python/mysqlclient-1.3.12
index 90408ef57299..b31a388fe3f4 100644
--- a/metadata/md5-cache/dev-python/mysqlclient-1.3.12
+++ b/metadata/md5-cache/dev-python/mysqlclient-1.3.12
@@ -10,5 +10,5 @@ RDEPEND=!dev-python/mysql-python virtual/mysql python_targets_pypy? ( >=virtual/
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mysqlclient/mysqlclient-1.3.12.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3b9ccb3d68e2501958e682b2bc125f89
diff --git a/metadata/md5-cache/dev-python/mysqlclient-1.3.13 b/metadata/md5-cache/dev-python/mysqlclient-1.3.13
index 0e37684ffa81..c8b15424b501 100644
--- a/metadata/md5-cache/dev-python/mysqlclient-1.3.13
+++ b/metadata/md5-cache/dev-python/mysqlclient-1.3.13
@@ -10,5 +10,5 @@ RDEPEND=!dev-python/mysql-python virtual/mysql python_targets_pypy? ( >=virtual/
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mysqlclient/mysqlclient-1.3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=77a00ae59bc8bd673baece9debc274e9
diff --git a/metadata/md5-cache/dev-python/naima-0.8-r1 b/metadata/md5-cache/dev-python/naima-0.8-r1
index 498caf1c0bf6..b66b336bcd58 100644
--- a/metadata/md5-cache/dev-python/naima-0.8-r1
+++ b/metadata/md5-cache/dev-python/naima-0.8-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/n/naima/naima-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=34e01fae2ac71104a3b43b696175633d
diff --git a/metadata/md5-cache/dev-python/namespace-google-1 b/metadata/md5-cache/dev-python/namespace-google-1
index b7d42e4fd7c4..676f653bb2ad 100644
--- a/metadata/md5-cache/dev-python/namespace-google-1
+++ b/metadata/md5-cache/dev-python/namespace-google-1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=install unpack
-DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) 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=Namespace package declaration for google
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages
-IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+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=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=public-domain
-RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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 )
+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(-)] 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
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=696f51cd8a48e127faef2663129eadd8
+_md5_=d33ad023f87a8dd15fc7475cd6e2b897
diff --git a/metadata/md5-cache/dev-python/natgrid-0.2.1-r3 b/metadata/md5-cache/dev-python/natgrid-0.2.1-r3
index e9775807647e..db484f36ffda 100644
--- a/metadata/md5-cache/dev-python/natgrid-0.2.1-r3
+++ b/metadata/md5-cache/dev-python/natgrid-0.2.1-r3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/matplotlib-0.98[python_targets_python2_7(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/matplotlib/natgrid-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b8fdca8229377ea2adb2bdaf922f2ab0
diff --git a/metadata/md5-cache/dev-python/natsort-4.0.4 b/metadata/md5-cache/dev-python/natsort-4.0.4
index 4868d22715ca..1eac051c4689 100644
--- a/metadata/md5-cache/dev-python/natsort-4.0.4
+++ b/metadata/md5-cache/dev-python/natsort-4.0.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/n/natsort/natsort-4.0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=07259d0084c6a3577afc3f09d56b0227
diff --git a/metadata/md5-cache/dev-python/nautilus-python-1.1-r2 b/metadata/md5-cache/dev-python/nautilus-python-1.1-r2
index 2d9470602e1c..463f870fd1b0 100644
--- a/metadata/md5-cache/dev-python/nautilus-python-1.1-r2
+++ b/metadata/md5-cache/dev-python/nautilus-python-1.1-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://gnome/sources/nautilus-python/1.1/nautilus-python-1.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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=9de897a5b00ac84c36a0ce337cec5b57
diff --git a/metadata/md5-cache/dev-python/nbconvert-5.2.1 b/metadata/md5-cache/dev-python/nbconvert-5.2.1
index 6dded86695ef..ae203c07fccf 100644
--- a/metadata/md5-cache/dev-python/nbconvert-5.2.1
+++ b/metadata/md5-cache/dev-python/nbconvert-5.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/n/nbconvert/nbconvert-5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6a3daa8b15848ca2cf7719e4ab021060
diff --git a/metadata/md5-cache/dev-python/nbdime-0.1.2 b/metadata/md5-cache/dev-python/nbdime-0.1.2
index 832d9812e96a..8e674397dc28 100644
--- a/metadata/md5-cache/dev-python/nbdime-0.1.2
+++ b/metadata/md5-cache/dev-python/nbdime-0.1.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/nbformat[python_targets_python3_4(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/n/nbdime/nbdime-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a3cb27ac3176b4c6678d345d7abc2a44
diff --git a/metadata/md5-cache/dev-python/nbdime-0.2.0 b/metadata/md5-cache/dev-python/nbdime-0.2.0
index bfd2151d0fa8..06588a6b17d3 100644
--- a/metadata/md5-cache/dev-python/nbdime-0.2.0
+++ b/metadata/md5-cache/dev-python/nbdime-0.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/nbformat[python_targets_python3_4(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/n/nbdime/nbdime-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=21ce233becfa732b85982245e97a6a48
diff --git a/metadata/md5-cache/dev-python/nbformat-4.4.0 b/metadata/md5-cache/dev-python/nbformat-4.4.0
index a3b938fa1c43..490d6922c9a5 100644
--- a/metadata/md5-cache/dev-python/nbformat-4.4.0
+++ b/metadata/md5-cache/dev-python/nbformat-4.4.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/jsonschema-2.4.0[python_targets_python2_7(-)?,python_target
 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/nbformat/nbformat-4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=75e0f53f6a57b3a641ce324093b7a7ed
diff --git a/metadata/md5-cache/dev-python/nbsphinx-0.2.14 b/metadata/md5-cache/dev-python/nbsphinx-0.2.14
index 0978e9d45724..4cfd2cd06d2a 100644
--- a/metadata/md5-cache/dev-python/nbsphinx-0.2.14
+++ b/metadata/md5-cache/dev-python/nbsphinx-0.2.14
@@ -10,5 +10,5 @@ RDEPEND=dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_
 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/nbsphinx/nbsphinx-0.2.14.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=905e9335911a14e1c5196310f17b0deb
diff --git a/metadata/md5-cache/dev-python/nbval-0.7 b/metadata/md5-cache/dev-python/nbval-0.7
index 1e432b79fc16..fc13333c8078 100644
--- a/metadata/md5-cache/dev-python/nbval-0.7
+++ b/metadata/md5-cache/dev-python/nbval-0.7
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pytest-2.8[python_targets_python2_7(-)?,python_targets_pyth
 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/nbval/nbval-0.7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b2ee0504b55eb09ace6aa901b8c01c87
diff --git a/metadata/md5-cache/dev-python/ndg-httpsclient-0.4.0 b/metadata/md5-cache/dev-python/ndg-httpsclient-0.4.0
index dca53315072a..ae93755a6f64 100644
--- a/metadata/md5-cache/dev-python/ndg-httpsclient-0.4.0
+++ b/metadata/md5-cache/dev-python/ndg-httpsclient-0.4.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyopenssl[python_targets_pypy(-)?,-python_single_target_pypy(
 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/n/ndg-httpsclient/ndg_httpsclient-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b4eecd5645721c14ac6ebc1c0448e3d4
diff --git a/metadata/md5-cache/dev-python/ndg-httpsclient-0.4.2-r1 b/metadata/md5-cache/dev-python/ndg-httpsclient-0.4.2-r1
index 653d5d4a9cac..53dd925054a1 100644
--- a/metadata/md5-cache/dev-python/ndg-httpsclient-0.4.2-r1
+++ b/metadata/md5-cache/dev-python/ndg-httpsclient-0.4.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyopenssl[python_targets_pypy(-)?,-python_single_target_pypy(
 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/n/ndg-httpsclient/ndg_httpsclient-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=587307ca574ddf9bf5ab3b2bdf2c6f5d
diff --git a/metadata/md5-cache/dev-python/neovim-python-client-0.1.13 b/metadata/md5-cache/dev-python/neovim-python-client-0.1.13
index 8ad0998fd9b2..3ea4ef5367c6 100644
--- a/metadata/md5-cache/dev-python/neovim-python-client-0.1.13
+++ b/metadata/md5-cache/dev-python/neovim-python-client-0.1.13
@@ -10,5 +10,5 @@ RDEPEND=<dev-python/msgpack-0.5.2:0[python_targets_python2_7(-)?,python_targets_
 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/neovim/python-client/archive/0.1.13.tar.gz -> neovim-python-client-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=98a418733cb5495407911aacaa58b080
diff --git a/metadata/md5-cache/dev-python/neovim-python-client-0.2.1-r1 b/metadata/md5-cache/dev-python/neovim-python-client-0.2.1-r1
index 057110954a97..342daa83c46b 100644
--- a/metadata/md5-cache/dev-python/neovim-python-client-0.2.1-r1
+++ b/metadata/md5-cache/dev-python/neovim-python-client-0.2.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/msgpack-0.5.2[python_targets_python2_7(-)?,python_targets_p
 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/neovim/python-client/archive/0.2.1.tar.gz -> neovim-python-client-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=94498d061572810dc74c35dd0cafb8f8
diff --git a/metadata/md5-cache/dev-python/neovim-python-client-0.2.4 b/metadata/md5-cache/dev-python/neovim-python-client-0.2.4
index cb0bb88c724a..330a91c7d425 100644
--- a/metadata/md5-cache/dev-python/neovim-python-client-0.2.4
+++ b/metadata/md5-cache/dev-python/neovim-python-client-0.2.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/msgpack-0.5.2[python_targets_python2_7(-)?,python_targets_p
 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/neovim/python-client/archive/0.2.4.tar.gz -> neovim-python-client-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=94498d061572810dc74c35dd0cafb8f8
diff --git a/metadata/md5-cache/dev-python/neovim-python-client-0.2.6 b/metadata/md5-cache/dev-python/neovim-python-client-0.2.6
index 38486c21ffd5..b5356c1bbdbc 100644
--- a/metadata/md5-cache/dev-python/neovim-python-client-0.2.6
+++ b/metadata/md5-cache/dev-python/neovim-python-client-0.2.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/msgpack-0.5.2[python_targets_python2_7(-)?,python_targets_p
 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/neovim/python-client/archive/0.2.6.tar.gz -> neovim-python-client-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=94498d061572810dc74c35dd0cafb8f8
diff --git a/metadata/md5-cache/dev-python/neovim-remote-1.8.6 b/metadata/md5-cache/dev-python/neovim-remote-1.8.6
index 678db4fef25f..747430a40d5f 100644
--- a/metadata/md5-cache/dev-python/neovim-remote-1.8.6
+++ b/metadata/md5-cache/dev-python/neovim-remote-1.8.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/neovim-python-client[python_targets_python3_4(-)?,python_targ
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/mhinz/neovim-remote/archive/v1.8.6.tar.gz -> neovim-remote-1.8.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=21667f1bf0fc6f1bfc08da09ed358d10
diff --git a/metadata/md5-cache/dev-python/neovim-remote-9999 b/metadata/md5-cache/dev-python/neovim-remote-9999
index 591b3ea20961..2bb84874d6a8 100644
--- a/metadata/md5-cache/dev-python/neovim-remote-9999
+++ b/metadata/md5-cache/dev-python/neovim-remote-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-python/neovim-python-client[python_targets_python3_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[python_targets_python3_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_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=21667f1bf0fc6f1bfc08da09ed358d10
diff --git a/metadata/md5-cache/dev-python/netaddr-0.7.12 b/metadata/md5-cache/dev-python/netaddr-0.7.12
index 8c8514a9a66d..53b2cdb9ca7b 100644
--- a/metadata/md5-cache/dev-python/netaddr-0.7.12
+++ b/metadata/md5-cache/dev-python/netaddr-0.7.12
@@ -10,5 +10,5 @@ RDEPEND=cli? ( >=dev-python/ipython-0.13.1-r1[python_targets_python2_7(-)?,pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/n/netaddr/netaddr-0.7.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f424e2cc65f6589bd4ec0ac07ddb94ba
diff --git a/metadata/md5-cache/dev-python/netaddr-0.7.13 b/metadata/md5-cache/dev-python/netaddr-0.7.13
index 644ef945ee8d..c4805eaae731 100644
--- a/metadata/md5-cache/dev-python/netaddr-0.7.13
+++ b/metadata/md5-cache/dev-python/netaddr-0.7.13
@@ -10,5 +10,5 @@ RDEPEND=cli? ( >=dev-python/ipython-0.13.1-r1[python_targets_python2_7(-)?,pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/n/netaddr/netaddr-0.7.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f04c4967aecd42bb707663aa0719bcbf
diff --git a/metadata/md5-cache/dev-python/netaddr-0.7.14 b/metadata/md5-cache/dev-python/netaddr-0.7.14
index 640a8dad1efc..286762b37374 100644
--- a/metadata/md5-cache/dev-python/netaddr-0.7.14
+++ b/metadata/md5-cache/dev-python/netaddr-0.7.14
@@ -10,5 +10,5 @@ RDEPEND=cli? ( >=dev-python/ipython-0.13.1-r1[python_targets_python2_7(-)?,pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/n/netaddr/netaddr-0.7.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f04c4967aecd42bb707663aa0719bcbf
diff --git a/metadata/md5-cache/dev-python/netaddr-0.7.15 b/metadata/md5-cache/dev-python/netaddr-0.7.15
index 155ef34b1b81..1c175c4b1a55 100644
--- a/metadata/md5-cache/dev-python/netaddr-0.7.15
+++ b/metadata/md5-cache/dev-python/netaddr-0.7.15
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/n/netaddr/netaddr-0.7.15.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=509dc4fe00dc2718de5f8a88f9db2477
diff --git a/metadata/md5-cache/dev-python/netaddr-0.7.17 b/metadata/md5-cache/dev-python/netaddr-0.7.17
index 213cb9e9a77a..c43a18c0c05d 100644
--- a/metadata/md5-cache/dev-python/netaddr-0.7.17
+++ b/metadata/md5-cache/dev-python/netaddr-0.7.17
@@ -10,5 +10,5 @@ RDEPEND=cli? ( >=dev-python/ipython-0.13.1-r1[python_targets_python2_7(-)?,pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/n/netaddr/netaddr-0.7.17.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d76287e378886a3d2d6d0b00e8c6a868
diff --git a/metadata/md5-cache/dev-python/netaddr-0.7.18 b/metadata/md5-cache/dev-python/netaddr-0.7.18
index 673f8ba2fac9..57f3d76c4fa5 100644
--- a/metadata/md5-cache/dev-python/netaddr-0.7.18
+++ b/metadata/md5-cache/dev-python/netaddr-0.7.18
@@ -10,5 +10,5 @@ RDEPEND=cli? ( >=dev-python/ipython-0.13.1-r1[python_targets_python2_7(-)?,pytho
 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/netaddr/netaddr-0.7.18.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=52ce8808d2ecee8861fb6093f1f75084
diff --git a/metadata/md5-cache/dev-python/netaddr-0.7.19 b/metadata/md5-cache/dev-python/netaddr-0.7.19
index 25690e74dd6c..ad8d260e73cb 100644
--- a/metadata/md5-cache/dev-python/netaddr-0.7.19
+++ b/metadata/md5-cache/dev-python/netaddr-0.7.19
@@ -10,5 +10,5 @@ RDEPEND=cli? ( >=dev-python/ipython-0.13.1-r1[python_targets_python2_7(-)?,pytho
 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/netaddr/netaddr-0.7.19.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b89ebe5d688f7d03f5e8ebc003087c9e
diff --git a/metadata/md5-cache/dev-python/netcdf4-python-1.2.2 b/metadata/md5-cache/dev-python/netcdf4-python-1.2.2
index ff5fafde39ba..8f8703545e5a 100644
--- a/metadata/md5-cache/dev-python/netcdf4-python-1.2.2
+++ b/metadata/md5-cache/dev-python/netcdf4-python-1.2.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy sci-libs/hdf5 sci-libs/netcdf:=[hdf,hdf5] python_target
 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/netCDF4/netCDF4-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d529414cc1cda1059f28c97f8613441a
diff --git a/metadata/md5-cache/dev-python/netifaces-0.10.6 b/metadata/md5-cache/dev-python/netifaces-0.10.6
index fd4948685d87..9af506e0b616 100644
--- a/metadata/md5-cache/dev-python/netifaces-0.10.6
+++ b/metadata/md5-cache/dev-python/netifaces-0.10.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/n/netifaces/netifaces-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6a9d10bef7d182fd6370cccc3a410629
diff --git a/metadata/md5-cache/dev-python/netifaces-0.10.7 b/metadata/md5-cache/dev-python/netifaces-0.10.7
index fa68fd793f26..f97b1bba2ef5 100644
--- a/metadata/md5-cache/dev-python/netifaces-0.10.7
+++ b/metadata/md5-cache/dev-python/netifaces-0.10.7
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/n/netifaces/netifaces-0.10.7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=aba1eb0f69ce0158fc17c276ce878025
diff --git a/metadata/md5-cache/dev-python/netlib-0.10 b/metadata/md5-cache/dev-python/netlib-0.10
index ba30d5c262d2..98fdff070e38 100644
--- a/metadata/md5-cache/dev-python/netlib-0.10
+++ b/metadata/md5-cache/dev-python/netlib-0.10
@@ -10,5 +10,5 @@ RDEPEND=>dev-python/pyasn1-0.1.2[python_targets_python2_7(-)?,-python_single_tar
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/n/netlib/netlib-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=88b99296a81741448ba3cf922efd89f5
diff --git a/metadata/md5-cache/dev-python/netlib-0.10.1 b/metadata/md5-cache/dev-python/netlib-0.10.1
index e5053d71e73c..2e0a02a6b5c3 100644
--- a/metadata/md5-cache/dev-python/netlib-0.10.1
+++ b/metadata/md5-cache/dev-python/netlib-0.10.1
@@ -10,5 +10,5 @@ RDEPEND=>dev-python/pyasn1-0.1.2[python_targets_python2_7(-)?,-python_single_tar
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/n/netlib/netlib-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bbec944f44e012c1f40ff41575a8f782
diff --git a/metadata/md5-cache/dev-python/netlib-0.11.1 b/metadata/md5-cache/dev-python/netlib-0.11.1
index d60b15ce51b2..7ad68e3771ef 100644
--- a/metadata/md5-cache/dev-python/netlib-0.11.1
+++ b/metadata/md5-cache/dev-python/netlib-0.11.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pyasn1-0.1.7[python_targets_python2_7(-)?,-python_single_ta
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/n/netlib/netlib-0.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d04b38bc3910428bde5e7654ba09d6dd
diff --git a/metadata/md5-cache/dev-python/netlib-0.11.2 b/metadata/md5-cache/dev-python/netlib-0.11.2
index c4dd2c973ade..7cad7b6f9e86 100644
--- a/metadata/md5-cache/dev-python/netlib-0.11.2
+++ b/metadata/md5-cache/dev-python/netlib-0.11.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pyasn1-0.1.7[python_targets_python2_7(-)?,-python_single_ta
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/n/netlib/netlib-0.11.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=bc6f0b5c9762baae3809b16c515c0483
diff --git a/metadata/md5-cache/dev-python/netlib-0.12.0 b/metadata/md5-cache/dev-python/netlib-0.12.0
index 7c13aae113e2..81e426672473 100644
--- a/metadata/md5-cache/dev-python/netlib-0.12.0
+++ b/metadata/md5-cache/dev-python/netlib-0.12.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pyasn1-0.1.7[python_targets_python2_7(-)?,-python_single_ta
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/n/netlib/netlib-0.12.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=bc6f0b5c9762baae3809b16c515c0483
diff --git a/metadata/md5-cache/dev-python/netmiko-1.4.2 b/metadata/md5-cache/dev-python/netmiko-1.4.2
index 2d2f13a8e455..6be2ea28b05f 100644
--- a/metadata/md5-cache/dev-python/netmiko-1.4.2
+++ b/metadata/md5-cache/dev-python/netmiko-1.4.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/n/netmiko/netmiko-1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=28a86b18443bae43115d07606fceb760
diff --git a/metadata/md5-cache/dev-python/netmiko-2.1.1 b/metadata/md5-cache/dev-python/netmiko-2.1.1
index fcac68f6f6dc..f899c62cc91e 100644
--- a/metadata/md5-cache/dev-python/netmiko-2.1.1
+++ b/metadata/md5-cache/dev-python/netmiko-2.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/n/netmiko/netmiko-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f3dc302ec210920ae917f84c5eb7db8e
diff --git a/metadata/md5-cache/dev-python/networkx-1.11 b/metadata/md5-cache/dev-python/networkx-1.11
index e95bf2797f55..362185b3371a 100644
--- a/metadata/md5-cache/dev-python/networkx-1.11
+++ b/metadata/md5-cache/dev-python/networkx-1.11
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets
 REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/n/networkx/networkx-1.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e73ebfca4be71722349ace8a4394281c
diff --git a/metadata/md5-cache/dev-python/networkx-1.11-r1 b/metadata/md5-cache/dev-python/networkx-1.11-r1
index 894a16a8db5b..29460b5b8570 100644
--- a/metadata/md5-cache/dev-python/networkx-1.11-r1
+++ b/metadata/md5-cache/dev-python/networkx-1.11-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets
 REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/n/networkx/networkx-1.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9343bb45d158feba22c5b9d8dd55a77d
diff --git a/metadata/md5-cache/dev-python/networkx-2.1 b/metadata/md5-cache/dev-python/networkx-2.1
index 1e53bea623b3..af81a70b0900 100644
--- a/metadata/md5-cache/dev-python/networkx-2.1
+++ b/metadata/md5-cache/dev-python/networkx-2.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets
 REQUIRED_USE=test? ( extras pandas scipy xml yaml ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/n/networkx/networkx-2.1.zip
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=30ef6e33349bac86752737fdaa1c9124
diff --git a/metadata/md5-cache/dev-python/neutron-lib-1.13.0 b/metadata/md5-cache/dev-python/neutron-lib-1.13.0
index 5bafe3577b7d..50cfb576ad9c 100644
--- a/metadata/md5-cache/dev-python/neutron-lib-1.13.0
+++ b/metadata/md5-cache/dev-python/neutron-lib-1.13.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 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/neutron-lib/neutron-lib-1.13.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6d90834f28092d43953b23be4b7a4a9f
diff --git a/metadata/md5-cache/dev-python/neutron-lib-1.18.0 b/metadata/md5-cache/dev-python/neutron-lib-1.18.0
index 7cae70589e82..d1ab9f9963b9 100644
--- a/metadata/md5-cache/dev-python/neutron-lib-1.18.0
+++ b/metadata/md5-cache/dev-python/neutron-lib-1.18.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 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/neutron-lib/neutron-lib-1.18.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4a0af80d115faab5dc58c5ae1179d946
diff --git a/metadata/md5-cache/dev-python/neutron-lib-1.9.1 b/metadata/md5-cache/dev-python/neutron-lib-1.9.1
index 9bf18c1c50c2..3c8e3368fb7b 100644
--- a/metadata/md5-cache/dev-python/neutron-lib-1.9.1
+++ b/metadata/md5-cache/dev-python/neutron-lib-1.9.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/n/neutron-lib/neutron-lib-1.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3155d668a3961aed040b58a179708ab8
diff --git a/metadata/md5-cache/dev-python/nevow-0.11.1 b/metadata/md5-cache/dev-python/nevow-0.11.1
index 4a0b3835fd17..3306f460502a 100644
--- a/metadata/md5-cache/dev-python/nevow-0.11.1
+++ b/metadata/md5-cache/dev-python/nevow-0.11.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/N/Nevow/Nevow-0.11.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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4bb325d94d9dcf9dd4c20d388e7696cb
diff --git a/metadata/md5-cache/dev-python/nevow-0.14.3 b/metadata/md5-cache/dev-python/nevow-0.14.3
index b75f719347e8..5c22f6ae495f 100644
--- a/metadata/md5-cache/dev-python/nevow-0.14.3
+++ b/metadata/md5-cache/dev-python/nevow-0.14.3
@@ -10,5 +10,5 @@ RDEPEND=|| ( dev-python/twisted[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/N/Nevow/Nevow-0.14.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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=86a26145433766e022a560ff4782216d
diff --git a/metadata/md5-cache/dev-python/newt_syrup-0.1.2-r1 b/metadata/md5-cache/dev-python/newt_syrup-0.1.2-r1
index a6365fa568de..d58fb5b8fd90 100644
--- a/metadata/md5-cache/dev-python/newt_syrup-0.1.2-r1
+++ b/metadata/md5-cache/dev-python/newt_syrup-0.1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/newt-0.52.11 python_targets_python2_7? ( >=dev-lang/python-2.
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://mcpierce.fedorapeople.org/rpms/newt_syrup-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8ca77bff8490d25e53c915d14eb11003
diff --git a/metadata/md5-cache/dev-python/nltk-3.2.3 b/metadata/md5-cache/dev-python/nltk-3.2.3
index f001d5c86beb..1247e3de2888 100644
--- a/metadata/md5-cache/dev-python/nltk-3.2.3
+++ b/metadata/md5-cache/dev-python/nltk-3.2.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/n/nltk/nltk-3.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cb9d705f7703997e5b6c9dca78294a74
diff --git a/metadata/md5-cache/dev-python/nltk-3.2.5 b/metadata/md5-cache/dev-python/nltk-3.2.5
index 0de3cc113921..3f830425f379 100644
--- a/metadata/md5-cache/dev-python/nltk-3.2.5
+++ b/metadata/md5-cache/dev-python/nltk-3.2.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/n/nltk/nltk-3.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=16e3d722dc45642b25c12d0c40a07c7b
diff --git a/metadata/md5-cache/dev-python/nnpy-1.4.1 b/metadata/md5-cache/dev-python/nnpy-1.4.1
index a78b46accc21..a2257f45d206 100644
--- a/metadata/md5-cache/dev-python/nnpy-1.4.1
+++ b/metadata/md5-cache/dev-python/nnpy-1.4.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/cffi:=[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/nanomsg/nnpy/archive/1.4.1.tar.gz -> nnpy-1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=356bdfbc5513e26f171682be1b94d1c6
diff --git a/metadata/md5-cache/dev-python/nnpy-1.4.2 b/metadata/md5-cache/dev-python/nnpy-1.4.2
index 2167a5f03e09..9ccb7977f6ee 100644
--- a/metadata/md5-cache/dev-python/nnpy-1.4.2
+++ b/metadata/md5-cache/dev-python/nnpy-1.4.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/cffi:=[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/nanomsg/nnpy/archive/1.4.2.tar.gz -> nnpy-1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7b515ceceb335e732f7fdfe8ebe73244
diff --git a/metadata/md5-cache/dev-python/node-semver-0.2.0 b/metadata/md5-cache/dev-python/node-semver-0.2.0
index 2cd9288c005b..23d63e0addfc 100644
--- a/metadata/md5-cache/dev-python/node-semver-0.2.0
+++ b/metadata/md5-cache/dev-python/node-semver-0.2.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/n/node-semver/node-semver-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ffbc7de54605e8e0f81ec920176b08e7
diff --git a/metadata/md5-cache/dev-python/nose-1.3.7-r1 b/metadata/md5-cache/dev-python/nose-1.3.7-r1
index d24787cc79aa..4f843309cc0d 100644
--- a/metadata/md5-cache/dev-python/nose-1.3.7-r1
+++ b/metadata/md5-cache/dev-python/nose-1.3.7-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/coverage[python_targets_pypy(-)?,python_targets_pypy3(-)?,pyt
 REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( 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/n/nose/nose-1.3.7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3ac43e11461b9658bcdd873d32b06117
diff --git a/metadata/md5-cache/dev-python/nose-1.3.7-r3 b/metadata/md5-cache/dev-python/nose-1.3.7-r3
index 1895d97bcdab..abbdbc6f122c 100644
--- a/metadata/md5-cache/dev-python/nose-1.3.7-r3
+++ b/metadata/md5-cache/dev-python/nose-1.3.7-r3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/coverage[python_targets_pypy(-)?,python_targets_pypy3(-)?,pyt
 REQUIRED_USE=doc? ( || ( python_targets_python2_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 )
 SLOT=0
 SRC_URI=mirror://pypi/n/nose/nose-1.3.7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c8ae5b30bac9a1bb0519f6c0b4171cf9
diff --git a/metadata/md5-cache/dev-python/nose-9999 b/metadata/md5-cache/dev-python/nose-9999
index b9750c6e44e9..4b6686c8400e 100644
--- a/metadata/md5-cache/dev-python/nose-9999
+++ b/metadata/md5-cache/dev-python/nose-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=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(-)] 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=[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=doc? ( || ( python_targets_python2_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 )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=de073af07779060caeb583882fb228eb
diff --git a/metadata/md5-cache/dev-python/nose-cover3-0.1.0-r1 b/metadata/md5-cache/dev-python/nose-cover3-0.1.0-r1
index 04ca05bc1c8f..56ef8f55713a 100644
--- a/metadata/md5-cache/dev-python/nose-cover3-0.1.0-r1
+++ b/metadata/md5-cache/dev-python/nose-cover3-0.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_
 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/n/nose-cover3/nose-cover3-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=743ed0cd69582e343aa682a326894a77
diff --git a/metadata/md5-cache/dev-python/nose-descriptionfixer-0.0.4 b/metadata/md5-cache/dev-python/nose-descriptionfixer-0.0.4
index ed759d61b18e..cbdbc737dc71 100644
--- a/metadata/md5-cache/dev-python/nose-descriptionfixer-0.0.4
+++ b/metadata/md5-cache/dev-python/nose-descriptionfixer-0.0.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_
 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/n/nose-descriptionfixer/nose-descriptionfixer-0.0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=40101215ad95971e37901fe584458741
diff --git a/metadata/md5-cache/dev-python/nose-exclude-0.4.1 b/metadata/md5-cache/dev-python/nose-exclude-0.4.1
index a2e8616044ca..5b84a13cab89 100644
--- a/metadata/md5-cache/dev-python/nose-exclude-0.4.1
+++ b/metadata/md5-cache/dev-python/nose-exclude-0.4.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_
 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/n/nose-exclude/nose-exclude-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=372711d5c203583cdfcf38ac5be3f0ca
diff --git a/metadata/md5-cache/dev-python/nose-exclude-0.5.0 b/metadata/md5-cache/dev-python/nose-exclude-0.5.0
index 895ccf274140..cd652d9f5bfc 100644
--- a/metadata/md5-cache/dev-python/nose-exclude-0.5.0
+++ b/metadata/md5-cache/dev-python/nose-exclude-0.5.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_
 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/n/nose-exclude/nose-exclude-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=02aa2d50e1b8903779b773992bea9c05
diff --git a/metadata/md5-cache/dev-python/nose-parameterized-0.5.0 b/metadata/md5-cache/dev-python/nose-parameterized-0.5.0
index 0b7b231115c3..4e5d13305eaf 100644
--- a/metadata/md5-cache/dev-python/nose-parameterized-0.5.0
+++ b/metadata/md5-cache/dev-python/nose-parameterized-0.5.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/n/nose-parameterized/nose-parameterized-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c28b9b58eafe2d867039de5fe03054e4
diff --git a/metadata/md5-cache/dev-python/nose-show-skipped-0.1 b/metadata/md5-cache/dev-python/nose-show-skipped-0.1
index 1f49cd819ab8..a07376a9ddff 100644
--- a/metadata/md5-cache/dev-python/nose-show-skipped-0.1
+++ b/metadata/md5-cache/dev-python/nose-show-skipped-0.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/n/nose-show-skipped/nose-show-skipped-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9d9361a66e42681c726d0731b5d06539
diff --git a/metadata/md5-cache/dev-python/nose-testconfig-0.10 b/metadata/md5-cache/dev-python/nose-testconfig-0.10
index e83e5b9233ad..612719fd53e8 100644
--- a/metadata/md5-cache/dev-python/nose-testconfig-0.10
+++ b/metadata/md5-cache/dev-python/nose-testconfig-0.10
@@ -10,5 +10,5 @@ RDEPEND=dev-python/nose python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targ
 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/n/nose-testconfig/nose-testconfig-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4675636ae5b1458a6823b9246630d1e4
diff --git a/metadata/md5-cache/dev-python/nose-testconfig-0.9 b/metadata/md5-cache/dev-python/nose-testconfig-0.9
index 0c3d36d01b69..ae620e596200 100644
--- a/metadata/md5-cache/dev-python/nose-testconfig-0.9
+++ b/metadata/md5-cache/dev-python/nose-testconfig-0.9
@@ -10,5 +10,5 @@ RDEPEND=dev-python/nose python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targ
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/n/nose-testconfig/nose-testconfig-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=623fd6ca73d82c9c8117ce0e0ac21cae
diff --git a/metadata/md5-cache/dev-python/nose2-0.6.5 b/metadata/md5-cache/dev-python/nose2-0.6.5
index eb50c2342d8a..221d873c52a2 100644
--- a/metadata/md5-cache/dev-python/nose2-0.6.5
+++ b/metadata/md5-cache/dev-python/nose2-0.6.5
@@ -10,5 +10,5 @@ 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
 SRC_URI=https://github.com/nose-devs/nose2/archive/0.6.5.tar.gz -> nose2-0.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=484fba01dc1e9bfd8cf8764eff601c05
diff --git a/metadata/md5-cache/dev-python/nose_fixes-1.3 b/metadata/md5-cache/dev-python/nose_fixes-1.3
index a479a8de9389..1c05a1940169 100644
--- a/metadata/md5-cache/dev-python/nose_fixes-1.3
+++ b/metadata/md5-cache/dev-python/nose_fixes-1.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,p
 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/n/nose_fixes/nose_fixes-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=eb89fcc3fc5d12676f1ad4ccc8b205c8
diff --git a/metadata/md5-cache/dev-python/nose_warnings_filters-0.1.5-r2 b/metadata/md5-cache/dev-python/nose_warnings_filters-0.1.5-r2
index bbd9f98f530e..72c29c9dd9e1 100644
--- a/metadata/md5-cache/dev-python/nose_warnings_filters-0.1.5-r2
+++ b/metadata/md5-cache/dev-python/nose_warnings_filters-0.1.5-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/n/nose_warnings_filters/nose_warnings_filters-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=06a15b3ff730b32e287fe779d0b21388
diff --git a/metadata/md5-cache/dev-python/nosehtmloutput-0.0.5 b/metadata/md5-cache/dev-python/nosehtmloutput-0.0.5
index a7ae27e85174..9641999f3190 100644
--- a/metadata/md5-cache/dev-python/nosehtmloutput-0.0.5
+++ b/metadata/md5-cache/dev-python/nosehtmloutput-0.0.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,pyt
 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/n/nosehtmloutput/nosehtmloutput-0.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=078cb7da3a244a876ef6571b1d07043f
diff --git a/metadata/md5-cache/dev-python/nosexcover-1.0.10 b/metadata/md5-cache/dev-python/nosexcover-1.0.10
index 7a3f11c0f3de..280903f6770f 100644
--- a/metadata/md5-cache/dev-python/nosexcover-1.0.10
+++ b/metadata/md5-cache/dev-python/nosexcover-1.0.10
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-
 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/n/nosexcover/nosexcover-1.0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=09510660a66dbd1a682b44c426c6283f
diff --git a/metadata/md5-cache/dev-python/nosexcover-1.0.11 b/metadata/md5-cache/dev-python/nosexcover-1.0.11
index 68a1e077b50b..9caa0470457f 100644
--- a/metadata/md5-cache/dev-python/nosexcover-1.0.11
+++ b/metadata/md5-cache/dev-python/nosexcover-1.0.11
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-
 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/n/nosexcover/nosexcover-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b58381a87a5ef8d3ac2904f28db17208
diff --git a/metadata/md5-cache/dev-python/notebook-5.0.0 b/metadata/md5-cache/dev-python/notebook-5.0.0
index f9cdb3485565..25c5c0f27c2e 100644
--- a/metadata/md5-cache/dev-python/notebook-5.0.0
+++ b/metadata/md5-cache/dev-python/notebook-5.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/mathjax-2.4 dev-python/jinja[python_targets_python2_7(-)?,pyt
 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/notebook/notebook-5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8d4115bda1c0ffec4a7fd9feefa9d276
diff --git a/metadata/md5-cache/dev-python/notebook-5.2.1 b/metadata/md5-cache/dev-python/notebook-5.2.1
index 99b4a5a79d7b..a6d1e4d108e7 100644
--- a/metadata/md5-cache/dev-python/notebook-5.2.1
+++ b/metadata/md5-cache/dev-python/notebook-5.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/mathjax-2.4 dev-python/jinja[python_targets_python2_7(-)?,pyt
 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/notebook/notebook-5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=52cd85e7585301c3fc0488ed81c278a2
diff --git a/metadata/md5-cache/dev-python/notify2-0.3 b/metadata/md5-cache/dev-python/notify2-0.3
index d4a08d630686..378733e4097a 100644
--- a/metadata/md5-cache/dev-python/notify2-0.3
+++ b/metadata/md5-cache/dev-python/notify2-0.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_pytho
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-python/ntlm-auth-1.1.0 b/metadata/md5-cache/dev-python/ntlm-auth-1.1.0
index d33fae14ffc0..5963940e56a0 100644
--- a/metadata/md5-cache/dev-python/ntlm-auth-1.1.0
+++ b/metadata/md5-cache/dev-python/ntlm-auth-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/jborean93/ntlm-auth/archive/v1.1.0.tar.gz -> ntlm-auth-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a6dcab4e6dffdee4118be001048837b3
diff --git a/metadata/md5-cache/dev-python/ntlm-auth-1.2.0 b/metadata/md5-cache/dev-python/ntlm-auth-1.2.0
index f547e1e88cb7..9cef6383f120 100644
--- a/metadata/md5-cache/dev-python/ntlm-auth-1.2.0
+++ b/metadata/md5-cache/dev-python/ntlm-auth-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/jborean93/ntlm-auth/archive/v1.2.0.tar.gz -> ntlm-auth-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a6dcab4e6dffdee4118be001048837b3
diff --git a/metadata/md5-cache/dev-python/ntplib-0.3.3 b/metadata/md5-cache/dev-python/ntplib-0.3.3
index 5a5c6dde094b..67019c38e6c9 100644
--- a/metadata/md5-cache/dev-python/ntplib-0.3.3
+++ b/metadata/md5-cache/dev-python/ntplib-0.3.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/n/ntplib/ntplib-0.3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=47310c9ac9aaadb794961facd2492cfd
diff --git a/metadata/md5-cache/dev-python/numba-0.27.0 b/metadata/md5-cache/dev-python/numba-0.27.0
index 7cc7fb9a7e8c..1856e9a06841 100644
--- a/metadata/md5-cache/dev-python/numba-0.27.0
+++ b/metadata/md5-cache/dev-python/numba-0.27.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/llvmlite-0.10[python_targets_python2_7(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/numba/numba/archive/0.27.0.tar.gz -> numba-0.27.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d7d2c0f2abe38b6b8c08ed3e43656a52
diff --git a/metadata/md5-cache/dev-python/numba-0.35.0 b/metadata/md5-cache/dev-python/numba-0.35.0
index 095dc5a3db66..4895305ccccc 100644
--- a/metadata/md5-cache/dev-python/numba-0.35.0
+++ b/metadata/md5-cache/dev-python/numba-0.35.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/llvmlite-0.19[python_targets_python2_7(-)?,python_targets_p
 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/numba/numba/archive/0.35.0.tar.gz -> numba-0.35.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2ea79b5f708413284d2bb885e32ff08d
diff --git a/metadata/md5-cache/dev-python/numba-0.37.0 b/metadata/md5-cache/dev-python/numba-0.37.0
index c7215715ae42..dd811bf9f44c 100644
--- a/metadata/md5-cache/dev-python/numba-0.37.0
+++ b/metadata/md5-cache/dev-python/numba-0.37.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/llvmlite-0.22.0[python_targets_python2_7(-)?,python_targets
 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/numba/numba/archive/0.37.0.tar.gz -> numba-0.37.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c45647668c3e7f67760f5caa2f6abe4a
diff --git a/metadata/md5-cache/dev-python/numba-0.39.0 b/metadata/md5-cache/dev-python/numba-0.39.0
index 4e45dac9809e..a683b43c606f 100644
--- a/metadata/md5-cache/dev-python/numba-0.39.0
+++ b/metadata/md5-cache/dev-python/numba-0.39.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/llvmlite-0.22.0[python_targets_python2_7(-)?,python_targets
 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/numba/numba/archive/0.39.0.tar.gz -> numba-0.39.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c915fef81b8f5133cd1f7111f3497121
diff --git a/metadata/md5-cache/dev-python/numdisplay-1.6.0-r1 b/metadata/md5-cache/dev-python/numdisplay-1.6.0-r1
index 5eeb7eaa8208..2d30297caa10 100644
--- a/metadata/md5-cache/dev-python/numdisplay-1.6.0-r1
+++ b/metadata/md5-cache/dev-python/numdisplay-1.6.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://stsdas.stsci.edu/download/numdisplay/numdisplay-1.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3567db19cab1cc77866abe3c8f676f1f
diff --git a/metadata/md5-cache/dev-python/numexpr-2.6.1 b/metadata/md5-cache/dev-python/numexpr-2.6.1
index df4410b9d4bf..b1ae27757a65 100644
--- a/metadata/md5-cache/dev-python/numexpr-2.6.1
+++ b/metadata/md5-cache/dev-python/numexpr-2.6.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/numpy-1.6[python_targets_python2_7(-)?,python_targets_pytho
 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/numexpr/numexpr-2.6.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d0a94b9950ee4269c7730209be96b4f3
diff --git a/metadata/md5-cache/dev-python/numexpr-2.6.2 b/metadata/md5-cache/dev-python/numexpr-2.6.2
index 3eae7eff1396..0eeb9059e40b 100644
--- a/metadata/md5-cache/dev-python/numexpr-2.6.2
+++ b/metadata/md5-cache/dev-python/numexpr-2.6.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/numpy-1.6[python_targets_python2_7(-)?,python_targets_pytho
 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/numexpr/numexpr-2.6.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ae81d2ea3d7e120c9f31f68c6765b950
diff --git a/metadata/md5-cache/dev-python/numpy-1.10.4 b/metadata/md5-cache/dev-python/numpy-1.10.4
index 92ddd62dee9d..904b39761629 100644
--- a/metadata/md5-cache/dev-python/numpy-1.10.4
+++ b/metadata/md5-cache/dev-python/numpy-1.10.4
@@ -10,5 +10,5 @@ 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
 SRC_URI=mirror://pypi/n/numpy/numpy-1.10.4.tar.gz doc? ( http://docs.scipy.org/doc/numpy-1.10.1/numpy-html-1.10.1.zip http://docs.scipy.org/doc/numpy-1.10.1/numpy-ref-1.10.1.pdf http://docs.scipy.org/doc/numpy-1.10.1/numpy-user-1.10.1.pdf )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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_=6e946488cfa9beead235ba68f4ab4be0
diff --git a/metadata/md5-cache/dev-python/numpy-1.13.3 b/metadata/md5-cache/dev-python/numpy-1.13.3
index d85111981ecb..e8027a76ef3d 100644
--- a/metadata/md5-cache/dev-python/numpy-1.13.3
+++ b/metadata/md5-cache/dev-python/numpy-1.13.3
@@ -10,5 +10,5 @@ RDEPEND=lapack? ( virtual/cblas virtual/lapack ) python_targets_python2_7? ( >=d
 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/numpy/numpy-1.13.3.zip doc? ( http://docs.scipy.org/doc/numpy-1.13.0/numpy-html-1.13.0.zip http://docs.scipy.org/doc/numpy-1.13.0/numpy-ref-1.13.0.pdf http://docs.scipy.org/doc/numpy-1.13.0/numpy-user-1.13.0.pdf )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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_=fbf5650d39d10a9c3b6580d607cf102e
diff --git a/metadata/md5-cache/dev-python/numpy-1.14.5 b/metadata/md5-cache/dev-python/numpy-1.14.5
index bbf1e44ace45..95d0c71ce8d2 100644
--- a/metadata/md5-cache/dev-python/numpy-1.14.5
+++ b/metadata/md5-cache/dev-python/numpy-1.14.5
@@ -10,5 +10,5 @@ RDEPEND=lapack? ( virtual/cblas virtual/lapack ) python_targets_python2_7? ( >=d
 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/n/numpy/numpy-1.14.5.zip doc? ( http://docs.scipy.org/doc/numpy-1.14.5/numpy-html-1.14.5.zip http://docs.scipy.org/doc/numpy-1.14.5/numpy-ref-1.14.5.pdf http://docs.scipy.org/doc/numpy-1.14.5/numpy-user-1.14.5.pdf )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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_=62c4a2a12649ce2acffcb8ddbbf47862
diff --git a/metadata/md5-cache/dev-python/numpy-1.8.2 b/metadata/md5-cache/dev-python/numpy-1.8.2
index 15e4ef4b5f32..dde3c8702e4e 100644
--- a/metadata/md5-cache/dev-python/numpy-1.8.2
+++ b/metadata/md5-cache/dev-python/numpy-1.8.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpy/numpy-1.8.2.tar.gz doc? ( http://docs.scipy.org/doc/numpy-1.8.1/numpy-html-1.8.1.zip http://docs.scipy.org/doc/numpy-1.8.1/numpy-ref-1.8.1.pdf http://docs.scipy.org/doc/numpy-1.8.1/numpy-user-1.8.1.pdf )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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_=3193cccb975a2ced4c036ce0997a952a
diff --git a/metadata/md5-cache/dev-python/numpy-1.9.2 b/metadata/md5-cache/dev-python/numpy-1.9.2
index 056f2ca02b8f..3115e8280154 100644
--- a/metadata/md5-cache/dev-python/numpy-1.9.2
+++ b/metadata/md5-cache/dev-python/numpy-1.9.2
@@ -10,5 +10,5 @@ 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
 SRC_URI=mirror://pypi/n/numpy/numpy-1.9.2.tar.gz doc? ( http://docs.scipy.org/doc/numpy-1.9.1/numpy-html-1.9.1.zip http://docs.scipy.org/doc/numpy-1.9.1/numpy-ref-1.9.1.pdf http://docs.scipy.org/doc/numpy-1.9.1/numpy-user-1.9.1.pdf )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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_=b7f3d7a4d4fcd3797d8bf45fab5cb452
diff --git a/metadata/md5-cache/dev-python/numpy-9999 b/metadata/md5-cache/dev-python/numpy-9999
index 17498a52dc00..33cf2aec9377 100644
--- a/metadata/md5-cache/dev-python/numpy-9999
+++ b/metadata/md5-cache/dev-python/numpy-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 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(-)] lapack? ( virtual/cblas virtual/lapack ) 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(-)] lapack? ( virtual/fortran )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c1517f3d2b96cc062bcecf084a34fcb1
diff --git a/metadata/md5-cache/dev-python/numpydoc-0.6.0 b/metadata/md5-cache/dev-python/numpydoc-0.6.0
index c1485873447c..36e93c6414d2 100644
--- a/metadata/md5-cache/dev-python/numpydoc-0.6.0
+++ b/metadata/md5-cache/dev-python/numpydoc-0.6.0
@@ -10,5 +10,5 @@ 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
 SRC_URI=mirror://pypi/n/numpydoc/numpydoc-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=24ac674e1720f0a5c03386d0b171ef56
diff --git a/metadata/md5-cache/dev-python/numpydoc-0.7.0 b/metadata/md5-cache/dev-python/numpydoc-0.7.0
index 4c65c3c40ba2..5e5db0525c86 100644
--- a/metadata/md5-cache/dev-python/numpydoc-0.7.0
+++ b/metadata/md5-cache/dev-python/numpydoc-0.7.0
@@ -10,5 +10,5 @@ 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
 SRC_URI=mirror://pypi/n/numpydoc/numpydoc-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=acbaa176b0c66dc2925b11b5d8327ad1
diff --git a/metadata/md5-cache/dev-python/oauth-1.0.1-r1 b/metadata/md5-cache/dev-python/oauth-1.0.1-r1
index 58993974c632..9773fb360ee4 100644
--- a/metadata/md5-cache/dev-python/oauth-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/oauth-1.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oauth/oauth-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1ad8b2f6589e51ab50591a2d554837db
diff --git a/metadata/md5-cache/dev-python/oauth2-1.9.0_p1-r1 b/metadata/md5-cache/dev-python/oauth2-1.9.0_p1-r1
index 53827e259a04..e387c75fa5e1 100644
--- a/metadata/md5-cache/dev-python/oauth2-1.9.0_p1-r1
+++ b/metadata/md5-cache/dev-python/oauth2-1.9.0_p1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/httplib2[python_targets_pypy(-)?,python_targets_python2_7(-)?
 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/o/oauth2/oauth2-1.9.0.post1.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=03ea8d7f11405412f1e6c407171a77c8
diff --git a/metadata/md5-cache/dev-python/oauth2client-2.0.1 b/metadata/md5-cache/dev-python/oauth2client-2.0.1
index 60c6fb8dc233..048360262281 100644
--- a/metadata/md5-cache/dev-python/oauth2client-2.0.1
+++ b/metadata/md5-cache/dev-python/oauth2client-2.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/google/oauth2client/archive/v2.0.1.tar.gz -> oauth2client-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2f4df5c3bbc5cbbe05d9cc48d456d542
diff --git a/metadata/md5-cache/dev-python/oauth2client-2.2.0 b/metadata/md5-cache/dev-python/oauth2client-2.2.0
index 1b09f8252fda..6b700e63d061 100644
--- a/metadata/md5-cache/dev-python/oauth2client-2.2.0
+++ b/metadata/md5-cache/dev-python/oauth2client-2.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/google/oauth2client/archive/v2.2.0.tar.gz -> oauth2client-2.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=632e7966f8f90ed775420976f12efa24
diff --git a/metadata/md5-cache/dev-python/oauth2client-4.1.2 b/metadata/md5-cache/dev-python/oauth2client-4.1.2
index 1deb5a691d2d..e335e78551a9 100644
--- a/metadata/md5-cache/dev-python/oauth2client-4.1.2
+++ b/metadata/md5-cache/dev-python/oauth2client-4.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/httplib2-0.9.1[python_targets_pypy(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) || ( 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/google/oauth2client/archive/v4.1.2.tar.gz -> oauth2client-4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a75cf52fb6f78a2c89559ce72ef2754d
diff --git a/metadata/md5-cache/dev-python/oauthlib-1.0.3 b/metadata/md5-cache/dev-python/oauthlib-1.0.3
index 2aa215715baa..5007ea924bb7 100644
--- a/metadata/md5-cache/dev-python/oauthlib-1.0.3
+++ b/metadata/md5-cache/dev-python/oauthlib-1.0.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pycrypto[python_targets_python2_7(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oauthlib/oauthlib-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=79b2a576b05d78e3b91ced5d5e7f1e04
diff --git a/metadata/md5-cache/dev-python/oauthlib-2.0.2 b/metadata/md5-cache/dev-python/oauthlib-2.0.2
index c1ab411f20d8..645d8d1733ce 100644
--- a/metadata/md5-cache/dev-python/oauthlib-2.0.2
+++ b/metadata/md5-cache/dev-python/oauthlib-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pyjwt-1.0.0[python_targets_python2_7(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oauthlib/oauthlib-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ef7078ca15b52fa2dcdf72cbd4d9b1b9
diff --git a/metadata/md5-cache/dev-python/oauthlib-2.0.3 b/metadata/md5-cache/dev-python/oauthlib-2.0.3
index d418cf5a3c52..425c8d99b6c8 100644
--- a/metadata/md5-cache/dev-python/oauthlib-2.0.3
+++ b/metadata/md5-cache/dev-python/oauthlib-2.0.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pyjwt-1.0.0[python_targets_python2_7(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oauthlib/oauthlib-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=141915ebe85f28eb6aa5b452d00c380b
diff --git a/metadata/md5-cache/dev-python/oauthlib-2.0.6 b/metadata/md5-cache/dev-python/oauthlib-2.0.6
index 725ad8a9ff11..ba245891983a 100644
--- a/metadata/md5-cache/dev-python/oauthlib-2.0.6
+++ b/metadata/md5-cache/dev-python/oauthlib-2.0.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pyjwt-1.0.0[python_targets_python2_7(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oauthlib/oauthlib-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dd0082c598e6cceba283711d52fc63d9
diff --git a/metadata/md5-cache/dev-python/objgraph-1.7.2 b/metadata/md5-cache/dev-python/objgraph-1.7.2
index 4dd56c5e129e..e37d1a9c9d27 100644
--- a/metadata/md5-cache/dev-python/objgraph-1.7.2
+++ b/metadata/md5-cache/dev-python/objgraph-1.7.2
@@ -10,5 +10,5 @@ RDEPEND=media-gfx/graphviz python_targets_python2_7? ( >=dev-lang/python-2.7.5-r
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/objgraph/objgraph-1.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0068e348b10fd8364ff8b532bad20c0b
diff --git a/metadata/md5-cache/dev-python/objgraph-1.8.1 b/metadata/md5-cache/dev-python/objgraph-1.8.1
index c558f5753227..fefc552cbdfb 100644
--- a/metadata/md5-cache/dev-python/objgraph-1.8.1
+++ b/metadata/md5-cache/dev-python/objgraph-1.8.1
@@ -10,5 +10,5 @@ RDEPEND=media-gfx/graphviz python_targets_python2_7? ( >=dev-lang/python-2.7.5-r
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/objgraph/objgraph-1.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0068e348b10fd8364ff8b532bad20c0b
diff --git a/metadata/md5-cache/dev-python/objgraph-3.1.0 b/metadata/md5-cache/dev-python/objgraph-3.1.0
index ad57ece9ff65..f28b2d5dcc54 100644
--- a/metadata/md5-cache/dev-python/objgraph-3.1.0
+++ b/metadata/md5-cache/dev-python/objgraph-3.1.0
@@ -10,5 +10,5 @@ RDEPEND=media-gfx/graphviz python_targets_python2_7? ( >=dev-lang/python-2.7.5-r
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/objgraph/objgraph-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1a49e9ea5f73bb8eca5942d9883c430d
diff --git a/metadata/md5-cache/dev-python/oct2py-3.6.0 b/metadata/md5-cache/dev-python/oct2py-3.6.0
index 4b9fdaf62af4..38165f372275 100644
--- a/metadata/md5-cache/dev-python/oct2py-3.6.0
+++ b/metadata/md5-cache/dev-python/oct2py-3.6.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/numpy-1.7.1[python_targets_python2_7(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oct2py/oct2py-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d48b9d35ca2f18fffc3f60fd852907da
diff --git a/metadata/md5-cache/dev-python/oct2py-4.0.6 b/metadata/md5-cache/dev-python/oct2py-4.0.6
index 4810b1964538..8661438fe09c 100644
--- a/metadata/md5-cache/dev-python/oct2py-4.0.6
+++ b/metadata/md5-cache/dev-python/oct2py-4.0.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/numpy-1.11[python_targets_python2_7(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oct2py/oct2py-4.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ad4d222eee2058c25b3917b15fb00825
diff --git a/metadata/md5-cache/dev-python/octave_kernel-0.26.2 b/metadata/md5-cache/dev-python/octave_kernel-0.26.2
index 31839a94c23b..fc87ba8766bf 100644
--- a/metadata/md5-cache/dev-python/octave_kernel-0.26.2
+++ b/metadata/md5-cache/dev-python/octave_kernel-0.26.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/octave_kernel/octave_kernel-0.26.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=21919f847b7a16e46f8e6e89f5dd673c
diff --git a/metadata/md5-cache/dev-python/odo-0.5.0 b/metadata/md5-cache/dev-python/odo-0.5.0
index b633d974bc77..9f289a4b1f7a 100644
--- a/metadata/md5-cache/dev-python/odo-0.5.0
+++ b/metadata/md5-cache/dev-python/odo-0.5.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/datashape-0.4.4[python_targets_python2_7(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/o/odo/odo-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e76efb14163cc47a1cd8df164d210885
diff --git a/metadata/md5-cache/dev-python/odo-0.5.0-r1 b/metadata/md5-cache/dev-python/odo-0.5.0-r1
index 5477cc717e90..f4b0ffcd8104 100644
--- a/metadata/md5-cache/dev-python/odo-0.5.0-r1
+++ b/metadata/md5-cache/dev-python/odo-0.5.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/datashape-0.4.6[python_targets_python2_7(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/odo/odo-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0ac791611e1ff7a150741572bfd71a0e
diff --git a/metadata/md5-cache/dev-python/olefile-0.44 b/metadata/md5-cache/dev-python/olefile-0.44
index 057d46912b8f..326026358d32 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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=5f764ddac3fb9b6008d35904621bb740
+_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
diff --git a/metadata/md5-cache/dev-python/olefile-0.46 b/metadata/md5-cache/dev-python/olefile-0.46
index 3eb28b2e0b12..e48f34e70129 100644
--- a/metadata/md5-cache/dev-python/olefile-0.46
+++ b/metadata/md5-cache/dev-python/olefile-0.46
@@ -1,14 +1,14 @@
-BDEPEND=doc? ( dev-python/sphinx[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(-)] ) 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(-)]
+BDEPEND=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(-)] ) 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=Python package to parse, read and write Microsoft OLE2 files
 EAPI=7
 HOMEPAGE=https://www.decalage.info/olefile
-IUSE=doc python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+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=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 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_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 )
+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/decalage2/olefile/archive/v0.46.tar.gz -> olefile-0.46.tar.gz
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=c89d0a41b4bb404cdd33399902d7e180
+_md5_=cd10abebe0b29018aa5549fcc4168f3b
diff --git a/metadata/md5-cache/dev-python/onkyo-eiscp-1.2.4 b/metadata/md5-cache/dev-python/onkyo-eiscp-1.2.4
index 59fa8de8fd32..1e8b0832964b 100644
--- a/metadata/md5-cache/dev-python/onkyo-eiscp-1.2.4
+++ b/metadata/md5-cache/dev-python/onkyo-eiscp-1.2.4
@@ -10,5 +10,5 @@ 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
 SRC_URI=mirror://pypi/o/onkyo-eiscp/onkyo-eiscp-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cc151b1e1d4d4525d00b9fa0d638e999
diff --git a/metadata/md5-cache/dev-python/onkyo-eiscp-1.2.5 b/metadata/md5-cache/dev-python/onkyo-eiscp-1.2.5
index 31a2b864fb9c..cdf06a417991 100644
--- a/metadata/md5-cache/dev-python/onkyo-eiscp-1.2.5
+++ b/metadata/md5-cache/dev-python/onkyo-eiscp-1.2.5
@@ -10,5 +10,5 @@ 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
 SRC_URI=mirror://pypi/o/onkyo-eiscp/onkyo-eiscp-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=55bc77667830dfb44daa28a798ad96d5
diff --git a/metadata/md5-cache/dev-python/openpyxl-2.4.11 b/metadata/md5-cache/dev-python/openpyxl-2.4.11
index 95a5638a7a1d..a5ffcaa37232 100644
--- a/metadata/md5-cache/dev-python/openpyxl-2.4.11
+++ b/metadata/md5-cache/dev-python/openpyxl-2.4.11
@@ -10,5 +10,5 @@ RDEPEND=dev-python/jdcal[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://bitbucket.org/openpyxl/openpyxl/get/2.4.11.tar.bz2 -> openpyxl-2.4.11.tar.bz2
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=765d4ccd8194b031b2386f43952cf745
diff --git a/metadata/md5-cache/dev-python/openstack-nose-plugin-0.11-r2 b/metadata/md5-cache/dev-python/openstack-nose-plugin-0.11-r2
index c9b7034fa0cc..7f95f06d21da 100644
--- a/metadata/md5-cache/dev-python/openstack-nose-plugin-0.11-r2
+++ b/metadata/md5-cache/dev-python/openstack-nose-plugin-0.11-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,-py
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/openstack.nose_plugin/openstack.nose_plugin-0.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=680e6c2404d5236e4bdb4edaa8f25397
diff --git a/metadata/md5-cache/dev-python/openstackdocstheme-1.16.1 b/metadata/md5-cache/dev-python/openstackdocstheme-1.16.1
index bdf27fa3b84c..dc5425a9c581 100644
--- a/metadata/md5-cache/dev-python/openstackdocstheme-1.16.1
+++ b/metadata/md5-cache/dev-python/openstackdocstheme-1.16.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/openstackdocstheme/openstackdocstheme-1.16.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=222dbb7e261f3f794875dc8bdc5c9b54
diff --git a/metadata/md5-cache/dev-python/openstackdocstheme-1.18.1 b/metadata/md5-cache/dev-python/openstackdocstheme-1.18.1
index 65f87802fe64..12488b9d7373 100644
--- a/metadata/md5-cache/dev-python/openstackdocstheme-1.18.1
+++ b/metadata/md5-cache/dev-python/openstackdocstheme-1.18.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/openstackdocstheme/openstackdocstheme-1.18.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=510a6187f951ae2cd9e0c224fe802ca9
diff --git a/metadata/md5-cache/dev-python/openstacksdk-0.11.3 b/metadata/md5-cache/dev-python/openstacksdk-0.11.3
index 2c49638755ae..e7e403b9e0e5 100644
--- a/metadata/md5-cache/dev-python/openstacksdk-0.11.3
+++ b/metadata/md5-cache/dev-python/openstacksdk-0.11.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/openstacksdk/openstacksdk-0.11.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=146e053a39965082e2d005de15dd20f7
diff --git a/metadata/md5-cache/dev-python/openstacksdk-0.17.2 b/metadata/md5-cache/dev-python/openstacksdk-0.17.2
index d0d4dfa2f2a3..0ee34456ac5a 100644
--- a/metadata/md5-cache/dev-python/openstacksdk-0.17.2
+++ b/metadata/md5-cache/dev-python/openstacksdk-0.17.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/openstacksdk/openstacksdk-0.17.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ad18c151aebe87bad989087bd6372016
diff --git a/metadata/md5-cache/dev-python/openstacksdk-0.9.17 b/metadata/md5-cache/dev-python/openstacksdk-0.9.17
index 2b96e984b885..2dd715880e5e 100644
--- a/metadata/md5-cache/dev-python/openstacksdk-0.9.17
+++ b/metadata/md5-cache/dev-python/openstacksdk-0.9.17
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/o/openstacksdk/openstacksdk-0.9.17.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5af60198b58fc780864fc6a6f1bc6bae
diff --git a/metadata/md5-cache/dev-python/optcomplete-1.2-r1 b/metadata/md5-cache/dev-python/optcomplete-1.2-r1
index 69ce3539c9f2..ddabb4d49514 100644
--- a/metadata/md5-cache/dev-python/optcomplete-1.2-r1
+++ b/metadata/md5-cache/dev-python/optcomplete-1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://furius.ca/downloads/optcomplete/releases/optcomplete-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=41422f70f97770164e4718c9d4bdc68b
diff --git a/metadata/md5-cache/dev-python/ordereddict-1.1 b/metadata/md5-cache/dev-python/ordereddict-1.1
index bbc90296a266..54ca93992068 100644
--- a/metadata/md5-cache/dev-python/ordereddict-1.1
+++ b/metadata/md5-cache/dev-python/ordereddict-1.1
@@ -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=mirror://pypi/o/ordereddict/ordereddict-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e42d6ffeff3bef7bb4bd5535b7bc2b5b
diff --git a/metadata/md5-cache/dev-python/os-brick-1.15.5 b/metadata/md5-cache/dev-python/os-brick-1.15.5
index b30e3c09daeb..6aac303eb58d 100644
--- a/metadata/md5-cache/dev-python/os-brick-1.15.5
+++ b/metadata/md5-cache/dev-python/os-brick-1.15.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-brick/os-brick-1.15.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3efcec471f1e2f4eeeb1553cc62346f6
diff --git a/metadata/md5-cache/dev-python/os-brick-2.3.1 b/metadata/md5-cache/dev-python/os-brick-2.3.1
index 1c4779e892f0..ee6ab7d2f744 100644
--- a/metadata/md5-cache/dev-python/os-brick-2.3.1
+++ b/metadata/md5-cache/dev-python/os-brick-2.3.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-brick/os-brick-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9c11e5cf6e9a1b9b1b8057c23d9687be
diff --git a/metadata/md5-cache/dev-python/os-brick-2.3.3 b/metadata/md5-cache/dev-python/os-brick-2.3.3
index 4b73b73335c7..db4ef11fe5f9 100644
--- a/metadata/md5-cache/dev-python/os-brick-2.3.3
+++ b/metadata/md5-cache/dev-python/os-brick-2.3.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-brick/os-brick-2.3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ef05f843884faba10dc31acb8fcbd39c
diff --git a/metadata/md5-cache/dev-python/os-brick-2.5.3 b/metadata/md5-cache/dev-python/os-brick-2.5.3
index e72199ebb962..12e098aa7daa 100644
--- a/metadata/md5-cache/dev-python/os-brick-2.5.3
+++ b/metadata/md5-cache/dev-python/os-brick-2.5.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-brick/os-brick-2.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=50560feb9c78c881e82d4416297cb6dc
diff --git a/metadata/md5-cache/dev-python/os-client-config-1.28.0 b/metadata/md5-cache/dev-python/os-client-config-1.28.0
index 0248204b2e1a..e4009a086fd7 100644
--- a/metadata/md5-cache/dev-python/os-client-config-1.28.0
+++ b/metadata/md5-cache/dev-python/os-client-config-1.28.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-client-config/os-client-config-1.28.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dbe944f6d4e0c434743745b2cf65ba10
diff --git a/metadata/md5-cache/dev-python/os-client-config-1.29.0 b/metadata/md5-cache/dev-python/os-client-config-1.29.0
index 497994950526..039f709cc2dc 100644
--- a/metadata/md5-cache/dev-python/os-client-config-1.29.0
+++ b/metadata/md5-cache/dev-python/os-client-config-1.29.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-client-config/os-client-config-1.29.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9d9325fc30f9b58a0ad1d74095e0a118
diff --git a/metadata/md5-cache/dev-python/os-diskconfig-python-novaclient-ext-0.1.3 b/metadata/md5-cache/dev-python/os-diskconfig-python-novaclient-ext-0.1.3
index 0ea78464d85e..4d95237511a2 100644
--- a/metadata/md5-cache/dev-python/os-diskconfig-python-novaclient-ext-0.1.3
+++ b/metadata/md5-cache/dev-python/os-diskconfig-python-novaclient-ext-0.1.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/python-novaclient-2.10.0[python_targets_python2_7(-)?,pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os_diskconfig_python_novaclient_ext/os_diskconfig_python_novaclient_ext-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=810ca4c38f35220adb5cac3f8b8db326
diff --git a/metadata/md5-cache/dev-python/os-diskconfig-python-novaclient-ext-9999 b/metadata/md5-cache/dev-python/os-diskconfig-python-novaclient-ext-9999
index 8416045fbe09..5b50cfe09f16 100644
--- a/metadata/md5-cache/dev-python/os-diskconfig-python-novaclient-ext-9999
+++ b/metadata/md5-cache/dev-python/os-diskconfig-python-novaclient-ext-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-python/python-novaclient-2.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
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-2	249c1a0962573f4ce2c28f0d5b6b35d4	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-2	249c1a0962573f4ce2c28f0d5b6b35d4	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_=645cc78f2f7b726a15bdebd90f5483f5
diff --git a/metadata/md5-cache/dev-python/os-networksv2-python-novaclient-ext-0.26 b/metadata/md5-cache/dev-python/os-networksv2-python-novaclient-ext-0.26
index 70b11578c729..33113e27f6a2 100644
--- a/metadata/md5-cache/dev-python/os-networksv2-python-novaclient-ext-0.26
+++ b/metadata/md5-cache/dev-python/os-networksv2-python-novaclient-ext-0.26
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/python-novaclient-3.4.0[python_targets_python2_7(-)?,python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os_networksv2_python_novaclient_ext/os_networksv2_python_novaclient_ext-0.26.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fd3ec0a54b8fb303b5c6daac9018746c
diff --git a/metadata/md5-cache/dev-python/os-service-types-1.1.0 b/metadata/md5-cache/dev-python/os-service-types-1.1.0
index 4622c3bc0c52..305ef147da3d 100644
--- a/metadata/md5-cache/dev-python/os-service-types-1.1.0
+++ b/metadata/md5-cache/dev-python/os-service-types-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-service-types/os-service-types-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c2ef9e21a8a93c72be6b1736e98bf0d2
diff --git a/metadata/md5-cache/dev-python/os-service-types-1.3.0 b/metadata/md5-cache/dev-python/os-service-types-1.3.0
index b129767640c2..b45bb18db8ee 100644
--- a/metadata/md5-cache/dev-python/os-service-types-1.3.0
+++ b/metadata/md5-cache/dev-python/os-service-types-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-service-types/os-service-types-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c2ef9e21a8a93c72be6b1736e98bf0d2
diff --git a/metadata/md5-cache/dev-python/os-testr-0.8.0 b/metadata/md5-cache/dev-python/os-testr-0.8.0
index c9a448ed0b1b..8fee8b664a5a 100644
--- a/metadata/md5-cache/dev-python/os-testr-0.8.0
+++ b/metadata/md5-cache/dev-python/os-testr-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-testr/os-testr-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f821acd4f21b13b6b03c8d451742999d
diff --git a/metadata/md5-cache/dev-python/os-testr-1.0.0 b/metadata/md5-cache/dev-python/os-testr-1.0.0
index 626e1bb8311b..c385b92aed55 100644
--- a/metadata/md5-cache/dev-python/os-testr-1.0.0
+++ b/metadata/md5-cache/dev-python/os-testr-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-testr/os-testr-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=13ed1dbf95b71b0ea523f34fe8c0b02f
diff --git a/metadata/md5-cache/dev-python/os-traits-0.3.3 b/metadata/md5-cache/dev-python/os-traits-0.3.3
index 5ec8553bdee2..c732daead5fe 100644
--- a/metadata/md5-cache/dev-python/os-traits-0.3.3
+++ b/metadata/md5-cache/dev-python/os-traits-0.3.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-traits/os-traits-0.3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0c911810f7786f0e2b355a5857f7e959
diff --git a/metadata/md5-cache/dev-python/os-traits-0.5.0 b/metadata/md5-cache/dev-python/os-traits-0.5.0
index 5f389cffbd28..11017db85f95 100644
--- a/metadata/md5-cache/dev-python/os-traits-0.5.0
+++ b/metadata/md5-cache/dev-python/os-traits-0.5.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-traits/os-traits-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c9dd556d05084a6d08f1669081e5b634
diff --git a/metadata/md5-cache/dev-python/os-vif-1.7.0 b/metadata/md5-cache/dev-python/os-vif-1.7.0
index 8c2b4a9492ba..3f6f8432b2c6 100644
--- a/metadata/md5-cache/dev-python/os-vif-1.7.0
+++ b/metadata/md5-cache/dev-python/os-vif-1.7.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os_vif/os_vif-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d29bf0d94e3798f79814b39d3520a8a3
diff --git a/metadata/md5-cache/dev-python/os-vif-1.9.1 b/metadata/md5-cache/dev-python/os-vif-1.9.1
index a302a85ea899..c42bddbecf59 100644
--- a/metadata/md5-cache/dev-python/os-vif-1.9.1
+++ b/metadata/md5-cache/dev-python/os-vif-1.9.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-vif/os_vif-1.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=364ccd98f011f149f3b9a3f8b8c70452
diff --git a/metadata/md5-cache/dev-python/os-virtual-interfacesv2-python-novaclient-ext-0.20 b/metadata/md5-cache/dev-python/os-virtual-interfacesv2-python-novaclient-ext-0.20
index d4643fdd7977..c2d1b9223d54 100644
--- a/metadata/md5-cache/dev-python/os-virtual-interfacesv2-python-novaclient-ext-0.20
+++ b/metadata/md5-cache/dev-python/os-virtual-interfacesv2-python-novaclient-ext-0.20
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/python-novaclient-3.4.0[python_targets_python2_7(-)?,python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os_virtual_interfacesv2_python_novaclient_ext/os_virtual_interfacesv2_python_novaclient_ext-0.20.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=adfbd3508833cc01d722f59ef8460a2a
diff --git a/metadata/md5-cache/dev-python/os-win-2.2.0 b/metadata/md5-cache/dev-python/os-win-2.2.0
index 15d8548fa971..f481fd86902b 100644
--- a/metadata/md5-cache/dev-python/os-win-2.2.0
+++ b/metadata/md5-cache/dev-python/os-win-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-win/os-win-2.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4586150d237d442cf8bab2f5200c0c8b
diff --git a/metadata/md5-cache/dev-python/os-win-3.0.1 b/metadata/md5-cache/dev-python/os-win-3.0.1
index bc5d426ed0cb..86626aceab1d 100644
--- a/metadata/md5-cache/dev-python/os-win-3.0.1
+++ b/metadata/md5-cache/dev-python/os-win-3.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-win/os-win-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b571c775faf0d445a86e6d6d4c8c06f9
diff --git a/metadata/md5-cache/dev-python/os-xenapi-0.2.0 b/metadata/md5-cache/dev-python/os-xenapi-0.2.0
index 6794071210e7..16864d15efbc 100644
--- a/metadata/md5-cache/dev-python/os-xenapi-0.2.0
+++ b/metadata/md5-cache/dev-python/os-xenapi-0.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-xenapi/os-xenapi-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0cd7c94bdc1a404009672c0fa2fb42d3
diff --git a/metadata/md5-cache/dev-python/os-xenapi-0.3.1 b/metadata/md5-cache/dev-python/os-xenapi-0.3.1
index eb790c3c5c8a..6e17d289f547 100644
--- a/metadata/md5-cache/dev-python/os-xenapi-0.3.1
+++ b/metadata/md5-cache/dev-python/os-xenapi-0.3.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-xenapi/os-xenapi-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=609dde30f5de3e10914e2f16904accca
diff --git a/metadata/md5-cache/dev-python/os-xenapi-0.3.3 b/metadata/md5-cache/dev-python/os-xenapi-0.3.3
index c75eb9a1bbf2..3122a9398650 100644
--- a/metadata/md5-cache/dev-python/os-xenapi-0.3.3
+++ b/metadata/md5-cache/dev-python/os-xenapi-0.3.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-xenapi/os-xenapi-0.3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=21d512198c52b93051661bc48d6569c8
diff --git a/metadata/md5-cache/dev-python/osc-lib-1.11.1 b/metadata/md5-cache/dev-python/osc-lib-1.11.1
index 21a142137e93..de7b6605c82a 100644
--- a/metadata/md5-cache/dev-python/osc-lib-1.11.1
+++ b/metadata/md5-cache/dev-python/osc-lib-1.11.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/osc-lib/osc-lib-1.11.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ba024133ac058a941f94a443b9743682
diff --git a/metadata/md5-cache/dev-python/osc-lib-1.7.0 b/metadata/md5-cache/dev-python/osc-lib-1.7.0
index 9ccfb213e0c0..d56f606ed427 100644
--- a/metadata/md5-cache/dev-python/osc-lib-1.7.0
+++ b/metadata/md5-cache/dev-python/osc-lib-1.7.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/o/osc-lib/osc-lib-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2f2e473e7f4b18a7be31bd412fc23d48
diff --git a/metadata/md5-cache/dev-python/osc-lib-1.9.0 b/metadata/md5-cache/dev-python/osc-lib-1.9.0
index edde942b4bce..3bf5762a8b11 100644
--- a/metadata/md5-cache/dev-python/osc-lib-1.9.0
+++ b/metadata/md5-cache/dev-python/osc-lib-1.9.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/osc-lib/osc-lib-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9abda947aba3f22aa00fc2943daec01d
diff --git a/metadata/md5-cache/dev-python/osc-placement-1.3.0 b/metadata/md5-cache/dev-python/osc-placement-1.3.0
index 76c6d34ef31e..cb4941f0ff30 100644
--- a/metadata/md5-cache/dev-python/osc-placement-1.3.0
+++ b/metadata/md5-cache/dev-python/osc-placement-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/osc-placement/osc-placement-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=428bd2af3fa03600455c537ea75b4a14
diff --git a/metadata/md5-cache/dev-python/oslo-cache-1.28.0 b/metadata/md5-cache/dev-python/oslo-cache-1.28.0
index df9641073984..bb7b13281e36 100644
--- a/metadata/md5-cache/dev-python/oslo-cache-1.28.0
+++ b/metadata/md5-cache/dev-python/oslo-cache-1.28.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.cache/oslo.cache-1.28.0.tar.gz -> oslo-cache-1.28.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b4d4a1c2e98b5cc6e943454762c771e3
diff --git a/metadata/md5-cache/dev-python/oslo-concurrency-3.25.1 b/metadata/md5-cache/dev-python/oslo-concurrency-3.25.1
index 254a305adf6e..7fa881b3c20b 100644
--- a/metadata/md5-cache/dev-python/oslo-concurrency-3.25.1
+++ b/metadata/md5-cache/dev-python/oslo-concurrency-3.25.1
@@ -10,5 +10,5 @@ RDEPEND=virtual/python-enum34[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
 SRC_URI=mirror://pypi/o/oslo.concurrency/oslo.concurrency-3.25.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2398fb20fb1d900d888edbd10422af06
diff --git a/metadata/md5-cache/dev-python/oslo-concurrency-3.27.0 b/metadata/md5-cache/dev-python/oslo-concurrency-3.27.0
index beb1c1a4c203..2a728b5b57b2 100644
--- a/metadata/md5-cache/dev-python/oslo-concurrency-3.27.0
+++ b/metadata/md5-cache/dev-python/oslo-concurrency-3.27.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/python-enum34[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
 SRC_URI=mirror://pypi/o/oslo.concurrency/oslo.concurrency-3.27.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ebfcd9a3844efc5f4e77f3d2be09ad61
diff --git a/metadata/md5-cache/dev-python/oslo-config-5.2.0 b/metadata/md5-cache/dev-python/oslo-config-5.2.0
index 01f74f5fefc7..84093499c1d4 100644
--- a/metadata/md5-cache/dev-python/oslo-config-5.2.0
+++ b/metadata/md5-cache/dev-python/oslo-config-5.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.3[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.config/oslo.config-5.2.0.tar.gz -> oslo-config-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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=573f4a43e224bb08d6d3cb57482343eb
diff --git a/metadata/md5-cache/dev-python/oslo-config-6.4.0 b/metadata/md5-cache/dev-python/oslo-config-6.4.0
index 5f857922d9a6..9fdaa44bb821 100644
--- a/metadata/md5-cache/dev-python/oslo-config-6.4.0
+++ b/metadata/md5-cache/dev-python/oslo-config-6.4.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.3[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.config/oslo.config-6.4.0.tar.gz -> oslo-config-6.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ce5caaaca018e51f89bd331df550c7d2
diff --git a/metadata/md5-cache/dev-python/oslo-context-2.20.0 b/metadata/md5-cache/dev-python/oslo-context-2.20.0
index 79c6a355257e..afcb35419c77 100644
--- a/metadata/md5-cache/dev-python/oslo-context-2.20.0
+++ b/metadata/md5-cache/dev-python/oslo-context-2.20.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.context/oslo.context-2.20.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4904327bba745488df0156f4c4721d5c
diff --git a/metadata/md5-cache/dev-python/oslo-context-2.21.0 b/metadata/md5-cache/dev-python/oslo-context-2.21.0
index a59e56e17b2f..1169310824e9 100644
--- a/metadata/md5-cache/dev-python/oslo-context-2.21.0
+++ b/metadata/md5-cache/dev-python/oslo-context-2.21.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.context/oslo.context-2.21.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4904327bba745488df0156f4c4721d5c
diff --git a/metadata/md5-cache/dev-python/oslo-db-4.33.1 b/metadata/md5-cache/dev-python/oslo-db-4.33.1
index eb89ea0e1943..8eb7cd737124 100644
--- a/metadata/md5-cache/dev-python/oslo-db-4.33.1
+++ b/metadata/md5-cache/dev-python/oslo-db-4.33.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.db/oslo.db-4.33.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8f46a51e4db8552fb538bd990b0f2cc7
diff --git a/metadata/md5-cache/dev-python/oslo-db-4.40.0 b/metadata/md5-cache/dev-python/oslo-db-4.40.0
index 32d7d14dc90e..c64dc1349fc2 100644
--- a/metadata/md5-cache/dev-python/oslo-db-4.40.0
+++ b/metadata/md5-cache/dev-python/oslo-db-4.40.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.db/oslo.db-4.40.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4a01540b729f058f9cd3134b4cae784f
diff --git a/metadata/md5-cache/dev-python/oslo-i18n-3.19.0 b/metadata/md5-cache/dev-python/oslo-i18n-3.19.0
index 6ef2c1bc5c05..cf4f5ba96ab6 100644
--- a/metadata/md5-cache/dev-python/oslo-i18n-3.19.0
+++ b/metadata/md5-cache/dev-python/oslo-i18n-3.19.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.i18n/oslo.i18n-3.19.0.tar.gz -> oslo-i18n-3.19.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ae7611a271e8c0923a0262f1924cc823
diff --git a/metadata/md5-cache/dev-python/oslo-log-3.36.0 b/metadata/md5-cache/dev-python/oslo-log-3.36.0
index f46188ae54ca..20a0d59b834c 100644
--- a/metadata/md5-cache/dev-python/oslo-log-3.36.0
+++ b/metadata/md5-cache/dev-python/oslo-log-3.36.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.log/oslo.log-3.36.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=397f51312f2fa3989b1485d7889e178d
diff --git a/metadata/md5-cache/dev-python/oslo-log-3.39.2 b/metadata/md5-cache/dev-python/oslo-log-3.39.2
index 1a8fb9d5c357..8d9eb229e170 100644
--- a/metadata/md5-cache/dev-python/oslo-log-3.39.2
+++ b/metadata/md5-cache/dev-python/oslo-log-3.39.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.log/oslo.log-3.39.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=019c7766734bce191dbc75239b8f1be2
diff --git a/metadata/md5-cache/dev-python/oslo-messaging-5.35.1 b/metadata/md5-cache/dev-python/oslo-messaging-5.35.1
index 7a106150a856..3766faba8770 100644
--- a/metadata/md5-cache/dev-python/oslo-messaging-5.35.1
+++ b/metadata/md5-cache/dev-python/oslo-messaging-5.35.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.messaging/oslo.messaging-5.35.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=20f04e50911386c1c85004383777a4db
diff --git a/metadata/md5-cache/dev-python/oslo-messaging-8.1.2 b/metadata/md5-cache/dev-python/oslo-messaging-8.1.2
index 2c5c6f7496ef..5ef070af75f6 100644
--- a/metadata/md5-cache/dev-python/oslo-messaging-8.1.2
+++ b/metadata/md5-cache/dev-python/oslo-messaging-8.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.messaging/oslo.messaging-8.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f2758268c4bda136dc842c25dfabde32
diff --git a/metadata/md5-cache/dev-python/oslo-middleware-3.34.0 b/metadata/md5-cache/dev-python/oslo-middleware-3.34.0
index d56214546dea..20fb48b77a4d 100644
--- a/metadata/md5-cache/dev-python/oslo-middleware-3.34.0
+++ b/metadata/md5-cache/dev-python/oslo-middleware-3.34.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.middleware/oslo.middleware-3.34.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=41c7479772f5d7731a25d0abdc93bae2
diff --git a/metadata/md5-cache/dev-python/oslo-policy-1.33.2 b/metadata/md5-cache/dev-python/oslo-policy-1.33.2
index 633980e0a50a..1a81458ab67a 100644
--- a/metadata/md5-cache/dev-python/oslo-policy-1.33.2
+++ b/metadata/md5-cache/dev-python/oslo-policy-1.33.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.policy/oslo.policy-1.33.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e2eb0dc9e82fdab821d3f69601a0eac3
diff --git a/metadata/md5-cache/dev-python/oslo-policy-1.38.1 b/metadata/md5-cache/dev-python/oslo-policy-1.38.1
index 0b0670ab6de4..7a676065f00a 100644
--- a/metadata/md5-cache/dev-python/oslo-policy-1.38.1
+++ b/metadata/md5-cache/dev-python/oslo-policy-1.38.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.policy/oslo.policy-1.38.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a709488fdb20575baaf1d3fc09d3e00d
diff --git a/metadata/md5-cache/dev-python/oslo-privsep-1.27.0-r1 b/metadata/md5-cache/dev-python/oslo-privsep-1.27.0-r1
index 5564b984227f..a2d050edcc36 100644
--- a/metadata/md5-cache/dev-python/oslo-privsep-1.27.0-r1
+++ b/metadata/md5-cache/dev-python/oslo-privsep-1.27.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/oslo-log-3.30.0[python_targets_python2_7(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.privsep/oslo.privsep-1.27.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=19da4ea574c01d2d6eb7e763d0428e1a
diff --git a/metadata/md5-cache/dev-python/oslo-privsep-1.29.2 b/metadata/md5-cache/dev-python/oslo-privsep-1.29.2
index 887ea8739ad9..ea953d6ef476 100644
--- a/metadata/md5-cache/dev-python/oslo-privsep-1.29.2
+++ b/metadata/md5-cache/dev-python/oslo-privsep-1.29.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/oslo-log-3.36.0[python_targets_python2_7(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.privsep/oslo.privsep-1.29.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=51c2149db18e2e9f9115526819e363e8
diff --git a/metadata/md5-cache/dev-python/oslo-reports-1.26.0 b/metadata/md5-cache/dev-python/oslo-reports-1.26.0
index 4fecd1b4351b..ea4041d0e26b 100644
--- a/metadata/md5-cache/dev-python/oslo-reports-1.26.0
+++ b/metadata/md5-cache/dev-python/oslo-reports-1.26.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.reports/oslo.reports-1.26.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0c3c65674868d81f8b6ec3ac81288c1d
diff --git a/metadata/md5-cache/dev-python/oslo-rootwrap-5.13.0 b/metadata/md5-cache/dev-python/oslo-rootwrap-5.13.0
index 21dedf5a1702..a289a92293ed 100644
--- a/metadata/md5-cache/dev-python/oslo-rootwrap-5.13.0
+++ b/metadata/md5-cache/dev-python/oslo-rootwrap-5.13.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.rootwrap/oslo.rootwrap-5.13.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f6f5e61f48c76031eafceb2de081ec78
diff --git a/metadata/md5-cache/dev-python/oslo-serialization-2.24.0-r1 b/metadata/md5-cache/dev-python/oslo-serialization-2.24.0-r1
index 4cd528abba9b..f4949339ce56 100644
--- a/metadata/md5-cache/dev-python/oslo-serialization-2.24.0-r1
+++ b/metadata/md5-cache/dev-python/oslo-serialization-2.24.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.serialization/oslo.serialization-2.24.0.tar.gz -> oslo-serialization-2.24.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e498585eba9c826d628bb36a29da2a89
diff --git a/metadata/md5-cache/dev-python/oslo-service-1.29.0 b/metadata/md5-cache/dev-python/oslo-service-1.29.0
index 4c4d052b05aa..a9cb088bdb4f 100644
--- a/metadata/md5-cache/dev-python/oslo-service-1.29.0
+++ b/metadata/md5-cache/dev-python/oslo-service-1.29.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.service/oslo.service-1.29.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9bc6b294ad3d877cab172f41b612c330
diff --git a/metadata/md5-cache/dev-python/oslo-service-1.31.5 b/metadata/md5-cache/dev-python/oslo-service-1.31.5
index 4b3107ee23a5..95afe9516ee9 100644
--- a/metadata/md5-cache/dev-python/oslo-service-1.31.5
+++ b/metadata/md5-cache/dev-python/oslo-service-1.31.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.service/oslo.service-1.31.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a8bd7d728f194553e9aa9c7fa6500b5f
diff --git a/metadata/md5-cache/dev-python/oslo-sphinx-4.18.0 b/metadata/md5-cache/dev-python/oslo-sphinx-4.18.0
index 0fdc9cb86773..31c415b83811 100644
--- a/metadata/md5-cache/dev-python/oslo-sphinx-4.18.0
+++ b/metadata/md5-cache/dev-python/oslo-sphinx-4.18.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslosphinx/oslosphinx-4.18.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7ec15f0245736460d8b852551fda4377
diff --git a/metadata/md5-cache/dev-python/oslo-utils-3.35.1 b/metadata/md5-cache/dev-python/oslo-utils-3.35.1
index 26798956ae65..494a5c1025c6 100644
--- a/metadata/md5-cache/dev-python/oslo-utils-3.35.1
+++ b/metadata/md5-cache/dev-python/oslo-utils-3.35.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.utils/oslo.utils-3.35.1.tar.gz -> oslo-utils-3.35.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4ba6111af38961672f74f0e2f1f7e5a2
diff --git a/metadata/md5-cache/dev-python/oslo-utils-3.36.4 b/metadata/md5-cache/dev-python/oslo-utils-3.36.4
index 312036900ece..40eee0a93237 100644
--- a/metadata/md5-cache/dev-python/oslo-utils-3.36.4
+++ b/metadata/md5-cache/dev-python/oslo-utils-3.36.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.utils/oslo.utils-3.36.4.tar.gz -> oslo-utils-3.36.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=777e4abd6451c4fe6e5eaf3c94fc48bf
diff --git a/metadata/md5-cache/dev-python/oslo-versionedobjects-1.31.3 b/metadata/md5-cache/dev-python/oslo-versionedobjects-1.31.3
index f07eb129a91c..498b920d677e 100644
--- a/metadata/md5-cache/dev-python/oslo-versionedobjects-1.31.3
+++ b/metadata/md5-cache/dev-python/oslo-versionedobjects-1.31.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.versionedobjects/oslo.versionedobjects-1.31.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=20680c2d3c07716db73b8f99d0e6456e
diff --git a/metadata/md5-cache/dev-python/oslo-versionedobjects-1.33.3 b/metadata/md5-cache/dev-python/oslo-versionedobjects-1.33.3
index 2e271c4a827e..da4f89e749a1 100644
--- a/metadata/md5-cache/dev-python/oslo-versionedobjects-1.33.3
+++ b/metadata/md5-cache/dev-python/oslo-versionedobjects-1.33.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.versionedobjects/oslo.versionedobjects-1.33.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=86191e57d3b9571898e09bba8f913832
diff --git a/metadata/md5-cache/dev-python/oslo-vmware-2.26.0 b/metadata/md5-cache/dev-python/oslo-vmware-2.26.0
index 8bfcc2b06d50..1572b678baf9 100644
--- a/metadata/md5-cache/dev-python/oslo-vmware-2.26.0
+++ b/metadata/md5-cache/dev-python/oslo-vmware-2.26.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.vmware/oslo.vmware-2.26.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ce3f2d4820f8caecfb83cb4e66b7f857
diff --git a/metadata/md5-cache/dev-python/oslotest-3.2.0 b/metadata/md5-cache/dev-python/oslotest-3.2.0
index 6c44fad38615..082fcbd91378 100644
--- a/metadata/md5-cache/dev-python/oslotest-3.2.0
+++ b/metadata/md5-cache/dev-python/oslotest-3.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/fixtures-3.0.0[python_targets_python2_7(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslotest/oslotest-3.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=35fc66577d6bfc5aa856ebecacb5f383
diff --git a/metadata/md5-cache/dev-python/osprofiler-1.11.0 b/metadata/md5-cache/dev-python/osprofiler-1.11.0
index 7a6bc3979c83..c3664111c9d7 100644
--- a/metadata/md5-cache/dev-python/osprofiler-1.11.0
+++ b/metadata/md5-cache/dev-python/osprofiler-1.11.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/o/osprofiler/osprofiler-1.11.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=02f20299c89ace344cf78d30f9b8b731
diff --git a/metadata/md5-cache/dev-python/osprofiler-1.15.2 b/metadata/md5-cache/dev-python/osprofiler-1.15.2
index a34195f0f521..6b9f4aa405ea 100644
--- a/metadata/md5-cache/dev-python/osprofiler-1.15.2
+++ b/metadata/md5-cache/dev-python/osprofiler-1.15.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/osprofiler/osprofiler-1.15.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e657046669dbb2f13f646d7b7e3bde9b
diff --git a/metadata/md5-cache/dev-python/ovs-2.7.0 b/metadata/md5-cache/dev-python/ovs-2.7.0
index 5dd5cfebd6d4..e24a8ea1c0e2 100644
--- a/metadata/md5-cache/dev-python/ovs-2.7.0
+++ b/metadata/md5-cache/dev-python/ovs-2.7.0
@@ -10,5 +10,5 @@ RDEPEND=!<net-misc/openvswitch-2.6.0-r2 python_targets_python2_7? ( >=dev-lang/p
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/o/ovs/ovs-2.7.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=05f0c5efd490772db19b343663d3de33
diff --git a/metadata/md5-cache/dev-python/ovs-2.7.2 b/metadata/md5-cache/dev-python/ovs-2.7.2
index 62fcb82139ad..7e392a105346 100644
--- a/metadata/md5-cache/dev-python/ovs-2.7.2
+++ b/metadata/md5-cache/dev-python/ovs-2.7.2
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/o/ovs/ovs-2.7.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c57590be6a4b30945a69d16b3d89ff05
diff --git a/metadata/md5-cache/dev-python/ovs-2.8.1 b/metadata/md5-cache/dev-python/ovs-2.8.1
index a983d6eee3cc..f258930a179b 100644
--- a/metadata/md5-cache/dev-python/ovs-2.8.1
+++ b/metadata/md5-cache/dev-python/ovs-2.8.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/o/ovs/ovs-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a7241417603bdc91ba9ba3ec317c46df
diff --git a/metadata/md5-cache/dev-python/ovs-2.9.2 b/metadata/md5-cache/dev-python/ovs-2.9.2
index 9bcd13d16da6..e0d198648fb6 100644
--- a/metadata/md5-cache/dev-python/ovs-2.9.2
+++ b/metadata/md5-cache/dev-python/ovs-2.9.2
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/o/ovs/ovs-2.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a7241417603bdc91ba9ba3ec317c46df
diff --git a/metadata/md5-cache/dev-python/ovsdbapp-0.10.0 b/metadata/md5-cache/dev-python/ovsdbapp-0.10.0
index d66bb735b6b7..07c37004d328 100644
--- a/metadata/md5-cache/dev-python/ovsdbapp-0.10.0
+++ b/metadata/md5-cache/dev-python/ovsdbapp-0.10.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/ovsdbapp/ovsdbapp-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f5d8cd54be463784b5f8887a1c82cab8
diff --git a/metadata/md5-cache/dev-python/ovsdbapp-0.4.0 b/metadata/md5-cache/dev-python/ovsdbapp-0.4.0
index 69b45515ac3a..aa0630896294 100644
--- a/metadata/md5-cache/dev-python/ovsdbapp-0.4.0
+++ b/metadata/md5-cache/dev-python/ovsdbapp-0.4.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/o/ovsdbapp/ovsdbapp-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=98ef4082f16c32dc05923e229ded8896
diff --git a/metadata/md5-cache/dev-python/owslib-0.16.0 b/metadata/md5-cache/dev-python/owslib-0.16.0
index 751f2074d9e7..176c795813bd 100644
--- a/metadata/md5-cache/dev-python/owslib-0.16.0
+++ b/metadata/md5-cache/dev-python/owslib-0.16.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/geopython/owslib/archive/0.16.0.tar.gz -> owslib-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2f42bf42e98fdcf12a47f5d32acd5b04
diff --git a/metadata/md5-cache/dev-python/owslib-0.16.0-r1 b/metadata/md5-cache/dev-python/owslib-0.16.0-r1
index 2058b326757d..ddd7a834f581 100644
--- a/metadata/md5-cache/dev-python/owslib-0.16.0-r1
+++ b/metadata/md5-cache/dev-python/owslib-0.16.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/geopython/owslib/archive/0.16.0.tar.gz -> owslib-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d35e923e2e10a4f16f47ac96ffc8b5d8
diff --git a/metadata/md5-cache/dev-python/packaging-16.8 b/metadata/md5-cache/dev-python/packaging-16.8
index 45309d47ac9c..270b01c2dcca 100644
--- a/metadata/md5-cache/dev-python/packaging-16.8
+++ b/metadata/md5-cache/dev-python/packaging-16.8
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pyparsing-2.1.10[python_targets_pypy(-)?,python_targets_pyp
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/packaging/packaging-16.8.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=623698f69aeea56c5c24b8b233481569
diff --git a/metadata/md5-cache/dev-python/packaging-17.1 b/metadata/md5-cache/dev-python/packaging-17.1
index b2a2f0d27923..0380a2183ff7 100644
--- a/metadata/md5-cache/dev-python/packaging-17.1
+++ b/metadata/md5-cache/dev-python/packaging-17.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pyparsing-2.1.10[python_targets_pypy(-)?,python_targets_pyp
 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/packaging/packaging-17.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6947f1cbaa7c83b74cd37d963467e97d
diff --git a/metadata/md5-cache/dev-python/pafy-0.5.3.1 b/metadata/md5-cache/dev-python/pafy-0.5.3.1
index f666a08fa09e..9a2b9fe15f2f 100644
--- a/metadata/md5-cache/dev-python/pafy-0.5.3.1
+++ b/metadata/md5-cache/dev-python/pafy-0.5.3.1
@@ -10,5 +10,5 @@ RDEPEND=net-misc/youtube-dl[python_targets_python2_7(-)?,python_targets_python3_
 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/pafy/pafy-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=60855f3a9f4f9d954f7395e423515a75
diff --git a/metadata/md5-cache/dev-python/pafy-0.5.4 b/metadata/md5-cache/dev-python/pafy-0.5.4
index d3cee0b44c81..8bcdc5120871 100644
--- a/metadata/md5-cache/dev-python/pafy-0.5.4
+++ b/metadata/md5-cache/dev-python/pafy-0.5.4
@@ -10,5 +10,5 @@ RDEPEND=net-misc/youtube-dl[python_targets_python2_7(-)?,python_targets_python3_
 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/pafy/pafy-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8d7612061131921e5e5041b152de3ebc
diff --git a/metadata/md5-cache/dev-python/pafy-9999 b/metadata/md5-cache/dev-python/pafy-9999
index f3caf07c169b..0ede0039b8bd 100644
--- a/metadata/md5-cache/dev-python/pafy-9999
+++ b/metadata/md5-cache/dev-python/pafy-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-3
 RDEPEND=net-misc/youtube-dl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=8d7612061131921e5e5041b152de3ebc
diff --git a/metadata/md5-cache/dev-python/paho-mqtt-1.1 b/metadata/md5-cache/dev-python/paho-mqtt-1.1
index d3e381c64303..382cb4d3b052 100644
--- a/metadata/md5-cache/dev-python/paho-mqtt-1.1
+++ b/metadata/md5-cache/dev-python/paho-mqtt-1.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/eclipse/paho.mqtt.python/archive/1.1.zip -> paho-mqtt-1.1.zip
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f0e2fd35ee2f41c1758a0f9116bec904
diff --git a/metadata/md5-cache/dev-python/paho-mqtt-1.3.1 b/metadata/md5-cache/dev-python/paho-mqtt-1.3.1
index 8973108c36d9..bdb65940d9c6 100644
--- a/metadata/md5-cache/dev-python/paho-mqtt-1.3.1
+++ b/metadata/md5-cache/dev-python/paho-mqtt-1.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/eclipse/paho.mqtt.python/archive/v1.3.1.tar.gz -> paho-mqtt-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b34209f9077d1ccdae9abdd4d4b82da6
diff --git a/metadata/md5-cache/dev-python/paisley-0.3.1-r1 b/metadata/md5-cache/dev-python/paisley-0.3.1-r1
index 2b9263c21bc4..66e83460524f 100644
--- a/metadata/md5-cache/dev-python/paisley-0.3.1-r1
+++ b/metadata/md5-cache/dev-python/paisley-0.3.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/paisley/paisley-0.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=097b597089e5b47a84de9a2f86a8cb00
diff --git a/metadata/md5-cache/dev-python/pandas-0.19.1 b/metadata/md5-cache/dev-python/pandas-0.19.1
index 80591273e2b2..541324a7409a 100644
--- a/metadata/md5-cache/dev-python/pandas-0.19.1
+++ b/metadata/md5-cache/dev-python/pandas-0.19.1
@@ -10,5 +10,5 @@ RDEPEND=>dev-python/numpy-1.7[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
 SRC_URI=mirror://pypi/p/pandas/pandas-0.19.1.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=926cffcc9df8e60e3332eac1309b1f93
diff --git a/metadata/md5-cache/dev-python/pandas-0.23.0 b/metadata/md5-cache/dev-python/pandas-0.23.0
index c19afa3f1ef9..4d54b956c586 100644
--- a/metadata/md5-cache/dev-python/pandas-0.23.0
+++ b/metadata/md5-cache/dev-python/pandas-0.23.0
@@ -10,5 +10,5 @@ RDEPEND=>dev-python/numpy-1.7[python_targets_python2_7(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pandas/pandas-0.23.0.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=34ad8d4e574c6ff16d9885e37bfe6e69
diff --git a/metadata/md5-cache/dev-python/pandas-0.23.4 b/metadata/md5-cache/dev-python/pandas-0.23.4
index 00caa0ec439a..88e21e16dd9f 100644
--- a/metadata/md5-cache/dev-python/pandas-0.23.4
+++ b/metadata/md5-cache/dev-python/pandas-0.23.4
@@ -10,5 +10,5 @@ RDEPEND=>dev-python/numpy-1.7[python_targets_python2_7(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pandas/pandas-0.23.4.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d9cf1b822f270898f1e1a6fd69bfd829
diff --git a/metadata/md5-cache/dev-python/pandas-9999 b/metadata/md5-cache/dev-python/pandas-9999
index a59baab1774e..cf10aeda7d06 100644
--- a/metadata/md5-cache/dev-python/pandas-9999
+++ b/metadata/md5-cache/dev-python/pandas-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>dev-python/numpy-1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-dateutil-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/pytz[python_targets_python2_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/numexpr-2.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/openpyxl-1.9.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(-)] !minimal? ( dev-python/bottleneck[python_targets_python2_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/numexpr-2.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(-)] ) full-support? ( dev-python/beautifulsoup: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(-)] dev-python/blosc[python_targets_python2_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/boto[python_targets_python2_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/google-api-python-client-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( dev-python/html5lib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/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/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/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] || ( >=dev-python/openpyxl-1.6.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/xlsxwriter[python_targets_python2_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/pytables-3.2.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/python-gflags[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rpy[python_targets_python2_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/statsmodels[python_targets_python2_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/sqlalchemy-0.8.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/xarray[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlrd[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] X? ( || ( dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) || ( x11-misc/xclip x11-misc/xsel ) ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[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_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d7eb8e8258ca01216847240c0b0c2846
diff --git a/metadata/md5-cache/dev-python/pandas-datareader-0.7.0 b/metadata/md5-cache/dev-python/pandas-datareader-0.7.0
new file mode 100644
index 000000000000..751357f864ee
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pandas-datareader-0.7.0
@@ -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(-)] test? ( dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pandas-0.19.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/requests[python_targets_python2_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/wrapt[python_targets_python2_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/ipython[python_targets_python2_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/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx_rtd_theme[python_targets_python2_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(-)] )
+DESCRIPTION=Pandas DataFrame extraction from a wide range of Internet sources
+EAPI=7
+HOMEPAGE=https://github.com/pydata/pandas-datareader
+IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pandas-0.19.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/requests[python_targets_python2_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/wrapt[python_targets_python2_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/ipython[python_targets_python2_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/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx_rtd_theme[python_targets_python2_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
+SLOT=0
+SRC_URI=https://github.com/pydata/pandas-datareader/archive/v0.7.0.tar.gz -> pandas-datareader-0.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_=afc6484640bf4cd56149fcaf59b3d8da
diff --git a/metadata/md5-cache/dev-python/pandocfilters-1.4.2-r1 b/metadata/md5-cache/dev-python/pandocfilters-1.4.2-r1
index 054a1de04c02..5cb14688fd3a 100644
--- a/metadata/md5-cache/dev-python/pandocfilters-1.4.2-r1
+++ b/metadata/md5-cache/dev-python/pandocfilters-1.4.2-r1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pandocfilters/pandocfilters-1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=abcf1103896adfc9c2b7d73338f9aefe
diff --git a/metadata/md5-cache/dev-python/paramiko-2.1.2 b/metadata/md5-cache/dev-python/paramiko-2.1.2
index 5e608c21d6c4..354844bb4d54 100644
--- a/metadata/md5-cache/dev-python/paramiko-2.1.2
+++ b/metadata/md5-cache/dev-python/paramiko-2.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/cryptography-1.1[python_targets_python2_7(-)?,python_target
 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	89bb9f083a2590d9b447fd0b78a96186
+_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 3b6c009cef4f..1b76f08580b0 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=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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=9207c79108645fc8381c473ba7f459ed
+_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
diff --git a/metadata/md5-cache/dev-python/paramiko-2.4.2 b/metadata/md5-cache/dev-python/paramiko-2.4.2
index 564cecedf570..f2c3f23de85f 100644
--- a/metadata/md5-cache/dev-python/paramiko-2.4.2
+++ b/metadata/md5-cache/dev-python/paramiko-2.4.2
@@ -4,11 +4,11 @@ DESCRIPTION=SSH2 protocol library
 EAPI=7
 HOMEPAGE=http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.org/project/paramiko/
 IUSE=doc examples server test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~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.2.tar.gz -> paramiko-2.4.2.tar.gz
 _eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=020990a864b028eff2eb3f83785ffa9c
+_md5_=2f28d8336a2bf55e8bf758a944792d43
diff --git a/metadata/md5-cache/dev-python/paramunittest-0.2 b/metadata/md5-cache/dev-python/paramunittest-0.2
index c762d1612f8c..fce26cc0ec13 100644
--- a/metadata/md5-cache/dev-python/paramunittest-0.2
+++ b/metadata/md5-cache/dev-python/paramunittest-0.2
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/P/ParamUnittest/ParamUnittest-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e55f6e15e7708b59a0a36aded7e6c679
diff --git a/metadata/md5-cache/dev-python/parse-1.6.6 b/metadata/md5-cache/dev-python/parse-1.6.6
index e0b70e0a18e7..42226c88cdb1 100644
--- a/metadata/md5-cache/dev-python/parse-1.6.6
+++ b/metadata/md5-cache/dev-python/parse-1.6.6
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/parse/parse-1.6.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=63a79d89a30557e93e0c24664a56fa1b
diff --git a/metadata/md5-cache/dev-python/parse-type-0.3.4-r1 b/metadata/md5-cache/dev-python/parse-type-0.3.4-r1
index 7eb6016ce1ee..34d754013934 100644
--- a/metadata/md5-cache/dev-python/parse-type-0.3.4-r1
+++ b/metadata/md5-cache/dev-python/parse-type-0.3.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/parse-1.6[python_targets_python2_7(-)?,python_targets_pytho
 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/parse_type/parse_type-0.3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2aa4d2d9089668f461177a8145b6e4de
diff --git a/metadata/md5-cache/dev-python/parsedatetime-2.4-r1 b/metadata/md5-cache/dev-python/parsedatetime-2.4-r1
index 4b1d1b3c6d60..6cd461c45efa 100644
--- a/metadata/md5-cache/dev-python/parsedatetime-2.4-r1
+++ b/metadata/md5-cache/dev-python/parsedatetime-2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/future[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/bear/parsedatetime/archive/v2.4.tar.gz -> parsedatetime-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1cf71a215152eab953c242ce83a4b422
diff --git a/metadata/md5-cache/dev-python/parsley-1.3 b/metadata/md5-cache/dev-python/parsley-1.3
index 454c19ae49be..109252698e1a 100644
--- a/metadata/md5-cache/dev-python/parsley-1.3
+++ b/metadata/md5-cache/dev-python/parsley-1.3
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/python-parsley/parsley/archive/1.3.tar.gz -> parsley-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9fcd18f077ab74c8cf7e75b0584f75f4
diff --git a/metadata/md5-cache/dev-python/parso-0.1.1 b/metadata/md5-cache/dev-python/parso-0.1.1
index 9b4ee54bd7eb..c0d0e18fec4f 100644
--- a/metadata/md5-cache/dev-python/parso-0.1.1
+++ b/metadata/md5-cache/dev-python/parso-0.1.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/davidhalter/parso/archive/v0.1.1.tar.gz -> parso-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=568c7b70c556d6cb185658b155664593
diff --git a/metadata/md5-cache/dev-python/parso-0.3.1 b/metadata/md5-cache/dev-python/parso-0.3.1
index e31bfa58d320..989764410c94 100644
--- a/metadata/md5-cache/dev-python/parso-0.3.1
+++ b/metadata/md5-cache/dev-python/parso-0.3.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/davidhalter/parso/archive/v0.3.1.tar.gz -> parso-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8c6d95a1d93249ae79ebd881093e1416
diff --git a/metadata/md5-cache/dev-python/partd-0.3.2 b/metadata/md5-cache/dev-python/partd-0.3.2
index 253e1fdb1b27..a4da74b9cf3a 100644
--- a/metadata/md5-cache/dev-python/partd-0.3.2
+++ b/metadata/md5-cache/dev-python/partd-0.3.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/locket[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/partd/partd-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=15ea58d31da4759528f97705b1a83682
diff --git a/metadata/md5-cache/dev-python/partd-0.3.8 b/metadata/md5-cache/dev-python/partd-0.3.8
index 564c9ada0ced..aab478111cd2 100644
--- a/metadata/md5-cache/dev-python/partd-0.3.8
+++ b/metadata/md5-cache/dev-python/partd-0.3.8
@@ -10,5 +10,5 @@ RDEPEND=dev-python/locket[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/partd/partd-0.3.8.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=51dd1e3b7227c87e17a3f0467777a0bd
diff --git a/metadata/md5-cache/dev-python/passlib-1.7.1-r1 b/metadata/md5-cache/dev-python/passlib-1.7.1-r1
index d08b6acf3d9a..8115c809cdcb 100644
--- a/metadata/md5-cache/dev-python/passlib-1.7.1-r1
+++ b/metadata/md5-cache/dev-python/passlib-1.7.1-r1
@@ -10,5 +10,5 @@ RDEPEND=bcrypt? ( dev-python/bcrypt[python_targets_pypy(-)?,python_targets_pytho
 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/passlib/passlib-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=72010dfe967ac2c5ddb336945d92a1ff
diff --git a/metadata/md5-cache/dev-python/passwordmeter-0.1.8 b/metadata/md5-cache/dev-python/passwordmeter-0.1.8
index 3ff9868d6fca..c4b3bc7b3a27 100644
--- a/metadata/md5-cache/dev-python/passwordmeter-0.1.8
+++ b/metadata/md5-cache/dev-python/passwordmeter-0.1.8
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/asset-0.6.3[python_targets_python2_7(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/passwordmeter/passwordmeter-0.1.8.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e44df8b831c1c845fb69fdd9ab51fe05
diff --git a/metadata/md5-cache/dev-python/paste-2.0.3-r1 b/metadata/md5-cache/dev-python/paste-2.0.3-r1
index 39844d187123..08f1fc848ef0 100644
--- a/metadata/md5-cache/dev-python/paste-2.0.3-r1
+++ b/metadata/md5-cache/dev-python/paste-2.0.3-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/namespace-paste[python_targets_python2_7(-)?,python_targets_p
 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/Paste/Paste-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=635a836f9b7b0487ee7a69cea810208a
diff --git a/metadata/md5-cache/dev-python/pastedeploy-1.5.2 b/metadata/md5-cache/dev-python/pastedeploy-1.5.2
index 5ee222fb7071..16dcb9c89b9f 100644
--- a/metadata/md5-cache/dev-python/pastedeploy-1.5.2
+++ b/metadata/md5-cache/dev-python/pastedeploy-1.5.2
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PasteDeploy/PasteDeploy-1.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=14c9fe6edf982dc4ae16d783cb7ddb1b
diff --git a/metadata/md5-cache/dev-python/pastedeploy-1.5.2-r1 b/metadata/md5-cache/dev-python/pastedeploy-1.5.2-r1
index 1579a791f8e2..99ca9fd883ed 100644
--- a/metadata/md5-cache/dev-python/pastedeploy-1.5.2-r1
+++ b/metadata/md5-cache/dev-python/pastedeploy-1.5.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/namespace-paste[python_targets_python2_7(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://bitbucket.org/ianb/pastedeploy/get/1.5.2.tar.gz -> pastedeploy-1.5.2-r1.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9e0a83447cd22f744288cc61de5c6753
diff --git a/metadata/md5-cache/dev-python/pastescript-2.0.2-r1 b/metadata/md5-cache/dev-python/pastescript-2.0.2-r1
index 1a841450a55a..8dcf121cebc6 100644
--- a/metadata/md5-cache/dev-python/pastescript-2.0.2-r1
+++ b/metadata/md5-cache/dev-python/pastescript-2.0.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/P/PasteScript/PasteScript-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b83977a557185c96da8c7a57f2af6089
diff --git a/metadata/md5-cache/dev-python/patch-1.16 b/metadata/md5-cache/dev-python/patch-1.16
index 26163f7ada83..b93def8af2e7 100644
--- a/metadata/md5-cache/dev-python/patch-1.16
+++ b/metadata/md5-cache/dev-python/patch-1.16
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/patch/patch-1.16.zip
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=56d612b18b54964cfad4a128af491cdd
diff --git a/metadata/md5-cache/dev-python/path-and-address-1.1.0 b/metadata/md5-cache/dev-python/path-and-address-1.1.0
index 15ca58bdc4d6..c3204a050c0e 100644
--- a/metadata/md5-cache/dev-python/path-and-address-1.1.0
+++ b/metadata/md5-cache/dev-python/path-and-address-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/path-and-address/path-and-address-1.1.0.zip
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c1f063ba2cfa5a8e0bcac7a0b44c705a
diff --git a/metadata/md5-cache/dev-python/path-py-10.3.1 b/metadata/md5-cache/dev-python/path-py-10.3.1
index 91415520a441..c636bfccc04e 100644
--- a/metadata/md5-cache/dev-python/path-py-10.3.1
+++ b/metadata/md5-cache/dev-python/path-py-10.3.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/appdirs[python_targets_pypy(-)?,python_targets_pypy3(-)?,pyth
 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/path.py/path.py-10.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=066570b660a587db8fa87ce9584d265d
diff --git a/metadata/md5-cache/dev-python/path-py-11.0.1 b/metadata/md5-cache/dev-python/path-py-11.0.1
index 3d500e0613c2..bca81167fef5 100644
--- a/metadata/md5-cache/dev-python/path-py-11.0.1
+++ b/metadata/md5-cache/dev-python/path-py-11.0.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/appdirs[python_targets_pypy(-)?,python_targets_pypy3(-)?,pyth
 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/path.py/path.py-11.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c947be3c71111389621a03a53d731d1f
diff --git a/metadata/md5-cache/dev-python/path-py-8.1.2 b/metadata/md5-cache/dev-python/path-py-8.1.2
index 7877edf2a576..d4d5ee55e459 100644
--- a/metadata/md5-cache/dev-python/path-py-8.1.2
+++ b/metadata/md5-cache/dev-python/path-py-8.1.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/path.py/path.py-8.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=af46ce8bae8ce0102ede991cf06e7a95
diff --git a/metadata/md5-cache/dev-python/pathlib-1.0.1-r1 b/metadata/md5-cache/dev-python/pathlib-1.0.1-r1
index 89bff2d4d8f2..30c3b5fdb068 100644
--- a/metadata/md5-cache/dev-python/pathlib-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/pathlib-1.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pathlib/pathlib-1.0.1.tar.gz
-_eclasses_=desktop	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=20d6d4724f53b6875935b0e0bebd4b11
diff --git a/metadata/md5-cache/dev-python/pathlib2-2.3.0 b/metadata/md5-cache/dev-python/pathlib2-2.3.0
index b16d787c1e9f..9ee33a0db180 100644
--- a/metadata/md5-cache/dev-python/pathlib2-2.3.0
+++ b/metadata/md5-cache/dev-python/pathlib2-2.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pathlib2/pathlib2-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3831cd47677f8f7d558a35ee381b67f1
diff --git a/metadata/md5-cache/dev-python/pathtools-0.1.2-r1 b/metadata/md5-cache/dev-python/pathtools-0.1.2-r1
index 8ffeb3987018..6f208e4dd20a 100644
--- a/metadata/md5-cache/dev-python/pathtools-0.1.2-r1
+++ b/metadata/md5-cache/dev-python/pathtools-0.1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pathtools/pathtools-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2ee9e2fcdc09c49f5dbf21f17522187a
diff --git a/metadata/md5-cache/dev-python/pathtools-0.1.2-r2 b/metadata/md5-cache/dev-python/pathtools-0.1.2-r2
index 1ab8e135b48b..165215afa5bb 100644
--- a/metadata/md5-cache/dev-python/pathtools-0.1.2-r2
+++ b/metadata/md5-cache/dev-python/pathtools-0.1.2-r2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/pathtools/pathtools-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=eddd281a4d904310e28341b192943f46
diff --git a/metadata/md5-cache/dev-python/patsy-0.4.1 b/metadata/md5-cache/dev-python/patsy-0.4.1
index 00fe0279eab6..1a8f15d9a3a3 100644
--- a/metadata/md5-cache/dev-python/patsy-0.4.1
+++ b/metadata/md5-cache/dev-python/patsy-0.4.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/patsy/patsy-0.4.1.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f3f259fd53555b9d6527f5d613a7fb0d
diff --git a/metadata/md5-cache/dev-python/paver-1.2.4 b/metadata/md5-cache/dev-python/paver-1.2.4
index b365e558fe31..38c55bc328d6 100644
--- a/metadata/md5-cache/dev-python/paver-1.2.4
+++ b/metadata/md5-cache/dev-python/paver-1.2.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-
 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/Paver/Paver-1.2.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=713d40f7bbdb7e6eb959f28040425ae4
diff --git a/metadata/md5-cache/dev-python/paver-1.3.4 b/metadata/md5-cache/dev-python/paver-1.3.4
index 74ea051818dd..79a2cae9ab96 100644
--- a/metadata/md5-cache/dev-python/paver-1.3.4
+++ b/metadata/md5-cache/dev-python/paver-1.3.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-
 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/Paver/Paver-1.3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=71d99b0e6c2b51b4ba1615bc34c552a1
diff --git a/metadata/md5-cache/dev-python/pbkdf2-1.3 b/metadata/md5-cache/dev-python/pbkdf2-1.3
index 4636f159acfc..ec083c67d69f 100644
--- a/metadata/md5-cache/dev-python/pbkdf2-1.3
+++ b/metadata/md5-cache/dev-python/pbkdf2-1.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/pbkdf2/pbkdf2-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=dbb5adc27ede1716634d0af405c14ad9
diff --git a/metadata/md5-cache/dev-python/pbr-0.8.2-r1 b/metadata/md5-cache/dev-python/pbr-0.8.2-r1
index 63a971509d65..6a9bccd2c691 100644
--- a/metadata/md5-cache/dev-python/pbr-0.8.2-r1
+++ b/metadata/md5-cache/dev-python/pbr-0.8.2-r1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] )
 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/pbr/pbr-0.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8267bf5b2124e8caa5ab2fad867bac73
diff --git a/metadata/md5-cache/dev-python/pbr-1.10.0-r1 b/metadata/md5-cache/dev-python/pbr-1.10.0-r1
index c9f271f61bca..3fa81143f0bb 100644
--- a/metadata/md5-cache/dev-python/pbr-1.10.0-r1
+++ b/metadata/md5-cache/dev-python/pbr-1.10.0-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pbr/pbr-1.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2de86eaf19eda4a5b8e03014d4806b5d
diff --git a/metadata/md5-cache/dev-python/pbr-3.1.1 b/metadata/md5-cache/dev-python/pbr-3.1.1
index 17d4184a3442..0cdc5436e4dc 100644
--- a/metadata/md5-cache/dev-python/pbr-3.1.1
+++ b/metadata/md5-cache/dev-python/pbr-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pbr/pbr-3.1.1.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b7a070a6aafcaef60f1040b59ada4d63
diff --git a/metadata/md5-cache/dev-python/pbr-4.1.1 b/metadata/md5-cache/dev-python/pbr-4.1.1
index ce2141fe9c6a..c99200ac46c6 100644
--- a/metadata/md5-cache/dev-python/pbr-4.1.1
+++ b/metadata/md5-cache/dev-python/pbr-4.1.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_
 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/pbr/pbr-4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8794891d07905b06804b637354fcbb9b
diff --git a/metadata/md5-cache/dev-python/pbr-4.2.0-r1 b/metadata/md5-cache/dev-python/pbr-4.2.0-r1
index 41570c5c7b96..d6ace06b78ee 100644
--- a/metadata/md5-cache/dev-python/pbr-4.2.0-r1
+++ b/metadata/md5-cache/dev-python/pbr-4.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_
 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/pbr/pbr-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cdfed89fd1529f0e4c65033da1c4c5a2
diff --git a/metadata/md5-cache/dev-python/pbr-4.2.0-r2 b/metadata/md5-cache/dev-python/pbr-4.2.0-r2
index d57be41b2b24..344a68e640ab 100644
--- a/metadata/md5-cache/dev-python/pbr-4.2.0-r2
+++ b/metadata/md5-cache/dev-python/pbr-4.2.0-r2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_
 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/pbr/pbr-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0a969ee008b375b5b7f246caecccbe8e
diff --git a/metadata/md5-cache/dev-python/pbr-4.3.0 b/metadata/md5-cache/dev-python/pbr-4.3.0
new file mode 100644
index 000000000000..a66867fbaaf6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pbr-4.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_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/coverage-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/coverage-4.4[python_targets_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-3.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/mock-2.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/subunit-1.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/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(-)] >=dev-python/testrepository-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/testresources-2.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/testscenarios-0.4[python_targets_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-2.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/virtualenv-14.0.6[python_targets_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/stestr-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/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/wheel[python_targets_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-vcs/git ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Inject some useful and sensible default behaviors into setuptools
+EAPI=6
+HOMEPAGE=https://github.com/openstack-dev/pbr
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~hppa ~mips ~s390 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) 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/p/pbr/pbr-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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c0e302b90fe5eba8395944f08ff8ba1b
diff --git a/metadata/md5-cache/dev-python/pcapy-0.11.1 b/metadata/md5-cache/dev-python/pcapy-0.11.1
index a4d2270429fb..d277353ba50f 100644
--- a/metadata/md5-cache/dev-python/pcapy-0.11.1
+++ b/metadata/md5-cache/dev-python/pcapy-0.11.1
@@ -10,5 +10,5 @@ RDEPEND=net-libs/libpcap python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:
 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/CoreSecurity/pcapy/archive/0.11.1.tar.gz -> pcapy-0.11.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=92818fe8abab2b9d35e7a7ec22a25216
diff --git a/metadata/md5-cache/dev-python/pdb-clone-1.10.1 b/metadata/md5-cache/dev-python/pdb-clone-1.10.1
index aa859de1cbe0..fb4ffbd53fad 100644
--- a/metadata/md5-cache/dev-python/pdb-clone-1.10.1
+++ b/metadata/md5-cache/dev-python/pdb-clone-1.10.1
@@ -10,5 +10,5 @@ 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_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pdb-clone/pdb-clone-1.10.1.zip
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=684eeeeaec801848d984b0c8fe03f556
diff --git a/metadata/md5-cache/dev-python/pdfrw-0.2 b/metadata/md5-cache/dev-python/pdfrw-0.2
index c2a2df59c8b9..719cadd47bb6 100644
--- a/metadata/md5-cache/dev-python/pdfrw-0.2
+++ b/metadata/md5-cache/dev-python/pdfrw-0.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pdfrw/pdfrw-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7665da5fc0b6628c73beae7f8d9c4413
diff --git a/metadata/md5-cache/dev-python/pdfrw-0.4 b/metadata/md5-cache/dev-python/pdfrw-0.4
index f861197525e0..0b8dba9b93ad 100644
--- a/metadata/md5-cache/dev-python/pdfrw-0.4
+++ b/metadata/md5-cache/dev-python/pdfrw-0.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/pdfrw/pdfrw-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3cc0fe8240cce1953680d65b8c679be8
diff --git a/metadata/md5-cache/dev-python/pdoc-0.3.2 b/metadata/md5-cache/dev-python/pdoc-0.3.2
index 8265c29c6fcd..edf342c6311c 100644
--- a/metadata/md5-cache/dev-python/pdoc-0.3.2
+++ b/metadata/md5-cache/dev-python/pdoc-0.3.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/mako[python_targets_python2_7(-)?,python_targets_python3_4(-)
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pdoc/pdoc-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8afb596a592a260373026b9f54601150
diff --git a/metadata/md5-cache/dev-python/peak-rules-0.5 b/metadata/md5-cache/dev-python/peak-rules-0.5
index c6f755938e20..43d0963169a0 100644
--- a/metadata/md5-cache/dev-python/peak-rules-0.5
+++ b/metadata/md5-cache/dev-python/peak-rules-0.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://peak.telecommunity.com/snapshots/PEAK-Rules-0.5a1.dev-r2713.tar.gz -> peak-rules-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3a30f2865f5eca463aaae2a96857e1c9
diff --git a/metadata/md5-cache/dev-python/pecan-1.0.4 b/metadata/md5-cache/dev-python/pecan-1.0.4
index ccd8c10a1a98..d7939f4a0cd6 100644
--- a/metadata/md5-cache/dev-python/pecan-1.0.4
+++ b/metadata/md5-cache/dev-python/pecan-1.0.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/simplejson[python_targets_python2_7(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pecan/pecan-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3bb1c40ecb2fc26af2d416f3a96996cd
diff --git a/metadata/md5-cache/dev-python/pecan-1.1.2 b/metadata/md5-cache/dev-python/pecan-1.1.2
index c52a980cb1cd..a34b96cc9f78 100644
--- a/metadata/md5-cache/dev-python/pecan-1.1.2
+++ b/metadata/md5-cache/dev-python/pecan-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/simplejson-2.1.1[python_targets_python2_7(-)?,python_target
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pecan/pecan-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e9f45ea61d0ee4fcae7e5c4d2781cf7a
diff --git a/metadata/md5-cache/dev-python/pecan-1.2.1 b/metadata/md5-cache/dev-python/pecan-1.2.1
index 0f29e7ccc71d..939939296b60 100644
--- a/metadata/md5-cache/dev-python/pecan-1.2.1
+++ b/metadata/md5-cache/dev-python/pecan-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/simplejson-2.1.1[python_targets_python2_7(-)?,python_target
 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/pecan/pecan-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e3eb47b1d8af69ec9ff401ab60514c4b
diff --git a/metadata/md5-cache/dev-python/peewee-2.7.4 b/metadata/md5-cache/dev-python/peewee-2.7.4
index 943445c5baa2..02fab32b0974 100644
--- a/metadata/md5-cache/dev-python/peewee-2.7.4
+++ b/metadata/md5-cache/dev-python/peewee-2.7.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite(+)] )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/coleifer/peewee/archive/2.7.4.tar.gz -> peewee-2.7.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2a82c8380be80c1eec21a28ba51e7054
diff --git a/metadata/md5-cache/dev-python/peewee-2.8.3 b/metadata/md5-cache/dev-python/peewee-2.8.3
index cd5efae8ec0d..9b69b033aa90 100644
--- a/metadata/md5-cache/dev-python/peewee-2.8.3
+++ b/metadata/md5-cache/dev-python/peewee-2.8.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite(+)] )
 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/coleifer/peewee/archive/2.8.3.tar.gz -> peewee-2.8.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a326b913332c2424cb2072f2666a79bf
diff --git a/metadata/md5-cache/dev-python/peewee-2.8.4 b/metadata/md5-cache/dev-python/peewee-2.8.4
index 5dabadcb0a11..14100339b5f3 100644
--- a/metadata/md5-cache/dev-python/peewee-2.8.4
+++ b/metadata/md5-cache/dev-python/peewee-2.8.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite(+)] )
 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/coleifer/peewee/archive/2.8.4.tar.gz -> peewee-2.8.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1430413aca10ac4c7fd5b9943f3992f3
diff --git a/metadata/md5-cache/dev-python/peewee-3.1.0 b/metadata/md5-cache/dev-python/peewee-3.1.0
index 9e60923da999..9308f685960a 100644
--- a/metadata/md5-cache/dev-python/peewee-3.1.0
+++ b/metadata/md5-cache/dev-python/peewee-3.1.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite(+)] )
 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/coleifer/peewee/archive/3.1.0.tar.gz -> peewee-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=94fd0fc23adf31b14fbc31ff62996c63
diff --git a/metadata/md5-cache/dev-python/pelican-minify-0.9 b/metadata/md5-cache/dev-python/pelican-minify-0.9
index 4deda86250ce..ffebf6c545c1 100644
--- a/metadata/md5-cache/dev-python/pelican-minify-0.9
+++ b/metadata/md5-cache/dev-python/pelican-minify-0.9
@@ -10,5 +10,5 @@ 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
 SRC_URI=mirror://pypi/p/pelican-minify/pelican-minify-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3cf2e40326e698c9ed231304844d9000
diff --git a/metadata/md5-cache/dev-python/pep8-1.5.6 b/metadata/md5-cache/dev-python/pep8-1.5.6
index 3c3582335eaa..a179ff3e412d 100644
--- a/metadata/md5-cache/dev-python/pep8-1.5.6
+++ b/metadata/md5-cache/dev-python/pep8-1.5.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-
 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/pep8/pep8-1.5.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4babd90162a377ace2818ac22ef843e9
diff --git a/metadata/md5-cache/dev-python/pep8-1.5.7 b/metadata/md5-cache/dev-python/pep8-1.5.7
index 607da205b928..e82ea6aa0588 100644
--- a/metadata/md5-cache/dev-python/pep8-1.5.7
+++ b/metadata/md5-cache/dev-python/pep8-1.5.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,p
 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/pep8/pep8-1.5.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=dca8e412bd2b0c9e9e83c0f4ac387720
diff --git a/metadata/md5-cache/dev-python/pep8-1.7.0 b/metadata/md5-cache/dev-python/pep8-1.7.0
index d235ea5a0fa7..996103c88791 100644
--- a/metadata/md5-cache/dev-python/pep8-1.7.0
+++ b/metadata/md5-cache/dev-python/pep8-1.7.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,p
 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/pep8/pep8-1.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cdee4b21763ebf08e423d728b79c806e
diff --git a/metadata/md5-cache/dev-python/pep8-1.7.1 b/metadata/md5-cache/dev-python/pep8-1.7.1
index 8d4a25140756..172c2856839f 100644
--- a/metadata/md5-cache/dev-python/pep8-1.7.1
+++ b/metadata/md5-cache/dev-python/pep8-1.7.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,p
 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/pep8/pep8-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5c953f129526b5291d7f890a8b5c681f
diff --git a/metadata/md5-cache/dev-python/peppercorn-0.5 b/metadata/md5-cache/dev-python/peppercorn-0.5
index 38ef93e06601..8532997a3d62 100644
--- a/metadata/md5-cache/dev-python/peppercorn-0.5
+++ b/metadata/md5-cache/dev-python/peppercorn-0.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/peppercorn/peppercorn-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c8294cee44d773e50d78ce192a769084
diff --git a/metadata/md5-cache/dev-python/pew-1.1.1 b/metadata/md5-cache/dev-python/pew-1.1.1
index 578ed7c5495e..532331bd5db8 100644
--- a/metadata/md5-cache/dev-python/pew-1.1.1
+++ b/metadata/md5-cache/dev-python/pew-1.1.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pew/pew-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=442f94eb61c21d66462b2a06f3828e98
diff --git a/metadata/md5-cache/dev-python/pexpect-4.2.1 b/metadata/md5-cache/dev-python/pexpect-4.2.1
index 63847fa602a5..b395b1558175 100644
--- a/metadata/md5-cache/dev-python/pexpect-4.2.1
+++ b/metadata/md5-cache/dev-python/pexpect-4.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/ptyprocess-0.5[python_targets_pypy(-)?,python_targets_pypy3
 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/pexpect/pexpect-4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=49aae5784f67f863d505912a2f733ff0
diff --git a/metadata/md5-cache/dev-python/pgmagick-0.6.7 b/metadata/md5-cache/dev-python/pgmagick-0.6.7
index 0d9924c0589a..2419fa44b111 100644
--- a/metadata/md5-cache/dev-python/pgmagick-0.6.7
+++ b/metadata/md5-cache/dev-python/pgmagick-0.6.7
@@ -10,5 +10,5 @@ RDEPEND=media-gfx/graphicsmagick:=[cxx] dev-libs/boost:=[python,python_targets_p
 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/pgmagick/pgmagick-0.6.7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e1a654f26aa9a935685094b589f40c30
diff --git a/metadata/md5-cache/dev-python/pgpdump-1.5 b/metadata/md5-cache/dev-python/pgpdump-1.5
index fdf04592640d..c249ddc24ba1 100644
--- a/metadata/md5-cache/dev-python/pgpdump-1.5
+++ b/metadata/md5-cache/dev-python/pgpdump-1.5
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pgpdump/pgpdump-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5603ed569a210c09149bb8ff69f58868
diff --git a/metadata/md5-cache/dev-python/phonenumbers-8.3.1 b/metadata/md5-cache/dev-python/phonenumbers-8.3.1
index 913f3d2be1b4..e60332c1e9ff 100644
--- a/metadata/md5-cache/dev-python/phonenumbers-8.3.1
+++ b/metadata/md5-cache/dev-python/phonenumbers-8.3.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/daviddrysdale/python-phonenumbers/archive/v8.3.1.tar.gz -> phonenumbers-8.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=3e7e632bbdf55145c657622120425c3c
diff --git a/metadata/md5-cache/dev-python/photutils-0.3.1 b/metadata/md5-cache/dev-python/photutils-0.3.1
index f96e99f1bbec..a22d8c5ae799 100644
--- a/metadata/md5-cache/dev-python/photutils-0.3.1
+++ b/metadata/md5-cache/dev-python/photutils-0.3.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/photutils/photutils-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f333d24391dacd13f91e670573082e28
diff --git a/metadata/md5-cache/dev-python/photutils-0.3.2 b/metadata/md5-cache/dev-python/photutils-0.3.2
index c368870cea7b..1f81e5e7a1a8 100644
--- a/metadata/md5-cache/dev-python/photutils-0.3.2
+++ b/metadata/md5-cache/dev-python/photutils-0.3.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/photutils/photutils-0.3.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a9f2d32e2763b175dfc1b6841e6d4f72
diff --git a/metadata/md5-cache/dev-python/pickleshare-0.7.3 b/metadata/md5-cache/dev-python/pickleshare-0.7.3
index 739d005e4c90..3a3f7e8261d9 100644
--- a/metadata/md5-cache/dev-python/pickleshare-0.7.3
+++ b/metadata/md5-cache/dev-python/pickleshare-0.7.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pickleshare/pickleshare-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=78574e346098c9026c7c72c6c9f6dabe
diff --git a/metadata/md5-cache/dev-python/pickleshare-0.7.4-r1 b/metadata/md5-cache/dev-python/pickleshare-0.7.4-r1
index 9198340ea23e..8e118089e587 100644
--- a/metadata/md5-cache/dev-python/pickleshare-0.7.4-r1
+++ b/metadata/md5-cache/dev-python/pickleshare-0.7.4-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pickleshare/pickleshare-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f986df23f1e9b6f41cf9c443167fab29
diff --git a/metadata/md5-cache/dev-python/pid-2.1.1 b/metadata/md5-cache/dev-python/pid-2.1.1
index ef3c070331b3..13fef10c26e8 100644
--- a/metadata/md5-cache/dev-python/pid-2.1.1
+++ b/metadata/md5-cache/dev-python/pid-2.1.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pid/pid-2.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f55a9cf4229fddaa0a7d2841c904aafa
diff --git a/metadata/md5-cache/dev-python/pid-2.2.0 b/metadata/md5-cache/dev-python/pid-2.2.0
index d424e6ad64f0..66cb7475295e 100644
--- a/metadata/md5-cache/dev-python/pid-2.2.0
+++ b/metadata/md5-cache/dev-python/pid-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_
 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/pid/pid-2.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4ee586c2dce692e3cad8202adedf4fd0
diff --git a/metadata/md5-cache/dev-python/piddle-1.0.15-r1 b/metadata/md5-cache/dev-python/piddle-1.0.15-r1
index 52695b5a18cb..7562cacaa636 100644
--- a/metadata/md5-cache/dev-python/piddle-1.0.15-r1
+++ b/metadata/md5-cache/dev-python/piddle-1.0.15-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=mirror://sourceforge/piddle/piddle-1.0.15.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=80aee6659babb783545766a9374fda92
diff --git a/metadata/md5-cache/dev-python/piexif-1.0.12 b/metadata/md5-cache/dev-python/piexif-1.0.12
index ce9d8ae21e91..09fa1e6c10a8 100644
--- a/metadata/md5-cache/dev-python/piexif-1.0.12
+++ b/metadata/md5-cache/dev-python/piexif-1.0.12
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/piexif/piexif-1.0.12.zip
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=860adb5b4682307cd27eeafc3d207ec5
diff --git a/metadata/md5-cache/dev-python/piexif-1.0.13 b/metadata/md5-cache/dev-python/piexif-1.0.13
index 9b7152b2a6c0..9db419e7993f 100644
--- a/metadata/md5-cache/dev-python/piexif-1.0.13
+++ b/metadata/md5-cache/dev-python/piexif-1.0.13
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/piexif/piexif-1.0.13.zip
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6ac210573c653ad58773a32ac3e39830
diff --git a/metadata/md5-cache/dev-python/piexif-1.1.0_beta0 b/metadata/md5-cache/dev-python/piexif-1.1.0_beta0
index 7c4c4105a489..dd3eb54a85fc 100644
--- a/metadata/md5-cache/dev-python/piexif-1.1.0_beta0
+++ b/metadata/md5-cache/dev-python/piexif-1.1.0_beta0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/piexif/piexif-1.1.0b0.zip
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b985fc584e9322e2024f0fe63cca3993
diff --git a/metadata/md5-cache/dev-python/pika-0.10.0 b/metadata/md5-cache/dev-python/pika-0.10.0
index 07a8f276daa7..59d184339f02 100644
--- a/metadata/md5-cache/dev-python/pika-0.10.0
+++ b/metadata/md5-cache/dev-python/pika-0.10.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/pika/pika-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=de3cd679ba1b9288c24a5223204bfdd4
diff --git a/metadata/md5-cache/dev-python/pika-pool-0.1.3 b/metadata/md5-cache/dev-python/pika-pool-0.1.3
index 01186d950c6d..903f86296cfa 100644
--- a/metadata/md5-cache/dev-python/pika-pool-0.1.3
+++ b/metadata/md5-cache/dev-python/pika-pool-0.1.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pika-0.9[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
 SRC_URI=mirror://pypi/p/pika-pool/pika-pool-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=acff9ddda6a4e2f261d369c30e0cafa5
diff --git a/metadata/md5-cache/dev-python/pilkit-2.0 b/metadata/md5-cache/dev-python/pilkit-2.0
index 1db2ff18fdad..cdaa1e809d1f 100644
--- a/metadata/md5-cache/dev-python/pilkit-2.0
+++ b/metadata/md5-cache/dev-python/pilkit-2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/matthewwithanm/pilkit/archive/2.0.tar.gz -> pilkit-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6b36a103313d2a314d6e6d8cfa5bbde5
diff --git a/metadata/md5-cache/dev-python/pillow-3.4.2-r1 b/metadata/md5-cache/dev-python/pillow-3.4.2-r1
index 3dc4f983521c..462909ff223e 100644
--- a/metadata/md5-cache/dev-python/pillow-3.4.2-r1
+++ b/metadata/md5-cache/dev-python/pillow-3.4.2-r1
@@ -10,5 +10,5 @@ RDEPEND=jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( medi
 REQUIRED_USE=test? ( jpeg tiff ) || ( 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/Pillow/Pillow-3.4.2.zip
-_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=42c072ca20395b9c0c37d83632e567d4
diff --git a/metadata/md5-cache/dev-python/pillow-4.3.0-r2 b/metadata/md5-cache/dev-python/pillow-4.3.0-r2
deleted file mode 100644
index 4ae10f6029ee..000000000000
--- a/metadata/md5-cache/dev-python/pillow-4.3.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/olefile[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) zlib? ( sys-libs/zlib:0= ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx_rtd_theme[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-gfx/imagemagick[png] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Python Imaging Library (fork)
-EAPI=6
-HOMEPAGE=https://python-pillow.org/
-IUSE=doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
-KEYWORDS=amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=HPND
-RDEPEND=dev-python/olefile[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) zlib? ( sys-libs/zlib:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=test? ( jpeg tiff ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/P/Pillow/Pillow-4.3.0.tar.gz
-_eclasses_=desktop	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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=fef3abaf8a3bd35b0496f565ef5dd795
diff --git a/metadata/md5-cache/dev-python/pillow-4.3.0-r3 b/metadata/md5-cache/dev-python/pillow-4.3.0-r3
deleted file mode 100644
index f0c4dd9820c4..000000000000
--- a/metadata/md5-cache/dev-python/pillow-4.3.0-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/olefile[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) tiff? ( media-libs/tiff:0=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) zlib? ( sys-libs/zlib:0= ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx_rtd_theme[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-gfx/imagemagick[png] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Python Imaging Library (fork)
-EAPI=6
-HOMEPAGE=https://python-pillow.org/
-IUSE=doc examples imagequant jpeg jpeg2k lcms qt5 test tiff tk truetype webp zlib python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=HPND
-RDEPEND=dev-python/olefile[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) tiff? ( media-libs/tiff:0=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) zlib? ( sys-libs/zlib:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=test? ( jpeg tiff ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/P/Pillow/Pillow-4.3.0.tar.gz
-_eclasses_=desktop	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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=7e2cb50888268872982487d48e2de46c
diff --git a/metadata/md5-cache/dev-python/pillow-5.2.0 b/metadata/md5-cache/dev-python/pillow-5.2.0
index b9fbe3d2d8e9..9d70a3952d9d 100644
--- a/metadata/md5-cache/dev-python/pillow-5.2.0
+++ b/metadata/md5-cache/dev-python/pillow-5.2.0
@@ -1,15 +1,15 @@
-BDEPEND=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_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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+BDEPEND=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(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/olefile[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] 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= ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx_rtd_theme[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] media-gfx/imagemagick[png] )
+DEPEND=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= ) 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(-)] 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_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/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(-)] media-gfx/imagemagick[png] )
 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_5 python_targets_python3_6 python_targets_python3_7 test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+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
 LICENSE=HPND
-RDEPEND=dev-python/olefile[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] 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_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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=test? ( jpeg tiff ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+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_=2bdb519100a50158504c730044ad9f2c
+_md5_=c81ebc8e8d9ac6a734e75364380cd7d2
diff --git a/metadata/md5-cache/dev-python/pillow-5.3.0 b/metadata/md5-cache/dev-python/pillow-5.3.0
new file mode 100644
index 000000000000..787766753d8a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pillow-5.3.0
@@ -0,0 +1,15 @@
+BDEPEND=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(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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= ) 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(-)] 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_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/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(-)] media-gfx/imagemagick[png] )
+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
+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.3.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_=c85526666d4cf354af3c185e8a3975a3
diff --git a/metadata/md5-cache/dev-python/pillowfight-0.2 b/metadata/md5-cache/dev-python/pillowfight-0.2
index af44659b9a60..df9e4d9db326 100644
--- a/metadata/md5-cache/dev-python/pillowfight-0.2
+++ b/metadata/md5-cache/dev-python/pillowfight-0.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/pillowfight/pillowfight-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=278a90b8eff154b3a43fec81a7affc91
diff --git a/metadata/md5-cache/dev-python/pip-10.0.1 b/metadata/md5-cache/dev-python/pip-10.0.1
index 4fcf8262823e..e1a4f4e642c9 100644
--- a/metadata/md5-cache/dev-python/pip-10.0.1
+++ b/metadata/md5-cache/dev-python/pip-10.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pip/pip-10.0.1.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e0584471330076fb5a4714943cfe7653
diff --git a/metadata/md5-cache/dev-python/pip-7.1.2 b/metadata/md5-cache/dev-python/pip-7.1.2
index 3bc144d5e0ec..986db3ba0d56 100644
--- a/metadata/md5-cache/dev-python/pip-7.1.2
+++ b/metadata/md5-cache/dev-python/pip-7.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pip/pip-7.1.2.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fb14cabaf70f82a25265a6631b3952b8
diff --git a/metadata/md5-cache/dev-python/pip-9.0.1-r1 b/metadata/md5-cache/dev-python/pip-9.0.1-r1
index 90546726484f..5189255836ab 100644
--- a/metadata/md5-cache/dev-python/pip-9.0.1-r1
+++ b/metadata/md5-cache/dev-python/pip-9.0.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pip/pip-9.0.1.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2b4497f2ea7e4ee073323fb05e22e850
diff --git a/metadata/md5-cache/dev-python/pip-9.0.1-r2 b/metadata/md5-cache/dev-python/pip-9.0.1-r2
index aef649797560..8fb51eb20a57 100644
--- a/metadata/md5-cache/dev-python/pip-9.0.1-r2
+++ b/metadata/md5-cache/dev-python/pip-9.0.1-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pip/pip-9.0.1.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b93e5892016daf443c8329321cc3edea
diff --git a/metadata/md5-cache/dev-python/pipenv-9.0.0 b/metadata/md5-cache/dev-python/pipenv-9.0.0
index c20b867084af..7984346b6cb6 100644
--- a/metadata/md5-cache/dev-python/pipenv-9.0.0
+++ b/metadata/md5-cache/dev-python/pipenv-9.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pipenv/pipenv-9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=220c5074de7e1e70809764dd96742f22
diff --git a/metadata/md5-cache/dev-python/pipenv-9.0.0-r1 b/metadata/md5-cache/dev-python/pipenv-9.0.0-r1
index b15eb7854c7f..8c010debd2ae 100644
--- a/metadata/md5-cache/dev-python/pipenv-9.0.0-r1
+++ b/metadata/md5-cache/dev-python/pipenv-9.0.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pipenv/pipenv-9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dd345e7e9d1d715def4c90d0efb2ed20
diff --git a/metadata/md5-cache/dev-python/pipenv-9.0.0-r2 b/metadata/md5-cache/dev-python/pipenv-9.0.0-r2
index c6556aa64202..fa8a4ead56b3 100644
--- a/metadata/md5-cache/dev-python/pipenv-9.0.0-r2
+++ b/metadata/md5-cache/dev-python/pipenv-9.0.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pipenv/pipenv-9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f3f268244e2b2c7f4d0a7e22334cc519
diff --git a/metadata/md5-cache/dev-python/pkgconfig-1.2.2 b/metadata/md5-cache/dev-python/pkgconfig-1.2.2
index f25b31f7e8b5..23aed77c3865 100644
--- a/metadata/md5-cache/dev-python/pkgconfig-1.2.2
+++ b/metadata/md5-cache/dev-python/pkgconfig-1.2.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/pkgconfig/pkgconfig-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c95fda74368d5e859a6c2a003b10f099
diff --git a/metadata/md5-cache/dev-python/pkginfo-1.2.1 b/metadata/md5-cache/dev-python/pkginfo-1.2.1
index 422c88ea9c18..c8771237551e 100644
--- a/metadata/md5-cache/dev-python/pkginfo-1.2.1
+++ b/metadata/md5-cache/dev-python/pkginfo-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)
 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/pkginfo/pkginfo-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8a43c3506e618418af179f3f304ed543
diff --git a/metadata/md5-cache/dev-python/pkginfo-1.4.2 b/metadata/md5-cache/dev-python/pkginfo-1.4.2
index badea3402d6c..08c11ce4b4ca 100644
--- a/metadata/md5-cache/dev-python/pkginfo-1.4.2
+++ b/metadata/md5-cache/dev-python/pkginfo-1.4.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,p
 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/pkginfo/pkginfo-1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9473ada2e372bfa17dcde83f4e8f80b8
diff --git a/metadata/md5-cache/dev-python/pkipplib-0.07-r1 b/metadata/md5-cache/dev-python/pkipplib-0.07-r1
index c8d948d9d08e..573bead35bbd 100644
--- a/metadata/md5-cache/dev-python/pkipplib-0.07-r1
+++ b/metadata/md5-cache/dev-python/pkipplib-0.07-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=http://www.pykota.com/software/pkipplib/download/tarballs/pkipplib-0.07.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c7e13d84cd47ea1b710fd13b93a579f5
diff --git a/metadata/md5-cache/dev-python/placefinder-0.3 b/metadata/md5-cache/dev-python/placefinder-0.3
index e594add4be7e..601856ab1fc3 100644
--- a/metadata/md5-cache/dev-python/placefinder-0.3
+++ b/metadata/md5-cache/dev-python/placefinder-0.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/placefinder-py/placefinder-py-0.3.tar.gz -> placefinder-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1fecbc129d6aec05c7b1183d1b37112d
diff --git a/metadata/md5-cache/dev-python/plotly-1.9.6 b/metadata/md5-cache/dev-python/plotly-1.9.6
index 93a190229754..0c12fc7347b5 100644
--- a/metadata/md5-cache/dev-python/plotly-1.9.6
+++ b/metadata/md5-cache/dev-python/plotly-1.9.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_
 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/plotly/plotly-1.9.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a84a3865fc24675025473a695b3d4a9d
diff --git a/metadata/md5-cache/dev-python/pluggy-0.5.2 b/metadata/md5-cache/dev-python/pluggy-0.5.2
index 8492cfad9e59..d935caa0ad23 100644
--- a/metadata/md5-cache/dev-python/pluggy-0.5.2
+++ b/metadata/md5-cache/dev-python/pluggy-0.5.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pluggy/pluggy-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4dfb62addd11bccbf032b5e610873a29
diff --git a/metadata/md5-cache/dev-python/pluggy-0.6.0 b/metadata/md5-cache/dev-python/pluggy-0.6.0
index 367d49bf52b4..8cb78670c18d 100644
--- a/metadata/md5-cache/dev-python/pluggy-0.6.0
+++ b/metadata/md5-cache/dev-python/pluggy-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/pluggy/pluggy-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=66ab284b766ac02a660523f6040f3ccb
diff --git a/metadata/md5-cache/dev-python/pluginbase-0.5 b/metadata/md5-cache/dev-python/pluginbase-0.5
index 7d1dce15f090..89bced87905f 100644
--- a/metadata/md5-cache/dev-python/pluginbase-0.5
+++ b/metadata/md5-cache/dev-python/pluginbase-0.5
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pluginbase/pluginbase-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=217393d48bc21662f6621dd077b6ca6e
diff --git a/metadata/md5-cache/dev-python/plumbum-1.6.0 b/metadata/md5-cache/dev-python/plumbum-1.6.0
index 32057b7d21ae..4919b63938e1 100644
--- a/metadata/md5-cache/dev-python/plumbum-1.6.0
+++ b/metadata/md5-cache/dev-python/plumbum-1.6.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/plumbum/plumbum-1.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=490289c5b693a541308ecfdb409f5836
diff --git a/metadata/md5-cache/dev-python/plumbum-1.6.4 b/metadata/md5-cache/dev-python/plumbum-1.6.4
index 0efa0db29fd0..f455ffaf5c22 100644
--- a/metadata/md5-cache/dev-python/plumbum-1.6.4
+++ b/metadata/md5-cache/dev-python/plumbum-1.6.4
@@ -10,5 +10,5 @@ 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_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/plumbum/plumbum-1.6.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=80adc047cc37d2baa6d1ed167cf977e6
diff --git a/metadata/md5-cache/dev-python/ply-3.10 b/metadata/md5-cache/dev-python/ply-3.10
index c4984ec9592a..d5d2a89df950 100644
--- a/metadata/md5-cache/dev-python/ply-3.10
+++ b/metadata/md5-cache/dev-python/ply-3.10
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/3.10
 SRC_URI=mirror://pypi/p/ply/ply-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=22941d7bdb6585aa8f073eac90928346
diff --git a/metadata/md5-cache/dev-python/ply-3.11 b/metadata/md5-cache/dev-python/ply-3.11
index 12340e88b3bc..12a2be41a1a8 100644
--- a/metadata/md5-cache/dev-python/ply-3.11
+++ b/metadata/md5-cache/dev-python/ply-3.11
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/3.11
 SRC_URI=mirror://pypi/p/ply/ply-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1bc4063fbf139e78e49a3f6468b4b831
diff --git a/metadata/md5-cache/dev-python/ply-3.6-r1 b/metadata/md5-cache/dev-python/ply-3.6-r1
index 46cc59d0222e..51cffe0fdfe6 100644
--- a/metadata/md5-cache/dev-python/ply-3.6-r1
+++ b/metadata/md5-cache/dev-python/ply-3.6-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0/3.6
 SRC_URI=http://www.dabeaz.com/ply/ply-3.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6b6791290a92470ae67c69758511f58d
diff --git a/metadata/md5-cache/dev-python/ply-3.9 b/metadata/md5-cache/dev-python/ply-3.9
index 38c02c6449a7..b7c581d3b70c 100644
--- a/metadata/md5-cache/dev-python/ply-3.9
+++ b/metadata/md5-cache/dev-python/ply-3.9
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/3.9
 SRC_URI=mirror://pypi/p/ply/ply-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=551efa71f56c087f136015a39677cf0d
diff --git a/metadata/md5-cache/dev-python/plyr-1.0.6 b/metadata/md5-cache/dev-python/plyr-1.0.6
index 4e1f9ef759d2..fe78be862148 100644
--- a/metadata/md5-cache/dev-python/plyr-1.0.6
+++ b/metadata/md5-cache/dev-python/plyr-1.0.6
@@ -10,5 +10,5 @@ RDEPEND=media-libs/glyr python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2
 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/sahib/python-glyr/archive/1.0.6.tar.gz -> python-glyr-1.0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0d2092a45b4d149f98bc2ad6cc3832c3
diff --git a/metadata/md5-cache/dev-python/pmw-1.3.3-r2 b/metadata/md5-cache/dev-python/pmw-1.3.3-r2
index 839b1c5958a2..f4b2aab65540 100644
--- a/metadata/md5-cache/dev-python/pmw-1.3.3-r2
+++ b/metadata/md5-cache/dev-python/pmw-1.3.3-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=py2
 SRC_URI=mirror://sourceforge/pmw/Pmw.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2e73251efb224b49739203642efd35dc
diff --git a/metadata/md5-cache/dev-python/pmw-2.0.1 b/metadata/md5-cache/dev-python/pmw-2.0.1
index 6d89630a25e5..d7ede75dddff 100644
--- a/metadata/md5-cache/dev-python/pmw-2.0.1
+++ b/metadata/md5-cache/dev-python/pmw-2.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targe
 RESTRICT=test
 SLOT=py3
 SRC_URI=mirror://pypi/P/Pmw/Pmw-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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=07d5e66fb287eef569081833026a5977
diff --git a/metadata/md5-cache/dev-python/pocketlint-0.15 b/metadata/md5-cache/dev-python/pocketlint-0.15
index 3d9263140c8f..53076097bed4 100644
--- a/metadata/md5-cache/dev-python/pocketlint-0.15
+++ b/metadata/md5-cache/dev-python/pocketlint-0.15
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/rhinstaller/pocketlint/archive/0.15.tar.gz -> pocketlint-0.15.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c0275b192d94d80faeeef23d59c39ad8
diff --git a/metadata/md5-cache/dev-python/pockets-0.3 b/metadata/md5-cache/dev-python/pockets-0.3
index dd0500cac1c9..987710afe555 100644
--- a/metadata/md5-cache/dev-python/pockets-0.3
+++ b/metadata/md5-cache/dev-python/pockets-0.3
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pockets/pockets-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6c24dce450412557a63460047e7860bf
diff --git a/metadata/md5-cache/dev-python/pockets-0.5.1 b/metadata/md5-cache/dev-python/pockets-0.5.1
index a16bd7a9d4e4..f84ff3511461 100644
--- a/metadata/md5-cache/dev-python/pockets-0.5.1
+++ b/metadata/md5-cache/dev-python/pockets-0.5.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pockets/pockets-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fcbc9650e46c1a74300c4a1719d4dc42
diff --git a/metadata/md5-cache/dev-python/polib-1.0.7 b/metadata/md5-cache/dev-python/polib-1.0.7
index 231e6840d2e2..db305ce4280a 100644
--- a/metadata/md5-cache/dev-python/polib-1.0.7
+++ b/metadata/md5-cache/dev-python/polib-1.0.7
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/polib/polib-1.0.7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e1607517e6d93a8c13e046e4918f86ff
diff --git a/metadata/md5-cache/dev-python/polib-1.1.0 b/metadata/md5-cache/dev-python/polib-1.1.0
index 4457a7749109..8b4929754d01 100644
--- a/metadata/md5-cache/dev-python/polib-1.1.0
+++ b/metadata/md5-cache/dev-python/polib-1.1.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/polib/polib-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3c0c4c8bffd64f671cc48fd843f3155d
diff --git a/metadata/md5-cache/dev-python/polygon-2.0.6 b/metadata/md5-cache/dev-python/polygon-2.0.6
index c5a14a6acd21..4c39a04c2edc 100644
--- a/metadata/md5-cache/dev-python/polygon-2.0.6
+++ b/metadata/md5-cache/dev-python/polygon-2.0.6
@@ -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=2
 SRC_URI=https://www.bitbucket.org/jraedler/polygon2/downloads/Polygon2-2.0.6.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fb286d006d77ad8a39776ccabe12d184
diff --git a/metadata/md5-cache/dev-python/polygon-3.0.7 b/metadata/md5-cache/dev-python/polygon-3.0.7
index f57c054b39d1..210071f8895d 100644
--- a/metadata/md5-cache/dev-python/polygon-3.0.7
+++ b/metadata/md5-cache/dev-python/polygon-3.0.7
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=3
 SRC_URI=https://www.bitbucket.org/jraedler/polygon3/downloads/Polygon3-3.0.7.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c4de4653911148430cbef9a33bdc0d9e
diff --git a/metadata/md5-cache/dev-python/portend-2.2 b/metadata/md5-cache/dev-python/portend-2.2
index 40729cb03cd5..a7ec26f14297 100644
--- a/metadata/md5-cache/dev-python/portend-2.2
+++ b/metadata/md5-cache/dev-python/portend-2.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/tempora-1.8[python_targets_pypy(-)?,python_targets_pypy3(-)
 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/portend/portend-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5d60f637b5e7aaab9cde44210d4dbd5a
diff --git a/metadata/md5-cache/dev-python/positional-1.0.1 b/metadata/md5-cache/dev-python/positional-1.0.1
index 139282292e2a..99b0db7dc135 100644
--- a/metadata/md5-cache/dev-python/positional-1.0.1
+++ b/metadata/md5-cache/dev-python/positional-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.6[python_targets_pypy(-)?,python_targets_python2_7(-)
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/positional/positional-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=821aa77868227b9bab693940d65c4f98
diff --git a/metadata/md5-cache/dev-python/positional-1.1.1 b/metadata/md5-cache/dev-python/positional-1.1.1
index f33ab6a14481..0b17ddfcaa0d 100644
--- a/metadata/md5-cache/dev-python/positional-1.1.1
+++ b/metadata/md5-cache/dev-python/positional-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.6[python_targets_pypy(-)?,python_targets_python2_7(-)
 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/positional/positional-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a4639c6ee239d807f80e58ca1575568d
diff --git a/metadata/md5-cache/dev-python/positional-1.1.2 b/metadata/md5-cache/dev-python/positional-1.1.2
index 383850812d15..2ee7c8bbde71 100644
--- a/metadata/md5-cache/dev-python/positional-1.1.2
+++ b/metadata/md5-cache/dev-python/positional-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.6[python_targets_pypy(-)?,python_targets_python2_7(-)
 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/positional/positional-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a4639c6ee239d807f80e58ca1575568d
diff --git a/metadata/md5-cache/dev-python/posix_ipc-0.9.8 b/metadata/md5-cache/dev-python/posix_ipc-0.9.8
index d2a945264f2f..59832b564e23 100644
--- a/metadata/md5-cache/dev-python/posix_ipc-0.9.8
+++ b/metadata/md5-cache/dev-python/posix_ipc-0.9.8
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/posix_ipc/posix_ipc-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6da49fb23979b76872d5991bd6191a1f
diff --git a/metadata/md5-cache/dev-python/potr-1.0.1 b/metadata/md5-cache/dev-python/potr-1.0.1
index d1accd27f147..1deaf0d02cc6 100644
--- a/metadata/md5-cache/dev-python/potr-1.0.1
+++ b/metadata/md5-cache/dev-python/potr-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pycrypto-2.1[python_targets_python2_7(-)?,python_targets_py
 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/python-potr/python-potr-1.0.1.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f0ecff1f36e8b96908d6d0fccacc7b26
diff --git a/metadata/md5-cache/dev-python/poyo-0.4.1 b/metadata/md5-cache/dev-python/poyo-0.4.1
index f5b2c326dce0..eb05aa1b0230 100644
--- a/metadata/md5-cache/dev-python/poyo-0.4.1
+++ b/metadata/md5-cache/dev-python/poyo-0.4.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/poyo/poyo-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0fe88f864d389e737e8cdc6779e609a7
diff --git a/metadata/md5-cache/dev-python/pp-1.6.5 b/metadata/md5-cache/dev-python/pp-1.6.5
index 0223560ab668..c8002583a7fa 100644
--- a/metadata/md5-cache/dev-python/pp-1.6.5
+++ b/metadata/md5-cache/dev-python/pp-1.6.5
@@ -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://www.parallelpython.com/downloads/pp/pp-1.6.5.tar.bz2
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=532c5e0cf9d8ddca5d44a175634a0780
diff --git a/metadata/md5-cache/dev-python/pp-1.6.6 b/metadata/md5-cache/dev-python/pp-1.6.6
index 4ab2ad296a72..7642fbdfba1e 100644
--- a/metadata/md5-cache/dev-python/pp-1.6.6
+++ b/metadata/md5-cache/dev-python/pp-1.6.6
@@ -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://www.parallelpython.com/downloads/pp/pp-1.6.6.tar.bz2
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=532c5e0cf9d8ddca5d44a175634a0780
diff --git a/metadata/md5-cache/dev-python/precis-i18n-1.0.0 b/metadata/md5-cache/dev-python/precis-i18n-1.0.0
index e289e02087ee..a6de47c9c3db 100644
--- a/metadata/md5-cache/dev-python/precis-i18n-1.0.0
+++ b/metadata/md5-cache/dev-python/precis-i18n-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/precis_i18n/precis_i18n-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=af681f662a25eb319eb847ec0dfb3913
diff --git a/metadata/md5-cache/dev-python/pretend-1.0.8 b/metadata/md5-cache/dev-python/pretend-1.0.8
index 3a906db23c2d..9937652da781 100644
--- a/metadata/md5-cache/dev-python/pretend-1.0.8
+++ b/metadata/md5-cache/dev-python/pretend-1.0.8
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/pretend/pretend-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b88654de9361bb03333794a66a8a4030
diff --git a/metadata/md5-cache/dev-python/pretend-1.0.8-r1 b/metadata/md5-cache/dev-python/pretend-1.0.8-r1
index 6a489f02bde8..46f200e46f9a 100644
--- a/metadata/md5-cache/dev-python/pretend-1.0.8-r1
+++ b/metadata/md5-cache/dev-python/pretend-1.0.8-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/alex/pretend/archive/v1.0.8.tar.gz -> pretend-1.0.8.gh.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=33ecb367d458e5b66874e9fa849d0797
diff --git a/metadata/md5-cache/dev-python/pretend-1.0.9 b/metadata/md5-cache/dev-python/pretend-1.0.9
index 184c42a7b791..39a929120740 100644
--- a/metadata/md5-cache/dev-python/pretend-1.0.9
+++ b/metadata/md5-cache/dev-python/pretend-1.0.9
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/alex/pretend/archive/v1.0.9.tar.gz -> pretend-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=44413c77fee3ddf79506d432448923b6
diff --git a/metadata/md5-cache/dev-python/pretty-yaml-15.6.3 b/metadata/md5-cache/dev-python/pretty-yaml-15.6.3
index f3719cf6bdc1..2c48c0d99be8 100644
--- a/metadata/md5-cache/dev-python/pretty-yaml-15.6.3
+++ b/metadata/md5-cache/dev-python/pretty-yaml-15.6.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyyaml[python_targets_pypy(-)?,python_targets_python2_7(-)?,p
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyaml/pyaml-15.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=5755d07b78faedd8b3ccb525faa01737
diff --git a/metadata/md5-cache/dev-python/pretty-yaml-15.8.2 b/metadata/md5-cache/dev-python/pretty-yaml-15.8.2
index b20d4a69ca23..b3c550549624 100644
--- a/metadata/md5-cache/dev-python/pretty-yaml-15.8.2
+++ b/metadata/md5-cache/dev-python/pretty-yaml-15.8.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyyaml[python_targets_pypy(-)?,python_targets_python2_7(-)?,p
 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/pyaml/pyaml-15.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a7a81dbf170ae5c9c0cd27f5094b1c71
diff --git a/metadata/md5-cache/dev-python/prettyprinter-0.13.2 b/metadata/md5-cache/dev-python/prettyprinter-0.13.2
index 228b224deeff..b43680f7f85b 100644
--- a/metadata/md5-cache/dev-python/prettyprinter-0.13.2
+++ b/metadata/md5-cache/dev-python/prettyprinter-0.13.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/colorful[python_targets_python3_5(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/prettyprinter/prettyprinter-0.13.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0f9d8dbce3ed06ab0c652940c9acd138
diff --git a/metadata/md5-cache/dev-python/prettytable-0.7.1-r1 b/metadata/md5-cache/dev-python/prettytable-0.7.1-r1
index d91578a0be2b..e4ab6fe1b0dc 100644
--- a/metadata/md5-cache/dev-python/prettytable-0.7.1-r1
+++ b/metadata/md5-cache/dev-python/prettytable-0.7.1-r1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PrettyTable/prettytable-0.7.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7649eed5554691b7e9981396599ce018
diff --git a/metadata/md5-cache/dev-python/prettytable-0.7.2 b/metadata/md5-cache/dev-python/prettytable-0.7.2
index cd780d522669..6eb2ede7fc54 100644
--- a/metadata/md5-cache/dev-python/prettytable-0.7.2
+++ b/metadata/md5-cache/dev-python/prettytable-0.7.2
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PrettyTable/prettytable-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=020e52572ef0388aaaa6a6f5188ef8d5
diff --git a/metadata/md5-cache/dev-python/priority-1.3.0 b/metadata/md5-cache/dev-python/priority-1.3.0
index 69f6fa554344..16b9bb13ffd6 100644
--- a/metadata/md5-cache/dev-python/priority-1.3.0
+++ b/metadata/md5-cache/dev-python/priority-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_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/p/priority/priority-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=aa3bbc4016563149f69a557c5b057e61
diff --git a/metadata/md5-cache/dev-python/process-tests-1.2.0 b/metadata/md5-cache/dev-python/process-tests-1.2.0
index eeccf36d3a91..b6bc74c942ba 100644
--- a/metadata/md5-cache/dev-python/process-tests-1.2.0
+++ b/metadata/md5-cache/dev-python/process-tests-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/process-tests/process-tests-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4ddec29b9f6f1f969220430fda13b895
diff --git a/metadata/md5-cache/dev-python/processing-0.52-r1 b/metadata/md5-cache/dev-python/processing-0.52-r1
index 6d632501400c..6d8f68d66c4d 100644
--- a/metadata/md5-cache/dev-python/processing-0.52-r1
+++ b/metadata/md5-cache/dev-python/processing-0.52-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=mirror://pypi/p/processing/processing-0.52.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a5ffd5230529d33321ff24d45ab62cd0
diff --git a/metadata/md5-cache/dev-python/progress-1.2 b/metadata/md5-cache/dev-python/progress-1.2
index edf5366e34d4..8df4cd838a50 100644
--- a/metadata/md5-cache/dev-python/progress-1.2
+++ b/metadata/md5-cache/dev-python/progress-1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/progress/progress-1.2.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=66f5e0597494283506d3d2965d93d2ba
diff --git a/metadata/md5-cache/dev-python/progress-1.3 b/metadata/md5-cache/dev-python/progress-1.3
index 1fcf94ab5947..90293dc95880 100644
--- a/metadata/md5-cache/dev-python/progress-1.3
+++ b/metadata/md5-cache/dev-python/progress-1.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/progress/progress-1.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=33ada809faded4dd78f7880af50b6a44
diff --git a/metadata/md5-cache/dev-python/progressbar-2.3-r3 b/metadata/md5-cache/dev-python/progressbar-2.3-r3
index 98e3da1770d0..2ab2da64f548 100644
--- a/metadata/md5-cache/dev-python/progressbar-2.3-r3
+++ b/metadata/md5-cache/dev-python/progressbar-2.3-r3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/progressbar/progressbar-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=208045bc0be94a3541a05b11195d6b7b
diff --git a/metadata/md5-cache/dev-python/prometheus_client-0.2.0 b/metadata/md5-cache/dev-python/prometheus_client-0.2.0
index 81c22a3ba91e..c6d5ee86a480 100644
--- a/metadata/md5-cache/dev-python/prometheus_client-0.2.0
+++ b/metadata/md5-cache/dev-python/prometheus_client-0.2.0
@@ -10,5 +10,5 @@ RDEPEND=|| ( dev-python/twisted[python_targets_python2_7(-)?,python_targets_pyth
 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/prometheus/client_python/archive/v0.2.0.tar.gz -> prometheus_client-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1061842abe0e6181037c212fbd79013b
diff --git a/metadata/md5-cache/dev-python/prometheus_client-0.3.0 b/metadata/md5-cache/dev-python/prometheus_client-0.3.0
index 53e00738bb96..d408c9f2c203 100644
--- a/metadata/md5-cache/dev-python/prometheus_client-0.3.0
+++ b/metadata/md5-cache/dev-python/prometheus_client-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=|| ( dev-python/twisted[python_targets_python2_7(-)?,python_targets_pyth
 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/prometheus/client_python/archive/v0.3.0.tar.gz -> prometheus_client-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e4f17b3115c933a3c2008582f7ad8691
diff --git a/metadata/md5-cache/dev-python/prometheus_client-0.3.1 b/metadata/md5-cache/dev-python/prometheus_client-0.3.1
index 1389e179f259..f2cc2652cc6a 100644
--- a/metadata/md5-cache/dev-python/prometheus_client-0.3.1
+++ b/metadata/md5-cache/dev-python/prometheus_client-0.3.1
@@ -10,5 +10,5 @@ RDEPEND=|| ( dev-python/twisted[python_targets_python2_7(-)?,python_targets_pyth
 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/prometheus/client_python/archive/v0.3.1.tar.gz -> prometheus_client-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e4f17b3115c933a3c2008582f7ad8691
diff --git a/metadata/md5-cache/dev-python/promises-2.0.1-r1 b/metadata/md5-cache/dev-python/promises-2.0.1-r1
index a3cfe7006811..1a833b3f7f07 100644
--- a/metadata/md5-cache/dev-python/promises-2.0.1-r1
+++ b/metadata/md5-cache/dev-python/promises-2.0.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/syrusakbary/promise/archive/v2.0.1.tar.gz -> promise-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ce8fa5fbc8f2d4c7e188d6efc221d436
diff --git a/metadata/md5-cache/dev-python/promises-2.1-r1 b/metadata/md5-cache/dev-python/promises-2.1-r1
index 901f7baceb91..9f389ecc5f8a 100644
--- a/metadata/md5-cache/dev-python/promises-2.1-r1
+++ b/metadata/md5-cache/dev-python/promises-2.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/promise/promise-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ae5b6aa7eb08c673817cc05eddd5a50b
diff --git a/metadata/md5-cache/dev-python/prompt_toolkit-1.0.15 b/metadata/md5-cache/dev-python/prompt_toolkit-1.0.15
index 3cf49b6d41b9..30196bbee784 100644
--- a/metadata/md5-cache/dev-python/prompt_toolkit-1.0.15
+++ b/metadata/md5-cache/dev-python/prompt_toolkit-1.0.15
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/prompt_toolkit/prompt_toolkit-1.0.15.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a5ee6b382f7106c8289e09c435e859bf
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.4.1 b/metadata/md5-cache/dev-python/protobuf-python-3.4.1
deleted file mode 100644
index 238a05ad74a5..000000000000
--- a/metadata/md5-cache/dev-python/protobuf-python-3.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-libs/protobuf-3.4.1 dev-python/namespace-google[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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-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 ) >=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=Google's Protocol Buffers - Python bindings
-EAPI=6
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 ) >=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/protobuf-3.4.1 dev-python/namespace-google[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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-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 ) >=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/14
-SRC_URI=https://github.com/google/protobuf/archive/v3.4.1.tar.gz -> protobuf-3.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=8fff39a0e40e936f784438f7dbce8b06
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.5.1.1 b/metadata/md5-cache/dev-python/protobuf-python-3.5.1.1
index 6c4efdc5c5ca..c302bdc7a25a 100644
--- a/metadata/md5-cache/dev-python/protobuf-python-3.5.1.1
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.5.1.1
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-libs/protobuf-3.5.1.1 dev-python/namespace-google[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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-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 ) >=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=Google's Protocol Buffers - Python bindings
 EAPI=6
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf
+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
 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 ) >=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/protobuf-3.5.1.1 dev-python/namespace-google[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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-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 ) >=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/15
-SRC_URI=https://github.com/google/protobuf/archive/v3.5.1.1.tar.gz -> protobuf-3.5.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=8f75ccd97bd87b32281401949227620f
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.5.1.1.tar.gz -> protobuf-3.5.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_=8ff86f310977d6d9d42c4250a98c8154
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.5.2-r1 b/metadata/md5-cache/dev-python/protobuf-python-3.5.2-r1
index 1c9187c531c7..4a44222b12bb 100644
--- a/metadata/md5-cache/dev-python/protobuf-python-3.5.2-r1
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.5.2-r1
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-libs/protobuf-3.5.2 dev-python/namespace-google[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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=Google's Protocol Buffers - Python bindings
 EAPI=6
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf
+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
 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 ) >=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/protobuf-3.5.2 dev-python/namespace-google[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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-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 ) >=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/15
-SRC_URI=https://github.com/google/protobuf/archive/v3.5.2.tar.gz -> protobuf-3.5.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=04ede7c9964436d1052d8d6ec4cd4286
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.5.2.tar.gz -> protobuf-3.5.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_=e7028aa65f749a8ab49d49e71c5e02c5
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.6.0.1 b/metadata/md5-cache/dev-python/protobuf-python-3.6.0.1
index a6c3f46c4cb8..c631a29cf595 100644
--- a/metadata/md5-cache/dev-python/protobuf-python-3.6.0.1
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.6.0.1
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-libs/protobuf-3.6.0.1 dev-python/namespace-google[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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=Google's Protocol Buffers - Python bindings
 EAPI=6
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf
+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
 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 ) >=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/protobuf-3.6.0.1 dev-python/namespace-google[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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-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 ) >=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/16
-SRC_URI=https://github.com/google/protobuf/archive/v3.6.0.1.tar.gz -> protobuf-3.6.0.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=9138961d7b6adc2a73a2145ddd7a91b8
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.6.0.1.tar.gz -> protobuf-3.6.0.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_=4bc0e3321209270553b90e1487df5735
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 aa782fb709a7..624e4a216ef4 100644
--- a/metadata/md5-cache/dev-python/protobuf-python-3.6.1
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.6.1
@@ -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 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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/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_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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(-)]
+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/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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_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=Google's Protocol Buffers - Python bindings
 EAPI=6
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_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
 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(-)] ~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_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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-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 ) >=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(-)] ~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/google/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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=d01012d83b4372c8acc861a428d05f95
+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
diff --git a/metadata/md5-cache/dev-python/psutil-5.4.1 b/metadata/md5-cache/dev-python/psutil-5.4.1
index 5ee177ebebf2..c998ab9114f7 100644
--- a/metadata/md5-cache/dev-python/psutil-5.4.1
+++ b/metadata/md5-cache/dev-python/psutil-5.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/psutil/psutil-5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=80c0c494a209cc2ef4cce2470346ccde
diff --git a/metadata/md5-cache/dev-python/psutil-5.4.3 b/metadata/md5-cache/dev-python/psutil-5.4.3
index 7754a1e403f2..f8c32e945e84 100644
--- a/metadata/md5-cache/dev-python/psutil-5.4.3
+++ b/metadata/md5-cache/dev-python/psutil-5.4.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-python/psycopg-2.7.4 b/metadata/md5-cache/dev-python/psycopg-2.7.4
index 3c1a88b2cb41..446767974e2b 100644
--- a/metadata/md5-cache/dev-python/psycopg-2.7.4
+++ b/metadata/md5-cache/dev-python/psycopg-2.7.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://pypi/p/psycopg2/psycopg2-2.7.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=66f3c51f073e65ec4225271eff67f791
diff --git a/metadata/md5-cache/dev-python/ptpython-0.33 b/metadata/md5-cache/dev-python/ptpython-0.33
index 06eb357d17fd..bfa22f42b486 100644
--- a/metadata/md5-cache/dev-python/ptpython-0.33
+++ b/metadata/md5-cache/dev-python/ptpython-0.33
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/ptpython/ptpython-0.33.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=57c37bd0fa10dc5f101c1c53a19f327b
diff --git a/metadata/md5-cache/dev-python/ptpython-0.33-r1 b/metadata/md5-cache/dev-python/ptpython-0.33-r1
index c46b2a74025a..3cd99f39d04b 100644
--- a/metadata/md5-cache/dev-python/ptpython-0.33-r1
+++ b/metadata/md5-cache/dev-python/ptpython-0.33-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/ptpython/ptpython-0.33.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5f4fcffacfe50749771d5a96474cdbbb
diff --git a/metadata/md5-cache/dev-python/ptvsd-3.2.1 b/metadata/md5-cache/dev-python/ptvsd-3.2.1
index 06b98c9cbebb..3ab90e3d5a73 100644
--- a/metadata/md5-cache/dev-python/ptvsd-3.2.1
+++ b/metadata/md5-cache/dev-python/ptvsd-3.2.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/59/de/54ad88ba555ce66920165949febf4810359c000c4c73568a6215603b437d/ptvsd-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4b466b1fea2c66b1562d5d0da95d9902
diff --git a/metadata/md5-cache/dev-python/ptyprocess-0.5.1 b/metadata/md5-cache/dev-python/ptyprocess-0.5.1
index 485315b411a6..d60e887cfbd9 100644
--- a/metadata/md5-cache/dev-python/ptyprocess-0.5.1
+++ b/metadata/md5-cache/dev-python/ptyprocess-0.5.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/ptyprocess/ptyprocess-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9b3914afacea66a183da738e86b1160c
diff --git a/metadata/md5-cache/dev-python/ptyprocess-0.5.2 b/metadata/md5-cache/dev-python/ptyprocess-0.5.2
index e573b02637b3..953ae5cf8b4d 100644
--- a/metadata/md5-cache/dev-python/ptyprocess-0.5.2
+++ b/metadata/md5-cache/dev-python/ptyprocess-0.5.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/ptyprocess/ptyprocess-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8ccaa99aefee46d894329f3b724ea049
diff --git a/metadata/md5-cache/dev-python/pudb-2017.1.4 b/metadata/md5-cache/dev-python/pudb-2017.1.4
index c21fd4813f11..58c98e0210bb 100644
--- a/metadata/md5-cache/dev-python/pudb-2017.1.4
+++ b/metadata/md5-cache/dev-python/pudb-2017.1.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/urwid[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pudb/pudb-2017.1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9dde7b54ea2b2c03577f7cce2bf8f949
diff --git a/metadata/md5-cache/dev-python/pudge-0.1.3-r1 b/metadata/md5-cache/dev-python/pudge-0.1.3-r1
index b106e0aec725..d882457904ea 100644
--- a/metadata/md5-cache/dev-python/pudge-0.1.3-r1
+++ b/metadata/md5-cache/dev-python/pudge-0.1.3-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pudge/pudge-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9eb031e349699ca834a98015e32d9db1
diff --git a/metadata/md5-cache/dev-python/pupynere-1.0.15-r1 b/metadata/md5-cache/dev-python/pupynere-1.0.15-r1
index 231da9e7fc77..cb8bcaf66161 100644
--- a/metadata/md5-cache/dev-python/pupynere-1.0.15-r1
+++ b/metadata/md5-cache/dev-python/pupynere-1.0.15-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pupynere/pupynere-1.0.15.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=268883bd74742044188c1ea8290c19b1
diff --git a/metadata/md5-cache/dev-python/pushbullet-py-0.10.0 b/metadata/md5-cache/dev-python/pushbullet-py-0.10.0
index d907d2265c54..5565dc231ae9 100644
--- a/metadata/md5-cache/dev-python/pushbullet-py-0.10.0
+++ b/metadata/md5-cache/dev-python/pushbullet-py-0.10.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/python-magic[python_targets_python2_7(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/randomchars/pushbullet.py/archive/0.10.0.tar.gz -> pushbullet-py-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a33f7bd47f408853655faf2ba13cff7a
diff --git a/metadata/md5-cache/dev-python/pushbullet-py-0.11.0 b/metadata/md5-cache/dev-python/pushbullet-py-0.11.0
index c8b35d81788f..ac370d6b2308 100644
--- a/metadata/md5-cache/dev-python/pushbullet-py-0.11.0
+++ b/metadata/md5-cache/dev-python/pushbullet-py-0.11.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/cryptography[python_targets_python2_7(-)?,python_targets_pyth
 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/pushbullet-py/pushbullet.py-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2d699c534a90e329f3f20d11d9acb0a1
diff --git a/metadata/md5-cache/dev-python/pxml-0.2.12 b/metadata/md5-cache/dev-python/pxml-0.2.12
index 46cf57bbe510..b9f15cb60299 100644
--- a/metadata/md5-cache/dev-python/pxml-0.2.12
+++ b/metadata/md5-cache/dev-python/pxml-0.2.12
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/blessings-1.5[python_targets_python2_7(-)?,python_targets_p
 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/pxml/pxml-0.2.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=18f0d32f35a29ea26336483b9f1e4012
diff --git a/metadata/md5-cache/dev-python/py-1.4.30 b/metadata/md5-cache/dev-python/py-1.4.30
index 8e6428d79c09..b1642b21602a 100644
--- a/metadata/md5-cache/dev-python/py-1.4.30
+++ b/metadata/md5-cache/dev-python/py-1.4.30
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/py/py-1.4.30.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6cf544497abbae19a61ddd6b7099f23d
diff --git a/metadata/md5-cache/dev-python/py-1.4.34 b/metadata/md5-cache/dev-python/py-1.4.34
index 36246140810f..a41acb7d7e1a 100644
--- a/metadata/md5-cache/dev-python/py-1.4.34
+++ b/metadata/md5-cache/dev-python/py-1.4.34
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/py/py-1.4.34.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4c2dc458a23e8c6b77c8106f1c9e10a5
diff --git a/metadata/md5-cache/dev-python/py-1.5.2 b/metadata/md5-cache/dev-python/py-1.5.2
index d4ada9cc712b..658fb0a96274 100644
--- a/metadata/md5-cache/dev-python/py-1.5.2
+++ b/metadata/md5-cache/dev-python/py-1.5.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/py/py-1.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=90ece26421f26325d094e6b2defedc22
diff --git a/metadata/md5-cache/dev-python/py-1.5.3 b/metadata/md5-cache/dev-python/py-1.5.3
index d65ae1e027c8..b5539a2dafd2 100644
--- a/metadata/md5-cache/dev-python/py-1.5.3
+++ b/metadata/md5-cache/dev-python/py-1.5.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/py/py-1.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1abf85912dff1b42e89c7450275134e6
diff --git a/metadata/md5-cache/dev-python/py-1.5.4 b/metadata/md5-cache/dev-python/py-1.5.4
index d4ef3158183e..d644c27b001f 100644
--- a/metadata/md5-cache/dev-python/py-1.5.4
+++ b/metadata/md5-cache/dev-python/py-1.5.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/py/py-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d3ccc1f089eb40c79071d535721fcb5b
diff --git a/metadata/md5-cache/dev-python/py-amqp-2.3.2 b/metadata/md5-cache/dev-python/py-amqp-2.3.2
index d7438b31d26e..274eb38adb56 100644
--- a/metadata/md5-cache/dev-python/py-amqp-2.3.2
+++ b/metadata/md5-cache/dev-python/py-amqp-2.3.2
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/a/amqp/amqp-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=56bdd54f896e24e0800f972ff4da95a0
diff --git a/metadata/md5-cache/dev-python/py-cpuinfo-3.2.0 b/metadata/md5-cache/dev-python/py-cpuinfo-3.2.0
index 286e53eba947..58d53f71da49 100644
--- a/metadata/md5-cache/dev-python/py-cpuinfo-3.2.0
+++ b/metadata/md5-cache/dev-python/py-cpuinfo-3.2.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/py-cpuinfo/py-cpuinfo-3.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9fbe21485d230a4043ef3e5d87b9f1dc
diff --git a/metadata/md5-cache/dev-python/py-cpuinfo-3.3.0 b/metadata/md5-cache/dev-python/py-cpuinfo-3.3.0
index 9f3c5af042b5..4db55a211bbc 100644
--- a/metadata/md5-cache/dev-python/py-cpuinfo-3.3.0
+++ b/metadata/md5-cache/dev-python/py-cpuinfo-3.3.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/py-cpuinfo/py-cpuinfo-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9fbe21485d230a4043ef3e5d87b9f1dc
diff --git a/metadata/md5-cache/dev-python/py-gfm-0.1.1 b/metadata/md5-cache/dev-python/py-gfm-0.1.1
index 7543f218a0ec..9165e69e1d13 100644
--- a/metadata/md5-cache/dev-python/py-gfm-0.1.1
+++ b/metadata/md5-cache/dev-python/py-gfm-0.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/markdown[python_targets_python2_7(-)?,python_targets_python3_
 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/google/py-gfm/archive/0.1.1.tar.gz -> py-gfm-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=61d57422c0f611f9cc659a969c80e91b
diff --git a/metadata/md5-cache/dev-python/py-lz4framed-0.9.6 b/metadata/md5-cache/dev-python/py-lz4framed-0.9.6
index b4d1cf134843..5c5df6308b73 100644
--- a/metadata/md5-cache/dev-python/py-lz4framed-0.9.6
+++ b/metadata/md5-cache/dev-python/py-lz4framed-0.9.6
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/py-lz4framed/py-lz4framed-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8d73f3820e1fa8fd3706e16295760544
diff --git a/metadata/md5-cache/dev-python/py-notify-0.3.1-r1 b/metadata/md5-cache/dev-python/py-notify-0.3.1-r1
index 5aa1444b2eaf..ca08ffd99892 100644
--- a/metadata/md5-cache/dev-python/py-notify-0.3.1-r1
+++ b/metadata/md5-cache/dev-python/py-notify-0.3.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=http://download.gna.org/py-notify/py-notify-0.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=5bab706058f94083109fb13db0b5fcd4
diff --git a/metadata/md5-cache/dev-python/py-smbpasswd-1.0.2 b/metadata/md5-cache/dev-python/py-smbpasswd-1.0.2
index 697d18f5ba2f..d9ed90a0c6ef 100644
--- a/metadata/md5-cache/dev-python/py-smbpasswd-1.0.2
+++ b/metadata/md5-cache/dev-python/py-smbpasswd-1.0.2
@@ -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://barryp.org/static/media/software/download/py-smbpasswd/1.0.2/smbpasswd-1.0.2.tgz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d38a595080330ceb1679b5f7fd8fd274
diff --git a/metadata/md5-cache/dev-python/py-ubjson-0.10.0 b/metadata/md5-cache/dev-python/py-ubjson-0.10.0
index f0b498b5f875..cd13868a0e77 100644
--- a/metadata/md5-cache/dev-python/py-ubjson-0.10.0
+++ b/metadata/md5-cache/dev-python/py-ubjson-0.10.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/py-ubjson/py-ubjson-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ee91eb0d6cacb53257c9155ec0af0620
diff --git a/metadata/md5-cache/dev-python/py-ubjson-0.11.0 b/metadata/md5-cache/dev-python/py-ubjson-0.11.0
index bd758c5775b3..269f4824da80 100644
--- a/metadata/md5-cache/dev-python/py-ubjson-0.11.0
+++ b/metadata/md5-cache/dev-python/py-ubjson-0.11.0
@@ -10,5 +10,5 @@ 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
 SRC_URI=mirror://pypi/p/py-ubjson/py-ubjson-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2b4b16ca8888b2f2358f8c4114211ef5
diff --git a/metadata/md5-cache/dev-python/py-ubjson-0.9.0 b/metadata/md5-cache/dev-python/py-ubjson-0.9.0
index 08928356beea..3af9abb16918 100644
--- a/metadata/md5-cache/dev-python/py-ubjson-0.9.0
+++ b/metadata/md5-cache/dev-python/py-ubjson-0.9.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/py-ubjson/py-ubjson-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fb4a102b1ed616dac8c1c80f865e4f19
diff --git a/metadata/md5-cache/dev-python/py-xmlrpc-0.9 b/metadata/md5-cache/dev-python/py-xmlrpc-0.9
index 80eb918d2139..637c4a42ef73 100644
--- a/metadata/md5-cache/dev-python/py-xmlrpc-0.9
+++ b/metadata/md5-cache/dev-python/py-xmlrpc-0.9
@@ -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=mirror://sourceforge/py-xmlrpc/py-xmlrpc-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8b595a83b59f2185c43d95bf9c7b4bd0
diff --git a/metadata/md5-cache/dev-python/py2neo-3.1.2 b/metadata/md5-cache/dev-python/py2neo-3.1.2
index f119fc3f495d..e979e66e8b5c 100644
--- a/metadata/md5-cache/dev-python/py2neo-3.1.2
+++ b/metadata/md5-cache/dev-python/py2neo-3.1.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/py2neo/py2neo-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1a3dfee229b9a50203bd9475fff49176
diff --git a/metadata/md5-cache/dev-python/py2play-0.1.10-r1 b/metadata/md5-cache/dev-python/py2play-0.1.10-r1
index 54d6297c93f3..ee5840cc02c2 100644
--- a/metadata/md5-cache/dev-python/py2play-0.1.10-r1
+++ b/metadata/md5-cache/dev-python/py2play-0.1.10-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=http://download.gna.org/slune/Py2Play-0.1.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fcde34b4b0e05e2ef5a1b2e60c8fbbe7
diff --git a/metadata/md5-cache/dev-python/pyClamd-0.3.17 b/metadata/md5-cache/dev-python/pyClamd-0.3.17
index ec1185520fbb..ebcdd34f0d7f 100644
--- a/metadata/md5-cache/dev-python/pyClamd-0.3.17
+++ b/metadata/md5-cache/dev-python/pyClamd-0.3.17
@@ -10,5 +10,5 @@ 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
 SRC_URI=mirror://pypi/p/pyClamd/pyClamd-0.3.17.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=01fa699fbce29ea4d010177d7d444b64
diff --git a/metadata/md5-cache/dev-python/pyClamd-0.4.0 b/metadata/md5-cache/dev-python/pyClamd-0.4.0
index 0246260c91a2..a2313dd19c77 100644
--- a/metadata/md5-cache/dev-python/pyClamd-0.4.0
+++ b/metadata/md5-cache/dev-python/pyClamd-0.4.0
@@ -10,5 +10,5 @@ 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
 SRC_URI=mirror://pypi/p/pyClamd/pyClamd-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1c0852a01944f4e0dee716fab56d8b24
diff --git a/metadata/md5-cache/dev-python/pyFFTW-0.10.4 b/metadata/md5-cache/dev-python/pyFFTW-0.10.4
index 11a8afb00d0b..68ece600c99a 100644
--- a/metadata/md5-cache/dev-python/pyFFTW-0.10.4
+++ b/metadata/md5-cache/dev-python/pyFFTW-0.10.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/pyFFTW/pyFFTW/archive/v0.10.4.tar.gz -> pyFFTW-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d2fdb26c337be6def3b0226a8ef84b1e
diff --git a/metadata/md5-cache/dev-python/pyFFTW-9999 b/metadata/md5-cache/dev-python/pyFFTW-9999
index 4b7721e0d05f..1b85ce91664e 100644
--- a/metadata/md5-cache/dev-python/pyFFTW-9999
+++ b/metadata/md5-cache/dev-python/pyFFTW-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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(-)] >=sci-libs/fftw-3.3:3.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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=d2fdb26c337be6def3b0226a8ef84b1e
diff --git a/metadata/md5-cache/dev-python/pyGPG-0.1 b/metadata/md5-cache/dev-python/pyGPG-0.1
index bd3cee7c5e9c..ca440caae073 100644
--- a/metadata/md5-cache/dev-python/pyGPG-0.1
+++ b/metadata/md5-cache/dev-python/pyGPG-0.1
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/gnupg python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dolsen/releases/pyGPG/pyGPG-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fcc10202472c4858c0d5bba0846f1c39
diff --git a/metadata/md5-cache/dev-python/pyGPG-0.2 b/metadata/md5-cache/dev-python/pyGPG-0.2
index 430c9f480f76..8791d04e89cf 100644
--- a/metadata/md5-cache/dev-python/pyGPG-0.2
+++ b/metadata/md5-cache/dev-python/pyGPG-0.2
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/gnupg python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dolsen/releases/pyGPG/pyGPG-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f5eb01471d758997e44af18f7f4c4603
diff --git a/metadata/md5-cache/dev-python/pyGPG-9999 b/metadata/md5-cache/dev-python/pyGPG-9999
index 987680a7ac6b..0838921a644d 100644
--- a/metadata/md5-cache/dev-python/pyGPG-9999
+++ b/metadata/md5-cache/dev-python/pyGPG-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=app-crypt/gnupg python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-2	249c1a0962573f4ce2c28f0d5b6b35d4	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-2	249c1a0962573f4ce2c28f0d5b6b35d4	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_=433a89bc29e85023243ec0f4e3783c7c
diff --git a/metadata/md5-cache/dev-python/pyPdf-1.13-r1 b/metadata/md5-cache/dev-python/pyPdf-1.13-r1
index 6d17e19aabc3..582f984f8a7d 100644
--- a/metadata/md5-cache/dev-python/pyPdf-1.13-r1
+++ b/metadata/md5-cache/dev-python/pyPdf-1.13-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=http://pybrary.net/pyPdf/pyPdf-1.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=183dcb4ec61b9a18d81a015d360eefb3
diff --git a/metadata/md5-cache/dev-python/pyacoustid-1.0.0-r1 b/metadata/md5-cache/dev-python/pyacoustid-1.0.0-r1
index d68e5ccad86f..5dd947b33b39 100644
--- a/metadata/md5-cache/dev-python/pyacoustid-1.0.0-r1
+++ b/metadata/md5-cache/dev-python/pyacoustid-1.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=media-libs/chromaprint dev-python/audioread[python_targets_python2_7(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyacoustid/pyacoustid-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c61edf26116c8809d4c2e2004078d04d
diff --git a/metadata/md5-cache/dev-python/pyaes-1.6.0 b/metadata/md5-cache/dev-python/pyaes-1.6.0
index c2f80d2e7ef5..362774c73b47 100644
--- a/metadata/md5-cache/dev-python/pyaes-1.6.0
+++ b/metadata/md5-cache/dev-python/pyaes-1.6.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyaes/pyaes-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0cf3a3c7db96bb43749f8458a14d29a2
diff --git a/metadata/md5-cache/dev-python/pyaes-1.6.1 b/metadata/md5-cache/dev-python/pyaes-1.6.1
index 98edc973bea6..e87ecb379e76 100644
--- a/metadata/md5-cache/dev-python/pyaes-1.6.1
+++ b/metadata/md5-cache/dev-python/pyaes-1.6.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyaes/pyaes-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2d4bf064a54af567814012cac83094d9
diff --git a/metadata/md5-cache/dev-python/pyalsa-1.0.29 b/metadata/md5-cache/dev-python/pyalsa-1.0.29
index 2b9610765485..fc95d18abd16 100644
--- a/metadata/md5-cache/dev-python/pyalsa-1.0.29
+++ b/metadata/md5-cache/dev-python/pyalsa-1.0.29
@@ -10,5 +10,5 @@ RDEPEND=media-libs/alsa-lib python_targets_pypy? ( >=virtual/pypy-5:0= ) python_
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://alsaproject/pyalsa/pyalsa-1.0.29.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0f4c355b62e0d53732fabc1533b43b55
diff --git a/metadata/md5-cache/dev-python/pyalsa-1.1.6 b/metadata/md5-cache/dev-python/pyalsa-1.1.6
index 3119bef419d6..c6ae7ae924c1 100644
--- a/metadata/md5-cache/dev-python/pyalsa-1.1.6
+++ b/metadata/md5-cache/dev-python/pyalsa-1.1.6
@@ -10,5 +10,5 @@ RDEPEND=media-libs/alsa-lib python_targets_pypy? ( >=virtual/pypy-5:0= ) python_
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-python/pyalsaaudio-0.7-r2 b/metadata/md5-cache/dev-python/pyalsaaudio-0.7-r2
index fc27022ee17a..43ad51d77ff4 100644
--- a/metadata/md5-cache/dev-python/pyalsaaudio-0.7-r2
+++ b/metadata/md5-cache/dev-python/pyalsaaudio-0.7-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/pyalsaaudio/pyalsaaudio-0.7.tar.gz mirror://pypi/p/pyalsaaudio/pyalsaaudio-0.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=10a8a65b6810da7114cc964f8517af6b
diff --git a/metadata/md5-cache/dev-python/pyalsaaudio-0.8.2 b/metadata/md5-cache/dev-python/pyalsaaudio-0.8.2
index ca2a433f8ca9..a51f5b1bccf6 100644
--- a/metadata/md5-cache/dev-python/pyalsaaudio-0.8.2
+++ b/metadata/md5-cache/dev-python/pyalsaaudio-0.8.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/pyalsaaudio/pyalsaaudio-0.8.2.tar.gz mirror://pypi/p/pyalsaaudio/pyalsaaudio-0.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4ecd231d535f35a8a6fb0e829079942c
diff --git a/metadata/md5-cache/dev-python/pyamf-0.8.0 b/metadata/md5-cache/dev-python/pyamf-0.8.0
index 061f6d03c4cc..d74f2666e736 100644
--- a/metadata/md5-cache/dev-python/pyamf-0.8.0
+++ b/metadata/md5-cache/dev-python/pyamf-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/defusedxml[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyAMF/PyAMF-0.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5067f37e8ec19cf3cb42761b05222810
diff --git a/metadata/md5-cache/dev-python/pyamg-2.1.0 b/metadata/md5-cache/dev-python/pyamg-2.1.0
index 2714c2d49496..4e0db1651765 100644
--- a/metadata/md5-cache/dev-python/pyamg-2.1.0
+++ b/metadata/md5-cache/dev-python/pyamg-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=sci-libs/scipy[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyamg/pyamg-2.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f983681cef4c071fe2a29eb8c2a62e5c
diff --git a/metadata/md5-cache/dev-python/pyamg-2.2.1 b/metadata/md5-cache/dev-python/pyamg-2.2.1
index f389fa540ae1..a43982fbd7b8 100644
--- a/metadata/md5-cache/dev-python/pyamg-2.2.1
+++ b/metadata/md5-cache/dev-python/pyamg-2.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyamg/pyamg-2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5894a6328d31caebb117b7c651b854b6
diff --git a/metadata/md5-cache/dev-python/pyamg-3.0.2 b/metadata/md5-cache/dev-python/pyamg-3.0.2
index dd72b26ee636..e24a9c94ceee 100644
--- a/metadata/md5-cache/dev-python/pyamg-3.0.2
+++ b/metadata/md5-cache/dev-python/pyamg-3.0.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyamg/pyamg-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=de45aea53ca0bad97dbbab7b2e265c3c
diff --git a/metadata/md5-cache/dev-python/pyamg-3.2.1 b/metadata/md5-cache/dev-python/pyamg-3.2.1
index 574a24a41450..f541ebe18468 100644
--- a/metadata/md5-cache/dev-python/pyamg-3.2.1
+++ b/metadata/md5-cache/dev-python/pyamg-3.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyamg/pyamg-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0f1444c07cdd0086ac4d2c5d6149f33c
diff --git a/metadata/md5-cache/dev-python/pyao-0.82-r3 b/metadata/md5-cache/dev-python/pyao-0.82-r3
index 469fb5d68136..ea8e933a8f8c 100644
--- a/metadata/md5-cache/dev-python/pyao-0.82-r3
+++ b/metadata/md5-cache/dev-python/pyao-0.82-r3
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libao-1.0.0 python_targets_python2_7? ( >=dev-lang/python-2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.andrewchatham.com/pyogg/download/pyao-0.82.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0e111da67e40309c5738ab7a1aa4cc3e
diff --git a/metadata/md5-cache/dev-python/pyasn1-0.2.3 b/metadata/md5-cache/dev-python/pyasn1-0.2.3
index b73c3a604c61..bbe95f981536 100644
--- a/metadata/md5-cache/dev-python/pyasn1-0.2.3
+++ b/metadata/md5-cache/dev-python/pyasn1-0.2.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/etingof/pyasn1/archive/0.2.3.tar.gz -> pyasn1-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8844af607bb440aa2237502ce73a6626
diff --git a/metadata/md5-cache/dev-python/pyasn1-0.3.7 b/metadata/md5-cache/dev-python/pyasn1-0.3.7
index ddd1b863a7bd..75f4d34780bb 100644
--- a/metadata/md5-cache/dev-python/pyasn1-0.3.7
+++ b/metadata/md5-cache/dev-python/pyasn1-0.3.7
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/etingof/pyasn1/archive/v0.3.7.tar.gz -> pyasn1-0.3.7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a65b3e1c01e7f2bcadf19585f0314540
diff --git a/metadata/md5-cache/dev-python/pyasn1-0.4.2 b/metadata/md5-cache/dev-python/pyasn1-0.4.2
index 128a43e73fcb..ec57c0c10679 100644
--- a/metadata/md5-cache/dev-python/pyasn1-0.4.2
+++ b/metadata/md5-cache/dev-python/pyasn1-0.4.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/pyasn1/pyasn1-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3e39d596972f81772a0cdf548bbbad90
diff --git a/metadata/md5-cache/dev-python/pyasn1-modules-0.0.10 b/metadata/md5-cache/dev-python/pyasn1-modules-0.0.10
index 0a1f7411ed2f..95c26ebde57b 100644
--- a/metadata/md5-cache/dev-python/pyasn1-modules-0.0.10
+++ b/metadata/md5-cache/dev-python/pyasn1-modules-0.0.10
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pyasn1-0.1.8[python_targets_pypy(-)?,python_targets_pypy3(-
 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/pyasn1-modules/pyasn1-modules-0.0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8761cd29fe3bc5f5159aa590ff0dbbc1
diff --git a/metadata/md5-cache/dev-python/pyasn1-modules-0.0.5-r1 b/metadata/md5-cache/dev-python/pyasn1-modules-0.0.5-r1
index f59157123d2c..839631a63fbe 100644
--- a/metadata/md5-cache/dev-python/pyasn1-modules-0.0.5-r1
+++ b/metadata/md5-cache/dev-python/pyasn1-modules-0.0.5-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyasn1[python_targets_pypy(-)?,python_targets_pypy3(-)?,pytho
 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/pyasn1-modules/pyasn1-modules-0.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9b5ca1194a362ac77ee492538614dfd9
diff --git a/metadata/md5-cache/dev-python/pyasn1-modules-0.0.8 b/metadata/md5-cache/dev-python/pyasn1-modules-0.0.8
index bcc4286da94c..3fc7138080c4 100644
--- a/metadata/md5-cache/dev-python/pyasn1-modules-0.0.8
+++ b/metadata/md5-cache/dev-python/pyasn1-modules-0.0.8
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pyasn1-0.1.8[python_targets_pypy(-)?,python_targets_pypy3(-
 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/pyasn1-modules/pyasn1-modules-0.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6abb0bfc8533e0435cf6f4bf8de1076d
diff --git a/metadata/md5-cache/dev-python/pyasn1-modules-0.1.4 b/metadata/md5-cache/dev-python/pyasn1-modules-0.1.4
index cb55430fbb26..08327f825880 100644
--- a/metadata/md5-cache/dev-python/pyasn1-modules-0.1.4
+++ b/metadata/md5-cache/dev-python/pyasn1-modules-0.1.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pyasn1-0.1.8[python_targets_pypy(-)?,python_targets_pypy3(-
 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/pyasn1-modules/pyasn1-modules-0.1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8761cd29fe3bc5f5159aa590ff0dbbc1
diff --git a/metadata/md5-cache/dev-python/pyasn1-modules-0.1.5 b/metadata/md5-cache/dev-python/pyasn1-modules-0.1.5
index a0c14e093eb0..ddf718e013e0 100644
--- a/metadata/md5-cache/dev-python/pyasn1-modules-0.1.5
+++ b/metadata/md5-cache/dev-python/pyasn1-modules-0.1.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pyasn1-0.3.4[python_targets_pypy(-)?,python_targets_pypy3(-
 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/pyasn1-modules/pyasn1-modules-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=238a60174ea0324347eb05fbb89fc33f
diff --git a/metadata/md5-cache/dev-python/pyasn1-modules-0.2.1 b/metadata/md5-cache/dev-python/pyasn1-modules-0.2.1
index 4504bb90dbd4..f0e5e376a7a1 100644
--- a/metadata/md5-cache/dev-python/pyasn1-modules-0.2.1
+++ b/metadata/md5-cache/dev-python/pyasn1-modules-0.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pyasn1-0.4.1[python_targets_pypy(-)?,python_targets_pypy3(-
 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/pyasn1-modules/pyasn1-modules-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=131b3f6ffa8d860a6e9e5f941d61a5e3
diff --git a/metadata/md5-cache/dev-python/pyatspi-2.24.0 b/metadata/md5-cache/dev-python/pyatspi-2.24.0
index 74a0538e35b4..304eaa35bb9b 100644
--- a/metadata/md5-cache/dev-python/pyatspi-2.24.0
+++ b/metadata/md5-cache/dev-python/pyatspi-2.24.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/pyatspi/2.24/pyatspi-2.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	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=41164360da2ad8217c4c1631ddbdaced
diff --git a/metadata/md5-cache/dev-python/pyaudio-0.2.11 b/metadata/md5-cache/dev-python/pyaudio-0.2.11
index 17032815369c..3d24f2deb8d7 100644
--- a/metadata/md5-cache/dev-python/pyaudio-0.2.11
+++ b/metadata/md5-cache/dev-python/pyaudio-0.2.11
@@ -10,5 +10,5 @@ RDEPEND=media-libs/portaudio python_targets_python2_7? ( >=dev-lang/python-2.7.5
 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/PyAudio/PyAudio-0.2.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a101a00de3bd49f9d2b8c74f3ae65da7
diff --git a/metadata/md5-cache/dev-python/pyavm-0.9.4 b/metadata/md5-cache/dev-python/pyavm-0.9.4
index 17b9d6202d4b..ef56b4812e3c 100644
--- a/metadata/md5-cache/dev-python/pyavm-0.9.4
+++ b/metadata/md5-cache/dev-python/pyavm-0.9.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyAVM/PyAVM-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a92bb222306bba075cd9a70c2c3df52c
diff --git a/metadata/md5-cache/dev-python/pyblake2-1.1.2 b/metadata/md5-cache/dev-python/pyblake2-1.1.2
index 9a038bf956d8..a36069fe631a 100644
--- a/metadata/md5-cache/dev-python/pyblake2-1.1.2
+++ b/metadata/md5-cache/dev-python/pyblake2-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/pyblake2/pyblake2-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e64e9117d2a0f4b845b896e3d9af442d
diff --git a/metadata/md5-cache/dev-python/pybloomfiltermmap-0.3.11-r1 b/metadata/md5-cache/dev-python/pybloomfiltermmap-0.3.11-r1
index 6e1f127fcfd1..e821739c3b42 100644
--- a/metadata/md5-cache/dev-python/pybloomfiltermmap-0.3.11-r1
+++ b/metadata/md5-cache/dev-python/pybloomfiltermmap-0.3.11-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=mirror://pypi/p/pybloomfiltermmap/pybloomfiltermmap-0.3.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=02a74cc994c7b2a01c7d51934a40910a
diff --git a/metadata/md5-cache/dev-python/pybloomfiltermmap-0.3.14 b/metadata/md5-cache/dev-python/pybloomfiltermmap-0.3.14
index 0abb1a95f399..305883ed2ec9 100644
--- a/metadata/md5-cache/dev-python/pybloomfiltermmap-0.3.14
+++ b/metadata/md5-cache/dev-python/pybloomfiltermmap-0.3.14
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pybloomfiltermmap/pybloomfiltermmap-0.3.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2195976eecc5788a0c9bde43c270e091
diff --git a/metadata/md5-cache/dev-python/pybloomfiltermmap-0.3.15 b/metadata/md5-cache/dev-python/pybloomfiltermmap-0.3.15
index a3cd6aa1a4b2..af0eda6ed508 100644
--- a/metadata/md5-cache/dev-python/pybloomfiltermmap-0.3.15
+++ b/metadata/md5-cache/dev-python/pybloomfiltermmap-0.3.15
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pybloomfiltermmap/pybloomfiltermmap-0.3.15.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1a938bc7aab21e6ce7c489949dda4b62
diff --git a/metadata/md5-cache/dev-python/pybluez-0.18-r1 b/metadata/md5-cache/dev-python/pybluez-0.18-r1
index 48a0cf1c7d8d..3b26819901ce 100644
--- a/metadata/md5-cache/dev-python/pybluez-0.18-r1
+++ b/metadata/md5-cache/dev-python/pybluez-0.18-r1
@@ -10,5 +10,5 @@ RDEPEND=net-wireless/bluez python_targets_pypy? ( >=virtual/pypy-5:0= ) python_t
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gentoo/PyBluez-0.18.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2cd8b6e4d61a3cb758c57c223999b2b1
diff --git a/metadata/md5-cache/dev-python/pybluez-0.22 b/metadata/md5-cache/dev-python/pybluez-0.22
index f9560c8ac47f..efccad552d01 100644
--- a/metadata/md5-cache/dev-python/pybluez-0.22
+++ b/metadata/md5-cache/dev-python/pybluez-0.22
@@ -10,5 +10,5 @@ RDEPEND=net-wireless/bluez python_targets_pypy? ( >=virtual/pypy-5:0= ) python_t
 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/PyBluez/PyBluez-0.22.zip
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=947f3642ad415cc619da223147c8acef
diff --git a/metadata/md5-cache/dev-python/pycadf-2.6.0 b/metadata/md5-cache/dev-python/pycadf-2.6.0
index cfb2b0fd5f06..d4709d8703dc 100644
--- a/metadata/md5-cache/dev-python/pycadf-2.6.0
+++ b/metadata/md5-cache/dev-python/pycadf-2.6.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycadf/pycadf-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6803b3a1d70a5b4d7f842f550f5f1b4b
diff --git a/metadata/md5-cache/dev-python/pycadf-2.7.0 b/metadata/md5-cache/dev-python/pycadf-2.7.0
index 8da2d340b812..3791d4d22589 100644
--- a/metadata/md5-cache/dev-python/pycadf-2.7.0
+++ b/metadata/md5-cache/dev-python/pycadf-2.7.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python2_7(-)?,python_targets_pytho
 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/pycadf/pycadf-2.7.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=674ac80e59b6aeb5266e4611828aaeb5
diff --git a/metadata/md5-cache/dev-python/pycairo-1.16.3-r1 b/metadata/md5-cache/dev-python/pycairo-1.16.3-r1
index f00304f450f7..d73ae4a95cbe 100644
--- a/metadata/md5-cache/dev-python/pycairo-1.16.3-r1
+++ b/metadata/md5-cache/dev-python/pycairo-1.16.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/cairo-1.13.1[svg] python_targets_pypy? ( >=virtual/pypy-5:0=[
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/pygobject/pycairo/releases/download/v1.16.3/pycairo-1.16.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ae4e4c082bd0bce9bbe40051c455d250
diff --git a/metadata/md5-cache/dev-python/pycairo-1.17.0 b/metadata/md5-cache/dev-python/pycairo-1.17.0
index 4e30e0710eba..8aa539b02097 100644
--- a/metadata/md5-cache/dev-python/pycairo-1.17.0
+++ b/metadata/md5-cache/dev-python/pycairo-1.17.0
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/cairo-1.13.1[svg] python_targets_pypy? ( >=virtual/pypy-5:0=[
 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/pygobject/pycairo/releases/download/v1.17.0/pycairo-1.17.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2ea189198941379d270d07bbb506ac55
diff --git a/metadata/md5-cache/dev-python/pycallgraph-1.0.1 b/metadata/md5-cache/dev-python/pycallgraph-1.0.1
index 354c6a8a1466..7d3f93c9fa77 100644
--- a/metadata/md5-cache/dev-python/pycallgraph-1.0.1
+++ b/metadata/md5-cache/dev-python/pycallgraph-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=media-gfx/graphviz python_targets_python2_7? ( >=dev-lang/python-2.7.5-r
 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/gak/pycallgraph/archive/1.0.1.tar.gz -> pycallgraph-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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d7551dea7c86a37f87f3309aa09a9fab
diff --git a/metadata/md5-cache/dev-python/pycapnp-0.6.2 b/metadata/md5-cache/dev-python/pycapnp-0.6.2
index 0d21fe6b4860..6358b423ea86 100644
--- a/metadata/md5-cache/dev-python/pycapnp-0.6.2
+++ b/metadata/md5-cache/dev-python/pycapnp-0.6.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/capnproto-0.6:= python_targets_python2_7? ( >=dev-lang/python
 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/pycapnp/pycapnp-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b12fe7b1a108b898b584756fb43aa4fc
diff --git a/metadata/md5-cache/dev-python/pycapnp-0.6.3 b/metadata/md5-cache/dev-python/pycapnp-0.6.3
index 0c1717c93f66..bfead7965bc4 100644
--- a/metadata/md5-cache/dev-python/pycapnp-0.6.3
+++ b/metadata/md5-cache/dev-python/pycapnp-0.6.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/capnproto-0.6:= python_targets_python2_7? ( >=dev-lang/python
 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/pycapnp/pycapnp-0.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=090a58447dd3c4a6319a3f69150f9701
diff --git a/metadata/md5-cache/dev-python/pycares-2.1.1 b/metadata/md5-cache/dev-python/pycares-2.1.1
index 72e2f3bf742f..d042e3ede1bf 100644
--- a/metadata/md5-cache/dev-python/pycares-2.1.1
+++ b/metadata/md5-cache/dev-python/pycares-2.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pycares/pycares-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=88eed9c8b418bc14f0049dc74beee2c9
diff --git a/metadata/md5-cache/dev-python/pycares-2.3.0 b/metadata/md5-cache/dev-python/pycares-2.3.0
index 79246fa4fd69..f742af385c57 100644
--- a/metadata/md5-cache/dev-python/pycares-2.3.0
+++ b/metadata/md5-cache/dev-python/pycares-2.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pycares/pycares-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=614c9bcc7efb8f5550e349c4ac8a5e35
diff --git a/metadata/md5-cache/dev-python/pycdf-0.6.3-r1 b/metadata/md5-cache/dev-python/pycdf-0.6.3-r1
index 0483ce9301f5..d614eaf78350 100644
--- a/metadata/md5-cache/dev-python/pycdf-0.6.3-r1
+++ b/metadata/md5-cache/dev-python/pycdf-0.6.3-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pysclint/pycdf-0.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=e91343623f57c23d7f1c1817927ffa7c
diff --git a/metadata/md5-cache/dev-python/pycdio-0.20-r1 b/metadata/md5-cache/dev-python/pycdio-0.20-r1
index 05e57215b0d5..777da1884166 100644
--- a/metadata/md5-cache/dev-python/pycdio-0.20-r1
+++ b/metadata/md5-cache/dev-python/pycdio-0.20-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pycdio/pycdio-0.20.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e73a47e0f3543e0ad0c20e837229543b
diff --git a/metadata/md5-cache/dev-python/pycdio-2.0.0 b/metadata/md5-cache/dev-python/pycdio-2.0.0
index 73d8d646d73a..829e4eaa7ef5 100644
--- a/metadata/md5-cache/dev-python/pycdio-2.0.0
+++ b/metadata/md5-cache/dev-python/pycdio-2.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pycdio/pycdio-2.0.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9cb8f8410d74feaa04b35106e3865e0a
diff --git a/metadata/md5-cache/dev-python/pychart-1.39-r1 b/metadata/md5-cache/dev-python/pychart-1.39-r1
index 94d5deb5ac46..23fc128ecc29 100644
--- a/metadata/md5-cache/dev-python/pychart-1.39-r1
+++ b/metadata/md5-cache/dev-python/pychart-1.39-r1
@@ -10,5 +10,5 @@ RDEPEND=app-text/ghostscript-gpl python_targets_pypy? ( >=virtual/pypy-5:0= ) py
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://download.gna.org/pychart/PyChart-1.39.tar.gz doc? ( http://download.gna.org/pychart/pychart-doc.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=30f467337614d650884a50d3d8a9d453
diff --git a/metadata/md5-cache/dev-python/pychecker-0.8.19-r1 b/metadata/md5-cache/dev-python/pychecker-0.8.19-r1
index c577f2375ae7..adfbbd748425 100644
--- a/metadata/md5-cache/dev-python/pychecker-0.8.19-r1
+++ b/metadata/md5-cache/dev-python/pychecker-0.8.19-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=mirror://sourceforge/pychecker/pychecker-0.8.19.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fda24a7babb3d8468177fec57323c2b1
diff --git a/metadata/md5-cache/dev-python/pychef-0.2.3 b/metadata/md5-cache/dev-python/pychef-0.2.3
index 0024e10dfd03..a912640c5b77 100644
--- a/metadata/md5-cache/dev-python/pychef-0.2.3
+++ b/metadata/md5-cache/dev-python/pychef-0.2.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=0
 SRC_URI=mirror://pypi/P/PyChef/PyChef-0.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=741cc4f4f09f6b0a9f2f9bfdd98a8331
diff --git a/metadata/md5-cache/dev-python/pychm-0.8.4-r1 b/metadata/md5-cache/dev-python/pychm-0.8.4-r1
index a6388df075d3..03f4e3efe9f2 100644
--- a/metadata/md5-cache/dev-python/pychm-0.8.4-r1
+++ b/metadata/md5-cache/dev-python/pychm-0.8.4-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/chmlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/gnochm/pychm-0.8.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9c5492387e63058841fece7270b9d02e
diff --git a/metadata/md5-cache/dev-python/pychroot-0.9.18 b/metadata/md5-cache/dev-python/pychroot-0.9.18
index d1675148a714..41a29bc28115 100644
--- a/metadata/md5-cache/dev-python/pychroot-0.9.18
+++ b/metadata/md5-cache/dev-python/pychroot-0.9.18
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/snakeoil-0.7.4[python_targets_python2_7(-)?,python_targets_
 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/pychroot/pychroot-0.9.18.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6ddcb4abee0ecac4d31005dd874fa989
diff --git a/metadata/md5-cache/dev-python/pychroot-9999 b/metadata/md5-cache/dev-python/pychroot-9999
index 0717504f21ed..3d0b8804ba3a 100644
--- a/metadata/md5-cache/dev-python/pychroot-9999
+++ b/metadata/md5-cache/dev-python/pychroot-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND==dev-python/snakeoil-9999[python_targets_python3_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_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=0efc4c6f6180a2509a2743ee65f9671a
diff --git a/metadata/md5-cache/dev-python/pyclamav-0.4.1-r2 b/metadata/md5-cache/dev-python/pyclamav-0.4.1-r2
index e44c8cde5f72..cfbe66e88cdd 100644
--- a/metadata/md5-cache/dev-python/pyclamav-0.4.1-r2
+++ b/metadata/md5-cache/dev-python/pyclamav-0.4.1-r2
@@ -10,5 +10,5 @@ RDEPEND=>=app-antivirus/clamav-0.90 python_targets_python2_7? ( >=dev-lang/pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://xael.org/norman/python/pyclamav/pyclamav-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=dd5154c6ea56ac1ca860fb4c7f8b3e09
diff --git a/metadata/md5-cache/dev-python/pyclimate-1.2.2-r2 b/metadata/md5-cache/dev-python/pyclimate-1.2.2-r2
index 02996778d53a..d59546a47004 100644
--- a/metadata/md5-cache/dev-python/pyclimate-1.2.2-r2
+++ b/metadata/md5-cache/dev-python/pyclimate-1.2.2-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jyth
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://fisica.ehu.es/jsaenz/pyclimate_files/PyClimate-1.2.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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0d13d9f89cffdec12462c7c8480d04a4
diff --git a/metadata/md5-cache/dev-python/pycmd-1.2 b/metadata/md5-cache/dev-python/pycmd-1.2
index 939fca6db50d..2e2e460c02de 100644
--- a/metadata/md5-cache/dev-python/pycmd-1.2
+++ b/metadata/md5-cache/dev-python/pycmd-1.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/py-1.4.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,p
 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/pycmd/pycmd-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1db01e37c4aa079ec9c7fef5c4189cd7
diff --git a/metadata/md5-cache/dev-python/pycobertura-0.10.0 b/metadata/md5-cache/dev-python/pycobertura-0.10.0
index 90a78e5db006..a1c0d732888b 100644
--- a/metadata/md5-cache/dev-python/pycobertura-0.10.0
+++ b/metadata/md5-cache/dev-python/pycobertura-0.10.0
@@ -10,5 +10,5 @@ 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
 SRC_URI=mirror://pypi/p/pycobertura/pycobertura-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4a8d3043e31f29c11814af6949f6714f
diff --git a/metadata/md5-cache/dev-python/pycodestyle-2.3.1 b/metadata/md5-cache/dev-python/pycodestyle-2.3.1
index 9016ed562111..9c9758a5d877 100644
--- a/metadata/md5-cache/dev-python/pycodestyle-2.3.1
+++ b/metadata/md5-cache/dev-python/pycodestyle-2.3.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,p
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-python/pycodestyle-2.4.0 b/metadata/md5-cache/dev-python/pycodestyle-2.4.0
index ba773cb519bc..f4203eaef4b1 100644
--- a/metadata/md5-cache/dev-python/pycodestyle-2.4.0
+++ b/metadata/md5-cache/dev-python/pycodestyle-2.4.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,p
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-python/pycollada-0.4 b/metadata/md5-cache/dev-python/pycollada-0.4
index c5b3b5e356e9..c5bf662f941a 100644
--- a/metadata/md5-cache/dev-python/pycollada-0.4
+++ b/metadata/md5-cache/dev-python/pycollada-0.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy dev-python/lxml >=dev-python/python-dateutil-2.0 python
 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/pycollada/pycollada/archive/v0.4.tar.gz -> pycollada-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ee637228b2b570ab928447d1bb0ca10b
diff --git a/metadata/md5-cache/dev-python/pycountry-16.11.8 b/metadata/md5-cache/dev-python/pycountry-16.11.8
index b642ff624934..5edb31ce0e4d 100644
--- a/metadata/md5-cache/dev-python/pycountry-16.11.8
+++ b/metadata/md5-cache/dev-python/pycountry-16.11.8
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/pycountry/pycountry-16.11.8.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=daa2bfe56a30a2e84432fedfb049ef5d
diff --git a/metadata/md5-cache/dev-python/pycountry-17.9.23 b/metadata/md5-cache/dev-python/pycountry-17.9.23
index 1235ad3147d3..adfb4986bb9f 100644
--- a/metadata/md5-cache/dev-python/pycountry-17.9.23
+++ b/metadata/md5-cache/dev-python/pycountry-17.9.23
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/pycountry/pycountry-17.9.23.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a8fbe486911b4101ace7fbafa77f9969
diff --git a/metadata/md5-cache/dev-python/pycountry-18.5.26 b/metadata/md5-cache/dev-python/pycountry-18.5.26
index 37742f4f648e..8d102baa1a35 100644
--- a/metadata/md5-cache/dev-python/pycountry-18.5.26
+++ b/metadata/md5-cache/dev-python/pycountry-18.5.26
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycountry/pycountry-18.5.26.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cb6ef94c61d19cd9e084249ed1b41a5b
diff --git a/metadata/md5-cache/dev-python/pycparser-2.14 b/metadata/md5-cache/dev-python/pycparser-2.14
index 8f1ae3742e14..e5fd660ee71f 100644
--- a/metadata/md5-cache/dev-python/pycparser-2.14
+++ b/metadata/md5-cache/dev-python/pycparser-2.14
@@ -10,5 +10,5 @@ RDEPEND=dev-python/ply[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_t
 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/pycparser/pycparser-2.14.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=27d8978306bc376ddd8c2af032e620a5
diff --git a/metadata/md5-cache/dev-python/pycparser-2.17 b/metadata/md5-cache/dev-python/pycparser-2.17
index 618a1e50317a..d88b2709642e 100644
--- a/metadata/md5-cache/dev-python/pycparser-2.17
+++ b/metadata/md5-cache/dev-python/pycparser-2.17
@@ -10,5 +10,5 @@ RDEPEND=dev-python/ply[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_t
 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/pycparser/pycparser-2.17.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2ce4e7a5861b48dc02185d12b31dd88b
diff --git a/metadata/md5-cache/dev-python/pycparser-2.18-r1 b/metadata/md5-cache/dev-python/pycparser-2.18-r1
index a00c1a13179b..db1d34c1b45e 100644
--- a/metadata/md5-cache/dev-python/pycparser-2.18-r1
+++ b/metadata/md5-cache/dev-python/pycparser-2.18-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/ply:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python
 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/pycparser/pycparser-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8267db999f808613ac806779d57d7912
diff --git a/metadata/md5-cache/dev-python/pycrypto-2.6.1-r2 b/metadata/md5-cache/dev-python/pycrypto-2.6.1-r2
index fa0a563c8d8b..2cba3897eadb 100644
--- a/metadata/md5-cache/dev-python/pycrypto-2.6.1-r2
+++ b/metadata/md5-cache/dev-python/pycrypto-2.6.1-r2
@@ -10,5 +10,5 @@ RDEPEND=gmp? ( dev-libs/gmp:0= ) python_targets_python2_7? ( >=dev-lang/python-2
 REQUIRED_USE=test? ( gmp ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/pycrypto-2.6.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3cb4b34101e2d9bf77b2e5d0536f1d81
diff --git a/metadata/md5-cache/dev-python/pycryptodome-3.4.6 b/metadata/md5-cache/dev-python/pycryptodome-3.4.6
index 31c2805ef51c..a199f9850cd8 100644
--- a/metadata/md5-cache/dev-python/pycryptodome-3.4.6
+++ b/metadata/md5-cache/dev-python/pycryptodome-3.4.6
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/gmp:0 virtual/python-cffi[python_targets_pypy(-)?,python_target
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/Legrandin/pycryptodome/archive/v3.4.6.tar.gz -> pycryptodome-3.4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e0232d3e6b1748ae4c78fff7372f1901
diff --git a/metadata/md5-cache/dev-python/pycryptodome-3.4.7 b/metadata/md5-cache/dev-python/pycryptodome-3.4.7
index 7a1f16a650be..f0cae6f82432 100644
--- a/metadata/md5-cache/dev-python/pycryptodome-3.4.7
+++ b/metadata/md5-cache/dev-python/pycryptodome-3.4.7
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/gmp:0 virtual/python-cffi[python_targets_pypy(-)?,python_target
 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/pycryptodome/pycryptodome-3.4.7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=75b6f9b5421b70d1b59fd74aed3022d3
diff --git a/metadata/md5-cache/dev-python/pycryptodome-3.6.6 b/metadata/md5-cache/dev-python/pycryptodome-3.6.6
index 3e954ff268b8..0a1145134176 100644
--- a/metadata/md5-cache/dev-python/pycryptodome-3.6.6
+++ b/metadata/md5-cache/dev-python/pycryptodome-3.6.6
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/gmp:0 virtual/python-cffi[python_targets_pypy(-)?,python_target
 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/pycryptodome/pycryptodome-3.6.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=342b9c8c9f4833339e5474d2c6e33d0b
diff --git a/metadata/md5-cache/dev-python/pycryptopp-0.6.0 b/metadata/md5-cache/dev-python/pycryptopp-0.6.0
index 7e1dad8a90e3..e7692ed9893e 100644
--- a/metadata/md5-cache/dev-python/pycryptopp-0.6.0
+++ b/metadata/md5-cache/dev-python/pycryptopp-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/crypto++ python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycryptopp/pycryptopp-0.6.0.1206569328141510525648634803928199668821045408958.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1a80c5c375308223f3b02cd6046693a4
diff --git a/metadata/md5-cache/dev-python/pycryptopp-0.7.1 b/metadata/md5-cache/dev-python/pycryptopp-0.7.1
deleted file mode 100644
index 21aa904157e0..000000000000
--- a/metadata/md5-cache/dev-python/pycryptopp-0.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/crypto++ 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=Python wrappers for a few algorithms from the Crypto++ library
-EAPI=5
-HOMEPAGE=https://tahoe-lafs.org/trac/pycryptopp https://pypi.org/project/pycryptopp/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/crypto++ python_targets_python2_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/pycryptopp/pycryptopp-0.7.1.869544967005693312591928092448767568728501330214.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=9a3fe381b9fecf1eef091f5763aca333
diff --git a/metadata/md5-cache/dev-python/pycryptopp-0.7.1-r1 b/metadata/md5-cache/dev-python/pycryptopp-0.7.1-r1
new file mode 100644
index 000000000000..a24ca0e64491
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pycryptopp-0.7.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-libs/crypto++ 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=Python wrappers for a few algorithms from the Crypto++ library
+EAPI=6
+HOMEPAGE=https://tahoe-lafs.org/trac/pycryptopp https://pypi.org/project/pycryptopp/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/crypto++ python_targets_python2_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/pycryptopp/pycryptopp-0.7.1.869544967005693312591928092448767568728501330214.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_=32fc1fc1d5d5cd9532e95ee0ea4d8d98
diff --git a/metadata/md5-cache/dev-python/pycuda-2012.1 b/metadata/md5-cache/dev-python/pycuda-2012.1
index 04db5f0ae474..603077bd5bed 100644
--- a/metadata/md5-cache/dev-python/pycuda-2012.1
+++ b/metadata/md5-cache/dev-python/pycuda-2012.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=userpriv
 SLOT=0
 SRC_URI=mirror://pypi/p/pycuda/pycuda-2012.1.tar.gz
-_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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_=8824509df2a44981822220a20774a35e
diff --git a/metadata/md5-cache/dev-python/pycuda-2013.1.1 b/metadata/md5-cache/dev-python/pycuda-2013.1.1
index 022fb37b7869..3960a82a3b56 100644
--- a/metadata/md5-cache/dev-python/pycuda-2013.1.1
+++ b/metadata/md5-cache/dev-python/pycuda-2013.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=userpriv
 SLOT=0
 SRC_URI=mirror://pypi/p/pycuda/pycuda-2013.1.1.tar.gz
-_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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_=1b2d50d3c8256d29ac42236b0ef516bb
diff --git a/metadata/md5-cache/dev-python/pycuda-2014.1 b/metadata/md5-cache/dev-python/pycuda-2014.1
index e9826a25685c..3946a3ce04b1 100644
--- a/metadata/md5-cache/dev-python/pycuda-2014.1
+++ b/metadata/md5-cache/dev-python/pycuda-2014.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 RESTRICT=userpriv
 SLOT=0
 SRC_URI=mirror://pypi/p/pycuda/pycuda-2014.1.tar.gz
-_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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_=e4a69f09ee6d9269342da6612ec0b6b6
diff --git a/metadata/md5-cache/dev-python/pycuda-2016.1.2 b/metadata/md5-cache/dev-python/pycuda-2016.1.2
index fdf996f77b79..300cac972f3e 100644
--- a/metadata/md5-cache/dev-python/pycuda-2016.1.2
+++ b/metadata/md5-cache/dev-python/pycuda-2016.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=userpriv
 SLOT=0
 SRC_URI=mirror://pypi/p/pycuda/pycuda-2016.1.2.tar.gz
-_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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_=0ae7e7a230644757812d0f05f178435b
diff --git a/metadata/md5-cache/dev-python/pycuda-2017.1 b/metadata/md5-cache/dev-python/pycuda-2017.1
index 9e2f5d2e4525..81411975cfc4 100644
--- a/metadata/md5-cache/dev-python/pycuda-2017.1
+++ b/metadata/md5-cache/dev-python/pycuda-2017.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=userpriv
 SLOT=0
 SRC_URI=mirror://pypi/p/pycuda/pycuda-2017.1.tar.gz
-_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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_=ef00fcd090b99e3058701384eb225d7c
diff --git a/metadata/md5-cache/dev-python/pycuda-9999 b/metadata/md5-cache/dev-python/pycuda-9999
index d67b9d349dad..4ab4870d3cbe 100644
--- a/metadata/md5-cache/dev-python/pycuda-9999
+++ b/metadata/md5-cache/dev-python/pycuda-9999
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/boost[python,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 )
 RESTRICT=userpriv
 SLOT=0
-_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	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	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	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	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d848ea7a5a6434daceffd68b3061e772
diff --git a/metadata/md5-cache/dev-python/pycups-1.9.72 b/metadata/md5-cache/dev-python/pycups-1.9.72
index 1162559e20a6..d4d369458994 100644
--- a/metadata/md5-cache/dev-python/pycups-1.9.72
+++ b/metadata/md5-cache/dev-python/pycups-1.9.72
@@ -10,5 +10,5 @@ RDEPEND=net-print/cups python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targe
 REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycups/pycups-1.9.72.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7a495ddf5bbe389d1881d124407cdf92
diff --git a/metadata/md5-cache/dev-python/pycups-1.9.73 b/metadata/md5-cache/dev-python/pycups-1.9.73
index 8d522fba0053..161a94eea6d4 100644
--- a/metadata/md5-cache/dev-python/pycups-1.9.73
+++ b/metadata/md5-cache/dev-python/pycups-1.9.73
@@ -10,5 +10,5 @@ RDEPEND=net-print/cups python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targe
 REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycups/pycups-1.9.73.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a70db8d9bf0dd8311010186695955f1b
diff --git a/metadata/md5-cache/dev-python/pycups-1.9.73-r1 b/metadata/md5-cache/dev-python/pycups-1.9.73-r1
index 33ea4ed536a6..132b1e1320a6 100644
--- a/metadata/md5-cache/dev-python/pycups-1.9.73-r1
+++ b/metadata/md5-cache/dev-python/pycups-1.9.73-r1
@@ -10,5 +10,5 @@ RDEPEND=net-print/cups python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targe
 REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( 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/pycups/pycups-1.9.73.tar.bz2
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a3d74125bae9366ae5e1030db333d3d2
diff --git a/metadata/md5-cache/dev-python/pycurl-7.43.0 b/metadata/md5-cache/dev-python/pycurl-7.43.0
index 21c869ca6b33..7fa2077c5d41 100644
--- a/metadata/md5-cache/dev-python/pycurl-7.43.0
+++ b/metadata/md5-cache/dev-python/pycurl-7.43.0
@@ -10,5 +10,5 @@ RDEPEND=>=net-misc/curl-7.25.0-r1[ssl=] ssl? ( net-misc/curl[curl_ssl_gnutls(-)=
 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/pycurl/pycurl-7.43.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a1ec1f9828252c63930de8fc9270a6f0
diff --git a/metadata/md5-cache/dev-python/pycxx-6.2.6 b/metadata/md5-cache/dev-python/pycxx-6.2.6
index 4a7ba3828d0d..c145da864b0c 100644
--- a/metadata/md5-cache/dev-python/pycxx-6.2.6
+++ b/metadata/md5-cache/dev-python/pycxx-6.2.6
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/cxx/pycxx-6.2.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=78fa977cc19f8ead4bac1ba9579812d4
diff --git a/metadata/md5-cache/dev-python/pydecomp-0.2 b/metadata/md5-cache/dev-python/pydecomp-0.2
index b1fbae3f94fa..3ff6b8189dfd 100644
--- a/metadata/md5-cache/dev-python/pydecomp-0.2
+++ b/metadata/md5-cache/dev-python/pydecomp-0.2
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dolsen/releases/pydecomp/pyDeComp-0.2.tar.gz -> pydecomp-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1af13e7a9d444fff75b1e2c4a5446083
diff --git a/metadata/md5-cache/dev-python/pydecomp-0.3 b/metadata/md5-cache/dev-python/pydecomp-0.3
index 29fcc0e611fa..3fb82c468122 100644
--- a/metadata/md5-cache/dev-python/pydecomp-0.3
+++ b/metadata/md5-cache/dev-python/pydecomp-0.3
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dolsen/releases/pydecomp/pyDeComp-0.3.tar.gz -> pydecomp-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=825badc8fa7b1f84193b27126feb3e7c
diff --git a/metadata/md5-cache/dev-python/pydecomp-9999 b/metadata/md5-cache/dev-python/pydecomp-9999
index 333a64b20832..b69b42577855 100644
--- a/metadata/md5-cache/dev-python/pydecomp-9999
+++ b/metadata/md5-cache/dev-python/pydecomp-9999
@@ -8,5 +8,5 @@ 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
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d8d7d37a024ace7ab83517ee45a7e600
diff --git a/metadata/md5-cache/dev-python/pydiff-0.2 b/metadata/md5-cache/dev-python/pydiff-0.2
index 50d05216f23a..1ab4b21564ea 100644
--- a/metadata/md5-cache/dev-python/pydiff-0.2
+++ b/metadata/md5-cache/dev-python/pydiff-0.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/pydiff/pydiff-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5fdbb632a38600bacee83798afc130d3
diff --git a/metadata/md5-cache/dev-python/pydispatcher-2.0.5 b/metadata/md5-cache/dev-python/pydispatcher-2.0.5
index c7d638f68d54..6bb841b92380 100644
--- a/metadata/md5-cache/dev-python/pydispatcher-2.0.5
+++ b/metadata/md5-cache/dev-python/pydispatcher-2.0.5
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyDispatcher/PyDispatcher-2.0.5.tar.gz -> pydispatcher-2.0.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e0592e343d7f2b42ee5f1d58c7cf9c79
diff --git a/metadata/md5-cache/dev-python/pydispatcher-2.1.2 b/metadata/md5-cache/dev-python/pydispatcher-2.1.2
index a61d1ceba56f..31cdba2ce2e1 100644
--- a/metadata/md5-cache/dev-python/pydispatcher-2.1.2
+++ b/metadata/md5-cache/dev-python/pydispatcher-2.1.2
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyPyDispatcher/PyPyDispatcher-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b25397be9e05924f4adf3417d31f95c1
diff --git a/metadata/md5-cache/dev-python/pydl-0.5.3 b/metadata/md5-cache/dev-python/pydl-0.5.3
index 32f0370949d8..86dfae77f9f1 100644
--- a/metadata/md5-cache/dev-python/pydl-0.5.3
+++ b/metadata/md5-cache/dev-python/pydl-0.5.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pydl/pydl-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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=6c898f4ae0b5c9b78b0fc3b1a5f834e1
diff --git a/metadata/md5-cache/dev-python/pydl-0.5.4 b/metadata/md5-cache/dev-python/pydl-0.5.4
index 06ee86699abb..457728e84191 100644
--- a/metadata/md5-cache/dev-python/pydl-0.5.4
+++ b/metadata/md5-cache/dev-python/pydl-0.5.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pydl/pydl-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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=1e495b893550c31d7ffdd24df0b69f05
diff --git a/metadata/md5-cache/dev-python/pydns-2.3.6-r1 b/metadata/md5-cache/dev-python/pydns-2.3.6-r1
index f42dbe781f47..abed0a7c1370 100644
--- a/metadata/md5-cache/dev-python/pydns-2.3.6-r1
+++ b/metadata/md5-cache/dev-python/pydns-2.3.6-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 RESTRICT=test
 SLOT=2
 SRC_URI=http://downloads.sourceforge.net/project/pydns/pydns/pydns-2.3.6/pydns-2.3.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e4439f1751eb294c77bf24673a9158a2
diff --git a/metadata/md5-cache/dev-python/pydns-3.1.1 b/metadata/md5-cache/dev-python/pydns-3.1.1
index 13c0031f0cc1..e001e68af6b6 100644
--- a/metadata/md5-cache/dev-python/pydns-3.1.1
+++ b/metadata/md5-cache/dev-python/pydns-3.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_4 python_targets_p
 RESTRICT=test
 SLOT=3
 SRC_URI=https://launchpad.net/py3dns/trunk/3.1.1/+download/py3dns-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=701a5121569b5bb4617cf9d91751671b
diff --git a/metadata/md5-cache/dev-python/pydot-1.0.28-r2 b/metadata/md5-cache/dev-python/pydot-1.0.28-r2
index 078a4d55e063..2f66734823c1 100644
--- a/metadata/md5-cache/dev-python/pydot-1.0.28-r2
+++ b/metadata/md5-cache/dev-python/pydot-1.0.28-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyparsing[python_targets_python2_7(-)?,-python_single_target_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pydot/pydot-1.0.28.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8d20f0606804aba74301ac6c83a15787
diff --git a/metadata/md5-cache/dev-python/pydot-1.2.3 b/metadata/md5-cache/dev-python/pydot-1.2.3
index 85e052fbff4a..7bdf13a88730 100644
--- a/metadata/md5-cache/dev-python/pydot-1.2.3
+++ b/metadata/md5-cache/dev-python/pydot-1.2.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3
 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/erocarrera/pydot/archive/v1.2.3.tar.gz -> pydot-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e6114f7242fb3837a9052b2ef058075b
diff --git a/metadata/md5-cache/dev-python/pydot-ng-1.0.0 b/metadata/md5-cache/dev-python/pydot-ng-1.0.0
index 6f7d7909f959..91619bcd0e00 100644
--- a/metadata/md5-cache/dev-python/pydot-ng-1.0.0
+++ b/metadata/md5-cache/dev-python/pydot-ng-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3
 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/pydot/pydot-ng/archive/1.0.0.tar.gz -> pydot-ng-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=47f1b537a7a9d46ea0358e8e0ec40175
diff --git a/metadata/md5-cache/dev-python/pydotplus-2.0.2 b/metadata/md5-cache/dev-python/pydotplus-2.0.2
index f328812f9b76..fdf8ed574776 100644
--- a/metadata/md5-cache/dev-python/pydotplus-2.0.2
+++ b/metadata/md5-cache/dev-python/pydotplus-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3
 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/pydotplus/pydotplus-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d529a7c59259e376e64216f0166cce98
diff --git a/metadata/md5-cache/dev-python/pyds-0.7.3-r1 b/metadata/md5-cache/dev-python/pyds-0.7.3-r1
index 3906b1362e40..9e0d3ae1e1b6 100644
--- a/metadata/md5-cache/dev-python/pyds-0.7.3-r1
+++ b/metadata/md5-cache/dev-python/pyds-0.7.3-r1
@@ -10,5 +10,5 @@ RDEPEND=app-text/silvercity >=dev-db/metakit-2.4.9.2[python,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gentoo/PyDS-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=560eac9daf58191f906bc0081c238d1e
diff --git a/metadata/md5-cache/dev-python/pyds9-1.8.1 b/metadata/md5-cache/dev-python/pyds9-1.8.1
index a194763236a8..fb70ece59bce 100644
--- a/metadata/md5-cache/dev-python/pyds9-1.8.1
+++ b/metadata/md5-cache/dev-python/pyds9-1.8.1
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/xpa:0 dev-python/six[python_targets_python2_7(-)?,python_target
 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/ericmandel/pyds9/archive/v1.8.1.tar.gz -> pyds9-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=468604b189fd119787fda909047fd0e5
diff --git a/metadata/md5-cache/dev-python/pydvdread-1.0-r1 b/metadata/md5-cache/dev-python/pydvdread-1.0-r1
index b1356e9e3980..ca82ea833229 100644
--- a/metadata/md5-cache/dev-python/pydvdread-1.0-r1
+++ b/metadata/md5-cache/dev-python/pydvdread-1.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/pydvdread/1.0/pydvdread-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2ffe1b8340cd9c0d54f77d1e2a1d0b92
diff --git a/metadata/md5-cache/dev-python/pyee-1.0.2 b/metadata/md5-cache/dev-python/pyee-1.0.2
index a3ef91a4902c..00ad9f2fbfe5 100644
--- a/metadata/md5-cache/dev-python/pyee-1.0.2
+++ b/metadata/md5-cache/dev-python/pyee-1.0.2
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyee/pyee-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=30e11b1fae8f53011a8725863aacb5a8
diff --git a/metadata/md5-cache/dev-python/pyelemental-1.2.0-r1 b/metadata/md5-cache/dev-python/pyelemental-1.2.0-r1
index fe5fe909ae12..55fc3f58a367 100644
--- a/metadata/md5-cache/dev-python/pyelemental-1.2.0-r1
+++ b/metadata/md5-cache/dev-python/pyelemental-1.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=sci-chemistry/gelemental-1.2.0 python_targets_python2_7? ( >=dev-lang/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.kdau.com/files/pyelemental-1.2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=232b8399c9adcd9b67673240218e0a22
diff --git a/metadata/md5-cache/dev-python/pyelftools-0.24 b/metadata/md5-cache/dev-python/pyelftools-0.24
index 50b070669aad..58ace796c8bd 100644
--- a/metadata/md5-cache/dev-python/pyelftools-0.24
+++ b/metadata/md5-cache/dev-python/pyelftools-0.24
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyelftools/pyelftools-0.24.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e7b6307df87a32043ad4c829a73aa038
diff --git a/metadata/md5-cache/dev-python/pyemf-2.0.0 b/metadata/md5-cache/dev-python/pyemf-2.0.0
index faa75e432385..79d1011d0da5 100644
--- a/metadata/md5-cache/dev-python/pyemf-2.0.0
+++ b/metadata/md5-cache/dev-python/pyemf-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pyemf/pyemf-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3cdad0868c756396ebe313727cc5c085
diff --git a/metadata/md5-cache/dev-python/pyenchant-1.6.6 b/metadata/md5-cache/dev-python/pyenchant-1.6.6
index fffa223a95e8..913279dfd5d5 100644
--- a/metadata/md5-cache/dev-python/pyenchant-1.6.6
+++ b/metadata/md5-cache/dev-python/pyenchant-1.6.6
@@ -10,5 +10,5 @@ RDEPEND=>=app-text/enchant-1.6 python_targets_pypy? ( >=virtual/pypy-5:0= ) pyth
 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/pyenchant/pyenchant-1.6.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8538ab193e57954db270249de0a6fb58
diff --git a/metadata/md5-cache/dev-python/pyenchant-1.6.8 b/metadata/md5-cache/dev-python/pyenchant-1.6.8
index 2faafb4a6af4..c0562567f84c 100644
--- a/metadata/md5-cache/dev-python/pyenchant-1.6.8
+++ b/metadata/md5-cache/dev-python/pyenchant-1.6.8
@@ -10,5 +10,5 @@ RDEPEND=>=app-text/enchant-1.6 python_targets_pypy? ( >=virtual/pypy-5:0= ) pyth
 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/pyenchant/pyenchant-1.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=eed2b943d66385fe3b162769558601d6
diff --git a/metadata/md5-cache/dev-python/pyev-0.9.0 b/metadata/md5-cache/dev-python/pyev-0.9.0
index a6dd11921327..16d3f266664c 100644
--- a/metadata/md5-cache/dev-python/pyev-0.9.0
+++ b/metadata/md5-cache/dev-python/pyev-0.9.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libev python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.
 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/pyev/pyev-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cf40a14836efc0f8d51f7e8068b9c9c4
diff --git a/metadata/md5-cache/dev-python/pyface-4.4.0-r1 b/metadata/md5-cache/dev-python/pyface-4.4.0-r1
index 57ff214aa9fe..d6c59dabc074 100644
--- a/metadata/md5-cache/dev-python/pyface-4.4.0-r1
+++ b/metadata/md5-cache/dev-python/pyface-4.4.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/traits-4.1[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyface/pyface-4.4.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=968a3407fe44b5f30cfeb2d2c9515c47
diff --git a/metadata/md5-cache/dev-python/pyface-4.5.2-r1 b/metadata/md5-cache/dev-python/pyface-4.5.2-r1
index 9eb1bf4def15..7558d49c29cf 100644
--- a/metadata/md5-cache/dev-python/pyface-4.5.2-r1
+++ b/metadata/md5-cache/dev-python/pyface-4.5.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/traits-4.1[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyface/pyface-4.5.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=42a5622c2f7b9085b7aab8d9080632dd
diff --git a/metadata/md5-cache/dev-python/pyface-6.0.0 b/metadata/md5-cache/dev-python/pyface-6.0.0
index 7281308287ab..8b8c648c9831 100644
--- a/metadata/md5-cache/dev-python/pyface-6.0.0
+++ b/metadata/md5-cache/dev-python/pyface-6.0.0
@@ -10,5 +10,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pyface/pyface-6.0.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=2c4e88d39c0104320a466ab962cdf341
diff --git a/metadata/md5-cache/dev-python/pyfakefs-3.3 b/metadata/md5-cache/dev-python/pyfakefs-3.3
index 27ccd45c9495..00864a2667bf 100644
--- a/metadata/md5-cache/dev-python/pyfakefs-3.3
+++ b/metadata/md5-cache/dev-python/pyfakefs-3.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/jmcgeheeiv/pyfakefs/archive/v3.3.tar.gz -> pyfakefs-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bb55374b5454f29cfe2eb62b72d58913
diff --git a/metadata/md5-cache/dev-python/pyfakefs-3.4.1 b/metadata/md5-cache/dev-python/pyfakefs-3.4.1
index fc61ef000845..dc8630115c6a 100644
--- a/metadata/md5-cache/dev-python/pyfakefs-3.4.1
+++ b/metadata/md5-cache/dev-python/pyfakefs-3.4.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/jmcgeheeiv/pyfakefs/archive/v3.4.1.tar.gz -> pyfakefs-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5b35dd7dbd0dec46d0c9040299bee21d
diff --git a/metadata/md5-cache/dev-python/pyfakefs-3.4.3 b/metadata/md5-cache/dev-python/pyfakefs-3.4.3
index 90fad569b292..7a02b3608796 100644
--- a/metadata/md5-cache/dev-python/pyfakefs-3.4.3
+++ b/metadata/md5-cache/dev-python/pyfakefs-3.4.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/jmcgeheeiv/pyfakefs/archive/v3.4.3.tar.gz -> pyfakefs-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fb01c5556f5142952f87beb4e96ea7c4
diff --git a/metadata/md5-cache/dev-python/pyfeyn-1.0.0 b/metadata/md5-cache/dev-python/pyfeyn-1.0.0
index 7178c9cbac38..759c3559e7e3 100644
--- a/metadata/md5-cache/dev-python/pyfeyn-1.0.0
+++ b/metadata/md5-cache/dev-python/pyfeyn-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pyx-0.14[python_targets_python3_4(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyfeyn/pyfeyn-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=13fa99f79e31051d4d1024492c4a2615
diff --git a/metadata/md5-cache/dev-python/pyfeyn-1.0.0-r1 b/metadata/md5-cache/dev-python/pyfeyn-1.0.0-r1
index 3c05958f50ef..d2a493ce408f 100644
--- a/metadata/md5-cache/dev-python/pyfeyn-1.0.0-r1
+++ b/metadata/md5-cache/dev-python/pyfeyn-1.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pyx-0.14[python_targets_python3_4(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyfeyn/pyfeyn-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bfd66a6343a8af2317b4df9798b1751d
diff --git a/metadata/md5-cache/dev-python/pyfiglet-0.7.5 b/metadata/md5-cache/dev-python/pyfiglet-0.7.5
index e1f7a3be0a74..c1128d3b9c38 100644
--- a/metadata/md5-cache/dev-python/pyfiglet-0.7.5
+++ b/metadata/md5-cache/dev-python/pyfiglet-0.7.5
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyfiglet/pyfiglet-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=649bf9622b9b9cd8ccbacbe88a8f60d5
diff --git a/metadata/md5-cache/dev-python/pyfits-3.3-r1 b/metadata/md5-cache/dev-python/pyfits-3.3-r1
index e0fff684e082..b6ccf1c6f2bf 100644
--- a/metadata/md5-cache/dev-python/pyfits-3.3-r1
+++ b/metadata/md5-cache/dev-python/pyfits-3.3-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyfits/pyfits-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7c24e113216725b1fa8fd206ded13fa4
diff --git a/metadata/md5-cache/dev-python/pyfits-3.4-r1 b/metadata/md5-cache/dev-python/pyfits-3.4-r1
index bdc0ec579643..6fb8a02700dc 100644
--- a/metadata/md5-cache/dev-python/pyfits-3.4-r1
+++ b/metadata/md5-cache/dev-python/pyfits-3.4-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyfits/pyfits-3.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d9ca55d427e1989c9fcb9e6925dd475a
diff --git a/metadata/md5-cache/dev-python/pyflakes-0.8.1 b/metadata/md5-cache/dev-python/pyflakes-0.8.1
index a75fdd197e99..7c6b475efe96 100644
--- a/metadata/md5-cache/dev-python/pyflakes-0.8.1
+++ b/metadata/md5-cache/dev-python/pyflakes-0.8.1
@@ -10,5 +10,5 @@ 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
 SRC_URI=mirror://pypi/p/pyflakes/pyflakes-0.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=93156bc6c4a66cea5b600abece00f089
diff --git a/metadata/md5-cache/dev-python/pyflakes-1.0.0 b/metadata/md5-cache/dev-python/pyflakes-1.0.0
index eb255923b682..e32675eac135 100644
--- a/metadata/md5-cache/dev-python/pyflakes-1.0.0
+++ b/metadata/md5-cache/dev-python/pyflakes-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-
 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/pyflakes/pyflakes-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e1f9917b142edc81beeebee5f89af2df
diff --git a/metadata/md5-cache/dev-python/pyflakes-1.2.3 b/metadata/md5-cache/dev-python/pyflakes-1.2.3
index 20c9a908f2ca..4868fb73de1d 100644
--- a/metadata/md5-cache/dev-python/pyflakes-1.2.3
+++ b/metadata/md5-cache/dev-python/pyflakes-1.2.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,p
 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/pyflakes/pyflakes-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=97868dc6345c24ac5150d3334de2d157
diff --git a/metadata/md5-cache/dev-python/pyflakes-1.6.0 b/metadata/md5-cache/dev-python/pyflakes-1.6.0
index 35ba0e975339..c14011b2cd34 100644
--- a/metadata/md5-cache/dev-python/pyflakes-1.6.0
+++ b/metadata/md5-cache/dev-python/pyflakes-1.6.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,p
 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/pyflakes/pyflakes-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=517a64451d23361f578bb5080b06552a
diff --git a/metadata/md5-cache/dev-python/pyflakes-2.0.0 b/metadata/md5-cache/dev-python/pyflakes-2.0.0
index 2f48d8777cdd..2fdf06e6f8da 100644
--- a/metadata/md5-cache/dev-python/pyflakes-2.0.0
+++ b/metadata/md5-cache/dev-python/pyflakes-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,p
 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/pyflakes/pyflakes-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2f0d7eda363aa1554e2b724e8dca3e2d
diff --git a/metadata/md5-cache/dev-python/pyflann-1.9.1 b/metadata/md5-cache/dev-python/pyflann-1.9.1
index cf78e678f141..aa781ab08b4d 100644
--- a/metadata/md5-cache/dev-python/pyflann-1.9.1
+++ b/metadata/md5-cache/dev-python/pyflann-1.9.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/mariusmuja/flann/archive/1.9.1.tar.gz -> flann-1.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7851abb5708fb889dd3fc955d548bfe6
diff --git a/metadata/md5-cache/dev-python/pyfltk-1.3.3 b/metadata/md5-cache/dev-python/pyfltk-1.3.3
index 9565d3eae0ce..fe78a663aced 100644
--- a/metadata/md5-cache/dev-python/pyfltk-1.3.3
+++ b/metadata/md5-cache/dev-python/pyfltk-1.3.3
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/fltk-1.3.0:1[opengl] !dev-python/pyfltk:1 python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pyfltk/pyFltk-1.3.3_py3.tar.gz -> pyFltk-1.3.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6b7e324561ddb6a05b9b87221e04f513
diff --git a/metadata/md5-cache/dev-python/pyformance-0.3.4 b/metadata/md5-cache/dev-python/pyformance-0.3.4
index 9b87393d40b7..a1832c24b756 100644
--- a/metadata/md5-cache/dev-python/pyformance-0.3.4
+++ b/metadata/md5-cache/dev-python/pyformance-0.3.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyformance/pyformance-0.3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bdca4627f4fa382f51bdef49953978c1
diff --git a/metadata/md5-cache/dev-python/pyformance-0.4 b/metadata/md5-cache/dev-python/pyformance-0.4
index d05a638fd7e7..80365ea5c2c0 100644
--- a/metadata/md5-cache/dev-python/pyformance-0.4
+++ b/metadata/md5-cache/dev-python/pyformance-0.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyformance/pyformance-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0410f20e7affe33a2fc7d4be9abaaa7b
diff --git a/metadata/md5-cache/dev-python/pyftpdlib-1.5.1 b/metadata/md5-cache/dev-python/pyftpdlib-1.5.1
index 01de6c0f68c7..efe69b37b64d 100644
--- a/metadata/md5-cache/dev-python/pyftpdlib-1.5.1
+++ b/metadata/md5-cache/dev-python/pyftpdlib-1.5.1
@@ -10,5 +10,5 @@ RDEPEND=ssl? ( dev-python/pyopenssl[python_targets_pypy(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyftpdlib/pyftpdlib-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=52291da8d959989f53eea9606ff822fb
diff --git a/metadata/md5-cache/dev-python/pyftpdlib-1.5.3 b/metadata/md5-cache/dev-python/pyftpdlib-1.5.3
index 2667e8156669..1faf5bc75a64 100644
--- a/metadata/md5-cache/dev-python/pyftpdlib-1.5.3
+++ b/metadata/md5-cache/dev-python/pyftpdlib-1.5.3
@@ -10,5 +10,5 @@ RDEPEND=ssl? ( dev-python/pyopenssl[python_targets_pypy(-)?,python_targets_pypy3
 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/pyftpdlib/pyftpdlib-1.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=322efd93b4da77bfc899d0e82266fb54
diff --git a/metadata/md5-cache/dev-python/pyftpdlib-1.5.4 b/metadata/md5-cache/dev-python/pyftpdlib-1.5.4
index 6c0c8001f4ab..a03a4586208d 100644
--- a/metadata/md5-cache/dev-python/pyftpdlib-1.5.4
+++ b/metadata/md5-cache/dev-python/pyftpdlib-1.5.4
@@ -10,5 +10,5 @@ RDEPEND=ssl? ( dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_
 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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=8c83103632868523917387346902a4d8
+_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
diff --git a/metadata/md5-cache/dev-python/pygal-2.1.1 b/metadata/md5-cache/dev-python/pygal-2.1.1
index 8bed75a88240..5a970a2a228b 100644
--- a/metadata/md5-cache/dev-python/pygal-2.1.1
+++ b/metadata/md5-cache/dev-python/pygal-2.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pygal/pygal-2.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e87d1db83a8ad5798f198efddbad846f
diff --git a/metadata/md5-cache/dev-python/pygal-2.1.1-r1 b/metadata/md5-cache/dev-python/pygal-2.1.1-r1
index 57733a70a70a..04a9dfbc7643 100644
--- a/metadata/md5-cache/dev-python/pygal-2.1.1-r1
+++ b/metadata/md5-cache/dev-python/pygal-2.1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pygal/pygal-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=43e22d0325a48bb1982e5a38c1873b0e
diff --git a/metadata/md5-cache/dev-python/pygame-1.9.2_pre20120101-r2 b/metadata/md5-cache/dev-python/pygame-1.9.2_pre20120101-r2
index 8429b455704b..3fdf7d0dd574 100644
--- a/metadata/md5-cache/dev-python/pygame-1.9.2_pre20120101-r2
+++ b/metadata/md5-cache/dev-python/pygame-1.9.2_pre20120101-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=http://people.apache.org/~Arfrever/gentoo/pygame-1.9.2_pre20120101.tar.xz
-_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8db514d0ffc783a3c08ccb8e42dab970
diff --git a/metadata/md5-cache/dev-python/pygame-1.9.3 b/metadata/md5-cache/dev-python/pygame-1.9.3
index 9ae41aea9b90..69a8ab41d1b0 100644
--- a/metadata/md5-cache/dev-python/pygame-1.9.3
+++ b/metadata/md5-cache/dev-python/pygame-1.9.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pygame/pygame-1.9.3.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=de49b75bf72e054210bd64e273b9232f
diff --git a/metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4 b/metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4
index 1387c93fda0a..fb265aaf2a94 100644
--- a/metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4
+++ b/metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://www.renpy.org/dl/6.99.12.4/pygame_sdl2-2.1.0-for-renpy-6.99.12.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d3e710336c8f5bab0ac63f237da09612
diff --git a/metadata/md5-cache/dev-python/pygame_sdl2-6.99.6-r1 b/metadata/md5-cache/dev-python/pygame_sdl2-6.99.6-r1
index 0ea2be45c18d..0e0b4d6518d5 100644
--- a/metadata/md5-cache/dev-python/pygame_sdl2-6.99.6-r1
+++ b/metadata/md5-cache/dev-python/pygame_sdl2-6.99.6-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://www.renpy.org/dl/6.99.6/pygame_sdl2-for-renpy-6.99.6.tar.bz2
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f389e92774036fdef4f82ca983e83ff2
diff --git a/metadata/md5-cache/dev-python/pygccxml-1.0.0 b/metadata/md5-cache/dev-python/pygccxml-1.0.0
index 2c0f6d283623..c5860c055ac9 100644
--- a/metadata/md5-cache/dev-python/pygccxml-1.0.0
+++ b/metadata/md5-cache/dev-python/pygccxml-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-cpp/gccxml-0.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pygccxml/pygccxml-1.0.0.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cd9dc15786f0d6d92aa8f281fe024704
diff --git a/metadata/md5-cache/dev-python/pygccxml-1.7.5 b/metadata/md5-cache/dev-python/pygccxml-1.7.5
index 1ec1c1120159..4034d19b71e9 100644
--- a/metadata/md5-cache/dev-python/pygccxml-1.7.5
+++ b/metadata/md5-cache/dev-python/pygccxml-1.7.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-cpp/gccxml-0.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5
 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/gccxml/pygccxml/archive/v1.7.5.tar.gz -> pygccxml-1.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b1a7d916bcccae30c071e6181a07d967
diff --git a/metadata/md5-cache/dev-python/pygcrypt-1.0.0 b/metadata/md5-cache/dev-python/pygcrypt-1.0.0
index 2a273b9f76e4..26d47eea61c4 100644
--- a/metadata/md5-cache/dev-python/pygcrypt-1.0.0
+++ b/metadata/md5-cache/dev-python/pygcrypt-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libgcrypt:0= virtual/python-cffi[python_targets_python3_5(-)?,p
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pygcrypt/pygcrypt-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7db003f3a49eae59ec20f5af5ec023eb
diff --git a/metadata/md5-cache/dev-python/pygene-0.2.1-r1 b/metadata/md5-cache/dev-python/pygene-0.2.1-r1
index 3b204e6e6f08..2d60e23cff69 100644
--- a/metadata/md5-cache/dev-python/pygene-0.2.1-r1
+++ b/metadata/md5-cache/dev-python/pygene-0.2.1-r1
@@ -10,5 +10,5 @@ RDEPEND=examples? ( >=dev-python/pyfltk-1.1.2:0[python_targets_python2_7(-)?,-py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.freenet.org.nz/python/pygene/pygene-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fcc5ba779c2bb3e19903207ac8b83d1b
diff --git a/metadata/md5-cache/dev-python/pygeocoder-1.2.5 b/metadata/md5-cache/dev-python/pygeocoder-1.2.5
index 1d4fa30bfa7f..94d74cab28c4 100644
--- a/metadata/md5-cache/dev-python/pygeocoder-1.2.5
+++ b/metadata/md5-cache/dev-python/pygeocoder-1.2.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/requests-1.0[python_targets_pypy(-)?,python_targets_python2
 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=http://code.xster.net/pygeocoder/downloads/pygeocoder-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8234873f284e778fb5dab81ddca2f4bb
diff --git a/metadata/md5-cache/dev-python/pyghmi-1.0.22 b/metadata/md5-cache/dev-python/pyghmi-1.0.22
index 4dcd37f6afbe..592ebbb85b0a 100644
--- a/metadata/md5-cache/dev-python/pyghmi-1.0.22
+++ b/metadata/md5-cache/dev-python/pyghmi-1.0.22
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pbr[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyghmi/pyghmi-1.0.22.tar.gz -> pyghmi-1.0.22.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0ec740bcc28b9c13bb41a2cfc296562b
diff --git a/metadata/md5-cache/dev-python/pygit2-0.26.4 b/metadata/md5-cache/dev-python/pygit2-0.26.4
index 675d361d3cec..8f506ce0ad97 100644
--- a/metadata/md5-cache/dev-python/pygit2-0.26.4
+++ b/metadata/md5-cache/dev-python/pygit2-0.26.4
@@ -10,5 +10,5 @@ RDEPEND==dev-libs/libgit2-0.26* >=dev-python/cffi-1.0:=[python_targets_python2_7
 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/pygit2/pygit2-0.26.4.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f48843096940f0c16a9bc895a7865ebe
diff --git a/metadata/md5-cache/dev-python/pygit2-0.27.1 b/metadata/md5-cache/dev-python/pygit2-0.27.1
deleted file mode 100644
index f4d0fb5edc3f..000000000000
--- a/metadata/md5-cache/dev-python/pygit2-0.27.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==dev-libs/libgit2-0.27* >=dev-python/cffi-1.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/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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_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 bindings for libgit2
-EAPI=6
-HOMEPAGE=https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/
-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=GPL-2-with-linking-exception
-RDEPEND==dev-libs/libgit2-0.27* >=dev-python/cffi-1.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/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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_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/p/pygit2/pygit2-0.27.1.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=b6308ec5ff32f4685d6aee69dab46bf8
diff --git a/metadata/md5-cache/dev-python/pygit2-0.27.2 b/metadata/md5-cache/dev-python/pygit2-0.27.2
index 4c371c9f4b02..91085e50aa81 100644
--- a/metadata/md5-cache/dev-python/pygit2-0.27.2
+++ b/metadata/md5-cache/dev-python/pygit2-0.27.2
@@ -10,5 +10,5 @@ RDEPEND==dev-libs/libgit2-0.27* >=dev-python/cffi-1.0:=[python_targets_python2_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/p/pygit2/pygit2-0.27.2.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ce9d6364b0abbc9d4abd13d221eec15a
diff --git a/metadata/md5-cache/dev-python/pyglet-1.2.4 b/metadata/md5-cache/dev-python/pyglet-1.2.4
index f4e64134a91c..28d4efb2a61b 100644
--- a/metadata/md5-cache/dev-python/pyglet-1.2.4
+++ b/metadata/md5-cache/dev-python/pyglet-1.2.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pyglet/pyglet-1.2.4.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2f4a66139beb2546ecacd7675899ca6a
diff --git a/metadata/md5-cache/dev-python/pygments-2.1.1 b/metadata/md5-cache/dev-python/pygments-2.1.1
index b2d79c6dfd8e..b2370dc64681 100644
--- a/metadata/md5-cache/dev-python/pygments-2.1.1
+++ b/metadata/md5-cache/dev-python/pygments-2.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,p
 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/Pygments/Pygments-2.1.1.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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_=894f0a4120c4a52a969bd6de8dd3f74f
diff --git a/metadata/md5-cache/dev-python/pygments-2.2.0 b/metadata/md5-cache/dev-python/pygments-2.2.0
index 2d61d537eed1..bbd67f88a000 100644
--- a/metadata/md5-cache/dev-python/pygments-2.2.0
+++ b/metadata/md5-cache/dev-python/pygments-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,p
 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/Pygments/Pygments-2.2.0.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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_=71e2e2a3394cbf164b7e0cbe604d4cd4
diff --git a/metadata/md5-cache/dev-python/pygobject-2.28.6-r55 b/metadata/md5-cache/dev-python/pygobject-2.28.6-r55
index 06928dd3ad88..7b1cd71a3122 100644
--- a/metadata/md5-cache/dev-python/pygobject-2.28.6-r55
+++ b/metadata/md5-cache/dev-python/pygobject-2.28.6-r55
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.24.0:2 dev-lang/python-exec:2 libffi? ( virtual/libffi
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=2
 SRC_URI=mirror://gnome/sources/pygobject/2.28/pygobject-2.28.6.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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ca50485e8c8b0f6265a2d8397edc35e3
diff --git a/metadata/md5-cache/dev-python/pygobject-3.22.0 b/metadata/md5-cache/dev-python/pygobject-3.22.0
index 45b0f664410c..a9f9f136c44c 100644
--- a/metadata/md5-cache/dev-python/pygobject-3.22.0
+++ b/metadata/md5-cache/dev-python/pygobject-3.22.0
@@ -10,5 +10,5 @@ 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 ) test? ( cairo )
 SLOT=3
 SRC_URI=mirror://gnome/sources/pygobject/3.22/pygobject-3.22.0.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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=10276560e69c8255eedeb8b903a1d9ed
diff --git a/metadata/md5-cache/dev-python/pygobject-3.24.1 b/metadata/md5-cache/dev-python/pygobject-3.24.1
index 09984db18dcd..44c789159b3a 100644
--- a/metadata/md5-cache/dev-python/pygobject-3.24.1
+++ b/metadata/md5-cache/dev-python/pygobject-3.24.1
@@ -10,5 +10,5 @@ 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 ) test? ( cairo )
 SLOT=3
 SRC_URI=mirror://gnome/sources/pygobject/3.24/pygobject-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	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=788b646ab46c00c326cb48931bb0650b
diff --git a/metadata/md5-cache/dev-python/pygobject-3.24.1-r1 b/metadata/md5-cache/dev-python/pygobject-3.24.1-r1
index 6ea440aa9597..4503942451fd 100644
--- a/metadata/md5-cache/dev-python/pygobject-3.24.1-r1
+++ b/metadata/md5-cache/dev-python/pygobject-3.24.1-r1
@@ -10,5 +10,5 @@ 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 ) test? ( cairo )
 SLOT=3
 SRC_URI=mirror://gnome/sources/pygobject/3.24/pygobject-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	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=42395a555c7c9ca7589e17c834f40452
diff --git a/metadata/md5-cache/dev-python/pygobject-3.28.3 b/metadata/md5-cache/dev-python/pygobject-3.28.3
index 140e6fad37c8..a3b49faa5287 100644
--- a/metadata/md5-cache/dev-python/pygobject-3.28.3
+++ b/metadata/md5-cache/dev-python/pygobject-3.28.3
@@ -10,5 +10,5 @@ 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 ) test? ( cairo )
 SLOT=3
 SRC_URI=mirror://gnome/sources/pygobject/3.28/pygobject-3.28.3.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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=af7903832edf1b298fca8cb3084dee10
diff --git a/metadata/md5-cache/dev-python/pygoocanvas-0.14.1-r1 b/metadata/md5-cache/dev-python/pygoocanvas-0.14.1-r1
index e030b5831b22..c224e2d16975 100644
--- a/metadata/md5-cache/dev-python/pygoocanvas-0.14.1-r1
+++ b/metadata/md5-cache/dev-python/pygoocanvas-0.14.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=mirror://gnome/sources/pygoocanvas/0.14/pygoocanvas-0.14.1.tar.bz2
-_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2f3a7444dd76aac504b59c58715800b3
diff --git a/metadata/md5-cache/dev-python/pygpgme-0.3-r1 b/metadata/md5-cache/dev-python/pygpgme-0.3-r1
index 462d2d8ec690..1529679e2e26 100644
--- a/metadata/md5-cache/dev-python/pygpgme-0.3-r1
+++ b/metadata/md5-cache/dev-python/pygpgme-0.3-r1
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/gpgme python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://launchpad.net/pygpgme/trunk/0.3/+download/pygpgme-0.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6faa37fc842550e15ca26fec01c2ce6a
diff --git a/metadata/md5-cache/dev-python/pygpu-0.6.0 b/metadata/md5-cache/dev-python/pygpu-0.6.0
index 4ae65545f320..b690d61a4181 100644
--- a/metadata/md5-cache/dev-python/pygpu-0.6.0
+++ b/metadata/md5-cache/dev-python/pygpu-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/mako[python_targets_python2_7(-)?,python_targets_python3_4(-)
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/Theano/libgpuarray/archive/v0.6.0.tar.gz -> pygpu-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=41c563718bf2bdca6056112def8560e4
diff --git a/metadata/md5-cache/dev-python/pygpu-0.6.7 b/metadata/md5-cache/dev-python/pygpu-0.6.7
index df4df7b86b2e..21937bb96982 100644
--- a/metadata/md5-cache/dev-python/pygpu-0.6.7
+++ b/metadata/md5-cache/dev-python/pygpu-0.6.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/mako[python_targets_python2_7(-)?,python_targets_python3_4(-)
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/Theano/libgpuarray/archive/v0.6.7.tar.gz -> pygpu-0.6.7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=90883c205e631433563b53898f3de3f5
diff --git a/metadata/md5-cache/dev-python/pygraphviz-1.2 b/metadata/md5-cache/dev-python/pygraphviz-1.2
index be5b7f747d72..f3d9113d4cb3 100644
--- a/metadata/md5-cache/dev-python/pygraphviz-1.2
+++ b/metadata/md5-cache/dev-python/pygraphviz-1.2
@@ -10,5 +10,5 @@ RDEPEND=media-gfx/graphviz python_targets_python2_7? ( >=dev-lang/python-2.7.5-r
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pygraphviz/pygraphviz-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=279b23feaa32b5602900ff7be92ac32c
diff --git a/metadata/md5-cache/dev-python/pygraphviz-1.3.1 b/metadata/md5-cache/dev-python/pygraphviz-1.3.1
index 883fb27f87be..f6d4b46a13dc 100644
--- a/metadata/md5-cache/dev-python/pygraphviz-1.3.1
+++ b/metadata/md5-cache/dev-python/pygraphviz-1.3.1
@@ -10,5 +10,5 @@ RDEPEND=media-gfx/graphviz python_targets_python2_7? ( >=dev-lang/python-2.7.5-r
 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/pygraphviz/pygraphviz-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=39680d2eb79429f32c9ae0afaf272d2e
diff --git a/metadata/md5-cache/dev-python/pygresql-5.0.4 b/metadata/md5-cache/dev-python/pygresql-5.0.4
index aa853882eb01..23ef90e367f2 100644
--- a/metadata/md5-cache/dev-python/pygresql-5.0.4
+++ b/metadata/md5-cache/dev-python/pygresql-5.0.4
@@ -10,5 +10,5 @@ RDEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_
 REQUIRED_USE=|| ( postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5 postgres_targets_postgres9_4 postgres_targets_postgres9_3 ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyGreSQL/PyGreSQL-5.0.4.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	postgres	1d395ef92a41175c81bf7da2cb7fb8cb	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	postgres	1d395ef92a41175c81bf7da2cb7fb8cb	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9490706bf92a240b95093d099181b736
diff --git a/metadata/md5-cache/dev-python/pygsl-0.9.5-r1 b/metadata/md5-cache/dev-python/pygsl-0.9.5-r1
index 7923b3ea66bf..847d1b24a040 100644
--- a/metadata/md5-cache/dev-python/pygsl-0.9.5-r1
+++ b/metadata/md5-cache/dev-python/pygsl-0.9.5-r1
@@ -10,5 +10,5 @@ RDEPEND=<sci-libs/gsl-2 dev-python/numpy[python_targets_python2_7(-)?,-python_si
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pygsl/pygsl-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d99b94805882c68cb6766864393472c7
diff --git a/metadata/md5-cache/dev-python/pygsl-2.1.1 b/metadata/md5-cache/dev-python/pygsl-2.1.1
index 11b1d4226b3c..533fefa135e1 100644
--- a/metadata/md5-cache/dev-python/pygsl-2.1.1
+++ b/metadata/md5-cache/dev-python/pygsl-2.1.1
@@ -10,5 +10,5 @@ RDEPEND=<sci-libs/gsl-2 dev-python/numpy[python_targets_python2_7(-)?,python_tar
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/pygsl/pygsl/pygsl-2.1.1/pygsl-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=21a2c0fb9fa20ab9077b5f29f5ffecc4
diff --git a/metadata/md5-cache/dev-python/pygtk-2.24.0-r4 b/metadata/md5-cache/dev-python/pygtk-2.24.0-r4
index 1cbc2fe2aecc..5c82b6546754 100644
--- a/metadata/md5-cache/dev-python/pygtk-2.24.0-r4
+++ b/metadata/md5-cache/dev-python/pygtk-2.24.0-r4
@@ -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=2
 SRC_URI=mirror://gnome/sources/pygtk/2.24/pygtk-2.24.0.tar.bz2
-_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ad8f0453386e9ee9b4a3fe89d9cd9afb
diff --git a/metadata/md5-cache/dev-python/pygtkhelpers-0.4.3-r1 b/metadata/md5-cache/dev-python/pygtkhelpers-0.4.3-r1
index 2eff1591934d..9aa2ff57b093 100644
--- a/metadata/md5-cache/dev-python/pygtkhelpers-0.4.3-r1
+++ b/metadata/md5-cache/dev-python/pygtkhelpers-0.4.3-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pygtkhelpers/pygtkhelpers-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=36844fad2521cc38a2e6c7d24c4bb361
diff --git a/metadata/md5-cache/dev-python/pygtksourceview-2.10.1-r1 b/metadata/md5-cache/dev-python/pygtksourceview-2.10.1-r1
index 4360dfe5ace8..624a5e6adfde 100644
--- a/metadata/md5-cache/dev-python/pygtksourceview-2.10.1-r1
+++ b/metadata/md5-cache/dev-python/pygtksourceview-2.10.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=2
 SRC_URI=mirror://gnome/sources/pygtksourceview/2.10/pygtksourceview-2.10.1.tar.bz2
-_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=138249b436d1c1cbef4418ca058951c0
diff --git a/metadata/md5-cache/dev-python/pyhamcrest-1.9.0 b/metadata/md5-cache/dev-python/pyhamcrest-1.9.0
index 6cf0e043a494..772f817087ff 100644
--- a/metadata/md5-cache/dev-python/pyhamcrest-1.9.0
+++ b/metadata/md5-cache/dev-python/pyhamcrest-1.9.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/P/PyHamcrest/PyHamcrest-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3d2a865b2cd8c5afea8ebb538527470f
diff --git a/metadata/md5-cache/dev-python/pyhamcrest-1.9.0-r1 b/metadata/md5-cache/dev-python/pyhamcrest-1.9.0-r1
index f3baf210e52e..8e3bb48175e6 100644
--- a/metadata/md5-cache/dev-python/pyhamcrest-1.9.0-r1
+++ b/metadata/md5-cache/dev-python/pyhamcrest-1.9.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/six-1.4[python_targets_python2_7(-)?,python_targets_python3
 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/hamcrest/PyHamcrest/archive/V1.9.0.tar.gz -> PyHamcrest-1.9.0.gh.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6e9c24dc93cc2ea0360d4f94fc02f597
diff --git a/metadata/md5-cache/dev-python/pyhcl-0.2.3 b/metadata/md5-cache/dev-python/pyhcl-0.2.3
index fee7719ba746..994a51b606c6 100644
--- a/metadata/md5-cache/dev-python/pyhcl-0.2.3
+++ b/metadata/md5-cache/dev-python/pyhcl-0.2.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/ply-3.4[python_targets_python2_7(-)?,python_targets_python3
 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/pyhcl/pyhcl-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=706c3b981ddd1eee719b214883ceeff5
diff --git a/metadata/md5-cache/dev-python/pyhcl-0.3.6 b/metadata/md5-cache/dev-python/pyhcl-0.3.6
index c0f3ff3f27f8..fc946c9b9b3d 100644
--- a/metadata/md5-cache/dev-python/pyhcl-0.3.6
+++ b/metadata/md5-cache/dev-python/pyhcl-0.3.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/ply-3.4[python_targets_python2_7(-)?,python_targets_python3
 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/pyhcl/pyhcl-0.3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=706c3b981ddd1eee719b214883ceeff5
diff --git a/metadata/md5-cache/dev-python/pyicu-2.0.2 b/metadata/md5-cache/dev-python/pyicu-2.0.2
index bb116a2f3cab..022b0043a055 100644
--- a/metadata/md5-cache/dev-python/pyicu-2.0.2
+++ b/metadata/md5-cache/dev-python/pyicu-2.0.2
@@ -10,5 +10,5 @@ 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_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyICU/PyICU-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=67922e4d8942a9ccef64039601efb67b
diff --git a/metadata/md5-cache/dev-python/pyid3lib-0.5.1-r2 b/metadata/md5-cache/dev-python/pyid3lib-0.5.1-r2
index 18377a11e321..a2d316b6f997 100644
--- a/metadata/md5-cache/dev-python/pyid3lib-0.5.1-r2
+++ b/metadata/md5-cache/dev-python/pyid3lib-0.5.1-r2
@@ -10,5 +10,5 @@ RDEPEND=media-libs/id3lib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pyid3lib/pyid3lib-0.5.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6c43dff68187b5429c08ea283af6f1cb
diff --git a/metadata/md5-cache/dev-python/pyifp-0.2.2-r1 b/metadata/md5-cache/dev-python/pyifp-0.2.2-r1
index aeefbe5c0add..913140d5113a 100644
--- a/metadata/md5-cache/dev-python/pyifp-0.2.2-r1
+++ b/metadata/md5-cache/dev-python/pyifp-0.2.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libifp-1.0.0.2 python_targets_python2_7? ( >=dev-lang/pytho
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://sourceforge/ifp-gnome/pyifp-0.2.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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=96d6b6a894d34ffdc0be052b5ad28976
diff --git a/metadata/md5-cache/dev-python/pyinotify-0.9.6 b/metadata/md5-cache/dev-python/pyinotify-0.9.6
index 60d144674749..3c31b05aa08f 100644
--- a/metadata/md5-cache/dev-python/pyinotify-0.9.6
+++ b/metadata/md5-cache/dev-python/pyinotify-0.9.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_
 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://seb.dbzteam.org/pub/pyinotify/releases/pyinotify-0.9.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=72f7f24818e8e76e44bb6766ef34ece7
diff --git a/metadata/md5-cache/dev-python/pyinsane-2.0.10 b/metadata/md5-cache/dev-python/pyinsane-2.0.10
index 95ed57f3f85c..37e260b80282 100644
--- a/metadata/md5-cache/dev-python/pyinsane-2.0.10
+++ b/metadata/md5-cache/dev-python/pyinsane-2.0.10
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=2
 SRC_URI=https://github.com/openpaperwork/pyinsane/archive/2.0.10.tar.gz -> pyinsane-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ad7c20a675f5cb22cbde8d12fbb2f167
diff --git a/metadata/md5-cache/dev-python/pyinsane-2.0.12-r1 b/metadata/md5-cache/dev-python/pyinsane-2.0.12-r1
index 751ce0b925ee..fdc6df0f951f 100644
--- a/metadata/md5-cache/dev-python/pyinsane-2.0.12-r1
+++ b/metadata/md5-cache/dev-python/pyinsane-2.0.12-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://pypi/p/pyinsane2/pyinsane2-2.0.12.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=46f4e7b695c16215dbbae018020ad36e
diff --git a/metadata/md5-cache/dev-python/pyjade-4.0.0 b/metadata/md5-cache/dev-python/pyjade-4.0.0
index 67d9d9bf7634..1632507a7f3c 100644
--- a/metadata/md5-cache/dev-python/pyjade-4.0.0
+++ b/metadata/md5-cache/dev-python/pyjade-4.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://pypi.python.org/packages/4a/04/396ec24e806fd3af7ea5d0f3cb6c7bbd4d00f7064712e4dd48f24c02ca95/pyjade-4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f1ecfa4262bd1dc5d3fc1f4a7f1a3c51
diff --git a/metadata/md5-cache/dev-python/pyjwt-1.5.3 b/metadata/md5-cache/dev-python/pyjwt-1.5.3
index 281b951ea1f1..25d594922b48 100644
--- a/metadata/md5-cache/dev-python/pyjwt-1.5.3
+++ b/metadata/md5-cache/dev-python/pyjwt-1.5.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_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/P/PyJWT/PyJWT-1.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ec6ac5e6411d4a6254f0c0a6506509fd
diff --git a/metadata/md5-cache/dev-python/pykerberos-1.1.7 b/metadata/md5-cache/dev-python/pykerberos-1.1.7
index 8fb5c2b9cd0e..d84707dbfc63 100644
--- a/metadata/md5-cache/dev-python/pykerberos-1.1.7
+++ b/metadata/md5-cache/dev-python/pykerberos-1.1.7
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/mit-krb5 dev-python/setuptools[python_targets_pypy(-)?,python_
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pykerberos/pykerberos-1.1.7-1.tar.gz -> pykerberos-1.1.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=b8d30de91273ded6da57a8ce0ab9e701
diff --git a/metadata/md5-cache/dev-python/pykerberos-1.1.9 b/metadata/md5-cache/dev-python/pykerberos-1.1.9
index c7ff59db82c7..db7b513861d5 100644
--- a/metadata/md5-cache/dev-python/pykerberos-1.1.9
+++ b/metadata/md5-cache/dev-python/pykerberos-1.1.9
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/mit-krb5 dev-python/setuptools[python_targets_pypy(-)?,python_
 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/pykerberos/pykerberos-1.1.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=101f3db44250cc0a79fa7375e24e2643
diff --git a/metadata/md5-cache/dev-python/pykka-1.2.1 b/metadata/md5-cache/dev-python/pykka-1.2.1
index f84a48d8d534..cf5beb5c46be 100644
--- a/metadata/md5-cache/dev-python/pykka-1.2.1
+++ b/metadata/md5-cache/dev-python/pykka-1.2.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/P/Pykka/Pykka-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b9752ca8e7a7c1e28f6b64f635350373
diff --git a/metadata/md5-cache/dev-python/pykwalify-1.5.2 b/metadata/md5-cache/dev-python/pykwalify-1.5.2
index a7c3348289e7..e67246164690 100644
--- a/metadata/md5-cache/dev-python/pykwalify-1.5.2
+++ b/metadata/md5-cache/dev-python/pykwalify-1.5.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/docopt-0.6.2 >=dev-python/pyyaml-3.11 >=dev-python/python-d
 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/pykwalify/pykwalify-1.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=840e7389a143bae4955d459a315b94a6
diff --git a/metadata/md5-cache/dev-python/pykwalify-9999 b/metadata/md5-cache/dev-python/pykwalify-9999
index cacde6c1c70b..433b5f4d5376 100644
--- a/metadata/md5-cache/dev-python/pykwalify-9999
+++ b/metadata/md5-cache/dev-python/pykwalify-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=dev-python/docopt-0.6.2 >=dev-python/pyyaml-3.11 >=dev-python/python-dateutil-2.4.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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_=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	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f16ee3bbaa36e8b199c238d2ce7a3b05
diff --git a/metadata/md5-cache/dev-python/pylast-1.9.0 b/metadata/md5-cache/dev-python/pylast-1.9.0
index 61f35270e347..507103e6f8aa 100644
--- a/metadata/md5-cache/dev-python/pylast-1.9.0
+++ b/metadata/md5-cache/dev-python/pylast-1.9.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pylast/pylast-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6dac180428e6bf1bcfc350a94d32221f
diff --git a/metadata/md5-cache/dev-python/pyldap-2.4.37 b/metadata/md5-cache/dev-python/pyldap-2.4.37
index ac467daaef81..50acf31f51a9 100644
--- a/metadata/md5-cache/dev-python/pyldap-2.4.37
+++ b/metadata/md5-cache/dev-python/pyldap-2.4.37
@@ -10,5 +10,5 @@ RDEPEND=>net-nds/openldap-2.4.11 dev-python/pyasn1[python_targets_pypy(-)?,pytho
 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/pyldap/pyldap-2.4.37.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=48cf8956a1de11468d322ffb14a335e8
diff --git a/metadata/md5-cache/dev-python/pylibacl-0.5.0-r1 b/metadata/md5-cache/dev-python/pylibacl-0.5.0-r1
index 7fb6bc5716c5..e092701dd06b 100644
--- a/metadata/md5-cache/dev-python/pylibacl-0.5.0-r1
+++ b/metadata/md5-cache/dev-python/pylibacl-0.5.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/pylibacl/pylibacl-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a79581db08921c3784404acd7b6a29bc
diff --git a/metadata/md5-cache/dev-python/pyliblzma-0.5.3-r1 b/metadata/md5-cache/dev-python/pyliblzma-0.5.3-r1
index 1d63596ffc7f..a6b48050a93e 100644
--- a/metadata/md5-cache/dev-python/pyliblzma-0.5.3-r1
+++ b/metadata/md5-cache/dev-python/pyliblzma-0.5.3-r1
@@ -10,5 +10,5 @@ RDEPEND=app-arch/xz-utils python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyliblzma/pyliblzma-0.5.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c2132d4a98e46d7fb2abf26aba9dc81c
diff --git a/metadata/md5-cache/dev-python/pylibmc-1.5.1-r1 b/metadata/md5-cache/dev-python/pylibmc-1.5.1-r1
index 7434eb8b7aa9..1176f7a03e16 100644
--- a/metadata/md5-cache/dev-python/pylibmc-1.5.1-r1
+++ b/metadata/md5-cache/dev-python/pylibmc-1.5.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libmemcached-0.32 python_targets_python2_7? ( >=dev-lang/pyth
 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/lericson/pylibmc/archive/1.5.1.tar.gz -> pylibmc-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=160c0ddca69927d5fa926cbd818aea99
diff --git a/metadata/md5-cache/dev-python/pylibpcap-0.6.4-r1 b/metadata/md5-cache/dev-python/pylibpcap-0.6.4-r1
index eb87494a51d2..eea7208e7047 100644
--- a/metadata/md5-cache/dev-python/pylibpcap-0.6.4-r1
+++ b/metadata/md5-cache/dev-python/pylibpcap-0.6.4-r1
@@ -10,5 +10,5 @@ RDEPEND=net-libs/libpcap python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pylibpcap/pylibpcap-0.6.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a15ee1ccbf34d702e4ccf7e3c9ac8b05
diff --git a/metadata/md5-cache/dev-python/pylint-1.6.5-r1 b/metadata/md5-cache/dev-python/pylint-1.6.5-r1
index c0e294211670..2958dd3b674f 100644
--- a/metadata/md5-cache/dev-python/pylint-1.6.5-r1
+++ b/metadata/md5-cache/dev-python/pylint-1.6.5-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pylint/pylint-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=45352faa27c4971ba8fecbd6d7e5f0b2
diff --git a/metadata/md5-cache/dev-python/pylint-1.7.2 b/metadata/md5-cache/dev-python/pylint-1.7.2
index 49c48581657b..18d37b11dd4d 100644
--- a/metadata/md5-cache/dev-python/pylint-1.7.2
+++ b/metadata/md5-cache/dev-python/pylint-1.7.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/astroid-1.5.1[python_targets_pypy(-)?,python_targets_python
 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/pylint/pylint-1.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=357b20a49bbdaaf5f0e655315f1b3742
diff --git a/metadata/md5-cache/dev-python/pylint-1.7.5 b/metadata/md5-cache/dev-python/pylint-1.7.5
index 02a7af2387ba..383c7de4bd2e 100644
--- a/metadata/md5-cache/dev-python/pylint-1.7.5
+++ b/metadata/md5-cache/dev-python/pylint-1.7.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/astroid-1.5.1[python_targets_pypy(-)?,python_targets_python
 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/pylint/pylint-1.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fe40ae005be4ff4c00d1ba5e8f3d5c72
diff --git a/metadata/md5-cache/dev-python/pylint-1.8.2 b/metadata/md5-cache/dev-python/pylint-1.8.2
index 04653246e93c..32a9fa9e278c 100644
--- a/metadata/md5-cache/dev-python/pylint-1.8.2
+++ b/metadata/md5-cache/dev-python/pylint-1.8.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/astroid-1.6.0[python_targets_pypy(-)?,python_targets_python
 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/pylint/pylint-1.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8403fb71ef83c91619e5e55303ca88a3
diff --git a/metadata/md5-cache/dev-python/pylint-1.8.4 b/metadata/md5-cache/dev-python/pylint-1.8.4
index 71ab5c907365..a0ade13af197 100644
--- a/metadata/md5-cache/dev-python/pylint-1.8.4
+++ b/metadata/md5-cache/dev-python/pylint-1.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/astroid-1.6.0[python_targets_pypy(-)?,python_targets_python
 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/pylint/pylint-1.8.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f5ac659242df4b82908b7c4bff6f0874
diff --git a/metadata/md5-cache/dev-python/pylirc-0.0.5-r1 b/metadata/md5-cache/dev-python/pylirc-0.0.5-r1
index 7ea867d1e998..f37b033fcf57 100644
--- a/metadata/md5-cache/dev-python/pylirc-0.0.5-r1
+++ b/metadata/md5-cache/dev-python/pylirc-0.0.5-r1
@@ -10,5 +10,5 @@ RDEPEND=app-misc/lirc python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pylirc/pylirc-0.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=109465dac6a8b7195c5fa83420dfeaad
diff --git a/metadata/md5-cache/dev-python/pylzma-0.4.9 b/metadata/md5-cache/dev-python/pylzma-0.4.9
index 7df03f25fc2b..0d725cbc0d69 100644
--- a/metadata/md5-cache/dev-python/pylzma-0.4.9
+++ b/metadata/md5-cache/dev-python/pylzma-0.4.9
@@ -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/fancycode/pylzma/archive/v0.4.9.tar.gz -> pylzma-0.4.9.gh.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f6fa4c40f07bdfd433df860c84deeac7
diff --git a/metadata/md5-cache/dev-python/pymad-0.6-r1 b/metadata/md5-cache/dev-python/pymad-0.6-r1
index 3b17d6f81f77..d92cb8680c30 100644
--- a/metadata/md5-cache/dev-python/pymad-0.6-r1
+++ b/metadata/md5-cache/dev-python/pymad-0.6-r1
@@ -10,5 +10,5 @@ RDEPEND=media-libs/libmad python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.spacepants.org/src/pymad/download/pymad-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4a8fff4dd46c2ba0b9971683baf285d9
diff --git a/metadata/md5-cache/dev-python/pymdstat-0.4.2 b/metadata/md5-cache/dev-python/pymdstat-0.4.2
index 18e49aa66b44..423c395249a6 100644
--- a/metadata/md5-cache/dev-python/pymdstat-0.4.2
+++ b/metadata/md5-cache/dev-python/pymdstat-0.4.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pymdstat/pymdstat-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6f512e42fe3cc2c0652aee54643bf2f9
diff --git a/metadata/md5-cache/dev-python/pymediainfo-2.2.0 b/metadata/md5-cache/dev-python/pymediainfo-2.2.0
index cc2ad76662cb..dee547f1a0b3 100644
--- a/metadata/md5-cache/dev-python/pymediainfo-2.2.0
+++ b/metadata/md5-cache/dev-python/pymediainfo-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=media-libs/libmediainfo python_targets_pypy? ( >=virtual/pypy-5:0= ) pyt
 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/pymediainfo/pymediainfo-2.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fb08cc701c9bf99d33c9e5c3eea4097d
diff --git a/metadata/md5-cache/dev-python/pymetar-0.21 b/metadata/md5-cache/dev-python/pymetar-0.21
index aad515563fff..3787f334916b 100644
--- a/metadata/md5-cache/dev-python/pymetar-0.21
+++ b/metadata/md5-cache/dev-python/pymetar-0.21
@@ -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=http://www.schwarzvogel.de/pkgs/pymetar-0.21.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1c3f708b7f6621824d59786ee96799f5
diff --git a/metadata/md5-cache/dev-python/pyminuit-1.2.1-r1 b/metadata/md5-cache/dev-python/pyminuit-1.2.1-r1
index a1ed0d52c24c..a0c08fee4560 100644
--- a/metadata/md5-cache/dev-python/pyminuit-1.2.1-r1
+++ b/metadata/md5-cache/dev-python/pyminuit-1.2.1-r1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://pyminuit.googlecode.com/files/pyminuit-1.2.1.tgz https://pyminuit.googlecode.com/files/Minuit-1_7_9-patch1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f30a93c16b93fcdad3f7d90d4d4c3338
diff --git a/metadata/md5-cache/dev-python/pyml-0.7.13.2-r1 b/metadata/md5-cache/dev-python/pyml-0.7.13.2-r1
index 5b0bd47b325e..048fb0ad2691 100644
--- a/metadata/md5-cache/dev-python/pyml-0.7.13.2-r1
+++ b/metadata/md5-cache/dev-python/pyml-0.7.13.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pyml/PyML-0.7.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c445ecaaf941a8153a8bec3242c3cced
diff --git a/metadata/md5-cache/dev-python/pyml-0.7.13.3 b/metadata/md5-cache/dev-python/pyml-0.7.13.3
index 13c229d6ed65..52b58ed9a43b 100644
--- a/metadata/md5-cache/dev-python/pyml-0.7.13.3
+++ b/metadata/md5-cache/dev-python/pyml-0.7.13.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pyml/PyML-0.7.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c445ecaaf941a8153a8bec3242c3cced
diff --git a/metadata/md5-cache/dev-python/pymoc-0.5.0 b/metadata/md5-cache/dev-python/pymoc-0.5.0
index f467c4f8b7c5..0e5ebf93aa5d 100644
--- a/metadata/md5-cache/dev-python/pymoc-0.5.0
+++ b/metadata/md5-cache/dev-python/pymoc-0.5.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pymoc/pymoc-0.5.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=dbfcc075706a02593350199d8c8e83d8
diff --git a/metadata/md5-cache/dev-python/pymongo-3.4.0 b/metadata/md5-cache/dev-python/pymongo-3.4.0
index 3da8a4cc25fd..7cd3f29c4edc 100644
--- a/metadata/md5-cache/dev-python/pymongo-3.4.0
+++ b/metadata/md5-cache/dev-python/pymongo-3.4.0
@@ -10,5 +10,5 @@ RDEPEND=kerberos? ( dev-python/pykerberos[python_targets_pypy(-)?,python_targets
 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/pymongo/pymongo-3.4.0.tar.gz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d7b952d3e0863022a37a7ff52e6fac74
diff --git a/metadata/md5-cache/dev-python/pymongo-3.5.1 b/metadata/md5-cache/dev-python/pymongo-3.5.1
index 64a185cef4dc..2f692836ca3c 100644
--- a/metadata/md5-cache/dev-python/pymongo-3.5.1
+++ b/metadata/md5-cache/dev-python/pymongo-3.5.1
@@ -10,5 +10,5 @@ RDEPEND=kerberos? ( dev-python/pykerberos[python_targets_pypy(-)?,python_targets
 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/pymongo/pymongo-3.5.1.tar.gz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=52ea8a976ed403f684fd6890dc6ec607
diff --git a/metadata/md5-cache/dev-python/pymongo-3.7.1 b/metadata/md5-cache/dev-python/pymongo-3.7.1
index d216a637e369..15ed0e60f9b0 100644
--- a/metadata/md5-cache/dev-python/pymongo-3.7.1
+++ b/metadata/md5-cache/dev-python/pymongo-3.7.1
@@ -10,5 +10,5 @@ RDEPEND=kerberos? ( dev-python/pykerberos[python_targets_pypy(-)?,python_targets
 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/pymongo/pymongo-3.7.1.tar.gz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3cde2a0f3ca14761a6b84dbe128fe46c
diff --git a/metadata/md5-cache/dev-python/pymountboot-0.2.2 b/metadata/md5-cache/dev-python/pymountboot-0.2.2
index ee5d74394f07..07d46a26ac34 100644
--- a/metadata/md5-cache/dev-python/pymountboot-0.2.2
+++ b/metadata/md5-cache/dev-python/pymountboot-0.2.2
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/util-linux-2.20 python_targets_pypy? ( >=virtual/pypy-5:0= )
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://www.bitbucket.org/mgorny/pymountboot/downloads/pymountboot-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f0f8b71f280e1438e0bec7005cd9c082
diff --git a/metadata/md5-cache/dev-python/pymountboot-9999 b/metadata/md5-cache/dev-python/pymountboot-9999
index 7d408047d71e..8297ff6eee96 100644
--- a/metadata/md5-cache/dev-python/pymountboot-9999
+++ b/metadata/md5-cache/dev-python/pymountboot-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=sys-apps/util-linux-2.20 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
-_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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=554c8477e0ce70c25517d3d9d87f997a
diff --git a/metadata/md5-cache/dev-python/pympler-0.5 b/metadata/md5-cache/dev-python/pympler-0.5
index 0c23804b5762..45bc5e9b8865 100644
--- a/metadata/md5-cache/dev-python/pympler-0.5
+++ b/metadata/md5-cache/dev-python/pympler-0.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/bottle[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/pympler/pympler/archive/0.5.tar.gz -> pympler-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=93021793ed4d38cfadf8539526f014f0
diff --git a/metadata/md5-cache/dev-python/pymssql-1.0.2-r1 b/metadata/md5-cache/dev-python/pymssql-1.0.2-r1
index b35857c7df06..38c6d5056489 100644
--- a/metadata/md5-cache/dev-python/pymssql-1.0.2-r1
+++ b/metadata/md5-cache/dev-python/pymssql-1.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/freetds-0.63[mssql] dev-python/setuptools[python_targets_pypy(-
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pymssql/pymssql-1.0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5f11ccb170020f364878b3edeb5f6967
diff --git a/metadata/md5-cache/dev-python/pymtp-0.0.6 b/metadata/md5-cache/dev-python/pymtp-0.0.6
index d21a2911c6f7..ef2482ae14b5 100644
--- a/metadata/md5-cache/dev-python/pymtp-0.0.6
+++ b/metadata/md5-cache/dev-python/pymtp-0.0.6
@@ -10,5 +10,5 @@ RDEPEND=media-libs/libmtp python_targets_python3_4? ( dev-lang/python:3.4 ) pyth
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/pymtp/pymtp_0.0.6.orig.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4ecc1b7c8963d4ce0ae5949fb57448eb
diff --git a/metadata/md5-cache/dev-python/pymysql-0.7.11 b/metadata/md5-cache/dev-python/pymysql-0.7.11
index 1be8f5c4612e..f08ad414611e 100644
--- a/metadata/md5-cache/dev-python/pymysql-0.7.11
+++ b/metadata/md5-cache/dev-python/pymysql-0.7.11
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/PyMySQL/PyMySQL/archive/v0.7.11.tar.gz -> pymysql-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=93bd7324f6a114f5f22df117f389a8a6
diff --git a/metadata/md5-cache/dev-python/pymysql-0.8.0 b/metadata/md5-cache/dev-python/pymysql-0.8.0
index 1ae116807375..6bc99cc7b1d3 100644
--- a/metadata/md5-cache/dev-python/pymysql-0.8.0
+++ b/metadata/md5-cache/dev-python/pymysql-0.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/PyMySQL/PyMySQL/archive/v0.8.0.tar.gz -> pymysql-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b1760736a9ea03b14d0d13d4477d4f0c
diff --git a/metadata/md5-cache/dev-python/pymysql-0.8.1 b/metadata/md5-cache/dev-python/pymysql-0.8.1
index 5579d5fa71c2..cd9c928934eb 100644
--- a/metadata/md5-cache/dev-python/pymysql-0.8.1
+++ b/metadata/md5-cache/dev-python/pymysql-0.8.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/PyMySQL/PyMySQL/archive/v0.8.1.tar.gz -> pymysql-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b1760736a9ea03b14d0d13d4477d4f0c
diff --git a/metadata/md5-cache/dev-python/pynacl-1.1.2 b/metadata/md5-cache/dev-python/pynacl-1.1.2
index e0461f5eff7c..33a2786204b1 100644
--- a/metadata/md5-cache/dev-python/pynacl-1.1.2
+++ b/metadata/md5-cache/dev-python/pynacl-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/pyca/pynacl/archive/1.1.2.tar.gz -> pynacl-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=de5e0eb4be736c1358a4604da5945e83
diff --git a/metadata/md5-cache/dev-python/pynacl-1.2.0 b/metadata/md5-cache/dev-python/pynacl-1.2.0
index 30dcaa5d4c59..e3ab6082dee4 100644
--- a/metadata/md5-cache/dev-python/pynacl-1.2.0
+++ b/metadata/md5-cache/dev-python/pynacl-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/pyca/pynacl/archive/1.2.0.tar.gz -> pynacl-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bedfc08c63382b81a7cd29dc47b4edd4
diff --git a/metadata/md5-cache/dev-python/pynacl-1.2.1 b/metadata/md5-cache/dev-python/pynacl-1.2.1
index dc2e532a84a2..2a79589537a4 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=~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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=fee801d7ac25cb8f5866d3d14008172d
+_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
diff --git a/metadata/md5-cache/dev-python/pynag-0.9.1 b/metadata/md5-cache/dev-python/pynag-0.9.1
index 83d0b65935ef..bc6b6f307927 100644
--- a/metadata/md5-cache/dev-python/pynag-0.9.1
+++ b/metadata/md5-cache/dev-python/pynag-0.9.1
@@ -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=mirror://pypi/p/pynag/pynag-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=69efab5968f3cdc2ad1162767b0b229a
diff --git a/metadata/md5-cache/dev-python/pyndex-0.3.2a-r1 b/metadata/md5-cache/dev-python/pyndex-0.3.2a-r1
index 14e91d92ba96..c4c095b0a64b 100644
--- a/metadata/md5-cache/dev-python/pyndex-0.3.2a-r1
+++ b/metadata/md5-cache/dev-python/pyndex-0.3.2a-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/metakit-2.4.9.2[python] python_targets_python2_7? ( >=dev-lang/
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://sourceforge/pyndex/Pyndex-0.3.2a.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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3f277b3db2cbea51efe588ef7484e750
diff --git a/metadata/md5-cache/dev-python/pynotifier-0.7.0-r3 b/metadata/md5-cache/dev-python/pynotifier-0.7.0-r3
index 798c49ab81fb..18ce0b798b33 100644
--- a/metadata/md5-cache/dev-python/pynotifier-0.7.0-r3
+++ b/metadata/md5-cache/dev-python/pynotifier-0.7.0-r3
@@ -10,5 +10,5 @@ RDEPEND=|| ( dev-python/twisted[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.bitkipper.net/bytes/debian/dists/unstable/source/pynotifier_0.7.0.orig.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e2be3f4c7e6dbee83a348639e3340247
diff --git a/metadata/md5-cache/dev-python/pynzb-0.1.0-r1 b/metadata/md5-cache/dev-python/pynzb-0.1.0-r1
index ff8bf79d29d4..7ab0584b376b 100644
--- a/metadata/md5-cache/dev-python/pynzb-0.1.0-r1
+++ b/metadata/md5-cache/dev-python/pynzb-0.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/pynzb/pynzb-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2448d50d50552fd88c21fdc9807ce3c8
diff --git a/metadata/md5-cache/dev-python/pyocr-0.4.7-r1 b/metadata/md5-cache/dev-python/pyocr-0.4.7-r1
index 28c5ce255138..310ace1c61e4 100644
--- a/metadata/md5-cache/dev-python/pyocr-0.4.7-r1
+++ b/metadata/md5-cache/dev-python/pyocr-0.4.7-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( cuneiform tesseract ) || ( python_targets_python2_7 python_tar
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/openpaperwork/pyocr/archive/0.4.7.tar.gz -> pyocr-0.4.7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=04ea2504e9cbf1361ed878b680b0b33d
diff --git a/metadata/md5-cache/dev-python/pyocr-0.5.1 b/metadata/md5-cache/dev-python/pyocr-0.5.1
index 1e59772c4f65..0a573cbfd25f 100644
--- a/metadata/md5-cache/dev-python/pyocr-0.5.1
+++ b/metadata/md5-cache/dev-python/pyocr-0.5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( cuneiform tesseract ) || ( python_targets_python2_7 python_tar
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pyocr/pyocr-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9f3248dc0768b0d6222036650deb331f
diff --git a/metadata/md5-cache/dev-python/pyodbc-4.0.16 b/metadata/md5-cache/dev-python/pyodbc-4.0.16
index fe2f8db11a89..63366684fd17 100644
--- a/metadata/md5-cache/dev-python/pyodbc-4.0.16
+++ b/metadata/md5-cache/dev-python/pyodbc-4.0.16
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/unixODBC-2.3.0 mssql? ( >=dev-db/freetds-0.64[odbc] ) python_ta
 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/pyodbc/pyodbc-4.0.16.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=18c4e4ef9477d217c562909dfaf84d0d
diff --git a/metadata/md5-cache/dev-python/pyodbc-4.0.23 b/metadata/md5-cache/dev-python/pyodbc-4.0.23
index 4e58995bc58e..5f4f39f14853 100644
--- a/metadata/md5-cache/dev-python/pyodbc-4.0.23
+++ b/metadata/md5-cache/dev-python/pyodbc-4.0.23
@@ -10,5 +10,5 @@ RDEPEND=dev-db/unixODBC mssql? ( dev-db/freetds[odbc] ) python_targets_python2_7
 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/pyodbc/pyodbc-4.0.23.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ec4ed514745a217544d9a4195c94d344
diff --git a/metadata/md5-cache/dev-python/pyode-1.2.0_p20100322-r1 b/metadata/md5-cache/dev-python/pyode-1.2.0_p20100322-r1
index 9e21709ead65..4468bd2adb59 100644
--- a/metadata/md5-cache/dev-python/pyode-1.2.0_p20100322-r1
+++ b/metadata/md5-cache/dev-python/pyode-1.2.0_p20100322-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-games/ode-0.7 >=dev-python/pyrex-0.9.4.1[python_targets_pypy(-)?,p
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pyode/PyODE-snapshot-2010-03-22.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1c24261eaf9315f07aa5efd8b1722a7b
diff --git a/metadata/md5-cache/dev-python/pyoembed-0.1.1 b/metadata/md5-cache/dev-python/pyoembed-0.1.1
index 71cf4398751b..200665b029ce 100644
--- a/metadata/md5-cache/dev-python/pyoembed-0.1.1
+++ b/metadata/md5-cache/dev-python/pyoembed-0.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/requests[python_targets_python2_7(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyoembed/pyoembed-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f5ea8c614eda99d18dfed2a0d41b7c0a
diff --git a/metadata/md5-cache/dev-python/pyoembed-9999 b/metadata/md5-cache/dev-python/pyoembed-9999
index 979a7a658754..caed7a2b1411 100644
--- a/metadata/md5-cache/dev-python/pyoembed-9999
+++ b/metadata/md5-cache/dev-python/pyoembed-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/requests[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/beautifulsoup:4[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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f5ea8c614eda99d18dfed2a0d41b7c0a
diff --git a/metadata/md5-cache/dev-python/pyogg-1.3-r2 b/metadata/md5-cache/dev-python/pyogg-1.3-r2
index 82601723da4b..e8ebcaaf8e52 100644
--- a/metadata/md5-cache/dev-python/pyogg-1.3-r2
+++ b/metadata/md5-cache/dev-python/pyogg-1.3-r2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libogg-1.0 python_targets_python2_7? ( >=dev-lang/python-2.
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gentoo/pyogg-1.3-r1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=dbb2c7dca97820886f07b5ad59716952
diff --git a/metadata/md5-cache/dev-python/pyopenal-0.1.6-r1 b/metadata/md5-cache/dev-python/pyopenal-0.1.6-r1
index 976e528869ce..15fc427ddeb1 100644
--- a/metadata/md5-cache/dev-python/pyopenal-0.1.6-r1
+++ b/metadata/md5-cache/dev-python/pyopenal-0.1.6-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pyogg-1.1[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://download.gna.org/pyopenal/PyOpenAL-0.1.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=53d50addf6b5ab9c4fe97e1dad30a96b
diff --git a/metadata/md5-cache/dev-python/pyopencl-2016.1 b/metadata/md5-cache/dev-python/pyopencl-2016.1
index ece95df6aba4..7a246b95cfc7 100644
--- a/metadata/md5-cache/dev-python/pyopencl-2016.1
+++ b/metadata/md5-cache/dev-python/pyopencl-2016.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/boost-1.48[python,python_targets_python2_7(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyopencl/pyopencl-2016.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fdcce48bbccf3a00178d7fcd408c47c2
diff --git a/metadata/md5-cache/dev-python/pyopencl-2017.2 b/metadata/md5-cache/dev-python/pyopencl-2017.2
index 13ffb841e4ae..5c69bb374604 100644
--- a/metadata/md5-cache/dev-python/pyopencl-2017.2
+++ b/metadata/md5-cache/dev-python/pyopencl-2017.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/boost-1.48[python,python_targets_python2_7(-)?,python_targets
 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/pyopencl/pyopencl-2017.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d8f4414168387a523e43576a1b8ac19a
diff --git a/metadata/md5-cache/dev-python/pyopencl-9999 b/metadata/md5-cache/dev-python/pyopencl-9999
index 522a1ab63bd0..e431a0366bd8 100644
--- a/metadata/md5-cache/dev-python/pyopencl-9999
+++ b/metadata/md5-cache/dev-python/pyopencl-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/boost-1.48[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/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/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mako[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytools-9999[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/opencl-0-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=|| ( python_targets_python2_7 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-2	249c1a0962573f4ce2c28f0d5b6b35d4	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-2	249c1a0962573f4ce2c28f0d5b6b35d4	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_=c34a9e5e5b09e7e06238fe4c675d044f
diff --git a/metadata/md5-cache/dev-python/pyopengl-3.1.0 b/metadata/md5-cache/dev-python/pyopengl-3.1.0
index c2765ccb45ac..633f338aba23 100644
--- a/metadata/md5-cache/dev-python/pyopengl-3.1.0
+++ b/metadata/md5-cache/dev-python/pyopengl-3.1.0
@@ -10,5 +10,5 @@ RDEPEND=media-libs/freeglut virtual/opengl x11-libs/libXi x11-libs/libXmu tk? (
 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/PyOpenGL/PyOpenGL-3.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=60ae0c3cde759a5e44c45d228ef1ca29
diff --git a/metadata/md5-cache/dev-python/pyopengl_accelerate-3.1.0 b/metadata/md5-cache/dev-python/pyopengl_accelerate-3.1.0
index aff89edc2a90..5086e23fe407 100644
--- a/metadata/md5-cache/dev-python/pyopengl_accelerate-3.1.0
+++ b/metadata/md5-cache/dev-python/pyopengl_accelerate-3.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyopengl[python_targets_python2_7(-)?,python_targets_python3_
 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/PyOpenGL-accelerate/PyOpenGL-accelerate-3.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=993b73137a3d51eb94b8b0d06aa2f67d
diff --git a/metadata/md5-cache/dev-python/pyopenssl-17.5.0 b/metadata/md5-cache/dev-python/pyopenssl-17.5.0
index 94c46cd27887..8919a2677a84 100644
--- a/metadata/md5-cache/dev-python/pyopenssl-17.5.0
+++ b/metadata/md5-cache/dev-python/pyopenssl-17.5.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/six-1.5.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,
 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/pyOpenSSL/pyOpenSSL-17.5.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=aa9a3e64ad8f9bd6afe348e108fa3a95
diff --git a/metadata/md5-cache/dev-python/pyorbit-2.24.0-r1 b/metadata/md5-cache/dev-python/pyorbit-2.24.0-r1
index f3fb5feab2cf..d3491e9294b1 100644
--- a/metadata/md5-cache/dev-python/pyorbit-2.24.0-r1
+++ b/metadata/md5-cache/dev-python/pyorbit-2.24.0-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=mirror://gnome/sources/pyorbit/2.24/pyorbit-2.24.0.tar.bz2
-_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0e06adb6987e968b0aabee28dd4e0d2c
diff --git a/metadata/md5-cache/dev-python/pyosd-0.2.14-r1 b/metadata/md5-cache/dev-python/pyosd-0.2.14-r1
index fc10de20ee5c..8aebddc48f56 100644
--- a/metadata/md5-cache/dev-python/pyosd-0.2.14-r1
+++ b/metadata/md5-cache/dev-python/pyosd-0.2.14-r1
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/xosd-2.2.4 python_targets_python2_7? ( >=dev-lang/python-2.7.
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://ichi2.net/pyosd/pyosd-0.2.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=64d4cdf88502b4253fdc87f26e2daba5
diff --git a/metadata/md5-cache/dev-python/pyotp-2.2.6 b/metadata/md5-cache/dev-python/pyotp-2.2.6
index e219663b6f86..b252d55aea97 100644
--- a/metadata/md5-cache/dev-python/pyotp-2.2.6
+++ b/metadata/md5-cache/dev-python/pyotp-2.2.6
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyotp/pyotp-2.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a9633f305839a96d5bd4f398c66a101e
diff --git a/metadata/md5-cache/dev-python/pyotp-2.2.6-r1 b/metadata/md5-cache/dev-python/pyotp-2.2.6-r1
index c9cc985ea651..c094725f324b 100644
--- a/metadata/md5-cache/dev-python/pyotp-2.2.6-r1
+++ b/metadata/md5-cache/dev-python/pyotp-2.2.6-r1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyotp/pyotp-2.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c55c886205cedd4cd64901e333386f10
diff --git a/metadata/md5-cache/dev-python/pypam-0.5.0-r3 b/metadata/md5-cache/dev-python/pypam-0.5.0-r3
index 19a7477424ea..07480756e98d 100644
--- a/metadata/md5-cache/dev-python/pypam-0.5.0-r3
+++ b/metadata/md5-cache/dev-python/pypam-0.5.0-r3
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/pam-0.64 python_targets_python2_7? ( >=dev-lang/python-2.7.5-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://www.pangalactic.org/PyPAM/PyPAM-0.5.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6c6d437e32a16d12ef2c04d2e40b8d0a
diff --git a/metadata/md5-cache/dev-python/pyparsing-2.2.0 b/metadata/md5-cache/dev-python/pyparsing-2.2.0
index ab8422bdb52a..a73dca0bfc17 100644
--- a/metadata/md5-cache/dev-python/pyparsing-2.2.0
+++ b/metadata/md5-cache/dev-python/pyparsing-2.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pyparsing/pyparsing-2.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5d7b15fea3b26a40bee2c6bb130d0963
diff --git a/metadata/md5-cache/dev-python/pyparted-3.10.7 b/metadata/md5-cache/dev-python/pyparted-3.10.7
index 10c01c8cd35b..ff09dfffb064 100644
--- a/metadata/md5-cache/dev-python/pyparted-3.10.7
+++ b/metadata/md5-cache/dev-python/pyparted-3.10.7
@@ -10,5 +10,5 @@ RDEPEND=>=sys-block/parted-3.1 dev-python/decorator[python_targets_python2_7(-)?
 REQUIRED_USE=test? ( python_targets_python2_7 ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/rhinstaller/pyparted/archive/v3.10.7.tar.gz -> pyparted-3.10.7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=91596f516e3323ba582f10769c72da45
diff --git a/metadata/md5-cache/dev-python/pyparted-3.11.1 b/metadata/md5-cache/dev-python/pyparted-3.11.1
index 5f85928d432a..67ab5ae57d37 100644
--- a/metadata/md5-cache/dev-python/pyparted-3.11.1
+++ b/metadata/md5-cache/dev-python/pyparted-3.11.1
@@ -10,5 +10,5 @@ RDEPEND=>=sys-block/parted-3.1 dev-python/decorator[python_targets_python2_7(-)?
 REQUIRED_USE=test? ( python_targets_python2_7 ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/rhinstaller/pyparted/archive/v3.11.1.tar.gz -> pyparted-3.11.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4d55bd4bc897525a6a23ee3910288aec
diff --git a/metadata/md5-cache/dev-python/pypax-0.9.2 b/metadata/md5-cache/dev-python/pypax-0.9.2
index 145bd62105a3..de9b7496b244 100644
--- a/metadata/md5-cache/dev-python/pypax-0.9.2
+++ b/metadata/md5-cache/dev-python/pypax-0.9.2
@@ -10,5 +10,5 @@ RDEPEND=ptpax? ( dev-libs/elfutils ) xtpax? ( sys-apps/attr ) python_targets_pyp
 REQUIRED_USE=|| ( ptpax xtpax ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/elfix/elfix-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=635a661fa720a5e2d2bdf454ea35c36c
diff --git a/metadata/md5-cache/dev-python/pypax-9999 b/metadata/md5-cache/dev-python/pypax-9999
index 8f06e85b7f93..629102a142fe 100644
--- a/metadata/md5-cache/dev-python/pypax-9999
+++ b/metadata/md5-cache/dev-python/pypax-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=ptpax? ( dev-libs/elfutils ) xtpax? ( sys-apps/attr ) 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=|| ( ptpax xtpax ) || ( python_targets_pypy 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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=32eb6e2ee857ab87875029f718a96915
diff --git a/metadata/md5-cache/dev-python/pypcap-1.2.1 b/metadata/md5-cache/dev-python/pypcap-1.2.1
index 183fc36d0767..89db5f414e65 100644
--- a/metadata/md5-cache/dev-python/pypcap-1.2.1
+++ b/metadata/md5-cache/dev-python/pypcap-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=net-libs/libpcap python_targets_pypy? ( >=virtual/pypy-5:0= ) python_tar
 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/pynetwork/pypcap/archive/v1.2.1.tar.gz -> pypcap-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a37bdfc678c274ff31696c52cb8ecbd3
diff --git a/metadata/md5-cache/dev-python/pypcap-1.2.2 b/metadata/md5-cache/dev-python/pypcap-1.2.2
index 3aa64370d086..688d75bf85e4 100644
--- a/metadata/md5-cache/dev-python/pypcap-1.2.2
+++ b/metadata/md5-cache/dev-python/pypcap-1.2.2
@@ -10,5 +10,5 @@ RDEPEND=net-libs/libpcap python_targets_pypy? ( >=virtual/pypy-5:0= ) python_tar
 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/pynetwork/pypcap/archive/v1.2.2.tar.gz -> pypcap-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a37bdfc678c274ff31696c52cb8ecbd3
diff --git a/metadata/md5-cache/dev-python/pypeg2-2.15.2 b/metadata/md5-cache/dev-python/pypeg2-2.15.2
index 4ae6357778ed..58c21706ce93 100644
--- a/metadata/md5-cache/dev-python/pypeg2-2.15.2
+++ b/metadata/md5-cache/dev-python/pypeg2-2.15.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyPEG2/pyPEG2-2.15.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2e70daf53696e50807382e130549e0b7
diff --git a/metadata/md5-cache/dev-python/pyperclip-1.5.27 b/metadata/md5-cache/dev-python/pyperclip-1.5.27
index 97da95444b6a..b1ae06981223 100644
--- a/metadata/md5-cache/dev-python/pyperclip-1.5.27
+++ b/metadata/md5-cache/dev-python/pyperclip-1.5.27
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/pyperclip/pyperclip-1.5.27.zip
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=82ce62a8aeca7fd8681d2093a0b41a4f
diff --git a/metadata/md5-cache/dev-python/pyperclip-1.6.0 b/metadata/md5-cache/dev-python/pyperclip-1.6.0
index 76a6eb13bda9..eb3a49b2a5ce 100644
--- a/metadata/md5-cache/dev-python/pyperclip-1.6.0
+++ b/metadata/md5-cache/dev-python/pyperclip-1.6.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/pyperclip/pyperclip-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0975694df900d5a7ae818afba9120ec5
diff --git a/metadata/md5-cache/dev-python/pyperclip-1.6.4 b/metadata/md5-cache/dev-python/pyperclip-1.6.4
index 39e4b825737f..68ab43a741a6 100644
--- a/metadata/md5-cache/dev-python/pyperclip-1.6.4
+++ b/metadata/md5-cache/dev-python/pyperclip-1.6.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/pyperclip/pyperclip-1.6.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=586b12fa2b976a7b99c067c976582e51
diff --git a/metadata/md5-cache/dev-python/pypgsql-2.5.1-r1 b/metadata/md5-cache/dev-python/pypgsql-2.5.1-r1
index 39ec859e5d69..c6f25699e94a 100644
--- a/metadata/md5-cache/dev-python/pypgsql-2.5.1-r1
+++ b/metadata/md5-cache/dev-python/pypgsql-2.5.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-db/postgresql:* dev-python/egenix-mx-base[python_targets_python2_7(-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pypgsql/pyPgSQL-2.5.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ee4bbb5036feefcc653611388d9f0f0c
diff --git a/metadata/md5-cache/dev-python/pyphen-0.9.4 b/metadata/md5-cache/dev-python/pyphen-0.9.4
index 7e3787056de0..379f7a26b1e3 100644
--- a/metadata/md5-cache/dev-python/pyphen-0.9.4
+++ b/metadata/md5-cache/dev-python/pyphen-0.9.4
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/P/Pyphen/Pyphen-0.9.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6bcec3355096345e57e6c142a88c56f3
diff --git a/metadata/md5-cache/dev-python/pyplusplus-1.0.0-r1 b/metadata/md5-cache/dev-python/pyplusplus-1.0.0-r1
index 2f87380eb9a3..683a58cbcb64 100644
--- a/metadata/md5-cache/dev-python/pyplusplus-1.0.0-r1
+++ b/metadata/md5-cache/dev-python/pyplusplus-1.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND==dev-python/pygccxml-1.0.0[python_targets_python2_7(-)?,-python_single_t
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pygccxml/pyplusplus-1.0.0.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ed264ec6a8109033153d3e28bf7001c2
diff --git a/metadata/md5-cache/dev-python/pyplusplus-1.0.0_p20131206 b/metadata/md5-cache/dev-python/pyplusplus-1.0.0_p20131206
index c499f1c3236e..5ce0cc78866e 100644
--- a/metadata/md5-cache/dev-python/pyplusplus-1.0.0_p20131206
+++ b/metadata/md5-cache/dev-python/pyplusplus-1.0.0_p20131206
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygccxml[python_targets_python2_7(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~heroxbd/pyplusplus-1.0.0_p20131206.tar.xz
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5dde05ca2c6d226d0a6ac93a6ec13523
diff --git a/metadata/md5-cache/dev-python/pyplusplus-9999 b/metadata/md5-cache/dev-python/pyplusplus-9999
index 3f03b22e6936..73d19857169e 100644
--- a/metadata/md5-cache/dev-python/pyplusplus-9999
+++ b/metadata/md5-cache/dev-python/pyplusplus-9999
@@ -8,5 +8,5 @@ LICENSE=freedist Boost-1.0
 RDEPEND=dev-python/pygccxml[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	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	subversion	3d1eb4b41d7190570a84f786958ebb13	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	subversion	3d1eb4b41d7190570a84f786958ebb13	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b2b1a71065a90021fbb5761be1c5fe14
diff --git a/metadata/md5-cache/dev-python/pypng-0.0.18 b/metadata/md5-cache/dev-python/pypng-0.0.18
index 1720a5aae381..156521cde0b7 100644
--- a/metadata/md5-cache/dev-python/pypng-0.0.18
+++ b/metadata/md5-cache/dev-python/pypng-0.0.18
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pypng/pypng-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=64c57f166ba0424a1c5c7a320d92fe8a
diff --git a/metadata/md5-cache/dev-python/pypowervm-1.1.10 b/metadata/md5-cache/dev-python/pypowervm-1.1.10
index cc5f419f6791..544e6f205fb9 100644
--- a/metadata/md5-cache/dev-python/pypowervm-1.1.10
+++ b/metadata/md5-cache/dev-python/pypowervm-1.1.10
@@ -10,5 +10,5 @@ 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
 SRC_URI=mirror://pypi/p/pypowervm/pypowervm-1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dedec866e2dcd7f80979411ca8f9890f
diff --git a/metadata/md5-cache/dev-python/pypowervm-1.1.16 b/metadata/md5-cache/dev-python/pypowervm-1.1.16
index 4ef8f080074b..89b935e0b957 100644
--- a/metadata/md5-cache/dev-python/pypowervm-1.1.16
+++ b/metadata/md5-cache/dev-python/pypowervm-1.1.16
@@ -10,5 +10,5 @@ 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
 SRC_URI=mirror://pypi/p/pypowervm/pypowervm-1.1.16.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=52dc80ee85a39012a46108d5b743bf27
diff --git a/metadata/md5-cache/dev-python/pypowervm-1.1.6 b/metadata/md5-cache/dev-python/pypowervm-1.1.6
index 89bd8d28a64d..aa733ce07142 100644
--- a/metadata/md5-cache/dev-python/pypowervm-1.1.6
+++ b/metadata/md5-cache/dev-python/pypowervm-1.1.6
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pypowervm/pypowervm-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3817a6a71e7e818a4cb7eccffcac7afb
diff --git a/metadata/md5-cache/dev-python/pyprof2calltree-1.4.0 b/metadata/md5-cache/dev-python/pyprof2calltree-1.4.0
index 31edba41f660..71f9247a92d2 100644
--- a/metadata/md5-cache/dev-python/pyprof2calltree-1.4.0
+++ b/metadata/md5-cache/dev-python/pyprof2calltree-1.4.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/pwaller/pyprof2calltree/archive/v1.4.0.tar.gz -> pyprof2calltree-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5248d63a363837e1e7a266f8abb61040
diff --git a/metadata/md5-cache/dev-python/pyproj-1.9.5.1 b/metadata/md5-cache/dev-python/pyproj-1.9.5.1
index 18dfb4aac69c..b0a24748aa6b 100644
--- a/metadata/md5-cache/dev-python/pyproj-1.9.5.1
+++ b/metadata/md5-cache/dev-python/pyproj-1.9.5.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyproj/pyproj-1.9.5.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=00b4ad1b01c73f1dad479601eef5dd8d
diff --git a/metadata/md5-cache/dev-python/pyproj-1.9.5.1-r1 b/metadata/md5-cache/dev-python/pyproj-1.9.5.1-r1
index 5ae4e0e05495..a7e7c8d81f29 100644
--- a/metadata/md5-cache/dev-python/pyproj-1.9.5.1-r1
+++ b/metadata/md5-cache/dev-python/pyproj-1.9.5.1-r1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyproj/pyproj-1.9.5.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1d85ba52564b16273e414457767be53e
diff --git a/metadata/md5-cache/dev-python/pyprotocols-1.0_pre2306-r1 b/metadata/md5-cache/dev-python/pyprotocols-1.0_pre2306-r1
index a0f9a68b0e5d..50e9a9e38fed 100644
--- a/metadata/md5-cache/dev-python/pyprotocols-1.0_pre2306-r1
+++ b/metadata/md5-cache/dev-python/pyprotocols-1.0_pre2306-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/decoratortools-1.4[python_targets_python2_7(-)?,-python_sin
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gentoo/PyProtocols-1.0a0dev_r2306.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7ceb388caffaf1b54cc9fd2633032058
diff --git a/metadata/md5-cache/dev-python/pyptlib-0.0.6 b/metadata/md5-cache/dev-python/pyptlib-0.0.6
index 4d142757f43f..54fcf440b437 100644
--- a/metadata/md5-cache/dev-python/pyptlib-0.0.6
+++ b/metadata/md5-cache/dev-python/pyptlib-0.0.6
@@ -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=mirror://pypi/p/pyptlib/pyptlib-0.0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=079ad15efee7f2922dad3f3c1873b7bf
diff --git a/metadata/md5-cache/dev-python/pypy-bin-6.0.0-r100 b/metadata/md5-cache/dev-python/pypy-bin-6.0.0-r100
new file mode 100644
index 000000000000..dfb214fba025
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy-bin-6.0.0-r100
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/7 sys-devel/gcc:* sys-libs/glibc sys-libs/ncurses:0/6 sys-libs/zlib:0/1 gdbm? ( sys-libs/gdbm:0= ) !libressl? ( dev-libs/openssl:0/0[-bindist] ) libressl? ( dev-libs/libressl:0/44 ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy:0 app-arch/lzip app-arch/xz-utils
+DESCRIPTION=Pre-built version of PyPy
+EAPI=6
+HOMEPAGE=http://pypy.org/
+IUSE=gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/7 sys-devel/gcc:* sys-libs/glibc sys-libs/ncurses:0/6 sys-libs/zlib:0/1 gdbm? ( sys-libs/gdbm:0= ) !libressl? ( dev-libs/openssl:0/0[-bindist] ) libressl? ( dev-libs/libressl:0/44 ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy:0
+REQUIRED_USE=x86? ( !cpu_flags_x86_sse2? ( !jit ) )
+SLOT=0/41
+SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy2-v6.0.0-src.tar.bz2 https://dev.gentoo.org/~floppym/python-gentoo-patches-2.7.14-0.tar.xz amd64? ( !libressl? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0-ffi7/pypy-bin-6.0.0-ffi7-amd64+bzip2+jit+ncurses.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0-ffi7/pypy-bin-6.0.0-ffi7-amd64+bzip2+ncurses.tar.lz ) ) libressl? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0-ffi7/pypy-bin-6.0.0-ffi7-amd64+bzip2+jit+libressl+ncurses.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0-ffi7/pypy-bin-6.0.0-ffi7-amd64+bzip2+libressl+ncurses.tar.lz ) ) ) x86? ( !libressl? ( cpu_flags_x86_sse2? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0-ffi7/pypy-bin-6.0.0-ffi7-x86+bzip2+jit+ncurses+sse2.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0-ffi7/pypy-bin-6.0.0-ffi7-x86+bzip2+ncurses+sse2.tar.lz ) ) !cpu_flags_x86_sse2? ( !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0-ffi7/pypy-bin-6.0.0-ffi7-x86+bzip2+ncurses.tar.lz ) ) ) libressl? ( cpu_flags_x86_sse2? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0-ffi7/pypy-bin-6.0.0-ffi7-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0-ffi7/pypy-bin-6.0.0-ffi7-x86+bzip2+libressl+ncurses+sse2.tar.lz ) ) !cpu_flags_x86_sse2? ( !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0-ffi7/pypy-bin-6.0.0-ffi7-x86+bzip2+libressl+ncurses.tar.lz ) ) ) )
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=c9ea9d444751ff4d24574650b18a79b6
diff --git a/metadata/md5-cache/dev-python/pypy3-bin-6.0.0-r100 b/metadata/md5-cache/dev-python/pypy3-bin-6.0.0-r100
new file mode 100644
index 000000000000..50e7aa4bd789
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy3-bin-6.0.0-r100
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/7 sys-devel/gcc:* sys-libs/glibc sys-libs/ncurses:0/6 sys-libs/zlib:0/1 gdbm? ( sys-libs/gdbm:0= ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy3:0 app-arch/lzip app-arch/xz-utils test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy-5:0 ) )
+DESCRIPTION=A fast, compliant alternative implementation of Python 3.3 (binary package)
+EAPI=6
+HOMEPAGE=http://pypy.org/
+IUSE=gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/7 sys-devel/gcc:* sys-libs/glibc sys-libs/ncurses:0/6 sys-libs/zlib:0/1 gdbm? ( sys-libs/gdbm:0= ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy3:0
+REQUIRED_USE=x86? ( !cpu_flags_x86_sse2? ( !jit ) )
+SLOT=0/60
+SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy3-v6.0.0-src.tar.bz2 amd64? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/6.0.0-ffi7/pypy3-bin-6.0.0-ffi7-amd64+bzip2+jit+ncurses.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/6.0.0-ffi7/pypy3-bin-6.0.0-ffi7-amd64+bzip2+ncurses.tar.lz ) ) x86? ( cpu_flags_x86_sse2? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/6.0.0-ffi7/pypy3-bin-6.0.0-ffi7-x86+bzip2+jit+ncurses+sse2.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/6.0.0-ffi7/pypy3-bin-6.0.0-ffi7-x86+bzip2+ncurses+sse2.tar.lz ) ) !cpu_flags_x86_sse2? ( !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/6.0.0-ffi7/pypy3-bin-6.0.0-ffi7-x86+bzip2+ncurses.tar.lz ) ) )
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=0fa2d260da38619a2536995f06afe2c2
diff --git a/metadata/md5-cache/dev-python/pyqrcode-1.2.1 b/metadata/md5-cache/dev-python/pyqrcode-1.2.1
index 453b6e377146..71261f1d9045 100644
--- a/metadata/md5-cache/dev-python/pyqrcode-1.2.1
+++ b/metadata/md5-cache/dev-python/pyqrcode-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=png? ( dev-python/pypng[python_targets_python2_7(-)?,python_targets_pyth
 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/PyQRCode/PyQRCode-1.2.1.tar.gz -> pyqrcode-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4e7466c5d22be3d63796b3206be60ff2
diff --git a/metadata/md5-cache/dev-python/pyqt-distutils-0.3.0 b/metadata/md5-cache/dev-python/pyqt-distutils-0.3.0
index a22c950d98c7..3857409c192d 100644
--- a/metadata/md5-cache/dev-python/pyqt-distutils-0.3.0
+++ b/metadata/md5-cache/dev-python/pyqt-distutils-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyqt-distutils/pyqt-distutils-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a00dd11fe634934c945fba2da30b6d4f
diff --git a/metadata/md5-cache/dev-python/pyqtgraph-0.10.0-r1 b/metadata/md5-cache/dev-python/pyqtgraph-0.10.0-r1
index 5e61a211a645..9c43638c0a1b 100644
--- a/metadata/md5-cache/dev-python/pyqtgraph-0.10.0-r1
+++ b/metadata/md5-cache/dev-python/pyqtgraph-0.10.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://www.pyqtgraph.org/downloads/0.10.0/pyqtgraph-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=39e32f4c74869cefd6f72349e283d736
diff --git a/metadata/md5-cache/dev-python/pyquery-1.2.13 b/metadata/md5-cache/dev-python/pyquery-1.2.13
index 43903c8981af..a541f0c37841 100644
--- a/metadata/md5-cache/dev-python/pyquery-1.2.13
+++ b/metadata/md5-cache/dev-python/pyquery-1.2.13
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/lxml-2.1[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
 SRC_URI=mirror://pypi/p/pyquery/pyquery-1.2.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b4322ca0a5eefd653ccba3b4627eabb6
diff --git a/metadata/md5-cache/dev-python/pyramid-1.5.8 b/metadata/md5-cache/dev-python/pyramid-1.5.8
index acb90edd4c21..7f724b30c3e1 100644
--- a/metadata/md5-cache/dev-python/pyramid-1.5.8
+++ b/metadata/md5-cache/dev-python/pyramid-1.5.8
@@ -10,5 +10,5 @@ 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
 SRC_URI=mirror://pypi/p/pyramid/pyramid-1.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9bce1f117e524cc294e82ed6e31479cb
diff --git a/metadata/md5-cache/dev-python/pyrax-1.9.7 b/metadata/md5-cache/dev-python/pyrax-1.9.7
index 8a7594f8bc12..8ae5904f856b 100644
--- a/metadata/md5-cache/dev-python/pyrax-1.9.7
+++ b/metadata/md5-cache/dev-python/pyrax-1.9.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyrax/pyrax-1.9.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=cd49c0b28f0b7bd9bafcc316f43fabd5
diff --git a/metadata/md5-cache/dev-python/pyregion-1.1.4 b/metadata/md5-cache/dev-python/pyregion-1.1.4
index 19a8a485e3d0..c177c82ea9a9 100644
--- a/metadata/md5-cache/dev-python/pyregion-1.1.4
+++ b/metadata/md5-cache/dev-python/pyregion-1.1.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyregion/pyregion-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ad333abddba14236b85fef6d7f2aeadd
diff --git a/metadata/md5-cache/dev-python/pyregion-1.2 b/metadata/md5-cache/dev-python/pyregion-1.2
index 7cdbce9314bb..69e3a8ee2390 100644
--- a/metadata/md5-cache/dev-python/pyregion-1.2
+++ b/metadata/md5-cache/dev-python/pyregion-1.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyregion/pyregion-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e71730413143cc63c243e96b5803edae
diff --git a/metadata/md5-cache/dev-python/pyrex-0.9.9-r1 b/metadata/md5-cache/dev-python/pyrex-0.9.9-r1
index c4ed6a008fb1..44b59f1d9f9d 100644
--- a/metadata/md5-cache/dev-python/pyrex-0.9.9-r1
+++ b/metadata/md5-cache/dev-python/pyrex-0.9.9-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/Pyrex-0.9.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=921bbe989d78c7d5576740b3555aa19b
diff --git a/metadata/md5-cache/dev-python/pyrfc3339-1.0 b/metadata/md5-cache/dev-python/pyrfc3339-1.0
index e40a91adc54f..8f0413a64bed 100644
--- a/metadata/md5-cache/dev-python/pyrfc3339-1.0
+++ b/metadata/md5-cache/dev-python/pyrfc3339-1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyRFC3339/pyRFC3339-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=88368c41c6386f22e10deaa26e3e2b3d
diff --git a/metadata/md5-cache/dev-python/pyringe-1.0.2 b/metadata/md5-cache/dev-python/pyringe-1.0.2
index fb47552d891e..802c79d2409c 100644
--- a/metadata/md5-cache/dev-python/pyringe-1.0.2
+++ b/metadata/md5-cache/dev-python/pyringe-1.0.2
@@ -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=mirror://pypi/p/pyringe/pyringe-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2bd63b9ce3a059e7a4d96cc539b1b0f5
diff --git a/metadata/md5-cache/dev-python/pyro-3.16-r1 b/metadata/md5-cache/dev-python/pyro-3.16-r1
index 373631184650..e2437d3b7ae2 100644
--- a/metadata/md5-cache/dev-python/pyro-3.16-r1
+++ b/metadata/md5-cache/dev-python/pyro-3.16-r1
@@ -10,5 +10,5 @@ RDEPEND=!dev-python/pyro:0 python_targets_pypy? ( >=virtual/pypy-5:0= ) python_t
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=3
 SRC_URI=mirror://pypi/P/Pyro/Pyro-3.16.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=303013b8b170ac542637cf88e73cf4c8
diff --git a/metadata/md5-cache/dev-python/pyro-4.41 b/metadata/md5-cache/dev-python/pyro-4.41
index e228e7ced848..f12d89e93c53 100644
--- a/metadata/md5-cache/dev-python/pyro-4.41
+++ b/metadata/md5-cache/dev-python/pyro-4.41
@@ -10,5 +10,5 @@ RDEPEND=!dev-python/pyro:0 >=dev-python/serpent-1.11[python_targets_pypy(-)?,pyt
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=4
 SRC_URI=mirror://pypi/P/Pyro4/Pyro4-4.41.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b77207324b0c5c895d7c07c09d459aa5
diff --git a/metadata/md5-cache/dev-python/pyro-4.56 b/metadata/md5-cache/dev-python/pyro-4.56
index 94095d1cd72f..617b5cfb71ff 100644
--- a/metadata/md5-cache/dev-python/pyro-4.56
+++ b/metadata/md5-cache/dev-python/pyro-4.56
@@ -10,5 +10,5 @@ RDEPEND=!dev-python/pyro:0 python_targets_python2_7? ( dev-python/selectors34[py
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=4
 SRC_URI=mirror://pypi/P/Pyro4/Pyro4-4.56.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0d3739dbe6eded2941c713f0a05bd243
diff --git a/metadata/md5-cache/dev-python/pyroma-1.7 b/metadata/md5-cache/dev-python/pyroma-1.7
index 4efbe2d61f01..0eb88f9dcb10 100644
--- a/metadata/md5-cache/dev-python/pyroma-1.7
+++ b/metadata/md5-cache/dev-python/pyroma-1.7
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyroma/pyroma-1.7.zip
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=311554bddf649112fab9ff013e1fcf75
diff --git a/metadata/md5-cache/dev-python/pyroute2-0.4.12 b/metadata/md5-cache/dev-python/pyroute2-0.4.12
index 276929cd50bf..7e45d579a884 100644
--- a/metadata/md5-cache/dev-python/pyroute2-0.4.12
+++ b/metadata/md5-cache/dev-python/pyroute2-0.4.12
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/pyroute2/pyroute2-0.4.12.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fe28b8ffefc18993b99961b4ae777adf
diff --git a/metadata/md5-cache/dev-python/pyroute2-0.4.21 b/metadata/md5-cache/dev-python/pyroute2-0.4.21
index ebf81ac3811f..7574cdf10679 100644
--- a/metadata/md5-cache/dev-python/pyroute2-0.4.21
+++ b/metadata/md5-cache/dev-python/pyroute2-0.4.21
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/pyroute2/pyroute2-0.4.21.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fe28b8ffefc18993b99961b4ae777adf
diff --git a/metadata/md5-cache/dev-python/pyrqlite-2.0 b/metadata/md5-cache/dev-python/pyrqlite-2.0
index c86d9325676b..eda189c3e154 100644
--- a/metadata/md5-cache/dev-python/pyrqlite-2.0
+++ b/metadata/md5-cache/dev-python/pyrqlite-2.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/rqlite/pyrqlite/archive/v2.0.tar.gz -> pyrqlite-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2595f7e08ccf03824bb9cb23dd896b2f
diff --git a/metadata/md5-cache/dev-python/pyrqlite-9999 b/metadata/md5-cache/dev-python/pyrqlite-9999
index 9da0e5f18873..fc2fbb4f0620 100644
--- a/metadata/md5-cache/dev-python/pyrqlite-9999
+++ b/metadata/md5-cache/dev-python/pyrqlite-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b4631da9ee745e819ee34b3feedb0ecb
diff --git a/metadata/md5-cache/dev-python/pyrsistent-0.13.0 b/metadata/md5-cache/dev-python/pyrsistent-0.13.0
index 379e20b83c56..3adf1713da96 100644
--- a/metadata/md5-cache/dev-python/pyrsistent-0.13.0
+++ b/metadata/md5-cache/dev-python/pyrsistent-0.13.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_t
 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/pyrsistent/pyrsistent-0.13.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=298691243f6ccd58ebe5bd3b0a7e6a75
diff --git a/metadata/md5-cache/dev-python/pyrsistent-0.14.2 b/metadata/md5-cache/dev-python/pyrsistent-0.14.2
index 66536e2699e4..4f7f105e034d 100644
--- a/metadata/md5-cache/dev-python/pyrsistent-0.14.2
+++ b/metadata/md5-cache/dev-python/pyrsistent-0.14.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_t
 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/pyrsistent/pyrsistent-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7b6ab4449c08a1cf842aaaf5b58190fc
diff --git a/metadata/md5-cache/dev-python/pyrsistent-0.14.4 b/metadata/md5-cache/dev-python/pyrsistent-0.14.4
index 19d0ec2b75f0..622fadd3dbd0 100644
--- a/metadata/md5-cache/dev-python/pyrsistent-0.14.4
+++ b/metadata/md5-cache/dev-python/pyrsistent-0.14.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_t
 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/pyrsistent/pyrsistent-0.14.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c3dc16c17cd1eeb7a534647397575e2f
diff --git a/metadata/md5-cache/dev-python/pysaml2-4.0.2-r3 b/metadata/md5-cache/dev-python/pysaml2-4.0.2-r3
index af1815c0f99a..4c471877745a 100644
--- a/metadata/md5-cache/dev-python/pysaml2-4.0.2-r3
+++ b/metadata/md5-cache/dev-python/pysaml2-4.0.2-r3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3
 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/pysaml2/pysaml2-4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f2ac4dcbe8812ca225488975b2cf823d
diff --git a/metadata/md5-cache/dev-python/pysaml2-4.5.0 b/metadata/md5-cache/dev-python/pysaml2-4.5.0
index edf7fcae742e..a67165f5cbd4 100644
--- a/metadata/md5-cache/dev-python/pysaml2-4.5.0
+++ b/metadata/md5-cache/dev-python/pysaml2-4.5.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/requests-1.0.0[python_targets_python2_7(-)?,python_targets_
 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/pysaml2/pysaml2-4.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=38980bf6e3d1df2f3abb82af831f8956
diff --git a/metadata/md5-cache/dev-python/pyscaffold-2.4.4 b/metadata/md5-cache/dev-python/pyscaffold-2.4.4
index dd0652a65737..e8d0bdc5b107 100644
--- a/metadata/md5-cache/dev-python/pyscaffold-2.4.4
+++ b/metadata/md5-cache/dev-python/pyscaffold-2.4.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,pyth
 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/PyScaffold/pyscaffold-2.4.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6188a4533c6d9054e0032630b11e0517
diff --git a/metadata/md5-cache/dev-python/pysctp-0.6 b/metadata/md5-cache/dev-python/pysctp-0.6
index 4d6b76c171e8..d7ee6d4e57c0 100644
--- a/metadata/md5-cache/dev-python/pysctp-0.6
+++ b/metadata/md5-cache/dev-python/pysctp-0.6
@@ -10,5 +10,5 @@ RDEPEND=net-misc/lksctp-tools python_targets_python2_7? ( >=dev-lang/python-2.7.
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/philpraxis/pysctp/archive/v0.6.tar.gz -> pysctp-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7fccc77abd3d1eeba7d45b1ca09547a8
diff --git a/metadata/md5-cache/dev-python/pysendfile-2.0.1 b/metadata/md5-cache/dev-python/pysendfile-2.0.1
index 6fa026c62b26..4cadd325377a 100644
--- a/metadata/md5-cache/dev-python/pysendfile-2.0.1
+++ b/metadata/md5-cache/dev-python/pysendfile-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-python/pyserial-3.2.1 b/metadata/md5-cache/dev-python/pyserial-3.2.1
index 283302f128e7..ae7cdd7b012c 100644
--- a/metadata/md5-cache/dev-python/pyserial-3.2.1
+++ b/metadata/md5-cache/dev-python/pyserial-3.2.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/pyserial/pyserial-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b0707d8a1f55345f4f7408a09c5da924
diff --git a/metadata/md5-cache/dev-python/pyserial-3.4 b/metadata/md5-cache/dev-python/pyserial-3.4
index 1193e1f37138..0cf08333e153 100644
--- a/metadata/md5-cache/dev-python/pyserial-3.4
+++ b/metadata/md5-cache/dev-python/pyserial-3.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_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/p/pyserial/pyserial-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=750cd6fad70f269f5d879aab3dab2291
diff --git a/metadata/md5-cache/dev-python/pysha3-1.0.2-r1 b/metadata/md5-cache/dev-python/pysha3-1.0.2-r1
index 3c4cb47366c4..8d0efbe7faab 100644
--- a/metadata/md5-cache/dev-python/pysha3-1.0.2-r1
+++ b/metadata/md5-cache/dev-python/pysha3-1.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_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/p/pysha3/pysha3-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=06c662cee5b91b84ad4330e55d981caa
diff --git a/metadata/md5-cache/dev-python/pyshark-0.3.7.2 b/metadata/md5-cache/dev-python/pyshark-0.3.7.2
index 4f480803183c..b7dff84f82ad 100644
--- a/metadata/md5-cache/dev-python/pyshark-0.3.7.2
+++ b/metadata/md5-cache/dev-python/pyshark-0.3.7.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/KimiNewt/pyshark/archive/v0.3.7.2.tar.gz -> pyshark-0.3.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=91cedff9983c19e5926d987304f22862
diff --git a/metadata/md5-cache/dev-python/pysmi-0.1.3 b/metadata/md5-cache/dev-python/pysmi-0.1.3
index ffebd7278148..7fb3487a33c4 100644
--- a/metadata/md5-cache/dev-python/pysmi-0.1.3
+++ b/metadata/md5-cache/dev-python/pysmi-0.1.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysmi/pysmi-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2cd2a3abb21802c43b84a199930cbd66
diff --git a/metadata/md5-cache/dev-python/pysmi-0.3.1 b/metadata/md5-cache/dev-python/pysmi-0.3.1
index 65f9cac77c77..cc4a0ccd7ec6 100644
--- a/metadata/md5-cache/dev-python/pysmi-0.3.1
+++ b/metadata/md5-cache/dev-python/pysmi-0.3.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysmi/pysmi-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6b5a67a6167c350ef28b2a1621472b74
diff --git a/metadata/md5-cache/dev-python/pysnmp-4.4.4 b/metadata/md5-cache/dev-python/pysnmp-4.4.4
index 452556abc200..0432f59d1e84 100644
--- a/metadata/md5-cache/dev-python/pysnmp-4.4.4
+++ b/metadata/md5-cache/dev-python/pysnmp-4.4.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pyasn1-0.2.3[python_targets_python2_7(-)?,python_targets_py
 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/pysnmp/pysnmp-4.4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=467399f6ee859079c6399f40d06dfbdf
diff --git a/metadata/md5-cache/dev-python/pysnmp-4.4.5 b/metadata/md5-cache/dev-python/pysnmp-4.4.5
index 434465c0f2f3..c5ec4a6ca446 100644
--- a/metadata/md5-cache/dev-python/pysnmp-4.4.5
+++ b/metadata/md5-cache/dev-python/pysnmp-4.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pyasn1-0.2.3[python_targets_python2_7(-)?,python_targets_py
 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/pysnmp/pysnmp-4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5da4dccae3183af0abf7d82bc1a59c74
diff --git a/metadata/md5-cache/dev-python/pysnmp-4.4.6 b/metadata/md5-cache/dev-python/pysnmp-4.4.6
index eba30913717b..4d716438171c 100644
--- a/metadata/md5-cache/dev-python/pysnmp-4.4.6
+++ b/metadata/md5-cache/dev-python/pysnmp-4.4.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pyasn1-0.2.3[python_targets_python2_7(-)?,python_targets_py
 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/pysnmp/pysnmp-4.4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5da4dccae3183af0abf7d82bc1a59c74
diff --git a/metadata/md5-cache/dev-python/pysnmp-apps-0.5.2 b/metadata/md5-cache/dev-python/pysnmp-apps-0.5.2
index eac028817c54..40af0b32ba65 100644
--- a/metadata/md5-cache/dev-python/pysnmp-apps-0.5.2
+++ b/metadata/md5-cache/dev-python/pysnmp-apps-0.5.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pysnmp-4.2.2[python_targets_python2_7(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysnmp-apps/pysnmp-apps-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e994fff8be4af19ae83b70c36a3a5ba4
diff --git a/metadata/md5-cache/dev-python/pysnmp-apps-0.5.3 b/metadata/md5-cache/dev-python/pysnmp-apps-0.5.3
index 578987f639ee..34dcf74a1173 100644
--- a/metadata/md5-cache/dev-python/pysnmp-apps-0.5.3
+++ b/metadata/md5-cache/dev-python/pysnmp-apps-0.5.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pysnmp-4.2.2[python_targets_python2_7(-)?,python_targets_py
 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/pysnmp-apps/pysnmp-apps-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f1738768bd23ab1a7480fb2994ce0daa
diff --git a/metadata/md5-cache/dev-python/pysnmp-mibs-0.1.6 b/metadata/md5-cache/dev-python/pysnmp-mibs-0.1.6
index 05b4d3f063f6..cbb377f78e6b 100644
--- a/metadata/md5-cache/dev-python/pysnmp-mibs-0.1.6
+++ b/metadata/md5-cache/dev-python/pysnmp-mibs-0.1.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pysnmp-4.2.3[python_targets_python2_7(-)?,python_targets_py
 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/pysnmp-mibs/pysnmp-mibs-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0bf22e604b7344c0c00f4a1905cbfe95
diff --git a/metadata/md5-cache/dev-python/pysolr-3.3.2 b/metadata/md5-cache/dev-python/pysolr-3.3.2
index f79dbf9dfb93..0e331208af6c 100644
--- a/metadata/md5-cache/dev-python/pysolr-3.3.2
+++ b/metadata/md5-cache/dev-python/pysolr-3.3.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/requests[python_targets_pypy(-)?,python_targets_python2_7(-)?
 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/pysolr/pysolr-3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d3f7d9a30d829c781b35bb6528f66183
diff --git a/metadata/md5-cache/dev-python/pysolr-3.6.0 b/metadata/md5-cache/dev-python/pysolr-3.6.0
index 715bfa80ada1..dfa51b38da7c 100644
--- a/metadata/md5-cache/dev-python/pysolr-3.6.0
+++ b/metadata/md5-cache/dev-python/pysolr-3.6.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/requests[python_targets_pypy(-)?,python_targets_python2_7(-)?
 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/pysolr/pysolr-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5f960ef043302bcc326b7fa9980354e8
diff --git a/metadata/md5-cache/dev-python/pyspf-2.0.12 b/metadata/md5-cache/dev-python/pyspf-2.0.12
index 3ea5f69807e4..0456b52c37e5 100644
--- a/metadata/md5-cache/dev-python/pyspf-2.0.12
+++ b/metadata/md5-cache/dev-python/pyspf-2.0.12
@@ -10,5 +10,5 @@ RDEPEND=dev-python/authres[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=test? ( ipv6 ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyspf/pyspf-2.0.12t.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0587d237844c4658d7fb340625b6387d
diff --git a/metadata/md5-cache/dev-python/pysrt-1.1.1 b/metadata/md5-cache/dev-python/pysrt-1.1.1
index f73ffdebcae3..01de8b20e3fe 100644
--- a/metadata/md5-cache/dev-python/pysrt-1.1.1
+++ b/metadata/md5-cache/dev-python/pysrt-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/chardet[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://pypi.python.org/packages/f6/33/16ad65a8973cb8bcb494af09ee1b9ab5ffdd6ff300bce5d3ac7d3cb1f2cc/pysrt-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=19cd8871ea3d129ac25e4635cde31f90
diff --git a/metadata/md5-cache/dev-python/pystache-0.5.4 b/metadata/md5-cache/dev-python/pystache-0.5.4
index ecfa717fc69c..eae52c8c580b 100644
--- a/metadata/md5-cache/dev-python/pystache-0.5.4
+++ b/metadata/md5-cache/dev-python/pystache-0.5.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/pystache/pystache-0.5.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c492cfe2a553cb1000b559b9c8ef4c9d
diff --git a/metadata/md5-cache/dev-python/pystatgrab-0.7 b/metadata/md5-cache/dev-python/pystatgrab-0.7
index 88a676d9fd24..dfc58ef850ab 100644
--- a/metadata/md5-cache/dev-python/pystatgrab-0.7
+++ b/metadata/md5-cache/dev-python/pystatgrab-0.7
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/libstatgrab-0.91 python_targets_python2_7? ( >=dev-lang/pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://www.mirrorservice.org/sites/ftp.i-scream.org/pub/i-scream/pystatgrab/pystatgrab-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=65c40c91a5d9129f9388c63c40e1e1ff
diff --git a/metadata/md5-cache/dev-python/pystdf-1.3.1-r1 b/metadata/md5-cache/dev-python/pystdf-1.3.1-r1
index e529bb9760c8..d4bbeee3df8e 100644
--- a/metadata/md5-cache/dev-python/pystdf-1.3.1-r1
+++ b/metadata/md5-cache/dev-python/pystdf-1.3.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://pystdf.googlecode.com/files/pystdf-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=c00e5f65dc85afc4ac51a01ccdf0429e
diff --git a/metadata/md5-cache/dev-python/pysvg-0.2.2 b/metadata/md5-cache/dev-python/pysvg-0.2.2
index c6c07ce5859b..58570757f0e4 100644
--- a/metadata/md5-cache/dev-python/pysvg-0.2.2
+++ b/metadata/md5-cache/dev-python/pysvg-0.2.2
@@ -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=mirror://pypi/p/pysvg/pysvg-0.2.2.zip
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e91c959868576083d3efd56730830dcc
diff --git a/metadata/md5-cache/dev-python/pysvn-1.8.0 b/metadata/md5-cache/dev-python/pysvn-1.8.0
index 9c642d94e8cd..7793355b3087 100644
--- a/metadata/md5-cache/dev-python/pysvn-1.8.0
+++ b/metadata/md5-cache/dev-python/pysvn-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pycxx-6.2.6[python_targets_python2_7(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://pysvn.barrys-emacs.org/source_kits/pysvn-1.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a3c8ec4576a379ff6d6cc4cee629045c
diff --git a/metadata/md5-cache/dev-python/pyswisseph-2.00.00_p2 b/metadata/md5-cache/dev-python/pyswisseph-2.00.00_p2
index 2712db1692ca..ba14ac3f8dbe 100644
--- a/metadata/md5-cache/dev-python/pyswisseph-2.00.00_p2
+++ b/metadata/md5-cache/dev-python/pyswisseph-2.00.00_p2
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyswisseph/pyswisseph-2.00.00-2.tar.bz2
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a404dcbde1d40a78cc7654997d4904c9
diff --git a/metadata/md5-cache/dev-python/pyswisseph-2.05.01_pre20160529 b/metadata/md5-cache/dev-python/pyswisseph-2.05.01_pre20160529
index 344538411b80..f5453171bc8c 100644
--- a/metadata/md5-cache/dev-python/pyswisseph-2.05.01_pre20160529
+++ b/metadata/md5-cache/dev-python/pyswisseph-2.05.01_pre20160529
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/astrorigin/pyswisseph/archive/4f76befee7e39dff96b4c068cc6ce5fa66fb021c.tar.gz -> pyswisseph-2.05.01_pre20160529.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=385aff40de6232cce3df464cea93eeca
diff --git a/metadata/md5-cache/dev-python/pytables-3.3.0 b/metadata/md5-cache/dev-python/pytables-3.3.0
index 27cf3239f5db..a826b604841d 100644
--- a/metadata/md5-cache/dev-python/pytables-3.3.0
+++ b/metadata/md5-cache/dev-python/pytables-3.3.0
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2:0= app-arch/lz4:0= >=app-arch/zstd-1.0.0 >=dev-libs/c-blo
 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/tables/tables-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9dba4c3d32b1b49cf332391841ab80f4
diff --git a/metadata/md5-cache/dev-python/pytables-3.4.2 b/metadata/md5-cache/dev-python/pytables-3.4.2
index 3987bd367839..3860f5519960 100644
--- a/metadata/md5-cache/dev-python/pytables-3.4.2
+++ b/metadata/md5-cache/dev-python/pytables-3.4.2
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2:0= app-arch/lz4:0= >=app-arch/zstd-1.0.0 >=dev-libs/c-blo
 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/tables/tables-3.4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=474a32dcc883426a1005762148838d99
diff --git a/metadata/md5-cache/dev-python/pyte-0.5.2-r1 b/metadata/md5-cache/dev-python/pyte-0.5.2-r1
index 359506b8a93f..872d9a58161a 100644
--- a/metadata/md5-cache/dev-python/pyte-0.5.2-r1
+++ b/metadata/md5-cache/dev-python/pyte-0.5.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/wcwidth[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyte/pyte-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=56c38f3048c0c2939d855380737bd105
diff --git a/metadata/md5-cache/dev-python/pyte-0.5.2-r2 b/metadata/md5-cache/dev-python/pyte-0.5.2-r2
index dfcb5411088f..f3b764e42eaa 100644
--- a/metadata/md5-cache/dev-python/pyte-0.5.2-r2
+++ b/metadata/md5-cache/dev-python/pyte-0.5.2-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/wcwidth[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyte/pyte-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=dd3257130009330527ddca1b2aeeb7df
diff --git a/metadata/md5-cache/dev-python/pyte-0.8.0 b/metadata/md5-cache/dev-python/pyte-0.8.0
index 3cae84283585..ffa20c7fd083 100644
--- a/metadata/md5-cache/dev-python/pyte-0.8.0
+++ b/metadata/md5-cache/dev-python/pyte-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/wcwidth[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyte/pyte-0.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=16c44912b6d37407a159d9ce1acd36b1
diff --git a/metadata/md5-cache/dev-python/pytest-3.0.3 b/metadata/md5-cache/dev-python/pytest-3.0.3
deleted file mode 100644
index 4ae595b9027c..000000000000
--- a/metadata/md5-cache/dev-python/pytest-3.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/py-1.4.29[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-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(-)] doc? ( dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( >=dev-python/hypothesis-3.5.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(-)] >dev-python/pytest-xdist-1.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/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(-)] 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/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(-)] ) 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=Simple powerful testing with Python
-EAPI=5
-HOMEPAGE=http://pytest.org/ https://pypi.org/project/pytest/
-IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=MIT
-RDEPEND=>=dev-python/py-1.4.29[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-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(-)] doc? ( dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) !<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 ) >=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/pytest-3.0.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=ee8d202cd13670e008865af0722c0b0b
diff --git a/metadata/md5-cache/dev-python/pytest-3.2.2 b/metadata/md5-cache/dev-python/pytest-3.2.2
index 9b09d7b5d3e1..5493c93fcd49 100644
--- a/metadata/md5-cache/dev-python/pytest-3.2.2
+++ b/metadata/md5-cache/dev-python/pytest-3.2.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/py-1.4.33[python_targets_pypy(-)?,python_targets_pypy3(-)?,
 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/pytest-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4c8ea0b68de925df2ccf05caca281f7b
diff --git a/metadata/md5-cache/dev-python/pytest-3.4.1-r1 b/metadata/md5-cache/dev-python/pytest-3.4.1-r1
deleted file mode 100644
index ccc1b5af0a51..000000000000
--- a/metadata/md5-cache/dev-python/pytest-3.4.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=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_single_target_pypy(-),-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/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_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/py-1.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_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) 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_single_target_pypy(-),-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/hypothesis-3.5.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(-)] >dev-python/pytest-xdist-1.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/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(-)] 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/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(-)] ) 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=Simple powerful testing with Python
-EAPI=6
-HOMEPAGE=http://pytest.org/
-IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=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_single_target_pypy(-),-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/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_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/py-1.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_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) !<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 ) >=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/pytest-3.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=6e68c707f27e16091b698df1108bc034
diff --git a/metadata/md5-cache/dev-python/pytest-3.4.2 b/metadata/md5-cache/dev-python/pytest-3.4.2
index cd400f6ab6e8..f81c6addb311 100644
--- a/metadata/md5-cache/dev-python/pytest-3.4.2
+++ b/metadata/md5-cache/dev-python/pytest-3.4.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/attrs-17.2.0[python_targets_pypy(-)?,python_targets_pypy3(-
 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/pytest-3.4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3571010ad25d9c72d1e58dba4e4f0bb9
diff --git a/metadata/md5-cache/dev-python/pytest-3.6.3 b/metadata/md5-cache/dev-python/pytest-3.6.3
index ac28abe27c40..39018acf894f 100644
--- a/metadata/md5-cache/dev-python/pytest-3.6.3
+++ b/metadata/md5-cache/dev-python/pytest-3.6.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/atomicwrites-1.0[python_targets_pypy(-)?,python_targets_pyp
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-python/pytest-3.8.0 b/metadata/md5-cache/dev-python/pytest-3.8.0
deleted file mode 100644
index 82405a5f6581..000000000000
--- a/metadata/md5-cache/dev-python/pytest-3.8.0
+++ /dev/null
@@ -1,15 +0,0 @@
-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/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(-)] 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(-)] test? ( >=dev-python/hypothesis-3.56[python_targets_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-1.22.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_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/requests[python_targets_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/flaky !!dev-python/pytest-capturelog )
-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
-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(-)] !<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.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_=781c479a6d6b36dad30cc8ab950b5b24
diff --git a/metadata/md5-cache/dev-python/pytest-3.8.2 b/metadata/md5-cache/dev-python/pytest-3.8.2
new file mode 100644
index 000000000000..82bdd8cdb094
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-3.8.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/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(-)] 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(-)] test? ( >=dev-python/hypothesis-3.56[python_targets_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-1.22.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_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/requests[python_targets_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/flaky !!dev-python/pytest-capturelog )
+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
+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
diff --git a/metadata/md5-cache/dev-python/pytest-aiohttp-0.1.3 b/metadata/md5-cache/dev-python/pytest-aiohttp-0.1.3
index 15c17012c499..c6762e8d61bc 100644
--- a/metadata/md5-cache/dev-python/pytest-aiohttp-0.1.3
+++ b/metadata/md5-cache/dev-python/pytest-aiohttp-0.1.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-aiohttp/pytest-aiohttp-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=92ef3193f43ca8b5048b528a9c42c705
diff --git a/metadata/md5-cache/dev-python/pytest-aiohttp-0.3.0 b/metadata/md5-cache/dev-python/pytest-aiohttp-0.3.0
index 52320b7adc8f..7ace6e3a4c40 100644
--- a/metadata/md5-cache/dev-python/pytest-aiohttp-0.3.0
+++ b/metadata/md5-cache/dev-python/pytest-aiohttp-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-aiohttp/pytest-aiohttp-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=957a43c5f28b94bbe5b1a44d38015d3d
diff --git a/metadata/md5-cache/dev-python/pytest-arraydiff-0.1 b/metadata/md5-cache/dev-python/pytest-arraydiff-0.1
index 02f052466dc9..da484eb27f73 100644
--- a/metadata/md5-cache/dev-python/pytest-arraydiff-0.1
+++ b/metadata/md5-cache/dev-python/pytest-arraydiff-0.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-arraydiff/pytest-arraydiff-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4962abc21a83f06d49d022649a38ea67
diff --git a/metadata/md5-cache/dev-python/pytest-cache-1.0-r1 b/metadata/md5-cache/dev-python/pytest-cache-1.0-r1
index bcbd499c13a4..021b72f8132f 100644
--- a/metadata/md5-cache/dev-python/pytest-cache-1.0-r1
+++ b/metadata/md5-cache/dev-python/pytest-cache-1.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-cache/pytest-cache-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=09c47e48f058bc3184ed8379c94b1fdc
diff --git a/metadata/md5-cache/dev-python/pytest-capturelog-0.7 b/metadata/md5-cache/dev-python/pytest-capturelog-0.7
index 5c2fe4b94859..59b4798e118b 100644
--- a/metadata/md5-cache/dev-python/pytest-capturelog-0.7
+++ b/metadata/md5-cache/dev-python/pytest-capturelog-0.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-capturelog/pytest-capturelog-0.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=bbe5d3c1f66fb62020c7a43c67300367
diff --git a/metadata/md5-cache/dev-python/pytest-catchlog-1.2.2 b/metadata/md5-cache/dev-python/pytest-catchlog-1.2.2
index a7604eb4d519..594dff700d61 100644
--- a/metadata/md5-cache/dev-python/pytest-catchlog-1.2.2
+++ b/metadata/md5-cache/dev-python/pytest-catchlog-1.2.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/py-1.1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,p
 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-catchlog/pytest-catchlog-1.2.2.zip
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=aa2a9efefb25c7cc3e7af647409385e0
diff --git a/metadata/md5-cache/dev-python/pytest-cov-2.3.1 b/metadata/md5-cache/dev-python/pytest-cov-2.3.1
index 9cf849317cd7..b7111dbbc67b 100644
--- a/metadata/md5-cache/dev-python/pytest-cov-2.3.1
+++ b/metadata/md5-cache/dev-python/pytest-cov-2.3.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/py-1.4.22[python_targets_pypy(-)?,python_targets_pypy3(-)?,
 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-cov/pytest-cov-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=42b445ce1b1a581ed869fe413d5c0511
diff --git a/metadata/md5-cache/dev-python/pytest-cov-2.5.1 b/metadata/md5-cache/dev-python/pytest-cov-2.5.1
index 7e036e5c2bc7..183c617840fa 100644
--- a/metadata/md5-cache/dev-python/pytest-cov-2.5.1
+++ b/metadata/md5-cache/dev-python/pytest-cov-2.5.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/py-1.4.22[python_targets_pypy(-)?,python_targets_pypy3(-)?,
 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-cov/pytest-cov-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2be24e9d80a954441ac5c611cdbfd77a
diff --git a/metadata/md5-cache/dev-python/pytest-cov-2.5.1-r1 b/metadata/md5-cache/dev-python/pytest-cov-2.5.1-r1
index 422e4b6e3d52..1012768a4341 100644
--- a/metadata/md5-cache/dev-python/pytest-cov-2.5.1-r1
+++ b/metadata/md5-cache/dev-python/pytest-cov-2.5.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/py-1.4.22[python_targets_pypy(-)?,python_targets_pypy3(-)?,
 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-cov/pytest-cov-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fd23b5c55de6fea3bb7f61418f4d3c0b
diff --git a/metadata/md5-cache/dev-python/pytest-cython-0.1.0 b/metadata/md5-cache/dev-python/pytest-cython-0.1.0
index 7c6f7d9cc572..4344c6faf7de 100644
--- a/metadata/md5-cache/dev-python/pytest-cython-0.1.0
+++ b/metadata/md5-cache/dev-python/pytest-cython-0.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-cython/pytest-cython-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8311a5351befa2ed9895f038c1a49b0a
diff --git a/metadata/md5-cache/dev-python/pytest-django-2.9.1 b/metadata/md5-cache/dev-python/pytest-django-2.9.1
index 92fc15a5403b..9a22de99085d 100644
--- a/metadata/md5-cache/dev-python/pytest-django-2.9.1
+++ b/metadata/md5-cache/dev-python/pytest-django-2.9.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-django/pytest-django-2.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7ca4da4f5b5196a43e75f4751f920c81
diff --git a/metadata/md5-cache/dev-python/pytest-expect-1.1.0 b/metadata/md5-cache/dev-python/pytest-expect-1.1.0
index 89fdef30869c..99661a761bbd 100644
--- a/metadata/md5-cache/dev-python/pytest-expect-1.1.0
+++ b/metadata/md5-cache/dev-python/pytest-expect-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,pytho
 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-expect/pytest-expect-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ac6efa1a8398dda63f4821a23b9a6d0d
diff --git a/metadata/md5-cache/dev-python/pytest-fixture-config-1.2.11 b/metadata/md5-cache/dev-python/pytest-fixture-config-1.2.11
index ffbd6955bcf0..fcf863600190 100644
--- a/metadata/md5-cache/dev-python/pytest-fixture-config-1.2.11
+++ b/metadata/md5-cache/dev-python/pytest-fixture-config-1.2.11
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,pytho
 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-fixture-config/pytest-fixture-config-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=99fcf68c1d372fc2d9dd9a45207632bb
diff --git a/metadata/md5-cache/dev-python/pytest-fixture-config-1.2.2 b/metadata/md5-cache/dev-python/pytest-fixture-config-1.2.2
index e0c47cb8bc72..732d0f2d9f63 100644
--- a/metadata/md5-cache/dev-python/pytest-fixture-config-1.2.2
+++ b/metadata/md5-cache/dev-python/pytest-fixture-config-1.2.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-fixture-config/pytest-fixture-config-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=63952d9cc0b397f3634fe39a1e462b2b
diff --git a/metadata/md5-cache/dev-python/pytest-flake8-0.8.1 b/metadata/md5-cache/dev-python/pytest-flake8-0.8.1
index 60c63ffae82d..ce1ae2b243c3 100644
--- a/metadata/md5-cache/dev-python/pytest-flake8-0.8.1
+++ b/metadata/md5-cache/dev-python/pytest-flake8-0.8.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/flake8-3.3.0[python_targets_python2_7(-)?,python_targets_py
 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/pytest-flake8/pytest-flake8-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c46dc9bb30548e0a8fcf2321087ea790
diff --git a/metadata/md5-cache/dev-python/pytest-flake8-0.9.1 b/metadata/md5-cache/dev-python/pytest-flake8-0.9.1
index 226468d77d90..82b16294ffa8 100644
--- a/metadata/md5-cache/dev-python/pytest-flake8-0.9.1
+++ b/metadata/md5-cache/dev-python/pytest-flake8-0.9.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/flake8-3.3.0[python_targets_python2_7(-)?,python_targets_py
 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/pytest-flake8/pytest-flake8-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7c8831b47fd6e5cf79a5ee8dde6e78fe
diff --git a/metadata/md5-cache/dev-python/pytest-forked-0.2 b/metadata/md5-cache/dev-python/pytest-forked-0.2
index a82800d2918f..8dc99a396d02 100644
--- a/metadata/md5-cache/dev-python/pytest-forked-0.2
+++ b/metadata/md5-cache/dev-python/pytest-forked-0.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pytest-2.6.0[python_targets_pypy(-)?,python_targets_pypy3(-
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-python/pytest-html-1.10.1 b/metadata/md5-cache/dev-python/pytest-html-1.10.1
index b35b11440e60..4ab03a9992f9 100644
--- a/metadata/md5-cache/dev-python/pytest-html-1.10.1
+++ b/metadata/md5-cache/dev-python/pytest-html-1.10.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-html/pytest-html-1.10.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=910ac9ab5a25b7af80238ec9e30a60f7
diff --git a/metadata/md5-cache/dev-python/pytest-html-1.14.2 b/metadata/md5-cache/dev-python/pytest-html-1.14.2
index d16cd9f69551..734e655a653e 100644
--- a/metadata/md5-cache/dev-python/pytest-html-1.14.2
+++ b/metadata/md5-cache/dev-python/pytest-html-1.14.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-html/pytest-html-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=46dc45afef099a5fc281344d3ca90fa0
diff --git a/metadata/md5-cache/dev-python/pytest-html-1.16.0 b/metadata/md5-cache/dev-python/pytest-html-1.16.0
index 8f02dbfffba0..fe6bbec47f72 100644
--- a/metadata/md5-cache/dev-python/pytest-html-1.16.0
+++ b/metadata/md5-cache/dev-python/pytest-html-1.16.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-html/pytest-html-1.16.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=46dc45afef099a5fc281344d3ca90fa0
diff --git a/metadata/md5-cache/dev-python/pytest-httpbin-0.2.3 b/metadata/md5-cache/dev-python/pytest-httpbin-0.2.3
index 48747cb1896a..cfa62e09a7a5 100644
--- a/metadata/md5-cache/dev-python/pytest-httpbin-0.2.3
+++ b/metadata/md5-cache/dev-python/pytest-httpbin-0.2.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-httpbin/pytest-httpbin-0.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=fd26855dad0f67018aa6b78c068c962f
diff --git a/metadata/md5-cache/dev-python/pytest-isort-0.1.0 b/metadata/md5-cache/dev-python/pytest-isort-0.1.0
index 70803864114f..53b68e83692f 100644
--- a/metadata/md5-cache/dev-python/pytest-isort-0.1.0
+++ b/metadata/md5-cache/dev-python/pytest-isort-0.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/isort-3.9.6[python_targets_python2_7(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-isort/pytest-isort-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f6dc81817c901f5b1ccd1266ee8f58ae
diff --git a/metadata/md5-cache/dev-python/pytest-localserver-0.3.7 b/metadata/md5-cache/dev-python/pytest-localserver-0.3.7
index ecbe6ad10f5f..b1143ee757ed 100644
--- a/metadata/md5-cache/dev-python/pytest-localserver-0.3.7
+++ b/metadata/md5-cache/dev-python/pytest-localserver-0.3.7
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/werkzeug-0.10[python_targets_pypy(-)?,python_targets_python
 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/pytest-localserver/pytest-localserver-0.3.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=059394ca54b473d4d3c32521b99e5414
diff --git a/metadata/md5-cache/dev-python/pytest-metadata-1.3.0 b/metadata/md5-cache/dev-python/pytest-metadata-1.3.0
index fdf362144369..15129aa732fe 100644
--- a/metadata/md5-cache/dev-python/pytest-metadata-1.3.0
+++ b/metadata/md5-cache/dev-python/pytest-metadata-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pytest-2.9.0[python_targets_pypy(-)?,python_targets_pypy3(-
 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-metadata/pytest-metadata-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=eb5975ded7343e255276a48b6516d3ec
diff --git a/metadata/md5-cache/dev-python/pytest-metadata-1.7.0 b/metadata/md5-cache/dev-python/pytest-metadata-1.7.0
index 02360e74214b..ac700f3e47f7 100644
--- a/metadata/md5-cache/dev-python/pytest-metadata-1.7.0
+++ b/metadata/md5-cache/dev-python/pytest-metadata-1.7.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pytest-2.9.0[python_targets_pypy(-)?,python_targets_pypy3(-
 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-metadata/pytest-metadata-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1d1c76a2584c646ec768785688b8c77e
diff --git a/metadata/md5-cache/dev-python/pytest-mock-1.10.0 b/metadata/md5-cache/dev-python/pytest-mock-1.10.0
index 89a98a3b283e..1fb1cb200fef 100644
--- a/metadata/md5-cache/dev-python/pytest-mock-1.10.0
+++ b/metadata/md5-cache/dev-python/pytest-mock-1.10.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,pytho
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-mock/pytest-mock-1.10.0.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a993882749546f862008a103101c0e09
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 13b7512904b7..addf6b5a45fc 100644
--- a/metadata/md5-cache/dev-python/pytest-mock-1.6.0
+++ b/metadata/md5-cache/dev-python/pytest-mock-1.6.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,pytho
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-python/pytest-mock-1.6.3 b/metadata/md5-cache/dev-python/pytest-mock-1.6.3
index ad50d1f37602..7cca26e43c90 100644
--- a/metadata/md5-cache/dev-python/pytest-mock-1.6.3
+++ b/metadata/md5-cache/dev-python/pytest-mock-1.6.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,pytho
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-mock/pytest-mock-1.6.3.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=883f41068c85ccf9b35af0c76b269fa4
diff --git a/metadata/md5-cache/dev-python/pytest-mpl-0.8 b/metadata/md5-cache/dev-python/pytest-mpl-0.8
index c0c60d206ea6..f5f916bd05f3 100644
--- a/metadata/md5-cache/dev-python/pytest-mpl-0.8
+++ b/metadata/md5-cache/dev-python/pytest-mpl-0.8
@@ -10,5 +10,5 @@ RDEPEND=dev-python/matplotlib[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
 SRC_URI=mirror://pypi/p/pytest-mpl/pytest-mpl-0.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9c9a4ee84358cd77e6ff87026f480eb6
diff --git a/metadata/md5-cache/dev-python/pytest-pep8-1.0.6 b/metadata/md5-cache/dev-python/pytest-pep8-1.0.6
index 4379203b0aa7..bc09451d9c4f 100644
--- a/metadata/md5-cache/dev-python/pytest-pep8-1.0.6
+++ b/metadata/md5-cache/dev-python/pytest-pep8-1.0.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,p
 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-pep8/pytest-pep8-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=77454e166f41625f40febeba48dc3686
diff --git a/metadata/md5-cache/dev-python/pytest-pylint-0.7.1 b/metadata/md5-cache/dev-python/pytest-pylint-0.7.1
index 0f6e1058f0a6..dba3fa50affa 100644
--- a/metadata/md5-cache/dev-python/pytest-pylint-0.7.1
+++ b/metadata/md5-cache/dev-python/pytest-pylint-0.7.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/carsongee/pytest-pylint/archive/v0.7.1.tar.gz -> pytest-pylint-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3a74381424a93789c05302c9d8042b9b
diff --git a/metadata/md5-cache/dev-python/pytest-pythonpath-0.7.1 b/metadata/md5-cache/dev-python/pytest-pythonpath-0.7.1
index 0e68f30188f2..fff53c57d853 100644
--- a/metadata/md5-cache/dev-python/pytest-pythonpath-0.7.1
+++ b/metadata/md5-cache/dev-python/pytest-pythonpath-0.7.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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-pythonpath/pytest-pythonpath-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=95b9c23dbd960bebb8b73f8e8c790e3b
diff --git a/metadata/md5-cache/dev-python/pytest-qt-2.3.0-r2 b/metadata/md5-cache/dev-python/pytest-qt-2.3.0-r2
index 3f8096224172..4c04b2e99daa 100644
--- a/metadata/md5-cache/dev-python/pytest-qt-2.3.0-r2
+++ b/metadata/md5-cache/dev-python/pytest-qt-2.3.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-qt/pytest-qt-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b1190bf5923cb77b4bf802c9d1fadba8
diff --git a/metadata/md5-cache/dev-python/pytest-raisesregexp-2.1 b/metadata/md5-cache/dev-python/pytest-raisesregexp-2.1
index 0d4ee8b5034d..192901023ad9 100644
--- a/metadata/md5-cache/dev-python/pytest-raisesregexp-2.1
+++ b/metadata/md5-cache/dev-python/pytest-raisesregexp-2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pytest[python_targets_python3_4(-)?,python_targets_python3_5(
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/kissgyorgy/pytest-raisesregexp/archive/v2.1.tar.gz -> pytest-raisesregexp-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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=87f21b7fb1c4ad6f4a6f1c1b688ab8bf
diff --git a/metadata/md5-cache/dev-python/pytest-relaxed-1.1.0 b/metadata/md5-cache/dev-python/pytest-relaxed-1.1.0
index 7e786787b700..64f391260273 100644
--- a/metadata/md5-cache/dev-python/pytest-relaxed-1.1.0
+++ b/metadata/md5-cache/dev-python/pytest-relaxed-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-relaxed/pytest-relaxed-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=db0e3df191e671d60a74555129297a6e
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 c6151e7b2c92..a18c67d79834 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_=4d898bc643d3e77cf1e9bd235843decc
+_md5_=6c0fc3a15fbf9847a00cdbd065c21d84
diff --git a/metadata/md5-cache/dev-python/pytest-rerunfailures-2.1.0 b/metadata/md5-cache/dev-python/pytest-rerunfailures-2.1.0
index f945531d485a..8216c79873e4 100644
--- a/metadata/md5-cache/dev-python/pytest-rerunfailures-2.1.0
+++ b/metadata/md5-cache/dev-python/pytest-rerunfailures-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pytest python_targets_pypy? ( >=virtual/pypy-5:0= ) python_ta
 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-rerunfailures/pytest-rerunfailures-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=11a9cb32bf6f0f5a81ee0a5c58a5009a
diff --git a/metadata/md5-cache/dev-python/pytest-runner-2.11.1 b/metadata/md5-cache/dev-python/pytest-runner-2.11.1
index 21085a5dbeda..24fc437dc2d4 100644
--- a/metadata/md5-cache/dev-python/pytest-runner-2.11.1
+++ b/metadata/md5-cache/dev-python/pytest-runner-2.11.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,pytho
 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-runner/pytest-runner-2.11.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b026af374aa01674fa13d159a4da2ed0
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 bc4034b7bde7..ad1083228153 100644
--- a/metadata/md5-cache/dev-python/pytest-runner-2.6.2
+++ b/metadata/md5-cache/dev-python/pytest-runner-2.6.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-python/pytest-runner-4.0 b/metadata/md5-cache/dev-python/pytest-runner-4.0
index 404f35f84a40..ea2fc5b2dda0 100644
--- a/metadata/md5-cache/dev-python/pytest-runner-4.0
+++ b/metadata/md5-cache/dev-python/pytest-runner-4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-runner/pytest-runner-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=21bfcffa38d20f776d0c937e778a8873
diff --git a/metadata/md5-cache/dev-python/pytest-salt-0.1_pre20170731 b/metadata/md5-cache/dev-python/pytest-salt-0.1_pre20170731
index 9fcf4f5f42a1..e927472c4946 100644
--- a/metadata/md5-cache/dev-python/pytest-salt-0.1_pre20170731
+++ b/metadata/md5-cache/dev-python/pytest-salt-0.1_pre20170731
@@ -10,5 +10,5 @@ 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
 SRC_URI=mirror://gentoo/pytest-salt-0.1_pre20170731.tar.xz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=eb671e101ff7417f738b37438e948180
diff --git a/metadata/md5-cache/dev-python/pytest-shutil-1.2.11 b/metadata/md5-cache/dev-python/pytest-shutil-1.2.11
index 61fff942401d..92f48a764479 100644
--- a/metadata/md5-cache/dev-python/pytest-shutil-1.2.11
+++ b/metadata/md5-cache/dev-python/pytest-shutil-1.2.11
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_t
 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-shutil/pytest-shutil-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=82bac1c9bbca2c8474e1ef1aea2a8c7f
diff --git a/metadata/md5-cache/dev-python/pytest-shutil-1.2.4 b/metadata/md5-cache/dev-python/pytest-shutil-1.2.4
index 7a16b9de2216..07fde7cb84af 100644
--- a/metadata/md5-cache/dev-python/pytest-shutil-1.2.4
+++ b/metadata/md5-cache/dev-python/pytest-shutil-1.2.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-shutil/pytest-shutil-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bd5da0a8aed75340a79d03a69262cca5
diff --git a/metadata/md5-cache/dev-python/pytest-shutil-1.2.8 b/metadata/md5-cache/dev-python/pytest-shutil-1.2.8
index 50bd6e6e8b35..02acdd0e8c57 100644
--- a/metadata/md5-cache/dev-python/pytest-shutil-1.2.8
+++ b/metadata/md5-cache/dev-python/pytest-shutil-1.2.8
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-shutil/pytest-shutil-1.2.8.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bd5da0a8aed75340a79d03a69262cca5
diff --git a/metadata/md5-cache/dev-python/pytest-subtesthack-0.1.1 b/metadata/md5-cache/dev-python/pytest-subtesthack-0.1.1
index 0cd0b99b08e6..05b9d686bb64 100644
--- a/metadata/md5-cache/dev-python/pytest-subtesthack-0.1.1
+++ b/metadata/md5-cache/dev-python/pytest-subtesthack-0.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/untitaker/pytest-subtesthack/archive/0.1.1.tar.gz -> pytest-subtesthack-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=03ed8270d85188282067e07f417da446
diff --git a/metadata/md5-cache/dev-python/pytest-timeout-1.2.0 b/metadata/md5-cache/dev-python/pytest-timeout-1.2.0
index 1757bc35bf84..090e922edd6c 100644
--- a/metadata/md5-cache/dev-python/pytest-timeout-1.2.0
+++ b/metadata/md5-cache/dev-python/pytest-timeout-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pytest python_targets_pypy? ( >=virtual/pypy-5:0= ) python_ta
 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-timeout/pytest-timeout-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d757eb80f59d0ca33b62952381bc8381
diff --git a/metadata/md5-cache/dev-python/pytest-timeout-1.2.1 b/metadata/md5-cache/dev-python/pytest-timeout-1.2.1
index a6425c180127..fa4d2f60c04f 100644
--- a/metadata/md5-cache/dev-python/pytest-timeout-1.2.1
+++ b/metadata/md5-cache/dev-python/pytest-timeout-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pytest python_targets_pypy? ( >=virtual/pypy-5:0= ) python_ta
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-timeout/pytest-timeout-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a37677e120b98017c6a79619b5763426
diff --git a/metadata/md5-cache/dev-python/pytest-virtualenv-1.2.11 b/metadata/md5-cache/dev-python/pytest-virtualenv-1.2.11
index b993c4830359..9695f119f3ae 100644
--- a/metadata/md5-cache/dev-python/pytest-virtualenv-1.2.11
+++ b/metadata/md5-cache/dev-python/pytest-virtualenv-1.2.11
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pytest-fixture-config[python_targets_pypy(-)?,python_targets_
 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-virtualenv/pytest-virtualenv-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5b07271cace6a5690cf6f81589d9edd3
diff --git a/metadata/md5-cache/dev-python/pytest-xdist-1.15.0 b/metadata/md5-cache/dev-python/pytest-xdist-1.15.0
index fe0eddcce324..7f7e09a7c206 100644
--- a/metadata/md5-cache/dev-python/pytest-xdist-1.15.0
+++ b/metadata/md5-cache/dev-python/pytest-xdist-1.15.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/execnet-1.1[python_targets_pypy(-)?,python_targets_pypy3(-)
 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-xdist/pytest-xdist-1.15.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e5ac4a68af5d84952bb0a91daa6d04e1
diff --git a/metadata/md5-cache/dev-python/pytest-xdist-1.20.1 b/metadata/md5-cache/dev-python/pytest-xdist-1.20.1
index f5310362aa3e..093a4ddf4f5c 100644
--- a/metadata/md5-cache/dev-python/pytest-xdist-1.20.1
+++ b/metadata/md5-cache/dev-python/pytest-xdist-1.20.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/execnet-1.1[python_targets_pypy(-)?,python_targets_pypy3(-)
 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-xdist/pytest-xdist-1.20.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=62440e33adcbfa149c7d35bd3734f8aa
diff --git a/metadata/md5-cache/dev-python/pytest-xdist-1.22.2 b/metadata/md5-cache/dev-python/pytest-xdist-1.22.2
index 5231d6c52257..22c0a87532bd 100644
--- a/metadata/md5-cache/dev-python/pytest-xdist-1.22.2
+++ b/metadata/md5-cache/dev-python/pytest-xdist-1.22.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/execnet-1.1[python_targets_pypy(-)?,python_targets_pypy3(-)
 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.22.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=54d3e40c562fd0ed6b7287472c432b03
diff --git a/metadata/md5-cache/dev-python/pytest-xprocess-0.12.1 b/metadata/md5-cache/dev-python/pytest-xprocess-0.12.1
index 40330e09c57a..2948fc164748 100644
--- a/metadata/md5-cache/dev-python/pytest-xprocess-0.12.1
+++ b/metadata/md5-cache/dev-python/pytest-xprocess-0.12.1
@@ -10,5 +10,5 @@ RDEPEND=|| ( dev-python/pytest-cache[python_targets_pypy(-)?,python_targets_pypy
 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-xprocess/pytest-xprocess-0.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e59ff122ced1f72080b7b0628d7698db
diff --git a/metadata/md5-cache/dev-python/python-afl-0.6.1 b/metadata/md5-cache/dev-python/python-afl-0.6.1
index 8e708ea1dbbd..84fde485cb66 100644
--- a/metadata/md5-cache/dev-python/python-afl-0.6.1
+++ b/metadata/md5-cache/dev-python/python-afl-0.6.1
@@ -10,5 +10,5 @@ RDEPEND=app-forensics/afl python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2
 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/python-afl/python-afl-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6708f7bffb4be3baa39745a04ac021f3
diff --git a/metadata/md5-cache/dev-python/python-afl-0.7.1 b/metadata/md5-cache/dev-python/python-afl-0.7.1
index df8affe55fcd..8b0f87bba62e 100644
--- a/metadata/md5-cache/dev-python/python-afl-0.7.1
+++ b/metadata/md5-cache/dev-python/python-afl-0.7.1
@@ -10,5 +10,5 @@ RDEPEND=app-forensics/afl python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2
 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/python-afl/python-afl-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1ef7bdfef24092f1009cd8158ee82338
diff --git a/metadata/md5-cache/dev-python/python-application-2.1.0 b/metadata/md5-cache/dev-python/python-application-2.1.0
index 175759e761cf..0d540793b8dd 100644
--- a/metadata/md5-cache/dev-python/python-application-2.1.0
+++ b/metadata/md5-cache/dev-python/python-application-2.1.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-application/python-application-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4073efef651379509f14c3d6c7be0c51
diff --git a/metadata/md5-cache/dev-python/python-augeas-0.4.1 b/metadata/md5-cache/dev-python/python-augeas-0.4.1
index 076bb9063a09..7e0c3078e7f2 100644
--- a/metadata/md5-cache/dev-python/python-augeas-0.4.1
+++ b/metadata/md5-cache/dev-python/python-augeas-0.4.1
@@ -10,5 +10,5 @@ RDEPEND=app-admin/augeas python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://fedorahosted.org/released/python-augeas/python-augeas-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d8756bcfa328bd307f08b6217639ab1b
diff --git a/metadata/md5-cache/dev-python/python-augeas-0.4.2_pre131218 b/metadata/md5-cache/dev-python/python-augeas-0.4.2_pre131218
index 48c8dd232274..a8980e0b95b1 100644
--- a/metadata/md5-cache/dev-python/python-augeas-0.4.2_pre131218
+++ b/metadata/md5-cache/dev-python/python-augeas-0.4.2_pre131218
@@ -10,5 +10,5 @@ RDEPEND=app-admin/augeas python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/python-augeas-0.4.2_pre131218.tar.xz
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=10870faf69ae8a3449b985e6ffa7d022
diff --git a/metadata/md5-cache/dev-python/python-augeas-0.5.0 b/metadata/md5-cache/dev-python/python-augeas-0.5.0
index 4c4c30483660..fe9e1e7baa31 100644
--- a/metadata/md5-cache/dev-python/python-augeas-0.5.0
+++ b/metadata/md5-cache/dev-python/python-augeas-0.5.0
@@ -10,5 +10,5 @@ RDEPEND=app-admin/augeas python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:
 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/python-augeas/python-augeas-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=277f895e484ed4579d8aa4288a6cd072
diff --git a/metadata/md5-cache/dev-python/python-axolotl-0.1.42 b/metadata/md5-cache/dev-python/python-axolotl-0.1.42
index 581221cf65f1..8d6d99f49e77 100644
--- a/metadata/md5-cache/dev-python/python-axolotl-0.1.42
+++ b/metadata/md5-cache/dev-python/python-axolotl-0.1.42
@@ -10,5 +10,5 @@ RDEPEND=dev-python/cryptography[python_targets_python2_7(-)?,python_targets_pyth
 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/tgalal/python-axolotl/archive/0.1.42.tar.gz -> python-axolotl-0.1.42.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8e1f7029e77a10d26234314d764351b3
diff --git a/metadata/md5-cache/dev-python/python-axolotl-curve25519-0.4.1_p2 b/metadata/md5-cache/dev-python/python-axolotl-curve25519-0.4.1_p2
index 46a01bebaa85..a09f3e00a879 100644
--- a/metadata/md5-cache/dev-python/python-axolotl-curve25519-0.4.1_p2
+++ b/metadata/md5-cache/dev-python/python-axolotl-curve25519-0.4.1_p2
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/tgalal/python-axolotl-curve25519/archive/0.4.1-2.tar.gz -> python-axolotl-curve25519-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=efe606b1684c0eee54dc4bb5da56ad57
diff --git a/metadata/md5-cache/dev-python/python-backoff-1.6.0 b/metadata/md5-cache/dev-python/python-backoff-1.6.0
index 268fec93c553..35198041610f 100644
--- a/metadata/md5-cache/dev-python/python-backoff-1.6.0
+++ b/metadata/md5-cache/dev-python/python-backoff-1.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/backoff/backoff-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3361d2cb880a329cda75aa6f349ad99f
diff --git a/metadata/md5-cache/dev-python/python-barbicanclient-4.5.2 b/metadata/md5-cache/dev-python/python-barbicanclient-4.5.2
index ee3bc1b602f5..5196eda63b81 100644
--- a/metadata/md5-cache/dev-python/python-barbicanclient-4.5.2
+++ b/metadata/md5-cache/dev-python/python-barbicanclient-4.5.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-barbicanclient/python-barbicanclient-4.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9e95aecd8a4cea86980fae020c409ac0
diff --git a/metadata/md5-cache/dev-python/python-barbicanclient-4.6.0 b/metadata/md5-cache/dev-python/python-barbicanclient-4.6.0
index 07db89283a75..a741b74abe0f 100644
--- a/metadata/md5-cache/dev-python/python-barbicanclient-4.6.0
+++ b/metadata/md5-cache/dev-python/python-barbicanclient-4.6.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 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/python-barbicanclient/python-barbicanclient-4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=914b115d6aba3c3ce45b4fa3d6b7e9ee
diff --git a/metadata/md5-cache/dev-python/python-bibtex-1.2.7-r1 b/metadata/md5-cache/dev-python/python-bibtex-1.2.7-r1
index 0f01d30799c1..f1d5874bdfe8 100644
--- a/metadata/md5-cache/dev-python/python-bibtex-1.2.7-r1
+++ b/metadata/md5-cache/dev-python/python-bibtex-1.2.7-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 >=app-text/recode-3.6-r1 python_targets_python2_7? ( >=d
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pybliographer/python-bibtex-1.2.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=3587493f0e24b54df030c091208b558c
diff --git a/metadata/md5-cache/dev-python/python-biggles-1.6.6-r1 b/metadata/md5-cache/dev-python/python-biggles-1.6.6-r1
index 97e03ca1a4e6..46cd67aa644e 100644
--- a/metadata/md5-cache/dev-python/python-biggles-1.6.6-r1
+++ b/metadata/md5-cache/dev-python/python-biggles-1.6.6-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/biggles/python2-biggles-1.6.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=882eb873f82a200b410c07ab79ed206a
diff --git a/metadata/md5-cache/dev-python/python-blazarclient-2.0.0 b/metadata/md5-cache/dev-python/python-blazarclient-2.0.0
index e764617cec06..6017ca3f51af 100644
--- a/metadata/md5-cache/dev-python/python-blazarclient-2.0.0
+++ b/metadata/md5-cache/dev-python/python-blazarclient-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 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/python-blazarclient/python-blazarclient-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5888779be8fe4827a102275649a0259c
diff --git a/metadata/md5-cache/dev-python/python-bugzilla-1.2.2 b/metadata/md5-cache/dev-python/python-bugzilla-1.2.2
index 82d20258c3b4..5ad0bbf0405d 100644
--- a/metadata/md5-cache/dev-python/python-bugzilla-1.2.2
+++ b/metadata/md5-cache/dev-python/python-bugzilla-1.2.2
@@ -10,5 +10,5 @@ RDEPEND=|| ( dev-python/python-magic[python_targets_python2_7(-)?,python_targets
 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/python-bugzilla/python-bugzilla-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b7a0e25adfe0b8eaaa5eab3b81b51791
diff --git a/metadata/md5-cache/dev-python/python-bugzilla-2.1.0 b/metadata/md5-cache/dev-python/python-bugzilla-2.1.0
index a713054a1fdf..64e7ef673f16 100644
--- a/metadata/md5-cache/dev-python/python-bugzilla-2.1.0
+++ b/metadata/md5-cache/dev-python/python-bugzilla-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=|| ( dev-python/python-magic[python_targets_python2_7(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-bugzilla/python-bugzilla-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1b2f20c0e8f331c89b7442ab189c15dd
diff --git a/metadata/md5-cache/dev-python/python-caja-1.12.0-r1 b/metadata/md5-cache/dev-python/python-caja-1.12.0-r1
deleted file mode 100644
index 69351bf5f07c..000000000000
--- a/metadata/md5-cache/dev-python/python-caja-1.12.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=dev-libs/glib:2 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(+)] >=mate-base/caja-1.8[gtk3(-)=,introspection] !gtk3? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) python_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-util/gtk-doc dev-util/gtk-doc-am virtual/pkgconfig:* doc? ( app-text/docbook-xml-dtd:4.1.2 ) >=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.12
-DESCRIPTION=Python bindings for the Caja file manager
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=doc gtk3 python_targets_python2_7
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 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(+)] >=mate-base/caja-1.8[gtk3(-)=,introspection] !gtk3? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) python_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://pub.mate-desktop.org/releases/1.12/python-caja-1.12.0.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=7c323abcfb39abdb026e7d0c2cb66fd6
diff --git a/metadata/md5-cache/dev-python/python-caja-1.14.0 b/metadata/md5-cache/dev-python/python-caja-1.14.0
deleted file mode 100644
index 77aa6e5ab806..000000000000
--- a/metadata/md5-cache/dev-python/python-caja-1.14.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure 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-libs/glib:2 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(+)] >=mate-base/caja-1.8[gtk3(-)=,introspection] !gtk3? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) dev-util/gtk-doc dev-util/gtk-doc-am virtual/pkgconfig:* doc? ( app-text/docbook-xml-dtd:4.1.2 ) >=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.14
-DESCRIPTION=Python bindings for the Caja file manager
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=doc gtk3 python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~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-libs/glib:2 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(+)] >=mate-base/caja-1.8[gtk3(-)=,introspection] !gtk3? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.14/python-caja-1.14.0.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=6be350c93083222b6b0e69f6d3788aa4
diff --git a/metadata/md5-cache/dev-python/python-caja-1.16.0 b/metadata/md5-cache/dev-python/python-caja-1.16.0
deleted file mode 100644
index 698dd6760559..000000000000
--- a/metadata/md5-cache/dev-python/python-caja-1.16.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure 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-libs/glib:2 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(+)] >=mate-base/caja-1.8[gtk3(-)=,introspection] !gtk3? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) dev-util/gtk-doc dev-util/gtk-doc-am virtual/pkgconfig:* doc? ( app-text/docbook-xml-dtd:4.1.2 ) >=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.16
-DESCRIPTION=Python bindings for the Caja file manager
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=doc gtk3 python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~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-libs/glib:2 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(+)] >=mate-base/caja-1.8[gtk3(-)=,introspection] !gtk3? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/python-caja-1.16.0.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=6be350c93083222b6b0e69f6d3788aa4
diff --git a/metadata/md5-cache/dev-python/python-caja-1.18.1 b/metadata/md5-cache/dev-python/python-caja-1.18.1
index be63090b0d1b..60c2ab0e2bd6 100644
--- a/metadata/md5-cache/dev-python/python-caja-1.18.1
+++ b/metadata/md5-cache/dev-python/python-caja-1.18.1
@@ -9,5 +9,5 @@ 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-libs/glib:2 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(+)] >=mate-base/caja-1.17.1[introspection] x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.18/python-caja-1.18.1.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=db37836a5c145c2810a29b181a30b913
diff --git a/metadata/md5-cache/dev-python/python-catcher-0.1.7 b/metadata/md5-cache/dev-python/python-catcher-0.1.7
index 249373ffb767..f89403b1ce76 100644
--- a/metadata/md5-cache/dev-python/python-catcher-0.1.7
+++ b/metadata/md5-cache/dev-python/python-catcher-0.1.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/mako[python_targets_python2_7(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-catcher/python-catcher-0.1.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=c78661f7b49016914cd071fb74dca793
diff --git a/metadata/md5-cache/dev-python/python-cdb-0.34-r1 b/metadata/md5-cache/dev-python/python-cdb-0.34-r1
index 2b74f8d658ba..f20382101122 100644
--- a/metadata/md5-cache/dev-python/python-cdb-0.34-r1
+++ b/metadata/md5-cache/dev-python/python-cdb-0.34-r1
@@ -10,5 +10,5 @@ RDEPEND=|| ( dev-db/cdb dev-db/tinycdb ) python_targets_python2_7? ( >=dev-lang/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://pilcrow.madison.wi.us/python-cdb/python-cdb-0.34.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bd05c466283af4eef44641efed86ed8b
diff --git a/metadata/md5-cache/dev-python/python-ceilometerclient-2.6.2 b/metadata/md5-cache/dev-python/python-ceilometerclient-2.6.2
index e8e06ca8c5cd..0cd61e829051 100644
--- a/metadata/md5-cache/dev-python/python-ceilometerclient-2.6.2
+++ b/metadata/md5-cache/dev-python/python-ceilometerclient-2.6.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3
 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/python-ceilometerclient/python-ceilometerclient-2.6.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5fb4f265d54e508dead960e69f49fd45
diff --git a/metadata/md5-cache/dev-python/python-cinderclient-3.1.0 b/metadata/md5-cache/dev-python/python-cinderclient-3.1.0
index 25e4f0baad88..9287f6adf1a8 100644
--- a/metadata/md5-cache/dev-python/python-cinderclient-3.1.0
+++ b/metadata/md5-cache/dev-python/python-cinderclient-3.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-cinderclient/python-cinderclient-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=616d502d7aaaef7e2125759151aeffe8
diff --git a/metadata/md5-cache/dev-python/python-cinderclient-3.5.0 b/metadata/md5-cache/dev-python/python-cinderclient-3.5.0
index f993622a1e3f..cd9fa84e7071 100644
--- a/metadata/md5-cache/dev-python/python-cinderclient-3.5.0
+++ b/metadata/md5-cache/dev-python/python-cinderclient-3.5.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 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/python-cinderclient/python-cinderclient-3.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=13e7cad7c81060b83ce3bf2ffbf3b9af
diff --git a/metadata/md5-cache/dev-python/python-cinderclient-4.0.1 b/metadata/md5-cache/dev-python/python-cinderclient-4.0.1
index db594b64cfa0..14fb0fc65e6a 100644
--- a/metadata/md5-cache/dev-python/python-cinderclient-4.0.1
+++ b/metadata/md5-cache/dev-python/python-cinderclient-4.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 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/python-cinderclient/python-cinderclient-4.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=12455c7e0a56b11c0321b298c1642b55
diff --git a/metadata/md5-cache/dev-python/python-cjson-1.1.0 b/metadata/md5-cache/dev-python/python-cjson-1.1.0
index 72d5fa69435f..7e02414e3b2f 100644
--- a/metadata/md5-cache/dev-python/python-cjson-1.1.0
+++ b/metadata/md5-cache/dev-python/python-cjson-1.1.0
@@ -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=mirror://pypi/p/python-cjson/python-cjson-1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fbae583eedea36f5ecfe78abc1396df1
diff --git a/metadata/md5-cache/dev-python/python-cjson-1.2.1 b/metadata/md5-cache/dev-python/python-cjson-1.2.1
index 9c6db0fb5365..ae3ac71fa30c 100644
--- a/metadata/md5-cache/dev-python/python-cjson-1.2.1
+++ b/metadata/md5-cache/dev-python/python-cjson-1.2.1
@@ -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=mirror://pypi/p/python-cjson/python-cjson-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=beb62c26bab4b44e28863d97a474e97f
diff --git a/metadata/md5-cache/dev-python/python-cluster-1.2.2 b/metadata/md5-cache/dev-python/python-cluster-1.2.2
index 054532d6ed56..62300ed63bae 100644
--- a/metadata/md5-cache/dev-python/python-cluster-1.2.2
+++ b/metadata/md5-cache/dev-python/python-cluster-1.2.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cluster/cluster-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2ba78c254e2d1214616cccd239931614
diff --git a/metadata/md5-cache/dev-python/python-consul-1.1.0 b/metadata/md5-cache/dev-python/python-consul-1.1.0
index 7997abfd491c..a41900d9ad03 100644
--- a/metadata/md5-cache/dev-python/python-consul-1.1.0
+++ b/metadata/md5-cache/dev-python/python-consul-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/cablehead/python-consul/archive/v1.1.0.tar.gz -> python-consul-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d348961f301b9baceb893499b92085f7
diff --git a/metadata/md5-cache/dev-python/python-cstruct-1.7 b/metadata/md5-cache/dev-python/python-cstruct-1.7
index 09aa313e103f..cf741eaa7d82 100644
--- a/metadata/md5-cache/dev-python/python-cstruct-1.7
+++ b/metadata/md5-cache/dev-python/python-cstruct-1.7
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cstruct/cstruct-1.7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=871c900dd2bcc3accf588cf4595c4d2d
diff --git a/metadata/md5-cache/dev-python/python-ctags-1.2.4 b/metadata/md5-cache/dev-python/python-ctags-1.2.4
index d58da7ac692b..973afbb35c85 100644
--- a/metadata/md5-cache/dev-python/python-ctags-1.2.4
+++ b/metadata/md5-cache/dev-python/python-ctags-1.2.4
@@ -10,5 +10,5 @@ RDEPEND=dev-util/ctags python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targe
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-ctags3/python-ctags3-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d470b903e6cf0477b39a2a84bdab9dc8
diff --git a/metadata/md5-cache/dev-python/python-daap-0.7.1-r1 b/metadata/md5-cache/dev-python/python-daap-0.7.1-r1
index 7518884ce50e..bd5a592e4442 100644
--- a/metadata/md5-cache/dev-python/python-daap-0.7.1-r1
+++ b/metadata/md5-cache/dev-python/python-daap-0.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=http://jerakeen.org/files/PythonDaap-0.7.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3d4bc52785a84666290d88086f7a6329
diff --git a/metadata/md5-cache/dev-python/python-daemon-1.6-r1 b/metadata/md5-cache/dev-python/python-daemon-1.6-r1
index 1dbc90ffbeba..5bd3cfe6e30a 100644
--- a/metadata/md5-cache/dev-python/python-daemon-1.6-r1
+++ b/metadata/md5-cache/dev-python/python-daemon-1.6-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/lockfile-0.9[python_targets_python2_7(-)?,-python_single_ta
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-daemon/python-daemon-1.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5c961bdd5005e5211210b529a58c30f7
diff --git a/metadata/md5-cache/dev-python/python-daemon-2.1.1 b/metadata/md5-cache/dev-python/python-daemon-2.1.1
index eab9fb08c7d2..968a406806c4 100644
--- a/metadata/md5-cache/dev-python/python-daemon-2.1.1
+++ b/metadata/md5-cache/dev-python/python-daemon-2.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/lockfile-0.9[python_targets_python2_7(-)?,python_targets_py
 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/python-daemon/python-daemon-2.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=dbe41a1e45c7aca36f879c98ed1d19b6
diff --git a/metadata/md5-cache/dev-python/python-daemon-2.1.2 b/metadata/md5-cache/dev-python/python-daemon-2.1.2
index 6ffaf98b8d2e..a1e771176c5d 100644
--- a/metadata/md5-cache/dev-python/python-daemon-2.1.2
+++ b/metadata/md5-cache/dev-python/python-daemon-2.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/python-daemon/python-daemon-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=01c4aa1e33faa5f2139028a4d8b2762d
diff --git a/metadata/md5-cache/dev-python/python-dateutil-2.6.1 b/metadata/md5-cache/dev-python/python-dateutil-2.6.1
index ac53ec690063..ec349b0d214d 100644
--- a/metadata/md5-cache/dev-python/python-dateutil-2.6.1
+++ b/metadata/md5-cache/dev-python/python-dateutil-2.6.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,py
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-dateutil/python-dateutil-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e315a1665e718781c8ef25a336a9fb0f
diff --git a/metadata/md5-cache/dev-python/python-dateutil-2.7.1 b/metadata/md5-cache/dev-python/python-dateutil-2.7.1
index 270f57cdace6..a75b0478c82c 100644
--- a/metadata/md5-cache/dev-python/python-dateutil-2.7.1
+++ b/metadata/md5-cache/dev-python/python-dateutil-2.7.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,py
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-dateutil/python-dateutil-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=876f0e19b62b059a38b4abfcd71049f9
diff --git a/metadata/md5-cache/dev-python/python-dateutil-2.7.2 b/metadata/md5-cache/dev-python/python-dateutil-2.7.2
index d77c2eb98dfa..f62fb3e1eb5f 100644
--- a/metadata/md5-cache/dev-python/python-dateutil-2.7.2
+++ b/metadata/md5-cache/dev-python/python-dateutil-2.7.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,py
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-dateutil/python-dateutil-2.7.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=876f0e19b62b059a38b4abfcd71049f9
diff --git a/metadata/md5-cache/dev-python/python-dateutil-2.7.2-r1 b/metadata/md5-cache/dev-python/python-dateutil-2.7.2-r1
index db6e6d2c24b6..382c099e05a7 100644
--- a/metadata/md5-cache/dev-python/python-dateutil-2.7.2-r1
+++ b/metadata/md5-cache/dev-python/python-dateutil-2.7.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,py
 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/python-dateutil/python-dateutil-2.7.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7eec70bfdc8f354b304eaf41119fefb9
diff --git a/metadata/md5-cache/dev-python/python-dateutil-2.7.3 b/metadata/md5-cache/dev-python/python-dateutil-2.7.3
index 5ec71df8d29f..086327458fc7 100644
--- a/metadata/md5-cache/dev-python/python-dateutil-2.7.3
+++ b/metadata/md5-cache/dev-python/python-dateutil-2.7.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,py
 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/python-dateutil/python-dateutil-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fa47d00a8d36b8b7d6ae224660016c80
diff --git a/metadata/md5-cache/dev-python/python-ddp-0.1.5 b/metadata/md5-cache/dev-python/python-ddp-0.1.5
index e9e25688d929..a90a578f28be 100644
--- a/metadata/md5-cache/dev-python/python-ddp-0.1.5
+++ b/metadata/md5-cache/dev-python/python-ddp-0.1.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyee[python_targets_python2_7(-)?,python_targets_python3_4(-)
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-ddp/python-ddp-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6402fcb78df121863865f696d277694b
diff --git a/metadata/md5-cache/dev-python/python-debian-0.1.28 b/metadata/md5-cache/dev-python/python-debian-0.1.28
index 0150aa146b33..36c2502204b5 100644
--- a/metadata/md5-cache/dev-python/python-debian-0.1.28
+++ b/metadata/md5-cache/dev-python/python-debian-0.1.28
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/python-debian/python-debian_0.1.28.tar.xz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5f20e3db3d9e568654880bc330550e0b
diff --git a/metadata/md5-cache/dev-python/python-debian-0.1.31 b/metadata/md5-cache/dev-python/python-debian-0.1.31
index a6312e8c1fa9..88b19d5b73ef 100644
--- a/metadata/md5-cache/dev-python/python-debian-0.1.31
+++ b/metadata/md5-cache/dev-python/python-debian-0.1.31
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/python-debian/python-debian_0.1.31.tar.xz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=01c4eb3a39a0d796dfd75efbdaf0f41b
diff --git a/metadata/md5-cache/dev-python/python-debian-0.1.32 b/metadata/md5-cache/dev-python/python-debian-0.1.32
index 915008669a5b..9df37a703931 100644
--- a/metadata/md5-cache/dev-python/python-debian-0.1.32
+++ b/metadata/md5-cache/dev-python/python-debian-0.1.32
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/python-debian/python-debian_0.1.32.tar.xz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=24beb71f7c17487134fdf49ed24b388d
diff --git a/metadata/md5-cache/dev-python/python-designateclient-2.7.0 b/metadata/md5-cache/dev-python/python-designateclient-2.7.0
index 11d7e5b96acf..06f1124f068e 100644
--- a/metadata/md5-cache/dev-python/python-designateclient-2.7.0
+++ b/metadata/md5-cache/dev-python/python-designateclient-2.7.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-designateclient/python-designateclient-2.7.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e6cbdbc3b31b66db6869d64547dd111c
diff --git a/metadata/md5-cache/dev-python/python-designateclient-2.9.0 b/metadata/md5-cache/dev-python/python-designateclient-2.9.0
index 8f402cbb73f6..3f5381945071 100644
--- a/metadata/md5-cache/dev-python/python-designateclient-2.9.0
+++ b/metadata/md5-cache/dev-python/python-designateclient-2.9.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 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/python-designateclient/python-designateclient-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a10bd74fd1b2c797c12ee8b771f6202b
diff --git a/metadata/md5-cache/dev-python/python-digest-1.7-r1 b/metadata/md5-cache/dev-python/python-digest-1.7-r1
index 8bad7b9ffba3..097799b6c6f2 100644
--- a/metadata/md5-cache/dev-python/python-digest-1.7-r1
+++ b/metadata/md5-cache/dev-python/python-digest-1.7-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-digest/python-digest-1.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=31ed92c599fb741cff7616bb8e21f70b
diff --git a/metadata/md5-cache/dev-python/python-discid-1.1.1 b/metadata/md5-cache/dev-python/python-discid-1.1.1
index c7a9f105eaaa..ca0499b24b24 100644
--- a/metadata/md5-cache/dev-python/python-discid-1.1.1
+++ b/metadata/md5-cache/dev-python/python-discid-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libdiscid-0.2.2 python_targets_python2_7? ( >=dev-lang/pyth
 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/JonnyJD/python-discid/archive/v1.1.1.tar.gz -> python-discid-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=88363ee33d655cea747a8663232e5f76
diff --git a/metadata/md5-cache/dev-python/python-distutils-extra-2.38 b/metadata/md5-cache/dev-python/python-distutils-extra-2.38
index 46cf18440fca..c1f1cbb7ec1e 100644
--- a/metadata/md5-cache/dev-python/python-distutils-extra-2.38
+++ b/metadata/md5-cache/dev-python/python-distutils-extra-2.38
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://launchpad.net/python-distutils-extra/trunk/2.38/+download/python-distutils-extra-2.38.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=04743f2cc1e27e004fd0c133e30716e8
diff --git a/metadata/md5-cache/dev-python/python-distutils-extra-2.39 b/metadata/md5-cache/dev-python/python-distutils-extra-2.39
index e8f43be0e972..1a97ef3451ac 100644
--- a/metadata/md5-cache/dev-python/python-distutils-extra-2.39
+++ b/metadata/md5-cache/dev-python/python-distutils-extra-2.39
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://launchpad.net/python-distutils-extra/trunk/2.39/+download/python-distutils-extra-2.39.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ec9d066b214566f0a8f0570200b66e87
diff --git a/metadata/md5-cache/dev-python/python-djvulibre-0.8 b/metadata/md5-cache/dev-python/python-djvulibre-0.8
index 5fea5cf11a8d..0197bd8c487f 100644
--- a/metadata/md5-cache/dev-python/python-djvulibre-0.8
+++ b/metadata/md5-cache/dev-python/python-djvulibre-0.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-djvulibre/python-djvulibre-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c15611d509568a1a3a48536828eb1c2b
diff --git a/metadata/md5-cache/dev-python/python-dsv-1.4.1-r2 b/metadata/md5-cache/dev-python/python-dsv-1.4.1-r2
index a9c9dd79f4e7..ede2d4575b6e 100644
--- a/metadata/md5-cache/dev-python/python-dsv-1.4.1-r2
+++ b/metadata/md5-cache/dev-python/python-dsv-1.4.1-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/python-dsv/DSV-1.4.1.tar.gz https://dev.gentoo.org/~mgorny/dist/python-dsv-1.4.1-gentoo-patchset.tar.bz2
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ca57e6b4f2db19eed69d29b6b30a68a5
diff --git a/metadata/md5-cache/dev-python/python-ebtables-0.2.0 b/metadata/md5-cache/dev-python/python-ebtables-0.2.0
index 2042341f9e97..4ac0bef4584b 100644
--- a/metadata/md5-cache/dev-python/python-ebtables-0.2.0
+++ b/metadata/md5-cache/dev-python/python-ebtables-0.2.0
@@ -10,5 +10,5 @@ RDEPEND=net-firewall/ebtables[-static] dev-python/cffi[python_targets_python2_7(
 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/ldx/python-ebtables/archive/v0.2.0.tar.gz -> python-ebtables-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5eb6e897cf2104e36e4387d6fa00e01e
diff --git a/metadata/md5-cache/dev-python/python-editor-0.4 b/metadata/md5-cache/dev-python/python-editor-0.4
index 53091b36529d..26b307917e11 100644
--- a/metadata/md5-cache/dev-python/python-editor-0.4
+++ b/metadata/md5-cache/dev-python/python-editor-0.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-editor/python-editor-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bd0614aeeb6c929a96262ec3de1715c9
diff --git a/metadata/md5-cache/dev-python/python-editor-1.0.3 b/metadata/md5-cache/dev-python/python-editor-1.0.3
index acab1b7b4a8b..6dcc77137057 100644
--- a/metadata/md5-cache/dev-python/python-editor-1.0.3
+++ b/metadata/md5-cache/dev-python/python-editor-1.0.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-editor/python-editor-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=601c5741b8a8b6b1ec3cd5e40ab610c4
diff --git a/metadata/md5-cache/dev-python/python-engineio-1.7.0 b/metadata/md5-cache/dev-python/python-engineio-1.7.0
index 69f488913b0f..77ff6f40f71b 100644
--- a/metadata/md5-cache/dev-python/python-engineio-1.7.0
+++ b/metadata/md5-cache/dev-python/python-engineio-1.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/python-engineio/python-engineio-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ccde85514b76641263872c2c142a6a3e
diff --git a/metadata/md5-cache/dev-python/python-engineio-2.2.0 b/metadata/md5-cache/dev-python/python-engineio-2.2.0
index b4acc53721fa..493708544e8c 100644
--- a/metadata/md5-cache/dev-python/python-engineio-2.2.0
+++ b/metadata/md5-cache/dev-python/python-engineio-2.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/python-engineio/python-engineio-2.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ccde85514b76641263872c2c142a6a3e
diff --git a/metadata/md5-cache/dev-python/python-etcd-0.3.2 b/metadata/md5-cache/dev-python/python-etcd-0.3.2
index 3b5382f79da6..b6d339cfefc4 100644
--- a/metadata/md5-cache/dev-python/python-etcd-0.3.2
+++ b/metadata/md5-cache/dev-python/python-etcd-0.3.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/urllib3-1.7[python_targets_python2_7(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://github.com/jplana/python-etcd/archive/0.3.2.zip -> python-etcd-0.3.2.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6e549108f54314e16e8a950a219ab00c
diff --git a/metadata/md5-cache/dev-python/python-etcd-0.3.3 b/metadata/md5-cache/dev-python/python-etcd-0.3.3
index f49fd1341776..d6ba7dd2ea81 100644
--- a/metadata/md5-cache/dev-python/python-etcd-0.3.3
+++ b/metadata/md5-cache/dev-python/python-etcd-0.3.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/urllib3-1.7[python_targets_python2_7(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/jplana/python-etcd/archive/0.3.3.tar.gz -> python-etcd-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cb368aeec195710990e1a6130c2c3726
diff --git a/metadata/md5-cache/dev-python/python-etcd-0.4.4 b/metadata/md5-cache/dev-python/python-etcd-0.4.4
index 2c51a13840be..98511f08b8ff 100644
--- a/metadata/md5-cache/dev-python/python-etcd-0.4.4
+++ b/metadata/md5-cache/dev-python/python-etcd-0.4.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/urllib3-1.7[python_targets_python2_7(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/jplana/python-etcd/archive/0.4.4.tar.gz -> python-etcd-0.4.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=294b8c1a009821f0bfbe95d4667ee72a
diff --git a/metadata/md5-cache/dev-python/python-etcd-0.4.5 b/metadata/md5-cache/dev-python/python-etcd-0.4.5
index 9a2dda684226..f621c496b423 100644
--- a/metadata/md5-cache/dev-python/python-etcd-0.4.5
+++ b/metadata/md5-cache/dev-python/python-etcd-0.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/python-dnspython-2[python_targets_python2_7(-)?,python_targets
 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/python-etcd/python-etcd-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=aba66303605082258630ee9b02b46cc8
diff --git a/metadata/md5-cache/dev-python/python-ethtool-0.11 b/metadata/md5-cache/dev-python/python-ethtool-0.11
index 07ff67e2b3a7..dcd1ffbc43fe 100644
--- a/metadata/md5-cache/dev-python/python-ethtool-0.11
+++ b/metadata/md5-cache/dev-python/python-ethtool-0.11
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libnl:3 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/p/y/python-ethtool/python-ethtool-0.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ea6de2a752c39a0cceefd87f2b0817e4
diff --git a/metadata/md5-cache/dev-python/python-evdev-0.7.0 b/metadata/md5-cache/dev-python/python-evdev-0.7.0
deleted file mode 100644
index 2d6a2de0f09e..000000000000
--- a/metadata/md5-cache/dev-python/python-evdev-0.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_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 library for evdev bindings
-EAPI=6
-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/v0.7.0.tar.gz -> python-evdev-0.7.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=e88f00407926e08c9df2983ed49985b9
diff --git a/metadata/md5-cache/dev-python/python-evdev-0.7.0-r1 b/metadata/md5-cache/dev-python/python-evdev-0.7.0-r1
new file mode 100644
index 000000000000..eac4b36d7a8a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-evdev-0.7.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(-)]
+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/v0.7.0.tar.gz -> python-evdev-0.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_=7a51577e2875f6c9e8779b8a2f61d116
diff --git a/metadata/md5-cache/dev-python/python-eventlib-0.2.1 b/metadata/md5-cache/dev-python/python-eventlib-0.2.1
index f668395b007a..f3e6e6b1a364 100644
--- a/metadata/md5-cache/dev-python/python-eventlib-0.2.1
+++ b/metadata/md5-cache/dev-python/python-eventlib-0.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/greenlet[python_targets_python2_7(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://download.ag-projects.com/SipClient/python-eventlib-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4ccb15f35d357e8f23171487e326417b
diff --git a/metadata/md5-cache/dev-python/python-exconsole-0.1.5 b/metadata/md5-cache/dev-python/python-exconsole-0.1.5
index 2aec29730c65..02f7354899cf 100644
--- a/metadata/md5-cache/dev-python/python-exconsole-0.1.5
+++ b/metadata/md5-cache/dev-python/python-exconsole-0.1.5
@@ -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=mirror://pypi/p/python-exconsole/python-exconsole-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8c5a524ee70a0c7e59226853d5b40f03
diff --git a/metadata/md5-cache/dev-python/python-fastcgi-1.1-r1 b/metadata/md5-cache/dev-python/python-fastcgi-1.1-r1
index 2dfc1d6df955..f68efec7e54a 100644
--- a/metadata/md5-cache/dev-python/python-fastcgi-1.1-r1
+++ b/metadata/md5-cache/dev-python/python-fastcgi-1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/fcgi-2.4.0-r2 python_targets_python2_7? ( >=dev-lang/python-2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-fastcgi/python-fastcgi-1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2d0da185f336f98579209dc23792ff0f
diff --git a/metadata/md5-cache/dev-python/python-fastimport-0.9.2-r1 b/metadata/md5-cache/dev-python/python-fastimport-0.9.2-r1
index a205dc0df2b8..eb9dbd57c408 100644
--- a/metadata/md5-cache/dev-python/python-fastimport-0.9.2-r1
+++ b/metadata/md5-cache/dev-python/python-fastimport-0.9.2-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://launchpad.net/python-fastimport/trunk/0.9.2/+download/python-fastimport-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=73fe3a0698caa454ab9a8a5ce5eb48fd
diff --git a/metadata/md5-cache/dev-python/python-fastimport-0.9.6 b/metadata/md5-cache/dev-python/python-fastimport-0.9.6
index 02b6a1bc0bf7..36ffbaf41c9d 100644
--- a/metadata/md5-cache/dev-python/python-fastimport-0.9.6
+++ b/metadata/md5-cache/dev-python/python-fastimport-0.9.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/f/fastimport/fastimport-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fc093309c890c307887d17e580e0c062
diff --git a/metadata/md5-cache/dev-python/python-fchksum-1.7.1-r1 b/metadata/md5-cache/dev-python/python-fchksum-1.7.1-r1
index 9fc5efd055c5..887f0803c1c0 100644
--- a/metadata/md5-cache/dev-python/python-fchksum-1.7.1-r1
+++ b/metadata/md5-cache/dev-python/python-fchksum-1.7.1-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://code.fluffytapeworm.com/projects/python-fchksum-1.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e50932d228cb061f5010016bb559fd47
diff --git a/metadata/md5-cache/dev-python/python-gammu-2.11 b/metadata/md5-cache/dev-python/python-gammu-2.11
index 8ab00c588fff..687593a6fb7a 100644
--- a/metadata/md5-cache/dev-python/python-gammu-2.11
+++ b/metadata/md5-cache/dev-python/python-gammu-2.11
@@ -10,5 +10,5 @@ RDEPEND=>=app-mobilephone/gammu-1.34.0 python_targets_python2_7? ( >=dev-lang/py
 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/python-gammu/python-gammu-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=be5f219de89ccf1d02c5f1b518c08804
diff --git a/metadata/md5-cache/dev-python/python-gammu-2.5 b/metadata/md5-cache/dev-python/python-gammu-2.5
index 6423dab4372c..7c5364ad5f48 100644
--- a/metadata/md5-cache/dev-python/python-gammu-2.5
+++ b/metadata/md5-cache/dev-python/python-gammu-2.5
@@ -10,5 +10,5 @@ RDEPEND=>=app-mobilephone/gammu-1.34.0 python_targets_python2_7? ( >=dev-lang/py
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-gammu/python-gammu-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9924f17c2570fcb70232e5c7ae3d8773
diff --git a/metadata/md5-cache/dev-python/python-gflags-3.1.1 b/metadata/md5-cache/dev-python/python-gflags-3.1.1
index 21c24b7113d4..011bdd418e14 100644
--- a/metadata/md5-cache/dev-python/python-gflags-3.1.1
+++ b/metadata/md5-cache/dev-python/python-gflags-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,-pyt
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-gflags/python-gflags-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=16e86e6a7916504496efe158c8256c82
diff --git a/metadata/md5-cache/dev-python/python-gflags-3.1.2 b/metadata/md5-cache/dev-python/python-gflags-3.1.2
index d4383144dc13..0c6071cfdc25 100644
--- a/metadata/md5-cache/dev-python/python-gflags-3.1.2
+++ b/metadata/md5-cache/dev-python/python-gflags-3.1.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,pyth
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-gflags/python-gflags-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d811def073b5628bb23038b47632599e
diff --git a/metadata/md5-cache/dev-python/python-glanceclient-2.10.0 b/metadata/md5-cache/dev-python/python-glanceclient-2.10.0
index 5a6cf77f02a1..020686dda93c 100644
--- a/metadata/md5-cache/dev-python/python-glanceclient-2.10.0
+++ b/metadata/md5-cache/dev-python/python-glanceclient-2.10.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=test? ( doc ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-glanceclient/python-glanceclient-2.10.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=80623bb31594aca6008a9edf87c9b595
diff --git a/metadata/md5-cache/dev-python/python-glanceclient-2.12.1 b/metadata/md5-cache/dev-python/python-glanceclient-2.12.1
index 6d328d4c25e3..cdb6762038a8 100644
--- a/metadata/md5-cache/dev-python/python-glanceclient-2.12.1
+++ b/metadata/md5-cache/dev-python/python-glanceclient-2.12.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=test? ( doc ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-glanceclient/python-glanceclient-2.12.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4369e4905d7fc3165c1f6ccc19b5a2cd
diff --git a/metadata/md5-cache/dev-python/python-glanceclient-2.8.0 b/metadata/md5-cache/dev-python/python-glanceclient-2.8.0
index 16d50e5ba077..800b03ed3563 100644
--- a/metadata/md5-cache/dev-python/python-glanceclient-2.8.0
+++ b/metadata/md5-cache/dev-python/python-glanceclient-2.8.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=test? ( doc ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-glanceclient/python-glanceclient-2.8.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9048b22d86d588677b4b605e3f730594
diff --git a/metadata/md5-cache/dev-python/python-gnupg-0.4.0 b/metadata/md5-cache/dev-python/python-gnupg-0.4.0
index 86bc03c89561..442f4bd23935 100644
--- a/metadata/md5-cache/dev-python/python-gnupg-0.4.0
+++ b/metadata/md5-cache/dev-python/python-gnupg-0.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/python-gnupg/python-gnupg-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9cd7103823c300621c591ac6e64ee551
diff --git a/metadata/md5-cache/dev-python/python-gnupg-0.4.1 b/metadata/md5-cache/dev-python/python-gnupg-0.4.1
index 8ca688308ffe..60e9aa475e94 100644
--- a/metadata/md5-cache/dev-python/python-gnupg-0.4.1
+++ b/metadata/md5-cache/dev-python/python-gnupg-0.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/python-gnupg/python-gnupg-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1bd5ccb0ab40d113590320a314197d82
diff --git a/metadata/md5-cache/dev-python/python-gnutls-3.1.1 b/metadata/md5-cache/dev-python/python-gnutls-3.1.1
index c73cd26048ac..5217a58baaeb 100644
--- a/metadata/md5-cache/dev-python/python-gnutls-3.1.1
+++ b/metadata/md5-cache/dev-python/python-gnutls-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=net-libs/gnutls python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2
 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/python-gnutls/python-gnutls-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=600b333cf9db3cf01182e9292c01c194
diff --git a/metadata/md5-cache/dev-python/python-gtkmvc-1.99.1 b/metadata/md5-cache/dev-python/python-gtkmvc-1.99.1
index 0952bf8de308..97419cc5a4f7 100644
--- a/metadata/md5-cache/dev-python/python-gtkmvc-1.99.1
+++ b/metadata/md5-cache/dev-python/python-gtkmvc-1.99.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pygtk-2.24.0 python_targets_python2_7? ( >=dev-lang/python-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pygtkmvc/python-gtkmvc-1.99.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d101092f58f9be0d85cf5d725a247632
diff --git a/metadata/md5-cache/dev-python/python-heatclient-1.11.1 b/metadata/md5-cache/dev-python/python-heatclient-1.11.1
index 2fe2613fd245..ce4e07961555 100644
--- a/metadata/md5-cache/dev-python/python-heatclient-1.11.1
+++ b/metadata/md5-cache/dev-python/python-heatclient-1.11.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 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/python-heatclient/python-heatclient-1.11.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=976c3385195bf74513c684de89830734
diff --git a/metadata/md5-cache/dev-python/python-heatclient-1.8.2 b/metadata/md5-cache/dev-python/python-heatclient-1.8.2
index 0600bec49498..c7ef3f3079a9 100644
--- a/metadata/md5-cache/dev-python/python-heatclient-1.8.2
+++ b/metadata/md5-cache/dev-python/python-heatclient-1.8.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-heatclient/python-heatclient-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f19f3d05b916fe03ec652579578837e1
diff --git a/metadata/md5-cache/dev-python/python-hpilo-4.0 b/metadata/md5-cache/dev-python/python-hpilo-4.0
index 3b4aa97b03c4..34c39308bfe1 100644
--- a/metadata/md5-cache/dev-python/python-hpilo-4.0
+++ b/metadata/md5-cache/dev-python/python-hpilo-4.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/seveas/python-hpilo/archive/4.0.tar.gz -> python-hpilo-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=eb8ad582c83166a9d87dad18ccd5acb3
diff --git a/metadata/md5-cache/dev-python/python-hpilo-4.1 b/metadata/md5-cache/dev-python/python-hpilo-4.1
index 0fa4f3f849c6..bc8c9ac079b3 100644
--- a/metadata/md5-cache/dev-python/python-hpilo-4.1
+++ b/metadata/md5-cache/dev-python/python-hpilo-4.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/seveas/python-hpilo/archive/4.1.tar.gz -> python-hpilo-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=eb8ad582c83166a9d87dad18ccd5acb3
diff --git a/metadata/md5-cache/dev-python/python-iptables-0.12.0 b/metadata/md5-cache/dev-python/python-iptables-0.12.0
index ffd3f72b00d0..e5d81a8f16bb 100644
--- a/metadata/md5-cache/dev-python/python-iptables-0.12.0
+++ b/metadata/md5-cache/dev-python/python-iptables-0.12.0
@@ -10,5 +10,5 @@ RDEPEND=net-firewall/iptables python_targets_python2_7? ( >=dev-lang/python-2.7.
 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/python-iptables/python-iptables-0.12.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e37d0fe092a7e4717d6ac73d1fdd5527
diff --git a/metadata/md5-cache/dev-python/python-ironicclient-1.17.0 b/metadata/md5-cache/dev-python/python-ironicclient-1.17.0
index 0c9f3f618c4a..b20fa25d8528 100644
--- a/metadata/md5-cache/dev-python/python-ironicclient-1.17.0
+++ b/metadata/md5-cache/dev-python/python-ironicclient-1.17.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 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/python-ironicclient/python-ironicclient-1.17.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e5d2aad824b04cc8e245e93ba5004a22
diff --git a/metadata/md5-cache/dev-python/python-ironicclient-2.2.1 b/metadata/md5-cache/dev-python/python-ironicclient-2.2.1
index 815774e1b434..3b428c5b8f51 100644
--- a/metadata/md5-cache/dev-python/python-ironicclient-2.2.1
+++ b/metadata/md5-cache/dev-python/python-ironicclient-2.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 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/python-ironicclient/python-ironicclient-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f67f7e35357c5c075da6fc3cfd1bf693
diff --git a/metadata/md5-cache/dev-python/python-iwscan-20080402-r1 b/metadata/md5-cache/dev-python/python-iwscan-20080402-r1
index 5819cf95e92c..4b8e15fa7229 100644
--- a/metadata/md5-cache/dev-python/python-iwscan-20080402-r1
+++ b/metadata/md5-cache/dev-python/python-iwscan-20080402-r1
@@ -10,5 +10,5 @@ RDEPEND=net-wireless/wireless-tools python_targets_pypy? ( >=virtual/pypy-5:0= )
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gentoo/python-iwscan-20080402.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=71a4aef898c611ae03fc219fc59453a4
diff --git a/metadata/md5-cache/dev-python/python-keystoneclient-3.15.0 b/metadata/md5-cache/dev-python/python-keystoneclient-3.15.0
index 6e9b597a3b55..85c4392c79db 100644
--- a/metadata/md5-cache/dev-python/python-keystoneclient-3.15.0
+++ b/metadata/md5-cache/dev-python/python-keystoneclient-3.15.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/python-keystoneclient/python-keystoneclient-3.15.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2689ca908a8434043311cab63bf0f12f
diff --git a/metadata/md5-cache/dev-python/python-keystoneclient-3.17.0 b/metadata/md5-cache/dev-python/python-keystoneclient-3.17.0
index 36ffb09e248d..bfd1c89b860c 100644
--- a/metadata/md5-cache/dev-python/python-keystoneclient-3.17.0
+++ b/metadata/md5-cache/dev-python/python-keystoneclient-3.17.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/python-keystoneclient/python-keystoneclient-3.17.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7a19bb2cd7b583acaaae70421b7955de
diff --git a/metadata/md5-cache/dev-python/python-ldap-2.4.19-r1 b/metadata/md5-cache/dev-python/python-ldap-2.4.19-r1
index 9b47b1548bc3..7d2cbe4949a8 100644
--- a/metadata/md5-cache/dev-python/python-ldap-2.4.19-r1
+++ b/metadata/md5-cache/dev-python/python-ldap-2.4.19-r1
@@ -10,5 +10,5 @@ RDEPEND=>net-nds/openldap-2.4.11 dev-python/pyasn1[python_targets_pypy(-)?,pytho
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-ldap/python-ldap-2.4.19.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3f5d9efd770742fb9b4e946035646459
diff --git a/metadata/md5-cache/dev-python/python-ldap-2.4.32 b/metadata/md5-cache/dev-python/python-ldap-2.4.32
index 7855b86d6b71..f471b0a0ed29 100644
--- a/metadata/md5-cache/dev-python/python-ldap-2.4.32
+++ b/metadata/md5-cache/dev-python/python-ldap-2.4.32
@@ -10,5 +10,5 @@ RDEPEND=>net-nds/openldap-2.4.11 dev-python/pyasn1[python_targets_pypy(-)?,pytho
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-ldap/python-ldap-2.4.32.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8cf5ffb2a901822f4368b947c14b5743
diff --git a/metadata/md5-cache/dev-python/python-levenshtein-0.11.2 b/metadata/md5-cache/dev-python/python-levenshtein-0.11.2
index a1cd0f2c4146..61c5fc7b35df 100644
--- a/metadata/md5-cache/dev-python/python-levenshtein-0.11.2
+++ b/metadata/md5-cache/dev-python/python-levenshtein-0.11.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=doc? ( || ( python_targets_pypy python_targets_python2_7 ) ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-Levenshtein/python-Levenshtein-0.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d983eb143698cf5dff44cb915d79ea22
diff --git a/metadata/md5-cache/dev-python/python-levenshtein-0.12.0 b/metadata/md5-cache/dev-python/python-levenshtein-0.12.0
index 43aebab16c3c..1e15d7fa7b62 100644
--- a/metadata/md5-cache/dev-python/python-levenshtein-0.12.0
+++ b/metadata/md5-cache/dev-python/python-levenshtein-0.12.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=doc? ( || ( python_targets_pypy python_targets_python2_7 ) ) || ( 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/python-Levenshtein/python-Levenshtein-0.12.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6297312bc69eccea1787c8d3c382c981
diff --git a/metadata/md5-cache/dev-python/python-linux-procfs-0.4.6 b/metadata/md5-cache/dev-python/python-linux-procfs-0.4.6
index 38e108fb1fe8..94d14ec40996 100644
--- a/metadata/md5-cache/dev-python/python-linux-procfs-0.4.6
+++ b/metadata/md5-cache/dev-python/python-linux-procfs-0.4.6
@@ -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=mirror://gentoo/python-linux-procfs-0.4.6.tar.xz
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2e5bb12d35b10ab2719da3cd82f3632d
diff --git a/metadata/md5-cache/dev-python/python-linux-procfs-9999 b/metadata/md5-cache/dev-python/python-linux-procfs-9999
index 0a576995a25d..ce9ecd3f1fa9 100644
--- a/metadata/md5-cache/dev-python/python-linux-procfs-9999
+++ b/metadata/md5-cache/dev-python/python-linux-procfs-9999
@@ -8,5 +8,5 @@ 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 )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-2	249c1a0962573f4ce2c28f0d5b6b35d4	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-2	249c1a0962573f4ce2c28f0d5b6b35d4	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_=d49bd7dd3ef1d764dd408fdfdf5063a5
diff --git a/metadata/md5-cache/dev-python/python-ly-0.9.4 b/metadata/md5-cache/dev-python/python-ly-0.9.4
index 47b9185e1e31..ee986919b04e 100644
--- a/metadata/md5-cache/dev-python/python-ly-0.9.4
+++ b/metadata/md5-cache/dev-python/python-ly-0.9.4
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-ly/python-ly-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4372c95fbab26661a27ebea75275a3b1
diff --git a/metadata/md5-cache/dev-python/python-ly-0.9.5 b/metadata/md5-cache/dev-python/python-ly-0.9.5
index d38fb681b65d..5cc39585e053 100644
--- a/metadata/md5-cache/dev-python/python-ly-0.9.5
+++ b/metadata/md5-cache/dev-python/python-ly-0.9.5
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-ly/python-ly-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3d1b2d507f965a97b95ed5c1f62ca61e
diff --git a/metadata/md5-cache/dev-python/python-lzo-1.08-r1 b/metadata/md5-cache/dev-python/python-lzo-1.08-r1
index ba96153755d5..138e640f5cb4 100644
--- a/metadata/md5-cache/dev-python/python-lzo-1.08-r1
+++ b/metadata/md5-cache/dev-python/python-lzo-1.08-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/lzo:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.oberhumer.com/opensource/lzo/download/LZO-v1/python-lzo-1.08.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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_=f5c538401cc7374aeb40e550c3e88857
diff --git a/metadata/md5-cache/dev-python/python-lzo-1.11 b/metadata/md5-cache/dev-python/python-lzo-1.11
index 5de826f747d3..5c2d9148ced6 100644
--- a/metadata/md5-cache/dev-python/python-lzo-1.11
+++ b/metadata/md5-cache/dev-python/python-lzo-1.11
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/lzo:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.
 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/python-lzo/python-lzo-1.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7f0bb1fe0966fdac1e572499852749ee
diff --git a/metadata/md5-cache/dev-python/python-lzo-1.12 b/metadata/md5-cache/dev-python/python-lzo-1.12
index 088751ee3547..bc0c69d44be0 100644
--- a/metadata/md5-cache/dev-python/python-lzo-1.12
+++ b/metadata/md5-cache/dev-python/python-lzo-1.12
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/lzo:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.
 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/python-lzo/python-lzo-1.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5cce7ae1b30702e953e1733e3368c4b7
diff --git a/metadata/md5-cache/dev-python/python-magic-0.4.10 b/metadata/md5-cache/dev-python/python-magic-0.4.10
index ddfb9b20527f..06f665298cb9 100644
--- a/metadata/md5-cache/dev-python/python-magic-0.4.10
+++ b/metadata/md5-cache/dev-python/python-magic-0.4.10
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/python-magic/python-magic-0.4.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9c4d5bcc263b3d8fc8e72f5e6630c4cc
diff --git a/metadata/md5-cache/dev-python/python-magic-0.4.15 b/metadata/md5-cache/dev-python/python-magic-0.4.15
index 6c183a2760ff..ffeb5408c79a 100644
--- a/metadata/md5-cache/dev-python/python-magic-0.4.15
+++ b/metadata/md5-cache/dev-python/python-magic-0.4.15
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/file[-python] python_targets_python2_7? ( >=dev-lang/python-2.7
 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/ahupp/python-magic/archive/0.4.15.tar.gz -> python-magic-0.4.15.gh.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5c4be71720e6100b1abfec01b1093433
diff --git a/metadata/md5-cache/dev-python/python-magnumclient-2.3.1 b/metadata/md5-cache/dev-python/python-magnumclient-2.3.1
index a04d4d518e70..db02d9efcef1 100644
--- a/metadata/md5-cache/dev-python/python-magnumclient-2.3.1
+++ b/metadata/md5-cache/dev-python/python-magnumclient-2.3.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-magnumclient/python-magnumclient-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=11eaff16308ac490edc4869f933c9234
diff --git a/metadata/md5-cache/dev-python/python-magnumclient-2.9.0 b/metadata/md5-cache/dev-python/python-magnumclient-2.9.0
index 0948583c2871..f7a347eea59c 100644
--- a/metadata/md5-cache/dev-python/python-magnumclient-2.9.0
+++ b/metadata/md5-cache/dev-python/python-magnumclient-2.9.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 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/python-magnumclient/python-magnumclient-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=48eb1ae52fbc95982a5ea7ee7d4220c7
diff --git a/metadata/md5-cache/dev-python/python-manilaclient-1.14.0 b/metadata/md5-cache/dev-python/python-manilaclient-1.14.0
index 6be16cd659cf..471713d9fcf3 100644
--- a/metadata/md5-cache/dev-python/python-manilaclient-1.14.0
+++ b/metadata/md5-cache/dev-python/python-manilaclient-1.14.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-manilaclient/python-manilaclient-1.14.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d51d16d0241dd1916caf86c1ebd45273
diff --git a/metadata/md5-cache/dev-python/python-manilaclient-1.21.0 b/metadata/md5-cache/dev-python/python-manilaclient-1.21.0
index c870b3866313..af64603245aa 100644
--- a/metadata/md5-cache/dev-python/python-manilaclient-1.21.0
+++ b/metadata/md5-cache/dev-python/python-manilaclient-1.21.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3
 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/python-manilaclient/python-manilaclient-1.21.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5753d68768f4e6f3472f7569f483f498
diff --git a/metadata/md5-cache/dev-python/python-memcached-1.53-r1 b/metadata/md5-cache/dev-python/python-memcached-1.53-r1
index 8a315a7bacfb..0e0992cf8a8e 100644
--- a/metadata/md5-cache/dev-python/python-memcached-1.53-r1
+++ b/metadata/md5-cache/dev-python/python-memcached-1.53-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.tummy.com/pub/python-memcached/old-releases/python-memcached-1.53.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d810048acd08a245c84e4114f9bde856
diff --git a/metadata/md5-cache/dev-python/python-memcached-1.58 b/metadata/md5-cache/dev-python/python-memcached-1.58
index 785cb81ac368..986a9c6874b1 100644
--- a/metadata/md5-cache/dev-python/python-memcached-1.58
+++ b/metadata/md5-cache/dev-python/python-memcached-1.58
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/python-memcached/python-memcached-1.58.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0f2d2dc4fadb27bb28881adc96181ed4
diff --git a/metadata/md5-cache/dev-python/python-meteor-0.1.6 b/metadata/md5-cache/dev-python/python-meteor-0.1.6
index bf2a33f4e71c..8c85c7eb0591 100644
--- a/metadata/md5-cache/dev-python/python-meteor-0.1.6
+++ b/metadata/md5-cache/dev-python/python-meteor-0.1.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/python-ddp[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
 SRC_URI=mirror://pypi/p/python-meteor/python-meteor-0.1.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e34ff9c9c7dd7d7e7ff7fd4c8b2b1265
diff --git a/metadata/md5-cache/dev-python/python-mhash-1.4-r1 b/metadata/md5-cache/dev-python/python-mhash-1.4-r1
index 7ba15b5d4544..5592b49b6777 100644
--- a/metadata/md5-cache/dev-python/python-mhash-1.4-r1
+++ b/metadata/md5-cache/dev-python/python-mhash-1.4-r1
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/mhash python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/mhash/python-mhash-1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c30882eb0110ba0f6cc3866c477ed657
diff --git a/metadata/md5-cache/dev-python/python-mistralclient-3.0.2 b/metadata/md5-cache/dev-python/python-mistralclient-3.0.2
index d120f3436203..949769a48f2a 100644
--- a/metadata/md5-cache/dev-python/python-mistralclient-3.0.2
+++ b/metadata/md5-cache/dev-python/python-mistralclient-3.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-mistralclient/python-mistralclient-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=469b491a8b96d34e53c8228efba5246d
diff --git a/metadata/md5-cache/dev-python/python-mistralclient-3.1.4 b/metadata/md5-cache/dev-python/python-mistralclient-3.1.4
index 97c2f573d91d..77309683fbcc 100644
--- a/metadata/md5-cache/dev-python/python-mistralclient-3.1.4
+++ b/metadata/md5-cache/dev-python/python-mistralclient-3.1.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 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/python-mistralclient/python-mistralclient-3.1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d2d16007d036cc442db84eebd786f060
diff --git a/metadata/md5-cache/dev-python/python-monascaclient-1.12.1 b/metadata/md5-cache/dev-python/python-monascaclient-1.12.1
index d6b68346797d..fccf9de90a52 100644
--- a/metadata/md5-cache/dev-python/python-monascaclient-1.12.1
+++ b/metadata/md5-cache/dev-python/python-monascaclient-1.12.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 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/python-monascaclient/python-monascaclient-1.12.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=04fa59d4110a321591d89309c7ff73f9
diff --git a/metadata/md5-cache/dev-python/python-monascaclient-1.5.1 b/metadata/md5-cache/dev-python/python-monascaclient-1.5.1
index 343c7159244a..eef56523c5e9 100644
--- a/metadata/md5-cache/dev-python/python-monascaclient-1.5.1
+++ b/metadata/md5-cache/dev-python/python-monascaclient-1.5.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-monascaclient/python-monascaclient-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1e4b01b7b184a7b04de7c39d546201d9
diff --git a/metadata/md5-cache/dev-python/python-monascaclient-1.7.0 b/metadata/md5-cache/dev-python/python-monascaclient-1.7.0
index 871a227d8f76..8580d596b39a 100644
--- a/metadata/md5-cache/dev-python/python-monascaclient-1.7.0
+++ b/metadata/md5-cache/dev-python/python-monascaclient-1.7.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 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/python-monascaclient/python-monascaclient-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=121c268ae0359129ef8632768b957e12
diff --git a/metadata/md5-cache/dev-python/python-mpd-0.5.5 b/metadata/md5-cache/dev-python/python-mpd-0.5.5
index 0295a1e4a7eb..d27efc6b0c9d 100644
--- a/metadata/md5-cache/dev-python/python-mpd-0.5.5
+++ b/metadata/md5-cache/dev-python/python-mpd-0.5.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/Mic92/python-mpd2/archive/v0.5.5.tar.gz -> python-mpd-0.5.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b42cc0300e9213869a17376fcb4fb9ba
diff --git a/metadata/md5-cache/dev-python/python-msrplib-0.18.0 b/metadata/md5-cache/dev-python/python-msrplib-0.18.0
index 94160835ccf1..9e5f5a26f57d 100644
--- a/metadata/md5-cache/dev-python/python-msrplib-0.18.0
+++ b/metadata/md5-cache/dev-python/python-msrplib-0.18.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/python-application[python_targets_python2_7(-)?,-python_singl
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://download.ag-projects.com/MSRP/python-msrplib-0.18.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d39557643f29968f24611666b48304fd
diff --git a/metadata/md5-cache/dev-python/python-musicbrainz-0.7.4-r1 b/metadata/md5-cache/dev-python/python-musicbrainz-0.7.4-r1
index 70f1c327c114..9698a5201b04 100644
--- a/metadata/md5-cache/dev-python/python-musicbrainz-0.7.4-r1
+++ b/metadata/md5-cache/dev-python/python-musicbrainz-0.7.4-r1
@@ -10,5 +10,5 @@ RDEPEND=media-libs/libdiscid python_targets_pypy? ( >=virtual/pypy-5:0= ) python
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://ftp.musicbrainz.org/pub/musicbrainz/python-musicbrainz2/python-musicbrainz2-0.7.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c4ca0530edd875df771842a93cf24170
diff --git a/metadata/md5-cache/dev-python/python-musicbrainz-ngs-0.6 b/metadata/md5-cache/dev-python/python-musicbrainz-ngs-0.6
index 4e43a569d1e9..49c7003f4870 100644
--- a/metadata/md5-cache/dev-python/python-musicbrainz-ngs-0.6
+++ b/metadata/md5-cache/dev-python/python-musicbrainz-ngs-0.6
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/alastair/python-musicbrainzngs/archive/v0.6.tar.gz -> python-musicbrainzngs0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7df98f3580cc763d8f608de8bba31e96
diff --git a/metadata/md5-cache/dev-python/python-nbxmpp-0.5.6 b/metadata/md5-cache/dev-python/python-nbxmpp-0.5.6
index 5ebb31129a46..fb9887e604c8 100644
--- a/metadata/md5-cache/dev-python/python-nbxmpp-0.5.6
+++ b/metadata/md5-cache/dev-python/python-nbxmpp-0.5.6
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://dev.gajim.org/gajim/python-nbxmpp/repository/archive.tar.gz?ref=nbxmpp-0.5.6 -> python-nbxmpp-0.5.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e0293dc432199804e22b661f15f66c84
diff --git a/metadata/md5-cache/dev-python/python-nbxmpp-0.6.1 b/metadata/md5-cache/dev-python/python-nbxmpp-0.6.1
index 8bdde6773ba9..6311d7eab73c 100644
--- a/metadata/md5-cache/dev-python/python-nbxmpp-0.6.1
+++ b/metadata/md5-cache/dev-python/python-nbxmpp-0.6.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://dev.gajim.org/gajim/python-nbxmpp/repository/archive.tar.gz?ref=nbxmpp-0.6.1 -> python-nbxmpp-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e607e0ac4cc4b1a88c1e699786f5bd83
diff --git a/metadata/md5-cache/dev-python/python-nbxmpp-0.6.6 b/metadata/md5-cache/dev-python/python-nbxmpp-0.6.6
index eb544bba0992..afbe4b128284 100644
--- a/metadata/md5-cache/dev-python/python-nbxmpp-0.6.6
+++ b/metadata/md5-cache/dev-python/python-nbxmpp-0.6.6
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://dev.gajim.org/gajim/python-nbxmpp/repository/archive.tar.gz?ref=nbxmpp-0.6.6 -> python-nbxmpp-0.6.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e607e0ac4cc4b1a88c1e699786f5bd83
diff --git a/metadata/md5-cache/dev-python/python-netlink-0.1 b/metadata/md5-cache/dev-python/python-netlink-0.1
index 7a953e82ef3b..82525a8757ed 100644
--- a/metadata/md5-cache/dev-python/python-netlink-0.1
+++ b/metadata/md5-cache/dev-python/python-netlink-0.1
@@ -10,5 +10,5 @@ RDEPEND=!dev-libs/libnl[python] python_targets_python3_4? ( dev-lang/python:3.4
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/N/NetLink/NetLink-0.1.tar.gz -> python-netlink-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=da47834507136232c0634c7b791bbfd0
diff --git a/metadata/md5-cache/dev-python/python-neutronclient-6.5.0 b/metadata/md5-cache/dev-python/python-neutronclient-6.5.0
index b37589ad5cae..f9d65f3beaa2 100644
--- a/metadata/md5-cache/dev-python/python-neutronclient-6.5.0
+++ b/metadata/md5-cache/dev-python/python-neutronclient-6.5.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=test? ( doc ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-neutronclient/python-neutronclient-6.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a5b707269c1df0bb0b57e52bbe7a210a
diff --git a/metadata/md5-cache/dev-python/python-neutronclient-6.7.0 b/metadata/md5-cache/dev-python/python-neutronclient-6.7.0
index c7c60853e5c0..3510de6921c4 100644
--- a/metadata/md5-cache/dev-python/python-neutronclient-6.7.0
+++ b/metadata/md5-cache/dev-python/python-neutronclient-6.7.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=test? ( doc ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-neutronclient/python-neutronclient-6.7.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f139a1423e7d52f33bbeafec6440a25e
diff --git a/metadata/md5-cache/dev-python/python-neutronclient-6.9.0 b/metadata/md5-cache/dev-python/python-neutronclient-6.9.0
index 074e25a3c48b..b2a9f7b1e52f 100644
--- a/metadata/md5-cache/dev-python/python-neutronclient-6.9.0
+++ b/metadata/md5-cache/dev-python/python-neutronclient-6.9.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=test? ( doc ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-neutronclient/python-neutronclient-6.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=99e8e267094ebd92b37364d179329590
diff --git a/metadata/md5-cache/dev-python/python-novaclient-11.0.0 b/metadata/md5-cache/dev-python/python-novaclient-11.0.0
index 9969ad45f225..eb859c6db0d2 100644
--- a/metadata/md5-cache/dev-python/python-novaclient-11.0.0
+++ b/metadata/md5-cache/dev-python/python-novaclient-11.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/keystoneauth-3.4.0[python_targets_python2_7(-)?,python_targ
 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/python-novaclient/python-novaclient-11.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1671a5e149c16b0b82a53a9ec64d4ea3
diff --git a/metadata/md5-cache/dev-python/python-novaclient-7.1.2 b/metadata/md5-cache/dev-python/python-novaclient-7.1.2
index 22a0ee12bbac..43176872d62b 100644
--- a/metadata/md5-cache/dev-python/python-novaclient-7.1.2
+++ b/metadata/md5-cache/dev-python/python-novaclient-7.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/keystoneauth-2.18.0[python_targets_python2_7(-)?,python_tar
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-novaclient/python-novaclient-7.1.2.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=19e92fd226f7b0ca7888c98070d7d522
diff --git a/metadata/md5-cache/dev-python/python-novaclient-9.1.2 b/metadata/md5-cache/dev-python/python-novaclient-9.1.2
index 2e4506c3bd89..9bbfa91c2f48 100644
--- a/metadata/md5-cache/dev-python/python-novaclient-9.1.2
+++ b/metadata/md5-cache/dev-python/python-novaclient-9.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/keystoneauth-3.1.0[python_targets_python2_7(-)?,python_targ
 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/python-novaclient/python-novaclient-9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e1247fc9fea003c17219e7192bff3895
diff --git a/metadata/md5-cache/dev-python/python-nss-0.16.0 b/metadata/md5-cache/dev-python/python-nss-0.16.0
index ccf34ad05723..367103a1368e 100644
--- a/metadata/md5-cache/dev-python/python-nss-0.16.0
+++ b/metadata/md5-cache/dev-python/python-nss-0.16.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/nspr dev-libs/nss python_targets_python2_7? ( >=dev-lang/python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/security/python-nss/releases/PYNSS_RELEASE_0_16_0/src/python-nss-0.16.0.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0739c43e03b21986f9fca943209871d4
diff --git a/metadata/md5-cache/dev-python/python-octaviaclient-1.4.0 b/metadata/md5-cache/dev-python/python-octaviaclient-1.4.0
index 51d6a844b2d9..4d7040447c7e 100644
--- a/metadata/md5-cache/dev-python/python-octaviaclient-1.4.0
+++ b/metadata/md5-cache/dev-python/python-octaviaclient-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/appdirs-1.3.0[python_targets_python2_7(-)?,python_targets_p
 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/python-octaviaclient/python-octaviaclient-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=211666be908644019fd1a67310f9f4aa
diff --git a/metadata/md5-cache/dev-python/python-oembed-0.2.4 b/metadata/md5-cache/dev-python/python-oembed-0.2.4
index db3657705f5c..1e5dd344f853 100644
--- a/metadata/md5-cache/dev-python/python-oembed-0.2.4
+++ b/metadata/md5-cache/dev-python/python-oembed-0.2.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/python-oembed/python-oembed-0.2.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d9486eca79038b05372c92fa7185a69d
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 91193dabf0e3..a4cdfdadc4f5 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
@@ -10,5 +10,5 @@ RDEPEND=mysql? ( >=dev-python/mysql-python-1.2.2[python_targets_python2_7(-)?,-p
 REQUIRED_USE=|| ( python_targets_python2_7 )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-python/python-openstackclient-3.14.2 b/metadata/md5-cache/dev-python/python-openstackclient-3.14.2
index 72ba5cbb643d..d97051c7f89f 100644
--- a/metadata/md5-cache/dev-python/python-openstackclient-3.14.2
+++ b/metadata/md5-cache/dev-python/python-openstackclient-3.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 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/python-openstackclient/python-openstackclient-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0391a98fa981cf544ac76d728b07815e
diff --git a/metadata/md5-cache/dev-python/python-openstackclient-3.16.1 b/metadata/md5-cache/dev-python/python-openstackclient-3.16.1
index fe6a27c9ec72..05fef1f8bfe9 100644
--- a/metadata/md5-cache/dev-python/python-openstackclient-3.16.1
+++ b/metadata/md5-cache/dev-python/python-openstackclient-3.16.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 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/python-openstackclient/python-openstackclient-3.16.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ff24c999c068c5462aeeabc505f918fc
diff --git a/metadata/md5-cache/dev-python/python-otrs-0.3.0 b/metadata/md5-cache/dev-python/python-otrs-0.3.0
index c7ea4de1deb1..f7462ab55075 100644
--- a/metadata/md5-cache/dev-python/python-otrs-0.3.0
+++ b/metadata/md5-cache/dev-python/python-otrs-0.3.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-otrs/python-otrs-0.3.0.zip
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=385331713d65298014033463903bf08d
diff --git a/metadata/md5-cache/dev-python/python-pam-0.1.4 b/metadata/md5-cache/dev-python/python-pam-0.1.4
index 227310aa0c23..ded1bea50f9e 100644
--- a/metadata/md5-cache/dev-python/python-pam-0.1.4
+++ b/metadata/md5-cache/dev-python/python-pam-0.1.4
@@ -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=mirror://pypi/p/pam/pam-0.1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2eca9ee131f5912d35ff9f903accba23
diff --git a/metadata/md5-cache/dev-python/python-poppler-qt5-0.24.2_p20170214 b/metadata/md5-cache/dev-python/python-poppler-qt5-0.24.2_p20170214
index da893130e56e..c0de9a721b79 100644
--- a/metadata/md5-cache/dev-python/python-poppler-qt5-0.24.2_p20170214
+++ b/metadata/md5-cache/dev-python/python-poppler-qt5-0.24.2_p20170214
@@ -10,5 +10,5 @@ RDEPEND=app-text/poppler[qt5] dev-python/PyQt5[python_targets_python2_7(-)?,pyth
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/wbsoft/python-poppler-qt5/archive/50fb2eb9ea34cf94e3756b7ddfc601af023267d5.tar.gz -> python-poppler-qt5-0.24.2_p20170214.tar.gz
-_eclasses_=desktop	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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fa0b94b8e33e9790f839abdf10007953
diff --git a/metadata/md5-cache/dev-python/python-prctl-1.6.1 b/metadata/md5-cache/dev-python/python-prctl-1.6.1
index 661beb2363fe..7cd85cec893c 100644
--- a/metadata/md5-cache/dev-python/python-prctl-1.6.1
+++ b/metadata/md5-cache/dev-python/python-prctl-1.6.1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/libcap python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/seveas/python-prctl/tarball/v1.6.1 -> python-prctl-1.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=442d2dfbf9bba28241d4a2a7069d0c77
diff --git a/metadata/md5-cache/dev-python/python-ptrace-0.8.1-r1 b/metadata/md5-cache/dev-python/python-ptrace-0.8.1-r1
index 05649e69146a..b29516402813 100644
--- a/metadata/md5-cache/dev-python/python-ptrace-0.8.1-r1
+++ b/metadata/md5-cache/dev-python/python-ptrace-0.8.1-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/python-ptrace/python-ptrace-0.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6813c5f9bc1036dc84e15254ea4b92c9
diff --git a/metadata/md5-cache/dev-python/python-recaptcha-2.0.0 b/metadata/md5-cache/dev-python/python-recaptcha-2.0.0
index 299bb4e4ffae..7d385f7ba501 100644
--- a/metadata/md5-cache/dev-python/python-recaptcha-2.0.0
+++ b/metadata/md5-cache/dev-python/python-recaptcha-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pycrypto[python_targets_python2_7(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/redhat-infosec/python-recaptcha/releases/download/v2.0.0/python-recaptcha-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4110078a6f81f8fc733e4f96810c0fa4
diff --git a/metadata/md5-cache/dev-python/python-recaptcha-2.0.1 b/metadata/md5-cache/dev-python/python-recaptcha-2.0.1
index 33fe78e6003e..3e67cfe47b73 100644
--- a/metadata/md5-cache/dev-python/python-recaptcha-2.0.1
+++ b/metadata/md5-cache/dev-python/python-recaptcha-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pycrypto[python_targets_python2_7(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/redhat-infosec/python-recaptcha/releases/download/v2.0.1/python-recaptcha-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=881174390843ae56877a343a88db1aa4
diff --git a/metadata/md5-cache/dev-python/python-redmine-2.0.2 b/metadata/md5-cache/dev-python/python-redmine-2.0.2
index 58af48ede4d7..c0c7eea5ef3d 100644
--- a/metadata/md5-cache/dev-python/python-redmine-2.0.2
+++ b/metadata/md5-cache/dev-python/python-redmine-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/requests[python_targets_pypy(-)?,python_targets_python2_7(-)?
 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/python-redmine/python-redmine-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dfcc4296cf7d6fac4e7046c9aeaf4e35
diff --git a/metadata/md5-cache/dev-python/python-rethinkdb-2.3.0 b/metadata/md5-cache/dev-python/python-rethinkdb-2.3.0
index 342b43dad4aa..607a628bfc79 100644
--- a/metadata/md5-cache/dev-python/python-rethinkdb-2.3.0
+++ b/metadata/md5-cache/dev-python/python-rethinkdb-2.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/r/rethinkdb/rethinkdb-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=34f5afe8600df48ccde6aea652ba47b4
diff --git a/metadata/md5-cache/dev-python/python-saharaclient-1.1.0 b/metadata/md5-cache/dev-python/python-saharaclient-1.1.0
index 31e51932b743..bc5c229171da 100644
--- a/metadata/md5-cache/dev-python/python-saharaclient-1.1.0
+++ b/metadata/md5-cache/dev-python/python-saharaclient-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-saharaclient/python-saharaclient-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=48b2c24c4b00f93e0f2746eee8cb124b
diff --git a/metadata/md5-cache/dev-python/python-saharaclient-1.5.0 b/metadata/md5-cache/dev-python/python-saharaclient-1.5.0
index 048d4195d7df..51d2113cca20 100644
--- a/metadata/md5-cache/dev-python/python-saharaclient-1.5.0
+++ b/metadata/md5-cache/dev-python/python-saharaclient-1.5.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 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/python-saharaclient/python-saharaclient-1.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f77cc33b95e249f6a65fa3c68cfd93d5
diff --git a/metadata/md5-cache/dev-python/python-scsi-0_pre160211 b/metadata/md5-cache/dev-python/python-scsi-0_pre160211
index b52f4c7076aa..4efa966072f5 100644
--- a/metadata/md5-cache/dev-python/python-scsi-0_pre160211
+++ b/metadata/md5-cache/dev-python/python-scsi-0_pre160211
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/rosjat/python-scsi/archive/957e5538d8d441fb792db6fbbdc0a5e8d57d9c7d.zip -> python-scsi-0_pre160211.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=453c802d7a2d36a5dfc4d53e9a75662e
diff --git a/metadata/md5-cache/dev-python/python-scsi-9999 b/metadata/md5-cache/dev-python/python-scsi-9999
index d6c6bc9f395e..6b433afd752d 100644
--- a/metadata/md5-cache/dev-python/python-scsi-9999
+++ b/metadata/md5-cache/dev-python/python-scsi-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=dbfd7b56a6d1471be8260cfc2859d7a4
diff --git a/metadata/md5-cache/dev-python/python-senlinclient-1.0.0 b/metadata/md5-cache/dev-python/python-senlinclient-1.0.0
index 8f7f63c800bc..4fd03ac0cdf1 100644
--- a/metadata/md5-cache/dev-python/python-senlinclient-1.0.0
+++ b/metadata/md5-cache/dev-python/python-senlinclient-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-senlinclient/python-senlinclient-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c18d526b6bd6716540f6ba0f8a919f0f
diff --git a/metadata/md5-cache/dev-python/python-senlinclient-1.2.0 b/metadata/md5-cache/dev-python/python-senlinclient-1.2.0
index 761bdee31f23..1ec3629b6c66 100644
--- a/metadata/md5-cache/dev-python/python-senlinclient-1.2.0
+++ b/metadata/md5-cache/dev-python/python-senlinclient-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3
 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/python-senlinclient/python-senlinclient-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=57f0e635b297fbe668cdc32e63ee0779
diff --git a/metadata/md5-cache/dev-python/python-sense-hat-2.2.0 b/metadata/md5-cache/dev-python/python-sense-hat-2.2.0
index 90d834b37126..a727cb9c0d31 100644
--- a/metadata/md5-cache/dev-python/python-sense-hat-2.2.0
+++ b/metadata/md5-cache/dev-python/python-sense-hat-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/RPi-Distro/python-sense-hat/archive/v2.2.0.tar.gz -> python-sense-hat-2.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8d946bdf811fe0a3ec16b2412d9a787a
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 1a7fea5a10d9..47719ce41aab 100644
--- a/metadata/md5-cache/dev-python/python-slip-0.6.5
+++ b/metadata/md5-cache/dev-python/python-slip-0.6.5
@@ -10,5 +10,5 @@ RDEPEND=dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,python_targe
 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/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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-python/python-social-auth-0.1.26 b/metadata/md5-cache/dev-python/python-social-auth-0.1.26
index 6783caac24ec..2d2cd4d122fb 100644
--- a/metadata/md5-cache/dev-python/python-social-auth-0.1.26
+++ b/metadata/md5-cache/dev-python/python-social-auth-0.1.26
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( dev-python/python-openid[python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://github.com/omab/python-social-auth/archive/v0.1.26.tar.gz -> python-social-auth-0.1.26.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=67af79a87f57eb539115cdbcfed532f6
diff --git a/metadata/md5-cache/dev-python/python-social-auth-0.2.10 b/metadata/md5-cache/dev-python/python-social-auth-0.2.10
index 256a0cf6e653..b9b876a020cc 100644
--- a/metadata/md5-cache/dev-python/python-social-auth-0.2.10
+++ b/metadata/md5-cache/dev-python/python-social-auth-0.2.10
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( dev-python/python-openid[python_targets_pyth
 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/omab/python-social-auth/archive/v0.2.10.tar.gz -> python-social-auth-0.2.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bc9a5665cc2aec5f932bad2dcc6ae933
diff --git a/metadata/md5-cache/dev-python/python-socketio-1.7.4 b/metadata/md5-cache/dev-python/python-socketio-1.7.4
index 3071ade45fea..bafdbfb7e7af 100644
--- a/metadata/md5-cache/dev-python/python-socketio-1.7.4
+++ b/metadata/md5-cache/dev-python/python-socketio-1.7.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/python-socketio/python-socketio-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=45abc6739289922d402f5538ed44251a
diff --git a/metadata/md5-cache/dev-python/python-socketio-1.8.0 b/metadata/md5-cache/dev-python/python-socketio-1.8.0
index d04c51b484b6..c44daafad29d 100644
--- a/metadata/md5-cache/dev-python/python-socketio-1.8.0
+++ b/metadata/md5-cache/dev-python/python-socketio-1.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/python-socketio/python-socketio-1.8.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=77c6bc1db8383e40011262e73ccee94d
diff --git a/metadata/md5-cache/dev-python/python-socketio-2.0.0 b/metadata/md5-cache/dev-python/python-socketio-2.0.0
index b473d2b0fd9c..a622e6064930 100644
--- a/metadata/md5-cache/dev-python/python-socketio-2.0.0
+++ b/metadata/md5-cache/dev-python/python-socketio-2.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/python-socketio/python-socketio-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=51a485599919c9ef0230c1e6a22215de
diff --git a/metadata/md5-cache/dev-python/python-spidermonkey-0.0.10 b/metadata/md5-cache/dev-python/python-spidermonkey-0.0.10
index e5a99f4494cc..1a61377d3ce2 100644
--- a/metadata/md5-cache/dev-python/python-spidermonkey-0.0.10
+++ b/metadata/md5-cache/dev-python/python-spidermonkey-0.0.10
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-spidermonkey/python-spidermonkey-0.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0289a3b377143e40885196345b2a7c89
diff --git a/metadata/md5-cache/dev-python/python-sqlparse-0.2.3 b/metadata/md5-cache/dev-python/python-sqlparse-0.2.3
index e8c917fbb8e2..919204ca88be 100644
--- a/metadata/md5-cache/dev-python/python-sqlparse-0.2.3
+++ b/metadata/md5-cache/dev-python/python-sqlparse-0.2.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( 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/sqlparse/sqlparse-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2a95a4592bf829e46e584f678cf8daf7
diff --git a/metadata/md5-cache/dev-python/python-sqlparse-0.2.4 b/metadata/md5-cache/dev-python/python-sqlparse-0.2.4
index ce731484198e..ede49204e80f 100644
--- a/metadata/md5-cache/dev-python/python-sqlparse-0.2.4
+++ b/metadata/md5-cache/dev-python/python-sqlparse-0.2.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( 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/sqlparse/sqlparse-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2a95a4592bf829e46e584f678cf8daf7
diff --git a/metadata/md5-cache/dev-python/python-stdnum-1.9 b/metadata/md5-cache/dev-python/python-stdnum-1.9
index 8f499e54a295..d4a49679c155 100644
--- a/metadata/md5-cache/dev-python/python-stdnum-1.9
+++ b/metadata/md5-cache/dev-python/python-stdnum-1.9
@@ -10,5 +10,5 @@ RDEPEND=vies? ( || ( dev-python/zeep dev-python/suds ) ) python_targets_python2_
 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/python-stdnum/python-stdnum-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8fdbb2f009e2ce45888e15f43f02b030
diff --git a/metadata/md5-cache/dev-python/python-swiftclient-3.0.0 b/metadata/md5-cache/dev-python/python-swiftclient-3.0.0
index a4988b47ce49..ff5f436db19b 100644
--- a/metadata/md5-cache/dev-python/python-swiftclient-3.0.0
+++ b/metadata/md5-cache/dev-python/python-swiftclient-3.0.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/python-futures[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-swiftclient/python-swiftclient-3.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ff472f64bf836a7d2cf2a09f7357896b
diff --git a/metadata/md5-cache/dev-python/python-swiftclient-3.1.0 b/metadata/md5-cache/dev-python/python-swiftclient-3.1.0
index ed4cab3ef8ae..a3ca2e6401a9 100644
--- a/metadata/md5-cache/dev-python/python-swiftclient-3.1.0
+++ b/metadata/md5-cache/dev-python/python-swiftclient-3.1.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/python-futures[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-swiftclient/python-swiftclient-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2e07384059d38dda12df159b46b55a93
diff --git a/metadata/md5-cache/dev-python/python-swiftclient-3.3.0 b/metadata/md5-cache/dev-python/python-swiftclient-3.3.0
index 6655baf1dc61..972c82620762 100644
--- a/metadata/md5-cache/dev-python/python-swiftclient-3.3.0
+++ b/metadata/md5-cache/dev-python/python-swiftclient-3.3.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/python-futures[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-swiftclient/python-swiftclient-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8b4ee01e8bbdf6aae576af499b1dba7b
diff --git a/metadata/md5-cache/dev-python/python-swiftclient-3.4.0 b/metadata/md5-cache/dev-python/python-swiftclient-3.4.0
index e50f3e39994f..ec5c9955d789 100644
--- a/metadata/md5-cache/dev-python/python-swiftclient-3.4.0
+++ b/metadata/md5-cache/dev-python/python-swiftclient-3.4.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/python-futures[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-swiftclient/python-swiftclient-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8b4ee01e8bbdf6aae576af499b1dba7b
diff --git a/metadata/md5-cache/dev-python/python-swiftclient-3.5.0 b/metadata/md5-cache/dev-python/python-swiftclient-3.5.0
index b9fcbb6683bc..5ca1c409c9e6 100644
--- a/metadata/md5-cache/dev-python/python-swiftclient-3.5.0
+++ b/metadata/md5-cache/dev-python/python-swiftclient-3.5.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/python-futures[python_targets_python2_7(-)?,python_targets_pytho
 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/python-swiftclient/python-swiftclient-3.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1ff1f69c8f6db35c59fc87ebb03fef3c
diff --git a/metadata/md5-cache/dev-python/python-systemd-233 b/metadata/md5-cache/dev-python/python-systemd-233
index 103d35b0cdc3..ba00761090ad 100644
--- a/metadata/md5-cache/dev-python/python-systemd-233
+++ b/metadata/md5-cache/dev-python/python-systemd-233
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/systemd:0= !sys-apps/systemd[python(-)] python_targets_python2_
 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/systemd/python-systemd/archive/v233.tar.gz -> python-systemd-233.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=70df0bcc2a25e78d05f7ccbbfc89968a
diff --git a/metadata/md5-cache/dev-python/python-termstyle-0.1.10 b/metadata/md5-cache/dev-python/python-termstyle-0.1.10
index afd3796aab1b..653376f19461 100644
--- a/metadata/md5-cache/dev-python/python-termstyle-0.1.10
+++ b/metadata/md5-cache/dev-python/python-termstyle-0.1.10
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/gfxmonk/termstyle/archive/0.1.10.tar.gz -> python-termstyle-0.1.10.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cd53f4bcc4ad7d095ead1b28a6ed7bc1
diff --git a/metadata/md5-cache/dev-python/python-troveclient-1.3.0 b/metadata/md5-cache/dev-python/python-troveclient-1.3.0
index 29ea89f0946b..3a33166614a6 100644
--- a/metadata/md5-cache/dev-python/python-troveclient-1.3.0
+++ b/metadata/md5-cache/dev-python/python-troveclient-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/prettytable-0.7[python_targets_python2_7(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-troveclient/python-troveclient-1.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=70deab1871443692a9684932fa9cbabf
diff --git a/metadata/md5-cache/dev-python/python-troveclient-2.5.0 b/metadata/md5-cache/dev-python/python-troveclient-2.5.0
index 1dd2977b02e4..16fcf0c59fd3 100644
--- a/metadata/md5-cache/dev-python/python-troveclient-2.5.0
+++ b/metadata/md5-cache/dev-python/python-troveclient-2.5.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/prettytable-0.7[python_targets_python2_7(-)?,python_targets
 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/python-troveclient/python-troveclient-2.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2fd5ed50632fdd43225e08066427d629
diff --git a/metadata/md5-cache/dev-python/python-tvrage-0.4.1 b/metadata/md5-cache/dev-python/python-tvrage-0.4.1
index 791303f62c8b..af134effca4c 100644
--- a/metadata/md5-cache/dev-python/python-tvrage-0.4.1
+++ b/metadata/md5-cache/dev-python/python-tvrage-0.4.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/beautifulsoup:python-2[python_targets_pypy(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-tvrage/python-tvrage-0.4.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3e485bdf48a392f00d06b21cc95d882f
diff --git a/metadata/md5-cache/dev-python/python-twitter-3.3 b/metadata/md5-cache/dev-python/python-twitter-3.3
index 59c95af6c974..1f1dd00cc864 100644
--- a/metadata/md5-cache/dev-python/python-twitter-3.3
+++ b/metadata/md5-cache/dev-python/python-twitter-3.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/python-twitter/python-twitter-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a84bd3719c06312f094231be564cb3d0
diff --git a/metadata/md5-cache/dev-python/python-uinput-0.10.2 b/metadata/md5-cache/dev-python/python-uinput-0.10.2
index e65c30879f6d..b2408a1cec30 100644
--- a/metadata/md5-cache/dev-python/python-uinput-0.10.2
+++ b/metadata/md5-cache/dev-python/python-uinput-0.10.2
@@ -10,5 +10,5 @@ RDEPEND=virtual/udev python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-uinput/python-uinput-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=009ac6e9b5e2668027c8217915496052
diff --git a/metadata/md5-cache/dev-python/python-urljr-1.0.1-r1 b/metadata/md5-cache/dev-python/python-urljr-1.0.1-r1
index 0069b8237e99..c6842c43ce28 100644
--- a/metadata/md5-cache/dev-python/python-urljr-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/python-urljr-1.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=curl? ( >=dev-python/pycurl-7.15.1[python_targets_python2_7(-)?,-python_
 REQUIRED_USE=test? ( curl ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.openidenabled.com/resources/downloads/python-openid/python-urljr-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fef8b38ba848023c56db17ee42c75f5d
diff --git a/metadata/md5-cache/dev-python/python-virtkey-0.60.0-r2 b/metadata/md5-cache/dev-python/python-virtkey-0.60.0-r2
index 152722b3a6bc..ded111736750 100644
--- a/metadata/md5-cache/dev-python/python-virtkey-0.60.0-r2
+++ b/metadata/md5-cache/dev-python/python-virtkey-0.60.0-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 x11-libs/libX11 x11-libs/libXtst x11-libs/gtk+:2 python_
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://launchpad.net/python-virtkey/0.60/0.60.0/+download/python-virtkey-0.60.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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_=a708ac39fb123539624d2c032b69cb25
diff --git a/metadata/md5-cache/dev-python/python-wpactrl-20081102-r1 b/metadata/md5-cache/dev-python/python-wpactrl-20081102-r1
index c6435856ba06..1ae7d8298e55 100644
--- a/metadata/md5-cache/dev-python/python-wpactrl-20081102-r1
+++ b/metadata/md5-cache/dev-python/python-wpactrl-20081102-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=mirror://gentoo/python-wpactrl-20081102.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6fa6e5fbf65897854c37e48a19d79efa
diff --git a/metadata/md5-cache/dev-python/python-xcaplib-1.1.0 b/metadata/md5-cache/dev-python/python-xcaplib-1.1.0
index b2f6f48fb51f..cf42410377bd 100644
--- a/metadata/md5-cache/dev-python/python-xcaplib-1.1.0
+++ b/metadata/md5-cache/dev-python/python-xcaplib-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://download.ag-projects.com/XCAP/python-xcaplib-1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3f454c315d3c5f1e8e273e0f6d3e511e
diff --git a/metadata/md5-cache/dev-python/python-xlib-0.15_rc1-r2 b/metadata/md5-cache/dev-python/python-xlib-0.15_rc1-r2
index 28f940d6408a..c5aab14049e6 100644
--- a/metadata/md5-cache/dev-python/python-xlib-0.15_rc1-r2
+++ b/metadata/md5-cache/dev-python/python-xlib-0.15_rc1-r2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/python-xlib/python-xlib-0.15rc1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f329645578ee05091d6bcc2594089259
diff --git a/metadata/md5-cache/dev-python/python-xlib-0.19 b/metadata/md5-cache/dev-python/python-xlib-0.19
index a266924115d7..9cb987fff33e 100644
--- a/metadata/md5-cache/dev-python/python-xlib-0.19
+++ b/metadata/md5-cache/dev-python/python-xlib-0.19
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,pyth
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/python-xlib/python-xlib/releases/download/0.19/python-xlib-0.19.tar.bz2
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ae6cd4b88fb947c998accdf02d2d9787
diff --git a/metadata/md5-cache/dev-python/python-xlib-0.23 b/metadata/md5-cache/dev-python/python-xlib-0.23
index e779781c900a..ba62453ea8a8 100644
--- a/metadata/md5-cache/dev-python/python-xlib-0.23
+++ b/metadata/md5-cache/dev-python/python-xlib-0.23
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,pyth
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/python-xlib/python-xlib/releases/download/0.23/python-xlib-0.23.tar.bz2
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=607d9aa05026d990c716252f984764cf
diff --git a/metadata/md5-cache/dev-python/python-yadis-1.1.0-r2 b/metadata/md5-cache/dev-python/python-yadis-1.1.0-r2
index 574741f49667..efafc9ca21b0 100644
--- a/metadata/md5-cache/dev-python/python-yadis-1.1.0-r2
+++ b/metadata/md5-cache/dev-python/python-yadis-1.1.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.openidenabled.com/resources/downloads/python-openid/python-yadis-1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=446abdf6ef45eedbf51c646b4762fc0d
diff --git a/metadata/md5-cache/dev-python/python-zaqarclient-1.2.0 b/metadata/md5-cache/dev-python/python-zaqarclient-1.2.0
index 6095bf769c1d..751eb7a473b0 100644
--- a/metadata/md5-cache/dev-python/python-zaqarclient-1.2.0
+++ b/metadata/md5-cache/dev-python/python-zaqarclient-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3
 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/python-zaqarclient/python-zaqarclient-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0165f7e6052d8f74e310c2882d656fe9
diff --git a/metadata/md5-cache/dev-python/python-zipstream-1.1.4 b/metadata/md5-cache/dev-python/python-zipstream-1.1.4
index 417d1146c0ee..e00a7e3db4fe 100644
--- a/metadata/md5-cache/dev-python/python-zipstream-1.1.4
+++ b/metadata/md5-cache/dev-python/python-zipstream-1.1.4
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/allanlei/python-zipstream/archive/v1.1.4.tar.gz -> python-zipstream-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2a98adb66672ee4a9c17d069e434b47c
diff --git a/metadata/md5-cache/dev-python/python-zunclient-1.1.0 b/metadata/md5-cache/dev-python/python-zunclient-1.1.0
index f1123d49cd45..2d5fb9976a8f 100644
--- a/metadata/md5-cache/dev-python/python-zunclient-1.1.0
+++ b/metadata/md5-cache/dev-python/python-zunclient-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targe
 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/python-zunclient/python-zunclient-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e08c94babeecf266849ed4ceaac0bfe8
diff --git a/metadata/md5-cache/dev-python/python-zunclient-2.1.0 b/metadata/md5-cache/dev-python/python-zunclient-2.1.0
index 9931a7e58885..b03320284c35 100644
--- a/metadata/md5-cache/dev-python/python-zunclient-2.1.0
+++ b/metadata/md5-cache/dev-python/python-zunclient-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targe
 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/python-zunclient/python-zunclient-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1782876b846a14ee63596bb890ac586c
diff --git a/metadata/md5-cache/dev-python/python3-lxc-3.0.2 b/metadata/md5-cache/dev-python/python3-lxc-3.0.2
new file mode 100644
index 000000000000..d1728102e40e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python3-lxc-3.0.2
@@ -0,0 +1,15 @@
+BDEPEND=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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=app-emulation/lxc-3.0 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(-)]
+DESCRIPTION=Python bindings for LXC
+EAPI=7
+HOMEPAGE=https://linuxcontainers.org/lxc/
+IUSE=python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-3
+RDEPEND=>=app-emulation/lxc-3.0 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=https://linuxcontainers.org/downloads/lxc/python3-lxc-3.0.2.tar.gz
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=4c2eb3c75db2db5c0cd867d575b5a1df
diff --git a/metadata/md5-cache/dev-python/python3-openid-3.1.0 b/metadata/md5-cache/dev-python/python3-openid-3.1.0
index 27ff4bf7ef08..14bf5a05101d 100644
--- a/metadata/md5-cache/dev-python/python3-openid-3.1.0
+++ b/metadata/md5-cache/dev-python/python3-openid-3.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python3-openid/python3-openid-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=40cfb26af38102ae43e59f44e1db7b6b
diff --git a/metadata/md5-cache/dev-python/python_orocos_kdl-1.4.0-r1 b/metadata/md5-cache/dev-python/python_orocos_kdl-1.4.0-r1
index a5d47e5ee365..8a044887fe67 100644
--- a/metadata/md5-cache/dev-python/python_orocos_kdl-1.4.0-r1
+++ b/metadata/md5-cache/dev-python/python_orocos_kdl-1.4.0-r1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/orocos/orocos_kinematics_dynamics/archive/v1.4.0.tar.gz -> orocos_kinematics_dynamics-1.4.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	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=ab45f8744c92f4ce4f78e1a96f6b51b3
diff --git a/metadata/md5-cache/dev-python/python_orocos_kdl-9999 b/metadata/md5-cache/dev-python/python_orocos_kdl-9999
index a0167772bb5f..0fc1f5231141 100644
--- a/metadata/md5-cache/dev-python/python_orocos_kdl-9999
+++ b/metadata/md5-cache/dev-python/python_orocos_kdl-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-libs/orocos_kdl-1.4.0:= dev-python/sip[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=ab45f8744c92f4ce4f78e1a96f6b51b3
diff --git a/metadata/md5-cache/dev-python/pythondialog-3.2.2 b/metadata/md5-cache/dev-python/pythondialog-3.2.2
index 6b0a2a46983b..fc4f6e25422c 100644
--- a/metadata/md5-cache/dev-python/pythondialog-3.2.2
+++ b/metadata/md5-cache/dev-python/pythondialog-3.2.2
@@ -10,5 +10,5 @@ RDEPEND=dev-util/dialog python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_ta
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pythondialog//3.2.2/python3-pythondialog-3.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f77c29262bdec63b1c92d912875f5b10
diff --git a/metadata/md5-cache/dev-python/pythondialog-3.3.0 b/metadata/md5-cache/dev-python/pythondialog-3.3.0
index 9ca857aa12ae..2bcdd84835b8 100644
--- a/metadata/md5-cache/dev-python/pythondialog-3.3.0
+++ b/metadata/md5-cache/dev-python/pythondialog-3.3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-util/dialog python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_ta
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pythondialog//3.3.0/python3-pythondialog-3.3.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7454c2df759dc6b85ec21be6f1073557
diff --git a/metadata/md5-cache/dev-python/pythondialog-3.3.0-r200 b/metadata/md5-cache/dev-python/pythondialog-3.3.0-r200
index e8564ba14032..b2f848b1d0d8 100644
--- a/metadata/md5-cache/dev-python/pythondialog-3.3.0-r200
+++ b/metadata/md5-cache/dev-python/pythondialog-3.3.0-r200
@@ -10,5 +10,5 @@ RDEPEND=dev-util/dialog python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targ
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=python-2
 SRC_URI=mirror://pypi/p/python2-pythondialog/python2-pythondialog-3.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7027ed08461aa3845daaa618d181bdf9
diff --git a/metadata/md5-cache/dev-python/pythondialog-3.4.0 b/metadata/md5-cache/dev-python/pythondialog-3.4.0
index 815e6dbaa88c..54bb8450e372 100644
--- a/metadata/md5-cache/dev-python/pythondialog-3.4.0
+++ b/metadata/md5-cache/dev-python/pythondialog-3.4.0
@@ -10,5 +10,5 @@ RDEPEND=dev-util/dialog python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_ta
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pythondialog//3.4.0/python3-pythondialog-3.4.0.tar.bz2
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0e44db2734a0f4890df403eb5a905513
diff --git a/metadata/md5-cache/dev-python/pythondialog-3.4.0-r200 b/metadata/md5-cache/dev-python/pythondialog-3.4.0-r200
index fac0c358d34d..d817ef363985 100644
--- a/metadata/md5-cache/dev-python/pythondialog-3.4.0-r200
+++ b/metadata/md5-cache/dev-python/pythondialog-3.4.0-r200
@@ -10,5 +10,5 @@ RDEPEND=dev-util/dialog python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targ
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=python-2
 SRC_URI=mirror://pypi/p/python2-pythondialog/python2-pythondialog-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ab73ba0e7bf7ac9be2955463c2f615d8
diff --git a/metadata/md5-cache/dev-python/pythonutils-0.4.0-r1 b/metadata/md5-cache/dev-python/pythonutils-0.4.0-r1
index 2cfcad6ee726..4d8131a9ce22 100644
--- a/metadata/md5-cache/dev-python/pythonutils-0.4.0-r1
+++ b/metadata/md5-cache/dev-python/pythonutils-0.4.0-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=http://www.voidspace.org.uk/downloads/pythonutils-0.4.0.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=726633c55640e516433f53135a8dbf14
diff --git a/metadata/md5-cache/dev-python/pythonz-bd-1.11.4 b/metadata/md5-cache/dev-python/pythonz-bd-1.11.4
index 095ff978ac24..16f4f4432c44 100644
--- a/metadata/md5-cache/dev-python/pythonz-bd-1.11.4
+++ b/metadata/md5-cache/dev-python/pythonz-bd-1.11.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/pythonz-bd/pythonz-bd-1.11.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8a90a742063c5b2ce111ae726225af37
diff --git a/metadata/md5-cache/dev-python/pytidylib-0.2.4 b/metadata/md5-cache/dev-python/pytidylib-0.2.4
index 6e419ef3f1cd..c20df528f260 100644
--- a/metadata/md5-cache/dev-python/pytidylib-0.2.4
+++ b/metadata/md5-cache/dev-python/pytidylib-0.2.4
@@ -10,5 +10,5 @@ RDEPEND=app-text/htmltidy python_targets_pypy? ( >=virtual/pypy-5:0= ) python_ta
 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/pytidylib/pytidylib-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c2970b8d61bb7722bad07dc411e32327
diff --git a/metadata/md5-cache/dev-python/pytoml-0.1.14 b/metadata/md5-cache/dev-python/pytoml-0.1.14
index acd764cc0ebf..84ad1c3ee63b 100644
--- a/metadata/md5-cache/dev-python/pytoml-0.1.14
+++ b/metadata/md5-cache/dev-python/pytoml-0.1.14
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/avakar/pytoml/archive/v0.1.14.tar.gz -> pytoml-0.1.14.tar.gz test? ( https://github.com/avakar/toml-test/archive/fa9501a192b7c46b82059caddaef978e3de883dc.tar.gz -> toml-test-fa9501a192b7c46b82059caddaef978e3de883dc.tar.gz )
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ab5dd179857fe14e7d5527d56d214a67
diff --git a/metadata/md5-cache/dev-python/pytoml-0.1.18 b/metadata/md5-cache/dev-python/pytoml-0.1.18
index 5ca3d1be5a43..287e904b0d86 100644
--- a/metadata/md5-cache/dev-python/pytoml-0.1.18
+++ b/metadata/md5-cache/dev-python/pytoml-0.1.18
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/avakar/pytoml/archive/v0.1.18.tar.gz -> pytoml-0.1.18.tar.gz test? ( https://github.com/avakar/toml-test/archive/fa9501a192b7c46b82059caddaef978e3de883dc.tar.gz -> toml-test-fa9501a192b7c46b82059caddaef978e3de883dc.tar.gz )
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=930fc4b687a2dcaef35396f4226d224c
diff --git a/metadata/md5-cache/dev-python/pytools-2016.2.6-r1 b/metadata/md5-cache/dev-python/pytools-2016.2.6-r1
index 31dfa45c69da..39dc81ff828c 100644
--- a/metadata/md5-cache/dev-python/pytools-2016.2.6-r1
+++ b/metadata/md5-cache/dev-python/pytools-2016.2.6-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/appdirs-1.4.0[python_targets_python2_7(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytools/pytools-2016.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3b335318db72c55358209061a5b1e1fd
diff --git a/metadata/md5-cache/dev-python/pytools-2017.4-r1 b/metadata/md5-cache/dev-python/pytools-2017.4-r1
index 01b0d36b48ac..b943f81ef77d 100644
--- a/metadata/md5-cache/dev-python/pytools-2017.4-r1
+++ b/metadata/md5-cache/dev-python/pytools-2017.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/appdirs-1.4.0[python_targets_python2_7(-)?,python_targets_p
 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/pytools/pytools-2017.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=22303da814413dbb2175cc2d626dbf28
diff --git a/metadata/md5-cache/dev-python/pytools-9999 b/metadata/md5-cache/dev-python/pytools-9999
index f3de86079692..036d856f2282 100644
--- a/metadata/md5-cache/dev-python/pytools-9999
+++ b/metadata/md5-cache/dev-python/pytools-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=dev-python/appdirs-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/decorator-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/numpy-1.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/six-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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=b823a164f24f26aa0f8b08e0fe182072
diff --git a/metadata/md5-cache/dev-python/pytrie-0.3 b/metadata/md5-cache/dev-python/pytrie-0.3
index 287993f664c2..3852df4beafa 100644
--- a/metadata/md5-cache/dev-python/pytrie-0.3
+++ b/metadata/md5-cache/dev-python/pytrie-0.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/sortedcontainers[python_targets_python2_7(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyTrie/PyTrie-0.3.tar.gz -> pytrie-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e04ca22e564a5ee809634f3db8bcc69c
diff --git a/metadata/md5-cache/dev-python/pytrie-0.3.1 b/metadata/md5-cache/dev-python/pytrie-0.3.1
index 1e5751a72ed5..0cfa3a65a35f 100644
--- a/metadata/md5-cache/dev-python/pytrie-0.3.1
+++ b/metadata/md5-cache/dev-python/pytrie-0.3.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/sortedcontainers[python_targets_python2_7(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyTrie/PyTrie-0.3.1.tar.gz -> pytrie-0.3.1.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=670d5c88fa4cdb01df83cb27f8dafeba
diff --git a/metadata/md5-cache/dev-python/pytz-2016.3 b/metadata/md5-cache/dev-python/pytz-2016.3
index 59aafa0ab352..a6f4c1e84dc1 100644
--- a/metadata/md5-cache/dev-python/pytz-2016.3
+++ b/metadata/md5-cache/dev-python/pytz-2016.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,p
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytz/pytz-2016.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a9ed4bb146af8d93d2a6e12146ec7717
diff --git a/metadata/md5-cache/dev-python/pytz-2017.2 b/metadata/md5-cache/dev-python/pytz-2017.2
index a96cc335710c..0a7cbaaf7ed4 100644
--- a/metadata/md5-cache/dev-python/pytz-2017.2
+++ b/metadata/md5-cache/dev-python/pytz-2017.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,p
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytz/pytz-2017.2.zip
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4cea442d62d380126a33550af828c6f4
diff --git a/metadata/md5-cache/dev-python/pytz-2018.4 b/metadata/md5-cache/dev-python/pytz-2018.4
index 4ded851cf27f..031717dbe427 100644
--- a/metadata/md5-cache/dev-python/pytz-2018.4
+++ b/metadata/md5-cache/dev-python/pytz-2018.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,p
 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/pytz/pytz-2018.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=737334c56063481e57def8ab94c9f390
diff --git a/metadata/md5-cache/dev-python/pyu2f-0.1.4 b/metadata/md5-cache/dev-python/pyu2f-0.1.4
index 832840683fa9..a8a5cb339552 100644
--- a/metadata/md5-cache/dev-python/pyu2f-0.1.4
+++ b/metadata/md5-cache/dev-python/pyu2f-0.1.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/google/pyu2f/archive/0.1.4.tar.gz -> pyu2f-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=474abc8abac2818fbd7fc4e170e5f90a
diff --git a/metadata/md5-cache/dev-python/pyudev-0.20.0-r1 b/metadata/md5-cache/dev-python/pyudev-0.20.0-r1
index ac26c51ebcff..c1c9c1653a32 100644
--- a/metadata/md5-cache/dev-python/pyudev-0.20.0-r1
+++ b/metadata/md5-cache/dev-python/pyudev-0.20.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=pygobject? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyudev/pyudev-0.20.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=93136cad7cca244d2ca56b83b5dabb3a
diff --git a/metadata/md5-cache/dev-python/pyudev-0.21.0 b/metadata/md5-cache/dev-python/pyudev-0.21.0
index 34c291ce23f2..5e1af6b41d33 100644
--- a/metadata/md5-cache/dev-python/pyudev-0.21.0
+++ b/metadata/md5-cache/dev-python/pyudev-0.21.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=pygobject? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyudev/pyudev-0.21.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=86682d43969795977838eb436e3264b6
diff --git a/metadata/md5-cache/dev-python/pyusb-1.0.2 b/metadata/md5-cache/dev-python/pyusb-1.0.2
index 097e62be953c..6bd579a4ef65 100644
--- a/metadata/md5-cache/dev-python/pyusb-1.0.2
+++ b/metadata/md5-cache/dev-python/pyusb-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=virtual/libusb:= dev-python/setuptools[python_targets_python2_7(-)?,pyth
 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/walac/pyusb/archive/v1.0.2.tar.gz -> pyusb-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=15bd147d72f57b17303a58af08961571
diff --git a/metadata/md5-cache/dev-python/pyutil-2.0.0 b/metadata/md5-cache/dev-python/pyutil-2.0.0
index 671a6a8784b7..b689dd9c71e2 100644
--- a/metadata/md5-cache/dev-python/pyutil-2.0.0
+++ b/metadata/md5-cache/dev-python/pyutil-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyutil/pyutil-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4d94061d8566b45357ac1ad370ef7a20
diff --git a/metadata/md5-cache/dev-python/pyutmp-0.2.1 b/metadata/md5-cache/dev-python/pyutmp-0.2.1
index 14d25d098eb0..a73be7f47002 100644
--- a/metadata/md5-cache/dev-python/pyutmp-0.2.1
+++ b/metadata/md5-cache/dev-python/pyutmp-0.2.1
@@ -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=mirror://pypi/p/pyutmp/pyutmp-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=eaf1c560aac0fef43196edef04b81cd2
diff --git a/metadata/md5-cache/dev-python/pyuv-1.2.0 b/metadata/md5-cache/dev-python/pyuv-1.2.0
index d2c852a69b70..70a8182ca54f 100644
--- a/metadata/md5-cache/dev-python/pyuv-1.2.0
+++ b/metadata/md5-cache/dev-python/pyuv-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libuv-1.7.3:0/1 python_targets_python2_7? ( >=dev-lang/python
 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/saghul/pyuv/archive/pyuv-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=02298ac28661db6f2ad0bbd0983cd1c0
diff --git a/metadata/md5-cache/dev-python/pyvorbis-1.4-r4 b/metadata/md5-cache/dev-python/pyvorbis-1.4-r4
index 18b64295a744..ba33eecd38b6 100644
--- a/metadata/md5-cache/dev-python/pyvorbis-1.4-r4
+++ b/metadata/md5-cache/dev-python/pyvorbis-1.4-r4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pyogg-1.1[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://ekyo.nerim.net/software/pyogg/pyvorbis-1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ca9a8fcf196d072162e85d84a153b9a3
diff --git a/metadata/md5-cache/dev-python/pyvtk-0.4.74 b/metadata/md5-cache/dev-python/pyvtk-0.4.74
index 15ce15cfb1e6..64a3a3f44e9a 100644
--- a/metadata/md5-cache/dev-python/pyvtk-0.4.74
+++ b/metadata/md5-cache/dev-python/pyvtk-0.4.74
@@ -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=http://cens.ioc.ee/projects/pyvtk/rel-0.x/PyVTK-0.4.74.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=63e898b1b87e8dc005f05114289ab944
diff --git a/metadata/md5-cache/dev-python/pywavelets-0.5.2 b/metadata/md5-cache/dev-python/pywavelets-0.5.2
index 5ab68c1c4519..6c3510c9a00b 100644
--- a/metadata/md5-cache/dev-python/pywavelets-0.5.2
+++ b/metadata/md5-cache/dev-python/pywavelets-0.5.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyWavelets/PyWavelets-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=63964546d823df3c94487bd5ba485fb3
diff --git a/metadata/md5-cache/dev-python/pywebdav-0.9.8-r1 b/metadata/md5-cache/dev-python/pywebdav-0.9.8-r1
index a3fa4fd73add..2ecc1de05427 100644
--- a/metadata/md5-cache/dev-python/pywebdav-0.9.8-r1
+++ b/metadata/md5-cache/dev-python/pywebdav-0.9.8-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://pywebdav.googlecode.com/files/PyWebDAV-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e179670a433a0ee381eb5e6e96cb69be
diff --git a/metadata/md5-cache/dev-python/pyx-0.12.1-r1 b/metadata/md5-cache/dev-python/pyx-0.12.1-r1
index ccc792683216..3ce2c8b2ebf8 100644
--- a/metadata/md5-cache/dev-python/pyx-0.12.1-r1
+++ b/metadata/md5-cache/dev-python/pyx-0.12.1-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/tex-base dev-texlive/texlive-basic python_targets_pypy? ( >=virt
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pyx/PyX-0.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f3abae822d62ab45802a1356e03e306c
diff --git a/metadata/md5-cache/dev-python/pyx-0.14.1 b/metadata/md5-cache/dev-python/pyx-0.14.1
index b6fdab5690a2..089e376b0ddf 100644
--- a/metadata/md5-cache/dev-python/pyx-0.14.1
+++ b/metadata/md5-cache/dev-python/pyx-0.14.1
@@ -10,5 +10,5 @@ RDEPEND=virtual/tex-base dev-texlive/texlive-basic python_targets_python3_4? ( d
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyX/PyX-0.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e63a85e8cdf4df7d52ac98a8d5e5ab2b
diff --git a/metadata/md5-cache/dev-python/pyx-0.14.1-r1 b/metadata/md5-cache/dev-python/pyx-0.14.1-r1
index 405e060f952c..6233ef7951d3 100644
--- a/metadata/md5-cache/dev-python/pyx-0.14.1-r1
+++ b/metadata/md5-cache/dev-python/pyx-0.14.1-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/tex-base dev-texlive/texlive-basic python_targets_python3_4? ( d
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyX/PyX-0.14.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=03b9496dc8717383fe1e778e547006c6
diff --git a/metadata/md5-cache/dev-python/pyxattr-0.6.0-r1 b/metadata/md5-cache/dev-python/pyxattr-0.6.0-r1
index cb08508e02cd..f693b1915c27 100644
--- a/metadata/md5-cache/dev-python/pyxattr-0.6.0-r1
+++ b/metadata/md5-cache/dev-python/pyxattr-0.6.0-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/attr python_targets_pypy? ( >=virtual/pypy-5:0= ) python_target
 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/p/pyxattr/pyxattr-0.6.0.tar.gz https://pyxattr.k1024.org/downloads/pyxattr-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=406910fefcce30ca7892c366d1292895
diff --git a/metadata/md5-cache/dev-python/pyxdg-0.25-r1 b/metadata/md5-cache/dev-python/pyxdg-0.25-r1
index 3cd14c73114f..68d82f149cc9 100644
--- a/metadata/md5-cache/dev-python/pyxdg-0.25-r1
+++ b/metadata/md5-cache/dev-python/pyxdg-0.25-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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://people.freedesktop.org/~takluyver/pyxdg-0.25.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=89d8a8af000f5e889ba8b7472a5b3a79
diff --git a/metadata/md5-cache/dev-python/pyxdg-0.26 b/metadata/md5-cache/dev-python/pyxdg-0.26
index 93f69b2fa86a..218bebe43a70 100644
--- a/metadata/md5-cache/dev-python/pyxdg-0.26
+++ b/metadata/md5-cache/dev-python/pyxdg-0.26
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/takluyver/pyxdg/archive/rel-0.26.tar.gz -> pyxdg-rel-0.26.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b55433e1444a76f87749e7c6fc1b6d07
diff --git a/metadata/md5-cache/dev-python/pyxenstore-0.0.2 b/metadata/md5-cache/dev-python/pyxenstore-0.0.2
index 539c17479aea..0f26e12d4b5e 100644
--- a/metadata/md5-cache/dev-python/pyxenstore-0.0.2
+++ b/metadata/md5-cache/dev-python/pyxenstore-0.0.2
@@ -10,5 +10,5 @@ RDEPEND=app-emulation/xen-tools python_targets_python2_7? ( >=dev-lang/python-2.
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyxenstore/pyxenstore-0.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fba27d4cce91f1f6fb7dd35fd7798c90
diff --git a/metadata/md5-cache/dev-python/pyxenstore-9999 b/metadata/md5-cache/dev-python/pyxenstore-9999
index e4cc7995270c..171446896dfb 100644
--- a/metadata/md5-cache/dev-python/pyxenstore-9999
+++ b/metadata/md5-cache/dev-python/pyxenstore-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=app-emulation/xen-tools python_targets_python2_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_=bzr	a1b66b9c760a0ab5113e62cf9b64d1fe	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bzr	a1b66b9c760a0ab5113e62cf9b64d1fe	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_=017d08b9e53d8791a81fddd7fe86470f
diff --git a/metadata/md5-cache/dev-python/pyyaml-3.12 b/metadata/md5-cache/dev-python/pyyaml-3.12
index 5c7e5c89fdc1..46ee57b14024 100644
--- a/metadata/md5-cache/dev-python/pyyaml-3.12
+++ b/metadata/md5-cache/dev-python/pyyaml-3.12
@@ -10,5 +10,5 @@ RDEPEND=libyaml? ( dev-libs/libyaml ) python_targets_pypy? ( >=virtual/pypy-5:0=
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://pyyaml.org/download/pyyaml/PyYAML-3.12.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=928f465e89e7b5cea453271ad8afd06f
diff --git a/metadata/md5-cache/dev-python/pyyaml-3.13 b/metadata/md5-cache/dev-python/pyyaml-3.13
index 977d28e270f5..13e907ad65c5 100644
--- a/metadata/md5-cache/dev-python/pyyaml-3.13
+++ b/metadata/md5-cache/dev-python/pyyaml-3.13
@@ -10,5 +10,5 @@ RDEPEND=libyaml? ( dev-libs/libyaml ) python_targets_pypy? ( >=virtual/pypy-5:0=
 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://pyyaml.org/download/pyyaml/PyYAML-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a7d8108bc6ccc5e0d871d3eac5de9c6d
diff --git a/metadata/md5-cache/dev-python/pyzbar-0.1.5 b/metadata/md5-cache/dev-python/pyzbar-0.1.5
index 128cb5cbcf71..044ee9eb67bf 100644
--- a/metadata/md5-cache/dev-python/pyzbar-0.1.5
+++ b/metadata/md5-cache/dev-python/pyzbar-0.1.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_5(
 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/NaturalHistoryMuseum/pyzbar/archive/v0.1.5.tar.gz -> pyzbar-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ac971aca268423ddf1cc99ee7fe0eef9
diff --git a/metadata/md5-cache/dev-python/pyzbar-0.1.7 b/metadata/md5-cache/dev-python/pyzbar-0.1.7
index 30463e77b605..b4080a0b2ee5 100644
--- a/metadata/md5-cache/dev-python/pyzbar-0.1.7
+++ b/metadata/md5-cache/dev-python/pyzbar-0.1.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_5(
 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/NaturalHistoryMuseum/pyzbar/archive/v0.1.7.tar.gz -> pyzbar-0.1.7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ac971aca268423ddf1cc99ee7fe0eef9
diff --git a/metadata/md5-cache/dev-python/pyzmq-16.0.2 b/metadata/md5-cache/dev-python/pyzmq-16.0.2
index bfe87b2f1fd4..4059bf7339b1 100644
--- a/metadata/md5-cache/dev-python/pyzmq-16.0.2
+++ b/metadata/md5-cache/dev-python/pyzmq-16.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/zeromq-4.1.2:= dev-python/py[python_targets_python2_7(-)?,pyt
 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/pyzmq/pyzmq-16.0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0a2bb7b48367fb185444f0caa443eaca
diff --git a/metadata/md5-cache/dev-python/pyzmq-17.1.0 b/metadata/md5-cache/dev-python/pyzmq-17.1.0
index 753adc189421..51a9fd88f720 100644
--- a/metadata/md5-cache/dev-python/pyzmq-17.1.0
+++ b/metadata/md5-cache/dev-python/pyzmq-17.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/zeromq-4.2.2-r2:=[drafts] dev-python/py[python_targets_python
 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/pyzmq/pyzmq-17.1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a24772740dde668816c43c89147ac21d
diff --git a/metadata/md5-cache/dev-python/pyzor-1.0.0-r1 b/metadata/md5-cache/dev-python/pyzor-1.0.0-r1
index f624d1405f7f..444e9b5cf912 100644
--- a/metadata/md5-cache/dev-python/pyzor-1.0.0-r1
+++ b/metadata/md5-cache/dev-python/pyzor-1.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=pyzord? ( gdbm? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2
 REQUIRED_USE=pyzord? ( || ( gdbm mysql redis ) ) test? ( gdbm mysql redis ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/SpamExperts/pyzor/archive/release-1-0-0.tar.gz -> pyzor-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4c4a7e864e15aa6c7eee9b44fd993e5a
diff --git a/metadata/md5-cache/dev-python/qpid-python-0.20 b/metadata/md5-cache/dev-python/qpid-python-0.20
index 843e0da274da..dd63892233dc 100644
--- a/metadata/md5-cache/dev-python/qpid-python-0.20
+++ b/metadata/md5-cache/dev-python/qpid-python-0.20
@@ -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=mirror://pypi/q/qpid-python/qpid-python-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=caf71490ca2906ee4a5acb7987b6aaed
diff --git a/metadata/md5-cache/dev-python/qrcode-5.1-r1 b/metadata/md5-cache/dev-python/qrcode-5.1-r1
index 8c8543479dee..d76d674f941e 100644
--- a/metadata/md5-cache/dev-python/qrcode-5.1-r1
+++ b/metadata/md5-cache/dev-python/qrcode-5.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/q/qrcode/qrcode-5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=61ecb2e42af4abea8de1c1501c8cf12c
diff --git a/metadata/md5-cache/dev-python/qserve-0.2.8-r1 b/metadata/md5-cache/dev-python/qserve-0.2.8-r1
index 0fa4bf8a8371..9a5bfb66cb45 100644
--- a/metadata/md5-cache/dev-python/qserve-0.2.8-r1
+++ b/metadata/md5-cache/dev-python/qserve-0.2.8-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/q/qserve/qserve-0.2.8.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=42d3fa56e1a1189148ade9067fbf93cb
diff --git a/metadata/md5-cache/dev-python/qtawesome-0.4.4 b/metadata/md5-cache/dev-python/qtawesome-0.4.4
index 2e7f7510a5f1..259e7a2541ce 100644
--- a/metadata/md5-cache/dev-python/qtawesome-0.4.4
+++ b/metadata/md5-cache/dev-python/qtawesome-0.4.4
@@ -10,5 +10,5 @@ RDEPEND=media-fonts/fontawesome python_targets_python2_7? ( >=dev-lang/python-2.
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/Q/QtAwesome/QtAwesome-0.4.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=31e8400fa61a1952a305ed6641dba36c
diff --git a/metadata/md5-cache/dev-python/qtconsole-4.3.1 b/metadata/md5-cache/dev-python/qtconsole-4.3.1
index 531f712542f0..49374a52ba2d 100644
--- a/metadata/md5-cache/dev-python/qtconsole-4.3.1
+++ b/metadata/md5-cache/dev-python/qtconsole-4.3.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/q/qtconsole/qtconsole-4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7fccfaf9c2fc7b8d7831f23146127add
diff --git a/metadata/md5-cache/dev-python/quixote-2.8 b/metadata/md5-cache/dev-python/quixote-2.8
index e8680b6b9978..432cfd44a56a 100644
--- a/metadata/md5-cache/dev-python/quixote-2.8
+++ b/metadata/md5-cache/dev-python/quixote-2.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://quixote.ca/releases/Quixote-2.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=65e6d1caad4e85fcea6fbc54040b2307
diff --git a/metadata/md5-cache/dev-python/rackspace-auth-openstack-1.3 b/metadata/md5-cache/dev-python/rackspace-auth-openstack-1.3
index ebab3b259b1c..b074c41e7b98 100644
--- a/metadata/md5-cache/dev-python/rackspace-auth-openstack-1.3
+++ b/metadata/md5-cache/dev-python/rackspace-auth-openstack-1.3
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rackspace-auth-openstack/rackspace-auth-openstack-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=467237bb70ca2971f984413110f1cb97
diff --git a/metadata/md5-cache/dev-python/rackspace-auth-openstack-9999 b/metadata/md5-cache/dev-python/rackspace-auth-openstack-9999
index 80bf759e74fa..c7d05b87a6fe 100644
--- a/metadata/md5-cache/dev-python/rackspace-auth-openstack-9999
+++ b/metadata/md5-cache/dev-python/rackspace-auth-openstack-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.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 )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-2	249c1a0962573f4ce2c28f0d5b6b35d4	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-2	249c1a0962573f4ce2c28f0d5b6b35d4	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_=dde3fc29d1fb595da5570b1c071fe2ac
diff --git a/metadata/md5-cache/dev-python/rackspace-monitoring-0.6.5 b/metadata/md5-cache/dev-python/rackspace-monitoring-0.6.5
index e51a43d1c8af..31136966df2f 100644
--- a/metadata/md5-cache/dev-python/rackspace-monitoring-0.6.5
+++ b/metadata/md5-cache/dev-python/rackspace-monitoring-0.6.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/r/rackspace-monitoring/rackspace-monitoring-0.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=f48ea49dbbf1ba8dd1a3d8f734640bfa
diff --git a/metadata/md5-cache/dev-python/rackspace-monitoring-0.8.0 b/metadata/md5-cache/dev-python/rackspace-monitoring-0.8.0
index 21547ad4455c..fbf983f938e7 100644
--- a/metadata/md5-cache/dev-python/rackspace-monitoring-0.8.0
+++ b/metadata/md5-cache/dev-python/rackspace-monitoring-0.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/r/rackspace-monitoring/rackspace-monitoring-0.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d03d1c455f1060adc3646c77a7b89043
diff --git a/metadata/md5-cache/dev-python/rackspace-monitoring-cli-0.6.10 b/metadata/md5-cache/dev-python/rackspace-monitoring-cli-0.6.10
index d6e1ae69dba3..651d5d95ed6b 100644
--- a/metadata/md5-cache/dev-python/rackspace-monitoring-cli-0.6.10
+++ b/metadata/md5-cache/dev-python/rackspace-monitoring-cli-0.6.10
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/r/rackspace-monitoring-cli/rackspace-monitoring-cli-0.6.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9ef582d88b91de3e92725abf037f1da6
diff --git a/metadata/md5-cache/dev-python/rackspace-novaclient-1.4 b/metadata/md5-cache/dev-python/rackspace-novaclient-1.4
index 4e0d63a0005a..3916f3219774 100644
--- a/metadata/md5-cache/dev-python/rackspace-novaclient-1.4
+++ b/metadata/md5-cache/dev-python/rackspace-novaclient-1.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,-pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rackspace-novaclient/rackspace-novaclient-1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8e234432e0700f050193751c5e4029e5
diff --git a/metadata/md5-cache/dev-python/rackspace-novaclient-2.1 b/metadata/md5-cache/dev-python/rackspace-novaclient-2.1
index d4645778eee1..478e26361041 100644
--- a/metadata/md5-cache/dev-python/rackspace-novaclient-2.1
+++ b/metadata/md5-cache/dev-python/rackspace-novaclient-2.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,pytho
 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/rackspace-novaclient/rackspace-novaclient-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e4fa4fea1365951bbecd90898b80598d
diff --git a/metadata/md5-cache/dev-python/radon-1.4.2 b/metadata/md5-cache/dev-python/radon-1.4.2
index 21c31d1af874..4651b78989f4 100644
--- a/metadata/md5-cache/dev-python/radon-1.4.2
+++ b/metadata/md5-cache/dev-python/radon-1.4.2
@@ -10,5 +10,5 @@ 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
 SRC_URI=mirror://pypi/r/radon/radon-1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b3f04dfd65c5288e09224eef52344d15
diff --git a/metadata/md5-cache/dev-python/raet-0.6.8 b/metadata/md5-cache/dev-python/raet-0.6.8
index 006f6881e78d..973692936047 100644
--- a/metadata/md5-cache/dev-python/raet-0.6.8
+++ b/metadata/md5-cache/dev-python/raet-0.6.8
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/six-1.6.1[python_targets_python2_7(-)?,python_targets_pytho
 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/raet/raet-0.6.8.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ac6d237565437f8d1c6d7c22759fb630
diff --git a/metadata/md5-cache/dev-python/ramlfications-0.1.9_p20160718 b/metadata/md5-cache/dev-python/ramlfications-0.1.9_p20160718
index 26277b19dca9..7fc15df5495a 100644
--- a/metadata/md5-cache/dev-python/ramlfications-0.1.9_p20160718
+++ b/metadata/md5-cache/dev-python/ramlfications-0.1.9_p20160718
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/spotify/ramlfications/archive/32a11cd7d75c4c5b3e3fc01c383314be298b0f9b.tar.gz -> ramlfications-0.1.9_p20160718.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7bfa21725853508b7031acc22ee209d7
diff --git a/metadata/md5-cache/dev-python/random2-1.0.1 b/metadata/md5-cache/dev-python/random2-1.0.1
index 580250b01e37..7fc4224db552 100644
--- a/metadata/md5-cache/dev-python/random2-1.0.1
+++ b/metadata/md5-cache/dev-python/random2-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/random2/random2-1.0.1.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5b35978253e1b485f4e96b99a9edcc95
diff --git a/metadata/md5-cache/dev-python/rarfile-3.0 b/metadata/md5-cache/dev-python/rarfile-3.0
index e6345a523806..121760f368d4 100644
--- a/metadata/md5-cache/dev-python/rarfile-3.0
+++ b/metadata/md5-cache/dev-python/rarfile-3.0
@@ -10,5 +10,5 @@ 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
 SRC_URI=mirror://pypi/r/rarfile/rarfile-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=169ece6964b6289907aa5fd1942f9e86
diff --git a/metadata/md5-cache/dev-python/ratelimit-1.4.1 b/metadata/md5-cache/dev-python/ratelimit-1.4.1
index 94bc581d62c3..6ce359892abf 100644
--- a/metadata/md5-cache/dev-python/ratelimit-1.4.1
+++ b/metadata/md5-cache/dev-python/ratelimit-1.4.1
@@ -10,5 +10,5 @@ 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 )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-python/raven-5.2.0 b/metadata/md5-cache/dev-python/raven-5.2.0
index 3572b571b52e..acdf33e4c6d2 100644
--- a/metadata/md5-cache/dev-python/raven-5.2.0
+++ b/metadata/md5-cache/dev-python/raven-5.2.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/r/raven/raven-5.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=607c3caf32b33fecc7d069629f537135
diff --git a/metadata/md5-cache/dev-python/raven-5.3.0 b/metadata/md5-cache/dev-python/raven-5.3.0
index 9fafe3ca01ce..ca9667afb2fa 100644
--- a/metadata/md5-cache/dev-python/raven-5.3.0
+++ b/metadata/md5-cache/dev-python/raven-5.3.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/r/raven/raven-5.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=607c3caf32b33fecc7d069629f537135
diff --git a/metadata/md5-cache/dev-python/raven-5.31.0 b/metadata/md5-cache/dev-python/raven-5.31.0
index 90c72fb3a3ac..ca4cd8611e0e 100644
--- a/metadata/md5-cache/dev-python/raven-5.31.0
+++ b/metadata/md5-cache/dev-python/raven-5.31.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/contextlib2[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/r/raven/raven-5.31.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a71e1c23145d985a7536b9c58aa082b4
diff --git a/metadata/md5-cache/dev-python/raven-5.33.0 b/metadata/md5-cache/dev-python/raven-5.33.0
index f45304c4f9c7..3e866f46f0ca 100644
--- a/metadata/md5-cache/dev-python/raven-5.33.0
+++ b/metadata/md5-cache/dev-python/raven-5.33.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/contextlib2[python_targets_python2_7(-)?,python_targets_pytho
 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/raven/raven-5.33.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cb42885fcb351e03624de6371259520d
diff --git a/metadata/md5-cache/dev-python/rax-default-network-flags-python-novaclient-ext-0.4.0 b/metadata/md5-cache/dev-python/rax-default-network-flags-python-novaclient-ext-0.4.0
index f1fb3de1a129..4a23ae61f8aa 100644
--- a/metadata/md5-cache/dev-python/rax-default-network-flags-python-novaclient-ext-0.4.0
+++ b/metadata/md5-cache/dev-python/rax-default-network-flags-python-novaclient-ext-0.4.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/python-novaclient-2.20.0[python_targets_python2_7(-)?,pytho
 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/rax_default_network_flags_python_novaclient_ext/rax_default_network_flags_python_novaclient_ext-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=725bff052c17064b6ee9b940e15055c2
diff --git a/metadata/md5-cache/dev-python/rax-scheduled-images-python-novaclient-ext-0.2.1 b/metadata/md5-cache/dev-python/rax-scheduled-images-python-novaclient-ext-0.2.1
index 5b5ddf7c9478..8351d5ccdf74 100644
--- a/metadata/md5-cache/dev-python/rax-scheduled-images-python-novaclient-ext-0.2.1
+++ b/metadata/md5-cache/dev-python/rax-scheduled-images-python-novaclient-ext-0.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/python-novaclient-2.10.0[python_targets_python2_7(-)?,-pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rax_scheduled_images_python_novaclient_ext/rax_scheduled_images_python_novaclient_ext-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b0d95feb5f2f6e1ebe722e6421c0f93b
diff --git a/metadata/md5-cache/dev-python/rax-scheduled-images-python-novaclient-ext-0.3.1 b/metadata/md5-cache/dev-python/rax-scheduled-images-python-novaclient-ext-0.3.1
index b43c2922dd9f..bc3dc74914dc 100644
--- a/metadata/md5-cache/dev-python/rax-scheduled-images-python-novaclient-ext-0.3.1
+++ b/metadata/md5-cache/dev-python/rax-scheduled-images-python-novaclient-ext-0.3.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/python-novaclient-2.10.0[python_targets_python2_7(-)?,pytho
 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/rax_scheduled_images_python_novaclient_ext/rax_scheduled_images_python_novaclient_ext-0.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=02233aac49104c107e652ef9926044ee
diff --git a/metadata/md5-cache/dev-python/rdflib-4.2.1 b/metadata/md5-cache/dev-python/rdflib-4.2.1
index 381e24f43f00..bf997dda05b5 100644
--- a/metadata/md5-cache/dev-python/rdflib-4.2.1
+++ b/metadata/md5-cache/dev-python/rdflib-4.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/isodate[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rdflib/rdflib-4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5cb205137b6bb51691ce4503a80eb5a1
diff --git a/metadata/md5-cache/dev-python/rdflib-4.2.2 b/metadata/md5-cache/dev-python/rdflib-4.2.2
index b9ce6212f7f2..5ef64253e605 100644
--- a/metadata/md5-cache/dev-python/rdflib-4.2.2
+++ b/metadata/md5-cache/dev-python/rdflib-4.2.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/isodate[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rdflib/rdflib-4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fff5211aa472a595a0e8d2c4493334b8
diff --git a/metadata/md5-cache/dev-python/readlike-0.1.2 b/metadata/md5-cache/dev-python/readlike-0.1.2
index e980d9642ace..f2b8b94a8eb7 100644
--- a/metadata/md5-cache/dev-python/readlike-0.1.2
+++ b/metadata/md5-cache/dev-python/readlike-0.1.2
@@ -10,5 +10,5 @@ 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
 SRC_URI=mirror://pypi/r/readlike/readlike-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=66e054780855e26f449170d9c00dd12d
diff --git a/metadata/md5-cache/dev-python/readlike-0.1.3 b/metadata/md5-cache/dev-python/readlike-0.1.3
index be101c07238f..bfb22df4130e 100644
--- a/metadata/md5-cache/dev-python/readlike-0.1.3
+++ b/metadata/md5-cache/dev-python/readlike-0.1.3
@@ -10,5 +10,5 @@ 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
 SRC_URI=mirror://pypi/r/readlike/readlike-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=adfc304badbfa74fe7d8d06e5872974a
diff --git a/metadata/md5-cache/dev-python/readme-0.6.0 b/metadata/md5-cache/dev-python/readme-0.6.0
index 16beb554a863..34f77ddc189a 100644
--- a/metadata/md5-cache/dev-python/readme-0.6.0
+++ b/metadata/md5-cache/dev-python/readme-0.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/r/readme/readme-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f08cc3c4a7982f72798dcc38088e6d10
diff --git a/metadata/md5-cache/dev-python/readme_renderer-17.2 b/metadata/md5-cache/dev-python/readme_renderer-17.2
index 04f6306a20ee..039b7fe703cc 100644
--- a/metadata/md5-cache/dev-python/readme_renderer-17.2
+++ b/metadata/md5-cache/dev-python/readme_renderer-17.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/bleach-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?
 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/r/readme_renderer/readme_renderer-17.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=090c581ef7adf091fb275fc9212d3a6a
diff --git a/metadata/md5-cache/dev-python/rebulk-0.9.0 b/metadata/md5-cache/dev-python/rebulk-0.9.0
index 935964450ee7..58b8f5dfced0 100644
--- a/metadata/md5-cache/dev-python/rebulk-0.9.0
+++ b/metadata/md5-cache/dev-python/rebulk-0.9.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rebulk/rebulk-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d65b50bea2e74088905efb36f9f835d5
diff --git a/metadata/md5-cache/dev-python/rebulk-9999 b/metadata/md5-cache/dev-python/rebulk-9999
index 4b0925373ecc..caa9c110445c 100644
--- a/metadata/md5-cache/dev-python/rebulk-9999
+++ b/metadata/md5-cache/dev-python/rebulk-9999
@@ -8,5 +8,5 @@ LICENSE=MIT 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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=51c983ffa1909788d9e255215a968b50
diff --git a/metadata/md5-cache/dev-python/recaptcha-client-1.0.6-r1 b/metadata/md5-cache/dev-python/recaptcha-client-1.0.6-r1
index 1279a386af72..e9bc2763cc0f 100644
--- a/metadata/md5-cache/dev-python/recaptcha-client-1.0.6-r1
+++ b/metadata/md5-cache/dev-python/recaptcha-client-1.0.6-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pycrypto[python_targets_python2_7(-)?,python_targets_python3_
 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/recaptcha-client/recaptcha-client-1.0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7ed4b1ce88ac3a6ea0f6ff8ce9efb10d
diff --git a/metadata/md5-cache/dev-python/recommonmark-0.4.0 b/metadata/md5-cache/dev-python/recommonmark-0.4.0
index 97dfb38a4a9e..e206be22bb91 100644
--- a/metadata/md5-cache/dev-python/recommonmark-0.4.0
+++ b/metadata/md5-cache/dev-python/recommonmark-0.4.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
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 ef32665c3e47..4843ca297308 100644
--- a/metadata/md5-cache/dev-python/recommonmark-0.5.0_pre20180907
+++ b/metadata/md5-cache/dev-python/recommonmark-0.5.0_pre20180907
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-python/reconfigure-0.1.79 b/metadata/md5-cache/dev-python/reconfigure-0.1.79
index 0944e6ddd330..545033e854d4 100644
--- a/metadata/md5-cache/dev-python/reconfigure-0.1.79
+++ b/metadata/md5-cache/dev-python/reconfigure-0.1.79
@@ -10,5 +10,5 @@ RDEPEND=dev-python/chardet[python_targets_python2_7(-)?,-python_single_target_py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/reconfigure/reconfigure-0.1.79.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bef63196237a4c018701c1bcd01cb777
diff --git a/metadata/md5-cache/dev-python/redis-py-2.10.5 b/metadata/md5-cache/dev-python/redis-py-2.10.5
index 9155e00dcdad..99e9d376ca17 100644
--- a/metadata/md5-cache/dev-python/redis-py-2.10.5
+++ b/metadata/md5-cache/dev-python/redis-py-2.10.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/r/redis/redis-2.10.5.tar.gz -> redis-py-2.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2c70d406c756ff80166245fec609ed97
diff --git a/metadata/md5-cache/dev-python/redis-py-2.10.6 b/metadata/md5-cache/dev-python/redis-py-2.10.6
index 43d5fd7a1065..a2ff4b39c0a4 100644
--- a/metadata/md5-cache/dev-python/redis-py-2.10.6
+++ b/metadata/md5-cache/dev-python/redis-py-2.10.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/r/redis/redis-2.10.6.tar.gz -> redis-py-2.10.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5ff418ace639fcd461a459302e0d2b2c
diff --git a/metadata/md5-cache/dev-python/redis-py-2.9.1 b/metadata/md5-cache/dev-python/redis-py-2.9.1
index a80a30a1a6c3..27980ecb89cf 100644
--- a/metadata/md5-cache/dev-python/redis-py-2.9.1
+++ b/metadata/md5-cache/dev-python/redis-py-2.9.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/r/redis/redis-2.9.1.tar.gz -> redis-py-2.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3cf3b5489b3785b9756e996ad2a64428
diff --git a/metadata/md5-cache/dev-python/redis-py-cluster-1.3.4 b/metadata/md5-cache/dev-python/redis-py-cluster-1.3.4
index d6a659e93780..78181de4404b 100644
--- a/metadata/md5-cache/dev-python/redis-py-cluster-1.3.4
+++ b/metadata/md5-cache/dev-python/redis-py-cluster-1.3.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/redis-py-2.10.2[python_targets_python2_7(-)?,python_targets
 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/redis-py-cluster/redis-py-cluster-1.3.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7a5ec0cc6a888ec6df54feea883d7602
diff --git a/metadata/md5-cache/dev-python/redlock-py-1.0.8 b/metadata/md5-cache/dev-python/redlock-py-1.0.8
index 7749f661fe46..63c9d8a28b11 100644
--- a/metadata/md5-cache/dev-python/redlock-py-1.0.8
+++ b/metadata/md5-cache/dev-python/redlock-py-1.0.8
@@ -10,5 +10,5 @@ RDEPEND=dev-python/redis-py[python_targets_pypy(-)?,python_targets_pypy3(-)?,pyt
 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/r/redlock-py/redlock-py-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d2cd6bc3b09676637d60e75d1259b186
diff --git a/metadata/md5-cache/dev-python/rednose-0.4.1 b/metadata/md5-cache/dev-python/rednose-0.4.1
index 517b9fa5a2c1..3ef6943b0cc1 100644
--- a/metadata/md5-cache/dev-python/rednose-0.4.1
+++ b/metadata/md5-cache/dev-python/rednose-0.4.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/python-termstyle-0.1.7[python_targets_pypy(-)?,python_targe
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rednose/rednose-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e52c1c103ca0308d113cdc73209ea048
diff --git a/metadata/md5-cache/dev-python/rednose-0.4.3 b/metadata/md5-cache/dev-python/rednose-0.4.3
index 5f2a76bbabb3..7f3629d12acc 100644
--- a/metadata/md5-cache/dev-python/rednose-0.4.3
+++ b/metadata/md5-cache/dev-python/rednose-0.4.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rednose/rednose-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bd2336079778c84a38e99075723bd822
diff --git a/metadata/md5-cache/dev-python/regendoc-0.5 b/metadata/md5-cache/dev-python/regendoc-0.5
index 7b7060fa7182..e65f6cd8cdfa 100644
--- a/metadata/md5-cache/dev-python/regendoc-0.5
+++ b/metadata/md5-cache/dev-python/regendoc-0.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/click[python_targets_pypy(-)?,python_targets_pypy3(-)?,python
 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/R/RegenDoc/regendoc-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=be87f826d1a9be58ad1c1e7060bd0ca9
diff --git a/metadata/md5-cache/dev-python/regendoc-0.6.1 b/metadata/md5-cache/dev-python/regendoc-0.6.1
index 344fcdedac51..0692b2d6cae4 100644
--- a/metadata/md5-cache/dev-python/regendoc-0.6.1
+++ b/metadata/md5-cache/dev-python/regendoc-0.6.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/click[python_targets_pypy(-)?,python_targets_pypy3(-)?,python
 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/R/RegenDoc/regendoc-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=16caa0c6c19113353d4c43079ffd054d
diff --git a/metadata/md5-cache/dev-python/regex-2017.04.05 b/metadata/md5-cache/dev-python/regex-2017.04.05
index 6316e51a187c..72627138519e 100644
--- a/metadata/md5-cache/dev-python/regex-2017.04.05
+++ b/metadata/md5-cache/dev-python/regex-2017.04.05
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_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/r/regex/regex-2017.04.05.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b350597601817d127173fb087c0d2ba8
diff --git a/metadata/md5-cache/dev-python/regions-0.2 b/metadata/md5-cache/dev-python/regions-0.2
index 2bd6afb917fc..9d8a8529dc12 100644
--- a/metadata/md5-cache/dev-python/regions-0.2
+++ b/metadata/md5-cache/dev-python/regions-0.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/regions/regions-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=aba3c916c21c8ecd80e8ad1d75a50ae7
diff --git a/metadata/md5-cache/dev-python/rencode-1.0.5 b/metadata/md5-cache/dev-python/rencode-1.0.5
index 0d402a167375..babb53659790 100644
--- a/metadata/md5-cache/dev-python/rencode-1.0.5
+++ b/metadata/md5-cache/dev-python/rencode-1.0.5
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/aresch/rencode/archive/v1.0.5.tar.gz -> rencode-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e3a49d74099f344214d4e94b824140f3
diff --git a/metadata/md5-cache/dev-python/reno-2.2.1 b/metadata/md5-cache/dev-python/reno-2.2.1
index e69091fd8c85..b9bb8672a65c 100644
--- a/metadata/md5-cache/dev-python/reno-2.2.1
+++ b/metadata/md5-cache/dev-python/reno-2.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.4[python_targets_python2_7(-)?,python_targets_python3
 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/reno/reno-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=266e38705224f620529ba92b860ef338
diff --git a/metadata/md5-cache/dev-python/reno-2.5.0 b/metadata/md5-cache/dev-python/reno-2.5.0
index 50d6e74c6d8d..f0d23bbc2596 100644
--- a/metadata/md5-cache/dev-python/reno-2.5.0
+++ b/metadata/md5-cache/dev-python/reno-2.5.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.4[python_targets_python2_7(-)?,python_targets_python3
 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/reno/reno-2.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bd29bf351adf1325ed5f53c60b4b7ca8
diff --git a/metadata/md5-cache/dev-python/reno-2.7.0 b/metadata/md5-cache/dev-python/reno-2.7.0
index fee5b0b0b824..77fd420ef5b8 100644
--- a/metadata/md5-cache/dev-python/reno-2.7.0
+++ b/metadata/md5-cache/dev-python/reno-2.7.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.4[python_targets_python2_7(-)?,python_targets_python3
 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/reno/reno-2.7.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a6b3c23ac018be4f3ec11ce3e893ac1d
diff --git a/metadata/md5-cache/dev-python/reportlab-3.3.0-r2 b/metadata/md5-cache/dev-python/reportlab-3.3.0-r2
index b08e6c965691..156796a7f81c 100644
--- a/metadata/md5-cache/dev-python/reportlab-3.3.0-r2
+++ b/metadata/md5-cache/dev-python/reportlab-3.3.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pillow-2.4.0[tiff,truetype,jpeg(+),python_targets_python2_7
 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/reportlab/reportlab-3.3.0.tar.gz http://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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_=113cf2959141c3f4b65ab9482b720cf9
diff --git a/metadata/md5-cache/dev-python/reportlab-3.4.0-r1 b/metadata/md5-cache/dev-python/reportlab-3.4.0-r1
index 04857680b913..88bc7b394456 100644
--- a/metadata/md5-cache/dev-python/reportlab-3.4.0-r1
+++ b/metadata/md5-cache/dev-python/reportlab-3.4.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pillow-2.4.0[tiff,truetype,jpeg(+),python_targets_python2_7
 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/reportlab/reportlab-3.4.0.tar.gz http://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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_=674a89be20342a9b3c206a5c609f9069
diff --git a/metadata/md5-cache/dev-python/repoze-lru-0.6-r2 b/metadata/md5-cache/dev-python/repoze-lru-0.6-r2
index ff824d5e1dc4..0a8d4cd53725 100644
--- a/metadata/md5-cache/dev-python/repoze-lru-0.6-r2
+++ b/metadata/md5-cache/dev-python/repoze-lru-0.6-r2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/repoze.lru/repoze.lru-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ef84b10b7bb3ff8f26d63bcd3b51b3a4
diff --git a/metadata/md5-cache/dev-python/repoze-lru-0.6-r3 b/metadata/md5-cache/dev-python/repoze-lru-0.6-r3
index 9bd54f079969..27abd9d332a4 100644
--- a/metadata/md5-cache/dev-python/repoze-lru-0.6-r3
+++ b/metadata/md5-cache/dev-python/repoze-lru-0.6-r3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/namespace-repoze[python_targets_pypy(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/repoze.lru/repoze.lru-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=846be97358d6bf0269d1615658270c4b
diff --git a/metadata/md5-cache/dev-python/repoze-sphinx-autointerface-0.7.1-r1 b/metadata/md5-cache/dev-python/repoze-sphinx-autointerface-0.7.1-r1
index 1fc8c449a6eb..bd710102c80c 100644
--- a/metadata/md5-cache/dev-python/repoze-sphinx-autointerface-0.7.1-r1
+++ b/metadata/md5-cache/dev-python/repoze-sphinx-autointerface-0.7.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/namespace-repoze[python_targets_python2_7(-)?,python_targets_
 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/repoze.sphinx.autointerface/repoze.sphinx.autointerface-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=14397a3a526e6022dde8ed24527c8959
diff --git a/metadata/md5-cache/dev-python/repoze-who-2.2 b/metadata/md5-cache/dev-python/repoze-who-2.2
index 7b8b1aa87e8f..9c94030a51b5 100644
--- a/metadata/md5-cache/dev-python/repoze-who-2.2
+++ b/metadata/md5-cache/dev-python/repoze-who-2.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/webob[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/repoze.who/repoze.who-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d71ac852ed514c0145125102216e5eba
diff --git a/metadata/md5-cache/dev-python/repoze-who-2.2-r1 b/metadata/md5-cache/dev-python/repoze-who-2.2-r1
index 14be5ba2cc49..77c974e88dc0 100644
--- a/metadata/md5-cache/dev-python/repoze-who-2.2-r1
+++ b/metadata/md5-cache/dev-python/repoze-who-2.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/namespace-repoze[python_targets_python2_7(-)?,python_targets_
 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/repoze.who/repoze.who-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=366fb4ead9024643e1b983b42070aae1
diff --git a/metadata/md5-cache/dev-python/reproject-0.3.1 b/metadata/md5-cache/dev-python/reproject-0.3.1
index 39c7186ed971..0e2c8854fadd 100644
--- a/metadata/md5-cache/dev-python/reproject-0.3.1
+++ b/metadata/md5-cache/dev-python/reproject-0.3.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/reproject/reproject-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=209765ae1897a4a8a204de4eb067edc2
diff --git a/metadata/md5-cache/dev-python/requests-2.11.1 b/metadata/md5-cache/dev-python/requests-2.11.1
index d0a8a82fff1d..d56922aaf8ea 100644
--- a/metadata/md5-cache/dev-python/requests-2.11.1
+++ b/metadata/md5-cache/dev-python/requests-2.11.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/r/requests/requests-2.11.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ee271b816d4ad0aa4be11f61a22c21e4
diff --git a/metadata/md5-cache/dev-python/requests-2.12.5 b/metadata/md5-cache/dev-python/requests-2.12.5
index 358f04c0573e..79bf46775f51 100644
--- a/metadata/md5-cache/dev-python/requests-2.12.5
+++ b/metadata/md5-cache/dev-python/requests-2.12.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/r/requests/requests-2.12.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9e21bc0eb87326abf3edc01f1073377f
diff --git a/metadata/md5-cache/dev-python/requests-2.14.2 b/metadata/md5-cache/dev-python/requests-2.14.2
index 89e227fffd59..ff0bf24a3a7f 100644
--- a/metadata/md5-cache/dev-python/requests-2.14.2
+++ b/metadata/md5-cache/dev-python/requests-2.14.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/r/requests/requests-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0309c5242a04ffcef8c50b02444cad6f
diff --git a/metadata/md5-cache/dev-python/requests-2.18.2-r2 b/metadata/md5-cache/dev-python/requests-2.18.2-r2
index 7ad4a403d675..d9c4bf2af664 100644
--- a/metadata/md5-cache/dev-python/requests-2.18.2-r2
+++ b/metadata/md5-cache/dev-python/requests-2.18.2-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/r/requests/requests-2.18.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d5ce02a9af648fbee3d7a700240611ac
diff --git a/metadata/md5-cache/dev-python/requests-2.18.4-r1 b/metadata/md5-cache/dev-python/requests-2.18.4-r1
index 572dff92a1b7..0f0e32895014 100644
--- a/metadata/md5-cache/dev-python/requests-2.18.4-r1
+++ b/metadata/md5-cache/dev-python/requests-2.18.4-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/r/requests/requests-2.18.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=229564fdc518e262992e739c1b7ae767
diff --git a/metadata/md5-cache/dev-python/requests-2.19.1-r1 b/metadata/md5-cache/dev-python/requests-2.19.1-r1
index 51ae8e948749..f43ee8e1ccab 100644
--- a/metadata/md5-cache/dev-python/requests-2.19.1-r1
+++ b/metadata/md5-cache/dev-python/requests-2.19.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/r/requests/requests-2.19.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=187472faf0924db567bcb24be8d7c684
diff --git a/metadata/md5-cache/dev-python/requests-cache-0.4.12 b/metadata/md5-cache/dev-python/requests-cache-0.4.12
index b46dc3788388..c5fc2a1fb9df 100644
--- a/metadata/md5-cache/dev-python/requests-cache-0.4.12
+++ b/metadata/md5-cache/dev-python/requests-cache-0.4.12
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/requests-2.6[python_targets_pypy(-)?,python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests-cache/requests-cache-0.4.12.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9dc27fb442f03957ae764448f8922586
diff --git a/metadata/md5-cache/dev-python/requests-kerberos-0.11.0 b/metadata/md5-cache/dev-python/requests-kerberos-0.11.0
index 4a664dd65e7c..4b45693c59e8 100644
--- a/metadata/md5-cache/dev-python/requests-kerberos-0.11.0
+++ b/metadata/md5-cache/dev-python/requests-kerberos-0.11.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/requests-1.1.0[python_targets_python3_4(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests-kerberos/requests-kerberos-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1ea0db88165b4193223d2713bfc75022
diff --git a/metadata/md5-cache/dev-python/requests-mock-1.2.0 b/metadata/md5-cache/dev-python/requests-mock-1.2.0
index 995b25d48c65..be7794a334ba 100644
--- a/metadata/md5-cache/dev-python/requests-mock-1.2.0
+++ b/metadata/md5-cache/dev-python/requests-mock-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/requests-1.1[python_targets_python2_7(-)?,python_targets_py
 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/requests-mock/requests-mock-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=94eb836afd42c05c175a52e2e9dd0189
diff --git a/metadata/md5-cache/dev-python/requests-ntlm-1.0.0 b/metadata/md5-cache/dev-python/requests-ntlm-1.0.0
index d23f76afe026..ad506885601e 100644
--- a/metadata/md5-cache/dev-python/requests-ntlm-1.0.0
+++ b/metadata/md5-cache/dev-python/requests-ntlm-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/requests-2.0.0[python_targets_python2_7(-)?,python_targets_
 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/requests/requests-ntlm/archive/v1.0.0.tar.gz -> requests-ntlm-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1cc84f380b0ff52e61db9f918c5c0906
diff --git a/metadata/md5-cache/dev-python/requests-ntlm-1.1.0 b/metadata/md5-cache/dev-python/requests-ntlm-1.1.0
index e1b113b3cb7a..5d4129b42fcd 100644
--- a/metadata/md5-cache/dev-python/requests-ntlm-1.1.0
+++ b/metadata/md5-cache/dev-python/requests-ntlm-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/requests-2.0.0[python_targets_python2_7(-)?,python_targets_
 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/requests_ntlm/requests_ntlm-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c95d29b62bbae2c8c5a8f4cf4623a829
diff --git a/metadata/md5-cache/dev-python/requests-oauthlib-0.7.0 b/metadata/md5-cache/dev-python/requests-oauthlib-0.7.0
index 3a8c2af6efcd..790ef4ba1b04 100644
--- a/metadata/md5-cache/dev-python/requests-oauthlib-0.7.0
+++ b/metadata/md5-cache/dev-python/requests-oauthlib-0.7.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/requests-2.0.0[python_targets_python2_7(-)?,python_targets_
 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/requests/requests-oauthlib/archive/v0.7.0.tar.gz -> requests-oauthlib-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c54f8a81e389366da13b0951dfea6184
diff --git a/metadata/md5-cache/dev-python/requests-toolbelt-0.5.1 b/metadata/md5-cache/dev-python/requests-toolbelt-0.5.1
index 8b62751b98ea..06ab63f52c6c 100644
--- a/metadata/md5-cache/dev-python/requests-toolbelt-0.5.1
+++ b/metadata/md5-cache/dev-python/requests-toolbelt-0.5.1
@@ -10,5 +10,5 @@ RDEPEND=<=dev-python/requests-3.0.0 python_targets_python2_7? ( >=dev-lang/pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests-toolbelt/requests-toolbelt-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=afc442b31ae7dcc9a9f83e2682274f94
diff --git a/metadata/md5-cache/dev-python/requests-toolbelt-0.7.0 b/metadata/md5-cache/dev-python/requests-toolbelt-0.7.0
index 8d59d7ad90b0..befe5a2c6482 100644
--- a/metadata/md5-cache/dev-python/requests-toolbelt-0.7.0
+++ b/metadata/md5-cache/dev-python/requests-toolbelt-0.7.0
@@ -10,5 +10,5 @@ RDEPEND=<=dev-python/requests-3.0.0 python_targets_python2_7? ( >=dev-lang/pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests-toolbelt/requests-toolbelt-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b931a10f3d9fddfb0beaf8b17d7d6455
diff --git a/metadata/md5-cache/dev-python/requests-toolbelt-0.7.1 b/metadata/md5-cache/dev-python/requests-toolbelt-0.7.1
index b97ce50ae6e5..a79538fef337 100644
--- a/metadata/md5-cache/dev-python/requests-toolbelt-0.7.1
+++ b/metadata/md5-cache/dev-python/requests-toolbelt-0.7.1
@@ -10,5 +10,5 @@ RDEPEND=<dev-python/requests-3.0.0[python_targets_python2_7(-)?,python_targets_p
 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/requests-toolbelt/requests-toolbelt-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2e066ed6cc96777a6f05dfb0c664c9fd
diff --git a/metadata/md5-cache/dev-python/requests-toolbelt-0.8.0 b/metadata/md5-cache/dev-python/requests-toolbelt-0.8.0
index 2ae4c3b72cb4..2091f44615be 100644
--- a/metadata/md5-cache/dev-python/requests-toolbelt-0.8.0
+++ b/metadata/md5-cache/dev-python/requests-toolbelt-0.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/r/requests-toolbelt/requests-toolbelt-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3c18c3151d4c372379448642dca9e4bd
diff --git a/metadata/md5-cache/dev-python/requestsexceptions-1.1.3 b/metadata/md5-cache/dev-python/requestsexceptions-1.1.3
index b88962a7fb79..e5c0c932ec0a 100644
--- a/metadata/md5-cache/dev-python/requestsexceptions-1.1.3
+++ b/metadata/md5-cache/dev-python/requestsexceptions-1.1.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-0.11[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
 SRC_URI=mirror://pypi/r/requestsexceptions/requestsexceptions-1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d5534ab5458fecab87bd07b6010df04f
diff --git a/metadata/md5-cache/dev-python/requestsexceptions-1.4.0 b/metadata/md5-cache/dev-python/requestsexceptions-1.4.0
index 142fe44f2bb5..963d94115bc7 100644
--- a/metadata/md5-cache/dev-python/requestsexceptions-1.4.0
+++ b/metadata/md5-cache/dev-python/requestsexceptions-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 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/requestsexceptions/requestsexceptions-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4c79e5c92eb628aa66b72df2bb1b1f46
diff --git a/metadata/md5-cache/dev-python/responses-0.6.0 b/metadata/md5-cache/dev-python/responses-0.6.0
index 8d5591486286..bfa52b5fe28b 100644
--- a/metadata/md5-cache/dev-python/responses-0.6.0
+++ b/metadata/md5-cache/dev-python/responses-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/requests-2.0[python_targets_python2_7(-)?,python_targets_py
 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/getsentry/responses/archive/0.6.0.tar.gz -> responses-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7f0767ea2ff092218549db40eb22235b
diff --git a/metadata/md5-cache/dev-python/restkit-4.2.2 b/metadata/md5-cache/dev-python/restkit-4.2.2
index 4606489eb599..f5805e26f126 100644
--- a/metadata/md5-cache/dev-python/restkit-4.2.2
+++ b/metadata/md5-cache/dev-python/restkit-4.2.2
@@ -10,5 +10,5 @@ RDEPEND=cli? ( dev-python/ipython[python_targets_python2_7(-)?,-python_single_ta
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/restkit/restkit-4.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=834e3e7fdc19d68ff011c835b28ef588
diff --git a/metadata/md5-cache/dev-python/restructuredtext-lint-0.12.2 b/metadata/md5-cache/dev-python/restructuredtext-lint-0.12.2
index d5ff43e0b584..c6f48c9121b7 100644
--- a/metadata/md5-cache/dev-python/restructuredtext-lint-0.12.2
+++ b/metadata/md5-cache/dev-python/restructuredtext-lint-0.12.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/docutils-0.11[python_targets_python2_7(-)?,python_targets_p
 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/restructuredtext_lint/restructuredtext_lint-0.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d17d598043653cfe09b74143fdad95e6
diff --git a/metadata/md5-cache/dev-python/restructuredtext-lint-1.1.2 b/metadata/md5-cache/dev-python/restructuredtext-lint-1.1.2
index a09dd9fdb83f..4245934eed59 100644
--- a/metadata/md5-cache/dev-python/restructuredtext-lint-1.1.2
+++ b/metadata/md5-cache/dev-python/restructuredtext-lint-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/docutils-0.11[python_targets_python2_7(-)?,python_targets_p
 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/restructuredtext_lint/restructuredtext_lint-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a1bb4493ad05f607680a431957c0051e
diff --git a/metadata/md5-cache/dev-python/resumable-urlretrieve-0.1.5 b/metadata/md5-cache/dev-python/resumable-urlretrieve-0.1.5
index 66c7a24e5e0d..e4d6ae1a4d01 100644
--- a/metadata/md5-cache/dev-python/resumable-urlretrieve-0.1.5
+++ b/metadata/md5-cache/dev-python/resumable-urlretrieve-0.1.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/resumable-urlretrieve/resumable-urlretrieve-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e1c59a876ab0def837e0d65c381347f1
diff --git a/metadata/md5-cache/dev-python/retry-decorator-1.0.0 b/metadata/md5-cache/dev-python/retry-decorator-1.0.0
index 1d6dbb1b35fc..9f3a00a870da 100644
--- a/metadata/md5-cache/dev-python/retry-decorator-1.0.0
+++ b/metadata/md5-cache/dev-python/retry-decorator-1.0.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/pnpnpn/retry-decorator/archive/v1.0.0.tar.gz -> retry-decorator-1.0.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=41a5a5adab9c8532194b2c54d4d65625
diff --git a/metadata/md5-cache/dev-python/retrying-1.3.3 b/metadata/md5-cache/dev-python/retrying-1.3.3
index 12d1554732d5..1f9df2a757d2 100644
--- a/metadata/md5-cache/dev-python/retrying-1.3.3
+++ b/metadata/md5-cache/dev-python/retrying-1.3.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/six-1.7.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,
 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/r/retrying/retrying-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f2e3746f65ab7a7028c7f0745fb45bad
diff --git a/metadata/md5-cache/dev-python/reverend-0.4-r1 b/metadata/md5-cache/dev-python/reverend-0.4-r1
index 6046906cf858..351cf6ab1dd0 100644
--- a/metadata/md5-cache/dev-python/reverend-0.4-r1
+++ b/metadata/md5-cache/dev-python/reverend-0.4-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/reverend/Reverend-0.4.tar.gz mirror://pypi/R/Reverend/Reverend-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=07b5c27c247f380a653886c93f87bbff
diff --git a/metadata/md5-cache/dev-python/rfc3986-0.3.1 b/metadata/md5-cache/dev-python/rfc3986-0.3.1
index 53b2a60328c8..4d9761f97538 100644
--- a/metadata/md5-cache/dev-python/rfc3986-0.3.1
+++ b/metadata/md5-cache/dev-python/rfc3986-0.3.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/r/rfc3986/rfc3986-0.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=af9693029147b7d841f7c5256b5c8f3b
diff --git a/metadata/md5-cache/dev-python/rfc3986-0.4.1 b/metadata/md5-cache/dev-python/rfc3986-0.4.1
index 90e93a824f46..60002dcd891e 100644
--- a/metadata/md5-cache/dev-python/rfc3986-0.4.1
+++ b/metadata/md5-cache/dev-python/rfc3986-0.4.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/r/rfc3986/rfc3986-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c975145cedf55657816e76f6458145c9
diff --git a/metadata/md5-cache/dev-python/rfc3986-1.1.0 b/metadata/md5-cache/dev-python/rfc3986-1.1.0
index 35063a48df40..fecfa8fa331b 100644
--- a/metadata/md5-cache/dev-python/rfc3986-1.1.0
+++ b/metadata/md5-cache/dev-python/rfc3986-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/r/rfc3986/rfc3986-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ce09c4a8f987f9f27d5bb39508832f4b
diff --git a/metadata/md5-cache/dev-python/rfc3987-1.3.7 b/metadata/md5-cache/dev-python/rfc3987-1.3.7
index da47154c5b6b..ac1e35eae062 100644
--- a/metadata/md5-cache/dev-python/rfc3987-1.3.7
+++ b/metadata/md5-cache/dev-python/rfc3987-1.3.7
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( dev-python/regex[python_targets_pypy(-)?,-python_
 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/r/rfc3987/rfc3987-1.3.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=26328ffe06658b705b936c24be295f69
diff --git a/metadata/md5-cache/dev-python/riak-python-client-2.7.0-r1 b/metadata/md5-cache/dev-python/riak-python-client-2.7.0-r1
index 5e03a42804ad..76aa9bf121cc 100644
--- a/metadata/md5-cache/dev-python/riak-python-client-2.7.0-r1
+++ b/metadata/md5-cache/dev-python/riak-python-client-2.7.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/basho-erlastic[python_targets_python2_7(-)?,python_targets_py
 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/riak/riak-2.7.0.tar.gz -> riak-python-client-2.7.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8aeaa516cc13c07425fae0c4a5ee8695
diff --git a/metadata/md5-cache/dev-python/rlcompleter2-0.98-r1 b/metadata/md5-cache/dev-python/rlcompleter2-0.98-r1
index 1359f83d8fbc..c9f1d658f674 100644
--- a/metadata/md5-cache/dev-python/rlcompleter2-0.98-r1
+++ b/metadata/md5-cache/dev-python/rlcompleter2-0.98-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=mirror://pypi/r/rlcompleter2/rlcompleter2-0.98.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=21f819fb08ad863609cf7e866850487f
diff --git a/metadata/md5-cache/dev-python/rnc2rng-2.4 b/metadata/md5-cache/dev-python/rnc2rng-2.4
index 5ac5c06957fa..f1eff10aa401 100644
--- a/metadata/md5-cache/dev-python/rnc2rng-2.4
+++ b/metadata/md5-cache/dev-python/rnc2rng-2.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rply[python_targets_python2_7(-)?,python_targets_python3_4(-)
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rnc2rng/rnc2rng-2.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fbe117206a01de1dd51dfc7e4b0be551
diff --git a/metadata/md5-cache/dev-python/rnc2rng-2.4.1 b/metadata/md5-cache/dev-python/rnc2rng-2.4.1
index e84e36ac3cf3..394fe8ddedd5 100644
--- a/metadata/md5-cache/dev-python/rnc2rng-2.4.1
+++ b/metadata/md5-cache/dev-python/rnc2rng-2.4.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rply[python_targets_python2_7(-)?,python_targets_python3_4(-)
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rnc2rng/rnc2rng-2.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fbe117206a01de1dd51dfc7e4b0be551
diff --git a/metadata/md5-cache/dev-python/robotbackgroundlogger-1.2 b/metadata/md5-cache/dev-python/robotbackgroundlogger-1.2
index f46857673fa0..2f0655bdfca6 100644
--- a/metadata/md5-cache/dev-python/robotbackgroundlogger-1.2
+++ b/metadata/md5-cache/dev-python/robotbackgroundlogger-1.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/robotframework[python_targets_python2_7(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/robotbackgroundlogger/robotbackgroundlogger-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b4f36ceed49be46bb78e3562d00a9cf6
diff --git a/metadata/md5-cache/dev-python/robotframework-3.0.2 b/metadata/md5-cache/dev-python/robotframework-3.0.2
index 1592390910d6..e658f2610c50 100644
--- a/metadata/md5-cache/dev-python/robotframework-3.0.2
+++ b/metadata/md5-cache/dev-python/robotframework-3.0.2
@@ -10,5 +10,5 @@ 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_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/robotframework/robotframework-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c940b05b2c4ce4526f91c05db3da07db
diff --git a/metadata/md5-cache/dev-python/robotframework-3.0.4 b/metadata/md5-cache/dev-python/robotframework-3.0.4
index cd2deb360df6..22422b0afe39 100644
--- a/metadata/md5-cache/dev-python/robotframework-3.0.4
+++ b/metadata/md5-cache/dev-python/robotframework-3.0.4
@@ -10,5 +10,5 @@ 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_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/robotframework/robotframework-3.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c940b05b2c4ce4526f91c05db3da07db
diff --git a/metadata/md5-cache/dev-python/robotframework-selenium2library-1.8.0 b/metadata/md5-cache/dev-python/robotframework-selenium2library-1.8.0
index a45304ff915e..a191c05c66a8 100644
--- a/metadata/md5-cache/dev-python/robotframework-selenium2library-1.8.0
+++ b/metadata/md5-cache/dev-python/robotframework-selenium2library-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/selenium-2.32.0[python_targets_python2_7(-)?,-python_single
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/robotframework-selenium2library/robotframework-selenium2library-1.8.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=63899e876c19ab881330bde86ffd762b
diff --git a/metadata/md5-cache/dev-python/robotframework-sshlibrary-2.1.3 b/metadata/md5-cache/dev-python/robotframework-sshlibrary-2.1.3
index 5f9bacec391d..75997be89d37 100644
--- a/metadata/md5-cache/dev-python/robotframework-sshlibrary-2.1.3
+++ b/metadata/md5-cache/dev-python/robotframework-sshlibrary-2.1.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/paramiko-1.8.0[python_targets_python2_7(-)?,-python_single_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/robotframework-sshlibrary/robotframework-sshlibrary-2.1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=090c5b750380e03a5976aedcea7f1ade
diff --git a/metadata/md5-cache/dev-python/roman-2.0.0 b/metadata/md5-cache/dev-python/roman-2.0.0
index 2a93dce24442..191746cdf1d8 100644
--- a/metadata/md5-cache/dev-python/roman-2.0.0
+++ b/metadata/md5-cache/dev-python/roman-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=!<dev-python/docutils-0.9[python_targets_pypy(-)?,python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/roman/roman-2.0.0.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9483ddc79abdf06aeb316f2fbef211f7
diff --git a/metadata/md5-cache/dev-python/roman-3.0 b/metadata/md5-cache/dev-python/roman-3.0
index 56df02c4a5dc..0a4dffd7cb26 100644
--- a/metadata/md5-cache/dev-python/roman-3.0
+++ b/metadata/md5-cache/dev-python/roman-3.0
@@ -10,5 +10,5 @@ RDEPEND=!<dev-python/docutils-0.9[python_targets_pypy(-)?,python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/roman/roman-3.0.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5a314530f2d46401e0a2b882d9159a4f
diff --git a/metadata/md5-cache/dev-python/root_numpy-4.4.0 b/metadata/md5-cache/dev-python/root_numpy-4.4.0
index 8a65df78ef39..b169c587d9f2 100644
--- a/metadata/md5-cache/dev-python/root_numpy-4.4.0
+++ b/metadata/md5-cache/dev-python/root_numpy-4.4.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jyth
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://pypi/r/root_numpy/root_numpy-4.4.0.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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=84e214645e9e762b1b94fa438cfd5527
diff --git a/metadata/md5-cache/dev-python/root_numpy-4.7.3 b/metadata/md5-cache/dev-python/root_numpy-4.7.3
index 7b3b120479a6..1d08c039ffdb 100644
--- a/metadata/md5-cache/dev-python/root_numpy-4.7.3
+++ b/metadata/md5-cache/dev-python/root_numpy-4.7.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_6(-
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/root_numpy/root_numpy-4.7.3.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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b6d76b382fa865959e68726083ee73af
diff --git a/metadata/md5-cache/dev-python/rootpy-0.8.3 b/metadata/md5-cache/dev-python/rootpy-0.8.3
index 8129f6feb9c9..5d8b049ce0a2 100644
--- a/metadata/md5-cache/dev-python/rootpy-0.8.3
+++ b/metadata/md5-cache/dev-python/rootpy-0.8.3
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/r/rootpy/rootpy-0.8.3.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=663ecf20336e0f92c30b62bc3a7eed83
diff --git a/metadata/md5-cache/dev-python/rootpy-1.0.1 b/metadata/md5-cache/dev-python/rootpy-1.0.1
index 277635bd43d7..0dc620aff12e 100644
--- a/metadata/md5-cache/dev-python/rootpy-1.0.1
+++ b/metadata/md5-cache/dev-python/rootpy-1.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/r/rootpy/rootpy-1.0.1.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e96d6021391916313a32a1d4988e5b48
diff --git a/metadata/md5-cache/dev-python/rope-0.10.3 b/metadata/md5-cache/dev-python/rope-0.10.3
index a7cfe344bda4..22ff79aaccb1 100644
--- a/metadata/md5-cache/dev-python/rope-0.10.3
+++ b/metadata/md5-cache/dev-python/rope-0.10.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=0
 SRC_URI=mirror://pypi/r/rope/rope-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=63b7e802ca2415a61fa7a40fdd60d6b0
diff --git a/metadata/md5-cache/dev-python/rope-0.10.7 b/metadata/md5-cache/dev-python/rope-0.10.7
index 87aa739690cc..0aef0c173c84 100644
--- a/metadata/md5-cache/dev-python/rope-0.10.7
+++ b/metadata/md5-cache/dev-python/rope-0.10.7
@@ -10,5 +10,5 @@ RDEPEND=!dev-python/rope_py3k python_targets_python2_7? ( >=dev-lang/python-2.7.
 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/rope/rope-0.10.7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=90a264e1973d19cbf2acdfa271fa3f0c
diff --git a/metadata/md5-cache/dev-python/ropeide-1.5.1-r2 b/metadata/md5-cache/dev-python/ropeide-1.5.1-r2
index 3f27383d499a..5185f5895ed3 100644
--- a/metadata/md5-cache/dev-python/ropeide-1.5.1-r2
+++ b/metadata/md5-cache/dev-python/ropeide-1.5.1-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/rope-0.8.4[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/rope/ropeide-1.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b12c065d752985757490536a81716643
diff --git a/metadata/md5-cache/dev-python/ropemacs-0.8 b/metadata/md5-cache/dev-python/ropemacs-0.8
index 323a7d56953f..0d9b3f19b0f2 100644
--- a/metadata/md5-cache/dev-python/ropemacs-0.8
+++ b/metadata/md5-cache/dev-python/ropemacs-0.8
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rope[python_targets_python2_7(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/ropemacs/ropemacs-0.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	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1ae24ab01fb5c54ba76e697ddefb2b37
diff --git a/metadata/md5-cache/dev-python/ropemode-0.2-r1 b/metadata/md5-cache/dev-python/ropemode-0.2-r1
index 253e7d008030..37ffee227221 100644
--- a/metadata/md5-cache/dev-python/ropemode-0.2-r1
+++ b/metadata/md5-cache/dev-python/ropemode-0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/rope-0.9.2[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/ropemode/ropemode-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4174ffd220216eb4d87320c70bbf6811
diff --git a/metadata/md5-cache/dev-python/ropemode-0.4 b/metadata/md5-cache/dev-python/ropemode-0.4
index bf8ba7d671c2..01b62213c16c 100644
--- a/metadata/md5-cache/dev-python/ropemode-0.4
+++ b/metadata/md5-cache/dev-python/ropemode-0.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/rope-0.9.4[python_targets_python2_7(-)?,python_targets_pyth
 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/python-rope/ropemode/archive/0.4.tar.gz -> ropemode-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2e982a92393a7261941730235fd4649c
diff --git a/metadata/md5-cache/dev-python/rosdistro-0.6.8 b/metadata/md5-cache/dev-python/rosdistro-0.6.8
index 41a560501676..b40d02e578cd 100644
--- a/metadata/md5-cache/dev-python/rosdistro-0.6.8
+++ b/metadata/md5-cache/dev-python/rosdistro-0.6.8
@@ -10,5 +10,5 @@ RDEPEND=dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,p
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/ros-infrastructure/rosdistro/archive/0.6.8.tar.gz -> rosdistro-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9e733e8a8f2a215886d432109f75c58a
diff --git a/metadata/md5-cache/dev-python/rospkg-1.1.4 b/metadata/md5-cache/dev-python/rospkg-1.1.4
index 8866d00baf65..94dee5148f23 100644
--- a/metadata/md5-cache/dev-python/rospkg-1.1.4
+++ b/metadata/md5-cache/dev-python/rospkg-1.1.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,pytho
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/ros-infrastructure/rospkg/archive/1.1.4.tar.gz -> rospkg-1.1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c3b268dd93d6d16f4ee2dfc2325c0b42
diff --git a/metadata/md5-cache/dev-python/routes-2.4.1 b/metadata/md5-cache/dev-python/routes-2.4.1
index f81cb83cb53e..ecf1dcffa519 100644
--- a/metadata/md5-cache/dev-python/routes-2.4.1
+++ b/metadata/md5-cache/dev-python/routes-2.4.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/repoze-lru-0.3[python_targets_python2_7(-)?,python_targets_
 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/Routes/Routes-2.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=de03a5462fab0baeb1d080a05f893fba
diff --git a/metadata/md5-cache/dev-python/rply-0.7.4 b/metadata/md5-cache/dev-python/rply-0.7.4
index 804f6bce40b2..d2c1deb89d3c 100644
--- a/metadata/md5-cache/dev-python/rply-0.7.4
+++ b/metadata/md5-cache/dev-python/rply-0.7.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/alex/rply/archive/v0.7.4.tar.gz -> rply-0.7.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=221f49975be0a7b2080c41b83b8bf8be
diff --git a/metadata/md5-cache/dev-python/rply-0.7.5 b/metadata/md5-cache/dev-python/rply-0.7.5
index 2fcc70ed7e7e..b222ffe759f2 100644
--- a/metadata/md5-cache/dev-python/rply-0.7.5
+++ b/metadata/md5-cache/dev-python/rply-0.7.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/alex/rply/archive/v0.7.5.tar.gz -> rply-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f9171b42657d7b949eb338b4544a5fa9
diff --git a/metadata/md5-cache/dev-python/rply-0.7.6 b/metadata/md5-cache/dev-python/rply-0.7.6
index 4d384fd017c0..f2395d6220ff 100644
--- a/metadata/md5-cache/dev-python/rply-0.7.6
+++ b/metadata/md5-cache/dev-python/rply-0.7.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/alex/rply/archive/v0.7.6.tar.gz -> rply-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3fcf3794faee4f665e52709716ffe474
diff --git a/metadata/md5-cache/dev-python/rpy-2.6.2 b/metadata/md5-cache/dev-python/rpy-2.6.2
index cb92b304098c..ed6e428d8354 100644
--- a/metadata/md5-cache/dev-python/rpy-2.6.2
+++ b/metadata/md5-cache/dev-python/rpy-2.6.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/R-3.1 dev-python/numpy[python_targets_python2_7(-)?,python_ta
 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/rpy2/rpy2-2.6.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7230faf2769cf3ac9ed220e3119e2cf1
diff --git a/metadata/md5-cache/dev-python/rpy-2.9.0 b/metadata/md5-cache/dev-python/rpy-2.9.0
index 554e87703fee..504e503dab42 100644
--- a/metadata/md5-cache/dev-python/rpy-2.9.0
+++ b/metadata/md5-cache/dev-python/rpy-2.9.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/r/rpy2/rpy2-2.9.0.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5ef3c3d3472147a35d853814c47b78e8
diff --git a/metadata/md5-cache/dev-python/rpyc-3.3.0 b/metadata/md5-cache/dev-python/rpyc-3.3.0
index 6de780a4348e..b495dc7b50bc 100644
--- a/metadata/md5-cache/dev-python/rpyc-3.3.0
+++ b/metadata/md5-cache/dev-python/rpyc-3.3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/plumbum python_targets_python2_7? ( >=dev-lang/python-2.7.5-r
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rpyc/rpyc-3.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f71e80382f53437a80521013353d177a
diff --git a/metadata/md5-cache/dev-python/rpyc-3.4.4 b/metadata/md5-cache/dev-python/rpyc-3.4.4
index 19fb1cc69536..a177315ab224 100644
--- a/metadata/md5-cache/dev-python/rpyc-3.4.4
+++ b/metadata/md5-cache/dev-python/rpyc-3.4.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/plumbum python_targets_python2_7? ( >=dev-lang/python-2.7.5-r
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rpyc/rpyc-3.4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=159e50763a96dd446bfb741b3d96ac31
diff --git a/metadata/md5-cache/dev-python/rsa-3.2.3-r1 b/metadata/md5-cache/dev-python/rsa-3.2.3-r1
index 852c1970d649..60ca7459289b 100644
--- a/metadata/md5-cache/dev-python/rsa-3.2.3-r1
+++ b/metadata/md5-cache/dev-python/rsa-3.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pyasn1-0.1.3[python_targets_pypy(-)?,python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rsa/rsa-3.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=73eb7635a8e83a983bb8f613bd48c7d7
diff --git a/metadata/md5-cache/dev-python/rsa-3.4.2 b/metadata/md5-cache/dev-python/rsa-3.4.2
index 2965fbdb92ed..549732faf4ef 100644
--- a/metadata/md5-cache/dev-python/rsa-3.4.2
+++ b/metadata/md5-cache/dev-python/rsa-3.4.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pyasn1-0.1.3[python_targets_pypy(-)?,python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rsa/rsa-3.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cce6ded0dab6768b66a233c1470096e5
diff --git a/metadata/md5-cache/dev-python/rst-linker-1.7 b/metadata/md5-cache/dev-python/rst-linker-1.7
index 5a3253766e5a..24a74c0dc32a 100644
--- a/metadata/md5-cache/dev-python/rst-linker-1.7
+++ b/metadata/md5-cache/dev-python/rst-linker-1.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/python-dateutil[python_targets_pypy(-)?,python_targets_pypy3(
 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/r/rst.linker/rst.linker-1.7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f7349bdf06262813a4c4c29c69e9b374
diff --git a/metadata/md5-cache/dev-python/rst-linker-1.9-r1 b/metadata/md5-cache/dev-python/rst-linker-1.9-r1
index a31f6e976e94..51f6713fd763 100644
--- a/metadata/md5-cache/dev-python/rst-linker-1.9-r1
+++ b/metadata/md5-cache/dev-python/rst-linker-1.9-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/python-dateutil[python_targets_pypy(-)?,python_targets_pypy3(
 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/r/rst.linker/rst.linker-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=18c85fcdf8957b9d9cb656e17dedbc0d
diff --git a/metadata/md5-cache/dev-python/rst2pdf-0.93-r3 b/metadata/md5-cache/dev-python/rst2pdf-0.93-r3
index 7807acf39c0c..383603efbc0c 100644
--- a/metadata/md5-cache/dev-python/rst2pdf-0.93-r3
+++ b/metadata/md5-cache/dev-python/rst2pdf-0.93-r3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/rst2pdf/rst2pdf/archive/0.93.tar.gz -> rst2pdf-0.93.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=27798e6697120043a023d9bcbf3d666d
diff --git a/metadata/md5-cache/dev-python/rtf2xml-1.33-r1 b/metadata/md5-cache/dev-python/rtf2xml-1.33-r1
index 8e4f7c1bf5e8..d1df8a133c30 100644
--- a/metadata/md5-cache/dev-python/rtf2xml-1.33-r1
+++ b/metadata/md5-cache/dev-python/rtf2xml-1.33-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=mirror://sourceforge/rtf2xml/rtf2xml-1.33.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=029be489530cccf7ef560750f7f1a1ee
diff --git a/metadata/md5-cache/dev-python/rtgraph-0.70-r1 b/metadata/md5-cache/dev-python/rtgraph-0.70-r1
index 726164683014..9eff07caa816 100644
--- a/metadata/md5-cache/dev-python/rtgraph-0.70-r1
+++ b/metadata/md5-cache/dev-python/rtgraph-0.70-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/rtgraph/rtgraph-0.70.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=547653609b1d1659208a929dac4a1f80
diff --git a/metadata/md5-cache/dev-python/rtimulib-7.2.1 b/metadata/md5-cache/dev-python/rtimulib-7.2.1
index 194eecf1d155..067e203e098e 100644
--- a/metadata/md5-cache/dev-python/rtimulib-7.2.1
+++ b/metadata/md5-cache/dev-python/rtimulib-7.2.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/RPi-Distro/RTIMULib/archive/V7.2.1.tar.gz -> RTIMULib-7.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=508fdc70f9bcafd4f29e2530c0823661
diff --git a/metadata/md5-cache/dev-python/rtslib-fb-2.1.62 b/metadata/md5-cache/dev-python/rtslib-fb-2.1.62
index 1816fb5c1243..27b73e92df74 100644
--- a/metadata/md5-cache/dev-python/rtslib-fb-2.1.62
+++ b/metadata/md5-cache/dev-python/rtslib-fb-2.1.62
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyudev[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rtslib-fb/rtslib-fb-2.1.62.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=39180ad749b400f51e4ad87c75546c5f
diff --git a/metadata/md5-cache/dev-python/rtslib-fb-2.1.66 b/metadata/md5-cache/dev-python/rtslib-fb-2.1.66
index 2f2b3430f12c..0b1cacbdefd0 100644
--- a/metadata/md5-cache/dev-python/rtslib-fb-2.1.66
+++ b/metadata/md5-cache/dev-python/rtslib-fb-2.1.66
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyudev[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rtslib-fb/rtslib-fb-2.1.66.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6bf0e89ae1b9df8e3a08206c2cff92ed
diff --git a/metadata/md5-cache/dev-python/rtslib-fb-2.1.66-r1 b/metadata/md5-cache/dev-python/rtslib-fb-2.1.66-r1
index 07c25a41c772..229fedaa31bb 100644
--- a/metadata/md5-cache/dev-python/rtslib-fb-2.1.66-r1
+++ b/metadata/md5-cache/dev-python/rtslib-fb-2.1.66-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyudev[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rtslib-fb/rtslib-fb-2.1.66.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1a7b41516cece0da5f29922dfe41cfb0
diff --git a/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.6.3 b/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.6.3
index 5d644e5524c8..dad5a9ee9e79 100644
--- a/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.6.3
+++ b/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.6.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://bitbucket.org/ruamel/std.pathlib/get/0.6.3.tar.gz -> ruamel-std-pathlib-0.6.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cd00ded8c3031cfbdfa2ed0e4f1cd14d
diff --git a/metadata/md5-cache/dev-python/ruamel-yaml-0.15.35 b/metadata/md5-cache/dev-python/ruamel-yaml-0.15.35
index 54acba390771..dcedeadc4cb2 100644
--- a/metadata/md5-cache/dev-python/ruamel-yaml-0.15.35
+++ b/metadata/md5-cache/dev-python/ruamel-yaml-0.15.35
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://bitbucket.org/ruamel/yaml/get/0.15.35.tar.gz -> ruamel-yaml-0.15.35.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cec19ca081a0e159de44ea3c8e6e2502
diff --git a/metadata/md5-cache/dev-python/ruledispatch-0.5_pre2306-r2 b/metadata/md5-cache/dev-python/ruledispatch-0.5_pre2306-r2
index d182e44f4985..7bbba5a00537 100644
--- a/metadata/md5-cache/dev-python/ruledispatch-0.5_pre2306-r2
+++ b/metadata/md5-cache/dev-python/ruledispatch-0.5_pre2306-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pyprotocols-1.0_pre2306[python_targets_python2_7(-)?,-pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gentoo/RuleDispatch-0.5a0.dev-r2306.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ef91c92c07f1de93e69190a3a56d11c7
diff --git a/metadata/md5-cache/dev-python/runsnakerun-2.0.4 b/metadata/md5-cache/dev-python/runsnakerun-2.0.4
index 8733ebfc71eb..513cc9de6dc4 100644
--- a/metadata/md5-cache/dev-python/runsnakerun-2.0.4
+++ b/metadata/md5-cache/dev-python/runsnakerun-2.0.4
@@ -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=mirror://pypi/R/RunSnakeRun/RunSnakeRun-2.0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f6985bb78cbab1c5898e720f91fd5930
diff --git a/metadata/md5-cache/dev-python/ryu-4.14 b/metadata/md5-cache/dev-python/ryu-4.14
index c6d06794f3e6..bfdc2910334d 100644
--- a/metadata/md5-cache/dev-python/ryu-4.14
+++ b/metadata/md5-cache/dev-python/ryu-4.14
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/r/ryu/ryu-4.14.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a1eaa8eee0850298355ff62d25d213e1
diff --git a/metadata/md5-cache/dev-python/ryu-4.21 b/metadata/md5-cache/dev-python/ryu-4.21
index 68e66eca3f31..c954a93c4647 100644
--- a/metadata/md5-cache/dev-python/ryu-4.21
+++ b/metadata/md5-cache/dev-python/ryu-4.21
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/r/ryu/ryu-4.21.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=58898c2f1274b4f66d368b5953f72dfc
diff --git a/metadata/md5-cache/dev-python/ryu-4.26 b/metadata/md5-cache/dev-python/ryu-4.26
index f109265f46e9..330216e878d7 100644
--- a/metadata/md5-cache/dev-python/ryu-4.26
+++ b/metadata/md5-cache/dev-python/ryu-4.26
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/r/ryu/ryu-4.26.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=58898c2f1274b4f66d368b5953f72dfc
diff --git a/metadata/md5-cache/dev-python/s3fs-0.1.2 b/metadata/md5-cache/dev-python/s3fs-0.1.2
index 737d8c98c9d1..223de491fa3b 100644
--- a/metadata/md5-cache/dev-python/s3fs-0.1.2
+++ b/metadata/md5-cache/dev-python/s3fs-0.1.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/boto3[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/s3fs/s3fs-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4e9c901d7965e6353008f55cd8a036ba
diff --git a/metadata/md5-cache/dev-python/s3fs-0.1.5 b/metadata/md5-cache/dev-python/s3fs-0.1.5
index 4f231e1b34b9..8be11d1a5c94 100644
--- a/metadata/md5-cache/dev-python/s3fs-0.1.5
+++ b/metadata/md5-cache/dev-python/s3fs-0.1.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/boto3[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/s3fs/s3fs-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5e877a0e804dfe54bdb0ce36c7f14607
diff --git a/metadata/md5-cache/dev-python/s3transfer-0.1.11 b/metadata/md5-cache/dev-python/s3transfer-0.1.11
index 0e9aed51a1de..4b843cd2c9bf 100644
--- a/metadata/md5-cache/dev-python/s3transfer-0.1.11
+++ b/metadata/md5-cache/dev-python/s3transfer-0.1.11
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/botocore-1.3.0[python_targets_python2_7(-)?,python_targets_
 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/s3transfer/s3transfer-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=29f7909b2f39921eba116cfa6fdabfd0
diff --git a/metadata/md5-cache/dev-python/sabyenc-3.3.5 b/metadata/md5-cache/dev-python/sabyenc-3.3.5
index 4f0c5dcf747f..5c75d2052184 100644
--- a/metadata/md5-cache/dev-python/sabyenc-3.3.5
+++ b/metadata/md5-cache/dev-python/sabyenc-3.3.5
@@ -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/sabnzbd/sabyenc/tarball/v3.3.5 -> sabyenc-3.3.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1e4b7e514d38b81bbd067ccf6770044a
diff --git a/metadata/md5-cache/dev-python/safety-1.4.1 b/metadata/md5-cache/dev-python/safety-1.4.1
index 8ac314e8b604..4ef7e6b61a2d 100644
--- a/metadata/md5-cache/dev-python/safety-1.4.1
+++ b/metadata/md5-cache/dev-python/safety-1.4.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/setuptools-16[python_targets_python2_7(-)?,python_targets_p
 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/pyupio/safety/archive/1.4.1.tar.gz -> safety-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b713fef9fb4bba4e09831941a8b9d12f
diff --git a/metadata/md5-cache/dev-python/sampy-1.2.1 b/metadata/md5-cache/dev-python/sampy-1.2.1
index 145c906183d6..b91eb9f40250 100644
--- a/metadata/md5-cache/dev-python/sampy-1.2.1
+++ b/metadata/md5-cache/dev-python/sampy-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk(+)] ) >=de
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sampy/sampy-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e24e6d1384d923f8f6ed310bb70f9245
diff --git a/metadata/md5-cache/dev-python/sancho-2.4-r1 b/metadata/md5-cache/dev-python/sancho-2.4-r1
index 79f34b62d599..bbf9d0900a71 100644
--- a/metadata/md5-cache/dev-python/sancho-2.4-r1
+++ b/metadata/md5-cache/dev-python/sancho-2.4-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://www.mems-exchange.org/software/files/sancho/Sancho-2.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0f745c00c3a5359c094f5ff5be91c75b
diff --git a/metadata/md5-cache/dev-python/scandir-1.6 b/metadata/md5-cache/dev-python/scandir-1.6
index ff4a2cc15515..3f53cf8bee29 100644
--- a/metadata/md5-cache/dev-python/scandir-1.6
+++ b/metadata/md5-cache/dev-python/scandir-1.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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	89bb9f083a2590d9b447fd0b78a96186
+_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.7 b/metadata/md5-cache/dev-python/scandir-1.7
index 4682e571d643..f6aa20787354 100644
--- a/metadata/md5-cache/dev-python/scandir-1.7
+++ b/metadata/md5-cache/dev-python/scandir-1.7
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/scandir/scandir-1.7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b32338c5471a404a2cc12d29f3d9be69
diff --git a/metadata/md5-cache/dev-python/scandir-1.8 b/metadata/md5-cache/dev-python/scandir-1.8
index 964dfb3e37b8..d52d9227629f 100644
--- a/metadata/md5-cache/dev-python/scandir-1.8
+++ b/metadata/md5-cache/dev-python/scandir-1.8
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/scandir/scandir-1.8.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=772b2089d6e0bf49af045c349abfe902
diff --git a/metadata/md5-cache/dev-python/scandir-1.9.0 b/metadata/md5-cache/dev-python/scandir-1.9.0
index 91ee253ce80e..8889f006afaa 100644
--- a/metadata/md5-cache/dev-python/scandir-1.9.0
+++ b/metadata/md5-cache/dev-python/scandir-1.9.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-python/scapy-python3-0.18-r1 b/metadata/md5-cache/dev-python/scapy-python3-0.18-r1
index ce273425d048..38d9518b43f9 100644
--- a/metadata/md5-cache/dev-python/scapy-python3-0.18-r1
+++ b/metadata/md5-cache/dev-python/scapy-python3-0.18-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/s/scapy-python3/scapy-python3-0.18.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=394e8ede4b2c478076f85e4ee689e290
diff --git a/metadata/md5-cache/dev-python/scapy-python3-0.21 b/metadata/md5-cache/dev-python/scapy-python3-0.21
index f23cbc938c6c..86aec7b91705 100644
--- a/metadata/md5-cache/dev-python/scapy-python3-0.21
+++ b/metadata/md5-cache/dev-python/scapy-python3-0.21
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/s/scapy-python3/scapy-python3-0.21.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d35506f696f76fc96f577166c57f12a9
diff --git a/metadata/md5-cache/dev-python/scapy-python3-0.23 b/metadata/md5-cache/dev-python/scapy-python3-0.23
index fcdb33472be7..e98cb8cd167a 100644
--- a/metadata/md5-cache/dev-python/scapy-python3-0.23
+++ b/metadata/md5-cache/dev-python/scapy-python3-0.23
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/scapy-python3/scapy-python3-0.23.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2f74c9116e1af119455a0525e373c1c7
diff --git a/metadata/md5-cache/dev-python/schedule-0.4.2 b/metadata/md5-cache/dev-python/schedule-0.4.2
index c7574ae29cca..642ce3af0677 100644
--- a/metadata/md5-cache/dev-python/schedule-0.4.2
+++ b/metadata/md5-cache/dev-python/schedule-0.4.2
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/s/schedule/schedule-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3ba128146636bf2e290254c3edd7be63
diff --git a/metadata/md5-cache/dev-python/schedule-0.5.0 b/metadata/md5-cache/dev-python/schedule-0.5.0
index 764769f99506..d5a9f9c54a3c 100644
--- a/metadata/md5-cache/dev-python/schedule-0.5.0
+++ b/metadata/md5-cache/dev-python/schedule-0.5.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/s/schedule/schedule-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1fe395fd0499376af1c2862a9904685d
diff --git a/metadata/md5-cache/dev-python/schema-0.6.6 b/metadata/md5-cache/dev-python/schema-0.6.6
index 7ccdf0e55984..65a10aa0a6c1 100644
--- a/metadata/md5-cache/dev-python/schema-0.6.6
+++ b/metadata/md5-cache/dev-python/schema-0.6.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/schema/schema-0.6.6.tar.gz https://github.com/keleshev/schema/archive/v0.6.6.zip -> schema-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2834bbff0c3d210c07f973c51e1340ee
diff --git a/metadata/md5-cache/dev-python/scientificpython-2.9.4 b/metadata/md5-cache/dev-python/scientificpython-2.9.4
index e883b1efea24..1227f051aa7a 100644
--- a/metadata/md5-cache/dev-python/scientificpython-2.9.4
+++ b/metadata/md5-cache/dev-python/scientificpython-2.9.4
@@ -10,5 +10,5 @@ RDEPEND=<dev-python/numpy-1.9[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://sourcesup.cru.fr/frs/download.php/4570/ScientificPython-2.9.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=743f64cc4c7b112d3419ff91647289b1
diff --git a/metadata/md5-cache/dev-python/scimath-4.1.2-r1 b/metadata/md5-cache/dev-python/scimath-4.1.2-r1
index 2d75fbbafe8b..4dc6f80d4651 100644
--- a/metadata/md5-cache/dev-python/scimath-4.1.2-r1
+++ b/metadata/md5-cache/dev-python/scimath-4.1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/traits-4.1[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.enthought.com/repo/ets/scimath-4.1.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=07c44eadda15103cc956477a3d2bb244
diff --git a/metadata/md5-cache/dev-python/sclapp-0.5.3-r1 b/metadata/md5-cache/dev-python/sclapp-0.5.3-r1
index a5a09732be35..88ffe848b5ff 100644
--- a/metadata/md5-cache/dev-python/sclapp-0.5.3-r1
+++ b/metadata/md5-cache/dev-python/sclapp-0.5.3-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pexpect[python_targets_python2_7(-)?,-python_single_target_py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.alittletooquiet.net/media/release/sclapp-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0d8f15c69ed66f4226f71cc4c0d68f94
diff --git a/metadata/md5-cache/dev-python/scoop-0.7.0-r1 b/metadata/md5-cache/dev-python/scoop-0.7.0-r1
index 82f0fcef7a5f..7dba4d68fa7d 100644
--- a/metadata/md5-cache/dev-python/scoop-0.7.0-r1
+++ b/metadata/md5-cache/dev-python/scoop-0.7.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/greenlet-0.3.4 >=dev-python/pyzmq-13.1.0 python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/scoop/scoop-0.7.0.release.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3d8e7036a1862b45b9cb0abd501b3c70
diff --git a/metadata/md5-cache/dev-python/scp-0.10.2 b/metadata/md5-cache/dev-python/scp-0.10.2
index e3d5518bb4e6..8f6dbe89cf04 100644
--- a/metadata/md5-cache/dev-python/scp-0.10.2
+++ b/metadata/md5-cache/dev-python/scp-0.10.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/s/scp/scp-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0746f366d3994b72503970b484bed921
diff --git a/metadata/md5-cache/dev-python/scripttest-1.2-r1 b/metadata/md5-cache/dev-python/scripttest-1.2-r1
index b31958f14272..3e154b3804fd 100644
--- a/metadata/md5-cache/dev-python/scripttest-1.2-r1
+++ b/metadata/md5-cache/dev-python/scripttest-1.2-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=mirror://pypi/S/ScriptTest/ScriptTest-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b9e6bedd2337cd6d11c1fcd75b7917ff
diff --git a/metadata/md5-cache/dev-python/scripttest-1.3.0 b/metadata/md5-cache/dev-python/scripttest-1.3.0
index d172d1b93cd9..e871ca0ce81c 100644
--- a/metadata/md5-cache/dev-python/scripttest-1.3.0
+++ b/metadata/md5-cache/dev-python/scripttest-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/pypa/scripttest/archive/1.3.0.tar.gz -> scripttest-1.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=be29ebe3eef02a6b3d1e33f1cfb05e23
diff --git a/metadata/md5-cache/dev-python/scrypt-0.8.0 b/metadata/md5-cache/dev-python/scrypt-0.8.0
index f480a89415fa..76cf3f2a275d 100644
--- a/metadata/md5-cache/dev-python/scrypt-0.8.0
+++ b/metadata/md5-cache/dev-python/scrypt-0.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/s/scrypt/scrypt-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8fa2ae9990196381411891c81ca78f98
diff --git a/metadata/md5-cache/dev-python/scrypt-0.8.6 b/metadata/md5-cache/dev-python/scrypt-0.8.6
index ce19aa9c1be0..541ac72665f5 100644
--- a/metadata/md5-cache/dev-python/scrypt-0.8.6
+++ b/metadata/md5-cache/dev-python/scrypt-0.8.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/scrypt/scrypt-0.8.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=42a53978213ab1c39b50757fd4bf3493
diff --git a/metadata/md5-cache/dev-python/sdnotify-0.3.1 b/metadata/md5-cache/dev-python/sdnotify-0.3.1
index 14a8491dbdaf..d816991dbb9c 100644
--- a/metadata/md5-cache/dev-python/sdnotify-0.3.1
+++ b/metadata/md5-cache/dev-python/sdnotify-0.3.1
@@ -10,5 +10,5 @@ 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
 SRC_URI=mirror://pypi/s/sdnotify/sdnotify-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e5254b0f3fb5fb32aa972d5a3eff3e84
diff --git a/metadata/md5-cache/dev-python/sdnotify-0.3.2 b/metadata/md5-cache/dev-python/sdnotify-0.3.2
index 4015da8b3e1a..75cf955c96aa 100644
--- a/metadata/md5-cache/dev-python/sdnotify-0.3.2
+++ b/metadata/md5-cache/dev-python/sdnotify-0.3.2
@@ -10,5 +10,5 @@ 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
 SRC_URI=mirror://pypi/s/sdnotify/sdnotify-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7d3bcd4b0e0312b8d8a5fa180f1cf20a
diff --git a/metadata/md5-cache/dev-python/seaborn-0.7.1 b/metadata/md5-cache/dev-python/seaborn-0.7.1
index bf39240ff2d2..607f3bd5c818 100644
--- a/metadata/md5-cache/dev-python/seaborn-0.7.1
+++ b/metadata/md5-cache/dev-python/seaborn-0.7.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/matplotlib[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
 SRC_URI=mirror://pypi/s/seaborn/seaborn-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6cafdd0039cfaffe8341bb8228fdb067
diff --git a/metadata/md5-cache/dev-python/seaborn-0.8.1 b/metadata/md5-cache/dev-python/seaborn-0.8.1
index abd9a290bc89..84c2431715fc 100644
--- a/metadata/md5-cache/dev-python/seaborn-0.8.1
+++ b/metadata/md5-cache/dev-python/seaborn-0.8.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/matplotlib[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
 SRC_URI=mirror://pypi/s/seaborn/seaborn-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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=6cafdd0039cfaffe8341bb8228fdb067
diff --git a/metadata/md5-cache/dev-python/seaborn-0.9.0 b/metadata/md5-cache/dev-python/seaborn-0.9.0
index db1072497cee..4cdbed8174a5 100644
--- a/metadata/md5-cache/dev-python/seaborn-0.9.0
+++ b/metadata/md5-cache/dev-python/seaborn-0.9.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/matplotlib[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
 SRC_URI=mirror://pypi/s/seaborn/seaborn-0.9.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=6cafdd0039cfaffe8341bb8228fdb067
diff --git a/metadata/md5-cache/dev-python/secretstorage-2.3.1 b/metadata/md5-cache/dev-python/secretstorage-2.3.1
index c90dd23bbcec..7081b9fa240a 100644
--- a/metadata/md5-cache/dev-python/secretstorage-2.3.1
+++ b/metadata/md5-cache/dev-python/secretstorage-2.3.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/cryptography[python_targets_python2_7(-)?,python_targets_pyth
 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/SecretStorage/SecretStorage-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f22bc7df97885409942a7d3199447ddc
diff --git a/metadata/md5-cache/dev-python/selectors34-1.2 b/metadata/md5-cache/dev-python/selectors34-1.2
index 9079e061aa9b..a3c5639d6f9a 100644
--- a/metadata/md5-cache/dev-python/selectors34-1.2
+++ b/metadata/md5-cache/dev-python/selectors34-1.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/selectors34/selectors34-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1a2ca6bf13c19df0dcaaaf162d3c15bc
diff --git a/metadata/md5-cache/dev-python/selenium-3.0.2 b/metadata/md5-cache/dev-python/selenium-3.0.2
index 5e8634508e61..7ee509ba8dfe 100644
--- a/metadata/md5-cache/dev-python/selenium-3.0.2
+++ b/metadata/md5-cache/dev-python/selenium-3.0.2
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/s/selenium/selenium-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3cae29b5ae977bc835a7e32297684c82
diff --git a/metadata/md5-cache/dev-python/selenium-3.13.0 b/metadata/md5-cache/dev-python/selenium-3.13.0
index 7c9f3827da57..b2f7f0bf955b 100644
--- a/metadata/md5-cache/dev-python/selenium-3.13.0
+++ b/metadata/md5-cache/dev-python/selenium-3.13.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/s/selenium/selenium-3.13.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a22c9a8f9d4ffc0d55453c23029a40b2
diff --git a/metadata/md5-cache/dev-python/semantic_version-2.6.0 b/metadata/md5-cache/dev-python/semantic_version-2.6.0
index c5cd97c07642..2bd71d0b6962 100644
--- a/metadata/md5-cache/dev-python/semantic_version-2.6.0
+++ b/metadata/md5-cache/dev-python/semantic_version-2.6.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/s/semantic_version/semantic_version-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3b5cd33f3bade2e11c2832bcc89038c3
diff --git a/metadata/md5-cache/dev-python/semantic_version-2.6.0-r1 b/metadata/md5-cache/dev-python/semantic_version-2.6.0-r1
index d8a800266e9d..812bde7fdff4 100644
--- a/metadata/md5-cache/dev-python/semantic_version-2.6.0-r1
+++ b/metadata/md5-cache/dev-python/semantic_version-2.6.0-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/rbarrois/python-semanticversion/archive/v2.6.0.tar.gz -> semantic_version-2.6.0-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2680ea5ad51eddc91183921e1c5d2206
diff --git a/metadata/md5-cache/dev-python/send2trash-1.3.0 b/metadata/md5-cache/dev-python/send2trash-1.3.0
index b74256910014..f6c14d0401e3 100644
--- a/metadata/md5-cache/dev-python/send2trash-1.3.0
+++ b/metadata/md5-cache/dev-python/send2trash-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/Send2Trash/Send2Trash-1.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=30672e548e059b3c4716c040b18b3f13
diff --git a/metadata/md5-cache/dev-python/serpent-1.19 b/metadata/md5-cache/dev-python/serpent-1.19
index 55fe910a83c1..cbfdc97b2690 100644
--- a/metadata/md5-cache/dev-python/serpent-1.19
+++ b/metadata/md5-cache/dev-python/serpent-1.19
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/s/serpent/serpent-1.19.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ae6d2c652dfddbff37d5396bc5677ce7
diff --git a/metadata/md5-cache/dev-python/service_identity-14.0.0 b/metadata/md5-cache/dev-python/service_identity-14.0.0
index 39c5c9a17175..5e3de1e1048f 100644
--- a/metadata/md5-cache/dev-python/service_identity-14.0.0
+++ b/metadata/md5-cache/dev-python/service_identity-14.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyasn1[python_targets_pypy(-)?,python_targets_python2_7(-)?,p
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/s/service_identity/service_identity-14.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=248e5deab624ac962d378f8c7ec2bf0b
diff --git a/metadata/md5-cache/dev-python/service_identity-16.0.0 b/metadata/md5-cache/dev-python/service_identity-16.0.0
index 31375458f8e2..9e2f8da31d07 100644
--- a/metadata/md5-cache/dev-python/service_identity-16.0.0
+++ b/metadata/md5-cache/dev-python/service_identity-16.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyasn1[python_targets_pypy(-)?,python_targets_python2_7(-)?,p
 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/service_identity/service_identity-16.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d00f8f010158737250daf45b4eb3b0fb
diff --git a/metadata/md5-cache/dev-python/service_identity-17.0.0 b/metadata/md5-cache/dev-python/service_identity-17.0.0
index 15725f975199..6989859258dd 100644
--- a/metadata/md5-cache/dev-python/service_identity-17.0.0
+++ b/metadata/md5-cache/dev-python/service_identity-17.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/s/service_identity/service_identity-17.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b5a884c04f1fff8408d89ceaba15a7f3
diff --git a/metadata/md5-cache/dev-python/service_identity-17.0.0-r1 b/metadata/md5-cache/dev-python/service_identity-17.0.0-r1
index f50508001141..d90f0d8b7558 100644
--- a/metadata/md5-cache/dev-python/service_identity-17.0.0-r1
+++ b/metadata/md5-cache/dev-python/service_identity-17.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyasn1[python_targets_pypy(-)?,python_targets_python2_7(-)?,p
 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/pyca/service_identity/archive/17.0.0.tar.gz -> service_identity-17.0.0.gh.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d1a309acbf09ea1a527bdf607e564aaf
diff --git a/metadata/md5-cache/dev-python/setproctitle-1.1.10 b/metadata/md5-cache/dev-python/setproctitle-1.1.10
index 8e6f526fb34a..171c6086b120 100644
--- a/metadata/md5-cache/dev-python/setproctitle-1.1.10
+++ b/metadata/md5-cache/dev-python/setproctitle-1.1.10
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/setproctitle/setproctitle-1.1.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=343291b135e32de0f1b2a446c3107884
diff --git a/metadata/md5-cache/dev-python/setproctitle-1.1.8 b/metadata/md5-cache/dev-python/setproctitle-1.1.8
index e251c2cdb974..9989755282c9 100644
--- a/metadata/md5-cache/dev-python/setproctitle-1.1.8
+++ b/metadata/md5-cache/dev-python/setproctitle-1.1.8
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/setproctitle/setproctitle-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=32d9c1be747ed80ff295f2ce759392fe
diff --git a/metadata/md5-cache/dev-python/setuptools-34.0.2-r1 b/metadata/md5-cache/dev-python/setuptools-34.0.2-r1
index 15b15d282254..e0a15bdf8a29 100644
--- a/metadata/md5-cache/dev-python/setuptools-34.0.2-r1
+++ b/metadata/md5-cache/dev-python/setuptools-34.0.2-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/packaging-16.8[python_targets_pypy(-)?,python_targets_pypy3
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools/setuptools-34.0.2.zip
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9547864658745e5d8c89257c55b618e4
diff --git a/metadata/md5-cache/dev-python/setuptools-36.0.1 b/metadata/md5-cache/dev-python/setuptools-36.0.1
index 66d4fc3f33d6..20f4773ca44a 100644
--- a/metadata/md5-cache/dev-python/setuptools-36.0.1
+++ b/metadata/md5-cache/dev-python/setuptools-36.0.1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools/setuptools-36.0.1.zip
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=91b2bb428a69780bc70f08cccff6eabd
diff --git a/metadata/md5-cache/dev-python/setuptools-36.7.2 b/metadata/md5-cache/dev-python/setuptools-36.7.2
index 790399930ce4..d2646beae0e1 100644
--- a/metadata/md5-cache/dev-python/setuptools-36.7.2
+++ b/metadata/md5-cache/dev-python/setuptools-36.7.2
@@ -11,5 +11,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools/setuptools-36.7.2.zip
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1031eb54feb55bd5ba3ac03e1c537bcd
diff --git a/metadata/md5-cache/dev-python/setuptools-38.5.1 b/metadata/md5-cache/dev-python/setuptools-38.5.1
index 14a672caf788..bb93fbb024a9 100644
--- a/metadata/md5-cache/dev-python/setuptools-38.5.1
+++ b/metadata/md5-cache/dev-python/setuptools-38.5.1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools/setuptools-38.5.1.zip
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=634f18b8a64afd89b45ddea13c2134f8
diff --git a/metadata/md5-cache/dev-python/setuptools-38.6.1 b/metadata/md5-cache/dev-python/setuptools-38.6.1
index 8e818e44dc41..62cd80a32eec 100644
--- a/metadata/md5-cache/dev-python/setuptools-38.6.1
+++ b/metadata/md5-cache/dev-python/setuptools-38.6.1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools/setuptools-38.6.1.zip
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=634f18b8a64afd89b45ddea13c2134f8
diff --git a/metadata/md5-cache/dev-python/setuptools-40.0.0 b/metadata/md5-cache/dev-python/setuptools-40.0.0
index 307ac4ccbac7..980ff35d28ec 100644
--- a/metadata/md5-cache/dev-python/setuptools-40.0.0
+++ b/metadata/md5-cache/dev-python/setuptools-40.0.0
@@ -11,5 +11,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy
 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/setuptools/setuptools-40.0.0.zip
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7062d7fa2e45902ff99e93b843f4f768
diff --git a/metadata/md5-cache/dev-python/setuptools-9999 b/metadata/md5-cache/dev-python/setuptools-9999
index ef57008293dc..6db95506da64 100644
--- a/metadata/md5-cache/dev-python/setuptools-9999
+++ b/metadata/md5-cache/dev-python/setuptools-9999
@@ -9,5 +9,5 @@ PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy(-)?,python_targets_py
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_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
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9a963283fce93c4f8a78aecd94673cd5
diff --git a/metadata/md5-cache/dev-python/setuptools-git-1.2 b/metadata/md5-cache/dev-python/setuptools-git-1.2
index c6f403f506cb..50f91524f789 100644
--- a/metadata/md5-cache/dev-python/setuptools-git-1.2
+++ b/metadata/md5-cache/dev-python/setuptools-git-1.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,p
 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/setuptools-git/setuptools-git-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4b932226b773d3cab0839d7bf0a35c2b
diff --git a/metadata/md5-cache/dev-python/setuptools_hg-0.4-r1 b/metadata/md5-cache/dev-python/setuptools_hg-0.4-r1
index dd8d041e28c2..33529a97704e 100644
--- a/metadata/md5-cache/dev-python/setuptools_hg-0.4-r1
+++ b/metadata/md5-cache/dev-python/setuptools_hg-0.4-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-vcs/mercurial python_targets_pypy? ( >=virtual/pypy-5:0= ) python_ta
 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/setuptools_hg/setuptools_hg-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=31bd1cbe09cec34f7c25a7eb6fe4a1d5
diff --git a/metadata/md5-cache/dev-python/setuptools_scm-1.15.6-r1 b/metadata/md5-cache/dev-python/setuptools_scm-1.15.6-r1
index a2745fd6d5e0..fbde2c21da41 100644
--- a/metadata/md5-cache/dev-python/setuptools_scm-1.15.6-r1
+++ b/metadata/md5-cache/dev-python/setuptools_scm-1.15.6-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools_scm/setuptools_scm-1.15.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fe921a991764ed27f10704736de6fc83
diff --git a/metadata/md5-cache/dev-python/setuptools_scm-1.15.7 b/metadata/md5-cache/dev-python/setuptools_scm-1.15.7
index 22ef91990b99..a2a5dac86386 100644
--- a/metadata/md5-cache/dev-python/setuptools_scm-1.15.7
+++ b/metadata/md5-cache/dev-python/setuptools_scm-1.15.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools_scm/setuptools_scm-1.15.7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=390ed5d8bcb943d4f3a3b31aae248fae
diff --git a/metadata/md5-cache/dev-python/setuptools_scm-1.16.1 b/metadata/md5-cache/dev-python/setuptools_scm-1.16.1
index e172079aea20..38fc17fc12c9 100644
--- a/metadata/md5-cache/dev-python/setuptools_scm-1.16.1
+++ b/metadata/md5-cache/dev-python/setuptools_scm-1.16.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools_scm/setuptools_scm-1.16.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=93b93f8cd6bdb37c066ee75c08505534
diff --git a/metadata/md5-cache/dev-python/setuptools_scm-2.1.0 b/metadata/md5-cache/dev-python/setuptools_scm-2.1.0
index 3dfa74a3eb4c..3ed5de96e0e3 100644
--- a/metadata/md5-cache/dev-python/setuptools_scm-2.1.0
+++ b/metadata/md5-cache/dev-python/setuptools_scm-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/setuptools_scm/setuptools_scm-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d7ab74d324a1635940ef468c076b98e0
diff --git a/metadata/md5-cache/dev-python/setuptools_trial-0.6.0 b/metadata/md5-cache/dev-python/setuptools_trial-0.6.0
index 8ded616d2ad7..d2384f7572a5 100644
--- a/metadata/md5-cache/dev-python/setuptools_trial-0.6.0
+++ b/metadata/md5-cache/dev-python/setuptools_trial-0.6.0
@@ -10,5 +10,5 @@ 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
 SRC_URI=mirror://pypi/s/setuptools_trial/setuptools_trial-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=82ef5c874c5a3a2ce539ed92f644d739
diff --git a/metadata/md5-cache/dev-python/sexpdata-0.0.3-r1 b/metadata/md5-cache/dev-python/sexpdata-0.0.3-r1
index a7357811e971..0b8ef9e000a3 100644
--- a/metadata/md5-cache/dev-python/sexpdata-0.0.3-r1
+++ b/metadata/md5-cache/dev-python/sexpdata-0.0.3-r1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/tkf/sexpdata/archive/v0.0.3.tar.gz -> sexpdata-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=96f844a2458ef2c88472a1c37f7090af
diff --git a/metadata/md5-cache/dev-python/sh-1.11 b/metadata/md5-cache/dev-python/sh-1.11
index 24e82d42c452..14e8c7b6cd1f 100644
--- a/metadata/md5-cache/dev-python/sh-1.11
+++ b/metadata/md5-cache/dev-python/sh-1.11
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sh/sh-1.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=48429e01b11a59570ae6bb1f61f08e86
diff --git a/metadata/md5-cache/dev-python/sh-1.11-r1 b/metadata/md5-cache/dev-python/sh-1.11-r1
index c51777f50a79..2c4bb846ab7f 100644
--- a/metadata/md5-cache/dev-python/sh-1.11-r1
+++ b/metadata/md5-cache/dev-python/sh-1.11-r1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sh/sh-1.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b23585d4793962468d81c66f36e43571
diff --git a/metadata/md5-cache/dev-python/sh-1.12.9 b/metadata/md5-cache/dev-python/sh-1.12.9
index fc30e45b9c46..cbe431a5b901 100644
--- a/metadata/md5-cache/dev-python/sh-1.12.9
+++ b/metadata/md5-cache/dev-python/sh-1.12.9
@@ -10,5 +10,5 @@ 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
 SRC_URI=mirror://pypi/s/sh/sh-1.12.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=49bc10cb315b8ec4ffc1e183b15843c3
diff --git a/metadata/md5-cache/dev-python/shm-1.2.2-r1 b/metadata/md5-cache/dev-python/shm-1.2.2-r1
index 7c3cd5e70040..039309e0ceb8 100644
--- a/metadata/md5-cache/dev-python/shm-1.2.2-r1
+++ b/metadata/md5-cache/dev-python/shm-1.2.2-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=http://nikitathespider.com/python/shm/shm-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8172c3bfecd97b5daf631baafae0d6ea
diff --git a/metadata/md5-cache/dev-python/shortuuid-0.4.3 b/metadata/md5-cache/dev-python/shortuuid-0.4.3
index fb94dce0d364..70a86486e015 100644
--- a/metadata/md5-cache/dev-python/shortuuid-0.4.3
+++ b/metadata/md5-cache/dev-python/shortuuid-0.4.3
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/s/shortuuid/shortuuid-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bcf14f0a0ff5c49de5da01f1103de26d
diff --git a/metadata/md5-cache/dev-python/shutilwhich-1.1.0 b/metadata/md5-cache/dev-python/shutilwhich-1.1.0
index 1ab6d28c2488..34cd636502a0 100644
--- a/metadata/md5-cache/dev-python/shutilwhich-1.1.0
+++ b/metadata/md5-cache/dev-python/shutilwhich-1.1.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/s/shutilwhich/shutilwhich-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=02bcc08138b07dde617751ab39c850f9
diff --git a/metadata/md5-cache/dev-python/simplebayes-1.5.7 b/metadata/md5-cache/dev-python/simplebayes-1.5.7
index 5540f656541f..8712efc391da 100644
--- a/metadata/md5-cache/dev-python/simplebayes-1.5.7
+++ b/metadata/md5-cache/dev-python/simplebayes-1.5.7
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/hickeroar/simplebayes/archive/1.5.7.tar.gz -> simplebayes-1.5.7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5ac34bf5a379e810649be9dd5b1205c6
diff --git a/metadata/md5-cache/dev-python/simplecv-1.3 b/metadata/md5-cache/dev-python/simplecv-1.3
index fa75c295a2e6..56325872305f 100644
--- a/metadata/md5-cache/dev-python/simplecv-1.3
+++ b/metadata/md5-cache/dev-python/simplecv-1.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/opencv-2.4.8[python,python_targets_python2_7(-)?,-python_si
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/sightmachine/SimpleCV/archive/1.3.tar.gz -> simplecv-1.3.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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7dc9c487c6dff27cda9af9c7c748e6a0
diff --git a/metadata/md5-cache/dev-python/simpleeval-0.8.7 b/metadata/md5-cache/dev-python/simpleeval-0.8.7
index bd850b702e6c..17d1409913c6 100644
--- a/metadata/md5-cache/dev-python/simpleeval-0.8.7
+++ b/metadata/md5-cache/dev-python/simpleeval-0.8.7
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/s/simpleeval/simpleeval-0.8.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=a7f92a79194b77fce214bca8ca9eca78
diff --git a/metadata/md5-cache/dev-python/simpleeval-0.9.3 b/metadata/md5-cache/dev-python/simpleeval-0.9.3
index 9cdb68a7ac26..61822b465d6e 100644
--- a/metadata/md5-cache/dev-python/simpleeval-0.9.3
+++ b/metadata/md5-cache/dev-python/simpleeval-0.9.3
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/s/simpleeval/simpleeval-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2b8583a00655f96c931d1bb44e319673
diff --git a/metadata/md5-cache/dev-python/simpleeval-0.9.5 b/metadata/md5-cache/dev-python/simpleeval-0.9.5
index e55f75d890fb..e64afc566592 100644
--- a/metadata/md5-cache/dev-python/simpleeval-0.9.5
+++ b/metadata/md5-cache/dev-python/simpleeval-0.9.5
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/s/simpleeval/simpleeval-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=06baea1e7081d1e9ce259395defcf071
diff --git a/metadata/md5-cache/dev-python/simplegeneric-0.8.1-r1 b/metadata/md5-cache/dev-python/simplegeneric-0.8.1-r1
index b370d72e27f4..8b437d4c8467 100644
--- a/metadata/md5-cache/dev-python/simplegeneric-0.8.1-r1
+++ b/metadata/md5-cache/dev-python/simplegeneric-0.8.1-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/simplegeneric/simplegeneric-0.8.1.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=909d78389bdbdb4a798220314789b89a
diff --git a/metadata/md5-cache/dev-python/simplejson-3.13.2 b/metadata/md5-cache/dev-python/simplejson-3.13.2
index 131b94f520e2..b278846fe60c 100644
--- a/metadata/md5-cache/dev-python/simplejson-3.13.2
+++ b/metadata/md5-cache/dev-python/simplejson-3.13.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/simplejson/simplejson-3.13.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3bcdd106fa99c735b2039937bc8cf3cf
diff --git a/metadata/md5-cache/dev-python/simplejson-3.14.0 b/metadata/md5-cache/dev-python/simplejson-3.14.0
index d530563fe49f..0503fd26d5f8 100644
--- a/metadata/md5-cache/dev-python/simplejson-3.14.0
+++ b/metadata/md5-cache/dev-python/simplejson-3.14.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/simplejson/simplejson-3.14.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=68a87c315a38fdbf539b44eae1625691
diff --git a/metadata/md5-cache/dev-python/simplejson-3.15.0 b/metadata/md5-cache/dev-python/simplejson-3.15.0
index 4adc44c7df44..c75bc1d02d8c 100644
--- a/metadata/md5-cache/dev-python/simplejson-3.15.0
+++ b/metadata/md5-cache/dev-python/simplejson-3.15.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/simplejson/simplejson-3.15.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6950d3e3c669b322d211bf448b99295c
diff --git a/metadata/md5-cache/dev-python/simplejson-3.16.0 b/metadata/md5-cache/dev-python/simplejson-3.16.0
index 3ed6ac7b5e20..d8bdb8a84a2d 100644
--- a/metadata/md5-cache/dev-python/simplejson-3.16.0
+++ b/metadata/md5-cache/dev-python/simplejson-3.16.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/simplejson/simplejson-3.16.0.tar.gz
-_eclasses_=desktop	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6950d3e3c669b322d211bf448b99295c
diff --git a/metadata/md5-cache/dev-python/simplekv-0.11.8 b/metadata/md5-cache/dev-python/simplekv-0.11.8
index 2e91b65f620b..1d41d7d4dc61 100644
--- a/metadata/md5-cache/dev-python/simplekv-0.11.8
+++ b/metadata/md5-cache/dev-python/simplekv-0.11.8
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/simplekv/simplekv-0.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8e0a81eab63cdb117e866155351cb963
diff --git a/metadata/md5-cache/dev-python/simplekv-0.9.2 b/metadata/md5-cache/dev-python/simplekv-0.9.2
index 42f6f7077c90..1e1b4603174e 100644
--- a/metadata/md5-cache/dev-python/simplekv-0.9.2
+++ b/metadata/md5-cache/dev-python/simplekv-0.9.2
@@ -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=mirror://pypi/s/simplekv/simplekv-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4c9dddea87973492dcf43b14486df568
diff --git a/metadata/md5-cache/dev-python/simples3-1.0 b/metadata/md5-cache/dev-python/simples3-1.0
index b00d6b3c24dd..c11190842705 100644
--- a/metadata/md5-cache/dev-python/simples3-1.0
+++ b/metadata/md5-cache/dev-python/simples3-1.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/simples3/simples3-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1c244b6862420ee8db3c2ea7d72f507a
diff --git a/metadata/md5-cache/dev-python/simplesettings-0.5-r1 b/metadata/md5-cache/dev-python/simplesettings-0.5-r1
index 13acffecc8b1..a9fedc12e29e 100644
--- a/metadata/md5-cache/dev-python/simplesettings-0.5-r1
+++ b/metadata/md5-cache/dev-python/simplesettings-0.5-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=mirror://pypi/s/simplesettings/simplesettings-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2151c6c259e9691e6167fdda1a283c6a
diff --git a/metadata/md5-cache/dev-python/simplesoapy-1.5.1-r1 b/metadata/md5-cache/dev-python/simplesoapy-1.5.1-r1
index 3f260fc54882..33ab3e4b64f5 100644
--- a/metadata/md5-cache/dev-python/simplesoapy-1.5.1-r1
+++ b/metadata/md5-cache/dev-python/simplesoapy-1.5.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/xmikos/simplesoapy/archive/v1.5.1.tar.gz -> simplesoapy-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6db19dd413aaa9b8646d0f81ebdff157
diff --git a/metadata/md5-cache/dev-python/simplesoapy-9999 b/metadata/md5-cache/dev-python/simplesoapy-9999
index 243768a4dce9..e68245ce65f3 100644
--- a/metadata/md5-cache/dev-python/simplesoapy-9999
+++ b/metadata/md5-cache/dev-python/simplesoapy-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 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(-)] dev-python/numpy[python_targets_python3_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-wireless/soapysdr[python] net-wireless/soapysdr[python_targets_python3_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_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=6db19dd413aaa9b8646d0f81ebdff157
diff --git a/metadata/md5-cache/dev-python/simplespectral-1.0.0 b/metadata/md5-cache/dev-python/simplespectral-1.0.0
index 429a0ad2e4cc..f554be9aa6ae 100644
--- a/metadata/md5-cache/dev-python/simplespectral-1.0.0
+++ b/metadata/md5-cache/dev-python/simplespectral-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python3_4(-)?,python_targets_python3_5(-
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/xmikos/simplespectral/archive/v1.0.0.tar.gz -> simplespectral-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b46a5d277b6d0837d97cc2e13ebc002a
diff --git a/metadata/md5-cache/dev-python/simplespectral-9999 b/metadata/md5-cache/dev-python/simplespectral-9999
index 6dfefe13c811..6754a4aa1a5c 100644
--- a/metadata/md5-cache/dev-python/simplespectral-9999
+++ b/metadata/md5-cache/dev-python/simplespectral-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-python/numpy[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] faster? ( sci-libs/scipy[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) fastest? ( dev-python/pyFFTW[python_targets_python3_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_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=b46a5d277b6d0837d97cc2e13ebc002a
diff --git a/metadata/md5-cache/dev-python/simpy-3.0.8 b/metadata/md5-cache/dev-python/simpy-3.0.8
index 3c4081d247aa..a3f853f7b7f1 100644
--- a/metadata/md5-cache/dev-python/simpy-3.0.8
+++ b/metadata/md5-cache/dev-python/simpy-3.0.8
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] ) python_
 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/simpy/simpy-3.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8778570bc0eee4aa55c3bcf3372db0bd
diff --git a/metadata/md5-cache/dev-python/singledispatch-3.4.0.3 b/metadata/md5-cache/dev-python/singledispatch-3.4.0.3
index 9fd12ad2746d..74c46e74bd5f 100644
--- a/metadata/md5-cache/dev-python/singledispatch-3.4.0.3
+++ b/metadata/md5-cache/dev-python/singledispatch-3.4.0.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,-pyt
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/singledispatch/singledispatch-3.4.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bbaae27b1c18d80de1dedff9009f496d
diff --git a/metadata/md5-cache/dev-python/sip-4.19.13 b/metadata/md5-cache/dev-python/sip-4.19.13
new file mode 100644
index 000000000000..066bef265ecb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sip-4.19.13
@@ -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(-)]
+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.13.tar.gz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=d6c1d3368ec2c20fd4d0f0e20c6bce14
diff --git a/metadata/md5-cache/dev-python/six-1.10.0 b/metadata/md5-cache/dev-python/six-1.10.0
index aa80a5797fac..3954302efb29 100644
--- a/metadata/md5-cache/dev-python/six-1.10.0
+++ b/metadata/md5-cache/dev-python/six-1.10.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/six/six-1.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9821e76091c9df95c23f0568064f2fe7
diff --git a/metadata/md5-cache/dev-python/six-1.11.0 b/metadata/md5-cache/dev-python/six-1.11.0
index 0dab0edeac0e..0adf1f19413b 100644
--- a/metadata/md5-cache/dev-python/six-1.11.0
+++ b/metadata/md5-cache/dev-python/six-1.11.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/six/six-1.11.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f0e75bd1b09cb8996db377dc17414de5
diff --git a/metadata/md5-cache/dev-python/slackclient-1.1.0 b/metadata/md5-cache/dev-python/slackclient-1.1.0
index f05dbaa890eb..80621925dcb9 100644
--- a/metadata/md5-cache/dev-python/slackclient-1.1.0
+++ b/metadata/md5-cache/dev-python/slackclient-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/websocket-client-0.35[python_targets_python2_7(-)?,python_t
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/s/slackclient/slackclient-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=367d687b0d766ded677635651ea207dc
diff --git a/metadata/md5-cache/dev-python/sleekxmpp-1.3.1-r1 b/metadata/md5-cache/dev-python/sleekxmpp-1.3.1-r1
index e583efc9c70c..2790772b5f6f 100644
--- a/metadata/md5-cache/dev-python/sleekxmpp-1.3.1-r1
+++ b/metadata/md5-cache/dev-python/sleekxmpp-1.3.1-r1
@@ -10,5 +10,5 @@ RDEPEND=crypt? ( dev-python/python-gnupg[python_targets_pypy(-)?,python_targets_
 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/fritzy/SleekXMPP/archive/1.3.1.tar.gz -> sleekxmpp-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=47677201155e5794eff9bd9a912d06f6
diff --git a/metadata/md5-cache/dev-python/slimit-0.8.1-r1 b/metadata/md5-cache/dev-python/slimit-0.8.1-r1
index 2035d9c712dd..0d870f7b8633 100644
--- a/metadata/md5-cache/dev-python/slimit-0.8.1-r1
+++ b/metadata/md5-cache/dev-python/slimit-0.8.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/ply:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/rspivak/slimit/archive/0.8.1.tar.gz -> slimit-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d029eb58dc2b57bb8d5e0e7fa01c4bb1
diff --git a/metadata/md5-cache/dev-python/slowaes-0.1-r2 b/metadata/md5-cache/dev-python/slowaes-0.1-r2
index fd9643f2c5ab..b0d0cd5f8e62 100644
--- a/metadata/md5-cache/dev-python/slowaes-0.1-r2
+++ b/metadata/md5-cache/dev-python/slowaes-0.1-r2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/slowaes/slowaes-0.1a1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=afa3fca0390935d8774e4a79a4ec3a0c
diff --git a/metadata/md5-cache/dev-python/smmap-0.9.0 b/metadata/md5-cache/dev-python/smmap-0.9.0
index b652849aaae1..06c517a6977f 100644
--- a/metadata/md5-cache/dev-python/smmap-0.9.0
+++ b/metadata/md5-cache/dev-python/smmap-0.9.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/s/smmap/smmap-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b20d2f2a41d527f3b7bfe7910fc8cd5e
diff --git a/metadata/md5-cache/dev-python/smmap2-2.0.3 b/metadata/md5-cache/dev-python/smmap2-2.0.3
index dd01eae72183..3b2ab018c3eb 100644
--- a/metadata/md5-cache/dev-python/smmap2-2.0.3
+++ b/metadata/md5-cache/dev-python/smmap2-2.0.3
@@ -10,5 +10,5 @@ RDEPEND=!dev-python/smmap[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/smmap2/smmap2-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bcd599ecabe5d8852dadc957a861e8c2
diff --git a/metadata/md5-cache/dev-python/snakefood-1.3.1-r1 b/metadata/md5-cache/dev-python/snakefood-1.3.1-r1
index 692acef1b943..63fbe698a977 100644
--- a/metadata/md5-cache/dev-python/snakefood-1.3.1-r1
+++ b/metadata/md5-cache/dev-python/snakefood-1.3.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=http://furius.ca/downloads/snakefood/releases/snakefood-1.3.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=182581cb631584d24d28268f58dc9578
diff --git a/metadata/md5-cache/dev-python/snakeoil-0.7.4 b/metadata/md5-cache/dev-python/snakeoil-0.7.4
index ca39c4fe4951..17c2b4a4b257 100644
--- a/metadata/md5-cache/dev-python/snakeoil-0.7.4
+++ b/metadata/md5-cache/dev-python/snakeoil-0.7.4
@@ -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 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/snakeoil/snakeoil-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=380a76bb995e94cc273ce2a51566d49a
diff --git a/metadata/md5-cache/dev-python/snakeoil-0.7.5 b/metadata/md5-cache/dev-python/snakeoil-0.7.5
index fad7f6385f51..b790679af2ae 100644
--- a/metadata/md5-cache/dev-python/snakeoil-0.7.5
+++ b/metadata/md5-cache/dev-python/snakeoil-0.7.5
@@ -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 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/pkgcore/snakeoil/releases/download/v0.7.5/snakeoil-0.7.5.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9b69d6009df82d848d22cc39d08bfb24
diff --git a/metadata/md5-cache/dev-python/snakeoil-9999 b/metadata/md5-cache/dev-python/snakeoil-9999
index 90ff5f1413cd..16b11531bebc 100644
--- a/metadata/md5-cache/dev-python/snakeoil-9999
+++ b/metadata/md5-cache/dev-python/snakeoil-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=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_python3_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_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=a7f5c62da0b261445f73d3ae4e8475b4
diff --git a/metadata/md5-cache/dev-python/snappy-0.5-r2 b/metadata/md5-cache/dev-python/snappy-0.5-r2
index dcf43a095c1e..7dab7af27032 100644
--- a/metadata/md5-cache/dev-python/snappy-0.5-r2
+++ b/metadata/md5-cache/dev-python/snappy-0.5-r2
@@ -10,5 +10,5 @@ RDEPEND=>=app-arch/snappy-1.0.2 python_targets_python2_7? ( >=dev-lang/python-2.
 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/python-snappy/python-snappy-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ef40d698a65d86dac8ec66fd9f7e49d4
diff --git a/metadata/md5-cache/dev-python/snappy-0.5.1 b/metadata/md5-cache/dev-python/snappy-0.5.1
index 3014bed6fd91..7f306667bc2f 100644
--- a/metadata/md5-cache/dev-python/snappy-0.5.1
+++ b/metadata/md5-cache/dev-python/snappy-0.5.1
@@ -10,5 +10,5 @@ RDEPEND=>=app-arch/snappy-1.0.2:= python_targets_python2_7? ( >=dev-lang/python-
 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/python-snappy/python-snappy-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fd1fe5cfb0ae0383e16fb841ac89dcdc
diff --git a/metadata/md5-cache/dev-python/snowballstemmer-1.2.0 b/metadata/md5-cache/dev-python/snowballstemmer-1.2.0
index f7a71a18985f..e04ac953a48a 100644
--- a/metadata/md5-cache/dev-python/snowballstemmer-1.2.0
+++ b/metadata/md5-cache/dev-python/snowballstemmer-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/snowballstemmer/snowballstemmer-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2619b2661e7cc479734e5b217fb46194
diff --git a/metadata/md5-cache/dev-python/snowballstemmer-1.2.1 b/metadata/md5-cache/dev-python/snowballstemmer-1.2.1
index 50f88e6ed744..f4078f795877 100644
--- a/metadata/md5-cache/dev-python/snowballstemmer-1.2.1
+++ b/metadata/md5-cache/dev-python/snowballstemmer-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/snowballstemmer/snowballstemmer-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=eb8f7fa3c16980bf5954e7f446c305e7
diff --git a/metadata/md5-cache/dev-python/soappy-0.12.22 b/metadata/md5-cache/dev-python/soappy-0.12.22
index 6695fbf6de09..519f3994539c 100644
--- a/metadata/md5-cache/dev-python/soappy-0.12.22
+++ b/metadata/md5-cache/dev-python/soappy-0.12.22
@@ -10,5 +10,5 @@ RDEPEND=dev-python/wstools[python_targets_python2_7(-)?,-python_single_target_py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/S/SOAPpy/SOAPpy-0.12.22.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a2b475b23ed82879f45291ad4949521b
diff --git a/metadata/md5-cache/dev-python/socketio-client-0.6.6 b/metadata/md5-cache/dev-python/socketio-client-0.6.6
index aa374ce548c4..c10745f0e64c 100644
--- a/metadata/md5-cache/dev-python/socketio-client-0.6.6
+++ b/metadata/md5-cache/dev-python/socketio-client-0.6.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/socketIO-client/socketIO_client-0.6.6.tar.gz -> socketio-client-0.6.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1b28a92e3bf57b0c99ad16ca87800c63
diff --git a/metadata/md5-cache/dev-python/socketio-client-nexus-0.7.6 b/metadata/md5-cache/dev-python/socketio-client-nexus-0.7.6
index 3fcca617c089..3cecdf3b59ec 100644
--- a/metadata/md5-cache/dev-python/socketio-client-nexus-0.7.6
+++ b/metadata/md5-cache/dev-python/socketio-client-nexus-0.7.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/socketIO-client-nexus/socketIO-client-nexus-0.7.6.tar.gz -> socketio-client-nexus-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2ce2cdec787e060da3ee369da168757b
diff --git a/metadata/md5-cache/dev-python/socketpool-0.5.3 b/metadata/md5-cache/dev-python/socketpool-0.5.3
index 3c80c7cdb58b..e0c90a171458 100644
--- a/metadata/md5-cache/dev-python/socketpool-0.5.3
+++ b/metadata/md5-cache/dev-python/socketpool-0.5.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( dev-python/gevent[python_targets_python2_7(-
 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/socketpool/socketpool-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0015bfce204a7980b545eb50d57bacf3
diff --git a/metadata/md5-cache/dev-python/sortedcollections-0.5.3 b/metadata/md5-cache/dev-python/sortedcollections-0.5.3
index 34dc3e895b9e..67d6cf93b303 100644
--- a/metadata/md5-cache/dev-python/sortedcollections-0.5.3
+++ b/metadata/md5-cache/dev-python/sortedcollections-0.5.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/sortedcontainers[python_targets_python2_7(-)?,python_targets_
 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/sortedcollections/sortedcollections-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=01ac41d9decacf767b0bfa45ef85d731
diff --git a/metadata/md5-cache/dev-python/sortedcontainers-1.5.7 b/metadata/md5-cache/dev-python/sortedcontainers-1.5.7
index c854f22b2db5..b9fa0cacafaf 100644
--- a/metadata/md5-cache/dev-python/sortedcontainers-1.5.7
+++ b/metadata/md5-cache/dev-python/sortedcontainers-1.5.7
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sortedcontainers/sortedcontainers-1.5.7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cd6779ab7f408c69628da98d0bad038e
diff --git a/metadata/md5-cache/dev-python/soya-0.14-r1 b/metadata/md5-cache/dev-python/soya-0.14-r1
index 4ebe629a5834..61764a6c86e2 100644
--- a/metadata/md5-cache/dev-python/soya-0.14-r1
+++ b/metadata/md5-cache/dev-python/soya-0.14-r1
@@ -10,5 +10,5 @@ RDEPEND==dev-games/ode-0.11.1 dev-python/editobj >=dev-python/pyopenal-0.1.6[pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://download.gna.org/soya/Soya-0.14.tar.bz2 doc? ( http://download.gna.org/soya/SoyaTutorial-0.14.tar.bz2 ) examples? ( http://download.gna.org/soya/SoyaTutorial-0.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7501c99674076f997c3ac18dfa9dc86e
diff --git a/metadata/md5-cache/dev-python/soya-0.15_rc1-r1 b/metadata/md5-cache/dev-python/soya-0.15_rc1-r1
index 138f42fc26d4..fdd6f304cb2a 100644
--- a/metadata/md5-cache/dev-python/soya-0.15_rc1-r1
+++ b/metadata/md5-cache/dev-python/soya-0.15_rc1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-games/ode-0.14[-double-precision] dev-python/editobj dev-python/pi
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://download.gna.org/soya/Soya-0.15rc1.tar.bz2 doc? ( http://download.gna.org/soya/SoyaTutorial-0.14.tar.bz2 ) examples? ( http://download.gna.org/soya/SoyaTutorial-0.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=340cb33ff8164fe8b7504145cde78ec3
diff --git a/metadata/md5-cache/dev-python/spark-parser-1.5.1-r1 b/metadata/md5-cache/dev-python/spark-parser-1.5.1-r1
index c72059795aa1..180428f56399 100644
--- a/metadata/md5-cache/dev-python/spark-parser-1.5.1-r1
+++ b/metadata/md5-cache/dev-python/spark-parser-1.5.1-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/s/spark_parser/spark_parser-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=067f87ffc373a68398f461bf12c9fcba
diff --git a/metadata/md5-cache/dev-python/spark-parser-1.6.0 b/metadata/md5-cache/dev-python/spark-parser-1.6.0
index 9651f9442b30..633008c3ebb5 100644
--- a/metadata/md5-cache/dev-python/spark-parser-1.6.0
+++ b/metadata/md5-cache/dev-python/spark-parser-1.6.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/spark_parser/spark_parser-1.6.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=84dbe5b90c269b233572d74a7ab940e9
diff --git a/metadata/md5-cache/dev-python/spark-parser-1.6.1 b/metadata/md5-cache/dev-python/spark-parser-1.6.1
index 3885c1900d4a..30aff68ce625 100644
--- a/metadata/md5-cache/dev-python/spark-parser-1.6.1
+++ b/metadata/md5-cache/dev-python/spark-parser-1.6.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/spark_parser/spark_parser-1.6.1.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=84dbe5b90c269b233572d74a7ab940e9
diff --git a/metadata/md5-cache/dev-python/spark-parser-1.8.5 b/metadata/md5-cache/dev-python/spark-parser-1.8.5
index 7fd3411bf3f5..096f5ee088e0 100644
--- a/metadata/md5-cache/dev-python/spark-parser-1.8.5
+++ b/metadata/md5-cache/dev-python/spark-parser-1.8.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/spark_parser/spark_parser-1.8.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=da139fcf6621a88d38b2f062fd9bc41d
diff --git a/metadata/md5-cache/dev-python/sparql-wrapper-1.7.6 b/metadata/md5-cache/dev-python/sparql-wrapper-1.7.6
index 170336071033..0b235accbdf3 100644
--- a/metadata/md5-cache/dev-python/sparql-wrapper-1.7.6
+++ b/metadata/md5-cache/dev-python/sparql-wrapper-1.7.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/rdflib-2.4.2[python_targets_python2_7(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/S/SPARQLWrapper/SPARQLWrapper-1.7.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2cc5367afe10452e45dfd574839d88a1
diff --git a/metadata/md5-cache/dev-python/sparql-wrapper-1.8.0 b/metadata/md5-cache/dev-python/sparql-wrapper-1.8.0
index 577c2123008e..e6791b54729f 100644
--- a/metadata/md5-cache/dev-python/sparql-wrapper-1.8.0
+++ b/metadata/md5-cache/dev-python/sparql-wrapper-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/rdflib-2.4.2[python_targets_python2_7(-)?,python_targets_py
 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/SPARQLWrapper/SPARQLWrapper-1.8.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e578a981fcdde5c42347a32e07b444bd
diff --git a/metadata/md5-cache/dev-python/speaklater-1.3-r1 b/metadata/md5-cache/dev-python/speaklater-1.3-r1
index 9e484e329359..3ceb787cd9fb 100644
--- a/metadata/md5-cache/dev-python/speaklater-1.3-r1
+++ b/metadata/md5-cache/dev-python/speaklater-1.3-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/speaklater/speaklater-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=95f0c16959b4500043c034d3f748fd01
diff --git a/metadata/md5-cache/dev-python/spectral-cube-0.4.0 b/metadata/md5-cache/dev-python/spectral-cube-0.4.0
index 52eed1a2224a..ebfde5a1c5a0 100644
--- a/metadata/md5-cache/dev-python/spectral-cube-0.4.0
+++ b/metadata/md5-cache/dev-python/spectral-cube-0.4.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/spectral-cube/spectral-cube-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fffc98aaf8970a3210a76c22681f7a34
diff --git a/metadata/md5-cache/dev-python/specutils-0.2 b/metadata/md5-cache/dev-python/specutils-0.2
index b578cd48878d..08dac5c5fb10 100644
--- a/metadata/md5-cache/dev-python/specutils-0.2
+++ b/metadata/md5-cache/dev-python/specutils-0.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/astropy/specutils/archive/v0.2.tar.gz -> specutils-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5001f1026c7f222f47f3ecdd0e2cdef4
diff --git a/metadata/md5-cache/dev-python/specutils-0.2.2 b/metadata/md5-cache/dev-python/specutils-0.2.2
index 722ee0dab334..6cb04793b0a2 100644
--- a/metadata/md5-cache/dev-python/specutils-0.2.2
+++ b/metadata/md5-cache/dev-python/specutils-0.2.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/astropy/specutils/archive/v0.2.2.tar.gz -> specutils-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=874e66665230384a45eaa6a42f21fced
diff --git a/metadata/md5-cache/dev-python/sphinx-1.2.2-r1 b/metadata/md5-cache/dev-python/sphinx-1.2.2-r1
index 30a42278cc33..0cd6a073fc2c 100644
--- a/metadata/md5-cache/dev-python/sphinx-1.2.2-r1
+++ b/metadata/md5-cache/dev-python/sphinx-1.2.2-r1
@@ -10,5 +10,5 @@ RDEPEND=<dev-python/docutils-0.13[python_targets_pypy(-)?,python_targets_python2
 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.2.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=0c3dbeace0a5214a0421803fd365883c
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 84195bc5c4ef..262ab0df8dfe 100644
--- a/metadata/md5-cache/dev-python/sphinx-1.2.3-r1
+++ b/metadata/md5-cache/dev-python/sphinx-1.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=<dev-python/docutils-0.13[python_targets_pypy(-)?,python_targets_pypy3(-
 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.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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-python/sphinx-1.3.1-r2 b/metadata/md5-cache/dev-python/sphinx-1.3.1-r2
index 4e505e330093..a5bcbf4d3af2 100644
--- a/metadata/md5-cache/dev-python/sphinx-1.3.1-r2
+++ b/metadata/md5-cache/dev-python/sphinx-1.3.1-r2
@@ -10,5 +10,5 @@ RDEPEND==dev-python/alabaster-0.7*[python_targets_pypy(-)?,python_targets_python
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
index fdb721e7c0c6..b136a00592fd 100644
--- a/metadata/md5-cache/dev-python/sphinx-1.3.5-r1
+++ b/metadata/md5-cache/dev-python/sphinx-1.3.5-r1
@@ -10,5 +10,5 @@ RDEPEND==dev-python/alabaster-0.7*[python_targets_pypy(-)?,python_targets_pypy3(
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
index 54a6c3c1f92c..7695ebd1bdbb 100644
--- a/metadata/md5-cache/dev-python/sphinx-1.6.3-r4
+++ b/metadata/md5-cache/dev-python/sphinx-1.6.3-r4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/alabaster-0.7.9[python_targets_pypy(-)?,python_targets_pypy
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
index d3b171c86b43..9b7a98911290 100644
--- a/metadata/md5-cache/dev-python/sphinx-1.6.5-r1
+++ b/metadata/md5-cache/dev-python/sphinx-1.6.5-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/alabaster-0.7.9[python_targets_pypy(-)?,python_targets_pypy
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
index 42c34d2a28ff..133b83aed250 100644
--- a/metadata/md5-cache/dev-python/sphinx-1.6.7-r1
+++ b/metadata/md5-cache/dev-python/sphinx-1.6.7-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/alabaster-0.7.9[python_targets_pypy(-)?,python_targets_pypy
 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	89bb9f083a2590d9b447fd0b78a96186
+_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-1.7.5-r1 b/metadata/md5-cache/dev-python/sphinx-1.7.5-r1
index 3369f40f21c9..ee615860fe71 100644
--- a/metadata/md5-cache/dev-python/sphinx-1.7.5-r1
+++ b/metadata/md5-cache/dev-python/sphinx-1.7.5-r1
@@ -1,14 +1,15 @@
 DEFINED_PHASES=compile configure install 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_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/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_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/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_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/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_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/imagesize[python_targets_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/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_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/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_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/requests-2.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/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/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_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-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_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-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/packaging[python_targets_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/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_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-typing[python_targets_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(-)] 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_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/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/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_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/html5lib[python_targets_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/simplejson[python_targets_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/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(-)] 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_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=>=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_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/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_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/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_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/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_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/imagesize[python_targets_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/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_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/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_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/requests-2.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/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/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_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-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_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-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/packaging[python_targets_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/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_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-typing[python_targets_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(-)] 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_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/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/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_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/html5lib[python_targets_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/simplejson[python_targets_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/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(-)] 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_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-texlive/texlive-latexextra dev-texlive/texlive-luatex 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(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=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 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x86-fbsd ~x86-macos ~x86-linux ~x64-macos ~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 ~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_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/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_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/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_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/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_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/imagesize[python_targets_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/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_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/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_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/requests-2.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/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/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_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-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_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-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/packaging[python_targets_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/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_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-typing[python_targets_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(-)] 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_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(-)] ) 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 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/Sphinx/Sphinx-1.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=6e43263b390f46c90a95224e15b65d0f
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c7a7fa11bd99f363dfe9cba862448882
diff --git a/metadata/md5-cache/dev-python/sphinx-aiohttp-theme-0.1.4 b/metadata/md5-cache/dev-python/sphinx-aiohttp-theme-0.1.4
index eb075bf66a15..1d4fa765359e 100644
--- a/metadata/md5-cache/dev-python/sphinx-aiohttp-theme-0.1.4
+++ b/metadata/md5-cache/dev-python/sphinx-aiohttp-theme-0.1.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/sphinx[python_targets_python3_5(-)?,python_targets_python3_6(
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiohttp-theme/aiohttp-theme-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9bf87d980a818373be8ae8def52e852d
diff --git a/metadata/md5-cache/dev-python/sphinx-better-theme-0.1.5 b/metadata/md5-cache/dev-python/sphinx-better-theme-0.1.5
index e86a42e1a938..770225b66111 100644
--- a/metadata/md5-cache/dev-python/sphinx-better-theme-0.1.5
+++ b/metadata/md5-cache/dev-python/sphinx-better-theme-0.1.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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-better-theme/sphinx-better-theme-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e7b723e0f04c44d65e7a3ae3071918d1
diff --git a/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.4.9 b/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.4.9
index a2d03f9a2f0d..13c805d9b84f 100644
--- a/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.4.9
+++ b/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.4.9
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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-bootstrap-theme/sphinx-bootstrap-theme-0.4.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=01ddb38276b4959997d750c214b6bbbb
diff --git a/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.6.0 b/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.6.0
index 7f664a0ddece..2e85b2210443 100644
--- a/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.6.0
+++ b/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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-bootstrap-theme/sphinx-bootstrap-theme-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=75b9677770f2092b125c808a31e05120
diff --git a/metadata/md5-cache/dev-python/sphinx-gallery-0.1.12 b/metadata/md5-cache/dev-python/sphinx-gallery-0.1.12
index 7f2fd17eef0a..fb1e55151e89 100644
--- a/metadata/md5-cache/dev-python/sphinx-gallery-0.1.12
+++ b/metadata/md5-cache/dev-python/sphinx-gallery-0.1.12
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx-gallery/sphinx-gallery-0.1.12.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d36b3c21a886a0a9c4aed250ec248b21
diff --git a/metadata/md5-cache/dev-python/sphinx-jinja-0.2.1 b/metadata/md5-cache/dev-python/sphinx-jinja-0.2.1
index c345540faf5f..b6e86786cae5 100644
--- a/metadata/md5-cache/dev-python/sphinx-jinja-0.2.1
+++ b/metadata/md5-cache/dev-python/sphinx-jinja-0.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pbr[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx-jinja/sphinx-jinja-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8886e9d99217a82d9a4fda8629dcbdd6
diff --git a/metadata/md5-cache/dev-python/sphinx-jinja-0.3.0 b/metadata/md5-cache/dev-python/sphinx-jinja-0.3.0
index 891c5dd252f7..01bd8b6a3ba7 100644
--- a/metadata/md5-cache/dev-python/sphinx-jinja-0.3.0
+++ b/metadata/md5-cache/dev-python/sphinx-jinja-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pbr[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx-jinja/sphinx-jinja-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=25c68c815832674547579f7ed2aecbaf
diff --git a/metadata/md5-cache/dev-python/sphinx-py3doc-enhanced-theme-2.3.2 b/metadata/md5-cache/dev-python/sphinx-py3doc-enhanced-theme-2.3.2
index 9a70f3b156fc..b06d57c92487 100644
--- a/metadata/md5-cache/dev-python/sphinx-py3doc-enhanced-theme-2.3.2
+++ b/metadata/md5-cache/dev-python/sphinx-py3doc-enhanced-theme-2.3.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bfdf331e09d8a7a2d1bc24ace590a2a2
diff --git a/metadata/md5-cache/dev-python/sphinx-testing-0.7.2 b/metadata/md5-cache/dev-python/sphinx-testing-0.7.2
index e94af4c267df..d07545820eb6 100644
--- a/metadata/md5-cache/dev-python/sphinx-testing-0.7.2
+++ b/metadata/md5-cache/dev-python/sphinx-testing-0.7.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx-testing/sphinx-testing-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e79c3d4934ee6644a3e535442fef3dbc
diff --git a/metadata/md5-cache/dev-python/sphinx_celery-1.3.1 b/metadata/md5-cache/dev-python/sphinx_celery-1.3.1
index 381545b1c627..44178275353d 100644
--- a/metadata/md5-cache/dev-python/sphinx_celery-1.3.1
+++ b/metadata/md5-cache/dev-python/sphinx_celery-1.3.1
@@ -10,5 +10,5 @@ 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
 SRC_URI=mirror://pypi/s/sphinx_celery/sphinx_celery-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=12506188a3f9e75fb7bc07b7f07a78ce
diff --git a/metadata/md5-cache/dev-python/sphinx_rtd_theme-0.1.9 b/metadata/md5-cache/dev-python/sphinx_rtd_theme-0.1.9
index 7a95556c5de5..2ddd81c266aa 100644
--- a/metadata/md5-cache/dev-python/sphinx_rtd_theme-0.1.9
+++ b/metadata/md5-cache/dev-python/sphinx_rtd_theme-0.1.9
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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_rtd_theme/sphinx_rtd_theme-0.1.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=60cedef5568052f6d7c2c391f5c31136
diff --git a/metadata/md5-cache/dev-python/sphinx_rtd_theme-0.2.4 b/metadata/md5-cache/dev-python/sphinx_rtd_theme-0.2.4
index 0414a5edfbce..52b85a4d827b 100644
--- a/metadata/md5-cache/dev-python/sphinx_rtd_theme-0.2.4
+++ b/metadata/md5-cache/dev-python/sphinx_rtd_theme-0.2.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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_rtd_theme/sphinx_rtd_theme-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=272418c3ad20d9a4ee46ca75a04c2d6a
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-asyncio-0.2.0-r2 b/metadata/md5-cache/dev-python/sphinxcontrib-asyncio-0.2.0-r2
index 5daeb2312e55..08857d8553ab 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-asyncio-0.2.0-r2
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-asyncio-0.2.0-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3ad503a69dbb787a279d93acaf6f8e69
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-blockdiag-1.5.5 b/metadata/md5-cache/dev-python/sphinxcontrib-blockdiag-1.5.5
index e25ad1d7ad4e..a139ac5b528b 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-blockdiag-1.5.5
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-blockdiag-1.5.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/blockdiag/sphinxcontrib-blockdiag/archive/1.5.5.tar.gz -> sphinxcontrib-blockdiag-1.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e58f30c8d5790ec8e3ffa312a2416fae
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-blockdiag-1.5.5-r1 b/metadata/md5-cache/dev-python/sphinxcontrib-blockdiag-1.5.5-r1
index f1706daa8d37..10974370eb4f 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-blockdiag-1.5.5-r1
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-blockdiag-1.5.5-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/blockdiag/sphinxcontrib-blockdiag/archive/1.5.5.tar.gz -> sphinxcontrib-blockdiag-1.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=20ce1f184ac4f7d3947be87c65f4f611
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-cheeseshop-0.2-r2 b/metadata/md5-cache/dev-python/sphinxcontrib-cheeseshop-0.2-r2
index 8ab43ee85f32..8a48430b6ab4 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-cheeseshop-0.2-r2
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-cheeseshop-0.2-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/sphinx-1.0[python_targets_pypy(-)?,python_targets_python2_7
 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/sphinxcontrib-cheeseshop/sphinxcontrib-cheeseshop-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=96ca1ee7b090e0588317e10a5c99a4cd
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-ditaa-0.2 b/metadata/md5-cache/dev-python/sphinxcontrib-ditaa-0.2
index e75bdd51c287..a7300191a142 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-ditaa-0.2
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-ditaa-0.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-ditaa/sphinxcontrib-ditaa-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9a019aa6886fbc279f166dee4b6bcf3a
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-documentedlist-0.6 b/metadata/md5-cache/dev-python/sphinxcontrib-documentedlist-0.6
index 61e47fcb9251..4c407646ba06 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-documentedlist-0.6
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-documentedlist-0.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/namespace-sphinxcontrib[python_targets_python2_7(-)?,python_t
 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/sphinxcontrib-documentedlist/sphinxcontrib-documentedlist-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7fb4a076d1d50ff715d3cadfa762dc65
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.3-r1 b/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.3-r1
index 80b796cf5d8e..726bb98b3dc2 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.3-r1
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/sphinx-1.0[python_targets_python2_7(-)?,python_targets_pyth
 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/sphinxcontrib-doxylink/sphinxcontrib-doxylink-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b4aea695886d345c2b08f816ae157d8b
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.5 b/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.5
index 40df7d1c1676..eebdff75cf61 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.5
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/sphinx-1.0[python_targets_python3_4(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-doxylink/sphinxcontrib-doxylink-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=50a25d21621f8d9e3e6bae4452f6125d
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.0 b/metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.0
index fa2eb2c51ad4..e0aca8fdbaba 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.0
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/jupyter/sphinxcontrib_github_alt/archive/1.0.tar.gz -> sphinxcontrib-github-alt-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=650279f6285e47083855b5fac9452b06
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-googleanalytics-0.1-r1 b/metadata/md5-cache/dev-python/sphinxcontrib-googleanalytics-0.1-r1
index 596e51638d7c..7f97609ae5c2 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-googleanalytics-0.1-r1
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-googleanalytics-0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/sphinx-0.6[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-googleanalytics/sphinxcontrib-googleanalytics-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=da4e0fbfcaa6b4adee9a1f2de64e3b36
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-googleanalytics-0.1-r2 b/metadata/md5-cache/dev-python/sphinxcontrib-googleanalytics-0.1-r2
index 1d0cb575e5e3..2a2929d876a8 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-googleanalytics-0.1-r2
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-googleanalytics-0.1-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-googleanalytics/sphinxcontrib-googleanalytics-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cc8de1035150e76d98a64f8944962ac5
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.4.0 b/metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.4.0
index e205b62a7023..c982b4ee0df8 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.4.0
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/sphinx-1.0[python_targets_pypy(-)?,python_targets_python2_7
 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/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b1012d76573e50e579c30425e1a59519
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.5.0 b/metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.5.0
index 3ba06e685c16..d80c0258c92c 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.5.0
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.5.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,p
 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/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c09af2868ddcd2c02ec5c6202fac59e1
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r1 b/metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r1
index eba5c6351561..b2c35f0a1e46 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r1
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/requests-0.13[python_targets_pypy(-)?,python_targets_python
 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/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=236cfb2d4614b880ed75e3a8a6ce3247
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r2 b/metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r2
index 6e5f5aac0ad7..b6be7b358ba0 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r2
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/namespace-sphinxcontrib[python_targets_pypy(-)?,python_target
 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/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=aeaa6041764c401e8c76c00f2c9adc44
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-napoleon-0.5.2 b/metadata/md5-cache/dev-python/sphinxcontrib-napoleon-0.5.2
index e25c26f83320..fec8168ddeb1 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-napoleon-0.5.2
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-napoleon-0.5.2
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-napoleon/sphinxcontrib-napoleon-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a587c46af124d93d9bb950e33a0f8886
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-napoleon-0.6.1 b/metadata/md5-cache/dev-python/sphinxcontrib-napoleon-0.6.1
index 95420a51ea2f..f69fa367ba0d 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-napoleon-0.6.1
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-napoleon-0.6.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/sphinx-1.2[python_targets_python2_7(-)?,python_targets_pyth
 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/sphinxcontrib-napoleon/sphinxcontrib-napoleon-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8b3c30112b8d0e8910a569457b5b44b4
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-newsfeed-0.1.4 b/metadata/md5-cache/dev-python/sphinxcontrib-newsfeed-0.1.4
index 29ce8b26b7ac..750582d4c243 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-newsfeed-0.1.4
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-newsfeed-0.1.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=77bc189e876fab11a98abc66aac63301
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.11 b/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.11
index eb7df6490774..e95e869a8a37 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.11
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.11
@@ -10,5 +10,5 @@ RDEPEND=dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,p
 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/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4f8329b93738f906619bb3d4e94287c6
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.8 b/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.8
index 4e1ca1dc8b07..fc69f260c7d0 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.8
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.8
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/sphinx-1.1[python_targets_pypy(-)?,python_targets_python2_7
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2671dae95e36c245708a2aeac76fe00c
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-spelling-2.1.2 b/metadata/md5-cache/dev-python/sphinxcontrib-spelling-2.1.2
index 33d8a68dcc96..e05217c58d7a 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-spelling-2.1.2
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-spelling-2.1.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pbr[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-spelling/sphinxcontrib-spelling-2.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c7cb036552ef84868706adfc45051614
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-spelling-2.3.0 b/metadata/md5-cache/dev-python/sphinxcontrib-spelling-2.3.0
index dee7e5185e10..86aa44849e0e 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-spelling-2.3.0
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-spelling-2.3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pbr[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-spelling/sphinxcontrib-spelling-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=81ffda1ecc6cc31fc69bab3ebc514d27
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.0.1-r1 b/metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.0.1-r1
index 391659dbc40c..fcb51289535b 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.0.1-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/sqlalchemy-0.9[python_targets_pypy(-)?,python_targets_pypy3
 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/sphinxcontrib-websupport/sphinxcontrib-websupport-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5a4c27849d6f7d04c2ea10f9c3ec8b46
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 cb04878d2980..89a16fa2e320 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.1.0
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.1.0
@@ -4,12 +4,12 @@ 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(-)]
 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/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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=ac9ee5d2708b3aa279b4e269b133c10c
+_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
diff --git a/metadata/md5-cache/dev-python/sphinxtogithub-1.1.0 b/metadata/md5-cache/dev-python/sphinxtogithub-1.1.0
index 49ed8dc39502..2f98aeea5450 100644
--- a/metadata/md5-cache/dev-python/sphinxtogithub-1.1.0
+++ b/metadata/md5-cache/dev-python/sphinxtogithub-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/sphinx-1.1[python_targets_pypy(-)?,python_targets_python2_7
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxtogithub/sphinxtogithub-1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=88ccd4fdcb6ced426def98bee6685941
diff --git a/metadata/md5-cache/dev-python/spyder-3.2.4 b/metadata/md5-cache/dev-python/spyder-3.2.4
index c724e874c7ee..68a97121a3f1 100644
--- a/metadata/md5-cache/dev-python/spyder-3.2.4
+++ b/metadata/md5-cache/dev-python/spyder-3.2.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/spyder/spyder-3.2.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5cb9449bdc1b01d5c221b3833543b969
diff --git a/metadata/md5-cache/dev-python/spyder-3.2.8 b/metadata/md5-cache/dev-python/spyder-3.2.8
index 8eb692d5cbae..7a559572bec8 100644
--- a/metadata/md5-cache/dev-python/spyder-3.2.8
+++ b/metadata/md5-cache/dev-python/spyder-3.2.8
@@ -10,5 +10,5 @@ RDEPEND=hdf5? ( dev-python/h5py[python_targets_python2_7(-)?,python_targets_pyth
 REQUIRED_USE=webengine? ( !webkit ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/spyder/spyder-3.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9298f851b8d03840e18612b34602646c
diff --git a/metadata/md5-cache/dev-python/spyder-3.3.0 b/metadata/md5-cache/dev-python/spyder-3.3.0
index a66a18d32c4d..3a1218e7565e 100644
--- a/metadata/md5-cache/dev-python/spyder-3.3.0
+++ b/metadata/md5-cache/dev-python/spyder-3.3.0
@@ -10,5 +10,5 @@ RDEPEND=hdf5? ( dev-python/h5py[python_targets_python2_7(-)?,python_targets_pyth
 REQUIRED_USE=webengine? ( !webkit ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/spyder/spyder-3.3.0.tar.gz
-_eclasses_=desktop	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=aed29306f99d1ac567315fe7254414e3
diff --git a/metadata/md5-cache/dev-python/spyder-3.3.1 b/metadata/md5-cache/dev-python/spyder-3.3.1
index ea35b39f8ff0..e37c85084fe5 100644
--- a/metadata/md5-cache/dev-python/spyder-3.3.1
+++ b/metadata/md5-cache/dev-python/spyder-3.3.1
@@ -10,5 +10,5 @@ RDEPEND=hdf5? ( dev-python/h5py[python_targets_python2_7(-)?,python_targets_pyth
 REQUIRED_USE=webengine? ( !webkit ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/spyder/spyder-3.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=aed29306f99d1ac567315fe7254414e3
diff --git a/metadata/md5-cache/dev-python/spyder-4.0.0_beta1 b/metadata/md5-cache/dev-python/spyder-4.0.0_beta1
index b4c3dc20c307..f7d4e4f79442 100644
--- a/metadata/md5-cache/dev-python/spyder-4.0.0_beta1
+++ b/metadata/md5-cache/dev-python/spyder-4.0.0_beta1
@@ -10,5 +10,5 @@ RDEPEND=hdf5? ( dev-python/h5py[python_targets_python2_7(-)?,python_targets_pyth
 REQUIRED_USE=webengine? ( !webkit ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/spyder/spyder-4.0.0b1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c47b2651e3437051e91f4faeff57b060
diff --git a/metadata/md5-cache/dev-python/spyder-kernels-0.2.4 b/metadata/md5-cache/dev-python/spyder-kernels-0.2.4
index fa1ce67fd088..e5c104bc7fc0 100644
--- a/metadata/md5-cache/dev-python/spyder-kernels-0.2.4
+++ b/metadata/md5-cache/dev-python/spyder-kernels-0.2.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/spyder-kernels/spyder-kernels-0.2.4.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=35bd46725c4ea33dc96abb4b2357af9d
diff --git a/metadata/md5-cache/dev-python/spyder-kernels-1.0.1 b/metadata/md5-cache/dev-python/spyder-kernels-1.0.1
index fe9b79024dde..bcc6131050cf 100644
--- a/metadata/md5-cache/dev-python/spyder-kernels-1.0.1
+++ b/metadata/md5-cache/dev-python/spyder-kernels-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/spyder-kernels/spyder-kernels-1.0.1.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=35bd46725c4ea33dc96abb4b2357af9d
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-0.7.10 b/metadata/md5-cache/dev-python/sqlalchemy-0.7.10
index 02fe5f093229..f255e65c1adf 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-0.7.10
+++ b/metadata/md5-cache/dev-python/sqlalchemy-0.7.10
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-0.7.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d99d23d7b5b6e1f356651101d917efde
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-0.9.8 b/metadata/md5-cache/dev-python/sqlalchemy-0.9.8
index 5c043566892f..b70d3e7a2b4d 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-0.9.8
+++ b/metadata/md5-cache/dev-python/sqlalchemy-0.9.8
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-
 REQUIRED_USE=test? ( sqlite ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-0.9.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2e6dd102661b53ff0badee65280b6daa
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.0.17 b/metadata/md5-cache/dev-python/sqlalchemy-1.0.17
index f526ce8f2285..cbeda7df19f5 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.0.17
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.0.17
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-
 REQUIRED_USE=test? ( sqlite ) || ( 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/SQLAlchemy/SQLAlchemy-1.0.17.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=796ec217c3a09555be1275bd07c255fa
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.0.19 b/metadata/md5-cache/dev-python/sqlalchemy-1.0.19
index 898afc7828a2..96cd7b7178ff 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.0.19
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.0.19
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-
 REQUIRED_USE=test? ( sqlite ) || ( 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/SQLAlchemy/SQLAlchemy-1.0.19.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6d92b3b71de377b1239e647b52afb93c
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.1.12 b/metadata/md5-cache/dev-python/sqlalchemy-1.1.12
index a470e6e7281d..ef7dfd07a4d5 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.1.12
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.1.12
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-
 REQUIRED_USE=test? ( sqlite ) || ( 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/SQLAlchemy/SQLAlchemy-1.1.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8487aed4e6c07eb17b0dd66e1b210280
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.1.17 b/metadata/md5-cache/dev-python/sqlalchemy-1.1.17
index 994e37284ed8..36d2fd7e7c9b 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.1.17
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.1.17
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-
 REQUIRED_USE=test? ( sqlite ) || ( 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/SQLAlchemy/SQLAlchemy-1.1.17.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6d1d199c01ea9a46c909225c5a074bdc
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.1.18 b/metadata/md5-cache/dev-python/sqlalchemy-1.1.18
index 3689de330846..4cc9bf6fd0a5 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.1.18
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.1.18
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-
 REQUIRED_USE=test? ( sqlite ) || ( 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/SQLAlchemy/SQLAlchemy-1.1.18.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6d1d199c01ea9a46c909225c5a074bdc
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.2.0 b/metadata/md5-cache/dev-python/sqlalchemy-1.2.0
index 627fc50b3420..6c29923e9bb4 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.2.0
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,p
 REQUIRED_USE=test? ( sqlite ) || ( 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/SQLAlchemy/SQLAlchemy-1.2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=582dd29ba3a8575497a4e25cdec9fb05
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.2.2 b/metadata/md5-cache/dev-python/sqlalchemy-1.2.2
index 4a49b9ecf0ad..acbbfb5314e7 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.2.2
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.2.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,p
 REQUIRED_USE=test? ( sqlite ) || ( 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/SQLAlchemy/SQLAlchemy-1.2.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b5c595fac6b31f02b9bb252dabff4143
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.2.4 b/metadata/md5-cache/dev-python/sqlalchemy-1.2.4
index abad66a0c21b..1a48784b96fb 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.2.4
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.2.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,p
 REQUIRED_USE=test? ( sqlite ) || ( 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/SQLAlchemy/SQLAlchemy-1.2.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fb405d0dce0fc256ba929601476577ca
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.2.7 b/metadata/md5-cache/dev-python/sqlalchemy-1.2.7
index 7c7edb198811..a9adff1b334e 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.2.7
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.2.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,p
 REQUIRED_USE=test? ( sqlite ) || ( 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/SQLAlchemy/SQLAlchemy-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fb405d0dce0fc256ba929601476577ca
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.2.9 b/metadata/md5-cache/dev-python/sqlalchemy-1.2.9
index 3fb5ed104de0..0b8ab41f59b7 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.2.9
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.2.9
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,p
 REQUIRED_USE=test? ( sqlite ) || ( python_targets_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/SQLAlchemy/SQLAlchemy-1.2.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5531b447e6f72787dd98ba0ffd5c5c97
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.11.0 b/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.11.0
index d8c1c2ce1171..354a4fd65bf7 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.11.0
+++ b/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.11.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/sqlalchemy-0.7.8[python_targets_python2_7(-)?,python_target
 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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a924f9d2dae93c7ab8aeb71bd71fc547
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.7.2-r1 b/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.7.2-r1
index 6860b4d4c4df..fe00fe6c1a66 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.7.2-r1
+++ b/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.7.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/decorator[python_targets_python2_7(-)?,-python_single_target_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sqlalchemy-migrate/sqlalchemy-migrate-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cb55999af6351fcab0be3e15fb4e588b
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.9.2 b/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.9.2
index 49cfb9e8f78a..55d5a74be8e2 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.9.2
+++ b/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.9.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sqlalchemy-migrate/sqlalchemy-migrate-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4004c29e19710dc444a14d74afa48d47
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-rqlite-1.0 b/metadata/md5-cache/dev-python/sqlalchemy-rqlite-1.0
index 6047cb61ffd8..a22f64c81550 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-rqlite-1.0
+++ b/metadata/md5-cache/dev-python/sqlalchemy-rqlite-1.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/rqlite/sqlalchemy-rqlite/archive/v1.0.tar.gz -> sqlalchemy-rqlite-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4b66b3afc6781aff0bc9dcdd43e6c96e
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-rqlite-9999 b/metadata/md5-cache/dev-python/sqlalchemy-rqlite-9999
index 2b6f4b1d1606..bb1846b3769f 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-rqlite-9999
+++ b/metadata/md5-cache/dev-python/sqlalchemy-rqlite-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=eb0c22d5833e08aeed22f531153cfc94
diff --git a/metadata/md5-cache/dev-python/sqlite3dbm-0.1.4-r1 b/metadata/md5-cache/dev-python/sqlite3dbm-0.1.4-r1
index ad91ee7696a6..298a09f5d0b0 100644
--- a/metadata/md5-cache/dev-python/sqlite3dbm-0.1.4-r1
+++ b/metadata/md5-cache/dev-python/sqlite3dbm-0.1.4-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=d
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/Yelp/sqlite3dbm/archive/v0.1.4.tar.gz -> sqlite3dbm-0.1.4-git.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=159ac4040b71935d87bcde079751bd20
diff --git a/metadata/md5-cache/dev-python/sqlitecachec-1.1.4-r1 b/metadata/md5-cache/dev-python/sqlitecachec-1.1.4-r1
index 20ee20bb054a..a9cacc35e6a5 100644
--- a/metadata/md5-cache/dev-python/sqlitecachec-1.1.4-r1
+++ b/metadata/md5-cache/dev-python/sqlitecachec-1.1.4-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 dev-libs/libxml2 python_targets_pypy? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://yum.baseurl.org/download/yum-metadata-parser/yum-metadata-parser-1.1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=487161b250501297884e8a5af8d759a1
diff --git a/metadata/md5-cache/dev-python/sqlobject-3.4.0 b/metadata/md5-cache/dev-python/sqlobject-3.4.0
index 50f75b71e83a..28a0f729b5eb 100644
--- a/metadata/md5-cache/dev-python/sqlobject-3.4.0
+++ b/metadata/md5-cache/dev-python/sqlobject-3.4.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/formencode-1.1.1[python_targets_python2_7(-)?,-python_singl
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLObject/SQLObject-3.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c660745b6d2175897f90e92643f25e0a
diff --git a/metadata/md5-cache/dev-python/squaremap-1.0.4 b/metadata/md5-cache/dev-python/squaremap-1.0.4
index 4334e885d548..9ea8d17c1100 100644
--- a/metadata/md5-cache/dev-python/squaremap-1.0.4
+++ b/metadata/md5-cache/dev-python/squaremap-1.0.4
@@ -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=mirror://pypi/S/SquareMap/SquareMap-1.0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cf3997cb0d3d848aaafe8bef7525ec52
diff --git a/metadata/md5-cache/dev-python/sshtunnel-0.1.4 b/metadata/md5-cache/dev-python/sshtunnel-0.1.4
new file mode 100644
index 000000000000..ce24efdfb155
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sshtunnel-0.1.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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/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(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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=Pure python SSH tunnels
+EAPI=6
+HOMEPAGE=https://pypi.python.org/pypi/sshtunnel
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86 ~arm
+LICENSE=MIT
+RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/sshtunnel/sshtunnel-0.1.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_=40457ef5d112adc65d0546126b11c30c
diff --git a/metadata/md5-cache/dev-python/ssl-fetch-0.2 b/metadata/md5-cache/dev-python/ssl-fetch-0.2
index f713379aac4d..4cb09791a16d 100644
--- a/metadata/md5-cache/dev-python/ssl-fetch-0.2
+++ b/metadata/md5-cache/dev-python/ssl-fetch-0.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/requests-1.2.1[python_targets_pypy(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dolsen/releases/ssl-fetch/ssl-fetch-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f294775a31c46de350c95ff14ea7d521
diff --git a/metadata/md5-cache/dev-python/ssl-fetch-0.2.1 b/metadata/md5-cache/dev-python/ssl-fetch-0.2.1
index b3c916447ec7..113a5f2c6f5a 100644
--- a/metadata/md5-cache/dev-python/ssl-fetch-0.2.1
+++ b/metadata/md5-cache/dev-python/ssl-fetch-0.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/requests-1.2.1[python_targets_pypy(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://github.com/dol-sen/ssl-fetch/archive/0.2.1.tar.gz -> ssl-fetch-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b1d9524621ed36a134df2703473d30df
diff --git a/metadata/md5-cache/dev-python/ssl-fetch-0.3 b/metadata/md5-cache/dev-python/ssl-fetch-0.3
index 136b300472a3..6f70b72af037 100644
--- a/metadata/md5-cache/dev-python/ssl-fetch-0.3
+++ b/metadata/md5-cache/dev-python/ssl-fetch-0.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/requests-1.2.1[python_targets_pypy(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dolsen/releases/ssl-fetch/ssl-fetch-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=de5971b01c4892cc4220716739f8bae7
diff --git a/metadata/md5-cache/dev-python/ssl-fetch-0.4 b/metadata/md5-cache/dev-python/ssl-fetch-0.4
index 88d94d6ce9fb..d1039b6e290d 100644
--- a/metadata/md5-cache/dev-python/ssl-fetch-0.4
+++ b/metadata/md5-cache/dev-python/ssl-fetch-0.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/requests-1.2.1[python_targets_pypy(-)?,python_targets_pytho
 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://dev.gentoo.org/~dolsen/releases/ssl-fetch/ssl-fetch-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ff44629b6f79b3521bb6f176e113f9cf
diff --git a/metadata/md5-cache/dev-python/ssl-fetch-9999 b/metadata/md5-cache/dev-python/ssl-fetch-9999
index 5cd8b0a04e15..a8c6a3b2b530 100644
--- a/metadata/md5-cache/dev-python/ssl-fetch-9999
+++ b/metadata/md5-cache/dev-python/ssl-fetch-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-python/requests-1.2.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(-)] python_targets_python2_7? ( dev-python/ndg-httpsclient[python_targets_python2_7] dev-python/pyasn1[python_targets_python2_7] >=dev-python/pyopenssl-0.13[python_targets_python2_7] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=12cde70bd7f503b4b630d84b52dcd898
diff --git a/metadata/md5-cache/dev-python/stapler-0.4_p20160424 b/metadata/md5-cache/dev-python/stapler-0.4_p20160424
index b77758080b5a..b7b4aca9b644 100644
--- a/metadata/md5-cache/dev-python/stapler-0.4_p20160424
+++ b/metadata/md5-cache/dev-python/stapler-0.4_p20160424
@@ -10,5 +10,5 @@ RDEPEND=dev-python/PyPDF2[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/hellerbarde/stapler/archive/7c153e6a8f52573ff886ebf0786b64e17699443a.tar.gz -> stapler-0.4_p20160424.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9e0e9412ba638650092471fc7e87dc4a
diff --git a/metadata/md5-cache/dev-python/statistics-1.0.3.5 b/metadata/md5-cache/dev-python/statistics-1.0.3.5
index 04d6c7e6d57d..97e396bb4db2 100644
--- a/metadata/md5-cache/dev-python/statistics-1.0.3.5
+++ b/metadata/md5-cache/dev-python/statistics-1.0.3.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/statistics/statistics-1.0.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=88ee8815b6b9e55f2a5d7e0ec42ad3b0
diff --git a/metadata/md5-cache/dev-python/statistics-3.4.0_beta3 b/metadata/md5-cache/dev-python/statistics-3.4.0_beta3
index f6497ca2e6ba..503bff655128 100644
--- a/metadata/md5-cache/dev-python/statistics-3.4.0_beta3
+++ b/metadata/md5-cache/dev-python/statistics-3.4.0_beta3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/statistics/statistics-3.4.0b3.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=71b965dd952ed6d7d002aba48f6dfacc
diff --git a/metadata/md5-cache/dev-python/statsd-3.2.1 b/metadata/md5-cache/dev-python/statsd-3.2.1
index 8dd9cf381f16..47554437a432 100644
--- a/metadata/md5-cache/dev-python/statsd-3.2.1
+++ b/metadata/md5-cache/dev-python/statsd-3.2.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0f782cd33f171dd40b5ac31a3cec2c8b
diff --git a/metadata/md5-cache/dev-python/statsmodels-0.6.1 b/metadata/md5-cache/dev-python/statsmodels-0.6.1
index bafebfceecec..8b13a11571fd 100644
--- a/metadata/md5-cache/dev-python/statsmodels-0.6.1
+++ b/metadata/md5-cache/dev-python/statsmodels-0.6.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/numpy-1.5.1[python_targets_python2_7(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/statsmodels/statsmodels-0.6.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=20d5844e91c4b9f00929674526dbf018
diff --git a/metadata/md5-cache/dev-python/statsmodels-0.8.0 b/metadata/md5-cache/dev-python/statsmodels-0.8.0
index 8cf815f3ef31..e3264c23d8e2 100644
--- a/metadata/md5-cache/dev-python/statsmodels-0.8.0
+++ b/metadata/md5-cache/dev-python/statsmodels-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/statsmodels/statsmodels-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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=02d071d7d21dbaad16bbd86aee1a0694
diff --git a/metadata/md5-cache/dev-python/statsmodels-0.9.0 b/metadata/md5-cache/dev-python/statsmodels-0.9.0
new file mode 100644
index 000000000000..2406cf745ac3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/statsmodels-0.9.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pandas-0.23.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/patsy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_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/cython[python_targets_python2_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(-)] doc? ( dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jupyter_client[python_targets_python2_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/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbconvert[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbformat[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpydoc[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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/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/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(-)] ) 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=Statistical computations and models for use with SciPy
+EAPI=6
+HOMEPAGE=https://www.statsmodels.org/stable/index.html
+IUSE=doc examples test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pandas-0.23.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/patsy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/s/statsmodels/statsmodels-0.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_=a3e5ecc27c77f7094d90bde178c86d45
diff --git a/metadata/md5-cache/dev-python/statsmodels-9999 b/metadata/md5-cache/dev-python/statsmodels-9999
index d00a39ec433f..6463a53407f6 100644
--- a/metadata/md5-cache/dev-python/statsmodels-9999
+++ b/metadata/md5-cache/dev-python/statsmodels-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pandas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jupyter_client[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbconvert[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbformat[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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/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? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pandas[python_targets_python2_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/patsy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_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/cython[python_targets_python2_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(-)] doc? ( dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jupyter_client[python_targets_python2_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/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbconvert[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbformat[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpydoc[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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/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(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Statistical computations and models for use with SciPy
 EAPI=6
 HOMEPAGE=https://www.statsmodels.org/stable/index.html
-IUSE=doc examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
+IUSE=doc examples test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 test
 LICENSE=BSD
-RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pandas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] examples? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pandas[python_targets_python2_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/patsy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] examples? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=6c0f6e68d2cdeb8edd86cf8285e6b426
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b09c0877b8e5d8aa947d3ff044752c73
diff --git a/metadata/md5-cache/dev-python/steadymark-0.5.3 b/metadata/md5-cache/dev-python/steadymark-0.5.3
index bbb1a9f09b4c..83fa4ecfb1c5 100644
--- a/metadata/md5-cache/dev-python/steadymark-0.5.3
+++ b/metadata/md5-cache/dev-python/steadymark-0.5.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/misaka[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/steadymark/steadymark-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=df151542ab2414f2574a6755c2d95d99
diff --git a/metadata/md5-cache/dev-python/stestr-2.1.0 b/metadata/md5-cache/dev-python/stestr-2.1.0
index f22694573850..a32564135913 100644
--- a/metadata/md5-cache/dev-python/stestr-2.1.0
+++ b/metadata/md5-cache/dev-python/stestr-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 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/stestr/stestr-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=18aa948a2253e75f04479cfb0a71cbaa
diff --git a/metadata/md5-cache/dev-python/stevedore-1.25.1 b/metadata/md5-cache/dev-python/stevedore-1.25.1
index 83ee518d9fb3..24e4e16af456 100644
--- a/metadata/md5-cache/dev-python/stevedore-1.25.1
+++ b/metadata/md5-cache/dev-python/stevedore-1.25.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 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/stevedore/stevedore-1.25.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6e4d9452bb03d2e10bdd3856ebe3e37a
diff --git a/metadata/md5-cache/dev-python/stevedore-1.28.0 b/metadata/md5-cache/dev-python/stevedore-1.28.0
index 9dbd943e41cb..de3e3d9f081a 100644
--- a/metadata/md5-cache/dev-python/stevedore-1.28.0
+++ b/metadata/md5-cache/dev-python/stevedore-1.28.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 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/stevedore/stevedore-1.28.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ccbd9698be9fc54b7f45778dc8e65692
diff --git a/metadata/md5-cache/dev-python/stomper-0.3.0 b/metadata/md5-cache/dev-python/stomper-0.3.0
index a499b089292d..88d1f353d5c9 100644
--- a/metadata/md5-cache/dev-python/stomper-0.3.0
+++ b/metadata/md5-cache/dev-python/stomper-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/stomper/stomper-0.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=705debf14841724af256235d83a5a3a5
diff --git a/metadata/md5-cache/dev-python/storm-0.20-r1 b/metadata/md5-cache/dev-python/storm-0.20-r1
index 6037f94425cf..83606c77ac17 100644
--- a/metadata/md5-cache/dev-python/storm-0.20-r1
+++ b/metadata/md5-cache/dev-python/storm-0.20-r1
@@ -10,5 +10,5 @@ RDEPEND=mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_si
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://launchpad.net/storm/trunk/0.20/+download/storm-0.20.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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_=d573862f34c1043d9547595245ae6691
diff --git a/metadata/md5-cache/dev-python/stormpath-2.4.5 b/metadata/md5-cache/dev-python/stormpath-2.4.5
index aca3f0ffacdc..06b2836ca4a8 100644
--- a/metadata/md5-cache/dev-python/stormpath-2.4.5
+++ b/metadata/md5-cache/dev-python/stormpath-2.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/isodate-0.5.4[python_targets_python2_7(-)?,python_targets_p
 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/stormpath/stormpath-sdk-python/archive/2.4.5.tar.gz -> stormpath-2.4.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bd0eab1efa93c21e6885fc683ace5e3c
diff --git a/metadata/md5-cache/dev-python/strict-rfc3339-0.6 b/metadata/md5-cache/dev-python/strict-rfc3339-0.6
index 86a3e94bc2f6..870748b317ef 100644
--- a/metadata/md5-cache/dev-python/strict-rfc3339-0.6
+++ b/metadata/md5-cache/dev-python/strict-rfc3339-0.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/s/strict-rfc3339/strict-rfc3339-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c703494c917d85cf8e16f074595afbd7
diff --git a/metadata/md5-cache/dev-python/strict-rfc3339-0.7 b/metadata/md5-cache/dev-python/strict-rfc3339-0.7
index 7d4351892d15..801e6d3c7c0f 100644
--- a/metadata/md5-cache/dev-python/strict-rfc3339-0.7
+++ b/metadata/md5-cache/dev-python/strict-rfc3339-0.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/s/strict-rfc3339/strict-rfc3339-0.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=f54b473c9b1a5fcc70888b8194b8f010
diff --git a/metadata/md5-cache/dev-python/stripe-1.84.2 b/metadata/md5-cache/dev-python/stripe-1.84.2
index 966a0955287b..55fc7da8c26c 100644
--- a/metadata/md5-cache/dev-python/stripe-1.84.2
+++ b/metadata/md5-cache/dev-python/stripe-1.84.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/requests-0.8.8 python_targets_python2_7? ( >=dev-lang/pytho
 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/stripe/stripe-1.84.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=85c1a08d20fcaea37778c2c0cf751c10
diff --git a/metadata/md5-cache/dev-python/stripe-2.3.0 b/metadata/md5-cache/dev-python/stripe-2.3.0
index 928c1ef38cbe..59b3f2d8c2f8 100644
--- a/metadata/md5-cache/dev-python/stripe-2.3.0
+++ b/metadata/md5-cache/dev-python/stripe-2.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/requests-0.8.8 python_targets_python2_7? ( >=dev-lang/pytho
 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/stripe/stripe-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=df84e56d42826a96590fbc8286532264
diff --git a/metadata/md5-cache/dev-python/stripogram-1.5-r1 b/metadata/md5-cache/dev-python/stripogram-1.5-r1
index 8d43c3bff4fe..beee496f1f45 100644
--- a/metadata/md5-cache/dev-python/stripogram-1.5-r1
+++ b/metadata/md5-cache/dev-python/stripogram-1.5-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=mirror://pypi/s/stripogram/stripogram-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=66caa23051a08b338f2e96f03a48190d
diff --git a/metadata/md5-cache/dev-python/structlog-16.1.0 b/metadata/md5-cache/dev-python/structlog-16.1.0
index 81dee99bcae5..82abce9992ca 100644
--- a/metadata/md5-cache/dev-python/structlog-16.1.0
+++ b/metadata/md5-cache/dev-python/structlog-16.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-
 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/hynek/structlog/archive/16.1.0.tar.gz -> structlog-16.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ff7fa2feed4e76028d49cde7426abb3f
diff --git a/metadata/md5-cache/dev-python/stsci-distutils-0.3.7 b/metadata/md5-cache/dev-python/stsci-distutils-0.3.7
index dc50e5187cd9..2ccd765ed4e7 100644
--- a/metadata/md5-cache/dev-python/stsci-distutils-0.3.7
+++ b/metadata/md5-cache/dev-python/stsci-distutils-0.3.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/d2to1[python_targets_pypy(-)?,python_targets_python2_7(-)?,py
 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/stsci.distutils/stsci.distutils-0.3.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=bd5fee5960fc08b1a889cc96d43a85db
diff --git a/metadata/md5-cache/dev-python/stsci-sphinxext-1.2.1 b/metadata/md5-cache/dev-python/stsci-sphinxext-1.2.1
index 715f97445f02..8e0da4197f2a 100644
--- a/metadata/md5-cache/dev-python/stsci-sphinxext-1.2.1
+++ b/metadata/md5-cache/dev-python/stsci-sphinxext-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/matplotlib[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
 SRC_URI=mirror://pypi/s/stsci.sphinxext/stsci.sphinxext-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7768af6ec6a42309ee32e89393ea6ba9
diff --git a/metadata/md5-cache/dev-python/subprocess32-3.2.7 b/metadata/md5-cache/dev-python/subprocess32-3.2.7
index d4214deaf48b..3bc3c3606de4 100644
--- a/metadata/md5-cache/dev-python/subprocess32-3.2.7
+++ b/metadata/md5-cache/dev-python/subprocess32-3.2.7
@@ -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=mirror://pypi/s/subprocess32/subprocess32-3.2.7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1864f7aa691f36bbd173aca97c651421
diff --git a/metadata/md5-cache/dev-python/subunit-1.2.0-r1 b/metadata/md5-cache/dev-python/subunit-1.2.0-r1
index a735240fb5af..fc22ad88b99a 100644
--- a/metadata/md5-cache/dev-python/subunit-1.2.0-r1
+++ b/metadata/md5-cache/dev-python/subunit-1.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/testtools-0.9.34[python_targets_pypy(-)?,python_targets_pyp
 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://launchpad.net/subunit/trunk/1.2/+download/subunit-1.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=286eff00f4858448672ac79a791d3b96
diff --git a/metadata/md5-cache/dev-python/subvertpy-0.10.1 b/metadata/md5-cache/dev-python/subvertpy-0.10.1
index 85ddf06e3533..d85e18830a3f 100644
--- a/metadata/md5-cache/dev-python/subvertpy-0.10.1
+++ b/metadata/md5-cache/dev-python/subvertpy-0.10.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-vcs/subversion-1.4 python_targets_python2_7? ( >=dev-lang/python-2
 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/subvertpy/subvertpy-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f82275d3bfc54b6c6dc20f914e3d31cb
diff --git a/metadata/md5-cache/dev-python/subvertpy-0.9.1 b/metadata/md5-cache/dev-python/subvertpy-0.9.1
index dd105275d2bd..4d83489472e9 100644
--- a/metadata/md5-cache/dev-python/subvertpy-0.9.1
+++ b/metadata/md5-cache/dev-python/subvertpy-0.9.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-vcs/subversion-1.4 python_targets_python2_7? ( >=dev-lang/python-2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://www.samba.org/~jelmer/subvertpy/subvertpy-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f309646b47c95be6d17f2d8a7ddb048f
diff --git a/metadata/md5-cache/dev-python/suds-0.6-r1 b/metadata/md5-cache/dev-python/suds-0.6-r1
index 107a72c349ea..bcd8ca9d53b1 100644
--- a/metadata/md5-cache/dev-python/suds-0.6-r1
+++ b/metadata/md5-cache/dev-python/suds-0.6-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targ
 REQUIRED_USE=doc? ( python_targets_python2_7 ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/suds-jurko/suds-jurko-0.6.tar.bz2 -> suds-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=531f0468161a92b9589530f8e5983b8d
diff --git a/metadata/md5-cache/dev-python/sudsds-1.0.1-r1 b/metadata/md5-cache/dev-python/sudsds-1.0.1-r1
index 748d3a0b5404..677f181bf2a1 100644
--- a/metadata/md5-cache/dev-python/sudsds-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/sudsds-1.0.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=http://www.nic.cz/public_media/datove_schranky/releases/src/sudsds-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a4c5c7645438d8a5637906595870b4e8
diff --git a/metadata/md5-cache/dev-python/sunpy-0.8.0 b/metadata/md5-cache/dev-python/sunpy-0.8.0
index 89d40c20cb85..0256a2b80a48 100644
--- a/metadata/md5-cache/dev-python/sunpy-0.8.0
+++ b/metadata/md5-cache/dev-python/sunpy-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/astropy-2[python_targets_python2_7(-)?,python_targets_pytho
 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/sunpy/sunpy-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=faf34e510d2ace282f51319a6715af0f
diff --git a/metadata/md5-cache/dev-python/superlance-0.14 b/metadata/md5-cache/dev-python/superlance-0.14
index 18c5d16b1361..415641e828b3 100644
--- a/metadata/md5-cache/dev-python/superlance-0.14
+++ b/metadata/md5-cache/dev-python/superlance-0.14
@@ -10,5 +10,5 @@ RDEPEND=app-admin/supervisor[python_targets_python2_7(-)?,-python_single_target_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/superlance/superlance-0.14.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b54cfe1f92390135db5187c390a6d270
diff --git a/metadata/md5-cache/dev-python/superlance-1.0.0 b/metadata/md5-cache/dev-python/superlance-1.0.0
index 535e82871f93..1abe73c01331 100644
--- a/metadata/md5-cache/dev-python/superlance-1.0.0
+++ b/metadata/md5-cache/dev-python/superlance-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=app-admin/supervisor[python_targets_python2_7(-)?,-python_single_target_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/superlance/superlance-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b54cfe1f92390135db5187c390a6d270
diff --git a/metadata/md5-cache/dev-python/supervisor-quick-0.1.4 b/metadata/md5-cache/dev-python/supervisor-quick-0.1.4
index a1b70e88a894..a69fab9574c2 100644
--- a/metadata/md5-cache/dev-python/supervisor-quick-0.1.4
+++ b/metadata/md5-cache/dev-python/supervisor-quick-0.1.4
@@ -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=mirror://pypi/s/supervisor-quick/supervisor-quick-0.1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0820d4faaf873fe69d71dad3c75aeb46
diff --git a/metadata/md5-cache/dev-python/sure-1.2.24 b/metadata/md5-cache/dev-python/sure-1.2.24
index 28252cfea215..f51c639baae5 100644
--- a/metadata/md5-cache/dev-python/sure-1.2.24
+++ b/metadata/md5-cache/dev-python/sure-1.2.24
@@ -10,5 +10,5 @@ RDEPEND=dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,pyt
 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/sure/sure-1.2.24.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=de5ff3f5c75f06b69b980c85a34ca0e7
diff --git a/metadata/md5-cache/dev-python/sure-1.2.3 b/metadata/md5-cache/dev-python/sure-1.2.3
index 006b34875f40..6c211ccbdc4f 100644
--- a/metadata/md5-cache/dev-python/sure-1.2.3
+++ b/metadata/md5-cache/dev-python/sure-1.2.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sure/sure-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=a87018a5254038456f27ca99e80d3f10
diff --git a/metadata/md5-cache/dev-python/sure-1.2.5 b/metadata/md5-cache/dev-python/sure-1.2.5
index 8b476ca2910f..a17acb72a4c4 100644
--- a/metadata/md5-cache/dev-python/sure-1.2.5
+++ b/metadata/md5-cache/dev-python/sure-1.2.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sure/sure-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a87018a5254038456f27ca99e80d3f10
diff --git a/metadata/md5-cache/dev-python/sure-1.2.5-r1 b/metadata/md5-cache/dev-python/sure-1.2.5-r1
index f7a656b572b6..102ca07fe14d 100644
--- a/metadata/md5-cache/dev-python/sure-1.2.5-r1
+++ b/metadata/md5-cache/dev-python/sure-1.2.5-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/nose-1.3.0[python_targets_pypy(-)?,python_targets_python2_7
 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/gabrielfalcao/sure/archive/1.2.5.tar.gz -> sure-1.2.5-r1.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=10aaa62913ae08c7d5634895d99c011d
diff --git a/metadata/md5-cache/dev-python/svgwrite-1.1.12 b/metadata/md5-cache/dev-python/svgwrite-1.1.12
index 1403989a3532..8bd0c8e7d972 100644
--- a/metadata/md5-cache/dev-python/svgwrite-1.1.12
+++ b/metadata/md5-cache/dev-python/svgwrite-1.1.12
@@ -10,5 +10,5 @@ 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_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/mozman/svgwrite/archive/v1.1.12.tar.gz -> svgwrite-1.1.12.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bc17dd3782c2ebd78b7d9afb93041198
diff --git a/metadata/md5-cache/dev-python/symboltype-1.0 b/metadata/md5-cache/dev-python/symboltype-1.0
index 0aacdac65ac0..406713fc5d50 100644
--- a/metadata/md5-cache/dev-python/symboltype-1.0
+++ b/metadata/md5-cache/dev-python/symboltype-1.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/S/SymbolType/SymbolType-1.0.zip -> symboltype-1.0.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=aa3303e4f1959ded44c4f76aac7d1df8
diff --git a/metadata/md5-cache/dev-python/symengine-0.3.0 b/metadata/md5-cache/dev-python/symengine-0.3.0
index cf6cf1b9a412..6f52c6dfd150 100644
--- a/metadata/md5-cache/dev-python/symengine-0.3.0
+++ b/metadata/md5-cache/dev-python/symengine-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/symengine/symengine.py/archive/v0.3.0.tar.gz -> symengine.py-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f73e5a2894acdb847f4fe40d4452c493
diff --git a/metadata/md5-cache/dev-python/sympy-1.0-r1 b/metadata/md5-cache/dev-python/sympy-1.0-r1
index 178d12cbebec..08e252a4c404 100644
--- a/metadata/md5-cache/dev-python/sympy-1.0-r1
+++ b/metadata/md5-cache/dev-python/sympy-1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/mpmath[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/sympy/sympy/releases/download/sympy-1.0/sympy-1.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4a8cec3f241fcfdab16f1523d2f816ed
diff --git a/metadata/md5-cache/dev-python/sympy-1.1.1 b/metadata/md5-cache/dev-python/sympy-1.1.1
index 67363da78c9c..db8cfac8845d 100644
--- a/metadata/md5-cache/dev-python/sympy-1.1.1
+++ b/metadata/md5-cache/dev-python/sympy-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/mpmath[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/sympy/sympy/releases/download/sympy-1.1.1/sympy-1.1.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9e6d52069493966b00d7fc92b807b2ef
diff --git a/metadata/md5-cache/dev-python/sympy-1.3 b/metadata/md5-cache/dev-python/sympy-1.3
index 2a996618abbe..8c51fb676fc0 100644
--- a/metadata/md5-cache/dev-python/sympy-1.3
+++ b/metadata/md5-cache/dev-python/sympy-1.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/sympy/sympy/releases/download/sympy-1.3/sympy-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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2f722e27c1788c71eedc530fb4384057
diff --git a/metadata/md5-cache/dev-python/tabulate-0.8.1 b/metadata/md5-cache/dev-python/tabulate-0.8.1
index cc9a0c291cee..10f6224d2f8e 100644
--- a/metadata/md5-cache/dev-python/tabulate-0.8.1
+++ b/metadata/md5-cache/dev-python/tabulate-0.8.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/t/tabulate/tabulate-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c0c1fcf90ff254e46300e58de28d874b
diff --git a/metadata/md5-cache/dev-python/tagpy-2013.1 b/metadata/md5-cache/dev-python/tagpy-2013.1
index edb314dda5f4..2f89acf0e242 100644
--- a/metadata/md5-cache/dev-python/tagpy-2013.1
+++ b/metadata/md5-cache/dev-python/tagpy-2013.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/boost-1.49.0:=[python,threads,python_targets_python2_7(-)?,py
 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/tagpy/tagpy-2013.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=aad77df8ffb1e872a06c03bbb6594af3
diff --git a/metadata/md5-cache/dev-python/tappy-2.4 b/metadata/md5-cache/dev-python/tappy-2.4
index 74507b92cc60..9314a6d639b6 100644
--- a/metadata/md5-cache/dev-python/tappy-2.4
+++ b/metadata/md5-cache/dev-python/tappy-2.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-python/taskflow-2.14.1 b/metadata/md5-cache/dev-python/taskflow-2.14.1
index 6e3d03e3ebb7..e620dff6fac3 100644
--- a/metadata/md5-cache/dev-python/taskflow-2.14.1
+++ b/metadata/md5-cache/dev-python/taskflow-2.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/t/taskflow/taskflow-2.14.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3969882cf3f5d0d378593cf5d6ede86a
diff --git a/metadata/md5-cache/dev-python/taskflow-2.9.1 b/metadata/md5-cache/dev-python/taskflow-2.9.1
index e9b7016bce34..b650f1c96120 100644
--- a/metadata/md5-cache/dev-python/taskflow-2.9.1
+++ b/metadata/md5-cache/dev-python/taskflow-2.9.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/t/taskflow/taskflow-2.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9e5be08a76659e45c70bcd786125a318
diff --git a/metadata/md5-cache/dev-python/taskflow-3.1.0 b/metadata/md5-cache/dev-python/taskflow-3.1.0
index 4cd3826cfc25..53cb64cc615a 100644
--- a/metadata/md5-cache/dev-python/taskflow-3.1.0
+++ b/metadata/md5-cache/dev-python/taskflow-3.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 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/taskflow/taskflow-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8919b7972d1f0281614ee066afbc26b0
diff --git a/metadata/md5-cache/dev-python/tblib-1.3.2 b/metadata/md5-cache/dev-python/tblib-1.3.2
index 58bddf040de7..27eea05ca5e2 100644
--- a/metadata/md5-cache/dev-python/tblib-1.3.2
+++ b/metadata/md5-cache/dev-python/tblib-1.3.2
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/t/tblib/tblib-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=de519bc3d66a21a2032215671abf518f
diff --git a/metadata/md5-cache/dev-python/telarchive-1.8.3 b/metadata/md5-cache/dev-python/telarchive-1.8.3
index a3cd31210a5e..73e166050b00 100644
--- a/metadata/md5-cache/dev-python/telarchive-1.8.3
+++ b/metadata/md5-cache/dev-python/telarchive-1.8.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=0
 SRC_URI=mirror://pypi/t/telarchive/telarchive-1.8.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8762e5bc5093c764144d0e337405be57
diff --git a/metadata/md5-cache/dev-python/tempest-lib-1.0.0 b/metadata/md5-cache/dev-python/tempest-lib-1.0.0
index 7e53ac8060b0..bb74b864e9d1 100644
--- a/metadata/md5-cache/dev-python/tempest-lib-1.0.0
+++ b/metadata/md5-cache/dev-python/tempest-lib-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3
 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/tempest-lib/tempest-lib-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bb381e2429486cac47ae136a0562cf20
diff --git a/metadata/md5-cache/dev-python/tempita-0.5.3-r1 b/metadata/md5-cache/dev-python/tempita-0.5.3-r1
index 60a3cbf5cecd..2e46982afcc7 100644
--- a/metadata/md5-cache/dev-python/tempita-0.5.3-r1
+++ b/metadata/md5-cache/dev-python/tempita-0.5.3-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/T/Tempita/Tempita-0.5.3dev.tar.gz -> tempita-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=01ba8b22d6535f666dee6fc2a77115c6
diff --git a/metadata/md5-cache/dev-python/tempora-1.7 b/metadata/md5-cache/dev-python/tempora-1.7
index 47b2b2c0389a..a1924a6b2a76 100644
--- a/metadata/md5-cache/dev-python/tempora-1.7
+++ b/metadata/md5-cache/dev-python/tempora-1.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pytz[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_
 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/t/tempora/tempora-1.7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8d15c35e1ce47d8d1bf00527df5c2f30
diff --git a/metadata/md5-cache/dev-python/tenacity-3.7.1 b/metadata/md5-cache/dev-python/tenacity-3.7.1
index 786c5a56aac8..42ec1a89d63b 100644
--- a/metadata/md5-cache/dev-python/tenacity-3.7.1
+++ b/metadata/md5-cache/dev-python/tenacity-3.7.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/six-1.7.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/t/tenacity/tenacity-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f82a4d8634def1ebbadf707717505cb9
diff --git a/metadata/md5-cache/dev-python/tenacity-4.4.0 b/metadata/md5-cache/dev-python/tenacity-4.4.0
index 0f943c711f49..88191da484a7 100644
--- a/metadata/md5-cache/dev-python/tenacity-4.4.0
+++ b/metadata/md5-cache/dev-python/tenacity-4.4.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/t/tenacity/tenacity-4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=91e4c60639e3a5c112d7ebe4de220880
diff --git a/metadata/md5-cache/dev-python/tenacity-4.8.0 b/metadata/md5-cache/dev-python/tenacity-4.8.0
index 9b416661d7fd..a79f10f90191 100644
--- a/metadata/md5-cache/dev-python/tenacity-4.8.0
+++ b/metadata/md5-cache/dev-python/tenacity-4.8.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/t/tenacity/tenacity-4.8.0.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3baa7d57279b4a73dca126405189f171
diff --git a/metadata/md5-cache/dev-python/termcolor-1.1.0-r1 b/metadata/md5-cache/dev-python/termcolor-1.1.0-r1
index 69fde4b10e98..6a93ae96a125 100644
--- a/metadata/md5-cache/dev-python/termcolor-1.1.0-r1
+++ b/metadata/md5-cache/dev-python/termcolor-1.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/t/termcolor/termcolor-1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6dd6df3a5cdb3c56ec8316ddeff9d1ae
diff --git a/metadata/md5-cache/dev-python/terminado-0.5 b/metadata/md5-cache/dev-python/terminado-0.5
index ff9a24b07425..c3e71d9d1bbb 100644
--- a/metadata/md5-cache/dev-python/terminado-0.5
+++ b/metadata/md5-cache/dev-python/terminado-0.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/ptyprocess[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
 SRC_URI=mirror://pypi/t/terminado/terminado-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=114f422e5cc0c8d78093c2c8165160bf
diff --git a/metadata/md5-cache/dev-python/terminado-0.6 b/metadata/md5-cache/dev-python/terminado-0.6
index 6754b13a5bde..754a4b568198 100644
--- a/metadata/md5-cache/dev-python/terminado-0.6
+++ b/metadata/md5-cache/dev-python/terminado-0.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/ptyprocess[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
 SRC_URI=mirror://pypi/t/terminado/terminado-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a67365ded163936901ff861f890cc70b
diff --git a/metadata/md5-cache/dev-python/terminado-0.8.1 b/metadata/md5-cache/dev-python/terminado-0.8.1
index c55178a5a1eb..abde727a0233 100644
--- a/metadata/md5-cache/dev-python/terminado-0.8.1
+++ b/metadata/md5-cache/dev-python/terminado-0.8.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/ptyprocess[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
 SRC_URI=mirror://pypi/t/terminado/terminado-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5b60a9f5a2cd483b53624b2c714885ff
diff --git a/metadata/md5-cache/dev-python/terminaltables-3.1.0 b/metadata/md5-cache/dev-python/terminaltables-3.1.0
index 591b3148e261..d7e38501c516 100644
--- a/metadata/md5-cache/dev-python/terminaltables-3.1.0
+++ b/metadata/md5-cache/dev-python/terminaltables-3.1.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/Robpol86/terminaltables/archive/v3.1.0.tar.gz -> terminaltables-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ae5ff7d192f1df88290b40055d4cb807
diff --git a/metadata/md5-cache/dev-python/terminaltables-9999 b/metadata/md5-cache/dev-python/terminaltables-9999
index d104d742048c..9c1229ef467f 100644
--- a/metadata/md5-cache/dev-python/terminaltables-9999
+++ b/metadata/md5-cache/dev-python/terminaltables-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7e5cd0ca4a8092e6959a75fdfde7928b
diff --git a/metadata/md5-cache/dev-python/testfixtures-4.9.1 b/metadata/md5-cache/dev-python/testfixtures-4.9.1
index 4a44af53d89c..d4f35f0c083e 100644
--- a/metadata/md5-cache/dev-python/testfixtures-4.9.1
+++ b/metadata/md5-cache/dev-python/testfixtures-4.9.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/t/testfixtures/testfixtures-4.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0451ccd7584944b65ac78842a86228ee
diff --git a/metadata/md5-cache/dev-python/testify-0.11.0 b/metadata/md5-cache/dev-python/testify-0.11.0
index 1961b91e4a4f..d3811ae7c412 100644
--- a/metadata/md5-cache/dev-python/testify-0.11.0
+++ b/metadata/md5-cache/dev-python/testify-0.11.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/t/testify/testify-0.11.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ab9e81581d289d5c5cac66c9649cec75
diff --git a/metadata/md5-cache/dev-python/testpath-0.3.1 b/metadata/md5-cache/dev-python/testpath-0.3.1
index 88410d284851..e64cc216dba5 100644
--- a/metadata/md5-cache/dev-python/testpath-0.3.1
+++ b/metadata/md5-cache/dev-python/testpath-0.3.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/jupyter/testpath/archive/0.3.1.tar.gz -> testpath-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0a277c673c8011c7d78baed12727d4f2
diff --git a/metadata/md5-cache/dev-python/testrepository-0.0.18-r1 b/metadata/md5-cache/dev-python/testrepository-0.0.18-r1
index c6f6f2455dcc..f8578b7ff795 100644
--- a/metadata/md5-cache/dev-python/testrepository-0.0.18-r1
+++ b/metadata/md5-cache/dev-python/testrepository-0.0.18-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/subunit-0.0.10[python_targets_pypy(-)?,python_targets_pypy3
 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/t/testrepository/testrepository-0.0.18.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=78ebde75fe9fed88061cd15b94bda0ad
diff --git a/metadata/md5-cache/dev-python/testrepository-0.0.20 b/metadata/md5-cache/dev-python/testrepository-0.0.20
index 2a88837af0e7..5822e0677058 100644
--- a/metadata/md5-cache/dev-python/testrepository-0.0.20
+++ b/metadata/md5-cache/dev-python/testrepository-0.0.20
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/subunit-0.0.18[python_targets_pypy(-)?,python_targets_pypy3
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-python/testresources-0.2.7-r2 b/metadata/md5-cache/dev-python/testresources-0.2.7-r2
index 56eba70ba882..f96aee0d9d38 100644
--- a/metadata/md5-cache/dev-python/testresources-0.2.7-r2
+++ b/metadata/md5-cache/dev-python/testresources-0.2.7-r2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/t/testresources/testresources-0.2.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=553ea9b0d94286e5ae1fb59929dd5bf3
diff --git a/metadata/md5-cache/dev-python/testresources-1.0.0 b/metadata/md5-cache/dev-python/testresources-1.0.0
index eac721f74753..c0031329004f 100644
--- a/metadata/md5-cache/dev-python/testresources-1.0.0
+++ b/metadata/md5-cache/dev-python/testresources-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/t/testresources/testresources-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b55ae21558b4e15560fd0a3a3c11cd00
diff --git a/metadata/md5-cache/dev-python/testresources-2.0.1 b/metadata/md5-cache/dev-python/testresources-2.0.1
index aabc5a144eb0..55938faeac13 100644
--- a/metadata/md5-cache/dev-python/testresources-2.0.1
+++ b/metadata/md5-cache/dev-python/testresources-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/testresources/testresources-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7a48f4dbfd49e0c1de6e32d83e714e8c
diff --git a/metadata/md5-cache/dev-python/testscenarios-0.5.0 b/metadata/md5-cache/dev-python/testscenarios-0.5.0
index 83e68f05fd51..cc341b91e38a 100644
--- a/metadata/md5-cache/dev-python/testscenarios-0.5.0
+++ b/metadata/md5-cache/dev-python/testscenarios-0.5.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/testtools[python_targets_pypy(-)?,python_targets_pypy3(-)?,py
 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/testscenarios/testscenarios-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=28637cda0c8be2f914c6434bec90dca7
diff --git a/metadata/md5-cache/dev-python/testtools-2.3.0 b/metadata/md5-cache/dev-python/testtools-2.3.0
index e477430656eb..95e23307a539 100644
--- a/metadata/md5-cache/dev-python/testtools-2.3.0
+++ b/metadata/md5-cache/dev-python/testtools-2.3.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/extras-1.0.0[python_targets_pypy(-)?,python_targets_pypy3(-
 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/testtools/testtools-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c1e7579335de098bbcdd2acf4b9562cc
diff --git a/metadata/md5-cache/dev-python/textfsm-0.4.0 b/metadata/md5-cache/dev-python/textfsm-0.4.0
index aa2bc8cf8f59..18b1fd0a4c54 100644
--- a/metadata/md5-cache/dev-python/textfsm-0.4.0
+++ b/metadata/md5-cache/dev-python/textfsm-0.4.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/t/textfsm/textfsm-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fce5c7c33b65c25be2c4a2ad0acb92f7
diff --git a/metadata/md5-cache/dev-python/texttable-0.9.1 b/metadata/md5-cache/dev-python/texttable-0.9.1
index ec0d6ff8bd52..20691f03b347 100644
--- a/metadata/md5-cache/dev-python/texttable-0.9.1
+++ b/metadata/md5-cache/dev-python/texttable-0.9.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/t/texttable/texttable-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=017576afb70c50b2becfab18a2dab97b
diff --git a/metadata/md5-cache/dev-python/textx-1.4 b/metadata/md5-cache/dev-python/textx-1.4
index c844167e6415..f37a25516b02 100644
--- a/metadata/md5-cache/dev-python/textx-1.4
+++ b/metadata/md5-cache/dev-python/textx-1.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/t/textX/textX-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5af1bc63e6b0d2254a7bf48b6f5e9789
diff --git a/metadata/md5-cache/dev-python/tgmochikit-1.4.2-r1 b/metadata/md5-cache/dev-python/tgmochikit-1.4.2-r1
index 92e0851876b0..e93e565bc606 100644
--- a/metadata/md5-cache/dev-python/tgmochikit-1.4.2-r1
+++ b/metadata/md5-cache/dev-python/tgmochikit-1.4.2-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=mirror://pypi/t/tgMochiKit/tgMochiKit-1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=dcfc87a7ba53d812a93d75dc3b70f61f
diff --git a/metadata/md5-cache/dev-python/theano-0.6.0 b/metadata/md5-cache/dev-python/theano-0.6.0
index 4019ac7d187a..81ccc1879463 100644
--- a/metadata/md5-cache/dev-python/theano-0.6.0
+++ b/metadata/md5-cache/dev-python/theano-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=sci-libs/scipy[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/T/Theano/Theano-0.6.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=46a4917c96a8ffdd0546df76e7ff4ed0
diff --git a/metadata/md5-cache/dev-python/theano-0.7.0 b/metadata/md5-cache/dev-python/theano-0.7.0
index 29056408132a..581b971ed75f 100644
--- a/metadata/md5-cache/dev-python/theano-0.7.0
+++ b/metadata/md5-cache/dev-python/theano-0.7.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/numpy-1.6.2[python_targets_python2_7(-)?,-python_single_tar
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/T/Theano/Theano-0.7.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=697f4dca2f5c9abff03bcc4dad980a38
diff --git a/metadata/md5-cache/dev-python/theano-0.8.2 b/metadata/md5-cache/dev-python/theano-0.8.2
index cb0ec6df8be9..89cf518b230b 100644
--- a/metadata/md5-cache/dev-python/theano-0.8.2
+++ b/metadata/md5-cache/dev-python/theano-0.8.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/T/Theano/Theano-0.8.2.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3ff6c968e1bda97ba8794fff08cb2499
diff --git a/metadata/md5-cache/dev-python/theano-0.9.0 b/metadata/md5-cache/dev-python/theano-0.9.0
index b7e6a71e652f..6210c24a1473 100644
--- a/metadata/md5-cache/dev-python/theano-0.9.0
+++ b/metadata/md5-cache/dev-python/theano-0.9.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/T/Theano/Theano-0.9.0.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7e5f8c6cb74cc2b24e68f81a652dcade
diff --git a/metadata/md5-cache/dev-python/thrift-0.11.0 b/metadata/md5-cache/dev-python/thrift-0.11.0
index 1df9184000d4..c04536aab6ef 100644
--- a/metadata/md5-cache/dev-python/thrift-0.11.0
+++ b/metadata/md5-cache/dev-python/thrift-0.11.0
@@ -10,5 +10,5 @@ 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_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/t/thrift/thrift-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c030f054c392de5642a189257ac813ed
diff --git a/metadata/md5-cache/dev-python/thriftpy-0.3.9 b/metadata/md5-cache/dev-python/thriftpy-0.3.9
index 9d6e5e50f535..c477afa53a82 100644
--- a/metadata/md5-cache/dev-python/thriftpy-0.3.9
+++ b/metadata/md5-cache/dev-python/thriftpy-0.3.9
@@ -10,5 +10,5 @@ RDEPEND=dev-python/flake8[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/t/thriftpy/thriftpy-0.3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e43c1215aa4898e1e48b6618915a3a25
diff --git a/metadata/md5-cache/dev-python/timelib-0.2.4-r1 b/metadata/md5-cache/dev-python/timelib-0.2.4-r1
index d3204eea9263..fd1b8a67a275 100644
--- a/metadata/md5-cache/dev-python/timelib-0.2.4-r1
+++ b/metadata/md5-cache/dev-python/timelib-0.2.4-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/pediapress/timelib/archive/0.2.4.tar.gz -> timelib-0.2.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f1e47eac97b8f633398ae19f1307c3f0
diff --git a/metadata/md5-cache/dev-python/tinycss-0.3 b/metadata/md5-cache/dev-python/tinycss-0.3
index 8ce64d4e6fb1..ffb7c8317749 100644
--- a/metadata/md5-cache/dev-python/tinycss-0.3
+++ b/metadata/md5-cache/dev-python/tinycss-0.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/t/tinycss/tinycss-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=be7c9ee92fd7e7bbe1d160943e26c4a2
diff --git a/metadata/md5-cache/dev-python/tinycss-0.4 b/metadata/md5-cache/dev-python/tinycss-0.4
index 4cba18e11aef..ec04ac21d26a 100644
--- a/metadata/md5-cache/dev-python/tinycss-0.4
+++ b/metadata/md5-cache/dev-python/tinycss-0.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/t/tinycss/tinycss-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6e473a3f07335a5a87155350cfc06c2c
diff --git a/metadata/md5-cache/dev-python/tinycss2-0.5 b/metadata/md5-cache/dev-python/tinycss2-0.5
index 20ca4c10c8df..d635250ea608 100644
--- a/metadata/md5-cache/dev-python/tinycss2-0.5
+++ b/metadata/md5-cache/dev-python/tinycss2-0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/t/tinycss2/tinycss2-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a6187c9b136486fe0319e15289158c6c
diff --git a/metadata/md5-cache/dev-python/tinycss2-0.6.1 b/metadata/md5-cache/dev-python/tinycss2-0.6.1
index dd5eba1208db..51a60aa46395 100644
--- a/metadata/md5-cache/dev-python/tinycss2-0.6.1
+++ b/metadata/md5-cache/dev-python/tinycss2-0.6.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/t/tinycss2/tinycss2-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=998fd3b6508d743f5e39ca0d37f0bc65
diff --git a/metadata/md5-cache/dev-python/tinydb-3.1.3 b/metadata/md5-cache/dev-python/tinydb-3.1.3
index 2c8093b42c33..3417ef3702a6 100644
--- a/metadata/md5-cache/dev-python/tinydb-3.1.3
+++ b/metadata/md5-cache/dev-python/tinydb-3.1.3
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/t/tinydb/tinydb-3.1.3.zip
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=660d8f2fd6146216fb8dce34b49b224d
diff --git a/metadata/md5-cache/dev-python/tld-0.7.10 b/metadata/md5-cache/dev-python/tld-0.7.10
index fb3f009b409d..4ad1452edfa5 100644
--- a/metadata/md5-cache/dev-python/tld-0.7.10
+++ b/metadata/md5-cache/dev-python/tld-0.7.10
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/barseghyanartur/tld/archive/0.7.10.tar.gz -> tld-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ea3e0b9b7c4c5e2d0bc7f087699c8226
diff --git a/metadata/md5-cache/dev-python/tld-0.9.1 b/metadata/md5-cache/dev-python/tld-0.9.1
index cb1650f16160..8b7fb9337760 100644
--- a/metadata/md5-cache/dev-python/tld-0.9.1
+++ b/metadata/md5-cache/dev-python/tld-0.9.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/barseghyanartur/tld/archive/0.9.1.tar.gz -> tld-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ea3e0b9b7c4c5e2d0bc7f087699c8226
diff --git a/metadata/md5-cache/dev-python/tlslite-0.4.9-r2 b/metadata/md5-cache/dev-python/tlslite-0.4.9-r2
index eecec2ed8725..9058237b6431 100644
--- a/metadata/md5-cache/dev-python/tlslite-0.4.9-r2
+++ b/metadata/md5-cache/dev-python/tlslite-0.4.9-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/t/tlslite/tlslite-0.4.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d552f41fecdd1288ff20e737b0013dfa
diff --git a/metadata/md5-cache/dev-python/tmdb3-0.6.17 b/metadata/md5-cache/dev-python/tmdb3-0.6.17
index ad8c3ce1a44c..cc12486b3903 100644
--- a/metadata/md5-cache/dev-python/tmdb3-0.6.17
+++ b/metadata/md5-cache/dev-python/tmdb3-0.6.17
@@ -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=mirror://pypi/t/tmdb3/tmdb3-0.6.17.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3c28e67fcfcf1c60b42a203fc6054bc2
diff --git a/metadata/md5-cache/dev-python/tmdb3-0.7.2 b/metadata/md5-cache/dev-python/tmdb3-0.7.2
index b93c4b55eefe..26954599a7f5 100644
--- a/metadata/md5-cache/dev-python/tmdb3-0.7.2
+++ b/metadata/md5-cache/dev-python/tmdb3-0.7.2
@@ -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=mirror://pypi/t/tmdb3/tmdb3-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8b5aa0db6c1032e18445f1e2d8d02658
diff --git a/metadata/md5-cache/dev-python/toml-0.9.6 b/metadata/md5-cache/dev-python/toml-0.9.6
index cf7a0a1b7a77..5dc0058ffbcf 100644
--- a/metadata/md5-cache/dev-python/toml-0.9.6
+++ b/metadata/md5-cache/dev-python/toml-0.9.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/t/toml/toml-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=606805220144e94cdd93feffea5042c1
diff --git a/metadata/md5-cache/dev-python/toolz-0.8.0 b/metadata/md5-cache/dev-python/toolz-0.8.0
index 46f83f76418e..c379fd94c6a6 100644
--- a/metadata/md5-cache/dev-python/toolz-0.8.0
+++ b/metadata/md5-cache/dev-python/toolz-0.8.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/t/toolz/toolz-0.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f099a7a3f47640e7f49e8cc5bb9638a6
diff --git a/metadata/md5-cache/dev-python/toolz-0.8.2 b/metadata/md5-cache/dev-python/toolz-0.8.2
index 5a17ff7a19bb..807de82a0f2f 100644
--- a/metadata/md5-cache/dev-python/toolz-0.8.2
+++ b/metadata/md5-cache/dev-python/toolz-0.8.2
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/t/toolz/toolz-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a50a0d1f259c7bf3ca16a6c12db5df10
diff --git a/metadata/md5-cache/dev-python/toolz-0.9.0 b/metadata/md5-cache/dev-python/toolz-0.9.0
index bb7774758828..00381192242f 100644
--- a/metadata/md5-cache/dev-python/toolz-0.9.0
+++ b/metadata/md5-cache/dev-python/toolz-0.9.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/t/toolz/toolz-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=edba183c2799566a60c5b0b616ceaad5
diff --git a/metadata/md5-cache/dev-python/tooz-1.60.1 b/metadata/md5-cache/dev-python/tooz-1.60.1
index e47c0a9219e8..05842debcfef 100644
--- a/metadata/md5-cache/dev-python/tooz-1.60.1
+++ b/metadata/md5-cache/dev-python/tooz-1.60.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3
 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/tooz/tooz-1.60.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ce3fc4e3f38154f2ee1a4aa71e06a086
diff --git a/metadata/md5-cache/dev-python/torment-3.0.3 b/metadata/md5-cache/dev-python/torment-3.0.3
index f07181bafdf6..e69ba15ee20a 100644
--- a/metadata/md5-cache/dev-python/torment-3.0.3
+++ b/metadata/md5-cache/dev-python/torment-3.0.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/mypy[python_targets_python3_4(-)?,python_targets_python3_5(-)
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/t/torment/torment-3.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d7918d6f7cce997e19861a0c846307f0
diff --git a/metadata/md5-cache/dev-python/toro-1.0.1 b/metadata/md5-cache/dev-python/toro-1.0.1
index 14caba8b4ef4..ea20cba6947f 100644
--- a/metadata/md5-cache/dev-python/toro-1.0.1
+++ b/metadata/md5-cache/dev-python/toro-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=virtual/python-futures[python_targets_python2_7(-)?,python_targets_pytho
 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/toro/toro-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=57ab2ccc185d9a0fab55ba914af29525
diff --git a/metadata/md5-cache/dev-python/tox-2.9.1 b/metadata/md5-cache/dev-python/tox-2.9.1
index f296e8b1f20d..20b0e46e8a07 100644
--- a/metadata/md5-cache/dev-python/tox-2.9.1
+++ b/metadata/md5-cache/dev-python/tox-2.9.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/t/tox/tox-2.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b12e5e405d0360b43c7de83cec609c15
diff --git a/metadata/md5-cache/dev-python/tpg-3.2.2-r1 b/metadata/md5-cache/dev-python/tpg-3.2.2-r1
index 37b7d328286c..67c70715a2ea 100644
--- a/metadata/md5-cache/dev-python/tpg-3.2.2-r1
+++ b/metadata/md5-cache/dev-python/tpg-3.2.2-r1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=http://christophe.delord.free.fr/tpg/TPG-3.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9444f3d9b833547d8f5369143db41c1c
diff --git a/metadata/md5-cache/dev-python/tqdm-4.23.3 b/metadata/md5-cache/dev-python/tqdm-4.23.3
index 92deb039a9dc..b52622c0b420 100644
--- a/metadata/md5-cache/dev-python/tqdm-4.23.3
+++ b/metadata/md5-cache/dev-python/tqdm-4.23.3
@@ -10,5 +10,5 @@ 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
 SRC_URI=https://github.com/tqdm/tqdm/archive/v4.23.3.tar.gz -> tqdm-4.23.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fdfb3c9befd5cacaba117fab49984b7a
diff --git a/metadata/md5-cache/dev-python/tqdm-9999 b/metadata/md5-cache/dev-python/tqdm-9999
index 7818bcec52c7..8d6b45daff44 100644
--- a/metadata/md5-cache/dev-python/tqdm-9999
+++ b/metadata/md5-cache/dev-python/tqdm-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=79575c0aa72da304f2a37c16fce30dd6
diff --git a/metadata/md5-cache/dev-python/traceback2-1.4.0 b/metadata/md5-cache/dev-python/traceback2-1.4.0
index 303329c5e339..05d2c60f2e59 100644
--- a/metadata/md5-cache/dev-python/traceback2-1.4.0
+++ b/metadata/md5-cache/dev-python/traceback2-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,p
 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/traceback2/traceback2-1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f8fa7b139aefda4b929f15358929e5a6
diff --git a/metadata/md5-cache/dev-python/tracing-0.10 b/metadata/md5-cache/dev-python/tracing-0.10
index 43eb9c42a942..233422058a6b 100644
--- a/metadata/md5-cache/dev-python/tracing-0.10
+++ b/metadata/md5-cache/dev-python/tracing-0.10
@@ -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=http://git.liw.fi/cgi-bin/cgit/cgit.cgi/python-tracing/snapshot/tracing-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=41d30076f7116616a6a66bae37ce59b2
diff --git a/metadata/md5-cache/dev-python/tracing-0.8 b/metadata/md5-cache/dev-python/tracing-0.8
index 50789329fae9..43903155c291 100644
--- a/metadata/md5-cache/dev-python/tracing-0.8
+++ b/metadata/md5-cache/dev-python/tracing-0.8
@@ -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=http://code.liw.fi/debian/pool/main/p/python-tracing/python-tracing_0.8.orig.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=18f6744093969684a1f72d105c37b509
diff --git a/metadata/md5-cache/dev-python/traitlets-4.3.2 b/metadata/md5-cache/dev-python/traitlets-4.3.2
index 2ee1da92bf94..0976173c27f5 100644
--- a/metadata/md5-cache/dev-python/traitlets-4.3.2
+++ b/metadata/md5-cache/dev-python/traitlets-4.3.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/t/traitlets/traitlets-4.3.2.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-python/traits-4.5.0 b/metadata/md5-cache/dev-python/traits-4.5.0
index c3d389e327ec..4629a73deefe 100644
--- a/metadata/md5-cache/dev-python/traits-4.5.0
+++ b/metadata/md5-cache/dev-python/traits-4.5.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/t/traits/traits-4.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7d274aef31776d3f7c90e5b2928bb108
diff --git a/metadata/md5-cache/dev-python/traits-4.6.0 b/metadata/md5-cache/dev-python/traits-4.6.0
index 6116fa91006a..2f8e925f9563 100644
--- a/metadata/md5-cache/dev-python/traits-4.6.0
+++ b/metadata/md5-cache/dev-python/traits-4.6.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/t/traits/traits-4.6.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=ec445b86a2613a1d1b334315930984d2
diff --git a/metadata/md5-cache/dev-python/traitsui-4.4.0 b/metadata/md5-cache/dev-python/traitsui-4.4.0
index 11f46fbe2c3f..bac0b5496129 100644
--- a/metadata/md5-cache/dev-python/traitsui-4.4.0
+++ b/metadata/md5-cache/dev-python/traitsui-4.4.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyface[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/t/traitsui/traitsui-4.4.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cbd81b2cfbd7092c84c22fb693218596
diff --git a/metadata/md5-cache/dev-python/traitsui-4.5.1 b/metadata/md5-cache/dev-python/traitsui-4.5.1
index ce43296e68fb..f0edfe2aa1d6 100644
--- a/metadata/md5-cache/dev-python/traitsui-4.5.1
+++ b/metadata/md5-cache/dev-python/traitsui-4.5.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyface[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/t/traitsui/traitsui-4.5.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=84a93ec288fe50740c803812d20a5bc8
diff --git a/metadata/md5-cache/dev-python/translate-toolkit-2.0.0 b/metadata/md5-cache/dev-python/translate-toolkit-2.0.0
index 35010fe1b0a7..d0dc337ea777 100644
--- a/metadata/md5-cache/dev-python/translate-toolkit-2.0.0
+++ b/metadata/md5-cache/dev-python/translate-toolkit-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_pyth
 REQUIRED_USE=subtitles? ( || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/translate/translate/archive/2.0.0.tar.gz -> translate-toolkit-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=123f4ab8771406263f862b629320c4e5
diff --git a/metadata/md5-cache/dev-python/translationstring-1.3 b/metadata/md5-cache/dev-python/translationstring-1.3
index 3c3ba91ec9ea..07fd842a05b1 100644
--- a/metadata/md5-cache/dev-python/translationstring-1.3
+++ b/metadata/md5-cache/dev-python/translationstring-1.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/t/translationstring/translationstring-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=403b515a7781881f648b9ec0c565ee4d
diff --git a/metadata/md5-cache/dev-python/transmissionrpc-0.11 b/metadata/md5-cache/dev-python/transmissionrpc-0.11
index 8bc481d9c7af..3745cbc2792a 100644
--- a/metadata/md5-cache/dev-python/transmissionrpc-0.11
+++ b/metadata/md5-cache/dev-python/transmissionrpc-0.11
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/six-1.1.0[python_targets_pypy(-)?,python_targets_python2_7(
 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/t/transmissionrpc/transmissionrpc-0.11.tar.gz https://bitbucket.org/blueluna/transmissionrpc/src/release-0.10/test/data/ubuntu-12.04.2-alternate-amd64.iso.torrent
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0d0dd3bf5c65e57025806ef9df906985
diff --git a/metadata/md5-cache/dev-python/transmissionrpc-9999 b/metadata/md5-cache/dev-python/transmissionrpc-9999
index 54ae3eb485b8..fa4b4abd3051 100644
--- a/metadata/md5-cache/dev-python/transmissionrpc-9999
+++ b/metadata/md5-cache/dev-python/transmissionrpc-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=dev-python/six-1.1.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=73173e1c7f02d6998c161199027cefab
diff --git a/metadata/md5-cache/dev-python/treq-0.2.1 b/metadata/md5-cache/dev-python/treq-0.2.1
index a29cd76dbb11..0a471d76dca6 100644
--- a/metadata/md5-cache/dev-python/treq-0.2.1
+++ b/metadata/md5-cache/dev-python/treq-0.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/t/treq/treq-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f4f1b18808e5addd9f3f3f2848d50a81
diff --git a/metadata/md5-cache/dev-python/treq-16.12.0 b/metadata/md5-cache/dev-python/treq-16.12.0
index c014692efe17..68841784d890 100644
--- a/metadata/md5-cache/dev-python/treq-16.12.0
+++ b/metadata/md5-cache/dev-python/treq-16.12.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/t/treq/treq-16.12.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=df697f35fb9e10b2350504236c4c88b3
diff --git a/metadata/md5-cache/dev-python/treq-17.3.1 b/metadata/md5-cache/dev-python/treq-17.3.1
index 4d3d93232a11..9cffbc9a651b 100644
--- a/metadata/md5-cache/dev-python/treq-17.3.1
+++ b/metadata/md5-cache/dev-python/treq-17.3.1
@@ -10,5 +10,5 @@ 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
 SRC_URI=mirror://pypi/t/treq/treq-17.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=33a37a9ae42e3af0ff2e15f17f5a2cb2
diff --git a/metadata/md5-cache/dev-python/treq-17.8.0 b/metadata/md5-cache/dev-python/treq-17.8.0
index 943a35e86bd6..e0a7fc2029ba 100644
--- a/metadata/md5-cache/dev-python/treq-17.8.0
+++ b/metadata/md5-cache/dev-python/treq-17.8.0
@@ -10,5 +10,5 @@ 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
 SRC_URI=mirror://pypi/t/treq/treq-17.8.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=049fae2ba8a5336dba20f5d7af88fe4b
diff --git a/metadata/md5-cache/dev-python/trollius-2.1 b/metadata/md5-cache/dev-python/trollius-2.1
index 50eeebe27daf..a672333755c6 100644
--- a/metadata/md5-cache/dev-python/trollius-2.1
+++ b/metadata/md5-cache/dev-python/trollius-2.1
@@ -10,5 +10,5 @@ RDEPEND=virtual/python-futures[python_targets_pypy(-)?,python_targets_python2_7(
 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/t/trollius/trollius-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fd68dcc12f7b5d4c862b7ae910574d9c
diff --git a/metadata/md5-cache/dev-python/ttfquery-1.0.5-r1 b/metadata/md5-cache/dev-python/ttfquery-1.0.5-r1
index 518cb061d719..b41f48747ec8 100644
--- a/metadata/md5-cache/dev-python/ttfquery-1.0.5-r1
+++ b/metadata/md5-cache/dev-python/ttfquery-1.0.5-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/fonttools dev-python/numpy python_targets_pypy? ( >=virtual/p
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/T/TTFQuery/TTFQuery-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a9e796bd0a9b4d815939201c4aa771fc
diff --git a/metadata/md5-cache/dev-python/ttystatus-0.22 b/metadata/md5-cache/dev-python/ttystatus-0.22
index 5b6268640a94..7adef9fd4aa7 100644
--- a/metadata/md5-cache/dev-python/ttystatus-0.22
+++ b/metadata/md5-cache/dev-python/ttystatus-0.22
@@ -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=http://code.liw.fi/debian/pool/main/p/python-ttystatus/python-ttystatus_0.22.orig.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=44f938923dc938e3e43a190121a7dfa4
diff --git a/metadata/md5-cache/dev-python/ttystatus-0.23 b/metadata/md5-cache/dev-python/ttystatus-0.23
index d90ec6037c5a..1301894d9ca6 100644
--- a/metadata/md5-cache/dev-python/ttystatus-0.23
+++ b/metadata/md5-cache/dev-python/ttystatus-0.23
@@ -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=http://code.liw.fi/debian/pool/main/p/python-ttystatus/python-ttystatus_0.23.orig.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b784424b0dbf2063e9998fa254b8bd2d
diff --git a/metadata/md5-cache/dev-python/ttystatus-0.32 b/metadata/md5-cache/dev-python/ttystatus-0.32
index 21d2c61a30d8..ddc0d234d033 100644
--- a/metadata/md5-cache/dev-python/ttystatus-0.32
+++ b/metadata/md5-cache/dev-python/ttystatus-0.32
@@ -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=http://git.liw.fi/cgi-bin/cgit/cgit.cgi/ttystatus/snapshot/ttystatus-0.32.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=86527a0626d764378741eb286b229cd7
diff --git a/metadata/md5-cache/dev-python/ttystatus-0.35 b/metadata/md5-cache/dev-python/ttystatus-0.35
index 71590c117942..8c13cf334422 100644
--- a/metadata/md5-cache/dev-python/ttystatus-0.35
+++ b/metadata/md5-cache/dev-python/ttystatus-0.35
@@ -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=http://git.liw.fi/cgi-bin/cgit/cgit.cgi/ttystatus/snapshot/ttystatus-0.35.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=114a5d3350a18bdf380720c3a6a26828
diff --git a/metadata/md5-cache/dev-python/turbocheetah-1.0-r1 b/metadata/md5-cache/dev-python/turbocheetah-1.0-r1
index b2356d07593d..3582e40cfcb2 100644
--- a/metadata/md5-cache/dev-python/turbocheetah-1.0-r1
+++ b/metadata/md5-cache/dev-python/turbocheetah-1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/cheetah-2.0.1[python_targets_python2_7(-)?,-python_single_t
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/T/TurboCheetah/TurboCheetah-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e5b6a35c87ce0b944e9172573af89c5b
diff --git a/metadata/md5-cache/dev-python/turbojson-1.3.2-r1 b/metadata/md5-cache/dev-python/turbojson-1.3.2-r1
index e8f25cae4e31..59adace3b787 100644
--- a/metadata/md5-cache/dev-python/turbojson-1.3.2-r1
+++ b/metadata/md5-cache/dev-python/turbojson-1.3.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/simplejson-1.9.1[python_targets_pypy(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/T/TurboJson/TurboJson-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7b8cde6d33e8107e8c3d33eb1b73eb31
diff --git a/metadata/md5-cache/dev-python/turbokid-1.0.5-r1 b/metadata/md5-cache/dev-python/turbokid-1.0.5-r1
index 89fcd6ffb9b3..478b55169647 100644
--- a/metadata/md5-cache/dev-python/turbokid-1.0.5-r1
+++ b/metadata/md5-cache/dev-python/turbokid-1.0.5-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/kid-0.9.6[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/T/TurboKid/TurboKid-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a8f213fb9f566fa0275bf3d2f12d0554
diff --git a/metadata/md5-cache/dev-python/turbolift-2.1.3 b/metadata/md5-cache/dev-python/turbolift-2.1.3
index 47305fd3042f..7496761c7d29 100644
--- a/metadata/md5-cache/dev-python/turbolift-2.1.3
+++ b/metadata/md5-cache/dev-python/turbolift-2.1.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/t/turbolift/turbolift-2.1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ad459942e9e12ee3ad3f6280a18fc1e4
diff --git a/metadata/md5-cache/dev-python/tvdb_api-1.10_pre20150406-r1 b/metadata/md5-cache/dev-python/tvdb_api-1.10_pre20150406-r1
index de780cf00cab..293527236453 100644
--- a/metadata/md5-cache/dev-python/tvdb_api-1.10_pre20150406-r1
+++ b/metadata/md5-cache/dev-python/tvdb_api-1.10_pre20150406-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/requests-cache[python_targets_python2_7(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~thev00d00/distfiles/dev-python/tvdb_api-1.10_pre20150406.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=66ca122fe2a2af95d48d93287fdb47a3
diff --git a/metadata/md5-cache/dev-python/tvdb_api-1.9 b/metadata/md5-cache/dev-python/tvdb_api-1.9
index aa643ea362bd..fb93a35073cd 100644
--- a/metadata/md5-cache/dev-python/tvdb_api-1.9
+++ b/metadata/md5-cache/dev-python/tvdb_api-1.9
@@ -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/dbr/tvdb_api/tarball/1.9 -> tvdb_api-1.9.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cba58d9aa23b9701bbba11654dc83797
diff --git a/metadata/md5-cache/dev-python/tweepy-2.3 b/metadata/md5-cache/dev-python/tweepy-2.3
index b65a0a667929..14f6c744d656 100644
--- a/metadata/md5-cache/dev-python/tweepy-2.3
+++ b/metadata/md5-cache/dev-python/tweepy-2.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/tweepy/tweepy/tarball/2.3 -> tweepy-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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d3198a8fbdaf1840dcca89161ab27a28
diff --git a/metadata/md5-cache/dev-python/tweepy-3.5.0 b/metadata/md5-cache/dev-python/tweepy-3.5.0
index 02379de33563..1b61de4c2633 100644
--- a/metadata/md5-cache/dev-python/tweepy-3.5.0
+++ b/metadata/md5-cache/dev-python/tweepy-3.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/t/tweepy/tweepy-3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4aaa2f78138144c82f66e6f5c3e5d0d2
diff --git a/metadata/md5-cache/dev-python/twilio-3.6.9 b/metadata/md5-cache/dev-python/twilio-3.6.9
index afca1e5b995e..fda23cd30a00 100644
--- a/metadata/md5-cache/dev-python/twilio-3.6.9
+++ b/metadata/md5-cache/dev-python/twilio-3.6.9
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/twilio/twilio-python/archive/3.6.9.tar.gz -> twilio-3.6.9.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c3441496237f2f0bc375ad9c376d043a
diff --git a/metadata/md5-cache/dev-python/twill-0.9-r1 b/metadata/md5-cache/dev-python/twill-0.9-r1
index 82ed0d9bcfdc..c6221925f63f 100644
--- a/metadata/md5-cache/dev-python/twill-0.9-r1
+++ b/metadata/md5-cache/dev-python/twill-0.9-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://darcs.idyll.org/~t/projects/twill-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e95b9ac2f57aba4083a64bba1336e098
diff --git a/metadata/md5-cache/dev-python/twine-1.11.0 b/metadata/md5-cache/dev-python/twine-1.11.0
index 606429967245..7f2f4a01f83e 100644
--- a/metadata/md5-cache/dev-python/twine-1.11.0
+++ b/metadata/md5-cache/dev-python/twine-1.11.0
@@ -10,5 +10,5 @@ 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
 SRC_URI=https://github.com/pypa/twine/archive/1.11.0.tar.gz -> twine-1.11.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fea6247e0c502ed5d4ce29c6395283de
diff --git a/metadata/md5-cache/dev-python/twisted-16.6.0-r3 b/metadata/md5-cache/dev-python/twisted-16.6.0-r3
index 49256d39b760..d8021bd8a267 100644
--- a/metadata/md5-cache/dev-python/twisted-16.6.0-r3
+++ b/metadata/md5-cache/dev-python/twisted-16.6.0-r3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/incremental-16.10.1[python_targets_python2_7(-)?,python_tar
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://twistedmatrix.com/Releases/Twisted/16.6/Twisted-16.6.0.tar.bz2 https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5ad45921f7920e7ced6e15abac2498fc
diff --git a/metadata/md5-cache/dev-python/twisted-17.1.0-r2 b/metadata/md5-cache/dev-python/twisted-17.1.0-r2
index 7da428b3e27d..8c0c958e55b2 100644
--- a/metadata/md5-cache/dev-python/twisted-17.1.0-r2
+++ b/metadata/md5-cache/dev-python/twisted-17.1.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/incremental-16.10.1[python_targets_python2_7(-)?,python_tar
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://twistedmatrix.com/Releases/Twisted/17.1/Twisted-17.1.0.tar.bz2 https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e6130ce17c72d6ac3629ec8278da1417
diff --git a/metadata/md5-cache/dev-python/twisted-17.9.0 b/metadata/md5-cache/dev-python/twisted-17.9.0
index 297e1cd56d2b..bc3dfd7c1469 100644
--- a/metadata/md5-cache/dev-python/twisted-17.9.0
+++ b/metadata/md5-cache/dev-python/twisted-17.9.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/incremental-16.10.1[python_targets_python2_7(-)?,python_tar
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://twistedmatrix.com/Releases/Twisted/17.9/Twisted-17.9.0.tar.bz2 https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=96418346492337025ad6e539cecf54ac
diff --git a/metadata/md5-cache/dev-python/twisted-conch-13.2.0 b/metadata/md5-cache/dev-python/twisted-conch-13.2.0
index 7f6123d0f0c1..4c1b27d4c315 100644
--- a/metadata/md5-cache/dev-python/twisted-conch-13.2.0
+++ b/metadata/md5-cache/dev-python/twisted-conch-13.2.0
@@ -10,5 +10,5 @@ RDEPEND==dev-python/twisted-core-13.2*[python_targets_python2_7(-)?,-python_sing
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://twistedmatrix.com/Releases/Conch/13.2/TwistedConch-13.2.0.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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e116b7eb53591618a4616314ba3dfd3c
diff --git a/metadata/md5-cache/dev-python/twisted-conch-15.2.1 b/metadata/md5-cache/dev-python/twisted-conch-15.2.1
index e20d7046dbcb..9433e38b650f 100644
--- a/metadata/md5-cache/dev-python/twisted-conch-15.2.1
+++ b/metadata/md5-cache/dev-python/twisted-conch-15.2.1
@@ -10,5 +10,5 @@ RDEPEND==dev-python/twisted-core-15.2*[python_targets_python2_7(-)?,-python_sing
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://twistedmatrix.com/Releases/Conch/15.2/TwistedConch-15.2.1.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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c148f302307cc52456e9066ca7666f20
diff --git a/metadata/md5-cache/dev-python/twisted-core-13.2.0 b/metadata/md5-cache/dev-python/twisted-core-13.2.0
index e383dbc5a7cc..d4b55489c292 100644
--- a/metadata/md5-cache/dev-python/twisted-core-13.2.0
+++ b/metadata/md5-cache/dev-python/twisted-core-13.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/zope-interface-3.6.0[python_targets_python2_7(-)?,-python_s
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://twistedmatrix.com/Releases/Core/13.2/TwistedCore-13.2.0.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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a74956e7ca59b536e30b959b10310879
diff --git a/metadata/md5-cache/dev-python/twisted-core-15.2.1 b/metadata/md5-cache/dev-python/twisted-core-15.2.1
index d185afb76900..af07a6510c80 100644
--- a/metadata/md5-cache/dev-python/twisted-core-15.2.1
+++ b/metadata/md5-cache/dev-python/twisted-core-15.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/zope-interface-3.6.0[python_targets_python2_7(-)?,-python_s
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://twistedmatrix.com/Releases/Core/15.2/TwistedCore-15.2.1.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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=15c78a0cd3ff619d3be42ee115ea8bb3
diff --git a/metadata/md5-cache/dev-python/twisted-lore-13.2.0 b/metadata/md5-cache/dev-python/twisted-lore-13.2.0
index 1a23079dc1dd..8d79efea8a07 100644
--- a/metadata/md5-cache/dev-python/twisted-lore-13.2.0
+++ b/metadata/md5-cache/dev-python/twisted-lore-13.2.0
@@ -10,5 +10,5 @@ RDEPEND==dev-python/twisted-core-13.2*[python_targets_python2_7(-)?,-python_sing
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://twistedmatrix.com/Releases/Lore/13.2/TwistedLore-13.2.0.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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=717b7f550a8994f5b103003813a9596b
diff --git a/metadata/md5-cache/dev-python/twisted-lore-15.2.1 b/metadata/md5-cache/dev-python/twisted-lore-15.2.1
index 6e5244559898..2019af952350 100644
--- a/metadata/md5-cache/dev-python/twisted-lore-15.2.1
+++ b/metadata/md5-cache/dev-python/twisted-lore-15.2.1
@@ -10,5 +10,5 @@ RDEPEND==dev-python/twisted-core-15.2*[python_targets_python2_7(-)?,-python_sing
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://twistedmatrix.com/Releases/Lore/15.2/TwistedLore-15.2.1.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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=da80d9bbd0ff7f3872cda9ae3127a35e
diff --git a/metadata/md5-cache/dev-python/twisted-mail-13.2.0 b/metadata/md5-cache/dev-python/twisted-mail-13.2.0
index adf7cfc8edf8..8078a5d9ef7f 100644
--- a/metadata/md5-cache/dev-python/twisted-mail-13.2.0
+++ b/metadata/md5-cache/dev-python/twisted-mail-13.2.0
@@ -10,5 +10,5 @@ RDEPEND==dev-python/twisted-core-13.2*[python_targets_python2_7(-)?,-python_sing
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://twistedmatrix.com/Releases/Mail/13.2/TwistedMail-13.2.0.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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3528c14356d151d77722d981f7b0ca20
diff --git a/metadata/md5-cache/dev-python/twisted-mail-15.2.1 b/metadata/md5-cache/dev-python/twisted-mail-15.2.1
index 450a57b93780..ad676773cf5c 100644
--- a/metadata/md5-cache/dev-python/twisted-mail-15.2.1
+++ b/metadata/md5-cache/dev-python/twisted-mail-15.2.1
@@ -10,5 +10,5 @@ RDEPEND==dev-python/twisted-core-15.2*[python_targets_python2_7(-)?,-python_sing
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://twistedmatrix.com/Releases/Mail/15.2/TwistedMail-15.2.1.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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=af37c285b096bf6d1a3840d6ec0b85be
diff --git a/metadata/md5-cache/dev-python/twisted-names-13.2.0 b/metadata/md5-cache/dev-python/twisted-names-13.2.0
index 5ebe59ac60c8..e7fecf0dcd2b 100644
--- a/metadata/md5-cache/dev-python/twisted-names-13.2.0
+++ b/metadata/md5-cache/dev-python/twisted-names-13.2.0
@@ -10,5 +10,5 @@ RDEPEND==dev-python/twisted-core-13.2*[python_targets_python2_7(-)?,-python_sing
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://twistedmatrix.com/Releases/Names/13.2/TwistedNames-13.2.0.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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=96629c78f1b6137402f1a7378f43b00c
diff --git a/metadata/md5-cache/dev-python/twisted-names-15.2.1 b/metadata/md5-cache/dev-python/twisted-names-15.2.1
index c22f42c2baff..0a725cd5d83e 100644
--- a/metadata/md5-cache/dev-python/twisted-names-15.2.1
+++ b/metadata/md5-cache/dev-python/twisted-names-15.2.1
@@ -10,5 +10,5 @@ RDEPEND==dev-python/twisted-core-15.2*[python_targets_python2_7(-)?,-python_sing
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://twistedmatrix.com/Releases/Names/15.2/TwistedNames-15.2.1.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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=84cab6c71128beea64950c484727bc46
diff --git a/metadata/md5-cache/dev-python/twisted-news-13.2.0 b/metadata/md5-cache/dev-python/twisted-news-13.2.0
index 46e478122d7e..ede12c7c69c4 100644
--- a/metadata/md5-cache/dev-python/twisted-news-13.2.0
+++ b/metadata/md5-cache/dev-python/twisted-news-13.2.0
@@ -10,5 +10,5 @@ RDEPEND==dev-python/twisted-core-13.2*[python_targets_python2_7(-)?,-python_sing
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://twistedmatrix.com/Releases/News/13.2/TwistedNews-13.2.0.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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=859101ac7a3acdbc1bbdeca1e0d1aa7b
diff --git a/metadata/md5-cache/dev-python/twisted-news-15.2.1 b/metadata/md5-cache/dev-python/twisted-news-15.2.1
index dbe136193407..b5a96d4a7205 100644
--- a/metadata/md5-cache/dev-python/twisted-news-15.2.1
+++ b/metadata/md5-cache/dev-python/twisted-news-15.2.1
@@ -10,5 +10,5 @@ RDEPEND==dev-python/twisted-core-15.2*[python_targets_python2_7(-)?,-python_sing
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://twistedmatrix.com/Releases/News/15.2/TwistedNews-15.2.1.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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ee32fbc05aa68bbec8bfa064583a1c79
diff --git a/metadata/md5-cache/dev-python/twisted-pair-13.2.0 b/metadata/md5-cache/dev-python/twisted-pair-13.2.0
index 7c65f5c34c59..485000fb8eea 100644
--- a/metadata/md5-cache/dev-python/twisted-pair-13.2.0
+++ b/metadata/md5-cache/dev-python/twisted-pair-13.2.0
@@ -10,5 +10,5 @@ RDEPEND==dev-python/twisted-core-13.2*[python_targets_python2_7(-)?,-python_sing
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://twistedmatrix.com/Releases/Pair/13.2/TwistedPair-13.2.0.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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4d5b1e131caac692c35c31ada1bcd0a6
diff --git a/metadata/md5-cache/dev-python/twisted-pair-15.2.1 b/metadata/md5-cache/dev-python/twisted-pair-15.2.1
index 0390dc0dcfd6..9fb60ab026c4 100644
--- a/metadata/md5-cache/dev-python/twisted-pair-15.2.1
+++ b/metadata/md5-cache/dev-python/twisted-pair-15.2.1
@@ -10,5 +10,5 @@ RDEPEND==dev-python/twisted-core-15.2*[python_targets_python2_7(-)?,-python_sing
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://twistedmatrix.com/Releases/Pair/15.2/TwistedPair-15.2.1.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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1b0988acd1dd54c9ba453f48a12ccab3
diff --git a/metadata/md5-cache/dev-python/twisted-runner-13.2.0 b/metadata/md5-cache/dev-python/twisted-runner-13.2.0
index eda231201218..8d58e491b8d3 100644
--- a/metadata/md5-cache/dev-python/twisted-runner-13.2.0
+++ b/metadata/md5-cache/dev-python/twisted-runner-13.2.0
@@ -10,5 +10,5 @@ RDEPEND==dev-python/twisted-core-13.2*[python_targets_python2_7(-)?,-python_sing
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://twistedmatrix.com/Releases/Runner/13.2/TwistedRunner-13.2.0.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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8657ca5bbee872dc87f8d3172ca93064
diff --git a/metadata/md5-cache/dev-python/twisted-runner-15.2.1 b/metadata/md5-cache/dev-python/twisted-runner-15.2.1
index ec2dc34cecd5..54aa459d6b8f 100644
--- a/metadata/md5-cache/dev-python/twisted-runner-15.2.1
+++ b/metadata/md5-cache/dev-python/twisted-runner-15.2.1
@@ -10,5 +10,5 @@ RDEPEND==dev-python/twisted-core-15.2*[python_targets_python2_7(-)?,-python_sing
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://twistedmatrix.com/Releases/Runner/15.2/TwistedRunner-15.2.1.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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=208b6fcf089d8b882c9541fd3e68f29f
diff --git a/metadata/md5-cache/dev-python/twisted-web-13.2.0 b/metadata/md5-cache/dev-python/twisted-web-13.2.0
index 012b0a0590da..17dbbb86f250 100644
--- a/metadata/md5-cache/dev-python/twisted-web-13.2.0
+++ b/metadata/md5-cache/dev-python/twisted-web-13.2.0
@@ -10,5 +10,5 @@ RDEPEND==dev-python/twisted-core-13.2*[python_targets_python2_7(-)?,-python_sing
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://twistedmatrix.com/Releases/Web/13.2/TwistedWeb-13.2.0.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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=996e44a1f8275163732f1759eca819d9
diff --git a/metadata/md5-cache/dev-python/twisted-web-15.2.1 b/metadata/md5-cache/dev-python/twisted-web-15.2.1
index cb2d428cc176..b9a14ce239b7 100644
--- a/metadata/md5-cache/dev-python/twisted-web-15.2.1
+++ b/metadata/md5-cache/dev-python/twisted-web-15.2.1
@@ -10,5 +10,5 @@ RDEPEND==dev-python/twisted-core-15.2*[python_targets_python2_7(-)?,-python_sing
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://twistedmatrix.com/Releases/Web/15.2/TwistedWeb-15.2.1.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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9f80c8c267a46382adc8c9d14a7a11a2
diff --git a/metadata/md5-cache/dev-python/twisted-words-13.2.0 b/metadata/md5-cache/dev-python/twisted-words-13.2.0
index acf4ea3797d1..bca6f92d5b38 100644
--- a/metadata/md5-cache/dev-python/twisted-words-13.2.0
+++ b/metadata/md5-cache/dev-python/twisted-words-13.2.0
@@ -10,5 +10,5 @@ RDEPEND==dev-python/twisted-core-13.2*[python_targets_python2_7(-)?,-python_sing
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://twistedmatrix.com/Releases/Words/13.2/TwistedWords-13.2.0.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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=92b8dda3e04905806a8adac2c38d8124
diff --git a/metadata/md5-cache/dev-python/twisted-words-15.2.1 b/metadata/md5-cache/dev-python/twisted-words-15.2.1
index 24b9f4750f0c..ea3130875f5c 100644
--- a/metadata/md5-cache/dev-python/twisted-words-15.2.1
+++ b/metadata/md5-cache/dev-python/twisted-words-15.2.1
@@ -10,5 +10,5 @@ RDEPEND==dev-python/twisted-core-15.2*[python_targets_python2_7(-)?,-python_sing
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://twistedmatrix.com/Releases/Words/15.2/TwistedWords-15.2.1.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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a988bf828cc329d0221019396f55b6b1
diff --git a/metadata/md5-cache/dev-python/twitter-1.17.1 b/metadata/md5-cache/dev-python/twitter-1.17.1
index cc0670ee218f..dbd8b0fd937b 100644
--- a/metadata/md5-cache/dev-python/twitter-1.17.1
+++ b/metadata/md5-cache/dev-python/twitter-1.17.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/t/twitter/twitter-1.17.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=40a9cb16501d9f01c33958c6e15c1f54
diff --git a/metadata/md5-cache/dev-python/twython-3.3.0 b/metadata/md5-cache/dev-python/twython-3.3.0
index b76a0e62fa79..4204b1c7994a 100644
--- a/metadata/md5-cache/dev-python/twython-3.3.0
+++ b/metadata/md5-cache/dev-python/twython-3.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/requests-2.1.0[python_targets_python2_7(-)?,python_targets_
 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/twython/twython-3.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5cbde26da77c82b2bb55f5c4e87ef2dd
diff --git a/metadata/md5-cache/dev-python/twython-3.6.0 b/metadata/md5-cache/dev-python/twython-3.6.0
index 177f9473b1f0..b15992b1baf9 100644
--- a/metadata/md5-cache/dev-python/twython-3.6.0
+++ b/metadata/md5-cache/dev-python/twython-3.6.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/requests-2.1.0[python_targets_python2_7(-)?,python_targets_
 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/twython/twython-3.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=882bf8329628fe9f3cf09f0c80be5ad2
diff --git a/metadata/md5-cache/dev-python/txAMQP-0.6.2 b/metadata/md5-cache/dev-python/txAMQP-0.6.2
index 8f98b4b5622c..3746f22d6562 100644
--- a/metadata/md5-cache/dev-python/txAMQP-0.6.2
+++ b/metadata/md5-cache/dev-python/txAMQP-0.6.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/t/txAMQP/txAMQP-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d6311e7a0949862ad83012b739a9238d
diff --git a/metadata/md5-cache/dev-python/txAMQP-0.7.0 b/metadata/md5-cache/dev-python/txAMQP-0.7.0
index 895331bae5a9..2aad13c24936 100644
--- a/metadata/md5-cache/dev-python/txAMQP-0.7.0
+++ b/metadata/md5-cache/dev-python/txAMQP-0.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/txamqp/txamqp/archive/0.7.0.tar.gz -> txamqp-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0146746dae87e0c4d3dbf153d081cab0
diff --git a/metadata/md5-cache/dev-python/txaio-2.7.1 b/metadata/md5-cache/dev-python/txaio-2.7.1
index 2fe296c71cf8..02c06d03b714 100644
--- a/metadata/md5-cache/dev-python/txaio-2.7.1
+++ b/metadata/md5-cache/dev-python/txaio-2.7.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-python/trollius-2.0[python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-python/txaio-2.8.2 b/metadata/md5-cache/dev-python/txaio-2.8.2
index 5f0075395993..a45531974e6d 100644
--- a/metadata/md5-cache/dev-python/txaio-2.8.2
+++ b/metadata/md5-cache/dev-python/txaio-2.8.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-python/trollius-2.0[python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=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	89bb9f083a2590d9b447fd0b78a96186
+_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 7e6b3651ebb1..0bbcdf3437fb 100644
--- a/metadata/md5-cache/dev-python/txaio-2.9.0
+++ b/metadata/md5-cache/dev-python/txaio-2.9.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-python/trollius-2.0[python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-python/txgithub-15.0.0-r1 b/metadata/md5-cache/dev-python/txgithub-15.0.0-r1
index b4015573004b..7aeaa75240b3 100644
--- a/metadata/md5-cache/dev-python/txgithub-15.0.0-r1
+++ b/metadata/md5-cache/dev-python/txgithub-15.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=|| ( >=dev-python/twisted-16.0.0[python_targets_python2_7(-)?,python_tar
 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/tomprince/txgithub/archive/15.0.0.tar.gz -> txgithub-15.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4c6b6fbe174d6688bbab64d7d2004d60
diff --git a/metadata/md5-cache/dev-python/txrequests-0.9.5-r1 b/metadata/md5-cache/dev-python/txrequests-0.9.5-r1
index 6613d82c95ad..fd4f0c49c941 100644
--- a/metadata/md5-cache/dev-python/txrequests-0.9.5-r1
+++ b/metadata/md5-cache/dev-python/txrequests-0.9.5-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/requests-1.2.0[python_targets_python2_7(-)?,python_targets_
 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/txrequests/txrequests-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8a5154b10a3d82ca52a86a5f0a672b18
diff --git a/metadata/md5-cache/dev-python/txsocksx-1.15.0.2 b/metadata/md5-cache/dev-python/txsocksx-1.15.0.2
index 729e6ce6f26b..aa1e14fc85de 100644
--- a/metadata/md5-cache/dev-python/txsocksx-1.15.0.2
+++ b/metadata/md5-cache/dev-python/txsocksx-1.15.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/parsley-1.2[python_targets_python2_7(-)?,-python_single_tar
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/t/txsocksx/txsocksx-1.15.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=377e67ad0d5002543f5d6baaffa20235
diff --git a/metadata/md5-cache/dev-python/txtorcon-0.19.3-r1 b/metadata/md5-cache/dev-python/txtorcon-0.19.3-r1
index a65716dc8c83..41f23beb16d4 100644
--- a/metadata/md5-cache/dev-python/txtorcon-0.19.3-r1
+++ b/metadata/md5-cache/dev-python/txtorcon-0.19.3-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/automat[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/t/txtorcon/txtorcon-0.19.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6b36c78210bd42e89f42d00b28d6e120
diff --git a/metadata/md5-cache/dev-python/typed-ast-1.1.0 b/metadata/md5-cache/dev-python/typed-ast-1.1.0
index 9f8d1aac3da5..ddfc932c2d4e 100644
--- a/metadata/md5-cache/dev-python/typed-ast-1.1.0
+++ b/metadata/md5-cache/dev-python/typed-ast-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/t/typed-ast/typed-ast-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=04fa116d6c941ded9d5b6d23ce6247e3
diff --git a/metadata/md5-cache/dev-python/typing-3.6.2-r1 b/metadata/md5-cache/dev-python/typing-3.6.2-r1
index 31726da40931..3db83d877559 100644
--- a/metadata/md5-cache/dev-python/typing-3.6.2-r1
+++ b/metadata/md5-cache/dev-python/typing-3.6.2-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/t/typing/typing-3.6.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3c1c18cde7d3540dca5b4083b7bb77cd
diff --git a/metadata/md5-cache/dev-python/typing-3.6.4-r1 b/metadata/md5-cache/dev-python/typing-3.6.4-r1
index f6ee4a8db8d6..5eb3451bdc40 100644
--- a/metadata/md5-cache/dev-python/typing-3.6.4-r1
+++ b/metadata/md5-cache/dev-python/typing-3.6.4-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/t/typing/typing-3.6.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=78427b1e6f8207f2c9b5a42a1c3cb814
diff --git a/metadata/md5-cache/dev-python/tzlocal-1.2 b/metadata/md5-cache/dev-python/tzlocal-1.2
index ebd3fa48500b..622d9a891938 100644
--- a/metadata/md5-cache/dev-python/tzlocal-1.2
+++ b/metadata/md5-cache/dev-python/tzlocal-1.2
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/t/tzlocal/tzlocal-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3a001b3ca04783b228835ae1b6e898a1
diff --git a/metadata/md5-cache/dev-python/u-msgpack-2.4.1 b/metadata/md5-cache/dev-python/u-msgpack-2.4.1
index 63dc3915ba3f..9778fe65260e 100644
--- a/metadata/md5-cache/dev-python/u-msgpack-2.4.1
+++ b/metadata/md5-cache/dev-python/u-msgpack-2.4.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/u/u-msgpack-python/u-msgpack-python-2.4.1.tar.gz -> u-msgpack-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d3fb0b7d10b051568aa3dbc5ce560507
diff --git a/metadata/md5-cache/dev-python/uhashring-1.0 b/metadata/md5-cache/dev-python/uhashring-1.0
index 035fd6eef9a1..d8ea09e276c2 100644
--- a/metadata/md5-cache/dev-python/uhashring-1.0
+++ b/metadata/md5-cache/dev-python/uhashring-1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/u/uhashring/uhashring-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9ed1ac3ac955dd0da627fc0f0f178ab1
diff --git a/metadata/md5-cache/dev-python/ujson-1.33 b/metadata/md5-cache/dev-python/ujson-1.33
index 8563fc56236b..5605d9960c81 100644
--- a/metadata/md5-cache/dev-python/ujson-1.33
+++ b/metadata/md5-cache/dev-python/ujson-1.33
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/u/ujson/ujson-1.33.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2d9aaeeb5699846d264d97fe0c36fc9c
diff --git a/metadata/md5-cache/dev-python/ujson-1.35 b/metadata/md5-cache/dev-python/ujson-1.35
index 7dfa9e2f1393..d61ef7c6b7f5 100644
--- a/metadata/md5-cache/dev-python/ujson-1.35
+++ b/metadata/md5-cache/dev-python/ujson-1.35
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/ujson/ujson-1.35.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1c79bc5272ee59d22257a06acf087882
diff --git a/metadata/md5-cache/dev-python/uncertainties-3.0.1 b/metadata/md5-cache/dev-python/uncertainties-3.0.1
index 54558da75fb4..5afee38231e4 100644
--- a/metadata/md5-cache/dev-python/uncertainties-3.0.1
+++ b/metadata/md5-cache/dev-python/uncertainties-3.0.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/u/uncertainties/uncertainties-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c7243ecf8e1c9ff050a59af73eb6eaf3
diff --git a/metadata/md5-cache/dev-python/uncompyle6-2.10.1 b/metadata/md5-cache/dev-python/uncompyle6-2.10.1
index e82da69e038a..42053fcd8c79 100644
--- a/metadata/md5-cache/dev-python/uncompyle6-2.10.1
+++ b/metadata/md5-cache/dev-python/uncompyle6-2.10.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/xdis-3.3.1 <dev-python/xdis-3.4.0 >=dev-python/spark-parser
 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/u/uncompyle6/uncompyle6-2.10.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6e95320f91611c91a0bc6bea9151b8a4
diff --git a/metadata/md5-cache/dev-python/unicodecsv-0.14.1 b/metadata/md5-cache/dev-python/unicodecsv-0.14.1
index a55ede6af448..6f01cd841608 100644
--- a/metadata/md5-cache/dev-python/unicodecsv-0.14.1
+++ b/metadata/md5-cache/dev-python/unicodecsv-0.14.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/u/unicodecsv/unicodecsv-0.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c2d4f96bf808da0334e8dc9019d8159b
diff --git a/metadata/md5-cache/dev-python/unidecode-0.04.20 b/metadata/md5-cache/dev-python/unidecode-0.04.20
index c81cab3cb509..fad374b8b13b 100644
--- a/metadata/md5-cache/dev-python/unidecode-0.04.20
+++ b/metadata/md5-cache/dev-python/unidecode-0.04.20
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/U/Unidecode/Unidecode-0.04.20.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=04078a5266de05d1a5220399d7a62e76
diff --git a/metadata/md5-cache/dev-python/unidecode-0.04.21 b/metadata/md5-cache/dev-python/unidecode-0.04.21
index 449d489795b6..116452a6f945 100644
--- a/metadata/md5-cache/dev-python/unidecode-0.04.21
+++ b/metadata/md5-cache/dev-python/unidecode-0.04.21
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/U/Unidecode/Unidecode-0.04.21.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ab459a039ac13829d6a723f59d38bc27
diff --git a/metadata/md5-cache/dev-python/unittest-mixins-1.3 b/metadata/md5-cache/dev-python/unittest-mixins-1.3
index 18dd4135fcd8..6004be9bc0bc 100644
--- a/metadata/md5-cache/dev-python/unittest-mixins-1.3
+++ b/metadata/md5-cache/dev-python/unittest-mixins-1.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/six-1.10.0[python_targets_pypy(-)?,python_targets_python2_7
 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/nedbat/unittest-mixins/archive/v1.3.tar.gz -> unittest-mixins-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=406035bad4cb9213b69aa4c8dac70b48
diff --git a/metadata/md5-cache/dev-python/unittest2-1.1.0 b/metadata/md5-cache/dev-python/unittest2-1.1.0
index 369da403849b..ce4e056f8344 100644
--- a/metadata/md5-cache/dev-python/unittest2-1.1.0
+++ b/metadata/md5-cache/dev-python/unittest2-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,p
 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/u/unittest2/unittest2-1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4b679e91729a1b4d71c734ac90cd7daa
diff --git a/metadata/md5-cache/dev-python/uranium-3.3.0 b/metadata/md5-cache/dev-python/uranium-3.3.0
index 6a97d10f2f1d..5501cd1c0d2b 100644
--- a/metadata/md5-cache/dev-python/uranium-3.3.0
+++ b/metadata/md5-cache/dev-python/uranium-3.3.0
@@ -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=0
 SRC_URI=https://github.com/Ultimaker/Uranium/archive/3.3.0.tar.gz -> uranium-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=326ee1502122c7f8124e3be2512feb56
diff --git a/metadata/md5-cache/dev-python/uranium-3.4.1 b/metadata/md5-cache/dev-python/uranium-3.4.1
index cdd1c6ef9a11..8ba191c31c56 100644
--- a/metadata/md5-cache/dev-python/uranium-3.4.1
+++ b/metadata/md5-cache/dev-python/uranium-3.4.1
@@ -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=0
 SRC_URI=https://github.com/Ultimaker/Uranium/archive/3.4.1.tar.gz -> uranium-3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=326ee1502122c7f8124e3be2512feb56
diff --git a/metadata/md5-cache/dev-python/urdf_parser_py-0.3.3 b/metadata/md5-cache/dev-python/urdf_parser_py-0.3.3
index 63945b2cfc18..0a538117005a 100644
--- a/metadata/md5-cache/dev-python/urdf_parser_py-0.3.3
+++ b/metadata/md5-cache/dev-python/urdf_parser_py-0.3.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/ros/urdf_parser_py/archive/0.3.3.tar.gz -> urdf_parser_py-0.3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=25511a05d6ffc8eb9d7975188874be7d
diff --git a/metadata/md5-cache/dev-python/urdf_parser_py-0.4.0 b/metadata/md5-cache/dev-python/urdf_parser_py-0.4.0
index a3b0c00117fa..cf39ebfe87bf 100644
--- a/metadata/md5-cache/dev-python/urdf_parser_py-0.4.0
+++ b/metadata/md5-cache/dev-python/urdf_parser_py-0.4.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/urdf_parser_py/archive/0.4.0.tar.gz -> urdf_parser_py-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b17a187b75fe5afbcc92920f6fdca1d4
diff --git a/metadata/md5-cache/dev-python/uritemplate-0.6 b/metadata/md5-cache/dev-python/uritemplate-0.6
index e918048371fb..bd00b977fff7 100644
--- a/metadata/md5-cache/dev-python/uritemplate-0.6
+++ b/metadata/md5-cache/dev-python/uritemplate-0.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/simplejson[python_targets_pypy(-)?,python_targets_pypy3(-)?,p
 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/u/uritemplate/uritemplate-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=491a8d6e3d282469e95537dc9d039537
diff --git a/metadata/md5-cache/dev-python/uritemplate-3.0.0 b/metadata/md5-cache/dev-python/uritemplate-3.0.0
index b3fd8ca92c44..7b743653e324 100644
--- a/metadata/md5-cache/dev-python/uritemplate-3.0.0
+++ b/metadata/md5-cache/dev-python/uritemplate-3.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/simplejson[python_targets_pypy(-)?,python_targets_pypy3(-)?,p
 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/u/uritemplate/uritemplate-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fd026e8448dd45ba086a123fe35ba6a9
diff --git a/metadata/md5-cache/dev-python/urlgrabber-3.10.1 b/metadata/md5-cache/dev-python/urlgrabber-3.10.1
index 5e8f9a7d357d..cea5920d3d38 100644
--- a/metadata/md5-cache/dev-python/urlgrabber-3.10.1
+++ b/metadata/md5-cache/dev-python/urlgrabber-3.10.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://urlgrabber.baseurl.org/download/urlgrabber-3.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0cb8ba547089c687946dbca2cd143c0f
diff --git a/metadata/md5-cache/dev-python/urlgrabber-3.9.1-r2 b/metadata/md5-cache/dev-python/urlgrabber-3.9.1-r2
index 33b4aed56530..4e79eeb1a535 100644
--- a/metadata/md5-cache/dev-python/urlgrabber-3.9.1-r2
+++ b/metadata/md5-cache/dev-python/urlgrabber-3.9.1-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://urlgrabber.baseurl.org/download/urlgrabber-3.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0f0d4d3f0a3a8c6b74652befb03498d4
diff --git a/metadata/md5-cache/dev-python/urllib3-1.22 b/metadata/md5-cache/dev-python/urllib3-1.22
index dccd2fb62f55..5e90a5a00b3b 100644
--- a/metadata/md5-cache/dev-python/urllib3-1.22
+++ b/metadata/md5-cache/dev-python/urllib3-1.22
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/u/urllib3/urllib3-1.22.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1181566d6e7489fd6e984f73a33db474
diff --git a/metadata/md5-cache/dev-python/urllib3-1.23 b/metadata/md5-cache/dev-python/urllib3-1.23
index 311796e6be37..e2116bd24c98 100644
--- a/metadata/md5-cache/dev-python/urllib3-1.23
+++ b/metadata/md5-cache/dev-python/urllib3-1.23
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/PySocks-1.5.6[python_targets_pypy(-)?,python_targets_pypy3(
 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/u/urllib3/urllib3-1.23.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5294023a4c26b0a01542ab7a6e6723bc
diff --git a/metadata/md5-cache/dev-python/urwid-1.3.1 b/metadata/md5-cache/dev-python/urwid-1.3.1
index 69b9cb7d9cfa..974ff3a0387e 100644
--- a/metadata/md5-cache/dev-python/urwid-1.3.1
+++ b/metadata/md5-cache/dev-python/urwid-1.3.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) py
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/u/urwid/urwid-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e7c5c20da22fd0ebfd0e7295a91ca631
diff --git a/metadata/md5-cache/dev-python/urwid-2.0.1 b/metadata/md5-cache/dev-python/urwid-2.0.1
index 0ed38ff5d850..fba2160bebd8 100644
--- a/metadata/md5-cache/dev-python/urwid-2.0.1
+++ b/metadata/md5-cache/dev-python/urwid-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) py
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/u/urwid/urwid-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3a1ccb45298f497ab96ce80ca14b4ea9
diff --git a/metadata/md5-cache/dev-python/urwidtrees-1.0.2 b/metadata/md5-cache/dev-python/urwidtrees-1.0.2
index 9d18944d2bc1..4ba6dcd11353 100644
--- a/metadata/md5-cache/dev-python/urwidtrees-1.0.2
+++ b/metadata/md5-cache/dev-python/urwidtrees-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/urwid-1.1.0[python_targets_python2_7(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/pazz/urwidtrees/archive/1.0.2.tar.gz -> urwidtrees-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=646ec1b6e6fd124b37f44a7509ab54ce
diff --git a/metadata/md5-cache/dev-python/ushlex-0.99.1 b/metadata/md5-cache/dev-python/ushlex-0.99.1
index 5d961b6dabe1..44cee03d5d8c 100644
--- a/metadata/md5-cache/dev-python/ushlex-0.99.1
+++ b/metadata/md5-cache/dev-python/ushlex-0.99.1
@@ -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=mirror://pypi/u/ushlex/ushlex-0.99.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=258d326edc9e1dc79a86c34c22384c05
diff --git a/metadata/md5-cache/dev-python/utidylib-0.2-r2 b/metadata/md5-cache/dev-python/utidylib-0.2-r2
index 06c4aacdf1f0..0071a96b32f1 100644
--- a/metadata/md5-cache/dev-python/utidylib-0.2-r2
+++ b/metadata/md5-cache/dev-python/utidylib-0.2-r2
@@ -10,5 +10,5 @@ RDEPEND=app-text/htmltidy python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gentoo/uTidylib-0.2.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=706561ba605ca7b1ba2f862c28c174b2
diff --git a/metadata/md5-cache/dev-python/utidylib-0.3 b/metadata/md5-cache/dev-python/utidylib-0.3
index e6efbe0fb4e3..9cddd64a1e9b 100644
--- a/metadata/md5-cache/dev-python/utidylib-0.3
+++ b/metadata/md5-cache/dev-python/utidylib-0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dl.cihar.com/utidylib/uTidylib-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=97cb3213a33c86250fd1177d0b8832b0
diff --git a/metadata/md5-cache/dev-python/utidylib-0.3-r1 b/metadata/md5-cache/dev-python/utidylib-0.3-r1
index 268f507964bd..d69320be4eb2 100644
--- a/metadata/md5-cache/dev-python/utidylib-0.3-r1
+++ b/metadata/md5-cache/dev-python/utidylib-0.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dl.cihar.com/utidylib/uTidylib-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5a5a4f93e2b4dbd4bf9218b85e834bbb
diff --git a/metadata/md5-cache/dev-python/utidylib-0.3-r2 b/metadata/md5-cache/dev-python/utidylib-0.3-r2
index 916a9a45d8cd..aae2ea9980f6 100644
--- a/metadata/md5-cache/dev-python/utidylib-0.3-r2
+++ b/metadata/md5-cache/dev-python/utidylib-0.3-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dl.cihar.com/utidylib/uTidylib-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d9d2a4832ea863b148fc3c812196a3bf
diff --git a/metadata/md5-cache/dev-python/utmp-0.4 b/metadata/md5-cache/dev-python/utmp-0.4
index dd5120b1a782..1a70ea07b17f 100644
--- a/metadata/md5-cache/dev-python/utmp-0.4
+++ b/metadata/md5-cache/dev-python/utmp-0.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python3_4(-)?,python_targets_python3_5(-)?
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/u/utmp/utmp-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e0f260723b721b7cc9ce3207f2e9af60
diff --git a/metadata/md5-cache/dev-python/uvloop-0.8.1 b/metadata/md5-cache/dev-python/uvloop-0.8.1
index 8184f44c6ab0..0aecafeffc64 100644
--- a/metadata/md5-cache/dev-python/uvloop-0.8.1
+++ b/metadata/md5-cache/dev-python/uvloop-0.8.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libuv-1.11.0:= python_targets_python3_5? ( dev-lang/python:3.
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/u/uvloop/uvloop-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6e205ac5dcfc61dc4aca6ccc885cbc46
diff --git a/metadata/md5-cache/dev-python/vatnumber-1.1-r1 b/metadata/md5-cache/dev-python/vatnumber-1.1-r1
index 1b49c13562f2..285d645aaf84 100644
--- a/metadata/md5-cache/dev-python/vatnumber-1.1-r1
+++ b/metadata/md5-cache/dev-python/vatnumber-1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=vies? ( dev-python/suds[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/v/vatnumber/vatnumber-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c71a50517ba1c4c1f5ddcdfd6e589723
diff --git a/metadata/md5-cache/dev-python/vcrpy-1.10.3 b/metadata/md5-cache/dev-python/vcrpy-1.10.3
index 1fa1a333f106..7e50029febbb 100644
--- a/metadata/md5-cache/dev-python/vcrpy-1.10.3
+++ b/metadata/md5-cache/dev-python/vcrpy-1.10.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/httplib2-0.9.1[python_targets_pypy(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/v/vcrpy/vcrpy-1.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5267f6328887d982937d4ea9d248927c
diff --git a/metadata/md5-cache/dev-python/vcrpy-1.11.1 b/metadata/md5-cache/dev-python/vcrpy-1.11.1
index 5289811efc40..2042617e574d 100644
--- a/metadata/md5-cache/dev-python/vcrpy-1.11.1
+++ b/metadata/md5-cache/dev-python/vcrpy-1.11.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/httplib2-0.9.1[python_targets_pypy(-)?,python_targets_pytho
 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/v/vcrpy/vcrpy-1.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fb89057049b81a6b7298d1a3f3634fca
diff --git a/metadata/md5-cache/dev-python/vcrpy-1.12.0 b/metadata/md5-cache/dev-python/vcrpy-1.12.0
index 6fa692290117..ccd6c954ba1e 100644
--- a/metadata/md5-cache/dev-python/vcrpy-1.12.0
+++ b/metadata/md5-cache/dev-python/vcrpy-1.12.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/httplib2-0.9.1[python_targets_pypy(-)?,python_targets_pytho
 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/kevin1024/vcrpy/archive/v1.12.0.tar.gz -> vcrpy-1.12.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b140c8e08381e78d5e9de15e035f03d5
diff --git a/metadata/md5-cache/dev-python/vcstools-0.1.38 b/metadata/md5-cache/dev-python/vcstools-0.1.38
index 7762964fe452..4fbd5bde68a6 100644
--- a/metadata/md5-cache/dev-python/vcstools-0.1.38
+++ b/metadata/md5-cache/dev-python/vcstools-0.1.38
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=http://download.ros.org/downloads/vcstools/vcstools-0.1.38.tar.gz https://github.com/vcstools/vcstools/archive/0.1.38.tar.gz -> vcstools-0.1.38.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ee59f0c3776b3ad51ae7201125b13e89
diff --git a/metadata/md5-cache/dev-python/vcstools-0.1.39 b/metadata/md5-cache/dev-python/vcstools-0.1.39
index 2ea4133228fe..7415331d4f1e 100644
--- a/metadata/md5-cache/dev-python/vcstools-0.1.39
+++ b/metadata/md5-cache/dev-python/vcstools-0.1.39
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=http://download.ros.org/downloads/vcstools/vcstools-0.1.39.tar.gz https://github.com/vcstools/vcstools/archive/0.1.39.tar.gz -> vcstools-0.1.39.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a27c58fe6b5e66a2789ec438a9dc5010
diff --git a/metadata/md5-cache/dev-python/vcstools-0.1.40 b/metadata/md5-cache/dev-python/vcstools-0.1.40
index 596de5878184..8102711f6070 100644
--- a/metadata/md5-cache/dev-python/vcstools-0.1.40
+++ b/metadata/md5-cache/dev-python/vcstools-0.1.40
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://download.ros.org/downloads/vcstools/vcstools-0.1.40.tar.gz https://github.com/vcstools/vcstools/archive/0.1.40.tar.gz -> vcstools-0.1.40.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f98899dd57e7d775ca7f6aee687e455d
diff --git a/metadata/md5-cache/dev-python/vcstools-9999 b/metadata/md5-cache/dev-python/vcstools-9999
index 3845e16a7574..409de80ff19b 100644
--- a/metadata/md5-cache/dev-python/vcstools-9999
+++ b/metadata/md5-cache/dev-python/vcstools-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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_=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	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f98899dd57e7d775ca7f6aee687e455d
diff --git a/metadata/md5-cache/dev-python/vcversioner-2.16.0.0 b/metadata/md5-cache/dev-python/vcversioner-2.16.0.0
index e4dd825e20de..cac7b2ec7853 100644
--- a/metadata/md5-cache/dev-python/vcversioner-2.16.0.0
+++ b/metadata/md5-cache/dev-python/vcversioner-2.16.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/v/vcversioner/vcversioner-2.16.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0c4e6821a39cef37c893334d856a354c
diff --git a/metadata/md5-cache/dev-python/vdirsyncer-0.16.3 b/metadata/md5-cache/dev-python/vdirsyncer-0.16.3
index 037372ea19bf..0d1ae8bfbbae 100644
--- a/metadata/md5-cache/dev-python/vdirsyncer-0.16.3
+++ b/metadata/md5-cache/dev-python/vdirsyncer-0.16.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/click-5.0[python_targets_python3_4(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/v/vdirsyncer/vdirsyncer-0.16.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=059d49e2f9c73c713ec7148c34ed88e7
diff --git a/metadata/md5-cache/dev-python/vdirsyncer-0.16.4 b/metadata/md5-cache/dev-python/vdirsyncer-0.16.4
index 69604f6bc435..9724404c5aff 100644
--- a/metadata/md5-cache/dev-python/vdirsyncer-0.16.4
+++ b/metadata/md5-cache/dev-python/vdirsyncer-0.16.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/click-5.0[python_targets_python3_4(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/v/vdirsyncer/vdirsyncer-0.16.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=059d49e2f9c73c713ec7148c34ed88e7
diff --git a/metadata/md5-cache/dev-python/vdirsyncer-0.16.6 b/metadata/md5-cache/dev-python/vdirsyncer-0.16.6
index 2a0848d665dd..d30764d2e494 100644
--- a/metadata/md5-cache/dev-python/vdirsyncer-0.16.6
+++ b/metadata/md5-cache/dev-python/vdirsyncer-0.16.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/click-5.0[python_targets_python3_4(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/v/vdirsyncer/vdirsyncer-0.16.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d195eb089ce97398819b2edef77b95d8
diff --git a/metadata/md5-cache/dev-python/vdirsyncer-0.16.7 b/metadata/md5-cache/dev-python/vdirsyncer-0.16.7
index 0bc2d609675f..50cbeda8088e 100644
--- a/metadata/md5-cache/dev-python/vdirsyncer-0.16.7
+++ b/metadata/md5-cache/dev-python/vdirsyncer-0.16.7
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/click-5.0[python_targets_python3_4(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/v/vdirsyncer/vdirsyncer-0.16.7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d195eb089ce97398819b2edef77b95d8
diff --git a/metadata/md5-cache/dev-python/venusian-1.0 b/metadata/md5-cache/dev-python/venusian-1.0
index 315dc5fec4a2..ea818f8fce3b 100644
--- a/metadata/md5-cache/dev-python/venusian-1.0
+++ b/metadata/md5-cache/dev-python/venusian-1.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/v/venusian/venusian-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2c41b6d6c1a8985794a2e34737e32d54
diff --git a/metadata/md5-cache/dev-python/venusian-1.0_p20161030 b/metadata/md5-cache/dev-python/venusian-1.0_p20161030
index f29b093fcffe..4d86f2e37fff 100644
--- a/metadata/md5-cache/dev-python/venusian-1.0_p20161030
+++ b/metadata/md5-cache/dev-python/venusian-1.0_p20161030
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/Pylons/venusian/archive/ec4032596e3aec987ba29b62cac701608ef3b523.zip -> venusian-1.0_p20161030.zip
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4c43ea20973a53edd5e9b84a264f4e43
diff --git a/metadata/md5-cache/dev-python/verboselogs-1.6 b/metadata/md5-cache/dev-python/verboselogs-1.6
index 4a441035042e..1e782e2fc091 100644
--- a/metadata/md5-cache/dev-python/verboselogs-1.6
+++ b/metadata/md5-cache/dev-python/verboselogs-1.6
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/v/verboselogs/verboselogs-1.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=99721622c2c21c679962c0d2f3ad28e2
diff --git a/metadata/md5-cache/dev-python/versioneer-0.16 b/metadata/md5-cache/dev-python/versioneer-0.16
index 9578a50556be..30abfc1a125a 100644
--- a/metadata/md5-cache/dev-python/versioneer-0.16
+++ b/metadata/md5-cache/dev-python/versioneer-0.16
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/v/versioneer/versioneer-0.16.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bc6f7249812df9b747ac33ba548d27a9
diff --git a/metadata/md5-cache/dev-python/versiontools-1.9.1-r1 b/metadata/md5-cache/dev-python/versiontools-1.9.1-r1
index b3bfe0cfb452..17b03d7afdb1 100644
--- a/metadata/md5-cache/dev-python/versiontools-1.9.1-r1
+++ b/metadata/md5-cache/dev-python/versiontools-1.9.1-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/v/versiontools/versiontools-1.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b21bf8a96da9d245ee4f9356eb37d4ed
diff --git a/metadata/md5-cache/dev-python/vertex-0.3.0-r1 b/metadata/md5-cache/dev-python/vertex-0.3.0-r1
index 5a1139d90b88..361101a35b83 100644
--- a/metadata/md5-cache/dev-python/vertex-0.3.0-r1
+++ b/metadata/md5-cache/dev-python/vertex-0.3.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/openssl >=dev-python/epsilon-0.6.0-r1[python_targets_python2_7(
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/V/Vertex/Vertex-0.3.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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9ba176438007c0933d9b84081b98207b
diff --git a/metadata/md5-cache/dev-python/vertex-0.3.1-r1 b/metadata/md5-cache/dev-python/vertex-0.3.1-r1
index 536397aa1c91..23b45beec0f7 100644
--- a/metadata/md5-cache/dev-python/vertex-0.3.1-r1
+++ b/metadata/md5-cache/dev-python/vertex-0.3.1-r1
@@ -10,5 +10,5 @@ RDEPEND=!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) >=dev-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/V/Vertex/Vertex-0.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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=932f856e5ea341c11dfcdae5f27c4af9
diff --git a/metadata/md5-cache/dev-python/vine-1.1.3 b/metadata/md5-cache/dev-python/vine-1.1.3
index 4b16a0cb276f..62edba901ed7 100644
--- a/metadata/md5-cache/dev-python/vine-1.1.3
+++ b/metadata/md5-cache/dev-python/vine-1.1.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/v/vine/vine-1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=148573b907a8aa5e1d80bdbaa029deca
diff --git a/metadata/md5-cache/dev-python/virtualenv-15.1.0 b/metadata/md5-cache/dev-python/virtualenv-15.1.0
index 7c4341807acb..5dcd3cecdfbc 100644
--- a/metadata/md5-cache/dev-python/virtualenv-15.1.0
+++ b/metadata/md5-cache/dev-python/virtualenv-15.1.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/pypa/virtualenv/archive/15.1.0.tar.gz -> virtualenv-15.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e6f5dd66fdba565606d66f7ba4dd5756
diff --git a/metadata/md5-cache/dev-python/virtualenv-16.0.0 b/metadata/md5-cache/dev-python/virtualenv-16.0.0
index 80da5df12fd5..2b5276f23aa3 100644
--- a/metadata/md5-cache/dev-python/virtualenv-16.0.0
+++ b/metadata/md5-cache/dev-python/virtualenv-16.0.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/pypa/virtualenv/archive/16.0.0.tar.gz -> virtualenv-16.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e6fa24ca4f90fccf7308541df363796b
diff --git a/metadata/md5-cache/dev-python/virtualenv-clone-0.2.6 b/metadata/md5-cache/dev-python/virtualenv-clone-0.2.6
index 141a24b6a535..a3d454e61b38 100644
--- a/metadata/md5-cache/dev-python/virtualenv-clone-0.2.6
+++ b/metadata/md5-cache/dev-python/virtualenv-clone-0.2.6
@@ -10,5 +10,5 @@ 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
 SRC_URI=mirror://pypi/v/virtualenv-clone/virtualenv-clone-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=99d5f59032038d4c23ecd02bab2b963c
diff --git a/metadata/md5-cache/dev-python/virtualenvwrapper-4.7.1 b/metadata/md5-cache/dev-python/virtualenvwrapper-4.7.1
index c443d3d6ddf2..0ab49350b617 100644
--- a/metadata/md5-cache/dev-python/virtualenvwrapper-4.7.1
+++ b/metadata/md5-cache/dev-python/virtualenvwrapper-4.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/v/virtualenvwrapper/virtualenvwrapper-4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8ca5b3c8cac7561c1cd2b725efb294d5
diff --git a/metadata/md5-cache/dev-python/virtualenvwrapper-4.8.2 b/metadata/md5-cache/dev-python/virtualenvwrapper-4.8.2
index b8347182308d..ebafbde86e66 100644
--- a/metadata/md5-cache/dev-python/virtualenvwrapper-4.8.2
+++ b/metadata/md5-cache/dev-python/virtualenvwrapper-4.8.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/v/virtualenvwrapper/virtualenvwrapper-4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=06f472dab4393b1adba75ff6e49160bb
diff --git a/metadata/md5-cache/dev-python/vobject-0.9.3 b/metadata/md5-cache/dev-python/vobject-0.9.3
index 34d4a7e28084..4d33f28b77af 100644
--- a/metadata/md5-cache/dev-python/vobject-0.9.3
+++ b/metadata/md5-cache/dev-python/vobject-0.9.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/python-dateutil-2.4.0[python_targets_pypy(-)?,python_target
 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/eventable/vobject/archive/0.9.3.tar.gz -> vobject-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=589123142f40346566332ae40873494d
diff --git a/metadata/md5-cache/dev-python/vobject-0.9.5 b/metadata/md5-cache/dev-python/vobject-0.9.5
index b27c53f11038..e87c32093188 100644
--- a/metadata/md5-cache/dev-python/vobject-0.9.5
+++ b/metadata/md5-cache/dev-python/vobject-0.9.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/python-dateutil-2.4.0[python_targets_pypy(-)?,python_target
 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/eventable/vobject/archive/0.9.5.tar.gz -> vobject-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=24d7d30fa0e08e570fbe43bd459a802c
diff --git a/metadata/md5-cache/dev-python/vobject-0.9.6 b/metadata/md5-cache/dev-python/vobject-0.9.6
index 3bd69f4fbb85..5126cf9bfc43 100644
--- a/metadata/md5-cache/dev-python/vobject-0.9.6
+++ b/metadata/md5-cache/dev-python/vobject-0.9.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/python-dateutil-2.4.0[python_targets_pypy(-)?,python_target
 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/eventable/vobject/archive/0.9.6.tar.gz -> vobject-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b1a1b4c300d2902c02f9fb77e8bbd17f
diff --git a/metadata/md5-cache/dev-python/voluptuous-0.10.5 b/metadata/md5-cache/dev-python/voluptuous-0.10.5
index 22bd7ec09656..cc2840374838 100644
--- a/metadata/md5-cache/dev-python/voluptuous-0.10.5
+++ b/metadata/md5-cache/dev-python/voluptuous-0.10.5
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/v/voluptuous/voluptuous-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=17a3191a5dbf6f34c7178862ef9d9a01
diff --git a/metadata/md5-cache/dev-python/voluptuous-0.11.1 b/metadata/md5-cache/dev-python/voluptuous-0.11.1
index 0519b6dc7370..14345bfd0fa7 100644
--- a/metadata/md5-cache/dev-python/voluptuous-0.11.1
+++ b/metadata/md5-cache/dev-python/voluptuous-0.11.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/v/voluptuous/voluptuous-0.11.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b3f06d66b23476bf68122dbf6eade5d8
diff --git a/metadata/md5-cache/dev-python/vpython-7.4.2 b/metadata/md5-cache/dev-python/vpython-7.4.2
index 90691f2e058a..179302dba86f 100644
--- a/metadata/md5-cache/dev-python/vpython-7.4.2
+++ b/metadata/md5-cache/dev-python/vpython-7.4.2
@@ -10,5 +10,5 @@ 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_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/v/vpython/vpython-7.4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1d6da8c201d53ea0485ffc8318d03bc1
diff --git a/metadata/md5-cache/dev-python/vpython-7.4.6 b/metadata/md5-cache/dev-python/vpython-7.4.6
index b67f444e5560..13c6c47f362e 100644
--- a/metadata/md5-cache/dev-python/vpython-7.4.6
+++ b/metadata/md5-cache/dev-python/vpython-7.4.6
@@ -10,5 +10,5 @@ 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_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/v/vpython/vpython-7.4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1d6da8c201d53ea0485ffc8318d03bc1
diff --git a/metadata/md5-cache/dev-python/vulture-0.10 b/metadata/md5-cache/dev-python/vulture-0.10
index 9f24d85399e5..5bbab4d7f500 100644
--- a/metadata/md5-cache/dev-python/vulture-0.10
+++ b/metadata/md5-cache/dev-python/vulture-0.10
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/v/vulture/vulture-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=aa5fbf2ec56ab331f972a7653fab236c
diff --git a/metadata/md5-cache/dev-python/waitress-1.0.1 b/metadata/md5-cache/dev-python/waitress-1.0.1
index 1937d7c94bad..935b97895fcc 100644
--- a/metadata/md5-cache/dev-python/waitress-1.0.1
+++ b/metadata/md5-cache/dev-python/waitress-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/w/waitress/waitress-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ea26a50c469291473b67a7f007188967
diff --git a/metadata/md5-cache/dev-python/waitress-1.0.2 b/metadata/md5-cache/dev-python/waitress-1.0.2
index 569412e0852a..4525f0659f99 100644
--- a/metadata/md5-cache/dev-python/waitress-1.0.2
+++ b/metadata/md5-cache/dev-python/waitress-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/w/waitress/waitress-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fa47fe8095a8b594197092af29654eac
diff --git a/metadata/md5-cache/dev-python/warlock-1.1.0 b/metadata/md5-cache/dev-python/warlock-1.1.0
index 4a574c893b06..eb8cb2c5bbd2 100644
--- a/metadata/md5-cache/dev-python/warlock-1.1.0
+++ b/metadata/md5-cache/dev-python/warlock-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/w/warlock/warlock-1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b6cb8b2ae290ad3d646e16348c8674fd
diff --git a/metadata/md5-cache/dev-python/warlock-1.2.0 b/metadata/md5-cache/dev-python/warlock-1.2.0
index 0e3bb88e413c..4c88102d37d8 100644
--- a/metadata/md5-cache/dev-python/warlock-1.2.0
+++ b/metadata/md5-cache/dev-python/warlock-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/w/warlock/warlock-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b6cb8b2ae290ad3d646e16348c8674fd
diff --git a/metadata/md5-cache/dev-python/watchdog-0.8.3-r1 b/metadata/md5-cache/dev-python/watchdog-0.8.3-r1
index 5b43dda93d69..bc5d16a054fd 100644
--- a/metadata/md5-cache/dev-python/watchdog-0.8.3-r1
+++ b/metadata/md5-cache/dev-python/watchdog-0.8.3-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyyaml[python_targets_pypy(-)?,python_targets_python2_7(-)?,p
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/w/watchdog/watchdog-0.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a0f442407c81e258e5c2199995e341b6
diff --git a/metadata/md5-cache/dev-python/watchdog-0.8.3-r2 b/metadata/md5-cache/dev-python/watchdog-0.8.3-r2
index 9f65a15f5f5e..268dd09caa81 100644
--- a/metadata/md5-cache/dev-python/watchdog-0.8.3-r2
+++ b/metadata/md5-cache/dev-python/watchdog-0.8.3-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyyaml[python_targets_pypy(-)?,python_targets_python2_7(-)?,p
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/w/watchdog/watchdog-0.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c9d1d8d2bbcb8e8dada7adb4ef898b96
diff --git a/metadata/md5-cache/dev-python/wcsaxes-0.8 b/metadata/md5-cache/dev-python/wcsaxes-0.8
index cce5dd10eae2..3ecf1779b3b8 100644
--- a/metadata/md5-cache/dev-python/wcsaxes-0.8
+++ b/metadata/md5-cache/dev-python/wcsaxes-0.8
@@ -10,5 +10,5 @@ RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/w/wcsaxes/wcsaxes-0.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=eb60919243d9effcd3e281c86b8041fe
diff --git a/metadata/md5-cache/dev-python/wcsaxes-0.9 b/metadata/md5-cache/dev-python/wcsaxes-0.9
index d8a881869c84..80fad45be971 100644
--- a/metadata/md5-cache/dev-python/wcsaxes-0.9
+++ b/metadata/md5-cache/dev-python/wcsaxes-0.9
@@ -10,5 +10,5 @@ RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/w/wcsaxes/wcsaxes-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=72fc9d46e09c74ab4167f91cd8fa5c01
diff --git a/metadata/md5-cache/dev-python/wcsaxes-0.9-r1 b/metadata/md5-cache/dev-python/wcsaxes-0.9-r1
index 34a8f523cdda..82d553b35901 100644
--- a/metadata/md5-cache/dev-python/wcsaxes-0.9-r1
+++ b/metadata/md5-cache/dev-python/wcsaxes-0.9-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/w/wcsaxes/wcsaxes-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7e39ae047ecfc63bb2ad3e47969f8c3c
diff --git a/metadata/md5-cache/dev-python/wcwidth-0.1.7 b/metadata/md5-cache/dev-python/wcwidth-0.1.7
index 84de2208ffdb..e064da50124e 100644
--- a/metadata/md5-cache/dev-python/wcwidth-0.1.7
+++ b/metadata/md5-cache/dev-python/wcwidth-0.1.7
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/w/wcwidth/wcwidth-0.1.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=9aaded0d11cd6d50d60ec337412552d5
diff --git a/metadata/md5-cache/dev-python/wcwidth-0.1.7-r1 b/metadata/md5-cache/dev-python/wcwidth-0.1.7-r1
index 1d75685f5d25..c2e8be609188 100644
--- a/metadata/md5-cache/dev-python/wcwidth-0.1.7-r1
+++ b/metadata/md5-cache/dev-python/wcwidth-0.1.7-r1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/w/wcwidth/wcwidth-0.1.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=8238f9ede2eaf14e4df20232b5648360
diff --git a/metadata/md5-cache/dev-python/weakrefmethod-1.0.3 b/metadata/md5-cache/dev-python/weakrefmethod-1.0.3
index 7425f3b76e52..49c06b701099 100644
--- a/metadata/md5-cache/dev-python/weakrefmethod-1.0.3
+++ b/metadata/md5-cache/dev-python/weakrefmethod-1.0.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/w/weakrefmethod/weakrefmethod-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=de2e359227dd7f643cc243e99e7268f1
diff --git a/metadata/md5-cache/dev-python/weasyprint-0.29 b/metadata/md5-cache/dev-python/weasyprint-0.29
index 74230b163afd..5cb2bad10ccf 100644
--- a/metadata/md5-cache/dev-python/weasyprint-0.29
+++ b/metadata/md5-cache/dev-python/weasyprint-0.29
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/pango:0/0 >=media-gfx/cairosvg-1.0.7[python_targets_python2_7(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/W/WeasyPrint/WeasyPrint-0.29.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fa2872df184294b9f97f1a8780bdb5cb
diff --git a/metadata/md5-cache/dev-python/weasyprint-0.41 b/metadata/md5-cache/dev-python/weasyprint-0.41
index 500d55010523..b04f50877b90 100644
--- a/metadata/md5-cache/dev-python/weasyprint-0.41
+++ b/metadata/md5-cache/dev-python/weasyprint-0.41
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/W/WeasyPrint/WeasyPrint-0.41.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=be839176f7d5cc49ab296e8c51454514
diff --git a/metadata/md5-cache/dev-python/webassets-0.12 b/metadata/md5-cache/dev-python/webassets-0.12
index 2244d6c8312b..603033f44928 100644
--- a/metadata/md5-cache/dev-python/webassets-0.12
+++ b/metadata/md5-cache/dev-python/webassets-0.12
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/miracle2k/webassets/archive/0.12.tar.gz -> webassets-0.12.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=17fb2e7226550a8a954c8347c77108b6
diff --git a/metadata/md5-cache/dev-python/webassets-0.12.1 b/metadata/md5-cache/dev-python/webassets-0.12.1
index d4a2964f3f1c..168d0204001b 100644
--- a/metadata/md5-cache/dev-python/webassets-0.12.1
+++ b/metadata/md5-cache/dev-python/webassets-0.12.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/miracle2k/webassets/archive/0.12.1.tar.gz -> webassets-0.12.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=21e611e4f28364911a77a686c39c170d
diff --git a/metadata/md5-cache/dev-python/webcolors-1.5 b/metadata/md5-cache/dev-python/webcolors-1.5
index a55cf9505994..1830fcc5cb2d 100644
--- a/metadata/md5-cache/dev-python/webcolors-1.5
+++ b/metadata/md5-cache/dev-python/webcolors-1.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/webcolors/webcolors-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fb6ee7b4deebe060e1c6d11f78c74ac7
diff --git a/metadata/md5-cache/dev-python/webcolors-1.8.1 b/metadata/md5-cache/dev-python/webcolors-1.8.1
index 39fcf5fcf67b..c90cb40c46e4 100644
--- a/metadata/md5-cache/dev-python/webcolors-1.8.1
+++ b/metadata/md5-cache/dev-python/webcolors-1.8.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/webcolors/webcolors-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=530347a07cb9578e6ba8ab497bbbb098
diff --git a/metadata/md5-cache/dev-python/webencodings-0.5.1 b/metadata/md5-cache/dev-python/webencodings-0.5.1
index 64c2a6a274de..05e7b9347aff 100644
--- a/metadata/md5-cache/dev-python/webencodings-0.5.1
+++ b/metadata/md5-cache/dev-python/webencodings-0.5.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/webencodings/webencodings-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8fe9c1fdb9d3918a5fd69e78c297285f
diff --git a/metadata/md5-cache/dev-python/weberror-0.13.1 b/metadata/md5-cache/dev-python/weberror-0.13.1
index f34dca55192b..1979d509dcee 100644
--- a/metadata/md5-cache/dev-python/weberror-0.13.1
+++ b/metadata/md5-cache/dev-python/weberror-0.13.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/paste-1.7.1[python_targets_python2_7(-)?,-python_single_tar
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/W/WebError/WebError-0.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=57836e48b3b4be53eb7efc5a5fe0edfc
diff --git a/metadata/md5-cache/dev-python/webhelpers-1.3-r1 b/metadata/md5-cache/dev-python/webhelpers-1.3-r1
index e5ff2d5d5ed1..4f3e5dc852b6 100644
--- a/metadata/md5-cache/dev-python/webhelpers-1.3-r1
+++ b/metadata/md5-cache/dev-python/webhelpers-1.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/markupsafe-0.9.2[python_targets_python2_7(-)?,-python_singl
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/W/WebHelpers/WebHelpers-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4194452fdf4a008c0748c7346bcc7ebb
diff --git a/metadata/md5-cache/dev-python/webob-1.7.3 b/metadata/md5-cache/dev-python/webob-1.7.3
index ed5716d54900..c330c3aa3aa2 100644
--- a/metadata/md5-cache/dev-python/webob-1.7.3
+++ b/metadata/md5-cache/dev-python/webob-1.7.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/W/WebOb/WebOb-1.7.3.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7acb37f8e7bb404ff2637d2cfc5f4bd8
diff --git a/metadata/md5-cache/dev-python/webob-1.7.4 b/metadata/md5-cache/dev-python/webob-1.7.4
index d3ee972ba2bc..bd3c7a5a1242 100644
--- a/metadata/md5-cache/dev-python/webob-1.7.4
+++ b/metadata/md5-cache/dev-python/webob-1.7.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/W/WebOb/WebOb-1.7.4.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e06e114ed870956728175f8b1f972ae9
diff --git a/metadata/md5-cache/dev-python/webpy-0.37-r1 b/metadata/md5-cache/dev-python/webpy-0.37-r1
index 3ecdd2edabcd..1e8e526dd8f6 100644
--- a/metadata/md5-cache/dev-python/webpy-0.37-r1
+++ b/metadata/md5-cache/dev-python/webpy-0.37-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=http://www.webpy.org/static/web.py-0.37.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fa3ebba9f62d5fead32243c9941db72b
diff --git a/metadata/md5-cache/dev-python/webpy-0.38 b/metadata/md5-cache/dev-python/webpy-0.38
index 90d927c74f65..a3f86525a964 100644
--- a/metadata/md5-cache/dev-python/webpy-0.38
+++ b/metadata/md5-cache/dev-python/webpy-0.38
@@ -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=http://www.webpy.org/static/web.py-0.38.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a9d1234986b9589422d3bd5b426caa71
diff --git a/metadata/md5-cache/dev-python/websocket-client-0.37.0 b/metadata/md5-cache/dev-python/websocket-client-0.37.0
index 2da71a573e1f..916941898b15 100644
--- a/metadata/md5-cache/dev-python/websocket-client-0.37.0
+++ b/metadata/md5-cache/dev-python/websocket-client-0.37.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/w/websocket-client/websocket_client-0.37.0.tar.gz -> websocket-client-0.37.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=22bb8d5f68ea7f9970a3ee04370f1eee
diff --git a/metadata/md5-cache/dev-python/websocket-client-0.40.0 b/metadata/md5-cache/dev-python/websocket-client-0.40.0
index 6f4fb4343278..42c07e6cefd3 100644
--- a/metadata/md5-cache/dev-python/websocket-client-0.40.0
+++ b/metadata/md5-cache/dev-python/websocket-client-0.40.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/w/websocket-client/websocket_client-0.40.0.tar.gz -> websocket-client-0.40.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2bf1bf57416367a562902b2a5055c06d
diff --git a/metadata/md5-cache/dev-python/websocket-client-0.47.0 b/metadata/md5-cache/dev-python/websocket-client-0.47.0
index b11c2f10b9ad..f536ec3c059f 100644
--- a/metadata/md5-cache/dev-python/websocket-client-0.47.0
+++ b/metadata/md5-cache/dev-python/websocket-client-0.47.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/w/websocket-client/websocket_client-0.47.0.tar.gz -> websocket-client-0.47.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2c5f34ba7197b8f32058d1fdeb2942cf
diff --git a/metadata/md5-cache/dev-python/websockify-0.8.0 b/metadata/md5-cache/dev-python/websockify-0.8.0
index ac97b19120e7..10b28dd4988c 100644
--- a/metadata/md5-cache/dev-python/websockify-0.8.0
+++ b/metadata/md5-cache/dev-python/websockify-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/kanaka/websockify/archive/v0.8.0.zip -> websockify-0.8.0.zip
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d537a449dcbc54ea5afa4ad2e76a3a3b
diff --git a/metadata/md5-cache/dev-python/webtest-2.0.21 b/metadata/md5-cache/dev-python/webtest-2.0.21
index 601de345dad2..4f6b297e9119 100644
--- a/metadata/md5-cache/dev-python/webtest-2.0.21
+++ b/metadata/md5-cache/dev-python/webtest-2.0.21
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/W/WebTest/WebTest-2.0.21.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=875cb98f360fb9355b32d43f086d496b
diff --git a/metadata/md5-cache/dev-python/webtest-2.0.29 b/metadata/md5-cache/dev-python/webtest-2.0.29
index 9ac5d465101a..ada2de92499c 100644
--- a/metadata/md5-cache/dev-python/webtest-2.0.29
+++ b/metadata/md5-cache/dev-python/webtest-2.0.29
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/W/WebTest/WebTest-2.0.29.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=84413a4603ef2d78dcbdcaade3540b56
diff --git a/metadata/md5-cache/dev-python/webut-0.1.0.2-r1 b/metadata/md5-cache/dev-python/webut-0.1.0.2-r1
index 0d26a389d3f3..a64ec3d9da5f 100644
--- a/metadata/md5-cache/dev-python/webut-0.1.0.2-r1
+++ b/metadata/md5-cache/dev-python/webut-0.1.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/nevow-0.9.18[python_targets_python2_7(-)?,-python_single_ta
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/w/webut/webut_0.1-0.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=5dc37e269fe815610f96639c8d337870
diff --git a/metadata/md5-cache/dev-python/wehjit-0.2.2-r1 b/metadata/md5-cache/dev-python/wehjit-0.2.2-r1
index 103a8b907e33..cddb3a81b4a5 100644
--- a/metadata/md5-cache/dev-python/wehjit-0.2.2-r1
+++ b/metadata/md5-cache/dev-python/wehjit-0.2.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/genshi dev-python/assets[python_targets_python2_7(-)?,-python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://jderose.fedorapeople.org/wehjit/0.2.2/wehjit-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4d689c8c99dccdae05774b42bb0feb98
diff --git a/metadata/md5-cache/dev-python/werkzeug-0.12.2 b/metadata/md5-cache/dev-python/werkzeug-0.12.2
index 45116fb4edd1..4b2f1b40fe2c 100644
--- a/metadata/md5-cache/dev-python/werkzeug-0.12.2
+++ b/metadata/md5-cache/dev-python/werkzeug-0.12.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/simplejson[python_targets_pypy(-)?,python_targets_pypy3(-)?,p
 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/W/Werkzeug/Werkzeug-0.12.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=00958c59ed64b79c7d28e0480e3aa1d0
diff --git a/metadata/md5-cache/dev-python/wheel-0.29.0 b/metadata/md5-cache/dev-python/wheel-0.29.0
index 1526461c2949..5830833d3ce6 100644
--- a/metadata/md5-cache/dev-python/wheel-0.29.0
+++ b/metadata/md5-cache/dev-python/wheel-0.29.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/w/wheel/wheel-0.29.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fe95c93805dc1c460543180319b2cb9f
diff --git a/metadata/md5-cache/dev-python/wheel-0.30.0 b/metadata/md5-cache/dev-python/wheel-0.30.0
index 387bf6bcb44d..a40cb33031cf 100644
--- a/metadata/md5-cache/dev-python/wheel-0.30.0
+++ b/metadata/md5-cache/dev-python/wheel-0.30.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/w/wheel/wheel-0.30.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=62c9caa086b7f89995e62b3546404213
diff --git a/metadata/md5-cache/dev-python/wheel-0.31.1 b/metadata/md5-cache/dev-python/wheel-0.31.1
index ff17975c4e14..96b2bb2348ca 100644
--- a/metadata/md5-cache/dev-python/wheel-0.31.1
+++ b/metadata/md5-cache/dev-python/wheel-0.31.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/w/wheel/wheel-0.31.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=82f01c70f8f549e38f57b69b76974b14
diff --git a/metadata/md5-cache/dev-python/whelk-2.7.1 b/metadata/md5-cache/dev-python/whelk-2.7.1
index 47eb71eea495..1585dc71955f 100644
--- a/metadata/md5-cache/dev-python/whelk-2.7.1
+++ b/metadata/md5-cache/dev-python/whelk-2.7.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/seveas/whelk/archive/2.7.1.tar.gz -> whelk-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e72734d1dbcbbfc8c7f7693ba0dc25ec
diff --git a/metadata/md5-cache/dev-python/whichcraft-0.4.1 b/metadata/md5-cache/dev-python/whichcraft-0.4.1
index e8494a0a1219..405e5dc6c758 100644
--- a/metadata/md5-cache/dev-python/whichcraft-0.4.1
+++ b/metadata/md5-cache/dev-python/whichcraft-0.4.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/pydanny/whichcraft/archive/0.4.1.tar.gz -> whichcraft-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2c7cdb3aca57b3f69353dc762d81420d
diff --git a/metadata/md5-cache/dev-python/whisper-0.9.13 b/metadata/md5-cache/dev-python/whisper-0.9.13
index aa3dda6e2b28..17aeef66d4ac 100644
--- a/metadata/md5-cache/dev-python/whisper-0.9.13
+++ b/metadata/md5-cache/dev-python/whisper-0.9.13
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/w/whisper/whisper-0.9.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3a588883af24073da03885050c86550f
diff --git a/metadata/md5-cache/dev-python/whisper-0.9.15 b/metadata/md5-cache/dev-python/whisper-0.9.15
index af8732531c3b..f22c13cbfcf6 100644
--- a/metadata/md5-cache/dev-python/whisper-0.9.15
+++ b/metadata/md5-cache/dev-python/whisper-0.9.15
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/w/whisper/whisper-0.9.15.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6f213c8253e319cfe8c728cfc8c348d3
diff --git a/metadata/md5-cache/dev-python/whoosh-2.6.0 b/metadata/md5-cache/dev-python/whoosh-2.6.0
index 7106f0e4a597..79adf54b28a7 100644
--- a/metadata/md5-cache/dev-python/whoosh-2.6.0
+++ b/metadata/md5-cache/dev-python/whoosh-2.6.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/W/Whoosh/Whoosh-2.6.0.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1871a73b2f81f1c4f88e12d5013a3c1e
diff --git a/metadata/md5-cache/dev-python/whoosh-2.7.4 b/metadata/md5-cache/dev-python/whoosh-2.7.4
index 282314122de5..afe61774702e 100644
--- a/metadata/md5-cache/dev-python/whoosh-2.7.4
+++ b/metadata/md5-cache/dev-python/whoosh-2.7.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-python/widgetsnbextension-3.0.0 b/metadata/md5-cache/dev-python/widgetsnbextension-3.0.0
index c80e31580d7c..5f319b5e3022 100644
--- a/metadata/md5-cache/dev-python/widgetsnbextension-3.0.0
+++ b/metadata/md5-cache/dev-python/widgetsnbextension-3.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/notebook-4.4.1[python_targets_python2_7(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/w/widgetsnbextension/widgetsnbextension-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ccc8c599e9115c2ed1722aad22fd5eaf
diff --git a/metadata/md5-cache/dev-python/workerpool-0.9.4 b/metadata/md5-cache/dev-python/workerpool-0.9.4
index 30e76e56839b..6a020cf5c6b3 100644
--- a/metadata/md5-cache/dev-python/workerpool-0.9.4
+++ b/metadata/md5-cache/dev-python/workerpool-0.9.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/w/workerpool/workerpool-0.9.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f03f57645521994da3fba16114698fec
diff --git a/metadata/md5-cache/dev-python/wrapt-1.10.10 b/metadata/md5-cache/dev-python/wrapt-1.10.10
index 84415846f218..a1d86efa5643 100644
--- a/metadata/md5-cache/dev-python/wrapt-1.10.10
+++ b/metadata/md5-cache/dev-python/wrapt-1.10.10
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/GrahamDumpleton/wrapt/archive/1.10.10.tar.gz -> wrapt-1.10.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=25d3245797d4d52aa15a08489aaa4df3
diff --git a/metadata/md5-cache/dev-python/wrapt-1.10.11 b/metadata/md5-cache/dev-python/wrapt-1.10.11
index 81df5785b22d..728db682e67d 100644
--- a/metadata/md5-cache/dev-python/wrapt-1.10.11
+++ b/metadata/md5-cache/dev-python/wrapt-1.10.11
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/GrahamDumpleton/wrapt/archive/1.10.11.tar.gz -> wrapt-1.10.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5821f770b0062ad7d8a420a6fc89f050
diff --git a/metadata/md5-cache/dev-python/ws4py-0.3.4 b/metadata/md5-cache/dev-python/ws4py-0.3.4
index bc98230302f3..3f34947be953 100644
--- a/metadata/md5-cache/dev-python/ws4py-0.3.4
+++ b/metadata/md5-cache/dev-python/ws4py-0.3.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/greenlet-0.4.1[python_targets_python2_7(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/Lawouach/WebSocket-for-Python/archive/v0.3.4 -> ws4py-0.3.4.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cfae233a7a8ced6c747864d7e696c249
diff --git a/metadata/md5-cache/dev-python/ws4py-0.3.4-r1 b/metadata/md5-cache/dev-python/ws4py-0.3.4-r1
index 43193d84aa95..a712c669e0f5 100644
--- a/metadata/md5-cache/dev-python/ws4py-0.3.4-r1
+++ b/metadata/md5-cache/dev-python/ws4py-0.3.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/greenlet-0.4.1[python_targets_python2_7(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/Lawouach/WebSocket-for-Python/archive/v0.3.4 -> ws4py-0.3.4.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1e580a09d70a58e89d3384504e032cda
diff --git a/metadata/md5-cache/dev-python/ws4py-0.5.1 b/metadata/md5-cache/dev-python/ws4py-0.5.1
index 0c2d89680ac8..3d2aacdd4e72 100644
--- a/metadata/md5-cache/dev-python/ws4py-0.5.1
+++ b/metadata/md5-cache/dev-python/ws4py-0.5.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/greenlet-0.4.1[python_targets_python2_7(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/Lawouach/WebSocket-for-Python/archive/0.5.1.tar.gz -> ws4py-0.5.1.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=c0848bc1cbdfcebe9321fd0752c9b038
diff --git a/metadata/md5-cache/dev-python/ws4py-9999 b/metadata/md5-cache/dev-python/ws4py-9999
index 74dfc6dcc42d..891f46df8348 100644
--- a/metadata/md5-cache/dev-python/ws4py-9999
+++ b/metadata/md5-cache/dev-python/ws4py-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-python/greenlet-0.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/cython-0.19.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] client? ( >=www-servers/tornado-3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) server? ( >=dev-python/cherrypy-3.2.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads?] ) python_targets_python3_4? ( dev-lang/python:3.4[threads?] ) python_targets_python3_5? ( dev-lang/python:3.5[threads?] ) python_targets_python3_6? ( dev-lang/python:3.6[threads?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3010272300e89b9f407b04ce5e161f2b
diff --git a/metadata/md5-cache/dev-python/wsaccel-0.6.2_p20170108 b/metadata/md5-cache/dev-python/wsaccel-0.6.2_p20170108
index 705b139a2a71..d75cdfb5c0bb 100644
--- a/metadata/md5-cache/dev-python/wsaccel-0.6.2_p20170108
+++ b/metadata/md5-cache/dev-python/wsaccel-0.6.2_p20170108
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/methane/wsaccel/archive/0fbd074c257c51b73de05b25ccb6488801320a32.zip -> wsaccel-0.6.2_p20170108.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=20b96eae55ec057152060e045c01246e
diff --git a/metadata/md5-cache/dev-python/wsgiintercept-1.3.1 b/metadata/md5-cache/dev-python/wsgiintercept-1.3.1
index f0187e361a1d..3ec8f7c88977 100644
--- a/metadata/md5-cache/dev-python/wsgiintercept-1.3.1
+++ b/metadata/md5-cache/dev-python/wsgiintercept-1.3.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/w/wsgi_intercept/wsgi_intercept-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3af21e183a849aeadbfc982a4e28a5dd
diff --git a/metadata/md5-cache/dev-python/wsgilog-0.3-r1 b/metadata/md5-cache/dev-python/wsgilog-0.3-r1
index afd2be2a3cac..157fe3ec2409 100644
--- a/metadata/md5-cache/dev-python/wsgilog-0.3-r1
+++ b/metadata/md5-cache/dev-python/wsgilog-0.3-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/w/wsgilog/wsgilog-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=98ac6495171ee2c3da1f3acc8e39f43b
diff --git a/metadata/md5-cache/dev-python/wsgiproxy2-0.4.2 b/metadata/md5-cache/dev-python/wsgiproxy2-0.4.2
index 5eb0ccb46c43..54321d4b4dd5 100644
--- a/metadata/md5-cache/dev-python/wsgiproxy2-0.4.2
+++ b/metadata/md5-cache/dev-python/wsgiproxy2-0.4.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WSGIProxy2/WSGIProxy2-0.4.2.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a2c4d7d4536b85ec4feea7dbda6e2de8
diff --git a/metadata/md5-cache/dev-python/wsgiproxy2-0.4.4 b/metadata/md5-cache/dev-python/wsgiproxy2-0.4.4
index aaf4f48cae06..f6f056109897 100644
--- a/metadata/md5-cache/dev-python/wsgiproxy2-0.4.4
+++ b/metadata/md5-cache/dev-python/wsgiproxy2-0.4.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WSGIProxy2/WSGIProxy2-0.4.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7863aef5ce56d0c96ccb02626713d87b
diff --git a/metadata/md5-cache/dev-python/wsproto-0.11.0 b/metadata/md5-cache/dev-python/wsproto-0.11.0
index 3b829d6f26fd..60205ac7cbcc 100644
--- a/metadata/md5-cache/dev-python/wsproto-0.11.0
+++ b/metadata/md5-cache/dev-python/wsproto-0.11.0
@@ -10,5 +10,5 @@ RDEPEND==dev-python/h11-0.7*[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/w/wsproto/wsproto-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=afd00710f6b8b1dddae0f819a7580606
diff --git a/metadata/md5-cache/dev-python/wstools-0.4.3 b/metadata/md5-cache/dev-python/wstools-0.4.3
index 972983a704e5..25260d7f18a7 100644
--- a/metadata/md5-cache/dev-python/wstools-0.4.3
+++ b/metadata/md5-cache/dev-python/wstools-0.4.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pyth
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/w/wstools/wstools-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=92eb539bbd9117abe629998c4e7171a4
diff --git a/metadata/md5-cache/dev-python/wstools-0.4.5-r1 b/metadata/md5-cache/dev-python/wstools-0.4.5-r1
index b277df1d9a3a..5e8beb589731 100644
--- a/metadata/md5-cache/dev-python/wstools-0.4.5-r1
+++ b/metadata/md5-cache/dev-python/wstools-0.4.5-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,pyth
 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/w/wstools/wstools-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e2cc0230ca3d97f3a9693b63c4c7f110
diff --git a/metadata/md5-cache/dev-python/wtf-peewee-0.2.6 b/metadata/md5-cache/dev-python/wtf-peewee-0.2.6
index 3d0ee9f92b73..43525e54232a 100644
--- a/metadata/md5-cache/dev-python/wtf-peewee-0.2.6
+++ b/metadata/md5-cache/dev-python/wtf-peewee-0.2.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/peewee-2.7.4[python_targets_python2_7(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/coleifer/wtf-peewee/archive/0.2.6.tar.gz -> wtf-peewee-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d27406a2bce2ddbbfdb49e14c30dcc98
diff --git a/metadata/md5-cache/dev-python/wtf-peewee-3.0.0 b/metadata/md5-cache/dev-python/wtf-peewee-3.0.0
index e5ec31d60f97..7829de2fc202 100644
--- a/metadata/md5-cache/dev-python/wtf-peewee-3.0.0
+++ b/metadata/md5-cache/dev-python/wtf-peewee-3.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/peewee-3[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
 SRC_URI=https://github.com/coleifer/wtf-peewee/archive/3.0.0.tar.gz -> wtf-peewee-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9bd8c3ebcb4c90df9be76d5427433099
diff --git a/metadata/md5-cache/dev-python/wtforms-2.1 b/metadata/md5-cache/dev-python/wtforms-2.1
index f9d106a685dc..6681fcc8d516 100644
--- a/metadata/md5-cache/dev-python/wtforms-2.1
+++ b/metadata/md5-cache/dev-python/wtforms-2.1
@@ -10,5 +10,5 @@ RDEPEND=app-arch/unzip dev-python/setuptools[python_targets_pypy(-)?,python_targ
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/W/WTForms/WTForms-2.1.zip
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6ececc1d8b6420f47eb13ae6b195fca9
diff --git a/metadata/md5-cache/dev-python/www-authenticate-0.9.2 b/metadata/md5-cache/dev-python/www-authenticate-0.9.2
index 077bf087245d..e7ed347d52e4 100644
--- a/metadata/md5-cache/dev-python/www-authenticate-0.9.2
+++ b/metadata/md5-cache/dev-python/www-authenticate-0.9.2
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/alexsdutton/www-authenticate/archive/0.9.2.tar.gz -> www-authenticate-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=544d514a4b37aa4b45f7e84cb4f74cab
diff --git a/metadata/md5-cache/dev-python/wxpython-3.0.2.0 b/metadata/md5-cache/dev-python/wxpython-3.0.2.0
index 9228700be401..656e19ef05ac 100644
--- a/metadata/md5-cache/dev-python/wxpython-3.0.2.0
+++ b/metadata/md5-cache/dev-python/wxpython-3.0.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/python-exec:2[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=3.0
 SRC_URI=mirror://sourceforge/wxpython/wxPython-src-3.0.2.0.tar.bz2 examples? ( mirror://sourceforge/wxpython/wxPython-demo-3.0.2.0.tar.bz2 )
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f6cff7eb4cb50a67a4820d7108b4ee91
diff --git a/metadata/md5-cache/dev-python/xapp-1.0.1-r2 b/metadata/md5-cache/dev-python/xapp-1.0.1-r2
index 0183647d3a11..f1efcc26da3e 100644
--- a/metadata/md5-cache/dev-python/xapp-1.0.1-r2
+++ b/metadata/md5-cache/dev-python/xapp-1.0.1-r2
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/xapps[introspection] dev-python/psutil[python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/python-xapp/archive/1.0.1.tar.gz -> xapp-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e6473efd488d3f3e023f151430007a09
diff --git a/metadata/md5-cache/dev-python/xarray-0.10.8 b/metadata/md5-cache/dev-python/xarray-0.10.8
index 15350f25b3cd..fc635ee53215 100644
--- a/metadata/md5-cache/dev-python/xarray-0.10.8
+++ b/metadata/md5-cache/dev-python/xarray-0.10.8
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/numpy-1.14[python_targets_python2_7(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/x/xarray/xarray-0.10.8.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7896fa2cba56110419f84dc11b2b4c2d
diff --git a/metadata/md5-cache/dev-python/xarray-0.9.6 b/metadata/md5-cache/dev-python/xarray-0.9.6
index b3de63bc69f8..a8f287b46218 100644
--- a/metadata/md5-cache/dev-python/xarray-0.9.6
+++ b/metadata/md5-cache/dev-python/xarray-0.9.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/x/xarray/xarray-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0c8072008077a0f9f0863d9980065994
diff --git a/metadata/md5-cache/dev-python/xcffib-0.4.0 b/metadata/md5-cache/dev-python/xcffib-0.4.0
index 0814d1e1e77b..9a3b7d0293ee 100644
--- a/metadata/md5-cache/dev-python/xcffib-0.4.0
+++ b/metadata/md5-cache/dev-python/xcffib-0.4.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-python/cffi-1.1:=[python_targets_pytho
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/x/xcffib/xcffib-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d313f7ecee63036f15694c577b90101f
diff --git a/metadata/md5-cache/dev-python/xcffib-0.5.1 b/metadata/md5-cache/dev-python/xcffib-0.5.1
index d2042749bade..e8a322606ac9 100644
--- a/metadata/md5-cache/dev-python/xcffib-0.5.1
+++ b/metadata/md5-cache/dev-python/xcffib-0.5.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-python/cffi-1.1:=[python_targets_pytho
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/x/xcffib/xcffib-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c9ad5e176c2a0f5930ee032effb7fd85
diff --git a/metadata/md5-cache/dev-python/xcffib-0.6.0 b/metadata/md5-cache/dev-python/xcffib-0.6.0
index a431a42bb7a3..0d56bc54c9ed 100644
--- a/metadata/md5-cache/dev-python/xcffib-0.6.0
+++ b/metadata/md5-cache/dev-python/xcffib-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-python/cffi-1.1:=[python_targets_pytho
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/x/xcffib/xcffib-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fe575d10a0c72d90f6d040776c2f771f
diff --git a/metadata/md5-cache/dev-python/xdis-3.3.1 b/metadata/md5-cache/dev-python/xdis-3.3.1
index b24a62a6293b..71c6c502e7ab 100644
--- a/metadata/md5-cache/dev-python/xdis-3.3.1
+++ b/metadata/md5-cache/dev-python/xdis-3.3.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/six-1.10.0[python_targets_pypy(-)?,python_targets_python2_7
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/x/xdis/xdis-3.3.1.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=33d6c9750c0befdb6430792d7ae23b11
diff --git a/metadata/md5-cache/dev-python/xdis-3.6.0 b/metadata/md5-cache/dev-python/xdis-3.6.0
index 0302b8978686..8d3f6d6eadd0 100644
--- a/metadata/md5-cache/dev-python/xdis-3.6.0
+++ b/metadata/md5-cache/dev-python/xdis-3.6.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/six-1.10.0[python_targets_pypy(-)?,python_targets_python2_7
 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/rocky/python-xdis/archive/release-3.6.0.tar.gz -> xdis-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=75a39446821df0bcd83d1862b5653348
diff --git a/metadata/md5-cache/dev-python/xlrd-0.9.4 b/metadata/md5-cache/dev-python/xlrd-0.9.4
index 593386a4ac8d..a225c40904c4 100644
--- a/metadata/md5-cache/dev-python/xlrd-0.9.4
+++ b/metadata/md5-cache/dev-python/xlrd-0.9.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/x/xlrd/xlrd-0.9.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=df10b344c5c1669305f6e51de8b76c69
diff --git a/metadata/md5-cache/dev-python/xlrd-1.0.0 b/metadata/md5-cache/dev-python/xlrd-1.0.0
index 275c95372e90..15deb0b8b3a9 100644
--- a/metadata/md5-cache/dev-python/xlrd-1.0.0
+++ b/metadata/md5-cache/dev-python/xlrd-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/x/xlrd/xlrd-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3ad477becd65d800853be2ae6603b0e0
diff --git a/metadata/md5-cache/dev-python/xlsxwriter-0.7.8 b/metadata/md5-cache/dev-python/xlsxwriter-0.7.8
index e619757acef7..0d76e6b0a7c5 100644
--- a/metadata/md5-cache/dev-python/xlsxwriter-0.7.8
+++ b/metadata/md5-cache/dev-python/xlsxwriter-0.7.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/X/XlsxWriter/XlsxWriter-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fb44f777a843bacaa3579f38cb69fe3d
diff --git a/metadata/md5-cache/dev-python/xlsxwriter-0.9.8 b/metadata/md5-cache/dev-python/xlsxwriter-0.9.8
index e4755a011526..cc556dffa6d6 100644
--- a/metadata/md5-cache/dev-python/xlsxwriter-0.9.8
+++ b/metadata/md5-cache/dev-python/xlsxwriter-0.9.8
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/X/XlsxWriter/XlsxWriter-0.9.8.tar.gz test? ( https://github.com/jmcnamara/XlsxWriter/archive/RELEASE_0.9.8.zip -> xlsxwriter-0.9.8-tests.zip )
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dc5ab7bcb3b61e768a00dbd49cf407e7
diff --git a/metadata/md5-cache/dev-python/xlutils-1.7.1 b/metadata/md5-cache/dev-python/xlutils-1.7.1
index dc738323bc1c..9bddbb1b188b 100644
--- a/metadata/md5-cache/dev-python/xlutils-1.7.1
+++ b/metadata/md5-cache/dev-python/xlutils-1.7.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/xlwt-0.7.3[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/x/xlutils/xlutils-1.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=08fd7fd54104c64427b5631d89a42f09
diff --git a/metadata/md5-cache/dev-python/xlutils-2.0.0 b/metadata/md5-cache/dev-python/xlutils-2.0.0
index d631695538f0..4840afebadf3 100644
--- a/metadata/md5-cache/dev-python/xlutils-2.0.0
+++ b/metadata/md5-cache/dev-python/xlutils-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/xlwt[python_targets_python2_7(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/x/xlutils/xlutils-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8c241e72e9fd334d8f3123cebfbe6d5a
diff --git a/metadata/md5-cache/dev-python/xlwt-1.0.0 b/metadata/md5-cache/dev-python/xlwt-1.0.0
index 72c314da33ce..7fe62a1c59a2 100644
--- a/metadata/md5-cache/dev-python/xlwt-1.0.0
+++ b/metadata/md5-cache/dev-python/xlwt-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/x/xlwt/xlwt-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d22eddf8ad87b559b0435e8d687bad27
diff --git a/metadata/md5-cache/dev-python/xlwt-1.2.0 b/metadata/md5-cache/dev-python/xlwt-1.2.0
index 10be03818e28..cd43b1ac3f06 100644
--- a/metadata/md5-cache/dev-python/xlwt-1.2.0
+++ b/metadata/md5-cache/dev-python/xlwt-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/x/xlwt/xlwt-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5f6321eead2cb40dbafe777d1346945f
diff --git a/metadata/md5-cache/dev-python/xmltodict-0.11.0 b/metadata/md5-cache/dev-python/xmltodict-0.11.0
index 7354831676c2..88c8ad5b305b 100644
--- a/metadata/md5-cache/dev-python/xmltodict-0.11.0
+++ b/metadata/md5-cache/dev-python/xmltodict-0.11.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/x/xmltodict/xmltodict-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ed5cd2a99ce0129aed57f8bfb8f430ec
diff --git a/metadata/md5-cache/dev-python/xmpppy-0.5.0_rc1-r2 b/metadata/md5-cache/dev-python/xmpppy-0.5.0_rc1-r2
index 9b2e5c276a7c..63d259574b44 100644
--- a/metadata/md5-cache/dev-python/xmpppy-0.5.0_rc1-r2
+++ b/metadata/md5-cache/dev-python/xmpppy-0.5.0_rc1-r2
@@ -10,5 +10,5 @@ RDEPEND=|| ( virtual/python-dnspython[python_targets_python2_7(-)?,-python_singl
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/xmpppy/xmpppy-0.5.0-rc1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=62184115ff8208d0ccdfdb74d87d339f
diff --git a/metadata/md5-cache/dev-python/xonsh-0.4.7 b/metadata/md5-cache/dev-python/xonsh-0.4.7
index f499891a6835..145d6fbaacff 100644
--- a/metadata/md5-cache/dev-python/xonsh-0.4.7
+++ b/metadata/md5-cache/dev-python/xonsh-0.4.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/ply[python_targets_python3_4(-)?,python_targets_python3_5(-)?
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/x/xonsh/xonsh-0.4.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=f6a89fc1200936b620dd272255d376ed
diff --git a/metadata/md5-cache/dev-python/xstatic-1.0.1 b/metadata/md5-cache/dev-python/xstatic-1.0.1
index 48e8969b3a4f..07ffb1328e36 100644
--- a/metadata/md5-cache/dev-python/xstatic-1.0.1
+++ b/metadata/md5-cache/dev-python/xstatic-1.0.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/X/XStatic/XStatic-1.0.1.tar.gz -> xstatic-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=35a73329df3416577aaaebf7be495937
diff --git a/metadata/md5-cache/dev-python/xstatic-bootstrap-scss-3.3.7.1 b/metadata/md5-cache/dev-python/xstatic-bootstrap-scss-3.3.7.1
index 03629e3689b6..6efddca92e35 100644
--- a/metadata/md5-cache/dev-python/xstatic-bootstrap-scss-3.3.7.1
+++ b/metadata/md5-cache/dev-python/xstatic-bootstrap-scss-3.3.7.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/xstatic[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/X/XStatic-Bootstrap-SCSS/XStatic-Bootstrap-SCSS-3.3.7.1.tar.gz -> xstatic-bootstrap-scss-3.3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7d72b1f74ac1256e02ea3e3f0173f00d
diff --git a/metadata/md5-cache/dev-python/xstatic-datatables-1.10.15.1 b/metadata/md5-cache/dev-python/xstatic-datatables-1.10.15.1
index eb37cb703873..bc29f22b592d 100644
--- a/metadata/md5-cache/dev-python/xstatic-datatables-1.10.15.1
+++ b/metadata/md5-cache/dev-python/xstatic-datatables-1.10.15.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/xstatic[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/X/XStatic-DataTables/XStatic-DataTables-1.10.15.1.tar.gz -> xstatic-datatables-1.10.15.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ecdccb79ff35f05dcd9499654bd8dcc3
diff --git a/metadata/md5-cache/dev-python/xstatic-jquery-1.10.2.1 b/metadata/md5-cache/dev-python/xstatic-jquery-1.10.2.1
index 2fe28309a6aa..83bf117e147b 100644
--- a/metadata/md5-cache/dev-python/xstatic-jquery-1.10.2.1
+++ b/metadata/md5-cache/dev-python/xstatic-jquery-1.10.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/xstatic[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/X/XStatic-jQuery/XStatic-jQuery-1.10.2.1.tar.gz -> xstatic-jquery-1.10.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=94b44bd9620f01b183acbf58f9c05672
diff --git a/metadata/md5-cache/dev-python/xstatic-patternfly-3.21.0.1 b/metadata/md5-cache/dev-python/xstatic-patternfly-3.21.0.1
index 970057e03f1b..cd87aa51ea40 100644
--- a/metadata/md5-cache/dev-python/xstatic-patternfly-3.21.0.1
+++ b/metadata/md5-cache/dev-python/xstatic-patternfly-3.21.0.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/xstatic[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/X/XStatic-Patternfly/XStatic-Patternfly-3.21.0.1.tar.gz -> xstatic-patternfly-3.21.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b52892016eca9841fe502a7736182e6b
diff --git a/metadata/md5-cache/dev-python/xstatic-patternfly-bootstrap-treeview-2.1.3.2 b/metadata/md5-cache/dev-python/xstatic-patternfly-bootstrap-treeview-2.1.3.2
index 1485c3a24ccd..a6b30481200f 100644
--- a/metadata/md5-cache/dev-python/xstatic-patternfly-bootstrap-treeview-2.1.3.2
+++ b/metadata/md5-cache/dev-python/xstatic-patternfly-bootstrap-treeview-2.1.3.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/xstatic[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/X/XStatic-Patternfly-Bootstrap-Treeview/XStatic-Patternfly-Bootstrap-Treeview-2.1.3.2.tar.gz -> xstatic-patternfly-bootstrap-treeview-2.1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cbf2d6a68154a74d155780ba36e5a2e7
diff --git a/metadata/md5-cache/dev-python/xvfbwrapper-0.2.8 b/metadata/md5-cache/dev-python/xvfbwrapper-0.2.8
index bc2e555614c2..fc8616611d9a 100644
--- a/metadata/md5-cache/dev-python/xvfbwrapper-0.2.8
+++ b/metadata/md5-cache/dev-python/xvfbwrapper-0.2.8
@@ -10,5 +10,5 @@ RDEPEND=x11-base/xorg-server[xvfb] python_targets_pypy? ( >=virtual/pypy-5:0= )
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/x/xvfbwrapper/xvfbwrapper-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=de6ebf22bb88dd3654367bad940b5ffc
diff --git a/metadata/md5-cache/dev-python/xvfbwrapper-0.2.9 b/metadata/md5-cache/dev-python/xvfbwrapper-0.2.9
index b05a7ba41a79..866b4a107236 100644
--- a/metadata/md5-cache/dev-python/xvfbwrapper-0.2.9
+++ b/metadata/md5-cache/dev-python/xvfbwrapper-0.2.9
@@ -10,5 +10,5 @@ RDEPEND=x11-base/xorg-server[xvfb] python_targets_pypy? ( >=virtual/pypy-5:0= )
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/x/xvfbwrapper/xvfbwrapper-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=aded2ff36f4dcb93014c3025bebd6af4
diff --git a/metadata/md5-cache/dev-python/yappi-0.98 b/metadata/md5-cache/dev-python/yappi-0.98
index 2c5253fbe670..3260ef13b6d5 100644
--- a/metadata/md5-cache/dev-python/yappi-0.98
+++ b/metadata/md5-cache/dev-python/yappi-0.98
@@ -10,5 +10,5 @@ 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
 SRC_URI=mirror://pypi/y/yappi/yappi-0.98.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1882f730f06f1fb08112102c30812626
diff --git a/metadata/md5-cache/dev-python/yapps-2.2.0-r1 b/metadata/md5-cache/dev-python/yapps-2.2.0-r1
index bc9de2e88a32..7aebc9ad5587 100644
--- a/metadata/md5-cache/dev-python/yapps-2.2.0-r1
+++ b/metadata/md5-cache/dev-python/yapps-2.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/Y/Yapps/Yapps-2.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=299ae241f2627a4cb81d9bcffe02bc4a
diff --git a/metadata/md5-cache/dev-python/yapsy-1.11.223-r1 b/metadata/md5-cache/dev-python/yapsy-1.11.223-r1
index 767036aed21f..d1aa17d307f5 100644
--- a/metadata/md5-cache/dev-python/yapsy-1.11.223-r1
+++ b/metadata/md5-cache/dev-python/yapsy-1.11.223-r1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/yapsy/Yapsy-1.11.223/Yapsy-1.11.223.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cea23371d0430347396200f34c63812d
diff --git a/metadata/md5-cache/dev-python/yapsy-1.11.223-r2 b/metadata/md5-cache/dev-python/yapsy-1.11.223-r2
index b4b50fd26014..dc45e4e5f563 100644
--- a/metadata/md5-cache/dev-python/yapsy-1.11.223-r2
+++ b/metadata/md5-cache/dev-python/yapsy-1.11.223-r2
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/yapsy/Yapsy-1.11.223/Yapsy-1.11.223.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=86e7086ffd4af1650be9e2614509c8d2
diff --git a/metadata/md5-cache/dev-python/yaql-1.1.3 b/metadata/md5-cache/dev-python/yaql-1.1.3
index 36144220cbd7..b6b454c23fa3 100644
--- a/metadata/md5-cache/dev-python/yaql-1.1.3
+++ b/metadata/md5-cache/dev-python/yaql-1.1.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/y/yaql/yaql-1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bd30a4e10d149b80e7e56a0a87682ab0
diff --git a/metadata/md5-cache/dev-python/yarl-0.9.8-r1 b/metadata/md5-cache/dev-python/yarl-0.9.8-r1
index 923cd900668e..06a79bbe0ef8 100644
--- a/metadata/md5-cache/dev-python/yarl-0.9.8-r1
+++ b/metadata/md5-cache/dev-python/yarl-0.9.8-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/multidict[python_targets_python3_4(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/y/yarl/yarl-0.9.8.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d5f65bfcb6639fb0e19c2b20b277bf83
diff --git a/metadata/md5-cache/dev-python/yarl-1.1.1 b/metadata/md5-cache/dev-python/yarl-1.1.1
index 9c9b0f403078..143020c1f19a 100644
--- a/metadata/md5-cache/dev-python/yarl-1.1.1
+++ b/metadata/md5-cache/dev-python/yarl-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/multidict-4.0[python_targets_python3_4(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/y/yarl/yarl-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=617d2c6811cdd8db44b01eaa7d340b44
diff --git a/metadata/md5-cache/dev-python/yarl-1.2.4 b/metadata/md5-cache/dev-python/yarl-1.2.4
index 7f75e9b1d28e..9fa18df96718 100644
--- a/metadata/md5-cache/dev-python/yarl-1.2.4
+++ b/metadata/md5-cache/dev-python/yarl-1.2.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/multidict-4.0[python_targets_python3_4(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/y/yarl/yarl-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0b2e184f70a0285c6d3371e3211b0a89
diff --git a/metadata/md5-cache/dev-python/yarl-1.2.6 b/metadata/md5-cache/dev-python/yarl-1.2.6
index 0d36d2ad0073..623c67d38487 100644
--- a/metadata/md5-cache/dev-python/yarl-1.2.6
+++ b/metadata/md5-cache/dev-python/yarl-1.2.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/multidict-4.0[python_targets_python3_4(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/y/yarl/yarl-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0b2e184f70a0285c6d3371e3211b0a89
diff --git a/metadata/md5-cache/dev-python/yaswfp-0.9.3 b/metadata/md5-cache/dev-python/yaswfp-0.9.3
index 2c912121802f..78d46547e097 100644
--- a/metadata/md5-cache/dev-python/yaswfp-0.9.3
+++ b/metadata/md5-cache/dev-python/yaswfp-0.9.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/y/yaswfp/yaswfp-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6e59c7c002f57c32b1ab6f5352e23855
diff --git a/metadata/md5-cache/dev-python/yenc-0.4.0-r1 b/metadata/md5-cache/dev-python/yenc-0.4.0-r1
index 7ff5607ce5ba..dcd61391114c 100644
--- a/metadata/md5-cache/dev-python/yenc-0.4.0-r1
+++ b/metadata/md5-cache/dev-python/yenc-0.4.0-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=http://www.golug.it/pub/yenc/yenc-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2f2a1b087a67ea23566bfab4748e12ad
diff --git a/metadata/md5-cache/dev-python/yolk-0.4.3-r1 b/metadata/md5-cache/dev-python/yolk-0.4.3-r1
index e80f3b85a4f6..c0d9a3e922a5 100644
--- a/metadata/md5-cache/dev-python/yolk-0.4.3-r1
+++ b/metadata/md5-cache/dev-python/yolk-0.4.3-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools dev-python/yolk-portage python_targets_pypy? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/y/yolk/yolk-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c2df2e0410fe3ba99bfa91a4288b4c1d
diff --git a/metadata/md5-cache/dev-python/yolk-portage-0.1-r1 b/metadata/md5-cache/dev-python/yolk-portage-0.1-r1
index bc38df6dac71..962fe5595a5c 100644
--- a/metadata/md5-cache/dev-python/yolk-portage-0.1-r1
+++ b/metadata/md5-cache/dev-python/yolk-portage-0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=app-portage/portage-utils-0.1.23 python_targets_pypy? ( >=virtual/pypy
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/y/yolk-portage/yolk-portage-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b094b9ee4b6f6be62062c7b462e15bb4
diff --git a/metadata/md5-cache/dev-python/yubiotp-0.2.1 b/metadata/md5-cache/dev-python/yubiotp-0.2.1
index 8ca26519869c..450d3e7e012e 100644
--- a/metadata/md5-cache/dev-python/yubiotp-0.2.1
+++ b/metadata/md5-cache/dev-python/yubiotp-0.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/Y/YubiOTP/YubiOTP-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=af5e1a34de9abac0696a35b455201862
diff --git a/metadata/md5-cache/dev-python/zVMCloudConnector-1.2.2 b/metadata/md5-cache/dev-python/zVMCloudConnector-1.2.2
index 8dc32c9be7aa..74bf1aeac40f 100644
--- a/metadata/md5-cache/dev-python/zVMCloudConnector-1.2.2
+++ b/metadata/md5-cache/dev-python/zVMCloudConnector-1.2.2
@@ -10,5 +10,5 @@ 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
 SRC_URI=mirror://pypi/z/zVMCloudConnector/zVMCloudConnector-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4f1b140609120a9717f0136fe4951796
diff --git a/metadata/md5-cache/dev-python/zake-0.2.1 b/metadata/md5-cache/dev-python/zake-0.2.1
index c3f90d02cd96..b7be98b77fc8 100644
--- a/metadata/md5-cache/dev-python/zake-0.2.1
+++ b/metadata/md5-cache/dev-python/zake-0.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/kazoo[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/z/zake/zake-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b083193301172bc2b73a8c70912b64bc
diff --git a/metadata/md5-cache/dev-python/zbase32-1.1.5 b/metadata/md5-cache/dev-python/zbase32-1.1.5
index 190e72e915d0..5d1dfc326e5d 100644
--- a/metadata/md5-cache/dev-python/zbase32-1.1.5
+++ b/metadata/md5-cache/dev-python/zbase32-1.1.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyutil[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/z/zbase32/zbase32-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5e0bb69a446dd7e8c64fae0d65662bd8
diff --git a/metadata/md5-cache/dev-python/zc-buildout-2.5.3-r1 b/metadata/md5-cache/dev-python/zc-buildout-2.5.3-r1
index 288313b8cac5..709d86863cbe 100644
--- a/metadata/md5-cache/dev-python/zc-buildout-2.5.3-r1
+++ b/metadata/md5-cache/dev-python/zc-buildout-2.5.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/setuptools-3.3[python_targets_pypy(-)?,python_targets_pypy3
 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/z/zc.buildout/zc.buildout-2.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bf0eb053e521c1bdc1e2198b510e68ef
diff --git a/metadata/md5-cache/dev-python/zeep-2.4.0 b/metadata/md5-cache/dev-python/zeep-2.4.0
index 723fc1451a39..727d403e1315 100644
--- a/metadata/md5-cache/dev-python/zeep-2.4.0
+++ b/metadata/md5-cache/dev-python/zeep-2.4.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools >=dev-python/appdirs-1.4.0 >=dev-python/cached-pro
 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/z/zeep/zeep-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=02e33300f9aee6a7b06d2e8e2c69ac69
diff --git a/metadata/md5-cache/dev-python/zeep-2.5.0 b/metadata/md5-cache/dev-python/zeep-2.5.0
index deb2fc00e940..05e600eb2a89 100644
--- a/metadata/md5-cache/dev-python/zeep-2.5.0
+++ b/metadata/md5-cache/dev-python/zeep-2.5.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools >=dev-python/appdirs-1.4.0 >=dev-python/cached-pro
 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/z/zeep/zeep-2.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=929444cd0607141877cd0c9eb195595f
diff --git a/metadata/md5-cache/dev-python/zeep-3.1.0 b/metadata/md5-cache/dev-python/zeep-3.1.0
index d1660d747951..043d74bcbb77 100644
--- a/metadata/md5-cache/dev-python/zeep-3.1.0
+++ b/metadata/md5-cache/dev-python/zeep-3.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools >=dev-python/appdirs-1.4.0 >=dev-python/attrs-17.2
 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/z/zeep/zeep-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=af5051699004e71c1acbd9bad3cbd89b
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.19.1 b/metadata/md5-cache/dev-python/zeroconf-0.19.1
index f12f2e8826eb..d22c59455dcb 100644
--- a/metadata/md5-cache/dev-python/zeroconf-0.19.1
+++ b/metadata/md5-cache/dev-python/zeroconf-0.19.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/z/zeroconf/zeroconf-0.19.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a4cfc54fe1ec0ccf9c383eb7bb4de418
diff --git a/metadata/md5-cache/dev-python/zfec-1.4.24 b/metadata/md5-cache/dev-python/zfec-1.4.24
index 0121f45329d0..1b7119a5702e 100644
--- a/metadata/md5-cache/dev-python/zfec-1.4.24
+++ b/metadata/md5-cache/dev-python/zfec-1.4.24
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyutil[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/z/zfec/zfec-1.4.24.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=987afb00e024b37b89e2b424ef3e5859
diff --git a/metadata/md5-cache/dev-python/zict-0.1.2 b/metadata/md5-cache/dev-python/zict-0.1.2
index 6f4c200fa44b..c30502dc03d5 100644
--- a/metadata/md5-cache/dev-python/zict-0.1.2
+++ b/metadata/md5-cache/dev-python/zict-0.1.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/HeapDict[python_targets_python2_7(-)?,python_targets_python3_
 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/zict/zict-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=50d31b3d86a03f3b287afc2bd171c885
diff --git a/metadata/md5-cache/dev-python/zict-0.1.3 b/metadata/md5-cache/dev-python/zict-0.1.3
index c4eaa3965724..530170243cca 100644
--- a/metadata/md5-cache/dev-python/zict-0.1.3
+++ b/metadata/md5-cache/dev-python/zict-0.1.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/HeapDict[python_targets_python2_7(-)?,python_targets_python3_
 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/zict/zict-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=74b34caff5b28c7ed14e15d5513e9768
diff --git a/metadata/md5-cache/dev-python/zope-component-4.3.0-r1 b/metadata/md5-cache/dev-python/zope-component-4.3.0-r1
index b2deeebb4848..f787b28f5d50 100644
--- a/metadata/md5-cache/dev-python/zope-component-4.3.0-r1
+++ b/metadata/md5-cache/dev-python/zope-component-4.3.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.component/zope.component-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d77e98165577ee348b243d2c877bfd64
diff --git a/metadata/md5-cache/dev-python/zope-component-4.4.1 b/metadata/md5-cache/dev-python/zope-component-4.4.1
index 50df860b1302..6f8dabd2836b 100644
--- a/metadata/md5-cache/dev-python/zope-component-4.4.1
+++ b/metadata/md5-cache/dev-python/zope-component-4.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.component/zope.component-4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=913b81b84c4404b76eb6ddee6044a6a3
diff --git a/metadata/md5-cache/dev-python/zope-configuration-4.1.0 b/metadata/md5-cache/dev-python/zope-configuration-4.1.0
index 5af3906edcdd..bb081634931e 100644
--- a/metadata/md5-cache/dev-python/zope-configuration-4.1.0
+++ b/metadata/md5-cache/dev-python/zope-configuration-4.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.configuration/zope.configuration-4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=44fe0a1d0f7bff60000f2fe3b116bdb7
diff --git a/metadata/md5-cache/dev-python/zope-deprecation-4.2.0 b/metadata/md5-cache/dev-python/zope-deprecation-4.2.0
index 16c346450bd9..389f5f5ebdf0 100644
--- a/metadata/md5-cache/dev-python/zope-deprecation-4.2.0
+++ b/metadata/md5-cache/dev-python/zope-deprecation-4.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/namespace-zope[python_targets_pypy(-)?,python_targets_pypy3(-
 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/z/zope.deprecation/zope.deprecation-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4f92ba3f69ad5562789e54fb150973bf
diff --git a/metadata/md5-cache/dev-python/zope-event-4.2.0 b/metadata/md5-cache/dev-python/zope-event-4.2.0
index b2eeb5f6be01..f23c9d44572d 100644
--- a/metadata/md5-cache/dev-python/zope-event-4.2.0
+++ b/metadata/md5-cache/dev-python/zope-event-4.2.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 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/z/zope.event/zope.event-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=077d1100751a1c6508ad043e88c0a06d
diff --git a/metadata/md5-cache/dev-python/zope-event-4.3.0 b/metadata/md5-cache/dev-python/zope-event-4.3.0
index bb81e5008115..c22583a85856 100644
--- a/metadata/md5-cache/dev-python/zope-event-4.3.0
+++ b/metadata/md5-cache/dev-python/zope-event-4.3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/namespace-zope[python_targets_pypy(-)?,python_targets_pypy3(-
 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/z/zope.event/zope.event-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3f78ee9dbd349332e52bfd2106795b61
diff --git a/metadata/md5-cache/dev-python/zope-exceptions-4.1.0 b/metadata/md5-cache/dev-python/zope-exceptions-4.1.0
index 349db370f905..4308179fb7f4 100644
--- a/metadata/md5-cache/dev-python/zope-exceptions-4.1.0
+++ b/metadata/md5-cache/dev-python/zope-exceptions-4.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/namespace-zope[python_targets_pypy(-)?,python_targets_pypy3(-
 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/z/zope.exceptions/zope.exceptions-4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4add67ac801de382f0b75ff3ba4ff443
diff --git a/metadata/md5-cache/dev-python/zope-i18nmessageid-4.1.0 b/metadata/md5-cache/dev-python/zope-i18nmessageid-4.1.0
index e18362532b77..c867729279a1 100644
--- a/metadata/md5-cache/dev-python/zope-i18nmessageid-4.1.0
+++ b/metadata/md5-cache/dev-python/zope-i18nmessageid-4.1.0
@@ -10,5 +10,5 @@ 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
 SRC_URI=mirror://pypi/z/zope.i18nmessageid/zope.i18nmessageid-4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3715445a7ad6655a529eed8d66321ae7
diff --git a/metadata/md5-cache/dev-python/zope-interface-4.1.1 b/metadata/md5-cache/dev-python/zope-interface-4.1.1
index fa84ff815f69..0ae0bd8805c7 100644
--- a/metadata/md5-cache/dev-python/zope-interface-4.1.1
+++ b/metadata/md5-cache/dev-python/zope-interface-4.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.interface/zope.interface-4.1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2aac8909e256da597a8e9fa1b886ae57
diff --git a/metadata/md5-cache/dev-python/zope-interface-4.3.2 b/metadata/md5-cache/dev-python/zope-interface-4.3.2
index b70fa73e4ea6..e0832cf65b32 100644
--- a/metadata/md5-cache/dev-python/zope-interface-4.3.2
+++ b/metadata/md5-cache/dev-python/zope-interface-4.3.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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/z/zope.interface/zope.interface-4.3.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4a14e78fbb8190b8b58642a5a9ac8b3c
diff --git a/metadata/md5-cache/dev-python/zope-interface-4.4.3 b/metadata/md5-cache/dev-python/zope-interface-4.4.3
index 9ecabb996896..439ddc27f125 100644
--- a/metadata/md5-cache/dev-python/zope-interface-4.4.3
+++ b/metadata/md5-cache/dev-python/zope-interface-4.4.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/namespace-zope[python_targets_pypy(-)?,python_targets_pypy3(-
 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/z/zope.interface/zope.interface-4.4.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=69c5dfa816f9310141abdc7ef420a324
diff --git a/metadata/md5-cache/dev-python/zope-interface-4.5.0 b/metadata/md5-cache/dev-python/zope-interface-4.5.0
index e70b0d09dace..cb449899ee02 100644
--- a/metadata/md5-cache/dev-python/zope-interface-4.5.0
+++ b/metadata/md5-cache/dev-python/zope-interface-4.5.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/namespace-zope[python_targets_pypy(-)?,python_targets_pypy3(-
 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/z/zope.interface/zope.interface-4.5.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2bb895d26b7e52f690da02c8a7f5d9c4
diff --git a/metadata/md5-cache/dev-python/zope-schema-4.5.0 b/metadata/md5-cache/dev-python/zope-schema-4.5.0
index 892fcc798e5c..68051c28ddca 100644
--- a/metadata/md5-cache/dev-python/zope-schema-4.5.0
+++ b/metadata/md5-cache/dev-python/zope-schema-4.5.0
@@ -10,5 +10,5 @@ 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
 SRC_URI=mirror://pypi/z/zope.schema/zope.schema-4.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bcb5505c047fd4d45aa4ee0e11c25695
diff --git a/metadata/md5-cache/dev-python/zope-testing-4.6.2 b/metadata/md5-cache/dev-python/zope-testing-4.6.2
index a18b29cabe63..5033250463f0 100644
--- a/metadata/md5-cache/dev-python/zope-testing-4.6.2
+++ b/metadata/md5-cache/dev-python/zope-testing-4.6.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/namespace-zope[python_targets_pypy(-)?,python_targets_pypy3(-
 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/z/zope.testing/zope.testing-4.6.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=523c0e10df2a85c941a6f389ad58333e
diff --git a/metadata/md5-cache/dev-python/zope-testrunner-4.7.0 b/metadata/md5-cache/dev-python/zope-testrunner-4.7.0
index 871f6627d44e..78f8999670fc 100644
--- a/metadata/md5-cache/dev-python/zope-testrunner-4.7.0
+++ b/metadata/md5-cache/dev-python/zope-testrunner-4.7.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/namespace-zope[python_targets_pypy(-)?,python_targets_pypy3(-
 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/z/zope.testrunner/zope.testrunner-4.7.0.zip
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=51524aaca3b2dd14ebd7c777c31e7baa
diff --git a/metadata/md5-cache/dev-python/zsi-2.1_alpha1-r1 b/metadata/md5-cache/dev-python/zsi-2.1_alpha1-r1
index 740fd7f738af..9a22ec62a055 100644
--- a/metadata/md5-cache/dev-python/zsi-2.1_alpha1-r1
+++ b/metadata/md5-cache/dev-python/zsi-2.1_alpha1-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 ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pywebsvcs/ZSI-2.1-a1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c4586c74e0db37945d10fc784ae99293
diff --git a/metadata/md5-cache/dev-python/zstandard-0.8.1 b/metadata/md5-cache/dev-python/zstandard-0.8.1
index d50b65ba2f56..c927cd00b19d 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 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=7e2de1d3c629edc84a19d1a5dec8d0f2
+_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
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index a904804ae1b5..cde253e86e00 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 9f3bdd0eb084..481a0aace9a7 100644
--- a/metadata/md5-cache/dev-qt/assistant-5.11.1
+++ b/metadata/md5-cache/dev-qt/assistant-5.11.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt/qthelp-5.11.1 ~dev-qt
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-qt/assistant-5.9.6 b/metadata/md5-cache/dev-qt/assistant-5.9.6
index 192fc5146c96..d33ad98cabb2 100644
--- a/metadata/md5-cache/dev-qt/assistant-5.9.6
+++ b/metadata/md5-cache/dev-qt/assistant-5.9.6
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtgui-5.9.6 ~dev-qt/qthelp-5.9.6 ~dev-qt/qt
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qttools-opensource-src-5.9.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=03de0ad856dfb96645b0c2f49e535fe1
diff --git a/metadata/md5-cache/dev-qt/designer-5.11.1 b/metadata/md5-cache/dev-qt/designer-5.11.1
index 7ec641580300..b042bba8a0ef 100644
--- a/metadata/md5-cache/dev-qt/designer-5.11.1
+++ b/metadata/md5-cache/dev-qt/designer-5.11.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt/qtnetwork-5.11.1 ~dev
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-qt/designer-5.9.6 b/metadata/md5-cache/dev-qt/designer-5.9.6
index 91e161ffe552..3f81090c36b7 100644
--- a/metadata/md5-cache/dev-qt/designer-5.9.6
+++ b/metadata/md5-cache/dev-qt/designer-5.9.6
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtgui-5.9.6 ~dev-qt/qtnetwork-5.9.6 ~dev-qt
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qttools-opensource-src-5.9.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=904a74cf2c37c853cccf983345d4ac99
diff --git a/metadata/md5-cache/dev-qt/linguist-5.11.1 b/metadata/md5-cache/dev-qt/linguist-5.11.1
index 4c26bf14f67a..6a7acfd70ff2 100644
--- a/metadata/md5-cache/dev-qt/linguist-5.11.1
+++ b/metadata/md5-cache/dev-qt/linguist-5.11.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/designer-5.11.1 ~dev-qt/qtcore-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-qt/linguist-5.9.6 b/metadata/md5-cache/dev-qt/linguist-5.9.6
index a42fb478cfd4..13e8d085bc6f 100644
--- a/metadata/md5-cache/dev-qt/linguist-5.9.6
+++ b/metadata/md5-cache/dev-qt/linguist-5.9.6
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/designer-5.9.6 ~dev-qt/qtcore-5.9.6 ~dev-qt/qtgui-5.9.6 ~dev-qt/
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qttools-opensource-src-5.9.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bb03fa13bc4479f0720ae47b128e3b7f
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-5.11.1 b/metadata/md5-cache/dev-qt/qdbusviewer-5.11.1
index b69019e618cf..83f478cadd6e 100644
--- a/metadata/md5-cache/dev-qt/qdbusviewer-5.11.1
+++ b/metadata/md5-cache/dev-qt/qdbusviewer-5.11.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.11.1 ~dev-qt/qtdbus-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-5.9.6 b/metadata/md5-cache/dev-qt/qdbusviewer-5.9.6
index a42e94e47027..4289b68ff258 100644
--- a/metadata/md5-cache/dev-qt/qdbusviewer-5.9.6
+++ b/metadata/md5-cache/dev-qt/qdbusviewer-5.9.6
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.6 ~dev-qt/qtdbus-5.9.6 ~dev-qt/qtgui-5.9.6 ~dev-qt/qt
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qttools-opensource-src-5.9.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4053e2bc1fadb80cc38fdbf9e4b4162d
diff --git a/metadata/md5-cache/dev-qt/qt-creator-4.6.2 b/metadata/md5-cache/dev-qt/qt-creator-4.6.2
index 05016c1bdf62..5ae5ccc88361 100644
--- a/metadata/md5-cache/dev-qt/qt-creator-4.6.2
+++ b/metadata/md5-cache/dev-qt/qt-creator-4.6.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND==dev-libs/botan-1.10*[-bindist,threads] >=dev-qt/qtconcurrent-5.6.2:5 >=dev-qt/qtcore-5.6.2:5 >=dev-qt/qtdeclarative-5.6.2:5[widgets] >=dev-qt/qtgui-5.6.2:5 >=dev-qt/qthelp-5.6.2:5 >=dev-qt/qtnetwork-5.6.2:5[ssl] >=dev-qt/qtprintsupport-5.6.2:5 >=dev-qt/qtquickcontrols-5.6.2:5 >=dev-qt/qtscript-5.6.2:5 >=dev-qt/qtsql-5.6.2:5[sqlite] >=dev-qt/qtsvg-5.6.2:5 >=dev-qt/qtwidgets-5.6.2:5 >=dev-qt/qtx11extras-5.6.2:5 >=dev-qt/qtxml-5.6.2:5 clangcodemodel? ( >=sys-devel/clang-5:= ) designer? ( >=dev-qt/designer-5.6.2:5 ) qbs? ( >=dev-util/qbs-1.11.1 ) systemd? ( sys-apps/systemd:= ) webengine? ( >=dev-qt/qtwebengine-5.6.2:5[widgets] ) sys-devel/gdb[client,python] autotools? ( sys-devel/autoconf ) bazaar? ( dev-vcs/bzr ) clangstaticanalyzer? ( >=sys-devel/clang-5:* ) cmake? ( dev-util/cmake[server(+)] ) cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) subversion? ( dev-vcs/subversion ) valgrind? ( dev-util/valgrind ) l10n_cs? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_de? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_fr? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_ja? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_pl? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_ru? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_sl? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_uk? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_zh-CN? ( >=dev-qt/qttranslations-5.6.2:5 ) l10n_zh-TW? ( >=dev-qt/qttranslations-5.6.2:5 )
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qtcreator/4.6/4.6.2/qt-creator-opensource-src-4.6.2.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	llvm	01fccd3367b527770b74bfbf59d616c6	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	llvm	01fccd3367b527770b74bfbf59d616c6	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5b278ccfead57f6554f85d58d26a30fc
diff --git a/metadata/md5-cache/dev-qt/qt-creator-9999 b/metadata/md5-cache/dev-qt/qt-creator-9999
index 9b8289057065..756d65942ca0 100644
--- a/metadata/md5-cache/dev-qt/qt-creator-9999
+++ b/metadata/md5-cache/dev-qt/qt-creator-9999
@@ -7,5 +7,5 @@ IUSE=doc systemd test +webengine android autotools baremetal bazaar clangcodemod
 LICENSE=GPL-3
 RDEPEND==dev-libs/botan-1.10*[-bindist,threads] >=dev-qt/qtconcurrent-5.9.0:5 >=dev-qt/qtcore-5.9.0:5 >=dev-qt/qtdeclarative-5.9.0:5[widgets] >=dev-qt/qtgui-5.9.0:5 >=dev-qt/qthelp-5.9.0:5 >=dev-qt/qtnetwork-5.9.0:5[ssl] >=dev-qt/qtprintsupport-5.9.0:5 >=dev-qt/qtquickcontrols-5.9.0:5 >=dev-qt/qtscript-5.9.0:5 >=dev-qt/qtsql-5.9.0:5[sqlite] >=dev-qt/qtsvg-5.9.0:5 >=dev-qt/qtwidgets-5.9.0:5 >=dev-qt/qtx11extras-5.9.0:5 >=dev-qt/qtxml-5.9.0:5 clangcodemodel? ( >=sys-devel/clang-6:= ) designer? ( >=dev-qt/designer-5.9.0:5 ) qbs? ( >=dev-util/qbs-1.11.1 ) systemd? ( sys-apps/systemd:= ) webengine? ( >=dev-qt/qtwebengine-5.9.0:5[widgets] ) sys-devel/gdb[client,python] autotools? ( sys-devel/autoconf ) bazaar? ( dev-vcs/bzr ) clangstaticanalyzer? ( >=sys-devel/clang-6:* ) cmake? ( dev-util/cmake[server(+)] ) cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) subversion? ( dev-vcs/subversion ) valgrind? ( dev-util/valgrind ) l10n_cs? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_de? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_fr? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_ja? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_pl? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_ru? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_sl? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_uk? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_zh-CN? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_zh-TW? ( >=dev-qt/qttranslations-5.9.0:5 )
 SLOT=0
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=eb7e29a7e10b23c896b5bb14858c84a3
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-5.9.6 b/metadata/md5-cache/dev-qt/qtpositioning-5.9.6
index 1ae981cfaef9..c00210788187 100644
--- a/metadata/md5-cache/dev-qt/qtpositioning-5.9.6
+++ b/metadata/md5-cache/dev-qt/qtpositioning-5.9.6
@@ -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 ~sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PDEPEND=geoclue? ( app-misc/geoclue:0 )
 RDEPEND=~dev-qt/qtcore-5.9.6 geoclue? ( ~dev-qt/qtdbus-5.9.6 ) qml? ( ~dev-qt/qtdeclarative-5.9.6 ) dev-qt/qtchooser
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtlocation-opensource-src-5.9.6.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_=391f5c7ba6d2d6bbce2abc2d6689eb32
+_md5_=8bc6c815ca0c74d1208cab6562a25fe5
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 08c294778ddc..6d8bc2538451 100644
--- a/metadata/md5-cache/dev-qt/qtwebkit-5.212.0_pre20180120
+++ b/metadata/md5-cache/dev-qt/qtwebkit-5.212.0_pre20180120
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 dev-libs/icu:= dev-libs/libxml2 dev-libs/libxslt >=dev-q
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-ros/Manifest.gz b/metadata/md5-cache/dev-ros/Manifest.gz
index 2df2de9ad84f..21e29b00e43c 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/actionlib-1.11.13 b/metadata/md5-cache/dev-ros/actionlib-1.11.13
index e30326437e8c..553642764729 100644
--- a/metadata/md5-cache/dev-ros/actionlib-1.11.13
+++ b/metadata/md5-cache/dev-ros/actionlib-1.11.13
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/actionlib/archive/1.11.13.tar.gz -> actionlib-1.11.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5ab96e65318da9a1efba87949fdafb37
diff --git a/metadata/md5-cache/dev-ros/actionlib-1.11.14 b/metadata/md5-cache/dev-ros/actionlib-1.11.14
index 73886287a665..33c35a52c1dd 100644
--- a/metadata/md5-cache/dev-ros/actionlib-1.11.14
+++ b/metadata/md5-cache/dev-ros/actionlib-1.11.14
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/actionlib/archive/1.11.14.tar.gz -> actionlib-1.11.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5ab96e65318da9a1efba87949fdafb37
diff --git a/metadata/md5-cache/dev-ros/actionlib-1.11.15 b/metadata/md5-cache/dev-ros/actionlib-1.11.15
index 319623ff35f1..6b8d2a03a321 100644
--- a/metadata/md5-cache/dev-ros/actionlib-1.11.15
+++ b/metadata/md5-cache/dev-ros/actionlib-1.11.15
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/actionlib/archive/1.11.15.tar.gz -> actionlib-1.11.15.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5ab96e65318da9a1efba87949fdafb37
diff --git a/metadata/md5-cache/dev-ros/actionlib-9999 b/metadata/md5-cache/dev-ros/actionlib-9999
index b3204c497701..70728432efbb 100644
--- a/metadata/md5-cache/dev-ros/actionlib-9999
+++ b/metadata/md5-cache/dev-ros/actionlib-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost:=[threads] dev-ros/roscpp 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/rostopic[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/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=03f3ff13a005c41353360f7ce667febf
diff --git a/metadata/md5-cache/dev-ros/actionlib_msgs-1.12.5 b/metadata/md5-cache/dev-ros/actionlib_msgs-1.12.5
index b795a6a41ec6..d89f2125eb92 100644
--- a/metadata/md5-cache/dev-ros/actionlib_msgs-1.12.5
+++ b/metadata/md5-cache/dev-ros/actionlib_msgs-1.12.5
@@ -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/ros/common_msgs/archive/1.12.5.tar.gz -> common_msgs-1.12.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=afa429dadfd8aa869828788f67a8a030
diff --git a/metadata/md5-cache/dev-ros/actionlib_msgs-1.12.6 b/metadata/md5-cache/dev-ros/actionlib_msgs-1.12.6
index 6d78c87c4a05..8c817b654f14 100644
--- a/metadata/md5-cache/dev-ros/actionlib_msgs-1.12.6
+++ b/metadata/md5-cache/dev-ros/actionlib_msgs-1.12.6
@@ -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/ros/common_msgs/archive/1.12.6.tar.gz -> common_msgs-1.12.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=799ceee85266af6c0384d76672706ffe
diff --git a/metadata/md5-cache/dev-ros/actionlib_msgs-9999 b/metadata/md5-cache/dev-ros/actionlib_msgs-9999
index 92807eb93842..585464565a9a 100644
--- a/metadata/md5-cache/dev-ros/actionlib_msgs-9999
+++ b/metadata/md5-cache/dev-ros/actionlib_msgs-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=afa429dadfd8aa869828788f67a8a030
diff --git a/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.10 b/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.10
index 493d908c0162..144923a58761 100644
--- a/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.10
+++ b/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.10
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/actionlib dev-libs/boost:=[threads] python_target
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/common_tutorials/archive/0.1.10.tar.gz -> common_tutorials-0.1.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9582a328a342f40132aeeca68ba80921
diff --git a/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.11 b/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.11
index e2be660500e4..f82767c0340e 100644
--- a/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.11
+++ b/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.11
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/actionlib dev-libs/boost:=[threads] python_target
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/common_tutorials/archive/0.1.11.tar.gz -> common_tutorials-0.1.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d44304a075715ff6392544dd01ed9eeb
diff --git a/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.8 b/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.8
index 964fa38bb0ed..071241029857 100644
--- a/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.8
+++ b/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.8
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/actionlib dev-libs/boost:=[threads] python_target
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/common_tutorials/archive/0.1.8.tar.gz -> common_tutorials-0.1.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=aa06261fb363190490e88c5d8634e5aa
diff --git a/metadata/md5-cache/dev-ros/actionlib_tutorials-9999 b/metadata/md5-cache/dev-ros/actionlib_tutorials-9999
index 430d24b91039..e46d0a20ed5a 100644
--- a/metadata/md5-cache/dev-ros/actionlib_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/actionlib_tutorials-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/actionlib dev-libs/boost:=[threads] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=aa06261fb363190490e88c5d8634e5aa
diff --git a/metadata/md5-cache/dev-ros/amcl-1.16.1 b/metadata/md5-cache/dev-ros/amcl-1.16.1
index 127471b07e96..708d5651ca41 100644
--- a/metadata/md5-cache/dev-ros/amcl-1.16.1
+++ b/metadata/md5-cache/dev-ros/amcl-1.16.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.1.tar.gz -> navigation-1.16.1.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=be834cde3d67befef47d893f5a7709af
diff --git a/metadata/md5-cache/dev-ros/amcl-1.16.2 b/metadata/md5-cache/dev-ros/amcl-1.16.2
index 10a3807a78ba..cf84d287814b 100644
--- a/metadata/md5-cache/dev-ros/amcl-1.16.2
+++ b/metadata/md5-cache/dev-ros/amcl-1.16.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz -> navigation-1.16.2.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=be834cde3d67befef47d893f5a7709af
diff --git a/metadata/md5-cache/dev-ros/amcl-9999 b/metadata/md5-cache/dev-ros/amcl-9999
index 5e8a54e50895..a964132ed174 100644
--- a/metadata/md5-cache/dev-ros/amcl-9999
+++ b/metadata/md5-cache/dev-ros/amcl-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/message_filters dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=be834cde3d67befef47d893f5a7709af
diff --git a/metadata/md5-cache/dev-ros/angles-1.9.11 b/metadata/md5-cache/dev-ros/angles-1.9.11
index b44042e82379..38de8ce28e5e 100644
--- a/metadata/md5-cache/dev-ros/angles-1.9.11
+++ b/metadata/md5-cache/dev-ros/angles-1.9.11
@@ -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/ros/angles/archive/1.9.11.tar.gz -> angles-1.9.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d5d90c6f138ac9fac6f49a222da12f93
diff --git a/metadata/md5-cache/dev-ros/angles-9999 b/metadata/md5-cache/dev-ros/angles-9999
index 932dd3a38bd8..1e786a24abea 100644
--- a/metadata/md5-cache/dev-ros/angles-9999
+++ b/metadata/md5-cache/dev-ros/angles-9999
@@ -8,5 +8,5 @@ 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=d5d90c6f138ac9fac6f49a222da12f93
diff --git a/metadata/md5-cache/dev-ros/audio_capture-0.3.1 b/metadata/md5-cache/dev-ros/audio_capture-0.3.1
index b22196d34f73..a5c6f3966cc7 100644
--- a/metadata/md5-cache/dev-ros/audio_capture-0.3.1
+++ b/metadata/md5-cache/dev-ros/audio_capture-0.3.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/b
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.1.tar.gz -> audio_common-0.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=287d727cb5ff74f279bb4e27d1f936f8
diff --git a/metadata/md5-cache/dev-ros/audio_capture-0.3.2 b/metadata/md5-cache/dev-ros/audio_capture-0.3.2
index 1de2ca256b21..dde51b2b6704 100644
--- a/metadata/md5-cache/dev-ros/audio_capture-0.3.2
+++ b/metadata/md5-cache/dev-ros/audio_capture-0.3.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/b
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.2.tar.gz -> audio_common-0.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=dc96ebfa250557a8f8d859e0c7d89272
diff --git a/metadata/md5-cache/dev-ros/audio_capture-0.3.3 b/metadata/md5-cache/dev-ros/audio_capture-0.3.3
index fc8e23645e54..64440bd3cc3a 100644
--- a/metadata/md5-cache/dev-ros/audio_capture-0.3.3
+++ b/metadata/md5-cache/dev-ros/audio_capture-0.3.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/b
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.3.tar.gz -> audio_common-0.3.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=dc96ebfa250557a8f8d859e0c7d89272
diff --git a/metadata/md5-cache/dev-ros/audio_capture-9999 b/metadata/md5-cache/dev-ros/audio_capture-9999
index 1080f8b012b4..56136bb5ae2b 100644
--- a/metadata/md5-cache/dev-ros/audio_capture-9999
+++ b/metadata/md5-cache/dev-ros/audio_capture-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-plugins/gst-plugins-lame:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=287d727cb5ff74f279bb4e27d1f936f8
diff --git a/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.1 b/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.1
index e56632621ef2..9c954435e7b2 100644
--- a/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.1
+++ b/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.1
@@ -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/ros-drivers/audio_common/archive/0.3.1.tar.gz -> audio_common-0.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cd10faebae16bc889e55e940fef8c1c0
diff --git a/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.2 b/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.2
index ca944c83056d..5787d812050c 100644
--- a/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.2
+++ b/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.2
@@ -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/ros-drivers/audio_common/archive/0.3.2.tar.gz -> audio_common-0.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=12ffaab703d68a90bf5e477e6d30b18c
diff --git a/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.3 b/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.3
index 2a41df977078..02dd446058e9 100644
--- a/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.3
+++ b/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.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=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.3.tar.gz -> audio_common-0.3.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=12ffaab703d68a90bf5e477e6d30b18c
diff --git a/metadata/md5-cache/dev-ros/audio_common_msgs-9999 b/metadata/md5-cache/dev-ros/audio_common_msgs-9999
index 5186a3b8218e..10268ee2f247 100644
--- a/metadata/md5-cache/dev-ros/audio_common_msgs-9999
+++ b/metadata/md5-cache/dev-ros/audio_common_msgs-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=cd10faebae16bc889e55e940fef8c1c0
diff --git a/metadata/md5-cache/dev-ros/audio_play-0.3.1 b/metadata/md5-cache/dev-ros/audio_play-0.3.1
index c2f939643b8a..be65d81de92f 100644
--- a/metadata/md5-cache/dev-ros/audio_play-0.3.1
+++ b/metadata/md5-cache/dev-ros/audio_play-0.3.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/b
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.1.tar.gz -> audio_common-0.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7dd390f17e225aabbfb2ca6196d5b031
diff --git a/metadata/md5-cache/dev-ros/audio_play-0.3.2 b/metadata/md5-cache/dev-ros/audio_play-0.3.2
index 702c7511baac..c3196fe82f8d 100644
--- a/metadata/md5-cache/dev-ros/audio_play-0.3.2
+++ b/metadata/md5-cache/dev-ros/audio_play-0.3.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/b
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.2.tar.gz -> audio_common-0.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=6f23119a0cdb129965afc487214835dc
diff --git a/metadata/md5-cache/dev-ros/audio_play-0.3.3 b/metadata/md5-cache/dev-ros/audio_play-0.3.3
index 7703b94c2153..477a5559465e 100644
--- a/metadata/md5-cache/dev-ros/audio_play-0.3.3
+++ b/metadata/md5-cache/dev-ros/audio_play-0.3.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/b
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.3.tar.gz -> audio_common-0.3.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6f23119a0cdb129965afc487214835dc
diff --git a/metadata/md5-cache/dev-ros/audio_play-9999 b/metadata/md5-cache/dev-ros/audio_play-9999
index d76a1fed1c58..979be42cfbb6 100644
--- a/metadata/md5-cache/dev-ros/audio_play-9999
+++ b/metadata/md5-cache/dev-ros/audio_play-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=7dd390f17e225aabbfb2ca6196d5b031
diff --git a/metadata/md5-cache/dev-ros/base_local_planner-1.16.1 b/metadata/md5-cache/dev-ros/base_local_planner-1.16.1
index daec86a49d70..220bbc889abb 100644
--- a/metadata/md5-cache/dev-ros/base_local_planner-1.16.1
+++ b/metadata/md5-cache/dev-ros/base_local_planner-1.16.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.1.tar.gz -> navigation-1.16.1.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b3ed73ed616527b8d43769f3431cd67d
diff --git a/metadata/md5-cache/dev-ros/base_local_planner-1.16.2 b/metadata/md5-cache/dev-ros/base_local_planner-1.16.2
index 56029abb23eb..624d99d48961 100644
--- a/metadata/md5-cache/dev-ros/base_local_planner-1.16.2
+++ b/metadata/md5-cache/dev-ros/base_local_planner-1.16.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz -> navigation-1.16.2.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3f2461b494627330ad86749debfa698d
diff --git a/metadata/md5-cache/dev-ros/base_local_planner-9999 b/metadata/md5-cache/dev-ros/base_local_planner-9999
index d67bd80bf7b7..eaf2ccb3298c 100644
--- a/metadata/md5-cache/dev-ros/base_local_planner-9999
+++ b/metadata/md5-cache/dev-ros/base_local_planner-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/voxel_grid dev-libs/boost:=[threads] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=3f2461b494627330ad86749debfa698d
diff --git a/metadata/md5-cache/dev-ros/bond-1.7.19 b/metadata/md5-cache/dev-ros/bond-1.7.19
index 40ab131ee458..a17a6ee92746 100644
--- a/metadata/md5-cache/dev-ros/bond-1.7.19
+++ b/metadata/md5-cache/dev-ros/bond-1.7.19
@@ -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/ros/bond_core/archive/1.7.19.tar.gz -> bond_core-1.7.19.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6ef5aa48e1ba41f57b43c1d3d855f26b
diff --git a/metadata/md5-cache/dev-ros/bond-1.8.0 b/metadata/md5-cache/dev-ros/bond-1.8.0
index a9ec605f2589..909b542658b0 100644
--- a/metadata/md5-cache/dev-ros/bond-1.8.0
+++ b/metadata/md5-cache/dev-ros/bond-1.8.0
@@ -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/ros/bond_core/archive/1.8.0.tar.gz -> bond_core-1.8.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6ef5aa48e1ba41f57b43c1d3d855f26b
diff --git a/metadata/md5-cache/dev-ros/bond-1.8.1 b/metadata/md5-cache/dev-ros/bond-1.8.1
index 1e87a89aa0cf..56acafb45bde 100644
--- a/metadata/md5-cache/dev-ros/bond-1.8.1
+++ b/metadata/md5-cache/dev-ros/bond-1.8.1
@@ -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/ros/bond_core/archive/1.8.1.tar.gz -> bond_core-1.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6ef5aa48e1ba41f57b43c1d3d855f26b
diff --git a/metadata/md5-cache/dev-ros/bond-1.8.2 b/metadata/md5-cache/dev-ros/bond-1.8.2
index 1d1a201a121f..4e28faf822fc 100644
--- a/metadata/md5-cache/dev-ros/bond-1.8.2
+++ b/metadata/md5-cache/dev-ros/bond-1.8.2
@@ -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/ros/bond_core/archive/1.8.2.tar.gz -> bond_core-1.8.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=070f35d4d212640f003a0a29d7f379a4
diff --git a/metadata/md5-cache/dev-ros/bond-1.8.3 b/metadata/md5-cache/dev-ros/bond-1.8.3
index 0c8a4afd9387..3c1781d9fc48 100644
--- a/metadata/md5-cache/dev-ros/bond-1.8.3
+++ b/metadata/md5-cache/dev-ros/bond-1.8.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=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.8.3.tar.gz -> bond_core-1.8.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=070f35d4d212640f003a0a29d7f379a4
diff --git a/metadata/md5-cache/dev-ros/bond-9999 b/metadata/md5-cache/dev-ros/bond-9999
index 15bdce7e00b7..a7e7ce75cf0f 100644
--- a/metadata/md5-cache/dev-ros/bond-9999
+++ b/metadata/md5-cache/dev-ros/bond-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=6ef5aa48e1ba41f57b43c1d3d855f26b
diff --git a/metadata/md5-cache/dev-ros/bondcpp-1.8.1 b/metadata/md5-cache/dev-ros/bondcpp-1.8.1
index 3a994c718f67..47472d1c39c2 100644
--- a/metadata/md5-cache/dev-ros/bondcpp-1.8.1
+++ b/metadata/md5-cache/dev-ros/bondcpp-1.8.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/bond dev-ros/cmake_modules >=dev-ros/roscpp-1.13.6 dev-ros/smcli
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.8.1.tar.gz -> bond_core-1.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bbea477d091ca4cfc12d25245a394575
diff --git a/metadata/md5-cache/dev-ros/bondcpp-1.8.2 b/metadata/md5-cache/dev-ros/bondcpp-1.8.2
index f77e38ae1603..9a47f8eebc50 100644
--- a/metadata/md5-cache/dev-ros/bondcpp-1.8.2
+++ b/metadata/md5-cache/dev-ros/bondcpp-1.8.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/bond dev-ros/cmake_modules >=dev-ros/roscpp-1.13.6 dev-ros/smcli
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.8.2.tar.gz -> bond_core-1.8.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=bbea477d091ca4cfc12d25245a394575
diff --git a/metadata/md5-cache/dev-ros/bondcpp-1.8.3 b/metadata/md5-cache/dev-ros/bondcpp-1.8.3
index 4cf1a90642d2..a59cccf3448e 100644
--- a/metadata/md5-cache/dev-ros/bondcpp-1.8.3
+++ b/metadata/md5-cache/dev-ros/bondcpp-1.8.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/bond dev-ros/cmake_modules >=dev-ros/roscpp-1.13.6 dev-ros/smcli
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.8.3.tar.gz -> bond_core-1.8.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bbea477d091ca4cfc12d25245a394575
diff --git a/metadata/md5-cache/dev-ros/bondcpp-9999 b/metadata/md5-cache/dev-ros/bondcpp-9999
index 21b4402070da..7cd68e5fdfd9 100644
--- a/metadata/md5-cache/dev-ros/bondcpp-9999
+++ b/metadata/md5-cache/dev-ros/bondcpp-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/bond dev-ros/cmake_modules >=dev-ros/roscpp-1.13.6 dev-ros/smclib dev-libs/boost:= sys-apps/util-linux python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=bbea477d091ca4cfc12d25245a394575
diff --git a/metadata/md5-cache/dev-ros/bondpy-1.7.16 b/metadata/md5-cache/dev-ros/bondpy-1.7.16
index d772dbfeae65..4e62c4370d51 100644
--- a/metadata/md5-cache/dev-ros/bondpy-1.7.16
+++ b/metadata/md5-cache/dev-ros/bondpy-1.7.16
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/bond[python_targets_python2_7(-)?,-python_single_target_python2_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.7.16.tar.gz -> bond_core-1.7.16.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f977400ba9d62282d9fbd71d32c5c279
diff --git a/metadata/md5-cache/dev-ros/bondpy-1.7.17 b/metadata/md5-cache/dev-ros/bondpy-1.7.17
index c94305bf3010..e55546352d48 100644
--- a/metadata/md5-cache/dev-ros/bondpy-1.7.17
+++ b/metadata/md5-cache/dev-ros/bondpy-1.7.17
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/bond[python_targets_python2_7(-)?,-python_single_target_python2_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.7.17.tar.gz -> bond_core-1.7.17.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f977400ba9d62282d9fbd71d32c5c279
diff --git a/metadata/md5-cache/dev-ros/bondpy-1.7.18 b/metadata/md5-cache/dev-ros/bondpy-1.7.18
index 166bbeea36b1..a44f121e8999 100644
--- a/metadata/md5-cache/dev-ros/bondpy-1.7.18
+++ b/metadata/md5-cache/dev-ros/bondpy-1.7.18
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/bond[python_targets_python2_7(-)?,-python_single_target_python2_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.7.18.tar.gz -> bond_core-1.7.18.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f1d07f9c6240bc10822c62f6b5c3262e
diff --git a/metadata/md5-cache/dev-ros/bondpy-1.7.19 b/metadata/md5-cache/dev-ros/bondpy-1.7.19
index 521bae236c70..8b919e887134 100644
--- a/metadata/md5-cache/dev-ros/bondpy-1.7.19
+++ b/metadata/md5-cache/dev-ros/bondpy-1.7.19
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/bond[python_targets_python2_7(-)?,-python_single_target_python2_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.7.19.tar.gz -> bond_core-1.7.19.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a6d18ac4893104db1f0a494cdf375d77
diff --git a/metadata/md5-cache/dev-ros/bondpy-1.8.0 b/metadata/md5-cache/dev-ros/bondpy-1.8.0
index 6b55ae2550d8..1d4dec2c04f4 100644
--- a/metadata/md5-cache/dev-ros/bondpy-1.8.0
+++ b/metadata/md5-cache/dev-ros/bondpy-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/bond[python_targets_python2_7(-)?,-python_single_target_python2_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.8.0.tar.gz -> bond_core-1.8.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a6d18ac4893104db1f0a494cdf375d77
diff --git a/metadata/md5-cache/dev-ros/bondpy-1.8.1 b/metadata/md5-cache/dev-ros/bondpy-1.8.1
index c04782c622d4..45bdbc21dff7 100644
--- a/metadata/md5-cache/dev-ros/bondpy-1.8.1
+++ b/metadata/md5-cache/dev-ros/bondpy-1.8.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/bond[python_targets_python2_7(-)?,-python_single_target_python2_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.8.1.tar.gz -> bond_core-1.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a6d18ac4893104db1f0a494cdf375d77
diff --git a/metadata/md5-cache/dev-ros/bondpy-1.8.2 b/metadata/md5-cache/dev-ros/bondpy-1.8.2
index 122e1bfaeaff..42c68be57419 100644
--- a/metadata/md5-cache/dev-ros/bondpy-1.8.2
+++ b/metadata/md5-cache/dev-ros/bondpy-1.8.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/bond[python_targets_python2_7(-)?,-python_single_target_python2_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.8.2.tar.gz -> bond_core-1.8.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=22f1b77e24121b175223a6c79c0f069b
diff --git a/metadata/md5-cache/dev-ros/bondpy-1.8.3 b/metadata/md5-cache/dev-ros/bondpy-1.8.3
index df1ad9c608db..6e564668eac8 100644
--- a/metadata/md5-cache/dev-ros/bondpy-1.8.3
+++ b/metadata/md5-cache/dev-ros/bondpy-1.8.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/bond[python_targets_python2_7(-)?,-python_single_target_python2_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.8.3.tar.gz -> bond_core-1.8.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=22f1b77e24121b175223a6c79c0f069b
diff --git a/metadata/md5-cache/dev-ros/bondpy-9999 b/metadata/md5-cache/dev-ros/bondpy-9999
index 0bb2f0d98a29..06bbca82a875 100644
--- a/metadata/md5-cache/dev-ros/bondpy-9999
+++ b/metadata/md5-cache/dev-ros/bondpy-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/bond[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/smclib sys-apps/util-linux python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=f977400ba9d62282d9fbd71d32c5c279
diff --git a/metadata/md5-cache/dev-ros/calibration_estimation-0.10.13 b/metadata/md5-cache/dev-ros/calibration_estimation-0.10.13
index c6aa65786164..31f068938d0b 100644
--- a/metadata/md5-cache/dev-ros/calibration_estimation-0.10.13
+++ b/metadata/md5-cache/dev-ros/calibration_estimation-0.10.13
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.13.tar.gz -> calibration-0.10.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8af9be2e6d270e3c77a43a343f0b7906
diff --git a/metadata/md5-cache/dev-ros/calibration_estimation-0.10.14 b/metadata/md5-cache/dev-ros/calibration_estimation-0.10.14
index bcbdfb213e3b..d9f3cdec8d05 100644
--- a/metadata/md5-cache/dev-ros/calibration_estimation-0.10.14
+++ b/metadata/md5-cache/dev-ros/calibration_estimation-0.10.14
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8af9be2e6d270e3c77a43a343f0b7906
diff --git a/metadata/md5-cache/dev-ros/calibration_estimation-9999 b/metadata/md5-cache/dev-ros/calibration_estimation-9999
index 335eae41778d..b6e92e7a2da0 100644
--- a/metadata/md5-cache/dev-ros/calibration_estimation-9999
+++ b/metadata/md5-cache/dev-ros/calibration_estimation-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/calibration_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/scipy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/urdf_parser_py[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_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=8af9be2e6d270e3c77a43a343f0b7906
diff --git a/metadata/md5-cache/dev-ros/calibration_launch-0.10.13 b/metadata/md5-cache/dev-ros/calibration_launch-0.10.13
index 9f5dc3e3fe23..3d6fba961acb 100644
--- a/metadata/md5-cache/dev-ros/calibration_launch-0.10.13
+++ b/metadata/md5-cache/dev-ros/calibration_launch-0.10.13
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/interval_intersection dev-ros/joint_states_settler dev-ros/laser
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.13.tar.gz -> calibration-0.10.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f6f2fa7a9ac5d482fb1169755ab796a1
diff --git a/metadata/md5-cache/dev-ros/calibration_launch-0.10.14 b/metadata/md5-cache/dev-ros/calibration_launch-0.10.14
index 52d6c29dea8a..0e401b9037dc 100644
--- a/metadata/md5-cache/dev-ros/calibration_launch-0.10.14
+++ b/metadata/md5-cache/dev-ros/calibration_launch-0.10.14
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/interval_intersection dev-ros/joint_states_settler dev-ros/laser
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f6f2fa7a9ac5d482fb1169755ab796a1
diff --git a/metadata/md5-cache/dev-ros/calibration_launch-9999 b/metadata/md5-cache/dev-ros/calibration_launch-9999
index 098105c409d6..0d899081b9f2 100644
--- a/metadata/md5-cache/dev-ros/calibration_launch-9999
+++ b/metadata/md5-cache/dev-ros/calibration_launch-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/interval_intersection dev-ros/joint_states_settler dev-ros/laser_cb_detector dev-ros/monocam_settler dev-ros/roslaunch dev-libs/urdfdom python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=f6f2fa7a9ac5d482fb1169755ab796a1
diff --git a/metadata/md5-cache/dev-ros/calibration_msgs-0.10.14 b/metadata/md5-cache/dev-ros/calibration_msgs-0.10.14
index d6f042d3a0a8..647b9290f7d8 100644
--- a/metadata/md5-cache/dev-ros/calibration_msgs-0.10.14
+++ b/metadata/md5-cache/dev-ros/calibration_msgs-0.10.14
@@ -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/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=56b284bc2adf9c1a76bb34b710d5f5b5
diff --git a/metadata/md5-cache/dev-ros/calibration_msgs-9999 b/metadata/md5-cache/dev-ros/calibration_msgs-9999
index 5563729dae13..205d344abccf 100644
--- a/metadata/md5-cache/dev-ros/calibration_msgs-9999
+++ b/metadata/md5-cache/dev-ros/calibration_msgs-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=56b284bc2adf9c1a76bb34b710d5f5b5
diff --git a/metadata/md5-cache/dev-ros/calibration_setup_helper-0.10.13 b/metadata/md5-cache/dev-ros/calibration_setup_helper-0.10.13
index 082820ac80c5..b3ee7a6162c9 100644
--- a/metadata/md5-cache/dev-ros/calibration_setup_helper-0.10.13
+++ b/metadata/md5-cache/dev-ros/calibration_setup_helper-0.10.13
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/calibration_launch python_targets_python2_7? ( >=dev-lang/python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.13.tar.gz -> calibration-0.10.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=933a87e9b97dfeea43fec0ea5ac7f7e8
diff --git a/metadata/md5-cache/dev-ros/calibration_setup_helper-0.10.14 b/metadata/md5-cache/dev-ros/calibration_setup_helper-0.10.14
index ac8d17a2bc79..78f45c99a645 100644
--- a/metadata/md5-cache/dev-ros/calibration_setup_helper-0.10.14
+++ b/metadata/md5-cache/dev-ros/calibration_setup_helper-0.10.14
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/calibration_launch python_targets_python2_7? ( >=dev-lang/python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=933a87e9b97dfeea43fec0ea5ac7f7e8
diff --git a/metadata/md5-cache/dev-ros/calibration_setup_helper-9999 b/metadata/md5-cache/dev-ros/calibration_setup_helper-9999
index 45f7fdb53deb..255678597de2 100644
--- a/metadata/md5-cache/dev-ros/calibration_setup_helper-9999
+++ b/metadata/md5-cache/dev-ros/calibration_setup_helper-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/calibration_launch python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=933a87e9b97dfeea43fec0ea5ac7f7e8
diff --git a/metadata/md5-cache/dev-ros/camera_calibration-1.12.14 b/metadata/md5-cache/dev-ros/camera_calibration-1.12.14
index a885ebf6b66f..ea7eb9662a3a 100644
--- a/metadata/md5-cache/dev-ros/camera_calibration-1.12.14
+++ b/metadata/md5-cache/dev-ros/camera_calibration-1.12.14
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.14.tar.gz -> image_pipeline-1.12.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fa14cf3e4586fb62e999ea82d259c56b
diff --git a/metadata/md5-cache/dev-ros/camera_calibration-1.12.15 b/metadata/md5-cache/dev-ros/camera_calibration-1.12.15
index a452e9b19c76..ff0dfe177a36 100644
--- a/metadata/md5-cache/dev-ros/camera_calibration-1.12.15
+++ b/metadata/md5-cache/dev-ros/camera_calibration-1.12.15
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.15.tar.gz -> image_pipeline-1.12.15.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fa14cf3e4586fb62e999ea82d259c56b
diff --git a/metadata/md5-cache/dev-ros/camera_calibration-1.12.16 b/metadata/md5-cache/dev-ros/camera_calibration-1.12.16
index 054ed3fb0cb0..2f9e9f607ce9 100644
--- a/metadata/md5-cache/dev-ros/camera_calibration-1.12.16
+++ b/metadata/md5-cache/dev-ros/camera_calibration-1.12.16
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.16.tar.gz -> image_pipeline-1.12.16.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fa14cf3e4586fb62e999ea82d259c56b
diff --git a/metadata/md5-cache/dev-ros/camera_calibration-1.12.18 b/metadata/md5-cache/dev-ros/camera_calibration-1.12.18
index 91cbf8613fa5..fdfb1483b89b 100644
--- a/metadata/md5-cache/dev-ros/camera_calibration-1.12.18
+++ b/metadata/md5-cache/dev-ros/camera_calibration-1.12.18
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.18.tar.gz -> image_pipeline-1.12.18.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e11eeddbd810853a34f6770512ba669a
diff --git a/metadata/md5-cache/dev-ros/camera_calibration-1.12.19 b/metadata/md5-cache/dev-ros/camera_calibration-1.12.19
index 8670ce0243d1..833c5aa76c3a 100644
--- a/metadata/md5-cache/dev-ros/camera_calibration-1.12.19
+++ b/metadata/md5-cache/dev-ros/camera_calibration-1.12.19
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.19.tar.gz -> image_pipeline-1.12.19.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e11eeddbd810853a34f6770512ba669a
diff --git a/metadata/md5-cache/dev-ros/camera_calibration-1.12.20 b/metadata/md5-cache/dev-ros/camera_calibration-1.12.20
index 221c52bc1bf3..ce2aa7ae003b 100644
--- a/metadata/md5-cache/dev-ros/camera_calibration-1.12.20
+++ b/metadata/md5-cache/dev-ros/camera_calibration-1.12.20
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.20.tar.gz -> image_pipeline-1.12.20.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4164b640a58ed16e12a351124883e21a
diff --git a/metadata/md5-cache/dev-ros/camera_calibration-1.12.21 b/metadata/md5-cache/dev-ros/camera_calibration-1.12.21
index 89cbb359d3de..5cb2de036de4 100644
--- a/metadata/md5-cache/dev-ros/camera_calibration-1.12.21
+++ b/metadata/md5-cache/dev-ros/camera_calibration-1.12.21
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.21.tar.gz -> image_pipeline-1.12.21.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4164b640a58ed16e12a351124883e21a
diff --git a/metadata/md5-cache/dev-ros/camera_calibration-1.12.22 b/metadata/md5-cache/dev-ros/camera_calibration-1.12.22
index ce886f790da6..fb6082dbc8b5 100644
--- a/metadata/md5-cache/dev-ros/camera_calibration-1.12.22
+++ b/metadata/md5-cache/dev-ros/camera_calibration-1.12.22
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.22.tar.gz -> image_pipeline-1.12.22.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4164b640a58ed16e12a351124883e21a
diff --git a/metadata/md5-cache/dev-ros/camera_calibration-1.12.23 b/metadata/md5-cache/dev-ros/camera_calibration-1.12.23
index 8eae3b544817..19fbb487edd3 100644
--- a/metadata/md5-cache/dev-ros/camera_calibration-1.12.23
+++ b/metadata/md5-cache/dev-ros/camera_calibration-1.12.23
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.23.tar.gz -> image_pipeline-1.12.23.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2945be7925d1995524d8a930f8816c62
diff --git a/metadata/md5-cache/dev-ros/camera_calibration-9999 b/metadata/md5-cache/dev-ros/camera_calibration-9999
index 74b20c6660cf..1605e929b83e 100644
--- a/metadata/md5-cache/dev-ros/camera_calibration-9999
+++ b/metadata/md5-cache/dev-ros/camera_calibration-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_geometry[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( media-libs/opencv[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/opencv[python,python_single_target_python2_7] ) dev-ros/message_filters[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=fa14cf3e4586fb62e999ea82d259c56b
diff --git a/metadata/md5-cache/dev-ros/camera_calibration_parsers-1.11.13-r1 b/metadata/md5-cache/dev-ros/camera_calibration_parsers-1.11.13-r1
index 3f5f92d334b1..03083fffc96f 100644
--- a/metadata/md5-cache/dev-ros/camera_calibration_parsers-1.11.13-r1
+++ b/metadata/md5-cache/dev-ros/camera_calibration_parsers-1.11.13-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_ta
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.13.tar.gz -> image_common-1.11.13.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a5516bdc8fbad416176fd35cd94b2409
diff --git a/metadata/md5-cache/dev-ros/camera_calibration_parsers-9999 b/metadata/md5-cache/dev-ros/camera_calibration_parsers-9999
index 10651b301795..84dc713d6c33 100644
--- a/metadata/md5-cache/dev-ros/camera_calibration_parsers-9999
+++ b/metadata/md5-cache/dev-ros/camera_calibration_parsers-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5:= dev-ros/roscpp dev-ros/roscpp_serialization python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=a5516bdc8fbad416176fd35cd94b2409
diff --git a/metadata/md5-cache/dev-ros/camera_info_manager-1.11.10 b/metadata/md5-cache/dev-ros/camera_info_manager-1.11.10
index e487fcf9dd3f..c3c5c3298da9 100644
--- a/metadata/md5-cache/dev-ros/camera_info_manager-1.11.10
+++ b/metadata/md5-cache/dev-ros/camera_info_manager-1.11.10
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscp
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.10.tar.gz -> image_common-1.11.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e7df4d824d0b198dde798e130ffd517c
diff --git a/metadata/md5-cache/dev-ros/camera_info_manager-1.11.11 b/metadata/md5-cache/dev-ros/camera_info_manager-1.11.11
index 3f5a7dc8175c..10f04a851df4 100644
--- a/metadata/md5-cache/dev-ros/camera_info_manager-1.11.11
+++ b/metadata/md5-cache/dev-ros/camera_info_manager-1.11.11
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscp
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.11.tar.gz -> image_common-1.11.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a741c1284730fdf94a7a3c7c61a101c8
diff --git a/metadata/md5-cache/dev-ros/camera_info_manager-1.11.12 b/metadata/md5-cache/dev-ros/camera_info_manager-1.11.12
index 4e358b43ce53..a7becd95d3b4 100644
--- a/metadata/md5-cache/dev-ros/camera_info_manager-1.11.12
+++ b/metadata/md5-cache/dev-ros/camera_info_manager-1.11.12
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscp
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.12.tar.gz -> image_common-1.11.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=94188239b8404c70f73f13c95ac08133
diff --git a/metadata/md5-cache/dev-ros/camera_info_manager-1.11.13 b/metadata/md5-cache/dev-ros/camera_info_manager-1.11.13
index 9af096cb04e2..183bf31c00a0 100644
--- a/metadata/md5-cache/dev-ros/camera_info_manager-1.11.13
+++ b/metadata/md5-cache/dev-ros/camera_info_manager-1.11.13
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscp
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.13.tar.gz -> image_common-1.11.13.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=94188239b8404c70f73f13c95ac08133
diff --git a/metadata/md5-cache/dev-ros/camera_info_manager-1.11.7 b/metadata/md5-cache/dev-ros/camera_info_manager-1.11.7
index b7553e5d0ab3..b8f545d620ea 100644
--- a/metadata/md5-cache/dev-ros/camera_info_manager-1.11.7
+++ b/metadata/md5-cache/dev-ros/camera_info_manager-1.11.7
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscp
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.7.tar.gz -> image_common-1.11.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e7df4d824d0b198dde798e130ffd517c
diff --git a/metadata/md5-cache/dev-ros/camera_info_manager-1.11.8 b/metadata/md5-cache/dev-ros/camera_info_manager-1.11.8
index 61f9a94b9321..db94b20d80dc 100644
--- a/metadata/md5-cache/dev-ros/camera_info_manager-1.11.8
+++ b/metadata/md5-cache/dev-ros/camera_info_manager-1.11.8
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscp
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.8.tar.gz -> image_common-1.11.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e7df4d824d0b198dde798e130ffd517c
diff --git a/metadata/md5-cache/dev-ros/camera_info_manager-1.11.9 b/metadata/md5-cache/dev-ros/camera_info_manager-1.11.9
index cd946c21f5a6..2279e8cb850d 100644
--- a/metadata/md5-cache/dev-ros/camera_info_manager-1.11.9
+++ b/metadata/md5-cache/dev-ros/camera_info_manager-1.11.9
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscp
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.9.tar.gz -> image_common-1.11.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e7df4d824d0b198dde798e130ffd517c
diff --git a/metadata/md5-cache/dev-ros/camera_info_manager-9999 b/metadata/md5-cache/dev-ros/camera_info_manager-9999
index 4ddab41e2d26..e7e97c283df1 100644
--- a/metadata/md5-cache/dev-ros/camera_info_manager-9999
+++ b/metadata/md5-cache/dev-ros/camera_info_manager-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=e7df4d824d0b198dde798e130ffd517c
diff --git a/metadata/md5-cache/dev-ros/carrot_planner-1.16.1 b/metadata/md5-cache/dev-ros/carrot_planner-1.16.1
index 364a68be82e0..41693aa75eaf 100644
--- a/metadata/md5-cache/dev-ros/carrot_planner-1.16.1
+++ b/metadata/md5-cache/dev-ros/carrot_planner-1.16.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/na
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.1.tar.gz -> navigation-1.16.1.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4be292b4011ccde05d2990b2bf94c896
diff --git a/metadata/md5-cache/dev-ros/carrot_planner-1.16.2 b/metadata/md5-cache/dev-ros/carrot_planner-1.16.2
index 85c4fc00222f..024c99f5acca 100644
--- a/metadata/md5-cache/dev-ros/carrot_planner-1.16.2
+++ b/metadata/md5-cache/dev-ros/carrot_planner-1.16.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/na
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz -> navigation-1.16.2.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f313433e654cf7fd2c15889af60ca7b6
diff --git a/metadata/md5-cache/dev-ros/carrot_planner-9999 b/metadata/md5-cache/dev-ros/carrot_planner-9999
index add63b8c81d3..3ccc8f7bfd42 100644
--- a/metadata/md5-cache/dev-ros/carrot_planner-9999
+++ b/metadata/md5-cache/dev-ros/carrot_planner-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=f313433e654cf7fd2c15889af60ca7b6
diff --git a/metadata/md5-cache/dev-ros/class_loader-0.4.1-r1 b/metadata/md5-cache/dev-ros/class_loader-0.4.1-r1
index 739d66399dfd..5a20141243bf 100644
--- a/metadata/md5-cache/dev-ros/class_loader-0.4.1-r1
+++ b/metadata/md5-cache/dev-ros/class_loader-0.4.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/poco dev-libs/boost:=[threads] dev-ros/cmake_modules dev-libs/c
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0/melodic2
 SRC_URI=https://github.com/ros/class_loader/archive/0.4.1.tar.gz -> class_loader-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=da92b18ce2704791f4944c21fcf01018
diff --git a/metadata/md5-cache/dev-ros/class_loader-9999 b/metadata/md5-cache/dev-ros/class_loader-9999
index 65b07fb48a12..b536f5294da0 100644
--- a/metadata/md5-cache/dev-ros/class_loader-9999
+++ b/metadata/md5-cache/dev-ros/class_loader-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/poco dev-libs/boost:=[threads] dev-ros/cmake_modules 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/melodic2
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=da92b18ce2704791f4944c21fcf01018
diff --git a/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.15.1-r1 b/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.15.1-r1
index ae9d0a251ac4..7fe6f352a3db 100644
--- a/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.15.1-r1
+++ b/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.15.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/costmap_2d-1.13.1 dev-ros/nav_core dev-ros/pluginlib dev-ros/r
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.15.1.tar.gz -> navigation-1.15.1.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=652f350b2b941c7d2c070e692777c0b4
diff --git a/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.15.2 b/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.15.2
index 31ccb8c214d6..4fd04f52ce79 100644
--- a/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.15.2
+++ b/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.15.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/costmap_2d-1.13.1 dev-ros/nav_core dev-ros/pluginlib dev-ros/r
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.15.2.tar.gz -> navigation-1.15.2.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2d5d1344d8adf1a79b643344f961c6ab
diff --git a/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.16.0 b/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.16.0
index 1a4f87ba43d4..ccc0a33dc754 100644
--- a/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.16.0
+++ b/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.16.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/costmap_2d-1.16 dev-cpp/eigen:3 dev-ros/nav_core dev-ros/plugi
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.0.tar.gz -> navigation-1.16.0.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6f5f6e992cb9b9458f29c2261ea58db9
diff --git a/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.16.1 b/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.16.1
index cdd011bdbade..6ac4943d28ad 100644
--- a/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.16.1
+++ b/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.16.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/costmap_2d-1.16 dev-cpp/eigen:3 dev-ros/nav_core dev-ros/plugi
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.1.tar.gz -> navigation-1.16.1.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6f5f6e992cb9b9458f29c2261ea58db9
diff --git a/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.16.2 b/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.16.2
index cea30288067a..a68234b86dc4 100644
--- a/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.16.2
+++ b/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.16.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/costmap_2d-1.16 dev-cpp/eigen:3 dev-ros/nav_core dev-ros/plugi
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz -> navigation-1.16.2.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6f5f6e992cb9b9458f29c2261ea58db9
diff --git a/metadata/md5-cache/dev-ros/clear_costmap_recovery-9999 b/metadata/md5-cache/dev-ros/clear_costmap_recovery-9999
index bb5022fa5c22..bd9ff754b0e3 100644
--- a/metadata/md5-cache/dev-ros/clear_costmap_recovery-9999
+++ b/metadata/md5-cache/dev-ros/clear_costmap_recovery-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-ros/costmap_2d-1.16 dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=6f5f6e992cb9b9458f29c2261ea58db9
diff --git a/metadata/md5-cache/dev-ros/cmake_modules-0.4.0 b/metadata/md5-cache/dev-ros/cmake_modules-0.4.0
index 293d3174b9b4..72e15d8a4b48 100644
--- a/metadata/md5-cache/dev-ros/cmake_modules-0.4.0
+++ b/metadata/md5-cache/dev-ros/cmake_modules-0.4.0
@@ -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/ros/cmake_modules/archive/0.4.0.tar.gz -> cmake_modules-0.4.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6e58dc527dae86e1a49932f847883534
diff --git a/metadata/md5-cache/dev-ros/cmake_modules-0.4.1 b/metadata/md5-cache/dev-ros/cmake_modules-0.4.1
index c7b3752d8ad4..017e7e9bea89 100644
--- a/metadata/md5-cache/dev-ros/cmake_modules-0.4.1
+++ b/metadata/md5-cache/dev-ros/cmake_modules-0.4.1
@@ -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/ros/cmake_modules/archive/0.4.1.tar.gz -> cmake_modules-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=164f764fb3c1c73940a044dc115412cd
diff --git a/metadata/md5-cache/dev-ros/cmake_modules-9999 b/metadata/md5-cache/dev-ros/cmake_modules-9999
index 94eebeaf2cac..affc92437499 100644
--- a/metadata/md5-cache/dev-ros/cmake_modules-9999
+++ b/metadata/md5-cache/dev-ros/cmake_modules-9999
@@ -8,5 +8,5 @@ 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=6e58dc527dae86e1a49932f847883534
diff --git a/metadata/md5-cache/dev-ros/collada_parser-1.12.10-r3 b/metadata/md5-cache/dev-ros/collada_parser-1.12.10-r3
index 57ce384170ed..7d03f3c0affe 100644
--- a/metadata/md5-cache/dev-ros/collada_parser-1.12.10-r3
+++ b/metadata/md5-cache/dev-ros/collada_parser-1.12.10-r3
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.6 dev-ros/roscpp dev-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/collada_urdf/archive/1.12.10.tar.gz -> collada_urdf-1.12.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=88d8cec32cb458ceace8011334d35220
diff --git a/metadata/md5-cache/dev-ros/collada_parser-1.12.12 b/metadata/md5-cache/dev-ros/collada_parser-1.12.12
index 250af91168af..09f0f9de0e25 100644
--- a/metadata/md5-cache/dev-ros/collada_parser-1.12.12
+++ b/metadata/md5-cache/dev-ros/collada_parser-1.12.12
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.6 dev-ros/class_loade
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/collada_urdf/archive/1.12.12.tar.gz -> collada_urdf-1.12.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=dd22009f387996875fdd45f55b031fc5
diff --git a/metadata/md5-cache/dev-ros/collada_parser-9999 b/metadata/md5-cache/dev-ros/collada_parser-9999
index 15d2f080c656..64c6ee1a7d8d 100644
--- a/metadata/md5-cache/dev-ros/collada_parser-9999
+++ b/metadata/md5-cache/dev-ros/collada_parser-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.6 dev-ros/class_loader:= dev-libs/urdfdom_headers dev-libs/collada-dom:= >=dev-ros/urdf-1.12.6 dev-ros/rosconsole dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=dd22009f387996875fdd45f55b031fc5
diff --git a/metadata/md5-cache/dev-ros/collada_urdf-1.12.10-r1 b/metadata/md5-cache/dev-ros/collada_urdf-1.12.10-r1
index c12841ef48aa..97278a564db5 100644
--- a/metadata/md5-cache/dev-ros/collada_urdf-1.12.10-r1
+++ b/metadata/md5-cache/dev-ros/collada_urdf-1.12.10-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/collada_urdf/archive/1.12.10.tar.gz -> collada_urdf-1.12.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e304874dde49a10c0f9b435600cd2c2a
diff --git a/metadata/md5-cache/dev-ros/collada_urdf-1.12.12 b/metadata/md5-cache/dev-ros/collada_urdf-1.12.12
index c20f61bd604d..c805b8a4b6e0 100644
--- a/metadata/md5-cache/dev-ros/collada_urdf-1.12.12
+++ b/metadata/md5-cache/dev-ros/collada_urdf-1.12.12
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/collada_urdf/archive/1.12.12.tar.gz -> collada_urdf-1.12.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=42a6f543a208263592a5b421687c54ba
diff --git a/metadata/md5-cache/dev-ros/collada_urdf-9999 b/metadata/md5-cache/dev-ros/collada_urdf-9999
index 41ddf03c6198..b001d7a5d2a7 100644
--- a/metadata/md5-cache/dev-ros/collada_urdf-9999
+++ b/metadata/md5-cache/dev-ros/collada_urdf-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever dev-ros/rosconsole dev-ros/urdf dev-ros/geometric_shapes media-libs/assimp dev-libs/collada-dom:= dev-cpp/eigen:3 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=42a6f543a208263592a5b421687c54ba
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw-0.14.2 b/metadata/md5-cache/dev-ros/combined_robot_hw-0.14.2
index 2ecdf35de315..e0c3aa5ddf0b 100644
--- a/metadata/md5-cache/dev-ros/combined_robot_hw-0.14.2
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw-0.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/hardware_interface-0.11 dev-ros/pluginlib dev-libs/tinyxml2:=
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.14.2.tar.gz -> ros_control-0.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=e001af4d104dcc1c07edcf065779fc35
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw-0.15.0 b/metadata/md5-cache/dev-ros/combined_robot_hw-0.15.0
index b94554bf665a..354a308d2974 100644
--- a/metadata/md5-cache/dev-ros/combined_robot_hw-0.15.0
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw-0.15.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:=
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.15.0.tar.gz -> ros_control-0.15.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=dfb24b26329355381b96f33e2622c611
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw-9999 b/metadata/md5-cache/dev-ros/combined_robot_hw-9999
index 46bea4d456d9..35eb5e53fc95 100644
--- a/metadata/md5-cache/dev-ros/combined_robot_hw-9999
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw-9999
@@ -8,5 +8,5 @@ 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=dfb24b26329355381b96f33e2622c611
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.14.2 b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.14.2
index d580f370d7dc..5726bcaba634 100644
--- a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.14.2
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.14.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.14.2.tar.gz -> ros_control-0.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=307d5145d85e0468a20d2ffce02dfbb4
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.15.0 b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.15.0
index 36b79f4ce982..db79768d6efb 100644
--- a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.15.0
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.15.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.15.0.tar.gz -> ros_control-0.15.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=307d5145d85e0468a20d2ffce02dfbb4
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-9999 b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-9999
index 58b0820257b3..0ca372785411 100644
--- a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-9999
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-9999
@@ -8,5 +8,5 @@ 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=16b150f13a23da3d83966fb264184df8
diff --git a/metadata/md5-cache/dev-ros/compressed_depth_image_transport-1.9.5-r1 b/metadata/md5-cache/dev-ros/compressed_depth_image_transport-1.9.5-r1
index 3761ac1e9047..4fd5f3063169 100644
--- a/metadata/md5-cache/dev-ros/compressed_depth_image_transport-1.9.5-r1
+++ b/metadata/md5-cache/dev-ros/compressed_depth_image_transport-1.9.5-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python2_7(-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_transport_plugins/archive/1.9.5.tar.gz -> image_transport_plugins-1.9.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=299f9492f3019e8a72bbbeb48b6c2d4e
diff --git a/metadata/md5-cache/dev-ros/compressed_depth_image_transport-9999 b/metadata/md5-cache/dev-ros/compressed_depth_image_transport-9999
index 117b12046422..d56550571834 100644
--- a/metadata/md5-cache/dev-ros/compressed_depth_image_transport-9999
+++ b/metadata/md5-cache/dev-ros/compressed_depth_image_transport-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=299f9492f3019e8a72bbbeb48b6c2d4e
diff --git a/metadata/md5-cache/dev-ros/compressed_image_transport-1.9.5-r1 b/metadata/md5-cache/dev-ros/compressed_image_transport-1.9.5-r1
index 2689984e44da..8bcad4aee89c 100644
--- a/metadata/md5-cache/dev-ros/compressed_image_transport-1.9.5-r1
+++ b/metadata/md5-cache/dev-ros/compressed_image_transport-1.9.5-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python2_7(-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_transport_plugins/archive/1.9.5.tar.gz -> image_transport_plugins-1.9.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c8ff0c347bc6c4aa9a27c8e5435af513
diff --git a/metadata/md5-cache/dev-ros/compressed_image_transport-9999 b/metadata/md5-cache/dev-ros/compressed_image_transport-9999
index 268094942cd7..1a5cea53b9db 100644
--- a/metadata/md5-cache/dev-ros/compressed_image_transport-9999
+++ b/metadata/md5-cache/dev-ros/compressed_image_transport-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=c8ff0c347bc6c4aa9a27c8e5435af513
diff --git a/metadata/md5-cache/dev-ros/control_msgs-1.4.0 b/metadata/md5-cache/dev-ros/control_msgs-1.4.0
index c7274f19f9af..cba022de1b69 100644
--- a/metadata/md5-cache/dev-ros/control_msgs-1.4.0
+++ b/metadata/md5-cache/dev-ros/control_msgs-1.4.0
@@ -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/ros-controls/control_msgs/archive/1.4.0.tar.gz -> control_msgs-1.4.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=629c7fc603cd51fbeb5be8b289cebab0
diff --git a/metadata/md5-cache/dev-ros/control_msgs-9999 b/metadata/md5-cache/dev-ros/control_msgs-9999
index 3ecbda812d7e..aa00a35cc3fd 100644
--- a/metadata/md5-cache/dev-ros/control_msgs-9999
+++ b/metadata/md5-cache/dev-ros/control_msgs-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=629c7fc603cd51fbeb5be8b289cebab0
diff --git a/metadata/md5-cache/dev-ros/control_toolbox-1.14.0 b/metadata/md5-cache/dev-ros/control_toolbox-1.14.0
index 9fe78f35a38a..d0b962cff630 100644
--- a/metadata/md5-cache/dev-ros/control_toolbox-1.14.0
+++ b/metadata/md5-cache/dev-ros/control_toolbox-1.14.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure dev-ros/realtime_tools dev-li
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/control_toolbox/archive/1.14.0.tar.gz -> control_toolbox-1.14.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e413fb1511721a2d4f54f2686fc3cdd6
diff --git a/metadata/md5-cache/dev-ros/control_toolbox-1.15.0 b/metadata/md5-cache/dev-ros/control_toolbox-1.15.0
index 750c829fe2d9..110d36980871 100644
--- a/metadata/md5-cache/dev-ros/control_toolbox-1.15.0
+++ b/metadata/md5-cache/dev-ros/control_toolbox-1.15.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure dev-ros/realtime_tools dev-li
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/control_toolbox/archive/1.15.0.tar.gz -> control_toolbox-1.15.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1ef38c5a82b9e9bcc50e6731b1c80db2
diff --git a/metadata/md5-cache/dev-ros/control_toolbox-1.16.0 b/metadata/md5-cache/dev-ros/control_toolbox-1.16.0
index 21c20874d6c9..bba92e9a8cc5 100644
--- a/metadata/md5-cache/dev-ros/control_toolbox-1.16.0
+++ b/metadata/md5-cache/dev-ros/control_toolbox-1.16.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure dev-ros/realtime_tools dev-li
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/control_toolbox/archive/1.16.0.tar.gz -> control_toolbox-1.16.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=24e49535e89c7b0da708832097f0b7f7
diff --git a/metadata/md5-cache/dev-ros/control_toolbox-9999 b/metadata/md5-cache/dev-ros/control_toolbox-9999
index af7902f6771f..fcda8ec7b9a9 100644
--- a/metadata/md5-cache/dev-ros/control_toolbox-9999
+++ b/metadata/md5-cache/dev-ros/control_toolbox-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure dev-ros/realtime_tools dev-libs/boost:=[threads] dev-libs/tinyxml dev-ros/control_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=e413fb1511721a2d4f54f2686fc3cdd6
diff --git a/metadata/md5-cache/dev-ros/controller_interface-0.14.2 b/metadata/md5-cache/dev-ros/controller_interface-0.14.2
index 139b33818d73..66af679bdc94 100644
--- a/metadata/md5-cache/dev-ros/controller_interface-0.14.2
+++ b/metadata/md5-cache/dev-ros/controller_interface-0.14.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib python_targe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.14.2.tar.gz -> ros_control-0.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=afd43a253220210a84b7ab0f43d66b66
diff --git a/metadata/md5-cache/dev-ros/controller_interface-0.15.0 b/metadata/md5-cache/dev-ros/controller_interface-0.15.0
index 3dd84469cef1..6f592dc0bae9 100644
--- a/metadata/md5-cache/dev-ros/controller_interface-0.15.0
+++ b/metadata/md5-cache/dev-ros/controller_interface-0.15.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib python_targe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.15.0.tar.gz -> ros_control-0.15.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=afd43a253220210a84b7ab0f43d66b66
diff --git a/metadata/md5-cache/dev-ros/controller_interface-9999 b/metadata/md5-cache/dev-ros/controller_interface-9999
index c42b7cd22626..f5ae6bce5fce 100644
--- a/metadata/md5-cache/dev-ros/controller_interface-9999
+++ b/metadata/md5-cache/dev-ros/controller_interface-9999
@@ -8,5 +8,5 @@ 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=a3911d99ec776489c6fd2602ca8c74ac
diff --git a/metadata/md5-cache/dev-ros/controller_manager-0.14.2 b/metadata/md5-cache/dev-ros/controller_manager-0.14.2
index 22d1e08ff1a7..250c4a609f97 100644
--- a/metadata/md5-cache/dev-ros/controller_manager-0.14.2
+++ b/metadata/md5-cache/dev-ros/controller_manager-0.14.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/controller_interface >=dev-ros/controller_manager_msgs-0.10.0[ro
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.14.2.tar.gz -> ros_control-0.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=5ff1390ff46a015dcc394169d7abe0c6
diff --git a/metadata/md5-cache/dev-ros/controller_manager-0.15.0 b/metadata/md5-cache/dev-ros/controller_manager-0.15.0
index 3cd60eca6b67..c3c05441ec40 100644
--- a/metadata/md5-cache/dev-ros/controller_manager-0.15.0
+++ b/metadata/md5-cache/dev-ros/controller_manager-0.15.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.15.0.tar.gz -> ros_control-0.15.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8b340fed7715d5b8b513388f8eb1dc1f
diff --git a/metadata/md5-cache/dev-ros/controller_manager-9999 b/metadata/md5-cache/dev-ros/controller_manager-9999
index 2fe2ce66e240..b7c7fb28d276 100644
--- a/metadata/md5-cache/dev-ros/controller_manager-9999
+++ b/metadata/md5-cache/dev-ros/controller_manager-9999
@@ -8,5 +8,5 @@ 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=8b340fed7715d5b8b513388f8eb1dc1f
diff --git a/metadata/md5-cache/dev-ros/controller_manager_msgs-0.14.2 b/metadata/md5-cache/dev-ros/controller_manager_msgs-0.14.2
index 39510a79660a..c570b03392fc 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_msgs-0.14.2
+++ b/metadata/md5-cache/dev-ros/controller_manager_msgs-0.14.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.14.2.tar.gz -> ros_control-0.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=3105e2ec8a8c1ea469dc7d0a82513963
diff --git a/metadata/md5-cache/dev-ros/controller_manager_msgs-0.15.0 b/metadata/md5-cache/dev-ros/controller_manager_msgs-0.15.0
index 79446e7844f6..75b04532007e 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_msgs-0.15.0
+++ b/metadata/md5-cache/dev-ros/controller_manager_msgs-0.15.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.15.0.tar.gz -> ros_control-0.15.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3105e2ec8a8c1ea469dc7d0a82513963
diff --git a/metadata/md5-cache/dev-ros/controller_manager_msgs-9999 b/metadata/md5-cache/dev-ros/controller_manager_msgs-9999
index f9e4beafbfde..5a7ab23f4943 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_msgs-9999
+++ b/metadata/md5-cache/dev-ros/controller_manager_msgs-9999
@@ -8,5 +8,5 @@ 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=943ce35d668b0524d2ae1d887840640f
diff --git a/metadata/md5-cache/dev-ros/controller_manager_tests-0.14.2 b/metadata/md5-cache/dev-ros/controller_manager_tests-0.14.2
index 8f42ae3726fa..2c4658b93ec0 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_tests-0.14.2
+++ b/metadata/md5-cache/dev-ros/controller_manager_tests-0.14.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_t
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.14.2.tar.gz -> ros_control-0.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=d33bf0342d4492c636b7e2370a3ccbe4
diff --git a/metadata/md5-cache/dev-ros/controller_manager_tests-0.15.0 b/metadata/md5-cache/dev-ros/controller_manager_tests-0.15.0
index 4ac740682933..9509ea654819 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_tests-0.15.0
+++ b/metadata/md5-cache/dev-ros/controller_manager_tests-0.15.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_t
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.15.0.tar.gz -> ros_control-0.15.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d33bf0342d4492c636b7e2370a3ccbe4
diff --git a/metadata/md5-cache/dev-ros/controller_manager_tests-9999 b/metadata/md5-cache/dev-ros/controller_manager_tests-9999
index e06ab9482ee1..f66f4300e93c 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_tests-9999
+++ b/metadata/md5-cache/dev-ros/controller_manager_tests-9999
@@ -8,5 +8,5 @@ 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=6e8f5bcd06bfddc50576fb83075b4409
diff --git a/metadata/md5-cache/dev-ros/convex_decomposition-0.1.10 b/metadata/md5-cache/dev-ros/convex_decomposition-0.1.10
index 17c0d0ee86e7..6166b377b320 100644
--- a/metadata/md5-cache/dev-ros/convex_decomposition-0.1.10
+++ b/metadata/md5-cache/dev-ros/convex_decomposition-0.1.10
@@ -10,5 +10,5 @@ RDEPEND=app-arch/unzip python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/convex_decomposition/archive/0.1.10.tar.gz -> convex_decomposition-0.1.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b1afe7d78e0c17782288d96d893048dd
diff --git a/metadata/md5-cache/dev-ros/convex_decomposition-0.1.11 b/metadata/md5-cache/dev-ros/convex_decomposition-0.1.11
index 8fcd390ac92a..d0e4a9f33275 100644
--- a/metadata/md5-cache/dev-ros/convex_decomposition-0.1.11
+++ b/metadata/md5-cache/dev-ros/convex_decomposition-0.1.11
@@ -10,5 +10,5 @@ RDEPEND=app-arch/unzip python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/convex_decomposition/archive/0.1.11.tar.gz -> convex_decomposition-0.1.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b1afe7d78e0c17782288d96d893048dd
diff --git a/metadata/md5-cache/dev-ros/convex_decomposition-9999 b/metadata/md5-cache/dev-ros/convex_decomposition-9999
index edc9872200e0..c1d20810a55b 100644
--- a/metadata/md5-cache/dev-ros/convex_decomposition-9999
+++ b/metadata/md5-cache/dev-ros/convex_decomposition-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=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(-)]
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=b1afe7d78e0c17782288d96d893048dd
diff --git a/metadata/md5-cache/dev-ros/costmap_2d-1.16.1 b/metadata/md5-cache/dev-ros/costmap_2d-1.16.1
index fa942307567d..0305b8a74d5e 100644
--- a/metadata/md5-cache/dev-ros/costmap_2d-1.16.1
+++ b/metadata/md5-cache/dev-ros/costmap_2d-1.16.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_
 REQUIRED_USE=ros_messages_cxx || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.1.tar.gz -> navigation-1.16.1.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f757c71d5fed266aec092c5319e6cc91
diff --git a/metadata/md5-cache/dev-ros/costmap_2d-1.16.2 b/metadata/md5-cache/dev-ros/costmap_2d-1.16.2
index b462ce5d0616..e4c7d5bdea5a 100644
--- a/metadata/md5-cache/dev-ros/costmap_2d-1.16.2
+++ b/metadata/md5-cache/dev-ros/costmap_2d-1.16.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_
 REQUIRED_USE=ros_messages_cxx || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz -> navigation-1.16.2.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=57a98707a5970bcae04812304ccf114f
diff --git a/metadata/md5-cache/dev-ros/costmap_2d-9999 b/metadata/md5-cache/dev-ros/costmap_2d-9999
index aed9633872f0..479955a12546 100644
--- a/metadata/md5-cache/dev-ros/costmap_2d-9999
+++ b/metadata/md5-cache/dev-ros/costmap_2d-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/laser_geometry dev-ros/message_filters dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/voxel_grid dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_sensor_msgs dev-cpp/eigen:3 dev-libs/boost:=[threads] dev-libs/tinyxml2:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=ros_messages_cxx || ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=57a98707a5970bcae04812304ccf114f
diff --git a/metadata/md5-cache/dev-ros/cpp_common-0.6.10 b/metadata/md5-cache/dev-ros/cpp_common-0.6.10
index 459f3bb22843..709c36ff6153 100644
--- a/metadata/md5-cache/dev-ros/cpp_common-0.6.10
+++ b/metadata/md5-cache/dev-ros/cpp_common-0.6.10
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/console_bridge:= dev-libs/boost:=[threads] python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.10.tar.gz -> roscpp_core-0.6.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=05049828660b89a2bf45cdcbc3700c10
diff --git a/metadata/md5-cache/dev-ros/cpp_common-0.6.11 b/metadata/md5-cache/dev-ros/cpp_common-0.6.11
index 8f0bcab8041d..d9ce299702c0 100644
--- a/metadata/md5-cache/dev-ros/cpp_common-0.6.11
+++ b/metadata/md5-cache/dev-ros/cpp_common-0.6.11
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/console_bridge:= dev-libs/boost:=[threads] python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.11.tar.gz -> roscpp_core-0.6.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=05049828660b89a2bf45cdcbc3700c10
diff --git a/metadata/md5-cache/dev-ros/cpp_common-0.6.7-r1 b/metadata/md5-cache/dev-ros/cpp_common-0.6.7-r1
index fc1cd7b38f08..3fa0b2885963 100644
--- a/metadata/md5-cache/dev-ros/cpp_common-0.6.7-r1
+++ b/metadata/md5-cache/dev-ros/cpp_common-0.6.7-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/console_bridge:= dev-libs/boost:=[threads] python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.7.tar.gz -> roscpp_core-0.6.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cfb5f209c52d0db2cc12d451772d06d0
diff --git a/metadata/md5-cache/dev-ros/cpp_common-0.6.8 b/metadata/md5-cache/dev-ros/cpp_common-0.6.8
index d4700818bc8f..432317df05c9 100644
--- a/metadata/md5-cache/dev-ros/cpp_common-0.6.8
+++ b/metadata/md5-cache/dev-ros/cpp_common-0.6.8
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/console_bridge:= dev-libs/boost:=[threads] python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.8.tar.gz -> roscpp_core-0.6.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=05049828660b89a2bf45cdcbc3700c10
diff --git a/metadata/md5-cache/dev-ros/cpp_common-0.6.9 b/metadata/md5-cache/dev-ros/cpp_common-0.6.9
index bb8b5356972d..1a02be002ecc 100644
--- a/metadata/md5-cache/dev-ros/cpp_common-0.6.9
+++ b/metadata/md5-cache/dev-ros/cpp_common-0.6.9
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/console_bridge:= dev-libs/boost:=[threads] python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.9.tar.gz -> roscpp_core-0.6.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=05049828660b89a2bf45cdcbc3700c10
diff --git a/metadata/md5-cache/dev-ros/cpp_common-9999 b/metadata/md5-cache/dev-ros/cpp_common-9999
index e1b3ce3afadd..d6b297660afd 100644
--- a/metadata/md5-cache/dev-ros/cpp_common-9999
+++ b/metadata/md5-cache/dev-ros/cpp_common-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/console_bridge:= dev-libs/boost:=[threads] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=cfb5f209c52d0db2cc12d451772d06d0
diff --git a/metadata/md5-cache/dev-ros/cv_bridge-1.12.5 b/metadata/md5-cache/dev-ros/cv_bridge-1.12.5
index 083be4884097..a3a54b1f5d6a 100644
--- a/metadata/md5-cache/dev-ros/cv_bridge-1.12.5
+++ b/metadata/md5-cache/dev-ros/cv_bridge-1.12.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+)] dev-libs/boost:=[
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.5.tar.gz -> vision_opencv-1.12.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3d2fa4c545ed8561ca2b6dec5aca799b
diff --git a/metadata/md5-cache/dev-ros/cv_bridge-1.12.7 b/metadata/md5-cache/dev-ros/cv_bridge-1.12.7
index 9adc8cb73489..85dd58b4473b 100644
--- a/metadata/md5-cache/dev-ros/cv_bridge-1.12.7
+++ b/metadata/md5-cache/dev-ros/cv_bridge-1.12.7
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+)] dev-libs/boost:=[
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.7.tar.gz -> vision_opencv-1.12.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3d2fa4c545ed8561ca2b6dec5aca799b
diff --git a/metadata/md5-cache/dev-ros/cv_bridge-1.12.8 b/metadata/md5-cache/dev-ros/cv_bridge-1.12.8
index 1342306342e1..18cbb9ddc691 100644
--- a/metadata/md5-cache/dev-ros/cv_bridge-1.12.8
+++ b/metadata/md5-cache/dev-ros/cv_bridge-1.12.8
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+)] dev-libs/boost:=[
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.8.tar.gz -> vision_opencv-1.12.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f7377354b09a4e46449a78f5e248047a
diff --git a/metadata/md5-cache/dev-ros/cv_bridge-1.13.0 b/metadata/md5-cache/dev-ros/cv_bridge-1.13.0
index 11edb6d97d88..e393e8d3aeed 100644
--- a/metadata/md5-cache/dev-ros/cv_bridge-1.13.0
+++ b/metadata/md5-cache/dev-ros/cv_bridge-1.13.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+)] dev-libs/boost:=[
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.13.0.tar.gz -> vision_opencv-1.13.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f7377354b09a4e46449a78f5e248047a
diff --git a/metadata/md5-cache/dev-ros/cv_bridge-9999 b/metadata/md5-cache/dev-ros/cv_bridge-9999
index c5c9f9df7f4c..ac2e450c9241 100644
--- a/metadata/md5-cache/dev-ros/cv_bridge-9999
+++ b/metadata/md5-cache/dev-ros/cv_bridge-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+)] dev-libs/boost:=[threads,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=3d2fa4c545ed8561ca2b6dec5aca799b
diff --git a/metadata/md5-cache/dev-ros/depth_image_proc-1.12.22-r1 b/metadata/md5-cache/dev-ros/depth_image_proc-1.12.22-r1
index c449533c6826..f65636afe094 100644
--- a/metadata/md5-cache/dev-ros/depth_image_proc-1.12.22-r1
+++ b/metadata/md5-cache/dev-ros/depth_image_proc-1.12.22-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/eigen_conversions dev-ros/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.22.tar.gz -> image_pipeline-1.12.22.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d428e1c1002d39fe9f874ace1cc6046d
diff --git a/metadata/md5-cache/dev-ros/depth_image_proc-1.12.23 b/metadata/md5-cache/dev-ros/depth_image_proc-1.12.23
index 1496ee7db5aa..4da9d23e4cc9 100644
--- a/metadata/md5-cache/dev-ros/depth_image_proc-1.12.23
+++ b/metadata/md5-cache/dev-ros/depth_image_proc-1.12.23
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/eigen_conversions dev-ros/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.23.tar.gz -> image_pipeline-1.12.23.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=508e7888fc8f443169e3e35932629432
diff --git a/metadata/md5-cache/dev-ros/depth_image_proc-9999 b/metadata/md5-cache/dev-ros/depth_image_proc-9999
index 63b98540a6af..3f53d9f7d1af 100644
--- a/metadata/md5-cache/dev-ros/depth_image_proc-9999
+++ b/metadata/md5-cache/dev-ros/depth_image_proc-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/eigen_conversions dev-ros/image_geometry dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=d428e1c1002d39fe9f874ace1cc6046d
diff --git a/metadata/md5-cache/dev-ros/depthimage_to_laserscan-1.0.7-r2 b/metadata/md5-cache/dev-ros/depthimage_to_laserscan-1.0.7-r2
index e1ccaf0eb74e..97d62c854b6b 100644
--- a/metadata/md5-cache/dev-ros/depthimage_to_laserscan-1.0.7-r2
+++ b/metadata/md5-cache/dev-ros/depthimage_to_laserscan-1.0.7-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp media-libs/opencv:= dev-ros/dynamic_reconfigure[python_ta
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/depthimage_to_laserscan/archive/1.0.7.tar.gz -> depthimage_to_laserscan-1.0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b65ffd432210fbe6290ff0ef8cb71223
diff --git a/metadata/md5-cache/dev-ros/depthimage_to_laserscan-9999 b/metadata/md5-cache/dev-ros/depthimage_to_laserscan-9999
index 25fb48e6dcb8..dd158ae73a4a 100644
--- a/metadata/md5-cache/dev-ros/depthimage_to_laserscan-9999
+++ b/metadata/md5-cache/dev-ros/depthimage_to_laserscan-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp media-libs/opencv:= dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=b65ffd432210fbe6290ff0ef8cb71223
diff --git a/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.9.2-r1 b/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.9.2-r1
index d9475767c8a3..eb1ce7cafe11 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.9.2-r1
+++ b/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.9.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-libs/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.2.tar.gz -> diagnostics-1.9.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=e16b0caca73043e7f7877b62534bfa87
diff --git a/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.9.3 b/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.9.3
index 34281abdebce..be9297ad7014 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.9.3
+++ b/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.9.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-libs/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.3.tar.gz -> diagnostics-1.9.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7dbefa3ad9f423d68e55ba9f6b66acfd
diff --git a/metadata/md5-cache/dev-ros/diagnostic_aggregator-9999 b/metadata/md5-cache/dev-ros/diagnostic_aggregator-9999
index cd6b67b57613..9b8c1fc1cf16 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_aggregator-9999
+++ b/metadata/md5-cache/dev-ros/diagnostic_aggregator-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy dev-ros/rostest dev-ros/xmlrpcpp dev-ros/bondcpp dev-libs/boost:= dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=e16b0caca73043e7f7877b62534bfa87
diff --git a/metadata/md5-cache/dev-ros/diagnostic_analysis-1.8.10 b/metadata/md5-cache/dev-ros/diagnostic_analysis-1.8.10
index c983b1410e84..2a80ecb79586 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_analysis-1.8.10
+++ b/metadata/md5-cache/dev-ros/diagnostic_analysis-1.8.10
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.8.10.tar.gz -> diagnostics-1.8.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=45a339501c631d5a44935a9a8a65981b
diff --git a/metadata/md5-cache/dev-ros/diagnostic_analysis-1.8.8 b/metadata/md5-cache/dev-ros/diagnostic_analysis-1.8.8
index bbb0ef63e69f..32b8a721a16e 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_analysis-1.8.8
+++ b/metadata/md5-cache/dev-ros/diagnostic_analysis-1.8.8
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.8.8.tar.gz -> diagnostics-1.8.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9a3227d4f164d8297e9c1fb74f6d98fb
diff --git a/metadata/md5-cache/dev-ros/diagnostic_analysis-1.8.9 b/metadata/md5-cache/dev-ros/diagnostic_analysis-1.8.9
index 245bc6a0b353..2acbd94fdcf4 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_analysis-1.8.9
+++ b/metadata/md5-cache/dev-ros/diagnostic_analysis-1.8.9
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.8.9.tar.gz -> diagnostics-1.8.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9a3227d4f164d8297e9c1fb74f6d98fb
diff --git a/metadata/md5-cache/dev-ros/diagnostic_analysis-1.9.0 b/metadata/md5-cache/dev-ros/diagnostic_analysis-1.9.0
index 71667cde1915..7608fb689aa8 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_analysis-1.9.0
+++ b/metadata/md5-cache/dev-ros/diagnostic_analysis-1.9.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.0.tar.gz -> diagnostics-1.9.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=05860182b95344314599be54fc9833a0
diff --git a/metadata/md5-cache/dev-ros/diagnostic_analysis-1.9.2 b/metadata/md5-cache/dev-ros/diagnostic_analysis-1.9.2
index 2505f20af421..199df4ae5e55 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_analysis-1.9.2
+++ b/metadata/md5-cache/dev-ros/diagnostic_analysis-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.2.tar.gz -> diagnostics-1.9.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=05860182b95344314599be54fc9833a0
diff --git a/metadata/md5-cache/dev-ros/diagnostic_analysis-1.9.3 b/metadata/md5-cache/dev-ros/diagnostic_analysis-1.9.3
index 42dd3ee50c34..54b6378bdff4 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_analysis-1.9.3
+++ b/metadata/md5-cache/dev-ros/diagnostic_analysis-1.9.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.3.tar.gz -> diagnostics-1.9.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=68bf80af2df174153335c697354f5ba7
diff --git a/metadata/md5-cache/dev-ros/diagnostic_analysis-9999 b/metadata/md5-cache/dev-ros/diagnostic_analysis-9999
index b83b3c6a214a..01116007ef44 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_analysis-9999
+++ b/metadata/md5-cache/dev-ros/diagnostic_analysis-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=9a3227d4f164d8297e9c1fb74f6d98fb
diff --git a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.8.10 b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.8.10
index ae2b2cdbef21..f9177b1f6ce1 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.8.10
+++ b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.8.10
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_updater[python_targets_python2_7(-)?,-python_single_t
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.8.10.tar.gz -> diagnostics-1.8.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bf0b19d051251bea2ece62eb97abd68c
diff --git a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.8.8 b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.8.8
index 4a8f2fb79366..eef36ca15050 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.8.8
+++ b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.8.8
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_updater[python_targets_python2_7(-)?,-python_single_t
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.8.8.tar.gz -> diagnostics-1.8.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=779baceb271f870a1623c8baa9b33392
diff --git a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.8.9 b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.8.9
index 5e1bf4abb7e9..1543d3b0aa9b 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.8.9
+++ b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.8.9
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_updater[python_targets_python2_7(-)?,-python_single_t
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.8.9.tar.gz -> diagnostics-1.8.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=779baceb271f870a1623c8baa9b33392
diff --git a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.9.0 b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.9.0
index dde2d6e9835b..cbf265dcaae5 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.9.0
+++ b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.9.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_updater[python_targets_python2_7(-)?,-python_single_t
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.0.tar.gz -> diagnostics-1.9.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0fc2da8e323309bfa93df70294271e5d
diff --git a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.9.2 b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.9.2
index 7831ca7e211b..ea4eb7c48355 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.9.2
+++ b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_updater[python_targets_python2_7(-)?,-python_single_t
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.2.tar.gz -> diagnostics-1.9.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=0fc2da8e323309bfa93df70294271e5d
diff --git a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.9.3 b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.9.3
index 0d81ba9e39ed..2b7fc7c670fc 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.9.3
+++ b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.9.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_updater[python_targets_python2_7(-)?,-python_single_t
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.3.tar.gz -> diagnostics-1.9.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=599bd6af28c78bec2f36603135068fb2
diff --git a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-9999 b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-9999
index 1ef35ec45bf3..07b3294f2863 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-9999
+++ b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/diagnostic_updater[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-admin/hddtemp python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=779baceb271f870a1623c8baa9b33392
diff --git a/metadata/md5-cache/dev-ros/diagnostic_msgs-1.12.5 b/metadata/md5-cache/dev-ros/diagnostic_msgs-1.12.5
index 2498741d1f45..8296fc9b7b04 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_msgs-1.12.5
+++ b/metadata/md5-cache/dev-ros/diagnostic_msgs-1.12.5
@@ -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/ros/common_msgs/archive/1.12.5.tar.gz -> common_msgs-1.12.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=16292cd1ff1c7e1a5e0be72904e619ec
diff --git a/metadata/md5-cache/dev-ros/diagnostic_msgs-1.12.6 b/metadata/md5-cache/dev-ros/diagnostic_msgs-1.12.6
index e990dbcd46e3..d1dfbf5fcb99 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_msgs-1.12.6
+++ b/metadata/md5-cache/dev-ros/diagnostic_msgs-1.12.6
@@ -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/ros/common_msgs/archive/1.12.6.tar.gz -> common_msgs-1.12.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ff074bb3dd162edc9465bf044a7a7e98
diff --git a/metadata/md5-cache/dev-ros/diagnostic_msgs-9999 b/metadata/md5-cache/dev-ros/diagnostic_msgs-9999
index a5b7d00edb0b..ad2f063b2778 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_msgs-9999
+++ b/metadata/md5-cache/dev-ros/diagnostic_msgs-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=16292cd1ff1c7e1a5e0be72904e619ec
diff --git a/metadata/md5-cache/dev-ros/diagnostic_updater-1.8.10 b/metadata/md5-cache/dev-ros/diagnostic_updater-1.8.10
index 96c6d1075609..90cead608281 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_updater-1.8.10
+++ b/metadata/md5-cache/dev-ros/diagnostic_updater-1.8.10
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_cxx(-),ros_messages_python(-),pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.8.10.tar.gz -> diagnostics-1.8.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9910bc98ce20614b6f2cae20614cda9f
diff --git a/metadata/md5-cache/dev-ros/diagnostic_updater-1.8.8 b/metadata/md5-cache/dev-ros/diagnostic_updater-1.8.8
index b758ab5afec1..a9b375b15c40 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_updater-1.8.8
+++ b/metadata/md5-cache/dev-ros/diagnostic_updater-1.8.8
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_cxx(-),ros_messages_python(-),pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.8.8.tar.gz -> diagnostics-1.8.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7ee2d82b596a897a6b3df6b4bd5ce74a
diff --git a/metadata/md5-cache/dev-ros/diagnostic_updater-1.8.9 b/metadata/md5-cache/dev-ros/diagnostic_updater-1.8.9
index 44a6396579fb..5eea5ebd3453 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_updater-1.8.9
+++ b/metadata/md5-cache/dev-ros/diagnostic_updater-1.8.9
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_cxx(-),ros_messages_python(-),pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.8.9.tar.gz -> diagnostics-1.8.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7ee2d82b596a897a6b3df6b4bd5ce74a
diff --git a/metadata/md5-cache/dev-ros/diagnostic_updater-1.9.0 b/metadata/md5-cache/dev-ros/diagnostic_updater-1.9.0
index d70ae91c5053..f4ef3079e216 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_updater-1.9.0
+++ b/metadata/md5-cache/dev-ros/diagnostic_updater-1.9.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_cxx(-),ros_messages_python(-),pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.0.tar.gz -> diagnostics-1.9.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d67c53ec39254a8516ce8cc856bb9de1
diff --git a/metadata/md5-cache/dev-ros/diagnostic_updater-1.9.2 b/metadata/md5-cache/dev-ros/diagnostic_updater-1.9.2
index 73ce5c408700..66f3697af3d0 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_updater-1.9.2
+++ b/metadata/md5-cache/dev-ros/diagnostic_updater-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_cxx(-),ros_messages_python(-),pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.2.tar.gz -> diagnostics-1.9.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=d67c53ec39254a8516ce8cc856bb9de1
diff --git a/metadata/md5-cache/dev-ros/diagnostic_updater-1.9.3 b/metadata/md5-cache/dev-ros/diagnostic_updater-1.9.3
index bb5f0e03baec..8ba47a8695f8 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_updater-1.9.3
+++ b/metadata/md5-cache/dev-ros/diagnostic_updater-1.9.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_cxx(-),ros_messages_python(-),pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.3.tar.gz -> diagnostics-1.9.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=73017135f87e6dea58f3fbeee7484878
diff --git a/metadata/md5-cache/dev-ros/diagnostic_updater-9999 b/metadata/md5-cache/dev-ros/diagnostic_updater-9999
index 269a7ed26b76..043c0c318322 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_updater-9999
+++ b/metadata/md5-cache/dev-ros/diagnostic_updater-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/diagnostic_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=7ee2d82b596a897a6b3df6b4bd5ce74a
diff --git a/metadata/md5-cache/dev-ros/driver_base-1.6.8 b/metadata/md5-cache/dev-ros/driver_base-1.6.8
index 66d0c736b09d..f624ec7b8fad 100644
--- a/metadata/md5-cache/dev-ros/driver_base-1.6.8
+++ b/metadata/md5-cache/dev-ros/driver_base-1.6.8
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/driver_common/archive/1.6.8.tar.gz -> driver_common-1.6.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=687a0d22ee23834d234c93ffd20ed403
diff --git a/metadata/md5-cache/dev-ros/driver_base-9999 b/metadata/md5-cache/dev-ros/driver_base-9999
index 4b331f21fedd..54d33a954be5 100644
--- a/metadata/md5-cache/dev-ros/driver_base-9999
+++ b/metadata/md5-cache/dev-ros/driver_base-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=687a0d22ee23834d234c93ffd20ed403
diff --git a/metadata/md5-cache/dev-ros/dwa_local_planner-1.16.1 b/metadata/md5-cache/dev-ros/dwa_local_planner-1.16.1
index 807a2329fd56..a7ca2f4bd0a4 100644
--- a/metadata/md5-cache/dev-ros/dwa_local_planner-1.16.1
+++ b/metadata/md5-cache/dev-ros/dwa_local_planner-1.16.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigur
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.1.tar.gz -> navigation-1.16.1.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=25595817cf2e5428d925448732a50ab5
diff --git a/metadata/md5-cache/dev-ros/dwa_local_planner-1.16.2 b/metadata/md5-cache/dev-ros/dwa_local_planner-1.16.2
index f1b55bf31793..84cf5b13d5ee 100644
--- a/metadata/md5-cache/dev-ros/dwa_local_planner-1.16.2
+++ b/metadata/md5-cache/dev-ros/dwa_local_planner-1.16.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dyn
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz -> navigation-1.16.2.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d6c3db79a4697290cfde448ae971a8b3
diff --git a/metadata/md5-cache/dev-ros/dwa_local_planner-9999 b/metadata/md5-cache/dev-ros/dwa_local_planner-9999
index 98ef05b212a6..7c43c0afc5a0 100644
--- a/metadata/md5-cache/dev-ros/dwa_local_planner-9999
+++ b/metadata/md5-cache/dev-ros/dwa_local_planner-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=d6c3db79a4697290cfde448ae971a8b3
diff --git a/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.5.48 b/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.5.48
index c44daf494f7b..ecac25ea0e88 100644
--- a/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.5.48
+++ b/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.5.48
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python2_7(-)?,-py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/dynamic_reconfigure/archive/1.5.48.tar.gz -> dynamic_reconfigure-1.5.48.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6952c884de58292b79581b7232d03bda
diff --git a/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.5.49 b/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.5.49
index 571618fd7068..854318d7d1b4 100644
--- a/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.5.49
+++ b/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.5.49
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python2_7(-)?,-py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/dynamic_reconfigure/archive/1.5.49.tar.gz -> dynamic_reconfigure-1.5.49.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6952c884de58292b79581b7232d03bda
diff --git a/metadata/md5-cache/dev-ros/dynamic_reconfigure-9999 b/metadata/md5-cache/dev-ros/dynamic_reconfigure-9999
index 0eed746d456b..f118c1a8493a 100644
--- a/metadata/md5-cache/dev-ros/dynamic_reconfigure-9999
+++ b/metadata/md5-cache/dev-ros/dynamic_reconfigure-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] 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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=6952c884de58292b79581b7232d03bda
diff --git a/metadata/md5-cache/dev-ros/eigen_conversions-1.11.9-r1 b/metadata/md5-cache/dev-ros/eigen_conversions-1.11.9-r1
index 5184ad684c51..0fd99b8ee97b 100644
--- a/metadata/md5-cache/dev-ros/eigen_conversions-1.11.9-r1
+++ b/metadata/md5-cache/dev-ros/eigen_conversions-1.11.9-r1
@@ -10,5 +10,5 @@ RDEPEND=sci-libs/orocos_kdl:= dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry/archive/1.11.9.tar.gz -> geometry-1.11.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=def115851bb22128fa86b5b2977b213f
diff --git a/metadata/md5-cache/dev-ros/eigen_conversions-1.12.0 b/metadata/md5-cache/dev-ros/eigen_conversions-1.12.0
index fc871378dcd0..06a265d19ce8 100644
--- a/metadata/md5-cache/dev-ros/eigen_conversions-1.12.0
+++ b/metadata/md5-cache/dev-ros/eigen_conversions-1.12.0
@@ -10,5 +10,5 @@ RDEPEND=sci-libs/orocos_kdl:= dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry/archive/1.12.0.tar.gz -> geometry-1.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=def115851bb22128fa86b5b2977b213f
diff --git a/metadata/md5-cache/dev-ros/eigen_conversions-9999 b/metadata/md5-cache/dev-ros/eigen_conversions-9999
index feef4e35e585..893bf25651f5 100644
--- a/metadata/md5-cache/dev-ros/eigen_conversions-9999
+++ b/metadata/md5-cache/dev-ros/eigen_conversions-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=sci-libs/orocos_kdl:= dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=def115851bb22128fa86b5b2977b213f
diff --git a/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.4 b/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.4
index 86cfd3842127..11040ce4dde3 100644
--- a/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.4
+++ b/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.4
@@ -10,5 +10,5 @@ RDEPEND=dev-cpp/eigen:3 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/eigen_stl_containers/archive/0.1.4.tar.gz -> eigen_stl_containers-0.1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ac09e23c9a297f1ea5d497c33257fa2d
diff --git a/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.5 b/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.5
index 6a696cdf6058..047f15ca038d 100644
--- a/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.5
+++ b/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.5
@@ -10,5 +10,5 @@ RDEPEND=dev-cpp/eigen:3 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/eigen_stl_containers/archive/0.1.5.tar.gz -> eigen_stl_containers-0.1.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ac09e23c9a297f1ea5d497c33257fa2d
diff --git a/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.6 b/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.6
index 6511e7de992f..9c7a2c88d9da 100644
--- a/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.6
+++ b/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.6
@@ -10,5 +10,5 @@ RDEPEND=dev-cpp/eigen:3 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/eigen_stl_containers/archive/0.1.6.tar.gz -> eigen_stl_containers-0.1.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=91703cee90c0e5c45bf6b2c44ad494a6
diff --git a/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.7 b/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.7
index e7892ad1b8ca..f2e143c717b6 100644
--- a/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.7
+++ b/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.7
@@ -10,5 +10,5 @@ RDEPEND=dev-cpp/eigen:3 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/eigen_stl_containers/archive/0.1.7.tar.gz -> eigen_stl_containers-0.1.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=25aed673878d8662d83e60722427305b
diff --git a/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.8 b/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.8
index b95830839196..1826e3af9f49 100644
--- a/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.8
+++ b/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.8
@@ -10,5 +10,5 @@ RDEPEND=dev-cpp/eigen:3 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/eigen_stl_containers/archive/0.1.8.tar.gz -> eigen_stl_containers-0.1.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=25aed673878d8662d83e60722427305b
diff --git a/metadata/md5-cache/dev-ros/eigen_stl_containers-9999 b/metadata/md5-cache/dev-ros/eigen_stl_containers-9999
index 6ec660dc40bf..389557ff2e8e 100644
--- a/metadata/md5-cache/dev-ros/eigen_stl_containers-9999
+++ b/metadata/md5-cache/dev-ros/eigen_stl_containers-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-cpp/eigen:3 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=ac09e23c9a297f1ea5d497c33257fa2d
diff --git a/metadata/md5-cache/dev-ros/fake_localization-1.15.2 b/metadata/md5-cache/dev-ros/fake_localization-1.15.2
index d7f056de37d1..f6e6d388cd8b 100644
--- a/metadata/md5-cache/dev-ros/fake_localization-1.15.2
+++ b/metadata/md5-cache/dev-ros/fake_localization-1.15.2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.15.2.tar.gz -> navigation-1.15.2.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=522029e9ccc9fc24d750386ade31e864
diff --git a/metadata/md5-cache/dev-ros/fake_localization-1.16.0 b/metadata/md5-cache/dev-ros/fake_localization-1.16.0
index d07219c6ed17..a9d8b8dd54c7 100644
--- a/metadata/md5-cache/dev-ros/fake_localization-1.16.0
+++ b/metadata/md5-cache/dev-ros/fake_localization-1.16.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.0.tar.gz -> navigation-1.16.0.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fe5ebab6223f30f32aae686cac901a1f
diff --git a/metadata/md5-cache/dev-ros/fake_localization-1.16.1 b/metadata/md5-cache/dev-ros/fake_localization-1.16.1
index 700643266da4..f2be9378a719 100644
--- a/metadata/md5-cache/dev-ros/fake_localization-1.16.1
+++ b/metadata/md5-cache/dev-ros/fake_localization-1.16.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.1.tar.gz -> navigation-1.16.1.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fe5ebab6223f30f32aae686cac901a1f
diff --git a/metadata/md5-cache/dev-ros/fake_localization-1.16.2 b/metadata/md5-cache/dev-ros/fake_localization-1.16.2
index 2a4af7892e05..8eacd2cd3120 100644
--- a/metadata/md5-cache/dev-ros/fake_localization-1.16.2
+++ b/metadata/md5-cache/dev-ros/fake_localization-1.16.2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz -> navigation-1.16.2.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fe5ebab6223f30f32aae686cac901a1f
diff --git a/metadata/md5-cache/dev-ros/fake_localization-9999 b/metadata/md5-cache/dev-ros/fake_localization-9999
index 3da13e697b28..bed5324d29fa 100644
--- a/metadata/md5-cache/dev-ros/fake_localization-9999
+++ b/metadata/md5-cache/dev-ros/fake_localization-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/message_filters dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=fe5ebab6223f30f32aae686cac901a1f
diff --git a/metadata/md5-cache/dev-ros/filters-1.8.1-r1 b/metadata/md5-cache/dev-ros/filters-1.8.1-r1
index 2a73cd80c615..4c5b36d2d49f 100644
--- a/metadata/md5-cache/dev-ros/filters-1.8.1-r1
+++ b/metadata/md5-cache/dev-ros/filters-1.8.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-r
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/filters/archive/1.8.1.tar.gz -> filters-1.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4f5028c6903189c68887453be25cfe05
diff --git a/metadata/md5-cache/dev-ros/filters-9999 b/metadata/md5-cache/dev-ros/filters-9999
index dc0fe5217370..bc59a8c726f8 100644
--- a/metadata/md5-cache/dev-ros/filters-9999
+++ b/metadata/md5-cache/dev-ros/filters-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] dev-libs/console_bridge:= 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=4f5028c6903189c68887453be25cfe05
diff --git a/metadata/md5-cache/dev-ros/gazebo_dev-2.7.3 b/metadata/md5-cache/dev-ros/gazebo_dev-2.7.3
index 58b5ee809b25..fc39c8a1ea6f 100644
--- a/metadata/md5-cache/dev-ros/gazebo_dev-2.7.3
+++ b/metadata/md5-cache/dev-ros/gazebo_dev-2.7.3
@@ -10,5 +10,5 @@ RDEPEND=sci-electronics/gazebo python_targets_python2_7? ( >=dev-lang/python-2.7
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.7.3.tar.gz -> gazebo_ros_pkgs-2.7.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9272b7fc6b39eae0800e872cf98ad7ea
diff --git a/metadata/md5-cache/dev-ros/gazebo_dev-2.7.4 b/metadata/md5-cache/dev-ros/gazebo_dev-2.7.4
index e0a74069abc2..8ef9b8a59c5d 100644
--- a/metadata/md5-cache/dev-ros/gazebo_dev-2.7.4
+++ b/metadata/md5-cache/dev-ros/gazebo_dev-2.7.4
@@ -10,5 +10,5 @@ RDEPEND=sci-electronics/gazebo python_targets_python2_7? ( >=dev-lang/python-2.7
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.7.4.tar.gz -> gazebo_ros_pkgs-2.7.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9272b7fc6b39eae0800e872cf98ad7ea
diff --git a/metadata/md5-cache/dev-ros/gazebo_dev-2.8.4 b/metadata/md5-cache/dev-ros/gazebo_dev-2.8.4
index e1b740d9dccf..dd9a31f6389d 100644
--- a/metadata/md5-cache/dev-ros/gazebo_dev-2.8.4
+++ b/metadata/md5-cache/dev-ros/gazebo_dev-2.8.4
@@ -10,5 +10,5 @@ RDEPEND=sci-electronics/gazebo python_targets_python2_7? ( >=dev-lang/python-2.7
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.8.4.tar.gz -> gazebo_ros_pkgs-2.8.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9272b7fc6b39eae0800e872cf98ad7ea
diff --git a/metadata/md5-cache/dev-ros/gazebo_dev-9999 b/metadata/md5-cache/dev-ros/gazebo_dev-9999
index eb89e94c2bf3..c431bc6e27ab 100644
--- a/metadata/md5-cache/dev-ros/gazebo_dev-9999
+++ b/metadata/md5-cache/dev-ros/gazebo_dev-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=sci-electronics/gazebo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=9272b7fc6b39eae0800e872cf98ad7ea
diff --git a/metadata/md5-cache/dev-ros/gazebo_msgs-2.6.2 b/metadata/md5-cache/dev-ros/gazebo_msgs-2.6.2
index 1f6ca7c45bda..51da5865f79e 100644
--- a/metadata/md5-cache/dev-ros/gazebo_msgs-2.6.2
+++ b/metadata/md5-cache/dev-ros/gazebo_msgs-2.6.2
@@ -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/ros-simulation/gazebo_ros_pkgs/archive/2.6.2.tar.gz -> gazebo_ros_pkgs-2.6.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=22b6e0e0bfb0237b73f633dc3a3bfa31
diff --git a/metadata/md5-cache/dev-ros/gazebo_msgs-2.7.3 b/metadata/md5-cache/dev-ros/gazebo_msgs-2.7.3
index 3e01fb6a6cdb..68c272465343 100644
--- a/metadata/md5-cache/dev-ros/gazebo_msgs-2.7.3
+++ b/metadata/md5-cache/dev-ros/gazebo_msgs-2.7.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=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.7.3.tar.gz -> gazebo_ros_pkgs-2.7.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b1f44b59ab4536a33899d94f44491e3d
diff --git a/metadata/md5-cache/dev-ros/gazebo_msgs-2.7.4 b/metadata/md5-cache/dev-ros/gazebo_msgs-2.7.4
index 55a91a10cb06..2bc9f5b327e0 100644
--- a/metadata/md5-cache/dev-ros/gazebo_msgs-2.7.4
+++ b/metadata/md5-cache/dev-ros/gazebo_msgs-2.7.4
@@ -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/ros-simulation/gazebo_ros_pkgs/archive/2.7.4.tar.gz -> gazebo_ros_pkgs-2.7.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b1f44b59ab4536a33899d94f44491e3d
diff --git a/metadata/md5-cache/dev-ros/gazebo_msgs-2.8.4 b/metadata/md5-cache/dev-ros/gazebo_msgs-2.8.4
index c8f7fb97eb41..cfd5d67cdc61 100644
--- a/metadata/md5-cache/dev-ros/gazebo_msgs-2.8.4
+++ b/metadata/md5-cache/dev-ros/gazebo_msgs-2.8.4
@@ -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/ros-simulation/gazebo_ros_pkgs/archive/2.8.4.tar.gz -> gazebo_ros_pkgs-2.8.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b1f44b59ab4536a33899d94f44491e3d
diff --git a/metadata/md5-cache/dev-ros/gazebo_msgs-9999 b/metadata/md5-cache/dev-ros/gazebo_msgs-9999
index e0ba33c7e633..8a84805a6353 100644
--- a/metadata/md5-cache/dev-ros/gazebo_msgs-9999
+++ b/metadata/md5-cache/dev-ros/gazebo_msgs-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=22b6e0e0bfb0237b73f633dc3a3bfa31
diff --git a/metadata/md5-cache/dev-ros/gazebo_plugins-2.6.2 b/metadata/md5-cache/dev-ros/gazebo_plugins-2.6.2
index 3ab189d25c64..b73234d3c9ff 100644
--- a/metadata/md5-cache/dev-ros/gazebo_plugins-2.6.2
+++ b/metadata/md5-cache/dev-ros/gazebo_plugins-2.6.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/rospy de
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.6.2.tar.gz -> gazebo_ros_pkgs-2.6.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=a97835cd5f5e80b14fab89d9369802b6
diff --git a/metadata/md5-cache/dev-ros/gazebo_plugins-2.7.3 b/metadata/md5-cache/dev-ros/gazebo_plugins-2.7.3
index 454c15a86986..187a91f2b6b6 100644
--- a/metadata/md5-cache/dev-ros/gazebo_plugins-2.7.3
+++ b/metadata/md5-cache/dev-ros/gazebo_plugins-2.7.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/gazebo_dev dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/rosc
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.7.3.tar.gz -> gazebo_ros_pkgs-2.7.3.tar.gz mirror://gentoo/gazebo-ros-2.7.3-patches-1.tar.bz2
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f2dfefc22592f96ab367e69112cf1402
diff --git a/metadata/md5-cache/dev-ros/gazebo_plugins-2.7.4 b/metadata/md5-cache/dev-ros/gazebo_plugins-2.7.4
index 070614fbe05c..11c67d516678 100644
--- a/metadata/md5-cache/dev-ros/gazebo_plugins-2.7.4
+++ b/metadata/md5-cache/dev-ros/gazebo_plugins-2.7.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/gazebo_dev dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/rosc
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.7.4.tar.gz -> gazebo_ros_pkgs-2.7.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1e5b6146f629141dfb40fd342cc29477
diff --git a/metadata/md5-cache/dev-ros/gazebo_plugins-2.8.4 b/metadata/md5-cache/dev-ros/gazebo_plugins-2.8.4
index 40e05bb22c16..5e1d9d74f856 100644
--- a/metadata/md5-cache/dev-ros/gazebo_plugins-2.8.4
+++ b/metadata/md5-cache/dev-ros/gazebo_plugins-2.8.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/gazebo_dev dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/rosc
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.8.4.tar.gz -> gazebo_ros_pkgs-2.8.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1e5b6146f629141dfb40fd342cc29477
diff --git a/metadata/md5-cache/dev-ros/gazebo_plugins-9999 b/metadata/md5-cache/dev-ros/gazebo_plugins-9999
index d877dc830815..174d0f7ec0d3 100644
--- a/metadata/md5-cache/dev-ros/gazebo_plugins-9999
+++ b/metadata/md5-cache/dev-ros/gazebo_plugins-9999
@@ -8,5 +8,5 @@ LICENSE=BSD Apache-2.0
 RDEPEND=dev-ros/gazebo_dev dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/driver_base[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge media-libs/opencv:= dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-ros/moveit_msgs[ros_messages_cxx(-)] dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-libs/protobuf:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=1e5b6146f629141dfb40fd342cc29477
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros-2.6.2 b/metadata/md5-cache/dev-ros/gazebo_ros-2.6.2
index 0c27a72a6466..c91fda04af7c 100644
--- a/metadata/md5-cache/dev-ros/gazebo_ros-2.6.2
+++ b/metadata/md5-cache/dev-ros/gazebo_ros-2.6.2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/ga
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.6.2.tar.gz -> gazebo_ros_pkgs-2.6.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=6fe881ce4516d99c789037bf8c021a0b
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros-2.7.3 b/metadata/md5-cache/dev-ros/gazebo_ros-2.7.3
index f1ed43ef8291..8cb74a8259b7 100644
--- a/metadata/md5-cache/dev-ros/gazebo_ros-2.7.3
+++ b/metadata/md5-cache/dev-ros/gazebo_ros-2.7.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/pr
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.7.3.tar.gz -> gazebo_ros_pkgs-2.7.3.tar.gz mirror://gentoo/gazebo-ros-2.7.3-patches-1.tar.bz2
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1a46b772ff66aabc135a95f70293bee0
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros-2.7.4 b/metadata/md5-cache/dev-ros/gazebo_ros-2.7.4
index ebd547cc9fd8..8e98b08bef21 100644
--- a/metadata/md5-cache/dev-ros/gazebo_ros-2.7.4
+++ b/metadata/md5-cache/dev-ros/gazebo_ros-2.7.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/pr
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.7.4.tar.gz -> gazebo_ros_pkgs-2.7.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7844afbd791467a4c5705be19adf3fcd
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros-2.8.4 b/metadata/md5-cache/dev-ros/gazebo_ros-2.8.4
index 418222d7ce72..8040f1733987 100644
--- a/metadata/md5-cache/dev-ros/gazebo_ros-2.8.4
+++ b/metadata/md5-cache/dev-ros/gazebo_ros-2.8.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/pr
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.8.4.tar.gz -> gazebo_ros_pkgs-2.8.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7844afbd791467a4c5705be19adf3fcd
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros-9999 b/metadata/md5-cache/dev-ros/gazebo_ros-9999
index d06b7382ff76..d8d201e38d92 100644
--- a/metadata/md5-cache/dev-ros/gazebo_ros-9999
+++ b/metadata/md5-cache/dev-ros/gazebo_ros-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=7844afbd791467a4c5705be19adf3fcd
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros_control-2.6.2-r1 b/metadata/md5-cache/dev-ros/gazebo_ros_control-2.6.2-r1
index e08679cafa3f..522e213eff6e 100644
--- a/metadata/md5-cache/dev-ros/gazebo_ros_control-2.6.2-r1
+++ b/metadata/md5-cache/dev-ros/gazebo_ros_control-2.6.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/contro
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.6.2.tar.gz -> gazebo_ros_pkgs-2.6.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=18ae2263dfb54482940eb4f77b3f4285
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros_control-2.7.3 b/metadata/md5-cache/dev-ros/gazebo_ros_control-2.7.3
index 31481f8a8077..f635f82800dc 100644
--- a/metadata/md5-cache/dev-ros/gazebo_ros_control-2.7.3
+++ b/metadata/md5-cache/dev-ros/gazebo_ros_control-2.7.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_too
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.7.3.tar.gz -> gazebo_ros_pkgs-2.7.3.tar.gz mirror://gentoo/gazebo-ros-2.7.3-patches-1.tar.bz2
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=745d538f0e3e5b505d80c915e8fe25db
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros_control-2.7.4 b/metadata/md5-cache/dev-ros/gazebo_ros_control-2.7.4
index c17fd7a2ad9e..33496d4fa2ed 100644
--- a/metadata/md5-cache/dev-ros/gazebo_ros_control-2.7.4
+++ b/metadata/md5-cache/dev-ros/gazebo_ros_control-2.7.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_too
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.7.4.tar.gz -> gazebo_ros_pkgs-2.7.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c91d6e4b0057042158c6f3930759c72b
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros_control-2.8.4 b/metadata/md5-cache/dev-ros/gazebo_ros_control-2.8.4
index a95e77e4bf9a..acf64a4a26f4 100644
--- a/metadata/md5-cache/dev-ros/gazebo_ros_control-2.8.4
+++ b/metadata/md5-cache/dev-ros/gazebo_ros_control-2.8.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_too
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.8.4.tar.gz -> gazebo_ros_pkgs-2.8.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c91d6e4b0057042158c6f3930759c72b
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros_control-9999 b/metadata/md5-cache/dev-ros/gazebo_ros_control-9999
index a6e071797d18..b20646bacaf2 100644
--- a/metadata/md5-cache/dev-ros/gazebo_ros_control-9999
+++ b/metadata/md5-cache/dev-ros/gazebo_ros_control-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=c91d6e4b0057042158c6f3930759c72b
diff --git a/metadata/md5-cache/dev-ros/gencpp-0.5.5 b/metadata/md5-cache/dev-ros/gencpp-0.5.5
index 128e6c516789..d9562d3f8fc3 100644
--- a/metadata/md5-cache/dev-ros/gencpp-0.5.5
+++ b/metadata/md5-cache/dev-ros/gencpp-0.5.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0/0.5.5
 SRC_URI=https://github.com/ros/gencpp/archive/0.5.5.tar.gz -> gencpp-0.5.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f6e13f83754e7de72fb85cf85529c088
diff --git a/metadata/md5-cache/dev-ros/gencpp-0.6.0 b/metadata/md5-cache/dev-ros/gencpp-0.6.0
index b2d9cde6205d..01d1217a80b5 100644
--- a/metadata/md5-cache/dev-ros/gencpp-0.6.0
+++ b/metadata/md5-cache/dev-ros/gencpp-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0/0.6.0
 SRC_URI=https://github.com/ros/gencpp/archive/0.6.0.tar.gz -> gencpp-0.6.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5efa01a0811fcab4cb3de2f07a2ce78f
diff --git a/metadata/md5-cache/dev-ros/gencpp-9999 b/metadata/md5-cache/dev-ros/gencpp-9999
index 8495d1c1eca0..f55187b1fbf4 100644
--- a/metadata/md5-cache/dev-ros/gencpp-9999
+++ b/metadata/md5-cache/dev-ros/gencpp-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/genmsg[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/9999
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=f6e13f83754e7de72fb85cf85529c088
diff --git a/metadata/md5-cache/dev-ros/geneus-2.2.5 b/metadata/md5-cache/dev-ros/geneus-2.2.5
index fdd73a87ed02..14a9d4481187 100644
--- a/metadata/md5-cache/dev-ros/geneus-2.2.5
+++ b/metadata/md5-cache/dev-ros/geneus-2.2.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0/2.2.5
 SRC_URI=https://github.com/jsk-ros-pkg/geneus/archive/2.2.5.tar.gz -> geneus-2.2.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=dd29abc3b5d488889f2e03daa98e3811
diff --git a/metadata/md5-cache/dev-ros/geneus-2.2.6 b/metadata/md5-cache/dev-ros/geneus-2.2.6
index 9fd1b32af507..7e46055cd55a 100644
--- a/metadata/md5-cache/dev-ros/geneus-2.2.6
+++ b/metadata/md5-cache/dev-ros/geneus-2.2.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0/2.2.6
 SRC_URI=https://github.com/jsk-ros-pkg/geneus/archive/2.2.6.tar.gz -> geneus-2.2.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=dd29abc3b5d488889f2e03daa98e3811
diff --git a/metadata/md5-cache/dev-ros/geneus-9999 b/metadata/md5-cache/dev-ros/geneus-9999
index 92d3db9fb266..737dabba6a9f 100644
--- a/metadata/md5-cache/dev-ros/geneus-9999
+++ b/metadata/md5-cache/dev-ros/geneus-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/genmsg[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/9999
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=dd29abc3b5d488889f2e03daa98e3811
diff --git a/metadata/md5-cache/dev-ros/genlisp-0.4.16 b/metadata/md5-cache/dev-ros/genlisp-0.4.16
index 6f3c0de8a978..3f417d03f88b 100644
--- a/metadata/md5-cache/dev-ros/genlisp-0.4.16
+++ b/metadata/md5-cache/dev-ros/genlisp-0.4.16
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0/0.4.16
 SRC_URI=https://github.com/ros/genlisp/archive/0.4.16.tar.gz -> genlisp-0.4.16.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1e40372f11c6d529f02b3f946e2099c5
diff --git a/metadata/md5-cache/dev-ros/genlisp-9999 b/metadata/md5-cache/dev-ros/genlisp-9999
index 2912a0255f38..70dfec000342 100644
--- a/metadata/md5-cache/dev-ros/genlisp-9999
+++ b/metadata/md5-cache/dev-ros/genlisp-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/genmsg[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/9999
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=1e40372f11c6d529f02b3f946e2099c5
diff --git a/metadata/md5-cache/dev-ros/genmsg-0.5.10 b/metadata/md5-cache/dev-ros/genmsg-0.5.10
index fd6529273399..ad186b6eda73 100644
--- a/metadata/md5-cache/dev-ros/genmsg-0.5.10
+++ b/metadata/md5-cache/dev-ros/genmsg-0.5.10
@@ -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/ros/genmsg/archive/0.5.10.tar.gz -> genmsg-0.5.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3acf5c3dc6e21586d8d04d5521bf1ebf
diff --git a/metadata/md5-cache/dev-ros/genmsg-0.5.11 b/metadata/md5-cache/dev-ros/genmsg-0.5.11
index 2c6140640781..72ba19adaed2 100644
--- a/metadata/md5-cache/dev-ros/genmsg-0.5.11
+++ b/metadata/md5-cache/dev-ros/genmsg-0.5.11
@@ -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/ros/genmsg/archive/0.5.11.tar.gz -> genmsg-0.5.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3acf5c3dc6e21586d8d04d5521bf1ebf
diff --git a/metadata/md5-cache/dev-ros/genmsg-0.5.9 b/metadata/md5-cache/dev-ros/genmsg-0.5.9
index 7e1b2c311c88..9248f3ef3508 100644
--- a/metadata/md5-cache/dev-ros/genmsg-0.5.9
+++ b/metadata/md5-cache/dev-ros/genmsg-0.5.9
@@ -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/ros/genmsg/archive/0.5.9.tar.gz -> genmsg-0.5.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=640424a46fe1fe2bbdc4c35f9e44889e
diff --git a/metadata/md5-cache/dev-ros/genmsg-9999 b/metadata/md5-cache/dev-ros/genmsg-9999
index 9dd198ec4fc9..930eac80ccf1 100644
--- a/metadata/md5-cache/dev-ros/genmsg-9999
+++ b/metadata/md5-cache/dev-ros/genmsg-9999
@@ -8,5 +8,5 @@ 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=640424a46fe1fe2bbdc4c35f9e44889e
diff --git a/metadata/md5-cache/dev-ros/gennodejs-2.0.1 b/metadata/md5-cache/dev-ros/gennodejs-2.0.1
index 501b3d64f4ce..8f20b9dde335 100644
--- a/metadata/md5-cache/dev-ros/gennodejs-2.0.1
+++ b/metadata/md5-cache/dev-ros/gennodejs-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0/2.0.1
 SRC_URI=https://github.com/RethinkRobotics-opensource/gennodejs/archive/2.0.1.tar.gz -> gennodejs-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5f19ff75e68642e9b932d66348525607
diff --git a/metadata/md5-cache/dev-ros/gennodejs-9999 b/metadata/md5-cache/dev-ros/gennodejs-9999
index 10bc9e8f252f..a18c1a8a3bcf 100644
--- a/metadata/md5-cache/dev-ros/gennodejs-9999
+++ b/metadata/md5-cache/dev-ros/gennodejs-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/genmsg[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/9999
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=5f19ff75e68642e9b932d66348525607
diff --git a/metadata/md5-cache/dev-ros/genpy-0.6.7 b/metadata/md5-cache/dev-ros/genpy-0.6.7
index 4dee595defd6..086559f0715f 100644
--- a/metadata/md5-cache/dev-ros/genpy-0.6.7
+++ b/metadata/md5-cache/dev-ros/genpy-0.6.7
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0/0.6.7
 SRC_URI=https://github.com/ros/genpy/archive/0.6.7.tar.gz -> genpy-0.6.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=77f6fb73c0c5c2957dbac17520cfad4d
diff --git a/metadata/md5-cache/dev-ros/genpy-9999 b/metadata/md5-cache/dev-ros/genpy-9999
index 9b90a9128719..8a8917d37ed5 100644
--- a/metadata/md5-cache/dev-ros/genpy-9999
+++ b/metadata/md5-cache/dev-ros/genpy-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0/9999
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=77f6fb73c0c5c2957dbac17520cfad4d
diff --git a/metadata/md5-cache/dev-ros/geodesy-0.5.2 b/metadata/md5-cache/dev-ros/geodesy-0.5.2
index abbb8cce5eae..795356944d98 100644
--- a/metadata/md5-cache/dev-ros/geodesy-0.5.2
+++ b/metadata/md5-cache/dev-ros/geodesy-0.5.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/angles dev-ros/geographic_msgs[ros_messages_cxx(-),ros_messages_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-geographic-info/geographic_info/archive/geographic_info-0.5.2.tar.gz -> geographic_info-0.5.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=d8e6ff85bcdf66c2343436c76c9f7b65
diff --git a/metadata/md5-cache/dev-ros/geodesy-0.5.3 b/metadata/md5-cache/dev-ros/geodesy-0.5.3
index d4f8ea8829fe..0aa855137d49 100644
--- a/metadata/md5-cache/dev-ros/geodesy-0.5.3
+++ b/metadata/md5-cache/dev-ros/geodesy-0.5.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/angles dev-ros/geographic_msgs[ros_messages_cxx(-),ros_messages_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-geographic-info/geographic_info/archive/geographic_info-0.5.3.tar.gz -> geographic_info-0.5.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=28497e97a8672d07562a328bd9ac975b
diff --git a/metadata/md5-cache/dev-ros/geodesy-9999 b/metadata/md5-cache/dev-ros/geodesy-9999
index a9f5babbbf33..b6e74af98402 100644
--- a/metadata/md5-cache/dev-ros/geodesy-9999
+++ b/metadata/md5-cache/dev-ros/geodesy-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/angles dev-ros/geographic_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/unique_id dev-ros/uuid_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyproj[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=d8e6ff85bcdf66c2343436c76c9f7b65
diff --git a/metadata/md5-cache/dev-ros/geographic_msgs-0.5.0 b/metadata/md5-cache/dev-ros/geographic_msgs-0.5.0
index 3a93d9582ee5..5862b87ce8c0 100644
--- a/metadata/md5-cache/dev-ros/geographic_msgs-0.5.0
+++ b/metadata/md5-cache/dev-ros/geographic_msgs-0.5.0
@@ -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/ros-geographic-info/geographic_info/archive/geographic_info-0.5.0.tar.gz -> geographic_info-0.5.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=55b020d8b0eaee60571a097f86ec0b7c
diff --git a/metadata/md5-cache/dev-ros/geographic_msgs-0.5.2 b/metadata/md5-cache/dev-ros/geographic_msgs-0.5.2
index 7b108668ed6a..72a980cdc622 100644
--- a/metadata/md5-cache/dev-ros/geographic_msgs-0.5.2
+++ b/metadata/md5-cache/dev-ros/geographic_msgs-0.5.2
@@ -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/ros-geographic-info/geographic_info/archive/geographic_info-0.5.2.tar.gz -> geographic_info-0.5.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=55b020d8b0eaee60571a097f86ec0b7c
diff --git a/metadata/md5-cache/dev-ros/geographic_msgs-0.5.3 b/metadata/md5-cache/dev-ros/geographic_msgs-0.5.3
index b65c3eca4e06..e5252b3ea1c6 100644
--- a/metadata/md5-cache/dev-ros/geographic_msgs-0.5.3
+++ b/metadata/md5-cache/dev-ros/geographic_msgs-0.5.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=0
 SRC_URI=https://github.com/ros-geographic-info/geographic_info/archive/geographic_info-0.5.3.tar.gz -> geographic_info-0.5.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=575bd15db549e6c5ee2213dc12a52a0e
diff --git a/metadata/md5-cache/dev-ros/geographic_msgs-9999 b/metadata/md5-cache/dev-ros/geographic_msgs-9999
index 9c1cfde332e7..f7c2ef111ae8 100644
--- a/metadata/md5-cache/dev-ros/geographic_msgs-9999
+++ b/metadata/md5-cache/dev-ros/geographic_msgs-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/uuid_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/uuid_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=55b020d8b0eaee60571a097f86ec0b7c
diff --git a/metadata/md5-cache/dev-ros/geometric_shapes-0.5.4 b/metadata/md5-cache/dev-ros/geometric_shapes-0.5.4
index df715222f809..9b710b1778e6 100644
--- a/metadata/md5-cache/dev-ros/geometric_shapes-0.5.4
+++ b/metadata/md5-cache/dev-ros/geometric_shapes-0.5.4
@@ -10,5 +10,5 @@ RDEPEND=dev-cpp/eigen:3 dev-libs/boost:= media-libs/qhull media-libs/assimp sci-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/geometric_shapes/archive/0.5.4.tar.gz -> geometric_shapes-0.5.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c131aa87bad2b1efafa0db94846076ec
diff --git a/metadata/md5-cache/dev-ros/geometric_shapes-0.6.0 b/metadata/md5-cache/dev-ros/geometric_shapes-0.6.0
index b9ef08e52955..930a996be52f 100644
--- a/metadata/md5-cache/dev-ros/geometric_shapes-0.6.0
+++ b/metadata/md5-cache/dev-ros/geometric_shapes-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=dev-cpp/eigen:3 dev-libs/boost:= media-libs/qhull media-libs/assimp sci-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/geometric_shapes/archive/0.6.0.tar.gz -> geometric_shapes-0.6.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c131aa87bad2b1efafa0db94846076ec
diff --git a/metadata/md5-cache/dev-ros/geometric_shapes-9999 b/metadata/md5-cache/dev-ros/geometric_shapes-9999
index f33baba98815..573afa0d6029 100644
--- a/metadata/md5-cache/dev-ros/geometric_shapes-9999
+++ b/metadata/md5-cache/dev-ros/geometric_shapes-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-cpp/eigen:3 dev-libs/boost:= media-libs/qhull media-libs/assimp sci-libs/octomap dev-ros/random_numbers dev-ros/resource_retriever dev-ros/eigen_stl_containers dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/shape_msgs[ros_messages_cxx(-)] dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=c131aa87bad2b1efafa0db94846076ec
diff --git a/metadata/md5-cache/dev-ros/geometry_msgs-1.12.5 b/metadata/md5-cache/dev-ros/geometry_msgs-1.12.5
index 62d352b2b774..9d681cd6e62a 100644
--- a/metadata/md5-cache/dev-ros/geometry_msgs-1.12.5
+++ b/metadata/md5-cache/dev-ros/geometry_msgs-1.12.5
@@ -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/ros/common_msgs/archive/1.12.5.tar.gz -> common_msgs-1.12.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fbf739d8d76ac5d849bc1b56ca1f2a6f
diff --git a/metadata/md5-cache/dev-ros/geometry_msgs-1.12.6 b/metadata/md5-cache/dev-ros/geometry_msgs-1.12.6
index dec805994c86..0b65855de6a2 100644
--- a/metadata/md5-cache/dev-ros/geometry_msgs-1.12.6
+++ b/metadata/md5-cache/dev-ros/geometry_msgs-1.12.6
@@ -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/ros/common_msgs/archive/1.12.6.tar.gz -> common_msgs-1.12.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a3d2d04aa29b5457f0df9ae94d9398dd
diff --git a/metadata/md5-cache/dev-ros/geometry_msgs-9999 b/metadata/md5-cache/dev-ros/geometry_msgs-9999
index 6749bb5abe74..67b9d3a1d3f7 100644
--- a/metadata/md5-cache/dev-ros/geometry_msgs-9999
+++ b/metadata/md5-cache/dev-ros/geometry_msgs-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=fbf739d8d76ac5d849bc1b56ca1f2a6f
diff --git a/metadata/md5-cache/dev-ros/global_planner-1.15.1-r1 b/metadata/md5-cache/dev-ros/global_planner-1.15.1-r1
index 91b9610bce67..3fa7497f2d79 100644
--- a/metadata/md5-cache/dev-ros/global_planner-1.15.1-r1
+++ b/metadata/md5-cache/dev-ros/global_planner-1.15.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python2_7(
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.15.1.tar.gz -> navigation-1.15.1.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6029bfa3802b78b68265f0f8db751d24
diff --git a/metadata/md5-cache/dev-ros/global_planner-1.15.2 b/metadata/md5-cache/dev-ros/global_planner-1.15.2
index a83a0a8255fc..88328026c7e0 100644
--- a/metadata/md5-cache/dev-ros/global_planner-1.15.2
+++ b/metadata/md5-cache/dev-ros/global_planner-1.15.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python2_7(
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.15.2.tar.gz -> navigation-1.15.2.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b12d691b2197a404c698c88a00bda46a
diff --git a/metadata/md5-cache/dev-ros/global_planner-1.16.0 b/metadata/md5-cache/dev-ros/global_planner-1.16.0
index 1b9dc3490520..e010dd709f13 100644
--- a/metadata/md5-cache/dev-ros/global_planner-1.16.0
+++ b/metadata/md5-cache/dev-ros/global_planner-1.16.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.0.tar.gz -> navigation-1.16.0.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d533489a07b679923b935774584e18d0
diff --git a/metadata/md5-cache/dev-ros/global_planner-1.16.1 b/metadata/md5-cache/dev-ros/global_planner-1.16.1
index bb5f08c29484..75ac9c52be51 100644
--- a/metadata/md5-cache/dev-ros/global_planner-1.16.1
+++ b/metadata/md5-cache/dev-ros/global_planner-1.16.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.1.tar.gz -> navigation-1.16.1.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d533489a07b679923b935774584e18d0
diff --git a/metadata/md5-cache/dev-ros/global_planner-1.16.2 b/metadata/md5-cache/dev-ros/global_planner-1.16.2
index 517a170ccecc..b086ab146c66 100644
--- a/metadata/md5-cache/dev-ros/global_planner-1.16.2
+++ b/metadata/md5-cache/dev-ros/global_planner-1.16.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz -> navigation-1.16.2.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d533489a07b679923b935774584e18d0
diff --git a/metadata/md5-cache/dev-ros/global_planner-9999 b/metadata/md5-cache/dev-ros/global_planner-9999
index e27673d1b5d0..9a675da64704 100644
--- a/metadata/md5-cache/dev-ros/global_planner-9999
+++ b/metadata/md5-cache/dev-ros/global_planner-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/angles dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=d533489a07b679923b935774584e18d0
diff --git a/metadata/md5-cache/dev-ros/gmapping-1.3.10 b/metadata/md5-cache/dev-ros/gmapping-1.3.10
index 224a2a9b12ce..b45922e75f45 100644
--- a/metadata/md5-cache/dev-ros/gmapping-1.3.10
+++ b/metadata/md5-cache/dev-ros/gmapping-1.3.10
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp de
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/slam_gmapping/archive/1.3.10.tar.gz -> slam_gmapping-1.3.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=647914d504ce7107968266bb04b6f792
diff --git a/metadata/md5-cache/dev-ros/gmapping-9999 b/metadata/md5-cache/dev-ros/gmapping-9999
index 0f54b3b9a98c..ba7c815a26b9 100644
--- a/metadata/md5-cache/dev-ros/gmapping-9999
+++ b/metadata/md5-cache/dev-ros/gmapping-9999
@@ -8,5 +8,5 @@ LICENSE=CC-BY-NC-SA-2.5
 RDEPEND=dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/gmapping python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=647914d504ce7107968266bb04b6f792
diff --git a/metadata/md5-cache/dev-ros/hardware_interface-0.14.2 b/metadata/md5-cache/dev-ros/hardware_interface-0.14.2
index 7fc33ce95af9..7cb4d849f42a 100644
--- a/metadata/md5-cache/dev-ros/hardware_interface-0.14.2
+++ b/metadata/md5-cache/dev-ros/hardware_interface-0.14.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.14.2.tar.gz -> ros_control-0.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=15722f3540ecdb25dc7693a6c0ac5e16
diff --git a/metadata/md5-cache/dev-ros/hardware_interface-0.15.0 b/metadata/md5-cache/dev-ros/hardware_interface-0.15.0
index 508251843599..7c7137fdb1d5 100644
--- a/metadata/md5-cache/dev-ros/hardware_interface-0.15.0
+++ b/metadata/md5-cache/dev-ros/hardware_interface-0.15.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.15.0.tar.gz -> ros_control-0.15.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=15722f3540ecdb25dc7693a6c0ac5e16
diff --git a/metadata/md5-cache/dev-ros/hardware_interface-9999 b/metadata/md5-cache/dev-ros/hardware_interface-9999
index be4c6cf5d920..8f3da9638181 100644
--- a/metadata/md5-cache/dev-ros/hardware_interface-9999
+++ b/metadata/md5-cache/dev-ros/hardware_interface-9999
@@ -8,5 +8,5 @@ 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=b194a47c6b3bd77779c013f22eb23de6
diff --git a/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.3.5 b/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.3.5
index 94ba15d744e5..c82b955c3d15 100644
--- a/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.3.5
+++ b/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.3.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/geometry_msgs[ros_messages
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.5.tar.gz -> hector_slam-0.3.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5dfbc8efe0eb0115a8a44433f7bf276a
diff --git a/metadata/md5-cache/dev-ros/hector_compressed_map_transport-9999 b/metadata/md5-cache/dev-ros/hector_compressed_map_transport-9999
index 34cc1ff37af1..8e24c46c0a8f 100644
--- a/metadata/md5-cache/dev-ros/hector_compressed_map_transport-9999
+++ b/metadata/md5-cache/dev-ros/hector_compressed_map_transport-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/hector_map_tools dev-ros/image_transport dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] media-libs/opencv python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=5dfbc8efe0eb0115a8a44433f7bf276a
diff --git a/metadata/md5-cache/dev-ros/hector_geotiff-0.3.5-r2 b/metadata/md5-cache/dev-ros/hector_geotiff-0.3.5-r2
index 120a7a19a4cd..91e8b1c0da67 100644
--- a/metadata/md5-cache/dev-ros/hector_geotiff-0.3.5-r2
+++ b/metadata/md5-cache/dev-ros/hector_geotiff-0.3.5-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/hector_map_tools dev-ros/hector_nav_msgs[ros_messages_cxx(-)] de
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.5.tar.gz -> hector_slam-0.3.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b9957353c2f0ce1c0b5eaa155ef0a655
diff --git a/metadata/md5-cache/dev-ros/hector_geotiff-9999 b/metadata/md5-cache/dev-ros/hector_geotiff-9999
index 0fe47c3dfb8b..314eda8576ce 100644
--- a/metadata/md5-cache/dev-ros/hector_geotiff-9999
+++ b/metadata/md5-cache/dev-ros/hector_geotiff-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/hector_map_tools dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=b9957353c2f0ce1c0b5eaa155ef0a655
diff --git a/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.3.5-r1 b/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.3.5-r1
index 1a89905b321a..f9c27f16c7e6 100644
--- a/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.3.5-r1
+++ b/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.3.5-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/hector_geotiff dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.5.tar.gz -> hector_slam-0.3.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=53455196979b8294ab36a964ddeb049c
diff --git a/metadata/md5-cache/dev-ros/hector_geotiff_plugins-9999 b/metadata/md5-cache/dev-ros/hector_geotiff_plugins-9999
index f79f3231ba54..0d0b39c93800 100644
--- a/metadata/md5-cache/dev-ros/hector_geotiff_plugins-9999
+++ b/metadata/md5-cache/dev-ros/hector_geotiff_plugins-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/hector_geotiff dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-libs/boost:= dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=53455196979b8294ab36a964ddeb049c
diff --git a/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.3.5 b/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.3.5
index b082ac89a691..fb92196543fa 100644
--- a/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.3.5
+++ b/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.3.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-l
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.5.tar.gz -> hector_slam-0.3.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=509866be883e2dd85b9af230d1eb23b3
diff --git a/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-9999 b/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-9999
index f80f863c65f9..9650e9a57576 100644
--- a/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-9999
+++ b/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/sensor_msgs[ros_messages_cxx(-)] 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=509866be883e2dd85b9af230d1eb23b3
diff --git a/metadata/md5-cache/dev-ros/hector_imu_tools-0.3.5 b/metadata/md5-cache/dev-ros/hector_imu_tools-0.3.5
index 70a01377260f..3516b8ddafc5 100644
--- a/metadata/md5-cache/dev-ros/hector_imu_tools-0.3.5
+++ b/metadata/md5-cache/dev-ros/hector_imu_tools-0.3.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] dev
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.5.tar.gz -> hector_slam-0.3.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=40bf27beb57f680d1aafab5693acbe07
diff --git a/metadata/md5-cache/dev-ros/hector_imu_tools-9999 b/metadata/md5-cache/dev-ros/hector_imu_tools-9999
index 8047e407849f..701cdc43e1a2 100644
--- a/metadata/md5-cache/dev-ros/hector_imu_tools-9999
+++ b/metadata/md5-cache/dev-ros/hector_imu_tools-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=40bf27beb57f680d1aafab5693acbe07
diff --git a/metadata/md5-cache/dev-ros/hector_map_server-0.3.5 b/metadata/md5-cache/dev-ros/hector_map_server-0.3.5
index 04ccd20e47fa..877267134038 100644
--- a/metadata/md5-cache/dev-ros/hector_map_server-0.3.5
+++ b/metadata/md5-cache/dev-ros/hector_map_server-0.3.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing de
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.5.tar.gz -> hector_slam-0.3.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0e550b28ddd54c0dd7fa9054a64244fd
diff --git a/metadata/md5-cache/dev-ros/hector_map_server-9999 b/metadata/md5-cache/dev-ros/hector_map_server-9999
index c61efa81c1e3..64770b44fecf 100644
--- a/metadata/md5-cache/dev-ros/hector_map_server-9999
+++ b/metadata/md5-cache/dev-ros/hector_map_server-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/tf 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=0e550b28ddd54c0dd7fa9054a64244fd
diff --git a/metadata/md5-cache/dev-ros/hector_map_tools-0.3.3 b/metadata/md5-cache/dev-ros/hector_map_tools-0.3.3
index b35ebf721b36..fdb08ab07aa4 100644
--- a/metadata/md5-cache/dev-ros/hector_map_tools-0.3.3
+++ b/metadata/md5-cache/dev-ros/hector_map_tools-0.3.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/nav_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.3.tar.gz -> hector_slam-0.3.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0548b3b890fcad00c02c1d63b2ad3c20
diff --git a/metadata/md5-cache/dev-ros/hector_map_tools-0.3.4 b/metadata/md5-cache/dev-ros/hector_map_tools-0.3.4
index 0333c2d2fb2d..5eeb47de166b 100644
--- a/metadata/md5-cache/dev-ros/hector_map_tools-0.3.4
+++ b/metadata/md5-cache/dev-ros/hector_map_tools-0.3.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/nav_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.4.tar.gz -> hector_slam-0.3.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0548b3b890fcad00c02c1d63b2ad3c20
diff --git a/metadata/md5-cache/dev-ros/hector_map_tools-0.3.5 b/metadata/md5-cache/dev-ros/hector_map_tools-0.3.5
index 7a14f83b1b93..1cc9fe499910 100644
--- a/metadata/md5-cache/dev-ros/hector_map_tools-0.3.5
+++ b/metadata/md5-cache/dev-ros/hector_map_tools-0.3.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/nav_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.5.tar.gz -> hector_slam-0.3.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3913e7e26aa0144ae28b16fed323aa1c
diff --git a/metadata/md5-cache/dev-ros/hector_map_tools-9999 b/metadata/md5-cache/dev-ros/hector_map_tools-9999
index 3f00adbc729f..41003322fdac 100644
--- a/metadata/md5-cache/dev-ros/hector_map_tools-9999
+++ b/metadata/md5-cache/dev-ros/hector_map_tools-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/nav_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=0548b3b890fcad00c02c1d63b2ad3c20
diff --git a/metadata/md5-cache/dev-ros/hector_mapping-0.3.5 b/metadata/md5-cache/dev-ros/hector_mapping-0.3.5
index 8e03ea9bb8d0..9e69b0c293d0 100644
--- a/metadata/md5-cache/dev-ros/hector_mapping-0.3.5
+++ b/metadata/md5-cache/dev-ros/hector_mapping-0.3.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/message_filters dev-ros/laser_geometry
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.5.tar.gz -> hector_slam-0.3.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7a0f9a3e02cd488d49eb0535d4421248
diff --git a/metadata/md5-cache/dev-ros/hector_mapping-9999 b/metadata/md5-cache/dev-ros/hector_mapping-9999
index a347743d043c..b9748c3539b5 100644
--- a/metadata/md5-cache/dev-ros/hector_mapping-9999
+++ b/metadata/md5-cache/dev-ros/hector_mapping-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/message_filters dev-ros/laser_geometry dev-ros/tf_conversions dev-libs/boost:=[threads] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/visualization_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/visualization_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=7a0f9a3e02cd488d49eb0535d4421248
diff --git a/metadata/md5-cache/dev-ros/hector_marker_drawing-0.3.3 b/metadata/md5-cache/dev-ros/hector_marker_drawing-0.3.3
index 10baba4d5f44..13f2e480e57e 100644
--- a/metadata/md5-cache/dev-ros/hector_marker_drawing-0.3.3
+++ b/metadata/md5-cache/dev-ros/hector_marker_drawing-0.3.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] python_ta
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.3.tar.gz -> hector_slam-0.3.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=47dc27e112b5beec730ef4b8cacd518d
diff --git a/metadata/md5-cache/dev-ros/hector_marker_drawing-0.3.4 b/metadata/md5-cache/dev-ros/hector_marker_drawing-0.3.4
index 52bb2c7e9844..9c7379751276 100644
--- a/metadata/md5-cache/dev-ros/hector_marker_drawing-0.3.4
+++ b/metadata/md5-cache/dev-ros/hector_marker_drawing-0.3.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] python_ta
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.4.tar.gz -> hector_slam-0.3.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=47dc27e112b5beec730ef4b8cacd518d
diff --git a/metadata/md5-cache/dev-ros/hector_marker_drawing-0.3.5 b/metadata/md5-cache/dev-ros/hector_marker_drawing-0.3.5
index 6d143ffca69b..75cef2a3af15 100644
--- a/metadata/md5-cache/dev-ros/hector_marker_drawing-0.3.5
+++ b/metadata/md5-cache/dev-ros/hector_marker_drawing-0.3.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] python_ta
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.5.tar.gz -> hector_slam-0.3.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=299abd7ce44f85e9a0618756eb0c94be
diff --git a/metadata/md5-cache/dev-ros/hector_marker_drawing-9999 b/metadata/md5-cache/dev-ros/hector_marker_drawing-9999
index e872d0d4efbd..02e42876385b 100644
--- a/metadata/md5-cache/dev-ros/hector_marker_drawing-9999
+++ b/metadata/md5-cache/dev-ros/hector_marker_drawing-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=47dc27e112b5beec730ef4b8cacd518d
diff --git a/metadata/md5-cache/dev-ros/hector_nav_msgs-0.3.5 b/metadata/md5-cache/dev-ros/hector_nav_msgs-0.3.5
index 9265835ee132..bb2cf712a78c 100644
--- a/metadata/md5-cache/dev-ros/hector_nav_msgs-0.3.5
+++ b/metadata/md5-cache/dev-ros/hector_nav_msgs-0.3.5
@@ -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/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.5.tar.gz -> hector_slam-0.3.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3e999cc0f655c968d53e4efa12d3894a
diff --git a/metadata/md5-cache/dev-ros/hector_nav_msgs-9999 b/metadata/md5-cache/dev-ros/hector_nav_msgs-9999
index 60412d689464..a3a65b5e867d 100644
--- a/metadata/md5-cache/dev-ros/hector_nav_msgs-9999
+++ b/metadata/md5-cache/dev-ros/hector_nav_msgs-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=3e999cc0f655c968d53e4efa12d3894a
diff --git a/metadata/md5-cache/dev-ros/hector_pose_estimation-0.3.0-r1 b/metadata/md5-cache/dev-ros/hector_pose_estimation-0.3.0-r1
index bcc5dbb85bef..54659cfc0cea 100644
--- a/metadata/md5-cache/dev-ros/hector_pose_estimation-0.3.0-r1
+++ b/metadata/md5-cache/dev-ros/hector_pose_estimation-0.3.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/hector_pose_estimation_core dev-ros/nodelet dev-ros/sensor_msgs[
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_localization/archive/0.3.0.tar.gz -> hector_localization-0.3.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ace561c6b7380d035e0f000aefb119fe
diff --git a/metadata/md5-cache/dev-ros/hector_pose_estimation-9999 b/metadata/md5-cache/dev-ros/hector_pose_estimation-9999
index c3e921c434e3..ce868dfe0f85 100644
--- a/metadata/md5-cache/dev-ros/hector_pose_estimation-9999
+++ b/metadata/md5-cache/dev-ros/hector_pose_estimation-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/hector_pose_estimation_core dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/message_filters dev-libs/boost:= dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=ace561c6b7380d035e0f000aefb119fe
diff --git a/metadata/md5-cache/dev-ros/hector_pose_estimation_core-0.3.0-r1 b/metadata/md5-cache/dev-ros/hector_pose_estimation_core-0.3.0-r1
index a6f06fc523f0..f00dc045c0b1 100644
--- a/metadata/md5-cache/dev-ros/hector_pose_estimation_core-0.3.0-r1
+++ b/metadata/md5-cache/dev-ros/hector_pose_estimation_core-0.3.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rostime dev-ros/rosconsole dev-ros/roscpp dev-ros/sensor_msgs[ro
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_localization/archive/0.3.0.tar.gz -> hector_localization-0.3.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cf4c3ca7f6525cc1409ae8a248dc3cf8
diff --git a/metadata/md5-cache/dev-ros/hector_pose_estimation_core-9999 b/metadata/md5-cache/dev-ros/hector_pose_estimation_core-9999
index 9221d0d3ae52..1f8c361681a8 100644
--- a/metadata/md5-cache/dev-ros/hector_pose_estimation_core-9999
+++ b/metadata/md5-cache/dev-ros/hector_pose_estimation_core-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rostime dev-ros/rosconsole dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-ros/tf 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=9e2d76fbe730115c8dfedbdab7dc5e6d
diff --git a/metadata/md5-cache/dev-ros/hector_slam_launch-0.3.3 b/metadata/md5-cache/dev-ros/hector_slam_launch-0.3.3
index 8115ed51616d..e3aa514bb8f2 100644
--- a/metadata/md5-cache/dev-ros/hector_slam_launch-0.3.3
+++ b/metadata/md5-cache/dev-ros/hector_slam_launch-0.3.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/hector_mapping dev-ros/hector_map_server dev-ros/hector_trajecto
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.3.tar.gz -> hector_slam-0.3.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=abfa6eb13695e61a9d7362280d7cc7ee
diff --git a/metadata/md5-cache/dev-ros/hector_slam_launch-0.3.4 b/metadata/md5-cache/dev-ros/hector_slam_launch-0.3.4
index f3a86998fa1b..7af575dfa78b 100644
--- a/metadata/md5-cache/dev-ros/hector_slam_launch-0.3.4
+++ b/metadata/md5-cache/dev-ros/hector_slam_launch-0.3.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/hector_mapping dev-ros/hector_map_server dev-ros/hector_trajecto
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.4.tar.gz -> hector_slam-0.3.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=abfa6eb13695e61a9d7362280d7cc7ee
diff --git a/metadata/md5-cache/dev-ros/hector_slam_launch-0.3.5 b/metadata/md5-cache/dev-ros/hector_slam_launch-0.3.5
index aa70a60791a8..e52a67b08b8b 100644
--- a/metadata/md5-cache/dev-ros/hector_slam_launch-0.3.5
+++ b/metadata/md5-cache/dev-ros/hector_slam_launch-0.3.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/hector_mapping dev-ros/hector_map_server dev-ros/hector_trajecto
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.5.tar.gz -> hector_slam-0.3.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=dfc699664464c100022f5208d4cb8887
diff --git a/metadata/md5-cache/dev-ros/hector_slam_launch-9999 b/metadata/md5-cache/dev-ros/hector_slam_launch-9999
index c8ab6b8b96b3..ca5496236436 100644
--- a/metadata/md5-cache/dev-ros/hector_slam_launch-9999
+++ b/metadata/md5-cache/dev-ros/hector_slam_launch-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/hector_mapping dev-ros/hector_map_server dev-ros/hector_trajectory_server dev-ros/hector_geotiff dev-ros/hector_geotiff_plugins python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=abfa6eb13695e61a9d7362280d7cc7ee
diff --git a/metadata/md5-cache/dev-ros/hector_trajectory_server-0.3.5 b/metadata/md5-cache/dev-ros/hector_trajectory_server-0.3.5
index 5966e6ed7800..ec1b980e871e 100644
--- a/metadata/md5-cache/dev-ros/hector_trajectory_server-0.3.5
+++ b/metadata/md5-cache/dev-ros/hector_trajectory_server-0.3.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.5.tar.gz -> hector_slam-0.3.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=56da7ace2a3b9b19716d8d0a6e782dcf
diff --git a/metadata/md5-cache/dev-ros/hector_trajectory_server-9999 b/metadata/md5-cache/dev-ros/hector_trajectory_server-9999
index 3ab06a58533f..5ae04de32e8f 100644
--- a/metadata/md5-cache/dev-ros/hector_trajectory_server-9999
+++ b/metadata/md5-cache/dev-ros/hector_trajectory_server-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/hector_map_tools dev-ros/tf 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=56da7ace2a3b9b19716d8d0a6e782dcf
diff --git a/metadata/md5-cache/dev-ros/image_cb_detector-0.10.14-r1 b/metadata/md5-cache/dev-ros/image_cb_detector-0.10.14-r1
index 036e96c99380..62a9ba961038 100644
--- a/metadata/md5-cache/dev-ros/image_cb_detector-0.10.14-r1
+++ b/metadata/md5-cache/dev-ros/image_cb_detector-0.10.14-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f8dfb2541d078e116209bd80b52b9622
diff --git a/metadata/md5-cache/dev-ros/image_cb_detector-9999 b/metadata/md5-cache/dev-ros/image_cb_detector-9999
index 198ca50b3348..d3c5da114744 100644
--- a/metadata/md5-cache/dev-ros/image_cb_detector-9999
+++ b/metadata/md5-cache/dev-ros/image_cb_detector-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/opencv:= dev-ros/image_transport dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/calibration_msgs[ros_messages_cxx(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=f8dfb2541d078e116209bd80b52b9622
diff --git a/metadata/md5-cache/dev-ros/image_geometry-1.12.3 b/metadata/md5-cache/dev-ros/image_geometry-1.12.3
index dee388dd9315..73e0adf02911 100644
--- a/metadata/md5-cache/dev-ros/image_geometry-1.12.3
+++ b/metadata/md5-cache/dev-ros/image_geometry-1.12.3
@@ -10,5 +10,5 @@ RDEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.3.tar.gz -> vision_opencv-1.12.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fc83140012a59caead68f4587fd3115e
diff --git a/metadata/md5-cache/dev-ros/image_geometry-1.12.4 b/metadata/md5-cache/dev-ros/image_geometry-1.12.4
index 9b7d08cb9ae5..5350b4f1a5ab 100644
--- a/metadata/md5-cache/dev-ros/image_geometry-1.12.4
+++ b/metadata/md5-cache/dev-ros/image_geometry-1.12.4
@@ -10,5 +10,5 @@ RDEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.4.tar.gz -> vision_opencv-1.12.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=32ad81c28aea58f03913c05fb0ee5196
diff --git a/metadata/md5-cache/dev-ros/image_geometry-1.12.5 b/metadata/md5-cache/dev-ros/image_geometry-1.12.5
index c0775b723ec3..8705e4fd86f0 100644
--- a/metadata/md5-cache/dev-ros/image_geometry-1.12.5
+++ b/metadata/md5-cache/dev-ros/image_geometry-1.12.5
@@ -10,5 +10,5 @@ RDEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.5.tar.gz -> vision_opencv-1.12.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=32ad81c28aea58f03913c05fb0ee5196
diff --git a/metadata/md5-cache/dev-ros/image_geometry-1.12.7 b/metadata/md5-cache/dev-ros/image_geometry-1.12.7
index 7e306c096dfa..27e0cc4ed605 100644
--- a/metadata/md5-cache/dev-ros/image_geometry-1.12.7
+++ b/metadata/md5-cache/dev-ros/image_geometry-1.12.7
@@ -10,5 +10,5 @@ RDEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.7.tar.gz -> vision_opencv-1.12.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=32ad81c28aea58f03913c05fb0ee5196
diff --git a/metadata/md5-cache/dev-ros/image_geometry-1.12.8 b/metadata/md5-cache/dev-ros/image_geometry-1.12.8
index bb51df4e7723..62bb41e7b5dc 100644
--- a/metadata/md5-cache/dev-ros/image_geometry-1.12.8
+++ b/metadata/md5-cache/dev-ros/image_geometry-1.12.8
@@ -10,5 +10,5 @@ RDEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.8.tar.gz -> vision_opencv-1.12.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7991fd1548460162cf41781baaeed864
diff --git a/metadata/md5-cache/dev-ros/image_geometry-1.13.0 b/metadata/md5-cache/dev-ros/image_geometry-1.13.0
index d1ae00d13736..0396f6b79985 100644
--- a/metadata/md5-cache/dev-ros/image_geometry-1.13.0
+++ b/metadata/md5-cache/dev-ros/image_geometry-1.13.0
@@ -10,5 +10,5 @@ RDEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.13.0.tar.gz -> vision_opencv-1.13.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7991fd1548460162cf41781baaeed864
diff --git a/metadata/md5-cache/dev-ros/image_geometry-9999 b/metadata/md5-cache/dev-ros/image_geometry-9999
index ca4246168d80..f0a31b41acfb 100644
--- a/metadata/md5-cache/dev-ros/image_geometry-9999
+++ b/metadata/md5-cache/dev-ros/image_geometry-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=ed1e39837bce85205fa7982a82d4b307
diff --git a/metadata/md5-cache/dev-ros/image_proc-1.12.22-r1 b/metadata/md5-cache/dev-ros/image_proc-1.12.22-r1
index 37bee5d2a5da..ea5305888fbf 100644
--- a/metadata/md5-cache/dev-ros/image_proc-1.12.22-r1
+++ b/metadata/md5-cache/dev-ros/image_proc-1.12.22-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.22.tar.gz -> image_pipeline-1.12.22.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=70a0611e941421357a31a372e12efe3f
diff --git a/metadata/md5-cache/dev-ros/image_proc-1.12.23 b/metadata/md5-cache/dev-ros/image_proc-1.12.23
index 943fa24ecfa3..f6f63a237123 100644
--- a/metadata/md5-cache/dev-ros/image_proc-1.12.23
+++ b/metadata/md5-cache/dev-ros/image_proc-1.12.23
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.23.tar.gz -> image_pipeline-1.12.23.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d98c3b12a4f2781421e857351bdd04e7
diff --git a/metadata/md5-cache/dev-ros/image_proc-9999 b/metadata/md5-cache/dev-ros/image_proc-9999
index d23759691f3d..78b33d00c9c1 100644
--- a/metadata/md5-cache/dev-ros/image_proc-9999
+++ b/metadata/md5-cache/dev-ros/image_proc-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] media-libs/opencv:= dev-libs/boost:=[threads] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=70a0611e941421357a31a372e12efe3f
diff --git a/metadata/md5-cache/dev-ros/image_publisher-1.12.22-r1 b/metadata/md5-cache/dev-ros/image_publisher-1.12.22-r1
index 8e1029243476..395dcc0a99c5 100644
--- a/metadata/md5-cache/dev-ros/image_publisher-1.12.22-r1
+++ b/metadata/md5-cache/dev-ros/image_publisher-1.12.22-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ro
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.22.tar.gz -> image_pipeline-1.12.22.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1e93b43137a78d56452f6b9310bc03ef
diff --git a/metadata/md5-cache/dev-ros/image_publisher-1.12.23 b/metadata/md5-cache/dev-ros/image_publisher-1.12.23
index d06a020ca09c..37dc7cc6be8e 100644
--- a/metadata/md5-cache/dev-ros/image_publisher-1.12.23
+++ b/metadata/md5-cache/dev-ros/image_publisher-1.12.23
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ro
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.23.tar.gz -> image_pipeline-1.12.23.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ad309501a51068faeefc9dd137eeab7b
diff --git a/metadata/md5-cache/dev-ros/image_publisher-9999 b/metadata/md5-cache/dev-ros/image_publisher-9999
index 9bde47d396c5..55e7e6f95ffc 100644
--- a/metadata/md5-cache/dev-ros/image_publisher-9999
+++ b/metadata/md5-cache/dev-ros/image_publisher-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/camera_info_manager dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=1e93b43137a78d56452f6b9310bc03ef
diff --git a/metadata/md5-cache/dev-ros/image_rotate-1.12.22-r1 b/metadata/md5-cache/dev-ros/image_rotate-1.12.22-r1
index 522fd95f18d0..0ae0e4277d41 100644
--- a/metadata/md5-cache/dev-ros/image_rotate-1.12.22-r1
+++ b/metadata/md5-cache/dev-ros/image_rotate-1.12.22-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ro
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.22.tar.gz -> image_pipeline-1.12.22.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=450062649dcff826fcdb561a7f969e50
diff --git a/metadata/md5-cache/dev-ros/image_rotate-1.12.23 b/metadata/md5-cache/dev-ros/image_rotate-1.12.23
index 8a7b38122382..c068f70c6ceb 100644
--- a/metadata/md5-cache/dev-ros/image_rotate-1.12.23
+++ b/metadata/md5-cache/dev-ros/image_rotate-1.12.23
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ro
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.23.tar.gz -> image_pipeline-1.12.23.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a114aafa452dc995edb69ff62c0a6395
diff --git a/metadata/md5-cache/dev-ros/image_rotate-9999 b/metadata/md5-cache/dev-ros/image_rotate-9999
index dc2ed22e0973..8b785e5ab99c 100644
--- a/metadata/md5-cache/dev-ros/image_rotate-9999
+++ b/metadata/md5-cache/dev-ros/image_rotate-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/eigen_conversions dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=450062649dcff826fcdb561a7f969e50
diff --git a/metadata/md5-cache/dev-ros/image_transport-1.11.13-r2 b/metadata/md5-cache/dev-ros/image_transport-1.11.13-r2
index 9eea63f96453..65561aba3e3c 100644
--- a/metadata/md5-cache/dev-ros/image_transport-1.11.13-r2
+++ b/metadata/md5-cache/dev-ros/image_transport-1.11.13-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/message_filters dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/ro
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.13.tar.gz -> image_common-1.11.13.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c65070a00dc45efc3e05e6e3135146e8
diff --git a/metadata/md5-cache/dev-ros/image_transport-9999 b/metadata/md5-cache/dev-ros/image_transport-9999
index 076e40b73176..cd6e4acf4f41 100644
--- a/metadata/md5-cache/dev-ros/image_transport-9999
+++ b/metadata/md5-cache/dev-ros/image_transport-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/message_filters dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= dev-libs/console_bridge:= dev-ros/class_loader:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=c65070a00dc45efc3e05e6e3135146e8
diff --git a/metadata/md5-cache/dev-ros/image_view-1.12.22-r1 b/metadata/md5-cache/dev-ros/image_view-1.12.22-r1
index 3a303af77805..9775cfcb6b01 100644
--- a/metadata/md5-cache/dev-ros/image_view-1.12.22-r1
+++ b/metadata/md5-cache/dev-ros/image_view-1.12.22-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:2 dev-ros/ca
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.22.tar.gz -> image_pipeline-1.12.22.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8d921cfda9d83b7975bac159de7bc7ac
diff --git a/metadata/md5-cache/dev-ros/image_view-1.12.23 b/metadata/md5-cache/dev-ros/image_view-1.12.23
index 19708c1a7a18..7e09a49bcdfe 100644
--- a/metadata/md5-cache/dev-ros/image_view-1.12.23
+++ b/metadata/md5-cache/dev-ros/image_view-1.12.23
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:2 dev-ros/ca
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.23.tar.gz -> image_pipeline-1.12.23.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6223da615e6092d612f95ecee7618495
diff --git a/metadata/md5-cache/dev-ros/image_view-9999 b/metadata/md5-cache/dev-ros/image_view-9999
index 6bc6bd979095..90ea0d714f18 100644
--- a/metadata/md5-cache/dev-ros/image_view-9999
+++ b/metadata/md5-cache/dev-ros/image_view-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:2 dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=8d921cfda9d83b7975bac159de7bc7ac
diff --git a/metadata/md5-cache/dev-ros/imu_complementary_filter-1.1.5 b/metadata/md5-cache/dev-ros/imu_complementary_filter-1.1.5
index 85c68435dc4a..6645f1a49013 100644
--- a/metadata/md5-cache/dev-ros/imu_complementary_filter-1.1.5
+++ b/metadata/md5-cache/dev-ros/imu_complementary_filter-1.1.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ccny-ros-pkg/imu_tools/archive/1.1.5.tar.gz -> imu_tools-1.1.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=20426eb31a2885fcbafd634ce92dc4a9
diff --git a/metadata/md5-cache/dev-ros/imu_complementary_filter-1.2.0 b/metadata/md5-cache/dev-ros/imu_complementary_filter-1.2.0
index 386df3b3c870..bdeca98ec253 100644
--- a/metadata/md5-cache/dev-ros/imu_complementary_filter-1.2.0
+++ b/metadata/md5-cache/dev-ros/imu_complementary_filter-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ccny-ros-pkg/imu_tools/archive/1.2.0.tar.gz -> imu_tools-1.2.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=133a2c72bb71dddb0ec74036f5e36c1f
diff --git a/metadata/md5-cache/dev-ros/imu_complementary_filter-9999 b/metadata/md5-cache/dev-ros/imu_complementary_filter-9999
index e13cd345486c..1da6b24cb200 100644
--- a/metadata/md5-cache/dev-ros/imu_complementary_filter-9999
+++ b/metadata/md5-cache/dev-ros/imu_complementary_filter-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=20426eb31a2885fcbafd634ce92dc4a9
diff --git a/metadata/md5-cache/dev-ros/imu_filter_madgwick-1.1.5-r1 b/metadata/md5-cache/dev-ros/imu_filter_madgwick-1.1.5-r1
index 3f376e26c9bd..718b401726c4 100644
--- a/metadata/md5-cache/dev-ros/imu_filter_madgwick-1.1.5-r1
+++ b/metadata/md5-cache/dev-ros/imu_filter_madgwick-1.1.5-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ccny-ros-pkg/imu_tools/archive/1.1.5.tar.gz -> imu_tools-1.1.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=14016f550bf42136b3999825c0c3f490
diff --git a/metadata/md5-cache/dev-ros/imu_filter_madgwick-1.2.0 b/metadata/md5-cache/dev-ros/imu_filter_madgwick-1.2.0
index fab13adca4cd..9c75b9c95f24 100644
--- a/metadata/md5-cache/dev-ros/imu_filter_madgwick-1.2.0
+++ b/metadata/md5-cache/dev-ros/imu_filter_madgwick-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ccny-ros-pkg/imu_tools/archive/1.2.0.tar.gz -> imu_tools-1.2.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=09803f948c48b24a4f035d5cb62f20cf
diff --git a/metadata/md5-cache/dev-ros/imu_filter_madgwick-9999 b/metadata/md5-cache/dev-ros/imu_filter_madgwick-9999
index 0d766e156322..fe57eadde8db 100644
--- a/metadata/md5-cache/dev-ros/imu_filter_madgwick-9999
+++ b/metadata/md5-cache/dev-ros/imu_filter_madgwick-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/nodelet dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/message_filters dev-ros/dynamic_reconfigure dev-libs/boost:=[threads] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=4df63faa124579d8f3cd9c23fd68c977
diff --git a/metadata/md5-cache/dev-ros/imu_processors-0.2.1 b/metadata/md5-cache/dev-ros/imu_processors-0.2.1
index 095004d85fb1..6dea787dd653 100644
--- a/metadata/md5-cache/dev-ros/imu_processors-0.2.1
+++ b/metadata/md5-cache/dev-ros/imu_processors-0.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-r
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/imu_pipeline/archive/0.2.1.tar.gz -> imu_pipeline-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2b597517a8703530de343f8cc54e0a35
diff --git a/metadata/md5-cache/dev-ros/imu_processors-0.2.2 b/metadata/md5-cache/dev-ros/imu_processors-0.2.2
index 29c0fc6c6437..4a6553900dc5 100644
--- a/metadata/md5-cache/dev-ros/imu_processors-0.2.2
+++ b/metadata/md5-cache/dev-ros/imu_processors-0.2.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-r
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/imu_pipeline/archive/0.2.2.tar.gz -> imu_pipeline-0.2.2.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cff65153ecaf5a83d8e00734197da57b
diff --git a/metadata/md5-cache/dev-ros/imu_processors-9999 b/metadata/md5-cache/dev-ros/imu_processors-9999
index 025b5559a4ab..cdd1f05992e1 100644
--- a/metadata/md5-cache/dev-ros/imu_processors-9999
+++ b/metadata/md5-cache/dev-ros/imu_processors-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=2b597517a8703530de343f8cc54e0a35
diff --git a/metadata/md5-cache/dev-ros/imu_transformer-0.2.2-r1 b/metadata/md5-cache/dev-ros/imu_transformer-0.2.2-r1
index a3331edb2ba8..017ec49cdc35 100644
--- a/metadata/md5-cache/dev-ros/imu_transformer-0.2.2-r1
+++ b/metadata/md5-cache/dev-ros/imu_transformer-0.2.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-libs/console_bridge:= dev-ro
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/imu_pipeline/archive/0.2.2.tar.gz -> imu_pipeline-0.2.2.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fb1cde35e9cde01860c566856883c2af
diff --git a/metadata/md5-cache/dev-ros/imu_transformer-9999 b/metadata/md5-cache/dev-ros/imu_transformer-9999
index 5fd5d3fbe221..a17691e60a57 100644
--- a/metadata/md5-cache/dev-ros/imu_transformer-9999
+++ b/metadata/md5-cache/dev-ros/imu_transformer-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslaunch dev-ros/tf2 dev-ros/tf2_ros dev-ros/topic_tools dev-ros/tf2_sensor_msgs dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=95d7d99252854df8a0930ca709a62587
diff --git a/metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.10.1 b/metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.10.1
index 8899108e0554..f352dd716d95 100644
--- a/metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.10.1
+++ b/metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.10.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ro
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.10.1.tar.gz -> visualization_tutorials-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=91eb3fead59390955ea837629cf105e7
diff --git a/metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.10.2 b/metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.10.2
index c027745b551d..b78a9f82dc5f 100644
--- a/metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.10.2
+++ b/metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.10.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ro
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.10.2.tar.gz -> visualization_tutorials-0.10.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=27cbba0feb39dede9b76c320f9605c26
diff --git a/metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.10.3 b/metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.10.3
index 91da774bc607..742eb4dc099c 100644
--- a/metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.10.3
+++ b/metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.10.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ro
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.10.3.tar.gz -> visualization_tutorials-0.10.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=27cbba0feb39dede9b76c320f9605c26
diff --git a/metadata/md5-cache/dev-ros/interactive_marker_tutorials-9999 b/metadata/md5-cache/dev-ros/interactive_marker_tutorials-9999
index 3b7b8fdd531b..129e59d1b7bb 100644
--- a/metadata/md5-cache/dev-ros/interactive_marker_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/interactive_marker_tutorials-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=91eb3fead59390955ea837629cf105e7
diff --git a/metadata/md5-cache/dev-ros/interactive_markers-1.11.3 b/metadata/md5-cache/dev-ros/interactive_markers-1.11.3
index 40511c1f0e17..35020b4c62b0 100644
--- a/metadata/md5-cache/dev-ros/interactive_markers-1.11.3
+++ b/metadata/md5-cache/dev-ros/interactive_markers-1.11.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/std_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/interactive_markers/archive/1.11.3.tar.gz -> interactive_markers-1.11.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=86c6e9c60a7ecec4d6ecb85d112373d9
diff --git a/metadata/md5-cache/dev-ros/interactive_markers-1.11.4 b/metadata/md5-cache/dev-ros/interactive_markers-1.11.4
index bc94a80287e5..8dd86fb0667e 100644
--- a/metadata/md5-cache/dev-ros/interactive_markers-1.11.4
+++ b/metadata/md5-cache/dev-ros/interactive_markers-1.11.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/std_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/interactive_markers/archive/1.11.4.tar.gz -> interactive_markers-1.11.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=acf43c5b99445bdd0dae756489d2a48e
diff --git a/metadata/md5-cache/dev-ros/interactive_markers-9999 b/metadata/md5-cache/dev-ros/interactive_markers-9999
index 288bb7d5c4c9..bf9535647796 100644
--- a/metadata/md5-cache/dev-ros/interactive_markers-9999
+++ b/metadata/md5-cache/dev-ros/interactive_markers-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/std_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/rosconsole dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=86c6e9c60a7ecec4d6ecb85d112373d9
diff --git a/metadata/md5-cache/dev-ros/interval_intersection-0.10.14 b/metadata/md5-cache/dev-ros/interval_intersection-0.10.14
index 0ce02d4650ca..4105ed19e4e3 100644
--- a/metadata/md5-cache/dev-ros/interval_intersection-0.10.14
+++ b/metadata/md5-cache/dev-ros/interval_intersection-0.10.14
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/calibration_msgs[ros
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f7198562aa05bbf83057bfb44abb80bc
diff --git a/metadata/md5-cache/dev-ros/interval_intersection-9999 b/metadata/md5-cache/dev-ros/interval_intersection-9999
index fe8a5263371d..016cf46aed75 100644
--- a/metadata/md5-cache/dev-ros/interval_intersection-9999
+++ b/metadata/md5-cache/dev-ros/interval_intersection-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/calibration_msgs[ros_messages_cxx(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/rostime python_targets_python2_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/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=89d978e36bbfaf2edaade670c886601b
diff --git a/metadata/md5-cache/dev-ros/ivcon-0.1.5 b/metadata/md5-cache/dev-ros/ivcon-0.1.5
index 2799c5906533..f6f867c2990e 100644
--- a/metadata/md5-cache/dev-ros/ivcon-0.1.5
+++ b/metadata/md5-cache/dev-ros/ivcon-0.1.5
@@ -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/ros/ivcon/archive/0.1.5.tar.gz -> ivcon-0.1.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9c3f77d3c31dd4495f6b33c0e6fe2d80
diff --git a/metadata/md5-cache/dev-ros/ivcon-0.1.6 b/metadata/md5-cache/dev-ros/ivcon-0.1.6
index 4637fedd464c..cffeb1147f18 100644
--- a/metadata/md5-cache/dev-ros/ivcon-0.1.6
+++ b/metadata/md5-cache/dev-ros/ivcon-0.1.6
@@ -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/ros/ivcon/archive/0.1.6.tar.gz -> ivcon-0.1.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9c3f77d3c31dd4495f6b33c0e6fe2d80
diff --git a/metadata/md5-cache/dev-ros/ivcon-9999 b/metadata/md5-cache/dev-ros/ivcon-9999
index d2724bdc7632..6459c51b1177 100644
--- a/metadata/md5-cache/dev-ros/ivcon-9999
+++ b/metadata/md5-cache/dev-ros/ivcon-9999
@@ -8,5 +8,5 @@ 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 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=9c3f77d3c31dd4495f6b33c0e6fe2d80
diff --git a/metadata/md5-cache/dev-ros/joint_limits_interface-0.14.2 b/metadata/md5-cache/dev-ros/joint_limits_interface-0.14.2
index cd9132bc9e80..e4e843eb685e 100644
--- a/metadata/md5-cache/dev-ros/joint_limits_interface-0.14.2
+++ b/metadata/md5-cache/dev-ros/joint_limits_interface-0.14.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.14.2.tar.gz -> ros_control-0.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=fe8aed8c1e38860e9ad14e9f48a4ed33
diff --git a/metadata/md5-cache/dev-ros/joint_limits_interface-0.15.0 b/metadata/md5-cache/dev-ros/joint_limits_interface-0.15.0
index 57c543a3ba34..6aad7cbcfa04 100644
--- a/metadata/md5-cache/dev-ros/joint_limits_interface-0.15.0
+++ b/metadata/md5-cache/dev-ros/joint_limits_interface-0.15.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.15.0.tar.gz -> ros_control-0.15.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fe8aed8c1e38860e9ad14e9f48a4ed33
diff --git a/metadata/md5-cache/dev-ros/joint_limits_interface-9999 b/metadata/md5-cache/dev-ros/joint_limits_interface-9999
index 4b161d7e9297..999d0a5d3212 100644
--- a/metadata/md5-cache/dev-ros/joint_limits_interface-9999
+++ b/metadata/md5-cache/dev-ros/joint_limits_interface-9999
@@ -8,5 +8,5 @@ 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=cff2960576e9a0147fb79875573714bb
diff --git a/metadata/md5-cache/dev-ros/joint_state_publisher-1.12.11 b/metadata/md5-cache/dev-ros/joint_state_publisher-1.12.11
index 0da1d220885f..f75ce55c7d36 100644
--- a/metadata/md5-cache/dev-ros/joint_state_publisher-1.12.11
+++ b/metadata/md5-cache/dev-ros/joint_state_publisher-1.12.11
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/robot_model/archive/1.12.11.tar.gz -> robot_model-1.12.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fe154dbcbc034df44bbb85d385aa20d7
diff --git a/metadata/md5-cache/dev-ros/joint_state_publisher-1.12.13 b/metadata/md5-cache/dev-ros/joint_state_publisher-1.12.13
index 5322cdc2badb..39c33847ac10 100644
--- a/metadata/md5-cache/dev-ros/joint_state_publisher-1.12.13
+++ b/metadata/md5-cache/dev-ros/joint_state_publisher-1.12.13
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/joint_state_publisher/archive/1.12.13.tar.gz -> joint_state_publisher-1.12.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c4d6824c7a0200411fc9fc08d4560216
diff --git a/metadata/md5-cache/dev-ros/joint_state_publisher-9999 b/metadata/md5-cache/dev-ros/joint_state_publisher-9999
index 6ccd01a831de..47a8783dd91c 100644
--- a/metadata/md5-cache/dev-ros/joint_state_publisher-9999
+++ b/metadata/md5-cache/dev-ros/joint_state_publisher-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=c4d6824c7a0200411fc9fc08d4560216
diff --git a/metadata/md5-cache/dev-ros/joint_states_settler-0.10.14 b/metadata/md5-cache/dev-ros/joint_states_settler-0.10.14
index 44a86e1db7df..8634ba5b3a62 100644
--- a/metadata/md5-cache/dev-ros/joint_states_settler-0.10.14
+++ b/metadata/md5-cache/dev-ros/joint_states_settler-0.10.14
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/rosconsole dev-ros/r
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=667e8e6a1e49462bec5cd455132e53b6
diff --git a/metadata/md5-cache/dev-ros/joint_states_settler-9999 b/metadata/md5-cache/dev-ros/joint_states_settler-9999
index d3a01a5c58d5..a32f7c2d7f37 100644
--- a/metadata/md5-cache/dev-ros/joint_states_settler-9999
+++ b/metadata/md5-cache/dev-ros/joint_states_settler-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/settlerlib dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/actionlib_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=667e8e6a1e49462bec5cd455132e53b6
diff --git a/metadata/md5-cache/dev-ros/kdl_conversions-1.11.9-r1 b/metadata/md5-cache/dev-ros/kdl_conversions-1.11.9-r1
index 42204f979e1d..d0a88a216241 100644
--- a/metadata/md5-cache/dev-ros/kdl_conversions-1.11.9-r1
+++ b/metadata/md5-cache/dev-ros/kdl_conversions-1.11.9-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-)] sci-libs/orocos_kdl:= python_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry/archive/1.11.9.tar.gz -> geometry-1.11.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b7a8671825d649c3cac918c609875a81
diff --git a/metadata/md5-cache/dev-ros/kdl_conversions-1.12.0 b/metadata/md5-cache/dev-ros/kdl_conversions-1.12.0
index b90218ff279d..4f16e42aad19 100644
--- a/metadata/md5-cache/dev-ros/kdl_conversions-1.12.0
+++ b/metadata/md5-cache/dev-ros/kdl_conversions-1.12.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-)] sci-libs/orocos_kdl:= python_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry/archive/1.12.0.tar.gz -> geometry-1.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b7a8671825d649c3cac918c609875a81
diff --git a/metadata/md5-cache/dev-ros/kdl_conversions-9999 b/metadata/md5-cache/dev-ros/kdl_conversions-9999
index 7cb7b64f89dd..472561073e72 100644
--- a/metadata/md5-cache/dev-ros/kdl_conversions-9999
+++ b/metadata/md5-cache/dev-ros/kdl_conversions-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-)] sci-libs/orocos_kdl:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=b7a8671825d649c3cac918c609875a81
diff --git a/metadata/md5-cache/dev-ros/kdl_parser-1.12.10 b/metadata/md5-cache/dev-ros/kdl_parser-1.12.10
index 2ddcde6d7194..3ae67e2b73d5 100644
--- a/metadata/md5-cache/dev-ros/kdl_parser-1.12.10
+++ b/metadata/md5-cache/dev-ros/kdl_parser-1.12.10
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole dev-ros/urdf sci-libs
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/kdl_parser/archive/1.12.10.tar.gz -> kdl_parser-1.12.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a400996376fe28f4d2c0cd4a2ab69a46
diff --git a/metadata/md5-cache/dev-ros/kdl_parser-1.13.0 b/metadata/md5-cache/dev-ros/kdl_parser-1.13.0
index d7e9f332308c..563bc7370a30 100644
--- a/metadata/md5-cache/dev-ros/kdl_parser-1.13.0
+++ b/metadata/md5-cache/dev-ros/kdl_parser-1.13.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole >=dev-ros/urdf-1.13 s
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/kdl_parser/archive/1.13.0.tar.gz -> kdl_parser-1.13.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=591d4ecce1dea54a47db10652db83384
diff --git a/metadata/md5-cache/dev-ros/kdl_parser-1.13.1 b/metadata/md5-cache/dev-ros/kdl_parser-1.13.1
index 8ad120a96ac5..e9eb7a79c93b 100644
--- a/metadata/md5-cache/dev-ros/kdl_parser-1.13.1
+++ b/metadata/md5-cache/dev-ros/kdl_parser-1.13.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole >=dev-ros/urdf-1.13 s
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/kdl_parser/archive/1.13.1.tar.gz -> kdl_parser-1.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=591d4ecce1dea54a47db10652db83384
diff --git a/metadata/md5-cache/dev-ros/kdl_parser-9999 b/metadata/md5-cache/dev-ros/kdl_parser-9999
index 1fc85ebff569..82edfa88aee8 100644
--- a/metadata/md5-cache/dev-ros/kdl_parser-9999
+++ b/metadata/md5-cache/dev-ros/kdl_parser-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole >=dev-ros/urdf-1.13 sci-libs/orocos_kdl:= dev-libs/tinyxml2:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=591d4ecce1dea54a47db10652db83384
diff --git a/metadata/md5-cache/dev-ros/kdl_parser_py-1.12.10 b/metadata/md5-cache/dev-ros/kdl_parser_py-1.12.10
index a382a9ebf9b8..7fa43594d078 100644
--- a/metadata/md5-cache/dev-ros/kdl_parser_py-1.12.10
+++ b/metadata/md5-cache/dev-ros/kdl_parser_py-1.12.10
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/urdf[python_targets_python2_7(-)?,-python_single_target_python2_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/kdl_parser/archive/1.12.10.tar.gz -> kdl_parser-1.12.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=632cd9f1e396555b0d90d63b25aaedac
diff --git a/metadata/md5-cache/dev-ros/kdl_parser_py-1.13.0 b/metadata/md5-cache/dev-ros/kdl_parser_py-1.13.0
index 96565c12feb2..e2a642a950a0 100644
--- a/metadata/md5-cache/dev-ros/kdl_parser_py-1.13.0
+++ b/metadata/md5-cache/dev-ros/kdl_parser_py-1.13.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/urdf-1.13[python_targets_python2_7(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/kdl_parser/archive/1.13.0.tar.gz -> kdl_parser-1.13.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e66bd6e4c15819d1b7ee217a4c06acb2
diff --git a/metadata/md5-cache/dev-ros/kdl_parser_py-1.13.1 b/metadata/md5-cache/dev-ros/kdl_parser_py-1.13.1
index 9c36531c7ec4..97b2b23cf724 100644
--- a/metadata/md5-cache/dev-ros/kdl_parser_py-1.13.1
+++ b/metadata/md5-cache/dev-ros/kdl_parser_py-1.13.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/urdf-1.13[python_targets_python2_7(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/kdl_parser/archive/1.13.1.tar.gz -> kdl_parser-1.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e66bd6e4c15819d1b7ee217a4c06acb2
diff --git a/metadata/md5-cache/dev-ros/kdl_parser_py-9999 b/metadata/md5-cache/dev-ros/kdl_parser_py-9999
index 89a19f3eb70b..73a246b381b9 100644
--- a/metadata/md5-cache/dev-ros/kdl_parser_py-9999
+++ b/metadata/md5-cache/dev-ros/kdl_parser_py-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-ros/urdf-1.13[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_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=e66bd6e4c15819d1b7ee217a4c06acb2
diff --git a/metadata/md5-cache/dev-ros/laser_assembler-1.7.4-r1 b/metadata/md5-cache/dev-ros/laser_assembler-1.7.4-r1
index 630885fa5a53..6a8873d0ef89 100644
--- a/metadata/md5-cache/dev-ros/laser_assembler-1.7.4-r1
+++ b/metadata/md5-cache/dev-ros/laser_assembler-1.7.4-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/laser_assembler/archive/1.7.4.tar.gz -> laser_assembler-1.7.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c66d9b7f0c5394ee2c31e20fb7c771e7
diff --git a/metadata/md5-cache/dev-ros/laser_assembler-1.7.5 b/metadata/md5-cache/dev-ros/laser_assembler-1.7.5
index 85a8a5904a9a..cd9f21d894d3 100644
--- a/metadata/md5-cache/dev-ros/laser_assembler-1.7.5
+++ b/metadata/md5-cache/dev-ros/laser_assembler-1.7.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/laser_assembler/archive/1.7.5.tar.gz -> laser_assembler-1.7.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8b5eeec604e6b958d02d618955390ed0
diff --git a/metadata/md5-cache/dev-ros/laser_assembler-9999 b/metadata/md5-cache/dev-ros/laser_assembler-9999
index 54b1eede3064..d85688e3fac3 100644
--- a/metadata/md5-cache/dev-ros/laser_assembler-9999
+++ b/metadata/md5-cache/dev-ros/laser_assembler-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/message_filters[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/filters python_targets_python2_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/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=c66d9b7f0c5394ee2c31e20fb7c771e7
diff --git a/metadata/md5-cache/dev-ros/laser_cb_detector-0.10.14 b/metadata/md5-cache/dev-ros/laser_cb_detector-0.10.14
index c5ee00929925..8a00054e615e 100644
--- a/metadata/md5-cache/dev-ros/laser_cb_detector-0.10.14
+++ b/metadata/md5-cache/dev-ros/laser_cb_detector-0.10.14
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib[python_targets_python2_7(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e5f151bc27625c02c6214ac747c076ba
diff --git a/metadata/md5-cache/dev-ros/laser_cb_detector-9999 b/metadata/md5-cache/dev-ros/laser_cb_detector-9999
index 7ea87ef4d758..12ec98003e10 100644
--- a/metadata/md5-cache/dev-ros/laser_cb_detector-9999
+++ b/metadata/md5-cache/dev-ros/laser_cb_detector-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/cv_bridge media-libs/opencv:= dev-ros/image_cb_detector dev-ros/message_filters dev-ros/roscpp dev-ros/settlerlib python_targets_python2_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/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=e5f151bc27625c02c6214ac747c076ba
diff --git a/metadata/md5-cache/dev-ros/laser_filters-1.8.5-r1 b/metadata/md5-cache/dev-ros/laser_filters-1.8.5-r1
index 85a54a1f5b5c..afc79b40ccf3 100644
--- a/metadata/md5-cache/dev-ros/laser_filters-1.8.5-r1
+++ b/metadata/md5-cache/dev-ros/laser_filters-1.8.5-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/laser_filters/archive/1.8.5.tar.gz -> laser_filters-1.8.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9f30ba5add3aa627f390d626dff82f58
diff --git a/metadata/md5-cache/dev-ros/laser_filters-1.8.6 b/metadata/md5-cache/dev-ros/laser_filters-1.8.6
index 7b9da4378b40..253c08f11c5f 100644
--- a/metadata/md5-cache/dev-ros/laser_filters-1.8.6
+++ b/metadata/md5-cache/dev-ros/laser_filters-1.8.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/laser_filters/archive/1.8.6.tar.gz -> laser_filters-1.8.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=121c139042888122313766e6b5d1e036
diff --git a/metadata/md5-cache/dev-ros/laser_filters-9999 b/metadata/md5-cache/dev-ros/laser_filters-9999
index f01dad534ffa..fe4275cc94fb 100644
--- a/metadata/md5-cache/dev-ros/laser_filters-9999
+++ b/metadata/md5-cache/dev-ros/laser_filters-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/angles dev-ros/filters dev-ros/laser_geometry dev-libs/tinyxml2:= dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=9f30ba5add3aa627f390d626dff82f58
diff --git a/metadata/md5-cache/dev-ros/laser_geometry-1.6.4 b/metadata/md5-cache/dev-ros/laser_geometry-1.6.4
index 74cc4111cf3f..e1c6d49e5740 100644
--- a/metadata/md5-cache/dev-ros/laser_geometry-1.6.4
+++ b/metadata/md5-cache/dev-ros/laser_geometry-1.6.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/laser_geometry/archive/1.6.4.tar.gz -> laser_geometry-1.6.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=55840aa2a23c8d24a7aeebe9e66c6a66
diff --git a/metadata/md5-cache/dev-ros/laser_geometry-9999 b/metadata/md5-cache/dev-ros/laser_geometry-9999
index ed6d56e8135f..37cab0957e9d 100644
--- a/metadata/md5-cache/dev-ros/laser_geometry-9999
+++ b/metadata/md5-cache/dev-ros/laser_geometry-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-ros/tf dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/eigen:3 dev-ros/angles python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=55840aa2a23c8d24a7aeebe9e66c6a66
diff --git a/metadata/md5-cache/dev-ros/laser_proc-0.1.5 b/metadata/md5-cache/dev-ros/laser_proc-0.1.5
index 553630ebbd48..4ba637c2d8da 100644
--- a/metadata/md5-cache/dev-ros/laser_proc-0.1.5
+++ b/metadata/md5-cache/dev-ros/laser_proc-0.1.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/sens
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/laser_proc/archive/0.1.5.tar.gz -> laser_proc-0.1.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4aa12cb1b1b69eebd1191b745034a4db
diff --git a/metadata/md5-cache/dev-ros/laser_proc-9999 b/metadata/md5-cache/dev-ros/laser_proc-9999
index 7efd0f87dda2..5188b70172d9 100644
--- a/metadata/md5-cache/dev-ros/laser_proc-9999
+++ b/metadata/md5-cache/dev-ros/laser_proc-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/nodelet 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=0b14d0751d79c267937b44719852545b
diff --git a/metadata/md5-cache/dev-ros/libmavconn-0.19.0-r1 b/metadata/md5-cache/dev-ros/libmavconn-0.19.0-r1
index 4d43ebb53386..58548c165ed8 100644
--- a/metadata/md5-cache/dev-ros/libmavconn-0.19.0-r1
+++ b/metadata/md5-cache/dev-ros/libmavconn-0.19.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 dev-libs/boost:= dev-libs/console
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/0.19.0.tar.gz -> mavros-0.19.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=62da6c05b0062da4c20d39a3c794966b
diff --git a/metadata/md5-cache/dev-ros/libmavconn-9999 b/metadata/md5-cache/dev-ros/libmavconn-9999
index 14100b918eda..86c895084ace 100644
--- a/metadata/md5-cache/dev-ros/libmavconn-9999
+++ b/metadata/md5-cache/dev-ros/libmavconn-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3 LGPL-3 BSD
 RDEPEND=>=dev-ros/mavlink-gbp-release-2016.7.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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=fc87b701393688870902942c758331f9
diff --git a/metadata/md5-cache/dev-ros/librviz_tutorial-0.10.1 b/metadata/md5-cache/dev-ros/librviz_tutorial-0.10.1
index b1217f29c6d2..839d1b6bd747 100644
--- a/metadata/md5-cache/dev-ros/librviz_tutorial-0.10.1
+++ b/metadata/md5-cache/dev-ros/librviz_tutorial-0.10.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rviz dev-libs/boost:= python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.10.1.tar.gz -> visualization_tutorials-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9d05ab3230394a29d3625f21fe240767
diff --git a/metadata/md5-cache/dev-ros/librviz_tutorial-0.10.2 b/metadata/md5-cache/dev-ros/librviz_tutorial-0.10.2
index d3ba38dd2fa5..c40c7d811ac8 100644
--- a/metadata/md5-cache/dev-ros/librviz_tutorial-0.10.2
+++ b/metadata/md5-cache/dev-ros/librviz_tutorial-0.10.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rviz dev-libs/boost:= python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.10.2.tar.gz -> visualization_tutorials-0.10.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=05f19ad785517ddaf2bf92376e218a86
diff --git a/metadata/md5-cache/dev-ros/librviz_tutorial-0.10.3 b/metadata/md5-cache/dev-ros/librviz_tutorial-0.10.3
index df94df77dfa1..17025d11e4a3 100644
--- a/metadata/md5-cache/dev-ros/librviz_tutorial-0.10.3
+++ b/metadata/md5-cache/dev-ros/librviz_tutorial-0.10.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rviz dev-libs/boost:= python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.10.3.tar.gz -> visualization_tutorials-0.10.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=05f19ad785517ddaf2bf92376e218a86
diff --git a/metadata/md5-cache/dev-ros/librviz_tutorial-9999 b/metadata/md5-cache/dev-ros/librviz_tutorial-9999
index dc8be956b851..b896d622b6aa 100644
--- a/metadata/md5-cache/dev-ros/librviz_tutorial-9999
+++ b/metadata/md5-cache/dev-ros/librviz_tutorial-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/rviz 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=9d05ab3230394a29d3625f21fe240767
diff --git a/metadata/md5-cache/dev-ros/map_msgs-1.13.0 b/metadata/md5-cache/dev-ros/map_msgs-1.13.0
index 7233470a59c5..626546526c59 100644
--- a/metadata/md5-cache/dev-ros/map_msgs-1.13.0
+++ b/metadata/md5-cache/dev-ros/map_msgs-1.13.0
@@ -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/ros-planning/navigation_msgs/archive/1.13.0.tar.gz -> navigation_msgs-1.13.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=11f97e1c67984f49dbead36fa44311e6
diff --git a/metadata/md5-cache/dev-ros/map_msgs-9999 b/metadata/md5-cache/dev-ros/map_msgs-9999
index 49eb434aa21f..54649a705d26 100644
--- a/metadata/md5-cache/dev-ros/map_msgs-9999
+++ b/metadata/md5-cache/dev-ros/map_msgs-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=11f97e1c67984f49dbead36fa44311e6
diff --git a/metadata/md5-cache/dev-ros/map_server-1.15.2-r1 b/metadata/md5-cache/dev-ros/map_server-1.15.2-r1
index c7df90465c21..03d96c669389 100644
--- a/metadata/md5-cache/dev-ros/map_server-1.15.2-r1
+++ b/metadata/md5-cache/dev-ros/map_server-1.15.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-libs
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.15.2.tar.gz -> navigation-1.15.2.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0d06f89b202fd3c96b7683e749cf0cf7
diff --git a/metadata/md5-cache/dev-ros/map_server-1.16.0 b/metadata/md5-cache/dev-ros/map_server-1.16.0
index 4d50a2dd8c9b..2ec8d86045a4 100644
--- a/metadata/md5-cache/dev-ros/map_server-1.16.0
+++ b/metadata/md5-cache/dev-ros/map_server-1.16.0
@@ -10,5 +10,5 @@ RDEPEND=sci-physics/bullet:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscp
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.0.tar.gz -> navigation-1.16.0.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=20a9fcd3c331088ea81e0daac42647e1
diff --git a/metadata/md5-cache/dev-ros/map_server-1.16.1 b/metadata/md5-cache/dev-ros/map_server-1.16.1
index d35edce83704..b61b09ddf4db 100644
--- a/metadata/md5-cache/dev-ros/map_server-1.16.1
+++ b/metadata/md5-cache/dev-ros/map_server-1.16.1
@@ -10,5 +10,5 @@ RDEPEND=sci-physics/bullet:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscp
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.1.tar.gz -> navigation-1.16.1.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=20a9fcd3c331088ea81e0daac42647e1
diff --git a/metadata/md5-cache/dev-ros/map_server-1.16.2 b/metadata/md5-cache/dev-ros/map_server-1.16.2
index bedb5aa61da3..30ef6fac1640 100644
--- a/metadata/md5-cache/dev-ros/map_server-1.16.2
+++ b/metadata/md5-cache/dev-ros/map_server-1.16.2
@@ -10,5 +10,5 @@ RDEPEND=sci-physics/bullet:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscp
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz -> navigation-1.16.2.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=20a9fcd3c331088ea81e0daac42647e1
diff --git a/metadata/md5-cache/dev-ros/map_server-9999 b/metadata/md5-cache/dev-ros/map_server-9999
index 093a9a220d54..d81071de20a8 100644
--- a/metadata/md5-cache/dev-ros/map_server-9999
+++ b/metadata/md5-cache/dev-ros/map_server-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=sci-physics/bullet:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp media-libs/sdl-image dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=20a9fcd3c331088ea81e0daac42647e1
diff --git a/metadata/md5-cache/dev-ros/mavlink-gbp-release-2017.2.7-r1 b/metadata/md5-cache/dev-ros/mavlink-gbp-release-2017.2.7-r1
index 7722f0fd02e7..668bfe65685c 100644
--- a/metadata/md5-cache/dev-ros/mavlink-gbp-release-2017.2.7-r1
+++ b/metadata/md5-cache/dev-ros/mavlink-gbp-release-2017.2.7-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/future[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavlink-gbp-release/archive/release/kinetic/mavlink/2017.2.7-2017.2.7.tar.gz -> mavlink-gbp-release-2017.2.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c667f892e2edd0f915e1c8eee97150e8
diff --git a/metadata/md5-cache/dev-ros/mavlink-gbp-release-2017.5.5 b/metadata/md5-cache/dev-ros/mavlink-gbp-release-2017.5.5
index a76a6e703185..441d056abb22 100644
--- a/metadata/md5-cache/dev-ros/mavlink-gbp-release-2017.5.5
+++ b/metadata/md5-cache/dev-ros/mavlink-gbp-release-2017.5.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/future[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavlink-gbp-release/archive/release/kinetic/mavlink/2017.5.5-2017.5.5.tar.gz -> mavlink-gbp-release-2017.5.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c667f892e2edd0f915e1c8eee97150e8
diff --git a/metadata/md5-cache/dev-ros/mavros-0.19.0-r1 b/metadata/md5-cache/dev-ros/mavros-0.19.0-r1
index e615876205d7..c60adee2ba7d 100644
--- a/metadata/md5-cache/dev-ros/mavros-0.19.0-r1
+++ b/metadata/md5-cache/dev-ros/mavros-0.19.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/0.19.0.tar.gz -> mavros-0.19.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=273d8092e453c4e8600632e587a00aab
diff --git a/metadata/md5-cache/dev-ros/mavros-9999 b/metadata/md5-cache/dev-ros/mavros-9999
index a5c99848bf35..e3d55115c630 100644
--- a/metadata/md5-cache/dev-ros/mavros-9999
+++ b/metadata/md5-cache/dev-ros/mavros-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3 LGPL-3 BSD
 RDEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-9999[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] >=dev-ros/mavlink-gbp-release-2016.11.11 dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=273d8092e453c4e8600632e587a00aab
diff --git a/metadata/md5-cache/dev-ros/mavros_extras-0.19.0-r1 b/metadata/md5-cache/dev-ros/mavros_extras-0.19.0-r1
index 37c73359f9be..fd83e2d34cbd 100644
--- a/metadata/md5-cache/dev-ros/mavros_extras-0.19.0-r1
+++ b/metadata/md5-cache/dev-ros/mavros_extras-0.19.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/0.19.0.tar.gz -> mavros-0.19.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=31fc7a0ef0551fa8b373dc8924daa30d
diff --git a/metadata/md5-cache/dev-ros/mavros_extras-9999 b/metadata/md5-cache/dev-ros/mavros_extras-9999
index 24cbfc769736..4db6065d650e 100644
--- a/metadata/md5-cache/dev-ros/mavros_extras-9999
+++ b/metadata/md5-cache/dev-ros/mavros_extras-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3 LGPL-3 BSD
 RDEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=31fc7a0ef0551fa8b373dc8924daa30d
diff --git a/metadata/md5-cache/dev-ros/mavros_msgs-0.18.7 b/metadata/md5-cache/dev-ros/mavros_msgs-0.18.7
index 86500a044766..0ec23c44227b 100644
--- a/metadata/md5-cache/dev-ros/mavros_msgs-0.18.7
+++ b/metadata/md5-cache/dev-ros/mavros_msgs-0.18.7
@@ -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/mavlink/mavros/archive/0.18.7.tar.gz -> mavros-0.18.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b3939e0916b495f9470c05ec3624c866
diff --git a/metadata/md5-cache/dev-ros/mavros_msgs-0.19.0 b/metadata/md5-cache/dev-ros/mavros_msgs-0.19.0
index 73a5a038254a..b4b8f3af1ec0 100644
--- a/metadata/md5-cache/dev-ros/mavros_msgs-0.19.0
+++ b/metadata/md5-cache/dev-ros/mavros_msgs-0.19.0
@@ -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/mavlink/mavros/archive/0.19.0.tar.gz -> mavros-0.19.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b3939e0916b495f9470c05ec3624c866
diff --git a/metadata/md5-cache/dev-ros/mavros_msgs-9999 b/metadata/md5-cache/dev-ros/mavros_msgs-9999
index ef4ec5f2f44f..1fbf7c14463a 100644
--- a/metadata/md5-cache/dev-ros/mavros_msgs-9999
+++ b/metadata/md5-cache/dev-ros/mavros_msgs-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=b3939e0916b495f9470c05ec3624c866
diff --git a/metadata/md5-cache/dev-ros/media_export-0.2.0 b/metadata/md5-cache/dev-ros/media_export-0.2.0
index a86ee1eba7ee..c4b1e620f52b 100644
--- a/metadata/md5-cache/dev-ros/media_export-0.2.0
+++ b/metadata/md5-cache/dev-ros/media_export-0.2.0
@@ -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/ros/media_export/archive/0.2.0.tar.gz -> media_export-0.2.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1c59a71f5c6d7db7a423f868e2dfcc7f
diff --git a/metadata/md5-cache/dev-ros/media_export-9999 b/metadata/md5-cache/dev-ros/media_export-9999
index 7b0453176118..c413ef91eaaa 100644
--- a/metadata/md5-cache/dev-ros/media_export-9999
+++ b/metadata/md5-cache/dev-ros/media_export-9999
@@ -8,5 +8,5 @@ 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=1c59a71f5c6d7db7a423f868e2dfcc7f
diff --git a/metadata/md5-cache/dev-ros/message_filters-1.13.5 b/metadata/md5-cache/dev-ros/message_filters-1.13.5
index 22c9549c050e..adfd291e1d98 100644
--- a/metadata/md5-cache/dev-ros/message_filters-1.13.5
+++ b/metadata/md5-cache/dev-ros/message_filters-1.13.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/xmlrpcpp dev-libs/boost:=[thre
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.5.tar.gz -> ros_comm-1.13.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fcdf1532f98705e4908c51743f633f83
diff --git a/metadata/md5-cache/dev-ros/message_filters-1.13.6 b/metadata/md5-cache/dev-ros/message_filters-1.13.6
index a4fa83014ee5..3c8b17e68144 100644
--- a/metadata/md5-cache/dev-ros/message_filters-1.13.6
+++ b/metadata/md5-cache/dev-ros/message_filters-1.13.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genp
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.6.tar.gz -> ros_comm-1.13.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5535611168573147fe3d3121c1fba155
diff --git a/metadata/md5-cache/dev-ros/message_filters-1.14.2 b/metadata/md5-cache/dev-ros/message_filters-1.14.2
index dde06b350cb3..27253ae1d481 100644
--- a/metadata/md5-cache/dev-ros/message_filters-1.14.2
+++ b/metadata/md5-cache/dev-ros/message_filters-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genp
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.2.tar.gz -> ros_comm-1.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=5535611168573147fe3d3121c1fba155
diff --git a/metadata/md5-cache/dev-ros/message_filters-1.14.3 b/metadata/md5-cache/dev-ros/message_filters-1.14.3
index 3d7b1a54fef9..3e5a5f8198fe 100644
--- a/metadata/md5-cache/dev-ros/message_filters-1.14.3
+++ b/metadata/md5-cache/dev-ros/message_filters-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genp
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5535611168573147fe3d3121c1fba155
diff --git a/metadata/md5-cache/dev-ros/message_filters-9999 b/metadata/md5-cache/dev-ros/message_filters-9999
index 3feb1480e965..6107c4ae951e 100644
--- a/metadata/md5-cache/dev-ros/message_filters-9999
+++ b/metadata/md5-cache/dev-ros/message_filters-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=5535611168573147fe3d3121c1fba155
diff --git a/metadata/md5-cache/dev-ros/message_generation-0.3.0 b/metadata/md5-cache/dev-ros/message_generation-0.3.0
index 7c9285ddbf09..078b600c4fdd 100644
--- a/metadata/md5-cache/dev-ros/message_generation-0.3.0
+++ b/metadata/md5-cache/dev-ros/message_generation-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg dev-ros/genlisp dev-ros/gencpp dev-ros/genpy dev-ros/gene
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/message_generation/archive/0.3.0.tar.gz -> message_generation-0.3.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=41b75c11275796e5fa3d0b290c4d85f7
diff --git a/metadata/md5-cache/dev-ros/message_generation-0.4.0 b/metadata/md5-cache/dev-ros/message_generation-0.4.0
index 3cb1cb6740a4..2ec8d9476c32 100644
--- a/metadata/md5-cache/dev-ros/message_generation-0.4.0
+++ b/metadata/md5-cache/dev-ros/message_generation-0.4.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg dev-ros/genlisp dev-ros/gencpp dev-ros/genpy dev-ros/gene
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/message_generation/archive/0.4.0.tar.gz -> message_generation-0.4.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7168198a73d9ce0349edf0b4418da2ba
diff --git a/metadata/md5-cache/dev-ros/message_generation-9999 b/metadata/md5-cache/dev-ros/message_generation-9999
index e44defd77383..4f8490073f62 100644
--- a/metadata/md5-cache/dev-ros/message_generation-9999
+++ b/metadata/md5-cache/dev-ros/message_generation-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/genmsg dev-ros/genlisp dev-ros/gencpp dev-ros/genpy dev-ros/geneus dev-ros/gennodejs python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=7168198a73d9ce0349edf0b4418da2ba
diff --git a/metadata/md5-cache/dev-ros/message_runtime-0.4.12 b/metadata/md5-cache/dev-ros/message_runtime-0.4.12
index 96aa68714406..a91fd729ee36 100644
--- a/metadata/md5-cache/dev-ros/message_runtime-0.4.12
+++ b/metadata/md5-cache/dev-ros/message_runtime-0.4.12
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits dev-ros/roscpp_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/message_runtime/archive/0.4.12.tar.gz -> message_runtime-0.4.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=15e0b820f77afa276256ab1f79eb9974
diff --git a/metadata/md5-cache/dev-ros/message_runtime-9999 b/metadata/md5-cache/dev-ros/message_runtime-9999
index e54241f79c0c..9ff68c5a1e12 100644
--- a/metadata/md5-cache/dev-ros/message_runtime-9999
+++ b/metadata/md5-cache/dev-ros/message_runtime-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits dev-ros/roscpp_serialization python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=15e0b820f77afa276256ab1f79eb9974
diff --git a/metadata/md5-cache/dev-ros/message_to_tf-0.3.0 b/metadata/md5-cache/dev-ros/message_to_tf-0.3.0
index 1a273fe0a1b9..fa751bfc0369 100644
--- a/metadata/md5-cache/dev-ros/message_to_tf-0.3.0
+++ b/metadata/md5-cache/dev-ros/message_to_tf-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[r
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_localization/archive/0.3.0.tar.gz -> hector_localization-0.3.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9d4541b975a6bb536a36e0cc4248eb35
diff --git a/metadata/md5-cache/dev-ros/message_to_tf-9999 b/metadata/md5-cache/dev-ros/message_to_tf-9999
index ae8c878a3b0b..991aeb56f92e 100644
--- a/metadata/md5-cache/dev-ros/message_to_tf-9999
+++ b/metadata/md5-cache/dev-ros/message_to_tf-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/topic_tools 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=9d4541b975a6bb536a36e0cc4248eb35
diff --git a/metadata/md5-cache/dev-ros/mk-1.12.3 b/metadata/md5-cache/dev-ros/mk-1.12.3
index 408af2554657..fb1649fdea43 100644
--- a/metadata/md5-cache/dev-ros/mk-1.12.3
+++ b/metadata/md5-cache/dev-ros/mk-1.12.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=0
 SRC_URI=https://github.com/ros/ros/archive/1.12.3.tar.gz -> ros-1.12.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=528f66b1d1138d3dc926186c5ac1375d
diff --git a/metadata/md5-cache/dev-ros/mk-1.12.5 b/metadata/md5-cache/dev-ros/mk-1.12.5
index 39036e345adb..b4e8467302e9 100644
--- a/metadata/md5-cache/dev-ros/mk-1.12.5
+++ b/metadata/md5-cache/dev-ros/mk-1.12.5
@@ -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/ros/ros/archive/1.12.5.tar.gz -> ros-1.12.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=528f66b1d1138d3dc926186c5ac1375d
diff --git a/metadata/md5-cache/dev-ros/mk-1.13.1 b/metadata/md5-cache/dev-ros/mk-1.13.1
index a3da836c39bf..8d1897c1e591 100644
--- a/metadata/md5-cache/dev-ros/mk-1.13.1
+++ b/metadata/md5-cache/dev-ros/mk-1.13.1
@@ -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/ros/ros/archive/1.13.1.tar.gz -> ros-1.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=528f66b1d1138d3dc926186c5ac1375d
diff --git a/metadata/md5-cache/dev-ros/mk-1.13.2 b/metadata/md5-cache/dev-ros/mk-1.13.2
index 160b7689b398..61754cab6e12 100644
--- a/metadata/md5-cache/dev-ros/mk-1.13.2
+++ b/metadata/md5-cache/dev-ros/mk-1.13.2
@@ -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/ros/ros/archive/1.13.2.tar.gz -> ros-1.13.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=e225befe12b3d4103f1dcdf57274a60f
diff --git a/metadata/md5-cache/dev-ros/mk-1.13.3 b/metadata/md5-cache/dev-ros/mk-1.13.3
index 5a628433f298..48f34939807f 100644
--- a/metadata/md5-cache/dev-ros/mk-1.13.3
+++ b/metadata/md5-cache/dev-ros/mk-1.13.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=0
 SRC_URI=https://github.com/ros/ros/archive/1.13.3.tar.gz -> ros-1.13.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e225befe12b3d4103f1dcdf57274a60f
diff --git a/metadata/md5-cache/dev-ros/mk-1.13.4 b/metadata/md5-cache/dev-ros/mk-1.13.4
index 485becf802bb..f257fd8eb57d 100644
--- a/metadata/md5-cache/dev-ros/mk-1.13.4
+++ b/metadata/md5-cache/dev-ros/mk-1.13.4
@@ -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/ros/ros/archive/1.13.4.tar.gz -> ros-1.13.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e225befe12b3d4103f1dcdf57274a60f
diff --git a/metadata/md5-cache/dev-ros/mk-1.13.5 b/metadata/md5-cache/dev-ros/mk-1.13.5
index 50c9eecf66e4..5ece9fc14319 100644
--- a/metadata/md5-cache/dev-ros/mk-1.13.5
+++ b/metadata/md5-cache/dev-ros/mk-1.13.5
@@ -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/ros/ros/archive/1.13.5.tar.gz -> ros-1.13.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fc99ffbc32e0f5e9dd0a602c92fe5578
diff --git a/metadata/md5-cache/dev-ros/mk-1.14.0 b/metadata/md5-cache/dev-ros/mk-1.14.0
index 75326e1fa856..d1fac208ce13 100644
--- a/metadata/md5-cache/dev-ros/mk-1.14.0
+++ b/metadata/md5-cache/dev-ros/mk-1.14.0
@@ -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/ros/ros/archive/1.14.0.tar.gz -> ros-1.14.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fc99ffbc32e0f5e9dd0a602c92fe5578
diff --git a/metadata/md5-cache/dev-ros/mk-1.14.1 b/metadata/md5-cache/dev-ros/mk-1.14.1
index 1fa1c517e255..feae67c2e313 100644
--- a/metadata/md5-cache/dev-ros/mk-1.14.1
+++ b/metadata/md5-cache/dev-ros/mk-1.14.1
@@ -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/ros/ros/archive/1.14.1.tar.gz -> ros-1.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fc99ffbc32e0f5e9dd0a602c92fe5578
diff --git a/metadata/md5-cache/dev-ros/mk-1.14.2 b/metadata/md5-cache/dev-ros/mk-1.14.2
index 1863bddccc5f..966bb87ec439 100644
--- a/metadata/md5-cache/dev-ros/mk-1.14.2
+++ b/metadata/md5-cache/dev-ros/mk-1.14.2
@@ -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/ros/ros/archive/1.14.2.tar.gz -> ros-1.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=fc99ffbc32e0f5e9dd0a602c92fe5578
diff --git a/metadata/md5-cache/dev-ros/mk-1.14.3 b/metadata/md5-cache/dev-ros/mk-1.14.3
index 9d9a3afe3372..bf3905302a49 100644
--- a/metadata/md5-cache/dev-ros/mk-1.14.3
+++ b/metadata/md5-cache/dev-ros/mk-1.14.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=0
 SRC_URI=https://github.com/ros/ros/archive/1.14.3.tar.gz -> ros-1.14.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e3ec9e810c389fb45e9817c608fd627e
diff --git a/metadata/md5-cache/dev-ros/mk-1.14.4 b/metadata/md5-cache/dev-ros/mk-1.14.4
index 45cc5c3bb03c..aca890089c58 100644
--- a/metadata/md5-cache/dev-ros/mk-1.14.4
+++ b/metadata/md5-cache/dev-ros/mk-1.14.4
@@ -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/ros/ros/archive/1.14.4.tar.gz -> ros-1.14.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e3ec9e810c389fb45e9817c608fd627e
diff --git a/metadata/md5-cache/dev-ros/mk-9999 b/metadata/md5-cache/dev-ros/mk-9999
index 3ec6224e221e..8f8f071b61ea 100644
--- a/metadata/md5-cache/dev-ros/mk-9999
+++ b/metadata/md5-cache/dev-ros/mk-9999
@@ -8,5 +8,5 @@ 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=528f66b1d1138d3dc926186c5ac1375d
diff --git a/metadata/md5-cache/dev-ros/monocam_settler-0.10.13 b/metadata/md5-cache/dev-ros/monocam_settler-0.10.13
index 24f84013ae53..843b927e9c28 100644
--- a/metadata/md5-cache/dev-ros/monocam_settler-0.10.13
+++ b/metadata/md5-cache/dev-ros/monocam_settler-0.10.13
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.13.tar.gz -> calibration-0.10.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=515ba831523560105f29000a2b09e536
diff --git a/metadata/md5-cache/dev-ros/monocam_settler-0.10.14 b/metadata/md5-cache/dev-ros/monocam_settler-0.10.14
index f6745efb209a..f8c5f3ff392f 100644
--- a/metadata/md5-cache/dev-ros/monocam_settler-0.10.14
+++ b/metadata/md5-cache/dev-ros/monocam_settler-0.10.14
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f11d406ce3dfb0db6bccb227fa563750
diff --git a/metadata/md5-cache/dev-ros/monocam_settler-9999 b/metadata/md5-cache/dev-ros/monocam_settler-9999
index d003b426ad25..0e33fde62e1e 100644
--- a/metadata/md5-cache/dev-ros/monocam_settler-9999
+++ b/metadata/md5-cache/dev-ros/monocam_settler-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/settlerlib dev-libs/boost:=[threads] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=515ba831523560105f29000a2b09e536
diff --git a/metadata/md5-cache/dev-ros/move_base-1.15.1-r2 b/metadata/md5-cache/dev-ros/move_base-1.15.1-r2
index 7fa87d4bfac0..fbbe4b041e03 100644
--- a/metadata/md5-cache/dev-ros/move_base-1.15.1-r2
+++ b/metadata/md5-cache/dev-ros/move_base-1.15.1-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/costmap_2d-1.15.1 dev-ros/roscpp dev-ros/pluginlib dev-libs/ti
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.15.1.tar.gz -> navigation-1.15.1.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=46710ec6d0524eb750b4aa7d223c556f
diff --git a/metadata/md5-cache/dev-ros/move_base-1.15.2 b/metadata/md5-cache/dev-ros/move_base-1.15.2
index 7e5b19d3faa6..0ee62bdc3265 100644
--- a/metadata/md5-cache/dev-ros/move_base-1.15.2
+++ b/metadata/md5-cache/dev-ros/move_base-1.15.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/costmap_2d-1.15.1 dev-ros/roscpp dev-ros/pluginlib dev-libs/ti
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.15.2.tar.gz -> navigation-1.15.2.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=46710ec6d0524eb750b4aa7d223c556f
diff --git a/metadata/md5-cache/dev-ros/move_base-1.16.0 b/metadata/md5-cache/dev-ros/move_base-1.16.0
index 40e0cd8cdc2d..caafc0dda93c 100644
--- a/metadata/md5-cache/dev-ros/move_base-1.16.0
+++ b/metadata/md5-cache/dev-ros/move_base-1.16.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigur
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.0.tar.gz -> navigation-1.16.0.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=734742f28191ddb49d6b5ae03dde8f07
diff --git a/metadata/md5-cache/dev-ros/move_base-1.16.1 b/metadata/md5-cache/dev-ros/move_base-1.16.1
index c142d1c39cd6..7379a937dc22 100644
--- a/metadata/md5-cache/dev-ros/move_base-1.16.1
+++ b/metadata/md5-cache/dev-ros/move_base-1.16.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigur
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.1.tar.gz -> navigation-1.16.1.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=734742f28191ddb49d6b5ae03dde8f07
diff --git a/metadata/md5-cache/dev-ros/move_base-1.16.2 b/metadata/md5-cache/dev-ros/move_base-1.16.2
index 8e3f39468aa7..5a3af3d7bc56 100644
--- a/metadata/md5-cache/dev-ros/move_base-1.16.2
+++ b/metadata/md5-cache/dev-ros/move_base-1.16.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigur
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz -> navigation-1.16.2.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=734742f28191ddb49d6b5ae03dde8f07
diff --git a/metadata/md5-cache/dev-ros/move_base-9999 b/metadata/md5-cache/dev-ros/move_base-9999
index d8874242fcb7..cdaee52156fc 100644
--- a/metadata/md5-cache/dev-ros/move_base-9999
+++ b/metadata/md5-cache/dev-ros/move_base-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=734742f28191ddb49d6b5ae03dde8f07
diff --git a/metadata/md5-cache/dev-ros/move_base_msgs-1.13.0 b/metadata/md5-cache/dev-ros/move_base_msgs-1.13.0
index b212b3134872..4ebdfc4a2f18 100644
--- a/metadata/md5-cache/dev-ros/move_base_msgs-1.13.0
+++ b/metadata/md5-cache/dev-ros/move_base_msgs-1.13.0
@@ -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/ros-planning/navigation_msgs/archive/1.13.0.tar.gz -> navigation_msgs-1.13.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=52bd04fc2c7bc162166915ba6619c011
diff --git a/metadata/md5-cache/dev-ros/move_base_msgs-9999 b/metadata/md5-cache/dev-ros/move_base_msgs-9999
index a20fe4f68875..06525c11d0e6 100644
--- a/metadata/md5-cache/dev-ros/move_base_msgs-9999
+++ b/metadata/md5-cache/dev-ros/move_base_msgs-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=52bd04fc2c7bc162166915ba6619c011
diff --git a/metadata/md5-cache/dev-ros/move_slow_and_clear-1.16.1 b/metadata/md5-cache/dev-ros/move_slow_and_clear-1.16.1
index 188612fed793..6ae9f68916e5 100644
--- a/metadata/md5-cache/dev-ros/move_slow_and_clear-1.16.1
+++ b/metadata/md5-cache/dev-ros/move_slow_and_clear-1.16.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/geometry_msgs[ros_messages_cxx(-)] dev
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.1.tar.gz -> navigation-1.16.1.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=27440bbb78c1902a2e58cf47873f7e8b
diff --git a/metadata/md5-cache/dev-ros/move_slow_and_clear-1.16.2 b/metadata/md5-cache/dev-ros/move_slow_and_clear-1.16.2
index dfc82906c1d6..afe31d9ffab1 100644
--- a/metadata/md5-cache/dev-ros/move_slow_and_clear-1.16.2
+++ b/metadata/md5-cache/dev-ros/move_slow_and_clear-1.16.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/geometry_msgs[ros_messages_cxx(-)] dev
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz -> navigation-1.16.2.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=27440bbb78c1902a2e58cf47873f7e8b
diff --git a/metadata/md5-cache/dev-ros/move_slow_and_clear-9999 b/metadata/md5-cache/dev-ros/move_slow_and_clear-9999
index 64528e6e444f..ac0273d25cba 100644
--- a/metadata/md5-cache/dev-ros/move_slow_and_clear-9999
+++ b/metadata/md5-cache/dev-ros/move_slow_and_clear-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=27440bbb78c1902a2e58cf47873f7e8b
diff --git a/metadata/md5-cache/dev-ros/moveit_msgs-0.10.0 b/metadata/md5-cache/dev-ros/moveit_msgs-0.10.0
index 914128a6426e..92c87c2dd1ff 100644
--- a/metadata/md5-cache/dev-ros/moveit_msgs-0.10.0
+++ b/metadata/md5-cache/dev-ros/moveit_msgs-0.10.0
@@ -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/ros-planning/moveit_msgs/archive/0.10.0.tar.gz -> moveit_msgs-0.10.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f6980a073d8579dd68dbeeeb8caeaf21
diff --git a/metadata/md5-cache/dev-ros/moveit_msgs-0.9.1 b/metadata/md5-cache/dev-ros/moveit_msgs-0.9.1
index 90e8a8c25b84..15cba3a3ca70 100644
--- a/metadata/md5-cache/dev-ros/moveit_msgs-0.9.1
+++ b/metadata/md5-cache/dev-ros/moveit_msgs-0.9.1
@@ -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/ros-planning/moveit_msgs/archive/0.9.1.tar.gz -> moveit_msgs-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6d90c5a5eb762d5f478acbee3433c10a
diff --git a/metadata/md5-cache/dev-ros/moveit_msgs-9999 b/metadata/md5-cache/dev-ros/moveit_msgs-9999
index f392b4ab45e0..727797e93e6b 100644
--- a/metadata/md5-cache/dev-ros/moveit_msgs-9999
+++ b/metadata/md5-cache/dev-ros/moveit_msgs-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/octomap_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/octomap_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/object_recognition_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/object_recognition_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=6d90c5a5eb762d5f478acbee3433c10a
diff --git a/metadata/md5-cache/dev-ros/nav_core-1.15.2 b/metadata/md5-cache/dev-ros/nav_core-1.15.2
index 690d2150b471..cbbf20c5cb8c 100644
--- a/metadata/md5-cache/dev-ros/nav_core-1.15.2
+++ b/metadata/md5-cache/dev-ros/nav_core-1.15.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.15.2.tar.gz -> navigation-1.15.2.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=83a7268b87351721f1a618adc8c74530
diff --git a/metadata/md5-cache/dev-ros/nav_core-1.16.0 b/metadata/md5-cache/dev-ros/nav_core-1.16.0
index 573a9ef0a8f5..ae5ba0c5bb6b 100644
--- a/metadata/md5-cache/dev-ros/nav_core-1.16.0
+++ b/metadata/md5-cache/dev-ros/nav_core-1.16.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/st
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.0.tar.gz -> navigation-1.16.0.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=536f7f888c3b1762eb1f2b97d36770b7
diff --git a/metadata/md5-cache/dev-ros/nav_core-1.16.1 b/metadata/md5-cache/dev-ros/nav_core-1.16.1
index 0c664491089b..ac6c313f1f58 100644
--- a/metadata/md5-cache/dev-ros/nav_core-1.16.1
+++ b/metadata/md5-cache/dev-ros/nav_core-1.16.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/st
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.1.tar.gz -> navigation-1.16.1.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=536f7f888c3b1762eb1f2b97d36770b7
diff --git a/metadata/md5-cache/dev-ros/nav_core-1.16.2 b/metadata/md5-cache/dev-ros/nav_core-1.16.2
index 52e11e119f3f..051eac44a182 100644
--- a/metadata/md5-cache/dev-ros/nav_core-1.16.2
+++ b/metadata/md5-cache/dev-ros/nav_core-1.16.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/st
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz -> navigation-1.16.2.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=536f7f888c3b1762eb1f2b97d36770b7
diff --git a/metadata/md5-cache/dev-ros/nav_core-9999 b/metadata/md5-cache/dev-ros/nav_core-9999
index 08b2e2be7b11..2d74184e24ba 100644
--- a/metadata/md5-cache/dev-ros/nav_core-9999
+++ b/metadata/md5-cache/dev-ros/nav_core-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=536f7f888c3b1762eb1f2b97d36770b7
diff --git a/metadata/md5-cache/dev-ros/nav_msgs-1.12.5 b/metadata/md5-cache/dev-ros/nav_msgs-1.12.5
index 9154fb733d3c..4bb0053891e3 100644
--- a/metadata/md5-cache/dev-ros/nav_msgs-1.12.5
+++ b/metadata/md5-cache/dev-ros/nav_msgs-1.12.5
@@ -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/ros/common_msgs/archive/1.12.5.tar.gz -> common_msgs-1.12.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=65cd3b2a6aa8b3aeb6f557227c8e829f
diff --git a/metadata/md5-cache/dev-ros/nav_msgs-1.12.6 b/metadata/md5-cache/dev-ros/nav_msgs-1.12.6
index 05bbddcc519d..c42119b8698c 100644
--- a/metadata/md5-cache/dev-ros/nav_msgs-1.12.6
+++ b/metadata/md5-cache/dev-ros/nav_msgs-1.12.6
@@ -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/ros/common_msgs/archive/1.12.6.tar.gz -> common_msgs-1.12.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9c064293d3be28dba6de4a6eeef3f6c5
diff --git a/metadata/md5-cache/dev-ros/nav_msgs-9999 b/metadata/md5-cache/dev-ros/nav_msgs-9999
index 645df5ef6bf9..018baabc326c 100644
--- a/metadata/md5-cache/dev-ros/nav_msgs-9999
+++ b/metadata/md5-cache/dev-ros/nav_msgs-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=65cd3b2a6aa8b3aeb6f557227c8e829f
diff --git a/metadata/md5-cache/dev-ros/navfn-1.16.0 b/metadata/md5-cache/dev-ros/navfn-1.16.0
index 5c1f18a0f15c..843d839020b6 100644
--- a/metadata/md5-cache/dev-ros/navfn-1.16.0
+++ b/metadata/md5-cache/dev-ros/navfn-1.16.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/ros
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.0.tar.gz -> navigation-1.16.0.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d0b6129249ee15523878a8d7dbf7998b
diff --git a/metadata/md5-cache/dev-ros/navfn-1.16.1 b/metadata/md5-cache/dev-ros/navfn-1.16.1
index b3cd1a12147d..5b131a743831 100644
--- a/metadata/md5-cache/dev-ros/navfn-1.16.1
+++ b/metadata/md5-cache/dev-ros/navfn-1.16.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/ros
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.1.tar.gz -> navigation-1.16.1.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d0b6129249ee15523878a8d7dbf7998b
diff --git a/metadata/md5-cache/dev-ros/navfn-1.16.2 b/metadata/md5-cache/dev-ros/navfn-1.16.2
index c5bdae65aad4..71ec5bd35296 100644
--- a/metadata/md5-cache/dev-ros/navfn-1.16.2
+++ b/metadata/md5-cache/dev-ros/navfn-1.16.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/ros
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz -> navigation-1.16.2.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d0b6129249ee15523878a8d7dbf7998b
diff --git a/metadata/md5-cache/dev-ros/navfn-9999 b/metadata/md5-cache/dev-ros/navfn-9999
index e4b64f454891..75509ade9420 100644
--- a/metadata/md5-cache/dev-ros/navfn-9999
+++ b/metadata/md5-cache/dev-ros/navfn-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=d0b6129249ee15523878a8d7dbf7998b
diff --git a/metadata/md5-cache/dev-ros/nmea_msgs-1.0.0 b/metadata/md5-cache/dev-ros/nmea_msgs-1.0.0
index ee655b9362d9..cd4c37cc5e45 100644
--- a/metadata/md5-cache/dev-ros/nmea_msgs-1.0.0
+++ b/metadata/md5-cache/dev-ros/nmea_msgs-1.0.0
@@ -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/ros-drivers/nmea_msgs/archive/nmea_msgs-1.0.0.tar.gz -> nmea_msgs-1.0.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=aa7d086a55c8de818c297103d2031f10
diff --git a/metadata/md5-cache/dev-ros/nmea_msgs-9999 b/metadata/md5-cache/dev-ros/nmea_msgs-9999
index b72edd11ebfc..09354d887f85 100644
--- a/metadata/md5-cache/dev-ros/nmea_msgs-9999
+++ b/metadata/md5-cache/dev-ros/nmea_msgs-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=aa7d086a55c8de818c297103d2031f10
diff --git a/metadata/md5-cache/dev-ros/nodelet-1.9.16-r1 b/metadata/md5-cache/dev-ros/nodelet-1.9.16-r1
index 0e6f0bd2e556..cc3e6d503285 100644
--- a/metadata/md5-cache/dev-ros/nodelet-1.9.16-r1
+++ b/metadata/md5-cache/dev-ros/nodelet-1.9.16-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/bondcpp dev-ros/cmake_modules dev-ros/pluginlib dev-libs/tinyxml
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.9.16.tar.gz -> nodelet_core-1.9.16.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ee86fdd3896a9f83909bcadd2bc77908
diff --git a/metadata/md5-cache/dev-ros/nodelet-9999 b/metadata/md5-cache/dev-ros/nodelet-9999
index 118eac60b449..38fda18395ae 100644
--- a/metadata/md5-cache/dev-ros/nodelet-9999
+++ b/metadata/md5-cache/dev-ros/nodelet-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/bondcpp dev-ros/cmake_modules dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= sys-apps/util-linux dev-ros/class_loader:= dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=ee86fdd3896a9f83909bcadd2bc77908
diff --git a/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.9.16 b/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.9.16
index 4ea601b09a17..17febef02c83 100644
--- a/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.9.16
+++ b/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.9.16
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.9.16.tar.gz -> nodelet_core-1.9.16.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=01770857dc029f1344457d1ecfd6ec10
diff --git a/metadata/md5-cache/dev-ros/nodelet_topic_tools-9999 b/metadata/md5-cache/dev-ros/nodelet_topic_tools-9999
index a5ae30c47930..fea0dded353c 100644
--- a/metadata/md5-cache/dev-ros/nodelet_topic_tools-9999
+++ b/metadata/md5-cache/dev-ros/nodelet_topic_tools-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters dev-ros/nodelet dev-ros/pluginlib 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=c95a1633f42d16997fd3a143af1ac604
diff --git a/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.1.10-r1 b/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.1.10-r1
index b791e4d24f24..eb64ca5a32bb 100644
--- a/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.1.10-r1
+++ b/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.1.10-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msg
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/common_tutorials/archive/0.1.10.tar.gz -> common_tutorials-0.1.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6fc259d5a14ecae7361fb4693967825d
diff --git a/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.1.11 b/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.1.11
index 7d08eab91530..e8d3e4349bc7 100644
--- a/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.1.11
+++ b/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.1.11
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msg
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/common_tutorials/archive/0.1.11.tar.gz -> common_tutorials-0.1.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f42e05223aab004528dbee3af6382a39
diff --git a/metadata/md5-cache/dev-ros/nodelet_tutorial_math-9999 b/metadata/md5-cache/dev-ros/nodelet_tutorial_math-9999
index 01d54279092d..1162b45289c9 100644
--- a/metadata/md5-cache/dev-ros/nodelet_tutorial_math-9999
+++ b/metadata/md5-cache/dev-ros/nodelet_tutorial_math-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=6fc259d5a14ecae7361fb4693967825d
diff --git a/metadata/md5-cache/dev-ros/object_recognition_msgs-0.4.1 b/metadata/md5-cache/dev-ros/object_recognition_msgs-0.4.1
index e3126050b20b..1bae78952797 100644
--- a/metadata/md5-cache/dev-ros/object_recognition_msgs-0.4.1
+++ b/metadata/md5-cache/dev-ros/object_recognition_msgs-0.4.1
@@ -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/wg-perception/object_recognition_msgs/archive/0.4.1.tar.gz -> object_recognition_msgs-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d33542c7d403b70606f7e0b67c790881
diff --git a/metadata/md5-cache/dev-ros/object_recognition_msgs-9999 b/metadata/md5-cache/dev-ros/object_recognition_msgs-9999
index 965ed204dd35..d2b114f82aa7 100644
--- a/metadata/md5-cache/dev-ros/object_recognition_msgs-9999
+++ b/metadata/md5-cache/dev-ros/object_recognition_msgs-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=d33542c7d403b70606f7e0b67c790881
diff --git a/metadata/md5-cache/dev-ros/octomap_msgs-0.3.3 b/metadata/md5-cache/dev-ros/octomap_msgs-0.3.3
index ab3f5373e77f..2250fc7ef29b 100644
--- a/metadata/md5-cache/dev-ros/octomap_msgs-0.3.3
+++ b/metadata/md5-cache/dev-ros/octomap_msgs-0.3.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=0
 SRC_URI=https://github.com/OctoMap/octomap_msgs/archive/0.3.3.tar.gz -> octomap_msgs-0.3.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=55ef4cfd2f983819942a7afa2bfe1328
diff --git a/metadata/md5-cache/dev-ros/octomap_msgs-9999 b/metadata/md5-cache/dev-ros/octomap_msgs-9999
index 4eafc1898cd4..d6d4b25021bf 100644
--- a/metadata/md5-cache/dev-ros/octomap_msgs-9999
+++ b/metadata/md5-cache/dev-ros/octomap_msgs-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=55ef4cfd2f983819942a7afa2bfe1328
diff --git a/metadata/md5-cache/dev-ros/octomap_ros-0.4.0-r1 b/metadata/md5-cache/dev-ros/octomap_ros-0.4.0-r1
index 203305bc986b..e0ca118a4b09 100644
--- a/metadata/md5-cache/dev-ros/octomap_ros-0.4.0-r1
+++ b/metadata/md5-cache/dev-ros/octomap_ros-0.4.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/tf dev-ros/pcl_ros sci-libs/octomap dev-ros/octomap_msgs[ros_mes
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/OctoMap/octomap_ros/archive/0.4.0.tar.gz -> octomap_ros-0.4.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ff85d2fd879999793bcff8c3b0fde24f
diff --git a/metadata/md5-cache/dev-ros/octomap_ros-9999 b/metadata/md5-cache/dev-ros/octomap_ros-9999
index 0ec11b02cac1..308012bb2539 100644
--- a/metadata/md5-cache/dev-ros/octomap_ros-9999
+++ b/metadata/md5-cache/dev-ros/octomap_ros-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/tf dev-ros/pcl_ros sci-libs/octomap dev-ros/octomap_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=ff85d2fd879999793bcff8c3b0fde24f
diff --git a/metadata/md5-cache/dev-ros/opencv_apps-2.0.0-r1 b/metadata/md5-cache/dev-ros/opencv_apps-2.0.0-r1
index ac862cd940d3..81da7c9c69fd 100644
--- a/metadata/md5-cache/dev-ros/opencv_apps-2.0.0-r1
+++ b/metadata/md5-cache/dev-ros/opencv_apps-2.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python2_7(-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/opencv_apps/archive/2.0.0.tar.gz -> opencv_apps-2.0.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=226610f1674c16c628040e3206cd8f71
diff --git a/metadata/md5-cache/dev-ros/opencv_apps-9999 b/metadata/md5-cache/dev-ros/opencv_apps-9999
index 3b44abaeb69f..aea72ef564e3 100644
--- a/metadata/md5-cache/dev-ros/opencv_apps-9999
+++ b/metadata/md5-cache/dev-ros/opencv_apps-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp >=media-libs/opencv-3.3:0=[contrib] 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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=226610f1674c16c628040e3206cd8f71
diff --git a/metadata/md5-cache/dev-ros/opencv_tests-1.12.1-r1 b/metadata/md5-cache/dev-ros/opencv_tests-1.12.1-r1
index d8659184bc6d..e640a4f1521c 100644
--- a/metadata/md5-cache/dev-ros/opencv_tests-1.12.1-r1
+++ b/metadata/md5-cache/dev-ros/opencv_tests-1.12.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.1.tar.gz -> vision_opencv-1.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=189572adf96e0296719177bd0bb91903
diff --git a/metadata/md5-cache/dev-ros/opencv_tests-1.12.2 b/metadata/md5-cache/dev-ros/opencv_tests-1.12.2
index d05c9bdd63fa..d1e73b0f315f 100644
--- a/metadata/md5-cache/dev-ros/opencv_tests-1.12.2
+++ b/metadata/md5-cache/dev-ros/opencv_tests-1.12.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.2.tar.gz -> vision_opencv-1.12.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=189572adf96e0296719177bd0bb91903
diff --git a/metadata/md5-cache/dev-ros/opencv_tests-1.12.3 b/metadata/md5-cache/dev-ros/opencv_tests-1.12.3
index 464ed7cf53bd..6af3184ea26e 100644
--- a/metadata/md5-cache/dev-ros/opencv_tests-1.12.3
+++ b/metadata/md5-cache/dev-ros/opencv_tests-1.12.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.3.tar.gz -> vision_opencv-1.12.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=189572adf96e0296719177bd0bb91903
diff --git a/metadata/md5-cache/dev-ros/opencv_tests-1.12.4 b/metadata/md5-cache/dev-ros/opencv_tests-1.12.4
index dcbbc152f72a..c6d8fe31b099 100644
--- a/metadata/md5-cache/dev-ros/opencv_tests-1.12.4
+++ b/metadata/md5-cache/dev-ros/opencv_tests-1.12.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.4.tar.gz -> vision_opencv-1.12.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b7bbeabe7ec9cf5a166e246d54734d83
diff --git a/metadata/md5-cache/dev-ros/opencv_tests-1.12.5 b/metadata/md5-cache/dev-ros/opencv_tests-1.12.5
index 3a8eb822c08a..7b480829bd1b 100644
--- a/metadata/md5-cache/dev-ros/opencv_tests-1.12.5
+++ b/metadata/md5-cache/dev-ros/opencv_tests-1.12.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.5.tar.gz -> vision_opencv-1.12.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b7bbeabe7ec9cf5a166e246d54734d83
diff --git a/metadata/md5-cache/dev-ros/opencv_tests-1.12.7 b/metadata/md5-cache/dev-ros/opencv_tests-1.12.7
index 8a3566ce57d5..e321dbd82498 100644
--- a/metadata/md5-cache/dev-ros/opencv_tests-1.12.7
+++ b/metadata/md5-cache/dev-ros/opencv_tests-1.12.7
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.7.tar.gz -> vision_opencv-1.12.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b7bbeabe7ec9cf5a166e246d54734d83
diff --git a/metadata/md5-cache/dev-ros/opencv_tests-1.12.8 b/metadata/md5-cache/dev-ros/opencv_tests-1.12.8
index 32f431f12f31..e291cf9f539f 100644
--- a/metadata/md5-cache/dev-ros/opencv_tests-1.12.8
+++ b/metadata/md5-cache/dev-ros/opencv_tests-1.12.8
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.8.tar.gz -> vision_opencv-1.12.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=94b6a648e2a9afc510d165d8c9392f81
diff --git a/metadata/md5-cache/dev-ros/opencv_tests-1.13.0 b/metadata/md5-cache/dev-ros/opencv_tests-1.13.0
index d2180af4dedc..a802a292dfac 100644
--- a/metadata/md5-cache/dev-ros/opencv_tests-1.13.0
+++ b/metadata/md5-cache/dev-ros/opencv_tests-1.13.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.13.0.tar.gz -> vision_opencv-1.13.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=94b6a648e2a9afc510d165d8c9392f81
diff --git a/metadata/md5-cache/dev-ros/opencv_tests-9999 b/metadata/md5-cache/dev-ros/opencv_tests-9999
index 37515036f7a2..4ceb53c42fb9 100644
--- a/metadata/md5-cache/dev-ros/opencv_tests-9999
+++ b/metadata/md5-cache/dev-ros/opencv_tests-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/opencv[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[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_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=189572adf96e0296719177bd0bb91903
diff --git a/metadata/md5-cache/dev-ros/openni2_camera-0.3.0-r1 b/metadata/md5-cache/dev-ros/openni2_camera-0.3.0-r1
index 92ec2a595da6..aa9d35b2b390 100644
--- a/metadata/md5-cache/dev-ros/openni2_camera-0.3.0-r1
+++ b/metadata/md5-cache/dev-ros/openni2_camera-0.3.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reco
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/openni2_camera/archive/0.3.0.tar.gz -> openni2_camera-0.3.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bd815a6dbd70ad6e3fb155e20c641263
diff --git a/metadata/md5-cache/dev-ros/openni2_camera-0.4.0 b/metadata/md5-cache/dev-ros/openni2_camera-0.4.0
index 8e34af4edff6..3c7e0a7e0ec9 100644
--- a/metadata/md5-cache/dev-ros/openni2_camera-0.4.0
+++ b/metadata/md5-cache/dev-ros/openni2_camera-0.4.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reco
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/openni2_camera/archive/0.4.0.tar.gz -> openni2_camera-0.4.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b4292f379975af5cb6c143a69b729f5e
diff --git a/metadata/md5-cache/dev-ros/openni2_camera-9999 b/metadata/md5-cache/dev-ros/openni2_camera-9999
index 65e07afa10dd..9eaf31e03559 100644
--- a/metadata/md5-cache/dev-ros/openni2_camera-9999
+++ b/metadata/md5-cache/dev-ros/openni2_camera-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/OpenNI2 dev-libs/boost:=[threads] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=bd815a6dbd70ad6e3fb155e20c641263
diff --git a/metadata/md5-cache/dev-ros/openni2_launch-0.4.0 b/metadata/md5-cache/dev-ros/openni2_launch-0.4.0
index f2f1f04f5945..7397cefb64e8 100644
--- a/metadata/md5-cache/dev-ros/openni2_launch-0.4.0
+++ b/metadata/md5-cache/dev-ros/openni2_launch-0.4.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rgbd_launch dev-ros/depth_image_proc dev-ros/image_proc dev-ros/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/openni2_camera/archive/0.4.0.tar.gz -> openni2_camera-0.4.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3b9fe557c39ac443487a60251f8603bc
diff --git a/metadata/md5-cache/dev-ros/openni2_launch-9999 b/metadata/md5-cache/dev-ros/openni2_launch-9999
index a8cd263406dd..bc9e4a86c0c7 100644
--- a/metadata/md5-cache/dev-ros/openni2_launch-9999
+++ b/metadata/md5-cache/dev-ros/openni2_launch-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rgbd_launch dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/openni2_camera dev-ros/tf python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=1a47b31f5093f8d1960fb09222f17652
diff --git a/metadata/md5-cache/dev-ros/openslam_gmapping-0.1.1 b/metadata/md5-cache/dev-ros/openslam_gmapping-0.1.1
index dfcdaa9c91f5..7511ba7f2e00 100644
--- a/metadata/md5-cache/dev-ros/openslam_gmapping-0.1.1
+++ b/metadata/md5-cache/dev-ros/openslam_gmapping-0.1.1
@@ -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/ros-perception/openslam_gmapping/archive/0.1.1.tar.gz -> openslam_gmapping-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d7575bfe62a428f249ab7c351b5722b2
diff --git a/metadata/md5-cache/dev-ros/openslam_gmapping-0.1.2 b/metadata/md5-cache/dev-ros/openslam_gmapping-0.1.2
index 1234f755b47b..5e47aab6604b 100644
--- a/metadata/md5-cache/dev-ros/openslam_gmapping-0.1.2
+++ b/metadata/md5-cache/dev-ros/openslam_gmapping-0.1.2
@@ -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/ros-perception/openslam_gmapping/archive/0.1.2.tar.gz -> openslam_gmapping-0.1.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=865a855c5b66abde933aa0a5a2c3970a
diff --git a/metadata/md5-cache/dev-ros/openslam_gmapping-9999 b/metadata/md5-cache/dev-ros/openslam_gmapping-9999
index e82614f23973..d5aff2c32f65 100644
--- a/metadata/md5-cache/dev-ros/openslam_gmapping-9999
+++ b/metadata/md5-cache/dev-ros/openslam_gmapping-9999
@@ -8,5 +8,5 @@ LICENSE=CC-BY-NC-SA-2.5
 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=d7575bfe62a428f249ab7c351b5722b2
diff --git a/metadata/md5-cache/dev-ros/pcl_conversions-0.2.1-r1 b/metadata/md5-cache/dev-ros/pcl_conversions-0.2.1-r1
index 8511a87a625a..a7c50e0d834b 100644
--- a/metadata/md5-cache/dev-ros/pcl_conversions-0.2.1-r1
+++ b/metadata/md5-cache/dev-ros/pcl_conversions-0.2.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp sci-libs/pcl:= dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/pcl_conversions/archive/0.2.1.tar.gz -> pcl_conversions-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=db72db226a56ebd4674efeec02a267d3
diff --git a/metadata/md5-cache/dev-ros/pcl_conversions-1.6.1 b/metadata/md5-cache/dev-ros/pcl_conversions-1.6.1
index e565cbac8479..b714a661f7be 100644
--- a/metadata/md5-cache/dev-ros/pcl_conversions-1.6.1
+++ b/metadata/md5-cache/dev-ros/pcl_conversions-1.6.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp sci-libs/pcl:= dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/perception_pcl/archive/1.6.1.tar.gz -> perception_pcl-1.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7443d51432724b4b3f37e412f3d44164
diff --git a/metadata/md5-cache/dev-ros/pcl_conversions-1.6.2 b/metadata/md5-cache/dev-ros/pcl_conversions-1.6.2
index c9b251872cdb..060e55d2c1a8 100644
--- a/metadata/md5-cache/dev-ros/pcl_conversions-1.6.2
+++ b/metadata/md5-cache/dev-ros/pcl_conversions-1.6.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp sci-libs/pcl:= dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/perception_pcl/archive/1.6.2.tar.gz -> perception_pcl-1.6.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=7443d51432724b4b3f37e412f3d44164
diff --git a/metadata/md5-cache/dev-ros/pcl_conversions-9999 b/metadata/md5-cache/dev-ros/pcl_conversions-9999
index 4412f57cb94d..d8a85af432d8 100644
--- a/metadata/md5-cache/dev-ros/pcl_conversions-9999
+++ b/metadata/md5-cache/dev-ros/pcl_conversions-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp sci-libs/pcl:= dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=7443d51432724b4b3f37e412f3d44164
diff --git a/metadata/md5-cache/dev-ros/pcl_msgs-0.2.0 b/metadata/md5-cache/dev-ros/pcl_msgs-0.2.0
index d451355ea748..b1ffd88d8cde 100644
--- a/metadata/md5-cache/dev-ros/pcl_msgs-0.2.0
+++ b/metadata/md5-cache/dev-ros/pcl_msgs-0.2.0
@@ -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/ros-perception/pcl_msgs/archive/0.2.0.tar.gz -> pcl_msgs-0.2.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=705cc9935115f67df93218476da8c104
diff --git a/metadata/md5-cache/dev-ros/pcl_msgs-9999 b/metadata/md5-cache/dev-ros/pcl_msgs-9999
index ab988b7ef1b7..2f95f9f22ad7 100644
--- a/metadata/md5-cache/dev-ros/pcl_msgs-9999
+++ b/metadata/md5-cache/dev-ros/pcl_msgs-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=705cc9935115f67df93218476da8c104
diff --git a/metadata/md5-cache/dev-ros/pcl_ros-1.5.4 b/metadata/md5-cache/dev-ros/pcl_ros-1.5.4
index 27164324c3e3..da6bf72f0c2e 100644
--- a/metadata/md5-cache/dev-ros/pcl_ros-1.5.4
+++ b/metadata/md5-cache/dev-ros/pcl_ros-1.5.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/perception_pcl/archive/1.5.4.tar.gz -> perception_pcl-1.5.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=dd8e1db59c430ec128c068ff6ee38854
diff --git a/metadata/md5-cache/dev-ros/pcl_ros-1.6.1 b/metadata/md5-cache/dev-ros/pcl_ros-1.6.1
index 6b3421bc0a97..8bd73b47c189 100644
--- a/metadata/md5-cache/dev-ros/pcl_ros-1.6.1
+++ b/metadata/md5-cache/dev-ros/pcl_ros-1.6.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/perception_pcl/archive/1.6.1.tar.gz -> perception_pcl-1.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0b30dd79e662c01c35378c6cb819baf8
diff --git a/metadata/md5-cache/dev-ros/pcl_ros-1.6.2 b/metadata/md5-cache/dev-ros/pcl_ros-1.6.2
index e6c8c0ea9568..1e9aad358cac 100644
--- a/metadata/md5-cache/dev-ros/pcl_ros-1.6.2
+++ b/metadata/md5-cache/dev-ros/pcl_ros-1.6.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/perception_pcl/archive/1.6.2.tar.gz -> perception_pcl-1.6.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=0b30dd79e662c01c35378c6cb819baf8
diff --git a/metadata/md5-cache/dev-ros/pcl_ros-9999 b/metadata/md5-cache/dev-ros/pcl_ros-9999
index 13448d439c7c..ed1fba7ef6a5 100644
--- a/metadata/md5-cache/dev-ros/pcl_ros-9999
+++ b/metadata/md5-cache/dev-ros/pcl_ros-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib dev-libs/console_bridge:= dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_eigen dev-ros/nodelet dev-ros/nodelet_topic_tools sci-libs/pcl:=[qhull] >=dev-ros/pcl_conversions-0.2.1-r1 dev-libs/boost:=[threads] dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=0b30dd79e662c01c35378c6cb819baf8
diff --git a/metadata/md5-cache/dev-ros/pluginlib-1.12.0-r1 b/metadata/md5-cache/dev-ros/pluginlib-1.12.0-r1
index f0daba1609f1..eed426a748e0 100644
--- a/metadata/md5-cache/dev-ros/pluginlib-1.12.0-r1
+++ b/metadata/md5-cache/dev-ros/pluginlib-1.12.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/class_loader-0.3.5:= dev-ros/rosconsole dev-ros/roslib[python_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/pluginlib/archive/1.12.0.tar.gz -> pluginlib-1.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=763cc2f23a33ea34af65fa9abaa53126
diff --git a/metadata/md5-cache/dev-ros/pluginlib-1.12.1 b/metadata/md5-cache/dev-ros/pluginlib-1.12.1
index 7c1bc32e89bd..b3d9927cca8f 100644
--- a/metadata/md5-cache/dev-ros/pluginlib-1.12.1
+++ b/metadata/md5-cache/dev-ros/pluginlib-1.12.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/class_loader-0.3.5:= dev-ros/rosconsole dev-ros/roslib[python_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/pluginlib/archive/1.12.1.tar.gz -> pluginlib-1.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=763cc2f23a33ea34af65fa9abaa53126
diff --git a/metadata/md5-cache/dev-ros/pluginlib-9999 b/metadata/md5-cache/dev-ros/pluginlib-9999
index 87a073d2c4b4..e8fbd5f829b3 100644
--- a/metadata/md5-cache/dev-ros/pluginlib-9999
+++ b/metadata/md5-cache/dev-ros/pluginlib-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-ros/class_loader-0.3.5:= dev-ros/rosconsole dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= dev-libs/tinyxml2:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=763cc2f23a33ea34af65fa9abaa53126
diff --git a/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.1.10-r1 b/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.1.10-r1
index ccd4c38bde37..ba6d57286ac1 100644
--- a/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.1.10-r1
+++ b/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.1.10-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/common_tutorials/archive/0.1.10.tar.gz -> common_tutorials-0.1.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e427b72da6e4532d56a69c9308004af1
diff --git a/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.1.11 b/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.1.11
index 7963a75242c5..b225e6564b17 100644
--- a/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.1.11
+++ b/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.1.11
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/common_tutorials/archive/0.1.11.tar.gz -> common_tutorials-0.1.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2abe9f32d2506f90132a002bc43b5ed4
diff --git a/metadata/md5-cache/dev-ros/pluginlib_tutorials-9999 b/metadata/md5-cache/dev-ros/pluginlib_tutorials-9999
index 80fa4071e452..1a92e7f6a018 100644
--- a/metadata/md5-cache/dev-ros/pluginlib_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/pluginlib_tutorials-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=e427b72da6e4532d56a69c9308004af1
diff --git a/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-1.4.0-r1 b/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-1.4.0-r1
index bb944dd3eee5..c0ed2a2338ad 100644
--- a/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-1.4.0-r1
+++ b/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-1.4.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/roscpp dev-ros/sensor_ms
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/pointcloud_to_laserscan/archive/1.4.0.tar.gz -> pointcloud_to_laserscan-1.4.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3aaa9ed4630449ed87ce22d7ab6e06cd
diff --git a/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-9999 b/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-9999
index 39b138e0ba17..5a7fd030a1bd 100644
--- a/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-9999
+++ b/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_sensor_msgs dev-libs/boost:= dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=3aaa9ed4630449ed87ce22d7ab6e06cd
diff --git a/metadata/md5-cache/dev-ros/polled_camera-1.11.12 b/metadata/md5-cache/dev-ros/polled_camera-1.11.12
index 89c7888df4bc..66db1063603b 100644
--- a/metadata/md5-cache/dev-ros/polled_camera-1.11.12
+++ b/metadata/md5-cache/dev-ros/polled_camera-1.11.12
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole python_targets
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.12.tar.gz -> image_common-1.11.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f5a70770c8a61a7c3a775dbce7d8d0a8
diff --git a/metadata/md5-cache/dev-ros/polled_camera-1.11.13 b/metadata/md5-cache/dev-ros/polled_camera-1.11.13
index 7d973b344581..238365a3efbe 100644
--- a/metadata/md5-cache/dev-ros/polled_camera-1.11.13
+++ b/metadata/md5-cache/dev-ros/polled_camera-1.11.13
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole python_targets
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.13.tar.gz -> image_common-1.11.13.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f5a70770c8a61a7c3a775dbce7d8d0a8
diff --git a/metadata/md5-cache/dev-ros/polled_camera-9999 b/metadata/md5-cache/dev-ros/polled_camera-9999
index 04ece7290c81..9d0e479267ec 100644
--- a/metadata/md5-cache/dev-ros/polled_camera-9999
+++ b/metadata/md5-cache/dev-ros/polled_camera-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=f5a70770c8a61a7c3a775dbce7d8d0a8
diff --git a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.10 b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.10
index 8af41674632a..2398feb90405 100644
--- a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.10
+++ b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.10
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.11.10.tar.gz -> pr2_common-1.11.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=61a317b776b3f153d86250e50baed06e
diff --git a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.11 b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.11
index 1a2e5fea7001..d2a84def8d09 100644
--- a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.11
+++ b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.11
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.11.11.tar.gz -> pr2_common-1.11.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=61a317b776b3f153d86250e50baed06e
diff --git a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.13 b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.13
index cbed1f669776..ba69d2e5d3b9 100644
--- a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.13
+++ b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.13
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.11.13.tar.gz -> pr2_common-1.11.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=61a317b776b3f153d86250e50baed06e
diff --git a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.14 b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.14
index 355ca39e1122..05ed92287987 100644
--- a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.14
+++ b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.14
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.11.14.tar.gz -> pr2_common-1.11.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=61a317b776b3f153d86250e50baed06e
diff --git a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.9 b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.9
index 6686a4cc185e..b14ae7e6d5ac 100644
--- a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.9
+++ b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.9
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.11.9.tar.gz -> pr2_common-1.11.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=61a317b776b3f153d86250e50baed06e
diff --git a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.0 b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.0
index eed729dabda3..410ff0048d84 100644
--- a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.0
+++ b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.0.tar.gz -> pr2_common-1.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=61a317b776b3f153d86250e50baed06e
diff --git a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.1 b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.1
index 44a8dd300dbf..ca3ee5c3807c 100644
--- a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.1
+++ b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.1.tar.gz -> pr2_common-1.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=dc9605e47fb2e2f047e0df2958b80bd6
diff --git a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.2 b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.2
index b204b098cd2d..dca971609fc0 100644
--- a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.2
+++ b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.2.tar.gz -> pr2_common-1.12.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=dc9605e47fb2e2f047e0df2958b80bd6
diff --git a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.3 b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.3
new file mode 100644
index 000000000000..551996e37d72
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Aggregates all of the topics that a 'pr2_dashboard' app might be interested in
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/pr2_dashboard_aggregator https://github.com/pr2/pr2_common
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.3.tar.gz -> pr2_common-1.12.3.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_=fff9c38e2aa41ac9c3d90ed693d19bd0
diff --git a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-9999 b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-9999
index dca8839384bd..67a00607ea78 100644
--- a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-9999
+++ b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=61a317b776b3f153d86250e50baed06e
diff --git a/metadata/md5-cache/dev-ros/pr2_description-1.12.0 b/metadata/md5-cache/dev-ros/pr2_description-1.12.0
index a9a523b7b374..a6586d5b2fdc 100644
--- a/metadata/md5-cache/dev-ros/pr2_description-1.12.0
+++ b/metadata/md5-cache/dev-ros/pr2_description-1.12.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/xacro[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.0.tar.gz -> pr2_common-1.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6bc9dc98e95448a69c9387ece4edc067
diff --git a/metadata/md5-cache/dev-ros/pr2_description-1.12.1 b/metadata/md5-cache/dev-ros/pr2_description-1.12.1
index a960c335055a..23eee43f7c12 100644
--- a/metadata/md5-cache/dev-ros/pr2_description-1.12.1
+++ b/metadata/md5-cache/dev-ros/pr2_description-1.12.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/xacro[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.1.tar.gz -> pr2_common-1.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f9a38f2cf273cf4553b1c97c90da1e66
diff --git a/metadata/md5-cache/dev-ros/pr2_description-1.12.2 b/metadata/md5-cache/dev-ros/pr2_description-1.12.2
index f12942afae03..42b1319448e8 100644
--- a/metadata/md5-cache/dev-ros/pr2_description-1.12.2
+++ b/metadata/md5-cache/dev-ros/pr2_description-1.12.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/xacro[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.2.tar.gz -> pr2_common-1.12.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=f9a38f2cf273cf4553b1c97c90da1e66
diff --git a/metadata/md5-cache/dev-ros/pr2_description-1.12.3 b/metadata/md5-cache/dev-ros/pr2_description-1.12.3
new file mode 100644
index 000000000000..f7b574b557c7
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/pr2_description-1.12.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/xacro[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/convex_decomposition dev-ros/ivcon test? ( dev-libs/urdfdom 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=Description (mechanical, kinematic, visual, etc.) of the PR2 robot
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/pr2_description https://github.com/pr2/pr2_common
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/xacro[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/pr2/pr2_common/archive/1.12.3.tar.gz -> pr2_common-1.12.3.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_=f1f1539c9d5a6c526b537295d1c09156
diff --git a/metadata/md5-cache/dev-ros/pr2_description-9999 b/metadata/md5-cache/dev-ros/pr2_description-9999
index 452ca223b6ae..f11905525473 100644
--- a/metadata/md5-cache/dev-ros/pr2_description-9999
+++ b/metadata/md5-cache/dev-ros/pr2_description-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/xacro[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_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=6bc9dc98e95448a69c9387ece4edc067
+_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	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_=f1f1539c9d5a6c526b537295d1c09156
diff --git a/metadata/md5-cache/dev-ros/pr2_machine-1.11.10 b/metadata/md5-cache/dev-ros/pr2_machine-1.11.10
index 8dd2abde02b7..007a03b9e6ba 100644
--- a/metadata/md5-cache/dev-ros/pr2_machine-1.11.10
+++ b/metadata/md5-cache/dev-ros/pr2_machine-1.11.10
@@ -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/pr2/pr2_common/archive/1.11.10.tar.gz -> pr2_common-1.11.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cd34aa75928710a6e973ec4da579a980
diff --git a/metadata/md5-cache/dev-ros/pr2_machine-1.11.11 b/metadata/md5-cache/dev-ros/pr2_machine-1.11.11
index b8f22944f670..708d48549711 100644
--- a/metadata/md5-cache/dev-ros/pr2_machine-1.11.11
+++ b/metadata/md5-cache/dev-ros/pr2_machine-1.11.11
@@ -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/pr2/pr2_common/archive/1.11.11.tar.gz -> pr2_common-1.11.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cd34aa75928710a6e973ec4da579a980
diff --git a/metadata/md5-cache/dev-ros/pr2_machine-1.11.13 b/metadata/md5-cache/dev-ros/pr2_machine-1.11.13
index 24f370484106..ae1fe2ee0608 100644
--- a/metadata/md5-cache/dev-ros/pr2_machine-1.11.13
+++ b/metadata/md5-cache/dev-ros/pr2_machine-1.11.13
@@ -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/pr2/pr2_common/archive/1.11.13.tar.gz -> pr2_common-1.11.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cd34aa75928710a6e973ec4da579a980
diff --git a/metadata/md5-cache/dev-ros/pr2_machine-1.11.14 b/metadata/md5-cache/dev-ros/pr2_machine-1.11.14
index aea960e48793..3cb56d3597ef 100644
--- a/metadata/md5-cache/dev-ros/pr2_machine-1.11.14
+++ b/metadata/md5-cache/dev-ros/pr2_machine-1.11.14
@@ -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/pr2/pr2_common/archive/1.11.14.tar.gz -> pr2_common-1.11.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cd34aa75928710a6e973ec4da579a980
diff --git a/metadata/md5-cache/dev-ros/pr2_machine-1.11.9 b/metadata/md5-cache/dev-ros/pr2_machine-1.11.9
index 0719aa49ddb1..7096dc7124af 100644
--- a/metadata/md5-cache/dev-ros/pr2_machine-1.11.9
+++ b/metadata/md5-cache/dev-ros/pr2_machine-1.11.9
@@ -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/pr2/pr2_common/archive/1.11.9.tar.gz -> pr2_common-1.11.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cd34aa75928710a6e973ec4da579a980
diff --git a/metadata/md5-cache/dev-ros/pr2_machine-1.12.0 b/metadata/md5-cache/dev-ros/pr2_machine-1.12.0
index 8d85a56f8219..04a0e1fb0033 100644
--- a/metadata/md5-cache/dev-ros/pr2_machine-1.12.0
+++ b/metadata/md5-cache/dev-ros/pr2_machine-1.12.0
@@ -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/pr2/pr2_common/archive/1.12.0.tar.gz -> pr2_common-1.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cd34aa75928710a6e973ec4da579a980
diff --git a/metadata/md5-cache/dev-ros/pr2_machine-1.12.1 b/metadata/md5-cache/dev-ros/pr2_machine-1.12.1
index 3206e6b157ca..bcb34c71c086 100644
--- a/metadata/md5-cache/dev-ros/pr2_machine-1.12.1
+++ b/metadata/md5-cache/dev-ros/pr2_machine-1.12.1
@@ -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/pr2/pr2_common/archive/1.12.1.tar.gz -> pr2_common-1.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3fff3957bb7bdf1d38c2c3caa1720665
diff --git a/metadata/md5-cache/dev-ros/pr2_machine-1.12.2 b/metadata/md5-cache/dev-ros/pr2_machine-1.12.2
index 05dd89eb8cc0..94b025f7ccd0 100644
--- a/metadata/md5-cache/dev-ros/pr2_machine-1.12.2
+++ b/metadata/md5-cache/dev-ros/pr2_machine-1.12.2
@@ -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/pr2/pr2_common/archive/1.12.2.tar.gz -> pr2_common-1.12.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=3fff3957bb7bdf1d38c2c3caa1720665
diff --git a/metadata/md5-cache/dev-ros/pr2_machine-1.12.3 b/metadata/md5-cache/dev-ros/pr2_machine-1.12.3
new file mode 100644
index 000000000000..6c20a0f643f4
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/pr2_machine-1.12.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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=xxx.machine files that describe the different hosts a node can be spawned on
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/pr2_machine https://github.com/pr2/pr2_common
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.3.tar.gz -> pr2_common-1.12.3.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_=158671eb296799567fbad622edc58d2f
diff --git a/metadata/md5-cache/dev-ros/pr2_machine-9999 b/metadata/md5-cache/dev-ros/pr2_machine-9999
index 03fd6d59aca3..2a089b09f7cb 100644
--- a/metadata/md5-cache/dev-ros/pr2_machine-9999
+++ b/metadata/md5-cache/dev-ros/pr2_machine-9999
@@ -8,5 +8,5 @@ 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=cd34aa75928710a6e973ec4da579a980
diff --git a/metadata/md5-cache/dev-ros/pr2_msgs-1.12.0 b/metadata/md5-cache/dev-ros/pr2_msgs-1.12.0
index 197209af1c96..ce61b7ae5947 100644
--- a/metadata/md5-cache/dev-ros/pr2_msgs-1.12.0
+++ b/metadata/md5-cache/dev-ros/pr2_msgs-1.12.0
@@ -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/pr2/pr2_common/archive/1.12.0.tar.gz -> pr2_common-1.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3f18d6d3f290c4f1b3e8ca9946675e54
diff --git a/metadata/md5-cache/dev-ros/pr2_msgs-1.12.1 b/metadata/md5-cache/dev-ros/pr2_msgs-1.12.1
index 1b1d5970cedb..db7c662c8c7f 100644
--- a/metadata/md5-cache/dev-ros/pr2_msgs-1.12.1
+++ b/metadata/md5-cache/dev-ros/pr2_msgs-1.12.1
@@ -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/pr2/pr2_common/archive/1.12.1.tar.gz -> pr2_common-1.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d5e40eb0de13ca39bc1e372824e19c98
diff --git a/metadata/md5-cache/dev-ros/pr2_msgs-1.12.2 b/metadata/md5-cache/dev-ros/pr2_msgs-1.12.2
index 522cdf49c9a7..a76c73c2b718 100644
--- a/metadata/md5-cache/dev-ros/pr2_msgs-1.12.2
+++ b/metadata/md5-cache/dev-ros/pr2_msgs-1.12.2
@@ -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/pr2/pr2_common/archive/1.12.2.tar.gz -> pr2_common-1.12.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=d5e40eb0de13ca39bc1e372824e19c98
diff --git a/metadata/md5-cache/dev-ros/pr2_msgs-1.12.3 b/metadata/md5-cache/dev-ros/pr2_msgs-1.12.3
new file mode 100644
index 000000000000..51531ea157ba
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/pr2_msgs-1.12.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=Messages for representing PR2 state, such as battery information and the PR2 fingertip sensors
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/pr2_msgs https://github.com/pr2/pr2_common
+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=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.3.tar.gz -> pr2_common-1.12.3.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_=ae493496201183111dadad8986fcb3e2
diff --git a/metadata/md5-cache/dev-ros/pr2_msgs-9999 b/metadata/md5-cache/dev-ros/pr2_msgs-9999
index 2c2daf5ee623..8a57ecdc081b 100644
--- a/metadata/md5-cache/dev-ros/pr2_msgs-9999
+++ b/metadata/md5-cache/dev-ros/pr2_msgs-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=3f18d6d3f290c4f1b3e8ca9946675e54
diff --git a/metadata/md5-cache/dev-ros/python_qt_binding-0.3.2 b/metadata/md5-cache/dev-ros/python_qt_binding-0.3.2
index f77df38a5bdd..cd6a8595aecf 100644
--- a/metadata/md5-cache/dev-ros/python_qt_binding-0.3.2
+++ b/metadata/md5-cache/dev-ros/python_qt_binding-0.3.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,-python_single
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/python_qt_binding/archive/0.3.2.tar.gz -> python_qt_binding-0.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=294274722fa23a8df3d6c0dcc66d0774
diff --git a/metadata/md5-cache/dev-ros/python_qt_binding-0.3.3 b/metadata/md5-cache/dev-ros/python_qt_binding-0.3.3
index a97d84400199..fda7b5564166 100644
--- a/metadata/md5-cache/dev-ros/python_qt_binding-0.3.3
+++ b/metadata/md5-cache/dev-ros/python_qt_binding-0.3.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,-python_single
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/python_qt_binding/archive/0.3.3.tar.gz -> python_qt_binding-0.3.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=294274722fa23a8df3d6c0dcc66d0774
diff --git a/metadata/md5-cache/dev-ros/python_qt_binding-0.3.4 b/metadata/md5-cache/dev-ros/python_qt_binding-0.3.4
index 6983742a3cdc..e1f16d863035 100644
--- a/metadata/md5-cache/dev-ros/python_qt_binding-0.3.4
+++ b/metadata/md5-cache/dev-ros/python_qt_binding-0.3.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,-python_single
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/python_qt_binding/archive/0.3.4.tar.gz -> python_qt_binding-0.3.4.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b4bc9e65ec3daf39cf8d6948dcfb244a
diff --git a/metadata/md5-cache/dev-ros/python_qt_binding-9999 b/metadata/md5-cache/dev-ros/python_qt_binding-9999
index 94c4d5e56b13..68983f24ddb8 100644
--- a/metadata/md5-cache/dev-ros/python_qt_binding-9999
+++ b/metadata/md5-cache/dev-ros/python_qt_binding-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=294274722fa23a8df3d6c0dcc66d0774
diff --git a/metadata/md5-cache/dev-ros/qt_dotgraph-0.2.29 b/metadata/md5-cache/dev-ros/qt_dotgraph-0.2.29
index 555f687c5ee6..5892a9665276 100644
--- a/metadata/md5-cache/dev-ros/qt_dotgraph-0.2.29
+++ b/metadata/md5-cache/dev-ros/qt_dotgraph-0.2.29
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pydot[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.2.29.tar.gz -> qt_gui_core-0.2.29.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=148cbcd522aab4758835328913793453
diff --git a/metadata/md5-cache/dev-ros/qt_dotgraph-0.2.30 b/metadata/md5-cache/dev-ros/qt_dotgraph-0.2.30
index 4877dda7583e..e7ea3851f4c1 100644
--- a/metadata/md5-cache/dev-ros/qt_dotgraph-0.2.30
+++ b/metadata/md5-cache/dev-ros/qt_dotgraph-0.2.30
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pydot[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.2.30.tar.gz -> qt_gui_core-0.2.30.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=148cbcd522aab4758835328913793453
diff --git a/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.0 b/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.0
index 682a9960b3fe..422d0f6751bb 100644
--- a/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.0
+++ b/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pydot[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.0.tar.gz -> qt_gui_core-0.3.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cea5507f08083b51d67de6b8acb47242
diff --git a/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.1 b/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.1
index 19a212d03e8a..99fc77044164 100644
--- a/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.1
+++ b/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pydot[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.1.tar.gz -> qt_gui_core-0.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cea5507f08083b51d67de6b8acb47242
diff --git a/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.10 b/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.10
index 306ab7032ba8..68059eb75d6a 100644
--- a/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.10
+++ b/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.10
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pydot[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.10.tar.gz -> qt_gui_core-0.3.10.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=dbfe7832a166facf273a3f0f7cea1e8a
diff --git a/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.11 b/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.11
index 07d1f4fb6c5c..b4f8e39603a6 100644
--- a/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.11
+++ b/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.11
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pydot[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.11.tar.gz -> qt_gui_core-0.3.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=dbfe7832a166facf273a3f0f7cea1e8a
diff --git a/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.2 b/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.2
index 3d4cafb25e73..64f7b72d2139 100644
--- a/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.2
+++ b/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pydot[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.2.tar.gz -> qt_gui_core-0.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=cea5507f08083b51d67de6b8acb47242
diff --git a/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.3 b/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.3
index f0a283c03e59..4a74914b90e8 100644
--- a/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.3
+++ b/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pydot[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.3.tar.gz -> qt_gui_core-0.3.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a0cb3f6dbd2b6979d835fb2a1e76bc62
diff --git a/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.4 b/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.4
index 075969ea8ad6..188ff60ca27c 100644
--- a/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.4
+++ b/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pydot[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.4.tar.gz -> qt_gui_core-0.3.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=32a4ff2e7b0a33ae3b9586a2245d0a10
diff --git a/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.5 b/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.5
index 142bd0045f4f..a68760b7dd30 100644
--- a/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.5
+++ b/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pydot[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.5.tar.gz -> qt_gui_core-0.3.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=32a4ff2e7b0a33ae3b9586a2245d0a10
diff --git a/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.6 b/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.6
index f515d2a8c1ed..d967c953f836 100644
--- a/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.6
+++ b/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pydot[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.6.tar.gz -> qt_gui_core-0.3.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=32a4ff2e7b0a33ae3b9586a2245d0a10
diff --git a/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.8 b/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.8
index e69fb7c46b9f..7381671df5a4 100644
--- a/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.8
+++ b/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.8
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pydot[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.8.tar.gz -> qt_gui_core-0.3.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=32a4ff2e7b0a33ae3b9586a2245d0a10
diff --git a/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.9 b/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.9
index a9600e2f60f3..f5b9953cb9b9 100644
--- a/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.9
+++ b/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.9
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pydot[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.9.tar.gz -> qt_gui_core-0.3.9.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=dbfe7832a166facf273a3f0f7cea1e8a
diff --git a/metadata/md5-cache/dev-ros/qt_dotgraph-9999 b/metadata/md5-cache/dev-ros/qt_dotgraph-9999
index b48285bc6601..4e4433a980a4 100644
--- a/metadata/md5-cache/dev-ros/qt_dotgraph-9999
+++ b/metadata/md5-cache/dev-ros/qt_dotgraph-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/pydot[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=cea5507f08083b51d67de6b8acb47242
diff --git a/metadata/md5-cache/dev-ros/qt_gui-0.3.10 b/metadata/md5-cache/dev-ros/qt_gui-0.3.10
index 079cd870b497..f7da44120909 100644
--- a/metadata/md5-cache/dev-ros/qt_gui-0.3.10
+++ b/metadata/md5-cache/dev-ros/qt_gui-0.3.10
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:5 dev-python/rospkg[python_targets_python2_7(-)?,-python_s
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.10.tar.gz -> qt_gui_core-0.3.10.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bd38eef50c703ab7083bbce4ba482d0c
diff --git a/metadata/md5-cache/dev-ros/qt_gui-0.3.11 b/metadata/md5-cache/dev-ros/qt_gui-0.3.11
index 368ce72ab4b6..5cdcb05a874c 100644
--- a/metadata/md5-cache/dev-ros/qt_gui-0.3.11
+++ b/metadata/md5-cache/dev-ros/qt_gui-0.3.11
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:5 dev-python/rospkg[python_targets_python2_7(-)?,-python_s
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.11.tar.gz -> qt_gui_core-0.3.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bd38eef50c703ab7083bbce4ba482d0c
diff --git a/metadata/md5-cache/dev-ros/qt_gui-0.3.4-r1 b/metadata/md5-cache/dev-ros/qt_gui-0.3.4-r1
index 7a49fe4ce5d2..72b9eb0b78ab 100644
--- a/metadata/md5-cache/dev-ros/qt_gui-0.3.4-r1
+++ b/metadata/md5-cache/dev-ros/qt_gui-0.3.4-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:5 dev-python/rospkg[python_targets_python2_7(-)?,-python_s
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.4.tar.gz -> qt_gui_core-0.3.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e0d0f4d70f697bcbf287e0b635403321
diff --git a/metadata/md5-cache/dev-ros/qt_gui-0.3.5 b/metadata/md5-cache/dev-ros/qt_gui-0.3.5
index c9be2dc15d30..75960c4efa7b 100644
--- a/metadata/md5-cache/dev-ros/qt_gui-0.3.5
+++ b/metadata/md5-cache/dev-ros/qt_gui-0.3.5
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:5 dev-python/rospkg[python_targets_python2_7(-)?,-python_s
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.5.tar.gz -> qt_gui_core-0.3.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e0d0f4d70f697bcbf287e0b635403321
diff --git a/metadata/md5-cache/dev-ros/qt_gui-0.3.6 b/metadata/md5-cache/dev-ros/qt_gui-0.3.6
index 30efff4c6ef1..36d6905b9b1d 100644
--- a/metadata/md5-cache/dev-ros/qt_gui-0.3.6
+++ b/metadata/md5-cache/dev-ros/qt_gui-0.3.6
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:5 dev-python/rospkg[python_targets_python2_7(-)?,-python_s
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.6.tar.gz -> qt_gui_core-0.3.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e0d0f4d70f697bcbf287e0b635403321
diff --git a/metadata/md5-cache/dev-ros/qt_gui-0.3.8 b/metadata/md5-cache/dev-ros/qt_gui-0.3.8
index 0daaa4b4ebf4..6780efa5a8d0 100644
--- a/metadata/md5-cache/dev-ros/qt_gui-0.3.8
+++ b/metadata/md5-cache/dev-ros/qt_gui-0.3.8
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:5 dev-python/rospkg[python_targets_python2_7(-)?,-python_s
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.8.tar.gz -> qt_gui_core-0.3.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e0d0f4d70f697bcbf287e0b635403321
diff --git a/metadata/md5-cache/dev-ros/qt_gui-0.3.9 b/metadata/md5-cache/dev-ros/qt_gui-0.3.9
index 58c0d2b3ae8c..f9d2407463c6 100644
--- a/metadata/md5-cache/dev-ros/qt_gui-0.3.9
+++ b/metadata/md5-cache/dev-ros/qt_gui-0.3.9
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:5 dev-python/rospkg[python_targets_python2_7(-)?,-python_s
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.9.tar.gz -> qt_gui_core-0.3.9.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bd38eef50c703ab7083bbce4ba482d0c
diff --git a/metadata/md5-cache/dev-ros/qt_gui-9999 b/metadata/md5-cache/dev-ros/qt_gui-9999
index 19a026f9c662..349dc3c8e289 100644
--- a/metadata/md5-cache/dev-ros/qt_gui-9999
+++ b/metadata/md5-cache/dev-ros/qt_gui-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-qt/qtcore:5 dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=e0d0f4d70f697bcbf287e0b635403321
diff --git a/metadata/md5-cache/dev-ros/qt_gui_app-0.2.29 b/metadata/md5-cache/dev-ros/qt_gui_app-0.2.29
index 4b51aaad1bff..0bb22b5957a0 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_app-0.2.29
+++ b/metadata/md5-cache/dev-ros/qt_gui_app-0.2.29
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.2.29.tar.gz -> qt_gui_core-0.2.29.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5a60d785051fd20662b8d611b308e113
diff --git a/metadata/md5-cache/dev-ros/qt_gui_app-0.2.30 b/metadata/md5-cache/dev-ros/qt_gui_app-0.2.30
index 594304ebadab..722fbaf00729 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_app-0.2.30
+++ b/metadata/md5-cache/dev-ros/qt_gui_app-0.2.30
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.2.30.tar.gz -> qt_gui_core-0.2.30.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5a60d785051fd20662b8d611b308e113
diff --git a/metadata/md5-cache/dev-ros/qt_gui_app-0.3.0 b/metadata/md5-cache/dev-ros/qt_gui_app-0.3.0
index 681036ab4ea1..78c6ed2dc849 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_app-0.3.0
+++ b/metadata/md5-cache/dev-ros/qt_gui_app-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.0.tar.gz -> qt_gui_core-0.3.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4ea2c47ecc9a06099dc9eb4508f1f8c1
diff --git a/metadata/md5-cache/dev-ros/qt_gui_app-0.3.1 b/metadata/md5-cache/dev-ros/qt_gui_app-0.3.1
index 36dd74843472..ff464b1555ef 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_app-0.3.1
+++ b/metadata/md5-cache/dev-ros/qt_gui_app-0.3.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.1.tar.gz -> qt_gui_core-0.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4ea2c47ecc9a06099dc9eb4508f1f8c1
diff --git a/metadata/md5-cache/dev-ros/qt_gui_app-0.3.10 b/metadata/md5-cache/dev-ros/qt_gui_app-0.3.10
index def9bdc419c7..0c1aea82f13d 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_app-0.3.10
+++ b/metadata/md5-cache/dev-ros/qt_gui_app-0.3.10
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.10.tar.gz -> qt_gui_core-0.3.10.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1c6cc48b2bd0562f4b48a1d565485f2e
diff --git a/metadata/md5-cache/dev-ros/qt_gui_app-0.3.11 b/metadata/md5-cache/dev-ros/qt_gui_app-0.3.11
index c89b0dc2dc3f..2f3e79e81533 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_app-0.3.11
+++ b/metadata/md5-cache/dev-ros/qt_gui_app-0.3.11
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.11.tar.gz -> qt_gui_core-0.3.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1c6cc48b2bd0562f4b48a1d565485f2e
diff --git a/metadata/md5-cache/dev-ros/qt_gui_app-0.3.2 b/metadata/md5-cache/dev-ros/qt_gui_app-0.3.2
index a5d9aa886842..a54dfcf227a4 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_app-0.3.2
+++ b/metadata/md5-cache/dev-ros/qt_gui_app-0.3.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.2.tar.gz -> qt_gui_core-0.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=4ea2c47ecc9a06099dc9eb4508f1f8c1
diff --git a/metadata/md5-cache/dev-ros/qt_gui_app-0.3.3 b/metadata/md5-cache/dev-ros/qt_gui_app-0.3.3
index 932a15bd67d9..61c663223be6 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_app-0.3.3
+++ b/metadata/md5-cache/dev-ros/qt_gui_app-0.3.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.3.tar.gz -> qt_gui_core-0.3.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=219b68ff4e1ffcddd8e7c69b32544dd1
diff --git a/metadata/md5-cache/dev-ros/qt_gui_app-0.3.4 b/metadata/md5-cache/dev-ros/qt_gui_app-0.3.4
index cdc6c16f6f31..37c55a222f3f 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_app-0.3.4
+++ b/metadata/md5-cache/dev-ros/qt_gui_app-0.3.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.4.tar.gz -> qt_gui_core-0.3.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ae2548a0ce3598610fc5bdcd2e540af1
diff --git a/metadata/md5-cache/dev-ros/qt_gui_app-0.3.5 b/metadata/md5-cache/dev-ros/qt_gui_app-0.3.5
index c7328ca236ca..ee7617ae9255 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_app-0.3.5
+++ b/metadata/md5-cache/dev-ros/qt_gui_app-0.3.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.5.tar.gz -> qt_gui_core-0.3.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ae2548a0ce3598610fc5bdcd2e540af1
diff --git a/metadata/md5-cache/dev-ros/qt_gui_app-0.3.6 b/metadata/md5-cache/dev-ros/qt_gui_app-0.3.6
index 9462a8d97308..a05b0c43404c 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_app-0.3.6
+++ b/metadata/md5-cache/dev-ros/qt_gui_app-0.3.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.6.tar.gz -> qt_gui_core-0.3.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ae2548a0ce3598610fc5bdcd2e540af1
diff --git a/metadata/md5-cache/dev-ros/qt_gui_app-0.3.8 b/metadata/md5-cache/dev-ros/qt_gui_app-0.3.8
index 999e90f57aee..cce85b6606d1 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_app-0.3.8
+++ b/metadata/md5-cache/dev-ros/qt_gui_app-0.3.8
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.8.tar.gz -> qt_gui_core-0.3.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ae2548a0ce3598610fc5bdcd2e540af1
diff --git a/metadata/md5-cache/dev-ros/qt_gui_app-0.3.9 b/metadata/md5-cache/dev-ros/qt_gui_app-0.3.9
index 86ea2cb9f92b..ae656a5db0f8 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_app-0.3.9
+++ b/metadata/md5-cache/dev-ros/qt_gui_app-0.3.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.9.tar.gz -> qt_gui_core-0.3.9.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1c6cc48b2bd0562f4b48a1d565485f2e
diff --git a/metadata/md5-cache/dev-ros/qt_gui_app-9999 b/metadata/md5-cache/dev-ros/qt_gui_app-9999
index fc6218645cff..44fe2e4e7263 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_app-9999
+++ b/metadata/md5-cache/dev-ros/qt_gui_app-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=4ea2c47ecc9a06099dc9eb4508f1f8c1
diff --git a/metadata/md5-cache/dev-ros/qt_gui_cpp-0.3.10 b/metadata/md5-cache/dev-ros/qt_gui_cpp-0.3.10
index 7480b279bc5a..03a48f528141 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_cpp-0.3.10
+++ b/metadata/md5-cache/dev-ros/qt_gui_cpp-0.3.10
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 dev-libs/t
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.10.tar.gz -> qt_gui_core-0.3.10.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=758e40eb529360557431e071c86b73da
diff --git a/metadata/md5-cache/dev-ros/qt_gui_cpp-0.3.11 b/metadata/md5-cache/dev-ros/qt_gui_cpp-0.3.11
index 29dd2ab11743..fc21a55e1f55 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_cpp-0.3.11
+++ b/metadata/md5-cache/dev-ros/qt_gui_cpp-0.3.11
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 dev-libs/t
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.11.tar.gz -> qt_gui_core-0.3.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=758e40eb529360557431e071c86b73da
diff --git a/metadata/md5-cache/dev-ros/qt_gui_cpp-0.3.8-r1 b/metadata/md5-cache/dev-ros/qt_gui_cpp-0.3.8-r1
index c07ae14c6fd8..c116b7e3c0e7 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_cpp-0.3.8-r1
+++ b/metadata/md5-cache/dev-ros/qt_gui_cpp-0.3.8-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 dev-libs/t
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.8.tar.gz -> qt_gui_core-0.3.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2d116aebb44cefd22961eb80ba2424ee
diff --git a/metadata/md5-cache/dev-ros/qt_gui_cpp-0.3.9 b/metadata/md5-cache/dev-ros/qt_gui_cpp-0.3.9
index 2d31ba525609..ad225c62151a 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_cpp-0.3.9
+++ b/metadata/md5-cache/dev-ros/qt_gui_cpp-0.3.9
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 dev-libs/t
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.9.tar.gz -> qt_gui_core-0.3.9.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=758e40eb529360557431e071c86b73da
diff --git a/metadata/md5-cache/dev-ros/qt_gui_cpp-9999 b/metadata/md5-cache/dev-ros/qt_gui_cpp-9999
index b44398667dbd..384c1096c1e2 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_cpp-9999
+++ b/metadata/md5-cache/dev-ros/qt_gui_cpp-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 dev-libs/tinyxml2:= >=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=2d116aebb44cefd22961eb80ba2424ee
diff --git a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.2.29 b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.2.29
index 6d6e53c45e49..7e02c3d55170 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.2.29
+++ b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.2.29
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.2.29.tar.gz -> qt_gui_core-0.2.29.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e037bab238f9336375c794d15a529bca
diff --git a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.2.30 b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.2.30
index cab8b51924ea..fc38037c20ab 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.2.30
+++ b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.2.30
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.2.30.tar.gz -> qt_gui_core-0.2.30.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e037bab238f9336375c794d15a529bca
diff --git a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.0 b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.0
index 76a74be55c03..d2d28c483a82 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.0
+++ b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.0.tar.gz -> qt_gui_core-0.3.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3cb1a7755bcef56395758f2aaad0f3aa
diff --git a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.1 b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.1
index 7b9860129889..c73466ff8c43 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.1
+++ b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.1.tar.gz -> qt_gui_core-0.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3cb1a7755bcef56395758f2aaad0f3aa
diff --git a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.10 b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.10
index 33769fd4e0e7..3ece85681993 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.10
+++ b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.10
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.10.tar.gz -> qt_gui_core-0.3.10.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3e9d1a7011df960f0818cd2bbf67dc0f
diff --git a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.11 b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.11
index cddb53b764a4..08d181014e06 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.11
+++ b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.11
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.11.tar.gz -> qt_gui_core-0.3.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3e9d1a7011df960f0818cd2bbf67dc0f
diff --git a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.2 b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.2
index bf5efa9d546f..1ce7d15d866c 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.2
+++ b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.2.tar.gz -> qt_gui_core-0.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=3cb1a7755bcef56395758f2aaad0f3aa
diff --git a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.3 b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.3
index 6d9703d04829..74ccf2fb2c15 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.3
+++ b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.3.tar.gz -> qt_gui_core-0.3.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=848782516fa0cdb599990e1cd3e9cd4b
diff --git a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.4 b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.4
index 5de55f71c54a..d0befe041cca 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.4
+++ b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.4.tar.gz -> qt_gui_core-0.3.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f29f81dc3f42cf4f751e47cd6feb6cf8
diff --git a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.5 b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.5
index 4477edd37b73..2cdb352e392f 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.5
+++ b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.5.tar.gz -> qt_gui_core-0.3.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f29f81dc3f42cf4f751e47cd6feb6cf8
diff --git a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.6 b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.6
index d87f7fc9a306..84ba1222457f 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.6
+++ b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.6.tar.gz -> qt_gui_core-0.3.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f29f81dc3f42cf4f751e47cd6feb6cf8
diff --git a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.8 b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.8
index a4a2552a0847..7b37b3f6542a 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.8
+++ b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.8
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.8.tar.gz -> qt_gui_core-0.3.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f29f81dc3f42cf4f751e47cd6feb6cf8
diff --git a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.9 b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.9
index 62a8af905b03..0125762062dc 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.9
+++ b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.9
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.9.tar.gz -> qt_gui_core-0.3.9.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3e9d1a7011df960f0818cd2bbf67dc0f
diff --git a/metadata/md5-cache/dev-ros/qt_gui_py_common-9999 b/metadata/md5-cache/dev-ros/qt_gui_py_common-9999
index 54612c29a58f..84c2aa11927d 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_py_common-9999
+++ b/metadata/md5-cache/dev-ros/qt_gui_py_common-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=3cb1a7755bcef56395758f2aaad0f3aa
diff --git a/metadata/md5-cache/dev-ros/random_numbers-0.3.1 b/metadata/md5-cache/dev-ros/random_numbers-0.3.1
index a383920c7833..6b262a5b1d00 100644
--- a/metadata/md5-cache/dev-ros/random_numbers-0.3.1
+++ b/metadata/md5-cache/dev-ros/random_numbers-0.3.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] python_targets_python2_7? ( >=dev-lang/python-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/random_numbers/archive/0.3.1.tar.gz -> random_numbers-0.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=43c378682327221c729052dccf62d64d
diff --git a/metadata/md5-cache/dev-ros/random_numbers-0.3.2 b/metadata/md5-cache/dev-ros/random_numbers-0.3.2
index ec089ca75a57..b0744295d178 100644
--- a/metadata/md5-cache/dev-ros/random_numbers-0.3.2
+++ b/metadata/md5-cache/dev-ros/random_numbers-0.3.2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] python_targets_python2_7? ( >=dev-lang/python-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/random_numbers/archive/0.3.2.tar.gz -> random_numbers-0.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=2f84fb61c7456c1fd4a175781160d39d
diff --git a/metadata/md5-cache/dev-ros/random_numbers-9999 b/metadata/md5-cache/dev-ros/random_numbers-9999
index 249afc3c7199..14586220b677 100644
--- a/metadata/md5-cache/dev-ros/random_numbers-9999
+++ b/metadata/md5-cache/dev-ros/random_numbers-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost:=[threads] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=43c378682327221c729052dccf62d64d
diff --git a/metadata/md5-cache/dev-ros/realtime_tools-1.10.0 b/metadata/md5-cache/dev-ros/realtime_tools-1.10.0
index e729b94babf4..88e8f68a1436 100644
--- a/metadata/md5-cache/dev-ros/realtime_tools-1.10.0
+++ b/metadata/md5-cache/dev-ros/realtime_tools-1.10.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/realtime_tools/archive/1.10.0.tar.gz -> realtime_tools-1.10.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=828c693f8bf3c345d095e8bcadec59c7
diff --git a/metadata/md5-cache/dev-ros/realtime_tools-1.11.0 b/metadata/md5-cache/dev-ros/realtime_tools-1.11.0
index 4c0e9ec0dc73..c6b15d737508 100644
--- a/metadata/md5-cache/dev-ros/realtime_tools-1.11.0
+++ b/metadata/md5-cache/dev-ros/realtime_tools-1.11.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/realtime_tools/archive/1.11.0.tar.gz -> realtime_tools-1.11.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=828c693f8bf3c345d095e8bcadec59c7
diff --git a/metadata/md5-cache/dev-ros/realtime_tools-1.12.0 b/metadata/md5-cache/dev-ros/realtime_tools-1.12.0
index dfc1b95fbc2f..20782d99f5ea 100644
--- a/metadata/md5-cache/dev-ros/realtime_tools-1.12.0
+++ b/metadata/md5-cache/dev-ros/realtime_tools-1.12.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/realtime_tools/archive/1.12.0.tar.gz -> realtime_tools-1.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2b2a51e3207985428514f0f95e951753
diff --git a/metadata/md5-cache/dev-ros/realtime_tools-9999 b/metadata/md5-cache/dev-ros/realtime_tools-9999
index c0e911c42e35..6097c83f4f2c 100644
--- a/metadata/md5-cache/dev-ros/realtime_tools-9999
+++ b/metadata/md5-cache/dev-ros/realtime_tools-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=4a7953be936651b7bea7b9a279dd5ab9
diff --git a/metadata/md5-cache/dev-ros/resource_retriever-1.12.3 b/metadata/md5-cache/dev-ros/resource_retriever-1.12.3
index 5b1d85ce9112..55cfd995851f 100644
--- a/metadata/md5-cache/dev-ros/resource_retriever-1.12.3
+++ b/metadata/md5-cache/dev-ros/resource_retriever-1.12.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosconsole dev-ros/roslib[python_targets_python2_7(-)?,-python_s
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/resource_retriever/archive/1.12.3.tar.gz -> resource_retriever-1.12.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bb60d535fb4629984ba8a1d25e4f9e90
diff --git a/metadata/md5-cache/dev-ros/resource_retriever-1.12.4 b/metadata/md5-cache/dev-ros/resource_retriever-1.12.4
index a51c9265f9c6..483a2fe77fa9 100644
--- a/metadata/md5-cache/dev-ros/resource_retriever-1.12.4
+++ b/metadata/md5-cache/dev-ros/resource_retriever-1.12.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosconsole dev-ros/roslib[python_targets_python2_7(-)?,-python_s
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/resource_retriever/archive/1.12.4.tar.gz -> resource_retriever-1.12.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=20de1be216d75fba51eda2d542c9cb4f
diff --git a/metadata/md5-cache/dev-ros/resource_retriever-9999 b/metadata/md5-cache/dev-ros/resource_retriever-9999
index 148165bcf595..853e8cff0a7a 100644
--- a/metadata/md5-cache/dev-ros/resource_retriever-9999
+++ b/metadata/md5-cache/dev-ros/resource_retriever-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rosconsole dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/curl dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=bb60d535fb4629984ba8a1d25e4f9e90
diff --git a/metadata/md5-cache/dev-ros/rgbd_launch-2.2.0 b/metadata/md5-cache/dev-ros/rgbd_launch-2.2.0
index ef5404206389..3131e0c1c89e 100644
--- a/metadata/md5-cache/dev-ros/rgbd_launch-2.2.0
+++ b/metadata/md5-cache/dev-ros/rgbd_launch-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/tf p
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rgbd_launch/archive/2.2.0.tar.gz -> rgbd_launch-2.2.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bab0dae5cac9130f0990441e5102b0f6
diff --git a/metadata/md5-cache/dev-ros/rgbd_launch-2.2.1 b/metadata/md5-cache/dev-ros/rgbd_launch-2.2.1
index 9f66d97036c7..9e86ddaebeba 100644
--- a/metadata/md5-cache/dev-ros/rgbd_launch-2.2.1
+++ b/metadata/md5-cache/dev-ros/rgbd_launch-2.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/tf p
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rgbd_launch/archive/2.2.1.tar.gz -> rgbd_launch-2.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bab0dae5cac9130f0990441e5102b0f6
diff --git a/metadata/md5-cache/dev-ros/rgbd_launch-2.2.2 b/metadata/md5-cache/dev-ros/rgbd_launch-2.2.2
index 9f6986a49b12..fca32a24550d 100644
--- a/metadata/md5-cache/dev-ros/rgbd_launch-2.2.2
+++ b/metadata/md5-cache/dev-ros/rgbd_launch-2.2.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/tf p
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rgbd_launch/archive/2.2.2.tar.gz -> rgbd_launch-2.2.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=8110f5d3963d7442dabb934706af2917
diff --git a/metadata/md5-cache/dev-ros/rgbd_launch-9999 b/metadata/md5-cache/dev-ros/rgbd_launch-9999
index bff3224b0001..c8c6f0ad9695 100644
--- a/metadata/md5-cache/dev-ros/rgbd_launch-9999
+++ b/metadata/md5-cache/dev-ros/rgbd_launch-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/tf python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=8110f5d3963d7442dabb934706af2917
diff --git a/metadata/md5-cache/dev-ros/robot_localization-2.5.2 b/metadata/md5-cache/dev-ros/robot_localization-2.5.2
index ec5d5d26a694..0e51bffc8b71 100644
--- a/metadata/md5-cache/dev-ros/robot_localization-2.5.2
+++ b/metadata/md5-cache/dev-ros/robot_localization-2.5.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_updater dev-ros/diagnostic_msgs[ros_messages_cxx(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/cra-ros-pkg/robot_localization/archive/2.5.2.tar.gz -> robot_localization-2.5.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=9eb19dcc1446d39a1f6a99d3b8c76b62
diff --git a/metadata/md5-cache/dev-ros/robot_localization-9999 b/metadata/md5-cache/dev-ros/robot_localization-9999
index 637256c2a9ec..8615720218fd 100644
--- a/metadata/md5-cache/dev-ros/robot_localization-9999
+++ b/metadata/md5-cache/dev-ros/robot_localization-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/diagnostic_updater dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/eigen_conversions dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/message_filters dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/xmlrpcpp dev-libs/boost:= dev-cpp/yaml-cpp:= dev-ros/nodelet dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geographic_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geographic_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=9eb19dcc1446d39a1f6a99d3b8c76b62
diff --git a/metadata/md5-cache/dev-ros/robot_pose_ekf-1.14.0 b/metadata/md5-cache/dev-ros/robot_pose_ekf-1.14.0
index f6982f3ff029..89da66320c4c 100644
--- a/metadata/md5-cache/dev-ros/robot_pose_ekf-1.14.0
+++ b/metadata/md5-cache/dev-ros/robot_pose_ekf-1.14.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.14.0.tar.gz -> navigation-1.14.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=16c74040be6f6b89ffbcddb66b501f23
diff --git a/metadata/md5-cache/dev-ros/robot_pose_ekf-1.14.2 b/metadata/md5-cache/dev-ros/robot_pose_ekf-1.14.2
index 75e0d8a0abb1..5ee5a0393b60 100644
--- a/metadata/md5-cache/dev-ros/robot_pose_ekf-1.14.2
+++ b/metadata/md5-cache/dev-ros/robot_pose_ekf-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.14.2.tar.gz -> navigation-1.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=914c418df91110a89e7e106d3d650ba3
diff --git a/metadata/md5-cache/dev-ros/robot_pose_ekf-1.15.1 b/metadata/md5-cache/dev-ros/robot_pose_ekf-1.15.1
index 80cb7f0ca88e..d39dd91eb2fe 100644
--- a/metadata/md5-cache/dev-ros/robot_pose_ekf-1.15.1
+++ b/metadata/md5-cache/dev-ros/robot_pose_ekf-1.15.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.15.1.tar.gz -> navigation-1.15.1.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=914c418df91110a89e7e106d3d650ba3
diff --git a/metadata/md5-cache/dev-ros/robot_pose_ekf-1.15.2 b/metadata/md5-cache/dev-ros/robot_pose_ekf-1.15.2
index 7e281cfadc26..f4ae6f9fdced 100644
--- a/metadata/md5-cache/dev-ros/robot_pose_ekf-1.15.2
+++ b/metadata/md5-cache/dev-ros/robot_pose_ekf-1.15.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.15.2.tar.gz -> navigation-1.15.2.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=14481d41de7772c6a18e89726c5403f8
diff --git a/metadata/md5-cache/dev-ros/robot_pose_ekf-9999 b/metadata/md5-cache/dev-ros/robot_pose_ekf-9999
index 0361cd2f8568..db29ed945e07 100644
--- a/metadata/md5-cache/dev-ros/robot_pose_ekf-9999
+++ b/metadata/md5-cache/dev-ros/robot_pose_ekf-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] sci-libs/orocos-bfl dev-libs/boost:=[threads] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=16c74040be6f6b89ffbcddb66b501f23
diff --git a/metadata/md5-cache/dev-ros/robot_pose_publisher-0.2.4 b/metadata/md5-cache/dev-ros/robot_pose_publisher-0.2.4
index 5ad448dc09c0..93edca4dbb2e 100644
--- a/metadata/md5-cache/dev-ros/robot_pose_publisher-0.2.4
+++ b/metadata/md5-cache/dev-ros/robot_pose_publisher-0.2.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/GT-RAIL/robot_pose_publisher/archive/0.2.4.tar.gz -> robot_pose_publisher-0.2.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4fca48613f80284565a4fbe8029caaf1
diff --git a/metadata/md5-cache/dev-ros/robot_pose_publisher-9999 b/metadata/md5-cache/dev-ros/robot_pose_publisher-9999
index 389c47389b13..dcb54c0fcecd 100644
--- a/metadata/md5-cache/dev-ros/robot_pose_publisher-9999
+++ b/metadata/md5-cache/dev-ros/robot_pose_publisher-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=4fca48613f80284565a4fbe8029caaf1
diff --git a/metadata/md5-cache/dev-ros/robot_state_publisher-1.13.5 b/metadata/md5-cache/dev-ros/robot_state_publisher-1.13.5
index b0cabdb66f3e..bb3f5d79635b 100644
--- a/metadata/md5-cache/dev-ros/robot_state_publisher-1.13.5
+++ b/metadata/md5-cache/dev-ros/robot_state_publisher-1.13.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/kdl_parser dev-cpp/eigen:3 sci-libs/orocos_kdl dev-ros/roscpp de
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/robot_state_publisher/archive/1.13.5.tar.gz -> robot_state_publisher-1.13.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fe7e6ef39dbbe5f604f9d260a0dbeb1c
diff --git a/metadata/md5-cache/dev-ros/robot_state_publisher-1.13.6-r1 b/metadata/md5-cache/dev-ros/robot_state_publisher-1.13.6-r1
index 540e8e254f0b..412dbe0a3dc9 100644
--- a/metadata/md5-cache/dev-ros/robot_state_publisher-1.13.6-r1
+++ b/metadata/md5-cache/dev-ros/robot_state_publisher-1.13.6-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/kdl_parser dev-cpp/eigen:3 sci-libs/orocos_kdl:= dev-ros/roscpp
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/robot_state_publisher/archive/1.13.6.tar.gz -> robot_state_publisher-1.13.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=16e531cec3da31f2d1a03e383e6fd749
diff --git a/metadata/md5-cache/dev-ros/robot_state_publisher-9999 b/metadata/md5-cache/dev-ros/robot_state_publisher-9999
index 8fc61736fb66..f806022dac58 100644
--- a/metadata/md5-cache/dev-ros/robot_state_publisher-9999
+++ b/metadata/md5-cache/dev-ros/robot_state_publisher-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/kdl_parser dev-cpp/eigen:3 sci-libs/orocos_kdl:= dev-ros/roscpp dev-ros/rosconsole dev-ros/rostime dev-ros/tf2_ros dev-ros/tf2_kdl dev-ros/kdl_conversions dev-ros/sensor_msgs dev-ros/tf dev-ros/urdf 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=16e531cec3da31f2d1a03e383e6fd749
diff --git a/metadata/md5-cache/dev-ros/ros_environment-1.2.0-r1 b/metadata/md5-cache/dev-ros/ros_environment-1.2.0-r1
index 923edeca0df6..1b125ce8405c 100644
--- a/metadata/md5-cache/dev-ros/ros_environment-1.2.0-r1
+++ b/metadata/md5-cache/dev-ros/ros_environment-1.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=!!<dev-ros/roslib-1.14.3 python_targets_python2_7? ( >=dev-lang/python-2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_environment/archive/1.2.0.tar.gz -> ros_environment-1.2.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=27027eb0145013c6886dafaeb4a2444a
diff --git a/metadata/md5-cache/dev-ros/ros_environment-9999 b/metadata/md5-cache/dev-ros/ros_environment-9999
index 1b895695e7ae..5bfe8eda8da7 100644
--- a/metadata/md5-cache/dev-ros/ros_environment-9999
+++ b/metadata/md5-cache/dev-ros/ros_environment-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=!!<dev-ros/roslib-1.14.3 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=27027eb0145013c6886dafaeb4a2444a
diff --git a/metadata/md5-cache/dev-ros/rosapi-0.8.6 b/metadata/md5-cache/dev-ros/rosapi-0.8.6
index 5e6df1f73120..9b605ca1fa48 100644
--- a/metadata/md5-cache/dev-ros/rosapi-0.8.6
+++ b/metadata/md5-cache/dev-ros/rosapi-0.8.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.8.6.tar.gz -> rosbridge_suite-0.8.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6a3f8d00584ef26ffc407a9cc042eaf9
diff --git a/metadata/md5-cache/dev-ros/rosapi-0.9.0 b/metadata/md5-cache/dev-ros/rosapi-0.9.0
index 41ad2fb1e62c..612f1450b284 100644
--- a/metadata/md5-cache/dev-ros/rosapi-0.9.0
+++ b/metadata/md5-cache/dev-ros/rosapi-0.9.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.9.0.tar.gz -> rosbridge_suite-0.9.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=07361f38f7bd207704561b5d7ad10cea
diff --git a/metadata/md5-cache/dev-ros/rosapi-9999 b/metadata/md5-cache/dev-ros/rosapi-9999
index 02394addb710..75d485cba3bd 100644
--- a/metadata/md5-cache/dev-ros/rosapi-9999
+++ b/metadata/md5-cache/dev-ros/rosapi-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbridge_library[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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=be8a7e488c3bede004f797e91c752586
diff --git a/metadata/md5-cache/dev-ros/rosauth-0.1.7 b/metadata/md5-cache/dev-ros/rosauth-0.1.7
index 0b38d1e3756e..66338779e5b8 100644
--- a/metadata/md5-cache/dev-ros/rosauth-0.1.7
+++ b/metadata/md5-cache/dev-ros/rosauth-0.1.7
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_sing
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/WPI-RAIL/rosauth/archive/0.1.7.tar.gz -> rosauth-0.1.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c5c462e7c570058bc4fd5803e2eedcf1
diff --git a/metadata/md5-cache/dev-ros/rosauth-9999 b/metadata/md5-cache/dev-ros/rosauth-9999
index 955f23e18cc7..e5a8b4fcd730 100644
--- a/metadata/md5-cache/dev-ros/rosauth-9999
+++ b/metadata/md5-cache/dev-ros/rosauth-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/openssl: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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=c5c462e7c570058bc4fd5803e2eedcf1
diff --git a/metadata/md5-cache/dev-ros/rosbag-1.13.5-r1 b/metadata/md5-cache/dev-ros/rosbag-1.13.5-r1
index 213e192536c1..5bbb3be9837c 100644
--- a/metadata/md5-cache/dev-ros/rosbag-1.13.5-r1
+++ b/metadata/md5-cache/dev-ros/rosbag-1.13.5-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosbag_storage dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_t
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.5.tar.gz -> ros_comm-1.13.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cbf5c65837e79941ef26b2d391f5d6bc
diff --git a/metadata/md5-cache/dev-ros/rosbag-1.13.6 b/metadata/md5-cache/dev-ros/rosbag-1.13.6
index 9b6514cb04ca..14c2b88b0e81 100644
--- a/metadata/md5-cache/dev-ros/rosbag-1.13.6
+++ b/metadata/md5-cache/dev-ros/rosbag-1.13.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosbag_storage dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_t
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.6.tar.gz -> ros_comm-1.13.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=964e996afb9847e39aa38bb39a47fa91
diff --git a/metadata/md5-cache/dev-ros/rosbag-1.14.2 b/metadata/md5-cache/dev-ros/rosbag-1.14.2
index e152b9d7b685..63ae6ff15003 100644
--- a/metadata/md5-cache/dev-ros/rosbag-1.14.2
+++ b/metadata/md5-cache/dev-ros/rosbag-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.2.tar.gz -> ros_comm-1.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=a253007abb2a2f4a57e8e2d48526d0bc
diff --git a/metadata/md5-cache/dev-ros/rosbag-1.14.3 b/metadata/md5-cache/dev-ros/rosbag-1.14.3
index 2b8236144016..8e940aae9479 100644
--- a/metadata/md5-cache/dev-ros/rosbag-1.14.3
+++ b/metadata/md5-cache/dev-ros/rosbag-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a253007abb2a2f4a57e8e2d48526d0bc
diff --git a/metadata/md5-cache/dev-ros/rosbag-9999 b/metadata/md5-cache/dev-ros/rosbag-9999
index 3037a36a3c39..ef1be6909e05 100644
--- a/metadata/md5-cache/dev-ros/rosbag-9999
+++ b/metadata/md5-cache/dev-ros/rosbag-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/std_srvs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/console_bridge:= lz4? ( dev-ros/roslz4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=a253007abb2a2f4a57e8e2d48526d0bc
diff --git a/metadata/md5-cache/dev-ros/rosbag_migration_rule-1.0.0 b/metadata/md5-cache/dev-ros/rosbag_migration_rule-1.0.0
index ce73ef919bb1..dbb6628b7065 100644
--- a/metadata/md5-cache/dev-ros/rosbag_migration_rule-1.0.0
+++ b/metadata/md5-cache/dev-ros/rosbag_migration_rule-1.0.0
@@ -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/ros/rosbag_migration_rule/archive/1.0.0.tar.gz -> rosbag_migration_rule-1.0.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4dff4f7b9d418487e9250fa4751dff30
diff --git a/metadata/md5-cache/dev-ros/rosbag_migration_rule-9999 b/metadata/md5-cache/dev-ros/rosbag_migration_rule-9999
index 1c9d3923aa22..6c46522ebe7c 100644
--- a/metadata/md5-cache/dev-ros/rosbag_migration_rule-9999
+++ b/metadata/md5-cache/dev-ros/rosbag_migration_rule-9999
@@ -8,5 +8,5 @@ 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=4dff4f7b9d418487e9250fa4751dff30
diff --git a/metadata/md5-cache/dev-ros/rosbag_storage-1.14.2-r1 b/metadata/md5-cache/dev-ros/rosbag_storage-1.14.2-r1
index 0eb3f392b95d..b56bedf49c4b 100644
--- a/metadata/md5-cache/dev-ros/rosbag_storage-1.14.2-r1
+++ b/metadata/md5-cache/dev-ros/rosbag_storage-1.14.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/console_bridge app-crypt/gpgme dev-ros/pluginlib dev-ros/cpp_co
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.2.tar.gz -> ros_comm-1.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=f7925c61f68d68826a64ea1a3db361e5
diff --git a/metadata/md5-cache/dev-ros/rosbag_storage-1.14.3 b/metadata/md5-cache/dev-ros/rosbag_storage-1.14.3
index 4118fd81a8a7..35b0a3303e08 100644
--- a/metadata/md5-cache/dev-ros/rosbag_storage-1.14.3
+++ b/metadata/md5-cache/dev-ros/rosbag_storage-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/console_bridge app-crypt/gpgme dev-ros/pluginlib dev-ros/cpp_co
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f7925c61f68d68826a64ea1a3db361e5
diff --git a/metadata/md5-cache/dev-ros/rosbag_storage-9999 b/metadata/md5-cache/dev-ros/rosbag_storage-9999
index f1f9784c3ce8..3445e7b1173e 100644
--- a/metadata/md5-cache/dev-ros/rosbag_storage-9999
+++ b/metadata/md5-cache/dev-ros/rosbag_storage-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/console_bridge app-crypt/gpgme dev-ros/pluginlib dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=f7925c61f68d68826a64ea1a3db361e5
diff --git a/metadata/md5-cache/dev-ros/rosbash-1.14.0 b/metadata/md5-cache/dev-ros/rosbash-1.14.0
index 70202530ad72..6ec883cea039 100644
--- a/metadata/md5-cache/dev-ros/rosbash-1.14.0
+++ b/metadata/md5-cache/dev-ros/rosbash-1.14.0
@@ -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/ros/ros/archive/1.14.0.tar.gz -> ros-1.14.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f42d6bb10e98152834c72d11b8ac2be4
diff --git a/metadata/md5-cache/dev-ros/rosbash-1.14.1 b/metadata/md5-cache/dev-ros/rosbash-1.14.1
index 42648f7d7a5a..b179ccec6f8c 100644
--- a/metadata/md5-cache/dev-ros/rosbash-1.14.1
+++ b/metadata/md5-cache/dev-ros/rosbash-1.14.1
@@ -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/ros/ros/archive/1.14.1.tar.gz -> ros-1.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f42d6bb10e98152834c72d11b8ac2be4
diff --git a/metadata/md5-cache/dev-ros/rosbash-1.14.2 b/metadata/md5-cache/dev-ros/rosbash-1.14.2
index ad5c014844da..405341938d33 100644
--- a/metadata/md5-cache/dev-ros/rosbash-1.14.2
+++ b/metadata/md5-cache/dev-ros/rosbash-1.14.2
@@ -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/ros/ros/archive/1.14.2.tar.gz -> ros-1.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=f42d6bb10e98152834c72d11b8ac2be4
diff --git a/metadata/md5-cache/dev-ros/rosbash-1.14.3 b/metadata/md5-cache/dev-ros/rosbash-1.14.3
index 96046c23e785..ed6cd016daf1 100644
--- a/metadata/md5-cache/dev-ros/rosbash-1.14.3
+++ b/metadata/md5-cache/dev-ros/rosbash-1.14.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=0
 SRC_URI=https://github.com/ros/ros/archive/1.14.3.tar.gz -> ros-1.14.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f3c8501247738c87993a58e083f71677
diff --git a/metadata/md5-cache/dev-ros/rosbash-1.14.4 b/metadata/md5-cache/dev-ros/rosbash-1.14.4
index eee17a4c5c68..6b021b423e6c 100644
--- a/metadata/md5-cache/dev-ros/rosbash-1.14.4
+++ b/metadata/md5-cache/dev-ros/rosbash-1.14.4
@@ -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/ros/ros/archive/1.14.4.tar.gz -> ros-1.14.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f3c8501247738c87993a58e083f71677
diff --git a/metadata/md5-cache/dev-ros/rosbash-9999 b/metadata/md5-cache/dev-ros/rosbash-9999
index 00a8bbc1f2b6..12b0a6db4e05 100644
--- a/metadata/md5-cache/dev-ros/rosbash-9999
+++ b/metadata/md5-cache/dev-ros/rosbash-9999
@@ -8,5 +8,5 @@ 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=e5773a8f2d3d52ad6dc494e4aa3f4b81
diff --git a/metadata/md5-cache/dev-ros/rosboost_cfg-1.14.0 b/metadata/md5-cache/dev-ros/rosboost_cfg-1.14.0
index e48f5f138a2e..385dd5fb43e0 100644
--- a/metadata/md5-cache/dev-ros/rosboost_cfg-1.14.0
+++ b/metadata/md5-cache/dev-ros/rosboost_cfg-1.14.0
@@ -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/ros/ros/archive/1.14.0.tar.gz -> ros-1.14.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=20be9bd31e5e5e29bd51139ee67f0c95
diff --git a/metadata/md5-cache/dev-ros/rosboost_cfg-1.14.1 b/metadata/md5-cache/dev-ros/rosboost_cfg-1.14.1
index cda06c1a64fd..f597ae59ccb6 100644
--- a/metadata/md5-cache/dev-ros/rosboost_cfg-1.14.1
+++ b/metadata/md5-cache/dev-ros/rosboost_cfg-1.14.1
@@ -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/ros/ros/archive/1.14.1.tar.gz -> ros-1.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=20be9bd31e5e5e29bd51139ee67f0c95
diff --git a/metadata/md5-cache/dev-ros/rosboost_cfg-1.14.2 b/metadata/md5-cache/dev-ros/rosboost_cfg-1.14.2
index 9c80037ddcb8..91e843a7cc25 100644
--- a/metadata/md5-cache/dev-ros/rosboost_cfg-1.14.2
+++ b/metadata/md5-cache/dev-ros/rosboost_cfg-1.14.2
@@ -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/ros/ros/archive/1.14.2.tar.gz -> ros-1.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=20be9bd31e5e5e29bd51139ee67f0c95
diff --git a/metadata/md5-cache/dev-ros/rosboost_cfg-1.14.3 b/metadata/md5-cache/dev-ros/rosboost_cfg-1.14.3
index bb1cbbaed8c5..dfcbe2e3cbac 100644
--- a/metadata/md5-cache/dev-ros/rosboost_cfg-1.14.3
+++ b/metadata/md5-cache/dev-ros/rosboost_cfg-1.14.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=0
 SRC_URI=https://github.com/ros/ros/archive/1.14.3.tar.gz -> ros-1.14.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=586566f613589dd889ee2187745f4391
diff --git a/metadata/md5-cache/dev-ros/rosboost_cfg-1.14.4 b/metadata/md5-cache/dev-ros/rosboost_cfg-1.14.4
index b80cd604583a..9760ded95234 100644
--- a/metadata/md5-cache/dev-ros/rosboost_cfg-1.14.4
+++ b/metadata/md5-cache/dev-ros/rosboost_cfg-1.14.4
@@ -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/ros/ros/archive/1.14.4.tar.gz -> ros-1.14.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=586566f613589dd889ee2187745f4391
diff --git a/metadata/md5-cache/dev-ros/rosboost_cfg-9999 b/metadata/md5-cache/dev-ros/rosboost_cfg-9999
index d16709e7c1c0..6748afd8d487 100644
--- a/metadata/md5-cache/dev-ros/rosboost_cfg-9999
+++ b/metadata/md5-cache/dev-ros/rosboost_cfg-9999
@@ -8,5 +8,5 @@ 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=20be9bd31e5e5e29bd51139ee67f0c95
diff --git a/metadata/md5-cache/dev-ros/rosbridge_library-0.8.6 b/metadata/md5-cache/dev-ros/rosbridge_library-0.8.6
index 3b60361b4470..a66c60525758 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_library-0.8.6
+++ b/metadata/md5-cache/dev-ros/rosbridge_library-0.8.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.8.6.tar.gz -> rosbridge_suite-0.8.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1bcc9fceca6e2546fb0fecdfe10b0c50
diff --git a/metadata/md5-cache/dev-ros/rosbridge_library-0.9.0 b/metadata/md5-cache/dev-ros/rosbridge_library-0.9.0
index 3bee41aef614..df837bb6501f 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_library-0.9.0
+++ b/metadata/md5-cache/dev-ros/rosbridge_library-0.9.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.9.0.tar.gz -> rosbridge_suite-0.9.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e97590a5765229f0ef90dac4c97f1a43
diff --git a/metadata/md5-cache/dev-ros/rosbridge_library-9999 b/metadata/md5-cache/dev-ros/rosbridge_library-9999
index dad78df23c19..fcf5f728542e 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_library-9999
+++ b/metadata/md5-cache/dev-ros/rosbridge_library-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[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(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=e7af24b02c70e8d747b873fde1607d78
diff --git a/metadata/md5-cache/dev-ros/rosbridge_server-0.8.6 b/metadata/md5-cache/dev-ros/rosbridge_server-0.8.6
index ca3607cc7901..5777e3b9d612 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_server-0.8.6
+++ b/metadata/md5-cache/dev-ros/rosbridge_server-0.8.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosapi[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.8.6.tar.gz -> rosbridge_suite-0.8.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=41f616b13aa32b67f17dfeca019eaed7
diff --git a/metadata/md5-cache/dev-ros/rosbridge_server-0.9.0 b/metadata/md5-cache/dev-ros/rosbridge_server-0.9.0
index a54c284eefa2..940f5d73f287 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_server-0.9.0
+++ b/metadata/md5-cache/dev-ros/rosbridge_server-0.9.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosapi[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.9.0.tar.gz -> rosbridge_suite-0.9.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0904546464ab1105d50f1c04c6df865c
diff --git a/metadata/md5-cache/dev-ros/rosbridge_server-9999 b/metadata/md5-cache/dev-ros/rosbridge_server-9999
index 1523646ca596..860024606792 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_server-9999
+++ b/metadata/md5-cache/dev-ros/rosbridge_server-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rosapi[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbridge_library[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosauth[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/backports-ssl-match-hostname[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] www-servers/tornado[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_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=0904546464ab1105d50f1c04c6df865c
diff --git a/metadata/md5-cache/dev-ros/rosbuild-1.14.2 b/metadata/md5-cache/dev-ros/rosbuild-1.14.2
index 508bc92ecd1a..166567185acb 100644
--- a/metadata/md5-cache/dev-ros/rosbuild-1.14.2
+++ b/metadata/md5-cache/dev-ros/rosbuild-1.14.2
@@ -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/ros/ros/archive/1.14.2.tar.gz -> ros-1.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=55a63573d8b07a42f244335f4cf70a55
diff --git a/metadata/md5-cache/dev-ros/rosbuild-1.14.3 b/metadata/md5-cache/dev-ros/rosbuild-1.14.3
index 65315aca9c45..daae69e60188 100644
--- a/metadata/md5-cache/dev-ros/rosbuild-1.14.3
+++ b/metadata/md5-cache/dev-ros/rosbuild-1.14.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=0
 SRC_URI=https://github.com/ros/ros/archive/1.14.3.tar.gz -> ros-1.14.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a51a314e10bc6934d98b131d0b9de66b
diff --git a/metadata/md5-cache/dev-ros/rosbuild-1.14.4 b/metadata/md5-cache/dev-ros/rosbuild-1.14.4
index c3fcce531244..cf7adea7731a 100644
--- a/metadata/md5-cache/dev-ros/rosbuild-1.14.4
+++ b/metadata/md5-cache/dev-ros/rosbuild-1.14.4
@@ -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/ros/ros/archive/1.14.4.tar.gz -> ros-1.14.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a51a314e10bc6934d98b131d0b9de66b
diff --git a/metadata/md5-cache/dev-ros/rosbuild-9999 b/metadata/md5-cache/dev-ros/rosbuild-9999
index 71e22adf99bc..290246860b06 100644
--- a/metadata/md5-cache/dev-ros/rosbuild-9999
+++ b/metadata/md5-cache/dev-ros/rosbuild-9999
@@ -8,5 +8,5 @@ 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=c1d5c223b8e6bc09a72acabbe8a9f28c
diff --git a/metadata/md5-cache/dev-ros/rosclean-1.14.0 b/metadata/md5-cache/dev-ros/rosclean-1.14.0
index df6350e13589..dee115eb71c5 100644
--- a/metadata/md5-cache/dev-ros/rosclean-1.14.0
+++ b/metadata/md5-cache/dev-ros/rosclean-1.14.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.14.0.tar.gz -> ros-1.14.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a6feb218112314f22ea23c1d7bcc4561
diff --git a/metadata/md5-cache/dev-ros/rosclean-1.14.1 b/metadata/md5-cache/dev-ros/rosclean-1.14.1
index 27aeeeabbd61..b66ad2fe2305 100644
--- a/metadata/md5-cache/dev-ros/rosclean-1.14.1
+++ b/metadata/md5-cache/dev-ros/rosclean-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.14.1.tar.gz -> ros-1.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a6feb218112314f22ea23c1d7bcc4561
diff --git a/metadata/md5-cache/dev-ros/rosclean-1.14.2 b/metadata/md5-cache/dev-ros/rosclean-1.14.2
index d2f0e55ce601..2b0e27e15fa7 100644
--- a/metadata/md5-cache/dev-ros/rosclean-1.14.2
+++ b/metadata/md5-cache/dev-ros/rosclean-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.14.2.tar.gz -> ros-1.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=a6feb218112314f22ea23c1d7bcc4561
diff --git a/metadata/md5-cache/dev-ros/rosclean-1.14.3 b/metadata/md5-cache/dev-ros/rosclean-1.14.3
index 3a500a132b42..596b1ab20cad 100644
--- a/metadata/md5-cache/dev-ros/rosclean-1.14.3
+++ b/metadata/md5-cache/dev-ros/rosclean-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.14.3.tar.gz -> ros-1.14.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=70b661883271d3a21f140afcf7423e39
diff --git a/metadata/md5-cache/dev-ros/rosclean-1.14.4 b/metadata/md5-cache/dev-ros/rosclean-1.14.4
index 981a0514940d..43b5a96081e6 100644
--- a/metadata/md5-cache/dev-ros/rosclean-1.14.4
+++ b/metadata/md5-cache/dev-ros/rosclean-1.14.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.14.4.tar.gz -> ros-1.14.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=70b661883271d3a21f140afcf7423e39
diff --git a/metadata/md5-cache/dev-ros/rosclean-9999 b/metadata/md5-cache/dev-ros/rosclean-9999
index 50d1ac4e6e0c..d0406f785a49 100644
--- a/metadata/md5-cache/dev-ros/rosclean-9999
+++ b/metadata/md5-cache/dev-ros/rosclean-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=a6feb218112314f22ea23c1d7bcc4561
diff --git a/metadata/md5-cache/dev-ros/rosconsole-1.13.6 b/metadata/md5-cache/dev-ros/rosconsole-1.13.6
index f59b5984f52c..292044b55d80 100644
--- a/metadata/md5-cache/dev-ros/rosconsole-1.13.6
+++ b/metadata/md5-cache/dev-ros/rosconsole-1.13.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/rosunit dev-libs/boost:=[thre
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.6.tar.gz -> ros_comm-1.13.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f756b6b85ddade142254e9f41492edea
diff --git a/metadata/md5-cache/dev-ros/rosconsole-1.13.7 b/metadata/md5-cache/dev-ros/rosconsole-1.13.7
index 83bc340db13a..c97ce6aff473 100644
--- a/metadata/md5-cache/dev-ros/rosconsole-1.13.7
+++ b/metadata/md5-cache/dev-ros/rosconsole-1.13.7
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/rosunit dev-libs/boost:=[thre
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/rosconsole/archive/1.13.7.tar.gz -> rosconsole-1.13.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=18736fb60d2fd2a98cb48f4a4778d6db
diff --git a/metadata/md5-cache/dev-ros/rosconsole-9999 b/metadata/md5-cache/dev-ros/rosconsole-9999
index 4b91d9bc7a2e..46bfe14f30f6 100644
--- a/metadata/md5-cache/dev-ros/rosconsole-9999
+++ b/metadata/md5-cache/dev-ros/rosconsole-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/rosunit dev-libs/boost:=[threads] log4cxx? ( dev-libs/log4cxx ) !log4cxx? ( glog? ( dev-cpp/glog ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=18736fb60d2fd2a98cb48f4a4778d6db
diff --git a/metadata/md5-cache/dev-ros/rosconsole_bridge-0.5.2 b/metadata/md5-cache/dev-ros/rosconsole_bridge-0.5.2
index 98ff9d6f6609..8dd3f57c818b 100644
--- a/metadata/md5-cache/dev-ros/rosconsole_bridge-0.5.2
+++ b/metadata/md5-cache/dev-ros/rosconsole_bridge-0.5.2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/console_bridge:= dev-ros/rosconsole python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/rosconsole_bridge/archive/0.5.2.tar.gz -> rosconsole_bridge-0.5.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=4109d2a7c601b129626ba4f15311005c
diff --git a/metadata/md5-cache/dev-ros/rosconsole_bridge-9999 b/metadata/md5-cache/dev-ros/rosconsole_bridge-9999
index 3084d58fc7d9..ca7bdb8bc6c8 100644
--- a/metadata/md5-cache/dev-ros/rosconsole_bridge-9999
+++ b/metadata/md5-cache/dev-ros/rosconsole_bridge-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/console_bridge:= dev-ros/rosconsole python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=9eac9663e1f97745c54a6bec47aa3fa4
diff --git a/metadata/md5-cache/dev-ros/roscpp-1.13.0 b/metadata/md5-cache/dev-ros/roscpp-1.13.0
index c284ccb5e954..74bcce7aecc6 100644
--- a/metadata/md5-cache/dev-ros/roscpp-1.13.0
+++ b/metadata/md5-cache/dev-ros/roscpp-1.13.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-r
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.0.tar.gz -> ros_comm-1.13.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=870031454fe925c570c12d78c1171f90
diff --git a/metadata/md5-cache/dev-ros/roscpp-1.13.1 b/metadata/md5-cache/dev-ros/roscpp-1.13.1
index a565157aa3e5..bda5691aa90d 100644
--- a/metadata/md5-cache/dev-ros/roscpp-1.13.1
+++ b/metadata/md5-cache/dev-ros/roscpp-1.13.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-r
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.1.tar.gz -> ros_comm-1.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=870031454fe925c570c12d78c1171f90
diff --git a/metadata/md5-cache/dev-ros/roscpp-1.13.2 b/metadata/md5-cache/dev-ros/roscpp-1.13.2
index 81c13a42927f..d3817b38e51a 100644
--- a/metadata/md5-cache/dev-ros/roscpp-1.13.2
+++ b/metadata/md5-cache/dev-ros/roscpp-1.13.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-r
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.2.tar.gz -> ros_comm-1.13.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=870031454fe925c570c12d78c1171f90
diff --git a/metadata/md5-cache/dev-ros/roscpp-1.13.4 b/metadata/md5-cache/dev-ros/roscpp-1.13.4
index 51cd70492bf0..94f58c04e2e4 100644
--- a/metadata/md5-cache/dev-ros/roscpp-1.13.4
+++ b/metadata/md5-cache/dev-ros/roscpp-1.13.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-r
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.4.tar.gz -> ros_comm-1.13.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=870031454fe925c570c12d78c1171f90
diff --git a/metadata/md5-cache/dev-ros/roscpp-1.13.5 b/metadata/md5-cache/dev-ros/roscpp-1.13.5
index d082c8fe44e0..7f4b79f37e44 100644
--- a/metadata/md5-cache/dev-ros/roscpp-1.13.5
+++ b/metadata/md5-cache/dev-ros/roscpp-1.13.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-r
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.5.tar.gz -> ros_comm-1.13.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=870031454fe925c570c12d78c1171f90
diff --git a/metadata/md5-cache/dev-ros/roscpp-1.13.6 b/metadata/md5-cache/dev-ros/roscpp-1.13.6
index 0cd5032154f0..dac7c7eae51c 100644
--- a/metadata/md5-cache/dev-ros/roscpp-1.13.6
+++ b/metadata/md5-cache/dev-ros/roscpp-1.13.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-r
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.6.tar.gz -> ros_comm-1.13.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1c23cf512a2168f51addad0286240575
diff --git a/metadata/md5-cache/dev-ros/roscpp-1.14.2 b/metadata/md5-cache/dev-ros/roscpp-1.14.2
index d6d42a4e87b0..e211e2be8b5b 100644
--- a/metadata/md5-cache/dev-ros/roscpp-1.14.2
+++ b/metadata/md5-cache/dev-ros/roscpp-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-r
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.2.tar.gz -> ros_comm-1.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=1c23cf512a2168f51addad0286240575
diff --git a/metadata/md5-cache/dev-ros/roscpp-1.14.3 b/metadata/md5-cache/dev-ros/roscpp-1.14.3
index 243e4f7defa1..b6f9de2a5c93 100644
--- a/metadata/md5-cache/dev-ros/roscpp-1.14.3
+++ b/metadata/md5-cache/dev-ros/roscpp-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-r
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1c23cf512a2168f51addad0286240575
diff --git a/metadata/md5-cache/dev-ros/roscpp-9999 b/metadata/md5-cache/dev-ros/roscpp-9999
index 22f194e5399c..8e74b43fc208 100644
--- a/metadata/md5-cache/dev-ros/roscpp-9999
+++ b/metadata/md5-cache/dev-ros/roscpp-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=870031454fe925c570c12d78c1171f90
diff --git a/metadata/md5-cache/dev-ros/roscpp_serialization-0.5.6 b/metadata/md5-cache/dev-ros/roscpp_serialization-0.5.6
index 4681623ac12e..36949107467f 100644
--- a/metadata/md5-cache/dev-ros/roscpp_serialization-0.5.6
+++ b/metadata/md5-cache/dev-ros/roscpp_serialization-0.5.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits python_targets_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.5.6.tar.gz -> roscpp_core-0.5.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2b77002609f271b98789f0ef24e703c6
diff --git a/metadata/md5-cache/dev-ros/roscpp_serialization-0.5.7 b/metadata/md5-cache/dev-ros/roscpp_serialization-0.5.7
index 826d38315253..c448fdacec2f 100644
--- a/metadata/md5-cache/dev-ros/roscpp_serialization-0.5.7
+++ b/metadata/md5-cache/dev-ros/roscpp_serialization-0.5.7
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits python_targets_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.5.7.tar.gz -> roscpp_core-0.5.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2b77002609f271b98789f0ef24e703c6
diff --git a/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.0 b/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.0
index c2c676ff52c5..c517a5b2a52d 100644
--- a/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.0
+++ b/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits python_targets_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.0.tar.gz -> roscpp_core-0.6.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2b77002609f271b98789f0ef24e703c6
diff --git a/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.1 b/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.1
index 8e3b6e3ab703..320d01c70d31 100644
--- a/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.1
+++ b/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits python_targets_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.1.tar.gz -> roscpp_core-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5d2b927dc7cefd54b22f3bbd54d14d9c
diff --git a/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.10 b/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.10
index 9ffa29735ad9..1572e62c7a58 100644
--- a/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.10
+++ b/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.10
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits python_targets_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.10.tar.gz -> roscpp_core-0.6.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=753ec8ada57cb481f5f22e8885cc2744
diff --git a/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.11 b/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.11
index 98c992fe0b02..d9e550c3c29a 100644
--- a/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.11
+++ b/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.11
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits python_targets_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.11.tar.gz -> roscpp_core-0.6.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=753ec8ada57cb481f5f22e8885cc2744
diff --git a/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.2 b/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.2
index 8bc31403407e..7da4ff1692c8 100644
--- a/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.2
+++ b/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits python_targets_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.2.tar.gz -> roscpp_core-0.6.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=25faa4dab872b47e8ad07b6706666852
diff --git a/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.3 b/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.3
index b7f4fddfcd54..388ac768e9d5 100644
--- a/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.3
+++ b/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits python_targets_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.3.tar.gz -> roscpp_core-0.6.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=25faa4dab872b47e8ad07b6706666852
diff --git a/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.4 b/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.4
index eb39888dd89a..97d558bf6bcb 100644
--- a/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.4
+++ b/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits python_targets_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.4.tar.gz -> roscpp_core-0.6.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=25faa4dab872b47e8ad07b6706666852
diff --git a/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.5 b/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.5
index ca4f2eec4110..c1168b634cf2 100644
--- a/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.5
+++ b/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits python_targets_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.5.tar.gz -> roscpp_core-0.6.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=25faa4dab872b47e8ad07b6706666852
diff --git a/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.7 b/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.7
index 087b8ebc3132..ffaf4006f9d3 100644
--- a/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.7
+++ b/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.7
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits python_targets_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.7.tar.gz -> roscpp_core-0.6.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=25faa4dab872b47e8ad07b6706666852
diff --git a/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.8 b/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.8
index 19f19664e4f2..9475eecb2f48 100644
--- a/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.8
+++ b/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.8
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits python_targets_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.8.tar.gz -> roscpp_core-0.6.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=753ec8ada57cb481f5f22e8885cc2744
diff --git a/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.9 b/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.9
index de76155e87ba..fa34cf6c47a4 100644
--- a/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.9
+++ b/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.9
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits python_targets_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.9.tar.gz -> roscpp_core-0.6.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=753ec8ada57cb481f5f22e8885cc2744
diff --git a/metadata/md5-cache/dev-ros/roscpp_serialization-9999 b/metadata/md5-cache/dev-ros/roscpp_serialization-9999
index e8b543e9fa45..0be1efc5b4cf 100644
--- a/metadata/md5-cache/dev-ros/roscpp_serialization-9999
+++ b/metadata/md5-cache/dev-ros/roscpp_serialization-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=2b77002609f271b98789f0ef24e703c6
diff --git a/metadata/md5-cache/dev-ros/roscpp_traits-0.5.6 b/metadata/md5-cache/dev-ros/roscpp_traits-0.5.6
index c7a0bc5536b4..baa1b2bbf31f 100644
--- a/metadata/md5-cache/dev-ros/roscpp_traits-0.5.6
+++ b/metadata/md5-cache/dev-ros/roscpp_traits-0.5.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime python_targets_python2_7? ( >=dev-lan
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.5.6.tar.gz -> roscpp_core-0.5.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d62b8bd7d601d96f8eac61ec13a823a1
diff --git a/metadata/md5-cache/dev-ros/roscpp_traits-0.5.7 b/metadata/md5-cache/dev-ros/roscpp_traits-0.5.7
index a7ebd914bd3e..88b1db3a69a2 100644
--- a/metadata/md5-cache/dev-ros/roscpp_traits-0.5.7
+++ b/metadata/md5-cache/dev-ros/roscpp_traits-0.5.7
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime python_targets_python2_7? ( >=dev-lan
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.5.7.tar.gz -> roscpp_core-0.5.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d62b8bd7d601d96f8eac61ec13a823a1
diff --git a/metadata/md5-cache/dev-ros/roscpp_traits-0.6.0 b/metadata/md5-cache/dev-ros/roscpp_traits-0.6.0
index 0d2d3f73cda4..62809aac23a3 100644
--- a/metadata/md5-cache/dev-ros/roscpp_traits-0.6.0
+++ b/metadata/md5-cache/dev-ros/roscpp_traits-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime python_targets_python2_7? ( >=dev-lan
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.0.tar.gz -> roscpp_core-0.6.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d62b8bd7d601d96f8eac61ec13a823a1
diff --git a/metadata/md5-cache/dev-ros/roscpp_traits-0.6.1 b/metadata/md5-cache/dev-ros/roscpp_traits-0.6.1
index a3c7206d0424..186e1fefbbbb 100644
--- a/metadata/md5-cache/dev-ros/roscpp_traits-0.6.1
+++ b/metadata/md5-cache/dev-ros/roscpp_traits-0.6.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime python_targets_python2_7? ( >=dev-lan
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.1.tar.gz -> roscpp_core-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f94fdf48324975e1cd194b8f4985a053
diff --git a/metadata/md5-cache/dev-ros/roscpp_traits-0.6.10 b/metadata/md5-cache/dev-ros/roscpp_traits-0.6.10
index 115c2f87821f..2729373920fd 100644
--- a/metadata/md5-cache/dev-ros/roscpp_traits-0.6.10
+++ b/metadata/md5-cache/dev-ros/roscpp_traits-0.6.10
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime python_targets_python2_7? ( >=dev-lan
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.10.tar.gz -> roscpp_core-0.6.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0fffe56e11432b15f1edccb94479829a
diff --git a/metadata/md5-cache/dev-ros/roscpp_traits-0.6.11 b/metadata/md5-cache/dev-ros/roscpp_traits-0.6.11
index 054e6187476c..910ab83f55d4 100644
--- a/metadata/md5-cache/dev-ros/roscpp_traits-0.6.11
+++ b/metadata/md5-cache/dev-ros/roscpp_traits-0.6.11
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime python_targets_python2_7? ( >=dev-lan
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.11.tar.gz -> roscpp_core-0.6.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0fffe56e11432b15f1edccb94479829a
diff --git a/metadata/md5-cache/dev-ros/roscpp_traits-0.6.2 b/metadata/md5-cache/dev-ros/roscpp_traits-0.6.2
index 1dd741f35bb8..90e55ac80f80 100644
--- a/metadata/md5-cache/dev-ros/roscpp_traits-0.6.2
+++ b/metadata/md5-cache/dev-ros/roscpp_traits-0.6.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime python_targets_python2_7? ( >=dev-lan
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.2.tar.gz -> roscpp_core-0.6.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=fe84de90f142fb8a2485d97bf6a7416f
diff --git a/metadata/md5-cache/dev-ros/roscpp_traits-0.6.3 b/metadata/md5-cache/dev-ros/roscpp_traits-0.6.3
index 11d7800d3f7f..17d85e457cfe 100644
--- a/metadata/md5-cache/dev-ros/roscpp_traits-0.6.3
+++ b/metadata/md5-cache/dev-ros/roscpp_traits-0.6.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime python_targets_python2_7? ( >=dev-lan
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.3.tar.gz -> roscpp_core-0.6.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fe84de90f142fb8a2485d97bf6a7416f
diff --git a/metadata/md5-cache/dev-ros/roscpp_traits-0.6.4 b/metadata/md5-cache/dev-ros/roscpp_traits-0.6.4
index 0c3ee2d973d0..e77671c09c8f 100644
--- a/metadata/md5-cache/dev-ros/roscpp_traits-0.6.4
+++ b/metadata/md5-cache/dev-ros/roscpp_traits-0.6.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime python_targets_python2_7? ( >=dev-lan
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.4.tar.gz -> roscpp_core-0.6.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fe84de90f142fb8a2485d97bf6a7416f
diff --git a/metadata/md5-cache/dev-ros/roscpp_traits-0.6.5 b/metadata/md5-cache/dev-ros/roscpp_traits-0.6.5
index 15e083b0a233..d67075b62c96 100644
--- a/metadata/md5-cache/dev-ros/roscpp_traits-0.6.5
+++ b/metadata/md5-cache/dev-ros/roscpp_traits-0.6.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime python_targets_python2_7? ( >=dev-lan
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.5.tar.gz -> roscpp_core-0.6.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fe84de90f142fb8a2485d97bf6a7416f
diff --git a/metadata/md5-cache/dev-ros/roscpp_traits-0.6.7 b/metadata/md5-cache/dev-ros/roscpp_traits-0.6.7
index 4a003e636336..b1c8cb28a2e9 100644
--- a/metadata/md5-cache/dev-ros/roscpp_traits-0.6.7
+++ b/metadata/md5-cache/dev-ros/roscpp_traits-0.6.7
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime python_targets_python2_7? ( >=dev-lan
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.7.tar.gz -> roscpp_core-0.6.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fe84de90f142fb8a2485d97bf6a7416f
diff --git a/metadata/md5-cache/dev-ros/roscpp_traits-0.6.8 b/metadata/md5-cache/dev-ros/roscpp_traits-0.6.8
index 4e8641e77192..091f07a08283 100644
--- a/metadata/md5-cache/dev-ros/roscpp_traits-0.6.8
+++ b/metadata/md5-cache/dev-ros/roscpp_traits-0.6.8
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime python_targets_python2_7? ( >=dev-lan
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.8.tar.gz -> roscpp_core-0.6.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0fffe56e11432b15f1edccb94479829a
diff --git a/metadata/md5-cache/dev-ros/roscpp_traits-0.6.9 b/metadata/md5-cache/dev-ros/roscpp_traits-0.6.9
index 79a8310e3ef5..46b7b22ea345 100644
--- a/metadata/md5-cache/dev-ros/roscpp_traits-0.6.9
+++ b/metadata/md5-cache/dev-ros/roscpp_traits-0.6.9
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime python_targets_python2_7? ( >=dev-lan
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.9.tar.gz -> roscpp_core-0.6.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0fffe56e11432b15f1edccb94479829a
diff --git a/metadata/md5-cache/dev-ros/roscpp_traits-9999 b/metadata/md5-cache/dev-ros/roscpp_traits-9999
index 12f6ee808333..9f147399be8d 100644
--- a/metadata/md5-cache/dev-ros/roscpp_traits-9999
+++ b/metadata/md5-cache/dev-ros/roscpp_traits-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/cpp_common dev-ros/rostime python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=d62b8bd7d601d96f8eac61ec13a823a1
diff --git a/metadata/md5-cache/dev-ros/roscpp_tutorials-0.6.1 b/metadata/md5-cache/dev-ros/roscpp_tutorials-0.6.1
index ea28e8e58a47..0cb070f7d396 100644
--- a/metadata/md5-cache/dev-ros/roscpp_tutorials-0.6.1
+++ b/metadata/md5-cache/dev-ros/roscpp_tutorials-0.6.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/roscons
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.6.1.tar.gz -> ros_tutorials-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=aac6167efa0b1cd6640d13388ee46489
diff --git a/metadata/md5-cache/dev-ros/roscpp_tutorials-0.7.0 b/metadata/md5-cache/dev-ros/roscpp_tutorials-0.7.0
index 12ae4c3f9434..5d721ca3e1f1 100644
--- a/metadata/md5-cache/dev-ros/roscpp_tutorials-0.7.0
+++ b/metadata/md5-cache/dev-ros/roscpp_tutorials-0.7.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/roscons
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.7.0.tar.gz -> ros_tutorials-0.7.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=aac6167efa0b1cd6640d13388ee46489
diff --git a/metadata/md5-cache/dev-ros/roscpp_tutorials-0.7.1 b/metadata/md5-cache/dev-ros/roscpp_tutorials-0.7.1
index a1888c4f8f55..22f303fb195c 100644
--- a/metadata/md5-cache/dev-ros/roscpp_tutorials-0.7.1
+++ b/metadata/md5-cache/dev-ros/roscpp_tutorials-0.7.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/roscons
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.7.1.tar.gz -> ros_tutorials-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=af90802fb9a53c4bbd6e3d17125aa087
diff --git a/metadata/md5-cache/dev-ros/roscpp_tutorials-0.8.0 b/metadata/md5-cache/dev-ros/roscpp_tutorials-0.8.0
index 7587e1d8bade..4be40cbe93b0 100644
--- a/metadata/md5-cache/dev-ros/roscpp_tutorials-0.8.0
+++ b/metadata/md5-cache/dev-ros/roscpp_tutorials-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/roscons
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.8.0.tar.gz -> ros_tutorials-0.8.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ce6bfb15050c8cfb22fb9216eed46305
diff --git a/metadata/md5-cache/dev-ros/roscpp_tutorials-0.8.1 b/metadata/md5-cache/dev-ros/roscpp_tutorials-0.8.1
index a02ca9240afe..45de8ee38b0e 100644
--- a/metadata/md5-cache/dev-ros/roscpp_tutorials-0.8.1
+++ b/metadata/md5-cache/dev-ros/roscpp_tutorials-0.8.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/roscons
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.8.1.tar.gz -> ros_tutorials-0.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ce6bfb15050c8cfb22fb9216eed46305
diff --git a/metadata/md5-cache/dev-ros/roscpp_tutorials-0.9.0 b/metadata/md5-cache/dev-ros/roscpp_tutorials-0.9.0
index 9f1f57eb0a80..78d4ea5c241c 100644
--- a/metadata/md5-cache/dev-ros/roscpp_tutorials-0.9.0
+++ b/metadata/md5-cache/dev-ros/roscpp_tutorials-0.9.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/roscons
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.9.0.tar.gz -> ros_tutorials-0.9.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8b4e63339c2d1f36add174549aefe47d
diff --git a/metadata/md5-cache/dev-ros/roscpp_tutorials-9999 b/metadata/md5-cache/dev-ros/roscpp_tutorials-9999
index 62d6d16aa79a..a5a6944b5c9a 100644
--- a/metadata/md5-cache/dev-ros/roscpp_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/roscpp_tutorials-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/rosconsole dev-ros/roscpp_serialization python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=aac6167efa0b1cd6640d13388ee46489
diff --git a/metadata/md5-cache/dev-ros/roscreate-1.14.0 b/metadata/md5-cache/dev-ros/roscreate-1.14.0
index 9b877648f99a..d387a1ed7a13 100644
--- a/metadata/md5-cache/dev-ros/roscreate-1.14.0
+++ b/metadata/md5-cache/dev-ros/roscreate-1.14.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.14.0.tar.gz -> ros-1.14.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4cab8daeace785d6776b1e00eb6f1777
diff --git a/metadata/md5-cache/dev-ros/roscreate-1.14.1 b/metadata/md5-cache/dev-ros/roscreate-1.14.1
index 16a45d0333c9..2be0d9fc06e0 100644
--- a/metadata/md5-cache/dev-ros/roscreate-1.14.1
+++ b/metadata/md5-cache/dev-ros/roscreate-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.14.1.tar.gz -> ros-1.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4cab8daeace785d6776b1e00eb6f1777
diff --git a/metadata/md5-cache/dev-ros/roscreate-1.14.2 b/metadata/md5-cache/dev-ros/roscreate-1.14.2
index 0d3fed381e9d..29f72bcb20a5 100644
--- a/metadata/md5-cache/dev-ros/roscreate-1.14.2
+++ b/metadata/md5-cache/dev-ros/roscreate-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.14.2.tar.gz -> ros-1.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=4cab8daeace785d6776b1e00eb6f1777
diff --git a/metadata/md5-cache/dev-ros/roscreate-1.14.3 b/metadata/md5-cache/dev-ros/roscreate-1.14.3
index 2ce6721fe0a8..634662c3f8ec 100644
--- a/metadata/md5-cache/dev-ros/roscreate-1.14.3
+++ b/metadata/md5-cache/dev-ros/roscreate-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.14.3.tar.gz -> ros-1.14.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0317a57a62e7b0f9e882358c90524029
diff --git a/metadata/md5-cache/dev-ros/roscreate-1.14.4 b/metadata/md5-cache/dev-ros/roscreate-1.14.4
index 39439495f0e7..124c9361ff93 100644
--- a/metadata/md5-cache/dev-ros/roscreate-1.14.4
+++ b/metadata/md5-cache/dev-ros/roscreate-1.14.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.14.4.tar.gz -> ros-1.14.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0317a57a62e7b0f9e882358c90524029
diff --git a/metadata/md5-cache/dev-ros/roscreate-9999 b/metadata/md5-cache/dev-ros/roscreate-9999
index 3e4519ef728d..c2ade37ba9af 100644
--- a/metadata/md5-cache/dev-ros/roscreate-9999
+++ b/metadata/md5-cache/dev-ros/roscreate-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=4cab8daeace785d6776b1e00eb6f1777
diff --git a/metadata/md5-cache/dev-ros/rosdiagnostic-1.9.0 b/metadata/md5-cache/dev-ros/rosdiagnostic-1.9.0
index a655bfeeda9c..8b18feb9c0e8 100644
--- a/metadata/md5-cache/dev-ros/rosdiagnostic-1.9.0
+++ b/metadata/md5-cache/dev-ros/rosdiagnostic-1.9.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.0.tar.gz -> diagnostics-1.9.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9686fbfea19f92660c94f1e1fe76b403
diff --git a/metadata/md5-cache/dev-ros/rosdiagnostic-1.9.2 b/metadata/md5-cache/dev-ros/rosdiagnostic-1.9.2
index 649b12783716..525ff273a6f1 100644
--- a/metadata/md5-cache/dev-ros/rosdiagnostic-1.9.2
+++ b/metadata/md5-cache/dev-ros/rosdiagnostic-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.2.tar.gz -> diagnostics-1.9.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=9686fbfea19f92660c94f1e1fe76b403
diff --git a/metadata/md5-cache/dev-ros/rosdiagnostic-1.9.3 b/metadata/md5-cache/dev-ros/rosdiagnostic-1.9.3
index 15e76cb944b7..ace047684de0 100644
--- a/metadata/md5-cache/dev-ros/rosdiagnostic-1.9.3
+++ b/metadata/md5-cache/dev-ros/rosdiagnostic-1.9.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.3.tar.gz -> diagnostics-1.9.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9360ba558027c848671838ca372b75fd
diff --git a/metadata/md5-cache/dev-ros/rosdiagnostic-9999 b/metadata/md5-cache/dev-ros/rosdiagnostic-9999
index 321a22cb9aa8..ae899be961b0 100644
--- a/metadata/md5-cache/dev-ros/rosdiagnostic-9999
+++ b/metadata/md5-cache/dev-ros/rosdiagnostic-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=9686fbfea19f92660c94f1e1fe76b403
diff --git a/metadata/md5-cache/dev-ros/rosgraph-1.13.0 b/metadata/md5-cache/dev-ros/rosgraph-1.13.0
index 6ceb37080200..3641b01deb00 100644
--- a/metadata/md5-cache/dev-ros/rosgraph-1.13.0
+++ b/metadata/md5-cache/dev-ros/rosgraph-1.13.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/netifaces[python_targets_python2_7(-)?,-python_single_target_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.0.tar.gz -> ros_comm-1.13.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=073c39b28801801bdeaa50bfc673c874
diff --git a/metadata/md5-cache/dev-ros/rosgraph-1.13.1 b/metadata/md5-cache/dev-ros/rosgraph-1.13.1
index b2c10e2c8a3c..25004c171a2e 100644
--- a/metadata/md5-cache/dev-ros/rosgraph-1.13.1
+++ b/metadata/md5-cache/dev-ros/rosgraph-1.13.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/netifaces[python_targets_python2_7(-)?,-python_single_target_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.1.tar.gz -> ros_comm-1.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=073c39b28801801bdeaa50bfc673c874
diff --git a/metadata/md5-cache/dev-ros/rosgraph-1.13.2 b/metadata/md5-cache/dev-ros/rosgraph-1.13.2
index 95d3a7672fc0..1467eaf4efdf 100644
--- a/metadata/md5-cache/dev-ros/rosgraph-1.13.2
+++ b/metadata/md5-cache/dev-ros/rosgraph-1.13.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/netifaces[python_targets_python2_7(-)?,-python_single_target_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.2.tar.gz -> ros_comm-1.13.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=073c39b28801801bdeaa50bfc673c874
diff --git a/metadata/md5-cache/dev-ros/rosgraph-1.13.4 b/metadata/md5-cache/dev-ros/rosgraph-1.13.4
index 7ba3c74e1f55..ff6d92d27e1a 100644
--- a/metadata/md5-cache/dev-ros/rosgraph-1.13.4
+++ b/metadata/md5-cache/dev-ros/rosgraph-1.13.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/netifaces[python_targets_python2_7(-)?,-python_single_target_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.4.tar.gz -> ros_comm-1.13.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=073c39b28801801bdeaa50bfc673c874
diff --git a/metadata/md5-cache/dev-ros/rosgraph-1.13.5 b/metadata/md5-cache/dev-ros/rosgraph-1.13.5
index 0c5b9f305452..bab76df1f3d4 100644
--- a/metadata/md5-cache/dev-ros/rosgraph-1.13.5
+++ b/metadata/md5-cache/dev-ros/rosgraph-1.13.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/netifaces[python_targets_python2_7(-)?,-python_single_target_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.5.tar.gz -> ros_comm-1.13.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=073c39b28801801bdeaa50bfc673c874
diff --git a/metadata/md5-cache/dev-ros/rosgraph-1.13.6 b/metadata/md5-cache/dev-ros/rosgraph-1.13.6
index f0f63e3296ae..b0a25513ef84 100644
--- a/metadata/md5-cache/dev-ros/rosgraph-1.13.6
+++ b/metadata/md5-cache/dev-ros/rosgraph-1.13.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/netifaces[python_targets_python2_7(-)?,-python_single_target_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.6.tar.gz -> ros_comm-1.13.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9ae3594f91af473a0a8ea4c5324a24a2
diff --git a/metadata/md5-cache/dev-ros/rosgraph-1.14.2 b/metadata/md5-cache/dev-ros/rosgraph-1.14.2
index d9130a86facf..59d4e4d9f282 100644
--- a/metadata/md5-cache/dev-ros/rosgraph-1.14.2
+++ b/metadata/md5-cache/dev-ros/rosgraph-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/netifaces[python_targets_python2_7(-)?,-python_single_target_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.2.tar.gz -> ros_comm-1.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=9ae3594f91af473a0a8ea4c5324a24a2
diff --git a/metadata/md5-cache/dev-ros/rosgraph-1.14.3 b/metadata/md5-cache/dev-ros/rosgraph-1.14.3
index ff80135b7307..7de09cbea23a 100644
--- a/metadata/md5-cache/dev-ros/rosgraph-1.14.3
+++ b/metadata/md5-cache/dev-ros/rosgraph-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/netifaces[python_targets_python2_7(-)?,-python_single_target_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9ae3594f91af473a0a8ea4c5324a24a2
diff --git a/metadata/md5-cache/dev-ros/rosgraph-9999 b/metadata/md5-cache/dev-ros/rosgraph-9999
index 65276bc3df85..c46a6fb30535 100644
--- a/metadata/md5-cache/dev-ros/rosgraph-9999
+++ b/metadata/md5-cache/dev-ros/rosgraph-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/netifaces[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=073c39b28801801bdeaa50bfc673c874
diff --git a/metadata/md5-cache/dev-ros/rosgraph_msgs-1.11.2 b/metadata/md5-cache/dev-ros/rosgraph_msgs-1.11.2
index cd90151f75f3..8c3e0d385e66 100644
--- a/metadata/md5-cache/dev-ros/rosgraph_msgs-1.11.2
+++ b/metadata/md5-cache/dev-ros/rosgraph_msgs-1.11.2
@@ -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/ros/ros_comm_msgs/archive/1.11.2.tar.gz -> ros_comm_msgs-1.11.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=af758456574122542b7e7d0cf6fba693
diff --git a/metadata/md5-cache/dev-ros/rosgraph_msgs-9999 b/metadata/md5-cache/dev-ros/rosgraph_msgs-9999
index d74db2c57c00..0a09674eddee 100644
--- a/metadata/md5-cache/dev-ros/rosgraph_msgs-9999
+++ b/metadata/md5-cache/dev-ros/rosgraph_msgs-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=af758456574122542b7e7d0cf6fba693
diff --git a/metadata/md5-cache/dev-ros/roslang-1.12.3 b/metadata/md5-cache/dev-ros/roslang-1.12.3
index 997d49ef218e..451f6592e353 100644
--- a/metadata/md5-cache/dev-ros/roslang-1.12.3
+++ b/metadata/md5-cache/dev-ros/roslang-1.12.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=0
 SRC_URI=https://github.com/ros/ros/archive/1.12.3.tar.gz -> ros-1.12.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=007b0fb4877d2bc2a823b5af8c69bdf8
diff --git a/metadata/md5-cache/dev-ros/roslang-1.12.5 b/metadata/md5-cache/dev-ros/roslang-1.12.5
index 2388c0c20522..19f7832e53ea 100644
--- a/metadata/md5-cache/dev-ros/roslang-1.12.5
+++ b/metadata/md5-cache/dev-ros/roslang-1.12.5
@@ -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/ros/ros/archive/1.12.5.tar.gz -> ros-1.12.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=007b0fb4877d2bc2a823b5af8c69bdf8
diff --git a/metadata/md5-cache/dev-ros/roslang-1.13.1 b/metadata/md5-cache/dev-ros/roslang-1.13.1
index 50726a8d9cfb..083c74c1700a 100644
--- a/metadata/md5-cache/dev-ros/roslang-1.13.1
+++ b/metadata/md5-cache/dev-ros/roslang-1.13.1
@@ -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/ros/ros/archive/1.13.1.tar.gz -> ros-1.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=007b0fb4877d2bc2a823b5af8c69bdf8
diff --git a/metadata/md5-cache/dev-ros/roslang-1.13.2 b/metadata/md5-cache/dev-ros/roslang-1.13.2
index 55164fb811b6..5f1f825a3276 100644
--- a/metadata/md5-cache/dev-ros/roslang-1.13.2
+++ b/metadata/md5-cache/dev-ros/roslang-1.13.2
@@ -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/ros/ros/archive/1.13.2.tar.gz -> ros-1.13.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=0667009ea7b27fe163fb591fc92e6dc1
diff --git a/metadata/md5-cache/dev-ros/roslang-1.13.3 b/metadata/md5-cache/dev-ros/roslang-1.13.3
index d1fd095d88f4..f2c88f77614c 100644
--- a/metadata/md5-cache/dev-ros/roslang-1.13.3
+++ b/metadata/md5-cache/dev-ros/roslang-1.13.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=0
 SRC_URI=https://github.com/ros/ros/archive/1.13.3.tar.gz -> ros-1.13.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0667009ea7b27fe163fb591fc92e6dc1
diff --git a/metadata/md5-cache/dev-ros/roslang-1.13.4 b/metadata/md5-cache/dev-ros/roslang-1.13.4
index b5afd374a08d..5fb3afa0beac 100644
--- a/metadata/md5-cache/dev-ros/roslang-1.13.4
+++ b/metadata/md5-cache/dev-ros/roslang-1.13.4
@@ -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/ros/ros/archive/1.13.4.tar.gz -> ros-1.13.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0667009ea7b27fe163fb591fc92e6dc1
diff --git a/metadata/md5-cache/dev-ros/roslang-1.13.5 b/metadata/md5-cache/dev-ros/roslang-1.13.5
index efe87f476c6b..ee88e428fe76 100644
--- a/metadata/md5-cache/dev-ros/roslang-1.13.5
+++ b/metadata/md5-cache/dev-ros/roslang-1.13.5
@@ -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/ros/ros/archive/1.13.5.tar.gz -> ros-1.13.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f94637b5b305b7ee97a2b961f79a8e3b
diff --git a/metadata/md5-cache/dev-ros/roslang-1.14.0 b/metadata/md5-cache/dev-ros/roslang-1.14.0
index 4b1e0cc19f78..e54a9711ea9f 100644
--- a/metadata/md5-cache/dev-ros/roslang-1.14.0
+++ b/metadata/md5-cache/dev-ros/roslang-1.14.0
@@ -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/ros/ros/archive/1.14.0.tar.gz -> ros-1.14.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f94637b5b305b7ee97a2b961f79a8e3b
diff --git a/metadata/md5-cache/dev-ros/roslang-1.14.1 b/metadata/md5-cache/dev-ros/roslang-1.14.1
index 112b88f408bb..25d5faa5a3d3 100644
--- a/metadata/md5-cache/dev-ros/roslang-1.14.1
+++ b/metadata/md5-cache/dev-ros/roslang-1.14.1
@@ -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/ros/ros/archive/1.14.1.tar.gz -> ros-1.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f94637b5b305b7ee97a2b961f79a8e3b
diff --git a/metadata/md5-cache/dev-ros/roslang-1.14.2 b/metadata/md5-cache/dev-ros/roslang-1.14.2
index 9acdee34894f..0e6232f22963 100644
--- a/metadata/md5-cache/dev-ros/roslang-1.14.2
+++ b/metadata/md5-cache/dev-ros/roslang-1.14.2
@@ -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/ros/ros/archive/1.14.2.tar.gz -> ros-1.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=f94637b5b305b7ee97a2b961f79a8e3b
diff --git a/metadata/md5-cache/dev-ros/roslang-1.14.3 b/metadata/md5-cache/dev-ros/roslang-1.14.3
index f941786e14d0..96909054e8b5 100644
--- a/metadata/md5-cache/dev-ros/roslang-1.14.3
+++ b/metadata/md5-cache/dev-ros/roslang-1.14.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=0
 SRC_URI=https://github.com/ros/ros/archive/1.14.3.tar.gz -> ros-1.14.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b252c6f126036ba26be6fb7aeaaf8137
diff --git a/metadata/md5-cache/dev-ros/roslang-1.14.4 b/metadata/md5-cache/dev-ros/roslang-1.14.4
index de8d693ebe08..5f63f2717c51 100644
--- a/metadata/md5-cache/dev-ros/roslang-1.14.4
+++ b/metadata/md5-cache/dev-ros/roslang-1.14.4
@@ -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/ros/ros/archive/1.14.4.tar.gz -> ros-1.14.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b252c6f126036ba26be6fb7aeaaf8137
diff --git a/metadata/md5-cache/dev-ros/roslang-9999 b/metadata/md5-cache/dev-ros/roslang-9999
index e11d8ce6f76e..f9e6b27ff4e7 100644
--- a/metadata/md5-cache/dev-ros/roslang-9999
+++ b/metadata/md5-cache/dev-ros/roslang-9999
@@ -8,5 +8,5 @@ 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=007b0fb4877d2bc2a823b5af8c69bdf8
diff --git a/metadata/md5-cache/dev-ros/roslaunch-1.13.0 b/metadata/md5-cache/dev-ros/roslaunch-1.13.0
index 225d8a7263dd..7d6479ec7a77 100644
--- a/metadata/md5-cache/dev-ros/roslaunch-1.13.0
+++ b/metadata/md5-cache/dev-ros/roslaunch-1.13.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.0.tar.gz -> ros_comm-1.13.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	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a82ad3beea0c047dcd59aab7e4fb7cce
diff --git a/metadata/md5-cache/dev-ros/roslaunch-1.13.1 b/metadata/md5-cache/dev-ros/roslaunch-1.13.1
index cb31ab7978c7..4f0bbeadeb21 100644
--- a/metadata/md5-cache/dev-ros/roslaunch-1.13.1
+++ b/metadata/md5-cache/dev-ros/roslaunch-1.13.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.1.tar.gz -> ros_comm-1.13.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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a82ad3beea0c047dcd59aab7e4fb7cce
diff --git a/metadata/md5-cache/dev-ros/roslaunch-1.13.2 b/metadata/md5-cache/dev-ros/roslaunch-1.13.2
index 2617f0156242..db0204097e60 100644
--- a/metadata/md5-cache/dev-ros/roslaunch-1.13.2
+++ b/metadata/md5-cache/dev-ros/roslaunch-1.13.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.2.tar.gz -> ros_comm-1.13.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a82ad3beea0c047dcd59aab7e4fb7cce
diff --git a/metadata/md5-cache/dev-ros/roslaunch-1.13.4 b/metadata/md5-cache/dev-ros/roslaunch-1.13.4
index bb7cdf0e8853..8c06c89a23ea 100644
--- a/metadata/md5-cache/dev-ros/roslaunch-1.13.4
+++ b/metadata/md5-cache/dev-ros/roslaunch-1.13.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.4.tar.gz -> ros_comm-1.13.4.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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a82ad3beea0c047dcd59aab7e4fb7cce
diff --git a/metadata/md5-cache/dev-ros/roslaunch-1.13.5 b/metadata/md5-cache/dev-ros/roslaunch-1.13.5
index ebe6fdb51954..16c6fca8cda4 100644
--- a/metadata/md5-cache/dev-ros/roslaunch-1.13.5
+++ b/metadata/md5-cache/dev-ros/roslaunch-1.13.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.5.tar.gz -> ros_comm-1.13.5.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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a82ad3beea0c047dcd59aab7e4fb7cce
diff --git a/metadata/md5-cache/dev-ros/roslaunch-1.13.6 b/metadata/md5-cache/dev-ros/roslaunch-1.13.6
index 0c362a82a472..91df40f8d17b 100644
--- a/metadata/md5-cache/dev-ros/roslaunch-1.13.6
+++ b/metadata/md5-cache/dev-ros/roslaunch-1.13.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.6.tar.gz -> ros_comm-1.13.6.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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a07cde16b2117a2026da07e04ce3efca
diff --git a/metadata/md5-cache/dev-ros/roslaunch-1.14.2 b/metadata/md5-cache/dev-ros/roslaunch-1.14.2
index d47ed994a753..331880de31c3 100644
--- a/metadata/md5-cache/dev-ros/roslaunch-1.14.2
+++ b/metadata/md5-cache/dev-ros/roslaunch-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.2.tar.gz -> ros_comm-1.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a07cde16b2117a2026da07e04ce3efca
diff --git a/metadata/md5-cache/dev-ros/roslaunch-1.14.3 b/metadata/md5-cache/dev-ros/roslaunch-1.14.3
index ded931a89feb..6980814ebf6e 100644
--- a/metadata/md5-cache/dev-ros/roslaunch-1.14.3
+++ b/metadata/md5-cache/dev-ros/roslaunch-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
-_eclasses_=cmake-utils	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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a07cde16b2117a2026da07e04ce3efca
diff --git a/metadata/md5-cache/dev-ros/roslaunch-9999 b/metadata/md5-cache/dev-ros/roslaunch-9999
index 997460060535..b94eb95a27d8 100644
--- a/metadata/md5-cache/dev-ros/roslaunch-9999
+++ b/metadata/md5-cache/dev-ros/roslaunch-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosclean[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosout python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a82ad3beea0c047dcd59aab7e4fb7cce
diff --git a/metadata/md5-cache/dev-ros/roslib-1.14.0-r1 b/metadata/md5-cache/dev-ros/roslib-1.14.0-r1
index 5fa81c4d8af7..4da31fea3db7 100644
--- a/metadata/md5-cache/dev-ros/roslib-1.14.0-r1
+++ b/metadata/md5-cache/dev-ros/roslib-1.14.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/rospkg-1.0.37[python_targets_python2_7(-)?,-python_single_t
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.14.0.tar.gz -> ros-1.14.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=54f6dab05dcaf5c4286796ded9fe03f1
diff --git a/metadata/md5-cache/dev-ros/roslib-1.14.1 b/metadata/md5-cache/dev-ros/roslib-1.14.1
index 5f6a99376ead..23093cab95c8 100644
--- a/metadata/md5-cache/dev-ros/roslib-1.14.1
+++ b/metadata/md5-cache/dev-ros/roslib-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/rospkg-1.0.37[python_targets_python2_7(-)?,-python_single_t
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.14.1.tar.gz -> ros-1.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=54f6dab05dcaf5c4286796ded9fe03f1
diff --git a/metadata/md5-cache/dev-ros/roslib-1.14.2 b/metadata/md5-cache/dev-ros/roslib-1.14.2
index fff7d7be080f..f4eccb06f444 100644
--- a/metadata/md5-cache/dev-ros/roslib-1.14.2
+++ b/metadata/md5-cache/dev-ros/roslib-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/rospkg-1.0.37[python_targets_python2_7(-)?,-python_single_t
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.14.2.tar.gz -> ros-1.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=54f6dab05dcaf5c4286796ded9fe03f1
diff --git a/metadata/md5-cache/dev-ros/roslib-1.14.3 b/metadata/md5-cache/dev-ros/roslib-1.14.3
index 4d111244c577..762f3f8f4f39 100644
--- a/metadata/md5-cache/dev-ros/roslib-1.14.3
+++ b/metadata/md5-cache/dev-ros/roslib-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/rospkg-1.0.37[python_targets_python2_7(-)?,-python_single_t
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.14.3.tar.gz -> ros-1.14.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b37cf7f7cfeec3e05a475711241b806f
diff --git a/metadata/md5-cache/dev-ros/roslib-1.14.4 b/metadata/md5-cache/dev-ros/roslib-1.14.4
index aaaf8fe463ef..6c14b723fede 100644
--- a/metadata/md5-cache/dev-ros/roslib-1.14.4
+++ b/metadata/md5-cache/dev-ros/roslib-1.14.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/rospkg-1.0.37[python_targets_python2_7(-)?,-python_single_t
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.14.4.tar.gz -> ros-1.14.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b37cf7f7cfeec3e05a475711241b806f
diff --git a/metadata/md5-cache/dev-ros/roslib-9999 b/metadata/md5-cache/dev-ros/roslib-9999
index e1b6a7651f08..086f44710091 100644
--- a/metadata/md5-cache/dev-ros/roslib-9999
+++ b/metadata/md5-cache/dev-ros/roslib-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-python/rospkg-1.0.37[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-ros/rospack dev-ros/ros_environment python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=b37cf7f7cfeec3e05a475711241b806f
diff --git a/metadata/md5-cache/dev-ros/roslint-0.11.0 b/metadata/md5-cache/dev-ros/roslint-0.11.0
index c432c31d71eb..232add0a12c4 100644
--- a/metadata/md5-cache/dev-ros/roslint-0.11.0
+++ b/metadata/md5-cache/dev-ros/roslint-0.11.0
@@ -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/ros/roslint/archive/0.11.0.tar.gz -> roslint-0.11.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=960cca10ace0ffb392a291948392159c
diff --git a/metadata/md5-cache/dev-ros/roslint-0.11.1 b/metadata/md5-cache/dev-ros/roslint-0.11.1
index 4dfb93888de6..9074de0b9482 100644
--- a/metadata/md5-cache/dev-ros/roslint-0.11.1
+++ b/metadata/md5-cache/dev-ros/roslint-0.11.1
@@ -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/ros/roslint/archive/0.11.1.tar.gz -> roslint-0.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=960cca10ace0ffb392a291948392159c
diff --git a/metadata/md5-cache/dev-ros/roslint-0.11.2 b/metadata/md5-cache/dev-ros/roslint-0.11.2
index c289780c0972..60d655a901e2 100644
--- a/metadata/md5-cache/dev-ros/roslint-0.11.2
+++ b/metadata/md5-cache/dev-ros/roslint-0.11.2
@@ -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/ros/roslint/archive/0.11.2.tar.gz -> roslint-0.11.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=483ad99b4cb4d2f7135cb27eeebe5124
diff --git a/metadata/md5-cache/dev-ros/roslint-9999 b/metadata/md5-cache/dev-ros/roslint-9999
index 6db8e52c17cb..50150f077b82 100644
--- a/metadata/md5-cache/dev-ros/roslint-9999
+++ b/metadata/md5-cache/dev-ros/roslint-9999
@@ -8,5 +8,5 @@ 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=960cca10ace0ffb392a291948392159c
diff --git a/metadata/md5-cache/dev-ros/roslisp-1.9.21 b/metadata/md5-cache/dev-ros/roslisp-1.9.21
index 9adf461f5347..c98f4d11547d 100644
--- a/metadata/md5-cache/dev-ros/roslisp-1.9.21
+++ b/metadata/md5-cache/dev-ros/roslisp-1.9.21
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslang dev-lisp/sbcl dev-ros/rospack dev-ros/rosgraph_msgs dev-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roslisp/archive/1.9.21.tar.gz -> roslisp-1.9.21.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f86e43a5d241ec85faa38531fa1550b7
diff --git a/metadata/md5-cache/dev-ros/roslisp-9999 b/metadata/md5-cache/dev-ros/roslisp-9999
index e9f2b09650f2..cc06acd44d4c 100644
--- a/metadata/md5-cache/dev-ros/roslisp-9999
+++ b/metadata/md5-cache/dev-ros/roslisp-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roslang dev-lisp/sbcl dev-ros/rospack dev-ros/rosgraph_msgs dev-ros/std_srvs python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=59e0cc12cc70c131fb152fdef4679aec
diff --git a/metadata/md5-cache/dev-ros/roslz4-1.13.0 b/metadata/md5-cache/dev-ros/roslz4-1.13.0
index ea4a47c64d5c..4255f3277912 100644
--- a/metadata/md5-cache/dev-ros/roslz4-1.13.0
+++ b/metadata/md5-cache/dev-ros/roslz4-1.13.0
@@ -10,5 +10,5 @@ RDEPEND=app-arch/lz4 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.0.tar.gz -> ros_comm-1.13.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a7af38936f1a0581a906f3de42fb516a
diff --git a/metadata/md5-cache/dev-ros/roslz4-1.13.1 b/metadata/md5-cache/dev-ros/roslz4-1.13.1
index ef4071561a85..ba6e8b92a332 100644
--- a/metadata/md5-cache/dev-ros/roslz4-1.13.1
+++ b/metadata/md5-cache/dev-ros/roslz4-1.13.1
@@ -10,5 +10,5 @@ RDEPEND=app-arch/lz4 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.1.tar.gz -> ros_comm-1.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a7af38936f1a0581a906f3de42fb516a
diff --git a/metadata/md5-cache/dev-ros/roslz4-1.13.2 b/metadata/md5-cache/dev-ros/roslz4-1.13.2
index 81bd1497c12a..c8ccbda6a889 100644
--- a/metadata/md5-cache/dev-ros/roslz4-1.13.2
+++ b/metadata/md5-cache/dev-ros/roslz4-1.13.2
@@ -10,5 +10,5 @@ RDEPEND=app-arch/lz4 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.2.tar.gz -> ros_comm-1.13.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=a7af38936f1a0581a906f3de42fb516a
diff --git a/metadata/md5-cache/dev-ros/roslz4-1.13.4 b/metadata/md5-cache/dev-ros/roslz4-1.13.4
index b3e93387c18b..7096e537f706 100644
--- a/metadata/md5-cache/dev-ros/roslz4-1.13.4
+++ b/metadata/md5-cache/dev-ros/roslz4-1.13.4
@@ -10,5 +10,5 @@ RDEPEND=app-arch/lz4 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.4.tar.gz -> ros_comm-1.13.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a7af38936f1a0581a906f3de42fb516a
diff --git a/metadata/md5-cache/dev-ros/roslz4-1.13.5 b/metadata/md5-cache/dev-ros/roslz4-1.13.5
index 34ca8742083b..49e3918b124c 100644
--- a/metadata/md5-cache/dev-ros/roslz4-1.13.5
+++ b/metadata/md5-cache/dev-ros/roslz4-1.13.5
@@ -10,5 +10,5 @@ RDEPEND=app-arch/lz4 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.5.tar.gz -> ros_comm-1.13.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a7af38936f1a0581a906f3de42fb516a
diff --git a/metadata/md5-cache/dev-ros/roslz4-1.13.6 b/metadata/md5-cache/dev-ros/roslz4-1.13.6
index fa1bcc91437d..562c1ced8a12 100644
--- a/metadata/md5-cache/dev-ros/roslz4-1.13.6
+++ b/metadata/md5-cache/dev-ros/roslz4-1.13.6
@@ -10,5 +10,5 @@ RDEPEND=app-arch/lz4 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.6.tar.gz -> ros_comm-1.13.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=58ef86e1e99d15652979f7f57a698554
diff --git a/metadata/md5-cache/dev-ros/roslz4-1.14.2 b/metadata/md5-cache/dev-ros/roslz4-1.14.2
index dfb2cf30934b..5fe894897a29 100644
--- a/metadata/md5-cache/dev-ros/roslz4-1.14.2
+++ b/metadata/md5-cache/dev-ros/roslz4-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=app-arch/lz4 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.2.tar.gz -> ros_comm-1.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=58ef86e1e99d15652979f7f57a698554
diff --git a/metadata/md5-cache/dev-ros/roslz4-1.14.3 b/metadata/md5-cache/dev-ros/roslz4-1.14.3
index d4601ca020e2..a6b31dcd03f9 100644
--- a/metadata/md5-cache/dev-ros/roslz4-1.14.3
+++ b/metadata/md5-cache/dev-ros/roslz4-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=app-arch/lz4 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=58ef86e1e99d15652979f7f57a698554
diff --git a/metadata/md5-cache/dev-ros/roslz4-9999 b/metadata/md5-cache/dev-ros/roslz4-9999
index 48d3a0db0cbe..fb9784823e8a 100644
--- a/metadata/md5-cache/dev-ros/roslz4-9999
+++ b/metadata/md5-cache/dev-ros/roslz4-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=app-arch/lz4 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=a7af38936f1a0581a906f3de42fb516a
diff --git a/metadata/md5-cache/dev-ros/rosmake-1.14.0 b/metadata/md5-cache/dev-ros/rosmake-1.14.0
index b460fee1a97b..dfed1b1332fb 100644
--- a/metadata/md5-cache/dev-ros/rosmake-1.14.0
+++ b/metadata/md5-cache/dev-ros/rosmake-1.14.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.14.0.tar.gz -> ros-1.14.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=70cf426e9e712c827b4ba5e1f011c7a8
diff --git a/metadata/md5-cache/dev-ros/rosmake-1.14.1 b/metadata/md5-cache/dev-ros/rosmake-1.14.1
index dff873b522fa..a696e71cc8e3 100644
--- a/metadata/md5-cache/dev-ros/rosmake-1.14.1
+++ b/metadata/md5-cache/dev-ros/rosmake-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.14.1.tar.gz -> ros-1.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=70cf426e9e712c827b4ba5e1f011c7a8
diff --git a/metadata/md5-cache/dev-ros/rosmake-1.14.2 b/metadata/md5-cache/dev-ros/rosmake-1.14.2
index e44db380f81f..b11ad570ce16 100644
--- a/metadata/md5-cache/dev-ros/rosmake-1.14.2
+++ b/metadata/md5-cache/dev-ros/rosmake-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.14.2.tar.gz -> ros-1.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=70cf426e9e712c827b4ba5e1f011c7a8
diff --git a/metadata/md5-cache/dev-ros/rosmake-1.14.3 b/metadata/md5-cache/dev-ros/rosmake-1.14.3
index f708823859e8..ec1cbdbee0f8 100644
--- a/metadata/md5-cache/dev-ros/rosmake-1.14.3
+++ b/metadata/md5-cache/dev-ros/rosmake-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.14.3.tar.gz -> ros-1.14.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=688c85bade86bf9142eec0a8ddc644eb
diff --git a/metadata/md5-cache/dev-ros/rosmake-1.14.4 b/metadata/md5-cache/dev-ros/rosmake-1.14.4
index 437008d7a7d6..7f0544932e11 100644
--- a/metadata/md5-cache/dev-ros/rosmake-1.14.4
+++ b/metadata/md5-cache/dev-ros/rosmake-1.14.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.14.4.tar.gz -> ros-1.14.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=688c85bade86bf9142eec0a8ddc644eb
diff --git a/metadata/md5-cache/dev-ros/rosmake-9999 b/metadata/md5-cache/dev-ros/rosmake-9999
index 14fdf8e7a62d..ec6149dac577 100644
--- a/metadata/md5-cache/dev-ros/rosmake-9999
+++ b/metadata/md5-cache/dev-ros/rosmake-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=70cf426e9e712c827b4ba5e1f011c7a8
diff --git a/metadata/md5-cache/dev-ros/rosmaster-1.13.0 b/metadata/md5-cache/dev-ros/rosmaster-1.13.0
index c33ffb33bf05..b2d3f943b6d4 100644
--- a/metadata/md5-cache/dev-ros/rosmaster-1.13.0
+++ b/metadata/md5-cache/dev-ros/rosmaster-1.13.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.0.tar.gz -> ros_comm-1.13.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4a3e7a19ea6a58b1bb3449377b494fd8
diff --git a/metadata/md5-cache/dev-ros/rosmaster-1.13.1 b/metadata/md5-cache/dev-ros/rosmaster-1.13.1
index d6705c1e019b..2cac700ffcac 100644
--- a/metadata/md5-cache/dev-ros/rosmaster-1.13.1
+++ b/metadata/md5-cache/dev-ros/rosmaster-1.13.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.1.tar.gz -> ros_comm-1.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4a3e7a19ea6a58b1bb3449377b494fd8
diff --git a/metadata/md5-cache/dev-ros/rosmaster-1.13.2 b/metadata/md5-cache/dev-ros/rosmaster-1.13.2
index cf628b83b7c3..4407029b1cbc 100644
--- a/metadata/md5-cache/dev-ros/rosmaster-1.13.2
+++ b/metadata/md5-cache/dev-ros/rosmaster-1.13.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.2.tar.gz -> ros_comm-1.13.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=4a3e7a19ea6a58b1bb3449377b494fd8
diff --git a/metadata/md5-cache/dev-ros/rosmaster-1.13.4 b/metadata/md5-cache/dev-ros/rosmaster-1.13.4
index 7c1645138cd8..b5c0ebdb53d1 100644
--- a/metadata/md5-cache/dev-ros/rosmaster-1.13.4
+++ b/metadata/md5-cache/dev-ros/rosmaster-1.13.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.4.tar.gz -> ros_comm-1.13.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4a3e7a19ea6a58b1bb3449377b494fd8
diff --git a/metadata/md5-cache/dev-ros/rosmaster-1.13.5 b/metadata/md5-cache/dev-ros/rosmaster-1.13.5
index 6fcc84a5f6c7..b418bc179cf3 100644
--- a/metadata/md5-cache/dev-ros/rosmaster-1.13.5
+++ b/metadata/md5-cache/dev-ros/rosmaster-1.13.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.5.tar.gz -> ros_comm-1.13.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4a3e7a19ea6a58b1bb3449377b494fd8
diff --git a/metadata/md5-cache/dev-ros/rosmaster-1.13.6 b/metadata/md5-cache/dev-ros/rosmaster-1.13.6
index b8a46ccebdf6..30e28a326aab 100644
--- a/metadata/md5-cache/dev-ros/rosmaster-1.13.6
+++ b/metadata/md5-cache/dev-ros/rosmaster-1.13.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.6.tar.gz -> ros_comm-1.13.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0d9d3900dc5c68466ac94f1fac6a1fdd
diff --git a/metadata/md5-cache/dev-ros/rosmaster-1.14.2 b/metadata/md5-cache/dev-ros/rosmaster-1.14.2
index 49c6f8527266..ef40d113705f 100644
--- a/metadata/md5-cache/dev-ros/rosmaster-1.14.2
+++ b/metadata/md5-cache/dev-ros/rosmaster-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.2.tar.gz -> ros_comm-1.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=0d9d3900dc5c68466ac94f1fac6a1fdd
diff --git a/metadata/md5-cache/dev-ros/rosmaster-1.14.3 b/metadata/md5-cache/dev-ros/rosmaster-1.14.3
index 8daa13f0b0be..330e1b482f06 100644
--- a/metadata/md5-cache/dev-ros/rosmaster-1.14.3
+++ b/metadata/md5-cache/dev-ros/rosmaster-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0d9d3900dc5c68466ac94f1fac6a1fdd
diff --git a/metadata/md5-cache/dev-ros/rosmaster-9999 b/metadata/md5-cache/dev-ros/rosmaster-9999
index 1818be918d01..39e6b6ccc20a 100644
--- a/metadata/md5-cache/dev-ros/rosmaster-9999
+++ b/metadata/md5-cache/dev-ros/rosmaster-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/defusedxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=4a3e7a19ea6a58b1bb3449377b494fd8
diff --git a/metadata/md5-cache/dev-ros/rosmsg-1.13.0 b/metadata/md5-cache/dev-ros/rosmsg-1.13.0
index 06e9bca19276..f081e001d1ed 100644
--- a/metadata/md5-cache/dev-ros/rosmsg-1.13.0
+++ b/metadata/md5-cache/dev-ros/rosmsg-1.13.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.0.tar.gz -> ros_comm-1.13.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a7cb5f713e03967951a7737e5d2c12d3
diff --git a/metadata/md5-cache/dev-ros/rosmsg-1.13.1 b/metadata/md5-cache/dev-ros/rosmsg-1.13.1
index 33b5bcc99378..c19c1a133a64 100644
--- a/metadata/md5-cache/dev-ros/rosmsg-1.13.1
+++ b/metadata/md5-cache/dev-ros/rosmsg-1.13.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.1.tar.gz -> ros_comm-1.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a7cb5f713e03967951a7737e5d2c12d3
diff --git a/metadata/md5-cache/dev-ros/rosmsg-1.13.2 b/metadata/md5-cache/dev-ros/rosmsg-1.13.2
index 2a9cf4c50032..1c8f4cb28d91 100644
--- a/metadata/md5-cache/dev-ros/rosmsg-1.13.2
+++ b/metadata/md5-cache/dev-ros/rosmsg-1.13.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.2.tar.gz -> ros_comm-1.13.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=a7cb5f713e03967951a7737e5d2c12d3
diff --git a/metadata/md5-cache/dev-ros/rosmsg-1.13.4 b/metadata/md5-cache/dev-ros/rosmsg-1.13.4
index cd3aa94ae7c9..104ce6e4d3b7 100644
--- a/metadata/md5-cache/dev-ros/rosmsg-1.13.4
+++ b/metadata/md5-cache/dev-ros/rosmsg-1.13.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.4.tar.gz -> ros_comm-1.13.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a7cb5f713e03967951a7737e5d2c12d3
diff --git a/metadata/md5-cache/dev-ros/rosmsg-1.13.5 b/metadata/md5-cache/dev-ros/rosmsg-1.13.5
index a7d1a9eb36b7..759fb4db0fd5 100644
--- a/metadata/md5-cache/dev-ros/rosmsg-1.13.5
+++ b/metadata/md5-cache/dev-ros/rosmsg-1.13.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.5.tar.gz -> ros_comm-1.13.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a7cb5f713e03967951a7737e5d2c12d3
diff --git a/metadata/md5-cache/dev-ros/rosmsg-1.13.6 b/metadata/md5-cache/dev-ros/rosmsg-1.13.6
index 6e0297a55887..d1c8a5ce7666 100644
--- a/metadata/md5-cache/dev-ros/rosmsg-1.13.6
+++ b/metadata/md5-cache/dev-ros/rosmsg-1.13.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.6.tar.gz -> ros_comm-1.13.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=98d0f4511f9aedd29d7fe52bfb9381e1
diff --git a/metadata/md5-cache/dev-ros/rosmsg-1.14.2 b/metadata/md5-cache/dev-ros/rosmsg-1.14.2
index 3670c330363a..807d643a7aac 100644
--- a/metadata/md5-cache/dev-ros/rosmsg-1.14.2
+++ b/metadata/md5-cache/dev-ros/rosmsg-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.2.tar.gz -> ros_comm-1.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=98d0f4511f9aedd29d7fe52bfb9381e1
diff --git a/metadata/md5-cache/dev-ros/rosmsg-1.14.3 b/metadata/md5-cache/dev-ros/rosmsg-1.14.3
index 9b26ae21a747..0dd073b2f206 100644
--- a/metadata/md5-cache/dev-ros/rosmsg-1.14.3
+++ b/metadata/md5-cache/dev-ros/rosmsg-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=98d0f4511f9aedd29d7fe52bfb9381e1
diff --git a/metadata/md5-cache/dev-ros/rosmsg-9999 b/metadata/md5-cache/dev-ros/rosmsg-9999
index a325e08a98e0..48c018299c59 100644
--- a/metadata/md5-cache/dev-ros/rosmsg-9999
+++ b/metadata/md5-cache/dev-ros/rosmsg-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=a7cb5f713e03967951a7737e5d2c12d3
diff --git a/metadata/md5-cache/dev-ros/rosnode-1.13.0 b/metadata/md5-cache/dev-ros/rosnode-1.13.0
index 3c05533dbc2a..373a3c49f37a 100644
--- a/metadata/md5-cache/dev-ros/rosnode-1.13.0
+++ b/metadata/md5-cache/dev-ros/rosnode-1.13.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.0.tar.gz -> ros_comm-1.13.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=63076293a723effd3d342ece285e4156
diff --git a/metadata/md5-cache/dev-ros/rosnode-1.13.1 b/metadata/md5-cache/dev-ros/rosnode-1.13.1
index 73bfb98e77d4..dc3941e4f3d1 100644
--- a/metadata/md5-cache/dev-ros/rosnode-1.13.1
+++ b/metadata/md5-cache/dev-ros/rosnode-1.13.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.1.tar.gz -> ros_comm-1.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=63076293a723effd3d342ece285e4156
diff --git a/metadata/md5-cache/dev-ros/rosnode-1.13.2 b/metadata/md5-cache/dev-ros/rosnode-1.13.2
index d2fcad324140..6364038dbbb5 100644
--- a/metadata/md5-cache/dev-ros/rosnode-1.13.2
+++ b/metadata/md5-cache/dev-ros/rosnode-1.13.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.2.tar.gz -> ros_comm-1.13.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=63076293a723effd3d342ece285e4156
diff --git a/metadata/md5-cache/dev-ros/rosnode-1.13.4 b/metadata/md5-cache/dev-ros/rosnode-1.13.4
index 0999e6ead476..b9be43a5eedd 100644
--- a/metadata/md5-cache/dev-ros/rosnode-1.13.4
+++ b/metadata/md5-cache/dev-ros/rosnode-1.13.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.4.tar.gz -> ros_comm-1.13.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=63076293a723effd3d342ece285e4156
diff --git a/metadata/md5-cache/dev-ros/rosnode-1.13.5 b/metadata/md5-cache/dev-ros/rosnode-1.13.5
index 787181ac4ee2..a1f51ca9a341 100644
--- a/metadata/md5-cache/dev-ros/rosnode-1.13.5
+++ b/metadata/md5-cache/dev-ros/rosnode-1.13.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.5.tar.gz -> ros_comm-1.13.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=63076293a723effd3d342ece285e4156
diff --git a/metadata/md5-cache/dev-ros/rosnode-1.13.6 b/metadata/md5-cache/dev-ros/rosnode-1.13.6
index 36e6d254976f..bbed3b1520d6 100644
--- a/metadata/md5-cache/dev-ros/rosnode-1.13.6
+++ b/metadata/md5-cache/dev-ros/rosnode-1.13.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.6.tar.gz -> ros_comm-1.13.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=91c1007f9639b788f89f3e525011386b
diff --git a/metadata/md5-cache/dev-ros/rosnode-1.14.2 b/metadata/md5-cache/dev-ros/rosnode-1.14.2
index 11bff9433bad..9a1f6864f27c 100644
--- a/metadata/md5-cache/dev-ros/rosnode-1.14.2
+++ b/metadata/md5-cache/dev-ros/rosnode-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.2.tar.gz -> ros_comm-1.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=91c1007f9639b788f89f3e525011386b
diff --git a/metadata/md5-cache/dev-ros/rosnode-1.14.3 b/metadata/md5-cache/dev-ros/rosnode-1.14.3
index a0444cf8549e..831de2080bbc 100644
--- a/metadata/md5-cache/dev-ros/rosnode-1.14.3
+++ b/metadata/md5-cache/dev-ros/rosnode-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=91c1007f9639b788f89f3e525011386b
diff --git a/metadata/md5-cache/dev-ros/rosnode-9999 b/metadata/md5-cache/dev-ros/rosnode-9999
index ca8f418899fe..7c852eee095c 100644
--- a/metadata/md5-cache/dev-ros/rosnode-9999
+++ b/metadata/md5-cache/dev-ros/rosnode-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=63076293a723effd3d342ece285e4156
diff --git a/metadata/md5-cache/dev-ros/rosout-1.13.0 b/metadata/md5-cache/dev-ros/rosout-1.13.0
index d9c242dc4f04..859098180c61 100644
--- a/metadata/md5-cache/dev-ros/rosout-1.13.0
+++ b/metadata/md5-cache/dev-ros/rosout-1.13.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_targets
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.0.tar.gz -> ros_comm-1.13.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d5ab415cde03018317b3db740c407853
diff --git a/metadata/md5-cache/dev-ros/rosout-1.13.1 b/metadata/md5-cache/dev-ros/rosout-1.13.1
index 6d338d6f520e..4de827b463e4 100644
--- a/metadata/md5-cache/dev-ros/rosout-1.13.1
+++ b/metadata/md5-cache/dev-ros/rosout-1.13.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_targets
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.1.tar.gz -> ros_comm-1.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d5ab415cde03018317b3db740c407853
diff --git a/metadata/md5-cache/dev-ros/rosout-1.13.2 b/metadata/md5-cache/dev-ros/rosout-1.13.2
index 529310e6d058..e97555eb5a86 100644
--- a/metadata/md5-cache/dev-ros/rosout-1.13.2
+++ b/metadata/md5-cache/dev-ros/rosout-1.13.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_targets
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.2.tar.gz -> ros_comm-1.13.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=d5ab415cde03018317b3db740c407853
diff --git a/metadata/md5-cache/dev-ros/rosout-1.13.4 b/metadata/md5-cache/dev-ros/rosout-1.13.4
index a3f405e44407..cb1353e65b35 100644
--- a/metadata/md5-cache/dev-ros/rosout-1.13.4
+++ b/metadata/md5-cache/dev-ros/rosout-1.13.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_targets
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.4.tar.gz -> ros_comm-1.13.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d5ab415cde03018317b3db740c407853
diff --git a/metadata/md5-cache/dev-ros/rosout-1.13.5 b/metadata/md5-cache/dev-ros/rosout-1.13.5
index ead804b3950f..ceb023e49bb3 100644
--- a/metadata/md5-cache/dev-ros/rosout-1.13.5
+++ b/metadata/md5-cache/dev-ros/rosout-1.13.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_targets
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.5.tar.gz -> ros_comm-1.13.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d5ab415cde03018317b3db740c407853
diff --git a/metadata/md5-cache/dev-ros/rosout-1.13.6 b/metadata/md5-cache/dev-ros/rosout-1.13.6
index e94922062b7f..e936fe7aa081 100644
--- a/metadata/md5-cache/dev-ros/rosout-1.13.6
+++ b/metadata/md5-cache/dev-ros/rosout-1.13.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_targets
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.6.tar.gz -> ros_comm-1.13.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2aaed6538c95db1d04be23166164f9fc
diff --git a/metadata/md5-cache/dev-ros/rosout-1.14.2 b/metadata/md5-cache/dev-ros/rosout-1.14.2
index 9452f0b93420..5e85df4f72ed 100644
--- a/metadata/md5-cache/dev-ros/rosout-1.14.2
+++ b/metadata/md5-cache/dev-ros/rosout-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_targets
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.2.tar.gz -> ros_comm-1.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=2aaed6538c95db1d04be23166164f9fc
diff --git a/metadata/md5-cache/dev-ros/rosout-1.14.3 b/metadata/md5-cache/dev-ros/rosout-1.14.3
index 0c05c6ac44db..66d4a3119806 100644
--- a/metadata/md5-cache/dev-ros/rosout-1.14.3
+++ b/metadata/md5-cache/dev-ros/rosout-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_targets
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2aaed6538c95db1d04be23166164f9fc
diff --git a/metadata/md5-cache/dev-ros/rosout-9999 b/metadata/md5-cache/dev-ros/rosout-9999
index 04a006878168..fcd46f3db10d 100644
--- a/metadata/md5-cache/dev-ros/rosout-9999
+++ b/metadata/md5-cache/dev-ros/rosout-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=7b451ec02b3e27fc4016a359b7027f52
diff --git a/metadata/md5-cache/dev-ros/rospack-2.4.3 b/metadata/md5-cache/dev-ros/rospack-2.4.3
index e4b26bfd8fb4..baf0318fbee1 100644
--- a/metadata/md5-cache/dev-ros/rospack-2.4.3
+++ b/metadata/md5-cache/dev-ros/rospack-2.4.3
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= dev-libs/tinyxml2:= python_targets_python2_7? ( >=dev-l
 REQUIRED_USE=|| ( python_targets_python2_7 ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/rospack/archive/2.4.3.tar.gz -> rospack-2.4.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e6cef78ca714f5db42134047f9ca2879
diff --git a/metadata/md5-cache/dev-ros/rospack-2.5.0 b/metadata/md5-cache/dev-ros/rospack-2.5.0
index 3965a3111bde..519e86a4368f 100644
--- a/metadata/md5-cache/dev-ros/rospack-2.5.0
+++ b/metadata/md5-cache/dev-ros/rospack-2.5.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= >=dev-libs/tinyxml2-5:= python_targets_python2_7? ( >=d
 REQUIRED_USE=|| ( python_targets_python2_7 ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/rospack/archive/2.5.0.tar.gz -> rospack-2.5.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0fd24c8b7928993e5c0a65c783bc1417
diff --git a/metadata/md5-cache/dev-ros/rospack-2.5.1 b/metadata/md5-cache/dev-ros/rospack-2.5.1
index d3c18c322463..011c0c50798d 100644
--- a/metadata/md5-cache/dev-ros/rospack-2.5.1
+++ b/metadata/md5-cache/dev-ros/rospack-2.5.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= >=dev-libs/tinyxml2-5:= python_targets_python2_7? ( >=d
 REQUIRED_USE=|| ( python_targets_python2_7 ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/rospack/archive/2.5.1.tar.gz -> rospack-2.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f85cd92a1bd7509f3be3c3915461eaec
diff --git a/metadata/md5-cache/dev-ros/rospack-9999 b/metadata/md5-cache/dev-ros/rospack-9999
index 24665de5b4b8..724985aa658b 100644
--- a/metadata/md5-cache/dev-ros/rospack-9999
+++ b/metadata/md5-cache/dev-ros/rospack-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost:= >=dev-libs/tinyxml2-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_python2_7(-)] dev-ros/ros_environment python_targets_python2_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 ) || ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=f85cd92a1bd7509f3be3c3915461eaec
diff --git a/metadata/md5-cache/dev-ros/rosparam-1.13.0 b/metadata/md5-cache/dev-ros/rosparam-1.13.0
index 5e37be8b4699..70fc405da07b 100644
--- a/metadata/md5-cache/dev-ros/rosparam-1.13.0
+++ b/metadata/md5-cache/dev-ros/rosparam-1.13.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.0.tar.gz -> ros_comm-1.13.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fd98b9bfb1928c28d92b4b5ab2cab9c4
diff --git a/metadata/md5-cache/dev-ros/rosparam-1.13.1 b/metadata/md5-cache/dev-ros/rosparam-1.13.1
index b3ee55979684..44d7b95dcbe6 100644
--- a/metadata/md5-cache/dev-ros/rosparam-1.13.1
+++ b/metadata/md5-cache/dev-ros/rosparam-1.13.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.1.tar.gz -> ros_comm-1.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fd98b9bfb1928c28d92b4b5ab2cab9c4
diff --git a/metadata/md5-cache/dev-ros/rosparam-1.13.2 b/metadata/md5-cache/dev-ros/rosparam-1.13.2
index 0ac8f3b2dbbd..7c01bdd63617 100644
--- a/metadata/md5-cache/dev-ros/rosparam-1.13.2
+++ b/metadata/md5-cache/dev-ros/rosparam-1.13.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.2.tar.gz -> ros_comm-1.13.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=fd98b9bfb1928c28d92b4b5ab2cab9c4
diff --git a/metadata/md5-cache/dev-ros/rosparam-1.13.4 b/metadata/md5-cache/dev-ros/rosparam-1.13.4
index d3abab41fd4d..271e41846821 100644
--- a/metadata/md5-cache/dev-ros/rosparam-1.13.4
+++ b/metadata/md5-cache/dev-ros/rosparam-1.13.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.4.tar.gz -> ros_comm-1.13.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fd98b9bfb1928c28d92b4b5ab2cab9c4
diff --git a/metadata/md5-cache/dev-ros/rosparam-1.13.5 b/metadata/md5-cache/dev-ros/rosparam-1.13.5
index bd8623193607..70844ba1aaf1 100644
--- a/metadata/md5-cache/dev-ros/rosparam-1.13.5
+++ b/metadata/md5-cache/dev-ros/rosparam-1.13.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.5.tar.gz -> ros_comm-1.13.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fd98b9bfb1928c28d92b4b5ab2cab9c4
diff --git a/metadata/md5-cache/dev-ros/rosparam-1.13.6 b/metadata/md5-cache/dev-ros/rosparam-1.13.6
index 0d131c6f7557..7804db8e3302 100644
--- a/metadata/md5-cache/dev-ros/rosparam-1.13.6
+++ b/metadata/md5-cache/dev-ros/rosparam-1.13.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.6.tar.gz -> ros_comm-1.13.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d890276e87f09538e6d7067e949c7099
diff --git a/metadata/md5-cache/dev-ros/rosparam-1.14.2 b/metadata/md5-cache/dev-ros/rosparam-1.14.2
index 52f5e484c1f0..64b7ccc20888 100644
--- a/metadata/md5-cache/dev-ros/rosparam-1.14.2
+++ b/metadata/md5-cache/dev-ros/rosparam-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.2.tar.gz -> ros_comm-1.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=d890276e87f09538e6d7067e949c7099
diff --git a/metadata/md5-cache/dev-ros/rosparam-1.14.3 b/metadata/md5-cache/dev-ros/rosparam-1.14.3
index 7b99d513dd52..d3f2b676e4b0 100644
--- a/metadata/md5-cache/dev-ros/rosparam-1.14.3
+++ b/metadata/md5-cache/dev-ros/rosparam-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d890276e87f09538e6d7067e949c7099
diff --git a/metadata/md5-cache/dev-ros/rosparam-9999 b/metadata/md5-cache/dev-ros/rosparam-9999
index 209235d574e5..0dcf3c1cd7c1 100644
--- a/metadata/md5-cache/dev-ros/rosparam-9999
+++ b/metadata/md5-cache/dev-ros/rosparam-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=fd98b9bfb1928c28d92b4b5ab2cab9c4
diff --git a/metadata/md5-cache/dev-ros/rospy-1.13.0 b/metadata/md5-cache/dev-ros/rospy-1.13.0
index 922e1daaf453..eb03b985ce83 100644
--- a/metadata/md5-cache/dev-ros/rospy-1.13.0
+++ b/metadata/md5-cache/dev-ros/rospy-1.13.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.0.tar.gz -> ros_comm-1.13.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=97c6b0f55846c7f5e41d0719713a6d26
diff --git a/metadata/md5-cache/dev-ros/rospy-1.13.1 b/metadata/md5-cache/dev-ros/rospy-1.13.1
index 89a8568bfb51..bfba2c15ddc6 100644
--- a/metadata/md5-cache/dev-ros/rospy-1.13.1
+++ b/metadata/md5-cache/dev-ros/rospy-1.13.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.1.tar.gz -> ros_comm-1.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=97c6b0f55846c7f5e41d0719713a6d26
diff --git a/metadata/md5-cache/dev-ros/rospy-1.13.2 b/metadata/md5-cache/dev-ros/rospy-1.13.2
index 166598ed107b..c037f6d579ff 100644
--- a/metadata/md5-cache/dev-ros/rospy-1.13.2
+++ b/metadata/md5-cache/dev-ros/rospy-1.13.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.2.tar.gz -> ros_comm-1.13.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=97c6b0f55846c7f5e41d0719713a6d26
diff --git a/metadata/md5-cache/dev-ros/rospy-1.13.4 b/metadata/md5-cache/dev-ros/rospy-1.13.4
index 6b155e173839..f4f2b7f8615b 100644
--- a/metadata/md5-cache/dev-ros/rospy-1.13.4
+++ b/metadata/md5-cache/dev-ros/rospy-1.13.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.4.tar.gz -> ros_comm-1.13.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=97c6b0f55846c7f5e41d0719713a6d26
diff --git a/metadata/md5-cache/dev-ros/rospy-1.13.5 b/metadata/md5-cache/dev-ros/rospy-1.13.5
index 877cf40b0bfd..9aa66f3a3ce5 100644
--- a/metadata/md5-cache/dev-ros/rospy-1.13.5
+++ b/metadata/md5-cache/dev-ros/rospy-1.13.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.5.tar.gz -> ros_comm-1.13.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=97c6b0f55846c7f5e41d0719713a6d26
diff --git a/metadata/md5-cache/dev-ros/rospy-1.13.6 b/metadata/md5-cache/dev-ros/rospy-1.13.6
index 97979102ac46..bb7260aff3d2 100644
--- a/metadata/md5-cache/dev-ros/rospy-1.13.6
+++ b/metadata/md5-cache/dev-ros/rospy-1.13.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.6.tar.gz -> ros_comm-1.13.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=96925456256576cc756080991ddab33c
diff --git a/metadata/md5-cache/dev-ros/rospy-1.14.2 b/metadata/md5-cache/dev-ros/rospy-1.14.2
index ab36e6f1d54e..8e1d9708a62f 100644
--- a/metadata/md5-cache/dev-ros/rospy-1.14.2
+++ b/metadata/md5-cache/dev-ros/rospy-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.2.tar.gz -> ros_comm-1.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=96925456256576cc756080991ddab33c
diff --git a/metadata/md5-cache/dev-ros/rospy-1.14.3 b/metadata/md5-cache/dev-ros/rospy-1.14.3
index 9f67b870b835..894d573377bf 100644
--- a/metadata/md5-cache/dev-ros/rospy-1.14.3
+++ b/metadata/md5-cache/dev-ros/rospy-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=96925456256576cc756080991ddab33c
diff --git a/metadata/md5-cache/dev-ros/rospy-9999 b/metadata/md5-cache/dev-ros/rospy-9999
index 866eca0e3697..1d9d153abc00 100644
--- a/metadata/md5-cache/dev-ros/rospy-9999
+++ b/metadata/md5-cache/dev-ros/rospy-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=97c6b0f55846c7f5e41d0719713a6d26
diff --git a/metadata/md5-cache/dev-ros/rospy_tutorials-0.6.1 b/metadata/md5-cache/dev-ros/rospy_tutorials-0.6.1
index 4905bc81459a..7a481aeddb47 100644
--- a/metadata/md5-cache/dev-ros/rospy_tutorials-0.6.1
+++ b/metadata/md5-cache/dev-ros/rospy_tutorials-0.6.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.6.1.tar.gz -> ros_tutorials-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6578656599fda361eca81c11e637b6d9
diff --git a/metadata/md5-cache/dev-ros/rospy_tutorials-0.7.0 b/metadata/md5-cache/dev-ros/rospy_tutorials-0.7.0
index c0f024da07f0..a5ffddca725b 100644
--- a/metadata/md5-cache/dev-ros/rospy_tutorials-0.7.0
+++ b/metadata/md5-cache/dev-ros/rospy_tutorials-0.7.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.7.0.tar.gz -> ros_tutorials-0.7.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6578656599fda361eca81c11e637b6d9
diff --git a/metadata/md5-cache/dev-ros/rospy_tutorials-0.7.1 b/metadata/md5-cache/dev-ros/rospy_tutorials-0.7.1
index d6c9bd878c0b..7438bd557eb6 100644
--- a/metadata/md5-cache/dev-ros/rospy_tutorials-0.7.1
+++ b/metadata/md5-cache/dev-ros/rospy_tutorials-0.7.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.7.1.tar.gz -> ros_tutorials-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2f4e6a0f01cb668361dab2674ac85aec
diff --git a/metadata/md5-cache/dev-ros/rospy_tutorials-0.8.0 b/metadata/md5-cache/dev-ros/rospy_tutorials-0.8.0
index 5f95d98cbf27..b4e2ab5e59e8 100644
--- a/metadata/md5-cache/dev-ros/rospy_tutorials-0.8.0
+++ b/metadata/md5-cache/dev-ros/rospy_tutorials-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.8.0.tar.gz -> ros_tutorials-0.8.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cacd687c736fcacbc65318bea6b76225
diff --git a/metadata/md5-cache/dev-ros/rospy_tutorials-0.8.1 b/metadata/md5-cache/dev-ros/rospy_tutorials-0.8.1
index af6257c03640..0fd7fe5299d7 100644
--- a/metadata/md5-cache/dev-ros/rospy_tutorials-0.8.1
+++ b/metadata/md5-cache/dev-ros/rospy_tutorials-0.8.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.8.1.tar.gz -> ros_tutorials-0.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cacd687c736fcacbc65318bea6b76225
diff --git a/metadata/md5-cache/dev-ros/rospy_tutorials-0.9.0 b/metadata/md5-cache/dev-ros/rospy_tutorials-0.9.0
index 46bb49cd2c68..73d17bbc9891 100644
--- a/metadata/md5-cache/dev-ros/rospy_tutorials-0.9.0
+++ b/metadata/md5-cache/dev-ros/rospy_tutorials-0.9.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.9.0.tar.gz -> ros_tutorials-0.9.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=93dbb4ab32b21a3222336c2e2801aee5
diff --git a/metadata/md5-cache/dev-ros/rospy_tutorials-9999 b/metadata/md5-cache/dev-ros/rospy_tutorials-9999
index 41f05fcbda96..4bc31925bc42 100644
--- a/metadata/md5-cache/dev-ros/rospy_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/rospy_tutorials-9999
@@ -8,5 +8,5 @@ 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=6578656599fda361eca81c11e637b6d9
diff --git a/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.1 b/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.1
index 713e52290bf8..006762d46d9c 100644
--- a/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.1
+++ b/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.1.tar.gz -> rosserial-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9cbe4d37484a41690600e1c1b1e64f17
diff --git a/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.2 b/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.2
index 0d07a0dd7323..771b00552675 100644
--- a/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.2
+++ b/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.2.tar.gz -> rosserial-0.7.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=b0829cf860a5d76c901752a569d75598
diff --git a/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.3 b/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.3
index db16ed7607ac..7996803f2553 100644
--- a/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.3
+++ b/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.3.tar.gz -> rosserial-0.7.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b0829cf860a5d76c901752a569d75598
diff --git a/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.4 b/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.4
index cba4c63b2dd6..a577312c029f 100644
--- a/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.4
+++ b/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.4.tar.gz -> rosserial-0.7.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b0829cf860a5d76c901752a569d75598
diff --git a/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.5 b/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.5
index a0021a0c9c86..72bc2a1fc3e3 100644
--- a/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.5
+++ b/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.5.tar.gz -> rosserial-0.7.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b0829cf860a5d76c901752a569d75598
diff --git a/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.6 b/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.6
index 2f76d935d550..1c3a6686b5e4 100644
--- a/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.6
+++ b/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.6.tar.gz -> rosserial-0.7.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bd7458317a1a0885456ee9f4f272309e
diff --git a/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.7 b/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.7
index 500aa7165e03..8e546e5ca135 100644
--- a/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.7
+++ b/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.7
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.7.tar.gz -> rosserial-0.7.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bd7458317a1a0885456ee9f4f272309e
diff --git a/metadata/md5-cache/dev-ros/rosserial_arduino-9999 b/metadata/md5-cache/dev-ros/rosserial_arduino-9999
index 2d7d017ff3f5..2b279cff808f 100644
--- a/metadata/md5-cache/dev-ros/rosserial_arduino-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_arduino-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=9cbe4d37484a41690600e1c1b1e64f17
diff --git a/metadata/md5-cache/dev-ros/rosserial_client-0.7.7 b/metadata/md5-cache/dev-ros/rosserial_client-0.7.7
index ea84b9cb04eb..1f60b1285b88 100644
--- a/metadata/md5-cache/dev-ros/rosserial_client-0.7.7
+++ b/metadata/md5-cache/dev-ros/rosserial_client-0.7.7
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.7.tar.gz -> rosserial-0.7.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=340f82da3a5534f62962552ae0a97b8c
diff --git a/metadata/md5-cache/dev-ros/rosserial_client-9999 b/metadata/md5-cache/dev-ros/rosserial_client-9999
index 5bb03a527ea9..feb8bbbfe8f7 100644
--- a/metadata/md5-cache/dev-ros/rosserial_client-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_client-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=c4f2b3af0d9a0503f57534afc8e29d98
diff --git a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.1 b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.1
index d6dbcac95013..4a1774bcbdf1 100644
--- a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.1
+++ b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.1.tar.gz -> rosserial-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=36edcbb5585db8816025f83152c359f7
diff --git a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.2 b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.2
index 977a54d8cdaa..a668e96ab887 100644
--- a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.2
+++ b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.2.tar.gz -> rosserial-0.7.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=8046063c55e71c8995e62f3cccb04242
diff --git a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.3 b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.3
index 99f38aa361c5..4775e278524b 100644
--- a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.3
+++ b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.3.tar.gz -> rosserial-0.7.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8046063c55e71c8995e62f3cccb04242
diff --git a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.4 b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.4
index 80d7c845f005..85bd22f208e3 100644
--- a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.4
+++ b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.4.tar.gz -> rosserial-0.7.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8046063c55e71c8995e62f3cccb04242
diff --git a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.5 b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.5
index ba759216a32b..31536d2fb0a0 100644
--- a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.5
+++ b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.5.tar.gz -> rosserial-0.7.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8046063c55e71c8995e62f3cccb04242
diff --git a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.6 b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.6
index 4c575e1e5f02..5a637d795da0 100644
--- a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.6
+++ b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.6.tar.gz -> rosserial-0.7.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4a37d6b790cd28e4fe9294b456cd3994
diff --git a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.7 b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.7
index 5ea53d572c28..d20b34da06ba 100644
--- a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.7
+++ b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.7
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.7.tar.gz -> rosserial-0.7.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4a37d6b790cd28e4fe9294b456cd3994
diff --git a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-9999 b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-9999
index 20a09d94daeb..4c536def8a04 100644
--- a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=36edcbb5585db8816025f83152c359f7
diff --git a/metadata/md5-cache/dev-ros/rosserial_msgs-0.7.6 b/metadata/md5-cache/dev-ros/rosserial_msgs-0.7.6
index fae1b4b31f76..cb1939aa4091 100644
--- a/metadata/md5-cache/dev-ros/rosserial_msgs-0.7.6
+++ b/metadata/md5-cache/dev-ros/rosserial_msgs-0.7.6
@@ -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/ros-drivers/rosserial/archive/0.7.6.tar.gz -> rosserial-0.7.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=292f34e839bd75ff91f874bbb179b93c
diff --git a/metadata/md5-cache/dev-ros/rosserial_msgs-0.7.7 b/metadata/md5-cache/dev-ros/rosserial_msgs-0.7.7
index bde51d6b7758..8db595cd46e6 100644
--- a/metadata/md5-cache/dev-ros/rosserial_msgs-0.7.7
+++ b/metadata/md5-cache/dev-ros/rosserial_msgs-0.7.7
@@ -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/ros-drivers/rosserial/archive/0.7.7.tar.gz -> rosserial-0.7.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=292f34e839bd75ff91f874bbb179b93c
diff --git a/metadata/md5-cache/dev-ros/rosserial_msgs-9999 b/metadata/md5-cache/dev-ros/rosserial_msgs-9999
index 3d0e37abab81..7975dbb602fc 100644
--- a/metadata/md5-cache/dev-ros/rosserial_msgs-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_msgs-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=292f34e839bd75ff91f874bbb179b93c
diff --git a/metadata/md5-cache/dev-ros/rosserial_python-0.7.1 b/metadata/md5-cache/dev-ros/rosserial_python-0.7.1
index a0c9618c8a32..9d0e1a577de3 100644
--- a/metadata/md5-cache/dev-ros/rosserial_python-0.7.1
+++ b/metadata/md5-cache/dev-ros/rosserial_python-0.7.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.1.tar.gz -> rosserial-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5a950765f420866d3d0313d5645cfc01
diff --git a/metadata/md5-cache/dev-ros/rosserial_python-0.7.2 b/metadata/md5-cache/dev-ros/rosserial_python-0.7.2
index dc042e44ac69..95371a96feb6 100644
--- a/metadata/md5-cache/dev-ros/rosserial_python-0.7.2
+++ b/metadata/md5-cache/dev-ros/rosserial_python-0.7.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.2.tar.gz -> rosserial-0.7.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=741f8c8a73992c402d4bf91946d751a5
diff --git a/metadata/md5-cache/dev-ros/rosserial_python-0.7.3 b/metadata/md5-cache/dev-ros/rosserial_python-0.7.3
index 92e976504d30..2a15a51efa12 100644
--- a/metadata/md5-cache/dev-ros/rosserial_python-0.7.3
+++ b/metadata/md5-cache/dev-ros/rosserial_python-0.7.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.3.tar.gz -> rosserial-0.7.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=741f8c8a73992c402d4bf91946d751a5
diff --git a/metadata/md5-cache/dev-ros/rosserial_python-0.7.4 b/metadata/md5-cache/dev-ros/rosserial_python-0.7.4
index 5a929064cb31..e42490a912ff 100644
--- a/metadata/md5-cache/dev-ros/rosserial_python-0.7.4
+++ b/metadata/md5-cache/dev-ros/rosserial_python-0.7.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.4.tar.gz -> rosserial-0.7.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=741f8c8a73992c402d4bf91946d751a5
diff --git a/metadata/md5-cache/dev-ros/rosserial_python-0.7.5 b/metadata/md5-cache/dev-ros/rosserial_python-0.7.5
index e1dd8f6cf6db..bb9ba52d0536 100644
--- a/metadata/md5-cache/dev-ros/rosserial_python-0.7.5
+++ b/metadata/md5-cache/dev-ros/rosserial_python-0.7.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.5.tar.gz -> rosserial-0.7.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=741f8c8a73992c402d4bf91946d751a5
diff --git a/metadata/md5-cache/dev-ros/rosserial_python-0.7.6 b/metadata/md5-cache/dev-ros/rosserial_python-0.7.6
index ae5f634c8536..1d42dd07fadb 100644
--- a/metadata/md5-cache/dev-ros/rosserial_python-0.7.6
+++ b/metadata/md5-cache/dev-ros/rosserial_python-0.7.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.6.tar.gz -> rosserial-0.7.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f3b5c1252de204d0e119c366a75d9e17
diff --git a/metadata/md5-cache/dev-ros/rosserial_python-0.7.7 b/metadata/md5-cache/dev-ros/rosserial_python-0.7.7
index 3ebbdfe6aceb..01242e77cdfe 100644
--- a/metadata/md5-cache/dev-ros/rosserial_python-0.7.7
+++ b/metadata/md5-cache/dev-ros/rosserial_python-0.7.7
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.7.tar.gz -> rosserial-0.7.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f3b5c1252de204d0e119c366a75d9e17
diff --git a/metadata/md5-cache/dev-ros/rosserial_python-9999 b/metadata/md5-cache/dev-ros/rosserial_python-9999
index d1dbd3334ce8..dac11e97534a 100644
--- a/metadata/md5-cache/dev-ros/rosserial_python-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_python-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=5a950765f420866d3d0313d5645cfc01
diff --git a/metadata/md5-cache/dev-ros/rosserial_server-0.7.4 b/metadata/md5-cache/dev-ros/rosserial_server-0.7.4
index 344e0dcaf4cc..d298e8de1cb8 100644
--- a/metadata/md5-cache/dev-ros/rosserial_server-0.7.4
+++ b/metadata/md5-cache/dev-ros/rosserial_server-0.7.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rosserial_msgs[ros_messages_cxx(-)] dev-ros/topic
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.4.tar.gz -> rosserial-0.7.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0c9a90710602fcdc60cfe67257521e73
diff --git a/metadata/md5-cache/dev-ros/rosserial_server-0.7.5 b/metadata/md5-cache/dev-ros/rosserial_server-0.7.5
index 3841bd70152e..be5e636d7e40 100644
--- a/metadata/md5-cache/dev-ros/rosserial_server-0.7.5
+++ b/metadata/md5-cache/dev-ros/rosserial_server-0.7.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rosserial_msgs[ros_messages_cxx(-)] dev-ros/topic
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.5.tar.gz -> rosserial-0.7.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=432a6f42123529205ce5f0b55681ebf7
diff --git a/metadata/md5-cache/dev-ros/rosserial_server-0.7.6 b/metadata/md5-cache/dev-ros/rosserial_server-0.7.6
index cb0622b9644e..f66defbf789c 100644
--- a/metadata/md5-cache/dev-ros/rosserial_server-0.7.6
+++ b/metadata/md5-cache/dev-ros/rosserial_server-0.7.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rosserial_msgs[ros_messages_cxx(-)] dev-ros/topic
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.6.tar.gz -> rosserial-0.7.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e1c918c9eb85037cd81d38d7f76db536
diff --git a/metadata/md5-cache/dev-ros/rosserial_server-0.7.7 b/metadata/md5-cache/dev-ros/rosserial_server-0.7.7
index a60a790c4fff..d753a63e1e0a 100644
--- a/metadata/md5-cache/dev-ros/rosserial_server-0.7.7
+++ b/metadata/md5-cache/dev-ros/rosserial_server-0.7.7
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rosserial_msgs[ros_messages_cxx(-)] dev-ros/topic
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.7.tar.gz -> rosserial-0.7.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e1c918c9eb85037cd81d38d7f76db536
diff --git a/metadata/md5-cache/dev-ros/rosserial_server-9999 b/metadata/md5-cache/dev-ros/rosserial_server-9999
index 88c31b4d20f7..350640684409 100644
--- a/metadata/md5-cache/dev-ros/rosserial_server-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_server-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/rosserial_msgs[ros_messages_cxx(-)] dev-ros/topic_tools dev-libs/boost:=[threads] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=cd2192dcacc0ab4103390bfbfdcaf965
diff --git a/metadata/md5-cache/dev-ros/rosserial_tivac-0.7.2 b/metadata/md5-cache/dev-ros/rosserial_tivac-0.7.2
index 2e9f133cd5dc..2465b4e8c7a5 100644
--- a/metadata/md5-cache/dev-ros/rosserial_tivac-0.7.2
+++ b/metadata/md5-cache/dev-ros/rosserial_tivac-0.7.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_tar
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.2.tar.gz -> rosserial-0.7.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=63d1edbfe8d776d4da8d706bdadbb7e7
diff --git a/metadata/md5-cache/dev-ros/rosserial_tivac-0.7.3 b/metadata/md5-cache/dev-ros/rosserial_tivac-0.7.3
index 74762907043b..b9ed8d5343f2 100644
--- a/metadata/md5-cache/dev-ros/rosserial_tivac-0.7.3
+++ b/metadata/md5-cache/dev-ros/rosserial_tivac-0.7.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_tar
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.3.tar.gz -> rosserial-0.7.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=63d1edbfe8d776d4da8d706bdadbb7e7
diff --git a/metadata/md5-cache/dev-ros/rosserial_tivac-0.7.4 b/metadata/md5-cache/dev-ros/rosserial_tivac-0.7.4
index 4468e21aec14..107dd02865f8 100644
--- a/metadata/md5-cache/dev-ros/rosserial_tivac-0.7.4
+++ b/metadata/md5-cache/dev-ros/rosserial_tivac-0.7.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_tar
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.4.tar.gz -> rosserial-0.7.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=63d1edbfe8d776d4da8d706bdadbb7e7
diff --git a/metadata/md5-cache/dev-ros/rosserial_tivac-0.7.5 b/metadata/md5-cache/dev-ros/rosserial_tivac-0.7.5
index faa1cd0e9077..621339085488 100644
--- a/metadata/md5-cache/dev-ros/rosserial_tivac-0.7.5
+++ b/metadata/md5-cache/dev-ros/rosserial_tivac-0.7.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_tar
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.5.tar.gz -> rosserial-0.7.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=63d1edbfe8d776d4da8d706bdadbb7e7
diff --git a/metadata/md5-cache/dev-ros/rosserial_tivac-0.7.6 b/metadata/md5-cache/dev-ros/rosserial_tivac-0.7.6
index 1280212531fe..1cdc7a7ffd77 100644
--- a/metadata/md5-cache/dev-ros/rosserial_tivac-0.7.6
+++ b/metadata/md5-cache/dev-ros/rosserial_tivac-0.7.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_tar
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.6.tar.gz -> rosserial-0.7.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=08db3fe89248a9eaad1301fb6f19cf18
diff --git a/metadata/md5-cache/dev-ros/rosserial_tivac-0.7.7 b/metadata/md5-cache/dev-ros/rosserial_tivac-0.7.7
index 1269d8c50ecd..4bd3d8697b35 100644
--- a/metadata/md5-cache/dev-ros/rosserial_tivac-0.7.7
+++ b/metadata/md5-cache/dev-ros/rosserial_tivac-0.7.7
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_tar
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.7.tar.gz -> rosserial-0.7.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=08db3fe89248a9eaad1301fb6f19cf18
diff --git a/metadata/md5-cache/dev-ros/rosserial_tivac-9999 b/metadata/md5-cache/dev-ros/rosserial_tivac-9999
index 3202b066b864..880b110b8710 100644
--- a/metadata/md5-cache/dev-ros/rosserial_tivac-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_tivac-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=63d1edbfe8d776d4da8d706bdadbb7e7
diff --git a/metadata/md5-cache/dev-ros/rosserial_windows-0.7.1 b/metadata/md5-cache/dev-ros/rosserial_windows-0.7.1
index 32656a42bb83..6e802de28dc9 100644
--- a/metadata/md5-cache/dev-ros/rosserial_windows-0.7.1
+++ b/metadata/md5-cache/dev-ros/rosserial_windows-0.7.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.1.tar.gz -> rosserial-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b5b99425e5c0adcb555722d4d671783f
diff --git a/metadata/md5-cache/dev-ros/rosserial_windows-0.7.2 b/metadata/md5-cache/dev-ros/rosserial_windows-0.7.2
index be753f0fbce3..b4447b45f6f4 100644
--- a/metadata/md5-cache/dev-ros/rosserial_windows-0.7.2
+++ b/metadata/md5-cache/dev-ros/rosserial_windows-0.7.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.2.tar.gz -> rosserial-0.7.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=d57cd1d894953a9708fc73745aeb025d
diff --git a/metadata/md5-cache/dev-ros/rosserial_windows-0.7.3 b/metadata/md5-cache/dev-ros/rosserial_windows-0.7.3
index 0b78d049d1bb..596f24a9ef67 100644
--- a/metadata/md5-cache/dev-ros/rosserial_windows-0.7.3
+++ b/metadata/md5-cache/dev-ros/rosserial_windows-0.7.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.3.tar.gz -> rosserial-0.7.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d57cd1d894953a9708fc73745aeb025d
diff --git a/metadata/md5-cache/dev-ros/rosserial_windows-0.7.4 b/metadata/md5-cache/dev-ros/rosserial_windows-0.7.4
index 0e0d592922f5..5f887d71b0ab 100644
--- a/metadata/md5-cache/dev-ros/rosserial_windows-0.7.4
+++ b/metadata/md5-cache/dev-ros/rosserial_windows-0.7.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.4.tar.gz -> rosserial-0.7.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d57cd1d894953a9708fc73745aeb025d
diff --git a/metadata/md5-cache/dev-ros/rosserial_windows-0.7.5 b/metadata/md5-cache/dev-ros/rosserial_windows-0.7.5
index 88bb982caa06..66eba951920f 100644
--- a/metadata/md5-cache/dev-ros/rosserial_windows-0.7.5
+++ b/metadata/md5-cache/dev-ros/rosserial_windows-0.7.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.5.tar.gz -> rosserial-0.7.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d57cd1d894953a9708fc73745aeb025d
diff --git a/metadata/md5-cache/dev-ros/rosserial_windows-0.7.6 b/metadata/md5-cache/dev-ros/rosserial_windows-0.7.6
index f1fdb8bceb73..8a8d45ff73c0 100644
--- a/metadata/md5-cache/dev-ros/rosserial_windows-0.7.6
+++ b/metadata/md5-cache/dev-ros/rosserial_windows-0.7.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.6.tar.gz -> rosserial-0.7.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2956362cef89e9323517754e98a307b2
diff --git a/metadata/md5-cache/dev-ros/rosserial_windows-0.7.7 b/metadata/md5-cache/dev-ros/rosserial_windows-0.7.7
index 4f3ee4b969e2..f00a6c79e91c 100644
--- a/metadata/md5-cache/dev-ros/rosserial_windows-0.7.7
+++ b/metadata/md5-cache/dev-ros/rosserial_windows-0.7.7
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.7.tar.gz -> rosserial-0.7.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2956362cef89e9323517754e98a307b2
diff --git a/metadata/md5-cache/dev-ros/rosserial_windows-9999 b/metadata/md5-cache/dev-ros/rosserial_windows-9999
index 2c4d1691452c..dfe85522a04e 100644
--- a/metadata/md5-cache/dev-ros/rosserial_windows-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_windows-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=b5b99425e5c0adcb555722d4d671783f
diff --git a/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.1 b/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.1
index e104e3dad399..5f1a22b8f1e8 100644
--- a/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.1
+++ b/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.1.tar.gz -> rosserial-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=74c5ef7981e2d89f3afc0f49845b61d0
diff --git a/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.2 b/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.2
index f0fc2b1de70e..75ba9c06df9a 100644
--- a/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.2
+++ b/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.2.tar.gz -> rosserial-0.7.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=ac377496271a1eedfa62540d51aea5f8
diff --git a/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.3 b/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.3
index ee44715475ae..36f5f64ba6c3 100644
--- a/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.3
+++ b/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.3.tar.gz -> rosserial-0.7.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ac377496271a1eedfa62540d51aea5f8
diff --git a/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.4 b/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.4
index 4f6cf7ee304d..43fc5c088157 100644
--- a/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.4
+++ b/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.4.tar.gz -> rosserial-0.7.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ac377496271a1eedfa62540d51aea5f8
diff --git a/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.5 b/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.5
index 2130f67101c2..c797bb8a0a8d 100644
--- a/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.5
+++ b/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.5.tar.gz -> rosserial-0.7.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ac377496271a1eedfa62540d51aea5f8
diff --git a/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.6 b/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.6
index 1f55777edb50..fa0e506e601e 100644
--- a/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.6
+++ b/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.6.tar.gz -> rosserial-0.7.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8b9b2cb3379f00fbb3f682c4533c8773
diff --git a/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.7 b/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.7
index 7b969218c770..29740ab08b36 100644
--- a/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.7
+++ b/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.7
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.7.tar.gz -> rosserial-0.7.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8b9b2cb3379f00fbb3f682c4533c8773
diff --git a/metadata/md5-cache/dev-ros/rosserial_xbee-9999 b/metadata/md5-cache/dev-ros/rosserial_xbee-9999
index fc8621a32a60..fadb0afe118b 100644
--- a/metadata/md5-cache/dev-ros/rosserial_xbee-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_xbee-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=74c5ef7981e2d89f3afc0f49845b61d0
diff --git a/metadata/md5-cache/dev-ros/rosservice-1.13.0 b/metadata/md5-cache/dev-ros/rosservice-1.13.0
index e988d414b212..1aa0855908a0 100644
--- a/metadata/md5-cache/dev-ros/rosservice-1.13.0
+++ b/metadata/md5-cache/dev-ros/rosservice-1.13.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.0.tar.gz -> ros_comm-1.13.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=84bedd376ca36442995753eb3b93719d
diff --git a/metadata/md5-cache/dev-ros/rosservice-1.13.1 b/metadata/md5-cache/dev-ros/rosservice-1.13.1
index f6464bb8137e..8fc535c3fa7e 100644
--- a/metadata/md5-cache/dev-ros/rosservice-1.13.1
+++ b/metadata/md5-cache/dev-ros/rosservice-1.13.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.1.tar.gz -> ros_comm-1.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=84bedd376ca36442995753eb3b93719d
diff --git a/metadata/md5-cache/dev-ros/rosservice-1.13.2 b/metadata/md5-cache/dev-ros/rosservice-1.13.2
index ada00300a09a..d28f0ae3fff0 100644
--- a/metadata/md5-cache/dev-ros/rosservice-1.13.2
+++ b/metadata/md5-cache/dev-ros/rosservice-1.13.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.2.tar.gz -> ros_comm-1.13.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=84bedd376ca36442995753eb3b93719d
diff --git a/metadata/md5-cache/dev-ros/rosservice-1.13.4 b/metadata/md5-cache/dev-ros/rosservice-1.13.4
index 0eb6f7f58de5..5dbdca32455f 100644
--- a/metadata/md5-cache/dev-ros/rosservice-1.13.4
+++ b/metadata/md5-cache/dev-ros/rosservice-1.13.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.4.tar.gz -> ros_comm-1.13.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=84bedd376ca36442995753eb3b93719d
diff --git a/metadata/md5-cache/dev-ros/rosservice-1.13.5 b/metadata/md5-cache/dev-ros/rosservice-1.13.5
index 9cb2732bf1fb..35064b027ba6 100644
--- a/metadata/md5-cache/dev-ros/rosservice-1.13.5
+++ b/metadata/md5-cache/dev-ros/rosservice-1.13.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.5.tar.gz -> ros_comm-1.13.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=84bedd376ca36442995753eb3b93719d
diff --git a/metadata/md5-cache/dev-ros/rosservice-1.13.6 b/metadata/md5-cache/dev-ros/rosservice-1.13.6
index cbb70b750282..f71c27ea4e5a 100644
--- a/metadata/md5-cache/dev-ros/rosservice-1.13.6
+++ b/metadata/md5-cache/dev-ros/rosservice-1.13.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.6.tar.gz -> ros_comm-1.13.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=75c5887a7d2588ef136bfc7b12275d3e
diff --git a/metadata/md5-cache/dev-ros/rosservice-1.14.2 b/metadata/md5-cache/dev-ros/rosservice-1.14.2
index 85b341d0d189..b772ac494d15 100644
--- a/metadata/md5-cache/dev-ros/rosservice-1.14.2
+++ b/metadata/md5-cache/dev-ros/rosservice-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.2.tar.gz -> ros_comm-1.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=75c5887a7d2588ef136bfc7b12275d3e
diff --git a/metadata/md5-cache/dev-ros/rosservice-1.14.3 b/metadata/md5-cache/dev-ros/rosservice-1.14.3
index 8c64c84c06c0..33381487e54c 100644
--- a/metadata/md5-cache/dev-ros/rosservice-1.14.3
+++ b/metadata/md5-cache/dev-ros/rosservice-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=75c5887a7d2588ef136bfc7b12275d3e
diff --git a/metadata/md5-cache/dev-ros/rosservice-9999 b/metadata/md5-cache/dev-ros/rosservice-9999
index 525c23645c91..9be23c09497c 100644
--- a/metadata/md5-cache/dev-ros/rosservice-9999
+++ b/metadata/md5-cache/dev-ros/rosservice-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=84bedd376ca36442995753eb3b93719d
diff --git a/metadata/md5-cache/dev-ros/rostest-1.13.0 b/metadata/md5-cache/dev-ros/rostest-1.13.0
index fa215561a8dc..182e60c7edfa 100644
--- a/metadata/md5-cache/dev-ros/rostest-1.13.0
+++ b/metadata/md5-cache/dev-ros/rostest-1.13.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.0.tar.gz -> ros_comm-1.13.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c9c42febae63a37f75d0567e989e569b
diff --git a/metadata/md5-cache/dev-ros/rostest-1.13.1 b/metadata/md5-cache/dev-ros/rostest-1.13.1
index 8ccf0a2cc466..ee2fa7d5eaf6 100644
--- a/metadata/md5-cache/dev-ros/rostest-1.13.1
+++ b/metadata/md5-cache/dev-ros/rostest-1.13.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.1.tar.gz -> ros_comm-1.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c9c42febae63a37f75d0567e989e569b
diff --git a/metadata/md5-cache/dev-ros/rostest-1.13.2 b/metadata/md5-cache/dev-ros/rostest-1.13.2
index dc967296d8da..3afe08c40be4 100644
--- a/metadata/md5-cache/dev-ros/rostest-1.13.2
+++ b/metadata/md5-cache/dev-ros/rostest-1.13.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.2.tar.gz -> ros_comm-1.13.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=c9c42febae63a37f75d0567e989e569b
diff --git a/metadata/md5-cache/dev-ros/rostest-1.13.4 b/metadata/md5-cache/dev-ros/rostest-1.13.4
index 17e5990697ff..792739d40e9c 100644
--- a/metadata/md5-cache/dev-ros/rostest-1.13.4
+++ b/metadata/md5-cache/dev-ros/rostest-1.13.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.4.tar.gz -> ros_comm-1.13.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c9c42febae63a37f75d0567e989e569b
diff --git a/metadata/md5-cache/dev-ros/rostest-1.13.5 b/metadata/md5-cache/dev-ros/rostest-1.13.5
index 010c16613677..5e7a6a9030c2 100644
--- a/metadata/md5-cache/dev-ros/rostest-1.13.5
+++ b/metadata/md5-cache/dev-ros/rostest-1.13.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.5.tar.gz -> ros_comm-1.13.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c9c42febae63a37f75d0567e989e569b
diff --git a/metadata/md5-cache/dev-ros/rostest-1.13.6 b/metadata/md5-cache/dev-ros/rostest-1.13.6
index 9375bcc0dc33..1339988f4fc8 100644
--- a/metadata/md5-cache/dev-ros/rostest-1.13.6
+++ b/metadata/md5-cache/dev-ros/rostest-1.13.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.6.tar.gz -> ros_comm-1.13.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1d2d3be469d52cfc187ccd69b887e4c3
diff --git a/metadata/md5-cache/dev-ros/rostest-1.14.2 b/metadata/md5-cache/dev-ros/rostest-1.14.2
index adc884958dde..b15b144f1660 100644
--- a/metadata/md5-cache/dev-ros/rostest-1.14.2
+++ b/metadata/md5-cache/dev-ros/rostest-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.2.tar.gz -> ros_comm-1.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=1d2d3be469d52cfc187ccd69b887e4c3
diff --git a/metadata/md5-cache/dev-ros/rostest-1.14.3 b/metadata/md5-cache/dev-ros/rostest-1.14.3
index 19722f185497..95e8cfb00576 100644
--- a/metadata/md5-cache/dev-ros/rostest-1.14.3
+++ b/metadata/md5-cache/dev-ros/rostest-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1d2d3be469d52cfc187ccd69b887e4c3
diff --git a/metadata/md5-cache/dev-ros/rostest-9999 b/metadata/md5-cache/dev-ros/rostest-9999
index ac62c61400cd..5b1f8e3fa5c3 100644
--- a/metadata/md5-cache/dev-ros/rostest-9999
+++ b/metadata/md5-cache/dev-ros/rostest-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=c9c42febae63a37f75d0567e989e569b
diff --git a/metadata/md5-cache/dev-ros/rostime-0.5.6 b/metadata/md5-cache/dev-ros/rostime-0.5.6
index c70fb355aed8..7f893b48ebbc 100644
--- a/metadata/md5-cache/dev-ros/rostime-0.5.6
+++ b/metadata/md5-cache/dev-ros/rostime-0.5.6
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.5.6.tar.gz -> roscpp_core-0.5.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=444a90f77216bea94494686007b10565
diff --git a/metadata/md5-cache/dev-ros/rostime-0.5.7 b/metadata/md5-cache/dev-ros/rostime-0.5.7
index c95ad54e1c3e..3cee972f9b2c 100644
--- a/metadata/md5-cache/dev-ros/rostime-0.5.7
+++ b/metadata/md5-cache/dev-ros/rostime-0.5.7
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.5.7.tar.gz -> roscpp_core-0.5.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=444a90f77216bea94494686007b10565
diff --git a/metadata/md5-cache/dev-ros/rostime-0.6.0 b/metadata/md5-cache/dev-ros/rostime-0.6.0
index 9826e72a34c5..287d9eb9916f 100644
--- a/metadata/md5-cache/dev-ros/rostime-0.6.0
+++ b/metadata/md5-cache/dev-ros/rostime-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.0.tar.gz -> roscpp_core-0.6.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=444a90f77216bea94494686007b10565
diff --git a/metadata/md5-cache/dev-ros/rostime-0.6.1 b/metadata/md5-cache/dev-ros/rostime-0.6.1
index 29d6e61d8dca..6196fb6839e5 100644
--- a/metadata/md5-cache/dev-ros/rostime-0.6.1
+++ b/metadata/md5-cache/dev-ros/rostime-0.6.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.1.tar.gz -> roscpp_core-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=04ec76514166809125740110efc599a7
diff --git a/metadata/md5-cache/dev-ros/rostime-0.6.10 b/metadata/md5-cache/dev-ros/rostime-0.6.10
index d767a943e16c..5dfe1f7d6667 100644
--- a/metadata/md5-cache/dev-ros/rostime-0.6.10
+++ b/metadata/md5-cache/dev-ros/rostime-0.6.10
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.10.tar.gz -> roscpp_core-0.6.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b1e1b240bb48c3a338606a47948d6ec7
diff --git a/metadata/md5-cache/dev-ros/rostime-0.6.11 b/metadata/md5-cache/dev-ros/rostime-0.6.11
index 79d2dda9ea2d..625f769aeaa6 100644
--- a/metadata/md5-cache/dev-ros/rostime-0.6.11
+++ b/metadata/md5-cache/dev-ros/rostime-0.6.11
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.11.tar.gz -> roscpp_core-0.6.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b1e1b240bb48c3a338606a47948d6ec7
diff --git a/metadata/md5-cache/dev-ros/rostime-0.6.2 b/metadata/md5-cache/dev-ros/rostime-0.6.2
index 6f24b48def55..db28fa31c27d 100644
--- a/metadata/md5-cache/dev-ros/rostime-0.6.2
+++ b/metadata/md5-cache/dev-ros/rostime-0.6.2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.2.tar.gz -> roscpp_core-0.6.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=5f4f37b2e56d057b0d23e1843046de09
diff --git a/metadata/md5-cache/dev-ros/rostime-0.6.3 b/metadata/md5-cache/dev-ros/rostime-0.6.3
index f64c1e769f99..5292e3fce457 100644
--- a/metadata/md5-cache/dev-ros/rostime-0.6.3
+++ b/metadata/md5-cache/dev-ros/rostime-0.6.3
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.3.tar.gz -> roscpp_core-0.6.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5f4f37b2e56d057b0d23e1843046de09
diff --git a/metadata/md5-cache/dev-ros/rostime-0.6.4 b/metadata/md5-cache/dev-ros/rostime-0.6.4
index 59493bf8e30e..def4424af190 100644
--- a/metadata/md5-cache/dev-ros/rostime-0.6.4
+++ b/metadata/md5-cache/dev-ros/rostime-0.6.4
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.4.tar.gz -> roscpp_core-0.6.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5f4f37b2e56d057b0d23e1843046de09
diff --git a/metadata/md5-cache/dev-ros/rostime-0.6.5 b/metadata/md5-cache/dev-ros/rostime-0.6.5
index e03f36ec8362..0eb090305e2e 100644
--- a/metadata/md5-cache/dev-ros/rostime-0.6.5
+++ b/metadata/md5-cache/dev-ros/rostime-0.6.5
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.5.tar.gz -> roscpp_core-0.6.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5f4f37b2e56d057b0d23e1843046de09
diff --git a/metadata/md5-cache/dev-ros/rostime-0.6.7 b/metadata/md5-cache/dev-ros/rostime-0.6.7
index 822ec4d4d732..0a5cdb989b9a 100644
--- a/metadata/md5-cache/dev-ros/rostime-0.6.7
+++ b/metadata/md5-cache/dev-ros/rostime-0.6.7
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.7.tar.gz -> roscpp_core-0.6.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5f4f37b2e56d057b0d23e1843046de09
diff --git a/metadata/md5-cache/dev-ros/rostime-0.6.8 b/metadata/md5-cache/dev-ros/rostime-0.6.8
index c5d64a258602..8e37b0523878 100644
--- a/metadata/md5-cache/dev-ros/rostime-0.6.8
+++ b/metadata/md5-cache/dev-ros/rostime-0.6.8
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.8.tar.gz -> roscpp_core-0.6.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b1e1b240bb48c3a338606a47948d6ec7
diff --git a/metadata/md5-cache/dev-ros/rostime-0.6.9 b/metadata/md5-cache/dev-ros/rostime-0.6.9
index a36de5724d55..187298fa8134 100644
--- a/metadata/md5-cache/dev-ros/rostime-0.6.9
+++ b/metadata/md5-cache/dev-ros/rostime-0.6.9
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.9.tar.gz -> roscpp_core-0.6.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b1e1b240bb48c3a338606a47948d6ec7
diff --git a/metadata/md5-cache/dev-ros/rostime-9999 b/metadata/md5-cache/dev-ros/rostime-9999
index d2f702068b04..fcce9f59333b 100644
--- a/metadata/md5-cache/dev-ros/rostime-9999
+++ b/metadata/md5-cache/dev-ros/rostime-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=444a90f77216bea94494686007b10565
diff --git a/metadata/md5-cache/dev-ros/rostopic-1.13.0 b/metadata/md5-cache/dev-ros/rostopic-1.13.0
index 83cad4592a25..f0cfbe5fc2fb 100644
--- a/metadata/md5-cache/dev-ros/rostopic-1.13.0
+++ b/metadata/md5-cache/dev-ros/rostopic-1.13.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.0.tar.gz -> ros_comm-1.13.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5cf8f9cfbb182afce3de4dc60cbb45d1
diff --git a/metadata/md5-cache/dev-ros/rostopic-1.13.1 b/metadata/md5-cache/dev-ros/rostopic-1.13.1
index 399bc98fd1ee..4073cfc1d8a9 100644
--- a/metadata/md5-cache/dev-ros/rostopic-1.13.1
+++ b/metadata/md5-cache/dev-ros/rostopic-1.13.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.1.tar.gz -> ros_comm-1.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5cf8f9cfbb182afce3de4dc60cbb45d1
diff --git a/metadata/md5-cache/dev-ros/rostopic-1.13.2 b/metadata/md5-cache/dev-ros/rostopic-1.13.2
index 0703d91a9c18..51427b1a0046 100644
--- a/metadata/md5-cache/dev-ros/rostopic-1.13.2
+++ b/metadata/md5-cache/dev-ros/rostopic-1.13.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.2.tar.gz -> ros_comm-1.13.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=5cf8f9cfbb182afce3de4dc60cbb45d1
diff --git a/metadata/md5-cache/dev-ros/rostopic-1.13.4 b/metadata/md5-cache/dev-ros/rostopic-1.13.4
index 7dff79c743ec..4b4b166c7f91 100644
--- a/metadata/md5-cache/dev-ros/rostopic-1.13.4
+++ b/metadata/md5-cache/dev-ros/rostopic-1.13.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.4.tar.gz -> ros_comm-1.13.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5cf8f9cfbb182afce3de4dc60cbb45d1
diff --git a/metadata/md5-cache/dev-ros/rostopic-1.13.5 b/metadata/md5-cache/dev-ros/rostopic-1.13.5
index 6ef31b73102a..ae8dc520d3b3 100644
--- a/metadata/md5-cache/dev-ros/rostopic-1.13.5
+++ b/metadata/md5-cache/dev-ros/rostopic-1.13.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.5.tar.gz -> ros_comm-1.13.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5cf8f9cfbb182afce3de4dc60cbb45d1
diff --git a/metadata/md5-cache/dev-ros/rostopic-1.13.6 b/metadata/md5-cache/dev-ros/rostopic-1.13.6
index 5ddcd151e549..9746c0b600ce 100644
--- a/metadata/md5-cache/dev-ros/rostopic-1.13.6
+++ b/metadata/md5-cache/dev-ros/rostopic-1.13.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.6.tar.gz -> ros_comm-1.13.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d69fee37006be24d0b6e1685c25467f2
diff --git a/metadata/md5-cache/dev-ros/rostopic-1.14.2 b/metadata/md5-cache/dev-ros/rostopic-1.14.2
index 6d83146b00b4..4948539be08d 100644
--- a/metadata/md5-cache/dev-ros/rostopic-1.14.2
+++ b/metadata/md5-cache/dev-ros/rostopic-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.2.tar.gz -> ros_comm-1.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=d69fee37006be24d0b6e1685c25467f2
diff --git a/metadata/md5-cache/dev-ros/rostopic-1.14.3 b/metadata/md5-cache/dev-ros/rostopic-1.14.3
index 57f9b5f94093..d8f8e3710181 100644
--- a/metadata/md5-cache/dev-ros/rostopic-1.14.3
+++ b/metadata/md5-cache/dev-ros/rostopic-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d69fee37006be24d0b6e1685c25467f2
diff --git a/metadata/md5-cache/dev-ros/rostopic-9999 b/metadata/md5-cache/dev-ros/rostopic-9999
index 410f6374c171..c30a33283e50 100644
--- a/metadata/md5-cache/dev-ros/rostopic-9999
+++ b/metadata/md5-cache/dev-ros/rostopic-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=5cf8f9cfbb182afce3de4dc60cbb45d1
diff --git a/metadata/md5-cache/dev-ros/rosunit-1.14.0 b/metadata/md5-cache/dev-ros/rosunit-1.14.0
index b39cc38e641c..3e634f457f4f 100644
--- a/metadata/md5-cache/dev-ros/rosunit-1.14.0
+++ b/metadata/md5-cache/dev-ros/rosunit-1.14.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.14.0.tar.gz -> ros-1.14.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fd5477f21934997024988a77d88dc0f6
diff --git a/metadata/md5-cache/dev-ros/rosunit-1.14.1 b/metadata/md5-cache/dev-ros/rosunit-1.14.1
index fb053a7b8fc7..a380062dd62e 100644
--- a/metadata/md5-cache/dev-ros/rosunit-1.14.1
+++ b/metadata/md5-cache/dev-ros/rosunit-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.14.1.tar.gz -> ros-1.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fd5477f21934997024988a77d88dc0f6
diff --git a/metadata/md5-cache/dev-ros/rosunit-1.14.2 b/metadata/md5-cache/dev-ros/rosunit-1.14.2
index 2d15f918e9e2..dc1bdd4d4bea 100644
--- a/metadata/md5-cache/dev-ros/rosunit-1.14.2
+++ b/metadata/md5-cache/dev-ros/rosunit-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.14.2.tar.gz -> ros-1.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=fd5477f21934997024988a77d88dc0f6
diff --git a/metadata/md5-cache/dev-ros/rosunit-1.14.3 b/metadata/md5-cache/dev-ros/rosunit-1.14.3
index 6ad1cdbf12a0..967585555c62 100644
--- a/metadata/md5-cache/dev-ros/rosunit-1.14.3
+++ b/metadata/md5-cache/dev-ros/rosunit-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.14.3.tar.gz -> ros-1.14.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f83b6a52718dab05ca14e2d99490cecd
diff --git a/metadata/md5-cache/dev-ros/rosunit-1.14.4 b/metadata/md5-cache/dev-ros/rosunit-1.14.4
index 980ba78d8d0e..0e2bde8dcf09 100644
--- a/metadata/md5-cache/dev-ros/rosunit-1.14.4
+++ b/metadata/md5-cache/dev-ros/rosunit-1.14.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.14.4.tar.gz -> ros-1.14.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f83b6a52718dab05ca14e2d99490cecd
diff --git a/metadata/md5-cache/dev-ros/rosunit-9999 b/metadata/md5-cache/dev-ros/rosunit-9999
index cab273aee5a3..ba9d5ceeabf7 100644
--- a/metadata/md5-cache/dev-ros/rosunit-9999
+++ b/metadata/md5-cache/dev-ros/rosunit-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=fd5477f21934997024988a77d88dc0f6
diff --git a/metadata/md5-cache/dev-ros/roswtf-1.13.0 b/metadata/md5-cache/dev-ros/roswtf-1.13.0
index 93545d6d0e40..d846e1d99067 100644
--- a/metadata/md5-cache/dev-ros/roswtf-1.13.0
+++ b/metadata/md5-cache/dev-ros/roswtf-1.13.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.0.tar.gz -> ros_comm-1.13.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b125dac9ab7301db2c8899d1453c35f7
diff --git a/metadata/md5-cache/dev-ros/roswtf-1.13.1 b/metadata/md5-cache/dev-ros/roswtf-1.13.1
index b8fc1b007b1c..b6774af6d96c 100644
--- a/metadata/md5-cache/dev-ros/roswtf-1.13.1
+++ b/metadata/md5-cache/dev-ros/roswtf-1.13.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.1.tar.gz -> ros_comm-1.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b125dac9ab7301db2c8899d1453c35f7
diff --git a/metadata/md5-cache/dev-ros/roswtf-1.13.2 b/metadata/md5-cache/dev-ros/roswtf-1.13.2
index efda9b138b15..3b7d80a21c72 100644
--- a/metadata/md5-cache/dev-ros/roswtf-1.13.2
+++ b/metadata/md5-cache/dev-ros/roswtf-1.13.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.2.tar.gz -> ros_comm-1.13.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=b125dac9ab7301db2c8899d1453c35f7
diff --git a/metadata/md5-cache/dev-ros/roswtf-1.13.4 b/metadata/md5-cache/dev-ros/roswtf-1.13.4
index 324a42d4fcbd..88e64839039d 100644
--- a/metadata/md5-cache/dev-ros/roswtf-1.13.4
+++ b/metadata/md5-cache/dev-ros/roswtf-1.13.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.4.tar.gz -> ros_comm-1.13.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b125dac9ab7301db2c8899d1453c35f7
diff --git a/metadata/md5-cache/dev-ros/roswtf-1.13.5 b/metadata/md5-cache/dev-ros/roswtf-1.13.5
index fae8c60a3ced..42c77e168788 100644
--- a/metadata/md5-cache/dev-ros/roswtf-1.13.5
+++ b/metadata/md5-cache/dev-ros/roswtf-1.13.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.5.tar.gz -> ros_comm-1.13.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b125dac9ab7301db2c8899d1453c35f7
diff --git a/metadata/md5-cache/dev-ros/roswtf-1.13.6 b/metadata/md5-cache/dev-ros/roswtf-1.13.6
index 60ed6300027d..37bb12299716 100644
--- a/metadata/md5-cache/dev-ros/roswtf-1.13.6
+++ b/metadata/md5-cache/dev-ros/roswtf-1.13.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.6.tar.gz -> ros_comm-1.13.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=12d49760283c9fe8c4a693ee5b412404
diff --git a/metadata/md5-cache/dev-ros/roswtf-1.14.2 b/metadata/md5-cache/dev-ros/roswtf-1.14.2
index 80171feced5e..ab2139a71369 100644
--- a/metadata/md5-cache/dev-ros/roswtf-1.14.2
+++ b/metadata/md5-cache/dev-ros/roswtf-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.2.tar.gz -> ros_comm-1.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=12d49760283c9fe8c4a693ee5b412404
diff --git a/metadata/md5-cache/dev-ros/roswtf-1.14.3 b/metadata/md5-cache/dev-ros/roswtf-1.14.3
index ae27ec8c9045..112f7e8efc81 100644
--- a/metadata/md5-cache/dev-ros/roswtf-1.14.3
+++ b/metadata/md5-cache/dev-ros/roswtf-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=12d49760283c9fe8c4a693ee5b412404
diff --git a/metadata/md5-cache/dev-ros/roswtf-9999 b/metadata/md5-cache/dev-ros/roswtf-9999
index dda1fa9d6a74..ec3bfd9e8fb9 100644
--- a/metadata/md5-cache/dev-ros/roswtf-9999
+++ b/metadata/md5-cache/dev-ros/roswtf-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=e0e5007dc79240a317f9b0cdd58c2058
diff --git a/metadata/md5-cache/dev-ros/rotate_recovery-1.16.1 b/metadata/md5-cache/dev-ros/rotate_recovery-1.16.1
index c0be0d5a117d..d33b6748ff43 100644
--- a/metadata/md5-cache/dev-ros/rotate_recovery-1.16.1
+++ b/metadata/md5-cache/dev-ros/rotate_recovery-1.16.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/costmap_2d dev-cpp/eigen:3 >=dev-ros/nav_core-1.16 dev-ros/plugi
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.1.tar.gz -> navigation-1.16.1.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e8840f4fb3afb2ce141fa9065d6c80a1
diff --git a/metadata/md5-cache/dev-ros/rotate_recovery-1.16.2 b/metadata/md5-cache/dev-ros/rotate_recovery-1.16.2
index fd35065fbf92..77abec7d21e1 100644
--- a/metadata/md5-cache/dev-ros/rotate_recovery-1.16.2
+++ b/metadata/md5-cache/dev-ros/rotate_recovery-1.16.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eig
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz -> navigation-1.16.2.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=79af0da29a098079e29336b6254e7576
diff --git a/metadata/md5-cache/dev-ros/rotate_recovery-9999 b/metadata/md5-cache/dev-ros/rotate_recovery-9999
index ee8bfc62ec3a..6b0ae8b1156d 100644
--- a/metadata/md5-cache/dev-ros/rotate_recovery-9999
+++ b/metadata/md5-cache/dev-ros/rotate_recovery-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=79af0da29a098079e29336b6254e7576
diff --git a/metadata/md5-cache/dev-ros/rqt_action-0.4.9 b/metadata/md5-cache/dev-ros/rqt_action-0.4.9
index 8e1c8f266b10..88c000f860a5 100644
--- a/metadata/md5-cache/dev-ros/rqt_action-0.4.9
+++ b/metadata/md5-cache/dev-ros/rqt_action-0.4.9
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_action/archive/0.4.9.tar.gz -> rqt_action-0.4.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=619cab03def1d3daa0fe4f966d00bc3e
diff --git a/metadata/md5-cache/dev-ros/rqt_action-9999 b/metadata/md5-cache/dev-ros/rqt_action-9999
index 71db6328fc31..ad8989fc6fc0 100644
--- a/metadata/md5-cache/dev-ros/rqt_action-9999
+++ b/metadata/md5-cache/dev-ros/rqt_action-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_msg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=619cab03def1d3daa0fe4f966d00bc3e
diff --git a/metadata/md5-cache/dev-ros/rqt_bag-0.4.11 b/metadata/md5-cache/dev-ros/rqt_bag-0.4.11
index 2c78827c39cb..9ecd41bf92da 100644
--- a/metadata/md5-cache/dev-ros/rqt_bag-0.4.11
+++ b/metadata/md5-cache/dev-ros/rqt_bag-0.4.11
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_bag/archive/0.4.11.tar.gz -> rqt_bag-0.4.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3a71e381828c161ace3d18aca7ccb2c9
diff --git a/metadata/md5-cache/dev-ros/rqt_bag-0.4.12 b/metadata/md5-cache/dev-ros/rqt_bag-0.4.12
index 8c40a07ed142..274dd0851475 100644
--- a/metadata/md5-cache/dev-ros/rqt_bag-0.4.12
+++ b/metadata/md5-cache/dev-ros/rqt_bag-0.4.12
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_bag/archive/0.4.12.tar.gz -> rqt_bag-0.4.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=31840280b0bb9fcb4078cd50956d7506
diff --git a/metadata/md5-cache/dev-ros/rqt_bag-9999 b/metadata/md5-cache/dev-ros/rqt_bag-9999
index 648b3bd7a6af..dd87a4e69c77 100644
--- a/metadata/md5-cache/dev-ros/rqt_bag-9999
+++ b/metadata/md5-cache/dev-ros/rqt_bag-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[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_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=3a71e381828c161ace3d18aca7ccb2c9
diff --git a/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.11 b/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.11
index cad1c2045d68..81e4a0c7a22f 100644
--- a/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.11
+++ b/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.11
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_bag/archive/0.4.11.tar.gz -> rqt_bag-0.4.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=94413a8300acf7116bd5a7b0c93e0a28
diff --git a/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.12 b/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.12
index 64ea89a3ec3f..09939540b357 100644
--- a/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.12
+++ b/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.12
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_bag/archive/0.4.12.tar.gz -> rqt_bag-0.4.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ebe53e9cf1defe8e0c140c3cf3883a31
diff --git a/metadata/md5-cache/dev-ros/rqt_bag_plugins-9999 b/metadata/md5-cache/dev-ros/rqt_bag_plugins-9999
index 836fca67eef2..736c3a26e653 100644
--- a/metadata/md5-cache/dev-ros/rqt_bag_plugins-9999
+++ b/metadata/md5-cache/dev-ros/rqt_bag_plugins-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_bag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=94413a8300acf7116bd5a7b0c93e0a28
diff --git a/metadata/md5-cache/dev-ros/rqt_console-0.4.7 b/metadata/md5-cache/dev-ros/rqt_console-0.4.7
index cbd17c774368..3dbd1e0ed106 100644
--- a/metadata/md5-cache/dev-ros/rqt_console-0.4.7
+++ b/metadata/md5-cache/dev-ros/rqt_console-0.4.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.7.tar.gz -> rqt_common_plugins-0.4.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c77a31c70c0655199ecbfe5079337a72
diff --git a/metadata/md5-cache/dev-ros/rqt_console-0.4.8 b/metadata/md5-cache/dev-ros/rqt_console-0.4.8
index 207032e3c9b3..4e5a92b13956 100644
--- a/metadata/md5-cache/dev-ros/rqt_console-0.4.8
+++ b/metadata/md5-cache/dev-ros/rqt_console-0.4.8
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_console/archive/0.4.8.tar.gz -> rqt_console-0.4.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=dd273580b23c0be7c621e5d14f709180
diff --git a/metadata/md5-cache/dev-ros/rqt_console-9999 b/metadata/md5-cache/dev-ros/rqt_console-9999
index 2e8af4e4480b..df8b8a2eb6fc 100644
--- a/metadata/md5-cache/dev-ros/rqt_console-9999
+++ b/metadata/md5-cache/dev-ros/rqt_console-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_logger_level[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[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_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=dd273580b23c0be7c621e5d14f709180
diff --git a/metadata/md5-cache/dev-ros/rqt_controller_manager-0.14.2 b/metadata/md5-cache/dev-ros/rqt_controller_manager-0.14.2
index 1932bcbcf992..38b97461baec 100644
--- a/metadata/md5-cache/dev-ros/rqt_controller_manager-0.14.2
+++ b/metadata/md5-cache/dev-ros/rqt_controller_manager-0.14.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_t
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.14.2.tar.gz -> ros_control-0.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=56d90a675886292a968bac35e075ec37
diff --git a/metadata/md5-cache/dev-ros/rqt_controller_manager-0.15.0 b/metadata/md5-cache/dev-ros/rqt_controller_manager-0.15.0
index 7d2e2f321550..7102660ba4c2 100644
--- a/metadata/md5-cache/dev-ros/rqt_controller_manager-0.15.0
+++ b/metadata/md5-cache/dev-ros/rqt_controller_manager-0.15.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_t
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.15.0.tar.gz -> ros_control-0.15.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=56d90a675886292a968bac35e075ec37
diff --git a/metadata/md5-cache/dev-ros/rqt_controller_manager-9999 b/metadata/md5-cache/dev-ros/rqt_controller_manager-9999
index af1d0ca26f99..720bf0031b2b 100644
--- a/metadata/md5-cache/dev-ros/rqt_controller_manager-9999
+++ b/metadata/md5-cache/dev-ros/rqt_controller_manager-9999
@@ -8,5 +8,5 @@ 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=77d8b22a6cedc0f0f98e9175d02f1df0
diff --git a/metadata/md5-cache/dev-ros/rqt_dep-0.4.7 b/metadata/md5-cache/dev-ros/rqt_dep-0.4.7
index b958a19c5376..426325002bc9 100644
--- a/metadata/md5-cache/dev-ros/rqt_dep-0.4.7
+++ b/metadata/md5-cache/dev-ros/rqt_dep-0.4.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.7.tar.gz -> rqt_common_plugins-0.4.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f063e25702b3bf8ed050a86548dbc6b2
diff --git a/metadata/md5-cache/dev-ros/rqt_dep-0.4.8 b/metadata/md5-cache/dev-ros/rqt_dep-0.4.8
index dbde49d84216..8bc02d3cc759 100644
--- a/metadata/md5-cache/dev-ros/rqt_dep-0.4.8
+++ b/metadata/md5-cache/dev-ros/rqt_dep-0.4.8
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_dep/archive/0.4.8.tar.gz -> rqt_dep-0.4.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=761680bc29cff76d33704a066090771b
diff --git a/metadata/md5-cache/dev-ros/rqt_dep-0.4.9 b/metadata/md5-cache/dev-ros/rqt_dep-0.4.9
index 98a936305cd2..0cc2a523130b 100644
--- a/metadata/md5-cache/dev-ros/rqt_dep-0.4.9
+++ b/metadata/md5-cache/dev-ros/rqt_dep-0.4.9
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_dep/archive/0.4.9.tar.gz -> rqt_dep-0.4.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d545c9cba9861e3e982689ffbe71fe0a
diff --git a/metadata/md5-cache/dev-ros/rqt_dep-9999 b/metadata/md5-cache/dev-ros/rqt_dep-9999
index 1f74719d023c..05a487dd7214 100644
--- a/metadata/md5-cache/dev-ros/rqt_dep-9999
+++ b/metadata/md5-cache/dev-ros/rqt_dep-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_graph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[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_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=761680bc29cff76d33704a066090771b
diff --git a/metadata/md5-cache/dev-ros/rqt_graph-0.4.10 b/metadata/md5-cache/dev-ros/rqt_graph-0.4.10
index 757832668604..9f50a3916828 100644
--- a/metadata/md5-cache/dev-ros/rqt_graph-0.4.10
+++ b/metadata/md5-cache/dev-ros/rqt_graph-0.4.10
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_graph/archive/0.4.10.tar.gz -> rqt_graph-0.4.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3b79cf8033ca053bfb45c3af1276f76a
diff --git a/metadata/md5-cache/dev-ros/rqt_graph-0.4.9 b/metadata/md5-cache/dev-ros/rqt_graph-0.4.9
index 452e67d14761..2987b6e7507d 100644
--- a/metadata/md5-cache/dev-ros/rqt_graph-0.4.9
+++ b/metadata/md5-cache/dev-ros/rqt_graph-0.4.9
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_graph/archive/0.4.9.tar.gz -> rqt_graph-0.4.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b04eaf560cc645fc019b19a221f3cfb5
diff --git a/metadata/md5-cache/dev-ros/rqt_graph-9999 b/metadata/md5-cache/dev-ros/rqt_graph-9999
index 298cb68b1495..e38824b5253a 100644
--- a/metadata/md5-cache/dev-ros/rqt_graph-9999
+++ b/metadata/md5-cache/dev-ros/rqt_graph-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[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_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=b04eaf560cc645fc019b19a221f3cfb5
diff --git a/metadata/md5-cache/dev-ros/rqt_gui-0.5.0 b/metadata/md5-cache/dev-ros/rqt_gui-0.5.0
index 2aa134af6d57..f0dd4d51fe30 100644
--- a/metadata/md5-cache/dev-ros/rqt_gui-0.5.0
+++ b/metadata/md5-cache/dev-ros/rqt_gui-0.5.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt/archive/0.5.0.tar.gz -> rqt-0.5.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=757d0021a4b80d7b65dc20d1fbd6ba0d
diff --git a/metadata/md5-cache/dev-ros/rqt_gui-9999 b/metadata/md5-cache/dev-ros/rqt_gui-9999
index 97db6504162f..ddc2ccf43349 100644
--- a/metadata/md5-cache/dev-ros/rqt_gui-9999
+++ b/metadata/md5-cache/dev-ros/rqt_gui-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=757d0021a4b80d7b65dc20d1fbd6ba0d
diff --git a/metadata/md5-cache/dev-ros/rqt_gui_cpp-0.5.0-r1 b/metadata/md5-cache/dev-ros/rqt_gui_cpp-0.5.0-r1
index a071c4460803..bee16d0a0014 100644
--- a/metadata/md5-cache/dev-ros/rqt_gui_cpp-0.5.0-r1
+++ b/metadata/md5-cache/dev-ros/rqt_gui_cpp-0.5.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtwidgets:5 dev-qt/qtcore:5 >=dev-ros/qt_gui_cpp-0.3.0 >=dev-ros/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt/archive/0.5.0.tar.gz -> rqt-0.5.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3879891cc437a57c2ae6affa1df70a9f
diff --git a/metadata/md5-cache/dev-ros/rqt_gui_cpp-9999 b/metadata/md5-cache/dev-ros/rqt_gui_cpp-9999
index c60a7efbe774..b149d09fbfb7 100644
--- a/metadata/md5-cache/dev-ros/rqt_gui_cpp-9999
+++ b/metadata/md5-cache/dev-ros/rqt_gui_cpp-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-qt/qtwidgets:5 dev-qt/qtcore:5 >=dev-ros/qt_gui_cpp-0.3.0 >=dev-ros/qt_gui-0.3.0 dev-ros/roscpp dev-ros/nodelet dev-libs/tinyxml2:= dev-libs/boost:= dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=3879891cc437a57c2ae6affa1df70a9f
diff --git a/metadata/md5-cache/dev-ros/rqt_gui_py-0.3.2 b/metadata/md5-cache/dev-ros/rqt_gui_py-0.3.2
index cf2fb413e598..61ce50771b63 100644
--- a/metadata/md5-cache/dev-ros/rqt_gui_py-0.3.2
+++ b/metadata/md5-cache/dev-ros/rqt_gui_py-0.3.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt/archive/0.3.2.tar.gz -> rqt-0.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=aa96d973388dae5a96c85154cfab3921
diff --git a/metadata/md5-cache/dev-ros/rqt_gui_py-0.5.0 b/metadata/md5-cache/dev-ros/rqt_gui_py-0.5.0
index 6f7543c04309..21fd6ba503d3 100644
--- a/metadata/md5-cache/dev-ros/rqt_gui_py-0.5.0
+++ b/metadata/md5-cache/dev-ros/rqt_gui_py-0.5.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt/archive/0.5.0.tar.gz -> rqt-0.5.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=aa96d973388dae5a96c85154cfab3921
diff --git a/metadata/md5-cache/dev-ros/rqt_gui_py-9999 b/metadata/md5-cache/dev-ros/rqt_gui_py-9999
index 3073204dad1a..24b0a5e61cbf 100644
--- a/metadata/md5-cache/dev-ros/rqt_gui_py-9999
+++ b/metadata/md5-cache/dev-ros/rqt_gui_py-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/rqt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=aa96d973388dae5a96c85154cfab3921
diff --git a/metadata/md5-cache/dev-ros/rqt_image_view-0.4.11-r1 b/metadata/md5-cache/dev-ros/rqt_image_view-0.4.11-r1
index 20f119b1aeda..50abc0762014 100644
--- a/metadata/md5-cache/dev-ros/rqt_image_view-0.4.11-r1
+++ b/metadata/md5-cache/dev-ros/rqt_image_view-0.4.11-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_image_view/archive/0.4.11.tar.gz -> rqt_image_view-0.4.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c4b04f77bd97b4a74abf8eccfb0b2934
diff --git a/metadata/md5-cache/dev-ros/rqt_image_view-0.4.13 b/metadata/md5-cache/dev-ros/rqt_image_view-0.4.13
index e3b24a25d92f..a99ab9c813d5 100644
--- a/metadata/md5-cache/dev-ros/rqt_image_view-0.4.13
+++ b/metadata/md5-cache/dev-ros/rqt_image_view-0.4.13
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_image_view/archive/0.4.13.tar.gz -> rqt_image_view-0.4.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7b2c6f3215b755e159e867f83fc44a72
diff --git a/metadata/md5-cache/dev-ros/rqt_image_view-9999 b/metadata/md5-cache/dev-ros/rqt_image_view-9999
index d355d3ae3994..4fd02e27ce8f 100644
--- a/metadata/md5-cache/dev-ros/rqt_image_view-9999
+++ b/metadata/md5-cache/dev-ros/rqt_image_view-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/opencv:= dev-ros/image_transport dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/rqt_gui_cpp-0.3 dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-qt/qtwidgets:5 dev-libs/boost:= dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=c4b04f77bd97b4a74abf8eccfb0b2934
diff --git a/metadata/md5-cache/dev-ros/rqt_launch-0.4.7 b/metadata/md5-cache/dev-ros/rqt_launch-0.4.7
index c540598a1903..60639b6e730c 100644
--- a/metadata/md5-cache/dev-ros/rqt_launch-0.4.7
+++ b/metadata/md5-cache/dev-ros/rqt_launch-0.4.7
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.7.tar.gz -> rqt_common_plugins-0.4.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=95f71229f5c8bd9ae8987a82c82def19
diff --git a/metadata/md5-cache/dev-ros/rqt_launch-0.4.8 b/metadata/md5-cache/dev-ros/rqt_launch-0.4.8
index beaafb2eac26..d823a72000e7 100644
--- a/metadata/md5-cache/dev-ros/rqt_launch-0.4.8
+++ b/metadata/md5-cache/dev-ros/rqt_launch-0.4.8
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_launch/archive/0.4.8.tar.gz -> rqt_launch-0.4.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0585909c41444af5c34587e06de023d4
diff --git a/metadata/md5-cache/dev-ros/rqt_launch-9999 b/metadata/md5-cache/dev-ros/rqt_launch-9999
index 3aa6f40133ad..158e6fc77f3b 100644
--- a/metadata/md5-cache/dev-ros/rqt_launch-9999
+++ b/metadata/md5-cache/dev-ros/rqt_launch-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=0585909c41444af5c34587e06de023d4
diff --git a/metadata/md5-cache/dev-ros/rqt_logger_level-0.4.7 b/metadata/md5-cache/dev-ros/rqt_logger_level-0.4.7
index e7f59f922e18..4fea258d21e6 100644
--- a/metadata/md5-cache/dev-ros/rqt_logger_level-0.4.7
+++ b/metadata/md5-cache/dev-ros/rqt_logger_level-0.4.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.7.tar.gz -> rqt_common_plugins-0.4.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c19f8190d7d43bf07ec59f2b39ca85b2
diff --git a/metadata/md5-cache/dev-ros/rqt_logger_level-0.4.8 b/metadata/md5-cache/dev-ros/rqt_logger_level-0.4.8
index b8bfb3358f05..e52870937d57 100644
--- a/metadata/md5-cache/dev-ros/rqt_logger_level-0.4.8
+++ b/metadata/md5-cache/dev-ros/rqt_logger_level-0.4.8
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_logger_level/archive/0.4.8.tar.gz -> rqt_logger_level-0.4.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5ce595e87babdbbfa2575c1747d93020
diff --git a/metadata/md5-cache/dev-ros/rqt_logger_level-9999 b/metadata/md5-cache/dev-ros/rqt_logger_level-9999
index c1c7090f0963..bd1090c3b1a3 100644
--- a/metadata/md5-cache/dev-ros/rqt_logger_level-9999
+++ b/metadata/md5-cache/dev-ros/rqt_logger_level-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[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_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=5ce595e87babdbbfa2575c1747d93020
diff --git a/metadata/md5-cache/dev-ros/rqt_moveit-0.5.6 b/metadata/md5-cache/dev-ros/rqt_moveit-0.5.6
index 5a310d9202b3..f9cbe94d2448 100644
--- a/metadata/md5-cache/dev-ros/rqt_moveit-0.5.6
+++ b/metadata/md5-cache/dev-ros/rqt_moveit-0.5.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.6.tar.gz -> rqt_robot_plugins-0.5.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b8f63357efcda840cc13599d1d17fd27
diff --git a/metadata/md5-cache/dev-ros/rqt_moveit-0.5.7 b/metadata/md5-cache/dev-ros/rqt_moveit-0.5.7
index ceea6fa435d5..a8079b652272 100644
--- a/metadata/md5-cache/dev-ros/rqt_moveit-0.5.7
+++ b/metadata/md5-cache/dev-ros/rqt_moveit-0.5.7
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_moveit/archive/0.5.7.tar.gz -> rqt_moveit-0.5.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b34096f6033143d1e68b60d891e3f893
diff --git a/metadata/md5-cache/dev-ros/rqt_moveit-9999 b/metadata/md5-cache/dev-ros/rqt_moveit-9999
index 732f557ac50a..d4ca3630e35e 100644
--- a/metadata/md5-cache/dev-ros/rqt_moveit-9999
+++ b/metadata/md5-cache/dev-ros/rqt_moveit-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_topic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=b34096f6033143d1e68b60d891e3f893
diff --git a/metadata/md5-cache/dev-ros/rqt_msg-0.4.7 b/metadata/md5-cache/dev-ros/rqt_msg-0.4.7
index 0802c10ce933..a6ed9b54140a 100644
--- a/metadata/md5-cache/dev-ros/rqt_msg-0.4.7
+++ b/metadata/md5-cache/dev-ros/rqt_msg-0.4.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.7.tar.gz -> rqt_common_plugins-0.4.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=168dcb63ee18945a263274933326a4b4
diff --git a/metadata/md5-cache/dev-ros/rqt_msg-0.4.8 b/metadata/md5-cache/dev-ros/rqt_msg-0.4.8
index a5b2be644edd..fd6c10c70d5a 100644
--- a/metadata/md5-cache/dev-ros/rqt_msg-0.4.8
+++ b/metadata/md5-cache/dev-ros/rqt_msg-0.4.8
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_msg/archive/0.4.8.tar.gz -> rqt_msg-0.4.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e8c52058bfb4e0ff47a5401aa4d4cdd8
diff --git a/metadata/md5-cache/dev-ros/rqt_msg-9999 b/metadata/md5-cache/dev-ros/rqt_msg-9999
index 4a3a2a2fb87b..773e52b95f69 100644
--- a/metadata/md5-cache/dev-ros/rqt_msg-9999
+++ b/metadata/md5-cache/dev-ros/rqt_msg-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[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_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=e8c52058bfb4e0ff47a5401aa4d4cdd8
diff --git a/metadata/md5-cache/dev-ros/rqt_nav_view-0.5.6 b/metadata/md5-cache/dev-ros/rqt_nav_view-0.5.6
index b5f9ac8d25c8..760ed9f28aca 100644
--- a/metadata/md5-cache/dev-ros/rqt_nav_view-0.5.6
+++ b/metadata/md5-cache/dev-ros/rqt_nav_view-0.5.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.6.tar.gz -> rqt_robot_plugins-0.5.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=138ecb848a1651ed5424b31fc0cffaf5
diff --git a/metadata/md5-cache/dev-ros/rqt_nav_view-0.5.7 b/metadata/md5-cache/dev-ros/rqt_nav_view-0.5.7
index 843cf311ebb9..a16f6d006a87 100644
--- a/metadata/md5-cache/dev-ros/rqt_nav_view-0.5.7
+++ b/metadata/md5-cache/dev-ros/rqt_nav_view-0.5.7
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_nav_view/archive/0.5.7.tar.gz -> rqt_nav_view-0.5.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0354dca772d17aa91f94901c3ba0f3d9
diff --git a/metadata/md5-cache/dev-ros/rqt_nav_view-9999 b/metadata/md5-cache/dev-ros/rqt_nav_view-9999
index 1075b487a585..4f3ca226f537 100644
--- a/metadata/md5-cache/dev-ros/rqt_nav_view-9999
+++ b/metadata/md5-cache/dev-ros/rqt_nav_view-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[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_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=0354dca772d17aa91f94901c3ba0f3d9
diff --git a/metadata/md5-cache/dev-ros/rqt_plot-0.4.8 b/metadata/md5-cache/dev-ros/rqt_plot-0.4.8
index 6520f6763ec7..9eb5fb06cae0 100644
--- a/metadata/md5-cache/dev-ros/rqt_plot-0.4.8
+++ b/metadata/md5-cache/dev-ros/rqt_plot-0.4.8
@@ -10,5 +10,5 @@ RDEPEND=dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_plot/archive/0.4.8.tar.gz -> rqt_plot-0.4.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=586c73e7a62c72af4fd41d20565e71f2
diff --git a/metadata/md5-cache/dev-ros/rqt_plot-9999 b/metadata/md5-cache/dev-ros/rqt_plot-9999
index 8aafa3c96ac5..15db22128cc9 100644
--- a/metadata/md5-cache/dev-ros/rqt_plot-9999
+++ b/metadata/md5-cache/dev-ros/rqt_plot-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyqtgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=586c73e7a62c72af4fd41d20565e71f2
diff --git a/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.8 b/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.8
index fe612ce6f862..f04d38cd8b00 100644
--- a/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.8
+++ b/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.8
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_pose_view/archive/0.5.8.tar.gz -> rqt_pose_view-0.5.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=48583ee5945caf339fdb69360800ce0f
diff --git a/metadata/md5-cache/dev-ros/rqt_pose_view-9999 b/metadata/md5-cache/dev-ros/rqt_pose_view-9999
index 26ec24b9c411..f34fe205c96b 100644
--- a/metadata/md5-cache/dev-ros/rqt_pose_view-9999
+++ b/metadata/md5-cache/dev-ros/rqt_pose_view-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopengl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=48583ee5945caf339fdb69360800ce0f
diff --git a/metadata/md5-cache/dev-ros/rqt_publisher-0.4.7 b/metadata/md5-cache/dev-ros/rqt_publisher-0.4.7
index a5b1b6e2ddc1..d44659856ae5 100644
--- a/metadata/md5-cache/dev-ros/rqt_publisher-0.4.7
+++ b/metadata/md5-cache/dev-ros/rqt_publisher-0.4.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.7.tar.gz -> rqt_common_plugins-0.4.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a65412646a53cd5f7b311142061037d0
diff --git a/metadata/md5-cache/dev-ros/rqt_publisher-0.4.8 b/metadata/md5-cache/dev-ros/rqt_publisher-0.4.8
index 8c15f890a15a..26fd1d89a9d5 100644
--- a/metadata/md5-cache/dev-ros/rqt_publisher-0.4.8
+++ b/metadata/md5-cache/dev-ros/rqt_publisher-0.4.8
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_publisher/archive/0.4.8.tar.gz -> rqt_publisher-0.4.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=85363e27e16b66fdaa84a514f3e62875
diff --git a/metadata/md5-cache/dev-ros/rqt_publisher-9999 b/metadata/md5-cache/dev-ros/rqt_publisher-9999
index 4dbd5d77144d..b2b1a56f5267 100644
--- a/metadata/md5-cache/dev-ros/rqt_publisher-9999
+++ b/metadata/md5-cache/dev-ros/rqt_publisher-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[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_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=85363e27e16b66fdaa84a514f3e62875
diff --git a/metadata/md5-cache/dev-ros/rqt_py_common-0.4.7 b/metadata/md5-cache/dev-ros/rqt_py_common-0.4.7
index 9dd66687f9df..2019a2c922fd 100644
--- a/metadata/md5-cache/dev-ros/rqt_py_common-0.4.7
+++ b/metadata/md5-cache/dev-ros/rqt_py_common-0.4.7
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.7.tar.gz -> rqt_common_plugins-0.4.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8e00080b219f2d57217fcf3119c02caf
diff --git a/metadata/md5-cache/dev-ros/rqt_py_common-0.5.0 b/metadata/md5-cache/dev-ros/rqt_py_common-0.5.0
index 5bae41b6b40c..b8d445a1215c 100644
--- a/metadata/md5-cache/dev-ros/rqt_py_common-0.5.0
+++ b/metadata/md5-cache/dev-ros/rqt_py_common-0.5.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt/archive/0.5.0.tar.gz -> rqt-0.5.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=336948e2d568e4b257e0b8289fc70866
diff --git a/metadata/md5-cache/dev-ros/rqt_py_common-9999 b/metadata/md5-cache/dev-ros/rqt_py_common-9999
index 821fc03ed67d..7a11c72a12be 100644
--- a/metadata/md5-cache/dev-ros/rqt_py_common-9999
+++ b/metadata/md5-cache/dev-ros/rqt_py_common-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[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_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=336948e2d568e4b257e0b8289fc70866
diff --git a/metadata/md5-cache/dev-ros/rqt_py_console-0.4.7 b/metadata/md5-cache/dev-ros/rqt_py_console-0.4.7
index c77c18be27dc..fc27b21b6bd0 100644
--- a/metadata/md5-cache/dev-ros/rqt_py_console-0.4.7
+++ b/metadata/md5-cache/dev-ros/rqt_py_console-0.4.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.7.tar.gz -> rqt_common_plugins-0.4.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=46993c3a9603f544a73307e5c80790ee
diff --git a/metadata/md5-cache/dev-ros/rqt_py_console-0.4.8 b/metadata/md5-cache/dev-ros/rqt_py_console-0.4.8
index 8e40f8e47e22..ad11ef48b864 100644
--- a/metadata/md5-cache/dev-ros/rqt_py_console-0.4.8
+++ b/metadata/md5-cache/dev-ros/rqt_py_console-0.4.8
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_py_console/archive/0.4.8.tar.gz -> rqt_py_console-0.4.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cfdbe0a7f26cae5c845bce456f8a83f7
diff --git a/metadata/md5-cache/dev-ros/rqt_py_console-9999 b/metadata/md5-cache/dev-ros/rqt_py_console-9999
index a704f267cd8a..f6feedc02a68 100644
--- a/metadata/md5-cache/dev-ros/rqt_py_console-9999
+++ b/metadata/md5-cache/dev-ros/rqt_py_console-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[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_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=cfdbe0a7f26cae5c845bce456f8a83f7
diff --git a/metadata/md5-cache/dev-ros/rqt_reconfigure-0.4.10 b/metadata/md5-cache/dev-ros/rqt_reconfigure-0.4.10
index 20fdbf96a820..64c5ac036a12 100644
--- a/metadata/md5-cache/dev-ros/rqt_reconfigure-0.4.10
+++ b/metadata/md5-cache/dev-ros/rqt_reconfigure-0.4.10
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_reconfigure/archive/0.4.10.tar.gz -> rqt_reconfigure-0.4.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=abb6430a8c043b533006039f619744c6
diff --git a/metadata/md5-cache/dev-ros/rqt_reconfigure-0.4.8 b/metadata/md5-cache/dev-ros/rqt_reconfigure-0.4.8
index a7e4d9a66ea9..3b02977c91a1 100644
--- a/metadata/md5-cache/dev-ros/rqt_reconfigure-0.4.8
+++ b/metadata/md5-cache/dev-ros/rqt_reconfigure-0.4.8
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_reconfigure/archive/0.4.8.tar.gz -> rqt_reconfigure-0.4.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7bf9951d19896325ec157c46d8b684d8
diff --git a/metadata/md5-cache/dev-ros/rqt_reconfigure-0.4.9 b/metadata/md5-cache/dev-ros/rqt_reconfigure-0.4.9
index 01f9a5d63d1d..8974562910f3 100644
--- a/metadata/md5-cache/dev-ros/rqt_reconfigure-0.4.9
+++ b/metadata/md5-cache/dev-ros/rqt_reconfigure-0.4.9
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_reconfigure/archive/0.4.9.tar.gz -> rqt_reconfigure-0.4.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=abb6430a8c043b533006039f619744c6
diff --git a/metadata/md5-cache/dev-ros/rqt_reconfigure-9999 b/metadata/md5-cache/dev-ros/rqt_reconfigure-9999
index 31b63bd96d42..cffaa6a71f7a 100644
--- a/metadata/md5-cache/dev-ros/rqt_reconfigure-9999
+++ b/metadata/md5-cache/dev-ros/rqt_reconfigure-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=7bf9951d19896325ec157c46d8b684d8
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_dashboard-0.5.6 b/metadata/md5-cache/dev-ros/rqt_robot_dashboard-0.5.6
index 659f9ba2f06b..ce3345e6f00d 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_dashboard-0.5.6
+++ b/metadata/md5-cache/dev-ros/rqt_robot_dashboard-0.5.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.6.tar.gz -> rqt_robot_plugins-0.5.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f82a6eb76f1f9b1ceffdf27f9942c7e1
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_dashboard-0.5.7 b/metadata/md5-cache/dev-ros/rqt_robot_dashboard-0.5.7
index 6cd751bd3680..761e448d3033 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_dashboard-0.5.7
+++ b/metadata/md5-cache/dev-ros/rqt_robot_dashboard-0.5.7
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_dashboard/archive/0.5.7.tar.gz -> rqt_robot_dashboard-0.5.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a07d6f48731a6ad3a9fc4a8c842e2c4a
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_dashboard-9999 b/metadata/md5-cache/dev-ros/rqt_robot_dashboard-9999
index d74ffc7dbf2e..838ca04d2d89 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_dashboard-9999
+++ b/metadata/md5-cache/dev-ros/rqt_robot_dashboard-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_nav_view[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_robot_monitor[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_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=a07d6f48731a6ad3a9fc4a8c842e2c4a
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.6 b/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.6
index 15b10a18140f..b41dd3195314 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.6
+++ b/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.6.tar.gz -> rqt_robot_plugins-0.5.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=368f8566dae25a9ed260a7fd27552764
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.7 b/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.7
index ca7c1c6126a9..8a917299bdf0 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.7
+++ b/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.7
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_monitor/archive/0.5.7.tar.gz -> rqt_robot_monitor-0.5.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=73fd37497a98cfc23189575a470070a2
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.8 b/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.8
index 35a621249bf2..11b17e509ce7 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.8
+++ b/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.8
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_monitor/archive/0.5.8.tar.gz -> rqt_robot_monitor-0.5.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=73fd37497a98cfc23189575a470070a2
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_monitor-9999 b/metadata/md5-cache/dev-ros/rqt_robot_monitor-9999
index 3efbd55d03bd..9510070d772a 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_monitor-9999
+++ b/metadata/md5-cache/dev-ros/rqt_robot_monitor-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_bag[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_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=73fd37497a98cfc23189575a470070a2
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.8 b/metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.8
index df522edd1e05..e79906b855f8 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.8
+++ b/metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.8
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_steering/archive/0.5.8.tar.gz -> rqt_robot_steering-0.5.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e23218be3e1862ff15005d5e94164d94
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.9 b/metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.9
index 7aff5ded26c7..5b50b7dad9e8 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.9
+++ b/metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.9
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_steering/archive/0.5.9.tar.gz -> rqt_robot_steering-0.5.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cd7f6f04f907e09781212633626bee65
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_steering-9999 b/metadata/md5-cache/dev-ros/rqt_robot_steering-9999
index eea5be89b695..841bc0125cb3 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_steering-9999
+++ b/metadata/md5-cache/dev-ros/rqt_robot_steering-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[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_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=e23218be3e1862ff15005d5e94164d94
diff --git a/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.5.6 b/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.5.6
index 387e18c722ec..d54863656016 100644
--- a/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.5.6
+++ b/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.5.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.6.tar.gz -> rqt_robot_plugins-0.5.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f077bca6e5a7902985fa4035d529c280
diff --git a/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.5.7 b/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.5.7
index a6c3f30685b3..2836eddf01e6 100644
--- a/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.5.7
+++ b/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.5.7
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_runtime_monitor/archive/0.5.7.tar.gz -> rqt_runtime_monitor-0.5.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e5b96e957b9f7205ebe510368b56ddd6
diff --git a/metadata/md5-cache/dev-ros/rqt_runtime_monitor-9999 b/metadata/md5-cache/dev-ros/rqt_runtime_monitor-9999
index 339decc8d8f0..9229e64f5b51 100644
--- a/metadata/md5-cache/dev-ros/rqt_runtime_monitor-9999
+++ b/metadata/md5-cache/dev-ros/rqt_runtime_monitor-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[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_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=e5b96e957b9f7205ebe510368b56ddd6
diff --git a/metadata/md5-cache/dev-ros/rqt_rviz-0.5.8-r1 b/metadata/md5-cache/dev-ros/rqt_rviz-0.5.8-r1
index 624fbc50b049..770f96779765 100644
--- a/metadata/md5-cache/dev-ros/rqt_rviz-0.5.8-r1
+++ b/metadata/md5-cache/dev-ros/rqt_rviz-0.5.8-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= dev-ros/pluginlib[python_targets_python2_7(-)?,-python_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_rviz/archive/0.5.8.tar.gz -> rqt_rviz-0.5.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7ed1f4e295b02f156b33d1cdceddaf6b
diff --git a/metadata/md5-cache/dev-ros/rqt_rviz-0.5.9 b/metadata/md5-cache/dev-ros/rqt_rviz-0.5.9
index ce4d62e20f14..d1d1e546e34d 100644
--- a/metadata/md5-cache/dev-ros/rqt_rviz-0.5.9
+++ b/metadata/md5-cache/dev-ros/rqt_rviz-0.5.9
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= dev-ros/pluginlib[python_targets_python2_7(-)?,-python_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_rviz/archive/0.5.9.tar.gz -> rqt_rviz-0.5.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f9c7923939a9239c0332064533206ff3
diff --git a/metadata/md5-cache/dev-ros/rqt_rviz-0.6.0 b/metadata/md5-cache/dev-ros/rqt_rviz-0.6.0
index b8f9270a460f..c1a9c3267a01 100644
--- a/metadata/md5-cache/dev-ros/rqt_rviz-0.6.0
+++ b/metadata/md5-cache/dev-ros/rqt_rviz-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= dev-ros/pluginlib[python_targets_python2_7(-)?,-python_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_rviz/archive/0.6.0.tar.gz -> rqt_rviz-0.6.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f9c7923939a9239c0332064533206ff3
diff --git a/metadata/md5-cache/dev-ros/rqt_rviz-9999 b/metadata/md5-cache/dev-ros/rqt_rviz-9999
index f21c874f0739..7c5a0af02221 100644
--- a/metadata/md5-cache/dev-ros/rqt_rviz-9999
+++ b/metadata/md5-cache/dev-ros/rqt_rviz-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost:= dev-ros/pluginlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_cpp >=dev-ros/qt_gui_cpp-0.3 dev-qt/qtwidgets:5 dev-ros/rviz dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=7ed1f4e295b02f156b33d1cdceddaf6b
diff --git a/metadata/md5-cache/dev-ros/rqt_service_caller-0.4.7 b/metadata/md5-cache/dev-ros/rqt_service_caller-0.4.7
index c896c77f0d05..39580a892402 100644
--- a/metadata/md5-cache/dev-ros/rqt_service_caller-0.4.7
+++ b/metadata/md5-cache/dev-ros/rqt_service_caller-0.4.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.7.tar.gz -> rqt_common_plugins-0.4.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=11f7ac4fc6fa3cbb45ab807261af2e3b
diff --git a/metadata/md5-cache/dev-ros/rqt_service_caller-0.4.8 b/metadata/md5-cache/dev-ros/rqt_service_caller-0.4.8
index 0c70dca0aad0..8c88a04f8c58 100644
--- a/metadata/md5-cache/dev-ros/rqt_service_caller-0.4.8
+++ b/metadata/md5-cache/dev-ros/rqt_service_caller-0.4.8
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_service_caller/archive/0.4.8.tar.gz -> rqt_service_caller-0.4.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5900ef7e574ae9449b8a863d14c73c8b
diff --git a/metadata/md5-cache/dev-ros/rqt_service_caller-9999 b/metadata/md5-cache/dev-ros/rqt_service_caller-9999
index 1e10cc489072..268fae9c8b45 100644
--- a/metadata/md5-cache/dev-ros/rqt_service_caller-9999
+++ b/metadata/md5-cache/dev-ros/rqt_service_caller-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=5900ef7e574ae9449b8a863d14c73c8b
diff --git a/metadata/md5-cache/dev-ros/rqt_shell-0.4.8 b/metadata/md5-cache/dev-ros/rqt_shell-0.4.8
index 26799c320469..5142a4c5428f 100644
--- a/metadata/md5-cache/dev-ros/rqt_shell-0.4.8
+++ b/metadata/md5-cache/dev-ros/rqt_shell-0.4.8
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_shell/archive/0.4.8.tar.gz -> rqt_shell-0.4.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b3e19534673bdcf0751b53f6bebb6de9
diff --git a/metadata/md5-cache/dev-ros/rqt_shell-0.4.9 b/metadata/md5-cache/dev-ros/rqt_shell-0.4.9
index 1513ce77c5f2..531354dc7af6 100644
--- a/metadata/md5-cache/dev-ros/rqt_shell-0.4.9
+++ b/metadata/md5-cache/dev-ros/rqt_shell-0.4.9
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_shell/archive/0.4.9.tar.gz -> rqt_shell-0.4.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b3e19534673bdcf0751b53f6bebb6de9
diff --git a/metadata/md5-cache/dev-ros/rqt_shell-9999 b/metadata/md5-cache/dev-ros/rqt_shell-9999
index aa775283ef82..f30dcb12152e 100644
--- a/metadata/md5-cache/dev-ros/rqt_shell-9999
+++ b/metadata/md5-cache/dev-ros/rqt_shell-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[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_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=b3e19534673bdcf0751b53f6bebb6de9
diff --git a/metadata/md5-cache/dev-ros/rqt_srv-0.4.7 b/metadata/md5-cache/dev-ros/rqt_srv-0.4.7
index 7867011a83c1..3a37ab53ba0c 100644
--- a/metadata/md5-cache/dev-ros/rqt_srv-0.4.7
+++ b/metadata/md5-cache/dev-ros/rqt_srv-0.4.7
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.7.tar.gz -> rqt_common_plugins-0.4.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ff1bc2b9c1a928a00e45918f7a077da8
diff --git a/metadata/md5-cache/dev-ros/rqt_srv-0.4.8 b/metadata/md5-cache/dev-ros/rqt_srv-0.4.8
index 95e3c53ebbf2..9a90d240703c 100644
--- a/metadata/md5-cache/dev-ros/rqt_srv-0.4.8
+++ b/metadata/md5-cache/dev-ros/rqt_srv-0.4.8
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_srv/archive/0.4.8.tar.gz -> rqt_srv-0.4.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b5a1f3e542bad3fff00a3988372b2adb
diff --git a/metadata/md5-cache/dev-ros/rqt_srv-9999 b/metadata/md5-cache/dev-ros/rqt_srv-9999
index e4f46be4beac..a0a501527d10 100644
--- a/metadata/md5-cache/dev-ros/rqt_srv-9999
+++ b/metadata/md5-cache/dev-ros/rqt_srv-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_msg[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_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=b5a1f3e542bad3fff00a3988372b2adb
diff --git a/metadata/md5-cache/dev-ros/rqt_tf_tree-0.5.6 b/metadata/md5-cache/dev-ros/rqt_tf_tree-0.5.6
index 993c19c3f169..7114c98d773b 100644
--- a/metadata/md5-cache/dev-ros/rqt_tf_tree-0.5.6
+++ b/metadata/md5-cache/dev-ros/rqt_tf_tree-0.5.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.6.tar.gz -> rqt_robot_plugins-0.5.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=53e223820e30b9f44543adc7f36d28da
diff --git a/metadata/md5-cache/dev-ros/rqt_tf_tree-0.5.7 b/metadata/md5-cache/dev-ros/rqt_tf_tree-0.5.7
index d5bab10e41ad..400cbb31f07d 100644
--- a/metadata/md5-cache/dev-ros/rqt_tf_tree-0.5.7
+++ b/metadata/md5-cache/dev-ros/rqt_tf_tree-0.5.7
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_tf_tree/archive/0.5.7.tar.gz -> rqt_tf_tree-0.5.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6931a34e8a2e42dc4c86253278d4bf02
diff --git a/metadata/md5-cache/dev-ros/rqt_tf_tree-0.5.8 b/metadata/md5-cache/dev-ros/rqt_tf_tree-0.5.8
index d548bf77f810..cfdc3b9fc9c8 100644
--- a/metadata/md5-cache/dev-ros/rqt_tf_tree-0.5.8
+++ b/metadata/md5-cache/dev-ros/rqt_tf_tree-0.5.8
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_tf_tree/archive/0.5.8.tar.gz -> rqt_tf_tree-0.5.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6931a34e8a2e42dc4c86253278d4bf02
diff --git a/metadata/md5-cache/dev-ros/rqt_tf_tree-9999 b/metadata/md5-cache/dev-ros/rqt_tf_tree-9999
index 6a94b5314890..5326d98ebbfd 100644
--- a/metadata/md5-cache/dev-ros/rqt_tf_tree-9999
+++ b/metadata/md5-cache/dev-ros/rqt_tf_tree-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_graph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_ros[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_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=6931a34e8a2e42dc4c86253278d4bf02
diff --git a/metadata/md5-cache/dev-ros/rqt_top-0.4.7 b/metadata/md5-cache/dev-ros/rqt_top-0.4.7
index 0c1050a5a440..fe222f13e09c 100644
--- a/metadata/md5-cache/dev-ros/rqt_top-0.4.7
+++ b/metadata/md5-cache/dev-ros/rqt_top-0.4.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.7.tar.gz -> rqt_common_plugins-0.4.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=68d2fcb6e22af2773f88b73ecec3e0b9
diff --git a/metadata/md5-cache/dev-ros/rqt_top-0.4.8 b/metadata/md5-cache/dev-ros/rqt_top-0.4.8
index 53599ee54359..10d24c5299ca 100644
--- a/metadata/md5-cache/dev-ros/rqt_top-0.4.8
+++ b/metadata/md5-cache/dev-ros/rqt_top-0.4.8
@@ -10,5 +10,5 @@ RDEPEND=dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_top/archive/0.4.8.tar.gz -> rqt_top-0.4.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7231ac1a5461d65a3bb636be749fd673
diff --git a/metadata/md5-cache/dev-ros/rqt_top-9999 b/metadata/md5-cache/dev-ros/rqt_top-9999
index 5d92c308ed04..25a1db4caf36 100644
--- a/metadata/md5-cache/dev-ros/rqt_top-9999
+++ b/metadata/md5-cache/dev-ros/rqt_top-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[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_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=7231ac1a5461d65a3bb636be749fd673
diff --git a/metadata/md5-cache/dev-ros/rqt_topic-0.4.10 b/metadata/md5-cache/dev-ros/rqt_topic-0.4.10
index fa1ded66b3e9..cd5daf2f6e62 100644
--- a/metadata/md5-cache/dev-ros/rqt_topic-0.4.10
+++ b/metadata/md5-cache/dev-ros/rqt_topic-0.4.10
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_topic/archive/0.4.10.tar.gz -> rqt_topic-0.4.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=aeb16f058cb6a8b42d30def6550c6269
diff --git a/metadata/md5-cache/dev-ros/rqt_topic-0.4.9 b/metadata/md5-cache/dev-ros/rqt_topic-0.4.9
index c9bcc8b0b3ec..a3098c5d6379 100644
--- a/metadata/md5-cache/dev-ros/rqt_topic-0.4.9
+++ b/metadata/md5-cache/dev-ros/rqt_topic-0.4.9
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_topic/archive/0.4.9.tar.gz -> rqt_topic-0.4.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=aeb16f058cb6a8b42d30def6550c6269
diff --git a/metadata/md5-cache/dev-ros/rqt_topic-9999 b/metadata/md5-cache/dev-ros/rqt_topic-9999
index f939c52b4492..886d626a402f 100644
--- a/metadata/md5-cache/dev-ros/rqt_topic-9999
+++ b/metadata/md5-cache/dev-ros/rqt_topic-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[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_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=aeb16f058cb6a8b42d30def6550c6269
diff --git a/metadata/md5-cache/dev-ros/rqt_web-0.4.7 b/metadata/md5-cache/dev-ros/rqt_web-0.4.7
index 86f9369cc41f..fd7d5fab8846 100644
--- a/metadata/md5-cache/dev-ros/rqt_web-0.4.7
+++ b/metadata/md5-cache/dev-ros/rqt_web-0.4.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.7.tar.gz -> rqt_common_plugins-0.4.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f90e4fd8077929ed32d433b6c43975bf
diff --git a/metadata/md5-cache/dev-ros/rqt_web-0.4.8 b/metadata/md5-cache/dev-ros/rqt_web-0.4.8
index 8f1f7b30b458..20c40d95b573 100644
--- a/metadata/md5-cache/dev-ros/rqt_web-0.4.8
+++ b/metadata/md5-cache/dev-ros/rqt_web-0.4.8
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_web/archive/0.4.8.tar.gz -> rqt_web-0.4.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=591fcdae723775d55735cd258933f591
diff --git a/metadata/md5-cache/dev-ros/rqt_web-9999 b/metadata/md5-cache/dev-ros/rqt_web-9999
index e9fa2afbec0c..3157cbb79aa6 100644
--- a/metadata/md5-cache/dev-ros/rqt_web-9999
+++ b/metadata/md5-cache/dev-ros/rqt_web-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=591fcdae723775d55735cd258933f591
diff --git a/metadata/md5-cache/dev-ros/rviz-1.13.1-r1 b/metadata/md5-cache/dev-ros/rviz-1.13.1-r1
index 166cbe9a9a7b..86dce1795505 100644
--- a/metadata/md5-cache/dev-ros/rviz-1.13.1-r1
+++ b/metadata/md5-cache/dev-ros/rviz-1.13.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] media-libs/assimp <dev-games/ogre-1.10:= virtu
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rviz/archive/1.13.1.tar.gz -> rviz-1.13.1.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=dce18c89515ad667aee3e37f3e86549e
diff --git a/metadata/md5-cache/dev-ros/rviz-9999 b/metadata/md5-cache/dev-ros/rviz-9999
index d6cd2bd2a1e1..9b203f1a3e61 100644
--- a/metadata/md5-cache/dev-ros/rviz-9999
+++ b/metadata/md5-cache/dev-ros/rviz-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost:=[threads] media-libs/assimp <dev-games/ogre-1.10:= virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml2:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/resource_retriever dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/map_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=dce18c89515ad667aee3e37f3e86549e
diff --git a/metadata/md5-cache/dev-ros/rviz_imu_plugin-1.1.5-r1 b/metadata/md5-cache/dev-ros/rviz_imu_plugin-1.1.5-r1
index 9df307c47619..0fc7ee10b326 100644
--- a/metadata/md5-cache/dev-ros/rviz_imu_plugin-1.1.5-r1
+++ b/metadata/md5-cache/dev-ros/rviz_imu_plugin-1.1.5-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-ros/roscpp dev-ros
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ccny-ros-pkg/imu_tools/archive/1.1.5.tar.gz -> imu_tools-1.1.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=83f35a3c9f745c0680e8acd67c2af996
diff --git a/metadata/md5-cache/dev-ros/rviz_imu_plugin-1.2.0 b/metadata/md5-cache/dev-ros/rviz_imu_plugin-1.2.0
index 826d5131e26f..d7cf96103aeb 100644
--- a/metadata/md5-cache/dev-ros/rviz_imu_plugin-1.2.0
+++ b/metadata/md5-cache/dev-ros/rviz_imu_plugin-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-ros/roscpp dev-ros
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ccny-ros-pkg/imu_tools/archive/1.2.0.tar.gz -> imu_tools-1.2.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8efcb18cc63537bb1ba1fd66de447be0
diff --git a/metadata/md5-cache/dev-ros/rviz_imu_plugin-9999 b/metadata/md5-cache/dev-ros/rviz_imu_plugin-9999
index ce794f70a7b7..952c09a633ae 100644
--- a/metadata/md5-cache/dev-ros/rviz_imu_plugin-9999
+++ b/metadata/md5-cache/dev-ros/rviz_imu_plugin-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-ros/roscpp dev-ros/rviz dev-libs/boost:= dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=83f35a3c9f745c0680e8acd67c2af996
diff --git a/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-0.10.1-r4 b/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-0.10.1-r4
index c3bd53f674ef..8668f4b4c8ca 100644
--- a/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-0.10.1-r4
+++ b/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-0.10.1-r4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rviz dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.10.1.tar.gz -> visualization_tutorials-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7ed45c001f140e7e421d04d63f1d61e9
diff --git a/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-0.10.2 b/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-0.10.2
index 6b52679028fe..babd90fe334d 100644
--- a/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-0.10.2
+++ b/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-0.10.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rviz dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.10.2.tar.gz -> visualization_tutorials-0.10.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=7eb6ca877ed8cef3e880bfba086701a9
diff --git a/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-0.10.3 b/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-0.10.3
index 112661aca5a8..ffd87887d91e 100644
--- a/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-0.10.3
+++ b/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-0.10.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rviz dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.10.3.tar.gz -> visualization_tutorials-0.10.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7eb6ca877ed8cef3e880bfba086701a9
diff --git a/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-9999 b/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-9999
index 826a1d887980..51123cccd644 100644
--- a/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rviz dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=7ed45c001f140e7e421d04d63f1d61e9
diff --git a/metadata/md5-cache/dev-ros/rviz_python_tutorial-0.10.1 b/metadata/md5-cache/dev-ros/rviz_python_tutorial-0.10.1
index dcfcfc249e69..5e28acd45255 100644
--- a/metadata/md5-cache/dev-ros/rviz_python_tutorial-0.10.1
+++ b/metadata/md5-cache/dev-ros/rviz_python_tutorial-0.10.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rviz[python_targets_python2_7(-)?,-python_single_target_python2_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.10.1.tar.gz -> visualization_tutorials-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5db142f5e93e4719a0c482227e9404c9
diff --git a/metadata/md5-cache/dev-ros/rviz_python_tutorial-0.10.2 b/metadata/md5-cache/dev-ros/rviz_python_tutorial-0.10.2
index 0b228b4cec0d..fdfa0645ef2e 100644
--- a/metadata/md5-cache/dev-ros/rviz_python_tutorial-0.10.2
+++ b/metadata/md5-cache/dev-ros/rviz_python_tutorial-0.10.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rviz[python_targets_python2_7(-)?,-python_single_target_python2_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.10.2.tar.gz -> visualization_tutorials-0.10.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=26adc53fc21624f57e75cc08cdf0fca8
diff --git a/metadata/md5-cache/dev-ros/rviz_python_tutorial-0.10.3 b/metadata/md5-cache/dev-ros/rviz_python_tutorial-0.10.3
index 9f17521dbf9f..b67b4910f1a3 100644
--- a/metadata/md5-cache/dev-ros/rviz_python_tutorial-0.10.3
+++ b/metadata/md5-cache/dev-ros/rviz_python_tutorial-0.10.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rviz[python_targets_python2_7(-)?,-python_single_target_python2_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.10.3.tar.gz -> visualization_tutorials-0.10.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=26adc53fc21624f57e75cc08cdf0fca8
diff --git a/metadata/md5-cache/dev-ros/rviz_python_tutorial-0.9.2 b/metadata/md5-cache/dev-ros/rviz_python_tutorial-0.9.2
index 9c3e13b2e68e..8848f4c94e73 100644
--- a/metadata/md5-cache/dev-ros/rviz_python_tutorial-0.9.2
+++ b/metadata/md5-cache/dev-ros/rviz_python_tutorial-0.9.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rviz[python_targets_python2_7(-)?,-python_single_target_python2_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.9.2.tar.gz -> visualization_tutorials-0.9.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=5db142f5e93e4719a0c482227e9404c9
diff --git a/metadata/md5-cache/dev-ros/rviz_python_tutorial-9999 b/metadata/md5-cache/dev-ros/rviz_python_tutorial-9999
index fd6ca726bca1..742dceed13ca 100644
--- a/metadata/md5-cache/dev-ros/rviz_python_tutorial-9999
+++ b/metadata/md5-cache/dev-ros/rviz_python_tutorial-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rviz[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_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=5db142f5e93e4719a0c482227e9404c9
diff --git a/metadata/md5-cache/dev-ros/self_test-1.8.10 b/metadata/md5-cache/dev-ros/self_test-1.8.10
index 9e22073dd1ff..89936cc6b4c6 100644
--- a/metadata/md5-cache/dev-ros/self_test-1.8.10
+++ b/metadata/md5-cache/dev-ros/self_test-1.8.10
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs dev-ros/diagnostic_updater dev-ros/roscpp dev-ro
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.8.10.tar.gz -> diagnostics-1.8.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ca50bd3bc89731a65ef566558bdf683e
diff --git a/metadata/md5-cache/dev-ros/self_test-1.8.8 b/metadata/md5-cache/dev-ros/self_test-1.8.8
index d054d67e9a32..b89e2f5aa998 100644
--- a/metadata/md5-cache/dev-ros/self_test-1.8.8
+++ b/metadata/md5-cache/dev-ros/self_test-1.8.8
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs dev-ros/diagnostic_updater dev-ros/roscpp dev-ro
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.8.8.tar.gz -> diagnostics-1.8.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2dae065468ce2bf23b970303919848da
diff --git a/metadata/md5-cache/dev-ros/self_test-1.8.9 b/metadata/md5-cache/dev-ros/self_test-1.8.9
index fe5fb1135781..c9fdb505031c 100644
--- a/metadata/md5-cache/dev-ros/self_test-1.8.9
+++ b/metadata/md5-cache/dev-ros/self_test-1.8.9
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs dev-ros/diagnostic_updater dev-ros/roscpp dev-ro
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.8.9.tar.gz -> diagnostics-1.8.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2dae065468ce2bf23b970303919848da
diff --git a/metadata/md5-cache/dev-ros/self_test-1.9.0 b/metadata/md5-cache/dev-ros/self_test-1.9.0
index 278db8c2ef30..975182f6229b 100644
--- a/metadata/md5-cache/dev-ros/self_test-1.9.0
+++ b/metadata/md5-cache/dev-ros/self_test-1.9.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs dev-ros/diagnostic_updater dev-ros/roscpp dev-ro
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.0.tar.gz -> diagnostics-1.9.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f6c5126ff8098a6d0f223a8e347bb44c
diff --git a/metadata/md5-cache/dev-ros/self_test-1.9.2 b/metadata/md5-cache/dev-ros/self_test-1.9.2
index 633b38469da1..c855d9e9ef8e 100644
--- a/metadata/md5-cache/dev-ros/self_test-1.9.2
+++ b/metadata/md5-cache/dev-ros/self_test-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs dev-ros/diagnostic_updater dev-ros/roscpp dev-ro
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.2.tar.gz -> diagnostics-1.9.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=f6c5126ff8098a6d0f223a8e347bb44c
diff --git a/metadata/md5-cache/dev-ros/self_test-1.9.3 b/metadata/md5-cache/dev-ros/self_test-1.9.3
index acf6ed113b2f..d2ea88e080ae 100644
--- a/metadata/md5-cache/dev-ros/self_test-1.9.3
+++ b/metadata/md5-cache/dev-ros/self_test-1.9.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs dev-ros/diagnostic_updater dev-ros/roscpp dev-ro
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.3.tar.gz -> diagnostics-1.9.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fce78dba65802e29841b9a7eee34248c
diff --git a/metadata/md5-cache/dev-ros/self_test-9999 b/metadata/md5-cache/dev-ros/self_test-9999
index aedd9fac2690..70f0c5fa8b72 100644
--- a/metadata/md5-cache/dev-ros/self_test-9999
+++ b/metadata/md5-cache/dev-ros/self_test-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/diagnostic_msgs dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=2dae065468ce2bf23b970303919848da
diff --git a/metadata/md5-cache/dev-ros/sensor_msgs-1.12.5 b/metadata/md5-cache/dev-ros/sensor_msgs-1.12.5
index 2ca9aecfa1e6..46887e7c7fca 100644
--- a/metadata/md5-cache/dev-ros/sensor_msgs-1.12.5
+++ b/metadata/md5-cache/dev-ros/sensor_msgs-1.12.5
@@ -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/ros/common_msgs/archive/1.12.5.tar.gz -> common_msgs-1.12.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=95d59d78e9953a8311fb511eb39e1fb2
diff --git a/metadata/md5-cache/dev-ros/sensor_msgs-1.12.6 b/metadata/md5-cache/dev-ros/sensor_msgs-1.12.6
index 10398900a484..9cfcf27b7061 100644
--- a/metadata/md5-cache/dev-ros/sensor_msgs-1.12.6
+++ b/metadata/md5-cache/dev-ros/sensor_msgs-1.12.6
@@ -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/ros/common_msgs/archive/1.12.6.tar.gz -> common_msgs-1.12.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=95d59d78e9953a8311fb511eb39e1fb2
diff --git a/metadata/md5-cache/dev-ros/sensor_msgs-9999 b/metadata/md5-cache/dev-ros/sensor_msgs-9999
index d6883ba21fd8..18f5c3922cfc 100644
--- a/metadata/md5-cache/dev-ros/sensor_msgs-9999
+++ b/metadata/md5-cache/dev-ros/sensor_msgs-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=95d59d78e9953a8311fb511eb39e1fb2
diff --git a/metadata/md5-cache/dev-ros/settlerlib-0.10.14 b/metadata/md5-cache/dev-ros/settlerlib-0.10.14
index 95201c056f16..7f5752d84d69 100644
--- a/metadata/md5-cache/dev-ros/settlerlib-0.10.14
+++ b/metadata/md5-cache/dev-ros/settlerlib-0.10.14
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= dev-ros/calibration_msgs[ros_messages_cxx(-)] dev-ros/r
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=728b60942571deb409f3340ff417e13c
diff --git a/metadata/md5-cache/dev-ros/settlerlib-9999 b/metadata/md5-cache/dev-ros/settlerlib-9999
index 51d5f4a0d80c..729ee4569d8b 100644
--- a/metadata/md5-cache/dev-ros/settlerlib-9999
+++ b/metadata/md5-cache/dev-ros/settlerlib-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost:= dev-ros/calibration_msgs[ros_messages_cxx(-)] dev-ros/rosconsole dev-ros/rostime python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=4190812a48d777af29a5746833129090
diff --git a/metadata/md5-cache/dev-ros/shape_msgs-1.12.5 b/metadata/md5-cache/dev-ros/shape_msgs-1.12.5
index e50acf6c0274..d39622902860 100644
--- a/metadata/md5-cache/dev-ros/shape_msgs-1.12.5
+++ b/metadata/md5-cache/dev-ros/shape_msgs-1.12.5
@@ -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/ros/common_msgs/archive/1.12.5.tar.gz -> common_msgs-1.12.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1071239c9b2568131976bfe735ea0432
diff --git a/metadata/md5-cache/dev-ros/shape_msgs-1.12.6 b/metadata/md5-cache/dev-ros/shape_msgs-1.12.6
index edd90e57e5b3..7bb9f8b589ad 100644
--- a/metadata/md5-cache/dev-ros/shape_msgs-1.12.6
+++ b/metadata/md5-cache/dev-ros/shape_msgs-1.12.6
@@ -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/ros/common_msgs/archive/1.12.6.tar.gz -> common_msgs-1.12.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fac1e415303386fb63de0bff3f130505
diff --git a/metadata/md5-cache/dev-ros/shape_msgs-9999 b/metadata/md5-cache/dev-ros/shape_msgs-9999
index 21dc2a1b313c..34c22ed92aa0 100644
--- a/metadata/md5-cache/dev-ros/shape_msgs-9999
+++ b/metadata/md5-cache/dev-ros/shape_msgs-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=1071239c9b2568131976bfe735ea0432
diff --git a/metadata/md5-cache/dev-ros/shape_tools-0.2.1 b/metadata/md5-cache/dev-ros/shape_tools-0.2.1
index 85c7487490cf..82144ef89c07 100644
--- a/metadata/md5-cache/dev-ros/shape_tools-0.2.1
+++ b/metadata/md5-cache/dev-ros/shape_tools-0.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/shape_msgs[ros_m
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/shape_tools/archive/0.2.1.tar.gz -> shape_tools-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1c6355f6334c03b53c5babeb21e77544
diff --git a/metadata/md5-cache/dev-ros/shape_tools-9999 b/metadata/md5-cache/dev-ros/shape_tools-9999
index b519d3a7522b..cdf2759ecea0 100644
--- a/metadata/md5-cache/dev-ros/shape_tools-9999
+++ b/metadata/md5-cache/dev-ros/shape_tools-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/shape_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=1c6355f6334c03b53c5babeb21e77544
diff --git a/metadata/md5-cache/dev-ros/smach-2.0.1 b/metadata/md5-cache/dev-ros/smach-2.0.1
index ee0ccaab4f7f..ca0f48c4f91d 100644
--- a/metadata/md5-cache/dev-ros/smach-2.0.1
+++ b/metadata/md5-cache/dev-ros/smach-2.0.1
@@ -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/ros/executive_smach/archive/2.0.1.tar.gz -> executive_smach-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bbee0edbd1aa1ae2e479dc9b2850b0a6
diff --git a/metadata/md5-cache/dev-ros/smach-9999 b/metadata/md5-cache/dev-ros/smach-9999
index 138ccbef1bd0..abb01853987e 100644
--- a/metadata/md5-cache/dev-ros/smach-9999
+++ b/metadata/md5-cache/dev-ros/smach-9999
@@ -8,5 +8,5 @@ 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=bbee0edbd1aa1ae2e479dc9b2850b0a6
diff --git a/metadata/md5-cache/dev-ros/smach_msgs-2.0.1 b/metadata/md5-cache/dev-ros/smach_msgs-2.0.1
index c687ee966b94..66ab100a8c45 100644
--- a/metadata/md5-cache/dev-ros/smach_msgs-2.0.1
+++ b/metadata/md5-cache/dev-ros/smach_msgs-2.0.1
@@ -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/ros/executive_smach/archive/2.0.1.tar.gz -> executive_smach-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=31ff9a436bfb14228af4246eb786a80f
diff --git a/metadata/md5-cache/dev-ros/smach_msgs-9999 b/metadata/md5-cache/dev-ros/smach_msgs-9999
index 1ebaf34e2dad..1d9a109a4af6 100644
--- a/metadata/md5-cache/dev-ros/smach_msgs-9999
+++ b/metadata/md5-cache/dev-ros/smach_msgs-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=31ff9a436bfb14228af4246eb786a80f
diff --git a/metadata/md5-cache/dev-ros/smach_ros-2.0.0 b/metadata/md5-cache/dev-ros/smach_ros-2.0.0
index 03c82777616c..a4969308997a 100644
--- a/metadata/md5-cache/dev-ros/smach_ros-2.0.0
+++ b/metadata/md5-cache/dev-ros/smach_ros-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/executive_smach/archive/2.0.0.tar.gz -> executive_smach-2.0.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d4f6c3c00c52ad89b3712b4a034ae738
diff --git a/metadata/md5-cache/dev-ros/smach_ros-2.0.1 b/metadata/md5-cache/dev-ros/smach_ros-2.0.1
index d97f937f62c2..e9efc3864842 100644
--- a/metadata/md5-cache/dev-ros/smach_ros-2.0.1
+++ b/metadata/md5-cache/dev-ros/smach_ros-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/executive_smach/archive/2.0.1.tar.gz -> executive_smach-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cf1d417ceced7795eb3f77de1719aa4b
diff --git a/metadata/md5-cache/dev-ros/smach_ros-9999 b/metadata/md5-cache/dev-ros/smach_ros-9999
index 23fe0cd9e960..c532503094b5 100644
--- a/metadata/md5-cache/dev-ros/smach_ros-9999
+++ b/metadata/md5-cache/dev-ros/smach_ros-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/smach[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/smach_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=d4f6c3c00c52ad89b3712b4a034ae738
diff --git a/metadata/md5-cache/dev-ros/smclib-1.7.19 b/metadata/md5-cache/dev-ros/smclib-1.7.19
index 3cd8a3dcb606..69c981bc4ac6 100644
--- a/metadata/md5-cache/dev-ros/smclib-1.7.19
+++ b/metadata/md5-cache/dev-ros/smclib-1.7.19
@@ -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/ros/bond_core/archive/1.7.19.tar.gz -> bond_core-1.7.19.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=aab61b73466a67bca126e79212900646
diff --git a/metadata/md5-cache/dev-ros/smclib-1.8.0 b/metadata/md5-cache/dev-ros/smclib-1.8.0
index cde458daf383..b8421ae1a5d8 100644
--- a/metadata/md5-cache/dev-ros/smclib-1.8.0
+++ b/metadata/md5-cache/dev-ros/smclib-1.8.0
@@ -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/ros/bond_core/archive/1.8.0.tar.gz -> bond_core-1.8.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=aab61b73466a67bca126e79212900646
diff --git a/metadata/md5-cache/dev-ros/smclib-1.8.1 b/metadata/md5-cache/dev-ros/smclib-1.8.1
index 867bf36eb5b9..c1a80d8af3bc 100644
--- a/metadata/md5-cache/dev-ros/smclib-1.8.1
+++ b/metadata/md5-cache/dev-ros/smclib-1.8.1
@@ -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/ros/bond_core/archive/1.8.1.tar.gz -> bond_core-1.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=aab61b73466a67bca126e79212900646
diff --git a/metadata/md5-cache/dev-ros/smclib-1.8.2 b/metadata/md5-cache/dev-ros/smclib-1.8.2
index 310d8cc4b620..cd1ebbfec450 100644
--- a/metadata/md5-cache/dev-ros/smclib-1.8.2
+++ b/metadata/md5-cache/dev-ros/smclib-1.8.2
@@ -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/ros/bond_core/archive/1.8.2.tar.gz -> bond_core-1.8.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=8fc94dcd7a68730b6a1b7e0edd2e9c90
diff --git a/metadata/md5-cache/dev-ros/smclib-1.8.3 b/metadata/md5-cache/dev-ros/smclib-1.8.3
index 0d6eff29879d..1c4d5b4022ed 100644
--- a/metadata/md5-cache/dev-ros/smclib-1.8.3
+++ b/metadata/md5-cache/dev-ros/smclib-1.8.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=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.8.3.tar.gz -> bond_core-1.8.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8fc94dcd7a68730b6a1b7e0edd2e9c90
diff --git a/metadata/md5-cache/dev-ros/smclib-9999 b/metadata/md5-cache/dev-ros/smclib-9999
index 742f63aa4c6c..9e6e51fd678f 100644
--- a/metadata/md5-cache/dev-ros/smclib-9999
+++ b/metadata/md5-cache/dev-ros/smclib-9999
@@ -8,5 +8,5 @@ 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=aab61b73466a67bca126e79212900646
diff --git a/metadata/md5-cache/dev-ros/sound_play-0.3.1 b/metadata/md5-cache/dev-ros/sound_play-0.3.1
index a8dda3ebf0c4..a1590a807562 100644
--- a/metadata/md5-cache/dev-ros/sound_play-0.3.1
+++ b/metadata/md5-cache/dev-ros/sound_play-0.3.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.1.tar.gz -> audio_common-0.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0110c8d1394fff4eb9b891f26cfc9357
diff --git a/metadata/md5-cache/dev-ros/sound_play-0.3.2 b/metadata/md5-cache/dev-ros/sound_play-0.3.2
index 4cb7fe81e808..5ec6f4087cd4 100644
--- a/metadata/md5-cache/dev-ros/sound_play-0.3.2
+++ b/metadata/md5-cache/dev-ros/sound_play-0.3.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.2.tar.gz -> audio_common-0.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=80d5a2b1b5327767b427a3b517f2ec1c
diff --git a/metadata/md5-cache/dev-ros/sound_play-0.3.3 b/metadata/md5-cache/dev-ros/sound_play-0.3.3
index 2659e9e0095f..da97f2ed664c 100644
--- a/metadata/md5-cache/dev-ros/sound_play-0.3.3
+++ b/metadata/md5-cache/dev-ros/sound_play-0.3.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.3.tar.gz -> audio_common-0.3.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=80d5a2b1b5327767b427a3b517f2ec1c
diff --git a/metadata/md5-cache/dev-ros/sound_play-9999 b/metadata/md5-cache/dev-ros/sound_play-9999
index e539ade8420c..de570e3c8b23 100644
--- a/metadata/md5-cache/dev-ros/sound_play-9999
+++ b/metadata/md5-cache/dev-ros/sound_play-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/gst-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-accessibility/festival media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.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(-)] 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/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=0110c8d1394fff4eb9b891f26cfc9357
diff --git a/metadata/md5-cache/dev-ros/stage_ros-1.7.5 b/metadata/md5-cache/dev-ros/stage_ros-1.7.5
index 5b23d65cb055..bdceba99a580 100644
--- a/metadata/md5-cache/dev-ros/stage_ros-1.7.5
+++ b/metadata/md5-cache/dev-ros/stage_ros-1.7.5
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/geometry_msgs dev-ros/nav_msgs dev-ros
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/stage_ros/archive/1.7.5.tar.gz -> stage_ros-1.7.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f6acb70265e4a582c69453d11bd1266d
diff --git a/metadata/md5-cache/dev-ros/stage_ros-1.8.0 b/metadata/md5-cache/dev-ros/stage_ros-1.8.0
index 3f7c65f37e7a..3171e89bf65c 100644
--- a/metadata/md5-cache/dev-ros/stage_ros-1.8.0
+++ b/metadata/md5-cache/dev-ros/stage_ros-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/geometry_msgs dev-ros/nav_msgs dev-ros
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/stage_ros/archive/1.8.0.tar.gz -> stage_ros-1.8.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d55a74348f9c3395d5c2eda215f86917
diff --git a/metadata/md5-cache/dev-ros/stage_ros-9999 b/metadata/md5-cache/dev-ros/stage_ros-9999
index 501a54dd63ef..98103b0f7075 100644
--- a/metadata/md5-cache/dev-ros/stage_ros-9999
+++ b/metadata/md5-cache/dev-ros/stage_ros-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost:=[threads] dev-ros/geometry_msgs dev-ros/nav_msgs dev-ros/roscpp dev-ros/rostest dev-ros/sensor_msgs dev-ros/std_msgs dev-ros/tf x11-libs/fltk >=sci-electronics/Stage-4.3:= dev-ros/std_srvs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=d55a74348f9c3395d5c2eda215f86917
diff --git a/metadata/md5-cache/dev-ros/std_msgs-0.5.11 b/metadata/md5-cache/dev-ros/std_msgs-0.5.11
index 7fa130cf041f..32e2c954a1ae 100644
--- a/metadata/md5-cache/dev-ros/std_msgs-0.5.11
+++ b/metadata/md5-cache/dev-ros/std_msgs-0.5.11
@@ -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/ros/std_msgs/archive/0.5.11.tar.gz -> std_msgs-0.5.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=953d4ebeaada761c8655b0232f121669
diff --git a/metadata/md5-cache/dev-ros/std_msgs-9999 b/metadata/md5-cache/dev-ros/std_msgs-9999
index a9c9e3373434..d751f0e529a8 100644
--- a/metadata/md5-cache/dev-ros/std_msgs-9999
+++ b/metadata/md5-cache/dev-ros/std_msgs-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=953d4ebeaada761c8655b0232f121669
diff --git a/metadata/md5-cache/dev-ros/std_srvs-1.11.2 b/metadata/md5-cache/dev-ros/std_srvs-1.11.2
index 15351d40f702..f8ee90e5cb37 100644
--- a/metadata/md5-cache/dev-ros/std_srvs-1.11.2
+++ b/metadata/md5-cache/dev-ros/std_srvs-1.11.2
@@ -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/ros/ros_comm_msgs/archive/1.11.2.tar.gz -> ros_comm_msgs-1.11.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=cc1da879fe64d82a34bcc3c0bc59f7b0
diff --git a/metadata/md5-cache/dev-ros/std_srvs-9999 b/metadata/md5-cache/dev-ros/std_srvs-9999
index 849ba38d7ead..e643ffa6d545 100644
--- a/metadata/md5-cache/dev-ros/std_srvs-9999
+++ b/metadata/md5-cache/dev-ros/std_srvs-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=cc1da879fe64d82a34bcc3c0bc59f7b0
diff --git a/metadata/md5-cache/dev-ros/stereo_image_proc-1.12.22-r1 b/metadata/md5-cache/dev-ros/stereo_image_proc-1.12.22-r1
index 15305e919bf5..2f7c32fa63ef 100644
--- a/metadata/md5-cache/dev-ros/stereo_image_proc-1.12.22-r1
+++ b/metadata/md5-cache/dev-ros/stereo_image_proc-1.12.22-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.22.tar.gz -> image_pipeline-1.12.22.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=16bbad95763ff3cc8cea67d4ea83f82e
diff --git a/metadata/md5-cache/dev-ros/stereo_image_proc-1.12.23 b/metadata/md5-cache/dev-ros/stereo_image_proc-1.12.23
index f1923108b86d..2b04ce483d49 100644
--- a/metadata/md5-cache/dev-ros/stereo_image_proc-1.12.23
+++ b/metadata/md5-cache/dev-ros/stereo_image_proc-1.12.23
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.23.tar.gz -> image_pipeline-1.12.23.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ec0c422fcd9d3cb8ef01a75ae5e90f7c
diff --git a/metadata/md5-cache/dev-ros/stereo_image_proc-9999 b/metadata/md5-cache/dev-ros/stereo_image_proc-9999
index 37254baa0c9c..2ee6028a3817 100644
--- a/metadata/md5-cache/dev-ros/stereo_image_proc-9999
+++ b/metadata/md5-cache/dev-ros/stereo_image_proc-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_proc dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] media-libs/opencv:= dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=16bbad95763ff3cc8cea67d4ea83f82e
diff --git a/metadata/md5-cache/dev-ros/stereo_msgs-1.12.3 b/metadata/md5-cache/dev-ros/stereo_msgs-1.12.3
index be51808163ac..dc863f4e8140 100644
--- a/metadata/md5-cache/dev-ros/stereo_msgs-1.12.3
+++ b/metadata/md5-cache/dev-ros/stereo_msgs-1.12.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=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.12.3.tar.gz -> common_msgs-1.12.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fb212a5fb1bf5bda782f4bfb02d12446
diff --git a/metadata/md5-cache/dev-ros/stereo_msgs-1.12.4 b/metadata/md5-cache/dev-ros/stereo_msgs-1.12.4
index ca77b83de3af..2333136d535b 100644
--- a/metadata/md5-cache/dev-ros/stereo_msgs-1.12.4
+++ b/metadata/md5-cache/dev-ros/stereo_msgs-1.12.4
@@ -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/ros/common_msgs/archive/1.12.4.tar.gz -> common_msgs-1.12.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fb212a5fb1bf5bda782f4bfb02d12446
diff --git a/metadata/md5-cache/dev-ros/stereo_msgs-1.12.5 b/metadata/md5-cache/dev-ros/stereo_msgs-1.12.5
index c1527bed1f85..ab974fab8820 100644
--- a/metadata/md5-cache/dev-ros/stereo_msgs-1.12.5
+++ b/metadata/md5-cache/dev-ros/stereo_msgs-1.12.5
@@ -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/ros/common_msgs/archive/1.12.5.tar.gz -> common_msgs-1.12.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6e2fcdcdd425289864757673be76f05b
diff --git a/metadata/md5-cache/dev-ros/stereo_msgs-1.12.6 b/metadata/md5-cache/dev-ros/stereo_msgs-1.12.6
index f4a1aaaf966f..30972c811b22 100644
--- a/metadata/md5-cache/dev-ros/stereo_msgs-1.12.6
+++ b/metadata/md5-cache/dev-ros/stereo_msgs-1.12.6
@@ -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/ros/common_msgs/archive/1.12.6.tar.gz -> common_msgs-1.12.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=463a352f94315310dde189f80f8b7202
diff --git a/metadata/md5-cache/dev-ros/stereo_msgs-9999 b/metadata/md5-cache/dev-ros/stereo_msgs-9999
index b720a9f593b7..cb7d32da7d7b 100644
--- a/metadata/md5-cache/dev-ros/stereo_msgs-9999
+++ b/metadata/md5-cache/dev-ros/stereo_msgs-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=fb212a5fb1bf5bda782f4bfb02d12446
diff --git a/metadata/md5-cache/dev-ros/test_bond-1.7.19 b/metadata/md5-cache/dev-ros/test_bond-1.7.19
index 2bfa982b50da..79031847b036 100644
--- a/metadata/md5-cache/dev-ros/test_bond-1.7.19
+++ b/metadata/md5-cache/dev-ros/test_bond-1.7.19
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/bondcpp dev-ros/bondpy[python_targets_python2_7(-)?,-python_sing
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.7.19.tar.gz -> bond_core-1.7.19.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0f3243461db63325a03cfa82d2ed6f51
diff --git a/metadata/md5-cache/dev-ros/test_bond-1.8.0 b/metadata/md5-cache/dev-ros/test_bond-1.8.0
index 5986c86b1e2b..b1d4f321ba4f 100644
--- a/metadata/md5-cache/dev-ros/test_bond-1.8.0
+++ b/metadata/md5-cache/dev-ros/test_bond-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/bondcpp dev-ros/bondpy[python_targets_python2_7(-)?,-python_sing
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.8.0.tar.gz -> bond_core-1.8.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0f3243461db63325a03cfa82d2ed6f51
diff --git a/metadata/md5-cache/dev-ros/test_bond-1.8.1 b/metadata/md5-cache/dev-ros/test_bond-1.8.1
index 219f7d79671e..bc09eb065233 100644
--- a/metadata/md5-cache/dev-ros/test_bond-1.8.1
+++ b/metadata/md5-cache/dev-ros/test_bond-1.8.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/bondcpp dev-ros/bondpy[python_targets_python2_7(-)?,-python_sing
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.8.1.tar.gz -> bond_core-1.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0f3243461db63325a03cfa82d2ed6f51
diff --git a/metadata/md5-cache/dev-ros/test_bond-1.8.2 b/metadata/md5-cache/dev-ros/test_bond-1.8.2
index e4c51c2be9f7..ec46dce92c96 100644
--- a/metadata/md5-cache/dev-ros/test_bond-1.8.2
+++ b/metadata/md5-cache/dev-ros/test_bond-1.8.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/bondcpp dev-ros/bondpy[python_targets_python2_7(-)?,-python_sing
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.8.2.tar.gz -> bond_core-1.8.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=8f74e5aadef2abdfe033ab2eff3c422d
diff --git a/metadata/md5-cache/dev-ros/test_bond-1.8.3 b/metadata/md5-cache/dev-ros/test_bond-1.8.3
index 7debee28295d..7dcf4b2c8425 100644
--- a/metadata/md5-cache/dev-ros/test_bond-1.8.3
+++ b/metadata/md5-cache/dev-ros/test_bond-1.8.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/bondcpp dev-ros/bondpy[python_targets_python2_7(-)?,-python_sing
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.8.3.tar.gz -> bond_core-1.8.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8f74e5aadef2abdfe033ab2eff3c422d
diff --git a/metadata/md5-cache/dev-ros/test_bond-9999 b/metadata/md5-cache/dev-ros/test_bond-9999
index 5cbd2659dcbb..fb3dcc404184 100644
--- a/metadata/md5-cache/dev-ros/test_bond-9999
+++ b/metadata/md5-cache/dev-ros/test_bond-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/bondcpp dev-ros/bondpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=0f3243461db63325a03cfa82d2ed6f51
diff --git a/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.9.3 b/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.9.3
index 0eba28cb2b59..195ae50b90f8 100644
--- a/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.9.3
+++ b/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.9.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.3.tar.gz -> diagnostics-1.9.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=025f758edc71fe08e6d99d6f540a4bce
diff --git a/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-9999 b/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-9999
index 854c786ca51f..187b0b60d51a 100644
--- a/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-9999
+++ b/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=025f758edc71fe08e6d99d6f540a4bce
diff --git a/metadata/md5-cache/dev-ros/test_nodelet-1.9.16 b/metadata/md5-cache/dev-ros/test_nodelet-1.9.16
index 5648c5953ad9..4ee46210aa9e 100644
--- a/metadata/md5-cache/dev-ros/test_nodelet-1.9.16
+++ b/metadata/md5-cache/dev-ros/test_nodelet-1.9.16
@@ -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/ros/nodelet_core/archive/1.9.16.tar.gz -> nodelet_core-1.9.16.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=876a672cc8197977a925e41ce5cc1c05
diff --git a/metadata/md5-cache/dev-ros/test_nodelet-9999 b/metadata/md5-cache/dev-ros/test_nodelet-9999
index ec208d9ac835..39be5f00c9d4 100644
--- a/metadata/md5-cache/dev-ros/test_nodelet-9999
+++ b/metadata/md5-cache/dev-ros/test_nodelet-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=00681c6529c41a8ab7e3f363184381b0
diff --git a/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.9.16 b/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.9.16
index 112cdbfdbaac..cb78dc46ca07 100644
--- a/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.9.16
+++ b/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.9.16
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/nodelet_topic_tools dev-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.9.16.tar.gz -> nodelet_core-1.9.16.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3b9d3c5b12cb420fa0c1454be3f195d4
diff --git a/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-9999 b/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-9999
index bb798841de3f..b75e7400cdd9 100644
--- a/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-9999
+++ b/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/pluginlib dev-ros/roscpp dev-ros/rostest python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=96e68383c5a68733984f4e75b633ca1a
diff --git a/metadata/md5-cache/dev-ros/test_rosbag-1.13.0 b/metadata/md5-cache/dev-ros/test_rosbag-1.13.0
index 56f69f664a61..d1dae148c14a 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag-1.13.0
+++ b/metadata/md5-cache/dev-ros/test_rosbag-1.13.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.0.tar.gz -> ros_comm-1.13.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=224b85d399c4d43bf3118653fd73a016
diff --git a/metadata/md5-cache/dev-ros/test_rosbag-1.13.1 b/metadata/md5-cache/dev-ros/test_rosbag-1.13.1
index 1dcceb7f50c3..ab5e3e3a7367 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag-1.13.1
+++ b/metadata/md5-cache/dev-ros/test_rosbag-1.13.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.1.tar.gz -> ros_comm-1.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=224b85d399c4d43bf3118653fd73a016
diff --git a/metadata/md5-cache/dev-ros/test_rosbag-1.13.2 b/metadata/md5-cache/dev-ros/test_rosbag-1.13.2
index 22d1ca97793a..77e346f41fec 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag-1.13.2
+++ b/metadata/md5-cache/dev-ros/test_rosbag-1.13.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.2.tar.gz -> ros_comm-1.13.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=224b85d399c4d43bf3118653fd73a016
diff --git a/metadata/md5-cache/dev-ros/test_rosbag-1.13.4 b/metadata/md5-cache/dev-ros/test_rosbag-1.13.4
index 6cd01400c9cc..3b0d60b187b1 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag-1.13.4
+++ b/metadata/md5-cache/dev-ros/test_rosbag-1.13.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.4.tar.gz -> ros_comm-1.13.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=224b85d399c4d43bf3118653fd73a016
diff --git a/metadata/md5-cache/dev-ros/test_rosbag-1.13.5 b/metadata/md5-cache/dev-ros/test_rosbag-1.13.5
index d011f24499ab..b01d1ea9b293 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag-1.13.5
+++ b/metadata/md5-cache/dev-ros/test_rosbag-1.13.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.5.tar.gz -> ros_comm-1.13.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=224b85d399c4d43bf3118653fd73a016
diff --git a/metadata/md5-cache/dev-ros/test_rosbag-1.13.6 b/metadata/md5-cache/dev-ros/test_rosbag-1.13.6
index f216c99b71a1..8610eab75d45 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag-1.13.6
+++ b/metadata/md5-cache/dev-ros/test_rosbag-1.13.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.6.tar.gz -> ros_comm-1.13.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d843f7488fb7751fb1fe658e0a77871d
diff --git a/metadata/md5-cache/dev-ros/test_rosbag-1.14.2 b/metadata/md5-cache/dev-ros/test_rosbag-1.14.2
index 72b678f0962b..9619acec4c7e 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag-1.14.2
+++ b/metadata/md5-cache/dev-ros/test_rosbag-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.2.tar.gz -> ros_comm-1.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=d843f7488fb7751fb1fe658e0a77871d
diff --git a/metadata/md5-cache/dev-ros/test_rosbag-1.14.3 b/metadata/md5-cache/dev-ros/test_rosbag-1.14.3
index c432dfa4f50d..ed2d76159eb2 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag-1.14.3
+++ b/metadata/md5-cache/dev-ros/test_rosbag-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d843f7488fb7751fb1fe658e0a77871d
diff --git a/metadata/md5-cache/dev-ros/test_rosbag-9999 b/metadata/md5-cache/dev-ros/test_rosbag-9999
index 2be5c953031c..ba3e09ce5d53 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag-9999
+++ b/metadata/md5-cache/dev-ros/test_rosbag-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/topic_tools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/xmlrpcpp python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=a84506811c2d543143e517e84580d5be
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.13.0 b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.13.0
index e2da6322d271..6199eed2b558 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.13.0
+++ b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.13.0
@@ -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/ros/ros_comm/archive/1.13.0.tar.gz -> ros_comm-1.13.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=90542630bdcabb3c6e78fbaff6a41fc9
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.13.1 b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.13.1
index 61b2da725fd2..48b453fa271e 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.13.1
+++ b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.13.1
@@ -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/ros/ros_comm/archive/1.13.1.tar.gz -> ros_comm-1.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=90542630bdcabb3c6e78fbaff6a41fc9
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.13.2 b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.13.2
index 58c9dbcac652..27d5c935c533 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.13.2
+++ b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.13.2
@@ -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/ros/ros_comm/archive/1.13.2.tar.gz -> ros_comm-1.13.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=90542630bdcabb3c6e78fbaff6a41fc9
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.13.4 b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.13.4
index a50848a06773..8f12cee63c63 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.13.4
+++ b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.13.4
@@ -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/ros/ros_comm/archive/1.13.4.tar.gz -> ros_comm-1.13.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=90542630bdcabb3c6e78fbaff6a41fc9
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.13.5 b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.13.5
index 9ca2af4dce29..a80c79565bc2 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.13.5
+++ b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.13.5
@@ -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/ros/ros_comm/archive/1.13.5.tar.gz -> ros_comm-1.13.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=90542630bdcabb3c6e78fbaff6a41fc9
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.13.6 b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.13.6
index 46ca2afa2246..11fc26346519 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.13.6
+++ b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.13.6
@@ -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/ros/ros_comm/archive/1.13.6.tar.gz -> ros_comm-1.13.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a3a4349eb4685fed27769dca9dbbba79
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.14.2 b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.14.2
index 542771b3a89e..b7de1be07924 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.14.2
+++ b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.14.2
@@ -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/ros/ros_comm/archive/1.14.2.tar.gz -> ros_comm-1.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=a3a4349eb4685fed27769dca9dbbba79
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.14.3 b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.14.3
index f444619f2e3d..884f776b4fc8 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.14.3
+++ b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.14.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=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a3a4349eb4685fed27769dca9dbbba79
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-9999 b/metadata/md5-cache/dev-ros/test_rosbag_storage-9999
index cf268fa8c60b..efcc7faf13b0 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag_storage-9999
+++ b/metadata/md5-cache/dev-ros/test_rosbag_storage-9999
@@ -8,5 +8,5 @@ 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=c62d47639eb77abb05341ba2bce42e69
diff --git a/metadata/md5-cache/dev-ros/test_roscpp-1.13.0 b/metadata/md5-cache/dev-ros/test_roscpp-1.13.0
index 66daa64e10d7..88529b99ce8c 100644
--- a/metadata/md5-cache/dev-ros/test_roscpp-1.13.0
+++ b/metadata/md5-cache/dev-ros/test_roscpp-1.13.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=test? ( ros_messages_cxx ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.0.tar.gz -> ros_comm-1.13.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=89a0fe1ef4cd78af929a472182f783cf
diff --git a/metadata/md5-cache/dev-ros/test_roscpp-1.13.1 b/metadata/md5-cache/dev-ros/test_roscpp-1.13.1
index a820a0103613..bae7d761b175 100644
--- a/metadata/md5-cache/dev-ros/test_roscpp-1.13.1
+++ b/metadata/md5-cache/dev-ros/test_roscpp-1.13.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=test? ( ros_messages_cxx ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.1.tar.gz -> ros_comm-1.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=89a0fe1ef4cd78af929a472182f783cf
diff --git a/metadata/md5-cache/dev-ros/test_roscpp-1.13.2 b/metadata/md5-cache/dev-ros/test_roscpp-1.13.2
index 797edf709e1d..2a7700f26764 100644
--- a/metadata/md5-cache/dev-ros/test_roscpp-1.13.2
+++ b/metadata/md5-cache/dev-ros/test_roscpp-1.13.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=test? ( ros_messages_cxx ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.2.tar.gz -> ros_comm-1.13.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=89a0fe1ef4cd78af929a472182f783cf
diff --git a/metadata/md5-cache/dev-ros/test_roscpp-1.13.4 b/metadata/md5-cache/dev-ros/test_roscpp-1.13.4
index 79762c4ca08d..5b37cffd17a1 100644
--- a/metadata/md5-cache/dev-ros/test_roscpp-1.13.4
+++ b/metadata/md5-cache/dev-ros/test_roscpp-1.13.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=test? ( ros_messages_cxx ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.4.tar.gz -> ros_comm-1.13.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=89a0fe1ef4cd78af929a472182f783cf
diff --git a/metadata/md5-cache/dev-ros/test_roscpp-1.13.5 b/metadata/md5-cache/dev-ros/test_roscpp-1.13.5
index 60916868fe37..43a2030ab9a8 100644
--- a/metadata/md5-cache/dev-ros/test_roscpp-1.13.5
+++ b/metadata/md5-cache/dev-ros/test_roscpp-1.13.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=test? ( ros_messages_cxx ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.5.tar.gz -> ros_comm-1.13.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=89a0fe1ef4cd78af929a472182f783cf
diff --git a/metadata/md5-cache/dev-ros/test_roscpp-1.13.6 b/metadata/md5-cache/dev-ros/test_roscpp-1.13.6
index 304adf622c77..8361794da8e2 100644
--- a/metadata/md5-cache/dev-ros/test_roscpp-1.13.6
+++ b/metadata/md5-cache/dev-ros/test_roscpp-1.13.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=test? ( ros_messages_cxx ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.6.tar.gz -> ros_comm-1.13.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4c7956905f90cdc2c1c822678436f32b
diff --git a/metadata/md5-cache/dev-ros/test_roscpp-1.14.2 b/metadata/md5-cache/dev-ros/test_roscpp-1.14.2
index 775e23e438a8..a379c2306cc6 100644
--- a/metadata/md5-cache/dev-ros/test_roscpp-1.14.2
+++ b/metadata/md5-cache/dev-ros/test_roscpp-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=test? ( ros_messages_cxx ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.2.tar.gz -> ros_comm-1.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=4c7956905f90cdc2c1c822678436f32b
diff --git a/metadata/md5-cache/dev-ros/test_roscpp-1.14.3 b/metadata/md5-cache/dev-ros/test_roscpp-1.14.3
index aea03e929e50..df1e9cb6920c 100644
--- a/metadata/md5-cache/dev-ros/test_roscpp-1.14.3
+++ b/metadata/md5-cache/dev-ros/test_roscpp-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=test? ( ros_messages_cxx ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4c7956905f90cdc2c1c822678436f32b
diff --git a/metadata/md5-cache/dev-ros/test_roscpp-9999 b/metadata/md5-cache/dev-ros/test_roscpp-9999
index 5cd7d8493688..37c202aaad1d 100644
--- a/metadata/md5-cache/dev-ros/test_roscpp-9999
+++ b/metadata/md5-cache/dev-ros/test_roscpp-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=test? ( ros_messages_cxx ) || ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=499afaa45bed99e701dcacca459b8302
diff --git a/metadata/md5-cache/dev-ros/test_rosgraph-1.13.0 b/metadata/md5-cache/dev-ros/test_rosgraph-1.13.0
index e4e6d5cac309..a5e4f4ab309b 100644
--- a/metadata/md5-cache/dev-ros/test_rosgraph-1.13.0
+++ b/metadata/md5-cache/dev-ros/test_rosgraph-1.13.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.0.tar.gz -> ros_comm-1.13.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4e2975d53b08447c903262922f86f9eb
diff --git a/metadata/md5-cache/dev-ros/test_rosgraph-1.13.1 b/metadata/md5-cache/dev-ros/test_rosgraph-1.13.1
index 852eda666889..f597c80a6adc 100644
--- a/metadata/md5-cache/dev-ros/test_rosgraph-1.13.1
+++ b/metadata/md5-cache/dev-ros/test_rosgraph-1.13.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.1.tar.gz -> ros_comm-1.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4e2975d53b08447c903262922f86f9eb
diff --git a/metadata/md5-cache/dev-ros/test_rosgraph-1.13.2 b/metadata/md5-cache/dev-ros/test_rosgraph-1.13.2
index 1355c04fddc0..3e17254bf5fb 100644
--- a/metadata/md5-cache/dev-ros/test_rosgraph-1.13.2
+++ b/metadata/md5-cache/dev-ros/test_rosgraph-1.13.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.2.tar.gz -> ros_comm-1.13.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=4e2975d53b08447c903262922f86f9eb
diff --git a/metadata/md5-cache/dev-ros/test_rosgraph-1.13.4 b/metadata/md5-cache/dev-ros/test_rosgraph-1.13.4
index bf39fb719a2e..c13c574c6983 100644
--- a/metadata/md5-cache/dev-ros/test_rosgraph-1.13.4
+++ b/metadata/md5-cache/dev-ros/test_rosgraph-1.13.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.4.tar.gz -> ros_comm-1.13.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4e2975d53b08447c903262922f86f9eb
diff --git a/metadata/md5-cache/dev-ros/test_rosgraph-1.13.5 b/metadata/md5-cache/dev-ros/test_rosgraph-1.13.5
index 2b53af498ed4..418f5ab28e88 100644
--- a/metadata/md5-cache/dev-ros/test_rosgraph-1.13.5
+++ b/metadata/md5-cache/dev-ros/test_rosgraph-1.13.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.5.tar.gz -> ros_comm-1.13.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4e2975d53b08447c903262922f86f9eb
diff --git a/metadata/md5-cache/dev-ros/test_rosgraph-1.13.6 b/metadata/md5-cache/dev-ros/test_rosgraph-1.13.6
index 2938b2bf9fcd..20591b43f3c6 100644
--- a/metadata/md5-cache/dev-ros/test_rosgraph-1.13.6
+++ b/metadata/md5-cache/dev-ros/test_rosgraph-1.13.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.6.tar.gz -> ros_comm-1.13.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=36004a15c0339bcfd879f71ab3b1b0f8
diff --git a/metadata/md5-cache/dev-ros/test_rosgraph-1.14.2 b/metadata/md5-cache/dev-ros/test_rosgraph-1.14.2
index 301b9cb63b4b..33ec82063dc1 100644
--- a/metadata/md5-cache/dev-ros/test_rosgraph-1.14.2
+++ b/metadata/md5-cache/dev-ros/test_rosgraph-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.2.tar.gz -> ros_comm-1.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=36004a15c0339bcfd879f71ab3b1b0f8
diff --git a/metadata/md5-cache/dev-ros/test_rosgraph-1.14.3 b/metadata/md5-cache/dev-ros/test_rosgraph-1.14.3
index c62c784b19f7..b15aa5d06f10 100644
--- a/metadata/md5-cache/dev-ros/test_rosgraph-1.14.3
+++ b/metadata/md5-cache/dev-ros/test_rosgraph-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=36004a15c0339bcfd879f71ab3b1b0f8
diff --git a/metadata/md5-cache/dev-ros/test_rosgraph-9999 b/metadata/md5-cache/dev-ros/test_rosgraph-9999
index 42be95993c44..f6202d8daae7 100644
--- a/metadata/md5-cache/dev-ros/test_rosgraph-9999
+++ b/metadata/md5-cache/dev-ros/test_rosgraph-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=249647f9778320193cf869a7ab3651e9
diff --git a/metadata/md5-cache/dev-ros/test_roslaunch-1.13.0 b/metadata/md5-cache/dev-ros/test_roslaunch-1.13.0
index 7f4ba6dba4b3..befbc91386d6 100644
--- a/metadata/md5-cache/dev-ros/test_roslaunch-1.13.0
+++ b/metadata/md5-cache/dev-ros/test_roslaunch-1.13.0
@@ -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/ros/ros_comm/archive/1.13.0.tar.gz -> ros_comm-1.13.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e29f54d50d0078d8d4dc4f8dbe43c858
diff --git a/metadata/md5-cache/dev-ros/test_roslaunch-1.13.1 b/metadata/md5-cache/dev-ros/test_roslaunch-1.13.1
index 0f6ea9ab64e1..a6aa97bdc5cc 100644
--- a/metadata/md5-cache/dev-ros/test_roslaunch-1.13.1
+++ b/metadata/md5-cache/dev-ros/test_roslaunch-1.13.1
@@ -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/ros/ros_comm/archive/1.13.1.tar.gz -> ros_comm-1.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e29f54d50d0078d8d4dc4f8dbe43c858
diff --git a/metadata/md5-cache/dev-ros/test_roslaunch-1.13.2 b/metadata/md5-cache/dev-ros/test_roslaunch-1.13.2
index cae185c60f07..2bc63ff69ddc 100644
--- a/metadata/md5-cache/dev-ros/test_roslaunch-1.13.2
+++ b/metadata/md5-cache/dev-ros/test_roslaunch-1.13.2
@@ -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/ros/ros_comm/archive/1.13.2.tar.gz -> ros_comm-1.13.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=e29f54d50d0078d8d4dc4f8dbe43c858
diff --git a/metadata/md5-cache/dev-ros/test_roslaunch-1.13.4 b/metadata/md5-cache/dev-ros/test_roslaunch-1.13.4
index d602fcca4cdc..4be497fce52e 100644
--- a/metadata/md5-cache/dev-ros/test_roslaunch-1.13.4
+++ b/metadata/md5-cache/dev-ros/test_roslaunch-1.13.4
@@ -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/ros/ros_comm/archive/1.13.4.tar.gz -> ros_comm-1.13.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e29f54d50d0078d8d4dc4f8dbe43c858
diff --git a/metadata/md5-cache/dev-ros/test_roslaunch-1.13.5 b/metadata/md5-cache/dev-ros/test_roslaunch-1.13.5
index 56a1c9fd943b..acb20f28e368 100644
--- a/metadata/md5-cache/dev-ros/test_roslaunch-1.13.5
+++ b/metadata/md5-cache/dev-ros/test_roslaunch-1.13.5
@@ -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/ros/ros_comm/archive/1.13.5.tar.gz -> ros_comm-1.13.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e29f54d50d0078d8d4dc4f8dbe43c858
diff --git a/metadata/md5-cache/dev-ros/test_roslaunch-1.13.6 b/metadata/md5-cache/dev-ros/test_roslaunch-1.13.6
index 74901a3edd41..5f8d08f4bff7 100644
--- a/metadata/md5-cache/dev-ros/test_roslaunch-1.13.6
+++ b/metadata/md5-cache/dev-ros/test_roslaunch-1.13.6
@@ -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/ros/ros_comm/archive/1.13.6.tar.gz -> ros_comm-1.13.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=049c34f79fde3816b3cd760c60d6ebe6
diff --git a/metadata/md5-cache/dev-ros/test_roslaunch-1.14.2 b/metadata/md5-cache/dev-ros/test_roslaunch-1.14.2
index 4ed90c24fb5e..ea401cfa43ce 100644
--- a/metadata/md5-cache/dev-ros/test_roslaunch-1.14.2
+++ b/metadata/md5-cache/dev-ros/test_roslaunch-1.14.2
@@ -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/ros/ros_comm/archive/1.14.2.tar.gz -> ros_comm-1.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=049c34f79fde3816b3cd760c60d6ebe6
diff --git a/metadata/md5-cache/dev-ros/test_roslaunch-1.14.3 b/metadata/md5-cache/dev-ros/test_roslaunch-1.14.3
index e6b422abc536..6e26b4bfe9da 100644
--- a/metadata/md5-cache/dev-ros/test_roslaunch-1.14.3
+++ b/metadata/md5-cache/dev-ros/test_roslaunch-1.14.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=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=049c34f79fde3816b3cd760c60d6ebe6
diff --git a/metadata/md5-cache/dev-ros/test_roslaunch-9999 b/metadata/md5-cache/dev-ros/test_roslaunch-9999
index 3432752cab2f..0b9e22953ebf 100644
--- a/metadata/md5-cache/dev-ros/test_roslaunch-9999
+++ b/metadata/md5-cache/dev-ros/test_roslaunch-9999
@@ -8,5 +8,5 @@ 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=335d7571a767250095d6281930000caa
diff --git a/metadata/md5-cache/dev-ros/test_roslib_comm-1.13.0 b/metadata/md5-cache/dev-ros/test_roslib_comm-1.13.0
index 7ee3f610ea1b..39f7fecc05c0 100644
--- a/metadata/md5-cache/dev-ros/test_roslib_comm-1.13.0
+++ b/metadata/md5-cache/dev-ros/test_roslib_comm-1.13.0
@@ -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/ros/ros_comm/archive/1.13.0.tar.gz -> ros_comm-1.13.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=75fc16911e3921dd6a49bbf8b2e7ccb2
diff --git a/metadata/md5-cache/dev-ros/test_roslib_comm-1.13.1 b/metadata/md5-cache/dev-ros/test_roslib_comm-1.13.1
index 628618312418..56f96dca00dc 100644
--- a/metadata/md5-cache/dev-ros/test_roslib_comm-1.13.1
+++ b/metadata/md5-cache/dev-ros/test_roslib_comm-1.13.1
@@ -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/ros/ros_comm/archive/1.13.1.tar.gz -> ros_comm-1.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=75fc16911e3921dd6a49bbf8b2e7ccb2
diff --git a/metadata/md5-cache/dev-ros/test_roslib_comm-1.13.2 b/metadata/md5-cache/dev-ros/test_roslib_comm-1.13.2
index d312cffc7f8b..15b22213f9d1 100644
--- a/metadata/md5-cache/dev-ros/test_roslib_comm-1.13.2
+++ b/metadata/md5-cache/dev-ros/test_roslib_comm-1.13.2
@@ -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/ros/ros_comm/archive/1.13.2.tar.gz -> ros_comm-1.13.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=75fc16911e3921dd6a49bbf8b2e7ccb2
diff --git a/metadata/md5-cache/dev-ros/test_roslib_comm-1.13.4 b/metadata/md5-cache/dev-ros/test_roslib_comm-1.13.4
index 755f5fb74fa4..797478b49cdb 100644
--- a/metadata/md5-cache/dev-ros/test_roslib_comm-1.13.4
+++ b/metadata/md5-cache/dev-ros/test_roslib_comm-1.13.4
@@ -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/ros/ros_comm/archive/1.13.4.tar.gz -> ros_comm-1.13.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=75fc16911e3921dd6a49bbf8b2e7ccb2
diff --git a/metadata/md5-cache/dev-ros/test_roslib_comm-1.13.5 b/metadata/md5-cache/dev-ros/test_roslib_comm-1.13.5
index 6a9759c630cb..92ec10f77127 100644
--- a/metadata/md5-cache/dev-ros/test_roslib_comm-1.13.5
+++ b/metadata/md5-cache/dev-ros/test_roslib_comm-1.13.5
@@ -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/ros/ros_comm/archive/1.13.5.tar.gz -> ros_comm-1.13.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=75fc16911e3921dd6a49bbf8b2e7ccb2
diff --git a/metadata/md5-cache/dev-ros/test_roslib_comm-1.13.6 b/metadata/md5-cache/dev-ros/test_roslib_comm-1.13.6
index c58db9cf6350..4d43ba5538db 100644
--- a/metadata/md5-cache/dev-ros/test_roslib_comm-1.13.6
+++ b/metadata/md5-cache/dev-ros/test_roslib_comm-1.13.6
@@ -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/ros/ros_comm/archive/1.13.6.tar.gz -> ros_comm-1.13.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c7cf129fbd2e981f620395cd07082d54
diff --git a/metadata/md5-cache/dev-ros/test_roslib_comm-1.14.2 b/metadata/md5-cache/dev-ros/test_roslib_comm-1.14.2
index dcfc3301d286..ea06ea1435bc 100644
--- a/metadata/md5-cache/dev-ros/test_roslib_comm-1.14.2
+++ b/metadata/md5-cache/dev-ros/test_roslib_comm-1.14.2
@@ -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/ros/ros_comm/archive/1.14.2.tar.gz -> ros_comm-1.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=c7cf129fbd2e981f620395cd07082d54
diff --git a/metadata/md5-cache/dev-ros/test_roslib_comm-1.14.3 b/metadata/md5-cache/dev-ros/test_roslib_comm-1.14.3
index 6c179dc96cbc..4efc1f942e82 100644
--- a/metadata/md5-cache/dev-ros/test_roslib_comm-1.14.3
+++ b/metadata/md5-cache/dev-ros/test_roslib_comm-1.14.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=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c7cf129fbd2e981f620395cd07082d54
diff --git a/metadata/md5-cache/dev-ros/test_roslib_comm-9999 b/metadata/md5-cache/dev-ros/test_roslib_comm-9999
index 561b0f069483..84e9ab6812fd 100644
--- a/metadata/md5-cache/dev-ros/test_roslib_comm-9999
+++ b/metadata/md5-cache/dev-ros/test_roslib_comm-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=d92e0eb4872d053930c1747e3c65c66a
diff --git a/metadata/md5-cache/dev-ros/test_rosmaster-1.12.7 b/metadata/md5-cache/dev-ros/test_rosmaster-1.12.7
index 1fbdaf0f8323..c7d0f80a325f 100644
--- a/metadata/md5-cache/dev-ros/test_rosmaster-1.12.7
+++ b/metadata/md5-cache/dev-ros/test_rosmaster-1.12.7
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.7.tar.gz -> ros_comm-1.12.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4e1a1625041279c8c7c23017c7ae9c03
diff --git a/metadata/md5-cache/dev-ros/test_rosmaster-1.13.0 b/metadata/md5-cache/dev-ros/test_rosmaster-1.13.0
index 42db2e7d5449..3ab76fb1cd5f 100644
--- a/metadata/md5-cache/dev-ros/test_rosmaster-1.13.0
+++ b/metadata/md5-cache/dev-ros/test_rosmaster-1.13.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.0.tar.gz -> ros_comm-1.13.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4e1a1625041279c8c7c23017c7ae9c03
diff --git a/metadata/md5-cache/dev-ros/test_rosmaster-1.13.1 b/metadata/md5-cache/dev-ros/test_rosmaster-1.13.1
index fd3d60a043ad..d0180783aaa2 100644
--- a/metadata/md5-cache/dev-ros/test_rosmaster-1.13.1
+++ b/metadata/md5-cache/dev-ros/test_rosmaster-1.13.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.1.tar.gz -> ros_comm-1.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4e1a1625041279c8c7c23017c7ae9c03
diff --git a/metadata/md5-cache/dev-ros/test_rosmaster-1.13.2 b/metadata/md5-cache/dev-ros/test_rosmaster-1.13.2
index df35d408c142..5cecf3afdba4 100644
--- a/metadata/md5-cache/dev-ros/test_rosmaster-1.13.2
+++ b/metadata/md5-cache/dev-ros/test_rosmaster-1.13.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.2.tar.gz -> ros_comm-1.13.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=4e1a1625041279c8c7c23017c7ae9c03
diff --git a/metadata/md5-cache/dev-ros/test_rosmaster-1.13.4 b/metadata/md5-cache/dev-ros/test_rosmaster-1.13.4
index 9fb9dab0f07d..8de46c674cb2 100644
--- a/metadata/md5-cache/dev-ros/test_rosmaster-1.13.4
+++ b/metadata/md5-cache/dev-ros/test_rosmaster-1.13.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.4.tar.gz -> ros_comm-1.13.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4e1a1625041279c8c7c23017c7ae9c03
diff --git a/metadata/md5-cache/dev-ros/test_rosmaster-1.13.5 b/metadata/md5-cache/dev-ros/test_rosmaster-1.13.5
index dd306062c4e1..622da54da47c 100644
--- a/metadata/md5-cache/dev-ros/test_rosmaster-1.13.5
+++ b/metadata/md5-cache/dev-ros/test_rosmaster-1.13.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.5.tar.gz -> ros_comm-1.13.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4e1a1625041279c8c7c23017c7ae9c03
diff --git a/metadata/md5-cache/dev-ros/test_rosmaster-1.13.6 b/metadata/md5-cache/dev-ros/test_rosmaster-1.13.6
index b8678e5abc37..e99de60bb2c4 100644
--- a/metadata/md5-cache/dev-ros/test_rosmaster-1.13.6
+++ b/metadata/md5-cache/dev-ros/test_rosmaster-1.13.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.6.tar.gz -> ros_comm-1.13.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=84b36ef7daaed21698582cccb302d99c
diff --git a/metadata/md5-cache/dev-ros/test_rosmaster-1.14.2 b/metadata/md5-cache/dev-ros/test_rosmaster-1.14.2
index 53e08ee8515b..bbe02f9b58c5 100644
--- a/metadata/md5-cache/dev-ros/test_rosmaster-1.14.2
+++ b/metadata/md5-cache/dev-ros/test_rosmaster-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.2.tar.gz -> ros_comm-1.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=84b36ef7daaed21698582cccb302d99c
diff --git a/metadata/md5-cache/dev-ros/test_rosmaster-1.14.3 b/metadata/md5-cache/dev-ros/test_rosmaster-1.14.3
index b5037ed874f5..183445ca1de4 100644
--- a/metadata/md5-cache/dev-ros/test_rosmaster-1.14.3
+++ b/metadata/md5-cache/dev-ros/test_rosmaster-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=84b36ef7daaed21698582cccb302d99c
diff --git a/metadata/md5-cache/dev-ros/test_rosmaster-9999 b/metadata/md5-cache/dev-ros/test_rosmaster-9999
index aea588236f08..db79984c05b3 100644
--- a/metadata/md5-cache/dev-ros/test_rosmaster-9999
+++ b/metadata/md5-cache/dev-ros/test_rosmaster-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=bc62d0ce164b612f1e480b67d4e1b989
diff --git a/metadata/md5-cache/dev-ros/test_rosparam-1.13.0 b/metadata/md5-cache/dev-ros/test_rosparam-1.13.0
index 8f90303323ed..0800a6833d56 100644
--- a/metadata/md5-cache/dev-ros/test_rosparam-1.13.0
+++ b/metadata/md5-cache/dev-ros/test_rosparam-1.13.0
@@ -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/ros/ros_comm/archive/1.13.0.tar.gz -> ros_comm-1.13.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6c3fbcdf57099191307b3fd069c65238
diff --git a/metadata/md5-cache/dev-ros/test_rosparam-1.13.1 b/metadata/md5-cache/dev-ros/test_rosparam-1.13.1
index aa0ec4e178af..2ed1df866fc2 100644
--- a/metadata/md5-cache/dev-ros/test_rosparam-1.13.1
+++ b/metadata/md5-cache/dev-ros/test_rosparam-1.13.1
@@ -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/ros/ros_comm/archive/1.13.1.tar.gz -> ros_comm-1.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6c3fbcdf57099191307b3fd069c65238
diff --git a/metadata/md5-cache/dev-ros/test_rosparam-1.13.2 b/metadata/md5-cache/dev-ros/test_rosparam-1.13.2
index c557fcad1fe2..b05be23e9f2c 100644
--- a/metadata/md5-cache/dev-ros/test_rosparam-1.13.2
+++ b/metadata/md5-cache/dev-ros/test_rosparam-1.13.2
@@ -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/ros/ros_comm/archive/1.13.2.tar.gz -> ros_comm-1.13.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=6c3fbcdf57099191307b3fd069c65238
diff --git a/metadata/md5-cache/dev-ros/test_rosparam-1.13.4 b/metadata/md5-cache/dev-ros/test_rosparam-1.13.4
index 3611fc120723..a1ec772c016c 100644
--- a/metadata/md5-cache/dev-ros/test_rosparam-1.13.4
+++ b/metadata/md5-cache/dev-ros/test_rosparam-1.13.4
@@ -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/ros/ros_comm/archive/1.13.4.tar.gz -> ros_comm-1.13.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6c3fbcdf57099191307b3fd069c65238
diff --git a/metadata/md5-cache/dev-ros/test_rosparam-1.13.5 b/metadata/md5-cache/dev-ros/test_rosparam-1.13.5
index 2052857deee2..d4135348d247 100644
--- a/metadata/md5-cache/dev-ros/test_rosparam-1.13.5
+++ b/metadata/md5-cache/dev-ros/test_rosparam-1.13.5
@@ -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/ros/ros_comm/archive/1.13.5.tar.gz -> ros_comm-1.13.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6c3fbcdf57099191307b3fd069c65238
diff --git a/metadata/md5-cache/dev-ros/test_rosparam-1.13.6 b/metadata/md5-cache/dev-ros/test_rosparam-1.13.6
index 98ee2863e587..27d7c9d2f725 100644
--- a/metadata/md5-cache/dev-ros/test_rosparam-1.13.6
+++ b/metadata/md5-cache/dev-ros/test_rosparam-1.13.6
@@ -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/ros/ros_comm/archive/1.13.6.tar.gz -> ros_comm-1.13.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e3d861aca70a89f9fdb3dd3d3a035b2a
diff --git a/metadata/md5-cache/dev-ros/test_rosparam-1.14.2 b/metadata/md5-cache/dev-ros/test_rosparam-1.14.2
index 059d941c8822..7070791e0b68 100644
--- a/metadata/md5-cache/dev-ros/test_rosparam-1.14.2
+++ b/metadata/md5-cache/dev-ros/test_rosparam-1.14.2
@@ -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/ros/ros_comm/archive/1.14.2.tar.gz -> ros_comm-1.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=e3d861aca70a89f9fdb3dd3d3a035b2a
diff --git a/metadata/md5-cache/dev-ros/test_rosparam-1.14.3 b/metadata/md5-cache/dev-ros/test_rosparam-1.14.3
index 3c5ec1841791..eac81cc48e09 100644
--- a/metadata/md5-cache/dev-ros/test_rosparam-1.14.3
+++ b/metadata/md5-cache/dev-ros/test_rosparam-1.14.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=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e3d861aca70a89f9fdb3dd3d3a035b2a
diff --git a/metadata/md5-cache/dev-ros/test_rosparam-9999 b/metadata/md5-cache/dev-ros/test_rosparam-9999
index 18991134a421..f4d04e9ce46c 100644
--- a/metadata/md5-cache/dev-ros/test_rosparam-9999
+++ b/metadata/md5-cache/dev-ros/test_rosparam-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=9783b48addfe2d7ecb881a41d41e6a69
diff --git a/metadata/md5-cache/dev-ros/test_rospy-1.12.7 b/metadata/md5-cache/dev-ros/test_rospy-1.12.7
index 1d87f88c79a4..6f2c3d5e7552 100644
--- a/metadata/md5-cache/dev-ros/test_rospy-1.12.7
+++ b/metadata/md5-cache/dev-ros/test_rospy-1.12.7
@@ -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/ros/ros_comm/archive/1.12.7.tar.gz -> ros_comm-1.12.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=52ddd22e4c2e0b0a2e3f1b120e9485d5
diff --git a/metadata/md5-cache/dev-ros/test_rospy-1.13.0 b/metadata/md5-cache/dev-ros/test_rospy-1.13.0
index 2da08a66bc30..31b966d90e98 100644
--- a/metadata/md5-cache/dev-ros/test_rospy-1.13.0
+++ b/metadata/md5-cache/dev-ros/test_rospy-1.13.0
@@ -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/ros/ros_comm/archive/1.13.0.tar.gz -> ros_comm-1.13.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=52ddd22e4c2e0b0a2e3f1b120e9485d5
diff --git a/metadata/md5-cache/dev-ros/test_rospy-1.13.1 b/metadata/md5-cache/dev-ros/test_rospy-1.13.1
index f4f82ab9fe48..5b58f30359ca 100644
--- a/metadata/md5-cache/dev-ros/test_rospy-1.13.1
+++ b/metadata/md5-cache/dev-ros/test_rospy-1.13.1
@@ -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/ros/ros_comm/archive/1.13.1.tar.gz -> ros_comm-1.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=52ddd22e4c2e0b0a2e3f1b120e9485d5
diff --git a/metadata/md5-cache/dev-ros/test_rospy-1.13.2 b/metadata/md5-cache/dev-ros/test_rospy-1.13.2
index d0d6225ef8e9..a998e28d3b77 100644
--- a/metadata/md5-cache/dev-ros/test_rospy-1.13.2
+++ b/metadata/md5-cache/dev-ros/test_rospy-1.13.2
@@ -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/ros/ros_comm/archive/1.13.2.tar.gz -> ros_comm-1.13.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=52ddd22e4c2e0b0a2e3f1b120e9485d5
diff --git a/metadata/md5-cache/dev-ros/test_rospy-1.13.4 b/metadata/md5-cache/dev-ros/test_rospy-1.13.4
index 007118e8f9d3..59cab3aed9b0 100644
--- a/metadata/md5-cache/dev-ros/test_rospy-1.13.4
+++ b/metadata/md5-cache/dev-ros/test_rospy-1.13.4
@@ -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/ros/ros_comm/archive/1.13.4.tar.gz -> ros_comm-1.13.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=52ddd22e4c2e0b0a2e3f1b120e9485d5
diff --git a/metadata/md5-cache/dev-ros/test_rospy-1.13.5 b/metadata/md5-cache/dev-ros/test_rospy-1.13.5
index 14d56f6745f1..060d81c23d9c 100644
--- a/metadata/md5-cache/dev-ros/test_rospy-1.13.5
+++ b/metadata/md5-cache/dev-ros/test_rospy-1.13.5
@@ -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/ros/ros_comm/archive/1.13.5.tar.gz -> ros_comm-1.13.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=52ddd22e4c2e0b0a2e3f1b120e9485d5
diff --git a/metadata/md5-cache/dev-ros/test_rospy-1.13.6 b/metadata/md5-cache/dev-ros/test_rospy-1.13.6
index f247adc6649c..8dc063b81995 100644
--- a/metadata/md5-cache/dev-ros/test_rospy-1.13.6
+++ b/metadata/md5-cache/dev-ros/test_rospy-1.13.6
@@ -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/ros/ros_comm/archive/1.13.6.tar.gz -> ros_comm-1.13.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=460b5ab79316cc162d89b7c05d7414fb
diff --git a/metadata/md5-cache/dev-ros/test_rospy-1.14.2 b/metadata/md5-cache/dev-ros/test_rospy-1.14.2
index 14d402648ecd..c380cb6d994d 100644
--- a/metadata/md5-cache/dev-ros/test_rospy-1.14.2
+++ b/metadata/md5-cache/dev-ros/test_rospy-1.14.2
@@ -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/ros/ros_comm/archive/1.14.2.tar.gz -> ros_comm-1.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=460b5ab79316cc162d89b7c05d7414fb
diff --git a/metadata/md5-cache/dev-ros/test_rospy-1.14.3 b/metadata/md5-cache/dev-ros/test_rospy-1.14.3
index 859847ec7d26..68983e23321d 100644
--- a/metadata/md5-cache/dev-ros/test_rospy-1.14.3
+++ b/metadata/md5-cache/dev-ros/test_rospy-1.14.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=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=460b5ab79316cc162d89b7c05d7414fb
diff --git a/metadata/md5-cache/dev-ros/test_rospy-9999 b/metadata/md5-cache/dev-ros/test_rospy-9999
index 86d6d8dd3fc7..5db81c05c981 100644
--- a/metadata/md5-cache/dev-ros/test_rospy-9999
+++ b/metadata/md5-cache/dev-ros/test_rospy-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/test_rosmaster[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=01943de04b9f18e8e5280e819bf1bd7d
diff --git a/metadata/md5-cache/dev-ros/test_rosservice-1.13.0 b/metadata/md5-cache/dev-ros/test_rosservice-1.13.0
index 16c17fa6ecc6..95e1c05b50dd 100644
--- a/metadata/md5-cache/dev-ros/test_rosservice-1.13.0
+++ b/metadata/md5-cache/dev-ros/test_rosservice-1.13.0
@@ -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/ros/ros_comm/archive/1.13.0.tar.gz -> ros_comm-1.13.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b2cfea3b9ed3d353b8620df07adf28af
diff --git a/metadata/md5-cache/dev-ros/test_rosservice-1.13.1 b/metadata/md5-cache/dev-ros/test_rosservice-1.13.1
index e09c7156ecc2..f53a88cf6992 100644
--- a/metadata/md5-cache/dev-ros/test_rosservice-1.13.1
+++ b/metadata/md5-cache/dev-ros/test_rosservice-1.13.1
@@ -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/ros/ros_comm/archive/1.13.1.tar.gz -> ros_comm-1.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b2cfea3b9ed3d353b8620df07adf28af
diff --git a/metadata/md5-cache/dev-ros/test_rosservice-1.13.2 b/metadata/md5-cache/dev-ros/test_rosservice-1.13.2
index ff2e1317e1a5..be2f21c70dec 100644
--- a/metadata/md5-cache/dev-ros/test_rosservice-1.13.2
+++ b/metadata/md5-cache/dev-ros/test_rosservice-1.13.2
@@ -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/ros/ros_comm/archive/1.13.2.tar.gz -> ros_comm-1.13.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=b2cfea3b9ed3d353b8620df07adf28af
diff --git a/metadata/md5-cache/dev-ros/test_rosservice-1.13.4 b/metadata/md5-cache/dev-ros/test_rosservice-1.13.4
index 75385907994a..ddbe0545579e 100644
--- a/metadata/md5-cache/dev-ros/test_rosservice-1.13.4
+++ b/metadata/md5-cache/dev-ros/test_rosservice-1.13.4
@@ -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/ros/ros_comm/archive/1.13.4.tar.gz -> ros_comm-1.13.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b2cfea3b9ed3d353b8620df07adf28af
diff --git a/metadata/md5-cache/dev-ros/test_rosservice-1.13.5 b/metadata/md5-cache/dev-ros/test_rosservice-1.13.5
index b37cd6e9cf9e..5aacb42329b4 100644
--- a/metadata/md5-cache/dev-ros/test_rosservice-1.13.5
+++ b/metadata/md5-cache/dev-ros/test_rosservice-1.13.5
@@ -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/ros/ros_comm/archive/1.13.5.tar.gz -> ros_comm-1.13.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b2cfea3b9ed3d353b8620df07adf28af
diff --git a/metadata/md5-cache/dev-ros/test_rosservice-1.13.6 b/metadata/md5-cache/dev-ros/test_rosservice-1.13.6
index 25cac9c14834..57afb58f55a0 100644
--- a/metadata/md5-cache/dev-ros/test_rosservice-1.13.6
+++ b/metadata/md5-cache/dev-ros/test_rosservice-1.13.6
@@ -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/ros/ros_comm/archive/1.13.6.tar.gz -> ros_comm-1.13.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=62ccda53b67d99e18909f07672b9a763
diff --git a/metadata/md5-cache/dev-ros/test_rosservice-1.14.2 b/metadata/md5-cache/dev-ros/test_rosservice-1.14.2
index 607b0e58cbb9..d510924fa8e4 100644
--- a/metadata/md5-cache/dev-ros/test_rosservice-1.14.2
+++ b/metadata/md5-cache/dev-ros/test_rosservice-1.14.2
@@ -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/ros/ros_comm/archive/1.14.2.tar.gz -> ros_comm-1.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=62ccda53b67d99e18909f07672b9a763
diff --git a/metadata/md5-cache/dev-ros/test_rosservice-1.14.3 b/metadata/md5-cache/dev-ros/test_rosservice-1.14.3
index be5de93a0323..051e8c12c097 100644
--- a/metadata/md5-cache/dev-ros/test_rosservice-1.14.3
+++ b/metadata/md5-cache/dev-ros/test_rosservice-1.14.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=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=62ccda53b67d99e18909f07672b9a763
diff --git a/metadata/md5-cache/dev-ros/test_rosservice-9999 b/metadata/md5-cache/dev-ros/test_rosservice-9999
index a8f84debf1c9..a0011676afba 100644
--- a/metadata/md5-cache/dev-ros/test_rosservice-9999
+++ b/metadata/md5-cache/dev-ros/test_rosservice-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=a0e624b934108555eacc2a541bae9646
diff --git a/metadata/md5-cache/dev-ros/test_tf2-0.6.1 b/metadata/md5-cache/dev-ros/test_tf2-0.6.1
index e344780e0c52..17e185c5f14a 100644
--- a/metadata/md5-cache/dev-ros/test_tf2-0.6.1
+++ b/metadata/md5-cache/dev-ros/test_tf2-0.6.1
@@ -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/ros/geometry2/archive/0.6.1.tar.gz -> geometry2-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=97b7d02b0224faee8b1964a9a5e532a8
diff --git a/metadata/md5-cache/dev-ros/test_tf2-0.6.2 b/metadata/md5-cache/dev-ros/test_tf2-0.6.2
index 6c94f61ffe30..26a17ef68be1 100644
--- a/metadata/md5-cache/dev-ros/test_tf2-0.6.2
+++ b/metadata/md5-cache/dev-ros/test_tf2-0.6.2
@@ -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/ros/geometry2/archive/0.6.2.tar.gz -> geometry2-0.6.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=97b7d02b0224faee8b1964a9a5e532a8
diff --git a/metadata/md5-cache/dev-ros/test_tf2-0.6.3 b/metadata/md5-cache/dev-ros/test_tf2-0.6.3
index 5b71e5475398..a46ad6d8bbdc 100644
--- a/metadata/md5-cache/dev-ros/test_tf2-0.6.3
+++ b/metadata/md5-cache/dev-ros/test_tf2-0.6.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=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.6.3.tar.gz -> geometry2-0.6.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=97b7d02b0224faee8b1964a9a5e532a8
diff --git a/metadata/md5-cache/dev-ros/test_tf2-9999 b/metadata/md5-cache/dev-ros/test_tf2-9999
index a81409dcaa6e..c84c6501a647 100644
--- a/metadata/md5-cache/dev-ros/test_tf2-9999
+++ b/metadata/md5-cache/dev-ros/test_tf2-9999
@@ -8,5 +8,5 @@ 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=37353a5eef1486ccac8dc9f9b7228302
diff --git a/metadata/md5-cache/dev-ros/tf-1.11.9 b/metadata/md5-cache/dev-ros/tf-1.11.9
index c0f469e0fdf1..49b523f82759 100644
--- a/metadata/md5-cache/dev-ros/tf-1.11.9
+++ b/metadata/md5-cache/dev-ros/tf-1.11.9
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/angles dev-ros/message_filters dev-ros
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry/archive/1.11.9.tar.gz -> geometry-1.11.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d9faaa5981cb3611bfd69b147cb0828f
diff --git a/metadata/md5-cache/dev-ros/tf-1.12.0 b/metadata/md5-cache/dev-ros/tf-1.12.0
index 4e7ae871b8d3..443194b23410 100644
--- a/metadata/md5-cache/dev-ros/tf-1.12.0
+++ b/metadata/md5-cache/dev-ros/tf-1.12.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/angles dev-ros/message_filters dev-ros
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry/archive/1.12.0.tar.gz -> geometry-1.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=79e8d1b03c0f9fedc9d11fe2e63ce18b
diff --git a/metadata/md5-cache/dev-ros/tf-9999 b/metadata/md5-cache/dev-ros/tf-9999
index f9de6d812cf7..d8da21ce5f3c 100644
--- a/metadata/md5-cache/dev-ros/tf-9999
+++ b/metadata/md5-cache/dev-ros/tf-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost:=[threads] dev-ros/angles dev-ros/message_filters dev-ros/rosconsole dev-ros/rostime dev-ros/roscpp dev-ros/tf2_ros 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-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=12dafec89b919446f37bd9d7324062e9
diff --git a/metadata/md5-cache/dev-ros/tf2-0.6.1 b/metadata/md5-cache/dev-ros/tf2-0.6.1
index 0c7831048ca2..da9e86b9c96e 100644
--- a/metadata/md5-cache/dev-ros/tf2-0.6.1
+++ b/metadata/md5-cache/dev-ros/tf2-0.6.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-libs/console_bridge:= dev-ros/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.6.1.tar.gz -> geometry2-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=24320bfa0fd255fe19064b02af9754e7
diff --git a/metadata/md5-cache/dev-ros/tf2-0.6.2 b/metadata/md5-cache/dev-ros/tf2-0.6.2
index 520ef7723dfa..84847844773e 100644
--- a/metadata/md5-cache/dev-ros/tf2-0.6.2
+++ b/metadata/md5-cache/dev-ros/tf2-0.6.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-libs/console_bridge:= dev-ros/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.6.2.tar.gz -> geometry2-0.6.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=24320bfa0fd255fe19064b02af9754e7
diff --git a/metadata/md5-cache/dev-ros/tf2-0.6.3 b/metadata/md5-cache/dev-ros/tf2-0.6.3
index e80513d03538..fe0fa9c1a633 100644
--- a/metadata/md5-cache/dev-ros/tf2-0.6.3
+++ b/metadata/md5-cache/dev-ros/tf2-0.6.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-libs/console_bridge:= dev-ros/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.6.3.tar.gz -> geometry2-0.6.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=24320bfa0fd255fe19064b02af9754e7
diff --git a/metadata/md5-cache/dev-ros/tf2-9999 b/metadata/md5-cache/dev-ros/tf2-9999
index 8f4fbc47b0e6..c2597d4f5a85 100644
--- a/metadata/md5-cache/dev-ros/tf2-9999
+++ b/metadata/md5-cache/dev-ros/tf2-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-libs/console_bridge:= dev-ros/rostime dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-libs/boost:=[threads] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=d27813b3911f6860121e04bdbb243b88
diff --git a/metadata/md5-cache/dev-ros/tf2_bullet-0.6.1 b/metadata/md5-cache/dev-ros/tf2_bullet-0.6.1
index b69aa80230ed..5886b206e690 100644
--- a/metadata/md5-cache/dev-ros/tf2_bullet-0.6.1
+++ b/metadata/md5-cache/dev-ros/tf2_bullet-0.6.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/tf2 dev-ros/geometry_msgs[ros_messages_cxx(-)] sci-physics/bulle
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.6.1.tar.gz -> geometry2-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b98c149c6a03ef150ae8e58a31297e6d
diff --git a/metadata/md5-cache/dev-ros/tf2_bullet-0.6.2 b/metadata/md5-cache/dev-ros/tf2_bullet-0.6.2
index 8e6b5e03533b..9b2ac4fc3f61 100644
--- a/metadata/md5-cache/dev-ros/tf2_bullet-0.6.2
+++ b/metadata/md5-cache/dev-ros/tf2_bullet-0.6.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/tf2 dev-ros/geometry_msgs[ros_messages_cxx(-)] sci-physics/bulle
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.6.2.tar.gz -> geometry2-0.6.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=b98c149c6a03ef150ae8e58a31297e6d
diff --git a/metadata/md5-cache/dev-ros/tf2_bullet-0.6.3 b/metadata/md5-cache/dev-ros/tf2_bullet-0.6.3
index 2c0d93425d2d..ccacb81cb9b2 100644
--- a/metadata/md5-cache/dev-ros/tf2_bullet-0.6.3
+++ b/metadata/md5-cache/dev-ros/tf2_bullet-0.6.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/tf2 dev-ros/geometry_msgs[ros_messages_cxx(-)] sci-physics/bulle
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.6.3.tar.gz -> geometry2-0.6.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b98c149c6a03ef150ae8e58a31297e6d
diff --git a/metadata/md5-cache/dev-ros/tf2_bullet-9999 b/metadata/md5-cache/dev-ros/tf2_bullet-9999
index fbfeb12c6f91..f76c22273968 100644
--- a/metadata/md5-cache/dev-ros/tf2_bullet-9999
+++ b/metadata/md5-cache/dev-ros/tf2_bullet-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/tf2 dev-ros/geometry_msgs[ros_messages_cxx(-)] sci-physics/bullet python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=84c3f560bacb843f5c22f06242ae97eb
diff --git a/metadata/md5-cache/dev-ros/tf2_eigen-0.6.1 b/metadata/md5-cache/dev-ros/tf2_eigen-0.6.1
index c14ec9d3cdbd..5243256388c4 100644
--- a/metadata/md5-cache/dev-ros/tf2_eigen-0.6.1
+++ b/metadata/md5-cache/dev-ros/tf2_eigen-0.6.1
@@ -10,5 +10,5 @@ RDEPEND=dev-cpp/eigen:3 dev-ros/tf2 dev-ros/geometry_msgs[ros_messages_cxx(-)] p
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.6.1.tar.gz -> geometry2-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5b07a52e31b6d2c92ed349b150972a04
diff --git a/metadata/md5-cache/dev-ros/tf2_eigen-0.6.2 b/metadata/md5-cache/dev-ros/tf2_eigen-0.6.2
index b6c69984a1bd..5b9836f629b5 100644
--- a/metadata/md5-cache/dev-ros/tf2_eigen-0.6.2
+++ b/metadata/md5-cache/dev-ros/tf2_eigen-0.6.2
@@ -10,5 +10,5 @@ RDEPEND=dev-cpp/eigen:3 dev-ros/tf2 dev-ros/geometry_msgs[ros_messages_cxx(-)] p
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.6.2.tar.gz -> geometry2-0.6.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=5b07a52e31b6d2c92ed349b150972a04
diff --git a/metadata/md5-cache/dev-ros/tf2_eigen-0.6.3 b/metadata/md5-cache/dev-ros/tf2_eigen-0.6.3
index 956e8114527b..ed9f66000f32 100644
--- a/metadata/md5-cache/dev-ros/tf2_eigen-0.6.3
+++ b/metadata/md5-cache/dev-ros/tf2_eigen-0.6.3
@@ -10,5 +10,5 @@ RDEPEND=dev-cpp/eigen:3 dev-ros/tf2 dev-ros/geometry_msgs[ros_messages_cxx(-)] p
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.6.3.tar.gz -> geometry2-0.6.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5b07a52e31b6d2c92ed349b150972a04
diff --git a/metadata/md5-cache/dev-ros/tf2_eigen-9999 b/metadata/md5-cache/dev-ros/tf2_eigen-9999
index 47d8fecb3050..cecefc787039 100644
--- a/metadata/md5-cache/dev-ros/tf2_eigen-9999
+++ b/metadata/md5-cache/dev-ros/tf2_eigen-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-cpp/eigen:3 dev-ros/tf2 dev-ros/geometry_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=12de8221dacbdde987e111f87ec1ab9e
diff --git a/metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.6.3 b/metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.6.3
index 84a4ea593921..a5528decd9cf 100644
--- a/metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.6.3
+++ b/metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.6.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.6.3.tar.gz -> geometry2-0.6.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e295f69cbd036a74d48e5c0f254fda0d
diff --git a/metadata/md5-cache/dev-ros/tf2_geometry_msgs-9999 b/metadata/md5-cache/dev-ros/tf2_geometry_msgs-9999
index 97ea66741af3..d56010e10b30 100644
--- a/metadata/md5-cache/dev-ros/tf2_geometry_msgs-9999
+++ b/metadata/md5-cache/dev-ros/tf2_geometry_msgs-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=e295f69cbd036a74d48e5c0f254fda0d
diff --git a/metadata/md5-cache/dev-ros/tf2_kdl-0.6.1-r1 b/metadata/md5-cache/dev-ros/tf2_kdl-0.6.1-r1
index 0492b5ac7c66..2f60eb57475e 100644
--- a/metadata/md5-cache/dev-ros/tf2_kdl-0.6.1-r1
+++ b/metadata/md5-cache/dev-ros/tf2_kdl-0.6.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-cpp/eigen:3 dev-ros/tf2 dev-ros/tf2_ros dev-python/python_orocos_kdl
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.6.1.tar.gz -> geometry2-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9b09fa08a9d90a906b033310ce409776
diff --git a/metadata/md5-cache/dev-ros/tf2_kdl-0.6.2 b/metadata/md5-cache/dev-ros/tf2_kdl-0.6.2
index f730bd451a79..4d19e089f79b 100644
--- a/metadata/md5-cache/dev-ros/tf2_kdl-0.6.2
+++ b/metadata/md5-cache/dev-ros/tf2_kdl-0.6.2
@@ -10,5 +10,5 @@ RDEPEND=dev-cpp/eigen:3 dev-ros/tf2 dev-ros/tf2_ros dev-python/python_orocos_kdl
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.6.2.tar.gz -> geometry2-0.6.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=9b09fa08a9d90a906b033310ce409776
diff --git a/metadata/md5-cache/dev-ros/tf2_kdl-0.6.3 b/metadata/md5-cache/dev-ros/tf2_kdl-0.6.3
index 8414c3209f1e..fd9ecc2be7a7 100644
--- a/metadata/md5-cache/dev-ros/tf2_kdl-0.6.3
+++ b/metadata/md5-cache/dev-ros/tf2_kdl-0.6.3
@@ -10,5 +10,5 @@ RDEPEND=dev-cpp/eigen:3 dev-ros/tf2 dev-ros/tf2_ros dev-python/python_orocos_kdl
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.6.3.tar.gz -> geometry2-0.6.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9b09fa08a9d90a906b033310ce409776
diff --git a/metadata/md5-cache/dev-ros/tf2_kdl-9999 b/metadata/md5-cache/dev-ros/tf2_kdl-9999
index 8cb8e584aa38..0a7a860df290 100644
--- a/metadata/md5-cache/dev-ros/tf2_kdl-9999
+++ b/metadata/md5-cache/dev-ros/tf2_kdl-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-cpp/eigen:3 dev-ros/tf2 dev-ros/tf2_ros dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/orocos_kdl:= dev-ros/tf2_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/cmake_modules python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=9b09fa08a9d90a906b033310ce409776
diff --git a/metadata/md5-cache/dev-ros/tf2_msgs-0.6.1 b/metadata/md5-cache/dev-ros/tf2_msgs-0.6.1
index 9897e74878f0..efa6876494e6 100644
--- a/metadata/md5-cache/dev-ros/tf2_msgs-0.6.1
+++ b/metadata/md5-cache/dev-ros/tf2_msgs-0.6.1
@@ -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/ros/geometry2/archive/0.6.1.tar.gz -> geometry2-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1f7d02ccefcef938994af37687c28169
diff --git a/metadata/md5-cache/dev-ros/tf2_msgs-0.6.2 b/metadata/md5-cache/dev-ros/tf2_msgs-0.6.2
index 5e0992d251e6..24633e041cd6 100644
--- a/metadata/md5-cache/dev-ros/tf2_msgs-0.6.2
+++ b/metadata/md5-cache/dev-ros/tf2_msgs-0.6.2
@@ -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/ros/geometry2/archive/0.6.2.tar.gz -> geometry2-0.6.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=1f7d02ccefcef938994af37687c28169
diff --git a/metadata/md5-cache/dev-ros/tf2_msgs-0.6.3 b/metadata/md5-cache/dev-ros/tf2_msgs-0.6.3
index 1601630e0e72..c8b2a8ffda0c 100644
--- a/metadata/md5-cache/dev-ros/tf2_msgs-0.6.3
+++ b/metadata/md5-cache/dev-ros/tf2_msgs-0.6.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=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.6.3.tar.gz -> geometry2-0.6.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1f7d02ccefcef938994af37687c28169
diff --git a/metadata/md5-cache/dev-ros/tf2_msgs-9999 b/metadata/md5-cache/dev-ros/tf2_msgs-9999
index 14c111d4a924..2d7921bfbb8c 100644
--- a/metadata/md5-cache/dev-ros/tf2_msgs-9999
+++ b/metadata/md5-cache/dev-ros/tf2_msgs-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=a6c71f7db75fd8af6c84a009b12f57d9
diff --git a/metadata/md5-cache/dev-ros/tf2_py-0.6.1 b/metadata/md5-cache/dev-ros/tf2_py-0.6.1
index f4cd7d743694..b1ea6f090093 100644
--- a/metadata/md5-cache/dev-ros/tf2_py-0.6.1
+++ b/metadata/md5-cache/dev-ros/tf2_py-0.6.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/tf2 dev-ros/rospy[python_targets_python2_7(-)?,-python_single_ta
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.6.1.tar.gz -> geometry2-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f986121d666943996636ab6b35a4f37b
diff --git a/metadata/md5-cache/dev-ros/tf2_py-0.6.2 b/metadata/md5-cache/dev-ros/tf2_py-0.6.2
index e3f5a5429dc4..d195751bf307 100644
--- a/metadata/md5-cache/dev-ros/tf2_py-0.6.2
+++ b/metadata/md5-cache/dev-ros/tf2_py-0.6.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/tf2 dev-ros/rospy[python_targets_python2_7(-)?,-python_single_ta
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.6.2.tar.gz -> geometry2-0.6.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=f986121d666943996636ab6b35a4f37b
diff --git a/metadata/md5-cache/dev-ros/tf2_py-0.6.3 b/metadata/md5-cache/dev-ros/tf2_py-0.6.3
index 5303a2043d88..044f144c4644 100644
--- a/metadata/md5-cache/dev-ros/tf2_py-0.6.3
+++ b/metadata/md5-cache/dev-ros/tf2_py-0.6.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/tf2 dev-ros/rospy[python_targets_python2_7(-)?,-python_single_ta
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.6.3.tar.gz -> geometry2-0.6.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f986121d666943996636ab6b35a4f37b
diff --git a/metadata/md5-cache/dev-ros/tf2_py-9999 b/metadata/md5-cache/dev-ros/tf2_py-9999
index aceaeb3e4d3d..437530363ae1 100644
--- a/metadata/md5-cache/dev-ros/tf2_py-9999
+++ b/metadata/md5-cache/dev-ros/tf2_py-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/tf2 dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=2346ef22128ed78855a7bef509918820
diff --git a/metadata/md5-cache/dev-ros/tf2_ros-0.6.1 b/metadata/md5-cache/dev-ros/tf2_ros-0.6.1
index 9d7bcef314b9..654b1604b6d0 100644
--- a/metadata/md5-cache/dev-ros/tf2_ros-0.6.1
+++ b/metadata/md5-cache/dev-ros/tf2_ros-0.6.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.6.1.tar.gz -> geometry2-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=afa831cde909d3269273a91f4d0bec1f
diff --git a/metadata/md5-cache/dev-ros/tf2_ros-0.6.2 b/metadata/md5-cache/dev-ros/tf2_ros-0.6.2
index b8d5bd0903c7..0147153e16dd 100644
--- a/metadata/md5-cache/dev-ros/tf2_ros-0.6.2
+++ b/metadata/md5-cache/dev-ros/tf2_ros-0.6.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.6.2.tar.gz -> geometry2-0.6.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=afa831cde909d3269273a91f4d0bec1f
diff --git a/metadata/md5-cache/dev-ros/tf2_ros-0.6.3 b/metadata/md5-cache/dev-ros/tf2_ros-0.6.3
index 0d74030e57f7..a4b94ed20a38 100644
--- a/metadata/md5-cache/dev-ros/tf2_ros-0.6.3
+++ b/metadata/md5-cache/dev-ros/tf2_ros-0.6.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.6.3.tar.gz -> geometry2-0.6.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=afa831cde909d3269273a91f4d0bec1f
diff --git a/metadata/md5-cache/dev-ros/tf2_ros-9999 b/metadata/md5-cache/dev-ros/tf2_ros-9999
index 823a693b7e7f..4b83606ceb0a 100644
--- a/metadata/md5-cache/dev-ros/tf2_ros-9999
+++ b/metadata/md5-cache/dev-ros/tf2_ros-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=e45d04e1ff9cfc53cfbd05cc0962d4d5
diff --git a/metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.6.3 b/metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.6.3
index ebfe92c52038..870aeb176ef0 100644
--- a/metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.6.3
+++ b/metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.6.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.6.3.tar.gz -> geometry2-0.6.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2f1a014de557c97b109bf7652e7b6177
diff --git a/metadata/md5-cache/dev-ros/tf2_sensor_msgs-9999 b/metadata/md5-cache/dev-ros/tf2_sensor_msgs-9999
index a770fa2b0225..c3f3c0e81a48 100644
--- a/metadata/md5-cache/dev-ros/tf2_sensor_msgs-9999
+++ b/metadata/md5-cache/dev-ros/tf2_sensor_msgs-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=4e7522c913c28915926051fbbdf5b207
diff --git a/metadata/md5-cache/dev-ros/tf2_tools-0.6.1 b/metadata/md5-cache/dev-ros/tf2_tools-0.6.1
index 5244d1451c26..2927615a5186 100644
--- a/metadata/md5-cache/dev-ros/tf2_tools-0.6.1
+++ b/metadata/md5-cache/dev-ros/tf2_tools-0.6.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.6.1.tar.gz -> geometry2-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cb18bbdbe42cb60ec85852a7bae6ba72
diff --git a/metadata/md5-cache/dev-ros/tf2_tools-0.6.2 b/metadata/md5-cache/dev-ros/tf2_tools-0.6.2
index 741c8ae01f40..b8029b0de83d 100644
--- a/metadata/md5-cache/dev-ros/tf2_tools-0.6.2
+++ b/metadata/md5-cache/dev-ros/tf2_tools-0.6.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.6.2.tar.gz -> geometry2-0.6.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=cb18bbdbe42cb60ec85852a7bae6ba72
diff --git a/metadata/md5-cache/dev-ros/tf2_tools-0.6.3 b/metadata/md5-cache/dev-ros/tf2_tools-0.6.3
index 33af635390d5..031f96916454 100644
--- a/metadata/md5-cache/dev-ros/tf2_tools-0.6.3
+++ b/metadata/md5-cache/dev-ros/tf2_tools-0.6.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.6.3.tar.gz -> geometry2-0.6.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cb18bbdbe42cb60ec85852a7bae6ba72
diff --git a/metadata/md5-cache/dev-ros/tf2_tools-9999 b/metadata/md5-cache/dev-ros/tf2_tools-9999
index 1483c49cf4c9..0d44ed389136 100644
--- a/metadata/md5-cache/dev-ros/tf2_tools-9999
+++ b/metadata/md5-cache/dev-ros/tf2_tools-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=e181380e0442606c9dea17fc087aaf6b
diff --git a/metadata/md5-cache/dev-ros/tf_conversions-1.11.9-r1 b/metadata/md5-cache/dev-ros/tf_conversions-1.11.9-r1
index f63eddf8c737..11c4b2b9d5ba 100644
--- a/metadata/md5-cache/dev-ros/tf_conversions-1.11.9-r1
+++ b/metadata/md5-cache/dev-ros/tf_conversions-1.11.9-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry/archive/1.11.9.tar.gz -> geometry-1.11.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e9a518902b6b09695e830f384d6537ee
diff --git a/metadata/md5-cache/dev-ros/tf_conversions-1.12.0 b/metadata/md5-cache/dev-ros/tf_conversions-1.12.0
index 915ad0f9f565..e8e93791c6ec 100644
--- a/metadata/md5-cache/dev-ros/tf_conversions-1.12.0
+++ b/metadata/md5-cache/dev-ros/tf_conversions-1.12.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry/archive/1.12.0.tar.gz -> geometry-1.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e9a518902b6b09695e830f384d6537ee
diff --git a/metadata/md5-cache/dev-ros/tf_conversions-9999 b/metadata/md5-cache/dev-ros/tf_conversions-9999
index 960f516d53a6..b99d4fc46846 100644
--- a/metadata/md5-cache/dev-ros/tf_conversions-9999
+++ b/metadata/md5-cache/dev-ros/tf_conversions-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/kdl_conversions dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/orocos_kdl:= dev-cpp/eigen:3 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
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=e9a518902b6b09695e830f384d6537ee
diff --git a/metadata/md5-cache/dev-ros/theora_image_transport-1.9.5-r1 b/metadata/md5-cache/dev-ros/theora_image_transport-1.9.5-r1
index 751332b6ca90..65d4aa5a7fba 100644
--- a/metadata/md5-cache/dev-ros/theora_image_transport-1.9.5-r1
+++ b/metadata/md5-cache/dev-ros/theora_image_transport-1.9.5-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ro
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_transport_plugins/archive/1.9.5.tar.gz -> image_transport_plugins-1.9.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8a80d201d5f208533efa7563fa1c1c95
diff --git a/metadata/md5-cache/dev-ros/theora_image_transport-9999 b/metadata/md5-cache/dev-ros/theora_image_transport-9999
index e92043e051d7..5b6eb0d7a6a9 100644
--- a/metadata/md5-cache/dev-ros/theora_image_transport-9999
+++ b/metadata/md5-cache/dev-ros/theora_image_transport-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/image_transport media-libs/opencv dev-ros/rosbag dev-ros/pluginlib media-libs/libogg media-libs/libtheora[encode] 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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=8a80d201d5f208533efa7563fa1c1c95
diff --git a/metadata/md5-cache/dev-ros/timestamp_tools-1.6.8 b/metadata/md5-cache/dev-ros/timestamp_tools-1.6.8
index 695dfa291d7e..9ebfd245e84e 100644
--- a/metadata/md5-cache/dev-ros/timestamp_tools-1.6.8
+++ b/metadata/md5-cache/dev-ros/timestamp_tools-1.6.8
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslib dev-ros/roscpp python_targets_python2_7? ( >=dev-lang/pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/driver_common/archive/1.6.8.tar.gz -> driver_common-1.6.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=be60db554ee7319f35b590aa73cf9c6e
diff --git a/metadata/md5-cache/dev-ros/timestamp_tools-9999 b/metadata/md5-cache/dev-ros/timestamp_tools-9999
index 56ceb85d2c92..1d60cf1d8009 100644
--- a/metadata/md5-cache/dev-ros/timestamp_tools-9999
+++ b/metadata/md5-cache/dev-ros/timestamp_tools-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roslib 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=be60db554ee7319f35b590aa73cf9c6e
diff --git a/metadata/md5-cache/dev-ros/topic_tools-1.13.0 b/metadata/md5-cache/dev-ros/topic_tools-1.13.0
index eea6f992aa16..fffb2fc1f791 100644
--- a/metadata/md5-cache/dev-ros/topic_tools-1.13.0
+++ b/metadata/md5-cache/dev-ros/topic_tools-1.13.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.0.tar.gz -> ros_comm-1.13.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5b92836e80db8e3a2729eff7ad94da9b
diff --git a/metadata/md5-cache/dev-ros/topic_tools-1.13.1 b/metadata/md5-cache/dev-ros/topic_tools-1.13.1
index b71bcf3387bd..7215adbc57e5 100644
--- a/metadata/md5-cache/dev-ros/topic_tools-1.13.1
+++ b/metadata/md5-cache/dev-ros/topic_tools-1.13.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.1.tar.gz -> ros_comm-1.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5b92836e80db8e3a2729eff7ad94da9b
diff --git a/metadata/md5-cache/dev-ros/topic_tools-1.13.2 b/metadata/md5-cache/dev-ros/topic_tools-1.13.2
index 81e4db3679b6..e5dced3f0cbc 100644
--- a/metadata/md5-cache/dev-ros/topic_tools-1.13.2
+++ b/metadata/md5-cache/dev-ros/topic_tools-1.13.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.2.tar.gz -> ros_comm-1.13.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=5b92836e80db8e3a2729eff7ad94da9b
diff --git a/metadata/md5-cache/dev-ros/topic_tools-1.13.4 b/metadata/md5-cache/dev-ros/topic_tools-1.13.4
index 1afc8e4bad13..b89ad82fd4e9 100644
--- a/metadata/md5-cache/dev-ros/topic_tools-1.13.4
+++ b/metadata/md5-cache/dev-ros/topic_tools-1.13.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.4.tar.gz -> ros_comm-1.13.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5b92836e80db8e3a2729eff7ad94da9b
diff --git a/metadata/md5-cache/dev-ros/topic_tools-1.13.5 b/metadata/md5-cache/dev-ros/topic_tools-1.13.5
index eb57e6f882ae..ba7e7007e77a 100644
--- a/metadata/md5-cache/dev-ros/topic_tools-1.13.5
+++ b/metadata/md5-cache/dev-ros/topic_tools-1.13.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.5.tar.gz -> ros_comm-1.13.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5b92836e80db8e3a2729eff7ad94da9b
diff --git a/metadata/md5-cache/dev-ros/topic_tools-1.13.6 b/metadata/md5-cache/dev-ros/topic_tools-1.13.6
index 75c518da3271..b6e2f24de511 100644
--- a/metadata/md5-cache/dev-ros/topic_tools-1.13.6
+++ b/metadata/md5-cache/dev-ros/topic_tools-1.13.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.6.tar.gz -> ros_comm-1.13.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=08600867e3bf640a8096994857d57e96
diff --git a/metadata/md5-cache/dev-ros/topic_tools-1.14.2 b/metadata/md5-cache/dev-ros/topic_tools-1.14.2
index 2d5b89e22370..482da7950de9 100644
--- a/metadata/md5-cache/dev-ros/topic_tools-1.14.2
+++ b/metadata/md5-cache/dev-ros/topic_tools-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.2.tar.gz -> ros_comm-1.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=08600867e3bf640a8096994857d57e96
diff --git a/metadata/md5-cache/dev-ros/topic_tools-1.14.3 b/metadata/md5-cache/dev-ros/topic_tools-1.14.3
index bf33b3132b81..f6ea11a003db 100644
--- a/metadata/md5-cache/dev-ros/topic_tools-1.14.3
+++ b/metadata/md5-cache/dev-ros/topic_tools-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=08600867e3bf640a8096994857d57e96
diff --git a/metadata/md5-cache/dev-ros/topic_tools-9999 b/metadata/md5-cache/dev-ros/topic_tools-9999
index bd3e38dae30c..514f754bbc0f 100644
--- a/metadata/md5-cache/dev-ros/topic_tools-9999
+++ b/metadata/md5-cache/dev-ros/topic_tools-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=4169fe9f0ceeb6577c21064c1d7a0094
diff --git a/metadata/md5-cache/dev-ros/trajectory_msgs-1.12.5 b/metadata/md5-cache/dev-ros/trajectory_msgs-1.12.5
index 6c523657e310..b1ba0abf4321 100644
--- a/metadata/md5-cache/dev-ros/trajectory_msgs-1.12.5
+++ b/metadata/md5-cache/dev-ros/trajectory_msgs-1.12.5
@@ -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/ros/common_msgs/archive/1.12.5.tar.gz -> common_msgs-1.12.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=df74b15885b46805224eb719f5718546
diff --git a/metadata/md5-cache/dev-ros/trajectory_msgs-1.12.6 b/metadata/md5-cache/dev-ros/trajectory_msgs-1.12.6
index c41496362806..dd9dfcf14380 100644
--- a/metadata/md5-cache/dev-ros/trajectory_msgs-1.12.6
+++ b/metadata/md5-cache/dev-ros/trajectory_msgs-1.12.6
@@ -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/ros/common_msgs/archive/1.12.6.tar.gz -> common_msgs-1.12.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9c62f18375dd2a18c81d0dd4390421b7
diff --git a/metadata/md5-cache/dev-ros/trajectory_msgs-9999 b/metadata/md5-cache/dev-ros/trajectory_msgs-9999
index 41e5f74969ec..6d6f78a5ebc0 100644
--- a/metadata/md5-cache/dev-ros/trajectory_msgs-9999
+++ b/metadata/md5-cache/dev-ros/trajectory_msgs-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=df74b15885b46805224eb719f5718546
diff --git a/metadata/md5-cache/dev-ros/transmission_interface-0.14.2 b/metadata/md5-cache/dev-ros/transmission_interface-0.14.2
index 2ccb31fa57f1..9a33796ca7b8 100644
--- a/metadata/md5-cache/dev-ros/transmission_interface-0.14.2
+++ b/metadata/md5-cache/dev-ros/transmission_interface-0.14.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-lib
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.14.2.tar.gz -> ros_control-0.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=2b7a0f21f1b5ea013b17ee0d9d5a7ea6
diff --git a/metadata/md5-cache/dev-ros/transmission_interface-0.15.0 b/metadata/md5-cache/dev-ros/transmission_interface-0.15.0
index 3b58559e14a6..4ed28e10c5a8 100644
--- a/metadata/md5-cache/dev-ros/transmission_interface-0.15.0
+++ b/metadata/md5-cache/dev-ros/transmission_interface-0.15.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-lib
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.15.0.tar.gz -> ros_control-0.15.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2b7a0f21f1b5ea013b17ee0d9d5a7ea6
diff --git a/metadata/md5-cache/dev-ros/transmission_interface-9999 b/metadata/md5-cache/dev-ros/transmission_interface-9999
index 93b4dc4afe41..5559fef33ac5 100644
--- a/metadata/md5-cache/dev-ros/transmission_interface-9999
+++ b/metadata/md5-cache/dev-ros/transmission_interface-9999
@@ -8,5 +8,5 @@ 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=2bfae9236590835dfa73e4b220761da8
diff --git a/metadata/md5-cache/dev-ros/turtle_actionlib-0.1.10 b/metadata/md5-cache/dev-ros/turtle_actionlib-0.1.10
index 2d2c0bb75b12..388bd157ab57 100644
--- a/metadata/md5-cache/dev-ros/turtle_actionlib-0.1.10
+++ b/metadata/md5-cache/dev-ros/turtle_actionlib-0.1.10
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconso
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/common_tutorials/archive/0.1.10.tar.gz -> common_tutorials-0.1.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=09f21103943f594be7f2b21c2faa0dbc
diff --git a/metadata/md5-cache/dev-ros/turtle_actionlib-0.1.11 b/metadata/md5-cache/dev-ros/turtle_actionlib-0.1.11
index 8aa89cd990f6..c8a0d608b07f 100644
--- a/metadata/md5-cache/dev-ros/turtle_actionlib-0.1.11
+++ b/metadata/md5-cache/dev-ros/turtle_actionlib-0.1.11
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconso
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/common_tutorials/archive/0.1.11.tar.gz -> common_tutorials-0.1.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8a9a0105420be7fe1ed8c0eb1a6c51b0
diff --git a/metadata/md5-cache/dev-ros/turtle_actionlib-9999 b/metadata/md5-cache/dev-ros/turtle_actionlib-9999
index d13c4170d3e4..5fc02a092a05 100644
--- a/metadata/md5-cache/dev-ros/turtle_actionlib-9999
+++ b/metadata/md5-cache/dev-ros/turtle_actionlib-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconsole dev-ros/roscpp dev-ros/turtlesim 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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=09f21103943f594be7f2b21c2faa0dbc
diff --git a/metadata/md5-cache/dev-ros/turtle_tf-0.2.2 b/metadata/md5-cache/dev-ros/turtle_tf-0.2.2
index b07adb7670eb..a8a7fa986700 100644
--- a/metadata/md5-cache/dev-ros/turtle_tf-0.2.2
+++ b/metadata/md5-cache/dev-ros/turtle_tf-0.2.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry_tutorials/archive/0.2.2.tar.gz -> geometry_tutorials-0.2.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=fff7c802a7d1541dcbc8676e8439918e
diff --git a/metadata/md5-cache/dev-ros/turtle_tf-9999 b/metadata/md5-cache/dev-ros/turtle_tf-9999
index d7f68e799f0f..ca82f3600e06 100644
--- a/metadata/md5-cache/dev-ros/turtle_tf-9999
+++ b/metadata/md5-cache/dev-ros/turtle_tf-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/turtlesim[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=fff7c802a7d1541dcbc8676e8439918e
diff --git a/metadata/md5-cache/dev-ros/turtle_tf2-0.2.2 b/metadata/md5-cache/dev-ros/turtle_tf2-0.2.2
index 26d78d6f0e89..e9d2052b02ab 100644
--- a/metadata/md5-cache/dev-ros/turtle_tf2-0.2.2
+++ b/metadata/md5-cache/dev-ros/turtle_tf2-0.2.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry_tutorials/archive/0.2.2.tar.gz -> geometry_tutorials-0.2.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=c114d049850f8e668e117a6cfe206f07
diff --git a/metadata/md5-cache/dev-ros/turtle_tf2-9999 b/metadata/md5-cache/dev-ros/turtle_tf2-9999
index c21ba6fd7420..cea4a12a29e2 100644
--- a/metadata/md5-cache/dev-ros/turtle_tf2-9999
+++ b/metadata/md5-cache/dev-ros/turtle_tf2-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/turtlesim[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=c114d049850f8e668e117a6cfe206f07
diff --git a/metadata/md5-cache/dev-ros/turtlesim-0.8.1 b/metadata/md5-cache/dev-ros/turtlesim-0.8.1
index d362fb2fa378..9feadb08e571 100644
--- a/metadata/md5-cache/dev-ros/turtlesim-0.8.1
+++ b/metadata/md5-cache/dev-ros/turtlesim-0.8.1
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:=[threa
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.8.1.tar.gz -> ros_tutorials-0.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=99bec88e79ce50286020b92591eca710
diff --git a/metadata/md5-cache/dev-ros/turtlesim-0.9.0 b/metadata/md5-cache/dev-ros/turtlesim-0.9.0
index 2ea9239794fd..762987d29192 100644
--- a/metadata/md5-cache/dev-ros/turtlesim-0.9.0
+++ b/metadata/md5-cache/dev-ros/turtlesim-0.9.0
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:=[threa
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.9.0.tar.gz -> ros_tutorials-0.9.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=43fa1c56dd24cdcd4dfb660d47342ff2
diff --git a/metadata/md5-cache/dev-ros/turtlesim-9999 b/metadata/md5-cache/dev-ros/turtlesim-9999
index 70509f068a37..d2a48d0610f4 100644
--- a/metadata/md5-cache/dev-ros/turtlesim-9999
+++ b/metadata/md5-cache/dev-ros/turtlesim-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:=[threads] dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/roslib dev-ros/rostime dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=9c1f6e51f42e35c6e4b034d7f730a8fe
diff --git a/metadata/md5-cache/dev-ros/unique_id-1.0.6 b/metadata/md5-cache/dev-ros/unique_id-1.0.6
index 275677e81e1c..d404e37b49ca 100644
--- a/metadata/md5-cache/dev-ros/unique_id-1.0.6
+++ b/metadata/md5-cache/dev-ros/unique_id-1.0.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/uuid_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-geographic-info/unique_identifier/archive/unique_identifier-1.0.6.tar.gz -> unique_identifier-1.0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=186bdbe0cab2b901055c07bdd36e0807
diff --git a/metadata/md5-cache/dev-ros/unique_id-9999 b/metadata/md5-cache/dev-ros/unique_id-9999
index 565016b533a5..517cec0f2427 100644
--- a/metadata/md5-cache/dev-ros/unique_id-9999
+++ b/metadata/md5-cache/dev-ros/unique_id-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/uuid_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=d269bcf3c2415b7260357f3e2e044b64
diff --git a/metadata/md5-cache/dev-ros/urdf-1.13.1-r1 b/metadata/md5-cache/dev-ros/urdf-1.13.1-r1
index 7c8ef5926dc0..0750b4043733 100644
--- a/metadata/md5-cache/dev-ros/urdf-1.13.1-r1
+++ b/metadata/md5-cache/dev-ros/urdf-1.13.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-libs/urdfdom dev-libs/urdfdom_headers dev-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/urdf/archive/1.13.1.tar.gz -> urdf-1.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6d4fd6e531aebf26394ef0c0ca269d4c
diff --git a/metadata/md5-cache/dev-ros/urdf-9999 b/metadata/md5-cache/dev-ros/urdf-9999
index 00cc0afd92d6..462f6cfe3bea 100644
--- a/metadata/md5-cache/dev-ros/urdf-9999
+++ b/metadata/md5-cache/dev-ros/urdf-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost:=[threads] dev-libs/urdfdom dev-libs/urdfdom_headers dev-ros/urdf_parser_plugin dev-ros/pluginlib dev-ros/rosconsole_bridge dev-libs/console_bridge:= dev-ros/roscpp dev-libs/tinyxml dev-libs/tinyxml2:= dev-ros/class_loader:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=6d4fd6e531aebf26394ef0c0ca269d4c
diff --git a/metadata/md5-cache/dev-ros/urdf_parser_plugin-1.12.11 b/metadata/md5-cache/dev-ros/urdf_parser_plugin-1.12.11
index ec54fd182ce7..04671ce705a4 100644
--- a/metadata/md5-cache/dev-ros/urdf_parser_plugin-1.12.11
+++ b/metadata/md5-cache/dev-ros/urdf_parser_plugin-1.12.11
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/urdfdom_headers python_targets_python2_7? ( >=dev-lang/python-2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/robot_model/archive/1.12.11.tar.gz -> robot_model-1.12.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1c955f877a99bfdd68041e9be7950ce0
diff --git a/metadata/md5-cache/dev-ros/urdf_parser_plugin-1.13.1 b/metadata/md5-cache/dev-ros/urdf_parser_plugin-1.13.1
index c6ca78b16b5f..5c7422000623 100644
--- a/metadata/md5-cache/dev-ros/urdf_parser_plugin-1.13.1
+++ b/metadata/md5-cache/dev-ros/urdf_parser_plugin-1.13.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/urdfdom_headers python_targets_python2_7? ( >=dev-lang/python-2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/urdf/archive/1.13.1.tar.gz -> urdf-1.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7a369ba8c2074ae0e8662e4b0b9dcc25
diff --git a/metadata/md5-cache/dev-ros/urdf_parser_plugin-9999 b/metadata/md5-cache/dev-ros/urdf_parser_plugin-9999
index 8f2989cecf34..b14349d3524d 100644
--- a/metadata/md5-cache/dev-ros/urdf_parser_plugin-9999
+++ b/metadata/md5-cache/dev-ros/urdf_parser_plugin-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/urdfdom_headers python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=7a369ba8c2074ae0e8662e4b0b9dcc25
diff --git a/metadata/md5-cache/dev-ros/urdf_tutorial-0.3.0 b/metadata/md5-cache/dev-ros/urdf_tutorial-0.3.0
index 18c8a38b9d14..dd49cc511294 100644
--- a/metadata/md5-cache/dev-ros/urdf_tutorial-0.3.0
+++ b/metadata/md5-cache/dev-ros/urdf_tutorial-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/urdf dev-ros/joint_state_publisher dev-ros/robot_state_publisher
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/urdf_tutorial/archive/0.3.0.tar.gz -> urdf_tutorial-0.3.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9f0920e4d65469b84286d529b60c05d0
diff --git a/metadata/md5-cache/dev-ros/urdf_tutorial-0.4.0 b/metadata/md5-cache/dev-ros/urdf_tutorial-0.4.0
index d3a1cc5bce73..c5210b36e832 100644
--- a/metadata/md5-cache/dev-ros/urdf_tutorial-0.4.0
+++ b/metadata/md5-cache/dev-ros/urdf_tutorial-0.4.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/urdf dev-ros/joint_state_publisher dev-ros/robot_state_publisher
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/urdf_tutorial/archive/0.4.0.tar.gz -> urdf_tutorial-0.4.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=30d9886c6f52e313a6d2faa0a21b78e4
diff --git a/metadata/md5-cache/dev-ros/urdf_tutorial-9999 b/metadata/md5-cache/dev-ros/urdf_tutorial-9999
index 80bc7a5497a6..b700114c9cf8 100644
--- a/metadata/md5-cache/dev-ros/urdf_tutorial-9999
+++ b/metadata/md5-cache/dev-ros/urdf_tutorial-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/urdf dev-ros/joint_state_publisher dev-ros/robot_state_publisher dev-ros/rviz dev-ros/xacro python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=30d9886c6f52e313a6d2faa0a21b78e4
diff --git a/metadata/md5-cache/dev-ros/urg_c-1.0.405 b/metadata/md5-cache/dev-ros/urg_c-1.0.405
index 12587d201779..599bb0d9b5cb 100644
--- a/metadata/md5-cache/dev-ros/urg_c-1.0.405
+++ b/metadata/md5-cache/dev-ros/urg_c-1.0.405
@@ -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/ros-drivers/urg_c/archive/1.0.405.tar.gz -> urg_c-1.0.405.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ae58f75ece1d48606ccff15b6e74d806
diff --git a/metadata/md5-cache/dev-ros/urg_c-9999 b/metadata/md5-cache/dev-ros/urg_c-9999
index fb51f14ada78..3dcc57330155 100644
--- a/metadata/md5-cache/dev-ros/urg_c-9999
+++ b/metadata/md5-cache/dev-ros/urg_c-9999
@@ -8,5 +8,5 @@ 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=a327266541f56dfddd2a052dba17113d
diff --git a/metadata/md5-cache/dev-ros/urg_node-0.1.10 b/metadata/md5-cache/dev-ros/urg_node-0.1.10
index 3ebf1d97aaef..5f72159a7886 100644
--- a/metadata/md5-cache/dev-ros/urg_node-0.1.10
+++ b/metadata/md5-cache/dev-ros/urg_node-0.1.10
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/urg_c dev-ros/tf dev-ros/dynamic_reconfigure[python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/urg_node/archive/0.1.10.tar.gz -> urg_node-0.1.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f3e3d566c5b4cc34f2596ca7326440c3
diff --git a/metadata/md5-cache/dev-ros/urg_node-0.1.11 b/metadata/md5-cache/dev-ros/urg_node-0.1.11
index 1e858cd52e12..2049dbb97c4d 100644
--- a/metadata/md5-cache/dev-ros/urg_node-0.1.11
+++ b/metadata/md5-cache/dev-ros/urg_node-0.1.11
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/urg_c dev-ros/tf dev-ros/dynamic_reconfigure[python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/urg_node/archive/0.1.11.tar.gz -> urg_node-0.1.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=92ce0f81d47efd791234f6c54f1c9f9a
diff --git a/metadata/md5-cache/dev-ros/urg_node-9999 b/metadata/md5-cache/dev-ros/urg_node-9999
index 1b07d1f3ff1c..0428a40fbad3 100644
--- a/metadata/md5-cache/dev-ros/urg_node-9999
+++ b/metadata/md5-cache/dev-ros/urg_node-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/urg_c dev-ros/tf dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nodelet dev-ros/rosconsole dev-ros/roscpp dev-ros/diagnostic_updater dev-ros/laser_proc dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] 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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=92ce0f81d47efd791234f6c54f1c9f9a
diff --git a/metadata/md5-cache/dev-ros/uuid_msgs-1.0.6 b/metadata/md5-cache/dev-ros/uuid_msgs-1.0.6
index ae68b6462ca7..8c4425871d7e 100644
--- a/metadata/md5-cache/dev-ros/uuid_msgs-1.0.6
+++ b/metadata/md5-cache/dev-ros/uuid_msgs-1.0.6
@@ -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/ros-geographic-info/unique_identifier/archive/unique_identifier-1.0.6.tar.gz -> unique_identifier-1.0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ba09f384c9b66521cc3ccd2d52eb3021
diff --git a/metadata/md5-cache/dev-ros/uuid_msgs-9999 b/metadata/md5-cache/dev-ros/uuid_msgs-9999
index 8d747c276498..63e685f5cc9c 100644
--- a/metadata/md5-cache/dev-ros/uuid_msgs-9999
+++ b/metadata/md5-cache/dev-ros/uuid_msgs-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=ba09f384c9b66521cc3ccd2d52eb3021
diff --git a/metadata/md5-cache/dev-ros/visp_auto_tracker-0.10.0 b/metadata/md5-cache/dev-ros/visp_auto_tracker-0.10.0
index 88c18c2d83a0..327c626e99c5 100644
--- a/metadata/md5-cache/dev-ros/visp_auto_tracker-0.10.0
+++ b/metadata/md5-cache/dev-ros/visp_auto_tracker-0.10.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/message_filters dev-r
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/lagadic/vision_visp/archive/kinetic-0.10.0.tar.gz -> vision_visp-0.10.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ad80ca8db354523c62d1bec58386cce0
diff --git a/metadata/md5-cache/dev-ros/visp_auto_tracker-0.8.0 b/metadata/md5-cache/dev-ros/visp_auto_tracker-0.8.0
index 5b52e2283b77..94ba4695f043 100644
--- a/metadata/md5-cache/dev-ros/visp_auto_tracker-0.8.0
+++ b/metadata/md5-cache/dev-ros/visp_auto_tracker-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/message_filters dev-r
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/lagadic/vision_visp/archive/jade-0.8.0.tar.gz -> vision_visp-0.8.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=86441403c851ba02abf4712ae0934ddc
diff --git a/metadata/md5-cache/dev-ros/visp_auto_tracker-0.9.1 b/metadata/md5-cache/dev-ros/visp_auto_tracker-0.9.1
index 457120c0a61d..888366e57a0d 100644
--- a/metadata/md5-cache/dev-ros/visp_auto_tracker-0.9.1
+++ b/metadata/md5-cache/dev-ros/visp_auto_tracker-0.9.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/message_filters dev-r
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/lagadic/vision_visp/archive/jade-0.9.1.tar.gz -> vision_visp-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=86441403c851ba02abf4712ae0934ddc
diff --git a/metadata/md5-cache/dev-ros/visp_auto_tracker-0.9.3 b/metadata/md5-cache/dev-ros/visp_auto_tracker-0.9.3
index 98fc09374fdd..3e8f5142900f 100644
--- a/metadata/md5-cache/dev-ros/visp_auto_tracker-0.9.3
+++ b/metadata/md5-cache/dev-ros/visp_auto_tracker-0.9.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/message_filters dev-r
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/lagadic/vision_visp/archive/kinetic-0.9.3.tar.gz -> vision_visp-0.9.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ad80ca8db354523c62d1bec58386cce0
diff --git a/metadata/md5-cache/dev-ros/visp_auto_tracker-9999 b/metadata/md5-cache/dev-ros/visp_auto_tracker-9999
index 786291d92139..985bbbf88a62 100644
--- a/metadata/md5-cache/dev-ros/visp_auto_tracker-9999
+++ b/metadata/md5-cache/dev-ros/visp_auto_tracker-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/message_filters dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:=[dmtx,zbar] dev-libs/boost:=[threads] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=ad80ca8db354523c62d1bec58386cce0
diff --git a/metadata/md5-cache/dev-ros/visp_bridge-0.10.0 b/metadata/md5-cache/dev-ros/visp_bridge-0.10.0
index 85c795dc1f14..530e45779cbd 100644
--- a/metadata/md5-cache/dev-ros/visp_bridge-0.10.0
+++ b/metadata/md5-cache/dev-ros/visp_bridge-0.10.0
@@ -10,5 +10,5 @@ RDEPEND=sci-libs/ViSP:=[xml] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/lagadic/vision_visp/archive/kinetic-0.10.0.tar.gz -> vision_visp-0.10.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3340f4d4a6209f3bd17b681a4fee14f5
diff --git a/metadata/md5-cache/dev-ros/visp_bridge-9999 b/metadata/md5-cache/dev-ros/visp_bridge-9999
index 21d21b7e78e2..7998c7773131 100644
--- a/metadata/md5-cache/dev-ros/visp_bridge-9999
+++ b/metadata/md5-cache/dev-ros/visp_bridge-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sci-libs/ViSP:=[xml] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/camera_calibration_parsers 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=3340f4d4a6209f3bd17b681a4fee14f5
diff --git a/metadata/md5-cache/dev-ros/visp_camera_calibration-0.10.0 b/metadata/md5-cache/dev-ros/visp_camera_calibration-0.10.0
index c04d82c44a87..ba7d191f0767 100644
--- a/metadata/md5-cache/dev-ros/visp_camera_calibration-0.10.0
+++ b/metadata/md5-cache/dev-ros/visp_camera_calibration-0.10.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/camera_calibration_parsers dev-ros/geometry_msgs[ros_messages_cx
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/lagadic/vision_visp/archive/kinetic-0.10.0.tar.gz -> vision_visp-0.10.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=256629f6fe483331bd184b123c946fa8
diff --git a/metadata/md5-cache/dev-ros/visp_camera_calibration-9999 b/metadata/md5-cache/dev-ros/visp_camera_calibration-9999
index 5b81d659918e..6b801d828051 100644
--- a/metadata/md5-cache/dev-ros/visp_camera_calibration-9999
+++ b/metadata/md5-cache/dev-ros/visp_camera_calibration-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-ros/camera_calibration_parsers dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/visp_bridge sci-libs/ViSP:= 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(-)] 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/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=256629f6fe483331bd184b123c946fa8
diff --git a/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-0.10.0 b/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-0.10.0
index f1dc958b08ae..dd04cd7a8854 100644
--- a/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-0.10.0
+++ b/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-0.10.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/image_proc dev-ros/roscpp dev-ros/sensor_msgs dev-ros/visp_bridg
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/lagadic/vision_visp/archive/kinetic-0.10.0.tar.gz -> vision_visp-0.10.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7b4c32c87b2a95454b8009895b68e40d
diff --git a/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-9999 b/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-9999
index 1d402c872856..23ac89fbfe42 100644
--- a/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-9999
+++ b/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-ros/image_proc dev-ros/roscpp dev-ros/sensor_msgs dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=7b4c32c87b2a95454b8009895b68e40d
diff --git a/metadata/md5-cache/dev-ros/visp_tracker-0.10.0-r2 b/metadata/md5-cache/dev-ros/visp_tracker-0.10.0-r2
index cdf0286aed3a..942edffae2d1 100644
--- a/metadata/md5-cache/dev-ros/visp_tracker-0.10.0-r2
+++ b/metadata/md5-cache/dev-ros/visp_tracker-0.10.0-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure dev-ros/geometry_m
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/lagadic/vision_visp/archive/kinetic-0.10.0.tar.gz -> vision_visp-0.10.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9bde53a0e1fc40605d3b2a7f265d2dea
diff --git a/metadata/md5-cache/dev-ros/visp_tracker-9999 b/metadata/md5-cache/dev-ros/visp_tracker-9999
index 009d7d1954f9..c9c0c239758a 100644
--- a/metadata/md5-cache/dev-ros/visp_tracker-9999
+++ b/metadata/md5-cache/dev-ros/visp_tracker-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_proc dev-ros/image_transport dev-ros/nodelet dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/ViSP:=[opencv,X] dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=9bde53a0e1fc40605d3b2a7f265d2dea
diff --git a/metadata/md5-cache/dev-ros/visualization_marker_tutorials-0.10.1 b/metadata/md5-cache/dev-ros/visualization_marker_tutorials-0.10.1
index 8e8e99508f66..9b396a554406 100644
--- a/metadata/md5-cache/dev-ros/visualization_marker_tutorials-0.10.1
+++ b/metadata/md5-cache/dev-ros/visualization_marker_tutorials-0.10.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] python_ta
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.10.1.tar.gz -> visualization_tutorials-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e90f4ff39494b7440725770643da75d9
diff --git a/metadata/md5-cache/dev-ros/visualization_marker_tutorials-0.10.2 b/metadata/md5-cache/dev-ros/visualization_marker_tutorials-0.10.2
index 8e332be6a6ce..8333c81f9ee2 100644
--- a/metadata/md5-cache/dev-ros/visualization_marker_tutorials-0.10.2
+++ b/metadata/md5-cache/dev-ros/visualization_marker_tutorials-0.10.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] python_ta
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.10.2.tar.gz -> visualization_tutorials-0.10.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=5e67cd4682f928841e33af43086edb2c
diff --git a/metadata/md5-cache/dev-ros/visualization_marker_tutorials-0.10.3 b/metadata/md5-cache/dev-ros/visualization_marker_tutorials-0.10.3
index 53aef7097b04..819f52a00b45 100644
--- a/metadata/md5-cache/dev-ros/visualization_marker_tutorials-0.10.3
+++ b/metadata/md5-cache/dev-ros/visualization_marker_tutorials-0.10.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] python_ta
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.10.3.tar.gz -> visualization_tutorials-0.10.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5e67cd4682f928841e33af43086edb2c
diff --git a/metadata/md5-cache/dev-ros/visualization_marker_tutorials-0.9.2 b/metadata/md5-cache/dev-ros/visualization_marker_tutorials-0.9.2
index 70a967ffb60c..396dd7593fa3 100644
--- a/metadata/md5-cache/dev-ros/visualization_marker_tutorials-0.9.2
+++ b/metadata/md5-cache/dev-ros/visualization_marker_tutorials-0.9.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] python_ta
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.9.2.tar.gz -> visualization_tutorials-0.9.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=e90f4ff39494b7440725770643da75d9
diff --git a/metadata/md5-cache/dev-ros/visualization_marker_tutorials-9999 b/metadata/md5-cache/dev-ros/visualization_marker_tutorials-9999
index 156412f5cf76..632050eb24d7 100644
--- a/metadata/md5-cache/dev-ros/visualization_marker_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/visualization_marker_tutorials-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=e90f4ff39494b7440725770643da75d9
diff --git a/metadata/md5-cache/dev-ros/visualization_msgs-1.12.5 b/metadata/md5-cache/dev-ros/visualization_msgs-1.12.5
index 83bd56c7a4f0..5b4b8c1c9eee 100644
--- a/metadata/md5-cache/dev-ros/visualization_msgs-1.12.5
+++ b/metadata/md5-cache/dev-ros/visualization_msgs-1.12.5
@@ -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/ros/common_msgs/archive/1.12.5.tar.gz -> common_msgs-1.12.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=08873df953cc456f144f27d5c57b9f8f
diff --git a/metadata/md5-cache/dev-ros/visualization_msgs-1.12.6 b/metadata/md5-cache/dev-ros/visualization_msgs-1.12.6
index 11fb9cbb5f7f..c31d6aa29193 100644
--- a/metadata/md5-cache/dev-ros/visualization_msgs-1.12.6
+++ b/metadata/md5-cache/dev-ros/visualization_msgs-1.12.6
@@ -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/ros/common_msgs/archive/1.12.6.tar.gz -> common_msgs-1.12.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3c4fb13ad49c14dcf343d985e6ec3c7c
diff --git a/metadata/md5-cache/dev-ros/visualization_msgs-9999 b/metadata/md5-cache/dev-ros/visualization_msgs-9999
index b8f340a745fd..fdd3f5cfce20 100644
--- a/metadata/md5-cache/dev-ros/visualization_msgs-9999
+++ b/metadata/md5-cache/dev-ros/visualization_msgs-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=08873df953cc456f144f27d5c57b9f8f
diff --git a/metadata/md5-cache/dev-ros/voxel_grid-1.15.2 b/metadata/md5-cache/dev-ros/voxel_grid-1.15.2
index e76058aa55e7..df205581c1d3 100644
--- a/metadata/md5-cache/dev-ros/voxel_grid-1.15.2
+++ b/metadata/md5-cache/dev-ros/voxel_grid-1.15.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.15.2.tar.gz -> navigation-1.15.2.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7a3b333f83f6dfe5a0782e85e11a567f
diff --git a/metadata/md5-cache/dev-ros/voxel_grid-1.16.0 b/metadata/md5-cache/dev-ros/voxel_grid-1.16.0
index 1914c21d39d8..5e366f494797 100644
--- a/metadata/md5-cache/dev-ros/voxel_grid-1.16.0
+++ b/metadata/md5-cache/dev-ros/voxel_grid-1.16.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.0.tar.gz -> navigation-1.16.0.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7a3b333f83f6dfe5a0782e85e11a567f
diff --git a/metadata/md5-cache/dev-ros/voxel_grid-1.16.1 b/metadata/md5-cache/dev-ros/voxel_grid-1.16.1
index 60adb2a4d186..85f273aeb40b 100644
--- a/metadata/md5-cache/dev-ros/voxel_grid-1.16.1
+++ b/metadata/md5-cache/dev-ros/voxel_grid-1.16.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.1.tar.gz -> navigation-1.16.1.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7a3b333f83f6dfe5a0782e85e11a567f
diff --git a/metadata/md5-cache/dev-ros/voxel_grid-1.16.2 b/metadata/md5-cache/dev-ros/voxel_grid-1.16.2
index 6c503b31f13d..c475dcfbcc9e 100644
--- a/metadata/md5-cache/dev-ros/voxel_grid-1.16.2
+++ b/metadata/md5-cache/dev-ros/voxel_grid-1.16.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz -> navigation-1.16.2.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7a3b333f83f6dfe5a0782e85e11a567f
diff --git a/metadata/md5-cache/dev-ros/voxel_grid-9999 b/metadata/md5-cache/dev-ros/voxel_grid-9999
index ac0f9233da5d..a96f79bbefa6 100644
--- a/metadata/md5-cache/dev-ros/voxel_grid-9999
+++ b/metadata/md5-cache/dev-ros/voxel_grid-9999
@@ -8,5 +8,5 @@ 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=8c00c2053caf79fa8fc2b49253711d6f
diff --git a/metadata/md5-cache/dev-ros/xacro-1.13.0 b/metadata/md5-cache/dev-ros/xacro-1.13.0
index 5851d200d0a9..cbf7dd9cc316 100644
--- a/metadata/md5-cache/dev-ros/xacro-1.13.0
+++ b/metadata/md5-cache/dev-ros/xacro-1.13.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslint[python_targets_python2_7(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/xacro/archive/1.13.0.tar.gz -> xacro-1.13.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2382b53167f5ef64ad129a239dab5939
diff --git a/metadata/md5-cache/dev-ros/xacro-1.13.1 b/metadata/md5-cache/dev-ros/xacro-1.13.1
index b261c6b98373..0a943a99d0ce 100644
--- a/metadata/md5-cache/dev-ros/xacro-1.13.1
+++ b/metadata/md5-cache/dev-ros/xacro-1.13.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslint[python_targets_python2_7(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/xacro/archive/1.13.1.tar.gz -> xacro-1.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2382b53167f5ef64ad129a239dab5939
diff --git a/metadata/md5-cache/dev-ros/xacro-1.13.2 b/metadata/md5-cache/dev-ros/xacro-1.13.2
index d304e410a9f9..1092a6750976 100644
--- a/metadata/md5-cache/dev-ros/xacro-1.13.2
+++ b/metadata/md5-cache/dev-ros/xacro-1.13.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslint[python_targets_python2_7(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/xacro/archive/1.13.2.tar.gz -> xacro-1.13.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=2382b53167f5ef64ad129a239dab5939
diff --git a/metadata/md5-cache/dev-ros/xacro-9999 b/metadata/md5-cache/dev-ros/xacro-9999
index d05b0b940c9a..cc364adcd151 100644
--- a/metadata/md5-cache/dev-ros/xacro-9999
+++ b/metadata/md5-cache/dev-ros/xacro-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roslint[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[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_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=22192a729a877cfe67437260c59b495b
diff --git a/metadata/md5-cache/dev-ros/xmlrpcpp-1.14.2 b/metadata/md5-cache/dev-ros/xmlrpcpp-1.14.2
index 9ba2148a28da..ffc425969f2b 100644
--- a/metadata/md5-cache/dev-ros/xmlrpcpp-1.14.2
+++ b/metadata/md5-cache/dev-ros/xmlrpcpp-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common python_targets_python2_7? ( >=dev-lang/python-2.7.5-r
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.2.tar.gz -> ros_comm-1.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=6c9dcddaab2b3dcfa90c57072244d64f
diff --git a/metadata/md5-cache/dev-ros/xmlrpcpp-1.14.3 b/metadata/md5-cache/dev-ros/xmlrpcpp-1.14.3
index a89ad3716411..f5394bf62bb1 100644
--- a/metadata/md5-cache/dev-ros/xmlrpcpp-1.14.3
+++ b/metadata/md5-cache/dev-ros/xmlrpcpp-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common python_targets_python2_7? ( >=dev-lang/python-2.7.5-r
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6c9dcddaab2b3dcfa90c57072244d64f
diff --git a/metadata/md5-cache/dev-ros/xmlrpcpp-9999 b/metadata/md5-cache/dev-ros/xmlrpcpp-9999
index 42e97daa4c72..95cbcdf592eb 100644
--- a/metadata/md5-cache/dev-ros/xmlrpcpp-9999
+++ b/metadata/md5-cache/dev-ros/xmlrpcpp-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/cpp_common python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=7b0cf58958a93775abc9efb7ef9e4f7b
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 612d408e6e39..e6bf4231366a 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/ed25519-1.2.4 b/metadata/md5-cache/dev-ruby/ed25519-1.2.4
index 5409928ee666..bbac0f0aca99 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
+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=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_=f9af80216c7f331411b0f1bc36bb2555
+_md5_=385530115cafd7d9666f4eac4c1647db
diff --git a/metadata/md5-cache/dev-ruby/facter-3.11.3-r1 b/metadata/md5-cache/dev-ruby/facter-3.11.3-r1
index b3b4c4ed9657..98075a1cbd7b 100644
--- a/metadata/md5-cache/dev-ruby/facter-3.11.3-r1
+++ b/metadata/md5-cache/dev-ruby/facter-3.11.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/leatherman-1.0.0:= dev-libs/openssl:* sys-apps/util-linux app
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
index 5d506966e344..c1b8a604232b 100644
--- a/metadata/md5-cache/dev-ruby/facter-3.11.4
+++ b/metadata/md5-cache/dev-ruby/facter-3.11.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/leatherman-1.0.0:= dev-libs/openssl:* sys-apps/util-linux app
 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	89bb9f083a2590d9b447fd0b78a96186
+_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 d3c01ad092e3..959a9199c35f 100644
--- a/metadata/md5-cache/dev-ruby/facter-3.12.0
+++ b/metadata/md5-cache/dev-ruby/facter-3.12.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/leatherman-1.0.0:= dev-libs/openssl:* sys-apps/util-linux app
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-ruby/facter-3.9.2 b/metadata/md5-cache/dev-ruby/facter-3.9.2
index 42a10fc8a334..d5f433bfddcf 100644
--- a/metadata/md5-cache/dev-ruby/facter-3.9.2
+++ b/metadata/md5-cache/dev-ruby/facter-3.9.2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/facter/archive/3.9.2.tar.gz -> facter-3.9.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1f177701d6330b06bbeab34a0d92c407
diff --git a/metadata/md5-cache/dev-ruby/facter-9999 b/metadata/md5-cache/dev-ruby/facter-9999
index 296fccaf2ccb..b4f4f4f5bfb1 100644
--- a/metadata/md5-cache/dev-ruby/facter-9999
+++ b/metadata/md5-cache/dev-ruby/facter-9999
@@ -8,5 +8,5 @@ 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
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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
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 6c5aeefbd215..3c06e266012e 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
+KEYWORDS=~amd64 ~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_=bea00eb6abbcd2843b76b98ac6a5b11e
+_md5_=d4e546f66ea72d4d57d2592f36d57e9f
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index a4fabc78d4dd..d27f9987afc4 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/guile-2.0.13-r2 b/metadata/md5-cache/dev-scheme/guile-2.0.13-r2
index d8a1ecf16d09..ed8a69ac75d9 100644
--- a/metadata/md5-cache/dev-scheme/guile-2.0.13-r2
+++ b/metadata/md5-cache/dev-scheme/guile-2.0.13-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/boehm-gc-7.0:=[threads?] dev-libs/gmp:= virtual/libffi dev-libs/libltdl:= dev-libs/libunistring:0= sys-devel/libtool sys-libs/ncurses:0= sys-libs/readline:0= virtual/pkgconfig sys-apps/texinfo 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
+DEPEND=>=dev-libs/boehm-gc-7.0:=[threads?] dev-libs/gmp:= virtual/libffi:= dev-libs/libltdl:= dev-libs/libunistring:0= sys-devel/libtool sys-libs/ncurses:0= sys-libs/readline:0= virtual/pkgconfig sys-apps/texinfo 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=GNU Ubiquitous Intelligent Language for Extensions
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/guile/
 IUSE=debug debug-malloc +deprecated +networking +nls +regex +threads
 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=LGPL-3+
-RDEPEND=>=dev-libs/boehm-gc-7.0:=[threads?] dev-libs/gmp:= virtual/libffi dev-libs/libltdl:= dev-libs/libunistring:0= sys-devel/libtool sys-libs/ncurses:0= sys-libs/readline:0=
+RDEPEND=>=dev-libs/boehm-gc-7.0:=[threads?] dev-libs/gmp:= virtual/libffi:= dev-libs/libltdl:= dev-libs/libunistring:0= sys-devel/libtool sys-libs/ncurses:0= sys-libs/readline:0=
 REQUIRED_USE=regex
 SLOT=12/22
 SRC_URI=mirror://gnu/guile/guile-2.0.13.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_=b283ceabe4576c3e669dbb6714be40c9
+_md5_=5f01b0fd713e7c31a9154bb4af1d4c21
diff --git a/metadata/md5-cache/dev-scheme/guile-2.0.14-r3 b/metadata/md5-cache/dev-scheme/guile-2.0.14-r3
index 8a748c2f5932..313ac745a0e2 100644
--- a/metadata/md5-cache/dev-scheme/guile-2.0.14-r3
+++ b/metadata/md5-cache/dev-scheme/guile-2.0.14-r3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/boehm-gc-7.0:=[threads?] dev-libs/gmp:= virtual/libffi dev-libs/libltdl:= dev-libs/libunistring:0= sys-devel/libtool sys-libs/ncurses:0= sys-libs/readline:0= virtual/pkgconfig sys-apps/texinfo 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
+DEPEND=>=dev-libs/boehm-gc-7.0:=[threads?] dev-libs/gmp:= virtual/libffi:= dev-libs/libltdl:= dev-libs/libunistring:0= sys-devel/libtool sys-libs/ncurses:0= sys-libs/readline:0= virtual/pkgconfig sys-apps/texinfo 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=GNU Ubiquitous Intelligent Language for Extensions
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/guile/
 IUSE=debug debug-malloc +deprecated +networking +nls +regex +threads
 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=LGPL-3+
-RDEPEND=>=dev-libs/boehm-gc-7.0:=[threads?] dev-libs/gmp:= virtual/libffi dev-libs/libltdl:= dev-libs/libunistring:0= sys-devel/libtool sys-libs/ncurses:0= sys-libs/readline:0=
+RDEPEND=>=dev-libs/boehm-gc-7.0:=[threads?] dev-libs/gmp:= virtual/libffi:= dev-libs/libltdl:= dev-libs/libunistring:0= sys-devel/libtool sys-libs/ncurses:0= sys-libs/readline:0=
 REQUIRED_USE=regex
 SLOT=12/22
 SRC_URI=mirror://gnu/guile/guile-2.0.14.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_=14df97ad4124412a5d2ea60ac760726a
+_md5_=784568b20bb7e6054a61e2ca23a23996
diff --git a/metadata/md5-cache/dev-scheme/guile-2.2.3 b/metadata/md5-cache/dev-scheme/guile-2.2.3
index 3ed44a03f141..41612714258d 100644
--- a/metadata/md5-cache/dev-scheme/guile-2.2.3
+++ b/metadata/md5-cache/dev-scheme/guile-2.2.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/boehm-gc-7.0:=[threads?] dev-libs/gmp:= virtual/libffi dev-libs/libltdl:= dev-libs/libunistring:0= sys-devel/libtool sys-libs/ncurses:0= sys-libs/readline:0= virtual/pkgconfig sys-apps/texinfo sys-devel/gettext
+DEPEND=>=dev-libs/boehm-gc-7.0:=[threads?] dev-libs/gmp:= virtual/libffi:= dev-libs/libltdl:= dev-libs/libunistring:0= sys-devel/libtool sys-libs/ncurses:0= sys-libs/readline:0= virtual/pkgconfig sys-apps/texinfo sys-devel/gettext
 DESCRIPTION=GNU Ubiquitous Intelligent Language for Extensions
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/guile/
 IUSE=debug debug-malloc +deprecated +networking +nls +regex +threads
 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=LGPL-3+
-RDEPEND=>=dev-libs/boehm-gc-7.0:=[threads?] dev-libs/gmp:= virtual/libffi dev-libs/libltdl:= dev-libs/libunistring:0= sys-devel/libtool sys-libs/ncurses:0= sys-libs/readline:0=
+RDEPEND=>=dev-libs/boehm-gc-7.0:=[threads?] dev-libs/gmp:= virtual/libffi:= dev-libs/libltdl:= dev-libs/libunistring:0= sys-devel/libtool sys-libs/ncurses:0= sys-libs/readline:0=
 REQUIRED_USE=regex
 RESTRICT=strip
 SLOT=12/2.2-1
 SRC_URI=mirror://gnu/guile/guile-2.2.3.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_=80ffc5748afe288dd37fefb9cd2d37b1
+_md5_=b37b10fecb1277a06c3e9c5f20af9f47
diff --git a/metadata/md5-cache/dev-tcltk/Manifest.gz b/metadata/md5-cache/dev-tcltk/Manifest.gz
index 5637d69b0710..c18f99bba00c 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/expect-5.45.4 b/metadata/md5-cache/dev-tcltk/expect-5.45.4
index f8e7ee472df7..47acb1cfae41 100644
--- a/metadata/md5-cache/dev-tcltk/expect-5.45.4
+++ b/metadata/md5-cache/dev-tcltk/expect-5.45.4
@@ -10,4 +10,4 @@ RDEPEND=>=dev-lang/tcl-8.2:0[threads?]
 SLOT=0
 SRC_URI=mirror://sourceforge/expect/expect5.45.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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3b3990bce25d84b094ed3341fd7f36e5
+_md5_=214ff4e364f200cd9b29c1280dca6756
diff --git a/metadata/md5-cache/dev-tcltk/iwidgets-4.1.1 b/metadata/md5-cache/dev-tcltk/iwidgets-4.1.1
new file mode 100644
index 000000000000..3bfa320e4b93
--- /dev/null
+++ b/metadata/md5-cache/dev-tcltk/iwidgets-4.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>=dev-tcltk/itcl-4.0.3 >=dev-tcltk/itk-4.0.1
+DESCRIPTION=Widget collection for incrTcl/incrTk
+EAPI=6
+HOMEPAGE=http://incrtcl.sourceforge.net/itcl/
+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
+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
diff --git a/metadata/md5-cache/dev-tcltk/snack-2.2.10-r6 b/metadata/md5-cache/dev-tcltk/snack-2.2.10-r6
index 94b1f1074d82..f6ceb4aa22c0 100644
--- a/metadata/md5-cache/dev-tcltk/snack-2.2.10-r6
+++ b/metadata/md5-cache/dev-tcltk/snack-2.2.10-r6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.speech.kth.se/snack/dist/snack2.2.10.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	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_=51c6d0f0061f093d36a7e91fb76153b3
diff --git a/metadata/md5-cache/dev-tcltk/snack-2.2.10-r7 b/metadata/md5-cache/dev-tcltk/snack-2.2.10-r7
new file mode 100644
index 000000000000..e75402848da2
--- /dev/null
+++ b/metadata/md5-cache/dev-tcltk/snack-2.2.10-r7
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/tcl:0= dev-lang/tk:0= alsa? ( media-libs/alsa-lib ) python? ( 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(-)] ) vorbis? ( media-libs/libvorbis ) >=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_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=The Snack Sound Toolkit (Tcl)
+EAPI=6
+HOMEPAGE=http://www.speech.kth.se/snack/
+IUSE=alsa examples python vorbis python_targets_pypy python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=dev-lang/tcl:0= dev-lang/tk:0= alsa? ( media-libs/alsa-lib ) python? ( 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(-)] ) vorbis? ( media-libs/libvorbis ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.speech.kth.se/snack/dist/snack2.2.10.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=cd3cdeef7f2bf831985a50b5ab1bd747
diff --git a/metadata/md5-cache/dev-tcltk/tclperl-3.2-r1 b/metadata/md5-cache/dev-tcltk/tclperl-3.2-r1
index 50be44aa2f83..1799b5de6288 100644
--- a/metadata/md5-cache/dev-tcltk/tclperl-3.2-r1
+++ b/metadata/md5-cache/dev-tcltk/tclperl-3.2-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install
-DEPEND=>=dev-lang/tcl-8.3.3:0 >=dev-lang/perl-5.6.0
+DEPEND=>=dev-lang/tcl-8.3.3:0 >=dev-lang/perl-5.6.0 sys-libs/binutils-libs
 DESCRIPTION=Perl package for Tcl
 EAPI=5
 HOMEPAGE=http://jfontain.free.fr/tclperl.htm
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
-RDEPEND=>=dev-lang/tcl-8.3.3:0 >=dev-lang/perl-5.6.0
+RDEPEND=>=dev-lang/tcl-8.3.3:0 >=dev-lang/perl-5.6.0 sys-libs/binutils-libs
 SLOT=0
 SRC_URI=http://jfontain.free.fr/tclperl-3.2.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_=4338eb3731dd94a147d0a7b0b27ed286
+_md5_=0681aa73dce71d371d707048a9962f3c
diff --git a/metadata/md5-cache/dev-tcltk/tkimg-1.4.7 b/metadata/md5-cache/dev-tcltk/tkimg-1.4.7
new file mode 100644
index 000000000000..a7cb463f4002
--- /dev/null
+++ b/metadata/md5-cache/dev-tcltk/tkimg-1.4.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare
+DEPEND=dev-lang/tk:= >=dev-tcltk/tcllib-1.11 media-libs/tiff:0= >=media-libs/libpng-1.6:0= >=sys-libs/zlib-1.2.7:= x11-libs/libX11 virtual/jpeg:= test? ( x11-apps/xhost media-fonts/font-misc-misc media-fonts/font-cursor-misc ) >=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=Adds a lot of image formats to Tcl/Tk
+EAPI=6
+HOMEPAGE=http://tkimg.sourceforge.net/
+IUSE=doc test static-libs test
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-lang/tk:= >=dev-tcltk/tcllib-1.11 media-libs/tiff:0= >=media-libs/libpng-1.6:0= >=sys-libs/zlib-1.2.7:= x11-libs/libX11 virtual/jpeg:=
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/tkimg/tkimg/1.4/tkimg%201.4.7/Img-Source-1.4.7.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=684a802e70ca107aa6837c8129e73dfb
diff --git a/metadata/md5-cache/dev-tex/Manifest.gz b/metadata/md5-cache/dev-tex/Manifest.gz
index 4d71ee1c683c..bdf26ac4b829 100644
--- a/metadata/md5-cache/dev-tex/Manifest.gz
+++ b/metadata/md5-cache/dev-tex/Manifest.gz
diff --git a/metadata/md5-cache/dev-tex/dot2tex-2.9.0 b/metadata/md5-cache/dev-tex/dot2tex-2.9.0
index 10addc66c32f..27d494cd98b7 100644
--- a/metadata/md5-cache/dev-tex/dot2tex-2.9.0
+++ b/metadata/md5-cache/dev-tex/dot2tex-2.9.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pydot[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/kjellmf/dot2tex/archive/2.9.0.tar.gz -> dot2tex-2.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c161be1b02f1c1a4927f3a241e26a74e
diff --git a/metadata/md5-cache/dev-tex/pscyr-0.4d_beta9 b/metadata/md5-cache/dev-tex/pscyr-0.4d_beta9
index edc8aa4f93fd..1ecd393d5034 100644
--- a/metadata/md5-cache/dev-tex/pscyr-0.4d_beta9
+++ b/metadata/md5-cache/dev-tex/pscyr-0.4d_beta9
@@ -3,10 +3,10 @@ DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=Type1 cyrillic fonts collection
 EAPI=4
 HOMEPAGE=ftp://scon155.phys.msu.su/pub/russian/psfonts/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LPPL-1.2
 RDEPEND=virtual/latex-base
 SLOT=0
 SRC_URI=ftp://scon155.phys.msu.su/pub/russian/psfonts/0.4d-beta/PSCyr-0.4-beta9-tex.tar.gz ftp://scon155.phys.msu.su/pub/russian/psfonts/0.4d-beta/PSCyr-0.4-beta9-type1.tar.gz
 _eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	latex-package	17f13abe0de88340745e52e6b627aee7	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5839289e2d9a316ea69bd2fd3bf30f45
+_md5_=1c02bd6143f0d737582d8c912c9fb793
diff --git a/metadata/md5-cache/dev-tex/rubber-1.4 b/metadata/md5-cache/dev-tex/rubber-1.4
index 3d6225a0e5ce..f9aceaa02e97 100644
--- a/metadata/md5-cache/dev-tex/rubber-1.4
+++ b/metadata/md5-cache/dev-tex/rubber-1.4
@@ -10,5 +10,5 @@ RDEPEND=virtual/latex-base python_targets_python2_7? ( >=dev-lang/python-2.7.5-r
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://launchpad.net/rubber/trunk/1.4/+download/rubber-1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1831ddfb9e06fa32afbccc5f2aaac95e
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 741b43d5c98e..29c1e03cc630 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.4.5-r3 b/metadata/md5-cache/dev-util/Orange-3.4.5-r3
index 8b25f937f8c1..887fd627cf1a 100644
--- a/metadata/md5-cache/dev-util/Orange-3.4.5-r3
+++ b/metadata/md5-cache/dev-util/Orange-3.4.5-r3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/anyqt[python_targets_python3_4(-)?,python_targets_python3_5(-
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-util/android-tools-8.1.0_p1 b/metadata/md5-cache/dev-util/android-tools-8.1.0_p1
index dd39bdd40d35..c23951c852b2 100644
--- a/metadata/md5-cache/dev-util/android-tools-8.1.0_p1
+++ b/metadata/md5-cache/dev-util/android-tools-8.1.0_p1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 BSD-2
 RDEPEND=sys-libs/zlib:= dev-libs/libpcre2:= virtual/libusb:1= 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(-)] )
 SLOT=0
 SRC_URI=https://git.archlinux.org/svntogit/community.git/snapshot/community-2b7f9774cc468205fec145e64e9103aee8e5c6f9.tar.gz -> android-tools-8.1.0_r1-arch.tar.gz https://github.com/android/platform_system_core/archive/android-8.1.0_r1.tar.gz -> android-tools-8.1.0_r1-core.tar.gz https://github.com/google/boringssl/archive/14308731e5446a73ac2258688a9688b524483cb6.tar.gz -> boringssl-14308731e5446a73ac2258688a9688b524483cb6.tar.gz mirror://gentoo/android-tools-8.1.0_r1-extras.tar.xz https://dev.gentoo.org/~vapier/dist/android-tools-8.1.0_r1-extras.tar.xz mirror://gentoo/android-tools-8.1.0_r1-selinux.tar.xz https://dev.gentoo.org/~vapier/dist/android-tools-8.1.0_r1-selinux.tar.xz mirror://gentoo/android-tools-8.1.0_r1-f2fs-tools.tar.xz https://dev.gentoo.org/~vapier/dist/android-tools-8.1.0_r1-f2fs-tools.tar.xz mirror://gentoo/android-tools-8.1.0_r1.ninja.xz https://dev.gentoo.org/~vapier/dist/android-tools-8.1.0_r1.ninja.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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_=b2758f22dcd58ddcbce8b2e9f9acd663
diff --git a/metadata/md5-cache/dev-util/anjuta-3.22.0 b/metadata/md5-cache/dev-util/anjuta-3.22.0
index 7c5e27087ea4..d4e273106ef8 100644
--- a/metadata/md5-cache/dev-util/anjuta-3.22.0
+++ b/metadata/md5-cache/dev-util/anjuta-3.22.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.34:2[dbus] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.10:
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://gnome/sources/anjuta/3.22/anjuta-3.22.0.tar.xz
-_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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=600a810138a3227cc0a8f4aaeaf4cc32
diff --git a/metadata/md5-cache/dev-util/anjuta-3.28.0 b/metadata/md5-cache/dev-util/anjuta-3.28.0
index 83554f478f2d..c07c2be82bc1 100644
--- a/metadata/md5-cache/dev-util/anjuta-3.28.0
+++ b/metadata/md5-cache/dev-util/anjuta-3.28.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.34:2[dbus] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.10:
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://gnome/sources/anjuta/3.28/anjuta-3.28.0.tar.xz
-_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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=73e4ca8cadf12d323d6859a120bbfb32
diff --git a/metadata/md5-cache/dev-util/apitrace-7.1-r1 b/metadata/md5-cache/dev-util/apitrace-7.1-r1
index ed100c05b692..20857cb2570e 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _md5_=36bd35a6f76e87dd90c9133ddf85d655
diff --git a/metadata/md5-cache/dev-util/argouml-0.34 b/metadata/md5-cache/dev-util/argouml-0.34
index ff3b54d27610..ae1b5a4a82d6 100644
--- a/metadata/md5-cache/dev-util/argouml-0.34
+++ b/metadata/md5-cache/dev-util/argouml-0.34
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=http://argouml-downloads.tigris.org/nonav/argouml-0.34/ArgoUML-0.34.tar.gz http://argouml-downloads.tigris.org/nonav/argouml-db-1.0/dbuml-module-1.0.4.zip doc? ( http://argouml-downloads.tigris.org/nonav/argouml-0.34/manual-0.34.pdf http://argouml-downloads.tigris.org/nonav/argouml-0.34/quickguide-0.34.pdf )
-_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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=41399d11164547d708f4bb5e7836009f
diff --git a/metadata/md5-cache/dev-util/bats-0.4.0_p20170219 b/metadata/md5-cache/dev-util/bats-0.4.0_p20170219
index 6b182247a062..6c1a1819222f 100644
--- a/metadata/md5-cache/dev-util/bats-0.4.0_p20170219
+++ b/metadata/md5-cache/dev-util/bats-0.4.0_p20170219
@@ -2,8 +2,8 @@ DEFINED_PHASES=install test
 DESCRIPTION=An automated testing system for bash
 EAPI=6
 HOMEPAGE=https://github.com/sstephenson/bats/
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/sstephenson/bats/archive/03608115df2071fff4eaaff1605768c275e5f81f.tar.gz -> bats-0.4.0_p20170219.tar.gz
-_md5_=99f2dd80d59dd5bc46545573a4aee88a
+_md5_=a282f903e1dfe0804cfde5e6dd36fbf2
diff --git a/metadata/md5-cache/dev-util/bazel-0.16.0 b/metadata/md5-cache/dev-util/bazel-0.16.0
deleted file mode 100644
index a2788355f50e..000000000000
--- a/metadata/md5-cache/dev-util/bazel-0.16.0
+++ /dev/null
@@ -1,14 +0,0 @@
-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.16.0/bazel-0.16.0-dist.zip https://github.com/google/desugar_jdk_libs/archive/f5e6d80c6b4ec6b0a46603f72b015d45cf3c11cd.zip -> google-desugar_jdk_libs-f5e6d80c6b4ec6b0a46603f72b015d45cf3c11cd.zip https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-linux_x64-allmodules.tar.gz
-_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_=933ad89398b819aa53397da5cce5a8e5
diff --git a/metadata/md5-cache/dev-util/bazel-0.17.1 b/metadata/md5-cache/dev-util/bazel-0.17.1
deleted file mode 100644
index 6f512811bdd7..000000000000
--- a/metadata/md5-cache/dev-util/bazel-0.17.1
+++ /dev/null
@@ -1,14 +0,0 @@
-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.17.1/bazel-0.17.1-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_=8eeae4c3c17706040ea879d2e4cda86d
diff --git a/metadata/md5-cache/dev-util/bazel-0.17.2 b/metadata/md5-cache/dev-util/bazel-0.17.2
new file mode 100644
index 000000000000..9bb4959214d0
--- /dev/null
+++ b/metadata/md5-cache/dev-util/bazel-0.17.2
@@ -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.17.2/bazel-0.17.2-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_=8eeae4c3c17706040ea879d2e4cda86d
diff --git a/metadata/md5-cache/dev-util/bcc-0.5.0_p20171230 b/metadata/md5-cache/dev-util/bcc-0.5.0_p20171230
index 0c6f869601ea..0c366dbcc700 100644
--- a/metadata/md5-cache/dev-util/bcc-0.5.0_p20171230
+++ b/metadata/md5-cache/dev-util/bcc-0.5.0_p20171230
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iovisor/bcc/archive/82ef5a0d999b687d26059e5adfdaac3e605f2339.tar.gz -> bcc-0.5.0_p20171230.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b9ccfa5e1af189823d70a4d33c22ffc7
diff --git a/metadata/md5-cache/dev-util/bcc-0.6.0 b/metadata/md5-cache/dev-util/bcc-0.6.0
index 85ed60188ef7..f00aad7dc4cd 100644
--- a/metadata/md5-cache/dev-util/bcc-0.6.0
+++ b/metadata/md5-cache/dev-util/bcc-0.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iovisor/bcc/archive/v0.6.0.tar.gz -> bcc-0.6.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f5497fa616b2703b7e6da106f9e2f85f
diff --git a/metadata/md5-cache/dev-util/bitcoin-tx-0.16.0 b/metadata/md5-cache/dev-util/bitcoin-tx-0.16.0
deleted file mode 100644
index 9fc1e66eb268..000000000000
--- a/metadata/md5-cache/dev-util/bitcoin-tx-0.16.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare pretend
-DEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] dev-libs/univalue:= !libressl? ( dev-libs/openssl:0=[-bindist] ) 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=Command-line Bitcoin transaction tool
-EAPI=6
-HOMEPAGE=https://bitcoincore.org/ https://bitcoinknots.org/
-IUSE=knots libressl
-KEYWORDS=~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux
-LICENSE=MIT
-RDEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] dev-libs/univalue:= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= )
-SLOT=0
-SRC_URI=https://github.com/bitcoin/bitcoin/archive/4b4d7eb255ca8f9a94b92479e6061d129c91a991.tar.gz -> bitcoin-v0.16.0.tar.gz https://bitcoinknots.org/files/0.16.x/0.16.0.knots20180322/bitcoin-0.16.0.knots20180322.patches.txz -> bitcoin-0.16.0.knots20180322.patches.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=9b66491f9a76f7a59a344e1b213fa04a
diff --git a/metadata/md5-cache/dev-util/bitcoin-tx-0.16.3 b/metadata/md5-cache/dev-util/bitcoin-tx-0.16.3
index 1ccb52b82742..2c735c33e5aa 100644
--- a/metadata/md5-cache/dev-util/bitcoin-tx-0.16.3
+++ b/metadata/md5-cache/dev-util/bitcoin-tx-0.16.3
@@ -4,10 +4,10 @@ DESCRIPTION=Command-line Bitcoin transaction tool
 EAPI=6
 HOMEPAGE=https://bitcoincore.org/ https://bitcoinknots.org/
 IUSE=knots libressl
-KEYWORDS=amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] dev-libs/univalue:= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= )
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/49e34e288005a5b144a642e197b628396f5a0765.tar.gz -> bitcoin-v0.16.3.tar.gz https://bitcoinknots.org/files/0.16.x/0.16.3.knots20180918/bitcoin-0.16.3.knots20180918.patches.txz -> bitcoin-0.16.3.knots20180918.patches.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=d6b5092e729273b024982a003b909557
+_md5_=cd65bec5bea1bf97041d2bf6ec80eb85
diff --git a/metadata/md5-cache/dev-util/bite-9999 b/metadata/md5-cache/dev-util/bite-9999
index d876f21d3f5b..9455c3cb0ce2 100644
--- a/metadata/md5-cache/dev-util/bite-9999
+++ b/metadata/md5-cache/dev-util/bite-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-python/requests-2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/multidict[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/chardet[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/python-dateutil-2.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] app-crypt/gpgme[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] =dev-python/snakeoil-9999[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( 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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=39de652323c941eb53c443cb9e792bad
diff --git a/metadata/md5-cache/dev-util/bless-0.6.0-r2 b/metadata/md5-cache/dev-util/bless-0.6.0-r2
index 7bffab46e9fd..db770a23a722 100644
--- a/metadata/md5-cache/dev-util/bless-0.6.0-r2
+++ b/metadata/md5-cache/dev-util/bless-0.6.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/mono-1.1.14 >=dev-dotnet/gtk-sharp-2.12.21
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ikelos/devoverlay-distfiles/bless-0.6.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	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d3df14ca155fef0ee20a72af5452b939
diff --git a/metadata/md5-cache/dev-util/bless-0.6.0-r3 b/metadata/md5-cache/dev-util/bless-0.6.0-r3
index 11fc1bdf9d2d..8938bb72b4a2 100644
--- a/metadata/md5-cache/dev-util/bless-0.6.0-r3
+++ b/metadata/md5-cache/dev-util/bless-0.6.0-r3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/mono-1.1.14 >=dev-dotnet/gtk-sharp-2.12.21
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ikelos/devoverlay-distfiles/bless-0.6.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	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3a3ca6b7535d2b8e46a40485b4ffda53
diff --git a/metadata/md5-cache/dev-util/buildbot-0.8.12-r3 b/metadata/md5-cache/dev-util/buildbot-0.8.12-r3
index af4c469dc8e2..f37c9fa41a4a 100644
--- a/metadata/md5-cache/dev-util/buildbot-0.8.12-r3
+++ b/metadata/md5-cache/dev-util/buildbot-0.8.12-r3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/jinja-2.1[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot/buildbot-0.8.12.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	readme.gentoo	566393c426fca4615a83df9a982bb9d9	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	readme.gentoo	566393c426fca4615a83df9a982bb9d9	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6c60f2cc8f34700ef1c6777d2dba4fb6
diff --git a/metadata/md5-cache/dev-util/buildbot-0.9.12-r1 b/metadata/md5-cache/dev-util/buildbot-0.9.12-r1
index 512590546669..99ba9eeefa53 100644
--- a/metadata/md5-cache/dev-util/buildbot-0.9.12-r1
+++ b/metadata/md5-cache/dev-util/buildbot-0.9.12-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/jinja-2.1[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot/buildbot-0.9.12.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=836de42c545b1fe9e1eaa16f365b88c1
diff --git a/metadata/md5-cache/dev-util/buildbot-1.1.2 b/metadata/md5-cache/dev-util/buildbot-1.1.2
index 487694ea543d..d03e0b5cd105 100644
--- a/metadata/md5-cache/dev-util/buildbot-1.1.2
+++ b/metadata/md5-cache/dev-util/buildbot-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/jinja-2.1[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot/buildbot-1.1.2.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d40747de2db0d81d3c5b45b004f7b3ee
diff --git a/metadata/md5-cache/dev-util/buildbot-1.3.0 b/metadata/md5-cache/dev-util/buildbot-1.3.0
index c8090b9eb6cc..d4f208f92156 100644
--- a/metadata/md5-cache/dev-util/buildbot-1.3.0
+++ b/metadata/md5-cache/dev-util/buildbot-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/jinja-2.1[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot/buildbot-1.3.0.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=76328a0bfd132024c2db068097a3b6e9
diff --git a/metadata/md5-cache/dev-util/buildbot-9999 b/metadata/md5-cache/dev-util/buildbot-9999
index 63b9b8ae2a2a..d781444d95d9 100644
--- a/metadata/md5-cache/dev-util/buildbot-9999
+++ b/metadata/md5-cache/dev-util/buildbot-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-python/jinja-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/twisted-17.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/autobahn-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/sqlalchemy-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.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/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/python-dateutil-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/txaio-2.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/pyjwt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/zope-interface-4.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-util/buildbot-worker-9999[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] crypt? ( >=dev-python/twisted-17.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(-),crypt] >=dev-python/pyopenssl-16.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/idna[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/service_identity[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) irc? ( dev-python/txrequests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) docker? ( >=dev-python/docker-py-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(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=76328a0bfd132024c2db068097a3b6e9
diff --git a/metadata/md5-cache/dev-util/buildbot-console-view-0.9.12 b/metadata/md5-cache/dev-util/buildbot-console-view-0.9.12
index 3ec5e32f6623..4082c9ccf7dd 100644
--- a/metadata/md5-cache/dev-util/buildbot-console-view-0.9.12
+++ b/metadata/md5-cache/dev-util/buildbot-console-view-0.9.12
@@ -10,5 +10,5 @@ RDEPEND=~dev-util/buildbot-0.9.12[python_targets_python2_7(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-console-view/buildbot-console-view-0.9.12.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fa9b41b14091b4ebe91c53066e52cb02
diff --git a/metadata/md5-cache/dev-util/buildbot-console-view-1.1.2 b/metadata/md5-cache/dev-util/buildbot-console-view-1.1.2
index 9c54026f265b..bc0222ec2326 100644
--- a/metadata/md5-cache/dev-util/buildbot-console-view-1.1.2
+++ b/metadata/md5-cache/dev-util/buildbot-console-view-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-util/buildbot-1.1.2[python_targets_python2_7(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-console-view/buildbot-console-view-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=72cc1a91c933bc9ead87dbae92985974
diff --git a/metadata/md5-cache/dev-util/buildbot-console-view-1.3.0 b/metadata/md5-cache/dev-util/buildbot-console-view-1.3.0
index 835acc21dd2c..21a1c8849194 100644
--- a/metadata/md5-cache/dev-util/buildbot-console-view-1.3.0
+++ b/metadata/md5-cache/dev-util/buildbot-console-view-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=~dev-util/buildbot-1.3.0[python_targets_python2_7(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-console-view/buildbot-console-view-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=72cc1a91c933bc9ead87dbae92985974
diff --git a/metadata/md5-cache/dev-util/buildbot-grid-view-0.9.12_p1 b/metadata/md5-cache/dev-util/buildbot-grid-view-0.9.12_p1
index 5cc1f9d24b90..e9358e59aaa4 100644
--- a/metadata/md5-cache/dev-util/buildbot-grid-view-0.9.12_p1
+++ b/metadata/md5-cache/dev-util/buildbot-grid-view-0.9.12_p1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-grid-view/buildbot-grid-view-0.9.12.post1.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=80c7ac142b740bdbe08112440380f196
diff --git a/metadata/md5-cache/dev-util/buildbot-grid-view-1.1.2 b/metadata/md5-cache/dev-util/buildbot-grid-view-1.1.2
index 23a9664f44bd..8a4e26dec458 100644
--- a/metadata/md5-cache/dev-util/buildbot-grid-view-1.1.2
+++ b/metadata/md5-cache/dev-util/buildbot-grid-view-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-grid-view/buildbot-grid-view-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ef3288e5f8f00d6bb353080d38e587db
diff --git a/metadata/md5-cache/dev-util/buildbot-grid-view-1.3.0 b/metadata/md5-cache/dev-util/buildbot-grid-view-1.3.0
index 5fe410ff5b2c..096a9feb68ef 100644
--- a/metadata/md5-cache/dev-util/buildbot-grid-view-1.3.0
+++ b/metadata/md5-cache/dev-util/buildbot-grid-view-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-grid-view/buildbot-grid-view-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ef3288e5f8f00d6bb353080d38e587db
diff --git a/metadata/md5-cache/dev-util/buildbot-pkg-0.9.12 b/metadata/md5-cache/dev-util/buildbot-pkg-0.9.12
index 56e6fcee15d0..bc2477a4fd11 100644
--- a/metadata/md5-cache/dev-util/buildbot-pkg-0.9.12
+++ b/metadata/md5-cache/dev-util/buildbot-pkg-0.9.12
@@ -10,5 +10,5 @@ RDEPEND=~dev-util/buildbot-0.9.12[python_targets_python2_7(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-pkg/buildbot-pkg-0.9.12.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=46b1d6f76a69f6776f954f48ed1ca917
diff --git a/metadata/md5-cache/dev-util/buildbot-pkg-1.1.2 b/metadata/md5-cache/dev-util/buildbot-pkg-1.1.2
index fbdc8d78e8ae..cd3a45909616 100644
--- a/metadata/md5-cache/dev-util/buildbot-pkg-1.1.2
+++ b/metadata/md5-cache/dev-util/buildbot-pkg-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-util/buildbot-1.1.2[python_targets_python2_7(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-pkg/buildbot-pkg-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=da4bc1796391bbb745ed183d6fa162d8
diff --git a/metadata/md5-cache/dev-util/buildbot-pkg-1.3.0 b/metadata/md5-cache/dev-util/buildbot-pkg-1.3.0
index a00475e48479..5ca3006a91a1 100644
--- a/metadata/md5-cache/dev-util/buildbot-pkg-1.3.0
+++ b/metadata/md5-cache/dev-util/buildbot-pkg-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=~dev-util/buildbot-1.3.0[python_targets_python2_7(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-pkg/buildbot-pkg-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=da4bc1796391bbb745ed183d6fa162d8
diff --git a/metadata/md5-cache/dev-util/buildbot-slave-0.8.12 b/metadata/md5-cache/dev-util/buildbot-slave-0.8.12
index cef029810098..7dc942c8b4e5 100644
--- a/metadata/md5-cache/dev-util/buildbot-slave-0.8.12
+++ b/metadata/md5-cache/dev-util/buildbot-slave-0.8.12
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-slave/buildbot-slave-0.8.12.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	readme.gentoo	566393c426fca4615a83df9a982bb9d9	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	readme.gentoo	566393c426fca4615a83df9a982bb9d9	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=63e712e16dbc7581de6e14af315faee6
diff --git a/metadata/md5-cache/dev-util/buildbot-waterfall-view-0.9.12 b/metadata/md5-cache/dev-util/buildbot-waterfall-view-0.9.12
index 5b1b4e089b8b..945d54be9baf 100644
--- a/metadata/md5-cache/dev-util/buildbot-waterfall-view-0.9.12
+++ b/metadata/md5-cache/dev-util/buildbot-waterfall-view-0.9.12
@@ -10,5 +10,5 @@ RDEPEND=~dev-util/buildbot-0.9.12[python_targets_python2_7(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-waterfall-view/buildbot-waterfall-view-0.9.12.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=82a412514081677fb95faa75067b3840
diff --git a/metadata/md5-cache/dev-util/buildbot-waterfall-view-1.1.2 b/metadata/md5-cache/dev-util/buildbot-waterfall-view-1.1.2
index bb0c21d5c8e5..8764f74ae47e 100644
--- a/metadata/md5-cache/dev-util/buildbot-waterfall-view-1.1.2
+++ b/metadata/md5-cache/dev-util/buildbot-waterfall-view-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=~dev-util/buildbot-1.1.2[python_targets_python2_7(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-waterfall-view/buildbot-waterfall-view-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=550e39bc62d015cd6163eac1eacea7d7
diff --git a/metadata/md5-cache/dev-util/buildbot-waterfall-view-1.3.0 b/metadata/md5-cache/dev-util/buildbot-waterfall-view-1.3.0
index 6d5b8768d1c9..994174c44506 100644
--- a/metadata/md5-cache/dev-util/buildbot-waterfall-view-1.3.0
+++ b/metadata/md5-cache/dev-util/buildbot-waterfall-view-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=~dev-util/buildbot-1.3.0[python_targets_python2_7(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-waterfall-view/buildbot-waterfall-view-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=550e39bc62d015cd6163eac1eacea7d7
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-0.9.12 b/metadata/md5-cache/dev-util/buildbot-worker-0.9.12
index d6c726f48632..238a126c3ab2 100644
--- a/metadata/md5-cache/dev-util/buildbot-worker-0.9.12
+++ b/metadata/md5-cache/dev-util/buildbot-worker-0.9.12
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targe
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-worker/buildbot-worker-0.9.12.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b535303e25ace8053e5941a08dfe9c6a
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-1.1.2 b/metadata/md5-cache/dev-util/buildbot-worker-1.1.2
index baf894d1dd67..5ce547f5f316 100644
--- a/metadata/md5-cache/dev-util/buildbot-worker-1.1.2
+++ b/metadata/md5-cache/dev-util/buildbot-worker-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targe
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-worker/buildbot-worker-1.1.2.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=40993df4c337c4ab3172dc191e03007a
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-1.3.0 b/metadata/md5-cache/dev-util/buildbot-worker-1.3.0
index f98fb9dfd628..4ef0a807bb2f 100644
--- a/metadata/md5-cache/dev-util/buildbot-worker-1.3.0
+++ b/metadata/md5-cache/dev-util/buildbot-worker-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targe
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-worker/buildbot-worker-1.3.0.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=40993df4c337c4ab3172dc191e03007a
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-9999 b/metadata/md5-cache/dev-util/buildbot-worker-9999
index 8c6cc07c5636..d6c7e50431a8 100644
--- a/metadata/md5-cache/dev-util/buildbot-worker-9999
+++ b/metadata/md5-cache/dev-util/buildbot-worker-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-python/setuptools-21.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/twisted-17.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/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-util/buildbot-0.9.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
-_eclasses_=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	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=40993df4c337c4ab3172dc191e03007a
diff --git a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-0.9.12 b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-0.9.12
index e7f66a96d0bc..492227bce69d 100644
--- a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-0.9.12
+++ b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-0.9.12
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0a5143bedc7656d6314189a79e2001f3
diff --git a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-1.1.2 b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-1.1.2
index 33dfae7eadc9..56201141b15d 100644
--- a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-1.1.2
+++ b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a9ef31d463083c5b094b452174343442
diff --git a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-1.3.0 b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-1.3.0
index ee5424e084ea..f41a2b654c12 100644
--- a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-1.3.0
+++ b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a9ef31d463083c5b094b452174343442
diff --git a/metadata/md5-cache/dev-util/buildbot-www-0.9.12 b/metadata/md5-cache/dev-util/buildbot-www-0.9.12
index fa187f333139..abc751164de1 100644
--- a/metadata/md5-cache/dev-util/buildbot-www-0.9.12
+++ b/metadata/md5-cache/dev-util/buildbot-www-0.9.12
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-www/buildbot-www-0.9.12.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8e4292c1b29287755123a88823a18d6e
diff --git a/metadata/md5-cache/dev-util/buildbot-www-1.1.2 b/metadata/md5-cache/dev-util/buildbot-www-1.1.2
index 7195272f047f..58cc97369129 100644
--- a/metadata/md5-cache/dev-util/buildbot-www-1.1.2
+++ b/metadata/md5-cache/dev-util/buildbot-www-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-www/buildbot-www-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7900405599d61a090b70b685844273bd
diff --git a/metadata/md5-cache/dev-util/buildbot-www-1.3.0 b/metadata/md5-cache/dev-util/buildbot-www-1.3.0
index 84c1a31eb7fc..b8b878186e17 100644
--- a/metadata/md5-cache/dev-util/buildbot-www-1.3.0
+++ b/metadata/md5-cache/dev-util/buildbot-www-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-www/buildbot-www-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7900405599d61a090b70b685844273bd
diff --git a/metadata/md5-cache/dev-util/bumpversion-0.5.3 b/metadata/md5-cache/dev-util/bumpversion-0.5.3
index c8d66acd5d22..2bc8244ab4a0 100644
--- a/metadata/md5-cache/dev-util/bumpversion-0.5.3
+++ b/metadata/md5-cache/dev-util/bumpversion-0.5.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/bumpversion/bumpversion-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fc7799d0484c42176d98b1990ca5fc1e
diff --git a/metadata/md5-cache/dev-util/cargo-0.26.0 b/metadata/md5-cache/dev-util/cargo-0.26.0
deleted file mode 100644
index ff3a8d35fc9a..000000000000
--- a/metadata/md5-cache/dev-util/cargo-0.26.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install unpack
-DEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= >=virtual/rust-1.19.0 dev-util/cmake sys-apps/coreutils sys-apps/diffutils sys-apps/findutils sys-apps/sed
-DESCRIPTION=The Rust's package manager
-EAPI=6
-HOMEPAGE=http://crates.io
-IUSE=doc libressl debug
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=|| ( MIT Apache-2.0 )
-RDEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= !dev-util/cargo-bin net-misc/curl[ssl]
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://github.com/rust-lang/cargo/archive/0.26.0.tar.gz -> cargo-0.26.0.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.5.3/download -> aho-corasick-0.5.3.crate https://crates.io/api/v1/crates/aho-corasick/0.6.4/download -> aho-corasick-0.6.4.crate https://crates.io/api/v1/crates/atty/0.2.8/download -> atty-0.2.8.crate https://crates.io/api/v1/crates/backtrace/0.3.5/download -> backtrace-0.3.5.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.16/download -> backtrace-sys-0.1.16.crate https://crates.io/api/v1/crates/bitflags/0.9.1/download -> bitflags-0.9.1.crate https://crates.io/api/v1/crates/bitflags/1.0.1/download -> bitflags-1.0.1.crate https://crates.io/api/v1/crates/bufstream/0.1.3/download -> bufstream-0.1.3.crate https://crates.io/api/v1/crates/cc/1.0.9/download -> cc-1.0.9.crate https://crates.io/api/v1/crates/cfg-if/0.1.2/download -> cfg-if-0.1.2.crate https://crates.io/api/v1/crates/cmake/0.1.30/download -> cmake-0.1.30.crate https://crates.io/api/v1/crates/commoncrypto/0.2.0/download -> commoncrypto-0.2.0.crate https://crates.io/api/v1/crates/commoncrypto-sys/0.2.0/download -> commoncrypto-sys-0.2.0.crate https://crates.io/api/v1/crates/core-foundation/0.5.1/download -> core-foundation-0.5.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.5.1/download -> core-foundation-sys-0.5.1.crate https://crates.io/api/v1/crates/crates-io/0.15.0/download -> crates-io-0.15.0.crate https://crates.io/api/v1/crates/crossbeam/0.3.2/download -> crossbeam-0.3.2.crate https://crates.io/api/v1/crates/crypto-hash/0.3.1/download -> crypto-hash-0.3.1.crate https://crates.io/api/v1/crates/curl/0.4.11/download -> curl-0.4.11.crate https://crates.io/api/v1/crates/curl-sys/0.4.1/download -> curl-sys-0.4.1.crate https://crates.io/api/v1/crates/docopt/0.8.3/download -> docopt-0.8.3.crate https://crates.io/api/v1/crates/dtoa/0.4.2/download -> dtoa-0.4.2.crate https://crates.io/api/v1/crates/env_logger/0.5.6/download -> env_logger-0.5.6.crate https://crates.io/api/v1/crates/failure/0.1.1/download -> failure-0.1.1.crate https://crates.io/api/v1/crates/failure_derive/0.1.1/download -> failure_derive-0.1.1.crate https://crates.io/api/v1/crates/filetime/0.1.15/download -> filetime-0.1.15.crate https://crates.io/api/v1/crates/flate2/1.0.1/download -> flate2-1.0.1.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/fs2/0.4.3/download -> fs2-0.4.3.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/git2/0.6.11/download -> git2-0.6.11.crate https://crates.io/api/v1/crates/git2-curl/0.7.0/download -> git2-curl-0.7.0.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.crate https://crates.io/api/v1/crates/globset/0.3.0/download -> globset-0.3.0.crate https://crates.io/api/v1/crates/hamcrest/0.1.1/download -> hamcrest-0.1.1.crate https://crates.io/api/v1/crates/hex/0.3.1/download -> hex-0.3.1.crate https://crates.io/api/v1/crates/home/0.3.2/download -> home-0.3.2.crate https://crates.io/api/v1/crates/humantime/1.1.1/download -> humantime-1.1.1.crate https://crates.io/api/v1/crates/idna/0.1.4/download -> idna-0.1.4.crate https://crates.io/api/v1/crates/ignore/0.4.1/download -> ignore-0.4.1.crate https://crates.io/api/v1/crates/itoa/0.4.1/download -> itoa-0.4.1.crate https://crates.io/api/v1/crates/jobserver/0.1.11/download -> jobserver-0.1.11.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.0.0/download -> lazy_static-1.0.0.crate https://crates.io/api/v1/crates/lazycell/0.6.0/download -> lazycell-0.6.0.crate https://crates.io/api/v1/crates/libc/0.2.40/download -> libc-0.2.40.crate https://crates.io/api/v1/crates/libgit2-sys/0.6.19/download -> libgit2-sys-0.6.19.crate https://crates.io/api/v1/crates/libssh2-sys/0.2.6/download -> libssh2-sys-0.2.6.crate https://crates.io/api/v1/crates/libz-sys/1.0.18/download -> libz-sys-1.0.18.crate https://crates.io/api/v1/crates/log/0.3.9/download -> log-0.3.9.crate https://crates.io/api/v1/crates/log/0.4.1/download -> log-0.4.1.crate https://crates.io/api/v1/crates/matches/0.1.6/download -> matches-0.1.6.crate https://crates.io/api/v1/crates/memchr/0.1.11/download -> memchr-0.1.11.crate https://crates.io/api/v1/crates/memchr/2.0.1/download -> memchr-2.0.1.crate https://crates.io/api/v1/crates/miniz-sys/0.1.10/download -> miniz-sys-0.1.10.crate https://crates.io/api/v1/crates/miow/0.3.1/download -> miow-0.3.1.crate https://crates.io/api/v1/crates/num/0.1.42/download -> num-0.1.42.crate https://crates.io/api/v1/crates/num-bigint/0.1.43/download -> num-bigint-0.1.43.crate https://crates.io/api/v1/crates/num-complex/0.1.43/download -> num-complex-0.1.43.crate https://crates.io/api/v1/crates/num-integer/0.1.36/download -> num-integer-0.1.36.crate https://crates.io/api/v1/crates/num-iter/0.1.35/download -> num-iter-0.1.35.crate https://crates.io/api/v1/crates/num-rational/0.1.42/download -> num-rational-0.1.42.crate https://crates.io/api/v1/crates/num-traits/0.2.2/download -> num-traits-0.2.2.crate https://crates.io/api/v1/crates/num_cpus/1.8.0/download -> num_cpus-1.8.0.crate https://crates.io/api/v1/crates/openssl/0.10.6/download -> openssl-0.10.6.crate https://crates.io/api/v1/crates/openssl-probe/0.1.2/download -> openssl-probe-0.1.2.crate https://crates.io/api/v1/crates/openssl-sys/0.9.28/download -> openssl-sys-0.9.28.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/pkg-config/0.3.9/download -> pkg-config-0.3.9.crate https://crates.io/api/v1/crates/proc-macro2/0.3.6/download -> proc-macro2-0.3.6.crate https://crates.io/api/v1/crates/quick-error/1.2.1/download -> quick-error-1.2.1.crate https://crates.io/api/v1/crates/quote/0.3.15/download -> quote-0.3.15.crate https://crates.io/api/v1/crates/quote/0.5.1/download -> quote-0.5.1.crate https://crates.io/api/v1/crates/rand/0.4.2/download -> rand-0.4.2.crate https://crates.io/api/v1/crates/redox_syscall/0.1.37/download -> redox_syscall-0.1.37.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/0.1.80/download -> regex-0.1.80.crate https://crates.io/api/v1/crates/regex/0.2.10/download -> regex-0.2.10.crate https://crates.io/api/v1/crates/regex-syntax/0.3.9/download -> regex-syntax-0.3.9.crate https://crates.io/api/v1/crates/regex-syntax/0.5.3/download -> regex-syntax-0.5.3.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.0/download -> remove_dir_all-0.5.0.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.7/download -> rustc-demangle-0.1.7.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.24/download -> rustc-serialize-0.3.24.crate https://crates.io/api/v1/crates/same-file/1.0.2/download -> same-file-1.0.2.crate https://crates.io/api/v1/crates/schannel/0.1.11/download -> schannel-0.1.11.crate https://crates.io/api/v1/crates/scoped-tls/0.1.1/download -> scoped-tls-0.1.1.crate https://crates.io/api/v1/crates/scopeguard/0.3.3/download -> scopeguard-0.3.3.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.37/download -> serde-1.0.37.crate https://crates.io/api/v1/crates/serde_derive/1.0.37/download -> serde_derive-1.0.37.crate https://crates.io/api/v1/crates/serde_derive_internals/0.23.0/download -> serde_derive_internals-0.23.0.crate https://crates.io/api/v1/crates/serde_ignored/0.0.4/download -> serde_ignored-0.0.4.crate https://crates.io/api/v1/crates/serde_json/1.0.13/download -> serde_json-1.0.13.crate https://crates.io/api/v1/crates/shell-escape/0.1.4/download -> shell-escape-0.1.4.crate https://crates.io/api/v1/crates/socket2/0.3.4/download -> socket2-0.3.4.crate https://crates.io/api/v1/crates/strsim/0.6.0/download -> strsim-0.6.0.crate https://crates.io/api/v1/crates/syn/0.11.11/download -> syn-0.11.11.crate https://crates.io/api/v1/crates/syn/0.13.1/download -> syn-0.13.1.crate https://crates.io/api/v1/crates/synom/0.11.3/download -> synom-0.11.3.crate https://crates.io/api/v1/crates/synstructure/0.6.1/download -> synstructure-0.6.1.crate https://crates.io/api/v1/crates/tar/0.4.14/download -> tar-0.4.14.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/termcolor/0.3.6/download -> termcolor-0.3.6.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/thread-id/2.0.0/download -> thread-id-2.0.0.crate https://crates.io/api/v1/crates/thread_local/0.2.7/download -> thread_local-0.2.7.crate https://crates.io/api/v1/crates/thread_local/0.3.5/download -> thread_local-0.3.5.crate https://crates.io/api/v1/crates/toml/0.4.6/download -> toml-0.4.6.crate https://crates.io/api/v1/crates/ucd-util/0.1.1/download -> ucd-util-0.1.1.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.5/download -> unicode-normalization-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.0.4/download -> unicode-xid-0.0.4.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/unreachable/1.0.0/download -> unreachable-1.0.0.crate https://crates.io/api/v1/crates/url/1.7.0/download -> url-1.7.0.crate https://crates.io/api/v1/crates/userenv-sys/0.2.0/download -> userenv-sys-0.2.0.crate https://crates.io/api/v1/crates/utf8-ranges/0.1.3/download -> utf8-ranges-0.1.3.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.0/download -> utf8-ranges-1.0.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.2/download -> vcpkg-0.2.2.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/walkdir/2.1.4/download -> walkdir-2.1.4.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.4/download -> winapi-0.3.4.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/0.1.6/download -> wincolor-0.1.6.crate x86? ( https://static.rust-lang.org/dist/cargo-0.25.0-i686-unknown-linux-gnu.tar.gz ) amd64? ( https://static.rust-lang.org/dist/cargo-0.25.0-x86_64-unknown-linux-gnu.tar.gz ) arm? ( https://static.rust-lang.org/dist/cargo-0.25.0-arm-unknown-linux-gnueabi.tar.gz https://static.rust-lang.org/dist/cargo-0.25.0-arm-unknown-linux-gnueabihf.tar.gz https://static.rust-lang.org/dist/cargo-0.25.0-armv7-unknown-linux-gnueabihf.tar.gz ) arm64? ( https://static.rust-lang.org/dist/cargo-0.25.0-aarch64-unknown-linux-gnu.tar.gz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	da08619f6c16047185d20223904c8aef	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=904a259b825a667eec519bb0a668f143
diff --git a/metadata/md5-cache/dev-util/cargo-0.29.0 b/metadata/md5-cache/dev-util/cargo-0.29.0
deleted file mode 100644
index 69003ad34484..000000000000
--- a/metadata/md5-cache/dev-util/cargo-0.29.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install unpack
-DEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= >=virtual/rust-1.27.0 dev-util/cmake sys-apps/coreutils sys-apps/diffutils sys-apps/findutils sys-apps/sed
-DESCRIPTION=The Rust's package manager
-EAPI=6
-HOMEPAGE=http://crates.io
-IUSE=doc libressl debug
-KEYWORDS=amd64 ~arm64 ~x86
-LICENSE=|| ( MIT Apache-2.0 )
-RDEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= !dev-util/cargo-bin net-misc/curl[ssl]
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://github.com/rust-lang/cargo/archive/0.29.0.tar.gz -> cargo-0.29.0.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.6.6/download -> aho-corasick-0.6.6.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/backtrace/0.3.9/download -> backtrace-0.3.9.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.23/download -> backtrace-sys-0.1.23.crate https://crates.io/api/v1/crates/bitflags/1.0.3/download -> bitflags-1.0.3.crate https://crates.io/api/v1/crates/bufstream/0.1.3/download -> bufstream-0.1.3.crate https://crates.io/api/v1/crates/cargo/0.29.0/download -> cargo-0.29.0.crate https://crates.io/api/v1/crates/cc/1.0.18/download -> cc-1.0.18.crate https://crates.io/api/v1/crates/cfg-if/0.1.4/download -> cfg-if-0.1.4.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/cmake/0.1.31/download -> cmake-0.1.31.crate https://crates.io/api/v1/crates/commoncrypto/0.2.0/download -> commoncrypto-0.2.0.crate https://crates.io/api/v1/crates/commoncrypto-sys/0.2.0/download -> commoncrypto-sys-0.2.0.crate https://crates.io/api/v1/crates/core-foundation/0.6.1/download -> core-foundation-0.6.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.6.1/download -> core-foundation-sys-0.6.1.crate https://crates.io/api/v1/crates/crates-io/0.17.0/download -> crates-io-0.17.0.crate https://crates.io/api/v1/crates/crossbeam/0.3.2/download -> crossbeam-0.3.2.crate https://crates.io/api/v1/crates/crypto-hash/0.3.1/download -> crypto-hash-0.3.1.crate https://crates.io/api/v1/crates/curl/0.4.14/download -> curl-0.4.14.crate https://crates.io/api/v1/crates/curl-sys/0.4.8/download -> curl-sys-0.4.8.crate https://crates.io/api/v1/crates/dtoa/0.4.3/download -> dtoa-0.4.3.crate https://crates.io/api/v1/crates/env_logger/0.5.11/download -> env_logger-0.5.11.crate https://crates.io/api/v1/crates/failure/0.1.2/download -> failure-0.1.2.crate https://crates.io/api/v1/crates/failure_derive/0.1.2/download -> failure_derive-0.1.2.crate https://crates.io/api/v1/crates/filetime/0.2.1/download -> filetime-0.2.1.crate https://crates.io/api/v1/crates/flate2/1.0.2/download -> flate2-1.0.2.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/fs2/0.4.3/download -> fs2-0.4.3.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/git2/0.7.5/download -> git2-0.7.5.crate https://crates.io/api/v1/crates/git2-curl/0.8.1/download -> git2-curl-0.8.1.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.crate https://crates.io/api/v1/crates/globset/0.4.1/download -> globset-0.4.1.crate https://crates.io/api/v1/crates/hex/0.3.2/download -> hex-0.3.2.crate https://crates.io/api/v1/crates/home/0.3.3/download -> home-0.3.3.crate https://crates.io/api/v1/crates/humantime/1.1.1/download -> humantime-1.1.1.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.crate https://crates.io/api/v1/crates/ignore/0.4.3/download -> ignore-0.4.3.crate https://crates.io/api/v1/crates/itoa/0.4.2/download -> itoa-0.4.2.crate https://crates.io/api/v1/crates/jobserver/0.1.11/download -> jobserver-0.1.11.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.0.2/download -> lazy_static-1.0.2.crate https://crates.io/api/v1/crates/lazycell/0.6.0/download -> lazycell-0.6.0.crate https://crates.io/api/v1/crates/libc/0.2.42/download -> libc-0.2.42.crate https://crates.io/api/v1/crates/libgit2-sys/0.7.7/download -> libgit2-sys-0.7.7.crate https://crates.io/api/v1/crates/libssh2-sys/0.2.8/download -> libssh2-sys-0.2.8.crate https://crates.io/api/v1/crates/libz-sys/1.0.18/download -> libz-sys-1.0.18.crate https://crates.io/api/v1/crates/log/0.4.3/download -> log-0.4.3.crate https://crates.io/api/v1/crates/matches/0.1.7/download -> matches-0.1.7.crate https://crates.io/api/v1/crates/memchr/2.0.1/download -> memchr-2.0.1.crate https://crates.io/api/v1/crates/miniz-sys/0.1.10/download -> miniz-sys-0.1.10.crate https://crates.io/api/v1/crates/miow/0.3.1/download -> miow-0.3.1.crate https://crates.io/api/v1/crates/num-traits/0.2.5/download -> num-traits-0.2.5.crate https://crates.io/api/v1/crates/num_cpus/1.8.0/download -> num_cpus-1.8.0.crate https://crates.io/api/v1/crates/openssl/0.10.10/download -> openssl-0.10.10.crate https://crates.io/api/v1/crates/openssl-probe/0.1.2/download -> openssl-probe-0.1.2.crate https://crates.io/api/v1/crates/openssl-sys/0.9.33/download -> openssl-sys-0.9.33.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/pkg-config/0.3.12/download -> pkg-config-0.3.12.crate https://crates.io/api/v1/crates/proc-macro2/0.4.9/download -> proc-macro2-0.4.9.crate https://crates.io/api/v1/crates/quick-error/1.2.2/download -> quick-error-1.2.2.crate https://crates.io/api/v1/crates/quote/0.6.4/download -> quote-0.6.4.crate https://crates.io/api/v1/crates/rand/0.4.2/download -> rand-0.4.2.crate https://crates.io/api/v1/crates/rand/0.5.4/download -> rand-0.5.4.crate https://crates.io/api/v1/crates/rand_core/0.2.1/download -> rand_core-0.2.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.40/download -> redox_syscall-0.1.40.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/1.0.2/download -> regex-1.0.2.crate https://crates.io/api/v1/crates/regex-syntax/0.6.2/download -> regex-syntax-0.6.2.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.1/download -> remove_dir_all-0.5.1.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.9/download -> rustc-demangle-0.1.9.crate https://crates.io/api/v1/crates/same-file/1.0.2/download -> same-file-1.0.2.crate https://crates.io/api/v1/crates/schannel/0.1.13/download -> schannel-0.1.13.crate https://crates.io/api/v1/crates/scopeguard/0.3.3/download -> scopeguard-0.3.3.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.70/download -> serde-1.0.70.crate https://crates.io/api/v1/crates/serde_derive/1.0.70/download -> serde_derive-1.0.70.crate https://crates.io/api/v1/crates/serde_ignored/0.0.4/download -> serde_ignored-0.0.4.crate https://crates.io/api/v1/crates/serde_json/1.0.24/download -> serde_json-1.0.24.crate https://crates.io/api/v1/crates/shell-escape/0.1.4/download -> shell-escape-0.1.4.crate https://crates.io/api/v1/crates/socket2/0.3.7/download -> socket2-0.3.7.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/syn/0.14.6/download -> syn-0.14.6.crate https://crates.io/api/v1/crates/synstructure/0.9.0/download -> synstructure-0.9.0.crate https://crates.io/api/v1/crates/tar/0.4.16/download -> tar-0.4.16.crate https://crates.io/api/v1/crates/tempfile/3.0.3/download -> tempfile-3.0.3.crate https://crates.io/api/v1/crates/termcolor/0.3.6/download -> termcolor-0.3.6.crate https://crates.io/api/v1/crates/termcolor/1.0.1/download -> termcolor-1.0.1.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/thread_local/0.3.5/download -> thread_local-0.3.5.crate https://crates.io/api/v1/crates/toml/0.4.6/download -> toml-0.4.6.crate https://crates.io/api/v1/crates/ucd-util/0.1.1/download -> ucd-util-0.1.1.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.7/download -> unicode-normalization-0.1.7.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/unreachable/1.0.0/download -> unreachable-1.0.0.crate https://crates.io/api/v1/crates/url/1.7.1/download -> url-1.7.1.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.0/download -> utf8-ranges-1.0.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.4/download -> vcpkg-0.2.4.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/walkdir/2.1.4/download -> walkdir-2.1.4.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.5/download -> winapi-0.3.5.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/0.1.6/download -> wincolor-0.1.6.crate https://crates.io/api/v1/crates/wincolor/1.0.0/download -> wincolor-1.0.0.crate x86? ( https://static.rust-lang.org/dist/cargo-0.28.0-i686-unknown-linux-gnu.tar.xz ) amd64? ( https://static.rust-lang.org/dist/cargo-0.28.0-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/cargo-0.28.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/cargo-0.28.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/cargo-0.28.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/cargo-0.28.0-aarch64-unknown-linux-gnu.tar.xz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	da08619f6c16047185d20223904c8aef	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=b3e1b207a833e54359b302a464c78442
diff --git a/metadata/md5-cache/dev-util/cargo-0.30.0 b/metadata/md5-cache/dev-util/cargo-0.30.0
index 2a05c10d3f2f..9422df1d0eda 100644
--- a/metadata/md5-cache/dev-util/cargo-0.30.0
+++ b/metadata/md5-cache/dev-util/cargo-0.30.0
@@ -4,11 +4,11 @@ DESCRIPTION=The Rust's package manager
 EAPI=6
 HOMEPAGE=http://crates.io
 IUSE=doc libressl debug
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=|| ( MIT Apache-2.0 )
 RDEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= !dev-util/cargo-bin net-misc/curl[ssl]
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://github.com/rust-lang/cargo/archive/0.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
-_md5_=436b080efa3d9f251ab111c8d413877d
+_md5_=63964c9600678e031b9d7793707f4231
diff --git a/metadata/md5-cache/dev-util/catalyst-3.0.1 b/metadata/md5-cache/dev-util/catalyst-3.0.1
index afd95fb7c328..919aff11263c 100644
--- a/metadata/md5-cache/dev-util/catalyst-3.0.1
+++ b/metadata/md5-cache/dev-util/catalyst-3.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pydecomp-0.2[python_targets_python2_7(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://gentoo/catalyst-3.0.1.tar.bz2 https://dev.gentoo.org/~dolsen/releases/catalyst/catalyst-3.0.1.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/catalyst-3.0.1.tar.bz2 https://dev.gentoo.org/~zerochaos/distfiles/catalyst-3.0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=857106b1b6cf9b332fe9b3f43808203e
diff --git a/metadata/md5-cache/dev-util/catalyst-3.0.2 b/metadata/md5-cache/dev-util/catalyst-3.0.2
index e8ce7201251f..7911ee4c359d 100644
--- a/metadata/md5-cache/dev-util/catalyst-3.0.2
+++ b/metadata/md5-cache/dev-util/catalyst-3.0.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pydecomp-0.2[python_targets_python3_4(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://gentoo/catalyst-3.0.2.tar.bz2 https://dev.gentoo.org/~dolsen/releases/catalyst/catalyst-3.0.2.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/catalyst-3.0.2.tar.bz2 https://dev.gentoo.org/~zerochaos/distfiles/catalyst-3.0.2.tar.bz2
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=211e922d28a2173fbca98b91a96f60f1
diff --git a/metadata/md5-cache/dev-util/catalyst-3.0.2-r1 b/metadata/md5-cache/dev-util/catalyst-3.0.2-r1
index 3076dd3bf353..5c1f2e15fec4 100644
--- a/metadata/md5-cache/dev-util/catalyst-3.0.2-r1
+++ b/metadata/md5-cache/dev-util/catalyst-3.0.2-r1
@@ -11,5 +11,5 @@ RDEPEND=app-arch/lbzip2 app-crypt/shash >=dev-python/pydecomp-0.2[python_targets
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://gentoo/catalyst-3.0.2.tar.bz2 https://dev.gentoo.org/~dolsen/releases/catalyst/catalyst-3.0.2.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/catalyst-3.0.2.tar.bz2 https://dev.gentoo.org/~zerochaos/distfiles/catalyst-3.0.2.tar.bz2
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4fb06b7b5a6fa5893799333e6ad89686
diff --git a/metadata/md5-cache/dev-util/catalyst-3.0.3 b/metadata/md5-cache/dev-util/catalyst-3.0.3
new file mode 100644
index 000000000000..993b69a07279
--- /dev/null
+++ b/metadata/md5-cache/dev-util/catalyst-3.0.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-text/asciidoc >=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(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_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=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
+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(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+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
diff --git a/metadata/md5-cache/dev-util/catalyst-9999 b/metadata/md5-cache/dev-util/catalyst-9999
index eed38b468bbf..b31e1f5907be 100644
--- a/metadata/md5-cache/dev-util/catalyst-9999
+++ b/metadata/md5-cache/dev-util/catalyst-9999
@@ -9,5 +9,5 @@ PDEPEND=system-bootloader? ( >=sys-apps/memtest86+-5.01-r4 sys-boot/grub:2 amd64
 RDEPEND=>=dev-python/pydecomp-0.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(-)] app-arch/lbzip2 app-crypt/shash 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(-)]
 REQUIRED_USE=|| ( 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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=4a5fef52f7523376dfc598a702e8747c
diff --git a/metadata/md5-cache/dev-util/catfish-1.2.2 b/metadata/md5-cache/dev-util/catfish-1.2.2
index 4fd904974a88..0039c719e2c8 100644
--- a/metadata/md5-cache/dev-util/catfish-1.2.2
+++ b/metadata/md5-cache/dev-util/catfish-1.2.2
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://launchpad.net/catfish-search/1.2/1.2.2/+download/catfish-1.2.2.tar.bz2
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b3e0cc4842f7fba8ed4bf28a6ccee98a
diff --git a/metadata/md5-cache/dev-util/catfish-1.4.6 b/metadata/md5-cache/dev-util/catfish-1.4.6
index c2f895930bd3..bce9c7a9d0b1 100644
--- a/metadata/md5-cache/dev-util/catfish-1.4.6
+++ b/metadata/md5-cache/dev-util/catfish-1.4.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/catfish/1.4/catfish-1.4.6.tar.bz2
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a930f82f49a2ebd22f6ba9348a8ef2b8
diff --git a/metadata/md5-cache/dev-util/catkin-0.7.11 b/metadata/md5-cache/dev-util/catkin-0.7.11
index 66a4f2373a44..216d2e3db0e6 100644
--- a/metadata/md5-cache/dev-util/catkin-0.7.11
+++ b/metadata/md5-cache/dev-util/catkin-0.7.11
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/ros/catkin/archive/0.7.11.tar.gz -> catkin-0.7.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9092ed0f891c341db3e1626caf150c03
diff --git a/metadata/md5-cache/dev-util/catkin-0.7.12 b/metadata/md5-cache/dev-util/catkin-0.7.12
index b93d698530f0..ff2d191f427b 100644
--- a/metadata/md5-cache/dev-util/catkin-0.7.12
+++ b/metadata/md5-cache/dev-util/catkin-0.7.12
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/ros/catkin/archive/0.7.12.tar.gz -> catkin-0.7.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9092ed0f891c341db3e1626caf150c03
diff --git a/metadata/md5-cache/dev-util/catkin-0.7.14 b/metadata/md5-cache/dev-util/catkin-0.7.14
index 5adaa76340f8..8b915eab6c06 100644
--- a/metadata/md5-cache/dev-util/catkin-0.7.14
+++ b/metadata/md5-cache/dev-util/catkin-0.7.14
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/ros/catkin/archive/0.7.14.tar.gz -> catkin-0.7.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9092ed0f891c341db3e1626caf150c03
diff --git a/metadata/md5-cache/dev-util/catkin-9999 b/metadata/md5-cache/dev-util/catkin-9999
index 9cce8512c62e..7d4deac9ce43 100644
--- a/metadata/md5-cache/dev-util/catkin-9999
+++ b/metadata/md5-cache/dev-util/catkin-9999
@@ -8,5 +8,5 @@ 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(-)] dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-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/empy[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-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-util/cmake
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=0920d7ba5b2d7d34396ca828fbe5fd0f
diff --git a/metadata/md5-cache/dev-util/cdiff-0.9.8 b/metadata/md5-cache/dev-util/cdiff-0.9.8
index f1bdf6037cda..dceaf62da795 100644
--- a/metadata/md5-cache/dev-util/cdiff-0.9.8
+++ b/metadata/md5-cache/dev-util/cdiff-0.9.8
@@ -10,5 +10,5 @@ RDEPEND=!<app-misc/colordiff-1.0.13-r1 dev-python/setuptools[python_targets_pypy
 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/c/cdiff/cdiff-0.9.8.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2ab58dcdd94a003d8ede85b687ae47f6
diff --git a/metadata/md5-cache/dev-util/cdiff-1.0 b/metadata/md5-cache/dev-util/cdiff-1.0
index 4cb343b0a686..f5f4253bcd41 100644
--- a/metadata/md5-cache/dev-util/cdiff-1.0
+++ b/metadata/md5-cache/dev-util/cdiff-1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/c/cdiff/cdiff-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cf4d3d7d4838628333d9a3335351b100
diff --git a/metadata/md5-cache/dev-util/cdiff-9999 b/metadata/md5-cache/dev-util/cdiff-9999
index fce1e1c531e0..9b621298a2d8 100644
--- a/metadata/md5-cache/dev-util/cdiff-9999
+++ b/metadata/md5-cache/dev-util/cdiff-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=!<app-misc/colordiff-1.0.13-r1 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(-)] sys-apps/less python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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_=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	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=04c338e769f8a212fec6e15352f06291
diff --git a/metadata/md5-cache/dev-util/cgvg-1.6.3 b/metadata/md5-cache/dev-util/cgvg-1.6.3
new file mode 100644
index 000000000000..516ed863f542
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cgvg-1.6.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=dev-lang/perl
+DESCRIPTION=Minimal command-line source browsing tool similar to cscope
+EAPI=7
+HOMEPAGE=http://uzix.org/cgvg.html
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl
+SLOT=0
+SRC_URI=http://uzix.org/cgvg/cgvg-1.6.3.tar.gz
+_md5_=7d13e8afe837683cf204047046ff4fe2
diff --git a/metadata/md5-cache/dev-util/clazy-1.3 b/metadata/md5-cache/dev-util/clazy-1.3
deleted file mode 100644
index ead865c3b95d..000000000000
--- a/metadata/md5-cache/dev-util/clazy-1.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/clang:= >=sys-devel/llvm-3.8:= app-arch/unzip sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Compiler plugin which allows clang to understand Qt semantics
-EAPI=6
-HOMEPAGE=https://github.com/KDE/clazy/blob/master/README.md
-KEYWORDS=~amd64
-LICENSE=LGPL-2+
-RDEPEND=sys-devel/clang:= >=sys-devel/llvm-3.8:=
-SLOT=0
-SRC_URI=mirror://kde/stable/clazy/1.3/src/clazy-1.3.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=9f5f4e52ebb6a1aae4ce938ad08198da
diff --git a/metadata/md5-cache/dev-util/clazy-1.4 b/metadata/md5-cache/dev-util/clazy-1.4
new file mode 100644
index 000000000000..688ff2ab3218
--- /dev/null
+++ b/metadata/md5-cache/dev-util/clazy-1.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/clang:= >=sys-devel/llvm-3.8:= sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Compiler plugin which allows clang to understand Qt semantics
+EAPI=6
+HOMEPAGE=https://github.com/KDE/clazy/blob/master/README.md
+KEYWORDS=~amd64
+LICENSE=LGPL-2+
+RDEPEND=sys-devel/clang:= >=sys-devel/llvm-3.8:=
+SLOT=0
+SRC_URI=mirror://kde/stable/clazy/1.4/src/clazy-1.4.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_=107846d0db0c7e84883d4a5d4a696451
diff --git a/metadata/md5-cache/dev-util/cligh-0.1_p20120630 b/metadata/md5-cache/dev-util/cligh-0.1_p20120630
index 5bf077ac0387..8324687278f9 100644
--- a/metadata/md5-cache/dev-util/cligh-0.1_p20120630
+++ b/metadata/md5-cache/dev-util/cligh-0.1_p20120630
@@ -10,5 +10,5 @@ RDEPEND=dev-python/PyGithub[python_targets_python2_7(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/CMB/cligh/archive/401ce7405d3dc7a90bd519dce8ae9be3bdef43ac.tar.gz -> cligh-0.1_p20120630.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=812d4bcacc2fb19d15223737a09ee469
diff --git a/metadata/md5-cache/dev-util/cligh-0.2 b/metadata/md5-cache/dev-util/cligh-0.2
index 6909a177e8f9..4d5d0af15e49 100644
--- a/metadata/md5-cache/dev-util/cligh-0.2
+++ b/metadata/md5-cache/dev-util/cligh-0.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/PyGithub[python_targets_python2_7(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://the-brannons.com/software/cligh-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3387997b9334b669b8b7eba61e8fc1f8
diff --git a/metadata/md5-cache/dev-util/cligh-9999 b/metadata/md5-cache/dev-util/cligh-9999
index 9cb22b03c6e8..a8a50eb75e1b 100644
--- a/metadata/md5-cache/dev-util/cligh-9999
+++ b/metadata/md5-cache/dev-util/cligh-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/PyGithub[python_targets_python3_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(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_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-2	249c1a0962573f4ce2c28f0d5b6b35d4	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-2	249c1a0962573f4ce2c28f0d5b6b35d4	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_=b908aed02329fefa05a8c6fb07f0b5ff
diff --git a/metadata/md5-cache/dev-util/cmake-3.10.3 b/metadata/md5-cache/dev-util/cmake-3.10.3
index c5852ac2d306..6f44b37a7eb2 100644
--- a/metadata/md5-cache/dev-util/cmake-3.10.3
+++ b/metadata/md5-cache/dev-util/cmake-3.10.3
@@ -9,5 +9,5 @@ LICENSE=CMake
 RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.0.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.10/cmake-3.10.3.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	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	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	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	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=462a22648e2bca44fadd8955dbdcef64
diff --git a/metadata/md5-cache/dev-util/cmake-3.11.4-r1 b/metadata/md5-cache/dev-util/cmake-3.11.4-r1
index dfaa95b33670..f5525880c5d9 100644
--- a/metadata/md5-cache/dev-util/cmake-3.11.4-r1
+++ b/metadata/md5-cache/dev-util/cmake-3.11.4-r1
@@ -9,5 +9,5 @@ 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.11/cmake-3.11.4.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	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	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	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	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=65e158ae9432b0ae3b99c315f409bb24
diff --git a/metadata/md5-cache/dev-util/cmake-3.12.1 b/metadata/md5-cache/dev-util/cmake-3.12.1
index 81790942f634..2e12e549efca 100644
--- a/metadata/md5-cache/dev-util/cmake-3.12.1
+++ b/metadata/md5-cache/dev-util/cmake-3.12.1
@@ -9,5 +9,5 @@ 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.12/cmake-3.12.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cd23f9a2914e74e23d22c9fc2c30fb1e
diff --git a/metadata/md5-cache/dev-util/cmake-3.12.2 b/metadata/md5-cache/dev-util/cmake-3.12.2
index 3e22c05aea9c..5c7c172b4467 100644
--- a/metadata/md5-cache/dev-util/cmake-3.12.2
+++ b/metadata/md5-cache/dev-util/cmake-3.12.2
@@ -9,5 +9,5 @@ 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.12/cmake-3.12.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cd23f9a2914e74e23d22c9fc2c30fb1e
diff --git a/metadata/md5-cache/dev-util/cmake-3.12.3 b/metadata/md5-cache/dev-util/cmake-3.12.3
new file mode 100644
index 000000000000..a7c2d72030ee
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cmake-3.12.3
@@ -0,0 +1,13 @@
+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
+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=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.12/cmake-3.12.3.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_=6bc06bce99e9add50113cbdddf379724
diff --git a/metadata/md5-cache/dev-util/cmake-3.9.6 b/metadata/md5-cache/dev-util/cmake-3.9.6
index e4b0e10f8eca..4c1d8ef029a1 100644
--- a/metadata/md5-cache/dev-util/cmake-3.9.6
+++ b/metadata/md5-cache/dev-util/cmake-3.9.6
@@ -9,5 +9,5 @@ LICENSE=CMake
 RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=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 ) server? ( >=dev-libs/libuv-1.0.0:= ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.9/cmake-3.9.6.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	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	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	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	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c1c116f58af1a3be4a03d41e3298b316
diff --git a/metadata/md5-cache/dev-util/cmake-fedora-2.7.1 b/metadata/md5-cache/dev-util/cmake-fedora-2.7.1
index e5aa0c4b876b..b4490feb2353 100644
--- a/metadata/md5-cache/dev-util/cmake-fedora-2.7.1
+++ b/metadata/md5-cache/dev-util/cmake-fedora-2.7.1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RESTRICT=test
 SLOT=0
 SRC_URI=https://releases.pagure.org/cmake-fedora/cmake-fedora-2.7.1-Source.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9a6ccfc0ed95429209c25d179e410a37
diff --git a/metadata/md5-cache/dev-util/cmdtest-0.16 b/metadata/md5-cache/dev-util/cmdtest-0.16
index 15e27a058034..49cbbfda87ef 100644
--- a/metadata/md5-cache/dev-util/cmdtest-0.16
+++ b/metadata/md5-cache/dev-util/cmdtest-0.16
@@ -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=http://code.liw.fi/debian/pool/main/c/cmdtest/cmdtest_0.16.orig.tar.xz
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b5c838747ac9bfa6f8cba6d9d81bd4f9
diff --git a/metadata/md5-cache/dev-util/cmdtest-0.18 b/metadata/md5-cache/dev-util/cmdtest-0.18
index aee49a323903..340bba6f84f5 100644
--- a/metadata/md5-cache/dev-util/cmdtest-0.18
+++ b/metadata/md5-cache/dev-util/cmdtest-0.18
@@ -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=http://code.liw.fi/debian/pool/main/c/cmdtest/cmdtest_0.18.orig.tar.xz
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a80b0e627f2e64f92ffda72f2e983d87
diff --git a/metadata/md5-cache/dev-util/cmdtest-0.27 b/metadata/md5-cache/dev-util/cmdtest-0.27
index 7e8ad789d445..5071a90ed34a 100644
--- a/metadata/md5-cache/dev-util/cmdtest-0.27
+++ b/metadata/md5-cache/dev-util/cmdtest-0.27
@@ -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=http://code.liw.fi/debian/pool/main/c/cmdtest/cmdtest_0.27.orig.tar.xz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fd05c7c5926c5a8ebfa4f1b559072202
diff --git a/metadata/md5-cache/dev-util/cmdtest-0.30 b/metadata/md5-cache/dev-util/cmdtest-0.30
index 4e032ff33684..3f640d22b524 100644
--- a/metadata/md5-cache/dev-util/cmdtest-0.30
+++ b/metadata/md5-cache/dev-util/cmdtest-0.30
@@ -10,5 +10,5 @@ RDEPEND=dev-python/cliapp[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://code.liw.fi/debian/pool/main/c/cmdtest/cmdtest_0.30.orig.tar.xz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=928ee023cb6b2adeda9cffa6da0fd5b5
diff --git a/metadata/md5-cache/dev-util/cmocka-1.1.1 b/metadata/md5-cache/dev-util/cmocka-1.1.1
index f1d342c56283..c8aac134f569 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d1413e90bac25e9b0c2679443edeb061
diff --git a/metadata/md5-cache/dev-util/coccigrep-1.13 b/metadata/md5-cache/dev-util/coccigrep-1.13
index 5ff6bae4ed66..2d296f1629d3 100644
--- a/metadata/md5-cache/dev-util/coccigrep-1.13
+++ b/metadata/md5-cache/dev-util/coccigrep-1.13
@@ -10,5 +10,5 @@ RDEPEND=dev-util/coccinelle[python] emacs? ( virtual/emacs ) vim? ( || ( app-edi
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/regit/coccigrep/archive/v1.13.tar.gz -> coccigrep-1.13.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	elisp-common	23f47b2e1de7abf387105eddd1318738	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	elisp-common	23f47b2e1de7abf387105eddd1318738	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b2371563d600f8a4a0fe64cffa402721
diff --git a/metadata/md5-cache/dev-util/codeblocks-17.12 b/metadata/md5-cache/dev-util/codeblocks-17.12
index b47bc9fcabe4..bac2e535786b 100644
--- a/metadata/md5-cache/dev-util/codeblocks-17.12
+++ b/metadata/md5-cache/dev-util/codeblocks-17.12
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=app-arch/zip x11-libs/wxGTK:3.0[X] contrib? ( app-text/hunspell dev-libs/boost:= dev-libs/libgamin )
 SLOT=0
 SRC_URI=mirror://sourceforge/codeblocks/codeblocks_17.12.tar.xz https://dev.gentoo.org/~leio/distfiles/codeblocks-17.12-fortran.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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=81c6dff70eca0384a9713709c9eddcf5
diff --git a/metadata/md5-cache/dev-util/codeblocks-17.12-r1 b/metadata/md5-cache/dev-util/codeblocks-17.12-r1
index 8b63291fff35..8652897e61d9 100644
--- a/metadata/md5-cache/dev-util/codeblocks-17.12-r1
+++ b/metadata/md5-cache/dev-util/codeblocks-17.12-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=app-arch/zip x11-libs/wxGTK:3.0[X] contrib? ( app-admin/gamin app-text/hunspell dev-libs/boost:= )
 SLOT=0
 SRC_URI=mirror://sourceforge/codeblocks/codeblocks_17.12.tar.xz https://dev.gentoo.org/~leio/distfiles/codeblocks-17.12-fortran.tar.xz https://dev.gentoo.org/~leio/distfiles/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch.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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=cd92ff1a32d56f09d1e5f93877d72367
diff --git a/metadata/md5-cache/dev-util/codeblocks-17.12-r300 b/metadata/md5-cache/dev-util/codeblocks-17.12-r300
index e4ce8ae5e844..1731858b7cc6 100644
--- a/metadata/md5-cache/dev-util/codeblocks-17.12-r300
+++ b/metadata/md5-cache/dev-util/codeblocks-17.12-r300
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=app-arch/zip x11-libs/wxGTK:3.0-gtk3[X] contrib? ( app-text/hunspell dev-libs/boost:= dev-libs/libgamin )
 SLOT=0
 SRC_URI=mirror://sourceforge/codeblocks/codeblocks_17.12.tar.xz https://dev.gentoo.org/~leio/distfiles/codeblocks-17.12-fortran.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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=5fdf56b06c013d50a868f66e54d87f0c
diff --git a/metadata/md5-cache/dev-util/codeblocks-17.12-r301 b/metadata/md5-cache/dev-util/codeblocks-17.12-r301
index 37b6cc063222..25bae50ec8b5 100644
--- a/metadata/md5-cache/dev-util/codeblocks-17.12-r301
+++ b/metadata/md5-cache/dev-util/codeblocks-17.12-r301
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=app-arch/zip x11-libs/wxGTK:3.0-gtk3[X] contrib? ( app-admin/gamin app-text/hunspell dev-libs/boost:= )
 SLOT=0
 SRC_URI=mirror://sourceforge/codeblocks/codeblocks_17.12.tar.xz https://dev.gentoo.org/~leio/distfiles/codeblocks-17.12-fortran.tar.xz https://dev.gentoo.org/~leio/distfiles/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch.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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=b8659a5c0386ccd78b34c29bdb5ec152
diff --git a/metadata/md5-cache/dev-util/codeblocks-9999 b/metadata/md5-cache/dev-util/codeblocks-9999
index fc65709b4b92..84e439ce4ac4 100644
--- a/metadata/md5-cache/dev-util/codeblocks-9999
+++ b/metadata/md5-cache/dev-util/codeblocks-9999
@@ -7,5 +7,5 @@ IUSE=contrib debug pch
 LICENSE=GPL-3
 RDEPEND=app-arch/zip x11-libs/wxGTK:3.0[X] contrib? ( app-admin/gamin app-text/hunspell dev-libs/boost:= )
 SLOT=0
-_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	subversion	3d1eb4b41d7190570a84f786958ebb13	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	subversion	3d1eb4b41d7190570a84f786958ebb13	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=36a8d44406a991b65034b39955cefa0d
diff --git a/metadata/md5-cache/dev-util/comparator-2.10 b/metadata/md5-cache/dev-util/comparator-2.10
index 1defd81b1136..1a26681d978a 100644
--- a/metadata/md5-cache/dev-util/comparator-2.10
+++ b/metadata/md5-cache/dev-util/comparator-2.10
@@ -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=http://www.catb.org/~esr/comparator/comparator-2.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ef6ff131cddabc7fa752cda633c97498
diff --git a/metadata/md5-cache/dev-util/conan-1.0.4 b/metadata/md5-cache/dev-util/conan-1.0.4
index df42edf04c28..d8682ce6beb6 100644
--- a/metadata/md5-cache/dev-util/conan-1.0.4
+++ b/metadata/md5-cache/dev-util/conan-1.0.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pyjwt-1.4[python_targets_python2_7(-)?,python_targets_pytho
 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/conan/conan-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1389f8421f091abc90b247d1b3e842a5
diff --git a/metadata/md5-cache/dev-util/confix-2.3.5-r2 b/metadata/md5-cache/dev-util/confix-2.3.5-r2
index 14aa35aa343e..ca9bc240ecd1 100644
--- a/metadata/md5-cache/dev-util/confix-2.3.5-r2
+++ b/metadata/md5-cache/dev-util/confix-2.3.5-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-util/confix-wrapper sys-devel/autoconf-archive sys-devel/automake sy
 REQUIRED_USE=python_targets_python2_7
 SLOT=2
 SRC_URI=mirror://sourceforge/confix/Confix-2.3.5.tar.bz2
-_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a668fb1049169d59ffb52c41b18c763c
diff --git a/metadata/md5-cache/dev-util/confix-2.3.5-r3 b/metadata/md5-cache/dev-util/confix-2.3.5-r3
index b2c56aa78659..9caa1fda22f8 100644
--- a/metadata/md5-cache/dev-util/confix-2.3.5-r3
+++ b/metadata/md5-cache/dev-util/confix-2.3.5-r3
@@ -10,5 +10,5 @@ RDEPEND=dev-util/confix-wrapper sys-devel/autoconf-archive sys-devel/automake sy
 REQUIRED_USE=python_targets_python2_7
 SLOT=2
 SRC_URI=mirror://sourceforge/confix/Confix-2.3.5.tar.bz2
-_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7dc0c92812a40c25015ab1a5cd52ec45
diff --git a/metadata/md5-cache/dev-util/confix-9999 b/metadata/md5-cache/dev-util/confix-9999
index c7cf048dde9b..b9a31fa52997 100644
--- a/metadata/md5-cache/dev-util/confix-9999
+++ b/metadata/md5-cache/dev-util/confix-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-util/confix-wrapper sys-devel/autoconf-archive sys-devel/automake sys-devel/libtool python_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=2
-_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	subversion	3d1eb4b41d7190570a84f786958ebb13	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	subversion	3d1eb4b41d7190570a84f786958ebb13	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=44c51fd6bf14173da8e796169447e7b8
diff --git a/metadata/md5-cache/dev-util/cookiecutter-1.6.0 b/metadata/md5-cache/dev-util/cookiecutter-1.6.0
index 5264afce43aa..7d03c6382df8 100644
--- a/metadata/md5-cache/dev-util/cookiecutter-1.6.0
+++ b/metadata/md5-cache/dev-util/cookiecutter-1.6.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/future-0.15.2[python_targets_python2_7(-)?,python_targets_p
 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/audreyr/cookiecutter/archive/1.6.0.tar.gz -> cookiecutter-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e7d45a232eb3afc94e22940615ef1eda
diff --git a/metadata/md5-cache/dev-util/cppcheck-1.81 b/metadata/md5-cache/dev-util/cppcheck-1.81
index e4297402d27c..b30293777c31 100644
--- a/metadata/md5-cache/dev-util/cppcheck-1.81
+++ b/metadata/md5-cache/dev-util/cppcheck-1.81
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/tinyxml2:= htmlreport? ( dev-python/pygments[python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/cppcheck/cppcheck-1.81.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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5db5d5eb9369b9b6d39be6d302fd39de
diff --git a/metadata/md5-cache/dev-util/cppcheck-1.84 b/metadata/md5-cache/dev-util/cppcheck-1.84
index fe2dcc29af26..e7b56ccfdd38 100644
--- a/metadata/md5-cache/dev-util/cppcheck-1.84
+++ b/metadata/md5-cache/dev-util/cppcheck-1.84
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/tinyxml2:= htmlreport? ( dev-python/pygments[python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/danmar/cppcheck/archive/1.84.tar.gz -> cppcheck-1.84.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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f1d7b15480bf6e61495eb4fb86073473
diff --git a/metadata/md5-cache/dev-util/cppcheck-1.84-r1 b/metadata/md5-cache/dev-util/cppcheck-1.84-r1
index 3eb57a69a290..18e0c19ae997 100644
--- a/metadata/md5-cache/dev-util/cppcheck-1.84-r1
+++ b/metadata/md5-cache/dev-util/cppcheck-1.84-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/tinyxml2:= htmlreport? ( dev-python/pygments[python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/danmar/cppcheck/archive/1.84.tar.gz -> cppcheck-1.84.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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a2abac445c3735d7cfedf07922ffe1e7
diff --git a/metadata/md5-cache/dev-util/cppcheck-9999 b/metadata/md5-cache/dev-util/cppcheck-9999
index 7f2893b8803f..6858bff2327b 100644
--- a/metadata/md5-cache/dev-util/cppcheck-9999
+++ b/metadata/md5-cache/dev-util/cppcheck-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-libs/tinyxml2:= htmlreport? ( dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) pcre? ( dev-libs/libpcre ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport: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 ) 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0c078b6b4a8b52eb3483173f7ffc7c7f
diff --git a/metadata/md5-cache/dev-util/cram-0.7 b/metadata/md5-cache/dev-util/cram-0.7
index 5e2b6107a3ec..496d7f6e2579 100644
--- a/metadata/md5-cache/dev-util/cram-0.7
+++ b/metadata/md5-cache/dev-util/cram-0.7
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cram/cram-0.7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e04cd31fff623eb4e61a39c89e9ff946
diff --git a/metadata/md5-cache/dev-util/creduce-2.7.0 b/metadata/md5-cache/dev-util/creduce-2.7.0
index ff89f797b8c8..44abb2a87609 100644
--- a/metadata/md5-cache/dev-util/creduce-2.7.0
+++ b/metadata/md5-cache/dev-util/creduce-2.7.0
@@ -8,5 +8,5 @@ LICENSE=UoI-NCSA
 RDEPEND=>=dev-lang/perl-5.10.0 sys-devel/clang:4 dev-perl/Benchmark-Timer dev-perl/Exporter-Lite dev-perl/File-Which dev-perl/Getopt-Tabular dev-perl/Regexp-Common dev-perl/Sys-CPU dev-util/astyle dev-util/indent
 SLOT=0
 SRC_URI=https://embed.cs.utah.edu/creduce/creduce-2.7.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f3f29a0a87a29c74ed7364be33767ce6
diff --git a/metadata/md5-cache/dev-util/creduce-2.7.0-r1 b/metadata/md5-cache/dev-util/creduce-2.7.0-r1
index edf409dcd63e..d51d18117968 100644
--- a/metadata/md5-cache/dev-util/creduce-2.7.0-r1
+++ b/metadata/md5-cache/dev-util/creduce-2.7.0-r1
@@ -8,5 +8,5 @@ LICENSE=UoI-NCSA
 RDEPEND=>=dev-lang/perl-5.10.0 sys-devel/clang:5 dev-perl/Benchmark-Timer dev-perl/Exporter-Lite dev-perl/File-Which dev-perl/Getopt-Tabular dev-perl/Regexp-Common dev-perl/Sys-CPU dev-util/astyle dev-util/indent
 SLOT=0
 SRC_URI=https://embed.cs.utah.edu/creduce/creduce-2.7.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=84b763f76449d540091d192a7f6a195e
diff --git a/metadata/md5-cache/dev-util/creduce-2.8.0_pre20180411 b/metadata/md5-cache/dev-util/creduce-2.8.0_pre20180411
index 6041a298998a..a5d9ce23f7dc 100644
--- a/metadata/md5-cache/dev-util/creduce-2.8.0_pre20180411
+++ b/metadata/md5-cache/dev-util/creduce-2.8.0_pre20180411
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-lang/perl-5.10.0 >=sys-devel/clang-6:= dev-util/ninja >=dev-util/cmake-3.9.6
+DEPEND=>=dev-lang/perl-5.10.0 sys-devel/clang:6 dev-util/ninja >=dev-util/cmake-3.9.6
 DESCRIPTION=C-Reduce - a plugin-based C program reducer
 EAPI=6
 HOMEPAGE=https://embed.cs.utah.edu/creduce/
 KEYWORDS=~amd64 ~x86
 LICENSE=UoI-NCSA
-RDEPEND=>=dev-lang/perl-5.10.0 >=sys-devel/clang-6:= dev-perl/Benchmark-Timer dev-perl/Exporter-Lite dev-perl/File-Which dev-perl/Getopt-Tabular dev-perl/Regexp-Common dev-perl/Sys-CPU dev-util/astyle dev-util/indent
+RDEPEND=>=dev-lang/perl-5.10.0 sys-devel/clang:6 dev-perl/Benchmark-Timer dev-perl/Exporter-Lite dev-perl/File-Which dev-perl/Getopt-Tabular dev-perl/Regexp-Common dev-perl/Sys-CPU dev-util/astyle dev-util/indent
 SLOT=0
 SRC_URI=https://github.com/csmith-project/creduce/archive/48e622ba74bc35c5a81299d3a34b9b14038d6a70.tar.gz -> creduce-48e622ba74bc35c5a81299d3a34b9b14038d6a70.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=4ca17c68e7d9b3567a2fd8f580aae5a0
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=350d511cf1987881cd608b578ee22742
diff --git a/metadata/md5-cache/dev-util/creduce-2.8.0_pre20180411-r1 b/metadata/md5-cache/dev-util/creduce-2.8.0_pre20180411-r1
new file mode 100644
index 000000000000..0351222e70a7
--- /dev/null
+++ b/metadata/md5-cache/dev-util/creduce-2.8.0_pre20180411-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-lang/perl-5.10.0 sys-devel/clang:7 dev-util/ninja >=dev-util/cmake-3.9.6
+DESCRIPTION=C-Reduce - a plugin-based C program reducer
+EAPI=6
+HOMEPAGE=https://embed.cs.utah.edu/creduce/
+KEYWORDS=~amd64 ~x86
+LICENSE=UoI-NCSA
+RDEPEND=>=dev-lang/perl-5.10.0 sys-devel/clang:7 dev-perl/Benchmark-Timer dev-perl/Exporter-Lite dev-perl/File-Which dev-perl/Getopt-Tabular dev-perl/Regexp-Common dev-perl/Sys-CPU dev-util/astyle dev-util/indent
+SLOT=0
+SRC_URI=https://github.com/csmith-project/creduce/archive/48e622ba74bc35c5a81299d3a34b9b14038d6a70.tar.gz -> creduce-48e622ba74bc35c5a81299d3a34b9b14038d6a70.tar.gz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e663f9a1899c927eb722ec869657e2a5
diff --git a/metadata/md5-cache/dev-util/creduce-9999 b/metadata/md5-cache/dev-util/creduce-9999
index d44a803a0454..eb967639a789 100644
--- a/metadata/md5-cache/dev-util/creduce-9999
+++ b/metadata/md5-cache/dev-util/creduce-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://embed.cs.utah.edu/creduce/
 LICENSE=UoI-NCSA
 RDEPEND=>=dev-lang/perl-5.10.0 >=sys-devel/clang-4:= dev-perl/Benchmark-Timer dev-perl/Exporter-Lite dev-perl/File-Which dev-perl/Getopt-Tabular dev-perl/Regexp-Common dev-perl/Sys-CPU dev-util/astyle dev-util/indent
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5ecac853cd201251e44a7b6a6a8a1d9f
diff --git a/metadata/md5-cache/dev-util/cutter-1.7 b/metadata/md5-cache/dev-util/cutter-1.7
index fb9a96ca1805..0a368a8da925 100644
--- a/metadata/md5-cache/dev-util/cutter-1.7
+++ b/metadata/md5-cache/dev-util/cutter-1.7
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=
 REQUIRED_USE=webengine? ( jupyter )
 SLOT=0
 SRC_URI=https://github.com/radareorg/cutter/archive/v1.7.tar.gz -> cutter-1.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7a520c9e0ab45ed0c2948e708af2646a
diff --git a/metadata/md5-cache/dev-util/d-feet-0.3.12 b/metadata/md5-cache/dev-util/d-feet-0.3.12
index bafb00277bb6..ddebf81212cb 100644
--- a/metadata/md5-cache/dev-util/d-feet-0.3.12
+++ b/metadata/md5-cache/dev-util/d-feet-0.3.12
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/d-feet/0.3/d-feet-0.3.12.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4c47f0d77de7736bd0e90f03d42641a0
diff --git a/metadata/md5-cache/dev-util/d-feet-0.3.13 b/metadata/md5-cache/dev-util/d-feet-0.3.13
index ad7e94d2bdf0..f4f6fcdd8cf6 100644
--- a/metadata/md5-cache/dev-util/d-feet-0.3.13
+++ b/metadata/md5-cache/dev-util/d-feet-0.3.13
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/d-feet/0.3/d-feet-0.3.13.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bcd335f215b4376f05fabd4047a5a2f0
diff --git a/metadata/md5-cache/dev-util/debhelper-11.3.5 b/metadata/md5-cache/dev-util/debhelper-11.3.5
deleted file mode 100644
index e41af052b4f7..000000000000
--- a/metadata/md5-cache/dev-util/debhelper-11.3.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long l10n_de? ( >=app-text/po4a-0.24 ) l10n_es? ( >=app-text/po4a-0.24 ) l10n_fr? ( >=app-text/po4a-0.24 ) test? ( dev-perl/Test-Pod sys-apps/fakeroot )
-DESCRIPTION=Collection of programs that can be used to automate common tasks in debian/rules
-EAPI=6
-HOMEPAGE=https://tracker.debian.org/pkg/debhelper
-IUSE=test l10n_de l10n_es l10n_fr
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long
-SLOT=0
-SRC_URI=mirror://debian/pool/main/d/debhelper/debhelper_11.3.5.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_=16be2c043232472fe92a860b452e3a14
diff --git a/metadata/md5-cache/dev-util/debhelper-11.4.1 b/metadata/md5-cache/dev-util/debhelper-11.4.1
new file mode 100644
index 000000000000..1fff9fcacbce
--- /dev/null
+++ b/metadata/md5-cache/dev-util/debhelper-11.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long l10n_de? ( >=app-text/po4a-0.24 ) l10n_es? ( >=app-text/po4a-0.24 ) l10n_fr? ( >=app-text/po4a-0.24 ) test? ( dev-perl/Test-Pod sys-apps/fakeroot )
+DESCRIPTION=Collection of programs that can be used to automate common tasks in debian/rules
+EAPI=6
+HOMEPAGE=https://tracker.debian.org/pkg/debhelper
+IUSE=test l10n_de l10n_es l10n_fr
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/debhelper/debhelper_11.4.1.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_=f8083739c4b0855d985b4bab9676130b
diff --git a/metadata/md5-cache/dev-util/devhelp-3.24.0 b/metadata/md5-cache/dev-util/devhelp-3.24.0
index 129702f026ea..0b73d708ec06 100644
--- a/metadata/md5-cache/dev-util/devhelp-3.24.0
+++ b/metadata/md5-cache/dev-util/devhelp-3.24.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.38:2[dbus] >=x11-libs/gtk+-3.20:3 >=net-libs/webkit-gt
 REQUIRED_USE=gedit? ( ^^ ( 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/3-3
 SRC_URI=mirror://gnome/sources/devhelp/3.24/devhelp-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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=f4042405851ea62cd14148c0c4eaeb43
diff --git a/metadata/md5-cache/dev-util/devhelp-3.26.1 b/metadata/md5-cache/dev-util/devhelp-3.26.1
index fb45621c455e..828dface8936 100644
--- a/metadata/md5-cache/dev-util/devhelp-3.26.1
+++ b/metadata/md5-cache/dev-util/devhelp-3.26.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.38:2[dbus] >=x11-libs/gtk+-3.22:3 >=net-libs/webkit-gt
 REQUIRED_USE=gedit? ( ^^ ( 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/3-4
 SRC_URI=mirror://gnome/sources/devhelp/3.26/devhelp-3.26.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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=ad0f81cbc057c1111ba17427865c9918
diff --git a/metadata/md5-cache/dev-util/diffoscope-87 b/metadata/md5-cache/dev-util/diffoscope-87
index 2a555955847c..cb70c7c52c78 100644
--- a/metadata/md5-cache/dev-util/diffoscope-87
+++ b/metadata/md5-cache/dev-util/diffoscope-87
@@ -10,5 +10,5 @@ RDEPEND=dev-python/python-magic[python_targets_python3_5(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/diffoscope/diffoscope-87.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d4511b9a5e4c1a447bb98c7d4e39dc5b
diff --git a/metadata/md5-cache/dev-util/diffoscope-88 b/metadata/md5-cache/dev-util/diffoscope-88
index 1375bf0d8a01..8e43cddc07d1 100644
--- a/metadata/md5-cache/dev-util/diffoscope-88
+++ b/metadata/md5-cache/dev-util/diffoscope-88
@@ -10,5 +10,5 @@ RDEPEND=dev-python/python-magic[python_targets_python3_5(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/diffoscope/diffoscope-88.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=73ac6a72fb3d93fa94a92c73937cdf59
diff --git a/metadata/md5-cache/dev-util/distro-info-0.14 b/metadata/md5-cache/dev-util/distro-info-0.14
index 328a4e3efff9..fa565c80f830 100644
--- a/metadata/md5-cache/dev-util/distro-info-0.14
+++ b/metadata/md5-cache/dev-util/distro-info-0.14
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:= python? ( python_targets_python2_7? ( >=dev-lang/python-
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/distro-info/distro-info_0.14.tar.xz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=657cffec634aab988d2444d0813548ac
diff --git a/metadata/md5-cache/dev-util/dogtail-0.9.10 b/metadata/md5-cache/dev-util/dogtail-0.9.10
index 59e5dd6e1539..0cd3896377a1 100644
--- a/metadata/md5-cache/dev-util/dogtail-0.9.10
+++ b/metadata/md5-cache/dev-util/dogtail-0.9.10
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/gobject-introspection dev-python/pyatspi[python_targets_python2
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://gitlab.com/dogtail/dogtail/raw/released/dogtail-0.9.10.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	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=18d98487985bbcb7e4ef4e0050d0f86e
diff --git a/metadata/md5-cache/dev-util/dput-ng-1.10 b/metadata/md5-cache/dev-util/dput-ng-1.10
index 00f3d7062de4..5e0163d9f9f8 100644
--- a/metadata/md5-cache/dev-util/dput-ng-1.10
+++ b/metadata/md5-cache/dev-util/dput-ng-1.10
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/dput-ng/dput-ng_1.10.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=69fae0cfd5cb975a30572f996549ff34
diff --git a/metadata/md5-cache/dev-util/dropwatch-1.4-r1 b/metadata/md5-cache/dev-util/dropwatch-1.4-r1
index 72969a148c97..55304d544cb7 100644
--- a/metadata/md5-cache/dev-util/dropwatch-1.4-r1
+++ b/metadata/md5-cache/dev-util/dropwatch-1.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libnl:3 sys-libs/binutils-libs sys-libs/readline:=
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/d/r/dropwatch/dropwatch-1.4.tbz2
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=7710b057f84563a344fb1e3528a999ac
diff --git a/metadata/md5-cache/dev-util/dropwatch-1.4_p20150706 b/metadata/md5-cache/dev-util/dropwatch-1.4_p20150706
index 00cf4931ef46..56472c8a646e 100644
--- a/metadata/md5-cache/dev-util/dropwatch-1.4_p20150706
+++ b/metadata/md5-cache/dev-util/dropwatch-1.4_p20150706
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libnl:3 sys-libs/binutils-libs:= sys-libs/readline:=
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~bircoph/distfiles/dropwatch-1.4_p20150706.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=214846a1889f7a7012fc43bd47accbdd
diff --git a/metadata/md5-cache/dev-util/dwarves-1.10_p20140618 b/metadata/md5-cache/dev-util/dwarves-1.10_p20140618
index e1bf85c123ae..20c687a10a2a 100644
--- a/metadata/md5-cache/dev-util/dwarves-1.10_p20140618
+++ b/metadata/md5-cache/dev-util/dwarves-1.10_p20140618
@@ -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://dev.gentoo.org/~flameeyes/dwarves/dwarves-1.10_p20140618.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=75bcaa4ac057514b5e9e4e6e80ed168a
diff --git a/metadata/md5-cache/dev-util/dwarves-1.10_p20160519 b/metadata/md5-cache/dev-util/dwarves-1.10_p20160519
index 8884c4b3fed0..730326b49d4f 100644
--- a/metadata/md5-cache/dev-util/dwarves-1.10_p20160519
+++ b/metadata/md5-cache/dev-util/dwarves-1.10_p20160519
@@ -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://dev.gentoo.org/~zzam/dwarves/dwarves-1.10_p20160519.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=646f5f01039e08fabace4d73a5136dd6
diff --git a/metadata/md5-cache/dev-util/dwarves-1.10_p20160630 b/metadata/md5-cache/dev-util/dwarves-1.10_p20160630
index 9baba88fb145..321ba682d15b 100644
--- a/metadata/md5-cache/dev-util/dwarves-1.10_p20160630
+++ b/metadata/md5-cache/dev-util/dwarves-1.10_p20160630
@@ -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://dev.gentoo.org/~zzam/dwarves/dwarves-1.10_p20160630.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=646f5f01039e08fabace4d73a5136dd6
diff --git a/metadata/md5-cache/dev-util/dwarves-1.12 b/metadata/md5-cache/dev-util/dwarves-1.12
index 065b7dce1cc5..f2d77687ada2 100644
--- a/metadata/md5-cache/dev-util/dwarves-1.12
+++ b/metadata/md5-cache/dev-util/dwarves-1.12
@@ -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=http://fedorapeople.org/~acme/dwarves/dwarves-1.12.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=00bf7c292a3fe0c2c4b65e999a098939
diff --git a/metadata/md5-cache/dev-util/dwarves-9999 b/metadata/md5-cache/dev-util/dwarves-9999
index 3b9c7af5c04f..e2447b52857e 100644
--- a/metadata/md5-cache/dev-util/dwarves-9999
+++ b/metadata/md5-cache/dev-util/dwarves-9999
@@ -8,5 +8,5 @@ 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-libs/elfutils-0.131 sys-libs/zlib
 REQUIRED_USE=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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8b8a8365ffabac2803d62b2433529ca8
diff --git a/metadata/md5-cache/dev-util/edb-debugger-0.9.21 b/metadata/md5-cache/dev-util/edb-debugger-0.9.21
index c9963137320b..7d7863ff05d7 100644
--- a/metadata/md5-cache/dev-util/edb-debugger-0.9.21
+++ b/metadata/md5-cache/dev-util/edb-debugger-0.9.21
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/capstone-3.0 graphviz? ( media-gfx/graphviz ) dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 dev-qt/qtnetwork:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtcore:5
 SLOT=0
 SRC_URI=https://github.com/eteran/edb-debugger/releases/download/0.9.21/edb-debugger-0.9.21.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3c59d075b88c1295340cf18ca06aa3cc
diff --git a/metadata/md5-cache/dev-util/edb-debugger-1.0.0-r1 b/metadata/md5-cache/dev-util/edb-debugger-1.0.0-r1
index 4d046b80e259..f34a70564ba5 100644
--- a/metadata/md5-cache/dev-util/edb-debugger-1.0.0-r1
+++ b/metadata/md5-cache/dev-util/edb-debugger-1.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/capstone dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 graphviz? ( media-gfx/graphviz )
 SLOT=0
 SRC_URI=https://github.com/eteran/edb-debugger/releases/download/1.0.0/edb-debugger-1.0.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b2a5c03408e266f3b14023f19c5eae37
diff --git a/metadata/md5-cache/dev-util/edb-debugger-9999 b/metadata/md5-cache/dev-util/edb-debugger-9999
index a9aee81fff03..4b718e34a410 100644
--- a/metadata/md5-cache/dev-util/edb-debugger-9999
+++ b/metadata/md5-cache/dev-util/edb-debugger-9999
@@ -7,5 +7,5 @@ IUSE=graphviz
 LICENSE=GPL-2+
 RDEPEND=dev-libs/capstone dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 graphviz? ( media-gfx/graphviz )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e8409a2120aca1fc3712ad8f7b344597
diff --git a/metadata/md5-cache/dev-util/electron-1.6.16 b/metadata/md5-cache/dev-util/electron-1.6.16
index 8b7605d8c6a8..0992ba913a48 100644
--- a/metadata/md5-cache/dev-util/electron-1.6.16
+++ b/metadata/md5-cache/dev-util/electron-1.6.16
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2:= >=app-eselect/eselect-electron-2.0 cups? ( >=net-print/
 RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=1.6
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-56.0.2924.87.tar.xz https://github.com/electron/electron/archive/v1.6.16.tar.gz -> electron-1.6.16.tar.gz https://github.com/electron/chromium-breakpad/archive/c566c50d81f7b1edeaee9f11f5d07bda858d6b64.tar.gz -> electron-chromium-breakpad-c566c50d81f7b1edeaee9f11f5d07bda858d6b64.tar.gz https://github.com/google/breakpad/archive/e35167de7516448fcc2bf687ad580b9d8b6aedc2.tar.gz -> electron-breakpad-e35167de7516448fcc2bf687ad580b9d8b6aedc2.tar.gz https://github.com/electron/brightray/archive/909c49265493bd095c27cefd999567be2107899a.tar.gz -> electron-brightray-909c49265493bd095c27cefd999567be2107899a.tar.gz https://github.com/electron/node/archive/9b1683e7000481ec6214eafa3eef7ac4594eb410.tar.gz -> electron-node-9b1683e7000481ec6214eafa3eef7ac4594eb410.tar.gz https://github.com/zcbenz/native-mate/archive/fd0e7dc4ab778f0d1ccda6c9640464ea06ee771e.tar.gz -> electron-native-mate-fd0e7dc4ab778f0d1ccda6c9640464ea06ee771e.tar.gz https://github.com/electron/pdf-viewer/archive/a050a339cfeabcfb5f07c313161d2ee27b6c3a39.tar.gz -> electron-pdf-viewer-a050a339cfeabcfb5f07c313161d2ee27b6c3a39.tar.gz https://github.com/elprans/grit/archive/9536fb6429147d27ef1563088341825db0a893cd.tar.gz -> electron-grit-9536fb6429147d27ef1563088341825db0a893cd.tar.gz https://github.com/electron/libchromiumcontent/archive/a9b88fab38a8162bb485cc5854973f71ea0bc7a6.tar.gz -> electron-libchromiumcontent-a9b88fab38a8162bb485cc5854973f71ea0bc7a6.tar.gz https://github.com/elprans/asar/releases/download/v0.13.0-gentoo/asar-build.tar.gz -> asar-0.13.0.tar.gz https://github.com/elprans/node-browserify/releases/download/14.0.0-gentoo/browserify-build.tar.gz -> browserify-14.0.0.tar.gz https://github.com/elprans/gentoo-electron-patches/archive/electron-1.6.16.tar.gz -> electron-patches-1.6.16.tar.gz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	chromium-2	3d468f3fc7ed63c78db7408ea04246e3	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	pax-utils	e85f015e815dd463b0c206d781ef45a5	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=de3d4415034bb1c230dd795e7a6477d0
diff --git a/metadata/md5-cache/dev-util/electron-1.7.15 b/metadata/md5-cache/dev-util/electron-1.7.15
index e85b0a4660d0..327da1e6b994 100644
--- a/metadata/md5-cache/dev-util/electron-1.7.15
+++ b/metadata/md5-cache/dev-util/electron-1.7.15
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2:= >=app-eselect/eselect-electron-2.0 cups? ( >=net-print/
 RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=1.7
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-58.0.3029.110.tar.xz https://github.com/electron/electron/archive/v1.7.15.tar.gz -> electron-1.7.15.tar.gz https://github.com/electron/chromium-breakpad/archive/c566c50d81f7b1edeaee9f11f5d07bda858d6b64.tar.gz -> electron-chromium-breakpad-c566c50d81f7b1edeaee9f11f5d07bda858d6b64.tar.gz https://github.com/google/breakpad/archive/e35167de7516448fcc2bf687ad580b9d8b6aedc2.tar.gz -> electron-breakpad-e35167de7516448fcc2bf687ad580b9d8b6aedc2.tar.gz https://github.com/electron/node/archive/a992f2ff412b85606ec1d4c1eb00ad832fa1e640.tar.gz -> electron-node-a992f2ff412b85606ec1d4c1eb00ad832fa1e640.tar.gz https://github.com/zcbenz/native-mate/archive/7d9c1a80f025f4c46f7da8ea73246fe0f1968579.tar.gz -> electron-native-mate-7d9c1a80f025f4c46f7da8ea73246fe0f1968579.tar.gz https://github.com/electron/pdf-viewer/archive/beb36874a6b61d7a18b92bf7dcd1f0661e4c59cf.tar.gz -> electron-pdf-viewer-beb36874a6b61d7a18b92bf7dcd1f0661e4c59cf.tar.gz https://github.com/elprans/grit/archive/9536fb6429147d27ef1563088341825db0a893cd.tar.gz -> electron-grit-9536fb6429147d27ef1563088341825db0a893cd.tar.gz https://github.com/electron/libchromiumcontent/archive/2f7b83669315f9492380334d1a8b1cd9bc758efd.tar.gz -> electron-libchromiumcontent-2f7b83669315f9492380334d1a8b1cd9bc758efd.tar.gz https://github.com/elprans/asar/releases/download/v0.13.0-gentoo/asar-build.tar.gz -> asar-0.13.0.tar.gz https://github.com/elprans/node-browserify/releases/download/14.0.0-gentoo/browserify-build.tar.gz -> browserify-14.0.0.tar.gz https://github.com/elprans/gentoo-electron-patches/archive/electron-1.7.15.tar.gz -> electron-patches-1.7.15.tar.gz https://github.com/ninja-build/ninja/archive/v1.8.2.tar.gz -> ninja-1.8.2.tar.gz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	chromium-2	3d468f3fc7ed63c78db7408ea04246e3	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	pax-utils	e85f015e815dd463b0c206d781ef45a5	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2a7814fa6e8ce92b2052850713904264
diff --git a/metadata/md5-cache/dev-util/emilpro-3-r3 b/metadata/md5-cache/dev-util/emilpro-3-r3
index 780fd528b06a..1c34d0700e64 100644
--- a/metadata/md5-cache/dev-util/emilpro-3-r3
+++ b/metadata/md5-cache/dev-util/emilpro-3-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-cpp/gtkmm:3.0 dev-cpp/gtksourceviewmm:3.0 dev-cpp/libxmlpp:2.6 dev-cpp/glibmm dev-cpp/pangomm dev-cpp/cairomm dev-libs/libsigc++:2 dev-libs/glib:2 system-binutils? ( >=sys-libs/binutils-libs-2.25.1-r2:=[multitarget] ) net-misc/curl virtual/libelf:0=
 SLOT=0
 SRC_URI=http://www.emilpro.com/emilpro-3.tar.gz !system-binutils? ( mirror://gnu/binutils/binutils-2.23.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3529a250050b53240f90c65cdad613e6
diff --git a/metadata/md5-cache/dev-util/emilpro-9999 b/metadata/md5-cache/dev-util/emilpro-9999
index e79a8f64b1c7..6a9d0c57e1b9 100644
--- a/metadata/md5-cache/dev-util/emilpro-9999
+++ b/metadata/md5-cache/dev-util/emilpro-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-cpp/gtkmm:3.0 dev-cpp/gtksourceviewmm:3.0 dev-cpp/libxmlpp:2.6 dev-cpp/glibmm dev-cpp/pangomm dev-cpp/cairomm dev-libs/libsigc++:2 dev-libs/glib:2 system-binutils? ( >=sys-libs/binutils-libs-2.25.1-r2:=[multitarget] ) net-misc/curl virtual/libelf:0=
 SLOT=0
 SRC_URI=!system-binutils? ( mirror://gnu/binutils/binutils-2.23.2.tar.bz2 )
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9f8ae991a4e9ca52f179e8f6828a6005
diff --git a/metadata/md5-cache/dev-util/eric-17.12-r1 b/metadata/md5-cache/dev-util/eric-17.12-r1
index 6d3326e2f771..cd40aac5ddd4 100644
--- a/metadata/md5-cache/dev-util/eric-17.12-r1
+++ b/metadata/md5-cache/dev-util/eric-17.12-r1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,
 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=6
 SRC_URI=mirror://sourceforge/eric-ide/eric6/stable/17.12/eric6-17.12.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3604e6000285dfc5f106661fce823f2b
diff --git a/metadata/md5-cache/dev-util/eric-18.03 b/metadata/md5-cache/dev-util/eric-18.03
index adcb437b1e77..44746124926c 100644
--- a/metadata/md5-cache/dev-util/eric-18.03
+++ b/metadata/md5-cache/dev-util/eric-18.03
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,
 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=6
 SRC_URI=mirror://sourceforge/eric-ide/eric6/stable/18.03/eric6-18.03.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3604e6000285dfc5f106661fce823f2b
diff --git a/metadata/md5-cache/dev-util/fatrace-0.12 b/metadata/md5-cache/dev-util/fatrace-0.12
index 28792f96890b..d5ca423142c3 100644
--- a/metadata/md5-cache/dev-util/fatrace-0.12
+++ b/metadata/md5-cache/dev-util/fatrace-0.12
@@ -10,5 +10,5 @@ RDEPEND=powertop? ( python_targets_python3_4? ( dev-lang/python:3.4 ) python_tar
 REQUIRED_USE=powertop? ( || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://launchpad.net/fatrace/trunk/0.12/+download/fatrace-0.12.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7c8ed963c0d67c6bf911ea4cc6ac4aeb
diff --git a/metadata/md5-cache/dev-util/gcovr-3.2 b/metadata/md5-cache/dev-util/gcovr-3.2
index c50ff2e93dba..036503fc4937 100644
--- a/metadata/md5-cache/dev-util/gcovr-3.2
+++ b/metadata/md5-cache/dev-util/gcovr-3.2
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/gcovr/gcovr/archive/3.2.tar.gz -> gcovr-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e9553e6675cbd52d3f05d1a0356ee23b
diff --git a/metadata/md5-cache/dev-util/gcovr-3.3 b/metadata/md5-cache/dev-util/gcovr-3.3
index 662d703f0ca3..b9582098a375 100644
--- a/metadata/md5-cache/dev-util/gcovr-3.3
+++ b/metadata/md5-cache/dev-util/gcovr-3.3
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/gcovr/gcovr/archive/3.3.tar.gz -> gcovr-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1c593d759570f02b528724db414a9db9
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.52.3 b/metadata/md5-cache/dev-util/gdbus-codegen-2.52.3
index 09412466cb46..78570b25fba0 100644
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.52.3
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.52.3
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.52/glib-2.52.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	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_=4b8e750a8cd468fcf90dda111ca9fa6c
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.54.3 b/metadata/md5-cache/dev-util/gdbus-codegen-2.54.3
index f254a268d80d..0d11f8087092 100644
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.54.3
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.54.3
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.54/glib-2.54.3.tar.xz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7b27b81d44684e018512dde861546235
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.56.2-r1 b/metadata/md5-cache/dev-util/gdbus-codegen-2.56.2-r1
index fcfd42e5c438..45c5933d4ae3 100644
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.56.2-r1
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.56.2-r1
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] )
 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=mirror://gnome/sources/glib/2.56/glib-2.56.2.tar.xz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dfaf0958d129baaa2d5eea3faca16134
diff --git a/metadata/md5-cache/dev-util/geany-1.30.1 b/metadata/md5-cache/dev-util/geany-1.30.1
index 3c80ea496724..f8784eacb948 100644
--- a/metadata/md5-cache/dev-util/geany-1.30.1
+++ b/metadata/md5-cache/dev-util/geany-1.30.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ HPND
 RDEPEND=>=dev-libs/glib-2.32:2 !gtk3? ( >=x11-libs/gtk+-2.24:2 vte? ( x11-libs/vte:0 ) ) gtk3? ( >=x11-libs/gtk+-3.0:3 vte? ( x11-libs/vte:2.91 ) )
 SLOT=0
 SRC_URI=https://download.geany.org/geany-1.30.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=35852be7ec857a7f3d83addaacee80c9
diff --git a/metadata/md5-cache/dev-util/geany-1.32 b/metadata/md5-cache/dev-util/geany-1.32
index 03c9bbf80f20..fb8a92bf8287 100644
--- a/metadata/md5-cache/dev-util/geany-1.32
+++ b/metadata/md5-cache/dev-util/geany-1.32
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ HPND
 RDEPEND=>=dev-libs/glib-2.32:2 !gtk3? ( >=x11-libs/gtk+-2.24:2 vte? ( x11-libs/vte:0 ) ) gtk3? ( >=x11-libs/gtk+-3.0:3 vte? ( x11-libs/vte:2.91 ) )
 SLOT=0
 SRC_URI=https://download.geany.org/geany-1.32.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1b7670e4b1c04ca17a8b9600b29e44f5
diff --git a/metadata/md5-cache/dev-util/geany-1.33 b/metadata/md5-cache/dev-util/geany-1.33
index 029551a0b416..f5961253fcf4 100644
--- a/metadata/md5-cache/dev-util/geany-1.33
+++ b/metadata/md5-cache/dev-util/geany-1.33
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ HPND
 RDEPEND=>=dev-libs/glib-2.32:2 !gtk3? ( >=x11-libs/gtk+-2.24:2 vte? ( x11-libs/vte:0 ) ) gtk3? ( >=x11-libs/gtk+-3.0:3 vte? ( x11-libs/vte:2.91 ) )
 SLOT=0
 SRC_URI=https://download.geany.org/geany-1.33.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f888ad9956d6f7e115657fdc92f4051b
diff --git a/metadata/md5-cache/dev-util/geany-9999 b/metadata/md5-cache/dev-util/geany-9999
index bdc748d72634..c0e135427423 100644
--- a/metadata/md5-cache/dev-util/geany-9999
+++ b/metadata/md5-cache/dev-util/geany-9999
@@ -7,5 +7,5 @@ IUSE=gtk3 +vte
 LICENSE=GPL-2+ HPND
 RDEPEND=>=dev-libs/glib-2.32:2 !gtk3? ( >=x11-libs/gtk+-2.24:2 vte? ( x11-libs/vte:0 ) ) gtk3? ( >=x11-libs/gtk+-3.0:3 vte? ( x11-libs/vte:2.91 ) )
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f888ad9956d6f7e115657fdc92f4051b
diff --git a/metadata/md5-cache/dev-util/gertty-1.3.2 b/metadata/md5-cache/dev-util/gertty-1.3.2
index aa3a237d1f0e..7644abcf1d04 100644
--- a/metadata/md5-cache/dev-util/gertty-1.3.2
+++ b/metadata/md5-cache/dev-util/gertty-1.3.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-0.11[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gertty/gertty-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dce6060d0b1997b106d6dc20f3ca796e
diff --git a/metadata/md5-cache/dev-util/gertty-1.4.0 b/metadata/md5-cache/dev-util/gertty-1.4.0
index 8732dbca861f..8ab40e0fd515 100644
--- a/metadata/md5-cache/dev-util/gertty-1.4.0
+++ b/metadata/md5-cache/dev-util/gertty-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-0.11[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gertty/gertty-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dce6060d0b1997b106d6dc20f3ca796e
diff --git a/metadata/md5-cache/dev-util/gertty-1.5.0 b/metadata/md5-cache/dev-util/gertty-1.5.0
index 9981d24ff58c..1af75afef595 100644
--- a/metadata/md5-cache/dev-util/gertty-1.5.0
+++ b/metadata/md5-cache/dev-util/gertty-1.5.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-0.11[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gertty/gertty-1.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bf5235bd6ac4dce14c71155d80641cab
diff --git a/metadata/md5-cache/dev-util/glade-3.20.2 b/metadata/md5-cache/dev-util/glade-3.20.2
index c0d5b0f5d304..6384a1fff938 100644
--- a/metadata/md5-cache/dev-util/glade-3.20.2
+++ b/metadata/md5-cache/dev-util/glade-3.20.2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/atk[introspection?] >=dev-libs/glib-2.32:2 >=dev-libs/libxml2-2
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=3.10/6
 SRC_URI=mirror://gnome/sources/glade/3.20/glade-3.20.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=15a89d7e462c8925351c0d77d6d6c938
diff --git a/metadata/md5-cache/dev-util/glade-3.20.4 b/metadata/md5-cache/dev-util/glade-3.20.4
index e90de354290d..985c3c205906 100644
--- a/metadata/md5-cache/dev-util/glade-3.20.4
+++ b/metadata/md5-cache/dev-util/glade-3.20.4
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/atk[introspection?] >=dev-libs/glib-2.32:2 >=dev-libs/libxml2-2
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=3.10/6
 SRC_URI=mirror://gnome/sources/glade/3.20/glade-3.20.4.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c0b1b5ba441da317a324a353c6cdf96c
diff --git a/metadata/md5-cache/dev-util/glslang-6.2.2596 b/metadata/md5-cache/dev-util/glslang-6.2.2596
index 1749abca61b0..4743f38f62d4 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c333c4707ab0d100a191bb4d6aa2a18c
diff --git a/metadata/md5-cache/dev-util/glslang-7.9.2888 b/metadata/md5-cache/dev-util/glslang-7.9.2888
index e46d26d7b9a6..d4629fd27fdf 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f0e8b409221203417b977693b4c1a743
diff --git a/metadata/md5-cache/dev-util/glslang-9999 b/metadata/md5-cache/dev-util/glslang-9999
index 65766cb62491..00d3e9d2427b 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d9378b5f7e3da41762c0e09824c0bf9f
diff --git a/metadata/md5-cache/dev-util/gnome-builder-3.24.2-r1 b/metadata/md5-cache/dev-util/gnome-builder-3.24.2-r1
index 6dd6c229ca31..da5b59cd704d 100644
--- a/metadata/md5-cache/dev-util/gnome-builder-3.24.2-r1
+++ b/metadata/md5-cache/dev-util/gnome-builder-3.24.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-builder/3.24/gnome-builder-3.24.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e3a9bc037c7308e89c57684c7028d8e9
diff --git a/metadata/md5-cache/dev-util/gnome-builder-3.28.4 b/metadata/md5-cache/dev-util/gnome-builder-3.28.4
index 7df70c9d909c..4664ddf239d3 100644
--- a/metadata/md5-cache/dev-util/gnome-builder-3.28.4
+++ b/metadata/md5-cache/dev-util/gnome-builder-3.28.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libdazzle-3.28.0[introspection,vala?] >=dev-libs/glib-2.56.0:
 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=mirror://gnome/sources/gnome-builder/3.28/gnome-builder-3.28.4.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5e2bb586269a1702b9329b8bebe51109
diff --git a/metadata/md5-cache/dev-util/gnome-devel-docs-3.22.1 b/metadata/md5-cache/dev-util/gnome-devel-docs-3.22.1
index 5fc14526c2ee..ce61e0f2ca2f 100644
--- a/metadata/md5-cache/dev-util/gnome-devel-docs-3.22.1
+++ b/metadata/md5-cache/dev-util/gnome-devel-docs-3.22.1
@@ -8,5 +8,5 @@ LICENSE=FDL-1.1+ CC-BY-SA-3.0 CC-BY-SA-4.0
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-devel-docs/3.22/gnome-devel-docs-3.22.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=748fbce61e06c84206defa8dd5dce132
diff --git a/metadata/md5-cache/dev-util/gob-2.0.20 b/metadata/md5-cache/dev-util/gob-2.0.20
index 97b8bb5caf36..cd93959ef387 100644
--- a/metadata/md5-cache/dev-util/gob-2.0.20
+++ b/metadata/md5-cache/dev-util/gob-2.0.20
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.4:2
 SLOT=2
 SRC_URI=mirror://gnome/sources/gob2/2.0/gob2-2.0.20.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a9ed3772bd265d449be6ae12f6966675
diff --git a/metadata/md5-cache/dev-util/gprof2dot-2016.10.13 b/metadata/md5-cache/dev-util/gprof2dot-2016.10.13
index 7a572c421dce..2bef6ddd2202 100644
--- a/metadata/md5-cache/dev-util/gprof2dot-2016.10.13
+++ b/metadata/md5-cache/dev-util/gprof2dot-2016.10.13
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gprof2dot/gprof2dot-2016.10.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=98268bdd3555c0c10502babf74893789
diff --git a/metadata/md5-cache/dev-util/gprof2dot-2017.09.19 b/metadata/md5-cache/dev-util/gprof2dot-2017.09.19
index 6ca09945fb24..54810b92eb96 100644
--- a/metadata/md5-cache/dev-util/gprof2dot-2017.09.19
+++ b/metadata/md5-cache/dev-util/gprof2dot-2017.09.19
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gprof2dot/gprof2dot-2017.9.19.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7f183955615b218bd3d9709ce126db8c
diff --git a/metadata/md5-cache/dev-util/gquilt-0.25-r1 b/metadata/md5-cache/dev-util/gquilt-0.25-r1
index 5e608698565c..0aafa2c67f01 100644
--- a/metadata/md5-cache/dev-util/gquilt-0.25-r1
+++ b/metadata/md5-cache/dev-util/gquilt-0.25-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jy
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://sourceforge/gquilt/gquilt-0.25.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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=eaa8473bf86e6d7d8f504275b1f20bf0
diff --git a/metadata/md5-cache/dev-util/gtk-doc-1.25-r1 b/metadata/md5-cache/dev-util/gtk-doc-1.25-r1
index ab16a7563cfc..1983e0074796 100644
--- a/metadata/md5-cache/dev-util/gtk-doc-1.25-r1
+++ b/metadata/md5-cache/dev-util/gtk-doc-1.25-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=mirror://gnome/sources/gtk-doc/1.25/gtk-doc-1.25.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1f556075bbeb6d1744b1683c14284b81
diff --git a/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.22.19 b/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.22.19
index f78f2c765d26..2ad90fb49708 100644
--- a/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.22.19
+++ b/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.22.19
@@ -8,5 +8,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.49.4:2 >=x11-libs/gdk-pixbuf-2.30:2 !<x11-libs/gtk+-2.24.28-r1:2 !<x11-libs/gtk+-3.22.2:3
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~eva/distfiles/gtk-update-icon-cache/gtk-update-icon-cache-3.22.19.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=99a104d3ee678ac48e4e4a54fbc91046
diff --git a/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.0 b/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.0
index eebede78dc45..827ac64692ed 100644
--- a/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.0
+++ b/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.0
@@ -8,5 +8,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.49.4:2 >=x11-libs/gdk-pixbuf-2.30:2 !<x11-libs/gtk+-2.24.28-r1:2 !<x11-libs/gtk+-3.22.2:3
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~leio/distfiles/gtk-update-icon-cache/gtk-update-icon-cache-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a6323b7baa0c143dabb2488357b4636b
diff --git a/metadata/md5-cache/dev-util/gyp-20170904022846 b/metadata/md5-cache/dev-util/gyp-20170904022846
index 1c03aff4a301..cad016dabc7b 100644
--- a/metadata/md5-cache/dev-util/gyp-20170904022846
+++ b/metadata/md5-cache/dev-util/gyp-20170904022846
@@ -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 python_targets_python2_7
 SLOT=0
 SRC_URI=https://home.apache.org/~arfrever/distfiles/gyp-20170904022846.tar.xz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7c8372bb33c756a98e3b0861eda970dc
diff --git a/metadata/md5-cache/dev-util/gyp-99999999999999 b/metadata/md5-cache/dev-util/gyp-99999999999999
index 035111a2e7b5..1cf917cf443f 100644
--- a/metadata/md5-cache/dev-util/gyp-99999999999999
+++ b/metadata/md5-cache/dev-util/gyp-99999999999999
@@ -8,5 +8,5 @@ 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_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/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(+)] python_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 python_targets_python2_7
 SLOT=0
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5717456e8197bfe8d6c1a01489c56813
diff --git a/metadata/md5-cache/dev-util/heaptrack-9999 b/metadata/md5-cache/dev-util/heaptrack-9999
index 00300c071554..df11e45e352a 100644
--- a/metadata/md5-cache/dev-util/heaptrack-9999
+++ b/metadata/md5-cache/dev-util/heaptrack-9999
@@ -7,5 +7,5 @@ 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 )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4b856227d68d1ca4b6b116ba46d936a2
diff --git a/metadata/md5-cache/dev-util/howdoi-1.1.12 b/metadata/md5-cache/dev-util/howdoi-1.1.12
index 3051fe9fc292..1176a2d25fa4 100644
--- a/metadata/md5-cache/dev-util/howdoi-1.1.12
+++ b/metadata/md5-cache/dev-util/howdoi-1.1.12
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/h/howdoi/howdoi-1.1.12.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c168262135aabb3b098c42c8ce33973d
diff --git a/metadata/md5-cache/dev-util/icemon-3.1.0 b/metadata/md5-cache/dev-util/icemon-3.1.0
index 96a8ea0398ac..5b6a6c63be71 100644
--- a/metadata/md5-cache/dev-util/icemon-3.1.0
+++ b/metadata/md5-cache/dev-util/icemon-3.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 sys-devel/icecream
 SLOT=0
 SRC_URI=https://github.com/icecc/icemon/archive/v3.1.0.tar.gz -> icemon-3.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=483bf574f79f3c580b395e60e3d77471
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 2025a8633914..943070f1513f 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=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 538827005883..b68c047abe67 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1a57037bbc779008f86219a96780df6c
diff --git a/metadata/md5-cache/dev-util/igprof-5.9.11 b/metadata/md5-cache/dev-util/igprof-5.9.11
index 284700bfebbc..10fd3a044e8e 100644
--- a/metadata/md5-cache/dev-util/igprof-5.9.11
+++ b/metadata/md5-cache/dev-util/igprof-5.9.11
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre sys-libs/libunwind
 SLOT=0
 SRC_URI=https://github.com/ktf/igprof/archive/v5.9.11.tar.gz -> igprof-5.9.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a7ba20399daffa91067452579381dba6
diff --git a/metadata/md5-cache/dev-util/include-what-you-use-4.0-r2 b/metadata/md5-cache/dev-util/include-what-you-use-4.0-r2
index 761f4d888203..50ea44aa599d 100644
--- a/metadata/md5-cache/dev-util/include-what-you-use-4.0-r2
+++ b/metadata/md5-cache/dev-util/include-what-you-use-4.0-r2
@@ -10,5 +10,5 @@ RDEPEND=sys-devel/llvm:4 sys-devel/clang:4 python_single_target_python2_7? ( >=d
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/include-what-you-use/include-what-you-use/archive/clang_4.0.tar.gz -> include-what-you-use-4.0.src.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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_=93deb33f18785acb801103f5c80c1028
diff --git a/metadata/md5-cache/dev-util/include-what-you-use-5.0 b/metadata/md5-cache/dev-util/include-what-you-use-5.0
index 8d1292925c8a..7e81c1f70d15 100644
--- a/metadata/md5-cache/dev-util/include-what-you-use-5.0
+++ b/metadata/md5-cache/dev-util/include-what-you-use-5.0
@@ -10,5 +10,5 @@ RDEPEND=sys-devel/llvm:5 sys-devel/clang:5 python_single_target_python2_7? ( >=d
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/include-what-you-use/include-what-you-use/archive/clang_5.0.tar.gz -> include-what-you-use-5.0.src.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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_=72c2b4b2168ee979155293abef911a1b
diff --git a/metadata/md5-cache/dev-util/include-what-you-use-6.0 b/metadata/md5-cache/dev-util/include-what-you-use-6.0
index bd3aaadb258a..2adad6cba470 100644
--- a/metadata/md5-cache/dev-util/include-what-you-use-6.0
+++ b/metadata/md5-cache/dev-util/include-what-you-use-6.0
@@ -10,5 +10,5 @@ RDEPEND=sys-devel/llvm:6 sys-devel/clang:6 python_single_target_python2_7? ( >=d
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/include-what-you-use/include-what-you-use/archive/clang_6.0.tar.gz -> include-what-you-use-6.0.src.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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_=612f760abb7438b5d522275095eeb8fa
diff --git a/metadata/md5-cache/dev-util/kcov-33 b/metadata/md5-cache/dev-util/kcov-33
index a50fdc9a355b..77ef5a3c64e8 100644
--- a/metadata/md5-cache/dev-util/kcov-33
+++ b/metadata/md5-cache/dev-util/kcov-33
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/elfutils net-misc/curl sys-devel/binutils:* sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/SimonKagstrom/kcov/archive/v33.tar.gz -> kcov-33.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=29e968dc11671ec1328a5142b238bff9
diff --git a/metadata/md5-cache/dev-util/kcov-34 b/metadata/md5-cache/dev-util/kcov-34
index d55c29ccf297..0708d5517fff 100644
--- a/metadata/md5-cache/dev-util/kcov-34
+++ b/metadata/md5-cache/dev-util/kcov-34
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/elfutils net-misc/curl sys-devel/binutils:* sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/SimonKagstrom/kcov/archive/v34.tar.gz -> kcov-34.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=29e968dc11671ec1328a5142b238bff9
diff --git a/metadata/md5-cache/dev-util/kcov-9999 b/metadata/md5-cache/dev-util/kcov-9999
index 73b0d04313f0..b2415826b9f0 100644
--- a/metadata/md5-cache/dev-util/kcov-9999
+++ b/metadata/md5-cache/dev-util/kcov-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/SimonKagstrom/kcov
 LICENSE=GPL-2
 RDEPEND=dev-libs/elfutils net-misc/curl sys-devel/binutils:* sys-libs/zlib
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=95788b962de66ef230e94e0de7269a1b
diff --git a/metadata/md5-cache/dev-util/kdbg-3.0.0 b/metadata/md5-cache/dev-util/kdbg-3.0.0
index 52d125e526d4..3a69e94337bf 100644
--- a/metadata/md5-cache/dev-util/kdbg-3.0.0
+++ b/metadata/md5-cache/dev-util/kdbg-3.0.0
@@ -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/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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index ff9c724d5a18..d00cd1ad5962 100644
--- a/metadata/md5-cache/dev-util/kdevelop-5.2.3
+++ b/metadata/md5-cache/dev-util/kdevelop-5.2.3
@@ -11,5 +11,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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 10f702d01995..ce173c5416b3 100644
--- a/metadata/md5-cache/dev-util/kdevelop-5.2.4
+++ b/metadata/md5-cache/dev-util/kdevelop-5.2.4
@@ -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/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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
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 c4ba6703b38d..04ec9b641140 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
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 8b2f951918b5..7cd8a8740b9b 100644
--- a/metadata/md5-cache/dev-util/kdevelop-php-5.2.3
+++ b/metadata/md5-cache/dev-util/kdevelop-php-5.2.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0: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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 9532cd76cd20..6f825d2ce859 100644
--- a/metadata/md5-cache/dev-util/kdevelop-php-5.2.4
+++ b/metadata/md5-cache/dev-util/kdevelop-php-5.2.4
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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-python-5.2.3 b/metadata/md5-cache/dev-util/kdevelop-python-5.2.3
index b4f58c2ddc60..d76f66673997 100644
--- a/metadata/md5-cache/dev-util/kdevelop-python-5.2.3
+++ b/metadata/md5-cache/dev-util/kdevelop-python-5.2.3
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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 8c6ebedbf1d6..78f537b322d8 100644
--- a/metadata/md5-cache/dev-util/kdevelop-python-5.2.4
+++ b/metadata/md5-cache/dev-util/kdevelop-python-5.2.4
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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
diff --git a/metadata/md5-cache/dev-util/kdstatemachineeditor-1.2.3 b/metadata/md5-cache/dev-util/kdstatemachineeditor-1.2.3
index 350cb0831841..3979cc153dba 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _md5_=16e80ca7855fb5cfdde295eb67573867
diff --git a/metadata/md5-cache/dev-util/kdstatemachineeditor-9999 b/metadata/md5-cache/dev-util/kdstatemachineeditor-9999
index b48310bba21a..08fee54ee80c 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _md5_=990ed621d1169f8fdf9f8e6ad805bdd5
diff --git a/metadata/md5-cache/dev-util/lldb-5.0.2 b/metadata/md5-cache/dev-util/lldb-5.0.2
index 200c16ed9ea6..53bf1a56936a 100644
--- a/metadata/md5-cache/dev-util/lldb-5.0.2
+++ b/metadata/md5-cache/dev-util/lldb-5.0.2
@@ -10,5 +10,5 @@ RDEPEND=libedit? ( dev-libs/libedit:0= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://releases.llvm.org/5.0.2/lldb-5.0.2.src.tar.xz test? ( https://releases.llvm.org/5.0.2/llvm-5.0.2.src.tar.xz )
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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_=699673acd534d7f9e1e8dd3e9efaae7e
diff --git a/metadata/md5-cache/dev-util/lldb-6.0.1 b/metadata/md5-cache/dev-util/lldb-6.0.1
index 4cdfc9c7e505..7d3327b8c7c4 100644
--- a/metadata/md5-cache/dev-util/lldb-6.0.1
+++ b/metadata/md5-cache/dev-util/lldb-6.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/6.0.1/lldb-6.0.1.src.tar.xz test? ( https://releases.llvm.org/6.0.1/llvm-6.0.1.src.tar.xz )
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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_=074f1403711868ef371b3e96a814cc11
diff --git a/metadata/md5-cache/dev-util/lldb-7.0.0 b/metadata/md5-cache/dev-util/lldb-7.0.0
index 2d5dd8ab0975..17bca1b65e28 100644
--- a/metadata/md5-cache/dev-util/lldb-7.0.0
+++ b/metadata/md5-cache/dev-util/lldb-7.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/7.0.0/lldb-7.0.0.src.tar.xz test? ( https://releases.llvm.org/7.0.0/llvm-7.0.0.src.tar.xz )
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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_=074f1403711868ef371b3e96a814cc11
diff --git a/metadata/md5-cache/dev-util/lldb-7.0.9999 b/metadata/md5-cache/dev-util/lldb-7.0.9999
index 02efbfc9f868..5b394200ca8d 100644
--- a/metadata/md5-cache/dev-util/lldb-7.0.9999
+++ b/metadata/md5-cache/dev-util/lldb-7.0.9999
@@ -9,5 +9,5 @@ RDEPEND=libedit? ( dev-libs/libedit:0= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=
 REQUIRED_USE=python_targets_python2_7
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	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_=dbd9c362cf9c90e3ffed6995724c8ad8
diff --git a/metadata/md5-cache/dev-util/lldb-9999 b/metadata/md5-cache/dev-util/lldb-9999
index 8c8424eba38f..2ce94e01c668 100644
--- a/metadata/md5-cache/dev-util/lldb-9999
+++ b/metadata/md5-cache/dev-util/lldb-9999
@@ -9,5 +9,5 @@ RDEPEND=libedit? ( dev-libs/libedit:0= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=
 REQUIRED_USE=python_targets_python2_7
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	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_=0daadd40c2f0938b938240736f4c5bb6
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 d8893861024e..8af10287e458 100644
--- a/metadata/md5-cache/dev-util/ltrace-0.7.3_p4
+++ b/metadata/md5-cache/dev-util/ltrace-0.7.3_p4
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/elfutils selinux? ( sys-libs/libselinux ) unwind? ( sys-libs/li
 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_=7b2d82944d5e53cd7c35bfda37c4d362
+_md5_=a9950486994f9cd97d9e6cb7ab9c8414
diff --git a/metadata/md5-cache/dev-util/lttng-modules-2.10.6-r1 b/metadata/md5-cache/dev-util/lttng-modules-2.10.6-r1
index a0adeb06835a..12c507492965 100644
--- a/metadata/md5-cache/dev-util/lttng-modules-2.10.6-r1
+++ b/metadata/md5-cache/dev-util/lttng-modules-2.10.6-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0/2.10
 SRC_URI=http://lttng.org/files/lttng-modules/lttng-modules-2.10.6.tar.bz2
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=b9f777ac3b5498db4b0a64731a4c5ab5
diff --git a/metadata/md5-cache/dev-util/lttng-modules-2.6.4 b/metadata/md5-cache/dev-util/lttng-modules-2.6.4
index 32948d54900c..1bc2714be889 100644
--- a/metadata/md5-cache/dev-util/lttng-modules-2.6.4
+++ b/metadata/md5-cache/dev-util/lttng-modules-2.6.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0/2.6
 SRC_URI=http://lttng.org/files/lttng-modules/lttng-modules-2.6.4.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=91e4f225dda39079dc4bdf8741eced76
diff --git a/metadata/md5-cache/dev-util/lttng-modules-2.7.1 b/metadata/md5-cache/dev-util/lttng-modules-2.7.1
index 717c3710e796..c242e987cd73 100644
--- a/metadata/md5-cache/dev-util/lttng-modules-2.7.1
+++ b/metadata/md5-cache/dev-util/lttng-modules-2.7.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0/2.7
 SRC_URI=http://lttng.org/files/lttng-modules/lttng-modules-2.7.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=94879e5932c4bbe7a73c93f9fd464676
diff --git a/metadata/md5-cache/dev-util/lttng-modules-2.7.4 b/metadata/md5-cache/dev-util/lttng-modules-2.7.4
index a0276e275292..840f8fc9c8a3 100644
--- a/metadata/md5-cache/dev-util/lttng-modules-2.7.4
+++ b/metadata/md5-cache/dev-util/lttng-modules-2.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0/2.7
 SRC_URI=http://lttng.org/files/lttng-modules/lttng-modules-2.7.4.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=91e4f225dda39079dc4bdf8741eced76
diff --git a/metadata/md5-cache/dev-util/lttng-modules-2.8.0 b/metadata/md5-cache/dev-util/lttng-modules-2.8.0
index f88db354125e..6113f41a6c44 100644
--- a/metadata/md5-cache/dev-util/lttng-modules-2.8.0
+++ b/metadata/md5-cache/dev-util/lttng-modules-2.8.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0/2.8
 SRC_URI=http://lttng.org/files/lttng-modules/lttng-modules-2.8.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=95ff2b5e5cbc28d9e83cd0ff5356b24c
diff --git a/metadata/md5-cache/dev-util/lttng-tools-2.10.5 b/metadata/md5-cache/dev-util/lttng-tools-2.10.5
index f9876500a3ab..2ce8099446fa 100644
--- a/metadata/md5-cache/dev-util/lttng-tools-2.10.5
+++ b/metadata/md5-cache/dev-util/lttng-tools-2.10.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/userspace-rcu dev-libs/popt dev-libs/libxml2 ust? ( dev-util/lttng-ust:= )
 SLOT=0/2.10
 SRC_URI=http://lttng.org/files/lttng-tools/lttng-tools-2.10.5.tar.bz2
-_eclasses_=linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=7b4acae0630e99d96b00a0e16e80c71e
diff --git a/metadata/md5-cache/dev-util/lttng-tools-2.6.1 b/metadata/md5-cache/dev-util/lttng-tools-2.6.1
index 9a3a6b08e4b7..1cfdb8c5a457 100644
--- a/metadata/md5-cache/dev-util/lttng-tools-2.6.1
+++ b/metadata/md5-cache/dev-util/lttng-tools-2.6.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/userspace-rcu dev-libs/popt dev-libs/libxml2 ust? ( dev-util/lttng-ust:= )
 SLOT=0/2.6
 SRC_URI=http://lttng.org/files/lttng-tools/lttng-tools-2.6.1.tar.bz2
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=f93586f8017ba3eaf578c5c3f988b64d
diff --git a/metadata/md5-cache/dev-util/lttng-tools-2.7.1 b/metadata/md5-cache/dev-util/lttng-tools-2.7.1
index 3bb9e925ee6d..0a7e187db950 100644
--- a/metadata/md5-cache/dev-util/lttng-tools-2.7.1
+++ b/metadata/md5-cache/dev-util/lttng-tools-2.7.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/userspace-rcu dev-libs/popt dev-libs/libxml2 ust? ( dev-util/lttng-ust:= )
 SLOT=0/2.7
 SRC_URI=http://lttng.org/files/lttng-tools/lttng-tools-2.7.1.tar.bz2
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=8a352400f658ac98607bed49b5d175dc
diff --git a/metadata/md5-cache/dev-util/lttng-tools-2.7.3 b/metadata/md5-cache/dev-util/lttng-tools-2.7.3
index b464ce9bcb16..fb2c3fb8c514 100644
--- a/metadata/md5-cache/dev-util/lttng-tools-2.7.3
+++ b/metadata/md5-cache/dev-util/lttng-tools-2.7.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/userspace-rcu dev-libs/popt dev-libs/libxml2 ust? ( dev-util/lttng-ust:= )
 SLOT=0/2.7
 SRC_URI=http://lttng.org/files/lttng-tools/lttng-tools-2.7.3.tar.bz2
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=f93586f8017ba3eaf578c5c3f988b64d
diff --git a/metadata/md5-cache/dev-util/lttng-tools-2.8.0 b/metadata/md5-cache/dev-util/lttng-tools-2.8.0
index 6d7b34c5042c..98795075b9fa 100644
--- a/metadata/md5-cache/dev-util/lttng-tools-2.8.0
+++ b/metadata/md5-cache/dev-util/lttng-tools-2.8.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/userspace-rcu dev-libs/popt dev-libs/libxml2 ust? ( dev-util/lttng-ust:= )
 SLOT=0/2.8
 SRC_URI=http://lttng.org/files/lttng-tools/lttng-tools-2.8.0.tar.bz2
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=f93586f8017ba3eaf578c5c3f988b64d
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
index d2c86212fc44..20832274124f 100644
--- a/metadata/md5-cache/dev-util/lxqt-build-tools-0.2.0
+++ b/metadata/md5-cache/dev-util/lxqt-build-tools-0.2.0
@@ -7,5 +7,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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 f653a73792c1..ee8208718f6f 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
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
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 a283683719d3..c53a92490168 100644
--- a/metadata/md5-cache/dev-util/massif-visualizer-0.7.0
+++ b/metadata/md5-cache/dev-util/massif-visualizer-0.7.0
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/meld-3.18.2 b/metadata/md5-cache/dev-util/meld-3.18.2
index 1d7c2ca93a4a..ebbbacdcb6f7 100644
--- a/metadata/md5-cache/dev-util/meld-3.18.2
+++ b/metadata/md5-cache/dev-util/meld-3.18.2
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4[xml] ) python_sing
 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=mirror://gnome/sources/meld/3.18/meld-3.18.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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_=c284dff2ab4501da74b70725569e8378
diff --git a/metadata/md5-cache/dev-util/meson-0.46.1 b/metadata/md5-cache/dev-util/meson-0.46.1
index a9d89f70a4fc..2a6258806bd5 100644
--- a/metadata/md5-cache/dev-util/meson-0.46.1
+++ b/metadata/md5-cache/dev-util/meson-0.46.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/m/meson/meson-0.46.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6f297964017d42a983a07cba924cc5cc
diff --git a/metadata/md5-cache/dev-util/meson-0.47.1 b/metadata/md5-cache/dev-util/meson-0.47.1
index c2c18b2e7d63..e56b39acb41a 100644
--- a/metadata/md5-cache/dev-util/meson-0.47.1
+++ b/metadata/md5-cache/dev-util/meson-0.47.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/m/meson/meson-0.47.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e8d193a409872725bee064245d769abe
diff --git a/metadata/md5-cache/dev-util/meson-0.48.0-r1 b/metadata/md5-cache/dev-util/meson-0.48.0-r1
deleted file mode 100644
index 84f83580b369..000000000000
--- a/metadata/md5-cache/dev-util/meson-0.48.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/m/meson/meson-0.48.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=f9d472ee0ccf5b2577bca51c30b4387b
diff --git a/metadata/md5-cache/dev-util/meson-0.48.0-r2 b/metadata/md5-cache/dev-util/meson-0.48.0-r2
new file mode 100644
index 000000000000..9d2719f648e4
--- /dev/null
+++ b/metadata/md5-cache/dev-util/meson-0.48.0-r2
@@ -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.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_=ecadf6fc6d116dba85db1806d8736e9d
diff --git a/metadata/md5-cache/dev-util/meson-9999 b/metadata/md5-cache/dev-util/meson-9999
index 8e32616153af..755faf3fa035 100644
--- a/metadata/md5-cache/dev-util/meson-9999
+++ b/metadata/md5-cache/dev-util/meson-9999
@@ -7,7 +7,6 @@ IUSE=python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 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 )
-RESTRICT=test
 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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=8507995d195033fd54c69cbd72c4e6da
+_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
diff --git a/metadata/md5-cache/dev-util/min-cscope-16.1.0 b/metadata/md5-cache/dev-util/min-cscope-16.1.0
index fdb599181b2f..8645826f271a 100644
--- a/metadata/md5-cache/dev-util/min-cscope-16.1.0
+++ b/metadata/md5-cache/dev-util/min-cscope-16.1.0
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/kscope/min-cscope-16.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=972cc7eec055c9003db83567cc3ecfb9
diff --git a/metadata/md5-cache/dev-util/mingw64-runtime-6.0.0 b/metadata/md5-cache/dev-util/mingw64-runtime-6.0.0
deleted file mode 100644
index bddb1faf2783..000000000000
--- a/metadata/md5-cache/dev-util/mingw64-runtime-6.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install setup
-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=Free Win64 runtime and import library definitions
-EAPI=6
-HOMEPAGE=http://mingw-w64.sourceforge.net/
-IUSE=headers-only idl libraries tools
-LICENSE=BSD
-RESTRICT=strip
-SLOT=0
-SRC_URI=mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v6.0.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=decdcc9f9ef64668ed6b46cebd7cf3cb
diff --git a/metadata/md5-cache/dev-util/mingw64-runtime-6.0.0-r1 b/metadata/md5-cache/dev-util/mingw64-runtime-6.0.0-r1
new file mode 100644
index 000000000000..dc79baccfbb5
--- /dev/null
+++ b/metadata/md5-cache/dev-util/mingw64-runtime-6.0.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install setup
+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=Free Win64 runtime and import library definitions
+EAPI=6
+HOMEPAGE=http://mingw-w64.sourceforge.net/
+IUSE=headers-only idl libraries tools
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v6.0.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=ff4b1e868973bce966d300cae48818be
diff --git a/metadata/md5-cache/dev-util/mpatch-0.8-r1 b/metadata/md5-cache/dev-util/mpatch-0.8-r1
index bdda97176694..3e97b69f3fe2 100644
--- a/metadata/md5-cache/dev-util/mpatch-0.8-r1
+++ b/metadata/md5-cache/dev-util/mpatch-0.8-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=http://oss.oracle.com/~mason/mpatch/mpatch-0.8.tar.bz2
-_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=519506b095888ca07b794196065fcd3e
diff --git a/metadata/md5-cache/dev-util/nemiver-0.9.6 b/metadata/md5-cache/dev-util/nemiver-0.9.6
index 0d3cf39e81dd..c129452ec75c 100644
--- a/metadata/md5-cache/dev-util/nemiver-0.9.6
+++ b/metadata/md5-cache/dev-util/nemiver-0.9.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.16:2[dbus] >=dev-cpp/glibmm-2.30:2 >=dev-cpp/gtkmm-3:3.0 >=dev-cpp/gtksourceviewmm-3:3.0 >=gnome-base/gsettings-desktop-schemas-0.0.1 >=gnome-base/libgtop-2.19 x11-libs/vte:2.91 >=dev-db/sqlite-3:3 sys-devel/gdb dev-libs/boost memoryview? ( >=app-editors/ghex-2.90:2 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/nemiver/0.9/nemiver-0.9.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cdacea6f313a6772418f831e89af7375
diff --git a/metadata/md5-cache/dev-util/oprofile-1.1.0-r1 b/metadata/md5-cache/dev-util/oprofile-1.1.0-r1
index 178ff1d29fc2..09fb08c17ba0 100644
--- a/metadata/md5-cache/dev-util/oprofile-1.1.0-r1
+++ b/metadata/md5-cache/dev-util/oprofile-1.1.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/popt-1.7-r1 sys-libs/binutils-libs:= >=sys-libs/glibc-2.3.2-r1 java? ( >=virtual/jdk-1.5:= ) ppc64? ( dev-libs/libpfm ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=mirror://sourceforge/oprofile/oprofile-1.1.0.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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=c9c94d8c2168258a405610c74b7f515b
diff --git a/metadata/md5-cache/dev-util/oprofile-1.2.0-r1 b/metadata/md5-cache/dev-util/oprofile-1.2.0-r1
index 96e5ed161066..b09760f05bc2 100644
--- a/metadata/md5-cache/dev-util/oprofile-1.2.0-r1
+++ b/metadata/md5-cache/dev-util/oprofile-1.2.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/popt-1.7-r1 sys-libs/binutils-libs:= >=sys-libs/glibc-2.3.2-r1 java? ( >=virtual/jdk-1.5:= ) ppc64? ( dev-libs/libpfm ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=mirror://sourceforge/oprofile/oprofile-1.2.0.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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=32fdd43bb99b0a842ff0ba935ac34775
diff --git a/metadata/md5-cache/dev-util/osc-0.152.0 b/metadata/md5-cache/dev-util/osc-0.152.0
index 081f3dc40056..ce2f706c3cfb 100644
--- a/metadata/md5-cache/dev-util/osc-0.152.0
+++ b/metadata/md5-cache/dev-util/osc-0.152.0
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-
 REQUIRED_USE=python_targets_python2_7 python_targets_python2_7
 SLOT=0
 SRC_URI=https://api.opensuse.org/public/source/openSUSE:Tools/osc/osc-0.152.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	obs-download	dee642b7a40967b3fee1c026a6ba33dd	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	obs-download	dee642b7a40967b3fee1c026a6ba33dd	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=17666db324d0012d4a6f57422b82fddb
diff --git a/metadata/md5-cache/dev-util/osc-0.154.0 b/metadata/md5-cache/dev-util/osc-0.154.0
index 5f46fcc1d1a2..12c810da67ac 100644
--- a/metadata/md5-cache/dev-util/osc-0.154.0
+++ b/metadata/md5-cache/dev-util/osc-0.154.0
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-
 REQUIRED_USE=python_targets_python2_7 python_targets_python2_7
 SLOT=0
 SRC_URI=https://api.opensuse.org/public/source/openSUSE:Tools/osc/osc-0.154.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	obs-download	dee642b7a40967b3fee1c026a6ba33dd	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	obs-download	dee642b7a40967b3fee1c026a6ba33dd	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=577906e28215dff0e4dcf99763169377
diff --git a/metadata/md5-cache/dev-util/osc-9999 b/metadata/md5-cache/dev-util/osc-9999
index c58f4144c590..812d659284e4 100644
--- a/metadata/md5-cache/dev-util/osc-9999
+++ b/metadata/md5-cache/dev-util/osc-9999
@@ -9,5 +9,5 @@ PDEPEND=dev-python/urlgrabber[python_targets_python2_7(-)?,-python_single_target
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
 REQUIRED_USE=python_targets_python2_7 python_targets_python2_7
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-2	249c1a0962573f4ce2c28f0d5b6b35d4	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-2	249c1a0962573f4ce2c28f0d5b6b35d4	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_=577906e28215dff0e4dcf99763169377
diff --git a/metadata/md5-cache/dev-util/perf-3.12 b/metadata/md5-cache/dev-util/perf-3.12
index 25a0b951c54b..09b352e485e5 100644
--- a/metadata/md5-cache/dev-util/perf-3.12
+++ b/metadata/md5-cache/dev-util/perf-3.12
@@ -10,5 +10,5 @@ RDEPEND=audit? ( sys-process/audit ) demangle? ( sys-devel/binutils ) perl? ( de
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=aee35e71a323ee473bdd7963902ed14e
diff --git a/metadata/md5-cache/dev-util/perf-3.13.1-r1 b/metadata/md5-cache/dev-util/perf-3.13.1-r1
index 5f0df2a85685..982765e2e7f4 100644
--- a/metadata/md5-cache/dev-util/perf-3.13.1-r1
+++ b/metadata/md5-cache/dev-util/perf-3.13.1-r1
@@ -10,5 +10,5 @@ RDEPEND=audit? ( sys-process/audit ) demangle? ( sys-devel/binutils ) gtk? ( x11
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.13.1.xz mirror://kernel/linux/kernel/v3.x/linux-3.13.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=4d8f07253af631744783366f0fdf93ca
diff --git a/metadata/md5-cache/dev-util/perf-3.15.5 b/metadata/md5-cache/dev-util/perf-3.15.5
index 938fe2e7a602..411635e358b3 100644
--- a/metadata/md5-cache/dev-util/perf-3.15.5
+++ b/metadata/md5-cache/dev-util/perf-3.15.5
@@ -10,5 +10,5 @@ RDEPEND=audit? ( sys-process/audit ) demangle? ( sys-devel/binutils ) gtk? ( x11
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.15.5.xz mirror://kernel/linux/kernel/v3.x/linux-3.15.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=5db2043ab93a4efbaab5a6e5731b9477
diff --git a/metadata/md5-cache/dev-util/perf-4.1.5-r1 b/metadata/md5-cache/dev-util/perf-4.1.5-r1
index c9f48ac975c2..7205db5a1c3f 100644
--- a/metadata/md5-cache/dev-util/perf-4.1.5-r1
+++ b/metadata/md5-cache/dev-util/perf-4.1.5-r1
@@ -10,5 +10,5 @@ RDEPEND=audit? ( sys-process/audit ) demangle? ( sys-devel/binutils:= ) gtk? ( x
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.1.5.xz mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=a210243203fdf5f5065cc73d3dbccbc6
diff --git a/metadata/md5-cache/dev-util/perf-4.14.33 b/metadata/md5-cache/dev-util/perf-4.14.33
index d409065e65ce..6f59d422da68 100644
--- a/metadata/md5-cache/dev-util/perf-4.14.33
+++ b/metadata/md5-cache/dev-util/perf-4.14.33
@@ -10,5 +10,5 @@ RDEPEND=audit? ( sys-process/audit ) demangle? ( sys-libs/binutils-libs:= ) gtk?
 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	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=eaeb52672805c1cd580b7065ed1d3fb3
diff --git a/metadata/md5-cache/dev-util/perf-4.4.4 b/metadata/md5-cache/dev-util/perf-4.4.4
index 3b7ef2ad2545..ad8fd609bedf 100644
--- a/metadata/md5-cache/dev-util/perf-4.4.4
+++ b/metadata/md5-cache/dev-util/perf-4.4.4
@@ -10,5 +10,5 @@ RDEPEND=audit? ( sys-process/audit ) demangle? ( sys-devel/binutils:= ) gtk? ( x
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.4.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=991b85ef85bc939277e5055b45d41a8c
diff --git a/metadata/md5-cache/dev-util/perf-4.9.13 b/metadata/md5-cache/dev-util/perf-4.9.13
index 13d144d98bc1..e3d69bc5f952 100644
--- a/metadata/md5-cache/dev-util/perf-4.9.13
+++ b/metadata/md5-cache/dev-util/perf-4.9.13
@@ -10,5 +10,5 @@ RDEPEND=audit? ( sys-process/audit ) demangle? ( sys-libs/binutils-libs:= ) gtk?
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.13.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=9e4c66fadc72e59a173a4bf912438708
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.5.3 b/metadata/md5-cache/dev-util/pkgcheck-0.5.3
index 02c9088c37b1..2a5f73d29f66 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-0.5.3
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.5.3
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/pkgcore-0.9.3[python_targets_python2_7(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/pkgcore/pkgcheck/releases/download/v0.5.3/pkgcheck-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6cf13a729dbf8ab2d16da455c6ef7870
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.5.4 b/metadata/md5-cache/dev-util/pkgcheck-0.5.4
index 49e6f1737abe..ddff01d6e7ba 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-0.5.4
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.5.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/snakeoil-0.7.2[python_targets_python2_7(-)?,python_targets_
 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/pkgcheck/pkgcheck-0.5.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=868971f4a2b1b4ba852a16bd295d5cbf
diff --git a/metadata/md5-cache/dev-util/pkgcheck-9999 b/metadata/md5-cache/dev-util/pkgcheck-9999
index 48d7949d7338..a9bd09d2a38a 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-9999
+++ b/metadata/md5-cache/dev-util/pkgcheck-9999
@@ -8,5 +8,5 @@ LICENSE=|| ( BSD GPL-2 )
 RDEPEND==dev-python/snakeoil-9999[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] =sys-apps/pkgcore-9999[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( 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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=378b9d2b368ece474f52b55a697e9a05
diff --git a/metadata/md5-cache/dev-util/ply-0_pre20160313 b/metadata/md5-cache/dev-util/ply-0_pre20160313
index d0c77d145d4e..ec5f81900fa3 100644
--- a/metadata/md5-cache/dev-util/ply-0_pre20160313
+++ b/metadata/md5-cache/dev-util/ply-0_pre20160313
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/iovisor/ply/archive/cfc56c789ad1eff1080ecb0dad18d009b91ae8ea.tar.gz -> ply-0_pre20160313.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=5bb0f69ae2c8cc14bd0a5e40e29eeed2
diff --git a/metadata/md5-cache/dev-util/pycharm-community-2018.2.1 b/metadata/md5-cache/dev-util/pycharm-community-2018.2.1
index c3d3a16ba85b..07df75e3a801 100644
--- a/metadata/md5-cache/dev-util/pycharm-community-2018.2.1
+++ b/metadata/md5-cache/dev-util/pycharm-community-2018.2.1
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.8 dev-python/pip
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://download.jetbrains.com/python/pycharm-community-2018.2.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2dbef2f259ef71151ec4cb7ebfda4b2f
diff --git a/metadata/md5-cache/dev-util/pycharm-professional-2018.2.1 b/metadata/md5-cache/dev-util/pycharm-professional-2018.2.1
index b721f0f71d3f..1c25484a9929 100644
--- a/metadata/md5-cache/dev-util/pycharm-professional-2018.2.1
+++ b/metadata/md5-cache/dev-util/pycharm-professional-2018.2.1
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.8 dev-python/pip
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://download.jetbrains.com/python/pycharm-professional-2018.2.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=98d273247d43b9be91e5e17041e91086
diff --git a/metadata/md5-cache/dev-util/qmtest-2.4.1-r1 b/metadata/md5-cache/dev-util/qmtest-2.4.1-r1
index bb8fd7ae31c2..220e2addeabe 100644
--- a/metadata/md5-cache/dev-util/qmtest-2.4.1-r1
+++ b/metadata/md5-cache/dev-util/qmtest-2.4.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=http://www.codesourcery.com/public/qmtest/qmtest-2.4.1/qmtest-2.4.1.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=909ff4d6edac7a36102c8f7c2d785e2e
diff --git a/metadata/md5-cache/dev-util/rbtools-0.7.10 b/metadata/md5-cache/dev-util/rbtools-0.7.10
index 0771d4ddd7d7..5ef59dcf1bc1 100644
--- a/metadata/md5-cache/dev-util/rbtools-0.7.10
+++ b/metadata/md5-cache/dev-util/rbtools-0.7.10
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/six-1.8.0[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://downloads.reviewboard.org/releases/RBTools/0.7/RBTools-0.7.10.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8888974dc0fc393a99d9b30ea98ad6c5
diff --git a/metadata/md5-cache/dev-util/rbtools-0.7.11 b/metadata/md5-cache/dev-util/rbtools-0.7.11
index 69f8d9d119bc..f6147bdf892a 100644
--- a/metadata/md5-cache/dev-util/rbtools-0.7.11
+++ b/metadata/md5-cache/dev-util/rbtools-0.7.11
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/six-1.8.0[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://downloads.reviewboard.org/releases/RBTools/0.7/RBTools-0.7.11.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a5a423e6784c94884587d7e9bfe81a17
diff --git a/metadata/md5-cache/dev-util/regexxer-0.10 b/metadata/md5-cache/dev-util/regexxer-0.10
index 8e18fa90cde4..ea465961619e 100644
--- a/metadata/md5-cache/dev-util/regexxer-0.10
+++ b/metadata/md5-cache/dev-util/regexxer-0.10
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-cpp/glibmm-2.28 dev-cpp/gtkmm:3.0 dev-cpp/gtksourceviewmm:3.0
 SLOT=0
 SRC_URI=mirror://sourceforge/regexxer/regexxer-0.10.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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ff2e4f85b6e2f62d2dfbba2380d62983
diff --git a/metadata/md5-cache/dev-util/rosdep-0.12.1 b/metadata/md5-cache/dev-util/rosdep-0.12.1
index 1e55fd82d563..d9af38609ddb 100644
--- a/metadata/md5-cache/dev-util/rosdep-0.12.1
+++ b/metadata/md5-cache/dev-util/rosdep-0.12.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,p
 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://download.ros.org/downloads/rosdep/rosdep-0.12.1.tar.gz https://github.com/ros-infrastructure/rosdep/archive/0.12.1.tar.gz -> rosdep-0.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cc0c08934d7fdad3ffc5255ab88cf1ce
diff --git a/metadata/md5-cache/dev-util/rosdep-0.12.2 b/metadata/md5-cache/dev-util/rosdep-0.12.2
index 69a4a8c745a6..e6363266411d 100644
--- a/metadata/md5-cache/dev-util/rosdep-0.12.2
+++ b/metadata/md5-cache/dev-util/rosdep-0.12.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,p
 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://download.ros.org/downloads/rosdep/rosdep-0.12.2.tar.gz https://github.com/ros-infrastructure/rosdep/archive/0.12.2.tar.gz -> rosdep-0.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cc0c08934d7fdad3ffc5255ab88cf1ce
diff --git a/metadata/md5-cache/dev-util/rosdep-9999 b/metadata/md5-cache/dev-util/rosdep-9999
index ff325c131e37..86d9048ec8f5 100644
--- a/metadata/md5-cache/dev-util/rosdep-9999
+++ b/metadata/md5-cache/dev-util/rosdep-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-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/rospkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-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/rosdistro[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-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/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_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
-_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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cc0c08934d7fdad3ffc5255ab88cf1ce
diff --git a/metadata/md5-cache/dev-util/rosinstall-0.7.8 b/metadata/md5-cache/dev-util/rosinstall-0.7.8
index ec74a7b77465..8b5b6cd1d64a 100644
--- a/metadata/md5-cache/dev-util/rosinstall-0.7.8
+++ b/metadata/md5-cache/dev-util/rosinstall-0.7.8
@@ -10,5 +10,5 @@ RDEPEND=dev-python/catkin_pkg[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
 SRC_URI=http://download.ros.org/downloads/rosinstall/rosinstall-0.7.8.tar.gz https://github.com/vcstools/rosinstall/archive/0.7.8.tar.gz -> rosinstall-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=138642721c89919538c6cbe9d7d35d08
diff --git a/metadata/md5-cache/dev-util/rosinstall-9999 b/metadata/md5-cache/dev-util/rosinstall-9999
index 4055759730b5..7a83d7e1a23d 100644
--- a/metadata/md5-cache/dev-util/rosinstall-9999
+++ b/metadata/md5-cache/dev-util/rosinstall-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/catkin_pkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/vcstools-0.1.38[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_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/wstool-0.1.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(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
-_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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=138642721c89919538c6cbe9d7d35d08
diff --git a/metadata/md5-cache/dev-util/rosinstall_generator-0.1.13 b/metadata/md5-cache/dev-util/rosinstall_generator-0.1.13
index a236f0312241..e0ea48bb243f 100644
--- a/metadata/md5-cache/dev-util/rosinstall_generator-0.1.13
+++ b/metadata/md5-cache/dev-util/rosinstall_generator-0.1.13
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/catkin_pkg-0.1.28[python_targets_python2_7(-)?,python_targe
 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/ros-infrastructure/rosinstall_generator/archive/0.1.13.tar.gz -> rosinstall_generator-0.1.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b136b143ecbd67ee929b5ba3e24a92a9
diff --git a/metadata/md5-cache/dev-util/rosinstall_generator-0.1.14 b/metadata/md5-cache/dev-util/rosinstall_generator-0.1.14
index 799b55ae7db7..6c09c5853361 100644
--- a/metadata/md5-cache/dev-util/rosinstall_generator-0.1.14
+++ b/metadata/md5-cache/dev-util/rosinstall_generator-0.1.14
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/catkin_pkg-0.1.28[python_targets_pypy(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/ros-infrastructure/rosinstall_generator/archive/0.1.14.tar.gz -> rosinstall_generator-0.1.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=15511ee52c5182df15dcfc726ca6f730
diff --git a/metadata/md5-cache/dev-util/rosinstall_generator-9999 b/metadata/md5-cache/dev-util/rosinstall_generator-9999
index 1c909e4161a2..d62a01da13da 100644
--- a/metadata/md5-cache/dev-util/rosinstall_generator-9999
+++ b/metadata/md5-cache/dev-util/rosinstall_generator-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-python/catkin_pkg-0.1.28[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-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/rosdistro-0.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_single_target_pypy(-),-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/rospkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-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/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_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
-_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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=15511ee52c5182df15dcfc726ca6f730
diff --git a/metadata/md5-cache/dev-util/rr-4.5.0 b/metadata/md5-cache/dev-util/rr-4.5.0
index 0934b07a2666..9e51043c4878 100644
--- a/metadata/md5-cache/dev-util/rr-4.5.0
+++ b/metadata/md5-cache/dev-util/rr-4.5.0
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/mozilla/rr/archive/4.5.0.tar.gz -> mozilla-rr-4.5.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=796f391cdb2b2ec7bb1f50139aaecbec
diff --git a/metadata/md5-cache/dev-util/rr-5.0.0 b/metadata/md5-cache/dev-util/rr-5.0.0
index f8a61ae68f01..c47b376e4272 100644
--- a/metadata/md5-cache/dev-util/rr-5.0.0
+++ b/metadata/md5-cache/dev-util/rr-5.0.0
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib dev-libs/capnproto python_targets_python2_7? ( >=dev-lang/
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/mozilla/rr/archive/5.0.0.tar.gz -> mozilla-rr-5.0.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=097311b73d85afd66ddd1aabf570dfd2
diff --git a/metadata/md5-cache/dev-util/rr-5.1.0 b/metadata/md5-cache/dev-util/rr-5.1.0
index 9e2c24a96633..4712e3932f73 100644
--- a/metadata/md5-cache/dev-util/rr-5.1.0
+++ b/metadata/md5-cache/dev-util/rr-5.1.0
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib dev-libs/capnproto python_targets_python2_7? ( >=dev-lang/
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/mozilla/rr/archive/5.1.0.tar.gz -> mozilla-rr-5.1.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=097311b73d85afd66ddd1aabf570dfd2
diff --git a/metadata/md5-cache/dev-util/rr-5.2.0 b/metadata/md5-cache/dev-util/rr-5.2.0
index 4b444d1656b3..e1827ef72b9b 100644
--- a/metadata/md5-cache/dev-util/rr-5.2.0
+++ b/metadata/md5-cache/dev-util/rr-5.2.0
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib dev-libs/capnproto python_targets_python2_7? ( >=dev-lang/
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/mozilla/rr/archive/5.2.0.tar.gz -> mozilla-rr-5.2.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=097311b73d85afd66ddd1aabf570dfd2
diff --git a/metadata/md5-cache/dev-util/schroot-1.6.10-r4 b/metadata/md5-cache/dev-util/schroot-1.6.10-r4
index 6baead2bad59..9102ae563272 100644
--- a/metadata/md5-cache/dev-util/schroot-1.6.10-r4
+++ b/metadata/md5-cache/dev-util/schroot-1.6.10-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/boost-1.42.0 >=sys-apps/util-linux-2.16 btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 ) lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) sys-apps/debianutils dchroot? ( !sys-apps/dchroot ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/s/schroot/schroot_1.6.10.orig.tar.xz mirror://debian/pool/main/s/schroot/schroot_1.6.10-2.debian.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=880939d1ab1916c47f4355756dd2c04c
diff --git a/metadata/md5-cache/dev-util/scons-2.5.1 b/metadata/md5-cache/dev-util/scons-2.5.1
index eb3ee5e425e8..b3f61848cad1 100644
--- a/metadata/md5-cache/dev-util/scons-2.5.1
+++ b/metadata/md5-cache/dev-util/scons-2.5.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/scons/scons-2.5.1.tar.gz doc? ( http://www.scons.org/doc/2.5.1/PDF/scons-user.pdf -> scons-2.5.1-user.pdf http://www.scons.org/doc/2.5.1/HTML/scons-user.html -> scons-2.5.1-user.html )
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=2af875b8aae21be3ab0cf595125d28c6
diff --git a/metadata/md5-cache/dev-util/scons-3.0.1 b/metadata/md5-cache/dev-util/scons-3.0.1
index ee62a7ea0243..c9ef442818c6 100644
--- a/metadata/md5-cache/dev-util/scons-3.0.1
+++ b/metadata/md5-cache/dev-util/scons-3.0.1
@@ -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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/scons/scons-3.0.1.tar.gz doc? ( http://www.scons.org/doc/3.0.1/PDF/scons-user.pdf -> scons-3.0.1-user.pdf http://www.scons.org/doc/3.0.1/HTML/scons-user.html -> scons-3.0.1-user.html ) test? ( https://github.com/scons/scons/archive/3.0.1.tar.gz -> scons-3.0.1.gh.tar.gz )
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e8408b739863b92190737b5155cf8fe5
diff --git a/metadata/md5-cache/dev-util/scons-3.0.1-r1 b/metadata/md5-cache/dev-util/scons-3.0.1-r1
index 75040ebb02a0..83e1545634ac 100644
--- a/metadata/md5-cache/dev-util/scons-3.0.1-r1
+++ b/metadata/md5-cache/dev-util/scons-3.0.1-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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/scons/scons-3.0.1.tar.gz doc? ( http://www.scons.org/doc/3.0.1/PDF/scons-user.pdf -> scons-3.0.1-user.pdf http://www.scons.org/doc/3.0.1/HTML/scons-user.html -> scons-3.0.1-user.html ) test? ( https://github.com/scons/scons/archive/3.0.1.tar.gz -> scons-3.0.1.gh.tar.gz )
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cf1ac497276394561a4527018a8861c8
diff --git a/metadata/md5-cache/dev-util/scons-3.0.1-r100 b/metadata/md5-cache/dev-util/scons-3.0.1-r100
index 9f37e9ad7126..2991de643f8f 100644
--- a/metadata/md5-cache/dev-util/scons-3.0.1-r100
+++ b/metadata/md5-cache/dev-util/scons-3.0.1-r100
@@ -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 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/scons/scons-3.0.1.tar.gz doc? ( http://www.scons.org/doc/3.0.1/PDF/scons-user.pdf -> scons-3.0.1-user.pdf http://www.scons.org/doc/3.0.1/HTML/scons-user.html -> scons-3.0.1-user.html ) test? ( https://github.com/scons/scons/archive/3.0.1.tar.gz -> scons-3.0.1.gh.tar.gz )
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d4f7552cad18bf65634bcbbcb7220ff1
diff --git a/metadata/md5-cache/dev-util/scons-3.0.1-r3 b/metadata/md5-cache/dev-util/scons-3.0.1-r3
index 9de1c460a163..58e827a72e2a 100644
--- a/metadata/md5-cache/dev-util/scons-3.0.1-r3
+++ b/metadata/md5-cache/dev-util/scons-3.0.1-r3
@@ -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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/scons/scons-3.0.1.tar.gz doc? ( http://www.scons.org/doc/3.0.1/PDF/scons-user.pdf -> scons-3.0.1-user.pdf http://www.scons.org/doc/3.0.1/HTML/scons-user.html -> scons-3.0.1-user.html ) test? ( https://github.com/scons/scons/archive/3.0.1.tar.gz -> scons-3.0.1.gh.tar.gz )
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3b69a8fae63f1409fa21302e35c004d0
diff --git a/metadata/md5-cache/dev-util/serialtalk-1.2 b/metadata/md5-cache/dev-util/serialtalk-1.2
index d65ac1456e86..2efabf843ecf 100644
--- a/metadata/md5-cache/dev-util/serialtalk-1.2
+++ b/metadata/md5-cache/dev-util/serialtalk-1.2
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 SLOT=0
 SRC_URI=https://github.com/BGO-OD/serialtalk/archive/v1.2.tar.gz -> serialtalk-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=dda3736c93c7779da1b3f7065f92e597
diff --git a/metadata/md5-cache/dev-util/serialtalk-9999 b/metadata/md5-cache/dev-util/serialtalk-9999
index e200ffb41706..d2e62f9d51ec 100644
--- a/metadata/md5-cache/dev-util/serialtalk-9999
+++ b/metadata/md5-cache/dev-util/serialtalk-9999
@@ -5,5 +5,5 @@ EAPI=6
 HOMEPAGE=https://github.com/BGO-OD/serialtalk
 LICENSE=GPL-3+
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=07639d554d15262d2fd6a105d2fbbda9
diff --git a/metadata/md5-cache/dev-util/spec-cleaner-1.0.6 b/metadata/md5-cache/dev-util/spec-cleaner-1.0.6
index 8c0a12a097af..3dee4baca0be 100644
--- a/metadata/md5-cache/dev-util/spec-cleaner-1.0.6
+++ b/metadata/md5-cache/dev-util/spec-cleaner-1.0.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/openSUSE/spec-cleaner/archive/spec-cleaner-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=24ce86df2597d614e39f39dbea0f05c3
diff --git a/metadata/md5-cache/dev-util/spec-cleaner-1.0.7 b/metadata/md5-cache/dev-util/spec-cleaner-1.0.7
index 81ee58de45ee..fd3cfc246d5a 100644
--- a/metadata/md5-cache/dev-util/spec-cleaner-1.0.7
+++ b/metadata/md5-cache/dev-util/spec-cleaner-1.0.7
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/openSUSE/spec-cleaner/archive/spec-cleaner-1.0.7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=07e8591afb31fe556cf9ef930a935223
diff --git a/metadata/md5-cache/dev-util/spec-cleaner-9999 b/metadata/md5-cache/dev-util/spec-cleaner-9999
index 18d229091f88..7403b5ee0339 100644
--- a/metadata/md5-cache/dev-util/spec-cleaner-9999
+++ b/metadata/md5-cache/dev-util/spec-cleaner-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 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(-)] >=app-arch/rpm-4.11.0.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(-)]
 REQUIRED_USE=|| ( 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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=07e8591afb31fe556cf9ef930a935223
diff --git a/metadata/md5-cache/dev-util/spirv-headers-1.3 b/metadata/md5-cache/dev-util/spirv-headers-1.3
index 4f507b41ea90..a08a82c50d40 100644
--- a/metadata/md5-cache/dev-util/spirv-headers-1.3
+++ b/metadata/md5-cache/dev-util/spirv-headers-1.3
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/SPIRV-Headers/archive/02ffc719aa9f9c1dce5ce05743fb1afe6cbf17ea.tar.gz -> spirv-headers-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c61087e4323f2a3f46a6cb2ca643657d
diff --git a/metadata/md5-cache/dev-util/spirv-headers-1.3.1_pre20180710 b/metadata/md5-cache/dev-util/spirv-headers-1.3.1_pre20180710
index 76c5a7a07243..a59a27a8947d 100644
--- a/metadata/md5-cache/dev-util/spirv-headers-1.3.1_pre20180710
+++ b/metadata/md5-cache/dev-util/spirv-headers-1.3.1_pre20180710
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/SPIRV-Headers/archive/ff684ffc6a35d2a58f0f63108877d0064ea33feb.tar.gz -> spirv-headers-1.3.1_pre20180710.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=601e2cac6126c2d75a9f425246878b38
diff --git a/metadata/md5-cache/dev-util/spirv-headers-1.3.4_pre20180917 b/metadata/md5-cache/dev-util/spirv-headers-1.3.4_pre20180917
index 2a28eda6c38e..f46933d9f4d3 100644
--- a/metadata/md5-cache/dev-util/spirv-headers-1.3.4_pre20180917
+++ b/metadata/md5-cache/dev-util/spirv-headers-1.3.4_pre20180917
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/SPIRV-Headers/archive/dcf23bdabacc3c54b83b1f9367e7a8adb27f8d87.tar.gz -> spirv-headers-1.3.4_pre20180917.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=29a3321a0d59143bacb56b9e4d08c8c8
diff --git a/metadata/md5-cache/dev-util/spirv-headers-9999 b/metadata/md5-cache/dev-util/spirv-headers-9999
index 0971134cb2e9..68cfdd90ccf9 100644
--- a/metadata/md5-cache/dev-util/spirv-headers-9999
+++ b/metadata/md5-cache/dev-util/spirv-headers-9999
@@ -5,5 +5,5 @@ EAPI=6
 HOMEPAGE=https://www.khronos.org/registry/spir-v/
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=60c2c314d7557c98526e4d6ed58747bb
diff --git a/metadata/md5-cache/dev-util/spirv-tools-2018.4 b/metadata/md5-cache/dev-util/spirv-tools-2018.4
index d660e0dbd2a5..9cb4a93ced70 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-util/spirv-tools-2018.5 b/metadata/md5-cache/dev-util/spirv-tools-2018.5
index 3a04515505ad..b1bf1411c13e 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-util/spirv-tools-9999 b/metadata/md5-cache/dev-util/spirv-tools-9999
index 6045b849ecbf..3b1b7c635090 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-util/strace-4.23-r1 b/metadata/md5-cache/dev-util/strace-4.23-r1
index 93d89ce699ef..0efe8079bf92 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_=32d4fa07eab69bacc805f728cde241ff
+_md5_=0fdadeb064cceaf833324c62cf4a6c54
diff --git a/metadata/md5-cache/dev-util/synopsis-0.13 b/metadata/md5-cache/dev-util/synopsis-0.13
index d3bbf7a55955..c443f60c4a72 100644
--- a/metadata/md5-cache/dev-util/synopsis-0.13
+++ b/metadata/md5-cache/dev-util/synopsis-0.13
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boehm-gc media-gfx/graphviz python_targets_python2_7? ( >=dev-l
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://synopsis.fresco.org/download/synopsis-0.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3cc4a29bba3ee85837b98fbb9cf5d078
diff --git a/metadata/md5-cache/dev-util/sysdig-0.23.1 b/metadata/md5-cache/dev-util/sysdig-0.23.1
index b64530617032..822439c1901a 100644
--- a/metadata/md5-cache/dev-util/sysdig-0.23.1
+++ b/metadata/md5-cache/dev-util/sysdig-0.23.1
@@ -9,5 +9,5 @@ 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	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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
new file mode 100644
index 000000000000..471fd3bfdbe4
--- /dev/null
+++ b/metadata/md5-cache/dev-util/sysdig-0.24.0
@@ -0,0 +1,13 @@
+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/sysdig-0.24.1 b/metadata/md5-cache/dev-util/sysdig-0.24.1
new file mode 100644
index 000000000000..4bd7dac9b107
--- /dev/null
+++ b/metadata/md5-cache/dev-util/sysdig-0.24.1
@@ -0,0 +1,13 @@
+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.1.tar.gz -> sysdig-0.24.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_=0f7945b6609aaa7b0c534c302fbcc027
diff --git a/metadata/md5-cache/dev-util/sysprof-3.24.1 b/metadata/md5-cache/dev-util/sysprof-3.24.1
index c940ca322da1..4e1ca129f091 100644
--- a/metadata/md5-cache/dev-util/sysprof-3.24.1
+++ b/metadata/md5-cache/dev-util/sysprof-3.24.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.44:2 gtk? ( sys-auth/polkit >=x11-libs/gtk+-3.22.0:3 ) systemd? ( sys-auth/polkit >=sys-apps/systemd-222 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/sysprof/3.24/sysprof-3.24.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=92190e0c3f0e1266fcc4e35add55b822
diff --git a/metadata/md5-cache/dev-util/sysprof-3.26.1 b/metadata/md5-cache/dev-util/sysprof-3.26.1
index e53f88c222eb..0df0f23eb743 100644
--- a/metadata/md5-cache/dev-util/sysprof-3.26.1
+++ b/metadata/md5-cache/dev-util/sysprof-3.26.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.44:2 gtk? ( sys-auth/polkit >=x11-libs/gtk+-3.22.0:3 ) systemd? ( sys-auth/polkit >=sys-apps/systemd-222 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/sysprof/3.26/sysprof-3.26.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e7346fd533391d42fe8d5962d261cb93
diff --git a/metadata/md5-cache/dev-util/sysprof-3.28.1 b/metadata/md5-cache/dev-util/sysprof-3.28.1
index 3297dfd94557..20ef2f017c53 100644
--- a/metadata/md5-cache/dev-util/sysprof-3.28.1
+++ b/metadata/md5-cache/dev-util/sysprof-3.28.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+ GPL-2+
 RDEPEND=>=dev-libs/glib-2.44:2 sys-auth/polkit gtk? ( >=x11-libs/gtk+-3.22.0:3 ) systemd? ( >=sys-apps/systemd-222 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/sysprof/3.28/sysprof-3.28.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cf5d080de7f5cc1feb5d0c2a3874bcc5
diff --git a/metadata/md5-cache/dev-util/systemtap-2.4-r1 b/metadata/md5-cache/dev-util/systemtap-2.4-r1
index f1197c723f2a..9167466f8727 100644
--- a/metadata/md5-cache/dev-util/systemtap-2.4-r1
+++ b/metadata/md5-cache/dev-util/systemtap-2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/elfutils-0.142 sys-libs/libcap python_targets_python2_7? ( >=
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://www.sourceware.org/systemtap/ftp/releases/systemtap-2.4.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=230ae690097c3d5f3f463ff895432be6
diff --git a/metadata/md5-cache/dev-util/systemtap-2.9 b/metadata/md5-cache/dev-util/systemtap-2.9
index c7815cd41386..5c34160492b3 100644
--- a/metadata/md5-cache/dev-util/systemtap-2.9
+++ b/metadata/md5-cache/dev-util/systemtap-2.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/elfutils-0.142 sys-libs/libcap python_targets_python2_7? ( >=
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://www.sourceware.org/systemtap/ftp/releases/systemtap-2.9.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e52be027bb50581d34427da648bca857
diff --git a/metadata/md5-cache/dev-util/systemtap-3.1 b/metadata/md5-cache/dev-util/systemtap-3.1
index 990836ff19a8..84097fbf5003 100644
--- a/metadata/md5-cache/dev-util/systemtap-3.1
+++ b/metadata/md5-cache/dev-util/systemtap-3.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/elfutils-0.142 sys-libs/libcap python_targets_python2_7? ( >=
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://www.sourceware.org/systemtap/ftp/releases/systemtap-3.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8bf480802bc56e56c64f29317c70ae0d
diff --git a/metadata/md5-cache/dev-util/systemtap-3.1-r1 b/metadata/md5-cache/dev-util/systemtap-3.1-r1
index 3fe29d5b7fa5..5da8e2ebd443 100644
--- a/metadata/md5-cache/dev-util/systemtap-3.1-r1
+++ b/metadata/md5-cache/dev-util/systemtap-3.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/elfutils-0.142 sys-libs/libcap python_targets_python2_7? ( >=
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://www.sourceware.org/systemtap/ftp/releases/systemtap-3.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7ada2b78a72e8d9728fa756caf3fb32c
diff --git a/metadata/md5-cache/dev-util/tailor-0.9.35-r1 b/metadata/md5-cache/dev-util/tailor-0.9.35-r1
index c3ac0d7bd0cf..bd78dc93926c 100644
--- a/metadata/md5-cache/dev-util/tailor-0.9.35-r1
+++ b/metadata/md5-cache/dev-util/tailor-0.9.35-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=http://darcs.arstecnica.it/tailor-0.9.35.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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6b390470d44a584b179ba9679dc5c6fd
diff --git a/metadata/md5-cache/dev-util/trace-cmd-2.5.1 b/metadata/md5-cache/dev-util/trace-cmd-2.5.1
index 8e28508a5b32..db7161f506e3 100644
--- a/metadata/md5-cache/dev-util/trace-cmd-2.5.1
+++ b/metadata/md5-cache/dev-util/trace-cmd-2.5.1
@@ -10,5 +10,5 @@ RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gentoo/trace-cmd-2.5.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6410602cb3ed75565704de261dd615b6
diff --git a/metadata/md5-cache/dev-util/trace-cmd-2.6 b/metadata/md5-cache/dev-util/trace-cmd-2.6
index 4752bcfc55d3..6dd4c5e0d619 100644
--- a/metadata/md5-cache/dev-util/trace-cmd-2.6
+++ b/metadata/md5-cache/dev-util/trace-cmd-2.6
@@ -10,5 +10,5 @@ RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gentoo/trace-cmd-2.6.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f7e6f5b7354ac443045cfc4b666596d6
diff --git a/metadata/md5-cache/dev-util/uncrustify-0.66.1 b/metadata/md5-cache/dev-util/uncrustify-0.66.1
index 3bdea5c0e71c..aac45ec04d5d 100644
--- a/metadata/md5-cache/dev-util/uncrustify-0.66.1
+++ b/metadata/md5-cache/dev-util/uncrustify-0.66.1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/uncrustify/uncrustify/archive/uncrustify-0.66.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=af541b4635ba523f7e0ecc5e714534f7
diff --git a/metadata/md5-cache/dev-util/uncrustify-0.67 b/metadata/md5-cache/dev-util/uncrustify-0.67
index fb080a6ab467..c597336b2ddd 100644
--- a/metadata/md5-cache/dev-util/uncrustify-0.67
+++ b/metadata/md5-cache/dev-util/uncrustify-0.67
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solari
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/uncrustify/uncrustify/archive/uncrustify-0.67.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=deb39c0090fe74dcde9eb8d1f6bcc050
diff --git a/metadata/md5-cache/dev-util/uncrustify-9999 b/metadata/md5-cache/dev-util/uncrustify-9999
index 0edb15a8d853..45ca1f8caa0b 100644
--- a/metadata/md5-cache/dev-util/uncrustify-9999
+++ b/metadata/md5-cache/dev-util/uncrustify-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://uncrustify.sourceforge.net/
 IUSE=test
 LICENSE=GPL-2
 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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=081bcdc4409fb6d8c97a1a4a4366e21e
diff --git a/metadata/md5-cache/dev-util/vint-0.3.18 b/metadata/md5-cache/dev-util/vint-0.3.18
index 7a651d517d0c..b086e3ec5386 100644
--- a/metadata/md5-cache/dev-util/vint-0.3.18
+++ b/metadata/md5-cache/dev-util/vint-0.3.18
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/ansicolor-0.2.4[python_targets_python2_7(-)?,python_targets
 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/Kuniwak/vint/archive/v0.3.18.tar.gz -> vint-0.3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=76df36e451d5d33d4527a5064bab4f86
diff --git a/metadata/md5-cache/dev-util/vint-0.3.19 b/metadata/md5-cache/dev-util/vint-0.3.19
index 044f24d37b80..2601dce0a082 100644
--- a/metadata/md5-cache/dev-util/vint-0.3.19
+++ b/metadata/md5-cache/dev-util/vint-0.3.19
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/ansicolor-0.2.4[python_targets_python2_7(-)?,python_targets
 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/Kuniwak/vint/archive/v0.3.19.tar.gz -> vint-0.3.19.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c1677dfa8c74d018d58f0569844a3e06
diff --git a/metadata/md5-cache/dev-util/vulkan-headers-1.1.77.0-r1 b/metadata/md5-cache/dev-util/vulkan-headers-1.1.77.0-r1
index 710ba0f2de47..5d073d97c8af 100644
--- a/metadata/md5-cache/dev-util/vulkan-headers-1.1.77.0-r1
+++ b/metadata/md5-cache/dev-util/vulkan-headers-1.1.77.0-r1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=!<=media-libs/vulkan-loader-1.1.70.0-r999
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/Vulkan-Headers/archive/b1577d5fbd5424c863710aa156aaafa77cae3de8.tar.gz -> vulkan-headers-1.1.77.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2391806315a909e2b8b7aa9afb9764b1
diff --git a/metadata/md5-cache/dev-util/vulkan-headers-1.1.82.0 b/metadata/md5-cache/dev-util/vulkan-headers-1.1.82.0
index a8a448284e2b..0b265a371d40 100644
--- a/metadata/md5-cache/dev-util/vulkan-headers-1.1.82.0
+++ b/metadata/md5-cache/dev-util/vulkan-headers-1.1.82.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=!<=media-libs/vulkan-loader-1.1.70.0-r999
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/Vulkan-Headers/archive/c4e056d365472174471a243dfefbfe66a03564af.tar.gz -> vulkan-headers-1.1.82.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3923e054049c5511ae380483ef89f525
diff --git a/metadata/md5-cache/dev-util/vulkan-headers-9999 b/metadata/md5-cache/dev-util/vulkan-headers-9999
index b33162177ed7..8cd9d31d2e9b 100644
--- a/metadata/md5-cache/dev-util/vulkan-headers-9999
+++ b/metadata/md5-cache/dev-util/vulkan-headers-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Headers
 LICENSE=Apache-2.0
 RDEPEND=!<=media-libs/vulkan-loader-1.1.70.0-r999
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a28b9639ebb64bb93d1b3e44cef4a706
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 444edb960faf..f09f1b1c40de 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _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 382297aa8f8c..c2d858790ddb 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _md5_=0b48d20d7dfd576c9a58792a40c1d811
diff --git a/metadata/md5-cache/dev-util/vulkan-tools-9999 b/metadata/md5-cache/dev-util/vulkan-tools-9999
index e843d014241f..124a37e68e2f 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _md5_=0b48d20d7dfd576c9a58792a40c1d811
diff --git a/metadata/md5-cache/dev-util/wstool-0.1.13 b/metadata/md5-cache/dev-util/wstool-0.1.13
index 9b39f419ce02..3e2694860ed6 100644
--- a/metadata/md5-cache/dev-util/wstool-0.1.13
+++ b/metadata/md5-cache/dev-util/wstool-0.1.13
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=http://download.ros.org/downloads/wstool/wstool-0.1.13.tar.gz https://github.com/vcstools/wstool/archive/0.1.13.tar.gz -> wstool-0.1.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=73b9664af76e3400e7677173e5a7fad3
diff --git a/metadata/md5-cache/dev-util/wstool-0.1.17 b/metadata/md5-cache/dev-util/wstool-0.1.17
index 5fc2096237ee..99662a62ab01 100644
--- a/metadata/md5-cache/dev-util/wstool-0.1.17
+++ b/metadata/md5-cache/dev-util/wstool-0.1.17
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://download.ros.org/downloads/wstool/wstool-0.1.17.tar.gz https://github.com/vcstools/wstool/archive/0.1.17.tar.gz -> wstool-0.1.17.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7f01edbb324b7c940bf1c8afd083c4e1
diff --git a/metadata/md5-cache/dev-util/wstool-9999 b/metadata/md5-cache/dev-util/wstool-9999
index 58293bab0627..6da9a82c43c1 100644
--- a/metadata/md5-cache/dev-util/wstool-9999
+++ b/metadata/md5-cache/dev-util/wstool-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/vcstools-0.1.38[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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_=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	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7f01edbb324b7c940bf1c8afd083c4e1
diff --git a/metadata/md5-cache/dev-util/xesam-tools-0.7.0-r1 b/metadata/md5-cache/dev-util/xesam-tools-0.7.0-r1
index a47f0ae42287..f50032bf13fa 100644
--- a/metadata/md5-cache/dev-util/xesam-tools-0.7.0-r1
+++ b/metadata/md5-cache/dev-util/xesam-tools-0.7.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://xesam.org/people/kamstrup/xesam-tools/xesam-tools-0.7.0.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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=08672d8b5060b81f344a2187d14c528e
diff --git a/metadata/md5-cache/dev-util/xxdiff-4.0.1_p20170622 b/metadata/md5-cache/dev-util/xxdiff-4.0.1_p20170622
index 5acf35d4b0bd..5ed1625e933f 100644
--- a/metadata/md5-cache/dev-util/xxdiff-4.0.1_p20170622
+++ b/metadata/md5-cache/dev-util/xxdiff-4.0.1_p20170622
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 python_targets_python2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/xxdiff-4.0.1_p20170622.tar.bz2
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9e6f7f7a0c16fd412036ecc332428efb
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 04adc92ff10f..7133939f24d3 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/bzr-2.5.1-r1 b/metadata/md5-cache/dev-vcs/bzr-2.5.1-r1
index 57b75aad02e2..47e571f3c6da 100644
--- a/metadata/md5-cache/dev-vcs/bzr-2.5.1-r1
+++ b/metadata/md5-cache/dev-vcs/bzr-2.5.1-r1
@@ -10,5 +10,5 @@ RDEPEND=curl? ( dev-python/pycurl[python_targets_python2_7(-)?,-python_single_ta
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://launchpad.net/bzr/2.5/2.5.1/+download/bzr-2.5.1.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=798f2fa30ea55651ff7d1c68ab5a5012
diff --git a/metadata/md5-cache/dev-vcs/bzr-2.6.0 b/metadata/md5-cache/dev-vcs/bzr-2.6.0
index 78267744b376..276ae3a7ec6f 100644
--- a/metadata/md5-cache/dev-vcs/bzr-2.6.0
+++ b/metadata/md5-cache/dev-vcs/bzr-2.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/bzr/2.6/2.6.0/+download/bzr-2.6.0.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	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_=2426a46aba3b2e381fbfdb2568c49652
diff --git a/metadata/md5-cache/dev-vcs/bzr-2.7.0 b/metadata/md5-cache/dev-vcs/bzr-2.7.0
index 1a53298757d5..e6c4e3ad2c62 100644
--- a/metadata/md5-cache/dev-vcs/bzr-2.7.0
+++ b/metadata/md5-cache/dev-vcs/bzr-2.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/bzr/2.7/2.7.0/+download/bzr-2.7.0.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	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_=177f7e3ffc93260e4ebf896d74f4241d
diff --git a/metadata/md5-cache/dev-vcs/bzr-2.7.1_pre b/metadata/md5-cache/dev-vcs/bzr-2.7.1_pre
index b66d8e66d03d..18ffc0cb1e0a 100644
--- a/metadata/md5-cache/dev-vcs/bzr-2.7.1_pre
+++ b/metadata/md5-cache/dev-vcs/bzr-2.7.1_pre
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~grozin/bzr-2.7.1_pre.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	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_=c6a78fd436004cbe52c49413d8cdcbed
diff --git a/metadata/md5-cache/dev-vcs/bzr-fastimport-0.13.0 b/metadata/md5-cache/dev-vcs/bzr-fastimport-0.13.0
index fa6c3623a157..944201e84347 100644
--- a/metadata/md5-cache/dev-vcs/bzr-fastimport-0.13.0
+++ b/metadata/md5-cache/dev-vcs/bzr-fastimport-0.13.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-vcs/bzr-1.18 >=dev-python/python-fastimport-0.9 python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://launchpad.net/bzr-fastimport/trunk/0.13.0/+download/bzr-fastimport-0.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=727dd2380d5d6a2370c644b63e6eb917
diff --git a/metadata/md5-cache/dev-vcs/bzr-rewrite-0.6.3 b/metadata/md5-cache/dev-vcs/bzr-rewrite-0.6.3
index 58a6c55347fe..26df35213e42 100644
--- a/metadata/md5-cache/dev-vcs/bzr-rewrite-0.6.3
+++ b/metadata/md5-cache/dev-vcs/bzr-rewrite-0.6.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-vcs/bzr-2.5.0 !dev-vcs/bzr-rebase !<dev-vcs/bzr-svn-0.6 python_tar
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://launchpad.net/bzr-rewrite/trunk/0.6.3/+download/bzr-rewrite-0.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=ce412c995291e2c637c0f91ea9ba486b
diff --git a/metadata/md5-cache/dev-vcs/bzr-xmloutput-0.8.8-r2 b/metadata/md5-cache/dev-vcs/bzr-xmloutput-0.8.8-r2
index df28ee27abfa..8f25ca41ff29 100644
--- a/metadata/md5-cache/dev-vcs/bzr-xmloutput-0.8.8-r2
+++ b/metadata/md5-cache/dev-vcs/bzr-xmloutput-0.8.8-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-vcs/bzr[python_targets_python2_7(-)?,-python_single_target_jython2_7
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://launchpad.net/bzr-xmloutput/trunk/0.8.8/+download/bzr-xmloutput-0.8.8.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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ca1bc678baf7e7a6dc959f3703778c85
diff --git a/metadata/md5-cache/dev-vcs/bzrtools-2.5 b/metadata/md5-cache/dev-vcs/bzrtools-2.5
index 4e200b835936..10e20b908059 100644
--- a/metadata/md5-cache/dev-vcs/bzrtools-2.5
+++ b/metadata/md5-cache/dev-vcs/bzrtools-2.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/bzrtools/stable/2.5/+download/bzrtools-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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=c552eda1543e07d05954272811235dfb
diff --git a/metadata/md5-cache/dev-vcs/cvs2svn-2.4.0-r1 b/metadata/md5-cache/dev-vcs/cvs2svn-2.4.0-r1
index 591132261313..2065429d7441 100644
--- a/metadata/md5-cache/dev-vcs/cvs2svn-2.4.0-r1
+++ b/metadata/md5-cache/dev-vcs/cvs2svn-2.4.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-vcs/subversion-1.0.9 bazaar? ( >=dev-vcs/bzr-1.13[python_targets_p
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://cvs2svn.tigris.org/files/documents/1462/49237/cvs2svn-2.4.0.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=671ca4adbb4f0eddd87446b9f42f504d
diff --git a/metadata/md5-cache/dev-vcs/fossil-2.6 b/metadata/md5-cache/dev-vcs/fossil-2.6
index 98d9aa026966..d3ec9f9118de 100644
--- a/metadata/md5-cache/dev-vcs/fossil-2.6
+++ b/metadata/md5-cache/dev-vcs/fossil-2.6
@@ -4,7 +4,7 @@ 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
+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.24.0:3 ) ssl? ( dev-libs/openssl:0 ) tcl? ( dev-lang/tcl:0= )
 REQUIRED_USE=ssl? ( !miniz )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.fossil-scm.org/index.html/uv/fossil-src-2.6.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=29b7792a6de33fb4b8f00ac498116358
+_md5_=234d4596a76b05bdef8be33783822ed7
diff --git a/metadata/md5-cache/dev-vcs/git-2.16.5 b/metadata/md5-cache/dev-vcs/git-2.16.5
new file mode 100644
index 000000000000..dd5380ba2425
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-2.16.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
+DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
+EAPI=6
+HOMEPAGE=https://www.git-scm.com/
+IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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-2
+RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_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.16.5.tar.xz mirror://kernel/software/scm/git/git-manpages-2.16.5.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.16.5.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_=3b9b69eec7cf63eea3c03d26cf577ff5
diff --git a/metadata/md5-cache/dev-vcs/git-2.18.0 b/metadata/md5-cache/dev-vcs/git-2.18.0
index 06d6faa0427c..21baa7907888 100644
--- a/metadata/md5-cache/dev-vcs/git-2.18.0
+++ b/metadata/md5-cache/dev-vcs/git-2.18.0
@@ -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.0.tar.xz mirror://kernel/software/scm/git/git-manpages-2.18.0.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.18.0.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_=2a1709c59f4272ce5798262006860a7e
+_md5_=dcf10b1bd697fb11a5cf37721930f7e7
diff --git a/metadata/md5-cache/dev-vcs/git-2.18.1 b/metadata/md5-cache/dev-vcs/git-2.18.1
new file mode 100644
index 000000000000..34cb5209664c
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-2.18.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
+DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
+EAPI=6
+HOMEPAGE=https://www.git-scm.com/
+IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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
diff --git a/metadata/md5-cache/dev-vcs/git-2.19.1 b/metadata/md5-cache/dev-vcs/git-2.19.1
new file mode 100644
index 000000000000..0d8d765c01b4
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-2.19.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
+DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
+EAPI=6
+HOMEPAGE=https://www.git-scm.com/
+IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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.19.1.tar.xz mirror://kernel/software/scm/git/git-manpages-2.19.1.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.19.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_=79025af3be68140c8af8d3ab90d2bc16
diff --git a/metadata/md5-cache/dev-vcs/git-cola-2.11 b/metadata/md5-cache/dev-vcs/git-cola-2.11
index 3e707c7d89f3..1836f1f01bca 100644
--- a/metadata/md5-cache/dev-vcs/git-cola-2.11
+++ b/metadata/md5-cache/dev-vcs/git-cola-2.11
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyinotify[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/git-cola/git-cola/archive/v2.11.tar.gz -> git-cola-2.11.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0e739904e01f6f356d1025eb7c25c5b8
diff --git a/metadata/md5-cache/dev-vcs/git-spindle-3.3 b/metadata/md5-cache/dev-vcs/git-spindle-3.3
index 1dd1ba3ff2cf..11757c3f86aa 100644
--- a/metadata/md5-cache/dev-vcs/git-spindle-3.3
+++ b/metadata/md5-cache/dev-vcs/git-spindle-3.3
@@ -10,5 +10,5 @@ RDEPEND=dev-vcs/git python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 ) || ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://github.com/seveas/git-spindle/archive/3.3.tar.gz -> git-spindle-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7a83e572249f2ac4f5a8c90b624a961a
diff --git a/metadata/md5-cache/dev-vcs/git-spindle-3.3-r1 b/metadata/md5-cache/dev-vcs/git-spindle-3.3-r1
index 74c484586af3..3de5fbff287b 100644
--- a/metadata/md5-cache/dev-vcs/git-spindle-3.3-r1
+++ b/metadata/md5-cache/dev-vcs/git-spindle-3.3-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-vcs/git dev-python/github3[python_targets_python2_7(-)?,python_targe
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/seveas/git-spindle/archive/3.3.tar.gz -> git-spindle-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a5040d647bc7e83cefc22a54adfb6056
diff --git a/metadata/md5-cache/dev-vcs/gitg-3.26.0 b/metadata/md5-cache/dev-vcs/gitg-3.26.0
index 1b289d93b2e7..e61989d1164c 100644
--- a/metadata/md5-cache/dev-vcs/gitg-3.26.0
+++ b/metadata/md5-cache/dev-vcs/gitg-3.26.0
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/libsecret dev-libs/libgee:0.8[introspection] >=app-text/gtkspe
 REQUIRED_USE=python? ( || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gitg/3.26/gitg-3.26.0.tar.xz
-_eclasses_=desktop	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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=29fa463da29424e3bbedce5958ca5aa3
diff --git a/metadata/md5-cache/dev-vcs/github-pages-publish-0.1.2 b/metadata/md5-cache/dev-vcs/github-pages-publish-0.1.2
index 2e9517ca7574..eda3f478f7e4 100644
--- a/metadata/md5-cache/dev-vcs/github-pages-publish-0.1.2
+++ b/metadata/md5-cache/dev-vcs/github-pages-publish-0.1.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools >=dev-python/pygit2-0.20.0 python_targets_python2_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/github-pages-publish/github-pages-publish-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=50d77d4fe7141c974257275cd92861ad
diff --git a/metadata/md5-cache/dev-vcs/gitinspector-0.4.4 b/metadata/md5-cache/dev-vcs/gitinspector-0.4.4
index cb25538b0353..2c56c3a9097a 100644
--- a/metadata/md5-cache/dev-vcs/gitinspector-0.4.4
+++ b/metadata/md5-cache/dev-vcs/gitinspector-0.4.4
@@ -10,5 +10,5 @@ RDEPEND=dev-vcs/git python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ejwa/gitinspector/archive/v0.4.4.tar.gz -> gitinspector-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=742560481f0a4d29030dde9fe1a1e52e
diff --git a/metadata/md5-cache/dev-vcs/hg-git-0.8.10 b/metadata/md5-cache/dev-vcs/hg-git-0.8.10
index 16377f75b467..12c754e0c47d 100644
--- a/metadata/md5-cache/dev-vcs/hg-git-0.8.10
+++ b/metadata/md5-cache/dev-vcs/hg-git-0.8.10
@@ -10,5 +10,5 @@ RDEPEND=>=dev-vcs/mercurial-2.8.2[python_targets_python2_7(-)?,-python_single_ta
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hg-git/hg-git-0.8.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8dbfe5d98de13b5fe5da3373221479b6
diff --git a/metadata/md5-cache/dev-vcs/hg-git-0.8.10-r1 b/metadata/md5-cache/dev-vcs/hg-git-0.8.10-r1
index 294c6aec8f6b..2c49e02181a0 100644
--- a/metadata/md5-cache/dev-vcs/hg-git-0.8.10-r1
+++ b/metadata/md5-cache/dev-vcs/hg-git-0.8.10-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-vcs/mercurial-2.8.2[python_targets_python2_7(-)?,-python_single_ta
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hg-git/hg-git-0.8.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c30b5477f4f0ce35cd98472007fe73fd
diff --git a/metadata/md5-cache/dev-vcs/hg-git-0.8.11 b/metadata/md5-cache/dev-vcs/hg-git-0.8.11
index bbc4974c9dcd..3e1b810bfacb 100644
--- a/metadata/md5-cache/dev-vcs/hg-git-0.8.11
+++ b/metadata/md5-cache/dev-vcs/hg-git-0.8.11
@@ -10,5 +10,5 @@ RDEPEND=>=dev-vcs/mercurial-2.8.2[python_targets_python2_7(-)?,-python_single_ta
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hg-git/hg-git-0.8.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1fa071c9f436414780217935b5db6766
diff --git a/metadata/md5-cache/dev-vcs/hg-git-0.8.8 b/metadata/md5-cache/dev-vcs/hg-git-0.8.8
index 4d67545aa53c..76378103dac9 100644
--- a/metadata/md5-cache/dev-vcs/hg-git-0.8.8
+++ b/metadata/md5-cache/dev-vcs/hg-git-0.8.8
@@ -10,5 +10,5 @@ RDEPEND=>=dev-vcs/mercurial-2.8.2[python_targets_python2_7(-)?,-python_single_ta
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hg-git/hg-git-0.8.8.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=328c7bbf2fa988b70cdfcf0dedc6feb9
diff --git a/metadata/md5-cache/dev-vcs/hgsubversion-1.8.5 b/metadata/md5-cache/dev-vcs/hgsubversion-1.8.5
index ad2798ed65cf..9b3ad5deb173 100644
--- a/metadata/md5-cache/dev-vcs/hgsubversion-1.8.5
+++ b/metadata/md5-cache/dev-vcs/hgsubversion-1.8.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-vcs/mercurial-1.4[python_targets_python2_7(-)?,-python_single_targ
 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	89bb9f083a2590d9b447fd0b78a96186
+_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.8.6 b/metadata/md5-cache/dev-vcs/hgsubversion-1.8.6
index cc9309987f4f..ad2671d8c6a7 100644
--- a/metadata/md5-cache/dev-vcs/hgsubversion-1.8.6
+++ b/metadata/md5-cache/dev-vcs/hgsubversion-1.8.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-vcs/mercurial-1.4[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hgsubversion/hgsubversion-1.8.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=208c7047a3db72b09e40ca7bc31c4879
diff --git a/metadata/md5-cache/dev-vcs/hgsubversion-9999 b/metadata/md5-cache/dev-vcs/hgsubversion-9999
index 826c298fb45f..7f3e2e90067f 100644
--- a/metadata/md5-cache/dev-vcs/hgsubversion-9999
+++ b/metadata/md5-cache/dev-vcs/hgsubversion-9999
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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/hgsvn-0.2.3-r1 b/metadata/md5-cache/dev-vcs/hgsvn-0.2.3-r1
index 386766edae85..fe1248fc4ff0 100644
--- a/metadata/md5-cache/dev-vcs/hgsvn-0.2.3-r1
+++ b/metadata/md5-cache/dev-vcs/hgsvn-0.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://pypi/h/hgsvn/hgsvn-0.2.3.zip
-_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b8c68894c0c4061caecac3cf8e72f1b6
diff --git a/metadata/md5-cache/dev-vcs/hgview-1.9.0-r1 b/metadata/md5-cache/dev-vcs/hgview-1.9.0-r1
index 4291aada8489..d24b33eba031 100644
--- a/metadata/md5-cache/dev-vcs/hgview-1.9.0-r1
+++ b/metadata/md5-cache/dev-vcs/hgview-1.9.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyinotify[python_targets_python2_7(-)?,-python_single_target_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hgview/hgview-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0616f1b16d9887747938e90de7c86e11
diff --git a/metadata/md5-cache/dev-vcs/kdesvn-2.0.0 b/metadata/md5-cache/dev-vcs/kdesvn-2.0.0
index 6e9f7347c5b3..b932350622fd 100644
--- a/metadata/md5-cache/dev-vcs/kdesvn-2.0.0
+++ b/metadata/md5-cache/dev-vcs/kdesvn-2.0.0
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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.5.2 b/metadata/md5-cache/dev-vcs/mercurial-4.5.2
index 290bc3b91cee..10eada9c71f0 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-4.5.2
+++ b/metadata/md5-cache/dev-vcs/mercurial-4.5.2
@@ -10,5 +10,5 @@ RDEPEND=bugzilla? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://www.mercurial-scm.org/release/mercurial-4.5.2.tar.gz
-_eclasses_=bash-completion-r1	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=dd4b6e00814f81ee230ed225c383cb06
diff --git a/metadata/md5-cache/dev-vcs/mercurial-4.6.2 b/metadata/md5-cache/dev-vcs/mercurial-4.6.2
index b45053d75f49..5497ae0bfdac 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-4.6.2
+++ b/metadata/md5-cache/dev-vcs/mercurial-4.6.2
@@ -10,5 +10,5 @@ RDEPEND=bugzilla? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://www.mercurial-scm.org/release/mercurial-4.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3e5f2bc97354ba645a26578e23e08b2e
diff --git a/metadata/md5-cache/dev-vcs/mercurial-4.7 b/metadata/md5-cache/dev-vcs/mercurial-4.7
index ed83cb56ffc8..2bc36274f09b 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-4.7
+++ b/metadata/md5-cache/dev-vcs/mercurial-4.7
@@ -10,5 +10,5 @@ RDEPEND=bugzilla? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python
 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	89bb9f083a2590d9b447fd0b78a96186
+_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 b/metadata/md5-cache/dev-vcs/mercurial-4.7.1
index 9c63826a93f4..adccff60c2fe 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-4.7.1
+++ b/metadata/md5-cache/dev-vcs/mercurial-4.7.1
@@ -10,5 +10,5 @@ RDEPEND=bugzilla? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python
 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	89bb9f083a2590d9b447fd0b78a96186
+_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 d58dc6ce59e9..8dd1ab45cf02 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 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+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
 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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=392424222b02c6a40667666e143327cf
+_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
diff --git a/metadata/md5-cache/dev-vcs/mercurial-9999 b/metadata/md5-cache/dev-vcs/mercurial-9999
index ea4db19fab45..646d8c5614f7 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-9999
+++ b/metadata/md5-cache/dev-vcs/mercurial-9999
@@ -8,5 +8,5 @@ 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 ) zsh-completion? ( app-shells/zsh ) 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=d35cc8b8bec112773b7152b7c22f2469
diff --git a/metadata/md5-cache/dev-vcs/mercurial-server-1.2-r1 b/metadata/md5-cache/dev-vcs/mercurial-server-1.2-r1
index 4bac89257633..53211cc5c9db 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-server-1.2-r1
+++ b/metadata/md5-cache/dev-vcs/mercurial-server-1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-vcs/mercurial python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://dev.lshift.net/paul/mercurial-server/mercurial-server_1.2.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c42baffe8660a11beef6c531d77768a8
diff --git a/metadata/md5-cache/dev-vcs/mercurial-server-9999 b/metadata/md5-cache/dev-vcs/mercurial-server-9999
index c01b80563812..10ceb6fc8b2c 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-server-9999
+++ b/metadata/md5-cache/dev-vcs/mercurial-server-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-vcs/mercurial python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_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
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mercurial	9813bb616cb1bd0c943177ab52204409	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mercurial	9813bb616cb1bd0c943177ab52204409	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5f396b55db02dfcac53999ad3c076362
diff --git a/metadata/md5-cache/dev-vcs/qgit-2.7 b/metadata/md5-cache/dev-vcs/qgit-2.7
index 3308bf54f461..d7bbab6dcd9a 100644
--- a/metadata/md5-cache/dev-vcs/qgit-2.7
+++ b/metadata/md5-cache/dev-vcs/qgit-2.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-vcs/git !dev-vcs/qgit:2
 SLOT=0
 SRC_URI=https://github.com/tibirna/qgit/archive/qgit-2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bb0316dc9191b0101032e6bd7c12230b
diff --git a/metadata/md5-cache/dev-vcs/qgit-2.7-r1 b/metadata/md5-cache/dev-vcs/qgit-2.7-r1
index ebfdc7061065..95de5ca97d99 100644
--- a/metadata/md5-cache/dev-vcs/qgit-2.7-r1
+++ b/metadata/md5-cache/dev-vcs/qgit-2.7-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-vcs/git !dev-vcs/qgit:2
 SLOT=0
 SRC_URI=https://github.com/tibirna/qgit/archive/qgit-2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b77034f0035f3f18723b940da1683c21
diff --git a/metadata/md5-cache/dev-vcs/qgit-2.8 b/metadata/md5-cache/dev-vcs/qgit-2.8
index ed4db28db9ef..c2483c925a52 100644
--- a/metadata/md5-cache/dev-vcs/qgit-2.8
+++ b/metadata/md5-cache/dev-vcs/qgit-2.8
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-vcs/git !dev-vcs/qgit:2
 SLOT=0
 SRC_URI=https://github.com/tibirna/qgit/archive/qgit-2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=496f555f683f8ab5060099f08f3b1cf9
diff --git a/metadata/md5-cache/dev-vcs/rabbitvcs-0.16-r1 b/metadata/md5-cache/dev-vcs/rabbitvcs-0.16-r1
index b936c59adc4a..12e3ad00a872 100644
--- a/metadata/md5-cache/dev-vcs/rabbitvcs-0.16-r1
+++ b/metadata/md5-cache/dev-vcs/rabbitvcs-0.16-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/rabbitvcs/rabbitvcs/tarball/v0.16 -> rabbitvcs-0.16.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0d8d4b48b92fb92179fa0d8ceddb5e64
diff --git a/metadata/md5-cache/dev-vcs/stgit-0.16-r2 b/metadata/md5-cache/dev-vcs/stgit-0.16-r2
index fa184d4fd576..7ba48300b306 100644
--- a/metadata/md5-cache/dev-vcs/stgit-0.16-r2
+++ b/metadata/md5-cache/dev-vcs/stgit-0.16-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-vcs/git-1.6.3.3 python_targets_python2_7? ( >=dev-lang/python-2.7.
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://download.gna.org/stgit/stgit-0.16.tar.gz mirror://gentoo/stgit-0.16-missing-patches.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b4d21f18d6283fde808f3b36183521c1
diff --git a/metadata/md5-cache/dev-vcs/stgit-0.18 b/metadata/md5-cache/dev-vcs/stgit-0.18
index b4cf37bbda1b..f732ac91b147 100644
--- a/metadata/md5-cache/dev-vcs/stgit-0.18
+++ b/metadata/md5-cache/dev-vcs/stgit-0.18
@@ -10,5 +10,5 @@ RDEPEND=>=dev-vcs/git-1.6.3.3 python_targets_python2_7? ( >=dev-lang/python-2.7.
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ctmarinas/stgit/archive/v0.18.tar.gz -> stgit-0.18.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1e713415a855b5b4f6ce1c6b749fdd7d
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.10.0 b/metadata/md5-cache/dev-vcs/subversion-1.10.0
index 559c271cddf6..9e1697db0d66 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.10.0
+++ b/metadata/md5-cache/dev-vcs/subversion-1.10.0
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1
 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	89bb9f083a2590d9b447fd0b78a96186
+_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 76b62ec908a7..b8b9e2cb4b72 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.10.2
+++ b/metadata/md5-cache/dev-vcs/subversion-1.10.2
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.9.7-r1 b/metadata/md5-cache/dev-vcs/subversion-1.9.7-r1
index 1db4886e2e4d..b76be3ee4321 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.9.7-r1
+++ b/metadata/md5-cache/dev-vcs/subversion-1.9.7-r1
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/ap
 REQUIRED_USE=ctypes-python? ( || ( python_targets_python2_7 ) ) python? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) !dso )
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.9.7.tar.bz2 https://dev.gentoo.org/~mgorny/dist/subversion-1.8.18-patchset.tar.bz2
-_eclasses_=autotools	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ce7c8208bf86fbec3fd07f13214e2c84
diff --git a/metadata/md5-cache/dev-vcs/svneverever-1.3.0 b/metadata/md5-cache/dev-vcs/svneverever-1.3.0
index 3cc38ecb3b71..8290f795bd1b 100644
--- a/metadata/md5-cache/dev-vcs/svneverever-1.3.0
+++ b/metadata/md5-cache/dev-vcs/svneverever-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pysvn[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/hartwork/svneverever/archive/v1.3.0.tar.gz -> svneverever-1.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bab3424ea86a717f58f759e9c0038134
diff --git a/metadata/md5-cache/dev-vcs/svnmailer-1.0.9-r1 b/metadata/md5-cache/dev-vcs/svnmailer-1.0.9-r1
index 4af15fadeebd..2b2a8043880e 100644
--- a/metadata/md5-cache/dev-vcs/svnmailer-1.0.9-r1
+++ b/metadata/md5-cache/dev-vcs/svnmailer-1.0.9-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-vcs/subversion[python,python_targets_python2_7(-)?,-python_single_ta
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://storage.perlig.de/svnmailer/svnmailer-1.0.9.tar.bz2
-_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a1671f77b009b1d2278d18601cb9f80e
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-4.5.2 b/metadata/md5-cache/dev-vcs/tortoisehg-4.5.2
index efbc5839be84..76a983390507 100644
--- a/metadata/md5-cache/dev-vcs/tortoisehg-4.5.2
+++ b/metadata/md5-cache/dev-vcs/tortoisehg-4.5.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-vcs/mercurial-4.4 <dev-vcs/mercurial-4.6 dev-python/iniparse[pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://www.bitbucket.org/tortoisehg/targz/downloads/tortoisehg-4.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b41777a711895e6d4e1a38972c3f042c
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-4.5.3 b/metadata/md5-cache/dev-vcs/tortoisehg-4.5.3
index caf6544fd2e5..15ec09f2ca5f 100644
--- a/metadata/md5-cache/dev-vcs/tortoisehg-4.5.3
+++ b/metadata/md5-cache/dev-vcs/tortoisehg-4.5.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-vcs/mercurial-4.4 <dev-vcs/mercurial-4.6 dev-python/iniparse[pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://www.bitbucket.org/tortoisehg/targz/downloads/tortoisehg-4.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3f74f7d737859a466638d0da94761f0f
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-4.6.1 b/metadata/md5-cache/dev-vcs/tortoisehg-4.6.1
index 5fcedf93994a..c9fa5cc77b05 100644
--- a/metadata/md5-cache/dev-vcs/tortoisehg-4.6.1
+++ b/metadata/md5-cache/dev-vcs/tortoisehg-4.6.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-vcs/mercurial-4.5 <dev-vcs/mercurial-4.7 dev-python/iniparse[pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://www.bitbucket.org/tortoisehg/targz/downloads/tortoisehg-4.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=dd967a297044df85552326e89ef44e20
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-4.7 b/metadata/md5-cache/dev-vcs/tortoisehg-4.7
index bb6e7c59b235..819d434392a2 100644
--- a/metadata/md5-cache/dev-vcs/tortoisehg-4.7
+++ b/metadata/md5-cache/dev-vcs/tortoisehg-4.7
@@ -10,5 +10,5 @@ RDEPEND=>=dev-vcs/mercurial-4.6 <dev-vcs/mercurial-4.8 dev-python/iniparse[pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://www.bitbucket.org/tortoisehg/targz/downloads/tortoisehg-4.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=73e33c9c6df5839673d1a8817a118045
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-9999 b/metadata/md5-cache/dev-vcs/tortoisehg-9999
index a1d8979bd37f..082283893bd8 100644
--- a/metadata/md5-cache/dev-vcs/tortoisehg-9999
+++ b/metadata/md5-cache/dev-vcs/tortoisehg-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-vcs/mercurial dev-python/iniparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt5[network,svg,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/qscintilla-python-2.9.4:=[qt5(+),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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3f74f7d737859a466638d0da94761f0f
diff --git a/metadata/md5-cache/games-action/Manifest.gz b/metadata/md5-cache/games-action/Manifest.gz
index 889aa1462d56..72781de6402b 100644
--- a/metadata/md5-cache/games-action/Manifest.gz
+++ b/metadata/md5-cache/games-action/Manifest.gz
diff --git a/metadata/md5-cache/games-action/armagetronad-0.2.8.3.3-r1 b/metadata/md5-cache/games-action/armagetronad-0.2.8.3.3-r1
index 9986d57c22a7..5e4405c21628 100644
--- a/metadata/md5-cache/games-action/armagetronad-0.2.8.3.3-r1
+++ b/metadata/md5-cache/games-action/armagetronad-0.2.8.3.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/libxml2 !dedicated? ( media-libs/libpng:0= media-libs/libsdl[X,opengl,video,sound?] media-libs/sdl-image[jpeg,png] virtual/glu virtual/opengl sound? ( media-libs/sdl-mixer ) )
 SLOT=0
 SRC_URI=https://launchpad.net/armagetronad/0.2.8/0.2.8.3.x/+download/armagetronad-0.2.8.3.3.src.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=03bedeabb9028b49bf2298f96802ec1d
diff --git a/metadata/md5-cache/games-action/atanks-6.4-r1 b/metadata/md5-cache/games-action/atanks-6.4-r1
index 4c570272cc23..ae19858a6532 100644
--- a/metadata/md5-cache/games-action/atanks-6.4-r1
+++ b/metadata/md5-cache/games-action/atanks-6.4-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=media-libs/allegro:0[X]
 SLOT=0
 SRC_URI=mirror://sourceforge/atanks/atanks-6.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a82f57a5fe611a892fa7d666e339eb40
diff --git a/metadata/md5-cache/games-action/barrage-1.0.4-r1 b/metadata/md5-cache/games-action/barrage-1.0.4-r1
index c0f641fdb42a..35183c0ca688 100644
--- a/metadata/md5-cache/games-action/barrage-1.0.4-r1
+++ b/metadata/md5-cache/games-action/barrage-1.0.4-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libsdl-1.2[sound,video] >=media-libs/sdl-mixer-1.2.4
 SLOT=0
 SRC_URI=mirror://sourceforge/lgames/barrage-1.0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=753d72afd7f573ad1a16a4b7dab0952e
diff --git a/metadata/md5-cache/games-action/brutal-legend-20130615-r2 b/metadata/md5-cache/games-action/brutal-legend-20130615-r2
index 56ac524feb42..e200461b6b50 100644
--- a/metadata/md5-cache/games-action/brutal-legend-20130615-r2
+++ b/metadata/md5-cache/games-action/brutal-legend-20130615-r2
@@ -9,5 +9,5 @@ RDEPEND=amd64? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=virtual/glu-9.0-r1[ab
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=BrutalLegend-Linux-2013-06-15-setup.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2fef19a9a93041038b652f1e1e242d5e
diff --git a/metadata/md5-cache/games-action/chromium-bsu-0.9.15.1-r1 b/metadata/md5-cache/games-action/chromium-bsu-0.9.15.1-r1
index c2c57fe0f6b4..1760dad71512 100644
--- a/metadata/md5-cache/games-action/chromium-bsu-0.9.15.1-r1
+++ b/metadata/md5-cache/games-action/chromium-bsu-0.9.15.1-r1
@@ -9,5 +9,5 @@ LICENSE=Clarified-Artistic
 RDEPEND=media-fonts/dejavu media-libs/quesoglc media-libs/glpng virtual/opengl virtual/glu x11-libs/libXmu mixer? ( media-libs/sdl-mixer ) !mixer? ( media-libs/freealut media-libs/openal ) nls? ( virtual/libintl ) sdl? ( media-libs/libsdl[X] media-libs/sdl-image[png] ) !sdl? ( media-libs/freeglut )
 SLOT=0
 SRC_URI=mirror://sourceforge/chromium-bsu/chromium-bsu-0.9.15.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ea057cc75addf9ea8a36db1174d7c1ba
diff --git a/metadata/md5-cache/games-action/descent3-demo-1.4.0a-r1 b/metadata/md5-cache/games-action/descent3-demo-1.4.0a-r1
index 01bc63873406..f659b8fc83e5 100644
--- a/metadata/md5-cache/games-action/descent3-demo-1.4.0a-r1
+++ b/metadata/md5-cache/games-action/descent3-demo-1.4.0a-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=?? ( alsa pulseaudio )
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=mirror://lokigames/loki_demos/descent3-demo.run
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=58131cf0997822fa065e4972f63a49f4
diff --git a/metadata/md5-cache/games-action/dxx-rebirth-0.59.100 b/metadata/md5-cache/games-action/dxx-rebirth-0.59.100
index 6087d5cb4d9a..dab11e1848c0 100644
--- a/metadata/md5-cache/games-action/dxx-rebirth-0.59.100
+++ b/metadata/md5-cache/games-action/dxx-rebirth-0.59.100
@@ -10,5 +10,5 @@ RDEPEND=dev-games/physfs:0=[hog,mvl,zip] media-libs/libsdl:0=[joystick,opengl?,s
 REQUIRED_USE=|| ( descent1 descent2 ) ?? ( opl3-musicpack sc55-musicpack ) opl3-musicpack? ( music ) sc55-musicpack? ( music )
 SLOT=0
 SRC_URI=https://www.dxx-rebirth.com/download/dxx/dxx-rebirth_v0.59.100-src.tar.gz opl3-musicpack? ( descent1? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-opl3-music.dxa ) descent2? ( https://www.dxx-rebirth.com/download/dxx/res/d2xr-opl3-music.dxa ) ) sc55-musicpack? ( descent1? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-sc55-music.dxa ) descent2? ( https://www.dxx-rebirth.com/download/dxx/res/d2xr-sc55-music.dxa ) ) l10n_de? ( descent1? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-briefings-ger.dxa ) descent2? ( https://www.dxx-rebirth.com/download/dxx/res/d2xr-briefings-ger.dxa ) ) textures? ( descent1? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-hires.dxa ) )
-_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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c0865e5009077d1ec4befbe1d87d85c1
diff --git a/metadata/md5-cache/games-action/extreme-tuxracer-0.7.4 b/metadata/md5-cache/games-action/extreme-tuxracer-0.7.4
index 77c857254b56..4b583c260e75 100644
--- a/metadata/md5-cache/games-action/extreme-tuxracer-0.7.4
+++ b/metadata/md5-cache/games-action/extreme-tuxracer-0.7.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=media-libs/libsfml-2.2:0= virtual/glu virtual/opengl
 SLOT=0
 SRC_URI=mirror://sourceforge/extremetuxracer/etr-0.7.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0229d3c673d3c18a1a472818a27874e4
diff --git a/metadata/md5-cache/games-action/garden-1.0.9-r1 b/metadata/md5-cache/games-action/garden-1.0.9-r1
index c1307b62aed7..79c8146a2482 100644
--- a/metadata/md5-cache/games-action/garden-1.0.9-r1
+++ b/metadata/md5-cache/games-action/garden-1.0.9-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=<media-libs/allegro-5
 SLOT=0
 SRC_URI=mirror://sourceforge/garden/garden-1.0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f940a68bade7c9c47dfe1220409bb992
diff --git a/metadata/md5-cache/games-action/lugaru-20151204-r1 b/metadata/md5-cache/games-action/lugaru-20151204-r1
index 1cb4589392aa..1d53a9153632 100644
--- a/metadata/md5-cache/games-action/lugaru-20151204-r1
+++ b/metadata/md5-cache/games-action/lugaru-20151204-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ free-noncomm CC-BY-SA-3.0
 RDEPEND=media-libs/libpng:0 media-libs/libsdl[opengl,video] media-libs/libvorbis media-libs/openal sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl
 SLOT=0
 SRC_URI=mirror://gentoo/lugaru-20151204.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fca604332d3d779934925b8a9e444289
diff --git a/metadata/md5-cache/games-action/luola-1.3.2-r1 b/metadata/md5-cache/games-action/luola-1.3.2-r1
index 1e1031fcfe6a..6ad863675fe6 100644
--- a/metadata/md5-cache/games-action/luola-1.3.2-r1
+++ b/metadata/md5-cache/games-action/luola-1.3.2-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[X,sound,joystick,video] media-libs/sdl-gfx media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer media-libs/sdl-ttf
 SLOT=0
 SRC_URI=mirror://gentoo/luola-1.3.2.tar.gz mirror://gentoo/stdlevels-6.0.tar.gz mirror://gentoo/nostalgia-1.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=2034e90837952701f836a7bd53fbc740
diff --git a/metadata/md5-cache/games-action/minetest-0.4.16-r1 b/metadata/md5-cache/games-action/minetest-0.4.16-r1
index 91f25f6bdd0a..051b9059a257 100644
--- a/metadata/md5-cache/games-action/minetest-0.4.16-r1
+++ b/metadata/md5-cache/games-action/minetest-0.4.16-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+ CC-BY-SA-3.0 OFL-1.1 Apache-2.0
 RDEPEND=dev-db/sqlite:3 sys-libs/zlib curl? ( net-misc/curl ) !dedicated? ( app-arch/bzip2 >=dev-games/irrlicht-1.8-r2 dev-libs/gmp:0= media-libs/libpng:0= virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXxf86vm sound? ( media-libs/libogg:= media-libs/libvorbis:= media-libs/openal:= ) truetype? ( media-libs/freetype:2 ) ) leveldb? ( dev-libs/leveldb ) luajit? ( dev-lang/luajit:2 ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) postgres? ( >=dev-db/postgresql-9.5:= ) redis? ( dev-libs/hiredis ) spatial? ( sci-libs/libspatialindex )
 SLOT=0
 SRC_URI=https://github.com/minetest/minetest/tarball/0.4.16 -> minetest-0.4.16.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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5942a1d855075b3a2a75229ca6b7302b
diff --git a/metadata/md5-cache/games-action/minetest-0.4.17-r1 b/metadata/md5-cache/games-action/minetest-0.4.17-r1
index bb1590ca62cc..bb13bd892ab9 100644
--- a/metadata/md5-cache/games-action/minetest-0.4.17-r1
+++ b/metadata/md5-cache/games-action/minetest-0.4.17-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+ CC-BY-SA-3.0 OFL-1.1 Apache-2.0
 RDEPEND=dev-db/sqlite:3 sys-libs/zlib curl? ( net-misc/curl ) !dedicated? ( app-arch/bzip2 >=dev-games/irrlicht-1.8-r2 dev-libs/gmp:0= media-libs/libpng:0= virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXxf86vm sound? ( media-libs/libogg:= media-libs/libvorbis:= media-libs/openal:= ) truetype? ( media-libs/freetype:2 ) ) jsoncpp? ( dev-libs/jsoncpp ) leveldb? ( dev-libs/leveldb:= ) luajit? ( dev-lang/luajit:2 ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) postgres? ( >=dev-db/postgresql-9.5:= ) redis? ( dev-libs/hiredis ) spatial? ( sci-libs/libspatialindex )
 SLOT=0
 SRC_URI=https://github.com/minetest/minetest/archive/0.4.17.tar.gz -> minetest-0.4.17.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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ad46e02d5635b0997de5d50800ce23fe
diff --git a/metadata/md5-cache/games-action/minetest-0.4.17.1 b/metadata/md5-cache/games-action/minetest-0.4.17.1
index 8ca460e5a9f7..4d9045e763fa 100644
--- a/metadata/md5-cache/games-action/minetest-0.4.17.1
+++ b/metadata/md5-cache/games-action/minetest-0.4.17.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+ CC-BY-SA-3.0 OFL-1.1 Apache-2.0
 RDEPEND=dev-db/sqlite:3 sys-libs/zlib curl? ( net-misc/curl ) !dedicated? ( app-arch/bzip2 >=dev-games/irrlicht-1.8-r2 dev-libs/gmp:0= media-libs/libpng:0= virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXxf86vm sound? ( media-libs/libogg:= media-libs/libvorbis:= media-libs/openal:= ) truetype? ( media-libs/freetype:2 ) ) jsoncpp? ( dev-libs/jsoncpp ) leveldb? ( dev-libs/leveldb:= ) luajit? ( dev-lang/luajit:2 ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) postgres? ( >=dev-db/postgresql-9.5:= ) redis? ( dev-libs/hiredis ) spatial? ( sci-libs/libspatialindex )
 SLOT=0
 SRC_URI=https://github.com/minetest/minetest/archive/0.4.17.1.tar.gz -> minetest-0.4.17.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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ad46e02d5635b0997de5d50800ce23fe
diff --git a/metadata/md5-cache/games-action/openastromenace-1.3.2-r1 b/metadata/md5-cache/games-action/openastromenace-1.3.2-r1
index bba0223fbfac..6d300fd9361c 100644
--- a/metadata/md5-cache/games-action/openastromenace-1.3.2-r1
+++ b/metadata/md5-cache/games-action/openastromenace-1.3.2-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3 GPL-3+ CC-BY-SA-3.0 UbuntuFontLicense-1.0 OFL-1.1
 RDEPEND=media-libs/freealut media-libs/freetype:2 media-libs/libogg media-libs/libsdl[joystick,video,X] media-libs/libvorbis media-libs/openal virtual/glu virtual/opengl x11-libs/libXinerama
 SLOT=0
 SRC_URI=mirror://sourceforge/openastromenace/1.3.2/astromenace-src-1.3.2.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=9fb3273a0fe14fc70a4f0d80ede0d471
diff --git a/metadata/md5-cache/games-action/openclonk-7.0 b/metadata/md5-cache/games-action/openclonk-7.0
index ecde259562ad..fa1a6455a246 100644
--- a/metadata/md5-cache/games-action/openclonk-7.0
+++ b/metadata/md5-cache/games-action/openclonk-7.0
@@ -9,5 +9,5 @@ LICENSE=BSD ISC CLONK-trademark LGPL-2.1 POSTGRESQL
 RDEPEND=>=dev-libs/boost-1.40:= dev-libs/tinyxml net-libs/libupnp media-libs/libpng:0= sys-libs/zlib !dedicated? ( dev-libs/glib:2 media-libs/freealut media-libs/freetype:2 media-libs/glew media-libs/libsdl[X,opengl,sound,video] media-libs/libvorbis media-libs/openal media-libs/sdl-mixer[mp3,vorbis,wav] virtual/jpeg:0= virtual/opengl virtual/glu x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libXrandr x11-libs/libX11 ) dedicated? ( sys-libs/readline:0= ) games-misc/games-envd
 SLOT=0
 SRC_URI=http://www.openclonk.org/builds/release/7.0/openclonk-7.0-src.tar.bz2
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	55aaa148741116aa54ad0d80e361818e	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	55aaa148741116aa54ad0d80e361818e	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0d4f1f5db5d9b1dc2735dd9c90667f2d
diff --git a/metadata/md5-cache/games-action/shootingstar-1.2.0-r1 b/metadata/md5-cache/games-action/shootingstar-1.2.0-r1
index 83609bda49aa..1299e95831e8 100644
--- a/metadata/md5-cache/games-action/shootingstar-1.2.0-r1
+++ b/metadata/md5-cache/games-action/shootingstar-1.2.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[video] media-libs/sdl-image media-libs/sdl-mixer virtual/glu virtual/opengl
 SLOT=0
 SRC_URI=mirror://gentoo/shootingstar-1.2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cb361d2bf9659ab1d2b6f281dee3b06e
diff --git a/metadata/md5-cache/games-action/slune-1.0.15-r1 b/metadata/md5-cache/games-action/slune-1.0.15-r1
index e92667afd4fc..94af84ae944e 100644
--- a/metadata/md5-cache/games-action/slune-1.0.15-r1
+++ b/metadata/md5-cache/games-action/slune-1.0.15-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/opengl >=media-libs/libsdl-1.2.6 >=dev-python/soya-0.9 >=dev-pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://download.gna.org/slune/Slune-1.0.15.tar.bz2
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	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_=038cce468ea051bf734db626ec015d00
diff --git a/metadata/md5-cache/games-action/solar2-1.10 b/metadata/md5-cache/games-action/solar2-1.10
index 2ffd7213d3ea..6469bd90ab83 100644
--- a/metadata/md5-cache/games-action/solar2-1.10
+++ b/metadata/md5-cache/games-action/solar2-1.10
@@ -10,5 +10,5 @@ RDEPEND=virtual/opengl amd64? ( >=media-libs/flac-1.2.1-r5[abi_x86_32(-)] >=medi
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=solar2-linux-1.10.tar.gz https://dev.gentoo.org/~chewi/distfiles/solar2.png
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d99222fdb99181f959cd00238241d9d3
diff --git a/metadata/md5-cache/games-action/super-hexagon-20160217 b/metadata/md5-cache/games-action/super-hexagon-20160217
index 7667f7289b1f..be9e9234d4a1 100644
--- a/metadata/md5-cache/games-action/super-hexagon-20160217
+++ b/metadata/md5-cache/games-action/super-hexagon-20160217
@@ -9,5 +9,5 @@ RDEPEND=media-libs/glew:1.6 media-libs/libsdl2[opengl,sound,video] media-libs/li
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=superhexagon-02172016-bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2d840f70659ed17da18ff73178fc9b9d
diff --git a/metadata/md5-cache/games-action/supermariowar-2.0_beta1-r1 b/metadata/md5-cache/games-action/supermariowar-2.0_beta1-r1
index 1632c81537ab..629ed8f7018e 100644
--- a/metadata/md5-cache/games-action/supermariowar-2.0_beta1-r1
+++ b/metadata/md5-cache/games-action/supermariowar-2.0_beta1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib:= dev-cpp/yaml-cpp net-libs/enet:1.3= media-libs/sdl-mixer[vorbis] media-libs/sdl-image[png,jpeg]
 SLOT=0
 SRC_URI=https://github.com/mmatyas/supermariowar/archive/v2.0-beta.1.tar.gz -> supermariowar-2.0_beta1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7080edb26c5dfaffbd0b0c1d2f20fc72
diff --git a/metadata/md5-cache/games-action/supertuxkart-0.9.3 b/metadata/md5-cache/games-action/supertuxkart-0.9.3
index c9d64445ad79..0cb741b8f47d 100644
--- a/metadata/md5-cache/games-action/supertuxkart-0.9.3
+++ b/metadata/md5-cache/games-action/supertuxkart-0.9.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-3 CC-BY-SA-3.0 CC-BY-2.0 public-domain ZLIB
 RDEPEND=media-libs/glew:0= media-libs/libpng:0= media-libs/libvorbis media-libs/openal net-libs/enet:1.3= net-misc/curl sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/libintl virtual/opengl x11-libs/libX11 x11-libs/libXxf86vm fribidi? ( dev-libs/fribidi ) recorder? ( media-libs/libopenglrecorder ) wiimote? ( net-wireless/bluez )
 SLOT=0
 SRC_URI=mirror://sourceforge/supertuxkart/SuperTuxKart/0.9.3/supertuxkart-0.9.3-src.tar.xz mirror://gentoo/supertuxkart.png
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b9fd34935be1cb76a402745579bbbd24
diff --git a/metadata/md5-cache/games-action/trine-1.08-r3 b/metadata/md5-cache/games-action/trine-1.08-r3
index c78eeb799a8d..ee062cf8bc89 100644
--- a/metadata/md5-cache/games-action/trine-1.08-r3
+++ b/metadata/md5-cache/games-action/trine-1.08-r3
@@ -10,5 +10,5 @@ RDEPEND=media-gfx/nvidia-cg-toolkit >=media-libs/libsdl-1.2[opengl,video] >=medi
 RESTRICT=bindist fetch strip
 SLOT=0
 SRC_URI=TrineUpdate4.64.run
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5f9e04e0f615f5ae156d2f44510e2a69
diff --git a/metadata/md5-cache/games-action/trine-enchanted-edition-2.12.508 b/metadata/md5-cache/games-action/trine-enchanted-edition-2.12.508
index 54e3199da8eb..d54f98204cb4 100644
--- a/metadata/md5-cache/games-action/trine-enchanted-edition-2.12.508
+++ b/metadata/md5-cache/games-action/trine-enchanted-edition-2.12.508
@@ -10,5 +10,5 @@ RDEPEND=media-gfx/nvidia-cg-toolkit[abi_x86_32] media-libs/alsa-lib[abi_x86_32]
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=trine_enchanted_edition_v2_12_build_508_humble_linux_full.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fb967e6521fa9fab73d220e7037b70e2
diff --git a/metadata/md5-cache/games-action/trine2-2.01.425 b/metadata/md5-cache/games-action/trine2-2.01.425
index ba4a06306e9a..3cb7bbd8792e 100644
--- a/metadata/md5-cache/games-action/trine2-2.01.425
+++ b/metadata/md5-cache/games-action/trine2-2.01.425
@@ -10,5 +10,5 @@ RDEPEND=media-gfx/nvidia-cg-toolkit[abi_x86_32] media-libs/alsa-lib[abi_x86_32]
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=trine2_complete_story_v2_01_build_425_humble_linux_full.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ed3f3d5b32c95dae94599c9980880e01
diff --git a/metadata/md5-cache/games-action/trosh-20-r1 b/metadata/md5-cache/games-action/trosh-20-r1
index 29d1a7969513..c48e62951a1d 100644
--- a/metadata/md5-cache/games-action/trosh-20-r1
+++ b/metadata/md5-cache/games-action/trosh-20-r1
@@ -8,5 +8,5 @@ LICENSE=WTFPL-2
 RDEPEND=>=games-engines/love-0.8.0:0 media-libs/devil[png]
 SLOT=0
 SRC_URI=http://stabyourself.net/dl.php?file=trosh/trosh-linux.zip -> trosh-20.zip https://dev.gentoo.org/~hasufell/distfiles/trosh.png
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0a8887f077957b7393b6e1942df6c525
diff --git a/metadata/md5-cache/games-action/trosh-20-r2 b/metadata/md5-cache/games-action/trosh-20-r2
index 6a61c514fb35..af8e9c98558e 100644
--- a/metadata/md5-cache/games-action/trosh-20-r2
+++ b/metadata/md5-cache/games-action/trosh-20-r2
@@ -8,5 +8,5 @@ LICENSE=WTFPL-2
 RDEPEND=games-engines/love:0.8 media-libs/devil[png]
 SLOT=0
 SRC_URI=http://stabyourself.net/dl.php?file=trosh/trosh-linux.zip -> trosh-20.zip https://dev.gentoo.org/~hasufell/distfiles/trosh.png
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5e1224fe0a61fe2ee11e9e31dae1679f
diff --git a/metadata/md5-cache/games-action/violetland-0.4.3-r1 b/metadata/md5-cache/games-action/violetland-0.4.3-r1
index 2ed517947dc4..9b824c9a414d 100644
--- a/metadata/md5-cache/games-action/violetland-0.4.3-r1
+++ b/metadata/md5-cache/games-action/violetland-0.4.3-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3 CC-BY-SA-3.0
 RDEPEND=dev-libs/boost:=[threads(+)] media-libs/libsdl[sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf virtual/glu virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/ooxi/violetland/archive/0.4.3.tar.gz -> violetland-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bba357c07836d72479afa3e5430b3b37
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index 472ff329c8c1..1be3e3715bd6 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/asteroid-1.2.1 b/metadata/md5-cache/games-arcade/asteroid-1.2.1
index ba37342ec232..a15dd5f81701 100644
--- a/metadata/md5-cache/games-arcade/asteroid-1.2.1
+++ b/metadata/md5-cache/games-arcade/asteroid-1.2.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/opengl media-libs/freeglut virtual/glu media-libs/libsdl media-libs/sdl-mixer x11-libs/gtk+:2
 SLOT=0
 SRC_URI=https://github.com/chazomaticus/asteroid/archive/1.2.1.tar.gz -> asteroid-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=69d65d2c60ed9521160f1a0ff982b38c
diff --git a/metadata/md5-cache/games-arcade/batrachians-0.1.6-r1 b/metadata/md5-cache/games-arcade/batrachians-0.1.6-r1
index ef40f21b3752..805c60c81084 100644
--- a/metadata/md5-cache/games-arcade/batrachians-0.1.6-r1
+++ b/metadata/md5-cache/games-arcade/batrachians-0.1.6-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-games/flatzebra-0.1.5
 SLOT=0
 SRC_URI=http://perso.b2b2c.ca/sarrazip/dev/batrachians-0.1.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e989f540e94f19311f03e8bec7d02ef1
diff --git a/metadata/md5-cache/games-arcade/berusky-1.7.1-r1 b/metadata/md5-cache/games-arcade/berusky-1.7.1-r1
index e2b8d40bb02a..9e5409d2a089 100644
--- a/metadata/md5-cache/games-arcade/berusky-1.7.1-r1
+++ b/metadata/md5-cache/games-arcade/berusky-1.7.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[X,video] media-libs/sdl-image[png] x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://www.anakreon.cz/download/berusky-1.7.1.tar.gz http://www.anakreon.cz/download/berusky-data-1.7.tar.gz https://dev.gentoo.org/~hasufell/distfiles/berusky.png
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b90a41e4c8c5fbf303a525c89588673e
diff --git a/metadata/md5-cache/games-arcade/blobby-1.0 b/metadata/md5-cache/games-arcade/blobby-1.0
index 7b00ec6eeee0..04499636fa22 100644
--- a/metadata/md5-cache/games-arcade/blobby-1.0
+++ b/metadata/md5-cache/games-arcade/blobby-1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-games/physfs-2[zip] media-libs/libsdl[sound,joystick,opengl,video,X] virtual/opengl
 SLOT=0
 SRC_URI=mirror://sourceforge/blobby/blobby2-linux-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=33f7d51c85899e7285cdf1210e0829bf
diff --git a/metadata/md5-cache/games-arcade/blobwars-2.00 b/metadata/md5-cache/games-arcade/blobwars-2.00
index c34462567c42..dfcadab9597c 100644
--- a/metadata/md5-cache/games-arcade/blobwars-2.00
+++ b/metadata/md5-cache/games-arcade/blobwars-2.00
@@ -8,5 +8,5 @@ LICENSE=BSD CC-BY-SA-3.0 CC-BY-3.0 GPL-2 LGPL-2.1 fairuse public-domain
 RDEPEND=media-libs/libsdl2 media-libs/sdl2-mixer media-libs/sdl2-ttf media-libs/sdl2-image media-libs/sdl2-net sys-libs/zlib virtual/libintl
 SLOT=0
 SRC_URI=mirror://sourceforge/blobwars/blobwars-2.00.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	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=56807bcf0d0ebd14c259836436582717
diff --git a/metadata/md5-cache/games-arcade/commandergenius-1.8.3 b/metadata/md5-cache/games-arcade/commandergenius-1.8.3
index 514750828ff8..3d0f9679ad78 100644
--- a/metadata/md5-cache/games-arcade/commandergenius-1.8.3
+++ b/metadata/md5-cache/games-arcade/commandergenius-1.8.3
@@ -10,5 +10,5 @@ RDEPEND=media-libs/libsdl2[X,opengl?,sound,video] media-libs/sdl2-image opengl?
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://github.com/gerstrong/Commander-Genius/archive/v183release.tar.gz -> commandergenius-1.8.3.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=23f052c8f78301470e9d8b09cbd31950
diff --git a/metadata/md5-cache/games-arcade/frozen-bubble-2.2.1_beta1-r1 b/metadata/md5-cache/games-arcade/frozen-bubble-2.2.1_beta1-r1
index 5ad900b3759c..caa4b5608ae6 100644
--- a/metadata/md5-cache/games-arcade/frozen-bubble-2.2.1_beta1-r1
+++ b/metadata/md5-cache/games-arcade/frozen-bubble-2.2.1_beta1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.12 dev-libs/glib:2 >=dev-perl/Alien-SDL-1.413 dev-perl/Compress-Bzip2 dev-perl/File-ShareDir dev-perl/File-Slurp dev-perl/File-Which dev-perl/IPC-System-Simple >=dev-perl/SDL-2.511 media-libs/sdl-image[gif,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-pango media-libs/sdl-ttf virtual/libiconv virtual/perl-Getopt-Long virtual/perl-IO dev-lang/perl:=
 SLOT=0
 SRC_URI=http://www.frozen-bubble.org/data/frozen-bubble-2.2.1-beta1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4dd24c11237a97b45ff2a91a8923c153
diff --git a/metadata/md5-cache/games-arcade/funnyboat-1.5-r2 b/metadata/md5-cache/games-arcade/funnyboat-1.5-r2
index 8d4682be9841..0a4fdd82f19c 100644
--- a/metadata/md5-cache/games-arcade/funnyboat-1.5-r2
+++ b/metadata/md5-cache/games-arcade/funnyboat-1.5-r2
@@ -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=mirror://sourceforge/funnyboat/funnyboat-1.5-src.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0637acac23b34d252bd4a5e01af56a60
diff --git a/metadata/md5-cache/games-arcade/gnome-nibbles-3.24.0 b/metadata/md5-cache/games-arcade/gnome-nibbles-3.24.0
index 8af37afc5e76..095393c018a8 100644
--- a/metadata/md5-cache/games-arcade/gnome-nibbles-3.24.0
+++ b/metadata/md5-cache/games-arcade/gnome-nibbles-3.24.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.40.0:2 dev-libs/libgee:0.8= dev-libs/libgnome-games-support:1= >=media-libs/clutter-1.22.0:1.0 >=media-libs/clutter-gtk-1.4.0:1.0 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.18.0:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-nibbles/3.24/gnome-nibbles-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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5034fca179bacd62d5f711fbe4a4f286
diff --git a/metadata/md5-cache/games-arcade/gnome-nibbles-3.24.1 b/metadata/md5-cache/games-arcade/gnome-nibbles-3.24.1
index 24f75c451165..dd3802dc40e6 100644
--- a/metadata/md5-cache/games-arcade/gnome-nibbles-3.24.1
+++ b/metadata/md5-cache/games-arcade/gnome-nibbles-3.24.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.40.0:2 dev-libs/libgee:0.8= dev-libs/libgnome-games-support:1= >=media-libs/clutter-1.22.0:1.0 >=media-libs/clutter-gtk-1.4.0:1.0 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.18.0:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-nibbles/3.24/gnome-nibbles-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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=df6a7d5064fe7d5a553c6b67f5fb13a4
diff --git a/metadata/md5-cache/games-arcade/gnome-robots-3.22.3 b/metadata/md5-cache/games-arcade/gnome-robots-3.22.3
index 8e094c3407ad..782bd0adcbc1 100644
--- a/metadata/md5-cache/games-arcade/gnome-robots-3.22.3
+++ b/metadata/md5-cache/games-arcade/gnome-robots-3.22.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.32:2 dev-libs/libgnome-games-support:1= >=gnome-base/librsvg-2.36.2:2 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.15:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-robots/3.22/gnome-robots-3.22.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d17869f9d28f94bdf04a01b8a4e934c8
diff --git a/metadata/md5-cache/games-arcade/jvgs-0.5-r1 b/metadata/md5-cache/games-arcade/jvgs-0.5-r1
index aa95d509c45c..42beba5007dd 100644
--- a/metadata/md5-cache/games-arcade/jvgs-0.5-r1
+++ b/metadata/md5-cache/games-arcade/jvgs-0.5-r1
@@ -8,5 +8,5 @@ LICENSE=WTFPL-2
 RDEPEND=dev-lang/lua:0 media-libs/libsdl[video] media-libs/sdl-mixer[vorbis] media-libs/freetype:2 sys-libs/zlib:= virtual/opengl
 SLOT=0
 SRC_URI=mirror://sourceforge/jvgs/jvgs-0.5-src.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1aae451c2731cdaf04e6d61197c2c0a1
diff --git a/metadata/md5-cache/games-arcade/lbreakout2-2.6.5-r1 b/metadata/md5-cache/games-arcade/lbreakout2-2.6.5-r1
index e7679630e199..435d138dd90a 100644
--- a/metadata/md5-cache/games-arcade/lbreakout2-2.6.5-r1
+++ b/metadata/md5-cache/games-arcade/lbreakout2-2.6.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libpng:0= sys-libs/zlib media-libs/libsdl[sound,joystick,video] media-libs/sdl-net media-libs/sdl-mixer nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/lgames/lbreakout2-2.6.5.tar.gz mirror://sourceforge/lgames/add-ons/lbreakout2/lbreakout2-levelsets-20141220.tar.gz themes? ( mirror://sourceforge/lgames/add-ons/lbreakout2/lbreakout2-themes-20141220.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8bbe78288015b6b9d768a1d9b22845ef
diff --git a/metadata/md5-cache/games-arcade/missile-1.0.1-r1 b/metadata/md5-cache/games-arcade/missile-1.0.1-r1
index 8c8a5f63ba5a..e8325df625f2 100644
--- a/metadata/md5-cache/games-arcade/missile-1.0.1-r1
+++ b/metadata/md5-cache/games-arcade/missile-1.0.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer
 SLOT=0
 SRC_URI=mirror://sourceforge/missile/missile-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a9ba35cdc2e001e6b336ec5325f456b6
diff --git a/metadata/md5-cache/games-arcade/mrrescue-1.02b-r1 b/metadata/md5-cache/games-arcade/mrrescue-1.02b-r1
index 22c73eee9bd2..e8fb94643b24 100644
--- a/metadata/md5-cache/games-arcade/mrrescue-1.02b-r1
+++ b/metadata/md5-cache/games-arcade/mrrescue-1.02b-r1
@@ -8,5 +8,5 @@ LICENSE=CC-BY-SA-3.0 MIT ZLIB
 RDEPEND=games-engines/love:0
 SLOT=0
 SRC_URI=https://github.com/SimonLarsen/mrrescue/releases/download/v1.02b/mrrescue-1.02b-love.zip https://dev.gentoo.org/~hasufell/distfiles/mrrescue.png
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c8143fcf07136d08245c44c9dcc8df5b
diff --git a/metadata/md5-cache/games-arcade/mrrescue-1.02b-r2 b/metadata/md5-cache/games-arcade/mrrescue-1.02b-r2
index 484206285860..e7e995a7fb32 100644
--- a/metadata/md5-cache/games-arcade/mrrescue-1.02b-r2
+++ b/metadata/md5-cache/games-arcade/mrrescue-1.02b-r2
@@ -8,5 +8,5 @@ LICENSE=CC-BY-SA-3.0 MIT ZLIB
 RDEPEND=games-engines/love:0.8
 SLOT=0
 SRC_URI=https://github.com/SimonLarsen/mrrescue/releases/download/v1.02b/mrrescue-1.02b-love.zip https://dev.gentoo.org/~hasufell/distfiles/mrrescue.png
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b2e4d7e5782e0d8c00c75a58196a62df
diff --git a/metadata/md5-cache/games-arcade/notpacman-1.0.4-r1 b/metadata/md5-cache/games-arcade/notpacman-1.0.4-r1
index f3a9490706da..fe2b8ffbfe18 100644
--- a/metadata/md5-cache/games-arcade/notpacman-1.0.4-r1
+++ b/metadata/md5-cache/games-arcade/notpacman-1.0.4-r1
@@ -8,5 +8,5 @@ LICENSE=WTFPL-2
 RDEPEND=>=games-engines/love-0.7.2:0.7 media-libs/devil[png]
 SLOT=0
 SRC_URI=http://stabyourself.net/dl.php?file=notpacman-1004/notpacman-linux.zip -> notpacman-1.0.4.zip https://dev.gentoo.org/~hasufell/distfiles/notpacman.png
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=020c89ae37fa4ef945968bff3cc8c7d6
diff --git a/metadata/md5-cache/games-arcade/opensonic-0.1.4-r2 b/metadata/md5-cache/games-arcade/opensonic-0.1.4-r2
index cb3b842663a6..349b4149ce1a 100644
--- a/metadata/md5-cache/games-arcade/opensonic-0.1.4-r2
+++ b/metadata/md5-cache/games-arcade/opensonic-0.1.4-r2
@@ -9,5 +9,5 @@ RDEPEND=media-libs/allegro:0=[X,jpeg,png,vorbis] media-libs/libogg:= media-libs/
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://sourceforge.net/projects/opensnc/files/Open%20Sonic/0.1.4/opensnc-src-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f9dff812192bbacfa1bc7e108098445c
diff --git a/metadata/md5-cache/games-arcade/opentyrian-2.1.20130907-r1 b/metadata/md5-cache/games-arcade/opentyrian-2.1.20130907-r1
index 7cde3a187fe5..bceae46455ec 100644
--- a/metadata/md5-cache/games-arcade/opentyrian-2.1.20130907-r1
+++ b/metadata/md5-cache/games-arcade/opentyrian-2.1.20130907-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl media-libs/sdl-net
 SLOT=0
 SRC_URI=http://darklomax.org/tyrian/tyrian21.zip http://www.camanis.net/opentyrian/releases/opentyrian-2.1.20130907-src.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=182f9b605f723b28fbfdcc86adfd3365
diff --git a/metadata/md5-cache/games-arcade/oshu-2.0.0 b/metadata/md5-cache/games-arcade/oshu-2.0.0
index 0833adcba996..999c224cbd57 100644
--- a/metadata/md5-cache/games-arcade/oshu-2.0.0
+++ b/metadata/md5-cache/games-arcade/oshu-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libsdl2-2.0.5:= media-libs/sdl2-image:= x11-libs/cairo:= x1
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.mg0.fr/oshu/releases/oshu-2.0.0.tar.gz osu-skin? ( https://www.mg0.fr/oshu/skins/osu-v1.tar.gz -> oshu-skin-v1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f9996c79566af24c72f200f54baf9f4a
diff --git a/metadata/md5-cache/games-arcade/pengupop-2.2.5-r1 b/metadata/md5-cache/games-arcade/pengupop-2.2.5-r1
index 7dbb3a2dfe67..711d7c00855f 100644
--- a/metadata/md5-cache/games-arcade/pengupop-2.2.5-r1
+++ b/metadata/md5-cache/games-arcade/pengupop-2.2.5-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[sound,video] sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://gentoo/pengupop-2.2.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8525523646ace39a7f669741739cbc1b
diff --git a/metadata/md5-cache/games-arcade/performous-1.1-r1 b/metadata/md5-cache/games-arcade/performous-1.1-r1
index e68556e72eea..9220bbc059db 100644
--- a/metadata/md5-cache/games-arcade/performous-1.1-r1
+++ b/metadata/md5-cache/games-arcade/performous-1.1-r1
@@ -9,5 +9,5 @@ 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 )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/games-arcade/savagewheels-1.6.1-r1 b/metadata/md5-cache/games-arcade/savagewheels-1.6.1-r1
index 4107403845e2..643c79331aed 100644
--- a/metadata/md5-cache/games-arcade/savagewheels-1.6.1-r1
+++ b/metadata/md5-cache/games-arcade/savagewheels-1.6.1-r1
@@ -10,5 +10,5 @@ RDEPEND=media-libs/libsdl sound? ( !fmod? ( media-libs/sdl-mixer[mod,modplug] )
 REQUIRED_USE=fmod? ( sound )
 SLOT=0
 SRC_URI=https://github.com/petarov/savagewheels/archive/1.6.1.tar.gz -> savagewheels-1.6.1.tar.gz https://github.com/petarov/savagewheels/releases/download/v1.4/savagewheels-gamedata.tar.gz -> savagewheels-gamedata-1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=04b7ac94a2f855415fb11e8575df25d5
diff --git a/metadata/md5-cache/games-arcade/slimevolley-2.4.2-r1 b/metadata/md5-cache/games-arcade/slimevolley-2.4.2-r1
index f53511abdc7e..4cdf3a07e2c4 100644
--- a/metadata/md5-cache/games-arcade/slimevolley-2.4.2-r1
+++ b/metadata/md5-cache/games-arcade/slimevolley-2.4.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/libsdl[X,sound,video] media-libs/sdl-ttf media-libs/sdl-image[png] net? ( media-libs/sdl-net ) virtual/libintl
 SLOT=0
 SRC_URI=http://downloads.tuxfamily.org/slime/v242/slimevolley_2.4.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e8978cba956ad27bf1efab7a54f809a0
diff --git a/metadata/md5-cache/games-arcade/supertux-0.5.1 b/metadata/md5-cache/games-arcade/supertux-0.5.1
index 2bf8bf52dcc8..6b1e19161c8a 100644
--- a/metadata/md5-cache/games-arcade/supertux-0.5.1
+++ b/metadata/md5-cache/games-arcade/supertux-0.5.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0
 RDEPEND=dev-games/physfs dev-libs/boost:= media-libs/glew:= virtual/opengl media-libs/libvorbis media-libs/openal >=media-libs/libsdl2-2.0.1[joystick,video] >=media-libs/sdl2-image-2.0.0[png,jpeg] >=net-misc/curl-7.21.7
 SLOT=0
 SRC_URI=https://github.com/SuperTux/supertux/releases/download/v0.5.1/SuperTux-v0.5.1-Source.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=67691f5894e5bda83431da8914d5660a
diff --git a/metadata/md5-cache/games-arcade/tuxanci-20110429-r1 b/metadata/md5-cache/games-arcade/tuxanci-20110429-r1
index c25ef73d8caa..bbbc98fd4ac4 100644
--- a/metadata/md5-cache/games-arcade/tuxanci-20110429-r1
+++ b/metadata/md5-cache/games-arcade/tuxanci-20110429-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!dedicated? ( >=media-libs/fontconfig-2.7.0 media-libs/libsdl[X,opengl?] media-libs/sdl-ttf[X] >=media-libs/sdl-image-1.2.10[png] sound? ( >=media-libs/sdl-mixer-1.2.11[vorbis] ) ) physfs? ( dev-games/physfs[zip] ) !physfs? ( >=dev-libs/libzip-0.9 )
 SLOT=0
 SRC_URI=http://dev.gentooexperimental.org/~scarabeus/tuxanci-20110429.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b649a1c74ce7105885fbafec38b6fbd7
diff --git a/metadata/md5-cache/games-arcade/tuxanci-99999999 b/metadata/md5-cache/games-arcade/tuxanci-99999999
index 8143e465a013..f27a3d2b733b 100644
--- a/metadata/md5-cache/games-arcade/tuxanci-99999999
+++ b/metadata/md5-cache/games-arcade/tuxanci-99999999
@@ -7,5 +7,5 @@ IUSE=debug dedicated +ipv6 nls opengl physfs +sound
 LICENSE=GPL-2
 RDEPEND=!dedicated? ( >=media-libs/fontconfig-2.7.0 media-libs/libsdl[X,opengl?] media-libs/sdl-ttf[X] >=media-libs/sdl-image-1.2.10[png] sound? ( >=media-libs/sdl-mixer-1.2.11[vorbis] ) ) physfs? ( dev-games/physfs[zip] ) !physfs? ( >=dev-libs/libzip-0.9 )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b649a1c74ce7105885fbafec38b6fbd7
diff --git a/metadata/md5-cache/games-arcade/vor-0.5.7-r1 b/metadata/md5-cache/games-arcade/vor-0.5.7-r1
index bbf7ea624c0f..02838b6acbbf 100644
--- a/metadata/md5-cache/games-arcade/vor-0.5.7-r1
+++ b/metadata/md5-cache/games-arcade/vor-0.5.7-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer[mod]
 SLOT=0
 SRC_URI=https://jasonwoof.com/downloads/vor/vor-0.5.7.tgz
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6e68ae4668a2c75f8b7ab03f8351b05f
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index 737bee633ac7..dc165bc09b4c 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/awale-1.5-r1 b/metadata/md5-cache/games-board/awale-1.5-r1
index 464b089e76e1..841f10070661 100644
--- a/metadata/md5-cache/games-board/awale-1.5-r1
+++ b/metadata/md5-cache/games-board/awale-1.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=tk? ( dev-lang/tcl:0= dev-lang/tk:0= )
 SLOT=0
 SRC_URI=mirror://nongnu/awale/awale-1.5.tar.gz https://dev.gentoo.org/~hasufell/distfiles/awale-1.5-no-autoreconf2.patch.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=572001b3a256236f886a1665d3817371
diff --git a/metadata/md5-cache/games-board/biloba-0.9.3-r1 b/metadata/md5-cache/games-board/biloba-0.9.3-r1
index 5b4def08bc80..3cf6a541de35 100644
--- a/metadata/md5-cache/games-board/biloba-0.9.3-r1
+++ b/metadata/md5-cache/games-board/biloba-0.9.3-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl:0[X,video,sound] media-libs/sdl-image[png] media-libs/sdl-mixer
 SLOT=0
 SRC_URI=mirror://sourceforge/biloba/biloba-0.9.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b212dbd29da518fde5ab3602dba3288d
diff --git a/metadata/md5-cache/games-board/cockatrice-20170505-r1 b/metadata/md5-cache/games-board/cockatrice-20170505-r1
index a8618bf17eab..2da0cc4f51a4 100644
--- a/metadata/md5-cache/games-board/cockatrice-20170505-r1
+++ b/metadata/md5-cache/games-board/cockatrice-20170505-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5 client? ( dev-libs/protobuf:= dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 ) oracle? ( sys-libs/zlib:= ) server? ( dev-libs/protobuf:= dev-qt/qtsql:5 dev-qt/qtwebsockets:5 )
 SLOT=0
 SRC_URI=https://github.com/Cockatrice/Cockatrice/archive/2017-05-05-Release-2.3.17.tar.gz -> cockatrice-20170505.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=930787971afa728f78efc6f307c6188b
diff --git a/metadata/md5-cache/games-board/four-in-a-row-3.22.2 b/metadata/md5-cache/games-board/four-in-a-row-3.22.2
index 11f756cb3554..0decbe268460 100644
--- a/metadata/md5-cache/games-board/four-in-a-row-3.22.2
+++ b/metadata/md5-cache/games-board/four-in-a-row-3.22.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ CC-BY-SA-3.0
 RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.13.2:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/four-in-a-row/3.22/four-in-a-row-3.22.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4becf07d4f3506bd2fe3d0bb550a2821
diff --git a/metadata/md5-cache/games-board/four-in-a-row-3.28.0 b/metadata/md5-cache/games-board/four-in-a-row-3.28.0
index 67a411fa6f56..0184d044ed58 100644
--- a/metadata/md5-cache/games-board/four-in-a-row-3.28.0
+++ b/metadata/md5-cache/games-board/four-in-a-row-3.28.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ CC-BY-SA-3.0
 RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.13.2:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/four-in-a-row/3.28/four-in-a-row-3.28.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4737cd78a796325d81aedf23b22a5ed7
diff --git a/metadata/md5-cache/games-board/freedoko-0.7.16 b/metadata/md5-cache/games-board/freedoko-0.7.16
index ca4bb2f8d69c..584a0368f5ca 100644
--- a/metadata/md5-cache/games-board/freedoko-0.7.16
+++ b/metadata/md5-cache/games-board/freedoko-0.7.16
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=net? ( net-libs/gnet dev-libs/glib:2 ) >=dev-cpp/gtkmm-2.4:2.4
 SLOT=0
 SRC_URI=mirror://sourceforge/free-doko/FreeDoko_0.7.16.src.zip backgrounds? ( mirror://sourceforge/free-doko/backgrounds.zip -> freedoko-backgrounds.zip ) kdecards? ( mirror://sourceforge/free-doko/kdecarddecks.zip ) xskatcards? ( mirror://sourceforge/free-doko/xskat.zip ) pysolcards? ( mirror://sourceforge/free-doko/pysol.zip ) gnomecards? ( mirror://sourceforge/free-doko/gnome-games.zip ) openclipartcards? ( mirror://sourceforge/free-doko/openclipart.zip ) !xskatcards? ( !kdecards? ( !gnomecards? ( !openclipartcards? ( !pysolcards? ( mirror://sourceforge/free-doko/xskat.zip ) ) ) ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=235c3766bd2bcde105ab5580d471b728
diff --git a/metadata/md5-cache/games-board/gambit-1.0.4 b/metadata/md5-cache/games-board/gambit-1.0.4
index ce3f1472b81d..bf50565da5f6 100644
--- a/metadata/md5-cache/games-board/gambit-1.0.4
+++ b/metadata/md5-cache/games-board/gambit-1.0.4
@@ -8,5 +8,5 @@ LICENSE=CC0-1.0
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 media-libs/mesa x11-libs/libX11
 SLOT=0
 SRC_URI=mirror://sourceforge/project/gambitchess/Gambit-1.0.4/Gambit-1.0.4-src.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=19655e7400b6284b6e73cf140ae6a904
diff --git a/metadata/md5-cache/games-board/gmchess-0.29.6-r2 b/metadata/md5-cache/games-board/gmchess-0.29.6-r2
index fb9289ea5915..66030492edbd 100644
--- a/metadata/md5-cache/games-board/gmchess-0.29.6-r2
+++ b/metadata/md5-cache/games-board/gmchess-0.29.6-r2
@@ -9,5 +9,5 @@ RDEPEND=dev-cpp/gtkmm:2.4
 RESTRICT=test
 SLOT=0
 SRC_URI=https://gmchess.googlecode.com/files/gmchess-0.29.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8593c40cf65a40bb0dfc992041d10b7d
diff --git a/metadata/md5-cache/games-board/gnome-chess-3.24.1 b/metadata/md5-cache/games-board/gnome-chess-3.24.1
index 73d9506a9cc8..648f2679cb56 100644
--- a/metadata/md5-cache/games-board/gnome-chess-3.24.1
+++ b/metadata/md5-cache/games-board/gnome-chess-3.24.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.40:2 >=gnome-base/librsvg-2.32:2 >=x11-libs/gtk+-3.19:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-chess/3.24/gnome-chess-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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e1c6b82ce2f60bfdbfbb11dd9f7543d4
diff --git a/metadata/md5-cache/games-board/gnome-chess-3.28.1 b/metadata/md5-cache/games-board/gnome-chess-3.28.1
index 4a205a68bc63..1af18f821dc0 100644
--- a/metadata/md5-cache/games-board/gnome-chess-3.28.1
+++ b/metadata/md5-cache/games-board/gnome-chess-3.28.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.19:3 >=gnome-base/librsvg-2.32.0:2
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-chess/3.28/gnome-chess-3.28.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7a6e60e6d9cbe42ba634637446068bf9
diff --git a/metadata/md5-cache/games-board/gnome-hearts-0.3.1-r2 b/metadata/md5-cache/games-board/gnome-hearts-0.3.1-r2
index b1366150a55f..e9f3b2ebb6e1 100644
--- a/metadata/md5-cache/games-board/gnome-hearts-0.3.1-r2
+++ b/metadata/md5-cache/games-board/gnome-hearts-0.3.1-r2
@@ -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=http://www.jejik.com/files/gnome-hearts/gnome-hearts-0.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f4b794fe15ad8dd693d605ffbab1e651
diff --git a/metadata/md5-cache/games-board/gnome-mahjongg-3.22.0 b/metadata/md5-cache/games-board/gnome-mahjongg-3.22.0
index eed33e01a809..78c5508a4c11 100644
--- a/metadata/md5-cache/games-board/gnome-mahjongg-3.22.0
+++ b/metadata/md5-cache/games-board/gnome-mahjongg-3.22.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.40:2 >=gnome-base/librsvg-2.32:2 >=x11-libs/gtk+-3.13.2:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-mahjongg/3.22/gnome-mahjongg-3.22.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=855d73c74a8df35cf116f26d6000f380
diff --git a/metadata/md5-cache/games-board/gnome-mines-3.20.1 b/metadata/md5-cache/games-board/gnome-mines-3.20.1
index daffe68368ea..38b6a563a68e 100644
--- a/metadata/md5-cache/games-board/gnome-mines-3.20.1
+++ b/metadata/md5-cache/games-board/gnome-mines-3.20.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.40:2 >=gnome-base/librsvg-2.32.0:2 >=x11-libs/gtk+-3.12:3 !<x11-themes/gnome-themes-standard-3.14
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-mines/3.20/gnome-mines-3.20.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9f00da2c085cc27b5e2b89482bc16649
diff --git a/metadata/md5-cache/games-board/gnome-mines-3.24.0 b/metadata/md5-cache/games-board/gnome-mines-3.24.0
index c9b2c5483110..13423bba6b6f 100644
--- a/metadata/md5-cache/games-board/gnome-mines-3.24.0
+++ b/metadata/md5-cache/games-board/gnome-mines-3.24.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.40:2 dev-libs/libgnome-games-support:1= >=gnome-base/librsvg-2.32.0:2 >=x11-libs/gtk+-3.12:3 !<x11-themes/gnome-themes-standard-3.14
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-mines/3.24/gnome-mines-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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f86a2eb894291fb389ed170fcdf7a9d3
diff --git a/metadata/md5-cache/games-board/gnome-mines-3.28.0 b/metadata/md5-cache/games-board/gnome-mines-3.28.0
index 6ae427d12ffa..50379bc2e7f0 100644
--- a/metadata/md5-cache/games-board/gnome-mines-3.28.0
+++ b/metadata/md5-cache/games-board/gnome-mines-3.28.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.40:2 dev-libs/libgee:0.8 >=x11-libs/gtk+-3.12:3 dev-libs/libgnome-games-support:1= >=gnome-base/librsvg-2.32.0:2
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-mines/3.28/gnome-mines-3.28.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a3ff417f72be590c8b5901500363871d
diff --git a/metadata/md5-cache/games-board/gnome-mines-3.30.0 b/metadata/md5-cache/games-board/gnome-mines-3.30.0
index ae7c2a3d5e76..d25d1788fd14 100644
--- a/metadata/md5-cache/games-board/gnome-mines-3.30.0
+++ b/metadata/md5-cache/games-board/gnome-mines-3.30.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.40:2 dev-libs/libgee:0.8 >=x11-libs/gtk+-3.12:3 dev-libs/libgnome-games-support:1= >=gnome-base/librsvg-2.32.0:2
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-mines/3.30/gnome-mines-3.30.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1f1dc277ce7c7d46c1a7c5c85d09f574
diff --git a/metadata/md5-cache/games-board/gnono-1.9.1-r1 b/metadata/md5-cache/games-board/gnono-1.9.1-r1
index e109a51c803c..64b6ef5b5714 100644
--- a/metadata/md5-cache/games-board/gnono-1.9.1-r1
+++ b/metadata/md5-cache/games-board/gnono-1.9.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=gnome-base/libgnomeui virtual/libintl
 SLOT=0
 SRC_URI=mirror://sourceforge/gnono/gnono-1.9.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=22c6541e34f852945d8f7b9098709246
diff --git a/metadata/md5-cache/games-board/gnubg-1.05.000-r1 b/metadata/md5-cache/games-board/gnubg-1.05.000-r1
index ae9e45854be3..2adbfdbdbf40 100644
--- a/metadata/md5-cache/games-board/gnubg-1.05.000-r1
+++ b/metadata/md5-cache/games-board/gnubg-1.05.000-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 dev-libs/gmp:0 dev-libs/libxml2 media-fo
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://gnubg.org/media/sources/gnubg-release-1.05.000-sources.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=87ad67f658e0ddaace30a01f54789628
diff --git a/metadata/md5-cache/games-board/gtkatlantic-0.6.1-r1 b/metadata/md5-cache/games-board/gtkatlantic-0.6.1-r1
index e9ccab92f1ad..4d2aabf91e2e 100644
--- a/metadata/md5-cache/games-board/gtkatlantic-0.6.1-r1
+++ b/metadata/md5-cache/games-board/gtkatlantic-0.6.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 media-libs/libpng:0 x11-libs/gtk+:3
 SLOT=0
 SRC_URI=http://download.tuxfamily.org/gtkatlantic/downloads/v0.6/gtkatlantic-0.6.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1e50ccb691eb2ee4f720d50b6d3ef596
diff --git a/metadata/md5-cache/games-board/iagno-3.22.0 b/metadata/md5-cache/games-board/iagno-3.22.0
index ba3573c0f40b..68c1f18fa5b0 100644
--- a/metadata/md5-cache/games-board/iagno-3.22.0
+++ b/metadata/md5-cache/games-board/iagno-3.22.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.40:2 >=gnome-base/librsvg-2.32.0:2 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.15:3 !<x11-themes/gnome-themes-standard-3.14
 SLOT=0
 SRC_URI=mirror://gnome/sources/iagno/3.22/iagno-3.22.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d39e43cc3c9bae4f8946826ede8de33e
diff --git a/metadata/md5-cache/games-board/iagno-3.30.0 b/metadata/md5-cache/games-board/iagno-3.30.0
index 5d226f4f1e11..48a1b15558f6 100644
--- a/metadata/md5-cache/games-board/iagno-3.30.0
+++ b/metadata/md5-cache/games-board/iagno-3.30.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.40:2 >=gnome-base/librsvg-2.32.0:2 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.15:3 !<x11-themes/gnome-themes-standard-3.14
 SLOT=0
 SRC_URI=mirror://gnome/sources/iagno/3.30/iagno-3.30.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=988055f7c3441bcaebeb878b00d98e8e
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 c491eac1fdbe..ea6b904354a5 100644
--- a/metadata/md5-cache/games-board/knights-2.6.0_pre20180415
+++ b/metadata/md5-cache/games-board/knights-2.6.0_pre20180415
@@ -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/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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	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
 _md5_=99bcd6afb3a63fe5d4ca0691ff7321f4
diff --git a/metadata/md5-cache/games-board/pasang-emas-3.1.0-r1 b/metadata/md5-cache/games-board/pasang-emas-3.1.0-r1
index a24b5ca60fb3..dd004547f439 100644
--- a/metadata/md5-cache/games-board/pasang-emas-3.1.0-r1
+++ b/metadata/md5-cache/games-board/pasang-emas-3.1.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=app-text/gnome-doc-utils >=x11-libs/gtk+-2.18.2:2 virtual/libintl
 SLOT=0
 SRC_URI=mirror://sourceforge/pasang-emas/pasang-emas-3.1.0.tar.bz2 extras? ( mirror://sourceforge/pasang-emas/pasang-emas-themes-1.0.tar.bz2 mirror://sourceforge/pasang-emas/pet-marble.tar.bz2 mirror://sourceforge/pasang-emas/pet-fragrance.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=238d2a3c0a713a55c51eb3100e9676da
diff --git a/metadata/md5-cache/games-board/peg-e-1.2.5 b/metadata/md5-cache/games-board/peg-e-1.2.5
index 899c7f4ab85e..3b8052c40c18 100644
--- a/metadata/md5-cache/games-board/peg-e-1.2.5
+++ b/metadata/md5-cache/games-board/peg-e-1.2.5
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://gottcode.org/peg-e/peg-e-1.2.5-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5f1ac78ea5d50c669daff56e1f4914da
diff --git a/metadata/md5-cache/games-board/pioneers-15.3-r1 b/metadata/md5-cache/games-board/pioneers-15.3-r1
index 50494dd042ac..def513bf2a9b 100644
--- a/metadata/md5-cache/games-board/pioneers-15.3-r1
+++ b/metadata/md5-cache/games-board/pioneers-15.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 CC-BY-SA-4.0
 RDEPEND=>=dev-libs/glib-2.26:2 !dedicated? ( >=x11-libs/gtk+-3.4:3 >=x11-libs/libnotify-0.7.4 help? ( app-text/rarian >=gnome-base/libgnome-2.10 ) ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/pio/pioneers-15.3.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=ec6675169fcbd29976d1f8c7eec21c94
diff --git a/metadata/md5-cache/games-board/pokerth-1.1.2 b/metadata/md5-cache/games-board/pokerth-1.1.2
index f1f56ba2c4e8..58aafb3f0200 100644
--- a/metadata/md5-cache/games-board/pokerth-1.1.2
+++ b/metadata/md5-cache/games-board/pokerth-1.1.2
@@ -9,5 +9,5 @@ LICENSE=AGPL-3 GPL-1 GPL-2 GPL-3 BitstreamVera public-domain
 RDEPEND=dev-db/sqlite:3 dev-libs/boost:0=[threads(+)] dev-libs/libgcrypt:0 dev-libs/protobuf:0= dev-libs/tinyxml[stl] dev-qt/qtcore:5 dev-qt/qtnetwork:5 >=net-libs/libircclient-1.6-r2 >=net-misc/curl-7.16 virtual/gsasl !dedicated? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/libsdl:0 media-libs/sdl-mixer[mod,vorbis] )
 SLOT=0
 SRC_URI=mirror://sourceforge/pokerth/pokerth-1.1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6d7a0c09be0e8ee95e64eb1a27008a8c
diff --git a/metadata/md5-cache/games-board/pychess-0.12.4 b/metadata/md5-cache/games-board/pychess-0.12.4
index 42e1c7467865..a910ff0bc048 100644
--- a/metadata/md5-cache/games-board/pychess-0.12.4
+++ b/metadata/md5-cache/games-board/pychess-0.12.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://pychess.org/download/pychess-0.12.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	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_=97f5ad53d6945a1e92ee1545c7e484ac
diff --git a/metadata/md5-cache/games-board/pysolfc-2.0-r5 b/metadata/md5-cache/games-board/pysolfc-2.0-r5
index 48f4e17f6705..1a31ae5374c2 100644
--- a/metadata/md5-cache/games-board/pysolfc-2.0-r5
+++ b/metadata/md5-cache/games-board/pysolfc-2.0-r5
@@ -10,5 +10,5 @@ RDEPEND=!minimal? ( dev-python/pillow[tk,python_targets_python2_7(-)?,-python_si
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://sourceforge/pysolfc/PySolFC-2.0.tar.bz2 extra-cardsets? ( mirror://sourceforge/pysolfc/PySolFC-Cardsets-2.0.tar.bz2 )
-_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3857d862f38edb21ca782178d864cc55
diff --git a/metadata/md5-cache/games-board/pysolfc-2.2.0 b/metadata/md5-cache/games-board/pysolfc-2.2.0
index e0f4dccd792f..c64d1e647449 100644
--- a/metadata/md5-cache/games-board/pysolfc-2.2.0
+++ b/metadata/md5-cache/games-board/pysolfc-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_5? ( dev-python/random2[python_targets_python3_5]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/shlomif/PySolFC/archive/pysolfc-2.2.0.tar.gz extra-cardsets? ( mirror://sourceforge/pysolfc/archive/pysolfc-2.2.0/PySolFC-Cardsets-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=24a89761b332df48fe9353ece29874c6
diff --git a/metadata/md5-cache/games-board/pysolfc-2.4.0 b/metadata/md5-cache/games-board/pysolfc-2.4.0
index fff203c8e24b..d90ff426cd21 100644
--- a/metadata/md5-cache/games-board/pysolfc-2.4.0
+++ b/metadata/md5-cache/games-board/pysolfc-2.4.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_5? ( dev-python/random2[python_targets_python3_5]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/shlomif/PySolFC/archive/pysolfc-2.4.0.tar.gz extra-cardsets? ( mirror://sourceforge/pysolfc/archive/pysolfc-2.4.0/PySolFC-Cardsets-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=24a89761b332df48fe9353ece29874c6
diff --git a/metadata/md5-cache/games-board/scid-4.6.2-r1 b/metadata/md5-cache/games-board/scid-4.6.2-r1
index db03a970d9d4..1cf1220effb3 100644
--- a/metadata/md5-cache/games-board/scid-4.6.2-r1
+++ b/metadata/md5-cache/games-board/scid-4.6.2-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/tk:0 dev-tcltk/tkimg >=sys-libs/zlib-1.1.3 !games-board/chessdb
 SLOT=0
 SRC_URI=mirror://sourceforge/scid/scid-4.6.2.zip mirror://sourceforge/scid/spelling.zip mirror://sourceforge/scid/ratings.zip mirror://sourceforge/scid/photos.zip mirror://sourceforge/scid/scidlet40k.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=31f14e88b4ad3b95695a043c545a87ff
diff --git a/metadata/md5-cache/games-board/simsu-1.3.6 b/metadata/md5-cache/games-board/simsu-1.3.6
index a21546b10446..c1a38f3fea59 100644
--- a/metadata/md5-cache/games-board/simsu-1.3.6
+++ b/metadata/md5-cache/games-board/simsu-1.3.6
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://gottcode.org/simsu/simsu-1.3.6-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=99df453ee250944a4dd098432adcd310
diff --git a/metadata/md5-cache/games-board/spider-1.2_p4-r2 b/metadata/md5-cache/games-board/spider-1.2_p4-r2
index 818ac79ac8ff..8e682acd7a89 100644
--- a/metadata/md5-cache/games-board/spider-1.2_p4-r2
+++ b/metadata/md5-cache/games-board/spider-1.2_p4-r2
@@ -9,5 +9,5 @@ LICENSE=HPND
 RDEPEND=x11-libs/libXext athena? ( x11-libs/libXaw ) x11-libs/libXmu x11-libs/libXt
 SLOT=0
 SRC_URI=mirror://debian/pool/main/s/spider/spider_1.2.orig.tar.gz mirror://debian/pool/main/s/spider/spider_1.2-4.diff.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4d37dba2fb488e48331c14ebe06105c4
diff --git a/metadata/md5-cache/games-board/tali-3.22.0 b/metadata/md5-cache/games-board/tali-3.22.0
index 4910ee10ce21..f385ba79a599 100644
--- a/metadata/md5-cache/games-board/tali-3.22.0
+++ b/metadata/md5-cache/games-board/tali-3.22.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ FDL-1.1+
 RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32:2 >=x11-libs/gtk+-3.15:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/tali/3.22/tali-3.22.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=556b2b0acf4ef477443c74956801ff24
diff --git a/metadata/md5-cache/games-board/teg-0.11.2 b/metadata/md5-cache/games-board/teg-0.11.2
index 32e50459ea1c..250efa128e0a 100644
--- a/metadata/md5-cache/games-board/teg-0.11.2
+++ b/metadata/md5-cache/games-board/teg-0.11.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 gnome-base/libgnomeui gnome-base/libgnome nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/teg/teg-0.11.2.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=4640e352e245a588242710779819f912
diff --git a/metadata/md5-cache/games-board/tetzle-2.1.3 b/metadata/md5-cache/games-board/tetzle-2.1.3
index d882b9369beb..7a604a1d9e2c 100644
--- a/metadata/md5-cache/games-board/tetzle-2.1.3
+++ b/metadata/md5-cache/games-board/tetzle-2.1.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://gottcode.org/tetzle/tetzle-2.1.3-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=99077d3c51bfa18527e8901460c7028a
diff --git a/metadata/md5-cache/games-board/xboard-4.8.0-r1 b/metadata/md5-cache/games-board/xboard-4.8.0-r1
index 373a7a57c1e3..d18c956c244a 100644
--- a/metadata/md5-cache/games-board/xboard-4.8.0-r1
+++ b/metadata/md5-cache/games-board/xboard-4.8.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 gnome-base/librsvg:2 virtual/libintl x11-libs/cairo[X] x
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/xboard/xboard-4.8.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8c80b6ec76249fd8cf0cd5509d7494c7
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index 2a1693dd91f8..a9ce7be24033 100644
--- a/metadata/md5-cache/games-emulation/Manifest.gz
+++ b/metadata/md5-cache/games-emulation/Manifest.gz
diff --git a/metadata/md5-cache/games-emulation/desmume-0.9.11-r1 b/metadata/md5-cache/games-emulation/desmume-0.9.11-r1
index 635a90eee859..62c40da7a323 100644
--- a/metadata/md5-cache/games-emulation/desmume-0.9.11-r1
+++ b/metadata/md5-cache/games-emulation/desmume-0.9.11-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/zziplib gnome-base/libglade media-libs/libsdl[joystick,opengl,video] sys-libs/zlib virtual/opengl x11-libs/agg >=x11-libs/gtk+-2.8.0:2 x11-libs/gtkglext
 SLOT=0
 SRC_URI=mirror://sourceforge/desmume/desmume-0.9.11.tar.gz
-_eclasses_=xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=474801794fd8b6412f33f7d35632f164
diff --git a/metadata/md5-cache/games-emulation/dolphin-5.0 b/metadata/md5-cache/games-emulation/dolphin-5.0
index d12e4423e471..67685c716c69 100644
--- a/metadata/md5-cache/games-emulation/dolphin-5.0
+++ b/metadata/md5-cache/games-emulation/dolphin-5.0
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libsfml-2.1 >net-libs/enet-1.3.7 >=net-libs/mbedtls-2.1.1:=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/dolphin-emu/dolphin/archive/5.0.zip -> dolphin-5.0.zip
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=53700fefc0602964510d85b69aff4aa2
diff --git a/metadata/md5-cache/games-emulation/dolphin-9999 b/metadata/md5-cache/games-emulation/dolphin-9999
index bca768f0afb5..84bc2e02b349 100644
--- a/metadata/md5-cache/games-emulation/dolphin-9999
+++ b/metadata/md5-cache/games-emulation/dolphin-9999
@@ -7,5 +7,5 @@ IUSE=alsa bluetooth discord-presence doc egl +evdev ffmpeg libav log lto profile
 LICENSE=GPL-2
 RDEPEND=dev-libs/hidapi:0= dev-libs/lzo:2= dev-libs/pugixml:0= media-libs/libpng:0= media-libs/libsfml net-libs/enet:1.3 net-libs/mbedtls net-misc/curl:0= sys-libs/readline:0= sys-libs/zlib:0= x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) egl? ( media-libs/mesa[egl] ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) systemd? ( sys-apps/systemd:0= ) upnp? ( net-libs/miniupnpc )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e295e455e0877919b32fc9f3d870cd1a
diff --git a/metadata/md5-cache/games-emulation/fakenes-0.5.8-r3 b/metadata/md5-cache/games-emulation/fakenes-0.5.8-r3
index 7c7cb585cd45..1f1aaec5f95e 100644
--- a/metadata/md5-cache/games-emulation/fakenes-0.5.8-r3
+++ b/metadata/md5-cache/games-emulation/fakenes-0.5.8-r3
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=>=media-libs/allegro-4.4.1.1:0[opengl?] dev-games/hawknl openal? ( media-libs/openal media-libs/freealut ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://sourceforge/fakenes/fakenes-0.5.8.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ee280ad40161769129cbcfc903833ee4
diff --git a/metadata/md5-cache/games-emulation/hatari-2.1.0-r1 b/metadata/md5-cache/games-emulation/hatari-2.1.0-r1
index 02f10413abd0..74bc03560dc2 100644
--- a/metadata/md5-cache/games-emulation/hatari-2.1.0-r1
+++ b/metadata/md5-cache/games-emulation/hatari-2.1.0-r1
@@ -11,5 +11,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=http://download.tuxfamily.org/hatari/2.1.0/hatari-2.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b2338c570fad2bfc77f958a76ef0e7d3
diff --git a/metadata/md5-cache/games-emulation/higan-106_p1-r1 b/metadata/md5-cache/games-emulation/higan-106_p1-r1
index 99f4a5fa5b7d..8498f238c0a3 100644
--- a/metadata/md5-cache/games-emulation/higan-106_p1-r1
+++ b/metadata/md5-cache/games-emulation/higan-106_p1-r1
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext icarus? ( x11-libs/gtks
 REQUIRED_USE=|| ( ao openal alsa pulseaudio oss ) || ( xv opengl sdl )
 SLOT=0
 SRC_URI=https://gitlab.com/higan/higan/repository/41efdba45afa770db99bc7484a8ad340ccc597d2/archive.tar.bz2 -> higan-106_p1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6fd4046fafb71066b854173d55c66490
diff --git a/metadata/md5-cache/games-emulation/m64py-0.2.4 b/metadata/md5-cache/games-emulation/m64py-0.2.4
index 3bf74afe4a22..dbef3381b8e9 100644
--- a/metadata/md5-cache/games-emulation/m64py-0.2.4
+++ b/metadata/md5-cache/games-emulation/m64py-0.2.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/PyQt5[gui,opengl,widgets,python_targets_python3_4(-)?,python_
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/m64py/m64py-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b1a697928c0e47dda3c429abbbc7e401
diff --git a/metadata/md5-cache/games-emulation/mednaffe-0.8.7 b/metadata/md5-cache/games-emulation/mednaffe-0.8.7
index bc81866331ff..59feb11e1f3e 100644
--- a/metadata/md5-cache/games-emulation/mednaffe-0.8.7
+++ b/metadata/md5-cache/games-emulation/mednaffe-0.8.7
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.32:2 games-emulation/mednafen[debugger] >=x11-libs/gtk+-3.4:3
 SLOT=0
 SRC_URI=https://github.com/AmatCoder/mednaffe/releases/download/0.8.7/mednaffe-0.8.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=57f1b30478405fc7c884bc06439565f9
diff --git a/metadata/md5-cache/games-emulation/mgba-0.6.1 b/metadata/md5-cache/games-emulation/mgba-0.6.1
index ea7a35eefe34..8a81a8cac51f 100644
--- a/metadata/md5-cache/games-emulation/mgba-0.6.1
+++ b/metadata/md5-cache/games-emulation/mgba-0.6.1
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 media-libs/libpng:0= sys-libs/zlib[minizip] ffmpeg? ( vi
 REQUIRED_USE=|| ( qt5 sdl ) qt5? ( opengl )
 SLOT=0
 SRC_URI=https://github.com/mgba-emu/mgba/archive/0.6.1.tar.gz -> mgba-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bb51b11aad2a0c3ee662457844b6e596
diff --git a/metadata/md5-cache/games-emulation/mgba-0.6.2 b/metadata/md5-cache/games-emulation/mgba-0.6.2
index e62e5c0dc9f9..427f51a33c48 100644
--- a/metadata/md5-cache/games-emulation/mgba-0.6.2
+++ b/metadata/md5-cache/games-emulation/mgba-0.6.2
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 media-libs/libpng:0= sys-libs/zlib[minizip] ffmpeg? ( vi
 REQUIRED_USE=|| ( qt5 sdl ) qt5? ( opengl )
 SLOT=0
 SRC_URI=https://github.com/mgba-emu/mgba/archive/0.6.2.tar.gz -> mgba-0.6.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=aee0ccda218d041500929ee673c699f9
diff --git a/metadata/md5-cache/games-emulation/mgba-0.6.3 b/metadata/md5-cache/games-emulation/mgba-0.6.3
index 1789685a278e..6d469f1fd86e 100644
--- a/metadata/md5-cache/games-emulation/mgba-0.6.3
+++ b/metadata/md5-cache/games-emulation/mgba-0.6.3
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 media-libs/libpng:0= sys-libs/zlib[minizip] ffmpeg? ( li
 REQUIRED_USE=|| ( qt5 sdl ) qt5? ( opengl )
 SLOT=0
 SRC_URI=https://github.com/mgba-emu/mgba/archive/0.6.3.tar.gz -> mgba-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2ecf6303963c42b6d16a59507db045fd
diff --git a/metadata/md5-cache/games-emulation/mupen64plus-ui-console-2.5-r1 b/metadata/md5-cache/games-emulation/mupen64plus-ui-console-2.5-r1
index b69a37145b38..30a0ddc64fe8 100644
--- a/metadata/md5-cache/games-emulation/mupen64plus-ui-console-2.5-r1
+++ b/metadata/md5-cache/games-emulation/mupen64plus-ui-console-2.5-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=games-emulation/mupen64plus-core-2.0-r1:0= media-libs/libsdl2:0= !<games-emulation/mupen64plus-2.0
 SLOT=0
 SRC_URI=https://github.com/mupen64plus/mupen64plus-ui-console/releases/download/2.5/mupen64plus-ui-console-src-2.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ab30292f029625c7da94c297694edf70
diff --git a/metadata/md5-cache/games-emulation/nestopia-1.47_p20170105 b/metadata/md5-cache/games-emulation/nestopia-1.47_p20170105
index 3c1a3ed6fc6a..5f76dfc92ac6 100644
--- a/metadata/md5-cache/games-emulation/nestopia-1.47_p20170105
+++ b/metadata/md5-cache/games-emulation/nestopia-1.47_p20170105
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=app-arch/libarchive:= media-libs/libao media-libs/libepoxy media-libs/libsdl2[sound,joystick,video] sys-libs/zlib gui? ( x11-libs/gtk+:3 )
 SLOT=0
 SRC_URI=https://github.com/rdanbrook/nestopia/archive/d7fae2aff1a93eac997d2b480652a1d068a2b6cf.tar.gz -> nestopia-1.47_p20170105.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8aca9eda0fdf2b88359f654cc66861b4
diff --git a/metadata/md5-cache/games-emulation/nestopia-9999 b/metadata/md5-cache/games-emulation/nestopia-9999
index 090a5c8e4250..40e21f677385 100644
--- a/metadata/md5-cache/games-emulation/nestopia-9999
+++ b/metadata/md5-cache/games-emulation/nestopia-9999
@@ -7,5 +7,5 @@ IUSE=doc gui
 LICENSE=GPL-2+
 RDEPEND=app-arch/libarchive:= media-libs/libao media-libs/libepoxy media-libs/libsdl2[sound,joystick,video] sys-libs/zlib gui? ( x11-libs/gtk+:3 )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8aca9eda0fdf2b88359f654cc66861b4
diff --git a/metadata/md5-cache/games-emulation/pcsx2-1.4.0 b/metadata/md5-cache/games-emulation/pcsx2-1.4.0
index 70a2c0186b18..f90434756e75 100644
--- a/metadata/md5-cache/games-emulation/pcsx2-1.4.0
+++ b/metadata/md5-cache/games-emulation/pcsx2-1.4.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=app-arch/bzip2[abi_x86_32(-)] app-arch/xz-utils[abi_x86_32(-)] dev-libs/libaio[abi_x86_32(-)] media-libs/alsa-lib[abi_x86_32(-)] media-libs/libpng:=[abi_x86_32(-)] media-libs/libsdl[abi_x86_32(-),joystick,sound] media-libs/libsoundtouch[abi_x86_32(-)] media-libs/portaudio[abi_x86_32(-)] >=sys-libs/zlib-1.2.4[abi_x86_32(-)] virtual/jpeg:62[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/gtk+:2[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/wxGTK:3.0[abi_x86_32(-),X]
 SLOT=0
 SRC_URI=https://github.com/PCSX2/pcsx2/archive/v1.4.0.tar.gz -> pcsx2-1.4.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c5df337d2205f67ce6b9c31f80c61768
diff --git a/metadata/md5-cache/games-emulation/pcsx2-9999 b/metadata/md5-cache/games-emulation/pcsx2-9999
index 5d8e0b15058d..67ad7c7dded5 100644
--- a/metadata/md5-cache/games-emulation/pcsx2-9999
+++ b/metadata/md5-cache/games-emulation/pcsx2-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://www.pcsx2.net
 LICENSE=GPL-3
 RDEPEND=app-arch/bzip2[abi_x86_32(-)] app-arch/xz-utils[abi_x86_32(-)] dev-libs/libaio[abi_x86_32(-)] media-libs/alsa-lib[abi_x86_32(-)] media-libs/libpng:=[abi_x86_32(-)] media-libs/libsdl2[abi_x86_32(-),haptic,joystick,sound] media-libs/libsoundtouch[abi_x86_32(-)] media-libs/portaudio[abi_x86_32(-)] >=sys-libs/zlib-1.2.4[abi_x86_32(-)] virtual/jpeg:62[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/gtk+:2[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/wxGTK:3.0[abi_x86_32(-),-sdl,X]
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7911707de31ef9fd54d1df2327229e79
diff --git a/metadata/md5-cache/games-emulation/ppsspp-1.5.4-r2 b/metadata/md5-cache/games-emulation/ppsspp-1.5.4-r2
index b684814d9e3b..2986d54d2b9a 100644
--- a/metadata/md5-cache/games-emulation/ppsspp-1.5.4-r2
+++ b/metadata/md5-cache/games-emulation/ppsspp-1.5.4-r2
@@ -10,5 +10,5 @@ RDEPEND=app-arch/snappy:= dev-libs/libzip:= media-libs/glew:= sys-libs/zlib:= vi
 REQUIRED_USE=!qt5? ( sdl )
 SLOT=0
 SRC_URI=https://github.com/hrydgard/ppsspp/archive/v1.5.4.tar.gz -> ppsspp-1.5.4.tar.gz !system-ffmpeg? ( https://github.com/hrydgard/ppsspp-ffmpeg/archive/a2e98d7ba4c7c5cac08608732c3058cb46e3e0ef.tar.gz -> ppsspp-1.5.4-ffmpeg.tar.gz ) https://github.com/hrydgard/ppsspp-lang/archive/1e3e4a0ba0ca8c0a092e027dfb7c1c4778366db5.tar.gz -> ppsspp-1.5.4-assets_lang.tar.gz https://github.com/hrydgard/pspautotests/archive/d02ba7407050f445edf9e908374ad4bf3b2f237b.tar.gz -> ppsspp-1.5.4-pspautotests.tar.gz https://github.com/hrydgard/minidx9/archive/7751cf73f5c06f1be21f5f31c3e2d9a7bacd3a93.tar.gz -> ppsspp-1.5.4-dx9sdk.tar.gz https://github.com/hrydgard/glslang/archive/2edde6665d9a56ead5ea0e55b4e64d9a803e6164.tar.gz -> ppsspp-1.5.4-ext_glslang.tar.gz https://github.com/Kingcom/armips/archive/8b4cadaf62d7de42d374056fc6aafc555f2bc7dc.tar.gz -> ppsspp-1.5.4-ext_armips.tar.gz https://github.com/Kingcom/tinyformat/archive/b7f5a22753c81d834ab5133d655f1fd525280765.tar.gz -> ppsspp-1.5.4-ext_armips_ext_tinyformat.tar.gz https://github.com/KhronosGroup/SPIRV-Cross/archive/90966d50f57608587bafd95b4e345b02b814754a.tar.gz -> ppsspp-1.5.4-ext_SPIRV-Cross.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d296bb5c820c5b0037fe4da6b65be16b
diff --git a/metadata/md5-cache/games-emulation/ppsspp-9999 b/metadata/md5-cache/games-emulation/ppsspp-9999
index 14f10cf64ac3..86af68008412 100644
--- a/metadata/md5-cache/games-emulation/ppsspp-9999
+++ b/metadata/md5-cache/games-emulation/ppsspp-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/snappy:= dev-libs/libzip:= media-libs/glew:= sys-libs/zlib:= virtual/opengl qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 !sdl? ( dev-qt/qtmultimedia:5 ) ) sdl? ( media-libs/libsdl2 ) system-ffmpeg? ( !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) )
 REQUIRED_USE=!qt5? ( sdl )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ffaf1e84cd34a41eeda70fba1c2ba3d6
diff --git a/metadata/md5-cache/games-emulation/snes9x-1.55 b/metadata/md5-cache/games-emulation/snes9x-1.55
index 3d3bb9f5bd2f..1a8727cbd37c 100644
--- a/metadata/md5-cache/games-emulation/snes9x-1.55
+++ b/metadata/md5-cache/games-emulation/snes9x-1.55
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib:=[minizip] x11-libs/libX11 x11-libs/libXext png? ( media-l
 RESTRICT=bindist
 SLOT=0
 SRC_URI=https://github.com/snes9xgit/snes9x/archive/1.55.tar.gz -> snes9x-1.55.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=172f6dfac51cb05cb4cc37872ecfcc22
diff --git a/metadata/md5-cache/games-emulation/snes9x-1.56 b/metadata/md5-cache/games-emulation/snes9x-1.56
index 26d071aff41e..3fceec92bb8d 100644
--- a/metadata/md5-cache/games-emulation/snes9x-1.56
+++ b/metadata/md5-cache/games-emulation/snes9x-1.56
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib:=[minizip] x11-libs/libX11 x11-libs/libXext png? ( media-l
 RESTRICT=bindist
 SLOT=0
 SRC_URI=https://github.com/snes9xgit/snes9x/archive/1.56.tar.gz -> snes9x-1.56.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2bf84a626998bc309b649f57afdfdace
diff --git a/metadata/md5-cache/games-emulation/stella-4.7.2-r1 b/metadata/md5-cache/games-emulation/stella-4.7.2-r1
index bc88cac426c5..05c5e5f4cceb 100644
--- a/metadata/md5-cache/games-emulation/stella-4.7.2-r1
+++ b/metadata/md5-cache/games-emulation/stella-4.7.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ BSD
 RDEPEND=media-libs/libsdl2[joystick?,opengl,video] media-libs/libpng:0= sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://sourceforge/stella/stella-4.7.2-src.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-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=989c694d9b49512c87b8e0e42802933a
diff --git a/metadata/md5-cache/games-emulation/vbam-2.0.2 b/metadata/md5-cache/games-emulation/vbam-2.0.2
index 42bfdb924bb8..a1fbaee39f02 100644
--- a/metadata/md5-cache/games-emulation/vbam-2.0.2
+++ b/metadata/md5-cache/games-emulation/vbam-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libpng-1.4:0= media-libs/libsdl2[joystick] link? ( >=media-
 REQUIRED_USE=openal? ( wxwidgets ) || ( sdl wxwidgets )
 SLOT=0
 SRC_URI=https://github.com/visualboyadvance-m/visualboyadvance-m/archive/v2.0.2.tar.gz -> vbam-2.0.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=be424e3e852885b46f0ad1d08d887fac
diff --git a/metadata/md5-cache/games-emulation/vbam-9999 b/metadata/md5-cache/games-emulation/vbam-9999
index ce34f85fb53b..8acb6c17b341 100644
--- a/metadata/md5-cache/games-emulation/vbam-9999
+++ b/metadata/md5-cache/games-emulation/vbam-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libpng-1.4:0= media-libs/libsdl2[joystick] link? ( >=media-libs/libsfml-2.0:= ) sys-libs/zlib:= virtual/glu virtual/opengl ffmpeg? ( =media-video/ffmpeg-3*:= ) lirc? ( app-misc/lirc ) nls? ( virtual/libintl ) wxwidgets? ( openal? ( media-libs/openal ) x11-libs/wxGTK:3.0-gtk3[X,opengl] )
 REQUIRED_USE=openal? ( wxwidgets ) || ( sdl wxwidgets )
 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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=be424e3e852885b46f0ad1d08d887fac
diff --git a/metadata/md5-cache/games-emulation/yabause-0.9.15 b/metadata/md5-cache/games-emulation/yabause-0.9.15
index 9951ecade7f9..35edb4d82372 100644
--- a/metadata/md5-cache/games-emulation/yabause-0.9.15
+++ b/metadata/md5-cache/games-emulation/yabause-0.9.15
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib:= x11-libs/libXrandr x11-libs/libX11 openal? ( media-libs/openal ) opengl? ( media-libs/freeglut virtual/glu virtual/opengl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) !qt5? ( dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/gtkglext ) sdl? ( media-libs/libsdl2[opengl?,video] )
 SLOT=0
 SRC_URI=https://download.tuxfamily.org/yabause/releases/0.9.15/yabause-0.9.15.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e7daaf9eae4dc357be5afa357d713dfb
diff --git a/metadata/md5-cache/games-engines/Manifest.gz b/metadata/md5-cache/games-engines/Manifest.gz
index 8afb79e6d85e..09d61a92f9c4 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/gargoyle-2011.1-r1 b/metadata/md5-cache/games-engines/gargoyle-2011.1-r1
index 5c956b590ed7..5a3946e14fd1 100644
--- a/metadata/md5-cache/games-engines/gargoyle-2011.1-r1
+++ b/metadata/md5-cache/games-engines/gargoyle-2011.1-r1
@@ -8,5 +8,5 @@ LICENSE=BSD GPL-2 MIT Hugo Glulxe
 RDEPEND=media-fonts/libertine media-fonts/liberation-fonts media-libs/freetype:2 media-libs/libpng:0 media-libs/sdl-mixer media-libs/sdl-sound[modplug,mp3,vorbis] sys-libs/zlib virtual/jpeg:0 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=https://garglk.googlecode.com/files/gargoyle-2011.1-sources.zip
-_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9fb8d1d3fb28ec3c71e12d0a0f95c1f4
diff --git a/metadata/md5-cache/games-engines/gemrb-0.8.3-r1 b/metadata/md5-cache/games-engines/gemrb-0.8.3-r1
index f82f42658359..b9a754c4fec8 100644
--- a/metadata/md5-cache/games-engines/gemrb-0.8.3-r1
+++ b/metadata/md5-cache/games-engines/gemrb-0.8.3-r1
@@ -10,5 +10,5 @@ RDEPEND=media-libs/freetype media-libs/libpng:0= >=media-libs/libsdl-1.2[video]
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://sourceforge/gemrb/gemrb-0.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ec08f2856962681f8bfb6088ff2ae3b7
diff --git a/metadata/md5-cache/games-engines/love-0.10.2 b/metadata/md5-cache/games-engines/love-0.10.2
index 12f312b234f5..f8f966f8a831 100644
--- a/metadata/md5-cache/games-engines/love-0.10.2
+++ b/metadata/md5-cache/games-engines/love-0.10.2
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=sys-libs/zlib dev-games/physfs !luajit? ( dev-lang/lua:0[deprecated] ) luajit? ( dev-lang/luajit:2 ) media-libs/freetype media-libs/libmodplug media-libs/libsdl2[joystick,opengl] media-libs/libogg media-libs/libtheora media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl
 SLOT=0.10
 SRC_URI=https://www.bitbucket.org/rude/love/downloads/love-0.10.2-linux-src.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4c523044ddef69f5875a9baf35c722e9
diff --git a/metadata/md5-cache/games-engines/love-11.1 b/metadata/md5-cache/games-engines/love-11.1
index cc9be4400ea5..5d9ff5ca0b03 100644
--- a/metadata/md5-cache/games-engines/love-11.1
+++ b/metadata/md5-cache/games-engines/love-11.1
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=sys-libs/zlib !luajit? ( dev-lang/lua:0[deprecated] ) luajit? ( dev-lang/luajit:2 ) media-libs/freetype media-libs/libmodplug media-libs/libsdl2[joystick,opengl] media-libs/libogg media-libs/libtheora media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl
 SLOT=0
 SRC_URI=https://www.bitbucket.org/rude/love/downloads/love-11.1-linux-src.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=25ca4db7e5187ddc019cb81a2610ad90
diff --git a/metadata/md5-cache/games-engines/love-9999 b/metadata/md5-cache/games-engines/love-9999
index 544be18d0391..ddc7db6f6739 100644
--- a/metadata/md5-cache/games-engines/love-9999
+++ b/metadata/md5-cache/games-engines/love-9999
@@ -7,5 +7,5 @@ IUSE=+luajit
 LICENSE=ZLIB
 RDEPEND=sys-libs/zlib !luajit? ( dev-lang/lua:0[deprecated] ) luajit? ( dev-lang/luajit:2 ) media-libs/freetype media-libs/libmodplug media-libs/libsdl2[joystick,opengl] media-libs/libogg media-libs/libtheora media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mercurial	9813bb616cb1bd0c943177ab52204409	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mercurial	9813bb616cb1bd0c943177ab52204409	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f2d49ca668ee679e6d96018cc48d4c0f
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 74e4a11552bb..8e932122bde7 100644
--- a/metadata/md5-cache/games-engines/odamex-0.7.0-r1
+++ b/metadata/md5-cache/games-engines/odamex-0.7.0-r1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/games-engines/openmw-0.43.0-r2 b/metadata/md5-cache/games-engines/openmw-0.43.0-r2
index 1d8d3e4304b7..24e6447c3a67 100644
--- a/metadata/md5-cache/games-engines/openmw-0.43.0-r2
+++ b/metadata/md5-cache/games-engines/openmw-0.43.0-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-3 MIT BitstreamVera ZLIB
 RDEPEND=dev-games/mygui >=dev-games/openscenegraph-3.5.5[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] dev-games/openscenegraph-qt dev-libs/boost:=[threads] dev-libs/tinyxml[stl] media-libs/libsdl2[joystick,opengl,video,X] media-libs/openal media-video/ffmpeg:= >=sci-physics/bullet-2.86 virtual/opengl qt5? ( app-arch/unshield dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 )
 SLOT=0
 SRC_URI=https://github.com/OpenMW/openmw/archive/openmw-0.43.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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8517a3760b438a413caa08f238b08a3f
diff --git a/metadata/md5-cache/games-engines/openmw-0.44.0 b/metadata/md5-cache/games-engines/openmw-0.44.0
index ef5fd0f98cf4..37b04556a04d 100644
--- a/metadata/md5-cache/games-engines/openmw-0.44.0
+++ b/metadata/md5-cache/games-engines/openmw-0.44.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3 MIT BitstreamVera ZLIB
 RDEPEND=dev-games/mygui >=dev-games/openscenegraph-3.5.5[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] dev-games/openscenegraph-qt dev-libs/boost:=[threads] dev-libs/tinyxml[stl] media-libs/libsdl2[joystick,opengl,video,X] media-libs/openal media-video/ffmpeg:= >=sci-physics/bullet-2.86 virtual/opengl qt5? ( app-arch/unshield dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 )
 SLOT=0
 SRC_URI=https://github.com/OpenMW/openmw/archive/openmw-0.44.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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7011b82066880323096c4acf2e8ee0eb
diff --git a/metadata/md5-cache/games-engines/openxcom-1.0.0_p20180317 b/metadata/md5-cache/games-engines/openxcom-1.0.0_p20180317
index 41b8c9da93e7..8fb5cbdc0ac3 100644
--- a/metadata/md5-cache/games-engines/openxcom-1.0.0_p20180317
+++ b/metadata/md5-cache/games-engines/openxcom-1.0.0_p20180317
@@ -9,5 +9,5 @@ LICENSE=GPL-3+ CC-BY-SA-4.0
 RDEPEND=>=dev-cpp/yaml-cpp-0.5.1 media-libs/libsdl[opengl,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-mixer[flac,mikmod,vorbis]
 SLOT=0
 SRC_URI=https://github.com/SupSuper/OpenXcom/archive/ea9ac466221f8b4f8974d2db1c42dc4ad6126564.tar.gz -> openxcom-1.0.0_p20180317.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bde30ff0612181d0215fb2fa07889f03
diff --git a/metadata/md5-cache/games-engines/openxcom-9999 b/metadata/md5-cache/games-engines/openxcom-9999
index ef3ecc695de1..c9d9a8a44570 100644
--- a/metadata/md5-cache/games-engines/openxcom-9999
+++ b/metadata/md5-cache/games-engines/openxcom-9999
@@ -7,5 +7,5 @@ IUSE=doc
 LICENSE=GPL-3+ CC-BY-SA-4.0
 RDEPEND=>=dev-cpp/yaml-cpp-0.5.1 media-libs/libsdl[opengl,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-mixer[flac,mikmod,vorbis]
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=65e70f8f27cc1f8526a18d34176340f4
diff --git a/metadata/md5-cache/games-engines/qtads-2.1.7-r1 b/metadata/md5-cache/games-engines/qtads-2.1.7-r1
index 4f999fb5d22d..f4e61d72f166 100644
--- a/metadata/md5-cache/games-engines/qtads-2.1.7-r1
+++ b/metadata/md5-cache/games-engines/qtads-2.1.7-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=media-libs/libsdl[sound] media-libs/sdl-mixer[midi,vorbis] media-libs/sdl-sound[mp3] dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
 SRC_URI=mirror://sourceforge/qtads/qtads-2.1.7.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d550d8c8570cee5f052fd847c943df3d
diff --git a/metadata/md5-cache/games-engines/renpy-6.99.12.4-r3 b/metadata/md5-cache/games-engines/renpy-6.99.12.4-r3
index 4e0bcd55d261..3469d03a4606 100644
--- a/metadata/md5-cache/games-engines/renpy-6.99.12.4-r3
+++ b/metadata/md5-cache/games-engines/renpy-6.99.12.4-r3
@@ -10,5 +10,5 @@ RDEPEND=>=app-eselect/eselect-renpy-0.7 dev-libs/fribidi ~dev-python/pygame_sdl2
 REQUIRED_USE=examples? ( development ) || ( python_targets_python2_7 )
 SLOT=6.99
 SRC_URI=https://www.renpy.org/dl/6.99.12.4/renpy-6.99.12.4-source.tar.bz2
-_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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e302fd2c4b82ccccc3d82951a6dcff8f
diff --git a/metadata/md5-cache/games-engines/residualvm-0.2.1-r1 b/metadata/md5-cache/games-engines/residualvm-0.2.1-r1
index fc523ebe5170..19e869c6aa7f 100644
--- a/metadata/md5-cache/games-engines/residualvm-0.2.1-r1
+++ b/metadata/md5-cache/games-engines/residualvm-0.2.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=media-libs/alsa-lib media-libs/freetype:2 media-libs/libsdl[X,sound,alsa,joystick,opengl,video] sys-libs/zlib virtual/glu virtual/opengl
 SLOT=0
 SRC_URI=mirror://sourceforge/residualvm/residualvm-0.2.1-sources.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=14700c4881d0a319b29ed4774e2f3975
diff --git a/metadata/md5-cache/games-engines/residualvm-0.3.1 b/metadata/md5-cache/games-engines/residualvm-0.3.1
index 5da766042c42..80e46f0b5279 100644
--- a/metadata/md5-cache/games-engines/residualvm-0.3.1
+++ b/metadata/md5-cache/games-engines/residualvm-0.3.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=media-libs/alsa-lib media-libs/freetype:2 media-libs/glew:0= media-libs/libpng:0= media-libs/libsdl2[X,sound,alsa,joystick,opengl,video] sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl
 SLOT=0
 SRC_URI=http://www.residualvm.org/downloads/release/0.3.1/residualvm-0.3.1-sources.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7a282117187e8952c77b39e761bcc3c9
diff --git a/metadata/md5-cache/games-engines/residualvm-9999 b/metadata/md5-cache/games-engines/residualvm-9999
index b35a760c61ba..528ef6b04a6f 100644
--- a/metadata/md5-cache/games-engines/residualvm-9999
+++ b/metadata/md5-cache/games-engines/residualvm-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.residualvm.org/
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=media-libs/alsa-lib media-libs/freetype:2 media-libs/glew:0= media-libs/libpng:0= media-libs/libsdl2[X,sound,alsa,joystick,opengl,video] sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7a282117187e8952c77b39e761bcc3c9
diff --git a/metadata/md5-cache/games-engines/scummvm-1.9.0 b/metadata/md5-cache/games-engines/scummvm-1.9.0
index 31479c2fcbef..3b8525de7e9e 100644
--- a/metadata/md5-cache/games-engines/scummvm-1.9.0
+++ b/metadata/md5-cache/games-engines/scummvm-1.9.0
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libsdl2-2.0.0[sound,joystick,video] zlib? ( sys-libs/zlib )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://scummvm.org/frs/scummvm/1.9.0/scummvm-1.9.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=549a9e6a77536077a9b16e3758f371ad
diff --git a/metadata/md5-cache/games-engines/scummvm-2.0.0 b/metadata/md5-cache/games-engines/scummvm-2.0.0
index 3d0dbefab9e8..2f760a05f650 100644
--- a/metadata/md5-cache/games-engines/scummvm-2.0.0
+++ b/metadata/md5-cache/games-engines/scummvm-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libsdl2-2.0.0[sound,joystick,video] zlib? ( sys-libs/zlib )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://scummvm.org/frs/scummvm/2.0.0/scummvm-2.0.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=77d778d47f4f99317578b32dc57d9de7
diff --git a/metadata/md5-cache/games-engines/solarus-1.3.1-r1 b/metadata/md5-cache/games-engines/solarus-1.3.1-r1
index eb34afe3b35d..a02575c27441 100644
--- a/metadata/md5-cache/games-engines/solarus-1.3.1-r1
+++ b/metadata/md5-cache/games-engines/solarus-1.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-games/physfs media-libs/libmodplug >=media-libs/libsdl2-2.0.1[X,joystick,video] media-libs/libvorbis media-libs/openal media-libs/sdl2-image[png] >=media-libs/sdl2-ttf-2.0.12 luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 )
 SLOT=0
 SRC_URI=http://www.zelda-solarus.com/downloads/solarus/solarus-1.3.1-src.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4c144d59eb8165e92ca0358f1a69751f
diff --git a/metadata/md5-cache/games-engines/stratagus-2.4.1 b/metadata/md5-cache/games-engines/stratagus-2.4.1
index cb0f03d0629a..da6caad910d0 100644
--- a/metadata/md5-cache/games-engines/stratagus-2.4.1
+++ b/metadata/md5-cache/games-engines/stratagus-2.4.1
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 >=dev-lang/lua-5:0 dev-lua/toluapp media-libs/libpng:0 v
 REQUIRED_USE=theora? ( vorbis )
 SLOT=0
 SRC_URI=https://github.com/Wargus/stratagus/archive/v2.4.1.tar.gz -> stratagus-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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=04773915a035b2a6f8d55bf768c1f129
diff --git a/metadata/md5-cache/games-fps/Manifest.gz b/metadata/md5-cache/games-fps/Manifest.gz
index 44e195dc51f5..f176408afbf8 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/alienarena-20130827-r1 b/metadata/md5-cache/games-fps/alienarena-20130827-r1
index b5482b465373..40d7ed305e12 100644
--- a/metadata/md5-cache/games-fps/alienarena-20130827-r1
+++ b/metadata/md5-cache/games-fps/alienarena-20130827-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 free-noncomm
 RDEPEND=!dedicated? ( virtual/jpeg:0 media-libs/openal media-libs/libvorbis media-libs/freetype:2 virtual/glu virtual/opengl dga? ( x11-libs/libXxf86dga ) vidmode? ( x11-libs/libXxf86vm ) zlib? ( sys-libs/zlib ) net-misc/curl )
 SLOT=0
 SRC_URI=http://icculus.org/alienarena/Files/alienarena-7.66-linux20130827.tar.gz http://red.planetarena.org/files/alienarena-7.66-linux20130827.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9a541ccaf898de2419cd57f5be69609f
diff --git a/metadata/md5-cache/games-fps/avp-20150214-r1 b/metadata/md5-cache/games-fps/avp-20150214-r1
index 683136d1e602..ea7342ad3c69 100644
--- a/metadata/md5-cache/games-fps/avp-20150214-r1
+++ b/metadata/md5-cache/games-fps/avp-20150214-r1
@@ -8,5 +8,5 @@ LICENSE=AvP
 RDEPEND=media-libs/libsdl[video,joystick,opengl] media-libs/openal
 SLOT=0
 SRC_URI=http://www.icculus.org/avp/files/avp-20150214.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=09dc8dca95411e5619676ddf6d92b3bb
diff --git a/metadata/md5-cache/games-fps/doomsday-2.0.3 b/metadata/md5-cache/games-fps/doomsday-2.0.3
index 40959253193a..c00acd468a6f 100644
--- a/metadata/md5-cache/games-fps/doomsday-2.0.3
+++ b/metadata/md5-cache/games-fps/doomsday-2.0.3
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 dev-qt/qtx11extr
 REQUIRED_USE=|| ( python_targets_python2_7 ) demo? ( doom ) freedoom? ( doom )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/deng/Doomsday%20Engine/2.0.3/doomsday-2.0.3.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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a1a09408d6e19f3a06c9fc0c03d11d82
diff --git a/metadata/md5-cache/games-fps/eduke32-20180906.6978 b/metadata/md5-cache/games-fps/eduke32-20180906.6978
index aca7bf32b7d4..e517d4c34610 100644
--- a/metadata/md5-cache/games-fps/eduke32-20180906.6978
+++ b/metadata/md5-cache/games-fps/eduke32-20180906.6978
@@ -10,5 +10,5 @@ RDEPEND=media-libs/libsdl2[joystick,opengl?,sound,video,X] media-libs/sdl2-mixer
 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/20180906-6978/eduke32_src_20180906-6978.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=96a6c249e355a0d9b65b64c8c9d532bd
diff --git a/metadata/md5-cache/games-fps/sauerbraten-2013.02.03 b/metadata/md5-cache/games-fps/sauerbraten-2013.02.03
index fdf017f05879..21ce17340c45 100644
--- a/metadata/md5-cache/games-fps/sauerbraten-2013.02.03
+++ b/metadata/md5-cache/games-fps/sauerbraten-2013.02.03
@@ -9,5 +9,5 @@ LICENSE=ZLIB freedist
 RDEPEND=sys-libs/zlib >=net-libs/enet-1.3.6:1.3 !dedicated? ( media-libs/libsdl[X,opengl] media-libs/sdl-mixer[vorbis] media-libs/sdl-image[png,jpeg] virtual/opengl virtual/glu x11-libs/libX11 ) games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/sauerbraten/sauerbraten/2013_02_03/sauerbraten_2013_02_03_collect_edition_linux.tar.bz2
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=454db34f44c4fc929701ac79abaa4690
diff --git a/metadata/md5-cache/games-fps/turtlearena-0.6.1-r1 b/metadata/md5-cache/games-fps/turtlearena-0.6.1-r1
index d7194f278475..30bdfd2b707d 100644
--- a/metadata/md5-cache/games-fps/turtlearena-0.6.1-r1
+++ b/metadata/md5-cache/games-fps/turtlearena-0.6.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ CC-BY-SA-3.0 mplus-fonts lcc
 RDEPEND=sys-libs/zlib[minizip] !dedicated? ( media-libs/freetype:2 media-libs/libsdl[X,sound,joystick,opengl,video] virtual/jpeg:0 virtual/opengl curl? ( net-misc/curl ) openal? ( media-libs/openal ) theora? ( media-libs/libtheora ) voice? ( media-libs/speex mumble? ( media-sound/mumble ) ) vorbis? ( media-libs/libvorbis ) )
 SLOT=0
 SRC_URI=https://turtlearena.googlecode.com/files/turtlearena-0.6.1-0-src.tar.bz2 https://turtlearena.googlecode.com/files/turtlearena-0.6.1-0.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6eaaba1a269e95c09d546a52adf842b2
diff --git a/metadata/md5-cache/games-fps/urbanterror-4.3.4_p20180627 b/metadata/md5-cache/games-fps/urbanterror-4.3.4_p20180627
index 7f2bd72f3d45..ae64a4d73e8f 100644
--- a/metadata/md5-cache/games-fps/urbanterror-4.3.4_p20180627
+++ b/metadata/md5-cache/games-fps/urbanterror-4.3.4_p20180627
@@ -10,5 +10,5 @@ RDEPEND=client? ( media-libs/libsdl2:=[X,sound,joystick,opengl,video] mumble? (
 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	89bb9f083a2590d9b447fd0b78a96186
+_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-kids/Manifest.gz b/metadata/md5-cache/games-kids/Manifest.gz
index 0da627ab1ad3..0f77fe50a3bc 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/gmult-8.0-r1 b/metadata/md5-cache/games-kids/gmult-8.0-r1
index 193e2f95f0cd..78046278c47e 100644
--- a/metadata/md5-cache/games-kids/gmult-8.0-r1
+++ b/metadata/md5-cache/games-kids/gmult-8.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:3 virtual/libintl
 SLOT=0
 SRC_URI=https://launchpad.net/gmult/trunk/8.0/+download/gmult-8.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=70ea4d905aa8415919fa727c0dae44b9
diff --git a/metadata/md5-cache/games-kids/memonix-1.6-r1 b/metadata/md5-cache/games-kids/memonix-1.6-r1
index b39dce4d8754..03c8ef258255 100644
--- a/metadata/md5-cache/games-kids/memonix-1.6-r1
+++ b/metadata/md5-cache/games-kids/memonix-1.6-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/libsdl:0[sound,opengl,video,X] media-libs/sdl-image[jpeg] media-libs/sdl-mixer[vorbis]
 SLOT=0
 SRC_URI=http://www.viewizard.com/download/memonix_1.6_src.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2c853ed4be13daa5ea431f53519dfe1e
diff --git a/metadata/md5-cache/games-kids/pytraffic-2.5.4-r2 b/metadata/md5-cache/games-kids/pytraffic-2.5.4-r2
index b3b4db0e14d7..b803473d03bd 100644
--- a/metadata/md5-cache/games-kids/pytraffic-2.5.4-r2
+++ b/metadata/md5-cache/games-kids/pytraffic-2.5.4-r2
@@ -10,5 +10,5 @@ RDEPEND=media-libs/libsdl:0[sound] media-libs/sdl-mixer dev-python/pygtk python_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://alpha.uhasselt.be/Research/Algebra/Members/pytraffic/pytraffic-2.5.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=47fe76fc3e6d29bc6e0561491e43db09
diff --git a/metadata/md5-cache/games-kids/tuxmath-2.0.3-r1 b/metadata/md5-cache/games-kids/tuxmath-2.0.3-r1
index d1e48cdd9aa9..6ed28311f944 100644
--- a/metadata/md5-cache/games-kids/tuxmath-2.0.3-r1
+++ b/metadata/md5-cache/games-kids/tuxmath-2.0.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 OFL-1.1
 RDEPEND=dev-games/t4k-common[svg?] dev-libs/libxml2:2 media-libs/libsdl:0[video] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[mod] media-libs/sdl-net media-libs/sdl-pango nls? ( virtual/libintl ) svg? ( gnome-base/librsvg:2 x11-libs/cairo )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/t/tuxmath/tuxmath_2.0.3.orig.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=13d7d159efd4e202f151cc3b1a27560c
diff --git a/metadata/md5-cache/games-misc/Manifest.gz b/metadata/md5-cache/games-misc/Manifest.gz
index 8475b9c52c84..ac89cb389f0f 100644
--- a/metadata/md5-cache/games-misc/Manifest.gz
+++ b/metadata/md5-cache/games-misc/Manifest.gz
diff --git a/metadata/md5-cache/games-misc/OilWar-1.2.1-r2 b/metadata/md5-cache/games-misc/OilWar-1.2.1-r2
index 542fa86665a5..a2abdbee2426 100644
--- a/metadata/md5-cache/games-misc/OilWar-1.2.1-r2
+++ b/metadata/md5-cache/games-misc/OilWar-1.2.1-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[video] media-libs/sdl-image[png] media-libs/sdl-mixer
 SLOT=0
 SRC_URI=mirror://gentoo/OilWar-1.2.1.tar.gz mirror://gentoo/OilWar.png
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5cc81f8c6f1a79819d23f7535dbf4ea5
diff --git a/metadata/md5-cache/games-misc/ballerburg-1.2.0 b/metadata/md5-cache/games-misc/ballerburg-1.2.0
index 485eaacd2751..e4c89142dfdd 100644
--- a/metadata/md5-cache/games-misc/ballerburg-1.2.0
+++ b/metadata/md5-cache/games-misc/ballerburg-1.2.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=media-libs/libsdl
 SLOT=0
 SRC_URI=http://download.tuxfamily.org/baller/ballerburg-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ebf8b24419f7610132b97b06df254a62
diff --git a/metadata/md5-cache/games-misc/doge-3.5.0 b/metadata/md5-cache/games-misc/doge-3.5.0
index 7eb0c5bde0b8..262fd02ff1f6 100644
--- a/metadata/md5-cache/games-misc/doge-3.5.0
+++ b/metadata/md5-cache/games-misc/doge-3.5.0
@@ -10,5 +10,5 @@ RDEPEND=sys-process/procps python_targets_python2_7? ( >=dev-lang/python-2.7.5-r
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/doge/doge-3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e6595106a1e49d1feadb0792492626f2
diff --git a/metadata/md5-cache/games-misc/katawa-shoujo-1.3.1-r1 b/metadata/md5-cache/games-misc/katawa-shoujo-1.3.1-r1
index a8a55f01f501..b6a16eccec89 100644
--- a/metadata/md5-cache/games-misc/katawa-shoujo-1.3.1-r1
+++ b/metadata/md5-cache/games-misc/katawa-shoujo-1.3.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=!system-renpy? ( || ( amd64 x86 ) )
 RESTRICT=!system-renpy? ( strip )
 SLOT=0
 SRC_URI=https://dl.katawa-shoujo.com/gold_1.3.1/%5B4ls%5D_katawa_shoujo_1.3.1-%5Blinux-x86%5D%5B18161880%5D.tar.bz2 -> katawa-shoujo-1.3.1.tar.bz2 https://dev.gentoo.org/~hasufell/distfiles/katawa-shoujo-48.png https://dev.gentoo.org/~hasufell/distfiles/katawa-shoujo-256.png
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9f0a453709668ea5a59728a8597b92dd
diff --git a/metadata/md5-cache/games-misc/little-inferno-20130509 b/metadata/md5-cache/games-misc/little-inferno-20130509
index f6a2b878536a..087836af54e5 100644
--- a/metadata/md5-cache/games-misc/little-inferno-20130509
+++ b/metadata/md5-cache/games-misc/little-inferno-20130509
@@ -10,5 +10,5 @@ RDEPEND=>=net-misc/curl-7.37.0-r1[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)]
 RESTRICT=bindist fetch bundled-libs? ( splitdebug )
 SLOT=0
 SRC_URI=LittleInferno-20130509.sh
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a8c20f1ad3f3b1e373e303234fe70229
diff --git a/metadata/md5-cache/games-mud/Manifest.gz b/metadata/md5-cache/games-mud/Manifest.gz
index 51ab38e52199..ea7dc94d37ad 100644
--- a/metadata/md5-cache/games-mud/Manifest.gz
+++ b/metadata/md5-cache/games-mud/Manifest.gz
diff --git a/metadata/md5-cache/games-mud/gnome-mud-0.11.2-r2 b/metadata/md5-cache/games-mud/gnome-mud-0.11.2-r2
index cb1bf21c8719..0b18ef8a759b 100644
--- a/metadata/md5-cache/games-mud/gnome-mud-0.11.2-r2
+++ b/metadata/md5-cache/games-mud/gnome-mud-0.11.2-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=virtual/libintl dev-libs/libpcre dev-perl/XML-Parser gnome-base/gconf:2 >=gnome-base/libglade-2.0.1:2.0 gstreamer? ( media-libs/gstreamer:1.0 ) net-libs/gnet:2 x11-libs/gtk+:2 >=x11-libs/vte-0.11:0
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-mud/0.11/gnome-mud-0.11.2.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=3983cab052c92705cfe34c9e7fc38230
diff --git a/metadata/md5-cache/games-mud/gnome-mud-9999 b/metadata/md5-cache/games-mud/gnome-mud-9999
index 9846a1dc14fb..5cb2f91aa1c7 100644
--- a/metadata/md5-cache/games-mud/gnome-mud-9999
+++ b/metadata/md5-cache/games-mud/gnome-mud-9999
@@ -7,5 +7,5 @@ IUSE=debug gstreamer
 LICENSE=GPL-2+
 RDEPEND=virtual/libintl >=dev-libs/glib-2.36:2 >=x11-libs/gtk+-2.24.0:2 >=x11-libs/vte-0.11:0 dev-libs/libpcre gnome-base/gconf:2 gstreamer? ( media-libs/gstreamer:1.0 )
 SLOT=0
-_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5b9b1d1563e98fdd5111a88f13804e87
diff --git a/metadata/md5-cache/games-mud/lyntin-4.2-r2 b/metadata/md5-cache/games-mud/lyntin-4.2-r2
index 20270ef1f4e6..180df89d9999 100644
--- a/metadata/md5-cache/games-mud/lyntin-4.2-r2
+++ b/metadata/md5-cache/games-mud/lyntin-4.2-r2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) >=dev-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/lyntin/lyntin-4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1ddffe93159aa7fedf8a7434d3b10985
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index 63d8296beae8..4c25fe48f349 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/atomix-3.22.0 b/metadata/md5-cache/games-puzzle/atomix-3.22.0
index 9949c2d994cb..b20283a0f89a 100644
--- a/metadata/md5-cache/games-puzzle/atomix-3.22.0
+++ b/metadata/md5-cache/games-puzzle/atomix-3.22.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.36:2 >=x11-libs/gdk-pixbuf-2.0.5:2 >=x11-libs/gtk+-3.10:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/atomix/3.22/atomix-3.22.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=47a0b5461ba034f6f3c654b2b7813cfa
diff --git a/metadata/md5-cache/games-puzzle/brainworkshop-5_beta20180712 b/metadata/md5-cache/games-puzzle/brainworkshop-5_beta20180712
index 37dfc6aee255..e4718892fa42 100644
--- a/metadata/md5-cache/games-puzzle/brainworkshop-5_beta20180712
+++ b/metadata/md5-cache/games-puzzle/brainworkshop-5_beta20180712
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/samcv/brainworkshop/archive/c5343cb3d828e8181ffff8249f683fce2fcca6db.tar.gz -> brainworkshop-5_beta20180712.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=20669b43ce307a37fe228cf55dd48430
diff --git a/metadata/md5-cache/games-puzzle/connectagram-1.2.8 b/metadata/md5-cache/games-puzzle/connectagram-1.2.8
index 4dcadeac8ca7..0196ac337f7b 100644
--- a/metadata/md5-cache/games-puzzle/connectagram-1.2.8
+++ b/metadata/md5-cache/games-puzzle/connectagram-1.2.8
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://gottcode.org/connectagram/connectagram-1.2.8-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5814a5b55b19eedfb78c8fad3ab80bd8
diff --git a/metadata/md5-cache/games-puzzle/cutemaze-1.2.3 b/metadata/md5-cache/games-puzzle/cutemaze-1.2.3
index 8948bbee6147..fb0ed787515d 100644
--- a/metadata/md5-cache/games-puzzle/cutemaze-1.2.3
+++ b/metadata/md5-cache/games-puzzle/cutemaze-1.2.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://gottcode.org/cutemaze/cutemaze-1.2.3-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=60442de858295c9357b636a9a65bacb3
diff --git a/metadata/md5-cache/games-puzzle/cuyo-2.1.1-r1 b/metadata/md5-cache/games-puzzle/cuyo-2.1.1-r1
index 3c9036d7da7e..114e0d462e7d 100644
--- a/metadata/md5-cache/games-puzzle/cuyo-2.1.1-r1
+++ b/metadata/md5-cache/games-puzzle/cuyo-2.1.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib media-libs/libsdl[sound,video] media-libs/sdl-mixer music? ( media-libs/sdl-mixer[mod] ) media-libs/sdl-image
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/cuyo/cuyo-2.~-1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9c42543f2c8d1db4c3683c0c17c1a874
diff --git a/metadata/md5-cache/games-puzzle/enigma-1.21-r3 b/metadata/md5-cache/games-puzzle/enigma-1.21-r3
index e360517ca9c2..00719988c8ff 100644
--- a/metadata/md5-cache/games-puzzle/enigma-1.21-r3
+++ b/metadata/md5-cache/games-puzzle/enigma-1.21-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=media-libs/sdl-ttf media-libs/libsdl[video] media-libs/sdl-mixer media-libs/sdl-image[jpeg,png] media-libs/libpng:0= sys-libs/zlib net-misc/curl || ( >=dev-libs/xerces-c-3[icu] >=dev-libs/xerces-c-3[-icu,-iconv] ) net-libs/enet:= nls? ( virtual/libintl ) media-fonts/dejavu x11-misc/xdg-utils
 SLOT=0
 SRC_URI=mirror://sourceforge/enigma-game/enigma-1.21.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7a39fe1a5cc89e9ee6eb309833d4a085
diff --git a/metadata/md5-cache/games-puzzle/five-or-more-3.22.2 b/metadata/md5-cache/games-puzzle/five-or-more-3.22.2
index bd13637cd77d..fd652965449d 100644
--- a/metadata/md5-cache/games-puzzle/five-or-more-3.22.2
+++ b/metadata/md5-cache/games-puzzle/five-or-more-3.22.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.32:2 >=gnome-base/librsvg-2.32:2 >=x11-libs/gtk+-3.12:3 !<x11-themes/gnome-themes-standard-3.14
 SLOT=0
 SRC_URI=mirror://gnome/sources/five-or-more/3.22/five-or-more-3.22.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cdd7788621a56c8e59090c1c031cdfad
diff --git a/metadata/md5-cache/games-puzzle/five-or-more-3.28.0 b/metadata/md5-cache/games-puzzle/five-or-more-3.28.0
index d0f3c53bf7e1..69f323dc3f37 100644
--- a/metadata/md5-cache/games-puzzle/five-or-more-3.28.0
+++ b/metadata/md5-cache/games-puzzle/five-or-more-3.28.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.32:2 >=gnome-base/librsvg-2.32:2 >=x11-libs/gtk+-3.20:3 !<x11-themes/gnome-themes-standard-3.14
 SLOT=0
 SRC_URI=mirror://gnome/sources/five-or-more/3.28/five-or-more-3.28.0.tar.xz
-_eclasses_=desktop	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2ccefeb493a03b0820cab2e8e692bb77
diff --git a/metadata/md5-cache/games-puzzle/gfifteen-1.0.3-r1 b/metadata/md5-cache/games-puzzle/gfifteen-1.0.3-r1
index c83d068f9455..aa70214ad349 100644
--- a/metadata/md5-cache/games-puzzle/gfifteen-1.0.3-r1
+++ b/metadata/md5-cache/games-puzzle/gfifteen-1.0.3-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://frigidcode.com/code/gfifteen/gfifteen-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d6067d752571b1e31c60ea9d134b142a
diff --git a/metadata/md5-cache/games-puzzle/glightoff-1.0.0-r1 b/metadata/md5-cache/games-puzzle/glightoff-1.0.0-r1
index 57c1b3133e78..e7ee31633308 100644
--- a/metadata/md5-cache/games-puzzle/glightoff-1.0.0-r1
+++ b/metadata/md5-cache/games-puzzle/glightoff-1.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=gnome-base/librsvg media-libs/libpng:0= >=x11-libs/gtk+-2.6:2
 SLOT=0
 SRC_URI=mirror://sourceforge/glightoff/glightoff-1.0.0.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=4d0af3a754820db0c014254722d75d19
diff --git a/metadata/md5-cache/games-puzzle/gnome-klotski-3.22.3 b/metadata/md5-cache/games-puzzle/gnome-klotski-3.22.3
index d11d4aa17045..865a5642079d 100644
--- a/metadata/md5-cache/games-puzzle/gnome-klotski-3.22.3
+++ b/metadata/md5-cache/games-puzzle/gnome-klotski-3.22.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ FDL-1.1+
 RDEPEND=>=dev-libs/glib-2.32:2 dev-libs/libgee:0.8= dev-libs/libgnome-games-support:1= >=gnome-base/librsvg-2.32.0:2 >=x11-libs/gtk+-3.19.0:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-klotski/3.22/gnome-klotski-3.22.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ee981b4c03387e3aa0ff064f8ca945d3
diff --git a/metadata/md5-cache/games-puzzle/gnome-sudoku-3.24.0 b/metadata/md5-cache/games-puzzle/gnome-sudoku-3.24.0
index ff48468edbd2..2ff0427b5710 100644
--- a/metadata/md5-cache/games-puzzle/gnome-sudoku-3.24.0
+++ b/metadata/md5-cache/games-puzzle/gnome-sudoku-3.24.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.40:2 dev-libs/libgee:0.8=[introspection] dev-libs/json-glib >=dev-libs/qqwing-1.3.4 x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.19.0:3[introspection] x11-libs/pango[introspection]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-sudoku/3.24/gnome-sudoku-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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=54a5d6afef03c9c1401292e7899a9fed
diff --git a/metadata/md5-cache/games-puzzle/gnome-sudoku-3.26.0 b/metadata/md5-cache/games-puzzle/gnome-sudoku-3.26.0
index c074846a9eb9..fff421aed678 100644
--- a/metadata/md5-cache/games-puzzle/gnome-sudoku-3.26.0
+++ b/metadata/md5-cache/games-puzzle/gnome-sudoku-3.26.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.40:2 dev-libs/libgee:0.8=[introspection] dev-libs/json-glib >=dev-libs/qqwing-1.3.4 x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.19.0:3[introspection] x11-libs/pango[introspection]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-sudoku/3.26/gnome-sudoku-3.26.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=40e1d29dd3886563e30481cb752e1078
diff --git a/metadata/md5-cache/games-puzzle/gnome-taquin-3.22.0 b/metadata/md5-cache/games-puzzle/gnome-taquin-3.22.0
index 4491d7bb9229..8ec2dbd1a281 100644
--- a/metadata/md5-cache/games-puzzle/gnome-taquin-3.22.0
+++ b/metadata/md5-cache/games-puzzle/gnome-taquin-3.22.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ CC-BY-SA-3.0 CC-BY-SA-4.0
 RDEPEND=>=dev-libs/glib-2.40:2 >=gnome-base/librsvg-2.32:2 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.15:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-taquin/3.22/gnome-taquin-3.22.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ef6b5e40791ff5c6984c52b2a7735559
diff --git a/metadata/md5-cache/games-puzzle/gnome-taquin-3.28.0 b/metadata/md5-cache/games-puzzle/gnome-taquin-3.28.0
index d13dcdc36cda..b67436d41fe0 100644
--- a/metadata/md5-cache/games-puzzle/gnome-taquin-3.28.0
+++ b/metadata/md5-cache/games-puzzle/gnome-taquin-3.28.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ CC-BY-SA-3.0 CC-BY-SA-4.0
 RDEPEND=>=dev-libs/glib-2.40:2 >=gnome-base/librsvg-2.32:2 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.15:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-taquin/3.28/gnome-taquin-3.28.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4e33c9357885cfcb2db10cfae159f187
diff --git a/metadata/md5-cache/games-puzzle/gnome-tetravex-3.22.0 b/metadata/md5-cache/games-puzzle/gnome-tetravex-3.22.0
index 17faca97e862..7867598c2525 100644
--- a/metadata/md5-cache/games-puzzle/gnome-tetravex-3.22.0
+++ b/metadata/md5-cache/games-puzzle/gnome-tetravex-3.22.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.40:2 >=x11-libs/gtk+-3.13.4:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-tetravex/3.22/gnome-tetravex-3.22.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0c5898fe6fec94f0afe4e6d56398d966
diff --git a/metadata/md5-cache/games-puzzle/gottet-1.1.6 b/metadata/md5-cache/games-puzzle/gottet-1.1.6
index d902f681a1d6..4f8133b81678 100644
--- a/metadata/md5-cache/games-puzzle/gottet-1.1.6
+++ b/metadata/md5-cache/games-puzzle/gottet-1.1.6
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://gottcode.org/gottet/gottet-1.1.6-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=83edcbde256b9e458cc139d82f2face8
diff --git a/metadata/md5-cache/games-puzzle/gtetrinet-0.7.11-r3 b/metadata/md5-cache/games-puzzle/gtetrinet-0.7.11-r3
index f26385176ae0..319baa91ca62 100644
--- a/metadata/md5-cache/games-puzzle/gtetrinet-0.7.11-r3
+++ b/metadata/md5-cache/games-puzzle/gtetrinet-0.7.11-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 media-libs/libcanberra >=gnome-base/gconf-2 >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtetrinet/0.7/gtetrinet-0.7.11.tar.bz2 mirror://gentoo/gtetrinet-gentoo-theme-0.1.tbz2
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5f776c0f0f85c8184d8ac2313114466d
diff --git a/metadata/md5-cache/games-puzzle/hexalate-1.1.3 b/metadata/md5-cache/games-puzzle/hexalate-1.1.3
index da09d8de2e94..1c1bce327ea5 100644
--- a/metadata/md5-cache/games-puzzle/hexalate-1.1.3
+++ b/metadata/md5-cache/games-puzzle/hexalate-1.1.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://gottcode.org/hexalate/hexalate-1.1.3-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=68bc1a94ac4802ce7ea3804c8bfe1d74
diff --git a/metadata/md5-cache/games-puzzle/hitori-3.22.4 b/metadata/md5-cache/games-puzzle/hitori-3.22.4
index 0201d1a135e5..53e491d987a3 100644
--- a/metadata/md5-cache/games-puzzle/hitori-3.22.4
+++ b/metadata/md5-cache/games-puzzle/hitori-3.22.4
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/cairo-1.4
 SLOT=0
 SRC_URI=mirror://gnome/sources/hitori/3.22/hitori-3.22.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4b7956bbd27b1e675667b2f82f0ff25c
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 c200d59c494c..c742c7c768f0 100644
--- a/metadata/md5-cache/games-puzzle/ksokoban-0.5.0_pre20170827
+++ b/metadata/md5-cache/games-puzzle/ksokoban-0.5.0_pre20170827
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	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
 _md5_=a0641f5c81a35102f210b8c1bc6e0492
diff --git a/metadata/md5-cache/games-puzzle/ksokoban-9999 b/metadata/md5-cache/games-puzzle/ksokoban-9999
index 2baf7f63ae44..e3e2cccd287f 100644
--- a/metadata/md5-cache/games-puzzle/ksokoban-9999
+++ b/metadata/md5-cache/games-puzzle/ksokoban-9999
@@ -7,5 +7,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0cad6e6b2cf80cfe9e8f451bb3b0105c
diff --git a/metadata/md5-cache/games-puzzle/lightsoff-3.24.0 b/metadata/md5-cache/games-puzzle/lightsoff-3.24.0
index 40c8f3a21484..d4e1ae06d35e 100644
--- a/metadata/md5-cache/games-puzzle/lightsoff-3.24.0
+++ b/metadata/md5-cache/games-puzzle/lightsoff-3.24.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.38:2 >=gnome-base/librsvg-2.32:2 >=media-libs/clutter-1.14:1.0 >=media-libs/clutter-gtk-1.5.5:1.0 >=x11-libs/gtk+-3.13.4:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/lightsoff/3.24/lightsoff-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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1ba7110f248914b90b4cf1047b839792
diff --git a/metadata/md5-cache/games-puzzle/lightsoff-3.28.0 b/metadata/md5-cache/games-puzzle/lightsoff-3.28.0
index 3fe3256259e6..125056be6e17 100644
--- a/metadata/md5-cache/games-puzzle/lightsoff-3.28.0
+++ b/metadata/md5-cache/games-puzzle/lightsoff-3.28.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.38.0:2 >=x11-libs/gtk+-3.13.4:3 >=media-libs/clutter-1.14.0:1.0 >=media-libs/clutter-gtk-1.5.5:1.0 >=gnome-base/librsvg-2.32.0:2
 SLOT=0
 SRC_URI=mirror://gnome/sources/lightsoff/3.28/lightsoff-3.28.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=744ba17f6f29f792cc4502f38656eac3
diff --git a/metadata/md5-cache/games-puzzle/meandmyshadow-0.4-r1 b/metadata/md5-cache/games-puzzle/meandmyshadow-0.4-r1
index 080faf23e127..ef7a9c6ddcf6 100644
--- a/metadata/md5-cache/games-puzzle/meandmyshadow-0.4-r1
+++ b/metadata/md5-cache/games-puzzle/meandmyshadow-0.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3 OFL-1.1 CC-BY-SA-2.5
 RDEPEND=app-arch/libarchive dev-libs/openssl:0= media-libs/libsdl[sound,video,X] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf net-misc/curl x11-libs/libX11 opengl? ( virtual/opengl )
 SLOT=0
 SRC_URI=mirror://sourceforge/meandmyshadow/0.4/meandmyshadow-0.4-src.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=48d3316aaf9c363763022effb3a8cf9b
diff --git a/metadata/md5-cache/games-puzzle/neverball-1.6.0-r1 b/metadata/md5-cache/games-puzzle/neverball-1.6.0-r1
index dde92260bf96..ff12ff2ff0d5 100644
--- a/metadata/md5-cache/games-puzzle/neverball-1.6.0-r1
+++ b/metadata/md5-cache/games-puzzle/neverball-1.6.0-r1
@@ -10,5 +10,5 @@ RDEPEND=media-libs/libsdl2[sound,joystick,opengl,video] media-libs/sdl2-ttf medi
 RESTRICT=test
 SLOT=0
 SRC_URI=https://neverball.org/neverball-1.6.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d338753e8733d30968ce143ed601f67b
diff --git a/metadata/md5-cache/games-puzzle/nightsky-20111222 b/metadata/md5-cache/games-puzzle/nightsky-20111222
index c9d404e292d3..6643b5ee90a9 100644
--- a/metadata/md5-cache/games-puzzle/nightsky-20111222
+++ b/metadata/md5-cache/games-puzzle/nightsky-20111222
@@ -10,5 +10,5 @@ RDEPEND=virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXext x11-libs/lib
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=nightskyhd-linux-1324519044.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4a9e34cca2a59985323f7b97aab9407d
diff --git a/metadata/md5-cache/games-puzzle/numptyphysics-0.3.4 b/metadata/md5-cache/games-puzzle/numptyphysics-0.3.4
index 6f72ea8334dc..133bd05ca560 100644
--- a/metadata/md5-cache/games-puzzle/numptyphysics-0.3.4
+++ b/metadata/md5-cache/games-puzzle/numptyphysics-0.3.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/libsdl2[opengl,video] media-libs/sdl2-image[png] media-libs/sdl2-ttf virtual/opengl dev-libs/glib:2
 SLOT=0
 SRC_URI=user-levels? ( https://github.com/thp/numptyphysics/archive/0.3.4.tar.gz -> numptyphysics-0.3.4.tar.gz http://numptyphysics.garage.maemo.org/levels/butelo/butelo.npz http://numptyphysics.garage.maemo.org/levels/catalyst/catalyst.npz http://numptyphysics.garage.maemo.org/levels/christeck/christeck.npz http://numptyphysics.garage.maemo.org/levels/dneary/dneary.npz http://numptyphysics.garage.maemo.org/levels/gnuton/gnuton.npz http://numptyphysics.garage.maemo.org/levels/gudger/gudger.npz http://numptyphysics.garage.maemo.org/levels/guile/guile.npz http://numptyphysics.garage.maemo.org/levels/hurd/hurd.npz http://numptyphysics.garage.maemo.org/levels/ioan/ioan.npz http://numptyphysics.garage.maemo.org/levels/jhoff80/jhoff80.npz http://numptyphysics.garage.maemo.org/levels/leonet/leonet.npz http://numptyphysics.garage.maemo.org/levels/melvin/melvin.npz http://numptyphysics.garage.maemo.org/levels/noodleman/noodleman.npz http://numptyphysics.garage.maemo.org/levels/papky/papky.npz http://numptyphysics.garage.maemo.org/levels/perli/perli.npz http://numptyphysics.garage.maemo.org/levels/qole/qole.npz http://numptyphysics.garage.maemo.org/levels/siminz/siminz.npz http://numptyphysics.garage.maemo.org/levels/szymanowski/szymanowski.npz http://numptyphysics.garage.maemo.org/levels/therealbubba/therealbubba.npz http://numptyphysics.garage.maemo.org/levels/werre/werre.npz http://numptyphysics.garage.maemo.org/levels/zeez/zeez.npz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d364278d0b6ce75bc162967721a932c3
diff --git a/metadata/md5-cache/games-puzzle/numptyphysics-9999 b/metadata/md5-cache/games-puzzle/numptyphysics-9999
index 4e3880dff5c8..3c8ee53f18d5 100644
--- a/metadata/md5-cache/games-puzzle/numptyphysics-9999
+++ b/metadata/md5-cache/games-puzzle/numptyphysics-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/libsdl2[opengl,video] media-libs/sdl2-image[png] media-libs/sdl2-ttf virtual/opengl dev-libs/glib:2
 SLOT=0
 SRC_URI=user-levels? ( http://numptyphysics.garage.maemo.org/levels/butelo/butelo.npz http://numptyphysics.garage.maemo.org/levels/catalyst/catalyst.npz http://numptyphysics.garage.maemo.org/levels/christeck/christeck.npz http://numptyphysics.garage.maemo.org/levels/dneary/dneary.npz http://numptyphysics.garage.maemo.org/levels/gnuton/gnuton.npz http://numptyphysics.garage.maemo.org/levels/gudger/gudger.npz http://numptyphysics.garage.maemo.org/levels/guile/guile.npz http://numptyphysics.garage.maemo.org/levels/hurd/hurd.npz http://numptyphysics.garage.maemo.org/levels/ioan/ioan.npz http://numptyphysics.garage.maemo.org/levels/jhoff80/jhoff80.npz http://numptyphysics.garage.maemo.org/levels/leonet/leonet.npz http://numptyphysics.garage.maemo.org/levels/melvin/melvin.npz http://numptyphysics.garage.maemo.org/levels/noodleman/noodleman.npz http://numptyphysics.garage.maemo.org/levels/papky/papky.npz http://numptyphysics.garage.maemo.org/levels/perli/perli.npz http://numptyphysics.garage.maemo.org/levels/qole/qole.npz http://numptyphysics.garage.maemo.org/levels/siminz/siminz.npz http://numptyphysics.garage.maemo.org/levels/szymanowski/szymanowski.npz http://numptyphysics.garage.maemo.org/levels/therealbubba/therealbubba.npz http://numptyphysics.garage.maemo.org/levels/werre/werre.npz http://numptyphysics.garage.maemo.org/levels/zeez/zeez.npz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7d9b00a506d92eff4bb81ed621a60cd5
diff --git a/metadata/md5-cache/games-puzzle/picpuz-2.5-r1 b/metadata/md5-cache/games-puzzle/picpuz-2.5-r1
index 5bde3106dded..2d4a4613c360 100644
--- a/metadata/md5-cache/games-puzzle/picpuz-2.5-r1
+++ b/metadata/md5-cache/games-puzzle/picpuz-2.5-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:3
 SLOT=0
 SRC_URI=http://kornelix.squarespace.com/storage/downloads/picpuz-2.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3c9e9a90f88b221e752a70f252ba1b0b
diff --git a/metadata/md5-cache/games-puzzle/pingus-0.7.6-r1 b/metadata/md5-cache/games-puzzle/pingus-0.7.6-r1
index ab8609c0278b..4e4de1aac6a6 100644
--- a/metadata/md5-cache/games-puzzle/pingus-0.7.6-r1
+++ b/metadata/md5-cache/games-puzzle/pingus-0.7.6-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/libsdl[joystick,opengl?,video] media-libs/sdl-image[png] media-libs/sdl-mixer music? ( media-libs/sdl-mixer[mod] ) opengl? ( virtual/opengl ) media-libs/libpng:0= dev-libs/boost:=
 SLOT=0
 SRC_URI=https://pingus.googlecode.com/files/pingus-0.7.6.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=89179850ecbbacbeb05ba54e67934123
diff --git a/metadata/md5-cache/games-puzzle/quadrapassel-3.22.0 b/metadata/md5-cache/games-puzzle/quadrapassel-3.22.0
index 8f1ad291fec3..108e9b0f9a21 100644
--- a/metadata/md5-cache/games-puzzle/quadrapassel-3.22.0
+++ b/metadata/md5-cache/games-puzzle/quadrapassel-3.22.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0:2 >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.91.6:1.0 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.12:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/quadrapassel/3.22/quadrapassel-3.22.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f5e0fe5fb53be53799e1a65cfafc50a7
diff --git a/metadata/md5-cache/games-puzzle/sgt-puzzles-20171029 b/metadata/md5-cache/games-puzzle/sgt-puzzles-20171029
index c96b38f1c116..b4891e97e8e5 100644
--- a/metadata/md5-cache/games-puzzle/sgt-puzzles-20171029
+++ b/metadata/md5-cache/games-puzzle/sgt-puzzles-20171029
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!gtk3? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) x11-misc/xdg-utils
 SLOT=0
 SRC_URI=https://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-20171029.69773d8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e602c2fa5ba2bca72e78f24bf3570910
diff --git a/metadata/md5-cache/games-puzzle/sgt-puzzles-99999999 b/metadata/md5-cache/games-puzzle/sgt-puzzles-99999999
index e7eea185d986..211966c6b10c 100644
--- a/metadata/md5-cache/games-puzzle/sgt-puzzles-99999999
+++ b/metadata/md5-cache/games-puzzle/sgt-puzzles-99999999
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=!gtk3? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) x11-misc/xdg-utils
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~np-hardass/distfiles/sgt-puzzles/sgt-puzzles-icons-20160315.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b16b42700f5a383216cd7fa2e1664b30
diff --git a/metadata/md5-cache/games-puzzle/skoosh-2.5.0-r1 b/metadata/md5-cache/games-puzzle/skoosh-2.5.0-r1
index 1d76dfa5b60a..757f4e17321e 100644
--- a/metadata/md5-cache/games-puzzle/skoosh-2.5.0-r1
+++ b/metadata/md5-cache/games-puzzle/skoosh-2.5.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnome-base/gconf-2:2 gnome-base/libgnome-keyring >=gnome-base/libgnomeui-2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=http://homepages.ihug.co.nz/~trmusson/stuff/skoosh-2.5.0.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=0eca8c10e477d8f48d2814bd8db9cc63
diff --git a/metadata/md5-cache/games-puzzle/swell-foop-3.24.0 b/metadata/md5-cache/games-puzzle/swell-foop-3.24.0
index e5a31e6bfce9..88ebadc4e777 100644
--- a/metadata/md5-cache/games-puzzle/swell-foop-3.24.0
+++ b/metadata/md5-cache/games-puzzle/swell-foop-3.24.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ FDL-1.1+
 RDEPEND=>=dev-libs/glib-2.36:2 >=media-libs/clutter-1.14:1.0 >=media-libs/clutter-gtk-1.5:1.0 >=x11-libs/gtk+-3.12:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/swell-foop/3.24/swell-foop-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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5e1ebe3ea028e357f4b37713e8d3ba8d
diff --git a/metadata/md5-cache/games-puzzle/swell-foop-3.26.0 b/metadata/md5-cache/games-puzzle/swell-foop-3.26.0
index e89cb3960034..e995549da232 100644
--- a/metadata/md5-cache/games-puzzle/swell-foop-3.26.0
+++ b/metadata/md5-cache/games-puzzle/swell-foop-3.26.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ FDL-1.1+
 RDEPEND=>=dev-libs/glib-2.36:2 >=media-libs/clutter-1.14:1.0 >=media-libs/clutter-gtk-1.5:1.0 >=x11-libs/gtk+-3.12:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/swell-foop/3.26/swell-foop-3.26.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=419d7a7dabf51f559cbd6695b86f92d6
diff --git a/metadata/md5-cache/games-puzzle/tanglet-1.5.2 b/metadata/md5-cache/games-puzzle/tanglet-1.5.2
index c1d7ce127c1e..aa5c7a4d1f80 100644
--- a/metadata/md5-cache/games-puzzle/tanglet-1.5.2
+++ b/metadata/md5-cache/games-puzzle/tanglet-1.5.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 sys-libs/zlib:=
 SLOT=0
 SRC_URI=https://gottcode.org/tanglet/tanglet-1.5.2-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=90e9164e3bbec5f9a479fb170e3b098f
diff --git a/metadata/md5-cache/games-puzzle/wmpuzzle-0.5.2-r1 b/metadata/md5-cache/games-puzzle/wmpuzzle-0.5.2-r1
index 69e49b946d94..6acc9be504d5 100644
--- a/metadata/md5-cache/games-puzzle/wmpuzzle-0.5.2-r1
+++ b/metadata/md5-cache/games-puzzle/wmpuzzle-0.5.2-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 SLOT=0
 SRC_URI=https://people.debian.org/~godisch/wmpuzzle/wmpuzzle-0.5.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1546ed5cefcd7b1e6c728908cb4138fc
diff --git a/metadata/md5-cache/games-roguelike/Manifest.gz b/metadata/md5-cache/games-roguelike/Manifest.gz
index 6e3b14483431..fe9691be3c0f 100644
--- a/metadata/md5-cache/games-roguelike/Manifest.gz
+++ b/metadata/md5-cache/games-roguelike/Manifest.gz
diff --git a/metadata/md5-cache/games-roguelike/angband-4.0.5-r1 b/metadata/md5-cache/games-roguelike/angband-4.0.5-r1
index 64b1303a9c9f..4f23e1a13c53 100644
--- a/metadata/md5-cache/games-roguelike/angband-4.0.5-r1
+++ b/metadata/md5-cache/games-roguelike/angband-4.0.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=X? ( x11-libs/libX11 ) !ncurses? ( !X? ( !sdl? ( sys-libs/ncurses:0=[unicode] ) ) ) ncurses? ( sys-libs/ncurses:0=[unicode] ) sdl? ( media-libs/libsdl[video,X] media-libs/sdl-image media-libs/sdl-ttf sound? ( media-libs/libsdl[sound] ) media-libs/sdl-mixer[mp3] )
 SLOT=0
 SRC_URI=http://rephial.org/downloads/4.0/angband-4.0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a32000475864f10672e0e2f7c9059e3d
diff --git a/metadata/md5-cache/games-roguelike/crossfire-client-1.71.0-r2 b/metadata/md5-cache/games-roguelike/crossfire-client-1.71.0-r2
index 80e07b1d9a1b..3cd2f5906564 100644
--- a/metadata/md5-cache/games-roguelike/crossfire-client-1.71.0-r2
+++ b/metadata/md5-cache/games-roguelike/crossfire-client-1.71.0-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=lua? ( dev-lang/lua:0= ) media-libs/libpng:0 net-misc/curl opengl? ( virtual/opengl media-libs/freeglut ) sdl? ( media-libs/libsdl[video] media-libs/sdl-image[png] ) sound? ( media-libs/sdl-mixer[vorbis] ) sys-libs/zlib x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://sourceforge/crossfire/crossfire-client-1.71.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=23cf9bc51601674b0e1051665c137425
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.20.1 b/metadata/md5-cache/games-roguelike/stone-soup-0.20.1
index ad2c8573885a..3c9e9e521d93 100644
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.20.1
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.20.1
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 luajit? ( >=dev-lang/luajit-2.0.0 ) sys-libs/zlib !ncurs
 RESTRICT=test
 SLOT=0
 SRC_URI=https://crawl.develz.org/release/0.20/stone_soup-0.20.1.tar.xz https://dev.gentoo.org/~hasufell/distfiles/stone-soup.png https://dev.gentoo.org/~hasufell/distfiles/stone-soup.svg
-_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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1abf47f103e71ac35b9286f1476cc5f7
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.21.1 b/metadata/md5-cache/games-roguelike/stone-soup-0.21.1
index 52dfda24caf1..dd6ab2177beb 100644
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.21.1
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.21.1
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 luajit? ( >=dev-lang/luajit-2.0.0 ) sys-libs/zlib !ncurs
 RESTRICT=test
 SLOT=0
 SRC_URI=https://crawl.develz.org/release/0.21/stone_soup-0.21.1.tar.xz https://dev.gentoo.org/~hasufell/distfiles/stone-soup.png https://dev.gentoo.org/~hasufell/distfiles/stone-soup.svg
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2606a4742a72b766c60dea0d50474c2f
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.22.0 b/metadata/md5-cache/games-roguelike/stone-soup-0.22.0
index b23faf59a92f..fa3881efbc7f 100644
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.22.0
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.22.0
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 luajit? ( >=dev-lang/luajit-2.0.0 ) sys-libs/zlib !ncurs
 RESTRICT=test
 SLOT=0
 SRC_URI=https://crawl.develz.org/release/0.22/stone_soup-0.22.0.tar.xz https://dev.gentoo.org/~hasufell/distfiles/stone-soup.png https://dev.gentoo.org/~hasufell/distfiles/stone-soup.svg
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2606a4742a72b766c60dea0d50474c2f
diff --git a/metadata/md5-cache/games-roguelike/tomenet-4.6.1a b/metadata/md5-cache/games-roguelike/tomenet-4.6.1a
index 4d46f5259dd3..717677bd7295 100644
--- a/metadata/md5-cache/games-roguelike/tomenet-4.6.1a
+++ b/metadata/md5-cache/games-roguelike/tomenet-4.6.1a
@@ -9,5 +9,5 @@ LICENSE=Moria
 RDEPEND=sys-libs/ncurses:0 !dedicated? ( X? ( x11-libs/libX11 ) sound? ( media-libs/libsdl[sound] media-libs/sdl-mixer[vorbis,smpeg,mp3] ) ) games-misc/games-envd
 SLOT=0
 SRC_URI=https://www.tomenet.eu/downloads/tomenet-4.6.1a.tar.bz2
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2f8388de6589771553614df081f22df9
diff --git a/metadata/md5-cache/games-rpg/Manifest.gz b/metadata/md5-cache/games-rpg/Manifest.gz
index f45ea2d17179..a5969361147a 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-libertatis-1.1.2-r1 b/metadata/md5-cache/games-rpg/arx-libertatis-1.1.2-r1
index ff57abafc907..e811a2578c01 100644
--- a/metadata/md5-cache/games-rpg/arx-libertatis-1.1.2-r1
+++ b/metadata/md5-cache/games-rpg/arx-libertatis-1.1.2-r1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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/avadon-1.0.4_p1331768904 b/metadata/md5-cache/games-rpg/avadon-1.0.4_p1331768904
index e1de0df3ca98..197c82ae5d84 100644
--- a/metadata/md5-cache/games-rpg/avadon-1.0.4_p1331768904
+++ b/metadata/md5-cache/games-rpg/avadon-1.0.4_p1331768904
@@ -9,5 +9,5 @@ RDEPEND=media-libs/libsdl[opengl,video] media-libs/openal
 RESTRICT=fetch bindist
 SLOT=0
 SRC_URI=avadon-linux-1331768904-bin.txt
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=44169fc12698c64934c3591e9094a3a3
diff --git a/metadata/md5-cache/games-rpg/bastion-20120620-r1 b/metadata/md5-cache/games-rpg/bastion-20120620-r1
index ec5b17508447..19424e8e881f 100644
--- a/metadata/md5-cache/games-rpg/bastion-20120620-r1
+++ b/metadata/md5-cache/games-rpg/bastion-20120620-r1
@@ -9,5 +9,5 @@ RDEPEND=virtual/opengl media-libs/freealut media-libs/openal media-libs/sdl-gfx
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=Bastion-HIB-2012-06-20.sh
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d4d4d2da63f503b01a3c5b043bedab20
diff --git a/metadata/md5-cache/games-rpg/comi-1 b/metadata/md5-cache/games-rpg/comi-1
index ec75e768cad9..1aeaff5c963f 100644
--- a/metadata/md5-cache/games-rpg/comi-1
+++ b/metadata/md5-cache/games-rpg/comi-1
@@ -11,5 +11,5 @@ RDEPEND=>=games-engines/scummvm-0.4.0
 RESTRICT=bindist
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~chewi/distfiles/comi.jpg
-_eclasses_=cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=880fdf64e1414578c5f0968cc5df5625
diff --git a/metadata/md5-cache/games-rpg/dear-esther-20130608 b/metadata/md5-cache/games-rpg/dear-esther-20130608
index e0774af141ea..b42dbf4ee1bd 100644
--- a/metadata/md5-cache/games-rpg/dear-esther-20130608
+++ b/metadata/md5-cache/games-rpg/dear-esther-20130608
@@ -9,5 +9,5 @@ RDEPEND=>=media-libs/freetype-2.5.0.1[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=dearesther-linux-06082013-bin
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=61d9a15b2b61811a7a8750230eefb714
diff --git a/metadata/md5-cache/games-rpg/dungeon-defenders-20130305 b/metadata/md5-cache/games-rpg/dungeon-defenders-20130305
index 9221aa0c72b7..3dcd84b18902 100644
--- a/metadata/md5-cache/games-rpg/dungeon-defenders-20130305
+++ b/metadata/md5-cache/games-rpg/dungeon-defenders-20130305
@@ -10,5 +10,5 @@ RDEPEND=x11-misc/xdg-utils >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] >=media
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=dundef-linux-03052013.mojo.run
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b08a2396b9c6542b9eb8eab44b3a80db
diff --git a/metadata/md5-cache/games-rpg/eternal-lands-1.9.3-r2 b/metadata/md5-cache/games-rpg/eternal-lands-1.9.3-r2
index 771b9504c4b0..52de9f3a7346 100644
--- a/metadata/md5-cache/games-rpg/eternal-lands-1.9.3-r2
+++ b/metadata/md5-cache/games-rpg/eternal-lands-1.9.3-r2
@@ -9,5 +9,5 @@ LICENSE=eternal_lands
 RDEPEND=dev-libs/libxml2:= media-libs/cal3d:=[-16bit-indices] media-libs/freealut media-libs/libpng:0= media-libs/libsdl:=[X,opengl,video] media-libs/libvorbis:= media-libs/openal:= media-libs/sdl-image:= media-libs/sdl-net:= >=games-rpg/eternal-lands-data-1.9.3 sys-libs/zlib:=[minizip] virtual/glu virtual/opengl x11-libs/libX11:= x11-libs/libXau:= x11-libs/libXdmcp:= x11-libs/libXext:= games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://gentoo/elc_1.9.3-20120213.tar.bz2 https://dev.gentoo.org/~rich0/distfiles/eternal-lands.png
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=35d7d63aa53fcbf45a7c100576a89daa
diff --git a/metadata/md5-cache/games-rpg/freedroidrpg-0.16-r1 b/metadata/md5-cache/games-rpg/freedroidrpg-0.16-r1
index 715bfdbcee26..6748f0ae93b5 100644
--- a/metadata/md5-cache/games-rpg/freedroidrpg-0.16-r1
+++ b/metadata/md5-cache/games-rpg/freedroidrpg-0.16-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=virtual/jpeg:0 media-libs/libpng:0 media-libs/libsdl[opengl?,sound?,video] >=media-libs/sdl-gfx-2.0.21 media-libs/sdl-image[jpeg,png] nls? ( virtual/libintl ) opengl? ( virtual/opengl ) sound? ( media-libs/libogg media-libs/libvorbis media-libs/sdl-mixer[vorbis] ) x11-libs/libX11
 SLOT=0
 SRC_URI=ftp://ftp.osuosl.org/pub/freedroid/freedroidRPG-0.16//freedroidRPG-0.16.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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a75a0f47bdfceed9541bc55c787704a9
diff --git a/metadata/md5-cache/games-rpg/grimrock-20150707 b/metadata/md5-cache/games-rpg/grimrock-20150707
index 55fec883bf86..28eced16022f 100644
--- a/metadata/md5-cache/games-rpg/grimrock-20150707
+++ b/metadata/md5-cache/games-rpg/grimrock-20150707
@@ -9,5 +9,5 @@ RDEPEND=media-libs/freeimage media-libs/freetype:2 media-libs/openal media-libs/
 RESTRICT=fetch bindist splitdebug
 SLOT=0
 SRC_URI=Grimrock-Linux-2015-07-07.sh
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=12024eb42c3c4c92346ceaba63e6ee04
diff --git a/metadata/md5-cache/games-rpg/pcgen-6.04.01-r1 b/metadata/md5-cache/games-rpg/pcgen-6.04.01-r1
index 3b9e855abb13..e8a46dfab5ab 100644
--- a/metadata/md5-cache/games-rpg/pcgen-6.04.01-r1
+++ b/metadata/md5-cache/games-rpg/pcgen-6.04.01-r1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1 OGL-1.0a
 RDEPEND=>=virtual/jre-1.6
 SLOT=0
 SRC_URI=mirror://sourceforge/pcgen/pcgen-6.04.01-full.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fb8ad46c75f6fe3315784346e56ce4b5
diff --git a/metadata/md5-cache/games-rpg/runescape-launcher-2.2.4-r2 b/metadata/md5-cache/games-rpg/runescape-launcher-2.2.4-r2
index 8079f21264cc..91fba1f2d7ae 100644
--- a/metadata/md5-cache/games-rpg/runescape-launcher-2.2.4-r2
+++ b/metadata/md5-cache/games-rpg/runescape-launcher-2.2.4-r2
@@ -10,5 +10,5 @@ RDEPEND=media-libs/libpng:1.2 >=media-libs/libsdl2-2.0.2 media-libs/glew:1.10 >=
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=http://content.runescape.com/downloads/ubuntu/pool/non-free/r/runescape-launcher/runescape-launcher_2.2.4_amd64.deb
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f3653bae47f573ec76a265f1a67ba374
diff --git a/metadata/md5-cache/games-rpg/sumwars-0.5.8-r1 b/metadata/md5-cache/games-rpg/sumwars-0.5.8-r1
index 1697f27885ec..f40b66a3a3a6 100644
--- a/metadata/md5-cache/games-rpg/sumwars-0.5.8-r1
+++ b/metadata/md5-cache/games-rpg/sumwars-0.5.8-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3 CC-BY-SA-3.0
 RDEPEND=>=dev-games/cegui-0.8[ogre] >=dev-games/ogre-1.7.4-r1[freeimage,opengl] dev-games/ois dev-games/physfs >=dev-lang/lua-5.1:0 >=dev-libs/tinyxml-2.6.2-r2 media-libs/freealut media-libs/openal media-libs/libogg media-libs/libvorbis >=net-libs/enet-1.3.0 x11-libs/libX11 x11-libs/libXrandr tools? ( dev-libs/boost )
 SLOT=0
 SRC_URI=mirror://sourceforge/sumwars/sumwars-0.5.8-src.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=02713299c5a36aaf0dd3480e5acfb65a
diff --git a/metadata/md5-cache/games-rpg/to-the-moon-0 b/metadata/md5-cache/games-rpg/to-the-moon-0
index 6de1bf166bcf..7081cfb53d6c 100644
--- a/metadata/md5-cache/games-rpg/to-the-moon-0
+++ b/metadata/md5-cache/games-rpg/to-the-moon-0
@@ -10,5 +10,5 @@ RDEPEND=!bundled-libs? ( dev-libs/libsigc++:2 >=media-libs/libsdl2-2.0.1[X,joyst
 RESTRICT=fetch bindist splitdebug
 SLOT=0
 SRC_URI=ToTheMoon_linux_1389114090.sh
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c7a3717724637ef1e92dee8278c882c9
diff --git a/metadata/md5-cache/games-rpg/wasteland2-1.9.0.13 b/metadata/md5-cache/games-rpg/wasteland2-1.9.0.13
index 904d3be3a62c..673d3087bbc7 100644
--- a/metadata/md5-cache/games-rpg/wasteland2-1.9.0.13
+++ b/metadata/md5-cache/games-rpg/wasteland2-1.9.0.13
@@ -9,5 +9,5 @@ RDEPEND=>=dev-libs/atk-2.12.0-r1[abi_x86_32(-)] >=dev-libs/glib-2.40.0-r1:2[abi_
 RESTRICT=bindist fetch mirror
 SLOT=0
 SRC_URI=gog_wasteland_2_1.9.0.13.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=59d5f4594800a80ee26d0c8a165a76ef
diff --git a/metadata/md5-cache/games-rpg/zsdx-1.9.0-r1 b/metadata/md5-cache/games-rpg/zsdx-1.9.0-r1
index 48237d25e28d..4019a1d63928 100644
--- a/metadata/md5-cache/games-rpg/zsdx-1.9.0-r1
+++ b/metadata/md5-cache/games-rpg/zsdx-1.9.0-r1
@@ -9,5 +9,5 @@ RDEPEND=>=games-engines/solarus-1.3.0 <games-engines/solarus-1.4.0
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://www.zelda-solarus.com/downloads/zsdx/zsdx-1.9.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=2d1b2186d0dfb0437248eb489ef2ee36
diff --git a/metadata/md5-cache/games-rpg/zsxd-1.9.0-r1 b/metadata/md5-cache/games-rpg/zsxd-1.9.0-r1
index c416bdc4ef9c..e24d92037b1f 100644
--- a/metadata/md5-cache/games-rpg/zsxd-1.9.0-r1
+++ b/metadata/md5-cache/games-rpg/zsxd-1.9.0-r1
@@ -9,5 +9,5 @@ RDEPEND=>=games-engines/solarus-1.3.1-r1 <games-engines/solarus-1.4.0
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=http://www.zelda-solarus.com/downloads/zsxd/zsxd-1.9.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=cabde41eadc75aa46f1e664920268d31
diff --git a/metadata/md5-cache/games-simulation/Manifest.gz b/metadata/md5-cache/games-simulation/Manifest.gz
index 24ebe1909e4e..7cbd9ebc6678 100644
--- a/metadata/md5-cache/games-simulation/Manifest.gz
+++ b/metadata/md5-cache/games-simulation/Manifest.gz
diff --git a/metadata/md5-cache/games-simulation/corsix-th-0.62 b/metadata/md5-cache/games-simulation/corsix-th-0.62
index 344da66b0a40..c6aae6ebaa6a 100644
--- a/metadata/md5-cache/games-simulation/corsix-th-0.62
+++ b/metadata/md5-cache/games-simulation/corsix-th-0.62
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/lua-5.1:0 >=dev-lua/luafilesystem-1.5 >=dev-lua/lpeg-0.9 >=dev-lua/luasocket-3.0_rc1-r4 media-libs/libsdl2[opengl,video] sound? ( media-libs/sdl2-mixer[midi?] ) truetype? ( >=media-libs/freetype-2.5.3:2 ) videos? ( !libav? ( >=media-video/ffmpeg-2.2.3:0= ) libav? ( >=media-video/libav-11.1:0= ) )
 SLOT=0
 SRC_URI=https://github.com/CorsixTH/CorsixTH/archive/v0.62.tar.gz -> corsix-th-0.62.tar.gz
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=91256873d18b9439737898b6aa7e890f
diff --git a/metadata/md5-cache/games-simulation/crrcsim-0.9.13 b/metadata/md5-cache/games-simulation/crrcsim-0.9.13
index 4010376b35cb..7e6e36b046d6 100644
--- a/metadata/md5-cache/games-simulation/crrcsim-0.9.13
+++ b/metadata/md5-cache/games-simulation/crrcsim-0.9.13
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[X,sound,joystick,opengl,video] media-libs/plib sci-mathematics/cgal portaudio? ( media-libs/portaudio )
 SLOT=0
 SRC_URI=mirror://sourceforge/crrcsim/crrcsim-0.9.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=81d854cb129648e1cdb00374596f566b
diff --git a/metadata/md5-cache/games-simulation/flightgear-2018.1.1 b/metadata/md5-cache/games-simulation/flightgear-2018.1.1
index c358bb061689..6f58bd7cf849 100644
--- a/metadata/md5-cache/games-simulation/flightgear-2018.1.1
+++ b/metadata/md5-cache/games-simulation/flightgear-2018.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-db/sqlite:3 >=dev-games/openscenegraph-3.2.0[jpeg,png] ~dev-games/simgear-2018.1.1[gdal=] media-libs/openal >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 media-sound/gsm sys-libs/zlib virtual/glu x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) gdal? ( >=sci-libs/gdal-2.0.0:0 ) qt5? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/freetype:2 media-libs/glew:0 media-libs/libpng:0 virtual/opengl qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) ) ~games-simulation/flightgear-data-2018.1.1
 SLOT=0
 SRC_URI=mirror://sourceforge/flightgear/flightgear-2018.1.1.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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_=6e0fd50a2fe96d27c794fc34dadca527
diff --git a/metadata/md5-cache/games-simulation/flightgear-2018.2.1 b/metadata/md5-cache/games-simulation/flightgear-2018.2.1
index e5f0945c2f93..45b7a23178af 100644
--- a/metadata/md5-cache/games-simulation/flightgear-2018.2.1
+++ b/metadata/md5-cache/games-simulation/flightgear-2018.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-db/sqlite:3 >=dev-games/openscenegraph-3.2.0[jpeg,png] ~dev-games/simgear-2018.2.1[gdal=] media-libs/openal >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 media-sound/gsm sys-libs/zlib virtual/glu x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) gdal? ( >=sci-libs/gdal-2.0.0:0 ) qt5? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/freetype:2 media-libs/glew:0 media-libs/libpng:0 virtual/opengl qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) ) ~games-simulation/flightgear-data-2018.2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/flightgear/flightgear-2018.2.1.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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_=7dfb2ebb2fe6cdfcedf805df9067c84b
diff --git a/metadata/md5-cache/games-simulation/flightgear-9999 b/metadata/md5-cache/games-simulation/flightgear-9999
index 2718d35c5177..c118931196e1 100644
--- a/metadata/md5-cache/games-simulation/flightgear-9999
+++ b/metadata/md5-cache/games-simulation/flightgear-9999
@@ -7,5 +7,5 @@ IUSE=dbus debug examples gdal openmp qt5 test +udev +utils vim-syntax
 LICENSE=GPL-2
 RDEPEND=dev-db/sqlite:3 >=dev-games/openscenegraph-3.2.0[jpeg,png] ~dev-games/simgear-9999[gdal=] media-libs/openal >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 media-sound/gsm sys-libs/zlib virtual/glu x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) gdal? ( >=sci-libs/gdal-2.0.0:0 ) qt5? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/freetype:2 media-libs/glew:0 media-libs/libpng:0 virtual/opengl qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) ) ~games-simulation/flightgear-data-9999
 SLOT=0
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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_=05a9d8e1182024bb3594b8b29e122bf8
diff --git a/metadata/md5-cache/games-simulation/openrct2-0.2.0 b/metadata/md5-cache/games-simulation/openrct2-0.2.0
index 0e769ee046aa..0cf2295a64c0 100644
--- a/metadata/md5-cache/games-simulation/openrct2-0.2.0
+++ b/metadata/md5-cache/games-simulation/openrct2-0.2.0
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
 DEPEND=>=dev-libs/jansson-2.5 >=dev-libs/libzip-1.0 media-libs/libpng:0= media-libs/libsdl2 media-libs/speexdsp multiplayer? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) opengl? ( virtual/opengl ) truetype? ( media-libs/sdl2-ttf media-libs/fontconfig ) twitch? ( net-misc/curl[ssl] ) app-arch/unzip test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
 DESCRIPTION=An open source re-implementation of RollerCoaster Tycoon 2
 EAPI=6
-HOMEPAGE=https://openrct2.website/
+HOMEPAGE=https://openrct2.org/
 IUSE=libressl +multiplayer opengl test truetype +twitch
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/jansson-2.5 >=dev-libs/libzip-1.0 media-libs/libpng:0= media-libs/libsdl2 media-libs/speexdsp multiplayer? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) opengl? ( virtual/opengl ) truetype? ( media-libs/sdl2-ttf media-libs/fontconfig ) twitch? ( net-misc/curl[ssl] )
 SLOT=0
 SRC_URI=https://github.com/OpenRCT2/OpenRCT2/archive/v0.2.0.tar.gz -> openrct2-0.2.0.tar.gz https://github.com/OpenRCT2/title-sequences/releases/download/v0.1.2/title-sequence-v0.1.2.zip -> openrct2-title-sequence-v0.1.2.zip https://github.com/OpenRCT2/objects/releases/download/v1.0.2/objects.zip -> openrct2-objects-v1.0.2.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=a3bd06e881faefedd698cf12d63a7782
+_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_=5ca11a19ceebc0b08ced4d1e558aeabf
diff --git a/metadata/md5-cache/games-simulation/openrct2-9999 b/metadata/md5-cache/games-simulation/openrct2-9999
index 0508411174b8..106c620a829a 100644
--- a/metadata/md5-cache/games-simulation/openrct2-9999
+++ b/metadata/md5-cache/games-simulation/openrct2-9999
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
 DEPEND=>=dev-libs/jansson-2.5 >=dev-libs/libzip-1.0 media-libs/libpng:0= media-libs/libsdl2 media-libs/speexdsp multiplayer? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) opengl? ( virtual/opengl ) truetype? ( media-libs/sdl2-ttf media-libs/fontconfig ) twitch? ( net-misc/curl[ssl] ) app-arch/unzip test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=An open source re-implementation of RollerCoaster Tycoon 2
 EAPI=6
-HOMEPAGE=https://openrct2.website/
+HOMEPAGE=https://openrct2.org/
 IUSE=libressl +multiplayer opengl test truetype +twitch
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/jansson-2.5 >=dev-libs/libzip-1.0 media-libs/libpng:0= media-libs/libsdl2 media-libs/speexdsp multiplayer? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) opengl? ( virtual/opengl ) truetype? ( media-libs/sdl2-ttf media-libs/fontconfig ) twitch? ( net-misc/curl[ssl] )
 SLOT=0
 SRC_URI=https://github.com/OpenRCT2/title-sequences/releases/download/v0.1.2/title-sequence-v0.1.2.zip -> openrct2-title-sequence-v0.1.2.zip https://github.com/OpenRCT2/objects/releases/download/v1.0.3/objects.zip -> openrct2-objects-v1.0.3.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=82fbca71811df7b6a5a829f7275ba397
+_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_=c8ff409d5078f31fec51338fbf940da4
diff --git a/metadata/md5-cache/games-simulation/openttd-1.7.1-r1 b/metadata/md5-cache/games-simulation/openttd-1.7.1-r1
index ab60b3fe8dd4..3fc11045ea48 100644
--- a/metadata/md5-cache/games-simulation/openttd-1.7.1-r1
+++ b/metadata/md5-cache/games-simulation/openttd-1.7.1-r1
@@ -11,5 +11,5 @@ RDEPEND=!dedicated? ( media-libs/libsdl[sound,X,video] icu? ( dev-libs/icu-layou
 RESTRICT=test
 SLOT=0
 SRC_URI=http://binaries.openttd.org/releases/1.7.1/openttd-1.7.1-source.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5c9cda55d3206afaf99f1c3b2df26171
diff --git a/metadata/md5-cache/games-simulation/openttd-1.7.2 b/metadata/md5-cache/games-simulation/openttd-1.7.2
index 03d00c0511a6..2a85c80cbf7e 100644
--- a/metadata/md5-cache/games-simulation/openttd-1.7.2
+++ b/metadata/md5-cache/games-simulation/openttd-1.7.2
@@ -11,5 +11,5 @@ RDEPEND=!dedicated? ( media-libs/libsdl[sound,X,video] icu? ( dev-libs/icu-layou
 RESTRICT=test
 SLOT=0
 SRC_URI=http://binaries.openttd.org/releases/1.7.2/openttd-1.7.2-source.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=035f7c35894880d5718b5616f98f2cfb
diff --git a/metadata/md5-cache/games-simulation/openttd-1.8.0 b/metadata/md5-cache/games-simulation/openttd-1.8.0
index 7d9e35825833..e258c7d7331e 100644
--- a/metadata/md5-cache/games-simulation/openttd-1.8.0
+++ b/metadata/md5-cache/games-simulation/openttd-1.8.0
@@ -11,5 +11,5 @@ RDEPEND=!dedicated? ( media-libs/libsdl[sound,X,video] icu? ( dev-libs/icu-layou
 RESTRICT=test
 SLOT=0
 SRC_URI=http://binaries.openttd.org/releases/1.8.0/openttd-1.8.0-source.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-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=747928ce651bdc01d6c4b14a2e66193a
diff --git a/metadata/md5-cache/games-simulation/openttd-9999 b/metadata/md5-cache/games-simulation/openttd-9999
index 4a15140b23cb..b8a49fdacc97 100644
--- a/metadata/md5-cache/games-simulation/openttd-9999
+++ b/metadata/md5-cache/games-simulation/openttd-9999
@@ -9,5 +9,5 @@ PDEPEND=!dedicated? ( openmedia? ( games-misc/openmsx games-misc/opensfx ) aplay
 RDEPEND=!dedicated? ( media-libs/libsdl[sound,X,video] icu? ( dev-libs/icu-layoutex dev-libs/icu-le-hb >=dev-libs/icu-58.1:= ) truetype? ( media-libs/fontconfig media-libs/freetype:2 sys-libs/zlib ) ) lzo? ( dev-libs/lzo:2 ) iconv? ( virtual/libiconv ) png? ( media-libs/libpng:0 ) zlib? ( sys-libs/zlib )
 RESTRICT=test
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5142d8a315aab2f534ce17f961672a95
diff --git a/metadata/md5-cache/games-sports/Manifest.gz b/metadata/md5-cache/games-sports/Manifest.gz
index 1fee4eb2d91d..b73593435c2b 100644
--- a/metadata/md5-cache/games-sports/Manifest.gz
+++ b/metadata/md5-cache/games-sports/Manifest.gz
diff --git a/metadata/md5-cache/games-sports/dustrac-1.11.0-r1 b/metadata/md5-cache/games-sports/dustrac-1.11.0-r1
index 1448a420bacc..c60e07b2acdb 100644
--- a/metadata/md5-cache/games-sports/dustrac-1.11.0-r1
+++ b/metadata/md5-cache/games-sports/dustrac-1.11.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ CC-BY-SA-3.0
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtxml:5 media-libs/libvorbis media-libs/openal virtual/opengl
 SLOT=0
 SRC_URI=mirror://sourceforge/dustrac/dustrac-1.11.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=69034f35ee4ee01729a8cc112fa811bf
diff --git a/metadata/md5-cache/games-sports/trophy-2.0.3-r1 b/metadata/md5-cache/games-sports/trophy-2.0.3-r1
index da1216b3e9c8..aae530e5b043 100644
--- a/metadata/md5-cache/games-sports/trophy-2.0.3-r1
+++ b/metadata/md5-cache/games-sports/trophy-2.0.3-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-games/clanlib:0.8[opengl]
 SLOT=0
 SRC_URI=mirror://sourceforge/trophy/trophy-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=681f23b2bac3ec41c974ba585179f673
diff --git a/metadata/md5-cache/games-strategy/0ad-0.0.22_alpha b/metadata/md5-cache/games-strategy/0ad-0.0.22_alpha
index 01184a31c4d2..bc16edd4cf14 100644
--- a/metadata/md5-cache/games-strategy/0ad-0.0.22_alpha
+++ b/metadata/md5-cache/games-strategy/0ad-0.0.22_alpha
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= dev-libs/icu:= dev-libs/libxml2 dev-libs/nspr ~games-st
 RESTRICT=test
 SLOT=0
 SRC_URI=http://releases.wildfiregames.com/0ad-0.0.22-alpha-unix-build.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c4980d5dc338d15157b618aa8c9dd194
diff --git a/metadata/md5-cache/games-strategy/0ad-0.0.23_alpha b/metadata/md5-cache/games-strategy/0ad-0.0.23_alpha
index 3dcd334d4949..aaabb55d8ff7 100644
--- a/metadata/md5-cache/games-strategy/0ad-0.0.23_alpha
+++ b/metadata/md5-cache/games-strategy/0ad-0.0.23_alpha
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= dev-libs/icu:= dev-libs/libsodium dev-libs/libxml2 dev-
 RESTRICT=test
 SLOT=0
 SRC_URI=http://releases.wildfiregames.com/0ad-0.0.23-alpha-unix-build.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=abc7af71b215f9d7334e907f192555d5
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index c3a222eacc8c..818d509eea15 100644
--- a/metadata/md5-cache/games-strategy/Manifest.gz
+++ b/metadata/md5-cache/games-strategy/Manifest.gz
diff --git a/metadata/md5-cache/games-strategy/colobot-0.1.11 b/metadata/md5-cache/games-strategy/colobot-0.1.11
index 6329d9d36a20..e1cf1ec9bb59 100644
--- a/metadata/md5-cache/games-strategy/colobot-0.1.11
+++ b/metadata/md5-cache/games-strategy/colobot-0.1.11
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-games/physfs dev-libs/boost:= media-libs/glew:0 media-libs/libogg media-libs/libpng:0= media-libs/libsdl2:= media-libs/libsndfile:= media-libs/libvorbis:= media-libs/sdl2-image media-libs/sdl2-ttf media-sound/vorbis-tools sys-devel/gettext openal? ( media-libs/openal ) games-strategy/colobot-data
 SLOT=0
 SRC_URI=https://github.com/colobot/colobot/archive/colobot-gold-0.1.11-alpha.tar.gz -> colobot-0.1.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ad783f8a596504d8870d77a3fc106d91
diff --git a/metadata/md5-cache/games-strategy/colobot-9999 b/metadata/md5-cache/games-strategy/colobot-9999
index 4b3c1880c80e..a1cd00ca3731 100644
--- a/metadata/md5-cache/games-strategy/colobot-9999
+++ b/metadata/md5-cache/games-strategy/colobot-9999
@@ -7,5 +7,5 @@ IUSE=devbuild test tools doc +openal
 LICENSE=GPL-3
 RDEPEND=dev-games/physfs dev-libs/boost:= media-libs/glew:0 media-libs/libogg media-libs/libpng:0= media-libs/libsdl2:= media-libs/libsndfile:= media-libs/libvorbis:= media-libs/sdl2-image media-libs/sdl2-ttf media-sound/vorbis-tools sys-devel/gettext openal? ( media-libs/openal ) games-strategy/colobot-data
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ad783f8a596504d8870d77a3fc106d91
diff --git a/metadata/md5-cache/games-strategy/colobot-data-0.1.11 b/metadata/md5-cache/games-strategy/colobot-data-0.1.11
index 9b72727c8cd0..f34bab37b453 100644
--- a/metadata/md5-cache/games-strategy/colobot-data-0.1.11
+++ b/metadata/md5-cache/games-strategy/colobot-data-0.1.11
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 REQUIRED_USE=music? ( ^^ ( music_flac_convert music_ogg ) ) music_flac_convert? ( music ) music_ogg? ( music )
 SLOT=0
 SRC_URI=https://github.com/colobot/colobot-data/archive/colobot-gold-0.1.11-alpha.zip -> colobot-data-0.1.11.zip music_ogg? ( https://colobot.info/files/music/colobot-music_ogg_0.1.11-alpha.tar.gz -> colobot-data-0.1.11-music-ogg.tar.gz ) music_flac_convert? ( https://colobot.info/files/music/colobot-music_flac_0.1.11-alpha.tar.gz -> colobot-data-0.1.11-music-flac.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0dc1f38fe33f9015edb6737df4637e04
diff --git a/metadata/md5-cache/games-strategy/colobot-data-9999 b/metadata/md5-cache/games-strategy/colobot-data-9999
index 20664bda9758..241d11b32bb8 100644
--- a/metadata/md5-cache/games-strategy/colobot-data-9999
+++ b/metadata/md5-cache/games-strategy/colobot-data-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 REQUIRED_USE=music? ( ^^ ( music_flac_convert music_ogg ) ) music_flac_convert? ( music ) music_ogg? ( music )
 SLOT=0
 SRC_URI=music_ogg? ( https://colobot.info/files/music/colobot-music_ogg_latest.tar.gz -> colobot-data-9999-music-ogg.tar.gz ) music_flac_convert? ( https://colobot.info/files/music/colobot-music_flac_latest.tar.gz -> colobot-data-9999-music-flac.tar.gz )
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f5116a6f76451c3520f53b789dfbf9de
diff --git a/metadata/md5-cache/games-strategy/defcon-demo-1.60-r1 b/metadata/md5-cache/games-strategy/defcon-demo-1.60-r1
index bcc9804a35c4..ab51038ec6e8 100644
--- a/metadata/md5-cache/games-strategy/defcon-demo-1.60-r1
+++ b/metadata/md5-cache/games-strategy/defcon-demo-1.60-r1
@@ -10,5 +10,5 @@ RDEPEND=media-libs/libogg media-libs/libvorbis >=sys-libs/glibc-2.3 x11-libs/lib
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=x86? ( http://www.introversion.co.uk/defcon/downloads/defcon_1.6-1_i386.deb ) amd64? ( http://www.introversion.co.uk/defcon/downloads/defcon_1.6-1_amd64.deb )
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=39b1c663606f9fc445deb2f5517879a5
diff --git a/metadata/md5-cache/games-strategy/dunelegacy-0.96.3 b/metadata/md5-cache/games-strategy/dunelegacy-0.96.3
index bb8bedbbfc36..d87d2475249a 100644
--- a/metadata/md5-cache/games-strategy/dunelegacy-0.96.3
+++ b/metadata/md5-cache/games-strategy/dunelegacy-0.96.3
@@ -10,5 +10,5 @@ RDEPEND=media-libs/libsdl[X,alsa?,sound,pulseaudio?,video] media-libs/sdl-mixer[
 REQUIRED_USE=|| ( alsa pulseaudio )
 SLOT=0
 SRC_URI=mirror://sourceforge/dunelegacy/dunelegacy-0.96.3-src.tar.bz2 https://dev.gentoo.org/~hasufell/distfiles/dunelegacy-0.96.3-no-autoreconf.patch.xz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=19515a5a8f1045d08f0353d10060a41f
diff --git a/metadata/md5-cache/games-strategy/endless-sky-0.9.6 b/metadata/md5-cache/games-strategy/endless-sky-0.9.6
index f825029e60dd..e7ae9384680e 100644
--- a/metadata/md5-cache/games-strategy/endless-sky-0.9.6
+++ b/metadata/md5-cache/games-strategy/endless-sky-0.9.6
@@ -8,5 +8,5 @@ LICENSE=CC-BY-SA-4.0 CC-BY-SA-3.0 GPL-3+ public-domain
 RDEPEND=media-libs/glew:0 media-libs/libsdl2 media-libs/libjpeg-turbo media-libs/libpng:= media-libs/openal virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/endless-sky/endless-sky/archive/v0.9.6.tar.gz -> endless-sky-0.9.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9cbc46f41e551853f1f792f26da8c1a5
diff --git a/metadata/md5-cache/games-strategy/freeciv-2.5.11 b/metadata/md5-cache/games-strategy/freeciv-2.5.11
index 43b7d857eda9..facfd8194529 100644
--- a/metadata/md5-cache/games-strategy/freeciv-2.5.11
+++ b/metadata/md5-cache/games-strategy/freeciv-2.5.11
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=app-arch/bzip2 app-arch/xz-utils net-misc/curl sys-libs/zlib auth? ( mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) !mysql? ( ( !sqlite? ( virtual/mysql ) ) ) ) readline? ( sys-libs/readline:0= ) dedicated? ( aimodules? ( dev-libs/libltdl:0 ) ) !dedicated? ( media-libs/libpng:0 gtk? ( x11-libs/gtk+:2 ) mapimg? ( media-gfx/imagemagick:= ) modpack? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl[video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-ttf ) server? ( aimodules? ( sys-devel/libtool:2 ) ) sound? ( media-libs/libsdl[sound] media-libs/sdl-mixer[vorbis] ) !sdl? ( !gtk? ( x11-libs/gtk+:2 ) ) ) system-lua? ( >=dev-lang/lua-5.2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/freeciv/freeciv-2.5.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9742b3b8877d0c8836c8bcf4b1d9dce4
diff --git a/metadata/md5-cache/games-strategy/freeciv-2.6.0 b/metadata/md5-cache/games-strategy/freeciv-2.6.0
index 0c42b6b79bc3..2e0bd56f1128 100644
--- a/metadata/md5-cache/games-strategy/freeciv-2.6.0
+++ b/metadata/md5-cache/games-strategy/freeciv-2.6.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=app-arch/bzip2 app-arch/xz-utils net-misc/curl sys-libs/zlib auth? ( mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) !mysql? ( ( !sqlite? ( virtual/mysql ) ) ) ) readline? ( sys-libs/readline:0= ) dedicated? ( aimodules? ( dev-libs/libltdl:0 ) ) !dedicated? ( media-libs/libpng:0 gtk? ( x11-libs/gtk+:2 ) mapimg? ( media-gfx/imagemagick:= ) modpack? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-ttf ) server? ( aimodules? ( sys-devel/libtool:2 ) ) sound? ( media-libs/libsdl2[sound] media-libs/sdl2-mixer[vorbis] ) !sdl? ( !gtk? ( x11-libs/gtk+:2 ) ) ) system-lua? ( >=dev-lang/lua-5.3 )
 SLOT=0
 SRC_URI=mirror://sourceforge/freeciv/freeciv-2.6.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=559ffa0632d64ae072bd6dd9e36c97d4
diff --git a/metadata/md5-cache/games-strategy/freeorion-0.4.7.1 b/metadata/md5-cache/games-strategy/freeorion-0.4.7.1
index 8ff7bb2d6b6f..1f634dc50c89 100644
--- a/metadata/md5-cache/games-strategy/freeorion-0.4.7.1
+++ b/metadata/md5-cache/games-strategy/freeorion-0.4.7.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2.1 CC-BY-SA-3.0
 RDEPEND=>=dev-libs/boost-1.56[python,threads] media-libs/freealut media-libs/freetype media-libs/glew:* media-libs/libsdl2 >=media-libs/libogg-1.1.3 media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] >=media-libs/libvorbis-1.1.2 media-libs/openal sci-physics/bullet sys-libs/zlib virtual/opengl !dev-games/gigi
 SLOT=0
 SRC_URI=https://github.com/freeorion/freeorion/archive/v0.4.7.1.tar.gz -> freeorion-0.4.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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d43cb6199a5176536bebf250ecd6879a
diff --git a/metadata/md5-cache/games-strategy/freeorion-0.4.7.1-r3 b/metadata/md5-cache/games-strategy/freeorion-0.4.7.1-r3
index 90f687adf8d9..cb07b4241bef 100644
--- a/metadata/md5-cache/games-strategy/freeorion-0.4.7.1-r3
+++ b/metadata/md5-cache/games-strategy/freeorion-0.4.7.1-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1 CC-BY-SA-3.0
 RDEPEND=>=dev-libs/boost-1.56:=[python,threads,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_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/freealut media-libs/freetype media-libs/glew:= media-libs/libsdl2 >=media-libs/libogg-1.1.3 media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] >=media-libs/libvorbis-1.1.2 media-libs/openal sci-physics/bullet sys-libs/zlib virtual/opengl !dev-games/gigi
 SLOT=0
 SRC_URI=https://github.com/freeorion/freeorion/archive/v0.4.7.1.tar.gz -> freeorion-0.4.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=56d488ea6924d41b0601cefafe0ea6bc
diff --git a/metadata/md5-cache/games-strategy/freeorion-0.4.7.1-r4 b/metadata/md5-cache/games-strategy/freeorion-0.4.7.1-r4
index f679f6673c52..9d6bfc20ec55 100644
--- a/metadata/md5-cache/games-strategy/freeorion-0.4.7.1-r4
+++ b/metadata/md5-cache/games-strategy/freeorion-0.4.7.1-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1 CC-BY-SA-3.0
 RDEPEND=>=dev-libs/boost-1.56:=[python,threads,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_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/freealut media-libs/freetype media-libs/glew:= media-libs/libsdl2 >=media-libs/libogg-1.1.3 media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] >=media-libs/libvorbis-1.1.2 media-libs/openal sci-physics/bullet sys-libs/zlib virtual/opengl !dev-games/gigi
 SLOT=0
 SRC_URI=https://github.com/freeorion/freeorion/archive/v0.4.7.1.tar.gz -> freeorion-0.4.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=7a2e47797a7bf6ccd71910f96c772f58
diff --git a/metadata/md5-cache/games-strategy/freeorion-9999 b/metadata/md5-cache/games-strategy/freeorion-9999
index dda366c0053d..737dfb56e8fe 100644
--- a/metadata/md5-cache/games-strategy/freeorion-9999
+++ b/metadata/md5-cache/games-strategy/freeorion-9999
@@ -7,5 +7,5 @@ IUSE=python_targets_python2_7
 LICENSE=GPL-2 LGPL-2.1 CC-BY-SA-3.0
 RDEPEND=>=dev-libs/boost-1.56:=[python,threads,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_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/freealut media-libs/freetype media-libs/glew:= media-libs/libsdl2 >=media-libs/libogg-1.1.3 media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] >=media-libs/libvorbis-1.1.2 media-libs/openal sci-physics/bullet sys-libs/zlib virtual/opengl !dev-games/gigi
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=56d488ea6924d41b0601cefafe0ea6bc
diff --git a/metadata/md5-cache/games-strategy/freesynd-0.7.1-r1 b/metadata/md5-cache/games-strategy/freesynd-0.7.1-r1
index dff0b031096c..1c63587d4b40 100644
--- a/metadata/md5-cache/games-strategy/freesynd-0.7.1-r1
+++ b/metadata/md5-cache/games-strategy/freesynd-0.7.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/libogg media-libs/libpng:0= media-libs/libsdl[X,sound,video] media-libs/libvorbis media-libs/sdl-mixer[mp3,vorbis] media-libs/sdl-image[png]
 SLOT=0
 SRC_URI=mirror://sourceforge/freesynd/freesynd-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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f4d6d2c2ef904c8369493bdb7412a71e
diff --git a/metadata/md5-cache/games-strategy/glob2-0.9.4.4-r2 b/metadata/md5-cache/games-strategy/glob2-0.9.4.4-r2
index 86a2d8f84511..26ae2a0ecb4a 100644
--- a/metadata/md5-cache/games-strategy/glob2-0.9.4.4-r2
+++ b/metadata/md5-cache/games-strategy/glob2-0.9.4.4-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/boost-1.34[threads] dev-libs/fribidi media-libs/libsdl[opengl] media-libs/libvorbis media-libs/sdl-image[png] media-libs/sdl-net media-libs/sdl-ttf media-libs/speex virtual/glu virtual/opengl
 SLOT=0
 SRC_URI=mirror://nongnu/glob2/0.9.4/glob2-0.9.4.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8505071d77f09a50d453605a933e3376
diff --git a/metadata/md5-cache/games-strategy/gwp-0.4.0-r3 b/metadata/md5-cache/games-strategy/gwp-0.4.0-r3
index d93f021b7beb..684d349280bb 100644
--- a/metadata/md5-cache/games-strategy/gwp-0.4.0-r3
+++ b/metadata/md5-cache/games-strategy/gwp-0.4.0-r3
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:2 gnome-base/libgnomeui gnome-base/libglade app-text/raria
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://gwp.lunix.com.ar/releases/gwp-0.4.0.tar.gz
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=5217357bd04fef53dc924b1f2f69427b
diff --git a/metadata/md5-cache/games-strategy/hedgewars-0.9.24.1 b/metadata/md5-cache/games-strategy/hedgewars-0.9.24.1
index f17d28c1419e..349cdb52496f 100644
--- a/metadata/md5-cache/games-strategy/hedgewars-0.9.24.1
+++ b/metadata/md5-cache/games-strategy/hedgewars-0.9.24.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 Apache-2.0 FDL-1.3
 RDEPEND=>=dev-games/physfs-3.0.1 dev-lang/lua:0= dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/libpng:0= media-libs/libsdl2:= media-libs/sdl2-image:= media-libs/sdl2-mixer:=[vorbis] media-libs/sdl2-net:= media-libs/sdl2-ttf:= sys-libs/zlib:= libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) app-arch/xz-utils >=media-fonts/dejavu-2.28 media-fonts/wqy-zenhei
 SLOT=0
 SRC_URI=https://www.hedgewars.org/download/releases/hedgewars-src-0.9.24.1.tar.bz2 mirror://debian/pool/main/h/hedgewars/hedgewars_0.9.23-dfsg-2.debian.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e3bcd50f1a8718040d8a8793d96668c7
diff --git a/metadata/md5-cache/games-strategy/lgeneral-1.3.1-r2 b/metadata/md5-cache/games-strategy/lgeneral-1.3.1-r2
index 9e6290283f9e..a314b454176b 100644
--- a/metadata/md5-cache/games-strategy/lgeneral-1.3.1-r2
+++ b/metadata/md5-cache/games-strategy/lgeneral-1.3.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/lgeneral/lgeneral-1.3.1.tar.gz mirror://sourceforge/lgeneral/pg-data.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5df6697890cec4d2135348e51d8aacc4
diff --git a/metadata/md5-cache/games-strategy/maxr-0.2.9 b/metadata/md5-cache/games-strategy/maxr-0.2.9
index 7ed77ecdc194..4413bc5190c6 100644
--- a/metadata/md5-cache/games-strategy/maxr-0.2.9
+++ b/metadata/md5-cache/games-strategy/maxr-0.2.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2 FDL-1.2+
 RDEPEND=media-libs/libsdl2[video] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-net
 SLOT=0
 SRC_URI=https://www.maxr.org/downloads/maxr-0.2.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0324bab7ca4c53fedc341b08fc4e51f2
diff --git a/metadata/md5-cache/games-strategy/megaglest-3.11.1-r1 b/metadata/md5-cache/games-strategy/megaglest-3.11.1-r1
index 412c10bb39cd..502f1585d41c 100644
--- a/metadata/md5-cache/games-strategy/megaglest-3.11.1-r1
+++ b/metadata/md5-cache/games-strategy/megaglest-3.11.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3 BitstreamVera
 RDEPEND=~games-strategy/megaglest-data-3.11.1 >=dev-lang/lua-5.1:0 dev-libs/libxml2 media-libs/fontconfig media-libs/freetype media-libs/libsdl[X,sound,joystick,opengl,video] media-libs/libvorbis media-libs/openal net-libs/gnutls sys-libs/zlib virtual/opengl virtual/glu x11-libs/libX11 x11-libs/libXext editor? ( x11-libs/wxGTK:3.0[X,opengl] ) fribidi? ( dev-libs/fribidi ) model-viewer? ( x11-libs/wxGTK:3.0[X] ) !static? ( dev-libs/xerces-c[icu] media-libs/ftgl media-libs/glew media-libs/libpng:0 net-libs/libircclient >=net-libs/miniupnpc-1.8 net-misc/curl virtual/jpeg:0 ) videos? ( media-video/vlc ) games-misc/games-envd
 SLOT=0
 SRC_URI=https://github.com/MegaGlest/megaglest-source/releases/download/3.11.1/megaglest-source-3.11.1.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5a9fa18949dad32219e0e443ff699bc4
diff --git a/metadata/md5-cache/games-strategy/megaglest-data-3.11.1 b/metadata/md5-cache/games-strategy/megaglest-data-3.11.1
index c5aa8abc8b95..3793bfb6cba0 100644
--- a/metadata/md5-cache/games-strategy/megaglest-data-3.11.1
+++ b/metadata/md5-cache/games-strategy/megaglest-data-3.11.1
@@ -9,5 +9,5 @@ LICENSE=CC-BY-SA-3.0
 RDEPEND=games-misc/games-envd
 SLOT=0
 SRC_URI=https://github.com/MegaGlest/megaglest-data/releases/download/3.11.1/megaglest-data-3.11.1.tar.xz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=63917303de23782c56b645fd7128c9a8
diff --git a/metadata/md5-cache/games-strategy/naev-0.6.1-r1 b/metadata/md5-cache/games-strategy/naev-0.6.1-r1
index 957a5c015351..87987625aed9 100644
--- a/metadata/md5-cache/games-strategy/naev-0.6.1-r1
+++ b/metadata/md5-cache/games-strategy/naev-0.6.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-3 public-domain CC-BY-3.0 CC-BY-SA-3.0
 RDEPEND=media-libs/libsdl2[X,sound,video] dev-libs/libzip dev-libs/libxml2 >=media-libs/freetype-2:2 >=media-libs/libvorbis-1.2.1 >=media-libs/libpng-1.2:0= virtual/glu virtual/opengl dev-lang/lua:0 mixer? ( media-libs/sdl2-mixer ) openal? ( media-libs/openal )
 SLOT=0
 SRC_URI=mirror://sourceforge/naev/naev-0.6.1.tar.bz2 mirror://sourceforge/naev/ndata-0.6.1.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1ff2273c1a031ca4b9b322c90f33b256
diff --git a/metadata/md5-cache/games-strategy/openra-20141029-r2 b/metadata/md5-cache/games-strategy/openra-20141029-r2
index 79f6238bcd43..2f016b0641dd 100644
--- a/metadata/md5-cache/games-strategy/openra-20141029-r2
+++ b/metadata/md5-cache/games-strategy/openra-20141029-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-dotnet/libgdiplus dev-lang/mono media-libs/freetype:2[X] media-libs/libsdl2[X,opengl,video] media-libs/openal virtual/jpeg:0 virtual/opengl games-misc/games-envd
 SLOT=0
 SRC_URI=https://github.com/OpenRA/OpenRA/tarball/release-20141029 -> openra-20141029.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=03c213a841dec897b386ac7037cde118
diff --git a/metadata/md5-cache/games-strategy/outerspace-0.5.68-r1 b/metadata/md5-cache/games-strategy/outerspace-0.5.68-r1
index 455e11574bd4..6579b6ec243e 100644
--- a/metadata/md5-cache/games-strategy/outerspace-0.5.68-r1
+++ b/metadata/md5-cache/games-strategy/outerspace-0.5.68-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pygame-1.7 python_targets_python2_7? ( >=dev-lang/python-2.
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ospace/Client/0.5.68/Outer%20Space-0.5.68.tar.gz -> outerspace-0.5.68.tar.gz mirror://sourceforge/ospace/Client/0.5.68/outerspace_0.5.68-0ubuntu1_all.deb
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9aebb47150fe67f59995e43c1582bcf3
diff --git a/metadata/md5-cache/games-strategy/s25rttr-0.8.1-r3 b/metadata/md5-cache/games-strategy/s25rttr-0.8.1-r3
index a81b0b479573..03dc2563c088 100644
--- a/metadata/md5-cache/games-strategy/s25rttr-0.8.1-r3
+++ b/metadata/md5-cache/games-strategy/s25rttr-0.8.1-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=app-arch/bzip2 media-libs/libsamplerate media-libs/libsdl[X,sound,opengl,video] media-libs/libsndfile media-libs/sdl-mixer[vorbis] net-libs/miniupnpc virtual/libiconv virtual/opengl
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~hasufell/distfiles/s25rttr-0.8.1.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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c42e2282e17fb238b7e9d592c2f59611
diff --git a/metadata/md5-cache/games-strategy/ufoai-2.5.0_p20180603 b/metadata/md5-cache/games-strategy/ufoai-2.5.0_p20180603
index a7102fece8a5..f2edf53cb67c 100644
--- a/metadata/md5-cache/games-strategy/ufoai-2.5.0_p20180603
+++ b/metadata/md5-cache/games-strategy/ufoai-2.5.0_p20180603
@@ -10,5 +10,5 @@ RDEPEND=net-misc/curl sys-libs/zlib client? ( media-libs/libogg media-libs/libpn
 REQUIRED_USE=|| ( client editor server )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~chewi/distfiles/ufoai-code-8b4533e85fdc0665889ff285e1521432084ee784.zip mirror://sourceforge/ufoai/ufoai-2.5-data.tar editor? ( mirror://sourceforge/ufoai/ufoai-2.5-mappack.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=27aa020fae069b203d11a24b84d3f967
diff --git a/metadata/md5-cache/games-strategy/wargus-2.4.1 b/metadata/md5-cache/games-strategy/wargus-2.4.1
index f4f03457ccf0..b73558e5d20f 100644
--- a/metadata/md5-cache/games-strategy/wargus-2.4.1
+++ b/metadata/md5-cache/games-strategy/wargus-2.4.1
@@ -9,5 +9,5 @@ PDEPEND=games-strategy/wargus-data
 RDEPEND==games-engines/stratagus-2.4.1*[theora] media-libs/libpng:0= sys-libs/zlib:= x11-libs/gtk+:2 x11-libs/libX11
 SLOT=0
 SRC_URI=https://github.com/Wargus/wargus/archive/v2.4.1.tar.gz -> wargus-2.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=21f9bf5beabef6e75ffd4aef26f7599e
diff --git a/metadata/md5-cache/games-strategy/warzone2100-3.2.3 b/metadata/md5-cache/games-strategy/warzone2100-3.2.3
index 4a49b3766d54..48a35e2f4267 100644
--- a/metadata/md5-cache/games-strategy/warzone2100-3.2.3
+++ b/metadata/md5-cache/games-strategy/warzone2100-3.2.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ CC-BY-SA-3.0 public-domain
 RDEPEND=>=dev-games/physfs-2[zip] dev-libs/openssl:0= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 media-libs/freetype:2 media-libs/glew:= media-libs/harfbuzz media-libs/libogg media-libs/libpng:0 media-libs/libtheora media-libs/libvorbis media-libs/openal sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXrandr nls? ( virtual/libintl ) !sdl? ( dev-qt/qtopengl:5 dev-qt/qtx11extras:5 ) sdl? ( media-libs/libsdl2[opengl,video,X] ) media-fonts/dejavu
 SLOT=0
 SRC_URI=mirror://sourceforge/warzone2100/warzone2100-3.2.3.tar.xz videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/2.2/high-quality-en/sequences.wz -> warzone2100-videos-2.2.wz ) https://github.com/Warzone2100/warzone2100/commit/ef37bca38289f4f79c6533acd93ed326858a3f68.patch -> warzone2100-3.2.3-qt_compile_fix.patch
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b4c9a14ce3692eeb3b478f9c84247458
diff --git a/metadata/md5-cache/games-strategy/wesnoth-1.14.4 b/metadata/md5-cache/games-strategy/wesnoth-1.14.4
index 423db4f31098..bdada76063a5 100644
--- a/metadata/md5-cache/games-strategy/wesnoth-1.14.4
+++ b/metadata/md5-cache/games-strategy/wesnoth-1.14.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/boost-1.50:=[nls,threads,icu] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] >=media-libs/sdl2-ttf-2.0.12 media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0 dbus? ( sys-apps/dbus ) fribidi? ( dev-libs/fribidi ) )
 SLOT=0
 SRC_URI=https://github.com/wesnoth/wesnoth/archive/1.14.4.tar.gz -> wesnoth-1.14.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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=ece6e48345abf5c0a600845a032dd5fd
diff --git a/metadata/md5-cache/games-strategy/wesnoth-1.14.5 b/metadata/md5-cache/games-strategy/wesnoth-1.14.5
index eafb6f562e53..a33de6fe8a65 100644
--- a/metadata/md5-cache/games-strategy/wesnoth-1.14.5
+++ b/metadata/md5-cache/games-strategy/wesnoth-1.14.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/boost-1.50:=[nls,threads,icu] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] >=media-libs/sdl2-ttf-2.0.12 media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0 dbus? ( sys-apps/dbus ) fribidi? ( dev-libs/fribidi ) )
 SLOT=0
 SRC_URI=https://github.com/wesnoth/wesnoth/archive/1.14.5.tar.gz -> wesnoth-1.14.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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=ece6e48345abf5c0a600845a032dd5fd
diff --git a/metadata/md5-cache/games-strategy/widelands-0.18-r1 b/metadata/md5-cache/games-strategy/widelands-0.18-r1
index add35437df2b..4c35c4366948 100644
--- a/metadata/md5-cache/games-strategy/widelands-0.18-r1
+++ b/metadata/md5-cache/games-strategy/widelands-0.18-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-lang/lua:0 >=dev-libs/boost-1.48:= media-libs/glew:0= media-libs/libpng:0= media-libs/libsdl[video] media-libs/sdl-gfx media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-net media-libs/sdl-ttf sys-libs/zlib[minizip]
 SLOT=0
 SRC_URI=https://launchpad.net/widelands/build18/build-18/+download/widelands-build18-src.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=256643811005a24e5261ba8b629f9c32
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index 0c639124769c..0d29dbf2d629 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/antimicro-2.23 b/metadata/md5-cache/games-util/antimicro-2.23
index e224d79b6599..e853f00e2331 100644
--- a/metadata/md5-cache/games-util/antimicro-2.23
+++ b/metadata/md5-cache/games-util/antimicro-2.23
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/libsdl2[X,joystick] x11-libs/libX11 x11-libs/libXtst
 SLOT=0
 SRC_URI=https://github.com/AntiMicro/antimicro/archive/2.23.tar.gz -> antimicro-2.23.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=275b931518f4c1e6ee9ee98824535b6f
diff --git a/metadata/md5-cache/games-util/dfarc-3.12-r1 b/metadata/md5-cache/games-util/dfarc-3.12-r1
index 3f371a0cc480..2f82b4c087a6 100644
--- a/metadata/md5-cache/games-util/dfarc-3.12-r1
+++ b/metadata/md5-cache/games-util/dfarc-3.12-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3 BZIP2
 RDEPEND=app-arch/bzip2 x11-misc/xdg-utils x11-libs/wxGTK:3.0[X]
 SLOT=0
 SRC_URI=mirror://gnu/freedink/dfarc-3.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f00ba941c18d951d29ec19108c34f992
diff --git a/metadata/md5-cache/games-util/dfarc-3.14 b/metadata/md5-cache/games-util/dfarc-3.14
index e625c2cc5c05..343ec1049f93 100644
--- a/metadata/md5-cache/games-util/dfarc-3.14
+++ b/metadata/md5-cache/games-util/dfarc-3.14
@@ -9,5 +9,5 @@ LICENSE=GPL-3 BZIP2
 RDEPEND=app-arch/bzip2 x11-misc/xdg-utils x11-libs/wxGTK:3.0[X]
 SLOT=0
 SRC_URI=mirror://gnu/freedink/dfarc-3.14.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0e915a4d883f5d99cd06be204cd7f6ce
diff --git a/metadata/md5-cache/games-util/lgogdownloader-3.4 b/metadata/md5-cache/games-util/lgogdownloader-3.4
index eded794e158a..9c18974a3fc2 100644
--- a/metadata/md5-cache/games-util/lgogdownloader-3.4
+++ b/metadata/md5-cache/games-util/lgogdownloader-3.4
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/games-util/lgogdownloader-9999 b/metadata/md5-cache/games-util/lgogdownloader-9999
index 9747b03db3c1..d3be378e9a2e 100644
--- a/metadata/md5-cache/games-util/lgogdownloader-9999
+++ b/metadata/md5-cache/games-util/lgogdownloader-9999
@@ -7,5 +7,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/games-util/lutris-0.4.14 b/metadata/md5-cache/games-util/lutris-0.4.14
index 07e839714fc7..acff03c3cdf7 100644
--- a/metadata/md5-cache/games-util/lutris-0.4.14
+++ b/metadata/md5-cache/games-util/lutris-0.4.14
@@ -10,5 +10,5 @@ RDEPEND=dev-python/dbus-python[python_targets_python3_4(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/lutris/lutris/archive/v0.4.14.tar.gz -> lutris-0.4.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e9e868639fcdce736e244929a0616209
diff --git a/metadata/md5-cache/games-util/lutris-9999 b/metadata/md5-cache/games-util/lutris-9999
index 09c382065eaf..8cbd87f01db5 100644
--- a/metadata/md5-cache/games-util/lutris-9999
+++ b/metadata/md5-cache/games-util/lutris-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-python/dbus-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(-)] 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-python/python-evdev[python_targets_python3_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/pyyaml[python_targets_python3_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-libs/libsoup x11-apps/xrandr x11-apps/xgamma python_targets_python3_4? ( dev-lang/python:3.4[sqlite,threads] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite,threads] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite,threads] ) >=dev-lang/python-exec-2:=[python_targets_python3_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e9e868639fcdce736e244929a0616209
diff --git a/metadata/md5-cache/games-util/nml-0.4.4-r1 b/metadata/md5-cache/games-util/nml-0.4.4-r1
index 4212ab0c5424..fb9a91f920d7 100644
--- a/metadata/md5-cache/games-util/nml-0.4.4-r1
+++ b/metadata/md5-cache/games-util/nml-0.4.4-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pillow[zlib,python_targets_python3_4(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://bundles.openttdcoop.org/nml/releases/0.4.4/nml-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=abba9b2d8c5d56d05cd8fd3f28df5bc8
diff --git a/metadata/md5-cache/games-util/pyfa-1.34.0 b/metadata/md5-cache/games-util/pyfa-1.34.0
index 7390bba344ac..21beae33aba8 100644
--- a/metadata/md5-cache/games-util/pyfa-1.34.0
+++ b/metadata/md5-cache/games-util/pyfa-1.34.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_t
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/pyfa-org/Pyfa/archive/v1.34.0.tar.gz -> pyfa-1.34.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=194ca9d03f8e46b6b06bcd7024fe45c1
diff --git a/metadata/md5-cache/games-util/pyfa-1.35.0 b/metadata/md5-cache/games-util/pyfa-1.35.0
index 7397fea0ae25..38b1d825a00c 100644
--- a/metadata/md5-cache/games-util/pyfa-1.35.0
+++ b/metadata/md5-cache/games-util/pyfa-1.35.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_t
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/pyfa-org/Pyfa/archive/v1.35.0.tar.gz -> pyfa-1.35.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a8bb210125c6b341cb4b0d5ce8dcfa2d
diff --git a/metadata/md5-cache/games-util/pyfa-1.35.1 b/metadata/md5-cache/games-util/pyfa-1.35.1
index b59153498a22..835c691f5959 100644
--- a/metadata/md5-cache/games-util/pyfa-1.35.1
+++ b/metadata/md5-cache/games-util/pyfa-1.35.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_t
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/pyfa-org/Pyfa/archive/v1.35.1.tar.gz -> pyfa-1.35.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a8bb210125c6b341cb4b0d5ce8dcfa2d
diff --git a/metadata/md5-cache/games-util/pyfa-1.37.0 b/metadata/md5-cache/games-util/pyfa-1.37.0
index 14db35c614b8..1894dc71c157 100644
--- a/metadata/md5-cache/games-util/pyfa-1.37.0
+++ b/metadata/md5-cache/games-util/pyfa-1.37.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=https://github.com/pyfa-org/Pyfa/archive/v1.37.0.tar.gz -> pyfa-1.37.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=03715b56af326c78713929b5609311a7
diff --git a/metadata/md5-cache/games-util/pyfa-9999 b/metadata/md5-cache/games-util/pyfa-9999
index f8c68bd201c8..f7fcba39d4d3 100644
--- a/metadata/md5-cache/games-util/pyfa-9999
+++ b/metadata/md5-cache/games-util/pyfa-9999
@@ -9,5 +9,5 @@ RDEPEND=>=dev-python/logbook-1.0.0[python_targets_python2_7(-)?,-python_single_t
 REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=mirror bindist
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=03715b56af326c78713929b5609311a7
diff --git a/metadata/md5-cache/games-util/qjoypad-4.3.0 b/metadata/md5-cache/games-util/qjoypad-4.3.0
index 9261ccf5263e..f71a8ffccbd9 100644
--- a/metadata/md5-cache/games-util/qjoypad-4.3.0
+++ b/metadata/md5-cache/games-util/qjoypad-4.3.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 virtual/libudev x11-libs/libxcb x11-libs/libXtst
 SLOT=0
 SRC_URI=https://github.com/panzi/qjoypad/archive/v4.3.0.tar.gz -> qjoypad-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0b892b0941b4e19ece0b2c5e1d459abf
diff --git a/metadata/md5-cache/games-util/springlobby-0.266 b/metadata/md5-cache/games-util/springlobby-0.266
index 4d7d2666dd56..112dc2f9951f 100644
--- a/metadata/md5-cache/games-util/springlobby-0.266
+++ b/metadata/md5-cache/games-util/springlobby-0.266
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/boost-1.35:= dev-libs/openssl:= net-misc/curl sys-libs/zlib[minizip] x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/wxGTK:3.0[X] libnotify? ( x11-libs/libnotify ) sound? ( media-libs/alure media-libs/openal )
 SLOT=0
 SRC_URI=https://www.springlobby.info/tarballs/springlobby-0.266.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=414b0055667470ff8947871fc8c454a1
diff --git a/metadata/md5-cache/games-util/xboxdrv-0.8.8 b/metadata/md5-cache/games-util/xboxdrv-0.8.8
index d977a517f7c4..5176c225d15b 100644
--- a/metadata/md5-cache/games-util/xboxdrv-0.8.8
+++ b/metadata/md5-cache/games-util/xboxdrv-0.8.8
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/boost:= dev-libs/dbus-glib:= virtual/libudev:= sys-apps/dbus:= dev-libs/glib:2= virtual/libusb:1= x11-libs/libX11:=
 SLOT=0
 SRC_URI=https://pingus.seul.org/~grumbel/xboxdrv/xboxdrv-linux-0.8.8.tar.bz2
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	741000d14c0b59263aac3f3cf6e39909	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	741000d14c0b59263aac3f3cf6e39909	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac
 _md5_=c2be9b9c1b542286c8364c727528863b
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 94e85df78542..1a2f2190c6cc 100644
--- a/metadata/md5-cache/gnome-base/Manifest.gz
+++ b/metadata/md5-cache/gnome-base/Manifest.gz
diff --git a/metadata/md5-cache/gnome-base/dconf-0.26.1 b/metadata/md5-cache/gnome-base/dconf-0.26.1
index 392762cc7050..45b115cb050f 100644
--- a/metadata/md5-cache/gnome-base/dconf-0.26.1
+++ b/metadata/md5-cache/gnome-base/dconf-0.26.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.44.0:2 sys-apps/dbus
 SLOT=0
 SRC_URI=mirror://gnome/sources/dconf/0.26/dconf-0.26.1.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0f0b5db6198f640cdf3c626422cdf86f
diff --git a/metadata/md5-cache/gnome-base/dconf-editor-3.24.3 b/metadata/md5-cache/gnome-base/dconf-editor-3.24.3
index 8bac2f140831..3d90d18520e6 100644
--- a/metadata/md5-cache/gnome-base/dconf-editor-3.24.3
+++ b/metadata/md5-cache/gnome-base/dconf-editor-3.24.3
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/appstream-glib >=dev-libs/glib-2.46.0:2 >=gnome-base/dconf-0.25.1 >=x11-libs/gtk+-3.22.0:3 !<gnome-base/dconf-0.22[X]
 SLOT=0
 SRC_URI=mirror://gnome/sources/dconf-editor/3.24/dconf-editor-3.24.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=99744d34325d6da1687f6a8fd0b2d0df
diff --git a/metadata/md5-cache/gnome-base/dconf-editor-3.26.2 b/metadata/md5-cache/gnome-base/dconf-editor-3.26.2
index 7b16d2a280c4..6db7418132ed 100644
--- a/metadata/md5-cache/gnome-base/dconf-editor-3.26.2
+++ b/metadata/md5-cache/gnome-base/dconf-editor-3.26.2
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/appstream-glib >=dev-libs/glib-2.46.0:2 >=gnome-base/dconf-0.25.1 >=x11-libs/gtk+-3.22.0:3 !<gnome-base/dconf-0.22[X]
 SLOT=0
 SRC_URI=mirror://gnome/sources/dconf-editor/3.26/dconf-editor-3.26.2.tar.xz
-_eclasses_=desktop	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7196c79335a3359b71dc34776c8a402b
diff --git a/metadata/md5-cache/gnome-base/gconf-3.2.6-r4 b/metadata/md5-cache/gnome-base/gconf-3.2.6-r4
index 2181374edd78..8193fb2f0ca4 100644
--- a/metadata/md5-cache/gnome-base/gconf-3.2.6-r4
+++ b/metadata/md5-cache/gnome-base/gconf-3.2.6-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/dbus-glib-0.100.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_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.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(-)?] >=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) policykit? ( sys-auth/polkit:= ) dev-libs/libxslt dev-util/gtk-doc-am >=dev-util/intltool-0.35 >=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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/dbus-glib-0.100.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_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.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(-)?] >=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) policykit? ( sys-auth/polkit:= ) dev-libs/libxslt dev-util/glib-utils dev-util/gtk-doc-am >=dev-util/intltool-0.35 >=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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=GNOME configuration system and daemon
 EAPI=5
 HOMEPAGE=https://projects.gnome.org/gconf/
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=2
 SRC_URI=mirror://gnome/sources/GConf/3.2/GConf-3.2.6.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	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=44018c08cbb81e09206ab84c1a40b8d6
+_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	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c5d8989206d996523b25b4566a93c7ec
diff --git a/metadata/md5-cache/gnome-base/gdm-3.24.3-r1 b/metadata/md5-cache/gnome-base/gdm-3.24.3-r1
index beead81a27a4..21c711b2cfab 100644
--- a/metadata/md5-cache/gnome-base/gdm-3.24.3-r1
+++ b/metadata/md5-cache/gnome-base/gdm-3.24.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ branding? ( CC-BY-SA-4.0 )
 RDEPEND=app-text/iso-codes >=dev-libs/glib-2.36:2[dbus] >=x11-libs/gtk+-2.91.1:3 >=gnome-base/dconf-0.20 >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas >=media-libs/fontconfig-2.5.0:1.0 >=media-libs/libcanberra-0.4[gtk3] sys-apps/dbus >=sys-apps/accountsservice-0.6.35 x11-apps/sessreg x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libxcb >=x11-misc/xdg-utils-1.0.2-r3 virtual/pam >=sys-apps/systemd-186:0=[pam] sys-auth/pambase[systemd] audit? ( sys-process/audit ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) plymouth? ( sys-boot/plymouth ) selinux? ( sys-libs/libselinux ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) >=gnome-base/gnome-session-3.6 >=gnome-base/gnome-shell-3.1.90 x11-apps/xhost accessibility? ( >=app-accessibility/orca-3.10 gnome-extra/mousetweaks ) fprint? ( sys-auth/fprintd sys-auth/pam_fprint ) !gnome-extra/fast-user-switch-applet
 SLOT=0
 SRC_URI=mirror://gnome/sources/gdm/3.24/gdm-3.24.3.tar.xz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-_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	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f85fefe9ab3e7b70318330ce7750aaf8
diff --git a/metadata/md5-cache/gnome-base/gdm-3.26.2.1-r1 b/metadata/md5-cache/gnome-base/gdm-3.26.2.1-r1
index c90f2215444b..6e954b26b9e8 100644
--- a/metadata/md5-cache/gnome-base/gdm-3.26.2.1-r1
+++ b/metadata/md5-cache/gnome-base/gdm-3.26.2.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ branding? ( CC-BY-SA-4.0 )
 RDEPEND=app-text/iso-codes >=dev-libs/glib-2.36:2[dbus] >=x11-libs/gtk+-2.91.1:3 >=gnome-base/dconf-0.20 >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas >=media-libs/fontconfig-2.5.0:1.0 >=media-libs/libcanberra-0.4[gtk3] sys-apps/dbus >=sys-apps/accountsservice-0.6.35 x11-apps/sessreg x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libxcb >=x11-misc/xdg-utils-1.0.2-r3 virtual/pam >=sys-apps/systemd-186:0=[pam] sys-auth/pambase[systemd] audit? ( sys-process/audit ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) plymouth? ( sys-boot/plymouth ) selinux? ( sys-libs/libselinux ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) >=gnome-base/gnome-session-3.6 >=gnome-base/gnome-shell-3.1.90 x11-apps/xhost accessibility? ( >=app-accessibility/orca-3.10 gnome-extra/mousetweaks ) fprint? ( sys-auth/fprintd sys-auth/pam_fprint ) !gnome-extra/fast-user-switch-applet
 SLOT=0
 SRC_URI=mirror://gnome/sources/gdm/3.26/gdm-3.26.2.1.tar.xz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-_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	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1a95514a2722872b575df3b255778c72
diff --git a/metadata/md5-cache/gnome-base/gnome-common-3.18.0-r1 b/metadata/md5-cache/gnome-base/gnome-common-3.18.0-r1
index 5aa6b0dc6d90..d1d03cac4037 100644
--- a/metadata/md5-cache/gnome-base/gnome-common-3.18.0-r1
+++ b/metadata/md5-cache/gnome-base/gnome-common-3.18.0-r1
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~a
 LICENSE=GPL-3
 SLOT=3
 SRC_URI=mirror://gnome/sources/gnome-common/3.18/gnome-common-3.18.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ab761cb0ad4f19120023e1e655e45c1c
diff --git a/metadata/md5-cache/gnome-base/gnome-control-center-3.24.4 b/metadata/md5-cache/gnome-base/gnome-control-center-3.24.4
index 734aff3f833c..5267a19b90ad 100644
--- a/metadata/md5-cache/gnome-base/gnome-control-center-3.24.4
+++ b/metadata/md5-cache/gnome-base/gnome-control-center-3.24.4
@@ -10,5 +10,5 @@ PDEPEND=>=gnome-base/gnome-session-2.91.6-r1
 RDEPEND=>=dev-libs/glib-2.44.0:2[dbus] >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.22.0:3[X,wayland?] >=gnome-base/gsettings-desktop-schemas-3.21.4 >=gnome-base/gnome-desktop-3.21.2:3= >=gnome-base/gnome-settings-daemon-3.23.90[colord,policykit] >=x11-misc/colord-0.1.34:0= >=dev-libs/libpwquality-1.2.2 dev-libs/libxml2:2 gnome-base/libgtop:2= media-libs/fontconfig >=sys-apps/accountsservice-0.6.39 >=media-libs/libcanberra-0.13[gtk3] >=media-sound/pulseaudio-2[glib] >=sys-auth/polkit-0.97 >=sys-power/upower-0.99:= virtual/libgudev x11-apps/xmodmap x11-libs/cairo x11-libs/libX11 x11-libs/libXxf86misc >=x11-libs/libXi-1.2 bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= ) colord? ( net-libs/libsoup:2.4 >=x11-misc/colord-0.1.34:0= >=x11-libs/colord-gtk-0.1.24 ) cups? ( >=net-print/cups-1.7[dbus] >=net-fs/samba-4.0.0[client] ) gnome-online-accounts? ( >=media-libs/grilo-0.3.0:0.3= >=net-libs/gnome-online-accounts-3.21.5:= ) ibus? ( >=app-i18n/ibus-1.5.2 ) kerberos? ( app-crypt/mit-krb5 ) networkmanager? ( >=gnome-extra/nm-applet-1.2.0 >=net-misc/networkmanager-1.2.0:=[modemmanager] >=net-misc/modemmanager-0.7.990 ) v4l? ( media-libs/clutter-gtk:1.0 >=media-video/cheese-3.5.91 ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=media-libs/clutter-1.11.3:1.0 media-libs/clutter-gtk:1.0 >=x11-libs/libXi-1.2 ) || ( >=sys-apps/systemd-31 ( app-admin/openrc-settingsd sys-auth/consolekit ) ) x11-themes/adwaita-icon-theme colord? ( >=gnome-extra/gnome-color-manager-3 ) cups? ( app-admin/system-config-printer net-print/cups-pk-helper ) input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] ) >=gnome-base/libgnomekbd-3 wayland? ( dev-libs/libinput ) !wayland? ( >=x11-drivers/xf86-input-libinput-0.19.0 input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) ) !<gnome-base/gdm-2.91.94 !<gnome-extra/gnome-color-manager-3.1.2 !gnome-extra/gnome-media[pulseaudio] !<gnome-extra/gnome-media-2.32.0-r300 !<net-wireless/gnome-bluetooth-3.3.2
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-control-center/3.24/gnome-control-center-3.24.4.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-control-center-3.24.4-patchset.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	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_=b859634e5729f5ca566752f1d3c8f1aa
diff --git a/metadata/md5-cache/gnome-base/gnome-control-center-3.26.2-r1 b/metadata/md5-cache/gnome-base/gnome-control-center-3.26.2-r1
index d6114a5186b8..a491a9e2e18b 100644
--- a/metadata/md5-cache/gnome-base/gnome-control-center-3.26.2-r1
+++ b/metadata/md5-cache/gnome-base/gnome-control-center-3.26.2-r1
@@ -10,5 +10,5 @@ PDEPEND=>=gnome-base/gnome-session-2.91.6-r1
 RDEPEND=>=dev-libs/glib-2.53.0:2[dbus] >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.22.0:3[X,wayland?] >=gnome-base/gsettings-desktop-schemas-3.21.4 >=gnome-base/gnome-desktop-3.21.2:3= >=gnome-base/gnome-settings-daemon-3.25.90[colord,policykit] >=x11-misc/colord-0.1.34:0= >=dev-libs/libpwquality-1.2.2 dev-libs/libxml2:2 gnome-base/libgtop:2= media-libs/fontconfig >=sys-apps/accountsservice-0.6.39 >=media-libs/libcanberra-0.13[gtk3] >=media-sound/pulseaudio-2[glib] >=sys-auth/polkit-0.97 >=sys-power/upower-0.99:= virtual/libgudev x11-apps/xmodmap x11-libs/cairo x11-libs/libX11 x11-libs/libXxf86misc >=x11-libs/libXi-1.2 bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= ) colord? ( net-libs/libsoup:2.4 >=x11-misc/colord-0.1.34:0= >=x11-libs/colord-gtk-0.1.24 ) cups? ( >=net-print/cups-1.7[dbus] >=net-fs/samba-4.0.0[client] ) gnome-online-accounts? ( >=media-libs/grilo-0.3.0:0.3= >=net-libs/gnome-online-accounts-3.25.3:= ) ibus? ( >=app-i18n/ibus-1.5.2 ) kerberos? ( app-crypt/mit-krb5 ) networkmanager? ( >=gnome-extra/nm-applet-1.2.0 >=net-misc/networkmanager-1.2.0:=[modemmanager] >=net-misc/modemmanager-0.7.990 ) v4l? ( media-libs/clutter-gtk:1.0 >=media-video/cheese-3.5.91 ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=media-libs/clutter-1.11.3:1.0 media-libs/clutter-gtk:1.0 >=x11-libs/libXi-1.2 ) || ( >=sys-apps/systemd-31 ( app-admin/openrc-settingsd sys-auth/consolekit ) ) x11-themes/adwaita-icon-theme colord? ( >=gnome-extra/gnome-color-manager-3 ) cups? ( app-admin/system-config-printer net-print/cups-pk-helper ) input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] ) >=gnome-base/libgnomekbd-3 wayland? ( dev-libs/libinput ) !wayland? ( >=x11-drivers/xf86-input-libinput-0.19.0 input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) ) !<gnome-base/gdm-2.91.94 !<gnome-extra/gnome-color-manager-3.1.2 !gnome-extra/gnome-media[pulseaudio] !<gnome-extra/gnome-media-2.32.0-r300 !<net-wireless/gnome-bluetooth-3.3.2
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-control-center/3.26/gnome-control-center-3.26.2.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-control-center-3.26.2-patchset.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	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_=b33190ff090d5f612980580d9afe57f3
diff --git a/metadata/md5-cache/gnome-base/gnome-desktop-2.32.1-r2 b/metadata/md5-cache/gnome-base/gnome-desktop-2.32.1-r2
index 3c0243bbd292..14911b865b57 100644
--- a/metadata/md5-cache/gnome-base/gnome-desktop-2.32.1-r2
+++ b/metadata/md5-cache/gnome-base/gnome-desktop-2.32.1-r2
@@ -11,5 +11,5 @@ RDEPEND=>=x11-libs/gtk+-2.18:2 >=dev-libs/glib-2.34:2 >=x11-libs/libXrandr-1.2 >
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-desktop/2.32/gnome-desktop-2.32.1.tar.bz2
-_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=af330cddee3435d5bdf341112af0adab
diff --git a/metadata/md5-cache/gnome-base/gnome-desktop-3.24.2 b/metadata/md5-cache/gnome-base/gnome-desktop-3.24.2
index 47e33b694ba3..9f531439f1cf 100644
--- a/metadata/md5-cache/gnome-base/gnome-desktop-3.24.2
+++ b/metadata/md5-cache/gnome-base/gnome-desktop-3.24.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
 RDEPEND=app-text/iso-codes >=dev-libs/glib-2.44.0:2[dbus] >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?] >=x11-libs/gtk+-3.3.6:3[X,introspection?] x11-libs/cairo:=[X] x11-libs/libX11 x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) udev? ( sys-apps/hwids virtual/libudev:= ) !<gnome-base/gnome-desktop-2.32.1-r1:2[doc]
 SLOT=3/12
 SRC_URI=mirror://gnome/sources/gnome-desktop/3.24/gnome-desktop-3.24.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5750f66d3333401279dfe5fe5728ef4d
diff --git a/metadata/md5-cache/gnome-base/gnome-keyring-3.20.0 b/metadata/md5-cache/gnome-base/gnome-keyring-3.20.0
index 2da74690981b..470ba399f9e4 100644
--- a/metadata/md5-cache/gnome-base/gnome-keyring-3.20.0
+++ b/metadata/md5-cache/gnome-base/gnome-keyring-3.20.0
@@ -10,5 +10,5 @@ PDEPEND=app-crypt/pinentry[gnome-keyring]
 RDEPEND=>=app-crypt/gcr-3.5.3:=[gtk] >=dev-libs/glib-2.38:2 app-misc/ca-certificates >=dev-libs/libgcrypt-1.2.2:0= caps? ( sys-libs/libcap-ng ) pam? ( virtual/pam ) selinux? ( sec-policy/selinux-gnome ) >=app-crypt/gnupg-2.0.28:=
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-keyring/3.20/gnome-keyring-3.20.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5096ed7d5309296804353e3edf8f39db
diff --git a/metadata/md5-cache/gnome-base/gnome-keyring-3.20.1 b/metadata/md5-cache/gnome-base/gnome-keyring-3.20.1
index 3a51f6282779..ba854f37a655 100644
--- a/metadata/md5-cache/gnome-base/gnome-keyring-3.20.1
+++ b/metadata/md5-cache/gnome-base/gnome-keyring-3.20.1
@@ -10,5 +10,5 @@ PDEPEND=app-crypt/pinentry[gnome-keyring]
 RDEPEND=>=app-crypt/gcr-3.5.3:=[gtk] >=dev-libs/glib-2.38:2 app-misc/ca-certificates >=dev-libs/libgcrypt-1.2.2:0= caps? ( sys-libs/libcap-ng ) pam? ( virtual/pam ) selinux? ( sec-policy/selinux-gnome ) >=app-crypt/gnupg-2.0.28:=
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-keyring/3.20/gnome-keyring-3.20.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=eaf300c6459ebe1c5c73db8a246a8154
diff --git a/metadata/md5-cache/gnome-base/gnome-keyring-3.28.2 b/metadata/md5-cache/gnome-base/gnome-keyring-3.28.2
index 1587630f8d78..6fe2c9f006a0 100644
--- a/metadata/md5-cache/gnome-base/gnome-keyring-3.28.2
+++ b/metadata/md5-cache/gnome-base/gnome-keyring-3.28.2
@@ -10,5 +10,5 @@ PDEPEND=app-crypt/pinentry[gnome-keyring]
 RDEPEND=>=app-crypt/gcr-3.27.90:=[gtk] >=dev-libs/glib-2.44:2 app-misc/ca-certificates >=dev-libs/libgcrypt-1.2.2:0= caps? ( sys-libs/libcap-ng ) pam? ( virtual/pam ) selinux? ( sec-policy/selinux-gnome ) >=app-crypt/gnupg-2.0.28:= ssh-agent? ( net-misc/openssh )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-keyring/3.28/gnome-keyring-3.28.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c597eb4041923912313eb16f902c9058
diff --git a/metadata/md5-cache/gnome-base/gnome-menus-3.13.3-r1 b/metadata/md5-cache/gnome-base/gnome-menus-3.13.3-r1
index 817e5a773317..b0dc1e9a8472 100644
--- a/metadata/md5-cache/gnome-base/gnome-menus-3.13.3-r1
+++ b/metadata/md5-cache/gnome-base/gnome-menus-3.13.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=dev-libs/glib-2.29.15:2 introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) !<gnome-base/gnome-menus-3.0.1-r1:0
 SLOT=3
 SRC_URI=mirror://gnome/sources/gnome-menus/3.13/gnome-menus-3.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ef786c2081a9b428434f88a03554480c
diff --git a/metadata/md5-cache/gnome-base/gnome-mime-data-2.18.0 b/metadata/md5-cache/gnome-base/gnome-mime-data-2.18.0
index 44fb5f204add..d5c5763ad19e 100644
--- a/metadata/md5-cache/gnome-base/gnome-mime-data-2.18.0
+++ b/metadata/md5-cache/gnome-base/gnome-mime-data-2.18.0
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fb
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-mime-data/2.18/gnome-mime-data-2.18.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=5e1a3ca36a7d09d72316c355a3c7a3c7
diff --git a/metadata/md5-cache/gnome-base/gnome-session-3.24.2-r1 b/metadata/md5-cache/gnome-base/gnome-session-3.24.2-r1
index 712edaac6a09..2ddedacc6c2c 100644
--- a/metadata/md5-cache/gnome-base/gnome-session-3.24.2-r1
+++ b/metadata/md5-cache/gnome-base/gnome-session-3.24.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2 FDL-1.1
 RDEPEND=>=dev-libs/glib-2.46.0:2[dbus] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.18.0:3 >=dev-libs/json-glib-0.10 >=gnome-base/gnome-desktop-3.18:3= elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) media-libs/mesa[egl,gles2] media-libs/libepoxy x11-libs/libSM x11-libs/libICE x11-libs/libXau x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk x11-apps/xdpyinfo systemd? ( >=sys-apps/systemd-183:0= ) >=gnome-base/gnome-settings-daemon-3.23.2 >=gnome-base/gsettings-desktop-schemas-0.1.7 x11-themes/adwaita-icon-theme sys-apps/dbus[X] !systemd? ( sys-auth/consolekit >=dev-libs/dbus-glib-0.76 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-session/3.24/gnome-session-3.24.2.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-session-3.24.2-xorg-default-translations.patch.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=954cf18979ef4fc2e9f553e95133d124
diff --git a/metadata/md5-cache/gnome-base/gnome-session-3.26.1 b/metadata/md5-cache/gnome-base/gnome-session-3.26.1
index fdffa76f33fd..923f652db59b 100644
--- a/metadata/md5-cache/gnome-base/gnome-session-3.26.1
+++ b/metadata/md5-cache/gnome-base/gnome-session-3.26.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2 FDL-1.1
 RDEPEND=>=dev-libs/glib-2.46.0:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.18.0:3 >=dev-libs/json-glib-0.10 >=gnome-base/gnome-desktop-3.18:3= elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) media-libs/mesa[egl,gles2] media-libs/libepoxy x11-libs/libSM x11-libs/libICE x11-libs/libXau x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk x11-apps/xdpyinfo systemd? ( >=sys-apps/systemd-183:0= ) >=gnome-base/gnome-settings-daemon-3.23.2 >=gnome-base/gsettings-desktop-schemas-0.1.7 x11-themes/adwaita-icon-theme sys-apps/dbus[X] !systemd? ( sys-auth/consolekit >=dev-libs/dbus-glib-0.76 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-session/3.26/gnome-session-3.26.1.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=281d6590fa024f464d3ae79548dfce9f
diff --git a/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.24.4 b/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.24.4
index 56c1d4a7a2e2..4a2db485d685 100644
--- a/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.24.4
+++ b/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.24.4
@@ -11,5 +11,5 @@ REQUIRED_USE=input_devices_wacom? ( udev ) smartcard? ( udev ) wayland? ( udev )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-settings-daemon/3.24/gnome-settings-daemon-3.24.4.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-settings-daemon-3.24.4-patchset.tar.xz
-_eclasses_=autotools	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-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0aace946b266355d0d1786ec34911234
diff --git a/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.26.2-r1 b/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.26.2-r1
index a76f6dc95811..4277a58792eb 100644
--- a/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.26.2-r1
+++ b/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.26.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( elogind systemd ) input_devices_wacom? ( udev ) smartcard? ( u
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-settings-daemon/3.26/gnome-settings-daemon-3.26.2.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-settings-daemon-3.26.2-patchset.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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ba328ea0ad66dc2674a224df94f4b9ac
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-3.22.3 b/metadata/md5-cache/gnome-base/gnome-shell-3.22.3
index 4aed569c0333..55704a93c99e 100644
--- a/metadata/md5-cache/gnome-base/gnome-shell-3.22.3
+++ b/metadata/md5-cache/gnome-base/gnome-shell-3.22.3
@@ -11,5 +11,5 @@ RDEPEND=>=app-accessibility/at-spi2-atk-2.5.3 >=dev-libs/atk-2[introspection] >=
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-shell/3.22/gnome-shell-3.22.3.tar.xz
-_eclasses_=autotools	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=aa06cf8320df81f6602730ddb0f11685
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-3.24.3 b/metadata/md5-cache/gnome-base/gnome-shell-3.24.3
index 9f6b0cf51f41..d5d1f21b6eb3 100644
--- a/metadata/md5-cache/gnome-base/gnome-shell-3.24.3
+++ b/metadata/md5-cache/gnome-base/gnome-shell-3.24.3
@@ -11,5 +11,5 @@ RDEPEND=>=app-accessibility/at-spi2-atk-2.5.3 >=dev-libs/atk-2[introspection] >=
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-shell/3.24/gnome-shell-3.24.3.tar.xz
-_eclasses_=autotools	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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-3.26.2-r4 b/metadata/md5-cache/gnome-base/gnome-shell-3.26.2-r4
index def812856983..1d3e40ea81ee 100644
--- a/metadata/md5-cache/gnome-base/gnome-shell-3.26.2-r4
+++ b/metadata/md5-cache/gnome-base/gnome-shell-3.26.2-r4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/libcroco-0.6.8:0.6 >=gnome-extra/evolution-data-server-3.17.2
 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 ) ?? ( elogind systemd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-shell/3.26/gnome-shell-3.26.2.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-shell-3.26.2-patchset.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	29ef682942c6ff558de2f797a61790c2	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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	29ef682942c6ff558de2f797a61790c2	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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=90364b235789808034762cf92f7617df
diff --git a/metadata/md5-cache/gnome-base/gnome-vfs-2.24.4-r5 b/metadata/md5-cache/gnome-base/gnome-vfs-2.24.4-r5
index 05bed405810b..727e92e1619f 100644
--- a/metadata/md5-cache/gnome-base/gnome-vfs-2.24.4-r5
+++ b/metadata/md5-cache/gnome-base/gnome-vfs-2.24.4-r5
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=gnome-base/gconf-2.32.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(-)?] >=dev-libs/glib-2.34.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-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(-)?] >=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(-)?] gnome-base/gnome-mime-data >=x11-misc/shared-mime-info-0.14 >=dev-libs/dbus-glib-0.100.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( >=sys-apps/acl-2.2.52-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_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-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !gnome-extra/gnome-vfs-sftp ) !gnutls? ( !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(-)?] ) !gnome-extra/gnome-vfs-sftp ) ) 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(-)?] )
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-vfs/2.24/gnome-vfs-2.24.4.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	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=78f374b9c1ed8f1365b11fc11a74c351
diff --git a/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.22.0 b/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.22.0
index 5466b045c3fb..e2c0a9775866 100644
--- a/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.22.0
+++ b/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.22.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.31:2 introspection? ( >=dev-libs/gobject-introspection-1.31.0:= ) !<gnome-base/gdm-3.8
 SLOT=0
 SRC_URI=mirror://gnome/sources/gsettings-desktop-schemas/3.22/gsettings-desktop-schemas-3.22.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1ee7f357815676fc0d53858d29a93d2e
diff --git a/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.24.1 b/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.24.1
index e510a1f63a28..6ce0cf5e1d1a 100644
--- a/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.24.1
+++ b/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.24.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.31:2 introspection? ( >=dev-libs/gobject-introspection-1.31.0:= ) !<gnome-base/gdm-3.8
 SLOT=0
 SRC_URI=mirror://gnome/sources/gsettings-desktop-schemas/3.24/gsettings-desktop-schemas-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2cc054cd010e3af3d27d283e23492bc3
diff --git a/metadata/md5-cache/gnome-base/gvfs-1.32.1-r1 b/metadata/md5-cache/gnome-base/gvfs-1.32.1-r1
index c9c8f8c2d833..1d7bdf7781e2 100644
--- a/metadata/md5-cache/gnome-base/gvfs-1.32.1-r1
+++ b/metadata/md5-cache/gnome-base/gvfs-1.32.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=cdda? ( udev ) elogind? ( !systemd udisks ) google? ( gnome-online-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gvfs/1.32/gvfs-1.32.1.tar.xz https://dev.gentoo.org/~leio/distfiles/gvfs-1.32.1-patches.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=63c395c341d73bb1b21a2bb1e4e3877e
diff --git a/metadata/md5-cache/gnome-base/gvfs-1.32.2 b/metadata/md5-cache/gnome-base/gvfs-1.32.2
index adf0b5ddf3b1..cfb3624216fa 100644
--- a/metadata/md5-cache/gnome-base/gvfs-1.32.2
+++ b/metadata/md5-cache/gnome-base/gvfs-1.32.2
@@ -11,5 +11,5 @@ REQUIRED_USE=cdda? ( udev ) elogind? ( !systemd udisks ) google? ( gnome-online-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gvfs/1.32/gvfs-1.32.2.tar.xz https://dev.gentoo.org/~leio/distfiles/gvfs-1.32.2-patchset.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a5fa80e8d3f746460e5d84982f7e961e
diff --git a/metadata/md5-cache/gnome-base/gvfs-1.34.2.1-r1 b/metadata/md5-cache/gnome-base/gvfs-1.34.2.1-r1
index 01cc8f85d7fb..ceaf4c3d2641 100644
--- a/metadata/md5-cache/gnome-base/gvfs-1.34.2.1-r1
+++ b/metadata/md5-cache/gnome-base/gvfs-1.34.2.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=cdda? ( udev ) elogind? ( !systemd udisks ) google? ( gnome-online-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gvfs/1.34/gvfs-1.34.2.1.tar.xz https://dev.gentoo.org/~leio/distfiles/gvfs-1.34.2.1-patchset.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=45e3a744223bab8d2708fd903ea001e7
diff --git a/metadata/md5-cache/gnome-base/libbonobo-2.24.3-r1 b/metadata/md5-cache/gnome-base/libbonobo-2.24.3-r1
index cec42dbf0237..2e45424b597b 100644
--- a/metadata/md5-cache/gnome-base/libbonobo-2.24.3-r1
+++ b/metadata/md5-cache/gnome-base/libbonobo-2.24.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/glib-2.14:2 >=gnome-base/orbit-2.14.0 >=dev-libs/libxml2-2.4.20:2 >=sys-apps/dbus-1.0.0 >=dev-libs/dbus-glib-0.74 >=dev-libs/popt-1.5 !gnome-base/bonobo-activation dev-util/gtk-doc-am virtual/yacc sys-devel/flex x11-apps/xrdb virtual/pkgconfig >=dev-util/intltool-0.35 >=app-portage/elt-patches-20170815 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.14:2 >=gnome-base/orbit-2.14.0 >=dev-libs/libxml2-2.4.20:2 >=sys-apps/dbus-1.0.0 >=dev-libs/dbus-glib-0.74 >=dev-libs/popt-1.5 !gnome-base/bonobo-activation dev-util/glib-utils dev-util/gtk-doc-am virtual/yacc sys-devel/flex x11-apps/xrdb virtual/pkgconfig >=dev-util/intltool-0.35 >=app-portage/elt-patches-20170815 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=GNOME CORBA framework
 EAPI=5
 HOMEPAGE=https://developer.gnome.org/libbonobo/stable/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.14:2 >=gnome-base/orbit-2.14.0 >=dev-libs/libxml2-2.4.
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/libbonobo/2.24/libbonobo-2.24.3.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=e02b9048deda8791e7c86617fd3021e8
+_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_=7bc456a7c5419660df8a8b12c3b1127d
diff --git a/metadata/md5-cache/gnome-base/libbonoboui-2.24.5-r1 b/metadata/md5-cache/gnome-base/libbonoboui-2.24.5-r1
index 1ba31e2322ed..3bd524bb446a 100644
--- a/metadata/md5-cache/gnome-base/libbonoboui-2.24.5-r1
+++ b/metadata/md5-cache/gnome-base/libbonoboui-2.24.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=gnome-base/libgnomecanvas-1.116 >=gnome-base/libbonobo-2.22 >=gnome-base/libgnome-2.13.7 >=dev-libs/libxml2-2.4.20:2 >=gnome-base/gconf-2:2 >=x11-libs/gtk+-2.8.12:2 >=dev-libs/glib-2.6.0:2 >=gnome-base/libglade-1.99.11:2.0 >=dev-libs/popt-1.5
 SLOT=0
 SRC_URI=mirror://gnome/sources/libbonoboui/2.24/libbonoboui-2.24.5.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c82fc02d1930bef744088a6bcf267bf4
diff --git a/metadata/md5-cache/gnome-base/libglade-2.6.4-r2 b/metadata/md5-cache/gnome-base/libglade-2.6.4-r2
index f566942b307e..baa2654e2a92 100644
--- a/metadata/md5-cache/gnome-base/libglade-2.6.4-r2
+++ b/metadata/md5-cache/gnome-base/libglade-2.6.4-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=tools? ( ^^ ( python_single_target_pypy python_single_target_python2_7 ) python_single_target_pypy? ( python_targets_pypy ) python_single_target_python2_7? ( python_targets_python2_7 ) )
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/libglade/2.6/libglade-2.6.4.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	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	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	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_=8579827e471cc838655ae8ace8310a21
diff --git a/metadata/md5-cache/gnome-base/libgnome-2.32.1-r1 b/metadata/md5-cache/gnome-base/libgnome-2.32.1-r1
index a1b1804cfdc8..2f1ce3c5d1b2 100644
--- a/metadata/md5-cache/gnome-base/libgnome-2.32.1-r1
+++ b/metadata/md5-cache/gnome-base/libgnome-2.32.1-r1
@@ -10,5 +10,5 @@ PDEPEND=gnome-base/gvfs
 RDEPEND=>=gnome-base/gconf-2 >=dev-libs/glib-2.16:2 >=gnome-base/gnome-vfs-2.5.3 >=gnome-base/libbonobo-2.13 >=dev-libs/popt-1.7 media-libs/libcanberra
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgnome/2.32/libgnome-2.32.1.tar.bz2 branding? ( mirror://gentoo/gentoo-gdm-theme-r3.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=29dac9043f97f046dc719d91b6944449
diff --git a/metadata/md5-cache/gnome-base/libgnome-keyring-3.12.0-r1 b/metadata/md5-cache/gnome-base/libgnome-keyring-3.12.0-r1
index 459fd6626b84..9fec13d0a10c 100644
--- a/metadata/md5-cache/gnome-base/libgnome-keyring-3.12.0-r1
+++ b/metadata/md5-cache/gnome-base/libgnome-keyring-3.12.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.16.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgnome-keyring/3.12/libgnome-keyring-3.12.0.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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=33ecd6fdaf5e00edaff11bab30b9861a
diff --git a/metadata/md5-cache/gnome-base/libgnomecanvas-2.30.3-r1 b/metadata/md5-cache/gnome-base/libgnomecanvas-2.30.3-r1
index 279999c2e71f..5ccf898b9450 100644
--- a/metadata/md5-cache/gnome-base/libgnomecanvas-2.30.3-r1
+++ b/metadata/md5-cache/gnome-base/libgnomecanvas-2.30.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=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(-)?] >=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(-)?] >=media-libs/libart_lgpl-2.3.21-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/pango-1.36.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] glade? ( >=gnome-base/libglade-2.6.4-r1: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(-)?] ) >=dev-lang/perl-5 sys-devel/gettext >=dev-util/intltool-0.35 >=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-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/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(-)?] >=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(-)?] >=media-libs/libart_lgpl-2.3.21-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/pango-1.36.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] glade? ( >=gnome-base/libglade-2.6.4-r1: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(-)?] ) >=dev-lang/perl-5 sys-devel/gettext dev-util/glib-utils >=dev-util/intltool-0.35 >=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-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=The Gnome 2 Canvas library
 EAPI=5
 HOMEPAGE=https://library.gnome.org/devel/libgnomecanvas/stable/
@@ -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(-)?] >=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(-)?] >=media-libs/libart_lgpl-2.3.21-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/pango-1.36.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] glade? ( >=gnome-base/libglade-2.6.4-r1: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(-)?] )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgnomecanvas/2.30/libgnomecanvas-2.30.3.tar.bz2
-_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=86401c3b8ef7561b9f1796ef110b323d
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=8c1d807faed8d8a39ae671c7753bd945
diff --git a/metadata/md5-cache/gnome-base/libgnomekbd-3.22.0.1 b/metadata/md5-cache/gnome-base/libgnomekbd-3.22.0.1
index 8e28de76ed1d..1620cd3ef91b 100644
--- a/metadata/md5-cache/gnome-base/libgnomekbd-3.22.0.1
+++ b/metadata/md5-cache/gnome-base/libgnomekbd-3.22.0.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.91.7:3[X,introspection?] >=x11-libs/libxklavier-5.2[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
 SLOT=0/8
 SRC_URI=mirror://gnome/sources/libgnomekbd/3.22/libgnomekbd-3.22.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8ef9aba0edb1ce1a7a1fc91cb527a16c
diff --git a/metadata/md5-cache/gnome-base/libgnomekbd-3.26.0 b/metadata/md5-cache/gnome-base/libgnomekbd-3.26.0
index 5d99f6d7ba3c..d7811dea705d 100644
--- a/metadata/md5-cache/gnome-base/libgnomekbd-3.26.0
+++ b/metadata/md5-cache/gnome-base/libgnomekbd-3.26.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.91.7:3[X,introspection?] >=x11-libs/libxklavier-5.2[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
 SLOT=0/8
 SRC_URI=mirror://gnome/sources/libgnomekbd/3.26/libgnomekbd-3.26.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ad92ec4f5b853e14a24df90a384d76f3
diff --git a/metadata/md5-cache/gnome-base/libgnomeui-2.24.5-r1 b/metadata/md5-cache/gnome-base/libgnomeui-2.24.5-r1
index 5427249a64c3..bedb3560df1e 100644
--- a/metadata/md5-cache/gnome-base/libgnomeui-2.24.5-r1
+++ b/metadata/md5-cache/gnome-base/libgnomeui-2.24.5-r1
@@ -10,5 +10,5 @@ PDEPEND=x11-themes/adwaita-icon-theme
 RDEPEND=dev-libs/atk >=dev-libs/glib-2.16:2 >=dev-libs/libxml2-2.4.20:2 >=dev-libs/popt-1.5 >=gnome-base/gconf-2:2 >=gnome-base/gnome-keyring-0.4 >=gnome-base/gnome-vfs-2.7.3:2 >=gnome-base/libgnome-2.13.7 >=gnome-base/libgnomecanvas-2 gnome-base/libgnome-keyring >=gnome-base/libbonoboui-2.13.1 >=gnome-base/libglade-2:2.0 media-libs/libart_lgpl x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.14:2 >=x11-libs/pango-1.1.2 x11-libs/libICE x11-libs/libSM
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgnomeui/2.24/libgnomeui-2.24.5.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=b2a61324d37084ad79f4f12d87bc00ba
diff --git a/metadata/md5-cache/gnome-base/libgtop-2.36.0 b/metadata/md5-cache/gnome-base/libgtop-2.36.0
index 3340b191bc8e..3185f7a7f9ee 100644
--- a/metadata/md5-cache/gnome-base/libgtop-2.36.0
+++ b/metadata/md5-cache/gnome-base/libgtop-2.36.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.26:2 introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
 SLOT=2/10
 SRC_URI=mirror://gnome/sources/libgtop/2.36/libgtop-2.36.0.tar.xz
-_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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1bbc519c9549caf607b6bd363ca8aab3
diff --git a/metadata/md5-cache/gnome-base/libgtop-2.38.0 b/metadata/md5-cache/gnome-base/libgtop-2.38.0
index f7cac7c7c1fe..124606704a31 100644
--- a/metadata/md5-cache/gnome-base/libgtop-2.38.0
+++ b/metadata/md5-cache/gnome-base/libgtop-2.38.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.26:2 introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
 SLOT=2/11
 SRC_URI=mirror://gnome/sources/libgtop/2.38/libgtop-2.38.0.tar.xz
-_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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e942b88b8b01d41f7ba209ba8df15120
diff --git a/metadata/md5-cache/gnome-base/librsvg-2.40.18 b/metadata/md5-cache/gnome-base/librsvg-2.40.18
index 784abe019249..547a15201c47 100644
--- a/metadata/md5-cache/gnome-base/librsvg-2.40.18
+++ b/metadata/md5-cache/gnome-base/librsvg-2.40.18
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=vala? ( introspection )
 SLOT=2
 SRC_URI=mirror://gnome/sources/librsvg/2.40/librsvg-2.40.18.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	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=01412e81b29960587e0651f33928b857
diff --git a/metadata/md5-cache/gnome-base/nautilus-3.20.4 b/metadata/md5-cache/gnome-base/nautilus-3.20.4
index fefb817eb71f..097feda0be88 100644
--- a/metadata/md5-cache/gnome-base/nautilus-3.20.4
+++ b/metadata/md5-cache/gnome-base/nautilus-3.20.4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.45.7:2[dbus] >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/nautilus/3.20/nautilus-3.20.4.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d9b19891be05a4208ea26d1e1cf0f0c7
diff --git a/metadata/md5-cache/gnome-base/nautilus-3.24.2.1-r1 b/metadata/md5-cache/gnome-base/nautilus-3.24.2.1-r1
index d1ac1087bd29..04f373eec2cf 100644
--- a/metadata/md5-cache/gnome-base/nautilus-3.24.2.1-r1
+++ b/metadata/md5-cache/gnome-base/nautilus-3.24.2.1-r1
@@ -11,5 +11,5 @@ RDEPEND=>=app-arch/gnome-autoar-0.2.1 >=dev-libs/glib-2.51.2:2[dbus] >=x11-libs/
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/nautilus/3.24/nautilus-3.24.2.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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8f6528fb8794d0dbce0186bd902344b6
diff --git a/metadata/md5-cache/gnome-base/orbit-2.14.19-r5 b/metadata/md5-cache/gnome-base/orbit-2.14.19-r5
index d7705f97740f..5be609a242cb 100644
--- a/metadata/md5-cache/gnome-base/orbit-2.14.19-r5
+++ b/metadata/md5-cache/gnome-base/orbit-2.14.19-r5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.44.1-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 REQUIRED_USE=test? ( debug )
 SLOT=2
 SRC_URI=mirror://gnome/sources/ORBit2/2.14/ORBit2-2.14.19.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9e21368ef6a11bb4add7ee0615e21084
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 6d528d2e6f3d..e421da3921e7 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/assogiate-0.2.1-r1 b/metadata/md5-cache/gnome-extra/assogiate-0.2.1-r1
index 5a09bea9d347..9d834af7c79d 100644
--- a/metadata/md5-cache/gnome-extra/assogiate-0.2.1-r1
+++ b/metadata/md5-cache/gnome-extra/assogiate-0.2.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.8:2 >=dev-cpp/glibmm-2.46:2 >=dev-cpp/gtkmm-2.24.4-r3:2.4 >=dev-cpp/libxmlpp-2.40:2.6 >=dev-cpp/gnome-vfsmm-2.26.0-r1
 SLOT=0
 SRC_URI=http://www.kdau.com/files/assogiate-0.2.1.tar.bz2
-_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8ba36ed6de369d457206f19a80711fa8
diff --git a/metadata/md5-cache/gnome-extra/chrome-gnome-shell-10 b/metadata/md5-cache/gnome-extra/chrome-gnome-shell-10
index d405f6c1f795..fe84cd05c183 100644
--- a/metadata/md5-cache/gnome-extra/chrome-gnome-shell-10
+++ b/metadata/md5-cache/gnome-extra/chrome-gnome-shell-10
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/gnome-extra/chrome-gnome-shell-8-r1 b/metadata/md5-cache/gnome-extra/chrome-gnome-shell-8-r1
index b5e1ba806338..671f106f72d3 100644
--- a/metadata/md5-cache/gnome-extra/chrome-gnome-shell-8-r1
+++ b/metadata/md5-cache/gnome-extra/chrome-gnome-shell-8-r1
@@ -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_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/chrome-gnome-shell/8/chrome-gnome-shell-8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=53d1f29efdf28dc060d15c13cf640827
diff --git a/metadata/md5-cache/gnome-extra/chrome-gnome-shell-9 b/metadata/md5-cache/gnome-extra/chrome-gnome-shell-9
index e65713f539e0..fc5363a00123 100644
--- a/metadata/md5-cache/gnome-extra/chrome-gnome-shell-9
+++ b/metadata/md5-cache/gnome-extra/chrome-gnome-shell-9
@@ -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_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/chrome-gnome-shell/9/chrome-gnome-shell-9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fbee6ceb44e90a85ce6acd2daa258e7c
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-3.6.6-r2 b/metadata/md5-cache/gnome-extra/cinnamon-3.6.6-r2
index 6201fb3ee50f..a2a9f9e1de09 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-3.6.6-r2
+++ b/metadata/md5-cache/gnome-extra/cinnamon-3.6.6-r2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) || ( python_targets_python2_7 ) || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/Cinnamon/archive/3.6.6.tar.gz -> cinnamon-3.6.6.tar.gz
-_eclasses_=autotools	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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f0771af73f2cfb7fe624540a08e2430d
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-3.8.8 b/metadata/md5-cache/gnome-extra/cinnamon-3.8.8
index 07d273f874ec..85d78e64abbe 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-3.8.8
+++ b/metadata/md5-cache/gnome-extra/cinnamon-3.8.8
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) || ( python_targets_python2_7 ) || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/Cinnamon/archive/3.8.8.tar.gz -> cinnamon-3.8.8.tar.gz
-_eclasses_=autotools	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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=16aba224fe1f3565497cdafa9b0a2e76
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-control-center-3.6.5 b/metadata/md5-cache/gnome-extra/cinnamon-control-center-3.6.5
index cd0f4163d2d2..aa8c7157bffb 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-control-center-3.6.5
+++ b/metadata/md5-cache/gnome-extra/cinnamon-control-center-3.6.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.31:2 dev-libs/libxml2:2 >=gnome-base/libgnomekbd-2.91.91:0= >=gnome-extra/cinnamon-desktop-1.0:0= >=gnome-extra/cinnamon-menus-1.0:0= >=gnome-extra/cinnamon-settings-daemon-1.0:0= >=gnome-extra/nm-applet-0.9.8 media-libs/fontconfig >=net-misc/modemmanager-0.7 >=net-misc/networkmanager-0.9.8:=[modemmanager] >=sys-auth/polkit-0.103 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.4.1:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 x11-libs/libxklavier colord? ( >=x11-misc/colord-0.1.14:0= ) cups? ( >=net-print/cups-1.4[dbus] ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=x11-libs/gtk+-3.8:3 >=x11-libs/libXi-1.2 ) systemd? ( >=sys-apps/systemd-31 ) !systemd? ( app-admin/openrc-settingsd sys-auth/elogind ) x11-themes/adwaita-icon-theme colord? ( >=gnome-extra/gnome-color-manager-3 ) cups? ( app-admin/system-config-printer net-print/cups-pk-helper ) input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-control-center/archive/3.6.5.tar.gz -> cinnamon-control-center-3.6.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2b0365e8362fe12e0f7784b9c76a3c16
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-control-center-3.8.0 b/metadata/md5-cache/gnome-extra/cinnamon-control-center-3.8.0
index df845f8a22ca..547b8246b1aa 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-control-center-3.8.0
+++ b/metadata/md5-cache/gnome-extra/cinnamon-control-center-3.8.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.31:2 dev-libs/libxml2:2 >=gnome-base/libgnomekbd-2.91.91:0= >=gnome-extra/cinnamon-desktop-1.0:0= >=gnome-extra/cinnamon-menus-1.0:0= >=gnome-extra/cinnamon-settings-daemon-1.0:0= >=gnome-extra/nm-applet-0.9.8 media-libs/fontconfig >=net-misc/modemmanager-0.7 >=net-misc/networkmanager-0.9.8:=[modemmanager] >=sys-auth/polkit-0.103 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.4.1:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 x11-libs/libxklavier colord? ( >=x11-misc/colord-0.1.14:0= ) cups? ( >=net-print/cups-1.4[dbus] ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=x11-libs/gtk+-3.8:3 >=x11-libs/libXi-1.2 ) systemd? ( >=sys-apps/systemd-31 ) !systemd? ( app-admin/openrc-settingsd sys-auth/elogind ) x11-themes/adwaita-icon-theme colord? ( >=gnome-extra/gnome-color-manager-3 ) cups? ( app-admin/system-config-printer net-print/cups-pk-helper ) input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-control-center/archive/3.8.0.tar.gz -> cinnamon-control-center-3.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a20bec70eb33093600c23e38a0589dda
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-desktop-3.6.2 b/metadata/md5-cache/gnome-extra/cinnamon-desktop-3.6.2
index fea8dbf1b06c..a0048280f1ec 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-desktop-3.6.2
+++ b/metadata/md5-cache/gnome-extra/cinnamon-desktop-3.6.2
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0/4
 SRC_URI=https://github.com/linuxmint/cinnamon-desktop/archive/3.6.2.tar.gz -> cinnamon-desktop-3.6.2.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1cdd5061af382a294934d72bb7ef39bb
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-desktop-3.8.1 b/metadata/md5-cache/gnome-extra/cinnamon-desktop-3.8.1
index 4f14299e1342..a4a5cc41535c 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-desktop-3.8.1
+++ b/metadata/md5-cache/gnome-extra/cinnamon-desktop-3.8.1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0/4
 SRC_URI=https://github.com/linuxmint/cinnamon-desktop/archive/3.8.1.tar.gz -> cinnamon-desktop-3.8.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=43bdaaad60213951fb4ab28c0456fa97
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-menus-3.6.0 b/metadata/md5-cache/gnome-extra/cinnamon-menus-3.6.0
index 13691f3dbafb..205b84f56367 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-menus-3.6.0
+++ b/metadata/md5-cache/gnome-extra/cinnamon-menus-3.6.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=dev-libs/glib-2.29.15:2 introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-menus/archive/3.6.0.tar.gz -> cinnamon-menus-3.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2cccdbedfcb49b194d2f35c2e8262a7f
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-menus-3.8.2 b/metadata/md5-cache/gnome-extra/cinnamon-menus-3.8.2
index 11173f435137..49dda889d732 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-menus-3.8.2
+++ b/metadata/md5-cache/gnome-extra/cinnamon-menus-3.8.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=dev-libs/glib-2.29.15:2 introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-menus/archive/3.8.2.tar.gz -> cinnamon-menus-3.8.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=133daba6714cf25d9b9d890ebf7be455
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-screensaver-3.6.1-r1 b/metadata/md5-cache/gnome-extra/cinnamon-screensaver-3.6.1-r1
index 0cc4981471d3..9bebc1378cd5 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-screensaver-3.6.1-r1
+++ b/metadata/md5-cache/gnome-extra/cinnamon-screensaver-3.6.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=x11-libs/gtk+-3.1.4:3[introspection] >=
 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/linuxmint/cinnamon-screensaver/archive/3.6.1.tar.gz -> cinnamon-screensaver-3.6.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b6b237bd4525c67d370a389f47014758
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-screensaver-3.8.0 b/metadata/md5-cache/gnome-extra/cinnamon-screensaver-3.8.0
index 2dde3019ed65..ab99b54f73c4 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-screensaver-3.8.0
+++ b/metadata/md5-cache/gnome-extra/cinnamon-screensaver-3.8.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=x11-libs/gtk+-3.1.4:3[introspection] >=
 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/linuxmint/cinnamon-screensaver/archive/3.8.0.tar.gz -> cinnamon-screensaver-3.8.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a3ffc496f73d4d3716c41a03ad0f44b6
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-session-3.6.1-r4 b/metadata/md5-cache/gnome-extra/cinnamon-session-3.6.1-r4
index 0f96a1f8ae58..1393d211a2f4 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-session-3.6.1-r4
+++ b/metadata/md5-cache/gnome-extra/cinnamon-session-3.6.1-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
 RDEPEND=>=dev-libs/dbus-glib-0.88 >=dev-libs/glib-2.37.3:2 media-libs/libcanberra x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3:3 x11-libs/cairo x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X] virtual/opengl systemd? ( >=sys-apps/systemd-183 sys-auth/polkit ) !systemd? ( sys-power/upower sys-auth/polkit[elogind] ) >=gnome-extra/cinnamon-desktop-2.6[systemd=] !systemd? ( sys-auth/elogind[policykit] )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-session/archive/3.6.1.tar.gz -> cinnamon-session-3.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=79293e1cc141c622e41b94109e2934ba
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-session-3.8.0 b/metadata/md5-cache/gnome-extra/cinnamon-session-3.8.0
index 371c860c2b74..eb3cf696129e 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-session-3.8.0
+++ b/metadata/md5-cache/gnome-extra/cinnamon-session-3.8.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
 RDEPEND=>=dev-libs/dbus-glib-0.88 >=dev-libs/glib-2.37.3:2 media-libs/libcanberra x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3:3 x11-libs/cairo x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X] virtual/opengl systemd? ( >=sys-apps/systemd-183 sys-auth/polkit ) !systemd? ( sys-power/upower sys-auth/polkit[elogind] ) >=gnome-extra/cinnamon-desktop-2.6[systemd=] !systemd? ( sys-auth/elogind[policykit] )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-session/archive/3.8.0.tar.gz -> cinnamon-session-3.8.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=98fe14d538ff02e7055a47b69b461997
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-3.6.1-r1 b/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-3.6.1-r1
index 83266df6de7d..c7e1300a977a 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-3.6.1-r1
+++ b/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-3.6.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.38:2 >=gnome-base/libgnomekbd-3.6 >=gnome-base/librsvg
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-settings-daemon/archive/3.6.1.tar.gz -> cinnamon-settings-daemon-3.6.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=08f75d86703479fe8a572e917b2f860e
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-3.8.4 b/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-3.8.4
index 5b1871d821e6..931ce3238963 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-3.8.4
+++ b/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-3.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.38:2 >=gnome-base/libgnomekbd-3.6 >=gnome-base/librsvg
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-settings-daemon/archive/3.8.4.tar.gz -> cinnamon-settings-daemon-3.8.4.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=98d6476a16b674759fc3799fd87d9af3
diff --git a/metadata/md5-cache/gnome-extra/cjs-3.6.1 b/metadata/md5-cache/gnome-extra/cjs-3.6.1
index 3f0ad1800020..00d71e5760b9 100644
--- a/metadata/md5-cache/gnome-extra/cjs-3.6.1
+++ b/metadata/md5-cache/gnome-extra/cjs-3.6.1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/spidermonkey:38 >=dev-libs/glib-2.37.3:2 >=dev-libs/gobject-int
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cjs/archive/3.6.1.tar.gz -> cjs-3.6.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6c3ba181385a02506d6b4a16bc2b9011
diff --git a/metadata/md5-cache/gnome-extra/cjs-3.8.0 b/metadata/md5-cache/gnome-extra/cjs-3.8.0
index 18e0e1a714b7..b075f06c07c3 100644
--- a/metadata/md5-cache/gnome-extra/cjs-3.8.0
+++ b/metadata/md5-cache/gnome-extra/cjs-3.8.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/spidermonkey:52 >=dev-libs/glib-2.37.3:2 >=dev-libs/gobject-int
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cjs/archive/3.8.0.tar.gz -> cjs-3.8.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1570270fa46e73b35db49fb1d84dceac
diff --git a/metadata/md5-cache/gnome-extra/eiciel-0.9.11 b/metadata/md5-cache/gnome-extra/eiciel-0.9.11
index fc29ff4dfd23..ad2f035fd783 100644
--- a/metadata/md5-cache/gnome-extra/eiciel-0.9.11
+++ b/metadata/md5-cache/gnome-extra/eiciel-0.9.11
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/acl-2.2.32 >=dev-cpp/gtkmm-3:3.0 >=gnome-base/nautilus-3
 SLOT=0
 SRC_URI=http://rofi.roger-ferrer.org/eiciel/download/eiciel-0.9.11.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=d4df30084d2401753b1332d4dd92e98a
diff --git a/metadata/md5-cache/gnome-extra/eiciel-0.9.11-r1 b/metadata/md5-cache/gnome-extra/eiciel-0.9.11-r1
index e79ebb222580..7529a5c16515 100644
--- a/metadata/md5-cache/gnome-extra/eiciel-0.9.11-r1
+++ b/metadata/md5-cache/gnome-extra/eiciel-0.9.11-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/acl-2.2.32 >=dev-cpp/gtkmm-3:3.0 >=gnome-base/nautilus-3
 SLOT=0
 SRC_URI=http://rofi.roger-ferrer.org/eiciel/download/eiciel-0.9.11.tar.bz2
-_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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1c97f46f26758240a001be48b3d13642
diff --git a/metadata/md5-cache/gnome-extra/evolution-data-server-3.24.7 b/metadata/md5-cache/gnome-extra/evolution-data-server-3.24.7
index af6a7cb46419..b07f05eca91d 100644
--- a/metadata/md5-cache/gnome-extra/evolution-data-server-3.24.7
+++ b/metadata/md5-cache/gnome-extra/evolution-data-server-3.24.7
@@ -11,5 +11,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=test
 SLOT=0/60
 SRC_URI=mirror://gnome/sources/evolution-data-server/3.24/evolution-data-server-3.24.7.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3d2b75c395045cbf9883e11406503778
diff --git a/metadata/md5-cache/gnome-extra/evolution-data-server-3.26.6 b/metadata/md5-cache/gnome-extra/evolution-data-server-3.26.6
index 3cff8fedef02..ab3571bc653c 100644
--- a/metadata/md5-cache/gnome-extra/evolution-data-server-3.26.6
+++ b/metadata/md5-cache/gnome-extra/evolution-data-server-3.26.6
@@ -11,5 +11,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=test !test? ( test )
 SLOT=0/60
 SRC_URI=mirror://gnome/sources/evolution-data-server/3.26/evolution-data-server-3.26.6.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d7ab9ea26d15a5144173ce066e831114
diff --git a/metadata/md5-cache/gnome-extra/evolution-ews-3.24.6 b/metadata/md5-cache/gnome-extra/evolution-ews-3.24.6
index c12c51262095..84dd0df4f1fa 100644
--- a/metadata/md5-cache/gnome-extra/evolution-ews-3.24.6
+++ b/metadata/md5-cache/gnome-extra/evolution-ews-3.24.6
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3= >=dev-libs/glib-2.46:2 dev-libs/libical:0= >=dev-libs/l
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/evolution-ews/3.24/evolution-ews-3.24.6.tar.xz
-_eclasses_=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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4d1a60c799bfb9e5ac53c49a14e1aa65
diff --git a/metadata/md5-cache/gnome-extra/evolution-ews-3.26.6 b/metadata/md5-cache/gnome-extra/evolution-ews-3.26.6
index b7a7154aa4dd..29023efbff8c 100644
--- a/metadata/md5-cache/gnome-extra/evolution-ews-3.26.6
+++ b/metadata/md5-cache/gnome-extra/evolution-ews-3.26.6
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3= >=dev-libs/glib-2.46:2 dev-libs/libical:0= >=dev-libs/l
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/evolution-ews/3.26/evolution-ews-3.26.6.tar.xz
-_eclasses_=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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d117637522a82881353b2ff789d0498b
diff --git a/metadata/md5-cache/gnome-extra/gconf-editor-3.0.1-r1 b/metadata/md5-cache/gnome-extra/gconf-editor-3.0.1-r1
index 3b82b22efcf4..d4b9f047511d 100644
--- a/metadata/md5-cache/gnome-extra/gconf-editor-3.0.1-r1
+++ b/metadata/md5-cache/gnome-extra/gconf-editor-3.0.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-3.0.0:3 >=gnome-base/gconf-2.12:2
 SLOT=0
 SRC_URI=mirror://gnome/sources/gconf-editor/3.0/gconf-editor-3.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8f25437a898f499248f9163fedcbfe52
diff --git a/metadata/md5-cache/gnome-extra/gnome-boxes-3.24.1-r1 b/metadata/md5-cache/gnome-extra/gnome-boxes-3.24.1-r1
index 9a0833755ccf..08eb2a6b1907 100644
--- a/metadata/md5-cache/gnome-extra/gnome-boxes-3.24.1-r1
+++ b/metadata/md5-cache/gnome-extra/gnome-boxes-3.24.1-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=app-arch/libarchive-3:= >=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-0.9.6:= >=dev-libs/libxml2-2.7.8:2 >=sys-libs/libosinfo-0.2.12 >=app-emulation/qemu-1.3.1[spice,smartcard,usbredir] >=app-emulation/libvirt-0.9.3[libvirtd,qemu] >=app-emulation/libvirt-glib-0.2.3 >=x11-libs/gtk+-3.19.8:3 >=net-libs/gtk-vnc-0.4.4[gtk3(+)] app-crypt/libsecret app-emulation/spice[smartcard] >=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir] virtual/libusb:1 >=app-misc/tracker-0.16:0=[iso] >=sys-apps/util-linux-2.20 >=net-libs/libsoup-2.38:2.4 sys-fs/mtools >=virtual/libgudev-165:=
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-boxes/3.24/gnome-boxes-3.24.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bf050d8c1883dcb0c4a41eb53346d877
diff --git a/metadata/md5-cache/gnome-extra/gnome-calculator-3.24.0 b/metadata/md5-cache/gnome-extra/gnome-calculator-3.24.0
index 21c819453372..deee7fa4d2bd 100644
--- a/metadata/md5-cache/gnome-extra/gnome-calculator-3.24.0
+++ b/metadata/md5-cache/gnome-extra/gnome-calculator-3.24.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.40:2 dev-libs/libxml2:2 dev-libs/mpfr:0= dev-libs/mpc:= >=net-libs/libsoup-2.42:2.4 >=x11-libs/gtk+-3.19.3:3 >=x11-libs/gtksourceview-3.15.1:3.0 !<gnome-extra/gnome-utils-2.3 !gnome-extra/gcalctool
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-calculator/3.24/gnome-calculator-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1bfce13993582cd76ec6a3b640fea6d6
diff --git a/metadata/md5-cache/gnome-extra/gnome-calculator-3.30.0 b/metadata/md5-cache/gnome-extra/gnome-calculator-3.30.0
index f9f4117bf2c9..a880d0376e21 100644
--- a/metadata/md5-cache/gnome-extra/gnome-calculator-3.30.0
+++ b/metadata/md5-cache/gnome-extra/gnome-calculator-3.30.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.40:2 >=x11-libs/gtk+-3.19.3:3 >=x11-libs/gtksourceview-3.15.1:3.0[vala] >=net-libs/libsoup-2.42:2.4 dev-libs/libxml2:2 dev-libs/mpc:= dev-libs/mpfr:0=
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-calculator/3.30/gnome-calculator-3.30.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9e962ebf432e45c4afedde2b0712d61b
diff --git a/metadata/md5-cache/gnome-extra/gnome-calculator-3.30.1 b/metadata/md5-cache/gnome-extra/gnome-calculator-3.30.1
index e124dd1b1cc3..6341899be6da 100644
--- a/metadata/md5-cache/gnome-extra/gnome-calculator-3.30.1
+++ b/metadata/md5-cache/gnome-extra/gnome-calculator-3.30.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.40:2 >=x11-libs/gtk+-3.19.3:3 >=x11-libs/gtksourceview-3.15.1:3.0[vala] >=net-libs/libsoup-2.42:2.4 dev-libs/libxml2:2 dev-libs/mpc:= dev-libs/mpfr:0=
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-calculator/3.30/gnome-calculator-3.30.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1bc0cc70fff41e117f9e328a5900dfe0
diff --git a/metadata/md5-cache/gnome-extra/gnome-calendar-3.24.3 b/metadata/md5-cache/gnome-extra/gnome-calendar-3.24.3
index 44bf518bff64..31837222008d 100644
--- a/metadata/md5-cache/gnome-extra/gnome-calendar-3.24.3
+++ b/metadata/md5-cache/gnome-extra/gnome-calendar-3.24.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.43.4:2 >=x11-libs/gtk+-3.21.6:3 >=gnome-extra/evolution-data-server-3.17.1:= >=dev-libs/libical-1.0.1:0= net-libs/libsoup:2.4 >=net-libs/gnome-online-accounts-3.2.0:= >=gnome-base/gsettings-desktop-schemas-3.21.2 dev-libs/appstream-glib dev-util/gdbus-codegen >=dev-util/intltool-0.40.6 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
+DEPEND=>=dev-libs/glib-2.43.4:2 >=x11-libs/gtk+-3.21.6:3 >=gnome-extra/evolution-data-server-3.17.1:= >=dev-libs/libical-1.0.1:0= net-libs/libsoup:2.4 >=net-libs/gnome-online-accounts-3.2.0:= >=gnome-base/gsettings-desktop-schemas-3.21.2 dev-libs/appstream-glib dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/intltool-0.40.6 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
 DESCRIPTION=Manage your online calendars with simple and modern interface
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Calendar
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.43.4:2 >=x11-libs/gtk+-3.21.6:3 >=gnome-extra/evolution-data-server-3.17.1:= >=dev-libs/libical-1.0.1:0= net-libs/libsoup:2.4 >=net-libs/gnome-online-accounts-3.2.0:= >=gnome-base/gsettings-desktop-schemas-3.21.2
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-calendar/3.24/gnome-calendar-3.24.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=66f4dafc91efdf53947940d6ef21a618
+_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_=ba4156cb710ff83f0a328e9c49316327
diff --git a/metadata/md5-cache/gnome-extra/gnome-characters-3.24.0 b/metadata/md5-cache/gnome-extra/gnome-characters-3.24.0
index a9a7272a04cf..a6131312eadd 100644
--- a/metadata/md5-cache/gnome-extra/gnome-characters-3.24.0
+++ b/metadata/md5-cache/gnome-extra/gnome-characters-3.24.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 BSD
 RDEPEND=>=dev-libs/gjs-1.43.3 >=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.35.9:= >=dev-libs/libunistring-0.9.5 >=x11-libs/gtk+-3.20:3[introspection] >=x11-libs/pango-1.36[introspection]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-characters/3.24/gnome-characters-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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5dfd469aef7f58b04600477ccbf27d5c
diff --git a/metadata/md5-cache/gnome-extra/gnome-characters-3.26.2 b/metadata/md5-cache/gnome-extra/gnome-characters-3.26.2
index 70dbb01acef3..b5e393de4550 100644
--- a/metadata/md5-cache/gnome-extra/gnome-characters-3.26.2
+++ b/metadata/md5-cache/gnome-extra/gnome-characters-3.26.2
@@ -9,5 +9,5 @@ RDEPEND=>=dev-libs/gjs-1.43.3 >=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-characters/3.26/gnome-characters-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d366793f67deb25d71e6e32c2549fc75
diff --git a/metadata/md5-cache/gnome-extra/gnome-clocks-3.24.0 b/metadata/md5-cache/gnome-extra/gnome-clocks-3.24.0
index 436b280d0367..03c74601d966 100644
--- a/metadata/md5-cache/gnome-extra/gnome-clocks-3.24.0
+++ b/metadata/md5-cache/gnome-extra/gnome-clocks-3.24.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-misc/geoclue-2.3.1:2.0 >=dev-libs/glib-2.44:2 >=dev-libs/libgweather-3.13.91:2= >=gnome-base/gnome-desktop-3.7.90:3= >=media-libs/gsound-0.98 >=sci-geosciences/geocode-glib-0.99.4 >=x11-libs/gtk+-3.19.8:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-clocks/3.24/gnome-clocks-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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b6d04001437818a9cf538bdc827b13a1
diff --git a/metadata/md5-cache/gnome-extra/gnome-color-manager-3.24.0 b/metadata/md5-cache/gnome-extra/gnome-color-manager-3.24.0
index 9fdd2af6b1e5..80ba581c2796 100644
--- a/metadata/md5-cache/gnome-extra/gnome-color-manager-3.24.0
+++ b/metadata/md5-cache/gnome-extra/gnome-color-manager-3.24.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.31.10:2 >=media-libs/lcms-2.2:2 >=media-libs/libcanberra-0.10[gtk3] media-libs/libexif media-libs/tiff:0= >=x11-libs/gtk+-3.3.8:3 >=x11-libs/vte-0.25.1:2.91 >=x11-misc/colord-1.3.1:0= >=x11-libs/colord-gtk-0.1.20 packagekit? ( app-admin/packagekit-base ) raw? ( media-gfx/exiv2:0= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-color-manager/3.24/gnome-color-manager-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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=025abfdb46d00dd378869a7c49b29593
diff --git a/metadata/md5-cache/gnome-extra/gnome-commander-1.6.3 b/metadata/md5-cache/gnome-extra/gnome-commander-1.6.3
index 10191a67b24f..68f5bd462190 100644
--- a/metadata/md5-cache/gnome-extra/gnome-commander-1.6.3
+++ b/metadata/md5-cache/gnome-extra/gnome-commander-1.6.3
@@ -10,5 +10,5 @@ RDEPEND=app-text/gnome-doc-utils >=dev-libs/glib-2.44.0:2 unique? ( >=dev-libs/l
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-commander/1.6/gnome-commander-1.6.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=e63c0d5642b0b917ff49c17e54754329
diff --git a/metadata/md5-cache/gnome-extra/gnome-commander-1.6.4 b/metadata/md5-cache/gnome-extra/gnome-commander-1.6.4
index ea13c44165b0..a7af333392c7 100644
--- a/metadata/md5-cache/gnome-extra/gnome-commander-1.6.4
+++ b/metadata/md5-cache/gnome-extra/gnome-commander-1.6.4
@@ -10,5 +10,5 @@ RDEPEND=app-text/gnome-doc-utils >=dev-libs/glib-2.44.0:2 unique? ( >=dev-libs/l
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-commander/1.6/gnome-commander-1.6.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1de77fd2e5a620cfd20510c72551ab4f
diff --git a/metadata/md5-cache/gnome-extra/gnome-commander-1.8.0 b/metadata/md5-cache/gnome-extra/gnome-commander-1.8.0
index 7afc84c5f84c..a503c837720d 100644
--- a/metadata/md5-cache/gnome-extra/gnome-commander-1.8.0
+++ b/metadata/md5-cache/gnome-extra/gnome-commander-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=app-text/yelp-tools >=dev-libs/glib-2.44.0:2 unique? ( >=dev-libs/libuni
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-commander/1.8/gnome-commander-1.8.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=c81937df4252f8ebb3c5e8f90715fa8e
diff --git a/metadata/md5-cache/gnome-extra/gnome-commander-1.8.1 b/metadata/md5-cache/gnome-extra/gnome-commander-1.8.1
index bafa21c44dc6..281f83085c40 100644
--- a/metadata/md5-cache/gnome-extra/gnome-commander-1.8.1
+++ b/metadata/md5-cache/gnome-extra/gnome-commander-1.8.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/yelp-tools >=dev-libs/glib-2.44.0:2 unique? ( >=dev-libs/libunique-0.9.3:1 ) gnome-base/gnome-keyring >=gnome-base/gnome-vfs-2.0.0 >=gnome-base/libgnome-2.0.0 >=gnome-base/libgnomeui-2.4.0 >=x11-libs/gtk+-2.18.0:2 chm? ( dev-libs/chmlib ) exif? ( >=media-gfx/exiv2-0.14 ) gsf? ( >=gnome-extra/libgsf-1.12.0 ) samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] ) pdf? ( >=app-text/poppler-0.18 ) taglib? ( >=media-libs/taglib-1.4 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-commander/1.8/gnome-commander-1.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4962f1883eba6c2019ce6875e18050d0
diff --git a/metadata/md5-cache/gnome-extra/gnome-contacts-3.22.1-r1 b/metadata/md5-cache/gnome-extra/gnome-contacts-3.22.1-r1
index f9e0a5dc0b72..89c8ea2ea360 100644
--- a/metadata/md5-cache/gnome-extra/gnome-contacts-3.22.1-r1
+++ b/metadata/md5-cache/gnome-extra/gnome-contacts-3.22.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/folks-0.11.4:=[eds,telepathy] >=dev-libs/glib-2.37.6:2 >=dev-libs/libgee-0.10:0.8 >=gnome-extra/evolution-data-server-3.13.90:=[gnome-online-accounts] >=gnome-base/gnome-desktop-3.0:3= media-libs/clutter:1.0 media-libs/clutter-gtk:1.0 media-libs/libchamplain:0.12 net-libs/gnome-online-accounts:= >=net-libs/telepathy-glib-0.17.5 >=sci-geosciences/geocode-glib-3.15.3 x11-libs/cairo:= x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.20.0:3 x11-libs/pango v4l? ( >=media-video/cheese-3.5.91:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-contacts/3.22/gnome-contacts-3.22.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=983366c80a5c9a9e9a7f099e3151b742
diff --git a/metadata/md5-cache/gnome-extra/gnome-directory-thumbnailer-0.1.10 b/metadata/md5-cache/gnome-extra/gnome-directory-thumbnailer-0.1.10
index 3efb688f26fd..202b3ec3a544 100644
--- a/metadata/md5-cache/gnome-extra/gnome-directory-thumbnailer-0.1.10
+++ b/metadata/md5-cache/gnome-extra/gnome-directory-thumbnailer-0.1.10
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.35:2 >=x11-libs/gdk-pixbuf-2.36.5:2 >=gnome-base/gnome-desktop-2.2:3= x11-libs/gtk+:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-directory-thumbnailer/0.1/gnome-directory-thumbnailer-0.1.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d4e8f55d9ff29ab010e3596cd1eecfb9
diff --git a/metadata/md5-cache/gnome-extra/gnome-documents-3.24.3 b/metadata/md5-cache/gnome-extra/gnome-documents-3.24.3
index 1a210795b80d..74297dec220e 100644
--- a/metadata/md5-cache/gnome-extra/gnome-documents-3.24.3
+++ b/metadata/md5-cache/gnome-extra/gnome-documents-3.24.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-text/evince-3.13.3[introspection] >=net-libs/webkit-gtk-2.6:4[introspection] dev-libs/gjs >=dev-libs/glib-2.39.3:2 >=dev-libs/gobject-introspection-1.31.6:= >=x11-libs/gtk+-3.22.10:3[introspection] >=net-libs/libsoup-2.41.3:2.4 gnome-base/gnome-desktop:3=[introspection] >=app-misc/tracker-1:=[miner-fs] >=x11-libs/cairo-1.14 >=dev-libs/libgdata-0.13.3:=[crypt,gnome-online-accounts,introspection] x11-libs/gdk-pixbuf:2[introspection] >=net-libs/gnome-online-accounts-3.2.0[introspection] x11-libs/pango[introspection] >=net-libs/libzapojit-0.0.2[introspection] >=app-text/libgepub-0.4[introspection] net-misc/gnome-online-miners sys-apps/dbus x11-themes/adwaita-icon-theme
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-documents/3.24/gnome-documents-3.24.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a7dcd0b93853c59b4988b0b319cf970e
diff --git a/metadata/md5-cache/gnome-extra/gnome-dvb-daemon-0.2.90 b/metadata/md5-cache/gnome-extra/gnome-dvb-daemon-0.2.90
index 0d287bf78ba1..589e2967dded 100644
--- a/metadata/md5-cache/gnome-extra/gnome-dvb-daemon-0.2.90
+++ b/metadata/md5-cache/gnome-extra/gnome-dvb-daemon-0.2.90
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.4.0:1.0 >=media-libs/gst-plugins-good-1.4.0:1.0 >=media-libs/gst-plugins-bad-1.4.0:1.0 >=dev-libs/libgee-0.8:0.8 >=dev-db/sqlite-3.4:3 >=media-libs/gst-rtsp-server-1.4.5:1.0 media-plugins/gst-plugins-dvb:1.0 dev-python/gst-python:1.0 >=dev-python/pygobject-3.2.1:3 >=dev-libs/gobject-introspection-1.44.0:0 x11-libs/gtk+:3[introspection] virtual/libgudev:0 vala? ( || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) ) totem? ( media-video/totem )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-dvb-daemon/0.2/gnome-dvb-daemon-0.2.90.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-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4886600dc206a9778fa7e8cdf13f9c59
diff --git a/metadata/md5-cache/gnome-extra/gnome-getting-started-docs-3.24.1 b/metadata/md5-cache/gnome-extra/gnome-getting-started-docs-3.24.1
index e582fa65fd8f..ba6159dca49f 100644
--- a/metadata/md5-cache/gnome-extra/gnome-getting-started-docs-3.24.1
+++ b/metadata/md5-cache/gnome-extra/gnome-getting-started-docs-3.24.1
@@ -9,5 +9,5 @@ RDEPEND=gnome-extra/gnome-user-docs
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-getting-started-docs/3.24/gnome-getting-started-docs-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ca482646e1c7ab1ca299cf5c76fdb6a9
diff --git a/metadata/md5-cache/gnome-extra/gnome-integration-spotify-20140907-r1 b/metadata/md5-cache/gnome-extra/gnome-integration-spotify-20140907-r1
index 5f401ab4a748..0e4c89f7639e 100644
--- a/metadata/md5-cache/gnome-extra/gnome-integration-spotify-20140907-r1
+++ b/metadata/md5-cache/gnome-extra/gnome-integration-spotify-20140907-r1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/mrpdaemon/gnome-integration-spotify/archive/20140907.tar.gz -> gnome-integration-spotify-20140907.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=727207dbac141501ed08dab4401011d9
diff --git a/metadata/md5-cache/gnome-extra/gnome-logs-3.24.2 b/metadata/md5-cache/gnome-extra/gnome-logs-3.24.2
index c53ecf9b9fea..894f58e41d40 100644
--- a/metadata/md5-cache/gnome-extra/gnome-logs-3.24.2
+++ b/metadata/md5-cache/gnome-extra/gnome-logs-3.24.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.43.90:2 gnome-base/gsettings-desktop-schemas sys-apps/systemd:= >=x11-libs/gtk+-3.19.3:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-logs/3.24/gnome-logs-3.24.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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b93a4b78b2ecb49a889020b8e7669215
diff --git a/metadata/md5-cache/gnome-extra/gnome-packagekit-3.24.0 b/metadata/md5-cache/gnome-extra/gnome-packagekit-3.24.0
index 60ab7b139d91..e02f14a783d5 100644
--- a/metadata/md5-cache/gnome-extra/gnome-packagekit-3.24.0
+++ b/metadata/md5-cache/gnome-extra/gnome-packagekit-3.24.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.32:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.15.3:3 >=x11-libs/libnotify-0.7.0:= x11-libs/pango >=app-admin/packagekit-base-0.9.1 >=media-libs/libcanberra-0.10[gtk3] >=sys-apps/dbus-1.1.2 media-libs/fontconfig x11-libs/libX11 systemd? ( >=sys-apps/systemd-42 ) !systemd? ( sys-auth/consolekit ) udev? ( virtual/libgudev:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-packagekit/3.24/gnome-packagekit-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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3d8c774840859c0b71b22c3cf3365317
diff --git a/metadata/md5-cache/gnome-extra/gnome-power-manager-3.24.0 b/metadata/md5-cache/gnome-extra/gnome-power-manager-3.24.0
index db217e788a78..7c0087e82b00 100644
--- a/metadata/md5-cache/gnome-extra/gnome-power-manager-3.24.0
+++ b/metadata/md5-cache/gnome-extra/gnome-power-manager-3.24.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.45.8:2 >=x11-libs/gtk+-3.3.8:3 >=x11-libs/cairo-1 >=sys-power/upower-0.99:= x11-themes/adwaita-icon-theme
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-power-manager/3.24/gnome-power-manager-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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=be1dc1e3f882b406b0bddf543a4569b3
diff --git a/metadata/md5-cache/gnome-extra/gnome-search-tool-3.6.0 b/metadata/md5-cache/gnome-extra/gnome-search-tool-3.6.0
index 4ea6db9128ae..7296987f2ec4 100644
--- a/metadata/md5-cache/gnome-extra/gnome-search-tool-3.6.0
+++ b/metadata/md5-cache/gnome-extra/gnome-search-tool-3.6.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2 FDL-1.1
 RDEPEND=dev-libs/atk >=dev-libs/glib-2.30:2 sys-apps/grep x11-libs/gdk-pixbuf >=x11-libs/gtk+-3:3[X] x11-libs/libICE x11-libs/libSM sys-apps/findutils || ( sys-apps/mlocate sys-freebsd/freebsd-ubin ) !<gnome-extra/gnome-utils-3.4
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-search-tool/3.6/gnome-search-tool-3.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0ca1910c7da134ad3c77b46debfa89af
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
index eb03597bbd58..be2547d35c07 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-11-r1
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-11-r1
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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 ef68e44e97fe..2cacd855cb4c 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-12
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-12
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.24.3 b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.24.3
index e197d9981fef..eda609e90cf0 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.24.3
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.24.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.26:2 >=gnome-base/libgtop-2.28.3[introspection] >=app-eselect/eselect-gnome-shell-extensions-20111211 >=dev-libs/gjs-1.29 dev-libs/gobject-introspection:= dev-libs/atk[introspection] gnome-base/gnome-menus:3[introspection] >=gnome-base/gnome-shell-3.14.2 media-libs/clutter:1.0[introspection] net-libs/telepathy-glib[introspection] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] x11-themes/adwaita-icon-theme x11-wm/mutter[introspection]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-shell-extensions/3.24/gnome-shell-extensions-3.24.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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4d3c4858f5da64a73aa5a99ebbe50017
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.26.2-r1 b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.26.2-r1
index 4c8ea69c2360..8e0b511b10da 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.26.2-r1
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.26.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.26:2 >=gnome-base/libgtop-2.28.3[introspection] >=app-eselect/eselect-gnome-shell-extensions-20111211 >=dev-libs/gjs-1.29 dev-libs/gobject-introspection:= dev-libs/atk[introspection] gnome-base/gnome-menus:3[introspection] >=gnome-base/gnome-shell-3.14.2 media-libs/clutter:1.0[introspection] net-libs/telepathy-glib[introspection] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] x11-themes/adwaita-icon-theme x11-wm/mutter[introspection]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-shell-extensions/3.26/gnome-shell-extensions-3.26.2.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-shell-extensions-3.26.2-patchset.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3538aaf8c630572b66f92bbde42a5c5e
diff --git a/metadata/md5-cache/gnome-extra/gnome-software-3.22.7 b/metadata/md5-cache/gnome-extra/gnome-software-3.22.7
index 0df10e989cd2..c5506ffe6b30 100644
--- a/metadata/md5-cache/gnome-extra/gnome-software-3.22.7
+++ b/metadata/md5-cache/gnome-extra/gnome-software-3.22.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-admin/packagekit-base-1.1.0 app-crypt/libsecret dev-db/sqlite:3 >=dev-libs/appstream-glib-0.6.7:0 >=dev-libs/glib-2.46:2 >=dev-libs/json-glib-1.1.1 >=gnome-base/gsettings-desktop-schemas-3.11.5 >=net-libs/libsoup-2.51.92:2.4 sys-auth/polkit >=x11-libs/gdk-pixbuf-2.31.5 >=x11-libs/gtk+-3.20:3 gnome? ( >=gnome-base/gnome-desktop-3.17.92:3= ) spell? ( app-text/gtkspell:3 ) udev? ( virtual/libgudev )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-software/3.22/gnome-software-3.22.7.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-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=657923b56ff318529a27d565daf16dc7
diff --git a/metadata/md5-cache/gnome-extra/gnome-system-monitor-3.24.0 b/metadata/md5-cache/gnome-extra/gnome-system-monitor-3.24.0
index 3517934f2cb7..9cb20eb4d2d9 100644
--- a/metadata/md5-cache/gnome-extra/gnome-system-monitor-3.24.0
+++ b/metadata/md5-cache/gnome-extra/gnome-system-monitor-3.24.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.37.3:2 >=gnome-base/libgtop-2.28.2:2= >=x11-libs/gtk+-3.22:3[X(+)] >=dev-cpp/gtkmm-3.3.18:3.0 >=dev-cpp/glibmm-2.46:2 >=dev-libs/libxml2-2.0:2 >=gnome-base/librsvg-2.35:2 systemd? ( >=sys-apps/systemd-44:0= ) X? ( >=x11-libs/libwnck-2.91.0:3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-system-monitor/3.24/gnome-system-monitor-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=767a57c491d4453c5b65bbec7781187d
diff --git a/metadata/md5-cache/gnome-extra/gnome-system-monitor-3.26.0 b/metadata/md5-cache/gnome-extra/gnome-system-monitor-3.26.0
index 460000f8e36d..3724d0f9746d 100644
--- a/metadata/md5-cache/gnome-extra/gnome-system-monitor-3.26.0
+++ b/metadata/md5-cache/gnome-extra/gnome-system-monitor-3.26.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.37.3:2 >=gnome-base/libgtop-2.37.2:2= >=x11-libs/gtk+-3.22:3[X(+)] >=dev-cpp/gtkmm-3.3.18:3.0 >=dev-cpp/glibmm-2.46:2 >=dev-libs/libxml2-2.0:2 >=gnome-base/librsvg-2.35:2 systemd? ( >=sys-apps/systemd-44:0= ) X? ( >=x11-libs/libwnck-2.91.0:3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-system-monitor/3.26/gnome-system-monitor-3.26.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ca9783c83225896ecca3463a2ced9c61
diff --git a/metadata/md5-cache/gnome-extra/gnome-tweak-tool-3.22.0 b/metadata/md5-cache/gnome-extra/gnome-tweak-tool-3.22.0
index 5927c2d186f3..7a9351d8a4ef 100644
--- a/metadata/md5-cache/gnome-extra/gnome-tweak-tool-3.22.0
+++ b/metadata/md5-cache/gnome-extra/gnome-tweak-tool-3.22.0
@@ -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=mirror://gnome/sources/gnome-tweak-tool/3.22/gnome-tweak-tool-3.22.0.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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6f2756f0e30b94f4fd01596b4a0cc56d
diff --git a/metadata/md5-cache/gnome-extra/gnome-tweak-tool-3.24.1 b/metadata/md5-cache/gnome-extra/gnome-tweak-tool-3.24.1
index 10ca479152d3..98a9f37b9bfc 100644
--- a/metadata/md5-cache/gnome-extra/gnome-tweak-tool-3.24.1
+++ b/metadata/md5-cache/gnome-extra/gnome-tweak-tool-3.24.1
@@ -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=mirror://gnome/sources/gnome-tweak-tool/3.24/gnome-tweak-tool-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	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ec3b035f9071e8dc5974c85aa60b5169
diff --git a/metadata/md5-cache/gnome-extra/gnome-user-docs-3.24.2 b/metadata/md5-cache/gnome-extra/gnome-user-docs-3.24.2
index 109ad39fdfbb..c3f759c3eb18 100644
--- a/metadata/md5-cache/gnome-extra/gnome-user-docs-3.24.2
+++ b/metadata/md5-cache/gnome-extra/gnome-user-docs-3.24.2
@@ -9,5 +9,5 @@ LICENSE=CC-BY-3.0
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-user-docs/3.24/gnome-user-docs-3.24.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6a2f14e98c12e128c027731f550a6068
diff --git a/metadata/md5-cache/gnome-extra/gnome-user-share-3.18.3 b/metadata/md5-cache/gnome-extra/gnome-user-share-3.18.3
index bbcf972ab4cb..a734c4626b25 100644
--- a/metadata/md5-cache/gnome-extra/gnome-user-share-3.18.3
+++ b/metadata/md5-cache/gnome-extra/gnome-user-share-3.18.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.28:2 >=x11-libs/gtk+-3:3 >=gnome-base/nautilus-2.91.7 media-libs/libcanberra[gtk3] >=www-apache/mod_dnssd-0.6 >=www-servers/apache-2.2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile] >=x11-libs/libnotify-0.7:=
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-user-share/3.18/gnome-user-share-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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bed9a7c1c40ac907d2eaf73a37667cc8
diff --git a/metadata/md5-cache/gnome-extra/gnome-weather-3.24.0 b/metadata/md5-cache/gnome-extra/gnome-weather-3.24.0
index 87ea3b5b730a..09bd1c76176f 100644
--- a/metadata/md5-cache/gnome-extra/gnome-weather-3.24.0
+++ b/metadata/md5-cache/gnome-extra/gnome-weather-3.24.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0
 RDEPEND=>=app-misc/geoclue-2.3.1:2.0 >=dev-libs/gjs-1.43.3 >=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.35.9:= >=dev-libs/libgweather-3.17.2:= gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.11.4:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-weather/3.24/gnome-weather-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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7ce32a954d742f207259744de403fb61
diff --git a/metadata/md5-cache/gnome-extra/gnome-weather-3.26.0 b/metadata/md5-cache/gnome-extra/gnome-weather-3.26.0
index 57c0e8b031f0..d82bec588c03 100644
--- a/metadata/md5-cache/gnome-extra/gnome-weather-3.26.0
+++ b/metadata/md5-cache/gnome-extra/gnome-weather-3.26.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0
 RDEPEND=>=app-misc/geoclue-2.3.1:2.0 >=dev-libs/gjs-1.50 >=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.35.9:= >=dev-libs/libgweather-3.25.91:= gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.11.4:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-weather/3.26/gnome-weather-3.26.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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ec3d624be26ae9c942fd9d8e8230818f
diff --git a/metadata/md5-cache/gnome-extra/gtkhtml-4.10.0 b/metadata/md5-cache/gnome-extra/gtkhtml-4.10.0
index 426e9be460d9..0ff7442c8d47 100644
--- a/metadata/md5-cache/gnome-extra/gtkhtml-4.10.0
+++ b/metadata/md5-cache/gnome-extra/gtkhtml-4.10.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=x11-libs/gtk+-3.2:3 >=x11-libs/cairo-1.10:= x11-libs/pango >=app-text/enchant-1.1.7:= gnome-base/gsettings-desktop-schemas >=app-text/iso-codes-0.49 >=net-libs/libsoup-2.26.0:2.4 x11-base/xorg-proto sys-devel/gettext >=dev-util/intltool-0.40.0 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=>=x11-libs/gtk+-3.2:3 >=x11-libs/cairo-1.10:= x11-libs/pango >=app-text/enchant-1.1.7:= gnome-base/gsettings-desktop-schemas >=app-text/iso-codes-0.49 >=net-libs/libsoup-2.26.0:2.4 x11-base/xorg-proto sys-devel/gettext dev-util/glib-utils >=dev-util/intltool-0.40.0 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=Lightweight HTML rendering/printing/editing engine
 EAPI=5
 HOMEPAGE=https://git.gnome.org/browse/gtkhtml
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=x11-libs/gtk+-3.2:3 >=x11-libs/cairo-1.10:= x11-libs/pango >=app-text/enchant-1.1.7:= gnome-base/gsettings-desktop-schemas >=app-text/iso-codes-0.49 >=net-libs/libsoup-2.26.0:2.4
 SLOT=4.0
 SRC_URI=mirror://gnome/sources/gtkhtml/4.10/gtkhtml-4.10.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=a18c8d41898ecc93ea026baedefa52e8
+_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_=30314b1d283702fb379e155c42be41ff
diff --git a/metadata/md5-cache/gnome-extra/gucharmap-10.0.0 b/metadata/md5-cache/gnome-extra/gucharmap-10.0.0
index 8646a4a0d222..f1373915c605 100644
--- a/metadata/md5-cache/gnome-extra/gucharmap-10.0.0
+++ b/metadata/md5-cache/gnome-extra/gucharmap-10.0.0
@@ -10,5 +10,5 @@ RDEPEND==app-i18n/unicode-data-10.0* >=dev-libs/glib-2.32:2 >=x11-libs/pango-1.2
 REQUIRED_USE=vala? ( introspection )
 SLOT=2.90
 SRC_URI=mirror://gnome/sources/gucharmap/10.0/gucharmap-10.0.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1ff69a6edac6a879f16b1dda36ab0bf2
diff --git a/metadata/md5-cache/gnome-extra/gucharmap-10.0.3 b/metadata/md5-cache/gnome-extra/gucharmap-10.0.3
index 5b3b713d7fcf..2d013c009e5b 100644
--- a/metadata/md5-cache/gnome-extra/gucharmap-10.0.3
+++ b/metadata/md5-cache/gnome-extra/gucharmap-10.0.3
@@ -10,5 +10,5 @@ RDEPEND==app-i18n/unicode-data-10.0* >=dev-libs/glib-2.32:2 >=x11-libs/pango-1.2
 REQUIRED_USE=vala? ( introspection )
 SLOT=2.90
 SRC_URI=mirror://gnome/sources/gucharmap/10.0/gucharmap-10.0.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6a3d1ff8883c964dbcf6d2f820f4e04a
diff --git a/metadata/md5-cache/gnome-extra/gucharmap-3.0.1-r200 b/metadata/md5-cache/gnome-extra/gucharmap-3.0.1-r200
index 850e9c5c7035..34c67fcb94f5 100644
--- a/metadata/md5-cache/gnome-extra/gucharmap-3.0.1-r200
+++ b/metadata/md5-cache/gnome-extra/gucharmap-3.0.1-r200
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.16.3:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs/gtk+-2.14.0:2[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gucharmap/3.0/gucharmap-3.0.1.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=1d958aecc3287fbe4a0da2cda2bff82a
diff --git a/metadata/md5-cache/gnome-extra/gucharmap-9.0.2 b/metadata/md5-cache/gnome-extra/gucharmap-9.0.2
index 000816e174a7..82234b9cd841 100644
--- a/metadata/md5-cache/gnome-extra/gucharmap-9.0.2
+++ b/metadata/md5-cache/gnome-extra/gucharmap-9.0.2
@@ -10,5 +10,5 @@ RDEPEND==app-i18n/unicode-data-9.0* >=dev-libs/glib-2.32:2 >=x11-libs/pango-1.2.
 REQUIRED_USE=vala? ( introspection )
 SLOT=2.90
 SRC_URI=mirror://gnome/sources/gucharmap/9.0/gucharmap-9.0.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6f476aaf03183f20a67496d3ed215e47
diff --git a/metadata/md5-cache/gnome-extra/gucharmap-9.0.4 b/metadata/md5-cache/gnome-extra/gucharmap-9.0.4
index d8ec88d3fcee..c7ca9344cb9b 100644
--- a/metadata/md5-cache/gnome-extra/gucharmap-9.0.4
+++ b/metadata/md5-cache/gnome-extra/gucharmap-9.0.4
@@ -10,5 +10,5 @@ RDEPEND==app-i18n/unicode-data-9.0* >=dev-libs/glib-2.32:2 >=x11-libs/pango-1.2.
 REQUIRED_USE=vala? ( introspection )
 SLOT=2.90
 SRC_URI=mirror://gnome/sources/gucharmap/9.0/gucharmap-9.0.4.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6f476aaf03183f20a67496d3ed215e47
diff --git a/metadata/md5-cache/gnome-extra/libgda-5.2.4-r2 b/metadata/md5-cache/gnome-extra/libgda-5.2.4-r2
index 01e19be718e4..b4052a92206e 100644
--- a/metadata/md5-cache/gnome-extra/libgda-5.2.4-r2
+++ b/metadata/md5-cache/gnome-extra/libgda-5.2.4-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=reports? ( python_targets_python2_7 ) canvas? ( gtk ) graphviz? ( g
 RESTRICT=test firebird? ( bindist )
 SLOT=5/4
 SRC_URI=mirror://gnome/sources/libgda/5.2/libgda-5.2.4.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dc2a122ee3357e9b493dfaa647285964
diff --git a/metadata/md5-cache/gnome-extra/libgsf-1.14.41-r1 b/metadata/md5-cache/gnome-extra/libgsf-1.14.41-r1
index d70f699011b4..79374dd1e111 100644
--- a/metadata/md5-cache/gnome-extra/libgsf-1.14.41-r1
+++ b/metadata/md5-cache/gnome-extra/libgsf-1.14.41-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.26:2 >=dev-libs/libxml2-2.4.16:2 sys-libs/zlib bzip2? ( app-arch/bzip2 ) gtk? ( x11-libs/gdk-pixbuf:2 virtual/imagemagick-tools ) introspection? ( >=dev-libs/gobject-introspection-1:= )
 SLOT=0/114
 SRC_URI=mirror://gnome/sources/libgsf/1.14/libgsf-1.14.41.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c61fe0b623c8d40a82087bf359f29171
diff --git a/metadata/md5-cache/gnome-extra/libgsf-1.14.43 b/metadata/md5-cache/gnome-extra/libgsf-1.14.43
index 644fd7a595f3..0a282fe8b148 100644
--- a/metadata/md5-cache/gnome-extra/libgsf-1.14.43
+++ b/metadata/md5-cache/gnome-extra/libgsf-1.14.43
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.26:2 >=dev-libs/libxml2-2.4.16:2 sys-libs/zlib bzip2? ( app-arch/bzip2 ) gtk? ( x11-libs/gdk-pixbuf:2 virtual/imagemagick-tools ) introspection? ( >=dev-libs/gobject-introspection-1:= )
 SLOT=0/114
 SRC_URI=mirror://gnome/sources/libgsf/1.14/libgsf-1.14.43.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cb6a80a7a1949eaa46107bceb757b6a3
diff --git a/metadata/md5-cache/gnome-extra/mousetweaks-3.12.0 b/metadata/md5-cache/gnome-extra/mousetweaks-3.12.0
index 760e34497043..95979f3ce875 100644
--- a/metadata/md5-cache/gnome-extra/mousetweaks-3.12.0
+++ b/metadata/md5-cache/gnome-extra/mousetweaks-3.12.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.25.9:2 >=x11-libs/gtk+-3:3[X] >=gnome-base/gsettings-desktop-schemas-0.1 x11-libs/libX11 x11-libs/libXtst x11-libs/libXfixes x11-libs/libXcursor
 SLOT=0
 SRC_URI=mirror://gnome/sources/mousetweaks/3.12/mousetweaks-3.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=aa1c513ab9fb7f27b9c56e393da63c58
diff --git a/metadata/md5-cache/gnome-extra/nautilus-actions-3.2.3 b/metadata/md5-cache/gnome-extra/nautilus-actions-3.2.3
index 1d7cca529db5..ac605a27d0a8 100644
--- a/metadata/md5-cache/gnome-extra/nautilus-actions-3.2.3
+++ b/metadata/md5-cache/gnome-extra/nautilus-actions-3.2.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2 FDL-1.3
 RDEPEND=>=dev-libs/glib-2.30:2 >=dev-libs/libxml2-2.6:2 dev-libs/libunique:3 >=gnome-base/libgtop-2.23.1:2 >=gnome-base/nautilus-3 sys-apps/util-linux x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libICE >=x11-libs/libSM-1 !gnome-extra/nautilus-actions:2
 SLOT=3
 SRC_URI=mirror://gnome/sources/nautilus-actions/3.2/nautilus-actions-3.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=38d6672623cba7bff0004028c5b3586f
diff --git a/metadata/md5-cache/gnome-extra/nautilus-actions-3.2.4 b/metadata/md5-cache/gnome-extra/nautilus-actions-3.2.4
index 1b866111bee9..79499b8882c9 100644
--- a/metadata/md5-cache/gnome-extra/nautilus-actions-3.2.4
+++ b/metadata/md5-cache/gnome-extra/nautilus-actions-3.2.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2 FDL-1.3
 RDEPEND=>=dev-libs/glib-2.30:2 >=dev-libs/libxml2-2.6:2 dev-libs/libunique:3 >=gnome-base/libgtop-2.23.1:2 >=gnome-base/nautilus-3 sys-apps/util-linux x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libICE >=x11-libs/libSM-1 !gnome-extra/nautilus-actions:2
 SLOT=3
 SRC_URI=mirror://gnome/sources/nautilus-actions/3.2/nautilus-actions-3.2.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=38d6672623cba7bff0004028c5b3586f
diff --git a/metadata/md5-cache/gnome-extra/nautilus-dropbox-1.6.2 b/metadata/md5-cache/gnome-extra/nautilus-dropbox-1.6.2
index 7a55e4fac2bc..eb77d0842c39 100644
--- a/metadata/md5-cache/gnome-extra/nautilus-dropbox-1.6.2
+++ b/metadata/md5-cache/gnome-extra/nautilus-dropbox-1.6.2
@@ -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://www.dropbox.com/download?dl=packages/nautilus-dropbox-1.6.2.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4e4a93108927fc3745425ce25075a45a
diff --git a/metadata/md5-cache/gnome-extra/nautilus-sendto-3.8.5 b/metadata/md5-cache/gnome-extra/nautilus-sendto-3.8.5
index ae4bb18f73da..5174e6856c6a 100644
--- a/metadata/md5-cache/gnome-extra/nautilus-sendto-3.8.5
+++ b/metadata/md5-cache/gnome-extra/nautilus-sendto-3.8.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=x11-libs/gtk+-2.90.3:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/nautilus-sendto/3.8/nautilus-sendto-3.8.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ac63667a62db2fda039be843b541cf3e
diff --git a/metadata/md5-cache/gnome-extra/nemo-3.6.4 b/metadata/md5-cache/gnome-extra/nemo-3.6.4
index 96c6b1c15436..3efc12cbd12d 100644
--- a/metadata/md5-cache/gnome-extra/nemo-3.6.4
+++ b/metadata/md5-cache/gnome-extra/nemo-3.6.4
@@ -10,5 +10,5 @@ PDEPEND=>=gnome-base/gvfs-0.1.2
 RDEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-2.6.1:0= >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.9.10:3[introspection?] >=dev-libs/libxml2-2.7.8:2 gnome-base/dconf:0= gnome-base/gsettings-desktop-schemas >=x11-libs/libnotify-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrender >=x11-libs/xapps-1.0.4 exif? ( >=media-libs/libexif-0.6.20:= ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) tracker? ( >=app-misc/tracker-0.12:= ) xmp? ( >=media-libs/exempi-2.2.0:= ) sys-libs/libselinux x11-themes/adwaita-icon-theme nls? ( >=gnome-extra/cinnamon-translations-2.2 )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/nemo/archive/3.6.4.tar.gz -> nemo-3.6.4.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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ef682f1d7301babf2cd15faf95213dbb
diff --git a/metadata/md5-cache/gnome-extra/nemo-3.8.5-r1 b/metadata/md5-cache/gnome-extra/nemo-3.8.5-r1
index 16ff4b8b8f87..d6bd25e709e3 100644
--- a/metadata/md5-cache/gnome-extra/nemo-3.8.5-r1
+++ b/metadata/md5-cache/gnome-extra/nemo-3.8.5-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-2.6.1:0= >
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linuxmint/nemo/archive/3.8.5.tar.gz -> nemo-3.8.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=553310b5943cee05de91bef0d7b0c51d
diff --git a/metadata/md5-cache/gnome-extra/nm-applet-1.8.10-r1 b/metadata/md5-cache/gnome-extra/nm-applet-1.8.10-r1
index da4c4d2b7e15..edd01e943ece 100644
--- a/metadata/md5-cache/gnome-extra/nm-applet-1.8.10-r1
+++ b/metadata/md5-cache/gnome-extra/nm-applet-1.8.10-r1
@@ -10,5 +10,5 @@ PDEPEND=virtual/notification-daemon
 RDEPEND=>=app-crypt/libsecret-0.18 >=dev-libs/glib-2.38:2[dbus] >=dev-libs/dbus-glib-0.88 >=sys-apps/dbus-1.4.1 >=sys-auth/polkit-0.96-r1 >=x11-libs/gtk+-3.10:3[introspection?] >=x11-libs/libnotify-0.7.0 app-text/iso-codes >=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?] net-misc/mobile-broadband-provider-info introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) virtual/freedesktop-icon-theme virtual/libgudev:= gcr? ( >=app-crypt/gcr-3.14:=[gtk] ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( >=dev-libs/jansson-2.7 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/network-manager-applet/1.8/network-manager-applet-1.8.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cf44c99ac3cf4c11521c55086ebac502
diff --git a/metadata/md5-cache/gnome-extra/nm-applet-1.8.14 b/metadata/md5-cache/gnome-extra/nm-applet-1.8.14
index 5dab3eed80d2..6bc11295a26d 100644
--- a/metadata/md5-cache/gnome-extra/nm-applet-1.8.14
+++ b/metadata/md5-cache/gnome-extra/nm-applet-1.8.14
@@ -10,5 +10,5 @@ PDEPEND=virtual/notification-daemon
 RDEPEND=>=app-crypt/libsecret-0.18 >=dev-libs/glib-2.38:2[dbus] >=dev-libs/dbus-glib-0.88 >=sys-apps/dbus-1.4.1 >=sys-auth/polkit-0.96-r1 >=x11-libs/gtk+-3.10:3[introspection?] >=x11-libs/libnotify-0.7.0 app-text/iso-codes >=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?] net-misc/mobile-broadband-provider-info ayatana? ( dev-libs/libappindicator:3 >=dev-libs/libdbusmenu-16.04.0 ) introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) virtual/freedesktop-icon-theme virtual/libgudev:= gcr? ( >=app-crypt/gcr-3.14:=[gtk] ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( >=dev-libs/jansson-2.7 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/network-manager-applet/1.8/network-manager-applet-1.8.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=63b30d5b968e10ee88b46964ac88e7dd
diff --git a/metadata/md5-cache/gnome-extra/nm-applet-1.8.16 b/metadata/md5-cache/gnome-extra/nm-applet-1.8.16
index 0495f332eb8d..464ed1022dba 100644
--- a/metadata/md5-cache/gnome-extra/nm-applet-1.8.16
+++ b/metadata/md5-cache/gnome-extra/nm-applet-1.8.16
@@ -10,5 +10,5 @@ PDEPEND=virtual/notification-daemon
 RDEPEND=>=app-crypt/libsecret-0.18 >=dev-libs/glib-2.38:2[dbus] >=dev-libs/dbus-glib-0.88 >=sys-apps/dbus-1.4.1 >=sys-auth/polkit-0.96-r1 >=x11-libs/gtk+-3.10:3[introspection?] >=x11-libs/libnotify-0.7.0 app-text/iso-codes >=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?] net-misc/mobile-broadband-provider-info ayatana? ( dev-libs/libappindicator:3 >=dev-libs/libdbusmenu-16.04.0 ) introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) virtual/freedesktop-icon-theme virtual/libgudev:= gcr? ( >=app-crypt/gcr-3.14:=[gtk] ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( >=dev-libs/jansson-2.7 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/network-manager-applet/1.8/network-manager-applet-1.8.16.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=86cc83dcd74dfba1b59e396253ac4bfd
diff --git a/metadata/md5-cache/gnome-extra/nm-applet-1.8.18 b/metadata/md5-cache/gnome-extra/nm-applet-1.8.18
index c339b57e571f..87d5a58248b7 100644
--- a/metadata/md5-cache/gnome-extra/nm-applet-1.8.18
+++ b/metadata/md5-cache/gnome-extra/nm-applet-1.8.18
@@ -10,5 +10,5 @@ PDEPEND=virtual/notification-daemon
 RDEPEND=>=app-crypt/libsecret-0.18 >=dev-libs/glib-2.38:2[dbus] >=dev-libs/dbus-glib-0.88 >=sys-apps/dbus-1.4.1 >=sys-auth/polkit-0.96-r1 >=x11-libs/gtk+-3.10:3[introspection?] >=x11-libs/libnotify-0.7.0 app-text/iso-codes >=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?] net-misc/mobile-broadband-provider-info ayatana? ( dev-libs/libappindicator:3 >=dev-libs/libdbusmenu-16.04.0 ) introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) virtual/freedesktop-icon-theme virtual/libgudev:= gcr? ( >=app-crypt/gcr-3.14:=[gtk] ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( >=dev-libs/jansson-2.7 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/network-manager-applet/1.8/network-manager-applet-1.8.18.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=86cc83dcd74dfba1b59e396253ac4bfd
diff --git a/metadata/md5-cache/gnome-extra/office-runner-1.0.2 b/metadata/md5-cache/gnome-extra/office-runner-1.0.2
index f041354751ee..0e4bd77a3aa2 100644
--- a/metadata/md5-cache/gnome-extra/office-runner-1.0.2
+++ b/metadata/md5-cache/gnome-extra/office-runner-1.0.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 >=gnome-base/gnome-settings-daemon-3.0 >=x11-libs/gtk+-3.8:3 >=sys-apps/systemd-190
 SLOT=0
 SRC_URI=mirror://gnome/sources/office-runner/1.0/office-runner-1.0.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	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8d61b09c5b977e55878bb05f10513d01
diff --git a/metadata/md5-cache/gnome-extra/seahorse-nautilus-3.11.92 b/metadata/md5-cache/gnome-extra/seahorse-nautilus-3.11.92
index 28b7ff057f56..418fbd976a0f 100644
--- a/metadata/md5-cache/gnome-extra/seahorse-nautilus-3.11.92
+++ b/metadata/md5-cache/gnome-extra/seahorse-nautilus-3.11.92
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-crypt/gpgme-1.0.0 >=app-crypt/gcr-3.4[gtk] >=dev-libs/dbus-glib-0.35 >=dev-libs/glib-2.28:2 gnome-base/gnome-keyring >=gnome-base/nautilus-3 x11-libs/gtk+:3 >=x11-libs/libcryptui-3.9.90 >=x11-libs/libnotify-0.3:= >=app-crypt/gnupg-1.4 !app-crypt/seahorse-plugins[nautilus]
 SLOT=0
 SRC_URI=mirror://gnome/sources/seahorse-nautilus/3.11/seahorse-nautilus-3.11.92.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=705d0850dafb2a9219d6e340a1f3396b
diff --git a/metadata/md5-cache/gnome-extra/sushi-3.24.0 b/metadata/md5-cache/gnome-extra/sushi-3.24.0
index 8b79dd5af1d1..a0c0bc16e211 100644
--- a/metadata/md5-cache/gnome-extra/sushi-3.24.0
+++ b/metadata/md5-cache/gnome-extra/sushi-3.24.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=x11-libs/gdk-pixbuf-2.23[introspection] >=dev-libs/gjs-1.40 >=dev-libs/glib-2.29.14:2 >=dev-libs/gobject-introspection-0.9.6:= >=media-libs/clutter-1.11.4:1.0[introspection] >=media-libs/clutter-gtk-1.0.1:1.0[introspection] >=x11-libs/gtk+-3.13.2:3[X,introspection] >=app-text/evince-3.0[introspection] media-libs/freetype:2 media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] >=media-libs/harfbuzz-0.9.9:= media-libs/clutter-gst:3.0[introspection] media-libs/musicbrainz:5= net-libs/webkit-gtk:4[introspection] x11-libs/gtksourceview:3.0[introspection] office? ( app-office/unoconv ) >=gnome-base/nautilus-3.1.90
 SLOT=0
 SRC_URI=mirror://gnome/sources/sushi/3.24/sushi-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f04fd2fe4787f4366d57b0805165cc0d
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 f3b6d4edfddf..fbfee9412134 100644
--- a/metadata/md5-cache/gnome-extra/synapse-0.2.99.2
+++ b/metadata/md5-cache/gnome-extra/synapse-0.2.99.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/libgee:0.8 >=dev-libs/glib-2.28.0:2 dev-libs/json-glib dev-libs/keybinder:3 dev-libs/libunique:1 sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtkhotkey >=x11-libs/gtk+-3.0.0:3 x11-libs/libnotify x11-libs/pango x11-themes/adwaita-icon-theme plugins? ( >=net-libs/rest-0.7 )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/gnome-extra/yelp-3.22.0 b/metadata/md5-cache/gnome-extra/yelp-3.22.0
index 8d957e0ce8ab..ccf981a693bf 100644
--- a/metadata/md5-cache/gnome-extra/yelp-3.22.0
+++ b/metadata/md5-cache/gnome-extra/yelp-3.22.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=app-arch/bzip2:= >=app-arch/xz-utils-4.9:= dev-db/sqlite:3= >=dev-libs/glib-2.38:2 >=dev-libs/libxml2-2.6.5:2 >=dev-libs/libxslt-1.1.4 >=gnome-extra/yelp-xsl-3.12 >=net-libs/webkit-gtk-2.7.2:4 >=x11-libs/gtk+-3.13.3:3 x11-themes/adwaita-icon-theme
 SLOT=0
 SRC_URI=mirror://gnome/sources/yelp/3.22/yelp-3.22.0.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=91c510f804d0630cae83d8cea4d1d27a
diff --git a/metadata/md5-cache/gnome-extra/yelp-xsl-3.20.1 b/metadata/md5-cache/gnome-extra/yelp-xsl-3.20.1
index 5da34eca171e..a1dacfd604e2 100644
--- a/metadata/md5-cache/gnome-extra/yelp-xsl-3.20.1
+++ b/metadata/md5-cache/gnome-extra/yelp-xsl-3.20.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ LGPL-2.1+ MIT FDL-1.1+
 RDEPEND=>=dev-libs/libxml2-2.6.12:= >=dev-libs/libxslt-1.1.8:=
 SLOT=0
 SRC_URI=mirror://gnome/sources/yelp-xsl/3.20/yelp-xsl-3.20.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7619d51db406dbf2c63babf57ac7657f
diff --git a/metadata/md5-cache/gnome-extra/zenity-3.24.0 b/metadata/md5-cache/gnome-extra/zenity-3.24.0
index 337d24f39bc0..e05ccf089061 100644
--- a/metadata/md5-cache/gnome-extra/zenity-3.24.0
+++ b/metadata/md5-cache/gnome-extra/zenity-3.24.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.8:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3:3[X] x11-libs/libX11 x11-libs/pango libnotify? ( >=x11-libs/libnotify-0.6.1:= ) webkit? ( >=net-libs/webkit-gtk-2.8.1:4 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/zenity/3.24/zenity-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1b2953b9779d513c0c4e84b507b00d23
diff --git a/metadata/md5-cache/gnome-extra/zenity-3.28.1 b/metadata/md5-cache/gnome-extra/zenity-3.28.1
index 2ea5589991ff..3c9e026f160b 100644
--- a/metadata/md5-cache/gnome-extra/zenity-3.28.1
+++ b/metadata/md5-cache/gnome-extra/zenity-3.28.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.8:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3:3[X] x11-libs/libX11 x11-libs/pango libnotify? ( >=x11-libs/libnotify-0.6.1:= ) webkit? ( >=net-libs/webkit-gtk-2.8.1:4 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/zenity/3.28/zenity-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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=13c04985e9584c2dea7ff0d2d1910b62
diff --git a/metadata/md5-cache/gnustep-base/Manifest.gz b/metadata/md5-cache/gnustep-base/Manifest.gz
index 620cf94ac5b2..a296cc9b95c5 100644
--- a/metadata/md5-cache/gnustep-base/Manifest.gz
+++ b/metadata/md5-cache/gnustep-base/Manifest.gz
diff --git a/metadata/md5-cache/gnustep-base/libobjc2-1.8 b/metadata/md5-cache/gnustep-base/libobjc2-1.8
index e6ba22aeedc2..07026c684a10 100644
--- a/metadata/md5-cache/gnustep-base/libobjc2-1.8
+++ b/metadata/md5-cache/gnustep-base/libobjc2-1.8
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=boehm-gc? ( dev-libs/boehm-gc ) cxx? ( sys-libs/libcxx )
 SLOT=0
 SRC_URI=https://github.com/gnustep/libobjc2/archive/v1.8.tar.gz -> libobjc2-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=dd20671afc6bf5e7d3e7083e21d0819c
diff --git a/metadata/md5-cache/gnustep-base/libobjc2-1.8.1 b/metadata/md5-cache/gnustep-base/libobjc2-1.8.1
index 3802f68bfe10..99f525e19441 100644
--- a/metadata/md5-cache/gnustep-base/libobjc2-1.8.1
+++ b/metadata/md5-cache/gnustep-base/libobjc2-1.8.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=boehm-gc? ( dev-libs/boehm-gc ) cxx? ( sys-libs/libcxx )
 SLOT=0
 SRC_URI=https://github.com/gnustep/libobjc2/archive/v1.8.1.tar.gz -> libobjc2-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=dd20671afc6bf5e7d3e7083e21d0819c
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index 61992a428c02..3bc8ac3a21aa 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 8195e009252e..a99a3133a850 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 2eff9328d478..d5ac3323181b 100644
--- a/metadata/md5-cache/kde-apps/akonadi-18.08.1
+++ b/metadata/md5-cache/kde-apps/akonadi-18.08.1
@@ -11,5 +11,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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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-calendar-18.04.3 b/metadata/md5-cache/kde-apps/akonadi-calendar-18.04.3
index 7954191fa901..7cb110218ab2 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index b6a3d82552f9..33537e1d74be 100644
--- a/metadata/md5-cache/kde-apps/akonadi-calendar-18.08.1
+++ b/metadata/md5-cache/kde-apps/akonadi-calendar-18.08.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kd
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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-contacts-18.04.3 b/metadata/md5-cache/kde-apps/akonadi-contacts-18.04.3
index 9987e8789f22..f921b7b1b73e 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 1660fc73bc2a..a60208736149 100644
--- a/metadata/md5-cache/kde-apps/akonadi-contacts-18.08.1
+++ b/metadata/md5-cache/kde-apps/akonadi-contacts-18.08.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0: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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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-import-wizard-18.04.3 b/metadata/md5-cache/kde-apps/akonadi-import-wizard-18.04.3
index 62938634da6a..85551a31cdc1 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 0d9b4d855f51..77b28eef165f 100644
--- a/metadata/md5-cache/kde-apps/akonadi-import-wizard-18.08.1
+++ b/metadata/md5-cache/kde-apps/akonadi-import-wizard-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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-mime-18.04.3 b/metadata/md5-cache/kde-apps/akonadi-mime-18.04.3
index 73942ab6914b..f22560a4e9b2 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 05f690378b36..9c69c9bce423 100644
--- a/metadata/md5-cache/kde-apps/akonadi-mime-18.08.1
+++ b/metadata/md5-cache/kde-apps/akonadi-mime-18.08.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0: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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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-notes-18.04.3 b/metadata/md5-cache/kde-apps/akonadi-notes-18.04.3
index 5b13678da960..d177d3c13b71 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 89b84c13a6db..b8d3cdd040ac 100644
--- a/metadata/md5-cache/kde-apps/akonadi-notes-18.08.1
+++ b/metadata/md5-cache/kde-apps/akonadi-notes-18.08.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/ki18n-5.49.0:5 >=kde-apps/kmime-18.08.1:5 >=dev-qt/qtgu
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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-search-18.04.3 b/metadata/md5-cache/kde-apps/akonadi-search-18.04.3
index 815271e00f7d..c1090083567f 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 9ec998feb4fa..80947047cee7 100644
--- a/metadata/md5-cache/kde-apps/akonadi-search-18.08.1
+++ b/metadata/md5-cache/kde-apps/akonadi-search-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/akonadiconsole-18.04.3 b/metadata/md5-cache/kde-apps/akonadiconsole-18.04.3
index 6cb7676c2425..d005b7fe78ab 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index d9dfc666d748..2214c5f5db35 100644
--- a/metadata/md5-cache/kde-apps/akonadiconsole-18.08.1
+++ b/metadata/md5-cache/kde-apps/akonadiconsole-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/akregator-18.04.3 b/metadata/md5-cache/kde-apps/akregator-18.04.3
index 9e0f16118c6b..0fcd60734727 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
new file mode 100644
index 000000000000..05fd5c439b0c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akregator-18.04.3-r1
@@ -0,0 +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/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 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.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=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.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
diff --git a/metadata/md5-cache/kde-apps/akregator-18.08.1 b/metadata/md5-cache/kde-apps/akregator-18.08.1
index 98e31489d6eb..475e53a37918 100644
--- a/metadata/md5-cache/kde-apps/akregator-18.08.1
+++ b/metadata/md5-cache/kde-apps/akregator-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/analitza-18.04.3 b/metadata/md5-cache/kde-apps/analitza-18.04.3
index e93caa1e52aa..f96766bea9f9 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index cfe097160ac5..1b63f2d67e32 100644
--- a/metadata/md5-cache/kde-apps/analitza-18.08.1
+++ b/metadata/md5-cache/kde-apps/analitza-18.08.1
@@ -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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/ark-18.04.3 b/metadata/md5-cache/kde-apps/ark-18.04.3
index 2a15600aceeb..a63033915aab 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 36cb6e038da5..1ee89f362745 100644
--- a/metadata/md5-cache/kde-apps/ark-18.08.1
+++ b/metadata/md5-cache/kde-apps/ark-18.08.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0: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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/artikulate-18.04.3 b/metadata/md5-cache/kde-apps/artikulate-18.04.3
index 49e024d7ffe3..f34d72d0deb2 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 79923e26787a..171e2adac3de 100644
--- a/metadata/md5-cache/kde-apps/artikulate-18.08.1
+++ b/metadata/md5-cache/kde-apps/artikulate-18.08.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=k
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/audiocd-kio-18.04.3 b/metadata/md5-cache/kde-apps/audiocd-kio-18.04.3
index fbcbdc308742..00af7a9916d0 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 672ec3a15272..fab337e8e2a6 100644
--- a/metadata/md5-cache/kde-apps/audiocd-kio-18.08.1
+++ b/metadata/md5-cache/kde-apps/audiocd-kio-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/baloo-widgets-18.04.3 b/metadata/md5-cache/kde-apps/baloo-widgets-18.04.3
index d78d87bfd544..521a54ce654b 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 6df925f58302..d9647dedd874 100644
--- a/metadata/md5-cache/kde-apps/baloo-widgets-18.08.1
+++ b/metadata/md5-cache/kde-apps/baloo-widgets-18.08.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/baloo-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kde-
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/blinken-18.04.3 b/metadata/md5-cache/kde-apps/blinken-18.04.3
index 78ff469c5b83..569061fb441a 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 0684cfeb3c2c..f7dc56c06fd7 100644
--- a/metadata/md5-cache/kde-apps/blinken-18.08.1
+++ b/metadata/md5-cache/kde-apps/blinken-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/bomber-18.04.3 b/metadata/md5-cache/kde-apps/bomber-18.04.3
index 45a37039c8ef..7c32d8977edb 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 760c948ae30d..499dd66752a7 100644
--- a/metadata/md5-cache/kde-apps/bomber-18.08.1
+++ b/metadata/md5-cache/kde-apps/bomber-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/bovo-18.04.3 b/metadata/md5-cache/kde-apps/bovo-18.04.3
index 790fe362020d..8ccfadda0d65 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 85c5aa59facd..694c9ca50261 100644
--- a/metadata/md5-cache/kde-apps/bovo-18.08.1
+++ b/metadata/md5-cache/kde-apps/bovo-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/calendarjanitor-18.04.3 b/metadata/md5-cache/kde-apps/calendarjanitor-18.04.3
index eb096d1ae97f..5eec9c9c2cf1 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 422dd49bef92..b53f50a9e525 100644
--- a/metadata/md5-cache/kde-apps/calendarjanitor-18.08.1
+++ b/metadata/md5-cache/kde-apps/calendarjanitor-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/calendarsupport-18.04.3 b/metadata/md5-cache/kde-apps/calendarsupport-18.04.3
index 9d050b11991e..cdcd170d1b2a 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index d035c915a2c7..74772e7d8af0 100644
--- a/metadata/md5-cache/kde-apps/calendarsupport-18.08.1
+++ b/metadata/md5-cache/kde-apps/calendarsupport-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/cantor-18.04.3 b/metadata/md5-cache/kde-apps/cantor-18.04.3
index 4a62e14ee232..20e272cef3bc 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	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_=5aba2106c0aebb2d930542002ef096bf
diff --git a/metadata/md5-cache/kde-apps/cantor-18.08.1 b/metadata/md5-cache/kde-apps/cantor-18.08.1
index 81aefc2876f5..6cea2814e727 100644
--- a/metadata/md5-cache/kde-apps/cantor-18.08.1
+++ b/metadata/md5-cache/kde-apps/cantor-18.08.1
@@ -11,5 +11,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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	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/cervisia-18.04.3 b/metadata/md5-cache/kde-apps/cervisia-18.04.3
index 760654138276..9f9869680c0a 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index a0f91a25763e..e69b16034f66 100644
--- a/metadata/md5-cache/kde-apps/cervisia-18.08.1
+++ b/metadata/md5-cache/kde-apps/cervisia-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/dolphin-18.04.3-r1 b/metadata/md5-cache/kde-apps/dolphin-18.04.3-r1
index c7a32710b749..47378ba6afa2 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 074b93107ff6..33cf9b4aa1d9 100644
--- a/metadata/md5-cache/kde-apps/dolphin-18.08.1
+++ b/metadata/md5-cache/kde-apps/dolphin-18.08.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kbookmarks-5.49.0:5 >=kde-frameworks/kcmutils-5.49.0: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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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-plugins-18.04.3 b/metadata/md5-cache/kde-apps/dolphin-plugins-18.04.3
index e6de576cca07..e65e1214752f 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 15971555e2ee..34225bf9b947 100644
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-18.08.1
+++ b/metadata/md5-cache/kde-apps/dolphin-plugins-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/dragon-18.04.3 b/metadata/md5-cache/kde-apps/dragon-18.04.3
index 7cca56c1880c..81b9386b3a6f 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 8466cce6673d..e4b1189be141 100644
--- a/metadata/md5-cache/kde-apps/dragon-18.08.1
+++ b/metadata/md5-cache/kde-apps/dragon-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/eventviews-18.04.3 b/metadata/md5-cache/kde-apps/eventviews-18.04.3
index 32a642e50241..e24005ae8465 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index f4010b12e16f..531921f2e920 100644
--- a/metadata/md5-cache/kde-apps/eventviews-18.08.1
+++ b/metadata/md5-cache/kde-apps/eventviews-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/ffmpegthumbs-18.04.3 b/metadata/md5-cache/kde-apps/ffmpegthumbs-18.04.3
index 04a164fc181c..18f855b2ff14 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 61926076f1a0..0f707cc54c9b 100644
--- a/metadata/md5-cache/kde-apps/ffmpegthumbs-18.08.1
+++ b/metadata/md5-cache/kde-apps/ffmpegthumbs-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/filelight-18.04.3 b/metadata/md5-cache/kde-apps/filelight-18.04.3
index 775533cbc37c..42c7e5ddd024 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 84ed25f4b830..29882cdb1765 100644
--- a/metadata/md5-cache/kde-apps/filelight-18.08.1
+++ b/metadata/md5-cache/kde-apps/filelight-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/granatier-18.04.3 b/metadata/md5-cache/kde-apps/granatier-18.04.3
index d15a17a14734..29f9a83fec66 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index da667b5278cf..7be60f7f0502 100644
--- a/metadata/md5-cache/kde-apps/granatier-18.08.1
+++ b/metadata/md5-cache/kde-apps/granatier-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/grantlee-editor-18.04.3 b/metadata/md5-cache/kde-apps/grantlee-editor-18.04.3
index 9eb76b79946d..c97c9a1af760 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 35c6a453f669..ec0e04bfa5b4 100644
--- a/metadata/md5-cache/kde-apps/grantlee-editor-18.08.1
+++ b/metadata/md5-cache/kde-apps/grantlee-editor-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/grantleetheme-18.04.3 b/metadata/md5-cache/kde-apps/grantleetheme-18.04.3
index 2253bc696c35..37364a9fdbf9 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 913acf213ae3..1f0a0ea62723 100644
--- a/metadata/md5-cache/kde-apps/grantleetheme-18.08.1
+++ b/metadata/md5-cache/kde-apps/grantleetheme-18.08.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0: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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/gwenview-18.04.3 b/metadata/md5-cache/kde-apps/gwenview-18.04.3
index d9e66e0197ff..280ebb61cd58 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index f4a830ab881d..6679db7f9226 100644
--- a/metadata/md5-cache/kde-apps/gwenview-18.08.1
+++ b/metadata/md5-cache/kde-apps/gwenview-18.08.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0: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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/incidenceeditor-18.04.3 b/metadata/md5-cache/kde-apps/incidenceeditor-18.04.3
index 1c08995e8fe8..b7a1104a40ee 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index d7746298acf7..304b966f9b71 100644
--- a/metadata/md5-cache/kde-apps/incidenceeditor-18.08.1
+++ b/metadata/md5-cache/kde-apps/incidenceeditor-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/juk-18.04.3 b/metadata/md5-cache/kde-apps/juk-18.04.3
index 957d9c63c40c..315eaa36784e 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index be95cb82c2bb..34e9b706ede1 100644
--- a/metadata/md5-cache/kde-apps/juk-18.08.1
+++ b/metadata/md5-cache/kde-apps/juk-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/k3b-18.04.3 b/metadata/md5-cache/kde-apps/k3b-18.04.3
index e67975193d1b..39e44605ae19 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 7b40b73eca6b..849e07fda0a4 100644
--- a/metadata/md5-cache/kde-apps/k3b-18.08.1
+++ b/metadata/md5-cache/kde-apps/k3b-18.08.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/kbookmarks-5.49.0: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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kaccounts-integration-18.04.3 b/metadata/md5-cache/kde-apps/kaccounts-integration-18.04.3
index 8d807aabc639..527fd2ee64b9 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 7723c08b5edd..619e1859d753 100644
--- a/metadata/md5-cache/kde-apps/kaccounts-integration-18.08.1
+++ b/metadata/md5-cache/kde-apps/kaccounts-integration-18.08.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfigwidgets-5.49.0:5 >=kde-frameworks/kcoreaddons-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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-providers-18.04.3 b/metadata/md5-cache/kde-apps/kaccounts-providers-18.04.3
index 5d8b428294d3..5f266d94a739 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 18ea44e4afbb..87b7bfdc3690 100644
--- a/metadata/md5-cache/kde-apps/kaccounts-providers-18.08.1
+++ b/metadata/md5-cache/kde-apps/kaccounts-providers-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kaddressbook-18.04.3 b/metadata/md5-cache/kde-apps/kaddressbook-18.04.3
index 558510dcbc22..b77b2333d3d3 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index e1e0b7e1a268..bdfec826ca44 100644
--- a/metadata/md5-cache/kde-apps/kaddressbook-18.08.1
+++ b/metadata/md5-cache/kde-apps/kaddressbook-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kajongg-18.04.3 b/metadata/md5-cache/kde-apps/kajongg-18.04.3
index 41bb43dd5891..8cbdd0f8c29b 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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_=33b6a8996129bfbcace21ea507f4efa1
diff --git a/metadata/md5-cache/kde-apps/kajongg-18.08.1 b/metadata/md5-cache/kde-apps/kajongg-18.08.1
index 7100d570a1ab..3004344bace9 100644
--- a/metadata/md5-cache/kde-apps/kajongg-18.08.1
+++ b/metadata/md5-cache/kde-apps/kajongg-18.08.1
@@ -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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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/kalarm-18.04.3 b/metadata/md5-cache/kde-apps/kalarm-18.04.3
index 677a8703a11a..2290ddb8355d 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 3bc549d12f0a..eb626c225a61 100644
--- a/metadata/md5-cache/kde-apps/kalarm-18.08.1
+++ b/metadata/md5-cache/kde-apps/kalarm-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kalarmcal-18.04.3 b/metadata/md5-cache/kde-apps/kalarmcal-18.04.3
index 7e0b0e4a6605..215ef5d0b308 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 1e41d1fd9e84..031b0f67f6e9 100644
--- a/metadata/md5-cache/kde-apps/kalarmcal-18.08.1
+++ b/metadata/md5-cache/kde-apps/kalarmcal-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kalgebra-18.04.3 b/metadata/md5-cache/kde-apps/kalgebra-18.04.3
index 60c9c6fb29a4..024795e072e8 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index fcdd5ebd3edb..1d161d9097cf 100644
--- a/metadata/md5-cache/kde-apps/kalgebra-18.08.1
+++ b/metadata/md5-cache/kde-apps/kalgebra-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kalzium-18.04.3 b/metadata/md5-cache/kde-apps/kalzium-18.04.3
index 64e570faede7..33fcb039c11c 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 6fa75a2ebbe3..301d0ceee8a8 100644
--- a/metadata/md5-cache/kde-apps/kalzium-18.08.1
+++ b/metadata/md5-cache/kde-apps/kalzium-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kamera-18.04.3 b/metadata/md5-cache/kde-apps/kamera-18.04.3
index 396333a6894c..1e4b31c9142a 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 7a3df0562488..700b170983c2 100644
--- a/metadata/md5-cache/kde-apps/kamera-18.08.1
+++ b/metadata/md5-cache/kde-apps/kamera-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kamoso-18.04.3 b/metadata/md5-cache/kde-apps/kamoso-18.04.3
index 7b26319bd39d..c597f60100f8 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 767426fb3939..00460b4f0d6a 100644
--- a/metadata/md5-cache/kde-apps/kamoso-18.08.1
+++ b/metadata/md5-cache/kde-apps/kamoso-18.08.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.49.0:5 >=kde-frameworks/kcoreaddons-5.49.0: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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kanagram-18.04.3 b/metadata/md5-cache/kde-apps/kanagram-18.04.3
index d1228d389b63..83d93d90b875 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 448f43800e65..24fe418c524b 100644
--- a/metadata/md5-cache/kde-apps/kanagram-18.08.1
+++ b/metadata/md5-cache/kde-apps/kanagram-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kapman-18.04.3 b/metadata/md5-cache/kde-apps/kapman-18.04.3
index 9cdc4bf4d340..21632ed3f490 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 4b098a09fb87..e328160b3f30 100644
--- a/metadata/md5-cache/kde-apps/kapman-18.08.1
+++ b/metadata/md5-cache/kde-apps/kapman-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kapptemplate-18.04.3 b/metadata/md5-cache/kde-apps/kapptemplate-18.04.3
index 4e5245bfe11e..0c839e4d6991 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 09cdab97901a..68dccff39dc7 100644
--- a/metadata/md5-cache/kde-apps/kapptemplate-18.08.1
+++ b/metadata/md5-cache/kde-apps/kapptemplate-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kate-18.04.3 b/metadata/md5-cache/kde-apps/kate-18.04.3
index fc1b65e56bf8..36a1a0ae62f3 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 97842cc36175..9cb39d6c3846 100644
--- a/metadata/md5-cache/kde-apps/kate-18.08.1
+++ b/metadata/md5-cache/kde-apps/kate-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/katomic-18.04.3 b/metadata/md5-cache/kde-apps/katomic-18.04.3
index e81fb90cd5cf..ba9fe63963fe 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 58b93699f3f3..e27d457bc09e 100644
--- a/metadata/md5-cache/kde-apps/katomic-18.08.1
+++ b/metadata/md5-cache/kde-apps/katomic-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kbackup-18.04.3 b/metadata/md5-cache/kde-apps/kbackup-18.04.3
index 1a48bceafe22..139b4f25a2a9 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 50056959376c..0eec76e34ac5 100644
--- a/metadata/md5-cache/kde-apps/kbackup-18.08.1
+++ b/metadata/md5-cache/kde-apps/kbackup-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kblackbox-18.04.3 b/metadata/md5-cache/kde-apps/kblackbox-18.04.3
index 9a9b32ac2d6a..9e7273860418 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index de1fb0f14067..fe62c5d9ef8d 100644
--- a/metadata/md5-cache/kde-apps/kblackbox-18.08.1
+++ b/metadata/md5-cache/kde-apps/kblackbox-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kblocks-18.04.3 b/metadata/md5-cache/kde-apps/kblocks-18.04.3
index 0a8545dbceef..f6812bf8f777 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 306534706185..d2998eb78692 100644
--- a/metadata/md5-cache/kde-apps/kblocks-18.08.1
+++ b/metadata/md5-cache/kde-apps/kblocks-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kblog-18.04.3 b/metadata/md5-cache/kde-apps/kblog-18.04.3
index 633d13cda5f1..ae22625e5bba 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
new file mode 100644
index 000000000000..124aa994a223
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kblog-18.04.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/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 sys-devel/make >=dev-util/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 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.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
diff --git a/metadata/md5-cache/kde-apps/kblog-18.08.1 b/metadata/md5-cache/kde-apps/kblog-18.08.1
index 596776b3cd77..833910b1ec3f 100644
--- a/metadata/md5-cache/kde-apps/kblog-18.08.1
+++ b/metadata/md5-cache/kde-apps/kblog-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kbounce-18.04.3 b/metadata/md5-cache/kde-apps/kbounce-18.04.3
index 85b2e3412be2..afdbb5560a8a 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 0f2b0227284b..296d3f976b3c 100644
--- a/metadata/md5-cache/kde-apps/kbounce-18.08.1
+++ b/metadata/md5-cache/kde-apps/kbounce-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kbreakout-18.04.3 b/metadata/md5-cache/kde-apps/kbreakout-18.04.3
index 2d92de19e3ea..c9cf3a0c4b29 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 12b230b66821..288e2c3e906d 100644
--- a/metadata/md5-cache/kde-apps/kbreakout-18.08.1
+++ b/metadata/md5-cache/kde-apps/kbreakout-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kbruch-18.04.3 b/metadata/md5-cache/kde-apps/kbruch-18.04.3
index 8cc9568aa38b..4ad8ab5150d4 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 617b265a17fb..112de766b1b0 100644
--- a/metadata/md5-cache/kde-apps/kbruch-18.08.1
+++ b/metadata/md5-cache/kde-apps/kbruch-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kcachegrind-18.04.3 b/metadata/md5-cache/kde-apps/kcachegrind-18.04.3
index 2b9c9b30700f..b1b8e3a12c72 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index e2f54d56ea90..7bbfa2ab8521 100644
--- a/metadata/md5-cache/kde-apps/kcachegrind-18.08.1
+++ b/metadata/md5-cache/kde-apps/kcachegrind-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kcalc-18.04.3 b/metadata/md5-cache/kde-apps/kcalc-18.04.3
index 77a7086c57f3..769c3c65e173 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 4920fb7efb1a..3233bca3119f 100644
--- a/metadata/md5-cache/kde-apps/kcalc-18.08.1
+++ b/metadata/md5-cache/kde-apps/kcalc-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kcalcore-18.04.3 b/metadata/md5-cache/kde-apps/kcalcore-18.04.3
index 937bc5ef42a8..cd754ef5cfa9 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index a27296d2d0e3..65f4781b6698 100644
--- a/metadata/md5-cache/kde-apps/kcalcore-18.08.1
+++ b/metadata/md5-cache/kde-apps/kcalcore-18.08.1
@@ -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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kcalutils-18.04.3 b/metadata/md5-cache/kde-apps/kcalutils-18.04.3
index 608092760e67..7fa0ae2a59a8 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 4239c7e1be06..a1256bc7daf0 100644
--- a/metadata/md5-cache/kde-apps/kcalutils-18.08.1
+++ b/metadata/md5-cache/kde-apps/kcalutils-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kcharselect-18.04.3 b/metadata/md5-cache/kde-apps/kcharselect-18.04.3
index 5d592cdc9884..44f69b87ab1a 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 51878d8b4fb5..b2d8e3e5e069 100644
--- a/metadata/md5-cache/kde-apps/kcharselect-18.08.1
+++ b/metadata/md5-cache/kde-apps/kcharselect-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kcolorchooser-18.04.3 b/metadata/md5-cache/kde-apps/kcolorchooser-18.04.3
index 24661d3efe52..650ee761abe4 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 49b197f460ac..3fe5ed0ccf42 100644
--- a/metadata/md5-cache/kde-apps/kcolorchooser-18.08.1
+++ b/metadata/md5-cache/kde-apps/kcolorchooser-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kcontacts-18.04.3 b/metadata/md5-cache/kde-apps/kcontacts-18.04.3
index 8febdca2d533..d8867aabb326 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 3e060ca2a654..ca77df27f73a 100644
--- a/metadata/md5-cache/kde-apps/kcontacts-18.08.1
+++ b/metadata/md5-cache/kde-apps/kcontacts-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kcron-18.04.3 b/metadata/md5-cache/kde-apps/kcron-18.04.3
index d7610e35ae02..65e69173019c 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index fdd7be4b30a2..5c87e6e8dd51 100644
--- a/metadata/md5-cache/kde-apps/kcron-18.08.1
+++ b/metadata/md5-cache/kde-apps/kcron-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kdav-18.04.3 b/metadata/md5-cache/kde-apps/kdav-18.04.3
index 6e29440c046e..7a7f3f35e8d3 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 560714e52ff5..1672a402532b 100644
--- a/metadata/md5-cache/kde-apps/kdav-18.08.1
+++ b/metadata/md5-cache/kde-apps/kdav-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kde-dev-scripts-18.04.3 b/metadata/md5-cache/kde-apps/kde-dev-scripts-18.04.3
index 18d4c84deb73..f751a97faa9a 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index dc466b0983f7..41121fff83f1 100644
--- a/metadata/md5-cache/kde-apps/kde-dev-scripts-18.08.1
+++ b/metadata/md5-cache/kde-apps/kde-dev-scripts-18.08.1
@@ -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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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-utils-18.04.3 b/metadata/md5-cache/kde-apps/kde-dev-utils-18.04.3
index ecf6662d3523..74ba59bdb973 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 1fddda6509b0..80ba3914022c 100644
--- a/metadata/md5-cache/kde-apps/kde-dev-utils-18.08.1
+++ b/metadata/md5-cache/kde-apps/kde-dev-utils-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kdebugsettings-18.04.3 b/metadata/md5-cache/kde-apps/kdebugsettings-18.04.3
index 5331b312c39c..66335e116261 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index ab3c45388886..678e1273d13c 100644
--- a/metadata/md5-cache/kde-apps/kdebugsettings-18.08.1
+++ b/metadata/md5-cache/kde-apps/kdebugsettings-18.08.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0: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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kdeedu-data-18.04.3 b/metadata/md5-cache/kde-apps/kdeedu-data-18.04.3
index ad7f8754043e..af73b8a0366f 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index af38220334bb..386b69a86c74 100644
--- a/metadata/md5-cache/kde-apps/kdeedu-data-18.08.1
+++ b/metadata/md5-cache/kde-apps/kdeedu-data-18.08.1
@@ -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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kdegraphics-mobipocket-18.04.3 b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-18.04.3
index a2e4577190ec..5f31dfeca2e2 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index f8f9544aeb41..378b4590049e 100644
--- a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-18.08.1
+++ b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kdenetwork-filesharing-18.04.3 b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-18.04.3
index 1c5954f997c2..23df8c7eff38 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 97d42d948f7c..b86d39ee5e78 100644
--- a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-18.08.1
+++ b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kdenlive-18.04.3-r1 b/metadata/md5-cache/kde-apps/kdenlive-18.04.3-r1
index 85b6296af615..b147236aa4a3 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 011c95e06ed2..fd8153d7b658 100644
--- a/metadata/md5-cache/kde-apps/kdenlive-18.08.1
+++ b/metadata/md5-cache/kde-apps/kdenlive-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kdepim-addons-18.04.3 b/metadata/md5-cache/kde-apps/kdepim-addons-18.04.3
index db7ecd8b5596..3773627b4a86 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 3f4fe9caace6..d2af340bd3bc 100644
--- a/metadata/md5-cache/kde-apps/kdepim-addons-18.08.1
+++ b/metadata/md5-cache/kde-apps/kdepim-addons-18.08.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcompletion-5.49.0:5 >=kde-frameworks/kconfig-5.49.0: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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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-apps-libs-18.04.3 b/metadata/md5-cache/kde-apps/kdepim-apps-libs-18.04.3
index b264b9dc2c9a..1fb97ed98693 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index adb2a1e65afd..db171ea941d8 100644
--- a/metadata/md5-cache/kde-apps/kdepim-apps-libs-18.08.1
+++ b/metadata/md5-cache/kde-apps/kdepim-apps-libs-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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-meta-18.04.3-r1 b/metadata/md5-cache/kde-apps/kdepim-meta-18.04.3-r1
new file mode 100644
index 000000000000..0cd4a621fb1c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdepim-meta-18.04.3-r1
@@ -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.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
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 3d87aa74dfb5..cce77d05f999 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 1e8e1b0a2929..3b77522bd368 100644
--- a/metadata/md5-cache/kde-apps/kdepim-runtime-18.08.1
+++ b/metadata/md5-cache/kde-apps/kdepim-runtime-18.08.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0: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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kdesdk-kioslaves-18.04.3 b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-18.04.3
index 386a2385b5ff..ea56376d8240 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index c6b434ee364b..c4c6bab6e6e9 100644
--- a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-18.08.1
+++ b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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-thumbnailers-18.04.3 b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-18.04.3
index 89f7687edb4a..ee2fb0415894 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 65eb68aa2f46..7606a4e3e542 100644
--- a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-18.08.1
+++ b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kdf-18.04.3 b/metadata/md5-cache/kde-apps/kdf-18.04.3
index 7b6ce07d0b0b..6a08b1d5fba0 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index c9899eecba66..d00bad48ffb1 100644
--- a/metadata/md5-cache/kde-apps/kdf-18.08.1
+++ b/metadata/md5-cache/kde-apps/kdf-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kdialog-18.04.3 b/metadata/md5-cache/kde-apps/kdialog-18.04.3
index 06b8b31cf066..02a8aec15ce1 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 300950b836d5..6c24f0f1cbd6 100644
--- a/metadata/md5-cache/kde-apps/kdialog-18.08.1
+++ b/metadata/md5-cache/kde-apps/kdialog-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kdiamond-18.04.3 b/metadata/md5-cache/kde-apps/kdiamond-18.04.3
index 21beaf977b8d..ccbe10d5dd02 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 75159d159077..64732bf6825d 100644
--- a/metadata/md5-cache/kde-apps/kdiamond-18.08.1
+++ b/metadata/md5-cache/kde-apps/kdiamond-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/keditbookmarks-18.04.3 b/metadata/md5-cache/kde-apps/keditbookmarks-18.04.3
index 046b25d6c176..f1fbd679450b 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index d88a079c97b7..bf1122b2d1f5 100644
--- a/metadata/md5-cache/kde-apps/keditbookmarks-18.08.1
+++ b/metadata/md5-cache/kde-apps/keditbookmarks-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kfind-18.04.3 b/metadata/md5-cache/kde-apps/kfind-18.04.3
index a3b213535fbb..97b0ca77f6cd 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 350de0452882..b78bded87add 100644
--- a/metadata/md5-cache/kde-apps/kfind-18.08.1
+++ b/metadata/md5-cache/kde-apps/kfind-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kfloppy-18.04.3 b/metadata/md5-cache/kde-apps/kfloppy-18.04.3
index b1212550ce36..d71858aa202e 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index caf88d9249c5..6349f89da3e5 100644
--- a/metadata/md5-cache/kde-apps/kfloppy-18.08.1
+++ b/metadata/md5-cache/kde-apps/kfloppy-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kfourinline-18.04.3 b/metadata/md5-cache/kde-apps/kfourinline-18.04.3
index 95d2aa379f91..ecfca66a2fea 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 6c1e640771b2..d95824c0e468 100644
--- a/metadata/md5-cache/kde-apps/kfourinline-18.08.1
+++ b/metadata/md5-cache/kde-apps/kfourinline-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kgeography-18.04.3 b/metadata/md5-cache/kde-apps/kgeography-18.04.3
index aa0f6e9caa03..0d3ba7a79cf6 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index c70f879521f7..624d2f452efe 100644
--- a/metadata/md5-cache/kde-apps/kgeography-18.08.1
+++ b/metadata/md5-cache/kde-apps/kgeography-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kget-18.04.3 b/metadata/md5-cache/kde-apps/kget-18.04.3
index 1d3c30da4a8e..2b63d81f6edc 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 7ca02707366b..f61b9b0d1b0b 100644
--- a/metadata/md5-cache/kde-apps/kget-18.08.1
+++ b/metadata/md5-cache/kde-apps/kget-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kgoldrunner-18.04.3 b/metadata/md5-cache/kde-apps/kgoldrunner-18.04.3
index fa8d9a19fb24..5e566315d282 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index cad625f04c38..e72ed2f4ad35 100644
--- a/metadata/md5-cache/kde-apps/kgoldrunner-18.08.1
+++ b/metadata/md5-cache/kde-apps/kgoldrunner-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kgpg-18.04.3 b/metadata/md5-cache/kde-apps/kgpg-18.04.3
index 57324b578a23..d2393f225137 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 803b5af2a1aa..aab927f60499 100644
--- a/metadata/md5-cache/kde-apps/kgpg-18.08.1
+++ b/metadata/md5-cache/kde-apps/kgpg-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/khangman-18.04.3 b/metadata/md5-cache/kde-apps/khangman-18.04.3
index 7d5768e40bbe..e069cc4cb54f 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 9e7688ca2dac..b9a3b0029a82 100644
--- a/metadata/md5-cache/kde-apps/khangman-18.08.1
+++ b/metadata/md5-cache/kde-apps/khangman-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/khelpcenter-18.04.3 b/metadata/md5-cache/kde-apps/khelpcenter-18.04.3
index 2beb9f464548..f3a43afd99b2 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 33d15909e596..56e9819d8fae 100644
--- a/metadata/md5-cache/kde-apps/khelpcenter-18.08.1
+++ b/metadata/md5-cache/kde-apps/khelpcenter-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kidentitymanagement-18.04.3 b/metadata/md5-cache/kde-apps/kidentitymanagement-18.04.3
index 4de2990e0d43..f6d129f5f45e 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index f484c371818c..a873187f27c4 100644
--- a/metadata/md5-cache/kde-apps/kidentitymanagement-18.08.1
+++ b/metadata/md5-cache/kde-apps/kidentitymanagement-18.08.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0: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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kig-18.04.3 b/metadata/md5-cache/kde-apps/kig-18.04.3
index 04420960c2db..e2a90b0988f6 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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_=f42dc61c650b2f4d4092aae104f23d1c
diff --git a/metadata/md5-cache/kde-apps/kig-18.08.1 b/metadata/md5-cache/kde-apps/kig-18.08.1
index 07a08aac32b2..9cd9995a5a7f 100644
--- a/metadata/md5-cache/kde-apps/kig-18.08.1
+++ b/metadata/md5-cache/kde-apps/kig-18.08.1
@@ -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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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/kigo-18.04.3 b/metadata/md5-cache/kde-apps/kigo-18.04.3
index d0e37a706ee7..55643d76aff6 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index d6574471e6dc..ede47c2c0883 100644
--- a/metadata/md5-cache/kde-apps/kigo-18.08.1
+++ b/metadata/md5-cache/kde-apps/kigo-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/killbots-18.04.3 b/metadata/md5-cache/kde-apps/killbots-18.04.3
index 1d653226334c..106ac9c19b3c 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index e9e28a0d32f5..42ee8a142ec2 100644
--- a/metadata/md5-cache/kde-apps/killbots-18.08.1
+++ b/metadata/md5-cache/kde-apps/killbots-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kimagemapeditor-18.04.3 b/metadata/md5-cache/kde-apps/kimagemapeditor-18.04.3
index 868d9c02c022..934bd5412737 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 45727aa20f33..f55dca763ae8 100644
--- a/metadata/md5-cache/kde-apps/kimagemapeditor-18.08.1
+++ b/metadata/md5-cache/kde-apps/kimagemapeditor-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kimap-18.04.3 b/metadata/md5-cache/kde-apps/kimap-18.04.3
index b275535b4107..80e0498b87ca 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 05b140b25cf3..4e95b86d5e3a 100644
--- a/metadata/md5-cache/kde-apps/kimap-18.08.1
+++ b/metadata/md5-cache/kde-apps/kimap-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kio-extras-18.04.3 b/metadata/md5-cache/kde-apps/kio-extras-18.04.3
index 5fbf1aee9b0f..7a68db3c310d 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 3057ff7c519b..1b1d3957dcdc 100644
--- a/metadata/md5-cache/kde-apps/kio-extras-18.08.1
+++ b/metadata/md5-cache/kde-apps/kio-extras-18.08.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.49.0:5[bzip2,lzma] >=kde-frameworks/kbookmar
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kiriki-18.04.3 b/metadata/md5-cache/kde-apps/kiriki-18.04.3
index 7cbd8436c3aa..357932705fe9 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index ba87aed24622..a27e22a73260 100644
--- a/metadata/md5-cache/kde-apps/kiriki-18.08.1
+++ b/metadata/md5-cache/kde-apps/kiriki-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kiten-18.04.3 b/metadata/md5-cache/kde-apps/kiten-18.04.3
index 647623461817..fe22fbbf0eb0 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 70b59b903a2e..b9a9257ed6bc 100644
--- a/metadata/md5-cache/kde-apps/kiten-18.08.1
+++ b/metadata/md5-cache/kde-apps/kiten-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kitinerary-18.08.1-r1 b/metadata/md5-cache/kde-apps/kitinerary-18.08.1-r1
index 38146033cf34..5e4695b54cfd 100644
--- a/metadata/md5-cache/kde-apps/kitinerary-18.08.1-r1
+++ b/metadata/md5-cache/kde-apps/kitinerary-18.08.1-r1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kjots-5.0.2 b/metadata/md5-cache/kde-apps/kjots-5.0.2
index 4310b575ff64..82e94be5b20f 100644
--- a/metadata/md5-cache/kde-apps/kjots-5.0.2
+++ b/metadata/md5-cache/kde-apps/kjots-5.0.2
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 15f34d153512..59880108bcf5 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 427ef87935f8..5003e573192b 100644
--- a/metadata/md5-cache/kde-apps/kjumpingcube-18.08.1
+++ b/metadata/md5-cache/kde-apps/kjumpingcube-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kldap-18.04.3 b/metadata/md5-cache/kde-apps/kldap-18.04.3
index 0223d7fc3b10..129578652994 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index bd8fc7128a28..61d08dac2358 100644
--- a/metadata/md5-cache/kde-apps/kldap-18.08.1
+++ b/metadata/md5-cache/kde-apps/kldap-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kleopatra-18.04.3 b/metadata/md5-cache/kde-apps/kleopatra-18.04.3
index 1be91190eade..6f0f901b0a32 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 1b0e91ed96b1..31e1c0e3471f 100644
--- a/metadata/md5-cache/kde-apps/kleopatra-18.08.1
+++ b/metadata/md5-cache/kde-apps/kleopatra-18.08.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=k
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/klettres-18.04.3 b/metadata/md5-cache/kde-apps/klettres-18.04.3
index 678062b6058f..13b7cc9778ae 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index dacb324035a7..e5d3bd6b8bb4 100644
--- a/metadata/md5-cache/kde-apps/klettres-18.08.1
+++ b/metadata/md5-cache/kde-apps/klettres-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/klickety-18.04.3 b/metadata/md5-cache/kde-apps/klickety-18.04.3
index 623a17639fbe..a48f89dc007b 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index e598061ef11d..32b89273c938 100644
--- a/metadata/md5-cache/kde-apps/klickety-18.08.1
+++ b/metadata/md5-cache/kde-apps/klickety-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/klines-18.04.3 b/metadata/md5-cache/kde-apps/klines-18.04.3
index 73942db8592a..07cb900e9582 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index af69c65f48f4..aef8ea9e0097 100644
--- a/metadata/md5-cache/kde-apps/klines-18.08.1
+++ b/metadata/md5-cache/kde-apps/klines-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kmag-18.04.3 b/metadata/md5-cache/kde-apps/kmag-18.04.3
index c51e7b349f70..2bd3a2ee4067 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 0153b892c09e..2c239ccdb0a3 100644
--- a/metadata/md5-cache/kde-apps/kmag-18.08.1
+++ b/metadata/md5-cache/kde-apps/kmag-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kmahjongg-18.04.3 b/metadata/md5-cache/kde-apps/kmahjongg-18.04.3
index d82211f65760..ad32d4c3bfb5 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index c22fa83b6276..b7fad2c92dcd 100644
--- a/metadata/md5-cache/kde-apps/kmahjongg-18.08.1
+++ b/metadata/md5-cache/kde-apps/kmahjongg-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kmail-18.04.3 b/metadata/md5-cache/kde-apps/kmail-18.04.3
index 99e0186a2644..d079f4c15693 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-apps/kmail-18.08.1 b/metadata/md5-cache/kde-apps/kmail-18.08.1
index cd1726a0bb99..203fe448fee3 100644
--- a/metadata/md5-cache/kde-apps/kmail-18.08.1
+++ b/metadata/md5-cache/kde-apps/kmail-18.08.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kbookmarks-5.49.0:5 >=kde-frameworks/kcmutils-5.49.0: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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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-account-wizard-18.04.3 b/metadata/md5-cache/kde-apps/kmail-account-wizard-18.04.3
index 0eccf47850ea..16bd78aaa32b 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 9b8a9047228c..57c30afc5879 100644
--- a/metadata/md5-cache/kde-apps/kmail-account-wizard-18.08.1
+++ b/metadata/md5-cache/kde-apps/kmail-account-wizard-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kmailtransport-18.04.3 b/metadata/md5-cache/kde-apps/kmailtransport-18.04.3
index 1bd14ac33896..4a20a19145b6 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index c6f26becb514..1eae85be000a 100644
--- a/metadata/md5-cache/kde-apps/kmailtransport-18.08.1
+++ b/metadata/md5-cache/kde-apps/kmailtransport-18.08.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0: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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kmbox-18.04.3 b/metadata/md5-cache/kde-apps/kmbox-18.04.3
index ea703d3d45e5..bcaf246c7741 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 1e529bbdbe1c..e02ff6d24990 100644
--- a/metadata/md5-cache/kde-apps/kmbox-18.08.1
+++ b/metadata/md5-cache/kde-apps/kmbox-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kmime-18.04.3 b/metadata/md5-cache/kde-apps/kmime-18.04.3
index 8ad9fcf45bb9..371cff8a9dec 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 609436eeea6b..07c797fbe294 100644
--- a/metadata/md5-cache/kde-apps/kmime-18.08.1
+++ b/metadata/md5-cache/kde-apps/kmime-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kmines-18.04.3 b/metadata/md5-cache/kde-apps/kmines-18.04.3
index a82d7edc6ba4..257bb90fb221 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 1d92c8fd3188..60dba6b836b3 100644
--- a/metadata/md5-cache/kde-apps/kmines-18.08.1
+++ b/metadata/md5-cache/kde-apps/kmines-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kmix-18.04.3 b/metadata/md5-cache/kde-apps/kmix-18.04.3
index 84a4d6222343..a5e47c1ea452 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 9734e9f9da99..507cc2a58d8c 100644
--- a/metadata/md5-cache/kde-apps/kmix-18.08.1
+++ b/metadata/md5-cache/kde-apps/kmix-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kmousetool-18.04.3 b/metadata/md5-cache/kde-apps/kmousetool-18.04.3
index ec979dfc7b4e..847bebbc8b1b 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index d67183f4df2b..12c3eb887773 100644
--- a/metadata/md5-cache/kde-apps/kmousetool-18.08.1
+++ b/metadata/md5-cache/kde-apps/kmousetool-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kmouth-18.04.3 b/metadata/md5-cache/kde-apps/kmouth-18.04.3
index 6b8a438e8ffb..483977346bb0 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 0a1fb33c6bac..73db9c5b5974 100644
--- a/metadata/md5-cache/kde-apps/kmouth-18.08.1
+++ b/metadata/md5-cache/kde-apps/kmouth-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kmplot-18.04.3 b/metadata/md5-cache/kde-apps/kmplot-18.04.3
index ab2ca765bd0a..99337f41cf3e 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 64556914bc62..b318199cf842 100644
--- a/metadata/md5-cache/kde-apps/kmplot-18.08.1
+++ b/metadata/md5-cache/kde-apps/kmplot-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/knavalbattle-18.04.3 b/metadata/md5-cache/kde-apps/knavalbattle-18.04.3
index eb2fcb112460..1d33a8d63a38 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 4d48a45c4db0..0504b7a631f4 100644
--- a/metadata/md5-cache/kde-apps/knavalbattle-18.08.1
+++ b/metadata/md5-cache/kde-apps/knavalbattle-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/knetwalk-18.04.3 b/metadata/md5-cache/kde-apps/knetwalk-18.04.3
index fbaa591dadb6..615a21f3aae2 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index fb717119bc8e..04c734deed26 100644
--- a/metadata/md5-cache/kde-apps/knetwalk-18.08.1
+++ b/metadata/md5-cache/kde-apps/knetwalk-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/knotes-18.04.3 b/metadata/md5-cache/kde-apps/knotes-18.04.3
index 0a19cea61222..a562e7cf6d85 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 9321068ef528..fe21bf8c5d56 100644
--- a/metadata/md5-cache/kde-apps/knotes-18.08.1
+++ b/metadata/md5-cache/kde-apps/knotes-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kolf-18.04.3 b/metadata/md5-cache/kde-apps/kolf-18.04.3
index bd721ade815d..e642a793bfd7 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index a55e3ee66cd3..0adb6e41b48a 100644
--- a/metadata/md5-cache/kde-apps/kolf-18.08.1-r1
+++ b/metadata/md5-cache/kde-apps/kolf-18.08.1-r1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kollision-18.04.3 b/metadata/md5-cache/kde-apps/kollision-18.04.3
index 0d5a281722fc..131b01be6456 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 34c38796b1dc..440d1e64dee4 100644
--- a/metadata/md5-cache/kde-apps/kollision-18.08.1
+++ b/metadata/md5-cache/kde-apps/kollision-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kolourpaint-18.04.3 b/metadata/md5-cache/kde-apps/kolourpaint-18.04.3
index 670edcbfb4b8..e59e83837e64 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index ac0d8787d1f0..f8a341197e3b 100644
--- a/metadata/md5-cache/kde-apps/kolourpaint-18.08.1
+++ b/metadata/md5-cache/kde-apps/kolourpaint-18.08.1
@@ -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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kompare-18.04.3 b/metadata/md5-cache/kde-apps/kompare-18.04.3
index f3d05afcc41a..39f5973c7395 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 212fcb687e94..11a5ce2bb251 100644
--- a/metadata/md5-cache/kde-apps/kompare-18.08.1
+++ b/metadata/md5-cache/kde-apps/kompare-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/konqueror-18.04.3-r1 b/metadata/md5-cache/kde-apps/konqueror-18.04.3-r1
index 267789a2fa75..2bec8438cc60 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 7bb217b879e9..52fbed34671b 100644
--- a/metadata/md5-cache/kde-apps/konqueror-18.08.1
+++ b/metadata/md5-cache/kde-apps/konqueror-18.08.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/kbookmarks-5.49.0: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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/konquest-18.04.3 b/metadata/md5-cache/kde-apps/konquest-18.04.3
index 9befe0d01214..80de46adb022 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 7b9b47ae1567..7de2b4ef19c3 100644
--- a/metadata/md5-cache/kde-apps/konquest-18.08.1
+++ b/metadata/md5-cache/kde-apps/konquest-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/konsole-18.04.3 b/metadata/md5-cache/kde-apps/konsole-18.04.3
index d0f9cff85570..33d8e270aa93 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 2a4a7bbd86dc..11c3d84f830e 100644
--- a/metadata/md5-cache/kde-apps/konsole-18.08.1
+++ b/metadata/md5-cache/kde-apps/konsole-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/konsolekalendar-18.04.3 b/metadata/md5-cache/kde-apps/konsolekalendar-18.04.3
index 2422fdd8efeb..81c24cbe2a24 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index b2c02ce8461b..6e046ae42edf 100644
--- a/metadata/md5-cache/kde-apps/konsolekalendar-18.08.1
+++ b/metadata/md5-cache/kde-apps/konsolekalendar-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kontact-18.04.3 b/metadata/md5-cache/kde-apps/kontact-18.04.3
index 86f4f06a440d..25653d41911e 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index f2ec7d903a82..6f32d77ff698 100644
--- a/metadata/md5-cache/kde-apps/kontact-18.08.1
+++ b/metadata/md5-cache/kde-apps/kontact-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kontactinterface-18.04.3 b/metadata/md5-cache/kde-apps/kontactinterface-18.04.3
index c2646296d3a7..8c6901c05c39 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 56d61f8f661d..b1675dfdfe55 100644
--- a/metadata/md5-cache/kde-apps/kontactinterface-18.08.1
+++ b/metadata/md5-cache/kde-apps/kontactinterface-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kopete-18.04.3 b/metadata/md5-cache/kde-apps/kopete-18.04.3
index fb443f3eb3a7..f643a2511109 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index b1475f936188..b0ecf85b2a63 100644
--- a/metadata/md5-cache/kde-apps/kopete-18.08.1
+++ b/metadata/md5-cache/kde-apps/kopete-18.08.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=k
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/korganizer-18.04.3 b/metadata/md5-cache/kde-apps/korganizer-18.04.3
index b946c7ee8ae7..1580c1313d29 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index d48c65ec872c..3e9581500da1 100644
--- a/metadata/md5-cache/kde-apps/korganizer-18.08.1
+++ b/metadata/md5-cache/kde-apps/korganizer-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kpat-18.04.3 b/metadata/md5-cache/kde-apps/kpat-18.04.3
index d32fa7141a8e..e5d02175a469 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 3fdb610c87f5..80fc258ae387 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 9dca2863f49f..5d7cc366d0e1 100644
--- a/metadata/md5-cache/kde-apps/kpimtextedit-18.08.1
+++ b/metadata/md5-cache/kde-apps/kpimtextedit-18.08.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0: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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kpkpass-18.08.1 b/metadata/md5-cache/kde-apps/kpkpass-18.08.1
index 1cc4ec66fff7..8dcd4aab31ca 100644
--- a/metadata/md5-cache/kde-apps/kpkpass-18.08.1
+++ b/metadata/md5-cache/kde-apps/kpkpass-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kqtquickcharts-18.04.3 b/metadata/md5-cache/kde-apps/kqtquickcharts-18.04.3
index 224c10541671..4d7c76cf7992 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 9be02cc01947..be9004f86cb1 100644
--- a/metadata/md5-cache/kde-apps/kqtquickcharts-18.08.1
+++ b/metadata/md5-cache/kde-apps/kqtquickcharts-18.08.1
@@ -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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/krdc-18.04.3 b/metadata/md5-cache/kde-apps/krdc-18.04.3
index 3ca6462a916a..1cf471069863 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 404a33ff7b44..fbb4f2d2a0e9 100644
--- a/metadata/md5-cache/kde-apps/krdc-18.08.1
+++ b/metadata/md5-cache/kde-apps/krdc-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kreversi-18.04.3 b/metadata/md5-cache/kde-apps/kreversi-18.04.3
index 597d4f283b3c..467b5799787d 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 098d16a9fc21..a25aaf1374cb 100644
--- a/metadata/md5-cache/kde-apps/kreversi-18.08.1
+++ b/metadata/md5-cache/kde-apps/kreversi-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/krfb-18.04.3 b/metadata/md5-cache/kde-apps/krfb-18.04.3
index dff7ed814bff..114de5dca95d 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index edc0ac2cfef0..5acd500ae259 100644
--- a/metadata/md5-cache/kde-apps/krfb-18.08.1
+++ b/metadata/md5-cache/kde-apps/krfb-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kross-interpreters-18.04.3 b/metadata/md5-cache/kde-apps/kross-interpreters-18.04.3
index 36cfdc719601..461ae5ff2bbd 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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_=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
index 2c99a0f63dc9..ede847cfcd8b 100644
--- a/metadata/md5-cache/kde-apps/kross-interpreters-18.08.1
+++ b/metadata/md5-cache/kde-apps/kross-interpreters-18.08.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kross-5.49.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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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/kruler-18.04.3 b/metadata/md5-cache/kde-apps/kruler-18.04.3
index a1e7386b64da..6b83b90c6216 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index f7c808d02da9..a18477ccb3be 100644
--- a/metadata/md5-cache/kde-apps/kruler-18.08.1
+++ b/metadata/md5-cache/kde-apps/kruler-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kshisen-18.04.3 b/metadata/md5-cache/kde-apps/kshisen-18.04.3
index bd4858dfe9f0..843f3d5d7847 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 04ddbcc1552e..71c9053980aa 100644
--- a/metadata/md5-cache/kde-apps/kshisen-18.08.1
+++ b/metadata/md5-cache/kde-apps/kshisen-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/ksirk-18.04.3 b/metadata/md5-cache/kde-apps/ksirk-18.04.3
index b30847e415b7..1498cbcf49f9 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index e331147b6135..93a9d9429f8f 100644
--- a/metadata/md5-cache/kde-apps/ksirk-18.08.1
+++ b/metadata/md5-cache/kde-apps/ksirk-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/ksmtp-18.04.3 b/metadata/md5-cache/kde-apps/ksmtp-18.04.3
index 40c35f3fb429..466ad461e71b 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index f11fcd1042b4..e87555f102bc 100644
--- a/metadata/md5-cache/kde-apps/ksmtp-18.08.1
+++ b/metadata/md5-cache/kde-apps/ksmtp-18.08.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.49.0:5 >=kde-frameworks/ki18n-5.49.0: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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/ksnakeduel-18.04.3 b/metadata/md5-cache/kde-apps/ksnakeduel-18.04.3
index b676ff50b6e9..d4629e97e322 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 610749ee1eea..7858316f4824 100644
--- a/metadata/md5-cache/kde-apps/ksnakeduel-18.08.1
+++ b/metadata/md5-cache/kde-apps/ksnakeduel-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kspaceduel-18.04.3 b/metadata/md5-cache/kde-apps/kspaceduel-18.04.3
index 339ac6145a7e..288a3fe5567b 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 4e895fe0f191..8aadbd4d72c9 100644
--- a/metadata/md5-cache/kde-apps/kspaceduel-18.08.1
+++ b/metadata/md5-cache/kde-apps/kspaceduel-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/ksquares-18.04.3 b/metadata/md5-cache/kde-apps/ksquares-18.04.3
index 9b8e0a9fff24..b4cfad95fc04 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 525d686c56c3..989d08511be2 100644
--- a/metadata/md5-cache/kde-apps/ksquares-18.08.1
+++ b/metadata/md5-cache/kde-apps/ksquares-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/ksudoku-18.04.3 b/metadata/md5-cache/kde-apps/ksudoku-18.04.3
index fe7d49821971..976ca32ba051 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 6fa711b058df..388a11ae5d7e 100644
--- a/metadata/md5-cache/kde-apps/ksudoku-18.08.1
+++ b/metadata/md5-cache/kde-apps/ksudoku-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/ksystemlog-18.04.3 b/metadata/md5-cache/kde-apps/ksystemlog-18.04.3
index 08d318b76bcc..c4df07c653ad 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 0125e39c5182..e817140aab5d 100644
--- a/metadata/md5-cache/kde-apps/ksystemlog-18.08.1
+++ b/metadata/md5-cache/kde-apps/ksystemlog-18.08.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0: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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kteatime-18.04.3 b/metadata/md5-cache/kde-apps/kteatime-18.04.3
index 2658c2e92e99..271f76fb5ac3 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 46400b36365a..f358c0cfee18 100644
--- a/metadata/md5-cache/kde-apps/kteatime-18.08.1
+++ b/metadata/md5-cache/kde-apps/kteatime-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/ktimer-18.04.3 b/metadata/md5-cache/kde-apps/ktimer-18.04.3
index 6ea1ce56eb14..729f2f993b90 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 1c6c5c321ae1..09f1626288df 100644
--- a/metadata/md5-cache/kde-apps/ktimer-18.08.1
+++ b/metadata/md5-cache/kde-apps/ktimer-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/ktouch-18.04.3 b/metadata/md5-cache/kde-apps/ktouch-18.04.3
index e1915581a3a0..99d61978a926 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index d9091fade9e2..613a8a1c0465 100644
--- a/metadata/md5-cache/kde-apps/ktouch-18.08.1
+++ b/metadata/md5-cache/kde-apps/ktouch-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/ktp-accounts-kcm-18.04.3 b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-18.04.3
index 95218e41a6db..49f35f224ed1 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 08e89bb773a0..f11f1b10e38e 100644
--- a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-18.08.1
+++ b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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-approver-18.04.3 b/metadata/md5-cache/kde-apps/ktp-approver-18.04.3
index 76821e25eeaf..04c10d1e3cb0 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 0ceb60b38796..1509f1336eb9 100644
--- a/metadata/md5-cache/kde-apps/ktp-approver-18.08.1
+++ b/metadata/md5-cache/kde-apps/ktp-approver-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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-auth-handler-18.04.3 b/metadata/md5-cache/kde-apps/ktp-auth-handler-18.04.3
index 2baba36e669e..53e90ea60ddc 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index c9bf8a8b50da..752e0f290576 100644
--- a/metadata/md5-cache/kde-apps/ktp-auth-handler-18.08.1
+++ b/metadata/md5-cache/kde-apps/ktp-auth-handler-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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-call-ui-18.04.3 b/metadata/md5-cache/kde-apps/ktp-call-ui-18.04.3
index 8ab6184e5c14..3a05656a96a7 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 69b5f5c17ba6..4ba41935d768 100644
--- a/metadata/md5-cache/kde-apps/ktp-call-ui-18.08.1
+++ b/metadata/md5-cache/kde-apps/ktp-call-ui-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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-common-internals-18.04.3 b/metadata/md5-cache/kde-apps/ktp-common-internals-18.04.3
index fd9194284c24..879dee0b304e 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 6de08a19c289..4445ea174e3e 100644
--- a/metadata/md5-cache/kde-apps/ktp-common-internals-18.08.1
+++ b/metadata/md5-cache/kde-apps/ktp-common-internals-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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-contact-list-18.04.3 b/metadata/md5-cache/kde-apps/ktp-contact-list-18.04.3
index 82d7b43a1962..f91c60f14cfa 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index ee6f4fdb3325..10f5da9c5a8c 100644
--- a/metadata/md5-cache/kde-apps/ktp-contact-list-18.08.1
+++ b/metadata/md5-cache/kde-apps/ktp-contact-list-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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-runner-18.04.3 b/metadata/md5-cache/kde-apps/ktp-contact-runner-18.04.3
index 50c8ed306023..f63f8d570953 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 219642a3fbd4..3264ce1343d2 100644
--- a/metadata/md5-cache/kde-apps/ktp-contact-runner-18.08.1
+++ b/metadata/md5-cache/kde-apps/ktp-contact-runner-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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-desktop-applets-18.04.3 b/metadata/md5-cache/kde-apps/ktp-desktop-applets-18.04.3
index 416e87611da9..5a15f0925b56 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index ac0bbe06152f..8e338e8aefaa 100644
--- a/metadata/md5-cache/kde-apps/ktp-desktop-applets-18.08.1
+++ b/metadata/md5-cache/kde-apps/ktp-desktop-applets-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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-filetransfer-handler-18.04.3 b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-18.04.3
index 8a347822b99f..ee141139fb04 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 9e3b4a6dc333..f429f3b7fcc4 100644
--- a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-18.08.1
+++ b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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-kded-module-18.04.3 b/metadata/md5-cache/kde-apps/ktp-kded-module-18.04.3
index 41290b73aa7d..8d286f83c052 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index e0d20376e8d0..1c5a307bbe86 100644
--- a/metadata/md5-cache/kde-apps/ktp-kded-module-18.08.1
+++ b/metadata/md5-cache/kde-apps/ktp-kded-module-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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-send-file-18.04.3 b/metadata/md5-cache/kde-apps/ktp-send-file-18.04.3
index 4e8a54efd5c0..f173097f0e78 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 837c257c05ce..26a38eea28eb 100644
--- a/metadata/md5-cache/kde-apps/ktp-send-file-18.08.1
+++ b/metadata/md5-cache/kde-apps/ktp-send-file-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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-text-ui-18.04.3 b/metadata/md5-cache/kde-apps/ktp-text-ui-18.04.3
index fddf77de3dcd..e6ca91f76e08 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index cd25462cd85b..9dddb621ef3a 100644
--- a/metadata/md5-cache/kde-apps/ktp-text-ui-18.08.1
+++ b/metadata/md5-cache/kde-apps/ktp-text-ui-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/ktuberling-18.04.3 b/metadata/md5-cache/kde-apps/ktuberling-18.04.3
index 14f40b60ca27..b2e0e6585487 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index bbd7907e6899..b42644cada0d 100644
--- a/metadata/md5-cache/kde-apps/ktuberling-18.08.1
+++ b/metadata/md5-cache/kde-apps/ktuberling-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kturtle-18.04.3 b/metadata/md5-cache/kde-apps/kturtle-18.04.3
index 6be43c47c5f0..3be07921693c 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 42d0d23d046a..eb29f7806aa7 100644
--- a/metadata/md5-cache/kde-apps/kturtle-18.08.1
+++ b/metadata/md5-cache/kde-apps/kturtle-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kubrick-18.04.3 b/metadata/md5-cache/kde-apps/kubrick-18.04.3
index cb1456bf2bff..667ad59aaf2b 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 7b69304d5dd7..c696d0c039ef 100644
--- a/metadata/md5-cache/kde-apps/kubrick-18.08.1
+++ b/metadata/md5-cache/kde-apps/kubrick-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kwalletmanager-18.04.3 b/metadata/md5-cache/kde-apps/kwalletmanager-18.04.3
index 5ef6e775d061..9cb9d5027f23 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 7dc867a6f6f6..a2ca790abe24 100644
--- a/metadata/md5-cache/kde-apps/kwalletmanager-18.08.1
+++ b/metadata/md5-cache/kde-apps/kwalletmanager-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kwave-18.04.3 b/metadata/md5-cache/kde-apps/kwave-18.04.3
index c38841ebb405..fbbc054c389a 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 51cff01297f7..df85642778b7 100644
--- a/metadata/md5-cache/kde-apps/kwave-18.08.1
+++ b/metadata/md5-cache/kde-apps/kwave-18.08.1
@@ -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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kwordquiz-18.04.3 b/metadata/md5-cache/kde-apps/kwordquiz-18.04.3
index 796b340eca56..fce2584ad7e4 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 1f58ae23cafb..44bcde3e75ba 100644
--- a/metadata/md5-cache/kde-apps/kwordquiz-18.08.1
+++ b/metadata/md5-cache/kde-apps/kwordquiz-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kwrite-18.04.3 b/metadata/md5-cache/kde-apps/kwrite-18.04.3
index 464e8570f1b9..47caf9ac49e1 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 8e92548b0588..443d6eab9d78 100644
--- a/metadata/md5-cache/kde-apps/kwrite-18.08.1
+++ b/metadata/md5-cache/kde-apps/kwrite-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/libgravatar-18.04.3 b/metadata/md5-cache/kde-apps/libgravatar-18.04.3
index c4f718298bcd..ee8f771b283e 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 6a06c7b7c956..0d56caef05b8 100644
--- a/metadata/md5-cache/kde-apps/libgravatar-18.08.1
+++ b/metadata/md5-cache/kde-apps/libgravatar-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/libkcddb-18.04.3 b/metadata/md5-cache/kde-apps/libkcddb-18.04.3
index d0c4ed2abb32..2fe5b677bd08 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 9a8afd0a6101..9a6959e9954e 100644
--- a/metadata/md5-cache/kde-apps/libkcddb-18.08.1
+++ b/metadata/md5-cache/kde-apps/libkcddb-18.08.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=kd
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/libkcompactdisc-18.04.3 b/metadata/md5-cache/kde-apps/libkcompactdisc-18.04.3
index 8a89b5f6a558..25c731cf96dd 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index d64be7a9eb88..a35be1426531 100644
--- a/metadata/md5-cache/kde-apps/libkcompactdisc-18.08.1
+++ b/metadata/md5-cache/kde-apps/libkcompactdisc-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/libkdcraw-18.04.3 b/metadata/md5-cache/kde-apps/libkdcraw-18.04.3
index 94f22f474435..8de1c24574bb 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 2f5bfa61c21f..4b1bf29c0a85 100644
--- a/metadata/md5-cache/kde-apps/libkdcraw-18.08.1
+++ b/metadata/md5-cache/kde-apps/libkdcraw-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/libkdegames-18.04.3 b/metadata/md5-cache/kde-apps/libkdegames-18.04.3
index f6adb3595876..776bf5226bbd 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 32efa4921d3b..f28ccbb839e3 100644
--- a/metadata/md5-cache/kde-apps/libkdegames-18.08.1
+++ b/metadata/md5-cache/kde-apps/libkdegames-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/libkdepim-18.04.3 b/metadata/md5-cache/kde-apps/libkdepim-18.04.3
index 193f8d56861d..37243a3dc352 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 0bd8ac9e8039..b626640dd165 100644
--- a/metadata/md5-cache/kde-apps/libkdepim-18.08.1
+++ b/metadata/md5-cache/kde-apps/libkdepim-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/libkeduvocdocument-18.04.3 b/metadata/md5-cache/kde-apps/libkeduvocdocument-18.04.3
index 3b44fb67bf15..86694c3f0489 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index da77c9686261..efcf771b7b2a 100644
--- a/metadata/md5-cache/kde-apps/libkeduvocdocument-18.08.1
+++ b/metadata/md5-cache/kde-apps/libkeduvocdocument-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/libkexiv2-18.04.3 b/metadata/md5-cache/kde-apps/libkexiv2-18.04.3
index 1475e7f048f7..fd598b147df6 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 856923b9b1ee..8e184016fa21 100644
--- a/metadata/md5-cache/kde-apps/libkexiv2-18.08.1
+++ b/metadata/md5-cache/kde-apps/libkexiv2-18.08.1
@@ -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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/libkgapi-18.04.3 b/metadata/md5-cache/kde-apps/libkgapi-18.04.3
index e255bae916c0..be813c3c6d2d 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 37205ddee48e..6b7746264b0d 100644
--- a/metadata/md5-cache/kde-apps/libkgapi-18.08.1
+++ b/metadata/md5-cache/kde-apps/libkgapi-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/libkgeomap-18.04.3 b/metadata/md5-cache/kde-apps/libkgeomap-18.04.3
index 3e5bd09f18b8..219824274608 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index a9d6eb7fe862..ce856688c58e 100644
--- a/metadata/md5-cache/kde-apps/libkgeomap-18.08.1
+++ b/metadata/md5-cache/kde-apps/libkgeomap-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/libkipi-18.04.3 b/metadata/md5-cache/kde-apps/libkipi-18.04.3
index 0bab9260420e..4a4bc0b0bd61 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 6ca48bb30394..eee3226824a0 100644
--- a/metadata/md5-cache/kde-apps/libkipi-18.08.1
+++ b/metadata/md5-cache/kde-apps/libkipi-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/libkleo-18.04.3 b/metadata/md5-cache/kde-apps/libkleo-18.04.3
index 6e433d27fe2f..20be27d68030 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 413989531cc4..ba1463ef5856 100644
--- a/metadata/md5-cache/kde-apps/libkleo-18.08.1
+++ b/metadata/md5-cache/kde-apps/libkleo-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/libkmahjongg-18.04.3 b/metadata/md5-cache/kde-apps/libkmahjongg-18.04.3
index 82ad0c7ab955..543f7233b85c 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 587a21b4110a..1a485c876f28 100644
--- a/metadata/md5-cache/kde-apps/libkmahjongg-18.08.1
+++ b/metadata/md5-cache/kde-apps/libkmahjongg-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/libkomparediff2-18.04.3 b/metadata/md5-cache/kde-apps/libkomparediff2-18.04.3
index 212e768efc77..043bbe270516 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index f18bacbc7150..55a02dd6d4cc 100644
--- a/metadata/md5-cache/kde-apps/libkomparediff2-18.08.1
+++ b/metadata/md5-cache/kde-apps/libkomparediff2-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/libksane-18.04.3 b/metadata/md5-cache/kde-apps/libksane-18.04.3
index fdb85270e71a..e7f215b2edb4 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 244d6168eff9..99474c2d548e 100644
--- a/metadata/md5-cache/kde-apps/libksane-18.08.1
+++ b/metadata/md5-cache/kde-apps/libksane-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/libksieve-18.04.3 b/metadata/md5-cache/kde-apps/libksieve-18.04.3
index bea501edd667..5e90cb866ad0 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 5f0ee1110643..920899616e12 100644
--- a/metadata/md5-cache/kde-apps/libksieve-18.08.1
+++ b/metadata/md5-cache/kde-apps/libksieve-18.08.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/kcompletion-5.49.0: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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/libktnef-18.04.3 b/metadata/md5-cache/kde-apps/libktnef-18.04.3
index f8ef23ed0120..327f7ae8c31f 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index dc973ab987e8..ee60404cf6da 100644
--- a/metadata/md5-cache/kde-apps/libktnef-18.08.1
+++ b/metadata/md5-cache/kde-apps/libktnef-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/lokalize-18.04.3 b/metadata/md5-cache/kde-apps/lokalize-18.04.3
index 932e8af10098..52893fb7e834 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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_=8a45228333f5b4d84e4bb333fc8957f5
diff --git a/metadata/md5-cache/kde-apps/lokalize-18.08.1 b/metadata/md5-cache/kde-apps/lokalize-18.08.1
index 52a0120466ef..6bd1afcf0d02 100644
--- a/metadata/md5-cache/kde-apps/lokalize-18.08.1
+++ b/metadata/md5-cache/kde-apps/lokalize-18.08.1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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/lskat-18.04.3 b/metadata/md5-cache/kde-apps/lskat-18.04.3
index 28fcda36323e..38936952fcb7 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index f3733e81fd41..a09b994c67d7 100644
--- a/metadata/md5-cache/kde-apps/lskat-18.08.1
+++ b/metadata/md5-cache/kde-apps/lskat-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/mailcommon-18.04.3 b/metadata/md5-cache/kde-apps/mailcommon-18.04.3
index 86e223bad2a2..b5e09f5f1972 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 55b3a763e0ee..acc2a6c62b4e 100644
--- a/metadata/md5-cache/kde-apps/mailcommon-18.08.1
+++ b/metadata/md5-cache/kde-apps/mailcommon-18.08.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=k
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/mailimporter-18.04.3 b/metadata/md5-cache/kde-apps/mailimporter-18.04.3
index 2b15ad5bf359..358a3d75559a 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 8c3d4fb238d2..2211be8a441a 100644
--- a/metadata/md5-cache/kde-apps/mailimporter-18.08.1
+++ b/metadata/md5-cache/kde-apps/mailimporter-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/marble-18.04.3 b/metadata/md5-cache/kde-apps/marble-18.04.3
index 6e8f5763a2fb..e66efb822495 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index c17bb04dbd76..44d7e77e4469 100644
--- a/metadata/md5-cache/kde-apps/marble-18.08.1
+++ b/metadata/md5-cache/kde-apps/marble-18.08.1
@@ -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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/mbox-importer-18.04.3 b/metadata/md5-cache/kde-apps/mbox-importer-18.04.3
index 09a4e807d43e..40e0200552da 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index c8c6e79ad713..14f8a1891f25 100644
--- a/metadata/md5-cache/kde-apps/mbox-importer-18.08.1
+++ b/metadata/md5-cache/kde-apps/mbox-importer-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/messagelib-18.04.3 b/metadata/md5-cache/kde-apps/messagelib-18.04.3
index 4c342ac1bc7c..4ba598c164cd 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 164d794bf140..21ac2fdc57a5 100644
--- a/metadata/md5-cache/kde-apps/messagelib-18.08.1
+++ b/metadata/md5-cache/kde-apps/messagelib-18.08.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/kcodecs-5.49.0:5 >=k
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/minuet-18.04.3 b/metadata/md5-cache/kde-apps/minuet-18.04.3
index f49ae0f3ef57..e3e37206fc99 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 780692b629ef..8dc831e75823 100644
--- a/metadata/md5-cache/kde-apps/minuet-18.08.1
+++ b/metadata/md5-cache/kde-apps/minuet-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/okular-18.04.3-r1 b/metadata/md5-cache/kde-apps/okular-18.04.3-r1
index d8e3d4a21766..fa3c4fca68ef 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 5a7a492a0502..daa03a2ea3e5 100644
--- a/metadata/md5-cache/kde-apps/okular-18.08.1
+++ b/metadata/md5-cache/kde-apps/okular-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/palapeli-18.04.3 b/metadata/md5-cache/kde-apps/palapeli-18.04.3
index 3192149f0171..b4302a13e1f9 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 80e351e96074..03eaadc9eda4 100644
--- a/metadata/md5-cache/kde-apps/palapeli-18.08.1
+++ b/metadata/md5-cache/kde-apps/palapeli-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/parley-18.04.3 b/metadata/md5-cache/kde-apps/parley-18.04.3
index 97c10dc5b995..259b71571564 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index b40fbd278eaf..94dfc702359e 100644
--- a/metadata/md5-cache/kde-apps/parley-18.08.1
+++ b/metadata/md5-cache/kde-apps/parley-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/picmi-18.04.3 b/metadata/md5-cache/kde-apps/picmi-18.04.3
index 8937ab887793..4c108510412d 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 8924aebf5941..0d434cf015ad 100644
--- a/metadata/md5-cache/kde-apps/picmi-18.08.1
+++ b/metadata/md5-cache/kde-apps/picmi-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/pim-data-exporter-18.04.3 b/metadata/md5-cache/kde-apps/pim-data-exporter-18.04.3
index 7dec36b1dce1..1b3c0d796789 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 0e81cd1e9c6c..6f0f400f32e6 100644
--- a/metadata/md5-cache/kde-apps/pim-data-exporter-18.08.1
+++ b/metadata/md5-cache/kde-apps/pim-data-exporter-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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-sieve-editor-18.04.3 b/metadata/md5-cache/kde-apps/pim-sieve-editor-18.04.3
index 16b5d616d5e8..5a7e9050c772 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 289280caa7b2..fe92002c98fb 100644
--- a/metadata/md5-cache/kde-apps/pim-sieve-editor-18.08.1
+++ b/metadata/md5-cache/kde-apps/pim-sieve-editor-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/pimcommon-18.04.3 b/metadata/md5-cache/kde-apps/pimcommon-18.04.3
index e99080e8e3ca..a0ca96b6d245 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 0c204cad82b0..0bb1c62c83c0 100644
--- a/metadata/md5-cache/kde-apps/pimcommon-18.08.1
+++ b/metadata/md5-cache/kde-apps/pimcommon-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/poxml-18.04.3 b/metadata/md5-cache/kde-apps/poxml-18.04.3
index 5bcc9d56adb2..f9f2857b2a3c 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index b328b1a68036..5c4e22e31b24 100644
--- a/metadata/md5-cache/kde-apps/poxml-18.08.1
+++ b/metadata/md5-cache/kde-apps/poxml-18.08.1
@@ -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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/print-manager-18.04.3 b/metadata/md5-cache/kde-apps/print-manager-18.04.3
index a790553a6cd4..863fbcc6ccc9 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index f47d8f1ef6a0..d47902e505c3 100644
--- a/metadata/md5-cache/kde-apps/print-manager-18.08.1
+++ b/metadata/md5-cache/kde-apps/print-manager-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/rocs-18.04.3 b/metadata/md5-cache/kde-apps/rocs-18.04.3
index 9f206a932961..fc3c28ade4b4 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 0ccfb7233947..1bceb932cc1c 100644
--- a/metadata/md5-cache/kde-apps/rocs-18.08.1
+++ b/metadata/md5-cache/kde-apps/rocs-18.08.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.49.0:5 >=kde-frameworks/kconfig-5.49.0:5 >=k
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/signon-kwallet-extension-18.04.3 b/metadata/md5-cache/kde-apps/signon-kwallet-extension-18.04.3
index e81938b24077..d1f10109a6a0 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 0ceadbc6fb80..8b13e5fcd1fe 100644
--- a/metadata/md5-cache/kde-apps/signon-kwallet-extension-18.08.1
+++ b/metadata/md5-cache/kde-apps/signon-kwallet-extension-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/spectacle-18.04.3-r1 b/metadata/md5-cache/kde-apps/spectacle-18.04.3-r1
index 33e1c404772c..4b2912c9bec7 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index a7e2bec75eda..b22eb0bdc019 100644
--- a/metadata/md5-cache/kde-apps/spectacle-18.08.1
+++ b/metadata/md5-cache/kde-apps/spectacle-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/step-18.04.3 b/metadata/md5-cache/kde-apps/step-18.04.3
index 7f9b326450f7..c9c81685d654 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 589a56afc5b8..ee680a774621 100644
--- a/metadata/md5-cache/kde-apps/step-18.08.1
+++ b/metadata/md5-cache/kde-apps/step-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/svgpart-18.04.3 b/metadata/md5-cache/kde-apps/svgpart-18.04.3
index 7c10481f9a9a..b33366caa513 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 4200287c7c4b..a5a257011c28 100644
--- a/metadata/md5-cache/kde-apps/svgpart-18.08.1
+++ b/metadata/md5-cache/kde-apps/svgpart-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/sweeper-18.04.3 b/metadata/md5-cache/kde-apps/sweeper-18.04.3
index 061732c89c7c..32177f986644 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index ceb5c24758f0..b1652b199c69 100644
--- a/metadata/md5-cache/kde-apps/sweeper-18.08.1
+++ b/metadata/md5-cache/kde-apps/sweeper-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/syndication-18.04.3 b/metadata/md5-cache/kde-apps/syndication-18.04.3
index 9529c1d401aa..e0f8ef7d9dab 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 bbee52816ea7..0ae6ad43acce 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index ec5774df85f3..416ffed9b880 100644
--- a/metadata/md5-cache/kde-apps/thumbnailers-18.08.1
+++ b/metadata/md5-cache/kde-apps/thumbnailers-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/umbrello-18.04.3 b/metadata/md5-cache/kde-apps/umbrello-18.04.3
index addc8b6f4642..fe535bc52702 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index aaa5c334ab5e..b82d763954b6 100644
--- a/metadata/md5-cache/kde-apps/umbrello-18.08.1
+++ b/metadata/md5-cache/kde-apps/umbrello-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/zeroconf-ioslave-18.04.3 b/metadata/md5-cache/kde-apps/zeroconf-ioslave-18.04.3
index e28d3410478a..d549aa0a34dc 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index cc084ad776c2..1d6dbc9819b5 100644
--- a/metadata/md5-cache/kde-apps/zeroconf-ioslave-18.08.1
+++ b/metadata/md5-cache/kde-apps/zeroconf-ioslave-18.08.1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index 94c402f630e2..b406d01a4555 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
index 4b213b1469d7..c78f0b6a6a72 100644
--- a/metadata/md5-cache/kde-frameworks/attica-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/attica-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 5fdf17487957..34ba707a087a 100644
--- a/metadata/md5-cache/kde-frameworks/attica-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/attica-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.46.0 b/metadata/md5-cache/kde-frameworks/baloo-5.46.0
index 315d49aeee14..7ca142f89cb2 100644
--- a/metadata/md5-cache/kde-frameworks/baloo-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/baloo-5.46.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kd
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 b091731125f5..2b79c755ad38 100644
--- a/metadata/md5-cache/kde-frameworks/baloo-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/baloo-5.50.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.50:5 >=kde-frameworks/kcoreaddons-5.50:5 >=kd
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.46.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.46.0
index ea8c9abddccf..0b09a9402ac6 100644
--- a/metadata/md5-cache/kde-frameworks/bluez-qt-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.46.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.46
 SRC_URI=mirror://kde/stable/frameworks/5.46/bluez-qt-5.46.0.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	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 83666b0f1686..240d9d4073bf 100644
--- a/metadata/md5-cache/kde-frameworks/bluez-qt-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.50.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	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
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.46.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.46.0
index b66636d31ec5..8bbbf15a52b4 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-5.46.0
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 630a34f19546..41f1a75cedf8 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-5.50.0
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
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
index cabc7ba29365..ad9074fdd895 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.46.0
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 84979a7f5a81..dd3d0a6bb0a3 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
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
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
index 3206d472a8f5..6959fdded441 100644
--- a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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 e4e5a0a3dbec..32f12da9fd95 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
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.46.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.46.0
index dbdb5b453c8c..379dce45d15c 100644
--- a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.46.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kconfigwidgets-5.46: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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 605940ab5f5e..23fd136920e9 100644
--- a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.50.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.50:5 >=kde-frameworks/kconfigwidgets-5.50: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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.46.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.46.0
index 2b74983ea3ec..d65c53237a09 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 01a5f19cdd8e..8e1443b2c9bf 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.46.0 b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.46.0
index ae231a4bcd83..bbb79033328c 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 645075d0fad1..23eef470e2a8 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.46.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.46.0
index e9f80568c2cb..685b42316349 100644
--- a/metadata/md5-cache/kde-frameworks/kapidox-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kapidox-5.46.0
@@ -10,5 +10,5 @@ RDEPEND=app-doc/doxygen dev-python/jinja[python_targets_python2_7(-)?,-python_si
 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	89bb9f083a2590d9b447fd0b78a96186
+_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 1efd6e00f214..a0045f5bdbaf 100644
--- a/metadata/md5-cache/kde-frameworks/kapidox-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kapidox-5.50.0
@@ -10,5 +10,5 @@ RDEPEND=app-doc/doxygen dev-python/jinja[python_targets_python2_7(-)?,-python_si
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.46.0 b/metadata/md5-cache/kde-frameworks/karchive-5.46.0
index 47a8dba71ca9..414ba440cab0 100644
--- a/metadata/md5-cache/kde-frameworks/karchive-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/karchive-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 67b6cc7f2cb1..fda79991f7e7 100644
--- a/metadata/md5-cache/kde-frameworks/karchive-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/karchive-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.46.0 b/metadata/md5-cache/kde-frameworks/kauth-5.46.0
index 8d626cf9d2f9..b0466513f21e 100644
--- a/metadata/md5-cache/kde-frameworks/kauth-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kauth-5.46.0
@@ -10,5 +10,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 a7d7d5f5d2b9..374ba16c1be4 100644
--- a/metadata/md5-cache/kde-frameworks/kauth-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kauth-5.50.0
@@ -10,5 +10,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.46.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.46.0
index 84d7b4f273b1..d05f102156f1 100644
--- a/metadata/md5-cache/kde-frameworks/kbookmarks-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kbookmarks-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 1f47b6c42dec..3ef3f3b83384 100644
--- a/metadata/md5-cache/kde-frameworks/kbookmarks-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kbookmarks-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.46.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.46.0
index 2ffbc2b5dd92..930de479e27c 100644
--- a/metadata/md5-cache/kde-frameworks/kcmutils-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kcmutils-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 32a45ad14b36..5445917e6b58 100644
--- a/metadata/md5-cache/kde-frameworks/kcmutils-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kcmutils-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.46.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.46.0
index 8776f7122fa6..151474c533d9 100644
--- a/metadata/md5-cache/kde-frameworks/kcodecs-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kcodecs-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 ba7a6b9c828e..234a2c231533 100644
--- a/metadata/md5-cache/kde-frameworks/kcodecs-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kcodecs-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.46.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.46.0
index c6a2429d65c9..730dca88bbec 100644
--- a/metadata/md5-cache/kde-frameworks/kcompletion-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kcompletion-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 b5b33bbac388..ba123c2dc02e 100644
--- a/metadata/md5-cache/kde-frameworks/kcompletion-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kcompletion-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.46.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.46.0
index be2091598157..c3466006f919 100644
--- a/metadata/md5-cache/kde-frameworks/kconfig-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kconfig-5.46.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 dc094b1223c2..5f7622996f60 100644
--- a/metadata/md5-cache/kde-frameworks/kconfig-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kconfig-5.50.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.46.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.46.0
index 03ef6f60887d..d03d39bdbe6d 100644
--- a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 b024f249f554..43512f906d69 100644
--- a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.46.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.46.0
index ffe4c155fbb9..3727a35dd1c4 100644
--- a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 16866bf9e5e5..0a792c3cf2cb 100644
--- a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.46.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.46.0
index b564fd4e9790..6f8d91022abb 100644
--- a/metadata/md5-cache/kde-frameworks/kcrash-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kcrash-5.46.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/kwindowsystem-5.46:
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 bfcfe3158f51..3ad2c89274cb 100644
--- a/metadata/md5-cache/kde-frameworks/kcrash-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kcrash-5.50.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.50:5 >=kde-frameworks/kwindowsystem-5.50:
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.46.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.46.0
index 53cb6f02c36c..0c6436d30a39 100644
--- a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 ba78060757db..72674f555ddb 100644
--- a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.46.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.46.0
index 18cff4c046e2..7e669bec3114 100644
--- a/metadata/md5-cache/kde-frameworks/kdeclarative-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kdeclarative-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 e8b9dbef32f5..6c1fb9f69a49 100644
--- a/metadata/md5-cache/kde-frameworks/kdeclarative-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kdeclarative-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.46.0 b/metadata/md5-cache/kde-frameworks/kded-5.46.0
index 6c6fffb8d42f..ed220b439eba 100644
--- a/metadata/md5-cache/kde-frameworks/kded-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kded-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 4f117524db66..90aafacb2b06 100644
--- a/metadata/md5-cache/kde-frameworks/kded-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kded-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.46.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.46.0
index 53b8c038f234..495f208f9307 100644
--- a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.46.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kauth-5.46:5 >=kde-frameworks/kcodecs-5.46:5 >=kde-fram
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 13382ef23a76..e9ca745d2f1e 100644
--- a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.50.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kauth-5.50:5 >=kde-frameworks/kcodecs-5.50:5 >=kde-fram
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.46.0 b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.46.0
index 87eda028b713..9f6bfee3a3b0 100644
--- a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 dffa8f8e039a..dd2e79c02f25 100644
--- a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.46.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.46.0
index 833610dbfd3f..738fac21e65f 100644
--- a/metadata/md5-cache/kde-frameworks/kdesu-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kdesu-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 e520a23daddc..a8de30ffe0a8 100644
--- a/metadata/md5-cache/kde-frameworks/kdesu-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kdesu-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kdewebkit-5.46.0 b/metadata/md5-cache/kde-frameworks/kdewebkit-5.46.0
index 8834c4bf0baa..f2d855c684d6 100644
--- a/metadata/md5-cache/kde-frameworks/kdewebkit-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kdewebkit-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 b864e57c06ef..a1826f04a275 100644
--- a/metadata/md5-cache/kde-frameworks/kdewebkit-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kdewebkit-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.46.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.46.0
index e4f36dd58b42..1f5f7cabb1b8 100644
--- a/metadata/md5-cache/kde-frameworks/kdnssd-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kdnssd-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 0479b71525d1..293c9161d03d 100644
--- a/metadata/md5-cache/kde-frameworks/kdnssd-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kdnssd-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.46.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.46.0
index 64d987f3b931..ab9e5b184716 100644
--- a/metadata/md5-cache/kde-frameworks/kdoctools-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kdoctools-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 368d2cb47afe..ddde21ba440c 100644
--- a/metadata/md5-cache/kde-frameworks/kdoctools-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kdoctools-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.46.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.46.0
index 41949ef96000..66e0ab983acc 100644
--- a/metadata/md5-cache/kde-frameworks/kemoticons-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kemoticons-5.46.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.46:5 >=kde-frameworks/kconfig-5.46:5 >=kde-f
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 c47c8425f69f..4dbad0f3b666 100644
--- a/metadata/md5-cache/kde-frameworks/kemoticons-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kemoticons-5.50.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.50:5 >=kde-frameworks/kconfig-5.50:5 >=kde-f
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.46.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.46.0
index 7def4ca8d7cf..a03d56631006 100644
--- a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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 d48f3930861f..13cc49b2327e 100644
--- a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.46.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.46.0
index c550ff082da1..09aa10603435 100644
--- a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 5fd52962604c..523af320ddf6 100644
--- a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.46.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.46.0
index aa9a2fb028fe..a7d25c3fdbc8 100644
--- a/metadata/md5-cache/kde-frameworks/kguiaddons-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kguiaddons-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 79d3b70c303e..a4b837e4014a 100644
--- a/metadata/md5-cache/kde-frameworks/kguiaddons-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kguiaddons-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kholidays-5.46.0 b/metadata/md5-cache/kde-frameworks/kholidays-5.46.0
index 113d88f76667..72f30f52d83e 100644
--- a/metadata/md5-cache/kde-frameworks/kholidays-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kholidays-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 6e0c3ccfdab5..9bd4a9aa1449 100644
--- a/metadata/md5-cache/kde-frameworks/kholidays-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kholidays-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.46.0 b/metadata/md5-cache/kde-frameworks/khtml-5.46.0
index 932cd7215446..994a7d881287 100644
--- a/metadata/md5-cache/kde-frameworks/khtml-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/khtml-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 a32abdfe0007..0df7ad5f5539 100644
--- a/metadata/md5-cache/kde-frameworks/khtml-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/khtml-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.46.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.46.0
index edfe468dd9f9..e06f34000f0d 100644
--- a/metadata/md5-cache/kde-frameworks/ki18n-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/ki18n-5.46.0
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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 df226c0bf98a..af04438c9046 100644
--- a/metadata/md5-cache/kde-frameworks/ki18n-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/ki18n-5.50.0
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.46.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.46.0
index de2f81691b60..1a2aac7119f8 100644
--- a/metadata/md5-cache/kde-frameworks/kiconthemes-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kiconthemes-5.46.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.46:5 >=kde-frameworks/kconfig-5.46:5 >=kde-f
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 0ab37f69b351..eee6d9682333 100644
--- a/metadata/md5-cache/kde-frameworks/kiconthemes-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kiconthemes-5.50.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.50:5 >=kde-frameworks/kconfig-5.50:5 >=kde-f
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.46.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.46.0
index af3f44b07e43..2c2d7eb2a034 100644
--- a/metadata/md5-cache/kde-frameworks/kidletime-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kidletime-5.46.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( >=dev-qt/qtx11ext
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 b0afeb195bd6..e0511e64c527 100644
--- a/metadata/md5-cache/kde-frameworks/kidletime-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kidletime-5.50.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( >=dev-qt/qtx11ext
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.46.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.46.0
index b7cc99407faa..9907a02ff1f7 100644
--- a/metadata/md5-cache/kde-frameworks/kimageformats-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kimageformats-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 cba099ffb046..fb7577fca159 100644
--- a/metadata/md5-cache/kde-frameworks/kimageformats-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kimageformats-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.46.0 b/metadata/md5-cache/kde-frameworks/kinit-5.46.0
index 7b40ba347a6f..333661088473 100644
--- a/metadata/md5-cache/kde-frameworks/kinit-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kinit-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 89b3b097806b..ff28d1720f8f 100644
--- a/metadata/md5-cache/kde-frameworks/kinit-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kinit-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.46.0 b/metadata/md5-cache/kde-frameworks/kio-5.46.0
index ea963e37b0a4..c61485810b62 100644
--- a/metadata/md5-cache/kde-frameworks/kio-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kio-5.46.0
@@ -11,5 +11,5 @@ RDEPEND=>=kde-frameworks/kauth-5.46:5 >=kde-frameworks/karchive-5.46:5 >=kde-fra
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 6e41806115ce..cacd3c9dd1d8 100644
--- a/metadata/md5-cache/kde-frameworks/kio-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kio-5.50.0
@@ -11,5 +11,5 @@ RDEPEND=>=kde-frameworks/kauth-5.50:5 >=kde-frameworks/karchive-5.50:5 >=kde-fra
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kirigami-5.46.0-r1 b/metadata/md5-cache/kde-frameworks/kirigami-5.46.0-r1
index a38b9b20cc4f..b74734cd1193 100644
--- a/metadata/md5-cache/kde-frameworks/kirigami-5.46.0-r1
+++ b/metadata/md5-cache/kde-frameworks/kirigami-5.46.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5= >=dev-qt/qtgraph
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 9f7e120f2d29..7b1c43ebb0f8 100644
--- a/metadata/md5-cache/kde-frameworks/kirigami-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kirigami-5.50.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5= >=dev-qt/qtgraph
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.46.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.46.0
index fd22dc8e6f88..5af0f4d9a94c 100644
--- a/metadata/md5-cache/kde-frameworks/kitemmodels-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kitemmodels-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 dc8c01dba916..5b4873e1f7ed 100644
--- a/metadata/md5-cache/kde-frameworks/kitemmodels-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kitemmodels-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.46.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.46.0
index 11bfd75fbb80..d00c828dc887 100644
--- a/metadata/md5-cache/kde-frameworks/kitemviews-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kitemviews-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 0b813202d12d..413644505aaf 100644
--- a/metadata/md5-cache/kde-frameworks/kitemviews-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kitemviews-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.46.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.46.0
index 84d88e18521c..e50208304c6f 100644
--- a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 a4950e9b4d1c..66baf35a34ee 100644
--- a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.46.0 b/metadata/md5-cache/kde-frameworks/kjs-5.46.0
index 684d2816fdb7..356a278aa3c2 100644
--- a/metadata/md5-cache/kde-frameworks/kjs-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kjs-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 2eaef6d5b058..625a8e8a0dcc 100644
--- a/metadata/md5-cache/kde-frameworks/kjs-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kjs-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kjsembed-5.46.0 b/metadata/md5-cache/kde-frameworks/kjsembed-5.46.0
index 0174f8389489..9376e86d269d 100644
--- a/metadata/md5-cache/kde-frameworks/kjsembed-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kjsembed-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 960603ac9c1c..e5dbfa096db8 100644
--- a/metadata/md5-cache/kde-frameworks/kjsembed-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kjsembed-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.46.0 b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.46.0
index 0329be1c54aa..3da7274b5b0f 100644
--- a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 0e32f8f5639d..bdd249f48fc4 100644
--- a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.46.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.46.0
index 364f19e545cc..1307d20a0c91 100644
--- a/metadata/md5-cache/kde-frameworks/knewstuff-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/knewstuff-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 75c76b4eb561..2c1a06b26f6f 100644
--- a/metadata/md5-cache/kde-frameworks/knewstuff-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/knewstuff-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.46.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.46.0
index 5f54d44dd349..ae2d78658690 100644
--- a/metadata/md5-cache/kde-frameworks/knotifications-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/knotifications-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 cf9f57eae9da..b5e84ac043ab 100644
--- a/metadata/md5-cache/kde-frameworks/knotifications-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/knotifications-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.46.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.46.0
index 08a062893ee6..1b9d50228866 100644
--- a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 06db70f30bbf..867391fd01af 100644
--- a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.46.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.46.0
index 22b2229fbece..289f6b5a0e3a 100644
--- a/metadata/md5-cache/kde-frameworks/kpackage-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kpackage-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 9e6f6994476a..722915f0a889 100644
--- a/metadata/md5-cache/kde-frameworks/kpackage-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kpackage-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.46.0 b/metadata/md5-cache/kde-frameworks/kparts-5.46.0
index cbbe72d7374c..07130eaf1113 100644
--- a/metadata/md5-cache/kde-frameworks/kparts-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kparts-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 90d575a892dc..cffe8387ae03 100644
--- a/metadata/md5-cache/kde-frameworks/kparts-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kparts-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.46.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.46.0
index 86e0137c0421..c1b649b7d845 100644
--- a/metadata/md5-cache/kde-frameworks/kpeople-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kpeople-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 8112aa742a0f..3b46aa992ab2 100644
--- a/metadata/md5-cache/kde-frameworks/kpeople-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kpeople-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.46.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.46.0
index ed67b7c9117a..31df93bf76c1 100644
--- a/metadata/md5-cache/kde-frameworks/kplotting-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kplotting-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 4d55f57a89e0..b6fec5847d4e 100644
--- a/metadata/md5-cache/kde-frameworks/kplotting-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kplotting-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.46.0 b/metadata/md5-cache/kde-frameworks/kpty-5.46.0
index a9eb7b8ae54b..044dce7e5f65 100644
--- a/metadata/md5-cache/kde-frameworks/kpty-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kpty-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 ec20554baf3c..7ab4ca9f2a28 100644
--- a/metadata/md5-cache/kde-frameworks/kpty-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kpty-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.46.0 b/metadata/md5-cache/kde-frameworks/kross-5.46.0
index 52d87333e017..28a30a86f00e 100644
--- a/metadata/md5-cache/kde-frameworks/kross-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kross-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 f6a8368ff116..5d7e8c953a37 100644
--- a/metadata/md5-cache/kde-frameworks/kross-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kross-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.46.0 b/metadata/md5-cache/kde-frameworks/krunner-5.46.0
index bcffc9b71b27..28611d33a835 100644
--- a/metadata/md5-cache/kde-frameworks/krunner-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/krunner-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 85057df93795..96bccd42558d 100644
--- a/metadata/md5-cache/kde-frameworks/krunner-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/krunner-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.46.0 b/metadata/md5-cache/kde-frameworks/kservice-5.46.0
index 39fccc8af043..c6f4f70b01c5 100644
--- a/metadata/md5-cache/kde-frameworks/kservice-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kservice-5.46.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.46:5 >=kde-frameworks/kcoreaddons-5.46:5 >=kd
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 1fdd32f1f108..c6d41b1fed36 100644
--- a/metadata/md5-cache/kde-frameworks/kservice-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kservice-5.50.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.50:5 >=kde-frameworks/kcoreaddons-5.50:5 >=kd
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.46.0-r1 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.46.0-r1
index 4b4983e05e35..cec0283c61ac 100644
--- a/metadata/md5-cache/kde-frameworks/ktexteditor-5.46.0-r1
+++ b/metadata/md5-cache/kde-frameworks/ktexteditor-5.46.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.46:5 >=kde-frameworks/kauth-5.46:5 >=kde-fra
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 dd8b9dacd8df..6af8f65d7406 100644
--- a/metadata/md5-cache/kde-frameworks/ktexteditor-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/ktexteditor-5.50.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.50:5 >=kde-frameworks/kauth-5.50:5 >=kde-fra
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.46.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.46.0
index 66a238b1f713..1e1ada086176 100644
--- a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 60cb652c320f..dc03b03529e8 100644
--- a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.46.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.46.0
index f18a05825548..65b994fe16ea 100644
--- a/metadata/md5-cache/kde-frameworks/kunitconversion-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kunitconversion-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 2d3f048cb463..6822a610614f 100644
--- a/metadata/md5-cache/kde-frameworks/kunitconversion-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kunitconversion-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.46.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.46.0
index 800bb3c8527a..e81b2c051be0 100644
--- a/metadata/md5-cache/kde-frameworks/kwallet-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kwallet-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 e827cd36d948..8ce3a587c5f7 100644
--- a/metadata/md5-cache/kde-frameworks/kwallet-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kwallet-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kwayland-5.46.0 b/metadata/md5-cache/kde-frameworks/kwayland-5.46.0
index f0c1439a07d0..72f162d0cdb1 100644
--- a/metadata/md5-cache/kde-frameworks/kwayland-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kwayland-5.46.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[egl] >=dev-libs/way
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 f80430588f50..4b7aa998a5fa 100644
--- a/metadata/md5-cache/kde-frameworks/kwayland-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kwayland-5.50.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[egl] >=dev-libs/way
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.46.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.46.0
index 6e012384d54e..31210ade82aa 100644
--- a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 4cfbf56521e9..6f06f3cfeebf 100644
--- a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.46.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.46.0
index 5ffeacbf2fff..feda6d7d2be1 100644
--- a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.46.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( >=dev-qt/qtx11ext
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 85af46611dd6..91b6369505e4 100644
--- a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.50.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( >=dev-qt/qtx11ext
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.46.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.46.0
index cd01679ebb12..51a8f60b477f 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlgui-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlgui-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 ca773f459806..2d9aac23cb1d 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlgui-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlgui-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.46.0 b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.46.0
index 3f44d0c06f7b..1caf5e112b0b 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 35d8ddfbc2ba..0dd0ed69ef1f 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.46.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.46.0
index 976359229c9d..e75179d13ffb 100644
--- a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.46.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 net-misc/modemmanager >=k
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 d79dd91768cd..6f966021b933 100644
--- a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.50.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 net-misc/modemmanager >=k
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.46.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.46.0
index 344dad121b4f..143f172f403b 100644
--- a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 abbb24e91729..a12350764df0 100644
--- a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.46.0 b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.46.0
index fbe94c01e39a..197aa242e030 100644
--- a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 20a7a750afb7..caa81d7e889c 100644
--- a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.46.0 b/metadata/md5-cache/kde-frameworks/plasma-5.46.0
index f3475e8f41f0..f4e9eb0526d8 100644
--- a/metadata/md5-cache/kde-frameworks/plasma-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.46.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.46:5 >=kde-frameworks/karchive-5.46:5 >=k
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 75f7b63804d1..0228bf39f24b 100644
--- a/metadata/md5-cache/kde-frameworks/plasma-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.50.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.50:5 >=kde-frameworks/karchive-5.50:5 >=k
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/prison-5.46.0 b/metadata/md5-cache/kde-frameworks/prison-5.46.0
index cd33e11e51da..9cb0967ece30 100644
--- a/metadata/md5-cache/kde-frameworks/prison-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/prison-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 3541ff93996f..d94e55dd183f 100644
--- a/metadata/md5-cache/kde-frameworks/prison-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/prison-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/purpose-5.46.0 b/metadata/md5-cache/kde-frameworks/purpose-5.46.0
index 26d350160c76..abe646409190 100644
--- a/metadata/md5-cache/kde-frameworks/purpose-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/purpose-5.46.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.46:5 >=kde-frameworks/ki18n-5.46:5 >=kde-
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 bede50054903..25c1fcadbfc0 100644
--- a/metadata/md5-cache/kde-frameworks/purpose-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/purpose-5.50.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.50:5 >=kde-frameworks/ki18n-5.50:5 >=kde-
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
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
index 8954a5581087..fda75aad8375 100644
--- a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.46.2
+++ b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.46.2
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 1fe68e3971bd..df947633204a 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
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.46.0-r1 b/metadata/md5-cache/kde-frameworks/solid-5.46.0-r1
index 902131d73983..32f6164b165e 100644
--- a/metadata/md5-cache/kde-frameworks/solid-5.46.0-r1
+++ b/metadata/md5-cache/kde-frameworks/solid-5.46.0-r1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 a45d7be43b0d..61a8ec73d72a 100644
--- a/metadata/md5-cache/kde-frameworks/solid-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/solid-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.46.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.46.0
index c7c62ead3a08..50b840ce643a 100644
--- a/metadata/md5-cache/kde-frameworks/sonnet-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/sonnet-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 c2dbb14067a8..de6d8a8e2d74 100644
--- a/metadata/md5-cache/kde-frameworks/sonnet-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/sonnet-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/syndication-5.50.0 b/metadata/md5-cache/kde-frameworks/syndication-5.50.0
index 358a13cecc2e..da59cc169113 100644
--- a/metadata/md5-cache/kde-frameworks/syndication-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/syndication-5.50.0
@@ -9,5 +9,5 @@ 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 )
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.46.0 b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.46.0
index 0930f5e4056c..756bd4094744 100644
--- a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 813878ab5c5d..7e27dbdc0152 100644
--- a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.46.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.46.0
index eeb9a085ebba..42f51a844039 100644
--- a/metadata/md5-cache/kde-frameworks/threadweaver-5.46.0
+++ b/metadata/md5-cache/kde-frameworks/threadweaver-5.46.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 e047c6a9aa15..078a830286a1 100644
--- a/metadata/md5-cache/kde-frameworks/threadweaver-5.50.0
+++ b/metadata/md5-cache/kde-frameworks/threadweaver-5.50.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index 31b7569ec4da..beb37f328b31 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 e9663d8e0a77..57a229b4f399 100644
--- a/metadata/md5-cache/kde-misc/basket-2.49a_p20170225-r1
+++ b/metadata/md5-cache/kde-misc/basket-2.49a_p20170225-r1
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	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
 _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 e141873f8f15..563572c96952 100644
--- a/metadata/md5-cache/kde-misc/colord-kde-0.5.0
+++ b/metadata/md5-cache/kde-misc/colord-kde-0.5.0
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 02dc66f2a91b..0539b056b588 100644
--- a/metadata/md5-cache/kde-misc/gmailfeed-1.1
+++ b/metadata/md5-cache/kde-misc/gmailfeed-1.1
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 e0b060766780..cf996bca0a65 100644
--- a/metadata/md5-cache/kde-misc/kdeconnect-1.3.1
+++ b/metadata/md5-cache/kde-misc/kdeconnect-1.3.1
@@ -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/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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kdiff3-0.9.98_p20170219-r1 b/metadata/md5-cache/kde-misc/kdiff3-0.9.98_p20170219-r1
index 1763c1f966ac..15b640695e11 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
@@ -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/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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 f0e9fae1e16d..edc8aa5a0f45 100644
--- a/metadata/md5-cache/kde-misc/kdirstat-3.1.3
+++ b/metadata/md5-cache/kde-misc/kdirstat-3.1.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/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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 0f648b8cb63f..80b76f442325 100644
--- a/metadata/md5-cache/kde-misc/kimtoy-1.91
+++ b/metadata/md5-cache/kde-misc/kimtoy-1.91
@@ -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/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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 d0ac86e49ff7..55b25caead2b 100644
--- a/metadata/md5-cache/kde-misc/kio-gdrive-1.2.4
+++ b/metadata/md5-cache/kde-misc/kio-gdrive-1.2.4
@@ -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/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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 77516d2d2bbd..554d038da656 100644
--- a/metadata/md5-cache/kde-misc/kio-gopher-0.1.99
+++ b/metadata/md5-cache/kde-misc/kio-gopher-0.1.99
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 e288bdb8d98f..a8ae28d83006 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
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 6d1ce6a45ef4..e2e4e11b577a 100644
--- a/metadata/md5-cache/kde-misc/kio-stash-1.0
+++ b/metadata/md5-cache/kde-misc/kio-stash-1.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0 >=kde-frameworks/kdbusaddons-5.46.0
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 04fe3104ae63..f60feee6435f 100644
--- a/metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.2
+++ b/metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.2
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 df0c721cff02..1262c1127048 100644
--- a/metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.3
+++ b/metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.3
@@ -9,5 +9,5 @@ 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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
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 fabb01df5497..2295261ae4ce 100644
--- a/metadata/md5-cache/kde-misc/kolor-manager-1.1.0
+++ b/metadata/md5-cache/kde-misc/kolor-manager-1.1.0
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 c9ff3790beee..a52a7e1d4654 100644
--- a/metadata/md5-cache/kde-misc/krename-5.0.0
+++ b/metadata/md5-cache/kde-misc/krename-5.0.0
@@ -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/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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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.0 b/metadata/md5-cache/kde-misc/krusader-2.7.0
deleted file mode 100644
index c7c1476de6c4..000000000000
--- a/metadata/md5-cache/kde-misc/krusader-2.7.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.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
-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
-SLOT=5
-SRC_URI=mirror://kde/stable/krusader/2.7.0/krusader-2.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=b589734f37b9e482a16c9708a3f87afc
diff --git a/metadata/md5-cache/kde-misc/krusader-2.7.1 b/metadata/md5-cache/kde-misc/krusader-2.7.1
index 15aaa4f0b67c..ff00ec58d8c2 100644
--- a/metadata/md5-cache/kde-misc/krusader-2.7.1
+++ b/metadata/md5-cache/kde-misc/krusader-2.7.1
@@ -4,10 +4,10 @@ DESCRIPTION=Advanced twin-panel (commander-style) file-manager with many extras
 EAPI=6
 HOMEPAGE=https://krusader.org/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
+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
 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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=450848d74cc7c4d4aa1a1b462ae38e3c
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 c575ab7d6498..8fbd2c4ee1c5 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 ab0b37315c2b..c37517139453 100644
--- a/metadata/md5-cache/kde-misc/ktoshiba-5.3.1
+++ b/metadata/md5-cache/kde-misc/ktoshiba-5.3.1
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 c7bd32acffad..270668103546 100644
--- a/metadata/md5-cache/kde-misc/kwebkitpart-1.4.0_pre20180406
+++ b/metadata/md5-cache/kde-misc/kwebkitpart-1.4.0_pre20180406
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	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
 _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 a36b2a2500a1..331256935f0d 100644
--- a/metadata/md5-cache/kde-misc/latte-dock-0.7.5
+++ b/metadata/md5-cache/kde-misc/latte-dock-0.7.5
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 1d71054b447e..3bca405a1de7 100644
--- a/metadata/md5-cache/kde-misc/latte-dock-0.8.0
+++ b/metadata/md5-cache/kde-misc/latte-dock-0.8.0
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
new file mode 100644
index 000000000000..99fdfceb3d23
--- /dev/null
+++ b/metadata/md5-cache/kde-misc/latte-dock-0.8.1
@@ -0,0 +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
+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
+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
+_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 5f7079210b5a..0a69d80064f7 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
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 a0a06afa5227..cbbea5b951be 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
@@ -8,5 +8,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _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 4968994da484..8def9a32ab56 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
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 952a78306f35..adfbc59061b6 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
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 c02960e7fac6..e9875d186d03 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
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 86722e71a163..baa36b794eaf 100644
--- a/metadata/md5-cache/kde-misc/playbar2-2.5
+++ b/metadata/md5-cache/kde-misc/playbar2-2.5
@@ -8,5 +8,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _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 62144214788a..93acd2246720 100644
--- a/metadata/md5-cache/kde-misc/rsibreak-0.12.8
+++ b/metadata/md5-cache/kde-misc/rsibreak-0.12.8
@@ -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/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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 34de9a7c6033..48ccde46a24c 100644
--- a/metadata/md5-cache/kde-misc/skanlite-2.1.0.1
+++ b/metadata/md5-cache/kde-misc/skanlite-2.1.0.1
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 b7a546c6b005..034c61b7cc02 100644
--- a/metadata/md5-cache/kde-misc/systemd-kcm-1.2.1
+++ b/metadata/md5-cache/kde-misc/systemd-kcm-1.2.1
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 88b3e5dea5bf..2ea340013408 100644
--- a/metadata/md5-cache/kde-misc/tellico-3.1.2
+++ b/metadata/md5-cache/kde-misc/tellico-3.1.2
@@ -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=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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/wacomtablet-3.1.0 b/metadata/md5-cache/kde-misc/wacomtablet-3.1.0
index 541befde9718..39e2ca53bab5 100644
--- a/metadata/md5-cache/kde-misc/wacomtablet-3.1.0
+++ b/metadata/md5-cache/kde-misc/wacomtablet-3.1.0
@@ -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/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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 d082c0a767fe..2c88e7563e8f 100644
--- a/metadata/md5-cache/kde-misc/yakuake-3.0.5
+++ b/metadata/md5-cache/kde-misc/yakuake-3.0.5
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 c321227f7141..0a86e79aceb3 100644
--- a/metadata/md5-cache/kde-misc/zanshin-0.5.0
+++ b/metadata/md5-cache/kde-misc/zanshin-0.5.0
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 35226b2e4967..babc1dcd0eef 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
index d6d55dee054e..f9708e7fc227 100644
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.12.5
+++ b/metadata/md5-cache/kde-plasma/bluedevil-5.12.5
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 dd0f868a215f..167f42ce501a 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 2acdbf830142..38ca92ecb5f5 100644
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.13.5
+++ b/metadata/md5-cache/kde-plasma/bluedevil-5.13.5
@@ -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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.12.5 b/metadata/md5-cache/kde-plasma/breeze-5.12.5
index 2452c79a95de..b9b2ffc11e46 100644
--- a/metadata/md5-cache/kde-plasma/breeze-5.12.5
+++ b/metadata/md5-cache/kde-plasma/breeze-5.12.5
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 89bb21472bf0..f500f1f3dc70 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 33312c502dec..781add94937a 100644
--- a/metadata/md5-cache/kde-plasma/breeze-5.13.5
+++ b/metadata/md5-cache/kde-plasma/breeze-5.13.5
@@ -10,5 +10,5 @@ PDEPEND=>=kde-frameworks/breeze-icons-5.46.0:5 >=kde-plasma/kde-cli-tools-5.13.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.12.5 b/metadata/md5-cache/kde-plasma/breeze-grub-5.12.5
index a2eeae268120..e34ec5b3af8c 100644
--- a/metadata/md5-cache/kde-plasma/breeze-grub-5.12.5
+++ b/metadata/md5-cache/kde-plasma/breeze-grub-5.12.5
@@ -7,5 +7,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 64b0bdca01a7..94a2b82c1d9e 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 0d309c29f951..638186790ea8 100644
--- a/metadata/md5-cache/kde-plasma/breeze-grub-5.13.5
+++ b/metadata/md5-cache/kde-plasma/breeze-grub-5.13.5
@@ -7,5 +7,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.12.5 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.12.5
index 022b8cd7d48b..34f04d77e159 100644
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.12.5
+++ b/metadata/md5-cache/kde-plasma/breeze-gtk-5.12.5
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 771c1b5f0b98..ae896e03eb38 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 fbca73d630b4..9d48ea5f5fa1 100644
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.13.5
+++ b/metadata/md5-cache/kde-plasma/breeze-gtk-5.13.5
@@ -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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.12.5 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.12.5
index 26caed718453..e4e9fe7b2f8a 100644
--- a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.12.5
+++ b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.12.5
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 c33a99d4bf57..cf5d43ab4066 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 adafa97478a5..e3e114eab531 100644
--- a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.13.5
+++ b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.13.5
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.12.5 b/metadata/md5-cache/kde-plasma/drkonqi-5.12.5
index 4ef106d9c363..f37d4923a313 100644
--- a/metadata/md5-cache/kde-plasma/drkonqi-5.12.5
+++ b/metadata/md5-cache/kde-plasma/drkonqi-5.12.5
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 d248a5cd9c51..653db5aba92c 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 b742551ade51..55b1936a8c5a 100644
--- a/metadata/md5-cache/kde-plasma/drkonqi-5.13.5
+++ b/metadata/md5-cache/kde-plasma/drkonqi-5.13.5
@@ -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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.12.5 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.12.5
index a3385bbdbc5f..a9cc026867bf 100644
--- a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.12.5
+++ b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.12.5
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 d7891febc047..7c326f22bc5e 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 bfa54618eba6..03d49a26384b 100644
--- a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.13.5
+++ b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.13.5
@@ -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/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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
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
index 8596fb914cb9..b4bc4ecc87e2 100644
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.12.5
+++ b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.12.5
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.43.0:5 >=kde-frameworks/kcmutils-5.43.0: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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 2425dd386501..d89cf3868334 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 b28b4f080f18..82c55c0061f5 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
@@ -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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
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
index 426cfadb9757..2517e0c03d5b 100644
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.12.5
+++ b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.12.5
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 bc62066a7352..3e4759c1d1b5 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 ffdc77acf8ed..f59380e827d5 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
@@ -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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.12.5 b/metadata/md5-cache/kde-plasma/kdecoration-5.12.5
index 4c0954ec37bd..93a699856baf 100644
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.12.5
+++ b/metadata/md5-cache/kde-plasma/kdecoration-5.12.5
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 1add92772337..44c82dbdb480 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 beabd7cbec21..9f72d687f3d3 100644
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.13.5
+++ b/metadata/md5-cache/kde-plasma/kdecoration-5.13.5
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.12.5 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.12.5
index 22919ad79d64..7bc8c6a94eb0 100644
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.12.5
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.12.5
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 cee57a06965b..44bb1cc0c518 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 e9ad7b92766c..865e8c065e08 100644
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.13.5
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.13.5
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.12.5 b/metadata/md5-cache/kde-plasma/kgamma-5.12.5
index 027589ec6268..096e7d97517c 100644
--- a/metadata/md5-cache/kde-plasma/kgamma-5.12.5
+++ b/metadata/md5-cache/kde-plasma/kgamma-5.12.5
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 0fa735443002..7e630bb8a616 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 9512ed676644..2494b7d598b3 100644
--- a/metadata/md5-cache/kde-plasma/kgamma-5.13.5
+++ b/metadata/md5-cache/kde-plasma/kgamma-5.13.5
@@ -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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.12.5 b/metadata/md5-cache/kde-plasma/khotkeys-5.12.5
index c7ccd831f1c2..0c64650408f6 100644
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.12.5
+++ b/metadata/md5-cache/kde-plasma/khotkeys-5.12.5
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 dacc54d47bea..26dc44de492b 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 9adc74df7566..93eda0c14a58 100644
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.13.5
+++ b/metadata/md5-cache/kde-plasma/khotkeys-5.13.5
@@ -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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.12.5 b/metadata/md5-cache/kde-plasma/kinfocenter-5.12.5
index ff0a036a051c..61b3586c5a10 100644
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.12.5
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.12.5
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0: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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 bbeddf39e2ed..bf27ea1122f3 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 a4490bdd0dc2..70bc0768d942 100644
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.13.5
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.13.5
@@ -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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.12.5 b/metadata/md5-cache/kde-plasma/kmenuedit-5.12.5
index bbb021b90fd2..e43d8794aaef 100644
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.12.5
+++ b/metadata/md5-cache/kde-plasma/kmenuedit-5.12.5
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 4faa5a3db53d..a40f262d724a 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 262378c067ad..a159378328ab 100644
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.13.5
+++ b/metadata/md5-cache/kde-plasma/kmenuedit-5.13.5
@@ -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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.12.5 b/metadata/md5-cache/kde-plasma/kscreen-5.12.5
index 51a48ad27d27..19e76194e22e 100644
--- a/metadata/md5-cache/kde-plasma/kscreen-5.12.5
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.12.5
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 0ba48977326a..50aea92efec3 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 99c834338f4e..81fc7746b576 100644
--- a/metadata/md5-cache/kde-plasma/kscreen-5.13.5
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.13.5
@@ -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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.12.5 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.12.5
index d37b277b2eb9..01c36ad73424 100644
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.12.5
+++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.12.5
@@ -11,5 +11,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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	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 e641d82149b3..cf0fa3b74e91 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	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_=be35fa6fda5b756ca24010777300dd1b
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.13.5 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.13.5
index 71f6e88d09ac..725f06ab85d0 100644
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.13.5
+++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.13.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	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
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.12.5 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.12.5
index 0195d68edf8a..958e6140aed9 100644
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.12.5
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.12.5
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 f9cf6baa59c1..0d55b74b5f26 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 119f2ed921d4..234e212be4de 100644
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.13.5
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.13.5
@@ -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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.12.5 b/metadata/md5-cache/kde-plasma/ksysguard-5.12.5
index a4c819a8305b..4d4dcc29f757 100644
--- a/metadata/md5-cache/kde-plasma/ksysguard-5.12.5
+++ b/metadata/md5-cache/kde-plasma/ksysguard-5.12.5
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 eb4c2a648fea..6f6f82eec570 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 b90dfe895cf2..fafeaa0633f8 100644
--- a/metadata/md5-cache/kde-plasma/ksysguard-5.13.5
+++ b/metadata/md5-cache/kde-plasma/ksysguard-5.13.5
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
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
index 25728737c755..a72e0a461de0 100644
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.12.5-r1
+++ b/metadata/md5-cache/kde-plasma/kwallet-pam-5.12.5-r1
@@ -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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 d074ed4d9648..bfda03cc2cb3 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 4f2c2b1d9484..b2eca6890c41 100644
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.13.5
+++ b/metadata/md5-cache/kde-plasma/kwallet-pam-5.13.5
@@ -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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.12.5 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.12.5
index 0c95068ee535..5b62e376c2dc 100644
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.12.5
+++ b/metadata/md5-cache/kde-plasma/kwayland-integration-5.12.5
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 f14486f237c7..640f4317f233 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 6c2ab050b85d..a67bea34711f 100644
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.13.5
+++ b/metadata/md5-cache/kde-plasma/kwayland-integration-5.13.5
@@ -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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.12.5 b/metadata/md5-cache/kde-plasma/kwin-5.12.5
index c846af6ed6f4..0bae037dff33 100644
--- a/metadata/md5-cache/kde-plasma/kwin-5.12.5
+++ b/metadata/md5-cache/kde-plasma/kwin-5.12.5
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.43.0:5 >=kde-frameworks/kauth-5.43.0: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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 aa70b603388a..bf28f5078ee5 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 61037e7a0db0..b3bb2c8cf49c 100644
--- a/metadata/md5-cache/kde-plasma/kwin-5.13.5
+++ b/metadata/md5-cache/kde-plasma/kwin-5.13.5
@@ -11,5 +11,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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.12.5 b/metadata/md5-cache/kde-plasma/kwrited-5.12.5
index 381bc7e0b34b..523f6187471b 100644
--- a/metadata/md5-cache/kde-plasma/kwrited-5.12.5
+++ b/metadata/md5-cache/kde-plasma/kwrited-5.12.5
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 0d54e3a8c676..3149f7527175 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 cc2d2d0ada06..aebcd7a2a080 100644
--- a/metadata/md5-cache/kde-plasma/kwrited-5.13.5
+++ b/metadata/md5-cache/kde-plasma/kwrited-5.13.5
@@ -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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.12.5 b/metadata/md5-cache/kde-plasma/libkscreen-5.12.5
index de4cd2c923ac..5c434bd23818 100644
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.12.5
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.12.5
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kwayland-5.43.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgu
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 b455fd889574..37ece31196d7 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 a12372a404eb..199cca730245 100644
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.13.5
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.13.5
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kwayland-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtg
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.12.5 b/metadata/md5-cache/kde-plasma/libksysguard-5.12.5
index 1838d70c34da..1c331ae50f5b 100644
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.12.5
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.12.5
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 15d2092f4fcf..bbd8b91a09b5 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 e70d45e2e80f..5aa17f0d4f93 100644
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.13.5
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.13.5
@@ -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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-plasma/milou-5.12.5 b/metadata/md5-cache/kde-plasma/milou-5.12.5
index 501cb277c497..d149196308eb 100644
--- a/metadata/md5-cache/kde-plasma/milou-5.12.5
+++ b/metadata/md5-cache/kde-plasma/milou-5.12.5
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 1553677ad8d6..6ee44b4b9fc9 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 4f1e2ebdbefc..367e02adcb9e 100644
--- a/metadata/md5-cache/kde-plasma/milou-5.13.5
+++ b/metadata/md5-cache/kde-plasma/milou-5.13.5
@@ -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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.12.5 b/metadata/md5-cache/kde-plasma/oxygen-5.12.5
index b16e07bb0a05..f021b5394727 100644
--- a/metadata/md5-cache/kde-plasma/oxygen-5.12.5
+++ b/metadata/md5-cache/kde-plasma/oxygen-5.12.5
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 cbecd3c7cbcb..37f0b113f504 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 ef99c8a7fcbd..919ff7b64d7a 100644
--- a/metadata/md5-cache/kde-plasma/oxygen-5.13.5-r1
+++ b/metadata/md5-cache/kde-plasma/oxygen-5.13.5-r1
@@ -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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
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 bf97baacdf39..d30ba2a5d301 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
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
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
index 4c6a090a5488..ad38aa009759 100644
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.12.5-r1
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.12.5-r1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index b81ca1e2c439..2305fb6abd2d 100644
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.12.7
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.12.7
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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.13.5-r1 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.13.5-r1
deleted file mode 100644
index 60e01cf461fc..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.13.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.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=fd4be17431964f8b5d4e34585925a024
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
new file mode 100644
index 000000000000..da36e12e3815
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.13.5-r2
@@ -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/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-integration-5.12.5 b/metadata/md5-cache/kde-plasma/plasma-integration-5.12.5
index 69cefc12be42..5327a5c61ea8 100644
--- a/metadata/md5-cache/kde-plasma/plasma-integration-5.12.5
+++ b/metadata/md5-cache/kde-plasma/plasma-integration-5.12.5
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0: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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 114277345102..38baafc58665 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 461177354111..a76609c27ebc 100644
--- a/metadata/md5-cache/kde-plasma/plasma-integration-5.13.5
+++ b/metadata/md5-cache/kde-plasma/plasma-integration-5.13.5
@@ -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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.12.5 b/metadata/md5-cache/kde-plasma/plasma-nm-5.12.5
index a5bf1ec168ed..f8bb5ef20c03 100644
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.12.5
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.12.5
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 05b2fd2a2c5d..82bcfeef0050 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 c64d29f2e0f8..e17919971536 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
@@ -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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.12.5 b/metadata/md5-cache/kde-plasma/plasma-pa-5.12.5
index 39f58085a28a..560464bd9129 100644
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.12.5
+++ b/metadata/md5-cache/kde-plasma/plasma-pa-5.12.5
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 324be9a3391d..08a1a2c9ee7e 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 8975b9409682..bfaa99e23bfb 100644
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.13.5
+++ b/metadata/md5-cache/kde-plasma/plasma-pa-5.13.5
@@ -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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.12.5 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.12.5
index e241128a429c..2bbf01a16b94 100644
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.12.5
+++ b/metadata/md5-cache/kde-plasma/plasma-sdk-5.12.5
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 6e32e8efd8c7..816d959a5fa1 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 914a1d3f96b6..5d5091c25b90 100644
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.13.5
+++ b/metadata/md5-cache/kde-plasma/plasma-sdk-5.13.5
@@ -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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.12.5 b/metadata/md5-cache/kde-plasma/plasma-vault-5.12.5
index d0ad93b0ab0c..bb99e2c7d4db 100644
--- a/metadata/md5-cache/kde-plasma/plasma-vault-5.12.5
+++ b/metadata/md5-cache/kde-plasma/plasma-vault-5.12.5
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 d40b3ae8c40a..33cd0b071620 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 c840c2b03977..bf6d144a05e0 100644
--- a/metadata/md5-cache/kde-plasma/plasma-vault-5.13.5
+++ b/metadata/md5-cache/kde-plasma/plasma-vault-5.13.5
@@ -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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.12.5 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.12.5
index 340d5ec124ed..ecc367439273 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.12.5
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.12.5
@@ -11,5 +11,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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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 7ee2b768a439..3c0c8c8b7035 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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_=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 5c2ab7d9d36f..81a57b71ea6a 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
@@ -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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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
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
index 3125ac1dbb67..00d54cbed190 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.12.5
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.12.5
@@ -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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 3d5bfbd252ff..063de58219a1 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 ca1acb250380..84655bd1898f 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
@@ -7,5 +7,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.12.5 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.12.5
index d9ec3ec8d294..dad216c5f97b 100644
--- a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.12.5
+++ b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.12.5
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 03a93d6427e1..b6138569de22 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 9d9a8abd367e..2cd58d0d72da 100644
--- a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.13.5
+++ b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.13.5
@@ -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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
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
index 11eba53f4706..5bb5c06dcb92 100644
--- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.12.5
+++ b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.12.5
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 23b47ce8699a..3f4f9502d271 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 82fced13cb31..5169da410375 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
@@ -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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.12.5 b/metadata/md5-cache/kde-plasma/powerdevil-5.12.5
index 5be46a9d799c..c3b1322b5340 100644
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.12.5
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.12.5
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 d5a61022e00e..dce53291e273 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 19eb4b29de5b..6caba61d6fbe 100644
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.13.5
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.13.5
@@ -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/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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.12.5 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.12.5
index 28d64552c317..1ff6c0be67be 100644
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.12.5
+++ b/metadata/md5-cache/kde-plasma/sddm-kcm-5.12.5
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 6337dd496490..e454d7b086fa 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 1b027700feca..02c7aba29ab2 100644
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.13.5
+++ b/metadata/md5-cache/kde-plasma/sddm-kcm-5.13.5
@@ -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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.12.5 b/metadata/md5-cache/kde-plasma/systemsettings-5.12.5
index a1994e122761..7d55590a31cb 100644
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.12.5
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.12.5
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 be96ab8ed652..f42bd7356cf8 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 73f841eeb37f..9a72a7c5fdf0 100644
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.13.5
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.13.5
@@ -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 >=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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
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
index 5a342184c044..53488ebab465 100644
--- a/metadata/md5-cache/kde-plasma/user-manager-5.12.5-r1
+++ b/metadata/md5-cache/kde-plasma/user-manager-5.12.5-r1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index 435583db920a..03078899ca68 100644
--- a/metadata/md5-cache/kde-plasma/user-manager-5.12.7
+++ b/metadata/md5-cache/kde-plasma/user-manager-5.12.7
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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.13.5 b/metadata/md5-cache/kde-plasma/user-manager-5.13.5
index 9d6f2216b021..ee4aee59ea63 100644
--- a/metadata/md5-cache/kde-plasma/user-manager-5.13.5
+++ b/metadata/md5-cache/kde-plasma/user-manager-5.13.5
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/lxde-base/Manifest.gz b/metadata/md5-cache/lxde-base/Manifest.gz
index 70a0b1f5a097..e93680cf5f88 100644
--- a/metadata/md5-cache/lxde-base/Manifest.gz
+++ b/metadata/md5-cache/lxde-base/Manifest.gz
diff --git a/metadata/md5-cache/lxde-base/lxde-icon-theme-0.5.0-r1 b/metadata/md5-cache/lxde-base/lxde-icon-theme-0.5.0-r1
index a1048298b364..f359dcc183ae 100644
--- a/metadata/md5-cache/lxde-base/lxde-icon-theme-0.5.0-r1
+++ b/metadata/md5-cache/lxde-base/lxde-icon-theme-0.5.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/LXDE%20Icon%20Theme/lxde-icon-theme-0.5.0/lxde-icon-theme-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3b84435a558b84f51d88afd32ff8695b
diff --git a/metadata/md5-cache/lxde-base/lxde-icon-theme-0.5.1 b/metadata/md5-cache/lxde-base/lxde-icon-theme-0.5.1
index 93f480c617dd..7a3de6dab7e7 100644
--- a/metadata/md5-cache/lxde-base/lxde-icon-theme-0.5.1
+++ b/metadata/md5-cache/lxde-base/lxde-icon-theme-0.5.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/LXDE%20Icon%20Theme/lxde-icon-theme-0.5.1/lxde-icon-theme-0.5.1.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-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=e6407b3fc8c4b06a0f79081909fbc365
diff --git a/metadata/md5-cache/lxqt-base/Manifest.gz b/metadata/md5-cache/lxqt-base/Manifest.gz
index d84ce9735da9..9ceec22e26d5 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
index 5c92e248e15f..a44a66016607 100644
--- a/metadata/md5-cache/lxqt-base/liblxqt-0.11.0-r1
+++ b/metadata/md5-cache/lxqt-base/liblxqt-0.11.0-r1
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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 acfd1fe77f0c..01bfbc8743b3 100644
--- a/metadata/md5-cache/lxqt-base/liblxqt-0.13.0
+++ b/metadata/md5-cache/lxqt-base/liblxqt-0.13.0
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/lxqt-base/libsysstat-0.3.1 b/metadata/md5-cache/lxqt-base/libsysstat-0.3.1
index b26e099e7b38..7ac4cd8fd0a0 100644
--- a/metadata/md5-cache/lxqt-base/libsysstat-0.3.1
+++ b/metadata/md5-cache/lxqt-base/libsysstat-0.3.1
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
index 3633fd6b3783..2687acac7c18 100644
--- a/metadata/md5-cache/lxqt-base/libsysstat-0.3.2
+++ b/metadata/md5-cache/lxqt-base/libsysstat-0.3.2
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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 cccd6af3eb14..eedcec610e18 100644
--- a/metadata/md5-cache/lxqt-base/libsysstat-0.4.1
+++ b/metadata/md5-cache/lxqt-base/libsysstat-0.4.1
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/lxqt-base/lxqt-about-0.11.0 b/metadata/md5-cache/lxqt-base/lxqt-about-0.11.0
index 1608508fe2f2..aca781adbe94 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-about-0.11.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-about-0.11.0
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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 db97c102272b..8683b85dac00 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-about-0.13.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-about-0.13.0
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/lxqt-base/lxqt-admin-0.11.0 b/metadata/md5-cache/lxqt-base/lxqt-admin-0.11.0
index c12066b4f692..7aa228dc76c2 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-admin-0.11.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-admin-0.11.0
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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 44ed69a0c470..b9e742c0570b 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-admin-0.13.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-admin-0.13.0
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/lxqt-base/lxqt-common-0.11.0 b/metadata/md5-cache/lxqt-base/lxqt-common-0.11.0
index e0a053d93e46..26ca6a06887d 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-common-0.11.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-common-0.11.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
index d90e92e42bf1..bb628845af43 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-config-0.11.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-config-0.11.0
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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 b7da44ef05bc..2796d38e71ee 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-config-0.13.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-config-0.13.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/lxqt-base/lxqt-globalkeys-0.11.0 b/metadata/md5-cache/lxqt-base/lxqt-globalkeys-0.11.0
index 7a3aabf0417f..4cfb488ba361 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-globalkeys-0.11.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-globalkeys-0.11.0
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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 600cb32411cd..e699aa897ee2 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-globalkeys-0.13.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-globalkeys-0.13.0
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/lxqt-base/lxqt-l10n-0.11.0 b/metadata/md5-cache/lxqt-base/lxqt-l10n-0.11.0
index f9f7a00928fe..9c26c698a7ad 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-l10n-0.11.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-l10n-0.11.0
@@ -7,5 +7,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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 8d45a8c29c87..151e2477addb 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-l10n-0.13.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-l10n-0.13.0
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/lxqt-base/lxqt-notificationd-0.11.0 b/metadata/md5-cache/lxqt-base/lxqt-notificationd-0.11.0
index 44e546da83a1..0a62899a4283 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-notificationd-0.11.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-notificationd-0.11.0
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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 d2e3d526c7a3..85e254e9b3af 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-notificationd-0.13.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-notificationd-0.13.0
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
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
index a8d119bd0a23..307d75698be6 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-0.11.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-0.11.0
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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 c3fb0d572109..9274fbf88e60 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
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/lxqt-base/lxqt-panel-0.11.0 b/metadata/md5-cache/lxqt-base/lxqt-panel-0.11.0
index 1b15643a9ef1..def21177b1d5 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-panel-0.11.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-panel-0.11.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 >=dev-libs/libqtxdg-1.0.0 dev-qt/qtcore:5 dev-qt/qtdbus:
 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	89bb9f083a2590d9b447fd0b78a96186
+_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 c869646be7bd..6b05fd260fdd 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-panel-0.13.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-panel-0.13.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libqtxdg-3.0.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5
 REQUIRED_USE=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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/lxqt-base/lxqt-policykit-0.11.0 b/metadata/md5-cache/lxqt-base/lxqt-policykit-0.11.0
index aa80e9f18a15..dbda92518c8c 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-policykit-0.11.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-policykit-0.11.0
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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 7dfc214b5567..1019d7d9453b 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-policykit-0.13.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-policykit-0.13.0
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/lxqt-base/lxqt-powermanagement-0.11.0 b/metadata/md5-cache/lxqt-base/lxqt-powermanagement-0.11.0
index 88c1c68914e3..121856a8f89d 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-powermanagement-0.11.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-powermanagement-0.11.0
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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 e59b685390fa..3137029e3af0 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-powermanagement-0.13.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-powermanagement-0.13.0
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/lxqt-base/lxqt-qtplugin-0.11.0 b/metadata/md5-cache/lxqt-base/lxqt-qtplugin-0.11.0
index 9f9e93ddc361..883374e9558d 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-qtplugin-0.11.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-qtplugin-0.11.0
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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 2317e50060a1..690f3967b5ea 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-qtplugin-0.13.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-qtplugin-0.13.0
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/lxqt-base/lxqt-runner-0.11.0 b/metadata/md5-cache/lxqt-base/lxqt-runner-0.11.0
index 3fbc38cd23ce..9e84967f8565 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-runner-0.11.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-runner-0.11.0
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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 2d678d3aed43..38f164799a20 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-runner-0.13.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-runner-0.13.0
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/lxqt-base/lxqt-session-0.11.0 b/metadata/md5-cache/lxqt-base/lxqt-session-0.11.0
index 6ea3b720d704..90267d667450 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-session-0.11.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-session-0.11.0
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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 739a52d5d9b2..d12f4c610728 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-session-0.13.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-session-0.13.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/lxqt-base/lxqt-sudo-0.11.0 b/metadata/md5-cache/lxqt-base/lxqt-sudo-0.11.0
index 731e4da1d2fb..05bf525db2a3 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-sudo-0.11.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-sudo-0.11.0
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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 afeaf3d03225..7ed101006897 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-sudo-0.13.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-sudo-0.13.0
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 1d377fec0a96..d4c3ee8d415a 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/alot-0.3.7-r1 b/metadata/md5-cache/mail-client/alot-0.3.7-r1
index 7d2caeb839e9..538efaa68c32 100644
--- a/metadata/md5-cache/mail-client/alot-0.3.7-r1
+++ b/metadata/md5-cache/mail-client/alot-0.3.7-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/configobj-4.6.0[python_targets_python2_7(-)?,-python_single
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/pazz/alot/tarball/0.3.7 -> alot-0.3.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=58787f909cd8b621aeac69c4a32ebd1b
diff --git a/metadata/md5-cache/mail-client/alot-0.5.1 b/metadata/md5-cache/mail-client/alot-0.5.1
index 887809ae59de..2c897ef5155e 100644
--- a/metadata/md5-cache/mail-client/alot-0.5.1
+++ b/metadata/md5-cache/mail-client/alot-0.5.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/configobj-4.7.0[python_targets_python2_7(-)?,-python_single
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/pazz/alot/tarball/0.5.1 -> alot-0.5.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=810481cd92f8ef604afbc6df2ec4b5a7
diff --git a/metadata/md5-cache/mail-client/alot-0.6 b/metadata/md5-cache/mail-client/alot-0.6
index 8366f8cb039a..9225cefad317 100644
--- a/metadata/md5-cache/mail-client/alot-0.6
+++ b/metadata/md5-cache/mail-client/alot-0.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/pazz/alot/tarball/0.6 -> alot-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b44006e17c7a60f77fa9f24e3d6997ae
diff --git a/metadata/md5-cache/mail-client/alot-0.7 b/metadata/md5-cache/mail-client/alot-0.7
index 0ba4b2a420f9..f4a85c5e56a7 100644
--- a/metadata/md5-cache/mail-client/alot-0.7
+++ b/metadata/md5-cache/mail-client/alot-0.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/pazz/alot/tarball/0.7 -> alot-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d255121d53f2fedbe33368e736efb177
diff --git a/metadata/md5-cache/mail-client/alot-0.7-r1 b/metadata/md5-cache/mail-client/alot-0.7-r1
index 2456b40042f8..d642452d6ee6 100644
--- a/metadata/md5-cache/mail-client/alot-0.7-r1
+++ b/metadata/md5-cache/mail-client/alot-0.7-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/pazz/alot/tarball/0.7 -> alot-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7fb2e8af52bcf542d509cfa7ca1a77ec
diff --git a/metadata/md5-cache/mail-client/balsa-2.5.3-r1 b/metadata/md5-cache/mail-client/balsa-2.5.3-r1
index 447d1c008549..76bba0d1930c 100644
--- a/metadata/md5-cache/mail-client/balsa-2.5.3-r1
+++ b/metadata/md5-cache/mail-client/balsa-2.5.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-text/gspell-1.2:0= >=dev-libs/glib-2.40.0:2 >=x11-libs/gtk+-3.10.0:3 dev-libs/gmime:2.6 >=net-libs/libesmtp-1.0.3:= net-mail/mailbase media-libs/libcanberra:=[gtk3] x11-themes/hicolor-icon-theme x11-themes/adwaita-icon-theme crypt? ( >=app-crypt/gpgme-1.2.0:= ) gnome? ( >=x11-libs/gtksourceview-3.2.0:3.0 ) gnome-keyring? ( app-crypt/libsecret ) sqlite? ( >=dev-db/sqlite-2.8:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) kerberos? ( app-crypt/mit-krb5 ) ldap? ( net-nds/openldap ) rubrica? ( dev-libs/libxml2:2 ) webkit? ( net-libs/webkit-gtk:4 ) xface? ( >=media-libs/compface-1.5.1:= )
 SLOT=0
 SRC_URI=http://pawsa.fedorapeople.org/balsa/balsa-2.5.3.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=577c390ce92372f95cf7ed7941668ecc
diff --git a/metadata/md5-cache/mail-client/balsa-2.5.6-r1 b/metadata/md5-cache/mail-client/balsa-2.5.6-r1
index 889da6bd0681..bb2cccc2f04d 100644
--- a/metadata/md5-cache/mail-client/balsa-2.5.6-r1
+++ b/metadata/md5-cache/mail-client/balsa-2.5.6-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-text/gspell-1.2:0= >=dev-libs/glib-2.40.0:2 net-libs/gnutls:= >=x11-libs/gtk+-3.10.0:3 dev-libs/gmime:2.6 net-mail/mailbase media-libs/libcanberra:=[gtk3] x11-themes/hicolor-icon-theme x11-themes/adwaita-icon-theme crypt? ( >=app-crypt/gpgme-1.5.0:= ) gnome? ( >=x11-libs/gtksourceview-3.2.0:3.0 ) gnome-keyring? ( app-crypt/libsecret ) sqlite? ( >=dev-db/sqlite-2.8:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) kerberos? ( app-crypt/mit-krb5 ) ldap? ( net-nds/openldap ) rubrica? ( dev-libs/libxml2:2 ) webkit? ( net-libs/webkit-gtk:4 app-text/html2text ) xface? ( >=media-libs/compface-1.5.1:= )
 SLOT=0
 SRC_URI=http://pawsa.fedorapeople.org/balsa/balsa-2.5.6.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=be475ebe506d6633494c8ef3bf757e9e
diff --git a/metadata/md5-cache/mail-client/claws-mail-3.15.0-r2 b/metadata/md5-cache/mail-client/claws-mail-3.15.0-r2
index 888ab12ac9ba..7188e656aaa5 100644
--- a/metadata/md5-cache/mail-client/claws-mail-3.15.0-r2
+++ b/metadata/md5-cache/mail-client/claws-mail-3.15.0-r2
@@ -10,5 +10,5 @@ RDEPEND=net-mail/ytnef archive? ( app-arch/libarchive >=net-misc/curl-7.9.7 ) bo
 REQUIRED_USE=libcanberra? ( notification ) libindicate? ( notification ) libnotify? ( notification ) networkmanager? ( dbus ) python? ( python_targets_python2_7 ) smime? ( pgp )
 SLOT=0
 SRC_URI=https://www.claws-mail.org/download.php?file=releases/claws-mail-3.15.0.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9b52c9dcd2d4b3b46bd5c2932ebe20ff
diff --git a/metadata/md5-cache/mail-client/claws-mail-3.15.1 b/metadata/md5-cache/mail-client/claws-mail-3.15.1
index 56927638f8e3..dd13c70b340b 100644
--- a/metadata/md5-cache/mail-client/claws-mail-3.15.1
+++ b/metadata/md5-cache/mail-client/claws-mail-3.15.1
@@ -10,5 +10,5 @@ RDEPEND=net-mail/ytnef archive? ( app-arch/libarchive >=net-misc/curl-7.9.7 ) bo
 REQUIRED_USE=libcanberra? ( notification ) libindicate? ( notification ) libnotify? ( notification ) networkmanager? ( dbus ) python? ( python_targets_python2_7 ) smime? ( pgp )
 SLOT=0
 SRC_URI=https://www.claws-mail.org/download.php?file=releases/claws-mail-3.15.1.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=abdbfb2a57b00b692dcdcb5c1e1b2479
diff --git a/metadata/md5-cache/mail-client/claws-mail-3.16.0 b/metadata/md5-cache/mail-client/claws-mail-3.16.0
index af9568b5baf4..13ccbad82f25 100644
--- a/metadata/md5-cache/mail-client/claws-mail-3.16.0
+++ b/metadata/md5-cache/mail-client/claws-mail-3.16.0
@@ -10,5 +10,5 @@ RDEPEND=net-mail/ytnef archive? ( app-arch/libarchive >=net-misc/curl-7.9.7 ) bo
 REQUIRED_USE=libcanberra? ( notification ) libindicate? ( notification ) libnotify? ( notification ) networkmanager? ( dbus ) python? ( python_targets_python2_7 ) smime? ( pgp )
 SLOT=0
 SRC_URI=https://www.claws-mail.org/download.php?file=releases/claws-mail-3.16.0.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d636afa8d7e2e12f833a2b0c7f4fb309
diff --git a/metadata/md5-cache/mail-client/claws-mail-3.17.1 b/metadata/md5-cache/mail-client/claws-mail-3.17.1
index aafd0d0a3914..96e03a7c87ac 100644
--- a/metadata/md5-cache/mail-client/claws-mail-3.17.1
+++ b/metadata/md5-cache/mail-client/claws-mail-3.17.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/nettle net-mail/ytnef archive? ( app-arch/libarchive >=net-misc
 REQUIRED_USE=libcanberra? ( notification ) libindicate? ( notification ) libnotify? ( notification ) networkmanager? ( dbus ) python? ( python_targets_python2_7 ) smime? ( pgp )
 SLOT=0
 SRC_URI=https://www.claws-mail.org/download.php?file=releases/claws-mail-3.17.1.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0662f6f55acdc53e44fbf97b35e1f115
diff --git a/metadata/md5-cache/mail-client/claws-mail-9999 b/metadata/md5-cache/mail-client/claws-mail-9999
index 3e9423f3b512..8e8b004890ac 100644
--- a/metadata/md5-cache/mail-client/claws-mail-9999
+++ b/metadata/md5-cache/mail-client/claws-mail-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/nettle net-mail/ytnef archive? ( app-arch/libarchive >=net-misc/curl-7.9.7 ) bogofilter? ( mail-filter/bogofilter ) calendar? ( >=dev-libs/libical-2.0.0:= >=net-misc/curl-7.9.7 ) dbus? ( >=dev-libs/dbus-glib-0.60 ) gdata? ( >=dev-libs/libgdata-0.17.2 ) dillo? ( www-client/dillo ) gnutls? ( >=net-libs/gnutls-3.0 ) gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( >=x11-libs/gtk+-2.24:2 ) imap? ( >=net-libs/libetpan-0.57 ) ldap? ( >=net-nds/openldap-2.0.7 ) nls? ( >=sys-devel/gettext-0.18 ) nntp? ( >=net-libs/libetpan-0.57 ) notification? ( dev-libs/glib:2 libcanberra? ( media-libs/libcanberra[gtk] ) libindicate? ( dev-libs/libindicate:3[gtk] ) libnotify? ( x11-libs/libnotify ) ) pda? ( >=app-pda/jpilot-0.99 ) pdf? ( app-text/poppler[cairo] ) pgp? ( >=app-crypt/gpgme-1.0.0 ) session? ( x11-libs/libICE x11-libs/libSM ) smime? ( >=app-crypt/gpgme-1.0.0 ) spam-report? ( >=net-misc/curl-7.9.7 ) spell? ( >=app-text/enchant-1.0.0 ) startup-notification? ( x11-libs/startup-notification ) svg? ( >=gnome-base/librsvg-2.40.5 ) valgrind? ( dev-util/valgrind ) app-misc/mime-types x11-misc/shared-mime-info clamav? ( app-antivirus/clamav ) networkmanager? ( net-misc/networkmanager ) pdf? ( app-text/ghostscript-gpl ) 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(+)] >=dev-python/pygtk-2.10.3 ) rss? ( dev-libs/libxml2 net-misc/curl )
 REQUIRED_USE=libcanberra? ( notification ) libindicate? ( notification ) libnotify? ( notification ) networkmanager? ( dbus ) python? ( python_targets_python2_7 ) smime? ( pgp )
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0662f6f55acdc53e44fbf97b35e1f115
diff --git a/metadata/md5-cache/mail-client/evolution-3.24.6 b/metadata/md5-cache/mail-client/evolution-3.24.6
index 7004ed18429f..7b50b1c4f66f 100644
--- a/metadata/md5-cache/mail-client/evolution-3.24.6
+++ b/metadata/md5-cache/mail-client/evolution-3.24.6
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP
 RDEPEND=>=app-crypt/gcr-3.4:=[gtk] >=app-text/enchant-1.1.7 >=dev-libs/glib-2.46:2[dbus] >=dev-libs/libxml2-2.7.3:2 >=gnome-base/gnome-desktop-2.91.3:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=gnome-extra/evolution-data-server-3.24.6:=[gtk,weather?] >=media-libs/libcanberra-0.25[gtk3] >=net-libs/libsoup-2.42:2.4 >=net-libs/webkit-gtk-2.13.90:4 >=x11-libs/cairo-1.9.15:=[glib] >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/gtk+-3.10:3 >=x11-libs/libnotify-0.7:= >=x11-misc/shared-mime-info-0.22 >=app-text/iso-codes-0.49 dev-libs/atk gnome-base/dconf dev-libs/libical:= x11-libs/libSM x11-libs/libICE archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] ) crypt? ( >=app-crypt/gnupg-1.4 || ( app-crypt/pinentry[gnome-keyring] app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] app-crypt/pinentry[qt5] ) x11-libs/libcryptui ) geolocation? ( >=media-libs/libchamplain-0.12:0.12[gtk] >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 >=sci-geosciences/geocode-glib-3.10.0 x11-libs/mx:1.0 ) ldap? ( >=net-nds/openldap-2:= ) spell? ( app-text/gtkspell:3 ) ssl? ( >=dev-libs/nspr-4.6.1:= >=dev-libs/nss-3.11:= ) weather? ( >=dev-libs/libgweather-3.10:2= ) ytnef? ( net-mail/ytnef ) bogofilter? ( mail-filter/bogofilter ) highlight? ( app-text/highlight ) spamassassin? ( mail-filter/spamassassin ) !gnome-extra/evolution-exchange
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/evolution/3.24/evolution-3.24.6.tar.xz
-_eclasses_=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	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d3fb319f3c4ff047a4b0ef76bff6facd
diff --git a/metadata/md5-cache/mail-client/evolution-3.26.6 b/metadata/md5-cache/mail-client/evolution-3.26.6
index 456c8a2eb7a9..2815e87af04d 100644
--- a/metadata/md5-cache/mail-client/evolution-3.26.6
+++ b/metadata/md5-cache/mail-client/evolution-3.26.6
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP
 RDEPEND=>=app-crypt/gcr-3.4:=[gtk] >=app-text/enchant-1.1.7 >=dev-libs/glib-2.46:2[dbus] >=dev-libs/libxml2-2.7.3:2 >=gnome-base/gnome-desktop-2.91.3:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=gnome-extra/evolution-data-server-3.26.6:=[gtk,weather?] >=media-libs/libcanberra-0.25[gtk3] >=net-libs/libsoup-2.42:2.4 >=net-libs/webkit-gtk-2.16.0:4 >=x11-libs/cairo-1.9.15:=[glib] >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/gtk+-3.10:3 >=x11-libs/libnotify-0.7:= >=x11-misc/shared-mime-info-0.22 >=app-text/iso-codes-0.49 dev-libs/atk gnome-base/dconf dev-libs/libical:= x11-libs/libSM x11-libs/libICE archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] ) crypt? ( >=app-crypt/gnupg-1.4 || ( app-crypt/pinentry[gnome-keyring] app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] app-crypt/pinentry[qt5] ) x11-libs/libcryptui ) geolocation? ( >=media-libs/libchamplain-0.12:0.12[gtk] >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 >=sci-geosciences/geocode-glib-3.10.0 x11-libs/mx:1.0 ) ldap? ( >=net-nds/openldap-2:= ) spell? ( app-text/gtkspell:3 ) ssl? ( >=dev-libs/nspr-4.6.1:= >=dev-libs/nss-3.11:= ) weather? ( >=dev-libs/libgweather-3.10:2= ) ytnef? ( net-mail/ytnef ) bogofilter? ( mail-filter/bogofilter ) highlight? ( app-text/highlight ) spamassassin? ( mail-filter/spamassassin ) !gnome-extra/evolution-exchange
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/evolution/3.26/evolution-3.26.6.tar.xz
-_eclasses_=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	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=890bbffd94ae4bdd56310751464d733f
diff --git a/metadata/md5-cache/mail-client/geary-0.12.0 b/metadata/md5-cache/mail-client/geary-0.12.0
index f3e7c140c4e7..81fc471c95da 100644
--- a/metadata/md5-cache/mail-client/geary-0.12.0
+++ b/metadata/md5-cache/mail-client/geary-0.12.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=app-crypt/gcr-3.10.1:0=[gtk,introspection,vala] app-crypt/libsecret app-text/iso-codes dev-db/sqlite:3 >=dev-libs/glib-2.42:2[dbus] >=dev-libs/libgee-0.8.5:0.8= dev-libs/libxml2:2 dev-libs/gmime:2.6 media-libs/libcanberra >=net-libs/webkit-gtk-2.10.0:4=[introspection] >=x11-libs/gtk+-3.14.0:3[introspection] x11-libs/libnotify gnome-base/gsettings-desktop-schemas nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnome/sources/geary/0.12/geary-0.12.0.tar.xz
-_eclasses_=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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7b9f8e66157bcd8a332db6ba90506d7b
diff --git a/metadata/md5-cache/mail-client/geary-0.12.3 b/metadata/md5-cache/mail-client/geary-0.12.3
index 0905d88b8d11..f19ed2a97c5c 100644
--- a/metadata/md5-cache/mail-client/geary-0.12.3
+++ b/metadata/md5-cache/mail-client/geary-0.12.3
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1+ BSD-2 CC-BY-3.0 CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.42:2 >=x11-libs/gtk+-3.14.0:3[introspection] >=net-libs/webkit-gtk-2.10.0:4=[introspection] app-text/iso-codes >=dev-db/sqlite-3.12:3 >=net-libs/libsoup-2.48:2.4[introspection] >=dev-libs/libgee-0.8.5:0.8=[introspection] >=x11-libs/libnotify-0.7.5[introspection] >=media-libs/libcanberra-0.28 >=dev-libs/gmime-2.6.17:2.6 >=app-crypt/libsecret-0.11[introspection,vala] >=dev-libs/libxml2-2.7.8:2 >=app-crypt/gcr-3.10.1:0=[gtk,introspection,vala] >=app-text/enchant-1.6:0 gnome-base/dconf gnome-base/gsettings-desktop-schemas
 SLOT=0
 SRC_URI=mirror://gnome/sources/geary/0.12/geary-0.12.3.tar.xz
-_eclasses_=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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b94332fa0b418dabc5057422fd063aab
diff --git a/metadata/md5-cache/mail-client/kube-0.5.0-r2 b/metadata/md5-cache/mail-client/kube-0.5.0-r2
index a8dd3b821d08..daa0eba1f260 100644
--- a/metadata/md5-cache/mail-client/kube-0.5.0-r2
+++ b/metadata/md5-cache/mail-client/kube-0.5.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/breeze-icons-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0: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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/mail-notification-5.4-r10 b/metadata/md5-cache/mail-client/mail-notification-5.4-r10
index 5354e2cdd601..c707bfcb6e64 100644
--- a/metadata/md5-cache/mail-client/mail-notification-5.4-r10
+++ b/metadata/md5-cache/mail-client/mail-notification-5.4-r10
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/gtk+:3 >=dev-libs/glib-2.14:2 >=gnome-base/gconf-2.6 >=gnome-base/libgnomeui-2.14 dev-libs/dbus-glib dev-libs/gmime:2.6 >=x11-libs/libnotify-0.4.1 gnome-keyring? ( gnome-base/libgnome-keyring ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sylpheed? ( mail-client/sylpheed )
 SLOT=0
 SRC_URI=https://github.com/epienbroek/mail-notification/tarball/9ae8768 -> mail-notification-9ae8768.tar.gz
-_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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=12e5f9eedda7eae13035c7040cc6b4f6
diff --git a/metadata/md5-cache/mail-client/neomutt-20180716 b/metadata/md5-cache/mail-client/neomutt-20180716
index 4e38bffa71ca..762a9bba3182 100644
--- a/metadata/md5-cache/mail-client/neomutt-20180716
+++ b/metadata/md5-cache/mail-client/neomutt-20180716
@@ -4,10 +4,10 @@ DESCRIPTION=A small but very powerful text-based mail client
 EAPI=6
 HOMEPAGE=https://neomutt.org/
 IUSE=berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime_classic ssl tokyocabinet
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) selinux? ( sec-policy/selinux-mutt )
 SLOT=0
 SRC_URI=https://github.com/neomutt/neomutt/archive/neomutt-20180716.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_=958734cbe63aea4cb61e76343dbedf1d
+_md5_=1164c210a283f350b3de8c2bfef52f79
diff --git a/metadata/md5-cache/mail-client/thunderbird-45.8.0 b/metadata/md5-cache/mail-client/thunderbird-45.8.0
deleted file mode 100644
index d02ec8d7e6ba..000000000000
--- a/metadata/md5-cache/mail-client/thunderbird-45.8.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.21.1 >=dev-libs/nspr-4.12 crypt? ( >=x11-plugins/enigmail-1.9.6.1-r1 ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) virtual/pkgconfig || ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,sqlite,ssl,threads] ) app-arch/zip app-arch/unzip >=sys-devel/binutils-2.16.1 >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.19:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 media-libs/libcanberra:*[pulseaudio?] kernel_linux? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 ffmpeg? ( virtual/ffmpeg ) gstreamer? ( >=media-libs/gstreamer-1.4.5:1.0 >=media-libs/gst-plugins-base-1.4.5:1.0 >=media-libs/gst-plugins-good-1.4.5:1.0 >=media-plugins/gst-plugins-libav-1.4.5:1.0 ) x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-51.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.9.1:3[secure-delete,debug=] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.1.3:0=[graphite,icu] >=media-gfx/graphite2-1.3.8 ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) >=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 >=sys-apps/sed-4
-DESCRIPTION=Thunderbird Mail Client
-EAPI=6
-HOMEPAGE=http://www.mozilla.com/en-US/thunderbird/
-IUSE=bindist crypt hardened ldap lightning +minimal mozdom selinux custom-cflags custom-optimization dbus debug ffmpeg +gstreamer +jemalloc3 neon pulseaudio selinux startup-notification system-cairo system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx +jit l10n_ar l10n_ast l10n_be l10n_bg l10n_bn-BD 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_pa 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_ta-LK l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW
-KEYWORDS=~alpha amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/nss-3.21.1 >=dev-libs/nspr-4.12 crypt? ( >=x11-plugins/enigmail-1.9.6.1-r1 ) selinux? ( sec-policy/selinux-thunderbird ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.19:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 media-libs/libcanberra:*[pulseaudio?] kernel_linux? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 ffmpeg? ( virtual/ffmpeg ) gstreamer? ( >=media-libs/gstreamer-1.4.5:1.0 >=media-libs/gst-plugins-base-1.4.5:1.0 >=media-libs/gst-plugins-good-1.4.5:1.0 >=media-plugins/gst-plugins-libav-1.4.5:1.0 ) x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-51.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.9.1:3[secure-delete,debug=] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.1.3:0=[graphite,icu] >=media-gfx/graphite2-1.3.8 ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) selinux? ( sec-policy/selinux-mozilla )
-REQUIRED_USE=system-harfbuzz? ( system-icu )
-RESTRICT=!bindist? ( bindist )
-SLOT=0
-SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/ar.xpi -> thunderbird-45.8.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/ast.xpi -> thunderbird-45.8.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/be.xpi -> thunderbird-45.8.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/bg.xpi -> thunderbird-45.8.0-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/bn-BD.xpi -> thunderbird-45.8.0-bn-BD.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/br.xpi -> thunderbird-45.8.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/ca.xpi -> thunderbird-45.8.0-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/cs.xpi -> thunderbird-45.8.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/cy.xpi -> thunderbird-45.8.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/da.xpi -> thunderbird-45.8.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/de.xpi -> thunderbird-45.8.0-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/el.xpi -> thunderbird-45.8.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/en-GB.xpi -> thunderbird-45.8.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/es-AR.xpi -> thunderbird-45.8.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/es-ES.xpi -> thunderbird-45.8.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/et.xpi -> thunderbird-45.8.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/eu.xpi -> thunderbird-45.8.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/fi.xpi -> thunderbird-45.8.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/fr.xpi -> thunderbird-45.8.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-45.8.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-45.8.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/gd.xpi -> thunderbird-45.8.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/gl.xpi -> thunderbird-45.8.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/he.xpi -> thunderbird-45.8.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/hr.xpi -> thunderbird-45.8.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/hsb.xpi -> thunderbird-45.8.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/hu.xpi -> thunderbird-45.8.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/hy-AM.xpi -> thunderbird-45.8.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/id.xpi -> thunderbird-45.8.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/is.xpi -> thunderbird-45.8.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/it.xpi -> thunderbird-45.8.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/ja.xpi -> thunderbird-45.8.0-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/ko.xpi -> thunderbird-45.8.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/lt.xpi -> thunderbird-45.8.0-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-45.8.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/nl.xpi -> thunderbird-45.8.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-45.8.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/pa-IN.xpi -> thunderbird-45.8.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/pl.xpi -> thunderbird-45.8.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-45.8.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-45.8.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/rm.xpi -> thunderbird-45.8.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/ro.xpi -> thunderbird-45.8.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/ru.xpi -> thunderbird-45.8.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/si.xpi -> thunderbird-45.8.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/sk.xpi -> thunderbird-45.8.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/sl.xpi -> thunderbird-45.8.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/sq.xpi -> thunderbird-45.8.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/sr.xpi -> thunderbird-45.8.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-45.8.0-sv-SE.xpi ) l10n_ta-LK? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/ta-LK.xpi -> thunderbird-45.8.0-ta-LK.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/tr.xpi -> thunderbird-45.8.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/uk.xpi -> thunderbird-45.8.0-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/vi.xpi -> thunderbird-45.8.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-45.8.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-45.8.0-zh-TW.xpi ) https://archive.mozilla.org/pub/thunderbird/releases/45.8.0/source/thunderbird-45.8.0.source.tar.xz https://dev.gentoo.org/~axs/distfiles/lightning-4.7.8.tar.xz lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-2.6-r1.tar.xz ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-38.0-patches-0.1.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-45.0-patches-12.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/thunderbird-38.0-patches-0.1.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-45.0-patches-12.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/thunderbird-38.0-patches-0.1.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-45.0-patches-12.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozconfig-v6.45	20139a8064698f0a306b8a32c0342676	mozcoreconf-v4	45c0b61c53e2dbbcf728355c62f8de3c	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	b2f01ad412baf81650c23fcf0975fa33	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=93b44d1b89b24cb57e46dbd9f495b391
diff --git a/metadata/md5-cache/mail-client/thunderbird-52.5.2 b/metadata/md5-cache/mail-client/thunderbird-52.5.2
deleted file mode 100644
index 1cb862244b33..000000000000
--- a/metadata/md5-cache/mail-client/thunderbird-52.5.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=rust? ( dev-lang/rust ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) virtual/pkgconfig || ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,sqlite,ssl,threads] ) app-arch/zip app-arch/unzip >=sys-devel/binutils-2.16.1 sys-apps/findutils pulseaudio? ( media-sound/pulseaudio ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.25:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 ) !gtk2? ( >=x11-libs/gtk+-3.4.0:3 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) >=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 >=sys-apps/sed-4
-DESCRIPTION=Thunderbird Mail Client
-EAPI=6
-HOMEPAGE=http://www.mozilla.com/en-US/thunderbird/
-IUSE=bindist crypt hardened ldap lightning +minimal mozdom rust selinux custom-cflags custom-optimization dbus debug +jemalloc neon pulseaudio selinux startup-notification system-cairo system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx gtk2 wifi l10n_ar l10n_ast l10n_be l10n_bg l10n_bn-BD 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_pa 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_ta-LK l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW
-KEYWORDS=~alpha amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 selinux? ( sec-policy/selinux-thunderbird ) crypt? ( >=x11-plugins/enigmail-1.9.8.3-r1 ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.25:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 ) !gtk2? ( >=x11-libs/gtk+-3.4.0:3 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
-RESTRICT=!bindist? ( bindist )
-SLOT=0
-SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/ar.xpi -> thunderbird-52.5.2-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/ast.xpi -> thunderbird-52.5.2-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/be.xpi -> thunderbird-52.5.2-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/bg.xpi -> thunderbird-52.5.2-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/bn-BD.xpi -> thunderbird-52.5.2-bn-BD.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/br.xpi -> thunderbird-52.5.2-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/ca.xpi -> thunderbird-52.5.2-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/cs.xpi -> thunderbird-52.5.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/cy.xpi -> thunderbird-52.5.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/da.xpi -> thunderbird-52.5.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/de.xpi -> thunderbird-52.5.2-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/el.xpi -> thunderbird-52.5.2-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/en-GB.xpi -> thunderbird-52.5.2-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/es-AR.xpi -> thunderbird-52.5.2-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/es-ES.xpi -> thunderbird-52.5.2-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/et.xpi -> thunderbird-52.5.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/eu.xpi -> thunderbird-52.5.2-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/fi.xpi -> thunderbird-52.5.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/fr.xpi -> thunderbird-52.5.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/fy-NL.xpi -> thunderbird-52.5.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/ga-IE.xpi -> thunderbird-52.5.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/gd.xpi -> thunderbird-52.5.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/gl.xpi -> thunderbird-52.5.2-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/he.xpi -> thunderbird-52.5.2-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/hr.xpi -> thunderbird-52.5.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/hsb.xpi -> thunderbird-52.5.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/hu.xpi -> thunderbird-52.5.2-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/hy-AM.xpi -> thunderbird-52.5.2-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/id.xpi -> thunderbird-52.5.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/is.xpi -> thunderbird-52.5.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/it.xpi -> thunderbird-52.5.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/ja.xpi -> thunderbird-52.5.2-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/ko.xpi -> thunderbird-52.5.2-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/lt.xpi -> thunderbird-52.5.2-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/nb-NO.xpi -> thunderbird-52.5.2-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/nl.xpi -> thunderbird-52.5.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/nn-NO.xpi -> thunderbird-52.5.2-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/pa-IN.xpi -> thunderbird-52.5.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/pl.xpi -> thunderbird-52.5.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/pt-BR.xpi -> thunderbird-52.5.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/pt-PT.xpi -> thunderbird-52.5.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/rm.xpi -> thunderbird-52.5.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/ro.xpi -> thunderbird-52.5.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/ru.xpi -> thunderbird-52.5.2-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/si.xpi -> thunderbird-52.5.2-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/sk.xpi -> thunderbird-52.5.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/sl.xpi -> thunderbird-52.5.2-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/sq.xpi -> thunderbird-52.5.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/sr.xpi -> thunderbird-52.5.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/sv-SE.xpi -> thunderbird-52.5.2-sv-SE.xpi ) l10n_ta-LK? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/ta-LK.xpi -> thunderbird-52.5.2-ta-LK.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/tr.xpi -> thunderbird-52.5.2-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/uk.xpi -> thunderbird-52.5.2-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/vi.xpi -> thunderbird-52.5.2-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/zh-CN.xpi -> thunderbird-52.5.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/xpi/zh-TW.xpi -> thunderbird-52.5.2-zh-TW.xpi ) https://archive.mozilla.org/pub/thunderbird/releases/52.5.2/source/thunderbird-52.5.2.source.tar.xz https://dev.gentoo.org/~axs/distfiles/lightning-5.4.5.2.tar.xz lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-3.3.tar.xz ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.5-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.5-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.5-patches-02.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozconfig-v6.52	d8539cc1b3254e460b76b1dbdf24ec0f	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	b2f01ad412baf81650c23fcf0975fa33	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=b3b08c34adbe010367fa28d4f8bb217b
diff --git a/metadata/md5-cache/mail-client/thunderbird-52.9.1 b/metadata/md5-cache/mail-client/thunderbird-52.9.1
index 62c8333da9f7..2bf787c52044 100644
--- a/metadata/md5-cache/mail-client/thunderbird-52.9.1
+++ b/metadata/md5-cache/mail-client/thunderbird-52.9.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 selinux? ( sec-policy/selin
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/ar.xpi -> thunderbird-52.9.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/ast.xpi -> thunderbird-52.9.1-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/be.xpi -> thunderbird-52.9.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/bg.xpi -> thunderbird-52.9.1-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/bn-BD.xpi -> thunderbird-52.9.1-bn-BD.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/br.xpi -> thunderbird-52.9.1-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/ca.xpi -> thunderbird-52.9.1-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/cs.xpi -> thunderbird-52.9.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/cy.xpi -> thunderbird-52.9.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/da.xpi -> thunderbird-52.9.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/de.xpi -> thunderbird-52.9.1-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/el.xpi -> thunderbird-52.9.1-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/en-GB.xpi -> thunderbird-52.9.1-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/es-AR.xpi -> thunderbird-52.9.1-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/es-ES.xpi -> thunderbird-52.9.1-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/et.xpi -> thunderbird-52.9.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/eu.xpi -> thunderbird-52.9.1-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/fi.xpi -> thunderbird-52.9.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/fr.xpi -> thunderbird-52.9.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/fy-NL.xpi -> thunderbird-52.9.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/ga-IE.xpi -> thunderbird-52.9.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/gd.xpi -> thunderbird-52.9.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/gl.xpi -> thunderbird-52.9.1-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/he.xpi -> thunderbird-52.9.1-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/hr.xpi -> thunderbird-52.9.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/hsb.xpi -> thunderbird-52.9.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/hu.xpi -> thunderbird-52.9.1-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/hy-AM.xpi -> thunderbird-52.9.1-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/id.xpi -> thunderbird-52.9.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/is.xpi -> thunderbird-52.9.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/it.xpi -> thunderbird-52.9.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/ja.xpi -> thunderbird-52.9.1-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/ko.xpi -> thunderbird-52.9.1-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/lt.xpi -> thunderbird-52.9.1-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/nb-NO.xpi -> thunderbird-52.9.1-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/nl.xpi -> thunderbird-52.9.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/nn-NO.xpi -> thunderbird-52.9.1-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/pa-IN.xpi -> thunderbird-52.9.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/pl.xpi -> thunderbird-52.9.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/pt-BR.xpi -> thunderbird-52.9.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/pt-PT.xpi -> thunderbird-52.9.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/rm.xpi -> thunderbird-52.9.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/ro.xpi -> thunderbird-52.9.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/ru.xpi -> thunderbird-52.9.1-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/si.xpi -> thunderbird-52.9.1-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/sk.xpi -> thunderbird-52.9.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/sl.xpi -> thunderbird-52.9.1-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/sq.xpi -> thunderbird-52.9.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/sr.xpi -> thunderbird-52.9.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/sv-SE.xpi -> thunderbird-52.9.1-sv-SE.xpi ) l10n_ta-LK? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/ta-LK.xpi -> thunderbird-52.9.1-ta-LK.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/tr.xpi -> thunderbird-52.9.1-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/uk.xpi -> thunderbird-52.9.1-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/vi.xpi -> thunderbird-52.9.1-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/zh-CN.xpi -> thunderbird-52.9.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/zh-TW.xpi -> thunderbird-52.9.1-zh-TW.xpi ) https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/source/thunderbird-52.9.1.source.tar.xz https://dev.gentoo.org/~axs/distfiles/lightning-5.4.9.tar.xz lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-3.3.tar.xz ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.5-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.5-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.5-patches-02.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozconfig-v6.52	d8539cc1b3254e460b76b1dbdf24ec0f	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	b2f01ad412baf81650c23fcf0975fa33	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozconfig-v6.52	d8539cc1b3254e460b76b1dbdf24ec0f	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	b2f01ad412baf81650c23fcf0975fa33	nsplugins	2049586e425364a1c5bdb004205d1758	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_=7f30db5aa0d7a5c46b85cd237eab6817
diff --git a/metadata/md5-cache/mail-client/thunderbird-60.0-r2 b/metadata/md5-cache/mail-client/thunderbird-60.0-r2
deleted file mode 100644
index 09ce95abbf66..000000000000
--- a/metadata/md5-cache/mail-client/thunderbird-60.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=rust? ( dev-lang/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-arch/zip app-arch/unzip >=sys-devel/binutils-2.30 sys-apps/findutils 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 ) >=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/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-icu? ( >=dev-libs/icu-59.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) >=x11-libs/gtk+-3.4.0:3 wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) >=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=http://www.mozilla.com/en-US/thunderbird/
-IUSE=bindist crypt hardened lightning +minimal mozdom rust selinux custom-cflags custom-optimization clang dbus debug neon pulseaudio selinux startup-notification system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx wifi 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 selinux? ( sec-policy/selinux-thunderbird ) crypt? ( >=x11-plugins/enigmail-1.9.8.3-r1 ) >=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/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-icu? ( >=dev-libs/icu-59.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) >=x11-libs/gtk+-3.4.0:3 wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
-RESTRICT=!bindist? ( bindist )
-SLOT=0
-SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/ar.xpi -> thunderbird-60.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/ast.xpi -> thunderbird-60.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/be.xpi -> thunderbird-60.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/bg.xpi -> thunderbird-60.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/br.xpi -> thunderbird-60.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/ca.xpi -> thunderbird-60.0-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/cs.xpi -> thunderbird-60.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/cy.xpi -> thunderbird-60.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/da.xpi -> thunderbird-60.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/de.xpi -> thunderbird-60.0-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/el.xpi -> thunderbird-60.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/en-GB.xpi -> thunderbird-60.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/es-AR.xpi -> thunderbird-60.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/es-ES.xpi -> thunderbird-60.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/et.xpi -> thunderbird-60.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/eu.xpi -> thunderbird-60.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/fi.xpi -> thunderbird-60.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/fr.xpi -> thunderbird-60.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-60.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-60.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/gd.xpi -> thunderbird-60.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/gl.xpi -> thunderbird-60.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/he.xpi -> thunderbird-60.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/hr.xpi -> thunderbird-60.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/hsb.xpi -> thunderbird-60.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/hu.xpi -> thunderbird-60.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/hy-AM.xpi -> thunderbird-60.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/id.xpi -> thunderbird-60.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/is.xpi -> thunderbird-60.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/it.xpi -> thunderbird-60.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/ja.xpi -> thunderbird-60.0-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/ko.xpi -> thunderbird-60.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/lt.xpi -> thunderbird-60.0-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-60.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/nl.xpi -> thunderbird-60.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-60.0-nn-NO.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/pl.xpi -> thunderbird-60.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-60.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-60.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/rm.xpi -> thunderbird-60.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/ro.xpi -> thunderbird-60.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/ru.xpi -> thunderbird-60.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/si.xpi -> thunderbird-60.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/sk.xpi -> thunderbird-60.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/sl.xpi -> thunderbird-60.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/sq.xpi -> thunderbird-60.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/sr.xpi -> thunderbird-60.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-60.0-sv-SE.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/tr.xpi -> thunderbird-60.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/uk.xpi -> thunderbird-60.0-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/vi.xpi -> thunderbird-60.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-60.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-60.0-zh-TW.xpi ) https://archive.mozilla.org/pub/thunderbird/releases/60.0/source/thunderbird-60.0.source.tar.xz https://dev.gentoo.org/~axs/distfiles/lightning-6.2.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-02.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-02.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-02.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	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozconfig-v6.60	8375169dc9be9739ebe22790b8b499ac	mozcoreconf-v6	662b7375d13187b558bd09ba79c2b621	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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=4ee307060b8ff3493ebb6c576ceb7493
diff --git a/metadata/md5-cache/mail-client/thunderbird-60.0-r3 b/metadata/md5-cache/mail-client/thunderbird-60.0-r3
index eaa9eb38aebf..8d38d24cfef5 100644
--- a/metadata/md5-cache/mail-client/thunderbird-60.0-r3
+++ b/metadata/md5-cache/mail-client/thunderbird-60.0-r3
@@ -1,15 +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
+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 )
+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.0/linux-i686/xpi/ar.xpi -> thunderbird-60.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/ast.xpi -> thunderbird-60.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/be.xpi -> thunderbird-60.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/bg.xpi -> thunderbird-60.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/br.xpi -> thunderbird-60.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/ca.xpi -> thunderbird-60.0-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/cs.xpi -> thunderbird-60.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/cy.xpi -> thunderbird-60.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/da.xpi -> thunderbird-60.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/de.xpi -> thunderbird-60.0-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/el.xpi -> thunderbird-60.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/en-GB.xpi -> thunderbird-60.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/es-AR.xpi -> thunderbird-60.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/es-ES.xpi -> thunderbird-60.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/et.xpi -> thunderbird-60.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/eu.xpi -> thunderbird-60.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/fi.xpi -> thunderbird-60.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/fr.xpi -> thunderbird-60.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-60.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-60.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/gd.xpi -> thunderbird-60.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/gl.xpi -> thunderbird-60.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/he.xpi -> thunderbird-60.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/hr.xpi -> thunderbird-60.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/hsb.xpi -> thunderbird-60.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/hu.xpi -> thunderbird-60.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/hy-AM.xpi -> thunderbird-60.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/id.xpi -> thunderbird-60.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/is.xpi -> thunderbird-60.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/it.xpi -> thunderbird-60.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/ja.xpi -> thunderbird-60.0-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/ko.xpi -> thunderbird-60.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/lt.xpi -> thunderbird-60.0-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-60.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/nl.xpi -> thunderbird-60.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-60.0-nn-NO.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/pl.xpi -> thunderbird-60.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-60.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-60.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/rm.xpi -> thunderbird-60.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/ro.xpi -> thunderbird-60.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/ru.xpi -> thunderbird-60.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/si.xpi -> thunderbird-60.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/sk.xpi -> thunderbird-60.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/sl.xpi -> thunderbird-60.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/sq.xpi -> thunderbird-60.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/sr.xpi -> thunderbird-60.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-60.0-sv-SE.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/tr.xpi -> thunderbird-60.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/uk.xpi -> thunderbird-60.0-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/vi.xpi -> thunderbird-60.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-60.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-60.0-zh-TW.xpi ) https://archive.mozilla.org/pub/thunderbird/releases/60.0/source/thunderbird-60.0.source.tar.xz https://dev.gentoo.org/~axs/distfiles/lightning-6.2.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-02.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-02.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-02.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	662b7375d13187b558bd09ba79c2b621	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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=9f71a1facc8992a1410aa7f7f3634598
+_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_=34808c394a3520c40c68f063e97f55c2
diff --git a/metadata/md5-cache/mail-client/thunderbird-bin-52.9.1-r1 b/metadata/md5-cache/mail-client/thunderbird-bin-52.9.1-r1
index 09c3be6ba5ca..a2a300749674 100644
--- a/metadata/md5-cache/mail-client/thunderbird-bin-52.9.1-r1
+++ b/metadata/md5-cache/mail-client/thunderbird-bin-52.9.1-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/freedesktop-icon-theme dev-libs/atk >=sys-apps/dbus-0.60 >=dev-l
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/ar.xpi -> thunderbird-52.9.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/ast.xpi -> thunderbird-52.9.1-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/be.xpi -> thunderbird-52.9.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/bg.xpi -> thunderbird-52.9.1-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/bn-BD.xpi -> thunderbird-52.9.1-bn-BD.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/br.xpi -> thunderbird-52.9.1-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/ca.xpi -> thunderbird-52.9.1-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/cs.xpi -> thunderbird-52.9.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/cy.xpi -> thunderbird-52.9.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/da.xpi -> thunderbird-52.9.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/de.xpi -> thunderbird-52.9.1-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/el.xpi -> thunderbird-52.9.1-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/en-GB.xpi -> thunderbird-52.9.1-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/es-AR.xpi -> thunderbird-52.9.1-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/es-ES.xpi -> thunderbird-52.9.1-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/et.xpi -> thunderbird-52.9.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/eu.xpi -> thunderbird-52.9.1-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/fi.xpi -> thunderbird-52.9.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/fr.xpi -> thunderbird-52.9.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/fy-NL.xpi -> thunderbird-52.9.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/ga-IE.xpi -> thunderbird-52.9.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/gd.xpi -> thunderbird-52.9.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/gl.xpi -> thunderbird-52.9.1-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/he.xpi -> thunderbird-52.9.1-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/hr.xpi -> thunderbird-52.9.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/hsb.xpi -> thunderbird-52.9.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/hu.xpi -> thunderbird-52.9.1-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/hy-AM.xpi -> thunderbird-52.9.1-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/id.xpi -> thunderbird-52.9.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/is.xpi -> thunderbird-52.9.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/it.xpi -> thunderbird-52.9.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/ja.xpi -> thunderbird-52.9.1-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/ko.xpi -> thunderbird-52.9.1-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/lt.xpi -> thunderbird-52.9.1-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/nb-NO.xpi -> thunderbird-52.9.1-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/nl.xpi -> thunderbird-52.9.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/nn-NO.xpi -> thunderbird-52.9.1-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/pa-IN.xpi -> thunderbird-52.9.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/pl.xpi -> thunderbird-52.9.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/pt-BR.xpi -> thunderbird-52.9.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/pt-PT.xpi -> thunderbird-52.9.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/rm.xpi -> thunderbird-52.9.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/ro.xpi -> thunderbird-52.9.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/ru.xpi -> thunderbird-52.9.1-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/si.xpi -> thunderbird-52.9.1-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/sk.xpi -> thunderbird-52.9.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/sl.xpi -> thunderbird-52.9.1-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/sq.xpi -> thunderbird-52.9.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/sr.xpi -> thunderbird-52.9.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/sv-SE.xpi -> thunderbird-52.9.1-sv-SE.xpi ) l10n_ta-LK? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/ta-LK.xpi -> thunderbird-52.9.1-ta-LK.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/tr.xpi -> thunderbird-52.9.1-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/uk.xpi -> thunderbird-52.9.1-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/vi.xpi -> thunderbird-52.9.1-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/zh-CN.xpi -> thunderbird-52.9.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/zh-TW.xpi -> thunderbird-52.9.1-zh-TW.xpi ) amd64? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/en-US/thunderbird-52.9.1.tar.bz2 -> thunderbird-bin_x86_64-52.9.1.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/en-US/thunderbird-52.9.1.tar.bz2 -> thunderbird-bin_i686-52.9.1.tar.bz2 ) https://dev.gentoo.org/~axs/distfiles/lightning-5.4.9.tar.xz
-_eclasses_=desktop	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fc0f2d3c786279ddcfa2b11a768e5ff3
diff --git a/metadata/md5-cache/mail-client/thunderbird-bin-60.0-r1 b/metadata/md5-cache/mail-client/thunderbird-bin-60.0-r1
index afd8b264dfff..dfc679f55856 100644
--- a/metadata/md5-cache/mail-client/thunderbird-bin-60.0-r1
+++ b/metadata/md5-cache/mail-client/thunderbird-bin-60.0-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/freedesktop-icon-theme dev-libs/atk >=sys-apps/dbus-0.60 >=dev-l
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/ar.xpi -> thunderbird-60.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/ast.xpi -> thunderbird-60.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/be.xpi -> thunderbird-60.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/bg.xpi -> thunderbird-60.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/br.xpi -> thunderbird-60.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/ca.xpi -> thunderbird-60.0-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/cs.xpi -> thunderbird-60.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/cy.xpi -> thunderbird-60.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/da.xpi -> thunderbird-60.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/de.xpi -> thunderbird-60.0-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/el.xpi -> thunderbird-60.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/en-GB.xpi -> thunderbird-60.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/es-AR.xpi -> thunderbird-60.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/es-ES.xpi -> thunderbird-60.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/et.xpi -> thunderbird-60.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/eu.xpi -> thunderbird-60.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/fi.xpi -> thunderbird-60.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/fr.xpi -> thunderbird-60.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-60.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-60.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/gd.xpi -> thunderbird-60.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/gl.xpi -> thunderbird-60.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/he.xpi -> thunderbird-60.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/hr.xpi -> thunderbird-60.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/hsb.xpi -> thunderbird-60.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/hu.xpi -> thunderbird-60.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/hy-AM.xpi -> thunderbird-60.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/id.xpi -> thunderbird-60.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/is.xpi -> thunderbird-60.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/it.xpi -> thunderbird-60.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/ja.xpi -> thunderbird-60.0-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/ko.xpi -> thunderbird-60.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/lt.xpi -> thunderbird-60.0-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-60.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/nl.xpi -> thunderbird-60.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-60.0-nn-NO.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/pl.xpi -> thunderbird-60.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-60.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-60.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/rm.xpi -> thunderbird-60.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/ro.xpi -> thunderbird-60.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/ru.xpi -> thunderbird-60.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/si.xpi -> thunderbird-60.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/sk.xpi -> thunderbird-60.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/sl.xpi -> thunderbird-60.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/sq.xpi -> thunderbird-60.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/sr.xpi -> thunderbird-60.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-60.0-sv-SE.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/tr.xpi -> thunderbird-60.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/uk.xpi -> thunderbird-60.0-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/vi.xpi -> thunderbird-60.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-60.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-60.0-zh-TW.xpi ) amd64? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/en-US/thunderbird-60.0.tar.bz2 -> thunderbird-bin_x86_64-60.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/en-US/thunderbird-60.0.tar.bz2 -> thunderbird-bin_i686-60.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=612b7b9034497e739cc944b5ff799945
diff --git a/metadata/md5-cache/mail-client/trojita-0.7-r2 b/metadata/md5-cache/mail-client/trojita-0.7-r2
index 970d3563c0d9..1c9ce1c723e2 100644
--- a/metadata/md5-cache/mail-client/trojita-0.7-r2
+++ b/metadata/md5-cache/mail-client/trojita-0.7-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sq
 REQUIRED_USE=password? ( dbus )
 SLOT=0
 SRC_URI=mirror://sourceforge/trojita/trojita-0.7.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4a53b4fbb103ef687bb2d5e11f1b09ff
diff --git a/metadata/md5-cache/mail-client/trojita-9999 b/metadata/md5-cache/mail-client/trojita-9999
index c43f559de6cd..9613bd07a02a 100644
--- a/metadata/md5-cache/mail-client/trojita-9999
+++ b/metadata/md5-cache/mail-client/trojita-9999
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 crypt? ( >=app-crypt/gpgme-1.8.0[cxx,qt5] dev-libs/mimetic ) dbus? ( dev-qt/qtdbus:5 ) password? ( dev-libs/qtkeychain[qt5(+)] ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=password? ( dbus )
 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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e025bb64f853e181adf81ab7231f4b7c
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index cc6a86c8e007..1b768440b09f 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/afew-1.1.0 b/metadata/md5-cache/mail-filter/afew-1.1.0
index 2b023c3b05de..33e5ab832f52 100644
--- a/metadata/md5-cache/mail-filter/afew-1.1.0
+++ b/metadata/md5-cache/mail-filter/afew-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/chardet[python_targets_python3_4(-)?,python_targets_python3_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 )
 SLOT=0
 SRC_URI=mirror://pypi/a/afew/afew-1.1.0.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d9018e91c176edcd19c554c226d24968
diff --git a/metadata/md5-cache/mail-filter/afew-1.2.0 b/metadata/md5-cache/mail-filter/afew-1.2.0
index 858642203092..15f4a7579baa 100644
--- a/metadata/md5-cache/mail-filter/afew-1.2.0
+++ b/metadata/md5-cache/mail-filter/afew-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/chardet[python_targets_python3_4(-)?,python_targets_python3_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 )
 SLOT=0
 SRC_URI=mirror://pypi/a/afew/afew-1.2.0.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d9018e91c176edcd19c554c226d24968
diff --git a/metadata/md5-cache/mail-filter/afew-1.3.0 b/metadata/md5-cache/mail-filter/afew-1.3.0
index 6bba0af1ae3b..1c98e286e3e0 100644
--- a/metadata/md5-cache/mail-filter/afew-1.3.0
+++ b/metadata/md5-cache/mail-filter/afew-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/chardet[python_targets_python3_4(-)?,python_targets_python3_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 )
 SLOT=0
 SRC_URI=mirror://pypi/a/afew/afew-1.3.0.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2fdbc3b00d84c3c2581054bdc5f5e473
diff --git a/metadata/md5-cache/mail-filter/amavisd-new-2.11.0-r4 b/metadata/md5-cache/mail-filter/amavisd-new-2.11.0-r4
new file mode 100644
index 000000000000..0070c97ead46
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/amavisd-new-2.11.0-r4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst preinst prepare
+DEPEND=>=sys-apps/sed-4 >=dev-lang/perl-5.10.0 virtual/pkgconfig
+DESCRIPTION=High-performance interface between the MTA and content checkers
+EAPI=6
+HOMEPAGE=https://www.ijs.si/software/amavisd/
+IUSE=clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2 BSD-2
+RDEPEND=>=sys-apps/sed-4 >=dev-lang/perl-5.10.0 >=sys-apps/coreutils-5.0-r3 app-arch/cpio app-arch/gzip app-arch/bzip2 app-arch/arc app-arch/cabextract app-arch/freeze app-arch/lha app-arch/lrzip app-arch/lzop app-arch/ncompress app-arch/p7zip app-arch/pax app-arch/unarj app-arch/unrar app-arch/xz-utils app-arch/zoo net-mail/ripole >=dev-perl/Archive-Zip-1.14 >=virtual/perl-IO-Compress-1.35 >=virtual/perl-Compress-Raw-Zlib-2.017 net-mail/tnef virtual/perl-MIME-Base64 >=dev-perl/MIME-tools-5.415 >=dev-perl/MailTools-1.58 >=dev-perl/Net-Server-0.91 virtual/perl-Digest-MD5 dev-perl/IO-stringy virtual/perl-IO-Socket-IP >=virtual/perl-Time-HiRes-1.49 dev-perl/Unix-Syslog dev-perl/Net-LibIDN sys-apps/file >=sys-libs/db-4.4.20 dev-perl/BerkeleyDB dev-perl/Convert-BinHex >=dev-perl/Mail-DKIM-0.31 virtual/perl-File-Temp dev-perl/Net-SSLeay dev-perl/IO-Socket-SSL virtual/mta clamav? ( app-antivirus/clamav ) ldap? ( >=dev-perl/perl-ldap-0.33 ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) razor? ( mail-filter/razor ) snmp? ( net-analyzer/net-snmp[perl] ) spamassassin? ( mail-filter/spamassassin dev-perl/Image-Info ) zmq? ( dev-perl/ZMQ-LibZMQ3 )
+SLOT=0
+SRC_URI=https://www.ijs.si/software/amavisd/amavisd-new-2.11.0.tar.xz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=94b31f0acf4a399d5ed92723ef0d2d29
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 dd6f4f6daee3..62c86f8f86ff 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_=331b66ecc3be5b6daea8490e2de4216d
+_md5_=40b7df18fc24818d414ec64dd672c35c
diff --git a/metadata/md5-cache/mail-filter/postsrsd-1.4 b/metadata/md5-cache/mail-filter/postsrsd-1.4
index 9eafe5c9a325..b3e5e9c75680 100644
--- a/metadata/md5-cache/mail-filter/postsrsd-1.4
+++ b/metadata/md5-cache/mail-filter/postsrsd-1.4
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/roehling/postsrsd/archive/1.4.tar.gz -> postsrsd-1.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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=1bf921d8cca83df563a3d2e67a2306e4
diff --git a/metadata/md5-cache/mail-filter/postsrsd-1.4-r1 b/metadata/md5-cache/mail-filter/postsrsd-1.4-r1
index 5b649dc9c164..2e00a0c199a0 100644
--- a/metadata/md5-cache/mail-filter/postsrsd-1.4-r1
+++ b/metadata/md5-cache/mail-filter/postsrsd-1.4-r1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/roehling/postsrsd/archive/1.4.tar.gz -> postsrsd-1.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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=d7f2cf5aadda7064bc640c0406d8ad04
diff --git a/metadata/md5-cache/mail-filter/pypolicyd-spf-2.0.1 b/metadata/md5-cache/mail-filter/pypolicyd-spf-2.0.1
index 1a0013e56a5c..fed69c154e52 100644
--- a/metadata/md5-cache/mail-filter/pypolicyd-spf-2.0.1
+++ b/metadata/md5-cache/mail-filter/pypolicyd-spf-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pyspf-2.0.9[python_targets_python3_4(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pypolicyd-spf/pypolicyd-spf-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c35115917a6158a330afb7f5c89f0baf
diff --git a/metadata/md5-cache/mail-filter/pypolicyd-spf-2.0.2 b/metadata/md5-cache/mail-filter/pypolicyd-spf-2.0.2
index 6486e9cfa39d..50430eb5e180 100644
--- a/metadata/md5-cache/mail-filter/pypolicyd-spf-2.0.2
+++ b/metadata/md5-cache/mail-filter/pypolicyd-spf-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyspf[python_targets_python3_4(-)?,python_targets_python3_5(-
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pypolicyd-spf/pypolicyd-spf-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=aefce9aecb72f4ff37a4a5247873e5d6
diff --git a/metadata/md5-cache/mail-filter/rmilter-1.10.0 b/metadata/md5-cache/mail-filter/rmilter-1.10.0
index 57775eb00b08..44fff57e06d5 100644
--- a/metadata/md5-cache/mail-filter/rmilter-1.10.0
+++ b/metadata/md5-cache/mail-filter/rmilter-1.10.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/libpcre !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) mail-filter/libmilter >=dev-libs/glib-2.28 dkim? ( mail-filter/opendkim ) memcached? ( dev-libs/libmemcached )
 SLOT=0
 SRC_URI=https://github.com/vstakhov/rmilter/archive/1.10.0.tar.gz -> rmilter-1.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4b9cde667bc7a2368e4c161240b18859
diff --git a/metadata/md5-cache/mail-filter/rmilter-1.10.0-r1 b/metadata/md5-cache/mail-filter/rmilter-1.10.0-r1
index 8e636b603fc8..44382acb9dd8 100644
--- a/metadata/md5-cache/mail-filter/rmilter-1.10.0-r1
+++ b/metadata/md5-cache/mail-filter/rmilter-1.10.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/libpcre !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) mail-filter/libmilter >=dev-libs/glib-2.28 dkim? ( mail-filter/opendkim ) memcached? ( dev-libs/libmemcached )
 SLOT=0
 SRC_URI=https://github.com/vstakhov/rmilter/archive/1.10.0.tar.gz -> rmilter-1.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1593d8ba0a261dcb566f172811bfc9d4
diff --git a/metadata/md5-cache/mail-filter/rmilter-1.10.0-r2 b/metadata/md5-cache/mail-filter/rmilter-1.10.0-r2
index c2b907002fe6..edebbd9ae900 100644
--- a/metadata/md5-cache/mail-filter/rmilter-1.10.0-r2
+++ b/metadata/md5-cache/mail-filter/rmilter-1.10.0-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/libpcre !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) mail-filter/libmilter >=dev-libs/glib-2.28 dkim? ( mail-filter/opendkim ) memcached? ( dev-libs/libmemcached )
 SLOT=0
 SRC_URI=https://github.com/vstakhov/rmilter/archive/1.10.0.tar.gz -> rmilter-1.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3b003b37910d5c95d44f63ddc63a69e2
diff --git a/metadata/md5-cache/mail-filter/rmilter-1.9.2 b/metadata/md5-cache/mail-filter/rmilter-1.9.2
index f3fce01f6a14..0a1c82699ba1 100644
--- a/metadata/md5-cache/mail-filter/rmilter-1.9.2
+++ b/metadata/md5-cache/mail-filter/rmilter-1.9.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/libpcre !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) mail-filter/libmilter >=dev-libs/glib-2.28 dkim? ( mail-filter/opendkim ) memcached? ( dev-libs/libmemcached )
 SLOT=0
 SRC_URI=https://github.com/vstakhov/rmilter/archive/1.9.2.tar.gz -> rmilter-1.9.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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=4b9cde667bc7a2368e4c161240b18859
diff --git a/metadata/md5-cache/mail-filter/rmilter-9999 b/metadata/md5-cache/mail-filter/rmilter-9999
index abbbb98eaae7..d2fb12dc2491 100644
--- a/metadata/md5-cache/mail-filter/rmilter-9999
+++ b/metadata/md5-cache/mail-filter/rmilter-9999
@@ -7,5 +7,5 @@ IUSE=dkim libressl +memcached
 LICENSE=BSD
 RDEPEND=dev-libs/libpcre !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) mail-filter/libmilter >=dev-libs/glib-2.28 dkim? ( mail-filter/opendkim ) memcached? ( dev-libs/libmemcached )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5eec32a180374a7ab900bf1cfdff2942
diff --git a/metadata/md5-cache/mail-filter/rspamd-1.6.5 b/metadata/md5-cache/mail-filter/rspamd-1.6.5
index 20ce9f84462f..cb0f1af6298d 100644
--- a/metadata/md5-cache/mail-filter/rspamd-1.6.5
+++ b/metadata/md5-cache/mail-filter/rspamd-1.6.5
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=!libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) fann? ( sci-mathematics/fann ) pcre2? ( dev-libs/libpcre2[jit=] ) !pcre2? ( dev-libs/libpcre[jit=] ) jit? ( dev-lang/luajit:2 ) jemalloc? ( dev-libs/jemalloc ) dev-libs/libevent dev-db/sqlite:3 dev-libs/glib:2 <dev-util/ragel-7.0 sys-apps/file gd? ( media-libs/gd[jpeg] ) dev-libs/icu cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
 SLOT=0
 SRC_URI=https://github.com/vstakhov/rspamd/archive/1.6.5.tar.gz -> rspamd-1.6.5.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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	89bb9f083a2590d9b447fd0b78a96186
+_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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=702a475d0213a7f936f3972803484ca4
diff --git a/metadata/md5-cache/mail-filter/rspamd-1.6.6 b/metadata/md5-cache/mail-filter/rspamd-1.6.6
index 690a00db3852..85a99ddb94fd 100644
--- a/metadata/md5-cache/mail-filter/rspamd-1.6.6
+++ b/metadata/md5-cache/mail-filter/rspamd-1.6.6
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=!libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) fann? ( sci-mathematics/fann ) pcre2? ( dev-libs/libpcre2[jit=] ) !pcre2? ( dev-libs/libpcre[jit=] ) jit? ( dev-lang/luajit:2 ) jemalloc? ( dev-libs/jemalloc ) dev-libs/libevent dev-db/sqlite:3 dev-libs/glib:2 <dev-util/ragel-7.0 sys-apps/file gd? ( media-libs/gd[jpeg] ) dev-libs/icu cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
 SLOT=0
 SRC_URI=https://github.com/vstakhov/rspamd/archive/1.6.6.tar.gz -> rspamd-1.6.6.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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	89bb9f083a2590d9b447fd0b78a96186
+_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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=41740706fb4d088532b839027a857cb1
diff --git a/metadata/md5-cache/mail-filter/rspamd-1.7.1 b/metadata/md5-cache/mail-filter/rspamd-1.7.1
index aa6e2c220c46..6bb55b76a664 100644
--- a/metadata/md5-cache/mail-filter/rspamd-1.7.1
+++ b/metadata/md5-cache/mail-filter/rspamd-1.7.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=!libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) fann? ( sci-mathematics/fann ) pcre2? ( dev-libs/libpcre2[jit=] ) !pcre2? ( dev-libs/libpcre[jit=] ) jit? ( dev-lang/luajit:2 ) jemalloc? ( dev-libs/jemalloc ) dev-libs/libevent dev-db/sqlite:3 dev-libs/glib:2 <dev-util/ragel-7.0 sys-apps/file gd? ( media-libs/gd[jpeg] ) dev-libs/icu cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
 SLOT=0
 SRC_URI=https://github.com/vstakhov/rspamd/archive/1.7.1.tar.gz -> rspamd-1.7.1.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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	89bb9f083a2590d9b447fd0b78a96186
+_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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0fe42338f53d039c1be0709d6f1d3b58
diff --git a/metadata/md5-cache/mail-filter/rspamd-1.7.2 b/metadata/md5-cache/mail-filter/rspamd-1.7.2
index 577667ce7e0f..f80ec3487f85 100644
--- a/metadata/md5-cache/mail-filter/rspamd-1.7.2
+++ b/metadata/md5-cache/mail-filter/rspamd-1.7.2
@@ -10,5 +10,5 @@ RDEPEND=!libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libres
 REQUIRED_USE=torch? ( jit )
 SLOT=0
 SRC_URI=https://github.com/vstakhov/rspamd/archive/1.7.2.tar.gz -> rspamd-1.7.2.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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	89bb9f083a2590d9b447fd0b78a96186
+_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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=111196b3c5266d13b55a8bcfa4a10cd2
diff --git a/metadata/md5-cache/mail-filter/rspamd-1.7.5 b/metadata/md5-cache/mail-filter/rspamd-1.7.5
index 0f3bf5912c30..17ba27025e9e 100644
--- a/metadata/md5-cache/mail-filter/rspamd-1.7.5
+++ b/metadata/md5-cache/mail-filter/rspamd-1.7.5
@@ -10,5 +10,5 @@ RDEPEND=!libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libres
 REQUIRED_USE=torch? ( jit )
 SLOT=0
 SRC_URI=https://github.com/vstakhov/rspamd/archive/1.7.5.tar.gz -> rspamd-1.7.5.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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	89bb9f083a2590d9b447fd0b78a96186
+_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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=687b126d3e754c4291a5a5e8fd6dcf8e
diff --git a/metadata/md5-cache/mail-filter/rspamd-1.7.7 b/metadata/md5-cache/mail-filter/rspamd-1.7.7
index 2941e7f5df24..2cb2767c5d41 100644
--- a/metadata/md5-cache/mail-filter/rspamd-1.7.7
+++ b/metadata/md5-cache/mail-filter/rspamd-1.7.7
@@ -10,5 +10,5 @@ RDEPEND=!libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libres
 REQUIRED_USE=torch? ( jit )
 SLOT=0
 SRC_URI=https://github.com/vstakhov/rspamd/archive/1.7.7.tar.gz -> rspamd-1.7.7.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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	89bb9f083a2590d9b447fd0b78a96186
+_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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8c3a60b7d73352402e5701581c15082b
diff --git a/metadata/md5-cache/mail-filter/rspamd-1.7.8 b/metadata/md5-cache/mail-filter/rspamd-1.7.8
index 6703e71defe5..baa91bc7e543 100644
--- a/metadata/md5-cache/mail-filter/rspamd-1.7.8
+++ b/metadata/md5-cache/mail-filter/rspamd-1.7.8
@@ -10,5 +10,5 @@ RDEPEND=!libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libres
 REQUIRED_USE=torch? ( jit )
 SLOT=0
 SRC_URI=https://github.com/vstakhov/rspamd/archive/1.7.8.tar.gz -> rspamd-1.7.8.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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	89bb9f083a2590d9b447fd0b78a96186
+_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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=69455554d9b83ec2227c0cc3a76b69b8
diff --git a/metadata/md5-cache/mail-filter/rspamd-1.7.9 b/metadata/md5-cache/mail-filter/rspamd-1.7.9
index f7a7d38b5924..a388276988cf 100644
--- a/metadata/md5-cache/mail-filter/rspamd-1.7.9
+++ b/metadata/md5-cache/mail-filter/rspamd-1.7.9
@@ -10,5 +10,5 @@ RDEPEND=!libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libres
 REQUIRED_USE=torch? ( jit )
 SLOT=0
 SRC_URI=https://github.com/vstakhov/rspamd/archive/1.7.9.tar.gz -> rspamd-1.7.9.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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	89bb9f083a2590d9b447fd0b78a96186
+_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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8c3a60b7d73352402e5701581c15082b
diff --git a/metadata/md5-cache/mail-filter/rspamd-9999 b/metadata/md5-cache/mail-filter/rspamd-9999
index 04e94f12f679..8bba193a527d 100644
--- a/metadata/md5-cache/mail-filter/rspamd-9999
+++ b/metadata/md5-cache/mail-filter/rspamd-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=!libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) fann? ( sci-mathematics/fann ) pcre2? ( dev-libs/libpcre2[jit=] ) !pcre2? ( dev-libs/libpcre[jit=] ) jit? ( dev-lang/luajit:2 ) jemalloc? ( dev-libs/jemalloc ) dev-libs/libevent net-libs/libnsl dev-db/sqlite:3 dev-libs/glib:2 <dev-util/ragel-7.0 sys-apps/file gd? ( media-libs/gd[jpeg] ) dev-libs/icu cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
 REQUIRED_USE=torch? ( jit )
 SLOT=0
-_eclasses_=cmake-utils	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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8c3a60b7d73352402e5701581c15082b
diff --git a/metadata/md5-cache/mail-filter/sigh-1607.1.2 b/metadata/md5-cache/mail-filter/sigh-1607.1.2
index abe94a337051..395cef635fbc 100644
--- a/metadata/md5-cache/mail-filter/sigh-1607.1.2
+++ b/metadata/md5-cache/mail-filter/sigh-1607.1.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=mail-filter/libmilter dev-libs/boost dev-libs/openssl:0
 SLOT=0
 SRC_URI=https://github.com/croessner/sigh/archive/v1607.1.2.tar.gz -> sigh-1607.1.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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=ea6b8998686ed856d7ae06d422e7321a
diff --git a/metadata/md5-cache/mail-filter/sigh-1607.1.6 b/metadata/md5-cache/mail-filter/sigh-1607.1.6
index 42cd9e82668f..a9c29198891c 100644
--- a/metadata/md5-cache/mail-filter/sigh-1607.1.6
+++ b/metadata/md5-cache/mail-filter/sigh-1607.1.6
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=mail-filter/libmilter dev-libs/boost dev-libs/openssl:0
 SLOT=0
 SRC_URI=https://github.com/croessner/sigh/archive/v1607.1.6.tar.gz -> sigh-1607.1.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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=089aac3fb5ab0112e7037998ff5e1560
diff --git a/metadata/md5-cache/mail-filter/spambayes-1.1_alpha6-r2 b/metadata/md5-cache/mail-filter/spambayes-1.1_alpha6-r2
index 47f3a8807085..fa224531aa32 100644
--- a/metadata/md5-cache/mail-filter/spambayes-1.1_alpha6-r2
+++ b/metadata/md5-cache/mail-filter/spambayes-1.1_alpha6-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/bsddb3[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/spambayes/spambayes-1.1a6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e1ec9165fa15bbc3e539dab3182e43aa
diff --git a/metadata/md5-cache/mail-filter/spambayes-1.1_beta1 b/metadata/md5-cache/mail-filter/spambayes-1.1_beta1
index a575e18e4478..22d1e1679d1a 100644
--- a/metadata/md5-cache/mail-filter/spambayes-1.1_beta1
+++ b/metadata/md5-cache/mail-filter/spambayes-1.1_beta1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/bsddb3[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/spambayes/spambayes-1.1b1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a6e1c97515a5ca106d0f2a7ca58f8c58
diff --git a/metadata/md5-cache/mail-filter/spambayes-1.1_beta2 b/metadata/md5-cache/mail-filter/spambayes-1.1_beta2
index bb8dfc2c842e..06a721347bc3 100644
--- a/metadata/md5-cache/mail-filter/spambayes-1.1_beta2
+++ b/metadata/md5-cache/mail-filter/spambayes-1.1_beta2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/bsddb3[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/spambayes/spambayes-1.1b2.tar.gz mirror://sourceforge/spambayes/spambayes-1.1b2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=908e9ee169ef6d19c0876d73451be06d
diff --git a/metadata/md5-cache/mate-base/Manifest.gz b/metadata/md5-cache/mate-base/Manifest.gz
index 5120f35f6dfa..9c9a71e469a1 100644
--- a/metadata/md5-cache/mate-base/Manifest.gz
+++ b/metadata/md5-cache/mate-base/Manifest.gz
diff --git a/metadata/md5-cache/mate-base/caja-1.12.7-r2 b/metadata/md5-cache/mate-base/caja-1.12.7-r2
deleted file mode 100644
index 4bbb59232c68..000000000000
--- a/metadata/md5-cache/mate-base/caja-1.12.7-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.4.7:2 gnome-base/dconf:0 >=gnome-base/gvfs-1.10.1:0[udisks] >=mate-base/mate-desktop-1.9:0[gtk3(-)=] >=media-libs/libexif-0.6.14:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXrender:0 >=x11-libs/pango-1.1.2:0 virtual/libintl:0 !gtk3? ( >=dev-libs/libunique-1:1 >=x11-libs/gtk+-2.24:2[introspection?] ) gtk3? ( >=dev-libs/libunique-3:3 >=x11-libs/gtk+-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) packagekit? ( app-admin/packagekit-base ) xmp? ( >=media-libs/exempi-1.99.5:2 ) !!mate-base/mate-file-manager >=dev-lang/perl-5:0= dev-util/gdbus-codegen:0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.40.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.12 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Caja file manager for the MATE desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=gtk3 +introspection +mate packagekit xmp test
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2 LGPL-2 FDL-1.1
-PDEPEND=mate? ( >=x11-themes/mate-icon-theme-1.12 )
-RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.4.7:2 gnome-base/dconf:0 >=gnome-base/gvfs-1.10.1:0[udisks] >=mate-base/mate-desktop-1.9:0[gtk3(-)=] >=media-libs/libexif-0.6.14:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXrender:0 >=x11-libs/pango-1.1.2:0 virtual/libintl:0 !gtk3? ( >=dev-libs/libunique-1:1 >=x11-libs/gtk+-2.24:2[introspection?] ) gtk3? ( >=dev-libs/libunique-3:3 >=x11-libs/gtk+-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) packagekit? ( app-admin/packagekit-base ) xmp? ( >=media-libs/exempi-1.99.5:2 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/caja-1.12.7.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=5074404d8aa468aa4da0810f75fd1338
diff --git a/metadata/md5-cache/mate-base/caja-1.14.2 b/metadata/md5-cache/mate-base/caja-1.14.2
deleted file mode 100644
index a14014bff818..000000000000
--- a/metadata/md5-cache/mate-base/caja-1.14.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.4.7:2 gnome-base/dconf:0 >=gnome-base/gvfs-1.10.1:0[udisks] >=mate-base/mate-desktop-1.9:0[gtk3(-)=] >=media-libs/libexif-0.6.14:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXrender:0 >=x11-libs/pango-1.1.2:0 virtual/libintl:0 !gtk3? ( >=dev-libs/libunique-1:1 >=x11-libs/gtk+-2.24:2[introspection?] ) gtk3? ( >=dev-libs/libunique-3:3 >=x11-libs/gtk+-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) packagekit? ( app-admin/packagekit-base ) xmp? ( >=media-libs/exempi-1.99.5:2 ) !!mate-base/mate-file-manager >=dev-lang/perl-5:0= dev-util/gdbus-codegen:0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.40.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.14 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Caja file manager for the MATE desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=gtk3 +introspection +mate packagekit xmp test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2 LGPL-2 FDL-1.1
-PDEPEND=mate? ( >=x11-themes/mate-icon-theme-1.14 )
-RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.4.7:2 gnome-base/dconf:0 >=gnome-base/gvfs-1.10.1:0[udisks] >=mate-base/mate-desktop-1.9:0[gtk3(-)=] >=media-libs/libexif-0.6.14:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXrender:0 >=x11-libs/pango-1.1.2:0 virtual/libintl:0 !gtk3? ( >=dev-libs/libunique-1:1 >=x11-libs/gtk+-2.24:2[introspection?] ) gtk3? ( >=dev-libs/libunique-3:3 >=x11-libs/gtk+-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) packagekit? ( app-admin/packagekit-base ) xmp? ( >=media-libs/exempi-1.99.5:2 ) !!mate-base/mate-file-manager
-RESTRICT=test
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.14/caja-1.14.2.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=cdc7d9c72190c45381cdadc5876f7963
diff --git a/metadata/md5-cache/mate-base/caja-1.16.6 b/metadata/md5-cache/mate-base/caja-1.16.6
deleted file mode 100644
index e2faa78c42c4..000000000000
--- a/metadata/md5-cache/mate-base/caja-1.16.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.4.7:2 gnome-base/dconf:0 >=gnome-base/gvfs-1.10.1:0[udisks] >=mate-base/mate-desktop-1.16.2:0[gtk3(-)=] >=media-libs/libexif-0.6.14:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXrender:0 >=x11-libs/pango-1.1.2:0 virtual/libintl:0 !gtk3? ( >=dev-libs/libunique-1:1 >=x11-libs/gtk+-2.24:2[introspection?] ) gtk3? ( >=dev-libs/libunique-3:3 >=x11-libs/gtk+-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) packagekit? ( app-admin/packagekit-base ) xmp? ( >=media-libs/exempi-1.99.5:2 ) !!mate-base/mate-file-manager >=dev-lang/perl-5:0= dev-util/gdbus-codegen:0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.40.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.16 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Caja file manager for the MATE desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=gtk3 +introspection +mate packagekit xmp test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2 LGPL-2 FDL-1.1
-PDEPEND=mate? ( >=x11-themes/mate-icon-theme-1.16 )
-RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.4.7:2 gnome-base/dconf:0 >=gnome-base/gvfs-1.10.1:0[udisks] >=mate-base/mate-desktop-1.16.2:0[gtk3(-)=] >=media-libs/libexif-0.6.14:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXrender:0 >=x11-libs/pango-1.1.2:0 virtual/libintl:0 !gtk3? ( >=dev-libs/libunique-1:1 >=x11-libs/gtk+-2.24:2[introspection?] ) gtk3? ( >=dev-libs/libunique-3:3 >=x11-libs/gtk+-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) packagekit? ( app-admin/packagekit-base ) xmp? ( >=media-libs/exempi-1.99.5:2 ) !!mate-base/mate-file-manager
-RESTRICT=test
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/caja-1.16.6.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=958bf97c96a68fb0153a7d6bc255e0e5
diff --git a/metadata/md5-cache/mate-base/caja-1.18.5 b/metadata/md5-cache/mate-base/caja-1.18.5
index 3cfb277889de..9e36b8a1e7f6 100644
--- a/metadata/md5-cache/mate-base/caja-1.18.5
+++ b/metadata/md5-cache/mate-base/caja-1.18.5
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.4.7:2 gnome-b
 RESTRICT=test
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.18/caja-1.18.5.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fb73d59ae1a5e1a5403f2951d6b072eb
diff --git a/metadata/md5-cache/mate-base/libmatekbd-1.12.1-r2 b/metadata/md5-cache/mate-base/libmatekbd-1.12.1-r2
deleted file mode 100644
index 06dd97cc680a..000000000000
--- a/metadata/md5-cache/mate-base/libmatekbd-1.12.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.36:2 x11-libs/cairo:0 >=x11-libs/gdk-pixbuf-2.24:2 x11-libs/libX11:0 >=x11-libs/libxklavier-5.0:0 x11-libs/pango:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) sys-devel/gettext:* >=dev-util/intltool-0.50.1:* 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.12
-DESCRIPTION=MATE keyboard configuration library
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X gtk3 +introspection test
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-libs/glib-2.36:2 x11-libs/cairo:0 >=x11-libs/gdk-pixbuf-2.24:2 x11-libs/libX11:0 >=x11-libs/libxklavier-5.0:0 x11-libs/pango:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/libmatekbd-1.12.1.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=8764e118cd280a1d0f3c1f0a27c6a7df
diff --git a/metadata/md5-cache/mate-base/libmatekbd-1.14.1 b/metadata/md5-cache/mate-base/libmatekbd-1.14.1
deleted file mode 100644
index 76f8dc1f72b1..000000000000
--- a/metadata/md5-cache/mate-base/libmatekbd-1.14.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.36:2 x11-libs/cairo:0 >=x11-libs/gdk-pixbuf-2.24:2 x11-libs/libX11:0 >=x11-libs/libxklavier-5.0:0 x11-libs/pango:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) sys-devel/gettext:* >=dev-util/intltool-0.50.1:* 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.14
-DESCRIPTION=MATE keyboard configuration library
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X gtk3 +introspection test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-libs/glib-2.36:2 x11-libs/cairo:0 >=x11-libs/gdk-pixbuf-2.24:2 x11-libs/libX11:0 >=x11-libs/libxklavier-5.0:0 x11-libs/pango:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.14/libmatekbd-1.14.1.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=b9df900979a83a65fd1be596456f35fb
diff --git a/metadata/md5-cache/mate-base/libmatekbd-1.16.0 b/metadata/md5-cache/mate-base/libmatekbd-1.16.0
deleted file mode 100644
index e42e8b2ac19c..000000000000
--- a/metadata/md5-cache/mate-base/libmatekbd-1.16.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.36:2 x11-libs/cairo:0 >=x11-libs/gdk-pixbuf-2.24:2 x11-libs/libX11:0 >=x11-libs/libxklavier-5.2:0[introspection?] x11-libs/pango:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) sys-devel/gettext:* >=dev-util/intltool-0.50.1:* 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.16
-DESCRIPTION=MATE keyboard configuration library
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X gtk3 +introspection test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-libs/glib-2.36:2 x11-libs/cairo:0 >=x11-libs/gdk-pixbuf-2.24:2 x11-libs/libX11:0 >=x11-libs/libxklavier-5.2:0[introspection?] x11-libs/pango:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/libmatekbd-1.16.0.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=fce1afc368e8538ffc6b90886d7d2df7
diff --git a/metadata/md5-cache/mate-base/libmatekbd-1.18.2 b/metadata/md5-cache/mate-base/libmatekbd-1.18.2
index 2c5174a08648..0a2216f8b5d5 100644
--- a/metadata/md5-cache/mate-base/libmatekbd-1.18.2
+++ b/metadata/md5-cache/mate-base/libmatekbd-1.18.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.36:2 x11-libs/cairo:0 >=x11-libs/gdk-pixbuf-2.24:2 x11-libs/libX11:0 >=x11-libs/libxklavier-5.2:0[introspection?] x11-libs/pango:0 virtual/libintl:0 >=x11-libs/gtk+-3.0:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.18/libmatekbd-1.18.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2c7c3209c9cb1adde2fd39be21d0ed8b
diff --git a/metadata/md5-cache/mate-base/mate-1.12-r1 b/metadata/md5-cache/mate-base/mate-1.12-r1
deleted file mode 100644
index 56fbc903cbaa..000000000000
--- a/metadata/md5-cache/mate-base/mate-1.12-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=postinst
-DESCRIPTION=Meta ebuild for MATE, a traditional desktop environment
-EAPI=6
-HOMEPAGE=http://mate-desktop.org
-IUSE=+base -bluetooth gtk3 help +notification +themes +extras
-KEYWORDS=amd64 ~arm x86
-LICENSE=metapackage
-PDEPEND=notification? ( =x11-misc/mate-notification-daemon-1.12*:0[gtk3(-)?] ) virtual/notification-daemon:0
-RDEPEND==mate-base/mate-desktop-1.12*:0[gtk3(-)?] =mate-base/mate-menus-1.12*:0 =mate-base/mate-panel-1.12*:0[gtk3(-)?] =mate-base/mate-session-manager-1.12*:0[gtk3(-)?] =mate-base/mate-settings-daemon-1.12*:0[gtk3(-)?] =x11-wm/marco-1.12*:0[gtk3(-)?] base? ( =mate-base/caja-1.12*:0[gtk3(-)?] =mate-base/mate-applets-meta-1.12*:0[gtk3(-)?] =mate-base/mate-control-center-1.12*:0[gtk3(-)?] =mate-extra/mate-media-1.12*:0[gtk3(-)?] =x11-misc/mozo-1.12*:0[gtk3(-)?] =x11-terms/mate-terminal-1.12*:0[gtk3(-)?] ) bluetooth? ( net-wireless/blueman:0 ) themes? ( =x11-themes/mate-backgrounds-1.12*:0 =x11-themes/mate-icon-theme-1.12*:0 >=x11-themes/mate-themes-meta-3:0 ) extras? ( =app-arch/engrampa-1.12*:0[gtk3(-)?] =app-editors/pluma-1.12*:0[gtk3(-)?] =app-text/atril-1.12*:0[gtk3(-)?] gnome-extra/gnome-calculator:0 =mate-extra/caja-extensions-1.12*:0[gtk3(-)?] =mate-extra/mate-netbook-1.12*:0[gtk3(-)?] =mate-extra/mate-power-manager-1.12*:0[gtk3(-)?] =mate-extra/mate-screensaver-1.12*:0[gtk3(-)?] =mate-extra/mate-system-monitor-1.12*:0[gtk3(-)?] =mate-extra/mate-utils-1.12*:0[gtk3(-)?] =media-gfx/eom-1.12*:0[gtk3(-)?] =net-analyzer/mate-netspeed-1.12*:0[gtk3(-)?] sys-apps/gnome-disk-utility:0 ) help? ( gnome-extra/yelp:0 =mate-extra/mate-user-guide-1.12*:0 )
-SLOT=0
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=a0d4172f6bd910ea80017313ba69c6ff
diff --git a/metadata/md5-cache/mate-base/mate-1.14 b/metadata/md5-cache/mate-base/mate-1.14
deleted file mode 100644
index 13d012482646..000000000000
--- a/metadata/md5-cache/mate-base/mate-1.14
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=postinst
-DESCRIPTION=Meta ebuild for MATE, a traditional desktop environment
-EAPI=6
-HOMEPAGE=http://mate-desktop.org
-IUSE=+base -bluetooth gtk3 help +notification +themes +extras
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=metapackage
-PDEPEND=notification? ( =x11-misc/mate-notification-daemon-1.14*:0[gtk3(-)?] ) virtual/notification-daemon:0
-RDEPEND==mate-base/mate-desktop-1.14*:0[gtk3(-)?] =mate-base/mate-menus-1.14*:0 =mate-base/mate-panel-1.14*:0[gtk3(-)?] =mate-base/mate-session-manager-1.14*:0[gtk3(-)?] =mate-base/mate-settings-daemon-1.14*:0[gtk3(-)?] =x11-wm/marco-1.14*:0[gtk3(-)?] base? ( =mate-base/caja-1.14*:0[gtk3(-)?] =mate-base/mate-applets-meta-1.14*:0[gtk3(-)?] =mate-base/mate-control-center-1.14*:0[gtk3(-)?] =mate-extra/mate-media-1.14*:0[gtk3(-)?] =x11-misc/mozo-1.14*:0 =x11-terms/mate-terminal-1.14*:0[gtk3(-)?] ) bluetooth? ( net-wireless/blueman:0 ) themes? ( =x11-themes/mate-backgrounds-1.14*:0 =x11-themes/mate-icon-theme-1.14*:0 >=x11-themes/mate-themes-meta-3:0 ) extras? ( =app-arch/engrampa-1.14*:0[gtk3(-)?] =app-editors/pluma-1.14*:0[gtk3(-)?] =app-text/atril-1.14*:0[gtk3(-)?] gnome-extra/gnome-calculator:0 =mate-extra/caja-extensions-1.14*:0[gtk3(-)?] =mate-extra/mate-netbook-1.14*:0[gtk3(-)?] =mate-extra/mate-power-manager-1.14*:0[gtk3(-)?] =mate-extra/mate-screensaver-1.14*:0[gtk3(-)?] =mate-extra/mate-system-monitor-1.14*:0 =mate-extra/mate-utils-1.14*:0[gtk3(-)?] =media-gfx/eom-1.14*:0[gtk3(-)?] sys-apps/gnome-disk-utility:0 ) help? ( gnome-extra/yelp:0 =mate-extra/mate-user-guide-1.14*:0 )
-SLOT=0
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=6f80a4529eb0ec52a844055ba144ebce
diff --git a/metadata/md5-cache/mate-base/mate-1.16 b/metadata/md5-cache/mate-base/mate-1.16
deleted file mode 100644
index 964db30df7cb..000000000000
--- a/metadata/md5-cache/mate-base/mate-1.16
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=postinst
-DESCRIPTION=Meta ebuild for MATE, a traditional desktop environment
-EAPI=6
-HOMEPAGE=http://mate-desktop.org
-IUSE=+base -bluetooth gtk3 help +notification +themes +extras
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=metapackage
-PDEPEND=notification? ( =x11-misc/mate-notification-daemon-1.16*:0 ) virtual/notification-daemon:0
-RDEPEND==mate-base/mate-desktop-1.16*:0[gtk3(-)?] =mate-base/mate-menus-1.16*:0 =mate-base/mate-panel-1.16*:0[gtk3(-)?] =mate-base/mate-session-manager-1.16*:0 =mate-base/mate-settings-daemon-1.16*:0[gtk3(-)?] =x11-wm/marco-1.16*:0[gtk3(-)?] base? ( =mate-base/caja-1.16*:0[gtk3(-)?] =mate-base/mate-applets-meta-1.16*:0[gtk3(-)?] =mate-base/mate-control-center-1.16*:0[gtk3(-)?] =mate-extra/mate-media-1.16*:0[gtk3(-)?] =x11-misc/mozo-1.16*:0 =x11-terms/mate-terminal-1.16*:0 ) bluetooth? ( net-wireless/blueman:0 ) themes? ( =x11-themes/mate-backgrounds-1.16*:0 =x11-themes/mate-icon-theme-1.16*:0 >=x11-themes/mate-themes-meta-3:0 ) extras? ( =app-arch/engrampa-1.16*:0 =app-editors/pluma-1.16*:0[gtk3(-)?] =app-text/atril-1.16*:0[gtk3(-)?] gnome-extra/gnome-calculator:0 =mate-extra/caja-extensions-1.16*:0[gtk3(-)?] =mate-extra/mate-netbook-1.16*:0[gtk3(-)?] =mate-extra/mate-power-manager-1.16*:0[gtk3(-)?] =mate-extra/mate-screensaver-1.16*:0[gtk3(-)?] =mate-extra/mate-system-monitor-1.16*:0 =mate-extra/mate-utils-1.16*:0[gtk3(-)?] =media-gfx/eom-1.16*:0[gtk3(-)?] sys-apps/gnome-disk-utility:0 ) help? ( gnome-extra/yelp:0 =mate-extra/mate-user-guide-1.16*:0 )
-SLOT=0
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=1b266d2f881d039678355db0ec1b6385
diff --git a/metadata/md5-cache/mate-base/mate-applets-1.12.1-r4 b/metadata/md5-cache/mate-base/mate-applets-1.12.1-r4
deleted file mode 100644
index effc774c9f43..000000000000
--- a/metadata/md5-cache/mate-base/mate-applets-1.12.1-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-text/rarian:0 dev-libs/atk:0 >=dev-libs/dbus-glib-0.74:0 >=dev-libs/glib-2.36:2 >=dev-libs/libmateweather-1.6.1[gtk3(-)=] >=dev-libs/libxml2-2.5:2 dev-python/pygobject:3 >=gnome-base/libgtop-2.11.92:2= >=mate-base/mate-desktop-1.9[gtk3(-)=] >=mate-base/mate-panel-1.7[gtk3(-)=] >=mate-base/mate-settings-daemon-1.6 >=sys-apps/dbus-1.1.2:0 <sys-power/cpupower-4.7 x11-libs/gdk-pixbuf:2 >=x11-libs/libnotify-0.7:0 x11-libs/libX11:0 x11-libs/pango:0 virtual/libintl:0 !gtk3? ( >=gnome-extra/gucharmap-2.32.1:0 >=x11-libs/gtk+-2.24:2 x11-libs/gtksourceview:2.0 >=x11-libs/libwnck-2.30:1 ) gtk3? ( >=gnome-extra/gucharmap-3.0:2.90 >=x11-libs/gtk+-3.0:3 x11-libs/gtksourceview:3.0 >=x11-libs/libwnck-3.0:3 ) policykit? ( >=sys-auth/polkit-0.92:0 ) upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) ) app-text/docbook-xml-dtd:4.3 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 >=dev-util/intltool-0.50.1:* dev-libs/libxslt:0 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.12
-DESCRIPTION=Applets for the MATE Desktop and Panel
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X gtk3 ipv6 policykit +upower python_targets_python2_7
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2 FDL-1.1 LGPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_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/rarian:0 dev-libs/atk:0 >=dev-libs/dbus-glib-0.74:0 >=dev-libs/glib-2.36:2 >=dev-libs/libmateweather-1.6.1[gtk3(-)=] >=dev-libs/libxml2-2.5:2 dev-python/pygobject:3 >=gnome-base/libgtop-2.11.92:2= >=mate-base/mate-desktop-1.9[gtk3(-)=] >=mate-base/mate-panel-1.7[gtk3(-)=] >=mate-base/mate-settings-daemon-1.6 >=sys-apps/dbus-1.1.2:0 <sys-power/cpupower-4.7 x11-libs/gdk-pixbuf:2 >=x11-libs/libnotify-0.7:0 x11-libs/libX11:0 x11-libs/pango:0 virtual/libintl:0 !gtk3? ( >=gnome-extra/gucharmap-2.32.1:0 >=x11-libs/gtk+-2.24:2 x11-libs/gtksourceview:2.0 >=x11-libs/libwnck-2.30:1 ) gtk3? ( >=gnome-extra/gucharmap-3.0:2.90 >=x11-libs/gtk+-3.0:3 x11-libs/gtksourceview:3.0 >=x11-libs/libwnck-3.0:3 ) policykit? ( >=sys-auth/polkit-0.92:0 ) upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/mate-applets-1.12.1.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=e14d8675c6f1c93ee18a170f18b45827
diff --git a/metadata/md5-cache/mate-base/mate-applets-1.12.1-r5 b/metadata/md5-cache/mate-base/mate-applets-1.12.1-r5
deleted file mode 100644
index 3fd7c7650281..000000000000
--- a/metadata/md5-cache/mate-base/mate-applets-1.12.1-r5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-text/rarian:0 dev-libs/atk:0 >=dev-libs/dbus-glib-0.74:0 >=dev-libs/glib-2.36:2 >=dev-libs/libmateweather-1.6.1[gtk3(-)=] >=dev-libs/libxml2-2.5:2 dev-python/pygobject:3 >=gnome-base/libgtop-2.11.92:2= >=mate-base/mate-desktop-1.9[gtk3(-)=] >=mate-base/mate-panel-1.7[gtk3(-)=] >=mate-base/mate-settings-daemon-1.6 >=sys-apps/dbus-1.1.2:0 sys-power/cpupower x11-libs/gdk-pixbuf:2 >=x11-libs/libnotify-0.7:0 x11-libs/libX11:0 x11-libs/pango:0 virtual/libintl:0 !gtk3? ( >=gnome-extra/gucharmap-2.32.1:0 >=x11-libs/gtk+-2.24:2 x11-libs/gtksourceview:2.0 >=x11-libs/libwnck-2.30:1 ) gtk3? ( >=gnome-extra/gucharmap-3.0:2.90 >=x11-libs/gtk+-3.0:3 x11-libs/gtksourceview:3.0 >=x11-libs/libwnck-3.0:3 ) policykit? ( >=sys-auth/polkit-0.92:0 ) upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) ) app-text/docbook-xml-dtd:4.3 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 >=dev-util/intltool-0.50.1:* dev-libs/libxslt:0 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.12
-DESCRIPTION=Applets for the MATE Desktop and Panel
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X gtk3 ipv6 policykit +upower python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2 FDL-1.1 LGPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_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/rarian:0 dev-libs/atk:0 >=dev-libs/dbus-glib-0.74:0 >=dev-libs/glib-2.36:2 >=dev-libs/libmateweather-1.6.1[gtk3(-)=] >=dev-libs/libxml2-2.5:2 dev-python/pygobject:3 >=gnome-base/libgtop-2.11.92:2= >=mate-base/mate-desktop-1.9[gtk3(-)=] >=mate-base/mate-panel-1.7[gtk3(-)=] >=mate-base/mate-settings-daemon-1.6 >=sys-apps/dbus-1.1.2:0 sys-power/cpupower x11-libs/gdk-pixbuf:2 >=x11-libs/libnotify-0.7:0 x11-libs/libX11:0 x11-libs/pango:0 virtual/libintl:0 !gtk3? ( >=gnome-extra/gucharmap-2.32.1:0 >=x11-libs/gtk+-2.24:2 x11-libs/gtksourceview:2.0 >=x11-libs/libwnck-2.30:1 ) gtk3? ( >=gnome-extra/gucharmap-3.0:2.90 >=x11-libs/gtk+-3.0:3 x11-libs/gtksourceview:3.0 >=x11-libs/libwnck-3.0:3 ) policykit? ( >=sys-auth/polkit-0.92:0 ) upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/mate-applets-1.12.1.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=a2698548e46ce755467de704971cbb32
diff --git a/metadata/md5-cache/mate-base/mate-applets-1.14.1-r1 b/metadata/md5-cache/mate-base/mate-applets-1.14.1-r1
deleted file mode 100644
index 69a694b71876..000000000000
--- a/metadata/md5-cache/mate-base/mate-applets-1.14.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/atk:0 >=dev-libs/dbus-glib-0.74:0 >=dev-libs/glib-2.36:2 >=dev-libs/libmateweather-1.6.1[gtk3(-)=] >=dev-libs/libxml2-2.5:2 dev-python/pygobject:3 >=gnome-base/libgtop-2.11.92:2= >=mate-base/mate-desktop-1.9[gtk3(-)=] >=mate-base/mate-panel-1.7[gtk3(-)=] >=net-wireless/wireless-tools-28_pre9:0 >=sys-apps/dbus-1.1.2:0 <sys-power/cpupower-4.7 x11-libs/gdk-pixbuf:2 >=x11-libs/libnotify-0.7:0 x11-libs/libX11:0 x11-libs/pango:0 virtual/libintl:0 !gtk3? ( >=gnome-extra/gucharmap-2.32.1:0 >=x11-libs/gtk+-2.24:2 x11-libs/gtksourceview:2.0 >=x11-libs/libwnck-2.30:1 ) gtk3? ( >=gnome-extra/gucharmap-3.0:2.90 >=x11-libs/gtk+-3.0:3 x11-libs/gtksourceview:3.0 >=x11-libs/libwnck-3.0:3 ) policykit? ( >=sys-auth/polkit-0.92:0 ) upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) ) !!net-analyzer/mate-netspeed app-text/docbook-xml-dtd:4.3 app-text/rarian:0 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 >=dev-util/intltool-0.50.1:* dev-libs/libxslt:0 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.14
-DESCRIPTION=Applets for the MATE Desktop and Panel
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X gtk3 ipv6 policykit +upower python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2 FDL-1.1 LGPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_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/atk:0 >=dev-libs/dbus-glib-0.74:0 >=dev-libs/glib-2.36:2 >=dev-libs/libmateweather-1.6.1[gtk3(-)=] >=dev-libs/libxml2-2.5:2 dev-python/pygobject:3 >=gnome-base/libgtop-2.11.92:2= >=mate-base/mate-desktop-1.9[gtk3(-)=] >=mate-base/mate-panel-1.7[gtk3(-)=] >=net-wireless/wireless-tools-28_pre9:0 >=sys-apps/dbus-1.1.2:0 <sys-power/cpupower-4.7 x11-libs/gdk-pixbuf:2 >=x11-libs/libnotify-0.7:0 x11-libs/libX11:0 x11-libs/pango:0 virtual/libintl:0 !gtk3? ( >=gnome-extra/gucharmap-2.32.1:0 >=x11-libs/gtk+-2.24:2 x11-libs/gtksourceview:2.0 >=x11-libs/libwnck-2.30:1 ) gtk3? ( >=gnome-extra/gucharmap-3.0:2.90 >=x11-libs/gtk+-3.0:3 x11-libs/gtksourceview:3.0 >=x11-libs/libwnck-3.0:3 ) policykit? ( >=sys-auth/polkit-0.92:0 ) upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) ) !!net-analyzer/mate-netspeed >=mate-base/mate-settings-daemon-1.6
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.14/mate-applets-1.14.1.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=c8b1c1229b22df345f2771fbb7570cc6
diff --git a/metadata/md5-cache/mate-base/mate-applets-1.14.1-r2 b/metadata/md5-cache/mate-base/mate-applets-1.14.1-r2
deleted file mode 100644
index ff2c150e4309..000000000000
--- a/metadata/md5-cache/mate-base/mate-applets-1.14.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/atk:0 >=dev-libs/dbus-glib-0.74:0 >=dev-libs/glib-2.36:2 >=dev-libs/libmateweather-1.6.1[gtk3(-)=] >=dev-libs/libxml2-2.5:2 dev-python/pygobject:3 >=gnome-base/libgtop-2.11.92:2= >=mate-base/mate-desktop-1.9[gtk3(-)=] >=mate-base/mate-panel-1.7[gtk3(-)=] >=net-wireless/wireless-tools-28_pre9:0 >=sys-apps/dbus-1.1.2:0 sys-power/cpupower x11-libs/gdk-pixbuf:2 >=x11-libs/libnotify-0.7:0 x11-libs/libX11:0 x11-libs/pango:0 virtual/libintl:0 !gtk3? ( >=gnome-extra/gucharmap-2.32.1:0 >=x11-libs/gtk+-2.24:2 x11-libs/gtksourceview:2.0 >=x11-libs/libwnck-2.30:1 ) gtk3? ( >=gnome-extra/gucharmap-3.0:2.90 >=x11-libs/gtk+-3.0:3 x11-libs/gtksourceview:3.0 >=x11-libs/libwnck-3.0:3 ) policykit? ( >=sys-auth/polkit-0.92:0 ) upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) ) !!net-analyzer/mate-netspeed app-text/docbook-xml-dtd:4.3 app-text/rarian:0 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 >=dev-util/intltool-0.50.1:* dev-libs/libxslt:0 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.14
-DESCRIPTION=Applets for the MATE Desktop and Panel
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X gtk3 ipv6 policykit +upower python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2 FDL-1.1 LGPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_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/atk:0 >=dev-libs/dbus-glib-0.74:0 >=dev-libs/glib-2.36:2 >=dev-libs/libmateweather-1.6.1[gtk3(-)=] >=dev-libs/libxml2-2.5:2 dev-python/pygobject:3 >=gnome-base/libgtop-2.11.92:2= >=mate-base/mate-desktop-1.9[gtk3(-)=] >=mate-base/mate-panel-1.7[gtk3(-)=] >=net-wireless/wireless-tools-28_pre9:0 >=sys-apps/dbus-1.1.2:0 sys-power/cpupower x11-libs/gdk-pixbuf:2 >=x11-libs/libnotify-0.7:0 x11-libs/libX11:0 x11-libs/pango:0 virtual/libintl:0 !gtk3? ( >=gnome-extra/gucharmap-2.32.1:0 >=x11-libs/gtk+-2.24:2 x11-libs/gtksourceview:2.0 >=x11-libs/libwnck-2.30:1 ) gtk3? ( >=gnome-extra/gucharmap-3.0:2.90 >=x11-libs/gtk+-3.0:3 x11-libs/gtksourceview:3.0 >=x11-libs/libwnck-3.0:3 ) policykit? ( >=sys-auth/polkit-0.92:0 ) upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) ) !!net-analyzer/mate-netspeed >=mate-base/mate-settings-daemon-1.6
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.14/mate-applets-1.14.1.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=c8567361f39083d764a14f4a9744cfbc
diff --git a/metadata/md5-cache/mate-base/mate-applets-1.16.0 b/metadata/md5-cache/mate-base/mate-applets-1.16.0
deleted file mode 100644
index 2d8424f0fdb3..000000000000
--- a/metadata/md5-cache/mate-base/mate-applets-1.16.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/atk:0 >=dev-libs/dbus-glib-0.74:0 >=dev-libs/glib-2.36:2 >=dev-libs/libmateweather-1.6.1[gtk3(-)=] >=dev-libs/libxml2-2.5:2 dev-python/pygobject:3 >=gnome-base/libgtop-2.11.92:2= >=mate-base/mate-panel-1.7[gtk3(-)=] >=net-wireless/wireless-tools-28_pre9:0 >=sys-apps/dbus-1.1.2:0 <sys-power/cpupower-4.7 x11-libs/gdk-pixbuf:2 >=x11-libs/libnotify-0.7:0 x11-libs/libX11:0 x11-libs/pango:0 virtual/libintl:0 !gtk3? ( >=gnome-extra/gucharmap-2.32.1:0 >=x11-libs/gtk+-2.24:2 x11-libs/gtksourceview:2.0 >=x11-libs/libwnck-2.30:1 ) gtk3? ( >=gnome-extra/gucharmap-3.0:2.90 >=x11-libs/gtk+-3.0:3 x11-libs/gtksourceview:3.0 >=x11-libs/libwnck-3.0:3 ) policykit? ( >=sys-auth/polkit-0.97:0 ) upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) ) !!net-analyzer/mate-netspeed app-text/docbook-xml-dtd:4.3 app-text/rarian:0 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 >=dev-util/intltool-0.50.1:* dev-libs/libxslt:0 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.16
-DESCRIPTION=Applets for the MATE Desktop and Panel
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X gtk3 ipv6 policykit +upower python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2 FDL-1.1 LGPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_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/atk:0 >=dev-libs/dbus-glib-0.74:0 >=dev-libs/glib-2.36:2 >=dev-libs/libmateweather-1.6.1[gtk3(-)=] >=dev-libs/libxml2-2.5:2 dev-python/pygobject:3 >=gnome-base/libgtop-2.11.92:2= >=mate-base/mate-panel-1.7[gtk3(-)=] >=net-wireless/wireless-tools-28_pre9:0 >=sys-apps/dbus-1.1.2:0 <sys-power/cpupower-4.7 x11-libs/gdk-pixbuf:2 >=x11-libs/libnotify-0.7:0 x11-libs/libX11:0 x11-libs/pango:0 virtual/libintl:0 !gtk3? ( >=gnome-extra/gucharmap-2.32.1:0 >=x11-libs/gtk+-2.24:2 x11-libs/gtksourceview:2.0 >=x11-libs/libwnck-2.30:1 ) gtk3? ( >=gnome-extra/gucharmap-3.0:2.90 >=x11-libs/gtk+-3.0:3 x11-libs/gtksourceview:3.0 >=x11-libs/libwnck-3.0:3 ) policykit? ( >=sys-auth/polkit-0.97:0 ) upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) ) !!net-analyzer/mate-netspeed >=mate-base/mate-settings-daemon-1.6
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-applets-1.16.0.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=bd37cb0c96802e375318f529b93e6acf
diff --git a/metadata/md5-cache/mate-base/mate-applets-1.16.0-r1 b/metadata/md5-cache/mate-base/mate-applets-1.16.0-r1
deleted file mode 100644
index 2375b1b116f3..000000000000
--- a/metadata/md5-cache/mate-base/mate-applets-1.16.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/atk:0 >=dev-libs/dbus-glib-0.74:0 >=dev-libs/glib-2.36:2 >=dev-libs/libmateweather-1.6.1[gtk3(-)=] >=dev-libs/libxml2-2.5:2 dev-python/pygobject:3 >=gnome-base/libgtop-2.11.92:2= >=mate-base/mate-panel-1.7[gtk3(-)=] >=net-wireless/wireless-tools-28_pre9:0 >=sys-apps/dbus-1.1.2:0 sys-power/cpupower x11-libs/gdk-pixbuf:2 >=x11-libs/libnotify-0.7:0 x11-libs/libX11:0 x11-libs/pango:0 virtual/libintl:0 !gtk3? ( >=gnome-extra/gucharmap-2.32.1:0 >=x11-libs/gtk+-2.24:2 x11-libs/gtksourceview:2.0 >=x11-libs/libwnck-2.30:1 ) gtk3? ( >=gnome-extra/gucharmap-3.0:2.90 >=x11-libs/gtk+-3.0:3 x11-libs/gtksourceview:3.0 >=x11-libs/libwnck-3.0:3 ) policykit? ( >=sys-auth/polkit-0.97:0 ) upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) ) !!net-analyzer/mate-netspeed app-text/docbook-xml-dtd:4.3 app-text/rarian:0 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 >=dev-util/intltool-0.50.1:* dev-libs/libxslt:0 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.16
-DESCRIPTION=Applets for the MATE Desktop and Panel
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X gtk3 ipv6 policykit +upower python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2 FDL-1.1 LGPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_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/atk:0 >=dev-libs/dbus-glib-0.74:0 >=dev-libs/glib-2.36:2 >=dev-libs/libmateweather-1.6.1[gtk3(-)=] >=dev-libs/libxml2-2.5:2 dev-python/pygobject:3 >=gnome-base/libgtop-2.11.92:2= >=mate-base/mate-panel-1.7[gtk3(-)=] >=net-wireless/wireless-tools-28_pre9:0 >=sys-apps/dbus-1.1.2:0 sys-power/cpupower x11-libs/gdk-pixbuf:2 >=x11-libs/libnotify-0.7:0 x11-libs/libX11:0 x11-libs/pango:0 virtual/libintl:0 !gtk3? ( >=gnome-extra/gucharmap-2.32.1:0 >=x11-libs/gtk+-2.24:2 x11-libs/gtksourceview:2.0 >=x11-libs/libwnck-2.30:1 ) gtk3? ( >=gnome-extra/gucharmap-3.0:2.90 >=x11-libs/gtk+-3.0:3 x11-libs/gtksourceview:3.0 >=x11-libs/libwnck-3.0:3 ) policykit? ( >=sys-auth/polkit-0.97:0 ) upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) ) !!net-analyzer/mate-netspeed >=mate-base/mate-settings-daemon-1.6
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-applets-1.16.0.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=a36a26915c4d8dd79d3aa1834d865cb1
diff --git a/metadata/md5-cache/mate-base/mate-applets-1.18.2 b/metadata/md5-cache/mate-base/mate-applets-1.18.2
index c9bf3989416c..12ee14ab942b 100644
--- a/metadata/md5-cache/mate-base/mate-applets-1.18.2
+++ b/metadata/md5-cache/mate-base/mate-applets-1.18.2
@@ -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://pub.mate-desktop.org/releases/1.18/mate-applets-1.18.2.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b5a3451b4e8a25978b051f211ab1aa21
diff --git a/metadata/md5-cache/mate-base/mate-applets-meta-1.12 b/metadata/md5-cache/mate-base/mate-applets-meta-1.12
deleted file mode 100644
index 6775ddb3d031..000000000000
--- a/metadata/md5-cache/mate-base/mate-applets-meta-1.12
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Meta package for MATE panel applets
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-IUSE=appindicator gtk3 netspeed sensors
-KEYWORDS=amd64 ~arm x86
-LICENSE=metapackage
-RDEPEND==mate-base/mate-applets-1.12*[gtk3(-)=] appindicator? ( =mate-extra/mate-indicator-applet-1.12*[gtk3(-)=] ) netspeed? ( =net-analyzer/mate-netspeed-1.12*[gtk3(-)=] ) sensors? ( =mate-extra/mate-sensors-applet-1.12*[gtk3(-)=] )
-SLOT=0
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=c7dc7e6de530abad80a4ba05931fc8d8
diff --git a/metadata/md5-cache/mate-base/mate-applets-meta-1.14 b/metadata/md5-cache/mate-base/mate-applets-meta-1.14
deleted file mode 100644
index d0a3d41c930a..000000000000
--- a/metadata/md5-cache/mate-base/mate-applets-meta-1.14
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Meta package for MATE panel applets
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-IUSE=appindicator gtk3 sensors
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=metapackage
-RDEPEND==mate-base/mate-applets-1.14*[gtk3(-)=] appindicator? ( =mate-extra/mate-indicator-applet-1.14*[gtk3(-)=] ) sensors? ( =mate-extra/mate-sensors-applet-1.14*[gtk3(-)=] )
-SLOT=0
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=881b3a35ad093eeb8dc0f4c0f9c096bf
diff --git a/metadata/md5-cache/mate-base/mate-applets-meta-1.16 b/metadata/md5-cache/mate-base/mate-applets-meta-1.16
deleted file mode 100644
index 484cea2bdacd..000000000000
--- a/metadata/md5-cache/mate-base/mate-applets-meta-1.16
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Meta package for MATE panel applets
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-IUSE=appindicator gtk3 sensors
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=metapackage
-RDEPEND==mate-base/mate-applets-1.16*[gtk3(-)=] appindicator? ( =mate-extra/mate-indicator-applet-1.16*[gtk3(-)=] ) sensors? ( =mate-extra/mate-sensors-applet-1.16*[gtk3(-)=] )
-SLOT=0
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=881b3a35ad093eeb8dc0f4c0f9c096bf
diff --git a/metadata/md5-cache/mate-base/mate-common-1.12.0 b/metadata/md5-cache/mate-base/mate-common-1.12.0
deleted file mode 100644
index 925052a42898..000000000000
--- a/metadata/md5-cache/mate-base/mate-common-1.12.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Common files for development of MATE packages
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/mate-common-1.12.0.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=980d9eac8dec8a81d404b6e251218687
diff --git a/metadata/md5-cache/mate-base/mate-common-1.14.0 b/metadata/md5-cache/mate-base/mate-common-1.14.0
deleted file mode 100644
index d44797ac3eca..000000000000
--- a/metadata/md5-cache/mate-base/mate-common-1.14.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Common files for development of MATE packages
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.14/mate-common-1.14.0.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=48cf07ce3b13ebc3b6bf61ca9632bc55
diff --git a/metadata/md5-cache/mate-base/mate-common-1.16.0 b/metadata/md5-cache/mate-base/mate-common-1.16.0
deleted file mode 100644
index 3710f27c0d06..000000000000
--- a/metadata/md5-cache/mate-base/mate-common-1.16.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Common files for development of MATE packages
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-common-1.16.0.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=48cf07ce3b13ebc3b6bf61ca9632bc55
diff --git a/metadata/md5-cache/mate-base/mate-control-center-1.12.1-r1 b/metadata/md5-cache/mate-base/mate-control-center-1.12.1-r1
deleted file mode 100644
index e4951488babd..000000000000
--- a/metadata/md5-cache/mate-base/mate-control-center-1.12.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-text/rarian:0 dev-libs/atk:0 >=dev-libs/dbus-glib-0.73:0 >=dev-libs/glib-2.36:2 dev-libs/libxml2:2 >=gnome-base/dconf-0.13.4:0 >=gnome-base/librsvg-2.0:2 >=mate-base/libmatekbd-1.6[gtk3(-)=] >=mate-base/mate-desktop-1.11[gtk3(-)=] >=mate-base/caja-1.8[gtk3(-)=] >=mate-base/mate-menus-1.6 >=mate-base/mate-settings-daemon-1.11[gtk3(-)=] >=media-libs/fontconfig-1:1.0 media-libs/freetype:2 >=sys-apps/dbus-1:0 x11-apps/xmodmap:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libX11:0 x11-libs/libXScrnSaver:0 x11-libs/libXcursor:0 x11-libs/libXext:0 >=x11-libs/libXi-1.2:0 x11-libs/libXrandr:0 x11-libs/libXrender:0 x11-libs/libXxf86misc:0 >=x11-libs/libxklavier-4:0 x11-libs/pango:0 >=x11-wm/marco-1.9.1[gtk3(-)=] virtual/libintl:0 !gtk3? ( >=dev-libs/libunique-1:1 media-libs/libcanberra:0[gtk] >=x11-libs/gtk+-2.24:2 appindicator? ( dev-libs/libappindicator:2 ) ) gtk3? ( >=dev-libs/libunique-3:3 media-libs/libcanberra:0[gtk3] >=x11-libs/gtk+-3.0:3 appindicator? ( dev-libs/libappindicator:3 ) ) >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 dev-util/desktop-file-utils:0 >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* x11-base/xorg-proto >=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.12
-DESCRIPTION=The MATE Desktop configuration tool
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=appindicator debug gtk3
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=app-text/rarian:0 dev-libs/atk:0 >=dev-libs/dbus-glib-0.73:0 >=dev-libs/glib-2.36:2 dev-libs/libxml2:2 >=gnome-base/dconf-0.13.4:0 >=gnome-base/librsvg-2.0:2 >=mate-base/libmatekbd-1.6[gtk3(-)=] >=mate-base/mate-desktop-1.11[gtk3(-)=] >=mate-base/caja-1.8[gtk3(-)=] >=mate-base/mate-menus-1.6 >=mate-base/mate-settings-daemon-1.11[gtk3(-)=] >=media-libs/fontconfig-1:1.0 media-libs/freetype:2 >=sys-apps/dbus-1:0 x11-apps/xmodmap:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libX11:0 x11-libs/libXScrnSaver:0 x11-libs/libXcursor:0 x11-libs/libXext:0 >=x11-libs/libXi-1.2:0 x11-libs/libXrandr:0 x11-libs/libXrender:0 x11-libs/libXxf86misc:0 >=x11-libs/libxklavier-4:0 x11-libs/pango:0 >=x11-wm/marco-1.9.1[gtk3(-)=] virtual/libintl:0 !gtk3? ( >=dev-libs/libunique-1:1 media-libs/libcanberra:0[gtk] >=x11-libs/gtk+-2.24:2 appindicator? ( dev-libs/libappindicator:2 ) ) gtk3? ( >=dev-libs/libunique-3:3 media-libs/libcanberra:0[gtk3] >=x11-libs/gtk+-3.0:3 appindicator? ( dev-libs/libappindicator:3 ) )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/mate-control-center-1.12.1.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=2724d4192b8bb62da8bec0d547646a9d
diff --git a/metadata/md5-cache/mate-base/mate-control-center-1.14.1-r1 b/metadata/md5-cache/mate-base/mate-control-center-1.14.1-r1
deleted file mode 100644
index 47e8a44fc3b6..000000000000
--- a/metadata/md5-cache/mate-base/mate-control-center-1.14.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/atk:0 >=dev-libs/dbus-glib-0.73:0 >=dev-libs/glib-2.36:2 dev-libs/libxml2:2 >=gnome-base/dconf-0.13.4:0 >=gnome-base/librsvg-2.0:2 >=mate-base/libmatekbd-1.6[gtk3(-)=] >=mate-base/mate-desktop-1.11[gtk3(-)=] >=mate-base/caja-1.8[gtk3(-)=] >=mate-base/mate-menus-1.6 >=mate-base/mate-settings-daemon-1.13.1[gtk3(-)=] >=media-libs/fontconfig-1:1.0 media-libs/freetype:2 >=sys-apps/dbus-1:0 x11-apps/xmodmap:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libX11:0 x11-libs/libXScrnSaver:0 x11-libs/libXcursor:0 x11-libs/libXext:0 >=x11-libs/libXi-1.2:0 x11-libs/libXrandr:0 x11-libs/libXrender:0 x11-libs/libXxf86misc:0 >=x11-libs/libxklavier-4:0 x11-libs/pango:0 >=x11-wm/marco-1.9.1[gtk3(-)=] virtual/libintl:0 !gtk3? ( >=dev-libs/libunique-1:1 media-libs/libcanberra:0[gtk] >=x11-libs/gtk+-2.24:2 appindicator? ( dev-libs/libappindicator:2 ) ) gtk3? ( >=dev-libs/libunique-3:3 media-libs/libcanberra:0[gtk3] >=x11-libs/gtk+-3.0:3 appindicator? ( dev-libs/libappindicator:3 ) ) app-text/rarian:0 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 dev-util/desktop-file-utils:0 >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* x11-base/xorg-proto >=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.14
-DESCRIPTION=The MATE Desktop configuration tool
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=appindicator debug gtk3
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/atk:0 >=dev-libs/dbus-glib-0.73:0 >=dev-libs/glib-2.36:2 dev-libs/libxml2:2 >=gnome-base/dconf-0.13.4:0 >=gnome-base/librsvg-2.0:2 >=mate-base/libmatekbd-1.6[gtk3(-)=] >=mate-base/mate-desktop-1.11[gtk3(-)=] >=mate-base/caja-1.8[gtk3(-)=] >=mate-base/mate-menus-1.6 >=mate-base/mate-settings-daemon-1.13.1[gtk3(-)=] >=media-libs/fontconfig-1:1.0 media-libs/freetype:2 >=sys-apps/dbus-1:0 x11-apps/xmodmap:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libX11:0 x11-libs/libXScrnSaver:0 x11-libs/libXcursor:0 x11-libs/libXext:0 >=x11-libs/libXi-1.2:0 x11-libs/libXrandr:0 x11-libs/libXrender:0 x11-libs/libXxf86misc:0 >=x11-libs/libxklavier-4:0 x11-libs/pango:0 >=x11-wm/marco-1.9.1[gtk3(-)=] virtual/libintl:0 !gtk3? ( >=dev-libs/libunique-1:1 media-libs/libcanberra:0[gtk] >=x11-libs/gtk+-2.24:2 appindicator? ( dev-libs/libappindicator:2 ) ) gtk3? ( >=dev-libs/libunique-3:3 media-libs/libcanberra:0[gtk3] >=x11-libs/gtk+-3.0:3 appindicator? ( dev-libs/libappindicator:3 ) )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.14/mate-control-center-1.14.1.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=8a67cf4561833d55c8c176e5bb874914
diff --git a/metadata/md5-cache/mate-base/mate-control-center-1.16.1 b/metadata/md5-cache/mate-base/mate-control-center-1.16.1
deleted file mode 100644
index cbc94853316d..000000000000
--- a/metadata/md5-cache/mate-base/mate-control-center-1.16.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/atk:0 >=dev-libs/dbus-glib-0.73:0 >=dev-libs/glib-2.36:2 dev-libs/libxml2:2 >=gnome-base/dconf-0.13.4:0 >=gnome-base/librsvg-2.0:2 >=mate-base/libmatekbd-1.6[gtk3(-)=] >=mate-base/mate-desktop-1.15.1[gtk3(-)=] >=mate-base/caja-1.8[gtk3(-)=] >=mate-base/mate-menus-1.6 >=mate-base/mate-settings-daemon-1.13.1[gtk3(-)=] >=media-libs/fontconfig-1:1.0 media-libs/freetype:2 >=sys-apps/dbus-1:0 x11-apps/xmodmap:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libX11:0 x11-libs/libXScrnSaver:0 x11-libs/libXcursor:0 x11-libs/libXext:0 >=x11-libs/libXi-1.2:0 x11-libs/libXrandr:0 x11-libs/libXrender:0 x11-libs/libXxf86misc:0 >=x11-libs/libxklavier-4:0 x11-libs/pango:0 >=x11-wm/marco-1.13.1[gtk3(-)=] virtual/libintl:0 !gtk3? ( >=dev-libs/libunique-1:1 media-libs/libcanberra:0[gtk] >=x11-libs/gtk+-2.24:2 appindicator? ( dev-libs/libappindicator:2 ) ) gtk3? ( >=dev-libs/libunique-3:3 media-libs/libcanberra:0[gtk3] >=x11-libs/gtk+-3.0:3 appindicator? ( dev-libs/libappindicator:3 ) ) app-text/rarian:0 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 dev-util/desktop-file-utils:0 >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* x11-base/xorg-proto >=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.16
-DESCRIPTION=The MATE Desktop configuration tool
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=appindicator debug gtk3
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/atk:0 >=dev-libs/dbus-glib-0.73:0 >=dev-libs/glib-2.36:2 dev-libs/libxml2:2 >=gnome-base/dconf-0.13.4:0 >=gnome-base/librsvg-2.0:2 >=mate-base/libmatekbd-1.6[gtk3(-)=] >=mate-base/mate-desktop-1.15.1[gtk3(-)=] >=mate-base/caja-1.8[gtk3(-)=] >=mate-base/mate-menus-1.6 >=mate-base/mate-settings-daemon-1.13.1[gtk3(-)=] >=media-libs/fontconfig-1:1.0 media-libs/freetype:2 >=sys-apps/dbus-1:0 x11-apps/xmodmap:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libX11:0 x11-libs/libXScrnSaver:0 x11-libs/libXcursor:0 x11-libs/libXext:0 >=x11-libs/libXi-1.2:0 x11-libs/libXrandr:0 x11-libs/libXrender:0 x11-libs/libXxf86misc:0 >=x11-libs/libxklavier-4:0 x11-libs/pango:0 >=x11-wm/marco-1.13.1[gtk3(-)=] virtual/libintl:0 !gtk3? ( >=dev-libs/libunique-1:1 media-libs/libcanberra:0[gtk] >=x11-libs/gtk+-2.24:2 appindicator? ( dev-libs/libappindicator:2 ) ) gtk3? ( >=dev-libs/libunique-3:3 media-libs/libcanberra:0[gtk3] >=x11-libs/gtk+-3.0:3 appindicator? ( dev-libs/libappindicator:3 ) )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-control-center-1.16.1.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=4b8cce4df31beed169f77870780102a3
diff --git a/metadata/md5-cache/mate-base/mate-control-center-1.18.2 b/metadata/md5-cache/mate-base/mate-control-center-1.18.2
index 7949aef6bc81..0be1a1706cea 100644
--- a/metadata/md5-cache/mate-base/mate-control-center-1.18.2
+++ b/metadata/md5-cache/mate-base/mate-control-center-1.18.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/atk:0 >=dev-libs/dbus-glib-0.73:0 >=dev-libs/glib-2.36:2 dev-libs/libxml2:2 >=gnome-base/dconf-0.13.4:0 >=gnome-base/librsvg-2.0:2 >=mate-base/libmatekbd-1.17.0 >=mate-base/mate-desktop-1.17.0 >=mate-base/caja-1.17.0 >=mate-base/mate-menus-1.1.0 >=mate-base/mate-settings-daemon-1.17.0 >=media-libs/fontconfig-1:1.0 media-libs/freetype:2 media-libs/libcanberra:0[gtk3] >=sys-apps/dbus-1:0 x11-apps/xmodmap:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 x11-libs/libX11:0 x11-libs/libXScrnSaver:0 x11-libs/libXcursor:0 x11-libs/libXext:0 >=x11-libs/libXi-1.5:0 x11-libs/libXrandr:0 x11-libs/libXrender:0 x11-libs/libXxf86misc:0 >=x11-libs/libxklavier-4:0 x11-libs/pango:0 >=x11-wm/marco-1.17.0 virtual/libintl:0 appindicator? ( dev-libs/libappindicator:3 )
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-control-center-1.18.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5ca399fe77bbcca016857abfa8f7f8b0
diff --git a/metadata/md5-cache/mate-base/mate-desktop-1.12.1-r2 b/metadata/md5-cache/mate-base/mate-desktop-1.12.1-r2
deleted file mode 100644
index 9985955eb213..000000000000
--- a/metadata/md5-cache/mate-base/mate-desktop-1.12.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-libs/glib-2.36:2 x11-libs/cairo:0 >=x11-libs/gdk-pixbuf-2.4:2[introspection?] x11-libs/libX11:0 >=x11-libs/libXrandr-1.3:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) startup-notification? ( >=x11-libs/startup-notification-0.5:0 ) app-text/docbook-xml-dtd:4.1.2 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.40:* >=gnome-base/dconf-0.13.4:0 sys-devel/gettext:* virtual/pkgconfig:* x11-base/xorg-proto >=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.12
-DESCRIPTION=Libraries for the MATE desktop that are not part of the UI
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X debug gtk3 +introspection startup-notification python_targets_python2_7
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2 FDL-1.1 LGPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-libs/glib-2.36:2 x11-libs/cairo:0 >=x11-libs/gdk-pixbuf-2.4:2[introspection?] x11-libs/libX11:0 >=x11-libs/libXrandr-1.3:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) startup-notification? ( >=x11-libs/startup-notification-0.5:0 )
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/mate-desktop-1.12.1.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	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=5f630bdfdaaa9164ac743a6bb3e2db7b
diff --git a/metadata/md5-cache/mate-base/mate-desktop-1.14.1 b/metadata/md5-cache/mate-base/mate-desktop-1.14.1
deleted file mode 100644
index 476771f6aa76..000000000000
--- a/metadata/md5-cache/mate-base/mate-desktop-1.14.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.36:2 >=gnome-base/dconf-0.13.4:0 x11-libs/cairo:0 x11-libs/libX11:0 >=x11-libs/libXrandr-1.3:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) startup-notification? ( >=x11-libs/startup-notification-0.5:0 ) app-text/docbook-xml-dtd:4.1.2 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.40:* sys-devel/gettext:* virtual/pkgconfig:* x11-base/xorg-proto >=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.14
-DESCRIPTION=Libraries for the MATE desktop that are not part of the UI
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X debug gtk3 +introspection startup-notification
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2 FDL-1.1 LGPL-2
-RDEPEND=>=dev-libs/glib-2.36:2 >=gnome-base/dconf-0.13.4:0 x11-libs/cairo:0 x11-libs/libX11:0 >=x11-libs/libXrandr-1.3:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) startup-notification? ( >=x11-libs/startup-notification-0.5:0 )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.14/mate-desktop-1.14.1.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=2400802acfe165fc871938bec3b47822
diff --git a/metadata/md5-cache/mate-base/mate-desktop-1.16.2 b/metadata/md5-cache/mate-base/mate-desktop-1.16.2
deleted file mode 100644
index e845aec31af9..000000000000
--- a/metadata/md5-cache/mate-base/mate-desktop-1.16.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.36:2 >=gnome-base/dconf-0.13.4:0 x11-libs/cairo:0 x11-libs/libX11:0 >=x11-libs/libXrandr-1.3:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) startup-notification? ( >=x11-libs/startup-notification-0.5:0 ) app-text/docbook-xml-dtd:4.1.2 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.40:* sys-devel/gettext:* virtual/pkgconfig:* x11-base/xorg-proto >=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.16
-DESCRIPTION=Libraries for the MATE desktop that are not part of the UI
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X debug gtk3 +introspection startup-notification
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2 FDL-1.1 LGPL-2
-RDEPEND=>=dev-libs/glib-2.36:2 >=gnome-base/dconf-0.13.4:0 x11-libs/cairo:0 x11-libs/libX11:0 >=x11-libs/libXrandr-1.3:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) startup-notification? ( >=x11-libs/startup-notification-0.5:0 )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-desktop-1.16.2.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=2400802acfe165fc871938bec3b47822
diff --git a/metadata/md5-cache/mate-base/mate-desktop-1.18.0 b/metadata/md5-cache/mate-base/mate-desktop-1.18.0
index 26c8fdda3d98..1b549aadbb99 100644
--- a/metadata/md5-cache/mate-base/mate-desktop-1.18.0
+++ b/metadata/md5-cache/mate-base/mate-desktop-1.18.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 FDL-1.1 LGPL-2
 RDEPEND=>=dev-libs/glib-2.36:2 >=gnome-base/dconf-0.13.4:0 x11-libs/cairo:0 x11-libs/libX11:0 >=x11-libs/libXrandr-1.3:0 virtual/libintl:0 >=x11-libs/gtk+-3.0:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) startup-notification? ( >=x11-libs/startup-notification-0.5:0 )
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-desktop-1.18.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a293af79276b2fc22272d05e9e77ebf0
diff --git a/metadata/md5-cache/mate-base/mate-menus-1.12.0-r1 b/metadata/md5-cache/mate-base/mate-menus-1.12.0-r1
deleted file mode 100644
index 4688345e178c..000000000000
--- a/metadata/md5-cache/mate-base/mate-menus-1.12.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.36.0:2 virtual/libintl:0 introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) python? ( dev-python/pygtk:2[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-util/intltool-0.40:* 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.12
-DESCRIPTION=MATE menu system, implementing the F.D.O cross-desktop spec
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=debug +introspection python python_targets_python2_7
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=dev-libs/glib-2.36.0:2 virtual/libintl:0 introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) python? ( dev-python/pygtk:2[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? ( || ( python_targets_python2_7 ) )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/mate-menus-1.12.0.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	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=c4c7ec23e4ea7335fe5d634980213f31
diff --git a/metadata/md5-cache/mate-base/mate-menus-1.14.0 b/metadata/md5-cache/mate-base/mate-menus-1.14.0
deleted file mode 100644
index 29db46d40bb2..000000000000
--- a/metadata/md5-cache/mate-base/mate-menus-1.14.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.36.0:2 virtual/libintl:0 introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) python? ( dev-python/pygtk:2[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-util/intltool-0.40:* 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.14
-DESCRIPTION=MATE menu system, implementing the F.D.O cross-desktop spec
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=debug +introspection python python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=dev-libs/glib-2.36.0:2 virtual/libintl:0 introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) python? ( dev-python/pygtk:2[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? ( || ( python_targets_python2_7 ) )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.14/mate-menus-1.14.0.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	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=b46c55d2f04fbe864faab5a20f2a1fa3
diff --git a/metadata/md5-cache/mate-base/mate-menus-1.16.0 b/metadata/md5-cache/mate-base/mate-menus-1.16.0
deleted file mode 100644
index 8414b7b65d35..000000000000
--- a/metadata/md5-cache/mate-base/mate-menus-1.16.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.36.0:2 virtual/libintl:0 introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) python? ( dev-python/pygtk:2[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-util/intltool-0.40:* 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.16
-DESCRIPTION=MATE menu system, implementing the F.D.O cross-desktop spec
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=debug +introspection python python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=dev-libs/glib-2.36.0:2 virtual/libintl:0 introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) python? ( dev-python/pygtk:2[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? ( || ( python_targets_python2_7 ) )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-menus-1.16.0.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	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=b46c55d2f04fbe864faab5a20f2a1fa3
diff --git a/metadata/md5-cache/mate-base/mate-menus-1.18.1 b/metadata/md5-cache/mate-base/mate-menus-1.18.1
index 9b7606ae97d1..b80a6cff414b 100644
--- a/metadata/md5-cache/mate-base/mate-menus-1.18.1
+++ b/metadata/md5-cache/mate-base/mate-menus-1.18.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.36.0:2 virtual/libintl:0 introspection? ( >=dev-libs/g
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-menus-1.18.1.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	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6835ce98de9bae1d99c9ee669167a259
diff --git a/metadata/md5-cache/mate-base/mate-panel-1.12.2-r3 b/metadata/md5-cache/mate-base/mate-panel-1.12.2-r3
deleted file mode 100644
index 3d2d5da4fd8b..000000000000
--- a/metadata/md5-cache/mate-base/mate-panel-1.12.2-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/atk:0 >=dev-libs/dbus-glib-0.80:0 >=dev-libs/glib-2.36:2 >=dev-libs/libmateweather-1.7[gtk3(-)=] dev-libs/libxml2:2 >=gnome-base/dconf-0.10:0 gnome-base/librsvg:2 >=mate-base/mate-desktop-1.9.3[gtk3(-)=] >=mate-base/mate-menus-1.6 >=sys-apps/dbus-1.1.2:0 >=x11-libs/cairo-1:0 >=x11-libs/gdk-pixbuf-2.7.1:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 >=x11-libs/pango-1.15.4:0[introspection?] x11-libs/libXau:0 >=x11-libs/libXrandr-1.3:0 virtual/libintl:0 !gtk3? ( media-libs/libcanberra:0[gtk] >=x11-libs/gtk+-2.19.7:2[introspection?] >=x11-libs/libwnck-2.30:1[introspection?] ) gtk3? ( media-libs/libcanberra:0[gtk3] >=x11-libs/gtk+-3.0:3[introspection?] >=x11-libs/libwnck-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) app-text/docbook-xml-dtd:4.1.2 app-text/yelp-tools:0 >=dev-lang/perl-5:0= dev-util/gtk-doc dev-util/gtk-doc-am >=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.12
-DESCRIPTION=The MATE panel
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X gtk3 +introspection
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2 FDL-1.1 LGPL-2
-RDEPEND=dev-libs/atk:0 >=dev-libs/dbus-glib-0.80:0 >=dev-libs/glib-2.36:2 >=dev-libs/libmateweather-1.7[gtk3(-)=] dev-libs/libxml2:2 >=gnome-base/dconf-0.10:0 gnome-base/librsvg:2 >=mate-base/mate-desktop-1.9.3[gtk3(-)=] >=mate-base/mate-menus-1.6 >=sys-apps/dbus-1.1.2:0 >=x11-libs/cairo-1:0 >=x11-libs/gdk-pixbuf-2.7.1:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 >=x11-libs/pango-1.15.4:0[introspection?] x11-libs/libXau:0 >=x11-libs/libXrandr-1.3:0 virtual/libintl:0 !gtk3? ( media-libs/libcanberra:0[gtk] >=x11-libs/gtk+-2.19.7:2[introspection?] >=x11-libs/libwnck-2.30:1[introspection?] ) gtk3? ( media-libs/libcanberra:0[gtk3] >=x11-libs/gtk+-3.0:3[introspection?] >=x11-libs/libwnck-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/mate-panel-1.12.2.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=e466dfe265134dc961d37f742997ed6c
diff --git a/metadata/md5-cache/mate-base/mate-panel-1.14.2 b/metadata/md5-cache/mate-base/mate-panel-1.14.2
deleted file mode 100644
index c6ad637b7553..000000000000
--- a/metadata/md5-cache/mate-base/mate-panel-1.14.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/atk:0 >=dev-libs/dbus-glib-0.80:0 >=dev-libs/glib-2.36:2 >=dev-libs/libmateweather-1.7[gtk3(-)=] dev-libs/libxml2:2 >=gnome-base/dconf-0.10:0 >=gnome-base/librsvg-2.36.2:2 >=mate-base/mate-desktop-1.9.3[gtk3(-)=] >=mate-base/mate-menus-1.6 >=sys-apps/dbus-1.1.2:0 >=x11-libs/cairo-1:0 >=x11-libs/gdk-pixbuf-2.7.1:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 >=x11-libs/pango-1.15.4:0[introspection?] x11-libs/libXau:0 >=x11-libs/libXrandr-1.3:0 virtual/libintl:0 !gtk3? ( media-libs/libcanberra:0[gtk] >=x11-libs/gtk+-2.19.7:2[introspection?] >=x11-libs/libwnck-2.30:1[introspection?] ) gtk3? ( media-libs/libcanberra:0[gtk3] >=x11-libs/gtk+-3.0:3[introspection?] >=x11-libs/libwnck-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) app-text/docbook-xml-dtd:4.1.2 app-text/yelp-tools:0 >=dev-lang/perl-5:0= dev-util/gtk-doc dev-util/gtk-doc-am >=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.14
-DESCRIPTION=The MATE panel
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X gtk3 +introspection
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2 FDL-1.1 LGPL-2
-RDEPEND=dev-libs/atk:0 >=dev-libs/dbus-glib-0.80:0 >=dev-libs/glib-2.36:2 >=dev-libs/libmateweather-1.7[gtk3(-)=] dev-libs/libxml2:2 >=gnome-base/dconf-0.10:0 >=gnome-base/librsvg-2.36.2:2 >=mate-base/mate-desktop-1.9.3[gtk3(-)=] >=mate-base/mate-menus-1.6 >=sys-apps/dbus-1.1.2:0 >=x11-libs/cairo-1:0 >=x11-libs/gdk-pixbuf-2.7.1:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 >=x11-libs/pango-1.15.4:0[introspection?] x11-libs/libXau:0 >=x11-libs/libXrandr-1.3:0 virtual/libintl:0 !gtk3? ( media-libs/libcanberra:0[gtk] >=x11-libs/gtk+-2.19.7:2[introspection?] >=x11-libs/libwnck-2.30:1[introspection?] ) gtk3? ( media-libs/libcanberra:0[gtk3] >=x11-libs/gtk+-3.0:3[introspection?] >=x11-libs/libwnck-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.14/mate-panel-1.14.2.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=58d48c88bd0f914478faa2bf52900d6a
diff --git a/metadata/md5-cache/mate-base/mate-panel-1.16.2 b/metadata/md5-cache/mate-base/mate-panel-1.16.2
deleted file mode 100644
index cfa22bcd6071..000000000000
--- a/metadata/md5-cache/mate-base/mate-panel-1.16.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/atk:0 >=dev-libs/dbus-glib-0.80:0 >=dev-libs/glib-2.36:2 >=dev-libs/libmateweather-1.7[gtk3(-)=] dev-libs/libxml2:2 >=gnome-base/dconf-0.10:0 >=gnome-base/librsvg-2.36.2:2 >=mate-base/mate-desktop-1.9.3[gtk3(-)=] >=mate-base/mate-menus-1.6 >=sys-apps/dbus-1.1.2:0 >=x11-libs/cairo-1:0 >=x11-libs/gdk-pixbuf-2.7.1:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 >=x11-libs/pango-1.15.4:0[introspection?] x11-libs/libXau:0 >=x11-libs/libXrandr-1.3:0 virtual/libintl:0 !gtk3? ( media-libs/libcanberra:0[gtk] >=x11-libs/gtk+-2.19.7:2[introspection?] >=x11-libs/libwnck-2.30:1[introspection?] ) gtk3? ( media-libs/libcanberra:0[gtk3] >=x11-libs/gtk+-3.0:3[introspection?] >=x11-libs/libwnck-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) app-text/docbook-xml-dtd:4.1.2 app-text/yelp-tools:0 >=dev-lang/perl-5:0= dev-util/gtk-doc dev-util/gtk-doc-am >=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.16
-DESCRIPTION=The MATE panel
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X gtk3 +introspection
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2 FDL-1.1 LGPL-2
-RDEPEND=dev-libs/atk:0 >=dev-libs/dbus-glib-0.80:0 >=dev-libs/glib-2.36:2 >=dev-libs/libmateweather-1.7[gtk3(-)=] dev-libs/libxml2:2 >=gnome-base/dconf-0.10:0 >=gnome-base/librsvg-2.36.2:2 >=mate-base/mate-desktop-1.9.3[gtk3(-)=] >=mate-base/mate-menus-1.6 >=sys-apps/dbus-1.1.2:0 >=x11-libs/cairo-1:0 >=x11-libs/gdk-pixbuf-2.7.1:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 >=x11-libs/pango-1.15.4:0[introspection?] x11-libs/libXau:0 >=x11-libs/libXrandr-1.3:0 virtual/libintl:0 !gtk3? ( media-libs/libcanberra:0[gtk] >=x11-libs/gtk+-2.19.7:2[introspection?] >=x11-libs/libwnck-2.30:1[introspection?] ) gtk3? ( media-libs/libcanberra:0[gtk3] >=x11-libs/gtk+-3.0:3[introspection?] >=x11-libs/libwnck-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-panel-1.16.2.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=7d7375b9e1449fcef9ad13ed62cbbb24
diff --git a/metadata/md5-cache/mate-base/mate-panel-1.18.7 b/metadata/md5-cache/mate-base/mate-panel-1.18.7
index 995e70019be3..4d7867d8950e 100644
--- a/metadata/md5-cache/mate-base/mate-panel-1.18.7
+++ b/metadata/md5-cache/mate-base/mate-panel-1.18.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2 FDL-1.1 LGPL-2
 RDEPEND=dev-libs/atk:0 >=dev-libs/dbus-glib-0.80:0 >=dev-libs/glib-2.36:2 >=dev-libs/libmateweather-1.17.0 dev-libs/libxml2:2 >=gnome-base/dconf-0.13.4:0 >=gnome-base/librsvg-2.36.2:2 >=mate-base/mate-desktop-1.17.0 >=mate-base/mate-menus-1.10.0 >=sys-apps/dbus-1.1.2:0 >=x11-libs/cairo-1:0 >=x11-libs/gdk-pixbuf-2.7.1:2 >=x11-libs/gtk+-3.20:3[introspection?] x11-libs/libICE:0 x11-libs/libSM:0 >=x11-libs/libwnck-3.0:3[introspection?] x11-libs/libX11:0 >=x11-libs/pango-1.15.4:0[introspection?] x11-libs/libXau:0 >=x11-libs/libXrandr-1.3:0 virtual/libintl:0 introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-panel-1.18.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ca1a95ab4a52e57c5a7b4bdfac78d7e9
diff --git a/metadata/md5-cache/mate-base/mate-session-manager-1.12.2-r1 b/metadata/md5-cache/mate-base/mate-session-manager-1.12.2-r1
deleted file mode 100644
index 9e1c0cf11a91..000000000000
--- a/metadata/md5-cache/mate-base/mate-session-manager-1.12.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.36:2 dev-libs/libxslt sys-apps/dbus x11-apps/xdpyinfo x11-libs/gdk-pixbuf:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango x11-libs/xtrans x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk virtual/libintl elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) gnome-keyring? ( gnome-base/gnome-keyring ) !gtk3? ( >=x11-libs/gtk+-2.14:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) systemd? ( sys-apps/systemd ) upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) ) >=dev-util/intltool-0.40:* >=dev-lang/perl-5 >=sys-devel/gettext-0.10.40:* virtual/pkgconfig:* !<gnome-base/gdm-2.20.4 >=app-portage/elt-patches-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.12
-DESCRIPTION=MATE session manager
-EAPI=6
-HOMEPAGE=http://mate-desktop.org/
-IUSE=debug elibc_FreeBSD gnome-keyring gtk3 ipv6 systemd upower
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2 LGPL-2 FDL-1.1
-RDEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.36:2 dev-libs/libxslt sys-apps/dbus x11-apps/xdpyinfo x11-libs/gdk-pixbuf:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango x11-libs/xtrans x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk virtual/libintl elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) gnome-keyring? ( gnome-base/gnome-keyring ) !gtk3? ( >=x11-libs/gtk+-2.14:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) systemd? ( sys-apps/systemd ) upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/mate-session-manager-1.12.2.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=0c8dce55df871a3a38b4bc4edb67387b
diff --git a/metadata/md5-cache/mate-base/mate-session-manager-1.14.1 b/metadata/md5-cache/mate-base/mate-session-manager-1.14.1
deleted file mode 100644
index 7f83ca2c49ca..000000000000
--- a/metadata/md5-cache/mate-base/mate-session-manager-1.14.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.36:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango x11-libs/xtrans virtual/libintl elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) !gtk3? ( >=x11-libs/gtk+-2.14:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) systemd? ( sys-apps/systemd ) upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) ) >=dev-util/intltool-0.40:* >=dev-lang/perl-5 >=sys-devel/gettext-0.10.40:* virtual/pkgconfig:* !<gnome-base/gdm-2.20.4 >=app-portage/elt-patches-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.14
-DESCRIPTION=MATE session manager
-EAPI=6
-HOMEPAGE=http://mate-desktop.org/
-IUSE=debug elibc_FreeBSD gnome-keyring gtk3 ipv6 systemd upower
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2 LGPL-2 FDL-1.1
-RDEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.36:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango x11-libs/xtrans virtual/libintl elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) !gtk3? ( >=x11-libs/gtk+-2.14:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) systemd? ( sys-apps/systemd ) upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) ) x11-apps/xdpyinfo x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk gnome-keyring? ( gnome-base/gnome-keyring )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.14/mate-session-manager-1.14.1.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=fbbe46584ccc9eceb15619585e32eb46
diff --git a/metadata/md5-cache/mate-base/mate-session-manager-1.16.1 b/metadata/md5-cache/mate-base/mate-session-manager-1.16.1
deleted file mode 100644
index 3bbe5dfaac76..000000000000
--- a/metadata/md5-cache/mate-base/mate-session-manager-1.16.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.36:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango virtual/libintl elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) >=x11-libs/gtk+-3.14:3 systemd? ( sys-apps/systemd ) upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) ) xtrans? ( x11-libs/xtrans ) >=dev-util/intltool-0.40:* >=dev-lang/perl-5 >=sys-devel/gettext-0.10.40:* virtual/pkgconfig:* !<gnome-base/gdm-2.20.4 >=app-portage/elt-patches-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.16
-DESCRIPTION=MATE session manager
-EAPI=6
-HOMEPAGE=http://mate-desktop.org/
-IUSE=debug elibc_FreeBSD gnome-keyring ipv6 systemd upower +xtrans
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2 LGPL-2 FDL-1.1
-RDEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.36:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango virtual/libintl elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) >=x11-libs/gtk+-3.14:3 systemd? ( sys-apps/systemd ) upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) ) xtrans? ( x11-libs/xtrans ) x11-apps/xdpyinfo x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk gnome-keyring? ( gnome-base/gnome-keyring )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-session-manager-1.16.1.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=d003facfcf90e9bdf31a8665ca101f01
diff --git a/metadata/md5-cache/mate-base/mate-session-manager-1.18.0-r1 b/metadata/md5-cache/mate-base/mate-session-manager-1.18.0-r1
deleted file mode 100644
index 10a4de702f2e..000000000000
--- a/metadata/md5-cache/mate-base/mate-session-manager-1.18.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.36:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango virtual/libintl elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) systemd? ( sys-apps/systemd ) !systemd? ( >=sys-auth/consolekit-0.9.2 ) xtrans? ( x11-libs/xtrans ) >=dev-util/intltool-0.40:* >=dev-lang/perl-5 >=sys-devel/gettext-0.10.40:* virtual/pkgconfig:* !<gnome-base/gdm-2.20.4 >=app-portage/elt-patches-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 session manager
-EAPI=6
-HOMEPAGE=http://mate-desktop.org/
-IUSE=debug elibc_FreeBSD gnome-keyring ipv6 systemd +xtrans
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2 LGPL-2 FDL-1.1
-RDEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.36:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango virtual/libintl elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) systemd? ( sys-apps/systemd ) !systemd? ( >=sys-auth/consolekit-0.9.2 ) xtrans? ( x11-libs/xtrans ) x11-apps/xdpyinfo x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk gnome-keyring? ( gnome-base/gnome-keyring )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-session-manager-1.18.0.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=be9a1a19ee420c8c825d70502640cc3a
diff --git a/metadata/md5-cache/mate-base/mate-session-manager-1.18.2 b/metadata/md5-cache/mate-base/mate-session-manager-1.18.2
deleted file mode 100644
index c4c4e53aa65b..000000000000
--- a/metadata/md5-cache/mate-base/mate-session-manager-1.18.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.36:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango virtual/libintl elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) systemd? ( sys-apps/systemd ) !systemd? ( >=sys-auth/consolekit-0.9.2 ) xtrans? ( x11-libs/xtrans ) >=dev-util/intltool-0.40:* >=dev-lang/perl-5 >=sys-devel/gettext-0.10.40:* virtual/pkgconfig:* !<gnome-base/gdm-2.20.4 >=app-portage/elt-patches-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 session manager
-EAPI=6
-HOMEPAGE=http://mate-desktop.org/
-IUSE=debug elibc_FreeBSD gnome-keyring ipv6 systemd xtrans
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2 LGPL-2 FDL-1.1
-RDEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.36:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango virtual/libintl elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) systemd? ( sys-apps/systemd ) !systemd? ( >=sys-auth/consolekit-0.9.2 ) xtrans? ( x11-libs/xtrans ) x11-apps/xdpyinfo x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk gnome-keyring? ( gnome-base/gnome-keyring )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-session-manager-1.18.2.tar.xz
-_eclasses_=autotools	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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=778bae00905fdf6725e055848ff7aab0
diff --git a/metadata/md5-cache/mate-base/mate-session-manager-1.18.2-r1 b/metadata/md5-cache/mate-base/mate-session-manager-1.18.2-r1
index 2829c01c81f7..b6213a3d793f 100644
--- a/metadata/md5-cache/mate-base/mate-session-manager-1.18.2-r1
+++ b/metadata/md5-cache/mate-base/mate-session-manager-1.18.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2 FDL-1.1
 RDEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.36:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango virtual/libintl elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) systemd? ( sys-apps/systemd ) !systemd? ( >=sys-auth/consolekit-0.9.2 ) xtrans? ( x11-libs/xtrans ) x11-apps/xdpyinfo x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk gnome-keyring? ( gnome-base/gnome-keyring )
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-session-manager-1.18.2.tar.xz
-_eclasses_=autotools	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f4fffe2a488bc4f6bb146aab2b1d7cbf
diff --git a/metadata/md5-cache/mate-base/mate-settings-daemon-1.12.1 b/metadata/md5-cache/mate-base/mate-settings-daemon-1.12.1
deleted file mode 100644
index 20aa6925e530..000000000000
--- a/metadata/md5-cache/mate-base/mate-settings-daemon-1.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/dbus-glib-0.74:0 >=dev-libs/glib-2.17.3:2 >=gnome-base/dconf-0.13.4:0 >=mate-base/libmatekbd-1.7[gtk3(-)=] >=mate-base/mate-desktop-1.9[gtk3(-)=] media-libs/fontconfig:1.0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libX11:0 x11-libs/libXi:0 x11-libs/libXext:0 x11-libs/libXxf86misc:0 >=x11-libs/libxklavier-5:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) libnotify? ( >=x11-libs/libnotify-0.7:0 ) policykit? ( >=dev-libs/dbus-glib-0.71:0 >=sys-apps/dbus-1.1.2:0 >=sys-auth/polkit-0.97:0 ) pulseaudio? ( >=media-libs/libmatemixer-1.10:0[pulseaudio] >=media-sound/pulseaudio-0.9.15:0 ) smartcard? ( >=dev-libs/nss-3.11.2:0 ) sound? ( >=media-libs/libmatemixer-1.9 !gtk3? ( media-libs/libcanberra:0[gtk] ) gtk3? ( media-libs/libcanberra:0[gtk3] ) ) >=dev-util/intltool-0.50.1:0 sys-devel/gettext:0 virtual/pkgconfig:0 x11-base/xorg-proto >=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.12
-DESCRIPTION=MATE Settings Daemon
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X debug gtk3 libnotify policykit pulseaudio smartcard +sound
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/dbus-glib-0.74:0 >=dev-libs/glib-2.17.3:2 >=gnome-base/dconf-0.13.4:0 >=mate-base/libmatekbd-1.7[gtk3(-)=] >=mate-base/mate-desktop-1.9[gtk3(-)=] media-libs/fontconfig:1.0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libX11:0 x11-libs/libXi:0 x11-libs/libXext:0 x11-libs/libXxf86misc:0 >=x11-libs/libxklavier-5:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) libnotify? ( >=x11-libs/libnotify-0.7:0 ) policykit? ( >=dev-libs/dbus-glib-0.71:0 >=sys-apps/dbus-1.1.2:0 >=sys-auth/polkit-0.97:0 ) pulseaudio? ( >=media-libs/libmatemixer-1.10:0[pulseaudio] >=media-sound/pulseaudio-0.9.15:0 ) smartcard? ( >=dev-libs/nss-3.11.2:0 ) sound? ( >=media-libs/libmatemixer-1.9 !gtk3? ( media-libs/libcanberra:0[gtk] ) gtk3? ( media-libs/libcanberra:0[gtk3] ) )
-REQUIRED_USE=pulseaudio? ( sound )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/mate-settings-daemon-1.12.1.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=30dc64296cda61980d0a484f512f105f
diff --git a/metadata/md5-cache/mate-base/mate-settings-daemon-1.14.1 b/metadata/md5-cache/mate-base/mate-settings-daemon-1.14.1
deleted file mode 100644
index cb20847af1d3..000000000000
--- a/metadata/md5-cache/mate-base/mate-settings-daemon-1.14.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/dbus-glib-0.74:0 >=dev-libs/glib-2.17.3:2 >=gnome-base/dconf-0.13.4:0 >=mate-base/libmatekbd-1.7[gtk3(-)=] >=mate-base/mate-desktop-1.9[gtk3(-)=] media-libs/fontconfig:1.0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libX11:0 x11-libs/libXi:0 x11-libs/libXext:0 x11-libs/libXxf86misc:0 >=x11-libs/libxklavier-5:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) libnotify? ( >=x11-libs/libnotify-0.7:0 ) policykit? ( >=dev-libs/dbus-glib-0.71:0 >=sys-apps/dbus-1.1.2:0 >=sys-auth/polkit-0.97:0 ) pulseaudio? ( >=media-libs/libmatemixer-1.10:0[pulseaudio] >=media-sound/pulseaudio-0.9.15:0 ) smartcard? ( >=dev-libs/nss-3.11.2:0 ) sound? ( >=media-libs/libmatemixer-1.9 !gtk3? ( media-libs/libcanberra:0[gtk] ) gtk3? ( media-libs/libcanberra:0[gtk3] ) ) >=dev-util/intltool-0.50.1:0 sys-devel/gettext:0 virtual/pkgconfig:0 x11-base/xorg-proto >=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.14
-DESCRIPTION=MATE Settings Daemon
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X debug gtk3 libnotify policykit pulseaudio smartcard +sound
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/dbus-glib-0.74:0 >=dev-libs/glib-2.17.3:2 >=gnome-base/dconf-0.13.4:0 >=mate-base/libmatekbd-1.7[gtk3(-)=] >=mate-base/mate-desktop-1.9[gtk3(-)=] media-libs/fontconfig:1.0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libX11:0 x11-libs/libXi:0 x11-libs/libXext:0 x11-libs/libXxf86misc:0 >=x11-libs/libxklavier-5:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) libnotify? ( >=x11-libs/libnotify-0.7:0 ) policykit? ( >=dev-libs/dbus-glib-0.71:0 >=sys-apps/dbus-1.1.2:0 >=sys-auth/polkit-0.97:0 ) pulseaudio? ( >=media-libs/libmatemixer-1.10:0[pulseaudio] >=media-sound/pulseaudio-0.9.15:0 ) smartcard? ( >=dev-libs/nss-3.11.2:0 ) sound? ( >=media-libs/libmatemixer-1.9 !gtk3? ( media-libs/libcanberra:0[gtk] ) gtk3? ( media-libs/libcanberra:0[gtk3] ) )
-REQUIRED_USE=pulseaudio? ( sound )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.14/mate-settings-daemon-1.14.1.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=444d58e54abca4518f2800390d937682
diff --git a/metadata/md5-cache/mate-base/mate-settings-daemon-1.16.2 b/metadata/md5-cache/mate-base/mate-settings-daemon-1.16.2
deleted file mode 100644
index 3b2c2f38cb74..000000000000
--- a/metadata/md5-cache/mate-base/mate-settings-daemon-1.16.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/dbus-glib-0.74:0 >=dev-libs/glib-2.17.3:2 >=gnome-base/dconf-0.13.4:0 >=mate-base/libmatekbd-1.7[gtk3(-)=] >=mate-base/mate-desktop-1.9[gtk3(-)=] media-libs/fontconfig:1.0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libX11:0 x11-libs/libXi:0 x11-libs/libXext:0 x11-libs/libXxf86misc:0 >=x11-libs/libxklavier-5:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) libnotify? ( >=x11-libs/libnotify-0.7:0 ) policykit? ( >=dev-libs/dbus-glib-0.71:0 >=sys-apps/dbus-1.1.2:0 >=sys-auth/polkit-0.97:0 ) pulseaudio? ( >=media-libs/libmatemixer-1.10:0[pulseaudio] >=media-sound/pulseaudio-0.9.15:0 ) smartcard? ( >=dev-libs/nss-3.11.2:0 ) sound? ( >=media-libs/libmatemixer-1.9 !gtk3? ( media-libs/libcanberra:0[gtk] ) gtk3? ( media-libs/libcanberra:0[gtk3] ) ) >=dev-util/intltool-0.50.1:0 sys-devel/gettext:0 virtual/pkgconfig:0 x11-base/xorg-proto >=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.16
-DESCRIPTION=MATE Settings Daemon
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X debug gtk3 libnotify policykit pulseaudio smartcard +sound
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/dbus-glib-0.74:0 >=dev-libs/glib-2.17.3:2 >=gnome-base/dconf-0.13.4:0 >=mate-base/libmatekbd-1.7[gtk3(-)=] >=mate-base/mate-desktop-1.9[gtk3(-)=] media-libs/fontconfig:1.0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libX11:0 x11-libs/libXi:0 x11-libs/libXext:0 x11-libs/libXxf86misc:0 >=x11-libs/libxklavier-5:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) libnotify? ( >=x11-libs/libnotify-0.7:0 ) policykit? ( >=dev-libs/dbus-glib-0.71:0 >=sys-apps/dbus-1.1.2:0 >=sys-auth/polkit-0.97:0 ) pulseaudio? ( >=media-libs/libmatemixer-1.10:0[pulseaudio] >=media-sound/pulseaudio-0.9.15:0 ) smartcard? ( >=dev-libs/nss-3.11.2:0 ) sound? ( >=media-libs/libmatemixer-1.9 !gtk3? ( media-libs/libcanberra:0[gtk] ) gtk3? ( media-libs/libcanberra:0[gtk3] ) )
-REQUIRED_USE=pulseaudio? ( sound )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-settings-daemon-1.16.2.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=444d58e54abca4518f2800390d937682
diff --git a/metadata/md5-cache/mate-base/mate-settings-daemon-1.18.2 b/metadata/md5-cache/mate-base/mate-settings-daemon-1.18.2
index 6b095812b01e..5fafb4af23ad 100644
--- a/metadata/md5-cache/mate-base/mate-settings-daemon-1.18.2
+++ b/metadata/md5-cache/mate-base/mate-settings-daemon-1.18.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/dbus-glib-0.74:0 >=dev-libs/glib-2.17.3:2 >=gnome-base/dconf-
 REQUIRED_USE=pulseaudio? ( sound )
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-settings-daemon-1.18.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c1e14029fe2279076925ca51484a503d
diff --git a/metadata/md5-cache/mate-extra/Manifest.gz b/metadata/md5-cache/mate-extra/Manifest.gz
index 03b62cfce8cb..55d32577fbcb 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/caja-dropbox-1.12.0-r1 b/metadata/md5-cache/mate-extra/caja-dropbox-1.12.0-r1
deleted file mode 100644
index a784e61343ed..000000000000
--- a/metadata/md5-cache/mate-extra/caja-dropbox-1.12.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure 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-libs/atk:0 >=dev-libs/glib-2.14:2 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-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=mate-base/caja-1.6 media-libs/fontconfig:1.0 media-libs/freetype:2 net-misc/dropbox:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libXinerama:0 x11-libs/pango:0 dev-python/docutils:0 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.12
-DESCRIPTION=Store, Sync and Share Files Online
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=debug python_targets_python2_7 kernel_linux
-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-libs/atk:0 >=dev-libs/glib-2.14:2 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-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=mate-base/caja-1.6 media-libs/fontconfig:1.0 media-libs/freetype:2 net-misc/dropbox:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libXinerama:0 x11-libs/pango:0
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/caja-dropbox-1.12.0.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mate	1d1847564eac8e0da804d51adea0a01d	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=f99299de1651fb2350b4b0eaee09e8a2
diff --git a/metadata/md5-cache/mate-extra/caja-dropbox-1.14.0 b/metadata/md5-cache/mate-extra/caja-dropbox-1.14.0
deleted file mode 100644
index 9b2e60894d43..000000000000
--- a/metadata/md5-cache/mate-extra/caja-dropbox-1.14.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure 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-libs/atk:0 >=dev-libs/glib-2.14:2 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-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=mate-base/caja-1.6 media-libs/fontconfig:1.0 media-libs/freetype:2 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libXinerama:0 x11-libs/pango:0 dev-python/docutils:0 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.14
-DESCRIPTION=Store, Sync and Share Files Online
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=debug python_targets_python2_7 kernel_linux
-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-libs/atk:0 >=dev-libs/glib-2.14:2 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-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=mate-base/caja-1.6 media-libs/fontconfig:1.0 media-libs/freetype:2 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libXinerama:0 x11-libs/pango:0 net-misc/dropbox:0
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.14/caja-dropbox-1.14.0.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mate	1d1847564eac8e0da804d51adea0a01d	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=38fe953f8694e5491efcbc51e55aec63
diff --git a/metadata/md5-cache/mate-extra/caja-dropbox-1.16.0 b/metadata/md5-cache/mate-extra/caja-dropbox-1.16.0
deleted file mode 100644
index 5b8a2836ae15..000000000000
--- a/metadata/md5-cache/mate-extra/caja-dropbox-1.16.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure 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-libs/atk:0 >=dev-libs/glib-2.14:2 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-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=mate-base/caja-1.6 media-libs/fontconfig:1.0 media-libs/freetype:2 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libXinerama:0 x11-libs/pango:0 dev-python/docutils:0 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.16
-DESCRIPTION=Store, Sync and Share Files Online
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=debug python_targets_python2_7 kernel_linux
-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-libs/atk:0 >=dev-libs/glib-2.14:2 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-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=mate-base/caja-1.6 media-libs/fontconfig:1.0 media-libs/freetype:2 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libXinerama:0 x11-libs/pango:0 net-misc/dropbox:0
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/caja-dropbox-1.16.0.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mate	1d1847564eac8e0da804d51adea0a01d	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=38fe953f8694e5491efcbc51e55aec63
diff --git a/metadata/md5-cache/mate-extra/caja-dropbox-1.18.0 b/metadata/md5-cache/mate-extra/caja-dropbox-1.18.0
index a059fc06af3c..2d7d71c8bb42 100644
--- a/metadata/md5-cache/mate-extra/caja-dropbox-1.18.0
+++ b/metadata/md5-cache/mate-extra/caja-dropbox-1.18.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 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-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=mate-base/caja-1.17.1 media-libs/fontconfig:1.0 media-libs/freetype:2 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libXinerama:0 x11-libs/pango:0 net-misc/dropbox:0
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.18/caja-dropbox-1.18.0.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mate	1d1847564eac8e0da804d51adea0a01d	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	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	mate	1d1847564eac8e0da804d51adea0a01d	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9db8f8cbc9e38e47c4caf0528abd1a5a
diff --git a/metadata/md5-cache/mate-extra/caja-extensions-1.12.0-r2 b/metadata/md5-cache/mate-extra/caja-extensions-1.12.0-r2
deleted file mode 100644
index 9b0d409777ec..000000000000
--- a/metadata/md5-cache/mate-extra/caja-extensions-1.12.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.36:2 >=mate-base/caja-1.7[gtk3(-)=] virtual/libintl:0 x11-libs/gdk-pixbuf:2 cdr? ( >=app-cdr/brasero-2.32.1:0= ) gajim? ( net-im/gajim:0 >=dev-libs/dbus-glib-0.60:0 >=sys-apps/dbus-1:0 ) gksu? ( x11-libs/gksu ) !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) image-converter? ( virtual/imagemagick-tools ) open-terminal? ( >=mate-base/mate-desktop-1.7[gtk3(-)=] ) pidgin? ( >=dev-libs/dbus-glib-0.60:0 ) upnp? ( >=net-libs/gupnp-0.13:0= ) dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.18:* sys-devel/gettext:* virtual/pkgconfig:* !!mate-extra/mate-file-manager-open-terminal !!mate-extra/mate-file-manager-sendto !!mate-extra/mate-file-manager-image-converter !!mate-extra/mate-file-manager-share >=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.12
-DESCRIPTION=Several Caja extensions
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=gksu gtk3 image-converter +open-terminal share +wallpaper cdr gajim +mail pidgin upnp
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.36:2 >=mate-base/caja-1.7[gtk3(-)=] virtual/libintl:0 x11-libs/gdk-pixbuf:2 cdr? ( >=app-cdr/brasero-2.32.1:0= ) gajim? ( net-im/gajim:0 >=dev-libs/dbus-glib-0.60:0 >=sys-apps/dbus-1:0 ) gksu? ( x11-libs/gksu ) !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) image-converter? ( virtual/imagemagick-tools ) open-terminal? ( >=mate-base/mate-desktop-1.7[gtk3(-)=] ) pidgin? ( >=dev-libs/dbus-glib-0.60:0 ) upnp? ( >=net-libs/gupnp-0.13:0= )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/caja-extensions-1.12.0.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=77c3b785172a6801adadc2a49a68f105
diff --git a/metadata/md5-cache/mate-extra/caja-extensions-1.14.1-r1 b/metadata/md5-cache/mate-extra/caja-extensions-1.14.1-r1
deleted file mode 100644
index 8102500f9c26..000000000000
--- a/metadata/md5-cache/mate-extra/caja-extensions-1.14.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.36:2 >=mate-base/caja-1.7[gtk3(-)=] virtual/libintl:0 x11-libs/gdk-pixbuf:2 gajim? ( >=dev-libs/dbus-glib-0.60:0 >=sys-apps/dbus-1:0 ) !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) open-terminal? ( >=mate-base/mate-desktop-1.7[gtk3(-)=] ) pidgin? ( >=dev-libs/dbus-glib-0.60:0 ) upnp? ( >=net-libs/gupnp-0.13:0= ) dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.18:* sys-devel/gettext:* virtual/pkgconfig:* !!mate-extra/mate-file-manager-open-terminal !!mate-extra/mate-file-manager-sendto !!mate-extra/mate-file-manager-image-converter !!mate-extra/mate-file-manager-share >=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.14
-DESCRIPTION=Several Caja extensions
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=gksu gtk3 image-converter +open-terminal share +wallpaper cdr gajim +mail pidgin upnp
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.36:2 >=mate-base/caja-1.7[gtk3(-)=] virtual/libintl:0 x11-libs/gdk-pixbuf:2 gajim? ( >=dev-libs/dbus-glib-0.60:0 >=sys-apps/dbus-1:0 ) !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) open-terminal? ( >=mate-base/mate-desktop-1.7[gtk3(-)=] ) pidgin? ( >=dev-libs/dbus-glib-0.60:0 ) upnp? ( >=net-libs/gupnp-0.13:0= ) cdr? ( >=app-cdr/brasero-2.32.1:0= ) gajim? ( net-im/gajim:0 ) gksu? ( x11-libs/gksu ) image-converter? ( virtual/imagemagick-tools ) pidgin? ( net-im/pidgin )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.14/caja-extensions-1.14.1.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=9dd5b887ada7ca4ff9b110899c4847a4
diff --git a/metadata/md5-cache/mate-extra/caja-extensions-1.16.0-r1 b/metadata/md5-cache/mate-extra/caja-extensions-1.16.0-r1
deleted file mode 100644
index 15f87894c1cd..000000000000
--- a/metadata/md5-cache/mate-extra/caja-extensions-1.16.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.36:2 >=mate-base/caja-1.7[gtk3(-)=] virtual/libintl:0 x11-libs/gdk-pixbuf:2 gajim? ( >=dev-libs/dbus-glib-0.60:0 >=sys-apps/dbus-1:0 ) !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) open-terminal? ( >=mate-base/mate-desktop-1.7[gtk3(-)=] ) pidgin? ( >=dev-libs/dbus-glib-0.60:0 ) upnp? ( >=net-libs/gupnp-0.13:0= ) dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.18:* sys-devel/gettext:* virtual/pkgconfig:* !!mate-extra/mate-file-manager-open-terminal !!mate-extra/mate-file-manager-sendto !!mate-extra/mate-file-manager-image-converter !!mate-extra/mate-file-manager-share >=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.16
-DESCRIPTION=Several Caja extensions
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=gksu gtk3 image-converter +open-terminal share +wallpaper cdr gajim +mail pidgin upnp
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.36:2 >=mate-base/caja-1.7[gtk3(-)=] virtual/libintl:0 x11-libs/gdk-pixbuf:2 gajim? ( >=dev-libs/dbus-glib-0.60:0 >=sys-apps/dbus-1:0 ) !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) open-terminal? ( >=mate-base/mate-desktop-1.7[gtk3(-)=] ) pidgin? ( >=dev-libs/dbus-glib-0.60:0 ) upnp? ( >=net-libs/gupnp-0.13:0= ) cdr? ( >=app-cdr/brasero-2.32.1:0= ) gajim? ( net-im/gajim:0 ) gksu? ( x11-libs/gksu ) image-converter? ( virtual/imagemagick-tools ) pidgin? ( net-im/pidgin )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/caja-extensions-1.16.0.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=9dd5b887ada7ca4ff9b110899c4847a4
diff --git a/metadata/md5-cache/mate-extra/caja-extensions-1.18.2 b/metadata/md5-cache/mate-extra/caja-extensions-1.18.2
index 440e0fcba6f5..19af8562c21b 100644
--- a/metadata/md5-cache/mate-extra/caja-extensions-1.18.2
+++ b/metadata/md5-cache/mate-extra/caja-extensions-1.18.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.36:2 >=mate-base/caja-1.17.1 virtual/libintl:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 gajim? ( >=dev-libs/dbus-glib-0.60:0 >=sys-apps/dbus-1:0 ) open-terminal? ( >=mate-base/mate-desktop-1.17.0 ) pidgin? ( >=dev-libs/dbus-glib-0.60:0 ) upnp? ( >=net-libs/gupnp-0.13:0= ) xattr? ( sys-apps/attr ) cdr? ( >=app-cdr/brasero-2.32.1:0= ) gajim? ( net-im/gajim:0 ) gksu? ( x11-libs/gksu ) image-converter? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) pidgin? ( net-im/pidgin )
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.18/caja-extensions-1.18.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c1b7651403be8cde71a99f7bd5fb9f19
diff --git a/metadata/md5-cache/mate-extra/mate-calc-1.18.1 b/metadata/md5-cache/mate-extra/mate-calc-1.18.1
index d56844469faa..23efe0d7df9e 100644
--- a/metadata/md5-cache/mate-extra/mate-calc-1.18.1
+++ b/metadata/md5-cache/mate-extra/mate-calc-1.18.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 dev-libs/libxml2:2 >=x11-libs/gtk+-3.14:3 x11-libs/pango:0
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-calc-1.18.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cec2033fb73476e2a50591e600f6854f
diff --git a/metadata/md5-cache/mate-extra/mate-indicator-applet-1.12.1-r1 b/metadata/md5-cache/mate-extra/mate-indicator-applet-1.12.1-r1
deleted file mode 100644
index 3b10b03f79dc..000000000000
--- a/metadata/md5-cache/mate-extra/mate-indicator-applet-1.12.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=mate-base/mate-panel-1.8[gtk3(-)=] !gtk3? ( >=dev-libs/libindicator-0.3.90:0 >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=dev-libs/libindicator-0.3.90:3 >=x11-libs/gtk+-3.0:3 ) >=dev-util/intltool-0.35.0 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.12
-DESCRIPTION=MATE indicator applet
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=gtk3
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2 FDL-1.1 LGPL-2
-RDEPEND=>=mate-base/mate-panel-1.8[gtk3(-)=] !gtk3? ( >=dev-libs/libindicator-0.3.90:0 >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=dev-libs/libindicator-0.3.90:3 >=x11-libs/gtk+-3.0:3 )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/mate-indicator-applet-1.12.1.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=becd89d668ba3aec9073556271127372
diff --git a/metadata/md5-cache/mate-extra/mate-indicator-applet-1.14.1-r1 b/metadata/md5-cache/mate-extra/mate-indicator-applet-1.14.1-r1
deleted file mode 100644
index ba1fe79aa7c0..000000000000
--- a/metadata/md5-cache/mate-extra/mate-indicator-applet-1.14.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=mate-base/mate-panel-1.8[gtk3(-)=] !gtk3? ( >=dev-libs/libindicator-0.3.90:0 >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=dev-libs/libindicator-0.3.90:3 >=x11-libs/gtk+-3.0:3 ) >=dev-util/intltool-0.35.0 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.14
-DESCRIPTION=MATE indicator applet
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=gtk3
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2 FDL-1.1 LGPL-2
-RDEPEND=>=mate-base/mate-panel-1.8[gtk3(-)=] !gtk3? ( >=dev-libs/libindicator-0.3.90:0 >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=dev-libs/libindicator-0.3.90:3 >=x11-libs/gtk+-3.0:3 )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.14/mate-indicator-applet-1.14.1.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=8b760f46a27aba742e1daec7959c4728
diff --git a/metadata/md5-cache/mate-extra/mate-indicator-applet-1.16.0 b/metadata/md5-cache/mate-extra/mate-indicator-applet-1.16.0
deleted file mode 100644
index 0a716d013493..000000000000
--- a/metadata/md5-cache/mate-extra/mate-indicator-applet-1.16.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=mate-base/mate-panel-1.8[gtk3(-)=] !gtk3? ( >=dev-libs/libindicator-0.3.90:0 >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=dev-libs/libindicator-0.3.90:3 >=x11-libs/gtk+-3.0:3 ) >=dev-util/intltool-0.35.0 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.16
-DESCRIPTION=MATE indicator applet
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=gtk3
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2 FDL-1.1 LGPL-2
-RDEPEND=>=mate-base/mate-panel-1.8[gtk3(-)=] !gtk3? ( >=dev-libs/libindicator-0.3.90:0 >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=dev-libs/libindicator-0.3.90:3 >=x11-libs/gtk+-3.0:3 )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-indicator-applet-1.16.0.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=4b3a4d03d59a101c53e0fbeed904c90c
diff --git a/metadata/md5-cache/mate-extra/mate-indicator-applet-1.18.1 b/metadata/md5-cache/mate-extra/mate-indicator-applet-1.18.1
index 0eaf68f63ee2..955a35440a7c 100644
--- a/metadata/md5-cache/mate-extra/mate-indicator-applet-1.18.1
+++ b/metadata/md5-cache/mate-extra/mate-indicator-applet-1.18.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2 FDL-1.1 LGPL-2
 RDEPEND=>=dev-libs/libindicator-0.4:3 >=mate-base/mate-panel-1.17.0 >=x11-libs/gtk+-3.14:3
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-indicator-applet-1.18.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d207ef6b089992537f7d4b4b1bbcd8ef
diff --git a/metadata/md5-cache/mate-extra/mate-media-1.12.1 b/metadata/md5-cache/mate-extra/mate-media-1.12.1
deleted file mode 100644
index 7fa9ebc66f82..000000000000
--- a/metadata/md5-cache/mate-extra/mate-media-1.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.36.0:2 dev-libs/libxml2:2 >=mate-base/mate-panel-1.8[gtk3(-)=] >=mate-base/mate-desktop-1.9.3[gtk3(-)=] >=media-libs/libmatemixer-1.9.1 x11-libs/cairo:0 x11-libs/pango:0 virtual/libintl:0 !gtk3? ( >=dev-libs/libunique-1:1 >=media-libs/libcanberra-0.13:0[gtk] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=dev-libs/libunique-3:3 >=media-libs/libcanberra-0.13:0[gtk3] >=x11-libs/gtk+-3.0:3 ) >=dev-util/intltool-0.35.0:* sys-devel/gettext:* virtual/pkgconfig:* !!<mate-base/mate-applets-1.8:* >=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.12
-DESCRIPTION=Multimedia related programs for the MATE desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=gtk3
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2 GPL-2 FDL-1.1
-RDEPEND=>=dev-libs/glib-2.36.0:2 dev-libs/libxml2:2 >=mate-base/mate-panel-1.8[gtk3(-)=] >=mate-base/mate-desktop-1.9.3[gtk3(-)=] >=media-libs/libmatemixer-1.9.1 x11-libs/cairo:0 x11-libs/pango:0 virtual/libintl:0 !gtk3? ( >=dev-libs/libunique-1:1 >=media-libs/libcanberra-0.13:0[gtk] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=dev-libs/libunique-3:3 >=media-libs/libcanberra-0.13:0[gtk3] >=x11-libs/gtk+-3.0:3 )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/mate-media-1.12.1.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=757a7b9ee15ed5fee3b855313acd504d
diff --git a/metadata/md5-cache/mate-extra/mate-media-1.14.1 b/metadata/md5-cache/mate-extra/mate-media-1.14.1
deleted file mode 100644
index 931e5bd41e1e..000000000000
--- a/metadata/md5-cache/mate-extra/mate-media-1.14.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.36.0:2 dev-libs/libxml2:2 >=mate-base/mate-panel-1.8[gtk3(-)=] >=mate-base/mate-desktop-1.9.3[gtk3(-)=] >=media-libs/libmatemixer-1.9.1 x11-libs/cairo:0 x11-libs/pango:0 virtual/libintl:0 !gtk3? ( >=dev-libs/libunique-1:1 >=media-libs/libcanberra-0.13:0[gtk] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=dev-libs/libunique-3:3 >=media-libs/libcanberra-0.13:0[gtk3] >=x11-libs/gtk+-3.0:3 ) >=dev-util/intltool-0.35.0:* sys-devel/gettext:* virtual/pkgconfig:* !!<mate-base/mate-applets-1.8:* >=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.14
-DESCRIPTION=Multimedia related programs for the MATE desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=gtk3
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2 GPL-2 FDL-1.1
-RDEPEND=>=dev-libs/glib-2.36.0:2 dev-libs/libxml2:2 >=mate-base/mate-panel-1.8[gtk3(-)=] >=mate-base/mate-desktop-1.9.3[gtk3(-)=] >=media-libs/libmatemixer-1.9.1 x11-libs/cairo:0 x11-libs/pango:0 virtual/libintl:0 !gtk3? ( >=dev-libs/libunique-1:1 >=media-libs/libcanberra-0.13:0[gtk] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=dev-libs/libunique-3:3 >=media-libs/libcanberra-0.13:0[gtk3] >=x11-libs/gtk+-3.0:3 )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.14/mate-media-1.14.1.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=7608ce3eb424ff89989b2c4a101139a3
diff --git a/metadata/md5-cache/mate-extra/mate-media-1.16.0 b/metadata/md5-cache/mate-extra/mate-media-1.16.0
deleted file mode 100644
index 29dc5517513c..000000000000
--- a/metadata/md5-cache/mate-extra/mate-media-1.16.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.36.0:2 dev-libs/libxml2:2 >=mate-base/mate-panel-1.8[gtk3(-)=] >=mate-base/mate-desktop-1.9.3[gtk3(-)=] >=media-libs/libmatemixer-1.9.1 x11-libs/cairo:0 x11-libs/pango:0 virtual/libintl:0 !gtk3? ( >=dev-libs/libunique-1:1 >=media-libs/libcanberra-0.13:0[gtk] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=dev-libs/libunique-3:3 >=media-libs/libcanberra-0.13:0[gtk3] >=x11-libs/gtk+-3.0:3 ) >=dev-util/intltool-0.35.0:* sys-devel/gettext:* virtual/pkgconfig:* !!<mate-base/mate-applets-1.8:* >=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.16
-DESCRIPTION=Multimedia related programs for the MATE desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=gtk3
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2 GPL-2 FDL-1.1
-RDEPEND=>=dev-libs/glib-2.36.0:2 dev-libs/libxml2:2 >=mate-base/mate-panel-1.8[gtk3(-)=] >=mate-base/mate-desktop-1.9.3[gtk3(-)=] >=media-libs/libmatemixer-1.9.1 x11-libs/cairo:0 x11-libs/pango:0 virtual/libintl:0 !gtk3? ( >=dev-libs/libunique-1:1 >=media-libs/libcanberra-0.13:0[gtk] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=dev-libs/libunique-3:3 >=media-libs/libcanberra-0.13:0[gtk3] >=x11-libs/gtk+-3.0:3 )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-media-1.16.0.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=7608ce3eb424ff89989b2c4a101139a3
diff --git a/metadata/md5-cache/mate-extra/mate-media-1.18.2 b/metadata/md5-cache/mate-extra/mate-media-1.18.2
index b6775f37354f..cf7b9f3327f5 100644
--- a/metadata/md5-cache/mate-extra/mate-media-1.18.2
+++ b/metadata/md5-cache/mate-extra/mate-media-1.18.2
@@ -8,5 +8,5 @@ LICENSE=LGPL-2 GPL-2 FDL-1.1
 RDEPEND=>=dev-libs/glib-2.36.0:2 dev-libs/libxml2:2 >=mate-base/mate-panel-1.17.0 >=mate-base/mate-desktop-1.17.0 >=media-libs/libcanberra-0.13:0[gtk3] >=media-libs/libmatemixer-1.10.0 x11-libs/cairo:0 >=x11-libs/gtk+-3.14:3 x11-libs/pango:0 virtual/libintl:0
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-media-1.18.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a0fd812751d3f4b8d1a4e73223c26ead
diff --git a/metadata/md5-cache/mate-extra/mate-netbook-1.12.0 b/metadata/md5-cache/mate-extra/mate-netbook-1.12.0
deleted file mode 100644
index c69bc1c43e3c..000000000000
--- a/metadata/md5-cache/mate-extra/mate-netbook-1.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.36:2 >=mate-base/mate-desktop-1.9[gtk3(-)=] >=mate-base/mate-panel-1.8[gtk3(-)=] x11-libs/libfakekey:0 x11-libs/libXtst:0 x11-libs/libX11:0 x11-libs/cairo:0 virtual/libintl:0 !gtk3? ( dev-libs/libunique:1 x11-libs/gtk+:2 x11-libs/libwnck:1 ) gtk3? ( dev-libs/libunique:3 x11-libs/gtk+:3 x11-libs/libwnck:3 ) >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* x11-base/xorg-proto >=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.12
-DESCRIPTION=MATE utilities for netbooks
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=gtk3
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2.36:2 >=mate-base/mate-desktop-1.9[gtk3(-)=] >=mate-base/mate-panel-1.8[gtk3(-)=] x11-libs/libfakekey:0 x11-libs/libXtst:0 x11-libs/libX11:0 x11-libs/cairo:0 virtual/libintl:0 !gtk3? ( dev-libs/libunique:1 x11-libs/gtk+:2 x11-libs/libwnck:1 ) gtk3? ( dev-libs/libunique:3 x11-libs/gtk+:3 x11-libs/libwnck:3 )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/mate-netbook-1.12.0.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=e7afbb5949eca7269dd2950f7bb9c8bd
diff --git a/metadata/md5-cache/mate-extra/mate-netbook-1.14.0 b/metadata/md5-cache/mate-extra/mate-netbook-1.14.0
deleted file mode 100644
index 0897b8f4ff4b..000000000000
--- a/metadata/md5-cache/mate-extra/mate-netbook-1.14.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.36:2 >=mate-base/mate-desktop-1.9[gtk3(-)=] >=mate-base/mate-panel-1.8[gtk3(-)=] x11-libs/libfakekey:0 x11-libs/libXtst:0 x11-libs/libX11:0 x11-libs/cairo:0 virtual/libintl:0 !gtk3? ( dev-libs/libunique:1 x11-libs/gtk+:2 x11-libs/libwnck:1 ) gtk3? ( dev-libs/libunique:3 x11-libs/gtk+:3 x11-libs/libwnck:3 ) >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* x11-base/xorg-proto >=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.14
-DESCRIPTION=MATE utilities for netbooks
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=gtk3
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2.36:2 >=mate-base/mate-desktop-1.9[gtk3(-)=] >=mate-base/mate-panel-1.8[gtk3(-)=] x11-libs/libfakekey:0 x11-libs/libXtst:0 x11-libs/libX11:0 x11-libs/cairo:0 virtual/libintl:0 !gtk3? ( dev-libs/libunique:1 x11-libs/gtk+:2 x11-libs/libwnck:1 ) gtk3? ( dev-libs/libunique:3 x11-libs/gtk+:3 x11-libs/libwnck:3 )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.14/mate-netbook-1.14.0.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=41cd273863a9f024554b3c8915baaeaf
diff --git a/metadata/md5-cache/mate-extra/mate-netbook-1.16.2 b/metadata/md5-cache/mate-extra/mate-netbook-1.16.2
deleted file mode 100644
index 6c31e4bb8f22..000000000000
--- a/metadata/md5-cache/mate-extra/mate-netbook-1.16.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.36:2 >=mate-base/mate-panel-1.8[gtk3(-)=] x11-libs/libfakekey:0 x11-libs/libXtst:0 x11-libs/libX11:0 x11-libs/cairo:0 virtual/libintl:0 !gtk3? ( x11-libs/gtk+:2 x11-libs/libwnck:1 ) gtk3? ( x11-libs/gtk+:3 x11-libs/libwnck:3 ) >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* x11-base/xorg-proto >=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.16
-DESCRIPTION=MATE utilities for netbooks
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=gtk3
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2.36:2 >=mate-base/mate-panel-1.8[gtk3(-)=] x11-libs/libfakekey:0 x11-libs/libXtst:0 x11-libs/libX11:0 x11-libs/cairo:0 virtual/libintl:0 !gtk3? ( x11-libs/gtk+:2 x11-libs/libwnck:1 ) gtk3? ( x11-libs/gtk+:3 x11-libs/libwnck:3 )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-netbook-1.16.2.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=ee63b75e4f4fc732c18b69130a243905
diff --git a/metadata/md5-cache/mate-extra/mate-netbook-1.18.2 b/metadata/md5-cache/mate-extra/mate-netbook-1.18.2
index f5fdbf436f07..9ed21ba9aaaa 100644
--- a/metadata/md5-cache/mate-extra/mate-netbook-1.18.2
+++ b/metadata/md5-cache/mate-extra/mate-netbook-1.18.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.36:2 >=mate-base/mate-panel-1.17.0 >=x11-libs/gtk+-3.14:3 x11-libs/libfakekey:0 x11-libs/libwnck:3 x11-libs/libXtst:0 x11-libs/libX11:0 x11-libs/cairo:0 virtual/libintl:0
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-netbook-1.18.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3b45bc46660da0f8239c168d3dfe0e40
diff --git a/metadata/md5-cache/mate-extra/mate-polkit-1.12.0-r2 b/metadata/md5-cache/mate-extra/mate-polkit-1.12.0-r2
deleted file mode 100644
index 056c3b16e835..000000000000
--- a/metadata/md5-cache/mate-extra/mate-polkit-1.12.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.36:2 >=sys-auth/polkit-0.102:0[introspection?] x11-libs/gdk-pixbuf:2[introspection?] virtual/libintl:0 accountsservice? ( sys-apps/accountsservice:0[introspection?] ) !gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] appindicator? ( dev-libs/libappindicator:2 ) ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] appindicator? ( dev-libs/libappindicator:3 ) ) introspection? ( >=dev-libs/gobject-introspection-0.6.2:= ) dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.35:* sys-devel/gettext:* >=sys-devel/libtool-2.2.6 virtual/pkgconfig:* !<gnome-extra/polkit-gnome-0.102:0 >=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.12
-DESCRIPTION=A MATE specific DBUS service that is used to bring up authentication dialogs
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=accountsservice appindicator debug examples gtk3 +introspection
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-libs/glib-2.36:2 >=sys-auth/polkit-0.102:0[introspection?] x11-libs/gdk-pixbuf:2[introspection?] virtual/libintl:0 accountsservice? ( sys-apps/accountsservice:0[introspection?] ) !gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] appindicator? ( dev-libs/libappindicator:2 ) ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] appindicator? ( dev-libs/libappindicator:3 ) ) introspection? ( >=dev-libs/gobject-introspection-0.6.2:= )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/mate-polkit-1.12.0.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=d57fee880f8ae5f14661999c44d67872
diff --git a/metadata/md5-cache/mate-extra/mate-polkit-1.14.0 b/metadata/md5-cache/mate-extra/mate-polkit-1.14.0
deleted file mode 100644
index bb718f9a02bf..000000000000
--- a/metadata/md5-cache/mate-extra/mate-polkit-1.14.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.36:2 >=sys-auth/polkit-0.102:0[introspection?] x11-libs/gdk-pixbuf:2[introspection?] virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] appindicator? ( dev-libs/libappindicator:2 ) ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] appindicator? ( dev-libs/libappindicator:3 ) ) introspection? ( >=dev-libs/gobject-introspection-0.6.2:= ) dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.35:* sys-devel/gettext:* >=sys-devel/libtool-2.2.6 virtual/pkgconfig:* !<gnome-extra/polkit-gnome-0.102:0 >=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.14
-DESCRIPTION=A MATE specific DBUS service that is used to bring up authentication dialogs
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=accountsservice appindicator debug examples gtk3 +introspection
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-libs/glib-2.36:2 >=sys-auth/polkit-0.102:0[introspection?] x11-libs/gdk-pixbuf:2[introspection?] virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] appindicator? ( dev-libs/libappindicator:2 ) ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] appindicator? ( dev-libs/libappindicator:3 ) ) introspection? ( >=dev-libs/gobject-introspection-0.6.2:= ) accountsservice? ( sys-apps/accountsservice:0[introspection?] )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.14/mate-polkit-1.14.0.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=3fce680c5fe8a6f0aadb123206803740
diff --git a/metadata/md5-cache/mate-extra/mate-polkit-1.16.0 b/metadata/md5-cache/mate-extra/mate-polkit-1.16.0
deleted file mode 100644
index 784312edd9c3..000000000000
--- a/metadata/md5-cache/mate-extra/mate-polkit-1.16.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.36:2 >=sys-auth/polkit-0.102:0[introspection?] x11-libs/gdk-pixbuf:2[introspection?] virtual/libintl:0 >=x11-libs/gtk+-3.14.0:3[introspection?] appindicator? ( dev-libs/libappindicator:3 ) introspection? ( >=dev-libs/gobject-introspection-0.6.2:= ) dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.35:* sys-devel/gettext:* >=sys-devel/libtool-2.2.6 virtual/pkgconfig:* !<gnome-extra/polkit-gnome-0.102:0 >=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.16
-DESCRIPTION=A MATE specific DBUS service that is used to bring up authentication dialogs
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=accountsservice appindicator debug examples +introspection
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-libs/glib-2.36:2 >=sys-auth/polkit-0.102:0[introspection?] x11-libs/gdk-pixbuf:2[introspection?] virtual/libintl:0 >=x11-libs/gtk+-3.14.0:3[introspection?] appindicator? ( dev-libs/libappindicator:3 ) introspection? ( >=dev-libs/gobject-introspection-0.6.2:= ) accountsservice? ( sys-apps/accountsservice:0[introspection?] )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-polkit-1.16.0.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=21908c85fef2566d12c01d7782459bec
diff --git a/metadata/md5-cache/mate-extra/mate-polkit-1.18.2 b/metadata/md5-cache/mate-extra/mate-polkit-1.18.2
index c85c307ec195..3fe23eac4b07 100644
--- a/metadata/md5-cache/mate-extra/mate-polkit-1.18.2
+++ b/metadata/md5-cache/mate-extra/mate-polkit-1.18.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.36:2 >=sys-auth/polkit-0.102:0[introspection?] x11-libs/gdk-pixbuf:2[introspection?] virtual/libintl:0 >=x11-libs/gtk+-3.14.0:3[introspection?] appindicator? ( dev-libs/libappindicator:3 ) introspection? ( >=dev-libs/gobject-introspection-0.6.2:= ) accountsservice? ( sys-apps/accountsservice:0[introspection?] )
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-polkit-1.18.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6ced843da0b202eb8acec5df6e45af2e
diff --git a/metadata/md5-cache/mate-extra/mate-power-manager-1.12.1-r2 b/metadata/md5-cache/mate-extra/mate-power-manager-1.12.1-r2
deleted file mode 100644
index 1188a1a3b298..000000000000
--- a/metadata/md5-cache/mate-extra/mate-power-manager-1.12.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-text/rarian:0 >=dev-libs/dbus-glib-0.70:0 >=dev-libs/glib-2.36:2 >=mate-base/mate-desktop-1.9[gtk3(-)=] >=sys-apps/dbus-1:0 >=x11-apps/xrandr-1.3:0 >=x11-libs/cairo-1:0 >=x11-libs/gdk-pixbuf-2.11:2 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXrandr:0 >=x11-libs/libnotify-0.7:0 x11-libs/pango:0 applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3:0 ) !gtk3? ( >=dev-libs/libunique-1:1 >=media-libs/libcanberra-0.10:0[gtk] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=dev-libs/libunique-3:3 >=media-libs/libcanberra-0.10:0[gtk3] >=x11-libs/gtk+-3.0:3 ) pm-utils? ( >=sys-power/upower-pm-utils-0.9.23 ) !pm-utils? ( >=sys-power/upower-0.9.23:= ) app-text/docbook-xml-dtd:4.3 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* x11-base/xorg-proto man? ( app-text/docbook-sgml-utils:0 >=app-text/docbook-sgml-dtd-4.3 ) >=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.12
-DESCRIPTION=A session daemon for MATE that makes it easy to manage your laptop or desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=+applet gnome-keyring gtk3 man pm-utils policykit test
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=app-text/rarian:0 >=dev-libs/dbus-glib-0.70:0 >=dev-libs/glib-2.36:2 >=mate-base/mate-desktop-1.9[gtk3(-)=] >=sys-apps/dbus-1:0 >=x11-apps/xrandr-1.3:0 >=x11-libs/cairo-1:0 >=x11-libs/gdk-pixbuf-2.11:2 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXrandr:0 >=x11-libs/libnotify-0.7:0 x11-libs/pango:0 applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3:0 ) !gtk3? ( >=dev-libs/libunique-1:1 >=media-libs/libcanberra-0.10:0[gtk] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=dev-libs/libunique-3:3 >=media-libs/libcanberra-0.10:0[gtk3] >=x11-libs/gtk+-3.0:3 ) pm-utils? ( >=sys-power/upower-pm-utils-0.9.23 ) !pm-utils? ( >=sys-power/upower-0.9.23:= ) policykit? ( >=mate-extra/mate-polkit-1.6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/mate-power-manager-1.12.1.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=34100e2cd676b986b942f7d049ee82a2
diff --git a/metadata/md5-cache/mate-extra/mate-power-manager-1.14.0 b/metadata/md5-cache/mate-extra/mate-power-manager-1.14.0
deleted file mode 100644
index 71d2bcf5af82..000000000000
--- a/metadata/md5-cache/mate-extra/mate-power-manager-1.14.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/dbus-glib-0.70:0 >=dev-libs/glib-2.36:2 >=mate-base/mate-desktop-1.9[gtk3(-)=] >=sys-apps/dbus-1:0 >=x11-apps/xrandr-1.3:0 >=x11-libs/cairo-1:0 >=x11-libs/gdk-pixbuf-2.11:2 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXrandr:0 >=x11-libs/libnotify-0.7:0 x11-libs/pango:0 applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3:0 ) !gtk3? ( >=dev-libs/libunique-1:1 >=media-libs/libcanberra-0.10:0[gtk] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=dev-libs/libunique-3:3 >=media-libs/libcanberra-0.10:0[gtk3] >=x11-libs/gtk+-3.0:3 ) pm-utils? ( >=sys-power/upower-pm-utils-0.9.23 ) !pm-utils? ( >=sys-power/upower-0.9.23:= ) app-text/docbook-xml-dtd:4.3 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:* x11-base/xorg-proto man? ( app-text/docbook-sgml-utils:0 >=app-text/docbook-sgml-dtd-4.3 ) >=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.14
-DESCRIPTION=A session daemon for MATE that makes it easy to manage your laptop or desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=+applet gnome-keyring gtk3 man pm-utils policykit test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/dbus-glib-0.70:0 >=dev-libs/glib-2.36:2 >=mate-base/mate-desktop-1.9[gtk3(-)=] >=sys-apps/dbus-1:0 >=x11-apps/xrandr-1.3:0 >=x11-libs/cairo-1:0 >=x11-libs/gdk-pixbuf-2.11:2 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXrandr:0 >=x11-libs/libnotify-0.7:0 x11-libs/pango:0 applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3:0 ) !gtk3? ( >=dev-libs/libunique-1:1 >=media-libs/libcanberra-0.10:0[gtk] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=dev-libs/libunique-3:3 >=media-libs/libcanberra-0.10:0[gtk3] >=x11-libs/gtk+-3.0:3 ) pm-utils? ( >=sys-power/upower-pm-utils-0.9.23 ) !pm-utils? ( >=sys-power/upower-0.9.23:= ) policykit? ( >=mate-extra/mate-polkit-1.6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.14/mate-power-manager-1.14.0.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=19295b712bd071903996e38195135bd4
diff --git a/metadata/md5-cache/mate-extra/mate-power-manager-1.16.2 b/metadata/md5-cache/mate-extra/mate-power-manager-1.16.2
deleted file mode 100644
index d45a64ee0037..000000000000
--- a/metadata/md5-cache/mate-extra/mate-power-manager-1.16.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/dbus-glib-0.70:0 >=dev-libs/glib-2.36:2 >=sys-apps/dbus-1:0 >=x11-apps/xrandr-1.3:0 >=x11-libs/cairo-1:0 >=x11-libs/gdk-pixbuf-2.11:2 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXrandr:0 >=x11-libs/libnotify-0.7:0 x11-libs/pango:0 applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3:0 ) !gtk3? ( >=dev-libs/libunique-1:1 >=media-libs/libcanberra-0.10:0[gtk] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=media-libs/libcanberra-0.10:0[gtk3] >=x11-libs/gtk+-3.0:3 ) pm-utils? ( >=sys-power/upower-pm-utils-0.9.23 ) !pm-utils? ( >=sys-power/upower-0.9.23:= ) app-text/docbook-xml-dtd:4.3 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:* x11-base/xorg-proto man? ( app-text/docbook-sgml-utils:0 >=app-text/docbook-sgml-dtd-4.3 ) >=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.16
-DESCRIPTION=A session daemon for MATE that makes it easy to manage your laptop or desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=+applet gnome-keyring gtk3 man pm-utils policykit test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/dbus-glib-0.70:0 >=dev-libs/glib-2.36:2 >=sys-apps/dbus-1:0 >=x11-apps/xrandr-1.3:0 >=x11-libs/cairo-1:0 >=x11-libs/gdk-pixbuf-2.11:2 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXrandr:0 >=x11-libs/libnotify-0.7:0 x11-libs/pango:0 applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3:0 ) !gtk3? ( >=dev-libs/libunique-1:1 >=media-libs/libcanberra-0.10:0[gtk] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=media-libs/libcanberra-0.10:0[gtk3] >=x11-libs/gtk+-3.0:3 ) pm-utils? ( >=sys-power/upower-pm-utils-0.9.23 ) !pm-utils? ( >=sys-power/upower-0.9.23:= ) policykit? ( >=mate-extra/mate-polkit-1.6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-power-manager-1.16.2.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=b3fc5bf07355b1654e470244109d6382
diff --git a/metadata/md5-cache/mate-extra/mate-power-manager-1.18.1 b/metadata/md5-cache/mate-extra/mate-power-manager-1.18.1
index a189de399257..0fffc95e258c 100644
--- a/metadata/md5-cache/mate-extra/mate-power-manager-1.18.1
+++ b/metadata/md5-cache/mate-extra/mate-power-manager-1.18.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/dbus-glib-0.70:0 >=dev-libs/glib-2.36:2 >=media-libs/libcanbe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-power-manager-1.18.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=74c1fd71d2f76bffe743070ebf280bd7
diff --git a/metadata/md5-cache/mate-extra/mate-screensaver-1.12.0-r1 b/metadata/md5-cache/mate-extra/mate-screensaver-1.12.0-r1
deleted file mode 100644
index 113239d5b2f9..000000000000
--- a/metadata/md5-cache/mate-extra/mate-screensaver-1.12.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/dbus-glib-0.71:0 >=dev-libs/glib-2.36:2 gnome-base/dconf:0 >=mate-base/libmatekbd-1.7.1[gtk3(-)=] >=mate-base/mate-desktop-1.9.4[gtk3(-)=] >=mate-base/mate-menus-1.6 >=mate-base/mate-session-manager-1.6 >=sys-apps/dbus-0.30:0 >=x11-libs/gdk-pixbuf-2.14:2 >=x11-libs/libX11-1:0 x11-libs/cairo:0 x11-libs/libXext:0 x11-libs/libXrandr:0 x11-libs/libXScrnSaver:0 x11-libs/libXxf86misc:0 x11-libs/libXxf86vm:0 x11-libs/libxklavier:0 x11-libs/pango:0 virtual/libintl:0 consolekit? ( sys-auth/consolekit:0 ) !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) libnotify? ( >=x11-libs/libnotify-0.7:0 ) opengl? ( virtual/opengl:0 ) pam? ( gnome-base/gnome-keyring:0 virtual/pam:0 ) !pam? ( kernel_linux? ( sys-apps/shadow:0 ) ) systemd? ( sys-apps/systemd:0= ) !!<gnome-extra/gnome-screensaver-3:0 >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* x11-base/xorg-proto >=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.12
-DESCRIPTION=Replaces xscreensaver, integrating with the MATE desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X debug consolekit gtk3 kernel_linux libnotify opengl pam systemd
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/dbus-glib-0.71:0 >=dev-libs/glib-2.36:2 gnome-base/dconf:0 >=mate-base/libmatekbd-1.7.1[gtk3(-)=] >=mate-base/mate-desktop-1.9.4[gtk3(-)=] >=mate-base/mate-menus-1.6 >=mate-base/mate-session-manager-1.6 >=sys-apps/dbus-0.30:0 >=x11-libs/gdk-pixbuf-2.14:2 >=x11-libs/libX11-1:0 x11-libs/cairo:0 x11-libs/libXext:0 x11-libs/libXrandr:0 x11-libs/libXScrnSaver:0 x11-libs/libXxf86misc:0 x11-libs/libXxf86vm:0 x11-libs/libxklavier:0 x11-libs/pango:0 virtual/libintl:0 consolekit? ( sys-auth/consolekit:0 ) !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) libnotify? ( >=x11-libs/libnotify-0.7:0 ) opengl? ( virtual/opengl:0 ) pam? ( gnome-base/gnome-keyring:0 virtual/pam:0 ) !pam? ( kernel_linux? ( sys-apps/shadow:0 ) ) systemd? ( sys-apps/systemd:0= ) !!<gnome-extra/gnome-screensaver-3:0
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/mate-screensaver-1.12.0.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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=78879a2a454d0e85ecdffaa56552bf46
diff --git a/metadata/md5-cache/mate-extra/mate-screensaver-1.14.1 b/metadata/md5-cache/mate-extra/mate-screensaver-1.14.1
deleted file mode 100644
index a1f9100f38f6..000000000000
--- a/metadata/md5-cache/mate-extra/mate-screensaver-1.14.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/dbus-glib-0.71:0 >=dev-libs/glib-2.36:2 gnome-base/dconf:0 >=mate-base/libmatekbd-1.7.1[gtk3(-)=] >=mate-base/mate-desktop-1.9.4[gtk3(-)=] >=mate-base/mate-menus-1.6 >=sys-apps/dbus-0.30:0 >=x11-libs/gdk-pixbuf-2.14:2 >=x11-libs/libX11-1:0 x11-libs/cairo:0 x11-libs/libXext:0 x11-libs/libXrandr:0 x11-libs/libXScrnSaver:0 x11-libs/libXxf86misc:0 x11-libs/libXxf86vm:0 x11-libs/libxklavier:0 x11-libs/pango:0 virtual/libintl:0 consolekit? ( sys-auth/consolekit:0 ) !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) libnotify? ( >=x11-libs/libnotify-0.7:0 ) opengl? ( virtual/opengl:0 ) pam? ( gnome-base/gnome-keyring:0 virtual/pam:0 ) !pam? ( kernel_linux? ( sys-apps/shadow:0 ) ) systemd? ( sys-apps/systemd:0= ) !!<gnome-extra/gnome-screensaver-3:0 >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* x11-base/xorg-proto >=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.14
-DESCRIPTION=Replaces xscreensaver, integrating with the MATE desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X debug consolekit gtk3 kernel_linux libnotify opengl pam systemd
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/dbus-glib-0.71:0 >=dev-libs/glib-2.36:2 gnome-base/dconf:0 >=mate-base/libmatekbd-1.7.1[gtk3(-)=] >=mate-base/mate-desktop-1.9.4[gtk3(-)=] >=mate-base/mate-menus-1.6 >=sys-apps/dbus-0.30:0 >=x11-libs/gdk-pixbuf-2.14:2 >=x11-libs/libX11-1:0 x11-libs/cairo:0 x11-libs/libXext:0 x11-libs/libXrandr:0 x11-libs/libXScrnSaver:0 x11-libs/libXxf86misc:0 x11-libs/libXxf86vm:0 x11-libs/libxklavier:0 x11-libs/pango:0 virtual/libintl:0 consolekit? ( sys-auth/consolekit:0 ) !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) libnotify? ( >=x11-libs/libnotify-0.7:0 ) opengl? ( virtual/opengl:0 ) pam? ( gnome-base/gnome-keyring:0 virtual/pam:0 ) !pam? ( kernel_linux? ( sys-apps/shadow:0 ) ) systemd? ( sys-apps/systemd:0= ) !!<gnome-extra/gnome-screensaver-3:0 >=mate-base/mate-session-manager-1.6
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.14/mate-screensaver-1.14.1.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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=c26175736477020a8a2e9b6fea7306b0
diff --git a/metadata/md5-cache/mate-extra/mate-screensaver-1.16.1 b/metadata/md5-cache/mate-extra/mate-screensaver-1.16.1
deleted file mode 100644
index 424adf7df18f..000000000000
--- a/metadata/md5-cache/mate-extra/mate-screensaver-1.16.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/dbus-glib-0.71:0 >=dev-libs/glib-2.36:2 gnome-base/dconf:0 >=mate-base/libmatekbd-1.7.1[gtk3(-)=] >=mate-base/mate-desktop-1.9.4[gtk3(-)=] >=mate-base/mate-menus-1.6 >=sys-apps/dbus-0.30:0 >=x11-libs/gdk-pixbuf-2.14:2 >=x11-libs/libX11-1:0 x11-libs/cairo:0 x11-libs/libXext:0 x11-libs/libXrandr:0 x11-libs/libXScrnSaver:0 x11-libs/libXxf86misc:0 x11-libs/libXxf86vm:0 x11-libs/libxklavier:0 x11-libs/pango:0 virtual/libintl:0 consolekit? ( sys-auth/consolekit:0 ) !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) libnotify? ( >=x11-libs/libnotify-0.7:0 ) opengl? ( virtual/opengl:0 ) pam? ( gnome-base/gnome-keyring:0 virtual/pam:0 ) !pam? ( kernel_linux? ( sys-apps/shadow:0 ) ) systemd? ( sys-apps/systemd:0= ) !!<gnome-extra/gnome-screensaver-3:0 >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* x11-base/xorg-proto >=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.16
-DESCRIPTION=Replaces xscreensaver, integrating with the MATE desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X debug consolekit gtk3 kernel_linux libnotify opengl pam systemd
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/dbus-glib-0.71:0 >=dev-libs/glib-2.36:2 gnome-base/dconf:0 >=mate-base/libmatekbd-1.7.1[gtk3(-)=] >=mate-base/mate-desktop-1.9.4[gtk3(-)=] >=mate-base/mate-menus-1.6 >=sys-apps/dbus-0.30:0 >=x11-libs/gdk-pixbuf-2.14:2 >=x11-libs/libX11-1:0 x11-libs/cairo:0 x11-libs/libXext:0 x11-libs/libXrandr:0 x11-libs/libXScrnSaver:0 x11-libs/libXxf86misc:0 x11-libs/libXxf86vm:0 x11-libs/libxklavier:0 x11-libs/pango:0 virtual/libintl:0 consolekit? ( sys-auth/consolekit:0 ) !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) libnotify? ( >=x11-libs/libnotify-0.7:0 ) opengl? ( virtual/opengl:0 ) pam? ( gnome-base/gnome-keyring:0 virtual/pam:0 ) !pam? ( kernel_linux? ( sys-apps/shadow:0 ) ) systemd? ( sys-apps/systemd:0= ) !!<gnome-extra/gnome-screensaver-3:0 >=mate-base/mate-session-manager-1.6
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-screensaver-1.16.1.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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=c26175736477020a8a2e9b6fea7306b0
diff --git a/metadata/md5-cache/mate-extra/mate-screensaver-1.18.2 b/metadata/md5-cache/mate-extra/mate-screensaver-1.18.2
index 8f96bf764c5c..fd81ec60484b 100644
--- a/metadata/md5-cache/mate-extra/mate-screensaver-1.18.2
+++ b/metadata/md5-cache/mate-extra/mate-screensaver-1.18.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.71:0 >=dev-libs/glib-2.36:2 gnome-base/dconf:0 >=mate-base/libmatekbd-1.17.0 >=mate-base/mate-desktop-1.17.0 >=mate-base/mate-menus-1.10.0 >=sys-apps/dbus-0.30:0 >=x11-libs/gdk-pixbuf-2.14:2 >=x11-libs/libX11-1:0 x11-libs/cairo:0 >=x11-libs/gtk+-3.14:3 x11-libs/libXext:0 x11-libs/libXrandr:0 x11-libs/libXScrnSaver:0 x11-libs/libXxf86misc:0 x11-libs/libXxf86vm:0 x11-libs/libxklavier:0 x11-libs/pango:0 virtual/libintl:0 consolekit? ( sys-auth/consolekit:0 ) libnotify? ( >=x11-libs/libnotify-0.7:0 ) opengl? ( virtual/opengl:0 ) pam? ( gnome-base/gnome-keyring:0 virtual/pam:0 ) !pam? ( kernel_linux? ( sys-apps/shadow:0 ) ) systemd? ( sys-apps/systemd:0= ) !!<gnome-extra/gnome-screensaver-3:0 >=mate-base/mate-session-manager-1.6
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-screensaver-1.18.2.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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4cfa3f5bffc989c8dafe762ba2683a40
diff --git a/metadata/md5-cache/mate-extra/mate-sensors-applet-1.12.1 b/metadata/md5-cache/mate-extra/mate-sensors-applet-1.12.1
deleted file mode 100644
index cd77017ca90d..000000000000
--- a/metadata/md5-cache/mate-extra/mate-sensors-applet-1.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-text/rarian:0 >=dev-libs/glib-2.36:2 >=mate-base/mate-panel-1.6[gtk3(-)=] >=x11-libs/cairo-1.0.4:0 x11-libs/gdk-pixbuf:2 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) 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/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.12
-DESCRIPTION=MATE panel applet to display readings from hardware sensors
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=+dbus gtk3 hddtemp libnotify lm_sensors video_cards_nvidia
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-PDEPEND=hddtemp? ( dbus? ( sys-fs/udisks:0 ) )
-RDEPEND=app-text/rarian:0 >=dev-libs/glib-2.36:2 >=mate-base/mate-panel-1.6[gtk3(-)=] >=x11-libs/cairo-1.0.4:0 x11-libs/gdk-pixbuf:2 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) 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 ) )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/mate-sensors-applet-1.12.1.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=ebad46212ba65e4f133764460a5aff9b
diff --git a/metadata/md5-cache/mate-extra/mate-sensors-applet-1.14.0 b/metadata/md5-cache/mate-extra/mate-sensors-applet-1.14.0
deleted file mode 100644
index 4c37101952ce..000000000000
--- a/metadata/md5-cache/mate-extra/mate-sensors-applet-1.14.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.36:2 >=mate-base/mate-panel-1.6[gtk3(-)=] >=x11-libs/cairo-1.0.4:0 x11-libs/gdk-pixbuf:2 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) 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.14
-DESCRIPTION=MATE panel applet to display readings from hardware sensors
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=+dbus gtk3 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.6[gtk3(-)=] >=x11-libs/cairo-1.0.4:0 x11-libs/gdk-pixbuf:2 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) 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 ) )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.14/mate-sensors-applet-1.14.0.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=6fead1f0f55e5d649527990029a19dd6
diff --git a/metadata/md5-cache/mate-extra/mate-sensors-applet-1.16.1 b/metadata/md5-cache/mate-extra/mate-sensors-applet-1.16.1
deleted file mode 100644
index 8ef0bbacd9ff..000000000000
--- a/metadata/md5-cache/mate-extra/mate-sensors-applet-1.16.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.36:2 >=mate-base/mate-panel-1.6[gtk3(-)=] >=x11-libs/cairo-1.0.4:0 x11-libs/gdk-pixbuf:2 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) 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.16
-DESCRIPTION=MATE panel applet to display readings from hardware sensors
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=+dbus gtk3 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.6[gtk3(-)=] >=x11-libs/cairo-1.0.4:0 x11-libs/gdk-pixbuf:2 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) 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 ) )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-sensors-applet-1.16.1.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=f749dc5f32943cb8e1f48b9fbfdd8c6c
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 226d1c1a9796..c0efa6078a1b 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
@@ -10,5 +10,5 @@ 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 ) )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/mate-extra/mate-system-monitor-1.12.2 b/metadata/md5-cache/mate-extra/mate-system-monitor-1.12.2
deleted file mode 100644
index f95c7658874f..000000000000
--- a/metadata/md5-cache/mate-extra/mate-system-monitor-1.12.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-cpp/glibmm-2.26:2 >=dev-libs/dbus-glib-0.70:0 >=dev-libs/glib-2.36:2 dev-libs/libsigc++:2 >=dev-libs/libxml2-2:2 >=gnome-base/libgtop-2.23.1:2= >=gnome-base/librsvg-2.35:2 >=sys-apps/dbus-0.7:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 virtual/libintl:0 !gtk3? ( >=dev-cpp/gtkmm-2.22:2.4 >=x11-libs/gtk+-2.20:2 >=x11-libs/libwnck-2.5:1 ) gtk3? ( >=dev-cpp/gtkmm-3.0:3.0 >=x11-libs/gtk+-3.0:3 >=x11-libs/libwnck-2.91:3 ) systemd? ( sys-apps/systemd ) app-text/yelp-tools:0 >=dev-util/intltool-0.50.1:* sys-devel/gettext:* >=sys-devel/autoconf-2.63:* 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.12
-DESCRIPTION=The MATE System Monitor
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=gtk3 systemd
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=dev-cpp/glibmm-2.26:2 >=dev-libs/dbus-glib-0.70:0 >=dev-libs/glib-2.36:2 dev-libs/libsigc++:2 >=dev-libs/libxml2-2:2 >=gnome-base/libgtop-2.23.1:2= >=gnome-base/librsvg-2.35:2 >=sys-apps/dbus-0.7:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 virtual/libintl:0 !gtk3? ( >=dev-cpp/gtkmm-2.22:2.4 >=x11-libs/gtk+-2.20:2 >=x11-libs/libwnck-2.5:1 ) gtk3? ( >=dev-cpp/gtkmm-3.0:3.0 >=x11-libs/gtk+-3.0:3 >=x11-libs/libwnck-2.91:3 ) systemd? ( sys-apps/systemd )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/mate-system-monitor-1.12.2.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=dd59bef192138bbf58bdd7cbfd6390c7
diff --git a/metadata/md5-cache/mate-extra/mate-system-monitor-1.14.0 b/metadata/md5-cache/mate-extra/mate-system-monitor-1.14.0
deleted file mode 100644
index 9e6407fa2d0b..000000000000
--- a/metadata/md5-cache/mate-extra/mate-system-monitor-1.14.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-cpp/glibmm-2.26:2 >=dev-cpp/gtkmm-3.8:3.0 >=dev-libs/glib-2.36:2 dev-libs/libsigc++:2 >=dev-libs/libxml2-2:2 >=gnome-base/libgtop-2.23.1:2= >=gnome-base/librsvg-2.35:2 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 >=x11-libs/libwnck-3.0:3 virtual/libintl:0 systemd? ( sys-apps/systemd ) app-text/yelp-tools:0 >=dev-util/intltool-0.50.1:* sys-devel/gettext:* >=sys-devel/autoconf-2.63:* 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.14
-DESCRIPTION=The MATE System Monitor
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=systemd
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-cpp/glibmm-2.26:2 >=dev-cpp/gtkmm-3.8:3.0 >=dev-libs/glib-2.36:2 dev-libs/libsigc++:2 >=dev-libs/libxml2-2:2 >=gnome-base/libgtop-2.23.1:2= >=gnome-base/librsvg-2.35:2 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 >=x11-libs/libwnck-3.0:3 virtual/libintl:0 systemd? ( sys-apps/systemd )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.14/mate-system-monitor-1.14.0.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=511c2a76d6c338f8c83965e193e66f76
diff --git a/metadata/md5-cache/mate-extra/mate-system-monitor-1.16.0 b/metadata/md5-cache/mate-extra/mate-system-monitor-1.16.0
deleted file mode 100644
index 458a6f3af37a..000000000000
--- a/metadata/md5-cache/mate-extra/mate-system-monitor-1.16.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-cpp/glibmm-2.26:2 >=dev-cpp/gtkmm-3.8:3.0 >=dev-libs/glib-2.36:2 dev-libs/libsigc++:2 >=dev-libs/libxml2-2:2 >=gnome-base/libgtop-2.23.1:2= >=gnome-base/librsvg-2.35:2 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 >=x11-libs/libwnck-3.0:3 virtual/libintl:0 systemd? ( sys-apps/systemd ) app-text/yelp-tools:0 >=dev-util/intltool-0.50.1:* sys-devel/gettext:* >=sys-devel/autoconf-2.63:* 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.16
-DESCRIPTION=The MATE System Monitor
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=systemd
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-cpp/glibmm-2.26:2 >=dev-cpp/gtkmm-3.8:3.0 >=dev-libs/glib-2.36:2 dev-libs/libsigc++:2 >=dev-libs/libxml2-2:2 >=gnome-base/libgtop-2.23.1:2= >=gnome-base/librsvg-2.35:2 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 >=x11-libs/libwnck-3.0:3 virtual/libintl:0 systemd? ( sys-apps/systemd )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-system-monitor-1.16.0.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=511c2a76d6c338f8c83965e193e66f76
diff --git a/metadata/md5-cache/mate-extra/mate-system-monitor-1.18.1 b/metadata/md5-cache/mate-extra/mate-system-monitor-1.18.1
index 1ebe497618d1..969a66c7b040 100644
--- a/metadata/md5-cache/mate-extra/mate-system-monitor-1.18.1
+++ b/metadata/md5-cache/mate-extra/mate-system-monitor-1.18.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-cpp/glibmm-2.26:2 >=dev-cpp/gtkmm-3.8:3.0 >=dev-libs/glib-2.36:2 dev-libs/libsigc++:2 >=dev-libs/libxml2-2:2 >=gnome-base/libgtop-2.23.1:2= >=gnome-base/librsvg-2.35:2 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 >=x11-libs/libwnck-3.0:3 virtual/libintl:0 systemd? ( sys-apps/systemd ) >=sys-auth/polkit-0.97:0
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-system-monitor-1.18.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fa82ccb739fc82fae31c1951450204d1
diff --git a/metadata/md5-cache/mate-extra/mate-user-guide-1.12.0 b/metadata/md5-cache/mate-extra/mate-user-guide-1.12.0
deleted file mode 100644
index ea4a3dfc71f2..000000000000
--- a/metadata/md5-cache/mate-extra/mate-user-guide-1.12.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=gnome-extra/yelp virtual/libintl:0 >=dev-util/intltool-0.40:* app-text/yelp-tools sys-devel/gettext:* virtual/pkgconfig:* !!mate-base/mate-desktop[user-guide] >=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.12
-DESCRIPTION=User documentation for MATE Desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=gnome-extra/yelp virtual/libintl:0
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/mate-user-guide-1.12.0.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=e448f8f51fd015cb845e9820f5264061
diff --git a/metadata/md5-cache/mate-extra/mate-user-guide-1.14.0 b/metadata/md5-cache/mate-extra/mate-user-guide-1.14.0
deleted file mode 100644
index f28e31096a2a..000000000000
--- a/metadata/md5-cache/mate-extra/mate-user-guide-1.14.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=virtual/libintl:0 >=dev-util/intltool-0.40:* app-text/yelp-tools sys-devel/gettext:* virtual/pkgconfig:* !!mate-base/mate-desktop[user-guide] >=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.14
-DESCRIPTION=User documentation for MATE Desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=virtual/libintl:0 gnome-extra/yelp
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.14/mate-user-guide-1.14.0.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=87141850c4f89665b71fe4dd4001488d
diff --git a/metadata/md5-cache/mate-extra/mate-user-guide-1.16.0 b/metadata/md5-cache/mate-extra/mate-user-guide-1.16.0
deleted file mode 100644
index 624c2b5fd3ce..000000000000
--- a/metadata/md5-cache/mate-extra/mate-user-guide-1.16.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=virtual/libintl:0 >=dev-util/intltool-0.40:* app-text/yelp-tools sys-devel/gettext:* virtual/pkgconfig:* !!mate-base/mate-desktop[user-guide] >=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.16
-DESCRIPTION=User documentation for MATE Desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=virtual/libintl:0 gnome-extra/yelp
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-user-guide-1.16.0.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=87141850c4f89665b71fe4dd4001488d
diff --git a/metadata/md5-cache/mate-extra/mate-user-guide-1.18.0 b/metadata/md5-cache/mate-extra/mate-user-guide-1.18.0
index 8ab9d4de4aa1..72f856a7b1c6 100644
--- a/metadata/md5-cache/mate-extra/mate-user-guide-1.18.0
+++ b/metadata/md5-cache/mate-extra/mate-user-guide-1.18.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=virtual/libintl:0 gnome-extra/yelp
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-user-guide-1.18.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0a59c9948a8cddf7c6518b17a2779816
diff --git a/metadata/md5-cache/mate-extra/mate-user-share-1.12.0 b/metadata/md5-cache/mate-extra/mate-user-share-1.12.0
deleted file mode 100644
index 89d3c2060c95..000000000000
--- a/metadata/md5-cache/mate-extra/mate-user-share-1.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/dbus-glib-0.70:0 >=dev-libs/glib-2.15.2:2 >=mate-base/caja-1.6[gtk3(-)=] >=sys-apps/dbus-1.1.1:0 >=x11-libs/gdk-pixbuf-2:2 x11-libs/libX11:0 x11-libs/pango:0 >=x11-libs/libnotify-0.7:0 >=www-apache/mod_dnssd-0.6:0 >=www-servers/apache-2.2:2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile] virtual/libintl:0 !gtk3? ( >=dev-libs/libunique-1:1 media-libs/libcanberra:0[gtk] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=dev-libs/libunique-3:3 media-libs/libcanberra:0[gtk3] >=x11-libs/gtk+-3.0:3 ) app-text/docbook-xml-dtd:4.1.2 app-text/yelp-tools:0 >=dev-util/intltool-0.35:* 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.12
-DESCRIPTION=Personal file sharing for the MATE desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X gtk3
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/dbus-glib-0.70:0 >=dev-libs/glib-2.15.2:2 >=mate-base/caja-1.6[gtk3(-)=] >=sys-apps/dbus-1.1.1:0 >=x11-libs/gdk-pixbuf-2:2 x11-libs/libX11:0 x11-libs/pango:0 >=x11-libs/libnotify-0.7:0 >=www-apache/mod_dnssd-0.6:0 >=www-servers/apache-2.2:2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile] virtual/libintl:0 !gtk3? ( >=dev-libs/libunique-1:1 media-libs/libcanberra:0[gtk] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=dev-libs/libunique-3:3 media-libs/libcanberra:0[gtk3] >=x11-libs/gtk+-3.0:3 )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/mate-user-share-1.12.0.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=2f45440b989af93d41d27fd8af659b24
diff --git a/metadata/md5-cache/mate-extra/mate-user-share-1.14.0 b/metadata/md5-cache/mate-extra/mate-user-share-1.14.0
deleted file mode 100644
index 5ad68323205d..000000000000
--- a/metadata/md5-cache/mate-extra/mate-user-share-1.14.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/dbus-glib-0.70:0 >=dev-libs/glib-2.15.2:2 >=mate-base/caja-1.6[gtk3(-)=] >=sys-apps/dbus-1.1.1:0 >=x11-libs/gdk-pixbuf-2:2 x11-libs/libX11:0 x11-libs/pango:0 >=x11-libs/libnotify-0.7:0 virtual/libintl:0 !gtk3? ( >=dev-libs/libunique-1:1 media-libs/libcanberra:0[gtk] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=dev-libs/libunique-3:3 media-libs/libcanberra:0[gtk3] >=x11-libs/gtk+-3.0:3 ) app-text/docbook-xml-dtd:4.1.2 app-text/yelp-tools:0 >=dev-util/intltool-0.35:* 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.14
-DESCRIPTION=Personal file sharing for the MATE desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X gtk3
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/dbus-glib-0.70:0 >=dev-libs/glib-2.15.2:2 >=mate-base/caja-1.6[gtk3(-)=] >=sys-apps/dbus-1.1.1:0 >=x11-libs/gdk-pixbuf-2:2 x11-libs/libX11:0 x11-libs/pango:0 >=x11-libs/libnotify-0.7:0 virtual/libintl:0 !gtk3? ( >=dev-libs/libunique-1:1 media-libs/libcanberra:0[gtk] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=dev-libs/libunique-3:3 media-libs/libcanberra:0[gtk3] >=x11-libs/gtk+-3.0:3 ) >=www-apache/mod_dnssd-0.6:0 >=www-servers/apache-2.2:2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile]
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.14/mate-user-share-1.14.0.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=2391682625af33aae36aeeff09ca3091
diff --git a/metadata/md5-cache/mate-extra/mate-user-share-1.16.0 b/metadata/md5-cache/mate-extra/mate-user-share-1.16.0
deleted file mode 100644
index 408279dcbccc..000000000000
--- a/metadata/md5-cache/mate-extra/mate-user-share-1.16.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/dbus-glib-0.70:0 >=dev-libs/glib-2.15.2:2 >=mate-base/caja-1.6[gtk3(-)=] >=sys-apps/dbus-1.1.1:0 >=x11-libs/gdk-pixbuf-2:2 x11-libs/libX11:0 x11-libs/pango:0 >=x11-libs/libnotify-0.7:0 virtual/libintl:0 !gtk3? ( >=dev-libs/libunique-1:1 media-libs/libcanberra:0[gtk] >=x11-libs/gtk+-2.24:2 ) gtk3? ( media-libs/libcanberra:0[gtk3] >=x11-libs/gtk+-3.0:3 ) app-text/docbook-xml-dtd:4.1.2 app-text/yelp-tools:0 >=dev-util/intltool-0.35:* 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.16
-DESCRIPTION=Personal file sharing for the MATE desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X gtk3
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/dbus-glib-0.70:0 >=dev-libs/glib-2.15.2:2 >=mate-base/caja-1.6[gtk3(-)=] >=sys-apps/dbus-1.1.1:0 >=x11-libs/gdk-pixbuf-2:2 x11-libs/libX11:0 x11-libs/pango:0 >=x11-libs/libnotify-0.7:0 virtual/libintl:0 !gtk3? ( >=dev-libs/libunique-1:1 media-libs/libcanberra:0[gtk] >=x11-libs/gtk+-2.24:2 ) gtk3? ( media-libs/libcanberra:0[gtk3] >=x11-libs/gtk+-3.0:3 ) >=www-apache/mod_dnssd-0.6:0 >=www-servers/apache-2.2:2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile]
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-user-share-1.16.0.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=e8e2b968c32173a3fb5a4f1637fb0da9
diff --git a/metadata/md5-cache/mate-extra/mate-user-share-1.18.0 b/metadata/md5-cache/mate-extra/mate-user-share-1.18.0
index db154277a13d..0c19cff04d18 100644
--- a/metadata/md5-cache/mate-extra/mate-user-share-1.18.0
+++ b/metadata/md5-cache/mate-extra/mate-user-share-1.18.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.70:0 >=dev-libs/glib-2.15.2:2 >=mate-base/caja-1.17.1 media-libs/libcanberra:0[gtk3] >=sys-apps/dbus-1.1.1:0 >=x11-libs/gdk-pixbuf-2:2 >=x11-libs/gtk+-3.14:3 x11-libs/libX11:0 x11-libs/pango:0 >=x11-libs/libnotify-0.7:0 virtual/libintl:0 >=www-apache/mod_dnssd-0.6:0 >=www-servers/apache-2.2:2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile]
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-user-share-1.18.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=55e8dd40978f3a48aa209d7f3a39f885
diff --git a/metadata/md5-cache/mate-extra/mate-utils-1.12.0-r2 b/metadata/md5-cache/mate-extra/mate-utils-1.12.0-r2
deleted file mode 100644
index 215193b7a25b..000000000000
--- a/metadata/md5-cache/mate-extra/mate-utils-1.12.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-text/rarian:0 dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=gnome-base/libgtop-2.12:2= sys-libs/zlib:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/pango:0 applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] ) !gtk3? ( >=x11-libs/gtk+-2.24:2 >=media-libs/libcanberra-0.4:0[gtk] ) gtk3? ( >=x11-libs/gtk+-3.0:3 >=media-libs/libcanberra-0.4:0[gtk3] ) >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* x11-base/xorg-proto >=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.12
-DESCRIPTION=Utilities for the MATE desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X applet debug gtk3 ipv6 test
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=app-text/rarian:0 dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=gnome-base/libgtop-2.12:2= sys-libs/zlib:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/pango:0 applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] ) !gtk3? ( >=x11-libs/gtk+-2.24:2 >=media-libs/libcanberra-0.4:0[gtk] ) gtk3? ( >=x11-libs/gtk+-3.0:3 >=media-libs/libcanberra-0.4:0[gtk3] )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/mate-utils-1.12.0.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=80f6d0f44765335659cfcd8448030acf
diff --git a/metadata/md5-cache/mate-extra/mate-utils-1.14.1 b/metadata/md5-cache/mate-extra/mate-utils-1.14.1
deleted file mode 100644
index 407318584836..000000000000
--- a/metadata/md5-cache/mate-extra/mate-utils-1.14.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=gnome-base/libgtop-2.12:2= sys-libs/zlib:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/pango:0 applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] ) !gtk3? ( >=x11-libs/gtk+-2.24:2 >=media-libs/libcanberra-0.4:0[gtk] ) gtk3? ( >=x11-libs/gtk+-3.0:3 >=media-libs/libcanberra-0.4:0[gtk3] ) app-text/rarian:0 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* x11-base/xorg-proto >=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.14
-DESCRIPTION=Utilities for the MATE desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X applet debug gtk3 ipv6 test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=gnome-base/libgtop-2.12:2= sys-libs/zlib:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/pango:0 applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] ) !gtk3? ( >=x11-libs/gtk+-2.24:2 >=media-libs/libcanberra-0.4:0[gtk] ) gtk3? ( >=x11-libs/gtk+-3.0:3 >=media-libs/libcanberra-0.4:0[gtk3] )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.14/mate-utils-1.14.1.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=c851c04c5438054a746a608926b10499
diff --git a/metadata/md5-cache/mate-extra/mate-utils-1.16.1 b/metadata/md5-cache/mate-extra/mate-utils-1.16.1
deleted file mode 100644
index 53152ec94435..000000000000
--- a/metadata/md5-cache/mate-extra/mate-utils-1.16.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=gnome-base/libgtop-2.12:2= sys-libs/zlib:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/pango:0 applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] ) !gtk3? ( >=x11-libs/gtk+-2.24:2 >=media-libs/libcanberra-0.4:0[gtk] ) gtk3? ( >=x11-libs/gtk+-3.0:3 >=media-libs/libcanberra-0.4:0[gtk3] ) app-text/rarian:0 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* x11-base/xorg-proto >=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.16
-DESCRIPTION=Utilities for the MATE desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X applet debug gtk3 ipv6 test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=gnome-base/libgtop-2.12:2= sys-libs/zlib:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/pango:0 applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] ) !gtk3? ( >=x11-libs/gtk+-2.24:2 >=media-libs/libcanberra-0.4:0[gtk] ) gtk3? ( >=x11-libs/gtk+-3.0:3 >=media-libs/libcanberra-0.4:0[gtk3] )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-utils-1.16.1.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=c851c04c5438054a746a608926b10499
diff --git a/metadata/md5-cache/mate-extra/mate-utils-1.18.3 b/metadata/md5-cache/mate-extra/mate-utils-1.18.3
index dcd013f59414..245b6efff573 100644
--- a/metadata/md5-cache/mate-extra/mate-utils-1.18.3
+++ b/metadata/md5-cache/mate-extra/mate-utils-1.18.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=gnome-base/libgtop-2.12:2= >=media-libs/libcanberra-0.4:0[gtk3] sys-libs/zlib:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/pango:0 applet? ( >=mate-base/mate-panel-1.17.0 )
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-utils-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4059b895d8eca463c15d00cd65f9bdd4
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index b02e82b97b46..4935ab350bc4 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/arphicfonts-0.2.20080216.1-r2 b/metadata/md5-cache/media-fonts/arphicfonts-0.2.20080216.1-r2
index bb487f036332..29343bb9ff92 100644
--- a/metadata/md5-cache/media-fonts/arphicfonts-0.2.20080216.1-r2
+++ b/metadata/md5-cache/media-fonts/arphicfonts-0.2.20080216.1-r2
@@ -9,5 +9,5 @@ LICENSE=Arphic
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=mirror://gnu/non-gnu/chinese-fonts-truetype/gkai00mp.ttf.gz mirror://gnu/non-gnu/chinese-fonts-truetype/bkai00mp.ttf.gz mirror://gnu/non-gnu/chinese-fonts-truetype/bsmi00lp.ttf.gz mirror://gnu/non-gnu/chinese-fonts-truetype/gbsn00lp.ttf.gz mirror://ubuntu/pool/main/t/ttf-arphic-uming/ttf-arphic-uming_0.2.20080216.1.orig.tar.gz mirror://ubuntu/pool/main/t/ttf-arphic-ukai/ttf-arphic-ukai_0.2.20080216.1.orig.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7c1a7f2e7dae126de01d9d2c9298ed3d
diff --git a/metadata/md5-cache/media-fonts/dejavu-2.37 b/metadata/md5-cache/media-fonts/dejavu-2.37
index fa409f900c96..675b4d7dbd63 100644
--- a/metadata/md5-cache/media-fonts/dejavu-2.37
+++ b/metadata/md5-cache/media-fonts/dejavu-2.37
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~am
 LICENSE=BitstreamVera
 SLOT=0
 SRC_URI=!fontforge? ( mirror://sourceforge/dejavu/dejavu-fonts-ttf-2.37.tar.bz2 ) fontforge? ( mirror://sourceforge/dejavu/dejavu-fonts-2.37.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2c8e43d10eb99ceb9ce5341b158c0575
diff --git a/metadata/md5-cache/media-fonts/infinality-ultimate-meta-1 b/metadata/md5-cache/media-fonts/infinality-ultimate-meta-1
index 01ba60604123..e8b76c21a5fa 100644
--- a/metadata/md5-cache/media-fonts/infinality-ultimate-meta-1
+++ b/metadata/md5-cache/media-fonts/infinality-ultimate-meta-1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=-
 DESCRIPTION=Meta package for infinality-ultimate with fonts
 EAPI=5
-HOMEPAGE=http://bohoomil.com/
+HOMEPAGE=https://www.gentoo.org/
 IUSE=minimal +latin +free ms l10n_as l10n_bn l10n_bo l10n_brx l10n_doi l10n_dz l10n_gu l10n_hi l10n_ja l10n_km l10n_kn l10n_ko l10n_kok l10n_ks l10n_mai l10n_ml l10n_mr l10n_ne l10n_or l10n_pa l10n_sa l10n_sat l10n_sd l10n_si l10n_syc l10n_ta l10n_te l10n_zh
 KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=media-libs/fontconfig-ultimate free? ( media-fonts/noto media-fonts/heuristica media-fonts/liberation-fonts media-fonts/wqy-microhei latin? ( media-fonts/courier-prime media-fonts/dejavu media-fonts/signika media-fonts/symbola media-fonts/tex-gyre !minimal? ( media-fonts/cantarell media-fonts/droid media-fonts/font-bh-ttf media-fonts/font-cursor-misc media-fonts/open-sans media-fonts/source-pro media-fonts/ubuntu-font-family media-fonts/urw-fonts ) ) l10n_brx? ( media-fonts/lohit-devanagari ) l10n_doi? ( media-fonts/lohit-devanagari ) l10n_dz? ( media-fonts/dzongkha-fonts ) l10n_hi? ( media-fonts/lohit-devanagari ) l10n_ja? ( media-fonts/ja-ipafonts ) l10n_km? ( media-fonts/khmer ) l10n_ko? ( media-fonts/unfonts ) l10n_kok? ( media-fonts/lohit-devanagari ) l10n_ks? ( media-fonts/lohit-devanagari ) l10n_mai? ( media-fonts/lohit-devanagari ) l10n_mr? ( media-fonts/lohit-devanagari ) l10n_ne? ( media-fonts/lohit-devanagari ) l10n_or? ( media-fonts/lohit-odia ) l10n_sa? ( media-fonts/lohit-devanagari ) l10n_sat? ( media-fonts/lohit-devanagari ) l10n_sd? ( media-fonts/lohit-devanagari ) l10n_si? ( media-fonts/lklug ) l10n_syc? ( media-fonts/font-misc-meltho ) !minimal? ( l10n_as? ( media-fonts/lohit-assamese ) l10n_bn? ( media-fonts/lohit-bengali ) l10n_bo? ( media-fonts/tibetan-machine-font ) l10n_gu? ( media-fonts/lohit-gujarati ) l10n_ja? ( media-fonts/ipaex media-fonts/koruri media-fonts/mplus-fonts media-fonts/vlgothic ) l10n_kn? ( media-fonts/lohit-kannada ) l10n_ko? ( media-fonts/nanum ) l10n_ml? ( media-fonts/lohit-malayalam ) l10n_mr? ( media-fonts/lohit-marathi ) l10n_ne? ( media-fonts/lohit-nepali ) l10n_pa? ( media-fonts/lohit-gurmukhi ) l10n_ta? ( media-fonts/lohit-tamil media-fonts/lohit-tamil-classical ) l10n_te? ( media-fonts/lohit-telugu ) l10n_zh? ( media-fonts/wqy-zenhei ) ) ) ms? ( media-fonts/corefonts !minimal? ( media-fonts/dejavu media-fonts/droid media-fonts/inconsolata media-fonts/open-sans media-fonts/paratype ) )
 SLOT=0
-_md5_=3bee80665796171a9bcd31d97953833f
+_md5_=7921a1f77f10248844e76694b29939ab
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 b029c4d2f111..f2d1e5265576 100644
--- a/metadata/md5-cache/media-fonts/oxygen-fonts-5.4.3
+++ b/metadata/md5-cache/media-fonts/oxygen-fonts-5.4.3
@@ -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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _md5_=c893d7400b2a58e8d303cf58232f583f
diff --git a/metadata/md5-cache/media-fonts/unifont-10.0.04 b/metadata/md5-cache/media-fonts/unifont-10.0.04
index 31b5226b0f17..133a493f78c8 100644
--- a/metadata/md5-cache/media-fonts/unifont-10.0.04
+++ b/metadata/md5-cache/media-fonts/unifont-10.0.04
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=utils? ( dev-lang/perl dev-perl/GD[png(-)] )
 SLOT=0
 SRC_URI=mirror://gnu/unifont/unifont-10.0.04/unifont-10.0.04.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b8c415ea35bbbbe34b66989ac73ca262
diff --git a/metadata/md5-cache/media-fonts/unifont-10.0.05 b/metadata/md5-cache/media-fonts/unifont-10.0.05
index e9c1a7a1e1e0..bb162b363f91 100644
--- a/metadata/md5-cache/media-fonts/unifont-10.0.05
+++ b/metadata/md5-cache/media-fonts/unifont-10.0.05
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=utils? ( dev-lang/perl dev-perl/GD[png(-)] )
 SLOT=0
 SRC_URI=mirror://gnu/unifont/unifont-10.0.05/unifont-10.0.05.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b8c415ea35bbbbe34b66989ac73ca262
diff --git a/metadata/md5-cache/media-fonts/unifont-10.0.06 b/metadata/md5-cache/media-fonts/unifont-10.0.06
index c8f134950f05..bfefe80496d0 100644
--- a/metadata/md5-cache/media-fonts/unifont-10.0.06
+++ b/metadata/md5-cache/media-fonts/unifont-10.0.06
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=utils? ( dev-lang/perl dev-perl/GD[png(-)] )
 SLOT=0
 SRC_URI=mirror://gnu/unifont/unifont-10.0.06/unifont-10.0.06.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8c5155ae32c823f511143162557e8234
diff --git a/metadata/md5-cache/media-fonts/unifont-9.0.06 b/metadata/md5-cache/media-fonts/unifont-9.0.06
index e0ca4f77103c..757ebb70f3fd 100644
--- a/metadata/md5-cache/media-fonts/unifont-9.0.06
+++ b/metadata/md5-cache/media-fonts/unifont-9.0.06
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=utils? ( dev-lang/perl dev-perl/GD[png(-)] )
 SLOT=0
 SRC_URI=mirror://gnu/unifont/unifont-9.0.06/unifont-9.0.06.tar.gz
-_eclasses_=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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ff554a7c787bb2c36640dccd69601079
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 4bde244b693d..43878652abd5 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/alembic-1.7.4 b/metadata/md5-cache/media-gfx/alembic-1.7.4
index 35b7342f7918..676133ce1c48 100644
--- a/metadata/md5-cache/media-gfx/alembic-1.7.4
+++ b/metadata/md5-cache/media-gfx/alembic-1.7.4
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/openexr-2.2.0-r2 hdf5? ( >=sci-libs/hdf5-1.8.18[zlib(+)] )
 REQUIRED_USE=python_targets_python2_7 hdf5? ( zlib ) pyalembic? ( boost )
 SLOT=0
 SRC_URI=https://github.com/alembic/alembic/archive/1.7.4.tar.gz -> alembic-1.7.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=666e1918f9a06509e2ad0af4102e3f6f
diff --git a/metadata/md5-cache/media-gfx/alembic-1.7.9 b/metadata/md5-cache/media-gfx/alembic-1.7.9
new file mode 100644
index 000000000000..d5046ee81e67
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/alembic-1.7.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=media-libs/openexr-2.2.0-r2:= boost? ( >=dev-libs/boost-1.65.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(+)] ) hdf5? ( >=sci-libs/hdf5-1.8.18[zlib(+)] ) python? ( >=dev-python/pyilmbase-2.2.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) zlib? ( >=sys-libs/zlib-1.2.11-r1 ) >=dev-util/cmake-3.9.6 doc? ( >=app-doc/doxygen-1.8.13-r1 ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Open framework for storing and sharing scene data
+EAPI=6
+HOMEPAGE=https://www.alembic.io/
+IUSE=arnold +boost doc examples hdf5 maya prman python test zlib python_targets_python2_7
+KEYWORDS=~amd64
+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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_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/openexr-2.2.0-r2:= boost? ( >=dev-libs/boost-1.65.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(+)] ) hdf5? ( >=sci-libs/hdf5-1.8.18[zlib(+)] ) python? ( >=dev-python/pyilmbase-2.2.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) zlib? ( >=sys-libs/zlib-1.2.11-r1 )
+REQUIRED_USE=python_targets_python2_7 hdf5? ( zlib ) python? ( boost )
+SLOT=0
+SRC_URI=https://github.com/alembic/alembic/archive/1.7.9.tar.gz -> alembic-1.7.9.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_=eb7c78471b067e59ac2a8331f340fcf5
diff --git a/metadata/md5-cache/media-gfx/arss-0.2.3-r1 b/metadata/md5-cache/media-gfx/arss-0.2.3-r1
index 5f201bce99d0..533f11316ace 100644
--- a/metadata/md5-cache/media-gfx/arss-0.2.3-r1
+++ b/metadata/md5-cache/media-gfx/arss-0.2.3-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=sci-libs/fftw:3.0=
 SLOT=0
 SRC_URI=mirror://sourceforge/arss/arss-0.2.3-src.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=eaf8e7b96ba637774bb59a80b2061b85
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 9afa34fe1eae..f6c22a66fff5 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
@@ -8,5 +8,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/media-gfx/blender-2.72b-r4 b/metadata/md5-cache/media-gfx/blender-2.72b-r4
index a2816b6e56a2..af6f02230781 100644
--- a/metadata/md5-cache/media-gfx/blender-2.72b-r4
+++ b/metadata/md5-cache/media-gfx/blender-2.72b-r4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec
 REQUIRED_USE=python_targets_python3_4 player? ( game-engine ) redcode? ( jpeg2k ffmpeg ) cycles? ( boost openexr tiff ) nls? ( boost ) colorio? ( boost ) openal? ( boost ) game-engine? ( boost ) ?? ( ffmpeg libav )
 SLOT=0
 SRC_URI=https://download.blender.org/source/blender-2.72b.tar.gz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e73c5287ca186e82f1cd2ebbac6e36df
diff --git a/metadata/md5-cache/media-gfx/blender-2.79 b/metadata/md5-cache/media-gfx/blender-2.79
index f7f176e0179f..0fb0c48d8d58 100644
--- a/metadata/md5-cache/media-gfx/blender-2.79
+++ b/metadata/md5-cache/media-gfx/blender-2.79
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) player? ( game-engine !headless ) cuda? ( cycles ) cycles? ( openexr tiff openimageio ) opencl? ( cycles ) osl? ( cycles llvm )
 SLOT=0
 SRC_URI=https://download.blender.org/source/blender-2.79.tar.gz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f698dbd8c598fdaab35bbebe25f187e6
diff --git a/metadata/md5-cache/media-gfx/blender-2.79-r1 b/metadata/md5-cache/media-gfx/blender-2.79-r1
index b5bd0443e94b..d18f70d7eae7 100644
--- a/metadata/md5-cache/media-gfx/blender-2.79-r1
+++ b/metadata/md5-cache/media-gfx/blender-2.79-r1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) player? ( game-engine !headless ) cuda? ( cycles ) cycles? ( openexr tiff openimageio ) opencl? ( cycles ) osl? ( cycles llvm )
 SLOT=0
 SRC_URI=https://download.blender.org/source/blender-2.79.tar.gz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b18e41fa23d7d1a38872f46f9a0507c8
diff --git a/metadata/md5-cache/media-gfx/blender-2.79b-r1 b/metadata/md5-cache/media-gfx/blender-2.79b-r1
index 6d0bf21716aa..8c6692a44213 100644
--- a/metadata/md5-cache/media-gfx/blender-2.79b-r1
+++ b/metadata/md5-cache/media-gfx/blender-2.79b-r1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) cuda? ( cycles ) cycles? ( openexr tiff openimageio ) opencl? ( cycles ) osl? ( cycles llvm ) player? ( game-engine !headless )
 SLOT=0
 SRC_URI=http://download.blender.org/source/blender-2.79b.tar.gz
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=5527a332fca424986f44614bbdcb7b47
diff --git a/metadata/md5-cache/media-gfx/cairosvg-1.0.22 b/metadata/md5-cache/media-gfx/cairosvg-1.0.22
index a60b7ad4dd09..90142dada74b 100644
--- a/metadata/md5-cache/media-gfx/cairosvg-1.0.22
+++ b/metadata/md5-cache/media-gfx/cairosvg-1.0.22
@@ -10,5 +10,5 @@ RDEPEND=dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/C/CairoSVG/CairoSVG-1.0.22.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8005a24f327165f84a10930d9b33add8
diff --git a/metadata/md5-cache/media-gfx/cairosvg-2.0.3 b/metadata/md5-cache/media-gfx/cairosvg-2.0.3
index 46ce3bbb2693..d32ffc009785 100644
--- a/metadata/md5-cache/media-gfx/cairosvg-2.0.3
+++ b/metadata/md5-cache/media-gfx/cairosvg-2.0.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/cairocffi[python_targets_python3_4(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/C/CairoSVG/CairoSVG-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=90129b80282a1439a6cf557405e45349
diff --git a/metadata/md5-cache/media-gfx/cellwriter-1.3.5 b/metadata/md5-cache/media-gfx/cellwriter-1.3.5
index 1bb6ff906c71..45b3ae8cd722 100644
--- a/metadata/md5-cache/media-gfx/cellwriter-1.3.5
+++ b/metadata/md5-cache/media-gfx/cellwriter-1.3.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXtst
 SLOT=0
 SRC_URI=http://pub.risujin.org/cellwriter/cellwriter-1.3.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=af912888824bef92bf04ee6214022af1
diff --git a/metadata/md5-cache/media-gfx/colorhug-client-0.2.8 b/metadata/md5-cache/media-gfx/colorhug-client-0.2.8
index 495cb0e71108..c35d6c992bbb 100644
--- a/metadata/md5-cache/media-gfx/colorhug-client-0.2.8
+++ b/metadata/md5-cache/media-gfx/colorhug-client-0.2.8
@@ -9,5 +9,5 @@ RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.31.10:2 >=dev-libs/libgusb-0.2.2 media
 RESTRICT=test
 SLOT=0
 SRC_URI=https://people.freedesktop.org/~hughsient/releases/colorhug-client-0.2.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f277d268733524fc864521272b1a064f
diff --git a/metadata/md5-cache/media-gfx/comix-4.0.4-r1 b/metadata/md5-cache/media-gfx/comix-4.0.4-r1
index 131d3331a1f7..aa3236d1b4dd 100644
--- a/metadata/md5-cache/media-gfx/comix-4.0.4-r1
+++ b/metadata/md5-cache/media-gfx/comix-4.0.4-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=mirror://sourceforge/comix/comix-4.0.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	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_=b3a4a006be8fb71e668641e95bbff046
diff --git a/metadata/md5-cache/media-gfx/converseen-0.9.6.2 b/metadata/md5-cache/media-gfx/converseen-0.9.6.2
index bddb05afb641..d2b81aacf7f0 100644
--- a/metadata/md5-cache/media-gfx/converseen-0.9.6.2
+++ b/metadata/md5-cache/media-gfx/converseen-0.9.6.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-gfx/imagemagick:=[cxx]
 SLOT=0
 SRC_URI=https://github.com/Faster3ck/Converseen/archive/v0.9.6.2.tar.gz -> converseen-0.9.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bde99fa6a535a7b8850f92c821594f5b
diff --git a/metadata/md5-cache/media-gfx/cura-3.3.1 b/metadata/md5-cache/media-gfx/cura-3.3.1
index 6690c2ff823d..bf02d3e604d0 100644
--- a/metadata/md5-cache/media-gfx/cura-3.3.1
+++ b/metadata/md5-cache/media-gfx/cura-3.3.1
@@ -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=0
 SRC_URI=https://github.com/Ultimaker/Cura/archive/3.3.1.tar.gz -> cura-3.3.1.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	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_=3af1fa8b486d04cb63387525f01e44e6
diff --git a/metadata/md5-cache/media-gfx/cura-3.4.1 b/metadata/md5-cache/media-gfx/cura-3.4.1
index 80d1cbf4410e..1bfa35133a26 100644
--- a/metadata/md5-cache/media-gfx/cura-3.4.1
+++ b/metadata/md5-cache/media-gfx/cura-3.4.1
@@ -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=0
 SRC_URI=https://github.com/Ultimaker/Cura/archive/3.4.1.tar.gz -> cura-3.4.1.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	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_=b167dcceab2369bd8a72479103147770
diff --git a/metadata/md5-cache/media-gfx/curaengine-3.3.0 b/metadata/md5-cache/media-gfx/curaengine-3.3.0
index db1372d1abad..7f8223f0768f 100644
--- a/metadata/md5-cache/media-gfx/curaengine-3.3.0
+++ b/metadata/md5-cache/media-gfx/curaengine-3.3.0
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=~dev-libs/libarcus-3.3.0:* dev-libs/protobuf
 SLOT=0
 SRC_URI=https://github.com/Ultimaker/CuraEngine/archive/3.3.0.tar.gz -> curaengine-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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=50f23c01d33fb376d09d7e06bb4d9055
diff --git a/metadata/md5-cache/media-gfx/curaengine-3.4.1 b/metadata/md5-cache/media-gfx/curaengine-3.4.1
index 3dc3339de962..4fdecd67e6c5 100644
--- a/metadata/md5-cache/media-gfx/curaengine-3.4.1
+++ b/metadata/md5-cache/media-gfx/curaengine-3.4.1
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=~dev-libs/libarcus-3.4.1:* dev-libs/protobuf
 SLOT=0
 SRC_URI=https://github.com/Ultimaker/CuraEngine/archive/3.4.1.tar.gz -> curaengine-3.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=50f23c01d33fb376d09d7e06bb4d9055
diff --git a/metadata/md5-cache/media-gfx/darktable-2.2.5 b/metadata/md5-cache/media-gfx/darktable-2.2.5
index 30c37ff5b973..c8cdf69a8134 100644
--- a/metadata/md5-cache/media-gfx/darktable-2.2.5
+++ b/metadata/md5-cache/media-gfx/darktable-2.2.5
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 dev-libs/pugixml:0
 REQUIRED_USE=cpu_flags_x86_sse3
 SLOT=0
 SRC_URI=https://github.com/darktable-org/darktable/releases/download/release-2.2.5/darktable-2.2.5.tar.xz doc? ( https://github.com/darktable-org/darktable/releases/download/release-2.2.0/darktable-usermanual.pdf -> darktable-usermanual-2.2.0.pdf )
-_eclasses_=cmake-utils	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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=62b8a220b3d54a66a6203b2dbb03eaca
diff --git a/metadata/md5-cache/media-gfx/darktable-2.4.3 b/metadata/md5-cache/media-gfx/darktable-2.4.3
index e15762af69f0..b9a0c303feb1 100644
--- a/metadata/md5-cache/media-gfx/darktable-2.4.3
+++ b/metadata/md5-cache/media-gfx/darktable-2.4.3
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 dev-libs/pugixml:0
 REQUIRED_USE=cpu_flags_x86_sse3
 SLOT=0
 SRC_URI=https://github.com/darktable-org/darktable/releases/download/release-2.4.3/darktable-2.4.3.tar.xz doc? ( https://github.com/darktable-org/darktable/releases/download/release-2.4.0/darktable-usermanual.pdf -> darktable-usermanual-2.4.0.pdf )
-_eclasses_=cmake-utils	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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dd969eb3ce4d1dd3aa98cc2e648872bb
diff --git a/metadata/md5-cache/media-gfx/darktable-2.4.4 b/metadata/md5-cache/media-gfx/darktable-2.4.4
index 836c9b2a418c..dab9aced09c5 100644
--- a/metadata/md5-cache/media-gfx/darktable-2.4.4
+++ b/metadata/md5-cache/media-gfx/darktable-2.4.4
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 dev-libs/pugixml:0
 REQUIRED_USE=cpu_flags_x86_sse3
 SLOT=0
 SRC_URI=https://github.com/darktable-org/darktable/releases/download/release-2.4.4/darktable-2.4.4.tar.xz doc? ( https://github.com/darktable-org/darktable/releases/download/release-2.4.0/darktable-usermanual.pdf -> darktable-usermanual-2.4.0.pdf )
-_eclasses_=cmake-utils	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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=427b4ae3b313c363312118f9c8218068
diff --git a/metadata/md5-cache/media-gfx/darktable-9999 b/metadata/md5-cache/media-gfx/darktable-9999
index d00a8ff794cb..9ab213597506 100644
--- a/metadata/md5-cache/media-gfx/darktable-9999
+++ b/metadata/md5-cache/media-gfx/darktable-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3 CC-BY-3.0
 RDEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 dev-libs/pugixml:0= gnome-base/librsvg:2 >=media-gfx/exiv2-0.25-r2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3:0= media-libs/libpng:0= media-libs/tiff:0 net-libs/libsoup:2.4 net-misc/curl sys-libs/zlib:= virtual/jpeg:0 x11-libs/cairo >=x11-libs/gtk+-3.14:3 x11-libs/pango colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:2= ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) webp? ( media-libs/libwebp:0= ) kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
 REQUIRED_USE=cpu_flags_x86_sse3
 SLOT=0
-_eclasses_=cmake-utils	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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0663165c7b81d702752d61113247bffa
diff --git a/metadata/md5-cache/media-gfx/digikam-5.9.0 b/metadata/md5-cache/media-gfx/digikam-5.9.0
index 15874eb36e9d..07d9e7c56114 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] ) mysql? ( virtual/mysql[server] ) 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.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
 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] ) mysql? ( virtual/mysql[server] ) 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 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.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
 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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=79a333fa935520289fbfcbfea492e911
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/displaycal-3.5.3.0 b/metadata/md5-cache/media-gfx/displaycal-3.5.3.0
index a9aae5c06a70..bdaae9d29944 100644
--- a/metadata/md5-cache/media-gfx/displaycal-3.5.3.0
+++ b/metadata/md5-cache/media-gfx/displaycal-3.5.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=media-gfx/argyllcms-1.1.0 dev-python/wxpython:3.0 >=x11-libs/libX11-1.
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/dispcalgui/DisplayCAL-3.5.3.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	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bcf17d92dfb17e2638fab311133ebd33
diff --git a/metadata/md5-cache/media-gfx/displaycal-3.6.0.0 b/metadata/md5-cache/media-gfx/displaycal-3.6.0.0
index d6f7a5f4c6bd..9f2b43569c03 100644
--- a/metadata/md5-cache/media-gfx/displaycal-3.6.0.0
+++ b/metadata/md5-cache/media-gfx/displaycal-3.6.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=media-gfx/argyllcms-1.1.0 dev-python/wxpython:3.0 >=x11-libs/libX11-1.
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/dispcalgui/DisplayCAL-3.6.0.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	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bcf17d92dfb17e2638fab311133ebd33
diff --git a/metadata/md5-cache/media-gfx/displaycal-3.6.1.1 b/metadata/md5-cache/media-gfx/displaycal-3.6.1.1
index 51b681c57825..e66a54e08d33 100644
--- a/metadata/md5-cache/media-gfx/displaycal-3.6.1.1
+++ b/metadata/md5-cache/media-gfx/displaycal-3.6.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-gfx/argyllcms-1.1.0 dev-python/wxpython:3.0 >=x11-libs/libX11-1.
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/dispcalgui/DisplayCAL-3.6.1.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	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bcf17d92dfb17e2638fab311133ebd33
diff --git a/metadata/md5-cache/media-gfx/displaycal-3.6.2.0 b/metadata/md5-cache/media-gfx/displaycal-3.6.2.0
index 6138d21447b3..11a694991bdc 100644
--- a/metadata/md5-cache/media-gfx/displaycal-3.6.2.0
+++ b/metadata/md5-cache/media-gfx/displaycal-3.6.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=media-gfx/argyllcms-1.1.0 dev-python/wxpython:3.0 >=x11-libs/libX11-1.
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/dispcalgui/DisplayCAL-3.6.2.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	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bcf17d92dfb17e2638fab311133ebd33
diff --git a/metadata/md5-cache/media-gfx/enblend-4.2.0_p20161007-r1 b/metadata/md5-cache/media-gfx/enblend-4.2.0_p20161007-r1
index 12c61bb70c0e..261086f12e72 100644
--- a/metadata/md5-cache/media-gfx/enblend-4.2.0_p20161007-r1
+++ b/metadata/md5-cache/media-gfx/enblend-4.2.0_p20161007-r1
@@ -10,5 +10,5 @@ RDEPEND=media-libs/lcms:2 media-libs/openexr:= media-libs/tiff:0 media-libs/vigr
 REQUIRED_USE=tcmalloc? ( !debug )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~soap/distfiles/enblend-4.2.0_p20161007.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=72cf3edd82a3aa547b6b945d09bca575
diff --git a/metadata/md5-cache/media-gfx/engauge-10.6 b/metadata/md5-cache/media-gfx/engauge-10.6
index 082c56be3498..8303ea00d4a5 100644
--- a/metadata/md5-cache/media-gfx/engauge-10.6
+++ b/metadata/md5-cache/media-gfx/engauge-10.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-libs/log4cpp sci-libs/fftw:3.0 jpeg2k? ( media-libs/openjpeg:2 ) pdf? ( app-text/poppler[qt5] )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/media-gfx/entangle-0.6.0 b/metadata/md5-cache/media-gfx/entangle-0.6.0
index d3be8069df77..29655f499037 100644
--- a/metadata/md5-cache/media-gfx/entangle-0.6.0
+++ b/metadata/md5-cache/media-gfx/entangle-0.6.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.26:2 >=x11-libs/gdk-pixbuf-2.12.0:2 >=x11-libs/gtk+-3.3.18:3[introspection] virtual/libgudev:= >=dev-libs/dbus-glib-0.60 >=dev-libs/gobject-introspection-0.9.3 >=media-libs/libgphoto2-2.4.11:= media-libs/lcms:2 >=dev-libs/libpeas-1.2.0[gtk] >=media-libs/gexiv2-0.4[introspection] >=x11-libs/libXext-1.3.0 >=x11-themes/gnome-icon-theme-symbolic-3.0.0 >=media-libs/libraw-0.9.0
 SLOT=0
 SRC_URI=http://entangle-photo.org/download/sources/entangle-0.6.0.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=8cea6bec186df76a8a7690c0a2b76db7
diff --git a/metadata/md5-cache/media-gfx/eog-3.24.1 b/metadata/md5-cache/media-gfx/eog-3.24.1
index 095b958a92f0..beac1b855d9c 100644
--- a/metadata/md5-cache/media-gfx/eog-3.24.1
+++ b/metadata/md5-cache/media-gfx/eog-3.24.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.42.0:2[dbus] >=dev-libs/libpeas-0.7.4:=[gtk] >=gnome-b
 REQUIRED_USE=exif? ( jpeg )
 SLOT=1
 SRC_URI=mirror://gnome/sources/eog/3.24/eog-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=81156550cc45e0ea4f82ff84079c857e
diff --git a/metadata/md5-cache/media-gfx/eog-3.26.2 b/metadata/md5-cache/media-gfx/eog-3.26.2
index 67ded0f635b7..fb96d0810adb 100644
--- a/metadata/md5-cache/media-gfx/eog-3.26.2
+++ b/metadata/md5-cache/media-gfx/eog-3.26.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.42.0:2[dbus] >=dev-libs/libpeas-0.7.4:=[gtk] >=gnome-b
 REQUIRED_USE=exif? ( jpeg )
 SLOT=1
 SRC_URI=mirror://gnome/sources/eog/3.26/eog-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a48226865b7a501ce3efb90eb879d4b5
diff --git a/metadata/md5-cache/media-gfx/eog-plugins-3.16.6-r1 b/metadata/md5-cache/media-gfx/eog-plugins-3.16.6-r1
index bae24db2c6f4..5145a101bc95 100644
--- a/metadata/md5-cache/media-gfx/eog-plugins-3.16.6-r1
+++ b/metadata/md5-cache/media-gfx/eog-plugins-3.16.6-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/libpeas-0.7.4:= >=media-gfx/eog-3.15.9
 REQUIRED_USE=map? ( exif ) python? ( ^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/eog-plugins/3.16/eog-plugins-3.16.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8e7eedf9faa66e0f6b9a22679e400a8e
diff --git a/metadata/md5-cache/media-gfx/eog-plugins-3.26.3 b/metadata/md5-cache/media-gfx/eog-plugins-3.26.3
index 35f56b89d5d3..de674272b4b6 100644
--- a/metadata/md5-cache/media-gfx/eog-plugins-3.26.3
+++ b/metadata/md5-cache/media-gfx/eog-plugins-3.26.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/libpeas-0.7.4:= >=media-gfx/eog-3.15.9
 REQUIRED_USE=map? ( exif ) python? ( ^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/eog-plugins/3.26/eog-plugins-3.26.3.tar.xz
-_eclasses_=desktop	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=24b7a7a55af46e61697119cc23568696
diff --git a/metadata/md5-cache/media-gfx/eom-1.12.2-r3 b/metadata/md5-cache/media-gfx/eom-1.12.2-r3
deleted file mode 100644
index 516b1e473276..000000000000
--- a/metadata/md5-cache/media-gfx/eom-1.12.2-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2:2 gnome-base/dconf:0 >=mate-base/mate-desktop-1.9.1[gtk3(-)=] sys-libs/zlib:0 x11-libs/cairo:0 >=x11-libs/gdk-pixbuf-2.4:2[introspection?,jpeg?,tiff?] x11-libs/libX11:0 >=x11-misc/shared-mime-info-0.20:0 virtual/libintl:0 dbus? ( >=dev-libs/dbus-glib-0.71:0 ) exif? ( >=media-libs/libexif-0.6.14:0 virtual/jpeg:0 ) !gtk3? ( >=x11-libs/gtk+-2.18:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms: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/pygobject-2.15.1:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_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.13:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) svg? ( >=gnome-base/librsvg-2.36.2:2 ) xmp? ( >=media-libs/exempi-1.99.5:2 ) !!media-gfx/mate-image-viewer app-text/yelp-tools:0 dev-util/gtk-doc dev-util/gtk-doc-am >=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.12
-DESCRIPTION=The MATE image viewer
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X debug dbus exif gtk3 +introspection jpeg lcms python svg tiff xmp python_targets_python2_7
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2:2 gnome-base/dconf:0 >=mate-base/mate-desktop-1.9.1[gtk3(-)=] sys-libs/zlib:0 x11-libs/cairo:0 >=x11-libs/gdk-pixbuf-2.4:2[introspection?,jpeg?,tiff?] x11-libs/libX11:0 >=x11-misc/shared-mime-info-0.20:0 virtual/libintl:0 dbus? ( >=dev-libs/dbus-glib-0.71:0 ) exif? ( >=media-libs/libexif-0.6.14:0 virtual/jpeg:0 ) !gtk3? ( >=x11-libs/gtk+-2.18:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms: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/pygobject-2.15.1:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_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.13:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) svg? ( >=gnome-base/librsvg-2.36.2:2 ) xmp? ( >=media-libs/exempi-1.99.5:2 ) !!media-gfx/mate-image-viewer
-REQUIRED_USE=gtk3? ( !python ) python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/eom-1.12.2.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=250fe091b563d2753e7a814edff1a0e3
diff --git a/metadata/md5-cache/media-gfx/eom-1.14.2 b/metadata/md5-cache/media-gfx/eom-1.14.2
deleted file mode 100644
index cd3931165ffa..000000000000
--- a/metadata/md5-cache/media-gfx/eom-1.14.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2:2 gnome-base/dconf:0 >=mate-base/mate-desktop-1.9.1[gtk3(-)=] sys-libs/zlib:0 x11-libs/cairo:0 >=x11-libs/gdk-pixbuf-2.4:2[introspection?,jpeg?,tiff?] x11-libs/libX11:0 >=x11-misc/shared-mime-info-0.20:0 virtual/libintl:0 dbus? ( >=dev-libs/dbus-glib-0.71:0 ) exif? ( >=media-libs/libexif-0.6.14:0 virtual/jpeg:0 ) !gtk3? ( >=x11-libs/gtk+-2.18:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms: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/pygobject-2.15.1:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_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.13:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) svg? ( >=gnome-base/librsvg-2.36.2:2 ) xmp? ( >=media-libs/exempi-1.99.5:2 ) !!media-gfx/mate-image-viewer app-text/yelp-tools:0 dev-util/gtk-doc dev-util/gtk-doc-am >=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.14
-DESCRIPTION=The MATE image viewer
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X debug dbus exif gtk3 +introspection jpeg lcms python svg tiff xmp python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2:2 gnome-base/dconf:0 >=mate-base/mate-desktop-1.9.1[gtk3(-)=] sys-libs/zlib:0 x11-libs/cairo:0 >=x11-libs/gdk-pixbuf-2.4:2[introspection?,jpeg?,tiff?] x11-libs/libX11:0 >=x11-misc/shared-mime-info-0.20:0 virtual/libintl:0 dbus? ( >=dev-libs/dbus-glib-0.71:0 ) exif? ( >=media-libs/libexif-0.6.14:0 virtual/jpeg:0 ) !gtk3? ( >=x11-libs/gtk+-2.18:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms: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/pygobject-2.15.1:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_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.13:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) svg? ( >=gnome-base/librsvg-2.36.2:2 ) xmp? ( >=media-libs/exempi-1.99.5:2 ) !!media-gfx/mate-image-viewer
-REQUIRED_USE=gtk3? ( !python ) python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.14/eom-1.14.2.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=849a9c1ef99dca0c107f8cb374905cca
diff --git a/metadata/md5-cache/media-gfx/eom-1.16.1 b/metadata/md5-cache/media-gfx/eom-1.16.1
deleted file mode 100644
index 041e2437bcbf..000000000000
--- a/metadata/md5-cache/media-gfx/eom-1.16.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2:2 gnome-base/dconf:0 >=mate-base/mate-desktop-1.9.1[gtk3(-)=] sys-libs/zlib:0 x11-libs/cairo:0 >=x11-libs/gdk-pixbuf-2.4:2[introspection?,jpeg?,tiff?] x11-libs/libX11:0 >=x11-misc/shared-mime-info-0.20:0 virtual/libintl:0 dbus? ( >=dev-libs/dbus-glib-0.71:0 ) exif? ( >=media-libs/libexif-0.6.14:0 virtual/jpeg:0 ) !gtk3? ( >=x11-libs/gtk+-2.18:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms: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/pygobject-2.15.1:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_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.13:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) svg? ( >=gnome-base/librsvg-2.36.2:2 ) xmp? ( >=media-libs/exempi-1.99.5:2 ) !!media-gfx/mate-image-viewer app-text/yelp-tools:0 dev-util/gtk-doc dev-util/gtk-doc-am >=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.16
-DESCRIPTION=The MATE image viewer
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X debug dbus exif gtk3 +introspection jpeg lcms python svg tiff xmp python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2:2 gnome-base/dconf:0 >=mate-base/mate-desktop-1.9.1[gtk3(-)=] sys-libs/zlib:0 x11-libs/cairo:0 >=x11-libs/gdk-pixbuf-2.4:2[introspection?,jpeg?,tiff?] x11-libs/libX11:0 >=x11-misc/shared-mime-info-0.20:0 virtual/libintl:0 dbus? ( >=dev-libs/dbus-glib-0.71:0 ) exif? ( >=media-libs/libexif-0.6.14:0 virtual/jpeg:0 ) !gtk3? ( >=x11-libs/gtk+-2.18:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms: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/pygobject-2.15.1:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_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.13:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) svg? ( >=gnome-base/librsvg-2.36.2:2 ) xmp? ( >=media-libs/exempi-1.99.5:2 ) !!media-gfx/mate-image-viewer
-REQUIRED_USE=gtk3? ( !python ) python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/eom-1.16.1.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=198ae8b0ad4aa5b01d9e9629d3e6786a
diff --git a/metadata/md5-cache/media-gfx/eom-1.18.3 b/metadata/md5-cache/media-gfx/eom-1.18.3
index 0bbab139efb6..673da069d4f8 100644
--- a/metadata/md5-cache/media-gfx/eom-1.18.3
+++ b/metadata/md5-cache/media-gfx/eom-1.18.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libpeas-1.2.0[gtk] >=dev-libs/libxml2-2:2 gnome-base/dconf:0 >=mate-base/mate-desktop-1.17.0 sys-libs/zlib:0 x11-libs/cairo:0 >=x11-libs/gdk-pixbuf-2.4:2[introspection?,jpeg?,tiff?] >=x11-libs/gtk+-3.14:3[introspection?] x11-libs/libX11:0 >=x11-misc/shared-mime-info-0.20:0 virtual/libintl:0 dbus? ( >=dev-libs/dbus-glib-0.71:0 ) exif? ( >=media-libs/libexif-0.6.14:0 virtual/jpeg:0 ) introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) svg? ( >=gnome-base/librsvg-2.36.2:2 ) xmp? ( >=media-libs/exempi-1.99.5:2 ) !!media-gfx/mate-image-viewer
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.18/eom-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cc8ac04b4150da428ccacfd87afad19f
diff --git a/metadata/md5-cache/media-gfx/exiv2-0.26_p20180319 b/metadata/md5-cache/media-gfx/exiv2-0.26_p20180319
index 8bff5db37ff2..a977ed77ce05 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _md5_=1b85fe07c2a5ee400ac28909b7948ff4
diff --git a/metadata/md5-cache/media-gfx/exiv2-0.26_p20180811-r2 b/metadata/md5-cache/media-gfx/exiv2-0.26_p20180811-r2
deleted file mode 100644
index fefa4c35708e..000000000000
--- a/metadata/md5-cache/media-gfx/exiv2-0.26_p20180811-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=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(-)?] ) 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 ) app-doc/doxygen dev-libs/libxslt media-gfx/graphviz virtual/pkgconfig ) nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=EXIF, IPTC and XMP metadata C++ library and command line utility
-EAPI=6
-HOMEPAGE=http://www.exiv2.org/
-IUSE=doc examples nls png webready xmp abi_x86_32 abi_x86_64 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-solaris ~x86-solaris
-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_p20180811c.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=a50cced16edfb04aa6d17bdb29653011
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 ff8233fe8fcc..cc13439e9917 100644
--- a/metadata/md5-cache/media-gfx/exiv2-0.26_p20180811-r3
+++ b/metadata/md5-cache/media-gfx/exiv2-0.26_p20180811-r3
@@ -4,10 +4,10 @@ DESCRIPTION=EXIF, IPTC and XMP metadata C++ library and command line utility
 EAPI=6
 HOMEPAGE=http://www.exiv2.org/
 IUSE=doc examples nls png webready xmp abi_x86_32 abi_x86_64 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-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-solaris ~x86-solaris
 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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=aa0692ca1f7501f92ff2615b611cef30
+_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
+_md5_=dd05115205b3a7157d534bee065138f6
diff --git a/metadata/md5-cache/media-gfx/fdm-materials-3.3.0 b/metadata/md5-cache/media-gfx/fdm-materials-3.3.0
index 5df59f72d830..5ba1de246709 100644
--- a/metadata/md5-cache/media-gfx/fdm-materials-3.3.0
+++ b/metadata/md5-cache/media-gfx/fdm-materials-3.3.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=CC0-1.0
 SLOT=0
 SRC_URI=https://github.com/Ultimaker/fdm_materials/archive/3.3.0.tar.gz -> fdm-materials-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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=2553485f31b25b30230860237b28ee61
diff --git a/metadata/md5-cache/media-gfx/fdm-materials-3.4.1 b/metadata/md5-cache/media-gfx/fdm-materials-3.4.1
index 73a17807d32d..e23c47771d22 100644
--- a/metadata/md5-cache/media-gfx/fdm-materials-3.4.1
+++ b/metadata/md5-cache/media-gfx/fdm-materials-3.4.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=CC0-1.0
 SLOT=0
 SRC_URI=https://github.com/Ultimaker/fdm_materials/archive/3.4.1.tar.gz -> fdm-materials-3.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=2553485f31b25b30230860237b28ee61
diff --git a/metadata/md5-cache/media-gfx/feh-2.26.4 b/metadata/md5-cache/media-gfx/feh-2.26.4
index 1539b70f38d3..abb35a665e97 100644
--- a/metadata/md5-cache/media-gfx/feh-2.26.4
+++ b/metadata/md5-cache/media-gfx/feh-2.26.4
@@ -9,5 +9,5 @@ LICENSE=feh
 RDEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) virtual/jpeg:0
 SLOT=0
 SRC_URI=https://feh.finalrewind.org/feh-2.26.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1d5a25568585bce010cae28fd29a5096
diff --git a/metadata/md5-cache/media-gfx/feh-2.27 b/metadata/md5-cache/media-gfx/feh-2.27
index 7c5de0bdb982..de50f760dd0b 100644
--- a/metadata/md5-cache/media-gfx/feh-2.27
+++ b/metadata/md5-cache/media-gfx/feh-2.27
@@ -9,5 +9,5 @@ LICENSE=feh
 RDEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) virtual/jpeg:0
 SLOT=0
 SRC_URI=https://feh.finalrewind.org/feh-2.27.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1d5a25568585bce010cae28fd29a5096
diff --git a/metadata/md5-cache/media-gfx/feh-2.28 b/metadata/md5-cache/media-gfx/feh-2.28
index d700b2a89274..6665340a4192 100644
--- a/metadata/md5-cache/media-gfx/feh-2.28
+++ b/metadata/md5-cache/media-gfx/feh-2.28
@@ -9,5 +9,5 @@ LICENSE=feh
 RDEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) virtual/jpeg:0
 SLOT=0
 SRC_URI=https://feh.finalrewind.org/feh-2.28.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1d5a25568585bce010cae28fd29a5096
diff --git a/metadata/md5-cache/media-gfx/fontforge-20170731-r3 b/metadata/md5-cache/media-gfx/fontforge-20170731-r3
index 2911bb76ff9d..51f05994bb4e 100644
--- a/metadata/md5-cache/media-gfx/fontforge-20170731-r3
+++ b/metadata/md5-cache/media-gfx/fontforge-20170731-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=cairo? ( png ) python? ( ^^ ( python_single_target_python2_7 python
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fontforge/fontforge/releases/download/20170731/fontforge-dist-20170731.tar.xz
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=27ff044f6754e1729533d379045aaad2
diff --git a/metadata/md5-cache/media-gfx/fontforge-20170731-r4 b/metadata/md5-cache/media-gfx/fontforge-20170731-r4
index 1bd3d553d042..aeadfdead98f 100644
--- a/metadata/md5-cache/media-gfx/fontforge-20170731-r4
+++ b/metadata/md5-cache/media-gfx/fontforge-20170731-r4
@@ -11,5 +11,5 @@ REQUIRED_USE=cairo? ( png ) python? ( ^^ ( python_single_target_python2_7 python
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fontforge/fontforge/releases/download/20170731/fontforge-dist-20170731.tar.xz
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=02a01ccdf8e07fe14470cdc2ba36db3a
diff --git a/metadata/md5-cache/media-gfx/fontypython-0.4.4-r3 b/metadata/md5-cache/media-gfx/fontypython-0.4.4-r3
index d2551760ff08..bf86196229eb 100644
--- a/metadata/md5-cache/media-gfx/fontypython-0.4.4-r3
+++ b/metadata/md5-cache/media-gfx/fontypython-0.4.4-r3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://nongnu/fontypython/fontypython-0.4.4.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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=00091d0198d57f6ad0577c6702314e01
diff --git a/metadata/md5-cache/media-gfx/fotowall-1.0 b/metadata/md5-cache/media-gfx/fotowall-1.0
index 4bfd06c9eedc..f86173fc3270 100644
--- a/metadata/md5-cache/media-gfx/fotowall-1.0
+++ b/metadata/md5-cache/media-gfx/fotowall-1.0
@@ -10,4 +10,4 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:
 SLOT=0
 SRC_URI=https://github.com/enricoros/fotowall/archive/v1.0.tar.gz -> fotowall-1.0.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=7638689845d50f33eef92a55a66e67bf
+_md5_=bf9a7517e9e9a63df31b91a7e3df5c13
diff --git a/metadata/md5-cache/media-gfx/fotoxx-15.05 b/metadata/md5-cache/media-gfx/fotoxx-15.05
index e24b1387ecb5..a0993630994a 100644
--- a/metadata/md5-cache/media-gfx/fotoxx-15.05
+++ b/metadata/md5-cache/media-gfx/fotoxx-15.05
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/libpng media-libs/tiff media-libs/lcms:2 x11-libs/gtk+:3 media-gfx/ufraw[gtk] media-gfx/dcraw media-libs/exiftool x11-misc/xdg-utils
 SLOT=0
 SRC_URI=http://www.kornelix.com/uploads/1/3/0/3/13035936/fotoxx-15.05.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ac1a1ba81af56e9c60b7fc57c7d57f89
diff --git a/metadata/md5-cache/media-gfx/freepv-0.3.0-r5 b/metadata/md5-cache/media-gfx/freepv-0.3.0-r5
index a558ac67f379..3caabfe52b9c 100644
--- a/metadata/md5-cache/media-gfx/freepv-0.3.0-r5
+++ b/metadata/md5-cache/media-gfx/freepv-0.3.0-r5
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libxml2 media-libs/libpng:0= media-libs/freeglut sys-libs/zlib virtual/jpeg:0 x11-libs/libXmu x11-libs/libXt x11-libs/libXxf86vm
 SLOT=0
 SRC_URI=mirror://sourceforge/freepv/freepv-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2f1629f01ac543dedeb31d359f697c00
diff --git a/metadata/md5-cache/media-gfx/frogr-1.3 b/metadata/md5-cache/media-gfx/frogr-1.3
index 4f08d6404e84..4f3500cb757e 100644
--- a/metadata/md5-cache/media-gfx/frogr-1.3
+++ b/metadata/md5-cache/media-gfx/frogr-1.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/json-glib-0.12 >=x11-libs/gtk+-3.10:3[introspection] >=media-libs/libexif-0.6.14 >=dev-libs/libxml2-2.6.8:2 media-libs/gstreamer:1.0 >=net-libs/libsoup-2.34:2.4 >=dev-libs/libgcrypt-1.5:*
 SLOT=0
 SRC_URI=mirror://gnome/sources/frogr/1.3/frogr-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8ffeb86141cce48daeeca82dd0e687af
diff --git a/metadata/md5-cache/media-gfx/geeqie-1.4-r1 b/metadata/md5-cache/media-gfx/geeqie-1.4-r1
index b1fb7ffdd898..d1c0a8862e45 100644
--- a/metadata/md5-cache/media-gfx/geeqie-1.4-r1
+++ b/metadata/md5-cache/media-gfx/geeqie-1.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A lightweight GTK image viewer forked from GQview
 EAPI=6
 HOMEPAGE=http://www.geeqie.org
 IUSE=debug doc exif ffmpegthumbnailer gpu-accel gtk3 jpeg lcms lirc lua map tiff xmp
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) virtual/libintl doc? ( app-text/gnome-doc-utils ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) gpu-accel? ( media-libs/clutter-gtk ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) lirc? ( app-misc/lirc ) lua? ( >=dev-lang/lua-5.1:= ) map? ( media-libs/libchamplain:0.12 ) xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) ) tiff? ( media-libs/tiff:0 )
 REQUIRED_USE=gpu-accel? ( gtk3 ) map? ( gpu-accel )
 SLOT=0
 SRC_URI=http://www.geeqie.org/geeqie-1.4.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=460701e10dbc23d90f868594eafbbd05
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=590c3a11508598984dcba4286aa8d5a6
diff --git a/metadata/md5-cache/media-gfx/gimp-2.10.2 b/metadata/md5-cache/media-gfx/gimp-2.10.2
index 09960ce7c6b8..e3b410cdd08a 100644
--- a/metadata/md5-cache/media-gfx/gimp-2.10.2
+++ b/metadata/md5-cache/media-gfx/gimp-2.10.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.54.2:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=2
 SRC_URI=mirror://gimp/v2.10/gimp-2.10.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=89f39ce82d3321330656cb9ca8127c66
diff --git a/metadata/md5-cache/media-gfx/gimp-2.10.4 b/metadata/md5-cache/media-gfx/gimp-2.10.4
index 448518bd9926..9096b63fce4f 100644
--- a/metadata/md5-cache/media-gfx/gimp-2.10.4
+++ b/metadata/md5-cache/media-gfx/gimp-2.10.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.54.2:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=2
 SRC_URI=mirror://gimp/v2.10/gimp-2.10.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8f01d3da1af0bb47b9f17d459008e4b2
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 de4f3bbd5ad9..6db4817a8f6b 100644
--- a/metadata/md5-cache/media-gfx/gimp-2.10.6-r1
+++ b/metadata/md5-cache/media-gfx/gimp-2.10.6-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.56.0:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/media-gfx/gimp-2.8.22-r1 b/metadata/md5-cache/media-gfx/gimp-2.8.22-r1
index 2e8a6b5aae1e..823e080d1b6a 100644
--- a/metadata/md5-cache/media-gfx/gimp-2.8.22-r1
+++ b/metadata/md5-cache/media-gfx/gimp-2.8.22-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.30.2:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=2
 SRC_URI=mirror://gimp/v2.8/gimp-2.8.22.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	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_=dc755f6e425c6a1f28db4eb42c931c29
diff --git a/metadata/md5-cache/media-gfx/gimp-2.9.8-r1 b/metadata/md5-cache/media-gfx/gimp-2.9.8-r1
index b7829ce3083b..d5b5feef0725 100644
--- a/metadata/md5-cache/media-gfx/gimp-2.9.8-r1
+++ b/metadata/md5-cache/media-gfx/gimp-2.9.8-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=2
 SRC_URI=mirror://gimp/v2.9/gimp-2.9.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d4638154917415a55c1c2e441aedd59c
diff --git a/metadata/md5-cache/media-gfx/gimp-9999 b/metadata/md5-cache/media-gfx/gimp-9999
index 9df7a49d5cd7..d28f4375c5ad 100644
--- a/metadata/md5-cache/media-gfx/gimp-9999
+++ b/metadata/md5-cache/media-gfx/gimp-9999
@@ -8,5 +8,5 @@ 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:= )
 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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=c2201de72b3c235e224c64b82720a902
+_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
diff --git a/metadata/md5-cache/media-gfx/gmic-1.7.8 b/metadata/md5-cache/media-gfx/gmic-1.7.8
index b44ba259b56b..7ccda1c1cf50 100644
--- a/metadata/md5-cache/media-gfx/gmic-1.7.8
+++ b/metadata/md5-cache/media-gfx/gmic-1.7.8
@@ -10,5 +10,5 @@ RDEPEND=fftw? ( sci-libs/fftw:3.0[threads] ) gimp? ( >=media-gfx/gimp-2.4.0 ) gr
 REQUIRED_USE=|| ( cli gimp )
 SLOT=0
 SRC_URI=http://gmic.eu/files/source/gmic_1.7.8.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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_=a3c970e79721c90d2a94a6f95a378f18
diff --git a/metadata/md5-cache/media-gfx/gmic-1.7.9 b/metadata/md5-cache/media-gfx/gmic-1.7.9
index 824520115c5f..456dbdc9b8e9 100644
--- a/metadata/md5-cache/media-gfx/gmic-1.7.9
+++ b/metadata/md5-cache/media-gfx/gmic-1.7.9
@@ -10,5 +10,5 @@ RDEPEND=fftw? ( sci-libs/fftw:3.0[threads] ) gimp? ( >=media-gfx/gimp-2.4.0 ) gr
 REQUIRED_USE=|| ( cli gimp )
 SLOT=0
 SRC_URI=http://gmic.eu/files/source/gmic_1.7.9.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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_=14edb3dbd9fe56f5c13171dc108249aa
diff --git a/metadata/md5-cache/media-gfx/gmic-2.0.0 b/metadata/md5-cache/media-gfx/gmic-2.0.0
index d39857df1268..ba118ca35187 100644
--- a/metadata/md5-cache/media-gfx/gmic-2.0.0
+++ b/metadata/md5-cache/media-gfx/gmic-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=fftw? ( sci-libs/fftw:3.0[threads] ) gimp? ( >=media-gfx/gimp-2.4.0 ) gr
 REQUIRED_USE=|| ( cli gimp )
 SLOT=0
 SRC_URI=http://gmic.eu/files/source/gmic_2.0.0.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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_=5bb907b747242f663a36c361c8b0bf38
diff --git a/metadata/md5-cache/media-gfx/gnofract4d-3.14-r1 b/metadata/md5-cache/media-gfx/gnofract4d-3.14-r1
index c3976f71c059..116af803282e 100644
--- a/metadata/md5-cache/media-gfx/gnofract4d-3.14-r1
+++ b/metadata/md5-cache/media-gfx/gnofract4d-3.14-r1
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:2 >=media-libs/libpng-1.4 virtual/jpeg >=dev-python/pygtk-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/gnofract4d/gnofract4d-3.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d12079bf362cb55da10ccfb14a6a2954
diff --git a/metadata/md5-cache/media-gfx/gnofract4d-3.14.1 b/metadata/md5-cache/media-gfx/gnofract4d-3.14.1
index 3e983ede69c9..f15b935228ca 100644
--- a/metadata/md5-cache/media-gfx/gnofract4d-3.14.1
+++ b/metadata/md5-cache/media-gfx/gnofract4d-3.14.1
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:2 media-libs/libpng:0= virtual/jpeg:0 >=dev-python/pygtk-2
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/edyoung/gnofract4d/archive/V_3_14_1.tar.gz -> gnofract4d-3.14.1.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ba905003d9b159635642f3f8462db1d2
diff --git a/metadata/md5-cache/media-gfx/gnome-font-viewer-3.24.0 b/metadata/md5-cache/media-gfx/gnome-font-viewer-3.24.0
index 37c5768d6970..d85ea7408bdd 100644
--- a/metadata/md5-cache/media-gfx/gnome-font-viewer-3.24.0
+++ b/metadata/md5-cache/media-gfx/gnome-font-viewer-3.24.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.35.1:2 gnome-base/gnome-desktop:3= media-libs/fontconfig:1.0 media-libs/freetype:2 >=media-libs/harfbuzz-0.9.9 >=x11-libs/gtk+-3.20:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-font-viewer/3.24/gnome-font-viewer-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fdc81141ba8a9430d4071aeb977970c1
diff --git a/metadata/md5-cache/media-gfx/gnome-font-viewer-3.30.0 b/metadata/md5-cache/media-gfx/gnome-font-viewer-3.30.0
new file mode 100644
index 000000000000..75cfb91565da
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/gnome-font-viewer-3.30.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.35.1:2 >=x11-libs/gtk+-3.20:3 >=media-libs/harfbuzz-0.9.9 media-libs/fontconfig:1.0 media-libs/freetype:2 gnome-base/gnome-desktop:3= dev-libs/appstream-glib dev-libs/libxml2:2 >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Font viewer utility for GNOME
+EAPI=6
+HOMEPAGE=https://git.gnome.org/browse/gnome-font-viewer
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.35.1:2 >=x11-libs/gtk+-3.20:3 >=media-libs/harfbuzz-0.9.9 media-libs/fontconfig:1.0 media-libs/freetype:2 gnome-base/gnome-desktop:3=
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-font-viewer/3.30/gnome-font-viewer-3.30.0.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=8462cdd415c0d2d6d6dcae7a2b0017af
diff --git a/metadata/md5-cache/media-gfx/gnome-photos-3.24.6 b/metadata/md5-cache/media-gfx/gnome-photos-3.24.6
index af1bf5757545..31646b8b0ea6 100644
--- a/metadata/md5-cache/media-gfx/gnome-photos-3.24.6
+++ b/metadata/md5-cache/media-gfx/gnome-photos-3.24.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=app-misc/tracker-1:=[miner-fs] >=dev-libs/glib-2.44:2 gnome-base/gsettings-desktop-schemas >=dev-libs/libgdata-0.15.2:0=[gnome-online-accounts] media-libs/babl >=media-libs/gegl-0.3.14:0.3[cairo,jpeg2k,raw] media-libs/gexiv2 >=media-libs/grilo-0.3.0:0.3= >=media-libs/libpng-1.6:0= >=net-libs/gnome-online-accounts-3.8:= >=net-libs/libgfbgraph-0.2.1:0.2 sci-geosciences/geocode-glib >=x11-libs/cairo-1.14 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22.15:3 net-misc/gnome-online-miners[flickr?] upnp-av? ( media-plugins/grilo-plugins:0.3[upnp-av] ) flickr? ( media-plugins/grilo-plugins:0.3[flickr] )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-photos/3.24/gnome-photos-3.24.6.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-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9c87a0449b99adcfa6f4972db1c5598e
diff --git a/metadata/md5-cache/media-gfx/gnome-raw-thumbnailer-3.0.0 b/metadata/md5-cache/media-gfx/gnome-raw-thumbnailer-3.0.0
index 89c0ae30ec66..d7cb50a470bf 100644
--- a/metadata/md5-cache/media-gfx/gnome-raw-thumbnailer-3.0.0
+++ b/metadata/md5-cache/media-gfx/gnome-raw-thumbnailer-3.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libopenraw-0.0.9[gtk] >=x11-libs/gdk-pixbuf-2:2 >=dev-libs/glib-2.26:2 !media-gfx/raw-thumbnailer
 SLOT=0
 SRC_URI=https://libopenraw.freedesktop.org/download/raw-thumbnailer-3.0.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=61787ec4f815261afa1c688162a038db
diff --git a/metadata/md5-cache/media-gfx/gnome-raw-thumbnailer-3.0.0-r1 b/metadata/md5-cache/media-gfx/gnome-raw-thumbnailer-3.0.0-r1
index 95f08de1b76c..f4edcb2e67e1 100644
--- a/metadata/md5-cache/media-gfx/gnome-raw-thumbnailer-3.0.0-r1
+++ b/metadata/md5-cache/media-gfx/gnome-raw-thumbnailer-3.0.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libopenraw-0.1.0[gtk] >=x11-libs/gdk-pixbuf-2:2 >=dev-libs/glib-2.26:2 !media-gfx/raw-thumbnailer
 SLOT=0
 SRC_URI=https://libopenraw.freedesktop.org/download/raw-thumbnailer-3.0.0.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=5945a7a51b133477a3a61ad12887c0e8
diff --git a/metadata/md5-cache/media-gfx/gnome-screenshot-3.22.0 b/metadata/md5-cache/media-gfx/gnome-screenshot-3.22.0
index 33b3235fbc5d..34b553315f9a 100644
--- a/metadata/md5-cache/media-gfx/gnome-screenshot-3.22.0
+++ b/metadata/md5-cache/media-gfx/gnome-screenshot-3.22.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.35.1:2[dbus] >=media-libs/libcanberra-0.26-r2[gtk3] x11-libs/cairo x11-libs/gdk-pixbuf >=x11-libs/gtk+-3.0.3:3 x11-libs/libX11 x11-libs/libXext >=gnome-base/gsettings-desktop-schemas-0.1.0 !<gnome-extra/gnome-utils-3.4
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-screenshot/3.22/gnome-screenshot-3.22.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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=251aaabfa3531cfcc5f59b2a9755d9ae
diff --git a/metadata/md5-cache/media-gfx/gpicview-0.2.5-r1 b/metadata/md5-cache/media-gfx/gpicview-0.2.5-r1
index 5f5bdc04da7c..67064cbd7000 100644
--- a/metadata/md5-cache/media-gfx/gpicview-0.2.5-r1
+++ b/metadata/md5-cache/media-gfx/gpicview-0.2.5-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/jpeg:0 >=x11-libs/gtk+-2.6:2
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/gpicview-0.2.5.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-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=dee17c801f8eec1ddfab7ca941044c04
diff --git a/metadata/md5-cache/media-gfx/graphite2-1.3.10 b/metadata/md5-cache/media-gfx/graphite2-1.3.10
index c80ca52dc06d..62d00f9f629c 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _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 e1455d85c580..d39af0099e40 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _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 9ed8196f9180..a6514fb98597 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _md5_=8b6d5a72cf72b1d67e056ceda41d60ae
diff --git a/metadata/md5-cache/media-gfx/gthumb-3.4.5 b/metadata/md5-cache/media-gfx/gthumb-3.4.5
index 87f41392b5ea..70bdcb346bf0 100644
--- a/metadata/md5-cache/media-gfx/gthumb-3.4.5
+++ b/metadata/md5-cache/media-gfx/gthumb-3.4.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.36.0:2[dbus] >=x11-libs/gtk+-3.10.0:3 exif? ( >=media-gfx/exiv2-0.21:= ) slideshow? ( >=media-libs/clutter-1.12.0:1.0 >=media-libs/clutter-gtk-1:1.0 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) raw? ( >=media-libs/libraw-0.14:= ) http? ( >=net-libs/libsoup-2.42.0:2.4 ) gnome-keyring? ( >=app-crypt/libsecret-0.11 ) cdr? ( >=app-cdr/brasero-3.2 ) svg? ( >=gnome-base/librsvg-2.34:2 ) webp? ( >=media-libs/libwebp-0.2.0 ) json? ( >=dev-libs/json-glib-0.15.0 ) webkit? ( >=net-libs/webkit-gtk-1.10.0:4 ) lcms? ( >=media-libs/lcms-2.6:2 ) media-libs/libpng:0= sys-libs/zlib >=gnome-base/gsettings-desktop-schemas-0.1.4 jpeg? ( virtual/jpeg:0= ) tiff? ( media-libs/tiff:= ) !raw? ( media-gfx/dcraw )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gthumb/3.4/gthumb-3.4.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4d7fbdbeac64355f42fa616ec17b2d4e
diff --git a/metadata/md5-cache/media-gfx/gthumb-3.6.1 b/metadata/md5-cache/media-gfx/gthumb-3.6.1
index d9b87f1efbb1..5f4b048547ef 100644
--- a/metadata/md5-cache/media-gfx/gthumb-3.6.1
+++ b/metadata/md5-cache/media-gfx/gthumb-3.6.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.36.0:2[dbus] >=x11-libs/gtk+-3.16.0:3 exif? ( >=media-gfx/exiv2-0.21:= ) slideshow? ( >=media-libs/clutter-1.12.0:1.0 >=media-libs/clutter-gtk-1:1.0 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) raw? ( >=media-libs/libraw-0.14:= ) http? ( >=net-libs/libsoup-2.42.0:2.4 ) gnome-keyring? ( >=app-crypt/libsecret-0.11 ) cdr? ( >=app-cdr/brasero-3.2 ) svg? ( >=gnome-base/librsvg-2.34:2 ) webp? ( >=media-libs/libwebp-0.2.0 ) json? ( >=dev-libs/json-glib-0.15.0 ) webkit? ( >=net-libs/webkit-gtk-1.10.0:4 ) lcms? ( >=media-libs/lcms-2.6:2 ) colord? ( >=x11-misc/colord-1.3 >=media-libs/lcms-2.6:2 ) media-libs/libpng:0= sys-libs/zlib >=gnome-base/gsettings-desktop-schemas-0.1.4 jpeg? ( virtual/jpeg:0= ) tiff? ( media-libs/tiff:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gthumb/3.6/gthumb-3.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d68dc5fca4db48243c9da685aa425fc7
diff --git a/metadata/md5-cache/media-gfx/gtkam-1.0 b/metadata/md5-cache/media-gfx/gtkam-1.0
index 6e9238ea2d14..c441a03e0b22 100644
--- a/metadata/md5-cache/media-gfx/gtkam-1.0
+++ b/metadata/md5-cache/media-gfx/gtkam-1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 >=media-libs/libgphoto2-2.5.0 >=media-libs/libexif-0.3.2 media-libs/libexif-gtk gimp? ( >=media-gfx/gimp-2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/gphoto/gtkam-1.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=3df1232d7e3e3d7476a2235d653c54c3
diff --git a/metadata/md5-cache/media-gfx/gtkimageview-1.6.4 b/metadata/md5-cache/media-gfx/gtkimageview-1.6.4
index 7f67c9f598e9..c74549fbdeae 100644
--- a/metadata/md5-cache/media-gfx/gtkimageview-1.6.4
+++ b/metadata/md5-cache/media-gfx/gtkimageview-1.6.4
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:2
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gentoo/gtkimageview-1.6.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=214258a59b733a0e6d050d76480090eb
diff --git a/metadata/md5-cache/media-gfx/hugin-2016.2.0 b/metadata/md5-cache/media-gfx/hugin-2016.2.0
index 8279143a9753..d50a038c74a7 100644
--- a/metadata/md5-cache/media-gfx/hugin-2016.2.0
+++ b/metadata/md5-cache/media-gfx/hugin-2016.2.0
@@ -10,5 +10,5 @@ RDEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=med
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/hugin/hugin-2016.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=708bac70c29ac0b41dbc1e8367ad191f
diff --git a/metadata/md5-cache/media-gfx/hugin-2017.0 b/metadata/md5-cache/media-gfx/hugin-2017.0
index b71fc365c7ec..298943bd934f 100644
--- a/metadata/md5-cache/media-gfx/hugin-2017.0
+++ b/metadata/md5-cache/media-gfx/hugin-2017.0
@@ -10,5 +10,5 @@ RDEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=med
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/hugin/hugin-2017.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3f8b4b9189e6b33bde98c41446a9339d
diff --git a/metadata/md5-cache/media-gfx/hugin-2018.0.0 b/metadata/md5-cache/media-gfx/hugin-2018.0.0
index 02412b858d6e..61eaefade9af 100644
--- a/metadata/md5-cache/media-gfx/hugin-2018.0.0
+++ b/metadata/md5-cache/media-gfx/hugin-2018.0.0
@@ -10,5 +10,5 @@ RDEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=med
 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://sourceforge/hugin/hugin-2018.0.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=546615c8dff672b509c215a147d739db
diff --git a/metadata/md5-cache/media-gfx/hugin-9999 b/metadata/md5-cache/media-gfx/hugin-9999
index 74da42b721bd..ecc6d31ec5bf 100644
--- a/metadata/md5-cache/media-gfx/hugin-9999
+++ b/metadata/md5-cache/media-gfx/hugin-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 SIFT
 RDEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= >=media-libs/libpano13-2.9.19_beta1:0= media-libs/libpng:0= media-libs/openexr:= media-libs/tiff:0 >=media-libs/vigra-1.11.0[openexr] sci-libs/fftw:3.0= sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/wxGTK:3.0=[X,opengl] lapack? ( virtual/blas virtual/lapack ) 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(+)?] ) sift? ( media-gfx/autopano-sift-C ) media-libs/exiftool
 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
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mercurial	9813bb616cb1bd0c943177ab52204409	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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mercurial	9813bb616cb1bd0c943177ab52204409	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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8011def26657fb60eaef2fe95fcc8bf2
diff --git a/metadata/md5-cache/media-gfx/icc_examin-0.56_p20171007 b/metadata/md5-cache/media-gfx/icc_examin-0.56_p20171007
index 7152e9b8a5dd..d1d3ddc07389 100644
--- a/metadata/md5-cache/media-gfx/icc_examin-0.56_p20171007
+++ b/metadata/md5-cache/media-gfx/icc_examin-0.56_p20171007
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/elektra media-libs/freetype media-libs/ftgl media-libs/libXcm[X] media-libs/oyranos media-libs/tiff:0 virtual/jpeg:0 virtual/opengl x11-libs/fltk[opengl] x11-libs/libX11 x11-libs/libXinerama x11-libs/libXpm x11-libs/libXrandr x11-libs/libXxf86vm
 SLOT=0
 SRC_URI=https://github.com/oyranos-cms/icc-examin/tarball/ee9e8cd013766b0df2c5e3b4416f985322b22966 -> icc-examin-0.56_p20171007.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=908143fc73f58a1cf361e0528e416ec7
diff --git a/metadata/md5-cache/media-gfx/icc_examin-9999 b/metadata/md5-cache/media-gfx/icc_examin-9999
index b113b95ce96c..c45c0489f5ef 100644
--- a/metadata/md5-cache/media-gfx/icc_examin-9999
+++ b/metadata/md5-cache/media-gfx/icc_examin-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.oyranos.org/icc-examin/
 LICENSE=GPL-2
 RDEPEND=app-admin/elektra media-libs/freetype media-libs/ftgl media-libs/libXcm[X] media-libs/oyranos media-libs/tiff:0 virtual/jpeg:0 virtual/opengl x11-libs/fltk[opengl] x11-libs/libX11 x11-libs/libXinerama x11-libs/libXpm x11-libs/libXrandr x11-libs/libXxf86vm
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3bfbb5647bf8fafd4eadbdbfa07da33e
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.10.11 b/metadata/md5-cache/media-gfx/imagemagick-6.9.10.11
index 99fb6930c6eb..4c4872ea3dde 100644
--- a/metadata/md5-cache/media-gfx/imagemagick-6.9.10.11
+++ b/metadata/md5-cache/media-gfx/imagemagick-6.9.10.11
@@ -12,4 +12,4 @@ RESTRICT=perl? ( userpriv )
 SLOT=0/6.9.10.11
 SRC_URI=mirror://imagemagick/ImageMagick-6.9.10-11.tar.xz
 _eclasses_=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_=16296c4cef2547e6f807201c31de83f7
+_md5_=fabdb14f4c769fd0538c101fee284acd
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.10.12 b/metadata/md5-cache/media-gfx/imagemagick-6.9.10.12
new file mode 100644
index 000000000000..a9ce24c5a13d
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/imagemagick-6.9.10.12
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install postinst prepare test
+DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815
+DESCRIPTION=A collection of tools and libraries for many image formats
+EAPI=6
+HOMEPAGE=https://www.imagemagick.org/
+IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=imagemagick
+RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
+REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
+RESTRICT=perl? ( userpriv )
+SLOT=0/6.9.10.12
+SRC_URI=mirror://imagemagick/ImageMagick-6.9.10-12.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	perl-functions	f2e3420aed32cf1abe33b4129b842636	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=31993b33c631def1197cdb6e0db928a4
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.0.8.12 b/metadata/md5-cache/media-gfx/imagemagick-7.0.8.12
new file mode 100644
index 000000000000..6aca0fa654e8
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/imagemagick-7.0.8.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare test
+DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815
+DESCRIPTION=A collection of tools and libraries for many image formats
+EAPI=6
+HOMEPAGE=https://www.imagemagick.org/
+IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=imagemagick
+RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
+REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
+SLOT=0/7.0.8.12
+SRC_URI=mirror://imagemagick/ImageMagick-7.0.8-12.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	perl-functions	f2e3420aed32cf1abe33b4129b842636	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=0a935374e053b1785a175eac1ebf3ba1
diff --git a/metadata/md5-cache/media-gfx/img2pdf-0.2.4 b/metadata/md5-cache/media-gfx/img2pdf-0.2.4
index a3a6828e1547..c1eb3710d354 100644
--- a/metadata/md5-cache/media-gfx/img2pdf-0.2.4
+++ b/metadata/md5-cache/media-gfx/img2pdf-0.2.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/img2pdf/img2pdf-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=22a0b98f1bdb2fe30b3a4f136cf2fb67
diff --git a/metadata/md5-cache/media-gfx/img2pdf-0.3.1 b/metadata/md5-cache/media-gfx/img2pdf-0.3.1
new file mode 100644
index 000000000000..8d60f5411213
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/img2pdf-0.3.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pdfrw[python_targets_python3_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=Losslessly convert raster images to PDF
+EAPI=6
+HOMEPAGE=https://gitlab.mister-muffin.de/josch/img2pdf
+IUSE=test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3+
+RDEPEND=dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_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=mirror://pypi/i/img2pdf/img2pdf-0.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_=a15f6fd412d365b92d0bf17f45f3d996
diff --git a/metadata/md5-cache/media-gfx/imv-2.1.3 b/metadata/md5-cache/media-gfx/imv-2.1.3
index aeb982312aac..237291352f07 100644
--- a/metadata/md5-cache/media-gfx/imv-2.1.3
+++ b/metadata/md5-cache/media-gfx/imv-2.1.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=!sys-apps/renameutils media-libs/fontconfig media-libs/libsdl2 media-libs/sdl2-ttf media-libs/freeimage
 SLOT=0
 SRC_URI=https://github.com/eXeC64/imv/archive/v2.1.3.tar.gz -> imv-2.1.3.tar.gz
-_eclasses_=xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f42c694c024332986bf8c90a527fdce1
diff --git a/metadata/md5-cache/media-gfx/imv-9999 b/metadata/md5-cache/media-gfx/imv-9999
index 1364a575db0c..e54a48432929 100644
--- a/metadata/md5-cache/media-gfx/imv-9999
+++ b/metadata/md5-cache/media-gfx/imv-9999
@@ -7,5 +7,5 @@ IUSE=test
 LICENSE=GPL-2+
 RDEPEND=!sys-apps/renameutils media-libs/fontconfig media-libs/libsdl2 media-libs/sdl2-ttf media-libs/freeimage
 SLOT=0
-_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f7d3d7859aeac6d9af299dd9a388b092
diff --git a/metadata/md5-cache/media-gfx/inkscape-0.92.2 b/metadata/md5-cache/media-gfx/inkscape-0.92.2
index 751fa6e84583..b8aaf79e9433 100644
--- a/metadata/md5-cache/media-gfx/inkscape-0.92.2
+++ b/metadata/md5-cache/media-gfx/inkscape-0.92.2
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=test
 SLOT=0
 SRC_URI=https://inkscape.global.ssl.fastly.net/media/resources/file/inkscape-0.92.2.tar.bz2 https://dev.gentoo.org/~jstein/dist/inkscape-0.92.1-poppler.patch
-_eclasses_=autotools	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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8f635db9828694a235d76809f02784ba
diff --git a/metadata/md5-cache/media-gfx/inkscape-0.92.3 b/metadata/md5-cache/media-gfx/inkscape-0.92.3
index 7f34353add8e..c1046cd2b6be 100644
--- a/metadata/md5-cache/media-gfx/inkscape-0.92.3
+++ b/metadata/md5-cache/media-gfx/inkscape-0.92.3
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=test
 SLOT=0
 SRC_URI=https://inkscape.global.ssl.fastly.net/media/resources/file/inkscape-0.92.3.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9d4f738583448f9e94b0514af81a7c61
diff --git a/metadata/md5-cache/media-gfx/inkscape-0.92.3-r1 b/metadata/md5-cache/media-gfx/inkscape-0.92.3-r1
index f0bf82a67fde..711950ce73f5 100644
--- a/metadata/md5-cache/media-gfx/inkscape-0.92.3-r1
+++ b/metadata/md5-cache/media-gfx/inkscape-0.92.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=test
 SLOT=0
 SRC_URI=https://inkscape.global.ssl.fastly.net/media/resources/file/inkscape-0.92.3.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3ec1354c04c58d463f74cb60fe8f39b9
diff --git a/metadata/md5-cache/media-gfx/iscan-data-1.22.0.1 b/metadata/md5-cache/media-gfx/iscan-data-1.22.0.1
deleted file mode 100644
index 91abc6f37b60..000000000000
--- a/metadata/md5-cache/media-gfx/iscan-data-1.22.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=udev? ( dev-libs/libxslt media-gfx/sane-backends ) virtual/pkgconfig
-DESCRIPTION=Image Scan! for Linux data files
-EAPI=5
-HOMEPAGE=http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX
-IUSE=udev
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~flameeyes/avasys/iscan-data_1.22.0-1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=6e644500ad257edbceab9e7072e53d42
diff --git a/metadata/md5-cache/media-gfx/iscan-data-1.37.0.3 b/metadata/md5-cache/media-gfx/iscan-data-1.37.0.3
new file mode 100644
index 000000000000..a61e5c545710
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/iscan-data-1.37.0.3
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install
+DEPEND=udev? ( dev-libs/libxslt media-gfx/sane-backends )
+DESCRIPTION=Image Scan! for Linux data files
+EAPI=7
+HOMEPAGE=http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX
+IUSE=udev
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://support.epson.net/linux/src/scanner/iscan/iscan-data_1.37.0-3.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac
+_md5_=1d06511720426a03fe1205b3d1b71ee5
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 f11d3c6a2fdd..35d9a7470e64 100644
--- a/metadata/md5-cache/media-gfx/kcoloredit-2.0.0_p20171121
+++ b/metadata/md5-cache/media-gfx/kcoloredit-2.0.0_p20171121
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	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
 _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 5a304e840b50..343b2ea90b6e 100644
--- a/metadata/md5-cache/media-gfx/kgraphviewer-2.4.2
+++ b/metadata/md5-cache/media-gfx/kgraphviewer-2.4.2
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
new file mode 100644
index 000000000000..955ca8f87ac2
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/kgraphviewer-2.4.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=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
+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
+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
+_md5_=f90bac4ba4154aba14a059449d018bf4
diff --git a/metadata/md5-cache/media-gfx/kphotoalbum-5.3 b/metadata/md5-cache/media-gfx/kphotoalbum-5.3
index 5263e41344e8..e5b71d6cfb21 100644
--- a/metadata/md5-cache/media-gfx/kphotoalbum-5.3
+++ b/metadata/md5-cache/media-gfx/kphotoalbum-5.3
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/krita-4.0.3 b/metadata/md5-cache/media-gfx/krita-4.0.3
deleted file mode 100644
index 28a81298dd4a..000000000000
--- a/metadata/md5-cache/media-gfx/krita-4.0.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/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:= 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] ) 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/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(+)?] ) 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 +jpeg openexr pdf python 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=>=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:= 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] ) 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/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(+)?] ) 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? ( ^^ ( 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.3/krita-4.0.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=400b107bc5878b7ac511ea78ad12ab51
diff --git a/metadata/md5-cache/media-gfx/krita-4.0.4 b/metadata/md5-cache/media-gfx/krita-4.0.4
index ed6a819a911a..fe1fb003ad4b 100644
--- a/metadata/md5-cache/media-gfx/krita-4.0.4
+++ b/metadata/md5-cache/media-gfx/krita-4.0.4
@@ -4,12 +4,12 @@ DESCRIPTION=Free digital painting application. Digital Painting, Creative Freedo
 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
+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
 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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=a7a73ff37a1a4a056dfd20197ab8cd5e
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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_=0802af67ac615041a72517bd820f5407
diff --git a/metadata/md5-cache/media-gfx/krita-4.1.3 b/metadata/md5-cache/media-gfx/krita-4.1.3
new file mode 100644
index 000000000000..2c6597cb4353
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/krita-4.1.3
@@ -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.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/kuickshow-0.10.0-r1 b/metadata/md5-cache/media-gfx/kuickshow-0.10.0-r1
index 993078158215..d9c2056e79a3 100644
--- a/metadata/md5-cache/media-gfx/kuickshow-0.10.0-r1
+++ b/metadata/md5-cache/media-gfx/kuickshow-0.10.0-r1
@@ -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/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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 462f937c7887..011ab04da2c5 100644
--- a/metadata/md5-cache/media-gfx/kxstitch-2.1.1
+++ b/metadata/md5-cache/media-gfx/kxstitch-2.1.1
@@ -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/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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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.4 b/metadata/md5-cache/media-gfx/libimagequant-2.11.4
deleted file mode 100644
index e7324624f307..000000000000
--- a/metadata/md5-cache/media-gfx/libimagequant-2.11.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install pretend
-DESCRIPTION=Palette quantization library that powers pngquant and other PNG optimizers
-EAPI=6
-HOMEPAGE=https://pngquant.org/lib/
-IUSE=cpu_flags_x86_sse2 debug openmp static-libs
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-SLOT=0/0
-SRC_URI=https://github.com/ImageOptim/libimagequant/archive/2.11.4.tar.gz -> libimagequant-2.11.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_=24b1cd96fb219b7a349f2dcd6cec1c10
diff --git a/metadata/md5-cache/media-gfx/libimagequant-2.11.7 b/metadata/md5-cache/media-gfx/libimagequant-2.11.7
index 56d22a7d987c..9bbba1a74532 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_=91118ad83826f80997dd144b1f3cdf3f
+_md5_=5af358e727f62309697776d16e4123d6
diff --git a/metadata/md5-cache/media-gfx/luminance-hdr-2.5.1-r1 b/metadata/md5-cache/media-gfx/luminance-hdr-2.5.1-r1
index ed87d794c0e3..b23e38fdef4f 100644
--- a/metadata/md5-cache/media-gfx/luminance-hdr-2.5.1-r1
+++ b/metadata/md5-cache/media-gfx/luminance-hdr-2.5.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/boost:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtwebengine:5[widgets] >=media-gfx/exiv2-0.14:0= media-libs/lcms:2 media-libs/libpng:0= >=media-libs/libraw-0.13.4:= media-libs/ilmbase:= >=media-libs/openexr-1.2.2-r2:= >=media-libs/tiff-3.8.2-r2:0 sci-libs/fftw:3.0=[threads] fits? ( sci-libs/cfitsio:= ) sci-libs/gsl virtual/jpeg:0
 SLOT=0
 SRC_URI=mirror://sourceforge/qtpfsgui/luminance-hdr-2.5.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4c1c41e7c513cc7caea5a4cedd220b96
diff --git a/metadata/md5-cache/media-gfx/lximage-qt-0.5.0 b/metadata/md5-cache/media-gfx/lximage-qt-0.5.0
index caefe834d009..071f937521a4 100644
--- a/metadata/md5-cache/media-gfx/lximage-qt-0.5.0
+++ b/metadata/md5-cache/media-gfx/lximage-qt-0.5.0
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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 2c302f4f8322..59f66b01e0d1 100644
--- a/metadata/md5-cache/media-gfx/lximage-qt-0.7.0
+++ b/metadata/md5-cache/media-gfx/lximage-qt-0.7.0
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/media-gfx/maim-5.5.1 b/metadata/md5-cache/media-gfx/maim-5.5.1
index 4da75121a82d..b30b2ab2ee06 100644
--- a/metadata/md5-cache/media-gfx/maim-5.5.1
+++ b/metadata/md5-cache/media-gfx/maim-5.5.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/libpng:0= virtual/jpeg:0 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender x11-misc/slop:= unicode? ( dev-libs/icu:= )
 SLOT=0
 SRC_URI=https://github.com/naelstrof/maim/archive/v5.5.1.tar.gz -> maim-5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0255094c3f02cef3299ada28eac2c4c3
diff --git a/metadata/md5-cache/media-gfx/maim-9999 b/metadata/md5-cache/media-gfx/maim-9999
index 152feb0b5f72..7c58fa11685e 100644
--- a/metadata/md5-cache/media-gfx/maim-9999
+++ b/metadata/md5-cache/media-gfx/maim-9999
@@ -7,5 +7,5 @@ IUSE=unicode
 LICENSE=GPL-3
 RDEPEND=media-libs/libpng:0= virtual/jpeg:0 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender x11-misc/slop:= unicode? ( dev-libs/icu:= )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d241b897ed744e89e754356d108704c5
diff --git a/metadata/md5-cache/media-gfx/mandelbulber-2.12-r1 b/metadata/md5-cache/media-gfx/mandelbulber-2.12-r1
index 0786e3e65a89..7fe1c465d275 100644
--- a/metadata/md5-cache/media-gfx/mandelbulber-2.12-r1
+++ b/metadata/md5-cache/media-gfx/mandelbulber-2.12-r1
@@ -9,5 +9,5 @@ LICENSE=CC-BY-4.0 GPL-3
 RDEPEND=dev-libs/lzo dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 media-libs/libpng:0= sci-libs/gsl:= opencl? ( virtual/opencl ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) sndfile? ( media-libs/libsndfile ) tiff? ( media-libs/tiff:0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/mandelbulber/mandelbulber2-2.12-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d4ce0feabff31e5f83993ed6ea5e41af
diff --git a/metadata/md5-cache/media-gfx/mcomix-1.2.1 b/metadata/md5-cache/media-gfx/mcomix-1.2.1
index 1d2b90000113..ec852c3c52d9 100644
--- a/metadata/md5-cache/media-gfx/mcomix-1.2.1
+++ b/metadata/md5-cache/media-gfx/mcomix-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/mcomix/mcomix-1.2.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	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_=1457f9a52289a5e250d7c59815309605
diff --git a/metadata/md5-cache/media-gfx/mirage-0.9.5.2-r1 b/metadata/md5-cache/media-gfx/mirage-0.9.5.2-r1
index da036e52ae07..4b40a09c748d 100644
--- a/metadata/md5-cache/media-gfx/mirage-0.9.5.2-r1
+++ b/metadata/md5-cache/media-gfx/mirage-0.9.5.2-r1
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/libX11 >=dev-python/pygtk-2.12:2[python_targets_python2_7(-)?,-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gentoo/mirage-0.9.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c657bc054b150b76c19f76d23ceeb4a4
diff --git a/metadata/md5-cache/media-gfx/mypaint-1.1.0-r2 b/metadata/md5-cache/media-gfx/mypaint-1.1.0-r2
index db736a0880e8..5710907fdbd0 100644
--- a/metadata/md5-cache/media-gfx/mypaint-1.1.0-r2
+++ b/metadata/md5-cache/media-gfx/mypaint-1.1.0-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jy
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://download.gna.org/mypaint/mypaint-1.1.0.tar.bz2
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3444b22ef9f5b27447f71bb66cabd992
diff --git a/metadata/md5-cache/media-gfx/mypaint-1.2.0 b/metadata/md5-cache/media-gfx/mypaint-1.2.0
index 9b28a5c57f6b..c649089c1b70 100644
--- a/metadata/md5-cache/media-gfx/mypaint-1.2.0
+++ b/metadata/md5-cache/media-gfx/mypaint-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_targe
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
index 676148f08e71..79d79d17b641 100644
--- a/metadata/md5-cache/media-gfx/mypaint-1.2.1
+++ b/metadata/md5-cache/media-gfx/mypaint-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_targe
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
index 2c68da841370..48cb43260124 100644
--- a/metadata/md5-cache/media-gfx/mypaint-1.2.1-r1
+++ b/metadata/md5-cache/media-gfx/mypaint-1.2.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_targe
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
index 8a7d26d820c8..d9e2e5bb885c 100644
--- a/metadata/md5-cache/media-gfx/mypaint-1.2.1-r2
+++ b/metadata/md5-cache/media-gfx/mypaint-1.2.1-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_targe
 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	89bb9f083a2590d9b447fd0b78a96186
+_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/nomacs-3.8.1 b/metadata/md5-cache/media-gfx/nomacs-3.8.1
index c35236879bed..736a22927ae6 100644
--- a/metadata/md5-cache/media-gfx/nomacs-3.8.1
+++ b/metadata/md5-cache/media-gfx/nomacs-3.8.1
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5[jpeg?] dev-qt/qtnet
 REQUIRED_USE=raw? ( opencv ) tiff? ( opencv )
 SLOT=0
 SRC_URI=https://github.com/nomacs/nomacs/archive/3.8.1.tar.gz -> nomacs-3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5868c98a7f7b36b16c78910e7293ffcd
diff --git a/metadata/md5-cache/media-gfx/nvidia-texture-tools-2.0.8-r3 b/metadata/md5-cache/media-gfx/nvidia-texture-tools-2.0.8-r3
index 8fba07508070..5d41909ca2ef 100644
--- a/metadata/md5-cache/media-gfx/nvidia-texture-tools-2.0.8-r3
+++ b/metadata/md5-cache/media-gfx/nvidia-texture-tools-2.0.8-r3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=media-libs/ilmbase:= media-libs/libpng:0= media-libs/tiff:0 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 cg? ( media-gfx/nvidia-cg-toolkit ) cuda? ( dev-util/nvidia-cuda-toolkit ) glew? ( media-libs/glew:0= ) glut? ( media-libs/freeglut ) openexr? ( media-libs/openexr:= )
 SLOT=0
 SRC_URI=https://nvidia-texture-tools.googlecode.com/files/nvidia-texture-tools-2.0.8-1.tar.gz https://dev.gentoo.org/~soap/distfiles/nvidia-texture-tools-2.0.8-patchset-1-r1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d9bdb9b832df84ad19deeb6873cba3c5
diff --git a/metadata/md5-cache/media-gfx/nvidia-texture-tools-2.0.8-r4 b/metadata/md5-cache/media-gfx/nvidia-texture-tools-2.0.8-r4
index d87529210b4f..5c655a4ab0a7 100644
--- a/metadata/md5-cache/media-gfx/nvidia-texture-tools-2.0.8-r4
+++ b/metadata/md5-cache/media-gfx/nvidia-texture-tools-2.0.8-r4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=media-libs/ilmbase:= media-libs/libpng:0= media-libs/tiff:0 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 cg? ( media-gfx/nvidia-cg-toolkit ) glew? ( media-libs/glew:0= ) glut? ( media-libs/freeglut ) openexr? ( media-libs/openexr:= )
 SLOT=0
 SRC_URI=https://nvidia-texture-tools.googlecode.com/files/nvidia-texture-tools-2.0.8-1.tar.gz https://dev.gentoo.org/~soap/distfiles/nvidia-texture-tools-2.0.8-patchset-1-r1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=94a811c17866e3cbd4a52a0cf7af19c2
diff --git a/metadata/md5-cache/media-gfx/openmesh-7.1 b/metadata/md5-cache/media-gfx/openmesh-7.1
index e09758c31591..d0e8af1f559a 100644
--- a/metadata/md5-cache/media-gfx/openmesh-7.1
+++ b/metadata/md5-cache/media-gfx/openmesh-7.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 media-libs/freeglut )
 SLOT=4
 SRC_URI=https://openmesh.org/media/Releases/7.1/OpenMesh-7.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5ae31aafe41270ef1d269343a3d229ff
diff --git a/metadata/md5-cache/media-gfx/openscad-2015.03_p2-r3 b/metadata/md5-cache/media-gfx/openscad-2015.03_p2-r3
index 7cd271cc5e59..36e864b2f248 100644
--- a/metadata/md5-cache/media-gfx/openscad-2015.03_p2-r3
+++ b/metadata/md5-cache/media-gfx/openscad-2015.03_p2-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-cpp/eigen:3 dev-libs/boost:= dev-libs/glib:2 dev-libs/gmp:0= dev-libs/mpfr:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2] dev-qt/qtopengl:5 media-gfx/opencsg media-libs/fontconfig:1.0 media-libs/freetype:2 >=media-libs/glew-2.0.0:* media-libs/harfbuzz sci-mathematics/cgal:= >=x11-libs/qscintilla-2.9.4:=[qt5(+)] emacs? ( virtual/emacs )
 SLOT=0
 SRC_URI=http://files.openscad.org/openscad-2015.03-2.src.tar.gz
-_eclasses_=elisp-common	23f47b2e1de7abf387105eddd1318738	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=elisp-common	23f47b2e1de7abf387105eddd1318738	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=955a9f18cbc76eff4d81ac27d82850cf
diff --git a/metadata/md5-cache/media-gfx/openscad-2015.03_p3 b/metadata/md5-cache/media-gfx/openscad-2015.03_p3
index 592b21a6a9d6..1977aade6cb6 100644
--- a/metadata/md5-cache/media-gfx/openscad-2015.03_p3
+++ b/metadata/md5-cache/media-gfx/openscad-2015.03_p3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-cpp/eigen:3 dev-libs/boost:= dev-libs/glib:2 dev-libs/gmp:0= dev-libs/mpfr:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2] dev-qt/qtopengl:5 media-gfx/opencsg media-libs/fontconfig:1.0 media-libs/freetype:2 >=media-libs/glew-2.0.0:* media-libs/harfbuzz sci-mathematics/cgal:= >=x11-libs/qscintilla-2.9.4:=[qt5(+)] emacs? ( virtual/emacs )
 SLOT=0
 SRC_URI=http://files.openscad.org/openscad-2015.03-3.src.tar.gz
-_eclasses_=elisp-common	23f47b2e1de7abf387105eddd1318738	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=elisp-common	23f47b2e1de7abf387105eddd1318738	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=760ce8a4b16f3a2bc812f394f8d854d7
diff --git a/metadata/md5-cache/media-gfx/openscad-9999 b/metadata/md5-cache/media-gfx/openscad-9999
index 69ddfcc01c33..348dbb0389a3 100644
--- a/metadata/md5-cache/media-gfx/openscad-9999
+++ b/metadata/md5-cache/media-gfx/openscad-9999
@@ -7,5 +7,5 @@ IUSE=emacs
 LICENSE=GPL-2
 RDEPEND=dev-cpp/eigen:3 dev-libs/boost:= dev-libs/glib:2 dev-libs/gmp:0= dev-libs/mpfr:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2] dev-qt/qtopengl:5 media-gfx/opencsg media-libs/fontconfig:1.0 media-libs/freetype:2 >=media-libs/glew-2.0.0:* media-libs/harfbuzz sci-mathematics/cgal:= >=x11-libs/qscintilla-2.9.4:=[qt5(+)] emacs? ( virtual/emacs )
 SLOT=0
-_eclasses_=elisp-common	23f47b2e1de7abf387105eddd1318738	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=elisp-common	23f47b2e1de7abf387105eddd1318738	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d18c36b63a46c395a1e8fb3cf6e33dcc
diff --git a/metadata/md5-cache/media-gfx/opentoonz-1.1.2 b/metadata/md5-cache/media-gfx/opentoonz-1.1.2
index afec2faca219..d9562e760449 100644
--- a/metadata/md5-cache/media-gfx/opentoonz-1.1.2
+++ b/metadata/md5-cache/media-gfx/opentoonz-1.1.2
@@ -8,5 +8,5 @@ LICENSE=BSD libtiff
 RDEPEND=app-arch/lz4:= >=dev-libs/boost-1.55.0:= dev-libs/lzo:2= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/freeglut:= media-libs/freetype:2= media-libs/glew:= media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsdl2:= sci-libs/blas-reference:= >=sci-libs/superlu-4.1:= sys-libs/zlib:= virtual/libusb:= virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/opentoonz/opentoonz/archive/v1.1.2.tar.gz -> opentoonz-1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=53d23204f7e8d72e3f9e4d107d706d87
diff --git a/metadata/md5-cache/media-gfx/opentoonz-1.2.1-r1 b/metadata/md5-cache/media-gfx/opentoonz-1.2.1-r1
index 4f6eb4914ece..8e346e523146 100644
--- a/metadata/md5-cache/media-gfx/opentoonz-1.2.1-r1
+++ b/metadata/md5-cache/media-gfx/opentoonz-1.2.1-r1
@@ -8,5 +8,5 @@ LICENSE=BSD libtiff
 RDEPEND=app-arch/lz4:= >=dev-libs/boost-1.55.0:= dev-libs/lzo:2= >=dev-qt/qtcore-5.9:5 >=dev-qt/qtgui-5.9:5 >=dev-qt/qtmultimedia-5.9:5[widgets] >=dev-qt/qtnetwork-5.9:5 >=dev-qt/qtopengl-5.9:5 >=dev-qt/qtprintsupport-5.9:5 >=dev-qt/qtscript-5.9:5 >=dev-qt/qtsvg-5.9:5 >=dev-qt/qtwidgets-5.9:5 >=dev-qt/qtxml-5.9:5 media-libs/freeglut:= media-libs/freetype:2= media-libs/glew:= media-libs/libjpeg-turbo:= >=media-libs/libmypaint-1.3.0 media-libs/libpng:= media-libs/libsdl2:= sci-libs/cblas-reference:= >=sci-libs/superlu-4.1:= sys-libs/zlib:= virtual/libusb:= virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/opentoonz/opentoonz/archive/v1.2.1.tar.gz -> opentoonz-1.2.1.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8a69f7c6dc18788ff37a9c25ea787147
diff --git a/metadata/md5-cache/media-gfx/openvdb-4.0.2 b/metadata/md5-cache/media-gfx/openvdb-4.0.2
index af6c9d8756d1..bbca7251fc18 100644
--- a/metadata/md5-cache/media-gfx/openvdb-4.0.2
+++ b/metadata/md5-cache/media-gfx/openvdb-4.0.2
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib:= >=dev-libs/boost-1.62:=[python?,python_targets_python2_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_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://github.com/dreamworksanimation/openvdb/archive/v4.0.2.tar.gz -> openvdb-4.0.2.tar.gz https://github.com/dracwyrm/gentoo-patches/raw/master/openvdb/openvdb-4.0.2-patchset-01.tar.xz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=96d89b6982f1fbc9050f891cb6089e4e
diff --git a/metadata/md5-cache/media-gfx/openvdb-4.0.2-r2 b/metadata/md5-cache/media-gfx/openvdb-4.0.2-r2
index 4890d83d3723..60f22b21aa41 100644
--- a/metadata/md5-cache/media-gfx/openvdb-4.0.2-r2
+++ b/metadata/md5-cache/media-gfx/openvdb-4.0.2-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/boost-1.62:=[python?,python_targets_python2_7(-)?,python_targ
 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=https://github.com/dreamworksanimation/openvdb/archive/v4.0.2.tar.gz -> openvdb-4.0.2.tar.gz https://dev.gentoo.org/~dracwyrm/patches/openvdb-4.0.2-patchset-02.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d963341a8f8285c19d79a9ede3f2faa7
diff --git a/metadata/md5-cache/media-gfx/openvdb-5.2.0 b/metadata/md5-cache/media-gfx/openvdb-5.2.0
index ad47a01fd72f..9fffa6a64722 100644
--- a/metadata/md5-cache/media-gfx/openvdb-5.2.0
+++ b/metadata/md5-cache/media-gfx/openvdb-5.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/boost-1.62:=[python?,python_targets_python2_7(-)?,python_targ
 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 ) )
 SLOT=0
 SRC_URI=https://github.com/dreamworksanimation/openvdb/archive/v5.2.0.tar.gz -> openvdb-5.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=fcd3b8fe7c5cadac2c6fae165baf0849
diff --git a/metadata/md5-cache/media-gfx/panini-0.72.0 b/metadata/md5-cache/media-gfx/panini-0.72.0
index eb243f404115..c350961a7467 100644
--- a/metadata/md5-cache/media-gfx/panini-0.72.0
+++ b/metadata/md5-cache/media-gfx/panini-0.72.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 sys-libs/zlib virtual/glu
 SLOT=0
 SRC_URI=https://github.com/lazarus-pkgs/panini/archive/v0.72.0.tar.gz -> panini-0.72.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5d4f216c8e382a04befc230096435b0a
diff --git a/metadata/md5-cache/media-gfx/pencil-0.6.1.1 b/metadata/md5-cache/media-gfx/pencil-0.6.1.1
index 688c8814dbc8..983c8e9dde72 100644
--- a/metadata/md5-cache/media-gfx/pencil-0.6.1.1
+++ b/metadata/md5-cache/media-gfx/pencil-0.6.1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
 SLOT=0
 SRC_URI=https://github.com/pencil2d/pencil/archive/v0.6.1.1.tar.gz -> pencil-0.6.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0b89ab01f1593bee9b656622096d3050
diff --git a/metadata/md5-cache/media-gfx/photoqt-1.5.1-r1 b/metadata/md5-cache/media-gfx/photoqt-1.5.1-r1
index 1d2388018716..15804490ade5 100644
--- a/metadata/md5-cache/media-gfx/photoqt-1.5.1-r1
+++ b/metadata/md5-cache/media-gfx/photoqt-1.5.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgraphicaleffects:5 dev-qt/qtgui:5 dev-qt/qtimageformats:5 dev-qt/qtmultimedia:5[qml] dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 exiv2? ( media-gfx/exiv2:= ) graphicsmagick? ( >=media-gfx/graphicsmagick-1.3.20:= ) raw? ( media-libs/libraw:= )
 SLOT=0
 SRC_URI=https://photoqt.org/pkgs/photoqt-1.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bb8d40145b7e18d0382caad7bccc0bfe
diff --git a/metadata/md5-cache/media-gfx/photoqt-1.7.1 b/metadata/md5-cache/media-gfx/photoqt-1.7.1
index 511bb59a5a43..003c45f7f426 100644
--- a/metadata/md5-cache/media-gfx/photoqt-1.7.1
+++ b/metadata/md5-cache/media-gfx/photoqt-1.7.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgraphicaleffects:5 dev-qt/qtgui:5 dev-qt/qtimageformats:5 dev-qt/qtmultimedia:5[qml] dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 app-arch/libarchive:= app-arch/unrar devil? ( media-libs/devil ) exiv2? ( media-gfx/exiv2:= ) freeimage? ( media-libs/freeimage ) graphicsmagick? ( >=media-gfx/graphicsmagick-1.3.20:= ) pdf? ( app-text/poppler[qt5] ) raw? ( media-libs/libraw:= )
 SLOT=0
 SRC_URI=https://photoqt.org/pkgs/photoqt-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9178d5f0cc20baf3681184dbbf39dd2f
diff --git a/metadata/md5-cache/media-gfx/phototonic-2.0 b/metadata/md5-cache/media-gfx/phototonic-2.0
index 2c03906e065c..7b22449da676 100644
--- a/metadata/md5-cache/media-gfx/phototonic-2.0
+++ b/metadata/md5-cache/media-gfx/phototonic-2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtcore:5 media-gfx/exiv2:= svg? ( dev-qt/qtsvg:5 ) tiff? ( dev-qt/qtimageformats:5 )
 SLOT=0
 SRC_URI=https://github.com/oferkv/phototonic/archive/v2.0.tar.gz -> phototonic-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b46fc07254b6dd04c88f4c8d25a39197
diff --git a/metadata/md5-cache/media-gfx/phototonic-2.1 b/metadata/md5-cache/media-gfx/phototonic-2.1
index f89ae5031128..caee8cb44d47 100644
--- a/metadata/md5-cache/media-gfx/phototonic-2.1
+++ b/metadata/md5-cache/media-gfx/phototonic-2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtcore:5 media-gfx/exiv2:= svg? ( dev-qt/qtsvg:5 ) tiff? ( dev-qt/qtimageformats:5 )
 SLOT=0
 SRC_URI=https://github.com/oferkv/phototonic/archive/v2.1.tar.gz -> phototonic-2.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b46fc07254b6dd04c88f4c8d25a39197
diff --git a/metadata/md5-cache/media-gfx/pinta-1.6-r2 b/metadata/md5-cache/media-gfx/pinta-1.6-r2
index f348d0553aa0..dd7e68496eb9 100644
--- a/metadata/md5-cache/media-gfx/pinta-1.6-r2
+++ b/metadata/md5-cache/media-gfx/pinta-1.6-r2
@@ -8,5 +8,5 @@ LICENSE=MIT CC-BY-3.0
 RDEPEND=dev-lang/mono dev-dotnet/mono-addins[gtk] x11-libs/cairo[X] x11-libs/gdk-pixbuf[X,jpeg,tiff] x11-themes/adwaita-icon-theme
 SLOT=0
 SRC_URI=https://github.com/PintaProject/Pinta/releases/download/1.6/pinta-1.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ba6950a25cf3ca1c2ab807cf1f2d63a8
diff --git a/metadata/md5-cache/media-gfx/pinta-9999 b/metadata/md5-cache/media-gfx/pinta-9999
index ec76dcba4be0..6c0424bf62dd 100644
--- a/metadata/md5-cache/media-gfx/pinta-9999
+++ b/metadata/md5-cache/media-gfx/pinta-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://pinta-project.com
 LICENSE=MIT CC-BY-3.0
 RDEPEND=dev-lang/mono dev-dotnet/mono-addins[gtk] x11-libs/cairo[X] x11-libs/gdk-pixbuf[X,jpeg,tiff] x11-themes/adwaita-icon-theme
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	git-2	249c1a0962573f4ce2c28f0d5b6b35d4	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	git-2	249c1a0962573f4ce2c28f0d5b6b35d4	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=11274a635857b93eb2fd3af0de9e9dd0
diff --git a/metadata/md5-cache/media-gfx/pqiv-2.10.2 b/metadata/md5-cache/media-gfx/pqiv-2.10.2
index cb5fc9c0c49b..89b30ca40711 100644
--- a/metadata/md5-cache/media-gfx/pqiv-2.10.2
+++ b/metadata/md5-cache/media-gfx/pqiv-2.10.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/cairo-1.6 x11-libs/gtk+:3 archive? ( app-arch/libarchive:0= ) ffmpeg? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) imagemagick? ( media-gfx/imagemagick:0= ) pdf? ( app-text/poppler:0= ) postscript? ( app-text/libspectre:0= ) webp? ( media-libs/libwebp:0= )
 SLOT=0
 SRC_URI=https://github.com/phillipberndt/pqiv/archive/2.10.2.tar.gz -> pqiv-2.10.2.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b6d0ceb11592ebc2011fa35bc486a876
diff --git a/metadata/md5-cache/media-gfx/pqiv-2.10.4 b/metadata/md5-cache/media-gfx/pqiv-2.10.4
index ed65ff40792f..d56845a2f169 100644
--- a/metadata/md5-cache/media-gfx/pqiv-2.10.4
+++ b/metadata/md5-cache/media-gfx/pqiv-2.10.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/cairo-1.6 x11-libs/gtk+:3 archive? ( app-arch/libarchive:0= ) ffmpeg? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) imagemagick? ( media-gfx/imagemagick:0= ) pdf? ( app-text/poppler:0= ) postscript? ( app-text/libspectre:0= ) webp? ( media-libs/libwebp:0= )
 SLOT=0
 SRC_URI=https://github.com/phillipberndt/pqiv/archive/2.10.4.tar.gz -> pqiv-2.10.4.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=38b9beec17a88f3512ae4f33adf9404c
diff --git a/metadata/md5-cache/media-gfx/pqiv-9999 b/metadata/md5-cache/media-gfx/pqiv-9999
index 289d9b0abe35..649da1ea3c28 100644
--- a/metadata/md5-cache/media-gfx/pqiv-9999
+++ b/metadata/md5-cache/media-gfx/pqiv-9999
@@ -7,5 +7,5 @@ IUSE=archive ffmpeg imagemagick kernel_linux libav pdf postscript webp kernel_li
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/cairo-1.6 x11-libs/gtk+:3 archive? ( app-arch/libarchive:0= ) ffmpeg? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) imagemagick? ( media-gfx/imagemagick:0= ) pdf? ( app-text/poppler:0= ) postscript? ( app-text/libspectre:0= ) webp? ( media-libs/libwebp:0= )
 SLOT=0
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=38b9beec17a88f3512ae4f33adf9404c
diff --git a/metadata/md5-cache/media-gfx/printrun-20150310-r3 b/metadata/md5-cache/media-gfx/printrun-20150310-r3
index 4fce25d0c728..e32bba6946fa 100644
--- a/metadata/md5-cache/media-gfx/printrun-20150310-r3
+++ b/metadata/md5-cache/media-gfx/printrun-20150310-r3
@@ -10,5 +10,5 @@ RDEPEND=app-text/psutils dev-python/dbus-python[python_targets_python2_7(-)?,-py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/kliment/Printrun/archive/printrun-20150310.tar.gz https://dev.gentoo.org/~amynka/snap/printrun-gtk3.tar.xz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2373256a1730b3dba900102257e55d86
diff --git a/metadata/md5-cache/media-gfx/printrun-99999999 b/metadata/md5-cache/media-gfx/printrun-99999999
index 28629a81b19c..6ff359b109c0 100644
--- a/metadata/md5-cache/media-gfx/printrun-99999999
+++ b/metadata/md5-cache/media-gfx/printrun-99999999
@@ -9,5 +9,5 @@ RDEPEND=app-text/psutils dev-python/dbus-python[python_targets_python2_7(-)?,-py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~amynka/snap/printrun-gtk3.tar.xz
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fc94d44967a4e1875ecd182b41163b9d
diff --git a/metadata/md5-cache/media-gfx/pycam-0.5.1 b/metadata/md5-cache/media-gfx/pycam-0.5.1
index afec9c90f665..1aa9a9761501 100644
--- a/metadata/md5-cache/media-gfx/pycam-0.5.1
+++ b/metadata/md5-cache/media-gfx/pycam-0.5.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygtk dev-python/pygtkglext dev-python/pyopengl python_target
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pycam/pycam-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f066919640fcf451fa9954d47b826b3a
diff --git a/metadata/md5-cache/media-gfx/pycam-0.6.2 b/metadata/md5-cache/media-gfx/pycam-0.6.2
index a09b913e376c..6a48fb8768ff 100644
--- a/metadata/md5-cache/media-gfx/pycam-0.6.2
+++ b/metadata/md5-cache/media-gfx/pycam-0.6.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygtk dev-python/pygtkglext dev-python/pyopengl dev-python/li
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/SebKuzminsky/pycam/archive/v0.6.2.tar.gz -> pycam-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7712887b4a990a7bfe363fba228a25cd
diff --git a/metadata/md5-cache/media-gfx/qimgv-0.6.3 b/metadata/md5-cache/media-gfx/qimgv-0.6.3
index 42f5cde813ad..2325d99632e2 100644
--- a/metadata/md5-cache/media-gfx/qimgv-0.6.3
+++ b/metadata/md5-cache/media-gfx/qimgv-0.6.3
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
index e4c4c3f2bf75..8bbc7e345b79 100644
--- a/metadata/md5-cache/media-gfx/qimgv-0.7
+++ b/metadata/md5-cache/media-gfx/qimgv-0.7
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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-9999 b/metadata/md5-cache/media-gfx/qimgv-9999
index c11ab1117e3e..aa037b497c57 100644
--- a/metadata/md5-cache/media-gfx/qimgv-9999
+++ b/metadata/md5-cache/media-gfx/qimgv-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/easymodo/qimgv
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-video/mpv[libmpv]
 SLOT=0
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6f95eabbea1dbe5573ad94c64bec4bda
diff --git a/metadata/md5-cache/media-gfx/qiv-2.3.2 b/metadata/md5-cache/media-gfx/qiv-2.3.2
index c889ceb4b313..8ff625f64d78 100644
--- a/metadata/md5-cache/media-gfx/qiv-2.3.2
+++ b/metadata/md5-cache/media-gfx/qiv-2.3.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.12:2 media-libs/imlib2[X] exif? ( media-libs/libexif ) lcms? ( media-libs/lcms:2 media-libs/tiff:0 virtual/jpeg:0 ) magic? ( sys-apps/file )
 SLOT=0
 SRC_URI=https://bitbucket.org/ciberandy/qiv/get/v2.3.2.tar.gz -> qiv-2.3.2.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ddf6df198f4f1016bd7200a7b1075aae
diff --git a/metadata/md5-cache/media-gfx/qrencode-python-1.02_pre140921 b/metadata/md5-cache/media-gfx/qrencode-python-1.02_pre140921
index ffcfddc44fca..796237daa0fd 100644
--- a/metadata/md5-cache/media-gfx/qrencode-python-1.02_pre140921
+++ b/metadata/md5-cache/media-gfx/qrencode-python-1.02_pre140921
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/Arachnid/pyqrencode/tarball/486bb7b64e3ce5483f65e375a67da0fa6d02ca92 -> qrencode-python-1.02_pre140921.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ce57e73214e538e680964ceec594246a
diff --git a/metadata/md5-cache/media-gfx/raw-thumbnailer-0.2.1 b/metadata/md5-cache/media-gfx/raw-thumbnailer-0.2.1
deleted file mode 100644
index dc9592795e5a..000000000000
--- a/metadata/md5-cache/media-gfx/raw-thumbnailer-0.2.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=~media-libs/libopenraw-0.0.9[gtk] x11-libs/gtk+:2 !media-gfx/gnome-raw-thumbnailer virtual/pkgconfig
-DESCRIPTION=A lightweight and fast raw image thumbnailer
-EAPI=4
-HOMEPAGE=https://github.com/erlendd/raw-thumbnailer
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=~media-libs/libopenraw-0.0.9[gtk] x11-libs/gtk+:2 !media-gfx/gnome-raw-thumbnailer
-SLOT=0
-SRC_URI=https://raw-thumbnailer.googlecode.com/files/raw-thumbnailer-0.2.1.tar.gz
-_md5_=beee24c22a07ceb4aadce5233e5bfae4
diff --git a/metadata/md5-cache/media-gfx/rawtherapee-5.2 b/metadata/md5-cache/media-gfx/rawtherapee-5.2
index d5257280b712..35081dccf270 100644
--- a/metadata/md5-cache/media-gfx/rawtherapee-5.2
+++ b/metadata/md5-cache/media-gfx/rawtherapee-5.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/gtk+:3 dev-libs/expat dev-libs/libsigc++:2 media-libs/libcanberra[gtk3] media-libs/tiff:0 media-libs/libpng:0 media-libs/libiptcdata media-libs/lcms:2 sci-libs/fftw:3.0 sys-libs/zlib virtual/jpeg:0
 SLOT=0
 SRC_URI=http://rawtherapee.com/shared/source/rawtherapee-5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3434dd65f41b266a4983cba33c2f7149
diff --git a/metadata/md5-cache/media-gfx/rawtherapee-5.3 b/metadata/md5-cache/media-gfx/rawtherapee-5.3
index d2593295c9d7..d1c04aaec46a 100644
--- a/metadata/md5-cache/media-gfx/rawtherapee-5.3
+++ b/metadata/md5-cache/media-gfx/rawtherapee-5.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/gtk+:3 dev-libs/expat dev-libs/libsigc++:2 media-libs/libcanberra[gtk3] media-libs/tiff:0 media-libs/libpng:0 media-libs/libiptcdata media-libs/lcms:2 media-libs/lensfun sci-libs/fftw:3.0 sys-libs/zlib virtual/jpeg:0
 SLOT=0
 SRC_URI=http://rawtherapee.com/shared/source/rawtherapee-5.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=954ed9f728e3450667bbc7d88942fa3e
diff --git a/metadata/md5-cache/media-gfx/rawtherapee-5.4 b/metadata/md5-cache/media-gfx/rawtherapee-5.4
index 9112b9680fc2..a528c7c5c2fc 100644
--- a/metadata/md5-cache/media-gfx/rawtherapee-5.4
+++ b/metadata/md5-cache/media-gfx/rawtherapee-5.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/gtk+:3 dev-libs/expat dev-libs/libsigc++:2 media-libs/libcanberra[gtk3] media-libs/tiff:0 media-libs/libpng:0 media-libs/libiptcdata media-libs/lcms:2 media-libs/lensfun sci-libs/fftw:3.0 sys-libs/zlib virtual/jpeg:0
 SLOT=0
 SRC_URI=http://rawtherapee.com/shared/source/rawtherapee-5.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=324b38555d22f8c8bd7d386928c07f64
diff --git a/metadata/md5-cache/media-gfx/ristretto-0.8.2_p20170821 b/metadata/md5-cache/media-gfx/ristretto-0.8.2_p20170821
index 857d8030757f..ae1bd4d81bdb 100644
--- a/metadata/md5-cache/media-gfx/ristretto-0.8.2_p20170821
+++ b/metadata/md5-cache/media-gfx/ristretto-0.8.2_p20170821
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.98:0= >=dev-libs/glib-2.24:2= media-libs/libexif:0= x11-libs/cairo:0= >=x11-libs/gtk+-2.20:2= x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.10:0= >=xfce-base/libxfce4util-4.10:0= >=xfce-base/xfconf-4.10:0=
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/ristretto-0.8.2git-rd21ed3c.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=61a2b68b69ede6f0d82bc8a18deef20f
diff --git a/metadata/md5-cache/media-gfx/ristretto-0.8.3 b/metadata/md5-cache/media-gfx/ristretto-0.8.3
index cb4c5e5b30d7..9bf1f0bd9371 100644
--- a/metadata/md5-cache/media-gfx/ristretto-0.8.3
+++ b/metadata/md5-cache/media-gfx/ristretto-0.8.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.24:2 media-libs/libexif:0= x11-libs/cairo:0 >=x11-libs/gtk+-2.20:2 x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.10:0= >=xfce-base/libxfce4util-4.10:0= >=xfce-base/xfconf-4.10:0=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/ristretto/0.8/ristretto-0.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4828bddab0447a9a512617bb39413bac
diff --git a/metadata/md5-cache/media-gfx/sane-backends-1.0.27-r1 b/metadata/md5-cache/media-gfx/sane-backends-1.0.27-r1
index 8dc2054f8748..54c63c50fef9 100644
--- a/metadata/md5-cache/media-gfx/sane-backends-1.0.27-r1
+++ b/metadata/md5-cache/media-gfx/sane-backends-1.0.27-r1
@@ -10,5 +10,5 @@ RDEPEND=sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(
 REQUIRED_USE=sane_backends_mustek_usb2? ( threads ) sane_backends_kvs40xx? ( threads )
 SLOT=0
 SRC_URI=https://alioth.debian.org/frs/download.php/file/4224/sane-backends-1.0.27.tar.gz
-_eclasses_=desktop	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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2ebdaf551d8cb66e15bd7edfe33f2324
diff --git a/metadata/md5-cache/media-gfx/scantailor-advanced-1.0.14 b/metadata/md5-cache/media-gfx/scantailor-advanced-1.0.14
index e12bb92a5b36..31ef937efd91 100644
--- a/metadata/md5-cache/media-gfx/scantailor-advanced-1.0.14
+++ b/metadata/md5-cache/media-gfx/scantailor-advanced-1.0.14
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-3 public-domain
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/libpng:0= media-libs/tiff:0 sys-libs/zlib virtual/jpeg:0 x11-libs/libXrender
 SLOT=0
 SRC_URI=https://github.com/4lex4/scantailor-advanced/archive/v1.0.14.tar.gz -> scantailor-advanced-1.0.14.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=1030a0ef150d1593571919b757718ef3
diff --git a/metadata/md5-cache/media-gfx/scour-0.35-r1 b/metadata/md5-cache/media-gfx/scour-0.35-r1
index 1cde7142a1b3..8fa07dcb4801 100644
--- a/metadata/md5-cache/media-gfx/scour-0.35-r1
+++ b/metadata/md5-cache/media-gfx/scour-0.35-r1
@@ -10,5 +10,5 @@ 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
 SRC_URI=https://github.com/codedread/scour/archive/v0.35.tar.gz -> scour-0.35.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c32abd238cd5d78b2d5380b985803405
diff --git a/metadata/md5-cache/media-gfx/scour-0.36 b/metadata/md5-cache/media-gfx/scour-0.36
index 119e31f6d025..5c1a31edfa84 100644
--- a/metadata/md5-cache/media-gfx/scour-0.36
+++ b/metadata/md5-cache/media-gfx/scour-0.36
@@ -10,5 +10,5 @@ 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
 SRC_URI=https://github.com/scour-project/scour/archive/v0.36.tar.gz -> scour-0.36.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=73932741905a0fe9319f8a37186b3357
diff --git a/metadata/md5-cache/media-gfx/shotwell-0.26.4 b/metadata/md5-cache/media-gfx/shotwell-0.26.4
index 4a4a9c4ba7d4..6d8e87194895 100644
--- a/metadata/md5-cache/media-gfx/shotwell-0.26.4
+++ b/metadata/md5-cache/media-gfx/shotwell-0.26.4
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=app-crypt/gcr-3[gtk] >=dev-db/sqlite-3.5.9:3 >=dev-libs/glib-2.40.0:2 >=dev-libs/json-glib-0.7.6 >=dev-libs/libgee-0.8.5:0.8 >=dev-libs/libxml2-2.6.32:2 gnome-base/dconf >=media-libs/gexiv2-0.10.4 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0 media-libs/lcms:2 >=media-libs/libexif-0.6.16:= >=media-libs/libgphoto2-2.5:= >=media-libs/libraw-0.13.2:= media-plugins/gst-plugins-gdkpixbuf:1.0 >=net-libs/libsoup-2.42.0:2.4 net-libs/webkit-gtk:4 virtual/libgudev:=[introspection] >=x11-libs/gtk+-3.14.0:3[X] dev-libs/libgdata
 SLOT=0
 SRC_URI=mirror://gnome/sources/shotwell/0.26/shotwell-0.26.4.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5975332d4fe4524826f765f3338c7007
diff --git a/metadata/md5-cache/media-gfx/shotwell-0.28.2 b/metadata/md5-cache/media-gfx/shotwell-0.28.2
index acd3500f3922..61d2bcd25714 100644
--- a/metadata/md5-cache/media-gfx/shotwell-0.28.2
+++ b/metadata/md5-cache/media-gfx/shotwell-0.28.2
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=app-crypt/gcr-3[gtk] >=dev-db/sqlite-3.5.9:3 >=dev-libs/glib-2.40.0:2 >=dev-libs/json-glib-0.7.6 >=dev-libs/libgee-0.8.5:0.8 >=dev-libs/libxml2-2.6.32:2 gnome-base/dconf >=media-libs/gexiv2-0.10.4 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0 media-libs/lcms:2 >=media-libs/libexif-0.6.16:= >=media-libs/libgphoto2-2.5:= >=media-libs/libraw-0.13.2:= media-plugins/gst-plugins-gdkpixbuf:1.0 >=net-libs/libsoup-2.42.0:2.4 net-libs/webkit-gtk:4 virtual/libgudev:=[introspection] >=x11-libs/gtk+-3.14.0:3[X] dev-libs/libgdata
 SLOT=0
 SRC_URI=mirror://gnome/sources/shotwell/0.28/shotwell-0.28.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5975332d4fe4524826f765f3338c7007
diff --git a/metadata/md5-cache/media-gfx/shotwell-0.28.3 b/metadata/md5-cache/media-gfx/shotwell-0.28.3
index d84e5fb3d50f..034b5da1f151 100644
--- a/metadata/md5-cache/media-gfx/shotwell-0.28.3
+++ b/metadata/md5-cache/media-gfx/shotwell-0.28.3
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=app-crypt/gcr-3[gtk] >=dev-db/sqlite-3.5.9:3 >=dev-libs/glib-2.40.0:2 >=dev-libs/json-glib-0.7.6 >=dev-libs/libgee-0.8.5:0.8 >=dev-libs/libxml2-2.6.32:2 gnome-base/dconf >=media-libs/gexiv2-0.10.4 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0 media-libs/lcms:2 >=media-libs/libexif-0.6.16:= >=media-libs/libgphoto2-2.5:= >=media-libs/libraw-0.13.2:= media-plugins/gst-plugins-gdkpixbuf:1.0 >=net-libs/libsoup-2.42.0:2.4 net-libs/webkit-gtk:4 virtual/libgudev:=[introspection] >=x11-libs/gtk+-3.14.0:3[X] dev-libs/libgdata
 SLOT=0
 SRC_URI=mirror://gnome/sources/shotwell/0.28/shotwell-0.28.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7e37dddeb80a80e9732a2e803a61cc3c
diff --git a/metadata/md5-cache/media-gfx/shotwell-0.29.2 b/metadata/md5-cache/media-gfx/shotwell-0.29.2
index f7b1140c9e5a..bb5661401b15 100644
--- a/metadata/md5-cache/media-gfx/shotwell-0.29.2
+++ b/metadata/md5-cache/media-gfx/shotwell-0.29.2
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=app-crypt/gcr:=[gtk,vala] dev-libs/libgdata:=[vala] dev-libs/libgee:= media-libs/gexiv2:=[introspection,vala] media-libs/libexif:= media-libs/libgphoto2:= media-libs/libraw:= net-libs/webkit-gtk:= x11-libs/gtk+:=[X]
 SLOT=0
 SRC_URI=mirror://gnome/sources/shotwell/0.29/shotwell-0.29.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=626def5eed659b5571549bcf3d769c70
diff --git a/metadata/md5-cache/media-gfx/shotwell-0.29.3 b/metadata/md5-cache/media-gfx/shotwell-0.29.3
index 7506772d3e2d..4f46ca689b84 100644
--- a/metadata/md5-cache/media-gfx/shotwell-0.29.3
+++ b/metadata/md5-cache/media-gfx/shotwell-0.29.3
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=app-crypt/gcr:=[gtk,vala] dev-libs/libgdata:=[vala] dev-libs/libgee:= media-libs/gexiv2:=[introspection,vala] media-libs/libexif:= media-libs/libgphoto2:= media-libs/libraw:= net-libs/webkit-gtk:= x11-libs/gtk+:=[X]
 SLOT=0
 SRC_URI=mirror://gnome/sources/shotwell/0.29/shotwell-0.29.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=626def5eed659b5571549bcf3d769c70
diff --git a/metadata/md5-cache/media-gfx/sigal-1.3.0 b/metadata/md5-cache/media-gfx/sigal-1.3.0
index 3bed126ba246..67e1efec6a7a 100644
--- a/metadata/md5-cache/media-gfx/sigal-1.3.0
+++ b/metadata/md5-cache/media-gfx/sigal-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/blinker[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/saimn/sigal/archive/1.3.0.tar.gz -> sigal-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c6de03e34a216d43b9839f3a151fc842
diff --git a/metadata/md5-cache/media-gfx/simple-scan-3.24.1 b/metadata/md5-cache/media-gfx/simple-scan-3.24.1
index f41f66075a9b..b9c8bc63922c 100644
--- a/metadata/md5-cache/media-gfx/simple-scan-3.24.1
+++ b/metadata/md5-cache/media-gfx/simple-scan-3.24.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.32:2 dev-libs/libgusb[vala] >=media-gfx/sane-backends-1.0.20:= >=sys-libs/zlib-1.2.3.1:= virtual/jpeg:0= x11-libs/cairo:= >=x11-libs/gtk+-3:3 colord? ( >=x11-misc/colord-0.1.24:=[udev] ) x11-misc/xdg-utils x11-themes/adwaita-icon-theme
 SLOT=0
 SRC_URI=https://launchpad.net/simple-scan/3.24/3.24.1/+download/simple-scan-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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d309f0f68791a9f9ac0af6f00b35a5b8
diff --git a/metadata/md5-cache/media-gfx/svg2rlg-0.3 b/metadata/md5-cache/media-gfx/svg2rlg-0.3
index 1de7a894af85..d9a94c42dec3 100644
--- a/metadata/md5-cache/media-gfx/svg2rlg-0.3
+++ b/metadata/md5-cache/media-gfx/svg2rlg-0.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/svg2rlg/svg2rlg-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=994885ce499bd9990c152c52fd2eb4a7
diff --git a/metadata/md5-cache/media-gfx/sxiv-24 b/metadata/md5-cache/media-gfx/sxiv-24
index ebd52f389d43..70f0a9122ca1 100644
--- a/metadata/md5-cache/media-gfx/sxiv-24
+++ b/metadata/md5-cache/media-gfx/sxiv-24
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=exif? ( media-libs/libexif ) gif? ( media-libs/giflib:0= ) media-libs/imlib2[X,gif?] x11-libs/libX11 x11-libs/libXft
 SLOT=0
 SRC_URI=https://github.com/muennich/sxiv/archive/v24.tar.gz -> sxiv-24.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=51e948687e383489b0fae72266e63e4f
diff --git a/metadata/md5-cache/media-gfx/sxiv-9999 b/metadata/md5-cache/media-gfx/sxiv-9999
index be5f75c14cf9..21ac03b6c8dc 100644
--- a/metadata/md5-cache/media-gfx/sxiv-9999
+++ b/metadata/md5-cache/media-gfx/sxiv-9999
@@ -7,5 +7,5 @@ IUSE=exif gif savedconfig
 LICENSE=GPL-2
 RDEPEND=exif? ( media-libs/libexif ) gif? ( media-libs/giflib:0= ) media-libs/imlib2[X,gif?] x11-libs/libX11 x11-libs/libXft
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a8bec5c1bb444a128042228fbc6c6f9c
diff --git a/metadata/md5-cache/media-gfx/symboleditor-2.0.0 b/metadata/md5-cache/media-gfx/symboleditor-2.0.0
index 12f8ebac78f4..8e34123602c2 100644
--- a/metadata/md5-cache/media-gfx/symboleditor-2.0.0
+++ b/metadata/md5-cache/media-gfx/symboleditor-2.0.0
@@ -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/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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/synnefo-1.1.0 b/metadata/md5-cache/media-gfx/synnefo-1.1.0
index 8ef8d64c1490..048f80a3b199 100644
--- a/metadata/md5-cache/media-gfx/synnefo-1.1.0
+++ b/metadata/md5-cache/media-gfx/synnefo-1.1.0
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=media-libs/oyranos-0.9.6 x11-misc/xcalib
 SLOT=0
 SRC_URI=https://github.com/oyranos-cms/Synnefo/archive/1.1.0.tar.gz -> synnefo-1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1bc191c4f7d77dc91e7d3888f187b24d
diff --git a/metadata/md5-cache/media-gfx/termtosvg-0.4.0 b/metadata/md5-cache/media-gfx/termtosvg-0.4.0
index e7b9e6b3096d..afabd660ec53 100644
--- a/metadata/md5-cache/media-gfx/termtosvg-0.4.0
+++ b/metadata/md5-cache/media-gfx/termtosvg-0.4.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/nbedos/termtosvg/archive/0.4.0.tar.gz -> termtosvg-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=618100f61c5db536997b17f3cc77cec7
diff --git a/metadata/md5-cache/media-gfx/tuxpaint-0.9.21-r2 b/metadata/md5-cache/media-gfx/tuxpaint-0.9.21-r2
index 4e9450a88380..dc0ba459058e 100644
--- a/metadata/md5-cache/media-gfx/tuxpaint-0.9.21-r2
+++ b/metadata/md5-cache/media-gfx/tuxpaint-0.9.21-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/libpaper dev-libs/fribidi gnome-base/librsvg:2 >=media-libs/libpng-1.2:0= >=media-libs/freetype-2:2 media-libs/libsdl media-libs/sdl-image[png] media-libs/sdl-mixer media-libs/sdl-pango media-libs/sdl-ttf x11-libs/cairo
 SLOT=0
 SRC_URI=mirror://sourceforge/tuxpaint/tuxpaint-0.9.21.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=36c66ff1b0b3148bbfa409342e1d834a
diff --git a/metadata/md5-cache/media-gfx/ufraw-0.22-r2 b/metadata/md5-cache/media-gfx/ufraw-0.22-r2
index d9f7034860c4..60b53fe81c49 100644
--- a/metadata/md5-cache/media-gfx/ufraw-0.22-r2
+++ b/metadata/md5-cache/media-gfx/ufraw-0.22-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2= >=media-gfx/exiv2-0.11:0= media-libs/lcms:2= >=media-li
 REQUIRED_USE=gimp? ( gtk )
 SLOT=0
 SRC_URI=mirror://sourceforge/ufraw/ufraw-0.22.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5d79d3f00010283d361deade72217725
diff --git a/metadata/md5-cache/media-gfx/uniconvertor-2.0_pre379-r1 b/metadata/md5-cache/media-gfx/uniconvertor-2.0_pre379-r1
index ae5b57aa2dd5..a9dcce5668ff 100644
--- a/metadata/md5-cache/media-gfx/uniconvertor-2.0_pre379-r1
+++ b/metadata/md5-cache/media-gfx/uniconvertor-2.0_pre379-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/uniconvertor-2.0_pre379.tar.xz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dc02259b33e664684910b49f67b5d4ab
diff --git a/metadata/md5-cache/media-gfx/uniconvertor-2.0_pre379-r2 b/metadata/md5-cache/media-gfx/uniconvertor-2.0_pre379-r2
index 9ac0968b53ab..064a443ce3e6 100644
--- a/metadata/md5-cache/media-gfx/uniconvertor-2.0_pre379-r2
+++ b/metadata/md5-cache/media-gfx/uniconvertor-2.0_pre379-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/uniconvertor-2.0_pre379.tar.xz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cc71c70e788410272bb0d10643dfd9cf
diff --git a/metadata/md5-cache/media-gfx/valentina-0.5.0-r2 b/metadata/md5-cache/media-gfx/valentina-0.5.0-r2
index e7f1cf9b7437..0c96becee282 100644
--- a/metadata/md5-cache/media-gfx/valentina-0.5.0-r2
+++ b/metadata/md5-cache/media-gfx/valentina-0.5.0-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=app-text/poppler dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5
 SLOT=0
 SRC_URI=https://bitbucket.org/dismine/valentina/get/v0.5.0.zip -> valentina-0.5.0.zip https://bitbucket.org/dismine/valentina/commits/d78ca13c4891ccf3542b0704a7d66af0f9b02938/raw -> valentina-4798.patch https://bitbucket.org/dismine/valentina/commits/98e869c4146204ef31822087fa826cfa1cd7e0f4/raw -> valentina-4802.patch https://bitbucket.org/dismine/valentina/commits/572fe909f75e013be310905c118e1afe4368db1c/raw -> valentina-5406.patch
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=84311c4aeafd0d6bf770e2b229020d6d
diff --git a/metadata/md5-cache/media-gfx/valentina-0.6.0 b/metadata/md5-cache/media-gfx/valentina-0.6.0
new file mode 100644
index 000000000000..7b308bce8f6d
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/valentina-0.6.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst
+DEPEND=app-text/poppler dev-qt/linguist:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 app-arch/unzip >=sys-apps/sed-4
+DESCRIPTION=Cloth patternmaking software
+EAPI=6
+HOMEPAGE=https://valentinaproject.bitbucket.io/
+IUSE=gnome l10n_cs l10n_de l10n_el l10n_en l10n_en l10n_es l10n_fi l10n_fr l10n_he l10n_id l10n_it l10n_nl l10n_pt-BR l10n_ro l10n_ru l10n_uk l10n_zh-CN
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=app-text/poppler dev-qt/linguist:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5
+SLOT=0
+SRC_URI=https://bitbucket.org/dismine/valentina/get/v0.6.0.zip -> valentina-0.6.0.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_=b49cc2c5638b4d648ae550a27005bbba
diff --git a/metadata/md5-cache/media-gfx/valentina-9999 b/metadata/md5-cache/media-gfx/valentina-9999
index c3e5c857f28c..4d56d4390637 100644
--- a/metadata/md5-cache/media-gfx/valentina-9999
+++ b/metadata/md5-cache/media-gfx/valentina-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=configure install postinst unpack
-DEPEND=app-text/poppler dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 dev-vcs/mercurial >=sys-apps/sed-4
+DEPEND=app-text/poppler dev-qt/linguist:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 dev-vcs/mercurial >=sys-apps/sed-4
 DESCRIPTION=Cloth patternmaking software
 EAPI=6
 HOMEPAGE=https://valentinaproject.bitbucket.io/
 IUSE=gnome l10n_cs l10n_de l10n_el l10n_en l10n_en l10n_es l10n_fi l10n_fr l10n_he l10n_id l10n_it l10n_nl l10n_pt-BR l10n_ro l10n_ru l10n_uk l10n_zh-CN
 LICENSE=GPL-3
-RDEPEND=app-text/poppler dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5
+RDEPEND=app-text/poppler dev-qt/linguist:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mercurial	9813bb616cb1bd0c943177ab52204409	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=ef33d5aee5a9616f6303a34c3ea01954
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mercurial	9813bb616cb1bd0c943177ab52204409	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1fb4a14acdc9a7150ecad4e892abab55
diff --git a/metadata/md5-cache/media-gfx/viewnior-1.6 b/metadata/md5-cache/media-gfx/viewnior-1.6
index 9f41e09404c0..e39d7206a516 100644
--- a/metadata/md5-cache/media-gfx/viewnior-1.6
+++ b/metadata/md5-cache/media-gfx/viewnior-1.6
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 media-gfx/exiv2 >=x11-libs/gtk+-2.20:2 x11-misc/shared-mime-info
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/media-gfx/xdot-0.8 b/metadata/md5-cache/media-gfx/xdot-0.8
index 6861397e4a91..877a3348d2b3 100644
--- a/metadata/md5-cache/media-gfx/xdot-0.8
+++ b/metadata/md5-cache/media-gfx/xdot-0.8
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/jrfonseca/xdot.py/archive/0.8.tar.gz -> xdot-0.8.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ff4586187648e974276d77b08fd9e259
diff --git a/metadata/md5-cache/media-gfx/xdot-1.0 b/metadata/md5-cache/media-gfx/xdot-1.0
index 146ed6b5e75e..a8845f118fe8 100644
--- a/metadata/md5-cache/media-gfx/xdot-1.0
+++ b/metadata/md5-cache/media-gfx/xdot-1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/jrfonseca/xdot.py/archive/1.0.tar.gz -> xdot-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ff4586187648e974276d77b08fd9e259
diff --git a/metadata/md5-cache/media-gfx/xdot-9999 b/metadata/md5-cache/media-gfx/xdot-9999
index 4f9d73a1e98a..1d9dd729f349 100644
--- a/metadata/md5-cache/media-gfx/xdot-9999
+++ b/metadata/md5-cache/media-gfx/xdot-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-gfx/graphviz[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_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=6bffb4475e8b55520ff47f353aa83438
diff --git a/metadata/md5-cache/media-gfx/yafaray-3.3.0 b/metadata/md5-cache/media-gfx/yafaray-3.3.0
index 1576a546ad9e..6c89b20cdd9b 100644
--- a/metadata/md5-cache/media-gfx/yafaray-3.3.0
+++ b/metadata/md5-cache/media-gfx/yafaray-3.3.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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-libs/Field3D-1.7.2 b/metadata/md5-cache/media-libs/Field3D-1.7.2
index f66603f5fa86..44dae8012a91 100644
--- a/metadata/md5-cache/media-libs/Field3D-1.7.2
+++ b/metadata/md5-cache/media-libs/Field3D-1.7.2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/boost-1.62:= >=media-libs/ilmbase-2.2.0:= sci-libs/hdf5:= virtual/mpi
 SLOT=0
 SRC_URI=https://github.com/imageworks/Field3D/archive/v1.7.2.tar.gz -> Field3D-1.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c0a6716ef339f4177d2b00c9f8798036
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 8f3851ac6b0b..8a87a8cf0ed3 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/aften-0.0.8-r2 b/metadata/md5-cache/media-libs/aften-0.0.8-r2
index e8053300d0f4..636280bdfcf1 100644
--- a/metadata/md5-cache/media-libs/aften-0.0.8-r2
+++ b/metadata/md5-cache/media-libs/aften-0.0.8-r2
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc x86
 LICENSE=LGPL-2.1 BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/aften/aften-0.0.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=34e198b2f1db107ff33721e0d372f715
diff --git a/metadata/md5-cache/media-libs/allegro-4.4.2-r1 b/metadata/md5-cache/media-libs/allegro-4.4.2-r1
index 8bb0b4db16f2..8cdd9e61736e 100644
--- a/metadata/md5-cache/media-libs/allegro-4.4.2-r1
+++ b/metadata/md5-cache/media-libs/allegro-4.4.2-r1
@@ -9,5 +9,5 @@ LICENSE=Allegro MIT GPL-2+ ZLIB
 RDEPEND=alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) svga? ( media-libs/svgalib ) vorbis? ( media-libs/libvorbis ) X? ( x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXpm x11-libs/libXt x11-libs/libXxf86dga x11-libs/libXxf86vm opengl? ( virtual/glu virtual/opengl ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/alleg/allegro-4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=68af51db2c36d4e5fd694586a0620314
diff --git a/metadata/md5-cache/media-libs/allegro-5.0.11 b/metadata/md5-cache/media-libs/allegro-5.0.11
index 96c452d55b23..fd24b30b9781 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=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 7e4612a0f1cc..c4561562ebd7 100644
--- a/metadata/md5-cache/media-libs/allegro-5.2.4.0
+++ b/metadata/md5-cache/media-libs/allegro-5.2.4.0
@@ -4,11 +4,11 @@ DESCRIPTION=Cross-platform library aimed at video game and multimedia programmin
 EAPI=6
 HOMEPAGE=https://liballeg.org/
 IUSE=alsa dumb flac gtk jpeg openal opengl opus oss physfs png pulseaudio test truetype vorbis webp X xinerama abi_x86_32 abi_x86_64 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 ppc ppc64 x86
 LICENSE=BSD 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(-)?] ) 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(-)?] ) opengl? ( >=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(-)?] ) opus? ( media-libs/opus[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) webp? ( media-libs/libwebp:0=[abi_x86_32(-)?,abi_x86_64(-)?,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/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(-)?] )
 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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=4e28d620bb3fb3f4da5fdf61b4fd163f
+_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_=922151bcac7fa669398965f68e8e6142
diff --git a/metadata/md5-cache/media-libs/alure-1.2-r1 b/metadata/md5-cache/media-libs/alure-1.2-r1
index 639ff9cc0449..5b4e9248f32b 100644
--- a/metadata/md5-cache/media-libs/alure-1.2-r1
+++ b/metadata/md5-cache/media-libs/alure-1.2-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=media-libs/openal-1.1 dumb? ( media-libs/dumb ) flac? ( media-libs/flac ) fluidsynth? ( >=media-sound/fluidsynth-1.1.1 ) mp3? ( media-sound/mpg123 ) sndfile? ( media-libs/libsndfile ) vorbis? ( media-libs/libvorbis )
 SLOT=0
 SRC_URI=http://kcat.strangesoft.net/alure-releases/alure-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7c71b1bd1a1ee97f6197da5dde390e07
diff --git a/metadata/md5-cache/media-libs/ampache_browser-1.0.0 b/metadata/md5-cache/media-libs/ampache_browser-1.0.0
index 68f8db37633e..277643a087b3 100644
--- a/metadata/md5-cache/media-libs/ampache_browser-1.0.0
+++ b/metadata/md5-cache/media-libs/ampache_browser-1.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://github.com/ampache-browser/ampache_browser/archive/v1.0.0.tar.gz -> ampache_browser-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=96d95788d2e5eb5e7b9a1b9033aba12b
diff --git a/metadata/md5-cache/media-libs/ampache_browser-1.0.1 b/metadata/md5-cache/media-libs/ampache_browser-1.0.1
index 5776ca3e6e7f..cb5dcdf9de72 100644
--- a/metadata/md5-cache/media-libs/ampache_browser-1.0.1
+++ b/metadata/md5-cache/media-libs/ampache_browser-1.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://github.com/ampache-browser/ampache_browser/archive/v1.0.1.tar.gz -> ampache_browser-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d296570b878d48f6645dcd802c4cd66a
diff --git a/metadata/md5-cache/media-libs/assimp-4.0.1 b/metadata/md5-cache/media-libs/assimp-4.0.1
index 26966e7f54a6..060b6b47c925 100644
--- a/metadata/md5-cache/media-libs/assimp-4.0.1
+++ b/metadata/md5-cache/media-libs/assimp-4.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost:= sys-libs/zlib:=[minizip] samples? ( media-libs/freeglut virtual/opengl x11-libs/libX11 ) tools? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 media-libs/devil virtual/opengl )
 SLOT=0
 SRC_URI=https://github.com/assimp/assimp/archive/v4.0.1.tar.gz -> assimp-4.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e97c07667f87fc8ab4930daa62290752
diff --git a/metadata/md5-cache/media-libs/aubio-0.4.1-r1 b/metadata/md5-cache/media-libs/aubio-0.4.1-r1
deleted file mode 100644
index 208eabecad98..000000000000
--- a/metadata/md5-cache/media-libs/aubio-0.4.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=ffmpeg? ( virtual/ffmpeg ) fftw? ( sci-libs/fftw:3.0 ) jack? ( virtual/jack ) libsamplerate? ( media-libs/libsamplerate ) python? ( dev-python/numpy[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(-)] ) sndfile? ( media-libs/libsndfile ) 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(-)] virtual/pkgconfig app-text/txt2man doc? ( app-doc/doxygen )
-DESCRIPTION=Library for audio labelling
-EAPI=5
-HOMEPAGE=https://aubio.org/
-IUSE=doc double-precision examples ffmpeg fftw jack libsamplerate sndfile python python_targets_python2_7
-KEYWORDS=amd64 ~ppc ppc64 sparc x86
-LICENSE=GPL-3
-RDEPEND=ffmpeg? ( virtual/ffmpeg ) fftw? ( sci-libs/fftw:3.0 ) jack? ( virtual/jack ) libsamplerate? ( media-libs/libsamplerate ) python? ( dev-python/numpy[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(-)] ) sndfile? ( media-libs/libsndfile )
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://aubio.org/pub/aubio-0.4.1.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	waf-utils	77ee347982e4e1d405ed64356b80201a	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=a47bf124d5ef75a7f70fdaa4a1d349ec
diff --git a/metadata/md5-cache/media-libs/aubio-0.4.2-r1 b/metadata/md5-cache/media-libs/aubio-0.4.2-r1
deleted file mode 100644
index e346d0625653..000000000000
--- a/metadata/md5-cache/media-libs/aubio-0.4.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=ffmpeg? ( !libav? ( >=media-video/ffmpeg-2.6:0= ) libav? ( >=media-video/libav-9:0= ) ) fftw? ( sci-libs/fftw:3.0 ) jack? ( virtual/jack ) libsamplerate? ( media-libs/libsamplerate ) python? ( dev-python/numpy[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(-)] ) sndfile? ( media-libs/libsndfile ) 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(-)] virtual/pkgconfig app-text/txt2man doc? ( app-doc/doxygen )
-DESCRIPTION=Library for audio labelling
-EAPI=5
-HOMEPAGE=https://aubio.org/
-IUSE=doc double-precision examples ffmpeg fftw jack libav libsamplerate sndfile python python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=ffmpeg? ( !libav? ( >=media-video/ffmpeg-2.6:0= ) libav? ( >=media-video/libav-9:0= ) ) fftw? ( sci-libs/fftw:3.0 ) jack? ( virtual/jack ) libsamplerate? ( media-libs/libsamplerate ) python? ( dev-python/numpy[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(-)] ) sndfile? ( media-libs/libsndfile )
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://aubio.org/pub/aubio-0.4.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	waf-utils	77ee347982e4e1d405ed64356b80201a	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=6807a9a38f2872c8d364d3be796ff415
diff --git a/metadata/md5-cache/media-libs/aubio-0.4.6 b/metadata/md5-cache/media-libs/aubio-0.4.6
deleted file mode 100644
index c335cff22831..000000000000
--- a/metadata/md5-cache/media-libs/aubio-0.4.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=ffmpeg? ( !libav? ( >=media-video/ffmpeg-2.6:0= ) libav? ( >=media-video/libav-9:0= ) ) fftw? ( sci-libs/fftw:3.0 ) jack? ( virtual/jack ) libsamplerate? ( media-libs/libsamplerate ) python? ( dev-python/numpy[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(-)] ) sndfile? ( media-libs/libsndfile ) 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(-)] app-text/txt2man virtual/pkgconfig doc? ( app-doc/doxygen )
-DESCRIPTION=Library for audio labelling
-EAPI=6
-HOMEPAGE=https://aubio.org/
-IUSE=doc double-precision examples ffmpeg fftw jack libav libsamplerate sndfile python python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=ffmpeg? ( !libav? ( >=media-video/ffmpeg-2.6:0= ) libav? ( >=media-video/libav-9:0= ) ) fftw? ( sci-libs/fftw:3.0 ) jack? ( virtual/jack ) libsamplerate? ( media-libs/libsamplerate ) python? ( dev-python/numpy[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(-)] ) sndfile? ( media-libs/libsndfile )
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0/5
-SRC_URI=https://aubio.org/pub/aubio-0.4.6.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	waf-utils	77ee347982e4e1d405ed64356b80201a	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=00adaed8c142c85cf2393621610dbaa9
diff --git a/metadata/md5-cache/media-libs/aubio-0.4.7 b/metadata/md5-cache/media-libs/aubio-0.4.7
index fb4d613f4e5e..dd3003d95cec 100644
--- a/metadata/md5-cache/media-libs/aubio-0.4.7
+++ b/metadata/md5-cache/media-libs/aubio-0.4.7
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=ffmpeg? ( !libav? ( >=media-video/ffmpeg-2.6:0= ) libav? ( >=media-video/libav-9:0= ) ) fftw? ( sci-libs/fftw:3.0 ) jack? ( virtual/jack ) libsamplerate? ( media-libs/libsamplerate ) python? ( dev-python/numpy[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(-)] ) sndfile? ( media-libs/libsndfile ) 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(-)] app-text/txt2man virtual/pkgconfig doc? ( app-doc/doxygen )
+DEPEND=ffmpeg? ( !libav? ( >=media-video/ffmpeg-2.6:0= ) libav? ( >=media-video/libav-9:0= ) ) fftw? ( sci-libs/fftw:3.0= ) jack? ( virtual/jack ) libsamplerate? ( media-libs/libsamplerate ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sndfile? ( media-libs/libsndfile ) 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(-)] app-text/txt2man virtual/pkgconfig doc? ( app-doc/doxygen )
 DESCRIPTION=Library for audio labelling
 EAPI=6
 HOMEPAGE=https://aubio.org/
-IUSE=doc double-precision examples ffmpeg fftw jack libav libsamplerate sndfile python python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+IUSE=doc double-precision examples ffmpeg fftw jack libav libsamplerate sndfile python test python_targets_python2_7
+KEYWORDS=amd64 ~ppc ppc64 sparc x86
 LICENSE=GPL-3
-RDEPEND=ffmpeg? ( !libav? ( >=media-video/ffmpeg-2.6:0= ) libav? ( >=media-video/libav-9:0= ) ) fftw? ( sci-libs/fftw:3.0 ) jack? ( virtual/jack ) libsamplerate? ( media-libs/libsamplerate ) python? ( dev-python/numpy[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(-)] ) sndfile? ( media-libs/libsndfile )
-REQUIRED_USE=|| ( python_targets_python2_7 )
+RDEPEND=ffmpeg? ( !libav? ( >=media-video/ffmpeg-2.6:0= ) libav? ( >=media-video/libav-9:0= ) ) fftw? ( sci-libs/fftw:3.0= ) jack? ( virtual/jack ) libsamplerate? ( media-libs/libsamplerate ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sndfile? ( media-libs/libsndfile )
+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_=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	waf-utils	77ee347982e4e1d405ed64356b80201a	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=9fa9e6bd719dff784e158598fda4b0ed
+_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
+_md5_=3162370198f08353c9344dcd2041bb24
diff --git a/metadata/md5-cache/media-libs/avidemux-core-2.6.20-r2 b/metadata/md5-cache/media-libs/avidemux-core-2.6.20-r2
index 6d23f8d9b8b7..8f531f94923d 100644
--- a/metadata/md5-cache/media-libs/avidemux-core-2.6.20-r2
+++ b/metadata/md5-cache/media-libs/avidemux-core-2.6.20-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-1 GPL-2 MIT PSF-2 public-domain
 RDEPEND=!<media-video/avidemux-2.6.20:2.6 dev-db/sqlite:3 sdl? ( media-libs/libsdl:0 ) system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] ) xv? ( x11-libs/libXv:0 ) vaapi? ( x11-libs/libva:0 ) vdpau? ( x11-libs/libvdpau:0 ) nvenc? ( media-video/nvidia_video_sdk ) nls? ( virtual/libintl:0 )
 SLOT=2.6
 SRC_URI=mirror://sourceforge/avidemux/avidemux/2.6.20/avidemux_2.6.20.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0912cbab0363df034c70ab48668189a5
diff --git a/metadata/md5-cache/media-libs/avidemux-core-2.7.0 b/metadata/md5-cache/media-libs/avidemux-core-2.7.0
index 65e93177c0c0..a668179ec779 100644
--- a/metadata/md5-cache/media-libs/avidemux-core-2.7.0
+++ b/metadata/md5-cache/media-libs/avidemux-core-2.7.0
@@ -9,5 +9,5 @@ LICENSE=GPL-1 GPL-2 MIT PSF-2 public-domain
 RDEPEND=dev-db/sqlite:3 nvenc? ( media-video/nvidia_video_sdk ) sdl? ( media-libs/libsdl:0 ) system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] ) vaapi? ( x11-libs/libva:0= ) vdpau? ( x11-libs/libvdpau:0 ) xv? ( x11-libs/libXv:0 ) !<media-libs/avidemux-core-2.7.0 !<media-video/avidemux-2.7.0 nls? ( virtual/libintl:0 )
 SLOT=2.7
 SRC_URI=mirror://sourceforge/avidemux/avidemux/2.7.0/avidemux_2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=508baa1cedb52840e302458d1646fc3a
diff --git a/metadata/md5-cache/media-libs/avidemux-core-9999 b/metadata/md5-cache/media-libs/avidemux-core-9999
index 089f1b94cd67..3ac84ce32393 100644
--- a/metadata/md5-cache/media-libs/avidemux-core-9999
+++ b/metadata/md5-cache/media-libs/avidemux-core-9999
@@ -7,5 +7,5 @@ IUSE=debug nls nvenc sdl system-ffmpeg vaapi vdpau xv
 LICENSE=GPL-1 GPL-2 MIT PSF-2 public-domain
 RDEPEND=dev-db/sqlite:3 nvenc? ( media-video/nvidia_video_sdk ) sdl? ( media-libs/libsdl:0 ) system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] ) vaapi? ( x11-libs/libva:0= ) vdpau? ( x11-libs/libvdpau:0 ) xv? ( x11-libs/libXv:0 ) !<media-libs/avidemux-core-9999 !<media-video/avidemux-9999 nls? ( virtual/libintl:0 )
 SLOT=2.7
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=508baa1cedb52840e302458d1646fc3a
diff --git a/metadata/md5-cache/media-libs/avidemux-plugins-2.6.20 b/metadata/md5-cache/media-libs/avidemux-plugins-2.6.20
index abf1b1d52fe3..3eeced8e0fe7 100644
--- a/metadata/md5-cache/media-libs/avidemux-plugins-2.6.20
+++ b/metadata/md5-cache/media-libs/avidemux-plugins-2.6.20
@@ -10,5 +10,5 @@ RDEPEND=~media-libs/avidemux-core-2.6.20:2.6[vdpau?] ~media-video/avidemux-2.6.2
 REQUIRED_USE=python_targets_python2_7
 SLOT=2.6
 SRC_URI=mirror://sourceforge/avidemux/avidemux/2.6.20/avidemux_2.6.20.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=abc9577d69e0cf2c0945b8593f62ba6b
diff --git a/metadata/md5-cache/media-libs/avidemux-plugins-2.7.0 b/metadata/md5-cache/media-libs/avidemux-plugins-2.7.0
index 3d7397248c71..9ea3589580e3 100644
--- a/metadata/md5-cache/media-libs/avidemux-plugins-2.7.0
+++ b/metadata/md5-cache/media-libs/avidemux-plugins-2.7.0
@@ -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=2.7
 SRC_URI=mirror://sourceforge/avidemux/avidemux/2.7.0/avidemux_2.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=f0cef79be42613e4196d476b6464dea1
diff --git a/metadata/md5-cache/media-libs/avidemux-plugins-9999 b/metadata/md5-cache/media-libs/avidemux-plugins-9999
index be07a9c655f5..9acfc9d5d6ad 100644
--- a/metadata/md5-cache/media-libs/avidemux-plugins-9999
+++ b/metadata/md5-cache/media-libs/avidemux-plugins-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-1 GPL-2 MIT PSF-2 public-domain
 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(+)] ~media-libs/avidemux-core-9999:2.7[vdpau?] ~media-video/avidemux-9999:2.7[opengl?,qt5?] >=dev-lang/spidermonkey-1.5-r2:0= dev-libs/libxml2:2 media-libs/a52dec:0 media-libs/libass:0= media-libs/libmad:0 media-libs/libmp4v2:0 media-libs/libpng:0= virtual/libiconv:0 aac? ( >=media-libs/faac-1.29.9.2:0 media-libs/faad2:0 ) aften? ( media-libs/aften:0 ) alsa? ( >=media-libs/alsa-lib-1.0.3b-r2:0 ) amr? ( media-libs/opencore-amr:0 ) dcaenc? ( media-sound/dcaenc:0 ) dts? ( media-libs/libdca:0 ) fdk? ( media-libs/fdk-aac:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) fribidi? ( dev-libs/fribidi:0 ) jack? ( media-sound/jack-audio-connection-kit:0 libsamplerate? ( media-libs/libsamplerate:0 ) ) lame? ( media-sound/lame:0 ) nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) ) opus? ( media-libs/opus:0 ) pulseaudio? ( media-sound/pulseaudio:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) truetype? ( media-libs/freetype:2 ) twolame? ( media-sound/twolame:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xv? ( x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXv:0 ) xvid? ( media-libs/xvid:0 ) !<media-libs/avidemux-plugins-9999
 REQUIRED_USE=python_targets_python2_7
 SLOT=2.7
-_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=448e39ffe5c77b2a2d25249a95e820f7
diff --git a/metadata/md5-cache/media-libs/chromaprint-1.4.2 b/metadata/md5-cache/media-libs/chromaprint-1.4.2
index 37b464fcf22c..df690910e51c 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4f93da75d05b39b25828788e3a528ae9
diff --git a/metadata/md5-cache/media-libs/chromaprint-1.4.3 b/metadata/md5-cache/media-libs/chromaprint-1.4.3
index 5f1c73015d79..4e353b296fc6 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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=c967c657738f241c21b7fb7f1d70d864
+_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
diff --git a/metadata/md5-cache/media-libs/clutter-1.26.2-r1 b/metadata/md5-cache/media-libs/clutter-1.26.2-r1
index 06d7a40eefd8..490782c21843 100644
--- a/metadata/md5-cache/media-libs/clutter-1.26.2-r1
+++ b/metadata/md5-cache/media-libs/clutter-1.26.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.44.0:2 >=dev-libs/atk-2.5.3[introspection?] >=dev-libs
 REQUIRED_USE=|| ( aqua wayland X ) wayland? ( egl )
 SLOT=1.0
 SRC_URI=mirror://gnome/sources/clutter/1.26/clutter-1.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=acd2b9140a41ce32d79b6b05e2d71eee
diff --git a/metadata/md5-cache/media-libs/clutter-gst-3.0.26 b/metadata/md5-cache/media-libs/clutter-gst-3.0.26
index 3d2b1872a36b..cb41b3419ee4 100644
--- a/metadata/md5-cache/media-libs/clutter-gst-3.0.26
+++ b/metadata/md5-cache/media-libs/clutter-gst-3.0.26
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.20:2 >=media-libs/clutter-1.20:1.0=[X=,introspection?] >=media-libs/cogl-1.18:1.0=[introspection?] >=media-libs/gstreamer-1.4:1.0[introspection?] >=media-libs/gst-plugins-bad-1.4:1.0 >=media-libs/gst-plugins-base-1.4:1.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.8:= ) udev? ( virtual/libgudev ) >=media-libs/gst-plugins-good-1.4:1.0 !udev? ( media-plugins/gst-plugins-v4l2 )
 SLOT=3.0
 SRC_URI=mirror://gnome/sources/clutter-gst/3.0/clutter-gst-3.0.26.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-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=d882b7bb749f63a8361eac2ea4ad4021
diff --git a/metadata/md5-cache/media-libs/clutter-gtk-1.8.4 b/metadata/md5-cache/media-libs/clutter-gtk-1.8.4
index 050bc56e018b..0281ecf568b8 100644
--- a/metadata/md5-cache/media-libs/clutter-gtk-1.8.4
+++ b/metadata/md5-cache/media-libs/clutter-gtk-1.8.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=x11-libs/gtk+-3.21.0:3[X=,introspection?,wayland=] >=media-libs/clutter-1.23.7:1.0[X=,gtk=,introspection?,wayland=] media-libs/cogl:1.0=[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.32:= )
 SLOT=1.0
 SRC_URI=mirror://gnome/sources/clutter-gtk/1.8/clutter-gtk-1.8.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9e2f075f31cb29c43bf4b3c55142cdcc
diff --git a/metadata/md5-cache/media-libs/codec2-0.7 b/metadata/md5-cache/media-libs/codec2-0.7
index b5a19ec00282..552baaf91596 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=519debfd4719859f8873333e9940efc4
diff --git a/metadata/md5-cache/media-libs/codec2-0.8.1 b/metadata/md5-cache/media-libs/codec2-0.8.1
index 472e1a1285d2..0861774e3ecc 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cd0f03ba2ad6f81058f7a9f56379c29b
diff --git a/metadata/md5-cache/media-libs/cogl-1.22.2 b/metadata/md5-cache/media-libs/cogl-1.22.2
index 36380bd24d4a..5fd96cc79796 100644
--- a/metadata/md5-cache/media-libs/cogl-1.22.2
+++ b/metadata/md5-cache/media-libs/cogl-1.22.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.32:2 x11-libs/cairo:= >=x11-libs/gdk-pixbuf-2:2 x11-libs/libX11 >=x11-libs/libXcomposite-0.4 x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXrandr-1.2 virtual/opengl gles2? ( media-libs/mesa[gles2] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) introspection? ( >=dev-libs/gobject-introspection-1.34.2:= ) kms? ( media-libs/mesa[gbm] x11-libs/libdrm:= ) pango? ( >=x11-libs/pango-1.20.0[introspection?] ) wayland? ( >=dev-libs/wayland-1.1.90 media-libs/mesa[egl,wayland] ) >=dev-util/gtk-doc-am-1.13 >=sys-devel/gettext-0.19 virtual/pkgconfig test? ( app-eselect/eselect-opengl media-libs/mesa[classic] ) >=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/glib-2.32:2 x11-libs/cairo:= >=x11-libs/gdk-pixbuf-2:2 x11-libs/libX11 >=x11-libs/libXcomposite-0.4 x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXrandr-1.2 virtual/opengl gles2? ( media-libs/mesa[gles2] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) introspection? ( >=dev-libs/gobject-introspection-1.34.2:= ) kms? ( media-libs/mesa[gbm] x11-libs/libdrm:= ) pango? ( >=x11-libs/pango-1.20.0[introspection?] ) wayland? ( >=dev-libs/wayland-1.1.90 media-libs/mesa[egl,wayland] ) dev-util/glib-utils >=dev-util/gtk-doc-am-1.13 >=sys-devel/gettext-0.19 virtual/pkgconfig test? ( app-eselect/eselect-opengl media-libs/mesa[classic] ) >=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 library for using 3D graphics hardware to draw pretty pictures
 EAPI=6
 HOMEPAGE=https://www.cogl3d.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=wayland? ( gles2 ) || ( gles2 opengl )
 RESTRICT=test
 SLOT=1.0/20
 SRC_URI=mirror://gnome/sources/cogl/1.22/cogl-1.22.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=c7a129cb251f9f1a33004667f699b664
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b7fa3fcc4d7bfd3ed0654df57a8fcff0
diff --git a/metadata/md5-cache/media-libs/coin-4.0.0a_pre20180416 b/metadata/md5-cache/media-libs/coin-4.0.0a_pre20180416
index a19e3bdff78e..c09f18ca9881 100644
--- a/metadata/md5-cache/media-libs/coin-4.0.0a_pre20180416
+++ b/metadata/md5-cache/media-libs/coin-4.0.0a_pre20180416
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 PEL )
 RDEPEND=app-arch/bzip2 dev-libs/expat media-libs/fontconfig media-libs/freetype:2 sys-libs/zlib virtual/opengl virtual/glu x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext javascript? ( dev-lang/spidermonkey:0 ) openal? ( media-libs/openal ) simage? ( media-libs/simage )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~reavertm/Coin3D-coin-8d1ca1a6ea23.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b546fae135f8535c38663b4b0be5d924
diff --git a/metadata/md5-cache/media-libs/ctl-1.5.2-r1 b/metadata/md5-cache/media-libs/ctl-1.5.2-r1
index a50985a498cc..9f4dfa3d206b 100644
--- a/metadata/md5-cache/media-libs/ctl-1.5.2-r1
+++ b/metadata/md5-cache/media-libs/ctl-1.5.2-r1
@@ -8,5 +8,5 @@ LICENSE=AMPAS
 RDEPEND=media-libs/ilmbase:= media-libs/openexr:= media-libs/tiff:= !media-libs/openexr_ctl
 SLOT=0
 SRC_URI=https://github.com/ampas/CTL/archive/ctl-1.5.2.tar.gz -> ctl-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0d04922f16322521329c6345d1500d50
diff --git a/metadata/md5-cache/media-libs/dav1d-9999 b/metadata/md5-cache/media-libs/dav1d-9999
index bd01734b8d3e..b03358e4d0b7 100644
--- a/metadata/md5-cache/media-libs/dav1d-9999
+++ b/metadata/md5-cache/media-libs/dav1d-9999
@@ -7,4 +7,4 @@ IUSE=+8bit +10bit +asm abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n
 LICENSE=BSD-2
 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
-_md5_=aa2711b72c36308958538e8514cff5a5
+_md5_=357f69309b42734a209479fa039757fe
diff --git a/metadata/md5-cache/media-libs/exempi-2.4.5 b/metadata/md5-cache/media-libs/exempi-2.4.5
deleted file mode 100644
index 68ce514aaf84..000000000000
--- a/metadata/md5-cache/media-libs/exempi-2.4.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/expat-2:= virtual/libiconv sys-libs/zlib:= sys-devel/autoconf-archive sys-devel/gettext test? ( >=dev-libs/boost-1.48 ) >=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=Exempi is a port of the Adobe XMP SDK to work on UNIX
-EAPI=6
-HOMEPAGE=https://libopenraw.freedesktop.org/wiki/Exempi
-IUSE=examples static-libs test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=>=dev-libs/expat-2:= virtual/libiconv sys-libs/zlib:=
-SLOT=2/3
-SRC_URI=https://libopenraw.freedesktop.org/download/exempi-2.4.5.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=a2d79bd7bf26e0da8ac611dfc4004f82
diff --git a/metadata/md5-cache/media-libs/exempi-2.4.5-r1 b/metadata/md5-cache/media-libs/exempi-2.4.5-r1
new file mode 100644
index 000000000000..d9544f2559d3
--- /dev/null
+++ b/metadata/md5-cache/media-libs/exempi-2.4.5-r1
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/autoconf-archive sys-devel/gettext test? ( >=dev-libs/boost-1.48 ) >=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/expat-2:= sys-libs/zlib virtual/libiconv
+DESCRIPTION=Port of the Adobe XMP SDK to work on UNIX
+EAPI=7
+HOMEPAGE=https://libopenraw.freedesktop.org/wiki/Exempi
+IUSE=examples static-libs test
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd
+LICENSE=BSD
+RDEPEND=>=dev-libs/expat-2:= sys-libs/zlib virtual/libiconv
+SLOT=2/3
+SRC_URI=https://libopenraw.freedesktop.org/download/exempi-2.4.5.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=b517ec4cdcf2522f3acbdb8c0a4e8ce3
diff --git a/metadata/md5-cache/media-libs/faac-1.28-r4 b/metadata/md5-cache/media-libs/faac-1.28-r4
deleted file mode 100644
index c06d57321d00..000000000000
--- a/metadata/md5-cache/media-libs/faac-1.28-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/libmp4v2: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 >=app-portage/elt-patches-20170317
-DESCRIPTION=Free MPEG-4 audio codecs by AudioCoding.com
-EAPI=5
-HOMEPAGE=http://www.audiocoding.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=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=LGPL-2.1 MPEG-4
-RDEPEND=media-libs/libmp4v2:0=
-SLOT=0
-SRC_URI=mirror://sourceforge/faac/faac-1.28.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	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_=1dd45a8a3c687969eabb7f52ecdc4cbb
diff --git a/metadata/md5-cache/media-libs/faac-1.29.8.3 b/metadata/md5-cache/media-libs/faac-1.29.8.3
deleted file mode 100644
index d73dbe9f2a65..000000000000
--- a/metadata/md5-cache/media-libs/faac-1.29.8.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install 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 >=app-portage/elt-patches-20170317
-DESCRIPTION=Free MPEG-4 audio codecs by AudioCoding.com
-EAPI=6
-HOMEPAGE=http://www.audiocoding.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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=LGPL-2.1 MPEG-4
-SLOT=0
-SRC_URI=mirror://sourceforge/faac/faac-1.29.8.3.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	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_=0068434daa8590d72df618211b4078a4
diff --git a/metadata/md5-cache/media-libs/faac-1.29.9.2 b/metadata/md5-cache/media-libs/faac-1.29.9.2
index 8915cc7915a4..38875bef4742 100644
--- a/metadata/md5-cache/media-libs/faac-1.29.9.2
+++ b/metadata/md5-cache/media-libs/faac-1.29.9.2
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install 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 >=app-portage/elt-patches-20170317
 DESCRIPTION=Free MPEG-4 audio codecs by AudioCoding.com
 EAPI=6
-HOMEPAGE=http://www.audiocoding.com
+HOMEPAGE=https://www.audiocoding.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=~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1 MPEG-4
 SLOT=0
 SRC_URI=mirror://sourceforge/faac/faac-1.29.9.2.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	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_=7bc7029c28d45e40aadda5b119be55fb
+_md5_=04bb3e544060123c3949a51912903785
diff --git a/metadata/md5-cache/media-libs/faad2-2.7-r3 b/metadata/md5-cache/media-libs/faad2-2.7-r3
deleted file mode 100644
index 0e51bd6d122e..000000000000
--- a/metadata/md5-cache/media-libs/faad2-2.7-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install 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
-DESCRIPTION=AAC audio decoding library
-EAPI=5
-HOMEPAGE=http://www.audiocoding.com/faad2.html
-IUSE=digitalradio static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2+
-SLOT=0
-SRC_URI=mirror://sourceforge/faac/faad2-2.7.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_=fb40e13f9a6678e6d89fbc985efe8af4
diff --git a/metadata/md5-cache/media-libs/faad2-2.8.6 b/metadata/md5-cache/media-libs/faad2-2.8.6
deleted file mode 100644
index 706ef3670548..000000000000
--- a/metadata/md5-cache/media-libs/faad2-2.8.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install 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
-DESCRIPTION=AAC audio decoding library
-EAPI=6
-HOMEPAGE=http://www.audiocoding.com/faad2.html
-IUSE=digitalradio static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2+
-SLOT=0
-SRC_URI=mirror://sourceforge/faac/faad2-2.8.6.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=f8aecdc4862729e6c1b5c0d90687bbd0
diff --git a/metadata/md5-cache/media-libs/faad2-2.8.8 b/metadata/md5-cache/media-libs/faad2-2.8.8
index fb9abdaa8f86..d8d0ded46665 100644
--- a/metadata/md5-cache/media-libs/faad2-2.8.8
+++ b/metadata/md5-cache/media-libs/faad2-2.8.8
@@ -4,9 +4,9 @@ DESCRIPTION=AAC audio decoding library
 EAPI=7
 HOMEPAGE=http://www.audiocoding.com/faad2.html
 IUSE=digitalradio static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://sourceforge/faac/faad2-2.8.8.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=4f3f53fb11cf7313bc34c96de56976d2
+_md5_=331d97574d6f49315bcabeb6ff3747fd
diff --git a/metadata/md5-cache/media-libs/fontconfig-ultimate-2015.04 b/metadata/md5-cache/media-libs/fontconfig-ultimate-2015.04
index 43104cb32fd4..464df3398fbe 100644
--- a/metadata/md5-cache/media-libs/fontconfig-ultimate-2015.04
+++ b/metadata/md5-cache/media-libs/fontconfig-ultimate-2015.04
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst prepare
 DEPEND=app-eselect/eselect-infinality app-eselect/eselect-lcdfilter media-libs/fontconfig-infinality media-libs/freetype:2[infinality]
 DESCRIPTION=A set of font rendering and replacement rules for fontconfig-infinality
 EAPI=5
-HOMEPAGE=http://bohoomil.com/
+HOMEPAGE=https://www.gentoo.org/
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=app-eselect/eselect-infinality app-eselect/eselect-lcdfilter media-libs/fontconfig-infinality media-libs/freetype:2[infinality]
 SLOT=0
 SRC_URI=https://github.com/bohoomil/fontconfig-ultimate/archive/2015-04.tar.gz -> fontconfig-ultimate-2015.04.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=f1292697cc987a69e2cf18ab760c3b5f
+_md5_=9d8b94382273b98aa32552d2a5b2dfa6
diff --git a/metadata/md5-cache/media-libs/fontconfig-ultimate-2015.08.01 b/metadata/md5-cache/media-libs/fontconfig-ultimate-2015.08.01
index 9384f82cd660..42b9d1c2f814 100644
--- a/metadata/md5-cache/media-libs/fontconfig-ultimate-2015.08.01
+++ b/metadata/md5-cache/media-libs/fontconfig-ultimate-2015.08.01
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst prepare
 DEPEND=app-eselect/eselect-infinality app-eselect/eselect-lcdfilter media-libs/fontconfig-infinality media-libs/freetype:2[infinality]
 DESCRIPTION=A set of font rendering and replacement rules for fontconfig-infinality
 EAPI=5
-HOMEPAGE=http://bohoomil.com/
+HOMEPAGE=https://www.gentoo.org/
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=app-eselect/eselect-infinality app-eselect/eselect-lcdfilter media-libs/fontconfig-infinality media-libs/freetype:2[infinality]
 SLOT=0
 SRC_URI=https://github.com/bohoomil/fontconfig-ultimate/archive/2015-08-01.tar.gz -> fontconfig-ultimate-2015.08.01.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=f1292697cc987a69e2cf18ab760c3b5f
+_md5_=9d8b94382273b98aa32552d2a5b2dfa6
diff --git a/metadata/md5-cache/media-libs/freeglut-3.0.0 b/metadata/md5-cache/media-libs/freeglut-3.0.0
index ced1816e3dc1..d57391f93efe 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4804309adbba5a79d9c8c588d1dfd702
diff --git a/metadata/md5-cache/media-libs/game-music-emu-0.6.1 b/metadata/md5-cache/media-libs/game-music-emu-0.6.1
deleted file mode 100644
index 121c28deeea4..000000000000
--- a/metadata/md5-cache/media-libs/game-music-emu-0.6.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Video game music file emulators
-EAPI=6
-HOMEPAGE=https://bitbucket.org/mpyne/game-music-emu/wiki/Home
-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 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.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=4225b21ec6bb56ecb6309913c78888e5
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 f4a65a9e4add..7ee749fb8f97 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4faf055c8d9dc85aa57d320e42d0c3e0
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 bda8ec9958c1..90ff068ec560 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_=1312fa4a047450c5ca553330042cc10b
+_md5_=164a4cf95c1f6eedbb03c26f5301a02a
diff --git a/metadata/md5-cache/media-libs/gegl-0.2.0-r2 b/metadata/md5-cache/media-libs/gegl-0.2.0-r2
index effc3143f2fc..961707d5af55 100644
--- a/metadata/md5-cache/media-libs/gegl-0.2.0-r2
+++ b/metadata/md5-cache/media-libs/gegl-0.2.0-r2
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=media-libs/babl-0.1.10 >=dev-libs/glib-2.28:2 >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango sys-libs/zlib cairo? ( x11-libs/cairo ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/jasper-1.900.1:= ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng:0= ) raw? ( =media-libs/libopenraw-0.0.9 ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) lensfun? ( >=media-libs/lensfun-0.2.5 )
 SLOT=0
 SRC_URI=https://download.gimp.org/pub/gegl/0.2/gegl-0.2.0.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=08f264cd076cf96adbf1f5b4870f1d13
diff --git a/metadata/md5-cache/media-libs/gegl-0.2.0-r5 b/metadata/md5-cache/media-libs/gegl-0.2.0-r5
index 3c98bfb0b2a3..a0dd03b6c66e 100644
--- a/metadata/md5-cache/media-libs/gegl-0.2.0-r5
+++ b/metadata/md5-cache/media-libs/gegl-0.2.0-r5
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=media-libs/babl-0.1.10 >=dev-libs/glib-2.28:2 >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango sys-libs/zlib cairo? ( x11-libs/cairo ) ffmpeg? ( libav? ( >=media-video/libav-11.3:0= ) !libav? ( media-video/ffmpeg:0= ) ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/jasper-1.900.1:= ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng:0= ) raw? ( >=media-libs/libopenraw-0.1:0= ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) lensfun? ( >=media-libs/lensfun-0.2.5 )
 SLOT=0
 SRC_URI=https://download.gimp.org/pub/gegl/0.2/gegl-0.2.0.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=81b405868f635683902e87cd7e530250
diff --git a/metadata/md5-cache/media-libs/gegl-0.3.0 b/metadata/md5-cache/media-libs/gegl-0.3.0
index 1cf4bb701bc9..0a9a2d856a33 100644
--- a/metadata/md5-cache/media-libs/gegl-0.3.0
+++ b/metadata/md5-cache/media-libs/gegl-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.36:2 dev-libs/json-glib >=media-libs/babl-0.1.12 sys-l
 REQUIRED_USE=vala? ( introspection )
 SLOT=0.3
 SRC_URI=http://download.gimp.org/pub/gegl/0.3/gegl-0.3.0.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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c02580f338ac0769ea514e81278a4b01
diff --git a/metadata/md5-cache/media-libs/gegl-0.3.0-r1 b/metadata/md5-cache/media-libs/gegl-0.3.0-r1
index f9b10ea2e597..a220b653fab7 100644
--- a/metadata/md5-cache/media-libs/gegl-0.3.0-r1
+++ b/metadata/md5-cache/media-libs/gegl-0.3.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.36:2 dev-libs/json-glib >=media-libs/babl-0.1.12 sys-l
 REQUIRED_USE=vala? ( introspection )
 SLOT=0.3
 SRC_URI=http://download.gimp.org/pub/gegl/0.3/gegl-0.3.0.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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=01a629277d4a4ed178396af438e5461b
diff --git a/metadata/md5-cache/media-libs/gegl-0.3.26 b/metadata/md5-cache/media-libs/gegl-0.3.26
index f5114d66bad2..c5d6009fcebd 100644
--- a/metadata/md5-cache/media-libs/gegl-0.3.26
+++ b/metadata/md5-cache/media-libs/gegl-0.3.26
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=media-libs/babl-0.1.38 sys-l
 REQUIRED_USE=svg? ( cairo ) vala? ( introspection )
 SLOT=0.3
 SRC_URI=http://download.gimp.org/pub/gegl/0.3/gegl-0.3.26.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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=98d732fa13571d25c89c13775fb055dc
diff --git a/metadata/md5-cache/media-libs/gegl-0.3.34 b/metadata/md5-cache/media-libs/gegl-0.3.34
index b27003ae4c98..1ed45cfffbb9 100644
--- a/metadata/md5-cache/media-libs/gegl-0.3.34
+++ b/metadata/md5-cache/media-libs/gegl-0.3.34
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=media-libs/babl-0.1.46 sys-l
 REQUIRED_USE=svg? ( cairo ) vala? ( introspection )
 SLOT=0.3
 SRC_URI=http://download.gimp.org/pub/gegl/0.3/gegl-0.3.34.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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fb48e99276d2f33e75621c17d7d76f4e
diff --git a/metadata/md5-cache/media-libs/gegl-0.3.8 b/metadata/md5-cache/media-libs/gegl-0.3.8
index 88f3ac005bca..3f43b1664f2d 100644
--- a/metadata/md5-cache/media-libs/gegl-0.3.8
+++ b/metadata/md5-cache/media-libs/gegl-0.3.8
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.36:2 dev-libs/json-glib >=media-libs/babl-0.1.14 sys-l
 REQUIRED_USE=svg? ( cairo ) vala? ( introspection )
 SLOT=0.3
 SRC_URI=http://download.gimp.org/pub/gegl/0.3/gegl-0.3.8.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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9d8353c253b431bea6f2cf69cf435f2b
diff --git a/metadata/md5-cache/media-libs/gegl-0.3.8-r1 b/metadata/md5-cache/media-libs/gegl-0.3.8-r1
index 91a2894ab672..7a2541531bda 100644
--- a/metadata/md5-cache/media-libs/gegl-0.3.8-r1
+++ b/metadata/md5-cache/media-libs/gegl-0.3.8-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.36:2 dev-libs/json-glib >=media-libs/babl-0.1.14 sys-l
 REQUIRED_USE=svg? ( cairo ) vala? ( introspection )
 SLOT=0.3
 SRC_URI=http://download.gimp.org/pub/gegl/0.3/gegl-0.3.8.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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=86e1f000ddc7ed7ffc87b308887f24f0
diff --git a/metadata/md5-cache/media-libs/gegl-0.4.6-r1 b/metadata/md5-cache/media-libs/gegl-0.4.6-r1
index fd0848bd21a3..63a4a301050b 100644
--- a/metadata/md5-cache/media-libs/gegl-0.4.6-r1
+++ b/metadata/md5-cache/media-libs/gegl-0.4.6-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=media-libs/babl-0.1.54 sys-l
 REQUIRED_USE=svg? ( cairo ) vala? ( introspection )
 SLOT=0.4
 SRC_URI=http://download.gimp.org/pub/gegl/0.4/gegl-0.4.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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b15cade9b5d5817376f12abd90043c52
diff --git a/metadata/md5-cache/media-libs/gegl-0.4.8-r1 b/metadata/md5-cache/media-libs/gegl-0.4.8-r1
index 85ee3a2affcf..9c61450f67b5 100644
--- a/metadata/md5-cache/media-libs/gegl-0.4.8-r1
+++ b/metadata/md5-cache/media-libs/gegl-0.4.8-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=media-libs/babl-0.1.56 >=med
 REQUIRED_USE=svg? ( cairo ) vala? ( introspection )
 SLOT=0.4
 SRC_URI=http://download.gimp.org/pub/gegl/0.4/gegl-0.4.8.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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=24d721bb949b91404751da0e3496852c
diff --git a/metadata/md5-cache/media-libs/gegl-9999 b/metadata/md5-cache/media-libs/gegl-9999
index 314a93708d72..2e26f30fe412 100644
--- a/metadata/md5-cache/media-libs/gegl-9999
+++ b/metadata/md5-cache/media-libs/gegl-9999
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-3+ LGPL-3 )
 RDEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=media-libs/babl-0.1.54 >=media-libs/libpng-1.6.0:0= sys-libs/zlib virtual/jpeg:0= >=x11-libs/gdk-pixbuf-2.32:2 x11-libs/pango cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) jpeg2k? ( >=media-libs/jasper-1.900.1:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-2.2.0:= ) raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= )
 REQUIRED_USE=svg? ( cairo ) vala? ( introspection )
 SLOT=0.4
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ae519ca9c879aada748f61447ec7059f
diff --git a/metadata/md5-cache/media-libs/gexiv2-0.10.8 b/metadata/md5-cache/media-libs/gexiv2-0.10.8
index 80c3bbb6bb92..6e56de88d23d 100644
--- a/metadata/md5-cache/media-libs/gexiv2-0.10.8
+++ b/metadata/md5-cache/media-libs/gexiv2-0.10.8
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targ
 REQUIRED_USE=python? ( introspection || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) test? ( python introspection ) vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gexiv2/0.10/gexiv2-0.10.8.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=397b9c1884154b8fdeedff955b1abd6a
diff --git a/metadata/md5-cache/media-libs/glew-1.10.0-r2 b/metadata/md5-cache/media-libs/glew-1.10.0-r2
deleted file mode 100644
index 64ddde381e71..000000000000
--- a/metadata/md5-cache/media-libs/glew-1.10.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=The OpenGL Extension Wrangler Library
-EAPI=5
-HOMEPAGE=http://glew.sourceforge.net/
-IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD MIT
-RDEPEND=>=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0/1.10
-SRC_URI=mirror://sourceforge/glew/glew-1.10.0.tgz
-_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	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=73019208822b04d780c18e526450d4f4
diff --git a/metadata/md5-cache/media-libs/glew-1.13.0 b/metadata/md5-cache/media-libs/glew-1.13.0
deleted file mode 100644
index caa1136551f7..000000000000
--- a/metadata/md5-cache/media-libs/glew-1.13.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=The OpenGL Extension Wrangler Library
-EAPI=6
-HOMEPAGE=http://glew.sourceforge.net/
-IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD MIT
-RDEPEND=>=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0/1.13
-SRC_URI=mirror://sourceforge/glew/glew-1.13.0.tgz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=53dddcad4b451f2a4d7eaeeed0c0a065
diff --git a/metadata/md5-cache/media-libs/glew-2.0.0 b/metadata/md5-cache/media-libs/glew-2.0.0
deleted file mode 100644
index c3d433c9c196..000000000000
--- a/metadata/md5-cache/media-libs/glew-2.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=The OpenGL Extension Wrangler Library
-EAPI=6
-HOMEPAGE=http://glew.sourceforge.net/
-IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD MIT
-RDEPEND=>=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0/2.0
-SRC_URI=mirror://sourceforge/glew/glew-2.0.0.tgz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=02dbaef90dae7182e8351b5eec407ebf
diff --git a/metadata/md5-cache/media-libs/glfw-3.2.1 b/metadata/md5-cache/media-libs/glfw-3.2.1
index 0f19a7312b72..27e9be4e8ef2 100644
--- a/metadata/md5-cache/media-libs/glfw-3.2.1
+++ b/metadata/md5-cache/media-libs/glfw-3.2.1
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=x11-libs/libxkbcommon !wayland? ( virtual/opengl x11-libs/libX11 x11-libs/libXcursor x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXxf86vm ) wayland? ( dev-libs/wayland media-libs/mesa[egl,wayland] )
 SLOT=0
 SRC_URI=mirror://sourceforge/glfw/glfw-3.2.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7ee9741dd6ba396587e9b1dc131cf372
diff --git a/metadata/md5-cache/media-libs/glm-0.9.8.5-r1 b/metadata/md5-cache/media-libs/glm-0.9.8.5-r1
index 99de38c666a2..b7b559191d17 100644
--- a/metadata/md5-cache/media-libs/glm-0.9.8.5-r1
+++ b/metadata/md5-cache/media-libs/glm-0.9.8.5-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( HappyBunny MIT )
 RDEPEND=virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/g-truc/glm/archive/0.9.8.5.tar.gz -> glm-0.9.8.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=03c4b3d03cbd5567e5645728e724e23e
diff --git a/metadata/md5-cache/media-libs/glm-0.9.9.0 b/metadata/md5-cache/media-libs/glm-0.9.9.0
index 8f189f1eddf0..27bafca71864 100644
--- a/metadata/md5-cache/media-libs/glm-0.9.9.0
+++ b/metadata/md5-cache/media-libs/glm-0.9.9.0
@@ -9,5 +9,5 @@ LICENSE=|| ( HappyBunny MIT )
 RDEPEND=virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/g-truc/glm/archive/0.9.9.0.tar.gz -> glm-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=60766ca323f0b29b2f53e83bfc6ebb91
diff --git a/metadata/md5-cache/media-libs/glm-0.9.9.1 b/metadata/md5-cache/media-libs/glm-0.9.9.1
index ab209e901504..c4f8c44c4669 100644
--- a/metadata/md5-cache/media-libs/glm-0.9.9.1
+++ b/metadata/md5-cache/media-libs/glm-0.9.9.1
@@ -9,5 +9,5 @@ LICENSE=|| ( HappyBunny MIT )
 RDEPEND=virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/g-truc/glm/archive/0.9.9.1.tar.gz -> glm-0.9.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=60766ca323f0b29b2f53e83bfc6ebb91
diff --git a/metadata/md5-cache/media-libs/glm-0.9.9.2 b/metadata/md5-cache/media-libs/glm-0.9.9.2
index 7c266574fdf4..e4bc175af674 100644
--- a/metadata/md5-cache/media-libs/glm-0.9.9.2
+++ b/metadata/md5-cache/media-libs/glm-0.9.9.2
@@ -9,5 +9,5 @@ LICENSE=|| ( HappyBunny MIT )
 RDEPEND=virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/g-truc/glm/archive/0.9.9.2.tar.gz -> glm-0.9.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=60766ca323f0b29b2f53e83bfc6ebb91
diff --git a/metadata/md5-cache/media-libs/glpng-1.46-r1 b/metadata/md5-cache/media-libs/glpng-1.46-r1
index eef738018654..2002465fb402 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a88413d177c536b61f676f33a63b62da
diff --git a/metadata/md5-cache/media-libs/glyr-1.0.10 b/metadata/md5-cache/media-libs/glyr-1.0.10
index 89a207ddba82..7cb2fbd8552e 100644
--- a/metadata/md5-cache/media-libs/glyr-1.0.10
+++ b/metadata/md5-cache/media-libs/glyr-1.0.10
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/media-libs/glyr-1.0.5 b/metadata/md5-cache/media-libs/glyr-1.0.5
index 575e6f395940..3aa6afe61c81 100644
--- a/metadata/md5-cache/media-libs/glyr-1.0.5
+++ b/metadata/md5-cache/media-libs/glyr-1.0.5
@@ -8,5 +8,5 @@ LICENSE=GPL-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.5.tar.gz -> glyr-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=ba8633089eb6eebbc277455c9ab537c1
diff --git a/metadata/md5-cache/media-libs/glyr-1.0.7 b/metadata/md5-cache/media-libs/glyr-1.0.7
index 04d193d422c5..c7b4f4c807cd 100644
--- a/metadata/md5-cache/media-libs/glyr-1.0.7
+++ b/metadata/md5-cache/media-libs/glyr-1.0.7
@@ -8,5 +8,5 @@ LICENSE=GPL-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.7.tar.gz -> glyr-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=49bf5037a3f6ccf531304eee775205a8
diff --git a/metadata/md5-cache/media-libs/graphene-1.8.2 b/metadata/md5-cache/media-libs/graphene-1.8.2
index fc572796a9cd..3dc288cc8180 100644
--- a/metadata/md5-cache/media-libs/graphene-1.8.2
+++ b/metadata/md5-cache/media-libs/graphene-1.8.2
@@ -4,10 +4,10 @@ DESCRIPTION=A thin layer of types for graphic libraries
 EAPI=6
 HOMEPAGE=https://ebassi.github.io/graphene/
 IUSE=cpu_flags_arm_neon cpu_flags_x86_sse2 doc +introspection test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
 LICENSE=MIT
 RDEPEND=>=dev-libs/glib-2.30.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( dev-libs/gobject-introspection:= )
 SLOT=0
 SRC_URI=https://github.com/ebassi/graphene/releases/download/1.8.2/graphene-1.8.2.tar.xz
-_eclasses_=meson	29ef682942c6ff558de2f797a61790c2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=6e21061a53311e0a8da0ab34460f3849
+_eclasses_=meson	29ef682942c6ff558de2f797a61790c2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f8433f78f51482feec95a019fa054318
diff --git a/metadata/md5-cache/media-libs/grilo-0.2.15 b/metadata/md5-cache/media-libs/grilo-0.2.15
index 6a466e88b4e1..f53df644e561 100644
--- a/metadata/md5-cache/media-libs/grilo-0.2.15
+++ b/metadata/md5-cache/media-libs/grilo-0.2.15
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.44:2 dev-libs/libxml2:2 net-libs/liboauth gtk? ( >=x11
 REQUIRED_USE=test? ( introspection )
 SLOT=0.2/1
 SRC_URI=mirror://gnome/sources/grilo/0.2/grilo-0.2.15.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-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ebbf9b822daec63789cec8c4f940879f
diff --git a/metadata/md5-cache/media-libs/grilo-0.3.4 b/metadata/md5-cache/media-libs/grilo-0.3.4
index 0beb0760b3a0..0278d808ae5c 100644
--- a/metadata/md5-cache/media-libs/grilo-0.3.4
+++ b/metadata/md5-cache/media-libs/grilo-0.3.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.44:2 dev-libs/libxml2:2 net-libs/liboauth gtk? ( >=x11
 REQUIRED_USE=test? ( introspection )
 SLOT=0.3/0
 SRC_URI=mirror://gnome/sources/grilo/0.3/grilo-0.3.4.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-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b8d47b22f2854f2f2a2dcfe40e845521
diff --git a/metadata/md5-cache/media-libs/grilo-0.3.6 b/metadata/md5-cache/media-libs/grilo-0.3.6
index 511e77de99fa..8e825a728f9a 100644
--- a/metadata/md5-cache/media-libs/grilo-0.3.6
+++ b/metadata/md5-cache/media-libs/grilo-0.3.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.44:2 dev-libs/libxml2:2 net-libs/liboauth gtk? ( >=x11
 REQUIRED_USE=test? ( introspection )
 SLOT=0.3/0
 SRC_URI=mirror://gnome/sources/grilo/0.3/grilo-0.3.6.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-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3ab742e1e97d876c707b25a26cf958b2
diff --git a/metadata/md5-cache/media-libs/gsound-1.0.2-r1 b/metadata/md5-cache/media-libs/gsound-1.0.2-r1
index 424c989994d9..6dff589ae362 100644
--- a/metadata/md5-cache/media-libs/gsound-1.0.2-r1
+++ b/metadata/md5-cache/media-libs/gsound-1.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.36:2 media-libs/libcanberra introspection? ( >=dev-lib
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gsound/1.0/gsound-1.0.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a7e575654e90aa0a170aa850b30068a5
diff --git a/metadata/md5-cache/media-libs/gst-plugins-bad-0.10.23-r4 b/metadata/md5-cache/media-libs/gst-plugins-bad-0.10.23-r4
index 10e6d3cf0444..9a80866e9beb 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-bad-0.10.23-r4
+++ b/metadata/md5-cache/media-libs/gst-plugins-bad-0.10.23-r4
@@ -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(-)?] >=media-libs/gst-plugins-base-0.10.36: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(-)?] >=media-libs/gstreamer-0.10.36: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(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,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-farsight-0.12.11:0.10 >=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-0.10.36-r2: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(-)?]
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.tar.xz https://dev.gentoo.org/~tetromino/distfiles/gst-plugins-bad/gst-plugins-bad-0.10.23-h264-patches.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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_=0b48404a1051f0e3979886709919fe5d
diff --git a/metadata/md5-cache/media-libs/gst-plugins-bad-1.14.1-r1 b/metadata/md5-cache/media-libs/gst-plugins-bad-1.14.1-r1
index 96320aa4ee42..9847639a09bc 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-bad-1.14.1-r1
+++ b/metadata/md5-cache/media-libs/gst-plugins-bad-1.14.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 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	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fe68a9d38d00aac2bb8992c0207346d4
diff --git a/metadata/md5-cache/media-libs/gst-plugins-bad-1.14.2 b/metadata/md5-cache/media-libs/gst-plugins-bad-1.14.2
index 3478da0c4f64..f39b147fac85 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-bad-1.14.2
+++ b/metadata/md5-cache/media-libs/gst-plugins-bad-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 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	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=52730a24dcc289d22231043c1cc27160
diff --git a/metadata/md5-cache/media-libs/gst-plugins-bad-1.14.3 b/metadata/md5-cache/media-libs/gst-plugins-bad-1.14.3
index 099c84a0e301..49173e417aee 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-bad-1.14.3
+++ b/metadata/md5-cache/media-libs/gst-plugins-bad-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 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	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=52730a24dcc289d22231043c1cc27160
diff --git a/metadata/md5-cache/media-libs/gst-plugins-base-0.10.36-r2 b/metadata/md5-cache/media-libs/gst-plugins-base-0.10.36-r2
index f8d0711ae3e8..6ac7eb9f1c63 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-base-0.10.36-r2
+++ b/metadata/md5-cache/media-libs/gst-plugins-base-0.10.36-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=media-libs/gstreamer-0.10.36:0.10[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(-)?] >=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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-text/iso-codes introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,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-0.10.10:0.10 >=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-0.10.36-r2: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(-)?]
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.36.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c1aceaf51e5915aea63ff06133208713
diff --git a/metadata/md5-cache/media-libs/gst-plugins-base-1.12.4 b/metadata/md5-cache/media-libs/gst-plugins-base-1.12.4
deleted file mode 100644
index 729bbdabb16c..000000000000
--- a/metadata/md5-cache/media-libs/gst-plugins-base-1.12.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=app-text/iso-codes >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.12.4:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) ivorbis? ( >=media-libs/tremor-0_pre20130223[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ogg? ( >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) orc? ( >=dev-lang/orc-0.4.24[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pango? ( >=x11-libs/pango-1.36.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-libs/gst-plugins-bad-1.11.90:1.0 >=dev-util/gtk-doc-am-1.12 X? ( x11-base/xorg-proto ) >=sys-apps/sed-4 >=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(-)?] nls? ( >=sys-devel/gettext-0.17 ) >=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(-)?]
-DESCRIPTION=Basepack of plugins for gstreamer
-EAPI=6
-HOMEPAGE=https://gstreamer.freedesktop.org/
-IUSE=alsa +introspection ivorbis +ogg +orc +pango theora +vorbis X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 nls
-KEYWORDS=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=GPL-2+ LGPL-2+
-RDEPEND=app-text/iso-codes >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.12.4:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) ivorbis? ( >=media-libs/tremor-0_pre20130223[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ogg? ( >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) orc? ( >=dev-lang/orc-0.4.24[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pango? ( >=x11-libs/pango-1.36.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-libs/gst-plugins-bad-1.11.90:1.0 >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-REQUIRED_USE=ivorbis? ( ogg ) theora? ( ogg ) vorbis? ( ogg )
-SLOT=1.0
-SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.12.4.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=af8fc39ca70abb6a72af8f2d36fe82d8
diff --git a/metadata/md5-cache/media-libs/gst-plugins-base-1.14.1 b/metadata/md5-cache/media-libs/gst-plugins-base-1.14.1
index a32034e679f7..67354a2a3bde 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-base-1.14.1
+++ b/metadata/md5-cache/media-libs/gst-plugins-base-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=app-text/iso-codes >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)
 REQUIRED_USE=ivorbis? ( ogg ) theora? ( ogg ) vorbis? ( ogg ) opengl? ( || ( egl X ) || ( gbm wayland X ) wayland? ( egl ) gbm? ( egl ) ) gles2? ( egl || ( gbm wayland X ) wayland? ( egl ) gbm? ( egl ) )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.14.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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_=6caf1c012e881ee77861f8afa7676d5b
diff --git a/metadata/md5-cache/media-libs/gst-plugins-base-1.14.2 b/metadata/md5-cache/media-libs/gst-plugins-base-1.14.2
index b73d7d0f95a9..b96f18c7b1af 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-base-1.14.2
+++ b/metadata/md5-cache/media-libs/gst-plugins-base-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=app-text/iso-codes >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)
 REQUIRED_USE=ivorbis? ( ogg ) theora? ( ogg ) vorbis? ( ogg ) opengl? ( || ( egl X ) || ( gbm wayland X ) wayland? ( egl ) gbm? ( egl ) ) gles2? ( egl || ( gbm wayland X ) wayland? ( egl ) gbm? ( egl ) )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.14.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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_=dc5738d24fd97f0879e89a0aa1f961c6
diff --git a/metadata/md5-cache/media-libs/gst-plugins-base-1.14.2-r1 b/metadata/md5-cache/media-libs/gst-plugins-base-1.14.2-r1
index 1dae123c16c5..78b7e0e7ecb7 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-base-1.14.2-r1
+++ b/metadata/md5-cache/media-libs/gst-plugins-base-1.14.2-r1
@@ -10,5 +10,5 @@ RDEPEND=app-text/iso-codes >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)
 REQUIRED_USE=ivorbis? ( ogg ) theora? ( ogg ) vorbis? ( ogg ) opengl? ( || ( egl X ) || ( gbm wayland X ) wayland? ( egl ) gbm? ( egl ) ) gles2? ( egl || ( gbm wayland X ) wayland? ( egl ) gbm? ( egl ) )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.14.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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_=69f17845ea00a68c9ee8654ba79330e9
diff --git a/metadata/md5-cache/media-libs/gst-plugins-base-1.14.3 b/metadata/md5-cache/media-libs/gst-plugins-base-1.14.3
index 2d009bc14754..baadcde7d43d 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-base-1.14.3
+++ b/metadata/md5-cache/media-libs/gst-plugins-base-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=app-text/iso-codes >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)
 REQUIRED_USE=ivorbis? ( ogg ) theora? ( ogg ) vorbis? ( ogg ) opengl? ( || ( egl X ) || ( gbm wayland X ) wayland? ( egl ) gbm? ( egl ) ) gles2? ( egl || ( gbm wayland X ) wayland? ( egl ) gbm? ( egl ) )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.14.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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_=484e0aa80624745466dc97a2219cdb4f
diff --git a/metadata/md5-cache/media-libs/gst-plugins-base-1.14.3-r1 b/metadata/md5-cache/media-libs/gst-plugins-base-1.14.3-r1
index 4fed61f8e500..6f298c064409 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-base-1.14.3-r1
+++ b/metadata/md5-cache/media-libs/gst-plugins-base-1.14.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Basepack of plugins for gstreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=alsa +egl gbm gles2 +introspection ivorbis +ogg +opengl +orc +pango theora +vorbis wayland +X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 nls
-KEYWORDS=~amd64 ~arm ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=app-text/iso-codes >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.14.3:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) ivorbis? ( >=media-libs/tremor-0_pre20130223[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ogg? ( >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) orc? ( >=dev-lang/orc-0.4.24[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pango? ( >=x11-libs/pango-1.36.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gles2? ( >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( x11-libs/libdrm ) gbm? ( >=dev-libs/libgudev-147[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/graphene-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( x11-libs/libdrm ) gbm? ( >=dev-libs/libgudev-147[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/graphene-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-libs/gst-plugins-bad-1.13.1:1.0 >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 REQUIRED_USE=ivorbis? ( ogg ) theora? ( ogg ) vorbis? ( ogg ) opengl? ( || ( egl X ) || ( gbm wayland X ) wayland? ( egl ) gbm? ( egl ) ) gles2? ( egl || ( gbm wayland X ) wayland? ( egl ) gbm? ( egl ) )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.14.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=a10c66744f21699f8e852dab03713394
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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_=884d9f9895686aec1c344c791fbb987e
diff --git a/metadata/md5-cache/media-libs/gst-plugins-base-1.14.4 b/metadata/md5-cache/media-libs/gst-plugins-base-1.14.4
new file mode 100644
index 000000000000..dd9e6dc998d5
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gst-plugins-base-1.14.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-text/iso-codes >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.14.4:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) ivorbis? ( >=media-libs/tremor-0_pre20130223[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ogg? ( >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) orc? ( >=dev-lang/orc-0.4.24[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pango? ( >=x11-libs/pango-1.36.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gles2? ( >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( x11-libs/libdrm ) gbm? ( >=dev-libs/libgudev-147[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) media-libs/libpng:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( x11-libs/libdrm ) gbm? ( >=dev-libs/libgudev-147[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) media-libs/libpng:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-libs/gst-plugins-bad-1.13.1:1.0 dev-util/glib-utils >=dev-util/gtk-doc-am-1.12 X? ( x11-base/xorg-proto ) >=sys-apps/sed-4 >=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(-)?] nls? ( >=sys-devel/gettext-0.17 ) >=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(-)?]
+DESCRIPTION=Basepack of plugins for gstreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=alsa +egl gbm gles2 +introspection ivorbis +ogg +opengl +orc +pango theora +vorbis wayland +X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 nls
+KEYWORDS=~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=GPL-2+ LGPL-2+
+RDEPEND=app-text/iso-codes >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.14.4:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) ivorbis? ( >=media-libs/tremor-0_pre20130223[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ogg? ( >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) orc? ( >=dev-lang/orc-0.4.24[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pango? ( >=x11-libs/pango-1.36.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gles2? ( >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( x11-libs/libdrm ) gbm? ( >=dev-libs/libgudev-147[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) media-libs/libpng:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( x11-libs/libdrm ) gbm? ( >=dev-libs/libgudev-147[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) media-libs/libpng:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-libs/gst-plugins-bad-1.13.1:1.0 >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+REQUIRED_USE=ivorbis? ( ogg ) theora? ( ogg ) vorbis? ( ogg ) opengl? ( || ( egl X ) || ( gbm wayland X ) wayland? ( egl ) gbm? ( egl ) ) gles2? ( egl || ( gbm wayland X ) wayland? ( egl ) gbm? ( egl ) )
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.14.4.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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_=224862f3e9064519e80d2a2c39352cb2
diff --git a/metadata/md5-cache/media-libs/gst-plugins-base-1.14.4-r1 b/metadata/md5-cache/media-libs/gst-plugins-base-1.14.4-r1
new file mode 100644
index 000000000000..79152ea019e4
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gst-plugins-base-1.14.4-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-text/iso-codes >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.14.4:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) ivorbis? ( >=media-libs/tremor-0_pre20130223[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ogg? ( >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) orc? ( >=dev-lang/orc-0.4.24[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pango? ( >=x11-libs/pango-1.36.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gles2? ( >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( x11-libs/libdrm ) gbm? ( >=dev-libs/libgudev-147[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/graphene-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( x11-libs/libdrm ) gbm? ( >=dev-libs/libgudev-147[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/graphene-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-libs/gst-plugins-bad-1.13.1:1.0 dev-util/glib-utils >=dev-util/gtk-doc-am-1.12 X? ( x11-base/xorg-proto ) >=sys-apps/sed-4 >=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(-)?] nls? ( >=sys-devel/gettext-0.17 ) >=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(-)?]
+DESCRIPTION=Basepack of plugins for gstreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=alsa +egl gbm gles2 +introspection ivorbis +ogg +opengl +orc +pango theora +vorbis wayland +X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 nls
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=app-text/iso-codes >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.14.4:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) ivorbis? ( >=media-libs/tremor-0_pre20130223[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ogg? ( >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) orc? ( >=dev-lang/orc-0.4.24[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pango? ( >=x11-libs/pango-1.36.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gles2? ( >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( x11-libs/libdrm ) gbm? ( >=dev-libs/libgudev-147[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/graphene-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( x11-libs/libdrm ) gbm? ( >=dev-libs/libgudev-147[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/graphene-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-libs/gst-plugins-bad-1.13.1:1.0 >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+REQUIRED_USE=ivorbis? ( ogg ) theora? ( ogg ) vorbis? ( ogg ) opengl? ( || ( egl X ) || ( gbm wayland X ) wayland? ( egl ) gbm? ( egl ) ) gles2? ( egl || ( gbm wayland X ) wayland? ( egl ) gbm? ( egl ) )
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.14.4.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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_=884d9f9895686aec1c344c791fbb987e
diff --git a/metadata/md5-cache/media-libs/gst-plugins-good-0.10.31-r2 b/metadata/md5-cache/media-libs/gst-plugins-good-0.10.31-r2
index 17673fd6796c..95b25f05b55c 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-good-0.10.31-r2
+++ b/metadata/md5-cache/media-libs/gst-plugins-good-0.10.31-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 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(-)?] >=media-libs/gstreamer-0.10.36: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(-)?] >=media-libs/gst-plugins-base-0.10.36: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(-)?] >=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(-)?] >=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(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_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-0.10.36-r2: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(-)?]
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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_=9376eafe880e8aeb815f7a2f4ba31ef5
diff --git a/metadata/md5-cache/media-libs/gst-plugins-good-1.12.4 b/metadata/md5-cache/media-libs/gst-plugins-good-1.12.4
deleted file mode 100644
index 5734287b65a9..000000000000
--- a/metadata/md5-cache/media-libs/gst-plugins-good-1.12.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.12.4: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/gstreamer-1.12.4: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(-)?] >=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(-)?] >=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(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_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.12 >=sys-apps/sed-4 >=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(-)?] nls? ( >=sys-devel/gettext-0.17 ) >=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(-)?]
-DESCRIPTION=Basepack of plugins for GStreamer
-EAPI=6
-HOMEPAGE=https://gstreamer.freedesktop.org/
-IUSE=+orc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 nls
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.12.4: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/gstreamer-1.12.4: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(-)?] >=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(-)?] >=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(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_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(-)?]
-SLOT=1.0
-SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.12.4.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=9e301193404016732e6407fa9a9835d8
diff --git a/metadata/md5-cache/media-libs/gst-plugins-good-1.14.1 b/metadata/md5-cache/media-libs/gst-plugins-good-1.14.1
index b933daf93fba..25f44dc4877a 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-good-1.14.1
+++ b/metadata/md5-cache/media-libs/gst-plugins-good-1.14.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-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(-)?] >=media-libs/gstreamer-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(-)?] >=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(-)?] >=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(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_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(-)?]
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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_=346abe73dd6c0decb9accfc22f8ea256
diff --git a/metadata/md5-cache/media-libs/gst-plugins-good-1.14.2 b/metadata/md5-cache/media-libs/gst-plugins-good-1.14.2
index 669846194102..18ce10c26a65 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-good-1.14.2
+++ b/metadata/md5-cache/media-libs/gst-plugins-good-1.14.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-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(-)?] >=media-libs/gstreamer-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(-)?] >=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(-)?] >=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(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_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(-)?]
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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_=6e9454e0afcf86758b1f4c0f2fd5e276
diff --git a/metadata/md5-cache/media-libs/gst-plugins-good-1.14.3 b/metadata/md5-cache/media-libs/gst-plugins-good-1.14.3
index c58642e4bb5a..43a45064fb05 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-good-1.14.3
+++ b/metadata/md5-cache/media-libs/gst-plugins-good-1.14.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-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(-)?] >=media-libs/gstreamer-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(-)?] >=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(-)?] >=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(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_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(-)?]
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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_=6e9454e0afcf86758b1f4c0f2fd5e276
diff --git a/metadata/md5-cache/media-libs/gst-plugins-good-1.14.4 b/metadata/md5-cache/media-libs/gst-plugins-good-1.14.4
new file mode 100644
index 000000000000..135ada55f40c
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gst-plugins-good-1.14.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.14.4: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/gstreamer-1.14.4: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(-)?] >=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(-)?] >=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(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_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.12 >=sys-apps/sed-4 >=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(-)?] nls? ( >=sys-devel/gettext-0.17 ) >=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(-)?]
+DESCRIPTION=Basepack of plugins for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=+orc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 nls
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.14.4: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/gstreamer-1.14.4: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(-)?] >=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(-)?] >=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(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_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(-)?]
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.4.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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_=36371d0727cad9d38499be90116a9668
diff --git a/metadata/md5-cache/media-libs/gst-plugins-ugly-0.10.19-r1 b/metadata/md5-cache/media-libs/gst-plugins-ugly-0.10.19-r1
index a67ffc03beec..8a2da7dd9202 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-ugly-0.10.19-r1
+++ b/metadata/md5-cache/media-libs/gst-plugins-ugly-0.10.19-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-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(-)?] >=media-libs/gstreamer-0.10.36: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(-)?] >=media-libs/gst-plugins-base-0.10.36: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(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,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-0.10.13 >=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-0.10.36-r2: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(-)?]
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.19.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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_=310cfdda5175f39320284af58348641e
diff --git a/metadata/md5-cache/media-libs/gst-plugins-ugly-1.14.1 b/metadata/md5-cache/media-libs/gst-plugins-ugly-1.14.1
index 74cffc6a6a1f..b49927d44174 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-ugly-1.14.1
+++ b/metadata/md5-cache/media-libs/gst-plugins-ugly-1.14.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-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(-)?] >=media-libs/gst-plugins-base-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(-)?] >=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(-)?]
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a110e36185673bcec93e84c74e25f00a
diff --git a/metadata/md5-cache/media-libs/gst-plugins-ugly-1.14.2 b/metadata/md5-cache/media-libs/gst-plugins-ugly-1.14.2
index 1ed4a63a8a7b..73cb2343ff7b 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-ugly-1.14.2
+++ b/metadata/md5-cache/media-libs/gst-plugins-ugly-1.14.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-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(-)?] >=media-libs/gst-plugins-base-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(-)?] >=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(-)?]
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5b3b47065a1a170776f51cfdf14a92c9
diff --git a/metadata/md5-cache/media-libs/gst-plugins-ugly-1.14.3 b/metadata/md5-cache/media-libs/gst-plugins-ugly-1.14.3
index 58234b7949a0..10209df29e1e 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-ugly-1.14.3
+++ b/metadata/md5-cache/media-libs/gst-plugins-ugly-1.14.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-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(-)?] >=media-libs/gst-plugins-base-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(-)?] >=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(-)?]
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5b3b47065a1a170776f51cfdf14a92c9
diff --git a/metadata/md5-cache/media-libs/gst-rtsp-server-0.10.8-r1 b/metadata/md5-cache/media-libs/gst-rtsp-server-0.10.8-r1
index facb2f418590..b5b7b7647502 100644
--- a/metadata/md5-cache/media-libs/gst-rtsp-server-0.10.8-r1
+++ b/metadata/md5-cache/media-libs/gst-rtsp-server-0.10.8-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-0.10.8.tar.bz2
-_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	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=60cd084f8e37617d0e4cc5ad84c5637f
diff --git a/metadata/md5-cache/media-libs/gst-rtsp-server-1.14.1 b/metadata/md5-cache/media-libs/gst-rtsp-server-1.14.1
index 4ff197524d94..f2cc5cc9c22d 100644
--- a/metadata/md5-cache/media-libs/gst-rtsp-server-1.14.1
+++ b/metadata/md5-cache/media-libs/gst-rtsp-server-1.14.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.14.1:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.14.1:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-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(-)?] >=media-plugins/gst-plugins-srtp-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(-)?] introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) >=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(-)?]
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cc28caf72b61207b90046b12a24a01db
diff --git a/metadata/md5-cache/media-libs/gst-rtsp-server-1.14.2 b/metadata/md5-cache/media-libs/gst-rtsp-server-1.14.2
index 8d8523f21c26..5e822a4216c7 100644
--- a/metadata/md5-cache/media-libs/gst-rtsp-server-1.14.2
+++ b/metadata/md5-cache/media-libs/gst-rtsp-server-1.14.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.14.2:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.14.2:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-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(-)?] >=media-plugins/gst-plugins-srtp-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(-)?] introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) >=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(-)?]
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d07166cdaef7bcf1b04594541d34ffdd
diff --git a/metadata/md5-cache/media-libs/gstreamer-1.12.4 b/metadata/md5-cache/media-libs/gstreamer-1.12.4
deleted file mode 100644
index 36e8d1f94e49..000000000000
--- a/metadata/md5-cache/media-libs/gstreamer-1.12.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] caps? ( sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) unwind? ( >=sys-libs/libunwind-1.2_rc1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/elfutils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-util/gtk-doc-am-1.12 sys-devel/bison sys-devel/flex >=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(-)?] nls? ( sys-devel/gettext )
-DESCRIPTION=Open source multimedia framework
-EAPI=6
-HOMEPAGE=https://gstreamer.freedesktop.org/
-IUSE=+caps +introspection nls +orc test unwind abi_x86_32 abi_x86_64 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
-LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] caps? ( sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) unwind? ( >=sys-libs/libunwind-1.2_rc1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/elfutils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=1.0
-SRC_URI=https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.12.4.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5ef7e623db81cae4dc230fcf015b4eda
diff --git a/metadata/md5-cache/media-libs/gstreamer-1.14.4 b/metadata/md5-cache/media-libs/gstreamer-1.14.4
new file mode 100644
index 000000000000..00c7ea62f839
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gstreamer-1.14.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] caps? ( sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) unwind? ( >=sys-libs/libunwind-1.2_rc1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/elfutils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-libs/gst-plugins-bad-1.13.1:1.0 dev-util/glib-utils >=dev-util/gtk-doc-am-1.12 sys-devel/bison sys-devel/flex >=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(-)?] nls? ( sys-devel/gettext )
+DESCRIPTION=Open source multimedia framework
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=+caps +introspection nls +orc test unwind abi_x86_32 abi_x86_64 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
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] caps? ( sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) unwind? ( >=sys-libs/libunwind-1.2_rc1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/elfutils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-libs/gst-plugins-bad-1.13.1:1.0
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.14.4.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	e85f015e815dd463b0c206d781ef45a5	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=2ec8357d645feaf8d8620cad4076c794
diff --git a/metadata/md5-cache/media-libs/gstreamer-editing-services-1.14.1 b/metadata/md5-cache/media-libs/gstreamer-editing-services-1.14.1
index 69d1d60e4dfe..c9f52b8877a9 100644
--- a/metadata/md5-cache/media-libs/gstreamer-editing-services-1.14.1
+++ b/metadata/md5-cache/media-libs/gstreamer-editing-services-1.14.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gstreamer-editing-services-1.14.1.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	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9afdb32c725b7030e58a95e142cbbf2a
diff --git a/metadata/md5-cache/media-libs/gstreamer-editing-services-1.14.2 b/metadata/md5-cache/media-libs/gstreamer-editing-services-1.14.2
index f0d8ba35d05a..07a8098c7db3 100644
--- a/metadata/md5-cache/media-libs/gstreamer-editing-services-1.14.2
+++ b/metadata/md5-cache/media-libs/gstreamer-editing-services-1.14.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gstreamer-editing-services-1.14.2.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	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f333b6273f86f2baf0953d32327804bc
diff --git a/metadata/md5-cache/media-libs/gstreamer-editing-services-1.14.3 b/metadata/md5-cache/media-libs/gstreamer-editing-services-1.14.3
index 2421c750457e..99dab206bc98 100644
--- a/metadata/md5-cache/media-libs/gstreamer-editing-services-1.14.3
+++ b/metadata/md5-cache/media-libs/gstreamer-editing-services-1.14.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gstreamer-editing-services-1.14.3.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	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f333b6273f86f2baf0953d32327804bc
diff --git a/metadata/md5-cache/media-libs/gupnp-dlna-0.10.4 b/metadata/md5-cache/media-libs/gupnp-dlna-0.10.4
index a2f03a47e4de..8ede45524802 100644
--- a/metadata/md5-cache/media-libs/gupnp-dlna-0.10.4
+++ b/metadata/md5-cache/media-libs/gupnp-dlna-0.10.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.34:2 >=dev-libs/libxml2-2.5:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/gupnp-dlna/0.10/gupnp-dlna-0.10.4.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d3206cd0ba3f4d51d36d10ea05cfa319
diff --git a/metadata/md5-cache/media-libs/gupnp-dlna-0.10.5 b/metadata/md5-cache/media-libs/gupnp-dlna-0.10.5
index 787b9dc101c4..c9b7cc298692 100644
--- a/metadata/md5-cache/media-libs/gupnp-dlna-0.10.5
+++ b/metadata/md5-cache/media-libs/gupnp-dlna-0.10.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.34:2 >=dev-libs/libxml2-2.5:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/gupnp-dlna/0.10/gupnp-dlna-0.10.5.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0056a14ae10585cc8370a796d1046f9f
diff --git a/metadata/md5-cache/media-libs/hamlib-3.3 b/metadata/md5-cache/media-libs/hamlib-3.3
new file mode 100644
index 000000000000..5bf507675e67
--- /dev/null
+++ b/metadata/md5-cache/media-libs/hamlib-3.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND==virtual/libusb-0* dev-libs/libxml2 sys-libs/readline:0= perl? ( dev-lang/perl ) 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(+)?] ) tcl? ( dev-lang/tcl:0= ) virtual/pkgconfig dev-lang/swig >=sys-devel/libtool-2.2 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
+DESCRIPTION=Ham radio backend rig control libraries
+EAPI=6
+HOMEPAGE=https://www.hamlib.org
+IUSE=doc perl python tcl python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~x86-fbsd
+LICENSE=LGPL-2 GPL-2
+RDEPEND==virtual/libusb-0* dev-libs/libxml2 sys-libs/readline:0= perl? ( dev-lang/perl ) 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(+)?] ) tcl? ( dev-lang/tcl:0= )
+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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.github.com/hamlib/hamlib/releases/download/3.3/hamlib-3.3.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=51bfa67c6c09199a4a9eaff7f59f7fe9
diff --git a/metadata/md5-cache/media-libs/harfbuzz-1.7.6 b/metadata/md5-cache/media-libs/harfbuzz-1.7.6
index df008b1dc7ef..6caa71cf8b2b 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-1.7.6
+++ b/metadata/md5-cache/media-libs/harfbuzz-1.7.6
@@ -10,5 +10,5 @@ RDEPEND=cairo? ( x11-libs/cairo:= ) fontconfig? ( media-libs/fontconfig:1.0[abi_
 REQUIRED_USE=introspection? ( glib )
 SLOT=0/0.9.18
 SRC_URI=https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.7.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5ab69471d0b6873978cad0ef020ded9b
diff --git a/metadata/md5-cache/media-libs/harfbuzz-1.8.1 b/metadata/md5-cache/media-libs/harfbuzz-1.8.1
index 38d16cb570ca..a01019b19940 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-1.8.1
+++ b/metadata/md5-cache/media-libs/harfbuzz-1.8.1
@@ -10,5 +10,5 @@ RDEPEND=cairo? ( x11-libs/cairo:= ) fontconfig? ( media-libs/fontconfig:1.0[abi_
 REQUIRED_USE=introspection? ( glib )
 SLOT=0/0.9.18
 SRC_URI=https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.8.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3af4f9680f2b25f14051b2ebd3b3a031
diff --git a/metadata/md5-cache/media-libs/harfbuzz-1.8.8 b/metadata/md5-cache/media-libs/harfbuzz-1.8.8
index 247c55e39813..fda173d433e8 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-1.8.8
+++ b/metadata/md5-cache/media-libs/harfbuzz-1.8.8
@@ -10,5 +10,5 @@ RDEPEND=cairo? ( x11-libs/cairo:= ) fontconfig? ( media-libs/fontconfig:1.0[abi_
 REQUIRED_USE=introspection? ( glib )
 SLOT=0/0.9.18
 SRC_URI=https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.8.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/media-libs/harfbuzz-1.9.0 b/metadata/md5-cache/media-libs/harfbuzz-1.9.0
index f4af5a92d500..7ac231afcd81 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-1.9.0
+++ b/metadata/md5-cache/media-libs/harfbuzz-1.9.0
@@ -10,5 +10,5 @@ RDEPEND=cairo? ( x11-libs/cairo:= ) fontconfig? ( media-libs/fontconfig:1.0[abi_
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/media-libs/harfbuzz-9999 b/metadata/md5-cache/media-libs/harfbuzz-9999
index 124c012c0640..a8b74802253a 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-9999
+++ b/metadata/md5-cache/media-libs/harfbuzz-9999
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/media-libs/jasper-2.0.14 b/metadata/md5-cache/media-libs/jasper-2.0.14
index 9f1ef3381a1b..d281be1f4af6 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fb2ee37e13abf94cb1e6b9a2b6d0df0c
diff --git a/metadata/md5-cache/media-libs/jasper-9999 b/metadata/md5-cache/media-libs/jasper-9999
index 753f5b345059..78f285b1da24 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e62c23723feb90e01c6a6cee7efb38e0
diff --git a/metadata/md5-cache/media-libs/kodi-platform-17.1.0.1 b/metadata/md5-cache/media-libs/kodi-platform-17.1.0.1
index 161f4b607849..8b4c845acb41 100644
--- a/metadata/md5-cache/media-libs/kodi-platform-17.1.0.1
+++ b/metadata/md5-cache/media-libs/kodi-platform-17.1.0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-17* =dev-libs/libplatform-2* dev-libs/tinyxml
 SLOT=0
 SRC_URI=https://github.com/xbmc/kodi-platform/tarball/c8188d8 -> kodi-platform-17.1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=03a92c640fa6d286d2b349376845c1e1
diff --git a/metadata/md5-cache/media-libs/kodi-platform-9999 b/metadata/md5-cache/media-libs/kodi-platform-9999
index 694fb7a2ac2e..f053e5f9052b 100644
--- a/metadata/md5-cache/media-libs/kodi-platform-9999
+++ b/metadata/md5-cache/media-libs/kodi-platform-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://kodi.tv
 LICENSE=GPL-2
 RDEPEND==media-tv/kodi-9999 =dev-libs/libplatform-2* dev-libs/tinyxml
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=49f8b16153d1fbae27cfe37954d87d7a
diff --git a/metadata/md5-cache/media-libs/lasi-1.1.2 b/metadata/md5-cache/media-libs/lasi-1.1.2
index 29aeeeada419..b7f897a0f8fc 100644
--- a/metadata/md5-cache/media-libs/lasi-1.1.2
+++ b/metadata/md5-cache/media-libs/lasi-1.1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 media-libs/freetype:2 x11-libs/pango
 SLOT=0
 SRC_URI=mirror://sourceforge/lasi/libLASi-1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=841ec8140de89410e47c3ed0a59c6e8d
diff --git a/metadata/md5-cache/media-libs/lensfun-0.3.2-r1 b/metadata/md5-cache/media-libs/lensfun-0.3.2-r1
index c27b24229a19..d479b7634cfe 100644
--- a/metadata/md5-cache/media-libs/lensfun-0.3.2-r1
+++ b/metadata/md5-cache/media-libs/lensfun-0.3.2-r1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/lensfun/lensfun-0.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=08158cb183f81aa9698aa7effe646b11
diff --git a/metadata/md5-cache/media-libs/libaom-1.0.0 b/metadata/md5-cache/media-libs/libaom-1.0.0
index e3a5b1169b6b..2f32de2867b1 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cd9a02b7640c7e284825d2ed5cc8cb0f
diff --git a/metadata/md5-cache/media-libs/libaom-9999 b/metadata/md5-cache/media-libs/libaom-9999
index 1b1b331f4a33..93b9bbb21966 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d9f9468a28f609a3fd87771868a612d4
diff --git a/metadata/md5-cache/media-libs/libart_lgpl-2.3.21-r3 b/metadata/md5-cache/media-libs/libart_lgpl-2.3.21-r3
index de20cfb001ff..0833d1a7f2f8 100644
--- a/metadata/md5-cache/media-libs/libart_lgpl-2.3.21-r3
+++ b/metadata/md5-cache/media-libs/libart_lgpl-2.3.21-r3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/libart_lgpl/2.3/libart_lgpl-2.3.21.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a4bf30494b5c27bd388972fab85d73a2
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 eedf320132e6..fc38d879e6f9 100644
--- a/metadata/md5-cache/media-libs/libbs2b-3.1.0-r2
+++ b/metadata/md5-cache/media-libs/libbs2b-3.1.0-r2
@@ -1,13 +1,14 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=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(-)?] virtual/pkgconfig
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install test
+DEPEND=>=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(-)?]
 DESCRIPTION=Bauer stereophonic-to-binaural DSP library
-EAPI=5
+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_=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_=48887e4cc586d21a3692c6f4ed7e4653
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=d7c5288a1fc17b92612f2cdb1e39f2fa
diff --git a/metadata/md5-cache/media-libs/libchamplain-0.12.16 b/metadata/md5-cache/media-libs/libchamplain-0.12.16
index 54b2f098e019..70c5e6f773ae 100644
--- a/metadata/md5-cache/media-libs/libchamplain-0.12.16
+++ b/metadata/md5-cache/media-libs/libchamplain-0.12.16
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.16:2 >=media-libs/clutter-1.12:1.0[int
 REQUIRED_USE=vala? ( introspection )
 SLOT=0.12
 SRC_URI=mirror://gnome/sources/libchamplain/0.12/libchamplain-0.12.16.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=41ec353304901ee4d536de779d852aa9
diff --git a/metadata/md5-cache/media-libs/libcuefile-477-r1 b/metadata/md5-cache/media-libs/libcuefile-477-r1
index de9ce3863b95..52ce7668b628 100644
--- a/metadata/md5-cache/media-libs/libcuefile-477-r1
+++ b/metadata/md5-cache/media-libs/libcuefile-477-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Cue File library from Musepack
-EAPI=5
-HOMEPAGE=http://www.musepack.net/
+EAPI=6
+HOMEPAGE=https://www.musepack.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 ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=8e2405f6dd3ff3bb5707302428618606
+_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_=585f325d0fd9227243ab8885d6e6235e
diff --git a/metadata/md5-cache/media-libs/libdvdcss-1.3.0 b/metadata/md5-cache/media-libs/libdvdcss-1.3.0
deleted file mode 100644
index 982ccf88dd70..000000000000
--- a/metadata/md5-cache/media-libs/libdvdcss-1.3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815
-DESCRIPTION=A portable abstraction library for DVD decryption
-EAPI=5
-HOMEPAGE=https://www.videolan.org/developers/libdvdcss.html
-IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2
-SLOT=1.2
-SRC_URI=https://www.videolan.org/pub/libdvdcss/1.3.0/libdvdcss-1.3.0.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_=2a514421db71a8e78ebf0979e4f0ec57
diff --git a/metadata/md5-cache/media-libs/libdvdcss-1.4.0 b/metadata/md5-cache/media-libs/libdvdcss-1.4.0
deleted file mode 100644
index 0c4638ced64f..000000000000
--- a/metadata/md5-cache/media-libs/libdvdcss-1.4.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815
-DESCRIPTION=A portable abstraction library for DVD decryption
-EAPI=5
-HOMEPAGE=https://www.videolan.org/developers/libdvdcss.html
-IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2
-SLOT=1.2
-SRC_URI=https://download.videolan.org/pub/libdvdcss/1.4.0/libdvdcss-1.4.0.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_=af41b35bf1ca549dd6e7fa2d7d0ad04d
diff --git a/metadata/md5-cache/media-libs/libdvdcss-1.4.1 b/metadata/md5-cache/media-libs/libdvdcss-1.4.1
deleted file mode 100644
index b92abf0afc38..000000000000
--- a/metadata/md5-cache/media-libs/libdvdcss-1.4.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815
-DESCRIPTION=A portable abstraction library for DVD decryption
-EAPI=5
-HOMEPAGE=https://www.videolan.org/developers/libdvdcss.html
-IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2
-SLOT=1.2
-SRC_URI=https://download.videolan.org/pub/libdvdcss/1.4.1/libdvdcss-1.4.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_=74b364fa018663760038838d67607153
diff --git a/metadata/md5-cache/media-libs/libdvdcss-1.4.2 b/metadata/md5-cache/media-libs/libdvdcss-1.4.2
index 44dcf18eb086..54d1260a444e 100644
--- a/metadata/md5-cache/media-libs/libdvdcss-1.4.2
+++ b/metadata/md5-cache/media-libs/libdvdcss-1.4.2
@@ -4,9 +4,9 @@ DESCRIPTION=A portable abstraction library for DVD decryption
 EAPI=5
 HOMEPAGE=https://www.videolan.org/developers/libdvdcss.html
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=1.2
 SRC_URI=https://download.videolan.org/pub/libdvdcss/1.4.2/libdvdcss-1.4.2.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_=9d9bf313fc7dc9f57ef3ad7f6380849d
+_md5_=cc83c9d100be85f94ae4d7ea18b455e5
diff --git a/metadata/md5-cache/media-libs/libebur128-1.2.3 b/metadata/md5-cache/media-libs/libebur128-1.2.3
index e282ddc10d67..1532f0d2227a 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bb585889cb0ada3db2e3997aa433c753
diff --git a/metadata/md5-cache/media-libs/libepoxy-1.5.3 b/metadata/md5-cache/media-libs/libepoxy-1.5.3
new file mode 100644
index 000000000000..a65d34996ced
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libepoxy-1.5.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install setup test unpack
+DEPEND=|| ( 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(+)] ) media-libs/mesa[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/meson-0.47.0 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(-)?] ) virtual/pkgconfig >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2
+DESCRIPTION=Epoxy is a library for handling OpenGL function pointer management for you
+EAPI=6
+HOMEPAGE=https://github.com/anholt/libepoxy
+IUSE=test +X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=MIT
+RDEPEND=media-libs/mesa[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0
+SRC_URI=https://github.com/anholt/libepoxy/archive/1.5.3.tar.gz -> libepoxy-1.5.3.tar.gz
+_eclasses_=meson	29ef682942c6ff558de2f797a61790c2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=08c58b25396b112fcab6941e6a1215ca
diff --git a/metadata/md5-cache/media-libs/libepoxy-9999 b/metadata/md5-cache/media-libs/libepoxy-9999
index 830bb3a838b4..349cc917d34b 100644
--- a/metadata/md5-cache/media-libs/libepoxy-9999
+++ b/metadata/md5-cache/media-libs/libepoxy-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install setup test unpack
-DEPEND=|| ( 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(+)] ) media-libs/mesa[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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(-)?] ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2
+DEPEND=|| ( 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(+)] ) media-libs/mesa[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/meson-0.47.0 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(-)?] ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2
 DESCRIPTION=Epoxy is a library for handling OpenGL function pointer management for you
 EAPI=6
 HOMEPAGE=https://github.com/anholt/libepoxy
@@ -8,4 +8,4 @@ LICENSE=MIT
 RDEPEND=media-libs/mesa[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 _eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	29ef682942c6ff558de2f797a61790c2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=49f023b4c8656f98eabf69b161f7f08f
+_md5_=08c58b25396b112fcab6941e6a1215ca
diff --git a/metadata/md5-cache/media-libs/libexif-0.6.21-r2 b/metadata/md5-cache/media-libs/libexif-0.6.21-r2
index fe26957a45cf..2d7386f0e45c 100644
--- a/metadata/md5-cache/media-libs/libexif-0.6.21-r2
+++ b/metadata/md5-cache/media-libs/libexif-0.6.21-r2
@@ -5,10 +5,10 @@ DESCRIPTION=Library for parsing, editing, and saving EXIF data
 EAPI=7
 HOMEPAGE=https://libexif.github.io/
 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
+KEYWORDS=alpha amd64 arm ~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_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=f6e8dfea9c86cd9078661327d1e2ac87
+_md5_=0c652101253a221b60929ce1809cbbfc
diff --git a/metadata/md5-cache/media-libs/libgig-3.3.0 b/metadata/md5-cache/media-libs/libgig-3.3.0
deleted file mode 100644
index 6f897d7f8a25..000000000000
--- a/metadata/md5-cache/media-libs/libgig-3.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=media-libs/libsndfile-1.0.2 >=media-libs/audiofile-0.2.3 virtual/pkgconfig doc? ( app-doc/doxygen )
-DESCRIPTION=a C++ library for loading Gigasampler files and DLS (Downloadable Sounds) Level 1/2 files
-EAPI=0
-HOMEPAGE=http://www.linuxsampler.org/libgig/
-IUSE=doc
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/libsndfile-1.0.2 >=media-libs/audiofile-0.2.3
-SLOT=0
-SRC_URI=http://download.linuxsampler.org/packages/libgig-3.3.0.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_=e11aab73e9029bddd6d76480f61d1e5d
diff --git a/metadata/md5-cache/media-libs/libgig-4.0.0-r1 b/metadata/md5-cache/media-libs/libgig-4.0.0-r1
deleted file mode 100644
index dfbf287e2723..000000000000
--- a/metadata/md5-cache/media-libs/libgig-4.0.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=media-libs/libsndfile-1.0.2 >=media-libs/audiofile-0.2.3 virtual/pkgconfig doc? ( app-doc/doxygen )
-DESCRIPTION=a C++ library for loading Gigasampler files and DLS (Downloadable Sounds) Level 1/2 files
-EAPI=5
-HOMEPAGE=http://www.linuxsampler.org/libgig/
-IUSE=doc
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/libsndfile-1.0.2 >=media-libs/audiofile-0.2.3
-SLOT=0
-SRC_URI=http://download.linuxsampler.org/packages/libgig-4.0.0.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_=bb0e959e81cc825e26b6ce55b54d1c0b
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 25ac164b7265..0a1b5df8599a 100644
--- a/metadata/md5-cache/media-libs/libgroove-4.3.0-r1
+++ b/metadata/md5-cache/media-libs/libgroove-4.3.0-r1
@@ -9,5 +9,5 @@ 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] )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
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 afd4edb5de1b..dd6b85b8c941 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e1e3bf3e1407b1c373b3f11fd4a5664c
diff --git a/metadata/md5-cache/media-libs/libheif-1.3.2 b/metadata/md5-cache/media-libs/libheif-1.3.2
deleted file mode 100644
index f55dde21f877..000000000000
--- a/metadata/md5-cache/media-libs/libheif-1.3.2
+++ /dev/null
@@ -1,14 +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
-DEPEND=media-libs/libde265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/x265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !>=media-libs/libjpeg-turbo-2
-DESCRIPTION=ISO/IEC 23008-12:2017 HEIF file format decoder and encoder
-EAPI=7
-HOMEPAGE=https://github.com/strukturag/libheif
-IUSE=static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=media-libs/libde265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/x265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !>=media-libs/libjpeg-turbo-2
-SLOT=0/1.3
-SRC_URI=https://github.com/strukturag/libheif/releases/download/v1.3.2/libheif-1.3.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=057e100a1f8ad40623178238f9d7e245
diff --git a/metadata/md5-cache/media-libs/libheif-1.3.2-r1 b/metadata/md5-cache/media-libs/libheif-1.3.2-r1
new file mode 100644
index 000000000000..ab7c38fecc70
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libheif-1.3.2-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 test
+DEPEND=media-libs/libde265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/x265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=ISO/IEC 23008-12:2017 HEIF file format decoder and encoder
+EAPI=7
+HOMEPAGE=https://github.com/strukturag/libheif
+IUSE=static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=media-libs/libde265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/x265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0/1.3
+SRC_URI=https://github.com/strukturag/libheif/releases/download/v1.3.2/libheif-1.3.2.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=a5e7415703a92684d6f0be2cc07723ae
diff --git a/metadata/md5-cache/media-libs/libjpeg-turbo-1.5.3-r2 b/metadata/md5-cache/media-libs/libjpeg-turbo-1.5.3-r2
index f208e075e113..e4a7d87891de 100644
--- a/metadata/md5-cache/media-libs/libjpeg-turbo-1.5.3-r2
+++ b/metadata/md5-cache/media-libs/libjpeg-turbo-1.5.3-r2
@@ -4,10 +4,10 @@ DESCRIPTION=MMX, SSE, and SSE2 SIMD accelerated JPEG library
 EAPI=6
 HOMEPAGE=https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/
 IUSE=java static-libs elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+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 ~x64-macos ~x86-macos
 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-1.5.3.tar.gz mirror://gentoo/libjpeg8_8d-2.debian.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	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_=f2b2be126587812c8cb60273ff6c69b5
+_md5_=2c887db1f257e130891ac3a00cdee87f
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 34add3109f0e..7d90c3cb434b 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _md5_=eb8d73679b4379de25750c61830688a0
diff --git a/metadata/md5-cache/media-libs/liblastfm-1.1.0_pre20150206 b/metadata/md5-cache/media-libs/liblastfm-1.1.0_pre20150206
index ec366e82db65..f0e9b2e7683e 100644
--- a/metadata/md5-cache/media-libs/liblastfm-1.1.0_pre20150206
+++ b/metadata/md5-cache/media-libs/liblastfm-1.1.0_pre20150206
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtxml:5 f
 RESTRICT=test
 SLOT=0/0
 SRC_URI=https://github.com/lastfm/liblastfm/archive/44331654256df83bc1d3cbb271a8ce3d4c464686.tar.gz -> liblastfm-1.1.0_pre20150206.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7eb840fa78259c74f0723ccbdbaae5f7
diff --git a/metadata/md5-cache/media-libs/liblrdf-0.5.0 b/metadata/md5-cache/media-libs/liblrdf-0.5.0
index 2602c9e619a8..35e36c80bc79 100644
--- a/metadata/md5-cache/media-libs/liblrdf-0.5.0
+++ b/metadata/md5-cache/media-libs/liblrdf-0.5.0
@@ -4,10 +4,10 @@ DESCRIPTION=A library for the manipulation of RDF file in LADSPA plugins
 EAPI=4
 HOMEPAGE=https://github.com/swh/LRDF
 IUSE=static-libs
-KEYWORDS=amd64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/openssl-1 media-libs/raptor:2 >=media-libs/ladspa-sdk-1.12
 SLOT=0
 SRC_URI=https://github.com/swh/LRDF/tarball/0.5.0 -> liblrdf-0.5.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=56a87ccf6bfacf494a8c825eff6f7241
+_md5_=ee9b17f4e8dccc9ee092b115482d7362
diff --git a/metadata/md5-cache/media-libs/liblrdf-0.6.1 b/metadata/md5-cache/media-libs/liblrdf-0.6.1
new file mode 100644
index 000000000000..59e51516ac31
--- /dev/null
+++ b/metadata/md5-cache/media-libs/liblrdf-0.6.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 install prepare test
+DEPEND=media-libs/ladspa-sdk media-libs/raptor:2 virtual/pkgconfig
+DESCRIPTION=Library for manipulation of RDF files in LADSPA plugins
+EAPI=7
+HOMEPAGE=https://github.com/swh/LRDF
+IUSE=static-libs
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=media-libs/ladspa-sdk media-libs/raptor:2
+SLOT=0
+SRC_URI=https://github.com/swh/LRDF/archive/v0.6.1.tar.gz -> liblrdf-0.6.1.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=1005671d90085c65587ad2c86fc16766
diff --git a/metadata/md5-cache/media-libs/liblscp-0.5.5 b/metadata/md5-cache/media-libs/liblscp-0.5.5
deleted file mode 100644
index f916bbc21e38..000000000000
--- a/metadata/md5-cache/media-libs/liblscp-0.5.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=doc? ( app-doc/doxygen )
-DESCRIPTION=a C++ library for the Linux Sampler control protocol
-EAPI=0
-HOMEPAGE=http://www.linuxsampler.org
-IUSE=doc
-KEYWORDS=amd64 ~ppc x86
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=http://download.linuxsampler.org/packages/liblscp-0.5.5.tar.gz
-_md5_=fd0263397fcdd67fc1a7fe43ced157dc
diff --git a/metadata/md5-cache/media-libs/liblscp-0.5.6 b/metadata/md5-cache/media-libs/liblscp-0.5.6
deleted file mode 100644
index c8a1c4caf67f..000000000000
--- a/metadata/md5-cache/media-libs/liblscp-0.5.6
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=doc? ( app-doc/doxygen )
-DESCRIPTION=a C++ library for the Linux Sampler control protocol
-EAPI=0
-HOMEPAGE=http://www.linuxsampler.org
-IUSE=doc
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=http://download.linuxsampler.org/packages/liblscp-0.5.6.tar.gz
-_md5_=058276428ac4680b9690386c42239847
diff --git a/metadata/md5-cache/media-libs/liblscp-0.5.7 b/metadata/md5-cache/media-libs/liblscp-0.5.7
deleted file mode 100644
index 8ac45a18fbe8..000000000000
--- a/metadata/md5-cache/media-libs/liblscp-0.5.7
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=doc? ( app-doc/doxygen )
-DESCRIPTION=C++ library for the Linux Sampler control protocol
-EAPI=5
-HOMEPAGE=http://www.linuxsampler.org
-IUSE=doc
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=http://download.linuxsampler.org/packages/liblscp-0.5.7.tar.bz2
-_md5_=e55562a0121f43bb2d262d1ed0a076b7
diff --git a/metadata/md5-cache/media-libs/liblscp-0.5.8 b/metadata/md5-cache/media-libs/liblscp-0.5.8
deleted file mode 100644
index 6f940f47c488..000000000000
--- a/metadata/md5-cache/media-libs/liblscp-0.5.8
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=doc? ( app-doc/doxygen )
-DESCRIPTION=C++ library for the Linux Sampler control protocol
-EAPI=5
-HOMEPAGE=http://www.linuxsampler.org
-IUSE=doc
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=http://download.linuxsampler.org/packages/liblscp-0.5.8.tar.gz
-_md5_=b1b750c477093a6157c09e83ed01beec
diff --git a/metadata/md5-cache/media-libs/liblscp-0.5.8-r1 b/metadata/md5-cache/media-libs/liblscp-0.5.8-r1
new file mode 100644
index 000000000000..fa20a8e1f850
--- /dev/null
+++ b/metadata/md5-cache/media-libs/liblscp-0.5.8-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=doc? ( app-doc/doxygen )
+DESCRIPTION=C++ library for the Linux Sampler control protocol
+EAPI=7
+HOMEPAGE=https://www.linuxsampler.org
+IUSE=doc
+KEYWORDS=amd64 ~ppc x86
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=https://download.linuxsampler.org/packages/liblscp-0.5.8.tar.gz
+_md5_=277ab3fb04e78482091b78ad28a05329
diff --git a/metadata/md5-cache/media-libs/libmad-0.15.1b-r9 b/metadata/md5-cache/media-libs/libmad-0.15.1b-r9
new file mode 100644
index 000000000000..c2d6986916af
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libmad-0.15.1b-r9
@@ -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="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
+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
diff --git a/metadata/md5-cache/media-libs/libmatemixer-1.12.1-r1 b/metadata/md5-cache/media-libs/libmatemixer-1.12.1-r1
deleted file mode 100644
index 68f1016ea2b8..000000000000
--- a/metadata/md5-cache/media-libs/libmatemixer-1.12.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-text/docbook-xml-dtd:4.1.2 >=dev-libs/glib-2.36:2 sys-devel/gettext:* alsa? ( >=media-libs/alsa-lib-1.0.5 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.23:0[alsa?,glib] ) dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.35.0:* 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.12
-DESCRIPTION=Mixer library for MATE Desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=+alsa oss pulseaudio
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2 GPL-2
-RDEPEND=app-text/docbook-xml-dtd:4.1.2 >=dev-libs/glib-2.36:2 sys-devel/gettext:* alsa? ( >=media-libs/alsa-lib-1.0.5 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.23:0[alsa?,glib] )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/libmatemixer-1.12.1.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=4896c545c0e8e586d8c8ac9dda324959
diff --git a/metadata/md5-cache/media-libs/libmatemixer-1.14.0 b/metadata/md5-cache/media-libs/libmatemixer-1.14.0
deleted file mode 100644
index 729c452d66c2..000000000000
--- a/metadata/md5-cache/media-libs/libmatemixer-1.14.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.36:2 sys-devel/gettext:* alsa? ( >=media-libs/alsa-lib-1.0.5 ) pulseaudio? ( >=media-sound/pulseaudio-2.0.0:0[alsa?,glib] ) app-text/docbook-xml-dtd:4.1.2 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.35.0:* 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.14
-DESCRIPTION=Mixer library for MATE Desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=+alsa oss pulseaudio
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2 GPL-2
-RDEPEND=>=dev-libs/glib-2.36:2 sys-devel/gettext:* alsa? ( >=media-libs/alsa-lib-1.0.5 ) pulseaudio? ( >=media-sound/pulseaudio-2.0.0:0[alsa?,glib] )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.14/libmatemixer-1.14.0.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=7a273fc75a88c51fb9dcf3b29a9ceda2
diff --git a/metadata/md5-cache/media-libs/libmatemixer-1.16.0 b/metadata/md5-cache/media-libs/libmatemixer-1.16.0
deleted file mode 100644
index 07e4d7d1bc3d..000000000000
--- a/metadata/md5-cache/media-libs/libmatemixer-1.16.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.36:2 sys-devel/gettext:* alsa? ( >=media-libs/alsa-lib-1.0.5 ) pulseaudio? ( >=media-sound/pulseaudio-2.0.0:0[alsa?,glib] ) app-text/docbook-xml-dtd:4.1.2 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.35.0:* 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.16
-DESCRIPTION=Mixer library for MATE Desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=+alsa oss pulseaudio
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2 GPL-2
-RDEPEND=>=dev-libs/glib-2.36:2 sys-devel/gettext:* alsa? ( >=media-libs/alsa-lib-1.0.5 ) pulseaudio? ( >=media-sound/pulseaudio-2.0.0:0[alsa?,glib] )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/libmatemixer-1.16.0.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=7a273fc75a88c51fb9dcf3b29a9ceda2
diff --git a/metadata/md5-cache/media-libs/libmatemixer-1.18.0 b/metadata/md5-cache/media-libs/libmatemixer-1.18.0
index 35b36a6873a6..d58dd16348b7 100644
--- a/metadata/md5-cache/media-libs/libmatemixer-1.18.0
+++ b/metadata/md5-cache/media-libs/libmatemixer-1.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2 GPL-2
 RDEPEND=>=dev-libs/glib-2.36:2 sys-devel/gettext:* alsa? ( >=media-libs/alsa-lib-1.0.5 ) pulseaudio? ( >=media-sound/pulseaudio-2.0.0:0[alsa?,glib] )
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.18/libmatemixer-1.18.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d76c1d8ccdc4ce8f007358e5fa13823f
diff --git a/metadata/md5-cache/media-libs/libmediaart-1.9.4 b/metadata/md5-cache/media-libs/libmediaart-1.9.4
index 07f7d17be1c1..9a26d45d8a47 100644
--- a/metadata/md5-cache/media-libs/libmediaart-1.9.4
+++ b/metadata/md5-cache/media-libs/libmediaart-1.9.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.38.0:2 gtk? ( >=x11-libs/gdk-pixbuf-2.12:2 ) introspec
 REQUIRED_USE=?? ( gtk qt5 ) vala? ( introspection )
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/libmediaart/1.9/libmediaart-1.9.4.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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3538b69ddcb73bf2371a89e53e63db0e
diff --git a/metadata/md5-cache/media-libs/libmng-2.0.3 b/metadata/md5-cache/media-libs/libmng-2.0.3
index edffbded8d25..8f3294a5291f 100644
--- a/metadata/md5-cache/media-libs/libmng-2.0.3
+++ b/metadata/md5-cache/media-libs/libmng-2.0.3
@@ -5,10 +5,10 @@ DESCRIPTION=Multiple Image Networkgraphics lib (animated png's)
 EAPI=7
 HOMEPAGE=https://www.libmng.com/
 IUSE=lcms static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=libmng
 RDEPEND=>=sys-libs/zlib-1.2.8-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/jpeg-0-r2: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(-)?] lcms? ( >=media-libs/lcms-2.5:2[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/2
 SRC_URI=mirror://sourceforge/libmng/libmng-2.0.3.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=0c4a83f251213e3beddfc0392b38880f
+_md5_=1c4775d02cd8d185cf15e09e02118a6e
diff --git a/metadata/md5-cache/media-libs/libmodplug-0.8.8.5 b/metadata/md5-cache/media-libs/libmodplug-0.8.8.5
deleted file mode 100644
index 3d40f46d6962..000000000000
--- a/metadata/md5-cache/media-libs/libmodplug-0.8.8.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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=Library for playing MOD-like music files
-EAPI=5
-HOMEPAGE=http://modplug-xmms.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=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=public-domain
-SLOT=0
-SRC_URI=mirror://sourceforge/modplug-xmms/libmodplug-0.8.8.5.tar.gz
-_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_=24a0aa55989e39d10947cac7ddccfd39
diff --git a/metadata/md5-cache/media-libs/libmodplug-0.8.9.0 b/metadata/md5-cache/media-libs/libmodplug-0.8.9.0
index d5598215f82a..8e3d751bbde8 100644
--- a/metadata/md5-cache/media-libs/libmodplug-0.8.9.0
+++ b/metadata/md5-cache/media-libs/libmodplug-0.8.9.0
@@ -4,9 +4,9 @@ DESCRIPTION=Library for playing MOD-like music files
 EAPI=5
 HOMEPAGE=http://modplug-xmms.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=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=public-domain
 SLOT=0
 SRC_URI=mirror://sourceforge/modplug-xmms/libmodplug-0.8.9.0.tar.gz
 _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_=81a36ccd964f97cadef5c12950b70289
+_md5_=aa7faa141d55a6d68a062e22e91c82f6
diff --git a/metadata/md5-cache/media-libs/libmp4v2-2.0.0 b/metadata/md5-cache/media-libs/libmp4v2-2.0.0
index 22ea0bd0390d..a8ea114f10a2 100644
--- a/metadata/md5-cache/media-libs/libmp4v2-2.0.0
+++ b/metadata/md5-cache/media-libs/libmp4v2-2.0.0
@@ -9,4 +9,4 @@ LICENSE=MPL-1.1
 SLOT=0
 SRC_URI=https://mp4v2.googlecode.com/files/mp4v2-2.0.0.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_=b81ae9da9560abeb69f019551002c639
+_md5_=26cac8f5e3aa401aab100d67076f9ffc
diff --git a/metadata/md5-cache/media-libs/libmp4v2-2.0.0-r1 b/metadata/md5-cache/media-libs/libmp4v2-2.0.0-r1
new file mode 100644
index 000000000000..e669f22fef85
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libmp4v2-2.0.0-r1
@@ -0,0 +1,12 @@
+BDEPEND=sys-apps/sed utils? ( sys-apps/help2man ) test? ( dev-util/dejagnu ) >=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure install prepare
+DESCRIPTION=Functions for accessing ISO-IEC:14496-1:2001 MPEG-4 standard
+EAPI=7
+HOMEPAGE=https://code.google.com/p/mp4v2/
+IUSE=static-libs test utils
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=MPL-1.1
+SLOT=0
+SRC_URI=https://mp4v2.googlecode.com/files/mp4v2-2.0.0.tar.bz2
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=b29ea846ad4c17313da23ac5394dbd41
diff --git a/metadata/md5-cache/media-libs/libmpris2client-0.1.0-r1 b/metadata/md5-cache/media-libs/libmpris2client-0.1.0-r1
index 485b29113d65..bb894d21aff3 100644
--- a/metadata/md5-cache/media-libs/libmpris2client-0.1.0-r1
+++ b/metadata/md5-cache/media-libs/libmpris2client-0.1.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=https://github.com/matiasdelellis/libmpris2client/releases/download/V0.1.0/libmpris2client-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=55ba623c613adf3339e0de34a8a49c37
diff --git a/metadata/md5-cache/media-libs/libmygpo-qt-1.1.0 b/metadata/md5-cache/media-libs/libmygpo-qt-1.1.0
index e82025b10bcd..2173987a7323 100644
--- a/metadata/md5-cache/media-libs/libmygpo-qt-1.1.0
+++ b/metadata/md5-cache/media-libs/libmygpo-qt-1.1.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5
 SLOT=0
 SRC_URI=https://github.com/gpodder/libmygpo-qt/archive/1.1.0.tar.gz -> libmygpo-qt-1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=aadcb08d7305373bfd05a449b9265560
diff --git a/metadata/md5-cache/media-libs/libmygpo-qt-9999 b/metadata/md5-cache/media-libs/libmygpo-qt-9999
index dbc096eab182..e86cfab457a8 100644
--- a/metadata/md5-cache/media-libs/libmygpo-qt-9999
+++ b/metadata/md5-cache/media-libs/libmygpo-qt-9999
@@ -7,5 +7,5 @@ IUSE=test
 LICENSE=LGPL-2.1
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8cdf432653bd8303d840edbf6e469020
diff --git a/metadata/md5-cache/media-libs/libmypaint-1.3.0 b/metadata/md5-cache/media-libs/libmypaint-1.3.0
index b6f6acce8e3d..20774c25f3a4 100644
--- a/metadata/md5-cache/media-libs/libmypaint-1.3.0
+++ b/metadata/md5-cache/media-libs/libmypaint-1.3.0
@@ -9,5 +9,5 @@ LICENSE=ISC
 RDEPEND=dev-libs/glib:2 dev-libs/json-c:= gegl? ( media-libs/babl media-libs/gegl:0.3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1.32 ) openmp? ( sys-devel/gcc:*[openmp] ) nls? ( sys-devel/gettext ) !<media-gfx/mypaint-1.2.1
 SLOT=0/0
 SRC_URI=https://github.com/mypaint/libmypaint/releases/download/v1.3.0/libmypaint-1.3.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fa7e0f9caa39d04a258c64f4e892decd
diff --git a/metadata/md5-cache/media-libs/libmypaint-1.3.0_beta1 b/metadata/md5-cache/media-libs/libmypaint-1.3.0_beta1
index d2a313127fe8..d56655735816 100644
--- a/metadata/md5-cache/media-libs/libmypaint-1.3.0_beta1
+++ b/metadata/md5-cache/media-libs/libmypaint-1.3.0_beta1
@@ -9,5 +9,5 @@ LICENSE=ISC
 RDEPEND=dev-libs/glib:2 dev-libs/json-c:= gegl? ( media-libs/babl media-libs/gegl:0.3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1.32 ) openmp? ( sys-devel/gcc:*[openmp] ) nls? ( sys-devel/gettext ) !<media-gfx/mypaint-1.2.2
 SLOT=0/0
 SRC_URI=https://github.com/mypaint/libmypaint/releases/download/v1.3.0-beta.1/libmypaint-1.3.0-beta.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f459c3bb884998f4bd035e0d0e6c787e
diff --git a/metadata/md5-cache/media-libs/libopenglrecorder-0.1.0 b/metadata/md5-cache/media-libs/libopenglrecorder-0.1.0
index 804635805f0d..6b1b511dc5c9 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a8a05ef9f9b36070229fd79cd6b5dd0b
diff --git a/metadata/md5-cache/media-libs/libopenraw-0.0.9 b/metadata/md5-cache/media-libs/libopenraw-0.0.9
index b492ceb89085..35ae2df19450 100644
--- a/metadata/md5-cache/media-libs/libopenraw-0.0.9
+++ b/metadata/md5-cache/media-libs/libopenraw-0.0.9
@@ -9,5 +9,5 @@ LICENSE=GPL-3 LGPL-3
 RDEPEND=virtual/jpeg:0 dev-libs/libxml2 gtk? ( >=dev-libs/glib-2 >=x11-libs/gdk-pixbuf-2.24.0:2 )
 SLOT=0
 SRC_URI=https://libopenraw.freedesktop.org/download/libopenraw-0.0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e813fe30a99499d46fbd3b75e468178f
diff --git a/metadata/md5-cache/media-libs/libopenraw-0.1.0 b/metadata/md5-cache/media-libs/libopenraw-0.1.0
deleted file mode 100644
index 600479a8983f..000000000000
--- a/metadata/md5-cache/media-libs/libopenraw-0.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=dev-libs/libxml2 virtual/jpeg:0 gtk? ( dev-libs/glib:2 >=x11-libs/gdk-pixbuf-2.24.0:2 ) >=dev-libs/boost-1.35 virtual/pkgconfig test? ( net-misc/curl ) >=sys-apps/sed-4
-DESCRIPTION=A decoding library for RAW image formats
-EAPI=6
-HOMEPAGE=https://libopenraw.freedesktop.org/wiki/
-IUSE=gtk static-libs test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
-LICENSE=GPL-3 LGPL-3
-RDEPEND=dev-libs/libxml2 virtual/jpeg:0 gtk? ( dev-libs/glib:2 >=x11-libs/gdk-pixbuf-2.24.0:2 )
-SLOT=0/7
-SRC_URI=https://libopenraw.freedesktop.org/download/libopenraw-0.1.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=2c9c05679b482680d4678bf4d72849cf
diff --git a/metadata/md5-cache/media-libs/libopenraw-0.1.1 b/metadata/md5-cache/media-libs/libopenraw-0.1.1
deleted file mode 100644
index 86b7a4d76800..000000000000
--- a/metadata/md5-cache/media-libs/libopenraw-0.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst
-DEPEND=dev-libs/libxml2 virtual/jpeg:0 gtk? ( dev-libs/glib:2 >=x11-libs/gdk-pixbuf-2.24.0:2 ) >=dev-libs/boost-1.35 virtual/pkgconfig test? ( net-misc/curl ) >=sys-apps/sed-4
-DESCRIPTION=A decoding library for RAW image formats
-EAPI=6
-HOMEPAGE=https://libopenraw.freedesktop.org/wiki/
-IUSE=gtk static-libs test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
-LICENSE=GPL-3 LGPL-3
-RDEPEND=dev-libs/libxml2 virtual/jpeg:0 gtk? ( dev-libs/glib:2 >=x11-libs/gdk-pixbuf-2.24.0:2 )
-SLOT=0/7
-SRC_URI=https://libopenraw.freedesktop.org/download/libopenraw-0.1.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=e4ee266aa111e618a06cdcdef237286a
diff --git a/metadata/md5-cache/media-libs/libopenraw-0.1.2 b/metadata/md5-cache/media-libs/libopenraw-0.1.2
index c369790c3c38..53a4c99dd4bd 100644
--- a/metadata/md5-cache/media-libs/libopenraw-0.1.2
+++ b/metadata/md5-cache/media-libs/libopenraw-0.1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3 LGPL-3
 RDEPEND=dev-libs/libxml2 virtual/jpeg:0 gtk? ( dev-libs/glib:2 >=x11-libs/gdk-pixbuf-2.24.0:2 )
 SLOT=0/7
 SRC_URI=https://libopenraw.freedesktop.org/download/libopenraw-0.1.2.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=738a529b51a3c0e56fe45a3555280267
+_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_=4872f4ddccd4aae8e0bd138779f2bde2
diff --git a/metadata/md5-cache/media-libs/libopenshot-0.1.3 b/metadata/md5-cache/media-libs/libopenshot-0.1.3
index 97cf8f8ff653..6ee2f2b5b0d8 100644
--- a/metadata/md5-cache/media-libs/libopenshot-0.1.3
+++ b/metadata/md5-cache/media-libs/libopenshot-0.1.3
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_4 python_single_target_
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
index 1def3b58ac99..43f8284ab859 100644
--- a/metadata/md5-cache/media-libs/libopenshot-0.1.7
+++ b/metadata/md5-cache/media-libs/libopenshot-0.1.7
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_4 python_single_target_
 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	89bb9f083a2590d9b447fd0b78a96186
+_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.1.8 b/metadata/md5-cache/media-libs/libopenshot-0.1.8
index 699adbce9607..77342400c59a 100644
--- a/metadata/md5-cache/media-libs/libopenshot-0.1.8
+++ b/metadata/md5-cache/media-libs/libopenshot-0.1.8
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_4 python_single_target_
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/OpenShot/libopenshot/archive/v0.1.8.tar.gz -> libopenshot-0.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=632af5298ef384c04873f8863e190884
diff --git a/metadata/md5-cache/media-libs/libopenshot-audio-0.1.2-r1 b/metadata/md5-cache/media-libs/libopenshot-audio-0.1.2-r1
index db064ef493e4..04a4eb6c691d 100644
--- a/metadata/md5-cache/media-libs/libopenshot-audio-0.1.2-r1
+++ b/metadata/md5-cache/media-libs/libopenshot-audio-0.1.2-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/alsa-lib media-libs/freetype x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr
 SLOT=0
 SRC_URI=https://github.com/OpenShot/libopenshot-audio/archive/v0.1.2.tar.gz -> libopenshot-audio-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4445153390e117c10cda6bc3f5a4eb21
diff --git a/metadata/md5-cache/media-libs/libopenshot-audio-0.1.4 b/metadata/md5-cache/media-libs/libopenshot-audio-0.1.4
index afd7db8fd93e..fe14756823c9 100644
--- a/metadata/md5-cache/media-libs/libopenshot-audio-0.1.4
+++ b/metadata/md5-cache/media-libs/libopenshot-audio-0.1.4
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/alsa-lib media-libs/freetype x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr
 SLOT=0
 SRC_URI=https://github.com/OpenShot/libopenshot-audio/archive/v0.1.4.tar.gz -> libopenshot-audio-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8fb2551dadf8f48f7a2cd9eeb20e0c50
diff --git a/metadata/md5-cache/media-libs/libprojectm-2.1.0-r2 b/metadata/md5-cache/media-libs/libprojectm-2.1.0-r2
index c94dce5b6d6e..8a3f7a9c142f 100644
--- a/metadata/md5-cache/media-libs/libprojectm-2.1.0-r2
+++ b/metadata/md5-cache/media-libs/libprojectm-2.1.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A graphical music visualization plugin similar to milkdrop
 EAPI=6
 HOMEPAGE=http://projectm.sourceforge.net
 IUSE=debug openmp video_cards_nvidia
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2
 RDEPEND=media-fonts/dejavu >=media-libs/ftgl-2.1.3_rc5 media-libs/freetype:2 media-libs/mesa media-libs/glew:= sys-libs/zlib video_cards_nvidia? ( media-gfx/nvidia-cg-toolkit )
 SLOT=0
 SRC_URI=mirror://sourceforge/projectm/projectM-complete-2.1.0-Source.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=fc86ab896519adde94a88d0859e04561
+_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_=90ce83f92c25158bc2e1d21b3b54f59c
diff --git a/metadata/md5-cache/media-libs/libqaccessibilityclient-0.2.0 b/metadata/md5-cache/media-libs/libqaccessibilityclient-0.2.0
index a888add2936c..5288d3252da3 100644
--- a/metadata/md5-cache/media-libs/libqaccessibilityclient-0.2.0
+++ b/metadata/md5-cache/media-libs/libqaccessibilityclient-0.2.0
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 df649f42d25f..4f3147307135 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_=8f1da51c96d0c786fb2bbdd85af32f1f
+_md5_=683129e206c71f67f155856bb331e65d
diff --git a/metadata/md5-cache/media-libs/libraw-0.18.13 b/metadata/md5-cache/media-libs/libraw-0.18.13
index 0080527eb8aa..28de383f317c 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_=2eccf93c5e1e8191003db1ebe40ab74e
+_md5_=96397b59827231a7c3a6799ba13eabca
diff --git a/metadata/md5-cache/media-libs/libreplaygain-477-r1 b/metadata/md5-cache/media-libs/libreplaygain-477-r1
index e6c1dfea0521..d9e68fbd2adf 100644
--- a/metadata/md5-cache/media-libs/libreplaygain-477-r1
+++ b/metadata/md5-cache/media-libs/libreplaygain-477-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Replay Gain library from Musepack
-EAPI=5
+EAPI=6
 HOMEPAGE=https://www.musepack.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 ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=4f5ddc235833ede4dd2fa22ea960363a
+_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_=5197438bd502b3e2ee5152f578fad051
diff --git a/metadata/md5-cache/media-libs/libsfml-2.4.2 b/metadata/md5-cache/media-libs/libsfml-2.4.2
index 6a49fe46c582..b4a12266dd83 100644
--- a/metadata/md5-cache/media-libs/libsfml-2.4.2
+++ b/metadata/md5-cache/media-libs/libsfml-2.4.2
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=media-libs/flac media-libs/freetype:2 media-libs/libpng:0= media-libs/libogg media-libs/libvorbis media-libs/mesa media-libs/openal sys-libs/zlib virtual/jpeg:0 virtual/libudev:0 virtual/opengl 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e5cf7b5775ff2bfa70f43cee168d3189
diff --git a/metadata/md5-cache/media-libs/libsfml-2.4.2-r1 b/metadata/md5-cache/media-libs/libsfml-2.4.2-r1
index 8b4925aa3d29..a0211aace232 100644
--- a/metadata/md5-cache/media-libs/libsfml-2.4.2-r1
+++ b/metadata/md5-cache/media-libs/libsfml-2.4.2-r1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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.4.2-r2 b/metadata/md5-cache/media-libs/libsfml-2.4.2-r2
index fb493fc13a5c..1db8ccb46380 100644
--- a/metadata/md5-cache/media-libs/libsfml-2.4.2-r2
+++ b/metadata/md5-cache/media-libs/libsfml-2.4.2-r2
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=efcc3082a72493ae5dfc3ec67bba5774
diff --git a/metadata/md5-cache/media-libs/libsfml-2.5.0 b/metadata/md5-cache/media-libs/libsfml-2.5.0
index 32108bf88bd5..bfaa81d2b189 100644
--- a/metadata/md5-cache/media-libs/libsfml-2.5.0
+++ b/metadata/md5-cache/media-libs/libsfml-2.5.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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/libsidplay-1.36.59-r1 b/metadata/md5-cache/media-libs/libsidplay-1.36.59-r1
deleted file mode 100644
index 0b0e1b550190..000000000000
--- a/metadata/md5-cache/media-libs/libsidplay-1.36.59-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170815
-DESCRIPTION=C64 SID player library
-EAPI=4
-HOMEPAGE=http://critical.ch/distfiles/
-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 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-SLOT=1
-SRC_URI=http://critical.ch/distfiles/libsidplay-1.36.59.tgz
-_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_=a2c0862afdd82391a9153e1aa51bd021
diff --git a/metadata/md5-cache/media-libs/libsndfile-1.0.28-r1 b/metadata/md5-cache/media-libs/libsndfile-1.0.28-r1
deleted file mode 100644
index 22bb3a25dd2a..000000000000
--- a/metadata/md5-cache/media-libs/libsndfile-1.0.28-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install setup test
-DEPEND=!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 ) virtual/pkgconfig 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 >=virtual/pypy3-5:0 >=virtual/pypy-5:0 ) )
-DESCRIPTION=A C library for reading and writing files containing sampled sound
-EAPI=6
-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
-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_=dbf70bc97c324bb6d8b00ef594e0bd4c
diff --git a/metadata/md5-cache/media-libs/libsndfile-1.0.28-r2 b/metadata/md5-cache/media-libs/libsndfile-1.0.28-r2
deleted file mode 100644
index ac245516ecef..000000000000
--- a/metadata/md5-cache/media-libs/libsndfile-1.0.28-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig 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 >=virtual/pypy3-5:0 >=virtual/pypy-5:0 ) )
-DEFINED_PHASES=compile configure install setup test
-DEPEND=!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 )
-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
-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_=f3a0785b00e0e55fffbc4be569a78864
diff --git a/metadata/md5-cache/media-libs/libsndfile-1.0.28-r3 b/metadata/md5-cache/media-libs/libsndfile-1.0.28-r3
index 88552feb04cd..3a76b727dc0b 100644
--- a/metadata/md5-cache/media-libs/libsndfile-1.0.28-r3
+++ b/metadata/md5-cache/media-libs/libsndfile-1.0.28-r3
@@ -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_=03c5585d50ba2657d6b6442a630b56ec
+_md5_=90c961ba6754cada26e1a800930c1793
diff --git a/metadata/md5-cache/media-libs/libsndfile-1.0.28-r4 b/metadata/md5-cache/media-libs/libsndfile-1.0.28-r4
new file mode 100644
index 000000000000..e84f8387e859
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libsndfile-1.0.28-r4
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig 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 >=virtual/pypy3-5:0 >=virtual/pypy-5:0 ) )
+DEFINED_PHASES=compile configure install setup test
+DEPEND=!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 )
+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
+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
diff --git a/metadata/md5-cache/media-libs/libsndfile-9999 b/metadata/md5-cache/media-libs/libsndfile-9999
index 929d3956c304..fee1ea1861ce 100644
--- a/metadata/md5-cache/media-libs/libsndfile-9999
+++ b/metadata/md5-cache/media-libs/libsndfile-9999
@@ -1,11 +1,12 @@
+BDEPEND=|| ( 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/pypy3-5:0 >=virtual/pypy-5:0 ) sys-devel/autogen >=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=compile configure install prepare setup test unpack
-DEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy3-5:0 >=virtual/pypy-5:0 ) sys-devel/autogen !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 ) virtual/pkgconfig 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 >=virtual/pypy3-5:0 >=virtual/pypy-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 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=A C library for reading and writing files containing sampled sound
-EAPI=6
+DEPEND=!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 )
+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
 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
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	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
-_md5_=63847e1f8a1ff7319322d1dbd93d0828
+_md5_=8a774a5ff4ae5702a5a3cfc8d79d17d2
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 9fb3a4e82174..8f5cb90c22ce 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=11c0d6617198eda3680e11e01a8899a9
diff --git a/metadata/md5-cache/media-libs/libtheora-1.1.1-r2 b/metadata/md5-cache/media-libs/libtheora-1.1.1-r2
new file mode 100644
index 000000000000..79f6b3c4f81a
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libtheora-1.1.1-r2
@@ -0,0 +1,15 @@
+BDEPEND=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
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=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:= )
+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
+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
diff --git a/metadata/md5-cache/media-libs/libuvc-0.0.6 b/metadata/md5-cache/media-libs/libuvc-0.0.6
index 9fadcf372e55..775b693e31c7 100644
--- a/metadata/md5-cache/media-libs/libuvc-0.0.6
+++ b/metadata/md5-cache/media-libs/libuvc-0.0.6
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=virtual/jpeg:62 virtual/libusb:1 virtual/udev
 SLOT=0
 SRC_URI=https://github.com/ktossell/libuvc/archive/v0.0.6.tar.gz -> libuvc-0.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3543d53a26076a8c287d93e9053bd070
diff --git a/metadata/md5-cache/media-libs/libv4l-1.10.0 b/metadata/md5-cache/media-libs/libv4l-1.10.0
index e35b7e7eb848..a5a76ce4c86b 100644
--- a/metadata/md5-cache/media-libs/libv4l-1.10.0
+++ b/metadata/md5-cache/media-libs/libv4l-1.10.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 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(-)?] ) !media-tv/v4l2-ctl !<media-tv/ivtv-utils-1.4.0-r2
 SLOT=0/0
 SRC_URI=https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.10.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e04ee2ff3a17bc4e8e9f3cadb623e239
diff --git a/metadata/md5-cache/media-libs/libv4l-1.10.1 b/metadata/md5-cache/media-libs/libv4l-1.10.1
index b957cbc00f37..ef9a8a9f79cf 100644
--- a/metadata/md5-cache/media-libs/libv4l-1.10.1
+++ b/metadata/md5-cache/media-libs/libv4l-1.10.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 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(-)?] ) !media-tv/v4l2-ctl !<media-tv/ivtv-utils-1.4.0-r2
 SLOT=0/0
 SRC_URI=https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.10.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b0bc18e3dbd2f102a5580499381fa6c3
diff --git a/metadata/md5-cache/media-libs/libv4l-1.12.3 b/metadata/md5-cache/media-libs/libv4l-1.12.3
index 567f59b3b805..99fa5b0c6768 100644
--- a/metadata/md5-cache/media-libs/libv4l-1.12.3
+++ b/metadata/md5-cache/media-libs/libv4l-1.12.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 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(-)?] ) virtual/libudev !media-tv/v4l2-ctl !<media-tv/ivtv-utils-1.4.0-r2
 SLOT=0/0
 SRC_URI=https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.12.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b3ef803523bbb3eb61bf6d740c7bc356
diff --git a/metadata/md5-cache/media-libs/libv4l-1.12.5 b/metadata/md5-cache/media-libs/libv4l-1.12.5
index 429946ce4da9..1d6a2ebebe62 100644
--- a/metadata/md5-cache/media-libs/libv4l-1.12.5
+++ b/metadata/md5-cache/media-libs/libv4l-1.12.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 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(-)?] ) virtual/libudev !media-tv/v4l2-ctl !<media-tv/ivtv-utils-1.4.0-r2
 SLOT=0/0
 SRC_URI=https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.12.5.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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_=a3eb4e85ad00dbe5fea53c464483971b
diff --git a/metadata/md5-cache/media-libs/libv4l-1.14.1 b/metadata/md5-cache/media-libs/libv4l-1.14.1
index 9d1bcf8df823..b437aff074a3 100644
--- a/metadata/md5-cache/media-libs/libv4l-1.14.1
+++ b/metadata/md5-cache/media-libs/libv4l-1.14.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 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(-)?] ) virtual/libudev !media-tv/v4l2-ctl !<media-tv/ivtv-utils-1.4.0-r2
 SLOT=0/0
 SRC_URI=https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.14.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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_=fffb9b27435df073cb9b896e38ff1ad1
diff --git a/metadata/md5-cache/media-libs/libv4l-1.6.2 b/metadata/md5-cache/media-libs/libv4l-1.6.2
index 52c382cc4be9..b347249c59a3 100644
--- a/metadata/md5-cache/media-libs/libv4l-1.6.2
+++ b/metadata/md5-cache/media-libs/libv4l-1.6.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 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(-)?] ) !media-tv/v4l2-ctl !<media-tv/ivtv-utils-1.4.0-r2
 SLOT=0
 SRC_URI=http://linuxtv.org/downloads/v4l-utils/v4l-utils-1.6.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f80efb8dd92d341c50905abe13258330
diff --git a/metadata/md5-cache/media-libs/libwmf-0.2.8.4-r6 b/metadata/md5-cache/media-libs/libwmf-0.2.8.4-r6
index 5f5bec669eac..535b91e31e6b 100644
--- a/metadata/md5-cache/media-libs/libwmf-0.2.8.4-r6
+++ b/metadata/md5-cache/media-libs/libwmf-0.2.8.4-r6
@@ -10,5 +10,5 @@ RDEPEND=app-text/ghostscript-gpl media-fonts/urw-fonts media-libs/freetype:2= >=
 REQUIRED_USE=expat? ( xml )
 SLOT=0
 SRC_URI=mirror://sourceforge/wvware/libwmf-0.2.8.4.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	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_=ae46d4fc4dad64c0094a2fee89968473
diff --git a/metadata/md5-cache/media-libs/libwmf-0.2.8.4-r7 b/metadata/md5-cache/media-libs/libwmf-0.2.8.4-r7
index b567676458f6..ef6699c3992b 100644
--- a/metadata/md5-cache/media-libs/libwmf-0.2.8.4-r7
+++ b/metadata/md5-cache/media-libs/libwmf-0.2.8.4-r7
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=app-text/ghostscript-gpl media-fonts/urw-fonts media-libs/freetype:2= media-libs/libpng:0= sys-libs/zlib:= x11-libs/gdk-pixbuf:2[X?] virtual/jpeg:0= expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2= ) X? ( x11-libs/libX11 x11-libs/libXt x11-libs/libXpm )
 SLOT=0
 SRC_URI=mirror://sourceforge/wvware/libwmf-0.2.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d5c04a8e003856d44c8d59a6c0075e33
diff --git a/metadata/md5-cache/media-libs/libxspf-1.2.0 b/metadata/md5-cache/media-libs/libxspf-1.2.0
index 0c3b494c7a2a..b879df3b76a3 100644
--- a/metadata/md5-cache/media-libs/libxspf-1.2.0
+++ b/metadata/md5-cache/media-libs/libxspf-1.2.0
@@ -9,5 +9,5 @@ LICENSE=BSD LGPL-2.1
 RDEPEND=>=dev-libs/expat-2 >=dev-libs/uriparser-0.7.5
 SLOT=0
 SRC_URI=mirror://sourceforge/libspiff/libxspf-1.2.0.tar.bz2
-_eclasses_=xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1e68bd165cfd602c89b6c9f1c478a808
diff --git a/metadata/md5-cache/media-libs/mesa-18.2.2 b/metadata/md5-cache/media-libs/mesa-18.2.2
new file mode 100644
index 000000000000..5a6e07496dfc
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mesa-18.2.2
@@ -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? ( 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: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? ( 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: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_=083b2738405d0f870f1ef5240b00e71b
diff --git a/metadata/md5-cache/media-libs/ming-0.4.8-r1 b/metadata/md5-cache/media-libs/ming-0.4.8-r1
index f91351538cc3..7503447dd2cc 100644
--- a/metadata/md5-cache/media-libs/ming-0.4.8-r1
+++ b/metadata/md5-cache/media-libs/ming-0.4.8-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 ) ) || ( python_targets_pyt
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/libming/libming/archive/ming-0_4_8.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	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	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	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	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6e7c9dbbc6ad3c949b9bf843316ffd4b
diff --git a/metadata/md5-cache/media-libs/munt-mt32emu-2.3.0 b/metadata/md5-cache/media-libs/munt-mt32emu-2.3.0
index 5cdb76d6b26c..0a465a6be049 100644
--- a/metadata/md5-cache/media-libs/munt-mt32emu-2.3.0
+++ b/metadata/md5-cache/media-libs/munt-mt32emu-2.3.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://github.com/munt/munt/archive/munt_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=4cbeabee13e328fc7d3dd27b8c25fb0a
diff --git a/metadata/md5-cache/media-libs/musicbrainz-5.1.0 b/metadata/md5-cache/media-libs/musicbrainz-5.1.0
index a130bbc34c0a..f10a45cac646 100644
--- a/metadata/md5-cache/media-libs/musicbrainz-5.1.0
+++ b/metadata/md5-cache/media-libs/musicbrainz-5.1.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libxml2 net-libs/neon
 SLOT=5/1
 SRC_URI=https://github.com/metabrainz/libmusicbrainz/releases/download/release-5.1.0/libmusicbrainz-5.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=66c2a9c7a0986998047e6470f1ed594f
diff --git a/metadata/md5-cache/media-libs/mutagen-1.35.1 b/metadata/md5-cache/media-libs/mutagen-1.35.1
index b3659bddd38e..d1449e815fed 100644
--- a/metadata/md5-cache/media-libs/mutagen-1.35.1
+++ b/metadata/md5-cache/media-libs/mutagen-1.35.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://bitbucket.org/lazka/mutagen/downloads/mutagen-1.35.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=40a91e3cde9a8b8c9b97406768fb4e30
diff --git a/metadata/md5-cache/media-libs/mutagen-1.38 b/metadata/md5-cache/media-libs/mutagen-1.38
index 7bfa999190b9..14b3e3ce724c 100644
--- a/metadata/md5-cache/media-libs/mutagen-1.38
+++ b/metadata/md5-cache/media-libs/mutagen-1.38
@@ -10,5 +10,5 @@ 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
 SRC_URI=https://github.com/quodlibet/mutagen/releases/download/release-1.38/mutagen-1.38.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5089ef0f0f57458ded48b6e16bd909cb
diff --git a/metadata/md5-cache/media-libs/mutagen-1.39 b/metadata/md5-cache/media-libs/mutagen-1.39
index 44a109cfb790..85722a7de438 100644
--- a/metadata/md5-cache/media-libs/mutagen-1.39
+++ b/metadata/md5-cache/media-libs/mutagen-1.39
@@ -10,5 +10,5 @@ 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
 SRC_URI=https://github.com/quodlibet/mutagen/releases/download/release-1.39/mutagen-1.39.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bbffff82e72b62d868a337ac963586cb
diff --git a/metadata/md5-cache/media-libs/mutagen-1.40.0 b/metadata/md5-cache/media-libs/mutagen-1.40.0
index 20b912bca625..6c559e26f4a3 100644
--- a/metadata/md5-cache/media-libs/mutagen-1.40.0
+++ b/metadata/md5-cache/media-libs/mutagen-1.40.0
@@ -10,5 +10,5 @@ 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
 SRC_URI=https://github.com/quodlibet/mutagen/releases/download/release-1.40.0/mutagen-1.40.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9611bdf8121bb23aee0af8c203fbde21
diff --git a/metadata/md5-cache/media-libs/nas-1.9.4-r1 b/metadata/md5-cache/media-libs/nas-1.9.4-r1
deleted file mode 100644
index 2c9929ed41c4..000000000000
--- a/metadata/md5-cache/media-libs/nas-1.9.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=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/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXpm >=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(-)?] app-text/rman sys-devel/bison sys-devel/flex x11-base/xorg-proto x11-misc/gccmakedep x11-misc/imake
-DESCRIPTION=Network Audio System
-EAPI=5
-HOMEPAGE=http://radscan.com/nas.html
-IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd
-LICENSE=HPND MIT
-RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=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/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXpm >=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(-)?]
-SLOT=0
-SRC_URI=mirror://sourceforge/nas/nas-1.9.4.src.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_=d69d9e36b2a8e8dcb35b1612777814d8
diff --git a/metadata/md5-cache/media-libs/nas-1.9.4-r2 b/metadata/md5-cache/media-libs/nas-1.9.4-r2
index 59666a699e1a..83227774dbd7 100644
--- a/metadata/md5-cache/media-libs/nas-1.9.4-r2
+++ b/metadata/md5-cache/media-libs/nas-1.9.4-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Network Audio System
 EAPI=7
 HOMEPAGE=https://radscan.com/nas.html
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd
 LICENSE=HPND MIT
 RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=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/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXpm >=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(-)?]
 SLOT=0
 SRC_URI=mirror://sourceforge/nas/nas-1.9.4.src.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=d36aea885029e3993186fe889afcc739
+_md5_=dce50da8bf2a52f0f4f25fee7e1f90a9
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 cbdc06981b47..fd3fb9495de4 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2843db6501e947870658b8f28e1fe3c3
diff --git a/metadata/md5-cache/media-libs/openal-1.19.0 b/metadata/md5-cache/media-libs/openal-1.19.0
index 44c63312b7db..3bbf9f13c69b 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a68dcfe81c1c7334a9513d5db9bb278f
diff --git a/metadata/md5-cache/media-libs/opencollada-1.6.58 b/metadata/md5-cache/media-libs/opencollada-1.6.58
index bbd87b33c6bd..efb217495490 100644
--- a/metadata/md5-cache/media-libs/opencollada-1.6.58
+++ b/metadata/md5-cache/media-libs/opencollada-1.6.58
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/libpcre dev-libs/zziplib media-libs/lib3ds sys-libs/zlib dev-libs/libxml2
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/OpenCOLLADA/archive/v1.6.58.tar.gz -> opencollada-1.6.58.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0d356230b2f66e2069cb1f1d85372c04
diff --git a/metadata/md5-cache/media-libs/opencollada-1.6.62 b/metadata/md5-cache/media-libs/opencollada-1.6.62
index d106ae2d7202..b7e4326d560d 100644
--- a/metadata/md5-cache/media-libs/opencollada-1.6.62
+++ b/metadata/md5-cache/media-libs/opencollada-1.6.62
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=<dev-libs/libpcre-8.42 dev-libs/zziplib media-libs/lib3ds sys-libs/zlib dev-libs/libxml2
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/OpenCOLLADA/archive/v1.6.62.tar.gz -> opencollada-1.6.62.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=17b73078d6c239a532c9d0c109e36361
diff --git a/metadata/md5-cache/media-libs/opencollada-1.6.63 b/metadata/md5-cache/media-libs/opencollada-1.6.63
index 9f69f1e2a978..fd541894e7a8 100644
--- a/metadata/md5-cache/media-libs/opencollada-1.6.63
+++ b/metadata/md5-cache/media-libs/opencollada-1.6.63
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/libpcre dev-libs/libxml2 dev-libs/zziplib media-libs/lib3ds sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/OpenCOLLADA/archive/v1.6.63.tar.gz -> opencollada-1.6.63.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c268563f7a47d05165a455f290ea9edd
diff --git a/metadata/md5-cache/media-libs/opencolorio-1.1.0-r1 b/metadata/md5-cache/media-libs/opencolorio-1.1.0-r1
index 6bc07d00d368..fa2a4388dc52 100644
--- a/metadata/md5-cache/media-libs/opencolorio-1.1.0-r1
+++ b/metadata/md5-cache/media-libs/opencolorio-1.1.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=doc? ( python ) python? ( ^^ ( python_single_target_python2_7 pytho
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/imageworks/OpenColorIO/archive/v1.1.0.tar.gz -> opencolorio-1.1.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=93bf65790208676daae5fb5bf64844e2
diff --git a/metadata/md5-cache/media-libs/opencv-2.4.13-r3 b/metadata/md5-cache/media-libs/opencv-2.4.13-r3
index d3b1f3cd596c..4013f765524f 100644
--- a/metadata/md5-cache/media-libs/opencv-2.4.13-r3
+++ b/metadata/md5-cache/media-libs/opencv-2.4.13-r3
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2 sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0/2.4
 SRC_URI=https://github.com/Itseez/opencv/archive/2.4.13.tar.gz -> opencv-2.4.13.tar.gz
-_eclasses_=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	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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	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_=981a8fec18d4c14eb69b382b36850ad4
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 169bf62c16cd..bd5301831dd5 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _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 ae9162b00dc3..b3e5b1c45132 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _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 9d2861b7b6d8..e2e5046243e1 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _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 57f8b7e683a9..2fac425c1034 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _md5_=eb9987435041d7861d305dfa8e112490
diff --git a/metadata/md5-cache/media-libs/openicc-0.1.0 b/metadata/md5-cache/media-libs/openicc-0.1.0
index 10c5fdb43361..07920af433c3 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=755d66cf981c1081cf232bf08a1c119a
diff --git a/metadata/md5-cache/media-libs/openimageio-1.6.13 b/metadata/md5-cache/media-libs/openimageio-1.6.13
index 1d0f83162601..62236b696dde 100644
--- a/metadata/md5-cache/media-libs/openimageio-1.6.13
+++ b/metadata/md5-cache/media-libs/openimageio-1.6.13
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/OpenImageIO/oiio/archive/Release-1.6.13.tar.gz -> openimageio-1.6.13.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ac495e4375fa757e4429dfd125cf0908
diff --git a/metadata/md5-cache/media-libs/openimageio-1.6.18 b/metadata/md5-cache/media-libs/openimageio-1.6.18
index 51067e163e2f..5bb909809ab1 100644
--- a/metadata/md5-cache/media-libs/openimageio-1.6.18
+++ b/metadata/md5-cache/media-libs/openimageio-1.6.18
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/OpenImageIO/oiio/archive/Release-1.6.18.tar.gz -> openimageio-1.6.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ba16bc2cfe091b0189f53c6d1816b412
diff --git a/metadata/md5-cache/media-libs/openimageio-1.7.17 b/metadata/md5-cache/media-libs/openimageio-1.7.17
index d137f9335b65..387613841346 100644
--- a/metadata/md5-cache/media-libs/openimageio-1.7.17
+++ b/metadata/md5-cache/media-libs/openimageio-1.7.17
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/OpenImageIO/oiio/archive/Release-1.7.17.tar.gz -> openimageio-1.7.17.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6642a013bfc9a5a201f95473ff1cca11
diff --git a/metadata/md5-cache/media-libs/openimageio-1.8.13 b/metadata/md5-cache/media-libs/openimageio-1.8.13
index 5f93ae6cf588..23c095907722 100644
--- a/metadata/md5-cache/media-libs/openimageio-1.8.13
+++ b/metadata/md5-cache/media-libs/openimageio-1.8.13
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/OpenImageIO/oiio/archive/Release-1.8.13.tar.gz -> openimageio-1.8.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=351852aeec9262c5e5b6a9597cfc59a7
diff --git a/metadata/md5-cache/media-libs/openimageio-1.8.7 b/metadata/md5-cache/media-libs/openimageio-1.8.7
index bd0650f59f7f..15af07c30537 100644
--- a/metadata/md5-cache/media-libs/openimageio-1.8.7
+++ b/metadata/md5-cache/media-libs/openimageio-1.8.7
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/OpenImageIO/oiio/archive/Release-1.8.7.tar.gz -> openimageio-1.8.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b2e1b982ef0a32bcef94dbcf0602ae67
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 8894fa69bfc2..bd464650cba8 100644
--- a/metadata/md5-cache/media-libs/openjpeg-1.5.2-r1
+++ b/metadata/md5-cache/media-libs/openjpeg-1.5.2-r1
@@ -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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/media-libs/openjpeg-2.3.0 b/metadata/md5-cache/media-libs/openjpeg-2.3.0
index cd68be42cfa0..8e2278669a9b 100644
--- a/metadata/md5-cache/media-libs/openjpeg-2.3.0
+++ b/metadata/md5-cache/media-libs/openjpeg-2.3.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/media-libs/openmoiv-1.0.3a b/metadata/md5-cache/media-libs/openmoiv-1.0.3a
index 4462c80db99d..02b6d6038095 100644
--- a/metadata/md5-cache/media-libs/openmoiv-1.0.3a
+++ b/metadata/md5-cache/media-libs/openmoiv-1.0.3a
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=media-libs/coin
 SLOT=0
 SRC_URI=http://www.tecn.upf.es/openMOIV/download/1.0.3/OpenMOIV.src.1.0.3a.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4ec0088163c7a0f71b97ed2f7150b2b7
diff --git a/metadata/md5-cache/media-libs/opensubdiv-3.3.0 b/metadata/md5-cache/media-libs/opensubdiv-3.3.0
index f95f8ca629b5..d0a970c1e3cf 100644
--- a/metadata/md5-cache/media-libs/opensubdiv-3.3.0
+++ b/metadata/md5-cache/media-libs/opensubdiv-3.3.0
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=media-libs/glew:= media-libs/glfw:= cuda? ( dev-util/nvidia-cuda-toolkit:* ) opencl? ( virtual/opencl ) ptex? ( media-libs/ptex )
 SLOT=0
 SRC_URI=https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v3_3_0.tar.gz -> opensubdiv-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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=f45c41861fe1ef3004792cadaf325c3a
diff --git a/metadata/md5-cache/media-libs/opensubdiv-3.3.3 b/metadata/md5-cache/media-libs/opensubdiv-3.3.3
index dabd2577bb08..d16fdac3a6e7 100644
--- a/metadata/md5-cache/media-libs/opensubdiv-3.3.3
+++ b/metadata/md5-cache/media-libs/opensubdiv-3.3.3
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=media-libs/glew:= media-libs/glfw:= cuda? ( dev-util/nvidia-cuda-toolkit:* ) opencl? ( virtual/opencl ) ptex? ( media-libs/ptex )
 SLOT=0
 SRC_URI=https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v3_3_3.tar.gz -> opensubdiv-3.3.3.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e138a6bcfcf049bced70ce921ac0c6e7
diff --git a/metadata/md5-cache/media-libs/opusfile-0.11 b/metadata/md5-cache/media-libs/opusfile-0.11
index 90b9380e0c6a..f5842b1e5a6a 100644
--- a/metadata/md5-cache/media-libs/opusfile-0.11
+++ b/metadata/md5-cache/media-libs/opusfile-0.11
@@ -10,4 +10,4 @@ RDEPEND=media-libs/libogg media-libs/opus http? ( !libressl? ( dev-libs/openssl:
 REQUIRED_USE=^^ ( fixed-point float )
 SLOT=0
 SRC_URI=https://downloads.xiph.org/releases/opus/opusfile-0.11.tar.gz
-_md5_=66f32f1c40b92ab52797eab1835118f0
+_md5_=aed15c0219b648d53d85f28ae2f82933
diff --git a/metadata/md5-cache/media-libs/osl-1.8.12 b/metadata/md5-cache/media-libs/osl-1.8.12
index b3b95ab876b9..a2e8458fa26e 100644
--- a/metadata/md5-cache/media-libs/osl-1.8.12
+++ b/metadata/md5-cache/media-libs/osl-1.8.12
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/openexr-2.2.0 >=media-libs/openimageio-1.7.0 dev-libs/pugix
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/imageworks/OpenShadingLanguage/archive/Release-1.8.12.tar.gz -> osl-1.8.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2842e1019ab5b257181e989a851d0b07
diff --git a/metadata/md5-cache/media-libs/osl-1.9.6 b/metadata/md5-cache/media-libs/osl-1.9.6
index 473511899a46..67a00af974dc 100644
--- a/metadata/md5-cache/media-libs/osl-1.9.6
+++ b/metadata/md5-cache/media-libs/osl-1.9.6
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/openexr-2.2.0 >=media-libs/openimageio-1.8.0 dev-libs/pugix
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/imageworks/OpenShadingLanguage/archive/Release-1.9.6.tar.gz -> osl-1.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ac840a319bb8ab848dc46e461f4be630
diff --git a/metadata/md5-cache/media-libs/osl-1.9.9 b/metadata/md5-cache/media-libs/osl-1.9.9
index b3fc86923583..ef55af112ea9 100644
--- a/metadata/md5-cache/media-libs/osl-1.9.9
+++ b/metadata/md5-cache/media-libs/osl-1.9.9
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/pugixml >=media-libs/openexr-2.2.0 >=media-libs/openimageio-1.8
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/imageworks/OpenShadingLanguage/archive/Release-1.9.9.tar.gz -> osl-1.9.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9d9d83c0c94034565bafe73bd1f621e1
diff --git a/metadata/md5-cache/media-libs/oyranos-0.9.6 b/metadata/md5-cache/media-libs/oyranos-0.9.6
index 017b62d9b0be..f558cf92359c 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e15206b790ed1a1994273a6c9ba15aee
diff --git a/metadata/md5-cache/media-libs/oyranos-9999 b/metadata/md5-cache/media-libs/oyranos-9999
index 3bb6667949e0..bb427e4b6860 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=116bfb27bcdd6ee71db91ff770344788
diff --git a/metadata/md5-cache/media-libs/partio-1.1.0_p20170829 b/metadata/md5-cache/media-libs/partio-1.1.0_p20170829
index cf4ab3b387a8..1015eac0ee73 100644
--- a/metadata/md5-cache/media-libs/partio-1.1.0_p20170829
+++ b/metadata/md5-cache/media-libs/partio-1.1.0_p20170829
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/wdas/partio/archive/2774ef3958da46d9f8a4230ebda9e04b1aa8f4e5.tar.gz -> partio-1.1.0_p20170829.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=12541118fed4e3f9736e4701cd468b77
diff --git a/metadata/md5-cache/media-libs/partio-1.5.0 b/metadata/md5-cache/media-libs/partio-1.5.0
index e82ae11741b7..06c0c74e3164 100644
--- a/metadata/md5-cache/media-libs/partio-1.5.0
+++ b/metadata/md5-cache/media-libs/partio-1.5.0
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/wdas/partio/archive/v1.5.0.tar.gz -> partio-1.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=fca16bb76ddf3b52636f31bdc563d7f2
diff --git a/metadata/md5-cache/media-libs/partio-1.5.4 b/metadata/md5-cache/media-libs/partio-1.5.4
index 784119bf949e..52d7387aebaf 100644
--- a/metadata/md5-cache/media-libs/partio-1.5.4
+++ b/metadata/md5-cache/media-libs/partio-1.5.4
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/wdas/partio/archive/v1.5.4.tar.gz -> partio-1.5.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=fca16bb76ddf3b52636f31bdc563d7f2
diff --git a/metadata/md5-cache/media-libs/partio-9999 b/metadata/md5-cache/media-libs/partio-9999
index 0be6d804efe5..1aa385ed20cd 100644
--- a/metadata/md5-cache/media-libs/partio-9999
+++ b/metadata/md5-cache/media-libs/partio-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] media-libs/freeglut virtual/opengl sys-libs/zlib:=
 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
-_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a99456167114f6e5ab4dcf9820f41e22
diff --git a/metadata/md5-cache/media-libs/phonon-4.10.1 b/metadata/md5-cache/media-libs/phonon-4.10.1
index a32a53c08b18..2d10886e58a9 100644
--- a/metadata/md5-cache/media-libs/phonon-4.10.1
+++ b/metadata/md5-cache/media-libs/phonon-4.10.1
@@ -10,5 +10,5 @@ PDEPEND=gstreamer? ( >=media-libs/phonon-gstreamer-4.9.0[qt5(+)] ) vlc? ( >=medi
 RDEPEND=!!dev-qt/qtphonon:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 ) pulseaudio? ( dev-libs/glib:2 >=media-sound/pulseaudio-0.9.21[glib] )
 SLOT=0
 SRC_URI=mirror://kde/stable/phonon/4.10.1/phonon-4.10.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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2103788b7aeb7b77eafc9f90078d3d8a
diff --git a/metadata/md5-cache/media-libs/phonon-9999 b/metadata/md5-cache/media-libs/phonon-9999
index cf3aa7773fbe..c110f14d131c 100644
--- a/metadata/md5-cache/media-libs/phonon-9999
+++ b/metadata/md5-cache/media-libs/phonon-9999
@@ -8,5 +8,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 )
 PDEPEND=gstreamer? ( >=media-libs/phonon-gstreamer-4.9.0[qt5(+)] ) vlc? ( >=media-libs/phonon-vlc-0.9.0[qt5(+)] )
 RDEPEND=!!dev-qt/qtphonon:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 ) pulseaudio? ( dev-libs/glib:2 >=media-sound/pulseaudio-0.9.21[glib] )
 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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e63aeb200391d21057be22447a9d08da
diff --git a/metadata/md5-cache/media-libs/phonon-gstreamer-4.9.0-r2 b/metadata/md5-cache/media-libs/phonon-gstreamer-4.9.0-r2
index 0b8f52f57f07..fd86854f645a 100644
--- a/metadata/md5-cache/media-libs/phonon-gstreamer-4.9.0-r2
+++ b/metadata/md5-cache/media-libs/phonon-gstreamer-4.9.0-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )
 RDEPEND=dev-libs/glib:2 dev-libs/libxml2:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/phonon-4.10.0 media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis] virtual/opengl network? ( media-plugins/gst-plugins-soup:1.0 )
 SLOT=0
 SRC_URI=mirror://kde/stable/phonon/phonon-backend-gstreamer/4.9.0/phonon-backend-gstreamer-4.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8850841c8b910f5223eef26b583b7511
diff --git a/metadata/md5-cache/media-libs/phonon-gstreamer-9999 b/metadata/md5-cache/media-libs/phonon-gstreamer-9999
index 63bcdbbb5da6..2345522794f7 100644
--- a/metadata/md5-cache/media-libs/phonon-gstreamer-9999
+++ b/metadata/md5-cache/media-libs/phonon-gstreamer-9999
@@ -7,5 +7,5 @@ IUSE=alsa debug +network
 LICENSE=LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )
 RDEPEND=dev-libs/glib:2 dev-libs/libxml2:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/phonon-4.10.0 media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis] virtual/opengl network? ( media-plugins/gst-plugins-soup:1.0 )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=04ff9d497b172339fc394dd691fc852b
diff --git a/metadata/md5-cache/media-libs/phonon-vlc-0.10.1 b/metadata/md5-cache/media-libs/phonon-vlc-0.10.1
index 728dc78a61c1..2ebbe5d22db3 100644
--- a/metadata/md5-cache/media-libs/phonon-vlc-0.10.1
+++ b/metadata/md5-cache/media-libs/phonon-vlc-0.10.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=media-libs/phonon-4.10.0 media-video/vlc:=[dbus,ogg,vorbis]
 SLOT=0
 SRC_URI=mirror://kde/stable/phonon/phonon-backend-vlc/0.10.1/phonon-backend-vlc-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=17d86997b4a659d54a1f699d5f5d3e63
diff --git a/metadata/md5-cache/media-libs/phonon-vlc-9999 b/metadata/md5-cache/media-libs/phonon-vlc-9999
index 286d5b5853b6..acd613257fdb 100644
--- a/metadata/md5-cache/media-libs/phonon-vlc-9999
+++ b/metadata/md5-cache/media-libs/phonon-vlc-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=media-libs/phonon-4.10.0 media-video/vlc:=[dbus,ogg,vorbis]
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=50cecf50f5582148cb27db757c9b540e
diff --git a/metadata/md5-cache/media-libs/portaudio-19.06.00-r1 b/metadata/md5-cache/media-libs/portaudio-19.06.00-r1
index 83ff95536de1..42733160ef6b 100644
--- a/metadata/md5-cache/media-libs/portaudio-19.06.00-r1
+++ b/metadata/md5-cache/media-libs/portaudio-19.06.00-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A free, cross-platform, open-source, audio I/O library
 EAPI=6
 HOMEPAGE=http://www.portaudio.com/
 IUSE=alsa +cxx debug doc jack oss static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=MIT
 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(-)?] )
 SLOT=0
 SRC_URI=http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz
 _eclasses_=ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=4d5af00bbac927ca11a5c952863005fe
+_md5_=25529dd17c648a26fb897399db2d16d4
diff --git a/metadata/md5-cache/media-libs/portaudio-19_pre20140130 b/metadata/md5-cache/media-libs/portaudio-19_pre20140130
deleted file mode 100644
index 8dc24e6df965..000000000000
--- a/metadata/md5-cache/media-libs/portaudio-19_pre20140130
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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(-)?] ) virtual/pkgconfig >=app-portage/elt-patches-20170815
-DESCRIPTION=A free, cross-platform, open-source, audio I/O library
-EAPI=5
-HOMEPAGE=http://www.portaudio.com/
-IUSE=alsa +cxx debug jack oss 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 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
-LICENSE=MIT
-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(-)?] )
-SLOT=0
-SRC_URI=http://www.portaudio.com/archives/pa_stable_v19_20140130.tgz
-_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_=a3b7ada2ecc7f867019978ef41919963
diff --git a/metadata/md5-cache/media-libs/portmidi-217-r1 b/metadata/md5-cache/media-libs/portmidi-217-r1
index 4834ba971bf8..cc554706a7c1 100644
--- a/metadata/md5-cache/media-libs/portmidi-217-r1
+++ b/metadata/md5-cache/media-libs/portmidi-217-r1
@@ -10,5 +10,5 @@ RDEPEND=media-libs/alsa-lib python? ( python_targets_python2_7? ( >=dev-lang/pyt
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/media-libs/ptex-2.1.28 b/metadata/md5-cache/media-libs/ptex-2.1.28
index ce9fb18a62b3..ef25d0c44f31 100644
--- a/metadata/md5-cache/media-libs/ptex-2.1.28
+++ b/metadata/md5-cache/media-libs/ptex-2.1.28
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/wdas/ptex/archive/v2.1.28.tar.gz -> ptex-2.1.28.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=61b90d914173cbaea333a1ae2792598b
diff --git a/metadata/md5-cache/media-libs/ptex-2.1.28-r1 b/metadata/md5-cache/media-libs/ptex-2.1.28-r1
index d479ff8e8483..b1d5e0a8b861 100644
--- a/metadata/md5-cache/media-libs/ptex-2.1.28-r1
+++ b/metadata/md5-cache/media-libs/ptex-2.1.28-r1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=sys-libs/zlib:=
 SLOT=0
 SRC_URI=https://github.com/wdas/ptex/archive/v2.1.28.tar.gz -> ptex-2.1.28.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e144d6c1720f04a39102516a905ee34f
diff --git a/metadata/md5-cache/media-libs/ptex-2.3.0 b/metadata/md5-cache/media-libs/ptex-2.3.0
index 7212a95e0ca7..b5a8dc0d9fec 100644
--- a/metadata/md5-cache/media-libs/ptex-2.3.0
+++ b/metadata/md5-cache/media-libs/ptex-2.3.0
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib:=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/wdas/ptex/archive/v2.3.0.tar.gz -> ptex-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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=3862e969b9732b6edbc3849796d6827d
diff --git a/metadata/md5-cache/media-libs/pyliblo-0.10.0 b/metadata/md5-cache/media-libs/pyliblo-0.10.0
index 4aaf10e3eefb..209bf57d0273 100644
--- a/metadata/md5-cache/media-libs/pyliblo-0.10.0
+++ b/metadata/md5-cache/media-libs/pyliblo-0.10.0
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/liblo-0.27 python_targets_python2_7? ( >=dev-lang/python-2.
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://das.nasophon.de/download/pyliblo-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7155ffc6d063b6c6790c031bec58efbe
diff --git a/metadata/md5-cache/media-libs/qhull-2015.2 b/metadata/md5-cache/media-libs/qhull-2015.2
index d71dcb7f5ad0..05f7d21ae2a2 100644
--- a/metadata/md5-cache/media-libs/qhull-2015.2
+++ b/metadata/md5-cache/media-libs/qhull-2015.2
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://www.qhull.org/download/qhull-2015-src-7.2.0.tgz -> qhull-2015.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f5f107d0a679290f14e376cedd735e7c
diff --git a/metadata/md5-cache/media-libs/qimageblitz-0.0.6_p20131029 b/metadata/md5-cache/media-libs/qimageblitz-0.0.6_p20131029
index 4c47280b57a5..630c987345ef 100644
--- a/metadata/md5-cache/media-libs/qimageblitz-0.0.6_p20131029
+++ b/metadata/md5-cache/media-libs/qimageblitz-0.0.6_p20131029
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~asturm/distfiles/qimageblitz-0.0.6_p20131029.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5e10e9cfb6add584b67cf1a816ede4b8
diff --git a/metadata/md5-cache/media-libs/qt-gstreamer-1.2.0-r3 b/metadata/md5-cache/media-libs/qt-gstreamer-1.2.0-r3
index e20d4244f464..a28aa29654c7 100644
--- a/metadata/md5-cache/media-libs/qt-gstreamer-1.2.0-r3
+++ b/metadata/md5-cache/media-libs/qt-gstreamer-1.2.0-r3
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtdeclarative:5
 RESTRICT=test
 SLOT=0
 SRC_URI=https://gstreamer.freedesktop.org/src/qt-gstreamer/qt-gstreamer-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ae13ed102d6fc9247dcfa8228b9e7468
diff --git a/metadata/md5-cache/media-libs/qt-gstreamer-1.2.0-r4 b/metadata/md5-cache/media-libs/qt-gstreamer-1.2.0-r4
index 6b6f089821b5..8f04617b3a2e 100644
--- a/metadata/md5-cache/media-libs/qt-gstreamer-1.2.0-r4
+++ b/metadata/md5-cache/media-libs/qt-gstreamer-1.2.0-r4
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtdeclarative:5
 RESTRICT=test
 SLOT=0
 SRC_URI=https://gstreamer.freedesktop.org/src/qt-gstreamer/qt-gstreamer-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f645c963b42f55ad8f1aebcc6d472d2f
diff --git a/metadata/md5-cache/media-libs/qtav-1.12.0 b/metadata/md5-cache/media-libs/qtav-1.12.0
index e4d9ce6bbcfe..ac5daf6afea3 100644
--- a/metadata/md5-cache/media-libs/qtav-1.12.0
+++ b/metadata/md5-cache/media-libs/qtav-1.12.0
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 REQUIRED_USE=gui? ( opengl )
 SLOT=0/1
 SRC_URI=https://github.com/wang-bin/QtAV/archive/v1.12.0.tar.gz -> qtav-1.12.0.tar.gz https://dev.gentoo.org/~johu/distfiles/qtav-1.12.0-capi.h-b43aa93.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f59f85ce975184edfe474336d020dff0
diff --git a/metadata/md5-cache/media-libs/raptor-2.0.14 b/metadata/md5-cache/media-libs/raptor-2.0.14
index eec80329e2e9..e556c187ab03 100644
--- a/metadata/md5-cache/media-libs/raptor-2.0.14
+++ b/metadata/md5-cache/media-libs/raptor-2.0.14
@@ -4,10 +4,10 @@ DESCRIPTION=The RDF Parser Toolkit
 EAPI=5
 HOMEPAGE=http://librdf.org/raptor/
 IUSE=+curl debug json static-libs unicode
-KEYWORDS=alpha amd64 arm 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 ~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.14.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_=ddfecb6de3802f5f0456b624b4f91526
+_md5_=31d2dfa2e1be1a6bf60cee6d2d0c5e0b
diff --git a/metadata/md5-cache/media-libs/raptor-2.0.15 b/metadata/md5-cache/media-libs/raptor-2.0.15
deleted file mode 100644
index dbc6ecd73c73..000000000000
--- a/metadata/md5-cache/media-libs/raptor-2.0.15
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/libxml2 dev-libs/libxslt curl? ( net-misc/curl ) json? ( dev-libs/yajl ) unicode? ( dev-libs/icu:= ) !media-libs/raptor:0 >=sys-devel/bison-3 >=sys-devel/flex-2.5.36 virtual/pkgconfig >=app-portage/elt-patches-20170815
-DESCRIPTION=The RDF Parser Toolkit
-EAPI=6
-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
-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_=0b65ee34a36d01dcc728d805c962826b
diff --git a/metadata/md5-cache/media-libs/raptor-2.0.15-r1 b/metadata/md5-cache/media-libs/raptor-2.0.15-r1
new file mode 100644
index 000000000000..e5b662174433
--- /dev/null
+++ b/metadata/md5-cache/media-libs/raptor-2.0.15-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=sys-devel/bison-3 >=sys-devel/flex-2.5.36 virtual/pkgconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure install prepare test
+DEPEND=dev-libs/libxml2 dev-libs/libxslt curl? ( net-misc/curl ) json? ( dev-libs/yajl ) unicode? ( dev-libs/icu:= )
+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
+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
diff --git a/metadata/md5-cache/media-libs/raspberrypi-userland-0_pre20160424 b/metadata/md5-cache/media-libs/raspberrypi-userland-0_pre20160424
index 5567b1f3d2f8..1a4708015571 100644
--- a/metadata/md5-cache/media-libs/raspberrypi-userland-0_pre20160424
+++ b/metadata/md5-cache/media-libs/raspberrypi-userland-0_pre20160424
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=!media-libs/raspberrypi-userland-bin wayland? ( dev-libs/wayland )
 SLOT=0
 SRC_URI=https://github.com/raspberrypi/userland/tarball/dff5760 -> raspberrypi-userland-0_pre20160424.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=73c74dd9d58afc52857baadd4d972ea6
diff --git a/metadata/md5-cache/media-libs/raspberrypi-userland-9999 b/metadata/md5-cache/media-libs/raspberrypi-userland-9999
index 8989374346a0..fc521f3bcf2e 100644
--- a/metadata/md5-cache/media-libs/raspberrypi-userland-9999
+++ b/metadata/md5-cache/media-libs/raspberrypi-userland-9999
@@ -5,5 +5,5 @@ EAPI=5
 HOMEPAGE=https://github.com/raspberrypi/userland
 LICENSE=BSD
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=252fd6c1fd7f6cbab6a349067c6863f1
diff --git a/metadata/md5-cache/media-libs/rply-1.01-r1 b/metadata/md5-cache/media-libs/rply-1.01-r1
index f897041df282..e60ec5f25def 100644
--- a/metadata/md5-cache/media-libs/rply-1.01-r1
+++ b/metadata/md5-cache/media-libs/rply-1.01-r1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~tetromino/distfiles/rply/rply-1.01.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=130f1cdd8f3deeeb24ebbff2bcb7260a
diff --git a/metadata/md5-cache/media-libs/rubberband-1.8.2 b/metadata/md5-cache/media-libs/rubberband-1.8.2
new file mode 100644
index 000000000000..7d83fe3dbf7d
--- /dev/null
+++ b/metadata/md5-cache/media-libs/rubberband-1.8.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/ladspa-sdk 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(-)?] media-libs/libsndfile media-libs/vamp-plugin-sdk[abi_x86_32(-)?,abi_x86_64(-)?,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/fftw: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(-)?] virtual/pkgconfig
+DESCRIPTION=An audio time-stretching and pitch-shifting library and utility program
+EAPI=7
+HOMEPAGE=https://www.breakfastquay.com/rubberband/
+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 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/ladspa-sdk 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(-)?] media-libs/libsndfile media-libs/vamp-plugin-sdk[abi_x86_32(-)?,abi_x86_64(-)?,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/fftw: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(-)?]
+SLOT=0
+SRC_URI=https://breakfastquay.com/files/releases/rubberband-1.8.2.tar.bz2
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=0571cf94e9cbc6919e3fab2e514f86aa
diff --git a/metadata/md5-cache/media-libs/schroedinger-1.0.11-r1 b/metadata/md5-cache/media-libs/schroedinger-1.0.11-r1
index 1e5090b1f641..1f3c23f001d2 100644
--- a/metadata/md5-cache/media-libs/schroedinger-1.0.11-r1
+++ b/metadata/md5-cache/media-libs/schroedinger-1.0.11-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2 MIT MPL-1.1
 RDEPEND=>=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,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://www.diracvideo.org/download/schroedinger/schroedinger-1.0.11.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-multilib	d4c92668ddddff2b1da2efb74daa43be	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-multilib	d4c92668ddddff2b1da2efb74daa43be	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=06720dc35bb38a23de8e2f1aba68fe5d
diff --git a/metadata/md5-cache/media-libs/shaderc-2017.2 b/metadata/md5-cache/media-libs/shaderc-2017.2
index 844074fa2890..9395feca259a 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _md5_=f5e603850e96510e6d8c9e6713270477
diff --git a/metadata/md5-cache/media-libs/shaderc-9999 b/metadata/md5-cache/media-libs/shaderc-9999
index a8ad0594f31f..dd14047e0242 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _md5_=921f8bc6ad90d2bac6da5af50b6389fd
diff --git a/metadata/md5-cache/media-libs/simage-1.7.1a_beta_pre20180312 b/metadata/md5-cache/media-libs/simage-1.7.1a_beta_pre20180312
index 8de18b7f632b..7c247b1fb554 100644
--- a/metadata/md5-cache/media-libs/simage-1.7.1a_beta_pre20180312
+++ b/metadata/md5-cache/media-libs/simage-1.7.1a_beta_pre20180312
@@ -9,5 +9,5 @@ LICENSE=public-domain mpeg2enc
 RDEPEND=gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( media-libs/jasper ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) sndfile? ( media-libs/libsndfile ) tiff? ( media-libs/tiff:0= ) vorbis? ( media-libs/libogg media-libs/libvorbis )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~reavertm/Coin3D-simage-3bd369da8f08.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3242c838ab9b7290aeff70abe9a05684
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 9f57151c5dfa..8de1f04b8995 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=745c6756b486402cfd85025be653bb6b
diff --git a/metadata/md5-cache/media-libs/svgalib-1.9.25-r5 b/metadata/md5-cache/media-libs/svgalib-1.9.25-r5
index d6a07f2c61b4..7b47cc6ae66c 100644
--- a/metadata/md5-cache/media-libs/svgalib-1.9.25-r5
+++ b/metadata/md5-cache/media-libs/svgalib-1.9.25-r5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://www.arava.co.il/matan/svgalib/svgalib-1.9.25.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=941ea0cf14b9fb24a8930174c73546c5
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 6144a4d9cfa2..969400e2de66 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d0bf5fd38b335f1643c9ce49365f32cd
diff --git a/metadata/md5-cache/media-libs/taglib-extras-1.0.1-r1 b/metadata/md5-cache/media-libs/taglib-extras-1.0.1-r1
index 1a7abf872641..736aa9ba7cd6 100644
--- a/metadata/md5-cache/media-libs/taglib-extras-1.0.1-r1
+++ b/metadata/md5-cache/media-libs/taglib-extras-1.0.1-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=media-libs/taglib-1.6
 SLOT=0
 SRC_URI=mirror://kde/stable/taglib-extras/1.0.1/src/taglib-extras-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bb95b49aaf6d0ad1e36699eeca332e81
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 deee13b834c2..0685f7d08950 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_=3ed9ecc74b94ef52e8256bcc0536d043
+_md5_=d3e8cffb6bd27a4784d14dcf80fe68c6
diff --git a/metadata/md5-cache/media-libs/vigra-1.11.0 b/metadata/md5-cache/media-libs/vigra-1.11.0
index 9c8e637040fb..76919d582103 100644
--- a/metadata/md5-cache/media-libs/vigra-1.11.0
+++ b/metadata/md5-cache/media-libs/vigra-1.11.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/python:2.7 >=dev-libs/boost-1.52.0-r6:=[python?,python_targets_
 REQUIRED_USE=doc? ( hdf5 fftw ) python? ( hdf5 || ( python_targets_python2_7 ) ) test? ( hdf5 python fftw )
 SLOT=0
 SRC_URI=https://github.com/ukoethe/vigra/releases/download/Version-1-11-0/vigra-1.11.0-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	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=43e0f9b7f8c77f965385b42756b0bd86
diff --git a/metadata/md5-cache/media-libs/vigra-1.11.1 b/metadata/md5-cache/media-libs/vigra-1.11.1
index 0930dceecafb..d954583edf4d 100644
--- a/metadata/md5-cache/media-libs/vigra-1.11.1
+++ b/metadata/md5-cache/media-libs/vigra-1.11.1
@@ -11,5 +11,5 @@ REQUIRED_USE=doc? ( hdf5 fftw ) python? ( hdf5 || ( python_targets_python2_7 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-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	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=a612160845df4f5e570aaa569ce0c216
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 71329c0d2a8b..bf2c193fb6d1 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _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 63768650c6ce..1e11206fa4a5 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _md5_=98d913c65f3305e56065913a0d29c8d9
diff --git a/metadata/md5-cache/media-libs/vulkan-layers-9999 b/metadata/md5-cache/media-libs/vulkan-layers-9999
index 9c886858a8e3..3643c4d3be83 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _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 cc42b6935e64..1b26a08a2755 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _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 7cd1ea8bc042..18d2757dc5f3 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _md5_=dc02c477b34848957629a8dadcf7e6d4
diff --git a/metadata/md5-cache/media-libs/vulkan-loader-9999 b/metadata/md5-cache/media-libs/vulkan-loader-9999
index d31ad97cbeb1..18e36e167912 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _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 260a8fece076..b1f6318c6926 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ed952d74907c69be7bffedc55f05cb23
diff --git a/metadata/md5-cache/media-libs/waffle-9999 b/metadata/md5-cache/media-libs/waffle-9999
index b584aabdd0a7..b4e6e6ba31e1 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=dbcac2d768e2e0a0bef13ee56c4e17e9
diff --git a/metadata/md5-cache/media-libs/woff2-1.0.2-r1 b/metadata/md5-cache/media-libs/woff2-1.0.2-r1
index 55d2bb607fa4..fe57e11cf4f7 100644
--- a/metadata/md5-cache/media-libs/woff2-1.0.2-r1
+++ b/metadata/md5-cache/media-libs/woff2-1.0.2-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=app-arch/brotli
 SLOT=0
 SRC_URI=https://github.com/google/woff2/archive/v1.0.2.tar.gz -> woff2-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3785132f289e23393a3c8b10d408f043
diff --git a/metadata/md5-cache/media-libs/x265-2.2 b/metadata/md5-cache/media-libs/x265-2.2
index e1e2fe80af77..c29916d8f574 100644
--- a/metadata/md5-cache/media-libs/x265-2.2
+++ b/metadata/md5-cache/media-libs/x265-2.2
@@ -9,5 +9,5 @@ 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/102
 SRC_URI=https://bitbucket.org/multicoreware/x265/downloads/x265_2.2.tar.gz https://downloads.videolan.org/pub/videolan/x265/x265_2.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	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=2152acdfcf11ff1d3e156efb8176ebf9
diff --git a/metadata/md5-cache/media-libs/x265-2.6 b/metadata/md5-cache/media-libs/x265-2.6
index 2528943df5f6..852a72718d38 100644
--- a/metadata/md5-cache/media-libs/x265-2.6
+++ b/metadata/md5-cache/media-libs/x265-2.6
@@ -9,5 +9,5 @@ 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/146
 SRC_URI=https://bitbucket.org/multicoreware/x265/downloads/x265_2.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3e5a608b5072077ceeeac46b81299c4f
diff --git a/metadata/md5-cache/media-libs/x265-2.7 b/metadata/md5-cache/media-libs/x265-2.7
index ae564f261eb0..2bef03ad3ede 100644
--- a/metadata/md5-cache/media-libs/x265-2.7
+++ b/metadata/md5-cache/media-libs/x265-2.7
@@ -9,5 +9,5 @@ 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/151
 SRC_URI=https://bitbucket.org/multicoreware/x265/downloads/x265_2.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=794c2a3c6d2b2a639877496ae2797ef5
diff --git a/metadata/md5-cache/media-libs/x265-2.8 b/metadata/md5-cache/media-libs/x265-2.8
index 4c8f1a82af21..1aa3f8613223 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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=914dceb50719597e24ae0fb020e82761
+_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
diff --git a/metadata/md5-cache/media-libs/x265-9999 b/metadata/md5-cache/media-libs/x265-9999
index 4f6e94e3f08e..13d1eda67501 100644
--- a/metadata/md5-cache/media-libs/x265-9999
+++ b/metadata/md5-cache/media-libs/x265-9999
@@ -7,5 +7,5 @@ IUSE=+10bit +12bit cpu_flags_arm_neon numa pic power8 test abi_x86_32 abi_x86_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
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 5e8ab107bc91..f434dd14a24c 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/frei0r-plugins-1.5.0 b/metadata/md5-cache/media-plugins/frei0r-plugins-1.5.0
deleted file mode 100644
index 5366ba3017cb..000000000000
--- a/metadata/md5-cache/media-plugins/frei0r-plugins-1.5.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=x11-libs/cairo facedetect? ( >=media-libs/opencv-2.3.0:= ) scale0tilt? ( >=media-libs/gavl-1.2.0 ) virtual/pkgconfig doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A minimalistic plugin API for video effects
-EAPI=6
-HOMEPAGE=https://www.dyne.org/software/frei0r/
-IUSE=doc +facedetect +scale0tilt
-KEYWORDS=amd64 ~arm hppa ppc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=x11-libs/cairo facedetect? ( >=media-libs/opencv-2.3.0:= ) scale0tilt? ( >=media-libs/gavl-1.2.0 )
-SLOT=0
-SRC_URI=https://files.dyne.org/frei0r/releases/frei0r-plugins-1.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=e292a3bbf5f63a9e2e39ebe6d7f1ab2e
diff --git a/metadata/md5-cache/media-plugins/frei0r-plugins-1.6.0 b/metadata/md5-cache/media-plugins/frei0r-plugins-1.6.0
deleted file mode 100644
index 18e388292e38..000000000000
--- a/metadata/md5-cache/media-plugins/frei0r-plugins-1.6.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=x11-libs/cairo facedetect? ( >=media-libs/opencv-2.3.0:= ) scale0tilt? ( >=media-libs/gavl-1.2.0 ) virtual/pkgconfig doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A minimalistic plugin API for video effects
-EAPI=6
-HOMEPAGE=https://www.dyne.org/software/frei0r/
-IUSE=doc +facedetect +scale0tilt
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=x11-libs/cairo facedetect? ( >=media-libs/opencv-2.3.0:= ) scale0tilt? ( >=media-libs/gavl-1.2.0 )
-SLOT=0
-SRC_URI=https://files.dyne.org/frei0r/releases/frei0r-plugins-1.6.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=db54d27b26dfc31c31d40fd5937d726a
diff --git a/metadata/md5-cache/media-plugins/frei0r-plugins-1.6.1 b/metadata/md5-cache/media-plugins/frei0r-plugins-1.6.1
index d7b258fef163..766550a498b8 100644
--- a/metadata/md5-cache/media-plugins/frei0r-plugins-1.6.1
+++ b/metadata/md5-cache/media-plugins/frei0r-plugins-1.6.1
@@ -4,10 +4,10 @@ DESCRIPTION=A minimalistic plugin API for video effects
 EAPI=6
 HOMEPAGE=https://www.dyne.org/software/frei0r/
 IUSE=doc +facedetect +scale0tilt
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=x11-libs/cairo facedetect? ( >=media-libs/opencv-2.3.0:= ) scale0tilt? ( >=media-libs/gavl-1.2.0 )
 SLOT=0
 SRC_URI=https://files.dyne.org/frei0r/releases/frei0r-plugins-1.6.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=c3c1c0daf9121226a9ff48be1367f9f4
+_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_=f11401dc0fa53b01eef33014d36d9bc2
diff --git a/metadata/md5-cache/media-plugins/grilo-plugins-0.2.17 b/metadata/md5-cache/media-plugins/grilo-plugins-0.2.17
index 80ce32227f2c..9fb046433056 100644
--- a/metadata/md5-cache/media-plugins/grilo-plugins-0.2.17
+++ b/metadata/md5-cache/media-plugins/grilo-plugins-0.2.17
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.44:2 >=media-libs/grilo-0.2.12:0.2[network,playlist] media-libs/libmediaart:2.0 >=dev-libs/gom-0.3.1 dev-libs/gmime:2.6 dev-libs/json-glib dev-libs/libxml2:2 dev-db/sqlite:3 daap? ( >=net-libs/libdmapsharing-2.9.12:3.0 ) dvd? ( >=dev-libs/totem-pl-parser-3.4.1 ) flickr? ( net-libs/liboauth ) freebox? ( net-dns/avahi ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.91 ) lua? ( >=dev-lang/lua-5.3 app-arch/libarchive dev-libs/libxml2:2 >=dev-libs/totem-pl-parser-3.4.1 ) subtitles? ( net-libs/libsoup:2.4 ) thetvdb? ( app-arch/libarchive dev-libs/libxml2 ) tracker? ( >=app-misc/tracker-0.10.5:= ) youtube? ( >=dev-libs/libgdata-0.9.1:= >=dev-libs/totem-pl-parser-3.4.1 ) upnp-av? ( net-libs/libsoup:2.4 net-libs/dleyna-connector-dbus ) vimeo? ( >=dev-libs/totem-pl-parser-3.4.1 )
 SLOT=0.2
 SRC_URI=mirror://gnome/sources/grilo-plugins/0.2/grilo-plugins-0.2.17.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=327c88bbb7abbeac29fe47fdf3605da2
diff --git a/metadata/md5-cache/media-plugins/grilo-plugins-0.3.5 b/metadata/md5-cache/media-plugins/grilo-plugins-0.3.5
index 856fd2e17ca9..a3de06469ecd 100644
--- a/metadata/md5-cache/media-plugins/grilo-plugins-0.3.5
+++ b/metadata/md5-cache/media-plugins/grilo-plugins-0.3.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.44:2 >=media-libs/grilo-0.3.1:0.3=[network,playlist] media-libs/libmediaart:2.0 >=dev-libs/gom-0.3.2 dev-libs/gmime:3.0 dev-libs/json-glib dev-libs/libxml2:2 dev-db/sqlite:3 chromaprint? ( media-plugins/gst-plugins-chromaprint:1.0 ) daap? ( >=net-libs/libdmapsharing-2.9.12:3.0 ) dvd? ( >=dev-libs/totem-pl-parser-3.4.1 ) flickr? ( net-libs/liboauth ) freebox? ( net-dns/avahi ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.91:= ) lua? ( >=dev-lang/lua-5.3 app-arch/libarchive dev-libs/libxml2:2 >=dev-libs/totem-pl-parser-3.4.1 ) subtitles? ( net-libs/libsoup:2.4 ) thetvdb? ( app-arch/libarchive dev-libs/libxml2 ) tracker? ( >=app-misc/tracker-0.10.5:= ) youtube? ( >=dev-libs/libgdata-0.9.1:= >=dev-libs/totem-pl-parser-3.4.1 ) upnp-av? ( net-libs/libsoup:2.4 net-libs/dleyna-connector-dbus net-misc/dleyna-server ) vimeo? ( >=dev-libs/totem-pl-parser-3.4.1 )
 SLOT=0.3
 SRC_URI=mirror://gnome/sources/grilo-plugins/0.3/grilo-plugins-0.3.5.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-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=76cff7ed7f4dd2cefda78012868b4e69
diff --git a/metadata/md5-cache/media-plugins/grilo-plugins-0.3.7 b/metadata/md5-cache/media-plugins/grilo-plugins-0.3.7
index 9544dd10d19c..56b31f470d26 100644
--- a/metadata/md5-cache/media-plugins/grilo-plugins-0.3.7
+++ b/metadata/md5-cache/media-plugins/grilo-plugins-0.3.7
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.44:2 >=media-libs/grilo-0.3.6:0.3=[network,playlist] media-libs/libmediaart:2.0 >=dev-libs/gom-0.3.2 dev-libs/gmime:3.0 dev-libs/json-glib dev-libs/libxml2:2 dev-db/sqlite:3 chromaprint? ( media-plugins/gst-plugins-chromaprint:1.0 ) daap? ( >=net-libs/libdmapsharing-2.9.12:3.0 ) dvd? ( >=dev-libs/totem-pl-parser-3.4.1 ) flickr? ( net-libs/liboauth ) freebox? ( net-dns/avahi ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.91:= ) lua? ( >=dev-lang/lua-5.3 app-arch/libarchive dev-libs/libxml2:2 >=dev-libs/totem-pl-parser-3.4.1 ) subtitles? ( net-libs/libsoup:2.4 ) thetvdb? ( app-arch/libarchive dev-libs/libxml2 ) tracker? ( >=app-misc/tracker-0.10.5:= ) youtube? ( >=dev-libs/libgdata-0.9.1:= >=dev-libs/totem-pl-parser-3.4.1 ) upnp-av? ( net-libs/libsoup:2.4 net-libs/dleyna-connector-dbus net-misc/dleyna-server ) vimeo? ( >=dev-libs/totem-pl-parser-3.4.1 )
 SLOT=0.3
 SRC_URI=mirror://gnome/sources/grilo-plugins/0.3/grilo-plugins-0.3.7.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-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=a1c4c0982b58042b8f496a009c5499d8
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-a52dec-0.10.19-r1 b/metadata/md5-cache/media-plugins/gst-plugins-a52dec-0.10.19-r1
index 890523104378..7f7f4b65cbe6 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-a52dec-0.10.19-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-a52dec-0.10.19-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/a52dec-0.7.4-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.19.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7dee5df322d1ee139932209bfa38618b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.14.1
index ba76a1973259..e84fd2a09634 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/a52dec-0.7.4-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a0c5aee2f7e0daf0e62abc9743a8232b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.14.2
index 82c5fd3a0d2f..eea58bf39ec4 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/a52dec-0.7.4-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=baf43c51aac19db0d5a93f79c09b197a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.14.3
index 15feff39a215..363aeb0b61e5 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/a52dec-0.7.4-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=baf43c51aac19db0d5a93f79c09b197a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-alsa-0.10.36-r1 b/metadata/md5-cache/media-plugins/gst-plugins-alsa-0.10.36-r1
index ba52106b461e..b56a1d2f8a91 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-alsa-0.10.36-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-alsa-0.10.36-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.36.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c10dffc1ae05d13beda6fda96c8e2ff6
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-amr-0.10.19-r1 b/metadata/md5-cache/media-plugins/gst-plugins-amr-0.10.19-r1
index 53f8e5c9630f..8b5fb0c7d819 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-amr-0.10.19-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-amr-0.10.19-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.19.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=254c06ef20d71c3c5a522471f01ff31b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-amr-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-amr-1.14.1
index d476aa3df455..9d661fd7eea8 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-amr-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-amr-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d38746b66b9e8e91cb19f2d6d969868a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-amr-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-amr-1.14.2
index 4bed5c61a9ab..3f616c3e6716 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-amr-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-amr-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b45af0a1048d3cb7e4d38247706e20e9
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-amr-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-amr-1.14.3
index b6e47c4c9e54..ccf88bfffa02 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-amr-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-amr-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b45af0a1048d3cb7e4d38247706e20e9
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-annodex-0.10.31-r1 b/metadata/md5-cache/media-plugins/gst-plugins-annodex-0.10.31-r1
index 20b053736ca2..f5d047f8c46c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-annodex-0.10.31-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-annodex-0.10.31-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=eb9b49e240b077d0f484ce1420a477e5
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-assrender-0.10.23-r1 b/metadata/md5-cache/media-plugins/gst-plugins-assrender-0.10.23-r1
index 3d3ae5e8092b..ae7f8edfda0e 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-assrender-0.10.23-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-assrender-0.10.23-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libass-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7e1065964b10291dfd4db754f345facf
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.14.1
index f2e5cf33c4a3..bd7310aea9ea 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a481ad702aa493293a99216c85b0ce80
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.14.2
index 54e0db7f7419..1c777ae005bc 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a5218886e373451d053a2c6f78ec0f58
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.14.3
index dcc8f604cf0b..136e808060bc 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a5218886e373451d053a2c6f78ec0f58
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-bluez-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-bluez-1.14.1
index 28582fd805c4..0c25aae84ff8 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-bluez-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-bluez-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=net-wireless/bluez-5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bd0fcbf99f77410baf9c813ada916159
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-bluez-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-bluez-1.14.2
index 35b6e965bfa7..384422053542 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-bluez-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-bluez-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=net-wireless/bluez-5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=51b642c2b31a8fd206be8198b318d369
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-bluez-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-bluez-1.14.3
index 4e479baa89cf..4bafac3e00c3 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-bluez-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-bluez-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=net-wireless/bluez-5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=51b642c2b31a8fd206be8198b318d369
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-bs2b-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-bs2b-1.14.1
index e243f01ced5f..1df83a4ec405 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-bs2b-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-bs2b-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=media-libs/libbs2b[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mip
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f08e38c3ab0fdb248127abe7ece4c248
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-bs2b-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-bs2b-1.14.2
index 0b38dfa27d6c..a6331dd2d9bf 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-bs2b-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-bs2b-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=media-libs/libbs2b[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mip
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bdca409278716fd7fea776411bdb5225
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-bs2b-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-bs2b-1.14.3
index e87c9c7311b5..c91807faa23b 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-bs2b-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-bs2b-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=media-libs/libbs2b[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mip
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bdca409278716fd7fea776411bdb5225
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-cairo-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-cairo-1.14.4
new file mode 100644
index 000000000000..3e8b2d9da013
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-cairo-1.14.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=x11-libs/cairo-1.10[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(-)?] >=sys-apps/sed-4 >=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(-)?] >=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-good-1.14.4: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(-)?]
+DESCRIPTION=Video overlay plugin based on cairo 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
+LICENSE=GPL-2
+RDEPEND=>=x11-libs/cairo-1.10[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.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-good-1.14.4: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-good/gst-plugins-good-1.14.4.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_=851054821fea9e2bdeca448893845830
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-cdio-0.10.19-r1 b/metadata/md5-cache/media-plugins/gst-plugins-cdio-0.10.19-r1
index da5ed4a3ac74..a77bfa6a89e4 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-cdio-0.10.19-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-cdio-0.10.19-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libcdio-0.90-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.19.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d2c7d3f671528cfb7c08e906c1440b2d
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.14.1
index 0eb3a45c4e27..83673842698c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libcdio-0.90-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=82eb748ef3858e266400cc8af6d91edb
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.14.2
index 19a495df6668..df51904a2522 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libcdio-0.90-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f9624b0eca3752eff0b3a9a3216384c8
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.14.3
index 560f1739f85c..e0affd50bf20 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libcdio-0.90-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f9624b0eca3752eff0b3a9a3216384c8
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-0.10.36-r1 b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-0.10.36-r1
index be0d69f979b5..39c6bf31a513 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-0.10.36-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-0.10.36-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-sound/cdparanoia-3.10.2-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.36.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bcf10a4ccbe8ca3d9c6bc4ea7faf8f0b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.12.4
deleted file mode 100644
index 2254c656fd75..000000000000
--- a/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.12.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-sound/cdparanoia-3.10.2-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(-)?] >=sys-apps/sed-4 >=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(-)?] >=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-base-1.12.4: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(-)?]
-DESCRIPTION=CD Audio Source (cdda) 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=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=>=media-sound/cdparanoia-3.10.2-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(-)?] >=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-base-1.12.4: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-base/gst-plugins-base-1.12.4.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=b49e5934ee907b36868d59d79169c0cb
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.14.1
index f49d0fe34b96..21502db7f13e 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-sound/cdparanoia-3.10.2-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b49e5934ee907b36868d59d79169c0cb
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.14.2
index 672d84bd5876..f2d64f6eb901 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-sound/cdparanoia-3.10.2-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=87434529c3d0c0702c3a732e25a1393b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.14.3
index 651bd8a68b72..520e39aabb0a 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-sound/cdparanoia-3.10.2-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=87434529c3d0c0702c3a732e25a1393b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.14.4
new file mode 100644
index 000000000000..6db234c4238c
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.14.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=media-sound/cdparanoia-3.10.2-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(-)?] >=sys-apps/sed-4 >=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(-)?] >=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-base-1.14.4: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(-)?]
+DESCRIPTION=CD Audio Source (cdda) 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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-sound/cdparanoia-3.10.2-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(-)?] >=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-base-1.14.4: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-base/gst-plugins-base-1.14.4.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_=793fc12057327ad52f82876262f657bf
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 4d2ccae5a056..a18b14cb21d7 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
@@ -10,5 +10,5 @@ RDEPEND=media-libs/chromaprint[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-chromaprint-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-chromaprint-1.14.2
index 2ca0e95ad35e..cb0028122592 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-chromaprint-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-chromaprint-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=media-libs/chromaprint[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-chromaprint-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-chromaprint-1.14.3
index 2da9af0fad15..d66cd2e69834 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-chromaprint-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-chromaprint-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=media-libs/chromaprint[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-colormanagement-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-colormanagement-1.14.1
index b1c06cace38e..cc674a28b76f 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-colormanagement-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-colormanagement-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/lcms-2.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=396912a6897bfd1a0e46312cee8bf46a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-colormanagement-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-colormanagement-1.14.2
index 01739833576b..12378c011c01 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-colormanagement-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-colormanagement-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/lcms-2.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=396912a6897bfd1a0e46312cee8bf46a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-colormanagement-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-colormanagement-1.14.3
index 16e4245dd88b..3c2444a2da66 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-colormanagement-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-colormanagement-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/lcms-2.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=396912a6897bfd1a0e46312cee8bf46a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dash-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-dash-1.14.1
index 3d3b81b66582..6eadec2f139d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dash-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dash-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8f37cc15866dfe26e9f4156541bd3319
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dash-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-dash-1.14.2
index d5e125a81c3f..29be4cdd36b2 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dash-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dash-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=14b4d2f8f393b3d8c27f41803dd6740e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dash-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-dash-1.14.3
index de2d36e62075..0bbf13268943 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dash-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dash-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=14b4d2f8f393b3d8c27f41803dd6740e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dtls-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-dtls-1.14.1
index 02e2d2836f80..4ad7161e6d0f 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dtls-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dtls-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=92cc34c0a8dc700b218306e46d9e8299
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dtls-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-dtls-1.14.2
index 96cceb5e1076..795511a7f5a3 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dtls-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dtls-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6c51f50a92ed8d776e33fdaf846f32f1
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dtls-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-dtls-1.14.3
index 72553ad0f7ea..fb9f31f7488c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dtls-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dtls-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6c51f50a92ed8d776e33fdaf846f32f1
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dts-0.10.23-r1 b/metadata/md5-cache/media-plugins/gst-plugins-dts-0.10.23-r1
index 254af29eb758..05503ba2f30d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dts-0.10.23-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dts-0.10.23-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libdca-0.0.5-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0408d54c8601d9ce91c8694f7abcd18d
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dts-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-dts-1.14.1
index d1ae96f8aa77..cb8f17153dd4 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dts-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dts-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libdca-0.0.5-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1ad6fbd1480ca37d71a78eaf25384941
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dts-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-dts-1.14.2
index e0aca2188caf..616455986b02 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dts-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dts-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libdca-0.0.5-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=53fa6dd48a19ae69d851bee28597d561
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dts-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-dts-1.14.3
index 269a9316e8e4..fe842482f530 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dts-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dts-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libdca-0.0.5-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=53fa6dd48a19ae69d851bee28597d561
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dv-0.10.31-r1 b/metadata/md5-cache/media-plugins/gst-plugins-dv-0.10.31-r1
index 6a1462c4b16a..41f15ecee4d0 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dv-0.10.31-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dv-0.10.31-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libdv-1.0.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c189480b4ab12dd470f4278c5a4ba073
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dv-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-dv-1.12.4
deleted file mode 100644
index 58cce76d60c2..000000000000
--- a/metadata/md5-cache/media-plugins/gst-plugins-dv-1.12.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=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(-)?] >=sys-apps/sed-4 >=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(-)?] >=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-good-1.12.4: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(-)?]
-DESCRIPTION=DV demuxer and 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=alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd
-LICENSE=GPL-2
-RDEPEND=>=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(-)?] >=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-good-1.12.4: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-good/gst-plugins-good-1.12.4.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=6a7c332a37d93d21f9d4dc5b774b96cc
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dv-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-dv-1.14.1
index ffe3dd818c37..7d3114cfea57 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dv-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dv-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libdv-1.0.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6a7c332a37d93d21f9d4dc5b774b96cc
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dv-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-dv-1.14.2
index ef1ef3e8004b..7700f91a5c97 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dv-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dv-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libdv-1.0.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=457edf33572df30f665cea070bd8a48a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dv-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-dv-1.14.3
index 268d24d57294..5ff1d5d02215 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dv-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dv-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libdv-1.0.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=457edf33572df30f665cea070bd8a48a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dv-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-dv-1.14.4
new file mode 100644
index 000000000000..ca5b5ee0eea3
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dv-1.14.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=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(-)?] >=sys-apps/sed-4 >=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(-)?] >=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-good-1.14.4: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(-)?]
+DESCRIPTION=DV demuxer and 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=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=GPL-2
+RDEPEND=>=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(-)?] >=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-good-1.14.4: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-good/gst-plugins-good-1.14.4.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_=de27df373625818b686aa82fd34098b0
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dvb-0.10.23-r1 b/metadata/md5-cache/media-plugins/gst-plugins-dvb-0.10.23-r1
index 569771fa4fd1..48f022f04094 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dvb-0.10.23-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dvb-0.10.23-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b160d5b85a2b56a62f6e6217698e3ed2
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.14.1
index 3d9b3274f1e7..51b9622d2953 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cb19960c81ed2facdf37be41343768d6
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.14.2
index 277912d0cbbd..10f79b297661 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d0e408b558658edaa233863483dcc7b6
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.14.3
index b344998bd4b7..511677c2097e 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d0e408b558658edaa233863483dcc7b6
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dvdread-0.10.19-r1 b/metadata/md5-cache/media-plugins/gst-plugins-dvdread-0.10.19-r1
index 0302461669c5..0c60d3a5901c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dvdread-0.10.19-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dvdread-0.10.19-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libdvdread-4.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.19.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=09ea5da18d2888dd49f1b5ee6dc2fcff
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.14.1
index cb66ab013678..e6bd32abc135 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libdvdread-4.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0b557e4b32c986dfa61ee580fe4da9b6
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.14.2
index 552e3869d463..23a87cd3579e 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libdvdread-4.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ebb5698de92340ebe23426207143f12b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.14.3
index 467e1f2fc0f2..be36fcf6f61b 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libdvdread-4.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ebb5698de92340ebe23426207143f12b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-faac-0.10.23-r1 b/metadata/md5-cache/media-plugins/gst-plugins-faac-0.10.23-r1
index 5dd765885607..83b77d4c9c32 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-faac-0.10.23-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-faac-0.10.23-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7ba4d7ecbcf9d35f4eb388362f8e6f62
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-faac-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-faac-1.14.1
index 7eba97d5e442..7d825ce49949 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-faac-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-faac-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0735f48c60c45857f2fec67123bacacb
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-faac-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-faac-1.14.2
index d64724b75eea..e984be91d13f 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-faac-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-faac-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=32c3ae60c16c9bce66a3ac2d2f1a0947
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-faac-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-faac-1.14.3
index b9889f342014..0754c1170d8b 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-faac-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-faac-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=32c3ae60c16c9bce66a3ac2d2f1a0947
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-faad-0.10.23-r2 b/metadata/md5-cache/media-plugins/gst-plugins-faad-0.10.23-r2
index 57a70b6614e6..52681cadc62c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-faad-0.10.23-r2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-faad-0.10.23-r2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/faad2-2.7-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	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-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	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-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=32132ee6dacd7a0039ecf09de582c64a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-faad-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-faad-1.14.1
index fff29dd8a614..39c2a1f4af61 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-faad-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-faad-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/faad2-2.7-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3cc425d711a7b4611286f6df48627b02
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-faad-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-faad-1.14.2
index b8240bc7097a..cb08ed1e57d4 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-faad-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-faad-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/faad2-2.7-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=13f03513785447df3a4616525869e96f
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-faad-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-faad-1.14.3
index 64f7e7b0754a..0eac5106b2f3 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-faad-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-faad-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/faad2-2.7-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=13f03513785447df3a4616525869e96f
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-flac-0.10.31-r1 b/metadata/md5-cache/media-plugins/gst-plugins-flac-0.10.31-r1
index 5c3cdfe2d9d0..f074637cb7c9 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-flac-0.10.31-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-flac-0.10.31-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/flac-1.2.1-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a0dae4aed942a9cb8e3151a5fb2aca68
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-flac-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-flac-1.12.4
deleted file mode 100644
index 58b39ad2025e..000000000000
--- a/metadata/md5-cache/media-plugins/gst-plugins-flac-1.12.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=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(-)?] >=sys-apps/sed-4 >=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(-)?] >=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-good-1.12.4: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(-)?]
-DESCRIPTION=FLAC encoder/decoder/tagger 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=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=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(-)?] >=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-good-1.12.4: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-good/gst-plugins-good-1.12.4.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=a1299448d257f3c0f17001a6d06f0010
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-flac-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-flac-1.14.1
index 6fb98195f711..232148cee3e8 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-flac-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-flac-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/flac-1.2.1-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a1299448d257f3c0f17001a6d06f0010
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-flac-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-flac-1.14.2
index d74eb35b9ab3..7150805a3910 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-flac-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-flac-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/flac-1.2.1-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4e20dabe2b17fd2fc212e38d958473f9
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-flac-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-flac-1.14.3
index 752d078e63e5..9389f2b35795 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-flac-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-flac-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/flac-1.2.1-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4e20dabe2b17fd2fc212e38d958473f9
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-flac-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-flac-1.14.4
new file mode 100644
index 000000000000..1f7d596bbbb4
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-flac-1.14.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=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(-)?] >=sys-apps/sed-4 >=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(-)?] >=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-good-1.14.4: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(-)?]
+DESCRIPTION=FLAC encoder/decoder/tagger 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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=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(-)?] >=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-good-1.14.4: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-good/gst-plugins-good-1.14.4.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_=324257900c03fb97d8d88a3e3ed87d65
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gconf-0.10.31-r1 b/metadata/md5-cache/media-plugins/gst-plugins-gconf-0.10.31-r1
index c64896d6aaeb..16dcf4e1ae72 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-gconf-0.10.31-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gconf-0.10.31-r1
@@ -10,5 +10,5 @@ RDEPEND=>=gnome-base/gconf-2.32.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	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_=4004d90308a205e943fed46c3363be00
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-0.10.31-r1 b/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-0.10.31-r1
index b26ac0464701..d5a0a383d74d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-0.10.31-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-0.10.31-r1
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/gdk-pixbuf-2.30.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c08bf41aac302d706e86e7bf2a6cf042
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.12.4
deleted file mode 100644
index 72d8afca20ad..000000000000
--- a/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.12.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=x11-libs/gdk-pixbuf-2.30.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(-)?] >=sys-apps/sed-4 >=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(-)?] >=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-good-1.12.4: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(-)?]
-DESCRIPTION=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=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=x11-libs/gdk-pixbuf-2.30.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(-)?] >=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-good-1.12.4: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-good/gst-plugins-good-1.12.4.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=88cb9dc8f56357f2d3ca94ca98ed603d
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.14.1
index 65c1cea615f0..f693d5a58965 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/gdk-pixbuf-2.30.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=88cb9dc8f56357f2d3ca94ca98ed603d
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.14.2
index 4f1c43ebaf79..e0688d99cf00 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/gdk-pixbuf-2.30.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=98ae5340f5f4d6808d33184972f6a06f
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.14.3
index 72a58b894140..e911fff2fe7e 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/gdk-pixbuf-2.30.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=98ae5340f5f4d6808d33184972f6a06f
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.14.4
new file mode 100644
index 000000000000..73e2f2dc8e1f
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.14.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=x11-libs/gdk-pixbuf-2.30.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(-)?] >=sys-apps/sed-4 >=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(-)?] >=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-good-1.14.4: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(-)?]
+DESCRIPTION=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=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=x11-libs/gdk-pixbuf-2.30.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(-)?] >=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-good-1.14.4: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-good/gst-plugins-good-1.14.4.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_=a39bcc9c822c482b66b087f065fc71cb
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gio-0.10.36-r1 b/metadata/md5-cache/media-plugins/gst-plugins-gio-0.10.36-r1
index 6ec26354bfe1..ae085cefe5a4 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-gio-0.10.36-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gio-0.10.36-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.36.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=be954cdc29141eb1a44c9b365a9b05a8
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gl-0.10.3-r1 b/metadata/md5-cache/media-plugins/gst-plugins-gl-0.10.3-r1
index 0f1739cf91b4..e124ce1284dd 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-gl-0.10.3-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gl-0.10.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/glew-1.10.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=test
 SLOT=0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-gl/gst-plugins-gl-0.10.3.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	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-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	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-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b6b5c67e6c95ba33b5f1de735d9f694f
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gnomevfs-0.10.36-r1 b/metadata/md5-cache/media-plugins/gst-plugins-gnomevfs-0.10.36-r1
index e27b81bbf3bb..7ad80035e28b 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-gnomevfs-0.10.36-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gnomevfs-0.10.36-r1
@@ -10,5 +10,5 @@ RDEPEND=>=gnome-base/gnome-vfs-2.24.4-r2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.36.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=02d1e765d5bf7c31f0d53cf571e659d8
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gsm-0.10.23-r1 b/metadata/md5-cache/media-plugins/gst-plugins-gsm-0.10.23-r1
index 080030c144ea..22b63d4bb8bb 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-gsm-0.10.23-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gsm-0.10.23-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3204e8c980a6fefe4eba5ecea421a0d7
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gtk-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-gtk-1.14.1
index e7b08e11a4b9..27451962ca20 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-gtk-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gtk-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/gst-plugins-base-1.14.1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,a
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b69a0e08a8c5237ccf6d97cc8447fc70
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gtk-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-gtk-1.14.2
index 2db66a61bc80..b99652e48be0 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-gtk-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gtk-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/gst-plugins-base-1.14.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,a
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=12b3353f2872758a62763f76d1efa0bf
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gtk-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-gtk-1.14.3
index a924fbfb472a..9952ae18bc72 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-gtk-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gtk-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/gst-plugins-base-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,a
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=12b3353f2872758a62763f76d1efa0bf
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gtk-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-gtk-1.14.4
new file mode 100644
index 000000000000..84733522425c
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gtk-1.14.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/gst-plugins-base-1.14.4: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(-)?,egl=,gles2=,opengl=,wayland=,X=] >=x11-libs/gtk+-3.15: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(-)?] gles2? ( >=x11-libs/gtk+-3.15:3[X?,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(-)?] ) opengl? ( >=x11-libs/gtk+-3.15:3[X?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-libs/gst-plugins-bad-1.13.1:1.0 >=sys-apps/sed-4 >=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(-)?] >=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-good-1.14.4: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(-)?]
+DESCRIPTION=Video sink plugin for GStreamer that renders to a GtkWidget
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=+egl gles2 +opengl wayland +X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=media-libs/gst-plugins-base-1.14.4: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(-)?,egl=,gles2=,opengl=,wayland=,X=] >=x11-libs/gtk+-3.15: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(-)?] gles2? ( >=x11-libs/gtk+-3.15:3[X?,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(-)?] ) opengl? ( >=x11-libs/gtk+-3.15:3[X?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-libs/gst-plugins-bad-1.13.1:1.0 >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.4: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-good/gst-plugins-good-1.14.4.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_=828aa5d2f6e37629f04f7e6b17d41197
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-hls-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-hls-1.14.1
index 4b724c0e4ec3..02f9b347e169 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-hls-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-hls-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mip
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c04b123f64041ae428656f51d99e1502
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-hls-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-hls-1.14.2
index 4bf132d66fcb..407c577b9590 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-hls-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-hls-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mip
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d05412a938e3a29c49e030f7268129b8
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-hls-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-hls-1.14.3
index a1c42a70a6e4..461479b10676 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-hls-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-hls-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mip
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d05412a938e3a29c49e030f7268129b8
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ivorbis-0.10.36-r1 b/metadata/md5-cache/media-plugins/gst-plugins-ivorbis-0.10.36-r1
index 376d7a8aeb7c..cd98f7d88089 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ivorbis-0.10.36-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ivorbis-0.10.36-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/tremor-0_pre20130223[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.36.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=745ac32c406f0e09532848f1110456d2
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-jack-0.10.31-r1 b/metadata/md5-cache/media-plugins/gst-plugins-jack-0.10.31-r1
index 2e9de1334c09..158cba3c33b2 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-jack-0.10.31-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-jack-0.10.31-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-sound/jack-audio-connection-kit-0.121.3-r1[abi_x86_32(-)?,abi_x8
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=00d7683890816a9ae25f1541581d8171
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-jack-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-jack-1.12.4
deleted file mode 100644
index c48faf858347..000000000000
--- a/metadata/md5-cache/media-plugins/gst-plugins-jack-1.12.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=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(-)?] >=sys-apps/sed-4 >=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(-)?] >=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-good-1.12.4: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(-)?]
-DESCRIPTION=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=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd
-LICENSE=GPL-2
-RDEPEND=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(-)?] >=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-good-1.12.4: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-good/gst-plugins-good-1.12.4.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=6d303f2cf5c3af99934412382d67dfbd
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-jack-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-jack-1.14.1
index b35821972332..aa846bcdb759 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-jack-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-jack-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6d303f2cf5c3af99934412382d67dfbd
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-jack-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-jack-1.14.2
index b9118b34bf3a..59cc671ec82e 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-jack-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-jack-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=32010656ce411c31fd74525c62ea1f8d
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-jack-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-jack-1.14.3
index 434cb038c821..dff0ddcf96ba 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-jack-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-jack-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=32010656ce411c31fd74525c62ea1f8d
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-jack-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-jack-1.14.4
new file mode 100644
index 000000000000..354e6a0e7a80
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-jack-1.14.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=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(-)?] >=sys-apps/sed-4 >=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(-)?] >=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-good-1.14.4: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(-)?]
+DESCRIPTION=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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=GPL-2
+RDEPEND=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(-)?] >=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-good-1.14.4: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-good/gst-plugins-good-1.14.4.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_=0fe3d81601982145f3138669317b64d1
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-jpeg-0.10.31-r1 b/metadata/md5-cache/media-plugins/gst-plugins-jpeg-0.10.31-r1
index b21c0f14f544..61223a577288 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-jpeg-0.10.31-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-jpeg-0.10.31-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a0a13b1dbb161c7a7f74c05752e58ee9
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.12.4
deleted file mode 100644
index 9922cd6fae25..000000000000
--- a/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.12.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=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(-)?] >=sys-apps/sed-4 >=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(-)?] >=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-good-1.12.4: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(-)?]
-DESCRIPTION=JPEG image 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=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=>=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(-)?] >=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-good-1.12.4: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-good/gst-plugins-good-1.12.4.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=58e243179b100e681bed9c43a9e1233d
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.14.1
index e7e0abaabbcd..7fc39d351db6 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=58e243179b100e681bed9c43a9e1233d
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.14.2
index 406cab555bc7..a7c8c48b6eeb 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c4ee2693592c01934c8eb0fe510e1a67
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.14.3
index 7fcebf76792b..cd2b2ec6f957 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c4ee2693592c01934c8eb0fe510e1a67
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.14.4
new file mode 100644
index 000000000000..82577ec3b185
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.14.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=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(-)?] >=sys-apps/sed-4 >=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(-)?] >=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-good-1.14.4: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(-)?]
+DESCRIPTION=JPEG image 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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=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(-)?] >=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-good-1.14.4: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-good/gst-plugins-good-1.14.4.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_=3b24579eeb5d3a7e7f4c64c696077e8f
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-kate-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-kate-1.14.1
index 9093dd1e6f2c..41aa530b2c3f 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-kate-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-kate-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libkate-0.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=dc4b3cbe6199001260d428b814cb859c
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-kate-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-kate-1.14.2
index 69a39f31c341..d8f8c59e4f42 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-kate-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-kate-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libkate-0.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=dc4b3cbe6199001260d428b814cb859c
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-kate-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-kate-1.14.3
index b0ef9f8931c0..caccc8ce03e6 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-kate-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-kate-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libkate-0.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=dc4b3cbe6199001260d428b814cb859c
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ladspa-0.10.23-r1 b/metadata/md5-cache/media-plugins/gst-plugins-ladspa-0.10.23-r1
index a0405c5e667b..c81159708231 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ladspa-0.10.23-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ladspa-0.10.23-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=01e42d10cdb580339b25ba4ab6f6f7d1
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ladspa-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-ladspa-1.14.1
index 4e14f6ac198d..bfa7d24758e4 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ladspa-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ladspa-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2dbbeaca27999f5db09f7c01ba8b5e9c
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ladspa-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-ladspa-1.14.2
index 77d9bb29fa00..cecc45661ea0 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ladspa-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ladspa-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a340246d9c8f17d20487c23cd41004c2
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ladspa-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-ladspa-1.14.3
index f17d7e127cd5..8f7a5382f981 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ladspa-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ladspa-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a340246d9c8f17d20487c23cd41004c2
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-lame-0.10.19-r1 b/metadata/md5-cache/media-plugins/gst-plugins-lame-0.10.19-r1
index 8110f2989cc1..679967e16ce4 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-lame-0.10.19-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-lame-0.10.19-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.19.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=800b57bef5817c96d27e8a6de3d4f89d
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-lame-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-lame-1.14.1
index ea3aa357353a..7f569989beeb 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-lame-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-lame-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c1763d3c3233e97b291fc1b8812fc884
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-lame-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-lame-1.14.2
index 6013d83125af..d758f79db97f 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-lame-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-lame-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ab1284381ea3254b73a98b2b6c2443b6
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-lame-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-lame-1.14.3
index 590aa9fd3326..11caacfa1baf 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-lame-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-lame-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ab1284381ea3254b73a98b2b6c2443b6
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-lame-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-lame-1.14.4
new file mode 100644
index 000000000000..14dba7663268
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-lame-1.14.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=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(-)?] >=sys-apps/sed-4 >=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(-)?] >=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-good-1.14.4: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(-)?]
+DESCRIPTION=MP3 encoder 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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=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(-)?] >=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-good-1.14.4: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-good/gst-plugins-good-1.14.4.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_=3e8bf51a2b5898b1cb9d296a0d16fb0b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libde265-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-libde265-1.14.1
index bad447c07f92..6a337bb0432f 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libde265-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libde265-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libde265-0.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=15624cde3dbf85cea8c6232dafefa296
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libde265-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-libde265-1.14.2
index 567da2395565..f12dc4e55724 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libde265-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libde265-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libde265-0.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=152e1cc3cda361436bfa287bbc5ed08a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libde265-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-libde265-1.14.3
index af0a3721e3cd..209aad58a957 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libde265-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libde265-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libde265-0.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=152e1cc3cda361436bfa287bbc5ed08a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libmms-0.10.23-r1 b/metadata/md5-cache/media-plugins/gst-plugins-libmms-0.10.23-r1
index 9c120321ad66..7d5dabb6a319 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libmms-0.10.23-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libmms-0.10.23-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libmms-0.6.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a68dca34016768479435340bf780b189
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.14.1
index eea204373845..0f97c905944d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libmms-0.6.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a9636933b56a6cd0b2927859846e5d2c
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.14.2
index d83aae3a5748..acad442785ee 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libmms-0.6.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c1c289dbf0be7bcd09c6c1f94aaecefe
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.14.3
index 89147a698347..2145c8722f5c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libmms-0.6.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c1c289dbf0be7bcd09c6c1f94aaecefe
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libpng-0.10.31-r1 b/metadata/md5-cache/media-plugins/gst-plugins-libpng-0.10.31-r1
index b1490e463a8e..8374035427b8 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libpng-0.10.31-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libpng-0.10.31-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bb4edf7cd28f2c9e6e28fb504eb56dee
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.12.4
deleted file mode 100644
index 15b228f24325..000000000000
--- a/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.12.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=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-apps/sed-4 >=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(-)?] >=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-good-1.12.4: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(-)?]
-DESCRIPTION=PNG image 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=alpha amd64 ~arm ppc ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=>=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(-)?] >=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-good-1.12.4: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-good/gst-plugins-good-1.12.4.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=b95254dc4ba950fcd5d01ab84972546e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.14.1
index e4df24509856..c16866ebbba5 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b95254dc4ba950fcd5d01ab84972546e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.14.2
index 8764635ee91b..92b2dca6b61f 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d73e231b84fdc4d34ac7bc54b4a4aad0
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.14.3
index c19ffa20c388..6128303f231c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d73e231b84fdc4d34ac7bc54b4a4aad0
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.14.4
new file mode 100644
index 000000000000..45bcf4b1a082
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.14.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=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-apps/sed-4 >=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(-)?] >=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-good-1.14.4: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(-)?]
+DESCRIPTION=PNG image 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=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=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(-)?] >=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-good-1.14.4: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-good/gst-plugins-good-1.14.4.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_=fbb773324ce272668f6bf57fccab01f3
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libvisual-0.10.36-r1 b/metadata/md5-cache/media-plugins/gst-plugins-libvisual-0.10.36-r1
index d1d34d93fd89..90878e540ad7 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libvisual-0.10.36-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libvisual-0.10.36-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libvisual-0.4.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.36.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3d7218e614170135819f3e9d63bcc0e5
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.12.4
deleted file mode 100644
index 400d8afaedda..000000000000
--- a/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.12.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/libvisual-0.4.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-plugins/libvisual-plugins-0.4.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-apps/sed-4 >=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(-)?] >=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-base-1.12.4: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(-)?]
-DESCRIPTION=Visualization elements 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=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd
-LICENSE=GPL-2
-RDEPEND=>=media-libs/libvisual-0.4.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-plugins/libvisual-plugins-0.4.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.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-base-1.12.4: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-base/gst-plugins-base-1.12.4.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=9252af08c98d7ffd3a991b17062051c8
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.14.1
index 13a067f617d8..439c162557b3 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libvisual-0.4.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9252af08c98d7ffd3a991b17062051c8
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.14.2
index f09eaf5fc68a..5315c2b36abf 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libvisual-0.4.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=50910da83cfd2b6381214b14467fd0ad
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.14.3
index 1e0d084c29fe..2de8fdc862ee 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libvisual-0.4.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=50910da83cfd2b6381214b14467fd0ad
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.14.4
new file mode 100644
index 000000000000..760889cee722
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.14.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=media-libs/libvisual-0.4.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-plugins/libvisual-plugins-0.4.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-apps/sed-4 >=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(-)?] >=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-base-1.14.4: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(-)?]
+DESCRIPTION=Visualization elements 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=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libvisual-0.4.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-plugins/libvisual-plugins-0.4.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.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-base-1.14.4: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-base/gst-plugins-base-1.14.4.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_=7b0f2d1ef41011da78bc67dae61bccf2
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-lv2-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-lv2-1.14.1
index a5b6f8bf9e9b..97e496209809 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-lv2-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-lv2-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/lv2-1.14.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d3b35ca05e7f444bca581eb9cf6f5043
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-lv2-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-lv2-1.14.2
index d01154dc8503..b0a4c9c4914a 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-lv2-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-lv2-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/lv2-1.14.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d9954a51b4a429ce79df84829ee24dab
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-lv2-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-lv2-1.14.3
index 483297e84f20..fc8e1a487843 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-lv2-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-lv2-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/lv2-1.14.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d9954a51b4a429ce79df84829ee24dab
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mad-0.10.19-r1 b/metadata/md5-cache/media-plugins/gst-plugins-mad-0.10.19-r1
index 456214fc47d7..ccf9896acdba 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mad-0.10.19-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mad-0.10.19-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libmad-0.15.1b-r8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.19.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c217141a129dfa03d2e7f879cbfba211
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-meta-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-meta-1.12.4
deleted file mode 100644
index d9b61c493169..000000000000
--- a/metadata/md5-cache/media-plugins/gst-plugins-meta-1.12.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Meta ebuild to pull in gst plugins for apps
-EAPI=6
-HOMEPAGE=https://www.gentoo.org
-IUSE=aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mms mp3 modplug mpeg ogg opus oss pulseaudio taglib theora v4l vaapi vcd vorbis vpx wavpack 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 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd
-LICENSE=metapackage
-RDEPEND=>=media-libs/gstreamer-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.12.4:1.0[alsa?,ogg?,theora?,vorbis?,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(-)?] >=media-libs/gst-plugins-good-1.12.4: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(-)?] a52? ( >=media-plugins/gst-plugins-a52dec-1.12.4: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(-)?] ) aac? ( >=media-plugins/gst-plugins-faad-1.12.4: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(-)?] ) cdda? ( || ( >=media-plugins/gst-plugins-cdparanoia-1.12.4: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-cdio-1.12.4: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(-)?] ) ) dts? ( >=media-plugins/gst-plugins-dts-1.12.4: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(-)?] ) dv? ( >=media-plugins/gst-plugins-dv-1.12.4: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(-)?] ) dvb? ( >=media-plugins/gst-plugins-dvb-1.12.4: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.12.4: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(-)?] ) dvd? ( >=media-libs/gst-plugins-ugly-1.12.4: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-a52dec-1.12.4: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-dvdread-1.12.4: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-mpeg2dec-1.12.4: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-resindvd-1.12.4: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(-)?] ) ffmpeg? ( >=media-plugins/gst-plugins-libav-1.12.4: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(-)?] ) flac? ( >=media-plugins/gst-plugins-flac-1.12.4: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(-)?] ) http? ( >=media-plugins/gst-plugins-soup-1.12.4: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(-)?] ) jack? ( >=media-plugins/gst-plugins-jack-1.12.4: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(-)?] ) lame? ( >=media-plugins/gst-plugins-lame-1.12.4: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(-)?] ) libass? ( >=media-plugins/gst-plugins-assrender-1.12.4: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(-)?] ) libvisual? ( >=media-plugins/gst-plugins-libvisual-1.12.4: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(-)?] ) mms? ( >=media-plugins/gst-plugins-libmms-1.12.4: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(-)?] ) modplug? ( >=media-plugins/gst-plugins-modplug-1.12.4: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(-)?] ) mp3? ( >=media-libs/gst-plugins-ugly-1.12.4: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-mpg123-1.12.4: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(-)?] ) mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-1.12.4: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(-)?] ) opus? ( >=media-plugins/gst-plugins-opus-1.12.4: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(-)?] ) oss? ( >=media-plugins/gst-plugins-oss-1.12.4: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(-)?] ) pulseaudio? ( >=media-plugins/gst-plugins-pulse-1.12.4: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(-)?] ) taglib? ( >=media-plugins/gst-plugins-taglib-1.12.4: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(-)?] ) v4l? ( >=media-plugins/gst-plugins-v4l2-1.12.4: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(-)?] ) vaapi? ( >=media-plugins/gst-plugins-vaapi-1.12.4: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(-)?] ) vcd? ( >=media-plugins/gst-plugins-mplex-1.12.4: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-mpeg2dec-1.12.4: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(-)?] ) vpx? ( >=media-plugins/gst-plugins-vpx-1.12.4: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(-)?] ) wavpack? ( >=media-plugins/gst-plugins-wavpack-1.12.4: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(-)?] ) x264? ( >=media-plugins/gst-plugins-x264-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )
-SLOT=1.0
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=fd7da008a0111efc38981304f51d1173
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-modplug-0.10.23-r1 b/metadata/md5-cache/media-plugins/gst-plugins-modplug-0.10.23-r1
index e9d17218fea5..dae4bcd9a23a 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-modplug-0.10.23-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-modplug-0.10.23-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f9214eb4276a59a30fdd5c3ce40fe8da
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.14.1
index 216fded58bce..db9e2d56033d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=950fc3bb3995a6f73024d965a9e57cd8
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.14.2
index b523693f782e..d2c140eb70da 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=57424b7fd54e58f6259bd60842d17ec6
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.14.3
index afddcbd95438..abc0789d6399 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=57424b7fd54e58f6259bd60842d17ec6
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-0.10.19-r1 b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-0.10.19-r1
index 6d24cd2d857d..37e8ff17e6cf 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-0.10.19-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-0.10.19-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libmpeg2-0.5.1-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.19.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b2c3a4214ae20019b5de4aa157440cdb
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.14.1
index e32c9073990d..fabeeb9fecaa 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libmpeg2-0.5.1-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9f6f891ce5e08101a3d22d6687276130
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.14.2
index fc9e23390bf6..53920d871d27 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libmpeg2-0.5.1-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4827323eb0ccbfd3064a4900aba3c803
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.14.3
index 415255132c5c..a8afa297c263 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libmpeg2-0.5.1-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4827323eb0ccbfd3064a4900aba3c803
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-0.10.23-r1 b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-0.10.23-r1
index 73cbccd489d2..5af9250ee42f 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-0.10.23-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-0.10.23-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-video/mjpegtools-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=176f1821ae07986d03bfd02be1203dad
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.14.1
index 0a328ddc6438..7f823add549c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-video/mjpegtools-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1b71e5623d1452af55b0cbb14566f5a6
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.14.2
index cf9b1e158861..c5a2440754c0 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-video/mjpegtools-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=221f5207cdeb21c5a39a0dddcccdace3
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.14.3
index bbaa8323c107..5cff842b271b 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-video/mjpegtools-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=221f5207cdeb21c5a39a0dddcccdace3
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.14.1
index 35ca7ccfafdc..390d38cde655 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-sound/mpg123-1.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=63c7a721e98a60789d3c752949a51f02
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.14.2
index 4706a15c2db9..f6f8c8c29ae6 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-sound/mpg123-1.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bd6edcbbc51d0385d256d5d55d078fac
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.14.3
index 74bb28da41a6..03db9a6d1fbd 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-sound/mpg123-1.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bd6edcbbc51d0385d256d5d55d078fac
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.14.4
new file mode 100644
index 000000000000..ba256f488aee
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.14.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-sound/mpg123-1.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_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/sed-4 >=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(-)?] >=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-good-1.14.4: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(-)?]
+DESCRIPTION=MP3 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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd
+LICENSE=GPL-2
+RDEPEND=>=media-sound/mpg123-1.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_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-good-1.14.4: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-good/gst-plugins-good-1.14.4.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_=95568b13ddb9dd4e09306751bd157b6a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mplex-0.10.23-r1 b/metadata/md5-cache/media-plugins/gst-plugins-mplex-0.10.23-r1
index 8b323d81f37a..7dd0d0290557 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mplex-0.10.23-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mplex-0.10.23-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-video/mjpegtools-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0b0a4239cef4dc2b9465b982ff6df735
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.14.1
index 44dc8280402f..17d5442c87a0 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-video/mjpegtools-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3c8a225aa14e9a942c328141fca405f3
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.14.2
index 2442e07046a2..ffce3232c779 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-video/mjpegtools-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f8f2bb1c42fad8d3c209e8f51eda4dff
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.14.3
index a8b1a286084e..1ea260a60c8f 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-video/mjpegtools-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f8f2bb1c42fad8d3c209e8f51eda4dff
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-musepack-0.10.23-r1 b/metadata/md5-cache/media-plugins/gst-plugins-musepack-0.10.23-r1
index 181a536f648a..cde6ea2f4590 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-musepack-0.10.23-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-musepack-0.10.23-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-sound/musepack-tools-465-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x8
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=adfdbd71ee3c206e956be4cca292e556
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-neon-0.10.23-r1 b/metadata/md5-cache/media-plugins/gst-plugins-neon-0.10.23-r1
index 49b36057d93c..81e73780dec6 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-neon-0.10.23-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-neon-0.10.23-r1
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/neon-0.30.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b869cab7ec079cb04a9b33068d3d94d1
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-neon-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-neon-1.14.1
index 16028c2409cd..2ed6a569c999 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-neon-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-neon-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/neon-0.30.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4fae9e02d4e2838bdde0afa82e06d4ab
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-neon-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-neon-1.14.2
index bd99eaedc3e7..19ce41252850 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-neon-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-neon-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/neon-0.30.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=925ca5644fe6a3ef29cfe8ffdd1604a9
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-neon-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-neon-1.14.3
index ed0196607d81..f59435573e34 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-neon-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-neon-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/neon-0.30.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=925ca5644fe6a3ef29cfe8ffdd1604a9
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ofa-0.10.23-r1 b/metadata/md5-cache/media-plugins/gst-plugins-ofa-0.10.23-r1
index 5e041148b077..89d210df4ebe 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ofa-0.10.23-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ofa-0.10.23-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libofa-0.9.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b74938fc3c263c14d457ec9e96866b40
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.14.1
index ec64596d7fb6..19ae8202fd75 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libofa-0.9.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=41fba70a939bda18331c0c5605327801
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.14.2
index 94227886bdbd..7d0144d9db4e 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libofa-0.9.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=059120661418b415ed87e41676a5030a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.14.3
index 137fcbd6d12a..2370a71b069a 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libofa-0.9.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=059120661418b415ed87e41676a5030a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ogg-0.10.36-r1 b/metadata/md5-cache/media-plugins/gst-plugins-ogg-0.10.36-r1
index e2b1f8633c9b..59681d233582 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ogg-0.10.36-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ogg-0.10.36-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.36.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4923349dcb7a1237d25d8c4fcec1a4a7
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-opencv-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-opencv-1.14.1
index 7bce7ca6464f..b4176ec74b2d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-opencv-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-opencv-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/opencv-2.3.0[contrib(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b94872ebfdb28bca349cc23a46d5c02a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-opencv-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-opencv-1.14.2
index 221a4cf89892..d35e4d5bf60c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-opencv-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-opencv-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/opencv-2.3.0[contrib(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b94872ebfdb28bca349cc23a46d5c02a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-opencv-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-opencv-1.14.3
index 4b3351f31553..d0a12f7d7ed2 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-opencv-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-opencv-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/opencv-2.3.0[contrib(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b94872ebfdb28bca349cc23a46d5c02a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-openh264-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-openh264-1.14.1
index b2c1f0b99bec..d3751f4e847b 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-openh264-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-openh264-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/openh264-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=df7a056484428003e62b705f259e4957
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-openh264-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-openh264-1.14.2
index 1b39c9df488f..05efd13698f6 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-openh264-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-openh264-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/openh264-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=718bb37e23975e4a26d59b24c186482b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-openh264-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-openh264-1.14.3
index 790242f5b53c..fe3c27133785 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-openh264-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-openh264-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/openh264-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=718bb37e23975e4a26d59b24c186482b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-opus-0.10.23-r1 b/metadata/md5-cache/media-plugins/gst-plugins-opus-0.10.23-r1
index b26c676742c9..5248e2c81c56 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-opus-0.10.23-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-opus-0.10.23-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/opus-1.0.2-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=78e52673aab69ee58f793c84c59387b1
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-opus-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-opus-1.12.4
deleted file mode 100644
index 6021ab1c86d9..000000000000
--- a/metadata/md5-cache/media-plugins/gst-plugins-opus-1.12.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/opus-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=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(-)?] >=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-base-1.12.4: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(-)?]
-DESCRIPTION=Opus audio parser 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=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd
-LICENSE=GPL-2
-RDEPEND=>=media-libs/opus-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(-)?] >=media-libs/gst-plugins-base-1.12.4: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(-)?,ogg] >=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-base-1.12.4: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-base/gst-plugins-base-1.12.4.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=947e105deb4b7b21af92e50b588843e1
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-opus-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-opus-1.14.1
index 95c3ed3d87a9..e0564fe0e200 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-opus-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-opus-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/opus-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=947e105deb4b7b21af92e50b588843e1
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-opus-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-opus-1.14.2
index 618b9ed689d9..ed9cd07bdd50 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-opus-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-opus-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/opus-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4f431d817943f106718f0676bf3e4684
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-opus-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-opus-1.14.3
index b2c02db20c55..960af7604a72 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-opus-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-opus-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/opus-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4f431d817943f106718f0676bf3e4684
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-opus-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-opus-1.14.4
new file mode 100644
index 000000000000..0080c3cf16a8
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-opus-1.14.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=media-libs/opus-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=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(-)?] >=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-base-1.14.4: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(-)?]
+DESCRIPTION=Opus audio parser 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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=GPL-2
+RDEPEND=>=media-libs/opus-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(-)?] >=media-libs/gst-plugins-base-1.14.4: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(-)?,ogg] >=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-base-1.14.4: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-base/gst-plugins-base-1.14.4.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_=b0cf36edcfaa166f19145e719a367ab3
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-oss-0.10.31-r1 b/metadata/md5-cache/media-plugins/gst-plugins-oss-0.10.31-r1
index f74de752cf37..25eb00f97289 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-oss-0.10.31-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-oss-0.10.31-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b1da1dc1268f4daa8e58775a706d3597
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-oss-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-oss-1.12.4
deleted file mode 100644
index e9b30384be6b..000000000000
--- a/metadata/md5-cache/media-plugins/gst-plugins-oss-1.12.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=virtual/os-headers >=sys-apps/sed-4 >=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(-)?] >=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-good-1.12.4: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(-)?]
-DESCRIPTION=OSS (Open Sound System) support 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=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=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-good-1.12.4: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-good/gst-plugins-good-1.12.4.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=dca8bd7746f4e38f711ba08a82a91077
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-oss-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-oss-1.14.1
index e9599a4a1ae8..3e2a5d961022 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-oss-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-oss-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=dca8bd7746f4e38f711ba08a82a91077
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-oss-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-oss-1.14.2
index 7ef0bd84e575..bcd8f95994e9 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-oss-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-oss-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=41a9a9596cf9ab898bada89ad992bbad
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-oss-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-oss-1.14.3
index ecbf9b92b22f..d5d6976e819d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-oss-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-oss-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=41a9a9596cf9ab898bada89ad992bbad
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-oss-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-oss-1.14.4
new file mode 100644
index 000000000000..ba7528b02e29
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-oss-1.14.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=virtual/os-headers >=sys-apps/sed-4 >=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(-)?] >=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-good-1.14.4: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(-)?]
+DESCRIPTION=OSS (Open Sound System) support 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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=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-good-1.14.4: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-good/gst-plugins-good-1.14.4.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_=3f6c11bc14178381fce452bcbdef0f1c
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-pango-0.10.36-r1 b/metadata/md5-cache/media-plugins/gst-plugins-pango-0.10.36-r1
index 4413256bca4b..bfea7fb62186 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-pango-0.10.36-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-pango-0.10.36-r1
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/pango-1.36.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.36.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2d6c9be238871125b4da32a116b214af
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-pulse-0.10.31-r2 b/metadata/md5-cache/media-plugins/gst-plugins-pulse-0.10.31-r2
index 631e291fbc15..b923c9cb1d55 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-pulse-0.10.31-r2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-pulse-0.10.31-r2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/gst-plugins-good-0.10:0.10[abi_x86_32(-)?,abi_x86_64(-)?,ab
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=16beed9a80264c45f2ec6e8361ee6751
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.12.4
deleted file mode 100644
index 3091a2b3cc74..000000000000
--- a/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.12.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/gst-plugins-base-1.12.4: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-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(-)?] >=sys-apps/sed-4 >=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(-)?] >=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-good-1.12.4: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(-)?]
-DESCRIPTION=PulseAudio sound server 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=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/gst-plugins-base-1.12.4: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-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(-)?] >=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-good-1.12.4: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-good/gst-plugins-good-1.12.4.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=674abc458a91fc06a16e930bcfa2fd5d
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.14.1
index bca9d2bd2ba6..ed811d59a20c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/gst-plugins-base-1.14.1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,a
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=674abc458a91fc06a16e930bcfa2fd5d
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.14.2
index 35c53d453b9b..68f8015e7d15 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/gst-plugins-base-1.14.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,a
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1282140f1477067e01e53d7afa4c71e8
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.14.3
index f42056a1fdf6..550d8e3e8c62 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/gst-plugins-base-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,a
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1282140f1477067e01e53d7afa4c71e8
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.14.4
new file mode 100644
index 000000000000..c2a1f6250900
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.14.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/gst-plugins-base-1.14.4: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-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(-)?] >=sys-apps/sed-4 >=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(-)?] >=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-good-1.14.4: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(-)?]
+DESCRIPTION=PulseAudio sound server 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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/gst-plugins-base-1.14.4: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-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(-)?] >=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-good-1.14.4: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-good/gst-plugins-good-1.14.4.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_=2c6d9651e86edf45b51ec1e4acf697a2
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-raw1394-0.10.31-r1 b/metadata/md5-cache/media-plugins/gst-plugins-raw1394-0.10.31-r1
index d13e14aec70c..292236e0d810 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-raw1394-0.10.31-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-raw1394-0.10.31-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f5a5533a3ec5f0f8353b9730c7eda13d
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.12.4
deleted file mode 100644
index 162e3f02dd62..000000000000
--- a/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.12.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=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(-)?] >=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-good-1.12.4: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(-)?]
-DESCRIPTION=Fiwewire DV/HDV capture 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 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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-good-1.12.4: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-good/gst-plugins-good-1.12.4.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=77976440181ee4c5b2a2c89ea94aeee6
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.14.1
index 11626a6cb7f0..4bf12b6037b4 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=77976440181ee4c5b2a2c89ea94aeee6
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.14.2
index 0b8748920e37..5b1a693691d8 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9a6d00053e6b13bb4fb02d467ec3c898
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.14.3
index 7794583cac45..b9deeca718ff 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9a6d00053e6b13bb4fb02d467ec3c898
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.14.4
new file mode 100644
index 000000000000..4c46d59eeb63
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.14.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=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(-)?] >=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-good-1.14.4: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(-)?]
+DESCRIPTION=Fiwewire DV/HDV capture 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 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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-good-1.14.4: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-good/gst-plugins-good-1.14.4.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_=ef4a466148f20033aefa315488485c41
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-resindvd-0.10.23-r1 b/metadata/md5-cache/media-plugins/gst-plugins-resindvd-0.10.23-r1
index 565a6ec38a2b..4cd05920da3b 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-resindvd-0.10.23-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-resindvd-0.10.23-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libdvdnav-4.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=52e3b19acd83cfe4f7f85600135251ff
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.14.1
index 07656505fd44..a189a314c1f3 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libdvdnav-4.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d63f93221f72d55e80b37cdb33de4db0
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.14.2
index 888fd134ead0..04bbdef58c1e 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libdvdnav-4.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c612651ed10c75ba800cc802832eb9ab
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.14.3
index 6b37846c7a82..e86be5753a85 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libdvdnav-4.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c612651ed10c75ba800cc802832eb9ab
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-rtmp-0.10.23-r1 b/metadata/md5-cache/media-plugins/gst-plugins-rtmp-0.10.23-r1
index d38df7681043..e94d80fc49dc 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-rtmp-0.10.23-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-rtmp-0.10.23-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0035c99bc529ac2b057c7cbd141310a7
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.14.1
index 99bff499e189..deda1eb4dac6 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2a1a32dc996267d0b2f6cc9ff3f283d6
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.14.2
index ca6e5dce9ff8..c97c34b6194d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=319f8eb617505aadcca18705802c93fc
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.14.3
index 1ebc609def11..07e27ea1a9f5 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=319f8eb617505aadcca18705802c93fc
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-shout2-0.10.31-r1 b/metadata/md5-cache/media-plugins/gst-plugins-shout2-0.10.31-r1
index 330ea67a6741..4fe1ade460c8 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-shout2-0.10.31-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-shout2-0.10.31-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libshout-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5de5b015feb17f53b34e77732ea87c15
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.12.4
deleted file mode 100644
index 92e0b531d3c2..000000000000
--- a/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.12.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/libshout-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=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(-)?] >=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-good-1.12.4: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(-)?]
-DESCRIPTION=Icecast server sink 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=alpha amd64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/libshout-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(-)?] >=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-good-1.12.4: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-good/gst-plugins-good-1.12.4.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=82d1027b86588dbf2c9623505a6ae15b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.14.1
index 5ded6277a3cb..e873e77d5c83 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libshout-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=82d1027b86588dbf2c9623505a6ae15b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.14.2
index 3c781f95209c..8de5e3da1b6d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libshout-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ed5313d5e9424dbe38af209773c858d7
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.14.3
index 559cbcbdf70f..ad1266b5f032 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libshout-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ed5313d5e9424dbe38af209773c858d7
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.14.4
new file mode 100644
index 000000000000..8ef1b1dfd768
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.14.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/libshout-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=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(-)?] >=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-good-1.14.4: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(-)?]
+DESCRIPTION=Icecast server sink 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=~alpha ~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libshout-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(-)?] >=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-good-1.14.4: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-good/gst-plugins-good-1.14.4.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_=7f55d8d3fc629cc0cea2647236c5bece
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-sidplay-0.10.19-r1 b/metadata/md5-cache/media-plugins/gst-plugins-sidplay-0.10.19-r1
index dc8142ef55ec..3d9716de44aa 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-sidplay-0.10.19-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-sidplay-0.10.19-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libsidplay-1.36.59-r1:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.19.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f2c71b151dabd4413c774064c36f84b2
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.14.1
index 6755c1c8f182..25d1c90ecb74 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libsidplay-1.36.59-r1:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=801cdac728a61d92cb0eeb3bbcaf70de
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.14.2
index 5bdaff8593a7..86206bdff829 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libsidplay-1.36.59-r1:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fdad16833d3ca0dfd5fd6d6f26091382
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.14.3
index 9386d8ca5909..6db928d1cf20 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libsidplay-1.36.59-r1:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fdad16833d3ca0dfd5fd6d6f26091382
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.14.1
index 846c621bf138..a7a41bd12f95 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8be0289eef666d9a524a147753205a16
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.14.2
index 30941ef01ca8..3449798af73d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=45ccdf7f6d7e88063b4e55cf0817cb18
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.14.3
index 4f020d5a8279..89ca15a551ca 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=45ccdf7f6d7e88063b4e55cf0817cb18
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-0.10.23-r1 b/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-0.10.23-r1
index 4d37a079cb4e..d8c205f986c0 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-0.10.23-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-0.10.23-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libsoundtouch-1.7.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7caf5c999b9b93f502fb246ececcce8d
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.14.1
index 16f577bb8b79..a9c2948b6454 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libsoundtouch-1.7.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=36d8574c531ab3c3abf8bb5f5747fdc2
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.14.2
index 0bc1a349253a..924195467c21 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libsoundtouch-1.7.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6bad2d9502ff835ebfeb32e009aa6098
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.14.3
index 597bea30bcb2..cb44161baa08 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libsoundtouch-1.7.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6bad2d9502ff835ebfeb32e009aa6098
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-soup-0.10.31-r2 b/metadata/md5-cache/media-plugins/gst-plugins-soup-0.10.31-r2
index ad62703c51a8..5fd6a9f78559 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-soup-0.10.31-r2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-soup-0.10.31-r2
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/libsoup-2.44.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	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-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	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-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7298125cd22a2c1512d98521b9c70843
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-soup-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-soup-1.12.4
deleted file mode 100644
index 7a1ec6c6b13e..000000000000
--- a/metadata/md5-cache/media-plugins/gst-plugins-soup-1.12.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=net-libs/libsoup-2.48:2.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=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(-)?] >=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-good-1.12.4: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(-)?]
-DESCRIPTION=HTTP client source/sink 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=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos
-LICENSE=GPL-2
-RDEPEND=>=net-libs/libsoup-2.48:2.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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-good-1.12.4: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-good/gst-plugins-good-1.12.4.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=8abb873f39cdf7312bedc7fde33faa30
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-soup-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-soup-1.14.1
index 8e4f7431f8c4..01baf1ba8d11 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-soup-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-soup-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/libsoup-2.48:2.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8abb873f39cdf7312bedc7fde33faa30
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-soup-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-soup-1.14.2
index 1127061a549d..fdaf90632ea5 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-soup-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-soup-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/libsoup-2.48:2.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6ebe1609838ad26314ce40012432023e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-soup-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-soup-1.14.3
index 44b8e371f95c..5dee2e6ed18d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-soup-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-soup-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/libsoup-2.48:2.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6ebe1609838ad26314ce40012432023e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-soup-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-soup-1.14.4
new file mode 100644
index 000000000000..bb5579743c2e
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-soup-1.14.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=net-libs/libsoup-2.48:2.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=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(-)?] >=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-good-1.14.4: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(-)?]
+DESCRIPTION=HTTP client source/sink 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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos
+LICENSE=GPL-2
+RDEPEND=>=net-libs/libsoup-2.48:2.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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-good-1.14.4: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-good/gst-plugins-good-1.14.4.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_=d9ec663abcbfbf39057c62388ec031f1
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-speex-0.10.31-r1 b/metadata/md5-cache/media-plugins/gst-plugins-speex-0.10.31-r1
index d0cb533649a3..0d749f546368 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-speex-0.10.31-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-speex-0.10.31-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6ad264ed7862de6d98a23dbcd95b2c87
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-speex-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-speex-1.12.4
deleted file mode 100644
index 35cfd9f5924b..000000000000
--- a/metadata/md5-cache/media-plugins/gst-plugins-speex-1.12.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=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(-)?] >=sys-apps/sed-4 >=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(-)?] >=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-good-1.12.4: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(-)?]
-DESCRIPTION=Speex 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=alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=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(-)?] >=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-good-1.12.4: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-good/gst-plugins-good-1.12.4.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=d41f702d634d4bf465b41b108946214c
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-speex-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-speex-1.14.1
index 8ab0182f4ce6..de5b23fbb690 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-speex-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-speex-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d41f702d634d4bf465b41b108946214c
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-speex-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-speex-1.14.2
index 978201286e02..1466e6b1ab2b 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-speex-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-speex-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9db1774017bfbe32d56d732d064d6843
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-speex-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-speex-1.14.3
index 43073a3e4861..0cbcbffaac76 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-speex-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-speex-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9db1774017bfbe32d56d732d064d6843
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-speex-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-speex-1.14.4
new file mode 100644
index 000000000000..67a9626cd2dc
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-speex-1.14.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=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(-)?] >=sys-apps/sed-4 >=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(-)?] >=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-good-1.14.4: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(-)?]
+DESCRIPTION=Speex 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=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=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(-)?] >=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-good-1.14.4: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-good/gst-plugins-good-1.14.4.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_=2f2c95a4ca94f6069ce34272af7807c9
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-srtp-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-srtp-1.14.1
index d5e34c9155eb..961feb2ea3aa 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-srtp-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-srtp-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/libsrtp-2.1.0:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1d764909b19c3f3dcade299b552c6f94
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 6b1520356516..e5d2086e04eb 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
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/libsrtp-2.1.0:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
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 2736bc7dbe9d..9f64559f31d0 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
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/libsrtp-2.1.0:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-taglib-0.10.31-r1 b/metadata/md5-cache/media-plugins/gst-plugins-taglib-0.10.31-r1
index 7e4a104462a8..b4b85f2c0f15 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-taglib-0.10.31-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-taglib-0.10.31-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/taglib-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=33512fc593424fb7c09a5255848591f8
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.12.4
deleted file mode 100644
index cc03264ec7b5..000000000000
--- a/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.12.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/taglib-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(-)?] >=sys-apps/sed-4 >=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(-)?] >=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-good-1.12.4: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(-)?]
-DESCRIPTION=ID3v2/APEv2 tagger 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=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=media-libs/taglib-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(-)?] >=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-good-1.12.4: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-good/gst-plugins-good-1.12.4.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=b33ec1686a990c25eea1c65cf7c02a34
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.14.1
index 44a578173808..069fc051f05d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/taglib-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b33ec1686a990c25eea1c65cf7c02a34
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.14.2
index e58c12cb9cb5..1e6f368a701d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/taglib-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b0175f3c5f139887adb2e30dc3122311
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.14.3
index 37b72ca8fc45..cbf36a9172f0 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/taglib-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b0175f3c5f139887adb2e30dc3122311
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.14.4
new file mode 100644
index 000000000000..c4d17c831a91
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.14.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/taglib-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(-)?] >=sys-apps/sed-4 >=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(-)?] >=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-good-1.14.4: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(-)?]
+DESCRIPTION=ID3v2/APEv2 tagger 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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=media-libs/taglib-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(-)?] >=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-good-1.14.4: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-good/gst-plugins-good-1.14.4.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_=87eb0eca2b6dcca4f7b181c71f599fd4
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-theora-0.10.36-r1 b/metadata/md5-cache/media-plugins/gst-plugins-theora-0.10.36-r1
index 8e81433571ec..1a66576ba475 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-theora-0.10.36-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-theora-0.10.36-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x8
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.36.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2c3a54d4e9c8da0b8a35602a2eade169
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-twolame-0.10.19-r1 b/metadata/md5-cache/media-plugins/gst-plugins-twolame-0.10.19-r1
index f1b4d7117396..b8dd92ee9ba5 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-twolame-0.10.19-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-twolame-0.10.19-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.19.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=781f36f6c0e3cbcf55db75d3463fb4ba
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.14.1
index c033559d7e2e..b83e67cada8b 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a4a5400289a4386eaff426331c093f27
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.14.2
index 25014fa6a439..4993e83cfae5 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f00b93de37e26eac5461783eb9a50b0c
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.14.3
index 80a9846b29d0..cbf4d5c959f4 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f00b93de37e26eac5461783eb9a50b0c
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.14.4
new file mode 100644
index 000000000000..a65b9e0de316
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.14.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=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(-)?] >=sys-apps/sed-4 >=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(-)?] >=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-good-1.14.4: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(-)?]
+DESCRIPTION=MPEG2 encoder 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=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=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(-)?] >=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-good-1.14.4: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-good/gst-plugins-good-1.14.4.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_=44cbfbca9d09e7d3de19947e22e7bc61
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-uvch264-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-uvch264-1.14.1
index e6b2085cb0ce..1587e8386eea 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-uvch264-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-uvch264-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=virtual/libgudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mip
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b3064d4c96228354f64f73cceabf948a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-uvch264-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-uvch264-1.14.2
index 3786cb88f7e1..ebd2937179f7 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-uvch264-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-uvch264-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=virtual/libgudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mip
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=94fb84c8462730ff6a12919782eaf437
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-uvch264-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-uvch264-1.14.3
index 372cd2ed1b46..4fa6a88fab38 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-uvch264-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-uvch264-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=virtual/libgudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mip
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=94fb84c8462730ff6a12919782eaf437
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-v4l2-0.10.31-r1 b/metadata/md5-cache/media-plugins/gst-plugins-v4l2-0.10.31-r1
index dd2112429e61..7791f16da404 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-v4l2-0.10.31-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-v4l2-0.10.31-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=10db3b034d98e6f3ac8cfeb549e82755
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.12.4
deleted file mode 100644
index 37ca824821fc..000000000000
--- a/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.12.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=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(-)?] >=media-libs/gst-plugins-base-1.12.4: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(-)?] udev? ( >=virtual/libgudev-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(-)?] ) virtual/os-headers >=sys-apps/sed-4 >=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(-)?] >=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-good-1.12.4: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(-)?]
-DESCRIPTION=plugin for gstreamer
-EAPI=6
-HOMEPAGE=https://gstreamer.freedesktop.org/
-IUSE=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 ~mips ppc ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=>=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(-)?] >=media-libs/gst-plugins-base-1.12.4: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(-)?] udev? ( >=virtual/libgudev-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(-)?] ) >=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-good-1.12.4: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-good/gst-plugins-good-1.12.4.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=0a4f5e287e18ca8c660b1de1801c8240
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.14.1
index b26d5788beaf..9ec38a606754 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0a4f5e287e18ca8c660b1de1801c8240
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.14.2
index 3ff05163db83..9ad950b513a3 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8c490d418544a91b7dca07a970cdee86
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.14.3
index adc7f1c116aa..6333ea846541 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8c490d418544a91b7dca07a970cdee86
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.14.4
new file mode 100644
index 000000000000..b32b9d130de1
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.14.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=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(-)?] >=media-libs/gst-plugins-base-1.14.4: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(-)?] udev? ( >=virtual/libgudev-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(-)?] ) virtual/os-headers >=sys-apps/sed-4 >=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(-)?] >=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-good-1.14.4: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(-)?]
+DESCRIPTION=plugin for gstreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=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 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=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(-)?] >=media-libs/gst-plugins-base-1.14.4: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(-)?] udev? ( >=virtual/libgudev-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(-)?] ) >=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-good-1.14.4: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-good/gst-plugins-good-1.14.4.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_=852de2c6f4b20268ed4997c035dead27
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.14.1
index 85d30451c328..b08787412c90 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a565f92621dbf74daef5c777377ba462
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.14.2
index c1732af335c4..d7c231176dcf 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ca613cee763931f95691426df889afd9
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.14.3
index b04b6a3aa861..9d6c9e464139 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ca613cee763931f95691426df889afd9
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.14.1
index 84b69a234b3f..d135c0679d80 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d8e16f05cb91dc69e51ffb906f3b912a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.14.2
index f28aaa627ce3..c1f33aeaf7c3 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c7427ef1b7ec88286bf799567d6017ef
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.14.3
index 84b2d5f98d06..33f5aff345b3 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c7427ef1b7ec88286bf799567d6017ef
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-vorbis-0.10.36-r1 b/metadata/md5-cache/media-plugins/gst-plugins-vorbis-0.10.36-r1
index 62b9512d29a5..0b7756c258a7 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-vorbis-0.10.36-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-vorbis-0.10.36-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.36.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	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-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	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-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4ff655bee0a97c10e3c7e5f47f412036
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-vp8-0.10.23-r3 b/metadata/md5-cache/media-plugins/gst-plugins-vp8-0.10.23-r3
index 96ecc6a35eaf..250f3adabde3 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-vp8-0.10.23-r3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-vp8-0.10.23-r3
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libvpx-1.2.0_pre20130625[abi_x86_32(-)?,abi_x86_64(-)?,abi_
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6b55dc9da7266f31db6c9876e6e0a91a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.12.4
deleted file mode 100644
index 83459ee4d982..000000000000
--- a/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.12.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/libvpx-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(-)?] >=sys-apps/sed-4 >=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(-)?] >=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-good-1.12.4: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(-)?]
-DESCRIPTION=VP8/VP9 video 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=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd
-LICENSE=GPL-2
-RDEPEND=>=media-libs/libvpx-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(-)?] >=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-good-1.12.4: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-good/gst-plugins-good-1.12.4.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=52449aec69206ce37bad4b0ff26bee52
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.14.1
index 19407ca2ff52..74645d051ff0 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libvpx-1.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=52449aec69206ce37bad4b0ff26bee52
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.14.2
index ff6d5f26b1c3..414ef958d0e0 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libvpx-1.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=aa22c4244c32698735b39f897572a6ab
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.14.3
index e743d12377f7..10e1d2cd7693 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libvpx-1.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=aa22c4244c32698735b39f897572a6ab
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.14.4
new file mode 100644
index 000000000000..3db8ec846bab
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.14.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/libvpx-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(-)?] >=sys-apps/sed-4 >=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(-)?] >=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-good-1.14.4: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(-)?]
+DESCRIPTION=VP8/VP9 video 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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libvpx-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(-)?] >=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-good-1.14.4: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-good/gst-plugins-good-1.14.4.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_=798e608933aa42a3420d6547c1a0dee9
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-wavpack-0.10.31-r1 b/metadata/md5-cache/media-plugins/gst-plugins-wavpack-0.10.31-r1
index 8a31655d4887..a0fccfce9a00 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-wavpack-0.10.31-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-wavpack-0.10.31-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=287c1a6e60f20f6edc2846fb44543bda
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.12.4
deleted file mode 100644
index 5badda0dff01..000000000000
--- a/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.12.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=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(-)?] >=sys-apps/sed-4 >=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(-)?] >=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-good-1.12.4: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(-)?]
-DESCRIPTION=Wavpack audio 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=alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd
-LICENSE=GPL-2
-RDEPEND=>=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(-)?] >=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-good-1.12.4: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-good/gst-plugins-good-1.12.4.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=6d2ea0a0788c4174e4517f0297024e27
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.14.1
index f056c3ac7c6b..353676696221 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6d2ea0a0788c4174e4517f0297024e27
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.14.2
index f439c2e2c0d7..7ba13d193c9a 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f8d17447a05a3658dea1c54285ac2a69
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.14.3
index 1befd6607f56..9633db48c713 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f8d17447a05a3658dea1c54285ac2a69
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.14.4
new file mode 100644
index 000000000000..fa3fce9ca675
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.14.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=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(-)?] >=sys-apps/sed-4 >=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(-)?] >=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-good-1.14.4: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(-)?]
+DESCRIPTION=Wavpack audio 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=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=GPL-2
+RDEPEND=>=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(-)?] >=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-good-1.14.4: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-good/gst-plugins-good-1.14.4.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_=5207362fcc127ff811dfdf0d0444ad8e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-x-0.10.36-r1 b/metadata/md5-cache/media-plugins/gst-plugins-x-0.10.36-r1
index af8b2b5360f4..c1b3ce227466 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-x-0.10.36-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-x-0.10.36-r1
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.36.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f0e0e41a8e625e15be33ee4c2fbe7a86
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-x264-0.10.19-r1 b/metadata/md5-cache/media-plugins/gst-plugins-x264-0.10.19-r1
index 10d4d9bd552e..4881308f8da9 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-x264-0.10.19-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-x264-0.10.19-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.19.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=12f02e526a0471644fdd7d0b5a556db0
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-x264-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-x264-1.14.1
index 74940bd21807..37b58b219271 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-x264-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-x264-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=579eb0df4c2e24e86a8615dc48b805b8
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-x264-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-x264-1.14.2
index e892af331bc2..c2051d3d87dd 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-x264-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-x264-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=761b5b63321592a1fb1d091ab70503d2
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-x264-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-x264-1.14.3
index 5125b275139a..36af055f0425 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-x264-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-x264-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=761b5b63321592a1fb1d091ab70503d2
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-x265-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-x265-1.14.1
index 0cecec0b14dc..3eca0d4ba4e2 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-x265-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-x265-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=media-libs/x265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=962fd1fc3ea8bb6cc4855eb8e6f315b3
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-x265-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-x265-1.14.2
index d264d2335b94..3b676ea3c29e 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-x265-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-x265-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=media-libs/x265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=facfab39b25b8b18589c0509955453b3
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-x265-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-x265-1.14.3
index 405a02b5dbde..6a8ab8710c84 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-x265-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-x265-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=media-libs/x265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=facfab39b25b8b18589c0509955453b3
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-0.10.31-r2 b/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-0.10.31-r2
index a4e50cfdfc7d..a7b08c779feb 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-0.10.31-r2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-0.10.31-r2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/gst-plugins-base-0.10:0.10[abi_x86_32(-)?,abi_x86_64(-)?,ab
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8e0e918d2a73beee0d1ca8f3b0c6cae3
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.12.4
deleted file mode 100644
index cbb5f52791ed..000000000000
--- a/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.12.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/gst-plugins-base-1.12.4: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(-)?] >=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/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/libXfixes-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(-)?] x11-base/xorg-proto >=sys-apps/sed-4 >=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(-)?] >=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-good-1.12.4: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(-)?]
-DESCRIPTION=X11 video capture stream 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 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/gst-plugins-base-1.12.4: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(-)?] >=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/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/libXfixes-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(-)?] >=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-good-1.12.4: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-good/gst-plugins-good-1.12.4.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=fa5ea4decc2712ddcb5d006e14abdd5f
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.14.1
index bcf170b8c382..35391afedb10 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/gst-plugins-base-1.14.1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,a
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fdba4e5acc756e495d4698336a3c3782
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.14.2
index 2e8c549dfd11..4d07e2ac31be 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/gst-plugins-base-1.14.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,a
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f1ea43b94c08e43749cf02afcf243c99
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.14.3
index 1d122578d74b..b2fa623e05b8 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/gst-plugins-base-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,a
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f1ea43b94c08e43749cf02afcf243c99
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.14.4
new file mode 100644
index 000000000000..1a71b6ce7330
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.14.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/gst-plugins-base-1.14.4: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(-)?] >=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/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/libXfixes-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(-)?] x11-base/xorg-proto >=sys-apps/sed-4 >=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(-)?] >=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-good-1.14.4: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(-)?]
+DESCRIPTION=X11 video capture stream 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 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/gst-plugins-base-1.14.4: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(-)?] >=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/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/libXfixes-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(-)?] >=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-good-1.14.4: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-good/gst-plugins-good-1.14.4.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_=afdb7a58510582916055eb2158c68d6c
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-xvid-0.10.23-r1 b/metadata/md5-cache/media-plugins/gst-plugins-xvid-0.10.23-r1
index 94ec77f909f8..4e6d8c5eb278 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-xvid-0.10.23-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-xvid-0.10.23-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b99bfbf5ce8bd6805530bb2a5fcd886c
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-xvideo-0.10.36-r1 b/metadata/md5-cache/media-plugins/gst-plugins-xvideo-0.10.36-r1
index 2e28025c679c..9f4bcb3883e2 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-xvideo-0.10.36-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-xvideo-0.10.36-r1
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 RESTRICT=test
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.36.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cb5f3f5bf706b074ae2b03b8ba86bef7
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-zbar-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-zbar-1.14.1
index 0a24bde57e20..c126ecd7adf4 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-zbar-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-zbar-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-gfx/zbar-0.10_p20121015-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3bfe982a7afbaec431c22b063695074a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-zbar-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-zbar-1.14.2
index c19321df83a9..28868fa12b0d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-zbar-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-zbar-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-gfx/zbar-0.10_p20121015-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3bfe982a7afbaec431c22b063695074a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-zbar-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-zbar-1.14.3
index e5fd574a26ec..846ecb29e20f 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-zbar-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-zbar-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=media-gfx/zbar-0.10_p20121015-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3bfe982a7afbaec431c22b063695074a
diff --git a/metadata/md5-cache/media-plugins/gst-transcoder-1.8.2-r1 b/metadata/md5-cache/media-plugins/gst-transcoder-1.8.2-r1
index 158f0402ab98..293e6833baa5 100644
--- a/metadata/md5-cache/media-plugins/gst-transcoder-1.8.2-r1
+++ b/metadata/md5-cache/media-plugins/gst-transcoder-1.8.2-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/gobject-introspection:= dev-libs/glib:2 >=media-libs/gstreamer-1.8.2:1.0[introspection] >=media-libs/gst-plugins-base-1.8.2:1.0[introspection]
 SLOT=0
 SRC_URI=https://github.com/pitivi/gst-transcoder/archive/1.8.2.tar.gz -> gst-transcoder-1.8.2.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6556bf4ed4d9bbd9271e3d68f841e02c
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 ccfe8eb322f7..36c5fd9d783a 100644
--- a/metadata/md5-cache/media-plugins/kipi-plugins-5.9.0
+++ b/metadata/md5-cache/media-plugins/kipi-plugins-5.9.0
@@ -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/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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kodi-audiodecoder-modplug-1.1.0 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-1.1.0
index a64604639317..fbdd3a19bff9 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-1.1.0
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-1.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/kodi media-libs/kodi-platform media-libs/libmodplug
 SLOT=0
 SRC_URI=https://github.com/notspiff/audiodecoder.modplug/archive/v1.1.0.tar.gz -> kodi-audiodecoder-modplug-1.1.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=df93a5882a532e0f6f6a5fa5a6004946
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-9999 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-9999
index eb181aa4ef5d..2d43b14edc29 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/notspiff/audiodecoder.modplug
 LICENSE=GPL-2
 RDEPEND=media-tv/kodi media-libs/kodi-platform media-libs/libmodplug
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=df93a5882a532e0f6f6a5fa5a6004946
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-1.1.0 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-1.1.0
index e0ed5d9b27e3..89d56d1eaab6 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-1.1.0
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-1.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/kodi media-libs/kodi-platform
 SLOT=0
 SRC_URI=https://github.com/notspiff/audiodecoder.nosefart/archive/v1.1.0.tar.gz -> kodi-audiodecoder-nosefart-1.1.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=78f482f3af63ccf272b99f61093cc2ce
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-9999 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-9999
index 01c8ab858fe9..234eb5933c5a 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/notspiff/audiodecoder.nosefart
 LICENSE=GPL-2
 RDEPEND=media-tv/kodi media-libs/kodi-platform
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=78f482f3af63ccf272b99f61093cc2ce
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-1.1.0 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-1.1.0
index cead0abad7c4..7269f763901d 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-1.1.0
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-1.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/kodi media-libs/kodi-platform media-libs/libsidplay:2
 SLOT=0
 SRC_URI=https://github.com/notspiff/audiodecoder.sidplay/archive/v1.1.0.tar.gz -> kodi-audiodecoder-sidplay-1.1.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a82039ac8e77cb3ce9433b60b2ffd113
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-9999 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-9999
index a41b6e5ce7ca..d6dd1f699698 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/notspiff/audiodecoder.sidplay
 LICENSE=GPL-2
 RDEPEND=media-tv/kodi media-libs/kodi-platform media-libs/libsidplay:2
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a82039ac8e77cb3ce9433b60b2ffd113
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-1.1.0 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-1.1.0
index 314aa1299b3d..5145e380a9b1 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-1.1.0
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-1.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/kodi media-libs/kodi-platform
 SLOT=0
 SRC_URI=https://github.com/notspiff/audiodecoder.snesapu/archive/v1.1.0.tar.gz -> kodi-audiodecoder-snesapu-1.1.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=97d88bc20b65db4e246b5d98ebf4f510
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-9999 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-9999
index 5ec581598355..c629f83258ff 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/notspiff/audiodecoder.snesapu
 LICENSE=GPL-2
 RDEPEND=media-tv/kodi media-libs/kodi-platform
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=97d88bc20b65db4e246b5d98ebf4f510
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-1.1.0 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-1.1.0
index eb37eeebc7e1..68bbd5a1c384 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-1.1.0
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-1.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/kodi media-libs/kodi-platform
 SLOT=0
 SRC_URI=https://github.com/notspiff/audiodecoder.stsound/archive/v1.1.0.tar.gz -> kodi-audiodecoder-stsound-1.1.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fe12cfcb0cb7008e65a9593198574527
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-9999 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-9999
index 4523051bba74..83907c2b48fa 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/notspiff/audiodecoder.stsound
 LICENSE=GPL-2
 RDEPEND=media-tv/kodi media-libs/kodi-platform
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fe12cfcb0cb7008e65a9593198574527
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-1.1.0 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-1.1.0
index 43b62dc22c6d..42bf30f96fd3 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-1.1.0
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-1.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/kodi
 SLOT=0
 SRC_URI=https://github.com/notspiff/audiodecoder.timidity/archive/v1.1.0.tar.gz -> kodi-audiodecoder-timidity-1.1.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9db9060d6e3c146fae7c046ffc6bc101
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-9999 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-9999
index b8d03ad1fd58..73f3a41c3b58 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/notspiff/audiodecoder.timidity
 LICENSE=GPL-2
 RDEPEND=media-tv/kodi
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9db9060d6e3c146fae7c046ffc6bc101
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-1.1.0 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-1.1.0
index 318936d891b9..880fc4007cd4 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-1.1.0
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-1.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/kodi media-libs/kodi-platform
 SLOT=0
 SRC_URI=https://github.com/notspiff/audiodecoder.vgmstream/archive/v1.1.0.tar.gz -> kodi-audiodecoder-vgmstream-1.1.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4000294b9e3418a04f55e05673d6bd13
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-9999 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-9999
index 81a9795caf60..d5716e6c310c 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/notspiff/audiodecoder.vgmstream
 LICENSE=GPL-2
 RDEPEND=media-tv/kodi media-libs/kodi-platform
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4000294b9e3418a04f55e05673d6bd13
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-1.1.0 b/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-1.1.0
index 2f0d87f1a040..8d603f76376c 100644
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-1.1.0
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-1.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/kodi media-libs/libogg media-libs/flac
 SLOT=0
 SRC_URI=https://github.com/xbmc/audioencoder.flac/archive/v1.1.0.tar.gz -> kodi-audioencoder-flac-1.1.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=85c95ea5330a3612ba49cd9fb38d365a
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-9999 b/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-9999
index 9a254ef949dc..9a1cb07af4eb 100644
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/xbmc/audioencoder.flac
 LICENSE=GPL-2
 RDEPEND=media-tv/kodi media-libs/libogg media-libs/flac
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=85c95ea5330a3612ba49cd9fb38d365a
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-1.2.0 b/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-1.2.0
index 1b2a36907e91..4ae89460075b 100644
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-1.2.0
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-1.2.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/kodi media-sound/lame
 SLOT=0
 SRC_URI=https://github.com/xbmc/audioencoder.lame/archive/v1.2.0.tar.gz -> kodi-audioencoder-lame-1.2.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4b36f1e8d9bc2280990183e2525ed00f
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-9999 b/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-9999
index e133c537da0c..e2778a0ec7ea 100644
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/xbmc/audioencoder.lame
 LICENSE=GPL-2
 RDEPEND=media-tv/kodi media-sound/lame
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4b36f1e8d9bc2280990183e2525ed00f
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-1.1.0 b/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-1.1.0
index 2c3b2dde9fd7..7099b9b756f5 100644
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-1.1.0
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-1.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/kodi media-libs/libogg media-libs/libvorbis
 SLOT=0
 SRC_URI=https://github.com/xbmc/audioencoder.vorbis/archive/v1.1.0.tar.gz -> kodi-audioencoder-vorbis-1.1.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3afbaad6ae7e58e76d114de8b7af93c5
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-9999 b/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-9999
index 151baac485fe..b445271ab920 100644
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/xbmc/audioencoder.vorbis
 LICENSE=GPL-2
 RDEPEND=media-tv/kodi media-libs/libogg media-libs/libvorbis
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3afbaad6ae7e58e76d114de8b7af93c5
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-1.1.0 b/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-1.1.0
index ffd7c259d279..38c441000037 100644
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-1.1.0
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-1.1.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/xbmc/audioencoder.wav/archive/v1.1.0.tar.gz -> kodi-audioencoder-wav-1.1.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9683cbcaed5aef73c4e58a4fa0337a13
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-9999 b/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-9999
index 15e53a27363f..3f6b934bad51 100644
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/xbmc/audioencoder.wav
 LICENSE=GPL-2
 RDEPEND=media-tv/kodi
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ed8fcc5e94654cf2ec87ca51a732b5df
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-9999 b/metadata/md5-cache/media-plugins/kodi-game-libretro-9999
index 9c4360813708..c43a205a199c 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-9999
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/kodi-game/game.libretro
 LICENSE=GPL-2
 RDEPEND==media-tv/kodi-9999 =media-libs/kodi-platform-9999 =dev-libs/libplatform-2*
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d22d15d0221fa2a592fc306cfb45a0a3
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-bnes-9999 b/metadata/md5-cache/media-plugins/kodi-game-libretro-bnes-9999
index b74690bdf307..0fd3b448d69c 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-bnes-9999
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-bnes-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/kodi-game/game.libretro.bnes
 LICENSE=GPL-2
 RDEPEND=media-plugins/kodi-game-libretro ~media-tv/kodi-9999 games-emulation/libretro-bnes
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3ce77d2e6d983320092e94e1f123564f
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-dosbox-9999 b/metadata/md5-cache/media-plugins/kodi-game-libretro-dosbox-9999
index b1329824278f..16608b846432 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-dosbox-9999
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-dosbox-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/kodi-game/game.libretro.dosbox
 LICENSE=GPL-2
 RDEPEND=media-plugins/kodi-game-libretro ~media-tv/kodi-9999 games-emulation/libretro-dosbox
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4e7d935f75558a7f081e6c42b5a497fe
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-fceumm-9999 b/metadata/md5-cache/media-plugins/kodi-game-libretro-fceumm-9999
index 50ecd8451eac..90597240336b 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-fceumm-9999
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-fceumm-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/kodi-game/game.libretro.fceumm
 LICENSE=GPL-2
 RDEPEND=media-plugins/kodi-game-libretro ~media-tv/kodi-9999 games-emulation/libretro-fceumm
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dc0b43539c3b79af36de3354b5938668
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-9999 b/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-9999
index 0699184b179e..5579bea6ccb2 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-9999
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/kodi-game/game.libretro.nestopia
 LICENSE=GPL-2
 RDEPEND=media-plugins/kodi-game-libretro ~media-tv/kodi-9999 games-emulation/libretro-nestopia
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8d806e5a24ecdd5edd0c60b37fdb5397
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-snes9x-9999 b/metadata/md5-cache/media-plugins/kodi-game-libretro-snes9x-9999
index a9b9fe965059..989c1b36a0d7 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-snes9x-9999
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-snes9x-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/kodi-game/game.libretro.snes9x
 LICENSE=GPL-2
 RDEPEND=media-plugins/kodi-game-libretro ~media-tv/kodi-9999 games-emulation/libretro-snes9x
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=547b27f9f9692c7085d97b23632d4a5f
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-twentyfortyeight-9999 b/metadata/md5-cache/media-plugins/kodi-game-libretro-twentyfortyeight-9999
index a69d351eab89..109475cdceaa 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-twentyfortyeight-9999
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-twentyfortyeight-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/kodi-game/game.libretro.2048
 LICENSE=GPL-2
 RDEPEND=media-plugins/kodi-game-libretro ~media-tv/kodi-9999 games-emulation/libretro-twentyfortyeight
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7cbdfd007e86ff07c8320f30770d65f0
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-1.0.6-r1 b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-1.0.6-r1
index fd074932bc7c..ae98b42dd38b 100644
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-1.0.6-r1
+++ b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-1.0.6-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* =dev-libs/libplatform-2*
 SLOT=0
 SRC_URI=https://github.com/peak3d/inputstream.adaptive/archive/v1.0.6.tar.gz -> kodi-inputstream-adaptive-1.0.6.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=95ef9baf95db1521cd0e7a7646a24a2b
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.0.19 b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.0.19
index 6c497143f628..ecc184561786 100644
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.0.19
+++ b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.0.19
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/expat =media-tv/kodi-17* =media-libs/kodi-platform-17* =dev-libs/libplatform-2*
 SLOT=0
 SRC_URI=https://codeload.github.com/peak3d/inputstream.adaptive/tar.gz/9af21218a87572bd4ab8d8d660c11f6295144f97 -> kodi-inputstream-adaptive-2.0.19.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8ab9014f01f18bfdc1fbcb4e084fdccd
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.0.20 b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.0.20
index 0b5b4a801695..9fc56e0fd29d 100644
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.0.20
+++ b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.0.20
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/expat =media-tv/kodi-17* =media-libs/kodi-platform-17* =dev-libs/libplatform-2*
 SLOT=0
 SRC_URI=https://codeload.github.com/peak3d/inputstream.adaptive/tar.gz/c51b9a9b58a645f820883e6d99982277fc58aac5 -> kodi-inputstream-adaptive-2.0.20.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=961cd8974c79b8c93d82671083c3e94e
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.0.25 b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.0.25
index 16873dda4bb4..6666986044d2 100644
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.0.25
+++ b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.0.25
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/expat =media-tv/kodi-17* =media-libs/kodi-platform-17* =dev-libs/libplatform-2*
 SLOT=0
 SRC_URI=https://codeload.github.com/peak3d/inputstream.adaptive/tar.gz/c51b9a9b58a645f820883e6d99982277fc58aac5 -> kodi-inputstream-adaptive-2.0.25.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=961cd8974c79b8c93d82671083c3e94e
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-9999 b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-9999
index d858da78ab66..5650ec497cee 100644
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-9999
+++ b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/peak3d/inputstream.adaptive.git
 LICENSE=GPL-2
 RDEPEND=dev-libs/expat ~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 =dev-libs/libplatform-2*
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e180ae8b4e208337949b71356b99a51a
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-1.0.4 b/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-1.0.4
index f9aef4b79ac1..44502a30be8b 100644
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-1.0.4
+++ b/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-1.0.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-17* media-video/rtmpdump
 SLOT=0
 SRC_URI=https://github.com/notspiff/inputstream.rtmp/archive/v1.0.4.tar.gz -> kodi-inputstream-rtmp-1.0.4.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0c9400318df44068dbaa83ebf6ed4a3a
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-1.0.5 b/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-1.0.5
index dd31a059fd23..887e90bfae86 100644
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-1.0.5
+++ b/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-1.0.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-17* media-video/rtmpdump
 SLOT=0
 SRC_URI=https://github.com/notspiff/inputstream.rtmp/archive/v1.0.5.tar.gz -> kodi-inputstream-rtmp-1.0.5.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7c068b2fbbadc93ff14c7d94e6f12657
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-9999 b/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-9999
index 457e18deb737..96db6086e5c8 100644
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-9999
+++ b/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/notspiff/inputstream.rtmp
 LICENSE=GPL-2
 RDEPEND==media-tv/kodi-9999 media-video/rtmpdump
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3e0f79dcbb026b002fc8788bb3218eea
diff --git a/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.3.2 b/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.3.2
index 1c90a6bcaec0..2a348dcfc31e 100644
--- a/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.3.2
+++ b/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.3.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>media-tv/kodi-17.0.9999:0 =media-tv/kodi-17*:0 =media-libs/kodi-platform-17* =dev-libs/libplatform-2* dev-libs/libpcre
 SLOT=0
 SRC_URI=https://github.com/xbmc/peripheral.joystick/archive/v1.3.2.tar.gz -> kodi-peripheral-joystick-1.3.2.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a323cb2e7e0dbbfb65f10eac4146f383
diff --git a/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.3.3 b/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.3.3
index 253bf9f148db..5199a607d00e 100644
--- a/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.3.3
+++ b/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.3.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>media-tv/kodi-17.0.9999:0 =media-tv/kodi-17*:0 =media-libs/kodi-platform-17* =dev-libs/libplatform-2* dev-libs/libpcre
 SLOT=0
 SRC_URI=https://github.com/xbmc/peripheral.joystick/archive/v1.3.3.tar.gz -> kodi-peripheral-joystick-1.3.3.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a323cb2e7e0dbbfb65f10eac4146f383
diff --git a/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-9999 b/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-9999
index 4f91f514043b..88b7e35fb9e2 100644
--- a/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-9999
+++ b/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/xbmc/peripheral.joystick
 LICENSE=GPL-2
 RDEPEND==media-tv/kodi-9999 =media-libs/kodi-platform-9999 =dev-libs/libplatform-2* dev-libs/libpcre
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=594e06863db208b7a84588222c3ae2da
diff --git a/metadata/md5-cache/media-plugins/kodi-peripheral-steamcontroller-9999 b/metadata/md5-cache/media-plugins/kodi-peripheral-steamcontroller-9999
index ace3e51e0735..a23be0c01326 100644
--- a/metadata/md5-cache/media-plugins/kodi-peripheral-steamcontroller-9999
+++ b/metadata/md5-cache/media-plugins/kodi-peripheral-steamcontroller-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/xbmc/peripheral.steamcontroller
 LICENSE=GPL-2
 RDEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 =dev-libs/libplatform-2* virtual/libusb:1
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ccb0339048b7915eecb82657866affe5
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-argustv-2.5.4-r1 b/metadata/md5-cache/media-plugins/kodi-pvr-argustv-2.5.4-r1
index 07039ace29d6..9dd48070a633 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-argustv-2.5.4-r1
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-argustv-2.5.4-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/jsoncpp
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.argustv/archive/2.5.4-Krypton.tar.gz -> kodi-pvr-argustv-2.5.4.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d3a0d86c43b69596d454b55d970604c0
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-argustv-2.5.6 b/metadata/md5-cache/media-plugins/kodi-pvr-argustv-2.5.6
index 8673332c29a7..6df5953c3c24 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-argustv-2.5.6
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-argustv-2.5.6
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/jsoncpp
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.argustv/archive/2.5.6-Krypton.tar.gz -> kodi-pvr-argustv-2.5.6.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d3a0d86c43b69596d454b55d970604c0
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-argustv-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-argustv-9999
index 4efd33dc9420..719913fbf47a 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-argustv-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-argustv-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/kodi-pvr/pvr.argustv
 LICENSE=GPL-2
 RDEPEND==media-tv/kodi-9999 =media-libs/kodi-platform-9999 dev-libs/jsoncpp
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3f72697159c0366e40ef65c168c97860
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-demo-2.4.3 b/metadata/md5-cache/media-plugins/kodi-pvr-demo-2.4.3
index 6cc08fa7260c..ad5c3b5dbc00 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-demo-2.4.3
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-demo-2.4.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/tinyxml
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.demo/archive/2.4.3-Krypton.tar.gz -> kodi-pvr-demo-2.4.3.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=028556df1745d1767014c2c529f7530a
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-demo-2.4.6 b/metadata/md5-cache/media-plugins/kodi-pvr-demo-2.4.6
index b7df1cb3ef8f..a4b779e06854 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-demo-2.4.6
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-demo-2.4.6
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/tinyxml
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.demo/archive/2.4.6-Krypton.tar.gz -> kodi-pvr-demo-2.4.6.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=028556df1745d1767014c2c529f7530a
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-demo-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-demo-9999
index 5dc2eea5a93e..8074574f4d4c 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-demo-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-demo-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/kodi-pvr/pvr.demo
 LICENSE=GPL-2
 RDEPEND==media-tv/kodi-9999 =media-libs/kodi-platform-9999 dev-libs/tinyxml
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9178700d04d7e80ce8d2b4866e2cd0ea
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-3.3.11-r1 b/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-3.3.11-r1
index 4befdca02c6b..926f891129ad 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-3.3.11-r1
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-3.3.11-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/tinyxml2
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.dvblink/archive/3.3.11-Krypton.tar.gz -> kodi-pvr-dvblink-3.3.11.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f097a1d4da64120069ffb5635518cdd0
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-3.4.5 b/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-3.4.5
index fca4398edb06..5b6c65fdc80a 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-3.4.5
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-3.4.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/tinyxml2
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.dvblink/archive/3.4.5-Krypton.tar.gz -> kodi-pvr-dvblink-3.4.5.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f097a1d4da64120069ffb5635518cdd0
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-9999
index 1ffed17800dd..3163aee8be8e 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/kodi-pvr/pvr.dvblink
 LICENSE=GPL-2
 RDEPEND==media-tv/kodi-9999 =media-libs/kodi-platform-9999 dev-libs/tinyxml2
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b2617f9eb1ea85abd82d8c0e4c97bb0c
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-2.4.11 b/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-2.4.11
index 5a2a247b7b0b..08f903a11e04 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-2.4.11
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-2.4.11
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/tinyxml
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.dvbviewer/archive/2.4.11-Krypton.tar.gz -> kodi-pvr-dvbviewer-2.4.11.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=189acc687e9b2736562b04a266d72658
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-2.4.7 b/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-2.4.7
index 93e544b50fd0..029ab1f3da46 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-2.4.7
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-2.4.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/tinyxml
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.dvbviewer/archive/2.4.7.tar.gz -> kodi-pvr-dvbviewer-2.4.7.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d0940eb56fed213a1b4e231cdfd4c2ae
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-9999
index a325af89d64a..c410ccd9ddaa 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/kodi-pvr/pvr.dvbviewer
 LICENSE=GPL-2
 RDEPEND==media-tv/kodi-9999* =media-libs/kodi-platform-9999* dev-libs/tinyxml
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b388543262583f3b11930e0036e3d62a
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-filmon-1.4.7 b/metadata/md5-cache/media-plugins/kodi-pvr-filmon-1.4.7
index 9b4beedeebac..9e94055bbff1 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-filmon-1.4.7
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-filmon-1.4.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/jsoncpp
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.filmon/archive/1.4.7-Krypton.tar.gz -> kodi-pvr-filmon-1.4.7.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f5389451c16553a8c3abe2ca5da3a175
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-filmon-1.4.8 b/metadata/md5-cache/media-plugins/kodi-pvr-filmon-1.4.8
index 09bc55732476..129c1718724b 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-filmon-1.4.8
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-filmon-1.4.8
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/jsoncpp
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.filmon/archive/1.4.8-Krypton.tar.gz -> kodi-pvr-filmon-1.4.8.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f5389451c16553a8c3abe2ca5da3a175
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-filmon-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-filmon-9999
index 2f420589f778..695a66ef87c1 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-filmon-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-filmon-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/kodi-pvr/pvr.filmon
 LICENSE=GPL-2
 RDEPEND==media-tv/kodi-9999 =media-libs/kodi-platform-9999 dev-libs/jsoncpp
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0c0948f1595c5da61c991958386abe2f
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-hts-3.4.24 b/metadata/md5-cache/media-plugins/kodi-pvr-hts-3.4.24
index 4906c2158b19..42d412738b19 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-hts-3.4.24
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-hts-3.4.24
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==dev-libs/libplatform-2* =media-libs/kodi-platform-17* =media-tv/kodi-17*
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.hts/archive/3.4.24-Krypton.tar.gz -> kodi-pvr-hts-3.4.24.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=94d75a79e681e5c3de96f41cc3f09895
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-hts-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-hts-9999
index 65f810181fec..ca3f401d4710 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-hts-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-hts-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/kodi-pvr/pvr.hts
 LICENSE=GPL-2
 RDEPEND==dev-libs/libplatform-2* =media-libs/kodi-platform-9999 =media-tv/kodi-9999
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e35e74a2584151b6227dc48c1b8ebc72
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-2.4.11 b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-2.4.11
index 9548cda5451b..12c88837a230 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-2.4.11
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-2.4.11
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==dev-libs/libplatform-2* =media-tv/kodi-17* =media-libs/kodi-platform-17* sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.iptvsimple/archive/2.4.11-Krypton.tar.gz -> kodi-pvr-iptvsimple-2.4.11.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f43c9ba2818385c0e73dd29cbc5f8a99
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-2.4.14 b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-2.4.14
index d318ac2f8999..a45a4b474255 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-2.4.14
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-2.4.14
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==dev-libs/libplatform-2* =media-tv/kodi-17* =media-libs/kodi-platform-17* sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.iptvsimple/archive/2.4.14-Krypton.tar.gz -> kodi-pvr-iptvsimple-2.4.14.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f43c9ba2818385c0e73dd29cbc5f8a99
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-2.4.8 b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-2.4.8
index c2c58c75cadf..6a08c49ce007 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-2.4.8
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-2.4.8
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==dev-libs/libplatform-2* =media-tv/kodi-17* =media-libs/kodi-platform-17* sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.iptvsimple/archive/2.4.8-Krypton.tar.gz -> kodi-pvr-iptvsimple-2.4.8.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f43c9ba2818385c0e73dd29cbc5f8a99
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-9999
index c71df3d7670a..4ce772f1403c 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/kodi-pvr/pvr.iptvsimple
 LICENSE=GPL-2
 RDEPEND==dev-libs/libplatform-2* =media-tv/kodi-9999 =media-libs/kodi-platform-9999 sys-libs/zlib
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9c81477ae84aaa5e02459de2860081b0
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-2.4.16 b/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-2.4.16
index f6c09241d78a..80c9a5919e75 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-2.4.16
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-2.4.16
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/tinyxml
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.mediaportal.tvserver/archive/2.4.16-Krypton.tar.gz -> kodi-pvr-mediaportal-tvserver-2.4.16.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8a3970ac5d34d79dc59e39f26e8fe0b5
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-2.4.19 b/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-2.4.19
index e5943700a808..947a91419e98 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-2.4.19
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-2.4.19
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/tinyxml
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.mediaportal.tvserver/archive/2.4.19v2-Krypton.tar.gz -> kodi-pvr-mediaportal-tvserver-2.4.19.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f214eb5ede8b6e1a9feea61a5fe55381
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-9999
index 7c8d229ce967..70b1c2a5e336 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/kodi-pvr/pvr.mediaportal.tvserver
 LICENSE=GPL-2
 RDEPEND==media-tv/kodi-9999 =media-libs/kodi-platform-9999 dev-libs/tinyxml
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e91319ad37a0c460be77e19e9e0fdcec
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-4.15.3 b/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-4.15.3
index 2ccaaab3af96..b5b3f4aaa3d3 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-4.15.3
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-4.15.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib =media-tv/kodi-17* =media-libs/kodi-platform-17*
 SLOT=0
 SRC_URI=https://github.com/janbar/pvr.mythtv/archive/4.15.3.tar.gz -> kodi-pvr-mythtv-4.15.3.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=875e55c5a0609ff516a205a3e4a44bc4
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-9999
index 5602f30158ae..a46447aa9138 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/janbar/pvr.mythtv
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib =media-tv/kodi-9999 =media-libs/kodi-platform-9999
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ee5f783755de4bb634777b6f2ea0eb8a
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-2.4.11 b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-2.4.11
index 54393526d857..e5add1eb1100 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-2.4.11
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-2.4.11
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/tinyxml
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.nextpvr/archive/2.4.11-Krypton.tar.gz -> kodi-pvr-nextpvr-2.4.11.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7d73bf1807a52922f7cdbb8f6efc09a6
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-2.4.13 b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-2.4.13
index 6c281c4ca4fd..e36d0c21f70d 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-2.4.13
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-2.4.13
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/tinyxml
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.nextpvr/archive/2.4.13-Krypton.tar.gz -> kodi-pvr-nextpvr-2.4.13.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7d73bf1807a52922f7cdbb8f6efc09a6
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-9999
index ff613ea1d96e..523c5dc8bde3 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/kodi-pvr/pvr.nextpvr
 LICENSE=GPL-2
 RDEPEND==media-tv/kodi-9999 =media-libs/kodi-platform-9999 dev-libs/tinyxml
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b8694e9bb52edaa7a72297e98ac7e613
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-njoy-2.4.2 b/metadata/md5-cache/media-plugins/kodi-pvr-njoy-2.4.2
index 9412042e2334..fccc5b8ac90a 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-njoy-2.4.2
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-njoy-2.4.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/tinyxml
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.njoy/archive/2.4.2-Krypton.tar.gz -> kodi-pvr-njoy-2.4.2.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8fef5bd3243ba518f7803d1721b3ac1e
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-njoy-2.4.3 b/metadata/md5-cache/media-plugins/kodi-pvr-njoy-2.4.3
index 9cb88356a6f9..d6ad543a6c7f 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-njoy-2.4.3
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-njoy-2.4.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/tinyxml
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.njoy/archive/2.4.3-Krypton.tar.gz -> kodi-pvr-njoy-2.4.3.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8fef5bd3243ba518f7803d1721b3ac1e
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-njoy-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-njoy-9999
index 2018fcca5f4d..3d05090063f5 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-njoy-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-njoy-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/kodi-pvr/pvr.njoy
 LICENSE=GPL-2
 RDEPEND==media-tv/kodi-9999 =media-libs/kodi-platform-9999 dev-libs/tinyxml
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b76aefa2ed76daa11c4ae6a68fcd06e7
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-pctv-1.4.5 b/metadata/md5-cache/media-plugins/kodi-pvr-pctv-1.4.5
index a1ba2241d54a..5aa0000a3a27 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-pctv-1.4.5
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-pctv-1.4.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/jsoncpp
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.pctv/archive/1.4.5-Krypton.tar.gz -> kodi-pvr-pctv-1.4.5.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5de9cf47adf06d2d0066b314968c7d42
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-pctv-1.4.7 b/metadata/md5-cache/media-plugins/kodi-pvr-pctv-1.4.7
index 88c1dea7f442..ca2f2bf9eb44 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-pctv-1.4.7
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-pctv-1.4.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/jsoncpp
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.pctv/archive/1.4.7-Krypton.tar.gz -> kodi-pvr-pctv-1.4.7.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5de9cf47adf06d2d0066b314968c7d42
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-pctv-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-pctv-9999
index 00ebc8416062..54ddbf0c2018 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-pctv-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-pctv-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/kodi-pvr/pvr.pctv
 LICENSE=GPL-2
 RDEPEND==media-tv/kodi-9999 =media-libs/kodi-platform-9999 dev-libs/jsoncpp
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e24e28c727673a18b2ad8d5e9873f287
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-2.8.3 b/metadata/md5-cache/media-plugins/kodi-pvr-stalker-2.8.3
index 20a174155de2..86bf28f9c383 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-2.8.3
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-stalker-2.8.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/jsoncpp dev-libs/tinyxml
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.stalker/archive/2.8.3-Krypton.tar.gz -> kodi-pvr-stalker-2.8.3.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5a996942a149906791f36e5e7340243f
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-2.8.6 b/metadata/md5-cache/media-plugins/kodi-pvr-stalker-2.8.6
index d87d11af7ded..f59931643d2d 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-2.8.6
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-stalker-2.8.6
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/jsoncpp dev-libs/tinyxml
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.stalker/archive/2.8.6-Krypton.tar.gz -> kodi-pvr-stalker-2.8.6.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5a996942a149906791f36e5e7340243f
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-stalker-9999
index 4f947f319f26..a2bc83051653 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-stalker-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/kodi-pvr/pvr.stalker
 LICENSE=GPL-2
 RDEPEND==media-tv/kodi-9999 =media-libs/kodi-platform-9999 dev-libs/jsoncpp dev-libs/tinyxml
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bf8ac549901468439d6e91a5f3628d3c
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-4.0.2 b/metadata/md5-cache/media-plugins/kodi-pvr-vbox-4.0.2
index bd1e3bc6b952..db04ef077db6 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-4.0.2
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vbox-4.0.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/kodi media-libs/kodi-platform dev-libs/tinyxml2
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.vbox/archive/4.0.2.tar.gz -> kodi-pvr-vbox-4.0.2.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7112b8f5563903976884de76f583a5ef
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-vbox-9999
index 436f5e3f9122..2823d7c20880 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vbox-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/kodi-pvr/pvr.vbox
 LICENSE=GPL-2
 RDEPEND=media-tv/kodi media-libs/kodi-platform dev-libs/tinyxml2
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7112b8f5563903976884de76f583a5ef
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-2.6.17 b/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-2.6.17
index c29edb4f750a..364c564d9c67 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-2.6.17
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-2.6.17
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.vdr.vnsi/archive/v2.6.17.tar.gz -> kodi-pvr-vdr-vnsi-2.6.17.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a68aa2281b18e528a92625793fb0b70c
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-9999
index ee02d3c4adaf..152cfa2f57d2 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/fernetmenta/pvr.vdr.vnsi
 LICENSE=GPL-2
 RDEPEND==media-tv/kodi-9999 =media-libs/kodi-platform-9999 virtual/opengl
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=664764d44c07338dbeeda8ea5f42d708
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-2.4.10 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-2.4.10
index 3f59c6b21f39..0f2e8232ac5a 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-2.4.10
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-2.4.10
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/tinyxml
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/2.4.10-Krypton.tar.gz -> kodi-pvr-vuplus-2.4.10.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f23c89106330aa5ca8d71a2e4e1849d1
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-2.4.6 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-2.4.6
index 78b025ee5f55..76f8ad7df452 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-2.4.6
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-2.4.6
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/tinyxml
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/2.4.6-Krypton.tar.gz -> kodi-pvr-vuplus-2.4.6.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f23c89106330aa5ca8d71a2e4e1849d1
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-9999
index 030a5f7d4b17..5ece6d1896db 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/kodi-pvr/pvr.vuplus
 LICENSE=GPL-2
 RDEPEND==media-tv/kodi-9999 =media-libs/kodi-platform-9999 dev-libs/tinyxml
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b78af073df5303a4e17db398f74b8424
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-wmc-1.4.7 b/metadata/md5-cache/media-plugins/kodi-pvr-wmc-1.4.7
index 29e18652da76..635fa764ef85 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-wmc-1.4.7
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-wmc-1.4.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17*
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.wmc/archive/1.4.7-Krypton.tar.gz -> kodi-pvr-wmc-1.4.7.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=01107474a708cc260eb53822e9213e80
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-wmc-1.4.9 b/metadata/md5-cache/media-plugins/kodi-pvr-wmc-1.4.9
index 333a86b93900..095f7b3ac75a 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-wmc-1.4.9
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-wmc-1.4.9
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17*
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.wmc/archive/1.4.9v2-Krypton.tar.gz -> kodi-pvr-wmc-1.4.9.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0d843f1e8a36825eb824bc62b8acfb6e
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-wmc-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-wmc-9999
index 1500326f36d2..a4d2a667e2d2 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-wmc-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-wmc-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/kodi-pvr/pvr.wmc
 LICENSE=GPL-2
 RDEPEND==media-tv/kodi-9999 =media-libs/kodi-platform-9999
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4fef3ee054e2337eee8c7eb9298a8f1e
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-1.1.0 b/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-1.1.0
index 63bc16f2320d..159f821d019e 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-1.1.0
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-1.1.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/notspiff/screensaver.asteroids/archive/v1.1.0.tar.gz -> kodi-screensaver-asteroids-1.1.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e3a949dd15a2f6b3984ca455d89430fe
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-9999 b/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-9999
index b23037342118..9ad6e4bbb974 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-9999
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-9999
@@ -5,5 +5,5 @@ EAPI=6
 HOMEPAGE=https://github.com/notspiff/screensaver.asteroids
 LICENSE=GPL-2
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e3a949dd15a2f6b3984ca455d89430fe
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-1.1.0 b/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-1.1.0
index 7e311a902155..166037bbb8a4 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-1.1.0
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-1.1.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/notspiff/screensaver.biogenesis/archive/v1.1.0.tar.gz -> kodi-screensaver-biogenesis-1.1.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=de04e467e06e017dd2a272d889e9d53e
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-9999 b/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-9999
index 0304743f44e9..a6b19aa1bcff 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-9999
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-9999
@@ -5,5 +5,5 @@ EAPI=6
 HOMEPAGE=https://github.com/notspiff/screensaver.biogenesis
 LICENSE=GPL-2
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=de04e467e06e017dd2a272d889e9d53e
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-crystalmorph-9999 b/metadata/md5-cache/media-plugins/kodi-screensaver-crystalmorph-9999
index 547c717c13bc..04d4d2fd7f33 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-crystalmorph-9999
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-crystalmorph-9999
@@ -5,5 +5,5 @@ EAPI=6
 HOMEPAGE=https://github.com/notspiff/screensaver.crystalmorph
 LICENSE=GPL-2
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5c87c244367262fde30fef7d56144c31
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-1.1.0 b/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-1.1.0
index 84e3fc2f8278..08ca487fd3c0 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-1.1.0
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-1.1.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/notspiff/screensaver.greynetic/archive/v1.1.0.tar.gz -> kodi-screensaver-greynetic-1.1.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2380279946c75fe98d37695b12d67aba
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-9999 b/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-9999
index 2c3d08b4a907..cf0bf4f769d6 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-9999
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-9999
@@ -5,5 +5,5 @@ EAPI=6
 HOMEPAGE=https://github.com/notspiff/screensaver.greynetic
 LICENSE=GPL-2
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2380279946c75fe98d37695b12d67aba
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-1.1.0 b/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-1.1.0
index c662652cc4ed..459e000bc08e 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-1.1.0
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-1.1.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/notspiff/screensaver.pingpong/archive/v1.1.0.tar.gz -> kodi-screensaver-pingpong-1.1.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f30b4649e6cb5aa75fb2f1f4229ff900
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-9999 b/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-9999
index 97eeeebe81f8..47a785213047 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-9999
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-9999
@@ -5,5 +5,5 @@ EAPI=6
 HOMEPAGE=https://github.com/notspiff/screensaver.pingpong
 LICENSE=GPL-2
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f30b4649e6cb5aa75fb2f1f4229ff900
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-1.1.0 b/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-1.1.0
index 426931ce4afc..068203249950 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-1.1.0
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-1.1.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/notspiff/screensaver.pyro/archive/v1.1.0.tar.gz -> kodi-screensaver-pyro-1.1.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9824a97f0e0497d94888f089d84a7056
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-9999 b/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-9999
index e7429bb588e1..0c64e0c2ee77 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-9999
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-9999
@@ -5,5 +5,5 @@ EAPI=6
 HOMEPAGE=https://github.com/notspiff/screensaver.pyro
 LICENSE=GPL-2
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9824a97f0e0497d94888f089d84a7056
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-rsxs-1.4.0 b/metadata/md5-cache/media-plugins/kodi-screensaver-rsxs-1.4.0
index 1db4b60b04e2..4cb8bf5707e7 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-rsxs-1.4.0
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-rsxs-1.4.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libpng:= sys-libs/zlib virtual/opengl media-libs/glu
 SLOT=0
 SRC_URI=https://github.com/notspiff/screensavers.rsxs/archive/v1.4.0.tar.gz -> kodi-screensaver-rsxs-1.4.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5019d118ce73e3aae5751c06bbc9f3b4
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-rsxs-9999 b/metadata/md5-cache/media-plugins/kodi-screensaver-rsxs-9999
index f1c7cdecbeb9..8019252c0421 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-rsxs-9999
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-rsxs-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/notspiff/screensavers.rsxs
 LICENSE=GPL-2
 RDEPEND=media-libs/libpng:= sys-libs/zlib virtual/opengl media-libs/glu
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5019d118ce73e3aae5751c06bbc9f3b4
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-libarchive-9999 b/metadata/md5-cache/media-plugins/kodi-vfs-libarchive-9999
index c9148388da37..a17ce0b19cc4 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-libarchive-9999
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-libarchive-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/notspiff/vfs.libarchive
 IUSE=libressl
 LICENSE=GPL-2
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=69dd828c3f15dfd8d40bedcf957a9830
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-rar-9999 b/metadata/md5-cache/media-plugins/kodi-vfs-rar-9999
index 2676e409757e..06e8e58a56d2 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-rar-9999
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-rar-9999
@@ -5,5 +5,5 @@ EAPI=6
 HOMEPAGE=https://github.com/notspiff/vfs.rar
 LICENSE=GPL-2
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9b666a4624ae3c9fce2dadf6febb3dc7
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-sacd-9999 b/metadata/md5-cache/media-plugins/kodi-vfs-sacd-9999
index 304ca78b7652..d88b6b4c4ead 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-sacd-9999
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-sacd-9999
@@ -5,5 +5,5 @@ EAPI=6
 HOMEPAGE=https://github.com/notspiff/vfs.sacd
 LICENSE=GPL-2
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e219ea43541f0c4815fc64c4b17e509c
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-sftp-9999 b/metadata/md5-cache/media-plugins/kodi-vfs-sftp-9999
index 19f00f76c097..d0ac90fb0b9a 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-sftp-9999
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-sftp-9999
@@ -5,5 +5,5 @@ EAPI=6
 HOMEPAGE=https://github.com/notspiff/vfs.sftp
 LICENSE=GPL-2
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f0e3bce046b97ae9c5ae337b5f3ce8a0
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-4.1.0 b/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-4.1.0
index eeb4c0f71ba3..76f79fe4c1dc 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-4.1.0
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-4.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/kodi virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/notspiff/visualization.fishbmc/archive/v4.1.0.tar.gz -> kodi-visualization-fishbmc-4.1.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=955179d847a34cdf068e8df1f9badb3b
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-9999 b/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-9999
index fdb7ab343c8c..9fac4bd8ab77 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-9999
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/notspiff/visualization.fishbmc
 LICENSE=GPL-2
 RDEPEND=media-tv/kodi virtual/opengl
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=955179d847a34cdf068e8df1f9badb3b
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-goom-1.1.0 b/metadata/md5-cache/media-plugins/kodi-visualization-goom-1.1.0
index 78d0c9f04cef..5216c8ccabcf 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-goom-1.1.0
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-goom-1.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/kodi virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/notspiff/visualization.goom/archive/v1.1.0.tar.gz -> kodi-visualization-goom-1.1.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f751a435ce3e222600c511d3ffef6ad1
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-goom-9999 b/metadata/md5-cache/media-plugins/kodi-visualization-goom-9999
index 52763fec51ce..86b250977a3f 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-goom-9999
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-goom-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/notspiff/visualization.goom
 LICENSE=GPL-2
 RDEPEND=media-tv/kodi virtual/opengl
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f751a435ce3e222600c511d3ffef6ad1
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-nastyfft-1.1.0 b/metadata/md5-cache/media-plugins/kodi-visualization-nastyfft-1.1.0
index eaf3a7248113..31f675b68293 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-nastyfft-1.1.0
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-nastyfft-1.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/kodi virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/notspiff/visualization.nastyfft/archive/v1.1.0.tar.gz -> kodi-visualization-nastyfft-1.1.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7da49436ae071ddacd66b4690392eb85
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-nastyfft-9999 b/metadata/md5-cache/media-plugins/kodi-visualization-nastyfft-9999
index 33d11a26f6dc..ee7eea5a0812 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-nastyfft-9999
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-nastyfft-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/notspiff/visualization.nastyfft
 LICENSE=GPL-2
 RDEPEND=media-tv/kodi virtual/opengl
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7da49436ae071ddacd66b4690392eb85
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-projectm-1.2.0 b/metadata/md5-cache/media-plugins/kodi-visualization-projectm-1.2.0
index a170699fbfb9..ebb32ff6c6fb 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-projectm-1.2.0
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-projectm-1.2.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* media-libs/libprojectm virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/notspiff/visualization.projectm/archive/v1.2.0.tar.gz -> kodi-visualization-projectm-1.2.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=90671563105304990d4ee10c9d4b09ff
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-projectm-1.2.1 b/metadata/md5-cache/media-plugins/kodi-visualization-projectm-1.2.1
index ffbbcc669f49..fcfa15f60ec6 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-projectm-1.2.1
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-projectm-1.2.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* media-libs/libprojectm virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/notspiff/visualization.projectm/archive/v1.2.1.tar.gz -> kodi-visualization-projectm-1.2.1.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=90671563105304990d4ee10c9d4b09ff
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-projectm-9999 b/metadata/md5-cache/media-plugins/kodi-visualization-projectm-9999
index 436d8ea2a7fd..d434675bb574 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-projectm-9999
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-projectm-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/notspiff/visualization.projectm
 LICENSE=GPL-2
 RDEPEND==media-tv/kodi-9999 =media-libs/kodi-platform-9999 media-libs/libprojectm virtual/opengl
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bc81a658e0202c566ecb82af7847bd75
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-1.1.5 b/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-1.1.5
index 62b4ab8fd3d3..e165a6e7d7fa 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-1.1.5
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-1.1.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==dev-libs/libplatform-2* media-tv/kodi virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/notspiff/visualization.shadertoy/archive/v1.1.5.tar.gz -> kodi-visualization-shadertoy-1.1.5.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=de2a93f41c1234af69c9cfb9193f0fd4
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-9999 b/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-9999
index 24a3eb5acf25..198c34d9aed0 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-9999
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/notspiff/visualization.shadertoy
 LICENSE=GPL-2
 RDEPEND==dev-libs/libplatform-2* media-tv/kodi virtual/opengl
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=de2a93f41c1234af69c9cfb9193f0fd4
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-1.1.1 b/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-1.1.1
index cb46d55b4fcd..b4431eb1fc19 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-1.1.1
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-1.1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/kodi virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/notspiff/visualization.spectrum/archive/v1.1.1.tar.gz -> kodi-visualization-spectrum-1.1.1.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a6ddc990f638208474bd8d62e17a494a
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-9999 b/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-9999
index 70bd40f37e50..626b5d72dcf9 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-9999
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/notspiff/visualization.spectrum
 LICENSE=GPL-2
 RDEPEND=media-tv/kodi virtual/opengl
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a6ddc990f638208474bd8d62e17a494a
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-starburst-9999 b/metadata/md5-cache/media-plugins/kodi-visualization-starburst-9999
index bfbdec83041a..cfd211c86b97 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-starburst-9999
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-starburst-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/notspiff/visualization.starburst
 LICENSE=GPL-2
 RDEPEND=media-tv/kodi virtual/opengl
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=50cfd18ec617b153a3be78cd1eeb8eef
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-waveform-1.1.0 b/metadata/md5-cache/media-plugins/kodi-visualization-waveform-1.1.0
index 25567b8fdd63..02cac7cd2fcb 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-waveform-1.1.0
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-waveform-1.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/kodi virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/notspiff/visualization.waveform/archive/v1.1.0.tar.gz -> kodi-visualization-waveform-1.1.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b25ac5c3a2ef3a4d50bd713761c654c5
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-waveform-9999 b/metadata/md5-cache/media-plugins/kodi-visualization-waveform-9999
index 9b0891709a3c..50b3c8193c92 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-waveform-9999
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-waveform-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/notspiff/visualization.waveform
 LICENSE=GPL-2
 RDEPEND=media-tv/kodi virtual/opengl
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b25ac5c3a2ef3a4d50bd713761c654c5
diff --git a/metadata/md5-cache/media-plugins/libvisual-projectm-2.1.0-r1 b/metadata/md5-cache/media-plugins/libvisual-projectm-2.1.0-r1
index 5c0449229b3e..f275f604233c 100644
--- a/metadata/md5-cache/media-plugins/libvisual-projectm-2.1.0-r1
+++ b/metadata/md5-cache/media-plugins/libvisual-projectm-2.1.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=media-libs/libprojectm-2.1.0 media-libs/libsdl =media-libs/libvisual-0.4* virtual/opengl
 SLOT=0
 SRC_URI=mirror://sourceforge/projectm/projectM-complete-2.1.0-Source.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8f86fe139523cf36f7e767c5eb8071ea
diff --git a/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.2.2 b/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.2.2
index 54a2bf75048e..534359c2108b 100644
--- a/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.2.2
+++ b/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.2.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsamplerate >=media-libs/taglib-1.10 media-sound/mpg123 =media-sound/qmmp-1.2* dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=http://qmmp.ylsoftware.com/files/plugins/qmmp-plugin-pack-1.2.2.tar.bz2
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2ebd934c2114207ed65e7bb9d23f4129
diff --git a/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.2.3 b/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.2.3
index 8b9a2ae8beb0..a8ed09420bee 100644
--- a/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.2.3
+++ b/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.2.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsamplerate >=media-libs/taglib-1.10 media-sound/mpg123 =media-sound/qmmp-1.2* dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=http://qmmp.ylsoftware.com/files/plugins/qmmp-plugin-pack-1.2.3.tar.bz2
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c06bcf2b10ef4cd2153d6845f22fdf21
diff --git a/metadata/md5-cache/media-plugins/vdr-imonlcd-0.0.5-r1 b/metadata/md5-cache/media-plugins/vdr-imonlcd-0.0.5-r1
index 6a9f7283d7f5..141d261d0207 100644
--- a/metadata/md5-cache/media-plugins/vdr-imonlcd-0.0.5-r1
+++ b/metadata/md5-cache/media-plugins/vdr-imonlcd-0.0.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/freetype >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/408/vdr-imonlcd-0.0.5.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=6913c02b9072468a724ecc971d920c2c
diff --git a/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.1 b/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.1
index 1eb36aea98bd..57db6367bf25 100644
--- a/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.1
+++ b/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/freetype >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1327/vdr-imonlcd-1.0.1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=ed341481962743282a93dab0478794a2
diff --git a/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.2 b/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.2
index d5cc28a369b6..9c8e018b5607 100644
--- a/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.2
+++ b/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/freetype >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/2086/vdr-imonlcd-1.0.2.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=02ff8d4077d16f6379f2ddf428b88acc
diff --git a/metadata/md5-cache/media-radio/KochMorse-0.99.6-r1 b/metadata/md5-cache/media-radio/KochMorse-0.99.6-r1
index 79009712cb62..18c1639bf975 100644
--- a/metadata/md5-cache/media-radio/KochMorse-0.99.6-r1
+++ b/metadata/md5-cache/media-radio/KochMorse-0.99.6-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyalsaaudio[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://KochMorse.googlecode.com/files/KochMorse-0.99.6.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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a1b8db91117ffe5954d1252e9af5d829
diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index c1220b566602..5922f1b3c1b0 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/svxlink-17.12.1 b/metadata/md5-cache/media-radio/svxlink-17.12.1
index eaa5b795a79b..af7051cfe3df 100644
--- a/metadata/md5-cache/media-radio/svxlink-17.12.1
+++ b/metadata/md5-cache/media-radio/svxlink-17.12.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=dev-lang/tcl:0 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/alsa-lib media-sound/gsm dev-libs/libgcrypt:0 media-libs/speex media-libs/opus dev-libs/libsigc++:2 dev-libs/popt
 SLOT=0
 SRC_URI=https://github.com/sm0svx/svxlink/archive/17.12.1.tar.gz -> svxlink-17.12.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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=28c93aa8f194d575bfe203092a3f2c63
diff --git a/metadata/md5-cache/media-radio/svxlink-17.12.2 b/metadata/md5-cache/media-radio/svxlink-17.12.2
index a0892244a6ee..1d6ac4db30a0 100644
--- a/metadata/md5-cache/media-radio/svxlink-17.12.2
+++ b/metadata/md5-cache/media-radio/svxlink-17.12.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=dev-lang/tcl:0 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/alsa-lib media-sound/gsm dev-libs/libgcrypt:0 media-libs/speex media-libs/opus dev-libs/libsigc++:2 dev-libs/popt
 SLOT=0
 SRC_URI=https://github.com/sm0svx/svxlink/archive/17.12.2.tar.gz -> svxlink-17.12.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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=56157c1ef1c3552895ec473c0f5bbacc
diff --git a/metadata/md5-cache/media-radio/tqsl-2.3.1 b/metadata/md5-cache/media-radio/tqsl-2.3.1
index 4b6460b15790..94fbbb92219f 100644
--- a/metadata/md5-cache/media-radio/tqsl-2.3.1
+++ b/metadata/md5-cache/media-radio/tqsl-2.3.1
@@ -8,5 +8,5 @@ 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=mirror://sourceforge/trustedqsl/tqsl-2.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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=c51740016c66b94c26dcb37d8eae4263
diff --git a/metadata/md5-cache/media-radio/wsjtx-1.8.0 b/metadata/md5-cache/media-radio/wsjtx-1.8.0
index 88e92acfe331..783aad3c9769 100644
--- a/metadata/md5-cache/media-radio/wsjtx-1.8.0
+++ b/metadata/md5-cache/media-radio/wsjtx-1.8.0
@@ -9,5 +9,5 @@ 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 doc? ( dev-ruby/asciidoctor )
 SLOT=0
 SRC_URI=mirror://sourceforge/wsjt/wsjtx-1.8.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=97356aaba95e3f47d32249682e61dc36
diff --git a/metadata/md5-cache/media-radio/wsjtx-1.9.1 b/metadata/md5-cache/media-radio/wsjtx-1.9.1
index 307e0e3ace24..7696cff94844 100644
--- a/metadata/md5-cache/media-radio/wsjtx-1.9.1
+++ b/metadata/md5-cache/media-radio/wsjtx-1.9.1
@@ -9,5 +9,5 @@ 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 doc? ( dev-ruby/asciidoctor )
 SLOT=0
 SRC_URI=mirror://sourceforge/wsjt/wsjtx-1.9.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=15218cf0153862cb6ca963a472db7113
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 0d1a435bbd59..69d34266a8d7 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/alsa-tools-1.1.6 b/metadata/md5-cache/media-sound/alsa-tools-1.1.6
index c6de5308964e..bd6d725f4932 100644
--- a/metadata/md5-cache/media-sound/alsa-tools-1.1.6
+++ b/metadata/md5-cache/media-sound/alsa-tools-1.1.6
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/media-sound/apulse-0.1.10 b/metadata/md5-cache/media-sound/apulse-0.1.10
index f36fa1663dcc..6fee0d28d103 100644
--- a/metadata/md5-cache/media-sound/apulse-0.1.10
+++ b/metadata/md5-cache/media-sound/apulse-0.1.10
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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 ccd3aa9dbb63..b63539f72d23 100644
--- a/metadata/md5-cache/media-sound/apulse-0.1.12-r4
+++ b/metadata/md5-cache/media-sound/apulse-0.1.12-r4
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=77a6b6c532c93e1187bec8e803814265
+_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
diff --git a/metadata/md5-cache/media-sound/ario-1.5.1-r1 b/metadata/md5-cache/media-sound/ario-1.5.1-r1
index e736f4082e64..3a340c002462 100644
--- a/metadata/md5-cache/media-sound/ario-1.5.1-r1
+++ b/metadata/md5-cache/media-sound/ario-1.5.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0= dev-libs/libunique:1 dev-libs/libxml2:2 media-libs/libmpdclient net-misc/curl net-libs/gnutls >=x11-libs/gtk+-2.16:2 audioscrobbler? ( net-libs/libsoup:2.4 ) dbus? ( dev-libs/dbus-glib ) libnotify? ( x11-libs/libnotify ) python? ( dev-python/pygtk:2 dev-python/pygobject:2 ) taglib? ( media-libs/taglib ) zeroconf? ( net-dns/avahi )
 SLOT=0
 SRC_URI=mirror://sourceforge/ario-player/ario-1.5.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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c6d4f10516b5940aa0766ba47dcd6e6d
diff --git a/metadata/md5-cache/media-sound/asunder-2.9.2-r2 b/metadata/md5-cache/media-sound/asunder-2.9.2-r2
index 8d0a8d4316e9..d5e31610e908 100644
--- a/metadata/md5-cache/media-sound/asunder-2.9.2-r2
+++ b/metadata/md5-cache/media-sound/asunder-2.9.2-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libcddb-0.9.5 media-sound/cdparanoia x11-libs/gtk+:2 flac? ( media-libs/flac ) mac? ( media-sound/mac ) mp3? ( media-sound/lame ) musepack? ( media-sound/musepack-tools ) opus? ( media-sound/opus-tools ) vorbis? ( media-sound/vorbis-tools ) wavpack? ( media-sound/wavpack )
 SLOT=0
 SRC_URI=http://littlesvr.ca/asunder/releases/asunder-2.9.2.tar.bz2
-_eclasses_=xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3f63ded4fe6c1910a021e3518b19198b
diff --git a/metadata/md5-cache/media-sound/asunder-2.9.3-r1 b/metadata/md5-cache/media-sound/asunder-2.9.3-r1
index 5c67e3595035..50278b6f51e3 100644
--- a/metadata/md5-cache/media-sound/asunder-2.9.3-r1
+++ b/metadata/md5-cache/media-sound/asunder-2.9.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libcddb-0.9.5 media-sound/cdparanoia x11-libs/gtk+:2 flac? ( media-libs/flac ) mac? ( media-sound/mac ) mp3? ( media-sound/lame ) musepack? ( media-sound/musepack-tools ) opus? ( media-sound/opus-tools ) vorbis? ( media-sound/vorbis-tools ) wavpack? ( media-sound/wavpack )
 SLOT=0
 SRC_URI=http://littlesvr.ca/asunder/releases/asunder-2.9.3.tar.bz2
-_eclasses_=xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=56b19e373c50b190f506260213890dfa
diff --git a/metadata/md5-cache/media-sound/audacious-3.9 b/metadata/md5-cache/media-sound/audacious-3.9
index 91492cf748e0..526909330736 100644
--- a/metadata/md5-cache/media-sound/audacious-3.9
+++ b/metadata/md5-cache/media-sound/audacious-3.9
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/dbus-glib-0.60 >=dev-libs/glib-2.28 >=x11-libs/cairo-1.2.6 >=
 REQUIRED_USE=^^ ( gtk gtk3 qt5 )
 SLOT=0
 SRC_URI=!gtk3? ( https://distfiles.audacious-media-player.org/audacious-3.9.tar.bz2 ) gtk3? ( https://distfiles.audacious-media-player.org/audacious-3.9-gtk3.tar.bz2 ) mirror://gentoo/gentoo_ice-xmms-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0026d2bea18eb535014b455faa7a93ed
diff --git a/metadata/md5-cache/media-sound/audacious-9999 b/metadata/md5-cache/media-sound/audacious-9999
index 3945969398e1..7ea370e0a3e8 100644
--- a/metadata/md5-cache/media-sound/audacious-9999
+++ b/metadata/md5-cache/media-sound/audacious-9999
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/dbus-glib-0.60 >=dev-libs/glib-2.28 >=x11-libs/cairo-1.2.6 >=
 REQUIRED_USE=^^ ( gtk gtk3 qt5 )
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0026d2bea18eb535014b455faa7a93ed
diff --git a/metadata/md5-cache/media-sound/audacity-2.2.2 b/metadata/md5-cache/media-sound/audacity-2.2.2
index 84272251c226..51331c6a0c9a 100644
--- a/metadata/md5-cache/media-sound/audacity-2.2.2
+++ b/metadata/md5-cache/media-sound/audacity-2.2.2
@@ -11,5 +11,5 @@ REQUIRED_USE=soundtouch? ( midi )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~polynomial-c/dist/audacity-minsrc-2.2.2.tar.xz doc? ( https://dev.gentoo.org/~polynomial-c/dist/audacity-manual-2.2.2.zip )
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ac9adc5442c9f32d5129c8cc5b3ead7b
diff --git a/metadata/md5-cache/media-sound/audex-0.95_pre20170727 b/metadata/md5-cache/media-sound/audex-0.95_pre20170727
index 391a59bb4010..c5fb4ab71137 100644
--- a/metadata/md5-cache/media-sound/audex-0.95_pre20170727
+++ b/metadata/md5-cache/media-sound/audex-0.95_pre20170727
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/beets-1.4.7 b/metadata/md5-cache/media-sound/beets-1.4.7
index 81fe7ac1b789..defdc9a63bc6 100644
--- a/metadata/md5-cache/media-sound/beets-1.4.7
+++ b/metadata/md5-cache/media-sound/beets-1.4.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/beets/beets-1.4.7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a2799596ef863e929fa7858d55b038e6
diff --git a/metadata/md5-cache/media-sound/bempc-0.11_p20160207 b/metadata/md5-cache/media-sound/bempc-0.11_p20160207
index d922a25d2c5a..41f7adf99477 100644
--- a/metadata/md5-cache/media-sound/bempc-0.11_p20160207
+++ b/metadata/md5-cache/media-sound/bempc-0.11_p20160207
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/libmpdclient
 SLOT=0
 SRC_URI=https://sourceforge.net/code-snapshots/git/b/be/be-mpc/code.git/be-mpc-code-783ea4e61cbfe54250e809498b1496d6cbd5afa1.zip -> bempc-0.11_p20160207.zip
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=90bfafadab45ec3dc72ee4c09dd504ea
diff --git a/metadata/md5-cache/media-sound/bpmdetect-0.7.0_pre20170810 b/metadata/md5-cache/media-sound/bpmdetect-0.7.0_pre20170810
index 82fe0b4a7a29..bf320e10085c 100644
--- a/metadata/md5-cache/media-sound/bpmdetect-0.7.0_pre20170810
+++ b/metadata/md5-cache/media-sound/bpmdetect-0.7.0_pre20170810
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 media-libs/flac media-libs/libmad media-libs/libvorbis media-libs/portaudio media-libs/taglib
 SLOT=0
 SRC_URI=https://github.com/Tatsh/bpmdetect/archive/b13aac15904c1f821b1739d00445f49432705387.tar.gz -> bpmdetect-0.7.0_pre20170810.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ae3f05e4d44f46489c300370fa5a0580
diff --git a/metadata/md5-cache/media-sound/bristol-0.60.11 b/metadata/md5-cache/media-sound/bristol-0.60.11
deleted file mode 100644
index 716db83cbc53..000000000000
--- a/metadata/md5-cache/media-sound/bristol-0.60.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=media-sound/jack-audio-connection-kit-0.109.2 alsa? ( >=media-libs/alsa-lib-1.0.0 ) x11-libs/libX11 virtual/pkgconfig 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=Synthesizer keyboard emulation package: Moog, Hammond and others
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/bristol
-IUSE=alsa oss static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-sound/jack-audio-connection-kit-0.109.2 alsa? ( >=media-libs/alsa-lib-1.0.0 ) x11-libs/libX11
-SLOT=0
-SRC_URI=mirror://sourceforge/bristol/bristol-0.60.11.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_=014bbadc04d6f4053e737865fb676770
diff --git a/metadata/md5-cache/media-sound/bristol-0.60.11-r1 b/metadata/md5-cache/media-sound/bristol-0.60.11-r1
new file mode 100644
index 000000000000..977e91fb6f81
--- /dev/null
+++ b/metadata/md5-cache/media-sound/bristol-0.60.11-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig 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
+DEFINED_PHASES=configure install prepare
+DEPEND=>=media-sound/jack-audio-connection-kit-0.109.2 x11-libs/libX11 alsa? ( >=media-libs/alsa-lib-1.0.0 )
+DESCRIPTION=Synthesizer keyboard emulation package: Moog, Hammond and others
+EAPI=7
+HOMEPAGE=https://sourceforge.net/projects/bristol
+IUSE=alsa oss static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-sound/jack-audio-connection-kit-0.109.2 x11-libs/libX11 alsa? ( >=media-libs/alsa-lib-1.0.0 )
+SLOT=0
+SRC_URI=mirror://sourceforge/bristol/bristol-0.60.11.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=521180e07d929f6c43036dd88592b726
diff --git a/metadata/md5-cache/media-sound/bristol-0.60.9 b/metadata/md5-cache/media-sound/bristol-0.60.9
deleted file mode 100644
index f2d8adf44f0c..000000000000
--- a/metadata/md5-cache/media-sound/bristol-0.60.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-sound/jack-audio-connection-kit-0.109.2 alsa? ( >=media-libs/alsa-lib-1.0.0 ) x11-libs/libX11 virtual/pkgconfig x11-base/xorg-proto >=app-portage/elt-patches-20170815
-DESCRIPTION=Synthesizer keyboard emulation package: Moog, Hammond and others
-EAPI=4
-HOMEPAGE=https://sourceforge.net/projects/bristol
-IUSE=alsa oss static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-sound/jack-audio-connection-kit-0.109.2 alsa? ( >=media-libs/alsa-lib-1.0.0 ) x11-libs/libX11
-SLOT=0
-SRC_URI=mirror://sourceforge/bristol/bristol-0.60.9.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_=bc52010008b187007d5657079ea9c451
diff --git a/metadata/md5-cache/media-sound/cantata-2.2.0 b/metadata/md5-cache/media-sound/cantata-2.2.0
index 68545a56a1c6..52bdfdaf177f 100644
--- a/metadata/md5-cache/media-sound/cantata-2.2.0
+++ b/metadata/md5-cache/media-sound/cantata-2.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=?? ( cdda cdio ) cdda? ( udisks || ( cddb musicbrainz ) ) cddb? ( |
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/CDrummond/cantata/releases/download/v2.2.0/cantata-2.2.0.tar.bz2
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=781b8cdcd44d34ea3ac0ba3f58399833
diff --git a/metadata/md5-cache/media-sound/cantata-2.3.2 b/metadata/md5-cache/media-sound/cantata-2.3.2
index dfed9e46e279..e51862e89eea 100644
--- a/metadata/md5-cache/media-sound/cantata-2.3.2
+++ b/metadata/md5-cache/media-sound/cantata-2.3.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 || ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* ) sys-libs/zlib virtual/libudev:= cdda? ( media-sound/cdparanoia ) cddb? ( media-libs/libcddb ) cdio? ( dev-libs/libcdio-paranoia ) mtp? ( media-libs/libmtp ) musicbrainz? ( media-libs/musicbrainz:5= ) replaygain? ( media-libs/libebur128 media-sound/mpg123 virtual/ffmpeg ) streaming? ( dev-qt/qtmultimedia:5 ) taglib? ( media-libs/taglib[asf(+),mp4(+)] udisks? ( sys-fs/udisks:2 ) ) zeroconf? ( net-dns/avahi ) dev-qt/qtconcurrent:5 dev-qt/linguist-tools:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 || ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* ) sys-libs/zlib virtual/libudev:= cdda? ( media-sound/cdparanoia ) cddb? ( media-libs/libcddb ) cdio? ( dev-libs/libcdio-paranoia ) mtp? ( media-libs/libmtp ) musicbrainz? ( media-libs/musicbrainz:5= ) replaygain? ( media-libs/libebur128 media-sound/mpg123 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) streaming? ( dev-qt/qtmultimedia:5 ) taglib? ( media-libs/taglib[asf(+),mp4(+)] udisks? ( sys-fs/udisks:2 ) ) zeroconf? ( net-dns/avahi ) dev-qt/qtconcurrent:5 dev-qt/linguist-tools:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
 DESCRIPTION=Featureful and configurable Qt client for the music player daemon (MPD)
 EAPI=6
 HOMEPAGE=https://github.com/CDrummond/cantata
-IUSE=cdda cddb cdio http-server mtp musicbrainz replaygain streaming taglib udisks zeroconf
-KEYWORDS=~amd64 ~x86
+IUSE=cdda cddb cdio http-server libav mtp musicbrainz replaygain streaming taglib udisks zeroconf
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 || ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* ) sys-libs/zlib virtual/libudev:= cdda? ( media-sound/cdparanoia ) cddb? ( media-libs/libcddb ) cdio? ( dev-libs/libcdio-paranoia ) mtp? ( media-libs/libmtp ) musicbrainz? ( media-libs/musicbrainz:5= ) replaygain? ( media-libs/libebur128 media-sound/mpg123 virtual/ffmpeg ) streaming? ( dev-qt/qtmultimedia:5 ) taglib? ( media-libs/taglib[asf(+),mp4(+)] udisks? ( sys-fs/udisks:2 ) ) zeroconf? ( net-dns/avahi ) dev-lang/perl[ithreads]
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 || ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* ) sys-libs/zlib virtual/libudev:= cdda? ( media-sound/cdparanoia ) cddb? ( media-libs/libcddb ) cdio? ( dev-libs/libcdio-paranoia ) mtp? ( media-libs/libmtp ) musicbrainz? ( media-libs/musicbrainz:5= ) replaygain? ( media-libs/libebur128 media-sound/mpg123 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) streaming? ( dev-qt/qtmultimedia:5 ) taglib? ( media-libs/taglib[asf(+),mp4(+)] udisks? ( sys-fs/udisks:2 ) ) zeroconf? ( net-dns/avahi ) dev-lang/perl[ithreads]
 REQUIRED_USE=?? ( cdda cdio ) cdda? ( udisks || ( cddb musicbrainz ) ) cddb? ( || ( cdio cdda ) taglib ) cdio? ( udisks || ( cddb musicbrainz ) ) mtp? ( taglib udisks ) musicbrainz? ( || ( cdio cdda ) taglib ) replaygain? ( taglib )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/CDrummond/cantata/releases/download/v2.3.2/cantata-2.3.2.tar.bz2
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=76fe31989caac3667eb054713db33036
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ae4d91eafc1abadda1695e2cac7b6133
diff --git a/metadata/md5-cache/media-sound/clementine-1.3.1_p20180416 b/metadata/md5-cache/media-sound/clementine-1.3.1_p20180416
index 579bc8f06956..816e1e0d8210 100644
--- a/metadata/md5-cache/media-sound/clementine-1.3.1_p20180416
+++ b/metadata/md5-cache/media-sound/clementine-1.3.1_p20180416
@@ -11,5 +11,5 @@ REQUIRED_USE=udisks? ( dbus ) wiimote? ( dbus )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/clementine-player/Clementine/archive/bd096dcbc3cfa8965ee96245b95c4027278b42a6.tar.gz -> clementine-1.3.1_p20180416.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b44b42bbc84b431333bcce9c2a6753aa
diff --git a/metadata/md5-cache/media-sound/clementine-1.3.1_p20180523 b/metadata/md5-cache/media-sound/clementine-1.3.1_p20180523
index a8ec56694682..1a4f9fee81f0 100644
--- a/metadata/md5-cache/media-sound/clementine-1.3.1_p20180523
+++ b/metadata/md5-cache/media-sound/clementine-1.3.1_p20180523
@@ -11,5 +11,5 @@ REQUIRED_USE=udisks? ( dbus ) wiimote? ( dbus )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/clementine-player/Clementine/archive/4619a4c1ab3b17b13d4b2327ad477912917eaf36.tar.gz -> clementine-1.3.1_p20180523.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0fcfeac581703d95a889ee3611de1d3a
diff --git a/metadata/md5-cache/media-sound/clementine-9999 b/metadata/md5-cache/media-sound/clementine-9999
index ec0cda4c0c09..f97ae36021bc 100644
--- a/metadata/md5-cache/media-sound/clementine-9999
+++ b/metadata/md5-cache/media-sound/clementine-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/crypto++ dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt5(+)] media-libs/taglib sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0 ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0 mms? ( media-plugins/gst-plugins-libmms:1.0 ) mtp? ( gnome-base/gvfs[mtp] ) udisks? ( sys-fs/udisks:2 )
 REQUIRED_USE=udisks? ( dbus ) wiimote? ( dbus )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=0a68c7c10b7ab2a80322918b1f0a9ce6
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=77c239e4be75d5f90cfa2f177628a643
diff --git a/metadata/md5-cache/media-sound/csound-6.08.0 b/metadata/md5-cache/media-sound/csound-6.08.0
deleted file mode 100644
index 7df5432a8236..000000000000
--- a/metadata/md5-cache/media-sound/csound-6.08.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test
-DEPEND=>=media-libs/libsndfile-1.0.16 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) csoundac? ( x11-libs/fltk:1[threads?] dev-cpp/eigen:3 dev-libs/boost:= ) curl? ( net-misc/curl ) dssi? ( media-libs/dssi media-libs/ladspa-sdk ) fluidsynth? ( media-sound/fluidsynth ) fltk? ( x11-libs/fltk:1[threads?] ) image? ( media-libs/libpng:0= ) jack? ( media-sound/jack-audio-connection-kit ) java? ( virtual/jdk:* ) keyboard? ( x11-libs/fltk:1[threads?] ) linear? ( sci-mathematics/gmm ) lua? ( luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 ) ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) 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(+)] ) stk? ( media-libs/stk ) tcl? ( >=dev-lang/tcl-8.5:0= >=dev-lang/tk-8.5:0= ) utils? ( !media-sound/snd ) websocket? ( net-libs/libwebsockets ) sys-devel/flex virtual/yacc chua? ( dev-libs/boost ) csoundac? ( dev-lang/swig ) nls? ( sys-devel/gettext ) test? ( dev-util/cunit python_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? ( >=dev-java/java-config-2.2.0-r3 ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A sound design and signal processing system for composition and performance
-EAPI=6
-HOMEPAGE=https://csound.github.io/
-IUSE=+alsa beats chua csoundac curl +cxx debug double-precision dssi examples fltk +fluidsynth +image jack java keyboard linear lua luajit nls osc openmp portaudio portmidi pulseaudio python samples score static-libs stk tcl test +threads +utils vim-syntax websocket elibc_FreeBSD java python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=media-libs/libsndfile-1.0.16 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) csoundac? ( x11-libs/fltk:1[threads?] dev-cpp/eigen:3 dev-libs/boost:= ) curl? ( net-misc/curl ) dssi? ( media-libs/dssi media-libs/ladspa-sdk ) fluidsynth? ( media-sound/fluidsynth ) fltk? ( x11-libs/fltk:1[threads?] ) image? ( media-libs/libpng:0= ) jack? ( media-sound/jack-audio-connection-kit ) java? ( virtual/jdk:* ) keyboard? ( x11-libs/fltk:1[threads?] ) linear? ( sci-mathematics/gmm ) lua? ( luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 ) ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) 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(+)] ) stk? ( media-libs/stk ) tcl? ( >=dev-lang/tcl-8.5:0= >=dev-lang/tk-8.5:0= ) utils? ( !media-sound/snd ) websocket? ( net-libs/libwebsockets ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=csoundac? ( || ( lua python ) ) java? ( cxx ) linear? ( double-precision ) lua? ( cxx ) python? ( python_targets_python2_7 cxx )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/csound/csound/archive/6.08.0.tar.gz -> csound-6.08.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=4585805db1c1d00f9684d92ade4230db
diff --git a/metadata/md5-cache/media-sound/csound-6.09.1 b/metadata/md5-cache/media-sound/csound-6.09.1
deleted file mode 100644
index 3a7b87a84264..000000000000
--- a/metadata/md5-cache/media-sound/csound-6.09.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test
-DEPEND=>=media-libs/libsndfile-1.0.16 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) csoundac? ( x11-libs/fltk:1[threads?] dev-cpp/eigen:3 dev-libs/boost:= ) curl? ( net-misc/curl ) dssi? ( media-libs/dssi media-libs/ladspa-sdk ) fluidsynth? ( media-sound/fluidsynth ) fltk? ( x11-libs/fltk:1[threads?] ) image? ( media-libs/libpng:0= ) jack? ( media-sound/jack-audio-connection-kit ) java? ( virtual/jdk:* ) keyboard? ( x11-libs/fltk:1[threads?] ) linear? ( sci-mathematics/gmm ) lua? ( luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 ) ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) 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(+)] ) stk? ( media-libs/stk ) tcl? ( >=dev-lang/tcl-8.5:0= >=dev-lang/tk-8.5:0= ) utils? ( !media-sound/snd ) websocket? ( net-libs/libwebsockets ) sys-devel/flex virtual/yacc chua? ( dev-libs/boost ) csoundac? ( dev-lang/swig ) nls? ( sys-devel/gettext ) test? ( dev-util/cunit python_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-arch/unzip ) java? ( >=dev-java/java-config-2.2.0-r3 ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A sound design and signal processing system for composition and performance
-EAPI=6
-HOMEPAGE=https://csound.github.io/
-IUSE=+alsa beats chua csoundac curl +cxx debug doc double-precision dssi examples fltk +fluidsynth +image jack java keyboard linear lua luajit nls osc openmp portaudio portmidi pulseaudio python samples score static-libs stk tcl test +threads +utils vim-syntax websocket elibc_FreeBSD java python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1 doc? ( FDL-1.2+ )
-RDEPEND=>=media-libs/libsndfile-1.0.16 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) csoundac? ( x11-libs/fltk:1[threads?] dev-cpp/eigen:3 dev-libs/boost:= ) curl? ( net-misc/curl ) dssi? ( media-libs/dssi media-libs/ladspa-sdk ) fluidsynth? ( media-sound/fluidsynth ) fltk? ( x11-libs/fltk:1[threads?] ) image? ( media-libs/libpng:0= ) jack? ( media-sound/jack-audio-connection-kit ) java? ( virtual/jdk:* ) keyboard? ( x11-libs/fltk:1[threads?] ) linear? ( sci-mathematics/gmm ) lua? ( luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 ) ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) 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(+)] ) stk? ( media-libs/stk ) tcl? ( >=dev-lang/tcl-8.5:0= >=dev-lang/tk-8.5:0= ) utils? ( !media-sound/snd ) websocket? ( net-libs/libwebsockets ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=csoundac? ( || ( lua python ) ) java? ( cxx ) linear? ( double-precision ) lua? ( cxx ) python? ( python_targets_python2_7 cxx )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/csound/csound/archive/6.09.1.tar.gz -> csound-6.09.1.tar.gz doc? ( https://github.com/csound/csound/releases/download/6.09.1/Csound6.09.1_manual_pdf.zip https://github.com/csound/csound/releases/download/6.09.1/Csound6.09.1_manual_html.zip )
-_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=6b491a6e5a460724e9b992889f72be04
diff --git a/metadata/md5-cache/media-sound/csound-6.10.0 b/metadata/md5-cache/media-sound/csound-6.10.0
index 213042e4a707..ef3e50bd8481 100644
--- a/metadata/md5-cache/media-sound/csound-6.10.0
+++ b/metadata/md5-cache/media-sound/csound-6.10.0
@@ -11,5 +11,5 @@ REQUIRED_USE=csoundac? ( || ( lua python ) ) java? ( cxx ) linear? ( double-prec
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/csound/csound/archive/6.10.0.tar.gz -> csound-6.10.0.tar.gz doc? ( https://github.com/csound/csound/releases/download/6.10.0/Csound6.10.0_manual_pdf.zip https://github.com/csound/csound/releases/download/6.10.0/Csound6.10.0_manual_html.zip )
-_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=19c9be1dd313a300f04616a40b505a6d
diff --git a/metadata/md5-cache/media-sound/csound-9999 b/metadata/md5-cache/media-sound/csound-9999
index d3473c60a821..6e5f97ccd2b5 100644
--- a/metadata/md5-cache/media-sound/csound-9999
+++ b/metadata/md5-cache/media-sound/csound-9999
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
-DEPEND=>=media-libs/libsndfile-1.0.16 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) csoundac? ( x11-libs/fltk:1[threads?] dev-cpp/eigen:3 dev-libs/boost:= ) curl? ( net-misc/curl ) dssi? ( media-libs/dssi media-libs/ladspa-sdk ) fluidsynth? ( media-sound/fluidsynth ) fltk? ( x11-libs/fltk:1[threads?] ) image? ( media-libs/libpng:0= ) jack? ( media-sound/jack-audio-connection-kit ) java? ( virtual/jdk:* ) keyboard? ( x11-libs/fltk:1[threads?] ) linear? ( sci-mathematics/gmm ) lua? ( luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 ) ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) 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(+)] ) stk? ( media-libs/stk ) tcl? ( >=dev-lang/tcl-8.5:0= >=dev-lang/tk-8.5:0= ) utils? ( !media-sound/snd ) websocket? ( net-libs/libwebsockets ) sys-devel/flex virtual/yacc chua? ( dev-libs/boost ) csoundac? ( dev-lang/swig ) nls? ( sys-devel/gettext ) test? ( dev-util/cunit python_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? ( >=dev-java/java-config-2.2.0-r3 ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=A sound design and signal processing system for composition and performance
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=>=media-libs/libsndfile-1.0.16 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) csoundac? ( x11-libs/fltk:1[threads?] dev-cpp/eigen:3 dev-libs/boost:= ) curl? ( net-misc/curl ) dssi? ( media-libs/dssi media-libs/ladspa-sdk ) fluidsynth? ( media-sound/fluidsynth ) fltk? ( x11-libs/fltk:1[threads?] ) image? ( media-libs/libpng:0= ) jack? ( media-sound/jack-audio-connection-kit ) java? ( virtual/jdk:* ) keyboard? ( x11-libs/fltk:1[threads?] ) linear? ( sci-mathematics/gmm ) lua? ( luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 ) ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) 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(+)] ) stk? ( media-libs/stk ) utils? ( !media-sound/snd ) websocket? ( net-libs/libwebsockets ) sys-devel/flex virtual/yacc chua? ( dev-libs/boost ) csoundac? ( dev-lang/swig ) nls? ( sys-devel/gettext ) test? ( dev-util/cunit python_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-devel/make >=dev-util/cmake-3.9.6 java? ( >=dev-java/java-config-2.2.0-r3 ) >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Sound design and signal processing system for composition and performance
 EAPI=6
 HOMEPAGE=https://csound.github.io/
-IUSE=+alsa beats chua csoundac curl +cxx debug doc double-precision dssi examples fltk +fluidsynth +image jack java keyboard linear lua luajit nls osc openmp portaudio portmidi pulseaudio python samples score static-libs stk tcl test +threads +utils vim-syntax websocket elibc_FreeBSD java python_targets_python2_7
+IUSE=+alsa beats chua csoundac curl +cxx debug doc double-precision dssi examples fltk +fluidsynth +image jack java keyboard linear lua luajit nls osc portaudio portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils vim-syntax websocket elibc_FreeBSD java python_targets_python2_7
 LICENSE=LGPL-2.1 doc? ( FDL-1.2+ )
-RDEPEND=>=media-libs/libsndfile-1.0.16 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) csoundac? ( x11-libs/fltk:1[threads?] dev-cpp/eigen:3 dev-libs/boost:= ) curl? ( net-misc/curl ) dssi? ( media-libs/dssi media-libs/ladspa-sdk ) fluidsynth? ( media-sound/fluidsynth ) fltk? ( x11-libs/fltk:1[threads?] ) image? ( media-libs/libpng:0= ) jack? ( media-sound/jack-audio-connection-kit ) java? ( virtual/jdk:* ) keyboard? ( x11-libs/fltk:1[threads?] ) linear? ( sci-mathematics/gmm ) lua? ( luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 ) ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) 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(+)] ) stk? ( media-libs/stk ) tcl? ( >=dev-lang/tcl-8.5:0= >=dev-lang/tk-8.5:0= ) utils? ( !media-sound/snd ) websocket? ( net-libs/libwebsockets ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=>=media-libs/libsndfile-1.0.16 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) csoundac? ( x11-libs/fltk:1[threads?] dev-cpp/eigen:3 dev-libs/boost:= ) curl? ( net-misc/curl ) dssi? ( media-libs/dssi media-libs/ladspa-sdk ) fluidsynth? ( media-sound/fluidsynth ) fltk? ( x11-libs/fltk:1[threads?] ) image? ( media-libs/libpng:0= ) jack? ( media-sound/jack-audio-connection-kit ) java? ( virtual/jdk:* ) keyboard? ( x11-libs/fltk:1[threads?] ) linear? ( sci-mathematics/gmm ) lua? ( luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 ) ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) 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(+)] ) stk? ( media-libs/stk ) utils? ( !media-sound/snd ) websocket? ( net-libs/libwebsockets ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=csoundac? ( || ( lua python ) ) java? ( cxx ) linear? ( double-precision ) lua? ( cxx ) python? ( python_targets_python2_7 cxx )
 RESTRICT=test
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=19c9be1dd313a300f04616a40b505a6d
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3c6d79ca7c5d8188d89c4f83960f0fea
diff --git a/metadata/md5-cache/media-sound/darkice-1.2 b/metadata/md5-cache/media-sound/darkice-1.2
index 647782203c69..128114306cfc 100644
--- a/metadata/md5-cache/media-sound/darkice-1.2
+++ b/metadata/md5-cache/media-sound/darkice-1.2
@@ -4,11 +4,11 @@ DESCRIPTION=A live audio streamer
 EAPI=5
 HOMEPAGE=http://www.darkice.org/
 IUSE=aac aacplus alsa debug jack libsamplerate mp3 opus pulseaudio twolame vorbis
-KEYWORDS=amd64 hppa ppc sparc x86
+KEYWORDS=amd64 ~hppa ppc sparc x86
 LICENSE=GPL-3
 RDEPEND=aac? ( media-libs/faac ) aacplus? ( >=media-libs/libaacplus-2.0.0 ) alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) libsamplerate? ( media-libs/libsamplerate ) mp3? ( media-sound/lame ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis )
 REQUIRED_USE=|| ( aac aacplus mp3 twolame vorbis ) || ( alsa jack pulseaudio )
 SLOT=0
 SRC_URI=https://darkice.googlecode.com/files/darkice-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_=8b91acf5cfdac39ae61eb67f4e8482a4
+_md5_=f951cf8074bdc11942d3a9a309420b8f
diff --git a/metadata/md5-cache/media-sound/darksnow-0.7.1 b/metadata/md5-cache/media-sound/darksnow-0.7.1
index 3ff58d667a74..4a40ea9345d8 100644
--- a/metadata/md5-cache/media-sound/darksnow-0.7.1
+++ b/metadata/md5-cache/media-sound/darksnow-0.7.1
@@ -9,5 +9,5 @@ PDEPEND=>=media-sound/darkice-1.2
 RDEPEND=>=x11-libs/gtk+-2.14.0:2
 SLOT=0
 SRC_URI=http://darksnow.radiolivre.org/pacotes/darksnow-0.7.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c6b2bb32d7a821afdee80d35cc239c17
diff --git a/metadata/md5-cache/media-sound/drumstick-1.1.0 b/metadata/md5-cache/media-sound/drumstick-1.1.0
index 167120bca9ed..248def914ed8 100644
--- a/metadata/md5-cache/media-sound/drumstick-1.1.0
+++ b/metadata/md5-cache/media-sound/drumstick-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtcore-5.7:5 >=dev-qt/qtdbus-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-q
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/drumstick/drumstick-1.1.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=d46b3b47a180595c31bad03b777e768a
diff --git a/metadata/md5-cache/media-sound/drumstick-1.1.1 b/metadata/md5-cache/media-sound/drumstick-1.1.1
index 4587da678c17..697166c4b6c1 100644
--- a/metadata/md5-cache/media-sound/drumstick-1.1.1
+++ b/metadata/md5-cache/media-sound/drumstick-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/drumstick/drumstick-1.1.1.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=a0f62d00b99d592b5ab72eaaca4d157f
diff --git a/metadata/md5-cache/media-sound/easytag-2.1.8 b/metadata/md5-cache/media-sound/easytag-2.1.8
index 2af6bba2d339..31f1039be838 100644
--- a/metadata/md5-cache/media-sound/easytag-2.1.8
+++ b/metadata/md5-cache/media-sound/easytag-2.1.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.24:2 mp3? ( >=media-libs/id3lib-3.8.3-r7 media-libs/libid3tag ) flac? ( media-libs/flac media-libs/libvorbis ) mp4? ( media-libs/taglib[mp4(+)] ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) speex? ( media-libs/speex media-libs/libvorbis )
 SLOT=0
 SRC_URI=mirror://gnome/sources/easytag/2.1/easytag-2.1.8.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=962c24f9158b3821b7a2374c0f3d84f9
diff --git a/metadata/md5-cache/media-sound/easytag-2.4.3 b/metadata/md5-cache/media-sound/easytag-2.4.3
index 283c88b9dca6..43e8bc86a30d 100644
--- a/metadata/md5-cache/media-sound/easytag-2.4.3
+++ b/metadata/md5-cache/media-sound/easytag-2.4.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.38:2 media-libs/libcanberra[gtk3] >=x11-libs/gtk+-3.10
 REQUIRED_USE=opus? ( vorbis ) speex? ( vorbis )
 SLOT=0
 SRC_URI=mirror://gnome/sources/easytag/2.4/easytag-2.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6be5727a0bfa4a53a9a97f7eb119aca3
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 c56bf6890987..f82063b253c4 100644
--- a/metadata/md5-cache/media-sound/elisa-0.2.1-r1
+++ b/metadata/md5-cache/media-sound/elisa-0.2.1-r1
@@ -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/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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/exaile-3.4.5 b/metadata/md5-cache/media-sound/exaile-3.4.5
index dd3bafba8c56..2e7c7a966827 100644
--- a/metadata/md5-cache/media-sound/exaile-3.4.5
+++ b/metadata/md5-cache/media-sound/exaile-3.4.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/exaile/exaile/archive/3.4.5.tar.gz -> exaile-3.4.5.tar.gz
-_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a1daccb92ee597ffaf81508fb0ee40d6
diff --git a/metadata/md5-cache/media-sound/flacon-4.1.0 b/metadata/md5-cache/media-sound/flacon-4.1.0
index 8ff256e1805f..6a119c162421 100644
--- a/metadata/md5-cache/media-sound/flacon-4.1.0
+++ b/metadata/md5-cache/media-sound/flacon-4.1.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=app-i18n/uchardet dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://github.com/flacon/flacon/archive/v4.1.0.tar.gz -> flacon-4.1.0.tar.gz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=becec8e01acba4b5883327e2dc511348
diff --git a/metadata/md5-cache/media-sound/fluidsynth-1.1.11 b/metadata/md5-cache/media-sound/fluidsynth-1.1.11
index 5aa24160f93d..8bef64b6c768 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fe9582db9b0523decbc4bc8962df54ea
diff --git a/metadata/md5-cache/media-sound/frescobaldi-3.0.0 b/metadata/md5-cache/media-sound/frescobaldi-3.0.0
index 1a38e07eba9a..ce9be64c2066 100644
--- a/metadata/md5-cache/media-sound/frescobaldi-3.0.0
+++ b/metadata/md5-cache/media-sound/frescobaldi-3.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/PyQt5[gui,network,printsupport,svg,webkit,widgets,python_targ
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/wbsoft/frescobaldi/releases/download/v3.0.0/frescobaldi-3.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=26fca02ab35782693f97870a2bba1b10
diff --git a/metadata/md5-cache/media-sound/gmpc-11.8.16-r1 b/metadata/md5-cache/media-sound/gmpc-11.8.16-r1
index b7b27f82bd25..3f036a1ded87 100644
--- a/metadata/md5-cache/media-sound/gmpc-11.8.16-r1
+++ b/metadata/md5-cache/media-sound/gmpc-11.8.16-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.16:2 dev-libs/libxml2:2 >=media-libs/libmpd-11.8 net-libs/libsoup:2.4 >=x11-libs/gtk+-2.18:2 x11-libs/libX11 x11-themes/hicolor-icon-theme unique? ( dev-libs/libunique:1 ) xspf? ( >=media-libs/libxspf-1.2 )
 SLOT=0
 SRC_URI=http://download.sarine.nl/Programs/gmpc/11.8/gmpc-11.8.16.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ef0b9f868cc57716f55909597fdbadff
diff --git a/metadata/md5-cache/media-sound/gmtp-1.3.10 b/metadata/md5-cache/media-sound/gmtp-1.3.10
index 7ec7f7cf4efd..e94f1f70ed55 100644
--- a/metadata/md5-cache/media-sound/gmtp-1.3.10
+++ b/metadata/md5-cache/media-sound/gmtp-1.3.10
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/glib:2 media-libs/flac media-libs/libid3tag media-libs/libmtp media-libs/libvorbis x11-libs/gtk+:3
 SLOT=0
 SRC_URI=mirror://sourceforge/gmtp/gmtp-1.3.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6d3e7ce710ac9b497ce3a33811589dfa
diff --git a/metadata/md5-cache/media-sound/gmtp-1.3.11 b/metadata/md5-cache/media-sound/gmtp-1.3.11
index acfd4a3a1e41..239e2d70bb2f 100644
--- a/metadata/md5-cache/media-sound/gmtp-1.3.11
+++ b/metadata/md5-cache/media-sound/gmtp-1.3.11
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/glib:2 media-libs/flac media-libs/libid3tag media-libs/libmtp media-libs/libvorbis x11-libs/gtk+:3
 SLOT=0
 SRC_URI=mirror://sourceforge/gmtp/gmtp-1.3.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ffb2631f8bab6fdf9a307aa78b6c8873
diff --git a/metadata/md5-cache/media-sound/gmusicbrowser-1.1.15-r3 b/metadata/md5-cache/media-sound/gmusicbrowser-1.1.15-r3
index 6c500ced4849..eae2c2c50c9a 100644
--- a/metadata/md5-cache/media-sound/gmusicbrowser-1.1.15-r3
+++ b/metadata/md5-cache/media-sound/gmusicbrowser-1.1.15-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-lang/perl dev-perl/Gtk2 virtual/perl-MIME-Base64 || ( net-misc/wget dev-perl/AnyEvent-HTTP ) dbus? ( dev-perl/Net-DBus ) gstreamer? ( dev-perl/Glib-Object-Introspection ) mplayer? ( || ( media-video/mplayer media-video/mpv ) ) !gstreamer? ( !mplayer? ( media-sound/alsa-utils media-sound/flac123 || ( media-sound/mpg123 media-sound/mpg321 ) media-sound/vorbis-tools ) ) extras? ( dev-perl/gnome2-wnck ) libnotify? ( dev-perl/Gtk2-Notify )
 SLOT=0
 SRC_URI=https://gmusicbrowser.org/download/gmusicbrowser-1.1.15.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7e1eb625f3bf901827722571ae04a659
diff --git a/metadata/md5-cache/media-sound/gmusicbrowser-1.1.15_p20160530 b/metadata/md5-cache/media-sound/gmusicbrowser-1.1.15_p20160530
index 10586d64b51c..08534c1825e5 100644
--- a/metadata/md5-cache/media-sound/gmusicbrowser-1.1.15_p20160530
+++ b/metadata/md5-cache/media-sound/gmusicbrowser-1.1.15_p20160530
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-lang/perl dev-perl/Gtk2 virtual/perl-MIME-Base64 || ( net-misc/wget dev-perl/AnyEvent-HTTP ) dbus? ( dev-perl/Net-DBus ) gstreamer? ( dev-perl/Glib-Object-Introspection ) mplayer? ( || ( media-video/mplayer media-video/mpv ) ) !gstreamer? ( !mplayer? ( media-sound/alsa-utils media-sound/flac123 || ( media-sound/mpg123 media-sound/mpg321 ) media-sound/vorbis-tools ) ) extras? ( dev-perl/gnome2-wnck ) libnotify? ( dev-perl/Gtk2-Notify )
 SLOT=0
 SRC_URI=https://github.com/squentin/gmusicbrowser/archive/853840eb9dad0b59ad2dac5d303f5929b2f09f21.tar.gz -> gmusicbrowser-1.1.15_p20160530.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d62df841dc672065898f09159a8e0db0
diff --git a/metadata/md5-cache/media-sound/gmusicbrowser-9999 b/metadata/md5-cache/media-sound/gmusicbrowser-9999
index a5e75645d06e..a90056332948 100644
--- a/metadata/md5-cache/media-sound/gmusicbrowser-9999
+++ b/metadata/md5-cache/media-sound/gmusicbrowser-9999
@@ -7,5 +7,5 @@ IUSE=dbus doc extras gstreamer libnotify mplayer
 LICENSE=GPL-3
 RDEPEND=dev-lang/perl dev-perl/Gtk2 virtual/perl-MIME-Base64 || ( net-misc/wget dev-perl/AnyEvent-HTTP ) dbus? ( dev-perl/Net-DBus ) gstreamer? ( dev-perl/Glib-Object-Introspection ) mplayer? ( || ( media-video/mplayer media-video/mpv ) ) !gstreamer? ( !mplayer? ( media-sound/alsa-utils media-sound/flac123 || ( media-sound/mpg123 media-sound/mpg321 ) media-sound/vorbis-tools ) ) extras? ( dev-perl/gnome2-wnck ) libnotify? ( dev-perl/Gtk2-Notify )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d62df841dc672065898f09159a8e0db0
diff --git a/metadata/md5-cache/media-sound/gnome-music-3.24.2 b/metadata/md5-cache/media-sound/gnome-music-3.24.2
index 02cfcee09b31..b210ba4c913f 100644
--- a/metadata/md5-cache/media-sound/gnome-music-3.24.2
+++ b/metadata/md5-cache/media-sound/gnome-music-3.24.2
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-music/3.24/gnome-music-3.24.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=e3ae1532b325a7cbb23c4069c48a0b2b
diff --git a/metadata/md5-cache/media-sound/gnome-sound-recorder-3.24.0.1 b/metadata/md5-cache/media-sound/gnome-sound-recorder-3.24.0.1
index 2e75d5cef211..199c1a49cc9a 100644
--- a/metadata/md5-cache/media-sound/gnome-sound-recorder-3.24.0.1
+++ b/metadata/md5-cache/media-sound/gnome-sound-recorder-3.24.0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/gjs >=dev-libs/glib-2.46:2 >=dev-libs/gobject-introspection-1.31.6 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.12:3[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection,ogg] media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-flac:1.0 media-plugins/gst-plugins-pulse:1.0
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-sound-recorder/3.24/gnome-sound-recorder-3.24.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=da085adab8e9758d2d3a88881fc93c98
diff --git a/metadata/md5-cache/media-sound/gnome-sound-recorder-3.28.1 b/metadata/md5-cache/media-sound/gnome-sound-recorder-3.28.1
index 17b2659d39ee..75354df53299 100644
--- a/metadata/md5-cache/media-sound/gnome-sound-recorder-3.28.1
+++ b/metadata/md5-cache/media-sound/gnome-sound-recorder-3.28.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/gjs >=dev-libs/glib-2.46:2 >=dev-libs/gobject-introspection-1.31.6 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.12:3[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection,ogg] media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-flac:1.0 media-plugins/gst-plugins-pulse:1.0
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-sound-recorder/3.28/gnome-sound-recorder-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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=2928d34cc0f4b9a5fd31e26c346dd946
diff --git a/metadata/md5-cache/media-sound/gogglesmm-1.1.9 b/metadata/md5-cache/media-sound/gogglesmm-1.1.9
index d4270a4c2d93..3e5aa6ccdfe1 100644
--- a/metadata/md5-cache/media-sound/gogglesmm-1.1.9
+++ b/metadata/md5-cache/media-sound/gogglesmm-1.1.9
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/fox:= x11-libs/libSM x11-libs/libICE dev-db/sqlite media-libs/taglib dev-libs/expat dev-libs/libgcrypt:= dbus? ( sys-apps/dbus ) flac? ( media-libs/flac ) mad? ( media-libs/libmad ) vorbis? ( media-libs/libvorbis ) ogg? ( media-libs/libogg ) opus? ( media-libs/opus ) aac? ( media-libs/faad2 ) pulseaudio? ( media-sound/pulseaudio ) opengl? ( media-libs/libepoxy virtual/glu )
 SLOT=0
 SRC_URI=https://github.com/gogglesmm/gogglesmm/archive/1.1.9.tar.gz -> gogglesmm-1.1.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f3cf918eb83b8ee2de48460b1a1892db
diff --git a/metadata/md5-cache/media-sound/gpodder-3.9.1 b/metadata/md5-cache/media-sound/gpodder-3.9.1
index 24fc6c0a7c48..6e46f75b73d8 100644
--- a/metadata/md5-cache/media-sound/gpodder-3.9.1
+++ b/metadata/md5-cache/media-sound/gpodder-3.9.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/eyeD3-0.7 >=dev-python/feedparser-5.1.2 dev-python/html5lib
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://gpodder.org/src/gpodder-3.9.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d8d52d4ddcd5c0f84451216445d58505
diff --git a/metadata/md5-cache/media-sound/gtkguitune-0.8 b/metadata/md5-cache/media-sound/gtkguitune-0.8
index 36c4bde5b139..72b7a94b4613 100644
--- a/metadata/md5-cache/media-sound/gtkguitune-0.8
+++ b/metadata/md5-cache/media-sound/gtkguitune-0.8
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-libs/libsigc++:2
 SLOT=0
 SRC_URI=mirror://gentoo/gtkguitune-gtk2-0.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bba2c616b9295c148ab0a9dd61befe02
diff --git a/metadata/md5-cache/media-sound/gtklick-0.6.4 b/metadata/md5-cache/media-sound/gtklick-0.6.4
index 57e1e94325a0..603d59eadfbb 100644
--- a/metadata/md5-cache/media-sound/gtklick-0.6.4
+++ b/metadata/md5-cache/media-sound/gtklick-0.6.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://das.nasophon.de/download/gtklick-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=577f773d8e69c1a19a2278cdc55b5772
diff --git a/metadata/md5-cache/media-sound/guayadeque-0.4.5_p20170110 b/metadata/md5-cache/media-sound/guayadeque-0.4.5_p20170110
index fbf52e835400..109d53c7fc28 100644
--- a/metadata/md5-cache/media-sound/guayadeque-0.4.5_p20170110
+++ b/metadata/md5-cache/media-sound/guayadeque-0.4.5_p20170110
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 >=dev-db/wxsqlite3-3.2.1 dev-libs/glib:2 media-libs/flac
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/anonbeat/guayadeque/archive/9fec4f7b85095fa2d9f8e4d39c0cf5015f7624fa.tar.gz -> guayadeque-0.4.5_p20170110.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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=08a49c5bde0e823131866f4499ee65e5
diff --git a/metadata/md5-cache/media-sound/guayadeque-9999 b/metadata/md5-cache/media-sound/guayadeque-9999
index b06e316b5ae0..daacd35fdd40 100644
--- a/metadata/md5-cache/media-sound/guayadeque-9999
+++ b/metadata/md5-cache/media-sound/guayadeque-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-db/sqlite:3 >=dev-db/wxsqlite3-3.2.1 dev-libs/glib:2 media-libs/flac media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0 >=media-libs/taglib-1.6.4 net-misc/curl sys-apps/dbus x11-libs/wxGTK:3.0[X] ayatana? ( >=dev-libs/libindicate-0.7 ) ipod? ( media-libs/libgpod ) !minimal? ( media-libs/gnonlin:1.0 media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-libnice:1.0 media-plugins/gst-plugins-pulse:1.0 media-plugins/gst-plugins-soup:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-ugly:1.0 )
 RESTRICT=test
 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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=95a0b5877c812d6b1e775d1e03876fed
diff --git a/metadata/md5-cache/media-sound/hydrogen-1.0.0_pre20180301-r1 b/metadata/md5-cache/media-sound/hydrogen-1.0.0_pre20180301-r1
index 91ab4ea5258a..dcee8fa7b15f 100644
--- a/metadata/md5-cache/media-sound/hydrogen-1.0.0_pre20180301-r1
+++ b/metadata/md5-cache/media-sound/hydrogen-1.0.0_pre20180301-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev
 REQUIRED_USE=lash? ( alsa )
 SLOT=0
 SRC_URI=https://github.com/hydrogen-music/hydrogen/archive/1a477ffe380f153c5d9fb3495d9874df7f75334f.tar.gz -> hydrogen-1.0.0_pre20180301.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c14691f62b8ed22854326851f1e1a366
diff --git a/metadata/md5-cache/media-sound/hydrogen-9999 b/metadata/md5-cache/media-sound/hydrogen-9999
index b463003ddd58..a19a10343a0a 100644
--- a/metadata/md5-cache/media-sound/hydrogen-9999
+++ b/metadata/md5-cache/media-sound/hydrogen-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 ZLIB
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/libsndfile-1.0.18 alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) !archive? ( >=dev-libs/libtar-1.2.11-r3 ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lash? ( media-sound/lash ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio )
 REQUIRED_USE=lash? ( alsa )
 SLOT=0
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7410a7ec922305a3724f1a7b5ebe0240
diff --git a/metadata/md5-cache/media-sound/id3ted-1.0 b/metadata/md5-cache/media-sound/id3ted-1.0
index 428aec9c4db1..5f1261adf82a 100644
--- a/metadata/md5-cache/media-sound/id3ted-1.0
+++ b/metadata/md5-cache/media-sound/id3ted-1.0
@@ -3,10 +3,10 @@ DEPEND=media-libs/taglib sys-apps/file
 DESCRIPTION=A Command-line ID3 Tag Editor
 EAPI=7
 HOMEPAGE=https://muennich.github.com/id3ted/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=media-libs/taglib sys-apps/file
 SLOT=0
 SRC_URI=https://github.com/muennich/id3ted/archive/v1.0.tar.gz -> id3ted-1.0.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=9a2005375783c84e3ceaadeb46461252
+_md5_=f2aeea5c4c49227aa6f7408582dfca6e
diff --git a/metadata/md5-cache/media-sound/id3ted-1.0_beta3 b/metadata/md5-cache/media-sound/id3ted-1.0_beta3
deleted file mode 100644
index b1e6cc0f769a..000000000000
--- a/metadata/md5-cache/media-sound/id3ted-1.0_beta3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=setup
-DEPEND=media-libs/taglib sys-apps/file
-DESCRIPTION=A Command-line ID3 Tag Editor
-EAPI=4
-HOMEPAGE=https://muennich.github.com/id3ted/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=media-libs/taglib sys-apps/file
-SLOT=0
-SRC_URI=mirror://github/muennich/id3ted/id3ted-1.0b3.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=c5504c0d0151e02030f4cf75a4d61a62
diff --git a/metadata/md5-cache/media-sound/jack-3.1.1-r2 b/metadata/md5-cache/media-sound/jack-3.1.1-r2
index a992b95dd10b..ea6cb647c29a 100644
--- a/metadata/md5-cache/media-sound/jack-3.1.1-r2
+++ b/metadata/md5-cache/media-sound/jack-3.1.1-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/cddb-py[python_targets_python2_7(-)?,-python_single_target_jy
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://www.home.unix-ag.org/arne/jack/jack-3.1.1.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=71eff5b2834df4110b6e92ee861c9375
diff --git a/metadata/md5-cache/media-sound/kaudiocreator-1.3_p20170806 b/metadata/md5-cache/media-sound/kaudiocreator-1.3_p20170806
index ae7c351f4eb5..3b748bc49e01 100644
--- a/metadata/md5-cache/media-sound/kaudiocreator-1.3_p20170806
+++ b/metadata/md5-cache/media-sound/kaudiocreator-1.3_p20170806
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 b70857f78ffe..4d5861cd3eb1 100644
--- a/metadata/md5-cache/media-sound/kid3-3.6.1
+++ b/metadata/md5-cache/media-sound/kid3-3.6.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 8926be7fe1f3..8c2f3b02cf07 100644
--- a/metadata/md5-cache/media-sound/kid3-3.6.2
+++ b/metadata/md5-cache/media-sound/kid3-3.6.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kmetronome-1.0.0 b/metadata/md5-cache/media-sound/kmetronome-1.0.0
index c6642de1eb54..05455f7fa030 100644
--- a/metadata/md5-cache/media-sound/kmetronome-1.0.0
+++ b/metadata/md5-cache/media-sound/kmetronome-1.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-libs/alsa-lib >=media-sound/drumstick-1.0.0 !media-sound/kmetronome:4
 SLOT=5
 SRC_URI=mirror://sourceforge/kmetronome/kmetronome-1.0.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=b251b010f85f71771c6385bc8abd08c0
diff --git a/metadata/md5-cache/media-sound/lilypond-2.18.2-r3 b/metadata/md5-cache/media-sound/lilypond-2.18.2-r3
index 57968900fb8b..6b4aaf47e714 100644
--- a/metadata/md5-cache/media-sound/lilypond-2.18.2-r3
+++ b/metadata/md5-cache/media-sound/lilypond-2.18.2-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.linuxaudio.org/lilypond/sources/v2.18/lilypond-2.18.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	elisp-common	23f47b2e1de7abf387105eddd1318738	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	elisp-common	23f47b2e1de7abf387105eddd1318738	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=90c0a96d195377652924ac6e417c2439
diff --git a/metadata/md5-cache/media-sound/lilypond-2.19.80-r1 b/metadata/md5-cache/media-sound/lilypond-2.19.80-r1
index ceed114ea732..359a40c3f39e 100644
--- a/metadata/md5-cache/media-sound/lilypond-2.19.80-r1
+++ b/metadata/md5-cache/media-sound/lilypond-2.19.80-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.linuxaudio.org/lilypond/sources/v2.19/lilypond-2.19.80.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	elisp-common	23f47b2e1de7abf387105eddd1318738	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	elisp-common	23f47b2e1de7abf387105eddd1318738	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5168acc7bb077cd0fff1a91f24b7742b
diff --git a/metadata/md5-cache/media-sound/lilypond-9999 b/metadata/md5-cache/media-sound/lilypond-9999
index 85376d32b682..346afd15bef2 100644
--- a/metadata/md5-cache/media-sound/lilypond-9999
+++ b/metadata/md5-cache/media-sound/lilypond-9999
@@ -9,5 +9,5 @@ RDEPEND=>=app-text/ghostscript-gpl-8.15 >=dev-scheme/guile-1.8.2:12[deprecated,r
 REQUIRED_USE=python_targets_python2_7
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	elisp-common	23f47b2e1de7abf387105eddd1318738	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	elisp-common	23f47b2e1de7abf387105eddd1318738	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6ad29f857c53075ffdf7dd5f77266bb0
diff --git a/metadata/md5-cache/media-sound/lingot-0.9.1 b/metadata/md5-cache/media-sound/lingot-0.9.1
deleted file mode 100644
index 05a44f7a9372..000000000000
--- a/metadata/md5-cache/media-sound/lingot-0.9.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 x11-libs/pango dev-libs/glib:2 gnome-base/libglade:2.0 alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) virtual/pkgconfig dev-util/intltool 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=LINGOT Is Not a Guitar-Only Tuner
-EAPI=4
-HOMEPAGE=http://www.nongnu.org/lingot
-IUSE=alsa jack
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 x11-libs/pango dev-libs/glib:2 gnome-base/libglade:2.0 alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack )
-SLOT=0
-SRC_URI=http://download.savannah.gnu.org/releases/lingot/lingot-0.9.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_=abefd806c1766d8af9064de4e82459f0
diff --git a/metadata/md5-cache/media-sound/lingot-1.0.1 b/metadata/md5-cache/media-sound/lingot-1.0.1
new file mode 100644
index 000000000000..ff695889e83d
--- /dev/null
+++ b/metadata/md5-cache/media-sound/lingot-1.0.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/intltool 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
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0= ) jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio )
+DESCRIPTION=Accurate, easy to use, and highly configurable musical instrument tuner
+EAPI=7
+HOMEPAGE=https://www.nongnu.org/lingot/
+IUSE=alsa +fftw jack pulseaudio
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0= ) jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio )
+SLOT=0
+SRC_URI=https://download.savannah.gnu.org/releases/lingot/lingot-1.0.1.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=691c2baa4e80a43b0e2ec37abf60bf04
diff --git a/metadata/md5-cache/media-sound/lmms-1.1.90 b/metadata/md5-cache/media-sound/lmms-1.1.90
index 01a43cc1761e..5f70250fc538 100644
--- a/metadata/md5-cache/media-sound/lmms-1.1.90
+++ b/metadata/md5-cache/media-sound/lmms-1.1.90
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 >=media-libs/libsamplerate-0.1.8 >=media-libs/libsndfile-1.0.11 sci-libs/fftw:3.0 sys-libs/zlib >=x11-libs/fltk-1.3.0_rc3:1 alsa? ( media-libs/alsa-lib ) fluidsynth? ( media-sound/fluidsynth ) jack? ( virtual/jack ) libgig? ( media-libs/libgig ) ogg? ( media-libs/libogg media-libs/libvorbis ) portaudio? ( >=media-libs/portaudio-19_pre ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl >=media-libs/sdl-sound-1.0.1 ) soundio? ( media-libs/libsoundio ) stk? ( media-libs/stk ) vst? ( virtual/wine ) media-libs/ladspa-cmt media-plugins/calf media-plugins/caps-plugins media-plugins/swh-plugins media-plugins/tap-plugins
 SLOT=0
 SRC_URI=https://github.com/LMMS/lmms/archive/v1.1.90.tar.gz -> lmms-1.1.90.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=09be4839287fbccd65c4909dcd4e79b5
diff --git a/metadata/md5-cache/media-sound/lmms-1.2.0_rc4 b/metadata/md5-cache/media-sound/lmms-1.2.0_rc4
index a744f5d4666e..751829d35596 100644
--- a/metadata/md5-cache/media-sound/lmms-1.2.0_rc4
+++ b/metadata/md5-cache/media-sound/lmms-1.2.0_rc4
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 >=media-libs/libsamplerate-0.1.8 >=media-libs/libsndfile-1.0.11 sci-libs/fftw:3.0 sys-libs/zlib >=x11-libs/fltk-1.3.0_rc3:1 alsa? ( media-libs/alsa-lib ) fluidsynth? ( media-sound/fluidsynth ) jack? ( virtual/jack ) libgig? ( media-libs/libgig ) ogg? ( media-libs/libogg media-libs/libvorbis ) portaudio? ( >=media-libs/portaudio-19_pre ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl >=media-libs/sdl-sound-1.0.1 ) soundio? ( media-libs/libsoundio ) stk? ( media-libs/stk ) vst? ( virtual/wine ) media-libs/ladspa-cmt media-plugins/calf media-plugins/caps-plugins media-plugins/swh-plugins media-plugins/tap-plugins
 SLOT=0
 SRC_URI=https://github.com/LMMS/lmms/archive/v1.2.0-rc4.tar.gz -> lmms-1.2.0_rc4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8d6ae56d559d3d23f8b2c569cd0a0e5a
diff --git a/metadata/md5-cache/media-sound/lmms-9999 b/metadata/md5-cache/media-sound/lmms-9999
index d9b9621a983e..1bf17888a773 100644
--- a/metadata/md5-cache/media-sound/lmms-9999
+++ b/metadata/md5-cache/media-sound/lmms-9999
@@ -7,5 +7,5 @@ IUSE=alsa debug fluidsynth jack libgig mp3 ogg portaudio pulseaudio sdl soundio
 LICENSE=GPL-2 LGPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 >=media-libs/libsamplerate-0.1.8 >=media-libs/libsndfile-1.0.11 sci-libs/fftw:3.0 sys-libs/zlib >=x11-libs/fltk-1.3.0_rc3:1 alsa? ( media-libs/alsa-lib ) fluidsynth? ( media-sound/fluidsynth ) jack? ( virtual/jack ) libgig? ( media-libs/libgig ) mp3? ( media-sound/lame ) ogg? ( media-libs/libogg media-libs/libvorbis ) portaudio? ( >=media-libs/portaudio-19_pre ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl >=media-libs/sdl-sound-1.0.1 ) soundio? ( media-libs/libsoundio ) stk? ( media-libs/stk ) vst? ( virtual/wine ) media-libs/ladspa-cmt media-plugins/calf media-plugins/caps-plugins media-plugins/swh-plugins media-plugins/tap-plugins
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7b6ebd81750b9e491d6d69f119440898
diff --git a/metadata/md5-cache/media-sound/lollypop-0.9.601 b/metadata/md5-cache/media-sound/lollypop-0.9.601
new file mode 100644
index 000000000000..54a697a00a56
--- /dev/null
+++ b/metadata/md5-cache/media-sound/lollypop-0.9.601
@@ -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 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/lyvi-2.0.0 b/metadata/md5-cache/media-sound/lyvi-2.0.0
index 35eb4365762f..601186a5f08e 100644
--- a/metadata/md5-cache/media-sound/lyvi-2.0.0
+++ b/metadata/md5-cache/media-sound/lyvi-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/ok100/lyvi/archive/v2.0.0.tar.gz -> lyvi-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f5e67032462523e4bba679c8d0b5e013
diff --git a/metadata/md5-cache/media-sound/marrie-0.3.2-r1 b/metadata/md5-cache/media-sound/marrie-0.3.2-r1
index 1842856d4ef0..1659f918f819 100644
--- a/metadata/md5-cache/media-sound/marrie-0.3.2-r1
+++ b/metadata/md5-cache/media-sound/marrie-0.3.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools >=dev-python/feedparser-5.1.3 python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/marrie/marrie-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6ec1a143d54bc84eb3369c4ba8fd6dd9
diff --git a/metadata/md5-cache/media-sound/marrie-9999 b/metadata/md5-cache/media-sound/marrie-9999
index bc2f64791ce4..04912882b1cd 100644
--- a/metadata/md5-cache/media-sound/marrie-9999
+++ b/metadata/md5-cache/media-sound/marrie-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/setuptools >=dev-python/feedparser-5.1.3 python_targets_python2_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6ec1a143d54bc84eb3369c4ba8fd6dd9
diff --git a/metadata/md5-cache/media-sound/milkytracker-1.0.0 b/metadata/md5-cache/media-sound/milkytracker-1.0.0
index be5cb1cd75ff..534d6ace5335 100644
--- a/metadata/md5-cache/media-sound/milkytracker-1.0.0
+++ b/metadata/md5-cache/media-sound/milkytracker-1.0.0
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-3 MPL-1.1 ) AIFFWriter.m BSD GPL-3 GPL-3+ LGPL-2.1+ MIT
 RDEPEND=dev-libs/zziplib media-libs/libsdl2[X] sys-libs/zlib alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit )
 SLOT=0
 SRC_URI=https://github.com/milkytracker/MilkyTracker/archive/v1.0.0.tar.gz -> milkytracker-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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=418f92867729c777ee31875ab785bec8
diff --git a/metadata/md5-cache/media-sound/moosic-1.5.6-r1 b/metadata/md5-cache/media-sound/moosic-1.5.6-r1
index 7251135f1740..33153834265a 100644
--- a/metadata/md5-cache/media-sound/moosic-1.5.6-r1
+++ b/metadata/md5-cache/media-sound/moosic-1.5.6-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=http://www.nanoo.org/~daniel/moosic/moosic-1.5.6.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1cfac9be09beebc38461e9b39a03119b
diff --git a/metadata/md5-cache/media-sound/mpd-0.20.10 b/metadata/md5-cache/media-sound/mpd-0.20.10
index d7e3e0f4e9a1..be785d297ce3 100644
--- a/metadata/md5-cache/media-sound/mpd-0.20.10
+++ b/metadata/md5-cache/media-sound/mpd-0.20.10
@@ -10,5 +10,5 @@ RDEPEND=!<sys-cluster/mpich2-1.4_rc2 adplug? ( media-libs/adplug ) alsa? ( media
 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.10.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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_=6ac09645291cdf77bbb8dc4855b27636
diff --git a/metadata/md5-cache/media-sound/mpd-0.20.12-r2 b/metadata/md5-cache/media-sound/mpd-0.20.12-r2
index b0d53a463bfa..af47cf0381c9 100644
--- a/metadata/md5-cache/media-sound/mpd-0.20.12-r2
+++ b/metadata/md5-cache/media-sound/mpd-0.20.12-r2
@@ -10,5 +10,5 @@ RDEPEND=adplug? ( media-libs/adplug ) alsa? ( media-libs/alsa-lib media-sound/al
 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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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 8e20012b2dcc..c25ac380f9e8 100644
--- a/metadata/md5-cache/media-sound/mpd-0.20.21-r1
+++ b/metadata/md5-cache/media-sound/mpd-0.20.21-r1
@@ -10,5 +10,5 @@ RDEPEND=adplug? ( media-libs/adplug ) alsa? ( media-libs/alsa-lib media-sound/al
 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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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
diff --git a/metadata/md5-cache/media-sound/mps-youtube-0.2.7.1 b/metadata/md5-cache/media-sound/mps-youtube-0.2.7.1
index 539e13aef88e..a929b7ec8ea9 100644
--- a/metadata/md5-cache/media-sound/mps-youtube-0.2.7.1
+++ b/metadata/md5-cache/media-sound/mps-youtube-0.2.7.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mps-youtube/mps-youtube-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=14b26fd1f495da6fbd84d556167062ad
diff --git a/metadata/md5-cache/media-sound/mps-youtube-0.2.8 b/metadata/md5-cache/media-sound/mps-youtube-0.2.8
index 919d9815a6c8..62b9e5648e86 100644
--- a/metadata/md5-cache/media-sound/mps-youtube-0.2.8
+++ b/metadata/md5-cache/media-sound/mps-youtube-0.2.8
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mps-youtube/mps-youtube-0.2.8.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=36a0a571cbc48d4ca2b20c3d05f949a3
diff --git a/metadata/md5-cache/media-sound/mps-youtube-9999 b/metadata/md5-cache/media-sound/mps-youtube-9999
index fa6992274ed4..48d6a80859e2 100644
--- a/metadata/md5-cache/media-sound/mps-youtube-9999
+++ b/metadata/md5-cache/media-sound/mps-youtube-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 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(-)] dev-python/pafy[python_targets_python3_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/ffmpeg || ( media-video/mplayer media-video/mpv ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=aa23a9e544e60b19d249ae55b93e8e64
diff --git a/metadata/md5-cache/media-sound/mumble-9999 b/metadata/md5-cache/media-sound/mumble-9999
index 3052297791ee..ac223140a8d8 100644
--- a/metadata/md5-cache/media-sound/mumble-9999
+++ b/metadata/md5-cache/media-sound/mumble-9999
@@ -7,5 +7,5 @@ IUSE=+alsa +dbus debug g15 jack libressl +opus oss pch portaudio pulseaudio +rnn
 LICENSE=BSD MIT
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=dev-libs/protobuf-2.2.0:= >=media-libs/libsndfile-1.0.20[-minimal] >=media-libs/speex-1.2.0 media-libs/speexdsp sys-apps/lsb-release x11-libs/libX11 x11-libs/libXi alsa? ( media-libs/alsa-lib ) dbus? ( dev-qt/qtdbus:5 ) g15? ( app-misc/g15daemon ) jack? ( virtual/jack ) !libressl? ( >=dev-libs/openssl-1.0.0b:0= ) libressl? ( dev-libs/libressl ) opus? ( >=media-libs/opus-1.0.1 ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) speech? ( >=app-accessibility/speech-dispatcher-0.8.0 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6633b02094993b56efb80a4cd9edbbde
diff --git a/metadata/md5-cache/media-sound/musepack-tools-465-r1 b/metadata/md5-cache/media-sound/musepack-tools-465-r1
index e6cac4af9666..18be357a2214 100644
--- a/metadata/md5-cache/media-sound/musepack-tools-465-r1
+++ b/metadata/md5-cache/media-sound/musepack-tools-465-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=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 sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=>=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(-)?] sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Musepack SV8 libraries and utilities
-EAPI=5
-HOMEPAGE=http://www.musepack.net
+EAPI=6
+HOMEPAGE=https://www.musepack.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 ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=643b7104cb95ca34496367ff97ce8be9
+_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_=fdd5960481cf1cbc68593fefd82ca451
diff --git a/metadata/md5-cache/media-sound/musescore-2.1.0-r1 b/metadata/md5-cache/media-sound/musescore-2.1.0-r1
index badf1c9af42e..9e4dbdf26151 100644
--- a/metadata/md5-cache/media-sound/musescore-2.1.0-r1
+++ b/metadata/md5-cache/media-sound/musescore-2.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclara
 REQUIRED_USE=portmidi? ( portaudio )
 SLOT=0
 SRC_URI=https://github.com/musescore/MuseScore/archive/v2.1.0.tar.gz -> musescore-2.1.0.tar.gz https://dev.gentoo.org/~mgorny/dist/musescore-2.1.0-fix-buildsystem.patch.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=58a9fb3af44a56687f0579df9a87cde5
diff --git a/metadata/md5-cache/media-sound/musescore-9999 b/metadata/md5-cache/media-sound/musescore-9999
index 85f0d8cd1f47..1f103951acb0 100644
--- a/metadata/md5-cache/media-sound/musescore-9999
+++ b/metadata/md5-cache/media-sound/musescore-9999
@@ -9,5 +9,5 @@ RDEPEND=dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclara
 REQUIRED_USE=portmidi? ( portaudio )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/musescore-9999-fix-buildsystem.patch.bz2
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fb518540433abca968279b26140fec30
diff --git a/metadata/md5-cache/media-sound/musique-1.5-r1 b/metadata/md5-cache/media-sound/musique-1.5-r1
index 60363f4ec5bc..87b473e30b0a 100644
--- a/metadata/md5-cache/media-sound/musique-1.5-r1
+++ b/metadata/md5-cache/media-sound/musique-1.5-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 media-libs/phonon[qt5(+)] media-libs/taglib
 SLOT=0
 SRC_URI=https://github.com/flaviotordini/musique/archive/1.5.tar.gz -> musique-1.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=042ea27555be2a00ea805abb803d9e3d
diff --git a/metadata/md5-cache/media-sound/pamix-1.6 b/metadata/md5-cache/media-sound/pamix-1.6
index c98cf2333860..1c2b8d4d4105 100644
--- a/metadata/md5-cache/media-sound/pamix-1.6
+++ b/metadata/md5-cache/media-sound/pamix-1.6
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=media-sound/pulseaudio sys-libs/ncurses:0=[unicode?]
 SLOT=0
 SRC_URI=https://github.com/patroclos/PAmix/archive/1.6.tar.gz -> pamix-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=221789596ae9d858a8d75da1e5835530
diff --git a/metadata/md5-cache/media-sound/pamix-9999 b/metadata/md5-cache/media-sound/pamix-9999
index 2bfe168f2ffb..d20dfa6f01e0 100644
--- a/metadata/md5-cache/media-sound/pamix-9999
+++ b/metadata/md5-cache/media-sound/pamix-9999
@@ -7,5 +7,5 @@ IUSE=+unicode
 LICENSE=MIT
 RDEPEND=media-sound/pulseaudio sys-libs/ncurses:0=[unicode?]
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=738782807cc4526cd3d326f5f1066dff
diff --git a/metadata/md5-cache/media-sound/paprefs-0.9.11_pre20180621 b/metadata/md5-cache/media-sound/paprefs-0.9.11_pre20180621
index f24e10d4fe09..296899b13dd8 100644
--- a/metadata/md5-cache/media-sound/paprefs-0.9.11_pre20180621
+++ b/metadata/md5-cache/media-sound/paprefs-0.9.11_pre20180621
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:3.0 dev-libs/dbus-glib >=dev-libs/libsigc++-2.2:2 >=media-sound/pulseaudio-12.0-r1[glib] || ( x11-themes/tango-icon-theme x11-themes/adwaita-icon-theme )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~polynomial-c/paprefs-0.9.11_pre20180621.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a35aa11b9889e46f4d5c50d4d9d5123a
diff --git a/metadata/md5-cache/media-sound/pasystray-0.2.1 b/metadata/md5-cache/media-sound/pasystray-0.2.1
deleted file mode 100644
index fb524d7d6449..000000000000
--- a/metadata/md5-cache/media-sound/pasystray-0.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm preinst
-DEPEND=|| ( >=media-sound/pulseaudio-1.0[glib,avahi] >=media-sound/pulseaudio-5.0-r3[glib,zeroconf] ) >=net-dns/avahi-0.6 x11-libs/gtk+:3 x11-libs/libX11 libnotify? ( >=x11-libs/libnotify-0.7 ) virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=A system tray for pulseaudio controls (replacement for the deprecated padevchooser)
-EAPI=4
-HOMEPAGE=https://github.com/christophgysin/pasystray
-IUSE=libnotify
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=|| ( >=media-sound/pulseaudio-1.0[glib,avahi] >=media-sound/pulseaudio-5.0-r3[glib,zeroconf] ) >=net-dns/avahi-0.6 x11-libs/gtk+:3 x11-libs/libX11 libnotify? ( >=x11-libs/libnotify-0.7 )
-SLOT=0
-SRC_URI=mirror://github/christophgysin/pasystray/pasystray-0.2.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=e48f5b2358823ca1a27eff7cf7edaa6e
diff --git a/metadata/md5-cache/media-sound/pasystray-0.6.0-r1 b/metadata/md5-cache/media-sound/pasystray-0.6.0-r1
deleted file mode 100644
index 511c41de2d27..000000000000
--- a/metadata/md5-cache/media-sound/pasystray-0.6.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.48.2 >=media-sound/pulseaudio-5.0-r3[glib,zeroconf?] zeroconf? ( >=net-dns/avahi-0.6 ) x11-libs/gtk+:3 x11-libs/libX11 libnotify? ( >=x11-libs/libnotify-0.7 ) virtual/pkgconfig >=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 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=PulseAudio system tray
-EAPI=6
-HOMEPAGE=https://github.com/christophgysin/pasystray
-IUSE=libnotify zeroconf
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.48.2 >=media-sound/pulseaudio-5.0-r3[glib,zeroconf?] zeroconf? ( >=net-dns/avahi-0.6 ) x11-libs/gtk+:3 x11-libs/libX11 libnotify? ( >=x11-libs/libnotify-0.7 )
-SLOT=0
-SRC_URI=https://github.com/christophgysin/pasystray/archive/pasystray-0.6.0.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=1aee3d152fbec94bba60182a18ac5284
diff --git a/metadata/md5-cache/media-sound/pasystray-0.6.0-r2 b/metadata/md5-cache/media-sound/pasystray-0.6.0-r2
index a8a2d05e24c1..3fe9602939f0 100644
--- a/metadata/md5-cache/media-sound/pasystray-0.6.0-r2
+++ b/metadata/md5-cache/media-sound/pasystray-0.6.0-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.48.2 >=media-sound/pulseaudio-5.0-r3[glib,zeroconf?] zeroconf? ( >=net-dns/avahi-0.6 ) x11-libs/gtk+:3 x11-libs/libX11 libnotify? ( >=x11-libs/libnotify-0.7 )
 SLOT=0
 SRC_URI=https://github.com/christophgysin/pasystray/archive/pasystray-0.6.0.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=faa09b0eebd4fc767a16867c49d42eec
diff --git a/metadata/md5-cache/media-sound/pasystray-0.7.0 b/metadata/md5-cache/media-sound/pasystray-0.7.0
new file mode 100644
index 000000000000..868e0d53ae40
--- /dev/null
+++ b/metadata/md5-cache/media-sound/pasystray-0.7.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.48.2 >=media-sound/pulseaudio-5.0-r3[glib,zeroconf?] x11-libs/gtk+:3 x11-libs/libX11 zeroconf? ( >=net-dns/avahi-0.6 ) libnotify? ( >=x11-libs/libnotify-0.7 ) virtual/pkgconfig >=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 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=PulseAudio system tray
+EAPI=6
+HOMEPAGE=https://github.com/christophgysin/pasystray
+IUSE=libnotify zeroconf
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.48.2 >=media-sound/pulseaudio-5.0-r3[glib,zeroconf?] x11-libs/gtk+:3 x11-libs/libX11 zeroconf? ( >=net-dns/avahi-0.6 ) libnotify? ( >=x11-libs/libnotify-0.7 )
+SLOT=0
+SRC_URI=https://github.com/christophgysin/pasystray/archive/pasystray-0.7.0.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	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4373a9680d50e972d6594b07a199dae1
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 6cbdb246baa7..287504aef2d5 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _md5_=272abdaa63f35668ba617275ec92369c
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 cd52ef55b14f..02c14e6f1360 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _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 a4731da75fdd..f7bd7ed87a6f 100644
--- a/metadata/md5-cache/media-sound/pavucontrol-qt-0.4.0
+++ b/metadata/md5-cache/media-sound/pavucontrol-qt-0.4.0
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/media-sound/picard-2.0.0_beta3 b/metadata/md5-cache/media-sound/picard-2.0.0_beta3
deleted file mode 100644
index 24e52db3d7a0..000000000000
--- a/metadata/md5-cache/media-sound/picard-2.0.0_beta3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=nls? ( dev-qt/linguist-tools:5 ) 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=A cross-platform music tagger
-EAPI=6
-HOMEPAGE=https://picard.musicbrainz.org
-IUSE=nls python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=dev-python/PyQt5[declarative,gui,network,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-qt/qtgui:5[accessibility] >=media-libs/mutagen-1.38 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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/metabrainz/picard/archive/2.0.0dev6.tar.gz -> picard-2.0.0_beta3.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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=c6f0784a1a0122df4395e163f81fbca8
diff --git a/metadata/md5-cache/media-sound/picard-2.0.3 b/metadata/md5-cache/media-sound/picard-2.0.3
index 102a9ae6780f..cb01f19f37a7 100644
--- a/metadata/md5-cache/media-sound/picard-2.0.3
+++ b/metadata/md5-cache/media-sound/picard-2.0.3
@@ -4,12 +4,12 @@ DESCRIPTION=A cross-platform music tagger
 EAPI=6
 HOMEPAGE=https://picard.musicbrainz.org
 IUSE=nls 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+
 RDEPEND=dev-python/PyQt5[declarative,gui,network,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-qt/qtgui:5[accessibility] >=media-libs/mutagen-1.38 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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/metabrainz/picard/archive/release-2.0.3.tar.gz -> picard-2.0.3.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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=72e1c0d9316edaf80084c63ad2ee9861
+_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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=9ebae0673f8fd71cfdf059f85d7de469
diff --git a/metadata/md5-cache/media-sound/picard-9999 b/metadata/md5-cache/media-sound/picard-9999
index 34e72be5b040..ee23dbfda4c9 100644
--- a/metadata/md5-cache/media-sound/picard-9999
+++ b/metadata/md5-cache/media-sound/picard-9999
@@ -9,5 +9,5 @@ RDEPEND=dev-python/PyQt5[declarative,gui,network,widgets,python_targets_python3_
 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
-_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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0c70cd86e12d3a72f9173a859d3bd7ca
diff --git a/metadata/md5-cache/media-sound/pithos-1.3.1 b/metadata/md5-cache/media-sound/pithos-1.3.1
index 772f6c4fe77b..ce107a8d8475 100644
--- a/metadata/md5-cache/media-sound/pithos-1.3.1
+++ b/metadata/md5-cache/media-sound/pithos-1.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-python/pylast[python_targets_python3_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/dbus-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(-)] >=dev-python/pygobject-3.12[python_targets_python3_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/appstream-glib[introspection] x11-libs/pango[introspection] media-libs/gstreamer:1.0[introspection] media-plugins/gst-plugins-meta:1.0[aac,http,mp3] >=x11-libs/gtk+-3.14:3[introspection] x11-themes/gnome-icon-theme-symbolic libnotify? ( x11-libs/libnotify[introspection] ) appindicator? ( dev-libs/libappindicator:3[introspection] ) keybinder? ( dev-libs/keybinder:3[introspection] )
 SLOT=0
 SRC_URI=https://github.com/pithos/pithos/archive/1.3.1.tar.gz -> pithos-1.3.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7089b3747af4a4dd783b887ea384b72a
diff --git a/metadata/md5-cache/media-sound/pithos-9999 b/metadata/md5-cache/media-sound/pithos-9999
index f0a7aaf8845a..083b1958ca91 100644
--- a/metadata/md5-cache/media-sound/pithos-9999
+++ b/metadata/md5-cache/media-sound/pithos-9999
@@ -7,5 +7,5 @@ IUSE=libnotify appindicator +keybinder python_targets_python3_4 python_targets_p
 LICENSE=GPL-3
 RDEPEND=dev-python/pylast[python_targets_python3_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/dbus-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(-)] >=dev-python/pygobject-3.12[python_targets_python3_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/appstream-glib[introspection] x11-libs/pango[introspection] media-libs/gstreamer:1.0[introspection] media-plugins/gst-plugins-meta:1.0[aac,http,mp3] >=x11-libs/gtk+-3.14:3[introspection] x11-themes/gnome-icon-theme-symbolic libnotify? ( x11-libs/libnotify[introspection] ) appindicator? ( dev-libs/libappindicator:3[introspection] ) keybinder? ( dev-libs/keybinder:3[introspection] )
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=999ad05ab96c7a63ad847acea0f38d6e
diff --git a/metadata/md5-cache/media-sound/playerctl-0.5.0 b/metadata/md5-cache/media-sound/playerctl-0.5.0
index 65491d909fcc..593a5c0f3485 100644
--- a/metadata/md5-cache/media-sound/playerctl-0.5.0
+++ b/metadata/md5-cache/media-sound/playerctl-0.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection
 SLOT=0
 SRC_URI=https://github.com/acrisci/playerctl/archive/v0.5.0.tar.gz -> playerctl-0.5.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a01f9b963c58dd2ce81c41d6da8ce959
diff --git a/metadata/md5-cache/media-sound/playerctl-0.6.0 b/metadata/md5-cache/media-sound/playerctl-0.6.0
index 17dd512f1d85..257c0b68932f 100644
--- a/metadata/md5-cache/media-sound/playerctl-0.6.0
+++ b/metadata/md5-cache/media-sound/playerctl-0.6.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection
 SLOT=0
 SRC_URI=https://github.com/acrisci/playerctl/archive/v0.6.0.tar.gz -> playerctl-0.6.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d78623fd960ea200cd64b8f433b16c55
diff --git a/metadata/md5-cache/media-sound/playerctl-0.6.1 b/metadata/md5-cache/media-sound/playerctl-0.6.1
index 14a0a98b491a..a40b3424d1bf 100644
--- a/metadata/md5-cache/media-sound/playerctl-0.6.1
+++ b/metadata/md5-cache/media-sound/playerctl-0.6.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-libs/glib:2 introspection? ( dev-libs/gobject-introspection:= )
 SLOT=0
 SRC_URI=https://github.com/acrisci/playerctl/archive/v0.6.1.tar.gz -> playerctl-0.6.1.tar.gz
-_eclasses_=meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f195fc290d0ab1a66f5c8f29d37f1f82
diff --git a/metadata/md5-cache/media-sound/pms-0.42_p20170508 b/metadata/md5-cache/media-sound/pms-0.42_p20170508
index 769b6a2b3ec6..1133d5df7273 100644
--- a/metadata/md5-cache/media-sound/pms-0.42_p20170508
+++ b/metadata/md5-cache/media-sound/pms-0.42_p20170508
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=sys-libs/ncurses:0=[unicode] media-libs/libmpdclient
 SLOT=0
 SRC_URI=https://github.com/ambientsound/pms/tarball/8c8918488a4a22924ee04442dc5e5216783d51ff -> pms-0.42_p20170508.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8e3ec9925a8282392905ac86a6769abb
diff --git a/metadata/md5-cache/media-sound/pms-9999 b/metadata/md5-cache/media-sound/pms-9999
index 6ae5d0d86b92..baf45464dc2e 100644
--- a/metadata/md5-cache/media-sound/pms-9999
+++ b/metadata/md5-cache/media-sound/pms-9999
@@ -7,5 +7,5 @@ IUSE=+regex doc
 LICENSE=GPL-3+
 RDEPEND=sys-libs/ncurses:0=[unicode] media-libs/libmpdclient
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9b6899299fd7e4645ffe3aa050955e0a
diff --git a/metadata/md5-cache/media-sound/pnmixer-0.7.2 b/metadata/md5-cache/media-sound/pnmixer-0.7.2
index f1925824e0c8..a7d9e354f420 100644
--- a/metadata/md5-cache/media-sound/pnmixer-0.7.2
+++ b/metadata/md5-cache/media-sound/pnmixer-0.7.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 media-libs/alsa-lib x11-libs/gtk+:3 x11-libs/libX11 libnotify? ( x11-libs/libnotify )
 SLOT=0
 SRC_URI=https://github.com/nicklan/pnmixer/releases/download/v0.7.2/pnmixer-v0.7.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=5041878350c591982c5e064a8e0ca7b3
diff --git a/metadata/md5-cache/media-sound/pnmixer-9999 b/metadata/md5-cache/media-sound/pnmixer-9999
index 9e8068378644..7a6ca72fcc79 100644
--- a/metadata/md5-cache/media-sound/pnmixer-9999
+++ b/metadata/md5-cache/media-sound/pnmixer-9999
@@ -7,5 +7,5 @@ IUSE=libnotify
 LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 media-libs/alsa-lib >=x11-libs/gtk+-3.12:3 x11-libs/libX11 libnotify? ( x11-libs/libnotify )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=82ef0264a4d99e8692bc84d7902f3bfe
diff --git a/metadata/md5-cache/media-sound/positron-1.1-r1 b/metadata/md5-cache/media-sound/positron-1.1-r1
index f26e6e5fc503..2952339985dc 100644
--- a/metadata/md5-cache/media-sound/positron-1.1-r1
+++ b/metadata/md5-cache/media-sound/positron-1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=vorbis? ( dev-python/pyvorbis[python_targets_python2_7(-)?,-python_singl
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://www.xiph.org/positron/files/source/positron-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c4ca00c76add2adff13f2ca8f87818ae
diff --git a/metadata/md5-cache/media-sound/potamus-16 b/metadata/md5-cache/media-sound/potamus-16
index 85152dfae586..def4a236bb19 100644
--- a/metadata/md5-cache/media-sound/potamus-16
+++ b/metadata/md5-cache/media-sound/potamus-16
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 >=gnome-base/libglade-2 media-libs/libsamplerate ao? ( media-libs/libao ) audiofile? ( media-libs/audiofile ) flac? ( media-libs/flac ) jack? ( media-sound/jack-audio-connection-kit ) libav? ( media-video/libav:= ) !libav? ( >=media-video/ffmpeg-2.8:0= ) mad? ( media-libs/libmad ) modplug? ( media-libs/libmodplug ) opus? ( media-libs/opusfile ) vorbis? ( media-libs/libvorbis )
 SLOT=0
 SRC_URI=http://offog.org/files/potamus-16.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=09b626e8e0eaa77c3eff916b58decad7
diff --git a/metadata/md5-cache/media-sound/pragha-1.3.3 b/metadata/md5-cache/media-sound/pragha-1.3.3
index f7c843b5d33e..242b6244d5bd 100644
--- a/metadata/md5-cache/media-sound/pragha-1.3.3
+++ b/metadata/md5-cache/media-sound/pragha-1.3.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/sqlite-3.4:3= >=dev-libs/glib-2.36:= media-libs/gstreamer:1.0=
 REQUIRED_USE=glyr? ( peas ) grilo? ( peas ) libnotify? ( peas ) mtp? ( udev ) rygel? ( peas ) soup? ( peas ) udev? ( peas )
 SLOT=0
 SRC_URI=https://github.com/pragha-music-player/pragha/releases/download/v1.3.3/pragha-1.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=09d9ce4a0d0bf208ebe6e46ba1cc5a37
diff --git a/metadata/md5-cache/media-sound/pragha-1.3.90 b/metadata/md5-cache/media-sound/pragha-1.3.90
index e86502f05538..a6c976842a72 100644
--- a/metadata/md5-cache/media-sound/pragha-1.3.90
+++ b/metadata/md5-cache/media-sound/pragha-1.3.90
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/sqlite-3.4:3= >=dev-libs/glib-2.36:= media-libs/gstreamer:1.0=
 REQUIRED_USE=glyr? ( peas ) grilo? ( peas ) libnotify? ( peas ) mtp? ( udev ) rygel? ( peas ) soup? ( peas ) udev? ( peas )
 SLOT=0
 SRC_URI=https://github.com/pragha-music-player/pragha/releases/download/V1.3.90/pragha-1.3.90.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a8db9a3b2822d95f1121307322a1e025
diff --git a/metadata/md5-cache/media-sound/pragha-1.3.91 b/metadata/md5-cache/media-sound/pragha-1.3.91
index 602589de5627..881580838b2a 100644
--- a/metadata/md5-cache/media-sound/pragha-1.3.91
+++ b/metadata/md5-cache/media-sound/pragha-1.3.91
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/sqlite-3.4:3= >=dev-libs/glib-2.42:= media-libs/gstreamer:1.0=
 REQUIRED_USE=glyr? ( peas ) grilo? ( peas ) koel? ( soup ) libnotify? ( peas ) mtp? ( udev ) rygel? ( peas ) soup? ( peas ) udev? ( peas )
 SLOT=0
 SRC_URI=https://github.com/pragha-music-player/pragha/releases/download/v1.3.91/pragha-1.3.91.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cbc05047df678b8044db53ae35dabb4f
diff --git a/metadata/md5-cache/media-sound/pragha-1.3.91.1 b/metadata/md5-cache/media-sound/pragha-1.3.91.1
index bab44e6719ca..2babb77a3000 100644
--- a/metadata/md5-cache/media-sound/pragha-1.3.91.1
+++ b/metadata/md5-cache/media-sound/pragha-1.3.91.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/sqlite-3.4:3= >=dev-libs/glib-2.42:= media-libs/gstreamer:1.0=
 REQUIRED_USE=glyr? ( peas ) grilo? ( peas ) koel? ( soup ) libnotify? ( peas ) mtp? ( udev ) rygel? ( peas ) soup? ( peas ) udev? ( peas )
 SLOT=0
 SRC_URI=https://github.com/pragha-music-player/pragha/releases/download/v1.3.91.1/pragha-1.3.91.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cbc05047df678b8044db53ae35dabb4f
diff --git a/metadata/md5-cache/media-sound/pragha-1.3.92 b/metadata/md5-cache/media-sound/pragha-1.3.92
index f1fd9e5b0f00..e0674a9b4ce5 100644
--- a/metadata/md5-cache/media-sound/pragha-1.3.92
+++ b/metadata/md5-cache/media-sound/pragha-1.3.92
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/sqlite-3.4:3= >=dev-libs/glib-2.42:= media-libs/gstreamer:1.0=
 REQUIRED_USE=glyr? ( peas ) grilo? ( peas ) koel? ( soup ) libnotify? ( peas ) mtp? ( udev ) rygel? ( peas ) soup? ( peas ) udev? ( peas )
 SLOT=0
 SRC_URI=https://github.com/pragha-music-player/pragha/releases/download/v1.3.92/pragha-1.3.92.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cbc05047df678b8044db53ae35dabb4f
diff --git a/metadata/md5-cache/media-sound/pragha-1.3.99 b/metadata/md5-cache/media-sound/pragha-1.3.99
new file mode 100644
index 000000000000..7076ed82dcbe
--- /dev/null
+++ b/metadata/md5-cache/media-sound/pragha-1.3.99
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=>=dev-db/sqlite-3.4:3= >=dev-libs/glib-2.42:= media-libs/gstreamer:1.0= media-libs/gst-plugins-base:1.0= >=media-libs/taglib-1.8:= >=x11-libs/gtk+-3.14:3= >=xfce-base/libxfce4ui-4.11:=[gtk3(+)] cdda? ( >=dev-libs/libcdio-0.90:= >=dev-libs/libcdio-paranoia-0.90:= >=media-libs/libcddb-1.3.0:= ) glyr? ( >=media-libs/glyr-1.0.1:= ) grilo? ( media-libs/grilo:0.3=[network] ) keybinder? ( >=dev-libs/keybinder-0.2.0:3= ) koel? ( dev-libs/json-glib:= ) lastfm? ( >=media-libs/libclastfm-0.5:= ) libnotify? ( >=x11-libs/libnotify-0.7.5:= ) mtp? ( >=media-libs/libmtp-1.1.0:= ) peas? ( >=dev-libs/libpeas-1.0.0:=[gtk] ) playlist? ( >=dev-libs/totem-pl-parser-2.26:= ) rygel? ( >=net-misc/rygel-0.26:= ) soup? ( >=net-libs/libsoup-2.38:= ) udev? ( virtual/libgudev:= ) dev-util/intltool >=dev-util/xfce4-dev-tools-4.10 sys-devel/gettext virtual/pkgconfig xfce-base/exo >=sys-apps/sed-4
+DESCRIPTION=A lightweight music player (for Xfce)
+EAPI=6
+HOMEPAGE=https://github.com/pragha-music-player/pragha
+IUSE=cdda +glyr grilo +keybinder koel lastfm libnotify mtp +peas +playlist rygel soup +udev
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-db/sqlite-3.4:3= >=dev-libs/glib-2.42:= media-libs/gstreamer:1.0= media-libs/gst-plugins-base:1.0= >=media-libs/taglib-1.8:= >=x11-libs/gtk+-3.14:3= >=xfce-base/libxfce4ui-4.11:=[gtk3(+)] cdda? ( >=dev-libs/libcdio-0.90:= >=dev-libs/libcdio-paranoia-0.90:= >=media-libs/libcddb-1.3.0:= ) glyr? ( >=media-libs/glyr-1.0.1:= ) grilo? ( media-libs/grilo:0.3=[network] ) keybinder? ( >=dev-libs/keybinder-0.2.0:3= ) koel? ( dev-libs/json-glib:= ) lastfm? ( >=media-libs/libclastfm-0.5:= ) libnotify? ( >=x11-libs/libnotify-0.7.5:= ) mtp? ( >=media-libs/libmtp-1.1.0:= ) peas? ( >=dev-libs/libpeas-1.0.0:=[gtk] ) playlist? ( >=dev-libs/totem-pl-parser-2.26:= ) rygel? ( >=net-misc/rygel-0.26:= ) soup? ( >=net-libs/libsoup-2.38:= ) udev? ( virtual/libgudev:= ) media-plugins/gst-plugins-meta:1.0
+REQUIRED_USE=glyr? ( peas ) grilo? ( peas ) koel? ( soup ) libnotify? ( peas ) mtp? ( udev ) rygel? ( peas ) soup? ( peas ) udev? ( peas )
+SLOT=0
+SRC_URI=https://github.com/pragha-music-player/pragha/releases/download/1.3.99/pragha-1.3.99.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_=700b72aeb02f8a49cfd87fdb5c91fa0a
diff --git a/metadata/md5-cache/media-sound/pulseaudio-11.1-r1 b/metadata/md5-cache/media-sound/pulseaudio-11.1-r1
index 320ff0993ded..93c10e9367ba 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-11.1-r1
+++ b/metadata/md5-cache/media-sound/pulseaudio-11.1-r1
@@ -11,5 +11,5 @@ RDEPEND=|| ( elibc_glibc? ( virtual/libc ) elibc_uclibc? ( virtual/libc ) dev-li
 REQUIRED_USE=bluetooth? ( dbus ) equalizer? ( dbus ) ofono-headset? ( bluetooth ) native-headset? ( bluetooth ) udev? ( || ( alsa oss ) )
 SLOT=0
 SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-11.1.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=49b52301e3b3c54815ee74a96955ab7d
diff --git a/metadata/md5-cache/media-sound/pulseaudio-12.2 b/metadata/md5-cache/media-sound/pulseaudio-12.2
index 4ff7e1803151..7cb87c9bc8a1 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-12.2
+++ b/metadata/md5-cache/media-sound/pulseaudio-12.2
@@ -11,5 +11,5 @@ RDEPEND=|| ( elibc_glibc? ( virtual/libc ) elibc_uclibc? ( virtual/libc ) dev-li
 REQUIRED_USE=bluetooth? ( dbus ) equalizer? ( dbus ) ofono-headset? ( bluetooth ) native-headset? ( bluetooth ) realtime? ( dbus ) udev? ( || ( alsa oss ) )
 SLOT=0
 SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-12.2.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=14b63fedb77fd1169cc2e87c2c8734b8
diff --git a/metadata/md5-cache/media-sound/pulseeffects-3.2.3 b/metadata/md5-cache/media-sound/pulseeffects-3.2.3
index e5729c0cca47..04d76ba72135 100644
--- a/metadata/md5-cache/media-sound/pulseeffects-3.2.3
+++ b/metadata/md5-cache/media-sound/pulseeffects-3.2.3
@@ -9,5 +9,5 @@ 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(-)] python_targets_python3_4? ( dev-python/configparser ) 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/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-python/pycairo[python_targets_python3_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/gst-python-1.12.0:1.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(-)] >=x11-libs/gtk+-3.18:3 dev-python/numpy[python_targets_python3_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.18[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=media-libs/lilv-0.24.2-r1 >=media-plugins/calf-0.90.0[lv2] >=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 >=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 media-sound/pulseaudio[equalizer]
 SLOT=0
 SRC_URI=https://github.com/wwmm/pulseeffects/archive/v3.2.3.tar.gz -> pulseeffects-3.2.3.tar.gz
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=22478e778c4ef05f32bf0f85bac4d076
diff --git a/metadata/md5-cache/media-sound/pulseeffects-3.2.3-r1 b/metadata/md5-cache/media-sound/pulseeffects-3.2.3-r1
index e2d2c696cecf..dcfd25a21795 100644
--- a/metadata/md5-cache/media-sound/pulseeffects-3.2.3-r1
+++ b/metadata/md5-cache/media-sound/pulseeffects-3.2.3-r1
@@ -9,5 +9,5 @@ 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(-)] python_targets_python3_4? ( dev-python/configparser ) 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/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-python/pycairo[python_targets_python3_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/gst-python-1.12.0:1.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(-)] >=x11-libs/gtk+-3.18:3[introspection] dev-python/numpy[python_targets_python3_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.18[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=media-libs/lilv-0.24.2-r1 >=media-plugins/calf-0.90.0[lv2] >=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[introspection] >=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 dev-libs/appstream-glib sys-devel/gettext media-sound/pulseaudio[equalizer]
 SLOT=0
 SRC_URI=https://github.com/wwmm/pulseeffects/archive/v3.2.3.tar.gz -> pulseeffects-3.2.3.tar.gz
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=76b4fbc5e8ddb1eeca1b9495b8b772cf
diff --git a/metadata/md5-cache/media-sound/pulseeffects-4.3.7 b/metadata/md5-cache/media-sound/pulseeffects-4.3.7
index 466a71535384..e9d6e27ed277 100644
--- a/metadata/md5-cache/media-sound/pulseeffects-4.3.7
+++ b/metadata/md5-cache/media-sound/pulseeffects-4.3.7
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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-9999 b/metadata/md5-cache/media-sound/pulseeffects-9999
index 6d41077818b4..86ff53bb7690 100644
--- a/metadata/md5-cache/media-sound/pulseeffects-9999
+++ b/metadata/md5-cache/media-sound/pulseeffects-9999
@@ -7,5 +7,5 @@ IUSE=bs2b calf mda-lv2 rubberband
 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
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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/pympd-0.08.1-r1 b/metadata/md5-cache/media-sound/pympd-0.08.1-r1
index 78bb1ed05dd9..5647c4059178 100644
--- a/metadata/md5-cache/media-sound/pympd-0.08.1-r1
+++ b/metadata/md5-cache/media-sound/pympd-0.08.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=mirror://sourceforge/pympd/pympd-0.08.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8114b90ecb3d184687dc47e9ff6b06af
diff --git a/metadata/md5-cache/media-sound/qastools-0.21.0 b/metadata/md5-cache/media-sound/qastools-0.21.0
index 76c2c90b9701..a52f195ba63b 100644
--- a/metadata/md5-cache/media-sound/qastools-0.21.0
+++ b/metadata/md5-cache/media-sound/qastools-0.21.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-libs/alsa-lib virtual/libudev:=
 SLOT=0
 SRC_URI=mirror://sourceforge/qastools/0.21.0/qastools_0.21.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9989aaad7a7a64436791fbc0a3639e7f
diff --git a/metadata/md5-cache/media-sound/qmmp-1.2.3 b/metadata/md5-cache/media-sound/qmmp-1.2.3
index 75b1ec263123..5c63a1de4b1d 100644
--- a/metadata/md5-cache/media-sound/qmmp-1.2.3
+++ b/metadata/md5-cache/media-sound/qmmp-1.2.3
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev
 REQUIRED_USE=gnome? ( dbus ) shout? ( soxr vorbis ) udisks? ( dbus )
 SLOT=0
 SRC_URI=http://qmmp.ylsoftware.com/files/qmmp-1.2.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0536f5caddc9affa2793eec713b1c0b7
diff --git a/metadata/md5-cache/media-sound/qmmp-1.2.4 b/metadata/md5-cache/media-sound/qmmp-1.2.4
index 7a37076fb703..35ed398b873a 100644
--- a/metadata/md5-cache/media-sound/qmmp-1.2.4
+++ b/metadata/md5-cache/media-sound/qmmp-1.2.4
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev
 REQUIRED_USE=gnome? ( dbus ) shout? ( soxr vorbis ) udisks? ( dbus )
 SLOT=0
 SRC_URI=http://qmmp.ylsoftware.com/files/qmmp-1.2.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c53ab318b4a8e3670477f2d5b190e68d
diff --git a/metadata/md5-cache/media-sound/qmmp-9999 b/metadata/md5-cache/media-sound/qmmp-9999
index cf7909ba21eb..ad18263460f9 100644
--- a/metadata/md5-cache/media-sound/qmmp-9999
+++ b/metadata/md5-cache/media-sound/qmmp-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/taglib x11-libs/libX11 aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) cue? ( media-libs/libcue ) curl? ( net-misc/curl ) dbus? ( dev-qt/qtdbus:5 ) enca? ( app-i18n/enca ) ffmpeg? ( !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) jack? ( media-libs/libsamplerate media-sound/jack-audio-connection-kit ) ladspa? ( media-libs/ladspa-cmt ) mad? ( media-libs/libmad ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) modplug? ( >=media-libs/libmodplug-0.8.4 ) mplayer? ( media-video/mplayer ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) projectm? ( dev-qt/qtgui:5[-gles2] dev-qt/qtopengl:5 media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) qtmedia? ( dev-qt/qtmultimedia:5 ) scrobbler? ( net-misc/curl ) shout? ( media-libs/libshout ) sid? ( >=media-libs/libsidplayfp-1.1.0 ) sndfile? ( media-libs/libsndfile ) soxr? ( media-libs/soxr ) udisks? ( sys-fs/udisks:2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wavpack? ( media-sound/wavpack )
 REQUIRED_USE=gnome? ( dbus ) shout? ( soxr vorbis ) udisks? ( dbus )
 SLOT=0
-_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	subversion	3d1eb4b41d7190570a84f786958ebb13	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	subversion	3d1eb4b41d7190570a84f786958ebb13	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ab8bc1c61cb8501aad0cdc582dd2efc0
diff --git a/metadata/md5-cache/media-sound/qtagger-1.0.1_p20150402 b/metadata/md5-cache/media-sound/qtagger-1.0.1_p20150402
index 111efa7d8d49..7453cd7731c0 100644
--- a/metadata/md5-cache/media-sound/qtagger-1.0.1_p20150402
+++ b/metadata/md5-cache/media-sound/qtagger-1.0.1_p20150402
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/taglib
 SLOT=0
 SRC_URI=https://github.com/DOOMer/qtagger/archive/0e74fe022ddbb689f7bae0460a21be303114029b.tar.gz -> qtagger-1.0.1_p20150402.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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0c6012011bdf321be1c75bcd8d5b2c7b
diff --git a/metadata/md5-cache/media-sound/qtscrobbler-0.11_pre20130123 b/metadata/md5-cache/media-sound/qtscrobbler-0.11_pre20130123
index 464006f83f79..abe48296133c 100644
--- a/metadata/md5-cache/media-sound/qtscrobbler-0.11_pre20130123
+++ b/metadata/md5-cache/media-sound/qtscrobbler-0.11_pre20130123
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=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
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/media-sound/quimup-1.4.0 b/metadata/md5-cache/media-sound/quimup-1.4.0
deleted file mode 100644
index 984070ed2a3e..000000000000
--- a/metadata/md5-cache/media-sound/quimup-1.4.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=media-libs/libmpdclient-2.3 media-libs/taglib virtual/pkgconfig
-DESCRIPTION=A Qt5 client for the music player daemon (MPD) written in C++
-EAPI=5
-HOMEPAGE=http://mpd.wikia.com/wiki/Client:Quimup
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=media-libs/libmpdclient-2.3 media-libs/taglib
-SLOT=0
-SRC_URI=mirror://sourceforge/quimup/quimup_1.4.0_src.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b06273ab3e588df701ecbd68fbd2d617
diff --git a/metadata/md5-cache/media-sound/quimup-1.4.3 b/metadata/md5-cache/media-sound/quimup-1.4.3
index b0d853ec3bdb..12062dcc5ff3 100644
--- a/metadata/md5-cache/media-sound/quimup-1.4.3
+++ b/metadata/md5-cache/media-sound/quimup-1.4.3
@@ -3,10 +3,10 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=me
 DESCRIPTION=A Qt5 client for the music player daemon (MPD) written in C++
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/quimup/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=media-libs/libmpdclient-2.3 media-libs/taglib
 SLOT=0
 SRC_URI=mirror://sourceforge/quimup/quimup_1.4.3_source.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=b539399bdc7087f677d382f949ca5444
+_md5_=cda9de02192d3372eb88d141bad01467
diff --git a/metadata/md5-cache/media-sound/quodlibet-3.8.1-r1 b/metadata/md5-cache/media-sound/quodlibet-3.8.1-r1
index 262d2a0bde0f..bf3f1dfdeef3 100644
--- a/metadata/md5-cache/media-sound/quodlibet-3.8.1-r1
+++ b/metadata/md5-cache/media-sound/quodlibet-3.8.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/keybinder:3[introspection] dev-python/feedparser[python_targets
 REQUIRED_USE=ipod? ( dbus ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/quodlibet/quodlibet/archive/release-3.8.1.tar.gz -> quodlibet-3.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7ef8e956cf63dd95a0b0b87d9776142d
diff --git a/metadata/md5-cache/media-sound/quodlibet-3.9.1 b/metadata/md5-cache/media-sound/quodlibet-3.9.1
index ecf4707f5020..2901d7e1bd56 100644
--- a/metadata/md5-cache/media-sound/quodlibet-3.9.1
+++ b/metadata/md5-cache/media-sound/quodlibet-3.9.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/keybinder:3[introspection] dev-python/feedparser[python_targets
 REQUIRED_USE=ipod? ( dbus ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/quodlibet/quodlibet/archive/release-3.9.1.tar.gz -> quodlibet-3.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fa6c808de97f7e55872fb750c2315ba4
diff --git a/metadata/md5-cache/media-sound/quodlibet-4.1.0 b/metadata/md5-cache/media-sound/quodlibet-4.1.0
index a42b32dfe431..1820ba2b2d01 100644
--- a/metadata/md5-cache/media-sound/quodlibet-4.1.0
+++ b/metadata/md5-cache/media-sound/quodlibet-4.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/keybinder:3[introspection] dev-python/feedparser[python_targets
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/quodlibet/quodlibet/archive/release-4.1.0.tar.gz -> quodlibet-4.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0cadbf4351ca11ff25d7b6e10b73b585
diff --git a/metadata/md5-cache/media-sound/rgain-1.2.1-r1 b/metadata/md5-cache/media-sound/rgain-1.2.1-r1
index 5fff995d9496..d01cfadbc564 100644
--- a/metadata/md5-cache/media-sound/rgain-1.2.1-r1
+++ b/metadata/md5-cache/media-sound/rgain-1.2.1-r1
@@ -10,5 +10,5 @@ RDEPEND=media-libs/mutagen dev-python/pygobject:3[python_targets_python2_7(-)?,-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rgain/rgain-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2d439f84314d6fa1fb94deaad67eb0d7
diff --git a/metadata/md5-cache/media-sound/rhythmbox-3.4.2 b/metadata/md5-cache/media-sound/rhythmbox-3.4.2
index 7a54726b226e..118519d4e838 100644
--- a/metadata/md5-cache/media-sound/rhythmbox-3.4.2
+++ b/metadata/md5-cache/media-sound/rhythmbox-3.4.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/libxml2-2.7.8:2 >=x11-libs/gtk+-3.16:3
 REQUIRED_USE=ipod? ( udev ) mtp? ( udev ) dbus? ( 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 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/rhythmbox/3.4/rhythmbox-3.4.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5aee092d7544aa2983d74768d3c624aa
diff --git a/metadata/md5-cache/media-sound/rosegarden-17.04 b/metadata/md5-cache/media-sound/rosegarden-17.04
index a5bc912dae0d..afd1ae5fb0cb 100644
--- a/metadata/md5-cache/media-sound/rosegarden-17.04
+++ b/metadata/md5-cache/media-sound/rosegarden-17.04
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/alsa-lib:= >=media-libs/dssi-1.0.0:= media-libs/ladspa-sdk:= media-libs/liblo:= media-libs/liblrdf:= media-libs/libsamplerate:= media-libs/libsndfile:= sci-libs/fftw:3.0 sys-libs/zlib:= virtual/jack x11-libs/libSM:= lirc? ( app-misc/lirc:= )
 SLOT=0
 SRC_URI=mirror://sourceforge/rosegarden/rosegarden-17.04.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=3a2d563cbd7d1ffc0c8b809cc4a99efe
diff --git a/metadata/md5-cache/media-sound/rosegarden-17.12.1 b/metadata/md5-cache/media-sound/rosegarden-17.12.1
index 911568ad7820..4b9db979d01e 100644
--- a/metadata/md5-cache/media-sound/rosegarden-17.12.1
+++ b/metadata/md5-cache/media-sound/rosegarden-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/alsa-lib:= >=media-libs/dssi-1.0.0:= media-libs/ladspa-sdk:= media-libs/liblo:= media-libs/liblrdf:= media-libs/libsamplerate:= media-libs/libsndfile:= sci-libs/fftw:3.0 sys-libs/zlib:= virtual/jack x11-libs/libSM:= lirc? ( app-misc/lirc:= )
 SLOT=0
 SRC_URI=mirror://sourceforge/rosegarden/rosegarden-17.12.1.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=414076c1156d5f9f571c79a6108fabb5
diff --git a/metadata/md5-cache/media-sound/schismtracker-20120105 b/metadata/md5-cache/media-sound/schismtracker-20120105
deleted file mode 100644
index aeb9d603bc49..000000000000
--- a/metadata/md5-cache/media-sound/schismtracker-20120105
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=media-libs/alsa-lib >=media-libs/libsdl-1.2[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXv x11-libs/libXxf86misc virtual/os-headers x11-base/xorg-proto
-DESCRIPTION=Free implementation of Impulse Tracker, a tool used to create high quality music
-EAPI=4
-HOMEPAGE=http://eval.sovietrussia.org//wiki/Schism_Tracker
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 LGPL-2 public-domain
-RDEPEND=media-libs/alsa-lib >=media-libs/libsdl-1.2[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXv x11-libs/libXxf86misc
-SLOT=0
-SRC_URI=http://schismtracker.org/dl/schismtracker-20120105.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_=919d505d97a694826486a99a8fd2e2f0
diff --git a/metadata/md5-cache/media-sound/schismtracker-20180810 b/metadata/md5-cache/media-sound/schismtracker-20180810
index a877286f328b..d2613173cbfe 100644
--- a/metadata/md5-cache/media-sound/schismtracker-20180810
+++ b/metadata/md5-cache/media-sound/schismtracker-20180810
@@ -3,10 +3,10 @@ DEPEND=media-libs/alsa-lib >=media-libs/libsdl-1.2[X] x11-libs/libX11 x11-libs/l
 DESCRIPTION=Free implementation of Impulse Tracker, a tool used to create high quality music
 EAPI=6
 HOMEPAGE=http://schismtracker.org/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2 LGPL-2 public-domain
 RDEPEND=media-libs/alsa-lib >=media-libs/libsdl-1.2[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXv x11-libs/libXxf86misc
 SLOT=0
 SRC_URI=https://github.com/schismtracker/schismtracker/archive/20180810.tar.gz -> schismtracker-20180810.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=a5a297290e1af2e490980dbf06f98243
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=9016b82d33d445ad8536081f64f26c65
diff --git a/metadata/md5-cache/media-sound/sonata-1.6.2.1-r1 b/metadata/md5-cache/media-sound/sonata-1.6.2.1-r1
index 1129ee501ad1..a5642dba5a83 100644
--- a/metadata/md5-cache/media-sound/sonata-1.6.2.1-r1
+++ b/metadata/md5-cache/media-sound/sonata-1.6.2.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pygtk-2.12 || ( x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:2
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://gentoo/sonata-1.6.2.1.tar.bz2
-_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e520289cb9747ab956c7a2fa04972b43
diff --git a/metadata/md5-cache/media-sound/sonata-1.6.2.1-r2 b/metadata/md5-cache/media-sound/sonata-1.6.2.1-r2
index 3827afc9be6e..1e159b26f086 100644
--- a/metadata/md5-cache/media-sound/sonata-1.6.2.1-r2
+++ b/metadata/md5-cache/media-sound/sonata-1.6.2.1-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pygtk-2.12:2 x11-libs/gdk-pixbuf:2[jpeg] >=dev-python/pytho
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://gentoo/sonata-1.6.2.1.tar.bz2
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e7f30f418ad62fdf33189c8819c69f3e
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 4e74e73ce315..63385d2b2965 100644
--- a/metadata/md5-cache/media-sound/sonic-visualiser-3.1.1
+++ b/metadata/md5-cache/media-sound/sonic-visualiser-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2 >=dev-libs/capnproto-0.6:= dev-libs/serd dev-libs/sord de
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3dfd9f4750ae6abb8f5dfe70bce72d91
diff --git a/metadata/md5-cache/media-sound/sound-juicer-3.24.0 b/metadata/md5-cache/media-sound/sound-juicer-3.24.0
index d4751532735c..af862ac42764 100644
--- a/metadata/md5-cache/media-sound/sound-juicer-3.24.0
+++ b/metadata/md5-cache/media-sound/sound-juicer-3.24.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=app-text/iso-codes >=dev-libs/glib-2.49.5:2[dbus] >=x11-libs/gtk+-3.21.6:3 media-libs/libcanberra[gtk3] >=app-cdr/brasero-2.90 sys-apps/dbus gnome-base/gsettings-desktop-schemas >=media-libs/libdiscid-0.4.0 >=media-libs/musicbrainz-5.0.1:5= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0[vorbis?] flac? ( media-plugins/gst-plugins-flac:1.0 ) gnome-base/gvfs[cdda,udev] || ( media-plugins/gst-plugins-cdparanoia:1.0 media-plugins/gst-plugins-cdio:1.0 ) media-plugins/gst-plugins-meta:1.0
 SLOT=0
 SRC_URI=mirror://gnome/sources/sound-juicer/3.24/sound-juicer-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c9595e8bff475c17076c67a71ef8447e
diff --git a/metadata/md5-cache/media-sound/soundconverter-3.0.0 b/metadata/md5-cache/media-sound/soundconverter-3.0.0
index 510c12e99166..d634a32ba87c 100644
--- a/metadata/md5-cache/media-sound/soundconverter-3.0.0
+++ b/metadata/md5-cache/media-sound/soundconverter-3.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/soundconverter/trunk/3.0.0/+download/soundconverter-3.0.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=58efcfaa60f52a40ae108c77d41bc776
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 f7f66f6719a0..768f0bb7e90e 100644
--- a/metadata/md5-cache/media-sound/soundkonverter-3.0.1-r1
+++ b/metadata/md5-cache/media-sound/soundkonverter-3.0.1-r1
@@ -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/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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/spotify-1.0.72 b/metadata/md5-cache/media-sound/spotify-1.0.72
index e811f3e7f916..0bef6d907f54 100644
--- a/metadata/md5-cache/media-sound/spotify-1.0.72
+++ b/metadata/md5-cache/media-sound/spotify-1.0.72
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/nss gnome-base/gconf gnome-extra/zenity media-libs/alsa-lib med
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb
-_eclasses_=desktop	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f2ddf35e7510a7f246c4f4005023bbbd
diff --git a/metadata/md5-cache/media-sound/spotify-1.0.80 b/metadata/md5-cache/media-sound/spotify-1.0.80
index 3baac2e3a1a5..ab464cfd12d6 100644
--- a/metadata/md5-cache/media-sound/spotify-1.0.80
+++ b/metadata/md5-cache/media-sound/spotify-1.0.80
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/openssl:0 dev-libs/nss gnome-base/gconf gnome-extra/zenity medi
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.0.80.480.g51b03ac3-13_amd64.deb
-_eclasses_=desktop	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=184acf576b883da31e603eb50758e0ac
diff --git a/metadata/md5-cache/media-sound/spotify-1.0.89 b/metadata/md5-cache/media-sound/spotify-1.0.89
index 849ef47bc997..fc0f3fdcf8d2 100644
--- a/metadata/md5-cache/media-sound/spotify-1.0.89
+++ b/metadata/md5-cache/media-sound/spotify-1.0.89
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/openssl:0 dev-libs/nss gnome-base/gconf gnome-extra/zenity medi
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.0.89.313.g34a58dea-5_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1dda4a032b2a60b936d5e3e90d569297
diff --git a/metadata/md5-cache/media-sound/supercollider-3.9.3-r1 b/metadata/md5-cache/media-sound/supercollider-3.9.3-r1
index bf555ef2c02a..bca76fbd231a 100644
--- a/metadata/md5-cache/media-sound/supercollider-3.9.3-r1
+++ b/metadata/md5-cache/media-sound/supercollider-3.9.3-r1
@@ -10,5 +10,5 @@ RDEPEND=media-libs/alsa-lib sys-libs/readline:0= x11-libs/libX11 x11-libs/libXt
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://github.com/supercollider/supercollider/releases/download/Version-3.9.3/SuperCollider-3.9.3-Source-linux.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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c2df55aeba23bb45e4e4025bcb5a9026
diff --git a/metadata/md5-cache/media-sound/teamspeak-client-3.2.2 b/metadata/md5-cache/media-sound/teamspeak-client-3.2.2
index 67385eacf876..b80b7c04b53c 100644
--- a/metadata/md5-cache/media-sound/teamspeak-client-3.2.2
+++ b/metadata/md5-cache/media-sound/teamspeak-client-3.2.2
@@ -10,5 +10,5 @@ REQUIRED_USE=|| ( alsa pulseaudio )
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/3.2.2/TeamSpeak3-Client-linux_amd64-3.2.2.run ) x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/3.2.2/TeamSpeak3-Client-linux_x86-3.2.2.run )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	unpacker	ee2f5086cd7e7b747b061f58db14d89e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	unpacker	ee2f5086cd7e7b747b061f58db14d89e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=edb7dd2ce2b2650e32e1bffd31125729
diff --git a/metadata/md5-cache/media-sound/terminatorx-4.0.1-r2 b/metadata/md5-cache/media-sound/terminatorx-4.0.1-r2
index b44a0fa5e128..27782b5d0141 100644
--- a/metadata/md5-cache/media-sound/terminatorx-4.0.1-r2
+++ b/metadata/md5-cache/media-sound/terminatorx-4.0.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=alsa? ( media-libs/alsa-lib ) mad? ( media-sound/madplay ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libvorbis ) sox? ( media-sound/sox media-sound/mpg123 ) x11-libs/gtk+:3 >=dev-libs/glib-2.2:2 x11-libs/libXi x11-libs/libXxf86dga dev-libs/libxml2:2 media-libs/audiofile:= media-libs/ladspa-sdk media-libs/ladspa-cmt media-libs/liblrdf
 SLOT=0
 SRC_URI=http://www.terminatorx.org/dist/terminatorX-4.0.1.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=7fddc938960987b19d0f68e708442cae
diff --git a/metadata/md5-cache/media-sound/timidity++-2.14.0-r3 b/metadata/md5-cache/media-sound/timidity++-2.14.0-r3
index 6b91d43fcfc3..5bf8576ac00e 100644
--- a/metadata/md5-cache/media-sound/timidity++-2.14.0-r3
+++ b/metadata/md5-cache/media-sound/timidity++-2.14.0-r3
@@ -11,5 +11,5 @@ RDEPEND=alsa? ( media-libs/alsa-lib ) ao? ( >=media-libs/libao-0.8.5 ) emacs? (
 REQUIRED_USE=tk? ( X )
 SLOT=0
 SRC_URI=mirror://sourceforge/timidity/TiMidity++-2.14.0.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0697f987ee9a3baa03abdfb7ddf7952c
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 42ef6f17bfed..a921e6cb39db 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 hatchet? ( dev-cpp/websocketpp ) 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.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
 DESCRIPTION=Multi-source social music player
 EAPI=6
 HOMEPAGE=https://www.tomahawk-player.org/
-IUSE=+hatchet telepathy xmpp debug
+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 hatchet? ( dev-cpp/websocketpp ) 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.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
 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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=ef8b014af19429b314a35e344883f9f2
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	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
+_md5_=3a8bc1564314299220877142029fbd70
diff --git a/metadata/md5-cache/media-sound/traverso-0.49.5 b/metadata/md5-cache/media-sound/traverso-0.49.5
index 83f215736c9d..b4b5e9e024fa 100644
--- a/metadata/md5-cache/media-sound/traverso-0.49.5
+++ b/metadata/md5-cache/media-sound/traverso-0.49.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=media-libs/flac-1.1.2 >=media-libs/libogg-1.1.2 media-libs/libsamplerate >=media-libs/libsndfile-1.0.12 >=media-libs/libvorbis-1.1.2 >=media-sound/wavpack-4.40.0 >=sci-libs/fftw-3 alsa? ( >=media-libs/alsa-lib-1.0.0 ) jack? ( virtual/jack ) lame? ( media-sound/lame ) lv2? ( media-libs/lilv ) mad? ( >=media-libs/libmad-0.15.0 ) pulseaudio? ( >=media-sound/pulseaudio-0.9 )
 SLOT=0
 SRC_URI=https://traverso-daw.org/traverso-0.49.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=18da91472ae1eafb62983eb9e40918b7
diff --git a/metadata/md5-cache/media-sound/tuxguitar-1.3.2 b/metadata/md5-cache/media-sound/tuxguitar-1.3.2
index e67a65035e63..e7dec322e088 100644
--- a/metadata/md5-cache/media-sound/tuxguitar-1.3.2
+++ b/metadata/md5-cache/media-sound/tuxguitar-1.3.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 timidity? ( media-sound/timidity++[alsa?,oss?] ) dev-java/swt:3.7[cairo] alsa? ( media-libs/alsa-lib ) pdf? ( dev-java/itext:5 ) fluidsynth? ( media-sound/fluidsynth ) lilypond? ( media-sound/lilypond ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/tuxguitar/tuxguitar-1.3.2-src.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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_=632c9b7a44e2be730b7e9b4023831958
diff --git a/metadata/md5-cache/media-sound/vmpk-0.6.2a b/metadata/md5-cache/media-sound/vmpk-0.6.2a
index 06804ef6df82..7c25a3465cfb 100644
--- a/metadata/md5-cache/media-sound/vmpk-0.6.2a
+++ b/metadata/md5-cache/media-sound/vmpk-0.6.2a
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=media-sound/drumstick-1.0.0 x11-libs/libxcb dbus? ( dev-qt/qtdbus:5 )
 SLOT=0
 SRC_URI=mirror://sourceforge/vmpk/vmpk-0.6.2a.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4e3d052638f4dc24e9d5857fb5ac65b6
diff --git a/metadata/md5-cache/media-sound/volti-0.2.3-r1 b/metadata/md5-cache/media-sound/volti-0.2.3-r1
index dc950a6d679f..dbd65258bb20 100644
--- a/metadata/md5-cache/media-sound/volti-0.2.3-r1
+++ b/metadata/md5-cache/media-sound/volti-0.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pygtk-2.16 >=dev-python/pyalsaaudio-0.7-r1 dev-python/dbus-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://volti.googlecode.com/files/volti-0.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=58647f869e092a858d0c86296f72f560
diff --git a/metadata/md5-cache/media-sound/volwheel-0.2.8-r1 b/metadata/md5-cache/media-sound/volwheel-0.2.8-r1
index 0526e299a6ab..3a322e151b1c 100644
--- a/metadata/md5-cache/media-sound/volwheel-0.2.8-r1
+++ b/metadata/md5-cache/media-sound/volwheel-0.2.8-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-lang/perl dev-perl/Gtk2 alsa? ( media-sound/alsa-utils )
 SLOT=0
 SRC_URI=https://olwtools.googlecode.com/files/volwheel-0.2.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bc0cb5453eeb4cf2de1d8359ee270b87
diff --git a/metadata/md5-cache/media-sound/whipper-0.7.0 b/metadata/md5-cache/media-sound/whipper-0.7.0
index 85670bd19b0e..0910f55f9413 100644
--- a/metadata/md5-cache/media-sound/whipper-0.7.0
+++ b/metadata/md5-cache/media-sound/whipper-0.7.0
@@ -10,5 +10,5 @@ RDEPEND=app-cdr/cdrdao dev-libs/gobject-introspection[python_targets_python2_7(-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/JoeLametta/whipper/archive/v0.7.0.tar.gz -> whipper-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=21b449c56139fecade0bfc6e17aa26e6
diff --git a/metadata/md5-cache/media-sound/wildmidi-0.2.3.5 b/metadata/md5-cache/media-sound/wildmidi-0.2.3.5
deleted file mode 100644
index d56daff9c251..000000000000
--- a/metadata/md5-cache/media-sound/wildmidi-0.2.3.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=alsa? ( media-libs/alsa-lib ) >=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=Midi processing library and a midi player using the gus patch set
-EAPI=5
-HOMEPAGE=http://wildmidi.sourceforge.net/
-IUSE=alsa debug
-KEYWORDS=alpha amd64 arm hppa ppc ppc64 x86
-LICENSE=GPL-3 LGPL-3
-RDEPEND=alsa? ( media-libs/alsa-lib ) media-sound/timidity-freepats
-SLOT=0
-SRC_URI=mirror://sourceforge/wildmidi/wildmidi-0.2.3.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	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=524a23617dbc72b9e93da4c6b0bfb053
diff --git a/metadata/md5-cache/media-sound/wildmidi-0.3.13 b/metadata/md5-cache/media-sound/wildmidi-0.3.13
index 57eb71b772ff..7951c2224592 100644
--- a/metadata/md5-cache/media-sound/wildmidi-0.3.13
+++ b/metadata/md5-cache/media-sound/wildmidi-0.3.13
@@ -10,5 +10,5 @@ RDEPEND=player? ( alsa? ( media-libs/alsa-lib ) openal? ( media-libs/openal ) )
 REQUIRED_USE=player? ( ^^ ( alsa oss openal ) )
 SLOT=0
 SRC_URI=https://github.com/Mindwerks/wildmidi/archive/wildmidi-0.3.13.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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1df20508e97ba4bc62890ab94d2d70f3
diff --git a/metadata/md5-cache/media-sound/wildmidi-0.3.6 b/metadata/md5-cache/media-sound/wildmidi-0.3.6
deleted file mode 100644
index e4cee7e2a4fc..000000000000
--- a/metadata/md5-cache/media-sound/wildmidi-0.3.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=player? ( alsa? ( media-libs/alsa-lib ) openal? ( media-libs/openal ) ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Midi processing library and a midi player using the gus patch set
-EAPI=5
-HOMEPAGE=http://www.mindwerks.net/projects/wildmidi/
-IUSE=+alsa openal oss +player
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
-LICENSE=GPL-3 LGPL-3
-RDEPEND=player? ( alsa? ( media-libs/alsa-lib ) openal? ( media-libs/openal ) ) media-sound/timidity-freepats
-REQUIRED_USE=player? ( ^^ ( alsa oss openal ) )
-SLOT=0
-SRC_URI=https://github.com/Mindwerks/wildmidi/archive/wildmidi-0.3.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	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=9709e22a98d40eebe411fbe114d494bd
diff --git a/metadata/md5-cache/media-sound/wildmidi-0.3.7 b/metadata/md5-cache/media-sound/wildmidi-0.3.7
deleted file mode 100644
index 38910f7dbfc2..000000000000
--- a/metadata/md5-cache/media-sound/wildmidi-0.3.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=player? ( alsa? ( media-libs/alsa-lib ) openal? ( media-libs/openal ) ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Midi processing library and a midi player using the gus patch set
-EAPI=5
-HOMEPAGE=http://www.mindwerks.net/projects/wildmidi/
-IUSE=+alsa openal oss +player
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
-LICENSE=GPL-3 LGPL-3
-RDEPEND=player? ( alsa? ( media-libs/alsa-lib ) openal? ( media-libs/openal ) ) media-sound/timidity-freepats
-REQUIRED_USE=player? ( ^^ ( alsa oss openal ) )
-SLOT=0
-SRC_URI=https://github.com/Mindwerks/wildmidi/archive/wildmidi-0.3.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	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=477801f772d20b56ff77df98491284d4
diff --git a/metadata/md5-cache/media-sound/wildmidi-0.3.8 b/metadata/md5-cache/media-sound/wildmidi-0.3.8
deleted file mode 100644
index 49f7b8d931a7..000000000000
--- a/metadata/md5-cache/media-sound/wildmidi-0.3.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=player? ( alsa? ( media-libs/alsa-lib ) openal? ( media-libs/openal ) ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Midi processing library and a midi player using the gus patch set
-EAPI=5
-HOMEPAGE=http://www.mindwerks.net/projects/wildmidi/
-IUSE=+alsa openal oss +player
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
-LICENSE=GPL-3 LGPL-3
-RDEPEND=player? ( alsa? ( media-libs/alsa-lib ) openal? ( media-libs/openal ) ) media-sound/timidity-freepats
-REQUIRED_USE=player? ( ^^ ( alsa oss openal ) )
-SLOT=0
-SRC_URI=https://github.com/Mindwerks/wildmidi/archive/wildmidi-0.3.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	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=d6b5380bce4806de7c2fc7f56abb0a9a
diff --git a/metadata/md5-cache/media-sound/xfmpc-0.2.3-r1 b/metadata/md5-cache/media-sound/xfmpc-0.2.3-r1
index 2cbd9cee39da..61e360785be7 100644
--- a/metadata/md5-cache/media-sound/xfmpc-0.2.3-r1
+++ b/metadata/md5-cache/media-sound/xfmpc-0.2.3-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.18:2= >=media-libs/libmpd-0.15:= >=x11-libs/gtk+-2.16:2= >=xfce-base/libxfce4ui-4.8:= >=xfce-base/libxfce4util-4.8:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfmpc/0.2/xfmpc-0.2.3.tar.bz2
-_eclasses_=xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fa07dc1d84c060104f2a194de2749ce1
diff --git a/metadata/md5-cache/media-sound/xnoise-0.2.21 b/metadata/md5-cache/media-sound/xnoise-0.2.21
index 1c75c621c8ec..d0a4f2c4a11c 100644
--- a/metadata/md5-cache/media-sound/xnoise-0.2.21
+++ b/metadata/md5-cache/media-sound/xnoise-0.2.21
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:3 >=dev-libs/glib-2.34:2 gnome-base/librsvg:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-plugins/gst-plugins-meta:1.0 dev-db/sqlite:3 >=media-libs/libtaginfo-0.2.0 x11-libs/cairo x11-libs/libX11 ayatana? ( dev-libs/libappindicator:3 ) lastfm? ( net-libs/libsoup:2.4 ) lyrics? ( net-libs/libsoup:2.4 dev-libs/libxml2:2 )
 SLOT=0
 SRC_URI=https://www.bitbucket.org/shuerhaaken/xnoise/downloads/xnoise-0.2.21.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=657100c2153e05420995a025b7efd26e
diff --git a/metadata/md5-cache/media-sound/yarock-1.3.1 b/metadata/md5-cache/media-sound/yarock-1.3.1
new file mode 100644
index 000000000000..81106e799500
--- /dev/null
+++ b/metadata/md5-cache/media-sound/yarock-1.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-cpp/htmlcxx dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/taglib x11-libs/libX11 !phonon? ( media-video/vlc:= ) phonon? ( >=media-libs/phonon-4.10.1 ) dev-qt/linguist-tools:5 dev-qt/qtconcurrent:5 dev-qt/qtx11extras:5 sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Qt-based music player
+EAPI=6
+HOMEPAGE=https://seb-apps.github.io/yarock/
+IUSE=phonon
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=dev-cpp/htmlcxx dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/taglib x11-libs/libX11 !phonon? ( media-video/vlc:= ) phonon? ( >=media-libs/phonon-4.10.1 )
+SLOT=0
+SRC_URI=https://launchpad.net/yarock/1.x/1.3.1/+download/Yarock_1.3.1_Sources.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_=cd963bc2180f43c92b997297fab30d7f
diff --git a/metadata/md5-cache/media-sound/yoshimi-1.4.1 b/metadata/md5-cache/media-sound/yoshimi-1.4.1
index 08243a74830d..35e74661594b 100644
--- a/metadata/md5-cache/media-sound/yoshimi-1.4.1
+++ b/metadata/md5-cache/media-sound/yoshimi-1.4.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/mini-xml-2.5 >=media-libs/alsa-lib-1.0.17 media-libs/fontconfig media-libs/libsndfile >=media-sound/jack-audio-connection-kit-0.115.6 sci-libs/fftw:3.0 sys-libs/ncurses:0= sys-libs/zlib x11-libs/cairo[X] x11-libs/fltk:1[opengl] lv2? ( media-libs/lv2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/yoshimi/yoshimi-1.4.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0628c00f06067bd2a0597b49f74261e7
diff --git a/metadata/md5-cache/media-sound/yoshimi-1.5.1.1 b/metadata/md5-cache/media-sound/yoshimi-1.5.1.1
index 9e8caa90005e..568df05bc8e3 100644
--- a/metadata/md5-cache/media-sound/yoshimi-1.5.1.1
+++ b/metadata/md5-cache/media-sound/yoshimi-1.5.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/mini-xml-2.5 >=media-libs/alsa-lib-1.0.17 media-libs/fontconfig media-libs/libsndfile >=media-sound/jack-audio-connection-kit-0.115.6 sci-libs/fftw:3.0 sys-libs/ncurses:0= sys-libs/readline:0= sys-libs/zlib x11-libs/cairo[X] x11-libs/fltk:1[opengl] lv2? ( media-libs/lv2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/yoshimi/yoshimi-1.5.1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0cc90aabb9a53e20fe531831ae986c0e
diff --git a/metadata/md5-cache/media-sound/yoshimi-1.5.8.2 b/metadata/md5-cache/media-sound/yoshimi-1.5.8.2
index 651b371676da..616c15abc761 100644
--- a/metadata/md5-cache/media-sound/yoshimi-1.5.8.2
+++ b/metadata/md5-cache/media-sound/yoshimi-1.5.8.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/mini-xml-2.5 >=media-libs/alsa-lib-1.0.17 media-libs/fontconfig media-libs/libsndfile >=media-sound/jack-audio-connection-kit-0.115.6 sci-libs/fftw:3.0 sys-libs/ncurses:0= sys-libs/readline:0= sys-libs/zlib x11-libs/cairo[X] x11-libs/fltk:1[opengl] lv2? ( media-libs/lv2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/yoshimi/yoshimi-1.5.8.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b860a25ad25750ce821d2d17e6ee9741
diff --git a/metadata/md5-cache/media-sound/zynaddsubfx-3.0.3 b/metadata/md5-cache/media-sound/zynaddsubfx-3.0.3
index d63bbb9b0814..c04b68488d25 100644
--- a/metadata/md5-cache/media-sound/zynaddsubfx-3.0.3
+++ b/metadata/md5-cache/media-sound/zynaddsubfx-3.0.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/mini-xml-2.2.1 sci-libs/fftw:3.0 media-libs/liblo alsa? ( med
 REQUIRED_USE=!alsa? ( jack )
 SLOT=0
 SRC_URI=mirror://sourceforge/zynaddsubfx/zynaddsubfx-3.0.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bceb33c82e154f9c155efb1db47f353c
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index f1d3bbaa46ac..961fe3c61d0e 100644
--- a/metadata/md5-cache/media-tv/Manifest.gz
+++ b/metadata/md5-cache/media-tv/Manifest.gz
diff --git a/metadata/md5-cache/media-tv/kodi-17.3-r1 b/metadata/md5-cache/media-tv/kodi-17.3-r1
index 021a1ca03d29..6f5bb9cc12bf 100644
--- a/metadata/md5-cache/media-tv/kodi-17.3-r1
+++ b/metadata/md5-cache/media-tv/kodi-17.3-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=d
 REQUIRED_USE=python_targets_python2_7 || ( gles opengl ) gles? ( X ) opengl? ( X ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdcss/archive/2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz -> libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz https://github.com/xbmc/libdvdread/archive/17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz -> libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz https://github.com/xbmc/libdvdnav/archive/43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz -> libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/3.1.6-Krypton.tar.gz -> ffmpeg-kodi-3.1.6-Krypton.tar.gz ) https://github.com/xbmc/xbmc/archive/17.3-Krypton.tar.gz -> kodi-17.3.tar.gz !java? ( https://github.com/candrews/gentoo-kodi/raw/master/kodi-17.3-generated-addons.tar.xz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=21ccb59d52de4fd9e54ccf2f3f8329ac
diff --git a/metadata/md5-cache/media-tv/kodi-17.5-r1 b/metadata/md5-cache/media-tv/kodi-17.5-r1
index a8d2c124fd41..bb1e0ba3475e 100644
--- a/metadata/md5-cache/media-tv/kodi-17.5-r1
+++ b/metadata/md5-cache/media-tv/kodi-17.5-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=d
 REQUIRED_USE=python_targets_python2_7 || ( gles opengl ) gles? ( X ) opengl? ( X ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdcss/archive/2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz -> libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz https://github.com/xbmc/libdvdread/archive/17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz -> libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz https://github.com/xbmc/libdvdnav/archive/43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz -> libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/3.1.11-Krypton-17.5.tar.gz -> ffmpeg-kodi-3.1.11-Krypton-17.5.tar.gz ) https://github.com/xbmc/xbmc/archive/17.5-Krypton.tar.gz -> kodi-17.5.tar.gz !java? ( https://github.com/candrews/gentoo-kodi/raw/master/kodi-17.5-generated-addons.tar.xz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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 f4aa55704db4..f30801c70349 100644
--- a/metadata/md5-cache/media-tv/kodi-17.6
+++ b/metadata/md5-cache/media-tv/kodi-17.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=d
 REQUIRED_USE=python_targets_python2_7 || ( gles opengl ) gles? ( X ) opengl? ( X ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdcss/archive/2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz -> libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz https://github.com/xbmc/libdvdread/archive/17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz -> libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz https://github.com/xbmc/libdvdnav/archive/43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz -> libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/3.1.11-Krypton-17.5.tar.gz -> ffmpeg-kodi-3.1.11-Krypton-17.5.tar.gz ) https://github.com/xbmc/xbmc/archive/17.6-Krypton.tar.gz -> kodi-17.6.tar.gz !java? ( https://github.com/candrews/gentoo-kodi/raw/master/kodi-17.6-generated-addons.tar.xz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/media-tv/kodi-17.6-r1 b/metadata/md5-cache/media-tv/kodi-17.6-r1
index 84b9f9405b1e..79c9240a0a75 100644
--- a/metadata/md5-cache/media-tv/kodi-17.6-r1
+++ b/metadata/md5-cache/media-tv/kodi-17.6-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=d
 REQUIRED_USE=python_targets_python2_7 || ( gles opengl ) gles? ( X ) opengl? ( X ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdcss/archive/2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz -> libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz https://github.com/xbmc/libdvdread/archive/17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz -> libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz https://github.com/xbmc/libdvdnav/archive/43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz -> libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/3.1.11-Krypton-17.5.tar.gz -> ffmpeg-kodi-3.1.11-Krypton-17.5.tar.gz ) https://github.com/xbmc/xbmc/archive/17.6-Krypton.tar.gz -> kodi-17.6.tar.gz !java? ( https://github.com/candrews/gentoo-kodi/raw/master/kodi-17.6-generated-addons.tar.xz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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
index 66900056b979..4693fdd1d39e 100644
--- a/metadata/md5-cache/media-tv/kodi-17.6-r2
+++ b/metadata/md5-cache/media-tv/kodi-17.6-r2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=d
 REQUIRED_USE=python_targets_python2_7 || ( gles opengl ) gles? ( X ) opengl? ( X ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdcss/archive/2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz -> libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz https://github.com/xbmc/libdvdread/archive/17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz -> libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz https://github.com/xbmc/libdvdnav/archive/43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz -> libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/3.1.11-Krypton-17.5.tar.gz -> ffmpeg-kodi-3.1.11-Krypton-17.5.tar.gz ) https://github.com/xbmc/xbmc/archive/17.6-Krypton.tar.gz -> kodi-17.6.tar.gz !java? ( https://github.com/candrews/gentoo-kodi/raw/master/kodi-17.6-generated-addons.tar.xz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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
index 76ead5ef0733..3e8e73829ba7 100644
--- a/metadata/md5-cache/media-tv/kodi-17.6-r3
+++ b/metadata/md5-cache/media-tv/kodi-17.6-r3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=d
 REQUIRED_USE=python_targets_python2_7 || ( gles opengl ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdcss/archive/2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz -> libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz https://github.com/xbmc/libdvdread/archive/17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz -> libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz https://github.com/xbmc/libdvdnav/archive/43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz -> libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/3.1.11-Krypton-17.5.tar.gz -> ffmpeg-kodi-3.1.11-Krypton-17.5.tar.gz ) https://github.com/xbmc/xbmc/archive/17.6-Krypton.tar.gz -> kodi-17.6.tar.gz !java? ( https://github.com/candrews/gentoo-kodi/raw/master/kodi-17.6-generated-addons.tar.xz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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
index 4db34259c70d..dd8f04539b55 100644
--- a/metadata/md5-cache/media-tv/kodi-17.6-r4
+++ b/metadata/md5-cache/media-tv/kodi-17.6-r4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=d
 REQUIRED_USE=python_targets_python2_7 || ( gles opengl ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdcss/archive/2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz -> libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz https://github.com/xbmc/libdvdread/archive/17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz -> libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz https://github.com/xbmc/libdvdnav/archive/43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz -> libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/3.1.11-Krypton-17.5.tar.gz -> ffmpeg-kodi-3.1.11-Krypton-17.5.tar.gz ) https://github.com/xbmc/xbmc/archive/17.6-Krypton.tar.gz -> kodi-17.6.tar.gz !java? ( https://github.com/candrews/gentoo-kodi/raw/master/kodi-17.6-generated-addons.tar.xz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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
index 1b7325f42087..6830cdc3ad6a 100644
--- a/metadata/md5-cache/media-tv/kodi-17.6-r5
+++ b/metadata/md5-cache/media-tv/kodi-17.6-r5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=d
 REQUIRED_USE=python_targets_python2_7 || ( gles opengl ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdcss/archive/2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz -> libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz https://github.com/xbmc/libdvdread/archive/17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz -> libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz https://github.com/xbmc/libdvdnav/archive/43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz -> libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/3.1.11-Krypton-17.5.tar.gz -> ffmpeg-kodi-3.1.11-Krypton-17.5.tar.gz ) https://github.com/xbmc/xbmc/archive/17.6-Krypton.tar.gz -> kodi-17.6.tar.gz !java? ( https://github.com/candrews/gentoo-kodi/raw/master/kodi-17.6-generated-addons.tar.xz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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-9999 b/metadata/md5-cache/media-tv/kodi-9999
index 59d7e918e942..1ee0149745b1 100644
--- a/metadata/md5-cache/media-tv/kodi-9999
+++ b/metadata/md5-cache/media-tv/kodi-9999
@@ -9,5 +9,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=d
 REQUIRED_USE=python_targets_python2_7 || ( gles opengl ) ^^ ( gbm wayland X ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.1-Leia-Alpha-1.tar.gz -> libdvdcss-1.4.1-Leia-Alpha-1.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-1.tar.gz -> libdvdread-6.0.0-Leia-Alpha-1.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-1.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-1.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.0.1-Leia-Alpha3-1.tar.gz -> ffmpeg-kodi-4.0.1-Leia-Alpha3-1.tar.gz )
-_eclasses_=autotools	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	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/media-tv/tvheadend-4.2.6 b/metadata/md5-cache/media-tv/tvheadend-4.2.6
index 127afd2775bb..dddc39fe58d4 100644
--- a/metadata/md5-cache/media-tv/tvheadend-4.2.6
+++ b/metadata/md5-cache/media-tv/tvheadend-4.2.6
@@ -10,5 +10,5 @@ RDEPEND=virtual/libiconv dbus? ( sys-apps/dbus ) dvbcsa? ( media-libs/libdvbcsa
 REQUIRED_USE=dvbcsa? ( || ( capmt constcw cwc dvben50221 ) )
 SLOT=0
 SRC_URI=https://github.com/tvheadend/tvheadend/archive/v4.2.6.tar.gz -> tvheadend-4.2.6.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=496cb0c8ad8e46675fd6a2ba3dc6c0db
diff --git a/metadata/md5-cache/media-tv/tvheadend-9999 b/metadata/md5-cache/media-tv/tvheadend-9999
index b68468d70136..8d5204c0f53f 100644
--- a/metadata/md5-cache/media-tv/tvheadend-9999
+++ b/metadata/md5-cache/media-tv/tvheadend-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=virtual/libiconv dbus? ( sys-apps/dbus ) dvbcsa? ( media-libs/libdvbcsa ) ffmpeg? ( media-video/ffmpeg:0/55.57.57[opus?,vpx?,x264?,x265?] ) hdhomerun? ( media-libs/libhdhomerun ) !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) uriparser? ( dev-libs/uriparser ) zeroconf? ( net-dns/avahi ) zlib? ( sys-libs/zlib ) dvb? ( media-tv/dtv-scan-tables ) xmltv? ( media-tv/xmltv )
 REQUIRED_USE=ddci? ( dvb )
 SLOT=0
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=2b99ba7c0bd3f89819395f75c21287be
diff --git a/metadata/md5-cache/media-tv/tvnamer-2.3 b/metadata/md5-cache/media-tv/tvnamer-2.3
index 6c2b08799e92..6869ee9b200e 100644
--- a/metadata/md5-cache/media-tv/tvnamer-2.3
+++ b/metadata/md5-cache/media-tv/tvnamer-2.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/tvdb_api python_targets_python2_7? ( >=dev-lang/python-2.7.5-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/t/tvnamer/tvnamer-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=a7ee9c1a4c9d79fe043c0e41314d4866
diff --git a/metadata/md5-cache/media-tv/tvnamer-2.4 b/metadata/md5-cache/media-tv/tvnamer-2.4
index d449af7f182e..cc5bf2cadd2d 100644
--- a/metadata/md5-cache/media-tv/tvnamer-2.4
+++ b/metadata/md5-cache/media-tv/tvnamer-2.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/tvdb_api-1.10_pre[python_targets_python2_7(-)?,python_targe
 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/tvnamer/tvnamer-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b5ba94b5e37292e2ae788283a3911417
diff --git a/metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20170225 b/metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20170225
index deef757b2898..ba0771b49c7a 100644
--- a/metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20170225
+++ b/metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20170225
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=firmware? ( sys-firmware/tt-s2-6400-firmware ) kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://bitbucket.org/powARman/v4l-dvb-saa716x/get/3b9fce66666a.tar.gz -> v4l-dvb-saa716x-0.0.1_p20160322.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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_=915f45d7b9c652fc08ef845850d126a1
diff --git a/metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20170225-r1 b/metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20170225-r1
index 52aa07040be4..8b8889595d42 100644
--- a/metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20170225-r1
+++ b/metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20170225-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=firmware? ( sys-firmware/tt-s2-6400-firmware ) kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://bitbucket.org/powARman/v4l-dvb-saa716x/get/3b9fce66666a.tar.gz -> v4l-dvb-saa716x-0.0.1_p20160322.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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_=f79f253318eca956c31094515398da57
diff --git a/metadata/md5-cache/media-tv/v4l-utils-1.14.1 b/metadata/md5-cache/media-tv/v4l-utils-1.14.1
index fe592435a0e3..bd85e3f12550 100644
--- a/metadata/md5-cache/media-tv/v4l-utils-1.14.1
+++ b/metadata/md5-cache/media-tv/v4l-utils-1.14.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=media-libs/libv4l-1.14.1 qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 virtual/opengl media-libs/alsa-lib ) virtual/libudev !media-tv/v4l2-ctl !<media-tv/ivtv-utils-1.4.0-r2
 SLOT=0
 SRC_URI=http://linuxtv.org/downloads/v4l-utils/v4l-utils-1.14.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c522d7aae9c17199b4896b7bbcbbf4a1
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 0f917bbb9619..4206b450cb7a 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/aegisub-3.2.2_p20160518-r2 b/metadata/md5-cache/media-video/aegisub-3.2.2_p20160518-r2
index 04f4df353d2e..969a4d12e938 100644
--- a/metadata/md5-cache/media-video/aegisub-3.2.2_p20160518-r2
+++ b/metadata/md5-cache/media-video/aegisub-3.2.2_p20160518-r2
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/wxGTK:3.0[X,opengl,debug?] dev-lang/luajit:2[lua52compat] dev-l
 REQUIRED_USE=|| ( alsa openal oss portaudio pulseaudio )
 SLOT=0
 SRC_URI=https://github.com/Aegisub/Aegisub/archive/b118fe7e7a5c37540e2f0aa75af105e272bad234.tar.gz -> aegisub-3.2.2_p20160518.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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=686e347246379dd69e617412b5a2549d
diff --git a/metadata/md5-cache/media-video/aegisub-9999 b/metadata/md5-cache/media-video/aegisub-9999
index 7514e9ff81ec..354131a5193a 100644
--- a/metadata/md5-cache/media-video/aegisub-9999
+++ b/metadata/md5-cache/media-video/aegisub-9999
@@ -8,5 +8,5 @@ LICENSE=BSD MIT
 RDEPEND=x11-libs/wxGTK:3.0[X,opengl,debug?] dev-lang/luajit:2[lua52compat] dev-libs/boost:=[icu,nls,threads] dev-libs/icu:= media-libs/ffmpegsource:= media-libs/fontconfig media-libs/freetype media-libs/libass:=[fontconfig] sys-libs/zlib virtual/libiconv virtual/opengl alsa? ( media-libs/alsa-lib ) fftw? ( >=sci-libs/fftw-3.3:= ) openal? ( media-libs/openal ) portaudio? ( =media-libs/portaudio-19* ) pulseaudio? ( media-sound/pulseaudio ) spell? ( app-text/hunspell:= ) uchardet? ( app-i18n/uchardet )
 REQUIRED_USE=|| ( alsa openal oss portaudio pulseaudio )
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8adba77664c64a1e143a8b129653d61c
diff --git a/metadata/md5-cache/media-video/avidemux-2.6.20-r1 b/metadata/md5-cache/media-video/avidemux-2.6.20-r1
index a189d31ad504..9f8d8642b89c 100644
--- a/metadata/md5-cache/media-video/avidemux-2.6.20-r1
+++ b/metadata/md5-cache/media-video/avidemux-2.6.20-r1
@@ -10,5 +10,5 @@ PDEPEND=~media-libs/avidemux-plugins-2.6.20:2.6[opengl?,qt5?]
 RDEPEND=~media-libs/avidemux-core-2.6.20:2.6[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?] opengl? ( virtual/opengl:0 ) qt5? ( dev-qt/qtgui:5 ) vaapi? ( x11-libs/libva:0 ) nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) ) nls? ( virtual/libintl:0 )
 SLOT=2.6
 SRC_URI=mirror://sourceforge/avidemux/avidemux/2.6.20/avidemux_2.6.20.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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fa75188891a5b6fdf9ea36daa1a549e1
diff --git a/metadata/md5-cache/media-video/avidemux-2.7.0 b/metadata/md5-cache/media-video/avidemux-2.7.0
index 8c8e52c0b3cd..df35133218e4 100644
--- a/metadata/md5-cache/media-video/avidemux-2.7.0
+++ b/metadata/md5-cache/media-video/avidemux-2.7.0
@@ -10,5 +10,5 @@ PDEPEND=~media-libs/avidemux-plugins-2.7.0:2.7[opengl?,qt5?]
 RDEPEND=~media-libs/avidemux-core-2.7.0:2.7[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?] nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) ) opengl? ( virtual/opengl:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) vaapi? ( x11-libs/libva:0= ) nls? ( virtual/libintl:0 ) !<media-video/avidemux-2.7.0
 SLOT=2.7
 SRC_URI=mirror://sourceforge/avidemux/avidemux/2.7.0/avidemux_2.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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=05a4098f659c0027797e8b49451b76fc
diff --git a/metadata/md5-cache/media-video/avidemux-9999 b/metadata/md5-cache/media-video/avidemux-9999
index 71cb8626db7e..e697fbc2a2e3 100644
--- a/metadata/md5-cache/media-video/avidemux-9999
+++ b/metadata/md5-cache/media-video/avidemux-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-1 GPL-2 MIT PSF-2 public-domain
 PDEPEND=~media-libs/avidemux-plugins-9999:2.7[opengl?,qt5?]
 RDEPEND=~media-libs/avidemux-core-9999:2.7[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?] nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) ) opengl? ( virtual/opengl:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) vaapi? ( x11-libs/libva:0= ) nls? ( virtual/libintl:0 ) !<media-video/avidemux-9999
 SLOT=2.7
-_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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=05a4098f659c0027797e8b49451b76fc
diff --git a/metadata/md5-cache/media-video/bino-1.6.7 b/metadata/md5-cache/media-video/bino-1.6.7
index 909ec4de8953..1ff59f0832ee 100644
--- a/metadata/md5-cache/media-video/bino-1.6.7
+++ b/metadata/md5-cache/media-video/bino-1.6.7
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 >=media-libs/glew-1.6.0:0= >=media-libs/libass-0.9.9 >=media-libs/openal-1.15.1 virtual/libintl 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] )
 SLOT=0
 SRC_URI=https://bino3d.org/releases/bino-1.6.7.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-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=b2e9a9d188f3ae190bd211cc45a5cf34
diff --git a/metadata/md5-cache/media-video/blinkensim-2.7-r1 b/metadata/md5-cache/media-video/blinkensim-2.7-r1
index a885c71f867b..5713b18d222c 100644
--- a/metadata/md5-cache/media-video/blinkensim-2.7-r1
+++ b/metadata/md5-cache/media-video/blinkensim-2.7-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=-
 DEPEND=>=media-libs/blib-1.1.4 media-video/blinkenthemes aalib? ( >=media-libs/aalib-1.4_rc4-r2 ) gtk? ( >=x11-libs/gtk+-2.4.4:2 ) virtual/pkgconfig
 DESCRIPTION=Graphical Blinkenlights simulator with networking support
 EAPI=6
-HOMEPAGE=http://www.blinkenlights.net/project/developer-tools
+HOMEPAGE=http://blinkenlights.net/project/developer-tools
 IUSE=aalib gtk
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/blib-1.1.4 media-video/blinkenthemes aalib? ( >=media-libs/aalib-1.4_rc4-r2 ) gtk? ( >=x11-libs/gtk+-2.4.4:2 )
 SLOT=0
-SRC_URI=http://www.blinkenlights.de/dist/blinkensim-2.7.tar.gz
-_md5_=e6af4e143eb5736bf53051d998a75423
+SRC_URI=http://blinkenlights.de/dist/blinkensim-2.7.tar.gz
+_md5_=36f0f6560dcd4460baad4e723780e888
diff --git a/metadata/md5-cache/media-video/blinkenthemes-0.10 b/metadata/md5-cache/media-video/blinkenthemes-0.10
index 76ede0368dc7..738c7d45fd80 100644
--- a/metadata/md5-cache/media-video/blinkenthemes-0.10
+++ b/metadata/md5-cache/media-video/blinkenthemes-0.10
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DEPEND=media-libs/blib virtual/pkgconfig
 DESCRIPTION=Themes for blinkensim
 EAPI=0
-HOMEPAGE=http://www.blinkenlights.net/project/developer-tools
+HOMEPAGE=http://blinkenlights.net/project/developer-tools
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
-SRC_URI=http://www.blinkenlights.de/dist/blinkenthemes-0.10.tar.gz
-_md5_=42d7c22f03f56aabf31f55f604f61d52
+SRC_URI=http://blinkenlights.de/dist/blinkenthemes-0.10.tar.gz
+_md5_=7332b0138ee1a01d3ea8cfe93040c8f1
diff --git a/metadata/md5-cache/media-video/blinkenthemes-0.10-r1 b/metadata/md5-cache/media-video/blinkenthemes-0.10-r1
new file mode 100644
index 000000000000..3cd582efb10d
--- /dev/null
+++ b/metadata/md5-cache/media-video/blinkenthemes-0.10-r1
@@ -0,0 +1,11 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=-
+DEPEND=media-libs/blib
+DESCRIPTION=Themes for blinkensim
+EAPI=7
+HOMEPAGE=http://blinkenlights.net/project/developer-tools
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://blinkenlights.de/dist/blinkenthemes-0.10.tar.gz
+_md5_=2d3fc45da283e54d7e452c10e7480008
diff --git a/metadata/md5-cache/media-video/blinkentools-2.9 b/metadata/md5-cache/media-video/blinkentools-2.9
index 5c2285eefb7e..e9d455c3dd3a 100644
--- a/metadata/md5-cache/media-video/blinkentools-2.9
+++ b/metadata/md5-cache/media-video/blinkentools-2.9
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DEPEND=media-libs/blib media-libs/libmng virtual/pkgconfig
 DESCRIPTION=blinkentools is a set of commandline utilities related to Blinkenlights
 EAPI=0
-HOMEPAGE=http://www.blinkenlights.net/project/developer-tools
+HOMEPAGE=http://blinkenlights.net/project/developer-tools
 KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 SLOT=0
-SRC_URI=http://www.blinkenlights.de/dist/blinkentools-2.9.tar.gz
-_md5_=f0f7f8af9299916814861c9b6f52e30e
+SRC_URI=http://blinkenlights.de/dist/blinkentools-2.9.tar.gz
+_md5_=ebb424d3f42154734c0ef2452fcbbbe3
diff --git a/metadata/md5-cache/media-video/blinkentools-2.9-r1 b/metadata/md5-cache/media-video/blinkentools-2.9-r1
new file mode 100644
index 000000000000..f7c18abe0178
--- /dev/null
+++ b/metadata/md5-cache/media-video/blinkentools-2.9-r1
@@ -0,0 +1,12 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=-
+DEPEND=media-libs/blib media-libs/libmng
+DESCRIPTION=Provides a set of commandline utilities related to Blinkenlights
+EAPI=7
+HOMEPAGE=http://blinkenlights.net/project/developer-tools
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/blib media-libs/libmng
+SLOT=0
+SRC_URI=http://blinkenlights.de/dist/blinkentools-2.9.tar.gz
+_md5_=fb949cfb71dc1df3cc86637031dd5e24
diff --git a/metadata/md5-cache/media-video/ccextractor-0.85-r2 b/metadata/md5-cache/media-video/ccextractor-0.85-r2
index fca71d95316e..216b5e203309 100644
--- a/metadata/md5-cache/media-video/ccextractor-0.85-r2
+++ b/metadata/md5-cache/media-video/ccextractor-0.85-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libpng:0= sys-libs/zlib:=
 SLOT=0
 SRC_URI=mirror://sourceforge/ccextractor/ccextractor-src-nowin.0.85.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2cc16828d6f3f6b90252df3f5182117b
diff --git a/metadata/md5-cache/media-video/cheese-3.24.0 b/metadata/md5-cache/media-video/cheese-3.24.0
index befcaaac448d..b39c359eff35 100644
--- a/metadata/md5-cache/media-video/cheese-3.24.0
+++ b/metadata/md5-cache/media-video/cheese-3.24.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.39.90:2 >=x11-libs/gtk+-3.13.4:3[introspection?] >=gnome-base/gnome-desktop-2.91.6:3= >=media-libs/libcanberra-0.26[gtk3] >=media-libs/clutter-1.13.2:1.0[introspection?] >=media-libs/clutter-gtk-0.91.8:1.0 media-libs/clutter-gst:3.0 media-libs/cogl:1.0=[introspection?] media-video/gnome-video-effects x11-libs/gdk-pixbuf:2[jpeg,introspection?] x11-libs/libX11 x11-libs/libXtst >=media-libs/gstreamer-1.4:1.0[introspection?] >=media-libs/gst-plugins-base-1.4:1.0[introspection?,ogg,pango,theora,vorbis,X] introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) >=media-libs/gst-plugins-bad-1.4:1.0 >=media-libs/gst-plugins-good-1.4:1.0 >=media-plugins/gst-plugins-jpeg-1.4:1.0 >=media-plugins/gst-plugins-v4l2-1.4:1.0 >=media-plugins/gst-plugins-vpx-1.4:1.0
 SLOT=0/8
 SRC_URI=mirror://gnome/sources/cheese/3.24/cheese-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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b7290127dd1e4dfec4d9e01a240325d5
diff --git a/metadata/md5-cache/media-video/cheese-3.28.0 b/metadata/md5-cache/media-video/cheese-3.28.0
index a58a38ea6b15..f477377f5836 100644
--- a/metadata/md5-cache/media-video/cheese-3.28.0
+++ b/metadata/md5-cache/media-video/cheese-3.28.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.39.90:2 >=x11-libs/gtk+-3.13.4:3[introspection?] >=gnome-base/gnome-desktop-2.91.6:3= >=media-libs/libcanberra-0.26[gtk3] >=media-libs/clutter-1.13.2:1.0[introspection?] >=media-libs/clutter-gtk-0.91.8:1.0 media-libs/clutter-gst:3.0 media-libs/cogl:1.0=[introspection?] media-video/gnome-video-effects x11-libs/gdk-pixbuf:2[jpeg,introspection?] x11-libs/libX11 x11-libs/libXtst >=media-libs/gstreamer-1.4:1.0[introspection?] >=media-libs/gst-plugins-base-1.4:1.0[introspection?,ogg,pango,theora,vorbis,X] introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) >=media-libs/gst-plugins-bad-1.4:1.0 >=media-libs/gst-plugins-good-1.4:1.0 >=media-plugins/gst-plugins-jpeg-1.4:1.0 >=media-plugins/gst-plugins-v4l2-1.4:1.0 >=media-plugins/gst-plugins-vpx-1.4:1.0
 SLOT=0/8
 SRC_URI=mirror://gnome/sources/cheese/3.28/cheese-3.28.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=72dd3d4ec32e04cf6a8090be6f990b3d
diff --git a/metadata/md5-cache/media-video/dcpomatic-2.12.4 b/metadata/md5-cache/media-video/dcpomatic-2.12.4
index 833f7a1bd5c9..15be7accb68c 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _md5_=7da77d5cc4b5ec86561a66ac1b3e4d4e
diff --git a/metadata/md5-cache/media-video/dcpomatic-9999 b/metadata/md5-cache/media-video/dcpomatic-9999
index f92b21f22cc1..976800762950 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _md5_=98ff8b33660ad81ed7ea6f10abc9e7ed
diff --git a/metadata/md5-cache/media-video/devedeng-4.10.0 b/metadata/md5-cache/media-video/devedeng-4.10.0
index 0d8a9f2164b2..f4d7177b8234 100644
--- a/metadata/md5-cache/media-video/devedeng-4.10.0
+++ b/metadata/md5-cache/media-video/devedeng-4.10.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/rastersoft/devedeng/archive/4.10.0.tar.gz -> devedeng-4.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1a99f1f806ddbad512ffee4d726fc75d
diff --git a/metadata/md5-cache/media-video/devedeng-4.11.0 b/metadata/md5-cache/media-video/devedeng-4.11.0
index c29e8018ca47..2ebdd12dad85 100644
--- a/metadata/md5-cache/media-video/devedeng-4.11.0
+++ b/metadata/md5-cache/media-video/devedeng-4.11.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/rastersoft/devedeng/archive/4.11.0.tar.gz -> devedeng-4.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=97ec601a53925fd1d0bb6528eb7700cf
diff --git a/metadata/md5-cache/media-video/devedeng-9999 b/metadata/md5-cache/media-video/devedeng-9999
index ab5698c2427d..ced3100b06f4 100644
--- a/metadata/md5-cache/media-video/devedeng-9999
+++ b/metadata/md5-cache/media-video/devedeng-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-python/pycairo[python_targets_python3_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(-)] x11-libs/gtk+:3 || ( media-video/vlc media-video/mpv media-video/mplayer ) !libav? ( media-video/ffmpeg ) libav? ( media-video/libav ) media-video/dvdauthor media-video/vcdimager virtual/cdrtools || ( app-cdr/brasero kde-apps/k3b ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1a8738d0a1b48aa6749106a15b15d41d
diff --git a/metadata/md5-cache/media-video/ffdiaporama-2.2_pre20140701-r1 b/metadata/md5-cache/media-video/ffdiaporama-2.2_pre20140701-r1
index 308477ec5923..7b332952ccb9 100644
--- a/metadata/md5-cache/media-video/ffdiaporama-2.2_pre20140701-r1
+++ b/metadata/md5-cache/media-video/ffdiaporama-2.2_pre20140701-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 texturemate? ( CC-BY-3.0 )
 RDEPEND=media-gfx/exiv2 media-libs/taglib openclipart? ( media-gfx/openclipart[svg,-gzip] ) dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtmultimedia:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtxml:5 libav? ( >=media-video/libav-11:0=[encode] ) !libav? ( >=media-video/ffmpeg-2.8:0=[encode] )
 SLOT=0
 SRC_URI=http://download.tuxfamily.org/ffdiaporama/Packages/Devel/ffdiaporama_bin_2.2.devel.2014.0701.tar.gz http://download.tuxfamily.org/ffdiaporama/Packages/Devel/ffdiaporama_rsc_2.2.devel.2014.0503.tar.gz https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.2-libav11.patch https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.2-ffmpeg-3.0.patch texturemate? ( http://download.tuxfamily.org/ffdiaporama/Packages/Stable/ffdiaporama_texturemate_1.0.2014.0125.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=eda368caf16cae389681180ddbd3f889
diff --git a/metadata/md5-cache/media-video/ffmpegthumbnailer-2.2.0 b/metadata/md5-cache/media-video/ffmpegthumbnailer-2.2.0
index 747450f5fd9d..db34f7e2b6a3 100644
--- a/metadata/md5-cache/media-video/ffmpegthumbnailer-2.2.0
+++ b/metadata/md5-cache/media-video/ffmpegthumbnailer-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=gtk? ( dev-libs/glib:2= ) jpeg? ( virtual/jpeg:0= ) !libav? ( >=media-vi
 REQUIRED_USE=gnome? ( gtk ) test? ( png jpeg )
 SLOT=0
 SRC_URI=https://github.com/dirkvdb/ffmpegthumbnailer/releases/download/2.2.0/ffmpegthumbnailer-2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=053f64cd6d7b0c4cbd213d799a13e944
diff --git a/metadata/md5-cache/media-video/gaupol-1.4 b/metadata/md5-cache/media-video/gaupol-1.4
index 69689d2229fd..df66314858d9 100644
--- a/metadata/md5-cache/media-video/gaupol-1.4
+++ b/metadata/md5-cache/media-video/gaupol-1.4
@@ -10,5 +10,5 @@ RDEPEND=app-text/iso-codes dev-python/chardet[python_targets_python3_4(-)?,pytho
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/otsaloma/gaupol/archive/1.4.tar.gz -> gaupol-1.4.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2f4c8813a759e4dd7e3524716bc95645
diff --git a/metadata/md5-cache/media-video/gaupol-1.4.1 b/metadata/md5-cache/media-video/gaupol-1.4.1
index 7f1dabc8c20d..d6fbe660344e 100644
--- a/metadata/md5-cache/media-video/gaupol-1.4.1
+++ b/metadata/md5-cache/media-video/gaupol-1.4.1
@@ -10,5 +10,5 @@ RDEPEND=app-text/iso-codes dev-python/chardet[python_targets_python3_4(-)?,pytho
 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/otsaloma/gaupol/archive/1.4.1.tar.gz -> gaupol-1.4.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5239f8f8dde4993675e9ed083b29fe51
diff --git a/metadata/md5-cache/media-video/gnome-mplayer-1.0.9-r1 b/metadata/md5-cache/media-video/gnome-mplayer-1.0.9-r1
index eba18a4d6cb8..2b582585cc1d 100644
--- a/metadata/md5-cache/media-video/gnome-mplayer-1.0.9-r1
+++ b/metadata/md5-cache/media-video/gnome-mplayer-1.0.9-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.30 >=media-libs/gmtk-1.0.9[dconf=] >=x11-libs/gtk+-3.2:3 x11-libs/libX11 x11-libs/libXScrnSaver alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.100 ) gda? ( gnome-extra/libgda:5 ) gnome? ( gnome-base/nautilus ) ipod? ( >=media-libs/libgpod-0.7 ) libnotify? ( >=x11-libs/libnotify-0.7 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.14 ) x11-themes/gnome-icon-theme-symbolic >=media-video/mplayer-1.0_rc4_p20100101[libass]
 SLOT=0
 SRC_URI=https://gnome-mplayer.googlecode.com/svn/packages/gnome-mplayer-1.0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d36df4d2f732499cff56e0737ac30972
diff --git a/metadata/md5-cache/media-video/gnome-mpv-0.14 b/metadata/md5-cache/media-video/gnome-mpv-0.14
index 002ceb6ec4af..6304a24cb7ea 100644
--- a/metadata/md5-cache/media-video/gnome-mpv-0.14
+++ b/metadata/md5-cache/media-video/gnome-mpv-0.14
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.44 >=x11-libs/gtk+-3.20:3 >=media-video/mpv-0.27[libmpv] media-libs/libepoxy
 SLOT=0
 SRC_URI=https://github.com/gnome-mpv/gnome-mpv/releases/download/v0.14/gnome-mpv-0.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fec7625ab79c92edbfac7175e5c28f2b
diff --git a/metadata/md5-cache/media-video/gnome-mpv-0.15 b/metadata/md5-cache/media-video/gnome-mpv-0.15
index c75d79a720d2..cf21627361f9 100644
--- a/metadata/md5-cache/media-video/gnome-mpv-0.15
+++ b/metadata/md5-cache/media-video/gnome-mpv-0.15
@@ -9,5 +9,5 @@ RDEPEND=>=dev-libs/glib-2.44 >=x11-libs/gtk+-3.20:3 >=media-video/mpv-0.27[libmp
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/gnome-mpv/gnome-mpv/releases/download/v0.15/gnome-mpv-0.15.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=043a6db07f1143a75cc05cb0ea0bea31
diff --git a/metadata/md5-cache/media-video/gnome-video-effects-0.4.3 b/metadata/md5-cache/media-video/gnome-video-effects-0.4.3
index be6d73943ea9..40a697bb097b 100644
--- a/metadata/md5-cache/media-video/gnome-video-effects-0.4.3
+++ b/metadata/md5-cache/media-video/gnome-video-effects-0.4.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-video-effects/0.4/gnome-video-effects-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1e3d1180b6ce7a2f32259b7c935e1715
diff --git a/metadata/md5-cache/media-video/gxine-0.5.907-r1 b/metadata/md5-cache/media-video/gxine-0.5.907-r1
index a78e77b109f9..8be7dd436159 100644
--- a/metadata/md5-cache/media-video/gxine-0.5.907-r1
+++ b/metadata/md5-cache/media-video/gxine-0.5.907-r1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/xine/gxine-0.5.907.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozextension	f47f008a138943f9e40e37c1fca10b24	multilib	b2f01ad412baf81650c23fcf0975fa33	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozextension	f47f008a138943f9e40e37c1fca10b24	multilib	b2f01ad412baf81650c23fcf0975fa33	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cb9786efc88983d899e64f6ad6095f68
diff --git a/metadata/md5-cache/media-video/gxine-0.5.908-r1 b/metadata/md5-cache/media-video/gxine-0.5.908-r1
index 56da5ca97d4b..7e28129e9c01 100644
--- a/metadata/md5-cache/media-video/gxine-0.5.908-r1
+++ b/metadata/md5-cache/media-video/gxine-0.5.908-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/xine-lib-1.1.20 x11-libs/gtk+:2 >=dev-libs/glib-2 >=dev-lang/spidermonkey-1.8.2.15:0 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender lirc? ( app-misc/lirc ) nls? ( virtual/libintl ) nsplugin? ( dev-libs/nspr x11-libs/libXaw x11-libs/libXt ) udev? ( virtual/libgudev:= ) xcb? ( x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=mirror://sourceforge/xine/gxine-0.5.908.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozextension	f47f008a138943f9e40e37c1fca10b24	multilib	b2f01ad412baf81650c23fcf0975fa33	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozextension	f47f008a138943f9e40e37c1fca10b24	multilib	b2f01ad412baf81650c23fcf0975fa33	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=814e690def05198aff7c046d1c0b3166
diff --git a/metadata/md5-cache/media-video/gxine-0.5.909 b/metadata/md5-cache/media-video/gxine-0.5.909
index 737bd3c7a4ec..242d913bdfb0 100644
--- a/metadata/md5-cache/media-video/gxine-0.5.909
+++ b/metadata/md5-cache/media-video/gxine-0.5.909
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/xine-lib-1.1.20 x11-libs/gtk+:2 >=dev-libs/glib-2 >=dev-lang/spidermonkey-1.8.2.15:0 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender lirc? ( app-misc/lirc ) nls? ( virtual/libintl ) nsplugin? ( dev-libs/nspr x11-libs/libXaw x11-libs/libXt ) udev? ( virtual/libgudev:= ) xcb? ( x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=mirror://sourceforge/xine/gxine-0.5.909.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozextension	f47f008a138943f9e40e37c1fca10b24	multilib	b2f01ad412baf81650c23fcf0975fa33	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozextension	f47f008a138943f9e40e37c1fca10b24	multilib	b2f01ad412baf81650c23fcf0975fa33	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=234c19b5bb3fd648555799dc922bbed7
diff --git a/metadata/md5-cache/media-video/handbrake-1.1.0-r1 b/metadata/md5-cache/media-video/handbrake-1.1.0-r1
index ddf7088bce06..8e0bb3049070 100644
--- a/metadata/md5-cache/media-video/handbrake-1.1.0-r1
+++ b/metadata/md5-cache/media-video/handbrake-1.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/jansson media-libs/a52dec media-libs/libass:= >=media-libs/libb
 REQUIRED_USE=^^ ( fdk libav-aac )
 SLOT=0
 SRC_URI=https://download2.handbrake.fr/1.1.0/HandBrake-1.1.0-source.tar.bz2 -> handbrake-1.1.0.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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=03db7d31d1e1642f0d8f46d41862aa03
diff --git a/metadata/md5-cache/media-video/handbrake-1.1.1 b/metadata/md5-cache/media-video/handbrake-1.1.1
index 10a99e8ca6ea..fe8415c0882e 100644
--- a/metadata/md5-cache/media-video/handbrake-1.1.1
+++ b/metadata/md5-cache/media-video/handbrake-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/jansson media-libs/a52dec media-libs/libass:= >=media-libs/libb
 REQUIRED_USE=^^ ( fdk libav-aac )
 SLOT=0
 SRC_URI=https://download2.handbrake.fr/1.1.1/HandBrake-1.1.1-source.tar.bz2 -> handbrake-1.1.1.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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=03db7d31d1e1642f0d8f46d41862aa03
diff --git a/metadata/md5-cache/media-video/handbrake-9999 b/metadata/md5-cache/media-video/handbrake-9999
index d7dd7e2f4fab..f77df28c6f95 100644
--- a/metadata/md5-cache/media-video/handbrake-9999
+++ b/metadata/md5-cache/media-video/handbrake-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/jansson media-libs/a52dec media-libs/libass:= >=media-libs/libbluray-1.0 media-libs/libdvdnav media-libs/libdvdread media-libs/libsamplerate media-libs/libtheora media-libs/libvorbis media-libs/libvpx media-libs/opus media-libs/x264:= media-sound/lame sys-libs/zlib libav? ( >=media-video/libav-12.3:0=[fdk?] ) !libav? ( >=media-video/ffmpeg-3.4:0=[fdk?] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-a52dec:1.0 media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-x264:1.0 ) gtk? ( >=x11-libs/gtk+-3.10 dev-libs/dbus-glib dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/libnotify x11-libs/pango virtual/libgudev:= ) fdk? ( media-libs/fdk-aac ) x265? ( >=media-libs/x265-1.7:0= )
 REQUIRED_USE=^^ ( fdk libav-aac )
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a0c3015338d55dfe457ac038be9da4e1
diff --git a/metadata/md5-cache/media-video/jubler-5.1 b/metadata/md5-cache/media-video/jubler-5.1
index e901835d5176..360e9d0a53b0 100644
--- a/metadata/md5-cache/media-video/jubler-5.1
+++ b/metadata/md5-cache/media-video/jubler-5.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=mplayer? ( media-video/mplayer[libass] ) spell? ( app-text/aspell ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://sourceforge/jubler/Jubler-source-5.1.tar.bz2 -> jubler-5.1.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ff59976a03d14cfa2a13c0fae8f208ae
diff --git a/metadata/md5-cache/media-video/kaffeine-2.0.15 b/metadata/md5-cache/media-video/kaffeine-2.0.15
index 5c584641cb75..9d9119a0759f 100644
--- a/metadata/md5-cache/media-video/kaffeine-2.0.15
+++ b/metadata/md5-cache/media-video/kaffeine-2.0.15
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 21e043548ace..7c84cf475bf6 100644
--- a/metadata/md5-cache/media-video/kamerka-0.12_p20161002-r1
+++ b/metadata/md5-cache/media-video/kamerka-0.12_p20161002-r1
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	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
 _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 63fe3dab8dfc..6471acac3b78 100644
--- a/metadata/md5-cache/media-video/kmplayer-0.12.0b-r1
+++ b/metadata/md5-cache/media-video/kmplayer-0.12.0b-r1
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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.2 b/metadata/md5-cache/media-video/libav-12.2
index 3d8eb5c8ac47..105aa42b505d 100644
--- a/metadata/md5-cache/media-video/libav-12.2
+++ b/metadata/md5-cache/media-video/libav-12.2
@@ -4,7 +4,7 @@ DESCRIPTION=Complete solution to record, convert and stream audio and video
 EAPI=5
 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.2.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_=89443319060111d989a25cd707704acd
+_md5_=8c1e3ec89ec4cf55aa3936d657a73357
diff --git a/metadata/md5-cache/media-video/libav-12.3 b/metadata/md5-cache/media-video/libav-12.3
new file mode 100644
index 000000000000..c619bfe68b79
--- /dev/null
+++ b/metadata/md5-cache/media-video/libav-12.3
@@ -0,0 +1,15 @@
+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(-)?] ) ) 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(-)?] ) >=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/yasm ) 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 )
+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
+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 )
+RESTRICT=faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist ) nvidia? ( bindist )
+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
diff --git a/metadata/md5-cache/media-video/makemkv-1.12.3 b/metadata/md5-cache/media-video/makemkv-1.12.3
index b9f057349531..87b0243daf50 100644
--- a/metadata/md5-cache/media-video/makemkv-1.12.3
+++ b/metadata/md5-cache/media-video/makemkv-1.12.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl
 RDEPEND=sys-libs/glibc dev-libs/expat dev-libs/openssl:0[-bindist(-)] sys-libs/zlib gui? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !libav? ( >=media-video/ffmpeg-1.0.0:0= ) libav? ( >=media-video/libav-0.8.9:0= ) net-misc/wget
 SLOT=0
 SRC_URI=http://www.makemkv.com/download/makemkv-oss-1.12.3.tar.gz http://www.makemkv.com/download/makemkv-bin-1.12.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=eb50c834610b416a9051f0f37fac3eec
diff --git a/metadata/md5-cache/media-video/mediainfo-18.05 b/metadata/md5-cache/media-video/mediainfo-18.05
index 48e17f5a24a1..58aa89289172 100644
--- a/metadata/md5-cache/media-video/mediainfo-18.05
+++ b/metadata/md5-cache/media-video/mediainfo-18.05
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=sys-libs/zlib >=media-libs/libzen-0.4.37 ~media-libs/libmediainfo-18.05[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:3.0[X] )
 SLOT=0
 SRC_URI=https://mediaarea.net/download/source/mediainfo/18.05/mediainfo_18.05.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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=5593f7534e8c2cea19a9a30e07628446
diff --git a/metadata/md5-cache/media-video/mediainfo-18.08.1 b/metadata/md5-cache/media-video/mediainfo-18.08.1
index 69a608866133..efd8b0009a5a 100644
--- a/metadata/md5-cache/media-video/mediainfo-18.08.1
+++ b/metadata/md5-cache/media-video/mediainfo-18.08.1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=sys-libs/zlib >=media-libs/libzen-0.4.37 ~media-libs/libmediainfo-18.08.1[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:3.0[X] )
 SLOT=0
 SRC_URI=https://mediaarea.net/download/source/mediainfo/18.08.1/mediainfo_18.08.1.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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=b52438d00f4b9f1e4204bab895180737
diff --git a/metadata/md5-cache/media-video/mkvtoolnix-21.0.0-r1 b/metadata/md5-cache/media-video/mkvtoolnix-21.0.0-r1
index e51ec1b0d680..ea8b2a5f40be 100644
--- a/metadata/md5-cache/media-video/mkvtoolnix-21.0.0-r1
+++ b/metadata/md5-cache/media-video/mkvtoolnix-21.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/boost-1.49.0:= >=dev-libs/libebml-1.3.5:= dev-libs/jsoncpp:= dev-libs/pugixml media-libs/flac >=media-libs/libmatroska-1.4.8:= media-libs/libogg media-libs/libvorbis sys-apps/file sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 app-text/cmark )
 SLOT=0
 SRC_URI=https://mkvtoolnix.download/sources/mkvtoolnix-21.0.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bd6fe09dc6126d2534d7636199a2c34d
diff --git a/metadata/md5-cache/media-video/mkvtoolnix-22.0.0 b/metadata/md5-cache/media-video/mkvtoolnix-22.0.0
index 20d5bc20a959..61706e0c73c6 100644
--- a/metadata/md5-cache/media-video/mkvtoolnix-22.0.0
+++ b/metadata/md5-cache/media-video/mkvtoolnix-22.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/boost-1.49.0:= >=dev-libs/libebml-1.3.5:= dev-libs/jsoncpp:= dev-libs/pugixml media-libs/flac >=media-libs/libmatroska-1.4.8:= media-libs/libogg media-libs/libvorbis sys-apps/file sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 app-text/cmark )
 SLOT=0
 SRC_URI=https://mkvtoolnix.download/sources/mkvtoolnix-22.0.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bd6fe09dc6126d2534d7636199a2c34d
diff --git a/metadata/md5-cache/media-video/mkvtoolnix-23.0.0 b/metadata/md5-cache/media-video/mkvtoolnix-23.0.0
index 03ab719b7d64..e9d3696c1404 100644
--- a/metadata/md5-cache/media-video/mkvtoolnix-23.0.0
+++ b/metadata/md5-cache/media-video/mkvtoolnix-23.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/boost-1.49.0:= >=dev-libs/libebml-1.3.5:= dev-libs/jsoncpp:= dev-libs/pugixml media-libs/flac >=media-libs/libmatroska-1.4.8:= media-libs/libogg media-libs/libvorbis sys-apps/file sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 app-text/cmark )
 SLOT=0
 SRC_URI=https://mkvtoolnix.download/sources/mkvtoolnix-23.0.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bd6fe09dc6126d2534d7636199a2c34d
diff --git a/metadata/md5-cache/media-video/mkvtoolnix-9999 b/metadata/md5-cache/media-video/mkvtoolnix-9999
index 5aa612fb34a7..5352a5a15d74 100644
--- a/metadata/md5-cache/media-video/mkvtoolnix-9999
+++ b/metadata/md5-cache/media-video/mkvtoolnix-9999
@@ -7,5 +7,5 @@ IUSE=debug pch test qt5
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/boost-1.49.0:= >=dev-libs/libebml-1.3.5:= dev-libs/jsoncpp:= dev-libs/pugixml media-libs/flac >=media-libs/libmatroska-1.4.8:= media-libs/libogg media-libs/libvorbis sys-apps/file sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 app-text/cmark )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bd6fe09dc6126d2534d7636199a2c34d
diff --git a/metadata/md5-cache/media-video/mpv-0.27.2 b/metadata/md5-cache/media-video/mpv-0.27.2
index f9712b65318f..48b7b24616ae 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b847debd15978a0ab61da538cab0d52f
diff --git a/metadata/md5-cache/media-video/mpv-0.28.2 b/metadata/md5-cache/media-video/mpv-0.28.2
index 7d5046a5a2cc..9f5fe1f9d6cb 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=469d8909e26be670e97ecfc2d1ff8b83
diff --git a/metadata/md5-cache/media-video/mpv-0.29.0 b/metadata/md5-cache/media-video/mpv-0.29.0
index abc072aa6727..dfc5f0ff40ca 100644
--- a/metadata/md5-cache/media-video/mpv-0.29.0
+++ b/metadata/md5-cache/media-video/mpv-0.29.0
@@ -10,5 +10,5 @@ RDEPEND=>=media-video/ffmpeg-4.0:0=[encode,threads,vaapi?,vdpau?] alsa? ( >=medi
 REQUIRED_USE=|| ( cli libmpv ) aqua? ( opengl ) cuda? ( opengl ) egl? ( || ( gbm X wayland ) ) gbm? ( drm egl opengl ) lcms? ( opengl ) luajit? ( lua ) opengl? ( || ( aqua egl X raspberry-pi !cli ) ) raspberry-pi? ( opengl ) test? ( opengl ) tools? ( cli ) uchardet? ( iconv ) v4l? ( || ( alsa oss ) ) vaapi? ( || ( gbm X wayland ) ) vdpau? ( X ) vulkan? ( || ( X wayland ) ) wayland? ( egl ) X? ( egl? ( opengl ) ) xv? ( X ) zsh-completion? ( cli ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/mpv-player/mpv/archive/v0.29.0.tar.gz -> mpv-0.29.0.tar.gz https://waf.io/waf-2.0.9
-_eclasses_=desktop	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	89bb9f083a2590d9b447fd0b78a96186
+_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-9999 b/metadata/md5-cache/media-video/mpv-9999
index 550de806d3aa..a42134951473 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _md5_=6e29c2ba421c362ca17ded7771e983da
diff --git a/metadata/md5-cache/media-video/obs-studio-21.0.2 b/metadata/md5-cache/media-video/obs-studio-21.0.2
deleted file mode 100644
index 04a30aa8bb13..000000000000
--- a/metadata/md5-cache/media-video/obs-studio-21.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg:=[x264] nvenc? ( media-video/ffmpeg:=[nvenc] ) net-misc/curl x11-libs/libXcomposite x11-libs/libXinerama x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Software for Recording and Streaming Live Video Content
-EAPI=6
-HOMEPAGE=https://obsproject.com
-IUSE=+alsa fdk imagemagick jack nvenc pulseaudio truetype v4l
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg:=[x264] nvenc? ( media-video/ffmpeg:=[nvenc] ) net-misc/curl x11-libs/libXcomposite x11-libs/libXinerama x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l )
-SLOT=0
-SRC_URI=https://github.com/obsproject/obs-studio/archive/21.0.2.tar.gz -> obs-studio-21.0.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=e0681824aacfb6b254cdd5208c99f997
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 a03b53bcde37..fac3396e5dbc 100644
--- a/metadata/md5-cache/media-video/obs-studio-21.1.2
+++ b/metadata/md5-cache/media-video/obs-studio-21.1.2
@@ -1,13 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg:=[x264] net-misc/curl x11-libs/libXcomposite x11-libs/libXinerama x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) luajit? ( dev-lang/luajit:2 ) nvenc? ( media-video/ffmpeg:=[nvenc(+),video_cards_nvidia(+)] ) pulseaudio? ( media-sound/pulseaudio ) python? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) ) speexdsp? ( media-libs/speexdsp ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l ) luajit? ( dev-lang/swig ) python? ( dev-lang/swig ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg:=[x264] net-misc/curl x11-libs/libXcomposite x11-libs/libXinerama x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) luajit? ( dev-lang/luajit:2 ) nvenc? ( media-video/ffmpeg:=[nvenc] ) pulseaudio? ( media-sound/pulseaudio ) 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(+)?] ) speex? ( media-libs/speexdsp ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l ) luajit? ( dev-lang/swig ) python? ( dev-lang/swig ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
 DESCRIPTION=Software for Recording and Streaming Live Video Content
 EAPI=6
 HOMEPAGE=https://obsproject.com
-IUSE=+alsa fdk imagemagick jack luajit nvenc pulseaudio python speexdsp truetype v4l
+IUSE=+alsa fdk imagemagick jack luajit nvenc pulseaudio python speex truetype v4l python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg:=[x264] net-misc/curl x11-libs/libXcomposite x11-libs/libXinerama x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) luajit? ( dev-lang/luajit:2 ) nvenc? ( media-video/ffmpeg:=[nvenc(+),video_cards_nvidia(+)] ) pulseaudio? ( media-sound/pulseaudio ) python? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) ) speexdsp? ( media-libs/speexdsp ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l )
+RDEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg:=[x264] net-misc/curl x11-libs/libXcomposite x11-libs/libXinerama x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) luajit? ( dev-lang/luajit:2 ) nvenc? ( media-video/ffmpeg:=[nvenc] ) pulseaudio? ( media-sound/pulseaudio ) 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(+)?] ) speex? ( media-libs/speexdsp ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l )
+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
 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-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=ac673bc388a85b419c80e72492d7bedb
+_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
diff --git a/metadata/md5-cache/media-video/obs-studio-22.0.3 b/metadata/md5-cache/media-video/obs-studio-22.0.3
new file mode 100644
index 000000000000..834bb1259dcf
--- /dev/null
+++ b/metadata/md5-cache/media-video/obs-studio-22.0.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg:=[x264] net-misc/curl x11-libs/libXcomposite x11-libs/libXinerama x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) luajit? ( dev-lang/luajit:2 ) nvenc? ( media-video/ffmpeg:=[nvenc] ) pulseaudio? ( media-sound/pulseaudio ) 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(+)?] ) speex? ( media-libs/speexdsp ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l ) luajit? ( dev-lang/swig ) python? ( dev-lang/swig ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=Software for Recording and Streaming Live Video Content
+EAPI=6
+HOMEPAGE=https://obsproject.com
+IUSE=+alsa fdk imagemagick jack luajit nvenc pulseaudio python speex truetype v4l python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg:=[x264] net-misc/curl x11-libs/libXcomposite x11-libs/libXinerama x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) luajit? ( dev-lang/luajit:2 ) nvenc? ( media-video/ffmpeg:=[nvenc] ) pulseaudio? ( media-sound/pulseaudio ) 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(+)?] ) speex? ( media-libs/speexdsp ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l )
+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
+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
diff --git a/metadata/md5-cache/media-video/obs-studio-9999 b/metadata/md5-cache/media-video/obs-studio-9999
index 32b8f16b32e9..5ba5b2e9e2e7 100644
--- a/metadata/md5-cache/media-video/obs-studio-9999
+++ b/metadata/md5-cache/media-video/obs-studio-9999
@@ -1,11 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg:=[x264] net-misc/curl x11-libs/libXcomposite x11-libs/libXinerama x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) luajit? ( dev-lang/luajit:2 ) nvenc? ( media-video/ffmpeg:=[nvenc(+),video_cards_nvidia(+)] ) pulseaudio? ( media-sound/pulseaudio ) python? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) ) speexdsp? ( media-libs/speexdsp ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l ) luajit? ( dev-lang/swig ) python? ( dev-lang/swig ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg:=[x264] net-misc/curl x11-libs/libXcomposite x11-libs/libXinerama x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) luajit? ( dev-lang/luajit:2 ) nvenc? ( media-video/ffmpeg:=[nvenc(+),video_cards_nvidia(+)] ) pulseaudio? ( media-sound/pulseaudio ) 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(+)?] ) speex? ( media-libs/speexdsp ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l ) luajit? ( dev-lang/swig ) python? ( dev-lang/swig ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Software for Recording and Streaming Live Video Content
 EAPI=6
 HOMEPAGE=https://obsproject.com
-IUSE=+alsa fdk imagemagick jack luajit nvenc pulseaudio python speexdsp truetype v4l
+IUSE=+alsa fdk imagemagick jack luajit nvenc pulseaudio python speex truetype v4l python_targets_python3_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-2
-RDEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg:=[x264] net-misc/curl x11-libs/libXcomposite x11-libs/libXinerama x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) luajit? ( dev-lang/luajit:2 ) nvenc? ( media-video/ffmpeg:=[nvenc(+),video_cards_nvidia(+)] ) pulseaudio? ( media-sound/pulseaudio ) python? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) ) speexdsp? ( media-libs/speexdsp ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l )
+RDEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg:=[x264] net-misc/curl x11-libs/libXcomposite x11-libs/libXinerama x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) luajit? ( dev-lang/luajit:2 ) nvenc? ( media-video/ffmpeg:=[nvenc(+),video_cards_nvidia(+)] ) pulseaudio? ( media-sound/pulseaudio ) 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(+)?] ) speex? ( media-libs/speexdsp ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l )
+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-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=9ba9210538a170238cd257d8ea02a925
+_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
diff --git a/metadata/md5-cache/media-video/ogmrip-1.0.1 b/metadata/md5-cache/media-video/ogmrip-1.0.1
index e0fff74a44cd..b893f19cdd20 100644
--- a/metadata/md5-cache/media-video/ogmrip-1.0.1
+++ b/metadata/md5-cache/media-video/ogmrip-1.0.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.16:2 >=app-i18n/enca-1.9 dev-libs/libxml2 media-libs/libdvdread >=media-video/mplayer-1.0_rc2[dvd,encode,xvid?,dts?,x264?] aac? ( >=media-libs/faac-1.24 ) gtk? ( >=x11-libs/gtk+-2.12:2 gnome-base/libglade gnome-base/gconf dbus? ( dev-libs/dbus-glib ) libnotify? ( >=x11-libs/libnotify-0.4.3 ) media-video/mplayer[jpeg] ) matroska? ( media-video/mkvtoolnix ) mp3? ( media-sound/lame ) mp4? ( >=media-video/gpac-0.4.2 ) ogm? ( media-sound/ogmtools ) spell? ( >=app-text/enchant-1.1.0 ) srt? ( || ( ( >=app-text/tesseract-2 media-libs/tiff ) >=app-text/gocr-0.39 >=app-text/ocrad-0.15 ) media-libs/libpng ) theora? ( media-libs/libtheora ) vorbis? ( media-sound/vorbis-tools ) gnome-base/gvfs
 SLOT=0
 SRC_URI=mirror://sourceforge/ogmrip/ogmrip-1.0.1.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=a5dded54df6a8891c370a78bb428162b
diff --git a/metadata/md5-cache/media-video/openshot-2.4.0-r1 b/metadata/md5-cache/media-video/openshot-2.4.0-r1
index e6f4864ca1f6..694f2bea44a2 100644
--- a/metadata/md5-cache/media-video/openshot-2.4.0-r1
+++ b/metadata/md5-cache/media-video/openshot-2.4.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/httplib2[python_targets_python3_4(-)?,python_targets_python3_
 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=1
 SRC_URI=https://launchpad.net/openshot/2.4/2.4.0/+download/openshot-qt-2.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=96660e07cd79a223e818ea482b69daba
diff --git a/metadata/md5-cache/media-video/parole-0.8.1 b/metadata/md5-cache/media-video/parole-0.8.1
index 0ae96ed9395b..9f07d3be1fb1 100644
--- a/metadata/md5-cache/media-video/parole-0.8.1
+++ b/metadata/md5-cache/media-video/parole-0.8.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.32:2= media-libs/gstreamer:1.0= media-libs/gst-plugins-base:1.0= sys-apps/dbus:0= >=x11-libs/gtk+-3.2:3= x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.11:0=[gtk3(+)] >=xfce-base/libxfce4util-4.11:0= >=xfce-base/xfconf-4.10:0= clutter? ( >=media-libs/clutter-1.16.4:1.0= >=media-libs/clutter-gtk-1.4.4:1.0= ) libnotify? ( >=x11-libs/libnotify-0.7:0= ) taglib? ( >=media-libs/taglib-1.6:0= ) media-plugins/gst-plugins-meta:1.0
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/parole/0.8/parole-0.8.1.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	89bb9f083a2590d9b447fd0b78a96186	xfconf	2d8c177734e778123f65326f8d05c3c8
+_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_=eee3c5baa99c59e53051a2e89cb255e6
diff --git a/metadata/md5-cache/media-video/parole-1.0.0 b/metadata/md5-cache/media-video/parole-1.0.0
index 0ec9abf8b337..4df65fa4383a 100644
--- a/metadata/md5-cache/media-video/parole-1.0.0
+++ b/metadata/md5-cache/media-video/parole-1.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.32:2= media-libs/gstreamer:1.0= media-libs/gst-plugins-base:1.0= sys-apps/dbus:0= >=x11-libs/gtk+-3.20:3= x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.11:0=[gtk3(+)] >=xfce-base/libxfce4util-4.11:0= >=xfce-base/xfconf-4.10:0= libnotify? ( >=x11-libs/libnotify-0.7:0= ) taglib? ( >=media-libs/taglib-1.6:0= ) media-plugins/gst-plugins-meta:1.0
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/parole/1.0/parole-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fec73a446b64c07cfcc2d3c6c2216468
diff --git a/metadata/md5-cache/media-video/parole-1.0.1 b/metadata/md5-cache/media-video/parole-1.0.1
index 6b4f20f03cd8..dbecef205d15 100644
--- a/metadata/md5-cache/media-video/parole-1.0.1
+++ b/metadata/md5-cache/media-video/parole-1.0.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.32:2= media-libs/gstreamer:1.0= media-libs/gst-plugins-base:1.0= sys-apps/dbus:0= >=x11-libs/gtk+-3.20:3= x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.11:0=[gtk3(+)] >=xfce-base/libxfce4util-4.11:0= >=xfce-base/xfconf-4.10:0= libnotify? ( >=x11-libs/libnotify-0.7:0= ) taglib? ( >=media-libs/taglib-1.6:0= ) dev-util/intltool sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto >=sys-apps/sed-4
+DEPEND=>=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.32:2= media-libs/gstreamer:1.0= media-libs/gst-plugins-base:1.0= sys-apps/dbus:0= >=x11-libs/gtk+-3.20:3= x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.11:0=[gtk3(+)] >=xfce-base/libxfce4util-4.11:0= >=xfce-base/xfconf-4.10:0= libnotify? ( >=x11-libs/libnotify-0.7:0= ) taglib? ( >=media-libs/taglib-1.6:0= ) dev-util/glib-utils dev-util/intltool sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto >=sys-apps/sed-4
 DESCRIPTION=A simple Xfce4 media player using GStreamer
 EAPI=6
 HOMEPAGE=https://docs.xfce.org/apps/parole/start
 IUSE=libnotify taglib
 KEYWORDS=~amd64 ~mips ~x86
-LICENSE=GPL-2
+LICENSE=GPL-2+
 RDEPEND=>=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.32:2= media-libs/gstreamer:1.0= media-libs/gst-plugins-base:1.0= sys-apps/dbus:0= >=x11-libs/gtk+-3.20:3= x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.11:0=[gtk3(+)] >=xfce-base/libxfce4util-4.11:0= >=xfce-base/xfconf-4.10:0= libnotify? ( >=x11-libs/libnotify-0.7:0= ) taglib? ( >=media-libs/taglib-1.6:0= ) media-plugins/gst-plugins-meta:1.0
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/parole/1.0/parole-1.0.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=3df87e3ff4691bf89385b3fcb5ab16f6
+_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_=668a8375e52adabdd9e8896b063c2725
diff --git a/metadata/md5-cache/media-video/peek-1.2.1 b/metadata/md5-cache/media-video/peek-1.2.1
index e939151da834..0f00dabe21c7 100644
--- a/metadata/md5-cache/media-video/peek-1.2.1
+++ b/metadata/md5-cache/media-video/peek-1.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.38:2 media-video/ffmpeg[X,encode] virtual/imagemagick-tools >=x11-libs/gtk+-3.14:3 keybinder? ( dev-libs/keybinder:3 )
 SLOT=0
 SRC_URI=https://github.com/phw/peek/archive/1.2.1.tar.gz -> peek-1.2.1.tar.gz
-_eclasses_=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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=df14d57bda68c23e9e11904d6cfb48f6
diff --git a/metadata/md5-cache/media-video/peek-1.2.2 b/metadata/md5-cache/media-video/peek-1.2.2
index b4d3287864b9..8f7983e64b39 100644
--- a/metadata/md5-cache/media-video/peek-1.2.2
+++ b/metadata/md5-cache/media-video/peek-1.2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.38:2 media-video/ffmpeg[X,encode] virtual/imagemagick-tools >=x11-libs/gtk+-3.14:3 keybinder? ( dev-libs/keybinder:3 )
 SLOT=0
 SRC_URI=https://github.com/phw/peek/archive/1.2.2.tar.gz -> peek-1.2.2.tar.gz
-_eclasses_=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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=df14d57bda68c23e9e11904d6cfb48f6
diff --git a/metadata/md5-cache/media-video/peek-1.3.1 b/metadata/md5-cache/media-video/peek-1.3.1
index 9d2b7b244788..484f3ef49d57 100644
--- a/metadata/md5-cache/media-video/peek-1.3.1
+++ b/metadata/md5-cache/media-video/peek-1.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.38:2 media-video/ffmpeg[X,encode] virtual/imagemagick-tools >=x11-libs/gtk+-3.14:3 keybinder? ( dev-libs/keybinder:3 )
 SLOT=0
 SRC_URI=https://github.com/phw/peek/archive/1.3.1.tar.gz -> peek-1.3.1.tar.gz
-_eclasses_=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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=df14d57bda68c23e9e11904d6cfb48f6
diff --git a/metadata/md5-cache/media-video/photofilmstrip-2.1.0-r2 b/metadata/md5-cache/media-video/photofilmstrip-2.1.0-r2
index 8638607b8536..f3e7afcb5a3d 100644
--- a/metadata/md5-cache/media-video/photofilmstrip-2.1.0-r2
+++ b/metadata/md5-cache/media-video/photofilmstrip-2.1.0-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/wxpython:3.0[cairo?,python_targets_python2_7(-)?,-python_sing
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://sourceforge/photostoryx/photofilmstrip/2.1.0/photofilmstrip-2.1.0.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=774088fc5f8d2f6e1bce0fa306ab8bb9
diff --git a/metadata/md5-cache/media-video/pitivi-0.97.1 b/metadata/md5-cache/media-video/pitivi-0.97.1
index fc5e57193c4f..e4a4dfa3ed1b 100644
--- a/metadata/md5-cache/media-video/pitivi-0.97.1
+++ b/metadata/md5-cache/media-video/pitivi-0.97.1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4[sqlite] ) python_s
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/pitivi/0.97/pitivi-0.97.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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d3da125c4f8ec58855535ee6fba785fe
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 dbf3d535a991..ac24bc72867f 100644
--- a/metadata/md5-cache/media-video/plasma-mediacenter-5.7.5
+++ b/metadata/md5-cache/media-video/plasma-mediacenter-5.7.5
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/simplescreenrecorder-0.3.10 b/metadata/md5-cache/media-video/simplescreenrecorder-0.3.10
index e1ed9f48e724..6897818127be 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=89679332e719f5d8a81a827b84ff4adc
diff --git a/metadata/md5-cache/media-video/simplescreenrecorder-0.3.11 b/metadata/md5-cache/media-video/simplescreenrecorder-0.3.11
index 866cb4adac6d..6a52e9ed79bc 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=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 5cc5b7d9f428..912cdab9583b 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=68880901dde3e1ad044a478dfc6ca134
diff --git a/metadata/md5-cache/media-video/simplescreenrecorder-9999 b/metadata/md5-cache/media-video/simplescreenrecorder-9999
index 28dcffd293cd..a4f8832a24b2 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=89679332e719f5d8a81a827b84ff4adc
diff --git a/metadata/md5-cache/media-video/smplayer-18.6.0 b/metadata/md5-cache/media-video/smplayer-18.6.0
index 5792aae891d6..8a57f6cb0721 100644
--- a/metadata/md5-cache/media-video/smplayer-18.6.0
+++ b/metadata/md5-cache/media-video/smplayer-18.6.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ BSD-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtnetwork:5[ssl] dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5(+)] dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib autoshutdown? ( dev-qt/qtdbus:5 ) mpris? ( dev-qt/qtdbus:5 ) || ( media-video/mplayer[bidi?,libass,png,X] ( >=media-video/mpv-0.15.0[libass,X] >=net-misc/youtube-dl-2014.11.26 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/smplayer/smplayer-18.6.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=53e946daa54ffc66642c057529aea549
diff --git a/metadata/md5-cache/media-video/smplayer-18.9.0 b/metadata/md5-cache/media-video/smplayer-18.9.0
index 7c494b597f6a..7973612639c7 100644
--- a/metadata/md5-cache/media-video/smplayer-18.9.0
+++ b/metadata/md5-cache/media-video/smplayer-18.9.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ BSD-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtnetwork:5[ssl] dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5(+)] dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib autoshutdown? ( dev-qt/qtdbus:5 ) mpris? ( dev-qt/qtdbus:5 ) || ( media-video/mplayer[bidi?,libass,png,X] ( >=media-video/mpv-0.15.0[libass,X] >=net-misc/youtube-dl-2014.11.26 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/smplayer/smplayer-18.9.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1a38a40544a58c914e23c7fd0bb34298
diff --git a/metadata/md5-cache/media-video/snappy-1.0-r1 b/metadata/md5-cache/media-video/snappy-1.0-r1
index 657163c37b06..ba3c28327047 100644
--- a/metadata/md5-cache/media-video/snappy-1.0-r1
+++ b/metadata/md5-cache/media-video/snappy-1.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=dev-libs/glib-2.32:2 >=media-libs/clutter-1.20.0:1.0 media-libs/clutter-gst:3.0 >=media-libs/clutter-gtk-1.6.0:1.0 >=x11-libs/gtk+-3.5.0:3 x11-libs/libXtst >=media-libs/gstreamer-1.4.0:1.0 >=media-libs/gst-plugins-base-1.4.0:1.0 media-plugins/gst-plugins-meta:1.0 !!<net-misc/spice-gtk-0.19
 SLOT=0
 SRC_URI=mirror://gnome/sources/snappy/1.0/snappy-1.0.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=34c016c7d8300caf5c6ca0b2e15eef51
diff --git a/metadata/md5-cache/media-video/sonic-snap-1.7-r1 b/metadata/md5-cache/media-video/sonic-snap-1.7-r1
index dd0baa789ecc..26f1c29fdb32 100644
--- a/metadata/md5-cache/media-video/sonic-snap-1.7-r1
+++ b/metadata/md5-cache/media-video/sonic-snap-1.7-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-1
 RDEPEND=x11-libs/fltk:1 mpeg? ( >=media-libs/libfame-0.9.1 ) sys-libs/zlib x11-libs/libXdmcp x11-libs/libXau x11-libs/libXrender x11-libs/libX11 x11-libs/libXext x11-libs/libXft
 SLOT=0
 SRC_URI=http://www.stolk.org/sonic-snap/downloads/sonic-snap-1.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8657c1e2323e7b6b1c656801d04c5868
diff --git a/metadata/md5-cache/media-video/subliminal-2.0.5-r2 b/metadata/md5-cache/media-video/subliminal-2.0.5-r2
index cf2526d0ee5f..4a2c28107fa8 100644
--- a/metadata/md5-cache/media-video/subliminal-2.0.5-r2
+++ b/metadata/md5-cache/media-video/subliminal-2.0.5-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/Diaoul/subliminal/archive/dd74383d1cba82829ce720f2e439a65d13ffe7ef.tar.gz -> subliminal-2.0.5-r2.tar.gz test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=52cc2b782669d27a6ead9af9d8bce639
diff --git a/metadata/md5-cache/media-video/subliminal-9999 b/metadata/md5-cache/media-video/subliminal-9999
index 23b318d1e1bd..aea604ad8ccb 100644
--- a/metadata/md5-cache/media-video/subliminal-9999
+++ b/metadata/md5-cache/media-video/subliminal-9999
@@ -9,5 +9,5 @@ RDEPEND=>=dev-python/guessit-2.0.1[python_targets_python2_7(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1dbd0239968df3c216458480164d7fc5
diff --git a/metadata/md5-cache/media-video/subtitlecomposer-0.6.4 b/metadata/md5-cache/media-video/subtitlecomposer-0.6.4
index 494524ca1ed0..d6d0cc695f87 100644
--- a/metadata/md5-cache/media-video/subtitlecomposer-0.6.4
+++ b/metadata/md5-cache/media-video/subtitlecomposer-0.6.4
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 ae94a6c0ad38..6dd9263261fe 100644
--- a/metadata/md5-cache/media-video/subtitlecomposer-0.6.6
+++ b/metadata/md5-cache/media-video/subtitlecomposer-0.6.6
@@ -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/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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/subtitleeditor-0.54.0 b/metadata/md5-cache/media-video/subtitleeditor-0.54.0
index da5237026b70..c6f28a90aa92 100644
--- a/metadata/md5-cache/media-video/subtitleeditor-0.54.0
+++ b/metadata/md5-cache/media-video/subtitleeditor-0.54.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-text/enchant-1.4 app-text/iso-codes >=dev-cpp/cairomm-1.12 >=dev-cpp/glibmm-2.46:2 >=dev-cpp/gtkmm-3.18:3.0 >=dev-cpp/gstreamermm-1.0:1.0= >=dev-cpp/libxmlpp-2.40:2.6 dev-libs/glib:2 >=dev-libs/libsigc++-2.6:2 media-libs/gst-plugins-base:1.0[X,pango] media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0 media-plugins/gst-plugins-meta:1.0 x11-libs/gtk+:3 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=https://github.com/kitone/subtitleeditor/releases/download/0.54.0/subtitleeditor-0.54.0.tar.gz
-_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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3fc69eb87fb3658315d9d3df1e04f5d5
diff --git a/metadata/md5-cache/media-video/totem-3.24.0 b/metadata/md5-cache/media-video/totem-3.24.0
index 7e59914e9eeb..0b1ce8a2f0c3 100644
--- a/metadata/md5-cache/media-video/totem-3.24.0
+++ b/metadata/md5-cache/media-video/totem-3.24.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.35:2[dbus] >=dev-libs/libpeas-1.1[gtk] >=dev-libs/libx
 REQUIRED_USE=python? ( introspection ^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/totem/3.24/totem-3.24.0.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f32fa6671e473a73cc407557f945bd9f
diff --git a/metadata/md5-cache/media-video/tovid-0.35.2-r1 b/metadata/md5-cache/media-video/tovid-0.35.2-r1
index b3fc7b03950f..c2eb97872e60 100644
--- a/metadata/md5-cache/media-video/tovid-0.35.2-r1
+++ b/metadata/md5-cache/media-video/tovid-0.35.2-r1
@@ -10,5 +10,5 @@ RDEPEND=app-cdr/dvd+rw-tools dev-tcltk/tix media-sound/normalize >=media-sound/s
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/tovid-suite/tovid/archive/v0.35.2.tar.gz -> tovid-0.35.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=52949729fb9dc89d02d0fddcd591d481
diff --git a/metadata/md5-cache/media-video/ttcut-0.19.6_p1 b/metadata/md5-cache/media-video/ttcut-0.19.6_p1
index b9b7215d5f85..c2ba49a29f55 100644
--- a/metadata/md5-cache/media-video/ttcut-0.19.6_p1
+++ b/metadata/md5-cache/media-video/ttcut-0.19.6_p1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libmpeg2-0.4.0 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 virtual/glu virtual/opengl media-video/mplayer >=media-video/ffmpeg-1.0.8[encode]
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~billie/distfiles/ttcut-0.19.6_p1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2f299ebd5d450314c8f1aef6f6c49fac
diff --git a/metadata/md5-cache/media-video/v4l2loopback-0.12.0 b/metadata/md5-cache/media-video/v4l2loopback-0.12.0
index 0311bda0a657..2650bd4eded9 100644
--- a/metadata/md5-cache/media-video/v4l2loopback-0.12.0
+++ b/metadata/md5-cache/media-video/v4l2loopback-0.12.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://github.com/umlaeute/v4l2loopback/tarball/v0.12.0 -> v4l2loopback-0.12.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921
 _md5_=53ba7d0f25a2986f2ef77bc8ffc3e8b9
diff --git a/metadata/md5-cache/media-video/v4l2loopback-9999 b/metadata/md5-cache/media-video/v4l2loopback-9999
index 345e4ce7f3ab..a017c5091f36 100644
--- a/metadata/md5-cache/media-video/v4l2loopback-9999
+++ b/metadata/md5-cache/media-video/v4l2loopback-9999
@@ -7,5 +7,5 @@ IUSE=examples kernel_linux kernel_linux
 LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=53ba7d0f25a2986f2ef77bc8ffc3e8b9
diff --git a/metadata/md5-cache/media-video/vcsi-7 b/metadata/md5-cache/media-video/vcsi-7
index 831ace333b05..92f58267e37e 100644
--- a/metadata/md5-cache/media-video/vcsi-7
+++ b/metadata/md5-cache/media-video/vcsi-7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/parsedatetime[python_targets_python3_5(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/amietn/vcsi/archive/v7.tar.gz -> vcsi-7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0a4b81b18ac8c9bddb3fbebb5956ad72
diff --git a/metadata/md5-cache/media-video/vlc-3.0.3-r1 b/metadata/md5-cache/media-video/vlc-3.0.3-r1
index 2340ad877b71..09e245a9c50c 100644
--- a/metadata/md5-cache/media-video/vlc-3.0.3-r1
+++ b/metadata/md5-cache/media-video/vlc-3.0.3-r1
@@ -10,5 +10,5 @@ RDEPEND=net-dns/libidn:= sys-libs/zlib:0[minizip] virtual/libintl:0 virtual/open
 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.3/vlc-3.0.3.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	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c8ec49a787a6368637599b6829456754
diff --git a/metadata/md5-cache/media-video/vlc-3.0.4 b/metadata/md5-cache/media-video/vlc-3.0.4
index 8bbef642d555..c925bf342eb0 100644
--- a/metadata/md5-cache/media-video/vlc-3.0.4
+++ b/metadata/md5-cache/media-video/vlc-3.0.4
@@ -10,5 +10,5 @@ RDEPEND=net-dns/libidn:= sys-libs/zlib:0[minizip] virtual/libintl:0 virtual/open
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/media-video/vlc-3.0.9999 b/metadata/md5-cache/media-video/vlc-3.0.9999
index f515aa02f073..43198e46fe0d 100644
--- a/metadata/md5-cache/media-video/vlc-3.0.9999
+++ b/metadata/md5-cache/media-video/vlc-3.0.9999
@@ -8,5 +8,5 @@ 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
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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
diff --git a/metadata/md5-cache/media-video/vlc-9999 b/metadata/md5-cache/media-video/vlc-9999
index f07937ffe4b5..535ca816ec87 100644
--- a/metadata/md5-cache/media-video/vlc-9999
+++ b/metadata/md5-cache/media-video/vlc-9999
@@ -8,5 +8,5 @@ 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 ) kms? ( x11-libs/libdrm ) 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-1.12 ) X? ( x11-libs/libX11 x11-libs/libxcb[xkb] x11-libs/libXcursor x11-libs/libxkbcommon[X] 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
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8a702bfcbfb9d6af51f712aa0dd5d5ca
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 99679027d2cd..ad6569f76145 100644
--- a/metadata/md5-cache/media-video/xine-ui-0.99.10
+++ b/metadata/md5-cache/media-video/xine-ui-0.99.10
@@ -1,13 +1,13 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=|| ( 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:= ) ) nls? ( >=sys-devel/gettext-0.18.3 ) X? ( x11-base/xorg-proto x11-libs/libXt ) virtual/pkgconfig >=sys-apps/sed-4
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=|| ( 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:= ) ) virtual/pkgconfig nls? ( >=sys-devel/gettext-0.18.3 ) X? ( x11-base/xorg-proto 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 >=sys-apps/sed-4
 DESCRIPTION=Xine movie player
-EAPI=5
-HOMEPAGE=http://xine.sourceforge.net/
+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_=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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=eef56a4294a69c691a8ca0dcfc6a9f52
+_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
diff --git a/metadata/md5-cache/media-video/xine-ui-0.99.9 b/metadata/md5-cache/media-video/xine-ui-0.99.9
index 9aa5c34323b6..269328a47001 100644
--- a/metadata/md5-cache/media-video/xine-ui-0.99.9
+++ b/metadata/md5-cache/media-video/xine-ui-0.99.9
@@ -9,5 +9,5 @@ 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.9.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-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=6e7ab5ae4f945f7ebe6e6bfb2a9c2a0c
diff --git a/metadata/md5-cache/net-analyzer/2ping-4.0.1 b/metadata/md5-cache/net-analyzer/2ping-4.0.1
index b3b5534dbd53..b6ea94c2db47 100644
--- a/metadata/md5-cache/net-analyzer/2ping-4.0.1
+++ b/metadata/md5-cache/net-analyzer/2ping-4.0.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://www.finnie.org/software/2ping/2ping-4.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=eda4f1406fd9ec87c03b51637ae03ffe
diff --git a/metadata/md5-cache/net-analyzer/2ping-4.1 b/metadata/md5-cache/net-analyzer/2ping-4.1
index 2cdeade81f8a..741d386f64bb 100644
--- a/metadata/md5-cache/net-analyzer/2ping-4.1
+++ b/metadata/md5-cache/net-analyzer/2ping-4.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://www.finnie.org/software/2ping/2ping-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=418698eef303da52b7f28a2cbe758c1e
diff --git a/metadata/md5-cache/net-analyzer/2ping-4.1.2 b/metadata/md5-cache/net-analyzer/2ping-4.1.2
index 88f37a9ee785..1e57d82540ac 100644
--- a/metadata/md5-cache/net-analyzer/2ping-4.1.2
+++ b/metadata/md5-cache/net-analyzer/2ping-4.1.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://www.finnie.org/software/2ping/2ping-4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=794cdb59efd077090a0750d16a04e2e2
diff --git a/metadata/md5-cache/net-analyzer/2ping-4.2 b/metadata/md5-cache/net-analyzer/2ping-4.2
index 95b668eea1f5..410b7b63be2d 100644
--- a/metadata/md5-cache/net-analyzer/2ping-4.2
+++ b/metadata/md5-cache/net-analyzer/2ping-4.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://www.finnie.org/software/2ping/2ping-4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=794cdb59efd077090a0750d16a04e2e2
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index ff90a0ae63db..8c04352fc1a7 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/arpon-2.7.2 b/metadata/md5-cache/net-analyzer/arpon-2.7.2
index 6754e8234902..d1b4390565df 100644
--- a/metadata/md5-cache/net-analyzer/arpon-2.7.2
+++ b/metadata/md5-cache/net-analyzer/arpon-2.7.2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/libdnet net-libs/libnet:1.1 net-libs/libpcap
 SLOT=0
 SRC_URI=mirror://sourceforge/arpon/ArpON-2.7.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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e83a7b3611eaee74cf5c4865ca4ff2c9
diff --git a/metadata/md5-cache/net-analyzer/bmon-4.0 b/metadata/md5-cache/net-analyzer/bmon-4.0
index 599a582cad2f..795340c88f72 100644
--- a/metadata/md5-cache/net-analyzer/bmon-4.0
+++ b/metadata/md5-cache/net-analyzer/bmon-4.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2 MIT
 RDEPEND=>=sys-libs/ncurses-5.3-r2:0= dev-libs/confuse:= dev-libs/libnl:3
 SLOT=0
 SRC_URI=https://codeload.github.com/tgraf/bmon/tar.gz/v4.0 -> bmon-4.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ced7dc7f7a48c086fba5fd09ba2d762e
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 44476c254800..d3a7aded0730 100644
--- a/metadata/md5-cache/net-analyzer/bro-2.4.1-r2
+++ b/metadata/md5-cache/net-analyzer/bro-2.4.1-r2
@@ -10,5 +10,5 @@ RDEPEND=app-shells/bash:0 dev-libs/openssl:0 net-analyzer/ipsumdump net-dns/bind
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/net-analyzer/carl-0.9-r2 b/metadata/md5-cache/net-analyzer/carl-0.9-r2
index 1284fa423d3b..fbf602ef1914 100644
--- a/metadata/md5-cache/net-analyzer/carl-0.9-r2
+++ b/metadata/md5-cache/net-analyzer/carl-0.9-r2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://www.schwarzvogel.de/pkgs/carl-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9d514bbe33eb3df995af1804a4226123
diff --git a/metadata/md5-cache/net-analyzer/etherape-0.9.14 b/metadata/md5-cache/net-analyzer/etherape-0.9.14
index c03e89f2225d..918d8e23877a 100644
--- a/metadata/md5-cache/net-analyzer/etherape-0.9.14
+++ b/metadata/md5-cache/net-analyzer/etherape-0.9.14
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnome-base/libglade-2.0 >=gnome-base/libgnomeui-2.0 gnome-base/libgnomecanvas[glade] net-libs/libpcap
 SLOT=0
 SRC_URI=mirror://sourceforge/etherape/etherape-0.9.14.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=57222c87f471c05c0f2db89fd85282eb
diff --git a/metadata/md5-cache/net-analyzer/etherape-0.9.17 b/metadata/md5-cache/net-analyzer/etherape-0.9.17
index 8dc7fabd92cf..25f009fc5917 100644
--- a/metadata/md5-cache/net-analyzer/etherape-0.9.17
+++ b/metadata/md5-cache/net-analyzer/etherape-0.9.17
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnome-base/libglade-2.0 dev-libs/popt gnome-base/libgnomecanvas[glade] net-libs/libpcap
 SLOT=0
 SRC_URI=mirror://sourceforge/etherape/etherape-0.9.17.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=6745893708f438f11c11a6902849d3b0
diff --git a/metadata/md5-cache/net-analyzer/ettercap-0.8.2 b/metadata/md5-cache/net-analyzer/ettercap-0.8.2
index a587586cd2cd..d78be6072c43 100644
--- a/metadata/md5-cache/net-analyzer/ettercap-0.8.2
+++ b/metadata/md5-cache/net-analyzer/ettercap-0.8.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/libbsd dev-libs/libpcre dev-libs/openssl net-libs/libnet:1.1 >=net-libs/libpcap-0.8.1 sys-libs/zlib gtk? ( >=dev-libs/atk-1.2.4 >=dev-libs/glib-2.2.2:2 media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.2.2:2 >=x11-libs/pango-1.2.3 ) ncurses? ( >=sys-libs/ncurses-5.3 ) plugins? ( >=net-misc/curl-7.26.0 )
 SLOT=0
 SRC_URI=https://github.com/Ettercap/ettercap/archive/v0.8.2.tar.gz -> ettercap-0.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=095f5a99128627f5a43d4fe7be7cd377
diff --git a/metadata/md5-cache/net-analyzer/ettercap-0.8.2-r1 b/metadata/md5-cache/net-analyzer/ettercap-0.8.2-r1
index 422a180553b7..3ec7d73adf37 100644
--- a/metadata/md5-cache/net-analyzer/ettercap-0.8.2-r1
+++ b/metadata/md5-cache/net-analyzer/ettercap-0.8.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/libbsd dev-libs/libpcre dev-libs/openssl:0= net-libs/libnet:1.1 >=net-libs/libpcap-0.8.1 sys-libs/zlib gtk? ( >=dev-libs/atk-1.2.4 >=dev-libs/glib-2.2.2:2 media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.2.2:2 >=x11-libs/pango-1.2.3 ) ncurses? ( >=sys-libs/ncurses-5.3:= ) plugins? ( >=net-misc/curl-7.26.0 )
 SLOT=0
 SRC_URI=https://github.com/Ettercap/ettercap/archive/v0.8.2.tar.gz -> ettercap-0.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9d44bd429289d440ef8aec5ae915efbb
diff --git a/metadata/md5-cache/net-analyzer/ettercap-9999 b/metadata/md5-cache/net-analyzer/ettercap-9999
index 3be8d0cc3b0c..b7d6f7b2b801 100644
--- a/metadata/md5-cache/net-analyzer/ettercap-9999
+++ b/metadata/md5-cache/net-analyzer/ettercap-9999
@@ -7,5 +7,5 @@ IUSE=doc gtk ipv6 libressl ncurses +plugins
 LICENSE=GPL-2+
 RDEPEND=dev-libs/libbsd dev-libs/libpcre !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libnet:1.1 >=net-libs/libpcap-0.8.1 sys-libs/zlib gtk? ( >=dev-libs/atk-1.2.4 >=dev-libs/glib-2.2.2:2 media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.2.2:2 >=x11-libs/pango-1.2.3 ) ncurses? ( sys-libs/ncurses:0= ) plugins? ( >=net-misc/curl-7.26.0 )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e48299ce69bc8aef25f437c1cdbd22ef
diff --git a/metadata/md5-cache/net-analyzer/fail2ban-0.10.2 b/metadata/md5-cache/net-analyzer/fail2ban-0.10.2
deleted file mode 100644
index 68305531fcda..000000000000
--- a/metadata/md5-cache/net-analyzer/fail2ban-0.10.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=python_single_target_pypy? ( >=virtual/pypy-5:0= ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy3(-),-python_single_target_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(+)?] virtual/pkgconfig
-DESCRIPTION=scans log files and bans IPs that show malicious signs
-EAPI=6
-HOMEPAGE=http://www.fail2ban.org/
-IUSE=selinux systemd 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
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=kernel_linux? ( net-firewall/iptables ) kernel_FreeBSD? ( sys-freebsd/freebsd-pf ) net-misc/whois virtual/logger virtual/mta selinux? ( sec-policy/selinux-fail2ban ) systemd? ( python_single_target_python2_7? ( || ( dev-python/python-systemd[python_targets_python2_7(-)?,python_single_target_python2_7(+)?,python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] sys-apps/systemd[python(-),python_targets_python2_7(-)?,python_single_target_python2_7(+)?,python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] ) ) python_single_target_python3_4? ( || ( dev-python/python-systemd[python_targets_python2_7(-)?,python_single_target_python2_7(+)?,python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] sys-apps/systemd[python(-),python_targets_python2_7(-)?,python_single_target_python2_7(+)?,python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] ) ) python_single_target_python3_5? ( || ( dev-python/python-systemd[python_targets_python2_7(-)?,python_single_target_python2_7(+)?,python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] sys-apps/systemd[python(-),python_targets_python2_7(-)?,python_single_target_python2_7(+)?,python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] ) ) python_single_target_python3_6? ( || ( dev-python/python-systemd[python_targets_python2_7(-)?,python_single_target_python2_7(+)?,python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] sys-apps/systemd[python(-),python_targets_python2_7(-)?,python_single_target_python2_7(+)?,python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] ) ) ) python_single_target_pypy? ( >=virtual/pypy-5:0= ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy3(-),-python_single_target_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(+)?]
-REQUIRED_USE=systemd? ( !python_single_target_pypy ) ^^ ( 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_pypy? ( python_targets_pypy ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/fail2ban/fail2ban/tarball/0.10.2 -> fail2ban-0.10.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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=787a375c17d27fd8288a44a80cff1b6e
diff --git a/metadata/md5-cache/net-analyzer/fail2ban-0.10.3.1 b/metadata/md5-cache/net-analyzer/fail2ban-0.10.3.1
index 41381cb51cba..27b88c890c20 100644
--- a/metadata/md5-cache/net-analyzer/fail2ban-0.10.3.1
+++ b/metadata/md5-cache/net-analyzer/fail2ban-0.10.3.1
@@ -10,5 +10,5 @@ RDEPEND=kernel_linux? ( net-firewall/iptables ) kernel_FreeBSD? ( sys-freebsd/fr
 REQUIRED_USE=systemd? ( !python_single_target_pypy ) ^^ ( 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_pypy? ( python_targets_pypy ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/fail2ban/fail2ban/tarball/0.10.3.1 -> fail2ban-0.10.3.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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7b445aeadf29e3932c0a6cc9ab6d8e45
diff --git a/metadata/md5-cache/net-analyzer/fail2ban-0.9.6 b/metadata/md5-cache/net-analyzer/fail2ban-0.9.6
deleted file mode 100644
index 66a0d283e3e0..000000000000
--- a/metadata/md5-cache/net-analyzer/fail2ban-0.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=python_single_target_pypy? ( >=virtual/pypy-5:0= ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_pypy(+)?,python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] virtual/pkgconfig
-DESCRIPTION=scans log files and bans IPs that show malicious signs
-EAPI=5
-HOMEPAGE=http://www.fail2ban.org/
-IUSE=selinux systemd 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
-KEYWORDS=alpha amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=kernel_linux? ( net-firewall/iptables ) kernel_FreeBSD? ( sys-freebsd/freebsd-pf ) net-misc/whois virtual/logger virtual/mta selinux? ( sec-policy/selinux-fail2ban ) systemd? ( python_single_target_python2_7? ( || ( dev-python/python-systemd[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(+)?] sys-apps/systemd[python(-),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_single_target_python3_4? ( || ( dev-python/python-systemd[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(+)?] sys-apps/systemd[python(-),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_single_target_python3_5? ( || ( dev-python/python-systemd[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(+)?] sys-apps/systemd[python(-),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_single_target_pypy? ( >=virtual/pypy-5:0= ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_pypy(+)?,python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?]
-REQUIRED_USE=systemd? ( !python_single_target_pypy ) ^^ ( python_single_target_pypy python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_pypy? ( python_targets_pypy ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://github.com/fail2ban/fail2ban/tarball/0.9.6 -> fail2ban-0.9.6.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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=a9d0c33dd83670ee6a3a76188533de08
diff --git a/metadata/md5-cache/net-analyzer/fail2ban-99999999 b/metadata/md5-cache/net-analyzer/fail2ban-99999999
index 8c526471c932..e7bb5fcd42ef 100644
--- a/metadata/md5-cache/net-analyzer/fail2ban-99999999
+++ b/metadata/md5-cache/net-analyzer/fail2ban-99999999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( net-firewall/iptables ) kernel_FreeBSD? ( sys-freebsd/freebsd-pf ) net-misc/whois virtual/logger virtual/mta selinux? ( sec-policy/selinux-fail2ban ) systemd? ( python_single_target_python2_7? ( || ( dev-python/python-systemd[python_targets_python2_7(-)?,python_single_target_python2_7(+)?,python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] sys-apps/systemd[python(-),python_targets_python2_7(-)?,python_single_target_python2_7(+)?,python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] ) ) python_single_target_python3_4? ( || ( dev-python/python-systemd[python_targets_python2_7(-)?,python_single_target_python2_7(+)?,python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] sys-apps/systemd[python(-),python_targets_python2_7(-)?,python_single_target_python2_7(+)?,python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] ) ) python_single_target_python3_5? ( || ( dev-python/python-systemd[python_targets_python2_7(-)?,python_single_target_python2_7(+)?,python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] sys-apps/systemd[python(-),python_targets_python2_7(-)?,python_single_target_python2_7(+)?,python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] ) ) python_single_target_python3_6? ( || ( dev-python/python-systemd[python_targets_python2_7(-)?,python_single_target_python2_7(+)?,python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] sys-apps/systemd[python(-),python_targets_python2_7(-)?,python_single_target_python2_7(+)?,python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] ) ) ) python_single_target_pypy? ( >=virtual/pypy-5:0= ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy3(-),-python_single_target_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(+)?]
 REQUIRED_USE=systemd? ( !python_single_target_pypy ) ^^ ( 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_pypy? ( python_targets_pypy ) 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
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b2da9a625a2f49787d5ef912a9058e1c
diff --git a/metadata/md5-cache/net-analyzer/flent-1.0.1-r1 b/metadata/md5-cache/net-analyzer/flent-1.0.1-r1
index 72b74ebb1b77..cedd0e1ff645 100644
--- a/metadata/md5-cache/net-analyzer/flent-1.0.1-r1
+++ b/metadata/md5-cache/net-analyzer/flent-1.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=qt5? ( dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_pyth
 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/tohojo/flent/archive/v1.0.1.tar.gz -> flent-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ad6f7cce551d749db59e336979429931
diff --git a/metadata/md5-cache/net-analyzer/gnome-nettool-3.8.1 b/metadata/md5-cache/net-analyzer/gnome-nettool-3.8.1
index 3e12b5cf10fd..6e72b91641d8 100644
--- a/metadata/md5-cache/net-analyzer/gnome-nettool-3.8.1
+++ b/metadata/md5-cache/net-analyzer/gnome-nettool-3.8.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.25.10:2 gnome-base/libgtop:2= x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.90.4:3 x11-libs/pango || ( net-misc/iputils net-analyzer/tcptraceroute net-analyzer/traceroute sys-freebsd/freebsd-usbin ) net-analyzer/nmap net-dns/bind-tools userland_GNU? ( net-misc/netkit-fingerd net-misc/whois ) userland_BSD? ( net-misc/bsdwhois )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-nettool/3.8/gnome-nettool-3.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bbc1cd58357e578e2d0158eb4d0e49e5
diff --git a/metadata/md5-cache/net-analyzer/gr-fosphor-9999 b/metadata/md5-cache/net-analyzer/gr-fosphor-9999
index 8731865c64e8..9857e394eb11 100644
--- a/metadata/md5-cache/net-analyzer/gr-fosphor-9999
+++ b/metadata/md5-cache/net-analyzer/gr-fosphor-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=net-wireless/gnuradio-3.7_rc:0=[wxwidgets?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_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/freetype dev-libs/boost:= glfw? ( >=media-libs/glfw-3 ) virtual/opencl virtual/opengl python_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
-_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b7cba68917b0a077c79328da5e6a59e6
diff --git a/metadata/md5-cache/net-analyzer/greenbone-security-assistant-6.0.9 b/metadata/md5-cache/net-analyzer/greenbone-security-assistant-6.0.9
index ff8eed74ab73..a9b7b2c39bc9 100644
--- a/metadata/md5-cache/net-analyzer/greenbone-security-assistant-6.0.9
+++ b/metadata/md5-cache/net-analyzer/greenbone-security-assistant-6.0.9
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ BSD MIT
 RDEPEND=dev-libs/libgcrypt:0 dev-libs/libxslt >=net-analyzer/openvas-libraries-8.0.3 net-libs/libmicrohttpd[messages]
 SLOT=0
 SRC_URI=http://wald.intevation.org/frs/download.php/2287/greenbone-security-assistant-6.0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bc3b4279996723399ac6608e2aacb1f1
diff --git a/metadata/md5-cache/net-analyzer/icinga2-2.8.4 b/metadata/md5-cache/net-analyzer/icinga2-2.8.4
index 5892a964d608..f5317b967ba0 100644
--- a/metadata/md5-cache/net-analyzer/icinga2-2.8.4
+++ b/metadata/md5-cache/net-analyzer/icinga2-2.8.4
@@ -10,5 +10,5 @@ RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=
 REQUIRED_USE=!minimal? ( || ( mysql postgres ) )
 SLOT=0
 SRC_URI=https://github.com/Icinga/icinga2/archive/v2.8.4.tar.gz -> icinga2-2.8.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b1e5ba709ebe917cd2595038ba6a6069
diff --git a/metadata/md5-cache/net-analyzer/icinga2-2.9.1 b/metadata/md5-cache/net-analyzer/icinga2-2.9.1
index f8d8ede50bf2..749176c046ee 100644
--- a/metadata/md5-cache/net-analyzer/icinga2-2.9.1
+++ b/metadata/md5-cache/net-analyzer/icinga2-2.9.1
@@ -10,5 +10,5 @@ RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=
 REQUIRED_USE=!minimal? ( || ( mysql postgres ) )
 SLOT=0
 SRC_URI=https://github.com/Icinga/icinga2/archive/v2.9.1.tar.gz -> icinga2-2.9.1.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2f829a59a94c820de27588a462b62107
diff --git a/metadata/md5-cache/net-analyzer/icinga2-2.9.1-r1 b/metadata/md5-cache/net-analyzer/icinga2-2.9.1-r1
index a46715bd37ee..66ce1da47e75 100644
--- a/metadata/md5-cache/net-analyzer/icinga2-2.9.1-r1
+++ b/metadata/md5-cache/net-analyzer/icinga2-2.9.1-r1
@@ -10,5 +10,5 @@ RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=
 REQUIRED_USE=!minimal? ( || ( mysql postgres ) )
 SLOT=0
 SRC_URI=https://github.com/Icinga/icinga2/archive/v2.9.1.tar.gz -> icinga2-2.9.1.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=24ebee83f10bbd0ab25120cd8c5a9b6f
diff --git a/metadata/md5-cache/net-analyzer/icinga2-2.9.1-r2 b/metadata/md5-cache/net-analyzer/icinga2-2.9.1-r2
index edf9fdf9981b..d0535a1dfa9e 100644
--- a/metadata/md5-cache/net-analyzer/icinga2-2.9.1-r2
+++ b/metadata/md5-cache/net-analyzer/icinga2-2.9.1-r2
@@ -10,5 +10,5 @@ RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=
 REQUIRED_USE=!minimal? ( || ( mariadb mysql postgres ) )
 SLOT=0
 SRC_URI=https://github.com/Icinga/icinga2/archive/v2.9.1.tar.gz -> icinga2-2.9.1.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9c2c499a270439f2b6a8884475dc7ed7
diff --git a/metadata/md5-cache/net-analyzer/icinga2-2.9.2 b/metadata/md5-cache/net-analyzer/icinga2-2.9.2
index 105672faa352..38e362058616 100644
--- a/metadata/md5-cache/net-analyzer/icinga2-2.9.2
+++ b/metadata/md5-cache/net-analyzer/icinga2-2.9.2
@@ -10,5 +10,5 @@ RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=
 REQUIRED_USE=!minimal? ( || ( mariadb mysql postgres ) )
 SLOT=0
 SRC_URI=https://github.com/Icinga/icinga2/archive/v2.9.2.tar.gz -> icinga2-2.9.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8054cb8a9c9196a578590e54bea08f4e
diff --git a/metadata/md5-cache/net-analyzer/icinga2-9999 b/metadata/md5-cache/net-analyzer/icinga2-9999
index 507250bbc360..6f554e462610 100644
--- a/metadata/md5-cache/net-analyzer/icinga2-9999
+++ b/metadata/md5-cache/net-analyzer/icinga2-9999
@@ -8,5 +8,5 @@ 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
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/net-analyzer/linkchecker-9.3.1-r1 b/metadata/md5-cache/net-analyzer/linkchecker-9.3.1-r1
index cdf1cacc50f8..ecbd9acff3e5 100644
--- a/metadata/md5-cache/net-analyzer/linkchecker-9.3.1-r1
+++ b/metadata/md5-cache/net-analyzer/linkchecker-9.3.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linkcheck/linkchecker/archive/v9.3.1.tar.gz -> linkchecker-9.3.1.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0fc9072818241262a4ad7eb39ba049b1
diff --git a/metadata/md5-cache/net-analyzer/linkchecker-9999 b/metadata/md5-cache/net-analyzer/linkchecker-9999
index 120685de0952..8564705a6e62 100644
--- a/metadata/md5-cache/net-analyzer/linkchecker-9999
+++ b/metadata/md5-cache/net-analyzer/linkchecker-9999
@@ -9,5 +9,5 @@ RDEPEND=dev-python/pyxdg[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d671d77cbab5acd18e80a7496ef52ce9
diff --git a/metadata/md5-cache/net-analyzer/mate-netspeed-1.12.0 b/metadata/md5-cache/net-analyzer/mate-netspeed-1.12.0
index 83fad2d78b43..ac12e316ef6c 100644
--- a/metadata/md5-cache/net-analyzer/mate-netspeed-1.12.0
+++ b/metadata/md5-cache/net-analyzer/mate-netspeed-1.12.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 >=gnome-base/libgtop-2.14.2:2 >=mate-base/mate-desktop-1.9[gtk3(-)=] >=mate-base/mate-panel-1.7[gtk3(-)=] >=net-wireless/wireless-tools-28_pre9:0 x11-libs/gdk-pixbuf:2 x11-libs/pango:0 virtual/libintl:0 !gtk3? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 )
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.12/mate-netspeed-1.12.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=af194e13119a19228f65541fa51ae96b
diff --git a/metadata/md5-cache/net-analyzer/multimon-ng-1.1.4 b/metadata/md5-cache/net-analyzer/multimon-ng-1.1.4
index 86dc830d13c1..e35b60aa63fa 100644
--- a/metadata/md5-cache/net-analyzer/multimon-ng-1.1.4
+++ b/metadata/md5-cache/net-analyzer/multimon-ng-1.1.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=pulseaudio? ( media-sound/pulseaudio ) X? ( x11-libs/libX11 )
 SLOT=0
 SRC_URI=https://github.com/EliasOenal/multimonNG/archive/1.1.4.tar.gz -> multimon-ng-1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9bddbdb2a9d1509e0ccb4f2ba40785aa
diff --git a/metadata/md5-cache/net-analyzer/multimon-ng-9999 b/metadata/md5-cache/net-analyzer/multimon-ng-9999
index 80a45f34b351..277b0920e87f 100644
--- a/metadata/md5-cache/net-analyzer/multimon-ng-9999
+++ b/metadata/md5-cache/net-analyzer/multimon-ng-9999
@@ -7,5 +7,5 @@ IUSE=pulseaudio X
 LICENSE=GPL-2
 RDEPEND=pulseaudio? ( media-sound/pulseaudio ) X? ( x11-libs/libX11 )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9bddbdb2a9d1509e0ccb4f2ba40785aa
diff --git a/metadata/md5-cache/net-analyzer/nagios-icinga-openvpn-0.0.1 b/metadata/md5-cache/net-analyzer/nagios-icinga-openvpn-0.0.1
index d97c175a809c..d142ce36c9bf 100644
--- a/metadata/md5-cache/net-analyzer/nagios-icinga-openvpn-0.0.1
+++ b/metadata/md5-cache/net-analyzer/nagios-icinga-openvpn-0.0.1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/liquidat/nagios-icinga-openvpn/archive/0.0.1.tar.gz -> nagios-icinga-openvpn-0.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9387d50a6f7e8998ed425c7d11b1496e
diff --git a/metadata/md5-cache/net-analyzer/nagstamon-2.0.1 b/metadata/md5-cache/net-analyzer/nagstamon-2.0.1
index c7082f3784a1..d56117115807 100644
--- a/metadata/md5-cache/net-analyzer/nagstamon-2.0.1
+++ b/metadata/md5-cache/net-analyzer/nagstamon-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/nagstamon/Nagstamon-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=215629d53be0e761666871a1af3c7011
diff --git a/metadata/md5-cache/net-analyzer/nagstamon-3.0.2-r1 b/metadata/md5-cache/net-analyzer/nagstamon-3.0.2-r1
index 71a916503c89..b46a50655e20 100644
--- a/metadata/md5-cache/net-analyzer/nagstamon-3.0.2-r1
+++ b/metadata/md5-cache/net-analyzer/nagstamon-3.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://nagstamon.ifw-dresden.de/files/stable/Nagstamon-3.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=423b5be1666116c2213d99c4be95824b
diff --git a/metadata/md5-cache/net-analyzer/namebench-1.3.1-r2 b/metadata/md5-cache/net-analyzer/namebench-1.3.1-r2
index 6e20b7e78ac1..3167c5af9acf 100644
--- a/metadata/md5-cache/net-analyzer/namebench-1.3.1-r2
+++ b/metadata/md5-cache/net-analyzer/namebench-1.3.1-r2
@@ -10,5 +10,5 @@ RDEPEND=X? ( python_targets_python2_7? ( dev-lang/python:2.7[tk] ) ) >=dev-pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://namebench.googlecode.com/files/namebench-1.3.1-source.tgz
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=81416fef4e53c2fb42d438c9565c88a5
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.7.3-r5 b/metadata/md5-cache/net-analyzer/net-snmp-5.7.3-r5
index 30aa004e8f97..f98d62dde255 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.7.3-r5
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.7.3-r5
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( python_targets_python2_7 ) rpm? ( bzip2 zlib )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/project/net-snmp/net-snmp/5.7.3/net-snmp-5.7.3.tar.gz https://dev.gentoo.org/~jer/net-snmp-5.7.3-patches-2.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/net-snmp-5.7.3-perl524.patch.gz https://dev.gentoo.org/~dilfridge/distfiles/net-snmp-5.7.3-perl524-2.patch.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cbda67fdce7aabd4b21c9b928ee5935b
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.7.3-r6 b/metadata/md5-cache/net-analyzer/net-snmp-5.7.3-r6
index e7bbf5625eea..f533efccfdd1 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.7.3-r6
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.7.3-r6
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( python_targets_python2_7 ) rpm? ( bzip2 zlib )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/project/net-snmp/net-snmp/5.7.3/net-snmp-5.7.3.tar.gz https://dev.gentoo.org/~jer/net-snmp-5.7.3-patches-2.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/net-snmp-5.7.3-perl524.patch.gz https://dev.gentoo.org/~dilfridge/distfiles/net-snmp-5.7.3-perl524-2.patch.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dc5d538961fc81d0fc8446d5f8ce4d4e
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.7.3_p3 b/metadata/md5-cache/net-analyzer/net-snmp-5.7.3_p3
index a76fcfacba2f..59f10a0fe68f 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.7.3_p3
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.7.3_p3
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( python_targets_python2_7 ) rpm? ( bzip2 zlib )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/project/net-snmp/net-snmp/5.7.3/net-snmp-5.7.3.tar.gz https://dev.gentoo.org/~jer/net-snmp-5.7.3-patches-3.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/net-snmp-5.7.3-perl524.patch.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=86fc8718f44c6d1be74afe4259f0564f
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.8 b/metadata/md5-cache/net-analyzer/net-snmp-5.8
index ce63d43a6df2..6994a9977b9a 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.8
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.8
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( python_targets_python2_7 ) rpm? ( bzip2 zlib )
 RESTRICT=test
 SLOT=0/35
 SRC_URI=mirror://sourceforge/project/net-snmp/net-snmp/5.8/net-snmp-5.8.tar.gz https://dev.gentoo.org/~jer/net-snmp-5.7.3-patches-3.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=219345517e028a385a49a96f71fe83af
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.10.0-r1 b/metadata/md5-cache/net-analyzer/netdata-1.10.0-r1
index 05aa6280c948..2cbdea1021b3 100644
--- a/metadata/md5-cache/net-analyzer/netdata-1.10.0-r1
+++ b/metadata/md5-cache/net-analyzer/netdata-1.10.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=app-shells/bash-4:0 || ( net-analyzer/netcat6 net-analyzer/netcat ) ne
 REQUIRED_USE=mysql? ( python ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://github.com/firehol/netdata/archive/v1.10.0.tar.gz -> netdata-1.10.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	fcaps	9445d60c1eb084a91c38ef4c070b2f16	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	fcaps	9445d60c1eb084a91c38ef4c070b2f16	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=d02e5580602e2132c8917b2921fa2dcf
diff --git a/metadata/md5-cache/net-analyzer/netdata-9999 b/metadata/md5-cache/net-analyzer/netdata-9999
index 1f906be45046..54bc02a6e6e7 100644
--- a/metadata/md5-cache/net-analyzer/netdata-9999
+++ b/metadata/md5-cache/net-analyzer/netdata-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ MIT BSD
 RDEPEND=>=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat6 net-analyzer/netcat ) net-analyzer/tcpdump net-analyzer/traceroute net-misc/curl net-misc/wget sys-apps/util-linux virtual/awk caps? ( sys-libs/libcap ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) 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/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] mysql? ( || ( dev-python/mysqlclient[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mysql-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(-)] ) ) postgres? ( dev-python/psycopg: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? ( python ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	fcaps	9445d60c1eb084a91c38ef4c070b2f16	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	fcaps	9445d60c1eb084a91c38ef4c070b2f16	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=f304c7696db80b0313465fe14321ee0c
diff --git a/metadata/md5-cache/net-analyzer/nipper-0.12.0 b/metadata/md5-cache/net-analyzer/nipper-0.12.0
index 0739fd0a9696..4c3b74912bec 100644
--- a/metadata/md5-cache/net-analyzer/nipper-0.12.0
+++ b/metadata/md5-cache/net-analyzer/nipper-0.12.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=net-libs/libnipper-0.12
 SLOT=0
 SRC_URI=mirror://sourceforge/nipper/nipper-cli-0.12.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=de3bc7c486280f2e5ddfe6fcd86b3663
diff --git a/metadata/md5-cache/net-analyzer/nmapsi-0.5_alpha1 b/metadata/md5-cache/net-analyzer/nmapsi-0.5_alpha1
index 0fc9a3813d15..6808b85203e7 100644
--- a/metadata/md5-cache/net-analyzer/nmapsi-0.5_alpha1
+++ b/metadata/md5-cache/net-analyzer/nmapsi-0.5_alpha1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 net-analyzer/nmap net-dns/bind-tools
 SLOT=0
 SRC_URI=mirror://sourceforge/nmapsi/nmapsi4-0.5-alpha1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=041e3252f2f2b91d2723e4ce16c85494
diff --git a/metadata/md5-cache/net-analyzer/nrpe-3.2.1-r1 b/metadata/md5-cache/net-analyzer/nrpe-3.2.1-r1
new file mode 100644
index 000000000000..393c5bcf156d
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/nrpe-3.2.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst setup
+DEPEND=sys-apps/tcp-wrappers ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) virtual/pkgconfig
+DESCRIPTION=Nagios Remote Plugin Executor
+EAPI=6
+HOMEPAGE=https://github.com/NagiosEnterprises/nrpe
+IUSE=command-args libressl selinux ssl
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=sys-apps/tcp-wrappers ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) || ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins ) selinux? ( sec-policy/selinux-nagios )
+SLOT=0
+SRC_URI=https://github.com/NagiosEnterprises/nrpe/releases/download/nrpe-3.2.1/nrpe-3.2.1.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=7302ac3996e55549872891eeb3199a80
diff --git a/metadata/md5-cache/net-analyzer/openvas-cli-1.4.3 b/metadata/md5-cache/net-analyzer/openvas-cli-1.4.3
index 4baac17ac58d..f69ce91955a6 100644
--- a/metadata/md5-cache/net-analyzer/openvas-cli-1.4.3
+++ b/metadata/md5-cache/net-analyzer/openvas-cli-1.4.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-analyzer/openvas-libraries-8.0.4 !net-analyzer/openvas-client
 SLOT=0
 SRC_URI=http://wald.intevation.org/frs/download.php/2209/openvas-cli-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3f02e25a463ee559716a9122644b00c3
diff --git a/metadata/md5-cache/net-analyzer/openvas-libraries-8.0.5 b/metadata/md5-cache/net-analyzer/openvas-libraries-8.0.5
index aaac89f6ad15..01b24a2a1f1d 100644
--- a/metadata/md5-cache/net-analyzer/openvas-libraries-8.0.5
+++ b/metadata/md5-cache/net-analyzer/openvas-libraries-8.0.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-crypt/gpgme >=dev-libs/glib-2.16 >=dev-libs/hiredis-0.10.1 dev-libs/libgcrypt:0 dev-libs/libksba !net-analyzer/openvas-libnasl net-libs/gnutls net-libs/libpcap >=net-libs/libssh-0.5.0 net-analyzer/net-snmp ldap? ( net-nds/openldap )
 SLOT=0
 SRC_URI=http://wald.intevation.org/frs/download.php/2191/openvas-libraries-8.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=40f14ac2dcb00b48b9f6be64b1c03f1a
diff --git a/metadata/md5-cache/net-analyzer/openvas-manager-6.0.6-r2 b/metadata/md5-cache/net-analyzer/openvas-manager-6.0.6-r2
index a972de8be05d..7f651959c111 100644
--- a/metadata/md5-cache/net-analyzer/openvas-manager-6.0.6-r2
+++ b/metadata/md5-cache/net-analyzer/openvas-manager-6.0.6-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-analyzer/openvas-libraries-8.0.5 >=dev-db/sqlite-3 dev-db/redis !net-analyzer/openvas-administrator
 SLOT=0
 SRC_URI=http://wald.intevation.org/frs/download.php/2195/openvas-manager-6.0.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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=5013619f141ef3db58fd647432a65fa9
diff --git a/metadata/md5-cache/net-analyzer/openvas-scanner-5.0.4-r1 b/metadata/md5-cache/net-analyzer/openvas-scanner-5.0.4-r1
index 36c4bac9cea8..a44db1d74fe4 100644
--- a/metadata/md5-cache/net-analyzer/openvas-scanner-5.0.4-r1
+++ b/metadata/md5-cache/net-analyzer/openvas-scanner-5.0.4-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-crypt/gpgme >=dev-libs/glib-2.16:2 dev-libs/libgcrypt:0 >=net-analyzer/openvas-libraries-8.0.2 !net-analyzer/openvas-plugins !net-analyzer/openvas-server
 SLOT=0
 SRC_URI=http://wald.intevation.org/frs/download.php/2129/openvas-scanner-5.0.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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=74dd3f2f48ecea378ad693c5f8091a45
diff --git a/metadata/md5-cache/net-analyzer/ospd-1.0.0 b/metadata/md5-cache/net-analyzer/ospd-1.0.0
index 4ea40feebeb1..36bbde4b0b5c 100644
--- a/metadata/md5-cache/net-analyzer/ospd-1.0.0
+++ b/metadata/md5-cache/net-analyzer/ospd-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://wald.intevation.org/frs/download.php/1999/ospd-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=68a2e36d111d554e3f060ab56088ba81
diff --git a/metadata/md5-cache/net-analyzer/pbgpp-0.2.10 b/metadata/md5-cache/net-analyzer/pbgpp-0.2.10
index 12a9c63c52e0..7054eec9194d 100644
--- a/metadata/md5-cache/net-analyzer/pbgpp-0.2.10
+++ b/metadata/md5-cache/net-analyzer/pbgpp-0.2.10
@@ -10,5 +10,5 @@ RDEPEND=dev-python/kafka-python[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pbgpp/pbgpp-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dc3c9b1b290f9d35de41970ef99b94f6
diff --git a/metadata/md5-cache/net-analyzer/prelude-correlator-3.0.1-r1 b/metadata/md5-cache/net-analyzer/prelude-correlator-3.0.1-r1
index e9342af14f57..264376bed74f 100644
--- a/metadata/md5-cache/net-analyzer/prelude-correlator-3.0.1-r1
+++ b/metadata/md5-cache/net-analyzer/prelude-correlator-3.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/netaddr[python_targets_python2_7(-)?,-python_single_target_py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/3.0.0/prelude-correlator-3.0.1.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=faf09f050a28f3537089a9200ca09f47
diff --git a/metadata/md5-cache/net-analyzer/prelude-correlator-3.1.0 b/metadata/md5-cache/net-analyzer/prelude-correlator-3.1.0
index 527ee86f0a52..e58aa5f2094c 100644
--- a/metadata/md5-cache/net-analyzer/prelude-correlator-3.1.0
+++ b/metadata/md5-cache/net-analyzer/prelude-correlator-3.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/netaddr[python_targets_python2_7(-)?,-python_single_target_py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/3.1.0/prelude-correlator-3.1.0.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0808ed8bf2b74145b22a52d1484c2d98
diff --git a/metadata/md5-cache/net-analyzer/prelude-correlator-4.0.0 b/metadata/md5-cache/net-analyzer/prelude-correlator-4.0.0
index 802332cd55f3..698fc8ef601e 100644
--- a/metadata/md5-cache/net-analyzer/prelude-correlator-4.0.0
+++ b/metadata/md5-cache/net-analyzer/prelude-correlator-4.0.0
@@ -10,5 +10,5 @@ RDEPEND=~dev-libs/libprelude-4.0.0[python,python_targets_python2_7(-)?,python_ta
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/4.0.0/prelude-correlator-4.0.0.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=82a8a8616101610fa5714f14ae52c4cf
diff --git a/metadata/md5-cache/net-analyzer/prelude-correlator-4.1.1 b/metadata/md5-cache/net-analyzer/prelude-correlator-4.1.1
index 1e8fd3ba9e38..8ca239634a30 100644
--- a/metadata/md5-cache/net-analyzer/prelude-correlator-4.1.1
+++ b/metadata/md5-cache/net-analyzer/prelude-correlator-4.1.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-libs/libprelude-4.1.0[python,python_targets_python2_7(-)?,python_ta
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/4.1.0/prelude-correlator-4.1.1.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5c5563a4c263a2aad4164c15208b3082
diff --git a/metadata/md5-cache/net-analyzer/pypacker-2.9 b/metadata/md5-cache/net-analyzer/pypacker-2.9
index 86ad3442a740..f78777f9bbc3 100644
--- a/metadata/md5-cache/net-analyzer/pypacker-2.9
+++ b/metadata/md5-cache/net-analyzer/pypacker-2.9
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/mike01/pypacker/archive/v2.9.tar.gz -> pypacker-2.9.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5e10bba7d7543aa4532bc681d638e257
diff --git a/metadata/md5-cache/net-analyzer/pypacker-4.6 b/metadata/md5-cache/net-analyzer/pypacker-4.6
index 48bb33f259f7..35fd67f847ca 100644
--- a/metadata/md5-cache/net-analyzer/pypacker-4.6
+++ b/metadata/md5-cache/net-analyzer/pypacker-4.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://gitlab.com/mike01/pypacker/-/archive/v4.6/pypacker-v4.6.tar.gz -> pypacker-4.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d5eff4641fabbeddca4fe9571f993091
diff --git a/metadata/md5-cache/net-analyzer/ripe-atlas-tools-1.2.1 b/metadata/md5-cache/net-analyzer/ripe-atlas-tools-1.2.1
index dda8622635cd..2e39730a2ccb 100644
--- a/metadata/md5-cache/net-analyzer/ripe-atlas-tools-1.2.1
+++ b/metadata/md5-cache/net-analyzer/ripe-atlas-tools-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/ripe-atlas-sagan-1.1.8[python_targets_python2_7(-)?,python_ta
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/r/ripe.atlas.tools/ripe.atlas.tools-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5c167bc830aa6d9ec4ab3a8bd440e896
diff --git a/metadata/md5-cache/net-analyzer/ripe-atlas-tools-1.2.2 b/metadata/md5-cache/net-analyzer/ripe-atlas-tools-1.2.2
index 8f0b827f749e..650955f39918 100644
--- a/metadata/md5-cache/net-analyzer/ripe-atlas-tools-1.2.2
+++ b/metadata/md5-cache/net-analyzer/ripe-atlas-tools-1.2.2
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/ripe-atlas-sagan-1.1.8[python_targets_python2_7(-)?,python_ta
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/r/ripe.atlas.tools/ripe.atlas.tools-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a2b580b728f0bee895612d6cc80db009
diff --git a/metadata/md5-cache/net-analyzer/ripe-atlas-tools-1.2.3 b/metadata/md5-cache/net-analyzer/ripe-atlas-tools-1.2.3
index 9ba443d60856..fdbca93a5310 100644
--- a/metadata/md5-cache/net-analyzer/ripe-atlas-tools-1.2.3
+++ b/metadata/md5-cache/net-analyzer/ripe-atlas-tools-1.2.3
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/ripe-atlas-sagan-1.1.8[python_targets_python2_7(-)?,python_ta
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/r/ripe.atlas.tools/ripe.atlas.tools-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7d53cbbdd99596c1272f98be1fdc6a5c
diff --git a/metadata/md5-cache/net-analyzer/ripe-atlas-tools-1.2.3-r1 b/metadata/md5-cache/net-analyzer/ripe-atlas-tools-1.2.3-r1
index 8c1fd9392bca..f58a82e3b6b2 100644
--- a/metadata/md5-cache/net-analyzer/ripe-atlas-tools-1.2.3-r1
+++ b/metadata/md5-cache/net-analyzer/ripe-atlas-tools-1.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/ripe-atlas-sagan-1.1.10[python_targets_python2_7(-)?,python_t
 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/ripe.atlas.tools/ripe.atlas.tools-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a059d11ee93ceac13a6a0eb4ead50053
diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.6.0-r1 b/metadata/md5-cache/net-analyzer/rrdtool-1.6.0-r1
index 4e5b50bf8688..2eeb58c5593a 100644
--- a/metadata/md5-cache/net-analyzer/rrdtool-1.6.0-r1
+++ b/metadata/md5-cache/net-analyzer/rrdtool-1.6.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.28.7:2[static-libs(+)?] >=dev-libs/libxml2-2.7.8:2[sta
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0/8.0.0
 SRC_URI=https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.6.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fbb18df0fbd87d3c06af38eeecdf26b8
diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.7.0 b/metadata/md5-cache/net-analyzer/rrdtool-1.7.0
index 426420229bb1..98c2a521519f 100644
--- a/metadata/md5-cache/net-analyzer/rrdtool-1.7.0
+++ b/metadata/md5-cache/net-analyzer/rrdtool-1.7.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.28.7:2[static-libs(+)?] >=dev-libs/libxml2-2.7.8:2[sta
 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/8.0.0
 SRC_URI=https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=adadd76c490edef98762a3229cc9f97c
diff --git a/metadata/md5-cache/net-analyzer/scapy-2.3.2-r1 b/metadata/md5-cache/net-analyzer/scapy-2.3.2-r1
index fb7015afe979..bd5e0a84c650 100644
--- a/metadata/md5-cache/net-analyzer/scapy-2.3.2-r1
+++ b/metadata/md5-cache/net-analyzer/scapy-2.3.2-r1
@@ -10,5 +10,5 @@ RDEPEND=net-analyzer/tcpdump gnuplot? ( dev-python/gnuplot-py[python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/secdev/scapy/archive/v2.3.2.tar.gz -> scapy-2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8d836750c5b52bd2f7ef211ea72581c2
diff --git a/metadata/md5-cache/net-analyzer/scapy-2.4.0 b/metadata/md5-cache/net-analyzer/scapy-2.4.0
index 8c113e297078..df394c24aca4 100644
--- a/metadata/md5-cache/net-analyzer/scapy-2.4.0
+++ b/metadata/md5-cache/net-analyzer/scapy-2.4.0
@@ -10,5 +10,5 @@ RDEPEND=net-analyzer/tcpdump python_targets_python2_7? ( >=dev-lang/python-2.7.5
 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/secdev/scapy/archive/v2.4.0.tar.gz -> scapy-2.4.0.tar.gz
-_eclasses_=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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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_=be0e899d37521b378b5c1d0b87248057
diff --git a/metadata/md5-cache/net-analyzer/scapy-9999 b/metadata/md5-cache/net-analyzer/scapy-9999
index debe761abba7..a933487aee00 100644
--- a/metadata/md5-cache/net-analyzer/scapy-9999
+++ b/metadata/md5-cache/net-analyzer/scapy-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=net-analyzer/tcpdump python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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_=e7d1ceee4f4a1f2baaab76b2cd467934
diff --git a/metadata/md5-cache/net-analyzer/sec-2.8.1 b/metadata/md5-cache/net-analyzer/sec-2.8.1
new file mode 100644
index 000000000000..b542608d8c44
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/sec-2.8.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Simple Event Correlator
+EAPI=6
+HOMEPAGE=https://github.com/simple-evcorr/sec
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/perl-5.8.0
+SLOT=0
+SRC_URI=https://github.com/simple-evcorr/sec/releases/download/2.8.1/sec-2.8.1.tar.gz
+_md5_=9d03224a5b3ebb42df19e2b350f6d810
diff --git a/metadata/md5-cache/net-analyzer/slurm-0.4.3 b/metadata/md5-cache/net-analyzer/slurm-0.4.3
index f2bcec0f9e1d..104b72375f0d 100644
--- a/metadata/md5-cache/net-analyzer/slurm-0.4.3
+++ b/metadata/md5-cache/net-analyzer/slurm-0.4.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:*
 SLOT=0
 SRC_URI=https://github.com/mattthias/slurm/archive/upstream/slurm.tar.gz -> slurm-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=790fd5143de73daf4c27ff8e127e597b
diff --git a/metadata/md5-cache/net-analyzer/speedtest-cli-1.0.7 b/metadata/md5-cache/net-analyzer/speedtest-cli-1.0.7
index 8323c684456a..1b74978ad435 100644
--- a/metadata/md5-cache/net-analyzer/speedtest-cli-1.0.7
+++ b/metadata/md5-cache/net-analyzer/speedtest-cli-1.0.7
@@ -10,5 +10,5 @@ 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
 SRC_URI=https://github.com/sivel/speedtest-cli/archive/v1.0.7.tar.gz -> speedtest-cli-1.0.7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a7f665ec1276648118e758e148e5a157
diff --git a/metadata/md5-cache/net-analyzer/speedtest-cli-2.0.0 b/metadata/md5-cache/net-analyzer/speedtest-cli-2.0.0
index 5183f1873f02..9b792042ce3c 100644
--- a/metadata/md5-cache/net-analyzer/speedtest-cli-2.0.0
+++ b/metadata/md5-cache/net-analyzer/speedtest-cli-2.0.0
@@ -10,5 +10,5 @@ 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
 SRC_URI=https://github.com/sivel/speedtest-cli/archive/v2.0.0.tar.gz -> speedtest-cli-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b8a132c8019dcab0c72d950fa14a91c2
diff --git a/metadata/md5-cache/net-analyzer/speedtest-cli-2.0.2 b/metadata/md5-cache/net-analyzer/speedtest-cli-2.0.2
index a86e2d9cd49d..7d294e91b8e7 100644
--- a/metadata/md5-cache/net-analyzer/speedtest-cli-2.0.2
+++ b/metadata/md5-cache/net-analyzer/speedtest-cli-2.0.2
@@ -10,5 +10,5 @@ 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
 SRC_URI=https://github.com/sivel/speedtest-cli/archive/v2.0.2.tar.gz -> speedtest-cli-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b8a132c8019dcab0c72d950fa14a91c2
diff --git a/metadata/md5-cache/net-analyzer/testssl-2.9.5_p5-r1 b/metadata/md5-cache/net-analyzer/testssl-2.9.5_p5-r1
new file mode 100644
index 000000000000..b7169ded5815
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/testssl-2.9.5_p5-r1
@@ -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
+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? ( 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_=4493f8eac832f5dc5e5893bd5dea7757
diff --git a/metadata/md5-cache/net-analyzer/traceroute-2.1.0 b/metadata/md5-cache/net-analyzer/traceroute-2.1.0
index 783cf9e2fe5b..679859e5e6e7 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_=e0d78690f501e5c6b8f03d0d66167626
+_md5_=662a67ace54347d6b9ce12bb4145093e
diff --git a/metadata/md5-cache/net-analyzer/wapiti-3.0.0 b/metadata/md5-cache/net-analyzer/wapiti-3.0.0
index 39562fa40049..57e98ea7ae84 100644
--- a/metadata/md5-cache/net-analyzer/wapiti-3.0.0
+++ b/metadata/md5-cache/net-analyzer/wapiti-3.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/beautifulsoup:4[python_targets_python3_4(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/wapiti/wapiti-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f1f14b8fc4418e1539ecb4935c028471
diff --git a/metadata/md5-cache/net-analyzer/wapiti-3.0.1 b/metadata/md5-cache/net-analyzer/wapiti-3.0.1
index df294661ca9a..17a620306a3f 100644
--- a/metadata/md5-cache/net-analyzer/wapiti-3.0.1
+++ b/metadata/md5-cache/net-analyzer/wapiti-3.0.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/beautifulsoup:4[python_targets_python3_4(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/wapiti/wapiti3-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=88cd17e196ae4cda0e6645665b19f4ee
diff --git a/metadata/md5-cache/net-analyzer/wapiti-9999 b/metadata/md5-cache/net-analyzer/wapiti-9999
index 2c69e53ff4e8..2cd27d9c130e 100644
--- a/metadata/md5-cache/net-analyzer/wapiti-9999
+++ b/metadata/md5-cache/net-analyzer/wapiti-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=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/lxml[python_targets_python3_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/mako[python_targets_python3_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-1.2.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/tld[python_targets_python3_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/yaswfp[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] kerberos? ( dev-python/requests-kerberos[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ntlm? ( dev-python/requests-ntlm[python_targets_python3_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[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_python3_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	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	subversion	3d1eb4b41d7190570a84f786958ebb13	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	subversion	3d1eb4b41d7190570a84f786958ebb13	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a432fbfe375dd551b9312beb0eb6b283
diff --git a/metadata/md5-cache/net-analyzer/wireshark-2.4.5 b/metadata/md5-cache/net-analyzer/wireshark-2.4.5
index 09e30930b5ed..5b3af75538ee 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-2.4.5
+++ b/metadata/md5-cache/net-analyzer/wireshark-2.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 netlink? ( dev-libs/libnl:3
 REQUIRED_USE=ciscodump? ( libssh ) sshdump? ( libssh )
 SLOT=0/2.4.5
 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-2.4.5.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=be1b35338cee57fe184eca7c853cfbd4
diff --git a/metadata/md5-cache/net-analyzer/wireshark-2.6.3 b/metadata/md5-cache/net-analyzer/wireshark-2.6.3
index 17e2ae231369..a2ce0881fe2e 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-2.6.3
+++ b/metadata/md5-cache/net-analyzer/wireshark-2.6.3
@@ -9,5 +9,5 @@ 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 >=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 ) gtk? ( virtual/freedesktop-icon-theme ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
 SLOT=0/2.6.3
 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-2.6.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f6cb274d71176802aca6d5f64c19fb69
diff --git a/metadata/md5-cache/net-analyzer/wireshark-99999999 b/metadata/md5-cache/net-analyzer/wireshark-99999999
index 7d520ac46a64..2d30b0153927 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-99999999
+++ b/metadata/md5-cache/net-analyzer/wireshark-99999999
@@ -7,5 +7,5 @@ IUSE=adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc +dumpcap +
 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 )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/net-analyzer/zmap-2.1.1 b/metadata/md5-cache/net-analyzer/zmap-2.1.1
index 2413b2a2e761..b3860d8bb5df 100644
--- a/metadata/md5-cache/net-analyzer/zmap-2.1.1
+++ b/metadata/md5-cache/net-analyzer/zmap-2.1.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/gmp:0 net-libs/libpcap dev-libs/json-c:= mongo? ( dev-db/mongodb ) redis? ( dev-libs/hiredis )
 SLOT=0
 SRC_URI=https://github.com/zmap/zmap/archive/v2.1.1.tar.gz -> zmap-2.1.1.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	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_=26e8b683b841ea7bbfbb247bb116bdd2
diff --git a/metadata/md5-cache/net-analyzer/zmap-9999 b/metadata/md5-cache/net-analyzer/zmap-9999
index 92387c418f54..678c69150ebc 100644
--- a/metadata/md5-cache/net-analyzer/zmap-9999
+++ b/metadata/md5-cache/net-analyzer/zmap-9999
@@ -7,5 +7,5 @@ IUSE=mongo redis +filecaps
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/gmp:0 net-libs/libpcap dev-libs/json-c:= mongo? ( dev-db/mongodb ) redis? ( dev-libs/hiredis )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	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_=15f8a8890787d18aaaf49995664247fe
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index 246376cb9c80..27cb565a5a51 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/accel-ppp-1.11.1_p20170508 b/metadata/md5-cache/net-dialup/accel-ppp-1.11.1_p20170508
index 70f6cc9aa9ec..ff75769b2e56 100644
--- a/metadata/md5-cache/net-dialup/accel-ppp-1.11.1_p20170508
+++ b/metadata/md5-cache/net-dialup/accel-ppp-1.11.1_p20170508
@@ -11,5 +11,5 @@ RDEPEND=lua? ( dev-lang/lua:0 ) postgres? ( dev-db/postgresql:* ) snmp? ( net-an
 REQUIRED_USE=valgrind? ( debug )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/accel-ppp-1.11.1_p20170508.tar.bz2
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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_=4e31ea45d48f1d94c70d5381bb5514f6
diff --git a/metadata/md5-cache/net-dialup/accel-ppp-1.11.1_p20180320 b/metadata/md5-cache/net-dialup/accel-ppp-1.11.1_p20180320
index 013c7ec33904..c8cf282e91a7 100644
--- a/metadata/md5-cache/net-dialup/accel-ppp-1.11.1_p20180320
+++ b/metadata/md5-cache/net-dialup/accel-ppp-1.11.1_p20180320
@@ -11,5 +11,5 @@ RDEPEND=lua? ( dev-lang/lua:0 ) postgres? ( dev-db/postgresql:* ) snmp? ( net-an
 REQUIRED_USE=valgrind? ( debug )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/accel-ppp-1.11.1_p20180320.tar.bz2
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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_=02c6493dfa15127c2b3a8a124ae6a242
diff --git a/metadata/md5-cache/net-dialup/accel-ppp-1.11.9999 b/metadata/md5-cache/net-dialup/accel-ppp-1.11.9999
index 9dcb5a1bf639..e9c65df230d5 100644
--- a/metadata/md5-cache/net-dialup/accel-ppp-1.11.9999
+++ b/metadata/md5-cache/net-dialup/accel-ppp-1.11.9999
@@ -9,5 +9,5 @@ PDEPEND=net-dialup/ppp-scripts
 RDEPEND=lua? ( dev-lang/lua:0 ) postgres? ( dev-db/postgresql:* ) snmp? ( net-analyzer/net-snmp ) dev-libs/libpcre dev-libs/openssl:0 kernel_linux? ( virtual/modutils )
 REQUIRED_USE=valgrind? ( debug )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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_=b26a9a2e4f579955fc1e9a70bbfe98d6
diff --git a/metadata/md5-cache/net-dialup/accel-ppp-9999 b/metadata/md5-cache/net-dialup/accel-ppp-9999
index 80c2fcb9c546..97ef8fd128a9 100644
--- a/metadata/md5-cache/net-dialup/accel-ppp-9999
+++ b/metadata/md5-cache/net-dialup/accel-ppp-9999
@@ -9,5 +9,5 @@ PDEPEND=net-dialup/ppp-scripts
 RDEPEND=lua? ( dev-lang/lua:0 ) postgres? ( dev-db/postgresql:* ) snmp? ( net-analyzer/net-snmp ) dev-libs/libpcre dev-libs/openssl:0 kernel_linux? ( virtual/modutils )
 REQUIRED_USE=valgrind? ( debug )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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_=5fd0f7338b411b107e95e791532a13ff
diff --git a/metadata/md5-cache/net-dialup/cutecom-0.40.0-r1 b/metadata/md5-cache/net-dialup/cutecom-0.40.0-r1
index 0337c72a555a..e8afad016c1d 100644
--- a/metadata/md5-cache/net-dialup/cutecom-0.40.0-r1
+++ b/metadata/md5-cache/net-dialup/cutecom-0.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtserialport:5 dev-qt/qtwidgets:5 net-dialup/lrzsz
 SLOT=0
 SRC_URI=https://codeload.github.com/neundorf/cutecom/tar.gz/v0.40.0 -> cutecom-0.40.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6997d51aec862d0f5f81ec1fdd7dc3dc
diff --git a/metadata/md5-cache/net-dialup/dgcmodem-1.10 b/metadata/md5-cache/net-dialup/dgcmodem-1.10
index 03817cad35a5..06ea2b568522 100644
--- a/metadata/md5-cache/net-dialup/dgcmodem-1.10
+++ b/metadata/md5-cache/net-dialup/dgcmodem-1.10
@@ -7,5 +7,5 @@ KEYWORDS=x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.linuxant.com/drivers/dgc/archive/dgcmodem-1.10/dgcmodem-1.10.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=8ca77e09378fcb33a8684c80d168750d
diff --git a/metadata/md5-cache/net-dialup/linux-atm-2.5.2 b/metadata/md5-cache/net-dialup/linux-atm-2.5.2
index dab31c16c1c6..f7593a0b9805 100644
--- a/metadata/md5-cache/net-dialup/linux-atm-2.5.2
+++ b/metadata/md5-cache/net-dialup/linux-atm-2.5.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/linux-atm/linux-atm-2.5.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=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
 _md5_=07762e76abfcc224347077fbab6a0bc5
diff --git a/metadata/md5-cache/net-dialup/moserial-3.0.11 b/metadata/md5-cache/net-dialup/moserial-3.0.11
index 56b530fb63cb..3244a01f271d 100644
--- a/metadata/md5-cache/net-dialup/moserial-3.0.11
+++ b/metadata/md5-cache/net-dialup/moserial-3.0.11
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.16:2[dbus] gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.0.0:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/moserial/3.0/moserial-3.0.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=df4d1f0ec33f575c38b5de9a302e6f00
diff --git a/metadata/md5-cache/net-dialup/openl2tp-1.8-r1 b/metadata/md5-cache/net-dialup/openl2tp-1.8-r1
index 55b63fd3c319..de171eb55d04 100644
--- a/metadata/md5-cache/net-dialup/openl2tp-1.8-r1
+++ b/metadata/md5-cache/net-dialup/openl2tp-1.8-r1
@@ -11,5 +11,5 @@ RDEPEND=>=net-dialup/ppp-2.4.5 >=net-libs/libtirpc-1.0.3 sys-libs/readline:= dma
 REQUIRED_USE=|| ( client server )
 SLOT=0
 SRC_URI=mirror://sourceforge/openl2tp/openl2tp-1.8.tar.gz
-_eclasses_=linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=ade8a3c65ab389a69e75266a39fba456
diff --git a/metadata/md5-cache/net-dialup/ppp-2.4.7-r6 b/metadata/md5-cache/net-dialup/ppp-2.4.7-r6
index 2ddb6f0aa911..e9637600ef34 100644
--- a/metadata/md5-cache/net-dialup/ppp-2.4.7-r6
+++ b/metadata/md5-cache/net-dialup/ppp-2.4.7-r6
@@ -10,5 +10,5 @@ PDEPEND=net-dialup/ppp-scripts
 RDEPEND=activefilter? ( net-libs/libpcap ) atm? ( net-dialup/linux-atm ) pam? ( virtual/pam ) gtk? ( x11-libs/gtk+:2 ) eap-tls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
 SLOT=0/2.4.7
 SRC_URI=https://download.samba.org/pub/ppp/ppp-2.4.7.tar.gz https://dev.gentoo.org/~polynomial-c/ppp-2.4.7-patches-6.tar.xz http://www.netservers.net.uk/gpl/ppp-dhcpc.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c5a47cbc85b8322bf4f4e45ee73a8106
diff --git a/metadata/md5-cache/net-dialup/ppp-2.4.7-r7 b/metadata/md5-cache/net-dialup/ppp-2.4.7-r7
index 8428f427a79e..877eaa59376b 100644
--- a/metadata/md5-cache/net-dialup/ppp-2.4.7-r7
+++ b/metadata/md5-cache/net-dialup/ppp-2.4.7-r7
@@ -10,5 +10,5 @@ PDEPEND=net-dialup/ppp-scripts
 RDEPEND=activefilter? ( net-libs/libpcap ) atm? ( net-dialup/linux-atm ) pam? ( virtual/pam ) gtk? ( x11-libs/gtk+:2 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= )
 SLOT=0/2.4.7
 SRC_URI=https://download.samba.org/pub/ppp/ppp-2.4.7.tar.gz https://dev.gentoo.org/~polynomial-c/ppp-2.4.7-patches-7.tar.xz http://www.netservers.net.uk/gpl/ppp-dhcpc.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7ca8b0918ca056254812131a58309cde
diff --git a/metadata/md5-cache/net-dialup/speedtouch-usb-3.0.1.2-r3 b/metadata/md5-cache/net-dialup/speedtouch-usb-3.0.1.2-r3
index 8ec8262be1ba..807f0106cc72 100644
--- a/metadata/md5-cache/net-dialup/speedtouch-usb-3.0.1.2-r3
+++ b/metadata/md5-cache/net-dialup/speedtouch-usb-3.0.1.2-r3
@@ -9,5 +9,5 @@ LICENSE=SpeedTouch-USB-Firmware
 RDEPEND=net-dialup/ppp
 SLOT=0
 SRC_URI=http://www.speedtouch.com/download/drivers/USB/SpeedTouch330_firmware_3012.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=736bb8b3e82e008522a5c8bea5133d9f
diff --git a/metadata/md5-cache/net-dialup/ueagle-atm-1.1-r3 b/metadata/md5-cache/net-dialup/ueagle-atm-1.1-r3
index cd579dc227ab..6bbde2f40108 100644
--- a/metadata/md5-cache/net-dialup/ueagle-atm-1.1-r3
+++ b/metadata/md5-cache/net-dialup/ueagle-atm-1.1-r3
@@ -8,5 +8,5 @@ LICENSE=BSD GPL-2
 RDEPEND=net-dialup/ppp !sys-kernel/linux-firmware
 SLOT=0
 SRC_URI=http://eagle-usb.org/ueagle-atm/non-free/ueagle-data-src-1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dd4c3dfccfa32fcf3d44e97e3f318396
diff --git a/metadata/md5-cache/net-dialup/ueagle4-atm-1.0 b/metadata/md5-cache/net-dialup/ueagle4-atm-1.0
index 8c909f69e959..5465fa2e7860 100644
--- a/metadata/md5-cache/net-dialup/ueagle4-atm-1.0
+++ b/metadata/md5-cache/net-dialup/ueagle4-atm-1.0
@@ -8,5 +8,5 @@ LICENSE=Ikanos
 RDEPEND=net-dialup/ppp !sys-kernel/linux-firmware
 SLOT=0
 SRC_URI=http://eagle-usb.org/ueagle-atm/non-free/ueagle4-data-1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a513db2634e99d0ed77f96d0ccf65ed0
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 8187cb967f2d..0c3f2d46d6ed 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/dnscrypt-proxy-2.0.17 b/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.17
new file mode 100644
index 000000000000..d17e085b6b50
--- /dev/null
+++ b/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.17
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.9 virtual/pkgconfig
+DESCRIPTION=A flexible DNS proxy, with support for encrypted DNS protocols
+EAPI=6
+HOMEPAGE=https://github.com/jedisct1/dnscrypt-proxy
+IUSE=pie test +filecaps
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=ISC
+SLOT=0
+SRC_URI=https://github.com/jedisct1/dnscrypt-proxy/archive/2.0.17.tar.gz -> dnscrypt-proxy-2.0.17.tar.gz
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=907e20161684160f72f9b1ed9c12eec5
diff --git a/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.17_pre20180903 b/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.17_pre20180903
deleted file mode 100644
index 5e935016afa2..000000000000
--- a/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.17_pre20180903
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.9 virtual/pkgconfig
-DESCRIPTION=A flexible DNS proxy, with support for encrypted DNS protocols
-EAPI=6
-HOMEPAGE=https://github.com/jedisct1/dnscrypt-proxy
-IUSE=pie test +filecaps
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=ISC
-SLOT=0
-SRC_URI=https://github.com/jedisct1/dnscrypt-proxy/archive/da5ee45b8ceb9233f4bc21b2a5f1eb7c875947cc.tar.gz -> dnscrypt-proxy-da5ee45b8ceb9233f4bc21b2a5f1eb7c875947cc.tar.gz
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=f32e68d81e53632635fed4c86bb60520
diff --git a/metadata/md5-cache/net-dns/dnsimple-dyndns-0.1 b/metadata/md5-cache/net-dns/dnsimple-dyndns-0.1
index 2fcfa8e29833..48ad38eb694c 100644
--- a/metadata/md5-cache/net-dns/dnsimple-dyndns-0.1
+++ b/metadata/md5-cache/net-dns/dnsimple-dyndns-0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/requests-2.0.0 python_targets_python2_7? ( >=dev-lang/pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/dnsimple-dyndns/dnsimple-dyndns-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2f7c3136738f9262e8c330f1d3892877
diff --git a/metadata/md5-cache/net-dns/dnssec-root-20150403 b/metadata/md5-cache/net-dns/dnssec-root-20150403
index 586d0a459b2b..b55c6dd95335 100644
--- a/metadata/md5-cache/net-dns/dnssec-root-20150403
+++ b/metadata/md5-cache/net-dns/dnssec-root-20150403
@@ -8,4 +8,4 @@ KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sp
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://data.iana.org/root-anchors/root-anchors.xml -> root-anchors-20100715.xml http://data.iana.org/root-anchors/Kjqmt7v.csr -> Kjqmt7v-20100715.csr test? ( http://data.iana.org/root-anchors/Kjqmt7v.crt -> Kjqmt7v-20150504.crt http://data.iana.org/root-anchors/root-anchors.p7s -> root-anchors-20150504.p7s http://data.iana.org/root-anchors/root-anchors.asc -> root-anchors-20100715.asc http://data.iana.org/root-anchors/icannbundle.pem -> icannbundle-20150504.pem http://data.iana.org/root-anchors/icann.pgp -> icann-20110715.pgp )
-_md5_=25b1595ee8e26afe57e2cd126866827d
+_md5_=3816c301d9615e35d44e5af0250dd6f8
diff --git a/metadata/md5-cache/net-dns/dnssec-root-20170203-r1 b/metadata/md5-cache/net-dns/dnssec-root-20170203-r1
new file mode 100644
index 000000000000..b9b1cd184fb7
--- /dev/null
+++ b/metadata/md5-cache/net-dns/dnssec-root-20170203-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare unpack
+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
+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
diff --git a/metadata/md5-cache/net-dns/https_dns_proxy-9999 b/metadata/md5-cache/net-dns/https_dns_proxy-9999
index 74c34239b7c4..702ca82fb67c 100644
--- a/metadata/md5-cache/net-dns/https_dns_proxy-9999
+++ b/metadata/md5-cache/net-dns/https_dns_proxy-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/aarond10/https_dns_proxy
 LICENSE=MIT
 RDEPEND=dev-libs/libev net-dns/c-ares >=net-misc/curl-7.53.0[http2,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	89bb9f083a2590d9b447fd0b78a96186
+_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_=095f6de94d97cc6fcded2843eaeee245
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 db63a80a9e87..26a0ccc5f917 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=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 76fac4e23d7b..7d2836a86ced 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e4c2137043f95b78889b4a520fe5163e
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 794bcd65409a..54aac044d5e6 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_=f2d9a531329f90aede4bac3b1897cd9c
+_md5_=3c89f02e2d1ee4788cd9a8748505bd7f
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index ecd07db518c3..640c9f173060 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/conntrack-tools-1.4.2 b/metadata/md5-cache/net-firewall/conntrack-tools-1.4.2
index 438f73b178ca..e6441caf625e 100644
--- a/metadata/md5-cache/net-firewall/conntrack-tools-1.4.2
+++ b/metadata/md5-cache/net-firewall/conntrack-tools-1.4.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnetfilter_conntrack-1.0.4 >=net-libs/libnetfilter_cthelper-1.0.0 >=net-libs/libnetfilter_cttimeout-1.0.0 >=net-libs/libnetfilter_queue-1.0.2 >=net-libs/libnfnetlink-1.0.1
 SLOT=0
 SRC_URI=http://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-1.4.2.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=48a5f40969be8c88eeb34b3f11580615
diff --git a/metadata/md5-cache/net-firewall/conntrack-tools-1.4.3 b/metadata/md5-cache/net-firewall/conntrack-tools-1.4.3
index 6194e7d4302b..1dd386b65985 100644
--- a/metadata/md5-cache/net-firewall/conntrack-tools-1.4.3
+++ b/metadata/md5-cache/net-firewall/conntrack-tools-1.4.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnetfilter_conntrack-1.0.4 >=net-libs/libnetfilter_cthelper-1.0.0 >=net-libs/libnetfilter_cttimeout-1.0.0 >=net-libs/libnetfilter_queue-1.0.2 >=net-libs/libnfnetlink-1.0.1
 SLOT=0
 SRC_URI=http://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-1.4.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ee98f694cd43513cf66229d49b4e4be3
diff --git a/metadata/md5-cache/net-firewall/conntrack-tools-1.4.4 b/metadata/md5-cache/net-firewall/conntrack-tools-1.4.4
index afbb8bc9cbd5..30c635c3eacb 100644
--- a/metadata/md5-cache/net-firewall/conntrack-tools-1.4.4
+++ b/metadata/md5-cache/net-firewall/conntrack-tools-1.4.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnetfilter_conntrack-1.0.6 >=net-libs/libnetfilter_cthelper-1.0.0 >=net-libs/libnetfilter_cttimeout-1.0.0 >=net-libs/libnetfilter_queue-1.0.2 >=net-libs/libnfnetlink-1.0.1
 SLOT=0
 SRC_URI=http://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-1.4.4.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c73c4a0cb2cfb3f1eacfe9e99654e2a7
diff --git a/metadata/md5-cache/net-firewall/conntrack-tools-1.4.4-r1 b/metadata/md5-cache/net-firewall/conntrack-tools-1.4.4-r1
index f8028a8fec37..70338fbb8510 100644
--- a/metadata/md5-cache/net-firewall/conntrack-tools-1.4.4-r1
+++ b/metadata/md5-cache/net-firewall/conntrack-tools-1.4.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnetfilter_conntrack-1.0.6 >=net-libs/libnetfilter_cthelper-1.0.0 >=net-libs/libnetfilter_cttimeout-1.0.0 >=net-libs/libnetfilter_queue-1.0.2 >=net-libs/libnfnetlink-1.0.1 !libtirpc? ( sys-libs/glibc[rpc(-)] ) libtirpc? ( net-libs/libtirpc )
 SLOT=0
 SRC_URI=http://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-1.4.4.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5b9689b9c5a05ea4990766758524609e
diff --git a/metadata/md5-cache/net-firewall/conntrack-tools-1.4.5 b/metadata/md5-cache/net-firewall/conntrack-tools-1.4.5
index 7a0721fc1a2f..cad968a81835 100644
--- a/metadata/md5-cache/net-firewall/conntrack-tools-1.4.5
+++ b/metadata/md5-cache/net-firewall/conntrack-tools-1.4.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnetfilter_conntrack-1.0.7 cthelper? ( >=net-libs/libnetfilter_cthelper-1.0.0 ) cttimeout? ( >=net-libs/libnetfilter_cttimeout-1.0.0 ) >=net-libs/libnetfilter_queue-1.0.2 >=net-libs/libnfnetlink-1.0.1 !libtirpc? ( sys-libs/glibc[rpc(-)] ) libtirpc? ( net-libs/libtirpc )
 SLOT=0
 SRC_URI=http://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-1.4.5.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=84870fa3e9c125f0c31fe6222d9f6ee5
diff --git a/metadata/md5-cache/net-firewall/firehol-3.1.3 b/metadata/md5-cache/net-firewall/firehol-3.1.3
index 5ad5d4fac4a8..357b2e523ab8 100644
--- a/metadata/md5-cache/net-firewall/firehol-3.1.3
+++ b/metadata/md5-cache/net-firewall/firehol-3.1.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-firewall/iptables sys-apps/iproute2[-minimal,ipv6?] net-misc/iputils[ipv6?] net-misc/iprange net-analyzer/traceroute virtual/modutils app-arch/gzip
 SLOT=0
 SRC_URI=https://github.com/firehol/firehol/releases/download/v3.1.3/firehol-3.1.3.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=f95cd15a41c52f884f8cf283d6e18d0e
diff --git a/metadata/md5-cache/net-firewall/firehol-3.1.3-r1 b/metadata/md5-cache/net-firewall/firehol-3.1.3-r1
index a6d39036e1c3..2ba01c8fd87b 100644
--- a/metadata/md5-cache/net-firewall/firehol-3.1.3-r1
+++ b/metadata/md5-cache/net-firewall/firehol-3.1.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-firewall/iptables sys-apps/iproute2[-minimal,ipv6?] net-misc/iputils[ipv6?] net-misc/iprange net-analyzer/traceroute virtual/modutils app-arch/gzip ipset? ( net-firewall/ipset )
 SLOT=0
 SRC_URI=https://github.com/firehol/firehol/releases/download/v3.1.3/firehol-3.1.3.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=e4d4a8f979bbeb13539d71dae74fcd25
diff --git a/metadata/md5-cache/net-firewall/firehol-3.1.4 b/metadata/md5-cache/net-firewall/firehol-3.1.4
index 46cb10ad7d50..a3d7b7f04a8a 100644
--- a/metadata/md5-cache/net-firewall/firehol-3.1.4
+++ b/metadata/md5-cache/net-firewall/firehol-3.1.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-firewall/iptables sys-apps/iproute2[-minimal,ipv6?] net-misc/iputils[ipv6?] net-misc/iprange net-analyzer/traceroute virtual/modutils app-arch/gzip ipset? ( net-firewall/ipset )
 SLOT=0
 SRC_URI=https://github.com/firehol/firehol/releases/download/v3.1.4/firehol-3.1.4.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=be8634cfab087fcaf4d22fc15564aca9
diff --git a/metadata/md5-cache/net-firewall/firehol-3.1.6 b/metadata/md5-cache/net-firewall/firehol-3.1.6
index b43b7b895510..c216164e1595 100644
--- a/metadata/md5-cache/net-firewall/firehol-3.1.6
+++ b/metadata/md5-cache/net-firewall/firehol-3.1.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-firewall/iptables sys-apps/iproute2[-minimal,ipv6?] net-misc/iputils[ipv6?] net-misc/iprange net-analyzer/traceroute virtual/modutils app-arch/gzip ipset? ( net-firewall/ipset )
 SLOT=0
 SRC_URI=https://github.com/firehol/firehol/releases/download/v3.1.6/firehol-3.1.6.tar.xz
-_eclasses_=linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=29b0f8cbe392039233566c5bd12ef7eb
diff --git a/metadata/md5-cache/net-firewall/firewalld-0.5.1-r2 b/metadata/md5-cache/net-firewall/firewalld-0.5.1-r2
index fc29e58a2168..8f88a7c11bb8 100644
--- a/metadata/md5-cache/net-firewall/firewalld-0.5.1-r2
+++ b/metadata/md5-cache/net-firewall/firewalld-0.5.1-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/firewalld/firewalld/archive/v0.5.1.tar.gz -> firewalld-0.5.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=631d922a21970b1e96b040176ac4d736
diff --git a/metadata/md5-cache/net-firewall/fwbuilder-5.3.7 b/metadata/md5-cache/net-firewall/fwbuilder-5.3.7
index 3ca29678b23f..3aae1115c350 100644
--- a/metadata/md5-cache/net-firewall/fwbuilder-5.3.7
+++ b/metadata/md5-cache/net-firewall/fwbuilder-5.3.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/libxml2 dev-libs/libxslt dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/fwbuilder/fwbuilder/archive/v5.3.7.tar.gz -> fwbuilder-5.3.7.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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5b2c7f54896fbd48e158af04db62aadc
diff --git a/metadata/md5-cache/net-firewall/fwknop-2.6.9-r1 b/metadata/md5-cache/net-firewall/fwknop-2.6.9-r1
index 8fe41a910622..6e664f0f51c0 100644
--- a/metadata/md5-cache/net-firewall/fwknop-2.6.9-r1
+++ b/metadata/md5-cache/net-firewall/fwknop-2.6.9-r1
@@ -10,5 +10,5 @@ RDEPEND=client? ( net-misc/wget[ssl] ) firewalld? ( net-firewall/firewalld[pytho
 REQUIRED_USE=nfqueue? ( server ) python? ( || ( python_targets_python2_7 ) ) server? ( ^^ ( firewalld iptables ) ) udp-server? ( server )
 SLOT=0
 SRC_URI=https://github.com/mrash/fwknop/archive/2.6.9.tar.gz -> fwknop-2.6.9.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1d9e83c155161ee8f12af2545ca8230e
diff --git a/metadata/md5-cache/net-firewall/ipset-6.29 b/metadata/md5-cache/net-firewall/ipset-6.29
index 6f97d9d63deb..4261bdb09908 100644
--- a/metadata/md5-cache/net-firewall/ipset-6.29
+++ b/metadata/md5-cache/net-firewall/ipset-6.29
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl modules? ( kernel_linux? ( virtual/modutils ) )
 SLOT=0
 SRC_URI=http://ipset.netfilter.org/ipset-6.29.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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_=8dc43623d679d0c3e219a7bf579998d3
diff --git a/metadata/md5-cache/net-firewall/ipset-6.30 b/metadata/md5-cache/net-firewall/ipset-6.30
index 5f1ea2bde3dc..ad29c9b8ee3f 100644
--- a/metadata/md5-cache/net-firewall/ipset-6.30
+++ b/metadata/md5-cache/net-firewall/ipset-6.30
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl modules? ( kernel_linux? ( virtual/modutils ) )
 SLOT=0
 SRC_URI=http://ipset.netfilter.org/ipset-6.30.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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_=a3c8fcf6aef68a603e1855c31a146a0f
diff --git a/metadata/md5-cache/net-firewall/ipset-6.32 b/metadata/md5-cache/net-firewall/ipset-6.32
index fed59e0464e4..4831451aa034 100644
--- a/metadata/md5-cache/net-firewall/ipset-6.32
+++ b/metadata/md5-cache/net-firewall/ipset-6.32
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl modules? ( kernel_linux? ( virtual/modutils ) )
 SLOT=0
 SRC_URI=http://ipset.netfilter.org/ipset-6.32.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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_=a3c8fcf6aef68a603e1855c31a146a0f
diff --git a/metadata/md5-cache/net-firewall/ipset-6.34 b/metadata/md5-cache/net-firewall/ipset-6.34
index 3e26d788ced5..39f677d76ccc 100644
--- a/metadata/md5-cache/net-firewall/ipset-6.34
+++ b/metadata/md5-cache/net-firewall/ipset-6.34
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl modules? ( kernel_linux? ( virtual/modutils ) )
 SLOT=0
 SRC_URI=http://ipset.netfilter.org/ipset-6.34.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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_=53cddce468c046f840579d923eed49e1
diff --git a/metadata/md5-cache/net-firewall/ipt_netflow-2.3 b/metadata/md5-cache/net-firewall/ipt_netflow-2.3
index d3632d90067c..82961aeca4c5 100644
--- a/metadata/md5-cache/net-firewall/ipt_netflow-2.3
+++ b/metadata/md5-cache/net-firewall/ipt_netflow-2.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-firewall/iptables:0= snmp? ( net-analyzer/net-snmp ) kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://github.com/aabc/ipt-netflow/archive/v2.3.tar.gz -> ipt_netflow-2.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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_=e4a74532b58da8348bfd1942b2375770
diff --git a/metadata/md5-cache/net-firewall/itval-1.2_p20121104 b/metadata/md5-cache/net-firewall/itval-1.2_p20121104
index 9fa77e36a28e..d7766da2ea34 100644
--- a/metadata/md5-cache/net-firewall/itval-1.2_p20121104
+++ b/metadata/md5-cache/net-firewall/itval-1.2_p20121104
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/fddl
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/ITVal-20121104.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=080da9c6ba2aa4992d9d0d9b3a2dce45
diff --git a/metadata/md5-cache/net-firewall/nfacct-1.0.1 b/metadata/md5-cache/net-firewall/nfacct-1.0.1
index 647756c341da..c40fecaea5d7 100644
--- a/metadata/md5-cache/net-firewall/nfacct-1.0.1
+++ b/metadata/md5-cache/net-firewall/nfacct-1.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libmnl >=net-libs/libnetfilter_acct-1.0.2
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/nfacct/files/nfacct-1.0.1.tar.bz2
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=1ae0a751025c3b692fa2e8b3c6e2f3a8
diff --git a/metadata/md5-cache/net-firewall/nfacct-1.0.2 b/metadata/md5-cache/net-firewall/nfacct-1.0.2
index ff2de5ee08d4..cdc3695d19be 100644
--- a/metadata/md5-cache/net-firewall/nfacct-1.0.2
+++ b/metadata/md5-cache/net-firewall/nfacct-1.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libmnl >=net-libs/libnetfilter_acct-1.0.3
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/nfacct/files/nfacct-1.0.2.tar.bz2
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=596781c712e0780471290136c58945bb
diff --git a/metadata/md5-cache/net-firewall/nftables-0.8-r3 b/metadata/md5-cache/net-firewall/nftables-0.8-r3
index 6a909293ffa0..09c989df7973 100644
--- a/metadata/md5-cache/net-firewall/nftables-0.8-r3
+++ b/metadata/md5-cache/net-firewall/nftables-0.8-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3:0= gmp? ( dev-libs/gmp:0= ) readline? ( sys-libs/readline:0= ) >=net-libs/libnftnl-1.0.8:0=
 SLOT=0
 SRC_URI=https://git.netfilter.org/nftables/snapshot/v0.8.tar.gz -> nftables-0.8.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=1810713a19abd955284b0190fd837cce
diff --git a/metadata/md5-cache/net-firewall/nftables-0.8.5 b/metadata/md5-cache/net-firewall/nftables-0.8.5
index 5219b75dd18c..c926297927ca 100644
--- a/metadata/md5-cache/net-firewall/nftables-0.8.5
+++ b/metadata/md5-cache/net-firewall/nftables-0.8.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3:0= gmp? ( dev-libs/gmp:0= ) readline? ( sys-libs/readline:0= ) >=net-libs/libnftnl-1.1.0:0=
 SLOT=0
 SRC_URI=https://git.netfilter.org/nftables/snapshot/v0.8.5.tar.gz -> nftables-0.8.5.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=53458ec4e7c8319aebabf83f3e659011
diff --git a/metadata/md5-cache/net-firewall/nftables-0.9.0 b/metadata/md5-cache/net-firewall/nftables-0.9.0
index 07569d78090a..986c84e1551a 100644
--- a/metadata/md5-cache/net-firewall/nftables-0.9.0
+++ b/metadata/md5-cache/net-firewall/nftables-0.9.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3:0= gmp? ( dev-libs/gmp:0= ) json? ( dev-libs/jansson ) readline? ( sys-libs/readline:0= ) >=net-libs/libnftnl-1.1.1:0=
 SLOT=0
 SRC_URI=https://git.netfilter.org/nftables/snapshot/v0.9.0.tar.gz -> nftables-0.9.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=7ee47f8ba45fa26be80aaec8c6b1f9c2
diff --git a/metadata/md5-cache/net-firewall/pglinux-2.3.1_p20171006 b/metadata/md5-cache/net-firewall/pglinux-2.3.1_p20171006
index 68acee97fe79..fc6737b02e9f 100644
--- a/metadata/md5-cache/net-firewall/pglinux-2.3.1_p20171006
+++ b/metadata/md5-cache/net-firewall/pglinux-2.3.1_p20171006
@@ -10,5 +10,5 @@ RDEPEND=net-libs/libnetfilter_queue net-libs/libnfnetlink dbus? ( sys-apps/dbus
 REQUIRED_USE=qt5? ( dbus )
 SLOT=0
 SRC_URI=https://sourceforge.net/code-snapshots/git/p/pe/peerguardian/code.git/peerguardian-code-9d91ab6a8e6bc2b41e985aa698eb5c1eb364fea8.zip -> pglinux-2.3.1_p20171006.zip
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b2207495f6b1f2d5ae17108786184d51
diff --git a/metadata/md5-cache/net-firewall/rtsp-conntrack-3.7-r1 b/metadata/md5-cache/net-firewall/rtsp-conntrack-3.7-r1
index 6306b104d872..6a933bd35d2f 100644
--- a/metadata/md5-cache/net-firewall/rtsp-conntrack-3.7-r1
+++ b/metadata/md5-cache/net-firewall/rtsp-conntrack-3.7-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://mike.it-loops.com/rtsp/rtsp-module-3.7.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=186ced34a99a1202968d3c7701ab38ec
diff --git a/metadata/md5-cache/net-firewall/sanewall-1.1.6-r2 b/metadata/md5-cache/net-firewall/sanewall-1.1.6-r2
index 428f334d71b3..782054d3247b 100644
--- a/metadata/md5-cache/net-firewall/sanewall-1.1.6-r2
+++ b/metadata/md5-cache/net-firewall/sanewall-1.1.6-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=net-firewall/iptables[ipv6] sys-apps/iproute2[-minimal] sys-apps/net-tools virtual/modutils || ( net-misc/wget net-misc/curl )
 SLOT=0
 SRC_URI=https://download.sanewall.org/releases/1.1.6/sanewall-1.1.6.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=220f6c02d8ae286666bdd6a11bf68213
diff --git a/metadata/md5-cache/net-firewall/shorewall-5.2.0.4 b/metadata/md5-cache/net-firewall/shorewall-5.2.0.4
index 84c7ae191d14..01cba454f0fe 100644
--- a/metadata/md5-cache/net-firewall/shorewall-5.2.0.4
+++ b/metadata/md5-cache/net-firewall/shorewall-5.2.0.4
@@ -10,5 +10,5 @@ RDEPEND=>=net-firewall/iptables-1.4.20 >=sys-apps/iproute2-3.8.0[-minimal] >=sys
 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	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_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 88f2fff616d0..a76ea0c41470 100644
--- a/metadata/md5-cache/net-firewall/shorewall-5.2.0.5
+++ b/metadata/md5-cache/net-firewall/shorewall-5.2.0.5
@@ -10,5 +10,5 @@ RDEPEND=>=net-firewall/iptables-1.4.20 >=sys-apps/iproute2-3.8.0[-minimal] >=sys
 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	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=035b86132f05d41c34ff6a7066b3d954
diff --git a/metadata/md5-cache/net-firewall/ufw-0.34_pre805-r2 b/metadata/md5-cache/net-firewall/ufw-0.34_pre805-r2
index f2024360eb0b..3e769e18cd1c 100644
--- a/metadata/md5-cache/net-firewall/ufw-0.34_pre805-r2
+++ b/metadata/md5-cache/net-firewall/ufw-0.34_pre805-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sabayon/net-firewall/ufw-0.34_pre805.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1bd781285a5859cea34cbd8c186ab92c
diff --git a/metadata/md5-cache/net-firewall/ufw-0.35-r1 b/metadata/md5-cache/net-firewall/ufw-0.35-r1
index bdac153f26ab..483718944a16 100644
--- a/metadata/md5-cache/net-firewall/ufw-0.35-r1
+++ b/metadata/md5-cache/net-firewall/ufw-0.35-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/ufw/0.35/0.35/+download/ufw-0.35.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=04bad3ce76e273bb3371e7d0e5af1664
diff --git a/metadata/md5-cache/net-firewall/ufw-frontends-0.3.2-r5 b/metadata/md5-cache/net-firewall/ufw-frontends-0.3.2-r5
index 18741c7c7531..9383d01fe63d 100644
--- a/metadata/md5-cache/net-firewall/ufw-frontends-0.3.2-r5
+++ b/metadata/md5-cache/net-firewall/ufw-frontends-0.3.2-r5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/baudm/ufw-frontends/archive/0.3.2.tar.gz -> ufw-frontends-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=664c85986c2e4803dfd7cf791cb4f147
diff --git a/metadata/md5-cache/net-firewall/xtables-addons-2.13 b/metadata/md5-cache/net-firewall/xtables-addons-2.13
index 58c168ac2969..f7818917edbb 100644
--- a/metadata/md5-cache/net-firewall/xtables-addons-2.13
+++ b/metadata/md5-cache/net-firewall/xtables-addons-2.13
@@ -9,5 +9,5 @@ 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 )
 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	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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
diff --git a/metadata/md5-cache/net-firewall/xtables-addons-2.14 b/metadata/md5-cache/net-firewall/xtables-addons-2.14
index 0f4198128901..0570162e23f8 100644
--- a/metadata/md5-cache/net-firewall/xtables-addons-2.14
+++ b/metadata/md5-cache/net-firewall/xtables-addons-2.14
@@ -9,5 +9,5 @@ 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 )
 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	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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
diff --git a/metadata/md5-cache/net-firewall/xtables-addons-3.0 b/metadata/md5-cache/net-firewall/xtables-addons-3.0
index 0fcdea87a272..5ddeeccebc4e 100644
--- a/metadata/md5-cache/net-firewall/xtables-addons-3.0
+++ b/metadata/md5-cache/net-firewall/xtables-addons-3.0
@@ -9,5 +9,5 @@ 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 )
 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	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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
diff --git a/metadata/md5-cache/net-firewall/xtables-addons-3.1 b/metadata/md5-cache/net-firewall/xtables-addons-3.1
index 8e114e94acb1..59ec7ccfe9a4 100644
--- a/metadata/md5-cache/net-firewall/xtables-addons-3.1
+++ b/metadata/md5-cache/net-firewall/xtables-addons-3.1
@@ -9,5 +9,5 @@ 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 )
 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	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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
diff --git a/metadata/md5-cache/net-firewall/xtables-addons-3.2 b/metadata/md5-cache/net-firewall/xtables-addons-3.2
index 8c66aefcf2ff..3bf6228453c5 100644
--- a/metadata/md5-cache/net-firewall/xtables-addons-3.2
+++ b/metadata/md5-cache/net-firewall/xtables-addons-3.2
@@ -9,5 +9,5 @@ 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 )
 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	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index 76401c1f42ed..2a0f36649707 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/autofs-5.1.2 b/metadata/md5-cache/net-fs/autofs-5.1.2
index 7cb6fcaf2de0..738ac4ab6487 100644
--- a/metadata/md5-cache/net-fs/autofs-5.1.2
+++ b/metadata/md5-cache/net-fs/autofs-5.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/util-linux-2.20 dmalloc? ( dev-libs/dmalloc[threads] ) ldap?
 REQUIRED_USE=sasl? ( ldap )
 SLOT=0
 SRC_URI=mirror://kernel/linux/daemons/autofs/v5/autofs-5.1.2.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=da3fe160c9f1208fe299937994fd4f46
diff --git a/metadata/md5-cache/net-fs/autofs-5.1.3 b/metadata/md5-cache/net-fs/autofs-5.1.3
index c3b0b880b6d9..5cbb6545043a 100644
--- a/metadata/md5-cache/net-fs/autofs-5.1.3
+++ b/metadata/md5-cache/net-fs/autofs-5.1.3
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/util-linux-2.20 dmalloc? ( dev-libs/dmalloc[threads] ) ldap?
 REQUIRED_USE=sasl? ( ldap )
 SLOT=0
 SRC_URI=mirror://kernel/linux/daemons/autofs/v5/autofs-5.1.3.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=7d2cb2dd161cc50eea4043ce6cd6d684
diff --git a/metadata/md5-cache/net-fs/autofs-5.1.4 b/metadata/md5-cache/net-fs/autofs-5.1.4
index e9d2da0394b7..d54b6655c6d9 100644
--- a/metadata/md5-cache/net-fs/autofs-5.1.4
+++ b/metadata/md5-cache/net-fs/autofs-5.1.4
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/util-linux-2.20 dmalloc? ( dev-libs/dmalloc[threads] ) ldap?
 REQUIRED_USE=sasl? ( ldap )
 SLOT=0
 SRC_URI=mirror://kernel/linux/daemons/autofs/v5/autofs-5.1.4.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=7d2cb2dd161cc50eea4043ce6cd6d684
diff --git a/metadata/md5-cache/net-fs/cifs-utils-6.7 b/metadata/md5-cache/net-fs/cifs-utils-6.7
index 4301a4c4fb3d..c6614d094d24 100644
--- a/metadata/md5-cache/net-fs/cifs-utils-6.7
+++ b/metadata/md5-cache/net-fs/cifs-utils-6.7
@@ -11,5 +11,5 @@ RDEPEND=!net-fs/mount-cifs !<net-fs/samba-3.6_rc1 sys-apps/keyutils ads? ( sys-l
 REQUIRED_USE=acl? ( ads )
 SLOT=0
 SRC_URI=https://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-6.7.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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
 _md5_=41a2d134817fcf43a88df0bc4a44e753
diff --git a/metadata/md5-cache/net-fs/cifs-utils-6.8 b/metadata/md5-cache/net-fs/cifs-utils-6.8
index 4bf4a24293bd..fc756120537a 100644
--- a/metadata/md5-cache/net-fs/cifs-utils-6.8
+++ b/metadata/md5-cache/net-fs/cifs-utils-6.8
@@ -11,5 +11,5 @@ RDEPEND=!net-fs/mount-cifs !<net-fs/samba-3.6_rc1 sys-apps/keyutils ads? ( sys-l
 REQUIRED_USE=acl? ( ads )
 SLOT=0
 SRC_URI=https://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-6.8.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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
 _md5_=3f5b0165cd1463612e8ec73c50c0114a
diff --git a/metadata/md5-cache/net-fs/cvmfs-2.3.5-r1 b/metadata/md5-cache/net-fs/cvmfs-2.3.5-r1
index 8c35f16f31d5..f9cc8864e163 100644
--- a/metadata/md5-cache/net-fs/cvmfs-2.3.5-r1
+++ b/metadata/md5-cache/net-fs/cvmfs-2.3.5-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-cpp/gtest >=dev-cpp/sparsehash-1.12 dev-db/sqlite:3= dev-libs/leveld
 REQUIRED_USE=test-programs? ( server )
 SLOT=0
 SRC_URI=https://github.com/cvmfs/cvmfs/archive/cvmfs-2.3.5.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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2e2d3e0b1b0d8e6d5286a1441251361e
diff --git a/metadata/md5-cache/net-fs/mc-2018.09.26.00.42.43 b/metadata/md5-cache/net-fs/mc-2018.09.26.00.42.43
new file mode 100644
index 000000000000..b765085847ae
--- /dev/null
+++ b/metadata/md5-cache/net-fs/mc-2018.09.26.00.42.43
@@ -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-09-26T00-42-43Z.tar.gz -> mc-2018.09.26.00.42.43.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/nfstest-1.0.2 b/metadata/md5-cache/net-fs/nfstest-1.0.2
index 2f8a972ca75a..8001b10ce931 100644
--- a/metadata/md5-cache/net-fs/nfstest-1.0.2
+++ b/metadata/md5-cache/net-fs/nfstest-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=net-fs/nfs-utils python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.linux-nfs.org/~mora/nfstest/releases/NFStest-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5326e669213aa6cca340fbbbd7ec22e8
diff --git a/metadata/md5-cache/net-fs/nfstest-2.1.2 b/metadata/md5-cache/net-fs/nfstest-2.1.2
index ee4e108e7526..b337117625d3 100644
--- a/metadata/md5-cache/net-fs/nfstest-2.1.2
+++ b/metadata/md5-cache/net-fs/nfstest-2.1.2
@@ -10,5 +10,5 @@ RDEPEND=net-fs/nfs-utils python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.linux-nfs.org/~mora/nfstest/releases/NFStest-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a07e9b596f119de146e7d5ea60e7f81c
diff --git a/metadata/md5-cache/net-fs/openafs-kernel-1.6.22.1 b/metadata/md5-cache/net-fs/openafs-kernel-1.6.22.1
index 7b5b8f566eb1..549c9fc4cdcf 100644
--- a/metadata/md5-cache/net-fs/openafs-kernel-1.6.22.1
+++ b/metadata/md5-cache/net-fs/openafs-kernel-1.6.22.1
@@ -9,5 +9,5 @@ LICENSE=IBM BSD openafs-krb5-a APSL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://openafs.org/dl/openafs/1.6.22.1/openafs-1.6.22.1-src.tar.bz2 https://dev.gentoo.org/~bircoph/afs/openafs-patches-20170822.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=18060792519c8916d03107b1c7cd5ecd
diff --git a/metadata/md5-cache/net-fs/openafs-kernel-1.6.22.2 b/metadata/md5-cache/net-fs/openafs-kernel-1.6.22.2
index e38421f9b2d7..be251aaa72cd 100644
--- a/metadata/md5-cache/net-fs/openafs-kernel-1.6.22.2
+++ b/metadata/md5-cache/net-fs/openafs-kernel-1.6.22.2
@@ -9,5 +9,5 @@ LICENSE=IBM BSD openafs-krb5-a APSL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://openafs.org/dl/openafs/1.6.22.2/openafs-1.6.22.2-src.tar.bz2 https://dev.gentoo.org/~bircoph/afs/openafs-patches-20170822.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=048cf9d2a586a300003c7e07987925f2
diff --git a/metadata/md5-cache/net-fs/s3ql-2.24 b/metadata/md5-cache/net-fs/s3ql-2.24
index 0103d87f931e..8825973477c7 100644
--- a/metadata/md5-cache/net-fs/s3ql-2.24
+++ b/metadata/md5-cache/net-fs/s3ql-2.24
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.bitbucket.org/nikratio/s3ql/downloads/s3ql-2.24.tar.bz2
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3da9ac01a790c8beba6530ca36a5cd96
diff --git a/metadata/md5-cache/net-fs/s3ql-2.25 b/metadata/md5-cache/net-fs/s3ql-2.25
index 8d7ebcac0b7d..452ce6a78408 100644
--- a/metadata/md5-cache/net-fs/s3ql-2.25
+++ b/metadata/md5-cache/net-fs/s3ql-2.25
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.bitbucket.org/nikratio/s3ql/downloads/s3ql-2.25.tar.bz2
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=83496d47172f6df42f70ffd6dafaaa49
diff --git a/metadata/md5-cache/net-fs/s3ql-2.26 b/metadata/md5-cache/net-fs/s3ql-2.26
index 2c7abff1718a..527d13539997 100644
--- a/metadata/md5-cache/net-fs/s3ql-2.26
+++ b/metadata/md5-cache/net-fs/s3ql-2.26
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.bitbucket.org/nikratio/s3ql/downloads/s3ql-2.26.tar.bz2
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=83496d47172f6df42f70ffd6dafaaa49
diff --git a/metadata/md5-cache/net-fs/s3ql-2.28 b/metadata/md5-cache/net-fs/s3ql-2.28
index 7943fde692ad..e57281a50f70 100644
--- a/metadata/md5-cache/net-fs/s3ql-2.28
+++ b/metadata/md5-cache/net-fs/s3ql-2.28
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.bitbucket.org/nikratio/s3ql/downloads/s3ql-2.28.tar.bz2
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=83496d47172f6df42f70ffd6dafaaa49
diff --git a/metadata/md5-cache/net-fs/samba-4.5.16 b/metadata/md5-cache/net-fs/samba-4.5.16
index a3cad2316617..41d8115985cf 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	915cae3d7d636732918d18827fb1c226	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	77ee347982e4e1d405ed64356b80201a
 _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 9dfabdb05cc5..b47d78fdff44 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 ~sparc ~x86
+KEYWORDS=~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	915cae3d7d636732918d18827fb1c226	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_=ab567b07c9cfeb7406c5d3e328bd86dd
+_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
diff --git a/metadata/md5-cache/net-fs/samba-4.8.5 b/metadata/md5-cache/net-fs/samba-4.8.5
index 59c4e7d48932..308443ac72d0 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 ~x86
+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.5.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	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_=37b17f7b3d939dcc5eba1e676bbfffab
+_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
diff --git a/metadata/md5-cache/net-fs/samba-4.9.0 b/metadata/md5-cache/net-fs/samba-4.9.0
index 1afc4909991e..471c7e168dd7 100644
--- a/metadata/md5-cache/net-fs/samba-4.9.0
+++ b/metadata/md5-cache/net-fs/samba-4.9.0
@@ -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 ~x86
+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	915cae3d7d636732918d18827fb1c226	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_=eb5ad13af66e7c4b2e551435aa9ea409
+_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 5cb56ef28650..55f001a70e50 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 ~x86
+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.1.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	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_=cf860228d0a496b52d592495df8ce857
+_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
diff --git a/metadata/md5-cache/net-fs/smbtad-1.2.6 b/metadata/md5-cache/net-fs/smbtad-1.2.6
index b19db08ee524..4f8a2dead259 100644
--- a/metadata/md5-cache/net-fs/smbtad-1.2.6
+++ b/metadata/md5-cache/net-fs/smbtad-1.2.6
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-db/libdbi dev-libs/iniparser:0 sys-libs/talloc >=net-fs/samba-3.6
 SLOT=0
 SRC_URI=http://morelias.org/smbta/smbtad-1.2.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=987e16fc19f7c915758cc90b0b6104e9
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 5248a9400a0f..313d880d1a5b 100644
--- a/metadata/md5-cache/net-fs/tahoe-lafs-1.10.2
+++ b/metadata/md5-cache/net-fs/tahoe-lafs-1.10.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/characteristic-14.0.0[python_targets_python2_7(-)?,-python_
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index c67eccf5ecd6..932f3e06d105 100644
--- a/metadata/md5-cache/net-ftp/Manifest.gz
+++ b/metadata/md5-cache/net-ftp/Manifest.gz
diff --git a/metadata/md5-cache/net-ftp/filezilla-3.34.0 b/metadata/md5-cache/net-ftp/filezilla-3.34.0
index ec30072f1958..73ca8fbc1e97 100644
--- a/metadata/md5-cache/net-ftp/filezilla-3.34.0
+++ b/metadata/md5-cache/net-ftp/filezilla-3.34.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 >=dev-libs/libfilezilla-0.12.3 >=dev-libs/pugixml-1.7 net-dns/libidn:= >=net-libs/gnutls-3.4.15 >=x11-libs/wxGTK-3.0.4:3.0[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus )
 SLOT=0
 SRC_URI=https://download.filezilla-project.org/client/FileZilla_3.34.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=119cb9776c3b74e5781da7b264984ed1
diff --git a/metadata/md5-cache/net-ftp/filezilla-3.35.1 b/metadata/md5-cache/net-ftp/filezilla-3.35.1
index 4618ca4c333c..e7ef7a436138 100644
--- a/metadata/md5-cache/net-ftp/filezilla-3.35.1
+++ b/metadata/md5-cache/net-ftp/filezilla-3.35.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 >=dev-libs/libfilezilla-0.13.0 >=dev-libs/pugixml-1.7 net-dns/libidn:= >=net-libs/gnutls-3.4.15 >=x11-libs/wxGTK-3.0.4:3.0[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus )
 SLOT=0
 SRC_URI=https://download.filezilla-project.org/client/FileZilla_3.35.1_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2ed05d4382262041e8ca5124607535c0
diff --git a/metadata/md5-cache/net-ftp/filezilla-3.35.2-r1 b/metadata/md5-cache/net-ftp/filezilla-3.35.2-r1
index a2b88f75ded5..d3f501679abd 100644
--- a/metadata/md5-cache/net-ftp/filezilla-3.35.2-r1
+++ b/metadata/md5-cache/net-ftp/filezilla-3.35.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 >=dev-libs/libfilezilla-0.13.0 >=dev-libs/pugixml-1.7 >=net-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.35.2_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=61b4b1cc4f2613f24fe5ed5206581782
diff --git a/metadata/md5-cache/net-ftp/filezilla-3.36.0 b/metadata/md5-cache/net-ftp/filezilla-3.36.0
index cf4a786d2aad..d6bb726f4704 100644
--- a/metadata/md5-cache/net-ftp/filezilla-3.36.0
+++ b/metadata/md5-cache/net-ftp/filezilla-3.36.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 >=dev-libs/libfilezilla-0.13.0 >=dev-libs/pugixml-1.7 >=net-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.36.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d98a05fe1eeee2d5613b031d604af267
diff --git a/metadata/md5-cache/net-ftp/filezilla-3.37.0 b/metadata/md5-cache/net-ftp/filezilla-3.37.0
index cf32d12934b3..c863b4f93a91 100644
--- a/metadata/md5-cache/net-ftp/filezilla-3.37.0
+++ b/metadata/md5-cache/net-ftp/filezilla-3.37.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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.1 b/metadata/md5-cache/net-ftp/filezilla-3.37.1
index d5a2245568be..21cacd7c0103 100644
--- a/metadata/md5-cache/net-ftp/filezilla-3.37.1
+++ b/metadata/md5-cache/net-ftp/filezilla-3.37.1
@@ -9,5 +9,5 @@ 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.2 >=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.1_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e313524aa384b60bbf7a2ab3f121375b
diff --git a/metadata/md5-cache/net-ftp/gftp-2.0.19-r3 b/metadata/md5-cache/net-ftp/gftp-2.0.19-r3
index 8db133b39e41..efcbee9b4404 100644
--- a/metadata/md5-cache/net-ftp/gftp-2.0.19-r3
+++ b/metadata/md5-cache/net-ftp/gftp-2.0.19-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:0 gtk? ( x11-libs/gtk+:2 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=http://www.gftp.org/gftp-2.0.19.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=bf9f5708b9a677f097cbc9c7c4cfd2dd
diff --git a/metadata/md5-cache/net-ftp/pybootd-1.5.0_pre20110524131526 b/metadata/md5-cache/net-ftp/pybootd-1.5.0_pre20110524131526
index 5966e3a6f029..cb88d2fa7d71 100644
--- a/metadata/md5-cache/net-ftp/pybootd-1.5.0_pre20110524131526
+++ b/metadata/md5-cache/net-ftp/pybootd-1.5.0_pre20110524131526
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/netifaces-0.5 python_targets_python2_7? ( >=dev-lang/python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/eblot/pybootd/archive/7fd7d0.tar.gz -> pybootd-1.5.0_pre20110524131526.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4fc49e9f85aada7896a2b66354d14bc6
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index c6661a21f599..7e225b4a6a11 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 68b48bd30e3c..50729273711e 100644
--- a/metadata/md5-cache/net-im/choqok-1.6.0-r1
+++ b/metadata/md5-cache/net-im/choqok-1.6.0-r1
@@ -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/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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/corebird-0.8 b/metadata/md5-cache/net-im/corebird-0.8
index 5c34881a00fd..eb072d00460c 100644
--- a/metadata/md5-cache/net-im/corebird-0.8
+++ b/metadata/md5-cache/net-im/corebird-0.8
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.40:2 dev-libs/json-glib dev-libs/libgee:0.8 gstreamer? ( media-plugins/gst-plugins-meta:1.0[X,ffmpeg] ) >=net-libs/libsoup-2.42.3.1 >=net-libs/rest-0.7.91:0.7 >=x11-libs/gtk+-3.12:3
 SLOT=0
 SRC_URI=https://github.com/baedert/corebird/archive/0.8.tar.gz -> corebird-0.8.tar.gz
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0deff2e4df9c51aba6a7aff6fa88f690
diff --git a/metadata/md5-cache/net-im/corebird-1.0 b/metadata/md5-cache/net-im/corebird-1.0
index 3189c01cc284..d08dd1772600 100644
--- a/metadata/md5-cache/net-im/corebird-1.0
+++ b/metadata/md5-cache/net-im/corebird-1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.40:2 dev-libs/json-glib dev-libs/libgee:0.8 gstreamer? ( media-plugins/gst-plugins-meta:1.0[X,ffmpeg] ) >=net-libs/libsoup-2.42.3.1 >=net-libs/rest-0.7.91:0.7 >=x11-libs/gtk+-3.14:3
 SLOT=0
 SRC_URI=https://github.com/baedert/corebird/archive/1.0.tar.gz -> corebird-1.0.tar.gz
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=319d3743222e575846f362f74aaf4be9
diff --git a/metadata/md5-cache/net-im/corebird-1.1 b/metadata/md5-cache/net-im/corebird-1.1
index 9bd98603d04c..72d4974e82ca 100644
--- a/metadata/md5-cache/net-im/corebird-1.1
+++ b/metadata/md5-cache/net-im/corebird-1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.44:2 dev-libs/json-glib dev-libs/libgee:0.8 gstreamer? ( media-plugins/gst-plugins-meta:1.0[X,ffmpeg] ) >=net-libs/libsoup-2.42.3.1 >=net-libs/rest-0.7.93:0.7 >=x11-libs/gtk+-3.16:3
 SLOT=0
 SRC_URI=https://github.com/baedert/corebird/archive/1.1.tar.gz -> corebird-1.1.tar.gz
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=328bb37e6e615bc3f197ef98598967d1
diff --git a/metadata/md5-cache/net-im/corebird-1.5-r2 b/metadata/md5-cache/net-im/corebird-1.5-r2
index 3a2c59f8d29b..f0d518c75d3e 100644
--- a/metadata/md5-cache/net-im/corebird-1.5-r2
+++ b/metadata/md5-cache/net-im/corebird-1.5-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.44:2 dev-libs/json-glib gstreamer? ( media-plugins/gst-plugins-meta:1.0[X] media-libs/gst-plugins-base:1.0[X] >=media-libs/gst-plugins-bad-1.6:1.0[X,gtk] media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-hls:1.0 ) spellcheck? ( >=app-text/gspell-1.0[vala] ) >=net-libs/libsoup-2.42.3.1 >=net-libs/rest-0.7.91:0.7 >=x11-libs/gtk+-3.18:3
 SLOT=0
 SRC_URI=https://github.com/baedert/corebird/archive/1.5.tar.gz -> corebird-1.5.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f002af6027a6058bdc8041d897575c63
diff --git a/metadata/md5-cache/net-im/corebird-1.5.1 b/metadata/md5-cache/net-im/corebird-1.5.1
index d8cac715c47d..10e2dc33256f 100644
--- a/metadata/md5-cache/net-im/corebird-1.5.1
+++ b/metadata/md5-cache/net-im/corebird-1.5.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.44:2 dev-libs/json-glib gstreamer? ( media-plugins/gst-plugins-meta:1.0[X] media-libs/gst-plugins-base:1.0[X] >=media-libs/gst-plugins-bad-1.6:1.0[X,gtk] media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-hls:1.0 ) spellcheck? ( >=app-text/gspell-1.0[vala] ) >=net-libs/libsoup-2.42.3.1 >=net-libs/rest-0.7.91:0.7 >=x11-libs/gtk+-3.18:3
 SLOT=0
 SRC_URI=https://github.com/baedert/corebird/archive/1.5.1.tar.gz -> corebird-1.5.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f002af6027a6058bdc8041d897575c63
diff --git a/metadata/md5-cache/net-im/corebird-1.6 b/metadata/md5-cache/net-im/corebird-1.6
index 3f7c9767b2f9..c91c11b40483 100644
--- a/metadata/md5-cache/net-im/corebird-1.6
+++ b/metadata/md5-cache/net-im/corebird-1.6
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.44:2 dev-libs/json-glib gstreamer? ( >=media-libs/gst-plugins-bad-1.6:1.0[X,gtk] media-libs/gst-plugins-base:1.0[X] media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-hls:1.0 media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-meta:1.0[X] media-plugins/gst-plugins-soup:1.0 ) spellcheck? ( >=app-text/gspell-1.0[vala] ) >=net-libs/libsoup-2.42.3.1 >=net-libs/rest-0.7.91:0.7 >=x11-libs/gtk+-3.20:3
 SLOT=0
 SRC_URI=https://github.com/baedert/corebird/archive/1.6.tar.gz -> corebird-1.6.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c1ecdb1bf92aa8317b4c6f920719cdbb
diff --git a/metadata/md5-cache/net-im/corebird-1.7.2 b/metadata/md5-cache/net-im/corebird-1.7.2
index c3357e124980..2f49c1469e0b 100644
--- a/metadata/md5-cache/net-im/corebird-1.7.2
+++ b/metadata/md5-cache/net-im/corebird-1.7.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.44:2 dev-libs/json-glib gstreamer? ( >=media-libs/gst-plugins-bad-1.6:1.0[X,gtk] media-libs/gst-plugins-base:1.0[X] media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-hls:1.0 media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-meta:1.0[X] media-plugins/gst-plugins-soup:1.0 ) spellcheck? ( >=app-text/gspell-1.0[vala] ) >=net-libs/libsoup-2.42.3.1 >=x11-libs/gtk+-3.20:3
 SLOT=0
 SRC_URI=https://github.com/baedert/corebird/archive/1.7.2.tar.gz -> corebird-1.7.2.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=733ce8c43800d61524081e3e287a4b42
diff --git a/metadata/md5-cache/net-im/corebird-1.7.3 b/metadata/md5-cache/net-im/corebird-1.7.3
index 64e0ffdb8f2b..64e8b0cd059a 100644
--- a/metadata/md5-cache/net-im/corebird-1.7.3
+++ b/metadata/md5-cache/net-im/corebird-1.7.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.44:2 dev-libs/json-glib gstreamer? ( >=media-libs/gst-plugins-bad-1.6:1.0[X,gtk] media-libs/gst-plugins-base:1.0[X] media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-hls:1.0 media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-meta:1.0[X] media-plugins/gst-plugins-soup:1.0 ) spellcheck? ( >=app-text/gspell-1.0[vala] ) >=net-libs/libsoup-2.42.3.1 >=x11-libs/gtk+-3.20:3
 SLOT=0
 SRC_URI=https://github.com/baedert/corebird/archive/1.7.3.tar.gz -> corebird-1.7.3.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=48bd266999855ef5a500e081367cedf1
diff --git a/metadata/md5-cache/net-im/corebird-1.7.4 b/metadata/md5-cache/net-im/corebird-1.7.4
index 0c7e17ca87cd..42fe5c90d85d 100644
--- a/metadata/md5-cache/net-im/corebird-1.7.4
+++ b/metadata/md5-cache/net-im/corebird-1.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 dev-libs/json-glib gstreamer? ( media-libs/gst-plugins-bad:1.0[X,gtk] media-libs/gst-plugins-base:1.0[X] media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-hls:1.0 media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-meta:1.0[X] media-plugins/gst-plugins-soup:1.0 ) spellcheck? ( app-text/gspell[vala] ) net-libs/libsoup x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://github.com/baedert/corebird/archive/1.7.4.tar.gz -> corebird-1.7.4.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b1234c759b0a013b46d72f62d17e4a7e
diff --git a/metadata/md5-cache/net-im/dianara-1.3.7-r1 b/metadata/md5-cache/net-im/dianara-1.3.7-r1
index a0ff87a78449..5f41ba355793 100644
--- a/metadata/md5-cache/net-im/dianara-1.3.7-r1
+++ b/metadata/md5-cache/net-im/dianara-1.3.7-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-crypt/qca-2.1.0.3:2[qt5(+),ssl] >=dev-libs/qoauth-2.0.1_pre20160315-r2:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5 sys-apps/file
 SLOT=0
 SRC_URI=mirror://nongnu/dianara/dianara-v1.3.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1c7302ebf8a6cf85e32aad4f66676578
diff --git a/metadata/md5-cache/net-im/dino-9999 b/metadata/md5-cache/net-im/dino-9999
index afdb3d1fff11..9c049143784d 100644
--- a/metadata/md5-cache/net-im/dino-9999
+++ b/metadata/md5-cache/net-im/dino-9999
@@ -7,5 +7,5 @@ IUSE=+gnupg +http +omemo
 LICENSE=GPL-3
 RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 dev-libs/libgee:0.8 net-libs/glib-networking x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango gnupg? ( app-crypt/gpgme:1 ) http? ( net-libs/libsoup:2.4 ) omemo? ( dev-libs/libgcrypt:0 )
 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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cffa4222cab1854f0f50665a57013d66
diff --git a/metadata/md5-cache/net-im/discord-bin-0.0.5 b/metadata/md5-cache/net-im/discord-bin-0.0.5
index 64748e7e2030..87d02ea74862 100644
--- a/metadata/md5-cache/net-im/discord-bin-0.0.5
+++ b/metadata/md5-cache/net-im/discord-bin-0.0.5
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss g
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=https://dl.discordapp.net/apps/linux/0.0.5/discord-0.0.5.deb
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=311e1497fbec69fd7fd3d7ee7f6b4a17
diff --git a/metadata/md5-cache/net-im/empathy-3.12.14 b/metadata/md5-cache/net-im/empathy-3.12.14
index 568d5e6412bd..f5e4be6a546e 100644
--- a/metadata/md5-cache/net-im/empathy-3.12.14
+++ b/metadata/md5-cache/net-im/empathy-3.12.14
@@ -10,5 +10,5 @@ PDEPEND=>=net-im/telepathy-mission-control-5.14
 RDEPEND=>=dev-libs/glib-2.48:2[dbus] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.9.4:3 x11-libs/pango >=dev-libs/dbus-glib-0.51 >=dev-libs/folks-0.9.5:=[telepathy] dev-libs/libgee:0.8= >=app-crypt/libsecret-0.5 >=media-libs/libcanberra-0.25[gtk3] >=net-libs/webkit-gtk-2.10:4 >=x11-libs/libnotify-0.7:= media-libs/gstreamer:1.0 >=media-libs/clutter-1.10.0:1.0 >=media-libs/clutter-gtk-1.1.2:1.0 media-libs/clutter-gst:3.0 >=media-libs/cogl-1.14:1.0= net-libs/farstream:0.2= >=net-libs/telepathy-farstream-0.6.0:= >=net-libs/telepathy-glib-0.23.2 >=net-im/telepathy-logger-0.8.0:= app-crypt/gcr[gtk] dev-libs/libxml2:2 gnome-base/gsettings-desktop-schemas media-sound/pulseaudio[glib] net-libs/libsoup:2.4 x11-libs/libX11 geolocation? ( >=app-misc/geoclue-2.1:2.0 >=sci-geosciences/geocode-glib-3.10 ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.1:= ) map? ( >=media-libs/clutter-1.7.14:1.0 >=media-libs/clutter-gtk-0.90.3:1.0 >=media-libs/libchamplain-0.12.1:0.12[gtk] ) spell? ( >=app-text/enchant-1.2 >=app-text/iso-codes-0.35 ) v4l? ( media-plugins/gst-plugins-v4l2:1.0 >=media-video/cheese-3.4:= virtual/libgudev:= ) media-libs/gst-plugins-base:1.0 net-im/telepathy-connection-managers !<net-voip/telepathy-rakia-0.7 x11-themes/adwaita-icon-theme gnome? ( gnome-extra/gnome-contacts )
 SLOT=0
 SRC_URI=mirror://gnome/sources/empathy/3.12/empathy-3.12.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-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d20d4857a667e1a59f08d3ef8518a0f2
diff --git a/metadata/md5-cache/net-im/gajim-0.16.9 b/metadata/md5-cache/net-im/gajim-0.16.9
index 44b935dfda4c..7ebb64d64a90 100644
--- a/metadata/md5-cache/net-im/gajim-0.16.9
+++ b/metadata/md5-cache/net-im/gajim-0.16.9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 ) libnotify? ( dbus ) gnome? ( gnome-
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.gajim.org/downloads/0.16/gajim-0.16.9.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bf37591e6f9f53f718f4e6dc52e252e0
diff --git a/metadata/md5-cache/net-im/gitter-bin-3.1.0 b/metadata/md5-cache/net-im/gitter-bin-3.1.0
index 355ce317d6ff..64c4081455fb 100644
--- a/metadata/md5-cache/net-im/gitter-bin-3.1.0
+++ b/metadata/md5-cache/net-im/gitter-bin-3.1.0
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/expat:0 dev-libs/glib:2 dev-libs/nspr:0 dev-libs/nss:0 gnome-ba
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://update.gitter.im/linux64/gitter_3.1.0_amd64.deb ) x86? ( https://update.gitter.im/linux32/gitter_3.1.0_i386.deb )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2d9d87df1d4398711a060a8c45181c3a
diff --git a/metadata/md5-cache/net-im/kadu-4.3-r2 b/metadata/md5-cache/net-im/kadu-4.3-r2
index f697d04c5c59..940b2805c51b 100644
--- a/metadata/md5-cache/net-im/kadu-4.3-r2
+++ b/metadata/md5-cache/net-im/kadu-4.3-r2
@@ -10,5 +10,5 @@ RDEPEND=>=app-arch/libarchive-2.6[lzma] >=dev-libs/injeqt-1.1.0 dev-qt/qtcore:5
 REQUIRED_USE=|| ( gadu xmpp )
 SLOT=0
 SRC_URI=http://download.kadu.im/stable/kadu-4.3.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1df96eab452aba3f6d014c90f983ecb3
diff --git a/metadata/md5-cache/net-im/minbif-1.0.5-r2 b/metadata/md5-cache/net-im/minbif-1.0.5-r2
index bf49ccc6ed56..f0e05db6bec3 100644
--- a/metadata/md5-cache/net-im/minbif-1.0.5-r2
+++ b/metadata/md5-cache/net-im/minbif-1.0.5-r2
@@ -10,5 +10,5 @@ RDEPEND=>=net-im/pidgin-2.6 gnutls? ( net-libs/gnutls ) imlib? ( media-libs/imli
 REQUIRED_USE=libcaca? ( imlib )
 SLOT=0
 SRC_URI=https://symlink.me/attachments/download/148/minbif-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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=0ea72208dc3b86d3f919a62c36e38409
diff --git a/metadata/md5-cache/net-im/openmittsu-0.9.11.0 b/metadata/md5-cache/net-im/openmittsu-0.9.11.0
index 9fe547c5f0e0..77ab3c61aac4 100644
--- a/metadata/md5-cache/net-im/openmittsu-0.9.11.0
+++ b/metadata/md5-cache/net-im/openmittsu-0.9.11.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ BitstreamVera OFL-1.1 Apache-2.0 CC0-1.0 MIT BSD
 RDEPEND=dev-db/qt5-sqlcipher >=dev-libs/libsodium-1.0.11:= >=dev-qt/qtcore-5.7.1:5= >=dev-qt/qtgui-5.7.1:5= >=dev-qt/qtmultimedia-5.7.1:5= >=dev-qt/qtnetwork-5.7.1:5=[ssl] >=dev-qt/qtsql-5.7.1:5=[sqlite] >=dev-qt/qtwidgets-5.7.1:5= >=media-gfx/qrencode-3.4.4-r1:=
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/openmittsu-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=87de3ebbac62098ff3a069cf92a2ad9d
diff --git a/metadata/md5-cache/net-im/openmittsu-0.9.9.48 b/metadata/md5-cache/net-im/openmittsu-0.9.9.48
index 628204ab35bb..fe6598eb2ac5 100644
--- a/metadata/md5-cache/net-im/openmittsu-0.9.9.48
+++ b/metadata/md5-cache/net-im/openmittsu-0.9.9.48
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ BitstreamVera OFL-1.1 Apache-2.0 CC0-1.0 MIT BSD-2 Boost-1.0
 RDEPEND=dev-db/qt5-sqlcipher >=dev-libs/libsodium-1.0.11:= >=dev-qt/qtcore-5.7.1:5= >=dev-qt/qtgui-5.7.1:5= >=dev-qt/qtmultimedia-5.7.1:5= >=dev-qt/qtnetwork-5.7.1:5=[ssl] >=dev-qt/qtsql-5.7.1:5=[sqlite] >=dev-qt/qtwidgets-5.7.1:5= >=media-gfx/qrencode-3.4.4-r1:=
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/openmittsu-0.9.9.48.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=307473ce69c02e602703fce09f158b49
diff --git a/metadata/md5-cache/net-im/pidgin-2.12.0 b/metadata/md5-cache/net-im/pidgin-2.12.0
index 5b5dfe7f785c..f56b69cc4c00 100644
--- a/metadata/md5-cache/net-im/pidgin-2.12.0
+++ b/metadata/md5-cache/net-im/pidgin-2.12.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( sys-libs/ncurs
 REQUIRED_USE=dbus? ( python_targets_python2_7 ) networkmanager? ( dbus ) python? ( python_targets_python2_7 )
 SLOT=0/2
 SRC_URI=mirror://sourceforge/pidgin/pidgin-2.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=59df4ce277d75432b392f6b0ee96703e
diff --git a/metadata/md5-cache/net-im/pidgin-2.13.0 b/metadata/md5-cache/net-im/pidgin-2.13.0
index 191da52593da..fa7f53910e76 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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=cf33735fe6b615b6a80b38b2fd1d8d47
+_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
diff --git a/metadata/md5-cache/net-im/psi-1.3-r1 b/metadata/md5-cache/net-im/psi-1.3-r1
index 358e6d4ba802..526adf0f3442 100644
--- a/metadata/md5-cache/net-im/psi-1.3-r1
+++ b/metadata/md5-cache/net-im/psi-1.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( aspell enchant hunspell ) webengine? ( !webkit )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/psi/psi-1.3.tar.xz https://github.com/psi-im/psi-l10n/archive/1.3.tar.gz -> psi-l10n-1.3.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=310ce68d78e12df65d28a59e30900766
diff --git a/metadata/md5-cache/net-im/psi-9999 b/metadata/md5-cache/net-im/psi-9999
index c5accf5c8a7f..48516dfc9a2f 100644
--- a/metadata/md5-cache/net-im/psi-9999
+++ b/metadata/md5-cache/net-im/psi-9999
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/qca:2[qt5(+)] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtg
 REQUIRED_USE=?? ( aspell enchant hunspell ) iconsets? ( extras ) sql? ( extras ) webengine? ( !webkit )
 RESTRICT=test iconsets? ( bindist )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e33a392d4c7ca412638de3a955d82ed1
diff --git a/metadata/md5-cache/net-im/qtox-1.16.3 b/metadata/md5-cache/net-im/qtox-1.16.3
index df51c54282ee..cf82317e8c14 100644
--- a/metadata/md5-cache/net-im/qtox-1.16.3
+++ b/metadata/md5-cache/net-im/qtox-1.16.3
@@ -9,5 +9,5 @@ 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 )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/net-im/qtox-9999 b/metadata/md5-cache/net-im/qtox-9999
index 28feba3a4577..6f79cbcd9432 100644
--- a/metadata/md5-cache/net-im/qtox-9999
+++ b/metadata/md5-cache/net-im/qtox-9999
@@ -7,5 +7,5 @@ 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 )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/net-im/ricochet-1.1.4 b/metadata/md5-cache/net-im/ricochet-1.1.4
index 97d4bbe1ffe3..08a6251eb809 100644
--- a/metadata/md5-cache/net-im/ricochet-1.1.4
+++ b/metadata/md5-cache/net-im/ricochet-1.1.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/openssl:0= dev-libs/protobuf:0= dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtwidgets:5 net-vpn/tor
 SLOT=0
 SRC_URI=https://github.com/ricochet-im/ricochet/archive/v1.1.4.tar.gz -> ricochet-1.1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ec5861780b069340144993fa2579ce13
diff --git a/metadata/md5-cache/net-im/ricochet-9999 b/metadata/md5-cache/net-im/ricochet-9999
index d9df305a5c95..428b59a90ae5 100644
--- a/metadata/md5-cache/net-im/ricochet-9999
+++ b/metadata/md5-cache/net-im/ricochet-9999
@@ -7,5 +7,5 @@ IUSE=debug hardened
 LICENSE=BSD
 RDEPEND=dev-libs/openssl:0= dev-libs/protobuf:0= dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtwidgets:5 net-vpn/tor
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e3a671bf72a64ad6d72898c43a6da721
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
index cd9dfa433f20..b8eef3bb7245 100644
--- a/metadata/md5-cache/net-im/signal-desktop-bin-1.16.2
+++ b/metadata/md5-cache/net-im/signal-desktop-bin-1.16.2
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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/skypeforlinux-8.29.0.41 b/metadata/md5-cache/net-im/skypeforlinux-8.29.0.41
index 5949a0011cbb..61f5ea612dc8 100644
--- a/metadata/md5-cache/net-im/skypeforlinux-8.29.0.41
+++ b/metadata/md5-cache/net-im/skypeforlinux-8.29.0.41
@@ -11,5 +11,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
index 19ab930e7b2b..adceafdae8c6 100644
--- a/metadata/md5-cache/net-im/skypeforlinux-8.29.0.50
+++ b/metadata/md5-cache/net-im/skypeforlinux-8.29.0.50
@@ -11,5 +11,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
index c4f227e2ce52..cfaf494e67ae 100644
--- a/metadata/md5-cache/net-im/skypeforlinux-8.30.0.50
+++ b/metadata/md5-cache/net-im/skypeforlinux-8.30.0.50
@@ -11,5 +11,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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/slack-bin-2.1.2 b/metadata/md5-cache/net-im/slack-bin-2.1.2
index 24b54a1d592b..34fa19b3e3f3 100644
--- a/metadata/md5-cache/net-im/slack-bin-2.1.2
+++ b/metadata/md5-cache/net-im/slack-bin-2.1.2
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/atk:0 dev-libs/expat:0 dev-libs/glib:2 dev-libs/nspr:0 dev-libs
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=x86? ( https://downloads.slack-edge.com/linux_releases/slack-desktop-2.1.2-i386.deb ) amd64? ( https://downloads.slack-edge.com/linux_releases/slack-desktop-2.1.2-amd64.deb )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=db31961e9e3b76b5ca951dd63433081e
diff --git a/metadata/md5-cache/net-im/slack-bin-3.1.1 b/metadata/md5-cache/net-im/slack-bin-3.1.1
index 9c2c342484cd..b047195dc1ec 100644
--- a/metadata/md5-cache/net-im/slack-bin-3.1.1
+++ b/metadata/md5-cache/net-im/slack-bin-3.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://downloads.slack-edge.com/linux_releases/slack-desktop-3.1.1-amd64.deb
-_eclasses_=desktop	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a9d1b6d49f82113bb1d0b74590e64e14
diff --git a/metadata/md5-cache/net-im/slack-bin-3.2.1 b/metadata/md5-cache/net-im/slack-bin-3.2.1
index c189a2f1a486..c24b593cd929 100644
--- a/metadata/md5-cache/net-im/slack-bin-3.2.1
+++ b/metadata/md5-cache/net-im/slack-bin-3.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://downloads.slack-edge.com/linux_releases/slack-desktop-3.2.1-amd64.deb
-_eclasses_=desktop	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	89bb9f083a2590d9b447fd0b78a96186
+_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.1 b/metadata/md5-cache/net-im/slack-bin-3.3.1
index a3744def0082..891b150b778f 100644
--- a/metadata/md5-cache/net-im/slack-bin-3.3.1
+++ b/metadata/md5-cache/net-im/slack-bin-3.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://downloads.slack-edge.com/linux_releases/slack-desktop-3.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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/telegram-desktop-bin-1.3.14 b/metadata/md5-cache/net-im/telegram-desktop-bin-1.3.14
deleted file mode 100644
index 3b820a618397..000000000000
--- a/metadata/md5-cache/net-im/telegram-desktop-bin-1.3.14
+++ /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]
-SLOT=0
-SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v1.3.14.tar.gz -> tdesktop-1.3.14.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.1.3.14.tar.xz ) x86? ( https://updates.tdesktop.com/tlinux32/tsetup32.1.3.14.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=4f83e5250dc8695fa70a43cf729031f6
diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-1.4.0 b/metadata/md5-cache/net-im/telegram-desktop-bin-1.4.0
deleted file mode 100644
index c4ad52b82e7c..000000000000
--- a/metadata/md5-cache/net-im/telegram-desktop-bin-1.4.0
+++ /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]
-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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=5aca4b1e611471917087c4f74fc30c60
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
new file mode 100644
index 000000000000..7048e235cf7d
--- /dev/null
+++ b/metadata/md5-cache/net-im/telegram-desktop-bin-1.4.0-r1
@@ -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.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/telepathy-logger-0.8.1 b/metadata/md5-cache/net-im/telepathy-logger-0.8.1
index a28cdd1d6d54..eaedf9778b97 100644
--- a/metadata/md5-cache/net-im/telepathy-logger-0.8.1
+++ b/metadata/md5-cache/net-im/telepathy-logger-0.8.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.28:2 >=sys-apps/dbus-1.1 >=dev-libs/dbus-glib-0.82 >=net-libs/telepathy-glib-0.19.2[introspection?] dev-libs/libxml2 dev-libs/libxslt dev-db/sqlite:3 introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
 SLOT=0/3
 SRC_URI=https://telepathy.freedesktop.org/releases/telepathy-logger/telepathy-logger-0.8.1.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-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b8f7c61e8b4d78e638a0e8274591a621
diff --git a/metadata/md5-cache/net-im/telepathy-logger-0.8.2 b/metadata/md5-cache/net-im/telepathy-logger-0.8.2
index 4b63aa758948..26414220652f 100644
--- a/metadata/md5-cache/net-im/telepathy-logger-0.8.2
+++ b/metadata/md5-cache/net-im/telepathy-logger-0.8.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.28:2 >=sys-apps/dbus-1.1 >=dev-libs/dbus-glib-0.82 >=net-libs/telepathy-glib-0.19.2[introspection?] dev-libs/libxml2 dev-libs/libxslt dev-db/sqlite:3 introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
 SLOT=0/3
 SRC_URI=https://telepathy.freedesktop.org/releases/telepathy-logger/telepathy-logger-0.8.2.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-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f038ef7cb5c2b55acba34037652446c4
diff --git a/metadata/md5-cache/net-im/telepathy-mission-control-5.16.4 b/metadata/md5-cache/net-im/telepathy-mission-control-5.16.4
index e70566db7be7..8c588600e910 100644
--- a/metadata/md5-cache/net-im/telepathy-mission-control-5.16.4
+++ b/metadata/md5-cache/net-im/telepathy-mission-control-5.16.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/dbus-glib-0.82 >=dev-libs/glib-2.46:2 >=sys-apps/dbus-0.95 >=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://telepathy.freedesktop.org/releases/telepathy-mission-control/telepathy-mission-control-5.16.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fb9dee7ada5ae14a2f68f031ec139d2c
diff --git a/metadata/md5-cache/net-im/toxic-0.8.0-r1 b/metadata/md5-cache/net-im/toxic-0.8.0-r1
index 76054054f411..090c25ba3fbb 100644
--- a/metadata/md5-cache/net-im/toxic-0.8.0-r1
+++ b/metadata/md5-cache/net-im/toxic-0.8.0-r1
@@ -10,5 +10,5 @@ RDEPEND=|| ( audio? ( net-libs/tox:0/0.1[av] ) video? ( net-libs/tox:0/0.1[av] )
 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
 SRC_URI=https://github.com/JFreegman/toxic/archive/v0.8.0.tar.gz -> toxic-0.8.0.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=70a442514a5735b24312f35ba02372a5
diff --git a/metadata/md5-cache/net-im/toxic-0.8.2 b/metadata/md5-cache/net-im/toxic-0.8.2
index 18a0740657f2..a5b28093556b 100644
--- a/metadata/md5-cache/net-im/toxic-0.8.2
+++ b/metadata/md5-cache/net-im/toxic-0.8.2
@@ -10,5 +10,5 @@ RDEPEND=net-libs/tox:0/0.2 dev-libs/libconfig net-misc/curl:0= sys-libs/ncurses:
 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
 SRC_URI=https://github.com/JFreegman/toxic/archive/v0.8.2.tar.gz -> toxic-0.8.2.tar.gz https://github.com/fx-carton/toxic_patches/archive/v0.8.2.tar.gz -> toxic_patches-0.8.2.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c769c48fd5af0afa4c073514f55ca129
diff --git a/metadata/md5-cache/net-im/transwhat-0.2.2 b/metadata/md5-cache/net-im/transwhat-0.2.2
index 3e44610b613e..444c469f2702 100644
--- a/metadata/md5-cache/net-im/transwhat-0.2.2
+++ b/metadata/md5-cache/net-im/transwhat-0.2.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/e4u[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/stv0g/transwhat/archive/v0.2.2.tar.gz -> transwhat-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=941ec4dcb52a7518a99184e74c5b5c79
diff --git a/metadata/md5-cache/net-im/turses-0.2.23 b/metadata/md5-cache/net-im/turses-0.2.23
index 42048e8d4736..659867e5cf81 100644
--- a/metadata/md5-cache/net-im/turses-0.2.23
+++ b/metadata/md5-cache/net-im/turses-0.2.23
@@ -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/alejandrogomez/turses/archive/v0.2.23.tar.gz -> turses-0.2.23.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c1ce52546a405da89739672b510a33c5
diff --git a/metadata/md5-cache/net-im/vacuum-1.3.0_pre20180105 b/metadata/md5-cache/net-im/vacuum-1.3.0_pre20180105
index 12b1df1a65ce..7a5c8f658c02 100644
--- a/metadata/md5-cache/net-im/vacuum-1.3.0_pre20180105
+++ b/metadata/md5-cache/net-im/vacuum-1.3.0_pre20180105
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtlockedfile[qt5(+)] dev-qt/qtmult
 REQUIRED_USE=annotations? ( privatestorage ) avatars? ( vcard ) birthdayreminder? ( vcard ) bookmarks? ( privatestorage ) captchaforms? ( dataforms ) commands? ( dataforms ) datastreamsmanager? ( dataforms ) filemessagearchive? ( messagearchiver ) filestreamsmanager? ( datastreamsmanager ) filetransfer? ( filestreamsmanager datastreamsmanager ) messagecarbons? ( servicediscovery ) pepmanager? ( servicediscovery ) recentcontacts? ( privatestorage ) registration? ( dataforms ) remotecontrol? ( commands dataforms ) servermessagearchive? ( messagearchiver ) sessionnegotiation? ( dataforms ) spell? ( ^^ ( aspell enchant hunspell ) )
 SLOT=0/37
 SRC_URI=https://github.com/Vacuum-IM/vacuum-im/archive/1.3.0.20180105-Alpha.tar.gz -> vacuum-im-1.3.0.20180105-Alpha.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2ada3df3286481c4efa52f3c29cfd63f
diff --git a/metadata/md5-cache/net-im/vacuum-9999 b/metadata/md5-cache/net-im/vacuum-9999
index ca7ca324b212..b44e269a432a 100644
--- a/metadata/md5-cache/net-im/vacuum-9999
+++ b/metadata/md5-cache/net-im/vacuum-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtlockedfile[qt5(+)] dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtxml:5 net-dns/libidn sys-libs/zlib[minizip] x11-libs/libXScrnSaver adiummessagestyle? ( dev-qt/qtwebkit:5 ) filemessagearchive? ( dev-qt/qtsql:5[sqlite] ) messagearchiver? ( dev-qt/qtsql:5[sqlite] ) spell? ( aspell? ( app-text/aspell ) enchant? ( app-text/enchant ) hunspell? ( app-text/hunspell ) ) !net-im/vacuum-spellchecker
 REQUIRED_USE=annotations? ( privatestorage ) avatars? ( vcard ) birthdayreminder? ( vcard ) bookmarks? ( privatestorage ) captchaforms? ( dataforms ) commands? ( dataforms ) datastreamsmanager? ( dataforms ) filemessagearchive? ( messagearchiver ) filestreamsmanager? ( datastreamsmanager ) filetransfer? ( filestreamsmanager datastreamsmanager ) messagecarbons? ( servicediscovery ) pepmanager? ( servicediscovery ) recentcontacts? ( privatestorage ) registration? ( dataforms ) remotecontrol? ( commands dataforms ) servermessagearchive? ( messagearchiver ) sessionnegotiation? ( dataforms ) spell? ( ^^ ( aspell enchant hunspell ) )
 SLOT=0/37
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b63133f26bad61123c5eea3a7037e8df
diff --git a/metadata/md5-cache/net-im/yowsup-2.5.7 b/metadata/md5-cache/net-im/yowsup-2.5.7
index 6f5925cee32c..33f1b10ca81a 100644
--- a/metadata/md5-cache/net-im/yowsup-2.5.7
+++ b/metadata/md5-cache/net-im/yowsup-2.5.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/configargparse[python_targets_python2_7(-)?,python_targets_py
 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/tgalal/yowsup/archive/v2.5.7.tar.gz -> yowsup-2.5.7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=714f7d17ecb71f3da5f4113ae6f9f477
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 1f6b9438a79e..6d0e634263af 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/hexchat-2.12.4-r2 b/metadata/md5-cache/net-irc/hexchat-2.12.4-r2
index ecf5477a37f8..e73fe409a305 100644
--- a/metadata/md5-cache/net-irc/hexchat-2.12.4-r2
+++ b/metadata/md5-cache/net-irc/hexchat-2.12.4-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:2 ) libcanb
 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=https://dl.hexchat.net/hexchat/hexchat-2.12.4.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	55aaa148741116aa54ad0d80e361818e	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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=17c0211432c9b7916b4d84499857a614
diff --git a/metadata/md5-cache/net-irc/hexchat-2.14.1 b/metadata/md5-cache/net-irc/hexchat-2.14.1
index 0cf8261fde39..920be062d5a0 100644
--- a/metadata/md5-cache/net-irc/hexchat-2.14.1
+++ b/metadata/md5-cache/net-irc/hexchat-2.14.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 dbus? ( dev-libs/dbus-glib ) gtk? ( x11-libs/gdk-pixbuf:
 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
 SRC_URI=https://dl.hexchat.net/hexchat/hexchat-2.14.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	29ef682942c6ff558de2f797a61790c2	mono-env	1f24c032c78290b0d9a07d5b343051a7	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	29ef682942c6ff558de2f797a61790c2	mono-env	1f24c032c78290b0d9a07d5b343051a7	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_=8e6b85647c6be92dcecccb44400d7350
diff --git a/metadata/md5-cache/net-irc/hexchat-2.14.2 b/metadata/md5-cache/net-irc/hexchat-2.14.2
index 1d09665b7dc3..b34b90c820da 100644
--- a/metadata/md5-cache/net-irc/hexchat-2.14.2
+++ b/metadata/md5-cache/net-irc/hexchat-2.14.2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 dbus? ( dev-libs/dbus-glib ) gtk? ( x11-libs/gdk-pixbuf:
 REQUIRED_USE=python? ( ^^ ( 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://dl.hexchat.net/hexchat/hexchat-2.14.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	29ef682942c6ff558de2f797a61790c2	mono-env	1f24c032c78290b0d9a07d5b343051a7	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	29ef682942c6ff558de2f797a61790c2	mono-env	1f24c032c78290b0d9a07d5b343051a7	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_=7a30f51f6332c9d622cde295d2bb5c63
diff --git a/metadata/md5-cache/net-irc/hexchat-9999 b/metadata/md5-cache/net-irc/hexchat-9999
index c1222af08703..313b036cc5b1 100644
--- a/metadata/md5-cache/net-irc/hexchat-9999
+++ b/metadata/md5-cache/net-irc/hexchat-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 plugin-fishlim? ( MIT )
 RDEPEND=dev-libs/glib:2 dbus? ( dev-libs/dbus-glib ) gtk? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango ) libcanberra? ( media-libs/libcanberra ) libproxy? ( net-libs/libproxy ) libnotify? ( x11-libs/libnotify ) lua? ( dev-lang/lua:= ) perl? ( dev-lang/perl ) plugin-sysinfo? ( sys-apps/pciutils ) 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 ) 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(+)?] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) theme-manager? ( || ( ( dev-lang/mono[minimal] dev-dotnet/libgdiplus ) dev-lang/mono[-minimal] ) )
 REQUIRED_USE=python? ( ^^ ( 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	meson	29ef682942c6ff558de2f797a61790c2	mono-env	1f24c032c78290b0d9a07d5b343051a7	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	29ef682942c6ff558de2f797a61790c2	mono-env	1f24c032c78290b0d9a07d5b343051a7	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_=7a30f51f6332c9d622cde295d2bb5c63
diff --git a/metadata/md5-cache/net-irc/inspircd-2.0.23 b/metadata/md5-cache/net-irc/inspircd-2.0.23
deleted file mode 100644
index ce44a40dff5e..000000000000
--- a/metadata/md5-cache/net-irc/inspircd-2.0.23
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=dev-lang/perl ssl? ( dev-libs/openssl:= ) geoip? ( dev-libs/geoip ) gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:= ) pcre? ( dev-libs/libpcre ) sqlite? ( >=dev-db/sqlite-3.0 ) tre? ( dev-libs/tre )
-DESCRIPTION=Inspire IRCd - The Stable, High-Performance Modular IRCd
-EAPI=6
-HOMEPAGE=https://inspircd.github.com/
-IUSE=geoip gnutls ipv6 ldap mysql pcre posix postgres sqlite ssl tre
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl ssl? ( dev-libs/openssl:= ) geoip? ( dev-libs/geoip ) gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:= ) pcre? ( dev-libs/libpcre ) sqlite? ( >=dev-db/sqlite-3.0 ) tre? ( dev-libs/tre )
-SLOT=0
-SRC_URI=https://github.com/inspircd/inspircd/archive/v2.0.23.tar.gz -> inspircd-2.0.23.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=f74068fb493a843c714b72055fd55e14
diff --git a/metadata/md5-cache/net-irc/inspircd-2.0.25 b/metadata/md5-cache/net-irc/inspircd-2.0.25
index 7df75d4f7fb3..bd408b9500bc 100644
--- a/metadata/md5-cache/net-irc/inspircd-2.0.25
+++ b/metadata/md5-cache/net-irc/inspircd-2.0.25
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=dev-lang/perl ssl? ( dev-libs/openssl:= ) geoip? ( dev-libs/geoip ) gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:= ) pcre? ( dev-libs/libpcre ) sqlite? ( >=dev-db/sqlite-3.0 ) tre? ( dev-libs/tre )
+DEPEND=dev-lang/perl ssl? ( dev-libs/openssl:= ) geoip? ( dev-libs/geoip ) gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 ) ldap? ( net-nds/openldap ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) pcre? ( dev-libs/libpcre ) sqlite? ( >=dev-db/sqlite-3.0 ) tre? ( dev-libs/tre )
 DESCRIPTION=Inspire IRCd - The Stable, High-Performance Modular IRCd
 EAPI=6
 HOMEPAGE=https://inspircd.github.com/
 IUSE=geoip gnutls ipv6 ldap mysql pcre posix postgres sqlite ssl tre
 KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
-RDEPEND=dev-lang/perl ssl? ( dev-libs/openssl:= ) geoip? ( dev-libs/geoip ) gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:= ) pcre? ( dev-libs/libpcre ) sqlite? ( >=dev-db/sqlite-3.0 ) tre? ( dev-libs/tre )
+RDEPEND=dev-lang/perl ssl? ( dev-libs/openssl:= ) geoip? ( dev-libs/geoip ) gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 ) ldap? ( net-nds/openldap ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) pcre? ( dev-libs/libpcre ) sqlite? ( >=dev-db/sqlite-3.0 ) tre? ( dev-libs/tre )
 SLOT=0
 SRC_URI=https://github.com/inspircd/inspircd/archive/v2.0.25.tar.gz -> inspircd-2.0.25.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ccab50d494b59366f66dba934d29201f
+_md5_=c049d2c13de35324c3ad214e4b1b3360
diff --git a/metadata/md5-cache/net-irc/inspircd-2.0.26 b/metadata/md5-cache/net-irc/inspircd-2.0.26
index 00ecb365ef45..d8966bfd68cc 100644
--- a/metadata/md5-cache/net-irc/inspircd-2.0.26
+++ b/metadata/md5-cache/net-irc/inspircd-2.0.26
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=dev-lang/perl ssl? ( dev-libs/openssl:= ) geoip? ( dev-libs/geoip ) gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:= ) pcre? ( dev-libs/libpcre ) sqlite? ( >=dev-db/sqlite-3.0 ) tre? ( dev-libs/tre )
+DEPEND=dev-lang/perl ssl? ( dev-libs/openssl:= ) geoip? ( dev-libs/geoip ) gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 ) ldap? ( net-nds/openldap ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) pcre? ( dev-libs/libpcre ) sqlite? ( >=dev-db/sqlite-3.0 ) tre? ( dev-libs/tre )
 DESCRIPTION=Inspire IRCd - The Stable, High-Performance Modular IRCd
 EAPI=6
 HOMEPAGE=https://inspircd.github.com/
 IUSE=geoip gnutls ipv6 ldap mysql pcre posix postgres sqlite ssl tre
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-lang/perl ssl? ( dev-libs/openssl:= ) geoip? ( dev-libs/geoip ) gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:= ) pcre? ( dev-libs/libpcre ) sqlite? ( >=dev-db/sqlite-3.0 ) tre? ( dev-libs/tre )
+RDEPEND=dev-lang/perl ssl? ( dev-libs/openssl:= ) geoip? ( dev-libs/geoip ) gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 ) ldap? ( net-nds/openldap ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) pcre? ( dev-libs/libpcre ) sqlite? ( >=dev-db/sqlite-3.0 ) tre? ( dev-libs/tre )
 SLOT=0
 SRC_URI=https://github.com/inspircd/inspircd/archive/v2.0.26.tar.gz -> inspircd-2.0.26.tar.gz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=854206fa98514bbf84f6e3533e82fdfc
+_md5_=e0a0d82b346879465d52a39662b4feb1
diff --git a/metadata/md5-cache/net-irc/konversation-1.7.5 b/metadata/md5-cache/net-irc/konversation-1.7.5
index cf5a6e297914..3ca96144b549 100644
--- a/metadata/md5-cache/net-irc/konversation-1.7.5
+++ b/metadata/md5-cache/net-irc/konversation-1.7.5
@@ -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/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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
index c7feb0800ff5..9ff877ef9218 100644
--- a/metadata/md5-cache/net-irc/kvirc-5.0_pre20180401054732
+++ b/metadata/md5-cache/net-irc/kvirc-5.0_pre20180401054732
@@ -10,5 +10,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
index b0748b28189f..ee67c2edf99e 100644
--- a/metadata/md5-cache/net-irc/kvirc-5.0_pre20180605072059
+++ b/metadata/md5-cache/net-irc/kvirc-5.0_pre20180605072059
@@ -10,5 +10,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_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 9901d6284d7a..3974d2ff68cd 100644
--- a/metadata/md5-cache/net-irc/kvirc-5.0_pre20180819121252
+++ b/metadata/md5-cache/net-irc/kvirc-5.0_pre20180819121252
@@ -10,5 +10,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/net-irc/kvirc-9999 b/metadata/md5-cache/net-irc/kvirc-9999
index e09bd5e5920b..5dfb0ae3ce57 100644
--- a/metadata/md5-cache/net-irc/kvirc-9999
+++ b/metadata/md5-cache/net-irc/kvirc-9999
@@ -8,5 +8,5 @@ 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
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/net-irc/limnoria-20150523 b/metadata/md5-cache/net-irc/limnoria-20150523
index 204c06099013..09587070a566 100644
--- a/metadata/md5-cache/net-irc/limnoria-20150523
+++ b/metadata/md5-cache/net-irc/limnoria-20150523
@@ -10,5 +10,5 @@ RDEPEND=dev-python/chardet[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://github.com/ProgVal/Limnoria/archive/master-2015-05-23.tar.gz -> limnoria-20150523.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4c32d99cc2b26bf6f7a820c66cb52466
diff --git a/metadata/md5-cache/net-irc/limnoria-20150829 b/metadata/md5-cache/net-irc/limnoria-20150829
index bc310a5823dc..df22fc63e60f 100644
--- a/metadata/md5-cache/net-irc/limnoria-20150829
+++ b/metadata/md5-cache/net-irc/limnoria-20150829
@@ -10,5 +10,5 @@ RDEPEND=dev-python/chardet[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/ProgVal/Limnoria/archive/master-2015-08-29.tar.gz -> limnoria-20150829.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=553bd105717ff34b8ffec4cc39841a55
diff --git a/metadata/md5-cache/net-irc/limnoria-20171025 b/metadata/md5-cache/net-irc/limnoria-20171025
index 798c93aa41b7..09436184041d 100644
--- a/metadata/md5-cache/net-irc/limnoria-20171025
+++ b/metadata/md5-cache/net-irc/limnoria-20171025
@@ -10,5 +10,5 @@ RDEPEND=dev-python/chardet[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/ProgVal/Limnoria/archive/master-2017-10-25.tar.gz -> limnoria-20171025.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=eaf1d3d0e2726e61ae26f5d703400c2c
diff --git a/metadata/md5-cache/net-irc/limnoria-99999999 b/metadata/md5-cache/net-irc/limnoria-99999999
index 750ae7247567..b87322677d3b 100644
--- a/metadata/md5-cache/net-irc/limnoria-99999999
+++ b/metadata/md5-cache/net-irc/limnoria-99999999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/chardet[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/feedparser[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/PySocks[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] crypt? ( dev-python/python-gnupg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) 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(-)] ) !net-irc/supybot !net-irc/supybot-plugins python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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_=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	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=eaf1d3d0e2726e61ae26f5d703400c2c
diff --git a/metadata/md5-cache/net-irc/polari-3.24.2 b/metadata/md5-cache/net-irc/polari-3.24.2
index a8bfa99433ab..022a5d8c3ec7 100644
--- a/metadata/md5-cache/net-irc/polari-3.24.2
+++ b/metadata/md5-cache/net-irc/polari-3.24.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-3.21.6:3[introspection] net-libs/telepathy-glib[introspection] >=dev-libs/glib-2.43.4:2 >=dev-libs/gobject-introspection-1.50:= >=dev-libs/gjs-1.45.3 x11-libs/gdk-pixbuf:2[introspection] >=app-text/gspell-1.4.0[introspection] x11-libs/pango[introspection] app-crypt/libsecret[introspection] net-libs/libsoup:2.4[introspection] net-im/telepathy-logger[introspection] >=net-irc/telepathy-idle-0.2
 SLOT=0
 SRC_URI=mirror://gnome/sources/polari/3.24/polari-3.24.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4d1223cf59d080d8dc9dadcf7bf5cb46
diff --git a/metadata/md5-cache/net-irc/polari-3.26.2 b/metadata/md5-cache/net-irc/polari-3.26.2
index 5541ba39e23c..dc4b9c4ba940 100644
--- a/metadata/md5-cache/net-irc/polari-3.26.2
+++ b/metadata/md5-cache/net-irc/polari-3.26.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.43.4:2 >=x11-libs/gtk+-3.21.6:3[introspection] net-libs/telepathy-glib[introspection] >=dev-libs/gobject-introspection-1.50:= >=dev-libs/gjs-1.50 x11-libs/gdk-pixbuf:2[introspection] >=app-text/gspell-1.4.0[introspection] x11-libs/pango[introspection] app-crypt/libsecret[introspection] net-libs/libsoup:2.4[introspection] net-im/telepathy-logger[introspection] >=net-irc/telepathy-idle-0.2
 SLOT=0
 SRC_URI=mirror://gnome/sources/polari/3.26/polari-3.26.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	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	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	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	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7c72f662e5397037b5c50582b6764226
diff --git a/metadata/md5-cache/net-irc/psybnc-2.3.2.9-r2 b/metadata/md5-cache/net-irc/psybnc-2.3.2.9-r2
deleted file mode 100644
index 1098884ad832..000000000000
--- a/metadata/md5-cache/net-irc/psybnc-2.3.2.9-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile config install postinst prepare setup unpack
-DEPEND=ssl? ( >=dev-libs/openssl-0.9.7d ) oidentd? ( >=net-misc/oidentd-2.0 )
-DESCRIPTION=psyBNC is a multi-user and multi-server gateway to IRC networks
-EAPI=2
-HOMEPAGE=http://www.psybnc.at/index.html
-IUSE=ipv6 ssl oidentd scripting multinetwork
-KEYWORDS=~amd64 ~sparc ~x86 ~ppc
-LICENSE=GPL-2
-RDEPEND=ssl? ( >=dev-libs/openssl-0.9.7d ) oidentd? ( >=net-misc/oidentd-2.0 )
-SLOT=0
-SRC_URI=http://www.psybnc.at/download/beta/psyBNC-2.3.2-9.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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=f92e278fc0715ec8b33fe359b7193c42
diff --git a/metadata/md5-cache/net-irc/quassel-0.12.5-r2 b/metadata/md5-cache/net-irc/quassel-0.12.5-r2
index 8c7a90fdbc4a..8a28e32a81bd 100644
--- a/metadata/md5-cache/net-irc/quassel-0.12.5-r2
+++ b/metadata/md5-cache/net-irc/quassel-0.12.5-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl?] sys-libs/zlib monolithic? ( dev
 REQUIRED_USE=|| ( X server monolithic ) crypt? ( || ( server monolithic ) ) dbus? ( || ( X monolithic ) ) kde? ( || ( X monolithic ) dbus phonon ) phonon? ( || ( X monolithic ) ) postgres? ( || ( server monolithic ) ) snorenotify? ( || ( X monolithic ) ) syslog? ( || ( server monolithic ) )
 SLOT=0
 SRC_URI=http://quassel-irc.org/pub/quassel-0.12.5.tar.bz2
-_eclasses_=cmake-utils	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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5d2cadb11de285d591d1af4020e23b41
diff --git a/metadata/md5-cache/net-irc/quassel-0.13_rc1 b/metadata/md5-cache/net-irc/quassel-0.13_rc1
index c51304635fae..340929300fd1 100644
--- a/metadata/md5-cache/net-irc/quassel-0.13_rc1
+++ b/metadata/md5-cache/net-irc/quassel-0.13_rc1
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl?] sys-libs/zlib monolithic? ( dev
 REQUIRED_USE=|| ( X server monolithic ) crypt? ( || ( server monolithic ) ) kde? ( || ( X monolithic ) dbus ) ldap? ( || ( server monolithic ) ) postgres? ( || ( server monolithic ) ) snorenotify? ( || ( X monolithic ) ) syslog? ( || ( server monolithic ) )
 SLOT=0
 SRC_URI=http://quassel-irc.org/pub/quassel-0.13-rc1.tar.bz2
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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-9999 b/metadata/md5-cache/net-irc/quassel-9999
index adeeea59101f..031db0eefe26 100644
--- a/metadata/md5-cache/net-irc/quassel-9999
+++ b/metadata/md5-cache/net-irc/quassel-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl?] sys-libs/zlib monolithic? ( dev-qt/qtscript:5 crypt? ( app-crypt/qca:2[qt5(+),ssl] ) ldap? ( net-nds/openldap ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 !bundled-icons? ( kde-frameworks/breeze-icons:5 oxygen? ( kde-frameworks/oxygen-icons:5 ) ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)] dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/sonnet:5 ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) ) !monolithic? ( server? ( dev-qt/qtscript:5 crypt? ( app-crypt/qca:2[qt5(+),ssl] ) ldap? ( net-nds/openldap ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) ) X? ( dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 !bundled-icons? ( kde-frameworks/breeze-icons:5 oxygen? ( kde-frameworks/oxygen-icons:5 ) ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)] dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/sonnet:5 ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) ) )
 REQUIRED_USE=|| ( X server monolithic ) crypt? ( || ( server monolithic ) ) kde? ( || ( X monolithic ) dbus ) ldap? ( || ( server monolithic ) ) postgres? ( || ( server monolithic ) ) snorenotify? ( || ( X monolithic ) ) syslog? ( || ( server monolithic ) )
 SLOT=0
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/net-irc/quasselgrep-0_p20170411 b/metadata/md5-cache/net-irc/quasselgrep-0_p20170411
index f44d2ae1d6d1..25371324b732 100644
--- a/metadata/md5-cache/net-irc/quasselgrep-0_p20170411
+++ b/metadata/md5-cache/net-irc/quasselgrep-0_p20170411
@@ -10,5 +10,5 @@ RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_t
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/fish-face/quasselgrep/tarball/502c88bdc7613abb68e868eb520e39ec8a5cf6dd -> quasselgrep-0_p20170411.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f21c1a0c5933f8439b39034dbe869ecf
diff --git a/metadata/md5-cache/net-irc/quasselgrep-9999 b/metadata/md5-cache/net-irc/quasselgrep-9999
index c2df9a484ac0..3f0d5ae47cf1 100644
--- a/metadata/md5-cache/net-irc/quasselgrep-9999
+++ b/metadata/md5-cache/net-irc/quasselgrep-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycryptodome[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/psycopg-2.5.3[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
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f21c1a0c5933f8439b39034dbe869ecf
diff --git a/metadata/md5-cache/net-irc/redirbot-0.0.5-r1 b/metadata/md5-cache/net-irc/redirbot-0.0.5-r1
index 030543930d20..418488fbaf13 100644
--- a/metadata/md5-cache/net-irc/redirbot-0.0.5-r1
+++ b/metadata/md5-cache/net-irc/redirbot-0.0.5-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/redirbot/redirbot-0.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=746f208b0bf31cbc46366e3877b288b0
diff --git a/metadata/md5-cache/net-irc/unrealircd-4.0.18 b/metadata/md5-cache/net-irc/unrealircd-4.0.18
new file mode 100644
index 000000000000..7d1550c860b4
--- /dev/null
+++ b/metadata/md5-cache/net-irc/unrealircd-4.0.18
@@ -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_=120229244746fea8e9c8aef261d55f02
diff --git a/metadata/md5-cache/net-irc/weechat-2.0.1 b/metadata/md5-cache/net-irc/weechat-2.0.1
index 755929c5554e..94846badaa5b 100644
--- a/metadata/md5-cache/net-irc/weechat-2.0.1
+++ b/metadata/md5-cache/net-irc/weechat-2.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_
 RESTRICT=test
 SLOT=0
 SRC_URI=https://weechat.org/files/src/weechat-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b532b53cbbc7dfa579b8989a83d87f3d
diff --git a/metadata/md5-cache/net-irc/weechat-2.1 b/metadata/md5-cache/net-irc/weechat-2.1
index 9a802224a11e..ff25eb2f2104 100644
--- a/metadata/md5-cache/net-irc/weechat-2.1
+++ b/metadata/md5-cache/net-irc/weechat-2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_
 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	89bb9f083a2590d9b447fd0b78a96186
+_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 f887385aae2f..9732c1499c64 100644
--- a/metadata/md5-cache/net-irc/weechat-2.2-r1
+++ b/metadata/md5-cache/net-irc/weechat-2.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/net-irc/weechat-9999 b/metadata/md5-cache/net-irc/weechat-9999
index 9b1edf922907..0de3e679d116 100644
--- a/metadata/md5-cache/net-irc/weechat-9999
+++ b/metadata/md5-cache/net-irc/weechat-9999
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zl
 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
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/net-irc/znc-1.7.1 b/metadata/md5-cache/net-irc/znc-1.7.1
index 34ac03047897..f160e4947fc1 100644
--- a/metadata/md5-cache/net-irc/znc-1.7.1
+++ b/metadata/md5-cache/net-irc/znc-1.7.1
@@ -10,5 +10,5 @@ RDEPEND=icu? ( dev-libs/icu:= ) nls? ( dev-libs/boost:=[nls] ) perl? ( >=dev-lan
 REQUIRED_USE=python? ( ^^ ( 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 ) icu )
 SLOT=0
 SRC_URI=https://znc.in/releases/archive/znc-1.7.1.tar.gz test? ( https://github.com/google/googletest/archive/ba96d0b1161f540656efdaed035b3c062b60e006.tar.gz -> gtest-ba96d0b1161f540656efdaed035b3c062b60e006.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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8d4a10f4671cf5f03f63a0706cb422e8
diff --git a/metadata/md5-cache/net-irc/znc-9999 b/metadata/md5-cache/net-irc/znc-9999
index 769eb5121455..396ce72bfd13 100644
--- a/metadata/md5-cache/net-irc/znc-9999
+++ b/metadata/md5-cache/net-irc/znc-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=icu? ( dev-libs/icu:= ) nls? ( dev-libs/boost:=[nls] ) perl? ( >=dev-lang/perl-5.10:= ) 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(+)?] ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tcl? ( dev-lang/tcl:0= ) zlib? ( sys-libs/zlib:0= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) icu )
 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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9561d8557558e4fe590e9bcde9774da1
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index cbc3938a477c..5f7a05fa3070 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/biblesync-1.1.2-r2 b/metadata/md5-cache/net-libs/biblesync-1.1.2-r2
index b8cc10bf5f62..aa6ff7ecafb1 100644
--- a/metadata/md5-cache/net-libs/biblesync-1.1.2-r2
+++ b/metadata/md5-cache/net-libs/biblesync-1.1.2-r2
@@ -8,5 +8,5 @@ KEYWORDS=amd64
 LICENSE=public-domain
 SLOT=0
 SRC_URI=mirror://sourceforge/gnomesword/biblesync-1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3fe740b4f9a78c24574c51514e5f5d51
diff --git a/metadata/md5-cache/net-libs/biblesync-2.0.1 b/metadata/md5-cache/net-libs/biblesync-2.0.1
index 35641d7b40e9..b031667d3c8c 100644
--- a/metadata/md5-cache/net-libs/biblesync-2.0.1
+++ b/metadata/md5-cache/net-libs/biblesync-2.0.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://github.com/karlkleinpaste/biblesync/releases/download/2.0.1/biblesync-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1063c2385950432f024da41a7dd2e991
diff --git a/metadata/md5-cache/net-libs/davix-0.6.7 b/metadata/md5-cache/net-libs/davix-0.6.7
index 931ed3b71b02..c6ae8b9c5908 100644
--- a/metadata/md5-cache/net-libs/davix-0.6.7
+++ b/metadata/md5-cache/net-libs/davix-0.6.7
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libxml2:2= dev-libs/openssl:0= kernel_linux? ( sys-apps/util-li
 REQUIRED_USE=test? ( tools )
 SLOT=0
 SRC_URI=http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/davix/0.6.7/davix-0.6.7.tar.gz -> davix-0.6.7.tar
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fe741259e4ae19a5f9a4ff83ea1bdf61
diff --git a/metadata/md5-cache/net-libs/davix-0.6.8 b/metadata/md5-cache/net-libs/davix-0.6.8
index cb407ceab60b..e3bcc9f3026e 100644
--- a/metadata/md5-cache/net-libs/davix-0.6.8
+++ b/metadata/md5-cache/net-libs/davix-0.6.8
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libxml2:2= dev-libs/openssl:0= kernel_linux? ( sys-apps/util-li
 REQUIRED_USE=test? ( tools )
 SLOT=0
 SRC_URI=http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/davix/0.6.8/davix-0.6.8.tar.gz -> davix-0.6.8.tar
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8b2ab852b1954b2f165abef743af1e51
diff --git a/metadata/md5-cache/net-libs/dslib-3.0-r1 b/metadata/md5-cache/net-libs/dslib-3.0-r1
index 7ce9c35f5142..684a3c8e8c43 100644
--- a/metadata/md5-cache/net-libs/dslib-3.0-r1
+++ b/metadata/md5-cache/net-libs/dslib-3.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyasn1[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.nic.cz/public_media/datove_schranky/releases//src/dslib-3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a1b338cc71aaa75858e9d4acfaa21d59
diff --git a/metadata/md5-cache/net-libs/farstream-0.2.8-r1 b/metadata/md5-cache/net-libs/farstream-0.2.8-r1
index ce9b92a4e510..99f932bbe6f6 100644
--- a/metadata/md5-cache/net-libs/farstream-0.2.8-r1
+++ b/metadata/md5-cache/net-libs/farstream-0.2.8-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/gstreamer-1.4:1.0 >=media-libs/gst-plugins-base-1.4:1.0 >=d
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3458d101efb15f40d4123f39d08743d6
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 219bc9ab4fc7..e9c941268a59 100644
--- a/metadata/md5-cache/net-libs/farstream-0.2.8-r2
+++ b/metadata/md5-cache/net-libs/farstream-0.2.8-r2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/gstreamer-1.4:1.0 >=media-libs/gst-plugins-base-1.4:1.0 >=d
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/net-libs/glib-networking-2.50.0 b/metadata/md5-cache/net-libs/glib-networking-2.50.0
index aa168fc75030..780286a5cd3b 100644
--- a/metadata/md5-cache/net-libs/glib-networking-2.50.0
+++ b/metadata/md5-cache/net-libs/glib-networking-2.50.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.46.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(-)?] gnome? ( gnome-base/gsettings-desktop-schemas ) libproxy? ( >=net-libs/libproxy-0.4.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(-)?] ) smartcard? ( >=app-crypt/p11-kit-0.18.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(-)?] >=net-libs/gnutls-3:=[pkcs11,abi_x86_32(-)?,abi_x86_64(-)?,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? ( app-misc/ca-certificates >=net-libs/gnutls-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://gnome/sources/glib-networking/2.50/glib-networking-2.50.0.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7aa030362032fea583225b46710f733d
diff --git a/metadata/md5-cache/net-libs/gnet-2.0.8-r2 b/metadata/md5-cache/net-libs/gnet-2.0.8-r2
index f5950ad64c75..72dad521b7fc 100644
--- a/metadata/md5-cache/net-libs/gnet-2.0.8-r2
+++ b/metadata/md5-cache/net-libs/gnet-2.0.8-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.6:2
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnet/2.0/gnet-2.0.8.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=ac031d3f39e2e6fef7f30e0ae9f47f29
diff --git a/metadata/md5-cache/net-libs/gnome-online-accounts-3.24.4 b/metadata/md5-cache/net-libs/gnome-online-accounts-3.24.4
index 587da496c3a1..39d773737299 100644
--- a/metadata/md5-cache/net-libs/gnome-online-accounts-3.24.4
+++ b/metadata/md5-cache/net-libs/gnome-online-accounts-3.24.4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.44:2 >=app-crypt/libsecret-0.5 >=dev-libs/json-glib-0.
 REQUIRED_USE=vala? ( introspection )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/gnome-online-accounts/3.24/gnome-online-accounts-3.24.4.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8ca1257069466e523fc0cc1cb7729423
diff --git a/metadata/md5-cache/net-libs/gnome-online-accounts-3.24.5 b/metadata/md5-cache/net-libs/gnome-online-accounts-3.24.5
index 18eb24156b30..43a745e69164 100644
--- a/metadata/md5-cache/net-libs/gnome-online-accounts-3.24.5
+++ b/metadata/md5-cache/net-libs/gnome-online-accounts-3.24.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.44:2 >=app-crypt/libsecret-0.5 >=dev-libs/json-glib-0.
 REQUIRED_USE=vala? ( introspection )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/gnome-online-accounts/3.24/gnome-online-accounts-3.24.5.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3b7f387d0d139ecb349f5c84fb433e95
diff --git a/metadata/md5-cache/net-libs/gnome-online-accounts-3.26.2 b/metadata/md5-cache/net-libs/gnome-online-accounts-3.26.2
index d0a2d436e93f..8ffaa6996203 100644
--- a/metadata/md5-cache/net-libs/gnome-online-accounts-3.26.2
+++ b/metadata/md5-cache/net-libs/gnome-online-accounts-3.26.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.52:2 >=app-crypt/libsecret-0.5 >=dev-libs/json-glib-0.
 REQUIRED_USE=vala? ( introspection )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/gnome-online-accounts/3.26/gnome-online-accounts-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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=78a3e087625e584d0411b3ed3187260b
diff --git a/metadata/md5-cache/net-libs/gnutls-3.5.19-r1 b/metadata/md5-cache/net-libs/gnutls-3.5.19-r1
index 562106cccfd2..3bfd5f7e003c 100644
--- a/metadata/md5-cache/net-libs/gnutls-3.5.19-r1
+++ b/metadata/md5-cache/net-libs/gnutls-3.5.19-r1
@@ -1,4 +1,4 @@
-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(-)?] tools? ( sys-devel/autogen ) valgrind? ( dev-util/valgrind ) doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) test-full? ( app-crypt/dieharder app-misc/datefudge dev-libs/softhsm:2[-bindist] net-dialup/ppp net-misc/socat ) >=app-portage/elt-patches-20170815
+BDEPEND=>=virtual/pkgconfig-0-r1 doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) tools? ( sys-devel/autogen ) valgrind? ( dev-util/valgrind ) test-full? ( app-crypt/dieharder app-misc/datefudge dev-libs/softhsm:2[-bindist] net-dialup/ppp net-misc/socat ) >=app-portage/elt-patches-20170815
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=>=dev-libs/libtasn1-4.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(-)?] dev-libs/libunistring:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_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/nettle-3.1:=[gmp,abi_x86_32(-)?,abi_x86_64(-)?,abi_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/gmp-5.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(-)?] tools? ( sys-devel/autogen ) dane? ( >=net-dns/unbound-1.4.20:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) guile? ( >=dev-scheme/guile-2:=[networking] ) 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(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.23.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(-)?] ) idn? ( >=net-dns/libidn2-0.16-r1[abi_x86_32(-)?,abi_x86_64(-)?,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? ( seccomp? ( sys-libs/libseccomp ) )
 DESCRIPTION=A TLS 1.2 and SSL 3.0 implementation for the GNU project
@@ -12,4 +12,4 @@ REQUIRED_USE=test-full? ( guile pkcs11 openpgp openssl idn seccomp tools zlib )
 SLOT=0/30
 SRC_URI=mirror://gnupg/gnutls/v3.5/gnutls-3.5.19.tar.xz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=2ac4612a8959553ed3ae9f02808a6159
+_md5_=a8e273e5c3c5518c8a8aca3aa9d5393d
diff --git a/metadata/md5-cache/net-libs/gnutls-3.6.3 b/metadata/md5-cache/net-libs/gnutls-3.6.3
index 8dc2ce00c3db..dbb4f5777d35 100644
--- a/metadata/md5-cache/net-libs/gnutls-3.6.3
+++ b/metadata/md5-cache/net-libs/gnutls-3.6.3
@@ -1,4 +1,4 @@
-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(-)?] tools? ( sys-devel/autogen ) valgrind? ( dev-util/valgrind ) doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) test-full? ( app-crypt/dieharder >=app-misc/datefudge-1.22 dev-libs/softhsm:2[-bindist] net-dialup/ppp net-misc/socat ) >=app-portage/elt-patches-20170815
+BDEPEND=>=virtual/pkgconfig-0-r1 doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) tools? ( sys-devel/autogen ) valgrind? ( dev-util/valgrind ) test-full? ( app-crypt/dieharder >=app-misc/datefudge-1.22 dev-libs/softhsm:2[-bindist] net-dialup/ppp net-misc/socat ) >=app-portage/elt-patches-20170815
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=>=dev-libs/libtasn1-4.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(-)?] dev-libs/libunistring:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_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/nettle-3.1:=[gmp,abi_x86_32(-)?,abi_x86_64(-)?,abi_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/gmp-5.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(-)?] tools? ( sys-devel/autogen ) dane? ( >=net-dns/unbound-1.4.20:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) guile? ( >=dev-scheme/guile-2:=[networking] ) 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(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.23.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(-)?] ) idn? ( >=net-dns/libidn2-0.16-r1[abi_x86_32(-)?,abi_x86_64(-)?,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? ( seccomp? ( sys-libs/libseccomp ) )
 DESCRIPTION=A TLS 1.2 and SSL 3.0 implementation for the GNU project
@@ -11,4 +11,4 @@ REQUIRED_USE=test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 sec
 SLOT=0/30
 SRC_URI=mirror://gnupg/gnutls/v3.6/gnutls-3.6.3.tar.xz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=0d705fde674ae87016cdb1da41061e73
+_md5_=8feead9f2de1353e3500a259e7b006f3
diff --git a/metadata/md5-cache/net-libs/google-cloud-cpp-0.2.0-r1 b/metadata/md5-cache/net-libs/google-cloud-cpp-0.2.0-r1
index 291636b34b62..4c70c9f2b02c 100644
--- a/metadata/md5-cache/net-libs/google-cloud-cpp-0.2.0-r1
+++ b/metadata/md5-cache/net-libs/google-cloud-cpp-0.2.0-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/protobuf net-misc/curl net-libs/grpc
 SLOT=0
 SRC_URI=https://github.com/GoogleCloudPlatform/google-cloud-cpp/archive/v0.2.0.tar.gz -> google-cloud-cpp-0.2.0.tar.gz https://github.com/nlohmann/json/releases/download/v3.1.2/json.hpp -> nlohmann-json-3.1.2-json.hpp https://github.com/googleapis/googleapis/archive/79ab27f3b70ebc221e265d2e8ab30a8cc2d21fa2.tar.gz -> googleapis-79ab27f3b70ebc221e265d2e8ab30a8cc2d21fa2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8945cff850671f538ba988cccb1c8718
diff --git a/metadata/md5-cache/net-libs/grpc-1.12.1-r1 b/metadata/md5-cache/net-libs/grpc-1.12.1-r1
index f49a480f531e..776478131fe8 100644
--- a/metadata/md5-cache/net-libs/grpc-1.12.1-r1
+++ b/metadata/md5-cache/net-libs/grpc-1.12.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] >=dev-libs/protobuf-3.5:= dev-util
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) tools? ( python )
 SLOT=0
 SRC_URI=https://github.com/grpc/grpc/archive/v1.12.1.tar.gz -> grpc-1.12.1.tar.gz tools? ( https://github.com/google/protobuf/archive/v3.5.2.tar.gz -> protobuf-3.5.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d5db57f306615c28e6e3a2a0eb7de045
diff --git a/metadata/md5-cache/net-libs/grpc-1.13.0-r1 b/metadata/md5-cache/net-libs/grpc-1.13.0-r1
index 849fc6b0dae9..e6529fb5bffe 100644
--- a/metadata/md5-cache/net-libs/grpc-1.13.0-r1
+++ b/metadata/md5-cache/net-libs/grpc-1.13.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] >=dev-libs/protobuf-3.5.2:= dev-ut
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) tools? ( python )
 SLOT=0
 SRC_URI=https://github.com/grpc/grpc/archive/v1.13.0.tar.gz -> grpc-1.13.0.tar.gz tools? ( https://github.com/google/protobuf/archive/v3.5.2.tar.gz -> protobuf-3.5.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=77ba1d4c683e992a39ac6d176062226d
diff --git a/metadata/md5-cache/net-libs/grpc-1.13.1 b/metadata/md5-cache/net-libs/grpc-1.13.1
index a4864c613501..dc802af45de9 100644
--- a/metadata/md5-cache/net-libs/grpc-1.13.1
+++ b/metadata/md5-cache/net-libs/grpc-1.13.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] >=dev-libs/protobuf-3.5.2:= dev-ut
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) tools? ( python )
 SLOT=0
 SRC_URI=https://github.com/grpc/grpc/archive/v1.13.1.tar.gz -> grpc-1.13.1.tar.gz tools? ( https://github.com/google/protobuf/archive/v3.5.2.tar.gz -> protobuf-3.5.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=560ae17827b282528fb5c91fd82cb4dd
diff --git a/metadata/md5-cache/net-libs/grpc-1.14.2 b/metadata/md5-cache/net-libs/grpc-1.14.2
index 0e3c74dfaff3..c8f5deb8e63a 100644
--- a/metadata/md5-cache/net-libs/grpc-1.14.2
+++ b/metadata/md5-cache/net-libs/grpc-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] >=dev-libs/protobuf-3.5.2:= dev-ut
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) tools? ( python )
 SLOT=0
 SRC_URI=https://github.com/grpc/grpc/archive/v1.14.2.tar.gz -> grpc-1.14.2.tar.gz tools? ( https://github.com/google/protobuf/archive/v3.5.2.tar.gz -> protobuf-3.5.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cd3cdbbb5ad3669f8171e2358c1b0fb1
diff --git a/metadata/md5-cache/net-libs/grpc-1.15.0 b/metadata/md5-cache/net-libs/grpc-1.15.0
index b3547da89575..8aef9cfb7748 100644
--- a/metadata/md5-cache/net-libs/grpc-1.15.0
+++ b/metadata/md5-cache/net-libs/grpc-1.15.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] >=dev-libs/protobuf-3.6.1:= dev-ut
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) tools? ( python )
 SLOT=0
 SRC_URI=https://github.com/grpc/grpc/archive/v1.15.0.tar.gz -> grpc-1.15.0.tar.gz tools? ( https://github.com/google/protobuf/archive/v3.6.1.tar.gz -> protobuf-3.6.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=16d04107a624c9501d66947a5c47aeb2
diff --git a/metadata/md5-cache/net-libs/gssdp-1.0.2 b/metadata/md5-cache/net-libs/gssdp-1.0.2
index ebf439549058..b12591c6e83a 100644
--- a/metadata/md5-cache/net-libs/gssdp-1.0.2
+++ b/metadata/md5-cache/net-libs/gssdp-1.0.2
@@ -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(-)?] >=net-libs/libsoup-2.44.2:2.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,introspection?] gtk? ( >=x11-libs/gtk+-3.0:3 ) introspection? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) >=dev-libs/gobject-introspection-1.36:= ) !<net-libs/gupnp-vala-0.10.3
 SLOT=0/3
 SRC_URI=mirror://gnome/sources/gssdp/1.0/gssdp-1.0.2.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=564466dc11f636889817fea58dee593d
diff --git a/metadata/md5-cache/net-libs/gtk-vnc-0.7.2 b/metadata/md5-cache/net-libs/gtk-vnc-0.7.2
index 9f22bce29e20..a829c761e80a 100644
--- a/metadata/md5-cache/net-libs/gtk-vnc-0.7.2
+++ b/metadata/md5-cache/net-libs/gtk-vnc-0.7.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.30.1:2 >=dev-libs/libgcrypt-1.4.2:0= dev-libs/libgpg-e
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtk-vnc/0.7/gtk-vnc-0.7.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0a26f184ea05f1e927cde09e6fd1d803
diff --git a/metadata/md5-cache/net-libs/gtk-vnc-0.8.0 b/metadata/md5-cache/net-libs/gtk-vnc-0.8.0
index 35209e3c25a4..6b48de32c0a7 100644
--- a/metadata/md5-cache/net-libs/gtk-vnc-0.8.0
+++ b/metadata/md5-cache/net-libs/gtk-vnc-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.30.1:2 >=dev-libs/libgcrypt-1.4.2:0= dev-libs/libgpg-e
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtk-vnc/0.8/gtk-vnc-0.8.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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b570cfb0a212c168b8bb9a5ad5720cc2
diff --git a/metadata/md5-cache/net-libs/gupnp-1.0.2 b/metadata/md5-cache/net-libs/gupnp-1.0.2
index d4bc480c7d31..9c724b7d5b46 100644
--- a/metadata/md5-cache/net-libs/gupnp-1.0.2
+++ b/metadata/md5-cache/net-libs/gupnp-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-
 REQUIRED_USE=|| ( python_targets_python2_7 ) ?? ( connman networkmanager )
 SLOT=0/4
 SRC_URI=mirror://gnome/sources/gupnp/1.0/gupnp-1.0.2.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	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=36cd2d9bbcb0a115796d94b47ae454b6
diff --git a/metadata/md5-cache/net-libs/gupnp-1.0.3 b/metadata/md5-cache/net-libs/gupnp-1.0.3
index 69ce032094f4..fe9f4a3938b0 100644
--- a/metadata/md5-cache/net-libs/gupnp-1.0.3
+++ b/metadata/md5-cache/net-libs/gupnp-1.0.3
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] )
 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 ) ?? ( connman networkmanager )
 SLOT=0/4
 SRC_URI=mirror://gnome/sources/gupnp/1.0/gupnp-1.0.3.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ca1dfcb0d80f1cc492eb701004d28850
diff --git a/metadata/md5-cache/net-libs/gupnp-av-0.12.10 b/metadata/md5-cache/net-libs/gupnp-av-0.12.10
index cde638026553..da6d0c3ca37f 100644
--- a/metadata/md5-cache/net-libs/gupnp-av-0.12.10
+++ b/metadata/md5-cache/net-libs/gupnp-av-0.12.10
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.34:2 >=net-libs/libsoup-2.28.2:2.4[introspection?] dev-libs/libxml2 introspection? ( >=dev-libs/gobject-introspection-1.36:= ) !net-libs/gupnp-vala
 SLOT=0/2
 SRC_URI=mirror://gnome/sources/gupnp-av/0.12/gupnp-av-0.12.10.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=879a1609f718f7a47742cffaa1efee5b
diff --git a/metadata/md5-cache/net-libs/gupnp-igd-0.2.4 b/metadata/md5-cache/net-libs/gupnp-igd-0.2.4
index 5ab17ca22362..957e7df11050 100644
--- a/metadata/md5-cache/net-libs/gupnp-igd-0.2.4
+++ b/metadata/md5-cache/net-libs/gupnp-igd-0.2.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install test
-DEPEND=>=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(-)?] >=net-libs/gssdp-0.14.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gupnp-0.20.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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10 ) 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(-)] >=dev-libs/gobject-introspection-0.10 >=dev-python/pygobject-2.16:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-util/gtk-doc-am sys-devel/gettext >=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-arch/xz-utils
+DEPEND=>=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(-)?] >=net-libs/gssdp-0.14.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gupnp-0.20.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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10 ) 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(-)] >=dev-libs/gobject-introspection-0.10 >=dev-python/pygobject-2.16:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-util/glib-utils dev-util/gtk-doc-am sys-devel/gettext >=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-arch/xz-utils
 DESCRIPTION=Library to handle UPnP IGD port mapping for GUPnP
 EAPI=5
 HOMEPAGE=http://gupnp.org
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gupnp-igd/0.2/gupnp-igd-0.2.4.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=e653bc93a186467db545fff338fc901e
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d1d282f55b26e96bfa5239b640592801
diff --git a/metadata/md5-cache/net-libs/gupnp-igd-0.2.5 b/metadata/md5-cache/net-libs/gupnp-igd-0.2.5
index 5d63c470256c..a032cb11d0e0 100644
--- a/metadata/md5-cache/net-libs/gupnp-igd-0.2.5
+++ b/metadata/md5-cache/net-libs/gupnp-igd-0.2.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install test
-DEPEND=>=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(-)?] >=net-libs/gssdp-0.14.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gupnp-0.20.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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10 ) >=dev-util/gtk-doc-am-1.10 sys-devel/gettext >=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-arch/xz-utils
+DEPEND=>=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(-)?] >=net-libs/gssdp-0.14.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gupnp-0.20.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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10 ) dev-util/glib-utils >=dev-util/gtk-doc-am-1.10 sys-devel/gettext >=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-arch/xz-utils
 DESCRIPTION=Library to handle UPnP IGD port mapping for GUPnP
 EAPI=6
 HOMEPAGE=http://gupnp.org
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gupnp-igd/0.2/gupnp-igd-0.2.5.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=f9c2a4a7d85adc0e275d0041978a8748
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=45e5a2164bf70eda488cbe2b122b63cc
diff --git a/metadata/md5-cache/net-libs/http-parser-2.8.1 b/metadata/md5-cache/net-libs/http-parser-2.8.1
index 5bbd1b696243..efd4c19f7696 100644
--- a/metadata/md5-cache/net-libs/http-parser-2.8.1
+++ b/metadata/md5-cache/net-libs/http-parser-2.8.1
@@ -3,9 +3,9 @@ DESCRIPTION=HTTP request/response parser for C
 EAPI=6
 HOMEPAGE=https://github.com/nodejs/http-parser
 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 ppc ppc64 x86 ~amd64-linux ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x64-macos ~x64-solaris
 LICENSE=MIT
 SLOT=0/2.8.0
 SRC_URI=https://github.com/nodejs/http-parser/archive/v2.8.1.tar.gz -> http-parser-2.8.1.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=33d7c3daec165da30401f78a0611572d
+_md5_=d5af52c4e5e446c22ac849b6da7e0418
diff --git a/metadata/md5-cache/net-libs/ignition-msgs-0.7.0 b/metadata/md5-cache/net-libs/ignition-msgs-0.7.0
index 19df7cbf65ba..ee905067d30c 100644
--- a/metadata/md5-cache/net-libs/ignition-msgs-0.7.0
+++ b/metadata/md5-cache/net-libs/ignition-msgs-0.7.0
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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 353149ebeb95..2cdd655bc07b 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=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
index 57ec2155e5bc..8888a7ce5f57 100644
--- a/metadata/md5-cache/net-libs/ignition-transport-3.1.0-r1
+++ b/metadata/md5-cache/net-libs/ignition-transport-3.1.0-r1
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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/ignition-transport-4.0.0 b/metadata/md5-cache/net-libs/ignition-transport-4.0.0
index 6dd59111f1e5..81fd76d77744 100644
--- a/metadata/md5-cache/net-libs/ignition-transport-4.0.0
+++ b/metadata/md5-cache/net-libs/ignition-transport-4.0.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=net-libs/ignition-msgs:1= dev-libs/protobuf:= >=net-libs/zeromq-4.2.0:= sys-apps/util-linux net-libs/cppzmq
 SLOT=4/4
 SRC_URI=http://gazebosim.org/distributions/ign-transport/releases/ignition-transport4-4.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bbdcf44c7082267b37c7747d454e8df0
diff --git a/metadata/md5-cache/net-libs/jreen-1.3.0-r1 b/metadata/md5-cache/net-libs/jreen-1.3.0-r1
index ec6424df0135..64532a5acc51 100644
--- a/metadata/md5-cache/net-libs/jreen-1.3.0-r1
+++ b/metadata/md5-cache/net-libs/jreen-1.3.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5 media-libs/speex net-libs/libgsasl sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/euroelessar/jreen/archive/v1.3.0.tar.gz -> jreen-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c0673979a3d5a71c1339aa5b651ab30d
diff --git a/metadata/md5-cache/net-libs/kdav2-0.1.0 b/metadata/md5-cache/net-libs/kdav2-0.1.0
index 7c2bc2891696..088af494ef05 100644
--- a/metadata/md5-cache/net-libs/kdav2-0.1.0
+++ b/metadata/md5-cache/net-libs/kdav2-0.1.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/kimap2-0.2.0-r1 b/metadata/md5-cache/net-libs/kimap2-0.2.0-r1
index 92f9ee4357f8..1b4c70d4ef42 100644
--- a/metadata/md5-cache/net-libs/kimap2-0.2.0-r1
+++ b/metadata/md5-cache/net-libs/kimap2-0.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0: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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 900f70b023d4..2b5dc0dc7b8b 100644
--- a/metadata/md5-cache/net-libs/libaccounts-glib-1.23
+++ b/metadata/md5-cache/net-libs/libaccounts-glib-1.23
@@ -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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/net-libs/libad9361-iio-0.1-r2 b/metadata/md5-cache/net-libs/libad9361-iio-0.1-r2
index 886f3f908e15..1cb8cf0eff93 100644
--- a/metadata/md5-cache/net-libs/libad9361-iio-0.1-r2
+++ b/metadata/md5-cache/net-libs/libad9361-iio-0.1-r2
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=net-libs/libiio:=
 SLOT=0/0.1
 SRC_URI=https://github.com/analogdevicesinc/libad9361-iio/archive/v0.1.tar.gz -> libad9361-iio-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a9ee53f3efecb8c4e8598bae4fc6281b
diff --git a/metadata/md5-cache/net-libs/libad9361-iio-9999 b/metadata/md5-cache/net-libs/libad9361-iio-9999
index eb9b2842fdf9..defbe09498c1 100644
--- a/metadata/md5-cache/net-libs/libad9361-iio-9999
+++ b/metadata/md5-cache/net-libs/libad9361-iio-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/analogdevicesinc/libad9361-iio
 LICENSE=LGPL-2.1
 RDEPEND=net-libs/libiio:=
 SLOT=0/9999
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a9ee53f3efecb8c4e8598bae4fc6281b
diff --git a/metadata/md5-cache/net-libs/libbitcoinconsensus-0.16.0 b/metadata/md5-cache/net-libs/libbitcoinconsensus-0.16.0
deleted file mode 100644
index c49de6239bb6..000000000000
--- a/metadata/md5-cache/net-libs/libbitcoinconsensus-0.16.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare pretend
-DEPEND=>=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] !libressl? ( dev-libs/openssl:0=[-bindist] ) 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=Bitcoin Core consensus library
-EAPI=6
-HOMEPAGE=https://bitcoincore.org/ https://bitcoinknots.org/
-IUSE=+asm knots libressl
-KEYWORDS=~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux
-LICENSE=MIT
-RDEPEND=>=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= )
-SLOT=0
-SRC_URI=https://github.com/bitcoin/bitcoin/archive/4b4d7eb255ca8f9a94b92479e6061d129c91a991.tar.gz -> bitcoin-v0.16.0.tar.gz https://bitcoinknots.org/files/0.16.x/0.16.0.knots20180322/bitcoin-0.16.0.knots20180322.patches.txz -> bitcoin-0.16.0.knots20180322.patches.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=f642a6712ebb29476e406ab96b630f49
diff --git a/metadata/md5-cache/net-libs/libbitcoinconsensus-0.16.3 b/metadata/md5-cache/net-libs/libbitcoinconsensus-0.16.3
index 3c7e0b18de61..a823d2ff219a 100644
--- a/metadata/md5-cache/net-libs/libbitcoinconsensus-0.16.3
+++ b/metadata/md5-cache/net-libs/libbitcoinconsensus-0.16.3
@@ -4,10 +4,10 @@ DESCRIPTION=Bitcoin Core consensus library
 EAPI=6
 HOMEPAGE=https://bitcoincore.org/ https://bitcoinknots.org/
 IUSE=+asm knots libressl
-KEYWORDS=amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= )
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/49e34e288005a5b144a642e197b628396f5a0765.tar.gz -> bitcoin-v0.16.3.tar.gz https://bitcoinknots.org/files/0.16.x/0.16.3.knots20180918/bitcoin-0.16.3.knots20180918.patches.txz -> bitcoin-0.16.3.knots20180918.patches.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=d815b948ad2f6ebb3ea65c4fcfd1fcd8
+_md5_=aca73b2a2017cce670c3b0fb648226cc
diff --git a/metadata/md5-cache/net-libs/libbtbb-2017.03.2 b/metadata/md5-cache/net-libs/libbtbb-2017.03.2
index f466ca91d80b..96eb5d1b73e3 100644
--- a/metadata/md5-cache/net-libs/libbtbb-2017.03.2
+++ b/metadata/md5-cache/net-libs/libbtbb-2017.03.2
@@ -10,5 +10,5 @@ RDEPEND=extras? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >
 REQUIRED_USE=extras? ( python_targets_python2_7 )
 SLOT=0/2017.03.2
 SRC_URI=https://github.com/greatscottgadgets/libbtbb/archive/2017-03-R2.tar.gz -> libbtbb-2017-03-R2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2591885add6dff9c7acefd047d9e5cd7
diff --git a/metadata/md5-cache/net-libs/libbtbb-2018.08.1 b/metadata/md5-cache/net-libs/libbtbb-2018.08.1
index 66e384f3ced7..f2c62e726929 100644
--- a/metadata/md5-cache/net-libs/libbtbb-2018.08.1
+++ b/metadata/md5-cache/net-libs/libbtbb-2018.08.1
@@ -10,5 +10,5 @@ RDEPEND=extras? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >
 REQUIRED_USE=extras? ( python_targets_python2_7 )
 SLOT=0/2018.08.1
 SRC_URI=https://github.com/greatscottgadgets/libbtbb/archive/2018-08-R1.tar.gz -> libbtbb-2018-08-R1.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ef1f971c97501338b6a2d9dc48f9ad27
diff --git a/metadata/md5-cache/net-libs/libbtbb-9999 b/metadata/md5-cache/net-libs/libbtbb-9999
index 77c63ffeaf14..00d490c0807c 100644
--- a/metadata/md5-cache/net-libs/libbtbb-9999
+++ b/metadata/md5-cache/net-libs/libbtbb-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=extras? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) wireshark-plugins? ( >=net-analyzer/wireshark-1.8.3-r1:= )
 REQUIRED_USE=extras? ( python_targets_python2_7 )
 SLOT=0/9999
-_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2591885add6dff9c7acefd047d9e5cd7
diff --git a/metadata/md5-cache/net-libs/libcork-0.15.0 b/metadata/md5-cache/net-libs/libcork-0.15.0
index 6a5ba05d2e2d..134c67871dae 100644
--- a/metadata/md5-cache/net-libs/libcork-0.15.0
+++ b/metadata/md5-cache/net-libs/libcork-0.15.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/check
 SLOT=0
 SRC_URI=https://github.com/dcreager/libcork/archive/0.15.0.tar.gz -> libcork-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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=cc12205b25cd111f4c0cc4fd09322ed5
diff --git a/metadata/md5-cache/net-libs/libcorkipset-1.1.1.20150311_p8 b/metadata/md5-cache/net-libs/libcorkipset-1.1.1.20150311_p8
index e8f23063f03f..ff69bb724e97 100644
--- a/metadata/md5-cache/net-libs/libcorkipset-1.1.1.20150311_p8
+++ b/metadata/md5-cache/net-libs/libcorkipset-1.1.1.20150311_p8
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=net-libs/libcork
 SLOT=0
 SRC_URI=https://github.com/rogers0/libcorkipset/archive/debian/1.1.1+20150311-8.tar.gz -> libcorkipset-1.1.1.20150311_p8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=39198e698a807cd7e445cdefaec4e2e4
diff --git a/metadata/md5-cache/net-libs/libdmapsharing-2.9.39 b/metadata/md5-cache/net-libs/libdmapsharing-2.9.39
index 8fcad33ba55f..4f1d1e6140fc 100644
--- a/metadata/md5-cache/net-libs/libdmapsharing-2.9.39
+++ b/metadata/md5-cache/net-libs/libdmapsharing-2.9.39
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.36:2 x11-libs/gdk-pixbuf:2 >=net-dns/avahi-0.6[dbus] >=net-libs/libsoup-2.48.0:2.4 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-1.30:= ) dev-util/gtk-doc-am virtual/pkgconfig test? ( >=dev-libs/check-0.9.4 ) >=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.36:2 x11-libs/gdk-pixbuf:2 >=net-dns/avahi-0.6[dbus] >=net-libs/libsoup-2.48.0:2.4 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-1.30:= ) dev-util/glib-utils dev-util/gtk-doc-am virtual/pkgconfig test? ( >=dev-libs/check-0.9.4 ) >=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 library that implements the DMAP family of protocols
 EAPI=6
 HOMEPAGE=https://www.flyn.org/projects/libdmapsharing/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.36:2 x11-libs/gdk-pixbuf:2 >=net-dns/avahi-0.6[dbus] >=net-libs/libsoup-2.48.0:2.4 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-1.30:= )
 SLOT=3.0/2
 SRC_URI=https://www.flyn.org/projects/libdmapsharing/libdmapsharing-2.9.39.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=e2730e1947a99f65b9dd3563bd1c3723
+_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_=35d855b02642559babc6f94e60ddbd8a
diff --git a/metadata/md5-cache/net-libs/libgcal-0.9.6-r1 b/metadata/md5-cache/net-libs/libgcal-0.9.6-r1
index dc163cab1ea2..a883caa28d8b 100644
--- a/metadata/md5-cache/net-libs/libgcal-0.9.6-r1
+++ b/metadata/md5-cache/net-libs/libgcal-0.9.6-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libxml2:2 >=net-misc/curl-7.18.2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://libgcal.googlecode.com/files/libgcal-0.9.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0202e2d19452bb1289e73630368d0998
diff --git a/metadata/md5-cache/net-libs/libgfbgraph-0.2.3-r1 b/metadata/md5-cache/net-libs/libgfbgraph-0.2.3-r1
index cb790ac4f602..311966beffaa 100644
--- a/metadata/md5-cache/net-libs/libgfbgraph-0.2.3-r1
+++ b/metadata/md5-cache/net-libs/libgfbgraph-0.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/json-glib[introspection?] net-libs/libsoup:2.4[
 RESTRICT=test
 SLOT=0.2
 SRC_URI=mirror://gnome/sources/gfbgraph/0.2/gfbgraph-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5bc2bd1e6345468f854d886612d47b86
diff --git a/metadata/md5-cache/net-libs/libgmail-0.1.11-r1 b/metadata/md5-cache/net-libs/libgmail-0.1.11-r1
index 81c5add0eea4..0ae3332c62a7 100644
--- a/metadata/md5-cache/net-libs/libgmail-0.1.11-r1
+++ b/metadata/md5-cache/net-libs/libgmail-0.1.11-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/clientcookie[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://sourceforge/libgmail/libgmail-0.1.11.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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=185ffab74b381296f3e2a697a75bd35e
diff --git a/metadata/md5-cache/net-libs/libgrss-0.5.0-r1 b/metadata/md5-cache/net-libs/libgrss-0.5.0-r1
index 8af79cd200cb..dcc2471d5576 100644
--- a/metadata/md5-cache/net-libs/libgrss-0.5.0-r1
+++ b/metadata/md5-cache/net-libs/libgrss-0.5.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=dev-libs/glib-2.30.2:2 >=dev-libs/libxml2-2.7.8:2 >=net-libs/libsoup-2.36.1:2.4
 SLOT=0.5
 SRC_URI=http://gtk.mplat.es/libgrss/tarballs/libgrss-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=252afc909c9e9d4f5fb02fc5bc30a6f3
diff --git a/metadata/md5-cache/net-libs/libgrss-0.7.0 b/metadata/md5-cache/net-libs/libgrss-0.7.0
index db8dd6ab5ee1..fcf46dc63405 100644
--- a/metadata/md5-cache/net-libs/libgrss-0.7.0
+++ b/metadata/md5-cache/net-libs/libgrss-0.7.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=dev-libs/glib-2.42.1:2 >=dev-libs/libxml2-2.9.2:2 >=net-libs/libsoup-2.48:2.4 introspection? ( >=dev-libs/gobject-introspection-1.42 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgrss/0.7/libgrss-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2abed46792fb947c1700b2d79cc8ada0
diff --git a/metadata/md5-cache/net-libs/libhackrf-2017.02.1 b/metadata/md5-cache/net-libs/libhackrf-2017.02.1
index c7bdaaac47c6..b6c76e0b1959 100644
--- a/metadata/md5-cache/net-libs/libhackrf-2017.02.1
+++ b/metadata/md5-cache/net-libs/libhackrf-2017.02.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=virtual/libusb:1
 SLOT=0/2017.02.1
 SRC_URI=https://github.com/mossmann/hackrf/releases/download/v2017.02.1/hackrf-2017.02.1.tar.xz
-_eclasses_=cmake-utils	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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2cbe8a981009a8aab72a90ecde4ff531
diff --git a/metadata/md5-cache/net-libs/libhackrf-2018.01.1 b/metadata/md5-cache/net-libs/libhackrf-2018.01.1
index 583171c67730..035c80c75f77 100644
--- a/metadata/md5-cache/net-libs/libhackrf-2018.01.1
+++ b/metadata/md5-cache/net-libs/libhackrf-2018.01.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=virtual/libusb:1
 SLOT=0/2018.01.1
 SRC_URI=https://github.com/mossmann/hackrf/releases/download/v2018.01.1/hackrf-2018.01.1.tar.xz
-_eclasses_=cmake-utils	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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0d064fc08311dab033e7bcea2445bef9
diff --git a/metadata/md5-cache/net-libs/libhackrf-9999 b/metadata/md5-cache/net-libs/libhackrf-9999
index 560cbde48274..5bd00c9672f1 100644
--- a/metadata/md5-cache/net-libs/libhackrf-9999
+++ b/metadata/md5-cache/net-libs/libhackrf-9999
@@ -7,5 +7,5 @@ IUSE=+udev
 LICENSE=BSD
 RDEPEND=virtual/libusb:1
 SLOT=0/9999
-_eclasses_=cmake-utils	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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2cbe8a981009a8aab72a90ecde4ff531
diff --git a/metadata/md5-cache/net-libs/libiio-0.15-r1 b/metadata/md5-cache/net-libs/libiio-0.15-r1
index c362f7e6a5bb..63773accb78b 100644
--- a/metadata/md5-cache/net-libs/libiio-0.15-r1
+++ b/metadata/md5-cache/net-libs/libiio-0.15-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libxml2:= virtual/libusb:1= aio? ( dev-libs/libaio ) avahi? ( net-dns/avahi )
 SLOT=0/0.15
 SRC_URI=https://github.com/analogdevicesinc/libiio/archive/v0.15.tar.gz -> libiio-0.15.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5ae092314e87999c2ee80648c0575359
diff --git a/metadata/md5-cache/net-libs/libiio-9999 b/metadata/md5-cache/net-libs/libiio-9999
index d30685ea432e..553da4476d0c 100644
--- a/metadata/md5-cache/net-libs/libiio-9999
+++ b/metadata/md5-cache/net-libs/libiio-9999
@@ -7,5 +7,5 @@ IUSE=+aio +avahi
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libxml2:= virtual/libusb:1= aio? ( dev-libs/libaio ) avahi? ( net-dns/avahi )
 SLOT=0/9999
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5ae092314e87999c2ee80648c0575359
diff --git a/metadata/md5-cache/net-libs/libktorrent-2.1-r1 b/metadata/md5-cache/net-libs/libktorrent-2.1-r1
index 3d0610d5bf4d..8c84944a6981 100644
--- a/metadata/md5-cache/net-libs/libktorrent-2.1-r1
+++ b/metadata/md5-cache/net-libs/libktorrent-2.1-r1
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 f9f67b340804..1a99454de789 100644
--- a/metadata/md5-cache/net-libs/libkvkontakte-5.0.0
+++ b/metadata/md5-cache/net-libs/libkvkontakte-5.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdewebkit-5.46.0:
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 a5c76a7a337d..c0bc037c7286 100644
--- a/metadata/md5-cache/net-libs/libmediawiki-5.37.0
+++ b/metadata/md5-cache/net-libs/libmediawiki-5.37.0
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/libmirisdr-9999 b/metadata/md5-cache/net-libs/libmirisdr-9999
index ab15a2563d79..51d06fe6081d 100644
--- a/metadata/md5-cache/net-libs/libmirisdr-9999
+++ b/metadata/md5-cache/net-libs/libmirisdr-9999
@@ -7,5 +7,5 @@ IUSE=doc static-libs
 LICENSE=GPL-2
 RDEPEND=virtual/libusb:1
 SLOT=0/9999
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c6ca18b2d0aaf93c336985063651adc6
diff --git a/metadata/md5-cache/net-libs/libndp-1.6-r1 b/metadata/md5-cache/net-libs/libndp-1.6-r1
index 165bad1e6c7b..245b7762eb00 100644
--- a/metadata/md5-cache/net-libs/libndp-1.6-r1
+++ b/metadata/md5-cache/net-libs/libndp-1.6-r1
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://libndp.org/files/libndp-1.6.tar.gz
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a9c6873957ed69c2811bc1035a47c0df
diff --git a/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.2 b/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.2
index 15b89b95e008..d62a22f5ad62 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.2
+++ b/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=net-libs/libmnl
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_acct/files/libnetfilter_acct-1.0.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f05a24dc393d984000d6716a4005781f
diff --git a/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.3 b/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.3
index 8b8cd80b666f..813459438eb6 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.3
+++ b/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=net-libs/libmnl
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_acct/files/libnetfilter_acct-1.0.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1f4adc32f531db22e687d0c2b0efb452
diff --git a/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.4 b/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.4
index 972c16610e0f..45880154789c 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.4
+++ b/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnfnetlink-1.0.0
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.4.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a1bbbdecbe1596bb10c29ae94b244ab0
diff --git a/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.5 b/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.5
index d8df10c3545b..7798cd9efbb4 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.5
+++ b/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnfnetlink-1.0.0
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.5.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4ef4c3101de978f8b9671dd7deb56fd5
diff --git a/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.6 b/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.6
index 56427a45b8d0..6233d0a4a014 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.6
+++ b/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnfnetlink-1.0.0
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.6.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=32ffe8ee928a9e6d197329f5156948ba
diff --git a/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.7 b/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.7
index e9dd06849787..8e2b13af39a3 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.7
+++ b/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnfnetlink-1.0.0
 SLOT=0
 SRC_URI=http://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.7.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=474bb166b99c73afa92389c10b09dced
diff --git a/metadata/md5-cache/net-libs/libnetfilter_cthelper-1.0.0 b/metadata/md5-cache/net-libs/libnetfilter_cthelper-1.0.0
index a538c7074227..ffe94f0f659e 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_cthelper-1.0.0
+++ b/metadata/md5-cache/net-libs/libnetfilter_cthelper-1.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libmnl
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_cthelper/files/libnetfilter_cthelper-1.0.0.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b4a7c244408bc684e1c1eb6b63f0818b
diff --git a/metadata/md5-cache/net-libs/libnetfilter_cthelper-1.0.0-r1 b/metadata/md5-cache/net-libs/libnetfilter_cthelper-1.0.0-r1
index 961e80985156..381bcf0fed90 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_cthelper-1.0.0-r1
+++ b/metadata/md5-cache/net-libs/libnetfilter_cthelper-1.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libmnl:=
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_cthelper/files/libnetfilter_cthelper-1.0.0.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=33556df2686e86bd01b971a9269124d9
diff --git a/metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.0 b/metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.0
index 6da49802bbd2..971105115dad 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.0
+++ b/metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libmnl
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_cttimeout/files/libnetfilter_cttimeout-1.0.0.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d0a687240b385f054264d860312f3fb4
diff --git a/metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.0-r1 b/metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.0-r1
index 900ea2703b5c..a79363f64acc 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.0-r1
+++ b/metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libmnl:=
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_cttimeout/files/libnetfilter_cttimeout-1.0.0.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=43dad9137daf5b7455aee11894defeca
diff --git a/metadata/md5-cache/net-libs/libnetfilter_log-1.0.1 b/metadata/md5-cache/net-libs/libnetfilter_log-1.0.1
index 1e2b1e717e74..a939c27f3553 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_log-1.0.1
+++ b/metadata/md5-cache/net-libs/libnetfilter_log-1.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libnfnetlink-1.0.0
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_log/files/libnetfilter_log-1.0.1.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1fc63d6b56d5d477b7bac8ce2e3abdbf
diff --git a/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.2 b/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.2
index c976c93bdbb7..39cc0497802c 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.2
+++ b/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnfnetlink-0.0.41
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_queue/files/libnetfilter_queue-1.0.2.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2274d33e3c6651260223180fccf83fc0
diff --git a/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.3 b/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.3
index cae731f620e5..c8586891fe5c 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.3
+++ b/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnfnetlink-0.0.41
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_queue/files/libnetfilter_queue-1.0.3.tar.bz2
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=55f89645ec278a5feef02cdc1f5a542a
diff --git a/metadata/md5-cache/net-libs/libnfnetlink-1.0.1 b/metadata/md5-cache/net-libs/libnfnetlink-1.0.1
index 5d59311315a5..19db31fe5e44 100644
--- a/metadata/md5-cache/net-libs/libnfnetlink-1.0.1
+++ b/metadata/md5-cache/net-libs/libnfnetlink-1.0.1
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.netfilter.org/projects/libnfnetlink/files/libnfnetlink-1.0.1.tar.bz2 https://git.alpinelinux.org/cgit/aports/plain/main/libnfnetlink/musl-fix-includes.patch -> 04aef8a4dedf267dd5744afb134ef8046e77f613-musl-fix-includes.patch
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1c877683026b02bdfc22642be3d90d4d
diff --git a/metadata/md5-cache/net-libs/libnftnl-1.0.8-r1 b/metadata/md5-cache/net-libs/libnftnl-1.0.8-r1
index c45284e86af9..8ef81e7ad466 100644
--- a/metadata/md5-cache/net-libs/libnftnl-1.0.8-r1
+++ b/metadata/md5-cache/net-libs/libnftnl-1.0.8-r1
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/libmnl-1.0.0 json? ( >=dev-libs/jansson-2.3 )
 REQUIRED_USE=test? ( json )
 SLOT=0/7
 SRC_URI=https://netfilter.org/projects/libnftnl/files/libnftnl-1.0.8.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=d77dbad1e3b0244e4b89c9b6709298dc
diff --git a/metadata/md5-cache/net-libs/libnftnl-1.1.0 b/metadata/md5-cache/net-libs/libnftnl-1.1.0
index 80afcefd1d36..04554b4ec2a3 100644
--- a/metadata/md5-cache/net-libs/libnftnl-1.1.0
+++ b/metadata/md5-cache/net-libs/libnftnl-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/libmnl-1.0.0 json? ( >=dev-libs/jansson-2.3 )
 REQUIRED_USE=test? ( json )
 SLOT=0/7
 SRC_URI=https://netfilter.org/projects/libnftnl/files/libnftnl-1.1.0.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=8574608d6106419c10fff90e8e07531c
diff --git a/metadata/md5-cache/net-libs/libnftnl-1.1.1 b/metadata/md5-cache/net-libs/libnftnl-1.1.1
index 73d69c7f8f48..c7f2462e55fe 100644
--- a/metadata/md5-cache/net-libs/libnftnl-1.1.1
+++ b/metadata/md5-cache/net-libs/libnftnl-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/libmnl-1.0.3 json? ( >=dev-libs/jansson-2.3 )
 REQUIRED_USE=test? ( json )
 SLOT=0/7
 SRC_URI=https://netfilter.org/projects/libnftnl/files/libnftnl-1.1.1.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=190736e8db2c747ed5d9d37e89b52f38
diff --git a/metadata/md5-cache/net-libs/libnftnl-1.1.1-r1 b/metadata/md5-cache/net-libs/libnftnl-1.1.1-r1
index 4970d0dde370..91be20e9a056 100644
--- a/metadata/md5-cache/net-libs/libnftnl-1.1.1-r1
+++ b/metadata/md5-cache/net-libs/libnftnl-1.1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/libmnl-1.0.3 json? ( >=dev-libs/jansson-2.3 )
 REQUIRED_USE=test? ( json )
 SLOT=0/7
 SRC_URI=https://netfilter.org/projects/libnftnl/files/libnftnl-1.1.1.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=4b650914f6250b085631d789cb0e8480
diff --git a/metadata/md5-cache/net-libs/libnice-0.1.13 b/metadata/md5-cache/net-libs/libnice-0.1.13
index f9b1974dc0ad..15dea2d52960 100644
--- a/metadata/md5-cache/net-libs/libnice-0.1.13
+++ b/metadata/md5-cache/net-libs/libnice-0.1.13
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 RESTRICT=test
 SLOT=0
 SRC_URI=https://nice.freedesktop.org/releases/libnice-0.1.13.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0570e6bd92e2af155bd137b67e3d3c9c
diff --git a/metadata/md5-cache/net-libs/libnipper-0.12.6-r1 b/metadata/md5-cache/net-libs/libnipper-0.12.6-r1
index d6d83a59a5d9..4b115d052b03 100644
--- a/metadata/md5-cache/net-libs/libnipper-0.12.6-r1
+++ b/metadata/md5-cache/net-libs/libnipper-0.12.6-r1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://sourceforge/nipper/libnipper-0.12.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d05964bd014c66e33ce16f49ff824e56
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 ae21bfa2099a..95a7b4c58cd1 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _md5_=bcfa9fe83ba967eb06cc80b731650127
diff --git a/metadata/md5-cache/net-libs/librsync-2.0.1-r1 b/metadata/md5-cache/net-libs/librsync-2.0.1-r1
index c4bfb50eba38..17d09dc4087a 100644
--- a/metadata/md5-cache/net-libs/librsync-2.0.1-r1
+++ b/metadata/md5-cache/net-libs/librsync-2.0.1-r1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/popt
 SLOT=0/2
 SRC_URI=https://github.com/librsync/librsync/archive/v2.0.1.tar.gz -> librsync-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b47f1f3dba735868bae11c0d941ee4f2
diff --git a/metadata/md5-cache/net-libs/librsync-2.0.2 b/metadata/md5-cache/net-libs/librsync-2.0.2
index 40761314aa46..da0c776c4799 100644
--- a/metadata/md5-cache/net-libs/librsync-2.0.2
+++ b/metadata/md5-cache/net-libs/librsync-2.0.2
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/popt
 SLOT=0/2
 SRC_URI=https://github.com/librsync/librsync/archive/v2.0.2.tar.gz -> librsync-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7ece7b341ce2a4e3f4a7571ca92fc405
diff --git a/metadata/md5-cache/net-libs/libsignon-glib-1.14 b/metadata/md5-cache/net-libs/libsignon-glib-1.14
index ad030bae4930..012cb941a8ca 100644
--- a/metadata/md5-cache/net-libs/libsignon-glib-1.14
+++ b/metadata/md5-cache/net-libs/libsignon-glib-1.14
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 py
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/net-libs/libsoup-2.56.1 b/metadata/md5-cache/net-libs/libsoup-2.56.1
index cd3d77f37f34..60cb8739341b 100644
--- a/metadata/md5-cache/net-libs/libsoup-2.56.1
+++ b/metadata/md5-cache/net-libs/libsoup-2.56.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=vala? ( introspection )
 SLOT=2.4
 SRC_URI=mirror://gnome/sources/libsoup/2.56/libsoup-2.56.1.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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8410a85854170165b80e5a4a66cd73fd
diff --git a/metadata/md5-cache/net-libs/libsoup-2.58.2 b/metadata/md5-cache/net-libs/libsoup-2.58.2
index 8c7937104182..91652a9dbbfc 100644
--- a/metadata/md5-cache/net-libs/libsoup-2.58.2
+++ b/metadata/md5-cache/net-libs/libsoup-2.58.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=vala? ( introspection )
 SLOT=2.4
 SRC_URI=mirror://gnome/sources/libsoup/2.58/libsoup-2.58.2.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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6191fb3a48b0bbf375943b4011850c67
diff --git a/metadata/md5-cache/net-libs/libssh-0.7.4 b/metadata/md5-cache/net-libs/libssh-0.7.4
index 6eedd2255eec..1b767cf2ca08 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=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 ce393e7301f3..f33f950aa226 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8f8c7ed3810bc789b8fa1dd98957c977
diff --git a/metadata/md5-cache/net-libs/libssh-0.8.2 b/metadata/md5-cache/net-libs/libssh-0.8.2
index 1ddf467f8927..f37f5bb052e5 100644
--- a/metadata/md5-cache/net-libs/libssh-0.8.2
+++ b/metadata/md5-cache/net-libs/libssh-0.8.2
@@ -10,5 +10,5 @@ RDEPEND=!gcrypt? ( !mbedtls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
index baf50b210ad3..5e4ad4611d58 100644
--- a/metadata/md5-cache/net-libs/libssh-0.8.3
+++ b/metadata/md5-cache/net-libs/libssh-0.8.3
@@ -10,5 +10,5 @@ RDEPEND=!gcrypt? ( !mbedtls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
new file mode 100644
index 000000000000..b12eb4c3c1b5
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libssh-0.8.3-r1
@@ -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.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-9999 b/metadata/md5-cache/net-libs/libssh-9999
index fac961a2735d..a35396f49410 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=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
new file mode 100644
index 000000000000..b73374749957
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libssh2-1.8.0-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!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(-)?] ) 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(-)?] ) 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(-)?] ) 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(-)?] ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Library implementing the SSH2 protocol
+EAPI=6
+HOMEPAGE=https://www.libssh2.org
+IUSE=gcrypt libressl mbedtls zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+LICENSE=BSD
+RDEPEND=!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(-)?] ) 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(-)?] ) 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(-)?] ) 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 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
diff --git a/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.1.10 b/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.1.10
new file mode 100644
index 000000000000..12b0a1c1a9fa
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.1.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=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:= ) ) sys-devel/libtool
+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
+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_10/libtorrent-rasterbar-1.1.10.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_=5f17fe611d1323a943681cd6ad5b2385
diff --git a/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.1.5-r1 b/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.1.5-r1
index 83774dc04713..092d69611653 100644
--- a/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.1.5-r1
+++ b/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.1.5-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] virtual/libiconv examples? ( !net-p2p/mldonkey
 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_5/libtorrent-rasterbar-1.1.5.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c348ee0ec4f466b2c8b3821b9f311235
diff --git a/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.1.7 b/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.1.7
deleted file mode 100644
index 043a750ef15b..000000000000
--- a/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.1.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=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:= ) ) sys-devel/libtool
-DESCRIPTION=C++ BitTorrent implementation focusing on efficiency and scalability
-EAPI=6
-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
-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_7/libtorrent-rasterbar-1.1.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=6dfe51227c08b86a1287815e213abacc
diff --git a/metadata/md5-cache/net-libs/libwebsockets-1.7.9 b/metadata/md5-cache/net-libs/libwebsockets-1.7.9
index 41142d66eb94..bfab28f41c41 100644
--- a/metadata/md5-cache/net-libs/libwebsockets-1.7.9
+++ b/metadata/md5-cache/net-libs/libwebsockets-1.7.9
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib libev? ( dev-libs/libev ) libuv? ( dev-libs/libuv ) ssl? (
 REQUIRED_USE=libressl? ( ssl )
 SLOT=0
 SRC_URI=https://github.com/warmcat/libwebsockets/archive/v1.7.9.tar.gz -> libwebsockets-1.7.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=47eed3d7194cd6f30d56e7e6a9944bf1
diff --git a/metadata/md5-cache/net-libs/libwebsockets-2.0.2 b/metadata/md5-cache/net-libs/libwebsockets-2.0.2
index d56f228f2e74..3bd6fdc4485e 100644
--- a/metadata/md5-cache/net-libs/libwebsockets-2.0.2
+++ b/metadata/md5-cache/net-libs/libwebsockets-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib libev? ( dev-libs/libev ) libuv? ( dev-libs/libuv ) ssl? (
 REQUIRED_USE=libressl? ( ssl )
 SLOT=0
 SRC_URI=https://github.com/warmcat/libwebsockets/archive/v2.0.2.tar.gz -> libwebsockets-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c9177122fd7492439414d107ec7bb1e4
diff --git a/metadata/md5-cache/net-libs/libwebsockets-2.1.1 b/metadata/md5-cache/net-libs/libwebsockets-2.1.1
index ec0452a36813..7d4bec552d8b 100644
--- a/metadata/md5-cache/net-libs/libwebsockets-2.1.1
+++ b/metadata/md5-cache/net-libs/libwebsockets-2.1.1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib http-proxy? ( net-libs/libhubbub ) libev? ( dev-libs/libev
 REQUIRED_USE=libressl? ( ssl ) http-proxy? ( client ) generic-sessions? ( sqlite3 ) generic-sessions? ( smtp ) smtp? ( libuv )
 SLOT=0/2.1.1
 SRC_URI=https://github.com/warmcat/libwebsockets/archive/v2.1.1.tar.gz -> libwebsockets-2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8ca258357e35d3dff50b66ea184acf58
diff --git a/metadata/md5-cache/net-libs/libwebsockets-2.4.2 b/metadata/md5-cache/net-libs/libwebsockets-2.4.2
index 5a459f12d5d2..6da21ac00d3d 100644
--- a/metadata/md5-cache/net-libs/libwebsockets-2.4.2
+++ b/metadata/md5-cache/net-libs/libwebsockets-2.4.2
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib http-proxy? ( net-libs/libhubbub ) caps? ( sys-libs/libcap
 REQUIRED_USE=libressl? ( ssl ) http-proxy? ( client ) generic-sessions? ( sqlite3 ) generic-sessions? ( smtp ) smtp? ( libuv )
 SLOT=0/2.4.2
 SRC_URI=https://github.com/warmcat/libwebsockets/archive/v2.4.2.tar.gz -> libwebsockets-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=a2aa7c9c6a7a9f0ea04c5632079428fd
diff --git a/metadata/md5-cache/net-libs/libzapojit-0.0.3 b/metadata/md5-cache/net-libs/libzapojit-0.0.3
index edcdcdfb850d..093ccbe87fd4 100644
--- a/metadata/md5-cache/net-libs/libzapojit-0.0.3
+++ b/metadata/md5-cache/net-libs/libzapojit-0.0.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.28:2 >=net-libs/libsoup-2.38:2.4 dev-libs/json-glib net-libs/rest net-libs/gnome-online-accounts introspection? ( >=dev-libs/gobject-introspection-1.30.0 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libzapojit/0.0/libzapojit-0.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0fe0ad85dcc8a9cdb223941872dfac5b
diff --git a/metadata/md5-cache/net-libs/mbedtls-2.10.0 b/metadata/md5-cache/net-libs/mbedtls-2.10.0
index e1df5b8a265d..72069eff8681 100644
--- a/metadata/md5-cache/net-libs/mbedtls-2.10.0
+++ b/metadata/md5-cache/net-libs/mbedtls-2.10.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=programs? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/10
 SRC_URI=https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b76054b2fd0ccb2f512168705db360d3
diff --git a/metadata/md5-cache/net-libs/mbedtls-2.11.0 b/metadata/md5-cache/net-libs/mbedtls-2.11.0
deleted file mode 100644
index c73b68578984..000000000000
--- a/metadata/md5-cache/net-libs/mbedtls-2.11.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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(-)?] ) doc? ( app-doc/doxygen media-gfx/graphviz ) test? ( dev-lang/perl ) sys-devel/make >=dev-util/cmake-3.9.6
-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
-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.11.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=b49ec34cd9ac8cb7e1077e0f56e9045c
diff --git a/metadata/md5-cache/net-libs/mbedtls-2.12.0 b/metadata/md5-cache/net-libs/mbedtls-2.12.0
index 08473b9350de..ebf207622aa3 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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=b49ec34cd9ac8cb7e1077e0f56e9045c
+_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
diff --git a/metadata/md5-cache/net-libs/mbedtls-2.13.1 b/metadata/md5-cache/net-libs/mbedtls-2.13.1
new file mode 100644
index 000000000000..741e578391cf
--- /dev/null
+++ b/metadata/md5-cache/net-libs/mbedtls-2.13.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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(-)?] ) doc? ( app-doc/doxygen media-gfx/graphviz ) test? ( dev-lang/perl ) sys-devel/make >=dev-util/cmake-3.9.6
+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
+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/12
+SRC_URI=https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.13.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	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=cedf9daf07af3ed61b65f36c35c435d9
diff --git a/metadata/md5-cache/net-libs/mbedtls-2.7.2 b/metadata/md5-cache/net-libs/mbedtls-2.7.2
deleted file mode 100644
index cbc9f7fb981e..000000000000
--- a/metadata/md5-cache/net-libs/mbedtls-2.7.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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(-)?] ) doc? ( app-doc/doxygen media-gfx/graphviz ) test? ( dev-lang/perl ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Cryptographic library for embedded systems
-EAPI=6
-HOMEPAGE=https://tls.mbed.org/
-IUSE=cpu_flags_x86_sse2 doc havege libressl programs test threads zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=Apache-2.0
-RDEPEND=programs? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0/10
-SRC_URI=https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.7.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	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=d0464ab236ed8b50c7de8698a351f1fa
diff --git a/metadata/md5-cache/net-libs/nfqueue-bindings-0.5 b/metadata/md5-cache/net-libs/nfqueue-bindings-0.5
index 8626de1e0441..e85e06dac025 100644
--- a/metadata/md5-cache/net-libs/nfqueue-bindings-0.5
+++ b/metadata/md5-cache/net-libs/nfqueue-bindings-0.5
@@ -10,5 +10,5 @@ RDEPEND=python? ( dev-python/dpkt[python_targets_python2_7(-)?,-python_single_ta
 REQUIRED_USE=|| ( perl python ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/chifflier/nfqueue-bindings/archive/nfqueue-bindings-0.5.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=94d8f98b71f002e62fc0ad62829dd63d
diff --git a/metadata/md5-cache/net-libs/nfqueue-bindings-0.6 b/metadata/md5-cache/net-libs/nfqueue-bindings-0.6
index 46a9f5a735f6..6ec657c97111 100644
--- a/metadata/md5-cache/net-libs/nfqueue-bindings-0.6
+++ b/metadata/md5-cache/net-libs/nfqueue-bindings-0.6
@@ -10,5 +10,5 @@ RDEPEND=python? ( dev-python/dpkt[python_targets_python2_7(-)?,-python_single_ta
 REQUIRED_USE=|| ( perl python ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/chifflier/nfqueue-bindings/archive/v0.6.tar.gz -> nfqueue-bindings-0.6.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ed0b00c5ccb5d0709bf32d014e63156f
diff --git a/metadata/md5-cache/net-libs/ntirpc-1.6.1 b/metadata/md5-cache/net-libs/ntirpc-1.6.1
index ee81e3e99e10..43d6ae74b740 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c11a24b8338c1511a555f981d8672069
diff --git a/metadata/md5-cache/net-libs/ntirpc-1.7.0 b/metadata/md5-cache/net-libs/ntirpc-1.7.0
index d34ce4a1a55d..37c66b9d1a36 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cef6ec10d329cd207ca41035177278dc
diff --git a/metadata/md5-cache/net-libs/onion-0.8 b/metadata/md5-cache/net-libs/onion-0.8
index db100d8a1489..16eb1ea64924 100644
--- a/metadata/md5-cache/net-libs/onion-0.8
+++ b/metadata/md5-cache/net-libs/onion-0.8
@@ -10,5 +10,5 @@ RDEPEND=gnutls? ( net-libs/gnutls dev-libs/libgcrypt:0= ) pam? ( virtual/pam ) p
 REQUIRED_USE=test? ( examples )
 SLOT=0
 SRC_URI=https://github.com/davidmoreno/onion/archive/v0.8.tar.gz -> onion-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9cc6af95b2fb601edd373ab2216ca19c
diff --git a/metadata/md5-cache/net-libs/onion-9999 b/metadata/md5-cache/net-libs/onion-9999
index 725a68dbbf20..ee00a832232f 100644
--- a/metadata/md5-cache/net-libs/onion-9999
+++ b/metadata/md5-cache/net-libs/onion-9999
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2+ Apache-2.0 ) AGPL-3
 RDEPEND=gnutls? ( net-libs/gnutls dev-libs/libgcrypt:0= ) pam? ( virtual/pam ) png? ( media-libs/libpng:0= x11-libs/cairo ) jpeg? ( virtual/jpeg:0 ) xml? ( dev-libs/libxml2:2 sys-libs/zlib ) systemd? ( sys-apps/systemd ) sqlite? ( dev-db/sqlite:3 ) boehm-gc? ( dev-libs/boehm-gc ) libev? ( dev-libs/libev ) !libev? ( libevent? ( dev-libs/libevent ) ) redis? ( dev-libs/hiredis )
 REQUIRED_USE=test? ( examples )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3ace1db667dae86958d7b035b3883bae
diff --git a/metadata/md5-cache/net-libs/phodav-2.2 b/metadata/md5-cache/net-libs/phodav-2.2
index 4559a5fa1137..751a6f3a3fa2 100644
--- a/metadata/md5-cache/net-libs/phodav-2.2
+++ b/metadata/md5-cache/net-libs/phodav-2.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.51:2 >=net-libs/libsoup-2.48:2.4 dev-libs/libxml2 zeroconf? ( net-dns/avahi )
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/phodav/2.2/phodav-2.2.tar.xz
-_eclasses_=desktop	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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a3bbb5b81632a57c6992221b45d8791a
diff --git a/metadata/md5-cache/net-libs/pjproject-2.7.1 b/metadata/md5-cache/net-libs/pjproject-2.7.1
index 2456ed3a3ae7..7b9891ffa8c4 100644
--- a/metadata/md5-cache/net-libs/pjproject-2.7.1
+++ b/metadata/md5-cache/net-libs/pjproject-2.7.1
@@ -4,11 +4,11 @@ DESCRIPTION=Open source SIP, Media, and NAT Traversal Library
 EAPI=6
 HOMEPAGE=http://www.pjsip.org/
 IUSE=amr debug doc epoll examples ipv6 opus resample silk ssl static-libs webrtc g711 g722 g7221 gsm ilbc speex l16 sdl ffmpeg v4l2 openh264 libyuv alsa oss portaudio
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=alsa? ( media-libs/alsa-lib ) oss? ( media-libs/portaudio[oss] ) portaudio? ( media-libs/portaudio ) amr? ( media-libs/opencore-amr ) gsm? ( media-sound/gsm ) ilbc? ( dev-libs/ilbc-rfc3951 ) opus? ( media-libs/opus ) speex? ( media-libs/speexdsp ) ffmpeg? ( virtual/ffmpeg:= ) sdl? ( media-libs/libsdl ) openh264? ( media-libs/openh264 ) resample? ( media-libs/libsamplerate ) ssl? ( dev-libs/openssl:= ) net-libs/libsrtp:0
 REQUIRED_USE=?? ( alsa oss portaudio )
 SLOT=0
 SRC_URI=http://www.pjsip.org/release/2.7.1/pjproject-2.7.1.tar.bz2
 _eclasses_=autotools	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_=4cde7399161c5d3e9686db6f25d67582
+_md5_=8495f40cacbad5d056f5845f397bced7
diff --git a/metadata/md5-cache/net-libs/pjproject-2.7.2 b/metadata/md5-cache/net-libs/pjproject-2.7.2
index 180865328488..457354aa293f 100644
--- a/metadata/md5-cache/net-libs/pjproject-2.7.2
+++ b/metadata/md5-cache/net-libs/pjproject-2.7.2
@@ -4,11 +4,11 @@ DESCRIPTION=Open source SIP, Media, and NAT Traversal Library
 EAPI=6
 HOMEPAGE=http://www.pjsip.org/
 IUSE=amr debug doc epoll examples ipv6 libressl opus resample silk ssl static-libs webrtc g711 g722 g7221 gsm ilbc speex l16 sdl ffmpeg v4l2 openh264 libyuv alsa oss portaudio
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=alsa? ( media-libs/alsa-lib ) oss? ( media-libs/portaudio[oss] ) portaudio? ( media-libs/portaudio ) amr? ( media-libs/opencore-amr ) gsm? ( media-sound/gsm ) ilbc? ( dev-libs/ilbc-rfc3951 ) opus? ( media-libs/opus ) speex? ( media-libs/speexdsp ) ffmpeg? ( virtual/ffmpeg:= ) sdl? ( media-libs/libsdl ) openh264? ( media-libs/openh264 ) resample? ( media-libs/libsamplerate ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) net-libs/libsrtp:0
 REQUIRED_USE=?? ( alsa oss portaudio )
 SLOT=0
 SRC_URI=http://www.pjsip.org/release/2.7.2/pjproject-2.7.2.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_=bc8fba400bdd38d0db59589c04df0d86
+_md5_=c467b3df277f8d1a47f76d154e86b231
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 73dceb5f0e89..c2ddeb147fbd 100644
--- a/metadata/md5-cache/net-libs/rabbitmq-c-0.8.0
+++ b/metadata/md5-cache/net-libs/rabbitmq-c-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=ssl? ( libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/net-libs/rest-0.8.1 b/metadata/md5-cache/net-libs/rest-0.8.1
index b5a1f87eeee6..b89a2c313dd2 100644
--- a/metadata/md5-cache/net-libs/rest-0.8.1
+++ b/metadata/md5-cache/net-libs/rest-0.8.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-misc/ca-certificates >=dev-libs/glib-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(-)?] 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-libs/libsoup:2.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.40 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? ( 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(-)?] ) >=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=app-misc/ca-certificates >=dev-libs/glib-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(-)?] 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-libs/libsoup:2.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) dev-util/glib-utils >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.40 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? ( 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(-)?] ) >=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=Helper library for RESTful services
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Librest
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=app-misc/ca-certificates >=dev-libs/glib-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(-)?] 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-libs/libsoup:2.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
 SLOT=0.7
 SRC_URI=mirror://gnome/sources/rest/0.8/rest-0.8.1.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=555a5a31a4b3973aabc60404913b77a6
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=28e099ce38be28af3f832d0ccbcaebd9
diff --git a/metadata/md5-cache/net-libs/ripe-atlas-sagan-1.1.10 b/metadata/md5-cache/net-libs/ripe-atlas-sagan-1.1.10
index 3f9622e23c45..989035dd8e61 100644
--- a/metadata/md5-cache/net-libs/ripe-atlas-sagan-1.1.10
+++ b/metadata/md5-cache/net-libs/ripe-atlas-sagan-1.1.10
@@ -10,5 +10,5 @@ RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/r/ripe.atlas.sagan/ripe.atlas.sagan-1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2854b354fc6a74a96fb3e4c4be9e0561
diff --git a/metadata/md5-cache/net-libs/ripe-atlas-sagan-1.1.11 b/metadata/md5-cache/net-libs/ripe-atlas-sagan-1.1.11
index f6825adbec47..702a4c042229 100644
--- a/metadata/md5-cache/net-libs/ripe-atlas-sagan-1.1.11
+++ b/metadata/md5-cache/net-libs/ripe-atlas-sagan-1.1.11
@@ -10,5 +10,5 @@ RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_p
 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/ripe.atlas.sagan/ripe.atlas.sagan-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bd94e75fb6554290f7cc2792d32778be
diff --git a/metadata/md5-cache/net-libs/ripe-atlas-sagan-1.1.8 b/metadata/md5-cache/net-libs/ripe-atlas-sagan-1.1.8
index 56784996dee7..c7aec8d23fc4 100644
--- a/metadata/md5-cache/net-libs/ripe-atlas-sagan-1.1.8
+++ b/metadata/md5-cache/net-libs/ripe-atlas-sagan-1.1.8
@@ -10,5 +10,5 @@ RDEPEND=dev-python/ipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/r/ripe.atlas.sagan/ripe.atlas.sagan-1.1.8.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=28cb8e0b06673bb4c8b1d41593bbd340
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 746b1aab3c2a..455a9c1ec1d6 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=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 6c685e504700..d6b953bfcb5e 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=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 71e8eb42d30e..e9296448631f 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=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 b93b5a6850af..793805ad6127 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ba0e570800cf0bb8a55fdf9c18713345
diff --git a/metadata/md5-cache/net-libs/srt-1.2.2 b/metadata/md5-cache/net-libs/srt-1.2.2
index 0a05c970cb75..f6476d840926 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1970f2269a24d99f27442a51ea15738a
diff --git a/metadata/md5-cache/net-libs/stem-1.5.4 b/metadata/md5-cache/net-libs/stem-1.5.4
index a3713893cedb..2bf99205dc06 100644
--- a/metadata/md5-cache/net-libs/stem-1.5.4
+++ b/metadata/md5-cache/net-libs/stem-1.5.4
@@ -10,5 +10,5 @@ RDEPEND=net-vpn/tor python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/stem/stem-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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=87ab1a9d30d76c9b5f4cef76eb2d2de5
diff --git a/metadata/md5-cache/net-libs/stem-1.6.0 b/metadata/md5-cache/net-libs/stem-1.6.0
index fa050ccc5d22..63bda700fd4a 100644
--- a/metadata/md5-cache/net-libs/stem-1.6.0
+++ b/metadata/md5-cache/net-libs/stem-1.6.0
@@ -10,5 +10,5 @@ RDEPEND=net-vpn/tor python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/stem/stem-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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=87ab1a9d30d76c9b5f4cef76eb2d2de5
diff --git a/metadata/md5-cache/net-libs/telepathy-farstream-0.6.2 b/metadata/md5-cache/net-libs/telepathy-farstream-0.6.2
index f83ead418eb6..955f271e4716 100644
--- a/metadata/md5-cache/net-libs/telepathy-farstream-0.6.2
+++ b/metadata/md5-cache/net-libs/telepathy-farstream-0.6.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.32:2 >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.60 media-libs/gstreamer:1.0[introspection?] >=net-libs/telepathy-glib-0.21[introspection?] net-libs/farstream:0.2=[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.30 )
 SLOT=0/3
 SRC_URI=https://telepathy.freedesktop.org/releases/telepathy-farstream/telepathy-farstream-0.6.2.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=8331d528213df8e4bcfe3d36a08a5bfe
diff --git a/metadata/md5-cache/net-libs/telepathy-glib-0.24.1 b/metadata/md5-cache/net-libs/telepathy-glib-0.24.1
index 262d61736bc9..c731b1cbf879 100644
--- a/metadata/md5-cache/net-libs/telepathy-glib-0.24.1
+++ b/metadata/md5-cache/net-libs/telepathy-glib-0.24.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install 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(+)] >=dev-libs/glib-2.36:2 >=dev-libs/dbus-glib-0.90 introspection? ( >=dev-libs/gobject-introspection-1.30 ) dev-libs/libxslt dev-util/gtk-doc-am 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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+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-libs/glib-2.36:2 >=dev-libs/dbus-glib-0.90 introspection? ( >=dev-libs/gobject-introspection-1.30 ) dev-libs/libxslt dev-util/glib-utils dev-util/gtk-doc-am 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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=GLib bindings for the Telepathy D-Bus protocol
 EAPI=5
 HOMEPAGE=https://telepathy.freedesktop.org/
@@ -12,5 +12,5 @@ REQUIRED_USE=python_targets_python2_7 vala? ( introspection )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-0.24.1.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-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=c1ae2b2813aed6c818f1f367929bac16
+_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_=0dc284f770ea62ef5651e0a70ce60d28
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 1118f4fa3e3c..95dc669d3171 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
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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_=a0481d6515fffaa2cc909b506ef121d6
diff --git a/metadata/md5-cache/net-libs/telepathy-qt-0.9.7-r1 b/metadata/md5-cache/net-libs/telepathy-qt-0.9.7-r1
index 0f8f23ef88bb..33e6347c3ed2 100644
--- a/metadata/md5-cache/net-libs/telepathy-qt-0.9.7-r1
+++ b/metadata/md5-cache/net-libs/telepathy-qt-0.9.7-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt
 RESTRICT=test
 SLOT=0
 SRC_URI=https://telepathy.freedesktop.org/releases/telepathy-qt/telepathy-qt-0.9.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-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=ecffa3b77822d0fe37ea642c9cf601e7
diff --git a/metadata/md5-cache/net-libs/tox-0.2.5 b/metadata/md5-cache/net-libs/tox-0.2.5
index c60fb421fe1d..cfb781a921ef 100644
--- a/metadata/md5-cache/net-libs/tox-0.2.5
+++ b/metadata/md5-cache/net-libs/tox-0.2.5
@@ -10,5 +10,5 @@ RDEPEND=av? ( media-libs/libvpx:= media-libs/opus ) daemon? ( dev-libs/libconfig
 REQUIRED_USE=^^ ( no-log log-trace log-debug )
 SLOT=0/0.2
 SRC_URI=https://github.com/TokTok/c-toxcore/archive/v0.2.5.tar.gz -> c-toxcore-0.2.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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3cd24bb7c2ec6c20fe9784adb9fac974
diff --git a/metadata/md5-cache/net-libs/tox-9999 b/metadata/md5-cache/net-libs/tox-9999
index 367531e95c83..c8c310b94978 100644
--- a/metadata/md5-cache/net-libs/tox-9999
+++ b/metadata/md5-cache/net-libs/tox-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=av? ( media-libs/libvpx:= media-libs/opus ) daemon? ( dev-libs/libconfig ) >=dev-libs/libsodium-0.6.1:=[asm,urandom]
 REQUIRED_USE=^^ ( no-log log-trace log-debug )
 SLOT=0/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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4a7b2726e5be717be9b1ad3634724645
diff --git a/metadata/md5-cache/net-libs/uhttpmock-0.5.0 b/metadata/md5-cache/net-libs/uhttpmock-0.5.0
index c6e8da97ebb2..13e0456b9d05 100644
--- a/metadata/md5-cache/net-libs/uhttpmock-0.5.0
+++ b/metadata/md5-cache/net-libs/uhttpmock-0.5.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.36.0:2 >=net-libs/libsoup-2.37.91:2.4 introspection? (
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=http://tecnocode.co.uk/downloads/uhttpmock/uhttpmock-0.5.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7e299caedef468cb06bb9e5b60635f50
diff --git a/metadata/md5-cache/net-libs/uhttpmock-0.5.1 b/metadata/md5-cache/net-libs/uhttpmock-0.5.1
index 953591269625..79e0a19d4858 100644
--- a/metadata/md5-cache/net-libs/uhttpmock-0.5.1
+++ b/metadata/md5-cache/net-libs/uhttpmock-0.5.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.36.0:2 >=net-libs/libsoup-2.37.91:2.4 introspection? (
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=http://tecnocode.co.uk/downloads/uhttpmock/uhttpmock-0.5.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7e299caedef468cb06bb9e5b60635f50
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.20.4 b/metadata/md5-cache/net-libs/webkit-gtk-2.20.4
index 3229a77d7740..74f33da2b45a 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.20.4
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.20.4
@@ -11,5 +11,5 @@ REQUIRED_USE=geolocation? ( introspection ) gles2? ( egl !opengl ) introspection
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
index a2861ec9c4d2..35da07197246 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.20.5
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.20.5
@@ -11,5 +11,5 @@ REQUIRED_USE=geolocation? ( introspection ) gles2? ( egl !opengl ) introspection
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
new file mode 100644
index 000000000000..44c9e8fec2f4
--- /dev/null
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.22.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=>=x11-libs/cairo-1.10.2:=[X?] >=media-libs/fontconfig-2.8.0:1.0 >=media-libs/freetype-2.4.2:2 >=dev-libs/libgcrypt-1.6.0:0= >=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.3.3:=[icu(+)] >=dev-libs/icu-3.8.1-r1:= virtual/jpeg:0= >=net-libs/libsoup-2.48:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.8.0 media-libs/libwebp:= >=dev-libs/glib-2.40:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) dev-libs/libtasn1:= >=dev-libs/libgcrypt-1.7.0:0= nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) spell? ( >=app-text/enchant-0.22:= ) gstreamer? ( >=media-libs/gstreamer-1.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 ) || ( >=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/glib-utils >=dev-util/gtk-doc-am-1.10 >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-6.0 >=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.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 )
+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
diff --git a/metadata/md5-cache/net-libs/xrootd-4.4.0 b/metadata/md5-cache/net-libs/xrootd-4.4.0
index ffaba524627b..471bf7e8955f 100644
--- a/metadata/md5-cache/net-libs/xrootd-4.4.0
+++ b/metadata/md5-cache/net-libs/xrootd-4.4.0
@@ -10,5 +10,5 @@ RDEPEND=!<sci-physics/root-5.32[xrootd] sys-libs/zlib fuse? ( sys-fs/fuse:0 ) ke
 REQUIRED_USE=http? ( kerberos ssl )
 SLOT=0
 SRC_URI=http://xrootd.org/download/v4.4.0/xrootd-4.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e1e15072123cc21c492898cdd4582a64
diff --git a/metadata/md5-cache/net-libs/xrootd-4.5.0 b/metadata/md5-cache/net-libs/xrootd-4.5.0
index c4e34cb96a24..bea58ef1dab4 100644
--- a/metadata/md5-cache/net-libs/xrootd-4.5.0
+++ b/metadata/md5-cache/net-libs/xrootd-4.5.0
@@ -10,5 +10,5 @@ RDEPEND=!<sci-physics/root-5.32[xrootd] sys-libs/zlib fuse? ( sys-fs/fuse:0 ) ke
 REQUIRED_USE=http? ( kerberos ssl ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://xrootd.org/download/v4.5.0/xrootd-4.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5d9f99a4a58c8c03638ff01bd1139a36
diff --git a/metadata/md5-cache/net-libs/xrootd-4.8.3 b/metadata/md5-cache/net-libs/xrootd-4.8.3
index 6c15f72faa0a..915ce4548e35 100644
--- a/metadata/md5-cache/net-libs/xrootd-4.8.3
+++ b/metadata/md5-cache/net-libs/xrootd-4.8.3
@@ -10,5 +10,5 @@ RDEPEND=!<sci-physics/root-5.32[xrootd] sys-libs/zlib fuse? ( sys-fs/fuse:= ) ke
 REQUIRED_USE=http? ( kerberos ssl ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://xrootd.org/download/v4.8.3/xrootd-4.8.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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=580f4dcba3ab69990fc61cb08ff22dda
diff --git a/metadata/md5-cache/net-libs/zmqpp-4.2.0 b/metadata/md5-cache/net-libs/zmqpp-4.2.0
index 937dc39b9c9e..5fbfa23a5db7 100644
--- a/metadata/md5-cache/net-libs/zmqpp-4.2.0
+++ b/metadata/md5-cache/net-libs/zmqpp-4.2.0
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0
 RDEPEND=net-libs/zeromq[static-libs?]
 SLOT=0
 SRC_URI=https://github.com/zeromq/zmqpp/archive/4.2.0.tar.gz -> zmqpp-4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2a79b15ba7f9002ba89d7a76c9f622dc
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 7a0df9a7bce1..52576e9ae12f 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/archivemail-0.9.0-r1 b/metadata/md5-cache/net-mail/archivemail-0.9.0-r1
index 74be55b7e354..27570c48de9e 100644
--- a/metadata/md5-cache/net-mail/archivemail-0.9.0-r1
+++ b/metadata/md5-cache/net-mail/archivemail-0.9.0-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=mirror://sourceforge/archivemail/archivemail-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=28fcb76a37f4e370e6c42514f6fa02de
diff --git a/metadata/md5-cache/net-mail/automx-0.10.2-r1 b/metadata/md5-cache/net-mail/automx-0.10.2-r1
index 49fbb3e415fa..ae6bde59f587 100644
--- a/metadata/md5-cache/net-mail/automx-0.10.2-r1
+++ b/metadata/md5-cache/net-mail/automx-0.10.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/ipaddr[python_targets_python2_7(-)?,-python_single_target_jyt
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/sys4/automx/archive/v0.10.2.tar.gz -> automx-0.10.2.tgz
-_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e8714808c58db7f705a0b727e3d16621
diff --git a/metadata/md5-cache/net-mail/automx-0.10.2-r2 b/metadata/md5-cache/net-mail/automx-0.10.2-r2
index 3c8d90ea5551..8b9f57716ab9 100644
--- a/metadata/md5-cache/net-mail/automx-0.10.2-r2
+++ b/metadata/md5-cache/net-mail/automx-0.10.2-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/ipaddr[python_targets_python2_7(-)?,-python_single_target_jyt
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/sys4/automx/archive/v0.10.2.tar.gz -> automx-0.10.2.tgz
-_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d676895d7c5fff03c7ea7a1f0ff9205a
diff --git a/metadata/md5-cache/net-mail/dovecot-2.3.3 b/metadata/md5-cache/net-mail/dovecot-2.3.3
new file mode 100644
index 000000000000..b4d2afc578ec
--- /dev/null
+++ b/metadata/md5-cache/net-mail/dovecot-2.3.3
@@ -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_=2f5487f1d269e09d87a845a2c4421915
diff --git a/metadata/md5-cache/net-mail/getmail-5.4 b/metadata/md5-cache/net-mail/getmail-5.4
index 0c0d7e789a29..be11fc9ff69a 100644
--- a/metadata/md5-cache/net-mail/getmail-5.4
+++ b/metadata/md5-cache/net-mail/getmail-5.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl?] ) >=dev
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://pyropus.ca/software/getmail/old-versions/getmail-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e69aa9c0d17a1fd1e6d6ae4ecc120ff2
diff --git a/metadata/md5-cache/net-mail/getmail-5.6 b/metadata/md5-cache/net-mail/getmail-5.6
index b12f9e05a7a6..0090014e7735 100644
--- a/metadata/md5-cache/net-mail/getmail-5.6
+++ b/metadata/md5-cache/net-mail/getmail-5.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl?] ) >=dev
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://pyropus.ca/software/getmail/old-versions/getmail-5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f626750aabf5e3a6d62a40175ecd12c9
diff --git a/metadata/md5-cache/net-mail/mailman-3.1.1 b/metadata/md5-cache/net-mail/mailman-3.1.1
index e95919c4676d..569d7f3f4d5a 100644
--- a/metadata/md5-cache/net-mail/mailman-3.1.1
+++ b/metadata/md5-cache/net-mail/mailman-3.1.1
@@ -9,5 +9,5 @@ RDEPEND=~dev-python/aiosmtpd-1.0[python_targets_python3_4(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mailman/mailman-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e928f7794301a9b1a2568b710f0a67c4
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 65b35d45d712..a82b728f841d 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_=78fd6fa76802889cfc1305f8ac65060b
+_md5_=d35137c2258e1f1917b2215257d5735c
diff --git a/metadata/md5-cache/net-mail/mswatch-1.2.0-r1 b/metadata/md5-cache/net-mail/mswatch-1.2.0-r1
index 03f0745ddae1..b2dd9fddf148 100644
--- a/metadata/md5-cache/net-mail/mswatch-1.2.0-r1
+++ b/metadata/md5-cache/net-mail/mswatch-1.2.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.6:2
 SLOT=0
 SRC_URI=mirror://sourceforge/mswatch/mswatch-1.2.0.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=c2839b7fa153f24e839641fffb56e6b8
diff --git a/metadata/md5-cache/net-mail/notmuch-0.23.7 b/metadata/md5-cache/net-mail/notmuch-0.23.7
index d8082c9651d9..d9690931c793 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.23.7
+++ b/metadata/md5-cache/net-mail/notmuch-0.23.7
@@ -10,5 +10,5 @@ RDEPEND=!!<app-shells/bash-completion-1.9 >=dev-libs/glib-2.22:2 >=dev-libs/gmim
 REQUIRED_USE=nmbug? ( python ) python? ( || ( python_targets_python2_7 python_targets_python3_4 ) ) test? ( crypt emacs python valgrind )
 SLOT=0/4
 SRC_URI=https://notmuchmail.org/releases/notmuch-0.23.7.tar.gz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
-_eclasses_=bash-completion-r1	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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=db38fd968d2b57fc8dffd3260bdb7bc0
diff --git a/metadata/md5-cache/net-mail/notmuch-0.24.2 b/metadata/md5-cache/net-mail/notmuch-0.24.2
index fd8a3931502c..71b783a6ab38 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.24.2
+++ b/metadata/md5-cache/net-mail/notmuch-0.24.2
@@ -10,5 +10,5 @@ RDEPEND=!!<app-shells/bash-completion-1.9 >=dev-libs/glib-2.22:2 >=dev-libs/gmim
 REQUIRED_USE=nmbug? ( python ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) test? ( crypt emacs python valgrind )
 SLOT=0/4
 SRC_URI=https://notmuchmail.org/releases/notmuch-0.24.2.tar.gz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
-_eclasses_=bash-completion-r1	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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=04b14e588c1a297268a028690e520853
diff --git a/metadata/md5-cache/net-mail/notmuch-0.25.3 b/metadata/md5-cache/net-mail/notmuch-0.25.3
index 6e2446049423..411a34aad794 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.25.3
+++ b/metadata/md5-cache/net-mail/notmuch-0.25.3
@@ -10,5 +10,5 @@ RDEPEND=!!<app-shells/bash-completion-1.9 >=dev-libs/glib-2.22:2 >=dev-libs/gmim
 REQUIRED_USE=nmbug? ( python ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) test? ( crypt emacs python valgrind )
 SLOT=0/5
 SRC_URI=https://notmuchmail.org/releases/notmuch-0.25.3.tar.gz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
-_eclasses_=bash-completion-r1	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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6382974132dcfb6fc58c13b4dcc510eb
diff --git a/metadata/md5-cache/net-mail/notmuch-0.26.1 b/metadata/md5-cache/net-mail/notmuch-0.26.1
index f768d7075b8b..93fdf05d8faa 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.26.1
+++ b/metadata/md5-cache/net-mail/notmuch-0.26.1
@@ -10,5 +10,5 @@ RDEPEND=!!<app-shells/bash-completion-1.9 >=dev-libs/glib-2.22:2 >=dev-libs/gmim
 REQUIRED_USE=nmbug? ( python ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) test? ( crypt emacs python valgrind )
 SLOT=0/5
 SRC_URI=https://notmuchmail.org/releases/notmuch-0.26.1.tar.gz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
-_eclasses_=bash-completion-r1	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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ad09c982ac37ce791dbcf348115b6fbd
diff --git a/metadata/md5-cache/net-mail/notmuch-0.26.2 b/metadata/md5-cache/net-mail/notmuch-0.26.2
index 890fa2773330..788852548f0d 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.26.2
+++ b/metadata/md5-cache/net-mail/notmuch-0.26.2
@@ -10,5 +10,5 @@ RDEPEND=!!<app-shells/bash-completion-1.9 >=dev-libs/glib-2.22:2 >=dev-libs/gmim
 REQUIRED_USE=nmbug? ( python ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) test? ( crypt emacs python valgrind )
 SLOT=0/5
 SRC_URI=https://notmuchmail.org/releases/notmuch-0.26.2.tar.gz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
-_eclasses_=bash-completion-r1	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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ad09c982ac37ce791dbcf348115b6fbd
diff --git a/metadata/md5-cache/net-mail/notmuch-0.27 b/metadata/md5-cache/net-mail/notmuch-0.27
index d1a63538f000..34b1c3804d94 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.27
+++ b/metadata/md5-cache/net-mail/notmuch-0.27
@@ -10,5 +10,5 @@ RDEPEND=!!<app-shells/bash-completion-1.9 >=dev-libs/glib-2.22:2 || ( >=dev-libs
 REQUIRED_USE=nmbug? ( python ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) test? ( crypt emacs python valgrind )
 SLOT=0/5
 SRC_URI=https://notmuchmail.org/releases/notmuch-0.27.tar.gz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
-_eclasses_=bash-completion-r1	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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7da66ff8738ecdbb4f3717f253ea5089
diff --git a/metadata/md5-cache/net-mail/offlineimap-6.5.6 b/metadata/md5-cache/net-mail/offlineimap-6.5.6
index c55157779483..63d70a063964 100644
--- a/metadata/md5-cache/net-mail/offlineimap-6.5.6
+++ b/metadata/md5-cache/net-mail/offlineimap-6.5.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,sqlit
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/OfflineIMAP/offlineimap/tarball/v6.5.6 -> offlineimap-6.5.6.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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fa5d6cdf40374abdb23264027cee86f9
diff --git a/metadata/md5-cache/net-mail/offlineimap-6.7.0.3 b/metadata/md5-cache/net-mail/offlineimap-6.7.0.3
index ded92dcf6c9a..13eddb15a0b8 100644
--- a/metadata/md5-cache/net-mail/offlineimap-6.7.0.3
+++ b/metadata/md5-cache/net-mail/offlineimap-6.7.0.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,sqlit
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/OfflineIMAP/offlineimap/archive/v6.7.0.3.tar.gz -> offlineimap-6.7.0.3.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fdee66259495e3ab68c84a84d70ec771
diff --git a/metadata/md5-cache/net-mail/offlineimap-7.1.5 b/metadata/md5-cache/net-mail/offlineimap-7.1.5
index 66e121da890a..0364247c19f7 100644
--- a/metadata/md5-cache/net-mail/offlineimap-7.1.5
+++ b/metadata/md5-cache/net-mail/offlineimap-7.1.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/OfflineIMAP/offlineimap/archive/v7.1.5.tar.gz -> offlineimap-7.1.5.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1eacb6206d1b666ee21c035efeddf2f3
diff --git a/metadata/md5-cache/net-mail/offlineimap-7.2.1 b/metadata/md5-cache/net-mail/offlineimap-7.2.1
index 912869c22542..8f26fabdfa8e 100644
--- a/metadata/md5-cache/net-mail/offlineimap-7.2.1
+++ b/metadata/md5-cache/net-mail/offlineimap-7.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/OfflineIMAP/offlineimap/archive/v7.2.1.tar.gz -> offlineimap-7.2.1.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ad878e5ecfc3661132201519e1d4ec1f
diff --git a/metadata/md5-cache/net-mail/rss2email-3.10_pre20171001 b/metadata/md5-cache/net-mail/rss2email-3.10_pre20171001
index c33a7412fa33..d5065e7e2085 100644
--- a/metadata/md5-cache/net-mail/rss2email-3.10_pre20171001
+++ b/metadata/md5-cache/net-mail/rss2email-3.10_pre20171001
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/rss2email/rss2email/archive/e21e803a158a90ed784ee61ce7226e5c3a593a28.tar.gz -> rss2email-3.10_pre20171001.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4b82647cde8789b470bc8324db36609d
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 1c1cce5e52c7..baddb6666a34 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/apt-cacher-ng-3.1 b/metadata/md5-cache/net-misc/apt-cacher-ng-3.1
index c9ba24eb53ff..7faaa09af42c 100644
--- a/metadata/md5-cache/net-misc/apt-cacher-ng-3.1
+++ b/metadata/md5-cache/net-misc/apt-cacher-ng-3.1
@@ -9,5 +9,5 @@ LICENSE=BSD-4 ZLIB public-domain
 RDEPEND=app-arch/bzip2 app-arch/xz-utils dev-libs/openssl:* sys-libs/zlib systemd? ( sys-apps/systemd ) dev-lang/perl fuse? ( sys-fs/fuse ) tcpd? ( sys-apps/tcp-wrappers )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_3.1.orig.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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=7b1eb3d736fa1112b14e249f189fc892
diff --git a/metadata/md5-cache/net-misc/apt-cacher-ng-3.2 b/metadata/md5-cache/net-misc/apt-cacher-ng-3.2
index 972be55e1b98..9e90cf803ae5 100644
--- a/metadata/md5-cache/net-misc/apt-cacher-ng-3.2
+++ b/metadata/md5-cache/net-misc/apt-cacher-ng-3.2
@@ -9,5 +9,5 @@ LICENSE=BSD-4 ZLIB public-domain
 RDEPEND=app-arch/bzip2 app-arch/xz-utils dev-libs/openssl:* sys-libs/zlib systemd? ( sys-apps/systemd ) dev-lang/perl fuse? ( sys-fs/fuse ) tcpd? ( sys-apps/tcp-wrappers )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_3.2.orig.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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=d614e004bb8935f3a3976a808b030fcc
diff --git a/metadata/md5-cache/net-misc/asterisk-11.25.1 b/metadata/md5-cache/net-misc/asterisk-11.25.1
index 54bc2940b96d..d50b0b77b9af 100644
--- a/metadata/md5-cache/net-misc/asterisk-11.25.1
+++ b/metadata/md5-cache/net-misc/asterisk-11.25.1
@@ -11,5 +11,5 @@ RDEPEND=dev-db/sqlite:3 dev-libs/popt dev-libs/libxml2 !libressl? ( dev-libs/ope
 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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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-11.25.3 b/metadata/md5-cache/net-misc/asterisk-11.25.3
index 46fe1e09bd89..c163829ccb53 100644
--- a/metadata/md5-cache/net-misc/asterisk-11.25.3
+++ b/metadata/md5-cache/net-misc/asterisk-11.25.3
@@ -11,5 +11,5 @@ RDEPEND=dev-db/sqlite:3 dev-libs/popt dev-libs/libxml2 !libressl? ( dev-libs/ope
 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.3.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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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
index e89d12badb7f..92a34a23abb7 100644
--- a/metadata/md5-cache/net-misc/asterisk-13.19.0-r1
+++ b/metadata/md5-cache/net-misc/asterisk-13.19.0-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-db/sqlite:3 dev-libs/popt dev-libs/jansson dev-libs/libxml2 !libress
 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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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
index 620b57c65c63..8ce673ab3808 100644
--- a/metadata/md5-cache/net-misc/asterisk-13.19.2
+++ b/metadata/md5-cache/net-misc/asterisk-13.19.2
@@ -4,12 +4,12 @@ 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
+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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ec5e06ce2154ad98c1a744179476ff7f
+_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
index 22788044c88c..4a30f1bb64cf 100644
--- a/metadata/md5-cache/net-misc/asterisk-13.20.0
+++ b/metadata/md5-cache/net-misc/asterisk-13.20.0
@@ -4,12 +4,12 @@ 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
+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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ec5e06ce2154ad98c1a744179476ff7f
+_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
index 41df2d04946e..35b9c783b88e 100644
--- a/metadata/md5-cache/net-misc/asterisk-13.21.0
+++ b/metadata/md5-cache/net-misc/asterisk-13.21.0
@@ -4,12 +4,12 @@ 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
+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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ec5e06ce2154ad98c1a744179476ff7f
+_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
index cbcacbf75e25..be1fb7fcc258 100644
--- a/metadata/md5-cache/net-misc/asterisk-13.22.0
+++ b/metadata/md5-cache/net-misc/asterisk-13.22.0
@@ -4,12 +4,12 @@ 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
+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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ec5e06ce2154ad98c1a744179476ff7f
+_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-core-sounds-1.4.22 b/metadata/md5-cache/net-misc/asterisk-core-sounds-1.4.22
index e6d422623c49..1e6223640d6f 100644
--- a/metadata/md5-cache/net-misc/asterisk-core-sounds-1.4.22
+++ b/metadata/md5-cache/net-misc/asterisk-core-sounds-1.4.22
@@ -4,8 +4,8 @@ DESCRIPTION=Core sounds for asterisk
 EAPI=4
 HOMEPAGE=http://www.asterisk.org/
 IUSE=alaw g722 g729 siren7 siren14 sln16 ulaw wav l10n_fr l10n_es l10n_ru
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=CC-BY-SA-3.0
 SLOT=0
 SRC_URI=alaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-alaw-1.4.22.tar.gz ) g722? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g722-1.4.22.tar.gz ) g729? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g729-1.4.22.tar.gz ) http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.4.22.tar.gz siren7? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-siren7-1.4.22.tar.gz ) siren14? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-siren14-1.4.22.tar.gz ) sln16? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-sln16-1.4.22.tar.gz ) ulaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-ulaw-1.4.22.tar.gz ) wav? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-wav-1.4.22.tar.gz ) l10n_fr? ( alaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-alaw-1.4.22.tar.gz ) g722? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-g722-1.4.22.tar.gz ) g729? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-g729-1.4.22.tar.gz ) http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-gsm-1.4.22.tar.gz siren7? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-siren7-1.4.22.tar.gz ) siren14? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-siren14-1.4.22.tar.gz ) sln16? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-sln16-1.4.22.tar.gz ) ulaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-ulaw-1.4.22.tar.gz ) wav? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-wav-1.4.22.tar.gz ) ) l10n_es? ( alaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-alaw-1.4.22.tar.gz ) g722? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-g722-1.4.22.tar.gz ) g729? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-g729-1.4.22.tar.gz ) http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-gsm-1.4.22.tar.gz siren7? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-siren7-1.4.22.tar.gz ) siren14? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-siren14-1.4.22.tar.gz ) sln16? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-sln16-1.4.22.tar.gz ) ulaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-ulaw-1.4.22.tar.gz ) wav? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-wav-1.4.22.tar.gz ) ) l10n_ru? ( alaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-alaw-1.4.22.tar.gz ) g722? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-g722-1.4.22.tar.gz ) g729? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-g729-1.4.22.tar.gz ) http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-gsm-1.4.22.tar.gz siren7? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-siren7-1.4.22.tar.gz ) siren14? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-siren14-1.4.22.tar.gz ) sln16? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-sln16-1.4.22.tar.gz ) ulaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-ulaw-1.4.22.tar.gz ) wav? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-wav-1.4.22.tar.gz ) )
-_md5_=0daa9b6bb057683739ab2dc35675d67a
+_md5_=c63d4faadc8a85782a2aa3aeb0d2eb35
diff --git a/metadata/md5-cache/net-misc/asterisk-extra-sounds-1.4.11 b/metadata/md5-cache/net-misc/asterisk-extra-sounds-1.4.11
index b6cca5961f04..19643abfd43d 100644
--- a/metadata/md5-cache/net-misc/asterisk-extra-sounds-1.4.11
+++ b/metadata/md5-cache/net-misc/asterisk-extra-sounds-1.4.11
@@ -4,9 +4,9 @@ DESCRIPTION=Extra sounds for asterisk
 EAPI=2
 HOMEPAGE=http://www.asterisk.org/
 IUSE=alaw g722 g729 +gsm siren7 siren14 sln16 ulaw wav l10n_fr
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=CC-BY-SA-3.0
 RDEPEND=>=net-misc/asterisk-1.4
 SLOT=0
 SRC_URI=alaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-alaw-1.4.11.tar.gz ) g722? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g722-1.4.11.tar.gz ) g729? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g729-1.4.11.tar.gz ) gsm? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz ) siren7? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-siren7-1.4.11.tar.gz ) siren14? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-siren14-1.4.11.tar.gz ) sln16? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-sln16-1.4.11.tar.gz ) ulaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-ulaw-1.4.11.tar.gz ) wav? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-wav-1.4.11.tar.gz ) l10n_fr? ( alaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-alaw-1.4.11.tar.gz ) g722? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-g722-1.4.11.tar.gz ) g729? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-g729-1.4.11.tar.gz ) gsm? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-gsm-1.4.11.tar.gz ) siren7? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-siren7-1.4.11.tar.gz ) siren14? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-siren14-1.4.11.tar.gz ) sln16? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-sln16-1.4.11.tar.gz ) ulaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-ulaw-1.4.11.tar.gz ) wav? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-wav-1.4.11.tar.gz ) )
-_md5_=a9cdeb194ed825afd382be51c3bea4bc
+_md5_=05ee5f43ed2d3368821a7a298d37fe43
diff --git a/metadata/md5-cache/net-misc/asterisk-moh-opsound-2.03 b/metadata/md5-cache/net-misc/asterisk-moh-opsound-2.03
index 8c5e3ec590c9..3ae7da097988 100644
--- a/metadata/md5-cache/net-misc/asterisk-moh-opsound-2.03
+++ b/metadata/md5-cache/net-misc/asterisk-moh-opsound-2.03
@@ -4,9 +4,9 @@ DESCRIPTION=asterisk moh music
 EAPI=2
 HOMEPAGE=http://www.asterisk.org/
 IUSE=alaw g722 g729 +gsm siren7 siren14 sln16 ulaw wav
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=CC-BY-SA-3.0
 RDEPEND=>=net-misc/asterisk-1.4
 SLOT=0
 SRC_URI=alaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-alaw-2.03.tar.gz ) g722? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-g722-2.03.tar.gz ) g729? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-g729-2.03.tar.gz ) gsm? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-gsm-2.03.tar.gz ) siren7? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-siren7-2.03.tar.gz ) siren14? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-siren14-2.03.tar.gz ) sln16? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-sln16-2.03.tar.gz ) ulaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-ulaw-2.03.tar.gz ) wav? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz )
-_md5_=dfa9400386246c6119e285505afeb1f0
+_md5_=c18fb469e492dbc25a3d72f9923c0bce
diff --git a/metadata/md5-cache/net-misc/batctl-2017.4 b/metadata/md5-cache/net-misc/batctl-2017.4
index 71f4f893d712..c46a276ca647 100644
--- a/metadata/md5-cache/net-misc/batctl-2017.4
+++ b/metadata/md5-cache/net-misc/batctl-2017.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libnl:3
 SLOT=0
 SRC_URI=https://downloads.open-mesh.org/batman/releases/batman-adv-2017.4/batctl-2017.4.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=379c42fb1d7b22458cdc15686d7458a7
diff --git a/metadata/md5-cache/net-misc/batman-adv-2017.4 b/metadata/md5-cache/net-misc/batman-adv-2017.4
index f3343a5b5681..a258548f97dd 100644
--- a/metadata/md5-cache/net-misc/batman-adv-2017.4
+++ b/metadata/md5-cache/net-misc/batman-adv-2017.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://downloads.open-mesh.org/batman/releases/batman-adv-2017.4/batman-adv-2017.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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_=dbaa6b57c9b9c62064cec063e1c73c37
diff --git a/metadata/md5-cache/net-misc/bridge-utils-1.5 b/metadata/md5-cache/net-misc/bridge-utils-1.5
index 4eee9a13cd04..42280b8719f7 100644
--- a/metadata/md5-cache/net-misc/bridge-utils-1.5
+++ b/metadata/md5-cache/net-misc/bridge-utils-1.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( sec-policy/selinux-brctl )
 SLOT=0
 SRC_URI=mirror://sourceforge/bridge/bridge-utils-1.5.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8168cce1aae76ccb20539fdc14a7aea1
diff --git a/metadata/md5-cache/net-misc/bridge-utils-1.6 b/metadata/md5-cache/net-misc/bridge-utils-1.6
index 19b59a0dfe08..dcf60771570b 100644
--- a/metadata/md5-cache/net-misc/bridge-utils-1.6
+++ b/metadata/md5-cache/net-misc/bridge-utils-1.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( sec-policy/selinux-brctl )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/net/bridge-utils/bridge-utils-1.6.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=a9c6af2df1059a6a341c09b8f4645cef
diff --git a/metadata/md5-cache/net-misc/charm-1.9.2-r1 b/metadata/md5-cache/net-misc/charm-1.9.2-r1
index 9907c2d88a1c..6f379a67203d 100644
--- a/metadata/md5-cache/net-misc/charm-1.9.2-r1
+++ b/metadata/md5-cache/net-misc/charm-1.9.2-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=mirror://sourceforge/ljcharm/charm-1.9.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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a86f940e368706f0373a499ecac654d7
diff --git a/metadata/md5-cache/net-misc/cmst-2018.01.06 b/metadata/md5-cache/net-misc/cmst-2018.01.06
index 9a0477315694..3311a8da5304 100644
--- a/metadata/md5-cache/net-misc/cmst-2018.01.06
+++ b/metadata/md5-cache/net-misc/cmst-2018.01.06
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 net-misc/connman
 SLOT=0
 SRC_URI=https://github.com/andrew-bibb/cmst/archive/cmst-2018.01.06.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ca7218a87e6936ff7bef3eb3bd222ec4
diff --git a/metadata/md5-cache/net-misc/connman-gtk-1.1.1 b/metadata/md5-cache/net-misc/connman-gtk-1.1.1
index cb4490fa9bf9..0e455a234607 100644
--- a/metadata/md5-cache/net-misc/connman-gtk-1.1.1
+++ b/metadata/md5-cache/net-misc/connman-gtk-1.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.0:2 >=x11-libs/gtk+-3.10:3 openconnect? ( >=net-vpn/openconnect-5.99 ) net-misc/connman
 SLOT=0
 SRC_URI=https://github.com/jgke/connman-gtk/archive/v1.1.1.tar.gz -> connman-gtk-1.1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=925e851793f5f501e7d8ee490cdfd3b3
diff --git a/metadata/md5-cache/net-misc/crossbar-17.12.1 b/metadata/md5-cache/net-misc/crossbar-17.12.1
index 41e3700bd7fe..dbfe97faa9aa 100644
--- a/metadata/md5-cache/net-misc/crossbar-17.12.1
+++ b/metadata/md5-cache/net-misc/crossbar-17.12.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/attrs-17.2.0[python_targets_python2_7(-)?,python_targets_py
 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/crossbar/crossbar-17.12.1.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=834e7dde32e1ca1a78dd193452933498
diff --git a/metadata/md5-cache/net-misc/crossbar-17.6.1_p3-r1 b/metadata/md5-cache/net-misc/crossbar-17.6.1_p3-r1
index 6a2256c56a2e..3b1d5f86cdf4 100644
--- a/metadata/md5-cache/net-misc/crossbar-17.6.1_p3-r1
+++ b/metadata/md5-cache/net-misc/crossbar-17.6.1_p3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/setuptools-36.0.1[python_targets_python2_7(-)?,-python_sing
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/crossbar/crossbar-17.6.1.post3.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=47b637ae7fd762fded6396cfecfb9176
diff --git a/metadata/md5-cache/net-misc/crossbar-17.8.1 b/metadata/md5-cache/net-misc/crossbar-17.8.1
index 66fb57743e3d..19f391d8576a 100644
--- a/metadata/md5-cache/net-misc/crossbar-17.8.1
+++ b/metadata/md5-cache/net-misc/crossbar-17.8.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/attrs-17.2.0[python_targets_python2_7(-)?,python_targets_py
 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/crossbario/crossbar/archive/v17.8.1.tar.gz -> crossbar-17.8.1.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=624dd878939f723f798d96c7a7965bee
diff --git a/metadata/md5-cache/net-misc/crossbar-17.9.1 b/metadata/md5-cache/net-misc/crossbar-17.9.1
index 9947aae2a134..ecf8e5a2a585 100644
--- a/metadata/md5-cache/net-misc/crossbar-17.9.1
+++ b/metadata/md5-cache/net-misc/crossbar-17.9.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/attrs-17.2.0[python_targets_python2_7(-)?,python_targets_py
 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/crossbar/crossbar-17.9.1.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d40551476f33e7fdd0a32906dba111d1
diff --git a/metadata/md5-cache/net-misc/crossbar-18.3.1 b/metadata/md5-cache/net-misc/crossbar-18.3.1
index 67ee122bbba1..f44200487534 100644
--- a/metadata/md5-cache/net-misc/crossbar-18.3.1
+++ b/metadata/md5-cache/net-misc/crossbar-18.3.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/attrs-17.2.0[python_targets_python2_7(-)?,python_targets_py
 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/crossbar/crossbar-18.3.1.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3ac5f501537dcd12cd87d27bdc47f4b8
diff --git a/metadata/md5-cache/net-misc/csync-0.50.0 b/metadata/md5-cache/net-misc/csync-0.50.0
index 14ced9f3f026..903ce30ebe2b 100644
--- a/metadata/md5-cache/net-misc/csync-0.50.0
+++ b/metadata/md5-cache/net-misc/csync-0.50.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-db/sqlite-3.4:3 net-libs/neon[ssl] iconv? ( virtual/libiconv ) samba? ( >=net-fs/samba-3.5 ) sftp? ( >=net-libs/libssh-0.5 ) !net-misc/ocsync
 SLOT=0
 SRC_URI=https://open.cryptomilk.org/attachments/download/27/csync-0.50.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e611101859bd2a0f7abe8f7238e0d2f3
diff --git a/metadata/md5-cache/net-misc/dahdi-2.10.0.1 b/metadata/md5-cache/net-misc/dahdi-2.10.0.1
index 9d9721f394af..48476b3033df 100644
--- a/metadata/md5-cache/net-misc/dahdi-2.10.0.1
+++ b/metadata/md5-cache/net-misc/dahdi-2.10.0.1
@@ -10,5 +10,5 @@ RDEPEND=kernel_linux? ( virtual/modutils )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/dahdi-linux-2.10.0.1.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-b0019.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1d0019.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-780019.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-e0019.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz mirror://gentoo/gentoo-dahdi-patchset-1.1.9.tar.bz2 http://www.junghanns.net/downloads/jnet-dahdi-drivers-1.0.14.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=416045fb8655caccd547f6ccf6dfcf8e
diff --git a/metadata/md5-cache/net-misc/dahdi-2.10.0.1-r1 b/metadata/md5-cache/net-misc/dahdi-2.10.0.1-r1
index 849d75813d6d..84c0f9dff99d 100644
--- a/metadata/md5-cache/net-misc/dahdi-2.10.0.1-r1
+++ b/metadata/md5-cache/net-misc/dahdi-2.10.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=kernel_linux? ( virtual/modutils )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/dahdi-linux-2.10.0.1.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-b0019.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1d0019.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-780019.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-e0019.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz mirror://gentoo/gentoo-dahdi-patchset-1.2.0.tar.bz2 http://www.junghanns.net/downloads/jnet-dahdi-drivers-1.0.14.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0538c8c8629cbee65642988cd809e3c3
diff --git a/metadata/md5-cache/net-misc/dahdi-2.10.1 b/metadata/md5-cache/net-misc/dahdi-2.10.1
index 371debff65bd..395a0840be9e 100644
--- a/metadata/md5-cache/net-misc/dahdi-2.10.1
+++ b/metadata/md5-cache/net-misc/dahdi-2.10.1
@@ -10,5 +10,5 @@ RDEPEND=kernel_linux? ( virtual/modutils )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/dahdi-linux-2.10.1.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-b0019.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1d0019.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-780019.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-e0019.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz mirror://gentoo/gentoo-dahdi-patchset-1.1.9.tar.bz2 http://www.junghanns.net/downloads/jnet-dahdi-drivers-1.0.14.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=416045fb8655caccd547f6ccf6dfcf8e
diff --git a/metadata/md5-cache/net-misc/dahdi-2.10.2-r2 b/metadata/md5-cache/net-misc/dahdi-2.10.2-r2
index 4b6d6cad2880..fbedfd45ce51 100644
--- a/metadata/md5-cache/net-misc/dahdi-2.10.2-r2
+++ b/metadata/md5-cache/net-misc/dahdi-2.10.2-r2
@@ -10,5 +10,5 @@ RDEPEND=kernel_linux? ( virtual/modutils )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/dahdi-linux-2.10.2.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz mirror://gentoo/gentoo-dahdi-patchset-1.2.3.tar.bz2 http://www.junghanns.net/downloads/jnet-dahdi-drivers-1.0.14.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4495598b5f9630c7700708f8305f8596
diff --git a/metadata/md5-cache/net-misc/dahdi-2.11.1 b/metadata/md5-cache/net-misc/dahdi-2.11.1
index 56569d5c5cfa..242fcfddb0e8 100644
--- a/metadata/md5-cache/net-misc/dahdi-2.11.1
+++ b/metadata/md5-cache/net-misc/dahdi-2.11.1
@@ -10,5 +10,5 @@ RDEPEND=kernel_linux? ( virtual/modutils )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/dahdi-linux-2.11.1.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz mirror://gentoo/gentoo-dahdi-patchset-1.2.3.tar.bz2 http://www.junghanns.net/downloads/jnet-dahdi-drivers-1.0.14.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9f235a1223a8f2c81c1cdae485e32073
diff --git a/metadata/md5-cache/net-misc/dahdi-2.11.1-r1 b/metadata/md5-cache/net-misc/dahdi-2.11.1-r1
index 205d0d202cef..3ca554a49099 100644
--- a/metadata/md5-cache/net-misc/dahdi-2.11.1-r1
+++ b/metadata/md5-cache/net-misc/dahdi-2.11.1-r1
@@ -10,5 +10,5 @@ RDEPEND=kernel_linux? ( virtual/modutils )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/dahdi-linux-2.11.1.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz mirror://gentoo/gentoo-dahdi-patchset-1.2.4.tar.bz2 http://www.junghanns.net/downloads/jnet-dahdi-drivers-1.0.14.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=108c6f99b356cf8b7a17362a1780c640
diff --git a/metadata/md5-cache/net-misc/dropbox-48.3.56 b/metadata/md5-cache/net-misc/dropbox-48.3.56
index 5ad4f9c4cdb1..bae111590bb0 100644
--- a/metadata/md5-cache/net-misc/dropbox-48.3.56
+++ b/metadata/md5-cache/net-misc/dropbox-48.3.56
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-48.3.56.tar.gz ) amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-48.3.56.tar.gz )
-_eclasses_=desktop	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a696372274dd3d18e52200eb8beee718
diff --git a/metadata/md5-cache/net-misc/dropbox-58.3.88 b/metadata/md5-cache/net-misc/dropbox-58.3.88
index 0e7e1049f750..bd6a6253cd31 100644
--- a/metadata/md5-cache/net-misc/dropbox-58.3.88
+++ b/metadata/md5-cache/net-misc/dropbox-58.3.88
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7fc2cb61bd59562aa31efb3fccab230b
diff --git a/metadata/md5-cache/net-misc/econnman-1.1 b/metadata/md5-cache/net-misc/econnman-1.1
new file mode 100644
index 000000000000..6befe3afd28f
--- /dev/null
+++ b/metadata/md5-cache/net-misc/econnman-1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=prepare setup
+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(+)?]
+DESCRIPTION=ConnMan User Interface written with EFL & python
+EAPI=7
+HOMEPAGE=https://phab.enlightenment.org/w/projects/econnman/ https://www.enlightenment.org/
+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=LGPL-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/efl[X,connman] dev-python/python-efl[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_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://download.enlightenment.org/rel/apps/econnman/econnman-1.1.tar.xz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=83c3f83de2fe56810a65a72b8360b543
diff --git a/metadata/md5-cache/net-misc/electron-cash-3.1.3 b/metadata/md5-cache/net-misc/electron-cash-3.1.3
index 8a9e0096c653..309b26a23a31 100644
--- a/metadata/md5-cache/net-misc/electron-cash-3.1.3
+++ b/metadata/md5-cache/net-misc/electron-cash-3.1.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/ecdsa[python_targets_python3_4(-)?,python_targets_python3_5(-
 REQUIRED_USE=|| ( cli ncurses qt5 ) audio_modem? ( qt5 ) cosign? ( qt5 ) digitalbitbox? ( qt5 ) email? ( qt5 ) qrcode? ( qt5 ) sync? ( qt5 ) vkb? ( qt5 ) || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/fyookball/electrum/archive/3.1.3.tar.gz -> electron-cash-3.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4b74bae902a6c5babdf1bf6abd39316e
diff --git a/metadata/md5-cache/net-misc/electrum-3.0.5 b/metadata/md5-cache/net-misc/electrum-3.0.5
index b7c2dda1c70b..51d8a9528939 100644
--- a/metadata/md5-cache/net-misc/electrum-3.0.5
+++ b/metadata/md5-cache/net-misc/electrum-3.0.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4[ncurses?] ) python_targe
 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 )
 SLOT=0
 SRC_URI=https://download.electrum.org/3.0.5/Electrum-3.0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c117260badd3464cbe76001f141c5276
diff --git a/metadata/md5-cache/net-misc/electrum-3.0.6 b/metadata/md5-cache/net-misc/electrum-3.0.6
index 82ba1dad6f84..b8d8dc2f3e94 100644
--- a/metadata/md5-cache/net-misc/electrum-3.0.6
+++ b/metadata/md5-cache/net-misc/electrum-3.0.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4[ncurses?] ) python_targe
 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 )
 SLOT=0
 SRC_URI=https://download.electrum.org/3.0.6/Electrum-3.0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9cb5d31db83e7671aa151af40ec33afa
diff --git a/metadata/md5-cache/net-misc/electrum-3.1.1 b/metadata/md5-cache/net-misc/electrum-3.1.1
index f40d1a37ad61..3858aefc83d1 100644
--- a/metadata/md5-cache/net-misc/electrum-3.1.1
+++ b/metadata/md5-cache/net-misc/electrum-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4[ncurses?] ) python_targe
 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.1.1/Electrum-3.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=92940e15eaec70ac3b7f11b37a5be0b0
diff --git a/metadata/md5-cache/net-misc/electrum-3.1.2 b/metadata/md5-cache/net-misc/electrum-3.1.2
index ba8597c16bb2..73951036bb4d 100644
--- a/metadata/md5-cache/net-misc/electrum-3.1.2
+++ b/metadata/md5-cache/net-misc/electrum-3.1.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4[ncurses?] ) python_targe
 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.1.2/Electrum-3.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=695eb16f095c85e1e15c6f1bf248a90c
diff --git a/metadata/md5-cache/net-misc/electrum-3.1.3 b/metadata/md5-cache/net-misc/electrum-3.1.3
index 4eb1b0e1b409..b53a46024c03 100644
--- a/metadata/md5-cache/net-misc/electrum-3.1.3
+++ b/metadata/md5-cache/net-misc/electrum-3.1.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4[ncurses?] ) python_targe
 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.1.3/Electrum-3.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=300f43ba0a850a5c694d51cb04900131
diff --git a/metadata/md5-cache/net-misc/electrum-3.2.2 b/metadata/md5-cache/net-misc/electrum-3.2.2
index 41ddaa297756..1ee1f35db350 100644
--- a/metadata/md5-cache/net-misc/electrum-3.2.2
+++ b/metadata/md5-cache/net-misc/electrum-3.2.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4[ncurses?] ) python_targe
 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.2/Electrum-3.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=04dae63b6fbc200a21177b7fc9615c6b
diff --git a/metadata/md5-cache/net-misc/electrum-ltc-3.0.6.2 b/metadata/md5-cache/net-misc/electrum-ltc-3.0.6.2
index 3eaad230d978..70bddde718df 100644
--- a/metadata/md5-cache/net-misc/electrum-ltc-3.0.6.2
+++ b/metadata/md5-cache/net-misc/electrum-ltc-3.0.6.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/scrypt[python_targets_python3_4(-)?,python_targets_python3_5(
 REQUIRED_USE=|| ( cli ncurses qt5 ) audio_modem? ( qt5 ) cosign? ( qt5 ) digitalbitbox? ( qt5 ) email? ( qt5 ) qrcode? ( qt5 ) sync? ( qt5 ) vkb? ( qt5 ) || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/pooler/electrum-ltc/archive/3.0.6.2.tar.gz -> electrum-ltc-3.0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=da389102e15e4c2c077e84f83bf00f1a
diff --git a/metadata/md5-cache/net-misc/eventd-0.21.0 b/metadata/md5-cache/net-misc/eventd-0.21.0
index ffe6bd512dd0..b39c9f58d37d 100644
--- a/metadata/md5-cache/net-misc/eventd-0.21.0
+++ b/metadata/md5-cache/net-misc/eventd-0.21.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.40:2 sys-apps/util-linux introspection? ( >=dev-libs/g
 REQUIRED_USE=X? ( notification ) fbcon? ( notification ) notification? ( || ( X fbcon ) )
 SLOT=0
 SRC_URI=https://www.eventd.org/download/eventd/eventd-0.21.0.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b7b7e632f2cf86da3393f3dc0e458d4a
diff --git a/metadata/md5-cache/net-misc/eventd-0.24.1 b/metadata/md5-cache/net-misc/eventd-0.24.1
index e3500dc28464..7cf44ba13d9e 100644
--- a/metadata/md5-cache/net-misc/eventd-0.24.1
+++ b/metadata/md5-cache/net-misc/eventd-0.24.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.40:2 sys-apps/util-linux x11-libs/libxkbcommon introsp
 REQUIRED_USE=X? ( notification ) fbcon? ( notification ) notification? ( || ( X fbcon ) ) test? ( websocket )
 SLOT=0
 SRC_URI=https://www.eventd.org/download/eventd/eventd-0.24.1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b946fd17b816ec589e689459f74e4acb
diff --git a/metadata/md5-cache/net-misc/exabgp-3.2.17 b/metadata/md5-cache/net-misc/exabgp-3.2.17
index 8d0fecbc56d0..4945b69155fb 100644
--- a/metadata/md5-cache/net-misc/exabgp-3.2.17
+++ b/metadata/md5-cache/net-misc/exabgp-3.2.17
@@ -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/Exa-Networks/exabgp/archive/exabgp-3.2.17.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2f283085f08e50f5b5f34ff2a0d7507c
diff --git a/metadata/md5-cache/net-misc/fatrat-1.2.0_beta2_p20161204 b/metadata/md5-cache/net-misc/fatrat-1.2.0_beta2_p20161204
index c65b93e0a90d..d4046ed418c0 100644
--- a/metadata/md5-cache/net-misc/fatrat-1.2.0_beta2_p20161204
+++ b/metadata/md5-cache/net-misc/fatrat-1.2.0_beta2_p20161204
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 bittorrent? ( dev-qt/qtwebengine:5[widgets] >=net-libs/libtorrent-rasterbar-1.1.1 ) curl? ( >=net-misc/curl-7.18.2 ) doc? ( dev-qt/qthelp:5 ) xmpp? ( net-libs/gloox )
 SLOT=0
 SRC_URI=https://github.com/LubosD/fatrat/tarball/14a1a146df76d70c44dcc38363848a5b41a364d5 -> fatrat-1.2.0_beta2_p20161204.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=408bad2969d388d6a00baf912e62df07
diff --git a/metadata/md5-cache/net-misc/freerdp-1.2.1_pre20150326-r1 b/metadata/md5-cache/net-misc/freerdp-1.2.1_pre20150326-r1
index ccf3096757c5..f8d1b75b7006 100644
--- a/metadata/md5-cache/net-misc/freerdp-1.2.1_pre20150326-r1
+++ b/metadata/md5-cache/net-misc/freerdp-1.2.1_pre20150326-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) sys-libs/zlib:0 alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) client? ( usb? ( virtual/libudev:0= sys-apps/util-linux:0= dev-libs/dbus-glib:0= virtual/libusb:1= ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) ) ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 x11-libs/libXrandr ) jpeg? ( virtual/jpeg:0 ) pulseaudio? ( media-sound/pulseaudio ) server? ( X? ( x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes xinerama? ( x11-libs/libXinerama ) ) ) smartcard? ( sys-apps/pcsc-lite ) wayland? ( dev-libs/wayland ) X? ( x11-libs/libX11 x11-libs/libxkbfile )
 SLOT=0/1.2
 SRC_URI=https://github.com/FreeRDP/FreeRDP/archive/aa2181dcf2dd98693767ba738c5b2ad8c3d742d4.tar.gz -> freerdp-1.2.1_pre20150326.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=376bf9c63efc347f0c806b0bd285e127
diff --git a/metadata/md5-cache/net-misc/freerdp-2.0.0_rc0 b/metadata/md5-cache/net-misc/freerdp-2.0.0_rc0
index 49fd9b6868c2..a943be79bafc 100644
--- a/metadata/md5-cache/net-misc/freerdp-2.0.0_rc0
+++ b/metadata/md5-cache/net-misc/freerdp-2.0.0_rc0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib:0 alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) client? ( usb? ( virtual/libudev:0= sys-apps/util-linux:0= dev-libs/dbus-glib:0= virtual/libusb:1= ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) ) ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 x11-libs/libXrandr ) jpeg? ( virtual/jpeg:0 ) openh264? ( media-libs/openh264 ) pulseaudio? ( media-sound/pulseaudio ) server? ( X? ( x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst xinerama? ( x11-libs/libXinerama ) ) ) smartcard? ( sys-apps/pcsc-lite ) systemd? ( sys-apps/systemd:0= ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) X? ( x11-libs/libX11 x11-libs/libxkbfile )
 SLOT=0/2
 SRC_URI=https://github.com/FreeRDP/FreeRDP/archive/2.0.0-rc0.tar.gz -> FreeRDP-2.0.0-rc0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=41e031ef0114dd61ff367cab1778e52b
diff --git a/metadata/md5-cache/net-misc/freerdp-2.0.0_rc1-r1 b/metadata/md5-cache/net-misc/freerdp-2.0.0_rc1-r1
index a85148c1966d..f572a38db5a8 100644
--- a/metadata/md5-cache/net-misc/freerdp-2.0.0_rc1-r1
+++ b/metadata/md5-cache/net-misc/freerdp-2.0.0_rc1-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib:0 alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) client? ( usb? ( virtual/libudev:0= sys-apps/util-linux:0= dev-libs/dbus-glib:0= virtual/libusb:1= ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) ) ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 x11-libs/libXrandr ) jpeg? ( virtual/jpeg:0 ) openh264? ( media-libs/openh264 ) pulseaudio? ( media-sound/pulseaudio ) server? ( X? ( x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst xinerama? ( x11-libs/libXinerama ) ) ) smartcard? ( sys-apps/pcsc-lite ) systemd? ( sys-apps/systemd:0= ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) X? ( x11-libs/libX11 x11-libs/libxkbfile )
 SLOT=0/2
 SRC_URI=https://github.com/FreeRDP/FreeRDP/archive/2.0.0-rc1.tar.gz -> FreeRDP-2.0.0-rc1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=232456f23d2298e9399eff9593545fd5
diff --git a/metadata/md5-cache/net-misc/freerdp-2.0.0_rc2-r1 b/metadata/md5-cache/net-misc/freerdp-2.0.0_rc2-r1
index ead10578ec46..44e69e0f4453 100644
--- a/metadata/md5-cache/net-misc/freerdp-2.0.0_rc2-r1
+++ b/metadata/md5-cache/net-misc/freerdp-2.0.0_rc2-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib:0 alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) client? ( usb? ( virtual/libudev:0= sys-apps/util-linux:0= dev-libs/dbus-glib:0= virtual/libusb:1= ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) ) ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 x11-libs/libXrandr ) jpeg? ( virtual/jpeg:0 ) openh264? ( media-libs/openh264 ) pulseaudio? ( media-sound/pulseaudio ) server? ( X? ( x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst xinerama? ( x11-libs/libXinerama ) ) ) smartcard? ( sys-apps/pcsc-lite ) systemd? ( sys-apps/systemd:0= ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) X? ( x11-libs/libX11 x11-libs/libxkbfile )
 SLOT=0/2
 SRC_URI=https://pub.freerdp.com/releases/freerdp-2.0.0-rc2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1422ae41d09d880ab6f18e77f6e3b9d3
diff --git a/metadata/md5-cache/net-misc/freerdp-2.0.0_rc3 b/metadata/md5-cache/net-misc/freerdp-2.0.0_rc3
index 56704e89dedd..8f3a476be19c 100644
--- a/metadata/md5-cache/net-misc/freerdp-2.0.0_rc3
+++ b/metadata/md5-cache/net-misc/freerdp-2.0.0_rc3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib:0 alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) client? ( usb? ( virtual/libudev:0= sys-apps/util-linux:0= dev-libs/dbus-glib:0= virtual/libusb:1= ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) ) ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 x11-libs/libXrandr ) jpeg? ( virtual/jpeg:0 ) openh264? ( media-libs/openh264 ) pulseaudio? ( media-sound/pulseaudio ) server? ( X? ( x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst xinerama? ( x11-libs/libXinerama ) ) ) smartcard? ( sys-apps/pcsc-lite ) systemd? ( sys-apps/systemd:0= ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) X? ( x11-libs/libX11 x11-libs/libxkbfile )
 SLOT=0/2
 SRC_URI=https://pub.freerdp.com/releases/freerdp-2.0.0-rc3.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c751cf7dbc26b39ed9e36cff0615be16
diff --git a/metadata/md5-cache/net-misc/freerdp-2.0.0_rc3-r1 b/metadata/md5-cache/net-misc/freerdp-2.0.0_rc3-r1
index 7decd23e133e..446ecac80ad6 100644
--- a/metadata/md5-cache/net-misc/freerdp-2.0.0_rc3-r1
+++ b/metadata/md5-cache/net-misc/freerdp-2.0.0_rc3-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib:0 alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) client? ( usb? ( virtual/libudev:0= sys-apps/util-linux:0= dev-libs/dbus-glib:0= virtual/libusb:1= ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) ) ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 x11-libs/libXrandr ) jpeg? ( virtual/jpeg:0 ) openh264? ( media-libs/openh264 ) pulseaudio? ( media-sound/pulseaudio ) server? ( X? ( x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst xinerama? ( x11-libs/libXinerama ) ) ) smartcard? ( sys-apps/pcsc-lite ) systemd? ( sys-apps/systemd:0= ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) X? ( x11-libs/libX11 x11-libs/libxkbfile )
 SLOT=0/2
 SRC_URI=https://pub.freerdp.com/releases/freerdp-2.0.0-rc3.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9aeb6e46cba528e63343309ab4066a98
diff --git a/metadata/md5-cache/net-misc/freerdp-9999 b/metadata/md5-cache/net-misc/freerdp-9999
index 6d4d6d8d25a3..391abeadb568 100644
--- a/metadata/md5-cache/net-misc/freerdp-9999
+++ b/metadata/md5-cache/net-misc/freerdp-9999
@@ -7,5 +7,5 @@ IUSE=alsa +client cups debug doc ffmpeg gstreamer jpeg libav libressl neon openh
 LICENSE=Apache-2.0
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib:0 alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) client? ( usb? ( virtual/libudev:0= sys-apps/util-linux:0= dev-libs/dbus-glib:0= virtual/libusb:1= ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) ) ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 x11-libs/libXrandr ) jpeg? ( virtual/jpeg:0 ) openh264? ( media-libs/openh264 ) pulseaudio? ( media-sound/pulseaudio ) server? ( X? ( x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst xinerama? ( x11-libs/libXinerama ) ) ) smartcard? ( sys-apps/pcsc-lite ) systemd? ( sys-apps/systemd:0= ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) X? ( x11-libs/libX11 x11-libs/libxkbfile )
 SLOT=0/2
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9aeb6e46cba528e63343309ab4066a98
diff --git a/metadata/md5-cache/net-misc/gerbera-1.1.0-r1 b/metadata/md5-cache/net-misc/gerbera-1.1.0-r1
index 6db259696d4b..5e08d010f9db 100644
--- a/metadata/md5-cache/net-misc/gerbera-1.1.0-r1
+++ b/metadata/md5-cache/net-misc/gerbera-1.1.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!!net-misc/mediatomb <=net-libs/libupnp-1.8.2:1.8[ipv6,reuseaddr] >=dev-db/sqlite-3 dev-libs/expat mysql? ( virtual/mysql ) javascript? ( dev-lang/duktape ) taglib? ( >=media-libs/taglib-1.11 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) ffmpeg? ( libav? ( >=media-video/libav-10:0= ) !libav? ( >=media-video/ffmpeg-2.2:0= ) ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl net-misc/youtube-dl ) magic? ( sys-apps/file ) sys-apps/util-linux sys-libs/zlib virtual/libiconv virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/gerbera/gerbera/archive/v1.1.0.tar.gz -> gerbera-1.1.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	systemd	47c677ae1d7b69031f11f630ac09f0d1	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b873d90595d5b0eb4dc2393b675e74c4
diff --git a/metadata/md5-cache/net-misc/gerbera-1.2.0-r1 b/metadata/md5-cache/net-misc/gerbera-1.2.0-r1
index 26aeb69f8182..bd1788b29e25 100644
--- a/metadata/md5-cache/net-misc/gerbera-1.2.0-r1
+++ b/metadata/md5-cache/net-misc/gerbera-1.2.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!!net-misc/mediatomb >=net-libs/libupnp-1.8.3[ipv6,reuseaddr] >=dev-db/sqlite-3 dev-libs/expat mysql? ( virtual/mysql ) javascript? ( dev-lang/duktape ) taglib? ( >=media-libs/taglib-1.11 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) exiv2? ( media-gfx/exiv2 ) ffmpeg? ( libav? ( >=media-video/libav-10:0= ) !libav? ( >=media-video/ffmpeg-2.2:0= ) ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl net-misc/youtube-dl ) magic? ( sys-apps/file ) sys-apps/util-linux sys-libs/zlib virtual/libiconv virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/gerbera/gerbera/archive/v1.2.0.tar.gz -> gerbera-1.2.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	systemd	47c677ae1d7b69031f11f630ac09f0d1	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0f154104ed2299da415768d084c67261
diff --git a/metadata/md5-cache/net-misc/gerbera-9999 b/metadata/md5-cache/net-misc/gerbera-9999
index f5fc67c698b1..f05ebde19c88 100644
--- a/metadata/md5-cache/net-misc/gerbera-9999
+++ b/metadata/md5-cache/net-misc/gerbera-9999
@@ -7,5 +7,5 @@ IUSE=curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm libav +
 LICENSE=GPL-2
 RDEPEND=!!net-misc/mediatomb net-libs/libupnp:1.8[ipv6,reuseaddr] >=dev-db/sqlite-3 dev-libs/expat mysql? ( virtual/mysql ) javascript? ( dev-lang/duktape ) taglib? ( >=media-libs/taglib-1.11 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) exiv2? ( media-gfx/exiv2 ) ffmpeg? ( libav? ( >=media-video/libav-10:0= ) !libav? ( >=media-video/ffmpeg-2.2:0= ) ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl net-misc/youtube-dl ) magic? ( sys-apps/file ) sys-apps/util-linux sys-libs/zlib virtual/libiconv virtual/tmpfiles
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2685d6df94eeb9ea404bf2fa8d3d1425
diff --git a/metadata/md5-cache/net-misc/gnome-online-miners-3.24.0 b/metadata/md5-cache/net-misc/gnome-online-miners-3.24.0
index be1bd77ffc30..3486397a8bcd 100644
--- a/metadata/md5-cache/net-misc/gnome-online-miners-3.24.0
+++ b/metadata/md5-cache/net-misc/gnome-online-miners-3.24.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-misc/tracker-1:0= >=dev-libs/glib-2.35.1:2 >=dev-libs/libgdata-0.15.2:0=[crypt,gnome-online-accounts] media-libs/grilo:0.3 >=net-libs/gnome-online-accounts-3.13.3:= >=net-libs/libgfbgraph-0.2.2:0.2 >=net-libs/libzapojit-0.0.2 flickr? ( media-plugins/grilo-plugins:0.3[flickr] )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-online-miners/3.24/gnome-online-miners-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8251ad15952abdaa4554ca6bcaf2b332
diff --git a/metadata/md5-cache/net-misc/gns3-converter-1.3.0 b/metadata/md5-cache/net-misc/gns3-converter-1.3.0
index c5bc1695a32d..896694019b78 100644
--- a/metadata/md5-cache/net-misc/gns3-converter-1.3.0
+++ b/metadata/md5-cache/net-misc/gns3-converter-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/configobj[python_targets_python3_4(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/GNS3/gns3-converter/archive/v1.3.0.tar.gz -> gns3-converter-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ff82e95531bfdd6449a1325ede549a60
diff --git a/metadata/md5-cache/net-misc/gns3-gui-1.5.3.1 b/metadata/md5-cache/net-misc/gns3-gui-1.5.3.1
index 09aafeeb019a..2f670f2dc9f5 100644
--- a/metadata/md5-cache/net-misc/gns3-gui-1.5.3.1
+++ b/metadata/md5-cache/net-misc/gns3-gui-1.5.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_4 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/GNS3/gns3-gui/archive/v1.5.3.1.tar.gz -> gns3-gui-1.5.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=48f06070bd9a3e97ce0ff6d6698d4298
diff --git a/metadata/md5-cache/net-misc/gns3-gui-2.0.3-r1 b/metadata/md5-cache/net-misc/gns3-gui-2.0.3-r1
index 588bdd583a6a..541e90959339 100644
--- a/metadata/md5-cache/net-misc/gns3-gui-2.0.3-r1
+++ b/metadata/md5-cache/net-misc/gns3-gui-2.0.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/GNS3/gns3-gui/archive/v2.0.3.tar.gz -> gns3-gui-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=da32c156c77b22efb32846a0cbe61da9
diff --git a/metadata/md5-cache/net-misc/gns3-gui-2.1.3-r1 b/metadata/md5-cache/net-misc/gns3-gui-2.1.3-r1
index 826d291b8207..11b647d81ea4 100644
--- a/metadata/md5-cache/net-misc/gns3-gui-2.1.3-r1
+++ b/metadata/md5-cache/net-misc/gns3-gui-2.1.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/GNS3/gns3-gui/archive/v2.1.3.tar.gz -> gns3-gui-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=071a06858974cbbead1dfc1a28eb9079
diff --git a/metadata/md5-cache/net-misc/gns3-server-1.5.3.1-r1 b/metadata/md5-cache/net-misc/gns3-server-1.5.3.1-r1
index 2ed035d7ee01..6d1be47fb250 100644
--- a/metadata/md5-cache/net-misc/gns3-server-1.5.3.1-r1
+++ b/metadata/md5-cache/net-misc/gns3-server-1.5.3.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_4 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/GNS3/gns3-server/archive/v1.5.3.1.tar.gz -> gns3-server-1.5.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=a41e572c684709b3d11f3e82287e5fbb
diff --git a/metadata/md5-cache/net-misc/gns3-server-2.0.3-r2 b/metadata/md5-cache/net-misc/gns3-server-2.0.3-r2
index 0d93d3c4ba79..c9b700ffe237 100644
--- a/metadata/md5-cache/net-misc/gns3-server-2.0.3-r2
+++ b/metadata/md5-cache/net-misc/gns3-server-2.0.3-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/GNS3/gns3-server/archive/v2.0.3.tar.gz -> gns3-server-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=925663ed098b2610e005feee29ea95f3
diff --git a/metadata/md5-cache/net-misc/gns3-server-2.1.3-r3 b/metadata/md5-cache/net-misc/gns3-server-2.1.3-r3
index 983f1d51ab5a..33a465f03807 100644
--- a/metadata/md5-cache/net-misc/gns3-server-2.1.3-r3
+++ b/metadata/md5-cache/net-misc/gns3-server-2.1.3-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targe
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7ee254ff018325d29985a9954e701e1a
diff --git a/metadata/md5-cache/net-misc/grdesktop-0.23-r1 b/metadata/md5-cache/net-misc/grdesktop-0.23-r1
index 451c24d88fb5..d98773212f5e 100644
--- a/metadata/md5-cache/net-misc/grdesktop-0.23-r1
+++ b/metadata/md5-cache/net-misc/grdesktop-0.23-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 >=gnome-base/libgnomeui-2 net-misc/rdesktop gnome-base/gconf:2
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/grdesktop/grdesktop-0.23.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=8e7d6a98c8ea99c67095d4ac5e924d9b
diff --git a/metadata/md5-cache/net-misc/grive-0.4.0_pre20150905 b/metadata/md5-cache/net-misc/grive-0.4.0_pre20150905
index 836cd46e251a..c2e76f9eae29 100644
--- a/metadata/md5-cache/net-misc/grive-0.4.0_pre20150905
+++ b/metadata/md5-cache/net-misc/grive-0.4.0_pre20150905
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/boost:= dev-libs/expat >=dev-libs/json-c-0.11-r1:= dev-libs/libgcrypt:0= net-misc/curl sys-libs/glibc dev-libs/yajl
 SLOT=0
 SRC_URI=https://github.com/vitalif/grive2/archive/5dc7028c8aebb26d35ed31c4b07ac180cc1887c9.tar.gz -> grive-0.4.0_pre20150905.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e25d37ffa675f4c0af3b8431d867a068
diff --git a/metadata/md5-cache/net-misc/grive-0.4.0_pre20150905-r1 b/metadata/md5-cache/net-misc/grive-0.4.0_pre20150905-r1
index 1fe64d1f93b2..9732a1ca9c40 100644
--- a/metadata/md5-cache/net-misc/grive-0.4.0_pre20150905-r1
+++ b/metadata/md5-cache/net-misc/grive-0.4.0_pre20150905-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/boost:= dev-libs/expat >=dev-libs/json-c-0.11-r1:= dev-libs/libgcrypt:0= net-misc/curl sys-libs/binutils-libs:0= sys-libs/glibc dev-libs/yajl
 SLOT=0
 SRC_URI=https://github.com/vitalif/grive2/archive/5dc7028c8aebb26d35ed31c4b07ac180cc1887c9.tar.gz -> grive-0.4.0_pre20150905.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5e9a8ae39dd2835f9701e4f4d967fdf6
diff --git a/metadata/md5-cache/net-misc/grive-0.4.0_pre20151011 b/metadata/md5-cache/net-misc/grive-0.4.0_pre20151011
index e22f43560969..70916f8d2357 100644
--- a/metadata/md5-cache/net-misc/grive-0.4.0_pre20151011
+++ b/metadata/md5-cache/net-misc/grive-0.4.0_pre20151011
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/boost:= dev-libs/expat >=dev-libs/json-c-0.11-r1:= dev-libs/libgcrypt:0= net-misc/curl sys-libs/binutils-libs:0= sys-libs/glibc dev-libs/yajl
 SLOT=0
 SRC_URI=https://github.com/vitalif/grive2/archive/44cb91f94e67bcdad77ca564b4d8083cedf72251.tar.gz -> grive-0.4.0_pre20151011.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=20ff2e9c605d9af8e8c808e8b7e63e32
diff --git a/metadata/md5-cache/net-misc/grive-0.5.1_pre20160114 b/metadata/md5-cache/net-misc/grive-0.5.1_pre20160114
index 6545bb081f07..585e699f3293 100644
--- a/metadata/md5-cache/net-misc/grive-0.5.1_pre20160114
+++ b/metadata/md5-cache/net-misc/grive-0.5.1_pre20160114
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/boost:= dev-libs/expat >=dev-libs/json-c-0.11-r1:= dev-libs/libgcrypt:0= net-misc/curl sys-libs/binutils-libs:0= sys-libs/glibc dev-libs/yajl
 SLOT=0
 SRC_URI=https://github.com/vitalif/grive2/archive/cfb8ff08b300d1fa57e12cdc85f724e3e25c906d.tar.gz -> grive-0.5.1_pre20160114.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3585d500ea0b661bb8fa4b05175304f9
diff --git a/metadata/md5-cache/net-misc/grive-0.5.1_pre20160706 b/metadata/md5-cache/net-misc/grive-0.5.1_pre20160706
index 1827cf5cb868..26f379556aee 100644
--- a/metadata/md5-cache/net-misc/grive-0.5.1_pre20160706
+++ b/metadata/md5-cache/net-misc/grive-0.5.1_pre20160706
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/boost:= dev-libs/expat >=dev-libs/json-c-0.11-r1:= dev-libs/libgcrypt:0= || ( net-misc/curl[curl_ssl_openssl] net-misc/curl[curl_ssl_gnutls] ) sys-libs/binutils-libs:0= sys-libs/glibc dev-libs/yajl
 SLOT=0
 SRC_URI=https://github.com/vitalif/grive2/archive/457d84974592ed3f123622b12f2a7a748cbc0668.tar.gz -> grive-0.5.1_pre20160706.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0b5bddc993b6e3337f8f3f4891cf45f5
diff --git a/metadata/md5-cache/net-misc/grive-0.5.1_pre20161004 b/metadata/md5-cache/net-misc/grive-0.5.1_pre20161004
index 94ee28c23f43..c23e854d52ad 100644
--- a/metadata/md5-cache/net-misc/grive-0.5.1_pre20161004
+++ b/metadata/md5-cache/net-misc/grive-0.5.1_pre20161004
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/boost:= dev-libs/expat >=dev-libs/json-c-0.11-r1:= dev-libs/libgcrypt:0= || ( net-misc/curl[curl_ssl_openssl] net-misc/curl[curl_ssl_gnutls] ) sys-libs/binutils-libs:0= sys-libs/glibc dev-libs/yajl
 SLOT=0
 SRC_URI=https://github.com/vitalif/grive2/archive/7bbb01c3014cc996ec24a7e5c0684f24b604b735.tar.gz -> grive-0.5.1_pre20161004.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e50adb94ffbea39b45b91cb16d459d73
diff --git a/metadata/md5-cache/net-misc/grive-0.5.1_pre20171005 b/metadata/md5-cache/net-misc/grive-0.5.1_pre20171005
index b51432e911fd..a1ca120435c3 100644
--- a/metadata/md5-cache/net-misc/grive-0.5.1_pre20171005
+++ b/metadata/md5-cache/net-misc/grive-0.5.1_pre20171005
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/boost:= dev-libs/expat >=dev-libs/json-c-0.11-r1:= dev-libs/libgcrypt:0= || ( net-misc/curl[curl_ssl_openssl] net-misc/curl[curl_ssl_gnutls] ) sys-libs/binutils-libs:0= sys-libs/glibc dev-libs/yajl
 SLOT=0
 SRC_URI=https://github.com/vitalif/grive2/archive/3c90425b8f46b62365ec3d84de628163865dbb1e.tar.gz -> grive-0.5.1_pre20171005.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=40101d4e03c5a0ccc30f7d196c74ce2f
diff --git a/metadata/md5-cache/net-misc/gsutil-4.27 b/metadata/md5-cache/net-misc/gsutil-4.27
index 43ee6da890d1..759701d9de23 100644
--- a/metadata/md5-cache/net-misc/gsutil-4.27
+++ b/metadata/md5-cache/net-misc/gsutil-4.27
@@ -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=http://commondatastorage.googleapis.com/pub/gsutil_4.27.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e06842aaa627e8501863fe796878b921
diff --git a/metadata/md5-cache/net-misc/gsutil-4.28 b/metadata/md5-cache/net-misc/gsutil-4.28
index aa55b28ca63c..1e63a12a160e 100644
--- a/metadata/md5-cache/net-misc/gsutil-4.28
+++ b/metadata/md5-cache/net-misc/gsutil-4.28
@@ -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=http://commondatastorage.googleapis.com/pub/gsutil_4.28.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=45d9d621eb3d8d51f2f0c674494f180d
diff --git a/metadata/md5-cache/net-misc/gsutil-4.30 b/metadata/md5-cache/net-misc/gsutil-4.30
index 7f8cb0c88d33..ce757e63a009 100644
--- a/metadata/md5-cache/net-misc/gsutil-4.30
+++ b/metadata/md5-cache/net-misc/gsutil-4.30
@@ -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=http://commondatastorage.googleapis.com/pub/gsutil_4.30.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=61e730c69fb2fce4b3dbc1cbd29ad5b0
diff --git a/metadata/md5-cache/net-misc/gsutil-4.32 b/metadata/md5-cache/net-misc/gsutil-4.32
index 72857af49ddb..3ba04806edb4 100644
--- a/metadata/md5-cache/net-misc/gsutil-4.32
+++ b/metadata/md5-cache/net-misc/gsutil-4.32
@@ -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=http://commondatastorage.googleapis.com/pub/gsutil_4.32.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7f0a2f5671f923691bc48e680f5b2a08
diff --git a/metadata/md5-cache/net-misc/gupnp-tools-0.8.14 b/metadata/md5-cache/net-misc/gupnp-tools-0.8.14
index 5177afaa4573..a6d078571456 100644
--- a/metadata/md5-cache/net-misc/gupnp-tools-0.8.14
+++ b/metadata/md5-cache/net-misc/gupnp-tools-0.8.14
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.24:2 >=dev-libs/libxml2-2.4:2 >=net-libs/gssdp-0.13.3:0= >=net-libs/gupnp-0.20.14:0= >=net-libs/gupnp-av-0.5.5:0= >=net-libs/libsoup-2.42:2.4 >=x11-libs/gtk+-3.10:3 >=x11-libs/gtksourceview-3.2:3.0
 SLOT=0
 SRC_URI=mirror://gnome/sources/gupnp-tools/0.8/gupnp-tools-0.8.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=6373f1d039eae245ce3ff80652c35d0c
diff --git a/metadata/md5-cache/net-misc/gvrpcd-1.3 b/metadata/md5-cache/net-misc/gvrpcd-1.3
index bfe5b7404dc0..3b0745adff76 100644
--- a/metadata/md5-cache/net-misc/gvrpcd-1.3
+++ b/metadata/md5-cache/net-misc/gvrpcd-1.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libnet:1.1
 SLOT=0
 SRC_URI=http://sokrates.mimuw.edu.pl/~sebek/gvrpcd/gvrpcd-1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5796278468f1520930dc03211b8c7778
diff --git a/metadata/md5-cache/net-misc/gwget-1.0.4 b/metadata/md5-cache/net-misc/gwget-1.0.4
index 32762e77810f..1799c103a58d 100644
--- a/metadata/md5-cache/net-misc/gwget-1.0.4
+++ b/metadata/md5-cache/net-misc/gwget-1.0.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-misc/wget >=x11-libs/gtk+-2.6:2 >=dev-libs/glib-2.16.0:2 >=gnome-base/gconf-2:2 >=gnome-base/libgnomeui-2 >=dev-libs/dbus-glib-0.70 epiphany? ( >=www-client/epiphany-1.4 ) libnotify? ( >=x11-libs/libnotify-0.2.2 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gwget/1.0/gwget-1.0.4.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=2fa892ecd8512f4e60f66c11d1c32f09
diff --git a/metadata/md5-cache/net-misc/hotot-0.9.8.15_p20150812-r2 b/metadata/md5-cache/net-misc/hotot-0.9.8.15_p20150812-r2
index 64fc9ddfd46a..27038643e87f 100644
--- a/metadata/md5-cache/net-misc/hotot-0.9.8.15_p20150812-r2
+++ b/metadata/md5-cache/net-misc/hotot-0.9.8.15_p20150812-r2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=|| ( chrome qt5 ) python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/lyricat/Hotot/tarball/452fc0924a98923b -> hotot-0.9.8.15_p20150812.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8042f1b6749fda2626d8ea5a3fe03692
diff --git a/metadata/md5-cache/net-misc/hotot-9999 b/metadata/md5-cache/net-misc/hotot-9999
index e7a5932688cb..a7430ede6544 100644
--- a/metadata/md5-cache/net-misc/hotot-9999
+++ b/metadata/md5-cache/net-misc/hotot-9999
@@ -8,5 +8,5 @@ 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/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(+)] qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 )
 REQUIRED_USE=|| ( chrome qt5 ) 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cb6e1de8daf9e49475387fe5c5330f84
diff --git a/metadata/md5-cache/net-misc/htbinit-0.8.5-r7 b/metadata/md5-cache/net-misc/htbinit-0.8.5-r7
index 55df75acab56..b803593724f1 100644
--- a/metadata/md5-cache/net-misc/htbinit-0.8.5-r7
+++ b/metadata/md5-cache/net-misc/htbinit-0.8.5-r7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/iproute2
 SLOT=0
 SRC_URI=mirror://sourceforge/htbinit/htb.init-v0.8.5
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8ab7a25202011054447abb750311b008
diff --git a/metadata/md5-cache/net-misc/httpie-0.9.2 b/metadata/md5-cache/net-misc/httpie-0.9.2
index 38304c0e8e0b..d4229ef0a63c 100644
--- a/metadata/md5-cache/net-misc/httpie-0.9.2
+++ b/metadata/md5-cache/net-misc/httpie-0.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/requests-2.3.0[python_targets_python2_7(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/h/httpie/httpie-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1a65eb8bb82a674f0427951cd7d12a20
diff --git a/metadata/md5-cache/net-misc/httpie-0.9.3 b/metadata/md5-cache/net-misc/httpie-0.9.3
index 3c0c897f6396..55d005ad485f 100644
--- a/metadata/md5-cache/net-misc/httpie-0.9.3
+++ b/metadata/md5-cache/net-misc/httpie-0.9.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/requests-2.3.0[python_targets_python2_7(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/h/httpie/httpie-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b4b9847762558f83b56a54fbbc835d14
diff --git a/metadata/md5-cache/net-misc/httpie-0.9.4 b/metadata/md5-cache/net-misc/httpie-0.9.4
index 1acc2db49065..a7f08a091442 100644
--- a/metadata/md5-cache/net-misc/httpie-0.9.4
+++ b/metadata/md5-cache/net-misc/httpie-0.9.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/requests-2.3.0[python_targets_python2_7(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/h/httpie/httpie-0.9.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b4b9847762558f83b56a54fbbc835d14
diff --git a/metadata/md5-cache/net-misc/httpie-0.9.9 b/metadata/md5-cache/net-misc/httpie-0.9.9
index 1e830630cfaf..649f0158f85c 100644
--- a/metadata/md5-cache/net-misc/httpie-0.9.9
+++ b/metadata/md5-cache/net-misc/httpie-0.9.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/requests-2.11.0[python_targets_python2_7(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/h/httpie/httpie-0.9.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=21b76246806dc4d5ba650f8f074e3ba0
diff --git a/metadata/md5-cache/net-misc/icaclient-13.10.0.20 b/metadata/md5-cache/net-misc/icaclient-13.10.0.20
index a0f0b575c0c7..9121beb74fad 100644
--- a/metadata/md5-cache/net-misc/icaclient-13.10.0.20
+++ b/metadata/md5-cache/net-misc/icaclient-13.10.0.20
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/atk dev-libs/glib:2 dev-libs/libxml2 media-fonts/font-adobe-100
 RESTRICT=mirror strip userpriv fetch
 SLOT=0
 SRC_URI=amd64? ( linuxx64-13.10.0.20.tar.gz ) x86? ( linuxx86-13.10.0.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4bf3c931dbc4f05a034abaebc160b48a
diff --git a/metadata/md5-cache/net-misc/icaclient-13.9.1.6 b/metadata/md5-cache/net-misc/icaclient-13.9.1.6
index fab38d92aeaa..6b13d19a8b6e 100644
--- a/metadata/md5-cache/net-misc/icaclient-13.9.1.6
+++ b/metadata/md5-cache/net-misc/icaclient-13.9.1.6
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/atk dev-libs/glib:2 dev-libs/libxml2 media-fonts/font-adobe-100
 RESTRICT=mirror strip userpriv fetch
 SLOT=0
 SRC_URI=amd64? ( linuxx64-13.9.1.6.tar.gz ) x86? ( linuxx86-13.9.1.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=36991b4bcdfde6ee7a9eb9f9d3d9a61d
diff --git a/metadata/md5-cache/net-misc/ifenslave-1.1.0-r6 b/metadata/md5-cache/net-misc/ifenslave-1.1.0-r6
index 1576b7e49a3b..946312356227 100644
--- a/metadata/md5-cache/net-misc/ifenslave-1.1.0-r6
+++ b/metadata/md5-cache/net-misc/ifenslave-1.1.0-r6
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 ~arm ~mips ppc sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/i/ifenslave-2.6/ifenslave-2.6_1.1.0.orig.tar.gz mirror://debian/pool/main/i/ifenslave-2.6/ifenslave-2.6_1.1.0-17.debian.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=9874d00bf1dfab5bb2939bf9f7dd3b30
diff --git a/metadata/md5-cache/net-misc/igmpproxy-0.1-r2 b/metadata/md5-cache/net-misc/igmpproxy-0.1-r2
index ffbe1c5bceb3..6f6ac2b9e74d 100644
--- a/metadata/md5-cache/net-misc/igmpproxy-0.1-r2
+++ b/metadata/md5-cache/net-misc/igmpproxy-0.1-r2
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2 Stanford
 SLOT=0
 SRC_URI=mirror://sourceforge/igmpproxy/igmpproxy-0.1.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=71c567190c5babb4c6a2cd05ff4e1111
diff --git a/metadata/md5-cache/net-misc/igmpproxy-0.2 b/metadata/md5-cache/net-misc/igmpproxy-0.2
index 61eb34e9bec4..b3986859c4df 100644
--- a/metadata/md5-cache/net-misc/igmpproxy-0.2
+++ b/metadata/md5-cache/net-misc/igmpproxy-0.2
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 Stanford
 SLOT=0
 SRC_URI=https://github.com/pali/igmpproxy/releases/download/0.2/igmpproxy-0.2.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=ea0636a4866d005e3cfa87a05e604b38
diff --git a/metadata/md5-cache/net-misc/igmpproxy-0.2.1 b/metadata/md5-cache/net-misc/igmpproxy-0.2.1
index d266019703de..b5cb43046db8 100644
--- a/metadata/md5-cache/net-misc/igmpproxy-0.2.1
+++ b/metadata/md5-cache/net-misc/igmpproxy-0.2.1
@@ -4,9 +4,9 @@ DESCRIPTION=A multicast routing daemon which uses IGMP forwarding
 EAPI=6
 HOMEPAGE=https://github.com/pali/igmpproxy
 IUSE=kernel_linux
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://github.com/pali/igmpproxy/releases/download/0.2.1/igmpproxy-0.2.1.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=54797036f9dfe030b0d6f3625f061fd9
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=e3472bf9c8ba0ed66d6858fcd647dd6a
diff --git a/metadata/md5-cache/net-misc/iputils-20180629 b/metadata/md5-cache/net-misc/iputils-20180629
index 46af7185b9fb..001bb557c590 100644
--- a/metadata/md5-cache/net-misc/iputils-20180629
+++ b/metadata/md5-cache/net-misc/iputils-20180629
@@ -10,4 +10,4 @@ RDEPEND=arping? ( !net-misc/arping ) rarpd? ( !net-misc/rarpd ) traceroute? ( !n
 SLOT=0
 SRC_URI=https://github.com/iputils/iputils/archive/s20180629.tar.gz -> iputils-20180629.tar.gz https://dev.gentoo.org/~whissi/dist/iputils/iputils-manpages-20180629.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5d6267c36b68c2791a7d008c782be76a
+_md5_=ca3a3a408b70cb568a5a0801c11f6fff
diff --git a/metadata/md5-cache/net-misc/jlj-2.12-r1 b/metadata/md5-cache/net-misc/jlj-2.12-r1
new file mode 100644
index 000000000000..a7e6dc96af9d
--- /dev/null
+++ b/metadata/md5-cache/net-misc/jlj-2.12-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst
+DEPEND=dev-lang/perl
+DESCRIPTION=Simple console LiveJournal entry system
+EAPI=7
+HOMEPAGE=http://umlautllama.com/projects/perl/#jlj
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
+LICENSE=freedist
+SLOT=0
+SRC_URI=http://umlautllama.com/projects/perl/jlj_2.12.tar.gz
+_md5_=9cd8a5a8e64b0411a77f2086db7d95bc
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 14a7d8903c14..fa18e061d984 100644
--- a/metadata/md5-cache/net-misc/knemo-0.8.0_pre20161211
+++ b/metadata/md5-cache/net-misc/knemo-0.8.0_pre20161211
@@ -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/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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/libteam-1.22 b/metadata/md5-cache/net-misc/libteam-1.22
index 4be05b787331..558eb9cd10cd 100644
--- a/metadata/md5-cache/net-misc/libteam-1.22
+++ b/metadata/md5-cache/net-misc/libteam-1.22
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/jansson-2.4 dev-libs/libdaemon >=dev-libs/libnl-3.2.19[utils] dbus? ( sys-apps/dbus ) zmq? ( >=net-libs/zeromq-3.2.0 ) syslog? ( virtual/logger )
 SLOT=0
 SRC_URI=http://libteam.org/files/libteam-1.22.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=617b7d9bfbb8b6aaeb6efd11526e032a
diff --git a/metadata/md5-cache/net-misc/linuxptp-1.5 b/metadata/md5-cache/net-misc/linuxptp-1.5
index 4462897ba5e1..ed647b6647a2 100644
--- a/metadata/md5-cache/net-misc/linuxptp-1.5
+++ b/metadata/md5-cache/net-misc/linuxptp-1.5
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/linuxptp/v1.5/linuxptp-1.5.tgz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=8f3c170058a350911672c0b7706edefe
diff --git a/metadata/md5-cache/net-misc/linuxptp-1.6 b/metadata/md5-cache/net-misc/linuxptp-1.6
index d0275dc9b18b..ad84c6b7b998 100644
--- a/metadata/md5-cache/net-misc/linuxptp-1.6
+++ b/metadata/md5-cache/net-misc/linuxptp-1.6
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/linuxptp/v1.6/linuxptp-1.6.tgz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=8f3c170058a350911672c0b7706edefe
diff --git a/metadata/md5-cache/net-misc/linuxptp-1.7 b/metadata/md5-cache/net-misc/linuxptp-1.7
index 94e2c899d828..57f604461110 100644
--- a/metadata/md5-cache/net-misc/linuxptp-1.7
+++ b/metadata/md5-cache/net-misc/linuxptp-1.7
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/linuxptp/v1.7/linuxptp-1.7.tgz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=91674e606d20f1f038b99510d446bad6
diff --git a/metadata/md5-cache/net-misc/linuxptp-1.8 b/metadata/md5-cache/net-misc/linuxptp-1.8
index bd37938fd4cb..4542738b4e24 100644
--- a/metadata/md5-cache/net-misc/linuxptp-1.8
+++ b/metadata/md5-cache/net-misc/linuxptp-1.8
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/linuxptp/v1.8/linuxptp-1.8.tgz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=91674e606d20f1f038b99510d446bad6
diff --git a/metadata/md5-cache/net-misc/lksctp-tools-1.0.13 b/metadata/md5-cache/net-misc/lksctp-tools-1.0.13
index 9d99a0b046d1..80dacf045d97 100644
--- a/metadata/md5-cache/net-misc/lksctp-tools-1.0.13
+++ b/metadata/md5-cache/net-misc/lksctp-tools-1.0.13
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2+ LGPL-2.1 )
 REQUIRED_USE=kernel_linux
 SLOT=0
 SRC_URI=mirror://sourceforge/lksctp/lksctp-tools-1.0.13.tar.gz
-_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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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
 _md5_=3159cef3a339d633df61c0c083b656d0
diff --git a/metadata/md5-cache/net-misc/lksctp-tools-1.0.16 b/metadata/md5-cache/net-misc/lksctp-tools-1.0.16
index 9de7cf3d647e..04a1a0b24043 100644
--- a/metadata/md5-cache/net-misc/lksctp-tools-1.0.16
+++ b/metadata/md5-cache/net-misc/lksctp-tools-1.0.16
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2+ LGPL-2.1 )
 REQUIRED_USE=kernel_linux
 SLOT=0
 SRC_URI=mirror://sourceforge/lksctp/lksctp-tools-1.0.16.tar.gz
-_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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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
 _md5_=3860dce97e3c3230d13207b90783fdf0
diff --git a/metadata/md5-cache/net-misc/lksctp-tools-1.0.17 b/metadata/md5-cache/net-misc/lksctp-tools-1.0.17
index 9b6558bf85c2..b853d055f868 100644
--- a/metadata/md5-cache/net-misc/lksctp-tools-1.0.17
+++ b/metadata/md5-cache/net-misc/lksctp-tools-1.0.17
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2+ LGPL-2.1 )
 REQUIRED_USE=kernel_linux
 SLOT=0
 SRC_URI=mirror://sourceforge/lksctp/lksctp-tools-1.0.17.tar.gz
-_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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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
 _md5_=a79a8c07e80582f618375cabee911a99
diff --git a/metadata/md5-cache/net-misc/lksctp-tools-1.0.18 b/metadata/md5-cache/net-misc/lksctp-tools-1.0.18
new file mode 100644
index 000000000000..1c03b62a4c4c
--- /dev/null
+++ b/metadata/md5-cache/net-misc/lksctp-tools-1.0.18
@@ -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_=8b1fc54b6fdd36e9d8497a814661dafa
diff --git a/metadata/md5-cache/net-misc/mcproxy-1.1.1 b/metadata/md5-cache/net-misc/mcproxy-1.1.1
index da14af803480..d8d78b5da1a7 100644
--- a/metadata/md5-cache/net-misc/mcproxy-1.1.1
+++ b/metadata/md5-cache/net-misc/mcproxy-1.1.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://github.com/mcproxy/mcproxy/archive/v1.1.1.tar.gz -> mcproxy-1.1.1.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=dbe6fe636ddb957c1caba4922d3a6ed1
diff --git a/metadata/md5-cache/net-misc/minidlna-1.1.5-r1 b/metadata/md5-cache/net-misc/minidlna-1.1.5-r1
index 74e02b40c595..34f55e49745d 100644
--- a/metadata/md5-cache/net-misc/minidlna-1.1.5-r1
+++ b/metadata/md5-cache/net-misc/minidlna-1.1.5-r1
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=dev-db/sqlite:3 media-libs/flac media-libs/libexif media-libs/libid3tag media-libs/libogg media-libs/libvorbis virtual/ffmpeg virtual/jpeg:0
 SLOT=0
 SRC_URI=mirror://sourceforge/minidlna/1.1.5/minidlna-1.1.5.tar.gz https://dev.gentoo.org/~xmw/minidlna-gentoo-artwork.patch.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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_=aa5d41ccdc65de67c03c1e787f2d8264
diff --git a/metadata/md5-cache/net-misc/minidlna-1.2.1 b/metadata/md5-cache/net-misc/minidlna-1.2.1
index c3995fe53c71..665cf6695feb 100644
--- a/metadata/md5-cache/net-misc/minidlna-1.2.1
+++ b/metadata/md5-cache/net-misc/minidlna-1.2.1
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=dev-db/sqlite:3 media-libs/flac media-libs/libexif media-libs/libid3tag media-libs/libogg media-libs/libvorbis virtual/ffmpeg virtual/jpeg:0 avahi? ( net-dns/avahi )
 SLOT=0
 SRC_URI=mirror://sourceforge/minidlna/1.2.1/minidlna-1.2.1.tar.gz https://dev.gentoo.org/~xmw/minidlna-gentoo-artwork.patch.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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_=2a087e6473b17b4ddb4dfa7cccf1bf72
diff --git a/metadata/md5-cache/net-misc/modemmanager-1.6.12 b/metadata/md5-cache/net-misc/modemmanager-1.6.12
index b89e4fa54b5c..4cc1f8051ad5 100644
--- a/metadata/md5-cache/net-misc/modemmanager-1.6.12
+++ b/metadata/md5-cache/net-misc/modemmanager-1.6.12
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.36.0:2 >=virtual/libgudev-230:= introspection? ( >=dev
 REQUIRED_USE=vala? ( introspection )
 SLOT=0/1
 SRC_URI=https://www.freedesktop.org/software/ModemManager/ModemManager-1.6.12.tar.xz
-_eclasses_=desktop	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4d0807bc0d59a7e53dcfdc421c7f88d7
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.10.10 b/metadata/md5-cache/net-misc/networkmanager-1.10.10
index 644d5afa20e7..f5a3c5bfe3e8 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.10.10
+++ b/metadata/md5-cache/net-misc/networkmanager-1.10.10
@@ -4,11 +4,11 @@ DESCRIPTION=A set of co-operative tools that make networking simple and straight
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 IUSE=audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection 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
+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.37.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(-)?] >=dev-libs/libnl-3.2.8: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(-)?] 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[abi_x86_32(-)?,abi_x86_64(-)?,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? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
 REQUIRED_USE=modemmanager? ( ppp ) vala? ( introspection ) wext? ( wifi ) ^^ ( nss gnutls ) ?? ( consolekit elogind systemd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/1.10/NetworkManager-1.10.10.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=225d59b38099f618794862f85653909d
+_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_=e9e34a7b069e5079d5be033c6ec2590d
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.12.2 b/metadata/md5-cache/net-misc/networkmanager-1.12.2
index 81bbedd2adc3..ee99127cff01 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.12.2
+++ b/metadata/md5-cache/net-misc/networkmanager-1.12.2
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/dbus-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mi
 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	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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.12.4 b/metadata/md5-cache/net-misc/networkmanager-1.12.4
index 5097da317068..912af7054c5c 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.12.4
+++ b/metadata/md5-cache/net-misc/networkmanager-1.12.4
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/dbus-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mi
 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.4.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	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9b7bacf5405f95301c110d68cf6a5e7b
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.14.0 b/metadata/md5-cache/net-misc/networkmanager-1.14.0
index 09ff4a146862..bc1ae4a20284 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.14.0
+++ b/metadata/md5-cache/net-misc/networkmanager-1.14.0
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/dbus-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mi
 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.0.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	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9b7bacf5405f95301c110d68cf6a5e7b
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.8.4 b/metadata/md5-cache/net-misc/networkmanager-1.8.4
index 70bf58fac933..a04c7b13986d 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.8.4
+++ b/metadata/md5-cache/net-misc/networkmanager-1.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/dbus-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mi
 REQUIRED_USE=modemmanager? ( ppp ) vala? ( introspection ) wext? ( wifi ) ^^ ( nss gnutls ) ?? ( consolekit elogind systemd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/1.8/NetworkManager-1.8.4.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cde36408c088e17e3d86a20fcdcfa38e
diff --git a/metadata/md5-cache/net-misc/networkmanager-fortisslvpn-1.2.6 b/metadata/md5-cache/net-misc/networkmanager-fortisslvpn-1.2.6
index aa94b4e27327..4a71499d31e7 100644
--- a/metadata/md5-cache/net-misc/networkmanager-fortisslvpn-1.2.6
+++ b/metadata/md5-cache/net-misc/networkmanager-fortisslvpn-1.2.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=net-misc/networkmanager-1.2:= >=dev-libs/glib-2.32:2 net-dialup/ppp:= >=net-vpn/openfortivpn-1.2.0 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.2.0 >=x11-libs/gtk+-3.4:3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-fortisslvpn/1.2/NetworkManager-fortisslvpn-1.2.6.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=a7b6dec75b0c29b29e7c7bcb5f7f7785
diff --git a/metadata/md5-cache/net-misc/networkmanager-fortisslvpn-1.2.8 b/metadata/md5-cache/net-misc/networkmanager-fortisslvpn-1.2.8
index 553dcc56f333..2693cdf37411 100644
--- a/metadata/md5-cache/net-misc/networkmanager-fortisslvpn-1.2.8
+++ b/metadata/md5-cache/net-misc/networkmanager-fortisslvpn-1.2.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=net-misc/networkmanager-1.2:= >=dev-libs/glib-2.32:2 net-dialup/ppp:= >=net-vpn/openfortivpn-1.2.0 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.2.0 >=x11-libs/gtk+-3.4:3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-fortisslvpn/1.2/NetworkManager-fortisslvpn-1.2.8.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=52fc88e657e0f1a1c373310f02eaf2ff
diff --git a/metadata/md5-cache/net-misc/networkmanager-libreswan-1.2.6 b/metadata/md5-cache/net-misc/networkmanager-libreswan-1.2.6
index be8a2008b64b..3cd951248bc4 100644
--- a/metadata/md5-cache/net-misc/networkmanager-libreswan-1.2.6
+++ b/metadata/md5-cache/net-misc/networkmanager-libreswan-1.2.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/libnl-3.2.8:3 >=net-misc/networkmanager-1.2.0:= net-vpn/libreswan gtk? ( app-crypt/libsecret >=gnome-extra/nm-applet-1.2.0 >=x11-libs/gtk+-3.4:3 ) !net-misc/networkmanager-openswan
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-libreswan/1.2/NetworkManager-libreswan-1.2.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1a17366395c0cb63f853b30f0694d7b0
diff --git a/metadata/md5-cache/net-misc/networkmanager-openconnect-1.2.4-r1 b/metadata/md5-cache/net-misc/networkmanager-openconnect-1.2.4-r1
index 5397581fffaa..052641e5888c 100644
--- a/metadata/md5-cache/net-misc/networkmanager-openconnect-1.2.4-r1
+++ b/metadata/md5-cache/net-misc/networkmanager-openconnect-1.2.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=net-misc/networkmanager-1.2:= >=dev-libs/glib-2.32:2 >=dev-libs/dbus-glib-0.74 dev-libs/libxml2:2 >=net-vpn/openconnect-3.02:= gtk? ( >=app-crypt/libsecret-0.18 >=x11-libs/gtk+-3.4:3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-openconnect/1.2/NetworkManager-openconnect-1.2.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=de28f43f7615d43f799d4fc07d980b53
diff --git a/metadata/md5-cache/net-misc/networkmanager-openvpn-1.8.4 b/metadata/md5-cache/net-misc/networkmanager-openvpn-1.8.4
index 9d7e341c24b9..f7689d532d3c 100644
--- a/metadata/md5-cache/net-misc/networkmanager-openvpn-1.8.4
+++ b/metadata/md5-cache/net-misc/networkmanager-openvpn-1.8.4
@@ -9,5 +9,5 @@ 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.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9fbc8549092d5b1acca0884c490b636c
diff --git a/metadata/md5-cache/net-misc/networkmanager-openvpn-1.8.6 b/metadata/md5-cache/net-misc/networkmanager-openvpn-1.8.6
new file mode 100644
index 000000000000..63c956e28fbc
--- /dev/null
+++ b/metadata/md5-cache/net-misc/networkmanager-openvpn-1.8.6
@@ -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.6.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/networkmanager-pptp-1.2.4 b/metadata/md5-cache/net-misc/networkmanager-pptp-1.2.4
index ba9c597e1627..8a623a2fd1b2 100644
--- a/metadata/md5-cache/net-misc/networkmanager-pptp-1.2.4
+++ b/metadata/md5-cache/net-misc/networkmanager-pptp-1.2.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=net-misc/networkmanager-1.2.0:= >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.32:2 net-dialup/ppp:= net-dialup/pptpclient gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.2.0 >=x11-libs/gtk+-3.4:3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-pptp/1.2/NetworkManager-pptp-1.2.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=294a45dc7c5690641c02b1918a480aa9
diff --git a/metadata/md5-cache/net-misc/networkmanager-pptp-1.2.6 b/metadata/md5-cache/net-misc/networkmanager-pptp-1.2.6
index 172e59b3ff4e..675434f229b2 100644
--- a/metadata/md5-cache/net-misc/networkmanager-pptp-1.2.6
+++ b/metadata/md5-cache/net-misc/networkmanager-pptp-1.2.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=net-misc/networkmanager-1.2.0:= >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.32:2 net-dialup/ppp:= net-dialup/pptpclient gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.2.0 >=x11-libs/gtk+-3.4:3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-pptp/1.2/NetworkManager-pptp-1.2.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fb757cd85b3ad62a9e82f6af4a9c19c1
diff --git a/metadata/md5-cache/net-misc/networkmanager-pptp-1.2.8 b/metadata/md5-cache/net-misc/networkmanager-pptp-1.2.8
new file mode 100644
index 000000000000..49a95f946c93
--- /dev/null
+++ b/metadata/md5-cache/net-misc/networkmanager-pptp-1.2.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=net-misc/networkmanager-1.2.0:= >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.32:2 net-dialup/ppp:= net-dialup/pptpclient gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.2.0 >=x11-libs/gtk+-3.4:3 ) sys-devel/gettext dev-libs/libxml2:2 dev-util/gdbus-codegen dev-util/intltool 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 PPTP VPN plugin
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager/VPN
+IUSE=gtk
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2+
+RDEPEND=>=net-misc/networkmanager-1.2.0:= >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.32:2 net-dialup/ppp:= net-dialup/pptpclient gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.2.0 >=x11-libs/gtk+-3.4:3 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/NetworkManager-pptp/1.2/NetworkManager-pptp-1.2.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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d961803a12be6684f12dcbb02788024b
diff --git a/metadata/md5-cache/net-misc/networkmanager-vpnc-1.2.6 b/metadata/md5-cache/net-misc/networkmanager-vpnc-1.2.6
index bf00a6dabd71..f5b8138b6052 100644
--- a/metadata/md5-cache/net-misc/networkmanager-vpnc-1.2.6
+++ b/metadata/md5-cache/net-misc/networkmanager-vpnc-1.2.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=net-misc/networkmanager-1.2.0:= >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.32:2 >=net-vpn/vpnc-0.5.3_p550 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.2.0 >=x11-libs/gtk+-3.4:3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-vpnc/1.2/NetworkManager-vpnc-1.2.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=dab29650736d9d0a00e7e47c023772ff
diff --git a/metadata/md5-cache/net-misc/networkmanager-wireguard-9999 b/metadata/md5-cache/net-misc/networkmanager-wireguard-9999
index b696dba9b876..282a47852066 100644
--- a/metadata/md5-cache/net-misc/networkmanager-wireguard-9999
+++ b/metadata/md5-cache/net-misc/networkmanager-wireguard-9999
@@ -7,5 +7,5 @@ IUSE=gtk test
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.54:2 >=net-misc/networkmanager-1.7.0:= net-vpn/wireguard gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.7.0 >=x11-libs/gtk+-3.4:3 )
 SLOT=0
-_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4138873e0b8f45bdce2e4bf51b8b6b8b
diff --git a/metadata/md5-cache/net-misc/nextcloud-client-2.3.3 b/metadata/md5-cache/net-misc/nextcloud-client-2.3.3
index 06fa50ef5e8f..4e8c86dfc498 100644
--- a/metadata/md5-cache/net-misc/nextcloud-client-2.3.3
+++ b/metadata/md5-cache/net-misc/nextcloud-client-2.3.3
@@ -9,5 +9,5 @@ LICENSE=CC-BY-3.0 GPL-2
 RDEPEND=>=dev-db/sqlite-3.4:3 dev-libs/qtkeychain[qt5(+)] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-fs/inotify-tools virtual/libiconv dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) shibboleth? ( dev-qt/qtwebkit:5 ) !net-misc/ocsync !net-misc/owncloud-client
 SLOT=0
 SRC_URI=http://download.owncloud.com/desktop/stable/owncloudclient-2.3.3.tar.xz https://github.com/nextcloud/client_theming/archive/v2.3.3.tar.gz -> nextcloud-client-2.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a0360015dd5c5cdef6446de457b09b37
diff --git a/metadata/md5-cache/net-misc/nextcloud-client-2.5.0_beta2 b/metadata/md5-cache/net-misc/nextcloud-client-2.5.0_beta2
index 028cc5620ad2..ef652420a37a 100644
--- a/metadata/md5-cache/net-misc/nextcloud-client-2.5.0_beta2
+++ b/metadata/md5-cache/net-misc/nextcloud-client-2.5.0_beta2
@@ -9,5 +9,5 @@ LICENSE=CC-BY-3.0 GPL-2
 RDEPEND=>=dev-db/sqlite-3.4:3 >=dev-libs/openssl-1.1.0:0= dev-libs/qtkeychain[qt5(+)] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-fs/inotify-tools dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) shibboleth? ( dev-qt/qtwebkit:5 ) !net-misc/ocsync !net-misc/owncloud-client
 SLOT=0
 SRC_URI=https://github.com/nextcloud/desktop/archive/v2.5.0-beta2.tar.gz -> nextcloud-client-2.5.0_beta2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d6525a03a641e44b15f1a5044f82c376
diff --git a/metadata/md5-cache/net-misc/ntpsec-1.1.1 b/metadata/md5-cache/net-misc/ntpsec-1.1.1
index 7673bfe4181e..fe6abba8e480 100644
--- a/metadata/md5-cache/net-misc/ntpsec-1.1.1
+++ b/metadata/md5-cache/net-misc/ntpsec-1.1.1
@@ -7,9 +7,9 @@ IUSE=rclock_oncore rclock_trimble rclock_truetime rclock_gpsd rclock_jjy rclock_
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 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 )
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) nist? ( rclock_local )
 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
-_md5_=fb45b015e3fc3ff245dee0c026b2e549
+_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 c9053137c810..3c5ad7bfc790 100644
--- a/metadata/md5-cache/net-misc/ntpsec-1.1.2
+++ b/metadata/md5-cache/net-misc/ntpsec-1.1.2
@@ -7,9 +7,9 @@ IUSE=rclock_oncore rclock_trimble rclock_truetime rclock_gpsd rclock_jjy rclock_
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 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 )
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) nist? ( rclock_local )
 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
-_md5_=fb45b015e3fc3ff245dee0c026b2e549
+_md5_=85039ace8a2872544ce8b732d22593f7
diff --git a/metadata/md5-cache/net-misc/ntpsec-9999 b/metadata/md5-cache/net-misc/ntpsec-9999
index 510d3eb457cc..312b2f3cae23 100644
--- a/metadata/md5-cache/net-misc/ntpsec-9999
+++ b/metadata/md5-cache/net-misc/ntpsec-9999
@@ -6,7 +6,7 @@ HOMEPAGE=https://www.ntpsec.org/
 IUSE=rclock_oncore rclock_trimble rclock_truetime rclock_gpsd rclock_jjy rclock_generic rclock_spectracom rclock_shm rclock_pps rclock_hpgps rclock_zyfer rclock_arbiter rclock_nmea rclock_neoclock rclock_modem rclock_local debug doc early gdb heat libressl nist ntpviz samba seccomp smear tests python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 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 )
+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
-_md5_=fb45b015e3fc3ff245dee0c026b2e549
+_md5_=85039ace8a2872544ce8b732d22593f7
diff --git a/metadata/md5-cache/net-misc/nyx-2.0.4 b/metadata/md5-cache/net-misc/nyx-2.0.4
index 51c814fc94e3..037894735d76 100644
--- a/metadata/md5-cache/net-misc/nyx-2.0.4
+++ b/metadata/md5-cache/net-misc/nyx-2.0.4
@@ -10,5 +10,5 @@ RDEPEND=net-libs/stem net-vpn/tor python_targets_python2_7? ( >=dev-lang/python-
 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/nyx/nyx-2.0.4.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=12c9ab02a1ce4e1f96b6f2a67b917fca
+_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_=c82e8be29bc43a3e425c7e2b5f05f580
diff --git a/metadata/md5-cache/net-misc/nyx-9999 b/metadata/md5-cache/net-misc/nyx-9999
new file mode 100644
index 000000000000..508ea3694365
--- /dev/null
+++ b/metadata/md5-cache/net-misc/nyx-9999
@@ -0,0 +1,12 @@
+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/oidentd-2.0.8-r6 b/metadata/md5-cache/net-misc/oidentd-2.0.8-r6
index 872d0bef6c8c..6553e7fedf57 100644
--- a/metadata/md5-cache/net-misc/oidentd-2.0.8-r6
+++ b/metadata/md5-cache/net-misc/oidentd-2.0.8-r6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( sec-policy/selinux-oident )
 SLOT=0
 SRC_URI=mirror://sourceforge/ojnk/oidentd-2.0.8.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=b87219ae54e5615d9594c7f32b0bf5fa
diff --git a/metadata/md5-cache/net-misc/oidentd-2.2.2 b/metadata/md5-cache/net-misc/oidentd-2.2.2
index 385d6d70c0b3..77cba215c7c9 100644
--- a/metadata/md5-cache/net-misc/oidentd-2.2.2
+++ b/metadata/md5-cache/net-misc/oidentd-2.2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=masquerade? ( net-libs/libnetfilter_conntrack sys-libs/libcap-ng ) selinux? ( sec-policy/selinux-oident )
 SLOT=0
 SRC_URI=https://ftp.janikrabe.com/pub/oidentd/releases/2.2.2/oidentd-2.2.2.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=6c9628734569287a7d55c4f599f19249
diff --git a/metadata/md5-cache/net-misc/omnisync-1.0_p20180614 b/metadata/md5-cache/net-misc/omnisync-1.0_p20180614
index 67f15c2b5b87..10fdcda3f5ef 100644
--- a/metadata/md5-cache/net-misc/omnisync-1.0_p20180614
+++ b/metadata/md5-cache/net-misc/omnisync-1.0_p20180614
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/gnutls:= net-analyzer/net-snmp:=
 SLOT=0
 SRC_URI=https://gitlab.com/grknight/omnisync/-/archive/b3a759af454552f4bbd3b1e097b41bd0d1d7fcf5/omnisync-b3a759af454552f4bbd3b1e097b41bd0d1d7fcf5.tar.bz2 -> omnisync-1.0_p20180614.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=308c77e7eca7544d330b26a790cf3155
diff --git a/metadata/md5-cache/net-misc/openvswitch-2.10.0-r1 b/metadata/md5-cache/net-misc/openvswitch-2.10.0-r1
index 5bc23f274168..5ce4469671b3 100644
--- a/metadata/md5-cache/net-misc/openvswitch-2.10.0-r1
+++ b/metadata/md5-cache/net-misc/openvswitch-2.10.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ssl? ( dev-libs/openssl:0= ) python_targets_python2_7? ( >=dev-lang/pyth
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://www.openvswitch.org/releases/openvswitch-2.10.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=319e80e1a8fbce4c93408cf0ebad41b1
diff --git a/metadata/md5-cache/net-misc/openvswitch-2.7.2 b/metadata/md5-cache/net-misc/openvswitch-2.7.2
index 486863a6e01a..243c33ac8a77 100644
--- a/metadata/md5-cache/net-misc/openvswitch-2.7.2
+++ b/metadata/md5-cache/net-misc/openvswitch-2.7.2
@@ -10,5 +10,5 @@ RDEPEND=ssl? ( dev-libs/openssl:0= ) python_targets_python2_7? ( >=dev-lang/pyth
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://www.openvswitch.org/releases/openvswitch-2.7.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=93ba25ec7d7db8dad9684b1bba213f1b
diff --git a/metadata/md5-cache/net-misc/openvswitch-2.7.2-r1 b/metadata/md5-cache/net-misc/openvswitch-2.7.2-r1
index 12a104335b70..ef1ec72f49b9 100644
--- a/metadata/md5-cache/net-misc/openvswitch-2.7.2-r1
+++ b/metadata/md5-cache/net-misc/openvswitch-2.7.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ssl? ( dev-libs/openssl:0= ) python_targets_python2_7? ( >=dev-lang/pyth
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://www.openvswitch.org/releases/openvswitch-2.7.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=0c4d0400fd26326dc24973db42f08243
diff --git a/metadata/md5-cache/net-misc/openvswitch-2.8.1 b/metadata/md5-cache/net-misc/openvswitch-2.8.1
index 709b5aa1f276..6fbaf10b1aee 100644
--- a/metadata/md5-cache/net-misc/openvswitch-2.8.1
+++ b/metadata/md5-cache/net-misc/openvswitch-2.8.1
@@ -10,5 +10,5 @@ RDEPEND=ssl? ( dev-libs/openssl:0= ) python_targets_python2_7? ( >=dev-lang/pyth
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://www.openvswitch.org/releases/openvswitch-2.8.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=e0654f4651b3c5f4bdae6aeae83ff46a
diff --git a/metadata/md5-cache/net-misc/owncloud-client-2.4.1 b/metadata/md5-cache/net-misc/owncloud-client-2.4.1
index 1ef01a72d973..3b1ea1a5e794 100644
--- a/metadata/md5-cache/net-misc/owncloud-client-2.4.1
+++ b/metadata/md5-cache/net-misc/owncloud-client-2.4.1
@@ -9,5 +9,5 @@ LICENSE=CC-BY-3.0 GPL-2
 RDEPEND=>=dev-db/sqlite-3.4:3 dev-libs/qtkeychain[qt5(+)] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-fs/inotify-tools dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) shibboleth? ( dev-qt/qtwebkit:5 ) !net-misc/ocsync !net-misc/nextcloud-client
 SLOT=0
 SRC_URI=http://download.owncloud.com/desktop/stable/owncloudclient-2.4.1.tar.xz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fc4760c2fac06b9f7c09fef033d09831
diff --git a/metadata/md5-cache/net-misc/owncloud-client-2.4.2 b/metadata/md5-cache/net-misc/owncloud-client-2.4.2
index 479b083d6704..6586321cd3ed 100644
--- a/metadata/md5-cache/net-misc/owncloud-client-2.4.2
+++ b/metadata/md5-cache/net-misc/owncloud-client-2.4.2
@@ -9,5 +9,5 @@ LICENSE=CC-BY-3.0 GPL-2
 RDEPEND=>=dev-db/sqlite-3.4:3 dev-libs/qtkeychain[qt5(+)] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-fs/inotify-tools dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) shibboleth? ( dev-qt/qtwebkit:5 ) !net-misc/ocsync !net-misc/nextcloud-client
 SLOT=0
 SRC_URI=http://download.owncloud.com/desktop/stable/owncloudclient-2.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fc4760c2fac06b9f7c09fef033d09831
diff --git a/metadata/md5-cache/net-misc/owncloud-client-2.4.3 b/metadata/md5-cache/net-misc/owncloud-client-2.4.3
index 785a39a6b09c..6e9d5123a89e 100644
--- a/metadata/md5-cache/net-misc/owncloud-client-2.4.3
+++ b/metadata/md5-cache/net-misc/owncloud-client-2.4.3
@@ -9,5 +9,5 @@ LICENSE=CC-BY-3.0 GPL-2
 RDEPEND=>=dev-db/sqlite-3.4:3 dev-libs/qtkeychain[qt5(+)] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-fs/inotify-tools dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) shibboleth? ( dev-qt/qtwebkit:5 ) !net-misc/ocsync !net-misc/nextcloud-client
 SLOT=0
 SRC_URI=http://download.owncloud.com/desktop/stable/owncloudclient-2.4.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=1727dbac76a9b79c015ee1832571cabe
diff --git a/metadata/md5-cache/net-misc/pssh-2.3.1-r1 b/metadata/md5-cache/net-misc/pssh-2.3.1-r1
index 3ea5325ee7c1..e62b4761dd6c 100644
--- a/metadata/md5-cache/net-misc/pssh-2.3.1-r1
+++ b/metadata/md5-cache/net-misc/pssh-2.3.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=test
 SLOT=0
 SRC_URI=https://parallel-ssh.googlecode.com/files/pssh-2.3.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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=aaf9896fe64e675d7f3815ec71fd3d76
diff --git a/metadata/md5-cache/net-misc/pulseaudio-dlna-0.5.2 b/metadata/md5-cache/net-misc/pulseaudio-dlna-0.5.2
index 147c5df6427f..4a616c9d0e59 100644
--- a/metadata/md5-cache/net-misc/pulseaudio-dlna-0.5.2
+++ b/metadata/md5-cache/net-misc/pulseaudio-dlna-0.5.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/protobuf-python-2.5.0[python_targets_python2_7(-)?,-python_
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/masmu/pulseaudio-dlna/archive/0.5.2.tar.gz -> pulseaudio-dlna-0.5.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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c5d66077784c4f76a4066c9476c2bb1e
diff --git a/metadata/md5-cache/net-misc/pulseaudio-dlna-0.5.2-r1 b/metadata/md5-cache/net-misc/pulseaudio-dlna-0.5.2-r1
index a49925171464..d8fda2ddab24 100644
--- a/metadata/md5-cache/net-misc/pulseaudio-dlna-0.5.2-r1
+++ b/metadata/md5-cache/net-misc/pulseaudio-dlna-0.5.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/protobuf-python-2.5.0[python_targets_python2_7(-)?,-python_
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/masmu/pulseaudio-dlna/archive/0.5.2.tar.gz -> pulseaudio-dlna-0.5.2.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=89f1ccd9b221d187cc8a1e32eba06c65
diff --git a/metadata/md5-cache/net-misc/pulseaudio-dlna-9999 b/metadata/md5-cache/net-misc/pulseaudio-dlna-9999
index 5ecfcfbba73c..c579fd785f98 100644
--- a/metadata/md5-cache/net-misc/pulseaudio-dlna-9999
+++ b/metadata/md5-cache/net-misc/pulseaudio-dlna-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-python/protobuf-python-2.5.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/chardet-2.0.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/pyroute2-0.3.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(+)] >=dev-python/docopt-0.6.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/futures-2.1.6[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] gnome-base/librsvg[introspection] x11-libs/gtk+:3[introspection] >=dev-python/lxml-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/netifaces-0.8[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_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/notify2-0.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/psutil-1.2.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/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/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/requests-2.2.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/setproctitle-1.0.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/zeroconf-0.17.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(+)] || ( || ( media-video/ffmpeg[encode,faac,mp3,opus,vorbis] media-video/ffmpeg[encode,fdk,mp3,opus,vorbis] ) ( media-video/libav[encode,faac,mp3,opus,vorbis] ) ( media-libs/faac media-libs/flac media-sound/lame media-sound/opus-tools media-sound/sox media-sound/vorbis-tools ) ) virtual/python-futures[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_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=python_targets_python2_7
 SLOT=0
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ebffd100960e6a94525e3ad1813d4214
diff --git a/metadata/md5-cache/net-misc/putty-0.68 b/metadata/md5-cache/net-misc/putty-0.68
index 87a01461d31e..53bb6f9ade78 100644
--- a/metadata/md5-cache/net-misc/putty-0.68
+++ b/metadata/md5-cache/net-misc/putty-0.68
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/pango ) kerberos? ( virtual/krb5 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jer/putty-icons.tar.bz2 https://the.earth.li/~sgtatham/putty/latest/putty-0.68.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f4ad7adf4004d1f7c66eb6b6505fb849
diff --git a/metadata/md5-cache/net-misc/putty-0.69 b/metadata/md5-cache/net-misc/putty-0.69
index 08b0cfe8d632..8cf235c2e9f3 100644
--- a/metadata/md5-cache/net-misc/putty-0.69
+++ b/metadata/md5-cache/net-misc/putty-0.69
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/pango ) kerberos? ( virtual/krb5 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jer/putty-icons.tar.bz2 https://the.earth.li/~sgtatham/putty/latest/putty-0.69.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e9f1e3dcd434403b28e813557da3589c
diff --git a/metadata/md5-cache/net-misc/putty-0.70 b/metadata/md5-cache/net-misc/putty-0.70
index 8941448f890b..4cdfa8026272 100644
--- a/metadata/md5-cache/net-misc/putty-0.70
+++ b/metadata/md5-cache/net-misc/putty-0.70
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/pango ) kerberos? ( virtual/krb5 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jer/putty-icons.tar.bz2 https://the.earth.li/~sgtatham/putty/latest/putty-0.70.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e9f1e3dcd434403b28e813557da3589c
diff --git a/metadata/md5-cache/net-misc/putty-9999 b/metadata/md5-cache/net-misc/putty-9999
index 3a3b5e3255e2..40ecb299a439 100644
--- a/metadata/md5-cache/net-misc/putty-9999
+++ b/metadata/md5-cache/net-misc/putty-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=!net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/pango ) kerberos? ( virtual/krb5 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jer/putty-icons.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f12a8b61f6d5907935f0bc527e7fc6ab
diff --git a/metadata/md5-cache/net-misc/pycnb-0.0.4-r1 b/metadata/md5-cache/net-misc/pycnb-0.0.4-r1
index cfc3fe9e883f..ccdc099f2da9 100644
--- a/metadata/md5-cache/net-misc/pycnb-0.0.4-r1
+++ b/metadata/md5-cache/net-misc/pycnb-0.0.4-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/cement[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycnb/pycnb-0.0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0ebcca5706bb1d9b11c04c296ef8f21a
diff --git a/metadata/md5-cache/net-misc/pyhoca-cli-0.5.0.3 b/metadata/md5-cache/net-misc/pyhoca-cli-0.5.0.3
deleted file mode 100644
index 58195c6989e9..000000000000
--- a/metadata/md5-cache/net-misc/pyhoca-cli-0.5.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setproctitle[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=net-misc/python-x2go-0.5.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=X2Go command line client
-EAPI=5
-HOMEPAGE=http://www.x2go.org
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3
-RDEPEND=dev-python/setproctitle[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=net-misc/python-x2go-0.5.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://code.x2go.org/releases/source/pyhoca-cli/pyhoca-cli-0.5.0.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=deeaa77e44aa9f665e7fa14d1741ef2b
diff --git a/metadata/md5-cache/net-misc/pyhoca-cli-0.5.0.4 b/metadata/md5-cache/net-misc/pyhoca-cli-0.5.0.4
index 7a32d2c5eeb9..f0802fc7910e 100644
--- a/metadata/md5-cache/net-misc/pyhoca-cli-0.5.0.4
+++ b/metadata/md5-cache/net-misc/pyhoca-cli-0.5.0.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setproctitle[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/pyhoca-cli/pyhoca-cli-0.5.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0f4c0aafbda146d4196537ab8d6ed9b8
diff --git a/metadata/md5-cache/net-misc/pyhoca-cli-0.6.0.0 b/metadata/md5-cache/net-misc/pyhoca-cli-0.6.0.0
new file mode 100644
index 000000000000..a2a84988a1ab
--- /dev/null
+++ b/metadata/md5-cache/net-misc/pyhoca-cli-0.6.0.0
@@ -0,0 +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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setproctitle[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=net-misc/python-x2go-0.6.0.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=X2Go command line client
+EAPI=7
+HOMEPAGE=http://www.x2go.org
+IUSE=python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3
+RDEPEND=dev-python/setproctitle[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=net-misc/python-x2go-0.6.0.1[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 )
+SLOT=0
+SRC_URI=http://code.x2go.org/releases/source/pyhoca-cli/pyhoca-cli-0.6.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_=9e26126ae69ba66f24676da4926d38b1
diff --git a/metadata/md5-cache/net-misc/pyhoca-gui-0.5.0.6 b/metadata/md5-cache/net-misc/pyhoca-gui-0.5.0.6
deleted file mode 100644
index 2594b5bdb3e8..000000000000
--- a/metadata/md5-cache/net-misc/pyhoca-gui-0.5.0.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/python-distutils-extra[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=X2Go graphical client applet
-EAPI=6
-HOMEPAGE=http://www.x2go.org
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3
-RDEPEND=dev-python/notify-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycups[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setproctitle[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wxpython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=net-misc/python-x2go-0.5.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://code.x2go.org/releases/source/pyhoca-gui/pyhoca-gui-0.5.0.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=152ee352932a9e8b1044dfb795f833e9
diff --git a/metadata/md5-cache/net-misc/pyhoca-gui-0.5.0.7 b/metadata/md5-cache/net-misc/pyhoca-gui-0.5.0.7
index 6a4ba6212909..1558dcf57906 100644
--- a/metadata/md5-cache/net-misc/pyhoca-gui-0.5.0.7
+++ b/metadata/md5-cache/net-misc/pyhoca-gui-0.5.0.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/notify-python[python_targets_python2_7(-)?,-python_single_tar
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/pyhoca-gui/pyhoca-gui-0.5.0.7.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=53631d9fe7efe30f57b53547cdbaae55
diff --git a/metadata/md5-cache/net-misc/python-x2go-0.5.0.5 b/metadata/md5-cache/net-misc/python-x2go-0.5.0.5
deleted file mode 100644
index 46313248820b..000000000000
--- a/metadata/md5-cache/net-misc/python-x2go-0.5.0.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-xlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/nx python_targets_python2_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=X2Go client-side Python API
-EAPI=6
-HOMEPAGE=http://www.x2go.org
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3
-RDEPEND=dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-xlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/nx python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://code.x2go.org/releases/source/python-x2go/python-x2go-0.5.0.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=b9b2fe47dc59e6a9d4dc7f2b392d0ada
diff --git a/metadata/md5-cache/net-misc/python-x2go-0.5.0.6 b/metadata/md5-cache/net-misc/python-x2go-0.5.0.6
index ec16a73b69ca..f78b92db60be 100644
--- a/metadata/md5-cache/net-misc/python-x2go-0.5.0.6
+++ b/metadata/md5-cache/net-misc/python-x2go-0.5.0.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/python-x2go/python-x2go-0.5.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b9b2fe47dc59e6a9d4dc7f2b392d0ada
diff --git a/metadata/md5-cache/net-misc/python-x2go-0.6.0.1 b/metadata/md5-cache/net-misc/python-x2go-0.6.0.1
new file mode 100644
index 000000000000..5c1d669dc8a5
--- /dev/null
+++ b/metadata/md5-cache/net-misc/python-x2go-0.6.0.1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/gevent[python_targets_python2_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/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/python-xlib[python_targets_python2_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/nx
+DESCRIPTION=X2Go client-side Python API
+EAPI=7
+HOMEPAGE=http://www.x2go.org
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3
+RDEPEND=dev-python/gevent[python_targets_python2_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/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/python-xlib[python_targets_python2_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/nx 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=http://code.x2go.org/releases/source/python-x2go/python-x2go-0.6.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_=3604e543ed321b0b1774fa18fb7bd07f
diff --git a/metadata/md5-cache/net-misc/pytvshows-0.2-r3 b/metadata/md5-cache/net-misc/pytvshows-0.2-r3
index f67a798dae6b..c8c720ff84cc 100644
--- a/metadata/md5-cache/net-misc/pytvshows-0.2-r3
+++ b/metadata/md5-cache/net-misc/pytvshows-0.2-r3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/feedparser[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://sourceforge/pytvshows/pytvshows-0.2.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f9e6199b1e50bc1fff3fb8a9ff754227
diff --git a/metadata/md5-cache/net-misc/qtm-1.3.19 b/metadata/md5-cache/net-misc/qtm-1.3.19
index 4837c655f973..a01a10f17e79 100644
--- a/metadata/md5-cache/net-misc/qtm-1.3.19
+++ b/metadata/md5-cache/net-misc/qtm-1.3.19
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/q
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://bitbucket.org/IndigoJo/qtm-1.3/downloads/qtm-1.3.19.tar.bz2
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=373918565fb7ea9934e75a2c04667535
diff --git a/metadata/md5-cache/net-misc/r8168-8.045.08 b/metadata/md5-cache/net-misc/r8168-8.045.08
index 6daf4bf1470e..61c312fbf84b 100644
--- a/metadata/md5-cache/net-misc/r8168-8.045.08
+++ b/metadata/md5-cache/net-misc/r8168-8.045.08
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://12244.wpc.azureedge.net/8012244/drivers/rtdrivers/cn/nic/0010-r8168-8.045.08.tar.bz2 -> r8168-8.045.08.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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_=7778dfcd2e7b06d97c4b043038189ce0
diff --git a/metadata/md5-cache/net-misc/remmina-1.2.0_rc24 b/metadata/md5-cache/net-misc/remmina-1.2.0_rc24
index cc736cea2fae..fdc1a830e41a 100644
--- a/metadata/md5-cache/net-misc/remmina-1.2.0_rc24
+++ b/metadata/md5-cache/net-misc/remmina-1.2.0_rc24
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile ayatana? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc0 <net-misc/freerdp-2.0.0_rc3 ) gnome-keyring? ( app-crypt/libsecret ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) vnc? ( net-libs/libvncserver ) zeroconf? ( net-dns/avahi[gtk3] ) virtual/freedesktop-icon-theme
 SLOT=0
 SRC_URI=https://github.com/FreeRDP/Remmina/archive/v1.2.0-rcgit.24.tar.gz -> remmina-1.2.0_rc24.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9c2f2a27cf93738c06d263a482c380b1
diff --git a/metadata/md5-cache/net-misc/remmina-1.2.31.2 b/metadata/md5-cache/net-misc/remmina-1.2.31.2
index 88c6b10ddadb..fb2be67a9271 100644
--- a/metadata/md5-cache/net-misc/remmina-1.2.31.2
+++ b/metadata/md5-cache/net-misc/remmina-1.2.31.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+-with-openssl-exception
 RDEPEND=dev-libs/glib:2 dev-libs/json-glib net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile ayatana? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc2 ) gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) vnc? ( net-libs/libvncserver ) zeroconf? ( net-dns/avahi[gtk3] ) virtual/freedesktop-icon-theme
 SLOT=0
 SRC_URI=https://github.com/FreeRDP/Remmina/archive/v1.2.31.2.tar.gz -> Remmina-1.2.31.2.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9f8fcef83407452a0587bcb8386b4e85
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 dcfe89b1da6b..117b01ad8c86 100644
--- a/metadata/md5-cache/net-misc/remmina-1.2.31.3
+++ b/metadata/md5-cache/net-misc/remmina-1.2.31.3
@@ -4,10 +4,10 @@ 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
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+-with-openssl-exception
 RDEPEND=dev-libs/glib:2 dev-libs/json-glib net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile ayatana? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc2 ) gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) vnc? ( net-libs/libvncserver ) zeroconf? ( net-dns/avahi[gtk3] ) virtual/freedesktop-icon-theme
 SLOT=0
 SRC_URI=https://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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=f8739e19491b2d15f4c3425e6143adcb
+_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
diff --git a/metadata/md5-cache/net-misc/ris-linux-0.4-r1 b/metadata/md5-cache/net-misc/ris-linux-0.4-r1
index 60102107f415..c182b00b5bca 100644
--- a/metadata/md5-cache/net-misc/ris-linux-0.4-r1
+++ b/metadata/md5-cache/net-misc/ris-linux-0.4-r1
@@ -10,5 +10,5 @@ RDEPEND=|| ( net-ftp/atftp net-ftp/tftp-hpa ) net-misc/dhcp net-fs/samba sys-boo
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://oss.netfarm.it/guides/ris-linux-0.4.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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=96bd45e647192d188b7912b94c6b204d
diff --git a/metadata/md5-cache/net-misc/rygel-0.34.0 b/metadata/md5-cache/net-misc/rygel-0.34.0
index ae15ca67d9a2..d1199cbca210 100644
--- a/metadata/md5-cache/net-misc/rygel-0.34.0
+++ b/metadata/md5-cache/net-misc/rygel-0.34.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/libgee-0.8:0.8 >=dev-libs/libxml2-2.7:2 >=media-libs/gupnp-dlna-0.9.4:2.0 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmediaart-0.7:2.0 media-plugins/gst-plugins-soup:1.0 >=net-libs/gssdp-0.13 >=net-libs/gupnp-0.20.14 >=net-libs/gupnp-av-0.12.8 >=net-libs/libsoup-2.44:2.4 >=sys-apps/util-linux-2.20 x11-misc/shared-mime-info introspection? ( >=dev-libs/gobject-introspection-1.33.4:= ) sqlite? ( >=dev-db/sqlite-3.5:3 dev-libs/libunistring:= x11-libs/gdk-pixbuf:2 ) tracker? ( >=app-misc/tracker-0.16:= ) transcode? ( media-libs/gst-plugins-bad:1.0 media-plugins/gst-plugins-twolame:1.0 media-plugins/gst-plugins-libav:1.0 ) X? ( >=x11-libs/gtk+-3:3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/rygel/0.34/rygel-0.34.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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f68a6a256de0deee0970b9a745ae630d
diff --git a/metadata/md5-cache/net-misc/s3cmd-1.6.1 b/metadata/md5-cache/net-misc/s3cmd-1.6.1
index 5b1856b4ea9d..468bb075c152 100644
--- a/metadata/md5-cache/net-misc/s3cmd-1.6.1
+++ b/metadata/md5-cache/net-misc/s3cmd-1.6.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_t
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/s3tools/s3cmd-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3a30144f9764577f91dc217180210f8c
diff --git a/metadata/md5-cache/net-misc/s3cmd-2.0.0 b/metadata/md5-cache/net-misc/s3cmd-2.0.0
index edae9dd9a207..1a662f8b5e87 100644
--- a/metadata/md5-cache/net-misc/s3cmd-2.0.0
+++ b/metadata/md5-cache/net-misc/s3cmd-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_p
 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.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=85bd64892a776dea9f01c0e95ec39d50
diff --git a/metadata/md5-cache/net-misc/seafile-client-6.1.7 b/metadata/md5-cache/net-misc/seafile-client-6.1.7
index fc5fac92d16c..757fd9957c51 100644
--- a/metadata/md5-cache/net-misc/seafile-client-6.1.7
+++ b/metadata/md5-cache/net-misc/seafile-client-6.1.7
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=net-libs/libsearpc =net-libs/ccnet-6.1.7 =net-misc/seafile-6.1.7 dev-libs/libevent dev-libs/jansson dev-libs/openssl:0 dev-db/sqlite:3 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 shibboleth? ( || ( dev-qt/qtwebengine:5[widgets] dev-qt/qtwebkit:5 ) )
 SLOT=0
 SRC_URI=https://github.com/haiwen/seafile-client/archive/v6.1.7.tar.gz -> seafile-client-6.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7aa4a6ca93fa3cb451eb6e5012a45204
diff --git a/metadata/md5-cache/net-misc/seafile-client-6.2.4 b/metadata/md5-cache/net-misc/seafile-client-6.2.4
index 5d09ea269dbc..15b4397f65b8 100644
--- a/metadata/md5-cache/net-misc/seafile-client-6.2.4
+++ b/metadata/md5-cache/net-misc/seafile-client-6.2.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=net-libs/libsearpc ~net-misc/seafile-6.2.4 dev-libs/libevent dev-libs/jansson dev-libs/openssl:0 dev-db/sqlite:3 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 shibboleth? ( || ( dev-qt/qtwebengine:5[widgets] dev-qt/qtwebkit:5 ) )
 SLOT=0
 SRC_URI=https://github.com/haiwen/seafile-client/archive/v6.2.4.tar.gz -> seafile-client-6.2.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=308ba33c8fcf9015fbc7a82dc25e26a4
diff --git a/metadata/md5-cache/net-misc/smb4k-2.1.0 b/metadata/md5-cache/net-misc/smb4k-2.1.0
index d3c7572f5136..2e3d062adcaf 100644
--- a/metadata/md5-cache/net-misc/smb4k-2.1.0
+++ b/metadata/md5-cache/net-misc/smb4k-2.1.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 97cd891bb68d..3bde842a14b7 100644
--- a/metadata/md5-cache/net-misc/smb4k-2.1.1
+++ b/metadata/md5-cache/net-misc/smb4k-2.1.1
@@ -9,5 +9,5 @@ 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.1.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/net-misc/socket-burst-dampener-1.1.0 b/metadata/md5-cache/net-misc/socket-burst-dampener-1.1.0
index 6b22751ab692..e12a3112abb9 100644
--- a/metadata/md5-cache/net-misc/socket-burst-dampener-1.1.0
+++ b/metadata/md5-cache/net-misc/socket-burst-dampener-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/zmedico/socket-burst-dampener/archive/v1.1.0.tar.gz -> socket-burst-dampener-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f92eeb95e52b9c9c46994d2f7c498ff6
diff --git a/metadata/md5-cache/net-misc/socket-burst-dampener-1.2.0 b/metadata/md5-cache/net-misc/socket-burst-dampener-1.2.0
index 35dc2258690a..bbb358b35223 100644
--- a/metadata/md5-cache/net-misc/socket-burst-dampener-1.2.0
+++ b/metadata/md5-cache/net-misc/socket-burst-dampener-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/zmedico/socket-burst-dampener/archive/v1.2.0.tar.gz -> socket-burst-dampener-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cdf86626ba4fe3b69890abbc92be41ad
diff --git a/metadata/md5-cache/net-misc/spice-gtk-0.34-r2 b/metadata/md5-cache/net-misc/spice-gtk-0.34-r2
index e6f827d7a2f7..e05006b64c58 100644
--- a/metadata/md5-cache/net-misc/spice-gtk-0.34-r2
+++ b/metadata/md5-cache/net-misc/spice-gtk-0.34-r2
@@ -10,5 +10,5 @@ RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) pu
 REQUIRED_USE=?? ( pulseaudio gstaudio )
 SLOT=0
 SRC_URI=https://www.spice-space.org/download/gtk/spice-gtk-0.34.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dbe01d21410dc84a9378c802ad930e8d
diff --git a/metadata/md5-cache/net-misc/spice-gtk-0.34-r3 b/metadata/md5-cache/net-misc/spice-gtk-0.34-r3
index d2ce6ecff8f0..c63efd2e519d 100644
--- a/metadata/md5-cache/net-misc/spice-gtk-0.34-r3
+++ b/metadata/md5-cache/net-misc/spice-gtk-0.34-r3
@@ -10,5 +10,5 @@ RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) pu
 REQUIRED_USE=?? ( pulseaudio gstaudio )
 SLOT=0
 SRC_URI=https://www.spice-space.org/download/gtk/spice-gtk-0.34.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0f039d1b4ec68cee3c02902415e1291c
diff --git a/metadata/md5-cache/net-misc/spice-gtk-0.35 b/metadata/md5-cache/net-misc/spice-gtk-0.35
index 6d709e648736..0c2dc240d66e 100644
--- a/metadata/md5-cache/net-misc/spice-gtk-0.35
+++ b/metadata/md5-cache/net-misc/spice-gtk-0.35
@@ -10,5 +10,5 @@ RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) pu
 REQUIRED_USE=?? ( pulseaudio gstaudio )
 SLOT=0
 SRC_URI=https://www.spice-space.org/download/gtk/spice-gtk-0.35.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=acb4ad1b536bdcbeaf6aa199fb7952a7
diff --git a/metadata/md5-cache/net-misc/spice-gtk-9999 b/metadata/md5-cache/net-misc/spice-gtk-9999
index 0350fe2dfcc5..a58bc5db19fb 100644
--- a/metadata/md5-cache/net-misc/spice-gtk-9999
+++ b/metadata/md5-cache/net-misc/spice-gtk-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio[glib] ) gstvideo? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) gstaudio? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) >=x11-libs/pixman-0.17.7 media-libs/opus gtk3? ( x11-libs/gtk+:3[introspection?] ) >=dev-libs/glib-2.36:2 >=x11-libs/cairo-1.2 virtual/jpeg:0= sys-libs/zlib introspection? ( dev-libs/gobject-introspection ) lz4? ( app-arch/lz4 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwids >=sys-apps/usbredir-0.4.2 virtual/libusb:1 virtual/libgudev:= policykit? ( sys-apps/acl >=sys-auth/polkit-0.110-r1 !~sys-auth/polkit-0.111 ) ) webdav? ( net-libs/phodav:2.0 >=dev-libs/glib-2.43.90:2 >=net-libs/libsoup-2.49.91 )
 REQUIRED_USE=?? ( pulseaudio gstaudio )
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=778ae97b35fbb3bd35da77a897a9d3fd
diff --git a/metadata/md5-cache/net-misc/srf-ip-conn-srv-9999 b/metadata/md5-cache/net-misc/srf-ip-conn-srv-9999
index b02fd24f31cd..37bc9368b716 100644
--- a/metadata/md5-cache/net-misc/srf-ip-conn-srv-9999
+++ b/metadata/md5-cache/net-misc/srf-ip-conn-srv-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/sharkrf/srf-ip-conn-srv
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/sharkrf/srf-ip-conn/archive/140c9b8a86193b8f345c9e113691113310859ff8.tar.gz -> srf-ip-conn-140c9b8a8619.tar.gz https://github.com/zserge/jsmn/archive/35086597a72d94d8393e6a90b96e553d714085bd.tar.gz -> jsmn-35086597a72d.tar.gz
-_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0440764b562e0ecfd629c4722c106017
diff --git a/metadata/md5-cache/net-misc/sstp-client-1.0.10-r1 b/metadata/md5-cache/net-misc/sstp-client-1.0.10-r1
index a114d15e14a2..8aaa08b27b0f 100644
--- a/metadata/md5-cache/net-misc/sstp-client-1.0.10-r1
+++ b/metadata/md5-cache/net-misc/sstp-client-1.0.10-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+-with-openssl-exception
 RDEPEND=>=dev-libs/libevent-2.0.10 dev-libs/openssl:0 net-dialup/ppp:=
 SLOT=0
 SRC_URI=mirror://sourceforge/sstp-client/sstp-client-1.0.10.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=b8e4ffe427d30f3679742850961e91d8
diff --git a/metadata/md5-cache/net-misc/sstp-client-1.0.11 b/metadata/md5-cache/net-misc/sstp-client-1.0.11
index 9484dc5119f1..571ce50615f4 100644
--- a/metadata/md5-cache/net-misc/sstp-client-1.0.11
+++ b/metadata/md5-cache/net-misc/sstp-client-1.0.11
@@ -9,5 +9,5 @@ LICENSE=GPL-2+-with-openssl-exception
 RDEPEND=>=dev-libs/libevent-2.0.10 dev-libs/openssl:0= net-dialup/ppp:=
 SLOT=0
 SRC_URI=mirror://sourceforge/sstp-client/sstp-client-1.0.11.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=c87a8b7c500b3b1b4ac827a979f64535
diff --git a/metadata/md5-cache/net-misc/stargazer-2.408 b/metadata/md5-cache/net-misc/stargazer-2.408
index eee87fb8f126..9b6246b3f404 100644
--- a/metadata/md5-cache/net-misc/stargazer-2.408
+++ b/metadata/md5-cache/net-misc/stargazer-2.408
@@ -10,5 +10,5 @@ RDEPEND=module_config_rpcconfig? ( dev-libs/xmlrpc-c[abyss] sys-libs/zlib ) modu
 REQUIRED_USE=stargazer? ( ^^ ( module_store_files module_store_firebird module_store_mysql module_store_postgres ) )
 SLOT=0
 SRC_URI=http://stg.dp.ua/download/server/2.408/stg-2.408.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2620736fc8746fc9bd3d67b50047f8aa
diff --git a/metadata/md5-cache/net-misc/streamlink-0.14.2-r1 b/metadata/md5-cache/net-misc/streamlink-0.14.2-r1
index 578a3e3c3206..cedb8ce97010 100644
--- a/metadata/md5-cache/net-misc/streamlink-0.14.2-r1
+++ b/metadata/md5-cache/net-misc/streamlink-0.14.2-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/python-futures[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/streamlink/streamlink/releases/download/0.14.2/streamlink-0.14.2.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c2087fd96028624c988043c365c520b2
diff --git a/metadata/md5-cache/net-misc/streamlink-9999 b/metadata/md5-cache/net-misc/streamlink-9999
index b8661436efdf..4e371072ed58 100644
--- a/metadata/md5-cache/net-misc/streamlink-9999
+++ b/metadata/md5-cache/net-misc/streamlink-9999
@@ -8,5 +8,5 @@ LICENSE=BSD-2 Apache-2.0
 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/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(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-singledispatch[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/backports-shutil_which[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-python/backports-shutil_get_terminal_size[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/pycountry[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/websocket-client[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-video/rtmpdump virtual/ffmpeg python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=ebc25e1915bea0e6b4f7607bea316a84
diff --git a/metadata/md5-cache/net-misc/streamtuner-0.99.99-r5 b/metadata/md5-cache/net-misc/streamtuner-0.99.99-r5
index 16f561746054..76bd8ee445b7 100644
--- a/metadata/md5-cache/net-misc/streamtuner-0.99.99-r5
+++ b/metadata/md5-cache/net-misc/streamtuner-0.99.99-r5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=x11-libs/gtk+-2.4:2 net-misc/curl xiph? ( dev-libs/libxml2:2 ) >=media-libs/taglib-1.2 python? ( dev-python/pygtk:2 ) x11-misc/xdg-utils
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/streamtuner/streamtuner-0.99.99.tar.gz https://savannah.nongnu.org/download/streamtuner/streamtuner-0.99.99-pygtk-2.6.diff
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=54bac50a58b6de5646ff1b275e2e426c
diff --git a/metadata/md5-cache/net-misc/switzerland-0.1.0 b/metadata/md5-cache/net-misc/switzerland-0.1.0
index 6fe0d7b08234..e1025ffb3fb8 100644
--- a/metadata/md5-cache/net-misc/switzerland-0.1.0
+++ b/metadata/md5-cache/net-misc/switzerland-0.1.0
@@ -10,5 +10,5 @@ RDEPEND=net-libs/libpcap python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/switzerland/switzerland-0.1.0.tgz
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=79bf33217501556ea0a5f23158004fe7
diff --git a/metadata/md5-cache/net-misc/teamviewer-13.1.3026 b/metadata/md5-cache/net-misc/teamviewer-13.1.3026
index 9c91d092227d..55dc8a6a2157 100644
--- a/metadata/md5-cache/net-misc/teamviewer-13.1.3026
+++ b/metadata/md5-cache/net-misc/teamviewer-13.1.3026
@@ -9,5 +9,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 de
 RESTRICT=bindist mirror
 SLOT=13
 SRC_URI=amd64? ( https://dl.tvcdn.de/download/linux/version_13x/teamviewer_13.1.3026_amd64.tar.xz ) x86? ( https://dl.tvcdn.de/download/linux/version_13x/teamviewer_13.1.3026_i386.tar.xz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=49e0d11bebc050c5317a7225dabae49a
diff --git a/metadata/md5-cache/net-misc/teamviewer-13.1.8286 b/metadata/md5-cache/net-misc/teamviewer-13.1.8286
index 3c8b111c8cdf..1cc3ba1906ef 100644
--- a/metadata/md5-cache/net-misc/teamviewer-13.1.8286
+++ b/metadata/md5-cache/net-misc/teamviewer-13.1.8286
@@ -9,5 +9,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 de
 RESTRICT=bindist mirror
 SLOT=13
 SRC_URI=amd64? ( https://dl.tvcdn.de/download/linux/version_13x/teamviewer_13.1.8286_amd64.tar.xz ) x86? ( https://dl.tvcdn.de/download/linux/version_13x/teamviewer_13.1.8286_i386.tar.xz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8cce873b625449ffef2bc006f2356c81
diff --git a/metadata/md5-cache/net-misc/teamviewer-13.2.13582 b/metadata/md5-cache/net-misc/teamviewer-13.2.13582
index 61e911760b18..e75ba109939a 100644
--- a/metadata/md5-cache/net-misc/teamviewer-13.2.13582
+++ b/metadata/md5-cache/net-misc/teamviewer-13.2.13582
@@ -9,5 +9,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 de
 RESTRICT=bindist mirror
 SLOT=13
 SRC_URI=amd64? ( https://dl.tvcdn.de/download/linux/version_13x/teamviewer_13.2.13582_amd64.tar.xz ) x86? ( https://dl.tvcdn.de/download/linux/version_13x/teamviewer_13.2.13582_i386.tar.xz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8cce873b625449ffef2bc006f2356c81
diff --git a/metadata/md5-cache/net-misc/tigervnc-1.8.0-r3 b/metadata/md5-cache/net-misc/tigervnc-1.8.0-r3
index 417c23960dd1..467cb3a8e8e9 100644
--- a/metadata/md5-cache/net-misc/tigervnc-1.8.0-r3
+++ b/metadata/md5-cache/net-misc/tigervnc-1.8.0-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/jpeg:0 sys-libs/zlib:= >=x11-libs/fltk-1.3.1 gnutls? ( net-libs/gnutls:= ) nls? ( virtual/libiconv ) pam? ( virtual/pam ) x11-libs/libX11 x11-libs/libXext x11-libs/libXrender server? ( x11-libs/libXau x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXfont2 x11-libs/libXtst >=x11-libs/pixman-0.27.2 >=x11-apps/xauth-1.0.3 x11-apps/xsetroot >=x11-misc/xkeyboard-config-2.4.1-r3 opengl? ( >=app-eselect/eselect-opengl-1.3.1-r1 ) xorgmodule? ( =x11-base/xorg-server-1.19* ) drm? ( x11-libs/libdrm ) ) xinerama? ( x11-libs/libXinerama ) !net-misc/tightvnc !net-misc/vnc !net-misc/xf4vnc java? ( >=virtual/jre-1.5:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://github.com/TigerVNC/tigervnc/archive/v1.8.0.tar.gz -> tigervnc-1.8.0.tar.gz https://dev.gentoo.org/~armin76/dist/tigervnc-1.4.2-patches-0.1.tar.bz2 server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-1.19.5.tar.bz2 )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	f0bc1c175684130a76ab6c17f575d820	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	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	f0bc1c175684130a76ab6c17f575d820	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	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=406cb4e681c9c6489e0b24e909d7caa2
diff --git a/metadata/md5-cache/net-misc/tigervnc-1.9.0 b/metadata/md5-cache/net-misc/tigervnc-1.9.0
index 7c55291517b1..b1914e6eb179 100644
--- a/metadata/md5-cache/net-misc/tigervnc-1.9.0
+++ b/metadata/md5-cache/net-misc/tigervnc-1.9.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/jpeg:0 sys-libs/zlib:= >=x11-libs/fltk-1.3.1 gnutls? ( net-libs/gnutls:= ) nls? ( virtual/libiconv ) pam? ( virtual/pam ) x11-libs/libX11 x11-libs/libXext x11-libs/libXrender server? ( x11-libs/libXau x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXfont2 x11-libs/libXtst >=x11-libs/pixman-0.27.2 >=x11-apps/xauth-1.0.3 x11-apps/xsetroot >=x11-misc/xkeyboard-config-2.4.1-r3 opengl? ( virtual/opengl ) xorgmodule? ( =x11-base/xorg-server-1.20* ) drm? ( x11-libs/libdrm ) ) xinerama? ( x11-libs/libXinerama ) !net-misc/tightvnc !net-misc/vnc !net-misc/xf4vnc java? ( >=virtual/jre-1.5:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://github.com/TigerVNC/tigervnc/archive/v1.9.0.tar.gz -> tigervnc-1.9.0.tar.gz server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-1.20.0.tar.bz2 )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=40517e02562c82eb26e6a2a457d3c99b
diff --git a/metadata/md5-cache/net-misc/tigervnc-1.9.0-r1 b/metadata/md5-cache/net-misc/tigervnc-1.9.0-r1
index 9b23ef1b6325..01a940cf73cb 100644
--- a/metadata/md5-cache/net-misc/tigervnc-1.9.0-r1
+++ b/metadata/md5-cache/net-misc/tigervnc-1.9.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/jpeg:0 sys-libs/zlib:= >=x11-libs/fltk-1.3.1 gnutls? ( net-libs/gnutls:= ) nls? ( virtual/libiconv ) pam? ( virtual/pam ) x11-libs/libX11 x11-libs/libXext x11-libs/libXrender server? ( x11-libs/libXau x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXfont2 x11-libs/libXtst >=x11-libs/pixman-0.27.2 >=x11-apps/xauth-1.0.3 x11-apps/xsetroot >=x11-misc/xkeyboard-config-2.4.1-r3 xorgmodule? ( =x11-base/xorg-server-1.20* ) drm? ( x11-libs/libdrm ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) xinerama? ( x11-libs/libXinerama ) !net-misc/tightvnc !net-misc/vnc !net-misc/xf4vnc java? ( >=virtual/jre-1.5:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://github.com/TigerVNC/tigervnc/archive/v1.9.0.tar.gz -> tigervnc-1.9.0.tar.gz server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-1.20.0.tar.bz2 )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1af07681d846aedfb510391c347c3601
diff --git a/metadata/md5-cache/net-misc/trackma-0.7.3 b/metadata/md5-cache/net-misc/trackma-0.7.3
index fdcdb93861c1..aff339917e28 100644
--- a/metadata/md5-cache/net-misc/trackma-0.7.3
+++ b/metadata/md5-cache/net-misc/trackma-0.7.3
@@ -10,5 +10,5 @@ RDEPEND=sys-process/lsof inotify? ( || ( dev-python/inotifyx dev-python/pyinotif
 REQUIRED_USE=|| ( cli gtk ncurses qt5 ) || ( python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/z411/trackma/archive/v0.7.3.tar.gz -> trackma-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9855d7616de638837f2cf0f46396099c
diff --git a/metadata/md5-cache/net-misc/trackma-0.7.4 b/metadata/md5-cache/net-misc/trackma-0.7.4
index 737bd0f02d79..35da179bc850 100644
--- a/metadata/md5-cache/net-misc/trackma-0.7.4
+++ b/metadata/md5-cache/net-misc/trackma-0.7.4
@@ -10,5 +10,5 @@ RDEPEND=sys-process/lsof inotify? ( || ( dev-python/inotifyx dev-python/pyinotif
 REQUIRED_USE=|| ( cli gtk ncurses qt5 ) || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/z411/trackma/archive/v0.7.4.tar.gz -> trackma-0.7.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=aeb2719693379c27824163e8dc0d082d
diff --git a/metadata/md5-cache/net-misc/trackma-9999 b/metadata/md5-cache/net-misc/trackma-9999
index b1a51d977316..2a8aa2e6dce6 100644
--- a/metadata/md5-cache/net-misc/trackma-9999
+++ b/metadata/md5-cache/net-misc/trackma-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=sys-process/lsof inotify? ( || ( dev-python/inotifyx dev-python/pyinotify ) ) ncurses? ( dev-python/urwid[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) gtk? ( 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-python/pycairo[python_targets_python3_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/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) qt5? ( dev-python/PyQt5[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),gui,widgets] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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=|| ( cli gtk ncurses qt5 ) || ( 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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1393b16987515e01979f0eb620c8cfda
diff --git a/metadata/md5-cache/net-misc/vinagre-3.22.0-r3 b/metadata/md5-cache/net-misc/vinagre-3.22.0-r3
index edbd4a56ac94..7973b815edb8 100644
--- a/metadata/md5-cache/net-misc/vinagre-3.22.0-r3
+++ b/metadata/md5-cache/net-misc/vinagre-3.22.0-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.32.0:2 >=x11-libs/gtk+-3.9.6:3 app-crypt/libsecret >=dev-libs/libxml2-2.6.31:2 >=net-libs/gtk-vnc-0.4.3[gtk3(+)] x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-themes/hicolor-icon-theme rdp? ( >=net-misc/freerdp-1.1:= ) ssh? ( >=x11-libs/vte-0.20:2.91 ) spice? ( app-emulation/spice-protocol >=net-misc/spice-gtk-0.5[gtk3(+)] ) telepathy? ( dev-libs/dbus-glib >=net-libs/telepathy-glib-0.11.6 ) zeroconf? ( >=net-dns/avahi-0.6.26[dbus,gtk3] )
 SLOT=0
 SRC_URI=mirror://gnome/sources/vinagre/3.22/vinagre-3.22.0.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6e623361f464ed2ea18c24a5a491b8ef
diff --git a/metadata/md5-cache/net-misc/vino-3.22.0 b/metadata/md5-cache/net-misc/vino-3.22.0
index 1f1a0045c5be..9bbf55051d1f 100644
--- a/metadata/md5-cache/net-misc/vino-3.22.0
+++ b/metadata/md5-cache/net-misc/vino-3.22.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.26:2 >=dev-libs/libgcrypt-1.1.90:0= >=x11-libs/gtk+-3:
 REQUIRED_USE=jpeg? ( zlib )
 SLOT=0
 SRC_URI=mirror://gnome/sources/vino/3.22/vino-3.22.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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=037a954f81a37dc5c932482509abe936
diff --git a/metadata/md5-cache/net-misc/wicd-1.7.4-r3 b/metadata/md5-cache/net-misc/wicd-1.7.4-r3
index c641e7fe403a..c746746fba07 100644
--- a/metadata/md5-cache/net-misc/wicd-1.7.4-r3
+++ b/metadata/md5-cache/net-misc/wicd-1.7.4-r3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses?,xml]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://launchpad.net/wicd/1.7/1.7.4/+download/wicd-1.7.4.tar.gz mac4lin? ( https://dev.gentoo.org/~anarchy/dist/wicd-mac4lin-icons.tar.xz ) ambiance? ( http://freetimesblog.altervista.org/blog/wp-content/uploads/downloads/2010/05/Icone-Wicd-Lucid.tar.gz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ecbe890493a07dca7bd4c053d2d754d4
diff --git a/metadata/md5-cache/net-misc/x2goclient-4.1.1.0 b/metadata/md5-cache/net-misc/x2goclient-4.1.1.0
index 67ff90fbb786..10d13772b00e 100644
--- a/metadata/md5-cache/net-misc/x2goclient-4.1.1.0
+++ b/metadata/md5-cache/net-misc/x2goclient-4.1.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=net-libs/libssh-0.6.0_rc1 net-print/cups x11-libs/libXpm ldap? ( net-nds/openldap ) net-misc/nx
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/x2goclient/x2goclient-4.1.1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3e69084af730cd975809eed74d160222
diff --git a/metadata/md5-cache/net-misc/x2goclient-4.1.1.1 b/metadata/md5-cache/net-misc/x2goclient-4.1.1.1
index f32a0d408819..29c61822364e 100644
--- a/metadata/md5-cache/net-misc/x2goclient-4.1.1.1
+++ b/metadata/md5-cache/net-misc/x2goclient-4.1.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=net-libs/libssh-0.7.5-r2 net-print/cups x11-libs/libXpm ldap? ( net-nds/openldap ) net-misc/nx
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/x2goclient/x2goclient-4.1.1.1.tar.gz
-_eclasses_=desktop	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=71ab0b57fee2cde0a0d30f580534f15d
diff --git a/metadata/md5-cache/net-misc/x2goclient-4.1.2.1 b/metadata/md5-cache/net-misc/x2goclient-4.1.2.1
index 2451ee99a527..898684bf96d9 100644
--- a/metadata/md5-cache/net-misc/x2goclient-4.1.2.1
+++ b/metadata/md5-cache/net-misc/x2goclient-4.1.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=net-libs/libssh-0.7.5-r2 net-print/cups x11-libs/libXpm ldap? ( net-nds/openldap ) net-misc/nx
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/x2goclient/x2goclient-4.1.2.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c0d42ca2702cc7dbc283a3830c92da98
diff --git a/metadata/md5-cache/net-misc/x2goserver-4.0.1.22 b/metadata/md5-cache/net-misc/x2goserver-4.0.1.22
index 5f3e0dcb665e..fa8b9b357c61 100644
--- a/metadata/md5-cache/net-misc/x2goserver-4.0.1.22
+++ b/metadata/md5-cache/net-misc/x2goserver-4.0.1.22
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Capture-Tiny dev-perl/Config-Simple dev-perl/File-BaseDir dev-p
 REQUIRED_USE=|| ( postgres sqlite )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/x2goserver/x2goserver-4.0.1.22.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=80c4fd459a41f959d627a859dbdf6ddc
diff --git a/metadata/md5-cache/net-misc/x2goserver-4.1.0.0-r1 b/metadata/md5-cache/net-misc/x2goserver-4.1.0.0-r1
index 0b2f767a6646..9fae86e4cc0e 100644
--- a/metadata/md5-cache/net-misc/x2goserver-4.1.0.0-r1
+++ b/metadata/md5-cache/net-misc/x2goserver-4.1.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Capture-Tiny dev-perl/Config-Simple dev-perl/File-BaseDir dev-p
 REQUIRED_USE=|| ( postgres sqlite )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/x2goserver/x2goserver-4.1.0.0.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=09c63fa0d019e7d795e6fd1bcaff30a3
diff --git a/metadata/md5-cache/net-misc/x2goserver-4.1.0.1 b/metadata/md5-cache/net-misc/x2goserver-4.1.0.1
index e26b40a0ea4a..c4205a499b10 100644
--- a/metadata/md5-cache/net-misc/x2goserver-4.1.0.1
+++ b/metadata/md5-cache/net-misc/x2goserver-4.1.0.1
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Capture-Tiny dev-perl/Config-Simple dev-perl/File-BaseDir dev-p
 REQUIRED_USE=|| ( postgres sqlite )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/x2goserver/x2goserver-4.1.0.1.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=09c63fa0d019e7d795e6fd1bcaff30a3
diff --git a/metadata/md5-cache/net-misc/x2goserver-4.1.0.2 b/metadata/md5-cache/net-misc/x2goserver-4.1.0.2
index 8286edce3cae..852d4e921bf5 100644
--- a/metadata/md5-cache/net-misc/x2goserver-4.1.0.2
+++ b/metadata/md5-cache/net-misc/x2goserver-4.1.0.2
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Capture-Tiny dev-perl/Config-Simple dev-perl/File-BaseDir dev-p
 REQUIRED_USE=|| ( postgres sqlite )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/x2goserver/x2goserver-4.1.0.2.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=09c63fa0d019e7d795e6fd1bcaff30a3
diff --git a/metadata/md5-cache/net-misc/you-get-0.4.536 b/metadata/md5-cache/net-misc/you-get-0.4.536
index 5ea9918d1454..7d2149a34027 100644
--- a/metadata/md5-cache/net-misc/you-get-0.4.536
+++ b/metadata/md5-cache/net-misc/you-get-0.4.536
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/soimort/you-get/archive/v0.4.536.tar.gz -> you-get-0.4.536.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6435f679227a246c5d0d70af3990f892
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2017.11.15 b/metadata/md5-cache/net-misc/youtube-dl-2017.11.15
index 757bcbf39930..6e7f1599cc97 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2017.11.15
+++ b/metadata/md5-cache/net-misc/youtube-dl-2017.11.15
@@ -10,5 +10,5 @@ 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
 SRC_URI=http://youtube-dl.org/downloads/2017.11.15/youtube-dl-2017.11.15.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1f5c75d010877fa70bb9573a3133d87b
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2018.08.22 b/metadata/md5-cache/net-misc/youtube-dl-2018.08.22
index af0d98715d44..c1f704dfba14 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2018.08.22
+++ b/metadata/md5-cache/net-misc/youtube-dl-2018.08.22
@@ -10,5 +10,5 @@ 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
 SRC_URI=https://youtube-dl.org/downloads/2018.08.22/youtube-dl-2018.08.22.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6973e732c83c3789cb5df61a16796002
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2018.09.18 b/metadata/md5-cache/net-misc/youtube-dl-2018.09.18
deleted file mode 100644
index 09d8f97eab64..000000000000
--- a/metadata/md5-cache/net-misc/youtube-dl-2018.09.18
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[coverage(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Download videos from YouTube.com (and more sites...)
-EAPI=6
-HOMEPAGE=https://rg3.github.com/youtube-dl/
-IUSE=+offensive test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-LICENSE=public-domain
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://youtube-dl.org/downloads/2018.09.18/youtube-dl-2018.09.18.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=6d304b7cf100f4ddb916374d6200c3eb
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2018.09.26 b/metadata/md5-cache/net-misc/youtube-dl-2018.09.26
index bee5c64614d8..441b8cc915dd 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2018.09.26
+++ b/metadata/md5-cache/net-misc/youtube-dl-2018.09.26
@@ -10,5 +10,5 @@ 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
 SRC_URI=https://youtube-dl.org/downloads/2018.09.26/youtube-dl-2018.09.26.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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2018.10.05 b/metadata/md5-cache/net-misc/youtube-dl-2018.10.05
new file mode 100644
index 000000000000..37d86c63918f
--- /dev/null
+++ b/metadata/md5-cache/net-misc/youtube-dl-2018.10.05
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[coverage(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Download videos from YouTube.com (and more sites...)
+EAPI=6
+HOMEPAGE=https://rg3.github.com/youtube-dl/
+IUSE=+offensive test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=public-domain
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://youtube-dl.org/downloads/2018.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
diff --git a/metadata/md5-cache/net-misc/youtube-dl-99999999 b/metadata/md5-cache/net-misc/youtube-dl-99999999
index 9959538768d8..178277faf913 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-99999999
+++ b/metadata/md5-cache/net-misc/youtube-dl-99999999
@@ -8,5 +8,5 @@ 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_=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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/net-misc/youtube-viewer-3.3.3 b/metadata/md5-cache/net-misc/youtube-viewer-3.3.3
index b5d96410b123..fd0929ca27a7 100644
--- a/metadata/md5-cache/net-misc/youtube-viewer-3.3.3
+++ b/metadata/md5-cache/net-misc/youtube-viewer-3.3.3
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Data-Dump dev-perl/JSON dev-perl/libwww-perl[ssl] dev-perl/Term-ReadLine-Gnu dev-perl/LWP-Protocol-https virtual/perl-Encode virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-Getopt-Long virtual/perl-Scalar-List-Utils virtual/perl-Term-ANSIColor virtual/perl-Term-ReadLine virtual/perl-Text-ParseWords virtual/perl-Text-Tabs+Wrap gtk? ( dev-perl/File-ShareDir >=dev-perl/Gtk2-1.244.0 virtual/freedesktop-icon-theme x11-libs/gdk-pixbuf:2[X,jpeg] ) || ( media-video/ffmpeg[openssl] media-video/ffmpeg[gnutls] ) || ( media-video/mpv media-video/mplayer media-video/vlc gtk? ( media-video/smplayer ) ) dev-lang/perl:=
 SLOT=0
 SRC_URI=https://github.com/trizen/youtube-viewer/archive/3.3.3.tar.gz -> youtube-viewer-3.3.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=437201f6ffb9033d26c852a65fde7a28
diff --git a/metadata/md5-cache/net-misc/youtube-viewer-3.3.4 b/metadata/md5-cache/net-misc/youtube-viewer-3.3.4
index c4c751cbf668..5f5cd7411032 100644
--- a/metadata/md5-cache/net-misc/youtube-viewer-3.3.4
+++ b/metadata/md5-cache/net-misc/youtube-viewer-3.3.4
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Data-Dump dev-perl/JSON dev-perl/libwww-perl[ssl] dev-perl/Term-ReadLine-Gnu dev-perl/LWP-Protocol-https virtual/perl-Encode virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-Getopt-Long virtual/perl-Scalar-List-Utils virtual/perl-Term-ANSIColor virtual/perl-Term-ReadLine virtual/perl-Text-ParseWords virtual/perl-Text-Tabs+Wrap gtk? ( dev-perl/File-ShareDir >=dev-perl/Gtk2-1.244.0 virtual/freedesktop-icon-theme x11-libs/gdk-pixbuf:2[X,jpeg] ) || ( media-video/ffmpeg[openssl] media-video/ffmpeg[gnutls] ) || ( media-video/mpv media-video/mplayer media-video/vlc gtk? ( media-video/smplayer ) ) dev-lang/perl:=
 SLOT=0
 SRC_URI=https://github.com/trizen/youtube-viewer/archive/3.3.4.tar.gz -> youtube-viewer-3.3.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=584c690335c2a95daff4cd49a013ba55
diff --git a/metadata/md5-cache/net-misc/youtube-viewer-9999 b/metadata/md5-cache/net-misc/youtube-viewer-9999
index 91d3db17fae3..cc317084ff25 100644
--- a/metadata/md5-cache/net-misc/youtube-viewer-9999
+++ b/metadata/md5-cache/net-misc/youtube-viewer-9999
@@ -7,5 +7,5 @@ IUSE=gtk
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-lang/perl-5.16.0 dev-perl/Data-Dump dev-perl/JSON dev-perl/libwww-perl[ssl] dev-perl/Term-ReadLine-Gnu media-video/ffmpeg[openssl] virtual/perl-Encode virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-Getopt-Long virtual/perl-Scalar-List-Utils virtual/perl-Term-ANSIColor virtual/perl-Term-ReadLine virtual/perl-Text-ParseWords virtual/perl-Text-Tabs+Wrap gtk? ( dev-perl/File-ShareDir >=dev-perl/Gtk2-1.244.0 virtual/freedesktop-icon-theme x11-libs/gdk-pixbuf:2[X,jpeg] ) || ( media-video/mpv media-video/mplayer media-video/smplayer media-video/vlc ) dev-lang/perl:=
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d0a31e2fad4b3697e28e67fde1e4ecfa
diff --git a/metadata/md5-cache/net-nds/Manifest.gz b/metadata/md5-cache/net-nds/Manifest.gz
index 629e509bd5c9..e840b45039f0 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/nsscache-0.30 b/metadata/md5-cache/net-nds/nsscache-0.30
index 617405b9e215..0f8b570273d2 100644
--- a/metadata/md5-cache/net-nds/nsscache-0.30
+++ b/metadata/md5-cache/net-nds/nsscache-0.30
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 ) || ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/google/nsscache/archive/version/0.30.tar.gz -> nsscache-0.30.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ba95061a3f06da59313139b33d9243fe
diff --git a/metadata/md5-cache/net-nds/nsscache-0.30-r2 b/metadata/md5-cache/net-nds/nsscache-0.30-r2
index 3e387435d484..4bc0fd6b2397 100644
--- a/metadata/md5-cache/net-nds/nsscache-0.30-r2
+++ b/metadata/md5-cache/net-nds/nsscache-0.30-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 ) || ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/google/nsscache/archive/version/0.30.tar.gz -> nsscache-0.30.tar.gz https://dev.gentoo.org/~robbat2/nsscache-0.30-gentoo-authorized-keys-command.py
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0815b47f8b5d44946c5cb7ae79e24a31
diff --git a/metadata/md5-cache/net-nds/nsscache-0.31 b/metadata/md5-cache/net-nds/nsscache-0.31
index 5ce2e94c1a73..62d794fb93df 100644
--- a/metadata/md5-cache/net-nds/nsscache-0.31
+++ b/metadata/md5-cache/net-nds/nsscache-0.31
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 ) || ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/google/nsscache/archive/version/0.31.tar.gz -> nsscache-0.31.tar.gz https://dev.gentoo.org/~robbat2/nsscache-0.30-r3-gentoo-authorized-keys-command.py
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bb1099b749514b83ba2a41b209545033
diff --git a/metadata/md5-cache/net-nds/nsscache-0.32 b/metadata/md5-cache/net-nds/nsscache-0.32
index 5a7d63756bb1..2931f7ed741b 100644
--- a/metadata/md5-cache/net-nds/nsscache-0.32
+++ b/metadata/md5-cache/net-nds/nsscache-0.32
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 ) || ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/google/nsscache/archive/version/0.32.tar.gz -> nsscache-0.32.tar.gz https://dev.gentoo.org/~robbat2/nsscache-0.30-r3-gentoo-authorized-keys-command.py
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bb1099b749514b83ba2a41b209545033
diff --git a/metadata/md5-cache/net-news/Manifest.gz b/metadata/md5-cache/net-news/Manifest.gz
index 09032a04ea02..cbe1d107ed0b 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/canto-curses-0.9.3 b/metadata/md5-cache/net-news/canto-curses-0.9.3
index 403a0a8c15d8..111b8f3ec9a2 100644
--- a/metadata/md5-cache/net-news/canto-curses-0.9.3
+++ b/metadata/md5-cache/net-news/canto-curses-0.9.3
@@ -10,5 +10,5 @@ RDEPEND=>=net-news/canto-daemon-0.9.1[python_targets_python3_4(-)?,python_target
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://codezen.org/static/canto-curses-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6f2a1db8d019e6c2b55fccb2cc95a72a
diff --git a/metadata/md5-cache/net-news/canto-daemon-0.9.1 b/metadata/md5-cache/net-news/canto-daemon-0.9.1
index d0fde25e1eab..11b9c18e0d46 100644
--- a/metadata/md5-cache/net-news/canto-daemon-0.9.1
+++ b/metadata/md5-cache/net-news/canto-daemon-0.9.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/feedparser[python_targets_python3_4(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://codezen.org/static/canto-daemon-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=273da4341f54864eb77cbd149ec486b5
diff --git a/metadata/md5-cache/net-news/liferea-1.12.1 b/metadata/md5-cache/net-news/liferea-1.12.1
index e463c399ed99..ce20fa2dea6d 100644
--- a/metadata/md5-cache/net-news/liferea-1.12.1
+++ b/metadata/md5-cache/net-news/liferea-1.12.1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/lwindolf/liferea/releases/download/v1.12.1/liferea-1.12.1.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	pax-utils	e85f015e815dd463b0c206d781ef45a5	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_=5c7e91d27f808c5a1d8a0b17537ebfe3
diff --git a/metadata/md5-cache/net-news/liferea-1.12.2 b/metadata/md5-cache/net-news/liferea-1.12.2
index 2fe841447c9c..407a5cef4bff 100644
--- a/metadata/md5-cache/net-news/liferea-1.12.2
+++ b/metadata/md5-cache/net-news/liferea-1.12.2
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/lwindolf/liferea/releases/download/v1.12.2/liferea-1.12.2.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	pax-utils	e85f015e815dd463b0c206d781ef45a5	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_=1b1baaa3c1270974bf104a7595d48069
diff --git a/metadata/md5-cache/net-news/liferea-1.12.3 b/metadata/md5-cache/net-news/liferea-1.12.3
index 0c82e487e713..d97782185e6a 100644
--- a/metadata/md5-cache/net-news/liferea-1.12.3
+++ b/metadata/md5-cache/net-news/liferea-1.12.3
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/lwindolf/liferea/releases/download/v1.12.3/liferea-1.12.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	pax-utils	e85f015e815dd463b0c206d781ef45a5	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_=9ae2d926a13fab586012f9426b3a9c79
diff --git a/metadata/md5-cache/net-news/liferea-1.12_rc3 b/metadata/md5-cache/net-news/liferea-1.12_rc3
index 880e6a90edd9..b87f2d7b411f 100644
--- a/metadata/md5-cache/net-news/liferea-1.12_rc3
+++ b/metadata/md5-cache/net-news/liferea-1.12_rc3
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/lwindolf/liferea/releases/download/v1.12-rc3/liferea-1.12-rc3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	pax-utils	e85f015e815dd463b0c206d781ef45a5	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_=b6a57620e49d6a7404727a636ea5f931
diff --git a/metadata/md5-cache/net-news/liferea-1.12_rc3-r1 b/metadata/md5-cache/net-news/liferea-1.12_rc3-r1
index 2cfb1e213e5f..086b6172e1fc 100644
--- a/metadata/md5-cache/net-news/liferea-1.12_rc3-r1
+++ b/metadata/md5-cache/net-news/liferea-1.12_rc3-r1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/lwindolf/liferea/releases/download/v1.12-rc3/liferea-1.12-rc3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	pax-utils	e85f015e815dd463b0c206d781ef45a5	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_=cccfb71cf8e1b9e33e25cd56d9012286
diff --git a/metadata/md5-cache/net-news/quiterss-0.18.12 b/metadata/md5-cache/net-news/quiterss-0.18.12
index 8a2a53c46650..428d38e33efb 100644
--- a/metadata/md5-cache/net-news/quiterss-0.18.12
+++ b/metadata/md5-cache/net-news/quiterss-0.18.12
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-db/sqlite-3.11.1:3 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsingleapplication[X,qt5(+)] dev-qt/qtsql:5[sqlite] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
 SLOT=0
 SRC_URI=https://github.com/QuiteRSS/quiterss/archive/0.18.12.tar.gz -> quiterss-0.18.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=aaf11d5f7815063c03c5f427b7b80e88
diff --git a/metadata/md5-cache/net-news/quiterss-0.18.9-r1 b/metadata/md5-cache/net-news/quiterss-0.18.9-r1
index c63a025f96aa..2e7025ddd59c 100644
--- a/metadata/md5-cache/net-news/quiterss-0.18.9-r1
+++ b/metadata/md5-cache/net-news/quiterss-0.18.9-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-db/sqlite-3.11.1:3 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsingleapplication[X,qt5(+)] dev-qt/qtsql:5[sqlite] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
 SLOT=0
 SRC_URI=https://github.com/QuiteRSS/quiterss/archive/0.18.9.tar.gz -> quiterss-0.18.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b8466bdbce5b3185623291168b52bb16
diff --git a/metadata/md5-cache/net-news/quiterss-9999 b/metadata/md5-cache/net-news/quiterss-9999
index db3348304b71..0e8d8598a7e9 100644
--- a/metadata/md5-cache/net-news/quiterss-9999
+++ b/metadata/md5-cache/net-news/quiterss-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://quiterss.org
 LICENSE=GPL-3
 RDEPEND=>=dev-db/sqlite-3.11.1:3 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsingleapplication[X,qt5(+)] dev-qt/qtsql:5[sqlite] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=aaf11d5f7815063c03c5f427b7b80e88
diff --git a/metadata/md5-cache/net-news/rawdog-2.19 b/metadata/md5-cache/net-news/rawdog-2.19
index 10b619353b51..f767f743f7af 100644
--- a/metadata/md5-cache/net-news/rawdog-2.19
+++ b/metadata/md5-cache/net-news/rawdog-2.19
@@ -10,5 +10,5 @@ RDEPEND=dev-python/feedparser[python_targets_pypy(-)?,python_targets_python2_7(-
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://offog.org/files/rawdog-2.19.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=17197f630da08aad2bd5c946a9329b33
diff --git a/metadata/md5-cache/net-news/rawdog-2.20 b/metadata/md5-cache/net-news/rawdog-2.20
index 6100ed5d0742..d3fb22ea4688 100644
--- a/metadata/md5-cache/net-news/rawdog-2.20
+++ b/metadata/md5-cache/net-news/rawdog-2.20
@@ -10,5 +10,5 @@ RDEPEND=dev-python/feedparser[python_targets_pypy(-)?,python_targets_python2_7(-
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://offog.org/files/rawdog-2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5ae826b86331c1113f5e787401db8fc0
diff --git a/metadata/md5-cache/net-news/rawdog-2.22-r1 b/metadata/md5-cache/net-news/rawdog-2.22-r1
index 0cf9c976ea01..82d0dcafd29a 100644
--- a/metadata/md5-cache/net-news/rawdog-2.22-r1
+++ b/metadata/md5-cache/net-news/rawdog-2.22-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/feedparser[python_targets_pypy(-)?,python_targets_python2_7(-
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://offog.org/files/rawdog-2.22.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4d8c5de6fb650f5f8320209fc6fe40f1
diff --git a/metadata/md5-cache/net-nntp/Manifest.gz b/metadata/md5-cache/net-nntp/Manifest.gz
index 702d85aae4f7..dd03044ed9e3 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 3ade048eba26..12d4432caa17 100644
--- a/metadata/md5-cache/net-nntp/kwooty-1.1.0_p20150623
+++ b/metadata/md5-cache/net-nntp/kwooty-1.1.0_p20150623
@@ -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/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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/pan-0.142 b/metadata/md5-cache/net-nntp/pan-0.142
index 1814fb0e8694..45711cb8e68c 100644
--- a/metadata/md5-cache/net-nntp/pan-0.142
+++ b/metadata/md5-cache/net-nntp/pan-0.142
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.26:2 dev-libs/gmime:2.6 >=sys-libs/zlib-1.2.0 >=x11-libs/gtk+-2.16:2 gnome-keyring? ( >=gnome-base/libgnome-keyring-3.2 ) libnotify? ( >=x11-libs/libnotify-0.4.1:0= ) spell? ( >=app-text/enchant-1.6 >=app-text/gtkspell-2.0.7:2 ) ssl? ( >=net-libs/gnutls-3:0= )
 SLOT=0
 SRC_URI=http://pan.rebelbase.com/download/releases/0.142/source/pan-0.142.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=6597d14087eaddb288b9175a4f96bf52
diff --git a/metadata/md5-cache/net-nntp/pan-0.145 b/metadata/md5-cache/net-nntp/pan-0.145
index dd73ff89fd99..7174a441f5f8 100644
--- a/metadata/md5-cache/net-nntp/pan-0.145
+++ b/metadata/md5-cache/net-nntp/pan-0.145
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.26:2 dev-libs/gmime:2.6 >=sys-libs/zlib-1.2.0 >=x11-libs/gtk+-2.16:2 gnome-keyring? ( >=gnome-base/libgnome-keyring-3.2 ) libnotify? ( >=x11-libs/libnotify-0.4.1:0= ) spell? ( >=app-text/enchant-1.6 >=app-text/gtkspell-2.0.7:2 ) ssl? ( >=net-libs/gnutls-3:0= )
 SLOT=0
 SRC_URI=http://pan.rebelbase.com/download/releases/0.145/source/pan-0.145.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=d46ede4e68fd4eb583008142f6526fce
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 20067a2608e8..731657a813d0 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/airdcpp-webclient-2.2.1 b/metadata/md5-cache/net-p2p/airdcpp-webclient-2.2.1
index 27a9f2b0c30d..0e94cb81d50d 100644
--- a/metadata/md5-cache/net-p2p/airdcpp-webclient-2.2.1
+++ b/metadata/md5-cache/net-p2p/airdcpp-webclient-2.2.1
@@ -10,5 +10,5 @@ PDEPEND=webui? ( www-apps/airdcpp-webui )
 RDEPEND=app-arch/bzip2 dev-cpp/websocketpp dev-libs/boost:= dev-libs/geoip dev-libs/leveldb:= dev-libs/openssl:0=[-bindist] net-libs/miniupnpc:= sys-libs/zlib:= virtual/libiconv nat-pmp? ( net-libs/libnatpmp:= ) tbb? ( dev-cpp/tbb:= )
 SLOT=0
 SRC_URI=https://github.com/airdcpp-web/airdcpp-webclient/archive/2.2.1.tar.gz -> airdcpp-webclient-2.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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e3817172222d8b37ae2a9f9b4aade13b
diff --git a/metadata/md5-cache/net-p2p/airdcpp-webclient-2.3.0 b/metadata/md5-cache/net-p2p/airdcpp-webclient-2.3.0
index 83b7e629c21e..b486cbce4fb1 100644
--- a/metadata/md5-cache/net-p2p/airdcpp-webclient-2.3.0
+++ b/metadata/md5-cache/net-p2p/airdcpp-webclient-2.3.0
@@ -10,5 +10,5 @@ PDEPEND=webui? ( www-apps/airdcpp-webui )
 RDEPEND=app-arch/bzip2 dev-cpp/websocketpp dev-libs/boost:= dev-libs/leveldb:= dev-libs/libmaxminddb:= dev-libs/openssl:0=[-bindist] net-libs/miniupnpc:= sys-libs/zlib:= virtual/libiconv nat-pmp? ( net-libs/libnatpmp:= ) tbb? ( dev-cpp/tbb:= )
 SLOT=0
 SRC_URI=https://github.com/airdcpp-web/airdcpp-webclient/archive/2.3.0.tar.gz -> airdcpp-webclient-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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a555c2f6fa98be1d0a56b752338954a4
diff --git a/metadata/md5-cache/net-p2p/amule-2.3.2-r2 b/metadata/md5-cache/net-p2p/amule-2.3.2-r2
index b6f49c3ea180..dcdfc0ef42e3 100644
--- a/metadata/md5-cache/net-p2p/amule-2.3.2-r2
+++ b/metadata/md5-cache/net-p2p/amule-2.3.2-r2
@@ -4,10 +4,10 @@ DESCRIPTION=aMule, the all-platform eMule p2p client
 EAPI=6
 HOMEPAGE=http://www.amule.org/
 IUSE=daemon debug geoip nls remote stats upnp +X
-KEYWORDS=alpha amd64 ~arm ~ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ~arm ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/boost:= dev-libs/crypto++:= sys-libs/binutils-libs:0= sys-libs/zlib x11-libs/wxGTK:3.0[X?] stats? ( media-libs/gd:=[jpeg,png] ) geoip? ( dev-libs/geoip ) upnp? ( net-libs/libupnp:* ) remote? ( media-libs/libpng:0= ) !net-p2p/imule
 SLOT=0
 SRC_URI=mirror://sourceforge/amule/aMule-2.3.2.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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89
-_md5_=6cbdb944b687e25f470b289f8c457f4d
+_md5_=185320b3854da4bd1bf16b9561f958ef
diff --git a/metadata/md5-cache/net-p2p/bisq-0.6.3 b/metadata/md5-cache/net-p2p/bisq-0.6.3
index e9342768fe33..abf75e4e6553 100644
--- a/metadata/md5-cache/net-p2p/bisq-0.6.3
+++ b/metadata/md5-cache/net-p2p/bisq-0.6.3
@@ -9,5 +9,5 @@ LICENSE=AGPL-3+
 RDEPEND=!net-p2p/bisq-bin x11-misc/xdg-utils dev-libs/glib:2[abi_x86_64] dev-libs/libxslt[abi_x86_64] media-libs/fontconfig:1.0[abi_x86_64] x11-libs/gtk+:2[abi_x86_64] x11-libs/libXtst[abi_x86_64] x11-libs/pango[abi_x86_64]
 SLOT=0
 SRC_URI=https://github.com/bisq-network/exchange/archive/v0.6.3.tar.gz -> bisq-0.6.3.tar.gz https://jitpack.io/com/github/JesusMcCloud/jtorctl/0/jtorctl-0.jar https://jitpack.io/com/github/JesusMcCloud/jtorctl/0/jtorctl-0.pom https://jitpack.io/com/github/JesusMcCloud/netlayer/parent/b3497f1d/parent-b3497f1d.pom https://jitpack.io/com/github/JesusMcCloud/netlayer/tor/b3497f1d/tor-b3497f1d.jar https://jitpack.io/com/github/JesusMcCloud/netlayer/tor/b3497f1d/tor-b3497f1d.pom https://jitpack.io/com/github/JesusMcCloud/netlayer/tor.native/b3497f1d/tor.native-b3497f1d.jar https://jitpack.io/com/github/JesusMcCloud/netlayer/tor.native/b3497f1d/tor.native-b3497f1d.pom https://jitpack.io/com/github/MicroUtils/kotlin-logging/3aedaa9310/kotlin-logging-3aedaa9310.jar https://jitpack.io/com/github/MicroUtils/kotlin-logging/3aedaa9310/kotlin-logging-3aedaa9310.pom https://jitpack.io/com/github/bisq-network/bitcoinj/bitcoinj-core/63c9a917/bitcoinj-core-63c9a917.jar https://jitpack.io/com/github/bisq-network/bitcoinj/bitcoinj-core/63c9a917/bitcoinj-core-63c9a917.pom https://jitpack.io/com/github/bisq-network/bitcoinj/bitcoinj-parent/63c9a917/bitcoinj-parent-63c9a917.pom https://jitpack.io/com/github/bisq-network/btcd-cli4j/btcd-cli4j-core/29f99be/btcd-cli4j-core-29f99be.jar https://jitpack.io/com/github/bisq-network/btcd-cli4j/btcd-cli4j-core/29f99be/btcd-cli4j-core-29f99be.pom https://jitpack.io/com/github/bisq-network/btcd-cli4j/btcd-cli4j-daemon/29f99be/btcd-cli4j-daemon-29f99be.jar https://jitpack.io/com/github/bisq-network/btcd-cli4j/btcd-cli4j-daemon/29f99be/btcd-cli4j-daemon-29f99be.pom https://jitpack.io/com/github/bisq-network/btcd-cli4j/btcd-cli4j-parent/29f99be/btcd-cli4j-parent-29f99be.pom https://jitpack.io/com/github/bisq-network/libdohj/libdohj-core/a83809f3/libdohj-core-a83809f3.jar https://jitpack.io/com/github/bisq-network/libdohj/libdohj-core/a83809f3/libdohj-core-a83809f3.pom https://jitpack.io/com/github/ravn/jsocks/567e1cd/jsocks-567e1cd.jar https://jitpack.io/com/github/ravn/jsocks/567e1cd/jsocks-567e1cd.pom https://raw.githubusercontent.com/JesusMcCloud/tor-binary/testrelease/release/com/cedricwalter/tor-binary/7.0.11/tor-binary-7.0.11.pom https://raw.githubusercontent.com/JesusMcCloud/tor-binary/testrelease/release/com/cedricwalter/tor-binary-geoip/7.0.11/tor-binary-geoip-7.0.11.jar https://raw.githubusercontent.com/JesusMcCloud/tor-binary/testrelease/release/com/cedricwalter/tor-binary-geoip/7.0.11/tor-binary-geoip-7.0.11.pom https://raw.githubusercontent.com/JesusMcCloud/tor-binary/testrelease/release/com/cedricwalter/tor-binary-linux32/7.0.11/tor-binary-linux32-7.0.11.jar https://raw.githubusercontent.com/JesusMcCloud/tor-binary/testrelease/release/com/cedricwalter/tor-binary-linux32/7.0.11/tor-binary-linux32-7.0.11.pom https://raw.githubusercontent.com/JesusMcCloud/tor-binary/testrelease/release/com/cedricwalter/tor-binary-linux64/7.0.11/tor-binary-linux64-7.0.11.jar https://raw.githubusercontent.com/JesusMcCloud/tor-binary/testrelease/release/com/cedricwalter/tor-binary-linux64/7.0.11/tor-binary-linux64-7.0.11.pom https://raw.githubusercontent.com/JesusMcCloud/tor-binary/testrelease/release/com/cedricwalter/tor-binary-macos/7.0.11/tor-binary-macos-7.0.11.jar https://raw.githubusercontent.com/JesusMcCloud/tor-binary/testrelease/release/com/cedricwalter/tor-binary-macos/7.0.11/tor-binary-macos-7.0.11.pom https://raw.githubusercontent.com/JesusMcCloud/tor-binary/testrelease/release/com/cedricwalter/tor-binary-windows/7.0.11/tor-binary-windows-7.0.11.jar https://raw.githubusercontent.com/JesusMcCloud/tor-binary/testrelease/release/com/cedricwalter/tor-binary-windows/7.0.11/tor-binary-windows-7.0.11.pom https://repo.maven.apache.org/maven2/antlr/antlr/2.7.2/antlr-2.7.2.jar https://repo.maven.apache.org/maven2/antlr/antlr/2.7.2/antlr-2.7.2.pom https://repo.maven.apache.org/maven2/aopalliance/aopalliance/1.0/aopalliance-1.0.jar https://repo.maven.apache.org/maven2/aopalliance/aopalliance/1.0/aopalliance-1.0.pom https://repo.maven.apache.org/maven2/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.pom https://repo.maven.apache.org/maven2/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar https://repo.maven.apache.org/maven2/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom https://repo.maven.apache.org/maven2/ch/qos/logback/logback-classic/1.1.10/logback-classic-1.1.10.jar https://repo.maven.apache.org/maven2/ch/qos/logback/logback-classic/1.1.10/logback-classic-1.1.10.pom https://repo.maven.apache.org/maven2/ch/qos/logback/logback-core/1.1.10/logback-core-1.1.10.jar https://repo.maven.apache.org/maven2/ch/qos/logback/logback-core/1.1.10/logback-core-1.1.10.pom https://repo.maven.apache.org/maven2/ch/qos/logback/logback-parent/1.1.10/logback-parent-1.1.10.pom https://repo.maven.apache.org/maven2/classworlds/classworlds/1.1/classworlds-1.1.jar https://repo.maven.apache.org/maven2/classworlds/classworlds/1.1/classworlds-1.1.pom https://repo.maven.apache.org/maven2/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar https://repo.maven.apache.org/maven2/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.8.10/jackson-annotations-2.8.10.jar https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.8.10/jackson-annotations-2.8.10.pom https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-core/2.8.10/jackson-core-2.8.10.jar https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-core/2.8.10/jackson-core-2.8.10.pom https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.8.10/jackson-databind-2.8.10.jar https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.8.10/jackson-databind-2.8.10.pom https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-parent/2.8/jackson-parent-2.8.pom https://repo.maven.apache.org/maven2/com/fasterxml/oss-parent/27/oss-parent-27.pom https://repo.maven.apache.org/maven2/com/google/code/findbugs/jsr305/2.0.1/jsr305-2.0.1.jar https://repo.maven.apache.org/maven2/com/google/code/findbugs/jsr305/2.0.1/jsr305-2.0.1.pom https://repo.maven.apache.org/maven2/com/google/code/findbugs/jsr305/3.0.1/jsr305-3.0.1.jar https://repo.maven.apache.org/maven2/com/google/code/findbugs/jsr305/3.0.1/jsr305-3.0.1.pom https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.2.4/gson-2.2.4.jar https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.3.1/gson-2.3.1.jar https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.3.1/gson-2.3.1.pom https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.7/gson-2.7.jar https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.7/gson-2.7.pom https://repo.maven.apache.org/maven2/com/google/code/gson/gson-parent/2.7/gson-parent-2.7.pom https://repo.maven.apache.org/maven2/com/google/collections/google-collections/1.0/google-collections-1.0.jar https://repo.maven.apache.org/maven2/com/google/collections/google-collections/1.0/google-collections-1.0.pom https://repo.maven.apache.org/maven2/com/google/google/1/google-1.pom https://repo.maven.apache.org/maven2/com/google/google/5/google-5.pom https://repo.maven.apache.org/maven2/com/google/guava/guava/18.0/guava-18.0.jar https://repo.maven.apache.org/maven2/com/google/guava/guava/18.0/guava-18.0.pom https://repo.maven.apache.org/maven2/com/google/guava/guava/19.0/guava-19.0.jar https://repo.maven.apache.org/maven2/com/google/guava/guava/19.0/guava-19.0.pom https://repo.maven.apache.org/maven2/com/google/guava/guava/20.0/guava-20.0.jar https://repo.maven.apache.org/maven2/com/google/guava/guava/20.0/guava-20.0.pom https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/18.0/guava-parent-18.0.pom https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/19.0/guava-parent-19.0.pom https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/20.0/guava-parent-20.0.pom https://repo.maven.apache.org/maven2/com/google/inject/guice/3.0/guice-3.0.jar https://repo.maven.apache.org/maven2/com/google/inject/guice/4.1.0/guice-4.1.0.jar https://repo.maven.apache.org/maven2/com/google/inject/guice/4.1.0/guice-4.1.0.pom https://repo.maven.apache.org/maven2/com/google/inject/guice-parent/4.1.0/guice-parent-4.1.0.pom https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.2.0/protobuf-java-3.2.0.jar https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.3.0/protobuf-java-3.3.0.jar https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.3.0/protobuf-java-3.3.0.pom https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java-util/3.3.0/protobuf-java-util-3.3.0.jar https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java-util/3.3.0/protobuf-java-util-3.3.0.pom https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.3.0/protobuf-parent-3.3.0.pom https://repo.maven.apache.org/maven2/com/google/protobuf/protoc/3.3.0/protoc-3.3.0-linux-x86_64.exe https://repo.maven.apache.org/maven2/com/google/protobuf/protoc/3.3.0/protoc-3.3.0.pom https://repo.maven.apache.org/maven2/com/google/zxing/core/2.0/core-2.0.jar https://repo.maven.apache.org/maven2/com/google/zxing/core/2.0/core-2.0.pom https://repo.maven.apache.org/maven2/com/google/zxing/javase/2.0/javase-2.0.jar https://repo.maven.apache.org/maven2/com/google/zxing/javase/2.0/javase-2.0.pom https://repo.maven.apache.org/maven2/com/googlecode/jcsv/jcsv/1.4.0/jcsv-1.4.0.jar https://repo.maven.apache.org/maven2/com/googlecode/jcsv/jcsv/1.4.0/jcsv-1.4.0.pom https://repo.maven.apache.org/maven2/com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1.jar https://repo.maven.apache.org/maven2/com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1.pom https://repo.maven.apache.org/maven2/com/lambdaworks/scrypt/1.4.0/scrypt-1.4.0.jar https://repo.maven.apache.org/maven2/com/lambdaworks/scrypt/1.4.0/scrypt-1.4.0.pom https://repo.maven.apache.org/maven2/com/madgag/spongycastle/core/1.51.0.0/core-1.51.0.0.jar https://repo.maven.apache.org/maven2/com/madgag/spongycastle/core/1.51.0.0/core-1.51.0.0.pom https://repo.maven.apache.org/maven2/com/sparkjava/spark-core/2.5.2/spark-core-2.5.2.jar https://repo.maven.apache.org/maven2/com/sparkjava/spark-core/2.5.2/spark-core-2.5.2.pom https://repo.maven.apache.org/maven2/com/squareup/okhttp/okhttp/2.2.0/okhttp-2.2.0.jar https://repo.maven.apache.org/maven2/com/squareup/okhttp/okhttp/2.7.2/okhttp-2.7.2.jar https://repo.maven.apache.org/maven2/com/squareup/okhttp/okhttp/2.7.2/okhttp-2.7.2.pom https://repo.maven.apache.org/maven2/com/squareup/okhttp/parent/2.7.2/parent-2.7.2.pom https://repo.maven.apache.org/maven2/com/squareup/okio/okio/1.2.0/okio-1.2.0.jar https://repo.maven.apache.org/maven2/com/squareup/okio/okio/1.6.0/okio-1.6.0.jar https://repo.maven.apache.org/maven2/com/squareup/okio/okio/1.6.0/okio-1.6.0.pom https://repo.maven.apache.org/maven2/com/squareup/okio/okio-parent/1.6.0/okio-parent-1.6.0.pom https://repo.maven.apache.org/maven2/commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom https://repo.maven.apache.org/maven2/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar https://repo.maven.apache.org/maven2/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom https://repo.maven.apache.org/maven2/commons-chain/commons-chain/1.1/commons-chain-1.1.jar https://repo.maven.apache.org/maven2/commons-chain/commons-chain/1.1/commons-chain-1.1.pom https://repo.maven.apache.org/maven2/commons-cli/commons-cli/1.0/commons-cli-1.0.jar https://repo.maven.apache.org/maven2/commons-cli/commons-cli/1.0/commons-cli-1.0.pom https://repo.maven.apache.org/maven2/commons-cli/commons-cli/1.2/commons-cli-1.2.jar https://repo.maven.apache.org/maven2/commons-cli/commons-cli/1.2/commons-cli-1.2.pom https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.3/commons-codec-1.3.pom https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.6/commons-codec-1.6.jar https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.6/commons-codec-1.6.pom https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.9/commons-codec-1.9.jar https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.9/commons-codec-1.9.pom https://repo.maven.apache.org/maven2/commons-collections/commons-collections/2.0/commons-collections-2.0.pom https://repo.maven.apache.org/maven2/commons-collections/commons-collections/2.1/commons-collections-2.1.pom https://repo.maven.apache.org/maven2/commons-collections/commons-collections/3.1/commons-collections-3.1.pom https://repo.maven.apache.org/maven2/commons-collections/commons-collections/3.2/commons-collections-3.2.pom https://repo.maven.apache.org/maven2/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.pom https://repo.maven.apache.org/maven2/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar https://repo.maven.apache.org/maven2/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.pom https://repo.maven.apache.org/maven2/commons-digester/commons-digester/1.6/commons-digester-1.6.jar https://repo.maven.apache.org/maven2/commons-digester/commons-digester/1.6/commons-digester-1.6.pom https://repo.maven.apache.org/maven2/commons-digester/commons-digester/1.8/commons-digester-1.8.pom https://repo.maven.apache.org/maven2/commons-io/commons-io/2.2/commons-io-2.2.pom https://repo.maven.apache.org/maven2/commons-io/commons-io/2.4/commons-io-2.4.jar https://repo.maven.apache.org/maven2/commons-io/commons-io/2.4/commons-io-2.4.pom https://repo.maven.apache.org/maven2/commons-io/commons-io/2.5/commons-io-2.5.jar https://repo.maven.apache.org/maven2/commons-io/commons-io/2.5/commons-io-2.5.pom https://repo.maven.apache.org/maven2/commons-lang/commons-lang/2.1/commons-lang-2.1.jar https://repo.maven.apache.org/maven2/commons-lang/commons-lang/2.1/commons-lang-2.1.pom https://repo.maven.apache.org/maven2/commons-lang/commons-lang/2.3/commons-lang-2.3.jar https://repo.maven.apache.org/maven2/commons-lang/commons-lang/2.3/commons-lang-2.3.pom https://repo.maven.apache.org/maven2/commons-lang/commons-lang/2.4/commons-lang-2.4.pom https://repo.maven.apache.org/maven2/commons-lang/commons-lang/2.6/commons-lang-2.6.jar https://repo.maven.apache.org/maven2/commons-lang/commons-lang/2.6/commons-lang-2.6.pom https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.0/commons-logging-1.0.pom https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.1/commons-logging-1.1.pom https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.jar https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.pom https://repo.maven.apache.org/maven2/commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.jar https://repo.maven.apache.org/maven2/commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.pom https://repo.maven.apache.org/maven2/commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar https://repo.maven.apache.org/maven2/commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.pom https://repo.maven.apache.org/maven2/de/jensd/fontawesomefx/8.0.0/fontawesomefx-8.0.0.jar https://repo.maven.apache.org/maven2/de/jensd/fontawesomefx/8.0.0/fontawesomefx-8.0.0.pom https://repo.maven.apache.org/maven2/dom4j/dom4j/1.1/dom4j-1.1.jar https://repo.maven.apache.org/maven2/dom4j/dom4j/1.1/dom4j-1.1.pom https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1.jar https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1.pom https://repo.maven.apache.org/maven2/javax/servlet/javax.servlet-api/3.1.0/javax.servlet-api-3.1.0.jar https://repo.maven.apache.org/maven2/javax/servlet/javax.servlet-api/3.1.0/javax.servlet-api-3.1.0.pom https://repo.maven.apache.org/maven2/javax/servlet/servlet-api/2.3/servlet-api-2.3.pom https://repo.maven.apache.org/maven2/junit/junit/3.8.1/junit-3.8.1.jar https://repo.maven.apache.org/maven2/junit/junit/3.8.1/junit-3.8.1.pom https://repo.maven.apache.org/maven2/junit/junit/3.8.2/junit-3.8.2.jar https://repo.maven.apache.org/maven2/junit/junit/3.8.2/junit-3.8.2.pom https://repo.maven.apache.org/maven2/junit/junit/4.11/junit-4.11.jar https://repo.maven.apache.org/maven2/junit/junit/4.11/junit-4.11.pom https://repo.maven.apache.org/maven2/log4j/log4j/1.2.12/log4j-1.2.12.jar https://repo.maven.apache.org/maven2/log4j/log4j/1.2.12/log4j-1.2.12.pom https://repo.maven.apache.org/maven2/logkit/logkit/1.0.1/logkit-1.0.1.pom https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.6.5/byte-buddy-1.6.5.jar https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.6.5/byte-buddy-1.6.5.pom https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.6.5/byte-buddy-agent-1.6.5.jar https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.6.5/byte-buddy-agent-1.6.5.pom https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.6.5/byte-buddy-parent-1.6.5.pom https://repo.maven.apache.org/maven2/net/glxn/qrgen/1.3/qrgen-1.3.jar https://repo.maven.apache.org/maven2/net/glxn/qrgen/1.3/qrgen-1.3.pom https://repo.maven.apache.org/maven2/net/gpedro/integrations/slack/slack-webhook/1.1.1/slack-webhook-1.1.1.jar https://repo.maven.apache.org/maven2/net/gpedro/integrations/slack/slack-webhook/1.1.1/slack-webhook-1.1.1.pom https://repo.maven.apache.org/maven2/net/java/jvnet-parent/3/jvnet-parent-3.pom https://repo.maven.apache.org/maven2/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0.jar https://repo.maven.apache.org/maven2/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0.pom https://repo.maven.apache.org/maven2/net/sf/jopt-simple/jopt-simple/4.8/jopt-simple-4.8.jar https://repo.maven.apache.org/maven2/net/sf/jopt-simple/jopt-simple/5.0.3/jopt-simple-5.0.3.jar https://repo.maven.apache.org/maven2/net/sf/jopt-simple/jopt-simple/5.0.3/jopt-simple-5.0.3.pom https://repo.maven.apache.org/maven2/org/apache/ant/ant/1.9.4/ant-1.9.4.jar https://repo.maven.apache.org/maven2/org/apache/ant/ant/1.9.4/ant-1.9.4.pom https://repo.maven.apache.org/maven2/org/apache/ant/ant-launcher/1.9.4/ant-launcher-1.9.4.jar https://repo.maven.apache.org/maven2/org/apache/ant/ant-launcher/1.9.4/ant-launcher-1.9.4.pom https://repo.maven.apache.org/maven2/org/apache/ant/ant-parent/1.9.4/ant-parent-1.9.4.pom https://repo.maven.apache.org/maven2/org/apache/apache/10/apache-10.pom https://repo.maven.apache.org/maven2/org/apache/apache/11/apache-11.pom https://repo.maven.apache.org/maven2/org/apache/apache/13/apache-13.pom https://repo.maven.apache.org/maven2/org/apache/apache/14/apache-14.pom https://repo.maven.apache.org/maven2/org/apache/apache/16/apache-16.pom https://repo.maven.apache.org/maven2/org/apache/apache/18/apache-18.pom https://repo.maven.apache.org/maven2/org/apache/apache/2/apache-2.pom https://repo.maven.apache.org/maven2/org/apache/apache/3/apache-3.pom https://repo.maven.apache.org/maven2/org/apache/apache/4/apache-4.pom https://repo.maven.apache.org/maven2/org/apache/apache/5/apache-5.pom https://repo.maven.apache.org/maven2/org/apache/apache/6/apache-6.pom https://repo.maven.apache.org/maven2/org/apache/apache/7/apache-7.pom https://repo.maven.apache.org/maven2/org/apache/apache/9/apache-9.pom https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.11/commons-compress-1.11.jar https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.11/commons-compress-1.11.pom https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.15/commons-compress-1.15.jar https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.15/commons-compress-1.15.pom https://repo.maven.apache.org/maven2/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar https://repo.maven.apache.org/maven2/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.pom https://repo.maven.apache.org/maven2/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4.jar https://repo.maven.apache.org/maven2/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4.pom https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/11/commons-parent-11.pom https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/17/commons-parent-17.pom https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/22/commons-parent-22.pom https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/24/commons-parent-24.pom https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/25/commons-parent-25.pom https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/32/commons-parent-32.pom https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/34/commons-parent-34.pom https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/37/commons-parent-37.pom https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/39/commons-parent-39.pom https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/42/commons-parent-42.pom https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/5/commons-parent-5.pom https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/9/commons-parent-9.pom https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.jar https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.pom https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.5/httpclient-4.5.jar https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.5.3/httpclient-4.5.3.jar https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.5.3/httpclient-4.5.3.pom https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponents-client/4.0.2/httpcomponents-client-4.0.2.pom https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponents-client/4.5.3/httpcomponents-client-4.5.3.pom https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponents-core/4.0.1/httpcomponents-core-4.0.1.pom https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponents-core/4.4.6/httpcomponents-core-4.4.6.pom https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.pom https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcore/4.4.1/httpcore-4.4.1.jar https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcore/4.4.6/httpcore-4.4.6.jar https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcore/4.4.6/httpcore-4.4.6.pom https://repo.maven.apache.org/maven2/org/apache/httpcomponents/project/4.0/project-4.0.pom https://repo.maven.apache.org/maven2/org/apache/httpcomponents/project/4.1/project-4.1.pom https://repo.maven.apache.org/maven2/org/apache/httpcomponents/project/7/project-7.pom https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia/1.0/doxia-1.0.pom https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia/1.1/doxia-1.1.pom https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia/1.2/doxia-1.2.pom https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia/1.4/doxia-1.4.pom https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-core/1.2/doxia-core-1.2.jar https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-core/1.2/doxia-core-1.2.pom https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-core/1.4/doxia-core-1.4.pom https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-decoration-model/1.2/doxia-decoration-model-1.2.pom https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-decoration-model/1.4/doxia-decoration-model-1.4.jar https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-decoration-model/1.4/doxia-decoration-model-1.4.pom https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-logging-api/1.1/doxia-logging-api-1.1.jar https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-logging-api/1.1/doxia-logging-api-1.1.pom https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-logging-api/1.2/doxia-logging-api-1.2.pom https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-logging-api/1.4/doxia-logging-api-1.4.jar https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-logging-api/1.4/doxia-logging-api-1.4.pom https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-module-fml/1.2/doxia-module-fml-1.2.pom https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-module-fml/1.4/doxia-module-fml-1.4.jar https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-module-fml/1.4/doxia-module-fml-1.4.pom https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-module-xhtml/1.2/doxia-module-xhtml-1.2.pom https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-module-xhtml/1.4/doxia-module-xhtml-1.4.jar https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-module-xhtml/1.4/doxia-module-xhtml-1.4.pom https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-modules/1.2/doxia-modules-1.2.pom https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-modules/1.4/doxia-modules-1.4.pom https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.pom https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-sink-api/1.1/doxia-sink-api-1.1.jar https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-sink-api/1.1/doxia-sink-api-1.1.pom https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-sink-api/1.2/doxia-sink-api-1.2.pom https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-sink-api/1.4/doxia-sink-api-1.4.jar https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-sink-api/1.4/doxia-sink-api-1.4.pom https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-site-renderer/1.2/doxia-site-renderer-1.2.pom https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-site-renderer/1.4/doxia-site-renderer-1.4.jar https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-site-renderer/1.4/doxia-site-renderer-1.4.pom https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-sitetools/1.2/doxia-sitetools-1.2.pom https://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-sitetools/1.4/doxia-sitetools-1.4.pom https://repo.maven.apache.org/maven2/org/apache/maven/enforcer/enforcer/1.4.1/enforcer-1.4.1.pom https://repo.maven.apache.org/maven2/org/apache/maven/enforcer/enforcer-api/1.4.1/enforcer-api-1.4.1.jar https://repo.maven.apache.org/maven2/org/apache/maven/enforcer/enforcer-api/1.4.1/enforcer-api-1.4.1.pom https://repo.maven.apache.org/maven2/org/apache/maven/enforcer/enforcer-rules/1.4.1/enforcer-rules-1.4.1.jar https://repo.maven.apache.org/maven2/org/apache/maven/enforcer/enforcer-rules/1.4.1/enforcer-rules-1.4.1.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven/2.0.2/maven-2.0.2.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven/2.0.5/maven-2.0.5.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven/2.0.6/maven-2.0.6.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven/2.0.8/maven-2.0.8.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven/2.0.9/maven-2.0.9.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven/2.2.1/maven-2.2.1.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven/3.0/maven-3.0.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven/3.0.3/maven-3.0.3.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact/2.0.2/maven-artifact-2.0.2.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact/2.0.5/maven-artifact-2.0.5.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact-manager/2.2.1/maven-artifact-manager-2.2.1.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact-manager/2.2.1/maven-artifact-manager-2.2.1.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-compat/3.0/maven-compat-3.0.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-compat/3.0/maven-compat-3.0.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-compat/3.0.3/maven-compat-3.0.3.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-compat/3.0.3/maven-compat-3.0.3.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-core/2.2.1/maven-core-2.2.1.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-core/2.2.1/maven-core-2.2.1.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-core/3.0/maven-core-3.0.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-core/3.0/maven-core-3.0.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-error-diagnostics/2.2.1/maven-error-diagnostics-2.2.1.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-error-diagnostics/2.2.1/maven-error-diagnostics-2.2.1.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-model/2.0.5/maven-model-2.0.5.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-model/3.0/maven-model-3.0.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-model/3.0/maven-model-3.0.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-model/3.0.3/maven-model-3.0.3.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-model/3.0.3/maven-model-3.0.3.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-model-builder/3.0.3/maven-model-builder-3.0.3.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-model-builder/3.0.3/maven-model-builder-3.0.3.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-monitor/2.2.1/maven-monitor-2.2.1.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-monitor/2.2.1/maven-monitor-2.2.1.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/10/maven-parent-10.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/11/maven-parent-11.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/13/maven-parent-13.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/15/maven-parent-15.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/16/maven-parent-16.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/19/maven-parent-19.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/21/maven-parent-21.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/22/maven-parent-22.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/23/maven-parent-23.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/24/maven-parent-24.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/26/maven-parent-26.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/30/maven-parent-30.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/5/maven-parent-5.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/6/maven-parent-6.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/7/maven-parent-7.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/8/maven-parent-8.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/9/maven-parent-9.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-api/2.2.1/maven-plugin-api-2.2.1.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-api/2.2.1/maven-plugin-api-2.2.1.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-descriptor/2.2.1/maven-plugin-descriptor-2.2.1.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-descriptor/2.2.1/maven-plugin-descriptor-2.2.1.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-parameter-documenter/2.2.1/maven-plugin-parameter-documenter-2.2.1.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-parameter-documenter/2.2.1/maven-plugin-parameter-documenter-2.2.1.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-registry/2.2.1/maven-plugin-registry-2.2.1.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-registry/2.2.1/maven-plugin-registry-2.2.1.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-profile/2.2.1/maven-profile-2.2.1.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-profile/2.2.1/maven-profile-2.2.1.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-project/2.2.1/maven-project-2.2.1.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-project/2.2.1/maven-project-2.2.1.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-repository-metadata/2.2.1/maven-repository-metadata-2.2.1.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-repository-metadata/2.2.1/maven-repository-metadata-2.2.1.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings/2.2.1/maven-settings-2.2.1.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings/2.2.1/maven-settings-2.2.1.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings/3.0/maven-settings-3.0.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings/3.0/maven-settings-3.0.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings/3.0.3/maven-settings-3.0.3.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.pom https://repo.maven.apache.org/maven2/org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.jar https://repo.maven.apache.org/maven2/org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.pom https://repo.maven.apache.org/maven2/org/apache/maven/plugin-testing/maven-plugin-testing/1.3/maven-plugin-testing-1.3.pom https://repo.maven.apache.org/maven2/org/apache/maven/plugin-testing/maven-plugin-testing-harness/1.3/maven-plugin-testing-harness-1.3.jar https://repo.maven.apache.org/maven2/org/apache/maven/plugin-testing/maven-plugin-testing-harness/1.3/maven-plugin-testing-harness-1.3.pom https://repo.maven.apache.org/maven2/org/apache/maven/plugin-tools/maven-plugin-annotations/3.1/maven-plugin-annotations-3.1.jar https://repo.maven.apache.org/maven2/org/apache/maven/plugin-tools/maven-plugin-annotations/3.1/maven-plugin-annotations-3.1.pom https://repo.maven.apache.org/maven2/org/apache/maven/plugin-tools/maven-plugin-annotations/3.4/maven-plugin-annotations-3.4.jar https://repo.maven.apache.org/maven2/org/apache/maven/plugin-tools/maven-plugin-annotations/3.4/maven-plugin-annotations-3.4.pom https://repo.maven.apache.org/maven2/org/apache/maven/plugin-tools/maven-plugin-tools/3.1/maven-plugin-tools-3.1.pom https://repo.maven.apache.org/maven2/org/apache/maven/plugin-tools/maven-plugin-tools/3.4/maven-plugin-tools-3.4.pom https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-antrun-plugin/1.8/maven-antrun-plugin-1.8.jar https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-antrun-plugin/1.8/maven-antrun-plugin-1.8.pom https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.jar https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-compiler-plugin/3.1/maven-compiler-plugin-3.1.jar https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-compiler-plugin/3.1/maven-compiler-plugin-3.1.pom https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-dependency-plugin/3.0.1/maven-dependency-plugin-3.0.1.jar https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-dependency-plugin/3.0.1/maven-dependency-plugin-3.0.1.pom https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-deploy-plugin/2.7/maven-deploy-plugin-2.7.jar https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-enforcer-plugin/1.4.1/maven-enforcer-plugin-1.4.1.jar https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-enforcer-plugin/1.4.1/maven-enforcer-plugin-1.4.1.pom https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-install-plugin/2.4/maven-install-plugin-2.4.jar https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.jar https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.pom https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-plugins/22/maven-plugins-22.pom https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-plugins/23/maven-plugins-23.pom https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-plugins/24/maven-plugins-24.pom https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-plugins/27/maven-plugins-27.pom https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-plugins/30/maven-plugins-30.pom https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-resources-plugin/2.6/maven-resources-plugin-2.6.jar https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-resources-plugin/2.6/maven-resources-plugin-2.6.pom https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-shade-plugin/2.3/maven-shade-plugin-2.3.jar https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-shade-plugin/3.1.0/maven-shade-plugin-3.1.0.jar https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-shade-plugin/3.1.0/maven-shade-plugin-3.1.0.pom https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-site-plugin/3.3/maven-site-plugin-3.3.jar https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-surefire-plugin/2.12.4/maven-surefire-plugin-2.12.4.jar https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-surefire-plugin/2.12.4/maven-surefire-plugin-2.12.4.pom https://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom https://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-reporting/2.0.9/maven-reporting-2.0.9.pom https://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-reporting/2.2.1/maven-reporting-2.2.1.pom https://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar https://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.pom https://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.jar https://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.pom https://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-reporting-api/2.2.1/maven-reporting-api-2.2.1.jar https://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-reporting-api/2.2.1/maven-reporting-api-2.2.1.pom https://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.jar https://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.pom https://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-reporting-impl/2.3/maven-reporting-impl-2.3.jar https://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-reporting-impl/2.3/maven-reporting-impl-2.3.pom https://repo.maven.apache.org/maven2/org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.jar https://repo.maven.apache.org/maven2/org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.pom https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-artifact-transfer/0.9.1/maven-artifact-transfer-0.9.1.jar https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-artifact-transfer/0.9.1/maven-artifact-transfer-0.9.1.pom https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.jar https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.pom https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.jar https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.pom https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-common-artifact-filters/3.0.1/maven-common-artifact-filters-3.0.1.jar https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-common-artifact-filters/3.0.1/maven-common-artifact-filters-3.0.1.pom https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-dependency-analyzer/1.7/maven-dependency-analyzer-1.7.jar https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-dependency-analyzer/1.7/maven-dependency-analyzer-1.7.pom https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-dependency-tree/2.2/maven-dependency-tree-2.2.jar https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-dependency-tree/2.2/maven-dependency-tree-2.2.pom https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-dependency-tree/3.0.1/maven-dependency-tree-3.0.1.jar https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-dependency-tree/3.0.1/maven-dependency-tree-3.0.1.pom https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-filtering/1.1/maven-filtering-1.1.jar https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-filtering/1.1/maven-filtering-1.1.pom https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-components/10/maven-shared-components-10.pom https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-components/12/maven-shared-components-12.pom https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-components/15/maven-shared-components-15.pom https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-components/17/maven-shared-components-17.pom https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-components/18/maven-shared-components-18.pom https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-components/19/maven-shared-components-19.pom https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-components/20/maven-shared-components-20.pom https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-components/30/maven-shared-components-30.pom https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-components/8/maven-shared-components-8.pom https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-incremental/1.1/maven-shared-incremental-1.1.jar https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-incremental/1.1/maven-shared-incremental-1.1.pom https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.jar https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.pom https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-utils/0.1/maven-shared-utils-0.1.jar https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-utils/0.1/maven-shared-utils-0.1.pom https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-utils/0.6/maven-shared-utils-0.6.jar https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-utils/0.6/maven-shared-utils-0.6.pom https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-utils/3.1.0/maven-shared-utils-3.1.0.jar https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-utils/3.1.0/maven-shared-utils-3.1.0.pom https://repo.maven.apache.org/maven2/org/apache/maven/surefire/maven-surefire-common/2.12.4/maven-surefire-common-2.12.4.jar https://repo.maven.apache.org/maven2/org/apache/maven/surefire/maven-surefire-common/2.12.4/maven-surefire-common-2.12.4.pom https://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire/2.12.4/surefire-2.12.4.pom https://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire-api/2.12.4/surefire-api-2.12.4.jar https://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire-api/2.12.4/surefire-api-2.12.4.pom https://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire-booter/2.12.4/surefire-booter-2.12.4.jar https://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire-booter/2.12.4/surefire-booter-2.12.4.pom https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon/1.0-beta-6/wagon-1.0-beta-6.pom https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon/1.0-beta-7/wagon-1.0-beta-7.pom https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.pom https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.jar https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.pom https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-provider-api/1.0-beta-7/wagon-provider-api-1.0-beta-7.jar https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-provider-api/1.0-beta-7/wagon-provider-api-1.0-beta-7.pom https://repo.maven.apache.org/maven2/org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.jar https://repo.maven.apache.org/maven2/org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.pom https://repo.maven.apache.org/maven2/org/apache/struts/struts-master/4/struts-master-4.pom https://repo.maven.apache.org/maven2/org/apache/struts/struts-parent/1.3.8/struts-parent-1.3.8.pom https://repo.maven.apache.org/maven2/org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.jar https://repo.maven.apache.org/maven2/org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.pom https://repo.maven.apache.org/maven2/org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.jar https://repo.maven.apache.org/maven2/org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.pom https://repo.maven.apache.org/maven2/org/apache/velocity/velocity/1.5/velocity-1.5.jar https://repo.maven.apache.org/maven2/org/apache/velocity/velocity/1.5/velocity-1.5.pom https://repo.maven.apache.org/maven2/org/apache/velocity/velocity/1.6.2/velocity-1.6.2.pom https://repo.maven.apache.org/maven2/org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.jar https://repo.maven.apache.org/maven2/org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.pom https://repo.maven.apache.org/maven2/org/apache/xbean/xbean/3.4/xbean-3.4.pom https://repo.maven.apache.org/maven2/org/apache/xbean/xbean-reflect/3.4/xbean-reflect-3.4.jar https://repo.maven.apache.org/maven2/org/apache/xbean/xbean-reflect/3.4/xbean-reflect-3.4.pom https://repo.maven.apache.org/maven2/org/beanshell/beanshell/2.0b4/beanshell-2.0b4.pom https://repo.maven.apache.org/maven2/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar https://repo.maven.apache.org/maven2/org/beanshell/bsh/2.0b4/bsh-2.0b4.pom https://repo.maven.apache.org/maven2/org/bitcoinj/bitcoinj-parent/0.14.1/bitcoinj-parent-0.14.1.pom https://repo.maven.apache.org/maven2/org/bitcoinj/orchid/1.1.1/orchid-1.1.1.jar https://repo.maven.apache.org/maven2/org/bitcoinj/orchid/1.2.1/orchid-1.2.1.jar https://repo.maven.apache.org/maven2/org/bitcoinj/orchid/1.2.1/orchid-1.2.1.pom https://repo.maven.apache.org/maven2/org/bouncycastle/bcpg-jdk15on/1.56/bcpg-jdk15on-1.56.jar https://repo.maven.apache.org/maven2/org/bouncycastle/bcpg-jdk15on/1.56/bcpg-jdk15on-1.56.pom https://repo.maven.apache.org/maven2/org/bouncycastle/bcpg-jdk16/1.46/bcpg-jdk16-1.46.jar https://repo.maven.apache.org/maven2/org/bouncycastle/bcpg-jdk16/1.46/bcpg-jdk16-1.46.pom https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.56/bcprov-jdk15on-1.56.jar https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.56/bcprov-jdk15on-1.56.pom https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk16/1.46/bcprov-jdk16-1.46.jar https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk16/1.46/bcprov-jdk16-1.46.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/1.0.12/plexus-1.0.12.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/2.0.2/plexus-2.0.2.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/2.0.3/plexus-2.0.3.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/2.0.6/plexus-2.0.6.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/3.0.1/plexus-3.0.1.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/3.1/plexus-3.1.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/3.2/plexus-3.2.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/3.3/plexus-3.3.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/3.3.1/plexus-3.3.1.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/3.3.2/plexus-3.3.2.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/4.0/plexus-4.0.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.jar https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-archiver/2.2/plexus-archiver-2.2.jar https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-archiver/2.2/plexus-archiver-2.2.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-archiver/3.4/plexus-archiver-3.4.jar https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-archiver/3.4/plexus-archiver-3.4.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-classworlds/2.2.2/plexus-classworlds-2.2.2.jar https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-classworlds/2.2.2/plexus-classworlds-2.2.2.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.jar https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-classworlds/2.4/plexus-classworlds-2.4.jar https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-classworlds/2.4/plexus-classworlds-2.4.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-compiler/2.2/plexus-compiler-2.2.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-compiler-api/2.2/plexus-compiler-api-2.2.jar https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-compiler-api/2.2/plexus-compiler-api-2.2.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-compiler-javac/2.2/plexus-compiler-javac-2.2.jar https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-compiler-javac/2.2/plexus-compiler-javac-2.2.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-compiler-manager/2.2/plexus-compiler-manager-2.2.jar https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-compiler-manager/2.2/plexus-compiler-manager-2.2.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-compilers/2.2/plexus-compilers-2.2.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-component-annotations/1.6/plexus-component-annotations-1.6.jar https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-component-annotations/1.6/plexus-component-annotations-1.6.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-components/1.1.14/plexus-components-1.1.14.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-components/1.1.15/plexus-components-1.1.15.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-components/1.1.18/plexus-components-1.1.18.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-components/1.1.19/plexus-components-1.1.19.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-components/1.1.20/plexus-components-1.1.20.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-components/1.1.4/plexus-components-1.1.4.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-components/1.2/plexus-components-1.2.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-components/1.3.1/plexus-components-1.3.1.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-20/plexus-container-default-1.0-alpha-20.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-container-default/1.5.5/plexus-container-default-1.5.5.jar https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-container-default/1.5.5/plexus-container-default-1.5.5.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-containers/1.0-alpha-20/plexus-containers-1.0-alpha-20.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-containers/1.5.5/plexus-containers-1.5.5.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-containers/1.6/plexus-containers-1.6.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-i18n/1.0-beta-6/plexus-i18n-1.0-beta-6.jar https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-i18n/1.0-beta-6/plexus-i18n-1.0-beta-6.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.jar https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.jar https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.jar https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.jar https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.jar https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-io/2.0.4/plexus-io-2.0.4.jar https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-io/2.0.4/plexus-io-2.0.4.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-io/2.4/plexus-io-2.4.jar https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-io/2.4/plexus-io-2.4.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-io/2.7.1/plexus-io-2.7.1.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/1.4.6/plexus-utils-1.4.6.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.jar https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/1.5.5/plexus-utils-1.5.5.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/2.0.4/plexus-utils-2.0.4.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.jar https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.jar https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/3.0.10/plexus-utils-3.0.10.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/3.0.20/plexus-utils-3.0.20.jar https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/3.0.20/plexus-utils-3.0.20.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/3.0.22/plexus-utils-3.0.22.jar https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/3.0.22/plexus-utils-3.0.22.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/3.0.24/plexus-utils-3.0.24.jar https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/3.0.24/plexus-utils-3.0.24.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/3.0.8/plexus-utils-3.0.8.jar https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/3.0.8/plexus-utils-3.0.8.pom https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.jar https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom https://repo.maven.apache.org/maven2/org/controlsfx/controlsfx/8.0.6_20/controlsfx-8.0.6_20.jar https://repo.maven.apache.org/maven2/org/controlsfx/controlsfx/8.0.6_20/controlsfx-8.0.6_20.pom https://repo.maven.apache.org/maven2/org/eclipse/aether/aether/0.9.0.M2/aether-0.9.0.M2.pom https://repo.maven.apache.org/maven2/org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.jar https://repo.maven.apache.org/maven2/org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.pom https://repo.maven.apache.org/maven2/org/eclipse/jetty/jetty-http/9.3.6.v20151106/jetty-http-9.3.6.v20151106.jar https://repo.maven.apache.org/maven2/org/eclipse/jetty/jetty-http/9.3.6.v20151106/jetty-http-9.3.6.v20151106.pom https://repo.maven.apache.org/maven2/org/eclipse/jetty/jetty-io/9.3.6.v20151106/jetty-io-9.3.6.v20151106.jar https://repo.maven.apache.org/maven2/org/eclipse/jetty/jetty-io/9.3.6.v20151106/jetty-io-9.3.6.v20151106.pom https://repo.maven.apache.org/maven2/org/eclipse/jetty/jetty-parent/25/jetty-parent-25.pom https://repo.maven.apache.org/maven2/org/eclipse/jetty/jetty-project/9.3.6.v20151106/jetty-project-9.3.6.v20151106.pom https://repo.maven.apache.org/maven2/org/eclipse/jetty/jetty-security/9.3.6.v20151106/jetty-security-9.3.6.v20151106.jar https://repo.maven.apache.org/maven2/org/eclipse/jetty/jetty-security/9.3.6.v20151106/jetty-security-9.3.6.v20151106.pom https://repo.maven.apache.org/maven2/org/eclipse/jetty/jetty-server/9.3.6.v20151106/jetty-server-9.3.6.v20151106.jar https://repo.maven.apache.org/maven2/org/eclipse/jetty/jetty-server/9.3.6.v20151106/jetty-server-9.3.6.v20151106.pom https://repo.maven.apache.org/maven2/org/eclipse/jetty/jetty-servlet/9.3.6.v20151106/jetty-servlet-9.3.6.v20151106.jar https://repo.maven.apache.org/maven2/org/eclipse/jetty/jetty-servlet/9.3.6.v20151106/jetty-servlet-9.3.6.v20151106.pom https://repo.maven.apache.org/maven2/org/eclipse/jetty/jetty-util/9.3.6.v20151106/jetty-util-9.3.6.v20151106.jar https://repo.maven.apache.org/maven2/org/eclipse/jetty/jetty-util/9.3.6.v20151106/jetty-util-9.3.6.v20151106.pom https://repo.maven.apache.org/maven2/org/eclipse/jetty/jetty-webapp/9.3.6.v20151106/jetty-webapp-9.3.6.v20151106.jar https://repo.maven.apache.org/maven2/org/eclipse/jetty/jetty-webapp/9.3.6.v20151106/jetty-webapp-9.3.6.v20151106.pom https://repo.maven.apache.org/maven2/org/eclipse/jetty/jetty-xml/9.3.6.v20151106/jetty-xml-9.3.6.v20151106.jar https://repo.maven.apache.org/maven2/org/eclipse/jetty/jetty-xml/9.3.6.v20151106/jetty-xml-9.3.6.v20151106.pom https://repo.maven.apache.org/maven2/org/eclipse/jetty/websocket/websocket-api/9.3.6.v20151106/websocket-api-9.3.6.v20151106.jar https://repo.maven.apache.org/maven2/org/eclipse/jetty/websocket/websocket-api/9.3.6.v20151106/websocket-api-9.3.6.v20151106.pom https://repo.maven.apache.org/maven2/org/eclipse/jetty/websocket/websocket-client/9.3.6.v20151106/websocket-client-9.3.6.v20151106.jar https://repo.maven.apache.org/maven2/org/eclipse/jetty/websocket/websocket-client/9.3.6.v20151106/websocket-client-9.3.6.v20151106.pom https://repo.maven.apache.org/maven2/org/eclipse/jetty/websocket/websocket-common/9.3.6.v20151106/websocket-common-9.3.6.v20151106.jar https://repo.maven.apache.org/maven2/org/eclipse/jetty/websocket/websocket-common/9.3.6.v20151106/websocket-common-9.3.6.v20151106.pom https://repo.maven.apache.org/maven2/org/eclipse/jetty/websocket/websocket-parent/9.3.6.v20151106/websocket-parent-9.3.6.v20151106.pom https://repo.maven.apache.org/maven2/org/eclipse/jetty/websocket/websocket-server/9.3.6.v20151106/websocket-server-9.3.6.v20151106.jar https://repo.maven.apache.org/maven2/org/eclipse/jetty/websocket/websocket-server/9.3.6.v20151106/websocket-server-9.3.6.v20151106.pom https://repo.maven.apache.org/maven2/org/eclipse/jetty/websocket/websocket-servlet/9.3.6.v20151106/websocket-servlet-9.3.6.v20151106.jar https://repo.maven.apache.org/maven2/org/eclipse/jetty/websocket/websocket-servlet/9.3.6.v20151106/websocket-servlet-9.3.6.v20151106.pom https://repo.maven.apache.org/maven2/org/fxmisc/easybind/easybind/1.0.3/easybind-1.0.3.jar https://repo.maven.apache.org/maven2/org/fxmisc/easybind/easybind/1.0.3/easybind-1.0.3.pom https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.pom https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom https://repo.maven.apache.org/maven2/org/iq80/snappy/snappy/0.4/snappy-0.4.jar https://repo.maven.apache.org/maven2/org/iq80/snappy/snappy/0.4/snappy-0.4.pom https://repo.maven.apache.org/maven2/org/jdom/jdom/1.1.3/jdom-1.1.3.jar https://repo.maven.apache.org/maven2/org/jdom/jdom/1.1.3/jdom-1.1.3.pom https://repo.maven.apache.org/maven2/org/jetbrains/annotations/13.0/annotations-13.0.jar https://repo.maven.apache.org/maven2/org/jetbrains/annotations/13.0/annotations-13.0.pom https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.1.51/kotlin-stdlib-1.1.51.jar https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.1.51/kotlin-stdlib-1.1.51.pom https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jre7/1.1.51/kotlin-stdlib-jre7-1.1.51.jar https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jre7/1.1.51/kotlin-stdlib-jre7-1.1.51.pom https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jre8/1.1.51/kotlin-stdlib-jre8-1.1.51.jar https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jre8/1.1.51/kotlin-stdlib-jre8-1.1.51.pom https://repo.maven.apache.org/maven2/org/jmockit/jmockit/1.30/jmockit-1.30.jar https://repo.maven.apache.org/maven2/org/jmockit/jmockit/1.30/jmockit-1.30.pom https://repo.maven.apache.org/maven2/org/mockito/mockito-core/2.7.5/mockito-core-2.7.5.jar https://repo.maven.apache.org/maven2/org/mockito/mockito-core/2.7.5/mockito-core-2.7.5.pom https://repo.maven.apache.org/maven2/org/objenesis/objenesis/2.5/objenesis-2.5.jar https://repo.maven.apache.org/maven2/org/objenesis/objenesis/2.5/objenesis-2.5.pom https://repo.maven.apache.org/maven2/org/objenesis/objenesis/2.6/objenesis-2.6.pom https://repo.maven.apache.org/maven2/org/objenesis/objenesis-parent/2.5/objenesis-parent-2.5.pom https://repo.maven.apache.org/maven2/org/objenesis/objenesis-parent/2.6/objenesis-parent-2.6.pom https://repo.maven.apache.org/maven2/org/ow2/asm/asm/5.0.2/asm-5.0.2.jar https://repo.maven.apache.org/maven2/org/ow2/asm/asm/5.0.2/asm-5.0.2.pom https://repo.maven.apache.org/maven2/org/ow2/asm/asm/6.0_BETA/asm-6.0_BETA.jar https://repo.maven.apache.org/maven2/org/ow2/asm/asm/6.0_BETA/asm-6.0_BETA.pom https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/6.0_BETA/asm-analysis-6.0_BETA.jar https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/6.0_BETA/asm-analysis-6.0_BETA.pom https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/6.0_BETA/asm-commons-6.0_BETA.jar https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/6.0_BETA/asm-commons-6.0_BETA.pom https://repo.maven.apache.org/maven2/org/ow2/asm/asm-parent/5.0.2/asm-parent-5.0.2.pom https://repo.maven.apache.org/maven2/org/ow2/asm/asm-parent/6.0_BETA/asm-parent-6.0_BETA.pom https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/6.0_BETA/asm-tree-6.0_BETA.jar https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/6.0_BETA/asm-tree-6.0_BETA.pom https://repo.maven.apache.org/maven2/org/ow2/asm/asm-util/6.0_BETA/asm-util-6.0_BETA.jar https://repo.maven.apache.org/maven2/org/ow2/asm/asm-util/6.0_BETA/asm-util-6.0_BETA.pom https://repo.maven.apache.org/maven2/org/ow2/ow2/1.3/ow2-1.3.pom https://repo.maven.apache.org/maven2/org/projectlombok/lombok/1.16.16/lombok-1.16.16.jar https://repo.maven.apache.org/maven2/org/projectlombok/lombok/1.16.16/lombok-1.16.16.pom https://repo.maven.apache.org/maven2/org/reactfx/reactfx/2.0-M3/reactfx-2.0-M3.jar https://repo.maven.apache.org/maven2/org/reactfx/reactfx/2.0-M3/reactfx-2.0-M3.pom https://repo.maven.apache.org/maven2/org/slf4j/jcl-over-slf4j/1.5.6/jcl-over-slf4j-1.5.6.jar https://repo.maven.apache.org/maven2/org/slf4j/jcl-over-slf4j/1.5.6/jcl-over-slf4j-1.5.6.pom https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.5.6/slf4j-api-1.5.6.jar https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.5.6/slf4j-api-1.5.6.pom https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.13/slf4j-api-1.7.13.pom https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.22/slf4j-api-1.7.22.jar https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.22/slf4j-api-1.7.22.pom https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.jar https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.pom https://repo.maven.apache.org/maven2/org/slf4j/slf4j-jdk14/1.5.6/slf4j-jdk14-1.5.6.jar https://repo.maven.apache.org/maven2/org/slf4j/slf4j-jdk14/1.5.6/slf4j-jdk14-1.5.6.pom https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.5.6/slf4j-parent-1.5.6.pom https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.7.13/slf4j-parent-1.7.13.pom https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.7.22/slf4j-parent-1.7.22.pom https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.7.5/slf4j-parent-1.7.5.pom https://repo.maven.apache.org/maven2/org/sonatype/aether/aether-api/1.7/aether-api-1.7.jar https://repo.maven.apache.org/maven2/org/sonatype/aether/aether-api/1.7/aether-api-1.7.pom https://repo.maven.apache.org/maven2/org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.jar https://repo.maven.apache.org/maven2/org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.pom https://repo.maven.apache.org/maven2/org/sonatype/aether/aether-parent/1.7/aether-parent-1.7.pom https://repo.maven.apache.org/maven2/org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.jar https://repo.maven.apache.org/maven2/org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.pom https://repo.maven.apache.org/maven2/org/sonatype/aether/aether-util/1.7/aether-util-1.7.jar https://repo.maven.apache.org/maven2/org/sonatype/aether/aether-util/1.7/aether-util-1.7.pom https://repo.maven.apache.org/maven2/org/sonatype/forge/forge-parent/10/forge-parent-10.pom https://repo.maven.apache.org/maven2/org/sonatype/forge/forge-parent/3/forge-parent-3.pom https://repo.maven.apache.org/maven2/org/sonatype/forge/forge-parent/4/forge-parent-4.pom https://repo.maven.apache.org/maven2/org/sonatype/forge/forge-parent/5/forge-parent-5.pom https://repo.maven.apache.org/maven2/org/sonatype/forge/forge-parent/6/forge-parent-6.pom https://repo.maven.apache.org/maven2/org/sonatype/forge/forge-parent/7/forge-parent-7.pom https://repo.maven.apache.org/maven2/org/sonatype/oss/oss-parent/7/oss-parent-7.pom https://repo.maven.apache.org/maven2/org/sonatype/oss/oss-parent/9/oss-parent-9.pom https://repo.maven.apache.org/maven2/org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.jar https://repo.maven.apache.org/maven2/org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.pom https://repo.maven.apache.org/maven2/org/sonatype/plexus/plexus-build-api/0.0.7/plexus-build-api-0.0.7.jar https://repo.maven.apache.org/maven2/org/sonatype/plexus/plexus-build-api/0.0.7/plexus-build-api-0.0.7.pom https://repo.maven.apache.org/maven2/org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar https://repo.maven.apache.org/maven2/org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.pom https://repo.maven.apache.org/maven2/org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar https://repo.maven.apache.org/maven2/org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.pom https://repo.maven.apache.org/maven2/org/sonatype/sisu/inject/guice-bean/1.4.2/guice-bean-1.4.2.pom https://repo.maven.apache.org/maven2/org/sonatype/sisu/inject/guice-bean/2.1.1/guice-bean-2.1.1.pom https://repo.maven.apache.org/maven2/org/sonatype/sisu/inject/guice-parent/2.9.4/guice-parent-2.9.4.pom https://repo.maven.apache.org/maven2/org/sonatype/sisu/inject/guice-plexus/1.4.2/guice-plexus-1.4.2.pom https://repo.maven.apache.org/maven2/org/sonatype/sisu/inject/guice-plexus/2.1.1/guice-plexus-2.1.1.pom https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-noaop.jar https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7.pom https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-guice/2.9.4/sisu-guice-2.9.4-no_aop.jar https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-guice/2.9.4/sisu-guice-2.9.4.pom https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-inject/1.4.2/sisu-inject-1.4.2.pom https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-inject/2.1.1/sisu-inject-2.1.1.pom https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.jar https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.pom https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-inject-bean/2.1.1/sisu-inject-bean-2.1.1.jar https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-inject-bean/2.1.1/sisu-inject-bean-2.1.1.pom https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.jar https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.pom https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-inject-plexus/2.1.1/sisu-inject-plexus-2.1.1.jar https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-inject-plexus/2.1.1/sisu-inject-plexus-2.1.1.pom https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-parent/1.4.2/sisu-parent-1.4.2.pom https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-parent/2.1.1/sisu-parent-2.1.1.pom https://repo.maven.apache.org/maven2/org/sonatype/spice/spice-parent/10/spice-parent-10.pom https://repo.maven.apache.org/maven2/org/sonatype/spice/spice-parent/12/spice-parent-12.pom https://repo.maven.apache.org/maven2/org/sonatype/spice/spice-parent/15/spice-parent-15.pom https://repo.maven.apache.org/maven2/org/sonatype/spice/spice-parent/16/spice-parent-16.pom https://repo.maven.apache.org/maven2/org/sonatype/spice/spice-parent/17/spice-parent-17.pom https://repo.maven.apache.org/maven2/org/springframework/spring-core/4.1.1.RELEASE/spring-core-4.1.1.RELEASE.jar https://repo.maven.apache.org/maven2/org/springframework/spring-core/4.3.6.RELEASE/spring-core-4.3.6.RELEASE.jar https://repo.maven.apache.org/maven2/org/springframework/spring-core/4.3.6.RELEASE/spring-core-4.3.6.RELEASE.pom https://repo.maven.apache.org/maven2/org/springframework/spring-test/4.1.1.RELEASE/spring-test-4.1.1.RELEASE.jar https://repo.maven.apache.org/maven2/org/springframework/spring-test/4.3.6.RELEASE/spring-test-4.3.6.RELEASE.jar https://repo.maven.apache.org/maven2/org/springframework/spring-test/4.3.6.RELEASE/spring-test-4.3.6.RELEASE.pom https://repo.maven.apache.org/maven2/org/tukaani/xz/1.5/xz-1.5.jar https://repo.maven.apache.org/maven2/org/tukaani/xz/1.5/xz-1.5.pom https://repo.maven.apache.org/maven2/org/tukaani/xz/1.6/xz-1.6.jar https://repo.maven.apache.org/maven2/org/tukaani/xz/1.6/xz-1.6.pom https://repo.maven.apache.org/maven2/org/vafer/jdependency/1.2/jdependency-1.2.jar https://repo.maven.apache.org/maven2/org/vafer/jdependency/1.2/jdependency-1.2.pom https://repo.maven.apache.org/maven2/org/xolstice/maven/plugins/protobuf-maven-plugin/0.5.0/protobuf-maven-plugin-0.5.0.jar https://repo.maven.apache.org/maven2/org/xolstice/maven/plugins/protobuf-maven-plugin/0.5.0/protobuf-maven-plugin-0.5.0.pom https://repo.maven.apache.org/maven2/oro/oro/2.0.8/oro-2.0.8.jar https://repo.maven.apache.org/maven2/oro/oro/2.0.8/oro-2.0.8.pom https://repo.maven.apache.org/maven2/sslext/sslext/1.2-0/sslext-1.2-0.jar https://repo.maven.apache.org/maven2/sslext/sslext/1.2-0/sslext-1.2-0.pom https://repo.maven.apache.org/maven2/uk/co/froot/maven/enforcer/digest-enforcer-parent/0.0.1/digest-enforcer-parent-0.0.1.pom https://repo.maven.apache.org/maven2/uk/co/froot/maven/enforcer/digest-enforcer-rules/0.0.1/digest-enforcer-rules-0.0.1.jar https://repo.maven.apache.org/maven2/uk/co/froot/maven/enforcer/digest-enforcer-rules/0.0.1/digest-enforcer-rules-0.0.1.pom https://repo.maven.apache.org/maven2/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar https://repo.maven.apache.org/maven2/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.pom https://repo.maven.apache.org/maven2/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom https://repo.maven.apache.org/maven2/xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar https://repo.maven.apache.org/maven2/xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.pom
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=17551b120fb3ad56204dd6e1f6f469b7
diff --git a/metadata/md5-cache/net-p2p/bitcoin-cli-0.16.0 b/metadata/md5-cache/net-p2p/bitcoin-cli-0.16.0
deleted file mode 100644
index 383c2f2a380c..000000000000
--- a/metadata/md5-cache/net-p2p/bitcoin-cli-0.16.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare pretend
-DEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] dev-libs/libevent:= dev-libs/univalue:= !libressl? ( dev-libs/openssl:0=[-bindist] ) 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=Command-line JSON-RPC client specifically for interfacing with bitcoind
-EAPI=6
-HOMEPAGE=https://bitcoincore.org/ https://bitcoinknots.org/
-IUSE=knots libressl
-KEYWORDS=~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux
-LICENSE=MIT
-RDEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] dev-libs/libevent:= dev-libs/univalue:= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= )
-SLOT=0
-SRC_URI=https://github.com/bitcoin/bitcoin/archive/4b4d7eb255ca8f9a94b92479e6061d129c91a991.tar.gz -> bitcoin-v0.16.0.tar.gz https://bitcoinknots.org/files/0.16.x/0.16.0.knots20180322/bitcoin-0.16.0.knots20180322.patches.txz -> bitcoin-0.16.0.knots20180322.patches.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=54778d6c8c916214b755ed5c8872ad1d
diff --git a/metadata/md5-cache/net-p2p/bitcoin-cli-0.16.3 b/metadata/md5-cache/net-p2p/bitcoin-cli-0.16.3
index fa98641e545d..6f70ac9184a1 100644
--- a/metadata/md5-cache/net-p2p/bitcoin-cli-0.16.3
+++ b/metadata/md5-cache/net-p2p/bitcoin-cli-0.16.3
@@ -4,10 +4,10 @@ DESCRIPTION=Command-line JSON-RPC client specifically for interfacing with bitco
 EAPI=6
 HOMEPAGE=https://bitcoincore.org/ https://bitcoinknots.org/
 IUSE=knots libressl
-KEYWORDS=amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] dev-libs/libevent:= dev-libs/univalue:= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= )
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/49e34e288005a5b144a642e197b628396f5a0765.tar.gz -> bitcoin-v0.16.3.tar.gz https://bitcoinknots.org/files/0.16.x/0.16.3.knots20180918/bitcoin-0.16.3.knots20180918.patches.txz -> bitcoin-0.16.3.knots20180918.patches.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=239ad6396f90e887bd334b4a168396b5
+_md5_=23f5907f2bf3a423bc99a4483674582a
diff --git a/metadata/md5-cache/net-p2p/bitcoin-qt-0.15.1 b/metadata/md5-cache/net-p2p/bitcoin-qt-0.15.1
index cc3ebe6b4de7..d98e44ffc314 100644
--- a/metadata/md5-cache/net-p2p/bitcoin-qt-0.15.1
+++ b/metadata/md5-cache/net-p2p/bitcoin-qt-0.15.1
@@ -10,5 +10,5 @@ RDEPEND=!libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libres
 REQUIRED_USE=http? ( libevent ) tor? ( libevent ) libevent? ( http tor ) l10n_am? ( knots ) l10n_pt? ( knots ) l10n_sn? ( knots ) l10n_is? ( knots )
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/7b57bc998f334775b50ebc8ca5e78ca728db4c58.tar.gz -> bitcoin-v0.15.1.tar.gz https://bitcoinknots.org/files/0.15.x/0.15.1.knots20171111/bitcoin-0.15.1.knots20171111.patches.txz -> bitcoin-0.15.1.knots20171111.patches.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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_=8da278a7a74cd03a061cef5150e95bd9
diff --git a/metadata/md5-cache/net-p2p/bitcoin-qt-0.16.0-r1 b/metadata/md5-cache/net-p2p/bitcoin-qt-0.16.0-r1
deleted file mode 100644
index b57277d1b050..000000000000
--- a/metadata/md5-cache/net-p2p/bitcoin-qt-0.16.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare pretend
-DEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] dev-libs/univalue:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 virtual/bitcoin-leveldb bip70? ( dev-libs/protobuf:= ) dbus? ( dev-qt/qtdbus:5 ) libevent? ( dev-libs/libevent:= ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) qrcode? ( media-gfx/qrencode:= ) upnp? ( >=net-libs/miniupnpc-1.9.20150916:= ) wallet? ( sys-libs/db:4.8=[cxx] ) zeromq? ( net-libs/zeromq:= ) dev-qt/linguist-tools:5 knots? ( gnome-base/librsvg media-gfx/imagemagick[png] ) >=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=An end-user Qt GUI for the Bitcoin crypto-currency
-EAPI=6
-HOMEPAGE=https://bitcoincore.org/ https://bitcoinknots.org/
-IUSE=+asm +bip70 +bitcoin_policy_rbf dbus kde +libevent knots libressl +qrcode test upnp +wallet zeromq
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] dev-libs/univalue:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 virtual/bitcoin-leveldb bip70? ( dev-libs/protobuf:= ) dbus? ( dev-qt/qtdbus:5 ) libevent? ( dev-libs/libevent:= ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) qrcode? ( media-gfx/qrencode:= ) upnp? ( >=net-libs/miniupnpc-1.9.20150916:= ) wallet? ( sys-libs/db:4.8=[cxx] ) zeromq? ( net-libs/zeromq:= )
-SLOT=0
-SRC_URI=https://github.com/bitcoin/bitcoin/archive/4b4d7eb255ca8f9a94b92479e6061d129c91a991.tar.gz -> bitcoin-v0.16.0.tar.gz https://bitcoinknots.org/files/0.16.x/0.16.0.knots20180322/bitcoin-0.16.0.knots20180322.patches.txz -> bitcoin-0.16.0.knots20180322.patches.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=87ff4af9669a808afec808a196e0a559
diff --git a/metadata/md5-cache/net-p2p/bitcoin-qt-0.16.3 b/metadata/md5-cache/net-p2p/bitcoin-qt-0.16.3
index be220d485f3c..e7b6f0df8c1b 100644
--- a/metadata/md5-cache/net-p2p/bitcoin-qt-0.16.3
+++ b/metadata/md5-cache/net-p2p/bitcoin-qt-0.16.3
@@ -4,10 +4,10 @@ DESCRIPTION=An end-user Qt GUI for the Bitcoin crypto-currency
 EAPI=6
 HOMEPAGE=https://bitcoincore.org/ https://bitcoinknots.org/
 IUSE=+asm +bip70 +bitcoin_policy_rbf dbus kde +libevent knots libressl +qrcode test upnp +wallet zeromq
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] dev-libs/univalue:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 virtual/bitcoin-leveldb bip70? ( dev-libs/protobuf:= ) dbus? ( dev-qt/qtdbus:5 ) libevent? ( dev-libs/libevent:= ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) qrcode? ( media-gfx/qrencode:= ) upnp? ( >=net-libs/miniupnpc-1.9.20150916:= ) wallet? ( sys-libs/db:4.8=[cxx] ) zeromq? ( net-libs/zeromq:= )
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/49e34e288005a5b144a642e197b628396f5a0765.tar.gz -> bitcoin-v0.16.3.tar.gz https://bitcoinknots.org/files/0.16.x/0.16.3.knots20180918/bitcoin-0.16.3.knots20180918.patches.txz -> bitcoin-0.16.3.knots20180918.patches.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=ef1e899484c6c54c4ec0b03111f6a1ab
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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_=f6942c2871d30c0262bd4725c93cc4ea
diff --git a/metadata/md5-cache/net-p2p/bitcoind-0.16.0 b/metadata/md5-cache/net-p2p/bitcoind-0.16.0
deleted file mode 100644
index 5eb48802a216..000000000000
--- a/metadata/md5-cache/net-p2p/bitcoind-0.16.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare pretend setup
-DEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] dev-libs/libevent:= >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] dev-libs/univalue:= virtual/bitcoin-leveldb !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) upnp? ( >=net-libs/miniupnpc-1.9.20150916:= ) wallet? ( sys-libs/db:4.8=[cxx] ) zeromq? ( net-libs/zeromq:= ) >=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=Original Bitcoin crypto-currency wallet for automated services
-EAPI=6
-HOMEPAGE=https://bitcoincore.org/ https://bitcoinknots.org/
-IUSE=+asm +bitcoin_policy_rbf examples knots libressl test upnp +wallet zeromq
-KEYWORDS=~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux
-LICENSE=MIT
-RDEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] dev-libs/libevent:= >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] dev-libs/univalue:= virtual/bitcoin-leveldb !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) upnp? ( >=net-libs/miniupnpc-1.9.20150916:= ) wallet? ( sys-libs/db:4.8=[cxx] ) zeromq? ( net-libs/zeromq:= )
-SLOT=0
-SRC_URI=https://github.com/bitcoin/bitcoin/archive/4b4d7eb255ca8f9a94b92479e6061d129c91a991.tar.gz -> bitcoin-v0.16.0.tar.gz https://bitcoinknots.org/files/0.16.x/0.16.0.knots20180322/bitcoin-0.16.0.knots20180322.patches.txz -> bitcoin-0.16.0.knots20180322.patches.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	db-use	501a5d0963e0d17f30260023f292ae8e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=d89616bd9e05ff6ab6499df1306b9cc0
diff --git a/metadata/md5-cache/net-p2p/bitcoind-0.16.3 b/metadata/md5-cache/net-p2p/bitcoind-0.16.3
index ea7b3a1923b9..34f63fb46ed5 100644
--- a/metadata/md5-cache/net-p2p/bitcoind-0.16.3
+++ b/metadata/md5-cache/net-p2p/bitcoind-0.16.3
@@ -4,10 +4,10 @@ DESCRIPTION=Original Bitcoin crypto-currency wallet for automated services
 EAPI=6
 HOMEPAGE=https://bitcoincore.org/ https://bitcoinknots.org/
 IUSE=+asm +bitcoin_policy_rbf examples knots libressl test upnp +wallet zeromq
-KEYWORDS=amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] dev-libs/libevent:= >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] dev-libs/univalue:= virtual/bitcoin-leveldb !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) upnp? ( >=net-libs/miniupnpc-1.9.20150916:= ) wallet? ( sys-libs/db:4.8=[cxx] ) zeromq? ( net-libs/zeromq:= )
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/49e34e288005a5b144a642e197b628396f5a0765.tar.gz -> bitcoin-v0.16.3.tar.gz https://bitcoinknots.org/files/0.16.x/0.16.3.knots20180918/bitcoin-0.16.3.knots20180918.patches.txz -> bitcoin-0.16.3.knots20180918.patches.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	db-use	501a5d0963e0d17f30260023f292ae8e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=34db958c15020ccbf9e9c71d0783c440
+_md5_=289e41efb29eea7a3b61b46012aec2a4
diff --git a/metadata/md5-cache/net-p2p/bittornado-0.3.18-r4 b/metadata/md5-cache/net-p2p/bittornado-0.3.18-r4
index 80549d0f7d6b..51ea2d34e9b5 100644
--- a/metadata/md5-cache/net-p2p/bittornado-0.3.18-r4
+++ b/metadata/md5-cache/net-p2p/bittornado-0.3.18-r4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pycrypto[python_targets_python2_7(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://download2.bittornado.com/download/BitTornado-0.3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3aa49b5cd319fdac28003b6bb135ec8c
diff --git a/metadata/md5-cache/net-p2p/bittornado-0.4.1_p20160925-r1 b/metadata/md5-cache/net-p2p/bittornado-0.4.1_p20160925-r1
index b529a5a4c390..60d64b786dd5 100644
--- a/metadata/md5-cache/net-p2p/bittornado-0.4.1_p20160925-r1
+++ b/metadata/md5-cache/net-p2p/bittornado-0.4.1_p20160925-r1
@@ -10,5 +10,5 @@ RDEPEND=|| ( dev-python/pycryptodome[python_targets_python3_4(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/effigies/BitTornado/archive/ed327c4e1ebbe1fe949be81723527cfda87aeb8d.tar.gz -> BitTornado-0.4.1_p20160925.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=aec1c85ea028726be458a19898e30455
diff --git a/metadata/md5-cache/net-p2p/deluge-1.3.15-r2 b/metadata/md5-cache/net-p2p/deluge-1.3.15-r2
index e627c3974612..44114e7af282 100644
--- a/metadata/md5-cache/net-p2p/deluge-1.3.15-r2
+++ b/metadata/md5-cache/net-p2p/deluge-1.3.15-r2
@@ -10,5 +10,5 @@ RDEPEND=net-libs/libtorrent-rasterbar[python,python_targets_python2_7(-)?,-pytho
 REQUIRED_USE=python_targets_python2_7 sound? ( gtk ) libnotify? ( gtk ) python_targets_python2_7
 SLOT=0
 SRC_URI=http://download.deluge-torrent.org/source/deluge-1.3.15.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ab7d0b19c1a612692a6a08b6248343a7
diff --git a/metadata/md5-cache/net-p2p/deluge-1.3.9999 b/metadata/md5-cache/net-p2p/deluge-1.3.9999
index 06cd2477250c..d8958d863998 100644
--- a/metadata/md5-cache/net-p2p/deluge-1.3.9999
+++ b/metadata/md5-cache/net-p2p/deluge-1.3.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libtorrent-rasterbar[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/chardet[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_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/pyopenssl[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_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/pyxdg[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_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/setproctitle[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_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-16.0.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ( >=dev-python/twisted-core-13.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/twisted-web-13.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ) geoip? ( dev-python/geoip-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(+)] ) gtk? ( sound? ( dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_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:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_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.12[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] gnome-base/librsvg libnotify? ( dev-python/notify-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(+)] ) ) webinterface? ( dev-python/mako[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_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=python_targets_python2_7 sound? ( gtk ) libnotify? ( gtk ) python_targets_python2_7
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=20b403a53939c7905d310acb91df1899
diff --git a/metadata/md5-cache/net-p2p/deluge-9999 b/metadata/md5-cache/net-p2p/deluge-9999
index b7b9942d8baf..b3b99f3e3ede 100644
--- a/metadata/md5-cache/net-p2p/deluge-9999
+++ b/metadata/md5-cache/net-p2p/deluge-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libtorrent-rasterbar-0.14.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(+)] dev-python/chardet[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_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/pyopenssl[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_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/pyxdg[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_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/setproctitle[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_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-16.0.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/twisted-web-13.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) geoip? ( dev-libs/geoip ) gtk? ( sound? ( dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_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:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_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.12[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] gnome-base/librsvg libnotify? ( dev-python/notify-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(+)] ) ) webinterface? ( dev-python/mako[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_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=python_targets_python2_7 sound? ( gtk ) libnotify? ( gtk ) python_targets_python2_7
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7c4bcbde43d4eacedb00a86b4a8fe2d3
diff --git a/metadata/md5-cache/net-p2p/eiskaltdcpp-2.2.10 b/metadata/md5-cache/net-p2p/eiskaltdcpp-2.2.10
index bb3a445c25be..30d0e7668053 100644
--- a/metadata/md5-cache/net-p2p/eiskaltdcpp-2.2.10
+++ b/metadata/md5-cache/net-p2p/eiskaltdcpp-2.2.10
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2 dev-libs/boost:= dev-libs/openssl:0= sys-apps/attr sys-li
 REQUIRED_USE=?? ( json xmlrpc ) cli? ( ^^ ( json xmlrpc ) ) dbus? ( qt5 ) javascript? ( qt5 ) spell? ( qt5 ) sqlite? ( qt5 )
 SLOT=0
 SRC_URI=https://github.com/eiskaltdcpp/eiskaltdcpp/archive/v2.2.10.tar.gz -> eiskaltdcpp-2.2.10.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e46757c200d01fb96f433d0cce60eb44
diff --git a/metadata/md5-cache/net-p2p/eiskaltdcpp-9999 b/metadata/md5-cache/net-p2p/eiskaltdcpp-9999
index 30508ec93d42..2266c2e05580 100644
--- a/metadata/md5-cache/net-p2p/eiskaltdcpp-9999
+++ b/metadata/md5-cache/net-p2p/eiskaltdcpp-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 GPL-3
 RDEPEND=app-arch/bzip2 dev-libs/boost:= dev-libs/openssl:0= sys-apps/attr sys-libs/zlib virtual/libiconv virtual/libintl cli? ( dev-lang/perl dev-perl/Data-Dump dev-perl/Term-ShellUI virtual/perl-Getopt-Long json? ( dev-perl/JSON-RPC ) xmlrpc? ( dev-perl/RPC-XML ) ) daemon? ( xmlrpc? ( dev-libs/xmlrpc-c[abyss,cxx] ) ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:3 x11-libs/pango x11-themes/hicolor-icon-theme libcanberra? ( media-libs/libcanberra ) libnotify? ( x11-libs/libnotify ) ) idn? ( net-dns/libidn ) lua? ( dev-lang/lua:= ) pcre? ( dev-libs/libpcre ) qt5? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dbus? ( dev-qt/qtdbus:5 ) javascript? ( dev-qt/qtdeclarative:5 dev-qt/qtscript:5 ) spell? ( app-text/aspell ) sqlite? ( dev-qt/qtsql:5[sqlite] ) ) upnp? ( net-libs/miniupnpc )
 REQUIRED_USE=?? ( json xmlrpc ) cli? ( ^^ ( json xmlrpc ) ) dbus? ( qt5 ) javascript? ( qt5 ) libcanberra? ( gtk ) libnotify? ( gtk ) spell? ( qt5 ) sqlite? ( qt5 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=87a9f520e0ee728204f5d7bcd47ede63
diff --git a/metadata/md5-cache/net-p2p/fms-0.3.79 b/metadata/md5-cache/net-p2p/fms-0.3.79
index 76b3705b12d3..161cc6804efb 100644
--- a/metadata/md5-cache/net-p2p/fms-0.3.79
+++ b/metadata/md5-cache/net-p2p/fms-0.3.79
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libiconv frost? ( net-libs/mbedtls ) >=dev-libs/poco-1.4.3_p1 >=dev-db/sqlite-3.6.15
 SLOT=0
 SRC_URI=mirror://gentoo/fms-src-0.3.79.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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=0cd5c198e0fa95e2e8cc5450e0f38a64
diff --git a/metadata/md5-cache/net-p2p/gtorrentviewer-0.2b b/metadata/md5-cache/net-p2p/gtorrentviewer-0.2b
index 21fd965072c4..89e94fa29198 100644
--- a/metadata/md5-cache/net-p2p/gtorrentviewer-0.2b
+++ b/metadata/md5-cache/net-p2p/gtorrentviewer-0.2b
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-misc/curl >=x11-libs/gtk+-2.4:2 >=dev-libs/glib-2.4:2
 SLOT=0
 SRC_URI=mirror://sourceforge/gtorrentviewer/GTorrentViewer-0.2b.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=12ce106913deebadadd9f07e44b00d8b
diff --git a/metadata/md5-cache/net-p2p/ktorrent-5.1.0 b/metadata/md5-cache/net-p2p/ktorrent-5.1.0
index 563fa66a4da6..1a767982b2d1 100644
--- a/metadata/md5-cache/net-p2p/ktorrent-5.1.0
+++ b/metadata/md5-cache/net-p2p/ktorrent-5.1.0
@@ -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/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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 972612a69be0..4aebaa775199 100644
--- a/metadata/md5-cache/net-p2p/ktorrent-5.1.1
+++ b/metadata/md5-cache/net-p2p/ktorrent-5.1.1
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
diff --git a/metadata/md5-cache/net-p2p/nicotine+-1.4.1 b/metadata/md5-cache/net-p2p/nicotine+-1.4.1
index 613d88be1b30..e538c1fe4c68 100644
--- a/metadata/md5-cache/net-p2p/nicotine+-1.4.1
+++ b/metadata/md5-cache/net-p2p/nicotine+-1.4.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pygtk-2.24[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/Nicotine-Plus/nicotine-plus/archive/1.4.1.tar.gz -> nicotine+-1.4.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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d7254d01ab4e6020c72cac98e48f49db
diff --git a/metadata/md5-cache/net-p2p/pybitmessage-0.6.3.2_p20180521 b/metadata/md5-cache/net-p2p/pybitmessage-0.6.3.2_p20180521
index e2ae3e3b0d9e..e4cfb3c64bff 100644
--- a/metadata/md5-cache/net-p2p/pybitmessage-0.6.3.2_p20180521
+++ b/metadata/md5-cache/net-p2p/pybitmessage-0.6.3.2_p20180521
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=d
 REQUIRED_USE=|| ( python_targets_python2_7 ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/g1itch/PyBitmessage/archive/30e211367003bafa67834ffff3f31e6b5a897f4b.tar.gz -> pybitmessage-0.6.3.2_p20180521.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cb58aac244ce75fa1dcbc83da6f1c039
diff --git a/metadata/md5-cache/net-p2p/qbittorrent-4.1.1 b/metadata/md5-cache/net-p2p/qbittorrent-4.1.1
index 2aec91579bba..bf8ccb4c3e3b 100644
--- a/metadata/md5-cache/net-p2p/qbittorrent-4.1.1
+++ b/metadata/md5-cache/net-p2p/qbittorrent-4.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/boost-1.62.0-r1:= dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] >=d
 REQUIRED_USE=dbus? ( X )
 SLOT=0
 SRC_URI=https://github.com/qbittorrent/qBittorrent/archive/release-4.1.1.tar.gz -> qbittorrent-4.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=282697bc7e60f6241fab702d5c3e31ff
diff --git a/metadata/md5-cache/net-p2p/qbittorrent-4.1.2 b/metadata/md5-cache/net-p2p/qbittorrent-4.1.2
index 96a76839fee3..3f606f4c1aa3 100644
--- a/metadata/md5-cache/net-p2p/qbittorrent-4.1.2
+++ b/metadata/md5-cache/net-p2p/qbittorrent-4.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/boost-1.62.0-r1:= dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] >=d
 REQUIRED_USE=dbus? ( X )
 SLOT=0
 SRC_URI=https://github.com/qbittorrent/qBittorrent/archive/release-4.1.2.tar.gz -> qbittorrent-4.1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=26f09120730aaa0303d9bd6837b20080
diff --git a/metadata/md5-cache/net-p2p/qbittorrent-4.1.3 b/metadata/md5-cache/net-p2p/qbittorrent-4.1.3
index 255814d9b6da..8b085bd2bfd9 100644
--- a/metadata/md5-cache/net-p2p/qbittorrent-4.1.3
+++ b/metadata/md5-cache/net-p2p/qbittorrent-4.1.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/boost-1.62.0-r1:= dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] >=d
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/net-p2p/qbittorrent-9999 b/metadata/md5-cache/net-p2p/qbittorrent-9999
index a139755d5ea8..2fe922449546 100644
--- a/metadata/md5-cache/net-p2p/qbittorrent-9999
+++ b/metadata/md5-cache/net-p2p/qbittorrent-9999
@@ -8,5 +8,5 @@ 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
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cd55a32881a7951b2158bad5a8bac2ef
diff --git a/metadata/md5-cache/net-p2p/retroshare-0.6.3-r1 b/metadata/md5-cache/net-p2p/retroshare-0.6.3-r1
index 890f08968315..f541ac6e5e82 100644
--- a/metadata/md5-cache/net-p2p/retroshare-0.6.3-r1
+++ b/metadata/md5-cache/net-p2p/retroshare-0.6.3-r1
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2 dev-db/sqlcipher dev-libs/openssl:0 dev-qt/qtcore:5 dev-q
 REQUIRED_USE=|| ( cli gui ) feedreader? ( gui ) voip? ( gui )
 SLOT=0
 SRC_URI=https://github.com/RetroShare/RetroShare/archive/v0.6.3.tar.gz -> retroshare-0.6.3.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fbca8b95d6695c2925f284f2eaa2edb2
diff --git a/metadata/md5-cache/net-p2p/retroshare-0.6.4 b/metadata/md5-cache/net-p2p/retroshare-0.6.4
index f020509e5a76..fdf8f7637ac6 100644
--- a/metadata/md5-cache/net-p2p/retroshare-0.6.4
+++ b/metadata/md5-cache/net-p2p/retroshare-0.6.4
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2 dev-db/sqlcipher dev-libs/openssl:0 dev-qt/qtcore:5 dev-q
 REQUIRED_USE=|| ( cli gui ) feedreader? ( gui ) voip? ( gui )
 SLOT=0
 SRC_URI=https://github.com/RetroShare/RetroShare/archive/v0.6.4.tar.gz -> retroshare-0.6.4.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=deb6f83a9e1bf91dffb2927c5e21f346
diff --git a/metadata/md5-cache/net-p2p/retroshare-0.6.9999 b/metadata/md5-cache/net-p2p/retroshare-0.6.9999
index 101bb5d9505e..2ae1da1cc7d8 100644
--- a/metadata/md5-cache/net-p2p/retroshare-0.6.9999
+++ b/metadata/md5-cache/net-p2p/retroshare-0.6.9999
@@ -8,5 +8,5 @@ LICENSE=AGPL-3 GPL-2 GPL-3 Apache-2.0 LGPL-2.1
 RDEPEND=app-arch/bzip2 dev-libs/openssl:0= >=dev-libs/rapidjson-1.1.0 net-libs/libupnp:0= sys-libs/zlib control-socket? ( dev-qt/qtnetwork:5 ) gnome-keyring? ( gnome-base/libgnome-keyring ) gui? ( dev-qt/qtcore:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtxml:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXScrnSaver ) settings-api? ( dev-qt/qtcore:5 ) sqlcipher? ( dev-db/sqlcipher ) !sqlcipher? ( dev-db/sqlite:3 ) webui? ( net-libs/libmicrohttpd )
 REQUIRED_USE=|| ( cli gui ) settings-api? ( || ( control-socket webui ) )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=20294d0b2fd200b7287e9c19b02de0c9
diff --git a/metadata/md5-cache/net-p2p/rtorrent-0.9.7 b/metadata/md5-cache/net-p2p/rtorrent-0.9.7
index 3a47be6c729c..1036ac9ff012 100644
--- a/metadata/md5-cache/net-p2p/rtorrent-0.9.7
+++ b/metadata/md5-cache/net-p2p/rtorrent-0.9.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=~net-libs/libtorrent-0.13.7 >=dev-libs/libsigc++-2.2.2:2 >=net-misc/curl-7.19.1 sys-libs/ncurses:0= xmlrpc? ( dev-libs/xmlrpc-c ) daemon? ( app-misc/screen ) selinux? ( sec-policy/selinux-rtorrent )
 SLOT=0
 SRC_URI=http://rtorrent.net/downloads/rtorrent-0.9.7.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=3c9c845cfeff4e3714448741df4e3ee7
diff --git a/metadata/md5-cache/net-p2p/rtorrent-0.9.7-r1 b/metadata/md5-cache/net-p2p/rtorrent-0.9.7-r1
index df7f2f96a90a..8ad66750b7a1 100644
--- a/metadata/md5-cache/net-p2p/rtorrent-0.9.7-r1
+++ b/metadata/md5-cache/net-p2p/rtorrent-0.9.7-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=~net-libs/libtorrent-0.13.7 >=dev-libs/libsigc++-2.2.2:2 >=net-misc/curl-7.19.1 sys-libs/ncurses:0= xmlrpc? ( dev-libs/xmlrpc-c ) daemon? ( app-misc/screen ) selinux? ( sec-policy/selinux-rtorrent )
 SLOT=0
 SRC_URI=http://rtorrent.net/downloads/rtorrent-0.9.7.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=f9bce188ef1b9d4e410c9d1d71f2703e
diff --git a/metadata/md5-cache/net-p2p/saku-3.11.0-r2 b/metadata/md5-cache/net-p2p/saku-3.11.0-r2
index 9b2f83927c5e..45f139d9a1c1 100644
--- a/metadata/md5-cache/net-p2p/saku-3.11.0-r2
+++ b/metadata/md5-cache/net-p2p/saku-3.11.0-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/shingetsu/saku-3.11.0.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=637e24a575575059eff75e4e4b7dafa7
diff --git a/metadata/md5-cache/net-p2p/syncthing-0.14.51 b/metadata/md5-cache/net-p2p/syncthing-0.14.51
new file mode 100644
index 000000000000..24a1c14724ea
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/syncthing-0.14.51
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare setup test unpack
+DEPEND=>=dev-lang/go-1.9 virtual/pkgconfig
+DESCRIPTION=Open Source Continuous File Synchronization
+EAPI=6
+HOMEPAGE=https://syncthing.net
+IUSE=selinux tools
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MPL-2.0
+RDEPEND=selinux? ( sec-policy/selinux-syncthing )
+SLOT=0
+SRC_URI=https://github.com/syncthing/syncthing/archive/v0.14.51.tar.gz -> syncthing-0.14.51.tar.gz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=b756ea7b29c8a382d575b16f4e3e3707
diff --git a/metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r1 b/metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r1
index 07d3147aaec4..33e2c66cfa58 100644
--- a/metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r1
+++ b/metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=v
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/Fuuzetsu/torrentinfo/archive/v1.8.6.tar.gz -> torrentinfo-1.8.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3b7910f3e357945cae56d6104659ff09
diff --git a/metadata/md5-cache/net-p2p/transmission-2.94 b/metadata/md5-cache/net-p2p/transmission-2.94
index 83cd9774fdfb..66aec55264e8 100644
--- a/metadata/md5-cache/net-p2p/transmission-2.94
+++ b/metadata/md5-cache/net-p2p/transmission-2.94
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libevent-2.0.10:= !libressl? ( dev-libs/openssl:0= ) libressl
 REQUIRED_USE=ayatana? ( gtk )
 SLOT=0
 SRC_URI=https://github.com/transmission/transmission-releases/raw/master/transmission-2.94.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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=caec70b03e3faa58800909bc176cd030
diff --git a/metadata/md5-cache/net-p2p/transmission-9999 b/metadata/md5-cache/net-p2p/transmission-9999
index 711fc9898591..fd3918c4cb56 100644
--- a/metadata/md5-cache/net-p2p/transmission-9999
+++ b/metadata/md5-cache/net-p2p/transmission-9999
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT
 RDEPEND=dev-libs/libb64:0= >=dev-libs/libevent-2.0.10:= !mbedtls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.16.3[ssl] sys-libs/zlib:= gtk? ( >=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3 ayatana? ( >=dev-libs/libappindicator-0.4.30:3 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 ) systemd? ( >=sys-apps/systemd-209:= )
 RESTRICT=!test? ( 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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3dd350da0511ba2af5a26af92b9cef0e
diff --git a/metadata/md5-cache/net-p2p/transmission-remote-gtk-1.3.1 b/metadata/md5-cache/net-p2p/transmission-remote-gtk-1.3.1
index 4e4f8afdbec3..9bf54b35b585 100644
--- a/metadata/md5-cache/net-p2p/transmission-remote-gtk-1.3.1
+++ b/metadata/md5-cache/net-p2p/transmission-remote-gtk-1.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/json-glib-0.12.6 net-misc/curl >=x11-libs/gtk+-3.16:3 ayatana? ( dev-libs/libappindicator:3 ) geoip? ( dev-libs/geoip ) libnotify? ( >=x11-libs/libnotify-0.7 ) libproxy? ( net-libs/libproxy ) rss? ( >=net-libs/libmrss-0.18 )
 SLOT=0
 SRC_URI=https://github.com/transmission-remote-gtk/transmission-remote-gtk/releases/download/1.3.1/transmission-remote-gtk-1.3.1.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=c82030395bca722268eb9fc4befa1ce7
diff --git a/metadata/md5-cache/net-p2p/vuze-4.8.1.2-r1 b/metadata/md5-cache/net-p2p/vuze-4.8.1.2-r1
index 08fd76fdcac4..c8812ad1c9b6 100644
--- a/metadata/md5-cache/net-p2p/vuze-4.8.1.2-r1
+++ b/metadata/md5-cache/net-p2p/vuze-4.8.1.2-r1
@@ -10,5 +10,5 @@ PDEPEND=~net-p2p/vuze-coreplugins-4.8.1.2
 RDEPEND=dev-java/json-simple:0 dev-java/bcprov:1.40 >=dev-java/commons-cli-1.0:1 >=dev-java/log4j-1.2.8:0 >=dev-java/swt-3.7.2-r1:3.7[cairo] >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/azureus/vuze/Vuze_4812/Vuze_4812_source.zip mirror://gentoo/vuze-4.5.0.2-gentoo-patches.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=116c2afce6beb73290c3e0a680e7123c
diff --git a/metadata/md5-cache/net-p2p/vuze-5.7.2.0 b/metadata/md5-cache/net-p2p/vuze-5.7.2.0
index 43f598b377b8..0d327edd1795 100644
--- a/metadata/md5-cache/net-p2p/vuze-5.7.2.0
+++ b/metadata/md5-cache/net-p2p/vuze-5.7.2.0
@@ -10,5 +10,5 @@ PDEPEND=~net-p2p/vuze-coreplugins-5.7.2.0
 RDEPEND=dev-java/commons-cli:1 dev-java/commons-lang:2.1 dev-java/json-simple:0 dev-java/log4j:0 dev-java/swt:3.8[cairo] >=virtual/jre-1.6:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/azureus/vuze/Vuze_5720/Vuze_5720_source.zip
-_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b5f7164ba64c37a748618f68a7478560
diff --git a/metadata/md5-cache/net-p2p/vuze-5.7.2.0-r1 b/metadata/md5-cache/net-p2p/vuze-5.7.2.0-r1
index b431ace074e4..bef4a6094245 100644
--- a/metadata/md5-cache/net-p2p/vuze-5.7.2.0-r1
+++ b/metadata/md5-cache/net-p2p/vuze-5.7.2.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=BitTorrent client in Java, formerly called Azureus
 EAPI=6
 HOMEPAGE=http://www.vuze.com/
 IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 ~x86
+KEYWORDS=amd64 ppc64 x86
 LICENSE=GPL-2 BSD
 PDEPEND=~net-p2p/vuze-coreplugins-5.7.2.0
 RDEPEND=dev-java/log4j:0 dev-java/swt:3.8[cairo] dev-java/commons-cli:1 dev-java/json-simple:0 dev-java/commons-lang:2.1 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/azureus/vuze/Vuze_5720/Vuze_5720_source.zip
-_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=ab7bfbca1c426d060bcffe0a7ae2bc62
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=94abff26d60e3abcf7cfac61ad9f7686
diff --git a/metadata/md5-cache/net-p2p/vuze-coreplugins-5.7.2.0 b/metadata/md5-cache/net-p2p/vuze-coreplugins-5.7.2.0
index f60bf5959fe5..85d59fe2df6c 100644
--- a/metadata/md5-cache/net-p2p/vuze-coreplugins-5.7.2.0
+++ b/metadata/md5-cache/net-p2p/vuze-coreplugins-5.7.2.0
@@ -3,9 +3,9 @@ DEPEND=~net-p2p/vuze-5.7.2.0 app-arch/unzip
 DESCRIPTION=Core plugins for Vuze that are included in upstream distribution
 EAPI=5
 HOMEPAGE=http://www.vuze.com/
-KEYWORDS=amd64 ppc64 ~x86
+KEYWORDS=amd64 ppc64 x86
 LICENSE=GPL-2 BSD
 RDEPEND=~net-p2p/vuze-5.7.2.0
 SLOT=0
 SRC_URI=http://azureus.sourceforge.net/plugins/azplugins_2.1.10.jar http://azureus.sourceforge.net/plugins/azrating_1.5.19.jar http://azureus.sourceforge.net/plugins/azupdater_1.9.2.zip http://azureus.sourceforge.net/plugins/azupnpav_0.5.6.zip
-_md5_=2110a9a017bc6790f9d790f6d05ac027
+_md5_=09000e2729e1564fbfd8625d1661ba5c
diff --git a/metadata/md5-cache/net-p2p/xmr-stak-2.4.3-r1 b/metadata/md5-cache/net-p2p/xmr-stak-2.4.3-r1
index abfb8b6d1b55..a1668156f2a7 100644
--- a/metadata/md5-cache/net-p2p/xmr-stak-2.4.3-r1
+++ b/metadata/md5-cache/net-p2p/xmr-stak-2.4.3-r1
@@ -9,5 +9,5 @@ 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.4.3.tar.gz -> xmr-stak-2.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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=9ba453602efe27333b9304ca05b32873
diff --git a/metadata/md5-cache/net-p2p/xmr-stak-2.4.4 b/metadata/md5-cache/net-p2p/xmr-stak-2.4.4
index 90a51ff5bcb7..71bf4849787e 100644
--- a/metadata/md5-cache/net-p2p/xmr-stak-2.4.4
+++ b/metadata/md5-cache/net-p2p/xmr-stak-2.4.4
@@ -9,5 +9,5 @@ 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.4.4.tar.gz -> xmr-stak-2.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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=9ba453602efe27333b9304ca05b32873
diff --git a/metadata/md5-cache/net-p2p/xmr-stak-2.4.5 b/metadata/md5-cache/net-p2p/xmr-stak-2.4.5
index adcb92077373..2daf6fa510d0 100644
--- a/metadata/md5-cache/net-p2p/xmr-stak-2.4.5
+++ b/metadata/md5-cache/net-p2p/xmr-stak-2.4.5
@@ -9,5 +9,5 @@ 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.4.5.tar.gz -> xmr-stak-2.4.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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=9ba453602efe27333b9304ca05b32873
diff --git a/metadata/md5-cache/net-p2p/xmr-stak-2.4.5-r1 b/metadata/md5-cache/net-p2p/xmr-stak-2.4.5-r1
index a29782f6cbbf..6b426b62b3fe 100644
--- a/metadata/md5-cache/net-p2p/xmr-stak-2.4.5-r1
+++ b/metadata/md5-cache/net-p2p/xmr-stak-2.4.5-r1
@@ -9,5 +9,5 @@ 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.4.5.tar.gz -> xmr-stak-2.4.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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=1b618ff797394773a5c00eb8c2e4fa8a
diff --git a/metadata/md5-cache/net-p2p/xmr-stak-2.4.6 b/metadata/md5-cache/net-p2p/xmr-stak-2.4.6
index 1a13d865451b..5d4062a94866 100644
--- a/metadata/md5-cache/net-p2p/xmr-stak-2.4.6
+++ b/metadata/md5-cache/net-p2p/xmr-stak-2.4.6
@@ -9,5 +9,5 @@ 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.4.6.tar.gz -> xmr-stak-2.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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=1b618ff797394773a5c00eb8c2e4fa8a
diff --git a/metadata/md5-cache/net-p2p/xmr-stak-2.4.7 b/metadata/md5-cache/net-p2p/xmr-stak-2.4.7
index b1fd2fcd21f6..ff44a48c78b1 100644
--- a/metadata/md5-cache/net-p2p/xmr-stak-2.4.7
+++ b/metadata/md5-cache/net-p2p/xmr-stak-2.4.7
@@ -9,5 +9,5 @@ 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.4.7.tar.gz -> xmr-stak-2.4.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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=1b618ff797394773a5c00eb8c2e4fa8a
diff --git a/metadata/md5-cache/net-p2p/xmr-stak-9999 b/metadata/md5-cache/net-p2p/xmr-stak-9999
index 3b9e1507cdbc..9a2445003533 100644
--- a/metadata/md5-cache/net-p2p/xmr-stak-9999
+++ b/metadata/md5-cache/net-p2p/xmr-stak-9999
@@ -7,5 +7,5 @@ IUSE=cuda devfee hwloc opencl ssl webserver
 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
-_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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1b618ff797394773a5c00eb8c2e4fa8a
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 24b5c2d4baa4..189cb67bbd43 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/brlaser-4 b/metadata/md5-cache/net-print/brlaser-4
index b8fec987cc9e..1024958db9f1 100644
--- a/metadata/md5-cache/net-print/brlaser-4
+++ b/metadata/md5-cache/net-print/brlaser-4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=net-print/cups app-text/ghostscript-gpl
 SLOT=0
 SRC_URI=https://github.com/pdewacht/brlaser/archive/v4.tar.gz -> brlaser-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b2af38753c6a5f023c57ef8c2b79bc82
diff --git a/metadata/md5-cache/net-print/cups-2.2.7 b/metadata/md5-cache/net-print/cups-2.2.7
index 5f57c5ffedbd..fd9ba79b5e1a 100644
--- a/metadata/md5-cache/net-print/cups-2.2.7
+++ b/metadata/md5-cache/net-print/cups-2.2.7
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( python_targets_python2_7 ) usb? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/apple/cups/releases/download/v2.2.7/cups-2.2.7-source.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	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	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	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	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6ca6043d4f3980a5a22af05911afeff6
diff --git a/metadata/md5-cache/net-print/cups-2.2.8-r1 b/metadata/md5-cache/net-print/cups-2.2.8-r1
index 1fea40358979..a96296909a55 100644
--- a/metadata/md5-cache/net-print/cups-2.2.8-r1
+++ b/metadata/md5-cache/net-print/cups-2.2.8-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( python_targets_python2_7 ) usb? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/apple/cups/releases/download/v2.2.8/cups-2.2.8-source.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	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	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	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	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=14ff3a1a201ab6ab7ce1e7207732482e
diff --git a/metadata/md5-cache/net-print/cups-2.3_beta5-r1 b/metadata/md5-cache/net-print/cups-2.3_beta5-r1
index 24280a7f5785..78ee938ef95b 100644
--- a/metadata/md5-cache/net-print/cups-2.3_beta5-r1
+++ b/metadata/md5-cache/net-print/cups-2.3_beta5-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=usb? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/apple/cups/releases/download/v2.3b5/cups-2.3b5-source.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e2924e93c3e0cc01d65c90643bbdfd37
diff --git a/metadata/md5-cache/net-print/cups-9999 b/metadata/md5-cache/net-print/cups-9999
index b1a7eb5212c0..3164acef8db7 100644
--- a/metadata/md5-cache/net-print/cups-9999
+++ b/metadata/md5-cache/net-print/cups-9999
@@ -10,5 +10,5 @@ RDEPEND=app-text/libpaper sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-
 REQUIRED_USE=usb? ( threads )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5bd985407fad06b6c58cbfe1f880172e
diff --git a/metadata/md5-cache/net-print/cups-filters-1.20.4 b/metadata/md5-cache/net-print/cups-filters-1.20.4
index f80c88be8be7..e06b0f9e33db 100644
--- a/metadata/md5-cache/net-print/cups-filters-1.20.4
+++ b/metadata/md5-cache/net-print/cups-filters-1.20.4
@@ -4,10 +4,10 @@ DESCRIPTION=Cups filters
 EAPI=6
 HOMEPAGE=https://wiki.linuxfoundation.org/openprinting/cups-filters
 IUSE=dbus +foomatic ipp_autosetup jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~m68k-mint
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~m68k-mint
 LICENSE=MIT GPL-2
 RDEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-3.0.2:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pclm? ( >=app-text/qpdf-7.0_beta1 ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] )
 SLOT=0
 SRC_URI=http://www.openprinting.org/download/cups-filters/cups-filters-1.20.4.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_=47c0ff6ef3b0febaac313a2b8f839313
+_md5_=2ba110fab25b794252c17941f6c6db2c
diff --git a/metadata/md5-cache/net-print/cups-pk-helper-0.2.5 b/metadata/md5-cache/net-print/cups-pk-helper-0.2.5
index e46b86ed7c81..a8db667b2189 100644
--- a/metadata/md5-cache/net-print/cups-pk-helper-0.2.5
+++ b/metadata/md5-cache/net-print/cups-pk-helper-0.2.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.30.0:2 net-print/cups >=sys-auth/polkit-0.97 sys-apps/dbus
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/cups-pk-helper/releases/cups-pk-helper-0.2.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b57d3a4b8494047d5046c88c247ac039
diff --git a/metadata/md5-cache/net-print/cups-pk-helper-0.2.6 b/metadata/md5-cache/net-print/cups-pk-helper-0.2.6
index 8112c7c3ae66..9b61ac15fe82 100644
--- a/metadata/md5-cache/net-print/cups-pk-helper-0.2.6
+++ b/metadata/md5-cache/net-print/cups-pk-helper-0.2.6
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.30.0:2 net-print/cups >=sys-auth/polkit-0.97 sys-apps/dbus
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/cups-pk-helper/releases/cups-pk-helper-0.2.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=aa4905b5a4ad1e73935c51e415e0a315
diff --git a/metadata/md5-cache/net-print/hplip-3.18.6 b/metadata/md5-cache/net-print/hplip-3.18.6
index 6251699f2855..9171f84b3816 100644
--- a/metadata/md5-cache/net-print/hplip-3.18.6
+++ b/metadata/md5-cache/net-print/hplip-3.18.6
@@ -10,5 +10,5 @@ RDEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic]
 REQUIRED_USE=!minimal? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/hplip/hplip-3.18.6.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.18.3-patches-2.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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_=77315d454ba8101746cb5e2a8f9b4072
diff --git a/metadata/md5-cache/net-print/libgnomecups-0.2.3-r3 b/metadata/md5-cache/net-print/libgnomecups-0.2.3-r3
index 2a15ede7d107..6f75c0af6d3e 100644
--- a/metadata/md5-cache/net-print/libgnomecups-0.2.3-r3
+++ b/metadata/md5-cache/net-print/libgnomecups-0.2.3-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=dev-libs/glib-2:2 >=net-print/cups-1.3.8
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgnomecups/0.2/libgnomecups-0.2.3.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=3346931c93a370d28f3734ee9943cabd
diff --git a/metadata/md5-cache/net-print/libgnomecups-0.2.3-r5 b/metadata/md5-cache/net-print/libgnomecups-0.2.3-r5
index 3db887727cb4..23c04452ce18 100644
--- a/metadata/md5-cache/net-print/libgnomecups-0.2.3-r5
+++ b/metadata/md5-cache/net-print/libgnomecups-0.2.3-r5
@@ -9,5 +9,5 @@ LICENSE=GPL-2 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(-)?] >=net-print/cups-1.7.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/libgnomecups/0.2/libgnomecups-0.2.3.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a62f803d79d7f05a95f938a9cef5699d
diff --git a/metadata/md5-cache/net-print/pkpgcounter-3.50-r2 b/metadata/md5-cache/net-print/pkpgcounter-3.50-r2
index e65ba8efa4f8..7f7cd4225958 100644
--- a/metadata/md5-cache/net-print/pkpgcounter-3.50-r2
+++ b/metadata/md5-cache/net-print/pkpgcounter-3.50-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.pykota.com/software/pkpgcounter/download/tarballs/pkpgcounter-3.50.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dfdbae69186d9edbb1ae9d9c1b94f893
diff --git a/metadata/md5-cache/net-print/pykota-1.26-r1 b/metadata/md5-cache/net-print/pykota-1.26-r1
index c7567e336bf3..9b48b01ab68e 100644
--- a/metadata/md5-cache/net-print/pykota-1.26-r1
+++ b/metadata/md5-cache/net-print/pykota-1.26-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/egenix-mx-base[python_targets_python2_7(-)?,-python_single_ta
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/pykota-1.26.tar.xz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=77ecfdc9e5cfe384859f4c8b96e2107f
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index 6a7c6cc28594..ec9c5b948db1 100644
--- a/metadata/md5-cache/net-proxy/Manifest.gz
+++ b/metadata/md5-cache/net-proxy/Manifest.gz
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.6.11-r2 b/metadata/md5-cache/net-proxy/haproxy-1.6.11-r2
index faf4c4a7e124..eec035796639 100644
--- a/metadata/md5-cache/net-proxy/haproxy-1.6.11-r2
+++ b/metadata/md5-cache/net-proxy/haproxy-1.6.11-r2
@@ -10,5 +10,5 @@ RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) ssl? ( !l
 REQUIRED_USE=pcre-jit? ( pcre ) ?? ( slz zlib )
 SLOT=0
 SRC_URI=http://haproxy.1wt.eu/download/1.6/src/haproxy-1.6.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=80df4cc1a7f1f58b495807283e832f66
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.6.14 b/metadata/md5-cache/net-proxy/haproxy-1.6.14
index b6639464acc0..391ef94bbd82 100644
--- a/metadata/md5-cache/net-proxy/haproxy-1.6.14
+++ b/metadata/md5-cache/net-proxy/haproxy-1.6.14
@@ -10,5 +10,5 @@ RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) ssl? ( !l
 REQUIRED_USE=pcre-jit? ( pcre ) ?? ( slz zlib )
 SLOT=0
 SRC_URI=http://haproxy.1wt.eu/download/1.6/src/haproxy-1.6.14.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=4b52cf07e570a70543d6e9289ecbdda9
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.7.10 b/metadata/md5-cache/net-proxy/haproxy-1.7.10
index 5664a6c1d9c8..955b1d3b31fb 100644
--- a/metadata/md5-cache/net-proxy/haproxy-1.7.10
+++ b/metadata/md5-cache/net-proxy/haproxy-1.7.10
@@ -10,5 +10,5 @@ RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) ssl? ( !l
 REQUIRED_USE=pcre-jit? ( pcre ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0
 SRC_URI=http://haproxy.1wt.eu/download/1.7/src/haproxy-1.7.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=a5e99ed716c1646688919673d678d0a5
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.7.11 b/metadata/md5-cache/net-proxy/haproxy-1.7.11
index 9ad378e837cb..d8364aabcc26 100644
--- a/metadata/md5-cache/net-proxy/haproxy-1.7.11
+++ b/metadata/md5-cache/net-proxy/haproxy-1.7.11
@@ -10,5 +10,5 @@ RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) ssl? ( !l
 REQUIRED_USE=pcre-jit? ( pcre ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0
 SRC_URI=http://haproxy.1wt.eu/download/1.7/src/haproxy-1.7.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=512f025ee4a7e6657f838b44c540dfc7
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.8.13 b/metadata/md5-cache/net-proxy/haproxy-1.8.13
index 24eaa253e705..12a9594e492e 100644
--- a/metadata/md5-cache/net-proxy/haproxy-1.8.13
+++ b/metadata/md5-cache/net-proxy/haproxy-1.8.13
@@ -10,5 +10,5 @@ RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? (
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0
 SRC_URI=http://haproxy.1wt.eu/download/1.8/src/haproxy-1.8.13.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=a96f6a5458cd3a0e9b7709917a28e04b
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.8.14 b/metadata/md5-cache/net-proxy/haproxy-1.8.14
new file mode 100644
index 000000000000..52fed1ff7574
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/haproxy-1.8.14
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst setup
+DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) virtual/pkgconfig
+DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
+EAPI=6
+HOMEPAGE=http://www.haproxy.org
+IUSE=+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl kernel_linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
+SLOT=0
+SRC_URI=http://haproxy.1wt.eu/download/1.8/src/haproxy-1.8.14.tar.gz
+_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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=0321bfadf4af535d2cfe84efeef41581
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.8.8 b/metadata/md5-cache/net-proxy/haproxy-1.8.8
index be6bfbc5f46b..3593b2b81ba5 100644
--- a/metadata/md5-cache/net-proxy/haproxy-1.8.8
+++ b/metadata/md5-cache/net-proxy/haproxy-1.8.8
@@ -10,5 +10,5 @@ RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? (
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0
 SRC_URI=http://haproxy.1wt.eu/download/1.8/src/haproxy-1.8.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=b84c8d95972675fd4b84c28a701ffa45
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.8.9 b/metadata/md5-cache/net-proxy/haproxy-1.8.9
index 05f25d34a24e..ff57da19614f 100644
--- a/metadata/md5-cache/net-proxy/haproxy-1.8.9
+++ b/metadata/md5-cache/net-proxy/haproxy-1.8.9
@@ -10,5 +10,5 @@ RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? (
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0
 SRC_URI=http://haproxy.1wt.eu/download/1.8/src/haproxy-1.8.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=4c6eccd379572eb9149e2747718cc5da
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.9.9999 b/metadata/md5-cache/net-proxy/haproxy-1.9.9999
index 412ff462fee3..c747ddc34a59 100644
--- a/metadata/md5-cache/net-proxy/haproxy-1.9.9999
+++ b/metadata/md5-cache/net-proxy/haproxy-1.9.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=b84c8d95972675fd4b84c28a701ffa45
diff --git a/metadata/md5-cache/net-proxy/mitmproxy-0.10.1 b/metadata/md5-cache/net-proxy/mitmproxy-0.10.1
index 954b19fc9f4b..32bf7f836012 100644
--- a/metadata/md5-cache/net-proxy/mitmproxy-0.10.1
+++ b/metadata/md5-cache/net-proxy/mitmproxy-0.10.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pillow-2.3.0[python_targets_python2_7(-)?,-python_single_ta
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://mitmproxy.org/download/mitmproxy-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=43d1ab172a27a1cf8dbfc10db6d285d1
diff --git a/metadata/md5-cache/net-proxy/mitmproxy-0.11.1 b/metadata/md5-cache/net-proxy/mitmproxy-0.11.1
index 9e2b98d96c74..c4ef55fb2bc7 100644
--- a/metadata/md5-cache/net-proxy/mitmproxy-0.11.1
+++ b/metadata/md5-cache/net-proxy/mitmproxy-0.11.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pillow-2.3.0[python_targets_python2_7(-)?,-python_single_ta
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://mitmproxy.org/download/mitmproxy-0.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fec0579164b924cbdd0b095af18a1f8d
diff --git a/metadata/md5-cache/net-proxy/mitmproxy-0.11.3 b/metadata/md5-cache/net-proxy/mitmproxy-0.11.3
index 5c30204c03ad..5e47607393a4 100644
--- a/metadata/md5-cache/net-proxy/mitmproxy-0.11.3
+++ b/metadata/md5-cache/net-proxy/mitmproxy-0.11.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pillow-2.3.0[python_targets_python2_7(-)?,-python_single_ta
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://mitmproxy.org/download/mitmproxy-0.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2b04f3af5572acc6719e87232daf4e8d
diff --git a/metadata/md5-cache/net-proxy/squid-3.5.27-r1 b/metadata/md5-cache/net-proxy/squid-3.5.27-r1
index fdbb8c186869..9da85eee6a92 100644
--- a/metadata/md5-cache/net-proxy/squid-3.5.27-r1
+++ b/metadata/md5-cache/net-proxy/squid-3.5.27-r1
@@ -10,5 +10,5 @@ RDEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/op
 REQUIRED_USE=tproxy? ( caps ) qos? ( caps )
 SLOT=0
 SRC_URI=http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.27.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f907dc2c19b77d8f656b833c0395386a
diff --git a/metadata/md5-cache/net-proxy/squid-3.5.28 b/metadata/md5-cache/net-proxy/squid-3.5.28
index 32a71fe24d4a..aa8a6bd1afc6 100644
--- a/metadata/md5-cache/net-proxy/squid-3.5.28
+++ b/metadata/md5-cache/net-proxy/squid-3.5.28
@@ -11,5 +11,5 @@ RDEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/op
 REQUIRED_USE=tproxy? ( caps ) qos? ( caps )
 SLOT=0
 SRC_URI=http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.28.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=ac1c58ffe8b22dbc3399ff4c63c1f410
diff --git a/metadata/md5-cache/net-proxy/sshuttle-0.78.3-r2 b/metadata/md5-cache/net-proxy/sshuttle-0.78.3-r2
index 677b04764e3c..7af196878f85 100644
--- a/metadata/md5-cache/net-proxy/sshuttle-0.78.3-r2
+++ b/metadata/md5-cache/net-proxy/sshuttle-0.78.3-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sshuttle/sshuttle-0.78.3.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=93e524b7efdde09a42905016fdb75726
diff --git a/metadata/md5-cache/net-proxy/sshuttle-0.78.4 b/metadata/md5-cache/net-proxy/sshuttle-0.78.4
index de7a8c4f619c..1c958c376365 100644
--- a/metadata/md5-cache/net-proxy/sshuttle-0.78.4
+++ b/metadata/md5-cache/net-proxy/sshuttle-0.78.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sshuttle/sshuttle-0.78.4.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d38405d8390b1a485277b532cd65ce8e
diff --git a/metadata/md5-cache/net-voip/Manifest.gz b/metadata/md5-cache/net-voip/Manifest.gz
index 561a1b5f0ec5..8a755faf1a45 100644
--- a/metadata/md5-cache/net-voip/Manifest.gz
+++ b/metadata/md5-cache/net-voip/Manifest.gz
diff --git a/metadata/md5-cache/net-voip/telepathy-gabble-0.18.4 b/metadata/md5-cache/net-voip/telepathy-gabble-0.18.4
index 245f3eb68aa6..4af57c5995d5 100644
--- a/metadata/md5-cache/net-voip/telepathy-gabble-0.18.4
+++ b/metadata/md5-cache/net-voip/telepathy-gabble-0.18.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.44:2 >=sys-apps/dbus-1.1.0 >=dev-libs/dbus-glib-0.82 >=net-libs/telepathy-glib-0.19.9 dev-libs/libxml2 dev-db/sqlite:3 gnutls? ( >=net-libs/gnutls-2.10.2 ) !gnutls? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( >=dev-libs/openssl-0.9.8g:0=[-bindist] ) ) jingle? ( >=net-libs/libsoup-2.42 >=net-libs/libnice-0.0.11 ) plugins? ( x11-libs/gtksourceview:3.0[introspection] ) !<net-im/telepathy-mission-control-5.5.0
 SLOT=0
 SRC_URI=https://telepathy.freedesktop.org/releases/telepathy-gabble/telepathy-gabble-0.18.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ab48318e4c750589bdbecf95fc738245
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 361444869789..270b2ce2bd4b 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/aiccu-2007.01.15-r5 b/metadata/md5-cache/net-vpn/aiccu-2007.01.15-r5
index 600672d44a90..f7b508c5c5b5 100644
--- a/metadata/md5-cache/net-vpn/aiccu-2007.01.15-r5
+++ b/metadata/md5-cache/net-vpn/aiccu-2007.01.15-r5
@@ -9,5 +9,5 @@ LICENSE=SixXS
 RDEPEND=net-libs/gnutls sys-apps/iproute2 systemd? ( sys-apps/systemd )
 SLOT=0
 SRC_URI=https://www.sixxs.net/archive/sixxs/aiccu/unix/aiccu_20070115.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7b3ecadc325b5ac7eba6a82bf5b642e9
diff --git a/metadata/md5-cache/net-vpn/badvpn-1.999.126 b/metadata/md5-cache/net-vpn/badvpn-1.999.126
index a874bf6fcb87..a13d0c279cea 100644
--- a/metadata/md5-cache/net-vpn/badvpn-1.999.126
+++ b/metadata/md5-cache/net-vpn/badvpn-1.999.126
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( client ncd server tun2socks udpgw )
 RESTRICT=!ncd? ( test )
 SLOT=0
 SRC_URI=https://badvpn.googlecode.com/files/badvpn-1.999.126.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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=c5912b088c3d19166dfadf3117b42d94
diff --git a/metadata/md5-cache/net-vpn/badvpn-1.999.127 b/metadata/md5-cache/net-vpn/badvpn-1.999.127
index e199b056e6a4..9b77302eb58f 100644
--- a/metadata/md5-cache/net-vpn/badvpn-1.999.127
+++ b/metadata/md5-cache/net-vpn/badvpn-1.999.127
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( client ncd server tun2socks udpgw )
 RESTRICT=!ncd? ( test )
 SLOT=0
 SRC_URI=https://badvpn.googlecode.com/files/badvpn-1.999.127.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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=50923104f2701e40ef5b0dfed0543ab0
diff --git a/metadata/md5-cache/net-vpn/badvpn-1.999.128 b/metadata/md5-cache/net-vpn/badvpn-1.999.128
index 4b77861961bd..8ca227f53626 100644
--- a/metadata/md5-cache/net-vpn/badvpn-1.999.128
+++ b/metadata/md5-cache/net-vpn/badvpn-1.999.128
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( client ncd server tun2socks udpgw )
 RESTRICT=!ncd? ( test )
 SLOT=0
 SRC_URI=https://badvpn.googlecode.com/files/badvpn-1.999.128.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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d63f8f9a5c21a116048298d79785af63
diff --git a/metadata/md5-cache/net-vpn/badvpn-1.999.129 b/metadata/md5-cache/net-vpn/badvpn-1.999.129
index 2fcca7d26033..674ff204dfaa 100644
--- a/metadata/md5-cache/net-vpn/badvpn-1.999.129
+++ b/metadata/md5-cache/net-vpn/badvpn-1.999.129
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( client ncd server tun2socks udpgw )
 RESTRICT=!ncd? ( test )
 SLOT=0
 SRC_URI=https://github.com/ambrop72/badvpn/archive/1.999.129.tar.gz -> badvpn-1.999.129.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=884c1964dfc6e02ca475c3e98fb3ad37
diff --git a/metadata/md5-cache/net-vpn/badvpn-1.999.130 b/metadata/md5-cache/net-vpn/badvpn-1.999.130
index 81f4a3f825be..5bd34605361a 100644
--- a/metadata/md5-cache/net-vpn/badvpn-1.999.130
+++ b/metadata/md5-cache/net-vpn/badvpn-1.999.130
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( client ncd server tun2socks udpgw )
 RESTRICT=!ncd? ( test )
 SLOT=0
 SRC_URI=https://github.com/ambrop72/badvpn/archive/1.999.130.tar.gz -> badvpn-1.999.130.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ffaf5900bc1a60af4463782c4c7630e3
diff --git a/metadata/md5-cache/net-vpn/i2pd-2.18.0 b/metadata/md5-cache/net-vpn/i2pd-2.18.0
index 89c07cf2c1cb..ea12fc2219c4 100644
--- a/metadata/md5-cache/net-vpn/i2pd-2.18.0
+++ b/metadata/md5-cache/net-vpn/i2pd-2.18.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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.19.0 b/metadata/md5-cache/net-vpn/i2pd-2.19.0
index d6dc01b33409..c70e7ec5edac 100644
--- a/metadata/md5-cache/net-vpn/i2pd-2.19.0
+++ b/metadata/md5-cache/net-vpn/i2pd-2.19.0
@@ -9,5 +9,5 @@ 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.19.0.tar.gz -> i2pd-2.19.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	89bb9f083a2590d9b447fd0b78a96186
+_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 290a105187fa..2e88b12a1023 100644
--- a/metadata/md5-cache/net-vpn/i2pd-2.20.0
+++ b/metadata/md5-cache/net-vpn/i2pd-2.20.0
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/net-vpn/iodine-0.7.0-r2 b/metadata/md5-cache/net-vpn/iodine-0.7.0-r2
index 61c9640a7e35..1200338a88d9 100644
--- a/metadata/md5-cache/net-vpn/iodine-0.7.0-r2
+++ b/metadata/md5-cache/net-vpn/iodine-0.7.0-r2
@@ -9,5 +9,5 @@ LICENSE=ISC GPL-2
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=http://code.kryo.se/iodine/iodine-0.7.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2ac9e78f1724443f5cf864256279b5d3
diff --git a/metadata/md5-cache/net-vpn/ipsec-tools-0.8.2-r5 b/metadata/md5-cache/net-vpn/ipsec-tools-0.8.2-r5
index 17112b0ac4f7..e89a56bb65dd 100644
--- a/metadata/md5-cache/net-vpn/ipsec-tools-0.8.2-r5
+++ b/metadata/md5-cache/net-vpn/ipsec-tools-0.8.2-r5
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) readline? ( sys-libs/readline:0= ) selinux? ( sys-libs/libselinux ) selinux? ( sec-policy/selinux-ipsec )
 SLOT=0
 SRC_URI=mirror://sourceforge/ipsec-tools/ipsec-tools-0.8.2.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=76df0e1b4d169e90af3e8f3f11d6a692
diff --git a/metadata/md5-cache/net-vpn/isatapd-0.9.7-r2 b/metadata/md5-cache/net-vpn/isatapd-0.9.7-r2
index 9d11e4dc9794..6e8c5b13b2ce 100644
--- a/metadata/md5-cache/net-vpn/isatapd-0.9.7-r2
+++ b/metadata/md5-cache/net-vpn/isatapd-0.9.7-r2
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.saschahlusiak.de/linux/isatapd-0.9.7.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=154571d7a6bd9bcbc77b8de6afa02f22
diff --git a/metadata/md5-cache/net-vpn/logmein-hamachi-2.1.0.174 b/metadata/md5-cache/net-vpn/logmein-hamachi-2.1.0.174
index 031534a74e08..f4ff41efda6c 100644
--- a/metadata/md5-cache/net-vpn/logmein-hamachi-2.1.0.174
+++ b/metadata/md5-cache/net-vpn/logmein-hamachi-2.1.0.174
@@ -10,5 +10,5 @@ RDEPEND=!net-misc/hamachi
 RESTRICT=mirror
 SLOT=0
 SRC_URI=x86? ( https://www.vpn.net/installers/logmein-hamachi-2.1.0.174-x86.tgz ) amd64? ( https://www.vpn.net/installers/logmein-hamachi-2.1.0.174-x64.tgz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=093e7870b29c6a6912b221cc97aa88d7
diff --git a/metadata/md5-cache/net-vpn/logmein-hamachi-2.1.0.198 b/metadata/md5-cache/net-vpn/logmein-hamachi-2.1.0.198
index c3e2c7a64b3c..f5b5a7f9df3c 100644
--- a/metadata/md5-cache/net-vpn/logmein-hamachi-2.1.0.198
+++ b/metadata/md5-cache/net-vpn/logmein-hamachi-2.1.0.198
@@ -10,5 +10,5 @@ RDEPEND=!net-misc/hamachi
 RESTRICT=mirror
 SLOT=0
 SRC_URI=x86? ( https://www.vpn.net/installers/logmein-hamachi-2.1.0.198-x86.tgz ) amd64? ( https://www.vpn.net/installers/logmein-hamachi-2.1.0.198-x64.tgz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=81339f1cb7ab9aba1e10fae2bbdc2a40
diff --git a/metadata/md5-cache/net-vpn/nstx-1.1_beta6-r3 b/metadata/md5-cache/net-vpn/nstx-1.1_beta6-r3
index e58eccfc1947..d496dac71256 100644
--- a/metadata/md5-cache/net-vpn/nstx-1.1_beta6-r3
+++ b/metadata/md5-cache/net-vpn/nstx-1.1_beta6-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/os-headers
 SLOT=0
 SRC_URI=http://dereference.de/nstx/nstx-1.1-beta6.tgz mirror://debian/pool/main/n/nstx/nstx_1.1-beta6-5.diff.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=4a1ad70f928b3e0f9915da321a8fc118
diff --git a/metadata/md5-cache/net-vpn/openconnect-7.06-r1 b/metadata/md5-cache/net-vpn/openconnect-7.06-r1
index 9c7a1bfa1697..80bd60488b65 100644
--- a/metadata/md5-cache/net-vpn/openconnect-7.06-r1
+++ b/metadata/md5-cache/net-vpn/openconnect-7.06-r1
@@ -9,5 +9,5 @@ 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	915cae3d7d636732918d18827fb1c226	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
+_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
index 55c280a6f19f..5724d7f32fb3 100644
--- a/metadata/md5-cache/net-vpn/openconnect-7.06-r4
+++ b/metadata/md5-cache/net-vpn/openconnect-7.06-r4
@@ -9,5 +9,5 @@ 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	915cae3d7d636732918d18827fb1c226	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
+_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
index f6290cd71770..f4444cc286a7 100644
--- a/metadata/md5-cache/net-vpn/openconnect-7.06_p20160614
+++ b/metadata/md5-cache/net-vpn/openconnect-7.06_p20160614
@@ -9,5 +9,5 @@ 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	915cae3d7d636732918d18827fb1c226	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
+_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
index a67e0c129e48..7b856e49f60e 100644
--- a/metadata/md5-cache/net-vpn/openconnect-7.07-r1
+++ b/metadata/md5-cache/net-vpn/openconnect-7.07-r1
@@ -9,5 +9,5 @@ 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	915cae3d7d636732918d18827fb1c226	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
+_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
index 1aa734d05f14..d64806aa8c25 100644
--- a/metadata/md5-cache/net-vpn/openconnect-7.07-r2
+++ b/metadata/md5-cache/net-vpn/openconnect-7.07-r2
@@ -9,5 +9,5 @@ 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	915cae3d7d636732918d18827fb1c226	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
+_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
index 332f68f39969..ea69a3f3ad99 100644
--- a/metadata/md5-cache/net-vpn/openconnect-7.07-r3
+++ b/metadata/md5-cache/net-vpn/openconnect-7.07-r3
@@ -9,5 +9,5 @@ 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	915cae3d7d636732918d18827fb1c226	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
+_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
index 19906c5c1039..b2d583b06eab 100644
--- a/metadata/md5-cache/net-vpn/openconnect-7.08
+++ b/metadata/md5-cache/net-vpn/openconnect-7.08
@@ -9,5 +9,5 @@ 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	915cae3d7d636732918d18827fb1c226	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
+_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 71bdb5ef7352..07db0f972029 100644
--- a/metadata/md5-cache/net-vpn/openconnect-7.08-r1
+++ b/metadata/md5-cache/net-vpn/openconnect-7.08-r1
@@ -9,5 +9,5 @@ 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	915cae3d7d636732918d18827fb1c226	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
+_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
diff --git a/metadata/md5-cache/net-vpn/openconnect-9999 b/metadata/md5-cache/net-vpn/openconnect-9999
index fd489d5aee7a..f537cfae162c 100644
--- a/metadata/md5-cache/net-vpn/openconnect-9999
+++ b/metadata/md5-cache/net-vpn/openconnect-9999
@@ -8,5 +8,5 @@ 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/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	915cae3d7d636732918d18827fb1c226	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
+_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
diff --git a/metadata/md5-cache/net-vpn/openfortivpn-1.6.0 b/metadata/md5-cache/net-vpn/openfortivpn-1.6.0
deleted file mode 100644
index 7d3a89c36c1b..000000000000
--- a/metadata/md5-cache/net-vpn/openfortivpn-1.6.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-dialup/ppp >=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 Fortinet compatible VPN client
-EAPI=6
-HOMEPAGE=https://github.com/adrienverge/openfortivpn
-IUSE=libressl kernel_linux
-KEYWORDS=amd64
-LICENSE=GPL-3-with-openssl-exception openssl
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-dialup/ppp
-SLOT=0
-SRC_URI=https://github.com/adrienverge/openfortivpn/archive/v1.6.0.tar.gz -> openfortivpn-1.6.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=27859e16ff998cea99febd2debb537a2
diff --git a/metadata/md5-cache/net-vpn/openfortivpn-1.7.1 b/metadata/md5-cache/net-vpn/openfortivpn-1.7.1
index 62379d73fc33..9964fdc6332e 100644
--- a/metadata/md5-cache/net-vpn/openfortivpn-1.7.1
+++ b/metadata/md5-cache/net-vpn/openfortivpn-1.7.1
@@ -10,5 +10,5 @@ LICENSE=GPL-3-with-openssl-exception openssl
 RDEPEND=net-dialup/ppp !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 SLOT=0
 SRC_URI=https://github.com/adrienverge/openfortivpn/archive/v1.7.1.tar.gz -> openfortivpn-1.7.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=498f6e19d6fb443dc4dd45297d3dcdbc
diff --git a/metadata/md5-cache/net-vpn/openvpn-2.4.4 b/metadata/md5-cache/net-vpn/openvpn-2.4.4
index ab015301729e..a9d090587d2f 100644
--- a/metadata/md5-cache/net-vpn/openvpn-2.4.4
+++ b/metadata/md5-cache/net-vpn/openvpn-2.4.4
@@ -10,5 +10,5 @@ RDEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( >
 REQUIRED_USE=static? ( !plugins !pkcs11 ) mbedtls? ( ssl !libressl ) pkcs11? ( ssl ) !plugins? ( !pam !down-root ) inotify? ( plugins )
 SLOT=0
 SRC_URI=https://swupdate.openvpn.net/community/releases/openvpn-2.4.4.tar.gz test? ( https://raw.githubusercontent.com/OpenVPN/openvpn/v2.4.4/tests/unit_tests/openvpn/mock_msg.h )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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_=047ed62447dbf676de53d51043fa6169
diff --git a/metadata/md5-cache/net-vpn/openvpn-2.4.5 b/metadata/md5-cache/net-vpn/openvpn-2.4.5
index 9ae22f072916..cc4bc8076556 100644
--- a/metadata/md5-cache/net-vpn/openvpn-2.4.5
+++ b/metadata/md5-cache/net-vpn/openvpn-2.4.5
@@ -10,5 +10,5 @@ RDEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( >
 REQUIRED_USE=static? ( !plugins !pkcs11 ) mbedtls? ( ssl !libressl ) pkcs11? ( ssl ) !plugins? ( !pam !down-root ) inotify? ( plugins )
 SLOT=0
 SRC_URI=https://swupdate.openvpn.net/community/releases/openvpn-2.4.5.tar.gz test? ( https://raw.githubusercontent.com/OpenVPN/openvpn/v2.4.5/tests/unit_tests/openvpn/mock_msg.h )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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_=a1c4c71bc99e17628b1ab40a52c6cc94
diff --git a/metadata/md5-cache/net-vpn/openvpn-2.4.6 b/metadata/md5-cache/net-vpn/openvpn-2.4.6
index 8b41b10d34c4..15d7a1e9dbce 100644
--- a/metadata/md5-cache/net-vpn/openvpn-2.4.6
+++ b/metadata/md5-cache/net-vpn/openvpn-2.4.6
@@ -10,5 +10,5 @@ RDEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( >
 REQUIRED_USE=static? ( !plugins !pkcs11 ) mbedtls? ( ssl !libressl ) pkcs11? ( ssl ) !plugins? ( !pam !down-root ) inotify? ( plugins )
 SLOT=0
 SRC_URI=https://swupdate.openvpn.net/community/releases/openvpn-2.4.6.tar.gz test? ( https://raw.githubusercontent.com/OpenVPN/openvpn/v2.4.6/tests/unit_tests/openvpn/mock_msg.h )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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_=2452bc39ffe2cf4e0e87f6072488ebac
diff --git a/metadata/md5-cache/net-vpn/openvpn-9999 b/metadata/md5-cache/net-vpn/openvpn-9999
index 5d45e14550f6..fd4874fb2cdb 100644
--- a/metadata/md5-cache/net-vpn/openvpn-9999
+++ b/metadata/md5-cache/net-vpn/openvpn-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools ) ) pam? ( virtual/pam ) ssl? ( !mbedtls? ( !libressl? ( >=dev-libs/openssl-0.9.8:* ) libressl? ( dev-libs/libressl ) ) mbedtls? ( net-libs/mbedtls ) ) lz4? ( app-arch/lz4 ) lzo? ( >=dev-libs/lzo-1.07 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) systemd? ( sys-apps/systemd ) selinux? ( sec-policy/selinux-openvpn )
 REQUIRED_USE=static? ( !plugins !pkcs11 ) lzo? ( !lz4 ) pkcs11? ( ssl ) mbedtls? ( ssl !libressl ) pkcs11? ( ssl ) !plugins? ( !pam !down-root ) inotify? ( plugins )
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	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	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cfcd1777d8d04f585ef5bc6c2280abbf
diff --git a/metadata/md5-cache/net-vpn/strongswan-5.5.3 b/metadata/md5-cache/net-vpn/strongswan-5.5.3
index f1200ef80be4..8e55d8486b2e 100644
--- a/metadata/md5-cache/net-vpn/strongswan-5.5.3
+++ b/metadata/md5-cache/net-vpn/strongswan-5.5.3
@@ -9,5 +9,5 @@ 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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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
index 9a1e7276fbe9..e7d7e4c68c8f 100644
--- a/metadata/md5-cache/net-vpn/strongswan-5.6.0
+++ b/metadata/md5-cache/net-vpn/strongswan-5.6.0
@@ -9,5 +9,5 @@ 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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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.6.0-r1 b/metadata/md5-cache/net-vpn/strongswan-5.6.0-r1
index b86be8742a0a..14a892b41477 100644
--- a/metadata/md5-cache/net-vpn/strongswan-5.6.0-r1
+++ b/metadata/md5-cache/net-vpn/strongswan-5.6.0-r1
@@ -9,5 +9,5 @@ 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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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_=82ed9ec16fda79e683635e6ebab76492
diff --git a/metadata/md5-cache/net-vpn/strongswan-5.6.2 b/metadata/md5-cache/net-vpn/strongswan-5.6.2
index 852de5f2a98c..c91b076a19c8 100644
--- a/metadata/md5-cache/net-vpn/strongswan-5.6.2
+++ b/metadata/md5-cache/net-vpn/strongswan-5.6.2
@@ -9,5 +9,5 @@ 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.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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_=28716396c52fc9585a6e1fee2e35b342
diff --git a/metadata/md5-cache/net-vpn/strongswan-5.6.3 b/metadata/md5-cache/net-vpn/strongswan-5.6.3
index 96c44a95938d..3bc923351d24 100644
--- a/metadata/md5-cache/net-vpn/strongswan-5.6.3
+++ b/metadata/md5-cache/net-vpn/strongswan-5.6.3
@@ -10,5 +10,5 @@ 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 ) 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.6.3.tar.bz2
-_eclasses_=linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=a9c34106f9806d3db6b85d88b4f53b7c
diff --git a/metadata/md5-cache/net-vpn/tor-0.3.4.7_rc b/metadata/md5-cache/net-vpn/tor-0.3.4.7_rc
index 21e5c4ad9a25..f9175a557725 100644
--- a/metadata/md5-cache/net-vpn/tor-0.3.4.7_rc
+++ b/metadata/md5-cache/net-vpn/tor-0.3.4.7_rc
@@ -4,10 +4,10 @@ DESCRIPTION=Anonymizing overlay network for TCP
 EAPI=6
 HOMEPAGE=http://www.torproject.org/
 IUSE=caps libressl lzma scrypt seccomp selinux systemd tor-hardening test web zstd
-KEYWORDS=amd64 ~arm ~mips ppc ppc64 x86 ~ppc-macos
+KEYWORDS=amd64 arm ~mips ppc ppc64 x86 ~ppc-macos
 LICENSE=BSD GPL-2
 RDEPEND=app-text/asciidoc dev-libs/libevent[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-tor )
 SLOT=0
 SRC_URI=https://www.torproject.org/dist/tor-0.3.4.7-rc.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.3.4.7-rc.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_=f74b65a12476450683fa91628507c60e
+_md5_=5d9bd96264876379e2073c18bf8cca01
diff --git a/metadata/md5-cache/net-vpn/vpnc-0.5.3_p550 b/metadata/md5-cache/net-vpn/vpnc-0.5.3_p550
index 5e402b797ca3..4b7896929fa0 100644
--- a/metadata/md5-cache/net-vpn/vpnc-0.5.3_p550
+++ b/metadata/md5-cache/net-vpn/vpnc-0.5.3_p550
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl dev-libs/libgcrypt:0= >=sys-apps/iproute2-2.6.19.20061214[
 RESTRICT=!gnutls? ( bindist )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/vpnc-0.5.3_p550.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dea722a53ae71a5e919106542c2ac62d
diff --git a/metadata/md5-cache/net-vpn/vtun-3.0.3 b/metadata/md5-cache/net-vpn/vtun-3.0.3
index 3a694a31f334..3d5b5d91b486 100644
--- a/metadata/md5-cache/net-vpn/vtun-3.0.3
+++ b/metadata/md5-cache/net-vpn/vtun-3.0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=ssl? ( dev-libs/openssl:0 ) lzo? ( dev-libs/lzo:2 ) zlib? ( sys-libs/zlib ) socks5? ( net-proxy/dante )
 SLOT=0
 SRC_URI=mirror://sourceforge/vtun/vtun-3.0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7aeb9ef7bfd0eba0532a7b92332ea6ca
diff --git a/metadata/md5-cache/net-vpn/wireguard-0.0.20180925 b/metadata/md5-cache/net-vpn/wireguard-0.0.20180925
deleted file mode 100644
index 5f68887e3bdd..000000000000
--- a/metadata/md5-cache/net-vpn/wireguard-0.0.20180925
+++ /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.20180925.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fa1632ac9dd5c198b03eb99016b0a7f9
diff --git a/metadata/md5-cache/net-vpn/wireguard-0.0.20181006 b/metadata/md5-cache/net-vpn/wireguard-0.0.20181006
new file mode 100644
index 000000000000..4f97652f8217
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/wireguard-0.0.20181006
@@ -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.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-9999 b/metadata/md5-cache/net-vpn/wireguard-9999
index 003b0d95c8ab..1f7b15acc5c2 100644
--- a/metadata/md5-cache/net-vpn/wireguard-9999
+++ b/metadata/md5-cache/net-vpn/wireguard-9999
@@ -7,5 +7,5 @@ IUSE=debug +module +tools module-src kernel_linux kernel_linux module
 LICENSE=GPL-2
 RDEPEND=tools? ( net-libs/libmnl ) module? ( kernel_linux? ( virtual/modutils ) )
 SLOT=0
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f1bf4449d5af16baae1cb24f952e2f1b
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 720bb4637d48..9f8abf0e6502 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.2_rc1-r1 b/metadata/md5-cache/net-wireless/aircrack-ng-1.2_rc1-r1
index 259bc1a85420..38a6201d4fc2 100644
--- a/metadata/md5-cache/net-wireless/aircrack-ng-1.2_rc1-r1
+++ b/metadata/md5-cache/net-wireless/aircrack-ng-1.2_rc1-r1
@@ -10,5 +10,5 @@ RDEPEND=net-libs/libpcap dev-libs/openssl:* netlink? ( dev-libs/libnl:3 ) pcre?
 REQUIRED_USE=airdrop-ng? ( || ( python_targets_python2_7 ) ) airgraph-ng? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=http://download.aircrack-ng.org/aircrack-ng-1.2-rc1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=80e36de495c2e4d08b67db48ffc8ad49
diff --git a/metadata/md5-cache/net-wireless/aircrack-ng-1.4 b/metadata/md5-cache/net-wireless/aircrack-ng-1.4
new file mode 100644
index 000000000000..74663a39db46
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/aircrack-ng-1.4
@@ -0,0 +1,16 @@
+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=net-libs/libpcap sys-apps/hwloc !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 )
+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
+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 sys-apps/hwloc !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 )
+REQUIRED_USE=airdrop-ng? ( || ( python_targets_python2_7 ) ) airgraph-ng? ( || ( python_targets_python2_7 ) )
+SLOT=0
+SRC_URI=https://download.aircrack-ng.org/aircrack-ng-1.4.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_=4bbbe8f7dade031c06dd95605f4562af
diff --git a/metadata/md5-cache/net-wireless/aircrack-ng-9999 b/metadata/md5-cache/net-wireless/aircrack-ng-9999
index 4f19687d779a..6ae6a5c0ab65 100644
--- a/metadata/md5-cache/net-wireless/aircrack-ng-9999
+++ b/metadata/md5-cache/net-wireless/aircrack-ng-9999
@@ -1,14 +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 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=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 )
+DEPEND=net-libs/libpcap sys-apps/hwloc !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 )
 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
 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 )
+RDEPEND=net-libs/libpcap sys-apps/hwloc !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 )
 REQUIRED_USE=airdrop-ng? ( || ( python_targets_python2_7 ) ) airgraph-ng? ( || ( python_targets_python2_7 ) )
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=5130a597d076bbb9e7114e7b28d6e287
+_md5_=87d510038e03d5612368a71fda496f79
diff --git a/metadata/md5-cache/net-wireless/bladerf-2017.12_rc1 b/metadata/md5-cache/net-wireless/bladerf-2017.12_rc1
index df4408e6b732..1f47d5c29148 100644
--- a/metadata/md5-cache/net-wireless/bladerf-2017.12_rc1
+++ b/metadata/md5-cache/net-wireless/bladerf-2017.12_rc1
@@ -10,5 +10,5 @@ PDEPEND=>=net-wireless/bladerf-firmware-2.0.0 >=net-wireless/bladerf-fpga-0.6.0
 RDEPEND=>=dev-libs/libusb-1.0.16 tecla? ( dev-libs/libtecla )
 SLOT=0/2017.12_rc1
 SRC_URI=https://github.com/Nuand/bladeRF/archive/2017.12-rc1.tar.gz -> bladerf-2017.12_rc1.tar.gz
-_eclasses_=cmake-utils	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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=07895438ec0b6898cb493665e0531ae9
diff --git a/metadata/md5-cache/net-wireless/bladerf-2018.08 b/metadata/md5-cache/net-wireless/bladerf-2018.08
index 864533d694f3..dab248f3c5c1 100644
--- a/metadata/md5-cache/net-wireless/bladerf-2018.08
+++ b/metadata/md5-cache/net-wireless/bladerf-2018.08
@@ -10,5 +10,5 @@ PDEPEND=>=net-wireless/bladerf-firmware-2.2.0 >=net-wireless/bladerf-fpga-0.7.3
 RDEPEND=>=dev-libs/libusb-1.0.16 tecla? ( dev-libs/libtecla )
 SLOT=0/2018.08
 SRC_URI=https://github.com/Nuand/bladeRF/archive/2018.08.tar.gz -> bladerf-2018.08.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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4c36384e9bc48092894951d2a373e25d
diff --git a/metadata/md5-cache/net-wireless/bladerf-9999 b/metadata/md5-cache/net-wireless/bladerf-9999
index 31aa97936853..a73a71a905e1 100644
--- a/metadata/md5-cache/net-wireless/bladerf-9999
+++ b/metadata/md5-cache/net-wireless/bladerf-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 PDEPEND=>=net-wireless/bladerf-firmware-2.2.0 >=net-wireless/bladerf-fpga-0.7.3
 RDEPEND=>=dev-libs/libusb-1.0.16 tecla? ( dev-libs/libtecla )
 SLOT=0/9999
-_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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4c36384e9bc48092894951d2a373e25d
diff --git a/metadata/md5-cache/net-wireless/blueberry-1.1.13-r1 b/metadata/md5-cache/net-wireless/blueberry-1.1.13-r1
index bf092de8694e..44163ab72267 100644
--- a/metadata/md5-cache/net-wireless/blueberry-1.1.13-r1
+++ b/metadata/md5-cache/net-wireless/blueberry-1.1.13-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/linuxmint/blueberry/archive/1.1.13.tar.gz -> blueberry-1.1.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=95f6bb35f80cb85f43ac6f063d2395ed
diff --git a/metadata/md5-cache/net-wireless/blueman-2.1_alpha2 b/metadata/md5-cache/net-wireless/blueman-2.1_alpha2
index 07f0ca093e8c..6518ed1daf72 100644
--- a/metadata/md5-cache/net-wireless/blueman-2.1_alpha2
+++ b/metadata/md5-cache/net-wireless/blueman-2.1_alpha2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_pytho
 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/blueman-project/blueman/releases/download/2.1.alpha2/blueman-2.1.alpha2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	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_=a1519b9cffa6a96903b21df838bbff9c
diff --git a/metadata/md5-cache/net-wireless/blueman-9999 b/metadata/md5-cache/net-wireless/blueman-9999
index 3571b0cdfb54..4365b315b2f5 100644
--- a/metadata/md5-cache/net-wireless/blueman-9999
+++ b/metadata/md5-cache/net-wireless/blueman-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-python/pygobject:3[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-wireless/bluez-5:= 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-python/dbus-python[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(+)?] sys-apps/dbus x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] || ( x11-themes/adwaita-icon-theme x11-themes/faenza-icon-theme x11-themes/mate-icon-theme ) appindicator? ( dev-libs/libappindicator:3[introspection] ) network? ( net-firewall/iptables sys-apps/net-tools || ( net-dns/dnsmasq net-misc/dhcp >=net-misc/networkmanager-0.8 ) ) policykit? ( sys-auth/polkit ) pulseaudio? ( media-sound/pulseaudio[bluetooth] ) !net-wireless/gnome-bluetooth
 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_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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_=e5939fc97441f0a4287b1fc45b16c8e6
diff --git a/metadata/md5-cache/net-wireless/bluez-5.50 b/metadata/md5-cache/net-wireless/bluez-5.50
index 76e1a32faca0..ff9b65d943f7 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_=e7b73a6807406dd5cd71e9c3fa35a706
+_md5_=31d77528343992281303686eb93f4a7e
diff --git a/metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.271-r4 b/metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.271-r4
index f3a9f5f92d43..880841919904 100644
--- a/metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.271-r4
+++ b/metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.271-r4
@@ -10,5 +10,5 @@ RDEPEND=kernel_linux? ( virtual/modutils )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=x86? ( https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_271.tar.gz ) amd64? ( https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz ) https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/README_6.30.223.271.txt -> README-broadcom-sta-6.30.223.271.txt
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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_=58f83541e8c5904b78873261f39f9ae6
diff --git a/metadata/md5-cache/net-wireless/chirp-20180906 b/metadata/md5-cache/net-wireless/chirp-20180906
index c3701147f9ef..4cbcc7e34894 100644
--- a/metadata/md5-cache/net-wireless/chirp-20180906
+++ b/metadata/md5-cache/net-wireless/chirp-20180906
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://trac.chirp.danplanet.com/chirp_daily/daily-20180906/chirp-daily-20180906.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f0249f894289cc77f75e11515f4a6bc5
diff --git a/metadata/md5-cache/net-wireless/chirp-99999999 b/metadata/md5-cache/net-wireless/chirp-99999999
index 266696a7f60c..a64fd90d89c1 100644
--- a/metadata/md5-cache/net-wireless/chirp-99999999
+++ b/metadata/md5-cache/net-wireless/chirp-99999999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/libxml2[python] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] radioreference? ( dev-python/suds[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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f0249f894289cc77f75e11515f4a6bc5
diff --git a/metadata/md5-cache/net-wireless/cpyrit-cuda-0.5.0 b/metadata/md5-cache/net-wireless/cpyrit-cuda-0.5.0
index b57e8672c797..85c6fe3c6f15 100644
--- a/metadata/md5-cache/net-wireless/cpyrit-cuda-0.5.0
+++ b/metadata/md5-cache/net-wireless/cpyrit-cuda-0.5.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/openssl:= net-libs/libpcap dev-util/nvidia-cuda-toolkit python_
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/JPaulMora/Pyrit/archive/v0.5.0.tar.gz -> pyrit-0.5.0.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8113f529464e57bb9c09d772df48229e
diff --git a/metadata/md5-cache/net-wireless/cpyrit-opencl-0.5.0 b/metadata/md5-cache/net-wireless/cpyrit-opencl-0.5.0
index 33bd7c34b19f..7950a3f39642 100644
--- a/metadata/md5-cache/net-wireless/cpyrit-opencl-0.5.0
+++ b/metadata/md5-cache/net-wireless/cpyrit-opencl-0.5.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/openssl:= sys-libs/zlib virtual/opencl python_targets_python2_7
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/JPaulMora/Pyrit/archive/v0.5.0.tar.gz -> pyrit-0.5.0.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=efa669a76c6c65b74295a1844099dfed
diff --git a/metadata/md5-cache/net-wireless/cubicsdr-0.2.3-r2 b/metadata/md5-cache/net-wireless/cubicsdr-0.2.3-r2
index df7d516241d0..99549473724e 100644
--- a/metadata/md5-cache/net-wireless/cubicsdr-0.2.3-r2
+++ b/metadata/md5-cache/net-wireless/cubicsdr-0.2.3-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/liquid-dsp x11-libs/wxGTK:3.0-gtk3[opengl] net-wireless/soapysdr virtual/opengl alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio )
 SLOT=0
 SRC_URI=https://github.com/cjcliffe/CubicSDR/archive/0.2.3.tar.gz -> cubicsdr-0.2.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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=729afe2ea3584f8facb561129e052d3f
diff --git a/metadata/md5-cache/net-wireless/cubicsdr-9999 b/metadata/md5-cache/net-wireless/cubicsdr-9999
index 213d27a63026..19d0546089ef 100644
--- a/metadata/md5-cache/net-wireless/cubicsdr-9999
+++ b/metadata/md5-cache/net-wireless/cubicsdr-9999
@@ -7,5 +7,5 @@ IUSE=alsa pulseaudio
 LICENSE=GPL-2
 RDEPEND=net-libs/liquid-dsp x11-libs/wxGTK:3.0-gtk3[opengl] net-wireless/soapysdr virtual/opengl alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio )
 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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=729afe2ea3584f8facb561129e052d3f
diff --git a/metadata/md5-cache/net-wireless/gnome-bluetooth-3.20.1 b/metadata/md5-cache/net-wireless/gnome-bluetooth-3.20.1
index 7c5bf3097ab1..8fe7635f6e7e 100644
--- a/metadata/md5-cache/net-wireless/gnome-bluetooth-3.20.1
+++ b/metadata/md5-cache/net-wireless/gnome-bluetooth-3.20.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+ FDL-1.1+
 RDEPEND=>=dev-libs/glib-2.38:2 media-libs/libcanberra[gtk3] >=x11-libs/gtk+-3.12:3[introspection?] x11-libs/libnotify virtual/udev introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) >=net-wireless/bluez-5
 SLOT=2/13
 SRC_URI=mirror://gnome/sources/gnome-bluetooth/3.20/gnome-bluetooth-3.20.1.tar.xz
-_eclasses_=desktop	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	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=78493f9629a1c5af4f71df22c22310fc
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.6.5.1-r2 b/metadata/md5-cache/net-wireless/gnuradio-3.6.5.1-r2
index d27e6e185899..f7cf4e2b5a97 100644
--- a/metadata/md5-cache/net-wireless/gnuradio-3.6.5.1-r2
+++ b/metadata/md5-cache/net-wireless/gnuradio-3.6.5.1-r2
@@ -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 analog? ( filter ) digital? ( filter analog ) pager? ( filter analog ) uhd? ( filter analog ) fcd? ( || ( alsa oss ) ) wavelet? ( analog )
 SLOT=0/3.6.5.1
 SRC_URI=https://www.gnuradio.org/releases/gnuradio/gnuradio-3.6.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=d7c0fb1173d5b81e3601bf0bce047373
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.7.11-r3 b/metadata/md5-cache/net-wireless/gnuradio-3.7.11-r3
index 47d1d72c165a..3735a2b8abbe 100644
--- a/metadata/md5-cache/net-wireless/gnuradio-3.7.11-r3
+++ b/metadata/md5-cache/net-wireless/gnuradio-3.7.11-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7 audio? ( || ( alsa oss jack portaudio ) )
 RESTRICT=test
 SLOT=0/3.7.11
 SRC_URI=https://www.gnuradio.org/releases/gnuradio/gnuradio-3.7.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2229279ac03cf215e4f9e65e61572c1f
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.7.13.4 b/metadata/md5-cache/net-wireless/gnuradio-3.7.13.4
index cc60ad69c91d..cf4c5adeef97 100644
--- a/metadata/md5-cache/net-wireless/gnuradio-3.7.13.4
+++ b/metadata/md5-cache/net-wireless/gnuradio-3.7.13.4
@@ -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 audio? ( || ( alsa oss jack portaudio ) ) alsa? ( audio ) oss? ( audio ) jack? ( audio ) portaudio? ( audio ) analog? ( filter ) digital? ( filter analog ) dtv? ( fec ) pager? ( filter analog ) qt5? ( filter ) uhd? ( filter analog ) fcd? ( || ( alsa oss ) ) wavelet? ( analog ) wxwidgets? ( filter analog )
 SLOT=0/3.7.13.4
 SRC_URI=https://www.gnuradio.org/releases/gnuradio/gnuradio-3.7.13.4.tar.gz https://dev.gentoo.org/~zerochaos/patches/gnuradio-3.7.13-1-qt5.tar.xz https://dev.gentoo.org/~zerochaos/patches/gnuradio-3.7.13-codec2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8d860592dcb25c5a644505800195eea5
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.7.9999 b/metadata/md5-cache/net-wireless/gnuradio-3.7.9999
index 1fa719651bf5..0c263c688a38 100644
--- a/metadata/md5-cache/net-wireless/gnuradio-3.7.9999
+++ b/metadata/md5-cache/net-wireless/gnuradio-3.7.9999
@@ -8,5 +8,5 @@ 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(+)] >=dev-lang/orc-0.4.12 dev-libs/boost:0=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] !<=dev-libs/boost-1.52.0-r6:0/1.52 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(+)] sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) filter? ( sci-libs/scipy ) grc? ( dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_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/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) jack? ( media-sound/jack-audio-connection-kit ) log? ( dev-libs/log4cpp ) portaudio? ( >=media-libs/portaudio-19_pre ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.9.6:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) utils? ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) vocoder? ( media-sound/gsm ) wavelet? ( >=sci-libs/gsl-1.10 ) wxwidgets? ( 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/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/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) zeromq? ( >=net-libs/zeromq-2.1.11 )
 REQUIRED_USE=python_targets_python2_7 audio? ( || ( alsa oss jack portaudio ) ) alsa? ( audio ) oss? ( audio ) jack? ( audio ) portaudio? ( audio ) analog? ( filter ) digital? ( filter analog ) dtv? ( fec ) pager? ( filter analog ) uhd? ( filter analog ) fcd? ( || ( alsa oss ) ) wavelet? ( analog ) wxwidgets? ( filter analog )
 SLOT=0/3.7.9999
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e387844ab998c931511114ead70bb30f
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.8.9999 b/metadata/md5-cache/net-wireless/gnuradio-3.8.9999
index 2eea6679eae9..d9e8afaee114 100644
--- a/metadata/md5-cache/net-wireless/gnuradio-3.8.9999
+++ b/metadata/md5-cache/net-wireless/gnuradio-3.8.9999
@@ -8,5 +8,5 @@ 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(+)] >=dev-lang/orc-0.4.12 dev-libs/boost:0=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] !<=dev-libs/boost-1.52.0-r6:0/1.52 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/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(+)] sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) filter? ( sci-libs/scipy ) grc? ( dev-python/pygobject:*[cairo(+),python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_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(+)] dev-python/mako[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) jack? ( media-sound/jack-audio-connection-kit ) log? ( dev-libs/log4cpp ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( dev-python/PyQt5[opengl,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_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/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6[qt5(+)] ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.9.6:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) utils? ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) vocoder? ( media-sound/gsm ) wavelet? ( >=sci-libs/gsl-1.10 ) zeromq? ( >=net-libs/zeromq-2.1.11 )
 REQUIRED_USE=python_targets_python2_7 audio? ( || ( alsa oss jack portaudio ) ) alsa? ( audio ) oss? ( audio ) jack? ( audio ) portaudio? ( audio ) analog? ( filter ) digital? ( filter analog ) dtv? ( fec ) pager? ( filter analog ) qt5? ( filter ) uhd? ( filter analog ) fcd? ( || ( alsa oss ) ) wavelet? ( analog ) wxwidgets? ( filter analog )
 SLOT=0/3.8.9999
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9ae0ea855ef1a9fe30ac1deaaf0012ba
diff --git a/metadata/md5-cache/net-wireless/gnuradio-9999 b/metadata/md5-cache/net-wireless/gnuradio-9999
index 093dce53ab16..525c1dabfa30 100644
--- a/metadata/md5-cache/net-wireless/gnuradio-9999
+++ b/metadata/md5-cache/net-wireless/gnuradio-9999
@@ -8,5 +8,5 @@ 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(+)] >=dev-lang/orc-0.4.12 dev-libs/boost:0=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] !<=dev-libs/boost-1.52.0-r6:0/1.52 dev-python/mako[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_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(+)] sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) filter? ( sci-libs/scipy ) grc? ( dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_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/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) jack? ( media-sound/jack-audio-connection-kit ) log? ( dev-libs/log4cpp ) portaudio? ( >=media-libs/portaudio-19_pre ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.9.6:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) utils? ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) vocoder? ( media-sound/gsm ) wavelet? ( >=sci-libs/gsl-1.10 ) wxwidgets? ( 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/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/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) zeromq? ( >=net-libs/zeromq-2.1.11 )
 REQUIRED_USE=python_targets_python2_7 audio? ( || ( alsa oss jack portaudio ) ) alsa? ( audio ) oss? ( audio ) jack? ( audio ) portaudio? ( audio ) analog? ( filter ) digital? ( filter analog ) dtv? ( fec ) pager? ( filter analog ) uhd? ( filter analog ) fcd? ( || ( alsa oss ) ) wavelet? ( analog ) wxwidgets? ( filter analog )
 SLOT=0/9999
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d0f39462efd796620bcc0d23d92fff1f
diff --git a/metadata/md5-cache/net-wireless/gqrx-2.11.5 b/metadata/md5-cache/net-wireless/gqrx-2.11.5
index 201388603c86..bf71b8dea82d 100644
--- a/metadata/md5-cache/net-wireless/gqrx-2.11.5
+++ b/metadata/md5-cache/net-wireless/gqrx-2.11.5
@@ -10,5 +10,5 @@ RDEPEND=>=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter] >=net-wireless/gr-
 REQUIRED_USE=^^ ( pulseaudio portaudio gr-audio )
 SLOT=0
 SRC_URI=https://github.com/csete/gqrx/archive/v2.11.5.tar.gz -> gqrx-2.11.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=6d1e1fa8035a3e17acb331afa457f1f8
diff --git a/metadata/md5-cache/net-wireless/gqrx-9999 b/metadata/md5-cache/net-wireless/gqrx-9999
index 242f3e84d6e8..08c66d4be784 100644
--- a/metadata/md5-cache/net-wireless/gqrx-9999
+++ b/metadata/md5-cache/net-wireless/gqrx-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter] >=net-wireless/gr-osmosdr-0.1.0:= dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 pulseaudio? ( media-sound/pulseaudio:= ) portaudio? ( media-libs/portaudio:= )
 REQUIRED_USE=^^ ( pulseaudio portaudio gr-audio )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6d1e1fa8035a3e17acb331afa457f1f8
diff --git a/metadata/md5-cache/net-wireless/gr-air-modes-9999 b/metadata/md5-cache/net-wireless/gr-air-modes-9999
index af75bb483990..504e2057b917 100644
--- a/metadata/md5-cache/net-wireless/gr-air-modes-9999
+++ b/metadata/md5-cache/net-wireless/gr-air-modes-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=net-wireless/gnuradio-3.7.0:= net-wireless/gr-osmosdr dev-python/pyzmq[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] fgfs? ( sci-libs/scipy games-simulation/flightgear ) rtlsdr? ( net-wireless/rtl-sdr ) uhd? ( >=net-wireless/uhd-3.4.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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_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
-_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5c252edc736a5a696e004fb12f20d3d7
diff --git a/metadata/md5-cache/net-wireless/gr-baz-9999 b/metadata/md5-cache/net-wireless/gr-baz-9999
index cfa64a11b916..f605fdca9f26 100644
--- a/metadata/md5-cache/net-wireless/gr-baz-9999
+++ b/metadata/md5-cache/net-wireless/gr-baz-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/boost[threads,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_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-wireless/gnuradio-3.7.0:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] armadillo? ( sci-libs/armadillo ) rtlsdr? ( virtual/libusb:1 ) uhd? ( net-wireless/uhd[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_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=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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e2397f87cfa83772820dfde29568aa44
diff --git a/metadata/md5-cache/net-wireless/gr-doa-9999 b/metadata/md5-cache/net-wireless/gr-doa-9999
index ad0a51f7323b..8730be27129d 100644
--- a/metadata/md5-cache/net-wireless/gr-doa-9999
+++ b/metadata/md5-cache/net-wireless/gr-doa-9999
@@ -9,5 +9,5 @@ RDEPEND=>=net-wireless/gnuradio-3.7.0:=[python_targets_python2_7(-)?,-python_sin
 REQUIRED_USE=python_targets_python2_7
 RESTRICT=test
 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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b417ca79e689a9716903b3b832966eb1
diff --git a/metadata/md5-cache/net-wireless/gr-foo-9999 b/metadata/md5-cache/net-wireless/gr-foo-9999
index d3a9a7688adf..a592c6ac26a7 100644
--- a/metadata/md5-cache/net-wireless/gr-foo-9999
+++ b/metadata/md5-cache/net-wireless/gr-foo-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=net-wireless/gnuradio-3.7_rc:0=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/boost:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_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-wireless/uhd:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_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=python_targets_python2_7
 SLOT=0/9999
-_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c063cfccf84d6ec61665bd962f8954ef
diff --git a/metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20180402 b/metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20180402
index f538f658948e..7a7922020749 100644
--- a/metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20180402
+++ b/metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20180402
@@ -10,5 +10,5 @@ RDEPEND=>=net-wireless/gnuradio-3.7_rc:0=[python_targets_python2_7(-)?,-python_s
 REQUIRED_USE=python_targets_python2_7
 SLOT=0/0.0_p20180402
 SRC_URI=https://github.com/bastibl/gr-ieee802-15-4/archive/c969b3fd2059472a28dee6f911083dd03d1dd569.tar.gz -> gr-ieee802154-0.0_p20180402.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b8fa4a660396d2da0dc0df1281972dce
diff --git a/metadata/md5-cache/net-wireless/gr-ieee802154-9999 b/metadata/md5-cache/net-wireless/gr-ieee802154-9999
index 25828317b732..4b392a3fe5ca 100644
--- a/metadata/md5-cache/net-wireless/gr-ieee802154-9999
+++ b/metadata/md5-cache/net-wireless/gr-ieee802154-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=net-wireless/gnuradio-3.7_rc:0=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/boost:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_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=python_targets_python2_7
 SLOT=0/9999
-_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b8fa4a660396d2da0dc0df1281972dce
diff --git a/metadata/md5-cache/net-wireless/gr-iio-0.3-r2 b/metadata/md5-cache/net-wireless/gr-iio-0.3-r2
index c0fa91806b2e..92865c0f46ea 100644
--- a/metadata/md5-cache/net-wireless/gr-iio-0.3-r2
+++ b/metadata/md5-cache/net-wireless/gr-iio-0.3-r2
@@ -9,5 +9,5 @@ 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(+)] >=net-wireless/gnuradio-3.7.0:= dev-libs/boost:= net-libs/libiio:= net-libs/libad9361-iio:=
 SLOT=0
 SRC_URI=https://github.com/analogdevicesinc/gr-iio/archive/v0.3.tar.gz -> gr-iio-0.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=9f41931101b8c6f844a2051f82ea5382
diff --git a/metadata/md5-cache/net-wireless/gr-iio-9999 b/metadata/md5-cache/net-wireless/gr-iio-9999
index 3f1643590e28..64502d7431f7 100644
--- a/metadata/md5-cache/net-wireless/gr-iio-9999
+++ b/metadata/md5-cache/net-wireless/gr-iio-9999
@@ -7,5 +7,5 @@ IUSE=python_targets_python2_7
 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(+)] >=net-wireless/gnuradio-3.7.0:= dev-libs/boost:= net-libs/libiio:= net-libs/libad9361-iio:=
 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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9f41931101b8c6f844a2051f82ea5382
diff --git a/metadata/md5-cache/net-wireless/gr-iqbal-0.37.2 b/metadata/md5-cache/net-wireless/gr-iqbal-0.37.2
index d7ca46ca00e2..afacacf1553c 100644
--- a/metadata/md5-cache/net-wireless/gr-iqbal-0.37.2
+++ b/metadata/md5-cache/net-wireless/gr-iqbal-0.37.2
@@ -10,5 +10,5 @@ RDEPEND=>=net-wireless/gnuradio-3.7_rc:0=[python_targets_python2_7(-)?,-python_s
 REQUIRED_USE=python_targets_python2_7
 SLOT=0/0.37.2
 SRC_URI=https://dev.gentoo.org/~zerochaos/distfiles/gr-iqbal-0.37.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=86a03cc6741841791f1106795e762bb4
diff --git a/metadata/md5-cache/net-wireless/gr-iqbal-9999 b/metadata/md5-cache/net-wireless/gr-iqbal-9999
index 3f354228b442..7dbc64669817 100644
--- a/metadata/md5-cache/net-wireless/gr-iqbal-9999
+++ b/metadata/md5-cache/net-wireless/gr-iqbal-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=net-wireless/gnuradio-3.7_rc:0=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] net-libs/libosmo-dsp:= 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_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/9999
-_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=86a03cc6741841791f1106795e762bb4
diff --git a/metadata/md5-cache/net-wireless/gr-osmosdr-0.1.4_p20170612-r1 b/metadata/md5-cache/net-wireless/gr-osmosdr-0.1.4_p20170612-r1
index cbee3af760e4..8184a8c35036 100644
--- a/metadata/md5-cache/net-wireless/gr-osmosdr-0.1.4_p20170612-r1
+++ b/metadata/md5-cache/net-wireless/gr-osmosdr-0.1.4_p20170612-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/0.1.4_p20170612
 SRC_URI=https://dev.gentoo.org/~zerochaos/distfiles/gr-osmosdr-0.1.4_p20170612.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cb0b4e79196eeb4e4a5c13eada10ec90
diff --git a/metadata/md5-cache/net-wireless/gr-osmosdr-0.1.4_p20180626 b/metadata/md5-cache/net-wireless/gr-osmosdr-0.1.4_p20180626
index f58a47ff2a80..b8ddd2f07f21 100644
--- a/metadata/md5-cache/net-wireless/gr-osmosdr-0.1.4_p20180626
+++ b/metadata/md5-cache/net-wireless/gr-osmosdr-0.1.4_p20180626
@@ -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/0.1.4_p20180626
 SRC_URI=https://dev.gentoo.org/~zerochaos/distfiles/gr-osmosdr-0.1.4_p20180626.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=234e11d3768b241c903aa0c9115bbf0a
diff --git a/metadata/md5-cache/net-wireless/gr-osmosdr-0.1.4_p20180626-r1 b/metadata/md5-cache/net-wireless/gr-osmosdr-0.1.4_p20180626-r1
index 48f1c643dd00..d12a8b2fa837 100644
--- a/metadata/md5-cache/net-wireless/gr-osmosdr-0.1.4_p20180626-r1
+++ b/metadata/md5-cache/net-wireless/gr-osmosdr-0.1.4_p20180626-r1
@@ -9,5 +9,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/0.1.4_p20180626
 SRC_URI=https://dev.gentoo.org/~zerochaos/distfiles/gr-osmosdr-0.1.4_p20180626.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a557c287a063e2f9277146e5cd7882a7
diff --git a/metadata/md5-cache/net-wireless/gr-osmosdr-9999 b/metadata/md5-cache/net-wireless/gr-osmosdr-9999
index 970464ec5c4d..6205c4ac76cf 100644
--- a/metadata/md5-cache/net-wireless/gr-osmosdr-9999
+++ b/metadata/md5-cache/net-wireless/gr-osmosdr-9999
@@ -8,5 +8,5 @@ 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(+)] dev-libs/boost:= >=net-wireless/gnuradio-3.7_rc:0=[fcd?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iqbalance? ( net-wireless/gr-iqbal:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) mirisdr? ( net-libs/libmirisdr:= ) rtlsdr? ( >=net-wireless/rtl-sdr-0.5.3:= ) sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr ) uhd? ( net-wireless/uhd:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_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/9999
-_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=234e11d3768b241c903aa0c9115bbf0a
diff --git a/metadata/md5-cache/net-wireless/gr-paint-9999 b/metadata/md5-cache/net-wireless/gr-paint-9999
index e4d8a964c238..e2ac977f0b40 100644
--- a/metadata/md5-cache/net-wireless/gr-paint-9999
+++ b/metadata/md5-cache/net-wireless/gr-paint-9999
@@ -8,5 +8,5 @@ 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(+)] net-wireless/gnuradio:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_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:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_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/imagemagick
 REQUIRED_USE=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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0116f6c7d50a850482af9b2cc35c3da9
diff --git a/metadata/md5-cache/net-wireless/gr-rds-9999 b/metadata/md5-cache/net-wireless/gr-rds-9999
index d011983c343f..fd8952a09a5e 100644
--- a/metadata/md5-cache/net-wireless/gr-rds-9999
+++ b/metadata/md5-cache/net-wireless/gr-rds-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=net-wireless/gnuradio-3.7_rc:0=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/boost:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_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=python_targets_python2_7
 SLOT=0/9999
-_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=71803d67f34b43badc8c1fee4217d4e9
diff --git a/metadata/md5-cache/net-wireless/gr-rftap-9999 b/metadata/md5-cache/net-wireless/gr-rftap-9999
index 1dfee5ba2400..5f16a33a3919 100644
--- a/metadata/md5-cache/net-wireless/gr-rftap-9999
+++ b/metadata/md5-cache/net-wireless/gr-rftap-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=net-wireless/gnuradio-3.7_rc:0=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/boost:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_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=python_targets_python2_7
 SLOT=0/9999
-_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b737507f29742ecb635f002455742c18
diff --git a/metadata/md5-cache/net-wireless/gr-specest-9999 b/metadata/md5-cache/net-wireless/gr-specest-9999
index dbc2b6062d7d..0c9f9c7d1654 100644
--- a/metadata/md5-cache/net-wireless/gr-specest-9999
+++ b/metadata/md5-cache/net-wireless/gr-specest-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=net-wireless/gnuradio-3.7.0:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_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
-_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0821b550f11404e2b840108474873dfe
diff --git a/metadata/md5-cache/net-wireless/hackrf-tools-2017.02.1 b/metadata/md5-cache/net-wireless/hackrf-tools-2017.02.1
index e2093c3aec25..9f43e68ea454 100644
--- a/metadata/md5-cache/net-wireless/hackrf-tools-2017.02.1
+++ b/metadata/md5-cache/net-wireless/hackrf-tools-2017.02.1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND==net-libs/libhackrf-2017.02.1:= sci-libs/fftw:3.0=
 SLOT=0
 SRC_URI=https://github.com/mossmann/hackrf/releases/download/v2017.02.1/hackrf-2017.02.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d584d5b2fab28300824336f71587dbe5
diff --git a/metadata/md5-cache/net-wireless/hackrf-tools-2018.01.1 b/metadata/md5-cache/net-wireless/hackrf-tools-2018.01.1
index 71c2126bfe3b..6514a057e1bd 100644
--- a/metadata/md5-cache/net-wireless/hackrf-tools-2018.01.1
+++ b/metadata/md5-cache/net-wireless/hackrf-tools-2018.01.1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND==net-libs/libhackrf-2018.01.1:= sci-libs/fftw:3.0=
 SLOT=0
 SRC_URI=https://github.com/mossmann/hackrf/releases/download/v2018.01.1/hackrf-2018.01.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bdec2a224ec07e28e2cfd4311fc097d1
diff --git a/metadata/md5-cache/net-wireless/hackrf-tools-9999 b/metadata/md5-cache/net-wireless/hackrf-tools-9999
index b15084352ac8..b160bc1fcafb 100644
--- a/metadata/md5-cache/net-wireless/hackrf-tools-9999
+++ b/metadata/md5-cache/net-wireless/hackrf-tools-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://greatscottgadgets.com/hackrf/
 LICENSE=BSD
 RDEPEND==net-libs/libhackrf-9999:= sci-libs/fftw:3.0=
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d584d5b2fab28300824336f71587dbe5
diff --git a/metadata/md5-cache/net-wireless/inspectrum-0.2.2 b/metadata/md5-cache/net-wireless/inspectrum-0.2.2
index 581300a9339d..3186de34d54a 100644
--- a/metadata/md5-cache/net-wireless/inspectrum-0.2.2
+++ b/metadata/md5-cache/net-wireless/inspectrum-0.2.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=sci-libs/fftw:3.0= dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtcore:5 net-libs/liquid-dsp
 SLOT=0
 SRC_URI=https://github.com/miek/inspectrum/archive/v0.2.2.tar.gz -> inspectrum-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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=c9384862b18c69d3feddc15921959486
diff --git a/metadata/md5-cache/net-wireless/inspectrum-9999 b/metadata/md5-cache/net-wireless/inspectrum-9999
index a439012cf6da..987c16360c53 100644
--- a/metadata/md5-cache/net-wireless/inspectrum-9999
+++ b/metadata/md5-cache/net-wireless/inspectrum-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/miek/inspectrum
 LICENSE=GPL-3+
 RDEPEND=sci-libs/fftw:3.0= dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtcore:5 net-libs/liquid-dsp
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=034736427a143e3b51d78f16232d7c2b
diff --git a/metadata/md5-cache/net-wireless/iwd-0.7 b/metadata/md5-cache/net-wireless/iwd-0.7
index 96d83fe3ed47..da59e8eb0e8e 100644
--- a/metadata/md5-cache/net-wireless/iwd-0.7
+++ b/metadata/md5-cache/net-wireless/iwd-0.7
@@ -9,5 +9,5 @@ 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	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=35c45517a8079fc91dbb08a73b9ea3a6
diff --git a/metadata/md5-cache/net-wireless/iwd-0.8 b/metadata/md5-cache/net-wireless/iwd-0.8
index d40157294d55..550de3a6c4c8 100644
--- a/metadata/md5-cache/net-wireless/iwd-0.8
+++ b/metadata/md5-cache/net-wireless/iwd-0.8
@@ -9,5 +9,5 @@ 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.8.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=61301bf05465b5a10f228f71c6455fe7
diff --git a/metadata/md5-cache/net-wireless/iwd-0.9 b/metadata/md5-cache/net-wireless/iwd-0.9
new file mode 100644
index 000000000000..940cee837687
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/iwd-0.9
@@ -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.9.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-9999 b/metadata/md5-cache/net-wireless/iwd-9999
index f252022a978a..5b2669035c4a 100644
--- a/metadata/md5-cache/net-wireless/iwd-9999
+++ b/metadata/md5-cache/net-wireless/iwd-9999
@@ -7,5 +7,5 @@ IUSE=+client +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3 kernel_l
 LICENSE=GPL-2
 RDEPEND=sys-apps/dbus client? ( sys-libs/readline:0= )
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=61301bf05465b5a10f228f71c6455fe7
diff --git a/metadata/md5-cache/net-wireless/jackit-0.0_p20170918 b/metadata/md5-cache/net-wireless/jackit-0.0_p20170918
index a359698dc731..8ab5c9e5d62a 100644
--- a/metadata/md5-cache/net-wireless/jackit-0.0_p20170918
+++ b/metadata/md5-cache/net-wireless/jackit-0.0_p20170918
@@ -10,5 +10,5 @@ RDEPEND=dev-python/tabulate[python_targets_python2_7(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/insecurityofthings/jackit/archive/1c057fad102af7daad537421d95e2695caeff2b7.tar.gz -> jackit-0.0_p20170918.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6cac288a63f2832f1dbb598044c3bdf7
diff --git a/metadata/md5-cache/net-wireless/linssid-3.6 b/metadata/md5-cache/net-wireless/linssid-3.6
index d2c5218f4a26..8d3fd86fcffa 100644
--- a/metadata/md5-cache/net-wireless/linssid-3.6
+++ b/metadata/md5-cache/net-wireless/linssid-3.6
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=net-wireless/iw x11-libs/libxkbcommon[X] policykit? ( sys-auth/polkit ) !policykit? ( app-admin/sudo x11-libs/gksu ) dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 x11-libs/qwt:6[opengl,qt5(+),svg]
 SLOT=0
 SRC_URI=mirror://sourceforge/linssid/linssid_3.6.orig.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b88bf840143e15521b99cb2e119b0e3c
diff --git a/metadata/md5-cache/net-wireless/lorcon-0.0_p20150109 b/metadata/md5-cache/net-wireless/lorcon-0.0_p20150109
index 3eb557074c14..ec15112d887c 100644
--- a/metadata/md5-cache/net-wireless/lorcon-0.0_p20150109
+++ b/metadata/md5-cache/net-wireless/lorcon-0.0_p20150109
@@ -10,5 +10,5 @@ RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zerochaos/distfiles/lorcon-0.0_p20150109.tar.xz
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=106b33fcddb470284544dbd3b9b7626f
diff --git a/metadata/md5-cache/net-wireless/lorcon-0.0_p20180409-r1 b/metadata/md5-cache/net-wireless/lorcon-0.0_p20180409-r1
index 228697402df4..e660e8b942e9 100644
--- a/metadata/md5-cache/net-wireless/lorcon-0.0_p20180409-r1
+++ b/metadata/md5-cache/net-wireless/lorcon-0.0_p20180409-r1
@@ -10,5 +10,5 @@ RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=https://github.com/kismetwireless/lorcon/archive/d8637792f2e857f31849f29759c1022eb0518c83.tar.gz -> lorcon-0.0_p20180409.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f00c76f34a7c5ef5a0cbee9dacc07477
diff --git a/metadata/md5-cache/net-wireless/lorcon-9999 b/metadata/md5-cache/net-wireless/lorcon-9999
index 62d644eb502c..db6d950524f9 100644
--- a/metadata/md5-cache/net-wireless/lorcon-9999
+++ b/metadata/md5-cache/net-wireless/lorcon-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 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_python2_7(-)] ) dev-libs/libnl:3= net-libs/libpcap
 REQUIRED_USE=python? ( || ( python_targets_python2_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f00c76f34a7c5ef5a0cbee9dacc07477
diff --git a/metadata/md5-cache/net-wireless/madwimax-0.1.1-r1 b/metadata/md5-cache/net-wireless/madwimax-0.1.1-r1
index 7d6a850f657a..3ab2b31195e0 100644
--- a/metadata/md5-cache/net-wireless/madwimax-0.1.1-r1
+++ b/metadata/md5-cache/net-wireless/madwimax-0.1.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libusb:1
 SLOT=0
 SRC_URI=https://madwimax.googlecode.com/files/madwimax-0.1.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac
 _md5_=d3c3d892f5865b3c656203697a0ac0b4
diff --git a/metadata/md5-cache/net-wireless/ndiswrapper-1.61 b/metadata/md5-cache/net-wireless/ndiswrapper-1.61
index 23e950129443..7be260eb8079 100644
--- a/metadata/md5-cache/net-wireless/ndiswrapper-1.61
+++ b/metadata/md5-cache/net-wireless/ndiswrapper-1.61
@@ -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	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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
diff --git a/metadata/md5-cache/net-wireless/osmo-fl2k-0.1.1 b/metadata/md5-cache/net-wireless/osmo-fl2k-0.1.1
index c7be9023fd7f..edbc422c3680 100644
--- a/metadata/md5-cache/net-wireless/osmo-fl2k-0.1.1
+++ b/metadata/md5-cache/net-wireless/osmo-fl2k-0.1.1
@@ -10,5 +10,5 @@ PDEPEND=media-sound/sox sys-apps/pv
 RDEPEND=virtual/libusb:1
 SLOT=0
 SRC_URI=https://git.osmocom.org/osmo-fl2k/snapshot/v0.1.1.tar.gz -> osmo-fl2k-0.1.1.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e3cc55fd56ae9956c36042de19fe36e7
diff --git a/metadata/md5-cache/net-wireless/osmo-fl2k-9999 b/metadata/md5-cache/net-wireless/osmo-fl2k-9999
index 97f4c46eb159..327c448210e4 100644
--- a/metadata/md5-cache/net-wireless/osmo-fl2k-9999
+++ b/metadata/md5-cache/net-wireless/osmo-fl2k-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PDEPEND=media-sound/sox sys-apps/pv
 RDEPEND=virtual/libusb:1
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dce6d84e8f9a80aac0fc61d23f00a327
diff --git a/metadata/md5-cache/net-wireless/pyrit-0.4.0-r1 b/metadata/md5-cache/net-wireless/pyrit-0.4.0-r1
index 66a0cd9c6dd1..5c102cadc980 100644
--- a/metadata/md5-cache/net-wireless/pyrit-0.4.0-r1
+++ b/metadata/md5-cache/net-wireless/pyrit-0.4.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=net-analyzer/scapy-2 opencl? ( net-wireless/cpyrit-opencl ) cuda? ( ne
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/JPaulMora/Pyrit/archive/0.4.0.tar.gz -> pyrit-0.4.0.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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=633c0a7af8aeb2c53a78da93abc1f96b
diff --git a/metadata/md5-cache/net-wireless/pyrit-0.5.0 b/metadata/md5-cache/net-wireless/pyrit-0.5.0
index e18321f6dae5..7cdd0d726a31 100644
--- a/metadata/md5-cache/net-wireless/pyrit-0.5.0
+++ b/metadata/md5-cache/net-wireless/pyrit-0.5.0
@@ -10,5 +10,5 @@ RDEPEND=>=net-analyzer/scapy-2 opencl? ( net-wireless/cpyrit-opencl ) cuda? ( ne
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/JPaulMora/Pyrit/archive/v0.5.0.tar.gz -> pyrit-0.5.0.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fb4e02f37ef561f16772a01329a9cbff
diff --git a/metadata/md5-cache/net-wireless/python-wifi-0.5.0-r3 b/metadata/md5-cache/net-wireless/python-wifi-0.5.0-r3
index d88192ea9cbc..01039f9c6de9 100644
--- a/metadata/md5-cache/net-wireless/python-wifi-0.5.0-r3
+++ b/metadata/md5-cache/net-wireless/python-wifi-0.5.0-r3
@@ -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=mirror://sourceforge/python-wifi.berlios/python-wifi-0.5.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6eb6d030ff0ebfd0e61a1fa46046c1a2
diff --git a/metadata/md5-cache/net-wireless/rfcat-0.0.170508 b/metadata/md5-cache/net-wireless/rfcat-0.0.170508
index 9295877658ac..ae502e48aa8d 100644
--- a/metadata/md5-cache/net-wireless/rfcat-0.0.170508
+++ b/metadata/md5-cache/net-wireless/rfcat-0.0.170508
@@ -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://bitbucket.org/atlas0fd00m/rfcat/downloads/rfcat_170508.tgz https://bitbucket.org/atlas0fd00m/rfcat/downloads/immeSniff-170508.hex https://bitbucket.org/atlas0fd00m/rfcat/downloads/RfCatChronosCCBootloader-170313.hex https://bitbucket.org/atlas0fd00m/rfcat/downloads/RfCatDonsCCBootloader-170313.hex https://bitbucket.org/atlas0fd00m/rfcat/downloads/RfCatYS1CCBootloader-170313.hex
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7053349cb32f2b873534aca77466961d
diff --git a/metadata/md5-cache/net-wireless/rfcat-9999 b/metadata/md5-cache/net-wireless/rfcat-9999
index 81183d133e39..02566586c887 100644
--- a/metadata/md5-cache/net-wireless/rfcat-9999
+++ b/metadata/md5-cache/net-wireless/rfcat-9999
@@ -8,5 +8,5 @@ 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
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c4065c4a91e61f91a10681b7e625f8ae
diff --git a/metadata/md5-cache/net-wireless/rtl-sdr-0.5.3_p20170919 b/metadata/md5-cache/net-wireless/rtl-sdr-0.5.3_p20170919
index a9cb253a960f..2c6cc999f94b 100644
--- a/metadata/md5-cache/net-wireless/rtl-sdr-0.5.3_p20170919
+++ b/metadata/md5-cache/net-wireless/rtl-sdr-0.5.3_p20170919
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libusb:1
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zerochaos/distfiles/rtl-sdr-0.5.3_p20170919.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4d17ce99bde512a60b3f235d4b87cda7
diff --git a/metadata/md5-cache/net-wireless/rtl-sdr-0.5.4 b/metadata/md5-cache/net-wireless/rtl-sdr-0.5.4
index f12d9345f098..59973c84bce1 100644
--- a/metadata/md5-cache/net-wireless/rtl-sdr-0.5.4
+++ b/metadata/md5-cache/net-wireless/rtl-sdr-0.5.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libusb:1
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zerochaos/distfiles/rtl-sdr-0.5.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4d17ce99bde512a60b3f235d4b87cda7
diff --git a/metadata/md5-cache/net-wireless/rtl-sdr-9999 b/metadata/md5-cache/net-wireless/rtl-sdr-9999
index 0bfb4d10be01..3d2a14ed6236 100644
--- a/metadata/md5-cache/net-wireless/rtl-sdr-9999
+++ b/metadata/md5-cache/net-wireless/rtl-sdr-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://sdr.osmocom.org/trac/wiki/rtl-sdr
 LICENSE=GPL-2
 RDEPEND=virtual/libusb:1
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4d17ce99bde512a60b3f235d4b87cda7
diff --git a/metadata/md5-cache/net-wireless/rtl_433-0.1_p20180223 b/metadata/md5-cache/net-wireless/rtl_433-0.1_p20180223
index 7120adcd4a98..6a71563721fd 100644
--- a/metadata/md5-cache/net-wireless/rtl_433-0.1_p20180223
+++ b/metadata/md5-cache/net-wireless/rtl_433-0.1_p20180223
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=net-wireless/rtl-sdr:=
 SLOT=0
 SRC_URI=https://github.com/merbanan/rtl_433/archive/51d275cd08c517d5445b568bf9c2f1b4103bec9f.tar.gz -> rtl_433-0.1_p20180223.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0ed955c7948705dc3f5468cdd8434984
diff --git a/metadata/md5-cache/net-wireless/rtl_433-9999 b/metadata/md5-cache/net-wireless/rtl_433-9999
index 01d315b9dad2..f1d81a9b6dc2 100644
--- a/metadata/md5-cache/net-wireless/rtl_433-9999
+++ b/metadata/md5-cache/net-wireless/rtl_433-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/merbanan/rtl_433
 LICENSE=GPL-2
 RDEPEND=net-wireless/rtl-sdr:=
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6a2cbce3b71fc003ca010ae9db52af91
diff --git a/metadata/md5-cache/net-wireless/soapy_power-1.6.1-r1 b/metadata/md5-cache/net-wireless/soapy_power-1.6.1-r1
index 45d59721f728..8045e2263927 100644
--- a/metadata/md5-cache/net-wireless/soapy_power-1.6.1-r1
+++ b/metadata/md5-cache/net-wireless/soapy_power-1.6.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python3_4(-)?,python_targets_python3_5(-
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/xmikos/soapy_power/archive/v1.6.1.tar.gz -> soapy_power-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=04c61f7c558a62d915b22c3df3f6d1e6
diff --git a/metadata/md5-cache/net-wireless/soapy_power-9999 b/metadata/md5-cache/net-wireless/soapy_power-9999
index 39cbb664f4c3..afd9ec7fd38b 100644
--- a/metadata/md5-cache/net-wireless/soapy_power-9999
+++ b/metadata/md5-cache/net-wireless/soapy_power-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-python/numpy[python_targets_python3_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/simplespectral[python_targets_python3_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/simplesoapy-1.5.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] faster? ( sci-libs/scipy[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) fastest? ( dev-python/pyFFTW[python_targets_python3_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_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=04c61f7c558a62d915b22c3df3f6d1e6
diff --git a/metadata/md5-cache/net-wireless/soapybladerf-0.3.5-r1 b/metadata/md5-cache/net-wireless/soapybladerf-0.3.5-r1
index 05b41c990626..8a03716b72ab 100644
--- a/metadata/md5-cache/net-wireless/soapybladerf-0.3.5-r1
+++ b/metadata/md5-cache/net-wireless/soapybladerf-0.3.5-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=net-wireless/soapysdr <net-wireless/bladerf-2018.0:=
 SLOT=0
 SRC_URI=https://github.com/pothosware/SoapyBladeRF/archive/soapy-bladerf-0.3.5.tar.gz -> soapybladerf-0.3.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=31b1e81c9c62d7e5ad9fc55a4e4226df
diff --git a/metadata/md5-cache/net-wireless/soapybladerf-0.3.5_p20180908 b/metadata/md5-cache/net-wireless/soapybladerf-0.3.5_p20180908
index 0019b99b7e73..730179f1f545 100644
--- a/metadata/md5-cache/net-wireless/soapybladerf-0.3.5_p20180908
+++ b/metadata/md5-cache/net-wireless/soapybladerf-0.3.5_p20180908
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=net-wireless/soapysdr >=net-wireless/bladerf-2018.08:=
 SLOT=0
 SRC_URI=https://github.com/pothosware/SoapyBladeRF/archive/b210241694e0a6e56beddda09fbabcfa8e14be56.tar.gz -> soapybladerf-0.3.5_p20180908.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cc61a98f153f9cda868c6611a7b6d145
diff --git a/metadata/md5-cache/net-wireless/soapybladerf-9999 b/metadata/md5-cache/net-wireless/soapybladerf-9999
index 9d1a8cf89fde..5fbfae8b80ea 100644
--- a/metadata/md5-cache/net-wireless/soapybladerf-9999
+++ b/metadata/md5-cache/net-wireless/soapybladerf-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/pothosware/SoapyBladeRF
 LICENSE=MIT
 RDEPEND=net-wireless/soapysdr >=net-wireless/bladerf-2018.08:=
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bcbb49df88bd3d634462b94ead381dfa
diff --git a/metadata/md5-cache/net-wireless/soapyhackrf-0.3.3 b/metadata/md5-cache/net-wireless/soapyhackrf-0.3.3
index 332504e00052..45c21554fdae 100644
--- a/metadata/md5-cache/net-wireless/soapyhackrf-0.3.3
+++ b/metadata/md5-cache/net-wireless/soapyhackrf-0.3.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=net-wireless/soapysdr net-libs/libhackrf:=
 SLOT=0
 SRC_URI=https://github.com/pothosware/SoapyHackRF/archive/soapy-hackrf-0.3.3.tar.gz -> soapyhackrf-0.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9ef9ecd861297202302513cfeaa3359a
diff --git a/metadata/md5-cache/net-wireless/soapyhackrf-9999 b/metadata/md5-cache/net-wireless/soapyhackrf-9999
index 423e2c412066..343012a4f908 100644
--- a/metadata/md5-cache/net-wireless/soapyhackrf-9999
+++ b/metadata/md5-cache/net-wireless/soapyhackrf-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/pothosware/SoapyHackRF
 LICENSE=MIT
 RDEPEND=net-wireless/soapysdr net-libs/libhackrf:=
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9ef9ecd861297202302513cfeaa3359a
diff --git a/metadata/md5-cache/net-wireless/soapyplutosdr-0.0_p20180825 b/metadata/md5-cache/net-wireless/soapyplutosdr-0.0_p20180825
index 89906615decf..dfba03ec6513 100644
--- a/metadata/md5-cache/net-wireless/soapyplutosdr-0.0_p20180825
+++ b/metadata/md5-cache/net-wireless/soapyplutosdr-0.0_p20180825
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=net-wireless/soapysdr net-libs/libiio:= net-libs/libad9361-iio:=
 SLOT=0
 SRC_URI=https://github.com/pothosware/SoapyPlutoSDR/archive/782650597b18f311cc97fbb7c6813539e6adef16.tar.gz -> soapyplutosdr-0.0_p20180825.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=33bd2b2ddee8d81ddeb6473cf9ea55c2
diff --git a/metadata/md5-cache/net-wireless/soapyplutosdr-9999 b/metadata/md5-cache/net-wireless/soapyplutosdr-9999
index dcc8eca59549..2f7b7c84fe1c 100644
--- a/metadata/md5-cache/net-wireless/soapyplutosdr-9999
+++ b/metadata/md5-cache/net-wireless/soapyplutosdr-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/pothosware/SoapyPlutoSDR
 LICENSE=LGPL-2.1+
 RDEPEND=net-wireless/soapysdr net-libs/libiio:= net-libs/libad9361-iio:=
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=33bd2b2ddee8d81ddeb6473cf9ea55c2
diff --git a/metadata/md5-cache/net-wireless/soapyremote-0.4.3 b/metadata/md5-cache/net-wireless/soapyremote-0.4.3
index d42093d0df0d..2a0bffb123c8 100644
--- a/metadata/md5-cache/net-wireless/soapyremote-0.4.3
+++ b/metadata/md5-cache/net-wireless/soapyremote-0.4.3
@@ -8,5 +8,5 @@ LICENSE=Boost-1.0
 RDEPEND=net-wireless/soapysdr
 SLOT=0
 SRC_URI=https://github.com/pothosware/SoapyRemote/archive/soapy-remote-0.4.3.tar.gz -> soapyremote-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6b8b9111fe70f3948961fe2151a260d5
diff --git a/metadata/md5-cache/net-wireless/soapyremote-9999 b/metadata/md5-cache/net-wireless/soapyremote-9999
index c0b09feeb512..85d6caa81860 100644
--- a/metadata/md5-cache/net-wireless/soapyremote-9999
+++ b/metadata/md5-cache/net-wireless/soapyremote-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/pothosware/SoapyRemote
 LICENSE=Boost-1.0
 RDEPEND=net-wireless/soapysdr
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=24539b86e033e4fb2cecd9792aaac2e9
diff --git a/metadata/md5-cache/net-wireless/soapyrtlsdr-0.2.5 b/metadata/md5-cache/net-wireless/soapyrtlsdr-0.2.5
index 4311145c29c0..3ae928954e62 100644
--- a/metadata/md5-cache/net-wireless/soapyrtlsdr-0.2.5
+++ b/metadata/md5-cache/net-wireless/soapyrtlsdr-0.2.5
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=net-wireless/soapysdr net-wireless/rtl-sdr
 SLOT=0
 SRC_URI=https://github.com/pothosware/SoapyRTLSDR/archive/soapy-rtlsdr-0.2.5.tar.gz -> soapyrtlsdr-0.2.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=998e3dfc40fa95588f78cddcac12c1d1
diff --git a/metadata/md5-cache/net-wireless/soapyrtlsdr-9999 b/metadata/md5-cache/net-wireless/soapyrtlsdr-9999
index aa509ed82e43..ab8b695387dd 100644
--- a/metadata/md5-cache/net-wireless/soapyrtlsdr-9999
+++ b/metadata/md5-cache/net-wireless/soapyrtlsdr-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/pothosware/SoapyRTLSDR
 LICENSE=MIT
 RDEPEND=net-wireless/soapysdr net-wireless/rtl-sdr
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=998e3dfc40fa95588f78cddcac12c1d1
diff --git a/metadata/md5-cache/net-wireless/soapysdr-0.6.1-r1 b/metadata/md5-cache/net-wireless/soapysdr-0.6.1-r1
index 507a4a0c24c2..a45d3ec6e0b9 100644
--- a/metadata/md5-cache/net-wireless/soapysdr-0.6.1-r1
+++ b/metadata/md5-cache/net-wireless/soapysdr-0.6.1-r1
@@ -11,5 +11,5 @@ RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) p
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://github.com/pothosware/SoapySDR/archive/soapy-sdr-0.6.1.tar.gz -> soapysdr-0.6.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=a092e25a445bcb4848b250dc6f88d0eb
diff --git a/metadata/md5-cache/net-wireless/soapysdr-9999 b/metadata/md5-cache/net-wireless/soapysdr-9999
index 1edc2b9254c4..f53f04b8baba 100644
--- a/metadata/md5-cache/net-wireless/soapysdr-9999
+++ b/metadata/md5-cache/net-wireless/soapysdr-9999
@@ -9,5 +9,5 @@ PDEPEND=bladerf? ( net-wireless/soapybladerf ) hackrf? ( net-wireless/soapyhackr
 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(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=f23c9526ae7f16416850125eff84c52a
diff --git a/metadata/md5-cache/net-wireless/soapysdrplay-0.1.0 b/metadata/md5-cache/net-wireless/soapysdrplay-0.1.0
index b3935a8c7468..e17e64dd3de6 100644
--- a/metadata/md5-cache/net-wireless/soapysdrplay-0.1.0
+++ b/metadata/md5-cache/net-wireless/soapysdrplay-0.1.0
@@ -8,5 +8,5 @@ LICENSE=Boost-1.0
 RDEPEND=net-wireless/soapysdr net-wireless/sdrplay
 SLOT=0
 SRC_URI=https://github.com/pothosware/SoapySDRPlay/archive/soapy-sdrplay-0.1.0.tar.gz -> soapysdrplay-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b157241c457d842a114fc8e779518002
diff --git a/metadata/md5-cache/net-wireless/soapysdrplay-9999 b/metadata/md5-cache/net-wireless/soapysdrplay-9999
index 4fe0e9fea0f8..24ed9603dd88 100644
--- a/metadata/md5-cache/net-wireless/soapysdrplay-9999
+++ b/metadata/md5-cache/net-wireless/soapysdrplay-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/pothosware/SoapySDRPlay
 LICENSE=Boost-1.0
 RDEPEND=net-wireless/soapysdr net-wireless/sdrplay
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b157241c457d842a114fc8e779518002
diff --git a/metadata/md5-cache/net-wireless/soapyuhd-0.3.4 b/metadata/md5-cache/net-wireless/soapyuhd-0.3.4
index f2dd1b03f028..a2b498a28c0f 100644
--- a/metadata/md5-cache/net-wireless/soapyuhd-0.3.4
+++ b/metadata/md5-cache/net-wireless/soapyuhd-0.3.4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=net-wireless/soapysdr net-wireless/uhd:= dev-libs/boost:=
 SLOT=0
 SRC_URI=https://github.com/pothosware/SoapyUHD/archive/soapy-uhd-0.3.4.tar.gz -> soapyuhd-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=af69da1209aa7d3a0621e764916a2acc
diff --git a/metadata/md5-cache/net-wireless/soapyuhd-9999 b/metadata/md5-cache/net-wireless/soapyuhd-9999
index f2cd68313edb..052a0cae4164 100644
--- a/metadata/md5-cache/net-wireless/soapyuhd-9999
+++ b/metadata/md5-cache/net-wireless/soapyuhd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/pothosware/SoapyUHD
 LICENSE=MIT
 RDEPEND=net-wireless/soapysdr net-wireless/uhd:= dev-libs/boost:=
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=af69da1209aa7d3a0621e764916a2acc
diff --git a/metadata/md5-cache/net-wireless/ubertooth-2017.03.2-r1 b/metadata/md5-cache/net-wireless/ubertooth-2017.03.2-r1
index 02385c59bb2d..fd58a1a0a8ee 100644
--- a/metadata/md5-cache/net-wireless/ubertooth-2017.03.2-r1
+++ b/metadata/md5-cache/net-wireless/ubertooth-2017.03.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=bluez? ( net-wireless/bluez:= ) >=net-libs/libbtbb-2017.03.2:=[static-libs?] static-libs? ( dev-libs/libusb[static-libs] ) virtual/libusb:1= udev? ( virtual/udev )
 SLOT=0
 SRC_URI=https://github.com/greatscottgadgets/ubertooth/releases/download/2017-03-R2/ubertooth-2017-03-R2.tar.xz
-_eclasses_=cmake-utils	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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4455f7e4254d7bd638fe5f44be7e9909
diff --git a/metadata/md5-cache/net-wireless/ubertooth-2018.08.1 b/metadata/md5-cache/net-wireless/ubertooth-2018.08.1
index ebc312aca319..45e4b11184a9 100644
--- a/metadata/md5-cache/net-wireless/ubertooth-2018.08.1
+++ b/metadata/md5-cache/net-wireless/ubertooth-2018.08.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=bluez? ( net-wireless/bluez:= ) >=net-libs/libbtbb-2018.08.1:=[static-libs?] static-libs? ( dev-libs/libusb[static-libs] ) virtual/libusb:1= udev? ( virtual/udev )
 SLOT=0
 SRC_URI=https://github.com/greatscottgadgets/ubertooth/releases/download/2018-08-R1/ubertooth-2018-08-R1.tar.xz
-_eclasses_=cmake-utils	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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4455f7e4254d7bd638fe5f44be7e9909
diff --git a/metadata/md5-cache/net-wireless/ubertooth-9999 b/metadata/md5-cache/net-wireless/ubertooth-9999
index 6bd7797d9a4b..d88a1ab67bb1 100644
--- a/metadata/md5-cache/net-wireless/ubertooth-9999
+++ b/metadata/md5-cache/net-wireless/ubertooth-9999
@@ -7,5 +7,5 @@ IUSE=+bluez static-libs +ubertooth1-firmware +udev
 LICENSE=GPL-2
 RDEPEND=bluez? ( net-wireless/bluez:= ) >=net-libs/libbtbb-9999:=[static-libs?] static-libs? ( dev-libs/libusb[static-libs] ) virtual/libusb:1= udev? ( virtual/udev )
 SLOT=0
-_eclasses_=cmake-utils	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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4455f7e4254d7bd638fe5f44be7e9909
diff --git a/metadata/md5-cache/net-wireless/uhd-3.10.3.0 b/metadata/md5-cache/net-wireless/uhd-3.10.3.0
index c8761bf16efd..a0d66b12e94b 100644
--- a/metadata/md5-cache/net-wireless/uhd-3.10.3.0
+++ b/metadata/md5-cache/net-wireless/uhd-3.10.3.0
@@ -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/1
 SRC_URI=https://github.com/EttusResearch/uhd/archive/release_003_010_003_000.tar.gz -> EttusResearch-UHD-3.10.3.0.tar.gz http://files.ettus.com/binaries/images/uhd-images_003.010.003.000-release.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=424497cf815020e0e8c5113769d73e26
diff --git a/metadata/md5-cache/net-wireless/uhd-3.11.0.0 b/metadata/md5-cache/net-wireless/uhd-3.11.0.0
index 6773309c6f6e..0eb6143ec486 100644
--- a/metadata/md5-cache/net-wireless/uhd-3.11.0.0
+++ b/metadata/md5-cache/net-wireless/uhd-3.11.0.0
@@ -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 b100? ( usb ) b200? ( usb ) usrp1? ( usb ) usrp2? ( usb ) || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )
 SLOT=0/3.11
 SRC_URI=https://github.com/EttusResearch/uhd/archive/release_003_011_000_000.tar.gz -> EttusResearch-UHD-3.11.0.0.tar.gz https://github.com/EttusResearch/uhd/releases/download/release_003_011_000_000/uhd_3.11.0.0_images.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1ac212cf068afbbd13d99e9fc6f1b12c
diff --git a/metadata/md5-cache/net-wireless/uhd-3.12.0.0 b/metadata/md5-cache/net-wireless/uhd-3.12.0.0
index bb79b8ded82d..dbfc2395556a 100644
--- a/metadata/md5-cache/net-wireless/uhd-3.12.0.0
+++ b/metadata/md5-cache/net-wireless/uhd-3.12.0.0
@@ -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 b100? ( usb ) b200? ( usb ) usrp1? ( usb ) usrp2? ( usb ) || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )
 SLOT=0/3.12
 SRC_URI=https://github.com/EttusResearch/uhd/archive/v3.12.0.0.tar.gz -> EttusResearch-UHD-3.12.0.0.tar.gz https://github.com/EttusResearch/uhd/releases/download/v3.12.0.0/uhd-images_3.12.0.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c77a8584e45df109c75e0c87a8ae95c9
diff --git a/metadata/md5-cache/net-wireless/uhd-3.13.0.1 b/metadata/md5-cache/net-wireless/uhd-3.13.0.1
index 62dfd5fdf54d..68f099f202f2 100644
--- a/metadata/md5-cache/net-wireless/uhd-3.13.0.1
+++ b/metadata/md5-cache/net-wireless/uhd-3.13.0.1
@@ -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 b100? ( usb ) b200? ( usb ) usrp1? ( usb ) usrp2? ( usb ) || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )
 SLOT=0/3.13
 SRC_URI=https://github.com/EttusResearch/uhd/archive/v3.13.0.1.tar.gz -> EttusResearch-UHD-3.13.0.1.tar.gz https://github.com/EttusResearch/uhd/releases/download/v3.13.0.1/uhd-images_3.13.0.1.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c77a8584e45df109c75e0c87a8ae95c9
diff --git a/metadata/md5-cache/net-wireless/urh-1.5.5 b/metadata/md5-cache/net-wireless/urh-1.5.5
index 8c2e8d14a7bf..b935b9118611 100644
--- a/metadata/md5-cache/net-wireless/urh-1.5.5
+++ b/metadata/md5-cache/net-wireless/urh-1.5.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/jopohl/urh/archive/v1.5.5.tar.gz -> urh-1.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=73bb47b3942cf53f54e98fc15da1c20e
diff --git a/metadata/md5-cache/net-wireless/urh-1.6.2.6 b/metadata/md5-cache/net-wireless/urh-1.6.2.6
index 8417c12f76ab..29b436ef1842 100644
--- a/metadata/md5-cache/net-wireless/urh-1.6.2.6
+++ b/metadata/md5-cache/net-wireless/urh-1.6.2.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/jopohl/urh/archive/v1.6.2.6.tar.gz -> urh-1.6.2.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=28fc2ac1d1d09442fb36b79c201572e0
diff --git a/metadata/md5-cache/net-wireless/urh-1.6.4.1 b/metadata/md5-cache/net-wireless/urh-1.6.4.1
index f591c6f3d948..583cb1f544e7 100644
--- a/metadata/md5-cache/net-wireless/urh-1.6.4.1
+++ b/metadata/md5-cache/net-wireless/urh-1.6.4.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/jopohl/urh/archive/v1.6.4.1.tar.gz -> urh-1.6.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ab5c4bbf8ebd6e073d1e5f15c7072dd7
diff --git a/metadata/md5-cache/ros-meta/Manifest.gz b/metadata/md5-cache/ros-meta/Manifest.gz
index e3807cece0ad..0755292d40a8 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/audio_common-0.3.1 b/metadata/md5-cache/ros-meta/audio_common-0.3.1
index 8e0313e1f3e3..d8a73d8d0d15 100644
--- a/metadata/md5-cache/ros-meta/audio_common-0.3.1
+++ b/metadata/md5-cache/ros-meta/audio_common-0.3.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/audio_capture dev-ros/audio_common_msgs dev-ros/audio_play dev-r
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.1.tar.gz -> audio_common-0.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d1179cb11e1862cae1bbe86f027a2e5b
diff --git a/metadata/md5-cache/ros-meta/audio_common-0.3.2 b/metadata/md5-cache/ros-meta/audio_common-0.3.2
index e810025cb468..6f1b6495e8e1 100644
--- a/metadata/md5-cache/ros-meta/audio_common-0.3.2
+++ b/metadata/md5-cache/ros-meta/audio_common-0.3.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/audio_capture dev-ros/audio_common_msgs dev-ros/audio_play dev-r
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.2.tar.gz -> audio_common-0.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=809d417aee1fb635c2dbf1c1471cdbde
diff --git a/metadata/md5-cache/ros-meta/audio_common-0.3.3 b/metadata/md5-cache/ros-meta/audio_common-0.3.3
index f6bed810396b..f77a5607ac22 100644
--- a/metadata/md5-cache/ros-meta/audio_common-0.3.3
+++ b/metadata/md5-cache/ros-meta/audio_common-0.3.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/audio_capture dev-ros/audio_common_msgs dev-ros/audio_play dev-r
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.3.tar.gz -> audio_common-0.3.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=809d417aee1fb635c2dbf1c1471cdbde
diff --git a/metadata/md5-cache/ros-meta/audio_common-9999 b/metadata/md5-cache/ros-meta/audio_common-9999
index 52b9ce5e4727..0baed068bf30 100644
--- a/metadata/md5-cache/ros-meta/audio_common-9999
+++ b/metadata/md5-cache/ros-meta/audio_common-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/audio_capture dev-ros/audio_common_msgs dev-ros/audio_play dev-ros/sound_play python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=74e4e209f1b4fe3d64cdff3f800d43a7
diff --git a/metadata/md5-cache/ros-meta/bond_core-1.8.2 b/metadata/md5-cache/ros-meta/bond_core-1.8.2
index 2d355170b546..d3bb265ad4a5 100644
--- a/metadata/md5-cache/ros-meta/bond_core-1.8.2
+++ b/metadata/md5-cache/ros-meta/bond_core-1.8.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/bond dev-ros/bondcpp dev-ros/bondpy dev-ros/smclib dev-ros/test_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.8.2.tar.gz -> bond_core-1.8.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=98c2c95d19c76be6da198005512ad870
diff --git a/metadata/md5-cache/ros-meta/bond_core-1.8.3 b/metadata/md5-cache/ros-meta/bond_core-1.8.3
index b6de32514c36..de09cce20103 100644
--- a/metadata/md5-cache/ros-meta/bond_core-1.8.3
+++ b/metadata/md5-cache/ros-meta/bond_core-1.8.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/bond dev-ros/bondcpp dev-ros/bondpy dev-ros/smclib dev-ros/test_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.8.3.tar.gz -> bond_core-1.8.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=98c2c95d19c76be6da198005512ad870
diff --git a/metadata/md5-cache/ros-meta/bond_core-9999 b/metadata/md5-cache/ros-meta/bond_core-9999
index b571a2f5f00d..577c62130c5c 100644
--- a/metadata/md5-cache/ros-meta/bond_core-9999
+++ b/metadata/md5-cache/ros-meta/bond_core-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/bond dev-ros/bondcpp dev-ros/bondpy dev-ros/smclib dev-ros/test_bond python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=9caa8a8b8be7f21dab64e7e9c33fb05e
diff --git a/metadata/md5-cache/ros-meta/calibration-0.10.13 b/metadata/md5-cache/ros-meta/calibration-0.10.13
index d5be6c114e70..90b2aa404aa3 100644
--- a/metadata/md5-cache/ros-meta/calibration-0.10.13
+++ b/metadata/md5-cache/ros-meta/calibration-0.10.13
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/calibration_estimation dev-ros/calibration_launch dev-ros/calibr
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.13.tar.gz -> calibration-0.10.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5e91c615a9de7e92ea1c84438dd132d8
diff --git a/metadata/md5-cache/ros-meta/calibration-0.10.14 b/metadata/md5-cache/ros-meta/calibration-0.10.14
index 4b060bf3f8d2..cec219a9331c 100644
--- a/metadata/md5-cache/ros-meta/calibration-0.10.14
+++ b/metadata/md5-cache/ros-meta/calibration-0.10.14
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/calibration_estimation dev-ros/calibration_launch dev-ros/calibr
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5e91c615a9de7e92ea1c84438dd132d8
diff --git a/metadata/md5-cache/ros-meta/calibration-9999 b/metadata/md5-cache/ros-meta/calibration-9999
index 987b084ca83c..830a45217ceb 100644
--- a/metadata/md5-cache/ros-meta/calibration-9999
+++ b/metadata/md5-cache/ros-meta/calibration-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/calibration_estimation dev-ros/calibration_launch dev-ros/calibration_msgs dev-ros/calibration_setup_helper dev-ros/image_cb_detector dev-ros/interval_intersection dev-ros/joint_states_settler dev-ros/laser_cb_detector dev-ros/monocam_settler dev-ros/settlerlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=5e91c615a9de7e92ea1c84438dd132d8
diff --git a/metadata/md5-cache/ros-meta/common_msgs-1.12.3 b/metadata/md5-cache/ros-meta/common_msgs-1.12.3
index 3d57d4d7bca3..40491d27692d 100644
--- a/metadata/md5-cache/ros-meta/common_msgs-1.12.3
+++ b/metadata/md5-cache/ros-meta/common_msgs-1.12.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/actionlib_msgs dev-ros/diagnostic_msgs dev-ros/geometry_msgs dev
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.12.3.tar.gz -> common_msgs-1.12.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0a3136da1c72d0c88fc2133695cb8efa
diff --git a/metadata/md5-cache/ros-meta/common_msgs-1.12.4 b/metadata/md5-cache/ros-meta/common_msgs-1.12.4
index 00d58de3536f..26386506b005 100644
--- a/metadata/md5-cache/ros-meta/common_msgs-1.12.4
+++ b/metadata/md5-cache/ros-meta/common_msgs-1.12.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/actionlib_msgs dev-ros/diagnostic_msgs dev-ros/geometry_msgs dev
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.12.4.tar.gz -> common_msgs-1.12.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0a3136da1c72d0c88fc2133695cb8efa
diff --git a/metadata/md5-cache/ros-meta/common_msgs-1.12.5 b/metadata/md5-cache/ros-meta/common_msgs-1.12.5
index 5212d73d1e82..8a7e260fedcc 100644
--- a/metadata/md5-cache/ros-meta/common_msgs-1.12.5
+++ b/metadata/md5-cache/ros-meta/common_msgs-1.12.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/actionlib_msgs dev-ros/diagnostic_msgs dev-ros/geometry_msgs dev
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.12.5.tar.gz -> common_msgs-1.12.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bc74b448edfaf347fbf61dc5ab6f81e9
diff --git a/metadata/md5-cache/ros-meta/common_msgs-1.12.6 b/metadata/md5-cache/ros-meta/common_msgs-1.12.6
index de5d5a26fb97..9993451354d7 100644
--- a/metadata/md5-cache/ros-meta/common_msgs-1.12.6
+++ b/metadata/md5-cache/ros-meta/common_msgs-1.12.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/actionlib_msgs dev-ros/diagnostic_msgs dev-ros/geometry_msgs dev
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.12.6.tar.gz -> common_msgs-1.12.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6e23fb73ae512fcc83178c51714abb5b
diff --git a/metadata/md5-cache/ros-meta/common_msgs-9999 b/metadata/md5-cache/ros-meta/common_msgs-9999
index 61a68680ab47..fc5766a31752 100644
--- a/metadata/md5-cache/ros-meta/common_msgs-9999
+++ b/metadata/md5-cache/ros-meta/common_msgs-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/actionlib_msgs dev-ros/diagnostic_msgs dev-ros/geometry_msgs dev-ros/nav_msgs dev-ros/sensor_msgs dev-ros/shape_msgs dev-ros/stereo_msgs dev-ros/trajectory_msgs dev-ros/visualization_msgs python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=0a3136da1c72d0c88fc2133695cb8efa
diff --git a/metadata/md5-cache/ros-meta/common_tutorials-0.1.10 b/metadata/md5-cache/ros-meta/common_tutorials-0.1.10
index bc322a9ad55b..579272570daf 100644
--- a/metadata/md5-cache/ros-meta/common_tutorials-0.1.10
+++ b/metadata/md5-cache/ros-meta/common_tutorials-0.1.10
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/actionlib_tutorials dev-ros/nodelet_tutorial_math dev-ros/plugin
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/common_tutorials/archive/0.1.10.tar.gz -> common_tutorials-0.1.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2ec68b048080e7ed973032f8889c9902
diff --git a/metadata/md5-cache/ros-meta/common_tutorials-0.1.11 b/metadata/md5-cache/ros-meta/common_tutorials-0.1.11
index beca68686c0e..fea9c40c4bd5 100644
--- a/metadata/md5-cache/ros-meta/common_tutorials-0.1.11
+++ b/metadata/md5-cache/ros-meta/common_tutorials-0.1.11
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/actionlib_tutorials dev-ros/nodelet_tutorial_math dev-ros/plugin
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/common_tutorials/archive/0.1.11.tar.gz -> common_tutorials-0.1.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4bb9c69c27ef96cf395e1b3974681e34
diff --git a/metadata/md5-cache/ros-meta/common_tutorials-0.1.8 b/metadata/md5-cache/ros-meta/common_tutorials-0.1.8
index 0208e122edaa..4ff8e7025aff 100644
--- a/metadata/md5-cache/ros-meta/common_tutorials-0.1.8
+++ b/metadata/md5-cache/ros-meta/common_tutorials-0.1.8
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/actionlib_tutorials dev-ros/nodelet_tutorial_math dev-ros/plugin
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/common_tutorials/archive/0.1.8.tar.gz -> common_tutorials-0.1.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=dcda6fd86d0b60025bca2118045f546b
diff --git a/metadata/md5-cache/ros-meta/common_tutorials-9999 b/metadata/md5-cache/ros-meta/common_tutorials-9999
index 5c876bb1ac2b..f3641119ff70 100644
--- a/metadata/md5-cache/ros-meta/common_tutorials-9999
+++ b/metadata/md5-cache/ros-meta/common_tutorials-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/actionlib_tutorials dev-ros/nodelet_tutorial_math dev-ros/pluginlib_tutorials dev-ros/turtle_actionlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=dcda6fd86d0b60025bca2118045f546b
diff --git a/metadata/md5-cache/ros-meta/desktop-1.4.0 b/metadata/md5-cache/ros-meta/desktop-1.4.0
index 70ed956eb388..404fbb84baaa 100644
--- a/metadata/md5-cache/ros-meta/desktop-1.4.0
+++ b/metadata/md5-cache/ros-meta/desktop-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=ros-meta/robot ros-meta/viz dev-ros/angles ros-meta/common_tutorials ros
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/metapackages/archive/1.4.0.tar.gz -> metapackages-1.4.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=aa61b13f15c0356c0047639e2cced2f5
diff --git a/metadata/md5-cache/ros-meta/desktop-1.4.1 b/metadata/md5-cache/ros-meta/desktop-1.4.1
index 73ac79063730..a8d599949f15 100644
--- a/metadata/md5-cache/ros-meta/desktop-1.4.1
+++ b/metadata/md5-cache/ros-meta/desktop-1.4.1
@@ -10,5 +10,5 @@ RDEPEND=ros-meta/robot ros-meta/viz dev-ros/angles ros-meta/common_tutorials ros
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/metapackages/archive/1.4.1.tar.gz -> metapackages-1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=aa61b13f15c0356c0047639e2cced2f5
diff --git a/metadata/md5-cache/ros-meta/desktop-9999 b/metadata/md5-cache/ros-meta/desktop-9999
index c09b0771978a..1037501a2b2d 100644
--- a/metadata/md5-cache/ros-meta/desktop-9999
+++ b/metadata/md5-cache/ros-meta/desktop-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=ros-meta/robot ros-meta/viz dev-ros/angles ros-meta/common_tutorials ros-meta/geometry_tutorials ros-meta/ros_tutorials dev-ros/roslint dev-ros/urdf_tutorial ros-meta/visualization_tutorials python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=aa61b13f15c0356c0047639e2cced2f5
diff --git a/metadata/md5-cache/ros-meta/desktop_full-1.4.0 b/metadata/md5-cache/ros-meta/desktop_full-1.4.0
index 1f7abce2b6cc..4e58c30aabe9 100644
--- a/metadata/md5-cache/ros-meta/desktop_full-1.4.0
+++ b/metadata/md5-cache/ros-meta/desktop_full-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=ros-meta/desktop ros-meta/perception ros-meta/simulators dev-ros/urdf_tu
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/metapackages/archive/1.4.0.tar.gz -> metapackages-1.4.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=925382c42c81e47395b6a441507f1b35
diff --git a/metadata/md5-cache/ros-meta/desktop_full-1.4.1 b/metadata/md5-cache/ros-meta/desktop_full-1.4.1
index e1271332dcc6..60d7f189bcc9 100644
--- a/metadata/md5-cache/ros-meta/desktop_full-1.4.1
+++ b/metadata/md5-cache/ros-meta/desktop_full-1.4.1
@@ -10,5 +10,5 @@ RDEPEND=ros-meta/desktop ros-meta/perception ros-meta/simulators dev-ros/urdf_tu
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/metapackages/archive/1.4.1.tar.gz -> metapackages-1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=925382c42c81e47395b6a441507f1b35
diff --git a/metadata/md5-cache/ros-meta/desktop_full-9999 b/metadata/md5-cache/ros-meta/desktop_full-9999
index 5c8b95ee2fda..a0946be0ce80 100644
--- a/metadata/md5-cache/ros-meta/desktop_full-9999
+++ b/metadata/md5-cache/ros-meta/desktop_full-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=ros-meta/desktop ros-meta/perception ros-meta/simulators dev-ros/urdf_tutorial python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=925382c42c81e47395b6a441507f1b35
diff --git a/metadata/md5-cache/ros-meta/diagnostics-1.8.10 b/metadata/md5-cache/ros-meta/diagnostics-1.8.10
index 08e7bfccd809..e8e2acbdd620 100644
--- a/metadata/md5-cache/ros-meta/diagnostics-1.8.10
+++ b/metadata/md5-cache/ros-meta/diagnostics-1.8.10
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_analysis dev-ros/diagno
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.8.10.tar.gz -> diagnostics-1.8.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=95495f744d8e51f57c57c66efb434835
diff --git a/metadata/md5-cache/ros-meta/diagnostics-1.8.8 b/metadata/md5-cache/ros-meta/diagnostics-1.8.8
index f9fd317cb56b..a50240cf1b6b 100644
--- a/metadata/md5-cache/ros-meta/diagnostics-1.8.8
+++ b/metadata/md5-cache/ros-meta/diagnostics-1.8.8
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_analysis dev-ros/diagno
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.8.8.tar.gz -> diagnostics-1.8.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=294eb7260d6b1feec899daf513b94762
diff --git a/metadata/md5-cache/ros-meta/diagnostics-1.8.9 b/metadata/md5-cache/ros-meta/diagnostics-1.8.9
index 41495746edfc..2a033602acf2 100644
--- a/metadata/md5-cache/ros-meta/diagnostics-1.8.9
+++ b/metadata/md5-cache/ros-meta/diagnostics-1.8.9
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_analysis dev-ros/diagno
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.8.9.tar.gz -> diagnostics-1.8.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=294eb7260d6b1feec899daf513b94762
diff --git a/metadata/md5-cache/ros-meta/diagnostics-1.9.0 b/metadata/md5-cache/ros-meta/diagnostics-1.9.0
index e0d4df7639a5..6d4ac51a119c 100644
--- a/metadata/md5-cache/ros-meta/diagnostics-1.9.0
+++ b/metadata/md5-cache/ros-meta/diagnostics-1.9.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_analysis dev-ros/diagno
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.0.tar.gz -> diagnostics-1.9.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9ac9ba8aa3e42b28e262fd7167e87626
diff --git a/metadata/md5-cache/ros-meta/diagnostics-1.9.2 b/metadata/md5-cache/ros-meta/diagnostics-1.9.2
index c01a9d131406..b3efa73c9604 100644
--- a/metadata/md5-cache/ros-meta/diagnostics-1.9.2
+++ b/metadata/md5-cache/ros-meta/diagnostics-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_analysis dev-ros/diagno
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.2.tar.gz -> diagnostics-1.9.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=9ac9ba8aa3e42b28e262fd7167e87626
diff --git a/metadata/md5-cache/ros-meta/diagnostics-1.9.3 b/metadata/md5-cache/ros-meta/diagnostics-1.9.3
index 3067168c1c7b..75eebcdae7a6 100644
--- a/metadata/md5-cache/ros-meta/diagnostics-1.9.3
+++ b/metadata/md5-cache/ros-meta/diagnostics-1.9.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_analysis dev-ros/diagno
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.3.tar.gz -> diagnostics-1.9.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f0417aa25a80821135c4bfe8b722eaac
diff --git a/metadata/md5-cache/ros-meta/diagnostics-9999 b/metadata/md5-cache/ros-meta/diagnostics-9999
index d834868f1d5b..d2ffce65ed22 100644
--- a/metadata/md5-cache/ros-meta/diagnostics-9999
+++ b/metadata/md5-cache/ros-meta/diagnostics-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_analysis dev-ros/diagnostic_common_diagnostics dev-ros/diagnostic_updater dev-ros/rosdiagnostic dev-ros/self_test dev-ros/test_diagnostic_aggregator python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=9ac9ba8aa3e42b28e262fd7167e87626
diff --git a/metadata/md5-cache/ros-meta/driver_common-1.6.8 b/metadata/md5-cache/ros-meta/driver_common-1.6.8
index 1fac3b0c80b8..e3534fc29de3 100644
--- a/metadata/md5-cache/ros-meta/driver_common-1.6.8
+++ b/metadata/md5-cache/ros-meta/driver_common-1.6.8
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/driver_base dev-ros/timestamp_tools python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/driver_common/archive/1.6.8.tar.gz -> driver_common-1.6.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6836bcfd94f52f2dfdfbdac0f0ed87c4
diff --git a/metadata/md5-cache/ros-meta/driver_common-9999 b/metadata/md5-cache/ros-meta/driver_common-9999
index 0d58604442a0..d4942c26c8d4 100644
--- a/metadata/md5-cache/ros-meta/driver_common-9999
+++ b/metadata/md5-cache/ros-meta/driver_common-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/driver_base dev-ros/timestamp_tools python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=6836bcfd94f52f2dfdfbdac0f0ed87c4
diff --git a/metadata/md5-cache/ros-meta/executive_smach-2.0.0 b/metadata/md5-cache/ros-meta/executive_smach-2.0.0
index 802050487b4a..6ce08725afe7 100644
--- a/metadata/md5-cache/ros-meta/executive_smach-2.0.0
+++ b/metadata/md5-cache/ros-meta/executive_smach-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/smach dev-ros/smach_ros dev-ros/smach_msgs python_targets_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/executive_smach/archive/2.0.0.tar.gz -> executive_smach-2.0.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ab42b7d478d0a6b1d278fae0bbeaf14f
diff --git a/metadata/md5-cache/ros-meta/executive_smach-2.0.1 b/metadata/md5-cache/ros-meta/executive_smach-2.0.1
index 2ad5437a52a1..e18a74e2dc0e 100644
--- a/metadata/md5-cache/ros-meta/executive_smach-2.0.1
+++ b/metadata/md5-cache/ros-meta/executive_smach-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/smach dev-ros/smach_ros dev-ros/smach_msgs python_targets_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/executive_smach/archive/2.0.1.tar.gz -> executive_smach-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=72d8f49e12476104f2faa60dda5c9268
diff --git a/metadata/md5-cache/ros-meta/executive_smach-9999 b/metadata/md5-cache/ros-meta/executive_smach-9999
index ca3eb7152b74..5baf29076376 100644
--- a/metadata/md5-cache/ros-meta/executive_smach-9999
+++ b/metadata/md5-cache/ros-meta/executive_smach-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/smach dev-ros/smach_ros dev-ros/smach_msgs python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=ab42b7d478d0a6b1d278fae0bbeaf14f
diff --git a/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-2.6.1 b/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-2.6.1
index ad423e4a6905..9db41df933ce 100644
--- a/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-2.6.1
+++ b/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-2.6.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/gazebo_msgs dev-ros/gazebo_plugins dev-ros/gazebo_ros dev-ros/ga
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.6.1.tar.gz -> gazebo_ros_pkgs-2.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4087cac74667de7c6667d64a8f73ed7c
diff --git a/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-2.6.2 b/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-2.6.2
index cb92a519e6fa..280bd07a57b2 100644
--- a/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-2.6.2
+++ b/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-2.6.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/gazebo_msgs dev-ros/gazebo_plugins dev-ros/gazebo_ros dev-ros/ga
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.6.2.tar.gz -> gazebo_ros_pkgs-2.6.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=2ffc6ae9f286045e2e5af21768ce2680
diff --git a/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-2.7.3 b/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-2.7.3
index 14ba334694a3..d39f65b86eac 100644
--- a/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-2.7.3
+++ b/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-2.7.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/gazebo_dev dev-ros/gazebo_msgs dev-ros/gazebo_plugins dev-ros/ga
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.7.3.tar.gz -> gazebo_ros_pkgs-2.7.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e5853080c56266c20fbfe41755efb859
diff --git a/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-2.7.4 b/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-2.7.4
index 68299e2fd131..6717d5ccc472 100644
--- a/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-2.7.4
+++ b/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-2.7.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/gazebo_dev dev-ros/gazebo_msgs dev-ros/gazebo_plugins dev-ros/ga
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.7.4.tar.gz -> gazebo_ros_pkgs-2.7.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e5853080c56266c20fbfe41755efb859
diff --git a/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-2.8.4 b/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-2.8.4
index 592a755336b1..339514da502f 100644
--- a/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-2.8.4
+++ b/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-2.8.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/gazebo_dev dev-ros/gazebo_msgs dev-ros/gazebo_plugins dev-ros/ga
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.8.4.tar.gz -> gazebo_ros_pkgs-2.8.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e5853080c56266c20fbfe41755efb859
diff --git a/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-9999 b/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-9999
index fbe8c39b0bc7..ba9d8d327fa3 100644
--- a/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-9999
+++ b/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/gazebo_dev dev-ros/gazebo_msgs dev-ros/gazebo_plugins dev-ros/gazebo_ros dev-ros/gazebo_ros_control python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=e5853080c56266c20fbfe41755efb859
diff --git a/metadata/md5-cache/ros-meta/geographic_info-0.4.0 b/metadata/md5-cache/ros-meta/geographic_info-0.4.0
index efa78b5e602e..7926764ee708 100644
--- a/metadata/md5-cache/ros-meta/geographic_info-0.4.0
+++ b/metadata/md5-cache/ros-meta/geographic_info-0.4.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geodesy dev-ros/geographic_msgs python_targets_python2_7? ( >=de
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-geographic-info/geographic_info/archive/geographic_info-0.4.0.tar.gz -> geographic_info-0.4.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1eb0fdc12066065d80f567edb805af96
diff --git a/metadata/md5-cache/ros-meta/geographic_info-0.5.0 b/metadata/md5-cache/ros-meta/geographic_info-0.5.0
index c8ff9dbadc38..4d7c0dfeb67a 100644
--- a/metadata/md5-cache/ros-meta/geographic_info-0.5.0
+++ b/metadata/md5-cache/ros-meta/geographic_info-0.5.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geodesy dev-ros/geographic_msgs python_targets_python2_7? ( >=de
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-geographic-info/geographic_info/archive/geographic_info-0.5.0.tar.gz -> geographic_info-0.5.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6cdfeecd4a0903e42dd30978441193e4
diff --git a/metadata/md5-cache/ros-meta/geographic_info-0.5.2 b/metadata/md5-cache/ros-meta/geographic_info-0.5.2
index c6c4adb6429c..6ee7cc78255d 100644
--- a/metadata/md5-cache/ros-meta/geographic_info-0.5.2
+++ b/metadata/md5-cache/ros-meta/geographic_info-0.5.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geodesy dev-ros/geographic_msgs python_targets_python2_7? ( >=de
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-geographic-info/geographic_info/archive/geographic_info-0.5.2.tar.gz -> geographic_info-0.5.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=7800bcf0c9c63a4746018ffa77c4b790
diff --git a/metadata/md5-cache/ros-meta/geographic_info-0.5.3 b/metadata/md5-cache/ros-meta/geographic_info-0.5.3
index 5bced5e851d3..e7022af184f7 100644
--- a/metadata/md5-cache/ros-meta/geographic_info-0.5.3
+++ b/metadata/md5-cache/ros-meta/geographic_info-0.5.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geodesy dev-ros/geographic_msgs python_targets_python2_7? ( >=de
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-geographic-info/geographic_info/archive/geographic_info-0.5.3.tar.gz -> geographic_info-0.5.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3d5496f97b5093d76bfd126263bc7936
diff --git a/metadata/md5-cache/ros-meta/geographic_info-9999 b/metadata/md5-cache/ros-meta/geographic_info-9999
index 4a81eb7719a9..839a1a391677 100644
--- a/metadata/md5-cache/ros-meta/geographic_info-9999
+++ b/metadata/md5-cache/ros-meta/geographic_info-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/geodesy dev-ros/geographic_msgs python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=7800bcf0c9c63a4746018ffa77c4b790
diff --git a/metadata/md5-cache/ros-meta/geometry-1.11.7 b/metadata/md5-cache/ros-meta/geometry-1.11.7
index 7da0771d5094..c2ed06711b27 100644
--- a/metadata/md5-cache/ros-meta/geometry-1.11.7
+++ b/metadata/md5-cache/ros-meta/geometry-1.11.7
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/eigen_conversions dev-ros/kdl_conversions dev-ros/tf dev-ros/tf_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry/archive/1.11.7.tar.gz -> geometry-1.11.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6ebdaf4193e08e595ec10c5fa9175b80
diff --git a/metadata/md5-cache/ros-meta/geometry-1.11.8 b/metadata/md5-cache/ros-meta/geometry-1.11.8
index 79902854626e..178476b270f6 100644
--- a/metadata/md5-cache/ros-meta/geometry-1.11.8
+++ b/metadata/md5-cache/ros-meta/geometry-1.11.8
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/eigen_conversions dev-ros/kdl_conversions dev-ros/tf dev-ros/tf_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry/archive/1.11.8.tar.gz -> geometry-1.11.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6ebdaf4193e08e595ec10c5fa9175b80
diff --git a/metadata/md5-cache/ros-meta/geometry-1.11.9 b/metadata/md5-cache/ros-meta/geometry-1.11.9
index e80be2108f05..9275e63907a0 100644
--- a/metadata/md5-cache/ros-meta/geometry-1.11.9
+++ b/metadata/md5-cache/ros-meta/geometry-1.11.9
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/eigen_conversions dev-ros/kdl_conversions dev-ros/tf dev-ros/tf_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry/archive/1.11.9.tar.gz -> geometry-1.11.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=72ba407f2eeef57d282539733ef393a9
diff --git a/metadata/md5-cache/ros-meta/geometry-1.12.0 b/metadata/md5-cache/ros-meta/geometry-1.12.0
index e82e46d53988..44bd6d001502 100644
--- a/metadata/md5-cache/ros-meta/geometry-1.12.0
+++ b/metadata/md5-cache/ros-meta/geometry-1.12.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/eigen_conversions dev-ros/kdl_conversions dev-ros/tf dev-ros/tf_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry/archive/1.12.0.tar.gz -> geometry-1.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1f55e1b44fee9f351f53ef5ea4a30f6a
diff --git a/metadata/md5-cache/ros-meta/geometry-9999 b/metadata/md5-cache/ros-meta/geometry-9999
index 99f26fae9fa5..ca2283353fb5 100644
--- a/metadata/md5-cache/ros-meta/geometry-9999
+++ b/metadata/md5-cache/ros-meta/geometry-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/eigen_conversions dev-ros/kdl_conversions dev-ros/tf dev-ros/tf_conversions python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=6ebdaf4193e08e595ec10c5fa9175b80
diff --git a/metadata/md5-cache/ros-meta/geometry2-0.6.2 b/metadata/md5-cache/ros-meta/geometry2-0.6.2
index 10e4557e371c..7ecd58fea460 100644
--- a/metadata/md5-cache/ros-meta/geometry2-0.6.2
+++ b/metadata/md5-cache/ros-meta/geometry2-0.6.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/test_tf2 dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_eigen dev-ro
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.6.2.tar.gz -> geometry2-0.6.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=93e08822946508b520a6c697ee3d7a7d
diff --git a/metadata/md5-cache/ros-meta/geometry2-0.6.3 b/metadata/md5-cache/ros-meta/geometry2-0.6.3
index 4595ab3af0d8..a31bbcace019 100644
--- a/metadata/md5-cache/ros-meta/geometry2-0.6.3
+++ b/metadata/md5-cache/ros-meta/geometry2-0.6.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/test_tf2 dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_eigen dev-ro
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.6.3.tar.gz -> geometry2-0.6.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=93e08822946508b520a6c697ee3d7a7d
diff --git a/metadata/md5-cache/ros-meta/geometry2-9999 b/metadata/md5-cache/ros-meta/geometry2-9999
index da45021dd759..23c66ceeb901 100644
--- a/metadata/md5-cache/ros-meta/geometry2-9999
+++ b/metadata/md5-cache/ros-meta/geometry2-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/test_tf2 dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_eigen dev-ros/tf2_geometry_msgs dev-ros/tf2_kdl dev-ros/tf2_msgs dev-ros/tf2_py dev-ros/tf2_ros dev-ros/tf2_sensor_msgs dev-ros/tf2_tools python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=93e08822946508b520a6c697ee3d7a7d
diff --git a/metadata/md5-cache/ros-meta/geometry_tutorials-0.2.2 b/metadata/md5-cache/ros-meta/geometry_tutorials-0.2.2
index 55a0669e1794..19503dddd69a 100644
--- a/metadata/md5-cache/ros-meta/geometry_tutorials-0.2.2
+++ b/metadata/md5-cache/ros-meta/geometry_tutorials-0.2.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/turtle_tf dev-ros/turtle_tf2 python_targets_python2_7? ( >=dev-l
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry_tutorials/archive/0.2.2.tar.gz -> geometry_tutorials-0.2.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=4eb0cb89162ac3ad247722a171facbd2
diff --git a/metadata/md5-cache/ros-meta/geometry_tutorials-9999 b/metadata/md5-cache/ros-meta/geometry_tutorials-9999
index 02ca21b844f3..d861f386786a 100644
--- a/metadata/md5-cache/ros-meta/geometry_tutorials-9999
+++ b/metadata/md5-cache/ros-meta/geometry_tutorials-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/turtle_tf dev-ros/turtle_tf2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=4eb0cb89162ac3ad247722a171facbd2
diff --git a/metadata/md5-cache/ros-meta/hector_localization-0.2.0 b/metadata/md5-cache/ros-meta/hector_localization-0.2.0
index df2a4741d97f..25080f4caca3 100644
--- a/metadata/md5-cache/ros-meta/hector_localization-0.2.0
+++ b/metadata/md5-cache/ros-meta/hector_localization-0.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/hector_pose_estimation dev-ros/hector_pose_estimation_core dev-r
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_localization/archive/0.2.0.tar.gz -> hector_localization-0.2.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=91e5b5176fa1d701a77c8a8ddf8eb234
diff --git a/metadata/md5-cache/ros-meta/hector_localization-0.2.1 b/metadata/md5-cache/ros-meta/hector_localization-0.2.1
index ac589a355ec7..c2e819fc758f 100644
--- a/metadata/md5-cache/ros-meta/hector_localization-0.2.1
+++ b/metadata/md5-cache/ros-meta/hector_localization-0.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/hector_pose_estimation dev-ros/hector_pose_estimation_core dev-r
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_localization/archive/0.2.1.tar.gz -> hector_localization-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=91e5b5176fa1d701a77c8a8ddf8eb234
diff --git a/metadata/md5-cache/ros-meta/hector_localization-0.3.0 b/metadata/md5-cache/ros-meta/hector_localization-0.3.0
index ec6c60553e4e..874a09c5f418 100644
--- a/metadata/md5-cache/ros-meta/hector_localization-0.3.0
+++ b/metadata/md5-cache/ros-meta/hector_localization-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/hector_pose_estimation dev-ros/hector_pose_estimation_core dev-r
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_localization/archive/0.3.0.tar.gz -> hector_localization-0.3.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0dad779c6bf0a9d2e7dcbbdbdc6b3907
diff --git a/metadata/md5-cache/ros-meta/hector_localization-9999 b/metadata/md5-cache/ros-meta/hector_localization-9999
index f8a4942e3852..bee3104bf51b 100644
--- a/metadata/md5-cache/ros-meta/hector_localization-9999
+++ b/metadata/md5-cache/ros-meta/hector_localization-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/hector_pose_estimation dev-ros/hector_pose_estimation_core dev-ros/message_to_tf python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=91e5b5176fa1d701a77c8a8ddf8eb234
diff --git a/metadata/md5-cache/ros-meta/hector_slam-0.3.3 b/metadata/md5-cache/ros-meta/hector_slam-0.3.3
index 8666d2d8d2d8..8fbf24f79f72 100644
--- a/metadata/md5-cache/ros-meta/hector_slam-0.3.3
+++ b/metadata/md5-cache/ros-meta/hector_slam-0.3.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/hector_compressed_map_transport dev-ros/hector_geotiff_plugins d
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.3.tar.gz -> hector_slam-0.3.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d4c4a6121168cec010b92524bce36e25
diff --git a/metadata/md5-cache/ros-meta/hector_slam-0.3.4 b/metadata/md5-cache/ros-meta/hector_slam-0.3.4
index 8f6a57cdff36..eab5a13c5478 100644
--- a/metadata/md5-cache/ros-meta/hector_slam-0.3.4
+++ b/metadata/md5-cache/ros-meta/hector_slam-0.3.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/hector_compressed_map_transport dev-ros/hector_geotiff_plugins d
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.4.tar.gz -> hector_slam-0.3.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d4c4a6121168cec010b92524bce36e25
diff --git a/metadata/md5-cache/ros-meta/hector_slam-0.3.5 b/metadata/md5-cache/ros-meta/hector_slam-0.3.5
index b2c37a8a8729..0d8fdf9832aa 100644
--- a/metadata/md5-cache/ros-meta/hector_slam-0.3.5
+++ b/metadata/md5-cache/ros-meta/hector_slam-0.3.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/hector_compressed_map_transport dev-ros/hector_geotiff_plugins d
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.5.tar.gz -> hector_slam-0.3.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9f9b5b4f2ea687ad531aaba340812365
diff --git a/metadata/md5-cache/ros-meta/hector_slam-9999 b/metadata/md5-cache/ros-meta/hector_slam-9999
index 0a1e84e07044..d424e546b54d 100644
--- a/metadata/md5-cache/ros-meta/hector_slam-9999
+++ b/metadata/md5-cache/ros-meta/hector_slam-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/hector_compressed_map_transport dev-ros/hector_geotiff_plugins dev-ros/hector_imu_tools dev-ros/hector_map_server dev-ros/hector_marker_drawing dev-ros/hector_trajectory_server dev-ros/hector_geotiff dev-ros/hector_imu_attitude_to_tf dev-ros/hector_mapping dev-ros/hector_map_tools dev-ros/hector_nav_msgs dev-ros/hector_slam_launch python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=d4c4a6121168cec010b92524bce36e25
diff --git a/metadata/md5-cache/ros-meta/image_common-1.11.12 b/metadata/md5-cache/ros-meta/image_common-1.11.12
index 631d537d9d2d..b373dc81e1f6 100644
--- a/metadata/md5-cache/ros-meta/image_common-1.11.12
+++ b/metadata/md5-cache/ros-meta/image_common-1.11.12
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/camera_calibration_parsers dev-ros/camera_info_manager dev-ros/i
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.12.tar.gz -> image_common-1.11.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=aba2b27e60919e82b67a5aa2a50571ba
diff --git a/metadata/md5-cache/ros-meta/image_common-1.11.13 b/metadata/md5-cache/ros-meta/image_common-1.11.13
index 24b117cedc49..5e1d7a6d166b 100644
--- a/metadata/md5-cache/ros-meta/image_common-1.11.13
+++ b/metadata/md5-cache/ros-meta/image_common-1.11.13
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/camera_calibration_parsers dev-ros/camera_info_manager dev-ros/i
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.13.tar.gz -> image_common-1.11.13.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=aba2b27e60919e82b67a5aa2a50571ba
diff --git a/metadata/md5-cache/ros-meta/image_common-9999 b/metadata/md5-cache/ros-meta/image_common-9999
index ffe083fdee37..eff52ba74790 100644
--- a/metadata/md5-cache/ros-meta/image_common-9999
+++ b/metadata/md5-cache/ros-meta/image_common-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/camera_calibration_parsers dev-ros/camera_info_manager dev-ros/image_transport dev-ros/polled_camera python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=3dea6c8bebc23a60c04dbe53d4ca30d0
diff --git a/metadata/md5-cache/ros-meta/image_pipeline-1.12.19 b/metadata/md5-cache/ros-meta/image_pipeline-1.12.19
index a8a90bdf0338..f94584940955 100644
--- a/metadata/md5-cache/ros-meta/image_pipeline-1.12.19
+++ b/metadata/md5-cache/ros-meta/image_pipeline-1.12.19
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/camera_calibration dev-ros/depth_image_proc dev-ros/image_proc d
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.19.tar.gz -> image_pipeline-1.12.19.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0c2354f95cd90a9f386b2d294472cde1
diff --git a/metadata/md5-cache/ros-meta/image_pipeline-1.12.20 b/metadata/md5-cache/ros-meta/image_pipeline-1.12.20
index eda9a7176af2..edf1fe19ba99 100644
--- a/metadata/md5-cache/ros-meta/image_pipeline-1.12.20
+++ b/metadata/md5-cache/ros-meta/image_pipeline-1.12.20
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/camera_calibration dev-ros/depth_image_proc dev-ros/image_proc d
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.20.tar.gz -> image_pipeline-1.12.20.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=43f37a4066182f5378de8fde5fd8bf31
diff --git a/metadata/md5-cache/ros-meta/image_pipeline-1.12.21 b/metadata/md5-cache/ros-meta/image_pipeline-1.12.21
index 34f06166608f..6ad7c4356025 100644
--- a/metadata/md5-cache/ros-meta/image_pipeline-1.12.21
+++ b/metadata/md5-cache/ros-meta/image_pipeline-1.12.21
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/camera_calibration dev-ros/depth_image_proc dev-ros/image_proc d
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.21.tar.gz -> image_pipeline-1.12.21.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=43f37a4066182f5378de8fde5fd8bf31
diff --git a/metadata/md5-cache/ros-meta/image_pipeline-1.12.22 b/metadata/md5-cache/ros-meta/image_pipeline-1.12.22
index b92bc69744b1..27293bbf669c 100644
--- a/metadata/md5-cache/ros-meta/image_pipeline-1.12.22
+++ b/metadata/md5-cache/ros-meta/image_pipeline-1.12.22
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/camera_calibration dev-ros/depth_image_proc dev-ros/image_proc d
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.22.tar.gz -> image_pipeline-1.12.22.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=43f37a4066182f5378de8fde5fd8bf31
diff --git a/metadata/md5-cache/ros-meta/image_pipeline-1.12.23 b/metadata/md5-cache/ros-meta/image_pipeline-1.12.23
index 5c223e4ffc4c..8079670d0808 100644
--- a/metadata/md5-cache/ros-meta/image_pipeline-1.12.23
+++ b/metadata/md5-cache/ros-meta/image_pipeline-1.12.23
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/camera_calibration dev-ros/depth_image_proc dev-ros/image_proc d
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.23.tar.gz -> image_pipeline-1.12.23.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2e8cc33857e29699aca3380f03fc54af
diff --git a/metadata/md5-cache/ros-meta/image_pipeline-9999 b/metadata/md5-cache/ros-meta/image_pipeline-9999
index f6a54481d1eb..9e79abaf11ba 100644
--- a/metadata/md5-cache/ros-meta/image_pipeline-9999
+++ b/metadata/md5-cache/ros-meta/image_pipeline-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/camera_calibration dev-ros/depth_image_proc dev-ros/image_proc dev-ros/image_publisher dev-ros/image_rotate dev-ros/image_view dev-ros/stereo_image_proc python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=0c2354f95cd90a9f386b2d294472cde1
diff --git a/metadata/md5-cache/ros-meta/image_transport_plugins-1.9.2 b/metadata/md5-cache/ros-meta/image_transport_plugins-1.9.2
index 1504d3a06c6d..03c9f7df1fa5 100644
--- a/metadata/md5-cache/ros-meta/image_transport_plugins-1.9.2
+++ b/metadata/md5-cache/ros-meta/image_transport_plugins-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/compressed_depth_image_transport dev-ros/compressed_image_transp
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_transport_plugins/archive/1.9.2.tar.gz -> image_transport_plugins-1.9.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=c16f63a2d4059f9eafd94dae7cdd01df
diff --git a/metadata/md5-cache/ros-meta/image_transport_plugins-1.9.3 b/metadata/md5-cache/ros-meta/image_transport_plugins-1.9.3
index 748d99b352a3..ef0ede603e57 100644
--- a/metadata/md5-cache/ros-meta/image_transport_plugins-1.9.3
+++ b/metadata/md5-cache/ros-meta/image_transport_plugins-1.9.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/compressed_depth_image_transport dev-ros/compressed_image_transp
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_transport_plugins/archive/1.9.3.tar.gz -> image_transport_plugins-1.9.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c16f63a2d4059f9eafd94dae7cdd01df
diff --git a/metadata/md5-cache/ros-meta/image_transport_plugins-1.9.5 b/metadata/md5-cache/ros-meta/image_transport_plugins-1.9.5
index faab374e37cd..888cc78e5f37 100644
--- a/metadata/md5-cache/ros-meta/image_transport_plugins-1.9.5
+++ b/metadata/md5-cache/ros-meta/image_transport_plugins-1.9.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/compressed_depth_image_transport dev-ros/compressed_image_transp
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_transport_plugins/archive/1.9.5.tar.gz -> image_transport_plugins-1.9.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6f7b69c89610859707bd344c5edef6dd
diff --git a/metadata/md5-cache/ros-meta/image_transport_plugins-9999 b/metadata/md5-cache/ros-meta/image_transport_plugins-9999
index fbf02c0fcd8a..13969f4b7516 100644
--- a/metadata/md5-cache/ros-meta/image_transport_plugins-9999
+++ b/metadata/md5-cache/ros-meta/image_transport_plugins-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/compressed_depth_image_transport dev-ros/compressed_image_transport dev-ros/theora_image_transport python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=c16f63a2d4059f9eafd94dae7cdd01df
diff --git a/metadata/md5-cache/ros-meta/imu_pipeline-0.2.1 b/metadata/md5-cache/ros-meta/imu_pipeline-0.2.1
index 240d8eff6191..f78df3d57165 100644
--- a/metadata/md5-cache/ros-meta/imu_pipeline-0.2.1
+++ b/metadata/md5-cache/ros-meta/imu_pipeline-0.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/imu_processors dev-ros/imu_transformer python_targets_python2_7?
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/imu_pipeline/archive/0.2.1.tar.gz -> imu_pipeline-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=919e34bbd7aa155ffab2c3661ea38e42
diff --git a/metadata/md5-cache/ros-meta/imu_pipeline-0.2.2 b/metadata/md5-cache/ros-meta/imu_pipeline-0.2.2
index b78575212eb8..9f3c810015dc 100644
--- a/metadata/md5-cache/ros-meta/imu_pipeline-0.2.2
+++ b/metadata/md5-cache/ros-meta/imu_pipeline-0.2.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/imu_processors dev-ros/imu_transformer python_targets_python2_7?
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/imu_pipeline/archive/0.2.2.tar.gz -> imu_pipeline-0.2.2.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2270411ecd08c5f5068bfb170b6c7a33
diff --git a/metadata/md5-cache/ros-meta/imu_pipeline-9999 b/metadata/md5-cache/ros-meta/imu_pipeline-9999
index 85ef64c8bd94..8f664f1e72c3 100644
--- a/metadata/md5-cache/ros-meta/imu_pipeline-9999
+++ b/metadata/md5-cache/ros-meta/imu_pipeline-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/imu_processors dev-ros/imu_transformer python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=919e34bbd7aa155ffab2c3661ea38e42
diff --git a/metadata/md5-cache/ros-meta/imu_tools-1.1.5 b/metadata/md5-cache/ros-meta/imu_tools-1.1.5
index 08d4f5150864..3971cd224ca2 100644
--- a/metadata/md5-cache/ros-meta/imu_tools-1.1.5
+++ b/metadata/md5-cache/ros-meta/imu_tools-1.1.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/imu_complementary_filter dev-ros/imu_filter_madgwick dev-ros/rvi
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ccny-ros-pkg/imu_tools/archive/1.1.5.tar.gz -> imu_tools-1.1.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=07e9d2fe6032c2bfc1c64c6fa8af9156
diff --git a/metadata/md5-cache/ros-meta/imu_tools-1.2.0 b/metadata/md5-cache/ros-meta/imu_tools-1.2.0
index f811b1cddc42..2501b62acd38 100644
--- a/metadata/md5-cache/ros-meta/imu_tools-1.2.0
+++ b/metadata/md5-cache/ros-meta/imu_tools-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/imu_complementary_filter dev-ros/imu_filter_madgwick dev-ros/rvi
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ccny-ros-pkg/imu_tools/archive/1.2.0.tar.gz -> imu_tools-1.2.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e9cb19be5295720e4e42305ce9933ea0
diff --git a/metadata/md5-cache/ros-meta/imu_tools-9999 b/metadata/md5-cache/ros-meta/imu_tools-9999
index 248582be97fc..6003ae0fb240 100644
--- a/metadata/md5-cache/ros-meta/imu_tools-9999
+++ b/metadata/md5-cache/ros-meta/imu_tools-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/imu_complementary_filter dev-ros/imu_filter_madgwick dev-ros/rviz_imu_plugin python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=07e9d2fe6032c2bfc1c64c6fa8af9156
diff --git a/metadata/md5-cache/ros-meta/laser_pipeline-1.6.3 b/metadata/md5-cache/ros-meta/laser_pipeline-1.6.3
index 41e305c36d79..36006f473434 100644
--- a/metadata/md5-cache/ros-meta/laser_pipeline-1.6.3
+++ b/metadata/md5-cache/ros-meta/laser_pipeline-1.6.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/laser_assembler dev-ros/laser_filters dev-ros/laser_geometry pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/laser_pipeline/archive/1.6.3.tar.gz -> laser_pipeline-1.6.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=478be47aa4834b17b70722db00754479
diff --git a/metadata/md5-cache/ros-meta/laser_pipeline-9999 b/metadata/md5-cache/ros-meta/laser_pipeline-9999
index ccfa475a7850..59e414fcdc79 100644
--- a/metadata/md5-cache/ros-meta/laser_pipeline-9999
+++ b/metadata/md5-cache/ros-meta/laser_pipeline-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/laser_assembler dev-ros/laser_filters dev-ros/laser_geometry python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=b30e9651ecf55c209dca2467d426f594
diff --git a/metadata/md5-cache/ros-meta/navigation-1.15.1 b/metadata/md5-cache/ros-meta/navigation-1.15.1
index 4b9df06b3bd6..78771b66f345 100644
--- a/metadata/md5-cache/ros-meta/navigation-1.15.1
+++ b/metadata/md5-cache/ros-meta/navigation-1.15.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/amcl dev-ros/base_local_planner dev-ros/carrot_planner dev-ros/c
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.15.1.tar.gz -> navigation-1.15.1.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=350071ded6e0ba0b4fba0c849f72330f
diff --git a/metadata/md5-cache/ros-meta/navigation-1.15.2 b/metadata/md5-cache/ros-meta/navigation-1.15.2
index 65b06f726a9b..aeb72eec2a65 100644
--- a/metadata/md5-cache/ros-meta/navigation-1.15.2
+++ b/metadata/md5-cache/ros-meta/navigation-1.15.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/amcl dev-ros/base_local_planner dev-ros/carrot_planner dev-ros/c
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.15.2.tar.gz -> navigation-1.15.2.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9f949735b56624a1308c1d63fb12239f
diff --git a/metadata/md5-cache/ros-meta/navigation-1.16.0 b/metadata/md5-cache/ros-meta/navigation-1.16.0
index e8c112d9d310..553a2306dbf9 100644
--- a/metadata/md5-cache/ros-meta/navigation-1.16.0
+++ b/metadata/md5-cache/ros-meta/navigation-1.16.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/amcl dev-ros/base_local_planner dev-ros/carrot_planner dev-ros/c
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.0.tar.gz -> navigation-1.16.0.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=786c31944b12e560ea7c03483dea2fbf
diff --git a/metadata/md5-cache/ros-meta/navigation-1.16.1 b/metadata/md5-cache/ros-meta/navigation-1.16.1
index 95d39837665b..5cada2c24741 100644
--- a/metadata/md5-cache/ros-meta/navigation-1.16.1
+++ b/metadata/md5-cache/ros-meta/navigation-1.16.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/amcl dev-ros/base_local_planner dev-ros/carrot_planner dev-ros/c
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.1.tar.gz -> navigation-1.16.1.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=786c31944b12e560ea7c03483dea2fbf
diff --git a/metadata/md5-cache/ros-meta/navigation-1.16.2 b/metadata/md5-cache/ros-meta/navigation-1.16.2
index c2048afa9366..42f6df365c55 100644
--- a/metadata/md5-cache/ros-meta/navigation-1.16.2
+++ b/metadata/md5-cache/ros-meta/navigation-1.16.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/amcl dev-ros/base_local_planner dev-ros/carrot_planner dev-ros/c
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz -> navigation-1.16.2.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=786c31944b12e560ea7c03483dea2fbf
diff --git a/metadata/md5-cache/ros-meta/navigation-9999 b/metadata/md5-cache/ros-meta/navigation-9999
index 9625b634b8c9..5209a1a0d263 100644
--- a/metadata/md5-cache/ros-meta/navigation-9999
+++ b/metadata/md5-cache/ros-meta/navigation-9999
@@ -8,5 +8,5 @@ LICENSE=BSD LGPL-2.1
 RDEPEND=dev-ros/amcl dev-ros/base_local_planner dev-ros/carrot_planner dev-ros/clear_costmap_recovery dev-ros/costmap_2d dev-ros/dwa_local_planner dev-ros/fake_localization dev-ros/global_planner dev-ros/map_server dev-ros/move_base dev-ros/move_slow_and_clear dev-ros/nav_core dev-ros/navfn dev-ros/rotate_recovery dev-ros/voxel_grid python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=786c31944b12e560ea7c03483dea2fbf
diff --git a/metadata/md5-cache/ros-meta/nodelet_core-1.9.15 b/metadata/md5-cache/ros-meta/nodelet_core-1.9.15
index f85608213d69..e908412c0b2e 100644
--- a/metadata/md5-cache/ros-meta/nodelet_core-1.9.15
+++ b/metadata/md5-cache/ros-meta/nodelet_core-1.9.15
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/test_nodelet dev-ros
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.9.15.tar.gz -> nodelet_core-1.9.15.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=dbacd07051395af0a200499796dcd883
diff --git a/metadata/md5-cache/ros-meta/nodelet_core-1.9.16 b/metadata/md5-cache/ros-meta/nodelet_core-1.9.16
index 0ea3f841fb7b..42a11561f6a5 100644
--- a/metadata/md5-cache/ros-meta/nodelet_core-1.9.16
+++ b/metadata/md5-cache/ros-meta/nodelet_core-1.9.16
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/test_nodelet dev-ros
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.9.16.tar.gz -> nodelet_core-1.9.16.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=dbacd07051395af0a200499796dcd883
diff --git a/metadata/md5-cache/ros-meta/nodelet_core-9999 b/metadata/md5-cache/ros-meta/nodelet_core-9999
index 244fc6a65b50..e841cf520f6a 100644
--- a/metadata/md5-cache/ros-meta/nodelet_core-9999
+++ b/metadata/md5-cache/ros-meta/nodelet_core-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/test_nodelet dev-ros/test_nodelet_topic_tools python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=93c3fa09833fed7bbc7e6ad68d966b7b
diff --git a/metadata/md5-cache/ros-meta/perception-1.4.0 b/metadata/md5-cache/ros-meta/perception-1.4.0
index fafbee44073d..068929993f27 100644
--- a/metadata/md5-cache/ros-meta/perception-1.4.0
+++ b/metadata/md5-cache/ros-meta/perception-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=ros-meta/ros_base ros-meta/image_common ros-meta/image_pipeline ros-meta
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/metapackages/archive/1.4.0.tar.gz -> metapackages-1.4.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ff6f17e09ce3d2c7ef39304407cdfb0e
diff --git a/metadata/md5-cache/ros-meta/perception-1.4.1 b/metadata/md5-cache/ros-meta/perception-1.4.1
index 8bbdefc1d39c..f9d3d7c59f45 100644
--- a/metadata/md5-cache/ros-meta/perception-1.4.1
+++ b/metadata/md5-cache/ros-meta/perception-1.4.1
@@ -10,5 +10,5 @@ RDEPEND=ros-meta/ros_base ros-meta/image_common ros-meta/image_pipeline ros-meta
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/metapackages/archive/1.4.1.tar.gz -> metapackages-1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ff6f17e09ce3d2c7ef39304407cdfb0e
diff --git a/metadata/md5-cache/ros-meta/perception-9999 b/metadata/md5-cache/ros-meta/perception-9999
index 89d9cbfad3be..80d0686f59b5 100644
--- a/metadata/md5-cache/ros-meta/perception-9999
+++ b/metadata/md5-cache/ros-meta/perception-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=ros-meta/ros_base ros-meta/image_common ros-meta/image_pipeline ros-meta/image_transport_plugins ros-meta/laser_pipeline ros-meta/perception_pcl ros-meta/vision_opencv python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=e73585007f17dab9fbb90e552ad4c6f0
diff --git a/metadata/md5-cache/ros-meta/perception_pcl-1.5.4 b/metadata/md5-cache/ros-meta/perception_pcl-1.5.4
index 1f2b1df7d4e9..317ca1fcb0f2 100644
--- a/metadata/md5-cache/ros-meta/perception_pcl-1.5.4
+++ b/metadata/md5-cache/ros-meta/perception_pcl-1.5.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/pcl_ros python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/perception_pcl/archive/1.5.4.tar.gz -> perception_pcl-1.5.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=df339878c07a65707657b06de2c0ca26
diff --git a/metadata/md5-cache/ros-meta/perception_pcl-1.6.1 b/metadata/md5-cache/ros-meta/perception_pcl-1.6.1
index ace13530293e..23e6966b33a8 100644
--- a/metadata/md5-cache/ros-meta/perception_pcl-1.6.1
+++ b/metadata/md5-cache/ros-meta/perception_pcl-1.6.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/pcl_conversions dev-ros/pcl_ros python_targets_python2_7? ( >=de
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/perception_pcl/archive/1.6.1.tar.gz -> perception_pcl-1.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=799ed24577a434df42d84e1891df11ee
diff --git a/metadata/md5-cache/ros-meta/perception_pcl-1.6.2 b/metadata/md5-cache/ros-meta/perception_pcl-1.6.2
index 231ef8793dd0..7e5cef8499db 100644
--- a/metadata/md5-cache/ros-meta/perception_pcl-1.6.2
+++ b/metadata/md5-cache/ros-meta/perception_pcl-1.6.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/pcl_conversions dev-ros/pcl_ros python_targets_python2_7? ( >=de
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/perception_pcl/archive/1.6.2.tar.gz -> perception_pcl-1.6.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=799ed24577a434df42d84e1891df11ee
diff --git a/metadata/md5-cache/ros-meta/perception_pcl-9999 b/metadata/md5-cache/ros-meta/perception_pcl-9999
index d85423b8055c..ad47c9447f89 100644
--- a/metadata/md5-cache/ros-meta/perception_pcl-9999
+++ b/metadata/md5-cache/ros-meta/perception_pcl-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/pcl_conversions dev-ros/pcl_ros python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=799ed24577a434df42d84e1891df11ee
diff --git a/metadata/md5-cache/ros-meta/pr2_common-1.11.10 b/metadata/md5-cache/ros-meta/pr2_common-1.11.10
index 5a62b545912f..0c69a565dbcf 100644
--- a/metadata/md5-cache/ros-meta/pr2_common-1.11.10
+++ b/metadata/md5-cache/ros-meta/pr2_common-1.11.10
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_descriptio
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.11.10.tar.gz -> pr2_common-1.11.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1ca7237c20ae297bb800a9a51b21d861
diff --git a/metadata/md5-cache/ros-meta/pr2_common-1.11.11 b/metadata/md5-cache/ros-meta/pr2_common-1.11.11
index c4ff2c1da0c5..4fd1d6512e3f 100644
--- a/metadata/md5-cache/ros-meta/pr2_common-1.11.11
+++ b/metadata/md5-cache/ros-meta/pr2_common-1.11.11
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_descriptio
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.11.11.tar.gz -> pr2_common-1.11.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1ca7237c20ae297bb800a9a51b21d861
diff --git a/metadata/md5-cache/ros-meta/pr2_common-1.11.13 b/metadata/md5-cache/ros-meta/pr2_common-1.11.13
index 0d5715cca035..48edf4b0160d 100644
--- a/metadata/md5-cache/ros-meta/pr2_common-1.11.13
+++ b/metadata/md5-cache/ros-meta/pr2_common-1.11.13
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_descriptio
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.11.13.tar.gz -> pr2_common-1.11.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1ca7237c20ae297bb800a9a51b21d861
diff --git a/metadata/md5-cache/ros-meta/pr2_common-1.11.14 b/metadata/md5-cache/ros-meta/pr2_common-1.11.14
index 830eccfc112c..b0f54892b979 100644
--- a/metadata/md5-cache/ros-meta/pr2_common-1.11.14
+++ b/metadata/md5-cache/ros-meta/pr2_common-1.11.14
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_descriptio
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.11.14.tar.gz -> pr2_common-1.11.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1ca7237c20ae297bb800a9a51b21d861
diff --git a/metadata/md5-cache/ros-meta/pr2_common-1.11.9 b/metadata/md5-cache/ros-meta/pr2_common-1.11.9
index bd7039262611..b0ed9df80a2e 100644
--- a/metadata/md5-cache/ros-meta/pr2_common-1.11.9
+++ b/metadata/md5-cache/ros-meta/pr2_common-1.11.9
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_descriptio
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.11.9.tar.gz -> pr2_common-1.11.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1ca7237c20ae297bb800a9a51b21d861
diff --git a/metadata/md5-cache/ros-meta/pr2_common-1.12.0 b/metadata/md5-cache/ros-meta/pr2_common-1.12.0
index 1520dd13e510..6b4dda46ee4a 100644
--- a/metadata/md5-cache/ros-meta/pr2_common-1.12.0
+++ b/metadata/md5-cache/ros-meta/pr2_common-1.12.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_descriptio
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.0.tar.gz -> pr2_common-1.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1ca7237c20ae297bb800a9a51b21d861
diff --git a/metadata/md5-cache/ros-meta/pr2_common-1.12.1 b/metadata/md5-cache/ros-meta/pr2_common-1.12.1
index b4f92967a160..75a52e0713e3 100644
--- a/metadata/md5-cache/ros-meta/pr2_common-1.12.1
+++ b/metadata/md5-cache/ros-meta/pr2_common-1.12.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_descriptio
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.1.tar.gz -> pr2_common-1.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7ec273cf015e6dbc2d28e6611c045070
diff --git a/metadata/md5-cache/ros-meta/pr2_common-1.12.2 b/metadata/md5-cache/ros-meta/pr2_common-1.12.2
index 3b05a3927900..05c9f1069999 100644
--- a/metadata/md5-cache/ros-meta/pr2_common-1.12.2
+++ b/metadata/md5-cache/ros-meta/pr2_common-1.12.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_descriptio
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.2.tar.gz -> pr2_common-1.12.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=7ec273cf015e6dbc2d28e6611c045070
diff --git a/metadata/md5-cache/ros-meta/pr2_common-1.12.3 b/metadata/md5-cache/ros-meta/pr2_common-1.12.3
new file mode 100644
index 000000000000..b01023ebd420
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/pr2_common-1.12.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_description dev-ros/pr2_machine 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=URDF description and 3D models of robot components of the PR2 robot
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/pr2_common https://github.com/pr2/pr2_common
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_description dev-ros/pr2_machine python_targets_python2_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/pr2/pr2_common/archive/1.12.3.tar.gz -> pr2_common-1.12.3.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_=2581d8e3e89bfed7346a29180441ff4f
diff --git a/metadata/md5-cache/ros-meta/pr2_common-9999 b/metadata/md5-cache/ros-meta/pr2_common-9999
index 960b41b7f212..19192fc646a2 100644
--- a/metadata/md5-cache/ros-meta/pr2_common-9999
+++ b/metadata/md5-cache/ros-meta/pr2_common-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_description dev-ros/pr2_machine python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=1ca7237c20ae297bb800a9a51b21d861
diff --git a/metadata/md5-cache/ros-meta/qt_gui_core-0.3.10 b/metadata/md5-cache/ros-meta/qt_gui_core-0.3.10
index 9ebb99d66d55..9b285e441aa9 100644
--- a/metadata/md5-cache/ros-meta/qt_gui_core-0.3.10
+++ b/metadata/md5-cache/ros-meta/qt_gui_core-0.3.10
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/qt_dotgraph dev-ros/qt_gui dev-ros/qt_gui_app dev-ros/qt_gui_cpp
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.10.tar.gz -> qt_gui_core-0.3.10.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9474bbfd421e8314f94e28a5afc2847c
diff --git a/metadata/md5-cache/ros-meta/qt_gui_core-0.3.11 b/metadata/md5-cache/ros-meta/qt_gui_core-0.3.11
index 71d3f6b403dc..897add71aa9c 100644
--- a/metadata/md5-cache/ros-meta/qt_gui_core-0.3.11
+++ b/metadata/md5-cache/ros-meta/qt_gui_core-0.3.11
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/qt_dotgraph dev-ros/qt_gui dev-ros/qt_gui_app dev-ros/qt_gui_cpp
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.11.tar.gz -> qt_gui_core-0.3.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9474bbfd421e8314f94e28a5afc2847c
diff --git a/metadata/md5-cache/ros-meta/qt_gui_core-0.3.6 b/metadata/md5-cache/ros-meta/qt_gui_core-0.3.6
index 35ef53baccbc..d4424f42300c 100644
--- a/metadata/md5-cache/ros-meta/qt_gui_core-0.3.6
+++ b/metadata/md5-cache/ros-meta/qt_gui_core-0.3.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/qt_dotgraph dev-ros/qt_gui dev-ros/qt_gui_app dev-ros/qt_gui_cpp
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.6.tar.gz -> qt_gui_core-0.3.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=725374733c05a5ce3dc648a89c8dba77
diff --git a/metadata/md5-cache/ros-meta/qt_gui_core-0.3.8 b/metadata/md5-cache/ros-meta/qt_gui_core-0.3.8
index 666853e87768..f9c18f547c60 100644
--- a/metadata/md5-cache/ros-meta/qt_gui_core-0.3.8
+++ b/metadata/md5-cache/ros-meta/qt_gui_core-0.3.8
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/qt_dotgraph dev-ros/qt_gui dev-ros/qt_gui_app dev-ros/qt_gui_cpp
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.8.tar.gz -> qt_gui_core-0.3.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=725374733c05a5ce3dc648a89c8dba77
diff --git a/metadata/md5-cache/ros-meta/qt_gui_core-0.3.9 b/metadata/md5-cache/ros-meta/qt_gui_core-0.3.9
index 1e635b2944cc..d7a3fab46494 100644
--- a/metadata/md5-cache/ros-meta/qt_gui_core-0.3.9
+++ b/metadata/md5-cache/ros-meta/qt_gui_core-0.3.9
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/qt_dotgraph dev-ros/qt_gui dev-ros/qt_gui_app dev-ros/qt_gui_cpp
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.9.tar.gz -> qt_gui_core-0.3.9.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9474bbfd421e8314f94e28a5afc2847c
diff --git a/metadata/md5-cache/ros-meta/qt_gui_core-9999 b/metadata/md5-cache/ros-meta/qt_gui_core-9999
index 4c0a3a08bc54..2dd426db9302 100644
--- a/metadata/md5-cache/ros-meta/qt_gui_core-9999
+++ b/metadata/md5-cache/ros-meta/qt_gui_core-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/qt_dotgraph dev-ros/qt_gui dev-ros/qt_gui_app dev-ros/qt_gui_cpp dev-ros/qt_gui_py_common python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=1f8702196b04280c6cb8c7019ab1c7ea
diff --git a/metadata/md5-cache/ros-meta/robot-1.4.0 b/metadata/md5-cache/ros-meta/robot-1.4.0
index ff3fb87ffd3f..d19018c2a627 100644
--- a/metadata/md5-cache/ros-meta/robot-1.4.0
+++ b/metadata/md5-cache/ros-meta/robot-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=ros-meta/ros_base dev-ros/control_msgs ros-meta/diagnostics ros-meta/exe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/metapackages/archive/1.4.0.tar.gz -> metapackages-1.4.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5991742670bacdaa83c4f382ef2ce2a4
diff --git a/metadata/md5-cache/ros-meta/robot-1.4.1 b/metadata/md5-cache/ros-meta/robot-1.4.1
index 2e5c43d32a02..09cbcb7f7bf7 100644
--- a/metadata/md5-cache/ros-meta/robot-1.4.1
+++ b/metadata/md5-cache/ros-meta/robot-1.4.1
@@ -10,5 +10,5 @@ RDEPEND=ros-meta/ros_base dev-ros/control_msgs ros-meta/diagnostics ros-meta/exe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/metapackages/archive/1.4.1.tar.gz -> metapackages-1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5991742670bacdaa83c4f382ef2ce2a4
diff --git a/metadata/md5-cache/ros-meta/robot-9999 b/metadata/md5-cache/ros-meta/robot-9999
index b4385e3178e5..683d39f5d187 100644
--- a/metadata/md5-cache/ros-meta/robot-9999
+++ b/metadata/md5-cache/ros-meta/robot-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=ros-meta/ros_base dev-ros/control_msgs ros-meta/diagnostics ros-meta/executive_smach dev-ros/filters ros-meta/geometry dev-ros/joint_state_publisher dev-ros/kdl_parser dev-ros/kdl_parser_py dev-ros/robot_state_publisher dev-ros/urdf dev-ros/urdf_parser_plugin dev-ros/xacro python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=5991742670bacdaa83c4f382ef2ce2a4
diff --git a/metadata/md5-cache/ros-meta/robot_model-1.12.10 b/metadata/md5-cache/ros-meta/robot_model-1.12.10
index c98c8a3fad7b..fe2e7f9f0a3f 100644
--- a/metadata/md5-cache/ros-meta/robot_model-1.12.10
+++ b/metadata/md5-cache/ros-meta/robot_model-1.12.10
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/joint_state_publisher dev-ros/urdf dev-ros/urdf_parser_plugin py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/robot_model/archive/1.12.10.tar.gz -> robot_model-1.12.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=827bfaf0930adce09bd006eeab7c1938
diff --git a/metadata/md5-cache/ros-meta/robot_model-1.12.11 b/metadata/md5-cache/ros-meta/robot_model-1.12.11
index ba5822754320..815e28930f6d 100644
--- a/metadata/md5-cache/ros-meta/robot_model-1.12.11
+++ b/metadata/md5-cache/ros-meta/robot_model-1.12.11
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/joint_state_publisher dev-ros/urdf dev-ros/urdf_parser_plugin py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/robot_model/archive/1.12.11.tar.gz -> robot_model-1.12.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=827bfaf0930adce09bd006eeab7c1938
diff --git a/metadata/md5-cache/ros-meta/robot_model-9999 b/metadata/md5-cache/ros-meta/robot_model-9999
index 762254336587..a02cabcda91d 100644
--- a/metadata/md5-cache/ros-meta/robot_model-9999
+++ b/metadata/md5-cache/ros-meta/robot_model-9999
@@ -8,5 +8,5 @@ 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=2c7817b8f86d78f6b0057fb308532d0a
diff --git a/metadata/md5-cache/ros-meta/ros-1.14.1 b/metadata/md5-cache/ros-meta/ros-1.14.1
index 48a004c10364..addcad334a3b 100644
--- a/metadata/md5-cache/ros-meta/ros-1.14.1
+++ b/metadata/md5-cache/ros-meta/ros-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosbash dev-ros/rosboost_cfg dev-ros/rosclean dev-ros/roscreate
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.14.1.tar.gz -> ros-1.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=027247b0c67bb8e05002f88b71905a8e
diff --git a/metadata/md5-cache/ros-meta/ros-1.14.2 b/metadata/md5-cache/ros-meta/ros-1.14.2
index 64f6b52976a0..d809cb2718c9 100644
--- a/metadata/md5-cache/ros-meta/ros-1.14.2
+++ b/metadata/md5-cache/ros-meta/ros-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosbash dev-ros/rosboost_cfg dev-ros/rosclean dev-ros/roscreate
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.14.2.tar.gz -> ros-1.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=027247b0c67bb8e05002f88b71905a8e
diff --git a/metadata/md5-cache/ros-meta/ros-1.14.3 b/metadata/md5-cache/ros-meta/ros-1.14.3
index 31f1d05407d4..2908ea1d0997 100644
--- a/metadata/md5-cache/ros-meta/ros-1.14.3
+++ b/metadata/md5-cache/ros-meta/ros-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosbash dev-ros/rosboost_cfg dev-ros/rosclean dev-ros/roscreate
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.14.3.tar.gz -> ros-1.14.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=85c22302dd537fac53c98b81ad3eb171
diff --git a/metadata/md5-cache/ros-meta/ros-1.14.4 b/metadata/md5-cache/ros-meta/ros-1.14.4
index 793ca23188e1..89a4dd521bda 100644
--- a/metadata/md5-cache/ros-meta/ros-1.14.4
+++ b/metadata/md5-cache/ros-meta/ros-1.14.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosbash dev-ros/rosboost_cfg dev-ros/rosclean dev-ros/roscreate
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.14.4.tar.gz -> ros-1.14.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=85c22302dd537fac53c98b81ad3eb171
diff --git a/metadata/md5-cache/ros-meta/ros-9999 b/metadata/md5-cache/ros-meta/ros-9999
index 4c77a6b49210..2b01b164f617 100644
--- a/metadata/md5-cache/ros-meta/ros-9999
+++ b/metadata/md5-cache/ros-meta/ros-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rosbash dev-ros/rosboost_cfg dev-ros/rosclean dev-ros/roscreate dev-ros/rosmake dev-ros/rosunit dev-ros/mk dev-ros/rosbuild dev-ros/roslang dev-ros/roslib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=e78e16beb69d5aac9f88f7bb6ce7af1d
diff --git a/metadata/md5-cache/ros-meta/ros_base-1.4.0 b/metadata/md5-cache/ros-meta/ros_base-1.4.0
index b58d92fe6364..5db4107b5e81 100644
--- a/metadata/md5-cache/ros-meta/ros_base-1.4.0
+++ b/metadata/md5-cache/ros-meta/ros_base-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/actionlib ros-meta/bond_core dev-ros/class_loader dev-ros/dynami
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/metapackages/archive/1.4.0.tar.gz -> metapackages-1.4.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d5e3809edf44f615f6bf3f88ebb62ff8
diff --git a/metadata/md5-cache/ros-meta/ros_base-1.4.1 b/metadata/md5-cache/ros-meta/ros_base-1.4.1
index 6fca738362f7..fa053565c979 100644
--- a/metadata/md5-cache/ros-meta/ros_base-1.4.1
+++ b/metadata/md5-cache/ros-meta/ros_base-1.4.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/actionlib ros-meta/bond_core dev-ros/dynamic_reconfigure ros-met
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/metapackages/archive/1.4.1.tar.gz -> metapackages-1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f8cfe61b8edbf56d6ece24f12526d74d
diff --git a/metadata/md5-cache/ros-meta/ros_base-9999 b/metadata/md5-cache/ros-meta/ros_base-9999
index 7a6d63b358a9..372d6039ff74 100644
--- a/metadata/md5-cache/ros-meta/ros_base-9999
+++ b/metadata/md5-cache/ros-meta/ros_base-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/actionlib ros-meta/bond_core dev-ros/dynamic_reconfigure ros-meta/nodelet_core python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=f8cfe61b8edbf56d6ece24f12526d74d
diff --git a/metadata/md5-cache/ros-meta/ros_comm-1.13.6 b/metadata/md5-cache/ros-meta/ros_comm-1.13.6
index aef588da6b5b..5278470b7ccf 100644
--- a/metadata/md5-cache/ros-meta/ros_comm-1.13.6
+++ b/metadata/md5-cache/ros-meta/ros_comm-1.13.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslz4 dev-ros/xmlrpcpp dev-ros/roswtf dev-ros/message_filters d
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.13.6.tar.gz -> ros_comm-1.13.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bb90113504cadfb7aae5dc4d2b393e2a
diff --git a/metadata/md5-cache/ros-meta/ros_comm-1.14.2 b/metadata/md5-cache/ros-meta/ros_comm-1.14.2
index 695be8b627c3..4a3f47520e9a 100644
--- a/metadata/md5-cache/ros-meta/ros_comm-1.14.2
+++ b/metadata/md5-cache/ros-meta/ros_comm-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslz4 dev-ros/xmlrpcpp dev-ros/roswtf dev-ros/message_filters d
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.2.tar.gz -> ros_comm-1.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=931d58054888fa4c05377dd3f5da80ee
diff --git a/metadata/md5-cache/ros-meta/ros_comm-1.14.3 b/metadata/md5-cache/ros-meta/ros_comm-1.14.3
index 456e9996c28a..b09f609179fa 100644
--- a/metadata/md5-cache/ros-meta/ros_comm-1.14.3
+++ b/metadata/md5-cache/ros-meta/ros_comm-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslz4 dev-ros/xmlrpcpp dev-ros/roswtf dev-ros/message_filters d
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=931d58054888fa4c05377dd3f5da80ee
diff --git a/metadata/md5-cache/ros-meta/ros_comm-9999 b/metadata/md5-cache/ros-meta/ros_comm-9999
index b1d54a5eeb8d..0a5d6bb541d0 100644
--- a/metadata/md5-cache/ros-meta/ros_comm-9999
+++ b/metadata/md5-cache/ros-meta/ros_comm-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roslz4 dev-ros/xmlrpcpp dev-ros/roswtf dev-ros/message_filters dev-ros/rosbag dev-ros/rosbag_storage dev-ros/rosgraph dev-ros/roslaunch dev-ros/rosmaster dev-ros/rosmsg dev-ros/rosnode dev-ros/rosout dev-ros/rosparam dev-ros/rosservice dev-ros/rostest dev-ros/rostopic dev-ros/topic_tools dev-ros/roscpp dev-ros/rospy dev-ros/test_rosbag dev-ros/test_rosbag_storage dev-ros/test_roscpp dev-ros/test_rosgraph dev-ros/test_roslaunch dev-ros/test_roslib_comm dev-ros/test_rosmaster dev-ros/test_rosparam dev-ros/test_rospy dev-ros/test_rosservice python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=931d58054888fa4c05377dd3f5da80ee
diff --git a/metadata/md5-cache/ros-meta/ros_control-0.14.1 b/metadata/md5-cache/ros-meta/ros_control-0.14.1
index f89553782b59..b7c2d7515956 100644
--- a/metadata/md5-cache/ros-meta/ros_control-0.14.1
+++ b/metadata/md5-cache/ros-meta/ros_control-0.14.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/combined_robot_hw dev-ros/combined_robot_hw_tests dev-ros/contro
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.14.1.tar.gz -> ros_control-0.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1853cde211a474993978b762e70f5f7b
diff --git a/metadata/md5-cache/ros-meta/ros_control-0.14.2 b/metadata/md5-cache/ros-meta/ros_control-0.14.2
index 4f733ed7f13f..395fa6dc3450 100644
--- a/metadata/md5-cache/ros-meta/ros_control-0.14.2
+++ b/metadata/md5-cache/ros-meta/ros_control-0.14.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/combined_robot_hw dev-ros/combined_robot_hw_tests dev-ros/contro
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.14.2.tar.gz -> ros_control-0.14.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=1853cde211a474993978b762e70f5f7b
diff --git a/metadata/md5-cache/ros-meta/ros_control-0.15.0 b/metadata/md5-cache/ros-meta/ros_control-0.15.0
index 5ed97da96aff..dd7b3cf40842 100644
--- a/metadata/md5-cache/ros-meta/ros_control-0.15.0
+++ b/metadata/md5-cache/ros-meta/ros_control-0.15.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/combined_robot_hw dev-ros/combined_robot_hw_tests dev-ros/contro
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.15.0.tar.gz -> ros_control-0.15.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1853cde211a474993978b762e70f5f7b
diff --git a/metadata/md5-cache/ros-meta/ros_control-9999 b/metadata/md5-cache/ros-meta/ros_control-9999
index 692e484013a6..912b2c321a7c 100644
--- a/metadata/md5-cache/ros-meta/ros_control-9999
+++ b/metadata/md5-cache/ros-meta/ros_control-9999
@@ -8,5 +8,5 @@ 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
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=058ad65e5e7844f24714b3af59e33c36
diff --git a/metadata/md5-cache/ros-meta/ros_core-1.4.0 b/metadata/md5-cache/ros-meta/ros_core-1.4.0
index 9790648bcabe..db3259443a6b 100644
--- a/metadata/md5-cache/ros-meta/ros_core-1.4.0
+++ b/metadata/md5-cache/ros-meta/ros_core-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-ros/cmake_modules ros-meta/common_msgs dev-ros/gencp
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/metapackages/archive/1.4.0.tar.gz -> metapackages-1.4.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3e89c6256f646e62b53a60c5802dcbfe
diff --git a/metadata/md5-cache/ros-meta/ros_core-1.4.1 b/metadata/md5-cache/ros-meta/ros_core-1.4.1
index 56a6fd44fa02..11bae394c4e3 100644
--- a/metadata/md5-cache/ros-meta/ros_core-1.4.1
+++ b/metadata/md5-cache/ros-meta/ros_core-1.4.1
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-ros/class_loader dev-ros/cmake_modules ros-meta/comm
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/metapackages/archive/1.4.1.tar.gz -> metapackages-1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=65cd423e3bb1de5392425acc341526f3
diff --git a/metadata/md5-cache/ros-meta/ros_core-9999 b/metadata/md5-cache/ros-meta/ros_core-9999
index 3988d3846a89..8ccb293c8bfb 100644
--- a/metadata/md5-cache/ros-meta/ros_core-9999
+++ b/metadata/md5-cache/ros-meta/ros_core-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin dev-ros/class_loader dev-ros/cmake_modules ros-meta/common_msgs dev-ros/gencpp dev-ros/geneus dev-ros/genlisp dev-ros/genmsg dev-ros/gennodejs dev-ros/genpy dev-ros/message_generation dev-ros/message_runtime dev-ros/pluginlib ros-meta/ros ros-meta/ros_comm dev-ros/rosbag_migration_rule dev-ros/rosconsole dev-ros/rosconsole_bridge ros-meta/roscpp_core dev-ros/rosgraph_msgs dev-ros/roslisp dev-ros/rospack dev-ros/std_msgs dev-ros/std_srvs python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=65cd423e3bb1de5392425acc341526f3
diff --git a/metadata/md5-cache/ros-meta/ros_tutorials-0.6.1 b/metadata/md5-cache/ros-meta/ros_tutorials-0.6.1
index 64d7eddf0c15..e182a1c5437e 100644
--- a/metadata/md5-cache/ros-meta/ros_tutorials-0.6.1
+++ b/metadata/md5-cache/ros-meta/ros_tutorials-0.6.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp_tutorials dev-ros/rospy_tutorials dev-ros/turtlesim pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.6.1.tar.gz -> ros_tutorials-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=12f6d16f3fd9028bbd75a2db23dde3cf
diff --git a/metadata/md5-cache/ros-meta/ros_tutorials-0.7.0 b/metadata/md5-cache/ros-meta/ros_tutorials-0.7.0
index a8efd8d61917..961b16f0fd71 100644
--- a/metadata/md5-cache/ros-meta/ros_tutorials-0.7.0
+++ b/metadata/md5-cache/ros-meta/ros_tutorials-0.7.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp_tutorials dev-ros/rospy_tutorials dev-ros/turtlesim pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.7.0.tar.gz -> ros_tutorials-0.7.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=12f6d16f3fd9028bbd75a2db23dde3cf
diff --git a/metadata/md5-cache/ros-meta/ros_tutorials-0.7.1 b/metadata/md5-cache/ros-meta/ros_tutorials-0.7.1
index 26931d032732..213ef9af5023 100644
--- a/metadata/md5-cache/ros-meta/ros_tutorials-0.7.1
+++ b/metadata/md5-cache/ros-meta/ros_tutorials-0.7.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp_tutorials dev-ros/rospy_tutorials dev-ros/turtlesim pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.7.1.tar.gz -> ros_tutorials-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6e4f311a844b0c78cfefe6748e141281
diff --git a/metadata/md5-cache/ros-meta/ros_tutorials-0.8.0 b/metadata/md5-cache/ros-meta/ros_tutorials-0.8.0
index 6b8253670330..fd7bf0b47bcf 100644
--- a/metadata/md5-cache/ros-meta/ros_tutorials-0.8.0
+++ b/metadata/md5-cache/ros-meta/ros_tutorials-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp_tutorials dev-ros/rospy_tutorials dev-ros/turtlesim pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.8.0.tar.gz -> ros_tutorials-0.8.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=eb2d3b00edbab65b83975b07fc317b76
diff --git a/metadata/md5-cache/ros-meta/ros_tutorials-0.8.1 b/metadata/md5-cache/ros-meta/ros_tutorials-0.8.1
index 6aa12e9dea1f..10a482f92f41 100644
--- a/metadata/md5-cache/ros-meta/ros_tutorials-0.8.1
+++ b/metadata/md5-cache/ros-meta/ros_tutorials-0.8.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp_tutorials dev-ros/rospy_tutorials dev-ros/turtlesim pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.8.1.tar.gz -> ros_tutorials-0.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=eb2d3b00edbab65b83975b07fc317b76
diff --git a/metadata/md5-cache/ros-meta/ros_tutorials-0.9.0 b/metadata/md5-cache/ros-meta/ros_tutorials-0.9.0
index ea5692361c5e..eb7ef02ac3f4 100644
--- a/metadata/md5-cache/ros-meta/ros_tutorials-0.9.0
+++ b/metadata/md5-cache/ros-meta/ros_tutorials-0.9.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp_tutorials dev-ros/rospy_tutorials dev-ros/turtlesim pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.9.0.tar.gz -> ros_tutorials-0.9.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=55eea960efc745c03770a7e73894deae
diff --git a/metadata/md5-cache/ros-meta/ros_tutorials-9999 b/metadata/md5-cache/ros-meta/ros_tutorials-9999
index 51c1af8b5ad6..9e1e366befb5 100644
--- a/metadata/md5-cache/ros-meta/ros_tutorials-9999
+++ b/metadata/md5-cache/ros-meta/ros_tutorials-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp_tutorials dev-ros/rospy_tutorials dev-ros/turtlesim python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=12f6d16f3fd9028bbd75a2db23dde3cf
diff --git a/metadata/md5-cache/ros-meta/rosbridge_suite-0.9.0 b/metadata/md5-cache/ros-meta/rosbridge_suite-0.9.0
index 5c462d3bbcda..8fcd0f7db315 100644
--- a/metadata/md5-cache/ros-meta/rosbridge_suite-0.9.0
+++ b/metadata/md5-cache/ros-meta/rosbridge_suite-0.9.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosapi dev-ros/rosbridge_library dev-ros/rosbridge_server python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.9.0.tar.gz -> rosbridge_suite-0.9.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=35798954910221fa5c23b2e541f0fa1a
diff --git a/metadata/md5-cache/ros-meta/rosbridge_suite-9999 b/metadata/md5-cache/ros-meta/rosbridge_suite-9999
index 25f9bf64512f..60c4c46a9407 100644
--- a/metadata/md5-cache/ros-meta/rosbridge_suite-9999
+++ b/metadata/md5-cache/ros-meta/rosbridge_suite-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rosapi dev-ros/rosbridge_library dev-ros/rosbridge_server python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=a23594418f77832bcc55537e6dcf074a
diff --git a/metadata/md5-cache/ros-meta/roscpp_core-0.6.10 b/metadata/md5-cache/ros-meta/roscpp_core-0.6.10
index cf607ce8245d..9c01dfa22849 100644
--- a/metadata/md5-cache/ros-meta/roscpp_core-0.6.10
+++ b/metadata/md5-cache/ros-meta/roscpp_core-0.6.10
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits dev-ros/roscpp_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.10.tar.gz -> roscpp_core-0.6.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=13bb679b63620a008e46fe65b53a5203
diff --git a/metadata/md5-cache/ros-meta/roscpp_core-0.6.11 b/metadata/md5-cache/ros-meta/roscpp_core-0.6.11
index c0b3793f1dad..d26bac91361a 100644
--- a/metadata/md5-cache/ros-meta/roscpp_core-0.6.11
+++ b/metadata/md5-cache/ros-meta/roscpp_core-0.6.11
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits dev-ros/roscpp_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.11.tar.gz -> roscpp_core-0.6.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=13bb679b63620a008e46fe65b53a5203
diff --git a/metadata/md5-cache/ros-meta/roscpp_core-0.6.5 b/metadata/md5-cache/ros-meta/roscpp_core-0.6.5
index 09ab33e21ece..ebdc432f280d 100644
--- a/metadata/md5-cache/ros-meta/roscpp_core-0.6.5
+++ b/metadata/md5-cache/ros-meta/roscpp_core-0.6.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits dev-ros/roscpp_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.5.tar.gz -> roscpp_core-0.6.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=438704893707a96fbf77288018402e57
diff --git a/metadata/md5-cache/ros-meta/roscpp_core-0.6.7 b/metadata/md5-cache/ros-meta/roscpp_core-0.6.7
index bc8d91b6a706..22c4400bb135 100644
--- a/metadata/md5-cache/ros-meta/roscpp_core-0.6.7
+++ b/metadata/md5-cache/ros-meta/roscpp_core-0.6.7
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits dev-ros/roscpp_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.7.tar.gz -> roscpp_core-0.6.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=438704893707a96fbf77288018402e57
diff --git a/metadata/md5-cache/ros-meta/roscpp_core-0.6.8 b/metadata/md5-cache/ros-meta/roscpp_core-0.6.8
index dc66c5574221..863ba71ee2e9 100644
--- a/metadata/md5-cache/ros-meta/roscpp_core-0.6.8
+++ b/metadata/md5-cache/ros-meta/roscpp_core-0.6.8
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits dev-ros/roscpp_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.8.tar.gz -> roscpp_core-0.6.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=13bb679b63620a008e46fe65b53a5203
diff --git a/metadata/md5-cache/ros-meta/roscpp_core-0.6.9 b/metadata/md5-cache/ros-meta/roscpp_core-0.6.9
index e1857918bf0d..af18d0215bbb 100644
--- a/metadata/md5-cache/ros-meta/roscpp_core-0.6.9
+++ b/metadata/md5-cache/ros-meta/roscpp_core-0.6.9
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits dev-ros/roscpp_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.9.tar.gz -> roscpp_core-0.6.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=13bb679b63620a008e46fe65b53a5203
diff --git a/metadata/md5-cache/ros-meta/roscpp_core-9999 b/metadata/md5-cache/ros-meta/roscpp_core-9999
index e20caaec1c5f..d6f43587ba33 100644
--- a/metadata/md5-cache/ros-meta/roscpp_core-9999
+++ b/metadata/md5-cache/ros-meta/roscpp_core-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits dev-ros/roscpp_serialization python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=6a3e3270e45dec26a3597b34826dc161
diff --git a/metadata/md5-cache/ros-meta/rosserial-0.7.1 b/metadata/md5-cache/ros-meta/rosserial-0.7.1
index 79a7b41a299a..02d4dc8bad42 100644
--- a/metadata/md5-cache/ros-meta/rosserial-0.7.1
+++ b/metadata/md5-cache/ros-meta/rosserial-0.7.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosserial_arduino dev-ros/rosserial_client dev-ros/rosserial_emb
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.1.tar.gz -> rosserial-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4d6a3990c216ddb0b013a499d0d21721
diff --git a/metadata/md5-cache/ros-meta/rosserial-0.7.2 b/metadata/md5-cache/ros-meta/rosserial-0.7.2
index 0fb5926c485f..0b7c82c1fe61 100644
--- a/metadata/md5-cache/ros-meta/rosserial-0.7.2
+++ b/metadata/md5-cache/ros-meta/rosserial-0.7.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosserial_arduino dev-ros/rosserial_client dev-ros/rosserial_emb
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.2.tar.gz -> rosserial-0.7.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=aed19879d78cc62aa51e3b8545520a18
diff --git a/metadata/md5-cache/ros-meta/rosserial-0.7.3 b/metadata/md5-cache/ros-meta/rosserial-0.7.3
index a1968404c830..544766643d3d 100644
--- a/metadata/md5-cache/ros-meta/rosserial-0.7.3
+++ b/metadata/md5-cache/ros-meta/rosserial-0.7.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosserial_arduino dev-ros/rosserial_client dev-ros/rosserial_emb
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.3.tar.gz -> rosserial-0.7.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=aed19879d78cc62aa51e3b8545520a18
diff --git a/metadata/md5-cache/ros-meta/rosserial-0.7.4 b/metadata/md5-cache/ros-meta/rosserial-0.7.4
index c43fad6715d7..7806b977a5c7 100644
--- a/metadata/md5-cache/ros-meta/rosserial-0.7.4
+++ b/metadata/md5-cache/ros-meta/rosserial-0.7.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosserial_arduino dev-ros/rosserial_client dev-ros/rosserial_emb
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.4.tar.gz -> rosserial-0.7.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=aed19879d78cc62aa51e3b8545520a18
diff --git a/metadata/md5-cache/ros-meta/rosserial-0.7.5 b/metadata/md5-cache/ros-meta/rosserial-0.7.5
index 9445ce076959..8f1d6d212a15 100644
--- a/metadata/md5-cache/ros-meta/rosserial-0.7.5
+++ b/metadata/md5-cache/ros-meta/rosserial-0.7.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosserial_arduino dev-ros/rosserial_client dev-ros/rosserial_emb
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.5.tar.gz -> rosserial-0.7.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=aed19879d78cc62aa51e3b8545520a18
diff --git a/metadata/md5-cache/ros-meta/rosserial-0.7.6 b/metadata/md5-cache/ros-meta/rosserial-0.7.6
index cb5f7664f7eb..87ce03472a3e 100644
--- a/metadata/md5-cache/ros-meta/rosserial-0.7.6
+++ b/metadata/md5-cache/ros-meta/rosserial-0.7.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosserial_arduino dev-ros/rosserial_client dev-ros/rosserial_emb
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.6.tar.gz -> rosserial-0.7.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=905a0532653519e9ea3b7e4a4963b668
diff --git a/metadata/md5-cache/ros-meta/rosserial-0.7.7 b/metadata/md5-cache/ros-meta/rosserial-0.7.7
index 3883bb16f067..e730ad6f2bc2 100644
--- a/metadata/md5-cache/ros-meta/rosserial-0.7.7
+++ b/metadata/md5-cache/ros-meta/rosserial-0.7.7
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosserial_arduino dev-ros/rosserial_client dev-ros/rosserial_emb
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.7.tar.gz -> rosserial-0.7.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=905a0532653519e9ea3b7e4a4963b668
diff --git a/metadata/md5-cache/ros-meta/rosserial-9999 b/metadata/md5-cache/ros-meta/rosserial-9999
index df84166c2e66..a09cf729dae3 100644
--- a/metadata/md5-cache/ros-meta/rosserial-9999
+++ b/metadata/md5-cache/ros-meta/rosserial-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rosserial_arduino dev-ros/rosserial_client dev-ros/rosserial_embeddedlinux dev-ros/rosserial_msgs dev-ros/rosserial_python dev-ros/rosserial_server dev-ros/rosserial_tivac dev-ros/rosserial_windows dev-ros/rosserial_xbee python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=aed19879d78cc62aa51e3b8545520a18
diff --git a/metadata/md5-cache/ros-meta/rqt-0.3.2 b/metadata/md5-cache/ros-meta/rqt-0.3.2
index 2cf052318de7..67a56a57b767 100644
--- a/metadata/md5-cache/ros-meta/rqt-0.3.2
+++ b/metadata/md5-cache/ros-meta/rqt-0.3.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rqt_gui dev-ros/rqt_gui_cpp dev-ros/rqt_gui_py python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt/archive/0.3.2.tar.gz -> rqt-0.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=6c8b1677deff7d0e27d2efc69f56f0e7
diff --git a/metadata/md5-cache/ros-meta/rqt-0.5.0 b/metadata/md5-cache/ros-meta/rqt-0.5.0
index f824f36a99ef..7496d2a60719 100644
--- a/metadata/md5-cache/ros-meta/rqt-0.5.0
+++ b/metadata/md5-cache/ros-meta/rqt-0.5.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rqt_gui dev-ros/rqt_gui_cpp dev-ros/rqt_gui_py dev-ros/rqt_py_co
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt/archive/0.5.0.tar.gz -> rqt-0.5.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d3252c6b649a19f50f81effbfc4bf5c7
diff --git a/metadata/md5-cache/ros-meta/rqt-9999 b/metadata/md5-cache/ros-meta/rqt-9999
index 520658fdbc52..78a9d4370b10 100644
--- a/metadata/md5-cache/ros-meta/rqt-9999
+++ b/metadata/md5-cache/ros-meta/rqt-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rqt_gui dev-ros/rqt_gui_cpp dev-ros/rqt_gui_py dev-ros/rqt_py_common python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=d3252c6b649a19f50f81effbfc4bf5c7
diff --git a/metadata/md5-cache/ros-meta/rqt_common_plugins-0.4.8 b/metadata/md5-cache/ros-meta/rqt_common_plugins-0.4.8
index 48e8827fc85e..a8afb4c5b31c 100644
--- a/metadata/md5-cache/ros-meta/rqt_common_plugins-0.4.8
+++ b/metadata/md5-cache/ros-meta/rqt_common_plugins-0.4.8
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rqt_action dev-ros/rqt_bag dev-ros/rqt_bag_plugins dev-ros/rqt_c
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.8.tar.gz -> rqt_common_plugins-0.4.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7f81ca1efaaaed7a19bfd14ebf6a1f92
diff --git a/metadata/md5-cache/ros-meta/rqt_common_plugins-9999 b/metadata/md5-cache/ros-meta/rqt_common_plugins-9999
index ac5301c18c73..49527ca3c1b6 100644
--- a/metadata/md5-cache/ros-meta/rqt_common_plugins-9999
+++ b/metadata/md5-cache/ros-meta/rqt_common_plugins-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rqt_action dev-ros/rqt_bag dev-ros/rqt_bag_plugins dev-ros/rqt_console dev-ros/rqt_dep dev-ros/rqt_graph dev-ros/rqt_image_view dev-ros/rqt_launch dev-ros/rqt_logger_level dev-ros/rqt_msg dev-ros/rqt_plot dev-ros/rqt_publisher dev-ros/rqt_py_console dev-ros/rqt_reconfigure dev-ros/rqt_service_caller dev-ros/rqt_shell dev-ros/rqt_srv dev-ros/rqt_top dev-ros/rqt_topic dev-ros/rqt_web python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=7f81ca1efaaaed7a19bfd14ebf6a1f92
diff --git a/metadata/md5-cache/ros-meta/rqt_robot_plugins-0.5.6 b/metadata/md5-cache/ros-meta/rqt_robot_plugins-0.5.6
index 298acd1f969c..2b5ea393bdfa 100644
--- a/metadata/md5-cache/ros-meta/rqt_robot_plugins-0.5.6
+++ b/metadata/md5-cache/ros-meta/rqt_robot_plugins-0.5.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rqt_moveit dev-ros/rqt_nav_view dev-ros/rqt_pose_view dev-ros/rq
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.6.tar.gz -> rqt_robot_plugins-0.5.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ca94c618962c80fee53d952e37baf8b8
diff --git a/metadata/md5-cache/ros-meta/rqt_robot_plugins-0.5.7 b/metadata/md5-cache/ros-meta/rqt_robot_plugins-0.5.7
index 174e503cb06b..3ab169bb062c 100644
--- a/metadata/md5-cache/ros-meta/rqt_robot_plugins-0.5.7
+++ b/metadata/md5-cache/ros-meta/rqt_robot_plugins-0.5.7
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rqt_moveit dev-ros/rqt_nav_view dev-ros/rqt_pose_view dev-ros/rq
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.7.tar.gz -> rqt_robot_plugins-0.5.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=36317c4c726df460a0bbb80b9869dd1d
diff --git a/metadata/md5-cache/ros-meta/rqt_robot_plugins-9999 b/metadata/md5-cache/ros-meta/rqt_robot_plugins-9999
index bd052c6231d3..62ef167ef864 100644
--- a/metadata/md5-cache/ros-meta/rqt_robot_plugins-9999
+++ b/metadata/md5-cache/ros-meta/rqt_robot_plugins-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rqt_moveit dev-ros/rqt_nav_view dev-ros/rqt_pose_view dev-ros/rqt_robot_dashboard dev-ros/rqt_robot_monitor dev-ros/rqt_robot_steering dev-ros/rqt_runtime_monitor dev-ros/rqt_rviz dev-ros/rqt_tf_tree python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=36317c4c726df460a0bbb80b9869dd1d
diff --git a/metadata/md5-cache/ros-meta/simulators-1.4.0 b/metadata/md5-cache/ros-meta/simulators-1.4.0
index 25adf3e13e70..8e28cbd173e6 100644
--- a/metadata/md5-cache/ros-meta/simulators-1.4.0
+++ b/metadata/md5-cache/ros-meta/simulators-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=ros-meta/robot ros-meta/gazebo_ros_pkgs ros-meta/rqt_common_plugins ros-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/metapackages/archive/1.4.0.tar.gz -> metapackages-1.4.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fb9965e70cfbaf4ec2df224175f672ad
diff --git a/metadata/md5-cache/ros-meta/simulators-1.4.1 b/metadata/md5-cache/ros-meta/simulators-1.4.1
index 58be6f1768d9..563168bf60ae 100644
--- a/metadata/md5-cache/ros-meta/simulators-1.4.1
+++ b/metadata/md5-cache/ros-meta/simulators-1.4.1
@@ -10,5 +10,5 @@ RDEPEND=ros-meta/robot ros-meta/gazebo_ros_pkgs ros-meta/rqt_common_plugins ros-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/metapackages/archive/1.4.1.tar.gz -> metapackages-1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fb9965e70cfbaf4ec2df224175f672ad
diff --git a/metadata/md5-cache/ros-meta/simulators-9999 b/metadata/md5-cache/ros-meta/simulators-9999
index d54c34fbaa63..a78d1670f6f5 100644
--- a/metadata/md5-cache/ros-meta/simulators-9999
+++ b/metadata/md5-cache/ros-meta/simulators-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=ros-meta/robot ros-meta/gazebo_ros_pkgs ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins dev-ros/stage_ros python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=8a3f2f7b614467fb13f0bfb6eb557806
diff --git a/metadata/md5-cache/ros-meta/slam_gmapping-1.3.10 b/metadata/md5-cache/ros-meta/slam_gmapping-1.3.10
index 21b1ca9e3fc7..5e7c62f1b997 100644
--- a/metadata/md5-cache/ros-meta/slam_gmapping-1.3.10
+++ b/metadata/md5-cache/ros-meta/slam_gmapping-1.3.10
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/gmapping python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/slam_gmapping/archive/1.3.10.tar.gz -> slam_gmapping-1.3.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9d930c4d804034b56211e7e3af7af45e
diff --git a/metadata/md5-cache/ros-meta/slam_gmapping-1.3.8 b/metadata/md5-cache/ros-meta/slam_gmapping-1.3.8
index cc9ee8ad2b98..256bfc50de0b 100644
--- a/metadata/md5-cache/ros-meta/slam_gmapping-1.3.8
+++ b/metadata/md5-cache/ros-meta/slam_gmapping-1.3.8
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/gmapping python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/slam_gmapping/archive/1.3.8.tar.gz -> slam_gmapping-1.3.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d1a29820674c32010ac8dc68bcc63078
diff --git a/metadata/md5-cache/ros-meta/slam_gmapping-1.3.9 b/metadata/md5-cache/ros-meta/slam_gmapping-1.3.9
index 428e1f932a8b..26b4ebfc63b2 100644
--- a/metadata/md5-cache/ros-meta/slam_gmapping-1.3.9
+++ b/metadata/md5-cache/ros-meta/slam_gmapping-1.3.9
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/gmapping python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/slam_gmapping/archive/1.3.9.tar.gz -> slam_gmapping-1.3.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fcf3e0be6709936524a5280f0494a17c
diff --git a/metadata/md5-cache/ros-meta/slam_gmapping-9999 b/metadata/md5-cache/ros-meta/slam_gmapping-9999
index fd03ea258545..253cb2a6f039 100644
--- a/metadata/md5-cache/ros-meta/slam_gmapping-9999
+++ b/metadata/md5-cache/ros-meta/slam_gmapping-9999
@@ -8,5 +8,5 @@ LICENSE=CC-BY-NC-SA-2.5
 RDEPEND=dev-ros/gmapping python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=d1a29820674c32010ac8dc68bcc63078
diff --git a/metadata/md5-cache/ros-meta/unique_identifier-1.0.5 b/metadata/md5-cache/ros-meta/unique_identifier-1.0.5
index dfa3330170d3..ae30b2a4709d 100644
--- a/metadata/md5-cache/ros-meta/unique_identifier-1.0.5
+++ b/metadata/md5-cache/ros-meta/unique_identifier-1.0.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/unique_id dev-ros/uuid_msgs python_targets_python2_7? ( >=dev-la
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-geographic-info/unique_identifier/archive/unique_identifier-1.0.5.tar.gz -> unique_identifier-1.0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a4b8063d97e71a6ca5a2726a96d036cb
diff --git a/metadata/md5-cache/ros-meta/unique_identifier-1.0.6 b/metadata/md5-cache/ros-meta/unique_identifier-1.0.6
index 872225e33187..8e1742295f67 100644
--- a/metadata/md5-cache/ros-meta/unique_identifier-1.0.6
+++ b/metadata/md5-cache/ros-meta/unique_identifier-1.0.6
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/unique_id dev-ros/uuid_msgs python_targets_python2_7? ( >=dev-la
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-geographic-info/unique_identifier/archive/unique_identifier-1.0.6.tar.gz -> unique_identifier-1.0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=967ddacc894e474c1d3993b3f1f6d1ca
diff --git a/metadata/md5-cache/ros-meta/unique_identifier-9999 b/metadata/md5-cache/ros-meta/unique_identifier-9999
index 97511e540e2a..de13f2170d9c 100644
--- a/metadata/md5-cache/ros-meta/unique_identifier-9999
+++ b/metadata/md5-cache/ros-meta/unique_identifier-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/unique_id dev-ros/uuid_msgs python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=a4b8063d97e71a6ca5a2726a96d036cb
diff --git a/metadata/md5-cache/ros-meta/vision_opencv-1.12.4 b/metadata/md5-cache/ros-meta/vision_opencv-1.12.4
index 4d8ee26c1109..ae1193ce5ec6 100644
--- a/metadata/md5-cache/ros-meta/vision_opencv-1.12.4
+++ b/metadata/md5-cache/ros-meta/vision_opencv-1.12.4
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/image_geometry dev-ros/opencv_tests python_tar
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.4.tar.gz -> vision_opencv-1.12.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c814932fc2862cfbb0439ee3ecf90c22
diff --git a/metadata/md5-cache/ros-meta/vision_opencv-1.12.5 b/metadata/md5-cache/ros-meta/vision_opencv-1.12.5
index 1eae7c9ca81d..37f78c7d000b 100644
--- a/metadata/md5-cache/ros-meta/vision_opencv-1.12.5
+++ b/metadata/md5-cache/ros-meta/vision_opencv-1.12.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/image_geometry dev-ros/opencv_tests python_tar
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.5.tar.gz -> vision_opencv-1.12.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c814932fc2862cfbb0439ee3ecf90c22
diff --git a/metadata/md5-cache/ros-meta/vision_opencv-1.12.7 b/metadata/md5-cache/ros-meta/vision_opencv-1.12.7
index e36d3221ac04..a8b80efacb51 100644
--- a/metadata/md5-cache/ros-meta/vision_opencv-1.12.7
+++ b/metadata/md5-cache/ros-meta/vision_opencv-1.12.7
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/image_geometry dev-ros/opencv_tests python_tar
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.7.tar.gz -> vision_opencv-1.12.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c814932fc2862cfbb0439ee3ecf90c22
diff --git a/metadata/md5-cache/ros-meta/vision_opencv-1.12.8 b/metadata/md5-cache/ros-meta/vision_opencv-1.12.8
index 8d510dbdd733..06c70f8dd1a3 100644
--- a/metadata/md5-cache/ros-meta/vision_opencv-1.12.8
+++ b/metadata/md5-cache/ros-meta/vision_opencv-1.12.8
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/image_geometry dev-ros/opencv_tests python_tar
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.8.tar.gz -> vision_opencv-1.12.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4a1cfe4993a1a3a1751f3f418b9b92dc
diff --git a/metadata/md5-cache/ros-meta/vision_opencv-1.13.0 b/metadata/md5-cache/ros-meta/vision_opencv-1.13.0
index 7ed62f65027b..08a68939a634 100644
--- a/metadata/md5-cache/ros-meta/vision_opencv-1.13.0
+++ b/metadata/md5-cache/ros-meta/vision_opencv-1.13.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/image_geometry dev-ros/opencv_tests python_tar
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.13.0.tar.gz -> vision_opencv-1.13.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4a1cfe4993a1a3a1751f3f418b9b92dc
diff --git a/metadata/md5-cache/ros-meta/vision_opencv-9999 b/metadata/md5-cache/ros-meta/vision_opencv-9999
index 51316b81d88d..8f98dce53a13 100644
--- a/metadata/md5-cache/ros-meta/vision_opencv-9999
+++ b/metadata/md5-cache/ros-meta/vision_opencv-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/cv_bridge dev-ros/image_geometry dev-ros/opencv_tests python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=635f08f53eadd5a71e9a6d8f06e10219
diff --git a/metadata/md5-cache/ros-meta/vision_visp-0.10.0 b/metadata/md5-cache/ros-meta/vision_visp-0.10.0
index 0c93addb4a3b..cf37b2b6e242 100644
--- a/metadata/md5-cache/ros-meta/vision_visp-0.10.0
+++ b/metadata/md5-cache/ros-meta/vision_visp-0.10.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/visp_auto_tracker dev-ros/visp_bridge dev-ros/visp_camera_calibr
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/lagadic/vision_visp/archive/kinetic-0.10.0.tar.gz -> vision_visp-0.10.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f5cdfb92da6aa201c69253028572f1d5
diff --git a/metadata/md5-cache/ros-meta/vision_visp-0.9.3 b/metadata/md5-cache/ros-meta/vision_visp-0.9.3
index 0e2e803f3a28..efec9ca6fba6 100644
--- a/metadata/md5-cache/ros-meta/vision_visp-0.9.3
+++ b/metadata/md5-cache/ros-meta/vision_visp-0.9.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/visp_auto_tracker dev-ros/visp_bridge dev-ros/visp_camera_calibr
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/lagadic/vision_visp/archive/kinetic-0.9.3.tar.gz -> vision_visp-0.9.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f5cdfb92da6aa201c69253028572f1d5
diff --git a/metadata/md5-cache/ros-meta/vision_visp-9999 b/metadata/md5-cache/ros-meta/vision_visp-9999
index f73c9b41d162..51242958d50d 100644
--- a/metadata/md5-cache/ros-meta/vision_visp-9999
+++ b/metadata/md5-cache/ros-meta/vision_visp-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-ros/visp_auto_tracker dev-ros/visp_bridge dev-ros/visp_camera_calibration dev-ros/visp_hand2eye_calibration dev-ros/visp_tracker python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=f5cdfb92da6aa201c69253028572f1d5
diff --git a/metadata/md5-cache/ros-meta/visualization_tutorials-0.10.1 b/metadata/md5-cache/ros-meta/visualization_tutorials-0.10.1
index eda524d8ff04..c66ccc8504da 100644
--- a/metadata/md5-cache/ros-meta/visualization_tutorials-0.10.1
+++ b/metadata/md5-cache/ros-meta/visualization_tutorials-0.10.1
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/interactive_marker_tutorials dev-ros/librviz_tutorial dev-ros/rv
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.10.1.tar.gz -> visualization_tutorials-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4f11df72b9cb3ca15dff62a6fcf31579
diff --git a/metadata/md5-cache/ros-meta/visualization_tutorials-0.10.2 b/metadata/md5-cache/ros-meta/visualization_tutorials-0.10.2
index f022fcdb9f77..2adfa7acb69e 100644
--- a/metadata/md5-cache/ros-meta/visualization_tutorials-0.10.2
+++ b/metadata/md5-cache/ros-meta/visualization_tutorials-0.10.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/interactive_marker_tutorials dev-ros/librviz_tutorial dev-ros/rv
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.10.2.tar.gz -> visualization_tutorials-0.10.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=cc38bcaa2881f92fa3ae6c5497be25b3
diff --git a/metadata/md5-cache/ros-meta/visualization_tutorials-0.10.3 b/metadata/md5-cache/ros-meta/visualization_tutorials-0.10.3
index 1c6be712863e..b87228d1db77 100644
--- a/metadata/md5-cache/ros-meta/visualization_tutorials-0.10.3
+++ b/metadata/md5-cache/ros-meta/visualization_tutorials-0.10.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/interactive_marker_tutorials dev-ros/librviz_tutorial dev-ros/rv
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.10.3.tar.gz -> visualization_tutorials-0.10.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cc38bcaa2881f92fa3ae6c5497be25b3
diff --git a/metadata/md5-cache/ros-meta/visualization_tutorials-0.9.2 b/metadata/md5-cache/ros-meta/visualization_tutorials-0.9.2
index b2e87bd67cdf..303e64d9496e 100644
--- a/metadata/md5-cache/ros-meta/visualization_tutorials-0.9.2
+++ b/metadata/md5-cache/ros-meta/visualization_tutorials-0.9.2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/interactive_marker_tutorials dev-ros/librviz_tutorial dev-ros/rv
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.9.2.tar.gz -> visualization_tutorials-0.9.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	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=4f11df72b9cb3ca15dff62a6fcf31579
diff --git a/metadata/md5-cache/ros-meta/visualization_tutorials-9999 b/metadata/md5-cache/ros-meta/visualization_tutorials-9999
index 431a83520c22..24c75b29615b 100644
--- a/metadata/md5-cache/ros-meta/visualization_tutorials-9999
+++ b/metadata/md5-cache/ros-meta/visualization_tutorials-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/interactive_marker_tutorials dev-ros/librviz_tutorial dev-ros/rviz_plugin_tutorials dev-ros/rviz_python_tutorial dev-ros/visualization_marker_tutorials python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=4f11df72b9cb3ca15dff62a6fcf31579
diff --git a/metadata/md5-cache/ros-meta/viz-1.4.0 b/metadata/md5-cache/ros-meta/viz-1.4.0
index d57f02cd654b..7a703903a371 100644
--- a/metadata/md5-cache/ros-meta/viz-1.4.0
+++ b/metadata/md5-cache/ros-meta/viz-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=ros-meta/ros_base ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/metapackages/archive/1.4.0.tar.gz -> metapackages-1.4.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=904ae5a0d15a49683ee7f1f2398e3cbc
diff --git a/metadata/md5-cache/ros-meta/viz-1.4.1 b/metadata/md5-cache/ros-meta/viz-1.4.1
index e1926fbe01e2..2b9730a5701c 100644
--- a/metadata/md5-cache/ros-meta/viz-1.4.1
+++ b/metadata/md5-cache/ros-meta/viz-1.4.1
@@ -10,5 +10,5 @@ RDEPEND=ros-meta/ros_base ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/metapackages/archive/1.4.1.tar.gz -> metapackages-1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=904ae5a0d15a49683ee7f1f2398e3cbc
diff --git a/metadata/md5-cache/ros-meta/viz-9999 b/metadata/md5-cache/ros-meta/viz-9999
index b5315776f6c3..48e15dc78746 100644
--- a/metadata/md5-cache/ros-meta/viz-9999
+++ b/metadata/md5-cache/ros-meta/viz-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=ros-meta/ros_base ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins dev-ros/rviz python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=180f2e8ba0e4f3aa0fef11109f4776cd
diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz
index ae4f8a0d07ae..9179837a1ce5 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/casacore-2.3.0-r1 b/metadata/md5-cache/sci-astronomy/casacore-2.3.0-r1
index b2684745d865..c5f73d03456d 100644
--- a/metadata/md5-cache/sci-astronomy/casacore-2.3.0-r1
+++ b/metadata/md5-cache/sci-astronomy/casacore-2.3.0-r1
@@ -10,5 +10,5 @@ RDEPEND=sci-astronomy/wcslib:0= sci-libs/cfitsio:0= sys-libs/readline:0= virtual
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://github.com/casacore/casacore/archive/v2.3.0.tar.gz -> casacore-2.3.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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_=aabf6640e1f29b429a530f14ee7c57d0
diff --git a/metadata/md5-cache/sci-astronomy/celestia-1.6.1-r1 b/metadata/md5-cache/sci-astronomy/celestia-1.6.1-r1
index 1a05d4f80afa..68096283574f 100644
--- a/metadata/md5-cache/sci-astronomy/celestia-1.6.1-r1
+++ b/metadata/md5-cache/sci-astronomy/celestia-1.6.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/opengl virtual/jpeg:0 media-libs/libpng:0= <dev-lang/lua-5.2:* gtk? ( !gnome? ( x11-libs/gtk+:2 >=x11-libs/gtkglext-1.0 ) ) gnome? ( x11-libs/gtk+:2 >=x11-libs/gtkglext-1.0 >=gnome-base/libgnomeui-2.0 ) !gtk? ( !gnome? ( media-libs/freeglut ) ) cairo? ( x11-libs/cairo ) theora? ( media-libs/libtheora )
 SLOT=0
 SRC_URI=mirror://sourceforge/celestia/celestia-1.6.1.tar.gz
-_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3a3ad0a54cb8b34f358e2a83936907ec
diff --git a/metadata/md5-cache/sci-astronomy/celestia-9999 b/metadata/md5-cache/sci-astronomy/celestia-9999
index 52acf604cc7e..9fe51afcaeef 100644
--- a/metadata/md5-cache/sci-astronomy/celestia-9999
+++ b/metadata/md5-cache/sci-astronomy/celestia-9999
@@ -7,5 +7,5 @@ IUSE=cairo gtk nls pch theora threads
 LICENSE=GPL-2
 RDEPEND=virtual/opengl virtual/jpeg:0 media-libs/libpng:0= >=dev-lang/lua-5.1:* gtk? ( x11-libs/gtk+:2 >=x11-libs/gtkglext-1.0 ) !gtk? ( media-libs/freeglut ) cairo? ( x11-libs/cairo ) theora? ( media-libs/libtheora )
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5531e7b86c4c2cfd28b814e9ce8c97c8
diff --git a/metadata/md5-cache/sci-astronomy/kapteyn-2.3 b/metadata/md5-cache/sci-astronomy/kapteyn-2.3
index 97f1380f1524..d91f22a8d8c8 100644
--- a/metadata/md5-cache/sci-astronomy/kapteyn-2.3
+++ b/metadata/md5-cache/sci-astronomy/kapteyn-2.3
@@ -10,5 +10,5 @@ RDEPEND=sci-astronomy/wcslib dev-python/numpy[python_targets_python2_7(-)?,-pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://www.astro.rug.nl/software/kapteyn/kapteyn-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=2635079d9d98a3f1029f86ba708809cd
diff --git a/metadata/md5-cache/sci-astronomy/kstars-2.9.5 b/metadata/md5-cache/sci-astronomy/kstars-2.9.5
index 8de855ed4acb..1672c5e28870 100644
--- a/metadata/md5-cache/sci-astronomy/kstars-2.9.5
+++ b/metadata/md5-cache/sci-astronomy/kstars-2.9.5
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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_=2510b6d18250a2311c3c478edacdba9a
diff --git a/metadata/md5-cache/sci-astronomy/pyephem-3.7.5.3 b/metadata/md5-cache/sci-astronomy/pyephem-3.7.5.3
index 88b37b3624e8..adb0cfbe7b54 100644
--- a/metadata/md5-cache/sci-astronomy/pyephem-3.7.5.3
+++ b/metadata/md5-cache/sci-astronomy/pyephem-3.7.5.3
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyephem/pyephem-3.7.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1e895226e4a255708622d30f0e3855d2
diff --git a/metadata/md5-cache/sci-astronomy/pyephem-3.7.6.0 b/metadata/md5-cache/sci-astronomy/pyephem-3.7.6.0
index 54c09a30b50e..0a5c865f1d5c 100644
--- a/metadata/md5-cache/sci-astronomy/pyephem-3.7.6.0
+++ b/metadata/md5-cache/sci-astronomy/pyephem-3.7.6.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyephem/pyephem-3.7.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3b607fb0dfae7db49e4288e8372ad5ab
diff --git a/metadata/md5-cache/sci-astronomy/stellarium-0.14.3 b/metadata/md5-cache/sci-astronomy/stellarium-0.14.3
deleted file mode 100644
index 8658825b351c..000000000000
--- a/metadata/md5-cache/sci-astronomy/stellarium-0.14.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=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/qtwidgets:5 virtual/opengl sys-libs/zlib sound? ( dev-qt/qtmultimedia:5[widgets] ) dev-qt/qttest:5 dev-qt/qtconcurrent:5 nls? ( dev-qt/linguist-tools:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=3D photo-realistic skies in real time
-EAPI=5
-HOMEPAGE=http://www.stellarium.org/
-IUSE=debug nls sound stars
-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/qtwidgets:5 virtual/opengl sys-libs/zlib sound? ( dev-qt/qtmultimedia:5[widgets] )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/stellarium/stellarium-0.14.3.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=0759e12c321996a9a3e634ca247c87d5
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 131e4e8a22f8..246b3e7bc382 100644
--- a/metadata/md5-cache/sci-astronomy/stellarium-0.16.0-r1
+++ b/metadata/md5-cache/sci-astronomy/stellarium-0.16.0-r1
@@ -10,5 +10,5 @@ RDEPEND=media-fonts/dejavu dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/sci-biology/HTSeq-0.9.1 b/metadata/md5-cache/sci-biology/HTSeq-0.9.1
index 6efe8d752a6b..d22719f9e72b 100644
--- a/metadata/md5-cache/sci-biology/HTSeq-0.9.1
+++ b/metadata/md5-cache/sci-biology/HTSeq-0.9.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/H/HTSeq/HTSeq-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=baebb3e5c138076f90cdaad5bc41573f
diff --git a/metadata/md5-cache/sci-biology/HTSeq-9999 b/metadata/md5-cache/sci-biology/HTSeq-9999
index 79a3cc82d2f6..1654bee0a063 100644
--- a/metadata/md5-cache/sci-biology/HTSeq-9999
+++ b/metadata/md5-cache/sci-biology/HTSeq-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-biology/pysam[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=baebb3e5c138076f90cdaad5bc41573f
diff --git a/metadata/md5-cache/sci-biology/Manifest.gz b/metadata/md5-cache/sci-biology/Manifest.gz
index 1c94451604c7..7be5031611f0 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/bamtools-2.5.1 b/metadata/md5-cache/sci-biology/bamtools-2.5.1
index eb868aa09688..54cc8f779645 100644
--- a/metadata/md5-cache/sci-biology/bamtools-2.5.1
+++ b/metadata/md5-cache/sci-biology/bamtools-2.5.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/jsoncpp-1.8.0:= sys-libs/zlib:=
 SLOT=0/2.5.1
 SRC_URI=https://github.com/pezmaster31/bamtools/archive/v2.5.1.tar.gz -> bamtools-2.5.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=283ed3269c843bce2ee0a9cefad79fe0
diff --git a/metadata/md5-cache/sci-biology/bamtools-9999 b/metadata/md5-cache/sci-biology/bamtools-9999
index 747d2aabe140..63c18738d9dd 100644
--- a/metadata/md5-cache/sci-biology/bamtools-9999
+++ b/metadata/md5-cache/sci-biology/bamtools-9999
@@ -7,5 +7,5 @@ IUSE=static-libs
 LICENSE=MIT
 RDEPEND=>=dev-libs/jsoncpp-1.8.0:= sys-libs/zlib:=
 SLOT=0/9999
-_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	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=283ed3269c843bce2ee0a9cefad79fe0
diff --git a/metadata/md5-cache/sci-biology/biopandas-0.2.1 b/metadata/md5-cache/sci-biology/biopandas-0.2.1
index 18081a5582f9..2ba31fa35d1d 100644
--- a/metadata/md5-cache/sci-biology/biopandas-0.2.1
+++ b/metadata/md5-cache/sci-biology/biopandas-0.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/B/BioPandas/biopandas-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ea88f22f7675491064ad08658a2ba291
diff --git a/metadata/md5-cache/sci-biology/biopython-1.68 b/metadata/md5-cache/sci-biology/biopython-1.68
index 196720b44f5b..4734c500d47f 100644
--- a/metadata/md5-cache/sci-biology/biopython-1.68
+++ b/metadata/md5-cache/sci-biology/biopython-1.68
@@ -10,5 +10,5 @@ RDEPEND=dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=http://www.biopython.org/DIST/biopython-1.68.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d27e2e9df832a55985e7f459f9e4fa81
diff --git a/metadata/md5-cache/sci-biology/express-0.9.5-r1 b/metadata/md5-cache/sci-biology/express-0.9.5-r1
index cc319d39d63c..ca344e738f87 100644
--- a/metadata/md5-cache/sci-biology/express-0.9.5-r1
+++ b/metadata/md5-cache/sci-biology/express-0.9.5-r1
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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 2e1d6072ba85..d43cad983014 100644
--- a/metadata/md5-cache/sci-biology/express-1.5.1
+++ b/metadata/md5-cache/sci-biology/express-1.5.1
@@ -8,5 +8,5 @@ LICENSE=Artistic
 RDEPEND=>=dev-libs/boost-1.52.0:= dev-libs/protobuf dev-util/google-perftools sys-libs/zlib sci-biology/bamtools
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/sci-biology/fasttree-2.1.7 b/metadata/md5-cache/sci-biology/fasttree-2.1.7
index 61343c32f22f..deeb21277763 100644
--- a/metadata/md5-cache/sci-biology/fasttree-2.1.7
+++ b/metadata/md5-cache/sci-biology/fasttree-2.1.7
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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 a97c52caa90e..3fe280d77e7f 100644
--- a/metadata/md5-cache/sci-biology/fasttree-2.1.8
+++ b/metadata/md5-cache/sci-biology/fasttree-2.1.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/sci-biology/kallisto-0.43.1 b/metadata/md5-cache/sci-biology/kallisto-0.43.1
index a74d2e4f9410..1922f911811a 100644
--- a/metadata/md5-cache/sci-biology/kallisto-0.43.1
+++ b/metadata/md5-cache/sci-biology/kallisto-0.43.1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=sci-libs/hdf5:= sys-libs/zlib:=
 SLOT=0
 SRC_URI=https://github.com/pachterlab/kallisto/archive/v0.43.1.tar.gz -> kallisto-0.43.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b5fc562bf49e70db44b86bc5702ae9f2
diff --git a/metadata/md5-cache/sci-biology/kallisto-9999 b/metadata/md5-cache/sci-biology/kallisto-9999
index 86f584b615f5..1949ea5c4e82 100644
--- a/metadata/md5-cache/sci-biology/kallisto-9999
+++ b/metadata/md5-cache/sci-biology/kallisto-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://pachterlab.github.io/kallisto/
 LICENSE=BSD
 RDEPEND=sci-libs/hdf5:= sys-libs/zlib:=
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b5fc562bf49e70db44b86bc5702ae9f2
diff --git a/metadata/md5-cache/sci-biology/pysam-0.12.0.1 b/metadata/md5-cache/sci-biology/pysam-0.12.0.1
index bc3ff9e587f4..bc53a63ddc78 100644
--- a/metadata/md5-cache/sci-biology/pysam-0.12.0.1
+++ b/metadata/md5-cache/sci-biology/pysam-0.12.0.1
@@ -10,5 +10,5 @@ RDEPEND==sci-libs/htslib-1.5*:= python_targets_python2_7? ( >=dev-lang/python-2.
 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/pysam/pysam-0.12.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c02049dd445007999f7534a8e5d17656
diff --git a/metadata/md5-cache/sci-biology/seqan-1.4.2-r1 b/metadata/md5-cache/sci-biology/seqan-1.4.2-r1
index 745c49fd0060..5b7fd2a3f9f4 100644
--- a/metadata/md5-cache/sci-biology/seqan-1.4.2-r1
+++ b/metadata/md5-cache/sci-biology/seqan-1.4.2-r1
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2 sys-libs/zlib
 REQUIRED_USE=cpu_flags_x86_sse4_1
 SLOT=1.4
 SRC_URI=http://packages.seqan.de/seqan-src/seqan-src-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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1b7be060ecec73f1e66596a71b90a92a
diff --git a/metadata/md5-cache/sci-biology/seqan-2.2.0-r1 b/metadata/md5-cache/sci-biology/seqan-2.2.0-r1
index 8f452a076482..1023358c1b94 100644
--- a/metadata/md5-cache/sci-biology/seqan-2.2.0-r1
+++ b/metadata/md5-cache/sci-biology/seqan-2.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2 sys-libs/zlib !!sci-biology/seqan:2.0 !!sci-biology/seqan
 REQUIRED_USE=cpu_flags_x86_sse4_1
 SLOT=0
 SRC_URI=http://packages.seqan.de/seqan-src/seqan-src-2.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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=aaf78a04252c5e6c2b92b04c7211b73c
diff --git a/metadata/md5-cache/sci-biology/seqan-2.4.0 b/metadata/md5-cache/sci-biology/seqan-2.4.0
index 042cbb9a1635..88c58f720d24 100644
--- a/metadata/md5-cache/sci-biology/seqan-2.4.0
+++ b/metadata/md5-cache/sci-biology/seqan-2.4.0
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2:= sys-libs/zlib:= !!sci-biology/seqan:2.0 !!sci-biology/s
 REQUIRED_USE=cpu_flags_x86_sse4_1
 SLOT=0
 SRC_URI=https://github.com/seqan/seqan/archive/seqan-v2.4.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	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ca34cde2b2fc2f8692469a016bc077f6
diff --git a/metadata/md5-cache/sci-biology/seqan-9999 b/metadata/md5-cache/sci-biology/seqan-9999
index a2d2469a07ee..0a1181d5bb9c 100644
--- a/metadata/md5-cache/sci-biology/seqan-9999
+++ b/metadata/md5-cache/sci-biology/seqan-9999
@@ -8,5 +8,5 @@ LICENSE=BSD GPL-3
 RDEPEND=app-arch/bzip2:= sys-libs/zlib:= !!sci-biology/seqan:2.0 !!sci-biology/seqan:2.1 !!sci-biology/seqan:2.2
 REQUIRED_USE=cpu_flags_x86_sse4_1
 SLOT=0
-_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	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=954c2a9b05e60f6a61eb27c1cc720117
diff --git a/metadata/md5-cache/sci-biology/uchime-4.2.40 b/metadata/md5-cache/sci-biology/uchime-4.2.40
index 0f5a6483e98f..b8389d7bb00d 100644
--- a/metadata/md5-cache/sci-biology/uchime-4.2.40
+++ b/metadata/md5-cache/sci-biology/uchime-4.2.40
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://drive5.com/uchime/uchime4.2.40_src.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6adcbb8c658bdc3c40f797c61f5c58b0
diff --git a/metadata/md5-cache/sci-biology/vienna-rna-2.1.1 b/metadata/md5-cache/sci-biology/vienna-rna-2.1.1
index 09f8eb3560c7..f8a8fe5aa56e 100644
--- a/metadata/md5-cache/sci-biology/vienna-rna-2.1.1
+++ b/metadata/md5-cache/sci-biology/vienna-rna-2.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl media-libs/gd doc? ( dev-texlive/texlive-latex ) python? (
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=http://www.tbi.univie.ac.at/~ronny/RNA/ViennaRNA-2.1.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1e58c830b49ced05ae9960fcc2dead13
diff --git a/metadata/md5-cache/sci-biology/vienna-rna-2.1.8 b/metadata/md5-cache/sci-biology/vienna-rna-2.1.8
index 98cbec3b705a..5e369f2ce550 100644
--- a/metadata/md5-cache/sci-biology/vienna-rna-2.1.8
+++ b/metadata/md5-cache/sci-biology/vienna-rna-2.1.8
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl media-libs/gd doc? ( dev-texlive/texlive-latex ) python? (
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=http://www.tbi.univie.ac.at/RNA/packages/source/ViennaRNA-2.1.8.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b2a6486af275e75c6365ab7eeba1e0bd
diff --git a/metadata/md5-cache/sci-calculators/Manifest.gz b/metadata/md5-cache/sci-calculators/Manifest.gz
index 656e52ed87fb..7e872f7b6332 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/galculator-2.1.4 b/metadata/md5-cache/sci-calculators/galculator-2.1.4
index 7c16d919a09c..e2d80b381c50 100644
--- a/metadata/md5-cache/sci-calculators/galculator-2.1.4
+++ b/metadata/md5-cache/sci-calculators/galculator-2.1.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:3 x11-libs/pango
 SLOT=0
 SRC_URI=http://galculator.mnim.org/downloads/galculator-2.1.4.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=0cf59cae3bcdae580642576070839222
diff --git a/metadata/md5-cache/sci-calculators/hcalc-1.2-r1 b/metadata/md5-cache/sci-calculators/hcalc-1.2-r1
index 01ba133a5663..0a65f8081aa5 100644
--- a/metadata/md5-cache/sci-calculators/hcalc-1.2-r1
+++ b/metadata/md5-cache/sci-calculators/hcalc-1.2-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXpm
 SLOT=0
 SRC_URI=mirror://github/jlec/hcalc/hcalc-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0f2e9fe5fed4c387ca3d40dae698a9f0
diff --git a/metadata/md5-cache/sci-calculators/qalculate-gtk-0.9.9 b/metadata/md5-cache/sci-calculators/qalculate-gtk-0.9.9
index 8079ce0491fa..6919a091a5b9 100644
--- a/metadata/md5-cache/sci-calculators/qalculate-gtk-0.9.9
+++ b/metadata/md5-cache/sci-calculators/qalculate-gtk-0.9.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sci-libs/libqalculate-0.9.9:= x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://github.com/Qalculate/qalculate-gtk/releases/download/v0.9.9/qalculate-gtk-0.9.9.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=3371070cd45ed6e6ea6fb5126314d9d5
diff --git a/metadata/md5-cache/sci-calculators/qalculate-gtk-2.2.0 b/metadata/md5-cache/sci-calculators/qalculate-gtk-2.2.0
index 24ed65aa1789..63231bde898e 100644
--- a/metadata/md5-cache/sci-calculators/qalculate-gtk-2.2.0
+++ b/metadata/md5-cache/sci-calculators/qalculate-gtk-2.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sci-libs/libqalculate-2.2.0:= x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://github.com/Qalculate/qalculate-gtk/releases/download/v2.2.0/qalculate-gtk-2.2.0.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=90d02484c65a967c37d3aea2d04fb131
diff --git a/metadata/md5-cache/sci-calculators/speedcrunch-0.12.0 b/metadata/md5-cache/sci-calculators/speedcrunch-0.12.0
index 71c388227e63..1c08bf3adecf 100644
--- a/metadata/md5-cache/sci-calculators/speedcrunch-0.12.0
+++ b/metadata/md5-cache/sci-calculators/speedcrunch-0.12.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qthelp:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://bitbucket.org/heldercorreia/speedcrunch/get/release-0.12.0.tar.gz -> speedcrunch-0.12.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=62870e7931aed813a573ce345e490223
diff --git a/metadata/md5-cache/sci-chemistry/GromacsWrapper-0.7.0 b/metadata/md5-cache/sci-chemistry/GromacsWrapper-0.7.0
index 69e692d844ec..12e949e3fb97 100644
--- a/metadata/md5-cache/sci-chemistry/GromacsWrapper-0.7.0
+++ b/metadata/md5-cache/sci-chemistry/GromacsWrapper-0.7.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/matplotlib-0.91.3[python_targets_python2_7(-)?,python_targe
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/Becksteinlab/GromacsWrapper/archive/release-0.7.0.tar.gz -> GromacsWrapper-0.7.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a9d4690552f590503ce659c78737f079
diff --git a/metadata/md5-cache/sci-chemistry/MDAnalysis-0.18.0 b/metadata/md5-cache/sci-chemistry/MDAnalysis-0.18.0
index 5facaeb39474..cf723acec6cf 100644
--- a/metadata/md5-cache/sci-chemistry/MDAnalysis-0.18.0
+++ b/metadata/md5-cache/sci-chemistry/MDAnalysis-0.18.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/M/MDAnalysis/MDAnalysis-0.18.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=18dcf311ec7bbdd23b9c0402adabe534
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index 09dca2296d62..d9127ed713fd 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/ParmEd-2.7.3 b/metadata/md5-cache/sci-chemistry/ParmEd-2.7.3
index 66d1db3b1acb..07dc0534bbee 100644
--- a/metadata/md5-cache/sci-chemistry/ParmEd-2.7.3
+++ b/metadata/md5-cache/sci-chemistry/ParmEd-2.7.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/ParmEd/ParmEd/archive/2.7.3.tar.gz -> ParmEd-2.7.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bd0aae20d1121c134defe3190961693a
diff --git a/metadata/md5-cache/sci-chemistry/ParmEd-3.0.3 b/metadata/md5-cache/sci-chemistry/ParmEd-3.0.3
index 7c7fa817a783..39be7fc93b3b 100644
--- a/metadata/md5-cache/sci-chemistry/ParmEd-3.0.3
+++ b/metadata/md5-cache/sci-chemistry/ParmEd-3.0.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/ParmEd/ParmEd/archive/3.0.3.tar.gz -> ParmEd-3.0.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=607b31630e78dc7fb3a8fa8e4c8aacd8
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 e2eab0a448dc..07aa43fb9592 100644
--- a/metadata/md5-cache/sci-chemistry/apbs-1.4.1-r2
+++ b/metadata/md5-cache/sci-chemistry/apbs-1.4.1-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-cpp/eigen:3 dev-libs/maloc[mpi=] virtual/blas sys-libs/readline fetk
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/sci-chemistry/avogadro2-1.90.0_p20180211 b/metadata/md5-cache/sci-chemistry/avogadro2-1.90.0_p20180211
index 658dc68ce5d9..1168ebf04e19 100644
--- a/metadata/md5-cache/sci-chemistry/avogadro2-1.90.0_p20180211
+++ b/metadata/md5-cache/sci-chemistry/avogadro2-1.90.0_p20180211
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sci-libs/avogadrolib
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/OpenChemistry/avogadroapp/archive/d5e1f827be7e9d1cc6755fd68a2b42b0b1d2ec32.tar.gz -> avogadro2-1.90.0_p20180211.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=391c91cbb9b9fd9d096fa536ad81fa48
diff --git a/metadata/md5-cache/sci-chemistry/ball-1.5.0_pre20180419 b/metadata/md5-cache/sci-chemistry/ball-1.5.0_pre20180419
index 3492b2877ba9..33ad1508db72 100644
--- a/metadata/md5-cache/sci-chemistry/ball-1.5.0_pre20180419
+++ b/metadata/md5-cache/sci-chemistry/ball-1.5.0_pre20180419
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( python_targets_python2_7 ) threads? ( fftw ) webengine? (
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/BALL-Project/ball/archive/e80b5e2021a72faa36bf9e35207998d4590f2cf4.tar.gz -> ball-1.5.0_pre20180419.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=add5ac25948a2c546744c631b54a616d
diff --git a/metadata/md5-cache/sci-chemistry/bkchem-0.14.0_pre2-r2 b/metadata/md5-cache/sci-chemistry/bkchem-0.14.0_pre2-r2
index c56d2da4b6c2..411eb88c5770 100644
--- a/metadata/md5-cache/sci-chemistry/bkchem-0.14.0_pre2-r2
+++ b/metadata/md5-cache/sci-chemistry/bkchem-0.14.0_pre2-r2
@@ -10,5 +10,5 @@ RDEPEND=cairo? ( dev-python/pycairo[python_targets_python2_7(-)?,-python_single_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://bkchem.zirael.org/download/bkchem-0.14.0-pre2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f1633240a6e979c6aa07d3004b8f8a09
diff --git a/metadata/md5-cache/sci-chemistry/chemex-0.6.1 b/metadata/md5-cache/sci-chemistry/chemex-0.6.1
index 2a98bc0f93ea..98972f38cf67 100644
--- a/metadata/md5-cache/sci-chemistry/chemex-0.6.1
+++ b/metadata/md5-cache/sci-chemistry/chemex-0.6.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/matplotlib-1.1[python_targets_python2_7(-)?,-python_single_
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/gbouvignies/chemex/archive/0.6.1.tar.gz -> chemex-0.6.1.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=03312f8f2369be320c6294d4180a3c42
diff --git a/metadata/md5-cache/sci-chemistry/chemical-mime-data-0.1.94-r3 b/metadata/md5-cache/sci-chemistry/chemical-mime-data-0.1.94-r3
index abe5943dd1eb..9fac40a49ff0 100644
--- a/metadata/md5-cache/sci-chemistry/chemical-mime-data-0.1.94-r3
+++ b/metadata/md5-cache/sci-chemistry/chemical-mime-data-0.1.94-r3
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=gnome-base/gnome-mime-data x11-misc/shared-mime-info
 SLOT=0
 SRC_URI=mirror://sourceforge/chemical-mime/chemical-mime-data-0.1.94.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1487b2e6f40664c22cb2b54cc15c7fcc
diff --git a/metadata/md5-cache/sci-chemistry/gelemental-1.2.0-r1 b/metadata/md5-cache/sci-chemistry/gelemental-1.2.0-r1
index 9f1c94d2f813..0be2d2be439d 100644
--- a/metadata/md5-cache/sci-chemistry/gelemental-1.2.0-r1
+++ b/metadata/md5-cache/sci-chemistry/gelemental-1.2.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3 MIT
 RDEPEND=dev-cpp/gtkmm:2.4 dev-cpp/glibmm:2
 SLOT=0
 SRC_URI=http://www.kdau.com/files/gelemental-1.2.0.tar.bz2 mirror://debian/pool/main/g/gelemental/gelemental_1.2.0-8.debian.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	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_=c12aedd5631001f3b869d124c29e80a7
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2016.2 b/metadata/md5-cache/sci-chemistry/gromacs-2016.2
index f26de502370b..335e472aa2ad 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2016.2
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2016.2
@@ -10,5 +10,5 @@ RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/bl
 REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) mkl? ( !blas !fftw !lapack )
 SLOT=0/2016.2
 SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-2016.2.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-2016.2.tar.gz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=73270c55dd4f7113d1e8e278cf4be737
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2016.5 b/metadata/md5-cache/sci-chemistry/gromacs-2016.5
index eeae05e8010a..6a70d882f95a 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2016.5
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2016.5
@@ -10,5 +10,5 @@ RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/bl
 REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) mkl? ( !blas !fftw !lapack )
 SLOT=0/2016.5
 SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-2016.5.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-2016.5.tar.gz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=73069a3501e9bd0cc41da4d01fe91c59
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2016.9999 b/metadata/md5-cache/sci-chemistry/gromacs-2016.9999
index 830660a49dbc..dc5e3b5d307f 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2016.9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2016.9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD )
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi )
 REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) mkl? ( !blas !fftw !lapack )
 SLOT=0/2016.9999
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3495d5feff978b22807c08c0c4c8c03c
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2018.1 b/metadata/md5-cache/sci-chemistry/gromacs-2018.1
index 6a9a959ff2b7..0b307782cd65 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2018.1
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2018.1
@@ -10,5 +10,5 @@ RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/bl
 REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack )
 SLOT=0/2018.1
 SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-2018.1.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-2018.1.tar.gz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=48c913af6e554e0dce78bff52433778a
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2018.2 b/metadata/md5-cache/sci-chemistry/gromacs-2018.2
index a58d63416e55..31d11ae91f4f 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2018.2
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2018.2
@@ -10,5 +10,5 @@ RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/bl
 REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack )
 SLOT=0/2018.2
 SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-2018.2.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-2018.2.tar.gz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9999da568916ce3d7d045996d0fae5df
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2018.3 b/metadata/md5-cache/sci-chemistry/gromacs-2018.3
index 8f1ac4ae5655..5986810267f1 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2018.3
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2018.3
@@ -10,5 +10,5 @@ RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/bl
 REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack )
 SLOT=0/2018.3
 SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-2018.3.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-2018.3.tar.gz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9999da568916ce3d7d045996d0fae5df
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2018.9999 b/metadata/md5-cache/sci-chemistry/gromacs-2018.9999
index efe58ced84ea..755048f6dc91 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2018.9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2018.9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD )
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi )
 REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack )
 SLOT=0/2018.9999
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9999da568916ce3d7d045996d0fae5df
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-4.6.9999 b/metadata/md5-cache/sci-chemistry/gromacs-4.6.9999
index edb400ba1629..bbc9975c27bd 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-4.6.9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-4.6.9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD )
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) fftw? ( sci-libs/fftw:3.0 ) gsl? ( sci-libs/gsl ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi )
 REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) mkl? ( !blas !fftw !lapack )
 SLOT=0/4.6.9999
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=88c3797b1c0d776df583435ac1199f8d
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-5.0.4 b/metadata/md5-cache/sci-chemistry/gromacs-5.0.4
index 01f38006c112..97c1532df47d 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-5.0.4
+++ b/metadata/md5-cache/sci-chemistry/gromacs-5.0.4
@@ -10,5 +10,5 @@ RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/bl
 REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) mkl? ( !blas !fftw !lapack )
 SLOT=0/5.0.4
 SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-5.0.4.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-5.0.4.tar.gz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	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	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	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	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0977dfc51fd4bef012cbea7072c49d1a
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-5.0.9999 b/metadata/md5-cache/sci-chemistry/gromacs-5.0.9999
index 281d39fe78a8..32548e6437cc 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-5.0.9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-5.0.9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD )
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) boost? ( >=dev-libs/boost-1.55 ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) fftw? ( sci-libs/fftw:3.0 ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi )
 REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) mkl? ( !blas !fftw !lapack )
 SLOT=0/5.0.9999
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3badc4fa6539107c36fe98256bfcae90
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-5.1.3 b/metadata/md5-cache/sci-chemistry/gromacs-5.1.3
index ffd6087fae52..197ecf94d253 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-5.1.3
+++ b/metadata/md5-cache/sci-chemistry/gromacs-5.1.3
@@ -10,5 +10,5 @@ RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/bl
 REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) mkl? ( !blas !fftw !lapack )
 SLOT=0/5.1.3
 SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-5.1.3.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-5.1.3.tar.gz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7cdd305e135195a36cbccdcab09c4699
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-5.1.9999 b/metadata/md5-cache/sci-chemistry/gromacs-5.1.9999
index ff928dcf6787..d03b3da608a6 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-5.1.9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-5.1.9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD )
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) boost? ( >=dev-libs/boost-1.55 ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) fftw? ( sci-libs/fftw:3.0 ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi )
 REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) mkl? ( !blas !fftw !lapack )
 SLOT=0/5.1.9999
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7cdd305e135195a36cbccdcab09c4699
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-9999 b/metadata/md5-cache/sci-chemistry/gromacs-9999
index 5161be308b94..20ebc837f57a 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD )
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi )
 REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) mkl? ( !blas !fftw !lapack )
 SLOT=0/9999
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b85be5a83f00ecdf56154f19c818e6aa
diff --git a/metadata/md5-cache/sci-chemistry/mdtraj-1.9.1 b/metadata/md5-cache/sci-chemistry/mdtraj-1.9.1
index 6c127f621c8b..6525975bfab2 100644
--- a/metadata/md5-cache/sci-chemistry/mdtraj-1.9.1
+++ b/metadata/md5-cache/sci-chemistry/mdtraj-1.9.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mdtraj/mdtraj-1.9.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bf8b1c2b5ce3aaa4234b24e222534dbb
diff --git a/metadata/md5-cache/sci-chemistry/mm-align-20120321 b/metadata/md5-cache/sci-chemistry/mm-align-20120321
index 1e720f671dfa..9cb469be2091 100644
--- a/metadata/md5-cache/sci-chemistry/mm-align-20120321
+++ b/metadata/md5-cache/sci-chemistry/mm-align-20120321
@@ -8,5 +8,5 @@ LICENSE=tm-align
 RDEPEND=virtual/fortran
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/MM-align-20120321.tar.xz
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=49c7ebd406de721ad41571fdc9428f3f
diff --git a/metadata/md5-cache/sci-chemistry/modeller-9.20 b/metadata/md5-cache/sci-chemistry/modeller-9.20
index 3c0f2f494e5d..3822952b7804 100644
--- a/metadata/md5-cache/sci-chemistry/modeller-9.20
+++ b/metadata/md5-cache/sci-chemistry/modeller-9.20
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://salilab.org/modeller/9.20/modeller-9.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=ee65458b50a4900e4aae940f90888ece
diff --git a/metadata/md5-cache/sci-chemistry/molequeue-0.8.0 b/metadata/md5-cache/sci-chemistry/molequeue-0.8.0
index 0a1db1e23fed..67aacc8b751e 100644
--- a/metadata/md5-cache/sci-chemistry/molequeue-0.8.0
+++ b/metadata/md5-cache/sci-chemistry/molequeue-0.8.0
@@ -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 server? ( client ) test? ( server )
 SLOT=0
 SRC_URI=https://github.com/OpenChemistry/molequeue/archive/0.8.0.tar.gz -> molequeue-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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bbfcb0263c616c8a8e05654d801bc1a0
diff --git a/metadata/md5-cache/sci-chemistry/molequeue-0.9.0 b/metadata/md5-cache/sci-chemistry/molequeue-0.9.0
index 03b3c4aa178a..4cf499aea12a 100644
--- a/metadata/md5-cache/sci-chemistry/molequeue-0.9.0
+++ b/metadata/md5-cache/sci-chemistry/molequeue-0.9.0
@@ -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 server? ( client ) test? ( server )
 SLOT=0
 SRC_URI=https://github.com/OpenChemistry/molequeue/archive/0.9.0.tar.gz -> molequeue-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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e85bdeb8b1749bdf5adb124f7031ad00
diff --git a/metadata/md5-cache/sci-chemistry/molsketch-0.4.1-r1 b/metadata/md5-cache/sci-chemistry/molsketch-0.4.1-r1
index 389b99f790ca..f90cd9c7beb0 100644
--- a/metadata/md5-cache/sci-chemistry/molsketch-0.4.1-r1
+++ b/metadata/md5-cache/sci-chemistry/molsketch-0.4.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sci-chemistry/openbabel-2.2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=mirror://sourceforge/project/molsketch/Molsketch/Beryllium-7%200.4.1/Molsketch-0.4.1-src.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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b45b296034ade945ccc335907c045895
diff --git a/metadata/md5-cache/sci-chemistry/nmrglue-0.5-r1 b/metadata/md5-cache/sci-chemistry/nmrglue-0.5-r1
index 4be2be48528e..98986ac80494 100644
--- a/metadata/md5-cache/sci-chemistry/nmrglue-0.5-r1
+++ b/metadata/md5-cache/sci-chemistry/nmrglue-0.5-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/matplotlib[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
 SRC_URI=https://github.com/jjhelmus/nmrglue/releases/download/v0.5/nmrglue-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f8e983d59085ca640e37002c4bc3a902
diff --git a/metadata/md5-cache/sci-chemistry/openbabel-2.3.2-r1 b/metadata/md5-cache/sci-chemistry/openbabel-2.3.2-r1
index f9f1f60f4502..59ff5e1f7132 100644
--- a/metadata/md5-cache/sci-chemistry/openbabel-2.3.2-r1
+++ b/metadata/md5-cache/sci-chemistry/openbabel-2.3.2-r1
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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-2.4.1 b/metadata/md5-cache/sci-chemistry/openbabel-2.4.1
index d06aeeb3f2f1..fb07fec0c063 100644
--- a/metadata/md5-cache/sci-chemistry/openbabel-2.4.1
+++ b/metadata/md5-cache/sci-chemistry/openbabel-2.4.1
@@ -9,5 +9,5 @@ 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/5.0.0
 SRC_URI=mirror://sourceforge/openbabel/openbabel-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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=4caa4d1a535fbb669ff9539f77cd1032
diff --git a/metadata/md5-cache/sci-chemistry/openbabel-perl-2.3.2 b/metadata/md5-cache/sci-chemistry/openbabel-perl-2.3.2
index 67f67f619247..8e28c1297d72 100644
--- a/metadata/md5-cache/sci-chemistry/openbabel-perl-2.3.2
+++ b/metadata/md5-cache/sci-chemistry/openbabel-perl-2.3.2
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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-perl-2.4.1 b/metadata/md5-cache/sci-chemistry/openbabel-perl-2.4.1
index 6ca6e09f7767..025c954dca5a 100644
--- a/metadata/md5-cache/sci-chemistry/openbabel-perl-2.4.1
+++ b/metadata/md5-cache/sci-chemistry/openbabel-perl-2.4.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl:= ~sci-chemistry/openbabel-2.4.1 dev-lang/perl:=
 SLOT=0/5
 SRC_URI=mirror://sourceforge/openbabel/openbabel-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	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a91e9cd1c3c738647d120c74e710f8e6
diff --git a/metadata/md5-cache/sci-chemistry/openbabel-python-2.3.2 b/metadata/md5-cache/sci-chemistry/openbabel-python-2.3.2
index fd9f639c4fa0..c9b818711f70 100644
--- a/metadata/md5-cache/sci-chemistry/openbabel-python-2.3.2
+++ b/metadata/md5-cache/sci-chemistry/openbabel-python-2.3.2
@@ -10,5 +10,5 @@ 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 )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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/openbabel-python-2.4.1-r1 b/metadata/md5-cache/sci-chemistry/openbabel-python-2.4.1-r1
index b4370584c728..ed8138c06baa 100644
--- a/metadata/md5-cache/sci-chemistry/openbabel-python-2.4.1-r1
+++ b/metadata/md5-cache/sci-chemistry/openbabel-python-2.4.1-r1
@@ -10,5 +10,5 @@ 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 )
 SLOT=0/5
 SRC_URI=mirror://sourceforge/openbabel/openbabel-2.4.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=fb2f770ca5b7001f8b342b6ca9b47ce0
diff --git a/metadata/md5-cache/sci-chemistry/p3d-0.4.3-r1 b/metadata/md5-cache/sci-chemistry/p3d-0.4.3-r1
index 1eea56fb1fca..c8e60de15988 100644
--- a/metadata/md5-cache/sci-chemistry/p3d-0.4.3-r1
+++ b/metadata/md5-cache/sci-chemistry/p3d-0.4.3-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://nodeload.github.com/fu/p3d/tarball/0.4.3 -> p3d-0.4.3.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-snapshot	b77011b62e2053c646ad720defe6d921	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-snapshot	b77011b62e2053c646ad720defe6d921	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9e3832010a5347eb6c9e4bba5441e9a5
diff --git a/metadata/md5-cache/sci-chemistry/p3d-9999 b/metadata/md5-cache/sci-chemistry/p3d-9999
index b4695ca00be3..b5c1c22e82d1 100644
--- a/metadata/md5-cache/sci-chemistry/p3d-9999
+++ b/metadata/md5-cache/sci-chemistry/p3d-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=588877767f6990c41eead2c39b098d8b
diff --git a/metadata/md5-cache/sci-chemistry/parassign-20130522 b/metadata/md5-cache/sci-chemistry/parassign-20130522
index f20fd215b2f6..eaa7f0cb8ed9 100644
--- a/metadata/md5-cache/sci-chemistry/parassign-20130522
+++ b/metadata/md5-cache/sci-chemistry/parassign-20130522
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 ) || ( python_targets_python2_7 )
 RESTRICT=fetch
 SLOT=0
 SRC_URI=PARAssign_Linux_x64_86.tgz
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=799a8d9a4cdb92870a2de2d603db67e9
diff --git a/metadata/md5-cache/sci-chemistry/pdbcat-1.3 b/metadata/md5-cache/sci-chemistry/pdbcat-1.3
index b7d3c08cbecd..08e48eb9a3e2 100644
--- a/metadata/md5-cache/sci-chemistry/pdbcat-1.3
+++ b/metadata/md5-cache/sci-chemistry/pdbcat-1.3
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=free-noncomm
 SLOT=0
 SRC_URI=http://www.ks.uiuc.edu/Development/MDTools/pdbcat/files/pdbcat-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4ebe1185f44e21cb0c7d7cbb291a8b30
diff --git a/metadata/md5-cache/sci-chemistry/pdbmat-3.89 b/metadata/md5-cache/sci-chemistry/pdbmat-3.89
index 2b7b95c658f4..283407190752 100644
--- a/metadata/md5-cache/sci-chemistry/pdbmat-3.89
+++ b/metadata/md5-cache/sci-chemistry/pdbmat-3.89
@@ -9,5 +9,5 @@ LICENSE=CeCILL-2
 RDEPEND=virtual/fortran
 SLOT=0
 SRC_URI=http://ecole.modelisation.free.fr/enm2011.tar.gz -> pdbmat-3.89.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5de2f612591221cdc5d57106eab44a2a
diff --git a/metadata/md5-cache/sci-chemistry/prody-1.6 b/metadata/md5-cache/sci-chemistry/prody-1.6
index 5a8d903acfb3..1f32f1de80f6 100644
--- a/metadata/md5-cache/sci-chemistry/prody-1.6
+++ b/metadata/md5-cache/sci-chemistry/prody-1.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/ipython[python_targets_python2_7(-)?,-python_single_target_py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/prody/ProDy/archive/v1.6.tar.gz -> prody-1.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ec3075eb7c34897bec8cd637a3b26c45
diff --git a/metadata/md5-cache/sci-chemistry/propka-3.1_p140511 b/metadata/md5-cache/sci-chemistry/propka-3.1_p140511
index 26c8b99eec8b..025b3c52f8f7 100644
--- a/metadata/md5-cache/sci-chemistry/propka-3.1_p140511
+++ b/metadata/md5-cache/sci-chemistry/propka-3.1_p140511
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/propka-3.1_p140511.tar.xz
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=77a50416f48bdac3be53689262fbd770
diff --git a/metadata/md5-cache/sci-chemistry/pymol-1.8.4.0-r1 b/metadata/md5-cache/sci-chemistry/pymol-1.8.4.0-r1
index 859f29f9046c..2e76e4c0b210 100644
--- a/metadata/md5-cache/sci-chemistry/pymol-1.8.4.0-r1
+++ b/metadata/md5-cache/sci-chemistry/pymol-1.8.4.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/pymol-1.8.4.0.png.xz mirror://sourceforge/project/pymol/pymol/1.8/pymol-v1.8.4.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2c0832bce75bfa0bb6f397cad9361276
diff --git a/metadata/md5-cache/sci-chemistry/pymol-1.8.6.0 b/metadata/md5-cache/sci-chemistry/pymol-1.8.6.0
index a6ab55a73349..2e1e342a5dfa 100644
--- a/metadata/md5-cache/sci-chemistry/pymol-1.8.6.0
+++ b/metadata/md5-cache/sci-chemistry/pymol-1.8.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/pymol-1.8.4.0.png.xz mirror://sourceforge/project/pymol/pymol/1.8/pymol-v1.8.6.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=657fbebc8c3871a98238d2a848552252
diff --git a/metadata/md5-cache/sci-chemistry/pymol-2.1.0 b/metadata/md5-cache/sci-chemistry/pymol-2.1.0
index 86551a1587a4..4adcbc402669 100644
--- a/metadata/md5-cache/sci-chemistry/pymol-2.1.0
+++ b/metadata/md5-cache/sci-chemistry/pymol-2.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/pymol-1.8.4.0.png.xz mirror://sourceforge/project/pymol/pymol/2/pymol-v2.1.0.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=222060b14c51ebf3352e0a8e60e734eb
diff --git a/metadata/md5-cache/sci-chemistry/pymol-plugins-psico-3.1-r1 b/metadata/md5-cache/sci-chemistry/pymol-plugins-psico-3.1-r1
index 822f1ff7da51..f33aa8cb9fd6 100644
--- a/metadata/md5-cache/sci-chemistry/pymol-plugins-psico-3.1-r1
+++ b/metadata/md5-cache/sci-chemistry/pymol-plugins-psico-3.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/speleo3/pymol-psico/tarball/3.1 -> pymol-plugins-psico-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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=43ad844b1f16b243dd59f0b441ca5da8
diff --git a/metadata/md5-cache/sci-chemistry/tm-align-20140601 b/metadata/md5-cache/sci-chemistry/tm-align-20140601
index ad2a520d4314..277f1d2c3e7d 100644
--- a/metadata/md5-cache/sci-chemistry/tm-align-20140601
+++ b/metadata/md5-cache/sci-chemistry/tm-align-20140601
@@ -9,5 +9,5 @@ LICENSE=tm-align
 RDEPEND=virtual/fortran
 SLOT=0
 SRC_URI=http://zhanglab.ccmb.med.umich.edu/TM-align/TMtools20140601.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=64e4ccba0de1d22ed789ce34e6a78765
diff --git a/metadata/md5-cache/sci-chemistry/tm-align-20150914 b/metadata/md5-cache/sci-chemistry/tm-align-20150914
index be8a02e7ec89..d273814c79e4 100644
--- a/metadata/md5-cache/sci-chemistry/tm-align-20150914
+++ b/metadata/md5-cache/sci-chemistry/tm-align-20150914
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/sci-chemistry/votca-csg-1.4 b/metadata/md5-cache/sci-chemistry/votca-csg-1.4
index cf87b19c9401..10a87af26d19 100644
--- a/metadata/md5-cache/sci-chemistry/votca-csg-1.4
+++ b/metadata/md5-cache/sci-chemistry/votca-csg-1.4
@@ -10,5 +10,5 @@ PDEPEND=extras? ( ~sci-chemistry/votca-csgapps-1.4 )
 RDEPEND=~sci-libs/votca-tools-1.4 gromacs? ( sci-chemistry/gromacs:= ) hdf5? ( sci-libs/hdf5 ) dev-lang/perl app-shells/bash:*
 SLOT=0
 SRC_URI=https://github.com/votca/csg/archive/v1.4.tar.gz -> votca-csg-1.4.tar.gz doc? ( https://github.com/votca/csg-manual/releases/download/v1.4/votca-csg-manual-1.4.pdf ) examples? ( https://github.com/votca/csg-tutorials/archive/v1.4.tar.gz -> votca-csg-tutorials-1.4.tar.gz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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_=21f28169dc7d4d4b46052ec461640bba
diff --git a/metadata/md5-cache/sci-chemistry/votca-csg-1.4.1 b/metadata/md5-cache/sci-chemistry/votca-csg-1.4.1
index 966524107870..5b99de277d94 100644
--- a/metadata/md5-cache/sci-chemistry/votca-csg-1.4.1
+++ b/metadata/md5-cache/sci-chemistry/votca-csg-1.4.1
@@ -10,5 +10,5 @@ PDEPEND=extras? ( ~sci-chemistry/votca-csgapps-1.4.1 )
 RDEPEND=~sci-libs/votca-tools-1.4.1 gromacs? ( sci-chemistry/gromacs:= ) hdf5? ( sci-libs/hdf5 ) dev-lang/perl app-shells/bash:*
 SLOT=0
 SRC_URI=https://github.com/votca/csg/archive/v1.4.1.tar.gz -> votca-csg-1.4.1.tar.gz doc? ( https://github.com/votca/csg-manual/releases/download/v1.4.1/votca-csg-manual-1.4.1.pdf ) examples? ( https://github.com/votca/csg-tutorials/archive/v1.4.1.tar.gz -> votca-csg-tutorials-1.4.1.tar.gz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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_=33b5f825d975286621e7d350bdc30fb1
diff --git a/metadata/md5-cache/sci-chemistry/votca-csg-9999 b/metadata/md5-cache/sci-chemistry/votca-csg-9999
index 2729acc7db09..101b9c9fdbea 100644
--- a/metadata/md5-cache/sci-chemistry/votca-csg-9999
+++ b/metadata/md5-cache/sci-chemistry/votca-csg-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 PDEPEND=extras? ( ~sci-chemistry/votca-csgapps-9999 ) doc? ( ~app-doc/votca-csg-manual-9999 )
 RDEPEND=~sci-libs/votca-tools-9999 >=dev-cpp/eigen-3.3 gromacs? ( sci-chemistry/gromacs:= ) hdf5? ( sci-libs/hdf5 ) dev-lang/perl app-shells/bash:*
 SLOT=0
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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_=53178a04d2589462bfa2ee44d850b7bb
diff --git a/metadata/md5-cache/sci-chemistry/votca-csgapps-1.4 b/metadata/md5-cache/sci-chemistry/votca-csgapps-1.4
index c5988d921981..936445a4faed 100644
--- a/metadata/md5-cache/sci-chemistry/votca-csgapps-1.4
+++ b/metadata/md5-cache/sci-chemistry/votca-csgapps-1.4
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=~sci-chemistry/votca-csg-1.4
 SLOT=0
 SRC_URI=https://github.com/votca/csgapps/archive/v1.4.tar.gz -> votca-csgapps-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c5ea9cb22c7ea08a3e5de84db8643c58
diff --git a/metadata/md5-cache/sci-chemistry/votca-csgapps-1.4.1 b/metadata/md5-cache/sci-chemistry/votca-csgapps-1.4.1
index 67caffbfe086..f293261dcd50 100644
--- a/metadata/md5-cache/sci-chemistry/votca-csgapps-1.4.1
+++ b/metadata/md5-cache/sci-chemistry/votca-csgapps-1.4.1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=~sci-chemistry/votca-csg-1.4.1
 SLOT=0
 SRC_URI=https://github.com/votca/csgapps/archive/v1.4.1.tar.gz -> votca-csgapps-1.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=8bd22e15b79424c684c4f8e614b48065
diff --git a/metadata/md5-cache/sci-chemistry/votca-csgapps-9999 b/metadata/md5-cache/sci-chemistry/votca-csgapps-9999
index 5f4a3027e1a9..d36109517f2d 100644
--- a/metadata/md5-cache/sci-chemistry/votca-csgapps-9999
+++ b/metadata/md5-cache/sci-chemistry/votca-csgapps-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.votca.org
 LICENSE=Apache-2.0
 RDEPEND=>=dev-cpp/eigen-3.3 ~sci-chemistry/votca-csg-9999
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=403bca33fe7ac577357d991b9d0d8612
diff --git a/metadata/md5-cache/sci-chemistry/votca-ctp-9999 b/metadata/md5-cache/sci-chemistry/votca-ctp-9999
index beed8ca493a2..00172e3bd3b4 100644
--- a/metadata/md5-cache/sci-chemistry/votca-ctp-9999
+++ b/metadata/md5-cache/sci-chemistry/votca-ctp-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.votca.org
 LICENSE=Apache-2.0
 RDEPEND=~sci-libs/votca-tools-9999[sqlite] >=dev-cpp/eigen-3.3 sci-libs/gsl ~sci-chemistry/votca-csg-9999
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ad3e952f414816d1af4e83b3260b652d
diff --git a/metadata/md5-cache/sci-chemistry/votca-xtp-1.4 b/metadata/md5-cache/sci-chemistry/votca-xtp-1.4
index 6592d70ab28c..c44b9957ce86 100644
--- a/metadata/md5-cache/sci-chemistry/votca-xtp-1.4
+++ b/metadata/md5-cache/sci-chemistry/votca-xtp-1.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=~sci-libs/votca-tools-1.4[sqlite] ~sci-chemistry/votca-csg-1.4
 SLOT=0
 SRC_URI=https://github.com/votca/xtp/archive/v1.4.tar.gz -> votca-xtp-1.4.tar.gz doc? ( https://github.com/votca/xtp/releases/download/v1.4/votca-xtp-manual-1.4.pdf )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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_=7eeaea99e458b7df922c406551f5c63e
diff --git a/metadata/md5-cache/sci-chemistry/votca-xtp-1.4.1 b/metadata/md5-cache/sci-chemistry/votca-xtp-1.4.1
index bc2756869179..ab419d7de94f 100644
--- a/metadata/md5-cache/sci-chemistry/votca-xtp-1.4.1
+++ b/metadata/md5-cache/sci-chemistry/votca-xtp-1.4.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=~sci-libs/votca-tools-1.4.1[sqlite] ~sci-chemistry/votca-csg-1.4.1
 SLOT=0
 SRC_URI=https://github.com/votca/xtp/archive/v1.4.1.tar.gz -> votca-xtp-1.4.1.tar.gz doc? ( https://github.com/votca/xtp/releases/download/v1.4.1/votca-xtp-manual-1.4.1.pdf )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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_=1dd7d9abe5b920a5982b13e857cd615a
diff --git a/metadata/md5-cache/sci-chemistry/votca-xtp-9999 b/metadata/md5-cache/sci-chemistry/votca-xtp-9999
index dda31d1f2855..d34cd46c5e2a 100644
--- a/metadata/md5-cache/sci-chemistry/votca-xtp-9999
+++ b/metadata/md5-cache/sci-chemistry/votca-xtp-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=~sci-libs/votca-tools-9999[sqlite] >=dev-cpp/eigen-3.3 ~sci-chemistry/votca-csg-9999 ~sci-chemistry/votca-ctp-9999 doc? ( app-doc/doxygen[dot] dev-texlive/texlive-latexextra virtual/latex-base dev-tex/pgf ) >=app-text/txt2tags-2.5 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~sci-libs/votca-tools-9999[sqlite] >=dev-cpp/eigen-3.3 ~sci-chemistry/votca-csg-9999 ~sci-chemistry/votca-ctp-9999 sci-libs/ceres-solver sci-libs/libxc doc? ( app-doc/doxygen[dot] dev-texlive/texlive-latexextra virtual/latex-base dev-tex/pgf ) >=app-text/txt2tags-2.5 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Votca excitation and charge properties module
 EAPI=6
 HOMEPAGE=http://www.votca.org
 IUSE=doc
 LICENSE=Apache-2.0
-RDEPEND=~sci-libs/votca-tools-9999[sqlite] >=dev-cpp/eigen-3.3 ~sci-chemistry/votca-csg-9999 ~sci-chemistry/votca-ctp-9999
+RDEPEND=~sci-libs/votca-tools-9999[sqlite] >=dev-cpp/eigen-3.3 ~sci-chemistry/votca-csg-9999 ~sci-chemistry/votca-ctp-9999 sci-libs/ceres-solver sci-libs/libxc
 SLOT=0
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=45a460f22285fd66c21ea83cb7e77f5b
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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_=cd3ee9e1e14c23b9193d200f585b7e20
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index 20f1d76dfcce..9fa75b4a18dc 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/Stage-4.1.1 b/metadata/md5-cache/sci-electronics/Stage-4.1.1
index cd51a239cb5c..b0c55869f4a6 100644
--- a/metadata/md5-cache/sci-electronics/Stage-4.1.1
+++ b/metadata/md5-cache/sci-electronics/Stage-4.1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libltdl:0 virtual/jpeg:0 media-libs/libpng:0= x11-libs/fltk[opengl] virtual/glu virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/rtv/Stage/archive/v4.1.1.tar.gz -> Stage-4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e4ca5f9402b18313c9b43668384b7606
diff --git a/metadata/md5-cache/sci-electronics/Stage-4.3.0 b/metadata/md5-cache/sci-electronics/Stage-4.3.0
index 756a0acb0341..21ebf76eac27 100644
--- a/metadata/md5-cache/sci-electronics/Stage-4.3.0
+++ b/metadata/md5-cache/sci-electronics/Stage-4.3.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libltdl:0 virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= x11-libs/fltk[opengl] virtual/glu virtual/opengl
 SLOT=0/4.3
 SRC_URI=https://github.com/rtv/Stage/archive/v4.3.0.tar.gz -> Stage-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9766438d56e7a8aab00974f6adfb8ed5
diff --git a/metadata/md5-cache/sci-electronics/Stage-9999 b/metadata/md5-cache/sci-electronics/Stage-9999
index ccd9e2d933af..c74eb78f043c 100644
--- a/metadata/md5-cache/sci-electronics/Stage-9999
+++ b/metadata/md5-cache/sci-electronics/Stage-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://rtv.github.io/Stage/
 LICENSE=GPL-2
 RDEPEND=dev-libs/libltdl:0 virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= x11-libs/fltk[opengl] virtual/glu virtual/opengl
 SLOT=0/4.3
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5a411e8dc6438ab0480f9ae8fa15e36b
diff --git a/metadata/md5-cache/sci-electronics/electronics-menu-1.0-r1 b/metadata/md5-cache/sci-electronics/electronics-menu-1.0-r1
index abaf652bf0c7..f19ae164670a 100644
--- a/metadata/md5-cache/sci-electronics/electronics-menu-1.0-r1
+++ b/metadata/md5-cache/sci-electronics/electronics-menu-1.0-r1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm64 ppc ppc64 sparc x86 ~x86-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://geda.seul.org/dist/electronics-menu-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=30577284512c7d0260175aad8ab1ce50
diff --git a/metadata/md5-cache/sci-electronics/gazebo-9.3.0 b/metadata/md5-cache/sci-electronics/gazebo-9.3.0
index 77d3e86a2ecf..bd0f471410a7 100644
--- a/metadata/md5-cache/sci-electronics/gazebo-9.3.0
+++ b/metadata/md5-cache/sci-electronics/gazebo-9.3.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/protobuf-2:= virtual/opengl media-libs/openal net-misc/curl dev-libs/tinyxml >=dev-libs/tinyxml2-6:= dev-libs/libtar dev-cpp/tbb >=dev-games/ogre-1.7.4:=[freeimage] <dev-games/ogre-1.10 >=media-libs/freeimage-3.15.4[png] sci-libs/libccd libav? ( >=media-video/libav-9:0= ) !libav? ( >=media-video/ffmpeg-2.6:0= ) sci-libs/gts >=sci-physics/bullet-2.82 >=dev-libs/sdformat-6.0:= dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-libs/boost:=[threads] sci-libs/gdal:= virtual/libusb:1 dev-libs/libspnav media-libs/freeimage sci-libs/hdf5:=[cxx] sys-apps/util-linux media-gfx/graphviz net-libs/ignition-msgs:1= sci-libs/ignition-math:4= net-libs/ignition-transport:4= x11-libs/qwt:6=[qt5(+)]
 SLOT=0/9
 SRC_URI=https://osrf-distributions.s3.amazonaws.com/gazebo/releases/gazebo-9.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bcef1cded60ba9cc0cd99369ba44af10
diff --git a/metadata/md5-cache/sci-electronics/gazebo-9.3.1 b/metadata/md5-cache/sci-electronics/gazebo-9.3.1
index de4e6d724ce8..7246089777f1 100644
--- a/metadata/md5-cache/sci-electronics/gazebo-9.3.1
+++ b/metadata/md5-cache/sci-electronics/gazebo-9.3.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/protobuf-2:= virtual/opengl media-libs/openal net-misc/curl dev-libs/tinyxml >=dev-libs/tinyxml2-6:= dev-libs/libtar dev-cpp/tbb >=dev-games/ogre-1.7.4:=[freeimage] <dev-games/ogre-1.10 >=media-libs/freeimage-3.15.4[png] sci-libs/libccd libav? ( >=media-video/libav-9:0= ) !libav? ( >=media-video/ffmpeg-2.6:0= ) sci-libs/gts >=sci-physics/bullet-2.82 >=dev-libs/sdformat-6.0:= dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-libs/boost:=[threads] sci-libs/gdal:= virtual/libusb:1 dev-libs/libspnav media-libs/freeimage sci-libs/hdf5:=[cxx] sys-apps/util-linux media-gfx/graphviz net-libs/ignition-msgs:1= sci-libs/ignition-math:4= net-libs/ignition-transport:4= x11-libs/qwt:6=[qt5(+)]
 SLOT=0/9
 SRC_URI=https://osrf-distributions.s3.amazonaws.com/gazebo/releases/gazebo-9.3.1.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bcef1cded60ba9cc0cd99369ba44af10
diff --git a/metadata/md5-cache/sci-electronics/gazebo-9.4.1 b/metadata/md5-cache/sci-electronics/gazebo-9.4.1
new file mode 100644
index 000000000000..48d2baaf1368
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/gazebo-9.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-libs/protobuf-2:= virtual/opengl media-libs/openal net-misc/curl dev-libs/tinyxml >=dev-libs/tinyxml2-6:= dev-libs/libtar dev-cpp/tbb >=dev-games/ogre-1.7.4:=[freeimage] <dev-games/ogre-1.10 >=media-libs/freeimage-3.15.4[png] sci-libs/libccd libav? ( >=media-video/libav-9:0= ) !libav? ( >=media-video/ffmpeg-2.6:0= ) sci-libs/gts >=sci-physics/bullet-2.82 >=dev-libs/sdformat-6.0:= dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-libs/boost:=[threads] sci-libs/gdal:= virtual/libusb:1 dev-libs/libspnav media-libs/freeimage sci-libs/hdf5:=[cxx] sys-apps/util-linux media-gfx/graphviz net-libs/ignition-msgs:1= sci-libs/ignition-math:4= net-libs/ignition-transport:4= x11-libs/qwt:6=[qt5(+)] dev-qt/qttest:5 app-text/ronn app-arch/gzip virtual/pkgconfig x11-apps/mesa-progs test? ( dev-libs/libxslt ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A 3D multiple robot simulator with dynamics
+EAPI=5
+HOMEPAGE=http://gazebosim.org/
+IUSE=cpu_flags_x86_sse2 libav test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-libs/protobuf-2:= virtual/opengl media-libs/openal net-misc/curl dev-libs/tinyxml >=dev-libs/tinyxml2-6:= dev-libs/libtar dev-cpp/tbb >=dev-games/ogre-1.7.4:=[freeimage] <dev-games/ogre-1.10 >=media-libs/freeimage-3.15.4[png] sci-libs/libccd libav? ( >=media-video/libav-9:0= ) !libav? ( >=media-video/ffmpeg-2.6:0= ) sci-libs/gts >=sci-physics/bullet-2.82 >=dev-libs/sdformat-6.0:= dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-libs/boost:=[threads] sci-libs/gdal:= virtual/libusb:1 dev-libs/libspnav media-libs/freeimage sci-libs/hdf5:=[cxx] sys-apps/util-linux media-gfx/graphviz net-libs/ignition-msgs:1= sci-libs/ignition-math:4= net-libs/ignition-transport:4= x11-libs/qwt:6=[qt5(+)]
+SLOT=0/9
+SRC_URI=https://osrf-distributions.s3.amazonaws.com/gazebo/releases/gazebo-9.4.1.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=dc26e76ca549dc5de988a2eae84b8bce
diff --git a/metadata/md5-cache/sci-electronics/geda-1.8.2 b/metadata/md5-cache/sci-electronics/geda-1.8.2
index 2fe4de911d43..140a2eee7ff5 100644
--- a/metadata/md5-cache/sci-electronics/geda-1.8.2
+++ b/metadata/md5-cache/sci-electronics/geda-1.8.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 >=x11-libs/cairo-1.2.0 >=dev-scheme/guile-1.8[deprecated] <dev-scheme/guile-2.2 nls? ( virtual/libintl ) stroke? ( >=dev-libs/libstroke-0.5.1 ) sci-electronics/electronics-menu
 SLOT=0
 SRC_URI=http://ftp.geda-project.org/geda-gaf/stable/v1.8/1.8.2/geda-gaf-1.8.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=17da25648c7ef86fcf3773fe808f0ca3
diff --git a/metadata/md5-cache/sci-electronics/geda-1.9.2-r1 b/metadata/md5-cache/sci-electronics/geda-1.9.2-r1
index 417820eba2d9..e2789c0863da 100644
--- a/metadata/md5-cache/sci-electronics/geda-1.9.2-r1
+++ b/metadata/md5-cache/sci-electronics/geda-1.9.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/pango >=x11-libs/cairo-1.2.0 x11-libs/gdk-pixbuf >=dev-scheme/guile-2.0.0 nls? ( virtual/libintl ) stroke? ( >=dev-libs/libstroke-0.5.1 ) sci-electronics/electronics-menu
 SLOT=0
 SRC_URI=http://ftp.geda-project.org/geda-gaf/unstable/v1.9/1.9.2/geda-gaf-1.9.2.tar.gz
-_eclasses_=autotools	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=003ca1f37977d64796c6b1cd05225900
diff --git a/metadata/md5-cache/sci-electronics/geda-xgsch2pcb-0.1.3-r3 b/metadata/md5-cache/sci-electronics/geda-xgsch2pcb-0.1.3-r3
index 55c1dec96b84..d995da995882 100644
--- a/metadata/md5-cache/sci-electronics/geda-xgsch2pcb-0.1.3-r3
+++ b/metadata/md5-cache/sci-electronics/geda-xgsch2pcb-0.1.3-r3
@@ -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=http://geda.seul.org/dist/geda-xgsch2pcb-0.1.3.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b145675f375b4e3d2a15e68f8ad25d09
diff --git a/metadata/md5-cache/sci-electronics/geda-xgsch2pcb-0.1.3-r4 b/metadata/md5-cache/sci-electronics/geda-xgsch2pcb-0.1.3-r4
index c1606a39550c..f548aada2841 100644
--- a/metadata/md5-cache/sci-electronics/geda-xgsch2pcb-0.1.3-r4
+++ b/metadata/md5-cache/sci-electronics/geda-xgsch2pcb-0.1.3-r4
@@ -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=http://geda.seul.org/dist/geda-xgsch2pcb-0.1.3.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=db255f4120593cb3dcc3e7a09b11a565
diff --git a/metadata/md5-cache/sci-electronics/gerbv-2.6.1 b/metadata/md5-cache/sci-electronics/gerbv-2.6.1
index 43af28d7b45a..ec449feaa08e 100644
--- a/metadata/md5-cache/sci-electronics/gerbv-2.6.1
+++ b/metadata/md5-cache/sci-electronics/gerbv-2.6.1
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:2 x11-libs/cairo
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/gerbv/gerbv-2.6.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cb868533d8e14f4ad4d998798c2b5ec9
diff --git a/metadata/md5-cache/sci-electronics/gresistor-0.0.2 b/metadata/md5-cache/sci-electronics/gresistor-0.0.2
index 2db2340b05ba..20537b3b586e 100644
--- a/metadata/md5-cache/sci-electronics/gresistor-0.0.2
+++ b/metadata/md5-cache/sci-electronics/gresistor-0.0.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jy
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://sourceforge/gresistor/gresistor-0.0.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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7dcd16c220dba384cf3b567744e16699
diff --git a/metadata/md5-cache/sci-electronics/gspeakers-0.11-r2 b/metadata/md5-cache/sci-electronics/gspeakers-0.11-r2
index 7705c6cd37e9..562162638a7e 100644
--- a/metadata/md5-cache/sci-electronics/gspeakers-0.11-r2
+++ b/metadata/md5-cache/sci-electronics/gspeakers-0.11-r2
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-cpp/gtkmm:2.4 >=dev-libs/libsigc++-2.6:2 dev-libs/libxml2:2 || ( sci-electronics/gnucap sci-electronics/ngspice sci-electronics/spice )
 SLOT=0
 SRC_URI=mirror://sourceforge/gspeakers/gspeakers-0.11.tar.gz
-_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8ed11e61f9c0c496f4346b27d61bae13
diff --git a/metadata/md5-cache/sci-electronics/gtkwave-3.3.87 b/metadata/md5-cache/sci-electronics/gtkwave-3.3.87
index 4aa882bcdf46..383e4f726495 100644
--- a/metadata/md5-cache/sci-electronics/gtkwave-3.3.87
+++ b/metadata/md5-cache/sci-electronics/gtkwave-3.3.87
@@ -9,5 +9,5 @@ LICENSE=GPL-2 MIT
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/pango sys-libs/zlib judy? ( dev-libs/judy ) tcl? ( dev-lang/tcl:0 dev-lang/tk:0 ) lzma? ( app-arch/xz-utils )
 SLOT=0
 SRC_URI=mirror://sourceforge/gtkwave/gtkwave-3.3.87.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5294ee4ac83009f2dd4bb52737b26ae1
diff --git a/metadata/md5-cache/sci-electronics/gwave-20090213-r1 b/metadata/md5-cache/sci-electronics/gwave-20090213-r1
index 08a7ccb8766b..ee6a5efe5296 100644
--- a/metadata/md5-cache/sci-electronics/gwave-20090213-r1
+++ b/metadata/md5-cache/sci-electronics/gwave-20090213-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==dev-scheme/guile-1.8*[networking] =dev-scheme/guile-gnome-platform-2.16* sci-electronics/electronics-menu gnuplot? ( sci-visualization/gnuplot ) plotutils? ( media-libs/plotutils )
 SLOT=0
 SRC_URI=mirror://sourceforge/gwave/gwave2-20090213.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	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_=02c98b16772f058dd74ea87f36b3484a
diff --git a/metadata/md5-cache/sci-electronics/gwave-20120229-r1 b/metadata/md5-cache/sci-electronics/gwave-20120229-r1
index 42b515b58091..77c00dfcb408 100644
--- a/metadata/md5-cache/sci-electronics/gwave-20120229-r1
+++ b/metadata/md5-cache/sci-electronics/gwave-20120229-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-scheme/guile-2[deprecated,networking] <dev-scheme/guile-2.2 dev-scheme/guile-gnome-platform x11-libs/guile-gtk sci-electronics/electronics-menu gnuplot? ( sci-visualization/gnuplot ) plotutils? ( media-libs/plotutils )
 SLOT=0
 SRC_URI=https://sourceforge.net/code-snapshots/svn/g/gw/gwave/code/gwave-code-249-trunk.zip
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d5acf75d2de21c6efc1b5c744deda824
diff --git a/metadata/md5-cache/sci-electronics/kicad-4.0.7 b/metadata/md5-cache/sci-electronics/kicad-4.0.7
index 8c5aa9858385..eff567a86a96 100644
--- a/metadata/md5-cache/sci-electronics/kicad-4.0.7
+++ b/metadata/md5-cache/sci-electronics/kicad-4.0.7
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/wxGTK-3.0.2:3.0[X,opengl] python? ( dev-python/wxpython:3.0[o
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://launchpad.net/kicad/4.0/4.0.7/+download/kicad-4.0.7.tar.xz !minimal? ( http://downloads.kicad-pcb.org/libraries/kicad-footprints-4.0.7.tar.gz http://downloads.kicad-pcb.org/libraries/kicad-library-4.0.7.tar.gz ) i18n? ( https://github.com/KiCad/kicad-i18n/archive/4.0.7.tar.gz -> kicad-4.0.7-i18n.tar.gz )
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	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	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	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	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d335eeb4e9cd2edd13d4681239524b7b
diff --git a/metadata/md5-cache/sci-electronics/kicad-5.0.0-r1 b/metadata/md5-cache/sci-electronics/kicad-5.0.0-r1
index 3148a065bde2..c452a1ae733f 100644
--- a/metadata/md5-cache/sci-electronics/kicad-5.0.0-r1
+++ b/metadata/md5-cache/sci-electronics/kicad-5.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/wxGTK-3.0.2:3.0[X,opengl] python? ( dev-python/wxpython:3.0[o
 REQUIRED_USE=python? ( python_targets_python2_7 ) ?? ( occ oce )
 SLOT=0
 SRC_URI=https://launchpad.net/kicad/5.0/5.0.0/+download/kicad-5.0.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	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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fff7cae751a61250e7758c264a3c24d1
diff --git a/metadata/md5-cache/sci-electronics/kicad-footprints-5.0.0 b/metadata/md5-cache/sci-electronics/kicad-footprints-5.0.0
index ab8b4424d301..8bf435af2ba4 100644
--- a/metadata/md5-cache/sci-electronics/kicad-footprints-5.0.0
+++ b/metadata/md5-cache/sci-electronics/kicad-footprints-5.0.0
@@ -8,5 +8,5 @@ LICENSE=CC-BY-SA-4.0
 RDEPEND=>=sci-electronics/kicad-5.0.0
 SLOT=0
 SRC_URI=https://github.com/KiCad/kicad-footprints/archive/5.0.0.tar.gz -> kicad-footprints-5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2c3e14e0a7724fa7f4ea165ca19b4338
diff --git a/metadata/md5-cache/sci-electronics/kicad-i18n-5.0.0 b/metadata/md5-cache/sci-electronics/kicad-i18n-5.0.0
index f313446b3c7f..57880a1158cb 100644
--- a/metadata/md5-cache/sci-electronics/kicad-i18n-5.0.0
+++ b/metadata/md5-cache/sci-electronics/kicad-i18n-5.0.0
@@ -8,5 +8,5 @@ LICENSE=CC-BY-SA-4.0
 RDEPEND=>=sci-electronics/kicad-5.0.0
 SLOT=0
 SRC_URI=https://github.com/KiCad/kicad-i18n/archive/5.0.0.tar.gz -> kicad-i18n-5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ece7ddfae49e7f2cb0853b0ae47a69b1
diff --git a/metadata/md5-cache/sci-electronics/kicad-packages3d-5.0.0 b/metadata/md5-cache/sci-electronics/kicad-packages3d-5.0.0
index 60c1b37ce032..6411cda5b415 100644
--- a/metadata/md5-cache/sci-electronics/kicad-packages3d-5.0.0
+++ b/metadata/md5-cache/sci-electronics/kicad-packages3d-5.0.0
@@ -8,5 +8,5 @@ LICENSE=CC-BY-SA-4.0
 RDEPEND=>=sci-electronics/kicad-5.0.0[oce]
 SLOT=0
 SRC_URI=https://github.com/KiCad/kicad-packages3d/archive/5.0.0.tar.gz -> kicad-packages3d-5.0.0.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=37f8cf3fe7988a6d14b60bcf700394ab
diff --git a/metadata/md5-cache/sci-electronics/kicad-symbols-5.0.0 b/metadata/md5-cache/sci-electronics/kicad-symbols-5.0.0
index 263055405e46..6b3466b076e8 100644
--- a/metadata/md5-cache/sci-electronics/kicad-symbols-5.0.0
+++ b/metadata/md5-cache/sci-electronics/kicad-symbols-5.0.0
@@ -8,5 +8,5 @@ LICENSE=CC-BY-SA-4.0
 RDEPEND=>=sci-electronics/kicad-5.0.0
 SLOT=0
 SRC_URI=https://github.com/KiCad/kicad-symbols/archive/5.0.0.tar.gz -> kicad-symbols-5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6472547a68f00d7a89873c3175503c40
diff --git a/metadata/md5-cache/sci-electronics/kicad-templates-5.0.0 b/metadata/md5-cache/sci-electronics/kicad-templates-5.0.0
index f36a53c763f2..1af759191a4c 100644
--- a/metadata/md5-cache/sci-electronics/kicad-templates-5.0.0
+++ b/metadata/md5-cache/sci-electronics/kicad-templates-5.0.0
@@ -8,5 +8,5 @@ LICENSE=CC-BY-SA-4.0
 RDEPEND=>=sci-electronics/kicad-5.0.0
 SLOT=0
 SRC_URI=https://github.com/KiCad/kicad-templates/archive/5.0.0.tar.gz -> kicad-templates-5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fd37ca227ca6fd24698ef0653c1c6509
diff --git a/metadata/md5-cache/sci-electronics/ngspice-27-r1 b/metadata/md5-cache/sci-electronics/ngspice-27-r1
index e4197b45fbf4..19c3fee01b89 100644
--- a/metadata/md5-cache/sci-electronics/ngspice-27-r1
+++ b/metadata/md5-cache/sci-electronics/ngspice-27-r1
@@ -3,11 +3,11 @@ DEPEND=sys-libs/ncurses:0= X? ( x11-libs/libXaw x11-libs/libXt x11-libs/libX11 )
 DESCRIPTION=The Next Generation Spice (Electronic Circuit Simulator)
 EAPI=6
 HOMEPAGE=http://ngspice.sourceforge.net
-IUSE=X debug doc examples fftw openmp readline shared tcl
+IUSE=X debug doc examples fftw openmp readline +shared tcl
 KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~x64-macos
 LICENSE=BSD GPL-2
 RDEPEND=sys-libs/ncurses:0= X? ( x11-libs/libXaw x11-libs/libXt x11-libs/libX11 ) fftw? ( sci-libs/fftw:3.0 ) readline? ( sys-libs/readline:0= ) tcl? ( dev-lang/tcl:0 dev-tcltk/blt ) X? ( sci-visualization/xgraph )
 SLOT=0
 SRC_URI=mirror://sourceforge/ngspice/ngspice-27.tar.gz doc? ( mirror://sourceforge/ngspice/ngspice-27-manual.pdf )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=96381e768fe04ae36d18f5eae8e59c53
+_md5_=7e07ecd90ab1d6aa98889076cf2bd3ad
diff --git a/metadata/md5-cache/sci-electronics/oregano-0.82 b/metadata/md5-cache/sci-electronics/oregano-0.82
index 46d7d4dedc37..e042479010a4 100644
--- a/metadata/md5-cache/sci-electronics/oregano-0.82
+++ b/metadata/md5-cache/sci-electronics/oregano-0.82
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2:2 x11-libs/goocanvas:2.0 x11-libs/gtk+:3 x11-libs/gtksourceview:3.0 app-text/rarian || ( gnome-base/dconf gnome-base/gconf ) sci-electronics/electronics-menu
 SLOT=0
 SRC_URI=https://github.com/marc-lorber/oregano/tarball/v0.82 -> oregano-0.82.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fad5c5af074ea6cce14766190c0dc504
diff --git a/metadata/md5-cache/sci-electronics/osqoop-1.2.0_pre20170131 b/metadata/md5-cache/sci-electronics/osqoop-1.2.0_pre20170131
index 915b7ffd4181..67d77b52a0f9 100644
--- a/metadata/md5-cache/sci-electronics/osqoop-1.2.0_pre20170131
+++ b/metadata/md5-cache/sci-electronics/osqoop-1.2.0_pre20170131
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 sci-libs/fftw:3.0 virtual/libusb:0 x11-libs/libXtst
 SLOT=0
 SRC_URI=https://github.com/sandsmark/osqoop/archive/b5bd459dd5c2a180a9a3e5a706ed5039159d7286.tar.gz -> osqoop-1.2.0_pre20170131.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=370bcab124a93cb14884fd348f57f55e
diff --git a/metadata/md5-cache/sci-electronics/pcb-0_p20140316 b/metadata/md5-cache/sci-electronics/pcb-0_p20140316
index ce2709594e9b..e95f2a56007f 100644
--- a/metadata/md5-cache/sci-electronics/pcb-0_p20140316
+++ b/metadata/md5-cache/sci-electronics/pcb-0_p20140316
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 gif? ( >=media-libs/gd-2.0.23 ) gtk? ( x11-libs/gtk+:2 x11-libs/pango x11-libs/gtkglext dbus? ( sys-apps/dbus ) ) jpeg? ( >=media-libs/gd-2.0.23[jpeg] ) motif? ( !gtk? ( >=x11-libs/motif-2.3:0 dbus? ( sys-apps/dbus ) xrender? ( >=x11-libs/libXrender-0.9 ) ) ) nelma? ( >=media-libs/gd-2.0.23[png] ) opengl? ( virtual/opengl ) gcode? ( >=media-libs/gd-2.0.23[png] ) virtual/libintl png? ( >=media-libs/gd-2.0.23[png] ) m4lib-png? ( >=media-libs/gd-2.0.23[png] ) tk? ( >=dev-lang/tk-8:0 ) sci-electronics/electronics-menu
 SLOT=0
 SRC_URI=mirror://sourceforge/pcb/pcb/pcb-20140316/pcb-20140316.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=de9fb893c2c07399b3f28f4f6d4e86f0
diff --git a/metadata/md5-cache/sci-electronics/pcb-4.0.2 b/metadata/md5-cache/sci-electronics/pcb-4.0.2
index 6d7298df0ea8..f2df4faf74bb 100644
--- a/metadata/md5-cache/sci-electronics/pcb-4.0.2
+++ b/metadata/md5-cache/sci-electronics/pcb-4.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 gif? ( media-libs/gd ) gtk? ( x11-libs/gtk+:2 x11-libs/pango x11-libs/gtkglext dbus? ( sys-apps/dbus ) ) jpeg? ( media-libs/gd[jpeg] ) motif? ( !gtk? ( >=x11-libs/motif-2.3:0 dbus? ( sys-apps/dbus ) xrender? ( >=x11-libs/libXrender-0.9 ) ) ) nelma? ( media-libs/gd[png] ) opengl? ( virtual/opengl ) gcode? ( media-libs/gd[png] ) virtual/libintl png? ( media-libs/gd[png] ) m4lib-png? ( media-libs/gd[png] ) tk? ( >=dev-lang/tk-8:0 ) sci-electronics/electronics-menu
 SLOT=0
 SRC_URI=mirror://sourceforge/pcb/pcb/pcb-4.0.2/pcb-4.0.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=fe7807abed3a9466456cda2bba505152
diff --git a/metadata/md5-cache/sci-electronics/pulseview-0.4.0 b/metadata/md5-cache/sci-electronics/pulseview-0.4.0
index a996f4c5c7f6..f04a5afba7a5 100644
--- a/metadata/md5-cache/sci-electronics/pulseview-0.4.0
+++ b/metadata/md5-cache/sci-electronics/pulseview-0.4.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/boost-1.55:= >=dev-libs/glib-2.28.0:2 >=dev-cpp/glibmm-2.28.0
 REQUIRED_USE=decode? ( ^^ ( 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://sigrok.org/download/source/pulseview/pulseview-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=876db33eddb9b3966e842faf2456aaa9
diff --git a/metadata/md5-cache/sci-electronics/pulseview-9999 b/metadata/md5-cache/sci-electronics/pulseview-9999
index 8b711eb258b1..cfe76ac429ec 100644
--- a/metadata/md5-cache/sci-electronics/pulseview-9999
+++ b/metadata/md5-cache/sci-electronics/pulseview-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/boost-1.55:= >=dev-libs/glib-2.28.0:2 >=dev-cpp/glibmm-2.28.0:2 >=sci-libs/libsigrok-0.6.0:=[cxx] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtsvg:5 decode? ( >=sci-libs/libsigrokdecode-0.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(+)?] 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=decode? ( ^^ ( 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bfd24862daf5aa7a628cb1b20a93eada
diff --git a/metadata/md5-cache/sci-electronics/qelectrotech-0.50 b/metadata/md5-cache/sci-electronics/qelectrotech-0.50
index dd2b691311df..7f5215c1b75a 100644
--- a/metadata/md5-cache/sci-electronics/qelectrotech-0.50
+++ b/metadata/md5-cache/sci-electronics/qelectrotech-0.50
@@ -9,5 +9,5 @@ LICENSE=CC-BY-3.0 GPL-2+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
 SLOT=0
 SRC_URI=https://download.tuxfamily.org/qet/tags/20151127/qelectrotech-0.5-src.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5fcdcf0b543d3f4315f0212ea263227c
diff --git a/metadata/md5-cache/sci-electronics/qelectrotech-0.61 b/metadata/md5-cache/sci-electronics/qelectrotech-0.61
new file mode 100644
index 000000000000..7f5eaafe167f
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/qelectrotech-0.61
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 doc? ( app-doc/doxygen ) >=sys-apps/sed-4
+DESCRIPTION=Qt5 application to design electric diagrams
+EAPI=6
+HOMEPAGE=https://qelectrotech.org/
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=CC-BY-3.0 GPL-2+
+RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
+SLOT=0
+SRC_URI=https://download.tuxfamily.org/qet/tags/20180823/qelectrotech-0.61-src.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_=8f46dd7372f7bc0d1825cdde1a7ef38c
diff --git a/metadata/md5-cache/sci-electronics/qelectrotech-9999 b/metadata/md5-cache/sci-electronics/qelectrotech-9999
index e1ff0c5e8eec..fbbc6d46bdee 100644
--- a/metadata/md5-cache/sci-electronics/qelectrotech-9999
+++ b/metadata/md5-cache/sci-electronics/qelectrotech-9999
@@ -1,11 +1,11 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare unpack
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 doc? ( app-doc/doxygen ) >=sys-apps/sed-4 || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
+DEFINED_PHASES=configure install postinst postrm preinst unpack
+DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 doc? ( app-doc/doxygen ) >=sys-apps/sed-4 || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
 DESCRIPTION=Qt5 application to design electric diagrams
-EAPI=5
+EAPI=6
 HOMEPAGE=https://qelectrotech.org/
 IUSE=doc
 LICENSE=CC-BY-3.0 GPL-2+
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
+RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	subversion	3d1eb4b41d7190570a84f786958ebb13	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=3ea67d3d9e5d18756b2b44b337737844
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	subversion	3d1eb4b41d7190570a84f786958ebb13	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b96e7ec84ba4781271d7b7d8e7ad0d84
diff --git a/metadata/md5-cache/sci-electronics/xoscope-2.0 b/metadata/md5-cache/sci-electronics/xoscope-2.0
index df4e8a0b493b..ecb01543d527 100644
--- a/metadata/md5-cache/sci-electronics/xoscope-2.0
+++ b/metadata/md5-cache/sci-electronics/xoscope-2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtkdatabox virtual/man
 SLOT=0
 SRC_URI=mirror://sourceforge/xoscope/xoscope-2.0.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f2cc7edba870b275f753c28ea6580396
diff --git a/metadata/md5-cache/sci-electronics/xoscope-2.1 b/metadata/md5-cache/sci-electronics/xoscope-2.1
index b806ed2b126c..4d958af1ca9e 100644
--- a/metadata/md5-cache/sci-electronics/xoscope-2.1
+++ b/metadata/md5-cache/sci-electronics/xoscope-2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtkdatabox virtual/man
 SLOT=0
 SRC_URI=mirror://sourceforge/project/xoscope/xoscope/2.1/xoscope-2.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b38c3cd82d22a53adb061d70ba604a62
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index f9bb1c4e2d8e..5f5bb293c4a5 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/foxtrotgps-1.2.0 b/metadata/md5-cache/sci-geosciences/foxtrotgps-1.2.0
index b210437f76cc..b3057d3ed1ae 100644
--- a/metadata/md5-cache/sci-geosciences/foxtrotgps-1.2.0
+++ b/metadata/md5-cache/sci-geosciences/foxtrotgps-1.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2:2 gnome-base/gconf:2 gnome-base/libglade media-libs/libexif net-misc/curl >=sci-geosciences/gpsd-2.90 sys-apps/dbus x11-libs/gtk+:2
 SLOT=0
 SRC_URI=https://www.foxtrotgps.org/releases/foxtrotgps-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cfc2f519fb7c09ebea65104a2497a26a
diff --git a/metadata/md5-cache/sci-geosciences/geocode-glib-3.24.0 b/metadata/md5-cache/sci-geosciences/geocode-glib-3.24.0
index e30016ce480e..010a3ccc3fb9 100644
--- a/metadata/md5-cache/sci-geosciences/geocode-glib-3.24.0
+++ b/metadata/md5-cache/sci-geosciences/geocode-glib-3.24.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/json-glib-0.99.2[introspection?] gnome
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/geocode-glib/3.24/geocode-glib-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2581ed49e60502d8dbc87a4064b335b7
diff --git a/metadata/md5-cache/sci-geosciences/gnome-maps-3.24.3 b/metadata/md5-cache/sci-geosciences/gnome-maps-3.24.3
index 8aaaa797af0d..b7cded4af6ee 100644
--- a/metadata/md5-cache/sci-geosciences/gnome-maps-3.24.3
+++ b/metadata/md5-cache/sci-geosciences/gnome-maps-3.24.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0
 RDEPEND=>=app-misc/geoclue-0.12.99:2.0[introspection] >=dev-libs/folks-0.10 >=dev-libs/gjs-1.44.0 >=dev-libs/gobject-introspection-0.6.3:= >=dev-libs/glib-2.39.3:2 >=dev-libs/libgee-0.16:0.8[introspection] dev-libs/libxml2:2 >=media-libs/libchamplain-0.12.14:0.12[gtk,introspection] >=net-libs/rest-0.7.90:0.7[introspection] >=sci-geosciences/geocode-glib-3.15.2[introspection] >=x11-libs/gtk+-3.22:3[introspection] app-crypt/libsecret[introspection] dev-libs/libgweather[introspection] media-libs/clutter-gtk:1.0[introspection] media-libs/clutter:1.0[introspection] media-libs/cogl:1.0[introspection] net-libs/gnome-online-accounts[introspection] net-libs/libgfbgraph[introspection] net-libs/libsoup:2.4[introspection] net-libs/webkit-gtk:4[introspection] x11-libs/gdk-pixbuf:2[introspection]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-maps/3.24/gnome-maps-3.24.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0eb665214dc96e2204d309647c8fff6c
diff --git a/metadata/md5-cache/sci-geosciences/gnome-maps-3.26.2 b/metadata/md5-cache/sci-geosciences/gnome-maps-3.26.2
index 0cddb7de1944..09c604d8dabc 100644
--- a/metadata/md5-cache/sci-geosciences/gnome-maps-3.26.2
+++ b/metadata/md5-cache/sci-geosciences/gnome-maps-3.26.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0
 RDEPEND=>=app-misc/geoclue-0.12.99:2.0[introspection] >=dev-libs/folks-0.10 >=dev-libs/gjs-1.44.0 >=dev-libs/gobject-introspection-0.6.3:= >=dev-libs/glib-2.44.0:2 >=dev-libs/libgee-0.16:0.8[introspection] dev-libs/libxml2:2 >=media-libs/libchamplain-0.12.14:0.12[gtk,introspection] >=net-libs/rest-0.7.90:0.7[introspection] >=sci-geosciences/geocode-glib-3.15.2[introspection] >=x11-libs/gtk+-3.22:3[introspection] app-crypt/libsecret[introspection] dev-libs/libgweather[introspection] media-libs/clutter-gtk:1.0[introspection] media-libs/clutter:1.0[introspection] media-libs/cogl:1.0[introspection] net-libs/gnome-online-accounts[introspection] net-libs/libgfbgraph[introspection] net-libs/libsoup:2.4[introspection] net-libs/webkit-gtk:4[introspection] x11-libs/gdk-pixbuf:2[introspection]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-maps/3.26/gnome-maps-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a5be69f8850efd421a6084ad66b3497d
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-3.17-r2 b/metadata/md5-cache/sci-geosciences/gpsd-3.17-r2
deleted file mode 100644
index cc99916b9a00..000000000000
--- a/metadata/md5-cache/sci-geosciences/gpsd-3.17-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare
-DEPEND=bluetooth? ( net-wireless/bluez ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ncurses? ( sys-libs/ncurses:= ) ntp? ( || ( net-misc/ntp net-misc/chrony ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygobject:3[cairo,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) virtual/pkgconfig test? ( sys-devel/bc ) virtual/pkgconfig >=dev-util/scons-1.2.1[python_targets_python2_7]
-DESCRIPTION=GPS daemon and library for USB/serial GPS devices and GPS/mapping clients
-EAPI=5
-HOMEPAGE=http://catb.org/gpsd/
-IUSE=gpsd_protocols_aivdm gpsd_protocols_ashtech gpsd_protocols_earthmate gpsd_protocols_evermore gpsd_protocols_fury gpsd_protocols_fv18 gpsd_protocols_garmin gpsd_protocols_garmintxt gpsd_protocols_geostar gpsd_protocols_gpsclock gpsd_protocols_isync gpsd_protocols_itrax gpsd_protocols_mtk3301 gpsd_protocols_navcom gpsd_protocols_nmea0183 gpsd_protocols_nmea2000 gpsd_protocols_ntrip gpsd_protocols_oceanserver gpsd_protocols_oncore gpsd_protocols_passthrough gpsd_protocols_rtcm104v2 gpsd_protocols_rtcm104v3 gpsd_protocols_sirf gpsd_protocols_skytraq gpsd_protocols_superstar2 gpsd_protocols_tnt gpsd_protocols_tripmate gpsd_protocols_tsip gpsd_protocols_ublox bluetooth dbus debug ipv6 latency_timing ncurses ntp python qt5 +shm +sockets static test udev usb X python_targets_python2_7
-KEYWORDS=amd64 arm ~ppc ~ppc64 x86
-LICENSE=BSD
-RDEPEND=bluetooth? ( net-wireless/bluez ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ncurses? ( sys-libs/ncurses:= ) ntp? ( || ( net-misc/ntp net-misc/chrony ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygobject:3[cairo,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) python? ( || ( python_targets_python2_7 ) )
-SLOT=0/23
-SRC_URI=mirror://nongnu/gpsd/gpsd-3.17.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	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=b3fe4914c5e3b731f28511a76c943823
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-3.17-r3 b/metadata/md5-cache/sci-geosciences/gpsd-3.17-r3
index 07d8307f64ee..cf2cb8b1873c 100644
--- a/metadata/md5-cache/sci-geosciences/gpsd-3.17-r3
+++ b/metadata/md5-cache/sci-geosciences/gpsd-3.17-r3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install preinst prepare
-DEPEND=bluetooth? ( net-wireless/bluez ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ncurses? ( sys-libs/ncurses:= ) ntp? ( || ( net-misc/ntp net-misc/chrony ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygobject:3[cairo,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) virtual/pkgconfig test? ( sys-devel/bc ) virtual/pkgconfig >=dev-util/scons-1.2.1[python_targets_python2_7]
+DEPEND=>=net-misc/pps-tools-0.0.20120407 bluetooth? ( net-wireless/bluez ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ncurses? ( sys-libs/ncurses:= ) ntp? ( || ( net-misc/ntp net-misc/chrony ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygobject:3[cairo,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) virtual/pkgconfig test? ( sys-devel/bc ) virtual/pkgconfig >=dev-util/scons-1.2.1[python_targets_python2_7]
 DESCRIPTION=GPS daemon and library for USB/serial GPS devices and GPS/mapping clients
 EAPI=5
 HOMEPAGE=http://catb.org/gpsd/
 IUSE=gpsd_protocols_aivdm gpsd_protocols_ashtech gpsd_protocols_earthmate gpsd_protocols_evermore gpsd_protocols_fury gpsd_protocols_fv18 gpsd_protocols_garmin gpsd_protocols_garmintxt gpsd_protocols_geostar gpsd_protocols_gpsclock gpsd_protocols_isync gpsd_protocols_itrax gpsd_protocols_mtk3301 gpsd_protocols_navcom gpsd_protocols_nmea0183 gpsd_protocols_nmea2000 gpsd_protocols_ntrip gpsd_protocols_oceanserver gpsd_protocols_oncore gpsd_protocols_passthrough gpsd_protocols_rtcm104v2 gpsd_protocols_rtcm104v3 gpsd_protocols_sirf gpsd_protocols_skytraq gpsd_protocols_superstar2 gpsd_protocols_tnt gpsd_protocols_tripmate gpsd_protocols_tsip gpsd_protocols_ublox bluetooth +cxx dbus debug ipv6 latency_timing ncurses ntp python qt5 +shm +sockets static test udev usb X python_targets_python2_7
-KEYWORDS=amd64 arm ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD
-RDEPEND=bluetooth? ( net-wireless/bluez ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ncurses? ( sys-libs/ncurses:= ) ntp? ( || ( net-misc/ntp net-misc/chrony ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygobject:3[cairo,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+RDEPEND=>=net-misc/pps-tools-0.0.20120407 bluetooth? ( net-wireless/bluez ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ncurses? ( sys-libs/ncurses:= ) ntp? ( || ( net-misc/ntp net-misc/chrony ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygobject:3[cairo,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) python? ( || ( python_targets_python2_7 ) ) qt5? ( cxx )
 SLOT=0/23
 SRC_URI=mirror://nongnu/gpsd/gpsd-3.17.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	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=a45f32ffc45f4159c9bc087c054d3750
+_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	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=8746e19dd78f08bad699e7ec15e49b8c
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-9999 b/metadata/md5-cache/sci-geosciences/gpsd-9999
index 29bfd4c3627c..c466d4ca6fb7 100644
--- a/metadata/md5-cache/sci-geosciences/gpsd-9999
+++ b/metadata/md5-cache/sci-geosciences/gpsd-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install preinst prepare unpack
-DEPEND=bluetooth? ( net-wireless/bluez ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ncurses? ( sys-libs/ncurses:= ) ntp? ( || ( net-misc/ntp net-misc/chrony ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) virtual/pkgconfig test? ( sys-devel/bc ) app-text/xmlto =app-text/docbook-xml-dtd-4.1* virtual/pkgconfig >=dev-util/scons-1.2.1[python_targets_python2_7] dev-vcs/git
+DEPEND=>=net-misc/pps-tools-0.0.20120407 bluetooth? ( net-wireless/bluez ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ncurses? ( sys-libs/ncurses:= ) ntp? ( || ( net-misc/ntp net-misc/chrony ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) virtual/pkgconfig test? ( sys-devel/bc ) app-text/xmlto =app-text/docbook-xml-dtd-4.1* virtual/pkgconfig >=dev-util/scons-1.2.1[python_targets_python2_7] dev-vcs/git
 DESCRIPTION=GPS daemon and library for USB/serial GPS devices and GPS/mapping clients
 EAPI=5
 HOMEPAGE=http://catb.org/gpsd/
 IUSE=gpsd_protocols_aivdm gpsd_protocols_ashtech gpsd_protocols_earthmate gpsd_protocols_evermore gpsd_protocols_fury gpsd_protocols_fv18 gpsd_protocols_garmin gpsd_protocols_garmintxt gpsd_protocols_geostar gpsd_protocols_gpsclock gpsd_protocols_isync gpsd_protocols_itrax gpsd_protocols_mtk3301 gpsd_protocols_navcom gpsd_protocols_nmea0183 gpsd_protocols_nmea2000 gpsd_protocols_ntrip gpsd_protocols_oceanserver gpsd_protocols_oncore gpsd_protocols_passthrough gpsd_protocols_rtcm104v2 gpsd_protocols_rtcm104v3 gpsd_protocols_sirf gpsd_protocols_skytraq gpsd_protocols_superstar2 gpsd_protocols_tnt gpsd_protocols_tripmate gpsd_protocols_tsip gpsd_protocols_ublox bluetooth +cxx dbus debug ipv6 latency_timing ncurses ntp python qt5 +shm +sockets static test udev usb X python_targets_python2_7
 LICENSE=BSD
-RDEPEND=bluetooth? ( net-wireless/bluez ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ncurses? ( sys-libs/ncurses:= ) ntp? ( || ( net-misc/ntp net-misc/chrony ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+RDEPEND=>=net-misc/pps-tools-0.0.20120407 bluetooth? ( net-wireless/bluez ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ncurses? ( sys-libs/ncurses:= ) ntp? ( || ( net-misc/ntp net-misc/chrony ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) python? ( || ( python_targets_python2_7 ) ) qt5? ( cxx )
 SLOT=0/23
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-2	249c1a0962573f4ce2c28f0d5b6b35d4	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=d97f08201899392fe8f4a2877467d616
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-2	249c1a0962573f4ce2c28f0d5b6b35d4	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f4a2b5a1041dd7e21bce77d5af206ff2
diff --git a/metadata/md5-cache/sci-geosciences/gpx-viewer-0.4.0-r1 b/metadata/md5-cache/sci-geosciences/gpx-viewer-0.4.0-r1
index 628a502c51f8..2cc268370e31 100644
--- a/metadata/md5-cache/sci-geosciences/gpx-viewer-0.4.0-r1
+++ b/metadata/md5-cache/sci-geosciences/gpx-viewer-0.4.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/gdl:3 dev-libs/glib:2 dev-libs/libxml2:2 >=media-libs/clutter-gtk-1.4.0:1.0 >=media-libs/libchamplain-0.12.3:0.12[gtk] x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://edge.launchpad.net/gpx-viewer/trunk/0.4.0/+download/gpx-viewer-0.4.0.tar.gz
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=360a7162c149d217afb921438eeb0dad
diff --git a/metadata/md5-cache/sci-geosciences/gpxpy-0.8.6 b/metadata/md5-cache/sci-geosciences/gpxpy-0.8.6
index 7802febb9213..c6727cc70118 100644
--- a/metadata/md5-cache/sci-geosciences/gpxpy-0.8.6
+++ b/metadata/md5-cache/sci-geosciences/gpxpy-0.8.6
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=https://github.com/tkrajina/gpxpy/tarball/85c3477b -> gpxpy-0.8.6.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3788fcc70d0248bf991751f3796740f1
diff --git a/metadata/md5-cache/sci-geosciences/gpxsee-5.14 b/metadata/md5-cache/sci-geosciences/gpxsee-5.14
index 6bca1da8848a..84a20a9518cc 100644
--- a/metadata/md5-cache/sci-geosciences/gpxsee-5.14
+++ b/metadata/md5-cache/sci-geosciences/gpxsee-5.14
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtnetwork:5 dev-qt/qtcore:5
 SLOT=0
 SRC_URI=https://github.com/tumic0/GPXSee/archive/5.14.tar.gz -> gpxsee-5.14.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4f1d542d6ce5400d66275fe5eaf0685a
diff --git a/metadata/md5-cache/sci-geosciences/gpxsee-5.17 b/metadata/md5-cache/sci-geosciences/gpxsee-5.17
index 96f7be5e780c..f5f70697dbdc 100644
--- a/metadata/md5-cache/sci-geosciences/gpxsee-5.17
+++ b/metadata/md5-cache/sci-geosciences/gpxsee-5.17
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtnetwork:5 dev-qt/qtcore:5
 SLOT=0
 SRC_URI=https://github.com/tumic0/GPXSee/archive/5.17.tar.gz -> gpxsee-5.17.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4f1d542d6ce5400d66275fe5eaf0685a
diff --git a/metadata/md5-cache/sci-geosciences/grass-7.2.0-r1 b/metadata/md5-cache/sci-geosciences/grass-7.2.0-r1
index aa1968474538..ace12f6de066 100644
--- a/metadata/md5-cache/sci-geosciences/grass-7.2.0-r1
+++ b/metadata/md5-cache/sci-geosciences/grass-7.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=d
 REQUIRED_USE=python_targets_python2_7 opengl? ( X )
 SLOT=0/7.2.0
 SRC_URI=http://grass.osgeo.org/grass72/source/grass-7.2.0.tar.gz
-_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f40f6726377706b60f33b8d851bdaace
diff --git a/metadata/md5-cache/sci-geosciences/grass-7.4.0 b/metadata/md5-cache/sci-geosciences/grass-7.4.0
index 6faf6d018dce..fd28db2cd050 100644
--- a/metadata/md5-cache/sci-geosciences/grass-7.4.0
+++ b/metadata/md5-cache/sci-geosciences/grass-7.4.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=d
 REQUIRED_USE=python_targets_python2_7 opengl? ( X )
 SLOT=0/7.4.0
 SRC_URI=http://grass.osgeo.org/grass74/source/grass-7.4.0.tar.gz
-_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ba6df21b06c58c785ce176e436466d78
diff --git a/metadata/md5-cache/sci-geosciences/grass-7.4.1 b/metadata/md5-cache/sci-geosciences/grass-7.4.1
index 061ba4136ea9..b5bbbe5eb683 100644
--- a/metadata/md5-cache/sci-geosciences/grass-7.4.1
+++ b/metadata/md5-cache/sci-geosciences/grass-7.4.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=d
 REQUIRED_USE=python_targets_python2_7 opengl? ( X )
 SLOT=0/7.4.0
 SRC_URI=http://grass.osgeo.org/grass74/source/grass-7.4.1.tar.gz
-_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1eb3a6354bb1fb81baa886ae14906d2d
diff --git a/metadata/md5-cache/sci-geosciences/gtk-g-rays2-2.05 b/metadata/md5-cache/sci-geosciences/gtk-g-rays2-2.05
index cbddfdff538e..58d1aa5138f3 100644
--- a/metadata/md5-cache/sci-geosciences/gtk-g-rays2-2.05
+++ b/metadata/md5-cache/sci-geosciences/gtk-g-rays2-2.05
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 dev-libs/dbus-glib virtual/libgudev x11-libs/cairo x11-libs/gtk+:3 virtual/freedesktop-icon-theme net-wireless/bluez
 SLOT=0
 SRC_URI=http://www.zen35309.zen.co.uk/gps/gtk-g-rays2-2.05.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=312467a162efa2cd422dfc145b8ae9c6
diff --git a/metadata/md5-cache/sci-geosciences/liblas-1.8.1 b/metadata/md5-cache/sci-geosciences/liblas-1.8.1
index 5d8760766a0e..d4332761aa3b 100644
--- a/metadata/md5-cache/sci-geosciences/liblas-1.8.1
+++ b/metadata/md5-cache/sci-geosciences/liblas-1.8.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= sci-geosciences/laszip sci-libs/libgeotiff gdal? ( sci-
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.osgeo.org/liblas/libLAS-1.8.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=007f6f0069496d9898e5f6c9f4209992
diff --git a/metadata/md5-cache/sci-geosciences/liblas-1.8.1-r1 b/metadata/md5-cache/sci-geosciences/liblas-1.8.1-r1
index a36ab15f2c14..611e0deeca55 100644
--- a/metadata/md5-cache/sci-geosciences/liblas-1.8.1-r1
+++ b/metadata/md5-cache/sci-geosciences/liblas-1.8.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= sci-geosciences/laszip sci-libs/libgeotiff gdal? ( sci-
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/libLAS/libLAS/archive/1.8.1.tar.gz -> liblas-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4c4864dc865a79b09f578dd36983e7ab
diff --git a/metadata/md5-cache/sci-geosciences/mapserver-7.0.3 b/metadata/md5-cache/sci-geosciences/mapserver-7.0.3
index 3554132cc006..709aa3b5f073 100644
--- a/metadata/md5-cache/sci-geosciences/mapserver-7.0.3
+++ b/metadata/md5-cache/sci-geosciences/mapserver-7.0.3
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat dev-libs/fcgi >=media-libs/gd-2.0.12[truetype,jpeg,png,zl
 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	89bb9f083a2590d9b447fd0b78a96186
+_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/mapserver-7.0.5 b/metadata/md5-cache/sci-geosciences/mapserver-7.0.5
index c2fdf6df9208..cc7d851d17d4 100644
--- a/metadata/md5-cache/sci-geosciences/mapserver-7.0.5
+++ b/metadata/md5-cache/sci-geosciences/mapserver-7.0.5
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat dev-libs/fcgi >=media-libs/gd-2.0.12[truetype,jpeg,png,zl
 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.5.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-r3	378dc4ea30db21411f4d1a32d21a6302	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	6ae2395d7f341093c36057cb4f69101a	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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-r3	378dc4ea30db21411f4d1a32d21a6302	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	6ae2395d7f341093c36057cb4f69101a	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5af75cd7e4053f7546d727489bac25bf
diff --git a/metadata/md5-cache/sci-geosciences/merkaartor-0.18.3-r2 b/metadata/md5-cache/sci-geosciences/merkaartor-0.18.3-r2
index d0f9be4e6b20..23b96f1f7586 100644
--- a/metadata/md5-cache/sci-geosciences/merkaartor-0.18.3-r2
+++ b/metadata/md5-cache/sci-geosciences/merkaartor-0.18.3-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtsingleapplication[X,qt5(+)] >=sci-libs/gdal-1.6.0 >=sci-libs/proj-4.6 sys-libs/zlib exif? ( media-gfx/exiv2:= ) gps? ( >=sci-geosciences/gpsd-3.17-r2 ) libproxy? ( net-libs/libproxy )
 SLOT=0
 SRC_URI=https://github.com/openstreetmap/merkaartor/archive/0.18.3.tar.gz -> merkaartor-0.18.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=199e48bc777949913021726ab99a16b0
diff --git a/metadata/md5-cache/sci-geosciences/merkaartor-0.18.3-r3 b/metadata/md5-cache/sci-geosciences/merkaartor-0.18.3-r3
index f656ac60b835..dcd534a0f290 100644
--- a/metadata/md5-cache/sci-geosciences/merkaartor-0.18.3-r3
+++ b/metadata/md5-cache/sci-geosciences/merkaartor-0.18.3-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtsingleapplication[X,qt5(+)] >=sci-libs/gdal-1.6.0 >=sci-libs/proj-4.6 sys-libs/zlib exif? ( media-gfx/exiv2:= ) gps? ( >=sci-geosciences/gpsd-3.17-r2 ) libproxy? ( net-libs/libproxy )
 SLOT=0
 SRC_URI=https://github.com/openstreetmap/merkaartor/archive/0.18.3.tar.gz -> merkaartor-0.18.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9d00a1febdbfe5c56c20efc1f8e86d3f
diff --git a/metadata/md5-cache/sci-geosciences/merkaartor-9999 b/metadata/md5-cache/sci-geosciences/merkaartor-9999
index c987c0877325..31e1ab221af0 100644
--- a/metadata/md5-cache/sci-geosciences/merkaartor-9999
+++ b/metadata/md5-cache/sci-geosciences/merkaartor-9999
@@ -7,5 +7,5 @@ IUSE=debug exif gps libproxy webengine
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsingleapplication[X,qt5(+)] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sci-libs/gdal sci-libs/proj sys-libs/zlib exif? ( media-gfx/exiv2:= ) gps? ( >=sci-geosciences/gpsd-3.17-r2 ) libproxy? ( net-libs/libproxy ) webengine? ( dev-qt/qtwebengine:5 )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=66a24d8f8345c6f787ceae7ca3d0abd0
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-4.8.0-r1 b/metadata/md5-cache/sci-geosciences/opencpn-4.8.0-r1
index dd4c1b12187b..0121b90cce46 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-4.8.0-r1
+++ b/metadata/md5-cache/sci-geosciences/opencpn-4.8.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=app-arch/bzip2 dev-libs/tinyxml media-libs/freetype:2 media-libs/portaudio sys-libs/zlib opengl? ( virtual/opengl ) x11-libs/gtk+:2 x11-libs/wxGTK:3.0[X] gps? ( sci-geosciences/gpsd ) !sci-geosciences/opencpn-plugin-wmm
 SLOT=0
 SRC_URI=https://github.com/OpenCPN/OpenCPN/archive/v4.8.0.tar.gz -> opencpn-4.8.0.tar.gz doc? ( https://launchpad.net/~opencpn/+archive/ubuntu/opencpn/+files/opencpn-doc_4.1.1329.1.orig.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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=a0595d33bb3db56d0e3328c2fa5b648c
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-4.8.2 b/metadata/md5-cache/sci-geosciences/opencpn-4.8.2
index 408931b23c4f..5233a7c92a37 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-4.8.2
+++ b/metadata/md5-cache/sci-geosciences/opencpn-4.8.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=app-arch/bzip2 dev-libs/tinyxml media-libs/freetype:2 media-libs/portaudio sys-libs/zlib opengl? ( virtual/opengl ) x11-libs/gtk+:2 x11-libs/wxGTK:3.0[X] gps? ( sci-geosciences/gpsd ) !sci-geosciences/opencpn-plugin-wmm
 SLOT=0
 SRC_URI=https://github.com/OpenCPN/OpenCPN/archive/v4.8.2.tar.gz -> opencpn-4.8.2.tar.gz doc? ( https://launchpad.net/~opencpn/+archive/ubuntu/opencpn/+files/opencpn-doc_4.1.1329.1.orig.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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=a457b13748e940f80f7cbdc74e224157
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-br24radar-2.1 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-br24radar-2.1
index e70bb6f5265f..5201138ebf7b 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-br24radar-2.1
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-br24radar-2.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 SLOT=0
 SRC_URI=https://github.com/canboat/BR24radar_pi/archive/v2.1.tar.gz -> opencpn-plugin-br24radar-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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=273802778456634efa3b18e2295da935
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-br24radar-9999 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-br24radar-9999
index c835c0ea6896..52a71d2e4f36 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-br24radar-9999
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-br24radar-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/canboat/BR24radar_pi
 LICENSE=GPL-3+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=273802778456634efa3b18e2295da935
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-climatology-1.0.20180316 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-climatology-1.0.20180316
index dcacf3ca100b..85e19440db23 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-climatology-1.0.20180316
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-climatology-1.0.20180316
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 SLOT=0
 SRC_URI=https://github.com/mschiff/climatology_pi/archive/v1.0.20180316.tar.gz -> opencpn-plugin-climatology-1.0.20180316.tar.gz mirror://sourceforge/opencpnplugins/climatology_pi/CL-DATA-1.0.tar.xz -> opencpn-plugin-climatology-1.0-CL-DATA.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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=04cbdccfe98ffb9551fefdd486b048df
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-climatology-9999 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-climatology-9999
index a23b20b34b19..fccd8aa4e036 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-climatology-9999
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-climatology-9999
@@ -7,5 +7,5 @@ LICENSE=GPL-3+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 SLOT=0
 SRC_URI=mirror://sourceforge/opencpnplugins/climatology_pi/CL-DATA-1.0.tar.xz -> opencpn-plugin-climatology-1.0-CL-DATA.tar.xz
-_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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=04cbdccfe98ffb9551fefdd486b048df
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-dr-1.1 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-dr-1.1
index 427319abb11a..e03d52da68fa 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-dr-1.1
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-dr-1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 SLOT=0
 SRC_URI=https://github.com/Rasbats/DR_pi/archive/V1.1.tar.gz -> opencpn-plugin-dr-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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=12f635c582080579787394971285d5cf
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-dr-9999 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-dr-9999
index c6a431c3e973..4d8dbf1b4517 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-dr-9999
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-dr-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/Rasbats/DR_pi
 LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a7e220a7f594cd86c87f17ead9d72b34
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-findit-1.1007 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-findit-1.1007
index dd1772bcdbad..d0ff7174f504 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-findit-1.1007
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-findit-1.1007
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 SLOT=0
 SRC_URI=https://github.com/ptulp/FindIt_pi/archive/v1.1007.tar.gz -> opencpn-plugin-findit-1.1007.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a5364296b50f02a3d75614266ea220ea
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-findit-9999 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-findit-9999
index 5a9ea8d9fe15..545170e946d8 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-findit-9999
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-findit-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/ptulp/FindIt_pi
 LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a5364296b50f02a3d75614266ea220ea
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-gxradar-1.1 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-gxradar-1.1
index 13ef951d0909..25e5923f1168 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-gxradar-1.1
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-gxradar-1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 SLOT=0
 SRC_URI=https://github.com/trudK45/gxradar_pi/archive/v.1.1.tar.gz -> opencpn-plugin-gxradar-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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=445d72a9ae6c4d5e2e9b6a89cd511c67
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-gxradar-9999 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-gxradar-9999
index c4d32c80dc50..e2b9e7965514 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-gxradar-9999
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-gxradar-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/trudK45/gxradar_pi
 LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ce5a3c13ac033d38628d086041ad0e6c
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-iacfleet-0.9 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-iacfleet-0.9
index 012aa31d6d72..2fe0c9258856 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-iacfleet-0.9
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-iacfleet-0.9
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 SLOT=0
 SRC_URI=https://github.com/nohal/iacfleet_pi/archive/v0.9.tar.gz -> opencpn-plugin-iacfleet-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2f2b35d929764b282cf8622274d0a2dc
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-iacfleet-9999 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-iacfleet-9999
index b87141a72235..fbd039155668 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-iacfleet-9999
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-iacfleet-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/nohal/iacfleet_pi
 LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2f2b35d929764b282cf8622274d0a2dc
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-launcher-1.1 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-launcher-1.1
index 6ea6e4b3d44b..b4327ca49bd8 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-launcher-1.1
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-launcher-1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 SLOT=0
 SRC_URI=https://github.com/nohal/launcher_pi/archive/v1.1.tar.gz -> opencpn-plugin-launcher-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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=72256ee186e9de35ef8040aca5a82d0d
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-launcher-9999 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-launcher-9999
index 580ff9e1abe0..35d9c49cc7eb 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-launcher-9999
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-launcher-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/nohal/launcher_pi
 LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=72256ee186e9de35ef8040aca5a82d0d
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-logbookkonni-1.3002 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-logbookkonni-1.3002
index aea17999cedb..0b57b091c1f6 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-logbookkonni-1.3002
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-logbookkonni-1.3002
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 SLOT=0
 SRC_URI=https://github.com/delatbabel/LogbookKonni-1.2/archive/v1.3002.tar.gz -> opencpn-plugin-logbookkonni-1.3002.tar.gz https://github.com/delatbabel/LogbookKonni-1.2/releases/download/v1.3002/LogbookKonni_Layouts.zip -> opencpn-plugin-logbookkonni-1.3002_Layouts.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2781ee67875d371c85f2294637c8de04
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-logbookkonni-9999 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-logbookkonni-9999
index 843070e3164b..fa1f5f8afafa 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-logbookkonni-9999
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-logbookkonni-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/delatbabel/LogbookKonni-1.2
 LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2781ee67875d371c85f2294637c8de04
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-objsearch-0.7 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-objsearch-0.7
index 089838b620f9..1ad6f5b92fb9 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-objsearch-0.7
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-objsearch-0.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 SLOT=0
 SRC_URI=https://github.com/nohal/objsearch_pi/archive/v0.7.tar.gz -> opencpn-plugin-objsearch-0.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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=fa6ec64636739d1553852c02fcc6f9ae
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-objsearch-9999 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-objsearch-9999
index 8b2054a63e40..d1caf37f64f3 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-objsearch-9999
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-objsearch-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/nohal/objsearch_pi
 LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fa6ec64636739d1553852c02fcc6f9ae
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-ocpn_draw-1.3.14 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-ocpn_draw-1.3.14
index d08ba63a11f6..9ee91a1db386 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-ocpn_draw-1.3.14
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-ocpn_draw-1.3.14
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 SLOT=0
 SRC_URI=https://github.com/jongough/ocpn_draw_pi/archive/V1.3.14.tar.gz -> opencpn-plugin-ocpn_draw-1.3.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c39c4d6b6348c4de2cfaae5bae3a27c4
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-ocpn_draw-9999 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-ocpn_draw-9999
index 8da1281338a3..e65c38d38c32 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-ocpn_draw-9999
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-ocpn_draw-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/jongough/ocpn_draw_pi
 LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7c453b54e8433eae9b42d4d8b8b2c645
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-ocpndebugger-1.3 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-ocpndebugger-1.3
index b6089f92acc1..637d8315cf6c 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-ocpndebugger-1.3
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-ocpndebugger-1.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 SLOT=0
 SRC_URI=https://github.com/nohal/ocpndebugger_pi/archive/v1.3.tar.gz -> opencpn-plugin-ocpndebugger-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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=42a287254ca5a0a57d30c9017cda89de
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-ocpndebugger-9999 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-ocpndebugger-9999
index 8fafdb351b21..371e0118b576 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-ocpndebugger-9999
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-ocpndebugger-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/nohal/ocpndebugger_pi
 LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=42a287254ca5a0a57d30c9017cda89de
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-oesenc-1.6.0 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-oesenc-1.6.0
index b3acbecf5f2f..2441615d0bce 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-oesenc-1.6.0
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-oesenc-1.6.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 SLOT=0
 SRC_URI=https://github.com/mschiff/oesenc_pi/archive/v1.6.0.tar.gz -> opencpn-plugin-oesenc-1.6.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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=d41b2fb4a4d75d5f277f46e7b75cecae
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-oesenc-9999 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-oesenc-9999
index 3ecf01ba2327..ecd4713c07a4 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-oesenc-9999
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-oesenc-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/bdbcat/oesenc_pi
 LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d41b2fb4a4d75d5f277f46e7b75cecae
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-otcurrent-1.2 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-otcurrent-1.2
index 969e24ae5bd4..7c0399e5f272 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-otcurrent-1.2
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-otcurrent-1.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 SLOT=0
 SRC_URI=https://github.com/Rasbats/otcurrent_pi/archive/v1.2.tar.gz -> opencpn-plugin-otcurrent-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cb8522f5efc1930a5164aa062bb286e2
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-otcurrent-9999 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-otcurrent-9999
index 6c17cdb2c60c..2adda3285431 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-otcurrent-9999
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-otcurrent-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/Rasbats/otcurrent_pi
 LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cb8522f5efc1930a5164aa062bb286e2
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-polar-1.1007 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-polar-1.1007
index 84f8b509b763..04ef07ab5404 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-polar-1.1007
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-polar-1.1007
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 SLOT=0
 SRC_URI=https://github.com/ptulp/polar_pi/archive/v1.1007.tar.gz -> opencpn-plugin-polar-1.1007.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6c3c723c61773f85c84d84849fcda08f
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-polar-9999 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-polar-9999
index 4a9d31db31d7..1bb29f18ad1d 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-polar-9999
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-polar-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/ptulp/polar_pi
 LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6c3c723c61773f85c84d84849fcda08f
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-radar-0.98 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-radar-0.98
index 6951fa0a5e40..bb8f8f498760 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-radar-0.98
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-radar-0.98
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 SLOT=0
 SRC_URI=https://github.com/Verezano/radar_pi/archive/aisradar_pi-0.98.tar.gz -> opencpn-plugin-radar-0.98.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=408f61c63ce9e81de4ae7005c733e84f
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-radar-9999 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-radar-9999
index 21d9aaf233d4..dd60d6dc955d 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-radar-9999
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-radar-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/Verezano/radar_pi
 LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=408f61c63ce9e81de4ae7005c733e84f
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-route-1.2 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-route-1.2
index a830961a71c3..6c2b0232389f 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-route-1.2
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-route-1.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 SLOT=0
 SRC_URI=https://github.com/SaltyPaws/route_pi/archive/v1.2.tar.gz -> opencpn-plugin-route-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=01bffd9cdc014643e310e06d40020c7a
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-route-9999 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-route-9999
index e747dcb69b79..510322ee6b08 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-route-9999
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-route-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/SaltyPaws/route_pi
 LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=01bffd9cdc014643e310e06d40020c7a
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-squiddio-0.7 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-squiddio-0.7
index 57612be3af93..3f8f2957df5c 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-squiddio-0.7
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-squiddio-0.7
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 SLOT=0
 SRC_URI=https://github.com/mauroc/squiddio_pi/archive/0.7.tar.gz -> opencpn-plugin-squiddio-0.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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=112956644052489b870adbd898985d75
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-squiddio-9999 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-squiddio-9999
index 7f4dc28c41d0..6a7e806a4693 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-squiddio-9999
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-squiddio-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/mauroc/squiddio_pi
 LICENSE=GPL-3+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=112956644052489b870adbd898985d75
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-statusbar-0.5.20180316 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-statusbar-0.5.20180316
index e8e5acb6ba90..8c6d778ca70f 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-statusbar-0.5.20180316
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-statusbar-0.5.20180316
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 SLOT=0
 SRC_URI=https://github.com/mschiff/statusbar_pi/archive/v0.5.20180316.tar.gz -> opencpn-plugin-statusbar-0.5.20180316.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4fdc8bf6dcf74e1a5969493ea9dc7ad9
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-statusbar-9999 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-statusbar-9999
index 6649e96b1ea3..a78ba20845ff 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-statusbar-9999
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-statusbar-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/seandepagnier/statusbar_pi
 LICENSE=GPL-3+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4fdc8bf6dcf74e1a5969493ea9dc7ad9
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-watchdog-1.9.051 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-watchdog-1.9.051
index 3e5e7d2a24dd..95f8a4676f22 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-watchdog-1.9.051
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-watchdog-1.9.051
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 SLOT=0
 SRC_URI=https://github.com/seandepagnier/watchdog_pi/archive/v1.9.051.tar.gz -> opencpn-plugin-watchdog-1.9.051.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=be2edcdceffbe461ffaf4cd1e0cec25c
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-watchdog-9999 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-watchdog-9999
index dc571dd76bb0..7fe9f1c77f68 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-watchdog-9999
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-watchdog-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/seandepagnier/watchdog_pi
 LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=be2edcdceffbe461ffaf4cd1e0cec25c
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-weather_routing-1.10.1 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-weather_routing-1.10.1
index b2f2c230c2c8..e04ee992ea55 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-weather_routing-1.10.1
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-weather_routing-1.10.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 SLOT=0
 SRC_URI=https://github.com/seandepagnier/weather_routing_pi/archive/v1.10.1.tar.gz -> opencpn-plugin-weather_routing-1.10.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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=801ba2166921f8dae6e1c8f6dfec2087
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-weather_routing-9999 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-weather_routing-9999
index 5570c0e5206d..4f703534021a 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-weather_routing-9999
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-weather_routing-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/seandepagnier/weather_routing_pi/
 LICENSE=GPL-3+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=801ba2166921f8dae6e1c8f6dfec2087
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-weatherfax-1.3.20180316 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-weatherfax-1.3.20180316
index dab48fe3e4ef..91a3a5e9e7f6 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-weatherfax-1.3.20180316
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-weatherfax-1.3.20180316
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 SLOT=0
 SRC_URI=https://github.com/mschiff/weatherfax_pi/archive/v1.3.20180316.tar.gz -> opencpn-plugin-weatherfax-1.3.20180316.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bb5ce20cbe1e9a833e6745c5711e28e2
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-weatherfax-9999 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-weatherfax-9999
index e66ba799e476..b0eb6df70a69 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-weatherfax-9999
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-weatherfax-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/seandepagnier/weatherfax_pi
 LICENSE=GPL-3+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bb5ce20cbe1e9a833e6745c5711e28e2
diff --git a/metadata/md5-cache/sci-geosciences/osm-gps-map-1.1.0 b/metadata/md5-cache/sci-geosciences/osm-gps-map-1.1.0
index 22fa50d4bb7d..c9bc2de38522 100644
--- a/metadata/md5-cache/sci-geosciences/osm-gps-map-1.1.0
+++ b/metadata/md5-cache/sci-geosciences/osm-gps-map-1.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.16.0:2 >=net-libs/libsoup-2.4.0:2.4 >=x11-libs/cairo-1.8.0 >=x11-libs/gtk+-3.0:3[introspection] dev-libs/gobject-introspection
 SLOT=0
 SRC_URI=https://github.com/nzjrs/osm-gps-map/releases/download/1.1.0/osm-gps-map-1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=df96fcd31778ae145751d47e4170ee10
diff --git a/metadata/md5-cache/sci-geosciences/osm2pgsql-0.94.0 b/metadata/md5-cache/sci-geosciences/osm2pgsql-0.94.0
index 10dc6807c2b7..51aa69b0f966 100644
--- a/metadata/md5-cache/sci-geosciences/osm2pgsql-0.94.0
+++ b/metadata/md5-cache/sci-geosciences/osm2pgsql-0.94.0
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2 dev-db/postgresql:= dev-libs/expat sci-libs/proj sys-libs
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/openstreetmap/osm2pgsql/archive/0.94.0.tar.gz -> osm2pgsql-0.94.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d0310e0b458e3e6ee9ba5da224aa331f
diff --git a/metadata/md5-cache/sci-geosciences/osm2pgsql-0.96.0 b/metadata/md5-cache/sci-geosciences/osm2pgsql-0.96.0
index 12f54096fd1b..02bfde34291b 100644
--- a/metadata/md5-cache/sci-geosciences/osm2pgsql-0.96.0
+++ b/metadata/md5-cache/sci-geosciences/osm2pgsql-0.96.0
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2 dev-db/postgresql:= dev-libs/expat sci-libs/proj sys-libs
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/openstreetmap/osm2pgsql/archive/0.96.0.tar.gz -> osm2pgsql-0.96.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0841e809d22d3dae798ec7e4c277e2d9
diff --git a/metadata/md5-cache/sci-geosciences/osm2pgsql-99999999 b/metadata/md5-cache/sci-geosciences/osm2pgsql-99999999
index 371652637603..3a3b57b1c375 100644
--- a/metadata/md5-cache/sci-geosciences/osm2pgsql-99999999
+++ b/metadata/md5-cache/sci-geosciences/osm2pgsql-99999999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/bzip2 dev-db/postgresql:= dev-libs/expat sci-libs/proj sys-libs/zlib lua? ( dev-lang/lua:= ) dev-db/postgis
 RESTRICT=test
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9598cace0cddf776f3916d002d1f3b4c
diff --git a/metadata/md5-cache/sci-geosciences/qgis-3.0.3-r1 b/metadata/md5-cache/sci-geosciences/qgis-3.0.3-r1
index c7b6ee5c82a0..1924aa62862b 100644
--- a/metadata/md5-cache/sci-geosciences/qgis-3.0.3-r1
+++ b/metadata/md5-cache/sci-geosciences/qgis-3.0.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6
 RESTRICT=test
 SLOT=0
 SRC_URI=https://qgis.org/downloads/qgis-3.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=768f3b47caa942a41f8449bb5f7df8ca
diff --git a/metadata/md5-cache/sci-geosciences/qgis-3.2.2 b/metadata/md5-cache/sci-geosciences/qgis-3.2.2
index 23adc1400dcf..f03eeb7f15a8 100644
--- a/metadata/md5-cache/sci-geosciences/qgis-3.2.2
+++ b/metadata/md5-cache/sci-geosciences/qgis-3.2.2
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6
 RESTRICT=test
 SLOT=0
 SRC_URI=https://qgis.org/downloads/qgis-3.2.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/sci-geosciences/qgis-3.2.3 b/metadata/md5-cache/sci-geosciences/qgis-3.2.3
index 658764134a43..7892c4baded0 100644
--- a/metadata/md5-cache/sci-geosciences/qgis-3.2.3
+++ b/metadata/md5-cache/sci-geosciences/qgis-3.2.3
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/sci-geosciences/qgis-9999 b/metadata/md5-cache/sci-geosciences/qgis-9999
index 2d39b069d9ec..15a828a55ea0 100644
--- a/metadata/md5-cache/sci-geosciences/qgis-9999
+++ b/metadata/md5-cache/sci-geosciences/qgis-9999
@@ -9,5 +9,5 @@ RDEPEND=app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 de
 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 )
 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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9f7cd32b273a9247ba269b2e253c3ec5
diff --git a/metadata/md5-cache/sci-geosciences/qmapshack-1.11.1-r1 b/metadata/md5-cache/sci-geosciences/qmapshack-1.11.1-r1
index da8348956a64..c58b6354d21d 100644
--- a/metadata/md5-cache/sci-geosciences/qmapshack-1.11.1-r1
+++ b/metadata/md5-cache/sci-geosciences/qmapshack-1.11.1-r1
@@ -3,10 +3,10 @@ DEPEND=dev-qt/qtwebkit:5 dev-qt/qtscript:5 dev-qt/qtprintsupport:5 dev-qt/qtdbus
 DESCRIPTION=GPS mapping utility
 EAPI=6
 HOMEPAGE=https://bitbucket.org/maproom/qmapshack/wiki/Home
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=dev-qt/qtwebkit:5 dev-qt/qtscript:5 dev-qt/qtprintsupport:5 dev-qt/qtdbus:5 dev-qt/qttest:5 dev-qt/designer:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-libs/quazip >=sci-geosciences/routino-3.1.1 sci-libs/gdal sci-libs/proj sci-libs/alglib
 SLOT=0
 SRC_URI=https://bitbucket.org/maproom/qmapshack/downloads/qmapshack-1.11.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=3072a02eec83c3c855d431f11f001e30
+_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_=b9fb8faf06a56c7f8ee71a2b67bb286c
diff --git a/metadata/md5-cache/sci-geosciences/qmapshack-1.12.0 b/metadata/md5-cache/sci-geosciences/qmapshack-1.12.0
index 32d3e9615ab8..9d15b23b8e3b 100644
--- a/metadata/md5-cache/sci-geosciences/qmapshack-1.12.0
+++ b/metadata/md5-cache/sci-geosciences/qmapshack-1.12.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-qt/qtwebengine:5[widgets] dev-qt/qtdeclarative:5[widgets] dev-qt/qtprintsupport:5 dev-qt/qtdbus:5 dev-qt/qttest:5 dev-qt/designer:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-libs/quazip >=sci-geosciences/routino-3.1.1 sci-libs/gdal sci-libs/proj sci-libs/alglib
 SLOT=0
 SRC_URI=https://bitbucket.org/maproom/qmapshack/downloads/qmapshack-1.12.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=9ef7b92abcf0fbabbed1946558997439
diff --git a/metadata/md5-cache/sci-geosciences/qmapshack-1.6.3 b/metadata/md5-cache/sci-geosciences/qmapshack-1.6.3
index 5db94773163e..996877151105 100644
--- a/metadata/md5-cache/sci-geosciences/qmapshack-1.6.3
+++ b/metadata/md5-cache/sci-geosciences/qmapshack-1.6.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-qt/qtwebkit:5 dev-qt/qtscript:5 dev-qt/qtprintsupport:5 dev-qt/qtdbus:5 dev-qt/qttest:5 dev-qt/qtnetwork:5[ssl] >=sci-geosciences/routino-3.1.1 sci-libs/gdal sci-libs/proj
 SLOT=0
 SRC_URI=https://bitbucket.org/maproom/qmapshack/downloads/qmapshack-1.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5d92028a6bc7be118e418f6f2785b456
diff --git a/metadata/md5-cache/sci-geosciences/routino-3.2 b/metadata/md5-cache/sci-geosciences/routino-3.2
index 14d6c1ca9a6e..d47b306e3ee2 100644
--- a/metadata/md5-cache/sci-geosciences/routino-3.2
+++ b/metadata/md5-cache/sci-geosciences/routino-3.2
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile prepare
 DESCRIPTION=Routing application based on openstreetmap data
 EAPI=6
 HOMEPAGE=http://www.routino.org/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=AGPL-3+
 SLOT=0
 SRC_URI=http://www.routino.org/download/routino-3.2.tgz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=3b174b0d66de75af74c92b3a3db5724c
+_md5_=33a4317c93de3d20dd09de93b8c3c739
diff --git a/metadata/md5-cache/sci-geosciences/seawater-2.0.1 b/metadata/md5-cache/sci-geosciences/seawater-2.0.1
index 87ee90be027f..733521bf098f 100644
--- a/metadata/md5-cache/sci-geosciences/seawater-2.0.1
+++ b/metadata/md5-cache/sci-geosciences/seawater-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/seawater/seawater-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=350c57fd0e3c962b825323ecf69661b2
diff --git a/metadata/md5-cache/sci-geosciences/seawater-3.3.4 b/metadata/md5-cache/sci-geosciences/seawater-3.3.4
index 57e4fe4c45e7..20b1daa1cad7 100644
--- a/metadata/md5-cache/sci-geosciences/seawater-3.3.4
+++ b/metadata/md5-cache/sci-geosciences/seawater-3.3.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/s/seawater/seawater-3.3.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c715142127b5200c4c22cd5293077f4b
diff --git a/metadata/md5-cache/sci-geosciences/tappy-0.9.0 b/metadata/md5-cache/sci-geosciences/tappy-0.9.0
index 789339947666..e2faf6971d36 100644
--- a/metadata/md5-cache/sci-geosciences/tappy-0.9.0
+++ b/metadata/md5-cache/sci-geosciences/tappy-0.9.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/tappy/tappy-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7d1f8a568ee613be214b1f7aa0276a17
diff --git a/metadata/md5-cache/sci-geosciences/tilecache-2.11-r1 b/metadata/md5-cache/sci-geosciences/tilecache-2.11-r1
index 9fc4357cfde8..f9d49192e667 100644
--- a/metadata/md5-cache/sci-geosciences/tilecache-2.11-r1
+++ b/metadata/md5-cache/sci-geosciences/tilecache-2.11-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pillow dev-python/paste python_targets_python2_7? ( >=dev-lan
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://tilecache.org/tilecache-2.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3a7d2600d59dfe7ab5e46c6986438c73
diff --git a/metadata/md5-cache/sci-geosciences/viking-1.6.2-r1 b/metadata/md5-cache/sci-geosciences/viking-1.6.2-r1
index 40358ac37e89..e07ef21cbfdb 100644
--- a/metadata/md5-cache/sci-geosciences/viking-1.6.2-r1
+++ b/metadata/md5-cache/sci-geosciences/viking-1.6.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/bzip2 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cb21769a7cbc49e6b286f029574389f2
diff --git a/metadata/md5-cache/sci-geosciences/xtide-2.13.2 b/metadata/md5-cache/sci-geosciences/xtide-2.13.2
index e5df76d54464..420791cd71e1 100644
--- a/metadata/md5-cache/sci-geosciences/xtide-2.13.2
+++ b/metadata/md5-cache/sci-geosciences/xtide-2.13.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/libpng:0 >=sci-geosciences/libtcd-2.2.5_p2 x11-libs/libX11 x11-libs/libXaw3d x11-libs/libXpm x11-libs/libXt gps? ( sci-geosciences/gpsd ) media-fonts/font-schumacher-misc
 SLOT=0
 SRC_URI=ftp://ftp.flaterco.com/xtide/xtide-2.13.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e3980f8abde839a1aaa92f625dadda72
diff --git a/metadata/md5-cache/sci-libs/Fiona-1.5.1 b/metadata/md5-cache/sci-libs/Fiona-1.5.1
index 7ced00c052b1..1de19a824e86 100644
--- a/metadata/md5-cache/sci-libs/Fiona-1.5.1
+++ b/metadata/md5-cache/sci-libs/Fiona-1.5.1
@@ -10,5 +10,5 @@ RDEPEND=>=sci-libs/gdal-1.8 dev-python/click[python_targets_python2_7(-)?,python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/F/Fiona/Fiona-1.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e72c0a78b2bfeabf7422967b1206b15f
diff --git a/metadata/md5-cache/sci-libs/Fiona-1.7.6 b/metadata/md5-cache/sci-libs/Fiona-1.7.6
index 4c02a4596a3b..80a3d91d2909 100644
--- a/metadata/md5-cache/sci-libs/Fiona-1.7.6
+++ b/metadata/md5-cache/sci-libs/Fiona-1.7.6
@@ -10,5 +10,5 @@ RDEPEND=>=sci-libs/gdal-1.8 dev-python/click[python_targets_python2_7(-)?,python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/F/Fiona/Fiona-1.7.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=944f57c8994fda467242f3fd7fda4b8a
diff --git a/metadata/md5-cache/sci-libs/Fiona-9999 b/metadata/md5-cache/sci-libs/Fiona-9999
index d0747777618f..9b9e2e8a5388 100644
--- a/metadata/md5-cache/sci-libs/Fiona-9999
+++ b/metadata/md5-cache/sci-libs/Fiona-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=sci-libs/gdal-1.8 dev-python/click[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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_=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	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=985aed6e5bca4d6b8ac231e1408bcfcb
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 454748ad0abe..ab604c07beb0 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/Rtree-0.8.2 b/metadata/md5-cache/sci-libs/Rtree-0.8.2
index df1cc6ace41b..4ae56dd82e85 100644
--- a/metadata/md5-cache/sci-libs/Rtree-0.8.2
+++ b/metadata/md5-cache/sci-libs/Rtree-0.8.2
@@ -10,5 +10,5 @@ RDEPEND=sci-libs/libspatialindex sci-libs/scipy python_targets_python2_7? ( >=de
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/R/Rtree/Rtree-0.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9c63dd1ecd2c49d21850952ae01476d6
diff --git a/metadata/md5-cache/sci-libs/Shapely-1.3.0 b/metadata/md5-cache/sci-libs/Shapely-1.3.0
index 5774302e52fb..7995a0fb898b 100644
--- a/metadata/md5-cache/sci-libs/Shapely-1.3.0
+++ b/metadata/md5-cache/sci-libs/Shapely-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=sci-libs/geos-3.1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/S/Shapely/Shapely-1.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8a96f40f3d8fc97eaa86ec1c5b727c02
diff --git a/metadata/md5-cache/sci-libs/Shapely-1.3.2 b/metadata/md5-cache/sci-libs/Shapely-1.3.2
index 3db9ed5a8733..a504f50c9a8b 100644
--- a/metadata/md5-cache/sci-libs/Shapely-1.3.2
+++ b/metadata/md5-cache/sci-libs/Shapely-1.3.2
@@ -10,5 +10,5 @@ RDEPEND=>=sci-libs/geos-3.1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/S/Shapely/Shapely-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8a96f40f3d8fc97eaa86ec1c5b727c02
diff --git a/metadata/md5-cache/sci-libs/Shapely-1.5.17 b/metadata/md5-cache/sci-libs/Shapely-1.5.17
index b26a00b5d865..8fffe3a442f5 100644
--- a/metadata/md5-cache/sci-libs/Shapely-1.5.17
+++ b/metadata/md5-cache/sci-libs/Shapely-1.5.17
@@ -10,5 +10,5 @@ RDEPEND=>=sci-libs/geos-3.1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/S/Shapely/Shapely-1.5.17.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2f7c9a8304c82545c42b25bd37ef2245
diff --git a/metadata/md5-cache/sci-libs/Shapely-1.5.17-r1 b/metadata/md5-cache/sci-libs/Shapely-1.5.17-r1
index 697bf8fe80f3..f2e07d65a275 100644
--- a/metadata/md5-cache/sci-libs/Shapely-1.5.17-r1
+++ b/metadata/md5-cache/sci-libs/Shapely-1.5.17-r1
@@ -10,5 +10,5 @@ RDEPEND=>=sci-libs/geos-3.3 dev-python/numpy[python_targets_python2_7(-)?,python
 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/Shapely/Shapely-1.5.17.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=10b626a672b6886720a5dbe03c8822df
diff --git a/metadata/md5-cache/sci-libs/Shapely-9999 b/metadata/md5-cache/sci-libs/Shapely-9999
index 0166886f7cc4..6859797d50bb 100644
--- a/metadata/md5-cache/sci-libs/Shapely-9999
+++ b/metadata/md5-cache/sci-libs/Shapely-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=sci-libs/geos-3.1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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_=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	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=380908c08ca6c588b38ab1978718c7bc
diff --git a/metadata/md5-cache/sci-libs/ViSP-3.0.1-r1 b/metadata/md5-cache/sci-libs/ViSP-3.0.1-r1
index abf12264597f..4766e8a36d45 100644
--- a/metadata/md5-cache/sci-libs/ViSP-3.0.1-r1
+++ b/metadata/md5-cache/sci-libs/ViSP-3.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=coin? ( media-libs/coin virtual/opengl ) dmtx? ( media-libs/libdmtx ) ff
 REQUIRED_USE=ffmpeg? ( opencv ) motif? ( coin )
 SLOT=0/3
 SRC_URI=http://gforge.inria.fr/frs/download.php/latestfile/475/visp-3.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6dbc52723191735d551563d692936c11
diff --git a/metadata/md5-cache/sci-libs/ViSP-3.1.0-r1 b/metadata/md5-cache/sci-libs/ViSP-3.1.0-r1
index c8d89b790666..e5346c8e3e73 100644
--- a/metadata/md5-cache/sci-libs/ViSP-3.1.0-r1
+++ b/metadata/md5-cache/sci-libs/ViSP-3.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=coin? ( media-libs/coin virtual/opengl ) dmtx? ( media-libs/libdmtx ) gs
 REQUIRED_USE=motif? ( coin )
 SLOT=0/3.1
 SRC_URI=http://gforge.inria.fr/frs/download.php/latestfile/475/visp-3.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9096ed523b649c4c28b8110226746c44
diff --git a/metadata/md5-cache/sci-libs/alglib-3.10.0-r1 b/metadata/md5-cache/sci-libs/alglib-3.10.0-r1
index c003e02a1643..089d4af0427c 100644
--- a/metadata/md5-cache/sci-libs/alglib-3.10.0-r1
+++ b/metadata/md5-cache/sci-libs/alglib-3.10.0-r1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 SLOT=0/3.8
 SRC_URI=http://www.alglib.net/translator/re/alglib-3.10.0.cpp.gpl.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bf7cd093a42c993a27b93aea177bd243
diff --git a/metadata/md5-cache/sci-libs/armadillo-6.200.3 b/metadata/md5-cache/sci-libs/armadillo-6.200.3
index 2d3d3abcbf78..62e05f1fbf90 100644
--- a/metadata/md5-cache/sci-libs/armadillo-6.200.3
+++ b/metadata/md5-cache/sci-libs/armadillo-6.200.3
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost arpack? ( sci-libs/arpack ) blas? ( virtual/blas ) lapack
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
index f3c7519515fd..3105cb3814e8 100644
--- a/metadata/md5-cache/sci-libs/armadillo-7.950.1
+++ b/metadata/md5-cache/sci-libs/armadillo-7.950.1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost arpack? ( sci-libs/arpack ) blas? ( virtual/blas ) lapack
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
index 2dbb4303db8d..3be20ee5e9b3 100644
--- a/metadata/md5-cache/sci-libs/armadillo-8.200.0
+++ b/metadata/md5-cache/sci-libs/armadillo-8.200.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost arpack? ( sci-libs/arpack ) blas? ( virtual/blas ) lapack
 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	89bb9f083a2590d9b447fd0b78a96186
+_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/armadillo-8.300.2 b/metadata/md5-cache/sci-libs/armadillo-8.300.2
index 8d2b96928b6b..7b6c004f6787 100644
--- a/metadata/md5-cache/sci-libs/armadillo-8.300.2
+++ b/metadata/md5-cache/sci-libs/armadillo-8.300.2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost arpack? ( sci-libs/arpack ) blas? ( virtual/blas ) lapack
 REQUIRED_USE=test? ( lapack )
 SLOT=0/8
 SRC_URI=mirror://sourceforge/arma/armadillo-8.300.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=965f7ea890d797877e73056bdbcc0e8e
diff --git a/metadata/md5-cache/sci-libs/avogadrolibs-1.91.0_pre20180415 b/metadata/md5-cache/sci-libs/avogadrolibs-1.91.0_pre20180415
index 5073ffae5b40..5ed24bcd578c 100644
--- a/metadata/md5-cache/sci-libs/avogadrolibs-1.91.0_pre20180415
+++ b/metadata/md5-cache/sci-libs/avogadrolibs-1.91.0_pre20180415
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/jsoncpp:= >=sci-chemistry/molequeue-0.7 archive? ( app-arch/lib
 REQUIRED_USE=vtk? ( qt5 )
 SLOT=0
 SRC_URI=https://github.com/OpenChemistry/avogadrolibs/archive/606debb5d7c2c4020478264c609f895584fc5e38.tar.gz -> avogadrolibs-1.91.0_pre20180415.tar.gz vtk? ( https://github.com/psavery/genXrdPattern/releases/download/1.0-static/linux64-genXrdPattern )
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=eea8b5b077f39d44537ff1a2ab900e0f
diff --git a/metadata/md5-cache/sci-libs/blas-reference-20151113-r1 b/metadata/md5-cache/sci-libs/blas-reference-20151113-r1
index f3296c566986..9587bd1ec32e 100644
--- a/metadata/md5-cache/sci-libs/blas-reference-20151113-r1
+++ b/metadata/md5-cache/sci-libs/blas-reference-20151113-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=app-eselect/eselect-blas doc? ( app-doc/blas-docs ) virtual/fortran
 SLOT=0
 SRC_URI=http://www.netlib.org/lapack/lapack-3.6.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=955a4b403685f98d55ee7569d4c8810c
diff --git a/metadata/md5-cache/sci-libs/blas-reference-20161223 b/metadata/md5-cache/sci-libs/blas-reference-20161223
index ae91a854b67e..d934128bfcad 100644
--- a/metadata/md5-cache/sci-libs/blas-reference-20161223
+++ b/metadata/md5-cache/sci-libs/blas-reference-20161223
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=app-eselect/eselect-blas doc? ( app-doc/blas-docs ) virtual/fortran
 SLOT=0
 SRC_URI=http://www.netlib.org/lapack/lapack-3.7.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9ec8cd62c06293981f9c75290101e554
diff --git a/metadata/md5-cache/sci-libs/bmrblib-1.0.3 b/metadata/md5-cache/sci-libs/bmrblib-1.0.3
index 6c90b61a73d9..b92f16f5f600 100644
--- a/metadata/md5-cache/sci-libs/bmrblib-1.0.3
+++ b/metadata/md5-cache/sci-libs/bmrblib-1.0.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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=http://download.gna.org/bmrblib/bmrblib-1.0.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=44ccc75f29658573371c505cb63cff23
diff --git a/metadata/md5-cache/sci-libs/cbflib-0.9.3.3 b/metadata/md5-cache/sci-libs/cbflib-0.9.3.3
index 0bd806e4df83..b115f5c9ffae 100644
--- a/metadata/md5-cache/sci-libs/cbflib-0.9.3.3
+++ b/metadata/md5-cache/sci-libs/cbflib-0.9.3.3
@@ -10,5 +10,5 @@ RDEPEND=sci-libs/hdf5:= virtual/fortran
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/cbflib/CBFlib-0.9.3.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7216292b003447182bbc37e5aec7eb68
diff --git a/metadata/md5-cache/sci-libs/cblas-reference-20151113-r2 b/metadata/md5-cache/sci-libs/cblas-reference-20151113-r2
index 2bcf50f8729a..e588fbe7b477 100644
--- a/metadata/md5-cache/sci-libs/cblas-reference-20151113-r2
+++ b/metadata/md5-cache/sci-libs/cblas-reference-20151113-r2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=app-eselect/eselect-cblas >=virtual/blas-3.6 virtual/pkgconfig virtual/fortran
 SLOT=0
 SRC_URI=http://www.netlib.org/lapack/lapack-3.6.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3b947ee8ec6885f0cbd4ade302171706
diff --git a/metadata/md5-cache/sci-libs/cblas-reference-20161223 b/metadata/md5-cache/sci-libs/cblas-reference-20161223
index dd3d3ac2047c..e6156b477bef 100644
--- a/metadata/md5-cache/sci-libs/cblas-reference-20161223
+++ b/metadata/md5-cache/sci-libs/cblas-reference-20161223
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=app-eselect/eselect-cblas >=virtual/blas-3.6 virtual/pkgconfig virtual/fortran
 SLOT=0
 SRC_URI=http://www.netlib.org/lapack/lapack-3.7.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=08b7cf4d35f61ba46f504a36aa6fcbe7
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 824b4d29d46f..5b45bc64fac7 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _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 b690f7897de9..14ac3b9f6a62 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _md5_=4be63e92adbe6c861217add4f7bbf0ad
diff --git a/metadata/md5-cache/sci-libs/cgnslib-3.3.0 b/metadata/md5-cache/sci-libs/cgnslib-3.3.0
index 7c12a9cef690..c401229f9f8f 100644
--- a/metadata/md5-cache/sci-libs/cgnslib-3.3.0
+++ b/metadata/md5-cache/sci-libs/cgnslib-3.3.0
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=hdf5? ( sci-libs/hdf5:=[mpi=,szip=] ) tools? ( dev-lang/tcl:= dev-lang/tk:= x11-libs/libXmu:= virtual/glu virtual/opengl ) fortran? ( virtual/fortran )
 SLOT=0/3
 SRC_URI=https://github.com/CGNS/CGNS/archive/v3.3.0.tar.gz -> cgnslib-3.3.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=42278891f24431ef1c3607611db338df
diff --git a/metadata/md5-cache/sci-libs/chemkit-0.1-r2 b/metadata/md5-cache/sci-libs/chemkit-0.1-r2
index 8f1d96b592ea..2c3c5343f533 100644
--- a/metadata/md5-cache/sci-libs/chemkit-0.1-r2
+++ b/metadata/md5-cache/sci-libs/chemkit-0.1-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/project/chemkit/chemkit-0.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=01cb1233fea53bbe4d0d1aade5ff7adc
diff --git a/metadata/md5-cache/sci-libs/clapack-3.2.1-r8 b/metadata/md5-cache/sci-libs/clapack-3.2.1-r8
index d80ec8ee2f02..a17c22c4552c 100644
--- a/metadata/md5-cache/sci-libs/clapack-3.2.1-r8
+++ b/metadata/md5-cache/sci-libs/clapack-3.2.1-r8
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libf2c-20090407-r1 virtual/blas
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.netlib.org/clapack/clapack-3.2.1-CMAKE.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=039d146b173e4c408109d28c0674acb7
diff --git a/metadata/md5-cache/sci-libs/clblas-2.10 b/metadata/md5-cache/sci-libs/clblas-2.10
index ac3e395e7723..2c6c3cbc4339 100644
--- a/metadata/md5-cache/sci-libs/clblas-2.10
+++ b/metadata/md5-cache/sci-libs/clblas-2.10
@@ -10,5 +10,5 @@ RDEPEND=virtual/opencl doc? ( dev-libs/mathjax ) performance? ( python_single_ta
 REQUIRED_USE=performance? ( ^^ ( 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/2
 SRC_URI=https://github.com/clMathLibraries/clBLAS/archive/v2.10.tar.gz -> clblas-2.10.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8be697e65a4a1db0c23294c2098318c1
diff --git a/metadata/md5-cache/sci-libs/clblast-0.10.0 b/metadata/md5-cache/sci-libs/clblast-0.10.0
index 45009e429c42..64648ed3305d 100644
--- a/metadata/md5-cache/sci-libs/clblast-0.10.0
+++ b/metadata/md5-cache/sci-libs/clblast-0.10.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=virtual/opencl
 SLOT=0
 SRC_URI=https://github.com/CNugteren/CLBlast/archive/0.10.0.tar.gz -> clblast-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=22cad252ed2da9ccc654e3e6cad23b4d
diff --git a/metadata/md5-cache/sci-libs/cminpack-1.3.5 b/metadata/md5-cache/sci-libs/cminpack-1.3.5
index 67a0585c0ae6..41f754565dc6 100644
--- a/metadata/md5-cache/sci-libs/cminpack-1.3.5
+++ b/metadata/md5-cache/sci-libs/cminpack-1.3.5
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=minpack
 SLOT=0/1
 SRC_URI=https://github.com/devernay/cminpack/archive/v1.3.5.tar.gz -> cminpack-1.3.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=d118aeab5332bd763483768224267a13
diff --git a/metadata/md5-cache/sci-libs/dcmtk-3.6.3 b/metadata/md5-cache/sci-libs/dcmtk-3.6.3
index c996bc4fdd29..f7c112ea0ca4 100644
--- a/metadata/md5-cache/sci-libs/dcmtk-3.6.3
+++ b/metadata/md5-cache/sci-libs/dcmtk-3.6.3
@@ -9,5 +9,5 @@ LICENSE=OFFIS
 RDEPEND=dev-libs/icu:= virtual/jpeg:0 png? ( media-libs/libpng:* ) ssl? ( dev-libs/openssl:0= ) tcpd? ( sys-apps/tcp-wrappers ) tiff? ( media-libs/tiff:0 ) xml? ( dev-libs/libxml2:2 ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk/dcmtk363/dcmtk-3.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ab8b3765063d6cdc3f84ec77e9baabe7
diff --git a/metadata/md5-cache/sci-libs/deap-0.9.1 b/metadata/md5-cache/sci-libs/deap-0.9.1
index 07dd70d1c44f..d31b4688a453 100644
--- a/metadata/md5-cache/sci-libs/deap-0.9.1
+++ b/metadata/md5-cache/sci-libs/deap-0.9.1
@@ -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://deap.googlecode.com/files/deap-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9651a8a02e4a8885b27ecf4e371d02b8
diff --git a/metadata/md5-cache/sci-libs/deap-1.0.0 b/metadata/md5-cache/sci-libs/deap-1.0.0
index a54f9f131138..a886118304cf 100644
--- a/metadata/md5-cache/sci-libs/deap-1.0.0
+++ b/metadata/md5-cache/sci-libs/deap-1.0.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/d/deap/deap-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fe58dcc7b6209834d8498813c3508f66
diff --git a/metadata/md5-cache/sci-libs/deap-1.0.1 b/metadata/md5-cache/sci-libs/deap-1.0.1
index 3ce1a1ac7da0..06e9d6a61583 100644
--- a/metadata/md5-cache/sci-libs/deap-1.0.1
+++ b/metadata/md5-cache/sci-libs/deap-1.0.1
@@ -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/DEAP/deap/archive/1.0.1.tar.gz -> deap-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ff52373e47d7d488575f16b4e0738f8b
diff --git a/metadata/md5-cache/sci-libs/dlib-19.4 b/metadata/md5-cache/sci-libs/dlib-19.4
index 052923338fe6..89c81bd6db69 100644
--- a/metadata/md5-cache/sci-libs/dlib-19.4
+++ b/metadata/md5-cache/sci-libs/dlib-19.4
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=cblas? ( virtual/cblas:= ) cuda? ( dev-libs/cudnn:= ) jpeg? ( virtual/jpeg:0= ) lapack? ( virtual/lapack:= ) mkl? ( sci-libs/mkl:= ) png? ( media-libs/libpng:0= ) sqlite? ( dev-db/sqlite:3= ) X? ( x11-libs/libX11:= )
 SLOT=0/19.4
 SRC_URI=https://github.com/davisking/dlib/archive/v19.4.tar.gz -> dlib-19.4.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	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_=3e606c9386cb2c6afc31f4f1517370d3
diff --git a/metadata/md5-cache/sci-libs/dlib-19.7 b/metadata/md5-cache/sci-libs/dlib-19.7
index ed7d33244a30..4549b2af4677 100644
--- a/metadata/md5-cache/sci-libs/dlib-19.7
+++ b/metadata/md5-cache/sci-libs/dlib-19.7
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=cblas? ( virtual/cblas:= ) cuda? ( dev-libs/cudnn:= ) jpeg? ( virtual/jpeg:0= ) lapack? ( virtual/lapack:= ) mkl? ( sci-libs/mkl:= ) png? ( media-libs/libpng:0= ) sqlite? ( dev-db/sqlite:3= ) X? ( x11-libs/libX11:= )
 SLOT=0/19.7
 SRC_URI=https://github.com/davisking/dlib/archive/v19.7.tar.gz -> dlib-19.7.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	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_=0a88b3cc763672b2be5a8e448d6508d7
diff --git a/metadata/md5-cache/sci-libs/dlib-19.9 b/metadata/md5-cache/sci-libs/dlib-19.9
index 875f68b99bb9..87b01c7e380d 100644
--- a/metadata/md5-cache/sci-libs/dlib-19.9
+++ b/metadata/md5-cache/sci-libs/dlib-19.9
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=cblas? ( virtual/cblas:= ) cuda? ( dev-libs/cudnn:= ) jpeg? ( virtual/jpeg:0= ) lapack? ( virtual/lapack:= ) mkl? ( sci-libs/mkl:= ) png? ( media-libs/libpng:0= ) python? ( python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) sqlite? ( dev-db/sqlite:3= ) X? ( x11-libs/libX11:= )
 SLOT=0/19.9
 SRC_URI=https://github.com/davisking/dlib/archive/v19.9.tar.gz -> dlib-19.9.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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_=21b8f3f96368682abc510ca950fe93a4
diff --git a/metadata/md5-cache/sci-libs/dmlc-core-0_p20170719 b/metadata/md5-cache/sci-libs/dmlc-core-0_p20170719
index 2f066024d096..c8ccdf98849f 100644
--- a/metadata/md5-cache/sci-libs/dmlc-core-0_p20170719
+++ b/metadata/md5-cache/sci-libs/dmlc-core-0_p20170719
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=net-misc/curl[ssl]
 SLOT=0
 SRC_URI=https://github.com/dmlc/dmlc-core/archive/54db57d5d1b2a7b93319053011802888b827a539.tar.gz -> dmlc-core-0_p20170719.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=28d7b139ac6e414a0a45dd60fa6c7c81
diff --git a/metadata/md5-cache/sci-libs/exodusii-6.02 b/metadata/md5-cache/sci-libs/exodusii-6.02
index f5d71a21c04c..6830c0c662eb 100644
--- a/metadata/md5-cache/sci-libs/exodusii-6.02
+++ b/metadata/md5-cache/sci-libs/exodusii-6.02
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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 7e8d246e3188..62b5b462e4d6 100644
--- a/metadata/md5-cache/sci-libs/exodusii-6.09
+++ b/metadata/md5-cache/sci-libs/exodusii-6.09
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=sci-libs/netcdf[hdf5]
 SLOT=0
 SRC_URI=mirror://sourceforge/project/exodusii/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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/sci-libs/fcl-0.5.0 b/metadata/md5-cache/sci-libs/fcl-0.5.0
index cb283e837bcf..df02249680fd 100644
--- a/metadata/md5-cache/sci-libs/fcl-0.5.0
+++ b/metadata/md5-cache/sci-libs/fcl-0.5.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=sci-libs/octomap sci-libs/flann dev-libs/boost:=[threads] sci-libs/libccd
 SLOT=0
 SRC_URI=https://github.com/flexible-collision-library/fcl/archive/0.5.0.tar.gz -> fcl-0.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=f28a93299501153363a7bc73e8541ab7
diff --git a/metadata/md5-cache/sci-libs/fcl-9999 b/metadata/md5-cache/sci-libs/fcl-9999
index 64fd2d8bb95c..f11008ee7924 100644
--- a/metadata/md5-cache/sci-libs/fcl-9999
+++ b/metadata/md5-cache/sci-libs/fcl-9999
@@ -7,5 +7,5 @@ IUSE=cpu_flags_x86_sse
 LICENSE=BSD
 RDEPEND=sci-libs/octomap sci-libs/flann dev-libs/boost:=[threads] sci-libs/libccd
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3b4165c24ab0c91bd066b5fef9aaeef2
diff --git a/metadata/md5-cache/sci-libs/flann-1.9.1 b/metadata/md5-cache/sci-libs/flann-1.9.1
index dd974641941c..c5a508db8904 100644
--- a/metadata/md5-cache/sci-libs/flann-1.9.1
+++ b/metadata/md5-cache/sci-libs/flann-1.9.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) mpi? ( sci-libs/hdf5[mpi] dev-libs/boost:=[mpi] ) !mpi? ( !sci-libs/hdf5[mpi] ) octave? ( >=sci-mathematics/octave-3.6.4-r1 )
 SLOT=0
 SRC_URI=https://github.com/mariusmuja/flann/archive/1.9.1.tar.gz -> flann-1.9.1.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	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_=5d060c38c667f53c5e7c6680d40309ac
diff --git a/metadata/md5-cache/sci-libs/flann-1.9.1-r1 b/metadata/md5-cache/sci-libs/flann-1.9.1-r1
index 32ba14672c70..e44e8c624dfd 100644
--- a/metadata/md5-cache/sci-libs/flann-1.9.1-r1
+++ b/metadata/md5-cache/sci-libs/flann-1.9.1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) mpi? ( sci-libs/hdf5[mpi] dev-libs/boost:=[mpi] ) !mpi? ( !sci-libs/hdf5[mpi] ) octave? ( >=sci-mathematics/octave-3.6.4-r1 )
 SLOT=0
 SRC_URI=https://github.com/mariusmuja/flann/archive/1.9.1.tar.gz -> flann-1.9.1.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	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_=0ccbd10b18fd67d0c9d9bb023970b710
diff --git a/metadata/md5-cache/sci-libs/flann-9999 b/metadata/md5-cache/sci-libs/flann-9999
index 07cfa7138e6d..88241fe819fe 100644
--- a/metadata/md5-cache/sci-libs/flann-9999
+++ b/metadata/md5-cache/sci-libs/flann-9999
@@ -7,5 +7,5 @@ IUSE=cuda doc examples mpi openmp octave static-libs
 LICENSE=BSD
 RDEPEND=cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) mpi? ( sci-libs/hdf5[mpi] dev-libs/boost:=[mpi] ) !mpi? ( !sci-libs/hdf5[mpi] ) octave? ( >=sci-mathematics/octave-3.6.4-r1 )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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_=2dc8313cd30281968913f5f5c9856d76
diff --git a/metadata/md5-cache/sci-libs/gdal-2.3.0-r2 b/metadata/md5-cache/sci-libs/gdal-2.3.0-r2
index cdce029054ac..3ba57eb7a68f 100644
--- a/metadata/md5-cache/sci-libs/gdal-2.3.0-r2
+++ b/metadata/md5-cache/sci-libs/gdal-2.3.0-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre dev-libs/libxml2:= med
 REQUIRED_USE=mdb? ( java ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) spatialite? ( sqlite )
 SLOT=0/2.3
 SRC_URI=https://download.osgeo.org/gdal/2.3.0/gdal-2.3.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=40e2a15c66267e2adaab437a6e11a329
diff --git a/metadata/md5-cache/sci-libs/gdal-2.3.1 b/metadata/md5-cache/sci-libs/gdal-2.3.1
index ef128a8ea4c6..81570da1d730 100644
--- a/metadata/md5-cache/sci-libs/gdal-2.3.1
+++ b/metadata/md5-cache/sci-libs/gdal-2.3.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre dev-libs/libxml2:= med
 REQUIRED_USE=mdb? ( java ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) spatialite? ( sqlite )
 SLOT=0/2.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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/sci-libs/grib_api-1.14.5 b/metadata/md5-cache/sci-libs/grib_api-1.14.5
index 64c8af092cae..13e5227cadd2 100644
--- a/metadata/md5-cache/sci-libs/grib_api-1.14.5
+++ b/metadata/md5-cache/sci-libs/grib_api-1.14.5
@@ -10,5 +10,5 @@ RDEPEND=aec? ( sci-libs/libaec:= ) jpeg2k? ( media-libs/jasper:= ) netcdf? ( sci
 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=https://software.ecmwf.int/wiki/download/attachments/3473437/grib_api-1.14.5-Source.tar.gz test? ( http://download.ecmwf.org/test-data/grib_api/grib_api_test_data.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e512c832b89f39604eae1aaffb04e496
diff --git a/metadata/md5-cache/sci-libs/hypre-2.11.1 b/metadata/md5-cache/sci-libs/hypre-2.11.1
index 5e840f15e83b..d63b473005fe 100644
--- a/metadata/md5-cache/sci-libs/hypre-2.11.1
+++ b/metadata/md5-cache/sci-libs/hypre-2.11.1
@@ -10,5 +10,5 @@ RDEPEND=sci-libs/superlu:= virtual/blas virtual/lapack mpi? ( virtual/mpi ) fort
 REQUIRED_USE=int64? ( !fei )
 SLOT=0/2.11.1
 SRC_URI=https://computation.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods/download/hypre-2.11.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1b21717b950f2dd96b0a0b4909e2b29b
diff --git a/metadata/md5-cache/sci-libs/hypre-2.11.2 b/metadata/md5-cache/sci-libs/hypre-2.11.2
index e6632ca00263..8d66e433f8d9 100644
--- a/metadata/md5-cache/sci-libs/hypre-2.11.2
+++ b/metadata/md5-cache/sci-libs/hypre-2.11.2
@@ -10,5 +10,5 @@ RDEPEND=sci-libs/superlu:= virtual/blas virtual/lapack mpi? ( virtual/mpi ) fort
 REQUIRED_USE=int64? ( !fei )
 SLOT=0/2.11.2
 SRC_URI=https://computation.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods/download/hypre-2.11.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1b21717b950f2dd96b0a0b4909e2b29b
diff --git a/metadata/md5-cache/sci-libs/hypre-2.14.0 b/metadata/md5-cache/sci-libs/hypre-2.14.0
index 50dfc0851f83..928a471b9158 100644
--- a/metadata/md5-cache/sci-libs/hypre-2.14.0
+++ b/metadata/md5-cache/sci-libs/hypre-2.14.0
@@ -10,5 +10,5 @@ RDEPEND=sci-libs/superlu:= virtual/blas virtual/lapack mpi? ( virtual/mpi ) fort
 REQUIRED_USE=int64? ( !fei )
 SLOT=0/2.14.0
 SRC_URI=https://github.com/LLNL/hypre/archive/v2.14.0.tar.gz -> hypre-2.14.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a253d0b4f765398243a39e1f5b70ce3a
diff --git a/metadata/md5-cache/sci-libs/ignition-math-3.2.0 b/metadata/md5-cache/sci-libs/ignition-math-3.2.0
index f2f093863673..412918a24c30 100644
--- a/metadata/md5-cache/sci-libs/ignition-math-3.2.0
+++ b/metadata/md5-cache/sci-libs/ignition-math-3.2.0
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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 1ee4c73e115f..cdbbdc1ff287 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a4ffc806d9d936e843c846383d5fba51
diff --git a/metadata/md5-cache/sci-libs/indilib-1.6.0 b/metadata/md5-cache/sci-libs/indilib-1.6.0
index 1cf69c3bba23..9e6b071292a9 100644
--- a/metadata/md5-cache/sci-libs/indilib-1.6.0
+++ b/metadata/md5-cache/sci-libs/indilib-1.6.0
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2+ LGPL-2+ LGPL-2.1+
 RDEPEND=net-misc/curl sci-libs/cfitsio:= sci-libs/gsl:= sci-libs/libnova sys-libs/zlib:= virtual/jpeg:0 virtual/libusb:0 ogg? ( media-libs/libogg media-libs/libtheora )
 SLOT=0/1
 SRC_URI=https://github.com/indilib/indi/releases/download/v1.6.0/libindi_1.6.0.tar.gz -> indilib-1.6.0.tar.gz
-_eclasses_=cmake-utils	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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=43046ef73049d0972c111b5aadfe3cb5
diff --git a/metadata/md5-cache/sci-libs/itpp-4.3.1-r1 b/metadata/md5-cache/sci-libs/itpp-4.3.1-r1
index dc30d8c7044e..a766eae694b2 100644
--- a/metadata/md5-cache/sci-libs/itpp-4.3.1-r1
+++ b/metadata/md5-cache/sci-libs/itpp-4.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=sci-libs/fftw:3.0= virtual/blas virtual/lapack
 SLOT=0
 SRC_URI=mirror://sourceforge/itpp/itpp-4.3.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e44d432fd9224347a87be7dbccaa9b23
diff --git a/metadata/md5-cache/sci-libs/keras-applications-1.0.4 b/metadata/md5-cache/sci-libs/keras-applications-1.0.4
index 1d09b841820c..1abfe873747c 100644
--- a/metadata/md5-cache/sci-libs/keras-applications-1.0.4
+++ b/metadata/md5-cache/sci-libs/keras-applications-1.0.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_6(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/keras-team/keras-applications/archive/1.0.4.tar.gz -> keras-applications-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a257616ef7f65eb92b709b807a085996
diff --git a/metadata/md5-cache/sci-libs/keras-applications-1.0.5 b/metadata/md5-cache/sci-libs/keras-applications-1.0.5
index e65388e497b8..2cdd45a03754 100644
--- a/metadata/md5-cache/sci-libs/keras-applications-1.0.5
+++ b/metadata/md5-cache/sci-libs/keras-applications-1.0.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/60/27/a25dfc6e49a6ab3de2d5f23fdb851f18d45ea9867a0955906a5c488ebbe2/Keras_Applications-1.0.5.tar.gz -> keras-applications-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9340d9cf289abee5ecd5b3f4a54ed09e
diff --git a/metadata/md5-cache/sci-libs/keras-preprocessing-1.0.2 b/metadata/md5-cache/sci-libs/keras-preprocessing-1.0.2
index 3ba5b47dd03a..4595a5d4434d 100644
--- a/metadata/md5-cache/sci-libs/keras-preprocessing-1.0.2
+++ b/metadata/md5-cache/sci-libs/keras-preprocessing-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_6(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/keras-team/keras-preprocessing/archive/1.0.2.tar.gz -> keras-preprocessing-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fb109d00c5b9a706751b38105bf2b718
diff --git a/metadata/md5-cache/sci-libs/keras-preprocessing-1.0.3 b/metadata/md5-cache/sci-libs/keras-preprocessing-1.0.3
index ffdb3542e542..aa525f3aa324 100644
--- a/metadata/md5-cache/sci-libs/keras-preprocessing-1.0.3
+++ b/metadata/md5-cache/sci-libs/keras-preprocessing-1.0.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/keras-team/keras-preprocessing/archive/1.0.3.tar.gz -> keras-preprocessing-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e778466d8757217f41686d06c92778dd
diff --git a/metadata/md5-cache/sci-libs/lapack-reference-3.6.0 b/metadata/md5-cache/sci-libs/lapack-reference-3.6.0
index 04de55f30d1a..02b8fd8bf62d 100644
--- a/metadata/md5-cache/sci-libs/lapack-reference-3.6.0
+++ b/metadata/md5-cache/sci-libs/lapack-reference-3.6.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=app-eselect/eselect-lapack >=virtual/blas-3.6 virtual/pkgconfig virtual/fortran
 SLOT=0
 SRC_URI=http://www.netlib.org/lapack/lapack-3.6.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d96aee0562e97a5d1c43d79652c7dd01
diff --git a/metadata/md5-cache/sci-libs/lapack-reference-3.7.0 b/metadata/md5-cache/sci-libs/lapack-reference-3.7.0
index 43e81f4805bf..30a98b0a23be 100644
--- a/metadata/md5-cache/sci-libs/lapack-reference-3.7.0
+++ b/metadata/md5-cache/sci-libs/lapack-reference-3.7.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=app-eselect/eselect-lapack >=virtual/blas-3.6 virtual/pkgconfig virtual/fortran
 SLOT=0
 SRC_URI=http://www.netlib.org/lapack/lapack-3.7.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c77ecae75d0d84c1aea91587922bfde6
diff --git a/metadata/md5-cache/sci-libs/lemon-1.3-r2 b/metadata/md5-cache/sci-libs/lemon-1.3-r2
index 60c1728f679f..d11e9f9b3b3c 100644
--- a/metadata/md5-cache/sci-libs/lemon-1.3-r2
+++ b/metadata/md5-cache/sci-libs/lemon-1.3-r2
@@ -10,5 +10,5 @@ RDEPEND=glpk? ( sci-mathematics/glpk:= ) coin? ( sci-libs/coinor-cbc:= sci-libs/
 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	89bb9f083a2590d9b447fd0b78a96186
+_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/levmar-2.6 b/metadata/md5-cache/sci-libs/levmar-2.6
index 4d3393535293..463235e70f8e 100644
--- a/metadata/md5-cache/sci-libs/levmar-2.6
+++ b/metadata/md5-cache/sci-libs/levmar-2.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/blas virtual/lapack
 SLOT=0
 SRC_URI=https://www.ics.forth.gr/~lourakis/levmar//levmar-2.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ca1fe4c2b38dc3033487dc8c32f45e99
diff --git a/metadata/md5-cache/sci-libs/libaec-1.0.1 b/metadata/md5-cache/sci-libs/libaec-1.0.1
index 7749ebd8b0c5..2dc82a5dd209 100644
--- a/metadata/md5-cache/sci-libs/libaec-1.0.1
+++ b/metadata/md5-cache/sci-libs/libaec-1.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=szip? ( !sci-libs/szip )
 SLOT=0/2
 SRC_URI=https://gitlab.dkrz.de/k202009/libaec/repository/archive.tar.gz?ref=v1.0.1 -> libaec-1.0.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=230115916c2eb4f93908aa41b07fa7f1
diff --git a/metadata/md5-cache/sci-libs/libaec-1.0.2 b/metadata/md5-cache/sci-libs/libaec-1.0.2
index cb7584b98178..4c74dd891caf 100644
--- a/metadata/md5-cache/sci-libs/libaec-1.0.2
+++ b/metadata/md5-cache/sci-libs/libaec-1.0.2
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=szip? ( !sci-libs/szip )
 SLOT=0/2
 SRC_URI=https://gitlab.dkrz.de/k202009/libaec/repository/archive.tar.gz?ref=v1.0.2 -> libaec-1.0.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=89d3b3024ea2890db539e62887bf5db4
diff --git a/metadata/md5-cache/sci-libs/libccd-2.0 b/metadata/md5-cache/sci-libs/libccd-2.0
index 26a553be2dfb..68ab3317966c 100644
--- a/metadata/md5-cache/sci-libs/libccd-2.0
+++ b/metadata/md5-cache/sci-libs/libccd-2.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://libccd.danfis.cz/files/libccd-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2d57d656458316e6b61dae5a94ccfa47
diff --git a/metadata/md5-cache/sci-libs/libccd-9999 b/metadata/md5-cache/sci-libs/libccd-9999
index 26c5decc5c53..3ab65591d53b 100644
--- a/metadata/md5-cache/sci-libs/libccd-9999
+++ b/metadata/md5-cache/sci-libs/libccd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://libccd.danfis.cz/
 IUSE=double doc
 LICENSE=BSD
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7f99d61f48ecfb80c1bd867eb4f139fe
diff --git a/metadata/md5-cache/sci-libs/libgeodecomp-0.3.1 b/metadata/md5-cache/sci-libs/libgeodecomp-0.3.1
index bc074a3cef7c..7c477fd95aa1 100644
--- a/metadata/md5-cache/sci-libs/libgeodecomp-0.3.1
+++ b/metadata/md5-cache/sci-libs/libgeodecomp-0.3.1
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=>=dev-libs/boost-1.48
 SLOT=0
 SRC_URI=http://www.libgeodecomp.org/archive/libgeodecomp-0.3.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cb8cd1df57f25e2b37f0710eab6455c8
diff --git a/metadata/md5-cache/sci-libs/libsigrokdecode-0.5.2 b/metadata/md5-cache/sci-libs/libsigrokdecode-0.5.2
new file mode 100644
index 000000000000..ad18c0902dc8
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/libsigrokdecode-0.5.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare setup test
+DEPEND=>=dev-libs/glib-2.34.0 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(+)?] virtual/pkgconfig
+DESCRIPTION=provide (streaming) protocol decoding functionality
+EAPI=6
+HOMEPAGE=https://sigrok.org/wiki/Libsigrokdecode
+IUSE=static-libs python_targets_python3_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=>=dev-libs/glib-2.34.0 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_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/4
+SRC_URI=https://sigrok.org/download/source/libsigrokdecode/libsigrokdecode-0.5.2.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_=c26c33f842775476d3ac0317a65133cb
diff --git a/metadata/md5-cache/sci-libs/libsigrokdecode-9999 b/metadata/md5-cache/sci-libs/libsigrokdecode-9999
index 2c16a6779f47..66aeea6facd4 100644
--- a/metadata/md5-cache/sci-libs/libsigrokdecode-9999
+++ b/metadata/md5-cache/sci-libs/libsigrokdecode-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.28.0 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(+)?] virtual/pkgconfig >=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
+DEPEND=>=dev-libs/glib-2.34.0 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(+)?] virtual/pkgconfig >=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=provide (streaming) protocol decoding functionality
 EAPI=6
 HOMEPAGE=https://sigrok.org/wiki/Libsigrokdecode
 IUSE=static-libs python_targets_python3_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=>=dev-libs/glib-2.28.0 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(+)?]
+RDEPEND=>=dev-libs/glib-2.34.0 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_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/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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=85389e63ce459eda8dfd46c467a76fd8
+_md5_=d88c51f4f5904db62603299fb1dc4d95
diff --git a/metadata/md5-cache/sci-libs/libxc-2.1.3 b/metadata/md5-cache/sci-libs/libxc-2.1.3
new file mode 100644
index 000000000000..45fbe216395e
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/libxc-2.1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install 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/fortran
+DESCRIPTION=A library of exchange-correlation functionals for use in DFT
+EAPI=5
+HOMEPAGE=http://octopus-code.org/wiki/Libxc
+IUSE=fortran static-libs -test
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=LGPL-3
+RDEPEND=virtual/fortran
+SLOT=0
+SRC_URI=http://www.tddft.org/programs/octopus/download/libxc/libxc-2.1.3.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	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
+_md5_=2fd3c43feb0647898e5932d07c9c03f7
diff --git a/metadata/md5-cache/sci-libs/libxc-2.2.3 b/metadata/md5-cache/sci-libs/libxc-2.2.3
new file mode 100644
index 000000000000..040de09ffb0c
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/libxc-2.2.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install 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/fortran
+DESCRIPTION=A library of exchange-correlation functionals for use in DFT
+EAPI=5
+HOMEPAGE=http://octopus-code.org/wiki/Libxc
+IUSE=fortran static-libs -test
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=LGPL-3
+RDEPEND=virtual/fortran
+SLOT=0
+SRC_URI=http://www.tddft.org/programs/octopus/download/libxc/libxc-2.2.3.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	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
+_md5_=2fd3c43feb0647898e5932d07c9c03f7
diff --git a/metadata/md5-cache/sci-libs/libxc-3.0.0 b/metadata/md5-cache/sci-libs/libxc-3.0.0
new file mode 100644
index 000000000000..5b402a17713e
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/libxc-3.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install 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/fortran
+DESCRIPTION=A library of exchange-correlation functionals for use in DFT
+EAPI=5
+HOMEPAGE=http://octopus-code.org/wiki/Libxc
+IUSE=fortran static-libs -test
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=LGPL-3
+RDEPEND=virtual/fortran
+SLOT=0
+SRC_URI=http://www.tddft.org/programs/octopus/download/libxc/libxc-3.0.0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	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
+_md5_=2fd3c43feb0647898e5932d07c9c03f7
diff --git a/metadata/md5-cache/sci-libs/linux-gpib-4.1.0 b/metadata/md5-cache/sci-libs/linux-gpib-4.1.0
index c4f72689b37d..cb2422856b59 100644
--- a/metadata/md5-cache/sci-libs/linux-gpib-4.1.0
+++ b/metadata/md5-cache/sci-libs/linux-gpib-4.1.0
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/readline:= tcl? ( dev-lang/tcl:0= ) guile? ( dev-scheme/guile:1
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/linux-gpib/linux-gpib-4.1.0.tar.gz firmware? ( https://linux-gpib.sourceforge.io/firmware/gpib_firmware-2006-11-12.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	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
+_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	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_=55404a37ba2eb82c03f47dd08c0b565a
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
new file mode 100644
index 000000000000..a0ae54381c17
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/linux-gpib-4.2.0_rc1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup
+DEPEND=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 ) virtual/pkgconfig doc? ( app-text/docbook-sgml-utils ) perl? ( virtual/perl-ExtUtils-MakeMaker ) >=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=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
+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 )
+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
diff --git a/metadata/md5-cache/sci-libs/lmfit-7.0 b/metadata/md5-cache/sci-libs/lmfit-7.0
index 4085102f986c..c99634e94c54 100644
--- a/metadata/md5-cache/sci-libs/lmfit-7.0
+++ b/metadata/md5-cache/sci-libs/lmfit-7.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=http://apps.jcns.fz-juelich.de/src/lmfit/lmfit-7.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3e7a5d6c3251fd441786bd9a42e1d1eb
diff --git a/metadata/md5-cache/sci-libs/mathgl-2.4.1 b/metadata/md5-cache/sci-libs/mathgl-2.4.1
index 920db7096a16..58c83e2a6a03 100644
--- a/metadata/md5-cache/sci-libs/mathgl-2.4.1
+++ b/metadata/md5-cache/sci-libs/mathgl-2.4.1
@@ -10,5 +10,5 @@ RDEPEND=virtual/opengl fltk? ( x11-libs/fltk:1 ) gif? ( media-libs/giflib ) glut
 REQUIRED_USE=mpi? ( hdf5 ) openmp? ( !threads ) png? ( zlib ) pdf? ( png ) python? ( python_targets_python2_7 )
 SLOT=0/7.5.0
 SRC_URI=mirror://sourceforge/mathgl/mathgl-2.4.1.tar.gz mirror://sourceforge/mathgl/STIX_font.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8933ec7e5adc820ed8180b6981b42e3c
diff --git a/metadata/md5-cache/sci-libs/metis-5.1.0-r2 b/metadata/md5-cache/sci-libs/metis-5.1.0-r2
index 18411453cd5e..f22a6950c549 100644
--- a/metadata/md5-cache/sci-libs/metis-5.1.0-r2
+++ b/metadata/md5-cache/sci-libs/metis-5.1.0-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=!sci-libs/parmetis virtual/fortran
 SLOT=0
 SRC_URI=http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e272526471ae9130aedb78962b63f102
diff --git a/metadata/md5-cache/sci-libs/metis-5.1.0-r3 b/metadata/md5-cache/sci-libs/metis-5.1.0-r3
index f712ae8515ec..36399afd7313 100644
--- a/metadata/md5-cache/sci-libs/metis-5.1.0-r3
+++ b/metadata/md5-cache/sci-libs/metis-5.1.0-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=!sci-libs/parmetis virtual/fortran
 SLOT=0
 SRC_URI=http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e8795e56c18ec1423afd14d1ee84c942
diff --git a/metadata/md5-cache/sci-libs/minfx-1.0.10 b/metadata/md5-cache/sci-libs/minfx-1.0.10
index 26b12616b1a3..1c44261af38a 100644
--- a/metadata/md5-cache/sci-libs/minfx-1.0.10
+++ b/metadata/md5-cache/sci-libs/minfx-1.0.10
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=http://download.gna.org/minfx/minfx-1.0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0e286da2f6c4c32fcf106508376ad5dc
diff --git a/metadata/md5-cache/sci-libs/minfx-1.0.11 b/metadata/md5-cache/sci-libs/minfx-1.0.11
index e8ca5cc7bc1f..ad01c602322e 100644
--- a/metadata/md5-cache/sci-libs/minfx-1.0.11
+++ b/metadata/md5-cache/sci-libs/minfx-1.0.11
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 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=http://download.gna.org/minfx/minfx-1.0.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a79db142493d936f8459c07807189836
diff --git a/metadata/md5-cache/sci-libs/minfx-1.0.3-r1 b/metadata/md5-cache/sci-libs/minfx-1.0.3-r1
index b25669665d1e..8aa7b6484f02 100644
--- a/metadata/md5-cache/sci-libs/minfx-1.0.3-r1
+++ b/metadata/md5-cache/sci-libs/minfx-1.0.3-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://download.gna.org/minfx/minfx-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5c9d4b6a4967ecac740816c628a62581
diff --git a/metadata/md5-cache/sci-libs/minfx-1.0.4 b/metadata/md5-cache/sci-libs/minfx-1.0.4
index e12332297bfd..81bd75f19274 100644
--- a/metadata/md5-cache/sci-libs/minfx-1.0.4
+++ b/metadata/md5-cache/sci-libs/minfx-1.0.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://download.gna.org/minfx/minfx-1.0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5c9d4b6a4967ecac740816c628a62581
diff --git a/metadata/md5-cache/sci-libs/minfx-1.0.4_pre98 b/metadata/md5-cache/sci-libs/minfx-1.0.4_pre98
index 5dc3d5f9ea58..ef5fbe25f9e5 100644
--- a/metadata/md5-cache/sci-libs/minfx-1.0.4_pre98
+++ b/metadata/md5-cache/sci-libs/minfx-1.0.4_pre98
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/minfx-1.0.4_pre98.tar.xz
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=40e4ad340c36c08a4e2c5ed1cac494f1
diff --git a/metadata/md5-cache/sci-libs/minfx-1.0.5 b/metadata/md5-cache/sci-libs/minfx-1.0.5
index 03144669c65a..96bb09bfaa6f 100644
--- a/metadata/md5-cache/sci-libs/minfx-1.0.5
+++ b/metadata/md5-cache/sci-libs/minfx-1.0.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://download.gna.org/minfx/minfx-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5c9d4b6a4967ecac740816c628a62581
diff --git a/metadata/md5-cache/sci-libs/minfx-1.0.6 b/metadata/md5-cache/sci-libs/minfx-1.0.6
index 41b1388e8f13..f7d7cf263c46 100644
--- a/metadata/md5-cache/sci-libs/minfx-1.0.6
+++ b/metadata/md5-cache/sci-libs/minfx-1.0.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=http://download.gna.org/minfx/minfx-1.0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7d27393462dd943af263daa344e58ac9
diff --git a/metadata/md5-cache/sci-libs/mmtk-2.7.9 b/metadata/md5-cache/sci-libs/mmtk-2.7.9
index 6bc30cf93624..0908d030847b 100644
--- a/metadata/md5-cache/sci-libs/mmtk-2.7.9
+++ b/metadata/md5-cache/sci-libs/mmtk-2.7.9
@@ -10,5 +10,5 @@ RDEPEND=dev-python/cython[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://sourcesup.cru.fr/frs/download.php/4324/MMTK-2.7.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d49c56f5778972f968382eaa947ebf59
diff --git a/metadata/md5-cache/sci-libs/nanoflann-1.2.3 b/metadata/md5-cache/sci-libs/nanoflann-1.2.3
index 9a88cd209c84..0223372e84c4 100644
--- a/metadata/md5-cache/sci-libs/nanoflann-1.2.3
+++ b/metadata/md5-cache/sci-libs/nanoflann-1.2.3
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-cpp/eigen:3
 SLOT=0
 SRC_URI=https://github.com/jlblancoc/nanoflann/archive/v1.2.3.tar.gz -> nanoflann-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0fd34bd9689c9ea457ede63164b8e258
diff --git a/metadata/md5-cache/sci-libs/nanoflann-9999 b/metadata/md5-cache/sci-libs/nanoflann-9999
index f8a8268ef6dd..31d4230bb84f 100644
--- a/metadata/md5-cache/sci-libs/nanoflann-9999
+++ b/metadata/md5-cache/sci-libs/nanoflann-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/jlblancoc/nanoflann
 LICENSE=BSD
 RDEPEND=dev-cpp/eigen:3
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0fd34bd9689c9ea457ede63164b8e258
diff --git a/metadata/md5-cache/sci-libs/neartree-5.1.1 b/metadata/md5-cache/sci-libs/neartree-5.1.1
index 21251024f811..7744b555092a 100644
--- a/metadata/md5-cache/sci-libs/neartree-5.1.1
+++ b/metadata/md5-cache/sci-libs/neartree-5.1.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/cvector
 SLOT=0
 SRC_URI=mirror://sourceforge/neartree/NearTree-5.1.1.tar.gz -> neartree-5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=225debfa9ba2031713e6ac9978932d5d
diff --git a/metadata/md5-cache/sci-libs/nemesis-5.24 b/metadata/md5-cache/sci-libs/nemesis-5.24
index 47923f7d8d00..8522e5aa2b8e 100644
--- a/metadata/md5-cache/sci-libs/nemesis-5.24
+++ b/metadata/md5-cache/sci-libs/nemesis-5.24
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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 3495d552f06f..4e6fadee5941 100644
--- a/metadata/md5-cache/sci-libs/nemesis-6.09
+++ b/metadata/md5-cache/sci-libs/nemesis-6.09
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=sci-libs/exodusii sci-libs/netcdf
 SLOT=0
 SRC_URI=mirror://sourceforge/project/exodusii/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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/sci-libs/netcdf-4.6.1-r1 b/metadata/md5-cache/sci-libs/netcdf-4.6.1-r1
new file mode 100644
index 000000000000..5a5b20787c60
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/netcdf-4.6.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install test
+DEPEND=dap? ( net-misc/curl:0= ) hdf? ( sci-libs/hdf:0= sci-libs/hdf5:0= ) hdf5? ( sci-libs/hdf5:0=[hl(+),mpi=,szip=,zlib] )
+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
+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
diff --git a/metadata/md5-cache/sci-libs/oce-0.18.3 b/metadata/md5-cache/sci-libs/oce-0.18.3
index 19a8247324c5..464bf59d9188 100644
--- a/metadata/md5-cache/sci-libs/oce-0.18.3
+++ b/metadata/md5-cache/sci-libs/oce-0.18.3
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/tcl:0= dev-lang/tk:0= dev-tcltk/itcl dev-tcltk/itk dev-tcltk/ti
 REQUIRED_USE=?? ( openmp tbb )
 SLOT=0.18.3
 SRC_URI=https://github.com/tpaviot/oce/archive/OCE-0.18.3.tar.gz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1245b25c5d0a54463157f97413286acc
diff --git a/metadata/md5-cache/sci-libs/octomap-1.9.0 b/metadata/md5-cache/sci-libs/octomap-1.9.0
index fedc9dec921f..001c6a26014e 100644
--- a/metadata/md5-cache/sci-libs/octomap-1.9.0
+++ b/metadata/md5-cache/sci-libs/octomap-1.9.0
@@ -9,5 +9,5 @@ LICENSE=BSD qt5? ( GPL-2 )
 RDEPEND=qt5? ( virtual/opengl dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-libs/libQGLViewer:= )
 SLOT=0/19
 SRC_URI=https://github.com/OctoMap/octomap/archive/v1.9.0.tar.gz -> octomap-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e48c8357363075137a96b5452bfe3661
diff --git a/metadata/md5-cache/sci-libs/octomap-9999 b/metadata/md5-cache/sci-libs/octomap-9999
index 9e70b2fd10c1..3e1ce5e23036 100644
--- a/metadata/md5-cache/sci-libs/octomap-9999
+++ b/metadata/md5-cache/sci-libs/octomap-9999
@@ -7,5 +7,5 @@ IUSE=qt5 dynamicEDT3D doc
 LICENSE=BSD qt5? ( GPL-2 )
 RDEPEND=qt5? ( virtual/opengl dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-libs/libQGLViewer:= )
 SLOT=0/19
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5083699d475d58ad391f872745354dd7
diff --git a/metadata/md5-cache/sci-libs/orocos-bfl-0.8.0 b/metadata/md5-cache/sci-libs/orocos-bfl-0.8.0
index a7a29f31707d..5cad334ac32f 100644
--- a/metadata/md5-cache/sci-libs/orocos-bfl-0.8.0
+++ b/metadata/md5-cache/sci-libs/orocos-bfl-0.8.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/boost:=
 SLOT=0
 SRC_URI=http://people.mech.kuleuven.be/~tdelaet/bfl_tar/orocos-bfl-0.8.0-src.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3140f075fa74dac5d581f31cf40a5de9
diff --git a/metadata/md5-cache/sci-libs/orocos_kdl-1.3.1-r1 b/metadata/md5-cache/sci-libs/orocos_kdl-1.3.1-r1
index 42a3f8a5ed93..415bb384fcb8 100644
--- a/metadata/md5-cache/sci-libs/orocos_kdl-1.3.1-r1
+++ b/metadata/md5-cache/sci-libs/orocos_kdl-1.3.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-cpp/eigen:3
 REQUIRED_USE=examples? ( models )
 SLOT=0
 SRC_URI=https://github.com/orocos/orocos_kinematics_dynamics/archive/v1.3.1.tar.gz -> orocos_kinematics_dynamics-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=50510226efb306edacd211dd5aa8fdb6
diff --git a/metadata/md5-cache/sci-libs/orocos_kdl-1.4.0 b/metadata/md5-cache/sci-libs/orocos_kdl-1.4.0
index 04557f68b4e6..ef32ee96a51f 100644
--- a/metadata/md5-cache/sci-libs/orocos_kdl-1.4.0
+++ b/metadata/md5-cache/sci-libs/orocos_kdl-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=dev-cpp/eigen:3
 REQUIRED_USE=examples? ( models )
 SLOT=0/14
 SRC_URI=https://github.com/orocos/orocos_kinematics_dynamics/archive/v1.4.0.tar.gz -> orocos_kinematics_dynamics-1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7d8a61ce35b24c50f2ca2ad89345a2eb
diff --git a/metadata/md5-cache/sci-libs/orocos_kdl-9999 b/metadata/md5-cache/sci-libs/orocos_kdl-9999
index 54afa89abce1..393bd36af434 100644
--- a/metadata/md5-cache/sci-libs/orocos_kdl-9999
+++ b/metadata/md5-cache/sci-libs/orocos_kdl-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-cpp/eigen:3
 REQUIRED_USE=examples? ( models )
 SLOT=0/14
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7d8a61ce35b24c50f2ca2ad89345a2eb
diff --git a/metadata/md5-cache/sci-libs/pcl-1.8.1 b/metadata/md5-cache/sci-libs/pcl-1.8.1
index b48ca2ae2647..f017016524db 100644
--- a/metadata/md5-cache/sci-libs/pcl-1.8.1
+++ b/metadata/md5-cache/sci-libs/pcl-1.8.1
@@ -10,5 +10,5 @@ RDEPEND=>=sci-libs/flann-1.7.1 dev-libs/boost:=[threads] dev-cpp/eigen:3 opengl?
 REQUIRED_USE=openni? ( usb ) openni2? ( usb ) tutorials? ( doc )
 SLOT=0/1.8
 SRC_URI=https://github.com/PointCloudLibrary/pcl/archive/pcl-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=564ebb1091b2e6eea7784cfc48dd33c7
diff --git a/metadata/md5-cache/sci-libs/pcl-9999 b/metadata/md5-cache/sci-libs/pcl-9999
index 09f47a5831bb..41d697ddbe5e 100644
--- a/metadata/md5-cache/sci-libs/pcl-9999
+++ b/metadata/md5-cache/sci-libs/pcl-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=sci-libs/flann-1.7.1 dev-libs/boost:=[threads] dev-cpp/eigen:3 opengl? ( virtual/opengl media-libs/freeglut ) openni? ( dev-libs/OpenNI ) openni2? ( dev-libs/OpenNI2 ) pcap? ( net-libs/libpcap ) png? ( media-libs/libpng:0= ) qhull? ( media-libs/qhull ) qt5? ( dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtopengl:5 ) usb? ( virtual/libusb:1 ) vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
 REQUIRED_USE=openni? ( usb ) openni2? ( usb ) tutorials? ( doc )
 SLOT=0/1.8
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=564ebb1091b2e6eea7784cfc48dd33c7
diff --git a/metadata/md5-cache/sci-libs/plplot-5.12.0-r1 b/metadata/md5-cache/sci-libs/plplot-5.12.0-r1
index ab5b3c85d1dd..604791322bc9 100644
--- a/metadata/md5-cache/sci-libs/plplot-5.12.0-r1
+++ b/metadata/md5-cache/sci-libs/plplot-5.12.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( python_targets_python2_7 ) qt5? ( dynamic ) test? ( latex
 RESTRICT=octave? ( test )
 SLOT=0/14
 SRC_URI=mirror://sourceforge/plplot/plplot-5.12.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5894f4fd5a4957b627a3595d34fab084
diff --git a/metadata/md5-cache/sci-libs/pycifrw-3.6.2 b/metadata/md5-cache/sci-libs/pycifrw-3.6.2
index d41c96a5b27a..11f164b801b7 100644
--- a/metadata/md5-cache/sci-libs/pycifrw-3.6.2
+++ b/metadata/md5-cache/sci-libs/pycifrw-3.6.2
@@ -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=mirror://pypi/P/PyCifRW/PyCifRW-3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=23ec970118ce61d420f861b5257a0f64
diff --git a/metadata/md5-cache/sci-libs/pycifrw-4.1.1 b/metadata/md5-cache/sci-libs/pycifrw-4.1.1
index 67c2642bca18..2c6d840aef24 100644
--- a/metadata/md5-cache/sci-libs/pycifrw-4.1.1
+++ b/metadata/md5-cache/sci-libs/pycifrw-4.1.1
@@ -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=mirror://pypi/P/PyCifRW/PyCifRW-4.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c3710b426267bc305b284d0b4b6ea05a
diff --git a/metadata/md5-cache/sci-libs/pymmlib-1.2.1 b/metadata/md5-cache/sci-libs/pymmlib-1.2.1
index 6c104f570f0c..096b82d8fd02 100644
--- a/metadata/md5-cache/sci-libs/pymmlib-1.2.1
+++ b/metadata/md5-cache/sci-libs/pymmlib-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://github/masci/mmLib/pymmlib-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=44fa7a29c2c139ded173740e4b87fda2
diff --git a/metadata/md5-cache/sci-libs/pyshp-1.2.0 b/metadata/md5-cache/sci-libs/pyshp-1.2.0
index f2523675588f..371baa49ea5b 100644
--- a/metadata/md5-cache/sci-libs/pyshp-1.2.0
+++ b/metadata/md5-cache/sci-libs/pyshp-1.2.0
@@ -10,5 +10,5 @@ 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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyshp/pyshp-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=acbdf31c8aa9e64b73b51502773640ce
diff --git a/metadata/md5-cache/sci-libs/pyshp-9999 b/metadata/md5-cache/sci-libs/pyshp-9999
index 43b8b9a05621..9694c86061ce 100644
--- a/metadata/md5-cache/sci-libs/pyshp-9999
+++ b/metadata/md5-cache/sci-libs/pyshp-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
-_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	subversion	3d1eb4b41d7190570a84f786958ebb13	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	subversion	3d1eb4b41d7190570a84f786958ebb13	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=acbdf31c8aa9e64b73b51502773640ce
diff --git a/metadata/md5-cache/sci-libs/rtabmap-0.14.0 b/metadata/md5-cache/sci-libs/rtabmap-0.14.0
index 8e262c64881c..01534dff1ae0 100644
--- a/metadata/md5-cache/sci-libs/rtabmap-0.14.0
+++ b/metadata/md5-cache/sci-libs/rtabmap-0.14.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=media-libs/opencv:=[qt5(-)?] sci-libs/pcl:=[openni,vtk] sci-libs/vtk:=[qt5(-)?] sys-libs/zlib sci-libs/octomap:= dev-libs/boost:= ieee1394? ( media-libs/libdc1394 ) openni2? ( dev-libs/OpenNI2 ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 )
 SLOT=0
 SRC_URI=https://github.com/introlab/rtabmap/archive/0.14.0.tar.gz -> rtabmap-0.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=00b9dd26e98c9d5cdea40032fb53049e
diff --git a/metadata/md5-cache/sci-libs/rtabmap-0.17.1 b/metadata/md5-cache/sci-libs/rtabmap-0.17.1
index 00124980c778..639a5123c1fd 100644
--- a/metadata/md5-cache/sci-libs/rtabmap-0.17.1
+++ b/metadata/md5-cache/sci-libs/rtabmap-0.17.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=media-libs/opencv:=[qt5(-)?] sci-libs/pcl:=[openni,vtk,qt5(-)?] sci-libs/vtk:=[qt5(-)?] sys-libs/zlib sci-libs/octomap:= dev-libs/boost:= ieee1394? ( media-libs/libdc1394 ) openni2? ( dev-libs/OpenNI2 ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 )
 SLOT=0
 SRC_URI=https://github.com/introlab/rtabmap/archive/0.17.1-melodic.tar.gz -> rtabmap-0.17.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a76cbea39f6e64787df71485ec33fd3a
diff --git a/metadata/md5-cache/sci-libs/rtabmap-9999 b/metadata/md5-cache/sci-libs/rtabmap-9999
index 26859c40c3b7..d274095195f7 100644
--- a/metadata/md5-cache/sci-libs/rtabmap-9999
+++ b/metadata/md5-cache/sci-libs/rtabmap-9999
@@ -7,5 +7,5 @@ IUSE=examples ieee1394 openni2 qt5
 LICENSE=BSD
 RDEPEND=media-libs/opencv:=[qt5(-)?] sci-libs/pcl:=[openni,vtk,qt5(-)?] sci-libs/vtk:=[qt5(-)?] sys-libs/zlib sci-libs/octomap:= dev-libs/boost:= ieee1394? ( media-libs/libdc1394 ) openni2? ( dev-libs/OpenNI2 ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a76cbea39f6e64787df71485ec33fd3a
diff --git a/metadata/md5-cache/sci-libs/scalapack-2.0.2 b/metadata/md5-cache/sci-libs/scalapack-2.0.2
index 64e230ac2bb0..374db3ca6974 100644
--- a/metadata/md5-cache/sci-libs/scalapack-2.0.2
+++ b/metadata/md5-cache/sci-libs/scalapack-2.0.2
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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/scikits_image-0.13.0 b/metadata/md5-cache/sci-libs/scikits_image-0.13.0
index 2aa8cdc3829d..02a5c1dfa083 100644
--- a/metadata/md5-cache/sci-libs/scikits_image-0.13.0
+++ b/metadata/md5-cache/sci-libs/scikits_image-0.13.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/matplotlib[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
 SRC_URI=mirror://pypi/s/scikit-image/scikit-image-0.13.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ca3da81561d0c2cbd3b6275d2cdba08e
diff --git a/metadata/md5-cache/sci-libs/scikits_learn-0.17 b/metadata/md5-cache/sci-libs/scikits_learn-0.17
index 2c88b91fe733..922975f1f745 100644
--- a/metadata/md5-cache/sci-libs/scikits_learn-0.17
+++ b/metadata/md5-cache/sci-libs/scikits_learn-0.17
@@ -10,5 +10,5 @@ RDEPEND=dev-python/joblib[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/s/scikit-learn/scikit-learn-0.17.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=656cd8ed06d2b1f443cf0abfdd8d06c8
diff --git a/metadata/md5-cache/sci-libs/scikits_learn-0.17.1 b/metadata/md5-cache/sci-libs/scikits_learn-0.17.1
index aca9135b2e88..210efcdcc6ea 100644
--- a/metadata/md5-cache/sci-libs/scikits_learn-0.17.1
+++ b/metadata/md5-cache/sci-libs/scikits_learn-0.17.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/joblib[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/s/scikit-learn/scikit-learn-0.17.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=affdaf89207eb6440e65aa4098961dc7
diff --git a/metadata/md5-cache/sci-libs/scikits_learn-0.18.1 b/metadata/md5-cache/sci-libs/scikits_learn-0.18.1
index 830ac9b7f89c..98afc803d931 100644
--- a/metadata/md5-cache/sci-libs/scikits_learn-0.18.1
+++ b/metadata/md5-cache/sci-libs/scikits_learn-0.18.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/joblib[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/s/scikit-learn/scikit-learn-0.18.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f71823b6a3834ed37ffa0dd8dc90b8aa
diff --git a/metadata/md5-cache/sci-libs/scikits_learn-0.18.2 b/metadata/md5-cache/sci-libs/scikits_learn-0.18.2
index 92c4bca9a232..0a5d298dd46b 100644
--- a/metadata/md5-cache/sci-libs/scikits_learn-0.18.2
+++ b/metadata/md5-cache/sci-libs/scikits_learn-0.18.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/joblib[python_targets_python2_7(-)?,python_targets_python3_4(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/scikit-learn/scikit-learn-0.18.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2aef241ea4de49429b6ee3994477b4e9
diff --git a/metadata/md5-cache/sci-libs/scikits_learn-0.18.2-r1 b/metadata/md5-cache/sci-libs/scikits_learn-0.18.2-r1
index 475adce19354..25337c436475 100644
--- a/metadata/md5-cache/sci-libs/scikits_learn-0.18.2-r1
+++ b/metadata/md5-cache/sci-libs/scikits_learn-0.18.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/matplotlib[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
 SRC_URI=mirror://pypi/s/scikit-learn/scikit-learn-0.18.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7b6c8f0881c2fe6a976919b6b404bb72
diff --git a/metadata/md5-cache/sci-libs/scikits_learn-0.19.0 b/metadata/md5-cache/sci-libs/scikits_learn-0.19.0
index 8ea9a83a592f..c84df6932a0c 100644
--- a/metadata/md5-cache/sci-libs/scikits_learn-0.19.0
+++ b/metadata/md5-cache/sci-libs/scikits_learn-0.19.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/matplotlib[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
 SRC_URI=mirror://pypi/s/scikit-learn/scikit-learn-0.19.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6c36a41409ce640bee0b7b9be3348948
diff --git a/metadata/md5-cache/sci-libs/scikits_optimization-0.3 b/metadata/md5-cache/sci-libs/scikits_optimization-0.3
index 26be332cd914..88413b651754 100644
--- a/metadata/md5-cache/sci-libs/scikits_optimization-0.3
+++ b/metadata/md5-cache/sci-libs/scikits_optimization-0.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/scikits.optimization/scikits.optimization-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cdc3c78c39869f914082c88c69a0fb3b
diff --git a/metadata/md5-cache/sci-libs/scikits_timeseries-0.91.3-r1 b/metadata/md5-cache/sci-libs/scikits_timeseries-0.91.3-r1
index 4828ee472c7f..48d62057abad 100644
--- a/metadata/md5-cache/sci-libs/scikits_timeseries-0.91.3-r1
+++ b/metadata/md5-cache/sci-libs/scikits_timeseries-0.91.3-r1
@@ -10,5 +10,5 @@ RDEPEND=sci-libs/scipy[python_targets_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pytseries/scikits.timeseries-0.91.3.tar.gz doc? ( mirror://sourceforge/pytseries/scikits.timeseries-0.91.3-html_docs.zip )
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=93c69f72a584473461512cab916b148b
diff --git a/metadata/md5-cache/sci-libs/scipy-0.16.1 b/metadata/md5-cache/sci-libs/scipy-0.16.1
index f0eb609ae97d..9f1cd043101a 100644
--- a/metadata/md5-cache/sci-libs/scipy-0.16.1
+++ b/metadata/md5-cache/sci-libs/scipy-0.16.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/numpy-1.6.2[lapack,python_targets_python2_7(-)?,python_targ
 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/scipy/scipy-0.16.1.tar.gz doc? ( https://docs.scipy.org/doc/scipy-0.16.1/scipy-html-0.16.1.zip -> scipy-0.16.1-html.zip https://docs.scipy.org/doc/scipy-0.16.1/scipy-ref-0.16.1.pdf -> scipy-0.16.1-ref.pdf )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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_=e37407c629e2269588e2d872e244673a
diff --git a/metadata/md5-cache/sci-libs/scipy-0.18.1 b/metadata/md5-cache/sci-libs/scipy-0.18.1
index f813c7e20a27..e2e0b7b5c57d 100644
--- a/metadata/md5-cache/sci-libs/scipy-0.18.1
+++ b/metadata/md5-cache/sci-libs/scipy-0.18.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/numpy-1.10[lapack,python_targets_python2_7(-)?,python_targe
 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/scipy/scipy-0.18.1.tar.gz doc? ( https://docs.scipy.org/doc/scipy-0.18.1/scipy-html-0.18.1.zip -> scipy-0.18.1-html.zip https://docs.scipy.org/doc/scipy-0.18.1/scipy-ref-0.18.1.pdf -> scipy-0.18.1-ref.pdf )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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_=a07716fff2a146e0364153f9b636573d
diff --git a/metadata/md5-cache/sci-libs/scipy-0.19.1 b/metadata/md5-cache/sci-libs/scipy-0.19.1
index ad631199eee3..9312dcdd6121 100644
--- a/metadata/md5-cache/sci-libs/scipy-0.19.1
+++ b/metadata/md5-cache/sci-libs/scipy-0.19.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/numpy-1.10[lapack,python_targets_python2_7(-)?,python_targe
 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/scipy/scipy-0.19.1.tar.gz doc? ( https://docs.scipy.org/doc/scipy-0.19.1/scipy-html-0.19.1.zip -> scipy-0.19.1-html.zip https://docs.scipy.org/doc/scipy-0.19.1/scipy-ref-0.19.1.pdf -> scipy-0.19.1-ref.pdf )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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_=dddc3fb3476fb48300856903e4e2ca4c
diff --git a/metadata/md5-cache/sci-libs/scipy-1.0.0 b/metadata/md5-cache/sci-libs/scipy-1.0.0
index 3e60b37c7075..aed6139e0bdd 100644
--- a/metadata/md5-cache/sci-libs/scipy-1.0.0
+++ b/metadata/md5-cache/sci-libs/scipy-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/numpy-1.10[lapack,python_targets_python2_7(-)?,python_targe
 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/scipy/scipy-1.0.0.tar.gz doc? ( https://docs.scipy.org/doc/scipy-1.0.0/scipy-html-1.0.0.zip -> scipy-1.0.0-html.zip https://docs.scipy.org/doc/scipy-1.0.0/scipy-ref-1.0.0.pdf -> scipy-1.0.0-ref.pdf )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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_=b7af1779539d72fda1c0c50e8f043c85
diff --git a/metadata/md5-cache/sci-libs/scipy-1.1.0 b/metadata/md5-cache/sci-libs/scipy-1.1.0
index fc90d7479ab0..b4caff91cec3 100644
--- a/metadata/md5-cache/sci-libs/scipy-1.1.0
+++ b/metadata/md5-cache/sci-libs/scipy-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/numpy-1.10[lapack,python_targets_python2_7(-)?,python_targe
 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/scipy/scipy-1.1.0.tar.gz doc? ( https://docs.scipy.org/doc/scipy-1.1.0/scipy-html-1.1.0.zip -> scipy-1.1.0-html.zip https://docs.scipy.org/doc/scipy-1.1.0/scipy-ref-1.1.0.pdf -> scipy-1.1.0-ref.pdf )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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_=b7af1779539d72fda1c0c50e8f043c85
diff --git a/metadata/md5-cache/sci-libs/scipy-9999 b/metadata/md5-cache/sci-libs/scipy-9999
index de7aff7b6972..5d69508a539e 100644
--- a/metadata/md5-cache/sci-libs/scipy-9999
+++ b/metadata/md5-cache/sci-libs/scipy-9999
@@ -8,5 +8,5 @@ LICENSE=BSD LGPL-2
 RDEPEND=>=dev-python/numpy-1.10[lapack,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/fortran 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
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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_=95787c99856f9bb76c2c47e5d84e19b4
diff --git a/metadata/md5-cache/sci-libs/shogun-5.0.0 b/metadata/md5-cache/sci-libs/shogun-5.0.0
index b841aeeb4221..85043d99e89a 100644
--- a/metadata/md5-cache/sci-libs/shogun-5.0.0
+++ b/metadata/md5-cache/sci-libs/shogun-5.0.0
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2 app-arch/gzip app-arch/lzma app-arch/snappy dev-libs/lzo
 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 ) ) test? ( python )
 SLOT=0/16
 SRC_URI=ftp://shogun-toolbox.org/shogun/releases/5.0/sources/shogun-5.0.0.tar.bz2 test? ( ftp://shogun-toolbox.org/shogun/data/shogun-data-0.9.tar.bz2 ) examples? ( ftp://shogun-toolbox.org/shogun/data/shogun-data-0.9.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=09fd2fb9b751627832f9807acaaa4ccb
diff --git a/metadata/md5-cache/sci-libs/sundials-2.7.0 b/metadata/md5-cache/sci-libs/sundials-2.7.0
index 213678bbd4ce..54a5f145557a 100644
--- a/metadata/md5-cache/sci-libs/sundials-2.7.0
+++ b/metadata/md5-cache/sci-libs/sundials-2.7.0
@@ -10,5 +10,5 @@ RDEPEND=lapack? ( virtual/lapack ) mpi? ( virtual/mpi sci-libs/hypre:= ) sparse?
 REQUIRED_USE=hypre? ( mpi )
 SLOT=0/2
 SRC_URI=https://computation.llnl.gov/projects/sundials/download/sundials-2.7.0.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=46319dc9edd2207997912282a1e19f36
diff --git a/metadata/md5-cache/sci-libs/sundials-3.0.0 b/metadata/md5-cache/sci-libs/sundials-3.0.0
index 4d7d4792b02c..0e9dd7f71968 100644
--- a/metadata/md5-cache/sci-libs/sundials-3.0.0
+++ b/metadata/md5-cache/sci-libs/sundials-3.0.0
@@ -10,5 +10,5 @@ RDEPEND=lapack? ( virtual/lapack ) mpi? ( virtual/mpi sci-libs/hypre:= ) sparse?
 REQUIRED_USE=hypre? ( mpi )
 SLOT=0/3
 SRC_URI=https://computation.llnl.gov/projects/sundials/download/sundials-3.0.0.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4a5dfb6fc0d043ea0c7fd6d0751df7ba
diff --git a/metadata/md5-cache/sci-libs/sundials-3.1.0 b/metadata/md5-cache/sci-libs/sundials-3.1.0
index 3d96e9349b4f..58ac77feab4a 100644
--- a/metadata/md5-cache/sci-libs/sundials-3.1.0
+++ b/metadata/md5-cache/sci-libs/sundials-3.1.0
@@ -10,5 +10,5 @@ RDEPEND=lapack? ( virtual/lapack ) mpi? ( virtual/mpi sci-libs/hypre:= ) sparse?
 REQUIRED_USE=hypre? ( mpi )
 SLOT=0/3
 SRC_URI=https://computation.llnl.gov/projects/sundials/download/sundials-3.1.0.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=17be79222655632e090df10773844142
diff --git a/metadata/md5-cache/sci-libs/superlu-5.2.1-r1 b/metadata/md5-cache/sci-libs/superlu-5.2.1-r1
index 515a9ffb6f17..9c0ea05ecd71 100644
--- a/metadata/md5-cache/sci-libs/superlu-5.2.1-r1
+++ b/metadata/md5-cache/sci-libs/superlu-5.2.1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=virtual/blas virtual/fortran
 SLOT=0/5
 SRC_URI=http://crd-legacy.lbl.gov/~xiaoye/SuperLU//superlu_5.2.1.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=aadbd0b16c364db30a7261129eecbba6
diff --git a/metadata/md5-cache/sci-libs/symengine-0.3.0-r1 b/metadata/md5-cache/sci-libs/symengine-0.3.0-r1
index ceafc039401e..7b557e323a7b 100644
--- a/metadata/md5-cache/sci-libs/symengine-0.3.0-r1
+++ b/metadata/md5-cache/sci-libs/symengine-0.3.0-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/gmp:= sys-libs/binutils-libs:= arb? ( sci-mathematics/arb:= ) boost? ( dev-libs/boost:= ) mpc? ( dev-libs/mpc:= ) tcmalloc? ( dev-util/google-perftools )
 SLOT=0/0.3
 SRC_URI=https://github.com/sympy/symengine/archive/v0.3.0.tar.gz -> symengine-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a946a796f2963a036408f23a277f2f29
diff --git a/metadata/md5-cache/sci-libs/tensorflow-1.10.0 b/metadata/md5-cache/sci-libs/tensorflow-1.10.0
index f811869a9c66..a315c9de2c73 100644
--- a/metadata/md5-cache/sci-libs/tensorflow-1.10.0
+++ b/metadata/md5-cache/sci-libs/tensorflow-1.10.0
@@ -10,5 +10,5 @@ RDEPEND=app-arch/snappy dev-db/lmdb dev-db/sqlite >=dev-libs/jsoncpp-1.8.4 dev-l
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://github.com/tensorflow/tensorflow/archive/v1.10.0.tar.gz -> tensorflow-1.10.0.tar.gz https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-1.10.0.tar.bz2 http://www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz -> oourafft-20061228.tgz https://bitbucket.org/eigen/eigen/get/fd6845384b86.tar.gz -> eigen-fd6845384b86.tar.gz https://github.com/abseil/abseil-cpp/archive/9613678332c976568272c8f4a78631a29159271d.tar.gz -> abseil-cpp-9613678332c976568272c8f4a78631a29159271d.tar.gz https://github.com/bazelbuild/rules_closure/archive/dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz -> bazelbuild-rules_closure-dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz https://github.com/google/double-conversion/archive/3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip -> double-conversion-3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz https://github.com/google/gemmlowp/archive/38ebac7b059e84692f53e5938f97a9943c120d98.zip -> gemmlowp-38ebac7b059e84692f53e5938f97a9943c120d98.zip https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz https://github.com/google/protobuf/archive/v3.6.0.tar.gz -> protobuf-3.6.0.tar.gz jemalloc? ( https://github.com/jemalloc/jemalloc/archive/4.4.0.tar.gz -> jemalloc-4.4.0.tar.gz ) cuda? ( https://github.com/nvidia/nccl/archive/03d856977ecbaac87e598c0c4bafca96761b9ac7.tar.gz -> nvidia-nccl-03d856977ecbaac87e598c0c4bafca96761b9ac7.tar.gz https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip ) python? ( https://github.com/abseil/abseil-py/archive/pypi-v0.2.2.tar.gz -> abseil-py-0.2.2.tar.gz https://github.com/googleapis/googleapis/archive/f81082ea1e2f85c43649bee26e0d9871d4b41cdb.zip -> googleapis-f81082ea1e2f85c43649bee26e0d9871d4b41cdb.zip https://github.com/GoogleCloudPlatform/google-cloud-cpp/archive/f875700a023bdd706333cde45aee8758b272c357.tar.gz -> google-cloud-cpp-f875700a023bdd706333cde45aee8758b272c357.tar.gz https://github.com/google/boringssl/archive/a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz -> boringssl-a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz https://github.com/intel/ARM_NEON_2_x86_SSE/archive/0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz -> ARM_NEON_2_x86_SSE-0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz https://github.com/llvm-mirror/llvm/archive/bd8c8d759852871609ba2e4e79868420f751949d.tar.gz -> llvm-bd8c8d759852871609ba2e4e79868420f751949d.tar.gz https://mirror.bazel.build/docs.python.org/2.7/_sources/license.txt -> tensorflow-python-license.txt https://pypi.python.org/packages/5c/78/ff794fcae2ce8aa6323e789d1f8b3b7765f601e7702726f430e814822b96/gast-0.2.0.tar.gz https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz !system-libs? ( https://github.com/google/flatbuffers/archive/v1.9.0.tar.gz -> flatbuffers-1.9.0.tar.gz ) ) !system-libs? ( https://github.com/google/nsync/archive/1.20.1.tar.gz -> nsync-1.20.1.tar.gz https://github.com/grpc/grpc/archive/v1.13.0.tar.gz -> grpc-1.13.0.tar.gz )
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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_=a454913e455f02dce2a6f8beea9bcd1f
diff --git a/metadata/md5-cache/sci-libs/tensorflow-1.11.0_rc0 b/metadata/md5-cache/sci-libs/tensorflow-1.11.0_rc0
deleted file mode 100644
index 24e16e6e815f..000000000000
--- a/metadata/md5-cache/sci-libs/tensorflow-1.11.0_rc0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup unpack
-DEPEND=app-arch/snappy dev-db/lmdb dev-db/sqlite >=dev-libs/jsoncpp-1.8.4 dev-libs/libpcre dev-libs/nsync >=dev-libs/protobuf-3.6.0 >=dev-libs/re2-0.2018.04.01 media-libs/giflib media-libs/libjpeg-turbo media-libs/libpng:0 >=net-libs/grpc-1.13.0 net-misc/curl sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-8.0[profiler] >=dev-libs/cudnn-6.0 ) jemalloc? ( >=dev-libs/jemalloc-4.4.0 ) mpi? ( virtual/mpi ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_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(-)] >=dev-libs/flatbuffers-1.8.0 dev-python/absl-py[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/astor[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/protobuf-python-3.6.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/termcolor[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=net-libs/grpc-1.13.0[python,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] sci-libs/keras-applications[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] sci-libs/keras-preprocessing[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] system-libs? ( net-libs/google-cloud-cpp ) ) system-libs? ( dev-libs/openssl:0 ) !python? ( dev-lang/python ) app-arch/unzip >=dev-util/bazel-0.16.0 dev-java/java-config dev-python/mock dev-lang/nasm dev-lang/swig dev-python/cython
-DESCRIPTION=Computation framework using data flow graphs for scalable machine learning
-EAPI=6
-HOMEPAGE=https://www.tensorflow.org/
-IUSE=cuda jemalloc mpi +python +system-libs cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 python_targets_python2_7 python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=app-arch/snappy dev-db/lmdb dev-db/sqlite >=dev-libs/jsoncpp-1.8.4 dev-libs/libpcre dev-libs/nsync >=dev-libs/protobuf-3.6.0 >=dev-libs/re2-0.2018.04.01 media-libs/giflib media-libs/libjpeg-turbo media-libs/libpng:0 >=net-libs/grpc-1.13.0 net-misc/curl sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-8.0[profiler] >=dev-libs/cudnn-6.0 ) jemalloc? ( >=dev-libs/jemalloc-4.4.0 ) mpi? ( virtual/mpi ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_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(-)] >=dev-libs/flatbuffers-1.8.0 dev-python/absl-py[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/astor[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/protobuf-python-3.6.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/termcolor[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=net-libs/grpc-1.13.0[python,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] sci-libs/keras-applications[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] sci-libs/keras-preprocessing[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] system-libs? ( net-libs/google-cloud-cpp ) ) system-libs? ( dev-libs/openssl:0 )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_6 ) )
-SLOT=0
-SRC_URI=https://github.com/tensorflow/tensorflow/archive/v1.11.0-rc0.tar.gz -> tensorflow-1.11.0_rc0.tar.gz https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-1.11.0_rc0.tar.bz2 http://www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz -> oourafft-20061228.tgz https://bitbucket.org/eigen/eigen/get/fd6845384b86.tar.gz -> eigen-fd6845384b86.tar.gz https://github.com/abseil/abseil-cpp/archive/f0f15c2778b0e4959244dd25e63f445a455870f5.tar.gz -> abseil-cpp-f0f15c2778b0e4959244dd25e63f445a455870f5.tar.gz https://github.com/bazelbuild/rules_closure/archive/dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz -> bazelbuild-rules_closure-dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz https://github.com/google/double-conversion/archive/3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip -> double-conversion-3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz https://github.com/google/gemmlowp/archive/38ebac7b059e84692f53e5938f97a9943c120d98.zip -> gemmlowp-38ebac7b059e84692f53e5938f97a9943c120d98.zip https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz cuda? ( https://github.com/nvidia/nccl/archive/03d856977ecbaac87e598c0c4bafca96761b9ac7.tar.gz -> nvidia-nccl-03d856977ecbaac87e598c0c4bafca96761b9ac7.tar.gz https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip ) python? ( https://github.com/intel/ARM_NEON_2_x86_SSE/archive/0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz -> ARM_NEON_2_x86_SSE-0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz https://mirror.bazel.build/docs.python.org/2.7/_sources/license.txt -> tensorflow-python-license.txt https://pypi.python.org/packages/5c/78/ff794fcae2ce8aa6323e789d1f8b3b7765f601e7702726f430e814822b96/gast-0.2.0.tar.gz https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz !system-libs? ( https://github.com/abseil/abseil-py/archive/pypi-v0.2.2.tar.gz -> abseil-py-0.2.2.tar.gz https://github.com/googleapis/googleapis/archive/f81082ea1e2f85c43649bee26e0d9871d4b41cdb.zip -> googleapis-f81082ea1e2f85c43649bee26e0d9871d4b41cdb.zip https://github.com/GoogleCloudPlatform/google-cloud-cpp/archive/f875700a023bdd706333cde45aee8758b272c357.tar.gz -> google-cloud-cpp-f875700a023bdd706333cde45aee8758b272c357.tar.gz https://github.com/google/boringssl/archive/a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz -> boringssl-a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz ) ) !system-libs? ( https://github.com/google/protobuf/archive/v3.6.0.tar.gz -> protobuf-3.6.0.tar.gz )
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=de0522a901c179162cab3cf4b3c33148
diff --git a/metadata/md5-cache/sci-libs/tensorflow-1.11.0_rc2 b/metadata/md5-cache/sci-libs/tensorflow-1.11.0_rc2
deleted file mode 100644
index 42a237fc3ac9..000000000000
--- a/metadata/md5-cache/sci-libs/tensorflow-1.11.0_rc2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip >=dev-libs/protobuf-3.6.0 >=dev-util/bazel-0.16.0 dev-java/java-config dev-python/mock dev-lang/swig dev-python/cython cuda? ( >=dev-util/nvidia-cuda-toolkit-8.0[profiler] ) !python? ( dev-lang/python ) python? ( >=net-libs/grpc-1.13.0[tools] )
-DEFINED_PHASES=compile configure install prepare pretend setup unpack
-DEPEND=app-arch/snappy dev-db/lmdb dev-db/sqlite >=dev-libs/jsoncpp-1.8.4 dev-libs/libpcre dev-libs/nsync >=dev-libs/protobuf-3.6.0 >=dev-libs/re2-0.2018.04.01 media-libs/giflib media-libs/libjpeg-turbo media-libs/libpng:0 >=net-libs/grpc-1.13.0 net-misc/curl sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-8.0[profiler] >=dev-libs/cudnn-6.0 ) jemalloc? ( >=dev-libs/jemalloc-4.4.0 ) mpi? ( virtual/mpi ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_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(-)] >=dev-libs/flatbuffers-1.8.0 dev-python/absl-py[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/astor[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/gast[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/protobuf-python-3.6.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/termcolor[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=net-libs/grpc-1.13.0[python,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] sci-libs/keras-applications[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] sci-libs/keras-preprocessing[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] system-libs? ( net-libs/google-cloud-cpp ) ) system-libs? ( dev-libs/openssl:0 ) dev-python/mock
-DESCRIPTION=Computation framework using data flow graphs for scalable machine learning
-EAPI=7
-HOMEPAGE=https://www.tensorflow.org/
-IUSE=cuda jemalloc mpi +python +system-libs cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 python_targets_python2_7 python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=app-arch/snappy dev-db/lmdb dev-db/sqlite >=dev-libs/jsoncpp-1.8.4 dev-libs/libpcre dev-libs/nsync >=dev-libs/protobuf-3.6.0 >=dev-libs/re2-0.2018.04.01 media-libs/giflib media-libs/libjpeg-turbo media-libs/libpng:0 >=net-libs/grpc-1.13.0 net-misc/curl sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-8.0[profiler] >=dev-libs/cudnn-6.0 ) jemalloc? ( >=dev-libs/jemalloc-4.4.0 ) mpi? ( virtual/mpi ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_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(-)] >=dev-libs/flatbuffers-1.8.0 dev-python/absl-py[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/astor[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/gast[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/protobuf-python-3.6.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/termcolor[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=net-libs/grpc-1.13.0[python,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] sci-libs/keras-applications[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] sci-libs/keras-preprocessing[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] system-libs? ( net-libs/google-cloud-cpp ) ) system-libs? ( dev-libs/openssl:0 )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_6 ) )
-SLOT=0
-SRC_URI=https://github.com/tensorflow/tensorflow/archive/v1.11.0-rc2.tar.gz -> tensorflow-1.11.0_rc2.tar.gz https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-1.11.0_rc2.tar.bz2 http://www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz -> oourafft-20061228.tgz https://bitbucket.org/eigen/eigen/get/fd6845384b86.tar.gz -> eigen-fd6845384b86.tar.gz https://github.com/abseil/abseil-cpp/archive/f0f15c2778b0e4959244dd25e63f445a455870f5.tar.gz -> abseil-cpp-f0f15c2778b0e4959244dd25e63f445a455870f5.tar.gz https://github.com/bazelbuild/rules_closure/archive/dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz -> bazelbuild-rules_closure-dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz https://github.com/google/double-conversion/archive/3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip -> double-conversion-3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz https://github.com/google/gemmlowp/archive/38ebac7b059e84692f53e5938f97a9943c120d98.zip -> gemmlowp-38ebac7b059e84692f53e5938f97a9943c120d98.zip https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz cuda? ( https://github.com/nvidia/nccl/archive/03d856977ecbaac87e598c0c4bafca96761b9ac7.tar.gz -> nvidia-nccl-03d856977ecbaac87e598c0c4bafca96761b9ac7.tar.gz https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip ) python? ( https://github.com/intel/ARM_NEON_2_x86_SSE/archive/0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz -> ARM_NEON_2_x86_SSE-0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz https://mirror.bazel.build/docs.python.org/2.7/_sources/license.txt -> tensorflow-python-license.txt https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz !system-libs? ( https://github.com/abseil/abseil-py/archive/pypi-v0.2.2.tar.gz -> abseil-py-0.2.2.tar.gz https://github.com/googleapis/googleapis/archive/f81082ea1e2f85c43649bee26e0d9871d4b41cdb.zip -> googleapis-f81082ea1e2f85c43649bee26e0d9871d4b41cdb.zip https://github.com/GoogleCloudPlatform/google-cloud-cpp/archive/f875700a023bdd706333cde45aee8758b272c357.tar.gz -> google-cloud-cpp-f875700a023bdd706333cde45aee8758b272c357.tar.gz https://github.com/google/boringssl/archive/a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz -> boringssl-a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz https://pypi.python.org/packages/5c/78/ff794fcae2ce8aa6323e789d1f8b3b7765f601e7702726f430e814822b96/gast-0.2.0.tar.gz ) ) !system-libs? ( https://github.com/google/protobuf/archive/v3.6.0.tar.gz -> protobuf-3.6.0.tar.gz )
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cuda	bb861e5221b7272ac90c2f12791c1e66	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_=a6db322801050f5fe19dd033347f69bd
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 d71c6854a95e..f603f4443a9a 100644
--- a/metadata/md5-cache/sci-libs/voro++-0.4.6-r1
+++ b/metadata/md5-cache/sci-libs/voro++-0.4.6-r1
@@ -7,5 +7,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/sci-libs/votca-tools-1.4 b/metadata/md5-cache/sci-libs/votca-tools-1.4
index bce1cd782e47..bbcd8ba52735 100644
--- a/metadata/md5-cache/sci-libs/votca-tools-1.4
+++ b/metadata/md5-cache/sci-libs/votca-tools-1.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/boost:= dev-libs/expat fftw? ( sci-libs/fftw:3.0 ) gsl? ( sci-libs/gsl ) sqlite? ( dev-db/sqlite:3 )
 SLOT=0
 SRC_URI=https://github.com/votca/tools/archive/v1.4.tar.gz -> votca-tools-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f5f857472d4289720f1108ef3179cec9
diff --git a/metadata/md5-cache/sci-libs/votca-tools-1.4.1 b/metadata/md5-cache/sci-libs/votca-tools-1.4.1
index 5e17c41560d2..681d5d88e59c 100644
--- a/metadata/md5-cache/sci-libs/votca-tools-1.4.1
+++ b/metadata/md5-cache/sci-libs/votca-tools-1.4.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/boost:= dev-libs/expat fftw? ( sci-libs/fftw:3.0 ) gsl? ( sci-libs/gsl ) sqlite? ( dev-db/sqlite:3 )
 SLOT=0
 SRC_URI=https://github.com/votca/tools/archive/v1.4.1.tar.gz -> votca-tools-1.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=7b5048567a0597d3f595cb82e803912d
diff --git a/metadata/md5-cache/sci-libs/votca-tools-9999 b/metadata/md5-cache/sci-libs/votca-tools-9999
index 8ff56a7ce611..93d5ac7c151d 100644
--- a/metadata/md5-cache/sci-libs/votca-tools-9999
+++ b/metadata/md5-cache/sci-libs/votca-tools-9999
@@ -7,5 +7,5 @@ IUSE=doc +fftw sqlite
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/boost:= dev-libs/expat >=dev-cpp/eigen-3.3 fftw? ( sci-libs/fftw:3.0 ) sqlite? ( dev-db/sqlite:3 )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5dc0e58ceff631435c681feb0ff34f8a
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 67140a143b18..f881ef14cb29 100644
--- a/metadata/md5-cache/sci-libs/vtk-6.1.0-r4
+++ b/metadata/md5-cache/sci-libs/vtk-6.1.0-r4
@@ -11,5 +11,5 @@ REQUIRED_USE=all-modules? ( python xdmf2 ) java? ( qt5 ) python? ( python_target
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/sci-libs/vtk-7.1.0 b/metadata/md5-cache/sci-libs/vtk-7.1.0
index c8ba17e3f413..68309b9a7cba 100644
--- a/metadata/md5-cache/sci-libs/vtk-7.1.0
+++ b/metadata/md5-cache/sci-libs/vtk-7.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=all-modules? ( python xdmf2 boost ) java? ( qt5 ) python? ( python_
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/sci-libs/vtk-8.1.0 b/metadata/md5-cache/sci-libs/vtk-8.1.0
index 7d025fe703a8..b4b4110b38ed 100644
--- a/metadata/md5-cache/sci-libs/vtk-8.1.0
+++ b/metadata/md5-cache/sci-libs/vtk-8.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=all-modules? ( python xdmf2 boost ) java? ( qt5 ) python? ( python_
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
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 29c4721d9675..a0443539a619 100644
--- a/metadata/md5-cache/sci-libs/vtk-8.1.0-r1
+++ b/metadata/md5-cache/sci-libs/vtk-8.1.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=all-modules? ( python xdmf2 boost ) java? ( qt5 ) python? ( python_
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
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 7be3136282f4..94a45f9d8157 100644
--- a/metadata/md5-cache/sci-libs/vtk-8.1.0-r2
+++ b/metadata/md5-cache/sci-libs/vtk-8.1.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=all-modules? ( python xdmf2 boost ) java? ( qt5 ) python? ( ^^ ( py
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/sci-libs/xdmf2-1.0_p141226-r1 b/metadata/md5-cache/sci-libs/xdmf2-1.0_p141226-r1
index 198c345275c9..10aa45a16ce9 100644
--- a/metadata/md5-cache/sci-libs/xdmf2-1.0_p141226-r1
+++ b/metadata/md5-cache/sci-libs/xdmf2-1.0_p141226-r1
@@ -10,5 +10,5 @@ RDEPEND=sci-libs/hdf5:= dev-libs/libxml2:2 python? ( python_targets_python2_7? (
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/xdmf2-1.0_p141226.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bdedbd3e52839c77bb41a9e24417b3bd
diff --git a/metadata/md5-cache/sci-libs/xdmf2-1.0_p141226-r2 b/metadata/md5-cache/sci-libs/xdmf2-1.0_p141226-r2
index a08bd171d12c..5b3775d4b6c9 100644
--- a/metadata/md5-cache/sci-libs/xdmf2-1.0_p141226-r2
+++ b/metadata/md5-cache/sci-libs/xdmf2-1.0_p141226-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= sci-libs/hdf5:= dev-libs/libxml2:2 python? ( python_tar
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/xdmf2-1.0_p141226.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=211bf6902ffc0fb4c0c0c21c93814858
diff --git a/metadata/md5-cache/sci-libs/xdmf2-1.0_p141226-r3 b/metadata/md5-cache/sci-libs/xdmf2-1.0_p141226-r3
index bbc1b1bd3630..097194f0342f 100644
--- a/metadata/md5-cache/sci-libs/xdmf2-1.0_p141226-r3
+++ b/metadata/md5-cache/sci-libs/xdmf2-1.0_p141226-r3
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= sci-libs/hdf5:= dev-libs/libxml2:2 python? ( python_tar
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/xdmf2-1.0_p141226.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=92a23595c7c49d95536db00240e9095e
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 2ac5ec074391..9b973afbf9bd 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/cgal-4.10 b/metadata/md5-cache/sci-mathematics/cgal-4.10
index 5ac2a1f0e644..d6220ebd56bf 100644
--- a/metadata/md5-cache/sci-mathematics/cgal-4.10
+++ b/metadata/md5-cache/sci-mathematics/cgal-4.10
@@ -9,5 +9,5 @@ LICENSE=LGPL-3 GPL-3 Boost-1.0
 RDEPEND=>=dev-cpp/eigen-3.1 dev-libs/boost:= dev-libs/mpfr:0 sys-libs/zlib:= x11-libs/libX11:= virtual/glu:= virtual/opengl:= gmp? ( dev-libs/gmp:=[cxx] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ) mpfi? ( sci-libs/mpfi ) ntl? ( dev-libs/ntl )
 SLOT=0/13
 SRC_URI=https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-4.10/CGAL-4.10.tar.xz doc? ( https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-4.10/CGAL-4.10-doc_html.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ca187197d360e34157e062c74c73bc84
diff --git a/metadata/md5-cache/sci-mathematics/cgal-4.11.1 b/metadata/md5-cache/sci-mathematics/cgal-4.11.1
index fe9a95a4caf4..49982d86dd13 100644
--- a/metadata/md5-cache/sci-mathematics/cgal-4.11.1
+++ b/metadata/md5-cache/sci-mathematics/cgal-4.11.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-3 GPL-3 Boost-1.0
 RDEPEND=>=dev-cpp/eigen-3.1 dev-libs/boost:=[threads] dev-libs/mpfr:0= sys-libs/zlib:= x11-libs/libX11:= virtual/glu:= virtual/opengl:= gmp? ( dev-libs/gmp:=[cxx] ) mpfi? ( sci-libs/mpfi ) ntl? ( dev-libs/ntl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 )
 SLOT=0/13
 SRC_URI=https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-4.11.1/CGAL-4.11.1.tar.xz doc? ( https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-4.11.1/CGAL-4.11.1-doc_html.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=11eace43da1731a0092df509f6fb9322
diff --git a/metadata/md5-cache/sci-mathematics/cgal-4.11.3 b/metadata/md5-cache/sci-mathematics/cgal-4.11.3
index df2fd66e858b..b6596f7c3b74 100644
--- a/metadata/md5-cache/sci-mathematics/cgal-4.11.3
+++ b/metadata/md5-cache/sci-mathematics/cgal-4.11.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-3 GPL-3 Boost-1.0
 RDEPEND=dev-cpp/eigen dev-libs/boost:=[threads] dev-libs/mpfr:0= sys-libs/zlib:= x11-libs/libX11:= virtual/glu:= virtual/opengl:= gmp? ( dev-libs/gmp:=[cxx] ) mpfi? ( sci-libs/mpfi ) ntl? ( dev-libs/ntl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 )
 SLOT=0/13
 SRC_URI=https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-4.11.3/CGAL-4.11.3.tar.xz doc? ( https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-4.11.3/CGAL-4.11.3-doc_html.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ff0d26f779bf75e466da919bdfe29b27
diff --git a/metadata/md5-cache/sci-mathematics/cgal-4.9 b/metadata/md5-cache/sci-mathematics/cgal-4.9
index 3d0728cea97f..66ffe03149ae 100644
--- a/metadata/md5-cache/sci-mathematics/cgal-4.9
+++ b/metadata/md5-cache/sci-mathematics/cgal-4.9
@@ -9,5 +9,5 @@ LICENSE=LGPL-3 GPL-3 Boost-1.0
 RDEPEND=>=dev-cpp/eigen-3.1 dev-libs/boost:= dev-libs/mpfr:0 sys-libs/zlib x11-libs/libX11 virtual/glu virtual/opengl gmp? ( dev-libs/gmp[cxx] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ) mpfi? ( sci-libs/mpfi ) ntl? ( dev-libs/ntl )
 SLOT=0
 SRC_URI=https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-4.9/CGAL-4.9.tar.xz -> cgal-4.9.tar.xz doc? ( https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-4.9/CGAL-4.9-doc_html.tar.xz -> cgal-4.9-doc_html-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e2e0943be04c277e5e16c8a72063ac42
diff --git a/metadata/md5-cache/sci-mathematics/diagrtb-2.64 b/metadata/md5-cache/sci-mathematics/diagrtb-2.64
index 7d6102f65c5f..0ee8f1da3156 100644
--- a/metadata/md5-cache/sci-mathematics/diagrtb-2.64
+++ b/metadata/md5-cache/sci-mathematics/diagrtb-2.64
@@ -10,5 +10,5 @@ RDEPEND=virtual/fortran
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=http://ecole.modelisation.free.fr/rtb2011.tar.gz -> diagrtb-2.64.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6b6e8498ba696895876f0c6bf3b375b7
diff --git a/metadata/md5-cache/sci-mathematics/dunshire-0.1.1 b/metadata/md5-cache/sci-mathematics/dunshire-0.1.1
index 8af08413431c..06fa8f542a9b 100644
--- a/metadata/md5-cache/sci-mathematics/dunshire-0.1.1
+++ b/metadata/md5-cache/sci-mathematics/dunshire-0.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/cvxopt[python_targets_python3_4(-)?,python_targets_python3_5(
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/dunshire/dunshire-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9ceed91263496e4e4ccf232fb64afec2
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 15acebba42a6..5056c8a7ea26 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=473a5c96f452ef9896bca1cfa77731d2
diff --git a/metadata/md5-cache/sci-mathematics/fann-9999 b/metadata/md5-cache/sci-mathematics/fann-9999
index 3fcd63adfb01..edfc2d2504f5 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=284f6911c56975fb246ad0e9db697d2d
diff --git a/metadata/md5-cache/sci-mathematics/genius-1.0.21 b/metadata/md5-cache/sci-mathematics/genius-1.0.21
index 649b554dd6d8..6b2f60c3f9a2 100644
--- a/metadata/md5-cache/sci-mathematics/genius-1.0.21
+++ b/metadata/md5-cache/sci-mathematics/genius-1.0.21
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 dev-libs/gmp:0= dev-libs/mpfr:0= dev-libs/popt sys-libs/ncurses:0= sys-libs/readline:0= gnome? ( x11-libs/gtk+:2 gnome-base/libgnome gnome-base/libgnomeui gnome-base/libglade:2.0 x11-libs/gtksourceview:2.0 x11-libs/vte:0 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/genius/1.0/genius-1.0.21.tar.xz doc? ( http://www.jirka.org/genius-reference.pdf )
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4c2a892c548bbea956fb64b66f7ba93e
diff --git a/metadata/md5-cache/sci-mathematics/geogebra-5.0.339.0_p20170308-r1 b/metadata/md5-cache/sci-mathematics/geogebra-5.0.339.0_p20170308-r1
index ee3c4a3f1c00..ab8e50a372ef 100644
--- a/metadata/md5-cache/sci-mathematics/geogebra-5.0.339.0_p20170308-r1
+++ b/metadata/md5-cache/sci-mathematics/geogebra-5.0.339.0_p20170308-r1
@@ -10,5 +10,5 @@ RDEPEND=|| ( dev-java/oracle-jre-bin[javafx] dev-java/oracle-jdk-bin[javafx] ) >
 RESTRICT=bindist
 SLOT=0
 SRC_URI=https://github.com/geogebra/geogebra/archive/7d5ac993d3f88f6701f56edbfe325d86afcaad87.tar.gz -> geogebra-5.0.339.0_p20170308.tar.gz http://dev.geogebra.org/maven2/com/apple/mac_extensions/20040714/mac_extensions-20040714.jar http://dev.geogebra.org/maven2/com/apple/mac_extensions/20040714/mac_extensions-20040714.pom http://dev.geogebra.org/maven2/com/googlecode/gwtgl/0.9.1/gwtgl-0.9.1.jar http://dev.geogebra.org/maven2/com/googlecode/gwtgl/0.9.1/gwtgl-0.9.1.pom http://dev.geogebra.org/maven2/com/googlecode/gwtgl/0.9.1/gwtgl-0.9.1-sources.jar http://dev.geogebra.org/maven2/com/google/j2objc/annotations/1.0.2/annotations-1.0.2.jar http://dev.geogebra.org/maven2/com/google/j2objc/annotations/1.0.2/annotations-1.0.2.pom http://dev.geogebra.org/maven2/com/jogamp/gluegen-rt/2.2.0/gluegen-rt-2.2.0.jar http://dev.geogebra.org/maven2/com/jogamp/gluegen-rt/2.2.0/gluegen-rt-2.2.0-natives-linux-amd64.jar http://dev.geogebra.org/maven2/com/jogamp/gluegen-rt/2.2.0/gluegen-rt-2.2.0-natives-linux-i586.jar http://dev.geogebra.org/maven2/com/jogamp/gluegen-rt/2.2.0/gluegen-rt-2.2.0-natives-macosx-universal.jar http://dev.geogebra.org/maven2/com/jogamp/gluegen-rt/2.2.0/gluegen-rt-2.2.0-natives-windows-amd64.jar http://dev.geogebra.org/maven2/com/jogamp/gluegen-rt/2.2.0/gluegen-rt-2.2.0-natives-windows-i586.jar http://dev.geogebra.org/maven2/com/jogamp/gluegen-rt/2.2.0/gluegen-rt-2.2.0.pom http://dev.geogebra.org/maven2/com/jogamp/jogl-all/2.2.0/jogl-all-2.2.0.jar http://dev.geogebra.org/maven2/com/jogamp/jogl-all/2.2.0/jogl-all-2.2.0-natives-linux-amd64.jar http://dev.geogebra.org/maven2/com/jogamp/jogl-all/2.2.0/jogl-all-2.2.0-natives-linux-i586.jar http://dev.geogebra.org/maven2/com/jogamp/jogl-all/2.2.0/jogl-all-2.2.0-natives-macosx-universal.jar http://dev.geogebra.org/maven2/com/jogamp/jogl-all/2.2.0/jogl-all-2.2.0-natives-windows-amd64.jar http://dev.geogebra.org/maven2/com/jogamp/jogl-all/2.2.0/jogl-all-2.2.0-natives-windows-i586.jar http://dev.geogebra.org/maven2/com/jogamp/jogl-all/2.2.0/jogl-all-2.2.0.pom http://dev.geogebra.org/maven2/com/ogprover/OpenGeoProver/20120725/OpenGeoProver-20120725.jar http://dev.geogebra.org/maven2/com/ogprover/OpenGeoProver/20120725/OpenGeoProver-20120725.pom http://dev.geogebra.org/maven2/com/sun/jna/4.1.0/jna-4.1.0.jar http://dev.geogebra.org/maven2/com/sun/jna/4.1.0/jna-4.1.0.pom http://dev.geogebra.org/maven2/com/zspace/zspace/20151207/zspace-20151207.jar http://dev.geogebra.org/maven2/com/zspace/zspace/20151207/zspace-20151207-natives-windows-amd64.jar http://dev.geogebra.org/maven2/com/zspace/zspace/20151207/zspace-20151207-natives-windows-i586.jar http://dev.geogebra.org/maven2/com/zspace/zspace/20151207/zspace-20151207.pom http://dev.geogebra.org/maven2/fr/ujf-grenoble/javagiac/52580/javagiac-52580-natives-linux-amd64.jar http://dev.geogebra.org/maven2/fr/ujf-grenoble/javagiac/52580/javagiac-52580-natives-linux-i586.jar http://dev.geogebra.org/maven2/fr/ujf-grenoble/javagiac/52580/javagiac-52580-natives-macosx-universal.jar http://dev.geogebra.org/maven2/fr/ujf-grenoble/javagiac/52580/javagiac-52580-natives-windows-amd64.jar http://dev.geogebra.org/maven2/fr/ujf-grenoble/javagiac/52580/javagiac-52580-natives-windows-i586.jar http://dev.geogebra.org/maven2/fr/ujf-grenoble/javagiac/52580/javagiac-52580.pom http://dev.geogebra.org/maven2/intel/rssdk/libpxcclr/20150901/libpxcclr-20150901.jar http://dev.geogebra.org/maven2/intel/rssdk/libpxcclr/20150901/libpxcclr-20150901-natives-windows-amd64.jar http://dev.geogebra.org/maven2/intel/rssdk/libpxcclr/20150901/libpxcclr-20150901-natives-windows-i586.jar http://dev.geogebra.org/maven2/intel/rssdk/libpxcclr/20150901/libpxcclr-20150901.pom http://dev.geogebra.org/maven2/netscape/javascript/jsobject/1/jsobject-1.jar http://dev.geogebra.org/maven2/netscape/javascript/jsobject/1/jsobject-1.pom https://plugins.gradle.org/m2/ca/coglinc/javacc-gradle-plugin/2.4.0/javacc-gradle-plugin-2.4.0.jar https://plugins.gradle.org/m2/ca/coglinc/javacc-gradle-plugin/2.4.0/javacc-gradle-plugin-2.4.0.pom https://plugins.gradle.org/m2/com/google/guava/guava-jdk5/17.0/guava-jdk5-17.0.jar https://plugins.gradle.org/m2/com/google/guava/guava-jdk5/17.0/guava-jdk5-17.0.pom https://plugins.gradle.org/m2/com/google/guava/guava-parent-jdk5/17.0/guava-parent-jdk5-17.0.pom https://plugins.gradle.org/m2/commons-io/commons-io/2.4/commons-io-2.4.jar https://plugins.gradle.org/m2/commons-io/commons-io/2.4/commons-io-2.4.pom https://plugins.gradle.org/m2/de/richsource/gradle/plugins/gwt-gradle-plugin/0.6/gwt-gradle-plugin-0.6.jar https://plugins.gradle.org/m2/de/richsource/gradle/plugins/gwt-gradle-plugin/0.6/gwt-gradle-plugin-0.6.pom https://plugins.gradle.org/m2/org/apache/apache/16/apache-16.pom https://plugins.gradle.org/m2/org/apache/apache/9/apache-9.pom https://plugins.gradle.org/m2/org/apache/commons/commons-collections4/4.1/commons-collections4-4.1.jar https://plugins.gradle.org/m2/org/apache/commons/commons-collections4/4.1/commons-collections4-4.1.pom https://plugins.gradle.org/m2/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4.jar https://plugins.gradle.org/m2/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4.pom https://plugins.gradle.org/m2/org/apache/commons/commons-parent/25/commons-parent-25.pom https://plugins.gradle.org/m2/org/apache/commons/commons-parent/37/commons-parent-37.pom https://plugins.gradle.org/m2/org/apache/commons/commons-parent/38/commons-parent-38.pom https://plugins.gradle.org/m2/org/sonatype/oss/oss-parent/7/oss-parent-7.pom https://repo1.maven.org/maven2/ant/ant/1.6.5/ant-1.6.5.jar https://repo1.maven.org/maven2/ant/ant/1.6.5/ant-1.6.5.pom https://repo1.maven.org/maven2/colt/colt/1.2.0/colt-1.2.0.jar https://repo1.maven.org/maven2/colt/colt/1.2.0/colt-1.2.0.pom https://repo1.maven.org/maven2/com/asual/lesscss/lesscss-engine/1.3.0/lesscss-engine-1.3.0.jar https://repo1.maven.org/maven2/com/asual/lesscss/lesscss-engine/1.3.0/lesscss-engine-1.3.0.pom https://repo1.maven.org/maven2/com/google/code/findbugs/annotations/3.0.1/annotations-3.0.1.jar https://repo1.maven.org/maven2/com/google/code/findbugs/annotations/3.0.1/annotations-3.0.1.pom https://repo1.maven.org/maven2/com/google/code/gson/gson/2.6.2/gson-2.6.2.jar https://repo1.maven.org/maven2/com/google/code/gson/gson/2.6.2/gson-2.6.2.pom https://repo1.maven.org/maven2/com/google/code/gson/gson-parent/2.6.2/gson-parent-2.6.2.pom https://repo1.maven.org/maven2/com/googlecode/gwtphonegap/gwtphonegap/3.5.0.1/gwtphonegap-3.5.0.1.jar https://repo1.maven.org/maven2/com/googlecode/gwtphonegap/gwtphonegap/3.5.0.1/gwtphonegap-3.5.0.1.pom https://repo1.maven.org/maven2/com/google/gwt/gwt/2.8.0/gwt-2.8.0.pom https://repo1.maven.org/maven2/com/google/gwt/gwt-dev/2.8.0/gwt-dev-2.8.0.jar https://repo1.maven.org/maven2/com/google/gwt/gwt-dev/2.8.0/gwt-dev-2.8.0.pom https://repo1.maven.org/maven2/com/google/gwt/gwt-servlet/2.8.0/gwt-servlet-2.8.0.jar https://repo1.maven.org/maven2/com/google/gwt/gwt-servlet/2.8.0/gwt-servlet-2.8.0.pom https://repo1.maven.org/maven2/com/google/gwt/gwt-user/2.8.0/gwt-user-2.8.0.jar https://repo1.maven.org/maven2/com/google/gwt/gwt-user/2.8.0/gwt-user-2.8.0.pom https://repo1.maven.org/maven2/com/google/jsinterop/jsinterop/1.0.1/jsinterop-1.0.1.pom https://repo1.maven.org/maven2/com/google/jsinterop/jsinterop-annotations/1.0.1/jsinterop-annotations-1.0.1.jar https://repo1.maven.org/maven2/com/google/jsinterop/jsinterop-annotations/1.0.1/jsinterop-annotations-1.0.1.pom https://repo1.maven.org/maven2/com/google/jsinterop/jsinterop-annotations/1.0.1/jsinterop-annotations-1.0.1-sources.jar https://repo1.maven.org/maven2/com/google/web/bindery/requestfactory/2.8.0/requestfactory-2.8.0.pom https://repo1.maven.org/maven2/com/ibm/icu/icu4j/50.1.1/icu4j-50.1.1.jar https://repo1.maven.org/maven2/com/ibm/icu/icu4j/50.1.1/icu4j-50.1.1.pom https://repo1.maven.org/maven2/commons-codec/commons-codec/1.10/commons-codec-1.10.jar https://repo1.maven.org/maven2/commons-codec/commons-codec/1.10/commons-codec-1.10.pom https://repo1.maven.org/maven2/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar https://repo1.maven.org/maven2/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.pom https://repo1.maven.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.jar https://repo1.maven.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.pom https://repo1.maven.org/maven2/javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2.jar https://repo1.maven.org/maven2/javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2.pom https://repo1.maven.org/maven2/javax/servlet/javax.servlet-api/3.1.0/javax.servlet-api-3.1.0.jar https://repo1.maven.org/maven2/javax/servlet/javax.servlet-api/3.1.0/javax.servlet-api-3.1.0.pom https://repo1.maven.org/maven2/javax/validation/validation-api/1.0.0.GA/validation-api-1.0.0.GA.jar https://repo1.maven.org/maven2/javax/validation/validation-api/1.0.0.GA/validation-api-1.0.0.GA.pom https://repo1.maven.org/maven2/javax/validation/validation-api/1.0.0.GA/validation-api-1.0.0.GA-sources.jar https://repo1.maven.org/maven2/net/java/dev/javacc/javacc/6.1.2/javacc-6.1.2.jar https://repo1.maven.org/maven2/net/java/dev/javacc/javacc/6.1.2/javacc-6.1.2.pom https://repo1.maven.org/maven2/net/java/jvnet-parent/3/jvnet-parent-3.pom https://repo1.maven.org/maven2/net/sourceforge/cssparser/cssparser/0.9.18/cssparser-0.9.18.jar https://repo1.maven.org/maven2/net/sourceforge/cssparser/cssparser/0.9.18/cssparser-0.9.18.pom https://repo1.maven.org/maven2/net/sourceforge/htmlunit/htmlunit/2.19/htmlunit-2.19.jar https://repo1.maven.org/maven2/net/sourceforge/htmlunit/htmlunit/2.19/htmlunit-2.19.pom https://repo1.maven.org/maven2/net/sourceforge/htmlunit/htmlunit-core-js/2.17/htmlunit-core-js-2.17.jar https://repo1.maven.org/maven2/net/sourceforge/htmlunit/htmlunit-core-js/2.17/htmlunit-core-js-2.17.pom https://repo1.maven.org/maven2/net/sourceforge/nekohtml/nekohtml/1.9.22/nekohtml-1.9.22.jar https://repo1.maven.org/maven2/net/sourceforge/nekohtml/nekohtml/1.9.22/nekohtml-1.9.22.pom https://repo1.maven.org/maven2/org/apache/apache/13/apache-13.pom https://repo1.maven.org/maven2/org/apache/apache/15/apache-15.pom https://repo1.maven.org/maven2/org/apache/apache/3/apache-3.pom https://repo1.maven.org/maven2/org/apache/apache/4/apache-4.pom https://repo1.maven.org/maven2/org/apache/commons/commons-parent/34/commons-parent-34.pom https://repo1.maven.org/maven2/org/apache/commons/commons-parent/35/commons-parent-35.pom https://repo1.maven.org/maven2/org/apache/commons/commons-parent/39/commons-parent-39.pom https://repo1.maven.org/maven2/org/apache/httpcomponents/httpclient/4.5.1/httpclient-4.5.1.jar https://repo1.maven.org/maven2/org/apache/httpcomponents/httpclient/4.5.1/httpclient-4.5.1.pom https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcomponents-client/4.5.1/httpcomponents-client-4.5.1.pom https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcomponents-core/4.4.3/httpcomponents-core-4.4.3.pom https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcore/4.4.3/httpcore-4.4.3.jar https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcore/4.4.3/httpcore-4.4.3.pom https://repo1.maven.org/maven2/org/apache/httpcomponents/httpmime/4.5.1/httpmime-4.5.1.jar https://repo1.maven.org/maven2/org/apache/httpcomponents/httpmime/4.5.1/httpmime-4.5.1.pom https://repo1.maven.org/maven2/org/apache/httpcomponents/project/7/project-7.pom https://repo1.maven.org/maven2/org/eclipse/jetty/apache-jsp/9.2.14.v20151106/apache-jsp-9.2.14.v20151106.jar https://repo1.maven.org/maven2/org/eclipse/jetty/apache-jsp/9.2.14.v20151106/apache-jsp-9.2.14.v20151106.pom https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-annotations/9.2.14.v20151106/jetty-annotations-9.2.14.v20151106.jar https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-annotations/9.2.14.v20151106/jetty-annotations-9.2.14.v20151106.pom https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-continuation/9.2.14.v20151106/jetty-continuation-9.2.14.v20151106.jar https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-continuation/9.2.14.v20151106/jetty-continuation-9.2.14.v20151106.pom https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-http/9.0.5.v20130815/jetty-http-9.0.5.v20130815.jar https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-http/9.0.5.v20130815/jetty-http-9.0.5.v20130815.pom https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-http/9.2.14.v20151106/jetty-http-9.2.14.v20151106.jar https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-http/9.2.14.v20151106/jetty-http-9.2.14.v20151106.pom https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-io/9.2.14.v20151106/jetty-io-9.2.14.v20151106.jar https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-io/9.2.14.v20151106/jetty-io-9.2.14.v20151106.pom https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-io/9.3.0.M2/jetty-io-9.3.0.M2.jar https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-io/9.3.0.M2/jetty-io-9.3.0.M2.pom https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-jndi/9.2.14.v20151106/jetty-jndi-9.2.14.v20151106.jar https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-jndi/9.2.14.v20151106/jetty-jndi-9.2.14.v20151106.pom https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-parent/18/jetty-parent-18.pom https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-parent/20/jetty-parent-20.pom https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-parent/22/jetty-parent-22.pom https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-parent/23/jetty-parent-23.pom https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-plus/9.2.14.v20151106/jetty-plus-9.2.14.v20151106.jar https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-plus/9.2.14.v20151106/jetty-plus-9.2.14.v20151106.pom https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-project/9.0.5.v20130815/jetty-project-9.0.5.v20130815.pom https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-project/9.2.13.v20150730/jetty-project-9.2.13.v20150730.pom https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-project/9.2.14.v20151106/jetty-project-9.2.14.v20151106.pom https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-project/9.3.0.M2/jetty-project-9.3.0.M2.pom https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-security/9.2.14.v20151106/jetty-security-9.2.14.v20151106.jar https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-security/9.2.14.v20151106/jetty-security-9.2.14.v20151106.pom https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-server/9.2.14.v20151106/jetty-server-9.2.14.v20151106.jar https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-server/9.2.14.v20151106/jetty-server-9.2.14.v20151106.pom https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-servlet/9.2.14.v20151106/jetty-servlet-9.2.14.v20151106.jar https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-servlet/9.2.14.v20151106/jetty-servlet-9.2.14.v20151106.pom https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-servlets/9.2.14.v20151106/jetty-servlets-9.2.14.v20151106.jar https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-servlets/9.2.14.v20151106/jetty-servlets-9.2.14.v20151106.pom https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util/9.2.14.v20151106/jetty-util-9.2.14.v20151106.jar https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util/9.2.14.v20151106/jetty-util-9.2.14.v20151106.pom https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util/9.3.0.M2/jetty-util-9.3.0.M2.jar https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util/9.3.0.M2/jetty-util-9.3.0.M2.pom https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-webapp/9.2.14.v20151106/jetty-webapp-9.2.14.v20151106.jar https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-webapp/9.2.14.v20151106/jetty-webapp-9.2.14.v20151106.pom https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-xml/9.2.14.v20151106/jetty-xml-9.2.14.v20151106.jar https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-xml/9.2.14.v20151106/jetty-xml-9.2.14.v20151106.pom https://repo1.maven.org/maven2/org/eclipse/jetty/toolchain/jetty-schemas/3.1.M0/jetty-schemas-3.1.M0.jar https://repo1.maven.org/maven2/org/eclipse/jetty/toolchain/jetty-schemas/3.1.M0/jetty-schemas-3.1.M0.pom https://repo1.maven.org/maven2/org/eclipse/jetty/toolchain/jetty-toolchain/1.4/jetty-toolchain-1.4.pom https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-api/9.0.5.v20130815/websocket-api-9.0.5.v20130815.jar https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-api/9.0.5.v20130815/websocket-api-9.0.5.v20130815.pom https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-api/9.2.13.v20150730/websocket-api-9.2.13.v20150730.jar https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-api/9.2.13.v20150730/websocket-api-9.2.13.v20150730.pom https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-client/9.0.5.v20130815/websocket-client-9.0.5.v20130815.jar https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-client/9.0.5.v20130815/websocket-client-9.0.5.v20130815.pom https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-client/9.2.13.v20150730/websocket-client-9.2.13.v20150730.jar https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-client/9.2.13.v20150730/websocket-client-9.2.13.v20150730.pom https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-common/9.0.5.v20130815/websocket-common-9.0.5.v20130815.jar https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-common/9.0.5.v20130815/websocket-common-9.0.5.v20130815.pom https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-common/9.2.13.v20150730/websocket-common-9.2.13.v20150730.jar https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-common/9.2.13.v20150730/websocket-common-9.2.13.v20150730.pom https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-parent/9.0.5.v20130815/websocket-parent-9.0.5.v20130815.pom https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-parent/9.2.13.v20150730/websocket-parent-9.2.13.v20150730.pom https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-server/9.0.5.v20130815/websocket-server-9.0.5.v20130815.jar https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-server/9.0.5.v20130815/websocket-server-9.0.5.v20130815.pom https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-servlet/9.0.5.v20130815/websocket-servlet-9.0.5.v20130815.jar https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-servlet/9.0.5.v20130815/websocket-servlet-9.0.5.v20130815.pom https://repo1.maven.org/maven2/org/mortbay/jasper/apache-el/8.0.9.M3/apache-el-8.0.9.M3.jar https://repo1.maven.org/maven2/org/mortbay/jasper/apache-el/8.0.9.M3/apache-el-8.0.9.M3.pom https://repo1.maven.org/maven2/org/mortbay/jasper/apache-jsp/8.0.9.M3/apache-jsp-8.0.9.M3.jar https://repo1.maven.org/maven2/org/mortbay/jasper/apache-jsp/8.0.9.M3/apache-jsp-8.0.9.M3.pom https://repo1.maven.org/maven2/org/mortbay/jasper/jasper-jsp/8.0.9.M3/jasper-jsp-8.0.9.M3.pom https://repo1.maven.org/maven2/org/mozilla/rhino/1.7R3/rhino-1.7R3.jar https://repo1.maven.org/maven2/org/mozilla/rhino/1.7R3/rhino-1.7R3.pom https://repo1.maven.org/maven2/org/ow2/asm/asm/5.0.3/asm-5.0.3.jar https://repo1.maven.org/maven2/org/ow2/asm/asm/5.0.3/asm-5.0.3.pom https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/5.0.3/asm-commons-5.0.3.jar https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/5.0.3/asm-commons-5.0.3.pom https://repo1.maven.org/maven2/org/ow2/asm/asm-parent/5.0.3/asm-parent-5.0.3.pom https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/5.0.3/asm-tree-5.0.3.jar https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/5.0.3/asm-tree-5.0.3.pom https://repo1.maven.org/maven2/org/ow2/asm/asm-util/5.0.3/asm-util-5.0.3.jar https://repo1.maven.org/maven2/org/ow2/asm/asm-util/5.0.3/asm-util-5.0.3.pom https://repo1.maven.org/maven2/org/ow2/ow2/1.3/ow2-1.3.pom https://repo1.maven.org/maven2/org/sonatype/oss/oss-parent/4/oss-parent-4.pom https://repo1.maven.org/maven2/org/w3c/css/sac/1.3/sac-1.3.jar https://repo1.maven.org/maven2/org/w3c/css/sac/1.3/sac-1.3.pom https://repo1.maven.org/maven2/tapestry/tapestry/4.0.2/tapestry-4.0.2.jar https://repo1.maven.org/maven2/tapestry/tapestry/4.0.2/tapestry-4.0.2.pom https://repo1.maven.org/maven2/xalan/serializer/2.7.2/serializer-2.7.2.jar https://repo1.maven.org/maven2/xalan/serializer/2.7.2/serializer-2.7.2.pom https://repo1.maven.org/maven2/xalan/xalan/2.7.2/xalan-2.7.2.jar https://repo1.maven.org/maven2/xalan/xalan/2.7.2/xalan-2.7.2.pom https://repo1.maven.org/maven2/xerces/xercesImpl/2.11.0/xercesImpl-2.11.0.jar https://repo1.maven.org/maven2/xerces/xercesImpl/2.11.0/xercesImpl-2.11.0.pom https://repo1.maven.org/maven2/xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar https://repo1.maven.org/maven2/xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.pom https://repo1.maven.org/maven2/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar https://repo1.maven.org/maven2/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.pom
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=94c399d25937dd83ad8f7a34af0d09c2
diff --git a/metadata/md5-cache/sci-mathematics/lybniz-1.3.2-r1 b/metadata/md5-cache/sci-mathematics/lybniz-1.3.2-r1
index abb8e039d001..ceb53f0cb1fc 100644
--- a/metadata/md5-cache/sci-mathematics/lybniz-1.3.2-r1
+++ b/metadata/md5-cache/sci-mathematics/lybniz-1.3.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/lybniz2/lybniz-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8e6ed5b641e7399e23819bb5ca71c8e3
diff --git a/metadata/md5-cache/sci-mathematics/mathmod-4.1-r1 b/metadata/md5-cache/sci-mathematics/mathmod-4.1-r1
index 5e51b1b3a7b0..25f77b509db0 100644
--- a/metadata/md5-cache/sci-mathematics/mathmod-4.1-r1
+++ b/metadata/md5-cache/sci-mathematics/mathmod-4.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtwidgets:5 dev-qt/qtopengl:5
 SLOT=0
 SRC_URI=mirror://sourceforge/mathmod/mathmod-4.1.src.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=85cf7efc082906ddbcd00250c9a98757
diff --git a/metadata/md5-cache/sci-mathematics/maxima-5.41.0-r1 b/metadata/md5-cache/sci-mathematics/maxima-5.41.0-r1
index 403e46e7441b..2561fb291e74 100644
--- a/metadata/md5-cache/sci-mathematics/maxima-5.41.0-r1
+++ b/metadata/md5-cache/sci-mathematics/maxima-5.41.0-r1
@@ -9,5 +9,5 @@ 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.41.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	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8ebe1c8259a0a4080c164ead39e355da
diff --git a/metadata/md5-cache/sci-mathematics/maxima-5.41.0-r2 b/metadata/md5-cache/sci-mathematics/maxima-5.41.0-r2
index 64bc1111baec..4d7145a601d9 100644
--- a/metadata/md5-cache/sci-mathematics/maxima-5.41.0-r2
+++ b/metadata/md5-cache/sci-mathematics/maxima-5.41.0-r2
@@ -9,5 +9,5 @@ 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.41.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8f20c2790728004c81f13eea36381e2c
diff --git a/metadata/md5-cache/sci-mathematics/maxima-5.42.0 b/metadata/md5-cache/sci-mathematics/maxima-5.42.0
new file mode 100644
index 000000000000..62170ccce0e0
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/maxima-5.42.0
@@ -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.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/mlpy-3.5.0 b/metadata/md5-cache/sci-mathematics/mlpy-3.5.0
index 0e660c4ece55..ffa82b6576e3 100644
--- a/metadata/md5-cache/sci-mathematics/mlpy-3.5.0
+++ b/metadata/md5-cache/sci-mathematics/mlpy-3.5.0
@@ -10,5 +10,5 @@ RDEPEND=>=sci-libs/gsl-1.11 >=dev-python/numpy-1.3[python_targets_python2_7(-)?,
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/mlpy/mlpy-3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=97f42ec024f6a550d3e020baa4e4f1ab
diff --git a/metadata/md5-cache/sci-mathematics/nusmv-2.6.0 b/metadata/md5-cache/sci-mathematics/nusmv-2.6.0
index d6106d5080af..e5b6566c2ad2 100644
--- a/metadata/md5-cache/sci-mathematics/nusmv-2.6.0
+++ b/metadata/md5-cache/sci-mathematics/nusmv-2.6.0
@@ -10,5 +10,5 @@ RDEPEND=minisat? ( >=sci-mathematics/minisat-2.2.0_p20130925 ) dev-libs/expat
 REQUIRED_USE=|| ( minisat zchaff )
 SLOT=0
 SRC_URI=http://nusmv.fbk.eu/distrib/NuSMV-2.6.0.tar.gz zchaff? ( http://www.princeton.edu/~chaff/zchaff/zchaff.64bit.2007.3.12.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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=d6bdea5e3e221c3a7b4a323fc3f6b995
diff --git a/metadata/md5-cache/sci-mathematics/octave-4.2.2 b/metadata/md5-cache/sci-mathematics/octave-4.2.2
index 53e87d9cf967..3722c96673fa 100644
--- a/metadata/md5-cache/sci-mathematics/octave-4.2.2
+++ b/metadata/md5-cache/sci-mathematics/octave-4.2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=app-arch/bzip2 app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= sys-libs/zlib virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 >=x11-libs/qscintilla-2.9.3-r2:=[qt5(+)] ) hdf5? ( sci-libs/hdf5:0= ) imagemagick? ( !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) ) java? ( >=virtual/jre-1.6.0:* ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= virtual/glu >=x11-libs/fltk-1.3:1=[opengl,xft] x11-libs/gl2ps:0= ) openssl? ( dev-libs/openssl:0= ) portaudio? ( media-libs/portaudio ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sndfile? ( media-libs/libsndfile ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/4.2.2
 SRC_URI=mirror://gnu/octave/octave-4.2.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f175a4d194d7b46f0d1f20a2d1c6c42b
diff --git a/metadata/md5-cache/sci-mathematics/octave-4.4.0 b/metadata/md5-cache/sci-mathematics/octave-4.4.0
index b7c8fdf7906e..556424ae21ab 100644
--- a/metadata/md5-cache/sci-mathematics/octave-4.4.0
+++ b/metadata/md5-cache/sci-mathematics/octave-4.4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=app-arch/bzip2 app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= sys-libs/zlib virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-libs/qscintilla:= ) hdf5? ( sci-libs/hdf5:0= ) imagemagick? ( !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) ) java? ( >=virtual/jre-1.6.0:* ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= virtual/glu >=x11-libs/fltk-1.3:1=[opengl,xft] x11-libs/gl2ps:0= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) portaudio? ( media-libs/portaudio ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sndfile? ( media-libs/libsndfile ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/4.4.0
 SRC_URI=mirror://gnu/octave/octave-4.4.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7f9a9f64ad5d84af544f0bbbc35d1dbc
diff --git a/metadata/md5-cache/sci-mathematics/octave-4.4.1 b/metadata/md5-cache/sci-mathematics/octave-4.4.1
index 36b83dd4060a..8677c6eb0186 100644
--- a/metadata/md5-cache/sci-mathematics/octave-4.4.1
+++ b/metadata/md5-cache/sci-mathematics/octave-4.4.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=app-arch/bzip2 app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= sys-libs/zlib virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-libs/qscintilla:= ) hdf5? ( sci-libs/hdf5:0= ) imagemagick? ( !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) ) java? ( >=virtual/jre-1.6.0:* ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= virtual/glu >=x11-libs/fltk-1.3:1=[opengl,xft] x11-libs/gl2ps:0= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) portaudio? ( media-libs/portaudio ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sndfile? ( media-libs/libsndfile ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/4.4.1
 SRC_URI=mirror://gnu/octave/octave-4.4.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=297cdfaf1eb6a369340054ad5479894f
diff --git a/metadata/md5-cache/sci-mathematics/p9m4-05-r1 b/metadata/md5-cache/sci-mathematics/p9m4-05-r1
index 22db70ea34da..b87a544fa3ac 100644
--- a/metadata/md5-cache/sci-mathematics/p9m4-05-r1
+++ b/metadata/md5-cache/sci-mathematics/p9m4-05-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/wxpython:* sci-mathematics/prover9 python_targets_python2_7?
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://www.cs.unm.edu/~mccune/prover9/gui/p9m4-v05.tar.gz https://dev.gentoo.org/~gienah/2big4tree/sci-mathematics/p9m4/p9m4-v05-64bit.patch.bz2
-_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fee19dd5acd6397cda12c0c44ef45db0
diff --git a/metadata/md5-cache/sci-mathematics/pymc-2.3.6 b/metadata/md5-cache/sci-mathematics/pymc-2.3.6
index a32009ca48cd..a2968d2e6810 100644
--- a/metadata/md5-cache/sci-mathematics/pymc-2.3.6
+++ b/metadata/md5-cache/sci-mathematics/pymc-2.3.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/numpy-1.6[python_targets_python2_7(-)?,python_targets_pytho
 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/pymc/pymc-2.3.6.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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_=0bbd2a862823ac92f99153e342af0efe
diff --git a/metadata/md5-cache/sci-mathematics/pymc3-3.1 b/metadata/md5-cache/sci-mathematics/pymc3-3.1
index e44f945ff4ea..525f0a5f3400 100644
--- a/metadata/md5-cache/sci-mathematics/pymc3-3.1
+++ b/metadata/md5-cache/sci-mathematics/pymc3-3.1
@@ -10,5 +10,5 @@ RDEPEND=<=dev-python/CommonMark-0.5.4[python_targets_python2_7(-)?,python_target
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/sci-mathematics/rkward-0.7.0 b/metadata/md5-cache/sci-mathematics/rkward-0.7.0
index 7e1410ff9c50..193060ff8cd7 100644
--- a/metadata/md5-cache/sci-mathematics/rkward-0.7.0
+++ b/metadata/md5-cache/sci-mathematics/rkward-0.7.0
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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-mathematics/rstudio-1.1.383-r1 b/metadata/md5-cache/sci-mathematics/rstudio-1.1.383-r1
index a3a6fc582e4d..b0d9c63e6df1 100644
--- a/metadata/md5-cache/sci-mathematics/rstudio-1.1.383-r1
+++ b/metadata/md5-cache/sci-mathematics/rstudio-1.1.383-r1
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=app-text/pandoc dev-haskell/pandoc-citeproc >=dev-lang/R-2.11.1 >=dev-libs/boost-1.63:= >=dev-libs/mathjax-2.7.0 dev-libs/openssl:0 sys-apps/util-linux >=sys-devel/clang-3.5.0:* sys-libs/zlib >=virtual/jre-1.8:= x11-libs/pango !dedicated? ( >=dev-qt/qtcore-5.4:5 >=dev-qt/qtdeclarative-5.4:5 >=dev-qt/qtdbus-5.4:5 >=dev-qt/qtgui-5.4:5 >=dev-qt/qtnetwork-5.4:5 >=dev-qt/qtopengl-5.4:5 >=dev-qt/qtpositioning-5.4:5 >=dev-qt/qtprintsupport-5.4:5 >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)] >=dev-qt/qtsensors-5.4:5 >=dev-qt/qtsql-5.4:5 >=dev-qt/qtsvg-5.4:5 >=dev-qt/qtwebchannel-5.4:5 >=dev-qt/qtwebkit-5.4:5 >=dev-qt/qtwidgets-5.4:5 >=dev-qt/qtxml-5.4:5 >=dev-qt/qtxmlpatterns-5.4:5 server? ( virtual/pam ) ) dedicated? ( virtual/pam ) >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/rstudio/rstudio/archive/v1.1.383.tar.gz -> rstudio-1.1.383.tar.gz https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip https://s3.amazonaws.com/rstudio-buildtools/gwt-2.7.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-java-2.37.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-2.37.0.jar https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip https://dev.gentoo.org/~gienah/distfiles/packrat-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/rmarkdown-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/shinyapps-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/rsconnect_0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	3e788d86170dfcd5b06824d898315e18	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	3e788d86170dfcd5b06824d898315e18	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d24005a258f2ee6c7bf337e815b46226
diff --git a/metadata/md5-cache/sci-mathematics/rstudio-1.1.453 b/metadata/md5-cache/sci-mathematics/rstudio-1.1.453
index 27be7c086202..c434df550107 100644
--- a/metadata/md5-cache/sci-mathematics/rstudio-1.1.453
+++ b/metadata/md5-cache/sci-mathematics/rstudio-1.1.453
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=>=app-text/pandoc-1.19.2.1 dev-haskell/pandoc-citeproc >=dev-lang/R-2.11.1 >=dev-libs/boost-1.63:= >=dev-libs/mathjax-2.7.4 sys-apps/util-linux >=sys-devel/clang-3.5.0:* sys-libs/zlib >=virtual/jre-1.8:= x11-libs/pango !dedicated? ( >=dev-qt/qtcore-5.4:5 >=dev-qt/qtdeclarative-5.4:5 >=dev-qt/qtdbus-5.4:5 >=dev-qt/qtgui-5.4:5 >=dev-qt/qtnetwork-5.4:5 >=dev-qt/qtopengl-5.4:5 >=dev-qt/qtpositioning-5.4:5 >=dev-qt/qtprintsupport-5.4:5 >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)] >=dev-qt/qtsensors-5.4:5 >=dev-qt/qtsql-5.4:5 >=dev-qt/qtsvg-5.4:5 >=dev-qt/qtwebchannel-5.4:5 >=dev-qt/qtwebkit-5.4:5 >=dev-qt/qtwidgets-5.4:5 >=dev-qt/qtxml-5.4:5 >=dev-qt/qtxmlpatterns-5.4:5 server? ( virtual/pam ) ) dedicated? ( virtual/pam ) !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:0 ) >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/rstudio/rstudio/archive/v1.1.453.tar.gz -> rstudio-1.1.453.tar.gz https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip https://s3.amazonaws.com/rstudio-buildtools/gwt-2.7.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-java-2.37.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-2.37.0.jar https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip https://dev.gentoo.org/~gienah/distfiles/packrat-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/rmarkdown-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/shinyapps-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/rsconnect_0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	3e788d86170dfcd5b06824d898315e18	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	3e788d86170dfcd5b06824d898315e18	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2a3cb8f17249bb6837c34b465b4a507c
diff --git a/metadata/md5-cache/sci-mathematics/snns-4.3-r2 b/metadata/md5-cache/sci-mathematics/snns-4.3-r2
index 532244735436..43bc1cd8a367 100644
--- a/metadata/md5-cache/sci-mathematics/snns-4.3-r2
+++ b/metadata/md5-cache/sci-mathematics/snns-4.3-r2
@@ -10,5 +10,5 @@ RDEPEND=X? ( x11-libs/libX11 x11-libs/libXaw3d x11-libs/libXt ) python? ( python
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=http://www.ra.cs.uni-tuebingen.de/downloads/SNNS/SNNSv4.3.tar.gz doc? ( http://www.ra.cs.uni-tuebingen.de/downloads/SNNS/SNNSv4.2.Manual.pdf )
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=faa7d06c5d3899ffa71296966bd1d633
diff --git a/metadata/md5-cache/sci-mathematics/snns-4.3-r3 b/metadata/md5-cache/sci-mathematics/snns-4.3-r3
index b283fb575e53..bef86dc3e42a 100644
--- a/metadata/md5-cache/sci-mathematics/snns-4.3-r3
+++ b/metadata/md5-cache/sci-mathematics/snns-4.3-r3
@@ -10,5 +10,5 @@ RDEPEND=X? ( x11-libs/libX11 x11-libs/libXaw3d x11-libs/libXt ) python? ( python
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=http://www.ra.cs.uni-tuebingen.de/downloads/SNNS/SNNSv4.3.tar.gz doc? ( http://www.ra.cs.uni-tuebingen.de/downloads/SNNS/SNNSv4.2.Manual.pdf )
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=abe23f5fac9654546a53c381e7ad96a8
diff --git a/metadata/md5-cache/sci-mathematics/wxmaxima-15.08.2 b/metadata/md5-cache/sci-mathematics/wxmaxima-15.08.2
index ddfaa0987a69..14470d6c5d9d 100644
--- a/metadata/md5-cache/sci-mathematics/wxmaxima-15.08.2
+++ b/metadata/md5-cache/sci-mathematics/wxmaxima-15.08.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2:2 x11-libs/wxGTK:3.0 media-fonts/jsmath sci-visualization/gnuplot[wxwidgets] sci-mathematics/maxima
 SLOT=0
 SRC_URI=mirror://sourceforge/wxmaxima/wxmaxima-15.08.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7cdc7ae43720f7c5bd1e5dce2e3a58e5
diff --git a/metadata/md5-cache/sci-mathematics/wxmaxima-18.02.0 b/metadata/md5-cache/sci-mathematics/wxmaxima-18.02.0
index 8220c3ad80a4..f5752bae06bc 100644
--- a/metadata/md5-cache/sci-mathematics/wxmaxima-18.02.0
+++ b/metadata/md5-cache/sci-mathematics/wxmaxima-18.02.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2:2 x11-libs/wxGTK:3.0 media-fonts/jsmath sci-visualization/gnuplot[wxwidgets] sci-mathematics/maxima
 SLOT=0
 SRC_URI=https://github.com/andrejv/wxmaxima/archive/Version-18.02.0.tar.gz -> wxmaxima-18.02.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bf93e45afe4fc0915c59ca411cf2b192
diff --git a/metadata/md5-cache/sci-mathematics/wxmaxima-18.10.0 b/metadata/md5-cache/sci-mathematics/wxmaxima-18.10.0
index 82e1682f31a1..155e78a0eea4 100644
--- a/metadata/md5-cache/sci-mathematics/wxmaxima-18.10.0
+++ b/metadata/md5-cache/sci-mathematics/wxmaxima-18.10.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2:2 x11-libs/wxGTK:3.0 media-fonts/jsmath sci-visualization/gnuplot[wxwidgets] sci-mathematics/maxima
 SLOT=0
 SRC_URI=https://github.com/wxMaxima-developers/wxmaxima/archive/Version-18.10.0.tar.gz -> wxmaxima-18.10.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7cabfafbaa00508d6451788dce5d9be7
diff --git a/metadata/md5-cache/sci-mathematics/xmds-2.2.2 b/metadata/md5-cache/sci-mathematics/xmds-2.2.2
index f780256b64cb..61f789e0f226 100644
--- a/metadata/md5-cache/sci-mathematics/xmds-2.2.2
+++ b/metadata/md5-cache/sci-mathematics/xmds-2.2.2
@@ -10,5 +10,5 @@ RDEPEND=>=sci-libs/fftw-3.3.1:3.0=[mpi?] mpi? ( virtual/mpi ) dev-python/numpy[p
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/xmds/xmds-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6d90f9bb47935ffba0d3f5df0f81ab82
diff --git a/metadata/md5-cache/sci-mathematics/yacas-1.6.1-r1 b/metadata/md5-cache/sci-mathematics/yacas-1.6.1-r1
index 12578f52eb7a..2441b11ad530 100644
--- a/metadata/md5-cache/sci-mathematics/yacas-1.6.1-r1
+++ b/metadata/md5-cache/sci-mathematics/yacas-1.6.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=gui? ( dev-qt/qtcore:5[icu] dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtwebkit:5 dev-qt/qtmultimedia:5 dev-qt/qtsql:5 dev-qt/qtprintsupport:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 ) jupyter? ( dev-python/jupyter dev-libs/boost:= dev-libs/jsoncpp:= dev-libs/openssl:0= net-libs/zeromq >=net-libs/zmqpp-4.1.2 ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/1
 SRC_URI=https://codeload.github.com/grzegorzmazur/yacas/tar.gz/v1.6.1 -> yacas-1.6.1.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b61dc9862029780e013507e2d6f47168
diff --git a/metadata/md5-cache/sci-misc/Manifest.gz b/metadata/md5-cache/sci-misc/Manifest.gz
index fa06c61991a2..64aaa4a5c7de 100644
--- a/metadata/md5-cache/sci-misc/Manifest.gz
+++ b/metadata/md5-cache/sci-misc/Manifest.gz
diff --git a/metadata/md5-cache/sci-misc/boinc-7.8.6 b/metadata/md5-cache/sci-misc/boinc-7.8.6
index bbf164875eb1..11a9efc0724c 100644
--- a/metadata/md5-cache/sci-misc/boinc-7.8.6
+++ b/metadata/md5-cache/sci-misc/boinc-7.8.6
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( curl_ssl_gnutls curl_ssl_libressl curl_ssl_openssl )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://github.com/BOINC/boinc/archive/client_release/7.8/7.8.6.tar.gz -> boinc-7.8.6.tar.gz X? ( https://boinc.berkeley.edu/logo/boinc_glossy2_512_F.tif -> boinc.tif )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3f38d47438f3a00840ad58f07de22a86
diff --git a/metadata/md5-cache/sci-misc/boinc-7.9.3 b/metadata/md5-cache/sci-misc/boinc-7.9.3
index c0dd33acb9d7..1e4ff4c9482a 100644
--- a/metadata/md5-cache/sci-misc/boinc-7.9.3
+++ b/metadata/md5-cache/sci-misc/boinc-7.9.3
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( curl_ssl_gnutls curl_ssl_libressl curl_ssl_openssl )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://github.com/BOINC/boinc/archive/client_release/7.10/7.9.3.tar.gz -> boinc-7.9.3.tar.gz X? ( https://boinc.berkeley.edu/logo/boinc_glossy2_512_F.tif -> boinc.tif )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=54e41e1fd3294f98259cf0ed6d4462af
diff --git a/metadata/md5-cache/sci-misc/gato-1.2.2 b/metadata/md5-cache/sci-misc/gato-1.2.2
index f253d79df700..ceaece9a1d3e 100644
--- a/metadata/md5-cache/sci-misc/gato-1.2.2
+++ b/metadata/md5-cache/sci-misc/gato-1.2.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk(+)] ) >=de
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/gato/Gato-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=865641d9134cbd6df5dd7fc57db23e2b
diff --git a/metadata/md5-cache/sci-misc/mendeleydesktop-1.17.13-r1 b/metadata/md5-cache/sci-misc/mendeleydesktop-1.17.13-r1
index bc4f5f6cb551..9fa8122fc37a 100644
--- a/metadata/md5-cache/sci-misc/mendeleydesktop-1.17.13-r1
+++ b/metadata/md5-cache/sci-misc/mendeleydesktop-1.17.13-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4
 RESTRICT=fetch
 SLOT=0
 SRC_URI=amd64? ( mendeleydesktop-1.17.13-linux-x86_64.tar.bz2 ) x86? ( mendeleydesktop-1.17.13-linux-i486.tar.bz2 ) amd64-linux? ( mendeleydesktop-1.17.13-linux-x86_64.tar.bz2 ) x86-linux? ( mendeleydesktop-1.17.13-linux-i486.tar.bz2 )
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7c2bc97e33f8671932e7450871ce65a6
diff --git a/metadata/md5-cache/sci-misc/mendeleydesktop-1.19.2 b/metadata/md5-cache/sci-misc/mendeleydesktop-1.19.2
index 63666314941f..a4c5af8eb83f 100644
--- a/metadata/md5-cache/sci-misc/mendeleydesktop-1.19.2
+++ b/metadata/md5-cache/sci-misc/mendeleydesktop-1.19.2
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4
 RESTRICT=fetch
 SLOT=0
 SRC_URI=amd64? ( mendeleydesktop-1.19.2-linux-x86_64.tar.bz2 ) x86? ( mendeleydesktop-1.19.2-linux-i486.tar.bz2 ) amd64-linux? ( mendeleydesktop-1.19.2-linux-x86_64.tar.bz2 ) x86-linux? ( mendeleydesktop-1.19.2-linux-i486.tar.bz2 )
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fa5356e00583406400430d01cdd8f8c9
diff --git a/metadata/md5-cache/sci-misc/pythoncad-1.37-r1 b/metadata/md5-cache/sci-misc/pythoncad-1.37-r1
index e4ff63cb9306..90d968ff2866 100644
--- a/metadata/md5-cache/sci-misc/pythoncad-1.37-r1
+++ b/metadata/md5-cache/sci-misc/pythoncad-1.37-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pythoncad/PythonCAD-DS1-R37.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4f4549142017145396fba2b754f283a5
diff --git a/metadata/md5-cache/sci-misc/vitables-3.0.0 b/metadata/md5-cache/sci-misc/vitables-3.0.0
index 674d56bc753e..a08881db83c2 100644
--- a/metadata/md5-cache/sci-misc/vitables-3.0.0
+++ b/metadata/md5-cache/sci-misc/vitables-3.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/vitables/ViTables-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=268c0b94493d56a299e474c3e7b9292f
diff --git a/metadata/md5-cache/sci-physics/Manifest.gz b/metadata/md5-cache/sci-physics/Manifest.gz
index 3c97ec72b3d9..f5b6cfdb8a97 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/bullet-2.86 b/metadata/md5-cache/sci-physics/bullet-2.86
index ef943e9c497d..85e34311bc40 100644
--- a/metadata/md5-cache/sci-physics/bullet-2.86
+++ b/metadata/md5-cache/sci-physics/bullet-2.86
@@ -10,5 +10,5 @@ RDEPEND=virtual/opengl media-libs/freeglut
 RESTRICT=test
 SLOT=0/2.86
 SRC_URI=https://github.com/bulletphysics/bullet3/archive/2.86.tar.gz -> bullet-2.86.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a080613672cc5e08d9f91b936cbb6f0c
diff --git a/metadata/md5-cache/sci-physics/clhep-2.1.4.1 b/metadata/md5-cache/sci-physics/clhep-2.1.4.1
index bc82399a8be7..c678dfb31a86 100644
--- a/metadata/md5-cache/sci-physics/clhep-2.1.4.1
+++ b/metadata/md5-cache/sci-physics/clhep-2.1.4.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3 LGPL-3
 SLOT=2/2.1.4.1
 SRC_URI=http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/clhep-2.1.4.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=37f678d51ae659eda4887cb4149656cd
diff --git a/metadata/md5-cache/sci-physics/clhep-2.1.4.2 b/metadata/md5-cache/sci-physics/clhep-2.1.4.2
index d29d5804dfb0..603388c09c01 100644
--- a/metadata/md5-cache/sci-physics/clhep-2.1.4.2
+++ b/metadata/md5-cache/sci-physics/clhep-2.1.4.2
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-3 LGPL-3
 SLOT=2/2.1.4.2
 SRC_URI=http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/clhep-2.1.4.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d7345ee6444f68bccd4ce18ab297a892
diff --git a/metadata/md5-cache/sci-physics/clhep-2.2.0.1 b/metadata/md5-cache/sci-physics/clhep-2.2.0.1
index 2169022f1486..aa12e0c16b18 100644
--- a/metadata/md5-cache/sci-physics/clhep-2.2.0.1
+++ b/metadata/md5-cache/sci-physics/clhep-2.2.0.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-3 LGPL-3
 SLOT=2/2.2.0.1
 SRC_URI=http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/clhep-2.2.0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d7345ee6444f68bccd4ce18ab297a892
diff --git a/metadata/md5-cache/sci-physics/clhep-2.2.0.5 b/metadata/md5-cache/sci-physics/clhep-2.2.0.5
index 191570023dda..451969d0ee3d 100644
--- a/metadata/md5-cache/sci-physics/clhep-2.2.0.5
+++ b/metadata/md5-cache/sci-physics/clhep-2.2.0.5
@@ -8,5 +8,5 @@ KEYWORDS=amd64 hppa ppc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-3 LGPL-3
 SLOT=2/2.2.0.5
 SRC_URI=http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/clhep-2.2.0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=14963d8ad907d59c640db17c805c775b
diff --git a/metadata/md5-cache/sci-physics/clhep-2.3.1.0 b/metadata/md5-cache/sci-physics/clhep-2.3.1.0
index 1fd58ace500d..cc058fd7021c 100644
--- a/metadata/md5-cache/sci-physics/clhep-2.3.1.0
+++ b/metadata/md5-cache/sci-physics/clhep-2.3.1.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-3 LGPL-3
 SLOT=2/2.3.1.0
 SRC_URI=http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/clhep-2.3.1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d7345ee6444f68bccd4ce18ab297a892
diff --git a/metadata/md5-cache/sci-physics/clhep-2.3.3.1 b/metadata/md5-cache/sci-physics/clhep-2.3.3.1
index 3370ebf2a990..5bceef8594da 100644
--- a/metadata/md5-cache/sci-physics/clhep-2.3.3.1
+++ b/metadata/md5-cache/sci-physics/clhep-2.3.3.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-3 LGPL-3
 SLOT=2/2.3.3.1
 SRC_URI=http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/clhep-2.3.3.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=77cde31ea3ddce69f5f42e555bb2760f
diff --git a/metadata/md5-cache/sci-physics/clhep-2.4.0.4 b/metadata/md5-cache/sci-physics/clhep-2.4.0.4
index 7ece02453959..2a78970af1bf 100644
--- a/metadata/md5-cache/sci-physics/clhep-2.4.0.4
+++ b/metadata/md5-cache/sci-physics/clhep-2.4.0.4
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~hppa ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-3 LGPL-3
 SLOT=2/2.4.0.4
 SRC_URI=http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/clhep-2.4.0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e6473f3c0ba72c0740f1bd2b500a727a
diff --git a/metadata/md5-cache/sci-physics/espresso++-1.9.4 b/metadata/md5-cache/sci-physics/espresso++-1.9.4
index c9f552adaa2b..397db2399e36 100644
--- a/metadata/md5-cache/sci-physics/espresso++-1.9.4
+++ b/metadata/md5-cache/sci-physics/espresso++-1.9.4
@@ -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/espressopp/espressopp/archive/v1.9.4.tar.gz -> espresso++-1.9.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fa57008069d508eb178c5a0540ec405a
diff --git a/metadata/md5-cache/sci-physics/espresso++-2.0 b/metadata/md5-cache/sci-physics/espresso++-2.0
index 6b20e5e43554..daa8c4228a8c 100644
--- a/metadata/md5-cache/sci-physics/espresso++-2.0
+++ b/metadata/md5-cache/sci-physics/espresso++-2.0
@@ -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/espressopp/espressopp/archive/v2.0.tar.gz -> espresso++-2.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	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=dbc611349be2ce472be2af2a4ffa9b63
diff --git a/metadata/md5-cache/sci-physics/espresso++-9999 b/metadata/md5-cache/sci-physics/espresso++-9999
index e47581189bc0..04f966b6bc24 100644
--- a/metadata/md5-cache/sci-physics/espresso++-9999
+++ b/metadata/md5-cache/sci-physics/espresso++-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/mpi dev-libs/boost:=[python,mpi,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/fftw:3.0 >=dev-python/mpi4py-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=dbc611349be2ce472be2af2a4ffa9b63
diff --git a/metadata/md5-cache/sci-physics/espresso-4.0.0-r1 b/metadata/md5-cache/sci-physics/espresso-4.0.0-r1
index 162de96fbf0a..107329efe5d5 100644
--- a/metadata/md5-cache/sci-physics/espresso-4.0.0-r1
+++ b/metadata/md5-cache/sci-physics/espresso-4.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/espressomd/espresso/releases/download/4.0.0/espresso-4.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	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=44ad080495e5c3ac4d6520c3a9bceb27
diff --git a/metadata/md5-cache/sci-physics/espresso-4.0_pre20170228 b/metadata/md5-cache/sci-physics/espresso-4.0_pre20170228
index 38af263a0dbb..ab420cf7ae1d 100644
--- a/metadata/md5-cache/sci-physics/espresso-4.0_pre20170228
+++ b/metadata/md5-cache/sci-physics/espresso-4.0_pre20170228
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/espressomd/espresso/archive/8a021f5e8b1d508f356f4419d360bd9dfb7fec2c.tar.gz -> espresso-4.0_pre20170228.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	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9b35d7c759d4a744eaa38db923c7bca0
diff --git a/metadata/md5-cache/sci-physics/espresso-9999 b/metadata/md5-cache/sci-physics/espresso-9999
index 451cb6a57d40..85ddc0461d13 100644
--- a/metadata/md5-cache/sci-physics/espresso-9999
+++ b/metadata/md5-cache/sci-physics/espresso-9999
@@ -8,5 +8,5 @@ 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/cython-0.26.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(+)?] 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(+)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) fftw? ( sci-libs/fftw:3.0 ) dev-libs/boost:=[mpi] hdf5? ( sci-libs/hdf5:=[mpi] )
 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
-_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	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=55896f13d603034a41cc89fa63ead574
diff --git a/metadata/md5-cache/sci-physics/geant-4.10.03-r1 b/metadata/md5-cache/sci-physics/geant-4.10.03-r1
index e6c829dad7c1..c0b64bafc935 100644
--- a/metadata/md5-cache/sci-physics/geant-4.10.03-r1
+++ b/metadata/md5-cache/sci-physics/geant-4.10.03-r1
@@ -10,5 +10,5 @@ PDEPEND=data? ( ~sci-physics/geant-data-4.10.03 ) doc? ( ~app-doc/geant-docs-4.1
 RDEPEND=dev-libs/expat >=sci-physics/clhep-2.3.3.0:2= dawn? ( media-gfx/dawn ) gdml? ( dev-libs/xerces-c ) inventor? ( media-libs/SoXt ) motif? ( x11-libs/motif:0 ) opengl? ( virtual/opengl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raytracerx? ( x11-libs/libX11 x11-libs/libXmu ) zlib? ( sys-libs/zlib )
 SLOT=4
 SRC_URI=http://geant4.cern.ch/support/source/geant4.10.03.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6ff728565c49af86daa01bc5ca0fe450
diff --git a/metadata/md5-cache/sci-physics/geant-vmc-4.3.6 b/metadata/md5-cache/sci-physics/geant-vmc-4.3.6
index 41d3cd2b11f0..aa56bc8bb255 100644
--- a/metadata/md5-cache/sci-physics/geant-vmc-4.3.6
+++ b/metadata/md5-cache/sci-physics/geant-vmc-4.3.6
@@ -10,5 +10,5 @@ RDEPEND=>=sci-physics/geant-4.10.03:=[opengl,geant3?] sci-physics/root:=[-root7]
 RESTRICT=!geant3? ( test ) !g4root? ( test ) !mtroot? ( test ) !vgm? ( test )
 SLOT=4
 SRC_URI=http://root.cern.ch/download/vmc/geant4_vmc.3.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ea28df4c2a9943d34a9e16b51006e06d
diff --git a/metadata/md5-cache/sci-physics/geant-vmc-9999 b/metadata/md5-cache/sci-physics/geant-vmc-9999
index a583b84d20fe..01890a8baef5 100644
--- a/metadata/md5-cache/sci-physics/geant-vmc-9999
+++ b/metadata/md5-cache/sci-physics/geant-vmc-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sci-physics/geant-4.10.03:=[opengl,geant3?] sci-physics/root:=[-root7] vgm? ( >=sci-physics/vgm-4.4:= )
 RESTRICT=!geant3? ( test ) !g4root? ( test ) !mtroot? ( test ) !vgm? ( test )
 SLOT=4
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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_=ea28df4c2a9943d34a9e16b51006e06d
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 eefd8dbbde16..b0b18ddc3376 100644
--- a/metadata/md5-cache/sci-physics/hepmc-2.06.09-r1
+++ b/metadata/md5-cache/sci-physics/hepmc-2.06.09-r1
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/sci-physics/lammps-20170901 b/metadata/md5-cache/sci-physics/lammps-20170901
index 5a4d4f2c7bfb..16621048fd4e 100644
--- a/metadata/md5-cache/sci-physics/lammps-20170901
+++ b/metadata/md5-cache/sci-physics/lammps-20170901
@@ -10,5 +10,5 @@ RDEPEND=app-arch/gzip media-libs/libpng:0 sys-libs/zlib mpi? ( virtual/mpi sci-l
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://github.com/lammps/lammps/archive/patch_1Sep2017.tar.gz -> lammps-patch_1Sep2017.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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_=e4a007b0f600d37964c81fbf53b09671
diff --git a/metadata/md5-cache/sci-physics/lammps-20170901-r1 b/metadata/md5-cache/sci-physics/lammps-20170901-r1
index 0e82a60cf6ca..339ed7e32d4e 100644
--- a/metadata/md5-cache/sci-physics/lammps-20170901-r1
+++ b/metadata/md5-cache/sci-physics/lammps-20170901-r1
@@ -10,5 +10,5 @@ RDEPEND=app-arch/gzip media-libs/libpng:0 sys-libs/zlib mpi? ( virtual/mpi sci-l
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://github.com/lammps/lammps/archive/patch_1Sep2017.tar.gz -> lammps-patch_1Sep2017.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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_=a3771ca00e85c20f45e86629f7213c3f
diff --git a/metadata/md5-cache/sci-physics/lammps-20180117 b/metadata/md5-cache/sci-physics/lammps-20180117
index bba2270ac92f..2c87bd886fbc 100644
--- a/metadata/md5-cache/sci-physics/lammps-20180117
+++ b/metadata/md5-cache/sci-physics/lammps-20180117
@@ -10,5 +10,5 @@ RDEPEND=app-arch/gzip media-libs/libpng:0 sys-libs/zlib mpi? ( virtual/mpi sci-l
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://github.com/lammps/lammps/archive/patch_17Jan2018.tar.gz -> lammps-patch_17Jan2018.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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_=7879e1d64e3c324a9185d524631d775e
diff --git a/metadata/md5-cache/sci-physics/lammps-20180222 b/metadata/md5-cache/sci-physics/lammps-20180222
index 143eead9a5f6..79d96b26a628 100644
--- a/metadata/md5-cache/sci-physics/lammps-20180222
+++ b/metadata/md5-cache/sci-physics/lammps-20180222
@@ -10,5 +10,5 @@ RDEPEND=app-arch/gzip media-libs/libpng:0 sys-libs/zlib mpi? ( virtual/mpi sci-l
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://github.com/lammps/lammps/archive/patch_22Feb2018.tar.gz -> lammps-patch_22Feb2018.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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_=7879e1d64e3c324a9185d524631d775e
diff --git a/metadata/md5-cache/sci-physics/lammps-20180308 b/metadata/md5-cache/sci-physics/lammps-20180308
index 5ecb36f1c439..352b44c83b96 100644
--- a/metadata/md5-cache/sci-physics/lammps-20180308
+++ b/metadata/md5-cache/sci-physics/lammps-20180308
@@ -10,5 +10,5 @@ RDEPEND=app-arch/gzip media-libs/libpng:0 sys-libs/zlib mpi? ( virtual/mpi sci-l
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://github.com/lammps/lammps/archive/patch_8Mar2018.tar.gz -> lammps-patch_8Mar2018.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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_=7879e1d64e3c324a9185d524631d775e
diff --git a/metadata/md5-cache/sci-physics/lammps-20180316 b/metadata/md5-cache/sci-physics/lammps-20180316
index 737af88a8bc6..41ebb63f12f6 100644
--- a/metadata/md5-cache/sci-physics/lammps-20180316
+++ b/metadata/md5-cache/sci-physics/lammps-20180316
@@ -10,5 +10,5 @@ RDEPEND=app-arch/gzip media-libs/libpng:0 sys-libs/zlib mpi? ( virtual/mpi sci-l
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://github.com/lammps/lammps/archive/patch_16Mar2018.tar.gz -> lammps-patch_16Mar2018.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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_=2098503d81e7263e2bb85bf09a1e1cdf
diff --git a/metadata/md5-cache/sci-physics/lammps-20180822 b/metadata/md5-cache/sci-physics/lammps-20180822
index c7a28672e759..5c1c3127942f 100644
--- a/metadata/md5-cache/sci-physics/lammps-20180822
+++ b/metadata/md5-cache/sci-physics/lammps-20180822
@@ -10,5 +10,5 @@ RDEPEND=app-arch/gzip media-libs/libpng:0 sys-libs/zlib mpi? ( virtual/mpi sci-l
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://github.com/lammps/lammps/archive/patch_22Aug2018.tar.gz -> lammps-patch_22Aug2018.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	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_=f2363aa38b8b5b8ca0f5755dd8a2f6fa
diff --git a/metadata/md5-cache/sci-physics/lhapdf-6.1.6 b/metadata/md5-cache/sci-physics/lhapdf-6.1.6
index 736a950b5227..d83a69b2b3e3 100644
--- a/metadata/md5-cache/sci-physics/lhapdf-6.1.6
+++ b/metadata/md5-cache/sci-physics/lhapdf-6.1.6
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:0= python? ( python_targets_python2_7? ( >=dev-lang/pytho
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://www.hepforge.org/archive/lhapdf/LHAPDF-6.1.6.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	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_=70b7c654872d7e1c202a1552b8116d21
diff --git a/metadata/md5-cache/sci-physics/qutip-4.2.0 b/metadata/md5-cache/sci-physics/qutip-4.2.0
index e217d9b689b3..d99faaf0721c 100644
--- a/metadata/md5-cache/sci-physics/qutip-4.2.0
+++ b/metadata/md5-cache/sci-physics/qutip-4.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_5(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/qutip/qutip/archive/v4.2.0.tar.gz -> qutip-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b41fa1f421d692b573b3ab739610d67d
diff --git a/metadata/md5-cache/sci-physics/reduze-2.2 b/metadata/md5-cache/sci-physics/reduze-2.2
index 77fe334d3eaf..1b7b3038f9ee 100644
--- a/metadata/md5-cache/sci-physics/reduze-2.2
+++ b/metadata/md5-cache/sci-physics/reduze-2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sci-mathematics/ginac-1.4.1 berkdb? ( sys-libs/db:6.0[cxx] ) mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=http://reduze.hepforge.org/download/reduze-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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=e96435e2ebcaeb56a393184ebc25aad3
diff --git a/metadata/md5-cache/sci-physics/root-6.12.06-r7 b/metadata/md5-cache/sci-physics/root-6.12.06-r7
index 4d377e43a34a..21c703d3c93d 100644
--- a/metadata/md5-cache/sci-physics/root-6.12.06-r7
+++ b/metadata/md5-cache/sci-physics/root-6.12.06-r7
@@ -10,5 +10,5 @@ RDEPEND=app-arch/lz4 app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-libs/l
 REQUIRED_USE=!X? ( !asimage !opengl !qt5 !tiff ) davix? ( ssl xml ) 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 ) ) qt5? ( root7 ) tmva? ( gsl )
 SLOT=6.12/06
 SRC_URI=https://root.cern/download/root_v6.12.06.source.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=101724bb5f78cfbaab3e93c757c6027f
diff --git a/metadata/md5-cache/sci-physics/root-6.14.04-r3 b/metadata/md5-cache/sci-physics/root-6.14.04-r3
index fdc0bda39953..0479a643d8a3 100644
--- a/metadata/md5-cache/sci-physics/root-6.14.04-r3
+++ b/metadata/md5-cache/sci-physics/root-6.14.04-r3
@@ -10,5 +10,5 @@ RDEPEND=app-arch/lz4 app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-libs/l
 REQUIRED_USE=!X? ( !asimage !opengl !qt5 !tiff ) davix? ( ssl xml ) 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 ) ) qt5? ( root7 ) tmva? ( gsl )
 SLOT=6.14/04
 SRC_URI=https://root.cern/download/root_v6.14.04.source.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1887f04a2497d0d74a9a7c116466bac6
diff --git a/metadata/md5-cache/sci-physics/root-9999 b/metadata/md5-cache/sci-physics/root-9999
index 8dda726f001a..a3ffd74c0911 100644
--- a/metadata/md5-cache/sci-physics/root-9999
+++ b/metadata/md5-cache/sci-physics/root-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA
 RDEPEND=app-arch/lz4 app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-libs/libpcre:3= dev-libs/xxhash media-fonts/dejavu media-libs/freetype:2= media-libs/libpng:0= sys-devel/llvm:5= sys-libs/ncurses:= sys-libs/zlib X? ( x11-libs/libX11:0= x11-libs/libXext:0= x11-libs/libXft:0= x11-libs/libXpm:0= opengl? ( media-libs/ftgl:0= media-libs/glew:0= virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt5? ( dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtwebengine:5= ) ) asimage? ( || ( media-libs/libafterimage[gif,jpeg,png,tiff?] >=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff?] ) ) avahi? ( net-dns/avahi[mdnsresponder-compat] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) davix? ( net-libs/davix ) emacs? ( virtual/emacs ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz:0= ) gsl? ( sci-libs/gsl ) http? ( dev-libs/fcgi:0= ) jemalloc? ( dev-libs/jemalloc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:0= ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mysql? ( virtual/mysql ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6= ) pythia8? ( sci-physics/pythia: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 ) 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(+)?] ) R? ( dev-lang/R ) shadow? ( virtual/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( dev-cpp/tbb ) tmva? ( dev-python/numpy[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(+)?] ) vc? ( dev-libs/vc ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) xinetd? ( sys-apps/xinetd ) fortran? ( virtual/fortran )
 REQUIRED_USE=!X? ( !asimage !opengl !qt5 !tiff ) davix? ( ssl xml ) 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 ) ) qt5? ( root7 ) tmva? ( gsl )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=749e41cfad69ad8818f015901fe0ec76
diff --git a/metadata/md5-cache/sci-physics/sassena-1.4.2 b/metadata/md5-cache/sci-physics/sassena-1.4.2
index e4d96e81f72c..6f0c7d3c8d26 100644
--- a/metadata/md5-cache/sci-physics/sassena-1.4.2
+++ b/metadata/md5-cache/sci-physics/sassena-1.4.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/boost[mpi] sci-libs/hdf5[mpi] dev-libs/libxml2 sci-libs/fftw:3.0 virtual/mpi virtual/blas virtual/lapack
 SLOT=0
 SRC_URI=https://github.com/benlabs/sassena/archive/v1.4.2.tar.gz -> sassena-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7db271ad90c4b04e0048f6c7d25e9eae
diff --git a/metadata/md5-cache/sci-physics/vgm-4.4 b/metadata/md5-cache/sci-physics/vgm-4.4
index 5c05b536c8bb..3e572d7dec00 100644
--- a/metadata/md5-cache/sci-physics/vgm-4.4
+++ b/metadata/md5-cache/sci-physics/vgm-4.4
@@ -10,5 +10,5 @@ RDEPEND=sci-physics/clhep:= root? ( sci-physics/root:=[-root7] ) geant4? ( >=sci
 RESTRICT=!geant4? ( test ) !root? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=http://ivana.home.cern.ch/ivana/vgm.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3c901b54b88c47b2ee84b12516a53c78
diff --git a/metadata/md5-cache/sci-physics/vgm-9999 b/metadata/md5-cache/sci-physics/vgm-9999
index 530abfbcec60..31551e0541f4 100644
--- a/metadata/md5-cache/sci-physics/vgm-9999
+++ b/metadata/md5-cache/sci-physics/vgm-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sci-physics/clhep:= root? ( sci-physics/root:= ) geant4? ( >=sci-physics/geant-4.10.03 )
 RESTRICT=!geant4? ( test ) !root? ( test ) !test? ( test )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e4ab9f87428f9cf828465559f97ae35d
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index 128b40fc0f36..604c7e602230 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/gwyddion-2.44 b/metadata/md5-cache/sci-visualization/gwyddion-2.44
index 510b4d8d2915..4b2accf481a1 100644
--- a/metadata/md5-cache/sci-visualization/gwyddion-2.44
+++ b/metadata/md5-cache/sci-visualization/gwyddion-2.44
@@ -10,5 +10,5 @@ RDEPEND=media-libs/libpng:0 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libXmu x11-l
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://gwyddion.net/download/2.44/gwyddion-2.44.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3383532b90f4814ffbd7c54b01a6c681
diff --git a/metadata/md5-cache/sci-visualization/gwyddion-2.47 b/metadata/md5-cache/sci-visualization/gwyddion-2.47
index 606beabc90c7..c67a95d272bf 100644
--- a/metadata/md5-cache/sci-visualization/gwyddion-2.47
+++ b/metadata/md5-cache/sci-visualization/gwyddion-2.47
@@ -10,5 +10,5 @@ RDEPEND=media-libs/libpng:0= x11-libs/cairo x11-libs/gtk+:2 x11-libs/libXmu x11-
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://gwyddion.net/download/2.47/gwyddion-2.47.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	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_=211e97b907db68a07168d416f2c163ad
diff --git a/metadata/md5-cache/sci-visualization/kst-2.0.8 b/metadata/md5-cache/sci-visualization/kst-2.0.8
index 370b3ff810d1..097792d279bb 100644
--- a/metadata/md5-cache/sci-visualization/kst-2.0.8
+++ b/metadata/md5-cache/sci-visualization/kst-2.0.8
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 d
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/kst/Kst-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b05f0c8c652ced7254a524ced07a0e14
diff --git a/metadata/md5-cache/sci-visualization/labplot-2.5.0 b/metadata/md5-cache/sci-visualization/labplot-2.5.0
index dc75f66da9c0..3e91ddc60584 100644
--- a/metadata/md5-cache/sci-visualization/labplot-2.5.0
+++ b/metadata/md5-cache/sci-visualization/labplot-2.5.0
@@ -8,5 +8,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/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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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-9999 b/metadata/md5-cache/sci-visualization/labplot-9999
index fd2ac23e9811..b62f1162261b 100644
--- a/metadata/md5-cache/sci-visualization/labplot-9999
+++ b/metadata/md5-cache/sci-visualization/labplot-9999
@@ -7,5 +7,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/sci-visualization/mayavi-4.3.0 b/metadata/md5-cache/sci-visualization/mayavi-4.3.0
index 5f0dd4d2e416..398226d5adba 100644
--- a/metadata/md5-cache/sci-visualization/mayavi-4.3.0
+++ b/metadata/md5-cache/sci-visualization/mayavi-4.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/apptools-4[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=2
 SRC_URI=http://www.enthought.com/repo/ets/mayavi-4.3.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=298e1735f6cec243a0e8cc8b5c68238d
diff --git a/metadata/md5-cache/sci-visualization/mayavi-4.5.0 b/metadata/md5-cache/sci-visualization/mayavi-4.5.0
index 6c6c9deb0a3b..246facfa1acc 100644
--- a/metadata/md5-cache/sci-visualization/mayavi-4.5.0
+++ b/metadata/md5-cache/sci-visualization/mayavi-4.5.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/apptools-4[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=2
 SRC_URI=https://github.com/enthought/mayavi/archive/4.5.0.tar.gz -> mayavi-4.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=08eb746eb7347e854d44fe60234f98b4
diff --git a/metadata/md5-cache/sci-visualization/paraview-5.5.2 b/metadata/md5-cache/sci-visualization/paraview-5.5.2
index 60e63225d364..77a29f6bffec 100644
--- a/metadata/md5-cache/sci-visualization/paraview-5.5.2
+++ b/metadata/md5-cache/sci-visualization/paraview-5.5.2
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( mpi python_targets_python2_7 ) mysql? ( sqlite )
 RESTRICT=mirror test
 SLOT=0
 SRC_URI=https://www.paraview.org/files/v5.5/ParaView-v5.5.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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fe1ec1f997d73906529f447c39e8d0b6
diff --git a/metadata/md5-cache/sci-visualization/tensorboard-1.11.0 b/metadata/md5-cache/sci-visualization/tensorboard-1.11.0
deleted file mode 100644
index 3684ff3288b2..000000000000
--- a/metadata/md5-cache/sci-visualization/tensorboard-1.11.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install prepare
-DESCRIPTION=TensorFlow's Visualization Toolkit
-EAPI=7
-HOMEPAGE=https://www.tensorflow.org/
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-PDEPEND=sci-libs/tensorflow[python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-RDEPEND=dev-python/bleach[python_targets_python2_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/html5lib[python_targets_python2_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/markdown[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/protobuf-python[python_targets_python2_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/werkzeug[python_targets_python2_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-futures[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/9b/2f/4d788919b1feef04624d63ed6ea45a49d1d1c834199ec50716edb5d310f4/tensorboard-1.11.0-py3-none-any.whl -> tensorboard-1.11.0.zip
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=6eebe2fb169c8270455ba8ccce47438c
diff --git a/metadata/md5-cache/sci-visualization/tensorboard-1.11.0-r1 b/metadata/md5-cache/sci-visualization/tensorboard-1.11.0-r1
new file mode 100644
index 000000000000..c96d845cbd23
--- /dev/null
+++ b/metadata/md5-cache/sci-visualization/tensorboard-1.11.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install prepare
+DESCRIPTION=TensorFlow's Visualization Toolkit
+EAPI=7
+HOMEPAGE=https://www.tensorflow.org/
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+PDEPEND=sci-libs/tensorflow[python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=dev-python/bleach[python_targets_python2_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/html5lib[python_targets_python2_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/markdown[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/protobuf-python[python_targets_python2_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/werkzeug[python_targets_python2_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/wheel[python_targets_python2_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-futures[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/9b/2f/4d788919b1feef04624d63ed6ea45a49d1d1c834199ec50716edb5d310f4/tensorboard-1.11.0-py3-none-any.whl -> tensorboard-1.11.0.zip
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=f0442ff00d8c0c09445937364b5dd069
diff --git a/metadata/md5-cache/sci-visualization/veusz-3.0 b/metadata/md5-cache/sci-visualization/veusz-3.0
index 5be242c128cb..441f4b557a73 100644
--- a/metadata/md5-cache/sci-visualization/veusz-3.0
+++ b/metadata/md5-cache/sci-visualization/veusz-3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/PyQt5[widgets,svg,printsupport,python_targets_python2_7(-)?,p
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/veusz/veusz/releases/download/veusz-3.0/veusz-3.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2789c839f68c556456fee42989ffb96e
diff --git a/metadata/md5-cache/sci-visualization/veusz-3.0.1 b/metadata/md5-cache/sci-visualization/veusz-3.0.1
index c26bb1e73c96..9a46197645db 100644
--- a/metadata/md5-cache/sci-visualization/veusz-3.0.1
+++ b/metadata/md5-cache/sci-visualization/veusz-3.0.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/PyQt5[widgets,svg,printsupport,python_targets_python2_7(-)?,p
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/veusz/veusz/releases/download/veusz-3.0.1/veusz-3.0.1.tar.gz
-_eclasses_=desktop	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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=898fb564ccbf2c3e7f69da3c0bd939ab
diff --git a/metadata/md5-cache/sci-visualization/visit-2.12.3-r1 b/metadata/md5-cache/sci-visualization/visit-2.12.3-r1
index d08a55b8ce33..20e1a341b961 100644
--- a/metadata/md5-cache/sci-visualization/visit-2.12.3-r1
+++ b/metadata/md5-cache/sci-visualization/visit-2.12.3-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=http://portal.nersc.gov/svn/visit/trunk/releases/2.12.3/visit2.12.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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=82cbd15f9136e865247d18335412aaed
diff --git a/metadata/md5-cache/sci-visualization/yt-3.3.5 b/metadata/md5-cache/sci-visualization/yt-3.3.5
index 8042c20b2219..b06bf86a6b40 100644
--- a/metadata/md5-cache/sci-visualization/yt-3.3.5
+++ b/metadata/md5-cache/sci-visualization/yt-3.3.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/y/yt/yt-3.3.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7a091373b5a074f0976a44a7df6573c0
diff --git a/metadata/md5-cache/sci-visualization/yt-3.4.0 b/metadata/md5-cache/sci-visualization/yt-3.4.0
index 569d530825ee..5bacf294a3b0 100644
--- a/metadata/md5-cache/sci-visualization/yt-3.4.0
+++ b/metadata/md5-cache/sci-visualization/yt-3.4.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/numpy-1.10.4[python_targets_python2_7(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/y/yt/yt-3.4.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1beeac7481015d6766be6590f406488c
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index a9f87c60d0fd..ee9ef4c6219a 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.45 b/metadata/md5-cache/sys-apps/accountsservice-0.6.45
index 5c3943954e96..366acf3de56c 100644
--- a/metadata/md5-cache/sys-apps/accountsservice-0.6.45
+++ b/metadata/md5-cache/sys-apps/accountsservice-0.6.45
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.37.3:2 sys-auth/polkit elogind? ( >=sys-auth/elogind-2
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/accountsservice/accountsservice-0.6.45.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ba456d90027a613b80618b7a71c00bca
diff --git a/metadata/md5-cache/sys-apps/accountsservice-0.6.50 b/metadata/md5-cache/sys-apps/accountsservice-0.6.50
index 5d121eb0c36e..c80a74034079 100644
--- a/metadata/md5-cache/sys-apps/accountsservice-0.6.50
+++ b/metadata/md5-cache/sys-apps/accountsservice-0.6.50
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.44:2 sys-auth/polkit elogind? ( >=sys-auth/elogind-229
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=68823ac81763ea5c5bacada27a473965
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 4a1f1d769ccf..af38f9c854a4 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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=029000aa0ceb15bc0d584fcd24670980
+_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
diff --git a/metadata/md5-cache/sys-apps/baobab-3.24.0 b/metadata/md5-cache/sys-apps/baobab-3.24.0
index 617a4c968ab9..961e0e2066a4 100644
--- a/metadata/md5-cache/sys-apps/baobab-3.24.0
+++ b/metadata/md5-cache/sys-apps/baobab-3.24.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ FDL-1.1+
 RDEPEND=>=dev-libs/glib-2.40:2[dbus] >=x11-libs/gtk+-3.19.1:3 gnome-base/gsettings-desktop-schemas x11-themes/adwaita-icon-theme !<gnome-extra/gnome-utils-3.4
 SLOT=0
 SRC_URI=mirror://gnome/sources/baobab/3.24/baobab-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6b713db40227129ba8ad9f375dd57b12
diff --git a/metadata/md5-cache/sys-apps/baobab-3.26.1 b/metadata/md5-cache/sys-apps/baobab-3.26.1
index 1b14ed0ceeed..3cabf93da20e 100644
--- a/metadata/md5-cache/sys-apps/baobab-3.26.1
+++ b/metadata/md5-cache/sys-apps/baobab-3.26.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ FDL-1.1+
 RDEPEND=>=dev-libs/glib-2.40:2[dbus] >=x11-libs/gtk+-3.19.1:3 gnome-base/gsettings-desktop-schemas x11-themes/adwaita-icon-theme !<gnome-extra/gnome-utils-3.4
 SLOT=0
 SRC_URI=mirror://gnome/sources/baobab/3.26/baobab-3.26.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=11b242cbaf0fae9cab6d7e700097980b
diff --git a/metadata/md5-cache/sys-apps/baselayout-java-0.1.0 b/metadata/md5-cache/sys-apps/baselayout-java-0.1.0
index d76b25c48845..b9d4082af855 100644
--- a/metadata/md5-cache/sys-apps/baselayout-java-0.1.0
+++ b/metadata/md5-cache/sys-apps/baselayout-java-0.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!<dev-java/java-config-2.2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~sera/distfiles/baselayout-java-0.1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=da634a742bfa64f1116272a7da325bff
diff --git a/metadata/md5-cache/sys-apps/bleachbit-2.0 b/metadata/md5-cache/sys-apps/bleachbit-2.0
index b8409b9ad8e5..5d67afdb60db 100644
--- a/metadata/md5-cache/sys-apps/bleachbit-2.0
+++ b/metadata/md5-cache/sys-apps/bleachbit-2.0
@@ -10,5 +10,5 @@ RDEPEND=gtk? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_ta
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/bleachbit/bleachbit/archive/v2.0.tar.gz -> bleachbit-2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f78d82cf4160df8f1d4d474f52b8e5ad
diff --git a/metadata/md5-cache/sys-apps/bolt-0.5 b/metadata/md5-cache/sys-apps/bolt-0.5
new file mode 100644
index 000000000000..d2f3b4e1e2cc
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/bolt-0.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-libs/glib-2.50.0:2 dev-util/glib-utils virtual/libudev virtual/udev dev-util/umockdev sys-auth/polkit[introspection] systemd? ( sys-apps/systemd:0= ) doc? ( app-text/asciidoc ) >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2 virtual/pkgconfig
+DESCRIPTION=Userspace system daemon to enable security levels for Thunderbolt 3.
+EAPI=6
+HOMEPAGE=https://gitlab.freedesktop.org/bolt/bolt
+IUSE=doc systemd
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/glib-2.50.0:2 dev-util/glib-utils virtual/libudev virtual/udev dev-util/umockdev sys-auth/polkit[introspection] systemd? ( sys-apps/systemd:0= ) doc? ( app-text/asciidoc )
+SLOT=0
+SRC_URI=https://gitlab.freedesktop.org/bolt/bolt/-/archive/0.5/bolt-0.5.tar.gz
+_eclasses_=meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=1a19386bcb6dd8bb973ad162dc4df517
diff --git a/metadata/md5-cache/sys-apps/colorized-logs-2.3 b/metadata/md5-cache/sys-apps/colorized-logs-2.3
index 7fa67af44a89..dc712a6d229f 100644
--- a/metadata/md5-cache/sys-apps/colorized-logs-2.3
+++ b/metadata/md5-cache/sys-apps/colorized-logs-2.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/kilobyte/colorized-logs/archive/v2.3.tar.gz -> colorized-logs-2.3.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f6cf3f8cf8f5217b8551d061982239f8
diff --git a/metadata/md5-cache/sys-apps/colorized-logs-2.4 b/metadata/md5-cache/sys-apps/colorized-logs-2.4
index 8aa57ea98ac4..5b6f59c5d8f0 100644
--- a/metadata/md5-cache/sys-apps/colorized-logs-2.4
+++ b/metadata/md5-cache/sys-apps/colorized-logs-2.4
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/kilobyte/colorized-logs/archive/v2.4.tar.gz -> colorized-logs-2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=488f8c68930e6b3aac33edd33986b326
diff --git a/metadata/md5-cache/sys-apps/cpint-2.5.3 b/metadata/md5-cache/sys-apps/cpint-2.5.3
index 787e0197e448..d864d477613d 100644
--- a/metadata/md5-cache/sys-apps/cpint-2.5.3
+++ b/metadata/md5-cache/sys-apps/cpint-2.5.3
@@ -7,5 +7,5 @@ KEYWORDS=s390
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://linuxvm.org/Patches/s390/cpint253.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=589d164a1df20bbb01bcd256e0405dee
diff --git a/metadata/md5-cache/sys-apps/crazydiskinfo-1.0.2 b/metadata/md5-cache/sys-apps/crazydiskinfo-1.0.2
index be6b6faba787..ed506ac0a4f7 100644
--- a/metadata/md5-cache/sys-apps/crazydiskinfo-1.0.2
+++ b/metadata/md5-cache/sys-apps/crazydiskinfo-1.0.2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/libatasmart:0= sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=https://github.com/otakuto/crazydiskinfo/archive/1.0.2.tar.gz -> crazydiskinfo-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7b46318b3f3395873cca8cf51357a74c
diff --git a/metadata/md5-cache/sys-apps/daemonize-1.7.5 b/metadata/md5-cache/sys-apps/daemonize-1.7.5
deleted file mode 100644
index f260c6624cac..000000000000
--- a/metadata/md5-cache/sys-apps/daemonize-1.7.5
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=prepare unpack
-DESCRIPTION=Runs a command as a Unix daemon
-EAPI=5
-HOMEPAGE=https://bmc.github.com/daemonize/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/bmc/daemonize/tarball/release-1.7.5 -> daemonize-1.7.5.tar.gz
-_md5_=d5d72253dc6a22b8495b9fef7019db4e
diff --git a/metadata/md5-cache/sys-apps/daemonize-1.7.6 b/metadata/md5-cache/sys-apps/daemonize-1.7.6
deleted file mode 100644
index ecb34163f827..000000000000
--- a/metadata/md5-cache/sys-apps/daemonize-1.7.6
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=prepare unpack
-DESCRIPTION=Runs a command as a Unix daemon
-EAPI=5
-HOMEPAGE=https://bmc.github.com/daemonize/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/bmc/daemonize/tarball/release-1.7.6 -> daemonize-1.7.6.tar.gz
-_md5_=40c5840dc033a93bb12484ad039dc173
diff --git a/metadata/md5-cache/sys-apps/daemonize-1.7.8 b/metadata/md5-cache/sys-apps/daemonize-1.7.8
new file mode 100644
index 000000000000..4282deefa295
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/daemonize-1.7.8
@@ -0,0 +1,9 @@
+DEFINED_PHASES=prepare
+DESCRIPTION=Runs a command as a Unix daemon
+EAPI=7
+HOMEPAGE=https://bmc.github.com/daemonize/
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://github.com/bmc/daemonize/archive/release-1.7.8.tar.gz -> daemonize-1.7.8.tar.gz
+_md5_=18e016804245fe1c1b4e65f63fa9cc43
diff --git a/metadata/md5-cache/sys-apps/dbus-1.10.18 b/metadata/md5-cache/sys-apps/dbus-1.10.18
index a0db9371e307..678bb49311e3 100644
--- a/metadata/md5-cache/sys-apps/dbus-1.10.18
+++ b/metadata/md5-cache/sys-apps/dbus-1.10.18
@@ -11,5 +11,5 @@ REQUIRED_USE=?? ( elogind systemd )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dbus.freedesktop.org/releases/dbus/dbus-1.10.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	915cae3d7d636732918d18827fb1c226	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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=abb7ae14ccb37471b3f3ed03fbef56d8
diff --git a/metadata/md5-cache/sys-apps/dbus-1.10.24 b/metadata/md5-cache/sys-apps/dbus-1.10.24
index 1e5eb9601726..8086f397a0f3 100644
--- a/metadata/md5-cache/sys-apps/dbus-1.10.24
+++ b/metadata/md5-cache/sys-apps/dbus-1.10.24
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/expat-2 selinux? ( sys-libs/libselinux ) elogind? ( sys-auth/
 REQUIRED_USE=?? ( elogind systemd ) test? ( debug )
 SLOT=0
 SRC_URI=https://dbus.freedesktop.org/releases/dbus/dbus-1.10.24.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=1200f8a54deab113f7ed4d7f35ac7880
diff --git a/metadata/md5-cache/sys-apps/dbus-1.12.10 b/metadata/md5-cache/sys-apps/dbus-1.12.10
index 739a39e1afa5..3c422134a243 100644
--- a/metadata/md5-cache/sys-apps/dbus-1.12.10
+++ b/metadata/md5-cache/sys-apps/dbus-1.12.10
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/expat-2.1.0 selinux? ( sys-libs/libselinux ) elogind? ( sys-a
 REQUIRED_USE=?? ( elogind systemd ) test? ( debug )
 SLOT=0
 SRC_URI=https://dbus.freedesktop.org/releases/dbus/dbus-1.12.10.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=b181b721e86a3466093899fb333e75c0
diff --git a/metadata/md5-cache/sys-apps/dbus-1.12.8 b/metadata/md5-cache/sys-apps/dbus-1.12.8
index b64edfdf3235..46fe664d1874 100644
--- a/metadata/md5-cache/sys-apps/dbus-1.12.8
+++ b/metadata/md5-cache/sys-apps/dbus-1.12.8
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/expat-2.1.0 selinux? ( sys-libs/libselinux ) elogind? ( sys-a
 REQUIRED_USE=?? ( elogind systemd ) test? ( debug )
 SLOT=0
 SRC_URI=https://dbus.freedesktop.org/releases/dbus/dbus-1.12.8.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
 _md5_=eebdcf57fd0f171fef0c487ca2a978b9
diff --git a/metadata/md5-cache/sys-apps/elivepatch-client-0.1 b/metadata/md5-cache/sys-apps/elivepatch-client-0.1
index bbb2d057a1e5..3758c10d30c9 100644
--- a/metadata/md5-cache/sys-apps/elivepatch-client-0.1
+++ b/metadata/md5-cache/sys-apps/elivepatch-client-0.1
@@ -10,5 +10,5 @@ RDEPEND=app-admin/sudo dev-python/git-python[python_targets_python2_7(-)?,python
 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/aliceinwire/elivepatch-client/archive/v0.1.tar.gz -> elivepatch-client-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8270f7fe385144cd532175531113eb29
diff --git a/metadata/md5-cache/sys-apps/elivepatch-client-9999 b/metadata/md5-cache/sys-apps/elivepatch-client-9999
index c1d6f596d1b5..044daa820b9a 100644
--- a/metadata/md5-cache/sys-apps/elivepatch-client-9999
+++ b/metadata/md5-cache/sys-apps/elivepatch-client-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=app-admin/sudo dev-python/git-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/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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=fb5eb7058eeee1b927bf5bb2e6f99793
diff --git a/metadata/md5-cache/sys-apps/elivepatch-server-0.1 b/metadata/md5-cache/sys-apps/elivepatch-server-0.1
index 643fa1a116a9..201e2bdcd45f 100644
--- a/metadata/md5-cache/sys-apps/elivepatch-server-0.1
+++ b/metadata/md5-cache/sys-apps/elivepatch-server-0.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/werkzeug[python_targets_python2_7(-)?,python_targets_python3_
 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/aliceinwire/elivepatch-server/archive/v0.1.tar.gz -> elivepatch-server-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3905262b917ff3fbd01c9754c1a6177c
diff --git a/metadata/md5-cache/sys-apps/elivepatch-server-9999 b/metadata/md5-cache/sys-apps/elivepatch-server-9999
index 98d21729adb2..791b2db3be34 100644
--- a/metadata/md5-cache/sys-apps/elivepatch-server-9999
+++ b/metadata/md5-cache/sys-apps/elivepatch-server-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=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(-)] 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/flask-restful[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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-kernel/kpatch-9999 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=a3ca248302b3576ac580d86b9dbe9d4b
diff --git a/metadata/md5-cache/sys-apps/epoch-1.2.1 b/metadata/md5-cache/sys-apps/epoch-1.2.1
index 25ff9c6cdc8e..263211fe5efc 100644
--- a/metadata/md5-cache/sys-apps/epoch-1.2.1
+++ b/metadata/md5-cache/sys-apps/epoch-1.2.1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 arm x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://github.com/Subsentient/epoch/archive/1.2.1.tar.gz -> epoch-1.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5fea1830758f5febb11a326375cf9be1
diff --git a/metadata/md5-cache/sys-apps/epoch-1.2.2 b/metadata/md5-cache/sys-apps/epoch-1.2.2
index 32ec21b541ed..c943aeb42575 100644
--- a/metadata/md5-cache/sys-apps/epoch-1.2.2
+++ b/metadata/md5-cache/sys-apps/epoch-1.2.2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://universe2.us/epoch_1.2.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=31240e0ce49184593638d7b665d3e575
diff --git a/metadata/md5-cache/sys-apps/epoch-1.3.0 b/metadata/md5-cache/sys-apps/epoch-1.3.0
index 2f46b814ddd4..cf8cca19b1d2 100644
--- a/metadata/md5-cache/sys-apps/epoch-1.3.0
+++ b/metadata/md5-cache/sys-apps/epoch-1.3.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://universe2.us/epoch_1.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5d697b59558ef3e8d372d934bb32b199
diff --git a/metadata/md5-cache/sys-apps/epoch-9999 b/metadata/md5-cache/sys-apps/epoch-9999
index b16e311b28bc..bd1a79ef5242 100644
--- a/metadata/md5-cache/sys-apps/epoch-9999
+++ b/metadata/md5-cache/sys-apps/epoch-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://universe2.us/epoch.html
 IUSE=kernel_linux
 LICENSE=public-domain
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9777a19eccfc7cd26e5fb4d654c919b7
diff --git a/metadata/md5-cache/sys-apps/etckeeper-1.18.6 b/metadata/md5-cache/sys-apps/etckeeper-1.18.6
index 428cc42711b0..c231b866e82a 100644
--- a/metadata/md5-cache/sys-apps/etckeeper-1.18.6
+++ b/metadata/md5-cache/sys-apps/etckeeper-1.18.6
@@ -4,11 +4,11 @@ DESCRIPTION=A collection of tools to let /etc be stored in a repository
 EAPI=6
 HOMEPAGE=https://etckeeper.branchable.com/
 IUSE=bazaar cron python_targets_python2_7
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 ~arm ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=bazaar? ( dev-vcs/bzr ) 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 ) )
 SLOT=0
 SRC_URI=https://github.com/joeyh/etckeeper/archive/1.18.6.tar.gz -> etckeeper-1.18.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cc2071007ff30758f2a6e9731b6be32a
+_md5_=5fec74fb4a4995fafa4f72132d2f12c8
diff --git a/metadata/md5-cache/sys-apps/etckeeper-1.18.6-r1 b/metadata/md5-cache/sys-apps/etckeeper-1.18.6-r1
index 108f0e0278e2..d84cb42694ff 100644
--- a/metadata/md5-cache/sys-apps/etckeeper-1.18.6-r1
+++ b/metadata/md5-cache/sys-apps/etckeeper-1.18.6-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A collection of tools to let /etc be stored in a repository
 EAPI=6
 HOMEPAGE=https://etckeeper.branchable.com/
 IUSE=bazaar cron python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
+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 ) )
 SLOT=0
 SRC_URI=https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/etckeeper-1.18.6.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=78e2df8260daf8a2ef0a38e1b71a76dc
+_md5_=a8cc79b38ced3a856f8fb853ce41f7ca
diff --git a/metadata/md5-cache/sys-apps/etckeeper-1.18.7 b/metadata/md5-cache/sys-apps/etckeeper-1.18.7
index 8241206f6a93..aa66e4de8736 100644
--- a/metadata/md5-cache/sys-apps/etckeeper-1.18.7
+++ b/metadata/md5-cache/sys-apps/etckeeper-1.18.7
@@ -1,10 +1,10 @@
-DEFINED_PHASES=compile install postinst
+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 ~x86
+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 ) )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/etckeeper-1.18.7.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=f286bfd833e40a7ea45f1adc07476d55
+_md5_=59cace3217701a2452b8a3b2cab27719
diff --git a/metadata/md5-cache/sys-apps/file-5.33-r4 b/metadata/md5-cache/sys-apps/file-5.33-r4
index e99d64fb8e8a..0e673a308edc 100644
--- a/metadata/md5-cache/sys-apps/file-5.33-r4
+++ b/metadata/md5-cache/sys-apps/file-5.33-r4
@@ -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
 SRC_URI=ftp://ftp.astron.com/pub/file/file-5.33.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cecfbfb13d1c572c49b8a3230f20d970
diff --git a/metadata/md5-cache/sys-apps/file-5.34 b/metadata/md5-cache/sys-apps/file-5.34
index 18509e02d699..01d2cde6a98a 100644
--- a/metadata/md5-cache/sys-apps/file-5.34
+++ b/metadata/md5-cache/sys-apps/file-5.34
@@ -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
 SRC_URI=ftp://ftp.astron.com/pub/file/file-5.34.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=eddde94a2690018eabb6355e79fdd9ca
diff --git a/metadata/md5-cache/sys-apps/file-9999 b/metadata/md5-cache/sys-apps/file-9999
index 0e41b50ad5c0..5ca2d127d6a0 100644
--- a/metadata/md5-cache/sys-apps/file-9999
+++ b/metadata/md5-cache/sys-apps/file-9999
@@ -8,5 +8,5 @@ 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 ) seccomp? ( sys-libs/libseccomp[abi_x86_32(-)?,abi_x86_64(-)?,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=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
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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_=1e792e2f2f6e11422a7c755924c17df3
diff --git a/metadata/md5-cache/sys-apps/frandom-1.1 b/metadata/md5-cache/sys-apps/frandom-1.1
index fbeba1d1f263..99c3a973702f 100644
--- a/metadata/md5-cache/sys-apps/frandom-1.1
+++ b/metadata/md5-cache/sys-apps/frandom-1.1
@@ -10,5 +10,5 @@ RDEPEND=kernel_linux? ( virtual/modutils )
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/project/frandom//frandom-1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=de0d164228bb386ad341920090146e2f
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.1.1-r1 b/metadata/md5-cache/sys-apps/fwupd-1.1.1-r1
index ecae6f4e1e6d..c749f5ea929f 100644
--- a/metadata/md5-cache/sys-apps/fwupd-1.1.1-r1
+++ b/metadata/md5-cache/sys-apps/fwupd-1.1.1-r1
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) 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	89bb9f083a2590d9b447fd0b78a96186
+_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.2-r1 b/metadata/md5-cache/sys-apps/fwupd-1.1.2-r1
index aebe0bf26074..a12994149a47 100644
--- a/metadata/md5-cache/sys-apps/fwupd-1.1.2-r1
+++ b/metadata/md5-cache/sys-apps/fwupd-1.1.2-r1
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) dell? ( uefi )
 SLOT=0
 SRC_URI=https://github.com/hughsie/fwupd/archive/1.1.2.tar.gz -> fwupd-1.1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7d61458347cef269907fc40a32ee3c14
diff --git a/metadata/md5-cache/sys-apps/gcp-0.1.3 b/metadata/md5-cache/sys-apps/gcp-0.1.3
index 874f7f70f3b8..0294b9aab4cc 100644
--- a/metadata/md5-cache/sys-apps/gcp-0.1.3
+++ b/metadata/md5-cache/sys-apps/gcp-0.1.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/progressbar[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=ftp://ftp.goffi.org/gcp/gcp-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=20230da21845c1c1277ff0e6dbe75c95
diff --git a/metadata/md5-cache/sys-apps/gnome-disk-utility-3.24.1 b/metadata/md5-cache/sys-apps/gnome-disk-utility-3.24.1
index 2aaacb86f6d2..17f4aab17219 100644
--- a/metadata/md5-cache/sys-apps/gnome-disk-utility-3.24.1
+++ b/metadata/md5-cache/sys-apps/gnome-disk-utility-3.24.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-arch/xz-utils-5.0.5 >=app-crypt/libsecret-0.7 >=dev-libs/glib-2.31:2[dbus] dev-libs/libpwquality >=media-libs/libcanberra-0.1[gtk3] >=media-libs/libdvdread-4.2.0 >=sys-fs/udisks-2.1.1:2 >=x11-libs/gtk+-3.16.0:3 >=x11-libs/libnotify-0.7:= systemd? ( >=sys-apps/systemd-209:0= ) x11-themes/adwaita-icon-theme fat? ( sys-fs/dosfstools ) gnome? ( >=gnome-base/gnome-settings-daemon-3.8 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-disk-utility/3.24/gnome-disk-utility-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ac1c9edd77c4c9a9c36240aad0d48f72
diff --git a/metadata/md5-cache/sys-apps/gptfdisk-1.0.3 b/metadata/md5-cache/sys-apps/gptfdisk-1.0.3
index e4f89e060be2..128683314b93 100644
--- a/metadata/md5-cache/sys-apps/gptfdisk-1.0.3
+++ b/metadata/md5-cache/sys-apps/gptfdisk-1.0.3
@@ -4,10 +4,10 @@ DESCRIPTION=GPT partition table manipulator for Linux
 EAPI=6
 HOMEPAGE=https://www.rodsbooks.com/gdisk/
 IUSE=kernel_linux ncurses static
-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=GPL-2
 RDEPEND=!static? ( dev-libs/popt ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode] ) kernel_linux? ( sys-apps/util-linux ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/gptfdisk/gptfdisk-1.0.3.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_=993f7a59dc7fedd3d540d7d7a3dd9ef9
+_md5_=7292a27a69693e1101f1eb7b1a335f92
diff --git a/metadata/md5-cache/sys-apps/gptfdisk-1.0.4 b/metadata/md5-cache/sys-apps/gptfdisk-1.0.4
index 0f16a2a898bb..094154d62854 100644
--- a/metadata/md5-cache/sys-apps/gptfdisk-1.0.4
+++ b/metadata/md5-cache/sys-apps/gptfdisk-1.0.4
@@ -4,10 +4,10 @@ DESCRIPTION=GPT partition table manipulator for Linux
 EAPI=7
 HOMEPAGE=https://www.rodsbooks.com/gdisk/
 IUSE=kernel_linux ncurses static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~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=GPL-2
 RDEPEND=!static? ( dev-libs/popt ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode] ) kernel_linux? ( sys-apps/util-linux ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/gptfdisk/gptfdisk-1.0.4.tar.gz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=e0b71e95e910f5a60e89adc4aa6ba332
+_md5_=e909258a9830d0593920af8bc9004096
diff --git a/metadata/md5-cache/sys-apps/grep-3.1 b/metadata/md5-cache/sys-apps/grep-3.1
index 933d8e0190eb..bc1ecaf72f1a 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_=dd3a7b6f2e94893840c592c247421f0e
+_md5_=c1c596bd9a0faee48fa81cca78d5dcaa
diff --git a/metadata/md5-cache/sys-apps/gsmartcontrol-1.0.2 b/metadata/md5-cache/sys-apps/gsmartcontrol-1.0.2
index 99dffdead9e0..6fc6199f995f 100644
--- a/metadata/md5-cache/sys-apps/gsmartcontrol-1.0.2
+++ b/metadata/md5-cache/sys-apps/gsmartcontrol-1.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 GPL-3 ) Boost-1.0 BSD Unlicense ZLIB
 RDEPEND=dev-cpp/gtkmm:3.0 dev-libs/libpcre:3 sys-apps/smartmontools x11-apps/xmessage
 SLOT=0
 SRC_URI=mirror://sourceforge/gsmartcontrol/gsmartcontrol-1.0.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e60d8cbd7421e4494b76a37135f8e4d4
diff --git a/metadata/md5-cache/sys-apps/gsmartcontrol-1.1.1 b/metadata/md5-cache/sys-apps/gsmartcontrol-1.1.1
deleted file mode 100644
index e0317c25c129..000000000000
--- a/metadata/md5-cache/sys-apps/gsmartcontrol-1.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=dev-cpp/gtkmm:3.0 dev-libs/libpcre:3 sys-apps/smartmontools virtual/pkgconfig test? ( dev-util/gtk-builder-convert ) >=sys-apps/sed-4
-DESCRIPTION=Hard disk drive health inspection tool
-EAPI=6
-HOMEPAGE=https://gsmartcontrol.sourceforge.io/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 ) Boost-1.0 BSD Unlicense ZLIB
-RDEPEND=dev-cpp/gtkmm:3.0 dev-libs/libpcre:3 sys-apps/smartmontools x11-apps/xmessage
-SLOT=0
-SRC_URI=mirror://sourceforge/gsmartcontrol/gsmartcontrol-1.1.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=7a45074f016164e9616db59aeb09ad9d
diff --git a/metadata/md5-cache/sys-apps/gsmartcontrol-1.1.3 b/metadata/md5-cache/sys-apps/gsmartcontrol-1.1.3
index f2845f4c2d0e..1d2484c3f56e 100644
--- a/metadata/md5-cache/sys-apps/gsmartcontrol-1.1.3
+++ b/metadata/md5-cache/sys-apps/gsmartcontrol-1.1.3
@@ -4,10 +4,10 @@ DESCRIPTION=Hard disk drive health inspection tool
 EAPI=6
 HOMEPAGE=https://gsmartcontrol.sourceforge.io/
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( GPL-2 GPL-3 ) Boost-1.0 BSD Unlicense ZLIB
 RDEPEND=dev-cpp/gtkmm:3.0 dev-libs/libpcre:3 sys-apps/smartmontools x11-apps/xmessage
 SLOT=0
 SRC_URI=mirror://sourceforge/gsmartcontrol/gsmartcontrol-1.1.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=7a45074f016164e9616db59aeb09ad9d
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4fd8c4bdbf8068f85133ce01a9c4b4c3
diff --git a/metadata/md5-cache/sys-apps/hd-idle-1.05 b/metadata/md5-cache/sys-apps/hd-idle-1.05
index d325926a3717..1ce4294a9cf6 100644
--- a/metadata/md5-cache/sys-apps/hd-idle-1.05
+++ b/metadata/md5-cache/sys-apps/hd-idle-1.05
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/hd-idle/hd-idle-1.05.tgz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=56aa1015a549f1509f4efc028b8dca57
diff --git a/metadata/md5-cache/sys-apps/help2man-1.47.6 b/metadata/md5-cache/sys-apps/help2man-1.47.6
index d6b67233e340..88c471586f37 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_=da1b85546b3923dd26530fee168f7971
+_md5_=d9de3f2b16b2072305bc6635c7dfd62c
diff --git a/metadata/md5-cache/sys-apps/i2c-tools-3.1.1-r1 b/metadata/md5-cache/sys-apps/i2c-tools-3.1.1-r1
index 305be2a40a1c..7cd848cc14b0 100644
--- a/metadata/md5-cache/sys-apps/i2c-tools-3.1.1-r1
+++ b/metadata/md5-cache/sys-apps/i2c-tools-3.1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=!<sys-apps/lm_sensors-3 python? ( python_targets_python2_7? ( >=dev-lang
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=http://dl.lm-sensors.org/i2c-tools/releases/i2c-tools-3.1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b9ac449e2ff7fafbb3be7879d47eaac9
diff --git a/metadata/md5-cache/sys-apps/i2c-tools-4.0 b/metadata/md5-cache/sys-apps/i2c-tools-4.0
index 5a42c67348ed..26092089b734 100644
--- a/metadata/md5-cache/sys-apps/i2c-tools-4.0
+++ b/metadata/md5-cache/sys-apps/i2c-tools-4.0
@@ -10,5 +10,5 @@ RDEPEND=!<sys-apps/lm_sensors-3 python? ( python_targets_python2_7? ( >=dev-lang
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/utils/i2c-tools/i2c-tools-4.0.tar.xz
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=32f86b1e459b8e1b81a89bc9a3dd02a3
diff --git a/metadata/md5-cache/sys-apps/iproute2-4.17.0 b/metadata/md5-cache/sys-apps/iproute2-4.17.0
index abfa2f1be22d..082247423a5f 100644
--- a/metadata/md5-cache/sys-apps/iproute2-4.17.0
+++ b/metadata/md5-cache/sys-apps/iproute2-4.17.0
@@ -4,10 +4,10 @@ DESCRIPTION=kernel routing and traffic control utilities
 EAPI=6
 HOMEPAGE=https://wiki.linuxfoundation.org/networking/iproute2
 IUSE=atm berkdb elf +iptables ipv6 minimal selinux
-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
 RDEPEND=!net-misc/arpd !minimal? ( net-libs/libmnl ) elf? ( virtual/libelf ) iptables? ( >=net-firewall/iptables-1.4.20:= ) berkdb? ( sys-libs/db:= ) atm? ( net-dialup/linux-atm ) selinux? ( sys-libs/libselinux )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/net/iproute2/iproute2-4.17.0.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_=45ef889c87472f220b33d1768b72aa4e
+_md5_=5a3b98201b77b8c00fc0088505ce2ba0
diff --git a/metadata/md5-cache/sys-apps/irqbalance-1.3.0 b/metadata/md5-cache/sys-apps/irqbalance-1.3.0
index f8bf8d69c900..92047e70bb01 100644
--- a/metadata/md5-cache/sys-apps/irqbalance-1.3.0
+++ b/metadata/md5-cache/sys-apps/irqbalance-1.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 sys-libs/ncurses:0=[unicode] caps? ( sys-libs/libcap-ng ) numa? ( sys-process/numactl ) selinux? ( sec-policy/selinux-irqbalance )
 SLOT=0
 SRC_URI=https://github.com/Irqbalance/irqbalance/archive/v1.3.0.tar.gz -> irqbalance-1.3.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=8456b2a0f64e4a0bb61c4aecd33891c7
diff --git a/metadata/md5-cache/sys-apps/irqbalance-1.4.0-r1 b/metadata/md5-cache/sys-apps/irqbalance-1.4.0-r1
index f0d9fe6d85aa..44920f97c606 100644
--- a/metadata/md5-cache/sys-apps/irqbalance-1.4.0-r1
+++ b/metadata/md5-cache/sys-apps/irqbalance-1.4.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 caps? ( sys-libs/libcap-ng ) numa? ( sys-process/numactl ) tui? ( sys-libs/ncurses:0=[unicode] ) selinux? ( sec-policy/selinux-irqbalance )
 SLOT=0
 SRC_URI=https://github.com/Irqbalance/irqbalance/archive/v1.4.0.tar.gz -> irqbalance-1.4.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=1aee4b027c8f1b4a4d485a30d403d113
diff --git a/metadata/md5-cache/sys-apps/kcheck-0.0.2 b/metadata/md5-cache/sys-apps/kcheck-0.0.2
index 3ff9dcb4fe47..649b2e4989a9 100644
--- a/metadata/md5-cache/sys-apps/kcheck-0.0.2
+++ b/metadata/md5-cache/sys-apps/kcheck-0.0.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/configargparse[python_targets_python3_4(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/wraeth/kcheck/archive/0.0.2.tar.gz -> kcheck-0.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b4995556ae00fe4b9bbabf9892352466
diff --git a/metadata/md5-cache/sys-apps/kcheck-9999 b/metadata/md5-cache/sys-apps/kcheck-9999
index 3abeb4061971..645f0c539359 100644
--- a/metadata/md5-cache/sys-apps/kcheck-9999
+++ b/metadata/md5-cache/sys-apps/kcheck-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-python/configargparse[python_targets_python3_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_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=b4995556ae00fe4b9bbabf9892352466
diff --git a/metadata/md5-cache/sys-apps/kexec-tools-2.0.14 b/metadata/md5-cache/sys-apps/kexec-tools-2.0.14
index 309951090ca6..5031547b91c4 100644
--- a/metadata/md5-cache/sys-apps/kexec-tools-2.0.14
+++ b/metadata/md5-cache/sys-apps/kexec-tools-2.0.14
@@ -10,5 +10,5 @@ RDEPEND=lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=lzma? ( zlib )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/kexec/kexec-tools-2.0.14.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=184d1347ae06d826dc05b9a970d55673
diff --git a/metadata/md5-cache/sys-apps/kexec-tools-2.0.16 b/metadata/md5-cache/sys-apps/kexec-tools-2.0.16
index 306484d533ff..673e20fc1a14 100644
--- a/metadata/md5-cache/sys-apps/kexec-tools-2.0.16
+++ b/metadata/md5-cache/sys-apps/kexec-tools-2.0.16
@@ -10,5 +10,5 @@ RDEPEND=lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=lzma? ( zlib )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/kexec/kexec-tools-2.0.16.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=224d9b9e43bc7b263f1518053738133a
diff --git a/metadata/md5-cache/sys-apps/kexec-tools-2.0.17 b/metadata/md5-cache/sys-apps/kexec-tools-2.0.17
index 19810f73df14..30d373b62ec8 100644
--- a/metadata/md5-cache/sys-apps/kexec-tools-2.0.17
+++ b/metadata/md5-cache/sys-apps/kexec-tools-2.0.17
@@ -10,5 +10,5 @@ RDEPEND=lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=lzma? ( zlib )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/kexec/kexec-tools-2.0.17.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=74771ea9079dbda966b469f947762fcd
diff --git a/metadata/md5-cache/sys-apps/kexec-tools-2.0.17-r1 b/metadata/md5-cache/sys-apps/kexec-tools-2.0.17-r1
index cb09f985a892..4d39ccbe40d3 100644
--- a/metadata/md5-cache/sys-apps/kexec-tools-2.0.17-r1
+++ b/metadata/md5-cache/sys-apps/kexec-tools-2.0.17-r1
@@ -10,5 +10,5 @@ RDEPEND=lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=lzma? ( zlib )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/kexec/kexec-tools-2.0.17.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f362ccea6cb865b5cdd810a7e5a7135b
diff --git a/metadata/md5-cache/sys-apps/kexec-tools-9999 b/metadata/md5-cache/sys-apps/kexec-tools-9999
index 6fdbc110957a..38882383f873 100644
--- a/metadata/md5-cache/sys-apps/kexec-tools-9999
+++ b/metadata/md5-cache/sys-apps/kexec-tools-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=lzma? ( zlib )
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	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	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=74771ea9079dbda966b469f947762fcd
diff --git a/metadata/md5-cache/sys-apps/keyutils-1.5.10-r1 b/metadata/md5-cache/sys-apps/keyutils-1.5.10-r1
index 9502b9db3223..d42b5f0e9e13 100644
--- a/metadata/md5-cache/sys-apps/keyutils-1.5.10-r1
+++ b/metadata/md5-cache/sys-apps/keyutils-1.5.10-r1
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=GPL-2 LGPL-2.1
 SLOT=0/1.6
 SRC_URI=https://people.redhat.com/dhowells/keyutils/keyutils-1.5.10.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5f3d4f0ea18e5dae4bd898f2900c0a97
diff --git a/metadata/md5-cache/sys-apps/keyutils-1.5.11-r1 b/metadata/md5-cache/sys-apps/keyutils-1.5.11-r1
index 1fcf494308fb..469d2a9e9fcb 100644
--- a/metadata/md5-cache/sys-apps/keyutils-1.5.11-r1
+++ b/metadata/md5-cache/sys-apps/keyutils-1.5.11-r1
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=GPL-2 LGPL-2.1
 SLOT=0/1.7
 SRC_URI=https://people.redhat.com/dhowells/keyutils/keyutils-1.5.11.tar.bz2
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=b600c23f0a27cda091562639e506d868
diff --git a/metadata/md5-cache/sys-apps/keyutils-1.5.9-r4 b/metadata/md5-cache/sys-apps/keyutils-1.5.9-r4
index 3b1d1029e00d..fbe09ba10565 100644
--- a/metadata/md5-cache/sys-apps/keyutils-1.5.9-r4
+++ b/metadata/md5-cache/sys-apps/keyutils-1.5.9-r4
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=GPL-2 LGPL-2.1
 SLOT=0
 SRC_URI=https://people.redhat.com/dhowells/keyutils/keyutils-1.5.9.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=991ebd47d1cff161133d2b71925e9270
diff --git a/metadata/md5-cache/sys-apps/lcdtest-1.18 b/metadata/md5-cache/sys-apps/lcdtest-1.18
index 0bb56e9e2f23..06c43e2a286e 100644
--- a/metadata/md5-cache/sys-apps/lcdtest-1.18
+++ b/metadata/md5-cache/sys-apps/lcdtest-1.18
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=media-libs/libsdl-1.2.7-r2[X,video] >=media-libs/sdl-image-1.2.3-r1 >=media-libs/sdl-ttf-2.0.9 media-fonts/liberation-fonts
 SLOT=0
 SRC_URI=http://www.brouhaha.com/~eric/software/lcdtest/download/lcdtest-1.18.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2868fafe721490d7e4e45a8675d9580c
diff --git a/metadata/md5-cache/sys-apps/likwid-4.1.1 b/metadata/md5-cache/sys-apps/likwid-4.1.1
index 390abdb2e8d0..dd89761a0fe0 100644
--- a/metadata/md5-cache/sys-apps/likwid-4.1.1
+++ b/metadata/md5-cache/sys-apps/likwid-4.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-lang/perl fortran? ( virtual/fortran )
 SLOT=0
 SRC_URI=https://github.com/RRZE-HPC/likwid/archive/likwid-4.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	fortran-2	68fcf50e02640de6eb5698ea038d9537	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	fortran-2	68fcf50e02640de6eb5698ea038d9537	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8136877429c476e0249fcf570c8660d2
diff --git a/metadata/md5-cache/sys-apps/likwid-4.1.2 b/metadata/md5-cache/sys-apps/likwid-4.1.2
index fc7993edefe7..b357b2d40fbf 100644
--- a/metadata/md5-cache/sys-apps/likwid-4.1.2
+++ b/metadata/md5-cache/sys-apps/likwid-4.1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-lang/perl fortran? ( virtual/fortran )
 SLOT=0
 SRC_URI=https://ftp.fau.de/pub/likwid/likwid-4.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	fortran-2	68fcf50e02640de6eb5698ea038d9537	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	fortran-2	68fcf50e02640de6eb5698ea038d9537	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6f26e29b2c13d7d52d4ff0d5d9acddf6
diff --git a/metadata/md5-cache/sys-apps/linux-misc-apps-3.18 b/metadata/md5-cache/sys-apps/linux-misc-apps-3.18
index 0be37b48ee9a..85b3b255f735 100644
--- a/metadata/md5-cache/sys-apps/linux-misc-apps-3.18
+++ b/metadata/md5-cache/sys-apps/linux-misc-apps-3.18
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/hwids >=dev-libs/glib-2.6 tcpd? ( sys-apps/tcp-wrappers ) !sys-power/pmtools
 SLOT=0
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=e15f88f61849333f33ec5bdf97d03c51
diff --git a/metadata/md5-cache/sys-apps/linux-misc-apps-3.6-r2 b/metadata/md5-cache/sys-apps/linux-misc-apps-3.6-r2
index 2efafbc9bd22..5b120d436065 100644
--- a/metadata/md5-cache/sys-apps/linux-misc-apps-3.6-r2
+++ b/metadata/md5-cache/sys-apps/linux-misc-apps-3.6-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/hwids >=sys-fs/sysfsutils-2 >=dev-libs/glib-2.6 tcpd? ( sys-apps/tcp-wrappers ) !sys-power/pmtools !net-misc/usbip
 SLOT=0
 SRC_URI=mirror://kernel/linux/kernel/v3.6/linux-3.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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=2076bbf77a231a4f80968745bf5eba66
diff --git a/metadata/md5-cache/sys-apps/linux-misc-apps-4.4 b/metadata/md5-cache/sys-apps/linux-misc-apps-4.4
index 1e2b855a7aa8..70a839105858 100644
--- a/metadata/md5-cache/sys-apps/linux-misc-apps-4.4
+++ b/metadata/md5-cache/sys-apps/linux-misc-apps-4.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/hwids >=dev-libs/glib-2.6 tcpd? ( sys-apps/tcp-wrappers ) !sys-power/pmtools
 SLOT=0
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-4.4.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=d94ef0daf4c2dd54ef7a0d82330220e1
diff --git a/metadata/md5-cache/sys-apps/linux-misc-apps-4.4-r1 b/metadata/md5-cache/sys-apps/linux-misc-apps-4.4-r1
index cb49b3c8fb5f..93609ac385ba 100644
--- a/metadata/md5-cache/sys-apps/linux-misc-apps-4.4-r1
+++ b/metadata/md5-cache/sys-apps/linux-misc-apps-4.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/hwids >=dev-libs/glib-2.6 >=sys-kernel/linux-headers-4.4 usbip? ( !net-misc/usbip tcpd? ( sys-apps/tcp-wrappers ) virtual/libudev ) !sys-power/pmtools
 SLOT=0
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-4.4.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=5da90aa70d01899b0af82aa1d860ec1c
diff --git a/metadata/md5-cache/sys-apps/lm_sensors-3.4.0_p20170901 b/metadata/md5-cache/sys-apps/lm_sensors-3.4.0_p20170901
index bcead97a8485..9af189ec7d83 100644
--- a/metadata/md5-cache/sys-apps/lm_sensors-3.4.0_p20170901
+++ b/metadata/md5-cache/sys-apps/lm_sensors-3.4.0_p20170901
@@ -9,5 +9,5 @@ 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/groeck/lm-sensors/archive/83cafd29f28d463573750d897014ec7143217ae5.tar.gz -> lm_sensors-3.4.0_p20170901.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=06720450d380c5fa0ab3e4a5ef3413ea
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 431139e80145..c21114a55dae 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
@@ -9,5 +9,5 @@ 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	915cae3d7d636732918d18827fb1c226	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=abba13c0f31a832cb701ec23e9b59785
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 fba0c5b4a1fc..db53ca7b18a1 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_=57df58d4b4325749f39404f17c76fcc6
+_md5_=a8d57f2fd3ec11aca204964b4369b29a
diff --git a/metadata/md5-cache/sys-apps/msr-tools-1.3 b/metadata/md5-cache/sys-apps/msr-tools-1.3
index 958361c3bdac..6db2876850d8 100644
--- a/metadata/md5-cache/sys-apps/msr-tools-1.3
+++ b/metadata/md5-cache/sys-apps/msr-tools-1.3
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://01.org/sites/default/files/downloads/msr-tools/msr-tools-1.3.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=515f943da2af5095554530e2627bf658
diff --git a/metadata/md5-cache/sys-apps/nix-2.1.2 b/metadata/md5-cache/sys-apps/nix-2.1.2
deleted file mode 100644
index 02fc2754f4e9..000000000000
--- a/metadata/md5-cache/sys-apps/nix-2.1.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=app-arch/brotli app-arch/bzip2 app-arch/xz-utils dev-db/sqlite dev-libs/openssl:0= >=dev-libs/boost-1.66:0=[context] net-misc/curl sys-libs/libseccomp sys-libs/zlib gc? ( dev-libs/boehm-gc[cxx] ) doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets ) sodium? ( dev-libs/libsodium:0= ) >=sys-devel/bison-2.6 >=sys-devel/flex-2.5.35 >=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 purely functional package manager
-EAPI=6
-HOMEPAGE=https://nixos.org/nix
-IUSE=+etc_profile +gc doc sodium
-LICENSE=LGPL-2.1
-RDEPEND=app-arch/brotli app-arch/bzip2 app-arch/xz-utils dev-db/sqlite dev-libs/openssl:0= >=dev-libs/boost-1.66:0=[context] net-misc/curl sys-libs/libseccomp sys-libs/zlib gc? ( dev-libs/boehm-gc[cxx] ) doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets ) sodium? ( dev-libs/libsodium:0= )
-SLOT=0
-SRC_URI=http://nixos.org/releases/nix/nix-2.1.2/nix-2.1.2.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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5752ba87031e46f6c3f7d20bb22e59f8
diff --git a/metadata/md5-cache/sys-apps/nix-2.1.3 b/metadata/md5-cache/sys-apps/nix-2.1.3
new file mode 100644
index 000000000000..5065a2e59df8
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/nix-2.1.3
@@ -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=compile configure install postinst prepare setup
+DEPEND=app-arch/brotli app-arch/bzip2 app-arch/xz-utils dev-db/sqlite dev-libs/openssl:0= >=dev-libs/boost-1.66:0=[context] net-misc/curl sys-libs/libseccomp sys-libs/zlib gc? ( dev-libs/boehm-gc[cxx] ) doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets ) sodium? ( dev-libs/libsodium:0= ) >=sys-devel/bison-2.6 >=sys-devel/flex-2.5.35
+DESCRIPTION=A purely functional package manager
+EAPI=7
+HOMEPAGE=https://nixos.org/nix
+IUSE=+etc_profile +gc doc sodium
+LICENSE=LGPL-2.1
+RDEPEND=app-arch/brotli app-arch/bzip2 app-arch/xz-utils dev-db/sqlite dev-libs/openssl:0= >=dev-libs/boost-1.66:0=[context] net-misc/curl sys-libs/libseccomp sys-libs/zlib gc? ( dev-libs/boehm-gc[cxx] ) doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets ) sodium? ( dev-libs/libsodium:0= )
+SLOT=0
+SRC_URI=http://nixos.org/releases/nix/nix-2.1.3/nix-2.1.3.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=3970904e7b5ac1a98f1a98dc441d1051
diff --git a/metadata/md5-cache/sys-apps/nvme-cli-1.6-r1 b/metadata/md5-cache/sys-apps/nvme-cli-1.6-r1
new file mode 100644
index 000000000000..cb3043a55a9c
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/nvme-cli-1.6-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure prepare
+DEPEND=uuid? ( sys-apps/util-linux:= )
+DESCRIPTION=NVM-Express user space tooling for Linux
+EAPI=6
+HOMEPAGE=https://github.com/linux-nvme/nvme-cli
+IUSE=+uuid
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=uuid? ( sys-apps/util-linux:= )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/linux-nvme/nvme-cli/archive/v1.6.tar.gz -> nvme-cli-1.6.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=430a4723566f067708b76fcf9be6a4cb
diff --git a/metadata/md5-cache/sys-apps/openrc-0.38.2 b/metadata/md5-cache/sys-apps/openrc-0.38.2
index aac9f4e223be..e502098f5e3e 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_=64e5c3fdfbf1c7fe7b260a3e98a3bce5
+_md5_=673edd79995ef47091b6692a7bfea063
diff --git a/metadata/md5-cache/sys-apps/osinfo-db-tools-1.1.0 b/metadata/md5-cache/sys-apps/osinfo-db-tools-1.1.0
index 8c76736edc23..12bcefd61803 100644
--- a/metadata/md5-cache/sys-apps/osinfo-db-tools-1.1.0
+++ b/metadata/md5-cache/sys-apps/osinfo-db-tools-1.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.6.0 >=app-arch/libarchive-3.0.0:= !<sys-libs/libosinfo-1.0.0
 SLOT=0
 SRC_URI=https://releases.pagure.org/libosinfo/osinfo-db-tools-1.1.0.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=4247a82cdaa83645a6630879f2d66b46
diff --git a/metadata/md5-cache/sys-apps/osinfo-db-tools-1.2.0 b/metadata/md5-cache/sys-apps/osinfo-db-tools-1.2.0
index 4f3d931e5af5..86183df1816e 100644
--- a/metadata/md5-cache/sys-apps/osinfo-db-tools-1.2.0
+++ b/metadata/md5-cache/sys-apps/osinfo-db-tools-1.2.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.6.0 >=app-arch/libarchive-3.0.0:= !<sys-libs/libosinfo-1.0.0
 SLOT=0
 SRC_URI=https://releases.pagure.org/libosinfo/osinfo-db-tools-1.2.0.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=8919ea24225042736be0ec328eb867c8
diff --git a/metadata/md5-cache/sys-apps/pcmciautils-018_p8-r1 b/metadata/md5-cache/sys-apps/pcmciautils-018_p8-r1
index 034de078a17a..b831bc3bee97 100644
--- a/metadata/md5-cache/sys-apps/pcmciautils-018_p8-r1
+++ b/metadata/md5-cache/sys-apps/pcmciautils-018_p8-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/modutils
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/pcmciautils/pcmciautils_018.orig.tar.gz mirror://debian/pool/main/p/pcmciautils/pcmciautils_018-8.debian.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c7c54118ec30b09fb1266d3f8b968747
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.9.4 b/metadata/md5-cache/sys-apps/pkgcore-0.9.4
index 4525aec64ccc..29ad20ccd23c 100644
--- a/metadata/md5-cache/sys-apps/pkgcore-0.9.4
+++ b/metadata/md5-cache/sys-apps/pkgcore-0.9.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/snakeoil-0.7.0[python_targets_python2_7(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/pkgcore/pkgcore/releases/download/v0.9.4/pkgcore-0.9.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=50cfed2b6e95b8dae53025334db6aa7b
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.9.7 b/metadata/md5-cache/sys-apps/pkgcore-0.9.7
index e3e98dc68e2e..435622d6f31b 100644
--- a/metadata/md5-cache/sys-apps/pkgcore-0.9.7
+++ b/metadata/md5-cache/sys-apps/pkgcore-0.9.7
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/snakeoil-0.7.3[python_targets_python2_7(-)?,python_targets_
 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/pkgcore/pkgcore-0.9.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=9a66eeb1e6fe23744346cdf17a8f7e33
diff --git a/metadata/md5-cache/sys-apps/pkgcore-9999 b/metadata/md5-cache/sys-apps/pkgcore-9999
index 89cb841be1e8..10630badea95 100644
--- a/metadata/md5-cache/sys-apps/pkgcore-9999
+++ b/metadata/md5-cache/sys-apps/pkgcore-9999
@@ -8,5 +8,5 @@ LICENSE=|| ( BSD GPL-2 )
 RDEPEND==dev-python/snakeoil-9999[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( 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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=de33831ce50ac4bf6a5bbfe9359af99e
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.40-r1 b/metadata/md5-cache/sys-apps/portage-2.3.40-r1
index 22416a7af4cc..390a58f31988 100644
--- a/metadata/md5-cache/sys-apps/portage-2.3.40-r1
+++ b/metadata/md5-cache/sys-apps/portage-2.3.40-r1
@@ -11,5 +11,5 @@ RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.
 REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://gentoo/portage-2.3.40.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.40.tar.bz2 https://github.com/gentoo/portage/compare/b7f94fccf4163364ab7b4c4f0dcd42b8847f03e0...937d0156aa060bdba9095313dedbb62e0a993aea.patch -> portage-2.3.40-bug-656942-bug-657436-937d0156aa06.patch https://github.com/gentoo/portage/compare/937d0156aa060bdba9095313dedbb62e0a993aea...1fc628eead43fa5da4b142479aa004ded8acceab.patch -> portage-2.3.40-bug-657436-937d0156aa06-1fc628eead43.patch
-_eclasses_=desktop	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7f684753e0927e05b71c754f6b3aa40a
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.49 b/metadata/md5-cache/sys-apps/portage-2.3.49
index 3821288bfac0..439c5b5a7b1b 100644
--- a/metadata/md5-cache/sys-apps/portage-2.3.49
+++ b/metadata/md5-cache/sys-apps/portage-2.3.49
@@ -4,12 +4,12 @@ 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
+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(-)]
 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.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=b1b20390305dff3ba32f7e7d4a36983f
+_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
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.50-r4 b/metadata/md5-cache/sys-apps/portage-2.3.50-r4
index e0cf7237a940..d157727dcbb9 100644
--- a/metadata/md5-cache/sys-apps/portage-2.3.50-r4
+++ b/metadata/md5-cache/sys-apps/portage-2.3.50-r4
@@ -11,5 +11,5 @@ RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.
 REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://gentoo/portage-2.3.50.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.50.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3d7f603c893bccea63b23ac8fdc2dab7
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.8 b/metadata/md5-cache/sys-apps/portage-2.3.8
index 9e19409bb921..f4b81b9d6834 100644
--- a/metadata/md5-cache/sys-apps/portage-2.3.8
+++ b/metadata/md5-cache/sys-apps/portage-2.3.8
@@ -11,5 +11,5 @@ RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.
 REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://gentoo/portage-2.3.8.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.8.tar.bz2
-_eclasses_=desktop	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7b7f1167aa64fc70b8d34c827ae06f88
diff --git a/metadata/md5-cache/sys-apps/portage-9999 b/metadata/md5-cache/sys-apps/portage-9999
index a3ad4094fbb0..0800d5012c34 100644
--- a/metadata/md5-cache/sys-apps/portage-9999
+++ b/metadata/md5-cache/sys-apps/portage-9999
@@ -9,5 +9,5 @@ PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.
 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 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
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4a770106552b4a431cde1a1cc24ee649
diff --git a/metadata/md5-cache/sys-apps/portage-mgorny-2.3.43.3 b/metadata/md5-cache/sys-apps/portage-mgorny-2.3.43.3
deleted file mode 100644
index 900caf764add..000000000000
--- a/metadata/md5-cache/sys-apps/portage-mgorny-2.3.43.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend 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 >=sys-apps/sed-4.0.5 sys-devel/patch 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(-)]
-DESCRIPTION=Fork of Portage focused on cleaning up and useful features
-EAPI=6
-HOMEPAGE=https://github.com/mgorny/portage-mgorny
-IUSE=build +ipc +native-extensions selinux xattr kernel_linux 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 ~sparc ~x86 ~amd64-fbsd
-LICENSE=GPL-2
-PDEPEND=!build? ( >=net-misc/rsync-2.6.4 )
-RDEPEND=>=app-arch/tar-1.27 !build? ( >=app-admin/eselect-1.2 app-crypt/openpgp-keys-gentoo-release >=app-crypt/gnupg-2.2.4-r2[ssl(-)] >=app-portage/gemato-10[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-shells/bash:0[readline] 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(-)] ) >=dev-python/lxml-3.6.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=sys-apps/sed-4.0.5 ) 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-portage/repoman !sys-apps/portage 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=|| ( 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/mgorny/portage-mgorny/archive/v2.3.43.3.tar.gz -> portage-mgorny-2.3.43.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=0c0e0c0d3b4cf4e10e00dff411d57e1f
diff --git a/metadata/md5-cache/sys-apps/portage-mgorny-2.3.49.1 b/metadata/md5-cache/sys-apps/portage-mgorny-2.3.49.1
index 0f427300c0cb..bfc1c5c0eca5 100644
--- a/metadata/md5-cache/sys-apps/portage-mgorny-2.3.49.1
+++ b/metadata/md5-cache/sys-apps/portage-mgorny-2.3.49.1
@@ -11,5 +11,5 @@ RDEPEND=>=app-arch/tar-1.27 !build? ( >=app-admin/eselect-1.2 app-crypt/openpgp-
 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/mgorny/portage-mgorny/archive/v2.3.49.1.tar.gz -> portage-mgorny-2.3.49.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0c0e0c0d3b4cf4e10e00dff411d57e1f
diff --git a/metadata/md5-cache/sys-apps/portage-mgorny-9999 b/metadata/md5-cache/sys-apps/portage-mgorny-9999
index 9950546d3833..6f4dd0801024 100644
--- a/metadata/md5-cache/sys-apps/portage-mgorny-9999
+++ b/metadata/md5-cache/sys-apps/portage-mgorny-9999
@@ -9,5 +9,5 @@ PDEPEND=!build? ( >=net-misc/rsync-2.6.4 )
 RDEPEND=>=app-arch/tar-1.27 !build? ( >=app-admin/eselect-1.2 app-crypt/openpgp-keys-gentoo-release >=app-crypt/gnupg-2.2.4-r2[ssl(-)] >=app-portage/gemato-10[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-shells/bash:0[readline] 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(-)] ) >=dev-python/lxml-3.6.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=sys-apps/sed-4.0.5 ) 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-portage/repoman !sys-apps/portage 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=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=9014d298a219041a5f4d25d2f5356a1b
diff --git a/metadata/md5-cache/sys-apps/pv-1.6.0-r1 b/metadata/md5-cache/sys-apps/pv-1.6.0-r1
index bd38261c4765..0ea77af39793 100644
--- a/metadata/md5-cache/sys-apps/pv-1.6.0-r1
+++ b/metadata/md5-cache/sys-apps/pv-1.6.0-r1
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-
 LICENSE=Artistic-2
 SLOT=0
 SRC_URI=http://www.ivarch.com/programs/sources/pv-1.6.0.tar.bz2
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=72ee8430045a96573c290a8a661ec7d3
diff --git a/metadata/md5-cache/sys-apps/pv-1.6.6 b/metadata/md5-cache/sys-apps/pv-1.6.6
index e96488a488ff..d8c6a157f3ef 100644
--- a/metadata/md5-cache/sys-apps/pv-1.6.6
+++ b/metadata/md5-cache/sys-apps/pv-1.6.6
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-li
 LICENSE=Artistic-2
 SLOT=0
 SRC_URI=http://www.ivarch.com/programs/sources/pv-1.6.6.tar.bz2
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=b3baf2c95be519bf72f575691201576f
diff --git a/metadata/md5-cache/sys-apps/qdirstat-1.4 b/metadata/md5-cache/sys-apps/qdirstat-1.4
index b49dea4d0a44..d922b3f65603 100644
--- a/metadata/md5-cache/sys-apps/qdirstat-1.4
+++ b/metadata/md5-cache/sys-apps/qdirstat-1.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://github.com/shundhammer/qdirstat/archive/1.4.tar.gz -> qdirstat-1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f9fa6ca4ed847c1b860dd7ec28951a35
diff --git a/metadata/md5-cache/sys-apps/razercfg-0.39-r1 b/metadata/md5-cache/sys-apps/razercfg-0.39-r1
index 58f8a48cebc1..ef4135435f50 100644
--- a/metadata/md5-cache/sys-apps/razercfg-0.39-r1
+++ b/metadata/md5-cache/sys-apps/razercfg-0.39-r1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://bues.ch/razercfg/razercfg-0.39.tar.bz2
-_eclasses_=cmake-utils	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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7603b79e75a68e4b6aeba48ec347da71
diff --git a/metadata/md5-cache/sys-apps/rename-1.3-r2 b/metadata/md5-cache/sys-apps/rename-1.3-r2
index 5f9ae6c32c7e..cdbc4d3b2172 100644
--- a/metadata/md5-cache/sys-apps/rename-1.3-r2
+++ b/metadata/md5-cache/sys-apps/rename-1.3-r2
@@ -6,5 +6,5 @@ KEYWORDS=amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://rename/sourceforge.net/rename-1.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_=968a0c1a9da830c57f5e834ddc86d93c
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=b7974d81f2cd3bf565e02a3afcbaa9af
diff --git a/metadata/md5-cache/sys-apps/roccat-tools-5.7.0 b/metadata/md5-cache/sys-apps/roccat-tools-5.7.0
index bce98d466680..cc3b2bd4b2d2 100644
--- a/metadata/md5-cache/sys-apps/roccat-tools-5.7.0
+++ b/metadata/md5-cache/sys-apps/roccat-tools-5.7.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 >=dev-libs/libgaminggear-0.15.1 sys-apps/dbus x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 virtual/libgudev:= virtual/libusb:1 input_devices_roccat_ryosmk? ( || ( dev-lang/lua:5.1 dev-lang/lua:0 ) ) input_devices_roccat_ryosmkfx? ( || ( dev-lang/lua:5.1 dev-lang/lua:0 ) ) input_devices_roccat_ryostkl? ( || ( dev-lang/lua:5.1 dev-lang/lua:0 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/roccat/roccat-tools-5.7.0.tar.bz2
-_eclasses_=cmake-utils	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	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d15d32def03a3cbf7584e913604289e3
diff --git a/metadata/md5-cache/sys-apps/rtl-entropy-0.1.2_p20180118-r1 b/metadata/md5-cache/sys-apps/rtl-entropy-0.1.2_p20180118-r1
index 5de196ac4cdf..62861e8aa1c3 100644
--- a/metadata/md5-cache/sys-apps/rtl-entropy-0.1.2_p20180118-r1
+++ b/metadata/md5-cache/sys-apps/rtl-entropy-0.1.2_p20180118-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=sys-libs/libcap dev-libs/openssl:0= bladerf? ( net-wireless/bladerf:= ) net-wireless/rtl-sdr
 SLOT=0
 SRC_URI=https://github.com/pwarren/rtl-entropy/archive/9f1768c35f6205a73a657cfc9ac7bd9f9a40936c.tar.gz -> rtl-entropy-0.1.2_p20180118.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=229ebe944ad53d7325bf3499e9df590a
diff --git a/metadata/md5-cache/sys-apps/sensei-raw-ctl-0.0_pre20180729 b/metadata/md5-cache/sys-apps/sensei-raw-ctl-0.0_pre20180729
index ae3442765522..2c56744bd431 100644
--- a/metadata/md5-cache/sys-apps/sensei-raw-ctl-0.0_pre20180729
+++ b/metadata/md5-cache/sys-apps/sensei-raw-ctl-0.0_pre20180729
@@ -9,5 +9,5 @@ LICENSE=ISC
 RDEPEND=virtual/libusb:1 gtk? ( x11-libs/gtk+:3 )
 SLOT=0
 SRC_URI=https://git.janouch.name/p/sensei-raw-ctl/archive/175d72ee849afe6e3547739132103cb26acf9173.tar.gz -> sensei-raw-ctl-0.0_pre20180729.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0c459a223bb8fb6ac668b68e5651b8fc
diff --git a/metadata/md5-cache/sys-apps/smc-sum-driver-1.6.0.20151201-r2 b/metadata/md5-cache/sys-apps/smc-sum-driver-1.6.0.20151201-r2
index ec67396082f0..6f79168ed211 100644
--- a/metadata/md5-cache/sys-apps/smc-sum-driver-1.6.0.20151201-r2
+++ b/metadata/md5-cache/sys-apps/smc-sum-driver-1.6.0.20151201-r2
@@ -10,5 +10,5 @@ RDEPEND=kernel_linux? ( virtual/modutils )
 RESTRICT=bindist fetch mirror
 SLOT=0
 SRC_URI=sum_driver_V1.6.0_20151201.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=300af85b1a364bdcd1fae09833b18b91
diff --git a/metadata/md5-cache/sys-apps/superdiag-1.1.0.20180731 b/metadata/md5-cache/sys-apps/superdiag-1.1.0.20180731
new file mode 100644
index 000000000000..34de2a0afc95
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/superdiag-1.1.0.20180731
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install nofetch unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Provides the capability to determine the health of Supermicro servers components
+EAPI=7
+HOMEPAGE=https://www.supermicro.com
+IUSE=iso usb
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=supermicro
+RESTRICT=bindist fetch mirror
+SLOT=0
+SRC_URI=SuperDiag_1.1.0_20180731_package.zip
+_md5_=bb95c9742fc7807614bc051ead406e3f
diff --git a/metadata/md5-cache/sys-apps/systemd-236-r5 b/metadata/md5-cache/sys-apps/systemd-236-r5
index c83e15808601..5ab2013698e4 100644
--- a/metadata/md5-cache/sys-apps/systemd-236-r5
+++ b/metadata/md5-cache/sys-apps/systemd-236-r5
@@ -12,5 +12,5 @@ REQUIRED_USE=importd? ( curl gcrypt lzma )
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd/archive/v236.tar.gz -> systemd-236.tar.gz https://dev.gentoo.org/~floppym/dist/systemd-236-patches-2.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	29ef682942c6ff558de2f797a61790c2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	29ef682942c6ff558de2f797a61790c2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f8c61e42536a9341244791197f369df3
diff --git a/metadata/md5-cache/sys-apps/systemd-238-r7 b/metadata/md5-cache/sys-apps/systemd-238-r7
index f608be63f6cf..d309ea0e3ad1 100644
--- a/metadata/md5-cache/sys-apps/systemd-238-r7
+++ b/metadata/md5-cache/sys-apps/systemd-238-r7
@@ -12,5 +12,5 @@ REQUIRED_USE=importd? ( curl gcrypt lzma )
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd/archive/v238/systemd-238.tar.gz https://dev.gentoo.org/~floppym/dist/systemd-238-patches-1.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	29ef682942c6ff558de2f797a61790c2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	29ef682942c6ff558de2f797a61790c2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e442fae1eef6275896f5a8c7e3d68d03
diff --git a/metadata/md5-cache/sys-apps/systemd-239 b/metadata/md5-cache/sys-apps/systemd-239
index 450bd1192103..3392041ceaae 100644
--- a/metadata/md5-cache/sys-apps/systemd-239
+++ b/metadata/md5-cache/sys-apps/systemd-239
@@ -12,5 +12,5 @@ REQUIRED_USE=importd? ( curl gcrypt lzma )
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd/archive/v239/systemd-239.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	29ef682942c6ff558de2f797a61790c2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	29ef682942c6ff558de2f797a61790c2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a76694014326d5e74c21ce16782eade7
diff --git a/metadata/md5-cache/sys-apps/systemd-239-r1 b/metadata/md5-cache/sys-apps/systemd-239-r1
index 27a9fbbf3710..a8ce2616e8a8 100644
--- a/metadata/md5-cache/sys-apps/systemd-239-r1
+++ b/metadata/md5-cache/sys-apps/systemd-239-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=importd? ( curl gcrypt lzma )
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd/archive/v239/systemd-239.tar.gz https://dev.gentoo.org/~floppym/dist/systemd-239-patches-0.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	29ef682942c6ff558de2f797a61790c2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	29ef682942c6ff558de2f797a61790c2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=35aa87b0103fc6926caf6f6ed32e275f
diff --git a/metadata/md5-cache/sys-apps/systemd-9999 b/metadata/md5-cache/sys-apps/systemd-9999
index 3def3ba8d0c7..a1db126615f6 100644
--- a/metadata/md5-cache/sys-apps/systemd-9999
+++ b/metadata/md5-cache/sys-apps/systemd-9999
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 REQUIRED_USE=importd? ( curl gcrypt lzma )
 RESTRICT=!test? ( test )
 SLOT=0/2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	29ef682942c6ff558de2f797a61790c2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	29ef682942c6ff558de2f797a61790c2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d74a1c0a005794a0152a25ca5e008201
diff --git a/metadata/md5-cache/sys-apps/tas-1.5.2.180622 b/metadata/md5-cache/sys-apps/tas-1.5.2.180622
index 113c372a032f..8b7a390ba98f 100644
--- a/metadata/md5-cache/sys-apps/tas-1.5.2.180622
+++ b/metadata/md5-cache/sys-apps/tas-1.5.2.180622
@@ -10,5 +10,5 @@ RDEPEND=net-misc/networkmanager sys-apps/ethtool sys-apps/net-tools sys-apps/sma
 RESTRICT=bindist fetch mirror
 SLOT=0
 SRC_URI=TAS_1.5.2_build.180622.zip
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=2d86fec63788c4caadd86c16cb53be9f
diff --git a/metadata/md5-cache/sys-apps/thunderbolt-software-user-space-0.9.2 b/metadata/md5-cache/sys-apps/thunderbolt-software-user-space-0.9.2
index e71f87aebcbc..3319f588c7af 100644
--- a/metadata/md5-cache/sys-apps/thunderbolt-software-user-space-0.9.2
+++ b/metadata/md5-cache/sys-apps/thunderbolt-software-user-space-0.9.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=app-text/txt2tags dev-libs/boost
 SLOT=0
 SRC_URI=https://github.com/intel/thunderbolt-software-user-space/archive/v0.9.2.tar.gz -> thunderbolt-software-user-space-0.9.2.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=20a4a94600198a03f73da459c85803b0
diff --git a/metadata/md5-cache/sys-apps/thunderbolt-software-user-space-0.9.3 b/metadata/md5-cache/sys-apps/thunderbolt-software-user-space-0.9.3
index fe2e1ccb8074..3da54d0eb65a 100644
--- a/metadata/md5-cache/sys-apps/thunderbolt-software-user-space-0.9.3
+++ b/metadata/md5-cache/sys-apps/thunderbolt-software-user-space-0.9.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=app-text/txt2tags dev-libs/boost
 SLOT=0
 SRC_URI=https://github.com/intel/thunderbolt-software-user-space/archive/v0.9.3.tar.gz -> thunderbolt-software-user-space-0.9.3.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=20a4a94600198a03f73da459c85803b0
diff --git a/metadata/md5-cache/sys-apps/usb_modeswitch-2.2.6 b/metadata/md5-cache/sys-apps/usb_modeswitch-2.2.6
index e7bfa1a809be..d32ba4b8a5c2 100644
--- a/metadata/md5-cache/sys-apps/usb_modeswitch-2.2.6
+++ b/metadata/md5-cache/sys-apps/usb_modeswitch-2.2.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/udev virtual/libusb:1 jimtcl? ( dev-lang/jimtcl ) !jimtcl? ( dev-lang/tcl:0 )
 SLOT=0
 SRC_URI=http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-2.2.6.tar.bz2 http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-20151101.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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_=b1f808a269756023894198cf4fc968aa
diff --git a/metadata/md5-cache/sys-apps/usb_modeswitch-2.3.0 b/metadata/md5-cache/sys-apps/usb_modeswitch-2.3.0
index 2f5f6b5df3c2..9e4df2731a63 100644
--- a/metadata/md5-cache/sys-apps/usb_modeswitch-2.3.0
+++ b/metadata/md5-cache/sys-apps/usb_modeswitch-2.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/udev virtual/libusb:1 jimtcl? ( dev-lang/jimtcl ) !jimtcl? ( dev-lang/tcl:0 )
 SLOT=0
 SRC_URI=http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-2.3.0.tar.bz2 http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-20160112.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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_=5ed014e1ae2c532656ff7eb4132444b6
diff --git a/metadata/md5-cache/sys-apps/usb_modeswitch-2.4.0-r1 b/metadata/md5-cache/sys-apps/usb_modeswitch-2.4.0-r1
index e4c94265a23f..c3c2920736e7 100644
--- a/metadata/md5-cache/sys-apps/usb_modeswitch-2.4.0-r1
+++ b/metadata/md5-cache/sys-apps/usb_modeswitch-2.4.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/udev virtual/libusb:1 jimtcl? ( dev-lang/jimtcl ) !jimtcl? ( dev-lang/tcl:0 )
 SLOT=0
 SRC_URI=http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-2.4.0.tar.bz2 http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-20160803.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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_=b79ac9467acc2b30fb41189558c638ea
diff --git a/metadata/md5-cache/sys-apps/usb_modeswitch-2.5.2 b/metadata/md5-cache/sys-apps/usb_modeswitch-2.5.2
index a156202470b3..a2daf5ff0538 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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f066460a877e34614a3c9c036374c768
+_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
diff --git a/metadata/md5-cache/sys-apps/usbutils-008-r1 b/metadata/md5-cache/sys-apps/usbutils-008-r1
deleted file mode 100644
index 8fb2117d3fd4..000000000000
--- a/metadata/md5-cache/sys-apps/usbutils-008-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=virtual/libusb:1= virtual/libudev:= app-arch/xz-utils virtual/pkgconfig
-DESCRIPTION=USB enumeration utilities
-EAPI=5
-HOMEPAGE=https://www.kernel.org/pub/linux/utils/usb/usbutils/ https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usbutils.git/
-IUSE=python python_targets_python2_7
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=virtual/libusb:1= virtual/libudev:= sys-apps/hwids 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://kernel/linux/utils/usb/usbutils/usbutils-008.tar.xz
-_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_=eb15b5b92ae6ba58da69310fedb56e3e
diff --git a/metadata/md5-cache/sys-apps/x86info-1.30 b/metadata/md5-cache/sys-apps/x86info-1.30
index f7832b8f6766..4a956a1e97fc 100644
--- a/metadata/md5-cache/sys-apps/x86info-1.30
+++ b/metadata/md5-cache/sys-apps/x86info-1.30
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/pciutils:=
 SLOT=0
 SRC_URI=http://www.codemonkey.org.uk/projects/x86info/x86info-1.30.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3a809e09ecb57a4ecf8b7599447e2a36
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 05314f940264..e0fca1cebc40 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/authenticator-0.2.1 b/metadata/md5-cache/sys-auth/authenticator-0.2.1
index 0288956ebcf4..f8af74f64bb8 100644
--- a/metadata/md5-cache/sys-auth/authenticator-0.2.1
+++ b/metadata/md5-cache/sys-auth/authenticator-0.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=app-crypt/libsecret dev-python/pillow[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyotp[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyzbar[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-gfx/gnome-screenshot x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://github.com/bilelmoussaoui/Authenticator/archive/0.2.1.tar.gz -> authenticator-0.2.1.tar.gz
-_eclasses_=desktop	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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=209a4fb04fa4b50744352a84e1129074
diff --git a/metadata/md5-cache/sys-auth/authenticator-9999 b/metadata/md5-cache/sys-auth/authenticator-9999
index 42113b277a5b..ae43a9d920a6 100644
--- a/metadata/md5-cache/sys-auth/authenticator-9999
+++ b/metadata/md5-cache/sys-auth/authenticator-9999
@@ -7,5 +7,5 @@ IUSE=python_targets_python3_5 python_targets_python3_6 test
 LICENSE=GPL-2+
 RDEPEND=app-crypt/libsecret dev-python/pillow[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyotp[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyzbar[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-gfx/gnome-screenshot x11-libs/gtk+:3
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=209a4fb04fa4b50744352a84e1129074
diff --git a/metadata/md5-cache/sys-auth/consolekit-0.4.6 b/metadata/md5-cache/sys-auth/consolekit-0.4.6
index bb84aa1d56ae..5dde01a7faee 100644
--- a/metadata/md5-cache/sys-auth/consolekit-0.4.6
+++ b/metadata/md5-cache/sys-auth/consolekit-0.4.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.38.2-r1:2= sys-libs/zlib:= x11-libs/libX11:= acl? ( sys-apps/acl:= >=virtual/udev-200 ) pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.110 ) kernel_linux? ( sys-apps/coreutils[acl?] ) selinux? ( sec-policy/selinux-consolekit )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-0.4.6.tar.xz https://launchpad.net/debian/+archive/primary/+files/consolekit_0.4.6-4.debian.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d6be672e272ce76010d9a6268bf4a76d
diff --git a/metadata/md5-cache/sys-auth/consolekit-1.1.0-r1 b/metadata/md5-cache/sys-auth/consolekit-1.1.0-r1
index 51e600fb6292..1f00eb83f3cd 100644
--- a/metadata/md5-cache/sys-auth/consolekit-1.1.0-r1
+++ b/metadata/md5-cache/sys-auth/consolekit-1.1.0-r1
@@ -9,5 +9,5 @@ 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] ) pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.110 ) 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.1.0/ConsoleKit2-1.1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=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
 _md5_=125a9f065e362b241fa2386cbfb4317b
diff --git a/metadata/md5-cache/sys-auth/consolekit-1.1.2 b/metadata/md5-cache/sys-auth/consolekit-1.1.2
index eac04672f59d..033b006ea7c5 100644
--- a/metadata/md5-cache/sys-auth/consolekit-1.1.2
+++ b/metadata/md5-cache/sys-auth/consolekit-1.1.2
@@ -9,5 +9,5 @@ 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.1.2/ConsoleKit2-1.1.2.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=0ccac6fb7c71780be9e4357ea6858f6e
diff --git a/metadata/md5-cache/sys-auth/consolekit-1.2.0 b/metadata/md5-cache/sys-auth/consolekit-1.2.0
index 7906f868f1b0..9f116f2e4d79 100644
--- a/metadata/md5-cache/sys-auth/consolekit-1.2.0
+++ b/metadata/md5-cache/sys-auth/consolekit-1.2.0
@@ -9,5 +9,5 @@ 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.0/ConsoleKit2-1.2.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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=79c3c9bfad3a6d109ca0e656f474b77d
diff --git a/metadata/md5-cache/sys-auth/consolekit-1.2.1 b/metadata/md5-cache/sys-auth/consolekit-1.2.1
index a251a1f0ff9c..cfd8c2e8160a 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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=fbde432e54c03d719eca522a0d411254
+_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
diff --git a/metadata/md5-cache/sys-auth/consolekit-9999 b/metadata/md5-cache/sys-auth/consolekit-9999
index 22d42f7329e4..87f797d91ad4 100644
--- a/metadata/md5-cache/sys-auth/consolekit-9999
+++ b/metadata/md5-cache/sys-auth/consolekit-9999
@@ -7,5 +7,5 @@ IUSE=acl cgroups debug doc evdev kernel_linux pam pm-utils policykit selinux tes
 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
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	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	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a8a89f6cf24129431e2739e1da54af60
diff --git a/metadata/md5-cache/sys-auth/elogind-238.1 b/metadata/md5-cache/sys-auth/elogind-238.1
index e8966f956a91..4222c81ad5d4 100644
--- a/metadata/md5-cache/sys-auth/elogind-238.1
+++ b/metadata/md5-cache/sys-auth/elogind-238.1
@@ -10,5 +10,5 @@ PDEPEND=sys-apps/dbus policykit? ( sys-auth/polkit )
 RDEPEND=sys-apps/util-linux sys-libs/libcap virtual/libudev:= acl? ( sys-apps/acl ) pam? ( virtual/pam ) selinux? ( sys-libs/libselinux ) !sys-apps/systemd
 SLOT=0
 SRC_URI=https://github.com/elogind/elogind/archive/v238.1.tar.gz -> elogind-238.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/sys-auth/fingerprint-gui-1.09-r1 b/metadata/md5-cache/sys-auth/fingerprint-gui-1.09-r1
index 611b99f89461..27be279db365 100644
--- a/metadata/md5-cache/sys-auth/fingerprint-gui-1.09-r1
+++ b/metadata/md5-cache/sys-auth/fingerprint-gui-1.09-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=app-crypt/qca[qt5(+)] dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtx11extras:5 sys-auth/libfprint sys-auth/polkit-qt[qt5(+)] sys-libs/pam x11-libs/libX11 x11-libs/libfakekey dev-libs/libusb !sys-auth/thinkfinger
 SLOT=0
 SRC_URI=https://github.com/maksbotan/fingerprint-gui/archive/v1.09-qt5.tar.gz -> fingerprint-gui-1.09.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=850533891b3eb0d29c844c65f672f461
diff --git a/metadata/md5-cache/sys-auth/google-authenticator-wrappers-1 b/metadata/md5-cache/sys-auth/google-authenticator-wrappers-1
index 6fe6612c3f60..951a295e25eb 100644
--- a/metadata/md5-cache/sys-auth/google-authenticator-wrappers-1
+++ b/metadata/md5-cache/sys-auth/google-authenticator-wrappers-1
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=sys-auth/google-authenticator
 SLOT=0
 SRC_URI=https://github.com/mgorny/google-authenticator-wrappers/archive/v1.tar.gz -> google-authenticator-wrappers-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=28c345bba72a5f16aa44325db4aba676
diff --git a/metadata/md5-cache/sys-auth/google-authenticator-wrappers-2 b/metadata/md5-cache/sys-auth/google-authenticator-wrappers-2
index 8107f43a3987..dfd7fb393998 100644
--- a/metadata/md5-cache/sys-auth/google-authenticator-wrappers-2
+++ b/metadata/md5-cache/sys-auth/google-authenticator-wrappers-2
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=sys-auth/google-authenticator
 SLOT=0
 SRC_URI=https://github.com/mgorny/google-authenticator-wrappers/archive/v2.tar.gz -> google-authenticator-wrappers-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=28c345bba72a5f16aa44325db4aba676
diff --git a/metadata/md5-cache/sys-auth/google-authenticator-wrappers-3 b/metadata/md5-cache/sys-auth/google-authenticator-wrappers-3
index 011d738ee3e2..1ecb23e41976 100644
--- a/metadata/md5-cache/sys-auth/google-authenticator-wrappers-3
+++ b/metadata/md5-cache/sys-auth/google-authenticator-wrappers-3
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=sys-auth/google-authenticator
 SLOT=0
 SRC_URI=https://github.com/mgorny/google-authenticator-wrappers/archive/v3.tar.gz -> google-authenticator-wrappers-3.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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a46811733c26aac5496b7c2ca7f2ad17
diff --git a/metadata/md5-cache/sys-auth/keystone-12.0.1 b/metadata/md5-cache/sys-auth/keystone-12.0.1
index 1360785ba569..0c8406e728c4 100644
--- a/metadata/md5-cache/sys-auth/keystone-12.0.1
+++ b/metadata/md5-cache/sys-auth/keystone-12.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://tarballs.openstack.org/keystone/keystone-12.0.1.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c3993e3bbaa179631a4fc69c3d1d4e6e
diff --git a/metadata/md5-cache/sys-auth/keystone-13.0.1 b/metadata/md5-cache/sys-auth/keystone-13.0.1
index 24cd313164b2..e32a80d4510f 100644
--- a/metadata/md5-cache/sys-auth/keystone-13.0.1
+++ b/metadata/md5-cache/sys-auth/keystone-13.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://tarballs.openstack.org/keystone/keystone-13.0.1.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b787d2e5a6f6d573d155394e12ade09c
diff --git a/metadata/md5-cache/sys-auth/keystone-14.0.0 b/metadata/md5-cache/sys-auth/keystone-14.0.0
index 0629c1d7d0f0..9e6a7dc46732 100644
--- a/metadata/md5-cache/sys-auth/keystone-14.0.0
+++ b/metadata/md5-cache/sys-auth/keystone-14.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( 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/keystone/rocky/keystone.conf.sample -> keystone.conf.sample-14.0.0 https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.policy.yaml.sample -> keystone.policy.yaml.sample-14.0.0 https://tarballs.openstack.org/keystone/keystone-14.0.0.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2ffd817913b034094b16e09fa2c8abe4
diff --git a/metadata/md5-cache/sys-auth/keystone-2017.2.9999 b/metadata/md5-cache/sys-auth/keystone-2017.2.9999
index 7b4b056ea6b4..86225190eceb 100644
--- a/metadata/md5-cache/sys-auth/keystone-2017.2.9999
+++ b/metadata/md5-cache/sys-auth/keystone-2017.2.9999
@@ -8,5 +8,5 @@ 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/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/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/paste[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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.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/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(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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/passlib-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-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/keystonemiddleware-4.12.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/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/scrypt-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.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-concurrency-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/oslo-config-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/oslo-config-4.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-config-4.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/oslo-context-2.14.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.24.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-messaging-5.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-db-4.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-i18n-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/oslo-i18n-3.15.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.22.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.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-policy-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-serialization-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/oslo-serialization-1.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.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/oauthlib-0.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/pysaml2-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/pysaml2-4.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/dogpile-cache-0.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/jsonschema-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/jsonschema-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/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/pycadf-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/pycadf-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/msgpack-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/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/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(-)] memcached? ( >=dev-python/python-memcached-1.56[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mongo? ( >=dev-python/pymongo-3.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/pymongo-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(-)] ) ldap? ( >=dev-python/pyldap-2.4.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/ldappool-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(-)] ) || ( www-servers/uwsgi[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(-)] www-apache/mod_wsgi[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-servers/gunicorn[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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=|| ( mysql postgres sqlite ) || ( 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	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b38550d88dbc0e6bb3e534bf1bc28b1d
diff --git a/metadata/md5-cache/sys-auth/keystone-2018.1.9999 b/metadata/md5-cache/sys-auth/keystone-2018.1.9999
index ddb9c2fae7a6..2c6767353363 100644
--- a/metadata/md5-cache/sys-auth/keystone-2018.1.9999
+++ b/metadata/md5-cache/sys-auth/keystone-2018.1.9999
@@ -8,5 +8,5 @@ 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/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/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/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/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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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(-)] >=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/passlib-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-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/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/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/scrypt-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.14.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-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-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-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-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-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-1.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/oauthlib-0.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/pysaml2-4.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/pysaml2-4.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/dogpile-cache-0.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/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/pycadf-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/pycadf-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/msgpack-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/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/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(-)] memcached? ( >=dev-python/python-memcached-1.56[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mongo? ( >=dev-python/pymongo-3.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/pymongo-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(-)] ) ldap? ( >=dev-python/pyldap-2.4.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/ldappool-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(-)] ) || ( www-servers/uwsgi[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(-)] www-apache/mod_wsgi[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-servers/gunicorn[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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=|| ( mysql postgres sqlite ) || ( 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	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a95dbae8d96a9504e00b00b181ff5cdd
diff --git a/metadata/md5-cache/sys-auth/keystone-2018.2.9999 b/metadata/md5-cache/sys-auth/keystone-2018.2.9999
index d0fc47421195..2efbad9d5b4d 100644
--- a/metadata/md5-cache/sys-auth/keystone-2018.2.9999
+++ b/metadata/md5-cache/sys-auth/keystone-2018.2.9999
@@ -9,5 +9,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( 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/keystone/rocky/keystone.conf.sample -> keystone.conf.sample-2018.2.9999 https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.policy.yaml.sample -> keystone.policy.yaml.sample-2018.2.9999
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f5aab8587188b6d8c1fa2cc524e6ed51
diff --git a/metadata/md5-cache/sys-auth/pam_abl-0.6.0 b/metadata/md5-cache/sys-auth/pam_abl-0.6.0
index 3deaf2088110..a68db68265e7 100644
--- a/metadata/md5-cache/sys-auth/pam_abl-0.6.0
+++ b/metadata/md5-cache/sys-auth/pam_abl-0.6.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/pam-0.78-r2 >=sys-libs/db-4.2.52_p2:=
 SLOT=0
 SRC_URI=mirror://sourceforge/pam-abl/pam-abl-0.6.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5b80f62704b517b51fd56e383e5c2b7a
diff --git a/metadata/md5-cache/sys-auth/polkit-0.113-r4 b/metadata/md5-cache/sys-auth/polkit-0.113-r4
index 522734da6579..dcf25ddc10f4 100644
--- a/metadata/md5-cache/sys-auth/polkit-0.113-r4
+++ b/metadata/md5-cache/sys-auth/polkit-0.113-r4
@@ -11,5 +11,5 @@ RDEPEND=dev-lang/spidermonkey:0/mozjs185[-debug] dev-libs/glib:2 dev-libs/expat
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/polkit/releases/polkit-0.113.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a5c130e1f044e578ac7ad01682eaed50
diff --git a/metadata/md5-cache/sys-auth/polkit-0.115-r1 b/metadata/md5-cache/sys-auth/polkit-0.115-r1
index 36fc86ca30a4..cd5615863077 100644
--- a/metadata/md5-cache/sys-auth/polkit-0.115-r1
+++ b/metadata/md5-cache/sys-auth/polkit-0.115-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-lang/spidermonkey:52[-debug] dev-libs/glib:2 dev-libs/expat elogind?
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/polkit/releases/polkit-0.115.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e92e49511c150a7673c7eb06ddcafc20
diff --git a/metadata/md5-cache/sys-auth/polkit-qt-0.112.0_p20160416-r2 b/metadata/md5-cache/sys-auth/polkit-qt-0.112.0_p20160416-r2
index 10979e95dabc..a231e15b5f7a 100644
--- a/metadata/md5-cache/sys-auth/polkit-qt-0.112.0_p20160416-r2
+++ b/metadata/md5-cache/sys-auth/polkit-qt-0.112.0_p20160416-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-auth/polkit-0.103 examples? ( dev-qt/qtxml:5 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~kensington/distfiles/polkit-qt-1-0.112.0_p20160416.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0fcf55d526ac78a29f05f9d11cb61819
diff --git a/metadata/md5-cache/sys-auth/rtkit-0.11-r2 b/metadata/md5-cache/sys-auth/rtkit-0.11-r2
index 0df2a6f792e1..1566305d18b7 100644
--- a/metadata/md5-cache/sys-auth/rtkit-0.11-r2
+++ b/metadata/md5-cache/sys-auth/rtkit-0.11-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-3 BSD
 RDEPEND=sys-apps/dbus sys-auth/polkit sys-libs/libcap
 SLOT=0
 SRC_URI=http://0pointer.de/public/rtkit-0.11.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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_=2390ebd02dd520db01b23479688c8376
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 eadad4d36879..e15a7980dcf2 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/sys-auth/sssd-1.12.1 b/metadata/md5-cache/sys-auth/sssd-1.12.1
deleted file mode 100644
index c34610412089..000000000000
--- a/metadata/md5-cache/sys-auth/sssd-1.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=virtual/pam >=dev-libs/popt-1.16 dev-libs/glib:2 >=dev-libs/ding-libs-0.2 >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= >=net-nds/openldap-2.4.30[sasl] >=dev-libs/libpcre-8.30 >=app-crypt/mit-krb5-1.10.3 >=sys-apps/keyutils-1.5 >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 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(+)] ) selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) >=net-dns/bind-tools-9.9[gssapi] >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=sys-apps/dbus-1.6 acl? ( net-fs/cifs-utils[acl] ) augeas? ( app-admin/augeas ) nfsv4? ( net-libs/libnfsidmap ) nls? ( >=sys-devel/gettext-0.18 ) virtual/libintl netlink? ( dev-libs/libnl:3 ) test? ( dev-libs/check ) manpages? ( >=dev-libs/libxslt-1.1.26 app-text/docbook-xml-dtd:4.4 ) >=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
-DESCRIPTION=System Security Services Daemon provides access to identity and authentication
-EAPI=5
-HOMEPAGE=https://pagure.io/sssd/sssd
-IUSE=acl augeas autofs +locator netlink nfsv4 nls +manpages python selinux sudo ssh test python_targets_python2_7 kernel_linux
-KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 x86
-LICENSE=GPL-3
-RDEPEND=virtual/pam >=dev-libs/popt-1.16 dev-libs/glib:2 >=dev-libs/ding-libs-0.2 >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= >=net-nds/openldap-2.4.30[sasl] >=dev-libs/libpcre-8.30 >=app-crypt/mit-krb5-1.10.3 >=sys-apps/keyutils-1.5 >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 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(+)] ) selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) >=net-dns/bind-tools-9.9[gssapi] >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=sys-apps/dbus-1.6 acl? ( net-fs/cifs-utils[acl] ) augeas? ( app-admin/augeas ) nfsv4? ( net-libs/libnfsidmap ) nls? ( >=sys-devel/gettext-0.18 ) virtual/libintl netlink? ( dev-libs/libnl:3 ) >=sys-libs/glibc-2.17[nscd] selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )
-REQUIRED_USE=python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://releases.pagure.org/SSSD/sssd/sssd-1.12.1.tar.gz
-_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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9c83e2ae2720b0101407549e2b393010
diff --git a/metadata/md5-cache/sys-auth/sssd-1.12.4 b/metadata/md5-cache/sys-auth/sssd-1.12.4
deleted file mode 100644
index 585a6a7b0132..000000000000
--- a/metadata/md5-cache/sys-auth/sssd-1.12.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=virtual/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/popt-1.16 dev-libs/glib:2 >=dev-libs/ding-libs-0.2 >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= >=net-nds/openldap-2.4.30[sasl] >=dev-libs/libpcre-8.30 >=app-crypt/mit-krb5-1.10.3 locator? ( >=app-crypt/mit-krb5-1.12.2[abi_x86_32(-)?,abi_x86_64(-)?,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-1.10.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-apps/keyutils-1.5 >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] ) selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) >=net-dns/bind-tools-9.9[gssapi] >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=sys-apps/dbus-1.6 acl? ( net-fs/cifs-utils[acl] ) augeas? ( app-admin/augeas ) nfsv4? ( net-libs/libnfsidmap ) nls? ( >=sys-devel/gettext-0.18 ) virtual/libintl netlink? ( dev-libs/libnl:3 ) samba? ( >=net-fs/samba-4.0 ) test? ( dev-libs/check ) manpages? ( >=dev-libs/libxslt-1.1.26 app-text/docbook-xml-dtd:4.4 ) >=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
-DESCRIPTION=System Security Services Daemon provides access to identity and authentication
-EAPI=5
-HOMEPAGE=https://pagure.io/sssd/sssd
-IUSE=acl augeas autofs +locator netlink nfsv4 nls +manpages python samba selinux sudo ssh test python_targets_python2_7 python_targets_python3_4 python_single_target_python2_7 python_single_target_python3_4 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 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=virtual/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/popt-1.16 dev-libs/glib:2 >=dev-libs/ding-libs-0.2 >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= >=net-nds/openldap-2.4.30[sasl] >=dev-libs/libpcre-8.30 >=app-crypt/mit-krb5-1.10.3 locator? ( >=app-crypt/mit-krb5-1.12.2[abi_x86_32(-)?,abi_x86_64(-)?,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-1.10.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-apps/keyutils-1.5 >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] ) selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) >=net-dns/bind-tools-9.9[gssapi] >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=sys-apps/dbus-1.6 acl? ( net-fs/cifs-utils[acl] ) augeas? ( app-admin/augeas ) nfsv4? ( net-libs/libnfsidmap ) nls? ( >=sys-devel/gettext-0.18 ) virtual/libintl netlink? ( dev-libs/libnl:3 ) samba? ( >=net-fs/samba-4.0 ) >=sys-libs/glibc-2.17[nscd] selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) )
-SLOT=0
-SRC_URI=https://releases.pagure.org/SSSD/sssd/sssd-1.12.4.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=924fcc4355a9df775f973d13a96f29d7
diff --git a/metadata/md5-cache/sys-auth/sssd-1.12.5 b/metadata/md5-cache/sys-auth/sssd-1.12.5
deleted file mode 100644
index e51d69795427..000000000000
--- a/metadata/md5-cache/sys-auth/sssd-1.12.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=virtual/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/popt-1.16 dev-libs/glib:2 >=dev-libs/ding-libs-0.2 >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= >=net-nds/openldap-2.4.30[sasl] >=dev-libs/libpcre-8.30 >=app-crypt/mit-krb5-1.10.3 locator? ( >=app-crypt/mit-krb5-1.12.2[abi_x86_32(-)?,abi_x86_64(-)?,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-1.10.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-apps/keyutils-1.5 >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] ) selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) >=net-dns/bind-tools-9.9[gssapi] >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=sys-apps/dbus-1.6 acl? ( net-fs/cifs-utils[acl] ) augeas? ( app-admin/augeas ) nfsv4? ( net-libs/libnfsidmap ) nls? ( >=sys-devel/gettext-0.18 ) virtual/libintl netlink? ( dev-libs/libnl:3 ) samba? ( >=net-fs/samba-4.0 ) test? ( dev-libs/check ) manpages? ( >=dev-libs/libxslt-1.1.26 app-text/docbook-xml-dtd:4.4 ) >=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
-DESCRIPTION=System Security Services Daemon provides access to identity and authentication
-EAPI=5
-HOMEPAGE=https://pagure.io/sssd/sssd
-IUSE=acl augeas autofs +locator netlink nfsv4 nls +manpages python samba selinux sudo ssh test python_targets_python2_7 python_targets_python3_4 python_single_target_python2_7 python_single_target_python3_4 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 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=virtual/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/popt-1.16 dev-libs/glib:2 >=dev-libs/ding-libs-0.2 >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= >=net-nds/openldap-2.4.30[sasl] >=dev-libs/libpcre-8.30 >=app-crypt/mit-krb5-1.10.3 locator? ( >=app-crypt/mit-krb5-1.12.2[abi_x86_32(-)?,abi_x86_64(-)?,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-1.10.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-apps/keyutils-1.5 >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] ) selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) >=net-dns/bind-tools-9.9[gssapi] >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=sys-apps/dbus-1.6 acl? ( net-fs/cifs-utils[acl] ) augeas? ( app-admin/augeas ) nfsv4? ( net-libs/libnfsidmap ) nls? ( >=sys-devel/gettext-0.18 ) virtual/libintl netlink? ( dev-libs/libnl:3 ) samba? ( >=net-fs/samba-4.0 ) >=sys-libs/glibc-2.17[nscd] selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) )
-SLOT=0
-SRC_URI=https://releases.pagure.org/SSSD/sssd/sssd-1.12.5.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=924fcc4355a9df775f973d13a96f29d7
diff --git a/metadata/md5-cache/sys-auth/sssd-1.13.0 b/metadata/md5-cache/sys-auth/sssd-1.13.0
deleted file mode 100644
index 0852b433f0bd..000000000000
--- a/metadata/md5-cache/sys-auth/sssd-1.13.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=virtual/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/popt-1.16 dev-libs/glib:2 >=dev-libs/ding-libs-0.2 >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= >=net-nds/openldap-2.4.30[sasl] >=dev-libs/libpcre-8.30 >=app-crypt/mit-krb5-1.10.3 locator? ( >=app-crypt/mit-krb5-1.12.2[abi_x86_32(-)?,abi_x86_64(-)?,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-1.10.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-apps/keyutils-1.5 >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) >=net-dns/bind-tools-9.9[gssapi] >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=sys-apps/dbus-1.6 acl? ( net-fs/cifs-utils[acl] ) augeas? ( app-admin/augeas ) nfsv4? ( net-libs/libnfsidmap ) nls? ( >=sys-devel/gettext-0.18 ) virtual/libintl netlink? ( dev-libs/libnl:3 ) samba? ( >=net-fs/samba-4.0 ) test? ( dev-libs/check ) manpages? ( >=dev-libs/libxslt-1.1.26 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 virtual/pkgconfig
-DESCRIPTION=System Security Services Daemon provides access to identity and authentication
-EAPI=5
-HOMEPAGE=https://pagure.io/sssd/sssd
-IUSE=acl augeas autofs +locator netlink nfsv4 nls +manpages python samba selinux sudo ssh test 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 python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=virtual/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/popt-1.16 dev-libs/glib:2 >=dev-libs/ding-libs-0.2 >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= >=net-nds/openldap-2.4.30[sasl] >=dev-libs/libpcre-8.30 >=app-crypt/mit-krb5-1.10.3 locator? ( >=app-crypt/mit-krb5-1.12.2[abi_x86_32(-)?,abi_x86_64(-)?,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-1.10.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-apps/keyutils-1.5 >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) >=net-dns/bind-tools-9.9[gssapi] >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=sys-apps/dbus-1.6 acl? ( net-fs/cifs-utils[acl] ) augeas? ( app-admin/augeas ) nfsv4? ( net-libs/libnfsidmap ) nls? ( >=sys-devel/gettext-0.18 ) virtual/libintl netlink? ( dev-libs/libnl:3 ) samba? ( >=net-fs/samba-4.0 ) >=sys-libs/glibc-2.17[nscd] selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 ) )
-SLOT=0
-SRC_URI=https://releases.pagure.org/SSSD/sssd/sssd-1.13.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=285692b3be917802112183895ba3e94a
diff --git a/metadata/md5-cache/sys-auth/sssd-1.13.1 b/metadata/md5-cache/sys-auth/sssd-1.13.1
deleted file mode 100644
index 80e1898ae6d7..000000000000
--- a/metadata/md5-cache/sys-auth/sssd-1.13.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=virtual/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/popt-1.16 dev-libs/glib:2 >=dev-libs/ding-libs-0.2 >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= >=net-nds/openldap-2.4.30[sasl] >=dev-libs/libpcre-8.30 >=app-crypt/mit-krb5-1.10.3 locator? ( >=app-crypt/mit-krb5-1.12.2[abi_x86_32(-)?,abi_x86_64(-)?,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-1.10.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-apps/keyutils-1.5 >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 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(-)] ) selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) >=net-dns/bind-tools-9.9[gssapi] >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=sys-apps/dbus-1.6 acl? ( net-fs/cifs-utils[acl] ) augeas? ( app-admin/augeas ) nfsv4? ( net-libs/libnfsidmap ) nls? ( >=sys-devel/gettext-0.18 ) virtual/libintl netlink? ( dev-libs/libnl:3 ) samba? ( >=net-fs/samba-4.0 ) test? ( dev-libs/check ) manpages? ( >=dev-libs/libxslt-1.1.26 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 virtual/pkgconfig
-DESCRIPTION=System Security Services Daemon provides access to identity and authentication
-EAPI=5
-HOMEPAGE=https://pagure.io/sssd/sssd
-IUSE=acl augeas autofs +locator netlink nfsv4 nls +manpages python samba selinux sudo ssh test 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 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=>=virtual/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/popt-1.16 dev-libs/glib:2 >=dev-libs/ding-libs-0.2 >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= >=net-nds/openldap-2.4.30[sasl] >=dev-libs/libpcre-8.30 >=app-crypt/mit-krb5-1.10.3 locator? ( >=app-crypt/mit-krb5-1.12.2[abi_x86_32(-)?,abi_x86_64(-)?,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-1.10.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-apps/keyutils-1.5 >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 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(-)] ) selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) >=net-dns/bind-tools-9.9[gssapi] >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=sys-apps/dbus-1.6 acl? ( net-fs/cifs-utils[acl] ) augeas? ( app-admin/augeas ) nfsv4? ( net-libs/libnfsidmap ) nls? ( >=sys-devel/gettext-0.18 ) virtual/libintl netlink? ( dev-libs/libnl:3 ) samba? ( >=net-fs/samba-4.0 ) >=sys-libs/glibc-2.17[nscd] selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
-SLOT=0
-SRC_URI=https://releases.pagure.org/SSSD/sssd/sssd-1.13.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=81dd4a9c8b2737a7ad8bbe42402d5465
diff --git a/metadata/md5-cache/sys-auth/sssd-1.16.3 b/metadata/md5-cache/sys-auth/sssd-1.16.3
new file mode 100644
index 000000000000..9779dab9929d
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/sssd-1.16.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=virtual/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/popt-1.16 dev-libs/glib:2 >=dev-libs/ding-libs-0.2 >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= >=net-nds/openldap-2.4.30[sasl] net-libs/http-parser >=dev-libs/libpcre-8.30 >=app-crypt/mit-krb5-1.10.3 dev-libs/jansson locator? ( >=app-crypt/mit-krb5-1.12.2[abi_x86_32(-)?,abi_x86_64(-)?,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-1.10.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-apps/keyutils-1.5 >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) >=net-dns/bind-tools-9.9[gssapi] >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=sys-apps/dbus-1.6 acl? ( net-fs/cifs-utils[acl] ) nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) ) nls? ( >=sys-devel/gettext-0.18 ) virtual/libintl netlink? ( dev-libs/libnl:3 ) samba? ( >=net-fs/samba-4.5 ) test? ( dev-libs/check ) manpages? ( >=dev-libs/libxslt-1.1.26 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 virtual/pkgconfig
+DESCRIPTION=System Security Services Daemon provides access to identity and authentication
+EAPI=6
+HOMEPAGE=https://pagure.io/SSSD/sssd
+IUSE=acl autofs +locator +netlink nfsv4 nls +manpages python samba selinux sudo ssh test 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 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
+LICENSE=GPL-3
+RDEPEND=>=virtual/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/popt-1.16 dev-libs/glib:2 >=dev-libs/ding-libs-0.2 >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= >=net-nds/openldap-2.4.30[sasl] net-libs/http-parser >=dev-libs/libpcre-8.30 >=app-crypt/mit-krb5-1.10.3 dev-libs/jansson locator? ( >=app-crypt/mit-krb5-1.12.2[abi_x86_32(-)?,abi_x86_64(-)?,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-1.10.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-apps/keyutils-1.5 >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) >=net-dns/bind-tools-9.9[gssapi] >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=sys-apps/dbus-1.6 acl? ( net-fs/cifs-utils[acl] ) nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) ) nls? ( >=sys-devel/gettext-0.18 ) virtual/libintl netlink? ( dev-libs/libnl:3 ) samba? ( >=net-fs/samba-4.5 ) >=sys-libs/glibc-2.17[nscd] selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )
+SLOT=0
+SRC_URI=http://releases.pagure.org/SSSD/sssd/sssd-1.16.3.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	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=80b1911dc730680aee393fbbe136390c
diff --git a/metadata/md5-cache/sys-auth/thinkfinger-0.3-r3 b/metadata/md5-cache/sys-auth/thinkfinger-0.3-r3
index 01e06867fa8a..8d3ab933d618 100644
--- a/metadata/md5-cache/sys-auth/thinkfinger-0.3-r3
+++ b/metadata/md5-cache/sys-auth/thinkfinger-0.3-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libusb:0 pam? ( virtual/pam )
 SLOT=0
 SRC_URI=mirror://sourceforge/thinkfinger/thinkfinger-0.3.tar.gz
-_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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=875f713a0b579755919c203057995ada
diff --git a/metadata/md5-cache/sys-auth/ykpers-1.19.0 b/metadata/md5-cache/sys-auth/ykpers-1.19.0
new file mode 100644
index 000000000000..54f158b6d5a6
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/ykpers-1.19.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/json-c >=sys-auth/libyubikey-1.6 virtual/libusb:1 app-text/asciidoc 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=Library and tool for personalization of Yubico's YubiKey
+EAPI=6
+HOMEPAGE=https://github.com/Yubico/yubikey-personalization
+IUSE=static-libs consolekit
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=dev-libs/json-c >=sys-auth/libyubikey-1.6 virtual/libusb:1 consolekit? ( sys-auth/consolekit[acl] )
+SLOT=0
+SRC_URI=https://github.com/Yubico/yubikey-personalization/archive/v1.19.0.tar.gz -> ykpers-1.19.0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac
+_md5_=5753c0876fba6658a71fe7d9a9cf17a5
diff --git a/metadata/md5-cache/sys-auth/yubico-piv-tool-1.6.2 b/metadata/md5-cache/sys-auth/yubico-piv-tool-1.6.2
new file mode 100644
index 000000000000..6aa4f0449b36
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/yubico-piv-tool-1.6.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/openssl:0=[-bindist] sys-apps/pcsc-lite dev-util/gengetopt sys-apps/help2man 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
+DESCRIPTION=Command line tool for the YubiKey PIV application
+EAPI=6
+HOMEPAGE=https://developers.yubico.com/yubico-piv-tool/ https://github.com/Yubico/yubico-piv-tool
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=BSD-2
+RDEPEND=dev-libs/openssl:0=[-bindist] sys-apps/pcsc-lite
+SLOT=0/1
+SRC_URI=https://github.com/Yubico/yubico-piv-tool/archive/yubico-piv-tool-1.6.2.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=f525f93b2a8ca8bcaf73386feb6305e5
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 2c6cf1a2767e..4dc72b2dbe24 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/arcconf-2.01.22270 b/metadata/md5-cache/sys-block/arcconf-2.01.22270
index 5b3e950a6eac..10bf7bebc8a9 100644
--- a/metadata/md5-cache/sys-block/arcconf-2.01.22270
+++ b/metadata/md5-cache/sys-block/arcconf-2.01.22270
@@ -9,5 +9,5 @@ LICENSE=Microsemi
 RESTRICT=fetch mirror bindist
 SLOT=0
 SRC_URI=https://download.adaptec.com/raid/storage_manager/arcconf_v2_01_22270.zip
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=10ca29c6583d372140b472f4761e0b27
diff --git a/metadata/md5-cache/sys-block/arcconf-2.06.23167 b/metadata/md5-cache/sys-block/arcconf-2.06.23167
index fb37f93c5b17..e2d5c80d9181 100644
--- a/metadata/md5-cache/sys-block/arcconf-2.06.23167
+++ b/metadata/md5-cache/sys-block/arcconf-2.06.23167
@@ -9,5 +9,5 @@ LICENSE=Microsemi
 RESTRICT=fetch mirror bindist
 SLOT=0
 SRC_URI=https://download.adaptec.com/raid/storage_manager/arcconf_v2_06_23167.zip
-_eclasses_=linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=0eadd1b912083311c99d31902635ad64
diff --git a/metadata/md5-cache/sys-block/blktrace-1.1.0 b/metadata/md5-cache/sys-block/blktrace-1.1.0
index 3bf4980d6974..2dd1a4336dad 100644
--- a/metadata/md5-cache/sys-block/blktrace-1.1.0
+++ b/metadata/md5-cache/sys-block/blktrace-1.1.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://brick.kernel.dk/snaps/blktrace-1.1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9ebebae1dc463abe3f92d140ff9100a4
diff --git a/metadata/md5-cache/sys-block/blktrace-1.1.0-r1 b/metadata/md5-cache/sys-block/blktrace-1.1.0-r1
index cad5a90073b3..5a8aa0b6934c 100644
--- a/metadata/md5-cache/sys-block/blktrace-1.1.0-r1
+++ b/metadata/md5-cache/sys-block/blktrace-1.1.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libaio
 SLOT=0
 SRC_URI=http://brick.kernel.dk/snaps/blktrace-1.1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b73b619f690ce295e8b407716e1088f5
diff --git a/metadata/md5-cache/sys-block/blktrace-1.2.0 b/metadata/md5-cache/sys-block/blktrace-1.2.0
index d78bf12d0aa9..4f82185b8294 100644
--- a/metadata/md5-cache/sys-block/blktrace-1.2.0
+++ b/metadata/md5-cache/sys-block/blktrace-1.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libaio
 SLOT=0
 SRC_URI=http://brick.kernel.dk/snaps/blktrace-1.2.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c9f935ca84ba7c0fbedc101355a3c2c7
diff --git a/metadata/md5-cache/sys-block/blocks-0.1.4_pre131210-r1 b/metadata/md5-cache/sys-block/blocks-0.1.4_pre131210-r1
index f1a47ae7dc0d..e1fba7ab01cd 100644
--- a/metadata/md5-cache/sys-block/blocks-0.1.4_pre131210-r1
+++ b/metadata/md5-cache/sys-block/blocks-0.1.4_pre131210-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/blocks-0.1.4_pre131210.tar.xz
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9e5c8f958590a62d8ecacf5b3b9687c9
diff --git a/metadata/md5-cache/sys-block/blocks-9999 b/metadata/md5-cache/sys-block/blocks-9999
index 99f9a003351b..7afebff9907c 100644
--- a/metadata/md5-cache/sys-block/blocks-9999
+++ b/metadata/md5-cache/sys-block/blocks-9999
@@ -9,5 +9,5 @@ RDEPEND=dev-python/maintboot >=dev-python/pyparted-3.10[python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python3_4 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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6345d2a9a306b0426cb185b5abe1bb60
diff --git a/metadata/md5-cache/sys-block/gparted-0.27.0 b/metadata/md5-cache/sys-block/gparted-0.27.0
index 413a69028f6b..0a091e393c7c 100644
--- a/metadata/md5-cache/sys-block/gparted-0.27.0
+++ b/metadata/md5-cache/sys-block/gparted-0.27.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ FDL-1.2+
 RDEPEND=>=dev-cpp/glibmm-2.14:2 >=dev-cpp/gtkmm-2.22:2.4 >=dev-libs/glib-2:2 >=sys-block/parted-3.2:= !policykit? ( kde? ( kde-plasma/kde-cli-tools[kdesu] ) ) policykit? ( sys-auth/polkit ) >=sys-apps/util-linux-2.20 >=sys-fs/e2fsprogs-1.41 btrfs? ( sys-fs/btrfs-progs ) dmraid? ( >=sys-fs/lvm2-2.02.45 sys-fs/dmraid sys-fs/multipath-tools ) f2fs? ( sys-fs/f2fs-tools ) fat? ( sys-fs/dosfstools sys-fs/mtools ) hfs? ( sys-fs/diskdev_cmds virtual/udev sys-fs/hfsutils ) jfs? ( sys-fs/jfsutils ) mdadm? ( sys-fs/mdadm ) ntfs? ( >=sys-fs/ntfs3g-2011.4.12[ntfsprogs] ) reiserfs? ( sys-fs/reiserfsprogs ) reiser4? ( sys-fs/reiser4progs ) xfs? ( sys-fs/xfsprogs sys-fs/xfsdump )
 SLOT=0
 SRC_URI=mirror://sourceforge/gparted/gparted-0.27.0.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=6bcf9b54eb30f8481e39615e3720632e
diff --git a/metadata/md5-cache/sys-block/gparted-0.28.1 b/metadata/md5-cache/sys-block/gparted-0.28.1
index 5c183a319cd7..94c5e76711ca 100644
--- a/metadata/md5-cache/sys-block/gparted-0.28.1
+++ b/metadata/md5-cache/sys-block/gparted-0.28.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ FDL-1.2+
 RDEPEND=>=dev-cpp/glibmm-2.14:2 >=dev-cpp/gtkmm-2.22:2.4 >=dev-libs/glib-2:2 >=sys-block/parted-3.2:= !policykit? ( kde? ( >=kde-plasma/kde-cli-tools-5.8.6-r1[kdesu] ) ) policykit? ( sys-auth/polkit ) >=sys-apps/util-linux-2.20 >=sys-fs/e2fsprogs-1.41 btrfs? ( sys-fs/btrfs-progs ) cryptsetup? ( sys-fs/cryptsetup ) dmraid? ( >=sys-fs/lvm2-2.02.45 sys-fs/dmraid sys-fs/multipath-tools ) f2fs? ( sys-fs/f2fs-tools ) fat? ( sys-fs/dosfstools sys-fs/mtools ) hfs? ( sys-fs/diskdev_cmds virtual/udev sys-fs/hfsutils ) jfs? ( sys-fs/jfsutils ) mdadm? ( sys-fs/mdadm ) ntfs? ( >=sys-fs/ntfs3g-2011.4.12[ntfsprogs] ) reiserfs? ( sys-fs/reiserfsprogs ) reiser4? ( sys-fs/reiser4progs ) xfs? ( sys-fs/xfsprogs sys-fs/xfsdump )
 SLOT=0
 SRC_URI=mirror://sourceforge/gparted/gparted-0.28.1.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=dea665980c0497b219918892cb63c156
diff --git a/metadata/md5-cache/sys-block/gparted-0.29.0 b/metadata/md5-cache/sys-block/gparted-0.29.0
index a0db934b27fe..8d2530f94746 100644
--- a/metadata/md5-cache/sys-block/gparted-0.29.0
+++ b/metadata/md5-cache/sys-block/gparted-0.29.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ FDL-1.2+
 RDEPEND=>=dev-cpp/glibmm-2.14:2 >=dev-cpp/gtkmm-2.22:2.4 >=dev-libs/glib-2:2 >=sys-block/parted-3.2:= !policykit? ( kde? ( >=kde-plasma/kde-cli-tools-5.8.6-r1[kdesu] ) ) policykit? ( sys-auth/polkit ) >=sys-apps/util-linux-2.20 >=sys-fs/e2fsprogs-1.41 btrfs? ( sys-fs/btrfs-progs ) cryptsetup? ( sys-fs/cryptsetup ) dmraid? ( >=sys-fs/lvm2-2.02.45 sys-fs/dmraid sys-fs/multipath-tools ) f2fs? ( sys-fs/f2fs-tools ) fat? ( sys-fs/dosfstools sys-fs/mtools ) hfs? ( sys-fs/diskdev_cmds virtual/udev sys-fs/hfsutils ) jfs? ( sys-fs/jfsutils ) mdadm? ( sys-fs/mdadm ) ntfs? ( >=sys-fs/ntfs3g-2011.4.12[ntfsprogs] ) reiserfs? ( sys-fs/reiserfsprogs ) reiser4? ( sys-fs/reiser4progs ) udf? ( sys-fs/udftools ) xfs? ( sys-fs/xfsprogs sys-fs/xfsdump )
 SLOT=0
 SRC_URI=mirror://sourceforge/gparted/gparted-0.29.0.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=80c494e78aa3d008f37a4ee3daee40eb
diff --git a/metadata/md5-cache/sys-block/iscsitarget-0.4.17 b/metadata/md5-cache/sys-block/iscsitarget-0.4.17
index 3bc06a00f746..725471ce4ea5 100644
--- a/metadata/md5-cache/sys-block/iscsitarget-0.4.17
+++ b/metadata/md5-cache/sys-block/iscsitarget-0.4.17
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/openssl kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=mirror://sourceforge/iscsitarget/iscsitarget-0.4.17.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a8308370d2b153001ac61deec3f06e74
diff --git a/metadata/md5-cache/sys-block/iscsitarget-1.4.19 b/metadata/md5-cache/sys-block/iscsitarget-1.4.19
index 9611f697446a..eb86a06deded 100644
--- a/metadata/md5-cache/sys-block/iscsitarget-1.4.19
+++ b/metadata/md5-cache/sys-block/iscsitarget-1.4.19
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/openssl kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=mirror://sourceforge/iscsitarget/iscsitarget-1.4.19.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=feaf392d2b3c21a3cb12caa6097aa008
diff --git a/metadata/md5-cache/sys-block/iscsitarget-1.4.20.2 b/metadata/md5-cache/sys-block/iscsitarget-1.4.20.2
index ae1d333cfd79..56e5678ac73c 100644
--- a/metadata/md5-cache/sys-block/iscsitarget-1.4.20.2
+++ b/metadata/md5-cache/sys-block/iscsitarget-1.4.20.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/openssl kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=mirror://sourceforge/iscsitarget/iscsitarget-1.4.20.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7f9c05ab8d9db874c7c88bff7ecaddba
diff --git a/metadata/md5-cache/sys-block/iscsitarget-1.4.20.2_p20130103 b/metadata/md5-cache/sys-block/iscsitarget-1.4.20.2_p20130103
index ed6b811a4c5f..ace598747c51 100644
--- a/metadata/md5-cache/sys-block/iscsitarget-1.4.20.2_p20130103
+++ b/metadata/md5-cache/sys-block/iscsitarget-1.4.20.2_p20130103
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/openssl kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ryao/dist/iscsitarget-1.4.20.2_p20130103.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e749c4813408eb907680cc2686a9bcb4
diff --git a/metadata/md5-cache/sys-block/iscsitarget-1.4.20.2_p20130821 b/metadata/md5-cache/sys-block/iscsitarget-1.4.20.2_p20130821
index 1c859b1bfa96..f5e008457490 100644
--- a/metadata/md5-cache/sys-block/iscsitarget-1.4.20.2_p20130821
+++ b/metadata/md5-cache/sys-block/iscsitarget-1.4.20.2_p20130821
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/openssl kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ryao/dist/iscsitarget-1.4.20.2_p20130821.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=28a8adb9f9762a10ab095edb11d066a3
diff --git a/metadata/md5-cache/sys-block/iscsitarget-9999 b/metadata/md5-cache/sys-block/iscsitarget-9999
index 3731fd2ce6db..716156c4e763 100644
--- a/metadata/md5-cache/sys-block/iscsitarget-9999
+++ b/metadata/md5-cache/sys-block/iscsitarget-9999
@@ -7,5 +7,5 @@ IUSE=kernel_linux kernel_linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/openssl kernel_linux? ( virtual/modutils )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	subversion	3d1eb4b41d7190570a84f786958ebb13	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=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	preserve-libs	ef207dc62baddfddfd39a164d9797648	subversion	3d1eb4b41d7190570a84f786958ebb13	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0411d755fa7105c348318367bc6c1693
diff --git a/metadata/md5-cache/sys-block/kvpm-0.9.10 b/metadata/md5-cache/sys-block/kvpm-0.9.10
index 3bb5c882f650..86fbdaff24df 100644
--- a/metadata/md5-cache/sys-block/kvpm-0.9.10
+++ b/metadata/md5-cache/sys-block/kvpm-0.9.10
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/open-iscsi-2.0.872-r2 b/metadata/md5-cache/sys-block/open-iscsi-2.0.872-r2
index 2632328517af..d2815399e6e9 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.0.872-r2
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.0.872-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=slp? ( net-libs/openslp ) sys-apps/util-linux
 SLOT=0
 SRC_URI=http://www.open-iscsi.org/bits/open-iscsi-2.0-872.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=bf04c00a9a2c47f8b29f221cdd423881
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.0.872-r3 b/metadata/md5-cache/sys-block/open-iscsi-2.0.872-r3
index 3141e9a139f5..4e336dd35b76 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.0.872-r3
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.0.872-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=slp? ( net-libs/openslp ) virtual/udev sys-fs/lsscsi sys-apps/util-linux
 SLOT=0
 SRC_URI=http://www.open-iscsi.org/bits/open-iscsi-2.0-872.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=206946fad2468c617094745277ca99e6
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.0.873 b/metadata/md5-cache/sys-block/open-iscsi-2.0.873
index 3577aec48c06..37ee480e7492 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.0.873
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.0.873
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=slp? ( net-libs/openslp ) sys-fs/lsscsi sys-apps/util-linux
 SLOT=0
 SRC_URI=http://www.open-iscsi.org/bits/open-iscsi-2.0-873.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=29d432dc464b7e99d2a5da869f715ca2
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r1 b/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r1
index 18cb37c2c8bd..8ef88254fe97 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r1
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=slp? ( net-libs/openslp ) sys-fs/lsscsi sys-apps/util-linux
 SLOT=0
 SRC_URI=http://www.open-iscsi.org/bits/open-iscsi-2.0-873.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=da7c7150bbcacd3198827ca93becf054
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r2 b/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r2
index 9533e8955588..24614f9eb5f8 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r2
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r2
@@ -10,5 +10,5 @@ RDEPEND=slp? ( net-libs/openslp ) infiniband? ( sys-fabric/ofed ) sys-fs/lsscsi
 REQUIRED_USE=infiniband? ( rdma ) || ( rdma tcp )
 SLOT=0
 SRC_URI=http://www.open-iscsi.org/bits/open-iscsi-2.0-873.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=6d54242a66d0751b632825b4d8586bb0
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r3 b/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r3
index c4866b129a0c..843ef970a642 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r3
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r3
@@ -10,5 +10,5 @@ RDEPEND=slp? ( net-libs/openslp ) infiniband? ( sys-fabric/ofed ) sys-fs/lsscsi
 REQUIRED_USE=infiniband? ( rdma ) || ( rdma tcp )
 SLOT=0
 SRC_URI=http://www.open-iscsi.org/bits/open-iscsi-2.0-873.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=24c732e22e00a72d5cf80be77e7d6910
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.0.874 b/metadata/md5-cache/sys-block/open-iscsi-2.0.874
index 119469d73c02..aa6620ae8dd5 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.0.874
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.0.874
@@ -10,5 +10,5 @@ RDEPEND=sys-block/open-isns:= slp? ( net-libs/openslp ) infiniband? ( sys-fabric
 REQUIRED_USE=infiniband? ( rdma ) || ( rdma tcp )
 SLOT=0
 SRC_URI=https://github.com/open-iscsi/open-iscsi/archive/2.0.874.tar.gz -> open-iscsi-2.0.874.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=e9adc89fc46d22c507955c6c42b500d8
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.0.874-r1 b/metadata/md5-cache/sys-block/open-iscsi-2.0.874-r1
index 051ee1f45490..1df27bfbff52 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.0.874-r1
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.0.874-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-block/open-isns:= slp? ( net-libs/openslp ) infiniband? ( sys-fabric
 REQUIRED_USE=infiniband? ( rdma ) || ( rdma tcp )
 SLOT=0
 SRC_URI=https://github.com/open-iscsi/open-iscsi/archive/2.0.874.tar.gz -> open-iscsi-2.0.874.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=e582c4e658e2d930d98b4899381790ab
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.0.874-r2 b/metadata/md5-cache/sys-block/open-iscsi-2.0.874-r2
index a665cf5ef277..8dce1104e3c7 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.0.874-r2
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.0.874-r2
@@ -10,5 +10,5 @@ RDEPEND=sys-block/open-isns:= infiniband? ( sys-fabric/ofed ) sys-fs/lsscsi sys-
 REQUIRED_USE=infiniband? ( rdma ) || ( rdma tcp )
 SLOT=0
 SRC_URI=https://github.com/open-iscsi/open-iscsi/archive/2.0.874.tar.gz -> open-iscsi-2.0.874.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=08cf26201848e0fcf18510b8c9edfb1c
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.0.875 b/metadata/md5-cache/sys-block/open-iscsi-2.0.875
index 19456cf6c037..62bc8e29d231 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.0.875
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.0.875
@@ -10,5 +10,5 @@ RDEPEND=sys-block/open-isns:= infiniband? ( sys-fabric/ofed ) sys-kernel/linux-h
 REQUIRED_USE=infiniband? ( rdma ) || ( rdma tcp )
 SLOT=0
 SRC_URI=https://github.com/open-iscsi/open-iscsi/archive/2.0.875.tar.gz -> open-iscsi-2.0.875.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=bc6d9784a31630148e800537d18cc614
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.0.876 b/metadata/md5-cache/sys-block/open-iscsi-2.0.876
index f215b6577f8b..1312a06e20a9 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.0.876
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.0.876
@@ -10,5 +10,5 @@ RDEPEND=sys-block/open-isns:= infiniband? ( sys-fabric/ofed ) sys-kernel/linux-h
 REQUIRED_USE=infiniband? ( rdma ) || ( rdma tcp )
 SLOT=0
 SRC_URI=https://github.com/open-iscsi/open-iscsi/archive/2.0.876.tar.gz -> open-iscsi-2.0.876.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=22eb823edfa4a5edda7efdda0e40aa90
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.0.876_p20180814 b/metadata/md5-cache/sys-block/open-iscsi-2.0.876_p20180814
index c25ceb2f0b1b..0f01f475d183 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.0.876_p20180814
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.0.876_p20180814
@@ -10,5 +10,5 @@ RDEPEND=sys-block/open-isns:= infiniband? ( sys-fabric/ofed ) sys-kernel/linux-h
 REQUIRED_USE=infiniband? ( rdma ) || ( rdma tcp )
 SLOT=0/0.2
 SRC_URI=https://github.com/open-iscsi/open-iscsi/archive/96c1a8e344d93594a3bb4faa848f878cc7315bde.tar.gz -> open-iscsi-2.0.876_p20180814.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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_=ddab5b7e85a96bcc2458a437af7ccfee
diff --git a/metadata/md5-cache/sys-block/partitionmanager-3.3.1 b/metadata/md5-cache/sys-block/partitionmanager-3.3.1
index 4149da61c268..ebcf4321bf78 100644
--- a/metadata/md5-cache/sys-block/partitionmanager-3.3.1
+++ b/metadata/md5-cache/sys-block/partitionmanager-3.3.1
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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-block/rts5229-1.07-r6 b/metadata/md5-cache/sys-block/rts5229-1.07-r6
index 1d4243ffe0f1..6030794f2677 100644
--- a/metadata/md5-cache/sys-block/rts5229-1.07-r6
+++ b/metadata/md5-cache/sys-block/rts5229-1.07-r6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~vikraman/distfiles/rts5229-1.07.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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_=3b357cec520970b771582a09fe196542
diff --git a/metadata/md5-cache/sys-block/rts_pstor-1.10-r5 b/metadata/md5-cache/sys-block/rts_pstor-1.10-r5
index 2ecafc093fb8..6c02a3f82b68 100644
--- a/metadata/md5-cache/sys-block/rts_pstor-1.10-r5
+++ b/metadata/md5-cache/sys-block/rts_pstor-1.10-r5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~vikraman/distfiles/rts_pstor-1.10.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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_=b540e3aaaf5ab9a8b385353fb7d6616b
diff --git a/metadata/md5-cache/sys-block/seekwatcher-0.12_p20091015-r1 b/metadata/md5-cache/sys-block/seekwatcher-0.12_p20091015-r1
index b4d74e16aca7..14652db09fea 100644
--- a/metadata/md5-cache/sys-block/seekwatcher-0.12_p20091015-r1
+++ b/metadata/md5-cache/sys-block/seekwatcher-0.12_p20091015-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python2_7 ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~slyfox/seekwatcher-0.12_p20091015.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a31fd6198471b475d0ce05c119e9f665
diff --git a/metadata/md5-cache/sys-block/targetcli-fb-2.1.45 b/metadata/md5-cache/sys-block/targetcli-fb-2.1.45
index 9c265aa9ad8f..120184cf58ba 100644
--- a/metadata/md5-cache/sys-block/targetcli-fb-2.1.45
+++ b/metadata/md5-cache/sys-block/targetcli-fb-2.1.45
@@ -10,5 +10,5 @@ RDEPEND=dev-python/configshell-fb[python_targets_python2_7(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/open-iscsi/targetcli-fb/archive/v2.1.fb45.tar.gz -> targetcli-fb-2.1.45.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4b93bfb17b9c36699fb8b20611a71679
diff --git a/metadata/md5-cache/sys-block/targetcli-fb-2.1.48 b/metadata/md5-cache/sys-block/targetcli-fb-2.1.48
index 6e81678fa659..4fc1eb19dd40 100644
--- a/metadata/md5-cache/sys-block/targetcli-fb-2.1.48
+++ b/metadata/md5-cache/sys-block/targetcli-fb-2.1.48
@@ -10,5 +10,5 @@ RDEPEND=dev-python/configshell-fb[python_targets_python2_7(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/open-iscsi/targetcli-fb/archive/v2.1.fb48.tar.gz -> targetcli-fb-2.1.48.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bb4b2623c95becd89351de8fe7cbec20
diff --git a/metadata/md5-cache/sys-block/targetcli-fb-2.1.48-r1 b/metadata/md5-cache/sys-block/targetcli-fb-2.1.48-r1
index 8929f407f65c..69d59b9d592d 100644
--- a/metadata/md5-cache/sys-block/targetcli-fb-2.1.48-r1
+++ b/metadata/md5-cache/sys-block/targetcli-fb-2.1.48-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/configshell-fb[python_targets_python2_7(-)?,python_targets_py
 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/open-iscsi/targetcli-fb/archive/v2.1.fb48.tar.gz -> targetcli-fb-2.1.48.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d998e80db2f895b8de217610123a2237
diff --git a/metadata/md5-cache/sys-block/targetcli-fb-2.1.48-r2 b/metadata/md5-cache/sys-block/targetcli-fb-2.1.48-r2
index c123e3e5ac07..2f5278be56af 100644
--- a/metadata/md5-cache/sys-block/targetcli-fb-2.1.48-r2
+++ b/metadata/md5-cache/sys-block/targetcli-fb-2.1.48-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/configshell-fb[python_targets_python2_7(-)?,python_targets_py
 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/open-iscsi/targetcli-fb/archive/v2.1.fb48.tar.gz -> targetcli-fb-2.1.48.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=58d39a4a686ae808b4e590f9f192f4c7
diff --git a/metadata/md5-cache/sys-block/whdd-2.2 b/metadata/md5-cache/sys-block/whdd-2.2
index 2dceeb571556..8d51393ccc76 100644
--- a/metadata/md5-cache/sys-block/whdd-2.2
+++ b/metadata/md5-cache/sys-block/whdd-2.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-util/dialog:= sys-libs/ncurses:0[unicode] sys-apps/smartmontools
 SLOT=0
 SRC_URI=https://github.com/krieger-od/whdd/tarball/2.2 -> whdd-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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=de5aac78fd65b137d210686a89491246
diff --git a/metadata/md5-cache/sys-block/zram-init-7.1-r1 b/metadata/md5-cache/sys-block/zram-init-7.1-r1
index 0a2cd6875ac9..793ceb00100b 100644
--- a/metadata/md5-cache/sys-block/zram-init-7.1-r1
+++ b/metadata/md5-cache/sys-block/zram-init-7.1-r1
@@ -3,10 +3,10 @@ DEPEND=virtual/pkgconfig
 DESCRIPTION=Scripts to support compressed swap devices or ramdisks with zram
 EAPI=6
 HOMEPAGE=https://github.com/vaeth/zram-init/
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=app-shells/push-2.0 !<sys-apps/openrc-0.13
 SLOT=0
 SRC_URI=https://github.com/vaeth/zram-init/archive/v7.1.tar.gz -> zram-init-7.1.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=249380c1f12b66aa5ffddb719294050b
+_md5_=2527f8d285a5b07d872fa76458275ec2
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index b46f27496cf0..fcbc351a271f 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/elilo-3.16-r3 b/metadata/md5-cache/sys-boot/elilo-3.16-r3
new file mode 100644
index 000000000000..58eea00e6d4b
--- /dev/null
+++ b/metadata/md5-cache/sys-boot/elilo-3.16-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=>=sys-boot/gnu-efi-3.0g dev-util/patchutils
+DESCRIPTION=Linux boot loader for EFI-based systems such as IA-64
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/elilo/
+KEYWORDS=~amd64 ~ia64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-boot/efibootmgr sys-fs/dosfstools[compat]
+SLOT=0
+SRC_URI=mirror://sourceforge/elilo/elilo-3.16-all.tar.gz mirror://debian/pool/main/e/elilo/elilo_3.14-3.debian.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_=dbbcad32ce0cfb4196a7625a92731f7a
diff --git a/metadata/md5-cache/sys-boot/grub-0.97-r16 b/metadata/md5-cache/sys-boot/grub-0.97-r16
index 9d53e325640d..0ca855ea9aa6 100644
--- a/metadata/md5-cache/sys-boot/grub-0.97-r16
+++ b/metadata/md5-cache/sys-boot/grub-0.97-r16
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!static? ( ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)] ) ) !sys-boot/grub:2[-multislot]
 SLOT=0
 SRC_URI=mirror://gentoo/grub-0.97.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz mirror://gentoo/splash.xpm.gz mirror://gentoo/grub-0.97-patches-1.14.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8fe39d9e6ea74ed8555b0d4e15424edf
diff --git a/metadata/md5-cache/sys-boot/grub-0.97-r18 b/metadata/md5-cache/sys-boot/grub-0.97-r18
index d329dbc39877..9d1651defb3e 100644
--- a/metadata/md5-cache/sys-boot/grub-0.97-r18
+++ b/metadata/md5-cache/sys-boot/grub-0.97-r18
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!static? ( ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)] ) ) !sys-boot/grub:2[-multislot]
 SLOT=0
 SRC_URI=mirror://gentoo/grub-0.97.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz mirror://gentoo/splash.xpm.gz mirror://gentoo/grub-0.97-patches-1.15.tar.bz2 https://dev.gentoo.org/~whissi/dist/grub/grub-0.97-patches-1.15.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a3704d68dc8e49492a672fc4de4ce94e
diff --git a/metadata/md5-cache/sys-boot/grub-static-0.97-r10 b/metadata/md5-cache/sys-boot/grub-static-0.97-r10
index d0111ea8b298..cc7684b0e7da 100644
--- a/metadata/md5-cache/sys-boot/grub-static-0.97-r10
+++ b/metadata/md5-cache/sys-boot/grub-static-0.97-r10
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!<sys-boot/grub-2
 SLOT=0
 SRC_URI=mirror://gentoo/grub-static-0.97-r10.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=eddc4eea556717945f8a5e44f547c110
diff --git a/metadata/md5-cache/sys-boot/grub-static-0.97-r12 b/metadata/md5-cache/sys-boot/grub-static-0.97-r12
index 5d20e05ab28b..f3515080a410 100644
--- a/metadata/md5-cache/sys-boot/grub-static-0.97-r12
+++ b/metadata/md5-cache/sys-boot/grub-static-0.97-r12
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!<sys-boot/grub-2
 SLOT=0
 SRC_URI=mirror://gentoo/grub-static-0.97-r12.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e0a9c204046860092b2e20eaa2b933d6
diff --git a/metadata/md5-cache/sys-boot/grub-static-0.97-r9 b/metadata/md5-cache/sys-boot/grub-static-0.97-r9
index abcd705e7510..a5315e080b40 100644
--- a/metadata/md5-cache/sys-boot/grub-static-0.97-r9
+++ b/metadata/md5-cache/sys-boot/grub-static-0.97-r9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!<sys-boot/grub-2
 SLOT=0
 SRC_URI=mirror://gentoo/grub-static-0.97-r9.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=efde9233702ccbc5bb5901f4e5db74d5
diff --git a/metadata/md5-cache/sys-boot/raspberrypi-mkimage-0_p20120201 b/metadata/md5-cache/sys-boot/raspberrypi-mkimage-0_p20120201
index a4d955539e80..e8da6ad86ab4 100644
--- a/metadata/md5-cache/sys-boot/raspberrypi-mkimage-0_p20120201
+++ b/metadata/md5-cache/sys-boot/raspberrypi-mkimage-0_p20120201
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=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	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3a31396daa119754109ad81d05610732
diff --git a/metadata/md5-cache/sys-boot/systemd-boot-239 b/metadata/md5-cache/sys-boot/systemd-boot-239
index 84de102fda3b..57507f782b14 100644
--- a/metadata/md5-cache/sys-boot/systemd-boot-239
+++ b/metadata/md5-cache/sys-boot/systemd-boot-239
@@ -10,4 +10,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v239.tar.gz -> systemd-239.tar.gz
 _eclasses_=meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=048a34ad3162179c5aaa83c86d919095
+_md5_=52bfbcfac7998cfa9378707a2925704e
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 5c5161b3ba0c..ef82d33de726 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-12.2.7 b/metadata/md5-cache/sys-cluster/ceph-12.2.7
index 45cae424e5c8..e81c4b34cf74 100644
--- a/metadata/md5-cache/sys-cluster/ceph-12.2.7
+++ b/metadata/md5-cache/sys-cluster/ceph-12.2.7
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7 || ( python_targets_python2_7 python_targe
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-12.2.7.tar.gz
-_eclasses_=check-reqs	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=667bddd9552d3b74cdf772f58a5506d3
diff --git a/metadata/md5-cache/sys-cluster/ceph-12.2.8 b/metadata/md5-cache/sys-cluster/ceph-12.2.8
index 80d58a3112b3..391c50587022 100644
--- a/metadata/md5-cache/sys-cluster/ceph-12.2.8
+++ b/metadata/md5-cache/sys-cluster/ceph-12.2.8
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7 || ( python_targets_python2_7 python_targe
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-12.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/sys-cluster/ceph-13.2.1-r1 b/metadata/md5-cache/sys-cluster/ceph-13.2.1-r1
index ae11a31f2948..8e114b0a96dc 100644
--- a/metadata/md5-cache/sys-cluster/ceph-13.2.1-r1
+++ b/metadata/md5-cache/sys-cluster/ceph-13.2.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-13.2.1.tar.gz mgr-frontend? ( mirror://gentoo/ceph-13.2.1-frontend-node-modules.tar.xz )
-_eclasses_=check-reqs	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=355b00556baef0950caf9aae6c4e73bb
diff --git a/metadata/md5-cache/sys-cluster/charliecloud-0.2.4 b/metadata/md5-cache/sys-cluster/charliecloud-0.2.4
deleted file mode 100644
index bf28ce333e6a..000000000000
--- a/metadata/md5-cache/sys-cluster/charliecloud-0.2.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=pv? ( sys-apps/pv ) doc? ( dev-python/sphinx dev-python/sphinx_rtd_theme net-misc/rsync ) test? ( app-arch/pigz )
-DESCRIPTION=Lightweight user-defined software stacks for high-performance computing
-EAPI=7
-HOMEPAGE=https://hpc.github.io/charliecloud/
-IUSE=doc examples +pv test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/hpc/charliecloud/archive/v0.2.4.tar.gz -> charliecloud-0.2.4.tar.gz
-_md5_=bd1ed0af4a1667156e50f4ffcf22d2fb
diff --git a/metadata/md5-cache/sys-cluster/charliecloud-0.9.3 b/metadata/md5-cache/sys-cluster/charliecloud-0.9.3
new file mode 100644
index 000000000000..ad4769814570
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/charliecloud-0.9.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install test
+DEPEND=pv? ( sys-apps/pv ) doc? ( dev-python/sphinx dev-python/sphinx_rtd_theme net-misc/rsync ) test? ( app-arch/pigz )
+DESCRIPTION=Lightweight user-defined software stacks for high-performance computing
+EAPI=7
+HOMEPAGE=https://hpc.github.io/charliecloud/
+IUSE=doc examples +pv test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/hpc/charliecloud/archive/v0.9.3.tar.gz -> charliecloud-0.9.3.tar.gz
+_md5_=bd1ed0af4a1667156e50f4ffcf22d2fb
diff --git a/metadata/md5-cache/sys-cluster/cinder-11.1.1 b/metadata/md5-cache/sys-cluster/cinder-11.1.1
index 6c3ad6ff2aab..f3c3383472e0 100644
--- a/metadata/md5-cache/sys-cluster/cinder-11.1.1
+++ b/metadata/md5-cache/sys-cluster/cinder-11.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/pike/cinder.conf.sample -> pike-cinder.conf.sample https://tarballs.openstack.org/cinder/cinder-11.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=142e637438712141471024c57366c06c
diff --git a/metadata/md5-cache/sys-cluster/cinder-12.0.3 b/metadata/md5-cache/sys-cluster/cinder-12.0.3
index 406f38ac50e1..8ec88c0e8438 100644
--- a/metadata/md5-cache/sys-cluster/cinder-12.0.3
+++ b/metadata/md5-cache/sys-cluster/cinder-12.0.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 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.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a0821ead26a4045b5e79f5f61ba80510
diff --git a/metadata/md5-cache/sys-cluster/cinder-13.0.0 b/metadata/md5-cache/sys-cluster/cinder-13.0.0
index eeb93941e21a..700cbf97eacf 100644
--- a/metadata/md5-cache/sys-cluster/cinder-13.0.0
+++ b/metadata/md5-cache/sys-cluster/cinder-13.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 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/rocky/cinder.conf.sample -> cinder.conf.sample-13.0.0 https://tarballs.openstack.org/cinder/cinder-13.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=429069aeb9429d7d74eec8f232d1ca60
diff --git a/metadata/md5-cache/sys-cluster/cinder-2017.2.9999 b/metadata/md5-cache/sys-cluster/cinder-2017.2.9999
index 4b59cd0a360c..37d13a12dc96 100644
--- a/metadata/md5-cache/sys-cluster/cinder-2017.2.9999
+++ b/metadata/md5-cache/sys-cluster/cinder-2017.2.9999
@@ -9,5 +9,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 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/pike/cinder.conf.sample -> pike-cinder.conf.sample
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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_=61fc5bc474f9c759538e03893e37e67a
diff --git a/metadata/md5-cache/sys-cluster/cinder-2018.1.9999 b/metadata/md5-cache/sys-cluster/cinder-2018.1.9999
index b530af92078e..f025d323c548 100644
--- a/metadata/md5-cache/sys-cluster/cinder-2018.1.9999
+++ b/metadata/md5-cache/sys-cluster/cinder-2018.1.9999
@@ -9,5 +9,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 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
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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_=fcdb88963bc9c0ea53d6709f0d52ee59
diff --git a/metadata/md5-cache/sys-cluster/cinder-2018.2.9999 b/metadata/md5-cache/sys-cluster/cinder-2018.2.9999
index 7f0cdfb6944f..cf0c36cf1883 100644
--- a/metadata/md5-cache/sys-cluster/cinder-2018.2.9999
+++ b/metadata/md5-cache/sys-cluster/cinder-2018.2.9999
@@ -9,5 +9,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 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/rocky/cinder.conf.sample -> cinder.conf.sample-2018.2.9999
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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_=8ee4c401b16232ab9b28d11d5a04542a
diff --git a/metadata/md5-cache/sys-cluster/cluster-glue-1.0.12-r1 b/metadata/md5-cache/sys-cluster/cluster-glue-1.0.12-r1
new file mode 100644
index 000000000000..f4a541ebf5cf
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/cluster-glue-1.0.12-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=!<sys-cluster/heartbeat-3.0 app-arch/bzip2 app-text/asciidoc app-text/docbook-xml-dtd:4.4 dev-libs/glib:2 dev-libs/libaio dev-libs/libxml2 ipmilan? ( sys-libs/openipmi ) libnet? ( net-libs/libnet:1.1 ) net-misc/curl net-misc/iputils || ( net-misc/netkit-telnetd net-misc/telnet-bsd ) doc? ( dev-libs/libxslt app-text/docbook-xsl-stylesheets ) >=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 pack for Heartbeat / Pacemaker
+EAPI=6
+HOMEPAGE=http://www.linux-ha.org/wiki/Cluster_Glue
+IUSE=doc ipmilan libnet static-libs
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=GPL-2
+RDEPEND=!<sys-cluster/heartbeat-3.0 app-arch/bzip2 app-text/asciidoc app-text/docbook-xml-dtd:4.4 dev-libs/glib:2 dev-libs/libaio dev-libs/libxml2 ipmilan? ( sys-libs/openipmi ) libnet? ( net-libs/libnet:1.1 ) net-misc/curl net-misc/iputils || ( net-misc/netkit-telnetd net-misc/telnet-bsd )
+SLOT=0
+SRC_URI=http://hg.linux-ha.org/glue/archive/glue-1.0.12.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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=5b011faa2238e806e9371d05d78ec2b7
diff --git a/metadata/md5-cache/sys-cluster/cman-3.1.5 b/metadata/md5-cache/sys-cluster/cman-3.1.5
index cdfeddcefa2a..2cf252258bbc 100644
--- a/metadata/md5-cache/sys-cluster/cman-3.1.5
+++ b/metadata/md5-cache/sys-cluster/cman-3.1.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 dev-libs/libxslt dbus? ( sys-apps/dbus ) ldap? ( net-nds/openldap ) sys-cluster/corosync sys-cluster/openais ~sys-cluster/libccs-3.1.5 ~sys-cluster/libfence-3.1.5 ~sys-cluster/libcman-3.1.5 ~sys-cluster/libdlm-3.1.5 ~sys-cluster/liblogthread-3.1.5 !sys-cluster/dlm
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/c/l/cluster/cluster-3.1.5.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=f2b35a737563ec1dc954412c27ccc3d6
diff --git a/metadata/md5-cache/sys-cluster/cman-3.1.5-r1 b/metadata/md5-cache/sys-cluster/cman-3.1.5-r1
index 03d4ba4f7d22..e9f75ba9ee8b 100644
--- a/metadata/md5-cache/sys-cluster/cman-3.1.5-r1
+++ b/metadata/md5-cache/sys-cluster/cman-3.1.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 dev-libs/libxslt dbus? ( sys-apps/dbus ) ldap? ( net-nds/openldap ) sys-cluster/corosync sys-cluster/openais ~sys-cluster/libccs-3.1.5 ~sys-cluster/libfence-3.1.5 ~sys-cluster/libcman-3.1.5 ~sys-cluster/libdlm-3.1.5 ~sys-cluster/liblogthread-3.1.5 !sys-cluster/dlm
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/c/l/cluster/cluster-3.1.5.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=c556739bd67b1e18f6c86668a45ca38c
diff --git a/metadata/md5-cache/sys-cluster/cman-3.2.0 b/metadata/md5-cache/sys-cluster/cman-3.2.0
index 5a689884f065..ccfc9afb6590 100644
--- a/metadata/md5-cache/sys-cluster/cman-3.2.0
+++ b/metadata/md5-cache/sys-cluster/cman-3.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 dev-libs/libxslt dbus? ( sys-apps/dbus ) ldap? ( net-nds/openldap ) sys-cluster/corosync sys-cluster/openais ~sys-cluster/libccs-3.2.0 ~sys-cluster/libfence-3.2.0 ~sys-cluster/libcman-3.2.0 ~sys-cluster/libdlm-3.2.0 ~sys-cluster/liblogthread-3.2.0 !sys-cluster/dlm
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/c/l/cluster/cluster-3.2.0.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=0e35d443462b5f1f98cc3dd6809519b5
diff --git a/metadata/md5-cache/sys-cluster/dlm-2.03.09 b/metadata/md5-cache/sys-cluster/dlm-2.03.09
index 9de0d22c3578..0dc8e4546ac0 100644
--- a/metadata/md5-cache/sys-cluster/dlm-2.03.09
+++ b/metadata/md5-cache/sys-cluster/dlm-2.03.09
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-kernel/linux-headers-2.6.24 !sys-cluster/dlm-headers !sys-cluster/dlm-kernel =sys-cluster/dlm-lib-2.03.09* kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/cluster/releases/cluster-2.03.09.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=e3f1fd1f0f9e7d86c002abd86915bf8a
diff --git a/metadata/md5-cache/sys-cluster/dlm-2.03.11 b/metadata/md5-cache/sys-cluster/dlm-2.03.11
index b5b50329fb18..614883eb1af2 100644
--- a/metadata/md5-cache/sys-cluster/dlm-2.03.11
+++ b/metadata/md5-cache/sys-cluster/dlm-2.03.11
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-kernel/linux-headers-2.6.24 !sys-cluster/dlm-headers !sys-cluster/dlm-kernel =sys-cluster/dlm-lib-2.03.11* kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/cluster/releases/cluster-2.03.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=dfbf9a82308d7fb637dbbd9240258520
diff --git a/metadata/md5-cache/sys-cluster/dlm-lib-2.03.09 b/metadata/md5-cache/sys-cluster/dlm-lib-2.03.09
index 0ffddbe80766..52a2c5398635 100644
--- a/metadata/md5-cache/sys-cluster/dlm-lib-2.03.09
+++ b/metadata/md5-cache/sys-cluster/dlm-lib-2.03.09
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-kernel/linux-headers-2.6.24 !sys-cluster/dlm-headers !sys-cluster/dlm-kernel kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/cluster/releases/cluster-2.03.09.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=76db8c8ab092b95cb8dba09e34cef2b0
diff --git a/metadata/md5-cache/sys-cluster/dlm-lib-2.03.11 b/metadata/md5-cache/sys-cluster/dlm-lib-2.03.11
index cd6a4f1fadb6..69c8d28f6a0e 100644
--- a/metadata/md5-cache/sys-cluster/dlm-lib-2.03.11
+++ b/metadata/md5-cache/sys-cluster/dlm-lib-2.03.11
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-kernel/linux-headers-2.6.24 !sys-cluster/dlm-headers !sys-cluster/dlm-kernel kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/cluster/releases/cluster-2.03.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=7e723c9540560ed70c11752feb3f82fc
diff --git a/metadata/md5-cache/sys-cluster/ganglia-3.7.1-r1 b/metadata/md5-cache/sys-cluster/ganglia-3.7.1-r1
index efb9568dd6bb..d9877227d07c 100644
--- a/metadata/md5-cache/sys-cluster/ganglia-3.7.1-r1
+++ b/metadata/md5-cache/sys-cluster/ganglia-3.7.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/confuse dev-libs/expat >=dev-libs/apr-1.0 net-libs/libnsl:0= !d
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/ganglia/ganglia-3.7.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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=f08eb9366a7a6eb7ea150fb1f179592c
diff --git a/metadata/md5-cache/sys-cluster/heat-10.0.2 b/metadata/md5-cache/sys-cluster/heat-10.0.2
index fd4d16b1ff22..f5f08c19e23b 100644
--- a/metadata/md5-cache/sys-cluster/heat-10.0.2
+++ b/metadata/md5-cache/sys-cluster/heat-10.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( 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/heat/heat.conf.sample.queens -> heat.conf.sample-10.0.2 https://tarballs.openstack.org/heat/heat-10.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b241d5c43c5457b6f5404a01de9ee433
diff --git a/metadata/md5-cache/sys-cluster/heat-11.0.0 b/metadata/md5-cache/sys-cluster/heat-11.0.0
index 6470fa3ffb82..e070c805c8b2 100644
--- a/metadata/md5-cache/sys-cluster/heat-11.0.0
+++ b/metadata/md5-cache/sys-cluster/heat-11.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( 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/heat/heat.conf.sample.rocky -> heat.conf.sample-11.0.0 https://tarballs.openstack.org/heat/heat-11.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1e19874f0ec21673cb4f8a3b17b2a723
diff --git a/metadata/md5-cache/sys-cluster/heat-2017.2.9999 b/metadata/md5-cache/sys-cluster/heat-2017.2.9999
index 2ff1116b45ba..422dc222a782 100644
--- a/metadata/md5-cache/sys-cluster/heat-2017.2.9999
+++ b/metadata/md5-cache/sys-cluster/heat-2017.2.9999
@@ -9,5 +9,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( 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/heat/heat.conf.sample.pike -> heat.conf.sample-2017.2.9999
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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_=63f2b426cdcb2a646ff78e9506a1bc1e
diff --git a/metadata/md5-cache/sys-cluster/heat-2018.1.9999 b/metadata/md5-cache/sys-cluster/heat-2018.1.9999
index d2cd55c02f6e..d394cb300bea 100644
--- a/metadata/md5-cache/sys-cluster/heat-2018.1.9999
+++ b/metadata/md5-cache/sys-cluster/heat-2018.1.9999
@@ -9,5 +9,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( 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/heat/heat.conf.sample.queens -> heat.conf.sample-2018.1.9999
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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_=708b6116a18d7934a88201ee9f7f3c99
diff --git a/metadata/md5-cache/sys-cluster/heat-2018.2.9999 b/metadata/md5-cache/sys-cluster/heat-2018.2.9999
index 5b0eb449ba13..8d3c4d35dceb 100644
--- a/metadata/md5-cache/sys-cluster/heat-2018.2.9999
+++ b/metadata/md5-cache/sys-cluster/heat-2018.2.9999
@@ -9,5 +9,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( 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/heat/heat.conf.sample.rocky -> heat.conf.sample-2018.2.9999
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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_=43318830b6cba8e82a5b9597b2141ee6
diff --git a/metadata/md5-cache/sys-cluster/heat-9.0.5 b/metadata/md5-cache/sys-cluster/heat-9.0.5
index d66496783158..ac980dfe9871 100644
--- a/metadata/md5-cache/sys-cluster/heat-9.0.5
+++ b/metadata/md5-cache/sys-cluster/heat-9.0.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.pike -> heat.conf.sample-9.0.5 https://tarballs.openstack.org/heat/heat-9.0.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4666a7d95cd5acac86767893b5cddac4
diff --git a/metadata/md5-cache/sys-cluster/hpx-0.9.99 b/metadata/md5-cache/sys-cluster/hpx-0.9.99
index 6e81f419d216..91953a4afc32 100644
--- a/metadata/md5-cache/sys-cluster/hpx-0.9.99
+++ b/metadata/md5-cache/sys-cluster/hpx-0.9.99
@@ -10,5 +10,5 @@ RDEPEND=tbb? ( dev-cpp/tbb ) >=dev-libs/boost-1.49 papi? ( dev-libs/papi ) perft
 REQUIRED_USE=jemalloc? ( !perftools !tbb ) perftools? ( !jemalloc !tbb ) tbb? ( !jemalloc !perftools )
 SLOT=0
 SRC_URI=http://stellar.cct.lsu.edu/files/hpx_0.9.99.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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=230a3f7a07bf73c15b3d8af2c6ed3a24
diff --git a/metadata/md5-cache/sys-cluster/hpx-1.0.0 b/metadata/md5-cache/sys-cluster/hpx-1.0.0
index 341efea46c89..41f8e7252b9e 100644
--- a/metadata/md5-cache/sys-cluster/hpx-1.0.0
+++ b/metadata/md5-cache/sys-cluster/hpx-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=tbb? ( dev-cpp/tbb ) >=dev-libs/boost-1.49 papi? ( dev-libs/papi ) perft
 REQUIRED_USE=jemalloc? ( !perftools !tbb ) perftools? ( !jemalloc !tbb ) tbb? ( !jemalloc !perftools )
 SLOT=0
 SRC_URI=http://stellar.cct.lsu.edu/files/hpx_1.0.0.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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d7a893e428f165194e841f19dba97736
diff --git a/metadata/md5-cache/sys-cluster/hpx-9999 b/metadata/md5-cache/sys-cluster/hpx-9999
index a4a5dc271214..339552a1994d 100644
--- a/metadata/md5-cache/sys-cluster/hpx-9999
+++ b/metadata/md5-cache/sys-cluster/hpx-9999
@@ -8,5 +8,5 @@ LICENSE=Boost-1.0
 RDEPEND=tbb? ( dev-cpp/tbb ) >=dev-libs/boost-1.49 papi? ( dev-libs/papi ) perftools? ( >=dev-util/google-perftools-1.7.1 ) >=sys-apps/hwloc-1.8 >=sys-libs/libunwind-1 sys-libs/zlib virtual/fortran
 REQUIRED_USE=jemalloc? ( !perftools !tbb ) perftools? ( !jemalloc !tbb ) tbb? ( !jemalloc !perftools )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	68fcf50e02640de6eb5698ea038d9537	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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_=2635cbb0b008e023d25b38e528ff690e
diff --git a/metadata/md5-cache/sys-cluster/ipvsadm-1.26-r2 b/metadata/md5-cache/sys-cluster/ipvsadm-1.26-r2
index 563440083638..bf472658c1f8 100644
--- a/metadata/md5-cache/sys-cluster/ipvsadm-1.26-r2
+++ b/metadata/md5-cache/sys-cluster/ipvsadm-1.26-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2 dev-libs/libnl:1.1 >=dev-libs/popt-1.16
 SLOT=0
 SRC_URI=http://www.linuxvirtualserver.org/software/kernel-2.6/ipvsadm-1.26.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=81d75f995843d9b8e387e75fb38eb87f
diff --git a/metadata/md5-cache/sys-cluster/ipvsadm-1.27-r1 b/metadata/md5-cache/sys-cluster/ipvsadm-1.27-r1
index 23106a79d62f..7e44f4b73c26 100644
--- a/metadata/md5-cache/sys-cluster/ipvsadm-1.27-r1
+++ b/metadata/md5-cache/sys-cluster/ipvsadm-1.27-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2:* dev-libs/libnl:= >=dev-libs/popt-1.16
 SLOT=0
 SRC_URI=https://kernel.org/pub/linux/utils/kernel/ipvsadm/ipvsadm-1.27.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3800954c8c9c6e63fffaf3a3089c4a31
diff --git a/metadata/md5-cache/sys-cluster/ipvsadm-1.28 b/metadata/md5-cache/sys-cluster/ipvsadm-1.28
index 13b5a3070b8e..453cf1ba8962 100644
--- a/metadata/md5-cache/sys-cluster/ipvsadm-1.28
+++ b/metadata/md5-cache/sys-cluster/ipvsadm-1.28
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2:* dev-libs/libnl:= >=dev-libs/popt-1.16
 SLOT=0
 SRC_URI=https://kernel.org/pub/linux/utils/kernel/ipvsadm/ipvsadm-1.28.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2561f135b1bf51808fa9d696b6abde4a
diff --git a/metadata/md5-cache/sys-cluster/knem-1.1.3 b/metadata/md5-cache/sys-cluster/knem-1.1.3
index b30e4733d2de..8cdee56223d8 100644
--- a/metadata/md5-cache/sys-cluster/knem-1.1.3
+++ b/metadata/md5-cache/sys-cluster/knem-1.1.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=sys-apps/hwloc virtual/modutils kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://gforge.inria.fr/frs/download.php/37186/knem-1.1.3.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7eefcb7d9ca2f55c6defdba8d2f7274a
diff --git a/metadata/md5-cache/sys-cluster/knem-9999 b/metadata/md5-cache/sys-cluster/knem-9999
index 2d6a1356151b..895aeecf4cb4 100644
--- a/metadata/md5-cache/sys-cluster/knem-9999
+++ b/metadata/md5-cache/sys-cluster/knem-9999
@@ -7,5 +7,5 @@ IUSE=debug modules kernel_linux kernel_linux kernel_linux
 LICENSE=GPL-2 LGPL-2
 RDEPEND=sys-apps/hwloc virtual/modutils kernel_linux? ( virtual/modutils )
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2c75e4547c52c64f76e5fab9c00376bd
diff --git a/metadata/md5-cache/sys-cluster/legion-16.08.0-r1 b/metadata/md5-cache/sys-cluster/legion-16.08.0-r1
index b774c8bba9f1..dd7446623e78 100644
--- a/metadata/md5-cache/sys-cluster/legion-16.08.0-r1
+++ b/metadata/md5-cache/sys-cluster/legion-16.08.0-r1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/StanfordLegion/legion/archive/legion-16.08.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b7c544f4c18033463b829b6189ab1f2a
diff --git a/metadata/md5-cache/sys-cluster/legion-16.10.0 b/metadata/md5-cache/sys-cluster/legion-16.10.0
index 0b010ce228bc..be979c3fecad 100644
--- a/metadata/md5-cache/sys-cluster/legion-16.10.0
+++ b/metadata/md5-cache/sys-cluster/legion-16.10.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/StanfordLegion/legion/archive/legion-16.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ecd7baeeb167d2d64a285661e22d9dac
diff --git a/metadata/md5-cache/sys-cluster/legion-17.02.0 b/metadata/md5-cache/sys-cluster/legion-17.02.0
index 9523493134c7..f85d5e7378fd 100644
--- a/metadata/md5-cache/sys-cluster/legion-17.02.0
+++ b/metadata/md5-cache/sys-cluster/legion-17.02.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/StanfordLegion/legion/archive/legion-17.02.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7ed45c18d89f7d1d2d5de1ed4a6abbef
diff --git a/metadata/md5-cache/sys-cluster/legion-17.05.0 b/metadata/md5-cache/sys-cluster/legion-17.05.0
index c3e11ebd4028..70742a711d99 100644
--- a/metadata/md5-cache/sys-cluster/legion-17.05.0
+++ b/metadata/md5-cache/sys-cluster/legion-17.05.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/StanfordLegion/legion/archive/legion-17.05.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=42c778913f3c9ec0c8d907e0795b379c
diff --git a/metadata/md5-cache/sys-cluster/legion-17.08.0 b/metadata/md5-cache/sys-cluster/legion-17.08.0
index a82056646b76..7d87b98dea4f 100644
--- a/metadata/md5-cache/sys-cluster/legion-17.08.0
+++ b/metadata/md5-cache/sys-cluster/legion-17.08.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/StanfordLegion/legion/archive/legion-17.08.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=88621e70b3d650da3a05a54d748f14b6
diff --git a/metadata/md5-cache/sys-cluster/legion-17.10.0 b/metadata/md5-cache/sys-cluster/legion-17.10.0
index dfa654055c2a..bae5cb97113f 100644
--- a/metadata/md5-cache/sys-cluster/legion-17.10.0
+++ b/metadata/md5-cache/sys-cluster/legion-17.10.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/StanfordLegion/legion/archive/legion-17.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=88621e70b3d650da3a05a54d748f14b6
diff --git a/metadata/md5-cache/sys-cluster/legion-18.02.0 b/metadata/md5-cache/sys-cluster/legion-18.02.0
index 1824d5951272..f18d84f98f40 100644
--- a/metadata/md5-cache/sys-cluster/legion-18.02.0
+++ b/metadata/md5-cache/sys-cluster/legion-18.02.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/StanfordLegion/legion/archive/legion-18.02.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=53b78a4552dc96763ac7bf7b80a5493a
diff --git a/metadata/md5-cache/sys-cluster/legion-18.05.0 b/metadata/md5-cache/sys-cluster/legion-18.05.0
index ecc0d56ebd92..2fdad6976c06 100644
--- a/metadata/md5-cache/sys-cluster/legion-18.05.0
+++ b/metadata/md5-cache/sys-cluster/legion-18.05.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/StanfordLegion/legion/archive/legion-18.05.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=53b78a4552dc96763ac7bf7b80a5493a
diff --git a/metadata/md5-cache/sys-cluster/legion-9999 b/metadata/md5-cache/sys-cluster/legion-9999
index e8daff1e01e2..d99efd71ff32 100644
--- a/metadata/md5-cache/sys-cluster/legion-9999
+++ b/metadata/md5-cache/sys-cluster/legion-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://legion.stanford.edu/
 IUSE=gasnet +hwloc
 LICENSE=BSD
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=42c778913f3c9ec0c8d907e0795b379c
diff --git a/metadata/md5-cache/sys-cluster/libccs-3.1.5 b/metadata/md5-cache/sys-cluster/libccs-3.1.5
index 81fef641b2c3..bfdcb2c4704d 100644
--- a/metadata/md5-cache/sys-cluster/libccs-3.1.5
+++ b/metadata/md5-cache/sys-cluster/libccs-3.1.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND==sys-cluster/corosync-1.4.7 dev-libs/libxml2 !sys-cluster/ccs
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/c/l/cluster/cluster-3.1.5.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=dd7bc7451a20cd2a772416693d0a0657
diff --git a/metadata/md5-cache/sys-cluster/libccs-3.2.0 b/metadata/md5-cache/sys-cluster/libccs-3.2.0
index 6969aa49f9cd..646485382a36 100644
--- a/metadata/md5-cache/sys-cluster/libccs-3.2.0
+++ b/metadata/md5-cache/sys-cluster/libccs-3.2.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND==sys-cluster/corosync-1.4.7 dev-libs/libxml2 !sys-cluster/ccs
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/c/l/cluster/cluster-3.2.0.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=6dc102d9dbedcef0378f92a20931df78
diff --git a/metadata/md5-cache/sys-cluster/libccs-perl-3.1.5 b/metadata/md5-cache/sys-cluster/libccs-perl-3.1.5
index fc7aaa44c66c..7f4e4040c864 100644
--- a/metadata/md5-cache/sys-cluster/libccs-perl-3.1.5
+++ b/metadata/md5-cache/sys-cluster/libccs-perl-3.1.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-cluster/libccs
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/c/l/cluster/cluster-3.1.5.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=523f64a00ce307d0c632e7728b2e1b0b
diff --git a/metadata/md5-cache/sys-cluster/libcman-3.1.5 b/metadata/md5-cache/sys-cluster/libcman-3.1.5
index be9edb58dcc7..e66d1a1ce7a0 100644
--- a/metadata/md5-cache/sys-cluster/libcman-3.1.5
+++ b/metadata/md5-cache/sys-cluster/libcman-3.1.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=!sys-cluster/cman-lib
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/c/l/cluster/cluster-3.1.5.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=727c74a8ddc3725bbfdc92a703af9feb
diff --git a/metadata/md5-cache/sys-cluster/libcman-3.2.0 b/metadata/md5-cache/sys-cluster/libcman-3.2.0
index 3178c6fec42b..b439d26d4f44 100644
--- a/metadata/md5-cache/sys-cluster/libcman-3.2.0
+++ b/metadata/md5-cache/sys-cluster/libcman-3.2.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=!sys-cluster/cman-lib
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/c/l/cluster/cluster-3.2.0.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=c7fbfbce298085c99d2e1586d4dcd661
diff --git a/metadata/md5-cache/sys-cluster/libfence-3.1.5 b/metadata/md5-cache/sys-cluster/libfence-3.1.5
index 4ac9f860f58a..052b85b750eb 100644
--- a/metadata/md5-cache/sys-cluster/libfence-3.1.5
+++ b/metadata/md5-cache/sys-cluster/libfence-3.1.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=~sys-cluster/libccs-3.1.5
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/c/l/cluster/cluster-3.1.5.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=f21b3093be6e5f2edead0b97d7952d35
diff --git a/metadata/md5-cache/sys-cluster/libfence-3.2.0 b/metadata/md5-cache/sys-cluster/libfence-3.2.0
index 4db2ba2255fa..36143bf391e0 100644
--- a/metadata/md5-cache/sys-cluster/libfence-3.2.0
+++ b/metadata/md5-cache/sys-cluster/libfence-3.2.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=~sys-cluster/libccs-3.2.0
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/c/l/cluster/cluster-3.2.0.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=0baa0d2a04801659afdd5b5651e3b7db
diff --git a/metadata/md5-cache/sys-cluster/liblogthread-3.1.5 b/metadata/md5-cache/sys-cluster/liblogthread-3.1.5
index 3fa0f2d62a30..067e9f3a6bc0 100644
--- a/metadata/md5-cache/sys-cluster/liblogthread-3.1.5
+++ b/metadata/md5-cache/sys-cluster/liblogthread-3.1.5
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~hppa ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/c/l/cluster/cluster-3.1.5.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=dc94eacaa634b9461ebc420e20c86853
diff --git a/metadata/md5-cache/sys-cluster/liblogthread-3.2.0 b/metadata/md5-cache/sys-cluster/liblogthread-3.2.0
index f1e9a36636ac..7322f32499ac 100644
--- a/metadata/md5-cache/sys-cluster/liblogthread-3.2.0
+++ b/metadata/md5-cache/sys-cluster/liblogthread-3.2.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm64 ~hppa ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/c/l/cluster/cluster-3.2.0.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=8cc0df9e6830a195f9637486193835d3
diff --git a/metadata/md5-cache/sys-cluster/minikube-0.29.0 b/metadata/md5-cache/sys-cluster/minikube-0.29.0
index 4a7d601ee90c..1246187a9ac8 100644
--- a/metadata/md5-cache/sys-cluster/minikube-0.29.0
+++ b/metadata/md5-cache/sys-cluster/minikube-0.29.0
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/minikube/archive/v0.29.0.tar.gz -> minikube-0.29.0.tar.gz
 _eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=f9b232c1bfbaf9f5c0c94c97f333b9ef
+_md5_=043e77cacecd245e583612974a76cf4c
diff --git a/metadata/md5-cache/sys-cluster/neutron-11.0.5 b/metadata/md5-cache/sys-cluster/neutron-11.0.5
index 21af131efc8a..9d33197c419d 100644
--- a/metadata/md5-cache/sys-cluster/neutron-11.0.5
+++ b/metadata/md5-cache/sys-cluster/neutron-11.0.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server || ( openvswitch linuxbridge ) ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/pike/configs.tar.gz -> neutron-configs-11.0.5.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/pike/ml2_plugins.tar.gz -> neutron-ml2-plugins-11.0.5.tar.gz https://tarballs.openstack.org/neutron/neutron-11.0.5.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=78bfbe2f9f1d3e3f43d1f80079879887
diff --git a/metadata/md5-cache/sys-cluster/neutron-12.0.4 b/metadata/md5-cache/sys-cluster/neutron-12.0.4
index 09a98e218086..1cef7fc84a23 100644
--- a/metadata/md5-cache/sys-cluster/neutron-12.0.4
+++ b/metadata/md5-cache/sys-cluster/neutron-12.0.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server || ( openvswitch linuxbridge ) ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/queens/configs.tar.gz -> neutron-configs-12.0.4.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/queens/ml2_plugins.tar.gz -> neutron-ml2-plugins-12.0.4.tar.gz https://tarballs.openstack.org/neutron/neutron-12.0.4.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4f16740b8272a5fa0cf92a5d1b0a6257
diff --git a/metadata/md5-cache/sys-cluster/neutron-13.0.1 b/metadata/md5-cache/sys-cluster/neutron-13.0.1
index 8cb3628eacb9..afa9c0a60a11 100644
--- a/metadata/md5-cache/sys-cluster/neutron-13.0.1
+++ b/metadata/md5-cache/sys-cluster/neutron-13.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server || ( openvswitch linuxbridge ) ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/rocky/configs.tar.gz -> neutron-configs-13.0.1.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/rocky/ml2_plugins.tar.gz -> neutron-ml2-plugins-13.0.1.tar.gz https://tarballs.openstack.org/neutron/neutron-13.0.1.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7077e714ca4957902bef6551c22ae6fb
diff --git a/metadata/md5-cache/sys-cluster/neutron-2017.2.9999 b/metadata/md5-cache/sys-cluster/neutron-2017.2.9999
index 733712bc2c24..896682d22b53 100644
--- a/metadata/md5-cache/sys-cluster/neutron-2017.2.9999
+++ b/metadata/md5-cache/sys-cluster/neutron-2017.2.9999
@@ -9,5 +9,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server || ( openvswitch linuxbridge ) ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/pike/configs.tar.gz -> neutron-configs-2017.2.9999.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/pike/ml2_plugins.tar.gz -> neutron-ml2-plugins-2017.2.9999.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	915cae3d7d636732918d18827fb1c226	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b2369d4e810f8e8abf37a9509c10502a
diff --git a/metadata/md5-cache/sys-cluster/neutron-2018.1.9999 b/metadata/md5-cache/sys-cluster/neutron-2018.1.9999
index a5e8504ca65e..e5f8249d9f96 100644
--- a/metadata/md5-cache/sys-cluster/neutron-2018.1.9999
+++ b/metadata/md5-cache/sys-cluster/neutron-2018.1.9999
@@ -9,5 +9,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server || ( openvswitch linuxbridge ) ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/queens/configs.tar.gz -> neutron-configs-2018.1.9999.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/queens/ml2_plugins.tar.gz -> neutron-ml2-plugins-2018.1.9999.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	915cae3d7d636732918d18827fb1c226	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b069e7b0345ae3c4d9fa86d19c82cabd
diff --git a/metadata/md5-cache/sys-cluster/neutron-2018.2.9999 b/metadata/md5-cache/sys-cluster/neutron-2018.2.9999
index 1497cd7b9470..228b4b24345d 100644
--- a/metadata/md5-cache/sys-cluster/neutron-2018.2.9999
+++ b/metadata/md5-cache/sys-cluster/neutron-2018.2.9999
@@ -9,5 +9,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server || ( openvswitch linuxbridge ) ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/rocky/configs.tar.gz -> neutron-configs-2018.2.9999.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/rocky/ml2_plugins.tar.gz -> neutron-ml2-plugins-2018.2.9999.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	915cae3d7d636732918d18827fb1c226	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=77daa0d5e329ba4c243c75761746a12d
diff --git a/metadata/md5-cache/sys-cluster/nova-16.1.5 b/metadata/md5-cache/sys-cluster/nova-16.1.5
index 3e46d3806b55..17f1bc8e3dd3 100644
--- a/metadata/md5-cache/sys-cluster/nova-16.1.5
+++ b/metadata/md5-cache/sys-cluster/nova-16.1.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/setuptools-16.0[python_targets_python2_7(-)?,python_targets
 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.5 https://tarballs.openstack.org/nova/nova-16.1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=04021d69340758736b993b0b3712640f
diff --git a/metadata/md5-cache/sys-cluster/nova-17.0.6 b/metadata/md5-cache/sys-cluster/nova-17.0.6
index fb1cf5af8495..222b33e64943 100644
--- a/metadata/md5-cache/sys-cluster/nova-17.0.6
+++ b/metadata/md5-cache/sys-cluster/nova-17.0.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/setuptools-16.0[python_targets_python2_7(-)?,python_targets
 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.6 https://tarballs.openstack.org/nova/nova-17.0.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=da3e53fd7b335b3853760363cc36f685
diff --git a/metadata/md5-cache/sys-cluster/nova-18.0.1 b/metadata/md5-cache/sys-cluster/nova-18.0.1
index 4b62625ebab3..cbf17d85d9ff 100644
--- a/metadata/md5-cache/sys-cluster/nova-18.0.1
+++ b/metadata/md5-cache/sys-cluster/nova-18.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/setuptools-21.0.0[python_targets_python2_7(-)?,python_targe
 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.1 https://tarballs.openstack.org/nova/nova-18.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7391c4a50ef8a90758dd191d7004233b
diff --git a/metadata/md5-cache/sys-cluster/nova-2017.2.9999 b/metadata/md5-cache/sys-cluster/nova-2017.2.9999
index ccf354f1ca7b..cf7df3e3b012 100644
--- a/metadata/md5-cache/sys-cluster/nova-2017.2.9999
+++ b/metadata/md5-cache/sys-cluster/nova-2017.2.9999
@@ -9,5 +9,5 @@ RDEPEND=>=dev-python/setuptools-16.0[python_targets_python2_7(-)?,python_targets
 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/pike/nova.conf.sample -> nova.conf.sample-2017.2.9999
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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_=0a062fcbd621dcb6f016ea9c6bd22365
diff --git a/metadata/md5-cache/sys-cluster/nova-2018.1.9999 b/metadata/md5-cache/sys-cluster/nova-2018.1.9999
index 022830fa6eaa..d3252dacfc74 100644
--- a/metadata/md5-cache/sys-cluster/nova-2018.1.9999
+++ b/metadata/md5-cache/sys-cluster/nova-2018.1.9999
@@ -9,5 +9,5 @@ RDEPEND=>=dev-python/setuptools-16.0[python_targets_python2_7(-)?,python_targets
 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-2018.1.9999
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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_=098deb90be06e608c3f80eaa7f2b12b1
diff --git a/metadata/md5-cache/sys-cluster/nova-2018.2.9999 b/metadata/md5-cache/sys-cluster/nova-2018.2.9999
index 82e6d1488b77..418a6e196966 100644
--- a/metadata/md5-cache/sys-cluster/nova-2018.2.9999
+++ b/metadata/md5-cache/sys-cluster/nova-2018.2.9999
@@ -9,5 +9,5 @@ RDEPEND=>=dev-python/setuptools-21.0.0[python_targets_python2_7(-)?,python_targe
 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-2018.2.9999
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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_=b2f6b31a1928154b3135adebcaad080a
diff --git a/metadata/md5-cache/sys-cluster/ocfs-1.0.14 b/metadata/md5-cache/sys-cluster/ocfs-1.0.14
index ae6eef966139..9a12a0fa993c 100644
--- a/metadata/md5-cache/sys-cluster/ocfs-1.0.14
+++ b/metadata/md5-cache/sys-cluster/ocfs-1.0.14
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/linux-sources kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://oss.oracle.com/projects/ocfs/dist/files/source/ocfs-1.0.14.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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_=29f0b5c0c49abaadc171cf6fc7ab036a
diff --git a/metadata/md5-cache/sys-cluster/open-mx-1.5.4 b/metadata/md5-cache/sys-cluster/open-mx-1.5.4
index a24eddfc53f6..09b20e3ee7a9 100644
--- a/metadata/md5-cache/sys-cluster/open-mx-1.5.4
+++ b/metadata/md5-cache/sys-cluster/open-mx-1.5.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=sys-apps/hwloc virtual/modutils kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://gforge.inria.fr/frs/download.php/34371/open-mx-1.5.4.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5ed87fbc4dd733c7af066e6ed48fb376
diff --git a/metadata/md5-cache/sys-cluster/pbs-python-4.3.3-r1 b/metadata/md5-cache/sys-cluster/pbs-python-4.3.3-r1
index 4df46b1d6a74..d2c2bbbb97cf 100644
--- a/metadata/md5-cache/sys-cluster/pbs-python-4.3.3-r1
+++ b/metadata/md5-cache/sys-cluster/pbs-python-4.3.3-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-cluster/torque python_targets_python2_7? ( >=dev-lang/python-2.7.5-r
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=ftp://ftp.sara.nl/pub/outgoing/pbs_python-4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3d69f7b8c1fecf8ca7c2f2131c8e519e
diff --git a/metadata/md5-cache/sys-cluster/polysh-0.4-r1 b/metadata/md5-cache/sys-cluster/polysh-0.4-r1
index 841a3fd6471a..ad67c45989a7 100644
--- a/metadata/md5-cache/sys-cluster/polysh-0.4-r1
+++ b/metadata/md5-cache/sys-cluster/polysh-0.4-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=http://guichaz.free.fr/polysh/files/polysh-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=873ab9b659627791a6eca69379dabac4
diff --git a/metadata/md5-cache/sys-cluster/sanlock-3.4.0-r1 b/metadata/md5-cache/sys-cluster/sanlock-3.4.0-r1
index 4362e41b2fc1..bfb4d954a31e 100644
--- a/metadata/md5-cache/sys-cluster/sanlock-3.4.0-r1
+++ b/metadata/md5-cache/sys-cluster/sanlock-3.4.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libaio sys-apps/util-linux python? ( python_targets_python2_7?
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://git.fedorahosted.org/cgit/sanlock.git/snapshot/sanlock-3.4.0.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=b9f4c8cb1ce92d8270d9bddf1277c83e
diff --git a/metadata/md5-cache/sys-cluster/swift-2.16.0 b/metadata/md5-cache/sys-cluster/swift-2.16.0
index a8161ca6c596..83216c91e730 100644
--- a/metadata/md5-cache/sys-cluster/swift-2.16.0
+++ b/metadata/md5-cache/sys-cluster/swift-2.16.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( proxy account container object ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://tarballs.openstack.org/swift/swift-2.16.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=813551138e94869e36cabd45b58863ef
diff --git a/metadata/md5-cache/sys-cluster/swift-2.17.0 b/metadata/md5-cache/sys-cluster/swift-2.17.0
index 0495e2486b3d..3477f79c4fb5 100644
--- a/metadata/md5-cache/sys-cluster/swift-2.17.0
+++ b/metadata/md5-cache/sys-cluster/swift-2.17.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( proxy account container object ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://tarballs.openstack.org/swift/swift-2.17.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=99570d75c311009128fe76870eaa8f8a
diff --git a/metadata/md5-cache/sys-cluster/swift-2.19.0 b/metadata/md5-cache/sys-cluster/swift-2.19.0
index fb397da5c510..fe9761e7d769 100644
--- a/metadata/md5-cache/sys-cluster/swift-2.19.0
+++ b/metadata/md5-cache/sys-cluster/swift-2.19.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( proxy account container object ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://tarballs.openstack.org/swift/swift-2.19.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=151898b7fd8ea3a8528f6937fed6fae4
diff --git a/metadata/md5-cache/sys-cluster/swift-2017.2.9999 b/metadata/md5-cache/sys-cluster/swift-2017.2.9999
index e3a8ffad4d48..25ccadd6843b 100644
--- a/metadata/md5-cache/sys-cluster/swift-2017.2.9999
+++ b/metadata/md5-cache/sys-cluster/swift-2017.2.9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/dnspython-1.14.0:0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.17.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netifaces-0.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/netifaces-0.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/netifaces-0.10.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.3.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyxattr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/PyECLib-1.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/cryptography-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/cryptography-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] memcached? ( net-misc/memcached ) net-misc/rsync[xattr] python_targets_python2_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=|| ( proxy account container object ) || ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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_=330ee923bf3be66785ea0bec569dd4ee
diff --git a/metadata/md5-cache/sys-cluster/swift-2018.1.9999 b/metadata/md5-cache/sys-cluster/swift-2018.1.9999
index 1a1b4d1860c0..55aabacdf738 100644
--- a/metadata/md5-cache/sys-cluster/swift-2018.1.9999
+++ b/metadata/md5-cache/sys-cluster/swift-2018.1.9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/dnspython-1.14.0:0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.17.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netifaces-0.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/netifaces-0.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/netifaces-0.10.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.3.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyxattr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/PyECLib-1.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/cryptography-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/cryptography-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] memcached? ( net-misc/memcached ) net-misc/rsync[xattr] python_targets_python2_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=|| ( proxy account container object ) || ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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_=23f31f2e2f71876c456a676d05c679d4
diff --git a/metadata/md5-cache/sys-cluster/swift-2018.2.9999 b/metadata/md5-cache/sys-cluster/swift-2018.2.9999
index 65f47516b4c9..f5ae3cbbc7a3 100644
--- a/metadata/md5-cache/sys-cluster/swift-2018.2.9999
+++ b/metadata/md5-cache/sys-cluster/swift-2018.2.9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/dnspython-1.14.0:0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.17.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/eventlet-0.23.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netifaces-0.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/netifaces-0.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/netifaces-0.10.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.3.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyxattr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/PyECLib-1.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/cryptography-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/cryptography-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] memcached? ( net-misc/memcached ) net-misc/rsync[xattr] python_targets_python2_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=|| ( proxy account container object ) || ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	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_=cedb5dd31624409a2c28a681020557e4
diff --git a/metadata/md5-cache/sys-cluster/torque-2.5.13-r1 b/metadata/md5-cache/sys-cluster/torque-2.5.13-r1
index 072dee2eccfb..ecd75c1a7397 100644
--- a/metadata/md5-cache/sys-cluster/torque-2.5.13-r1
+++ b/metadata/md5-cache/sys-cluster/torque-2.5.13-r1
@@ -9,5 +9,5 @@ LICENSE=torque-2.5
 RDEPEND=sys-libs/readline:0= munge? ( sys-auth/munge ) tk? ( dev-lang/tk:0= dev-lang/tcl:0= ) syslog? ( virtual/logger ) !!games-util/qstat crypt? ( net-misc/openssh ) !crypt? ( net-misc/netkit-rsh )
 SLOT=0
 SRC_URI=http://www.adaptivecomputing.com/index.php?wpfb_dl=1643 -> torque-2.5.13.tar.gz
-_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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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
 _md5_=bf87e1fdee3e3e6f6570547ec8348fc6
diff --git a/metadata/md5-cache/sys-cluster/torque-4.1.7-r1 b/metadata/md5-cache/sys-cluster/torque-4.1.7-r1
index c0246544ebde..ca4bb4318423 100644
--- a/metadata/md5-cache/sys-cluster/torque-4.1.7-r1
+++ b/metadata/md5-cache/sys-cluster/torque-4.1.7-r1
@@ -9,5 +9,5 @@ LICENSE=torque-2.5
 RDEPEND=sys-libs/zlib sys-libs/readline:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) cpusets? ( sys-apps/hwloc ) munge? ( sys-auth/munge ) nvidia? ( >=x11-drivers/nvidia-drivers-275 ) tk? ( dev-lang/tk:0= dev-lang/tcl:0= ) syslog? ( virtual/logger ) !!games-util/qstat crypt? ( net-misc/openssh ) !crypt? ( net-misc/netkit-rsh ) !dev-libs/uthash
 SLOT=0
 SRC_URI=http://www.adaptivecomputing.com/index.php?wpfb_dl=1690 -> torque-4.1.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cb5db1554ec59d3e8f5ba2ec96211838
diff --git a/metadata/md5-cache/sys-cluster/torque-4.2.10 b/metadata/md5-cache/sys-cluster/torque-4.2.10
index 2002b892d78f..7ed00f4e6eb2 100644
--- a/metadata/md5-cache/sys-cluster/torque-4.2.10
+++ b/metadata/md5-cache/sys-cluster/torque-4.2.10
@@ -9,5 +9,5 @@ LICENSE=torque-2.5
 RDEPEND=sys-libs/zlib sys-libs/readline:0= dev-libs/libxml2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) cpusets? ( sys-apps/hwloc ) munge? ( sys-auth/munge ) nvidia? ( >=x11-drivers/nvidia-drivers-275 ) tk? ( dev-lang/tk:0= dev-lang/tcl:0= ) syslog? ( virtual/logger ) !!games-util/qstat crypt? ( net-misc/openssh ) !crypt? ( net-misc/netkit-rsh ) !dev-libs/uthash
 SLOT=0
 SRC_URI=http://www.adaptivecomputing.com/index.php?wpfb_dl=2849 -> torque-4.2.10.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=55d8e83a4ed392bffe294a25c05a3fac
diff --git a/metadata/md5-cache/sys-cluster/torque-4.2.9-r5 b/metadata/md5-cache/sys-cluster/torque-4.2.9-r5
index 92a90c7f36b3..3987737c9e54 100644
--- a/metadata/md5-cache/sys-cluster/torque-4.2.9-r5
+++ b/metadata/md5-cache/sys-cluster/torque-4.2.9-r5
@@ -9,5 +9,5 @@ LICENSE=torque-2.5
 RDEPEND=sys-libs/zlib sys-libs/readline:0= dev-libs/libxml2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) cpusets? ( sys-apps/hwloc ) munge? ( sys-auth/munge ) nvidia? ( >=x11-drivers/nvidia-drivers-275 ) tk? ( dev-lang/tk:0= dev-lang/tcl:0= ) syslog? ( virtual/logger ) !!games-util/qstat crypt? ( net-misc/openssh ) !crypt? ( net-misc/netkit-rsh ) !dev-libs/uthash
 SLOT=0
 SRC_URI=http://www.adaptivecomputing.com/index.php?wpfb_dl=2849 -> torque-4.2.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b7cc6de5e86c28aacd851a1b072654b7
diff --git a/metadata/md5-cache/sys-cluster/torque-6.0.3 b/metadata/md5-cache/sys-cluster/torque-6.0.3
index fd57300ee15f..417f43a035dd 100644
--- a/metadata/md5-cache/sys-cluster/torque-6.0.3
+++ b/metadata/md5-cache/sys-cluster/torque-6.0.3
@@ -9,5 +9,5 @@ LICENSE=torque-2.5
 RDEPEND=sys-libs/zlib sys-libs/readline:0= dev-libs/libxml2 >=dev-libs/boost-1.41 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) cpusets? ( sys-apps/hwloc ) munge? ( sys-auth/munge ) nvidia? ( >=x11-drivers/nvidia-drivers-275 ) tk? ( dev-lang/tk:0= dev-lang/tcl:0= ) syslog? ( virtual/logger ) !!games-util/qstat crypt? ( net-misc/openssh ) !crypt? ( net-misc/netkit-rsh ) !dev-libs/uthash
 SLOT=0
 SRC_URI=http://wpfilebase.s3.amazonaws.com/torque/torque-6.0.3-1485300822_19e79ad.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2c0dab1352482251d781a94d4c28acb5
diff --git a/metadata/md5-cache/sys-cluster/zookeeper-bin-3.4.10 b/metadata/md5-cache/sys-cluster/zookeeper-bin-3.4.10
index 0a3eab18c255..ac8744cbc457 100644
--- a/metadata/md5-cache/sys-cluster/zookeeper-bin-3.4.10
+++ b/metadata/md5-cache/sys-cluster/zookeeper-bin-3.4.10
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=mirror binchecks
 SLOT=0
 SRC_URI=mirror://apache/zookeeper/zookeeper-3.4.10/zookeeper-3.4.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4ffe5b5bcf61cebb3f518030dc5244b5
diff --git a/metadata/md5-cache/sys-cluster/zookeeper-bin-3.4.11 b/metadata/md5-cache/sys-cluster/zookeeper-bin-3.4.11
index 438b0d0a0805..3fa86f238593 100644
--- a/metadata/md5-cache/sys-cluster/zookeeper-bin-3.4.11
+++ b/metadata/md5-cache/sys-cluster/zookeeper-bin-3.4.11
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=mirror binchecks
 SLOT=0
 SRC_URI=mirror://apache/zookeeper/zookeeper-3.4.11/zookeeper-3.4.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4ffe5b5bcf61cebb3f518030dc5244b5
diff --git a/metadata/md5-cache/sys-cluster/zookeeper-bin-3.4.12 b/metadata/md5-cache/sys-cluster/zookeeper-bin-3.4.12
index 91b075f92a31..d835a1780005 100644
--- a/metadata/md5-cache/sys-cluster/zookeeper-bin-3.4.12
+++ b/metadata/md5-cache/sys-cluster/zookeeper-bin-3.4.12
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=mirror binchecks
 SLOT=0
 SRC_URI=mirror://apache/zookeeper/zookeeper-3.4.12/zookeeper-3.4.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=484dd330aef5f8816a0d4a960c47887b
diff --git a/metadata/md5-cache/sys-cluster/zookeeper-bin-3.4.13 b/metadata/md5-cache/sys-cluster/zookeeper-bin-3.4.13
index 7fa776993fd0..3d0cf0877c57 100644
--- a/metadata/md5-cache/sys-cluster/zookeeper-bin-3.4.13
+++ b/metadata/md5-cache/sys-cluster/zookeeper-bin-3.4.13
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=mirror binchecks
 SLOT=0
 SRC_URI=mirror://apache/zookeeper/zookeeper-3.4.13/zookeeper-3.4.13.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	0ee72667014428e01a01df2345244cf3	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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c5eae12a978c83abe943970845e293f7
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index d01394e36f51..d42f415777ae 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 00e9420eab02..ec1a73dcbb3a 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_=1f5efa631640c33f7324c75aa61501dc
+_md5_=4ef67581803f4245a22cc4fc9555b19b
diff --git a/metadata/md5-cache/sys-devel/binutils-2.31.1-r1 b/metadata/md5-cache/sys-devel/binutils-2.31.1-r1
index b5223b28582c..7d3569eff4e8 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.31.1-r1
+++ b/metadata/md5-cache/sys-devel/binutils-2.31.1-r1
@@ -10,4 +10,4 @@ RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 SLOT=2.31
 SRC_URI=mirror://gnu/binutils/binutils-2.31.1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/binutils-2.31.1-patches-3.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_=d233b2e07e9e327368c3bf9f2ece29e6
+_md5_=64b5c34d4546f0f138ad008ebedb74fb
diff --git a/metadata/md5-cache/sys-devel/binutils-9999 b/metadata/md5-cache/sys-devel/binutils-9999
index c0bab8e60715..03285ae6f6b0 100644
--- a/metadata/md5-cache/sys-devel/binutils-9999
+++ b/metadata/md5-cache/sys-devel/binutils-9999
@@ -9,4 +9,4 @@ RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 SLOT=9999
 SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/binutils-9999-patches-2.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ef1cc4cee4de71b38eff870327266d27
+_md5_=96616037c59d2d73b5966cc81736618a
diff --git a/metadata/md5-cache/sys-devel/binutils-hppa64-2.31.1-r1 b/metadata/md5-cache/sys-devel/binutils-hppa64-2.31.1-r1
index 2a166ae46ee1..526ef760be48 100644
--- a/metadata/md5-cache/sys-devel/binutils-hppa64-2.31.1-r1
+++ b/metadata/md5-cache/sys-devel/binutils-hppa64-2.31.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext ) sys-devel/flex virtual/yacc >=sys-libs/binutils-libs-2.31.1 >=app-portage/elt-patches-20170815 sys-devel/gnuconfig
+DEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext ) sys-devel/flex virtual/yacc >=app-portage/elt-patches-20170815 sys-devel/gnuconfig
 DESCRIPTION=Tools necessary to build programs
 EAPI=6
 HOMEPAGE=https://sourceware.org/binutils/
@@ -10,4 +10,4 @@ RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 SLOT=2.31
 SRC_URI=mirror://gnu/binutils/binutils-2.31.1.tar.xz https://sourceware.org/pub/binutils/releases/binutils-2.31.1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/binutils-2.31.1-patches-3.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_=5d9c717d6b5fa60c63512c9074973052
+_md5_=524531af116857c11d9714a9e20e7545
diff --git a/metadata/md5-cache/sys-devel/bison-2.7.1 b/metadata/md5-cache/sys-devel/bison-2.7.1
deleted file mode 100644
index 75e764bdd338..000000000000
--- a/metadata/md5-cache/sys-devel/bison-2.7.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=sys-devel/m4-1.4.16 sys-devel/flex nls? ( sys-devel/gettext ) test? ( dev-lang/perl )
-DESCRIPTION=A general-purpose (yacc-compatible) parser generator
-EAPI=4
-HOMEPAGE=https://www.gnu.org/software/bison/
-IUSE=nls static 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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=sys-devel/m4-1.4.16
-SLOT=0
-SRC_URI=mirror://gnu/bison/bison-2.7.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_=c14f0a0a0a807bc5bf7a55a5ba3805bc
diff --git a/metadata/md5-cache/sys-devel/bison-3.0.5-r1 b/metadata/md5-cache/sys-devel/bison-3.0.5-r1
index d7e5da9800d0..db559c6d2d8e 100644
--- a/metadata/md5-cache/sys-devel/bison-3.0.5-r1
+++ b/metadata/md5-cache/sys-devel/bison-3.0.5-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A general-purpose (yacc-compatible) parser generator
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/bison/
 IUSE=examples nls static 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=>=sys-devel/m4-1.4.16
 SLOT=0
 SRC_URI=mirror://gnu/bison/bison-3.0.5.tar.xz https://dev.gentoo.org/~whissi/dist/bison/bison-3.0.5-patches-1.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_=26d0fd29532dab98f253c2c2c0fc7b55
+_md5_=5d5e240e5dba4c1f0a94e88a3ec3a3f0
diff --git a/metadata/md5-cache/sys-devel/clang-4.0.1 b/metadata/md5-cache/sys-devel/clang-4.0.1
index bfb2c0ab93ee..b3b80b7b6883 100644
--- a/metadata/md5-cache/sys-devel/clang-4.0.1
+++ b/metadata/md5-cache/sys-devel/clang-4.0.1
@@ -11,5 +11,5 @@ RDEPEND=~sys-devel/llvm-4.0.1:4=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGP
 REQUIRED_USE=python_targets_python2_7 || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
 SLOT=4
 SRC_URI=https://releases.llvm.org/4.0.1/cfe-4.0.1.src.tar.xz https://releases.llvm.org/4.0.1/clang-tools-extra-4.0.1.src.tar.xz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-manpages-4.0.1.tar.bz2 ) test? ( https://releases.llvm.org/4.0.1/llvm-4.0.1.src.tar.xz )
-_eclasses_=cmake-utils	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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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	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_=7849f02330391c293f9519350f361b34
diff --git a/metadata/md5-cache/sys-devel/clang-5.0.2 b/metadata/md5-cache/sys-devel/clang-5.0.2
index 56edb65d95ba..268263fbe1ae 100644
--- a/metadata/md5-cache/sys-devel/clang-5.0.2
+++ b/metadata/md5-cache/sys-devel/clang-5.0.2
@@ -11,5 +11,5 @@ RDEPEND=~sys-devel/llvm-5.0.2:5=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGP
 REQUIRED_USE=python_targets_python2_7 || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
 SLOT=5
 SRC_URI=https://releases.llvm.org/5.0.2/cfe-5.0.2.src.tar.xz https://releases.llvm.org/5.0.2/clang-tools-extra-5.0.2.src.tar.xz test? ( https://releases.llvm.org/5.0.2/llvm-5.0.2.src.tar.xz ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-5.0.2-manpages.tar.bz2 )
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ded06e01e880daf8a50d44d485811c7c
diff --git a/metadata/md5-cache/sys-devel/clang-6.0.1 b/metadata/md5-cache/sys-devel/clang-6.0.1
index 402ac84daf77..12a8be6f8fc1 100644
--- a/metadata/md5-cache/sys-devel/clang-6.0.1
+++ b/metadata/md5-cache/sys-devel/clang-6.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=python_targets_python2_7 || ( llvm_targets_AArch64 llvm_targets_AMD
 RESTRICT=!test? ( test )
 SLOT=6
 SRC_URI=https://releases.llvm.org/6.0.1/cfe-6.0.1.src.tar.xz https://releases.llvm.org/6.0.1/clang-tools-extra-6.0.1.src.tar.xz test? ( https://releases.llvm.org/6.0.1/llvm-6.0.1.src.tar.xz ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-6.0.1-manpages.tar.bz2 )
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8ea61e33f59148dda04e293ea0363a56
diff --git a/metadata/md5-cache/sys-devel/clang-7.0.0 b/metadata/md5-cache/sys-devel/clang-7.0.0
index 2424366e0251..a6ea0bcdc024 100644
--- a/metadata/md5-cache/sys-devel/clang-7.0.0
+++ b/metadata/md5-cache/sys-devel/clang-7.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=python_targets_python2_7 || ( llvm_targets_AArch64 llvm_targets_AMD
 RESTRICT=!test? ( test )
 SLOT=7
 SRC_URI=https://releases.llvm.org/7.0.0/cfe-7.0.0.src.tar.xz https://releases.llvm.org/7.0.0/clang-tools-extra-7.0.0.src.tar.xz test? ( https://releases.llvm.org/7.0.0/llvm-7.0.0.src.tar.xz ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-7.0.0-manpages.tar.bz2 )
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e17f4f324a9f2e85ec3456fed656276f
diff --git a/metadata/md5-cache/sys-devel/clang-7.0.9999 b/metadata/md5-cache/sys-devel/clang-7.0.9999
index 48680d0767c5..cd4b25c11128 100644
--- a/metadata/md5-cache/sys-devel/clang-7.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-7.0.9999
@@ -10,5 +10,5 @@ RDEPEND=~sys-devel/llvm-7.0.9999:7=[debug=,llvm_targets_AArch64?,llvm_targets_AM
 REQUIRED_USE=python_targets_python2_7 || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
 RESTRICT=!test? ( test )
 SLOT=7
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1834d3f870de4b40e30b814a55f862b0
diff --git a/metadata/md5-cache/sys-devel/clang-9999 b/metadata/md5-cache/sys-devel/clang-9999
index d501872ac81b..9a89a8f40a6f 100644
--- a/metadata/md5-cache/sys-devel/clang-9999
+++ b/metadata/md5-cache/sys-devel/clang-9999
@@ -10,5 +10,5 @@ RDEPEND=~sys-devel/llvm-9999:8=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU
 REQUIRED_USE=python_targets_python2_7 || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore llvm_targets_AVR llvm_targets_Nios2 llvm_targets_RISCV llvm_targets_WebAssembly )
 RESTRICT=!test? ( test )
 SLOT=8
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=46ae44e1b1f7f89acad15472b5b4bc4a
diff --git a/metadata/md5-cache/sys-devel/distcc-3.2_rc1-r5 b/metadata/md5-cache/sys-devel/distcc-3.2_rc1-r5
index 3ed2aa7abbc3..7e6c395de25a 100644
--- a/metadata/md5-cache/sys-devel/distcc-3.2_rc1-r5
+++ b/metadata/md5-cache/sys-devel/distcc-3.2_rc1-r5
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=test
 SLOT=0
 SRC_URI=https://distcc.googlecode.com/files/distcc-3.2rc1.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4f5620c112e37abd67d730cba3d0b6e1
diff --git a/metadata/md5-cache/sys-devel/distcc-3.3 b/metadata/md5-cache/sys-devel/distcc-3.3
index 289a54b2a583..e20522b09ac2 100644
--- a/metadata/md5-cache/sys-devel/distcc-3.3
+++ b/metadata/md5-cache/sys-devel/distcc-3.3
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/distcc/distcc/releases/download/v3.3/distcc-3.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e980f13104b016aa0068fd01d8e81c57
diff --git a/metadata/md5-cache/sys-devel/gcc-2.95.3-r10 b/metadata/md5-cache/sys-devel/gcc-2.95.3-r10
deleted file mode 100644
index b8e0933b551c..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-2.95.3-r10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=>=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-libs/zlib nls? ( virtual/libintl ) >=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=The GNU Compiler Collection
-EAPI=5
-HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla altivec debug +nls +nptl +cxx +fortran
-KEYWORDS=~alpha ~ppc ~sparc ~x86
-LICENSE=GPL-2+ LGPL-2.1+ FDL-1.1+
-PDEPEND=>=sys-devel/gcc-config-1.7
-RDEPEND=sys-libs/zlib nls? ( virtual/libintl )
-RESTRICT=strip
-SLOT=2.95.3
-SRC_URI=mirror://gnu/gcc/gcc-2.95.3/gcc-2.95.3.tar.bz2 mirror://gentoo/gcc-2.95.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-2.95.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-2.95.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-2.95.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-2.95.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-2.95.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-2.95.3-patches-1.4.tar.bz2
-_eclasses_=desktop	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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=812d2060d64ba720c343a27801254181
diff --git a/metadata/md5-cache/sys-devel/gcc-3.3.6-r1 b/metadata/md5-cache/sys-devel/gcc-3.3.6-r1
index 681d5ad699ea..c1634014c4aa 100644
--- a/metadata/md5-cache/sys-devel/gcc-3.3.6-r1
+++ b/metadata/md5-cache/sys-devel/gcc-3.3.6-r1
@@ -11,5 +11,5 @@ RDEPEND=>=sys-devel/binutils-2.14.90.0.6-r1 sys-libs/zlib nls? ( virtual/libintl
 RESTRICT=strip
 SLOT=3.3.6
 SRC_URI=mirror://gnu/gcc/gcc-3.3.6/gcc-3.3.6.tar.bz2 mirror://gentoo/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-3.3.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.3.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.3.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.3.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.3.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.3.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.3.6-patches-1.9.tar.bz2 boundschecking? ( mirror://sourceforge/boundschecking/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 mirror://gentoo/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~vapier/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~rhill/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~zorry/patches/gcc/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~blueness/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~tamiko/distfiles/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~slyfox/distfiles/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 )
-_eclasses_=desktop	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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=63f1d1e629319cdadc549e36aa390c53
diff --git a/metadata/md5-cache/sys-devel/gcc-3.3.6-r2 b/metadata/md5-cache/sys-devel/gcc-3.3.6-r2
new file mode 100644
index 000000000000..01e72e5794b0
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-3.3.6-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=>=sys-devel/binutils-2.14.90.0.6-r1 amd64? ( >=sys-devel/binutils-2.15.90.0.1.1-r1 ) >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=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 ) >=media-libs/libart_lgpl-2.1 )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=5
+HOMEPAGE=https://gcc.gnu.org/
+IUSE=regression-test vanilla altivec debug boundschecking doc hardened multilib objc awt gcj pgo +nls +nptl +cxx +fortran
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+ FDL-1.2+
+PDEPEND=>=sys-devel/gcc-config-1.7
+RDEPEND=>=sys-devel/binutils-2.14.90.0.6-r1 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv
+RESTRICT=strip
+SLOT=3.3.6
+SRC_URI=mirror://gnu/gcc/gcc-3.3.6/gcc-3.3.6.tar.bz2 mirror://gentoo/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-3.3.6-patches-1.10.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.3.6-patches-1.10.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.3.6-patches-1.10.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.3.6-patches-1.10.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.3.6-patches-1.10.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.3.6-patches-1.10.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.3.6-patches-1.10.tar.bz2 boundschecking? ( mirror://sourceforge/boundschecking/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 mirror://gentoo/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~vapier/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~rhill/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~zorry/patches/gcc/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~blueness/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~tamiko/distfiles/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~slyfox/distfiles/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 )
+_eclasses_=desktop	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_=7d83ec21f455a6c839d1125993fb2859
diff --git a/metadata/md5-cache/sys-devel/gcc-3.4.6-r2 b/metadata/md5-cache/sys-devel/gcc-3.4.6-r2
index cf5f5c0679eb..cdd40341f9cb 100644
--- a/metadata/md5-cache/sys-devel/gcc-3.4.6-r2
+++ b/metadata/md5-cache/sys-devel/gcc-3.4.6-r2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv
 RESTRICT=strip
 SLOT=3.4.6
 SRC_URI=mirror://gnu/gcc/gcc-3.4.6/gcc-3.4.6.tar.bz2 mirror://gentoo/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 mirror://gentoo/gcc-3.4.6-patches-1.8.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.4.6-patches-1.8.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.4.6-patches-1.8.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.4.6-patches-1.8.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.4.6-patches-1.8.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.4.6-patches-1.8.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.4.6-patches-1.8.tar.bz2 boundschecking? ( mirror://sourceforge/boundschecking/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 mirror://gentoo/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~vapier/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~rhill/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~zorry/patches/gcc/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~blueness/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~tamiko/distfiles/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~slyfox/distfiles/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 ) d? ( mirror://sourceforge/dgcc/gdc-0.24-src.tar.bz2 )
-_eclasses_=desktop	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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=d7dec1766720fc67e21b08bfe6022486
diff --git a/metadata/md5-cache/sys-devel/gcc-4.0.4 b/metadata/md5-cache/sys-devel/gcc-4.0.4
index 3200a3585ba5..9b321d18c1ce 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.0.4
+++ b/metadata/md5-cache/sys-devel/gcc-4.0.4
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv fortran? ( >=dev
 RESTRICT=strip
 SLOT=4.0.4
 SRC_URI=mirror://gnu/gcc/gcc-4.0.4/gcc-4.0.4.tar.bz2 mirror://gentoo/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.0.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.0.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.0.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.0.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.0.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.0.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.0.4-patches-1.3.tar.bz2
-_eclasses_=desktop	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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=3dd4f8122c4cea5a0e80d9e034d8c6f3
diff --git a/metadata/md5-cache/sys-devel/gcc-4.0.4-r1 b/metadata/md5-cache/sys-devel/gcc-4.0.4-r1
index e8b5e4d4c316..ff08631251ef 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.0.4-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.0.4-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv fortran? ( >=dev
 RESTRICT=strip
 SLOT=4.0.4
 SRC_URI=mirror://gnu/gcc/gcc-4.0.4/gcc-4.0.4.tar.bz2 mirror://gentoo/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.0.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.0.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.0.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.0.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.0.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.0.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.0.4-patches-1.4.tar.bz2
-_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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=5c3eea34eaf5e97666b075f7f5d4fa9d
diff --git a/metadata/md5-cache/sys-devel/gcc-4.1.2 b/metadata/md5-cache/sys-devel/gcc-4.1.2
index 71cdeb79089c..0a1476af1dce 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.1.2
+++ b/metadata/md5-cache/sys-devel/gcc-4.1.2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv fortran? ( >=dev
 RESTRICT=strip
 SLOT=4.1.2
 SRC_URI=mirror://gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 mirror://gentoo/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.1.2-patches-1.6.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.1.2-patches-1.6.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.1.2-patches-1.6.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-patches-1.6.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.1.2-patches-1.6.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.1.2-patches-1.6.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.1.2-patches-1.6.tar.bz2 d? ( mirror://sourceforge/dgcc/gdc-0.24-src.tar.bz2 )
-_eclasses_=desktop	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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=624ba5f357ebde380fd7dcfcfda8449c
diff --git a/metadata/md5-cache/sys-devel/gcc-4.1.2-r1 b/metadata/md5-cache/sys-devel/gcc-4.1.2-r1
index b35d86918715..729137ac966b 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.1.2-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.1.2-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv fortran? ( >=dev
 RESTRICT=strip
 SLOT=4.1.2
 SRC_URI=mirror://gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 mirror://gentoo/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.1.2-patches-1.7.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.1.2-patches-1.7.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.1.2-patches-1.7.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-patches-1.7.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.1.2-patches-1.7.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.1.2-patches-1.7.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.1.2-patches-1.7.tar.bz2 d? ( mirror://sourceforge/dgcc/gdc-0.24-src.tar.bz2 )
-_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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=916671e5541ab030f004ac8320f8feec
diff --git a/metadata/md5-cache/sys-devel/gcc-4.2.4-r1 b/metadata/md5-cache/sys-devel/gcc-4.2.4-r1
index e9a5ea2a8a36..67daf689c2ef 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.2.4-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.2.4-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv fortran? ( >=dev
 RESTRICT=strip
 SLOT=4.2.4
 SRC_URI=mirror://gnu/gcc/gcc-4.2.4/gcc-4.2.4.tar.bz2 mirror://gentoo/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.2.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.2.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.2.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.2.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.2.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.2.4-patches-1.4.tar.bz2
-_eclasses_=desktop	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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=40eb7f3a89055031f38431809365bc09
diff --git a/metadata/md5-cache/sys-devel/gcc-4.2.4-r2 b/metadata/md5-cache/sys-devel/gcc-4.2.4-r2
index e1d2534f25e5..437ca6154c7f 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.2.4-r2
+++ b/metadata/md5-cache/sys-devel/gcc-4.2.4-r2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv fortran? ( >=dev
 RESTRICT=strip
 SLOT=4.2.4
 SRC_URI=mirror://gnu/gcc/gcc-4.2.4/gcc-4.2.4.tar.bz2 mirror://gentoo/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.2.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.2.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.2.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.2.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.2.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.2.4-patches-1.5.tar.bz2
-_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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=86a9a0b781cbe40672292b40b1c41c6b
diff --git a/metadata/md5-cache/sys-devel/gcc-4.3.6-r1 b/metadata/md5-cache/sys-devel/gcc-4.3.6-r1
index c1b17ebbbcf1..0cbd8d22af38 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.3.6-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.3.6-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.3.6
 SRC_URI=mirror://gnu/gcc/gcc-4.3.6/gcc-4.3.6.tar.bz2 mirror://gentoo/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.3.6-patches-1.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.3.6-patches-1.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.3.6-patches-1.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-patches-1.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.3.6-patches-1.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.3.6-patches-1.2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.3.6-patches-1.2.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=desktop	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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=96b4ef1a01a77ed5ac862323a395109e
diff --git a/metadata/md5-cache/sys-devel/gcc-4.3.6-r2 b/metadata/md5-cache/sys-devel/gcc-4.3.6-r2
index 2b4f4519589f..fc735316e11b 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.3.6-r2
+++ b/metadata/md5-cache/sys-devel/gcc-4.3.6-r2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.3.6
 SRC_URI=mirror://gnu/gcc/gcc-4.3.6/gcc-4.3.6.tar.bz2 mirror://gentoo/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.3.6-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.3.6-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.3.6-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.3.6-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.3.6-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.3.6-patches-1.3.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=386a5d97f32f4ca3744145d168f82ac4
diff --git a/metadata/md5-cache/sys-devel/gcc-4.4.7 b/metadata/md5-cache/sys-devel/gcc-4.4.7
index 9a7d781af839..8d5b8cdd58a7 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.4.7
+++ b/metadata/md5-cache/sys-devel/gcc-4.4.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.4.7
 SRC_URI=mirror://gnu/gcc/gcc-4.4.7/gcc-4.4.7.tar.bz2 mirror://gentoo/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.4.7-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.7-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.7-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.7-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.7-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.7-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.7-patches-1.3.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=desktop	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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=dceb9c7c83221cc16d1e96976accad5e
diff --git a/metadata/md5-cache/sys-devel/gcc-4.4.7-r1 b/metadata/md5-cache/sys-devel/gcc-4.4.7-r1
index cdd21f65e149..c3e4b60231a3 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.4.7-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.4.7-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.4.7
 SRC_URI=mirror://gnu/gcc/gcc-4.4.7/gcc-4.4.7.tar.bz2 mirror://gentoo/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.4.7-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.7-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.7-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.7-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.7-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.7-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.7-patches-1.4.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=07148fad278909746fa9e841f07b4813
diff --git a/metadata/md5-cache/sys-devel/gcc-4.5.4 b/metadata/md5-cache/sys-devel/gcc-4.5.4
index 8da6b4c6c401..7cf2139e2be2 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.5.4
+++ b/metadata/md5-cache/sys-devel/gcc-4.5.4
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.5.4
 SRC_URI=mirror://gnu/gcc/gcc-4.5.4/gcc-4.5.4.tar.bz2 mirror://gentoo/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.5.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.5.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.5.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.5.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.5.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.5.4-patches-1.3.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=571cff20a06f6ff7c1aca3aaa417c068
diff --git a/metadata/md5-cache/sys-devel/gcc-4.5.4-r1 b/metadata/md5-cache/sys-devel/gcc-4.5.4-r1
index 5340b3cf4e69..e8e012d4181a 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.5.4-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.5.4-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.5.4
 SRC_URI=mirror://gnu/gcc/gcc-4.5.4/gcc-4.5.4.tar.bz2 mirror://gentoo/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.5.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.5.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.5.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.5.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.5.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.5.4-patches-1.4.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=fc88e173b7ff0d25a0df59528acdda2e
diff --git a/metadata/md5-cache/sys-devel/gcc-4.6.4 b/metadata/md5-cache/sys-devel/gcc-4.6.4
index 5d5bf8a5f302..83c3174bbbfe 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.6.4
+++ b/metadata/md5-cache/sys-devel/gcc-4.6.4
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.6.4
 SRC_URI=mirror://gnu/gcc/gcc-4.6.4/gcc-4.6.4.tar.bz2 mirror://gentoo/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.6.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.6.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.6.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.6.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.6.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.6.4-patches-1.3.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=0b8362c82ddcd2644cca03e1d286bbaa
diff --git a/metadata/md5-cache/sys-devel/gcc-4.6.4-r1 b/metadata/md5-cache/sys-devel/gcc-4.6.4-r1
index 15ab8ebfa488..057ac1b81e2e 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.6.4-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.6.4-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.6.4
 SRC_URI=mirror://gnu/gcc/gcc-4.6.4/gcc-4.6.4.tar.bz2 mirror://gentoo/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.6.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.6.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.6.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.6.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.6.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.6.4-patches-1.4.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=c622dd97985404d9ac2f950f95b6b286
diff --git a/metadata/md5-cache/sys-devel/gcc-4.7.4-r1 b/metadata/md5-cache/sys-devel/gcc-4.7.4-r1
index 9260241d3f58..480edac5c2da 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.7.4-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.7.4-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.7.4
 SRC_URI=mirror://gnu/gcc/gcc-4.7.4/gcc-4.7.4.tar.bz2 mirror://gentoo/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.7.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.4-patches-1.4.tar.bz2 mirror://gentoo/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=b7c4348c5456f94428a7c422251a1f18
diff --git a/metadata/md5-cache/sys-devel/gcc-4.7.4-r2 b/metadata/md5-cache/sys-devel/gcc-4.7.4-r2
index 4729a0006990..23f724e9efba 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.7.4-r2
+++ b/metadata/md5-cache/sys-devel/gcc-4.7.4-r2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.7.4
 SRC_URI=mirror://gnu/gcc/gcc-4.7.4/gcc-4.7.4.tar.bz2 mirror://gentoo/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.7.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.4-patches-1.5.tar.bz2 mirror://gentoo/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=e6cc3051e8e55fad7a8c580b5272b9cb
diff --git a/metadata/md5-cache/sys-devel/gcc-4.8.5-r1 b/metadata/md5-cache/sys-devel/gcc-4.8.5-r1
index 1002f6acab21..ead84848faea 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.8.5-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.8.5-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.8.5
 SRC_URI=mirror://gnu/gcc/gcc-4.8.5/gcc-4.8.5.tar.bz2 mirror://gentoo/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.5-patches-1.3.tar.bz2 mirror://gentoo/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=5208fe90a7af46207bca10b23ea935ac
diff --git a/metadata/md5-cache/sys-devel/gcc-4.8.5-r2 b/metadata/md5-cache/sys-devel/gcc-4.8.5-r2
index 581aec4ed766..b48892fb1555 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.8.5-r2
+++ b/metadata/md5-cache/sys-devel/gcc-4.8.5-r2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.8.5
 SRC_URI=mirror://gnu/gcc/gcc-4.8.5/gcc-4.8.5.tar.bz2 mirror://gentoo/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.8.5-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.5-patches-1.4.tar.bz2 mirror://gentoo/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=07f4bc471b219b224108863bbdc6bf1a
diff --git a/metadata/md5-cache/sys-devel/gcc-4.9.4 b/metadata/md5-cache/sys-devel/gcc-4.9.4
index 1be9452e5439..66b1a6afbe5d 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.9.4
+++ b/metadata/md5-cache/sys-devel/gcc-4.9.4
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.9.4
 SRC_URI=mirror://gnu/gcc/gcc-4.9.4/gcc-4.9.4.tar.bz2 mirror://gentoo/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-patches-1.3.tar.bz2 mirror://gentoo/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=2c051e9cf5eb44aa3fdb596e4e1c7c83
diff --git a/metadata/md5-cache/sys-devel/gcc-5.4.0-r4 b/metadata/md5-cache/sys-devel/gcc-5.4.0-r4
index cbfea1fa9cac..874c9ef8cea0 100644
--- a/metadata/md5-cache/sys-devel/gcc-5.4.0-r4
+++ b/metadata/md5-cache/sys-devel/gcc-5.4.0-r4
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=5.4.0
 SRC_URI=mirror://gnu/gcc/gcc-5.4.0/gcc-5.4.0.tar.bz2 mirror://gentoo/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-5.4.0-patches-1.9.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-patches-1.9.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-patches-1.9.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-patches-1.9.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-patches-1.9.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-patches-1.9.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-patches-1.9.tar.bz2 mirror://gentoo/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=eaa0d13b0e1d57db19fc7011c9befd7b
diff --git a/metadata/md5-cache/sys-devel/gcc-5.4.0-r5 b/metadata/md5-cache/sys-devel/gcc-5.4.0-r5
index 27038f4a984e..36a289b6edf3 100644
--- a/metadata/md5-cache/sys-devel/gcc-5.4.0-r5
+++ b/metadata/md5-cache/sys-devel/gcc-5.4.0-r5
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=5.4.0
 SRC_URI=mirror://gnu/gcc/gcc-5.4.0/gcc-5.4.0.tar.bz2 mirror://gentoo/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-5.4.0-patches-1.10.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-patches-1.10.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-patches-1.10.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-patches-1.10.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-patches-1.10.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-patches-1.10.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-patches-1.10.tar.bz2 mirror://gentoo/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=d3c2a96b5a63dc4833b14956b0070b49
diff --git a/metadata/md5-cache/sys-devel/gcc-6.4.0-r1 b/metadata/md5-cache/sys-devel/gcc-6.4.0-r1
index a92cbd1f24d6..04fd86d3e2ad 100644
--- a/metadata/md5-cache/sys-devel/gcc-6.4.0-r1
+++ b/metadata/md5-cache/sys-devel/gcc-6.4.0-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=6.4.0
 SRC_URI=mirror://gnu/gcc/gcc-6.4.0/gcc-6.4.0.tar.xz mirror://gentoo/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-6.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.4.0-patches-1.3.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=e8c07f4b3f1057325c5297a300d7a3e3
diff --git a/metadata/md5-cache/sys-devel/gcc-6.4.0-r3 b/metadata/md5-cache/sys-devel/gcc-6.4.0-r3
index 34037a4e5685..e612d4da153e 100644
--- a/metadata/md5-cache/sys-devel/gcc-6.4.0-r3
+++ b/metadata/md5-cache/sys-devel/gcc-6.4.0-r3
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=6.4.0
 SRC_URI=mirror://gnu/gcc/gcc-6.4.0/gcc-6.4.0.tar.xz mirror://gentoo/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-6.4.0-patches-1.6.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.4.0-patches-1.6.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.4.0-patches-1.6.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.4.0-patches-1.6.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.4.0-patches-1.6.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.4.0-patches-1.6.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.4.0-patches-1.6.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=e0edb6e3f4013fe8b74559c70e562271
diff --git a/metadata/md5-cache/sys-devel/gcc-6.4.0-r4 b/metadata/md5-cache/sys-devel/gcc-6.4.0-r4
index f204865dc6d8..213681b824a1 100644
--- a/metadata/md5-cache/sys-devel/gcc-6.4.0-r4
+++ b/metadata/md5-cache/sys-devel/gcc-6.4.0-r4
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=6.4.0
 SRC_URI=mirror://gnu/gcc/gcc-6.4.0/gcc-6.4.0.tar.xz mirror://gentoo/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-6.4.0-patches-1.7.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.4.0-patches-1.7.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.4.0-patches-1.7.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.4.0-patches-1.7.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.4.0-patches-1.7.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.4.0-patches-1.7.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.4.0-patches-1.7.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=fce70cf1086588f53310fde19f7158e0
diff --git a/metadata/md5-cache/sys-devel/gcc-7.3.0-r3 b/metadata/md5-cache/sys-devel/gcc-7.3.0-r3
index 8cf18bdd0b1e..f5a33bbcfb01 100644
--- a/metadata/md5-cache/sys-devel/gcc-7.3.0-r3
+++ b/metadata/md5-cache/sys-devel/gcc-7.3.0-r3
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=7.3.0
 SRC_URI=mirror://gnu/gcc/gcc-7.3.0/gcc-7.3.0.tar.xz mirror://gentoo/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.3.0-patches-1.4.tar.bz2
-_eclasses_=desktop	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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=8a97475e8d048e3adf03495a5d3719d1
diff --git a/metadata/md5-cache/sys-devel/gcc-7.3.0-r4 b/metadata/md5-cache/sys-devel/gcc-7.3.0-r4
index 726ae08233b2..eec301462467 100644
--- a/metadata/md5-cache/sys-devel/gcc-7.3.0-r4
+++ b/metadata/md5-cache/sys-devel/gcc-7.3.0-r4
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=7.3.0
 SRC_URI=mirror://gnu/gcc/gcc-7.3.0/gcc-7.3.0.tar.xz mirror://gentoo/gcc-7.3.0-patches-1.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
-_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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=4b79279a66244cedd68026eb353f5abe
diff --git a/metadata/md5-cache/sys-devel/gcc-7.3.0-r5 b/metadata/md5-cache/sys-devel/gcc-7.3.0-r5
index 5a235641ab6c..14154f662439 100644
--- a/metadata/md5-cache/sys-devel/gcc-7.3.0-r5
+++ b/metadata/md5-cache/sys-devel/gcc-7.3.0-r5
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=7.3.0
 SRC_URI=mirror://gnu/gcc/gcc-7.3.0/gcc-7.3.0.tar.xz mirror://gentoo/gcc-7.3.0-patches-1.7.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.3.0-patches-1.7.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.3.0-patches-1.7.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.3.0-patches-1.7.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.3.0-patches-1.7.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.3.0-patches-1.7.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.3.0-patches-1.7.tar.bz2
-_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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=b72e2f955294a341086d1ca42e435d3e
diff --git a/metadata/md5-cache/sys-devel/gcc-8.2.0-r2 b/metadata/md5-cache/sys-devel/gcc-8.2.0-r2
index f9ac38445b71..c96156fcf069 100644
--- a/metadata/md5-cache/sys-devel/gcc-8.2.0-r2
+++ b/metadata/md5-cache/sys-devel/gcc-8.2.0-r2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=8.2.0
 SRC_URI=mirror://gnu/gcc/gcc-8.2.0/gcc-8.2.0.tar.xz mirror://gentoo/gcc-8.2.0-patches-1.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.2.0-patches-1.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.2.0-patches-1.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.2.0-patches-1.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.2.0-patches-1.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.2.0-patches-1.2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.2.0-patches-1.2.tar.bz2
-_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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=5e8f0c7039c8a8846f6dd59efba453b1
diff --git a/metadata/md5-cache/sys-devel/gcc-8.2.0-r3 b/metadata/md5-cache/sys-devel/gcc-8.2.0-r3
index edd358839864..bc510888310d 100644
--- a/metadata/md5-cache/sys-devel/gcc-8.2.0-r3
+++ b/metadata/md5-cache/sys-devel/gcc-8.2.0-r3
@@ -10,6 +10,6 @@ PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=strip
 SLOT=8.2.0
-SRC_URI=mirror://gnu/gcc/gcc-8.2.0/gcc-8.2.0.tar.xz mirror://gentoo/gcc-8.2.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.2.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.2.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.2.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.2.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.2.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.2.0-patches-1.3.tar.bz2
-_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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=b764840db5815c7826ddbae7490ae597
+SRC_URI=mirror://gnu/gcc/gcc-8.2.0/gcc-8.2.0.tar.xz mirror://gentoo/gcc-8.2.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.2.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.2.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.2.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.2.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.2.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.2.0-patches-1.4.tar.bz2
+_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_=0af5f4142022393f6411e4196c80617b
diff --git a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2 b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2
index 08695c324d6f..a4adf7a3fa1a 100644
--- a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2
+++ b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2
@@ -11,5 +11,5 @@ RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext
 RESTRICT=strip
 SLOT=42
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-5666.3.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-16.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-39.tar.gz fortran? ( mirror://gnu/gcc/gcc-4.2.4/gcc-fortran-4.2.4.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/gcc-apple-4.2.1_p5646-gfortran.patch )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	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_=9d045438c8d24fad84c5133405ed383f
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.1.2 b/metadata/md5-cache/sys-devel/kgcc64-4.1.2
index b8382a188631..9d15f02b1ab4 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.1.2
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.1.2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv
 RESTRICT=strip
 SLOT=4.1.2
 SRC_URI=mirror://gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 mirror://gentoo/gcc-4.1.2-patches-1.0.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.1.2-patches-1.0.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.1.2-patches-1.0.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-patches-1.0.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.1.2-patches-1.0.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.1.2-patches-1.0.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.1.2-patches-1.0.1.tar.bz2
-_eclasses_=desktop	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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=4287b0b7f9ce8b6865f6948812501cc8
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.2.4 b/metadata/md5-cache/sys-devel/kgcc64-4.2.4
index 603e131a2bff..6c0f63bde7ff 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.2.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.2.4
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv
 RESTRICT=strip
 SLOT=4.2.4
 SRC_URI=mirror://gnu/gcc/gcc-4.2.4/gcc-4.2.4.tar.bz2 mirror://gentoo/gcc-4.2.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.2.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.2.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.2.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.2.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.2.4-patches-1.0.tar.bz2
-_eclasses_=desktop	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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=b6f206f7701d664aa14a87c3585f0ddd
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.3.5 b/metadata/md5-cache/sys-devel/kgcc64-4.3.5
index 65b2249e1024..d4680e20f7e8 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.3.5
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.3.5
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.3.5
 SRC_URI=mirror://gnu/gcc/gcc-4.3.5/gcc-4.3.5.tar.bz2 mirror://gentoo/gcc-4.3.5-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.3.5-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.3.5-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.5-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.3.5-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.3.5-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.3.5-patches-1.1.tar.bz2
-_eclasses_=desktop	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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=ec6572a5964dbd4fb0e9b408ab1a4906
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.4.5 b/metadata/md5-cache/sys-devel/kgcc64-4.4.5
index 418c3af5e25f..71fa3229f138 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.4.5
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.4.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=sys-devel/gcc-config-1.4 sy
 RESTRICT=strip
 SLOT=4.4.5
 SRC_URI=mirror://gnu/gcc/gcc-4.4.5/gcc-4.4.5.tar.bz2 mirror://gentoo/gcc-4.4.5-patches-1.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.5-patches-1.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.5-patches-1.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.5-patches-1.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.5-patches-1.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.5-patches-1.2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.5-patches-1.2.tar.bz2
-_eclasses_=desktop	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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=885ff8764444180b5b9468b039d1d6c7
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.4.6 b/metadata/md5-cache/sys-devel/kgcc64-4.4.6
index b663275b0605..82e64426551e 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.4.6
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.4.6
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=sys-devel/gcc-config-1.4 sy
 RESTRICT=strip
 SLOT=4.4.6
 SRC_URI=mirror://gnu/gcc/gcc-4.4.6/gcc-4.4.6.tar.bz2 mirror://gentoo/gcc-4.4.6-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.6-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.6-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.6-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.6-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.6-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.6-patches-1.0.tar.bz2
-_eclasses_=desktop	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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=7c248eb43f85d6e92aa0d3da6bb4643e
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.5.3 b/metadata/md5-cache/sys-devel/kgcc64-4.5.3
index 0ba9467b32c6..f3b7daf24be4 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.5.3
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.5.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.5.3
 SRC_URI=mirror://gnu/gcc/gcc-4.5.3/gcc-4.5.3.tar.bz2 mirror://gentoo/gcc-4.5.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.5.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.5.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.5.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.5.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.5.3-patches-1.4.tar.bz2
-_eclasses_=desktop	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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=bc38515ddf23da9bea281583fd294e01
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.5.4 b/metadata/md5-cache/sys-devel/kgcc64-4.5.4
index ff4a23e97c6c..b296e03d4791 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.5.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.5.4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.5.4
 SRC_URI=mirror://gnu/gcc/gcc-4.5.4/gcc-4.5.4.tar.bz2 mirror://gentoo/gcc-4.5.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.5.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.5.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.5.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.5.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.5.4-patches-1.2.tar.bz2
-_eclasses_=desktop	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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=66fb8a6b7789b020c7ec831ff6734136
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.6.4 b/metadata/md5-cache/sys-devel/kgcc64-4.6.4
index ba0f41bc6a42..b6586df1ac84 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.6.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.6.4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.6.4
 SRC_URI=mirror://gnu/gcc/gcc-4.6.4/gcc-4.6.4.tar.bz2 mirror://gentoo/gcc-4.6.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.6.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.6.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.6.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.6.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.6.4-patches-1.0.tar.bz2
-_eclasses_=desktop	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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=72222fd69b078160875299e54f945848
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.7.3 b/metadata/md5-cache/sys-devel/kgcc64-4.7.3
index b4af07600ea2..7b0013083f3c 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.7.3
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.7.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.7.3
 SRC_URI=mirror://gnu/gcc/gcc-4.7.3/gcc-4.7.3.tar.bz2 mirror://gentoo/gcc-4.7.3-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.3-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.3-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.3-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.3-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.3-patches-1.3.tar.bz2
-_eclasses_=desktop	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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=e5f7f7adb1120b7069c7bff6460186eb
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.7.4 b/metadata/md5-cache/sys-devel/kgcc64-4.7.4
index 5bd8930d6a87..45061be51862 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.7.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.7.4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.7.4
 SRC_URI=mirror://gnu/gcc/gcc-4.7.4/gcc-4.7.4.tar.bz2 mirror://gentoo/gcc-4.7.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.4-patches-1.0.tar.bz2
-_eclasses_=desktop	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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=f12ff1dddfea91247a92f36600960ad6
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.8.3 b/metadata/md5-cache/sys-devel/kgcc64-4.8.3
index 92013d03743e..c4c9a123174f 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.8.3
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.8.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.8.3
 SRC_URI=mirror://gnu/gcc/gcc-4.8.3/gcc-4.8.3.tar.bz2 mirror://gentoo/gcc-4.8.3-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.3-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.3-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.3-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.3-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.3-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.3-patches-1.1.tar.bz2
-_eclasses_=desktop	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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=8471dd65776a9de1df31e6ac5983dbd4
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.8.5 b/metadata/md5-cache/sys-devel/kgcc64-4.8.5
index 6d03bc8e6519..e650852f80f8 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.8.5
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.8.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.8.5
 SRC_URI=mirror://gnu/gcc/gcc-4.8.5/gcc-4.8.5.tar.bz2 mirror://gentoo/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.5-patches-1.3.tar.bz2
-_eclasses_=desktop	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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=5be437344c8ffaae90c70c4fdd9ddc60
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.9.4 b/metadata/md5-cache/sys-devel/kgcc64-4.9.4
index b1df130edd77..25a6a699f9d2 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.9.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.9.4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.9.4
 SRC_URI=mirror://gnu/gcc/gcc-4.9.4/gcc-4.9.4.tar.bz2 mirror://gentoo/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-patches-1.0.tar.bz2
-_eclasses_=desktop	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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=4664212d44d7899566dd93153173e74e
diff --git a/metadata/md5-cache/sys-devel/kgcc64-5.4.0 b/metadata/md5-cache/sys-devel/kgcc64-5.4.0
index eafc4867e8f1..7a7de3499d08 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-5.4.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-5.4.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=5.4.0
 SRC_URI=mirror://gnu/gcc/gcc-5.4.0/gcc-5.4.0.tar.bz2 mirror://gentoo/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-patches-1.0.tar.bz2
-_eclasses_=desktop	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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=4664212d44d7899566dd93153173e74e
diff --git a/metadata/md5-cache/sys-devel/kgcc64-6.3.0 b/metadata/md5-cache/sys-devel/kgcc64-6.3.0
index 0fde5cdde049..19e08144bdbe 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-6.3.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-6.3.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=6.3.0
 SRC_URI=mirror://gnu/gcc/gcc-6.3.0/gcc-6.3.0.tar.bz2 mirror://gentoo/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.3.0-patches-1.0.tar.bz2
-_eclasses_=desktop	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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=dd30e381df3740b88e76ffa3e5a8933e
diff --git a/metadata/md5-cache/sys-devel/kgcc64-6.4.0 b/metadata/md5-cache/sys-devel/kgcc64-6.4.0
index cc18ef0082c1..01cac0290061 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-6.4.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-6.4.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=6.4.0
 SRC_URI=mirror://gnu/gcc/gcc-6.4.0/gcc-6.4.0.tar.xz mirror://gentoo/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.4.0-patches-1.0.tar.bz2
-_eclasses_=desktop	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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=4664212d44d7899566dd93153173e74e
diff --git a/metadata/md5-cache/sys-devel/kgcc64-7.2.0 b/metadata/md5-cache/sys-devel/kgcc64-7.2.0
index 18f4377cc183..a8a98ca3e68f 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-7.2.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-7.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=7.2.0
 SRC_URI=mirror://gnu/gcc/gcc-7.2.0/gcc-7.2.0.tar.xz mirror://gentoo/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.1.0-patches-1.1.tar.bz2
-_eclasses_=desktop	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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=cebaf5a44a3f27a06d34b25f117ec3f4
diff --git a/metadata/md5-cache/sys-devel/kgcc64-7.3.0 b/metadata/md5-cache/sys-devel/kgcc64-7.3.0
index 3a71d1b01c42..3cb4315b112f 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-7.3.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-7.3.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=7.3.0
 SRC_URI=mirror://gnu/gcc/gcc-7.3.0/gcc-7.3.0.tar.xz mirror://gentoo/gcc-7.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.3.0-patches-1.0.tar.bz2
-_eclasses_=desktop	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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=7c76e15073553d95a38e1d2cec3e32c4
diff --git a/metadata/md5-cache/sys-devel/kgcc64-8.2.0 b/metadata/md5-cache/sys-devel/kgcc64-8.2.0
index 61e766542787..2202d57e9153 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-8.2.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-8.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=8.2.0
 SRC_URI=mirror://gnu/gcc/gcc-8.2.0/gcc-8.2.0.tar.xz mirror://gentoo/gcc-8.1.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.1.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.1.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.1.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.1.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.1.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.1.0-patches-1.3.tar.bz2
-_eclasses_=desktop	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	3f3ed51008cc9b2e8bdf0bf7cac9bb38	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_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_=4cb1d9d85f4546a85589d19c1abefacf
diff --git a/metadata/md5-cache/sys-devel/lld-4.0.1 b/metadata/md5-cache/sys-devel/lld-4.0.1
index c9fce2d66e22..63f318c8c094 100644
--- a/metadata/md5-cache/sys-devel/lld-4.0.1
+++ b/metadata/md5-cache/sys-devel/lld-4.0.1
@@ -9,5 +9,5 @@ LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/llvm-4.0.1
 SLOT=0
 SRC_URI=https://releases.llvm.org/4.0.1/lld-4.0.1.src.tar.xz test? ( https://releases.llvm.org/4.0.1/llvm-4.0.1.src.tar.xz )
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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_=dab6cce0b3734cc7c4d0986da8d8c741
diff --git a/metadata/md5-cache/sys-devel/lld-5.0.2 b/metadata/md5-cache/sys-devel/lld-5.0.2
index ff750c51d7d6..797ede2a2980 100644
--- a/metadata/md5-cache/sys-devel/lld-5.0.2
+++ b/metadata/md5-cache/sys-devel/lld-5.0.2
@@ -9,5 +9,5 @@ LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/llvm-5.0.2
 SLOT=0
 SRC_URI=https://releases.llvm.org/5.0.2/lld-5.0.2.src.tar.xz test? ( https://releases.llvm.org/5.0.2/llvm-5.0.2.src.tar.xz )
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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_=1fe999bc0dae3fb1e401ecf91e23f3e7
diff --git a/metadata/md5-cache/sys-devel/lld-6.0.1 b/metadata/md5-cache/sys-devel/lld-6.0.1
index 7d2bcddd6b4d..9d99cfe5096c 100644
--- a/metadata/md5-cache/sys-devel/lld-6.0.1
+++ b/metadata/md5-cache/sys-devel/lld-6.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=The LLVM linker (link editor)
 EAPI=6
 HOMEPAGE=https://llvm.org/
 IUSE=test
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm64 x86 ~amd64-fbsd
 LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/llvm-6.0.1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/6.0.1/lld-6.0.1.src.tar.xz test? ( https://releases.llvm.org/6.0.1/llvm-6.0.1.src.tar.xz )
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=0952bdc1087491bebc82ee2536060965
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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_=8e1ed99544d146be7788ebbc98c51805
diff --git a/metadata/md5-cache/sys-devel/lld-7.0.0 b/metadata/md5-cache/sys-devel/lld-7.0.0
index 657022090119..1ac332d7bc8b 100644
--- a/metadata/md5-cache/sys-devel/lld-7.0.0
+++ b/metadata/md5-cache/sys-devel/lld-7.0.0
@@ -10,5 +10,5 @@ RDEPEND=~sys-devel/llvm-7.0.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/7.0.0/lld-7.0.0.src.tar.xz test? ( https://releases.llvm.org/7.0.0/llvm-7.0.0.src.tar.xz )
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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_=0952bdc1087491bebc82ee2536060965
diff --git a/metadata/md5-cache/sys-devel/lld-7.0.9999 b/metadata/md5-cache/sys-devel/lld-7.0.9999
index 2ebaffb8c039..0cd864c5cf4c 100644
--- a/metadata/md5-cache/sys-devel/lld-7.0.9999
+++ b/metadata/md5-cache/sys-devel/lld-7.0.9999
@@ -8,5 +8,5 @@ LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/llvm-7.0.9999
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	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_=61c1985ae4d5c629f59801c5654e3a7c
diff --git a/metadata/md5-cache/sys-devel/lld-9999 b/metadata/md5-cache/sys-devel/lld-9999
index 35149433387c..2a34f4bbeed4 100644
--- a/metadata/md5-cache/sys-devel/lld-9999
+++ b/metadata/md5-cache/sys-devel/lld-9999
@@ -8,5 +8,5 @@ LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/llvm-9999
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	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_=7703ffa6dd783b18dda65ae4aeaa5924
diff --git a/metadata/md5-cache/sys-devel/llvm-3.7.1-r3 b/metadata/md5-cache/sys-devel/llvm-3.7.1-r3
index e2f8ab916f50..39138addccba 100644
--- a/metadata/md5-cache/sys-devel/llvm-3.7.1-r3
+++ b/metadata/md5-cache/sys-devel/llvm-3.7.1-r3
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib:0= clang? ( python? ( python_targets_python2_7? ( >=dev-la
 REQUIRED_USE=python_targets_python2_7 lldb? ( clang xml )
 SLOT=0/3.7.1
 SRC_URI=https://llvm.org/releases/3.7.1/llvm-3.7.1.src.tar.xz clang? ( https://llvm.org/releases/3.7.1/compiler-rt-3.7.1.src.tar.xz https://llvm.org/releases/3.7.1/cfe-3.7.1.src.tar.xz https://llvm.org/releases/3.7.1/clang-tools-extra-3.7.1.src.tar.xz ) lldb? ( https://llvm.org/releases/3.7.1/lldb-3.7.1.src.tar.xz ) !doc? ( https://dev.gentoo.org/~voyageur/distfiles/llvm-3.7.0-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-3.7.1-patchset.tar.gz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	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	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	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	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f54e683896a15cd5c29a90ee51bb6e83
diff --git a/metadata/md5-cache/sys-devel/llvm-3.9.1-r1 b/metadata/md5-cache/sys-devel/llvm-3.9.1-r1
index ed0443b3a439..00e00c1b7a7b 100644
--- a/metadata/md5-cache/sys-devel/llvm-3.9.1-r1
+++ b/metadata/md5-cache/sys-devel/llvm-3.9.1-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib:0= clang? ( python? ( python_targets_python2_7? ( >=dev-la
 REQUIRED_USE=python_targets_python2_7 lldb? ( clang xml ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore ) multitarget? ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
 SLOT=0/3.9.1
 SRC_URI=https://llvm.org/releases/3.9.1/llvm-3.9.1.src.tar.xz clang? ( https://llvm.org/releases/3.9.1/compiler-rt-3.9.1.src.tar.xz https://llvm.org/releases/3.9.1/cfe-3.9.1.src.tar.xz https://llvm.org/releases/3.9.1/clang-tools-extra-3.9.1.src.tar.xz ) lldb? ( https://llvm.org/releases/3.9.1/lldb-3.9.1.src.tar.xz ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-3.9.0_rc3-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-3.9.1-patchset.tar.xz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	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	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	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	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=37d8c466527964e286895075d8e35dcb
diff --git a/metadata/md5-cache/sys-devel/llvm-4.0.1-r1 b/metadata/md5-cache/sys-devel/llvm-4.0.1-r1
index f7c9c3b3c5b0..8a973f63316a 100644
--- a/metadata/md5-cache/sys-devel/llvm-4.0.1-r1
+++ b/metadata/md5-cache/sys-devel/llvm-4.0.1-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib:0= gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( d
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
 SLOT=4
 SRC_URI=https://releases.llvm.org/4.0.1/llvm-4.0.1.src.tar.xz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-manpages-4.0.1.tar.bz2 )
-_eclasses_=cmake-utils	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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	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_=851c072b4030e5a4e2c943b1c3adc5f4
diff --git a/metadata/md5-cache/sys-devel/llvm-5.0.2 b/metadata/md5-cache/sys-devel/llvm-5.0.2
index 49d8dec86b0f..0c907c63f199 100644
--- a/metadata/md5-cache/sys-devel/llvm-5.0.2
+++ b/metadata/md5-cache/sys-devel/llvm-5.0.2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib:0= gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( d
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
 SLOT=5
 SRC_URI=https://releases.llvm.org/5.0.2/llvm-5.0.2.src.tar.xz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-5.0.1-patchset.tar.bz2 !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-5.0.2-manpages.tar.bz2 )
-_eclasses_=cmake-utils	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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=28ee92c20f3e9a2255960a3f5145a8dd
diff --git a/metadata/md5-cache/sys-devel/llvm-6.0.1 b/metadata/md5-cache/sys-devel/llvm-6.0.1
index f707b0c1ceec..feca21e9cf6f 100644
--- a/metadata/md5-cache/sys-devel/llvm-6.0.1
+++ b/metadata/md5-cache/sys-devel/llvm-6.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=6
 SRC_URI=https://releases.llvm.org/6.0.1/llvm-6.0.1.src.tar.xz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-6.0.1-manpages.tar.bz2 )
-_eclasses_=cmake-utils	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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ad0706f61f3493915f82e3db80679487
diff --git a/metadata/md5-cache/sys-devel/llvm-6.0.1-r1 b/metadata/md5-cache/sys-devel/llvm-6.0.1-r1
index 3bcf702fd41c..ba83071d5a69 100644
--- a/metadata/md5-cache/sys-devel/llvm-6.0.1-r1
+++ b/metadata/md5-cache/sys-devel/llvm-6.0.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=6
 SRC_URI=https://releases.llvm.org/6.0.1/llvm-6.0.1.src.tar.xz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-6.0.1-manpages.tar.bz2 )
-_eclasses_=cmake-utils	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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b554e89dd28d03b366798f882639efd1
diff --git a/metadata/md5-cache/sys-devel/llvm-6.0.1-r2 b/metadata/md5-cache/sys-devel/llvm-6.0.1-r2
new file mode 100644
index 000000000000..f6079eef7df8
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-6.0.1-r2
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=sys-libs/zlib:0= gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-lang/perl || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) ) kernel_Darwin? ( <sys-libs/libcxx-6.0.1.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( dev-python/sphinx ) gold? ( sys-libs/binutils-libs ) libffi? ( virtual/pkgconfig ) !!<dev-python/configparser-3.3.0.2 || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1
+DESCRIPTION=Low Level Virtual Machine
+EAPI=6
+HOMEPAGE=https://llvm.org/
+IUSE=debug doc gold libedit +libffi ncurses test xar xml kernel_Darwin llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=UoI-NCSA rc BSD public-domain llvm_targets_ARM? ( LLVM-Grant )
+PDEPEND=sys-devel/llvm-common gold? ( >=sys-devel/llvmgold-6 )
+RDEPEND=sys-libs/zlib:0= gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
+RESTRICT=!test? ( test )
+SLOT=6
+SRC_URI=https://releases.llvm.org/6.0.1/llvm-6.0.1.src.tar.xz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-6.0.1-manpages.tar.bz2 )
+_eclasses_=cmake-utils	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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=fc59df4ded3666e972e6d51c2ea05020
diff --git a/metadata/md5-cache/sys-devel/llvm-7.0.0 b/metadata/md5-cache/sys-devel/llvm-7.0.0
index ed711c39ae6e..361862c220a9 100644
--- a/metadata/md5-cache/sys-devel/llvm-7.0.0
+++ b/metadata/md5-cache/sys-devel/llvm-7.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=7
 SRC_URI=https://releases.llvm.org/7.0.0/llvm-7.0.0.src.tar.xz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-7.0.0-manpages.tar.bz2 )
-_eclasses_=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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5c2f3c0b565bb592b0f31a87380eddb2
diff --git a/metadata/md5-cache/sys-devel/llvm-7.0.0-r1 b/metadata/md5-cache/sys-devel/llvm-7.0.0-r1
new file mode 100644
index 000000000000..d28bbc66ca32
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-7.0.0-r1
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=sys-libs/zlib:0= exegesis? ( dev-libs/libpfm:= ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-lang/perl || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) ) kernel_Darwin? ( <sys-libs/libcxx-7.0.0.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( dev-python/sphinx ) gold? ( sys-libs/binutils-libs ) libffi? ( virtual/pkgconfig ) !!<dev-python/configparser-3.3.0.2 || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1
+DESCRIPTION=Low Level Virtual Machine
+EAPI=6
+HOMEPAGE=https://llvm.org/
+IUSE=debug doc exegesis gold libedit +libffi ncurses test xar xml kernel_Darwin llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=UoI-NCSA rc BSD public-domain llvm_targets_ARM? ( LLVM-Grant )
+PDEPEND=sys-devel/llvm-common gold? ( >=sys-devel/llvmgold-7 )
+RDEPEND=sys-libs/zlib:0= exegesis? ( dev-libs/libpfm:= ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
+RESTRICT=!test? ( test )
+SLOT=7
+SRC_URI=https://releases.llvm.org/7.0.0/llvm-7.0.0.src.tar.xz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-7.0.0-manpages.tar.bz2 )
+_eclasses_=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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=656a70dd1c6fd4656955bef05bbe5294
diff --git a/metadata/md5-cache/sys-devel/llvm-7.0.9999 b/metadata/md5-cache/sys-devel/llvm-7.0.9999
index 754f551d9f09..aca040b5e9f5 100644
--- a/metadata/md5-cache/sys-devel/llvm-7.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-7.0.9999
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib:0= exegesis? ( dev-libs/libpfm:= ) gold? ( >=sys-devel/bin
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
 RESTRICT=!test? ( test )
 SLOT=7
-_eclasses_=cmake-utils	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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3e5546637601ad3cf228b61470a5f2cf
diff --git a/metadata/md5-cache/sys-devel/llvm-9999 b/metadata/md5-cache/sys-devel/llvm-9999
index 2939756ebc6d..1ef631c3a251 100644
--- a/metadata/md5-cache/sys-devel/llvm-9999
+++ b/metadata/md5-cache/sys-devel/llvm-9999
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib:0= exegesis? ( dev-libs/libpfm:= ) gold? ( >=sys-devel/bin
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore llvm_targets_AVR llvm_targets_Nios2 llvm_targets_RISCV llvm_targets_WebAssembly )
 RESTRICT=!test? ( test )
 SLOT=8
-_eclasses_=cmake-utils	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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5f41ffc3e61611af456cfe79099e46e5
diff --git a/metadata/md5-cache/sys-devel/pmake-1.111.3.3 b/metadata/md5-cache/sys-devel/pmake-1.111.3.3
index f474bf94125c..d77b4ebb6d72 100644
--- a/metadata/md5-cache/sys-devel/pmake-1.111.3.3
+++ b/metadata/md5-cache/sys-devel/pmake-1.111.3.3
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/pmake/pmake_1.111.orig.tar.gz mirror://debian/pool/main/p/pmake/pmake_1.111-3.3.debian.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=5d819dbf33052e56caaee38f9cda7858
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index bae887e2e342..43337309f13f 100644
--- a/metadata/md5-cache/sys-firmware/Manifest.gz
+++ b/metadata/md5-cache/sys-firmware/Manifest.gz
diff --git a/metadata/md5-cache/sys-firmware/intel-microcode-20180807a_p20180922 b/metadata/md5-cache/sys-firmware/intel-microcode-20180807a_p20180922
index 0d7d86665a9a..17d2bf0754c6 100644
--- a/metadata/md5-cache/sys-firmware/intel-microcode-20180807a_p20180922
+++ b/metadata/md5-cache/sys-firmware/intel-microcode-20180807a_p20180922
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( initramfs split-ucode )
 RESTRICT=binchecks bindist mirror strip
 SLOT=0
 SRC_URI=https://downloadmirror.intel.com/28087/eng/microcode-20180807a.tgz https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-20180922.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=d9318b724b38b5b1d2ba2769ff677744
diff --git a/metadata/md5-cache/sys-firmware/iwl1000-ucode-39.31.5.1 b/metadata/md5-cache/sys-firmware/iwl1000-ucode-39.31.5.1
index 99e0d8d2df13..083ac4b04a97 100644
--- a/metadata/md5-cache/sys-firmware/iwl1000-ucode-39.31.5.1
+++ b/metadata/md5-cache/sys-firmware/iwl1000-ucode-39.31.5.1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=ipw3945
 SLOT=0
 SRC_URI=http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-1000-ucode-39.31.5.1.tgz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=22b8d4007831fa3c4fbd2817c7eacc6d
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-7260-bt-ucode-37.8.10 b/metadata/md5-cache/sys-firmware/iwl3160-7260-bt-ucode-37.8.10
index 48df8d7115cf..596b392fd9ea 100644
--- a/metadata/md5-cache/sys-firmware/iwl3160-7260-bt-ucode-37.8.10
+++ b/metadata/md5-cache/sys-firmware/iwl3160-7260-bt-ucode-37.8.10
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=!sys-kernel/linux-firmware[-savedconfig]
 SLOT=0
 SRC_URI=mirror://gentoo/iwl3160-7260-bt-ucode-37.8.10.tgz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=9955f31f0b108c2d0091a3cf983a6ccb
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-7260-bt-ucode-37.8.10_p1 b/metadata/md5-cache/sys-firmware/iwl3160-7260-bt-ucode-37.8.10_p1
index 2beeaf1a5862..de17e755a9de 100644
--- a/metadata/md5-cache/sys-firmware/iwl3160-7260-bt-ucode-37.8.10_p1
+++ b/metadata/md5-cache/sys-firmware/iwl3160-7260-bt-ucode-37.8.10_p1
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=!sys-kernel/linux-firmware[-savedconfig]
 SLOT=0
 SRC_URI=mirror://gentoo/iwl3160-7260-bt-ucode-37.8.10_p1.tgz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=f7c85bcc35c7613656b7393ec6269177
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-7260-bt-ucode-37.8.10_p2 b/metadata/md5-cache/sys-firmware/iwl3160-7260-bt-ucode-37.8.10_p2
index e050571cae96..122fdf74ef95 100644
--- a/metadata/md5-cache/sys-firmware/iwl3160-7260-bt-ucode-37.8.10_p2
+++ b/metadata/md5-cache/sys-firmware/iwl3160-7260-bt-ucode-37.8.10_p2
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=!sys-kernel/linux-firmware[-savedconfig]
 SLOT=0
 SRC_URI=mirror://gentoo/iwl3160-7260-bt-ucode-37.8.10_p2.tgz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=9f1242ed5f4b471d97bf5e46a56f56de
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.10.11.23 b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.10.11.23
index 933b85f25434..20a83de0c8b4 100644
--- a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.10.11.23
+++ b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.10.11.23
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=10
 SRC_URI=https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=iwlwifi-3160-ucode-23.11.10.0.tgz -> iwl3160-ucode-0.10.11.23.tgz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=6d0eb92de71c28270eb3601df051067b
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.10.15.23 b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.10.15.23
index e54428a9b4f6..b414d9b34366 100644
--- a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.10.15.23
+++ b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.10.15.23
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=10
 SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-3160-ucode-23.15.10.0.tgz -> iwl3160-ucode-0.10.15.23.tgz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=e4b1b0d7bf66c55c578f8ea9dca93ac4
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.12.16.25 b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.12.16.25
index 54eb860cbc71..93bbbc4868fd 100644
--- a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.12.16.25
+++ b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.12.16.25
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=12
 SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-3160-ucode-25.16.12.0.tgz -> iwl3160-ucode-0.12.16.25.tgz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=9535695a42f56fbbddeed890d5be9c8f
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.12.17.25 b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.12.17.25
index d100a8d50ceb..ceabf9d5f632 100644
--- a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.12.17.25
+++ b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.12.17.25
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=12
 SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-3160-ucode-25.17.12.0.tgz -> iwl3160-ucode-0.12.17.25.tgz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=3b852a06be90fea9bc7d1bfec1cdda72
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.13.30.25 b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.13.30.25
index 8617492e9cb5..97e433fd46f5 100644
--- a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.13.30.25
+++ b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.13.30.25
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=13
 SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-3160-ucode-25.30.13.0.tgz -> iwl3160-ucode-0.13.30.25.tgz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=fba1653bf0d32498802056419200d674
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.15.227938 b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.15.227938
index b9e13df9ed8a..0230b1e1bb48 100644
--- a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.15.227938
+++ b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.15.227938
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=15
 SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-3160-ucode-15.227938.0.tgz -> iwl3160-ucode-0.15.227938.tgz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=ccd8415ceccb857420aac4c5b412faa6
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.16.242414 b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.16.242414
index 479c1a7d41d5..f7a1eb2941c1 100644
--- a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.16.242414
+++ b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.16.242414
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=16
 SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-3160-ucode-16.242414.0.tgz -> iwl3160-ucode-0.16.242414.tgz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=80eaf1d50670511dab8ab70bd5b663e8
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.7.1.22 b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.7.1.22
index c708b3722757..907b4059cea2 100644
--- a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.7.1.22
+++ b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.7.1.22
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=7
 SRC_URI=https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=iwlwifi-3160-ucode-22.1.7.0.tgz -> iwl3160-ucode-0.7.1.22.tgz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=fc5062b8308806bac2f538bc63a7e384
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.8.15.22 b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.8.15.22
index 8c102c248bfe..0b1789e1198b 100644
--- a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.8.15.22
+++ b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.8.15.22
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=8
 SRC_URI=https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=iwlwifi-3160-ucode-22.15.8.0.tgz -> iwl3160-ucode-0.8.15.22.tgz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=b64240c5acb39bd7598a0f63c8301ba8
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.8.24.22 b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.8.24.22
index 73ed6b55519a..cecbc186a94d 100644
--- a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.8.24.22
+++ b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.8.24.22
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=8
 SRC_URI=https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=iwlwifi-3160-ucode-22.24.8.0.tgz -> iwl3160-ucode-0.8.24.22.tgz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=4befe044d6cfef4f031fb841e1360c22
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.9.214.23 b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.9.214.23
index 6faae5b723c8..4cce2c12880f 100644
--- a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.9.214.23
+++ b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.9.214.23
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=9
 SRC_URI=https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=iwlwifi-3160-ucode-23.214.9.0.tgz -> iwl3160-ucode-0.9.214.23.tgz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=2a47852f8a4e1d31fd36e8d30d253c92
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.9.228.25 b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.9.228.25
index fadd5ae4d2ba..1583fb22460a 100644
--- a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.9.228.25
+++ b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.9.228.25
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=9
 SRC_URI=https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=iwlwifi-3160-ucode-25.228.9.0.tgz -> iwl3160-ucode-0.9.228.25.tgz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=b152ad27535f63c79852edc812e7b5ea
diff --git a/metadata/md5-cache/sys-firmware/iwl6050-ucode-41.28.5.1 b/metadata/md5-cache/sys-firmware/iwl6050-ucode-41.28.5.1
index 5e6b7d8bf7a5..dd8a3fc357f8 100644
--- a/metadata/md5-cache/sys-firmware/iwl6050-ucode-41.28.5.1
+++ b/metadata/md5-cache/sys-firmware/iwl6050-ucode-41.28.5.1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=ipw3945
 SLOT=0
 SRC_URI=http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-6050-ucode-41.28.5.1.tgz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=4c02bd30acd9a7381855e1cd50d9037d
diff --git a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.10.11.23 b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.10.11.23
index 1e3c7cbfed2f..e969d876ce3a 100644
--- a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.10.11.23
+++ b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.10.11.23
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=10
 SRC_URI=https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=iwlwifi-7260-ucode-23.11.10.0.tgz -> iwl7260-ucode-0.10.11.23.tgz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=6d0eb92de71c28270eb3601df051067b
diff --git a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.10.15.23 b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.10.15.23
index 29a820b82eb1..0913c3298379 100644
--- a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.10.15.23
+++ b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.10.15.23
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=10
 SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-7260-ucode-23.15.10.0.tgz -> iwl7260-ucode-0.10.15.23.tgz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=e4b1b0d7bf66c55c578f8ea9dca93ac4
diff --git a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.12.16.25 b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.12.16.25
index a259f1e64b15..31612c48a3a9 100644
--- a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.12.16.25
+++ b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.12.16.25
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=12
 SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-7260-ucode-25.16.12.0.tgz -> iwl7260-ucode-0.12.16.25.tgz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=9535695a42f56fbbddeed890d5be9c8f
diff --git a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.12.17.25 b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.12.17.25
index dad2e30fc898..7c04e2ea4468 100644
--- a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.12.17.25
+++ b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.12.17.25
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=12
 SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-7260-ucode-25.17.12.0.tgz -> iwl7260-ucode-0.12.17.25.tgz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=3b852a06be90fea9bc7d1bfec1cdda72
diff --git a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.13.30.25 b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.13.30.25
index 1fdcf9ad17b6..6c11a628e3fc 100644
--- a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.13.30.25
+++ b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.13.30.25
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=13
 SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-7260-ucode-25.30.13.0.tgz -> iwl7260-ucode-0.13.30.25.tgz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=fba1653bf0d32498802056419200d674
diff --git a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.15.227938 b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.15.227938
index 4efc9ec48350..337282d9b4a5 100644
--- a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.15.227938
+++ b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.15.227938
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=15
 SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-7260-ucode-15.227938.0.tgz -> iwl7260-ucode-0.15.227938.tgz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=ccd8415ceccb857420aac4c5b412faa6
diff --git a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.16.242414 b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.16.242414
index 7198984b337c..ea1f468afc57 100644
--- a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.16.242414
+++ b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.16.242414
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=16
 SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-7260-ucode-16.242414.0.tgz -> iwl7260-ucode-0.16.242414.tgz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=80eaf1d50670511dab8ab70bd5b663e8
diff --git a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.7.1.22 b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.7.1.22
index c30d47367eda..20a48b1d45b4 100644
--- a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.7.1.22
+++ b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.7.1.22
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=7
 SRC_URI=https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=iwlwifi-7260-ucode-22.1.7.0.tgz -> iwl7260-ucode-0.7.1.22.tgz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=6ae1ff4f62c0e2ca4fd4898083b280a0
diff --git a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.8.15.22 b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.8.15.22
index e5826acc59b6..19902e9a8091 100644
--- a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.8.15.22
+++ b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.8.15.22
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=8
 SRC_URI=https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=iwlwifi-7260-ucode-22.15.8.0.tgz -> iwl7260-ucode-0.8.15.22.tgz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=4befe044d6cfef4f031fb841e1360c22
diff --git a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.8.24.22 b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.8.24.22
index 0b85bb93ea87..7a0ada7cc807 100644
--- a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.8.24.22
+++ b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.8.24.22
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=8
 SRC_URI=https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=iwlwifi-7260-ucode-22.24.8.0.tgz -> iwl7260-ucode-0.8.24.22.tgz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=4befe044d6cfef4f031fb841e1360c22
diff --git a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.9.214.23 b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.9.214.23
index 72d2d2290b34..cf0650bed41d 100644
--- a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.9.214.23
+++ b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.9.214.23
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=9
 SRC_URI=https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=iwlwifi-7260-ucode-23.214.9.0.tgz -> iwl7260-ucode-0.9.214.23.tgz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=ee20b0cb3a457882e43ea0bd732ef1e0
diff --git a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.9.228.25 b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.9.228.25
index a965ca89fc18..e8845e9c4a37 100644
--- a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.9.228.25
+++ b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.9.228.25
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=9
 SRC_URI=https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=iwlwifi-7260-ucode-25.228.9.0.tgz -> iwl7260-ucode-0.9.228.25.tgz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=e9ae3c3909b8baf5e8caa80039222aa5
diff --git a/metadata/md5-cache/sys-firmware/iwl8000-ucode-16.242414.0 b/metadata/md5-cache/sys-firmware/iwl8000-ucode-16.242414.0
index a2d80e7fccb4..5fc78df3331c 100644
--- a/metadata/md5-cache/sys-firmware/iwl8000-ucode-16.242414.0
+++ b/metadata/md5-cache/sys-firmware/iwl8000-ucode-16.242414.0
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=!sys-kernel/linux-firmware[-savedconfig]
 SLOT=0
 SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-8000-ucode-16.242414.0.tgz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=a148adbff178027a90f38e51621a9fec
diff --git a/metadata/md5-cache/sys-firmware/midisport-firmware-1.2 b/metadata/md5-cache/sys-firmware/midisport-firmware-1.2
index 164e70d5245b..b0bad3d554ff 100644
--- a/metadata/md5-cache/sys-firmware/midisport-firmware-1.2
+++ b/metadata/md5-cache/sys-firmware/midisport-firmware-1.2
@@ -9,5 +9,5 @@ LICENSE=Midisport
 RDEPEND=sys-apps/fxload virtual/udev
 SLOT=0
 SRC_URI=http://downloads.sourceforge.net/usb-midi-fw/midisport-firmware-1.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac
 _md5_=292cbf787ef3e518b41a41646fbfd2cd
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 1380c8c985f8..c470e00a9e00 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/android-file-transfer-linux-3.5 b/metadata/md5-cache/sys-fs/android-file-transfer-linux-3.5
index 7aa85229195a..dc9a47823453 100644
--- a/metadata/md5-cache/sys-fs/android-file-transfer-linux-3.5
+++ b/metadata/md5-cache/sys-fs/android-file-transfer-linux-3.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-apps/file sys-libs/readline:0= fuse? ( sys-fs/fuse:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 SLOT=0
 SRC_URI=https://github.com/whoozle/android-file-transfer-linux/archive/v3.5.tar.gz -> android-file-transfer-linux-3.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=66b9fb415b5a1223c97cb870d1e969f5
diff --git a/metadata/md5-cache/sys-fs/android-file-transfer-linux-9999 b/metadata/md5-cache/sys-fs/android-file-transfer-linux-9999
index 93633b0120b9..142c3f8f15f7 100644
--- a/metadata/md5-cache/sys-fs/android-file-transfer-linux-9999
+++ b/metadata/md5-cache/sys-fs/android-file-transfer-linux-9999
@@ -7,5 +7,5 @@ IUSE=fuse qt5
 LICENSE=LGPL-2.1
 RDEPEND=sys-apps/file sys-libs/readline:0= fuse? ( sys-fs/fuse:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=66b9fb415b5a1223c97cb870d1e969f5
diff --git a/metadata/md5-cache/sys-fs/aufs-util-3.19_p20150323 b/metadata/md5-cache/sys-fs/aufs-util-3.19_p20150323
index 0388c5e70d73..b0ed3250673b 100644
--- a/metadata/md5-cache/sys-fs/aufs-util-3.19_p20150323
+++ b/metadata/md5-cache/sys-fs/aufs-util-3.19_p20150323
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!sys-fs/aufs2 !<sys-fs/aufs3-3_p20130318
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs-util-3.19_p20150323.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6ae61d7d55bedb420dccf0c015ea7bc2
diff --git a/metadata/md5-cache/sys-fs/aufs-util-3.19_p20150420 b/metadata/md5-cache/sys-fs/aufs-util-3.19_p20150420
index 409a0c3dcd7a..a11a788a9503 100644
--- a/metadata/md5-cache/sys-fs/aufs-util-3.19_p20150420
+++ b/metadata/md5-cache/sys-fs/aufs-util-3.19_p20150420
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!sys-fs/aufs2 !<sys-fs/aufs3-3_p20130318
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs-util-3.19_p20150420.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6ae61d7d55bedb420dccf0c015ea7bc2
diff --git a/metadata/md5-cache/sys-fs/aufs-util-4.0_p20150420 b/metadata/md5-cache/sys-fs/aufs-util-4.0_p20150420
index 9ef4b6f68031..b5d9ec7c3fc5 100644
--- a/metadata/md5-cache/sys-fs/aufs-util-4.0_p20150420
+++ b/metadata/md5-cache/sys-fs/aufs-util-4.0_p20150420
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!sys-fs/aufs2 !<sys-fs/aufs3-3_p20130318
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs-util-4.0_p20150420.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a2957009473e07b0ea4273debb8e7450
diff --git a/metadata/md5-cache/sys-fs/aufs-util-4.0_p20151116 b/metadata/md5-cache/sys-fs/aufs-util-4.0_p20151116
index 365269ea8a28..cd077777b422 100644
--- a/metadata/md5-cache/sys-fs/aufs-util-4.0_p20151116
+++ b/metadata/md5-cache/sys-fs/aufs-util-4.0_p20151116
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!sys-fs/aufs2 !<sys-fs/aufs3-3_p20130318
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs-util-4.0_p20151116.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3358b0aef124b3e2332817d15f7c8910
diff --git a/metadata/md5-cache/sys-fs/aufs-util-4.1_p20161010 b/metadata/md5-cache/sys-fs/aufs-util-4.1_p20161010
index d47fa7ba859d..13051e8fc0d2 100644
--- a/metadata/md5-cache/sys-fs/aufs-util-4.1_p20161010
+++ b/metadata/md5-cache/sys-fs/aufs-util-4.1_p20161010
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!sys-fs/aufs2 !<sys-fs/aufs3-3_p20130318
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs-util-4.1_p20161010.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=be512ab755a3c0774c857b1bf7ca9129
diff --git a/metadata/md5-cache/sys-fs/aufs-util-4.1_p20170130 b/metadata/md5-cache/sys-fs/aufs-util-4.1_p20170130
index 222f6731aabb..fa0bf9e16e1a 100644
--- a/metadata/md5-cache/sys-fs/aufs-util-4.1_p20170130
+++ b/metadata/md5-cache/sys-fs/aufs-util-4.1_p20170130
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!sys-fs/aufs2 !<sys-fs/aufs3-3_p20130318
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs-util-4.1_p20170130.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4a5639e2da2fc5f4454e76c84f7a4aea
diff --git a/metadata/md5-cache/sys-fs/bedup-0.10.1 b/metadata/md5-cache/sys-fs/bedup-0.10.1
index 96cfa2d7aee8..526a55382d2f 100644
--- a/metadata/md5-cache/sys-fs/bedup-0.10.1
+++ b/metadata/md5-cache/sys-fs/bedup-0.10.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/cffi-0.5:=[python_targets_python3_4(-)?,python_targets_pyth
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
index 071f3b2aa269..55450b4f6774 100644
--- a/metadata/md5-cache/sys-fs/bedup-9999
+++ b/metadata/md5-cache/sys-fs/bedup-9999
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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/bees-0.6 b/metadata/md5-cache/sys-fs/bees-0.6
new file mode 100644
index 000000000000..b2b17250f5e4
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/bees-0.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure pretend setup
+DEPEND=>=sys-apps/util-linux-2.30.2 >=sys-fs/btrfs-progs-4.1
+DESCRIPTION=Best-Effort Extent-Same, a btrfs dedup agent
+EAPI=7
+HOMEPAGE=https://github.com/Zygo/bees
+IUSE=tools kernel_linux
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=>=sys-apps/util-linux-2.30.2 >=sys-fs/btrfs-progs-4.1
+SLOT=0
+SRC_URI=https://github.com/Zygo/bees/archive/v0.6.tar.gz -> bees-0.6.tar.gz
+_eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=aadf35196ac4b44f0eb6c710927ff2f5
diff --git a/metadata/md5-cache/sys-fs/bees-9999 b/metadata/md5-cache/sys-fs/bees-9999
index 7eea2aab4c65..7c7146aacf91 100644
--- a/metadata/md5-cache/sys-fs/bees-9999
+++ b/metadata/md5-cache/sys-fs/bees-9999
@@ -8,5 +8,5 @@ IUSE=tools kernel_linux
 LICENSE=GPL-3
 RDEPEND=>=sys-apps/util-linux-2.30.2 >=sys-fs/btrfs-progs-4.1
 SLOT=0
-_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=5ca50f308e54f208e2df519b990f62ed
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=0511de23578ccef0c91e7cc8286d7d5a
diff --git a/metadata/md5-cache/sys-fs/clamfs-1.0.1-r2 b/metadata/md5-cache/sys-fs/clamfs-1.0.1-r2
index 04836f0070ea..329291b7c8c8 100644
--- a/metadata/md5-cache/sys-fs/clamfs-1.0.1-r2
+++ b/metadata/md5-cache/sys-fs/clamfs-1.0.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/boost-1.33 sys-fs/fuse dev-cpp/commoncpp2 dev-libs/rlog dev-libs/poco app-antivirus/clamav
 SLOT=0
 SRC_URI=mirror://sourceforge/clamfs/clamfs-1.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ac0dcbbca331f6b5771aaf80678bbc68
diff --git a/metadata/md5-cache/sys-fs/cryfs-0.9.7 b/metadata/md5-cache/sys-fs/cryfs-0.9.7
index cac646d8ce19..706e1084cad2 100644
--- a/metadata/md5-cache/sys-fs/cryfs-0.9.7
+++ b/metadata/md5-cache/sys-fs/cryfs-0.9.7
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/boost-1.56:= >=dev-libs/crypto++-5.6.3:= net-misc/curl:= >=sy
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/cryfs/cryfs/releases/download/0.9.7/cryfs-0.9.7.tar.xz https://dev.gentoo.org/~johu/distfiles/cryfs-0.9.7-spdlog.patch.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-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=ff17c3ec1ab5af9e0ae6f7e9c26161d8
diff --git a/metadata/md5-cache/sys-fs/cryfs-0.9.9 b/metadata/md5-cache/sys-fs/cryfs-0.9.9
index c17e4f84b06f..db49a4c4e247 100644
--- a/metadata/md5-cache/sys-fs/cryfs-0.9.9
+++ b/metadata/md5-cache/sys-fs/cryfs-0.9.9
@@ -9,5 +9,5 @@ LICENSE=LGPL-3 BSD-2 MIT
 RDEPEND=>=dev-libs/boost-1.56:= >=dev-libs/crypto++-5.6.3:= net-misc/curl:= >=sys-fs/fuse-2.8.6:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= )
 SLOT=0
 SRC_URI=https://github.com/cryfs/cryfs/releases/download/0.9.9/cryfs-0.9.9.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-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=71adc65e73037ce171b585e958baabb3
diff --git a/metadata/md5-cache/sys-fs/cryfs-9999 b/metadata/md5-cache/sys-fs/cryfs-9999
index 2ed178c85b0e..f8c88404867f 100644
--- a/metadata/md5-cache/sys-fs/cryfs-9999
+++ b/metadata/md5-cache/sys-fs/cryfs-9999
@@ -7,5 +7,5 @@ IUSE=custom-optimization libressl test update-check
 LICENSE=LGPL-3 BSD-2 MIT
 RDEPEND=>=dev-libs/boost-1.56:= >=dev-libs/crypto++-5.6.3:= net-misc/curl:= >=sys-fs/fuse-2.8.6:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= )
 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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=13166c0861c0b7e841e712b21f6a2bd2
diff --git a/metadata/md5-cache/sys-fs/cryptmount-5.2.2 b/metadata/md5-cache/sys-fs/cryptmount-5.2.2
index ce6a37fed060..fa984945818a 100644
--- a/metadata/md5-cache/sys-fs/cryptmount-5.2.2
+++ b/metadata/md5-cache/sys-fs/cryptmount-5.2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libgcrypt:0= nls? ( virtual/libintl ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd )
 SLOT=0
 SRC_URI=mirror://sourceforge/cryptmount/cryptmount-5.2.2.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=6dd1c9243b69de0f8f2e5b2333e81432
diff --git a/metadata/md5-cache/sys-fs/cryptmount-5.2.2-r1 b/metadata/md5-cache/sys-fs/cryptmount-5.2.2-r1
index 69993b1f859d..c60098fe67fa 100644
--- a/metadata/md5-cache/sys-fs/cryptmount-5.2.2-r1
+++ b/metadata/md5-cache/sys-fs/cryptmount-5.2.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libgcrypt:0= sys-fs/lvm2:0= nls? ( virtual/libintl ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd )
 SLOT=0
 SRC_URI=mirror://sourceforge/cryptmount/cryptmount-5.2.2.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=71f330d64cd78706227d4afa06f5b42d
diff --git a/metadata/md5-cache/sys-fs/cryptsetup-1.7.5-r1 b/metadata/md5-cache/sys-fs/cryptsetup-1.7.5-r1
index 633c5834f0e2..16716b4882fb 100644
--- a/metadata/md5-cache/sys-fs/cryptsetup-1.7.5-r1
+++ b/metadata/md5-cache/sys-fs/cryptsetup-1.7.5-r1
@@ -10,5 +10,5 @@ RDEPEND=static-libs? ( dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[stati
 REQUIRED_USE=^^ ( gcrypt kernel nettle openssl ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) ) static? ( !gcrypt )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/cryptsetup/v1.7/cryptsetup-1.7.5.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	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_=5d9f35e14172e2f276e04e17104e7b3d
diff --git a/metadata/md5-cache/sys-fs/cryptsetup-2.0.3-r1 b/metadata/md5-cache/sys-fs/cryptsetup-2.0.3-r1
index fc62972114ac..421721f25fdd 100644
--- a/metadata/md5-cache/sys-fs/cryptsetup-2.0.3-r1
+++ b/metadata/md5-cache/sys-fs/cryptsetup-2.0.3-r1
@@ -10,5 +10,5 @@ RDEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[s
 REQUIRED_USE=^^ ( gcrypt kernel nettle openssl ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) static? ( !gcrypt )
 SLOT=0/12
 SRC_URI=mirror://kernel/linux/utils/cryptsetup/v2.0/cryptsetup-2.0.3.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=18b143dc1009dda5def42bcb32c624f0
diff --git a/metadata/md5-cache/sys-fs/cryptsetup-2.0.4 b/metadata/md5-cache/sys-fs/cryptsetup-2.0.4
index 6c5d0f730293..ae49faf25dd4 100644
--- a/metadata/md5-cache/sys-fs/cryptsetup-2.0.4
+++ b/metadata/md5-cache/sys-fs/cryptsetup-2.0.4
@@ -10,5 +10,5 @@ RDEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[s
 REQUIRED_USE=^^ ( gcrypt kernel nettle openssl ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) static? ( !gcrypt )
 SLOT=0/12
 SRC_URI=mirror://kernel/linux/utils/cryptsetup/v2.0/cryptsetup-2.0.4.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_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_=8c73e617fd5c3d65080b2b40768e1b78
diff --git a/metadata/md5-cache/sys-fs/cryptsetup-2.0.4-r1 b/metadata/md5-cache/sys-fs/cryptsetup-2.0.4-r1
index bade8e41d101..4abdceeae021 100644
--- a/metadata/md5-cache/sys-fs/cryptsetup-2.0.4-r1
+++ b/metadata/md5-cache/sys-fs/cryptsetup-2.0.4-r1
@@ -10,5 +10,5 @@ RDEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[s
 REQUIRED_USE=^^ ( gcrypt kernel nettle openssl ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) static? ( !gcrypt )
 SLOT=0/12
 SRC_URI=mirror://kernel/linux/utils/cryptsetup/v2.0/cryptsetup-2.0.4.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_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_=c2309069382f2aaa0b3635ac320cf95f
diff --git a/metadata/md5-cache/sys-fs/dfc-3.0.5-r1 b/metadata/md5-cache/sys-fs/dfc-3.0.5-r1
index 009e9dab64dc..11a3c2bbf5a0 100644
--- a/metadata/md5-cache/sys-fs/dfc-3.0.5-r1
+++ b/metadata/md5-cache/sys-fs/dfc-3.0.5-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=http://projects.gw-computing.net/attachments/download/467/dfc-3.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=f6f2e93c14baa4e40cf420df19c15c4c
diff --git a/metadata/md5-cache/sys-fs/dfc-3.1.1 b/metadata/md5-cache/sys-fs/dfc-3.1.1
index defe38db7301..7f38bf4422ad 100644
--- a/metadata/md5-cache/sys-fs/dfc-3.1.1
+++ b/metadata/md5-cache/sys-fs/dfc-3.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/sys-fs/dislocker-0.7.1-r1 b/metadata/md5-cache/sys-fs/dislocker-0.7.1-r1
index d2c80c10ec5a..2194edea2db0 100644
--- a/metadata/md5-cache/sys-fs/dislocker-0.7.1-r1
+++ b/metadata/md5-cache/sys-fs/dislocker-0.7.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-fs/fuse:* net-libs/mbedtls ruby? ( dev-lang/ruby:2.3 )
 SLOT=0
 SRC_URI=https://github.com/Aorimn/dislocker/archive/v0.7.1.tar.gz -> dislocker-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4c5da410a8d25384e9289a558727bc91
diff --git a/metadata/md5-cache/sys-fs/dislocker-9999 b/metadata/md5-cache/sys-fs/dislocker-9999
index 4b504946d1bf..d06ddadce83f 100644
--- a/metadata/md5-cache/sys-fs/dislocker-9999
+++ b/metadata/md5-cache/sys-fs/dislocker-9999
@@ -7,5 +7,5 @@ IUSE=ruby
 LICENSE=GPL-2
 RDEPEND=sys-fs/fuse:* net-libs/mbedtls ruby? ( dev-lang/ruby:2.3 )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4c5da410a8d25384e9289a558727bc91
diff --git a/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r3 b/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r3
index 9091c2d16b3d..e8443e9f382a 100644
--- a/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r3
+++ b/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r3
@@ -10,5 +10,5 @@ RDEPEND=>=sys-fs/lvm2-2.02.45 klibc? ( dev-libs/klibc ) dietlibc? ( dev-libs/die
 REQUIRED_USE=klibc? ( !dietlibc )
 SLOT=0
 SRC_URI=https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4a415cdb605db596c39fffca248a8757
diff --git a/metadata/md5-cache/sys-fs/dosfstools-4.1 b/metadata/md5-cache/sys-fs/dosfstools-4.1
index 47febfa5e8c9..a92a45c0b588 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 ~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_=be8b8440cfc2da236723fdbd604c04c8
+_md5_=a39141e6520d5ad11a21d6022471ab91
diff --git a/metadata/md5-cache/sys-fs/e4rat-0.2.4_pre20141201 b/metadata/md5-cache/sys-fs/e4rat-0.2.4_pre20141201
index 6424d2ae8240..2b84b9e8769e 100644
--- a/metadata/md5-cache/sys-fs/e4rat-0.2.4_pre20141201
+++ b/metadata/md5-cache/sys-fs/e4rat-0.2.4_pre20141201
@@ -9,5 +9,5 @@ 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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=8e14eaadd0d8e9dff6cebca5994b4137
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 7e967c2b8b2c..40251d12dab3 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
@@ -9,5 +9,5 @@ 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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/sys-fs/ecryptfs-utils-108-r1 b/metadata/md5-cache/sys-fs/ecryptfs-utils-108-r1
index 8535a9013409..a17fe8bef780 100644
--- a/metadata/md5-cache/sys-fs/ecryptfs-utils-108-r1
+++ b/metadata/md5-cache/sys-fs/ecryptfs-utils-108-r1
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/keyutils-1.0 >=dev-libs/libgcrypt-1.2.0:0 dev-libs/nss gpg? (
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://launchpad.net/ecryptfs/trunk/108/+download/ecryptfs-utils_108.orig.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=50869ba7d3278f96684c37bc8cf06eb7
diff --git a/metadata/md5-cache/sys-fs/encfs-1.9.2 b/metadata/md5-cache/sys-fs/encfs-1.9.2
index 604829fe086d..5247d42d381b 100644
--- a/metadata/md5-cache/sys-fs/encfs-1.9.2
+++ b/metadata/md5-cache/sys-fs/encfs-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=!libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) dev-
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vgough/encfs/archive/v1.9.2.tar.gz -> encfs-1.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d2ee16b402eef714323e583edea31a3d
diff --git a/metadata/md5-cache/sys-fs/encfs-1.9.4 b/metadata/md5-cache/sys-fs/encfs-1.9.4
index 73f8b36d97c5..7a2a716e0a26 100644
--- a/metadata/md5-cache/sys-fs/encfs-1.9.4
+++ b/metadata/md5-cache/sys-fs/encfs-1.9.4
@@ -10,5 +10,5 @@ RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) de
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vgough/encfs/archive/v1.9.4.tar.gz -> encfs-1.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c30c067c388776196eda3b79c7a1a2bb
diff --git a/metadata/md5-cache/sys-fs/encfs-1.9.5 b/metadata/md5-cache/sys-fs/encfs-1.9.5
index 4f9d2dd157e5..ed5cbea0c1ac 100644
--- a/metadata/md5-cache/sys-fs/encfs-1.9.5
+++ b/metadata/md5-cache/sys-fs/encfs-1.9.5
@@ -10,5 +10,5 @@ RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) de
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vgough/encfs/archive/v1.9.5.tar.gz -> encfs-1.9.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=ba8a931e0369774cc6c201767829ba26
diff --git a/metadata/md5-cache/sys-fs/eudev-3.2.5 b/metadata/md5-cache/sys-fs/eudev-3.2.5
index efeb624a15a0..4cc37ead765e 100644
--- a/metadata/md5-cache/sys-fs/eudev-3.2.5
+++ b/metadata/md5-cache/sys-fs/eudev-3.2.5
@@ -10,5 +10,5 @@ PDEPEND=>=sys-fs/udev-init-scripts-26 hwdb? ( >=sys-apps/hwids-20140304[udev] )
 RDEPEND=>=sys-apps/util-linux-2.20 introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev !sys-apps/systemd
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/eudev/eudev-3.2.5.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=08bc6b5670812d81cc8a3f2d7ca065d4
diff --git a/metadata/md5-cache/sys-fs/eudev-3.2.6 b/metadata/md5-cache/sys-fs/eudev-3.2.6
index 299d8c895f53..b764595b949c 100644
--- a/metadata/md5-cache/sys-fs/eudev-3.2.6
+++ b/metadata/md5-cache/sys-fs/eudev-3.2.6
@@ -10,5 +10,5 @@ PDEPEND=>=sys-fs/udev-init-scripts-26 hwdb? ( >=sys-apps/hwids-20140304[udev] )
 RDEPEND=>=sys-apps/util-linux-2.20 introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev !sys-apps/systemd
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/eudev/eudev-3.2.6.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=6588ceb5141c770b6b5dd8c39d6ef326
diff --git a/metadata/md5-cache/sys-fs/eudev-4.9999 b/metadata/md5-cache/sys-fs/eudev-4.9999
index ad70e020ab8d..7e5d23787b63 100644
--- a/metadata/md5-cache/sys-fs/eudev-4.9999
+++ b/metadata/md5-cache/sys-fs/eudev-4.9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1 GPL-2
 PDEPEND=>=sys-fs/udev-init-scripts-26 hwdb? ( >=sys-apps/hwids-20140304[udev] )
 RDEPEND=>=sys-apps/util-linux-2.20 kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev !sys-apps/systemd
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=1a235588341bcf6ff19113fd0dadc11a
diff --git a/metadata/md5-cache/sys-fs/eudev-9999 b/metadata/md5-cache/sys-fs/eudev-9999
index d096857e52c3..7f84743aa9ec 100644
--- a/metadata/md5-cache/sys-fs/eudev-9999
+++ b/metadata/md5-cache/sys-fs/eudev-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1 MIT GPL-2
 PDEPEND=>=sys-fs/udev-init-scripts-26 hwdb? ( >=sys-apps/hwids-20140304[udev] )
 RDEPEND=>=sys-apps/util-linux-2.20 introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev !sys-apps/systemd
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=6588ceb5141c770b6b5dd8c39d6ef326
diff --git a/metadata/md5-cache/sys-fs/fragview-0.1.1 b/metadata/md5-cache/sys-fs/fragview-0.1.1
index 8bcf1c7c0a56..9c216e45f683 100644
--- a/metadata/md5-cache/sys-fs/fragview-0.1.1
+++ b/metadata/md5-cache/sys-fs/fragview-0.1.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:3.0 dev-db/sqlite:3 dev-libs/boost:=
 SLOT=0
 SRC_URI=https://github.com/i-rinat/fragview/archive/v0.1.1.tar.gz -> fragview-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=200417fc78b0c335dd9ab55032043897
diff --git a/metadata/md5-cache/sys-fs/fragview-9999 b/metadata/md5-cache/sys-fs/fragview-9999
index 957e5ad1d0a9..505b4a41e577 100644
--- a/metadata/md5-cache/sys-fs/fragview-9999
+++ b/metadata/md5-cache/sys-fs/fragview-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/i-rinat/fragview
 LICENSE=MIT
 RDEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:3.0 dev-db/sqlite:3 dev-libs/boost:=
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e48ea03913d51d48237910ef73a459ac
diff --git a/metadata/md5-cache/sys-fs/fuse-2.9.7 b/metadata/md5-cache/sys-fs/fuse-2.9.7
index fcc2a7853a66..e9151d149cd9 100644
--- a/metadata/md5-cache/sys-fs/fuse-2.9.7
+++ b/metadata/md5-cache/sys-fs/fuse-2.9.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PDEPEND=kernel_FreeBSD? ( sys-fs/fuse4bsd )
 SLOT=0
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-2.9.7/fuse-2.9.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5c0dd9579acd9225a908f48435c9dac9
diff --git a/metadata/md5-cache/sys-fs/fuse-2.9.7-r1 b/metadata/md5-cache/sys-fs/fuse-2.9.7-r1
index 2be347fed356..46974a4b03e1 100644
--- a/metadata/md5-cache/sys-fs/fuse-2.9.7-r1
+++ b/metadata/md5-cache/sys-fs/fuse-2.9.7-r1
@@ -10,5 +10,5 @@ PDEPEND=kernel_FreeBSD? ( sys-fs/fuse4bsd )
 RDEPEND=sys-fs/fuse-common
 SLOT=0
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-2.9.7/fuse-2.9.7.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac
 _md5_=1f3f703d54ed8efe91da8983beed494a
diff --git a/metadata/md5-cache/sys-fs/fuse-2.9.8 b/metadata/md5-cache/sys-fs/fuse-2.9.8
index 75133d2890c6..5905896040f9 100644
--- a/metadata/md5-cache/sys-fs/fuse-2.9.8
+++ b/metadata/md5-cache/sys-fs/fuse-2.9.8
@@ -10,5 +10,5 @@ PDEPEND=kernel_FreeBSD? ( sys-fs/fuse4bsd )
 RDEPEND=sys-fs/fuse-common
 SLOT=0
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-2.9.8/fuse-2.9.8.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac
 _md5_=1f3f703d54ed8efe91da8983beed494a
diff --git a/metadata/md5-cache/sys-fs/fuse-zip-0.4.2 b/metadata/md5-cache/sys-fs/fuse-zip-0.4.2
deleted file mode 100644
index b19306b00f8c..000000000000
--- a/metadata/md5-cache/sys-fs/fuse-zip-0.4.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile prepare
-DEPEND=>=dev-libs/libzip-0.11.2:= >=sys-fs/fuse-2.7:=
-DESCRIPTION=FUSE file system to navigate, extract, create and modify ZIP archives
-EAPI=5
-HOMEPAGE=https://bitbucket.org/agalanin/fuse-zip
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=>=dev-libs/libzip-0.11.2:= >=sys-fs/fuse-2.7:=
-RESTRICT=test
-SLOT=0
-SRC_URI=https://bitbucket.org/agalanin/fuse-zip/downloads/fuse-zip-0.4.2.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=4813ec7968cb20143f067425389d6049
diff --git a/metadata/md5-cache/sys-fs/fuse-zip-0.4.5 b/metadata/md5-cache/sys-fs/fuse-zip-0.4.5
new file mode 100644
index 000000000000..de8552c9473e
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/fuse-zip-0.4.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=>=dev-libs/libzip-0.11.2:= >=sys-fs/fuse-2.7:=
+DESCRIPTION=FUSE file system to navigate, extract, create and modify ZIP archives
+EAPI=7
+HOMEPAGE=https://bitbucket.org/agalanin/fuse-zip
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/libzip-0.11.2:= >=sys-fs/fuse-2.7:=
+RESTRICT=test
+SLOT=0
+SRC_URI=https://bitbucket.org/agalanin/fuse-zip/downloads/fuse-zip-0.4.5.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=219e38b23863b45c81aaf85f7d3a908d
diff --git a/metadata/md5-cache/sys-fs/loop-aes-3.7m b/metadata/md5-cache/sys-fs/loop-aes-3.7m
index 0191ef8fefdb..5778b65ee974 100644
--- a/metadata/md5-cache/sys-fs/loop-aes-3.7m
+++ b/metadata/md5-cache/sys-fs/loop-aes-3.7m
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=mirror://sourceforge/loop-aes/loop-AES-v3.7m.tar.bz2
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=bfc55533051af96954be584432d355a5
diff --git a/metadata/md5-cache/sys-fs/lsscsi-0.29 b/metadata/md5-cache/sys-fs/lsscsi-0.29
index 6ee647f73957..a3fca055c295 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_=5147046fe11c675c3da99134487a8747
+_md5_=a22cfece104d187434eec0e4881d425b
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.116 b/metadata/md5-cache/sys-fs/lvm2-2.02.116
index 1f2eb70dcc37..24ef093e0de8 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.116
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.116
@@ -10,5 +10,5 @@ RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* ) readline
 REQUIRED_USE=device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin ) systemd? ( udev ) static? ( !udev )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.116.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.116.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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_=3064d59513eb33e8d1d7d92fdf73ccfe
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.116-r1 b/metadata/md5-cache/sys-fs/lvm2-2.02.116-r1
index 421fde5c8ca6..828ba5600725 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.116-r1
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.116-r1
@@ -10,5 +10,5 @@ RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* ) readline
 REQUIRED_USE=device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin ) systemd? ( udev )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.116.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.116.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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
index a3a03f409aa0..e7bac67de203 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.116-r2
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.116-r2
@@ -10,5 +10,5 @@ RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* ) readline
 REQUIRED_USE=device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin ) systemd? ( udev ) clvm? ( !systemd )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.116.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.116.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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
index d1b04b1a58fd..1f7c0b1d4b09 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.116-r4
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.116-r4
@@ -10,5 +10,5 @@ RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* ) readline
 REQUIRED_USE=device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin ) systemd? ( udev ) clvm? ( !systemd )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.116.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.116.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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
index 2c127b6346e1..6c7ffede7219 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.116-r5
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.116-r5
@@ -10,5 +10,5 @@ RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync
 REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin ) systemd? ( udev ) clvm? ( !systemd )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.116.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.116.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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
index 8bb6282f88c4..1aa6aa4bb09f 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.116-r6
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.116-r6
@@ -10,5 +10,5 @@ RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync
 REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin ) systemd? ( udev ) clvm? ( !systemd )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.116.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.116.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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
index 7ddaf3495de6..640867bc29b6 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.136
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.136
@@ -10,5 +10,5 @@ RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* ) readline
 REQUIRED_USE=device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin ) systemd? ( udev ) clvm? ( !systemd )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.136.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.136.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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
index f150e1103204..b225a9522a4b 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.136-r1
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.136-r1
@@ -10,5 +10,5 @@ RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync
 REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin ) systemd? ( udev ) clvm? ( !systemd )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.136.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.136.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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
index c04a77effc26..c5ed9b2887de 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.136-r2
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.136-r2
@@ -10,5 +10,5 @@ RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync
 REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin ) systemd? ( udev ) clvm? ( !systemd )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.136.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.136.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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
index 3c2b12147879..02d5dc5245e3 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.139
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.139
@@ -10,5 +10,5 @@ RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync
 REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin ) systemd? ( udev ) clvm? ( !systemd )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.139.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.139.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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
index 3bd44b0a613b..9c0eec17f8b3 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.139-r1
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.139-r1
@@ -10,5 +10,5 @@ RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync
 REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin ) systemd? ( udev ) clvm? ( !systemd )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.139.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.139.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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
index eb14e7fe602e..de7b3debcbbf 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.145
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.145
@@ -10,5 +10,5 @@ RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync
 REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin ) systemd? ( udev ) clvm? ( !systemd )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.145.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.145.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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
index f3537806f900..69a1e8b42625 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.145-r1
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.145-r1
@@ -10,5 +10,5 @@ RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync
 REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin ) systemd? ( udev ) clvm? ( !systemd )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.145.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.145.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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.145-r2 b/metadata/md5-cache/sys-fs/lvm2-2.02.145-r2
index 2f09251a8a05..18aef1907865 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.145-r2
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.145-r2
@@ -10,5 +10,5 @@ RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync
 REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin ) systemd? ( udev ) clvm? ( !systemd )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.145.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.145.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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_=e1fd129f9313582c858adc93cc8e1cea
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.166 b/metadata/md5-cache/sys-fs/lvm2-2.02.166
index d82ffb3480f3..c874ae78cd70 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.166
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.166
@@ -10,5 +10,5 @@ RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync
 REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin ) systemd? ( udev ) clvm? ( !systemd )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.166.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.166.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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
index b1a4edbf9f7e..5b913f0f2f9d 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.166-r2
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.166-r2
@@ -10,5 +10,5 @@ RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync
 REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !sanlock !thin ) systemd? ( udev ) clvm? ( !systemd )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.166.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.166.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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
index a4fee50226b0..71ef6add8008 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.173
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.173
@@ -10,5 +10,5 @@ RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync
 REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !sanlock !thin ) systemd? ( udev ) clvm? ( !systemd )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.173.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.173.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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 2752336b1b60..1fe9294b480a 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.181
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.181
@@ -10,5 +10,5 @@ RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) corosync? ( sys-cluster/corosync
 REQUIRED_USE=device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !sanlock !thin ) systemd? ( udev ) clvm? ( !systemd )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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
diff --git a/metadata/md5-cache/sys-fs/mtools-4.0.19 b/metadata/md5-cache/sys-fs/mtools-4.0.19
new file mode 100644
index 000000000000..a2f678cd7a59
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/mtools-4.0.19
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=!elibc_glibc? ( virtual/libiconv ) X? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt ) sys-apps/texinfo
+DESCRIPTION=utilities to access MS-DOS disks from Unix without mounting them
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools
+IUSE=X elibc_glibc
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris
+LICENSE=GPL-3
+RDEPEND=!elibc_glibc? ( virtual/libiconv ) X? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt )
+SLOT=0
+SRC_URI=mirror://gnu/mtools/mtools-4.0.19.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_=c9eab0a8e052f7348bfc27e8ee9c3a1a
diff --git a/metadata/md5-cache/sys-fs/multipath-tools-0.6.4-r1 b/metadata/md5-cache/sys-fs/multipath-tools-0.6.4-r1
index 0bac4bbdc5f8..f0c3de3ca69d 100644
--- a/metadata/md5-cache/sys-fs/multipath-tools-0.6.4-r1
+++ b/metadata/md5-cache/sys-fs/multipath-tools-0.6.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-fs/lvm2-2.02.45 >=virtual/udev-171 dev-libs/libaio dev-libs/userspace-rcu sys-libs/readline:0= rbd? ( sys-cluster/ceph ) systemd? ( sys-apps/systemd )
 SLOT=0
 SRC_URI=http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=0.6.4;sf=tgz -> multipath-tools-0.6.4.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-snapshot	b77011b62e2053c646ad720defe6d921
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-snapshot	b77011b62e2053c646ad720defe6d921
 _md5_=743a0ba01f7f047ad9b1757ab2ca119a
diff --git a/metadata/md5-cache/sys-fs/multipath-tools-0.7.6 b/metadata/md5-cache/sys-fs/multipath-tools-0.7.6
index 7c69841b411a..dc5545643023 100644
--- a/metadata/md5-cache/sys-fs/multipath-tools-0.7.6
+++ b/metadata/md5-cache/sys-fs/multipath-tools-0.7.6
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/json-c:= dev-libs/libaio dev-libs/userspace-rcu >=sys-fs/lvm2-2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=0.7.6;sf=tgz -> multipath-tools-0.7.6.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-snapshot	b77011b62e2053c646ad720defe6d921
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-snapshot	b77011b62e2053c646ad720defe6d921
 _md5_=84fb8fa2387d63103f18e4e68bd1bc61
diff --git a/metadata/md5-cache/sys-fs/multipath-tools-0.7.7 b/metadata/md5-cache/sys-fs/multipath-tools-0.7.7
index a2d6b70edec9..4720224da937 100644
--- a/metadata/md5-cache/sys-fs/multipath-tools-0.7.7
+++ b/metadata/md5-cache/sys-fs/multipath-tools-0.7.7
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/json-c:= dev-libs/libaio dev-libs/userspace-rcu >=sys-fs/lvm2-2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=0.7.7;sf=tgz -> multipath-tools-0.7.7.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-snapshot	b77011b62e2053c646ad720defe6d921
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-snapshot	b77011b62e2053c646ad720defe6d921
 _md5_=84fb8fa2387d63103f18e4e68bd1bc61
diff --git a/metadata/md5-cache/sys-fs/nilfs-utils-2.1.5-r1 b/metadata/md5-cache/sys-fs/nilfs-utils-2.1.5-r1
index fd17fd693634..4526223e8d41 100644
--- a/metadata/md5-cache/sys-fs/nilfs-utils-2.1.5-r1
+++ b/metadata/md5-cache/sys-fs/nilfs-utils-2.1.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=sys-libs/e2fsprogs-libs sys-apps/util-linux
 SLOT=0
 SRC_URI=http://nilfs.sourceforge.net/download/nilfs-utils-2.1.5.tar.bz2
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=771dabc635c41a585043f88418c0bea6
diff --git a/metadata/md5-cache/sys-fs/nilfs-utils-2.1.6 b/metadata/md5-cache/sys-fs/nilfs-utils-2.1.6
index 2c262ed1fc3a..e414dcb93405 100644
--- a/metadata/md5-cache/sys-fs/nilfs-utils-2.1.6
+++ b/metadata/md5-cache/sys-fs/nilfs-utils-2.1.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=sys-libs/e2fsprogs-libs sys-apps/util-linux
 SLOT=0
 SRC_URI=http://nilfs.sourceforge.net/download/nilfs-utils-2.1.6.tar.bz2
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=1d10f89ad7aa7c698cf39fe52fbd49ac
diff --git a/metadata/md5-cache/sys-fs/nilfs-utils-2.2.2 b/metadata/md5-cache/sys-fs/nilfs-utils-2.2.2
index ab99ee01e314..bfa4832160c4 100644
--- a/metadata/md5-cache/sys-fs/nilfs-utils-2.2.2
+++ b/metadata/md5-cache/sys-fs/nilfs-utils-2.2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=sys-libs/e2fsprogs-libs sys-apps/util-linux
 SLOT=0
 SRC_URI=http://nilfs.sourceforge.net/download/nilfs-utils-2.2.2.tar.bz2
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=1d10f89ad7aa7c698cf39fe52fbd49ac
diff --git a/metadata/md5-cache/sys-fs/ntfs3g-2016.2.22-r2 b/metadata/md5-cache/sys-fs/ntfs3g-2016.2.22-r2
index 847bc712fa2a..2670cd4d0762 100644
--- a/metadata/md5-cache/sys-fs/ntfs3g-2016.2.22-r2
+++ b/metadata/md5-cache/sys-fs/ntfs3g-2016.2.22-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!<sys-apps/util-linux-2.20.1-r2 !sys-fs/ntfsprogs ntfsdecrypt? ( >=dev-libs/libgcrypt-1.2.2:0 >=net-libs/gnutls-1.4.4 ) external-fuse? ( >=sys-fs/fuse-2.8.0 <sys-fs/fuse-3.0.0_pre )
 SLOT=0/87
 SRC_URI=http://tuxera.com/opensource/ntfs-3g_ntfsprogs-2016.2.22.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6518862469adadd4756ddeaf4fa8be68
diff --git a/metadata/md5-cache/sys-fs/ntfs3g-2017.3.23-r1 b/metadata/md5-cache/sys-fs/ntfs3g-2017.3.23-r1
index 57536501a2ac..f89e061f318f 100644
--- a/metadata/md5-cache/sys-fs/ntfs3g-2017.3.23-r1
+++ b/metadata/md5-cache/sys-fs/ntfs3g-2017.3.23-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!<sys-apps/util-linux-2.20.1-r2 !sys-fs/ntfsprogs ntfsdecrypt? ( >=dev-libs/libgcrypt-1.2.2:0 >=net-libs/gnutls-1.4.4 ) external-fuse? ( >=sys-fs/fuse-2.8.0:0 )
 SLOT=0/88
 SRC_URI=http://tuxera.com/opensource/ntfs-3g_ntfsprogs-2017.3.23.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1db008af5c7a5c82b43c3cd3ace325e4
diff --git a/metadata/md5-cache/sys-fs/owfs-3.1_p4-r1 b/metadata/md5-cache/sys-fs/owfs-3.1_p4-r1
index f570f899965e..31bf344666ae 100644
--- a/metadata/md5-cache/sys-fs/owfs-3.1_p4-r1
+++ b/metadata/md5-cache/sys-fs/owfs-3.1_p4-r1
@@ -10,5 +10,5 @@ RDEPEND=ftdi? ( dev-embedded/libftdi:0 ) fuse? ( sys-fs/fuse:0= ) perl? ( dev-la
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0/3.1_p4
 SRC_URI=mirror://sourceforge/owfs/owfs-3.1p4.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=71bee7d7868c6c08d8e544fa60c73481
diff --git a/metadata/md5-cache/sys-fs/owfs-3.2_p2-r1 b/metadata/md5-cache/sys-fs/owfs-3.2_p2-r1
index 538a7c4272b9..d3a0bbc960b9 100644
--- a/metadata/md5-cache/sys-fs/owfs-3.2_p2-r1
+++ b/metadata/md5-cache/sys-fs/owfs-3.2_p2-r1
@@ -10,5 +10,5 @@ RDEPEND=ftdi? ( dev-embedded/libftdi:0 ) fuse? ( sys-fs/fuse:0= ) perl? ( dev-la
 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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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_=91db8fa32cfd2c5ca70f01ab84d29d32
diff --git a/metadata/md5-cache/sys-fs/pysize-0.2-r1 b/metadata/md5-cache/sys-fs/pysize-0.2-r1
index a8d65e78e5cf..545511b14038 100644
--- a/metadata/md5-cache/sys-fs/pysize-0.2-r1
+++ b/metadata/md5-cache/sys-fs/pysize-0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=gtk? ( dev-python/pygtk:2 ) ncurses? ( sys-libs/ncurses:0= ) python_targ
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 ) || ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://guichaz.free.fr/pysize/files/pysize-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3f29c13c0b91e2b4620d3e7ae93b38fe
diff --git a/metadata/md5-cache/sys-fs/pytagsfs-0.9.2 b/metadata/md5-cache/sys-fs/pytagsfs-0.9.2
index a136aacdce65..a34318d85321 100644
--- a/metadata/md5-cache/sys-fs/pytagsfs-0.9.2
+++ b/metadata/md5-cache/sys-fs/pytagsfs-0.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/fuse-python-0.2-r1 >=dev-python/sclapp-0.5.2 || ( dev-pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.alittletooquiet.net/media/release/pytagsfs-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=de7b23c2d40ef669e5acf8f5deefda02
diff --git a/metadata/md5-cache/sys-fs/reiserfs-defrag-0.2.2 b/metadata/md5-cache/sys-fs/reiserfs-defrag-0.2.2
index a9d38e0aba46..4bfb14e0ca68 100644
--- a/metadata/md5-cache/sys-fs/reiserfs-defrag-0.2.2
+++ b/metadata/md5-cache/sys-fs/reiserfs-defrag-0.2.2
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=https://github.com/i-rinat/reiserfs-defrag/archive/v0.2.2.tar.gz -> reiserfs-defrag-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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=bb2034b45fbc463a62342abe7eb89107
diff --git a/metadata/md5-cache/sys-fs/shake-0.999 b/metadata/md5-cache/sys-fs/shake-0.999
index 03d2ca286c33..e43dfb7b10ae 100644
--- a/metadata/md5-cache/sys-fs/shake-0.999
+++ b/metadata/md5-cache/sys-fs/shake-0.999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=sys-apps/attr
 SLOT=0
 SRC_URI=mirror://nongnu/shake/shake-0.999.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0274f570307dd9b146d393810e2f2888
diff --git a/metadata/md5-cache/sys-fs/shake-1.0 b/metadata/md5-cache/sys-fs/shake-1.0
index 1f27be883b12..6bd3db95a73e 100644
--- a/metadata/md5-cache/sys-fs/shake-1.0
+++ b/metadata/md5-cache/sys-fs/shake-1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=sys-apps/attr
 SLOT=0
 SRC_URI=https://github.com/unbrice/shake/archive/v1.0.tar.gz -> shake-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e264b8f5086ce26d17172a2d31292141
diff --git a/metadata/md5-cache/sys-fs/squashfs-tools-9999 b/metadata/md5-cache/sys-fs/squashfs-tools-9999
index 51fe52e90115..2d845b26c935 100644
--- a/metadata/md5-cache/sys-fs/squashfs-tools-9999
+++ b/metadata/md5-cache/sys-fs/squashfs-tools-9999
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile configure install unpack
 DEPEND=!static? ( !xz? ( !lzo? ( sys-libs/zlib ) ) lz4? ( app-arch/lz4 ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo ) sys-libs/zlib xattr? ( sys-apps/attr ) xz? ( app-arch/xz-utils ) zstd? ( app-arch/zstd ) ) static? ( !xz? ( !lzo? ( sys-libs/zlib[static-libs(+)] ) ) lz4? ( app-arch/lz4[static-libs(+)] ) lzma? ( app-arch/xz-utils[static-libs(+)] ) lzo? ( dev-libs/lzo[static-libs(+)] ) sys-libs/zlib[static-libs(+)] xattr? ( sys-apps/attr[static-libs(+)] ) xz? ( app-arch/xz-utils[static-libs(+)] ) zstd? ( app-arch/zstd[static-libs(+)] ) ) >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Tool for creating compressed filesystem type squashfs
 EAPI=6
-HOMEPAGE=http://squashfs.sourceforge.net
+HOMEPAGE=http://squashfs.sourceforge.net https://github.com/plougher/squashfs-tools
 IUSE=debug lz4 lzma lzo static xattr +xz zstd
 LICENSE=GPL-2
 RDEPEND=!static? ( !xz? ( !lzo? ( sys-libs/zlib ) ) lz4? ( app-arch/lz4 ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo ) sys-libs/zlib xattr? ( sys-apps/attr ) xz? ( app-arch/xz-utils ) zstd? ( app-arch/zstd ) )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3768b44ddf8cdad52d39ef4c55209aa0
+_md5_=426c7134079fb6292b7f88e45f027d56
diff --git a/metadata/md5-cache/sys-fs/traydevice-1.6.2-r1 b/metadata/md5-cache/sys-fs/traydevice-1.6.2-r1
index 03d449760475..174b7bcab9bc 100644
--- a/metadata/md5-cache/sys-fs/traydevice-1.6.2-r1
+++ b/metadata/md5-cache/sys-fs/traydevice-1.6.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://nongnu/traydevice/traydevice-1.6.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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9eb962662fd301966826d326c50b2b16
diff --git a/metadata/md5-cache/sys-fs/udev-236-r1 b/metadata/md5-cache/sys-fs/udev-236-r1
index 26fe0bf5345c..2c79d3be1ae0 100644
--- a/metadata/md5-cache/sys-fs/udev-236-r1
+++ b/metadata/md5-cache/sys-fs/udev-236-r1
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v236.tar.gz -> systemd-236.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	meson	29ef682942c6ff558de2f797a61790c2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	29ef682942c6ff558de2f797a61790c2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=f17be813122ebd8c7c08193ae0dcfdc5
diff --git a/metadata/md5-cache/sys-fs/udev-238 b/metadata/md5-cache/sys-fs/udev-238
index d236f4c8a514..0f36a3b8b4ec 100644
--- a/metadata/md5-cache/sys-fs/udev-238
+++ b/metadata/md5-cache/sys-fs/udev-238
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v238.tar.gz -> systemd-238.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	meson	29ef682942c6ff558de2f797a61790c2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	29ef682942c6ff558de2f797a61790c2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=f09fed9291bf4fd82dd351d9423d2ed2
diff --git a/metadata/md5-cache/sys-fs/udev-239 b/metadata/md5-cache/sys-fs/udev-239
index b076fd29e92f..2680d2c0db6e 100644
--- a/metadata/md5-cache/sys-fs/udev-239
+++ b/metadata/md5-cache/sys-fs/udev-239
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v239.tar.gz -> systemd-239.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	915cae3d7d636732918d18827fb1c226	meson	29ef682942c6ff558de2f797a61790c2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	29ef682942c6ff558de2f797a61790c2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=d308dc15320837c9e3e767fea3e20a85
diff --git a/metadata/md5-cache/sys-fs/udev-9999 b/metadata/md5-cache/sys-fs/udev-9999
index 7d6a56cb0c95..378596da0a33 100644
--- a/metadata/md5-cache/sys-fs/udev-9999
+++ b/metadata/md5-cache/sys-fs/udev-9999
@@ -9,5 +9,5 @@ PDEPEND=>=sys-apps/hwids-20140304[udev] >=sys-fs/udev-init-scripts-26
 RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10
 RESTRICT=test
 SLOT=0
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	915cae3d7d636732918d18827fb1c226	meson	29ef682942c6ff558de2f797a61790c2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	29ef682942c6ff558de2f797a61790c2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=1c9f2ce87f3fe65b7301691f7b5121f9
diff --git a/metadata/md5-cache/sys-fs/udiskie-1.1.1 b/metadata/md5-cache/sys-fs/udiskie-1.1.1
index 9b3837de8907..97b87e464902 100644
--- a/metadata/md5-cache/sys-fs/udiskie-1.1.1
+++ b/metadata/md5-cache/sys-fs/udiskie-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/docopt[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/u/udiskie/udiskie-1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3ac313941a922b822bee7db75196ad69
diff --git a/metadata/md5-cache/sys-fs/udisks-1.0.5-r2 b/metadata/md5-cache/sys-fs/udisks-1.0.5-r2
index a70e0c2bb008..291c4ef003c7 100644
--- a/metadata/md5-cache/sys-fs/udisks-1.0.5-r2
+++ b/metadata/md5-cache/sys-fs/udisks-1.0.5-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.30 >=dev-libs/libatasmart-0.19 >=sys-auth/polkit-0.110 >=sys-apps/dbus-1.6 >=sys-apps/sg3_utils-1.27.20090411 >=sys-block/parted-3 >=sys-fs/lvm2-2.02.66 virtual/libgudev:= virtual/libudev:= virtual/udev selinux? ( sec-policy/selinux-devicekit ) >=sys-apps/util-linux-2.20.1-r2 virtual/eject remote-access? ( net-dns/avahi )
 SLOT=0
 SRC_URI=https://hal.freedesktop.org/releases/udisks-1.0.5.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1eff6a8af3e8ca9366835aa28f61ae5b
diff --git a/metadata/md5-cache/sys-fs/udisks-2.1.8 b/metadata/md5-cache/sys-fs/udisks-2.1.8
index e7184cb9e03d..905182875439 100644
--- a/metadata/md5-cache/sys-fs/udisks-2.1.8
+++ b/metadata/md5-cache/sys-fs/udisks-2.1.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/libatasmart-0.19 >=sys-auth/polkit-0.110 >=virtual/libgudev-165:= virtual/udev acl? ( virtual/acl ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) systemd? ( >=sys-apps/systemd-209 ) >=sys-apps/util-linux-2.20.1-r2 >=sys-block/parted-3 virtual/eject cryptsetup? ( sys-fs/cryptsetup[udev(+)] sys-fs/lvm2[udev(+)] ) gptfdisk? ( >=sys-apps/gptfdisk-0.8 ) selinux? ( sec-policy/selinux-devicekit )
 SLOT=2
 SRC_URI=https://udisks.freedesktop.org/releases/udisks-2.1.8.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9801a814eedac69d8dffe0f67750cea6
diff --git a/metadata/md5-cache/sys-fs/udisks-2.7.4-r1 b/metadata/md5-cache/sys-fs/udisks-2.7.4-r1
index 0f59025de221..201ef7020050 100644
--- a/metadata/md5-cache/sys-fs/udisks-2.7.4-r1
+++ b/metadata/md5-cache/sys-fs/udisks-2.7.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/libatasmart-0.19 >=sys-auth/polkit-0.1
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=2
 SRC_URI=https://github.com/storaged-project/udisks/archive/udisks-2.7.4.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=44ce09959f1c87c9cb49290739d8521c
diff --git a/metadata/md5-cache/sys-fs/udisks-2.7.7 b/metadata/md5-cache/sys-fs/udisks-2.7.7
index 651960a613eb..8f3887e6369a 100644
--- a/metadata/md5-cache/sys-fs/udisks-2.7.7
+++ b/metadata/md5-cache/sys-fs/udisks-2.7.7
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/libatasmart-0.19 >=sys-auth/polkit-0.1
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=2
 SRC_URI=https://github.com/storaged-project/udisks/releases/download/udisks-2.7.7/udisks-2.7.7.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fe24e66f431dd649ac6f9b12f34cc098
diff --git a/metadata/md5-cache/sys-fs/udisks-2.8.0 b/metadata/md5-cache/sys-fs/udisks-2.8.0
index 492e7020fa54..62e634f85577 100644
--- a/metadata/md5-cache/sys-fs/udisks-2.8.0
+++ b/metadata/md5-cache/sys-fs/udisks-2.8.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/libatasmart-0.19 >=sys-auth/polkit-0.1
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=2
 SRC_URI=https://github.com/storaged-project/udisks/releases/download/udisks-2.8.0/udisks-2.8.0.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=83c835a6a87c00556f53753617d5c6db
diff --git a/metadata/md5-cache/sys-fs/udisks-2.8.1 b/metadata/md5-cache/sys-fs/udisks-2.8.1
index 189b2ae71be7..f7e2392c61e0 100644
--- a/metadata/md5-cache/sys-fs/udisks-2.8.1
+++ b/metadata/md5-cache/sys-fs/udisks-2.8.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/libatasmart-0.19 >=sys-auth/polkit-0.1
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=2
 SRC_URI=https://github.com/storaged-project/udisks/releases/download/udisks-2.8.1/udisks-2.8.1.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1e27b33a4b625f015dcd155f2ee68fb9
diff --git a/metadata/md5-cache/sys-fs/vhba-20170610 b/metadata/md5-cache/sys-fs/vhba-20170610
index f14cc46aa69d..c8b895a0be9c 100644
--- a/metadata/md5-cache/sys-fs/vhba-20170610
+++ b/metadata/md5-cache/sys-fs/vhba-20170610
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=virtual/udev kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=mirror://sourceforge/cdemu/vhba-module-20170610.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1c832cd772b32c68202e71356e35f554
diff --git a/metadata/md5-cache/sys-fs/zfs-0.6.5.11-r2 b/metadata/md5-cache/sys-fs/zfs-0.6.5.11-r2
index f135fdbc9eff..e78b7a7730fe 100644
--- a/metadata/md5-cache/sys-fs/zfs-0.6.5.11-r2
+++ b/metadata/md5-cache/sys-fs/zfs-0.6.5.11-r2
@@ -10,5 +10,5 @@ RDEPEND=net-libs/libtirpc sys-apps/util-linux[static-libs?] sys-libs/zlib[static
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.6.5.11/zfs-0.6.5.11.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=31e592fa5315ff950006264b2e45b9b1
diff --git a/metadata/md5-cache/sys-fs/zfs-0.7.11 b/metadata/md5-cache/sys-fs/zfs-0.7.11
index 10c5fde27849..1ff60ef5c7ec 100644
--- a/metadata/md5-cache/sys-fs/zfs-0.7.11
+++ b/metadata/md5-cache/sys-fs/zfs-0.7.11
@@ -10,5 +10,5 @@ RDEPEND=net-libs/libtirpc sys-apps/util-linux[static-libs?] sys-libs/zlib[static
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.11/zfs-0.7.11.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=56dd74b77dee8d638651acc6da457cc8
diff --git a/metadata/md5-cache/sys-fs/zfs-0.7.8 b/metadata/md5-cache/sys-fs/zfs-0.7.8
index c066c50f6e86..1a0a5efa292f 100644
--- a/metadata/md5-cache/sys-fs/zfs-0.7.8
+++ b/metadata/md5-cache/sys-fs/zfs-0.7.8
@@ -10,5 +10,5 @@ RDEPEND=net-libs/libtirpc sys-apps/util-linux[static-libs?] sys-libs/zlib[static
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.8/zfs-0.7.8.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bd423644e8b4c253609d720c81abd7d2
diff --git a/metadata/md5-cache/sys-fs/zfs-0.7.9 b/metadata/md5-cache/sys-fs/zfs-0.7.9
index 3c9159a9d3a9..9fb8d73c4c67 100644
--- a/metadata/md5-cache/sys-fs/zfs-0.7.9
+++ b/metadata/md5-cache/sys-fs/zfs-0.7.9
@@ -10,5 +10,5 @@ RDEPEND=net-libs/libtirpc sys-apps/util-linux[static-libs?] sys-libs/zlib[static
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.9/zfs-0.7.9.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=69d636bbd6a7d8dcdaf9e1b697b4e30c
diff --git a/metadata/md5-cache/sys-fs/zfs-0.7.9-r1 b/metadata/md5-cache/sys-fs/zfs-0.7.9-r1
index c5d50f541f26..5235045713ea 100644
--- a/metadata/md5-cache/sys-fs/zfs-0.7.9-r1
+++ b/metadata/md5-cache/sys-fs/zfs-0.7.9-r1
@@ -10,5 +10,5 @@ RDEPEND=net-libs/libtirpc sys-apps/util-linux[static-libs?] sys-libs/zlib[static
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.9/zfs-0.7.9.tar.gz https://dev.gentoo.org/~ryao/dist/zfs-0.7.9-r1-patches.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dd2e4eacdc776b3c60b6fd84a89008af
diff --git a/metadata/md5-cache/sys-fs/zfs-0.7.9999 b/metadata/md5-cache/sys-fs/zfs-0.7.9999
index d3104e0ffad2..d580f36e588a 100644
--- a/metadata/md5-cache/sys-fs/zfs-0.7.9999
+++ b/metadata/md5-cache/sys-fs/zfs-0.7.9999
@@ -8,5 +8,5 @@ LICENSE=BSD-2 CDDL MIT
 RDEPEND=net-libs/libtirpc sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk !=sys-apps/grep-2.13* !kernel-builtin? ( =sys-fs/zfs-kmod-0.7.9999* ) !sys-fs/zfs-fuse !prefix? ( virtual/udev ) test-suite? ( sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps virtual/modutils ) rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-boot/grub-2.00-r2:2 ) kernel_linux? ( virtual/modutils )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=64f036c041c4fc87dc4a171c255d9d26
diff --git a/metadata/md5-cache/sys-fs/zfs-9999 b/metadata/md5-cache/sys-fs/zfs-9999
index ca76e903fa46..801ff94ae4e8 100644
--- a/metadata/md5-cache/sys-fs/zfs-9999
+++ b/metadata/md5-cache/sys-fs/zfs-9999
@@ -8,5 +8,5 @@ LICENSE=BSD-2 CDDL MIT
 RDEPEND=net-libs/libtirpc sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk !=sys-apps/grep-2.13* !kernel-builtin? ( =sys-fs/zfs-kmod-9999* ) !sys-fs/zfs-fuse !prefix? ( virtual/udev ) test-suite? ( sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps virtual/modutils ) rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-boot/grub-2.00-r2:2 ) kernel_linux? ( virtual/modutils )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a768d68aec940cfa4a6172413557336a
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-0.6.5.11 b/metadata/md5-cache/sys-fs/zfs-kmod-0.6.5.11
index 461873528fb6..a5dfc4d0ad63 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-0.6.5.11
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-0.6.5.11
@@ -10,5 +10,5 @@ RDEPEND==sys-kernel/spl-0.6.5.11* dev-lang/perl virtual/awk !sys-fs/zfs-fuse ker
 RESTRICT=debug? ( strip ) test
 SLOT=0
 SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.6.5.11/zfs-0.6.5.11.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=330e6bf268c16c9357bac4bbe39fe634
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-0.7.11 b/metadata/md5-cache/sys-fs/zfs-kmod-0.7.11
index c7ce4cf84089..8da3e8056783 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-0.7.11
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-0.7.11
@@ -10,5 +10,5 @@ RDEPEND==sys-kernel/spl-0.7.11* dev-lang/perl virtual/awk !sys-fs/zfs-fuse kerne
 RESTRICT=debug? ( strip ) test
 SLOT=0
 SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.11/zfs-0.7.11.tar.gz
-_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	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=80ff02b9bbb7dabcedc07ddb5bb982b5
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-0.7.8 b/metadata/md5-cache/sys-fs/zfs-kmod-0.7.8
index c6ca294230b5..b955ff438694 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-0.7.8
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-0.7.8
@@ -10,5 +10,5 @@ RDEPEND==sys-kernel/spl-0.7.8* dev-lang/perl virtual/awk !sys-fs/zfs-fuse kernel
 RESTRICT=debug? ( strip ) test
 SLOT=0
 SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.8/zfs-0.7.8.tar.gz
-_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	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d60764ad9b9742387120e9ef7eda135c
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-0.7.9 b/metadata/md5-cache/sys-fs/zfs-kmod-0.7.9
index 232837995927..a4a22ace5253 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-0.7.9
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-0.7.9
@@ -10,5 +10,5 @@ RDEPEND==sys-kernel/spl-0.7.9* dev-lang/perl virtual/awk !sys-fs/zfs-fuse kernel
 RESTRICT=debug? ( strip ) test
 SLOT=0
 SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.9/zfs-0.7.9.tar.gz
-_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	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c977b26affdd118fc74904ff3c941c55
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-0.7.9-r1 b/metadata/md5-cache/sys-fs/zfs-kmod-0.7.9-r1
index a38500ba0893..c8394d38958f 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-0.7.9-r1
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-0.7.9-r1
@@ -10,5 +10,5 @@ RDEPEND==sys-kernel/spl-0.7.9-r1 dev-lang/perl virtual/awk !sys-fs/zfs-fuse kern
 RESTRICT=debug? ( strip ) test
 SLOT=0
 SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.9/zfs-0.7.9.tar.gz https://dev.gentoo.org/~ryao/dist/zfs-0.7.9-r1-patches.tar.xz
-_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	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ce3981677fd6d7e8f19639ddf0951814
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-0.7.9999 b/metadata/md5-cache/sys-fs/zfs-kmod-0.7.9999
index 12a6e07011a6..67d6a8d630ec 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-0.7.9999
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-0.7.9999
@@ -8,5 +8,5 @@ LICENSE=CDDL debug? ( GPL-2+ )
 RDEPEND==sys-kernel/spl-0.7.9999* dev-lang/perl virtual/awk !sys-fs/zfs-fuse kernel_linux? ( virtual/modutils )
 RESTRICT=debug? ( strip ) test
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b55c4d89ae0e76bf30df27ea5f826b06
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-9999 b/metadata/md5-cache/sys-fs/zfs-kmod-9999
index cb71169a83e4..b11647187e71 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-9999
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-9999
@@ -8,5 +8,5 @@ LICENSE=CDDL GPL-2+
 RDEPEND=dev-lang/perl virtual/awk !sys-fs/zfs-fuse !sys-kernel/spl kernel_linux? ( virtual/modutils )
 RESTRICT=debug? ( strip ) test
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1187d7c43049100b5eb4bc855b730288
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 923e7e39678b..b7aaf07ab74f 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.14.73 b/metadata/md5-cache/sys-kernel/ck-sources-4.14.73
new file mode 100644
index 000000000000..55b7b1e72114
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.14.73
@@ -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.73
+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-79.base.tar.xz mirror://gentoo/genpatches-4.14-79.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-79.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_=085ff130ba0a97322b5fa5a7fc9b9eb0
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.17.11 b/metadata/md5-cache/sys-kernel/ck-sources-4.17.11
deleted file mode 100644
index 2965461a6e31..000000000000
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.17.11
+++ /dev/null
@@ -1,14 +0,0 @@
-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=Con Kolivas' high performance patchset and Gentoo's genpatches for Linux 4.17
-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.17.11
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.17.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.17-gnu/deblob-4.17 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.17-gnu/deblob-check -> deblob-check-4.17 ) mirror://gentoo/genpatches-4.17-12.base.tar.xz mirror://gentoo/genpatches-4.17-12.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.17-12.experimental.tar.xz ) http://ck.kolivas.org/patches/4.0/4.17/4.17-ck1/patch-4.17-ck1.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=553ebc779b59b8d3ded2653ecb83d1f4
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.18.11 b/metadata/md5-cache/sys-kernel/ck-sources-4.18.11
new file mode 100644
index 000000000000..d7d7df7e70cc
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.18.11
@@ -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.11
+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-14.base.tar.xz mirror://gentoo/genpatches-4.18-14.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.18-14.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_=19e59bbb661dacc6a839e7100cafa92d
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.130 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.130
new file mode 100644
index 000000000000..9c01649bcb83
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.9.130
@@ -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.130
+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-134.base.tar.xz mirror://gentoo/genpatches-4.9-134.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-134.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_=035fedf0fc1d114fd67ed46b5de4aec7
diff --git a/metadata/md5-cache/sys-kernel/cryptodev-1.9 b/metadata/md5-cache/sys-kernel/cryptodev-1.9
index 5d3d161e5eb4..56a72b067098 100644
--- a/metadata/md5-cache/sys-kernel/cryptodev-1.9
+++ b/metadata/md5-cache/sys-kernel/cryptodev-1.9
@@ -10,5 +10,5 @@ RDEPEND=kernel_linux? ( virtual/modutils )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://nwl.cc/pub/cryptodev-linux/cryptodev-linux-1.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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_=eb9556add7514771d0397677abf94bcf
diff --git a/metadata/md5-cache/sys-kernel/cryptodev-9999 b/metadata/md5-cache/sys-kernel/cryptodev-9999
index 7d9c78b5ddfd..e84997636296 100644
--- a/metadata/md5-cache/sys-kernel/cryptodev-9999
+++ b/metadata/md5-cache/sys-kernel/cryptodev-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=kernel_linux? ( virtual/modutils )
 RESTRICT=test
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a1e9260f65c16be366c4440c0c4ed851
diff --git a/metadata/md5-cache/sys-kernel/dracut-044-r1 b/metadata/md5-cache/sys-kernel/dracut-044-r1
index 7b3dece42515..4c61c436da93 100644
--- a/metadata/md5-cache/sys-kernel/dracut-044-r1
+++ b/metadata/md5-cache/sys-kernel/dracut-044-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/udev systemd? ( >=sys-apps/systemd-199 ) app-arch/cpio >=app-she
 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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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
diff --git a/metadata/md5-cache/sys-kernel/dracut-044-r3 b/metadata/md5-cache/sys-kernel/dracut-044-r3
index 2554b8fdacc7..900a48965a00 100644
--- a/metadata/md5-cache/sys-kernel/dracut-044-r3
+++ b/metadata/md5-cache/sys-kernel/dracut-044-r3
@@ -10,5 +10,5 @@ RDEPEND=virtual/udev systemd? ( >=sys-apps/systemd-199 virtual/pkgconfig ) app-a
 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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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
diff --git a/metadata/md5-cache/sys-kernel/dracut-045-r2 b/metadata/md5-cache/sys-kernel/dracut-045-r2
index 061b9f3d8546..be9ab662d569 100644
--- a/metadata/md5-cache/sys-kernel/dracut-045-r2
+++ b/metadata/md5-cache/sys-kernel/dracut-045-r2
@@ -10,5 +10,5 @@ RDEPEND=virtual/udev virtual/pkgconfig >=sys-apps/kmod-15[tools] app-arch/cpio >
 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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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
diff --git a/metadata/md5-cache/sys-kernel/dracut-046-r1 b/metadata/md5-cache/sys-kernel/dracut-046-r1
index 9bf30611b3c8..27073b1218ee 100644
--- a/metadata/md5-cache/sys-kernel/dracut-046-r1
+++ b/metadata/md5-cache/sys-kernel/dracut-046-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/udev virtual/pkgconfig >=sys-apps/kmod-15[tools] app-arch/cpio >
 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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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
diff --git a/metadata/md5-cache/sys-kernel/dracut-047-r1 b/metadata/md5-cache/sys-kernel/dracut-047-r1
index 6bfc781b0032..a3986db06bba 100644
--- a/metadata/md5-cache/sys-kernel/dracut-047-r1
+++ b/metadata/md5-cache/sys-kernel/dracut-047-r1
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/kmod-23[tools] virtual/pkgconfig virtual/udev app-arch/cpio >
 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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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
diff --git a/metadata/md5-cache/sys-kernel/dracut-048 b/metadata/md5-cache/sys-kernel/dracut-048
index 017d8be61103..d58686b7c7e4 100644
--- a/metadata/md5-cache/sys-kernel/dracut-048
+++ b/metadata/md5-cache/sys-kernel/dracut-048
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/kmod-23[tools] virtual/pkgconfig virtual/udev app-arch/cpio >
 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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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
diff --git a/metadata/md5-cache/sys-kernel/dracut-9999 b/metadata/md5-cache/sys-kernel/dracut-9999
index 9eecf15bce46..5d6d2b4a9150 100644
--- a/metadata/md5-cache/sys-kernel/dracut-9999
+++ b/metadata/md5-cache/sys-kernel/dracut-9999
@@ -8,5 +8,5 @@ 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
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.74 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.74
new file mode 100644
index 000000000000..ce388ec12ba7
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.74
@@ -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.74
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz 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_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=6e7cc7835264b396f87c1a1d60a65886
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.18.12 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.18.12
new file mode 100644
index 000000000000..85b384e0dceb
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.18.12
@@ -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.12
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz 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_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=01d22d9319c6e5c79889fcf6ef400c51
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.131 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.131
new file mode 100644
index 000000000000..3c606111a89c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.131
@@ -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.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/git-sources-4.19_rc6 b/metadata/md5-cache/sys-kernel/git-sources-4.19_rc6
new file mode 100644
index 000000000000..b40e528b0c39
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-4.19_rc6
@@ -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_rc6
+SRC_URI=https://git.kernel.org/torvalds/p/v4.19-rc6/v4.18 -> patch-4.19-rc6.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_=5116cd3c37585eb8cbcf1b1eed8a062f
diff --git a/metadata/md5-cache/sys-kernel/kergen-0.1.3 b/metadata/md5-cache/sys-kernel/kergen-0.1.3
index fba5745e99e2..73de6e96a749 100644
--- a/metadata/md5-cache/sys-kernel/kergen-0.1.3
+++ b/metadata/md5-cache/sys-kernel/kergen-0.1.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_4 )
 SLOT=0
 SRC_URI=http://whatishacking.org/kergen/downloads/kergen-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a49de7d3d598a7d6bdbee112d020a85d
diff --git a/metadata/md5-cache/sys-kernel/kergen-0.1.4 b/metadata/md5-cache/sys-kernel/kergen-0.1.4
index f0b0916898a8..98609f506dcd 100644
--- a/metadata/md5-cache/sys-kernel/kergen-0.1.4
+++ b/metadata/md5-cache/sys-kernel/kergen-0.1.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://whatishacking.org/kergen/downloads/kergen-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e20334b77484c13664244b3f59d26f16
diff --git a/metadata/md5-cache/sys-kernel/kpatch-0.4.0-r1 b/metadata/md5-cache/sys-kernel/kpatch-0.4.0-r1
index acffe897ffd8..655d3fe7dc6b 100644
--- a/metadata/md5-cache/sys-kernel/kpatch-0.4.0-r1
+++ b/metadata/md5-cache/sys-kernel/kpatch-0.4.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=app-crypt/pesign dev-libs/openssl:0= sys-libs/zlib sys-apps/pciutils kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://github.com/dynup/kpatch/archive/v0.4.0.tar.gz -> kpatch-0.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=180426fef024eccfe2b62c851cc35a80
diff --git a/metadata/md5-cache/sys-kernel/kpatch-0.6.0 b/metadata/md5-cache/sys-kernel/kpatch-0.6.0
index 9c52896f34dd..9ab2db5e37df 100644
--- a/metadata/md5-cache/sys-kernel/kpatch-0.6.0
+++ b/metadata/md5-cache/sys-kernel/kpatch-0.6.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=app-crypt/pesign dev-libs/openssl:0= sys-libs/zlib sys-apps/pciutils kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://github.com/dynup/kpatch/archive/v0.6.0.tar.gz -> kpatch-0.6.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8b37b9232ba8ed070be0669e863d12d7
diff --git a/metadata/md5-cache/sys-kernel/kpatch-9999 b/metadata/md5-cache/sys-kernel/kpatch-9999
index 820a5db2a2b1..0d3a45d0cdee 100644
--- a/metadata/md5-cache/sys-kernel/kpatch-9999
+++ b/metadata/md5-cache/sys-kernel/kpatch-9999
@@ -7,5 +7,5 @@ IUSE=examples +modules test kernel_linux kernel_linux kernel_linux
 LICENSE=GPL-2+
 RDEPEND=app-crypt/pesign dev-libs/openssl:0= sys-libs/zlib sys-apps/pciutils kernel_linux? ( virtual/modutils )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6d9d2aa13b9d8501ef2cf8d4eb221e3c
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20180913 b/metadata/md5-cache/sys-kernel/linux-firmware-20180913
deleted file mode 100644
index 65da52c0adec..000000000000
--- a/metadata/md5-cache/sys-kernel/linux-firmware-20180913
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst preinst prepare unpack
-DESCRIPTION=Linux firmware files
-EAPI=6
-HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
-IUSE=savedconfig savedconfig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=linux-firmware ( BSD ISC MIT no-source-code ) GPL-2 GPL-2+ freedist
-RDEPEND=!savedconfig? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] !media-tv/cx18-firmware !<sys-firmware/ivtv-firmware-20080701-r1 !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !net-wireless/ar9271-firmware !net-wireless/i2400m-fw !net-wireless/libertas-firmware !sys-firmware/rt61-firmware !net-wireless/rt73-firmware !net-wireless/rt2860-firmware !net-wireless/rt2870-firmware !sys-block/qla-fc-firmware !sys-firmware/amd-ucode !sys-firmware/iwl1000-ucode !sys-firmware/iwl2000-ucode !sys-firmware/iwl2030-ucode !sys-firmware/iwl3945-ucode !sys-firmware/iwl4965-ucode !sys-firmware/iwl5000-ucode !sys-firmware/iwl5150-ucode !sys-firmware/iwl6000-ucode !sys-firmware/iwl6005-ucode !sys-firmware/iwl6030-ucode !sys-firmware/iwl6050-ucode !sys-firmware/iwl3160-ucode !sys-firmware/iwl7260-ucode !sys-firmware/iwl7265-ucode !sys-firmware/iwl3160-7260-bt-ucode !sys-firmware/radeon-ucode )
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-44d4fca9922a252a0bd81f6307bcc072a78da54a.tar.gz -> linux-firmware-20180913.tar.gz
-_eclasses_=portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e
-_md5_=d72dbddfc4bec7d398d30a35a59c3ec5
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20181001 b/metadata/md5-cache/sys-kernel/linux-firmware-20181001
new file mode 100644
index 000000000000..2707e5a400c4
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-20181001
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst preinst prepare unpack
+DESCRIPTION=Linux firmware files
+EAPI=6
+HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
+IUSE=savedconfig savedconfig
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 mips ppc ppc64 s390 sh sparc x86
+LICENSE=linux-firmware ( BSD ISC MIT no-source-code ) GPL-2 GPL-2+ freedist
+RDEPEND=!savedconfig? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] !media-tv/cx18-firmware !<sys-firmware/ivtv-firmware-20080701-r1 !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !net-wireless/ar9271-firmware !net-wireless/i2400m-fw !net-wireless/libertas-firmware !sys-firmware/rt61-firmware !net-wireless/rt73-firmware !net-wireless/rt2860-firmware !net-wireless/rt2870-firmware !sys-block/qla-fc-firmware !sys-firmware/amd-ucode !sys-firmware/iwl1000-ucode !sys-firmware/iwl2000-ucode !sys-firmware/iwl2030-ucode !sys-firmware/iwl3945-ucode !sys-firmware/iwl4965-ucode !sys-firmware/iwl5000-ucode !sys-firmware/iwl5150-ucode !sys-firmware/iwl6000-ucode !sys-firmware/iwl6005-ucode !sys-firmware/iwl6030-ucode !sys-firmware/iwl6050-ucode !sys-firmware/iwl3160-ucode !sys-firmware/iwl7260-ucode !sys-firmware/iwl7265-ucode !sys-firmware/iwl3160-7260-bt-ucode !sys-firmware/radeon-ucode )
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-7c81f23ad903f72e87e2102d8f52408305c0f7a2.tar.gz -> linux-firmware-20181001.tar.gz
+_eclasses_=portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e
+_md5_=453301f20f63c0bd439af85fc451281d
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.14 b/metadata/md5-cache/sys-kernel/linux-headers-4.14
deleted file mode 100644
index 8ea5db9178d7..000000000000
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.14
+++ /dev/null
@@ -1,14 +0,0 @@
-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
-RDEPEND=!!media-sound/alsa-headers
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=mirror://gentoo/gentoo-headers-base-4.14.tar.xz mirror://gentoo/gentoo-headers-4.14-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_=8299df41893040ede059f4bc5283020b
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1 b/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1
new file mode 100644
index 000000000000..55996f29614f
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1
@@ -0,0 +1,14 @@
+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
+RDEPEND=!!media-sound/alsa-headers
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=mirror://gentoo/gentoo-headers-base-4.14.tar.xz mirror://gentoo/gentoo-headers-4.14-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_=ae35dd357a7901797ee52b8e03a5d658
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.15 b/metadata/md5-cache/sys-kernel/linux-headers-4.15
deleted file mode 100644
index 54547bdded76..000000000000
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.15
+++ /dev/null
@@ -1,14 +0,0 @@
-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
-RDEPEND=!!media-sound/alsa-headers
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=mirror://gentoo/gentoo-headers-base-4.15.tar.xz mirror://gentoo/gentoo-headers-4.15-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_=f2de0d8d309e9dd46bc12bc436310c38
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.15-r1 b/metadata/md5-cache/sys-kernel/linux-headers-4.15-r1
new file mode 100644
index 000000000000..74dd7c383db5
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.15-r1
@@ -0,0 +1,14 @@
+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
+RDEPEND=!!media-sound/alsa-headers
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=mirror://gentoo/gentoo-headers-base-4.15.tar.xz mirror://gentoo/gentoo-headers-4.15-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_=de73a8185ad57767345e19a83f25589b
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.16-r1 b/metadata/md5-cache/sys-kernel/linux-headers-4.16-r1
deleted file mode 100644
index 53822c4e1eaf..000000000000
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.16-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-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
-RDEPEND=!!media-sound/alsa-headers
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=mirror://gentoo/gentoo-headers-base-4.16-r1.tar.xz mirror://gentoo/gentoo-headers-4.16-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-4.16-r1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-4.16-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_=f2b40dfcfbc14c8865f944d7dff77159
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.16-r2 b/metadata/md5-cache/sys-kernel/linux-headers-4.16-r2
new file mode 100644
index 000000000000..f9e40500b1d8
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.16-r2
@@ -0,0 +1,14 @@
+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
+RDEPEND=!!media-sound/alsa-headers
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=mirror://gentoo/gentoo-headers-base-4.16-r1.tar.xz mirror://gentoo/gentoo-headers-4.16-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-4.16-r1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-4.16-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_=c3291fa0f169cfeed7015e3faa79157a
diff --git a/metadata/md5-cache/sys-kernel/spl-0.6.5.11 b/metadata/md5-cache/sys-kernel/spl-0.6.5.11
index 71ca0eefd9ec..0b98f79582be 100644
--- a/metadata/md5-cache/sys-kernel/spl-0.6.5.11
+++ b/metadata/md5-cache/sys-kernel/spl-0.6.5.11
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl virtual/awk !sys-devel/spl kernel_linux? ( virtual/modutil
 RESTRICT=debug? ( strip ) test
 SLOT=0
 SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.6.5.11/spl-0.6.5.11.tar.gz
-_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	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=686b6fd59d2395a1b58d10194b357f67
diff --git a/metadata/md5-cache/sys-kernel/spl-0.7.11 b/metadata/md5-cache/sys-kernel/spl-0.7.11
index 7ef67efd0129..09d33f635f7f 100644
--- a/metadata/md5-cache/sys-kernel/spl-0.7.11
+++ b/metadata/md5-cache/sys-kernel/spl-0.7.11
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl virtual/awk !sys-devel/spl kernel_linux? ( virtual/modutil
 RESTRICT=debug? ( strip ) test
 SLOT=0
 SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.11/spl-0.7.11.tar.gz
-_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	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8489d30cd6462f5231edf99acf6d4637
diff --git a/metadata/md5-cache/sys-kernel/spl-0.7.8 b/metadata/md5-cache/sys-kernel/spl-0.7.8
index e65db2c9469f..fcda12a7621c 100644
--- a/metadata/md5-cache/sys-kernel/spl-0.7.8
+++ b/metadata/md5-cache/sys-kernel/spl-0.7.8
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl virtual/awk !sys-devel/spl kernel_linux? ( virtual/modutil
 RESTRICT=debug? ( strip ) test
 SLOT=0
 SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.8/spl-0.7.8.tar.gz
-_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	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6e304bf6d6fc5dc2158788e01a39b1fe
diff --git a/metadata/md5-cache/sys-kernel/spl-0.7.9 b/metadata/md5-cache/sys-kernel/spl-0.7.9
index 10859adc8e9c..01986fbe71c5 100644
--- a/metadata/md5-cache/sys-kernel/spl-0.7.9
+++ b/metadata/md5-cache/sys-kernel/spl-0.7.9
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl virtual/awk !sys-devel/spl kernel_linux? ( virtual/modutil
 RESTRICT=debug? ( strip ) test
 SLOT=0
 SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.9/spl-0.7.9.tar.gz
-_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	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e2a6d13ec039b725f8e56fd315287c2a
diff --git a/metadata/md5-cache/sys-kernel/spl-0.7.9-r1 b/metadata/md5-cache/sys-kernel/spl-0.7.9-r1
index 52de4bfa4f14..a42b50d87ae3 100644
--- a/metadata/md5-cache/sys-kernel/spl-0.7.9-r1
+++ b/metadata/md5-cache/sys-kernel/spl-0.7.9-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl virtual/awk !sys-devel/spl kernel_linux? ( virtual/modutil
 RESTRICT=debug? ( strip ) test
 SLOT=0
 SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.9/spl-0.7.9.tar.gz https://dev.gentoo.org/~ryao/dist/spl-0.7.9-r1-patches.tar.xz
-_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	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6ecedd68490ab071a3f5f3a85b157bba
diff --git a/metadata/md5-cache/sys-kernel/spl-0.7.9999 b/metadata/md5-cache/sys-kernel/spl-0.7.9999
index 72440f068312..1b782b697cba 100644
--- a/metadata/md5-cache/sys-kernel/spl-0.7.9999
+++ b/metadata/md5-cache/sys-kernel/spl-0.7.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/awk !sys-devel/spl kernel_linux? ( virtual/modutils )
 RESTRICT=debug? ( strip ) test
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a73ca105baf573bddd36e9c6a80243d0
diff --git a/metadata/md5-cache/sys-kernel/spl-9999 b/metadata/md5-cache/sys-kernel/spl-9999
index 118689bfcc5d..059788d8ebb4 100644
--- a/metadata/md5-cache/sys-kernel/spl-9999
+++ b/metadata/md5-cache/sys-kernel/spl-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/awk !sys-devel/spl kernel_linux? ( virtual/modutils )
 RESTRICT=debug? ( strip ) test
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=93df91929a0f8135c931b3a9609b75de
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.58 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.58
deleted file mode 100644
index fb9c83b5d998..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.58
+++ /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=3.16.58
-SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.16.58.xz mirror://kernel/linux/kernel/v3.x/linux-3.16.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-3.16.59 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.59
new file mode 100644
index 000000000000..388cae744f66
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.59
@@ -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=3.16.59
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.16.59.xz mirror://kernel/linux/kernel/v3.x/linux-3.16.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.73 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.73
deleted file mode 100644
index aa9c342ba551..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.73
+++ /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.73
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.73.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.74 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.74
new file mode 100644
index 000000000000..c92e1eed5567
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.74
@@ -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.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.18.11 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.18.11
deleted file mode 100644
index 70e4e83d4985..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.18.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( 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/patch-4.18.11.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.12 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.18.12
new file mode 100644
index 000000000000..5ac4fca7e411
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.18.12
@@ -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.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.9.130 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.130
deleted file mode 100644
index edd69dfeb283..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-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 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.130
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.130.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.131 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.131
new file mode 100644
index 000000000000..2290a8dc3612
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.131
@@ -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.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-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 1f6bd423c0cc..da443ddc10c8 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 6f765c770c23..3a7099afbf1b 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_=057318153c76809d61613ccc87d5533d
+_md5_=8bdee8071ff0f706ef58b12eea7e78ad
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-4.0.1 b/metadata/md5-cache/sys-libs/compiler-rt-4.0.1
index 2bf30a73df5a..9bd4443ced95 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-4.0.1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-4.0.1
@@ -9,5 +9,5 @@ LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=!=sys-libs/compiler-rt-4.0.1*:0
 SLOT=4.0.1
 SRC_URI=https://releases.llvm.org/4.0.1/compiler-rt-4.0.1.src.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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_=c2d1e47e6067d424fd0bfb719aea4f49
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-5.0.2 b/metadata/md5-cache/sys-libs/compiler-rt-5.0.2
index 7fb51bb0ac0c..6cd50b8e34f3 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-5.0.2
+++ b/metadata/md5-cache/sys-libs/compiler-rt-5.0.2
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=|| ( UoI-NCSA MIT )
 SLOT=5.0.2
 SRC_URI=https://releases.llvm.org/5.0.2/compiler-rt-5.0.2.src.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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_=cf306ab79e82e1e310441e78889afacf
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-6.0.1 b/metadata/md5-cache/sys-libs/compiler-rt-6.0.1
index 9aad09220737..9f3b8578c5e1 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-6.0.1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-6.0.1
@@ -9,5 +9,5 @@ LICENSE=|| ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=6.0.1
 SRC_URI=https://releases.llvm.org/6.0.1/compiler-rt-6.0.1.src.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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_=8905da13653837ff391b280337b22cc5
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-7.0.0 b/metadata/md5-cache/sys-libs/compiler-rt-7.0.0
index afd7f9c851b0..e432f1c3e319 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-7.0.0
+++ b/metadata/md5-cache/sys-libs/compiler-rt-7.0.0
@@ -9,5 +9,5 @@ LICENSE=|| ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=7.0.0
 SRC_URI=https://releases.llvm.org/7.0.0/compiler-rt-7.0.0.src.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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_=15e453ad2cdf396e591aa2b7d8c73b4c
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-7.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-7.0.9999
index 5ade727f5d57..39b730548822 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-7.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-7.0.9999
@@ -7,5 +7,5 @@ IUSE=+clang test
 LICENSE=|| ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=7.0.0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	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_=f596ba31a42fcad75d4123dadf3d8e65
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-9999 b/metadata/md5-cache/sys-libs/compiler-rt-9999
index 6274392f9ffe..34869fa0faa7 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-9999
@@ -7,5 +7,5 @@ IUSE=+clang test
 LICENSE=|| ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=8.0.0
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	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_=221e59c4b6dbbdf4ff13be55feac5796
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-4.0.1 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-4.0.1
index 035d4f2214c1..ee7c90216327 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-4.0.1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-4.0.1
@@ -9,5 +9,5 @@ LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=!=sys-libs/compiler-rt-sanitizers-4.0.1*:0
 SLOT=4.0.1
 SRC_URI=https://releases.llvm.org/4.0.1/compiler-rt-4.0.1.src.tar.xz https://dev.gentoo.org/~mgorny/dist/llvm/compiler-rt-sanitizers-4.0.1-patchset.tar.xz test? ( https://releases.llvm.org/4.0.1/llvm-4.0.1.src.tar.xz )
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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_=aa052979a4bfde7c6e1d79ae5f5bcb59
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-5.0.2 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-5.0.2
index 46f26c0e991e..361c44ac083d 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-5.0.2
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-5.0.2
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=|| ( UoI-NCSA MIT )
 SLOT=5.0.2
 SRC_URI=https://releases.llvm.org/5.0.2/compiler-rt-5.0.2.src.tar.xz test? ( https://releases.llvm.org/5.0.2/llvm-5.0.2.src.tar.xz )
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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_=021f40b88a2928351f359fb8d9526a5e
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-6.0.1 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-6.0.1
index 8099fd25c3e5..19e61633b1d9 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-6.0.1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-6.0.1
@@ -9,5 +9,5 @@ LICENSE=|| ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=6.0.1
 SRC_URI=https://releases.llvm.org/6.0.1/compiler-rt-6.0.1.src.tar.xz https://dev.gentoo.org/~mgorny/dist/llvm/compiler-rt-sanitizers-6.0.1-patchset.tar.xz test? ( https://releases.llvm.org/6.0.1/llvm-6.0.1.src.tar.xz )
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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_=ec79d60d0f179bb8ec3aab424cd827e9
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-7.0.0 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-7.0.0
index bfacbcd28023..a9f58edf59d6 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-7.0.0
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-7.0.0
@@ -9,5 +9,5 @@ LICENSE=|| ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=7.0.0
 SRC_URI=https://releases.llvm.org/7.0.0/compiler-rt-7.0.0.src.tar.xz test? ( https://releases.llvm.org/7.0.0/llvm-7.0.0.src.tar.xz )
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	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_=742a0ccf31b58eaa69be8d1eec5b3616
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-7.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-7.0.9999
index a5bd0c92c8ff..de8f9b69c158 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-7.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-7.0.9999
@@ -7,5 +7,5 @@ IUSE=+clang test elibc_glibc
 LICENSE=|| ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=7.0.0
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	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_=8d109606f66591e47bc46f05139c04a8
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-9999 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-9999
index 52aba2085e78..477ada65cfe8 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-9999
@@ -7,5 +7,5 @@ IUSE=+clang test elibc_glibc
 LICENSE=|| ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=8.0.0
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	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_=955c5db9f4f8cebcd035aca1236547df
diff --git a/metadata/md5-cache/sys-libs/cracklib-2.9.6-r1 b/metadata/md5-cache/sys-libs/cracklib-2.9.6-r1
index ba0246fc75be..b60d4f7e7e48 100644
--- a/metadata/md5-cache/sys-libs/cracklib-2.9.6-r1
+++ b/metadata/md5-cache/sys-libs/cracklib-2.9.6-r1
@@ -10,5 +10,5 @@ RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) p
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://github.com/cracklib/cracklib/releases/download/cracklib-2.9.6/cracklib-2.9.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0fa285a2246c53c9d1a0b163093986e6
diff --git a/metadata/md5-cache/sys-libs/kpmcore-3.3.0 b/metadata/md5-cache/sys-libs/kpmcore-3.3.0
index 6291c0ac09c0..462dd78d86c9 100644
--- a/metadata/md5-cache/sys-libs/kpmcore-3.3.0
+++ b/metadata/md5-cache/sys-libs/kpmcore-3.3.0
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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/libapparmor-2.11.1 b/metadata/md5-cache/sys-libs/libapparmor-2.11.1
index 5125302bb769..64072293b2d4 100644
--- a/metadata/md5-cache/sys-libs/libapparmor-2.11.1
+++ b/metadata/md5-cache/sys-libs/libapparmor-2.11.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/apparmor/2.11/2.11.1/+download/apparmor-2.11.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=057ce94365243d715316b63ac60ad280
diff --git a/metadata/md5-cache/sys-libs/libapparmor-2.12.0 b/metadata/md5-cache/sys-libs/libapparmor-2.12.0
index 2d14d008f437..429d94f4b900 100644
--- a/metadata/md5-cache/sys-libs/libapparmor-2.12.0
+++ b/metadata/md5-cache/sys-libs/libapparmor-2.12.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/apparmor/2.12/2.12.0/+download/apparmor-2.12.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c91bb3d3e84e19f493f51d849b38a369
diff --git a/metadata/md5-cache/sys-libs/libcxx-3.9.1 b/metadata/md5-cache/sys-libs/libcxx-3.9.1
index 64a80223f4c5..87e33148384e 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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=af0f64cf74d727cd01e5622cede04ce5
+_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
+_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 fe82194484b3..0668f72a234d 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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=598c6bfc0e2e8371f7cd3a22b3c55f2f
+_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
+_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 2dba2b63b029..3a8e0cfd0d1c 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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=efadaac16e614b25c76ec01d5dbd7e50
+_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
+_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 845d908c04d2..1af5ddafb6b0 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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=de875b8cf9443df26e7b9e64f32ada7b
+_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
+_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 62af3f68edb3..9c7ae82cef7d 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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=39b5fcc5bf684b3aa3e7b18d315b75bb
+_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
+_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 56de7a464849..f72bd5ab8d04 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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=8770e8b9bb0665006661cdd8bb60ed11
+_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
+_md5_=17794f6f34416009e1191a9a3f6629c7
diff --git a/metadata/md5-cache/sys-libs/libcxx-9999 b/metadata/md5-cache/sys-libs/libcxx-9999
index 2101456b116f..8ed36e6a3679 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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=4d2f54b6fc47572637c3590a6e0cd08c
+_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
+_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 14c01433b0a2..3a265dfdb09d 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _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 2f00cb47ad01..924ff598d6c2 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _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 16b02420a6ed..f42f8acc2a8d 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _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 91d402d1ce87..0b3e3936234d 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _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 d1f0d14e65c3..26cbb60495ba 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _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 d877b8f01de1..10d51f2225f6 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _md5_=134e0d197df3775bc431efbaddaf2767
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-9999 b/metadata/md5-cache/sys-libs/libcxxabi-9999
index ca95da4c52f9..b8fad67a16af 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _md5_=9d0562d98bd13cfc1f59c8e0aedda839
diff --git a/metadata/md5-cache/sys-libs/libkudzu-1.2.57.1 b/metadata/md5-cache/sys-libs/libkudzu-1.2.57.1
index 6ab4e422d975..dfda77afbecb 100644
--- a/metadata/md5-cache/sys-libs/libkudzu-1.2.57.1
+++ b/metadata/md5-cache/sys-libs/libkudzu-1.2.57.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/popt >=sys-apps/pciutils-2.2.4[zlib?] zlib? ( sys-libs/zlib ) sys-apps/hwdata-gentoo !sys-apps/kudzu
 SLOT=0
 SRC_URI=mirror://gentoo/kudzu-1.2.57.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0d377459fb534d84c1baace8483b82ae
diff --git a/metadata/md5-cache/sys-libs/libomp-4.0.1 b/metadata/md5-cache/sys-libs/libomp-4.0.1
index 5ba70f9b669e..64933b96b352 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	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _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 d2cd993ee8a8..aed7c9248a50 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	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _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 a2f6d963166d..346a09f1d6e0 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	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _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 2f36508d90b0..1052d13ae180 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	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _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 d2d51a82a44f..90fa5c51dd83 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	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _md5_=2f83b7071d6c3751b0de25790dfabe83
diff --git a/metadata/md5-cache/sys-libs/libomp-9999 b/metadata/md5-cache/sys-libs/libomp-9999
index 69231650442e..b9d9ca4e356f 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	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _md5_=f3b1f1de2d7885a2e570955f68ee33ca
diff --git a/metadata/md5-cache/sys-libs/libosinfo-1.1.0 b/metadata/md5-cache/sys-libs/libosinfo-1.1.0
index ae946e7e83cd..55427a7d87b4 100644
--- a/metadata/md5-cache/sys-libs/libosinfo-1.1.0
+++ b/metadata/md5-cache/sys-libs/libosinfo-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.36.0:2 >=net-libs/libsoup-2.42:2.4 >=dev-libs/libxml2-
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=https://releases.pagure.org/libosinfo/libosinfo-1.1.0.tar.gz
-_eclasses_=desktop	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	udev	7752f306eec7b286d00bdb47b763e7ac	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	udev	7752f306eec7b286d00bdb47b763e7ac	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4167758e903e9f325c68c864f34860e8
diff --git a/metadata/md5-cache/sys-libs/libosinfo-1.2.0 b/metadata/md5-cache/sys-libs/libosinfo-1.2.0
index 8ee706f1de34..8466c9619535 100644
--- a/metadata/md5-cache/sys-libs/libosinfo-1.2.0
+++ b/metadata/md5-cache/sys-libs/libosinfo-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.36.0:2 >=dev-libs/libxml2-2.6.0 >=dev-libs/libxslt-1.0
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=https://releases.pagure.org/libosinfo/libosinfo-1.2.0.tar.gz
-_eclasses_=desktop	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	udev	7752f306eec7b286d00bdb47b763e7ac	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	udev	7752f306eec7b286d00bdb47b763e7ac	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=238f57cf6a73202cc851be424f51de90
diff --git a/metadata/md5-cache/sys-libs/libstdc++-v3-3.3.6-r1 b/metadata/md5-cache/sys-libs/libstdc++-v3-3.3.6-r1
index 8005be1dd8e9..25caef6d5481 100644
--- a/metadata/md5-cache/sys-libs/libstdc++-v3-3.3.6-r1
+++ b/metadata/md5-cache/sys-libs/libstdc++-v3-3.3.6-r1
@@ -7,6 +7,6 @@ IUSE=multilib nls
 KEYWORDS=amd64 ~mips ppc -ppc64 sparc x86 ~x86-fbsd
 LICENSE=GPL-2 LGPL-2.1
 SLOT=5
-SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-3.3.6/gcc-3.3.6.tar.bz2 mirror://gentoo/gcc-3.3.6-patches-1.9.tar.bz2
+SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-3.3.6/gcc-3.3.6.tar.bz2 mirror://gentoo/gcc-3.3.6-patches-1.10.tar.bz2
 _eclasses_=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_=e48a8cc9e9309f5f9e63b2774e5a4d5d
+_md5_=0b85addcc470e2a0a48966db94d96ecf
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 833f11790a90..96567b35cf66 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _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 64991ef9b241..b1f0adf8c4a3 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _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 61b76e2d42ab..f1557c185da7 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _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 1604eb11b04c..c1e7a16fabf3 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _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 fbd22557b48e..733cc018f88a 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _md5_=2b9083f6f0fa15cdc69a4b7bd465e21f
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-9999 b/metadata/md5-cache/sys-libs/llvm-libunwind-9999
index 29860a5b83fd..19c0b42c04be 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _md5_=245526a86ec7bd334c7e2ee9884f3455
diff --git a/metadata/md5-cache/sys-libs/musl-1.1.20-r1 b/metadata/md5-cache/sys-libs/musl-1.1.20-r1
new file mode 100644
index 000000000000..44aeda90041d
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/musl-1.1.20-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DESCRIPTION=Light, fast and simple C library focused on standards-conformance and safety
+EAPI=6
+HOMEPAGE=http://www.musl-libc.org/
+IUSE=headers-only
+KEYWORDS=-* amd64 ~arm ~arm64 ~mips ~ppc x86
+LICENSE=MIT LGPL-2 GPL-2
+SLOT=0
+SRC_URI=http://www.musl-libc.org/releases/musl-1.1.20.tar.gz https://dev.gentoo.org/~blueness/musl-misc/getconf.c https://dev.gentoo.org/~blueness/musl-misc/getent.c https://dev.gentoo.org/~blueness/musl-misc/iconv.c
+_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_=90227bb74d3ac4ab7e5d78dd9ce7679a
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 4fa7b58ed5e1..ba3c8bf64183 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0622131c06e9f9d5d5e132d3335c5855
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 126c670c055c..5fbbaf585028 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_=03cb3597b4480a50bc09e7fed784efaf
+_md5_=a8fae5f074223162254d3d6a6f6a8a31
diff --git a/metadata/md5-cache/sys-libs/pam-1.3.1 b/metadata/md5-cache/sys-libs/pam-1.3.1
new file mode 100644
index 000000000000..38378bc067fa
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/pam-1.3.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=app-text/docbook-xml-dtd:4.3 app-text/docbook-xml-dtd:4.4 app-text/docbook-xml-dtd:4.5 nls? ( 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 filecaps? ( sys-libs/libcap )
+DESCRIPTION=Linux-PAM (Pluggable Authentication Modules)
+EAPI=6
+HOMEPAGE=https://github.com/linux-pam/linux-pam
+IUSE=audit berkdb +cracklib debug nis nls +pie selinux static-libs +filecaps abi_x86_32 abi_x86_64 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-linux ~x86-linux
+LICENSE=|| ( BSD GPL-2 )
+PDEPEND=sys-auth/pambase
+RDEPEND=app-text/docbook-xml-dtd:4.3 app-text/docbook-xml-dtd:4.4 app-text/docbook-xml-dtd:4.5 nls? ( sys-devel/gettext ) 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(-)?] ) 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(-)?] ) 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(-)?] ) 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(-)?] ) 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(-)?] ) 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(-)?] ) !<sys-apps/openrc-0.11.8 !sys-auth/openpam !sys-auth/pam_userdb
+SLOT=0
+SRC_URI=https://github.com/linux-pam/linux-pam/archive/v1.3.1.tar.gz -> pam-1.3.1.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	db-use	501a5d0963e0d17f30260023f292ae8e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	fcaps	9445d60c1eb084a91c38ef4c070b2f16	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=2371f4b598b0758b3f0313b1c91dbcb6
diff --git a/metadata/md5-cache/sys-libs/tapi-1.30 b/metadata/md5-cache/sys-libs/tapi-1.30
index 0a922af8f61b..166b99abf212 100644
--- a/metadata/md5-cache/sys-libs/tapi-1.30
+++ b/metadata/md5-cache/sys-libs/tapi-1.30
@@ -7,5 +7,5 @@ KEYWORDS=~x64-macos ~x86-macos
 LICENSE=|| ( UoI-NCSA MIT )
 SLOT=0
 SRC_URI=https://opensource.apple.com/tarballs/tapi/tapi-1.30.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=86c368989f5b523261c7eb80014e405a
diff --git a/metadata/md5-cache/sys-libs/tapi-2.0.0 b/metadata/md5-cache/sys-libs/tapi-2.0.0
index 9bff523eabde..8ab773957efd 100644
--- a/metadata/md5-cache/sys-libs/tapi-2.0.0
+++ b/metadata/md5-cache/sys-libs/tapi-2.0.0
@@ -8,5 +8,5 @@ LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=sys-devel/llvm:= sys-devel/clang:=
 SLOT=0
 SRC_URI=https://opensource.apple.com/tarballs/clang/clang-800.0.42.1.tar.gz http://releases.llvm.org/5.0.1/llvm-5.0.1.src.tar.xz http://releases.llvm.org/5.0.1/cfe-5.0.1.src.tar.xz https://github.com/ributzka/tapi/archive/b9205695b4edee91000383695be8de5ba8e0db41.tar.gz -> tapi-2.0.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f1f27861b46952b82f7a4a1bba60cd8a
diff --git a/metadata/md5-cache/sys-libs/uclibc-ng-1.0.30-r1 b/metadata/md5-cache/sys-libs/uclibc-ng-1.0.30-r1
index b3a2d4e22370..6ae21cadd338 100644
--- a/metadata/md5-cache/sys-libs/uclibc-ng-1.0.30-r1
+++ b/metadata/md5-cache/sys-libs/uclibc-ng-1.0.30-r1
@@ -3,11 +3,11 @@ DESCRIPTION=C library for developing embedded Linux systems
 EAPI=6
 HOMEPAGE=https://uclibc-ng.org/
 IUSE=debug hardened iconv ipv6 symlink-compat headers-only savedconfig
-KEYWORDS=-* amd64 ~arm ~mips ppc x86
+KEYWORDS=-* amd64 arm ~mips ppc x86
 LICENSE=LGPL-2
 RDEPEND=!!sys-libs/uclibc iconv? ( dev-libs/libiconv )
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://downloads.uclibc-ng.org/releases/1.0.30/uClibc-ng-1.0.30.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	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=2af0182b4e034cc174baf9a503768866
+_md5_=e6eff898ea5deb7e27f08c1c8014276e
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 8f6acdb2e79e..52cd753523a7 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=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 80247720373b..d69442a241fc 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4302d869ca56ba63a8b423258cb6d291
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index d105476106a3..93899fe24f01 100644
--- a/metadata/md5-cache/sys-power/Manifest.gz
+++ b/metadata/md5-cache/sys-power/Manifest.gz
diff --git a/metadata/md5-cache/sys-power/acpi_call-1.1.0 b/metadata/md5-cache/sys-power/acpi_call-1.1.0
index 9deffd97e65e..9b9fc497a117 100644
--- a/metadata/md5-cache/sys-power/acpi_call-1.1.0
+++ b/metadata/md5-cache/sys-power/acpi_call-1.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://github.com/mkottman/acpi_call/archive/v1.1.0.tar.gz -> acpi_call-1.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921
 _md5_=5be6da936304131f2bba2def28007e02
diff --git a/metadata/md5-cache/sys-power/acpi_call-1.1.0-r1 b/metadata/md5-cache/sys-power/acpi_call-1.1.0-r1
index 924a0b211a38..022748d67204 100644
--- a/metadata/md5-cache/sys-power/acpi_call-1.1.0-r1
+++ b/metadata/md5-cache/sys-power/acpi_call-1.1.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://github.com/mkottman/acpi_call/archive/v1.1.0.tar.gz -> acpi_call-1.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921
 _md5_=eb101df88571616b08882aec09c3acd0
diff --git a/metadata/md5-cache/sys-power/acpi_call-1.1.0-r2 b/metadata/md5-cache/sys-power/acpi_call-1.1.0-r2
index d6da1489d018..a3103418fcd7 100644
--- a/metadata/md5-cache/sys-power/acpi_call-1.1.0-r2
+++ b/metadata/md5-cache/sys-power/acpi_call-1.1.0-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://github.com/mkottman/acpi_call/archive/v1.1.0.tar.gz -> acpi_call-1.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921
 _md5_=db86a2bddddfa31211402b106da53da8
diff --git a/metadata/md5-cache/sys-power/acpi_call-3.17 b/metadata/md5-cache/sys-power/acpi_call-3.17
index 4131b3e3702c..a3544146fc21 100644
--- a/metadata/md5-cache/sys-power/acpi_call-3.17
+++ b/metadata/md5-cache/sys-power/acpi_call-3.17
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://github.com/teleshoes/acpi_call/archive/3.17.tar.gz -> acpi_call-3.17.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921
 _md5_=239ccf5142541804c153ed4f3fc2cc2e
diff --git a/metadata/md5-cache/sys-power/acpi_call-9999 b/metadata/md5-cache/sys-power/acpi_call-9999
index 2527b2bd5846..b52911f6cc29 100644
--- a/metadata/md5-cache/sys-power/acpi_call-9999
+++ b/metadata/md5-cache/sys-power/acpi_call-9999
@@ -7,5 +7,5 @@ IUSE=kernel_linux kernel_linux kernel_linux
 LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d2c20339df76a5da65cb363c9ec55a39
diff --git a/metadata/md5-cache/sys-power/acpid-2.0.29 b/metadata/md5-cache/sys-power/acpid-2.0.29
index 821002b61033..3e5e614f0715 100644
--- a/metadata/md5-cache/sys-power/acpid-2.0.29
+++ b/metadata/md5-cache/sys-power/acpid-2.0.29
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( sec-policy/selinux-apm )
 SLOT=0
 SRC_URI=mirror://sourceforge/acpid2/acpid-2.0.29.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=0cd62a038e62faf1806175191027146e
diff --git a/metadata/md5-cache/sys-power/acpid-2.0.29-r1 b/metadata/md5-cache/sys-power/acpid-2.0.29-r1
index 31d0dc092619..633113264da8 100644
--- a/metadata/md5-cache/sys-power/acpid-2.0.29-r1
+++ b/metadata/md5-cache/sys-power/acpid-2.0.29-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( sec-policy/selinux-apm )
 SLOT=0
 SRC_URI=mirror://sourceforge/acpid2/acpid-2.0.29.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	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=6e6c5e0be0713d7a181e53459da4e6fb
diff --git a/metadata/md5-cache/sys-power/acpid-2.0.30 b/metadata/md5-cache/sys-power/acpid-2.0.30
index a31c5e71f8b0..aa6404850a5d 100644
--- a/metadata/md5-cache/sys-power/acpid-2.0.30
+++ b/metadata/md5-cache/sys-power/acpid-2.0.30
@@ -9,5 +9,5 @@ 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	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=89ce77a7ffaf78f402356afa72a00260
diff --git a/metadata/md5-cache/sys-power/apcupsd-3.14.13 b/metadata/md5-cache/sys-power/apcupsd-3.14.13
index 8b91de4666f8..7aa04abb397d 100644
--- a/metadata/md5-cache/sys-power/apcupsd-3.14.13
+++ b/metadata/md5-cache/sys-power/apcupsd-3.14.13
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=sys-apps/util-linux-2.23[tty-helpers(-)] sys-freebsd/freebsd-ubin ) cgi? ( >=media-libs/gd-1.8.4 ) nls? ( sys-devel/gettext ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) gnome? ( >=x11-libs/gtk+-2.4.0:2 dev-libs/glib:2 >=gnome-base/gconf-2.0 ) sys-apps/openrc virtual/mailx
 SLOT=0
 SRC_URI=mirror://sourceforge/apcupsd/apcupsd-3.14.13.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7e1955976e5b158713f834b48df83a61
diff --git a/metadata/md5-cache/sys-power/apcupsd-3.14.14-r1 b/metadata/md5-cache/sys-power/apcupsd-3.14.14-r1
deleted file mode 100644
index e6ddaa35ab0f..000000000000
--- a/metadata/md5-cache/sys-power/apcupsd-3.14.14-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=|| ( >=sys-apps/util-linux-2.23[tty-helpers(-)] sys-freebsd/freebsd-ubin ) modbus? ( usb? ( virtual/libusb:0 ) ) cgi? ( >=media-libs/gd-1.8.4 ) nls? ( sys-devel/gettext ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) gnome? ( >=x11-libs/gtk+-2.4.0:2 dev-libs/glib:2 >=gnome-base/gconf-2.0 ) virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=APC UPS daemon with integrated tcp/ip remote shutdown
-EAPI=5
-HOMEPAGE=http://www.apcupsd.org/
-IUSE=snmp +usb +modbus cgi nls gnome kernel_linux kernel_linux
-KEYWORDS=amd64 ~arm ppc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=|| ( >=sys-apps/util-linux-2.23[tty-helpers(-)] sys-freebsd/freebsd-ubin ) modbus? ( usb? ( virtual/libusb:0 ) ) cgi? ( >=media-libs/gd-1.8.4 ) nls? ( sys-devel/gettext ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) gnome? ( >=x11-libs/gtk+-2.4.0:2 dev-libs/glib:2 >=gnome-base/gconf-2.0 ) virtual/mailx
-SLOT=0
-SRC_URI=mirror://sourceforge/apcupsd/apcupsd-3.14.14.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b07a9c27b2b4edfcaf69ea3a31c1731a
diff --git a/metadata/md5-cache/sys-power/apcupsd-3.14.14-r2 b/metadata/md5-cache/sys-power/apcupsd-3.14.14-r2
index 194acaa88f9b..4bb951963ca7 100644
--- a/metadata/md5-cache/sys-power/apcupsd-3.14.14-r2
+++ b/metadata/md5-cache/sys-power/apcupsd-3.14.14-r2
@@ -4,10 +4,10 @@ DESCRIPTION=APC UPS daemon with integrated tcp/ip remote shutdown
 EAPI=6
 HOMEPAGE=http://www.apcupsd.org/
 IUSE=snmp +usb +modbus cgi nls gnome kernel_linux kernel_linux
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm ppc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=|| ( >=sys-apps/util-linux-2.23[tty-helpers(-)] sys-freebsd/freebsd-ubin ) modbus? ( usb? ( virtual/libusb:0 ) ) cgi? ( >=media-libs/gd-1.8.4 ) nls? ( sys-devel/gettext ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) gnome? ( >=x11-libs/gtk+-2.4.0:2 dev-libs/glib:2 >=gnome-base/gconf-2.0 ) virtual/mailx
 SLOT=0
 SRC_URI=mirror://sourceforge/apcupsd/apcupsd-3.14.14.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=431a32814504d6c2e819c32d83c856ca
+_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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=2cdfb426c597e75d13a5cfc5775690b7
diff --git a/metadata/md5-cache/sys-power/bbswitch-0.8 b/metadata/md5-cache/sys-power/bbswitch-0.8
index 727c549160d1..65243a8ec58a 100644
--- a/metadata/md5-cache/sys-power/bbswitch-0.8
+++ b/metadata/md5-cache/sys-power/bbswitch-0.8
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://github.com/Bumblebee-Project/bbswitch/archive/v0.8.tar.gz -> bbswitch-0.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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_=5d513d69e3f7328685366d20f63efbc5
diff --git a/metadata/md5-cache/sys-power/bbswitch-0.8-r1 b/metadata/md5-cache/sys-power/bbswitch-0.8-r1
index ac42a3957891..6245c4628dce 100644
--- a/metadata/md5-cache/sys-power/bbswitch-0.8-r1
+++ b/metadata/md5-cache/sys-power/bbswitch-0.8-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://github.com/Bumblebee-Project/bbswitch/archive/v0.8.tar.gz -> bbswitch-0.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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_=4feae6f13aacd183c0d17c9a58b7cd53
diff --git a/metadata/md5-cache/sys-power/bbswitch-9999 b/metadata/md5-cache/sys-power/bbswitch-9999
index c428d1db2177..e316a0e1b724 100644
--- a/metadata/md5-cache/sys-power/bbswitch-9999
+++ b/metadata/md5-cache/sys-power/bbswitch-9999
@@ -7,5 +7,5 @@ IUSE=kernel_linux kernel_linux
 LICENSE=GPL-3+
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a0cb0915cbb63720fbc92f43cd8e97bb
diff --git a/metadata/md5-cache/sys-power/ncpufreqd-2.4 b/metadata/md5-cache/sys-power/ncpufreqd-2.4
index 01f63146b206..9137e8f24e72 100644
--- a/metadata/md5-cache/sys-power/ncpufreqd-2.4
+++ b/metadata/md5-cache/sys-power/ncpufreqd-2.4
@@ -8,5 +8,5 @@ LICENSE=ZLIB
 RDEPEND=app-arch/xz-utils virtual/logger
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/ncpufreqd-2.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=79651794698da6f082a6ca7460e69bb4
diff --git a/metadata/md5-cache/sys-power/phc-intel-0.3.2.12.17 b/metadata/md5-cache/sys-power/phc-intel-0.3.2.12.17
index a39e3234bfd6..0c1f1c90bd5d 100644
--- a/metadata/md5-cache/sys-power/phc-intel-0.3.2.12.17
+++ b/metadata/md5-cache/sys-power/phc-intel-0.3.2.12.17
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://www.linux-phc.org/forum/download/file.php?id=166 -> phc-intel-pack-rev17.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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_=a990dad4754c0483725d80c2b7289a76
diff --git a/metadata/md5-cache/sys-power/phc-intel-0.3.2.12.21 b/metadata/md5-cache/sys-power/phc-intel-0.3.2.12.21
index c8ded1d38ef8..49dfc612fc3e 100644
--- a/metadata/md5-cache/sys-power/phc-intel-0.3.2.12.21
+++ b/metadata/md5-cache/sys-power/phc-intel-0.3.2.12.21
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://www.linux-phc.org/forum/download/file.php?id=170 -> phc-intel-pack-rev21.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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_=e05c7df504b32d526dd53fe37477d0a2
diff --git a/metadata/md5-cache/sys-power/phc-intel-0.3.2.12.24 b/metadata/md5-cache/sys-power/phc-intel-0.3.2.12.24
index 2e9297b08070..b0b097701686 100644
--- a/metadata/md5-cache/sys-power/phc-intel-0.3.2.12.24
+++ b/metadata/md5-cache/sys-power/phc-intel-0.3.2.12.24
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://www.linux-phc.org/forum/download/file.php?id=178 -> phc-intel-pack-rev24.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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_=33254c855ce4aa89c5ce44bd3d849873
diff --git a/metadata/md5-cache/sys-power/powernowd-1.00-r4 b/metadata/md5-cache/sys-power/powernowd-1.00-r4
index 58d26900d9ad..a79aa3943eb7 100644
--- a/metadata/md5-cache/sys-power/powernowd-1.00-r4
+++ b/metadata/md5-cache/sys-power/powernowd-1.00-r4
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.deater.net/john/powernowd-1.00.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0714325fd160450c95ce37adf2c182fe
diff --git a/metadata/md5-cache/sys-power/powernowd-1.00-r5 b/metadata/md5-cache/sys-power/powernowd-1.00-r5
index eb6297e5d895..4633d0421b10 100644
--- a/metadata/md5-cache/sys-power/powernowd-1.00-r5
+++ b/metadata/md5-cache/sys-power/powernowd-1.00-r5
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.deater.net/john/powernowd-1.00.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=e05eb3751a5079face9b2d86fc406941
diff --git a/metadata/md5-cache/sys-power/powertop-2.8 b/metadata/md5-cache/sys-power/powertop-2.8
index d65f518fde6a..32544543a611 100644
--- a/metadata/md5-cache/sys-power/powertop-2.8
+++ b/metadata/md5-cache/sys-power/powertop-2.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses:=[unicode?] X? ( x11-apps/xset ) virtual/libintl
 SLOT=0
 SRC_URI=https://01.org/sites/default/files/downloads/powertop/powertop-2.8.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c3cc20a94ad73652c6989171d4579031
diff --git a/metadata/md5-cache/sys-power/powertop-2.9 b/metadata/md5-cache/sys-power/powertop-2.9
index 9bc919f53612..f7ac17eee264 100644
--- a/metadata/md5-cache/sys-power/powertop-2.9
+++ b/metadata/md5-cache/sys-power/powertop-2.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses:=[unicode?] X? ( x11-apps/xset ) virtual/libintl
 SLOT=0
 SRC_URI=https://01.org/sites/default/files/downloads/powertop/powertop-v2.9.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e81193b00f47b5ea195340f6ee7c0733
diff --git a/metadata/md5-cache/sys-power/powertop-9999 b/metadata/md5-cache/sys-power/powertop-9999
index 1ef8418fe953..6e5853d94e44 100644
--- a/metadata/md5-cache/sys-power/powertop-9999
+++ b/metadata/md5-cache/sys-power/powertop-9999
@@ -7,5 +7,5 @@ IUSE=nls unicode X kernel_linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses:=[unicode?] X? ( x11-apps/xset ) virtual/libintl
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c015e4d583202eef3c92ae133e6e66f6
diff --git a/metadata/md5-cache/sys-power/upower-0.99.5 b/metadata/md5-cache/sys-power/upower-0.99.5
index dfb8255d1ed8..64a42d4c5cc5 100644
--- a/metadata/md5-cache/sys-power/upower-0.99.5
+++ b/metadata/md5-cache/sys-power/upower-0.99.5
@@ -9,5 +9,5 @@ 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.5.tar.xz
-_eclasses_=ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5eb4d92e1ca7bdc3e88428e6c2c5acde
diff --git a/metadata/md5-cache/sys-power/upower-0.99.7 b/metadata/md5-cache/sys-power/upower-0.99.7
index 0954f02df3a0..79b88b9f6b56 100644
--- a/metadata/md5-cache/sys-power/upower-0.99.7
+++ b/metadata/md5-cache/sys-power/upower-0.99.7
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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 0f8998f5156a..8656afdf667a 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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=5a68aa2ebe386e1f4f124692ddb40e82
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d5bfff898b05f988886d943e1d032de4
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 600aa9a5725b..5befd05e1a72 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/atop-2.3.0-r1 b/metadata/md5-cache/sys-process/atop-2.3.0-r1
index e97c1febe77e..e72bad5f2c9f 100644
--- a/metadata/md5-cache/sys-process/atop-2.3.0-r1
+++ b/metadata/md5-cache/sys-process/atop-2.3.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= >=sys-process/acct-6.6.4-r1
 SLOT=0
 SRC_URI=https://github.com/Atoptool/atop/archive/v2.3.0.tar.gz -> atop-2.3.0.tar.gz https://github.com/Atoptool/atop/commit/42e86fcc42ce60f8c92f3c7d5f3a6ccde47c0b33.patch -> atop-2.3.0-version_h.patch https://github.com/Atoptool/atop/commit/a8d850d06efc8d70a19f55ec93fe83df51e99077.patch -> atop-2.3.0-version_c.patch https://github.com/Atoptool/atop/commit/5f101e656a24271726d1e9cd672631b6033c36c1.patch -> atop-2.3.0-netatop_h.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=188bb80ee3cc4491e42cda9ac2dc1774
diff --git a/metadata/md5-cache/sys-process/audit-2.6.4 b/metadata/md5-cache/sys-process/audit-2.6.4
index 9cf0a4f85158..666d12bbd7ca 100644
--- a/metadata/md5-cache/sys-process/audit-2.6.4
+++ b/metadata/md5-cache/sys-process/audit-2.6.4
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 py
 RESTRICT=test
 SLOT=0
 SRC_URI=https://people.redhat.com/sgrubb/audit/audit-2.6.4.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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_=94f8b4b140bd3d9e7a581f39a1cb4f46
diff --git a/metadata/md5-cache/sys-process/audit-2.7.1 b/metadata/md5-cache/sys-process/audit-2.7.1
index 0cc8ecf146fb..3a89a35b60d5 100644
--- a/metadata/md5-cache/sys-process/audit-2.7.1
+++ b/metadata/md5-cache/sys-process/audit-2.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 py
 RESTRICT=test
 SLOT=0
 SRC_URI=https://people.redhat.com/sgrubb/audit/audit-2.7.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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_=ec12bfce289f6fe562768119f1daf054
diff --git a/metadata/md5-cache/sys-process/audit-2.8.2 b/metadata/md5-cache/sys-process/audit-2.8.2
index 74ac766007d6..e31609263121 100644
--- a/metadata/md5-cache/sys-process/audit-2.8.2
+++ b/metadata/md5-cache/sys-process/audit-2.8.2
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 py
 RESTRICT=test
 SLOT=0
 SRC_URI=https://people.redhat.com/sgrubb/audit/audit-2.8.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	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
+_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_=5af739a262a09713e556d75f4841d1cb
diff --git a/metadata/md5-cache/sys-process/audit-2.8.3 b/metadata/md5-cache/sys-process/audit-2.8.3
index a11818575755..cfa27f7d339f 100644
--- a/metadata/md5-cache/sys-process/audit-2.8.3
+++ b/metadata/md5-cache/sys-process/audit-2.8.3
@@ -4,12 +4,12 @@ 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 ) )
 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	915cae3d7d636732918d18827fb1c226	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_=5af739a262a09713e556d75f4841d1cb
+_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
diff --git a/metadata/md5-cache/sys-process/criu-2.5-r1 b/metadata/md5-cache/sys-process/criu-2.5-r1
index b8e44f7db490..7878d9a551ff 100644
--- a/metadata/md5-cache/sys-process/criu-2.5-r1
+++ b/metadata/md5-cache/sys-process/criu-2.5-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.openvz.org/criu/criu-2.5.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=590606e6e058d413d4c8513016e67b4b
diff --git a/metadata/md5-cache/sys-process/criu-3.6 b/metadata/md5-cache/sys-process/criu-3.6
index 7b3ef84ede22..b246f2286927 100644
--- a/metadata/md5-cache/sys-process/criu-3.6
+++ b/metadata/md5-cache/sys-process/criu-3.6
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.openvz.org/criu/criu-3.6.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=06ac14cd3acab8f3808a99ff7f1a4b1f
diff --git a/metadata/md5-cache/sys-process/criu-3.7 b/metadata/md5-cache/sys-process/criu-3.7
index e0978d74aa9b..6d511f1b90d2 100644
--- a/metadata/md5-cache/sys-process/criu-3.7
+++ b/metadata/md5-cache/sys-process/criu-3.7
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.openvz.org/criu/criu-3.7.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9f6ee0f328a0617b0d2a21a05c734b3f
diff --git a/metadata/md5-cache/sys-process/criu-3.9 b/metadata/md5-cache/sys-process/criu-3.9
index a5708e98d52d..fd2c4f07c1c3 100644
--- a/metadata/md5-cache/sys-process/criu-3.9
+++ b/metadata/md5-cache/sys-process/criu-3.9
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.openvz.org/criu/criu-3.9.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=616bfab02f81bc2c0472ac4f9076cdb6
diff --git a/metadata/md5-cache/sys-process/evisum-0.1.1 b/metadata/md5-cache/sys-process/evisum-0.1.1
deleted file mode 100644
index 31ccd9903314..000000000000
--- a/metadata/md5-cache/sys-process/evisum-0.1.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-libs/efl-1.20.0[X]
-DESCRIPTION=System and process monitor written with EFL
-EAPI=7
-HOMEPAGE=https://www.enlightenment.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=ISC
-RDEPEND=>=dev-libs/efl-1.20.0[X]
-SLOT=0
-SRC_URI=https://download.enlightenment.org/rel/apps/evisum/evisum-0.1.1.tar.xz
-_md5_=f5c1f256088656cbca1a79af193e0fef
diff --git a/metadata/md5-cache/sys-process/evisum-0.1.2 b/metadata/md5-cache/sys-process/evisum-0.1.2
new file mode 100644
index 000000000000..1d5db36422c3
--- /dev/null
+++ b/metadata/md5-cache/sys-process/evisum-0.1.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=>=dev-libs/efl-1.20.0[X]
+DESCRIPTION=System and process monitor written with EFL
+EAPI=7
+HOMEPAGE=https://www.enlightenment.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=>=dev-libs/efl-1.20.0[X]
+SLOT=0
+SRC_URI=https://download.enlightenment.org/rel/apps/evisum/evisum-0.1.2.tar.xz
+_md5_=8f099902a4218520f241d78fe04645e7
diff --git a/metadata/md5-cache/sys-process/glances-2.11.1 b/metadata/md5-cache/sys-process/glances-2.11.1
index b0e353f1e202..b500b9f4e650 100644
--- a/metadata/md5-cache/sys-process/glances-2.11.1
+++ b/metadata/md5-cache/sys-process/glances-2.11.1
@@ -10,5 +10,5 @@ RDEPEND=doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/G/Glances/Glances-2.11.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9db5919033418c926d7c40b37854c4e8
diff --git a/metadata/md5-cache/sys-process/glances-3.0.1 b/metadata/md5-cache/sys-process/glances-3.0.1
index 8b7d716663ac..7c0073d67e2e 100644
--- a/metadata/md5-cache/sys-process/glances-3.0.1
+++ b/metadata/md5-cache/sys-process/glances-3.0.1
@@ -10,5 +10,5 @@ RDEPEND=doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/G/Glances/Glances-3.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=769b06c3a04f93af3b5870c211efdae1
diff --git a/metadata/md5-cache/sys-process/glances-3.0.2 b/metadata/md5-cache/sys-process/glances-3.0.2
index 9f8eb94e4607..617dff1bba0a 100644
--- a/metadata/md5-cache/sys-process/glances-3.0.2
+++ b/metadata/md5-cache/sys-process/glances-3.0.2
@@ -10,5 +10,5 @@ RDEPEND=doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/G/Glances/Glances-3.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=769b06c3a04f93af3b5870c211efdae1
diff --git a/metadata/md5-cache/sys-process/htop-2.0.2 b/metadata/md5-cache/sys-process/htop-2.0.2
index 24056b33a04a..cdffd8f97ca1 100644
--- a/metadata/md5-cache/sys-process/htop-2.0.2
+++ b/metadata/md5-cache/sys-process/htop-2.0.2
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=sys-libs/ncurses:0=[unicode?]
 SLOT=0
 SRC_URI=https://hisham.hm/htop/releases/2.0.2/htop-2.0.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=acc944bfb62e451ec9d3387e9302b3c8
diff --git a/metadata/md5-cache/sys-process/htop-2.1.0-r1 b/metadata/md5-cache/sys-process/htop-2.1.0-r1
index 2823514ba0c6..bb9182b6fbf9 100644
--- a/metadata/md5-cache/sys-process/htop-2.1.0-r1
+++ b/metadata/md5-cache/sys-process/htop-2.1.0-r1
@@ -10,5 +10,5 @@ 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	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_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 1c1a1e3d07ee..1f6861620203 100644
--- a/metadata/md5-cache/sys-process/htop-2.2.0
+++ b/metadata/md5-cache/sys-process/htop-2.2.0
@@ -10,5 +10,5 @@ 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	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=515e7afa4fdda3d1901e9da0ea85decb
diff --git a/metadata/md5-cache/sys-process/htop-3.0.0_beta4 b/metadata/md5-cache/sys-process/htop-3.0.0_beta4
index b0b1ac0dd09b..b5b757d7adda 100644
--- a/metadata/md5-cache/sys-process/htop-3.0.0_beta4
+++ b/metadata/md5-cache/sys-process/htop-3.0.0_beta4
@@ -8,5 +8,5 @@ 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	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_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/incron-0.5.10-r1 b/metadata/md5-cache/sys-process/incron-0.5.10-r1
index d51863450f40..9cccebb61311 100644
--- a/metadata/md5-cache/sys-process/incron-0.5.10-r1
+++ b/metadata/md5-cache/sys-process/incron-0.5.10-r1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2 LGPL-2.1
 SLOT=0
 SRC_URI=http://inotify.aiken.cz/download/incron/incron-0.5.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=27220330759904537fd2a46d54d33d0e
diff --git a/metadata/md5-cache/sys-process/iotop-0.6 b/metadata/md5-cache/sys-process/iotop-0.6
index 2606245e1c90..69f8a24f78e6 100644
--- a/metadata/md5-cache/sys-process/iotop-0.6
+++ b/metadata/md5-cache/sys-process/iotop-0.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses(+)] )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://guichaz.free.fr/iotop/files/iotop-0.6.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ad975c2f3bf76d20d945e623c6e67c38
diff --git a/metadata/md5-cache/sys-process/latencytop-0.5-r1 b/metadata/md5-cache/sys-process/latencytop-0.5-r1
index acff67042f4e..9fc8dc2740d1 100644
--- a/metadata/md5-cache/sys-process/latencytop-0.5-r1
+++ b/metadata/md5-cache/sys-process/latencytop-0.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 gtk? ( x11-libs/gtk+:2 ) sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=mirror://gentoo/latencytop-0.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f203baa61cc939fba91c226c80f447a8
diff --git a/metadata/md5-cache/sys-process/lsof-4.91 b/metadata/md5-cache/sys-process/lsof-4.91
index 2dfc3d5bdfea..cf200428fb66 100644
--- a/metadata/md5-cache/sys-process/lsof-4.91
+++ b/metadata/md5-cache/sys-process/lsof-4.91
@@ -4,10 +4,10 @@ DESCRIPTION=Lists open files for running Unix processes
 EAPI=6
 HOMEPAGE=ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/
 IUSE=examples ipv6 rpc selinux static
-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 ~sparc-solaris ~x64-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 ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=lsof
 RDEPEND=rpc? ( net-libs/libtirpc ) selinux? ( sys-libs/libselinux )
 SLOT=0
 SRC_URI=ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.91.tar.bz2 ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/OLD/lsof_4.91.tar.bz2 http://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.91.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_=540ad54ba3f0dc039a96bfe5cc6cb0ab
+_md5_=aa98645e15c37626d7fc33fb59318314
diff --git a/metadata/md5-cache/sys-process/memwatch-0.1.0 b/metadata/md5-cache/sys-process/memwatch-0.1.0
index fb708b7ca5f7..f8218c06d153 100644
--- a/metadata/md5-cache/sys-process/memwatch-0.1.0
+++ b/metadata/md5-cache/sys-process/memwatch-0.1.0
@@ -8,5 +8,5 @@ LICENSE=WTFPL-2
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=http://unixdev.ru/src/memwatch-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=97fc6a6b3a78da02293ec6eaecae8cb0
diff --git a/metadata/md5-cache/sys-process/memwatch-0.2.0 b/metadata/md5-cache/sys-process/memwatch-0.2.0
index 2aefba5ea4a5..389828495d0a 100644
--- a/metadata/md5-cache/sys-process/memwatch-0.2.0
+++ b/metadata/md5-cache/sys-process/memwatch-0.2.0
@@ -8,5 +8,5 @@ LICENSE=WTFPL-2
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=http://unixdev.ru/src/memwatch-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=985800aff86cb099f381304a6ee235d5
diff --git a/metadata/md5-cache/sys-process/memwatch-0.2.1 b/metadata/md5-cache/sys-process/memwatch-0.2.1
index 1b27cf191d8e..ebd30b0f60a5 100644
--- a/metadata/md5-cache/sys-process/memwatch-0.2.1
+++ b/metadata/md5-cache/sys-process/memwatch-0.2.1
@@ -8,5 +8,5 @@ LICENSE=WTFPL-2
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=http://unixdev.ru/src/memwatch-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=985800aff86cb099f381304a6ee235d5
diff --git a/metadata/md5-cache/sys-process/memwatch-0.3.0 b/metadata/md5-cache/sys-process/memwatch-0.3.0
index 44083ccd7bcb..e11c6bd35cc4 100644
--- a/metadata/md5-cache/sys-process/memwatch-0.3.0
+++ b/metadata/md5-cache/sys-process/memwatch-0.3.0
@@ -8,5 +8,5 @@ LICENSE=WTFPL-2
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=http://unixdev.ru/src/memwatch-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bbb0cee85dd00cd64b62204b9078176b
diff --git a/metadata/md5-cache/sys-process/memwatch-0.3.0-r1 b/metadata/md5-cache/sys-process/memwatch-0.3.0-r1
index d6e8960a7579..6fc53b6b2109 100644
--- a/metadata/md5-cache/sys-process/memwatch-0.3.0-r1
+++ b/metadata/md5-cache/sys-process/memwatch-0.3.0-r1
@@ -8,5 +8,5 @@ LICENSE=WTFPL-2
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=http://unixdev.ru/src/memwatch-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7154c653d7414b21f8c5929ee5bacea8
diff --git a/metadata/md5-cache/sys-process/memwatch-0.3.1 b/metadata/md5-cache/sys-process/memwatch-0.3.1
index 6584a6f4dfbc..8545df65a023 100644
--- a/metadata/md5-cache/sys-process/memwatch-0.3.1
+++ b/metadata/md5-cache/sys-process/memwatch-0.3.1
@@ -8,5 +8,5 @@ LICENSE=WTFPL-2
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=http://unixdev.ru/src/memwatch-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7154c653d7414b21f8c5929ee5bacea8
diff --git a/metadata/md5-cache/sys-process/memwatch-0.3.2 b/metadata/md5-cache/sys-process/memwatch-0.3.2
index 2416c03b1e31..e7ad8c0dd9a3 100644
--- a/metadata/md5-cache/sys-process/memwatch-0.3.2
+++ b/metadata/md5-cache/sys-process/memwatch-0.3.2
@@ -8,5 +8,5 @@ LICENSE=WTFPL-2
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=http://unixdev.ru/src/memwatch-0.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=7154c653d7414b21f8c5929ee5bacea8
diff --git a/metadata/md5-cache/sys-process/memwatch-0.3.3 b/metadata/md5-cache/sys-process/memwatch-0.3.3
index e4f271e85c80..860ed9d8f176 100644
--- a/metadata/md5-cache/sys-process/memwatch-0.3.3
+++ b/metadata/md5-cache/sys-process/memwatch-0.3.3
@@ -8,5 +8,5 @@ LICENSE=WTFPL-2
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=http://unixdev.ru/src/memwatch-0.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7154c653d7414b21f8c5929ee5bacea8
diff --git a/metadata/md5-cache/sys-process/numad-0.5 b/metadata/md5-cache/sys-process/numad-0.5
index f57216b69c03..6ca6ce021778 100644
--- a/metadata/md5-cache/sys-process/numad-0.5
+++ b/metadata/md5-cache/sys-process/numad-0.5
@@ -7,5 +7,5 @@ KEYWORDS=amd64 -arm -s390 x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://gentoo/numad-0.5-334278f.tar.bz2
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=00d040505089f6e1310b3f156bf681e2
diff --git a/metadata/md5-cache/sys-process/numad-0.5-r1 b/metadata/md5-cache/sys-process/numad-0.5-r1
index dcb93e7a9d4d..9a6a5a56ce5d 100644
--- a/metadata/md5-cache/sys-process/numad-0.5-r1
+++ b/metadata/md5-cache/sys-process/numad-0.5-r1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 -arm -s390 x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://gentoo/numad-0.5-334278f.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=95b3ca86177e36d53e7a59bc23d4d142
diff --git a/metadata/md5-cache/sys-process/numad-0.5-r2 b/metadata/md5-cache/sys-process/numad-0.5-r2
index 461924d840cd..d0fc01f73be9 100644
--- a/metadata/md5-cache/sys-process/numad-0.5-r2
+++ b/metadata/md5-cache/sys-process/numad-0.5-r2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 -arm ~arm64 -s390 ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://gentoo/numad-0.5-334278f.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=35b44243e9c14a273b0e44fb7babfb57
diff --git a/metadata/md5-cache/sys-process/numad-9999 b/metadata/md5-cache/sys-process/numad-9999
index 5ac10b48c79b..c3d7733bbc38 100644
--- a/metadata/md5-cache/sys-process/numad-9999
+++ b/metadata/md5-cache/sys-process/numad-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://fedoraproject.org/wiki/Features/numad
 IUSE=kernel_linux
 LICENSE=LGPL-2.1
 SLOT=0
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=a0116cdc98a31857ac9eed930b4288c9
diff --git a/metadata/md5-cache/sys-process/tini-0.16.1 b/metadata/md5-cache/sys-process/tini-0.16.1
index 12b831c9ced0..c817ecb3a2a4 100644
--- a/metadata/md5-cache/sys-process/tini-0.16.1
+++ b/metadata/md5-cache/sys-process/tini-0.16.1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/krallin/tini/archive/v0.16.1.tar.gz -> tini-0.16.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=039f0b0e2f51650c4738cd15723fb29f
diff --git a/metadata/md5-cache/sys-process/tini-0.18.0 b/metadata/md5-cache/sys-process/tini-0.18.0
index 621846c94fd7..a0e2012c749e 100644
--- a/metadata/md5-cache/sys-process/tini-0.18.0
+++ b/metadata/md5-cache/sys-process/tini-0.18.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/krallin/tini/archive/v0.18.0.tar.gz -> tini-0.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=05c035527790ab47950344325a5442c1
diff --git a/metadata/md5-cache/sys-process/usbtop-0.2 b/metadata/md5-cache/sys-process/usbtop-0.2
index 6bb91ca35d22..600c2a1928e0 100644
--- a/metadata/md5-cache/sys-process/usbtop-0.2
+++ b/metadata/md5-cache/sys-process/usbtop-0.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=net-libs/libpcap:=[usb] dev-libs/boost:=[threads]
 SLOT=0
 SRC_URI=https://github.com/aguinet/usbtop/archive/release-0.2.tar.gz -> usbtop-0.2.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1fef7cb6cbba24be9364ff5b36295926
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 0b9d4c21c73b..49127e93a39e 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/cargo-1.25.0 b/metadata/md5-cache/virtual/cargo-1.25.0
deleted file mode 100644
index b9da3f3e3b95..000000000000
--- a/metadata/md5-cache/virtual/cargo-1.25.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Package manager for Rust
-EAPI=7
-KEYWORDS=amd64 ~arm64 x86
-RDEPEND=|| ( =dev-lang/rust-1.25.0*[extended] =dev-util/cargo-0.26.0* )
-SLOT=0
-_md5_=488cdda1fe3f14c417eb935b02665a4c
diff --git a/metadata/md5-cache/virtual/cargo-1.28.0 b/metadata/md5-cache/virtual/cargo-1.28.0
deleted file mode 100644
index e1253aa19b76..000000000000
--- a/metadata/md5-cache/virtual/cargo-1.28.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Package manager for Rust
-EAPI=7
-KEYWORDS=amd64 ~arm64 ~x86
-RDEPEND=|| ( =dev-lang/rust-1.28.0*[cargo] =dev-lang/rust-bin-1.28.0*[cargo] =dev-util/cargo-0.29.0* )
-SLOT=0
-_md5_=e087f36fdb687ed6937c356a6e2ddd81
diff --git a/metadata/md5-cache/virtual/cargo-1.29.1 b/metadata/md5-cache/virtual/cargo-1.29.1
index 378a2e64e4ac..a5a9f97c53a8 100644
--- a/metadata/md5-cache/virtual/cargo-1.29.1
+++ b/metadata/md5-cache/virtual/cargo-1.29.1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Package manager for Rust
 EAPI=7
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 RDEPEND=|| ( =dev-lang/rust-1.29.1*[cargo] =dev-lang/rust-bin-1.29.1*[cargo] =dev-util/cargo-0.30.0* )
 SLOT=0
-_md5_=b40fcb86f6d778f2a83c95bafb1cadc0
+_md5_=aa98142b226cc779bd1179989de9df92
diff --git a/metadata/md5-cache/virtual/libffi-3.3_rc0 b/metadata/md5-cache/virtual/libffi-3.3_rc0
new file mode 100644
index 000000000000..9f50cc339828
--- /dev/null
+++ b/metadata/md5-cache/virtual/libffi-3.3_rc0
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=A virtual for the Foreign Function Interface implementation
+EAPI=7
+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 ~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-libs/libffi-3.3_rc0: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(-)?]
+SLOT=0/7
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=ec96af13d76017d3c543707544606e2f
diff --git a/metadata/md5-cache/virtual/rust-1.25.0 b/metadata/md5-cache/virtual/rust-1.25.0
deleted file mode 100644
index 7a81441bc786..000000000000
--- a/metadata/md5-cache/virtual/rust-1.25.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Rust language compiler
-EAPI=6
-KEYWORDS=amd64 ~arm64 x86
-RDEPEND=|| ( =dev-lang/rust-1.25.0* =dev-lang/rust-bin-1.25.0* )
-SLOT=0
-_md5_=2ea68fcf8fa89d05306a664789fe880d
diff --git a/metadata/md5-cache/virtual/rust-1.28.0 b/metadata/md5-cache/virtual/rust-1.28.0
deleted file mode 100644
index afc3aaf0d475..000000000000
--- a/metadata/md5-cache/virtual/rust-1.28.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Rust language compiler
-EAPI=7
-KEYWORDS=amd64 ~arm64 ~x86
-RDEPEND=|| ( =dev-lang/rust-1.28.0* =dev-lang/rust-bin-1.28.0* )
-SLOT=0
-_md5_=5e1cd9557e019c4211d86363a456985f
diff --git a/metadata/md5-cache/virtual/rust-1.29.1 b/metadata/md5-cache/virtual/rust-1.29.1
index 8c758d301a3f..4c6ea87fc734 100644
--- a/metadata/md5-cache/virtual/rust-1.29.1
+++ b/metadata/md5-cache/virtual/rust-1.29.1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Rust language compiler
 EAPI=7
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 RDEPEND=|| ( =dev-lang/rust-1.29.1* =dev-lang/rust-bin-1.29.1* )
 SLOT=0
-_md5_=972f1fbb9112b560e518e3b6a04d92d4
+_md5_=dad7178b61033a6b77ecc7b49f8a0ca2
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index 762f6e7d3e8b..4740fc9c5a33 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/mpm_itk-2.4.7_p4-r1 b/metadata/md5-cache/www-apache/mpm_itk-2.4.7_p4-r1
index c8e8ce3681c0..1be5a55a4cc8 100644
--- a/metadata/md5-cache/www-apache/mpm_itk-2.4.7_p4-r1
+++ b/metadata/md5-cache/www-apache/mpm_itk-2.4.7_p4-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=sys-libs/libcap >=www-servers/apache-2.4.7[-threads] =www-servers/apache-2.4*
 SLOT=0
 SRC_URI=http://mpm-itk.sesse.net/mpm-itk-2.4.7-04.tar.gz
-_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	915cae3d7d636732918d18827fb1c226	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=e2302fb4dc670544053645a47efc57a2
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 2cb923fca0d7..a348976732be 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/blohg-0.13-r3 b/metadata/md5-cache/www-apps/blohg-0.13-r3
index a872c08cf4d0..da04450fde52 100644
--- a/metadata/md5-cache/www-apps/blohg-0.13-r3
+++ b/metadata/md5-cache/www-apps/blohg-0.13-r3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/click-2.0 >=dev-python/docutils-0.11 >=dev-python/flask-0.1
 REQUIRED_USE=|| ( git mercurial ) test? ( git mercurial ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/blohg/blohg-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f290e9880a72afeb3a66b37a8f1fc823
diff --git a/metadata/md5-cache/www-apps/blohg-9999 b/metadata/md5-cache/www-apps/blohg-9999
index e6375e40b5b5..ef9edecb9ad2 100644
--- a/metadata/md5-cache/www-apps/blohg-9999
+++ b/metadata/md5-cache/www-apps/blohg-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-python/click-2.0 >=dev-python/docutils-0.11 >=dev-python/flask-0.10.1 >=dev-python/flask-babel-0.7 >=dev-python/frozen-flask-0.7 >=dev-python/jinja-2.5.2 dev-python/pyyaml dev-python/setuptools dev-python/pygments git? ( >=dev-python/pygit2-0.21.3 ) mercurial? ( >=dev-vcs/mercurial-1.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(-)]
 REQUIRED_USE=|| ( git mercurial ) test? ( git mercurial ) || ( python_targets_python2_7 )
 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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b8d372f233f4abb07a1a6decb35ecdea
diff --git a/metadata/md5-cache/www-apps/blohg-tumblelog-0.2 b/metadata/md5-cache/www-apps/blohg-tumblelog-0.2
index e010c99f61a7..fba52ff277ae 100644
--- a/metadata/md5-cache/www-apps/blohg-tumblelog-0.2
+++ b/metadata/md5-cache/www-apps/blohg-tumblelog-0.2
@@ -10,5 +10,5 @@ RDEPEND=>=www-apps/blohg-0.12 dev-python/pygments[python_targets_python2_7(-)?,-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/blohg-tumblelog/blohg-tumblelog-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=14b0817e084b80c073e184da0bab9096
diff --git a/metadata/md5-cache/www-apps/blohg-tumblelog-9999 b/metadata/md5-cache/www-apps/blohg-tumblelog-9999
index cdc67a9e3315..03f90d3660d1 100644
--- a/metadata/md5-cache/www-apps/blohg-tumblelog-9999
+++ b/metadata/md5-cache/www-apps/blohg-tumblelog-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=www-apps/blohg-0.12 dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyoembed[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/beautifulsoup:4[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	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	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=14b0817e084b80c073e184da0bab9096
diff --git a/metadata/md5-cache/www-apps/klaus-1.2.2 b/metadata/md5-cache/www-apps/klaus-1.2.2
index 5e574b18567f..d0d434e8ccd8 100644
--- a/metadata/md5-cache/www-apps/klaus-1.2.2
+++ b/metadata/md5-cache/www-apps/klaus-1.2.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/k/klaus/klaus-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=13a3ac2afe8c99acca9603babb89e330
diff --git a/metadata/md5-cache/www-apps/moinmoin-1.9.7-r1 b/metadata/md5-cache/www-apps/moinmoin-1.9.7-r1
index 372728691f29..3ad4e367742d 100644
--- a/metadata/md5-cache/www-apps/moinmoin-1.9.7-r1
+++ b/metadata/md5-cache/www-apps/moinmoin-1.9.7-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/docutils-0.4[python_targets_python2_7(-)?,-python_single_ta
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://static.moinmo.in/files/moin-1.9.7.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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	6ae2395d7f341093c36057cb4f69101a	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	6ae2395d7f341093c36057cb4f69101a	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7466069341b559b6a07ebf498b2bcc17
diff --git a/metadata/md5-cache/www-apps/nikola-7.8.11 b/metadata/md5-cache/www-apps/nikola-7.8.11
index 018f6277e474..821eb44f1472 100644
--- a/metadata/md5-cache/www-apps/nikola-7.8.11
+++ b/metadata/md5-cache/www-apps/nikola-7.8.11
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/N/Nikola/Nikola-7.8.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6d1450dfd9eda8dadb5f47be0e699b63
diff --git a/metadata/md5-cache/www-apps/nikola-7.8.12 b/metadata/md5-cache/www-apps/nikola-7.8.12
index 9e9654fa974b..de6146a001f9 100644
--- a/metadata/md5-cache/www-apps/nikola-7.8.12
+++ b/metadata/md5-cache/www-apps/nikola-7.8.12
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/N/Nikola/Nikola-7.8.12.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6d1450dfd9eda8dadb5f47be0e699b63
diff --git a/metadata/md5-cache/www-apps/nikola-7.8.13 b/metadata/md5-cache/www-apps/nikola-7.8.13
index 7d49bcb738f7..67ea07825e2e 100644
--- a/metadata/md5-cache/www-apps/nikola-7.8.13
+++ b/metadata/md5-cache/www-apps/nikola-7.8.13
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/N/Nikola/Nikola-7.8.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6d1450dfd9eda8dadb5f47be0e699b63
diff --git a/metadata/md5-cache/www-apps/nikola-7.8.14 b/metadata/md5-cache/www-apps/nikola-7.8.14
index 5596eb4040c2..d8ac5df1cd3d 100644
--- a/metadata/md5-cache/www-apps/nikola-7.8.14
+++ b/metadata/md5-cache/www-apps/nikola-7.8.14
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/N/Nikola/Nikola-7.8.14.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=257bac238b31e65d830b673af113e480
diff --git a/metadata/md5-cache/www-apps/nikola-7.8.14-r1 b/metadata/md5-cache/www-apps/nikola-7.8.14-r1
index e21ae3bf9ee3..7467864c8f62 100644
--- a/metadata/md5-cache/www-apps/nikola-7.8.14-r1
+++ b/metadata/md5-cache/www-apps/nikola-7.8.14-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/N/Nikola/Nikola-7.8.14.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6c65da3163b96bae45306d93e64ec0e0
diff --git a/metadata/md5-cache/www-apps/nikola-7.8.15 b/metadata/md5-cache/www-apps/nikola-7.8.15
index bfd34416831f..a29abdcb165e 100644
--- a/metadata/md5-cache/www-apps/nikola-7.8.15
+++ b/metadata/md5-cache/www-apps/nikola-7.8.15
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/N/Nikola/Nikola-7.8.15.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b2b82c86e3206804e8052fcf4ffc9e07
diff --git a/metadata/md5-cache/www-apps/nikola-7.8.15-r1 b/metadata/md5-cache/www-apps/nikola-7.8.15-r1
index 4a8b48c16866..094bfaa3f7a8 100644
--- a/metadata/md5-cache/www-apps/nikola-7.8.15-r1
+++ b/metadata/md5-cache/www-apps/nikola-7.8.15-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/N/Nikola/Nikola-7.8.15.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=611d67ab7eded7ee66e276447c9f3b2f
diff --git a/metadata/md5-cache/www-apps/nikola-7.8.8 b/metadata/md5-cache/www-apps/nikola-7.8.8
index a4b98ccde6bb..778623d27f21 100644
--- a/metadata/md5-cache/www-apps/nikola-7.8.8
+++ b/metadata/md5-cache/www-apps/nikola-7.8.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/N/Nikola/Nikola-7.8.8.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e903a970e965f6747bcc7b081d808bd8
diff --git a/metadata/md5-cache/www-apps/novnc-0.6.2 b/metadata/md5-cache/www-apps/novnc-0.6.2
index 6a771aa45433..c595cb501214 100644
--- a/metadata/md5-cache/www-apps/novnc-0.6.2
+++ b/metadata/md5-cache/www-apps/novnc-0.6.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/websockify[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
 SRC_URI=https://github.com/kanaka/noVNC/archive/v0.6.2.tar.gz -> novnc-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bc4ceb97ee9317ce61fa18df7109412c
diff --git a/metadata/md5-cache/www-apps/novnc-0.6.2-r1 b/metadata/md5-cache/www-apps/novnc-0.6.2-r1
index 91e1c246466c..579af2c2ed40 100644
--- a/metadata/md5-cache/www-apps/novnc-0.6.2-r1
+++ b/metadata/md5-cache/www-apps/novnc-0.6.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/websockify[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
 SRC_URI=https://github.com/kanaka/noVNC/archive/v0.6.2.tar.gz -> novnc-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e0c98da565213fbfe98b5be9dacb5a41
diff --git a/metadata/md5-cache/www-apps/novnc-1.0.0 b/metadata/md5-cache/www-apps/novnc-1.0.0
index d425ddf291be..28854223284e 100644
--- a/metadata/md5-cache/www-apps/novnc-1.0.0
+++ b/metadata/md5-cache/www-apps/novnc-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/websockify[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
 SRC_URI=https://github.com/kanaka/noVNC/archive/v1.0.0.tar.gz -> novnc-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=72336b244ca852a3bbe9ae130bf32bdb
diff --git a/metadata/md5-cache/www-apps/novnc-9999 b/metadata/md5-cache/www-apps/novnc-9999
index 9eb32f876cb9..5478a23a40f9 100644
--- a/metadata/md5-cache/www-apps/novnc-9999
+++ b/metadata/md5-cache/www-apps/novnc-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-3
 RDEPEND=dev-python/websockify[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=72336b244ca852a3bbe9ae130bf32bdb
diff --git a/metadata/md5-cache/www-apps/ownpaste-0.2.2-r1 b/metadata/md5-cache/www-apps/ownpaste-0.2.2-r1
index dd1e4446074e..dda4a4c09d2e 100644
--- a/metadata/md5-cache/www-apps/ownpaste-0.2.2-r1
+++ b/metadata/md5-cache/www-apps/ownpaste-0.2.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/ownpaste/ownpaste-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=471d1488f26dfc714c323d2f95cfa03d
diff --git a/metadata/md5-cache/www-apps/ownpaste-9999 b/metadata/md5-cache/www-apps/ownpaste-9999
index aaee0a5f6501..c30fb3698ab0 100644
--- a/metadata/md5-cache/www-apps/ownpaste-9999
+++ b/metadata/md5-cache/www-apps/ownpaste-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/flask-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/flask-script-0.3.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/flask-sqlalchemy-0.15[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/jinja-2.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/werkzeug-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-migrate-0.7.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pytz[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	89bb9f083a2590d9b447fd0b78a96186
+_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_=471d1488f26dfc714c323d2f95cfa03d
diff --git a/metadata/md5-cache/www-apps/prewikka-3.1.0 b/metadata/md5-cache/www-apps/prewikka-3.1.0
index b7e00a42eb3f..e097682ff43e 100644
--- a/metadata/md5-cache/www-apps/prewikka-3.1.0
+++ b/metadata/md5-cache/www-apps/prewikka-3.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/Babel[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/3.1.0/prewikka-3.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5659f2b5a66d1038a6b7abfbf4bee20e
diff --git a/metadata/md5-cache/www-apps/prewikka-4.0.0 b/metadata/md5-cache/www-apps/prewikka-4.0.0
index c15d78449ca3..425115f1c6ca 100644
--- a/metadata/md5-cache/www-apps/prewikka-4.0.0
+++ b/metadata/md5-cache/www-apps/prewikka-4.0.0
@@ -10,5 +10,5 @@ RDEPEND=~dev-libs/libprelude-4.0.0[python,python_targets_python2_7(-)?,-python_s
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/4.0.0/prewikka-4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b01bff4ad59db70a34a6fe0b51bbcb6d
diff --git a/metadata/md5-cache/www-apps/prewikka-4.1.5 b/metadata/md5-cache/www-apps/prewikka-4.1.5
index 044c425919d6..1c52cb287e31 100644
--- a/metadata/md5-cache/www-apps/prewikka-4.1.5
+++ b/metadata/md5-cache/www-apps/prewikka-4.1.5
@@ -10,5 +10,5 @@ RDEPEND=~dev-libs/libprelude-4.1.0[python,python_targets_python2_7(-)?,-python_s
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/4.1.0/prewikka-4.1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=36d14f3815fb77885a461470c9abfd5a
diff --git a/metadata/md5-cache/www-apps/radicale-1.1.6 b/metadata/md5-cache/www-apps/radicale-1.1.6
index b5ebad6b31d1..e201314dd386 100644
--- a/metadata/md5-cache/www-apps/radicale-1.1.6
+++ b/metadata/md5-cache/www-apps/radicale-1.1.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/vobject-0.9.5[python_targets_python3_4(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/R/Radicale/Radicale-1.1.6.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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=388c509c98109d2cee606f4935be9599
diff --git a/metadata/md5-cache/www-apps/radicale-2.1.10 b/metadata/md5-cache/www-apps/radicale-2.1.10
index 389166f2def8..e6bed79faaed 100644
--- a/metadata/md5-cache/www-apps/radicale-2.1.10
+++ b/metadata/md5-cache/www-apps/radicale-2.1.10
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/vobject-0.9.6[python_targets_python3_4(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/R/Radicale/Radicale-2.1.10.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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=69758c908fb9e4fc39dc6a205de77565
diff --git a/metadata/md5-cache/www-apps/radicale-2.1.8 b/metadata/md5-cache/www-apps/radicale-2.1.8
index 82c4e55c5861..7e8080ea714e 100644
--- a/metadata/md5-cache/www-apps/radicale-2.1.8
+++ b/metadata/md5-cache/www-apps/radicale-2.1.8
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/vobject-0.9.5[python_targets_python3_4(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/R/Radicale/Radicale-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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d4ea255c557925bfc8934afdcac25df2
diff --git a/metadata/md5-cache/www-apps/roundup-1.5.1 b/metadata/md5-cache/www-apps/roundup-1.5.1
index ce86264e75b5..de151aab2844 100644
--- a/metadata/md5-cache/www-apps/roundup-1.5.1
+++ b/metadata/md5-cache/www-apps/roundup-1.5.1
@@ -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=mirror://pypi/r/roundup/roundup-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3f1ced4f85d21b1c3155354b9f21f702
diff --git a/metadata/md5-cache/www-apps/scgi-1.14-r1 b/metadata/md5-cache/www-apps/scgi-1.14-r1
index 4f482fc3cb3c..4dfbb27e7f9a 100644
--- a/metadata/md5-cache/www-apps/scgi-1.14-r1
+++ b/metadata/md5-cache/www-apps/scgi-1.14-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=http://python.ca/scgi/releases/scgi-1.14.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b6cf242598dce9cd9a0d1f2eea03037c
diff --git a/metadata/md5-cache/www-apps/trac-1.0.13 b/metadata/md5-cache/www-apps/trac-1.0.13
index d09bea405f7b..cc0a4a6979fd 100644
--- a/metadata/md5-cache/www-apps/trac-1.0.13
+++ b/metadata/md5-cache/www-apps/trac-1.0.13
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target
 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	89bb9f083a2590d9b447fd0b78a96186
+_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 4f2cd428f178..0b18ec47527e 100644
--- a/metadata/md5-cache/www-apps/trac-1.0.9
+++ b/metadata/md5-cache/www-apps/trac-1.0.9
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( mysql postgres sqlite ) python_targets_python2_7
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/www-apps/trac-1.2 b/metadata/md5-cache/www-apps/trac-1.2
index 1b6c7701eb83..e37d491c9f3d 100644
--- a/metadata/md5-cache/www-apps/trac-1.2
+++ b/metadata/md5-cache/www-apps/trac-1.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
index c2b29cc8e50c..5708b185dce8 100644
--- a/metadata/md5-cache/www-apps/trac-1.2-r1
+++ b/metadata/md5-cache/www-apps/trac-1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target
 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	89bb9f083a2590d9b447fd0b78a96186
+_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 acb5b9e5b0ab..777655d8886d 100644
--- a/metadata/md5-cache/www-apps/trac-1.2.1
+++ b/metadata/md5-cache/www-apps/trac-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( mysql postgres sqlite ) python_targets_python2_7
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/www-apps/trac-accountmanager-0.4.2-r1 b/metadata/md5-cache/www-apps/trac-accountmanager-0.4.2-r1
index c64d1da6a7f8..bb4023129a2f 100644
--- a/metadata/md5-cache/www-apps/trac-accountmanager-0.4.2-r1
+++ b/metadata/md5-cache/www-apps/trac-accountmanager-0.4.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=www-apps/trac-0.12 python_targets_python2_7? ( >=dev-lang/python-2.7.5
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/T/TracAccountManager/TracAccountManager-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e31f60f9ad6487a7455e24478271b68c
diff --git a/metadata/md5-cache/www-apps/trac-accountmanager-0.4.4 b/metadata/md5-cache/www-apps/trac-accountmanager-0.4.4
index dab2b6014f2b..0f090516c350 100644
--- a/metadata/md5-cache/www-apps/trac-accountmanager-0.4.4
+++ b/metadata/md5-cache/www-apps/trac-accountmanager-0.4.4
@@ -10,5 +10,5 @@ RDEPEND=>=www-apps/trac-0.12 python_targets_python2_7? ( >=dev-lang/python-2.7.5
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/T/TracAccountManager/TracAccountManager-0.4.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e27513dde6c528c025ebe98d576b6cfc
diff --git a/metadata/md5-cache/www-apps/trac-mercurial-0.12.0.29_pre10899-r1 b/metadata/md5-cache/www-apps/trac-mercurial-0.12.0.29_pre10899-r1
index f989743b2983..bd1a6c8c12a4 100644
--- a/metadata/md5-cache/www-apps/trac-mercurial-0.12.0.29_pre10899-r1
+++ b/metadata/md5-cache/www-apps/trac-mercurial-0.12.0.29_pre10899-r1
@@ -10,5 +10,5 @@ RDEPEND=>=www-apps/trac-0.12[python_targets_python2_7(-)?,-python_single_target_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~rafaelmartins/distfiles/TracMercurial-0.12.0.29dev-r10899.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cc1dd660abf2b1768a60b654d91632eb
diff --git a/metadata/md5-cache/www-apps/trac-mercurial-1.0.0.3_pre20130206-r1 b/metadata/md5-cache/www-apps/trac-mercurial-1.0.0.3_pre20130206-r1
index 9c96ef02728f..de7f3417909e 100644
--- a/metadata/md5-cache/www-apps/trac-mercurial-1.0.0.3_pre20130206-r1
+++ b/metadata/md5-cache/www-apps/trac-mercurial-1.0.0.3_pre20130206-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=www-apps/trac-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/mercurial-1.1[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	89bb9f083a2590d9b447fd0b78a96186
+_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_=25013b422ce0efb6417686f6f7b09b94
diff --git a/metadata/md5-cache/www-apps/trac-tags-0.6-r1 b/metadata/md5-cache/www-apps/trac-tags-0.6-r1
index 858c83c2d99a..ca5a61aee29a 100644
--- a/metadata/md5-cache/www-apps/trac-tags-0.6-r1
+++ b/metadata/md5-cache/www-apps/trac-tags-0.6-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/genshi-0.6[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://trac-hacks.org/changeset/9901/tagsplugin/tags/0.6?old_path=%2F&format=zip -> trac-tags-0.6.zip
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=be4a84c18cf9da8c20fe176905c8c7d6
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 5dd514522514..e4d4274ed835 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
index 011097a3ab88..a9391a2d42e1 100644
--- a/metadata/md5-cache/www-client/chromium-69.0.3497.100
+++ b/metadata/md5-cache/www-client/chromium-69.0.3497.100
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2:= cups? ( >=net-print/cup
 RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-69.0.3497.100.tar.xz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	chromium-2	3d468f3fc7ed63c78db7408ea04246e3	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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.16 b/metadata/md5-cache/www-client/chromium-70.0.3538.16
deleted file mode 100644
index 0c2752b7f804..000000000000
--- a/metadata/md5-cache/www-client/chromium-70.0.3538.16
+++ /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-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.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-70.0.3538.16.tar.xz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	chromium-2	3d468f3fc7ed63c78db7408ea04246e3	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=02244fd9045508893bd1a6f5837dd764
diff --git a/metadata/md5-cache/www-client/chromium-70.0.3538.22 b/metadata/md5-cache/www-client/chromium-70.0.3538.22
index aaebab29517f..92d07bcccad0 100644
--- a/metadata/md5-cache/www-client/chromium-70.0.3538.22
+++ b/metadata/md5-cache/www-client/chromium-70.0.3538.22
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2:= cups? ( >=net-print/cup
 RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-70.0.3538.22.tar.xz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	chromium-2	3d468f3fc7ed63c78db7408ea04246e3	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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
new file mode 100644
index 000000000000..e8d9c5a5da42
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-70.0.3538.35
@@ -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:=[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-71.0.3554.4 b/metadata/md5-cache/www-client/chromium-71.0.3554.4
index 161e4ecbc6fe..fd613b7ec48c 100644
--- a/metadata/md5-cache/www-client/chromium-71.0.3554.4
+++ b/metadata/md5-cache/www-client/chromium-71.0.3554.4
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2:= cups? ( >=net-print/cup
 RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-71.0.3554.4.tar.xz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	chromium-2	3d468f3fc7ed63c78db7408ea04246e3	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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
new file mode 100644
index 000000000000..67c26390af1b
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-71.0.3559.6
@@ -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.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/conkeror-1.0.4 b/metadata/md5-cache/www-client/conkeror-1.0.4
index 02aeefc0cf7f..4d840715defe 100644
--- a/metadata/md5-cache/www-client/conkeror-1.0.4
+++ b/metadata/md5-cache/www-client/conkeror-1.0.4
@@ -7,5 +7,5 @@ LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 ) CC-BY-SA-3.0
 RDEPEND=|| ( ( >=www-client/firefox-5.0 <www-client/firefox-57 ) ( >=www-client/firefox-bin-23.0 <www-client/firefox-bin-57 ) )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/conkeror-1.0.4.tar.xz https://dev.gentoo.org/~ulm/distfiles/conkeror.png
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6772eeb7f34760ee7197c78681f5adb2
diff --git a/metadata/md5-cache/www-client/epiphany-3.24.5 b/metadata/md5-cache/www-client/epiphany-3.24.5
deleted file mode 100644
index fb5c5eca15f3..000000000000
--- a/metadata/md5-cache/www-client/epiphany-3.24.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.46.0:2[dbus] >=x11-libs/gtk+-3.22.13:3 >=net-libs/webkit-gtk-2.15.90:4= >=x11-libs/cairo-1.2 >=app-crypt/gcr-3.5.5:=[gtk] >=x11-libs/gdk-pixbuf-2.36.5:2 >=gnome-base/gnome-desktop-2.91.2:3= dev-libs/icu:= >=x11-libs/libnotify-0.5.1:= >=app-crypt/libsecret-0.14 >=net-libs/libsoup-2.48:2.4 >=dev-libs/libxml2-2.6.12:2 >=dev-libs/libxslt-1.1.7 dev-db/sqlite:3 >=app-text/iso-codes-0.35 >=gnome-base/gsettings-desktop-schemas-0.0.1 app-text/yelp-tools dev-libs/appstream-glib sys-apps/paxctl >=sys-devel/gettext-0.19.8 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=GNOME webbrowser based on Webkit
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Web
-IUSE=test test
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-libs/glib-2.46.0:2[dbus] >=x11-libs/gtk+-3.22.13:3 >=net-libs/webkit-gtk-2.15.90:4= >=x11-libs/cairo-1.2 >=app-crypt/gcr-3.5.5:=[gtk] >=x11-libs/gdk-pixbuf-2.36.5:2 >=gnome-base/gnome-desktop-2.91.2:3= dev-libs/icu:= >=x11-libs/libnotify-0.5.1:= >=app-crypt/libsecret-0.14 >=net-libs/libsoup-2.48:2.4 >=dev-libs/libxml2-2.6.12:2 >=dev-libs/libxslt-1.1.7 dev-db/sqlite:3 >=app-text/iso-codes-0.35 >=gnome-base/gsettings-desktop-schemas-0.0.1 x11-themes/adwaita-icon-theme !www-client/epiphany-extensions
-SLOT=0
-SRC_URI=mirror://gnome/sources/epiphany/3.24/epiphany-3.24.5.tar.xz
-_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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=4eedccd56f65d765ca49a8c081dcd452
diff --git a/metadata/md5-cache/www-client/epiphany-3.26.7 b/metadata/md5-cache/www-client/epiphany-3.26.7
index c2bf7ac5979c..c158d870219b 100644
--- a/metadata/md5-cache/www-client/epiphany-3.26.7
+++ b/metadata/md5-cache/www-client/epiphany-3.26.7
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.52.0:2 >=x11-libs/gtk+-3.22.13:3 >=dev-libs/nettle-3.2:= >=net-libs/webkit-gtk-2.17.4:4= >=x11-libs/cairo-1.2 >=app-crypt/gcr-3.5.5:=[gtk] >=x11-libs/gdk-pixbuf-2.36.5:2 >=gnome-base/gnome-desktop-2.91.2:3= dev-libs/icu:= >=app-text/iso-codes-0.35 >=dev-libs/json-glib-1.2.4 >=x11-libs/libnotify-0.5.1 >=app-crypt/libsecret-0.14 >=net-libs/libsoup-2.48:2.4 >=dev-libs/libxml2-2.6.12:2 >=dev-libs/libxslt-1.1.7 dev-db/sqlite:3 dev-libs/gmp:0= >=gnome-base/gsettings-desktop-schemas-0.0.1 x11-themes/adwaita-icon-theme
 SLOT=0
 SRC_URI=mirror://gnome/sources/epiphany/3.26/epiphany-3.26.7.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	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	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	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	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3a9c01c973eeda175c386526031718dc
diff --git a/metadata/md5-cache/www-client/epiphany-3.30.0 b/metadata/md5-cache/www-client/epiphany-3.30.0
new file mode 100644
index 000000000000..cc3dd5055b98
--- /dev/null
+++ b/metadata/md5-cache/www-client/epiphany-3.30.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.52.0:2 >=x11-libs/gtk+-3.22.13:3 >=dev-libs/nettle-3.2:= >=net-libs/webkit-gtk-2.21.92:4= >=x11-libs/cairo-1.2 >=dev-libs/libdazzle-3.28.0 >=app-crypt/gcr-3.5.5:=[gtk] >=x11-libs/gdk-pixbuf-2.36.5:2 dev-libs/icu:= >=app-text/iso-codes-0.35 >=dev-libs/json-glib-1.2.4 >=x11-libs/libnotify-0.5.1 >=app-crypt/libsecret-0.14 >=net-libs/libsoup-2.48:2.4 >=dev-libs/libxml2-2.6.12:2 >=dev-libs/libxslt-1.1.7 dev-db/sqlite:3 dev-libs/gmp:0= >=gnome-base/gsettings-desktop-schemas-0.0.1 dev-libs/appstream-glib dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool sys-apps/paxctl >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=GNOME webbrowser based on Webkit
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Web
+IUSE=test test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/glib-2.52.0:2 >=x11-libs/gtk+-3.22.13:3 >=dev-libs/nettle-3.2:= >=net-libs/webkit-gtk-2.21.92:4= >=x11-libs/cairo-1.2 >=dev-libs/libdazzle-3.28.0 >=app-crypt/gcr-3.5.5:=[gtk] >=x11-libs/gdk-pixbuf-2.36.5:2 dev-libs/icu:= >=app-text/iso-codes-0.35 >=dev-libs/json-glib-1.2.4 >=x11-libs/libnotify-0.5.1 >=app-crypt/libsecret-0.14 >=net-libs/libsoup-2.48:2.4 >=dev-libs/libxml2-2.6.12:2 >=dev-libs/libxslt-1.1.7 dev-db/sqlite:3 dev-libs/gmp:0= >=gnome-base/gsettings-desktop-schemas-0.0.1 x11-themes/adwaita-icon-theme
+SLOT=0
+SRC_URI=mirror://gnome/sources/epiphany/3.30/epiphany-3.30.0.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	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	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=24eae7272bd99b32abea629dd046bafd
diff --git a/metadata/md5-cache/www-client/epiphany-3.30.1 b/metadata/md5-cache/www-client/epiphany-3.30.1
new file mode 100644
index 000000000000..6b32b1c5aafd
--- /dev/null
+++ b/metadata/md5-cache/www-client/epiphany-3.30.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.52.0:2 >=x11-libs/gtk+-3.22.13:3 >=dev-libs/nettle-3.2:= >=net-libs/webkit-gtk-2.21.92:4= >=x11-libs/cairo-1.2 >=dev-libs/libdazzle-3.28.0 >=app-crypt/gcr-3.5.5:=[gtk] >=x11-libs/gdk-pixbuf-2.36.5:2 dev-libs/icu:= >=app-text/iso-codes-0.35 >=dev-libs/json-glib-1.2.4 >=x11-libs/libnotify-0.5.1 >=app-crypt/libsecret-0.14 >=net-libs/libsoup-2.48:2.4 >=dev-libs/libxml2-2.6.12:2 >=dev-libs/libxslt-1.1.7 dev-db/sqlite:3 dev-libs/gmp:0= >=gnome-base/gsettings-desktop-schemas-0.0.1 dev-libs/appstream-glib dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool sys-apps/paxctl >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=GNOME webbrowser based on Webkit
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Web
+IUSE=test test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/glib-2.52.0:2 >=x11-libs/gtk+-3.22.13:3 >=dev-libs/nettle-3.2:= >=net-libs/webkit-gtk-2.21.92:4= >=x11-libs/cairo-1.2 >=dev-libs/libdazzle-3.28.0 >=app-crypt/gcr-3.5.5:=[gtk] >=x11-libs/gdk-pixbuf-2.36.5:2 dev-libs/icu:= >=app-text/iso-codes-0.35 >=dev-libs/json-glib-1.2.4 >=x11-libs/libnotify-0.5.1 >=app-crypt/libsecret-0.14 >=net-libs/libsoup-2.48:2.4 >=dev-libs/libxml2-2.6.12:2 >=dev-libs/libxslt-1.1.7 dev-db/sqlite:3 dev-libs/gmp:0= >=gnome-base/gsettings-desktop-schemas-0.0.1 x11-themes/adwaita-icon-theme
+SLOT=0
+SRC_URI=mirror://gnome/sources/epiphany/3.30/epiphany-3.30.1.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	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	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=24eae7272bd99b32abea629dd046bafd
diff --git a/metadata/md5-cache/www-client/falkon-3.0.1 b/metadata/md5-cache/www-client/falkon-3.0.1
index fcd0a8a4714d..525a8584d09a 100644
--- a/metadata/md5-cache/www-client/falkon-3.0.1
+++ b/metadata/md5-cache/www-client/falkon-3.0.1
@@ -9,5 +9,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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-52.9.0 b/metadata/md5-cache/www-client/firefox-52.9.0
index 9799aaa81fa0..24e7ae3859c6 100644
--- a/metadata/md5-cache/www-client/firefox-52.9.0
+++ b/metadata/md5-cache/www-client/firefox-52.9.0
@@ -10,5 +10,5 @@ RDEPEND=jack? ( virtual/jack ) >=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 seli
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/ach.xpi -> firefox-52.9.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/af.xpi -> firefox-52.9.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/an.xpi -> firefox-52.9.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/ar.xpi -> firefox-52.9.0esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/as.xpi -> firefox-52.9.0esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/ast.xpi -> firefox-52.9.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/az.xpi -> firefox-52.9.0esr-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/bg.xpi -> firefox-52.9.0esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/bn-BD.xpi -> firefox-52.9.0esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/bn-IN.xpi -> firefox-52.9.0esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/br.xpi -> firefox-52.9.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/bs.xpi -> firefox-52.9.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/ca.xpi -> firefox-52.9.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/cak.xpi -> firefox-52.9.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/cs.xpi -> firefox-52.9.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/cy.xpi -> firefox-52.9.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/da.xpi -> firefox-52.9.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/de.xpi -> firefox-52.9.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/dsb.xpi -> firefox-52.9.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/el.xpi -> firefox-52.9.0esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/en-GB.xpi -> firefox-52.9.0esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/en-ZA.xpi -> firefox-52.9.0esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/eo.xpi -> firefox-52.9.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/es-AR.xpi -> firefox-52.9.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/es-CL.xpi -> firefox-52.9.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/es-ES.xpi -> firefox-52.9.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/es-MX.xpi -> firefox-52.9.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/et.xpi -> firefox-52.9.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/eu.xpi -> firefox-52.9.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/fa.xpi -> firefox-52.9.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/ff.xpi -> firefox-52.9.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/fi.xpi -> firefox-52.9.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/fr.xpi -> firefox-52.9.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/fy-NL.xpi -> firefox-52.9.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/ga-IE.xpi -> firefox-52.9.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/gd.xpi -> firefox-52.9.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/gl.xpi -> firefox-52.9.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/gn.xpi -> firefox-52.9.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/gu-IN.xpi -> firefox-52.9.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/he.xpi -> firefox-52.9.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/hi-IN.xpi -> firefox-52.9.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/hr.xpi -> firefox-52.9.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/hsb.xpi -> firefox-52.9.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/hu.xpi -> firefox-52.9.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/hy-AM.xpi -> firefox-52.9.0esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/id.xpi -> firefox-52.9.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/is.xpi -> firefox-52.9.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/it.xpi -> firefox-52.9.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/ja.xpi -> firefox-52.9.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/ka.xpi -> firefox-52.9.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/kab.xpi -> firefox-52.9.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/kk.xpi -> firefox-52.9.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/km.xpi -> firefox-52.9.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/kn.xpi -> firefox-52.9.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/ko.xpi -> firefox-52.9.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/lij.xpi -> firefox-52.9.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/lt.xpi -> firefox-52.9.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/lv.xpi -> firefox-52.9.0esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/mai.xpi -> firefox-52.9.0esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/mk.xpi -> firefox-52.9.0esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/ml.xpi -> firefox-52.9.0esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/mr.xpi -> firefox-52.9.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/ms.xpi -> firefox-52.9.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/nb-NO.xpi -> firefox-52.9.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/nl.xpi -> firefox-52.9.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/nn-NO.xpi -> firefox-52.9.0esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/or.xpi -> firefox-52.9.0esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/pa-IN.xpi -> firefox-52.9.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/pl.xpi -> firefox-52.9.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/pt-BR.xpi -> firefox-52.9.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/pt-PT.xpi -> firefox-52.9.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/rm.xpi -> firefox-52.9.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/ro.xpi -> firefox-52.9.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/ru.xpi -> firefox-52.9.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/si.xpi -> firefox-52.9.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/sk.xpi -> firefox-52.9.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/sl.xpi -> firefox-52.9.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/son.xpi -> firefox-52.9.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/sq.xpi -> firefox-52.9.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/sr.xpi -> firefox-52.9.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/sv-SE.xpi -> firefox-52.9.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/ta.xpi -> firefox-52.9.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/te.xpi -> firefox-52.9.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/th.xpi -> firefox-52.9.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/tr.xpi -> firefox-52.9.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/uk.xpi -> firefox-52.9.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/uz.xpi -> firefox-52.9.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/vi.xpi -> firefox-52.9.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/xh.xpi -> firefox-52.9.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/zh-CN.xpi -> firefox-52.9.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/zh-TW.xpi -> firefox-52.9.0esr-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/source/firefox-52.9.0esr.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.5-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.5-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.5-patches-02.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozconfig-v6.52	d8539cc1b3254e460b76b1dbdf24ec0f	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozconfig-v6.52	d8539cc1b3254e460b76b1dbdf24ec0f	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=230e939203ba5a27ba2b175a1dab8207
diff --git a/metadata/md5-cache/www-client/firefox-60.2.0 b/metadata/md5-cache/www-client/firefox-60.2.0
deleted file mode 100644
index 2c6cc77d0278..000000000000
--- a/metadata/md5-cache/www-client/firefox-60.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=system-icu? ( >=dev-libs/icu-60.2 ) jack? ( virtual/jack ) >=dev-libs/nss-3.36.4 >=dev-libs/nspr-4.19 selinux? ( sec-policy/selinux-mozilla ) >=sys-devel/llvm-4.0.1 >=sys-devel/clang-4.0.1 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-arch/zip app-arch/unzip >=sys-devel/binutils-2.30 sys-apps/findutils 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 ) >=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/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-icu? ( >=dev-libs/icu-59.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) >=x11-libs/gtk+-3.4.0:3 wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) >=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=Firefox Web Browser
-EAPI=6
-HOMEPAGE=http://www.mozilla.com/firefox
-IUSE=bindist eme-free +gmp-autoupdate hardened hwaccel jack +screenshot selinux test custom-cflags custom-optimization clang dbus debug neon pulseaudio selinux startup-notification system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx wifi l10n_ach l10n_af l10n_an l10n_ar l10n_as l10n_ast l10n_az l10n_bg l10n_bn-BD l10n_bn-IN l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-GB l10n_en-ZA l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mai l10n_mk l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_or l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
-KEYWORDS=amd64 x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=system-icu? ( >=dev-libs/icu-60.2 ) jack? ( virtual/jack ) >=dev-libs/nss-3.36.4 >=dev-libs/nspr-4.19 selinux? ( sec-policy/selinux-mozilla ) >=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/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-icu? ( >=dev-libs/icu-59.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) >=x11-libs/gtk+-3.4.0:3 wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
-RESTRICT=!bindist? ( bindist )
-SLOT=0
-SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/ach.xpi -> firefox-60.2.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/af.xpi -> firefox-60.2.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/an.xpi -> firefox-60.2.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/ar.xpi -> firefox-60.2.0esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/as.xpi -> firefox-60.2.0esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/ast.xpi -> firefox-60.2.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/az.xpi -> firefox-60.2.0esr-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/bg.xpi -> firefox-60.2.0esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/bn-BD.xpi -> firefox-60.2.0esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/bn-IN.xpi -> firefox-60.2.0esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/br.xpi -> firefox-60.2.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/bs.xpi -> firefox-60.2.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/ca.xpi -> firefox-60.2.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/cak.xpi -> firefox-60.2.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/cs.xpi -> firefox-60.2.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/cy.xpi -> firefox-60.2.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/da.xpi -> firefox-60.2.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/de.xpi -> firefox-60.2.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/dsb.xpi -> firefox-60.2.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/el.xpi -> firefox-60.2.0esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/en-GB.xpi -> firefox-60.2.0esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/en-ZA.xpi -> firefox-60.2.0esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/eo.xpi -> firefox-60.2.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/es-AR.xpi -> firefox-60.2.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/es-CL.xpi -> firefox-60.2.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/es-ES.xpi -> firefox-60.2.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/es-MX.xpi -> firefox-60.2.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/et.xpi -> firefox-60.2.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/eu.xpi -> firefox-60.2.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/fa.xpi -> firefox-60.2.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/ff.xpi -> firefox-60.2.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/fi.xpi -> firefox-60.2.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/fr.xpi -> firefox-60.2.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/fy-NL.xpi -> firefox-60.2.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/ga-IE.xpi -> firefox-60.2.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/gd.xpi -> firefox-60.2.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/gl.xpi -> firefox-60.2.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/gn.xpi -> firefox-60.2.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/gu-IN.xpi -> firefox-60.2.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/he.xpi -> firefox-60.2.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/hi-IN.xpi -> firefox-60.2.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/hr.xpi -> firefox-60.2.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/hsb.xpi -> firefox-60.2.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/hu.xpi -> firefox-60.2.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/hy-AM.xpi -> firefox-60.2.0esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/id.xpi -> firefox-60.2.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/is.xpi -> firefox-60.2.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/it.xpi -> firefox-60.2.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/ja.xpi -> firefox-60.2.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/ka.xpi -> firefox-60.2.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/kab.xpi -> firefox-60.2.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/kk.xpi -> firefox-60.2.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/km.xpi -> firefox-60.2.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/kn.xpi -> firefox-60.2.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/ko.xpi -> firefox-60.2.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/lij.xpi -> firefox-60.2.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/lt.xpi -> firefox-60.2.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/lv.xpi -> firefox-60.2.0esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/mai.xpi -> firefox-60.2.0esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/mk.xpi -> firefox-60.2.0esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/ml.xpi -> firefox-60.2.0esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/mr.xpi -> firefox-60.2.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/ms.xpi -> firefox-60.2.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/nb-NO.xpi -> firefox-60.2.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/nl.xpi -> firefox-60.2.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/nn-NO.xpi -> firefox-60.2.0esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/or.xpi -> firefox-60.2.0esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/pa-IN.xpi -> firefox-60.2.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/pl.xpi -> firefox-60.2.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/pt-BR.xpi -> firefox-60.2.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/pt-PT.xpi -> firefox-60.2.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/rm.xpi -> firefox-60.2.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/ro.xpi -> firefox-60.2.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/ru.xpi -> firefox-60.2.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/si.xpi -> firefox-60.2.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/sk.xpi -> firefox-60.2.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/sl.xpi -> firefox-60.2.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/son.xpi -> firefox-60.2.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/sq.xpi -> firefox-60.2.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/sr.xpi -> firefox-60.2.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/sv-SE.xpi -> firefox-60.2.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/ta.xpi -> firefox-60.2.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/te.xpi -> firefox-60.2.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/th.xpi -> firefox-60.2.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/tr.xpi -> firefox-60.2.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/uk.xpi -> firefox-60.2.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/uz.xpi -> firefox-60.2.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/vi.xpi -> firefox-60.2.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/xh.xpi -> firefox-60.2.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/zh-CN.xpi -> firefox-60.2.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/linux-i686/xpi/zh-TW.xpi -> firefox-60.2.0esr-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/60.2.0esr/source/firefox-60.2.0esr.source.tar.xz https://dev.gentoo.org/~whissi/dist/firefox/firefox-60.0-patches-03.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-60.0-patches-03.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-60.0-patches-03.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	mozconfig-v6.60	8375169dc9be9739ebe22790b8b499ac	mozcoreconf-v6	662b7375d13187b558bd09ba79c2b621	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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=025b51e3f2250fbe1b0ca3e75ddcead5
diff --git a/metadata/md5-cache/www-client/firefox-60.2.1-r1 b/metadata/md5-cache/www-client/firefox-60.2.1-r1
deleted file mode 100644
index c1d75da09fc7..000000000000
--- a/metadata/md5-cache/www-client/firefox-60.2.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=system-icu? ( >=dev-libs/icu-60.2 ) jack? ( virtual/jack ) >=dev-libs/nss-3.36.4 >=dev-libs/nspr-4.19 selinux? ( sec-policy/selinux-mozilla ) >=sys-devel/llvm-4.0.1 >=sys-devel/clang-4.0.1 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-arch/zip app-arch/unzip >=sys-devel/binutils-2.30 sys-apps/findutils 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 ) >=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/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-icu? ( >=dev-libs/icu-59.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) >=x11-libs/gtk+-3.4.0:3 wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) >=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=Firefox Web Browser
-EAPI=6
-HOMEPAGE=https://www.mozilla.com/firefox
-IUSE=bindist eme-free geckodriver +gmp-autoupdate hardened hwaccel jack +screenshot selinux test custom-cflags custom-optimization clang dbus debug neon pulseaudio selinux startup-notification system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx wifi l10n_ach l10n_af l10n_an l10n_ar l10n_as l10n_ast l10n_az l10n_bg l10n_bn-BD l10n_bn-IN l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-GB l10n_en-ZA l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mai l10n_mk l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_or l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
-KEYWORDS=~amd64 ~x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=system-icu? ( >=dev-libs/icu-60.2 ) jack? ( virtual/jack ) >=dev-libs/nss-3.36.4 >=dev-libs/nspr-4.19 selinux? ( sec-policy/selinux-mozilla ) >=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/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-icu? ( >=dev-libs/icu-59.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) >=x11-libs/gtk+-3.4.0:3 wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
-RESTRICT=!bindist? ( bindist )
-SLOT=0
-SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/ach.xpi -> firefox-60.2.1esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/af.xpi -> firefox-60.2.1esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/an.xpi -> firefox-60.2.1esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/ar.xpi -> firefox-60.2.1esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/as.xpi -> firefox-60.2.1esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/ast.xpi -> firefox-60.2.1esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/az.xpi -> firefox-60.2.1esr-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/bg.xpi -> firefox-60.2.1esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/bn-BD.xpi -> firefox-60.2.1esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/bn-IN.xpi -> firefox-60.2.1esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/br.xpi -> firefox-60.2.1esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/bs.xpi -> firefox-60.2.1esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/ca.xpi -> firefox-60.2.1esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/cak.xpi -> firefox-60.2.1esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/cs.xpi -> firefox-60.2.1esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/cy.xpi -> firefox-60.2.1esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/da.xpi -> firefox-60.2.1esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/de.xpi -> firefox-60.2.1esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/dsb.xpi -> firefox-60.2.1esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/el.xpi -> firefox-60.2.1esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/en-GB.xpi -> firefox-60.2.1esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/en-ZA.xpi -> firefox-60.2.1esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/eo.xpi -> firefox-60.2.1esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/es-AR.xpi -> firefox-60.2.1esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/es-CL.xpi -> firefox-60.2.1esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/es-ES.xpi -> firefox-60.2.1esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/es-MX.xpi -> firefox-60.2.1esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/et.xpi -> firefox-60.2.1esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/eu.xpi -> firefox-60.2.1esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/fa.xpi -> firefox-60.2.1esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/ff.xpi -> firefox-60.2.1esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/fi.xpi -> firefox-60.2.1esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/fr.xpi -> firefox-60.2.1esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/fy-NL.xpi -> firefox-60.2.1esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/ga-IE.xpi -> firefox-60.2.1esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/gd.xpi -> firefox-60.2.1esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/gl.xpi -> firefox-60.2.1esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/gn.xpi -> firefox-60.2.1esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/gu-IN.xpi -> firefox-60.2.1esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/he.xpi -> firefox-60.2.1esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/hi-IN.xpi -> firefox-60.2.1esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/hr.xpi -> firefox-60.2.1esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/hsb.xpi -> firefox-60.2.1esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/hu.xpi -> firefox-60.2.1esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/hy-AM.xpi -> firefox-60.2.1esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/id.xpi -> firefox-60.2.1esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/is.xpi -> firefox-60.2.1esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/it.xpi -> firefox-60.2.1esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/ja.xpi -> firefox-60.2.1esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/ka.xpi -> firefox-60.2.1esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/kab.xpi -> firefox-60.2.1esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/kk.xpi -> firefox-60.2.1esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/km.xpi -> firefox-60.2.1esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/kn.xpi -> firefox-60.2.1esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/ko.xpi -> firefox-60.2.1esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/lij.xpi -> firefox-60.2.1esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/lt.xpi -> firefox-60.2.1esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/lv.xpi -> firefox-60.2.1esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/mai.xpi -> firefox-60.2.1esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/mk.xpi -> firefox-60.2.1esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/ml.xpi -> firefox-60.2.1esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/mr.xpi -> firefox-60.2.1esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/ms.xpi -> firefox-60.2.1esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/nb-NO.xpi -> firefox-60.2.1esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/nl.xpi -> firefox-60.2.1esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/nn-NO.xpi -> firefox-60.2.1esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/or.xpi -> firefox-60.2.1esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/pa-IN.xpi -> firefox-60.2.1esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/pl.xpi -> firefox-60.2.1esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/pt-BR.xpi -> firefox-60.2.1esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/pt-PT.xpi -> firefox-60.2.1esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/rm.xpi -> firefox-60.2.1esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/ro.xpi -> firefox-60.2.1esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/ru.xpi -> firefox-60.2.1esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/si.xpi -> firefox-60.2.1esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/sk.xpi -> firefox-60.2.1esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/sl.xpi -> firefox-60.2.1esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/son.xpi -> firefox-60.2.1esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/sq.xpi -> firefox-60.2.1esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/sr.xpi -> firefox-60.2.1esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/sv-SE.xpi -> firefox-60.2.1esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/ta.xpi -> firefox-60.2.1esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/te.xpi -> firefox-60.2.1esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/th.xpi -> firefox-60.2.1esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/tr.xpi -> firefox-60.2.1esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/uk.xpi -> firefox-60.2.1esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/uz.xpi -> firefox-60.2.1esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/vi.xpi -> firefox-60.2.1esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/xh.xpi -> firefox-60.2.1esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/zh-CN.xpi -> firefox-60.2.1esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/linux-i686/xpi/zh-TW.xpi -> firefox-60.2.1esr-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/60.2.1esr/source/firefox-60.2.1esr.source.tar.xz https://dev.gentoo.org/~whissi/dist/firefox/firefox-60.0-patches-03.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-60.0-patches-03.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-60.0-patches-03.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	mozconfig-v6.60	8375169dc9be9739ebe22790b8b499ac	mozcoreconf-v6	662b7375d13187b558bd09ba79c2b621	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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=878369de8e2d39dbbddd071549bd2983
diff --git a/metadata/md5-cache/www-client/firefox-60.2.2 b/metadata/md5-cache/www-client/firefox-60.2.2
new file mode 100644
index 000000000000..104d7303ca33
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-60.2.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=system-icu? ( >=dev-libs/icu-60.2 ) jack? ( virtual/jack ) >=dev-libs/nss-3.36.4 >=dev-libs/nspr-4.19 selinux? ( sec-policy/selinux-mozilla ) >=sys-devel/llvm-4.0.1 >=sys-devel/clang-4.0.1 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-arch/zip app-arch/unzip >=sys-devel/binutils-2.30 sys-apps/findutils 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 ) >=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/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-icu? ( >=dev-libs/icu-59.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) >=x11-libs/gtk+-3.4.0:3 wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) >=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=Firefox Web Browser
+EAPI=6
+HOMEPAGE=https://www.mozilla.com/firefox
+IUSE=bindist eme-free geckodriver +gmp-autoupdate hardened hwaccel jack +screenshot selinux test custom-cflags custom-optimization clang dbus debug neon pulseaudio selinux startup-notification system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx wifi l10n_ach l10n_af l10n_an l10n_ar l10n_as l10n_ast l10n_az l10n_bg l10n_bn-BD l10n_bn-IN l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-GB l10n_en-ZA l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mai l10n_mk l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_or l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
+KEYWORDS=amd64 x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=system-icu? ( >=dev-libs/icu-60.2 ) jack? ( virtual/jack ) >=dev-libs/nss-3.36.4 >=dev-libs/nspr-4.19 selinux? ( sec-policy/selinux-mozilla ) >=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/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-icu? ( >=dev-libs/icu-59.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) >=x11-libs/gtk+-3.4.0:3 wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
+RESTRICT=!bindist? ( bindist )
+SLOT=0
+SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/ach.xpi -> firefox-60.2.2esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/af.xpi -> firefox-60.2.2esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/an.xpi -> firefox-60.2.2esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/ar.xpi -> firefox-60.2.2esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/as.xpi -> firefox-60.2.2esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/ast.xpi -> firefox-60.2.2esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/az.xpi -> firefox-60.2.2esr-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/bg.xpi -> firefox-60.2.2esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/bn-BD.xpi -> firefox-60.2.2esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/bn-IN.xpi -> firefox-60.2.2esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/br.xpi -> firefox-60.2.2esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/bs.xpi -> firefox-60.2.2esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/ca.xpi -> firefox-60.2.2esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/cak.xpi -> firefox-60.2.2esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/cs.xpi -> firefox-60.2.2esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/cy.xpi -> firefox-60.2.2esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/da.xpi -> firefox-60.2.2esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/de.xpi -> firefox-60.2.2esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/dsb.xpi -> firefox-60.2.2esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/el.xpi -> firefox-60.2.2esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/en-GB.xpi -> firefox-60.2.2esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/en-ZA.xpi -> firefox-60.2.2esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/eo.xpi -> firefox-60.2.2esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/es-AR.xpi -> firefox-60.2.2esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/es-CL.xpi -> firefox-60.2.2esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/es-ES.xpi -> firefox-60.2.2esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/es-MX.xpi -> firefox-60.2.2esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/et.xpi -> firefox-60.2.2esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/eu.xpi -> firefox-60.2.2esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/fa.xpi -> firefox-60.2.2esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/ff.xpi -> firefox-60.2.2esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/fi.xpi -> firefox-60.2.2esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/fr.xpi -> firefox-60.2.2esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/fy-NL.xpi -> firefox-60.2.2esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/ga-IE.xpi -> firefox-60.2.2esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/gd.xpi -> firefox-60.2.2esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/gl.xpi -> firefox-60.2.2esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/gn.xpi -> firefox-60.2.2esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/gu-IN.xpi -> firefox-60.2.2esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/he.xpi -> firefox-60.2.2esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/hi-IN.xpi -> firefox-60.2.2esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/hr.xpi -> firefox-60.2.2esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/hsb.xpi -> firefox-60.2.2esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/hu.xpi -> firefox-60.2.2esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/hy-AM.xpi -> firefox-60.2.2esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/id.xpi -> firefox-60.2.2esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/is.xpi -> firefox-60.2.2esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/it.xpi -> firefox-60.2.2esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/ja.xpi -> firefox-60.2.2esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/ka.xpi -> firefox-60.2.2esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/kab.xpi -> firefox-60.2.2esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/kk.xpi -> firefox-60.2.2esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/km.xpi -> firefox-60.2.2esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/kn.xpi -> firefox-60.2.2esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/ko.xpi -> firefox-60.2.2esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/lij.xpi -> firefox-60.2.2esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/lt.xpi -> firefox-60.2.2esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/lv.xpi -> firefox-60.2.2esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/mai.xpi -> firefox-60.2.2esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/mk.xpi -> firefox-60.2.2esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/ml.xpi -> firefox-60.2.2esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/mr.xpi -> firefox-60.2.2esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/ms.xpi -> firefox-60.2.2esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/nb-NO.xpi -> firefox-60.2.2esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/nl.xpi -> firefox-60.2.2esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/nn-NO.xpi -> firefox-60.2.2esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/or.xpi -> firefox-60.2.2esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/pa-IN.xpi -> firefox-60.2.2esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/pl.xpi -> firefox-60.2.2esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/pt-BR.xpi -> firefox-60.2.2esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/pt-PT.xpi -> firefox-60.2.2esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/rm.xpi -> firefox-60.2.2esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/ro.xpi -> firefox-60.2.2esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/ru.xpi -> firefox-60.2.2esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/si.xpi -> firefox-60.2.2esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/sk.xpi -> firefox-60.2.2esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/sl.xpi -> firefox-60.2.2esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/son.xpi -> firefox-60.2.2esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/sq.xpi -> firefox-60.2.2esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/sr.xpi -> firefox-60.2.2esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/sv-SE.xpi -> firefox-60.2.2esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/ta.xpi -> firefox-60.2.2esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/te.xpi -> firefox-60.2.2esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/th.xpi -> firefox-60.2.2esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/tr.xpi -> firefox-60.2.2esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/uk.xpi -> firefox-60.2.2esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/uz.xpi -> firefox-60.2.2esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/vi.xpi -> firefox-60.2.2esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/xh.xpi -> firefox-60.2.2esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/zh-CN.xpi -> firefox-60.2.2esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/linux-i686/xpi/zh-TW.xpi -> firefox-60.2.2esr-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/60.2.2esr/source/firefox-60.2.2esr.source.tar.xz https://dev.gentoo.org/~whissi/dist/firefox/firefox-60.0-patches-03.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-60.0-patches-03.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-60.0-patches-03.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	mozconfig-v6.60	b0c9597a272886ddb9681889887b2322	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_=bbb09c685f4d86131b8bc7740c58cf56
diff --git a/metadata/md5-cache/www-client/firefox-62.0-r1 b/metadata/md5-cache/www-client/firefox-62.0-r1
deleted file mode 100644
index 7d0c0089cfbd..000000000000
--- a/metadata/md5-cache/www-client/firefox-62.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.38 >=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-icu? ( >=dev-libs/icu-60.2:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.24.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) app-arch/zip app-arch/unzip >=sys-devel/binutils-2.16.1 sys-apps/findutils pulseaudio? ( media-sound/pulseaudio ) elibc_glibc? ( || ( ( >=dev-lang/rust-1.24.0[-extended(-)] >=dev-util/cargo-0.25.0 ) >=dev-lang/rust-1.24.0[extended] ( >=dev-lang/rust-bin-1.24.0 >=dev-util/cargo-0.25.0 ) ) ) elibc_musl? ( || ( >=dev-lang/rust-1.24.0 >=dev-util/cargo-0.25.0 ) ) >=sys-devel/llvm-4.0.1 >=sys-devel/clang-4.0.1 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=Firefox Web Browser
-EAPI=6
-HOMEPAGE=https://www.mozilla.com/firefox
-IUSE=bindist dbus debug eme-free +gmp-autoupdate hardened hwaccel jack neon pulseaudio +screenshot selinux startup-notification system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx test wifi custom-cflags custom-optimization l10n_ach l10n_af l10n_an l10n_ar l10n_as l10n_ast l10n_az l10n_bg l10n_bn-BD l10n_bn-IN l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-GB l10n_en-ZA l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mai l10n_mk l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_or l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
-KEYWORDS=~amd64 ~x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/nss-3.38 >=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-icu? ( >=dev-libs/icu-60.2:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.24.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) jack? ( virtual/jack ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
-REQUIRED_USE=wifi? ( dbus )
-RESTRICT=!bindist? ( bindist )
-SLOT=0
-SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/ach.xpi -> firefox-62.0-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/af.xpi -> firefox-62.0-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/an.xpi -> firefox-62.0-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/ar.xpi -> firefox-62.0-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/as.xpi -> firefox-62.0-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/ast.xpi -> firefox-62.0-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/az.xpi -> firefox-62.0-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/bg.xpi -> firefox-62.0-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/bn-BD.xpi -> firefox-62.0-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/bn-IN.xpi -> firefox-62.0-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/br.xpi -> firefox-62.0-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/bs.xpi -> firefox-62.0-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/ca.xpi -> firefox-62.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/cak.xpi -> firefox-62.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/cs.xpi -> firefox-62.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/cy.xpi -> firefox-62.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/da.xpi -> firefox-62.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/de.xpi -> firefox-62.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/dsb.xpi -> firefox-62.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/el.xpi -> firefox-62.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/en-GB.xpi -> firefox-62.0-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/en-ZA.xpi -> firefox-62.0-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/eo.xpi -> firefox-62.0-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/es-AR.xpi -> firefox-62.0-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/es-CL.xpi -> firefox-62.0-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/es-ES.xpi -> firefox-62.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/es-MX.xpi -> firefox-62.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/et.xpi -> firefox-62.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/eu.xpi -> firefox-62.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/fa.xpi -> firefox-62.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/ff.xpi -> firefox-62.0-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/fi.xpi -> firefox-62.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/fr.xpi -> firefox-62.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/fy-NL.xpi -> firefox-62.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/ga-IE.xpi -> firefox-62.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/gd.xpi -> firefox-62.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/gl.xpi -> firefox-62.0-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/gn.xpi -> firefox-62.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/gu-IN.xpi -> firefox-62.0-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/he.xpi -> firefox-62.0-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/hi-IN.xpi -> firefox-62.0-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/hr.xpi -> firefox-62.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/hsb.xpi -> firefox-62.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/hu.xpi -> firefox-62.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/hy-AM.xpi -> firefox-62.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/id.xpi -> firefox-62.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/is.xpi -> firefox-62.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/it.xpi -> firefox-62.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/ja.xpi -> firefox-62.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/ka.xpi -> firefox-62.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/kab.xpi -> firefox-62.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/kk.xpi -> firefox-62.0-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/km.xpi -> firefox-62.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/kn.xpi -> firefox-62.0-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/ko.xpi -> firefox-62.0-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/lij.xpi -> firefox-62.0-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/lt.xpi -> firefox-62.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/lv.xpi -> firefox-62.0-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/mai.xpi -> firefox-62.0-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/mk.xpi -> firefox-62.0-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/ml.xpi -> firefox-62.0-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/mr.xpi -> firefox-62.0-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/ms.xpi -> firefox-62.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/nb-NO.xpi -> firefox-62.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/nl.xpi -> firefox-62.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/nn-NO.xpi -> firefox-62.0-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/or.xpi -> firefox-62.0-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/pa-IN.xpi -> firefox-62.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/pl.xpi -> firefox-62.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/pt-BR.xpi -> firefox-62.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/pt-PT.xpi -> firefox-62.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/rm.xpi -> firefox-62.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/ro.xpi -> firefox-62.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/ru.xpi -> firefox-62.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/si.xpi -> firefox-62.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/sk.xpi -> firefox-62.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/sl.xpi -> firefox-62.0-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/son.xpi -> firefox-62.0-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/sq.xpi -> firefox-62.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/sr.xpi -> firefox-62.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/sv-SE.xpi -> firefox-62.0-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/ta.xpi -> firefox-62.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/te.xpi -> firefox-62.0-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/th.xpi -> firefox-62.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/tr.xpi -> firefox-62.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/uk.xpi -> firefox-62.0-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/uz.xpi -> firefox-62.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/vi.xpi -> firefox-62.0-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/xh.xpi -> firefox-62.0-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/zh-CN.xpi -> firefox-62.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xpi/zh-TW.xpi -> firefox-62.0-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/62.0/source/firefox-62.0.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	662b7375d13187b558bd09ba79c2b621	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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=821aa3754add35b1b2487f22257ebea8
diff --git a/metadata/md5-cache/www-client/firefox-62.0.2 b/metadata/md5-cache/www-client/firefox-62.0.2
deleted file mode 100644
index e9f8db1144b8..000000000000
--- a/metadata/md5-cache/www-client/firefox-62.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.38 >=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-icu? ( >=dev-libs/icu-60.2:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.24.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) 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=Firefox Web Browser
-EAPI=6
-HOMEPAGE=https://www.mozilla.com/firefox
-IUSE=bindist clang dbus debug eme-free geckodriver +gmp-autoupdate hardened hwaccel jack lto neon pulseaudio +screenshot selinux startup-notification system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx test wifi custom-cflags custom-optimization l10n_ach l10n_af l10n_an l10n_ar l10n_as l10n_ast l10n_az l10n_bg l10n_bn-BD l10n_bn-IN l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-GB l10n_en-ZA l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mai l10n_mk l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_or l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
-KEYWORDS=~amd64 ~x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/nss-3.38 >=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-icu? ( >=dev-libs/icu-60.2:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.24.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) jack? ( virtual/jack ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
-REQUIRED_USE=wifi? ( dbus )
-RESTRICT=!bindist? ( bindist )
-SLOT=0
-SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/ach.xpi -> firefox-62.0.2-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/af.xpi -> firefox-62.0.2-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/an.xpi -> firefox-62.0.2-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/ar.xpi -> firefox-62.0.2-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/as.xpi -> firefox-62.0.2-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/ast.xpi -> firefox-62.0.2-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/az.xpi -> firefox-62.0.2-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/bg.xpi -> firefox-62.0.2-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/bn-BD.xpi -> firefox-62.0.2-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/bn-IN.xpi -> firefox-62.0.2-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/br.xpi -> firefox-62.0.2-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/bs.xpi -> firefox-62.0.2-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/ca.xpi -> firefox-62.0.2-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/cak.xpi -> firefox-62.0.2-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/cs.xpi -> firefox-62.0.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/cy.xpi -> firefox-62.0.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/da.xpi -> firefox-62.0.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/de.xpi -> firefox-62.0.2-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/dsb.xpi -> firefox-62.0.2-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/el.xpi -> firefox-62.0.2-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/en-GB.xpi -> firefox-62.0.2-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/en-ZA.xpi -> firefox-62.0.2-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/eo.xpi -> firefox-62.0.2-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/es-AR.xpi -> firefox-62.0.2-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/es-CL.xpi -> firefox-62.0.2-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/es-ES.xpi -> firefox-62.0.2-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/es-MX.xpi -> firefox-62.0.2-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/et.xpi -> firefox-62.0.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/eu.xpi -> firefox-62.0.2-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/fa.xpi -> firefox-62.0.2-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/ff.xpi -> firefox-62.0.2-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/fi.xpi -> firefox-62.0.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/fr.xpi -> firefox-62.0.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/fy-NL.xpi -> firefox-62.0.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/ga-IE.xpi -> firefox-62.0.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/gd.xpi -> firefox-62.0.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/gl.xpi -> firefox-62.0.2-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/gn.xpi -> firefox-62.0.2-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/gu-IN.xpi -> firefox-62.0.2-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/he.xpi -> firefox-62.0.2-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/hi-IN.xpi -> firefox-62.0.2-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/hr.xpi -> firefox-62.0.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/hsb.xpi -> firefox-62.0.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/hu.xpi -> firefox-62.0.2-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/hy-AM.xpi -> firefox-62.0.2-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/id.xpi -> firefox-62.0.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/is.xpi -> firefox-62.0.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/it.xpi -> firefox-62.0.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/ja.xpi -> firefox-62.0.2-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/ka.xpi -> firefox-62.0.2-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/kab.xpi -> firefox-62.0.2-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/kk.xpi -> firefox-62.0.2-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/km.xpi -> firefox-62.0.2-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/kn.xpi -> firefox-62.0.2-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/ko.xpi -> firefox-62.0.2-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/lij.xpi -> firefox-62.0.2-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/lt.xpi -> firefox-62.0.2-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/lv.xpi -> firefox-62.0.2-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/mai.xpi -> firefox-62.0.2-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/mk.xpi -> firefox-62.0.2-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/ml.xpi -> firefox-62.0.2-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/mr.xpi -> firefox-62.0.2-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/ms.xpi -> firefox-62.0.2-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/nb-NO.xpi -> firefox-62.0.2-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/nl.xpi -> firefox-62.0.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/nn-NO.xpi -> firefox-62.0.2-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/or.xpi -> firefox-62.0.2-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/pa-IN.xpi -> firefox-62.0.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/pl.xpi -> firefox-62.0.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/pt-BR.xpi -> firefox-62.0.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/pt-PT.xpi -> firefox-62.0.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/rm.xpi -> firefox-62.0.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/ro.xpi -> firefox-62.0.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/ru.xpi -> firefox-62.0.2-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/si.xpi -> firefox-62.0.2-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/sk.xpi -> firefox-62.0.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/sl.xpi -> firefox-62.0.2-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/son.xpi -> firefox-62.0.2-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/sq.xpi -> firefox-62.0.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/sr.xpi -> firefox-62.0.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/sv-SE.xpi -> firefox-62.0.2-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/ta.xpi -> firefox-62.0.2-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/te.xpi -> firefox-62.0.2-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/th.xpi -> firefox-62.0.2-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/tr.xpi -> firefox-62.0.2-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/uk.xpi -> firefox-62.0.2-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/uz.xpi -> firefox-62.0.2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/vi.xpi -> firefox-62.0.2-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/xh.xpi -> firefox-62.0.2-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/zh-CN.xpi -> firefox-62.0.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xpi/zh-TW.xpi -> firefox-62.0.2-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/62.0.2/source/firefox-62.0.2.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	662b7375d13187b558bd09ba79c2b621	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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=3a78807da01e40dbb31015af4d1bdf59
diff --git a/metadata/md5-cache/www-client/firefox-62.0.3 b/metadata/md5-cache/www-client/firefox-62.0.3
new file mode 100644
index 000000000000..db207aea219d
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-62.0.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=>=dev-libs/nss-3.38 >=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-icu? ( >=dev-libs/icu-60.2:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.24.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) 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=Firefox Web Browser
+EAPI=6
+HOMEPAGE=https://www.mozilla.com/firefox
+IUSE=bindist clang dbus debug eme-free geckodriver +gmp-autoupdate hardened hwaccel jack lto neon pulseaudio +screenshot selinux startup-notification system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx test wifi custom-cflags custom-optimization l10n_ach l10n_af l10n_an l10n_ar l10n_as l10n_ast l10n_az l10n_bg l10n_bn-BD l10n_bn-IN l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-GB l10n_en-ZA l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mai l10n_mk l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_or l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
+KEYWORDS=~amd64 ~x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/nss-3.38 >=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-icu? ( >=dev-libs/icu-60.2:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.24.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) jack? ( virtual/jack ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
+REQUIRED_USE=wifi? ( dbus )
+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
diff --git a/metadata/md5-cache/www-client/firefox-bin-52.9.0 b/metadata/md5-cache/www-client/firefox-bin-52.9.0
index 1a756b220913..9442958e9fd7 100644
--- a/metadata/md5-cache/www-client/firefox-bin-52.9.0
+++ b/metadata/md5-cache/www-client/firefox-bin-52.9.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/g
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/ach.xpi -> firefox-52.9.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/af.xpi -> firefox-52.9.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/an.xpi -> firefox-52.9.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/ar.xpi -> firefox-52.9.0esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/as.xpi -> firefox-52.9.0esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/ast.xpi -> firefox-52.9.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/az.xpi -> firefox-52.9.0esr-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/bg.xpi -> firefox-52.9.0esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/bn-BD.xpi -> firefox-52.9.0esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/bn-IN.xpi -> firefox-52.9.0esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/br.xpi -> firefox-52.9.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/bs.xpi -> firefox-52.9.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/ca.xpi -> firefox-52.9.0esr-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/cs.xpi -> firefox-52.9.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/cy.xpi -> firefox-52.9.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/da.xpi -> firefox-52.9.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/de.xpi -> firefox-52.9.0esr-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/el.xpi -> firefox-52.9.0esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/en-GB.xpi -> firefox-52.9.0esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/en-ZA.xpi -> firefox-52.9.0esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/eo.xpi -> firefox-52.9.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/es-AR.xpi -> firefox-52.9.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/es-CL.xpi -> firefox-52.9.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/es-ES.xpi -> firefox-52.9.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/es-MX.xpi -> firefox-52.9.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/et.xpi -> firefox-52.9.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/eu.xpi -> firefox-52.9.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/fa.xpi -> firefox-52.9.0esr-fa.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/fi.xpi -> firefox-52.9.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/fr.xpi -> firefox-52.9.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/fy-NL.xpi -> firefox-52.9.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/ga-IE.xpi -> firefox-52.9.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/gd.xpi -> firefox-52.9.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/gl.xpi -> firefox-52.9.0esr-gl.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/gu-IN.xpi -> firefox-52.9.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/he.xpi -> firefox-52.9.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/hi-IN.xpi -> firefox-52.9.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/hr.xpi -> firefox-52.9.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/hsb.xpi -> firefox-52.9.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/hu.xpi -> firefox-52.9.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/hy-AM.xpi -> firefox-52.9.0esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/id.xpi -> firefox-52.9.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/is.xpi -> firefox-52.9.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/it.xpi -> firefox-52.9.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/ja.xpi -> firefox-52.9.0esr-ja.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/kk.xpi -> firefox-52.9.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/km.xpi -> firefox-52.9.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/kn.xpi -> firefox-52.9.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/ko.xpi -> firefox-52.9.0esr-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/lt.xpi -> firefox-52.9.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/lv.xpi -> firefox-52.9.0esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/mai.xpi -> firefox-52.9.0esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/mk.xpi -> firefox-52.9.0esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/ml.xpi -> firefox-52.9.0esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/mr.xpi -> firefox-52.9.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/ms.xpi -> firefox-52.9.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/nb-NO.xpi -> firefox-52.9.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/nl.xpi -> firefox-52.9.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/nn-NO.xpi -> firefox-52.9.0esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/or.xpi -> firefox-52.9.0esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/pa-IN.xpi -> firefox-52.9.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/pl.xpi -> firefox-52.9.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/pt-BR.xpi -> firefox-52.9.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/pt-PT.xpi -> firefox-52.9.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/rm.xpi -> firefox-52.9.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/ro.xpi -> firefox-52.9.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/ru.xpi -> firefox-52.9.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/si.xpi -> firefox-52.9.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/sk.xpi -> firefox-52.9.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/sl.xpi -> firefox-52.9.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/son.xpi -> firefox-52.9.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/sq.xpi -> firefox-52.9.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/sr.xpi -> firefox-52.9.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/sv-SE.xpi -> firefox-52.9.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/ta.xpi -> firefox-52.9.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/te.xpi -> firefox-52.9.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/th.xpi -> firefox-52.9.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/tr.xpi -> firefox-52.9.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/uk.xpi -> firefox-52.9.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/uz.xpi -> firefox-52.9.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/vi.xpi -> firefox-52.9.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/xh.xpi -> firefox-52.9.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/zh-CN.xpi -> firefox-52.9.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//52.9.0esr/linux-i686/xpi/zh-TW.xpi -> firefox-52.9.0esr-zh-TW.xpi ) amd64? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/52.9.0esr/linux-x86_64/en-US/firefox-52.9.0esr.tar.bz2 -> firefox-bin_x86_64-52.9.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/52.9.0esr/linux-i686/en-US/firefox-52.9.0esr.tar.bz2 -> firefox-bin_i686-52.9.0.tar.bz2 )
-_eclasses_=desktop	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0d5b5562c5b6cf22fbd4e0164b24b05e
diff --git a/metadata/md5-cache/www-client/firefox-bin-60.2.1 b/metadata/md5-cache/www-client/firefox-bin-60.2.1
deleted file mode 100644
index 5e1790f75795..000000000000
--- a/metadata/md5-cache/www-client/firefox-bin-60.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=app-arch/unzip >=sys-apps/sed-4 app-arch/unzip
-DESCRIPTION=Firefox Web Browser
-EAPI=6
-HOMEPAGE=https://www.mozilla.org/en-US/firefox/
-IUSE=+ffmpeg +pulseaudio selinux startup-notification l10n_ach l10n_af l10n_an l10n_ar l10n_as l10n_ast l10n_az l10n_bg l10n_bn-BD l10n_bn-IN l10n_br l10n_bs l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_en-ZA l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_kk l10n_km l10n_kn l10n_ko l10n_lt l10n_lv l10n_mai l10n_mk l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_or l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
-KEYWORDS=-* amd64 x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/glib-2.26:2 media-libs/fontconfig >=media-libs/freetype-2.4.10 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 virtual/freedesktop-icon-theme pulseaudio? ( !<media-sound/apulse-0.1.9 || ( media-sound/pulseaudio media-sound/apulse ) ) ffmpeg? ( media-video/ffmpeg ) selinux? ( sec-policy/selinux-mozilla )
-RESTRICT=strip mirror
-SLOT=0
-SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/ach.xpi -> firefox-60.2.1esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/af.xpi -> firefox-60.2.1esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/an.xpi -> firefox-60.2.1esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/ar.xpi -> firefox-60.2.1esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/as.xpi -> firefox-60.2.1esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/ast.xpi -> firefox-60.2.1esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/az.xpi -> firefox-60.2.1esr-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/bg.xpi -> firefox-60.2.1esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/bn-BD.xpi -> firefox-60.2.1esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/bn-IN.xpi -> firefox-60.2.1esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/br.xpi -> firefox-60.2.1esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/bs.xpi -> firefox-60.2.1esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/ca.xpi -> firefox-60.2.1esr-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/cs.xpi -> firefox-60.2.1esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/cy.xpi -> firefox-60.2.1esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/da.xpi -> firefox-60.2.1esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/de.xpi -> firefox-60.2.1esr-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/el.xpi -> firefox-60.2.1esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/en-GB.xpi -> firefox-60.2.1esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/en-ZA.xpi -> firefox-60.2.1esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/eo.xpi -> firefox-60.2.1esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/es-AR.xpi -> firefox-60.2.1esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/es-CL.xpi -> firefox-60.2.1esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/es-ES.xpi -> firefox-60.2.1esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/es-MX.xpi -> firefox-60.2.1esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/et.xpi -> firefox-60.2.1esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/eu.xpi -> firefox-60.2.1esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/fa.xpi -> firefox-60.2.1esr-fa.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/fi.xpi -> firefox-60.2.1esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/fr.xpi -> firefox-60.2.1esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/fy-NL.xpi -> firefox-60.2.1esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/ga-IE.xpi -> firefox-60.2.1esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/gd.xpi -> firefox-60.2.1esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/gl.xpi -> firefox-60.2.1esr-gl.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/gu-IN.xpi -> firefox-60.2.1esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/he.xpi -> firefox-60.2.1esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/hi-IN.xpi -> firefox-60.2.1esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/hr.xpi -> firefox-60.2.1esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/hsb.xpi -> firefox-60.2.1esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/hu.xpi -> firefox-60.2.1esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/hy-AM.xpi -> firefox-60.2.1esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/id.xpi -> firefox-60.2.1esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/is.xpi -> firefox-60.2.1esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/it.xpi -> firefox-60.2.1esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/ja.xpi -> firefox-60.2.1esr-ja.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/kk.xpi -> firefox-60.2.1esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/km.xpi -> firefox-60.2.1esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/kn.xpi -> firefox-60.2.1esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/ko.xpi -> firefox-60.2.1esr-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/lt.xpi -> firefox-60.2.1esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/lv.xpi -> firefox-60.2.1esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/mai.xpi -> firefox-60.2.1esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/mk.xpi -> firefox-60.2.1esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/ml.xpi -> firefox-60.2.1esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/mr.xpi -> firefox-60.2.1esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/ms.xpi -> firefox-60.2.1esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/nb-NO.xpi -> firefox-60.2.1esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/nl.xpi -> firefox-60.2.1esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/nn-NO.xpi -> firefox-60.2.1esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/or.xpi -> firefox-60.2.1esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/pa-IN.xpi -> firefox-60.2.1esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/pl.xpi -> firefox-60.2.1esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/pt-BR.xpi -> firefox-60.2.1esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/pt-PT.xpi -> firefox-60.2.1esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/rm.xpi -> firefox-60.2.1esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/ro.xpi -> firefox-60.2.1esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/ru.xpi -> firefox-60.2.1esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/si.xpi -> firefox-60.2.1esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/sk.xpi -> firefox-60.2.1esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/sl.xpi -> firefox-60.2.1esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/son.xpi -> firefox-60.2.1esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/sq.xpi -> firefox-60.2.1esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/sr.xpi -> firefox-60.2.1esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/sv-SE.xpi -> firefox-60.2.1esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/ta.xpi -> firefox-60.2.1esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/te.xpi -> firefox-60.2.1esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/th.xpi -> firefox-60.2.1esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/tr.xpi -> firefox-60.2.1esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/uk.xpi -> firefox-60.2.1esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/uz.xpi -> firefox-60.2.1esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/vi.xpi -> firefox-60.2.1esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/xh.xpi -> firefox-60.2.1esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/zh-CN.xpi -> firefox-60.2.1esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.1esr/linux-i686/xpi/zh-TW.xpi -> firefox-60.2.1esr-zh-TW.xpi ) amd64? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/60.2.1esr/linux-x86_64/en-US/firefox-60.2.1esr.tar.bz2 -> firefox-bin_x86_64-60.2.1.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/60.2.1esr/linux-i686/en-US/firefox-60.2.1esr.tar.bz2 -> firefox-bin_i686-60.2.1.tar.bz2 )
-_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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=5654d31601d7f1a4bdef5680d786b1e2
diff --git a/metadata/md5-cache/www-client/firefox-bin-60.2.2 b/metadata/md5-cache/www-client/firefox-bin-60.2.2
new file mode 100644
index 000000000000..552ac48bfe1c
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-bin-60.2.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst unpack
+DEPEND=app-arch/unzip >=sys-apps/sed-4 app-arch/unzip
+DESCRIPTION=Firefox Web Browser
+EAPI=6
+HOMEPAGE=https://www.mozilla.org/en-US/firefox/
+IUSE=+ffmpeg +pulseaudio selinux startup-notification l10n_ach l10n_af l10n_an l10n_ar l10n_as l10n_ast l10n_az l10n_bg l10n_bn-BD l10n_bn-IN l10n_br l10n_bs l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_en-ZA l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_kk l10n_km l10n_kn l10n_ko l10n_lt l10n_lv l10n_mai l10n_mk l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_or l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
+KEYWORDS=-* amd64 x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/glib-2.26:2 media-libs/fontconfig >=media-libs/freetype-2.4.10 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 virtual/freedesktop-icon-theme pulseaudio? ( !<media-sound/apulse-0.1.9 || ( media-sound/pulseaudio media-sound/apulse ) ) ffmpeg? ( media-video/ffmpeg ) selinux? ( sec-policy/selinux-mozilla )
+RESTRICT=strip mirror
+SLOT=0
+SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/ach.xpi -> firefox-60.2.2esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/af.xpi -> firefox-60.2.2esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/an.xpi -> firefox-60.2.2esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/ar.xpi -> firefox-60.2.2esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/as.xpi -> firefox-60.2.2esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/ast.xpi -> firefox-60.2.2esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/az.xpi -> firefox-60.2.2esr-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/bg.xpi -> firefox-60.2.2esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/bn-BD.xpi -> firefox-60.2.2esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/bn-IN.xpi -> firefox-60.2.2esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/br.xpi -> firefox-60.2.2esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/bs.xpi -> firefox-60.2.2esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/ca.xpi -> firefox-60.2.2esr-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/cs.xpi -> firefox-60.2.2esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/cy.xpi -> firefox-60.2.2esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/da.xpi -> firefox-60.2.2esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/de.xpi -> firefox-60.2.2esr-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/el.xpi -> firefox-60.2.2esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/en-GB.xpi -> firefox-60.2.2esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/en-ZA.xpi -> firefox-60.2.2esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/eo.xpi -> firefox-60.2.2esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/es-AR.xpi -> firefox-60.2.2esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/es-CL.xpi -> firefox-60.2.2esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/es-ES.xpi -> firefox-60.2.2esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/es-MX.xpi -> firefox-60.2.2esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/et.xpi -> firefox-60.2.2esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/eu.xpi -> firefox-60.2.2esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/fa.xpi -> firefox-60.2.2esr-fa.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/fi.xpi -> firefox-60.2.2esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/fr.xpi -> firefox-60.2.2esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/fy-NL.xpi -> firefox-60.2.2esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/ga-IE.xpi -> firefox-60.2.2esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/gd.xpi -> firefox-60.2.2esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/gl.xpi -> firefox-60.2.2esr-gl.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/gu-IN.xpi -> firefox-60.2.2esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/he.xpi -> firefox-60.2.2esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/hi-IN.xpi -> firefox-60.2.2esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/hr.xpi -> firefox-60.2.2esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/hsb.xpi -> firefox-60.2.2esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/hu.xpi -> firefox-60.2.2esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/hy-AM.xpi -> firefox-60.2.2esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/id.xpi -> firefox-60.2.2esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/is.xpi -> firefox-60.2.2esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/it.xpi -> firefox-60.2.2esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/ja.xpi -> firefox-60.2.2esr-ja.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/kk.xpi -> firefox-60.2.2esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/km.xpi -> firefox-60.2.2esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/kn.xpi -> firefox-60.2.2esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/ko.xpi -> firefox-60.2.2esr-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/lt.xpi -> firefox-60.2.2esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/lv.xpi -> firefox-60.2.2esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/mai.xpi -> firefox-60.2.2esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/mk.xpi -> firefox-60.2.2esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/ml.xpi -> firefox-60.2.2esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/mr.xpi -> firefox-60.2.2esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/ms.xpi -> firefox-60.2.2esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/nb-NO.xpi -> firefox-60.2.2esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/nl.xpi -> firefox-60.2.2esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/nn-NO.xpi -> firefox-60.2.2esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/or.xpi -> firefox-60.2.2esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/pa-IN.xpi -> firefox-60.2.2esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/pl.xpi -> firefox-60.2.2esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/pt-BR.xpi -> firefox-60.2.2esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/pt-PT.xpi -> firefox-60.2.2esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/rm.xpi -> firefox-60.2.2esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/ro.xpi -> firefox-60.2.2esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/ru.xpi -> firefox-60.2.2esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/si.xpi -> firefox-60.2.2esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/sk.xpi -> firefox-60.2.2esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/sl.xpi -> firefox-60.2.2esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/son.xpi -> firefox-60.2.2esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/sq.xpi -> firefox-60.2.2esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/sr.xpi -> firefox-60.2.2esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/sv-SE.xpi -> firefox-60.2.2esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/ta.xpi -> firefox-60.2.2esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/te.xpi -> firefox-60.2.2esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/th.xpi -> firefox-60.2.2esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/tr.xpi -> firefox-60.2.2esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/uk.xpi -> firefox-60.2.2esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/uz.xpi -> firefox-60.2.2esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/vi.xpi -> firefox-60.2.2esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/xh.xpi -> firefox-60.2.2esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/zh-CN.xpi -> firefox-60.2.2esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.2.2esr/linux-i686/xpi/zh-TW.xpi -> firefox-60.2.2esr-zh-TW.xpi ) amd64? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/60.2.2esr/linux-x86_64/en-US/firefox-60.2.2esr.tar.bz2 -> firefox-bin_x86_64-60.2.2.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/60.2.2esr/linux-i686/en-US/firefox-60.2.2esr.tar.bz2 -> firefox-bin_i686-60.2.2.tar.bz2 )
+_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_=96f8f63f1dbc28f86c83d35dc2df95d4
diff --git a/metadata/md5-cache/www-client/firefox-bin-62.0.2 b/metadata/md5-cache/www-client/firefox-bin-62.0.2
deleted file mode 100644
index 96237ab20264..000000000000
--- a/metadata/md5-cache/www-client/firefox-bin-62.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=app-arch/unzip >=sys-apps/sed-4 app-arch/unzip
-DESCRIPTION=Firefox Web Browser
-EAPI=6
-HOMEPAGE=https://www.mozilla.org/en-US/firefox/
-IUSE=+ffmpeg +pulseaudio selinux startup-notification l10n_ach l10n_af l10n_an l10n_ar l10n_as l10n_ast l10n_az l10n_bg l10n_bn-BD l10n_bn-IN l10n_br l10n_bs l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_en-ZA l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_kk l10n_km l10n_kn l10n_ko l10n_lt l10n_lv l10n_mai l10n_mk l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_or l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
-KEYWORDS=-* amd64 x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/glib-2.26:2 media-libs/fontconfig >=media-libs/freetype-2.4.10 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 virtual/freedesktop-icon-theme pulseaudio? ( !<media-sound/apulse-0.1.9 || ( media-sound/pulseaudio media-sound/apulse ) ) ffmpeg? ( media-video/ffmpeg ) selinux? ( sec-policy/selinux-mozilla )
-RESTRICT=strip mirror
-SLOT=0
-SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/ach.xpi -> firefox-62.0.2-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/af.xpi -> firefox-62.0.2-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/an.xpi -> firefox-62.0.2-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/ar.xpi -> firefox-62.0.2-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/as.xpi -> firefox-62.0.2-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/ast.xpi -> firefox-62.0.2-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/az.xpi -> firefox-62.0.2-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/bg.xpi -> firefox-62.0.2-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/bn-BD.xpi -> firefox-62.0.2-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/bn-IN.xpi -> firefox-62.0.2-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/br.xpi -> firefox-62.0.2-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/bs.xpi -> firefox-62.0.2-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/ca.xpi -> firefox-62.0.2-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/cs.xpi -> firefox-62.0.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/cy.xpi -> firefox-62.0.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/da.xpi -> firefox-62.0.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/de.xpi -> firefox-62.0.2-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/el.xpi -> firefox-62.0.2-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/en-GB.xpi -> firefox-62.0.2-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/en-ZA.xpi -> firefox-62.0.2-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/eo.xpi -> firefox-62.0.2-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/es-AR.xpi -> firefox-62.0.2-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/es-CL.xpi -> firefox-62.0.2-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/es-ES.xpi -> firefox-62.0.2-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/es-MX.xpi -> firefox-62.0.2-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/et.xpi -> firefox-62.0.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/eu.xpi -> firefox-62.0.2-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/fa.xpi -> firefox-62.0.2-fa.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/fi.xpi -> firefox-62.0.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/fr.xpi -> firefox-62.0.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/fy-NL.xpi -> firefox-62.0.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/ga-IE.xpi -> firefox-62.0.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/gd.xpi -> firefox-62.0.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/gl.xpi -> firefox-62.0.2-gl.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/gu-IN.xpi -> firefox-62.0.2-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/he.xpi -> firefox-62.0.2-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/hi-IN.xpi -> firefox-62.0.2-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/hr.xpi -> firefox-62.0.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/hsb.xpi -> firefox-62.0.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/hu.xpi -> firefox-62.0.2-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/hy-AM.xpi -> firefox-62.0.2-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/id.xpi -> firefox-62.0.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/is.xpi -> firefox-62.0.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/it.xpi -> firefox-62.0.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/ja.xpi -> firefox-62.0.2-ja.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/kk.xpi -> firefox-62.0.2-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/km.xpi -> firefox-62.0.2-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/kn.xpi -> firefox-62.0.2-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/ko.xpi -> firefox-62.0.2-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/lt.xpi -> firefox-62.0.2-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/lv.xpi -> firefox-62.0.2-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/mai.xpi -> firefox-62.0.2-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/mk.xpi -> firefox-62.0.2-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/ml.xpi -> firefox-62.0.2-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/mr.xpi -> firefox-62.0.2-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/ms.xpi -> firefox-62.0.2-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/nb-NO.xpi -> firefox-62.0.2-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/nl.xpi -> firefox-62.0.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/nn-NO.xpi -> firefox-62.0.2-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/or.xpi -> firefox-62.0.2-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/pa-IN.xpi -> firefox-62.0.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/pl.xpi -> firefox-62.0.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/pt-BR.xpi -> firefox-62.0.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/pt-PT.xpi -> firefox-62.0.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/rm.xpi -> firefox-62.0.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/ro.xpi -> firefox-62.0.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/ru.xpi -> firefox-62.0.2-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/si.xpi -> firefox-62.0.2-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/sk.xpi -> firefox-62.0.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/sl.xpi -> firefox-62.0.2-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/son.xpi -> firefox-62.0.2-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/sq.xpi -> firefox-62.0.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/sr.xpi -> firefox-62.0.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/sv-SE.xpi -> firefox-62.0.2-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/ta.xpi -> firefox-62.0.2-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/te.xpi -> firefox-62.0.2-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/th.xpi -> firefox-62.0.2-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/tr.xpi -> firefox-62.0.2-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/uk.xpi -> firefox-62.0.2-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/uz.xpi -> firefox-62.0.2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/vi.xpi -> firefox-62.0.2-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/xh.xpi -> firefox-62.0.2-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/zh-CN.xpi -> firefox-62.0.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.2/linux-i686/xpi/zh-TW.xpi -> firefox-62.0.2-zh-TW.xpi ) amd64? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/62.0.2/linux-x86_64/en-US/firefox-62.0.2.tar.bz2 -> firefox-bin_x86_64-62.0.2.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/62.0.2/linux-i686/en-US/firefox-62.0.2.tar.bz2 -> firefox-bin_i686-62.0.2.tar.bz2 )
-_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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=a2a33afb4ac0c4da32b3838fdf42cd49
diff --git a/metadata/md5-cache/www-client/firefox-bin-62.0.3 b/metadata/md5-cache/www-client/firefox-bin-62.0.3
new file mode 100644
index 000000000000..2f34dcf12ce5
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-bin-62.0.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst unpack
+DEPEND=app-arch/unzip >=sys-apps/sed-4 app-arch/unzip
+DESCRIPTION=Firefox Web Browser
+EAPI=6
+HOMEPAGE=https://www.mozilla.org/en-US/firefox/
+IUSE=+ffmpeg +pulseaudio selinux startup-notification l10n_ach l10n_af l10n_an l10n_ar l10n_as l10n_ast l10n_az l10n_bg l10n_bn-BD l10n_bn-IN l10n_br l10n_bs l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_en-ZA l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_kk l10n_km l10n_kn l10n_ko l10n_lt l10n_lv l10n_mai l10n_mk l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_or l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
+KEYWORDS=-* amd64 x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/glib-2.26:2 media-libs/fontconfig >=media-libs/freetype-2.4.10 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 virtual/freedesktop-icon-theme pulseaudio? ( !<media-sound/apulse-0.1.9 || ( media-sound/pulseaudio media-sound/apulse ) ) ffmpeg? ( media-video/ffmpeg ) selinux? ( sec-policy/selinux-mozilla )
+RESTRICT=strip mirror
+SLOT=0
+SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/ach.xpi -> firefox-62.0.3-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/af.xpi -> firefox-62.0.3-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/an.xpi -> firefox-62.0.3-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/ar.xpi -> firefox-62.0.3-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/as.xpi -> firefox-62.0.3-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/ast.xpi -> firefox-62.0.3-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/az.xpi -> firefox-62.0.3-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/bg.xpi -> firefox-62.0.3-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/mozilla.org/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/mozilla.org/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/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/br.xpi -> firefox-62.0.3-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/bs.xpi -> firefox-62.0.3-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/ca.xpi -> firefox-62.0.3-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/cs.xpi -> firefox-62.0.3-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/cy.xpi -> firefox-62.0.3-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/da.xpi -> firefox-62.0.3-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/de.xpi -> firefox-62.0.3-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/el.xpi -> firefox-62.0.3-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/mozilla.org/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/mozilla.org/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/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/eo.xpi -> firefox-62.0.3-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/mozilla.org/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/mozilla.org/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/mozilla.org/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/mozilla.org/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/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/et.xpi -> firefox-62.0.3-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/eu.xpi -> firefox-62.0.3-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/fa.xpi -> firefox-62.0.3-fa.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/fi.xpi -> firefox-62.0.3-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/fr.xpi -> firefox-62.0.3-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/mozilla.org/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/mozilla.org/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/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/gd.xpi -> firefox-62.0.3-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/gl.xpi -> firefox-62.0.3-gl.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/mozilla.org/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/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/he.xpi -> firefox-62.0.3-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/mozilla.org/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/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/hr.xpi -> firefox-62.0.3-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/hsb.xpi -> firefox-62.0.3-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/hu.xpi -> firefox-62.0.3-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/mozilla.org/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/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/id.xpi -> firefox-62.0.3-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/is.xpi -> firefox-62.0.3-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/it.xpi -> firefox-62.0.3-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/ja.xpi -> firefox-62.0.3-ja.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/kk.xpi -> firefox-62.0.3-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/km.xpi -> firefox-62.0.3-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/kn.xpi -> firefox-62.0.3-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/ko.xpi -> firefox-62.0.3-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/lt.xpi -> firefox-62.0.3-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/lv.xpi -> firefox-62.0.3-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/mai.xpi -> firefox-62.0.3-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/mk.xpi -> firefox-62.0.3-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/ml.xpi -> firefox-62.0.3-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/mr.xpi -> firefox-62.0.3-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/ms.xpi -> firefox-62.0.3-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/mozilla.org/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/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/nl.xpi -> firefox-62.0.3-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/mozilla.org/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/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/or.xpi -> firefox-62.0.3-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/mozilla.org/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/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/pl.xpi -> firefox-62.0.3-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/mozilla.org/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/mozilla.org/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/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/rm.xpi -> firefox-62.0.3-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/ro.xpi -> firefox-62.0.3-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/ru.xpi -> firefox-62.0.3-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/si.xpi -> firefox-62.0.3-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/sk.xpi -> firefox-62.0.3-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/sl.xpi -> firefox-62.0.3-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/son.xpi -> firefox-62.0.3-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/sq.xpi -> firefox-62.0.3-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/sr.xpi -> firefox-62.0.3-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/mozilla.org/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/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/ta.xpi -> firefox-62.0.3-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/te.xpi -> firefox-62.0.3-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/th.xpi -> firefox-62.0.3-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/tr.xpi -> firefox-62.0.3-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/uk.xpi -> firefox-62.0.3-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/uz.xpi -> firefox-62.0.3-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/vi.xpi -> firefox-62.0.3-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/xh.xpi -> firefox-62.0.3-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/mozilla.org/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/mozilla.org/firefox/releases//62.0.3/linux-i686/xpi/zh-TW.xpi -> firefox-62.0.3-zh-TW.xpi ) amd64? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/62.0.3/linux-x86_64/en-US/firefox-62.0.3.tar.bz2 -> firefox-bin_x86_64-62.0.3.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/62.0.3/linux-i686/en-US/firefox-62.0.3.tar.bz2 -> firefox-bin_i686-62.0.3.tar.bz2 )
+_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_=5b08550dbaa592be0b221e649ca4150f
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
index adea6c45694e..4a6e9df486f0 100644
--- a/metadata/md5-cache/www-client/google-chrome-69.0.3497.100
+++ b/metadata/md5-cache/www-client/google-chrome-69.0.3497.100
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_69.0.3497.100-1_amd64.deb
-_eclasses_=chromium-2	3d468f3fc7ed63c78db7408ea04246e3	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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-beta-70.0.3538.22 b/metadata/md5-cache/www-client/google-chrome-beta-70.0.3538.22
deleted file mode 100644
index 3e5730d10cd8..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-beta-70.0.3538.22
+++ /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.22-1_amd64.deb
-_eclasses_=chromium-2	3d468f3fc7ed63c78db7408ea04246e3	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=58ad026a395c6d0b8738f78a65f39f6a
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
new file mode 100644
index 000000000000..6789be71d818
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-beta-70.0.3538.35
@@ -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.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-unstable-71.0.3559.6 b/metadata/md5-cache/www-client/google-chrome-unstable-71.0.3559.6
index 98e63e5ec987..f92bedc47cd0 100644
--- 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
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_71.0.3559.6-1_amd64.deb
-_eclasses_=chromium-2	3d468f3fc7ed63c78db7408ea04246e3	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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/links-2.14-r1 b/metadata/md5-cache/www-client/links-2.14-r1
index 728fe31a4440..c062a7d5af26 100644
--- a/metadata/md5-cache/www-client/links-2.14-r1
+++ b/metadata/md5-cache/www-client/links-2.14-r1
@@ -10,5 +10,5 @@ RDEPEND=bzip2? ( app-arch/bzip2 ) fbcon? ( media-libs/libpng:0= ) gpm? ( sys-lib
 REQUIRED_USE=!livecd? ( fbcon? ( gpm ) ) svga? ( suid )
 SLOT=2
 SRC_URI=http://links.twibright.com/download/links-2.14.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=22193d06b6cbd0bc5e5a05f74fc5ac12
diff --git a/metadata/md5-cache/www-client/links-2.16 b/metadata/md5-cache/www-client/links-2.16
index b5b78f8de891..bf795dd78744 100644
--- a/metadata/md5-cache/www-client/links-2.16
+++ b/metadata/md5-cache/www-client/links-2.16
@@ -10,5 +10,5 @@ RDEPEND=bzip2? ( app-arch/bzip2 ) fbcon? ( media-libs/libpng:0= ) gpm? ( sys-lib
 REQUIRED_USE=!livecd? ( fbcon? ( gpm ) ) svga? ( suid )
 SLOT=2
 SRC_URI=http://links.twibright.com/download/links-2.16.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1554ec6e483e25d32dbeff477f96b49d
diff --git a/metadata/md5-cache/www-client/links-2.17 b/metadata/md5-cache/www-client/links-2.17
index 10fb1a2764ff..e90e80e836ec 100644
--- a/metadata/md5-cache/www-client/links-2.17
+++ b/metadata/md5-cache/www-client/links-2.17
@@ -10,5 +10,5 @@ RDEPEND=bzip2? ( app-arch/bzip2 ) fbcon? ( media-libs/libpng:0= ) gpm? ( sys-lib
 REQUIRED_USE=!livecd? ( fbcon? ( gpm ) ) svga? ( suid )
 SLOT=2
 SRC_URI=http://links.twibright.com/download/links-2.17.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1554ec6e483e25d32dbeff477f96b49d
diff --git a/metadata/md5-cache/www-client/midori-0.5.11-r2 b/metadata/md5-cache/www-client/midori-0.5.11-r2
index aadd57624a25..45a883e22730 100644
--- a/metadata/md5-cache/www-client/midori-0.5.11-r2
+++ b/metadata/md5-cache/www-client/midori-0.5.11-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 MIT
 RDEPEND=>=app-crypt/gcr-3:=[gtk] >=dev-db/sqlite-3.6.19:3 >=dev-libs/glib-2.32.3:2 dev-libs/libxml2 >=net-libs/libsoup-2.38:2.4 >=x11-libs/libnotify-0.7 >=x11-libs/gtk+-3.10.0:3 >=net-libs/webkit-gtk-2.3.91:4[jit=] granite? ( >=dev-libs/granite-0.2 ) xscreensaver? ( x11-libs/libX11 x11-libs/libXScrnSaver )
 SLOT=0
 SRC_URI=http://www.midori-browser.org/downloads/midori_0.5.11_all_.tar.bz2
-_eclasses_=cmake-utils	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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=43f9ec8687459909c0bce7ff00e1ee90
diff --git a/metadata/md5-cache/www-client/midori-0.5.11-r3 b/metadata/md5-cache/www-client/midori-0.5.11-r3
index fe7f6fb30b78..69e9df625de3 100644
--- a/metadata/md5-cache/www-client/midori-0.5.11-r3
+++ b/metadata/md5-cache/www-client/midori-0.5.11-r3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 MIT
 RDEPEND=>=app-crypt/gcr-3:=[gtk] >=dev-db/sqlite-3.6.19:3 >=dev-libs/glib-2.32.3:2 dev-libs/libxml2 >=net-libs/libsoup-2.38:2.4 >=x11-libs/libnotify-0.7 >=x11-libs/gtk+-3.10.0:3 >=net-libs/webkit-gtk-2.3.91:4[jit=] granite? ( >=dev-libs/granite-0.2 ) xscreensaver? ( x11-libs/libX11 x11-libs/libXScrnSaver )
 SLOT=0
 SRC_URI=http://www.midori-browser.org/downloads/midori_0.5.11_all_.tar.bz2
-_eclasses_=cmake-utils	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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=583ba0ae936f2a4532f3a555d38c1f20
diff --git a/metadata/md5-cache/www-client/opera-12.16_p1860-r1 b/metadata/md5-cache/www-client/opera-12.16_p1860-r1
index 1b0bf6153359..2c50477a81e5 100644
--- a/metadata/md5-cache/www-client/opera-12.16_p1860-r1
+++ b/metadata/md5-cache/www-client/opera-12.16_p1860-r1
@@ -9,5 +9,5 @@ LICENSE=OPERA-12 LGPL-2 LGPL-3
 RDEPEND=media-libs/fontconfig media-libs/freetype sys-libs/zlib virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt x11-misc/xdg-utils gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf gtk? ( x11-libs/gtk+:2 ) x11-libs/pango x11-libs/pixman )
 SLOT=0
 SRC_URI=amd64? ( mirror://opera/linux/1216/opera-12.16-1860.x86_64.linux.tar.xz ) amd64-fbsd? ( mirror://opera/unix/1216/opera-12.16-1860.amd64.freebsd.tar.xz ) x86? ( mirror://opera/linux/1216/opera-12.16-1860.i386.linux.tar.xz ) x86-fbsd? ( mirror://opera/unix/1216/opera-12.16-1860.i386.freebsd.tar.xz )
-_eclasses_=desktop	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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=be0c66071fc9a6720038844178c32412
diff --git a/metadata/md5-cache/www-client/opera-55.0.2994.61 b/metadata/md5-cache/www-client/opera-55.0.2994.61
deleted file mode 100644
index a26f0274d9c8..000000000000
--- a/metadata/md5-cache/www-client/opera-55.0.2994.61
+++ /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/55.0.2994.61/linux/opera-stable_55.0.2994.61_amd64.deb https://download2.operacdn.com/pub/opera/desktop/55.0.2994.61/linux/opera-stable_55.0.2994.61_amd64.deb https://download3.operacdn.com/pub/opera/desktop/55.0.2994.61/linux/opera-stable_55.0.2994.61_amd64.deb https://download4.operacdn.com/pub/opera/desktop/55.0.2994.61/linux/opera-stable_55.0.2994.61_amd64.deb
-_eclasses_=chromium-2	3d468f3fc7ed63c78db7408ea04246e3	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=d331450c1bd8fe3ef6bab2696ed91ad1
diff --git a/metadata/md5-cache/www-client/opera-56.0.3051.31 b/metadata/md5-cache/www-client/opera-56.0.3051.31
index c6d825f5fb80..a778b69fc638 100644
--- a/metadata/md5-cache/www-client/opera-56.0.3051.31
+++ b/metadata/md5-cache/www-client/opera-56.0.3051.31
@@ -9,5 +9,5 @@ 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	3d468f3fc7ed63c78db7408ea04246e3	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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
new file mode 100644
index 000000000000..0c1b84167d8e
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-56.0.3051.36
@@ -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.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-beta-56.0.3051.28 b/metadata/md5-cache/www-client/opera-beta-56.0.3051.28
index 808056722c0e..d4287d8a0369 100644
--- a/metadata/md5-cache/www-client/opera-beta-56.0.3051.28
+++ b/metadata/md5-cache/www-client/opera-beta-56.0.3051.28
@@ -9,5 +9,5 @@ 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	3d468f3fc7ed63c78db7408ea04246e3	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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-developer-57.0.3082.0 b/metadata/md5-cache/www-client/opera-developer-57.0.3082.0
deleted file mode 100644
index 914f1385cdb0..000000000000
--- a/metadata/md5-cache/www-client/opera-developer-57.0.3082.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.3082.0/linux/opera-developer_57.0.3082.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/57.0.3082.0/linux/opera-developer_57.0.3082.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/57.0.3082.0/linux/opera-developer_57.0.3082.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/57.0.3082.0/linux/opera-developer_57.0.3082.0_amd64.deb )
-_eclasses_=chromium-2	3d468f3fc7ed63c78db7408ea04246e3	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=fa4bf208e053d504f2ddf5c13ee4f251
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
index 271499e18424..aecbd6888120 100644
--- a/metadata/md5-cache/www-client/opera-developer-57.0.3090.0
+++ b/metadata/md5-cache/www-client/opera-developer-57.0.3090.0
@@ -9,5 +9,5 @@ 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	3d468f3fc7ed63c78db7408ea04246e3	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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
new file mode 100644
index 000000000000..6de6b206c5f0
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-developer-57.0.3098.1
@@ -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/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/otter-0.9.99.2 b/metadata/md5-cache/www-client/otter-0.9.99.2
index f986faec5848..e3480a5306ae 100644
--- a/metadata/md5-cache/www-client/otter-0.9.99.2
+++ b/metadata/md5-cache/www-client/otter-0.9.99.2
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarati
 REQUIRED_USE=|| ( webengine webkit )
 SLOT=0
 SRC_URI=https://github.com/OtterBrowser/otter-browser/archive/v0.9.99.2.tar.gz -> otter-0.9.99.2.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f5fd8d1d4ccf507346cd69f881dccb60
diff --git a/metadata/md5-cache/www-client/otter-0.9.99.3 b/metadata/md5-cache/www-client/otter-0.9.99.3
index f435b8051610..88fe6c39a61c 100644
--- a/metadata/md5-cache/www-client/otter-0.9.99.3
+++ b/metadata/md5-cache/www-client/otter-0.9.99.3
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarati
 REQUIRED_USE=|| ( webengine webkit )
 SLOT=0
 SRC_URI=https://github.com/OtterBrowser/otter-browser/archive/v0.9.99.3.tar.gz -> otter-0.9.99.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f5fd8d1d4ccf507346cd69f881dccb60
diff --git a/metadata/md5-cache/www-client/otter-9999 b/metadata/md5-cache/www-client/otter-9999
index a830bf386b3e..c181247668ad 100644
--- a/metadata/md5-cache/www-client/otter-9999
+++ b/metadata/md5-cache/www-client/otter-9999
@@ -7,5 +7,5 @@ IUSE=spell
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxmlpatterns:5 spell? ( kde-frameworks/sonnet )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3ced5f89e095946b81f7a9f9e5bf22bc
diff --git a/metadata/md5-cache/www-client/pybugz-0.12.1 b/metadata/md5-cache/www-client/pybugz-0.12.1
index 0dba87536d9d..1a204a186a1b 100644
--- a/metadata/md5-cache/www-client/pybugz-0.12.1
+++ b/metadata/md5-cache/www-client/pybugz-0.12.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/williamh/pybugz/archive/0.12.1.tar.gz -> pybugz-0.12.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f1fdbf6db46d8762d9502aa797eb261f
diff --git a/metadata/md5-cache/www-client/pybugz-0.13 b/metadata/md5-cache/www-client/pybugz-0.13
index 263381c7072e..4b341f949657 100644
--- a/metadata/md5-cache/www-client/pybugz-0.13
+++ b/metadata/md5-cache/www-client/pybugz-0.13
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/www-client/pybugz-9999 b/metadata/md5-cache/www-client/pybugz-9999
index 76aad29f3c31..ad9f900711f2 100644
--- a/metadata/md5-cache/www-client/pybugz-9999
+++ b/metadata/md5-cache/www-client/pybugz-9999
@@ -8,5 +8,5 @@ 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 )
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/www-client/qupzilla-2.2.5 b/metadata/md5-cache/www-client/qupzilla-2.2.5
index bf592021a87e..d8e65ab9fb81 100644
--- a/metadata/md5-cache/www-client/qupzilla-2.2.5
+++ b/metadata/md5-cache/www-client/qupzilla-2.2.5
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-qt/qtcore-5.8:5 >=dev-qt/qtdeclarative-5.8:5[widgets] >=dev-qt/qtgui-5.8:5 >=dev-qt/qtnetwork-5.8:5[ssl] >=dev-qt/qtprintsupport-5.8:5 >=dev-qt/qtsql-5.8:5[sqlite] >=dev-qt/qtwebchannel-5.8:5 >=dev-qt/qtwebengine-5.8:5[widgets] >=dev-qt/qtwidgets-5.8:5 >=dev-qt/qtx11extras-5.8:5 x11-libs/libxcb:= dbus? ( >=dev-qt/qtdbus-5.8:5 ) gnome-keyring? ( gnome-base/gnome-keyring ) kwallet? ( kde-frameworks/kwallet:5 ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) >=dev-qt/qtsvg-5.8:5
 SLOT=0
 SRC_URI=https://github.com/QupZilla/qupzilla/releases/download/v2.2.5/QupZilla-2.2.5.tar.xz https://github.com/QupZilla/qupzilla-plugins/archive/80fea7df7765fdf9c9c64fdb667052b25f1c0a22.tar.gz -> qupzilla-plugins-2017.03.26.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=87046ff380eb39ea754bf3c166ee178c
diff --git a/metadata/md5-cache/www-client/qutebrowser-1.4.1 b/metadata/md5-cache/www-client/qutebrowser-1.4.1
deleted file mode 100644
index 8fcf715e850f..000000000000
--- a/metadata/md5-cache/www-client/qutebrowser-1.4.1
+++ /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.1/qutebrowser-1.4.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=4649ad2b7da150f7c82044597fc91630
diff --git a/metadata/md5-cache/www-client/qutebrowser-1.4.2 b/metadata/md5-cache/www-client/qutebrowser-1.4.2
index 7e5a47eb6d7c..4f8c418dd492 100644
--- a/metadata/md5-cache/www-client/qutebrowser-1.4.2
+++ b/metadata/md5-cache/www-client/qutebrowser-1.4.2
@@ -11,5 +11,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
new file mode 100644
index 000000000000..73db73471b3d
--- /dev/null
+++ b/metadata/md5-cache/www-client/qutebrowser-1.5.0
@@ -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,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
diff --git a/metadata/md5-cache/www-client/qutebrowser-9999 b/metadata/md5-cache/www-client/qutebrowser-9999
index 128b5136addd..5f1d1ab8abf0 100644
--- a/metadata/md5-cache/www-client/qutebrowser-9999
+++ b/metadata/md5-cache/www-client/qutebrowser-9999
@@ -9,5 +9,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/www-client/ripe-atlas-cousteau-1.0.6 b/metadata/md5-cache/www-client/ripe-atlas-cousteau-1.0.6
index 5507ec04775c..483e504dd858 100644
--- a/metadata/md5-cache/www-client/ripe-atlas-cousteau-1.0.6
+++ b/metadata/md5-cache/www-client/ripe-atlas-cousteau-1.0.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/socketio-client-0.6.5[python_targets_python2_7(-)?,python_t
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/r/ripe.atlas.cousteau/ripe.atlas.cousteau-1.0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=85f76eb364c86d41c7c9e337e3657356
diff --git a/metadata/md5-cache/www-client/ripe-atlas-cousteau-1.0.7 b/metadata/md5-cache/www-client/ripe-atlas-cousteau-1.0.7
index df8380e744bb..e4d2112228ff 100644
--- a/metadata/md5-cache/www-client/ripe-atlas-cousteau-1.0.7
+++ b/metadata/md5-cache/www-client/ripe-atlas-cousteau-1.0.7
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/socketio-client-0.6.5[python_targets_python2_7(-)?,python_t
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/r/ripe.atlas.cousteau/ripe.atlas.cousteau-1.0.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=feb70e787d8b6445cd4843be702e0c1a
diff --git a/metadata/md5-cache/www-client/ripe-atlas-cousteau-1.2 b/metadata/md5-cache/www-client/ripe-atlas-cousteau-1.2
index c8764a46f505..b5fca3c2ae07 100644
--- a/metadata/md5-cache/www-client/ripe-atlas-cousteau-1.2
+++ b/metadata/md5-cache/www-client/ripe-atlas-cousteau-1.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/socketio-client-0.6.5[python_targets_python2_7(-)?,python_t
 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/ripe.atlas.cousteau/ripe.atlas.cousteau-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d9ac2056b43d1166e6d9d8e84da76225
diff --git a/metadata/md5-cache/www-client/seamonkey-2.49.9.1_p0 b/metadata/md5-cache/www-client/seamonkey-2.49.9.1_p0
index 788edf5370cc..86f6929a60e3 100644
--- a/metadata/md5-cache/www-client/seamonkey-2.49.9.1_p0
+++ b/metadata/md5-cache/www-client/seamonkey-2.49.9.1_p0
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 jack? ( virtual/jack ) crypt? ( >=x11-plugins/enigmail-2.0.5 ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.25:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 ) force-gtk3? ( >=x11-libs/gtk+-3.4.0:3 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/source/thunderbird-52.9.1.source.tar.xz https://hg.mozilla.org/chatzilla/archive/SEA2_48_RELBRANCH.tar.bz2 -> chatzilla-SEA2_48_RELBRANCH.tar.bz2 https://hg.mozilla.org/dom-inspector/archive/DOMI_2_0_17.tar.bz2 -> dom-inspector-DOMI_2_0_17.tar.bz2 l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/cs.xpi -> seamonkey-2.49.9.1-cs.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/de.xpi -> seamonkey-2.49.9.1-de.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/en-GB.xpi -> seamonkey-2.49.9.1-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/es-AR.xpi -> seamonkey-2.49.9.1-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/es-ES.xpi -> seamonkey-2.49.9.1-es-ES.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/fr.xpi -> seamonkey-2.49.9.1-fr.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/hu.xpi -> seamonkey-2.49.9.1-hu.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/it.xpi -> seamonkey-2.49.9.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/ja.xpi -> seamonkey-2.49.9.1-ja.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/lt.xpi -> seamonkey-2.49.9.1-lt.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/nl.xpi -> seamonkey-2.49.9.1-nl.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/pl.xpi -> seamonkey-2.49.9.1-pl.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/pt-PT.xpi -> seamonkey-2.49.9.1-pt-PT.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/ru.xpi -> seamonkey-2.49.9.1-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/sk.xpi -> seamonkey-2.49.9.1-sk.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/sv-SE.xpi -> seamonkey-2.49.9.1-sv-SE.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/zh-CN.xpi -> seamonkey-2.49.9.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/zh-TW.xpi -> seamonkey-2.49.9.1-zh-TW.xpi ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/seamonkey-2.46-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.46-patches-01.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozconfig-v6.52	d8539cc1b3254e460b76b1dbdf24ec0f	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	b2f01ad412baf81650c23fcf0975fa33	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozconfig-v6.52	d8539cc1b3254e460b76b1dbdf24ec0f	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	b2f01ad412baf81650c23fcf0975fa33	nsplugins	2049586e425364a1c5bdb004205d1758	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_=fb423edcde31e5e35029184f88e5c366
diff --git a/metadata/md5-cache/www-client/seamonkey-bin-2.48 b/metadata/md5-cache/www-client/seamonkey-bin-2.48
index bb193314876e..7863c8b59739 100644
--- a/metadata/md5-cache/www-client/seamonkey-bin-2.48
+++ b/metadata/md5-cache/www-client/seamonkey-bin-2.48
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/g
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=l10n_cs? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.cs.langpack.xpi -> seamonkey-2.48-cs.xpi ) l10n_de? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.de.langpack.xpi -> seamonkey-2.48-de.xpi ) l10n_en-GB? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.en-GB.langpack.xpi -> seamonkey-2.48-en-GB.xpi ) l10n_es-AR? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.es-AR.langpack.xpi -> seamonkey-2.48-es-AR.xpi ) l10n_es-ES? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.es-ES.langpack.xpi -> seamonkey-2.48-es-ES.xpi ) l10n_fr? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.fr.langpack.xpi -> seamonkey-2.48-fr.xpi ) l10n_hu? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.hu.langpack.xpi -> seamonkey-2.48-hu.xpi ) l10n_it? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.it.langpack.xpi -> seamonkey-2.48-it.xpi ) l10n_ja? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.ja.langpack.xpi -> seamonkey-2.48-ja.xpi ) l10n_lt? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.lt.langpack.xpi -> seamonkey-2.48-lt.xpi ) l10n_nl? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.nl.langpack.xpi -> seamonkey-2.48-nl.xpi ) l10n_pl? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.pl.langpack.xpi -> seamonkey-2.48-pl.xpi ) l10n_pt-PT? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.pt-PT.langpack.xpi -> seamonkey-2.48-pt-PT.xpi ) l10n_ru? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.ru.langpack.xpi -> seamonkey-2.48-ru.xpi ) l10n_sk? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.sk.langpack.xpi -> seamonkey-2.48-sk.xpi ) l10n_sv? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.sv-SE.langpack.xpi -> seamonkey-2.48-sv-SE.xpi ) l10n_zh-CN? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.zh-CN.langpack.xpi -> seamonkey-2.48-zh-CN.xpi ) l10n_zh-TW? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/langpack/seamonkey-2.48.zh-TW.langpack.xpi -> seamonkey-2.48-zh-TW.xpi ) amd64? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/contrib/seamonkey-2.48.en-US.linux-x86_64.tar.bz2 -> seamonkey-bin_x86_64-2.48.tar.bz2 ) x86? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/2.48/linux-i686/en-US/seamonkey-2.48.tar.bz2 -> seamonkey-bin_i686-2.48.tar.bz2 )
-_eclasses_=desktop	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fd82cd1ca3c7d2982d4c233f76d9d2f6
diff --git a/metadata/md5-cache/www-client/seamonkey-bin-2.49.1_rc2 b/metadata/md5-cache/www-client/seamonkey-bin-2.49.1_rc2
index c7dc7d82d5b2..ee6edacf367a 100644
--- a/metadata/md5-cache/www-client/seamonkey-bin-2.49.1_rc2
+++ b/metadata/md5-cache/www-client/seamonkey-bin-2.49.1_rc2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/g
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=l10n_cs? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/cs.xpi -> seamonkey-2.49.1-cs.xpi ) l10n_de? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/de.xpi -> seamonkey-2.49.1-de.xpi ) l10n_en-GB? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/en-GB.xpi -> seamonkey-2.49.1-en-GB.xpi ) l10n_es-AR? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/es-AR.xpi -> seamonkey-2.49.1-es-AR.xpi ) l10n_es-ES? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/es-ES.xpi -> seamonkey-2.49.1-es-ES.xpi ) l10n_fr? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/fr.xpi -> seamonkey-2.49.1-fr.xpi ) l10n_hu? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/hu.xpi -> seamonkey-2.49.1-hu.xpi ) l10n_it? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/it.xpi -> seamonkey-2.49.1-it.xpi ) l10n_ja? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/ja.xpi -> seamonkey-2.49.1-ja.xpi ) l10n_lt? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/lt.xpi -> seamonkey-2.49.1-lt.xpi ) l10n_nl? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/nl.xpi -> seamonkey-2.49.1-nl.xpi ) l10n_pl? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/pl.xpi -> seamonkey-2.49.1-pl.xpi ) l10n_pt-PT? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/pt-PT.xpi -> seamonkey-2.49.1-pt-PT.xpi ) l10n_ru? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/ru.xpi -> seamonkey-2.49.1-ru.xpi ) l10n_sk? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/sk.xpi -> seamonkey-2.49.1-sk.xpi ) l10n_sv? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/sv-SE.xpi -> seamonkey-2.49.1-sv-SE.xpi ) l10n_zh-CN? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/zh-CN.xpi -> seamonkey-2.49.1-zh-CN.xpi ) l10n_zh-TW? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/zh-TW.xpi -> seamonkey-2.49.1-zh-TW.xpi ) amd64? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-x86_64/en-US/seamonkey-2.49.1.tar.bz2 -> seamonkey-bin_x86_64-2.49.1_rc2.tar.bz2 ) x86? ( http://archive.mozilla.org/pub/mozilla.org/seamonkey/candidates/2.49.1-candidates/build2/linux-i686/en-US/seamonkey-2.49.1.tar.bz2 -> seamonkey-bin_i686-2.49.1_rc2.tar.bz2 )
-_eclasses_=desktop	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d822038773704800103ff107b2fc6b0b
diff --git a/metadata/md5-cache/www-client/uget-2.2.0 b/metadata/md5-cache/www-client/uget-2.2.0
index 6b766808d946..20c16ce2635c 100644
--- a/metadata/md5-cache/www-client/uget-2.2.0
+++ b/metadata/md5-cache/www-client/uget-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=net-misc/curl-7.19.1 dev-libs/libpcre >=dev-libs/glib-2.32:2 >=x11-lib
 REQUIRED_USE=^^ ( gnutls openssl )
 SLOT=0
 SRC_URI=mirror://sourceforge/urlget/uget-2.2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4cad6e45f06953f82a2e3957dc95ecb6
diff --git a/metadata/md5-cache/www-client/uget-2.2.1 b/metadata/md5-cache/www-client/uget-2.2.1
index 1ce20a600524..d595698ca66d 100644
--- a/metadata/md5-cache/www-client/uget-2.2.1
+++ b/metadata/md5-cache/www-client/uget-2.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=net-misc/curl-7.19.1 dev-libs/libpcre >=dev-libs/glib-2.32:2 >=x11-lib
 REQUIRED_USE=^^ ( gnutls openssl )
 SLOT=0
 SRC_URI=mirror://sourceforge/urlget/uget-2.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9f8479bc811cdb6d5161a41adafe00ef
diff --git a/metadata/md5-cache/www-client/uget-9999 b/metadata/md5-cache/www-client/uget-9999
index 316cf292cb30..fecfd5f1ebfd 100644
--- a/metadata/md5-cache/www-client/uget-9999
+++ b/metadata/md5-cache/www-client/uget-9999
@@ -7,5 +7,5 @@ IUSE=aria2 ayatana control-socket +gnutls gstreamer libnotify nls openssl rss
 LICENSE=LGPL-2.1
 RDEPEND=>=net-misc/curl-7.19.1 dev-libs/libpcre >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3 gnutls? ( net-libs/gnutls dev-libs/libgcrypt:0 ) aria2? ( net-misc/aria2[xmlrpc] ) ayatana? ( dev-libs/libappindicator:3 ) gstreamer? ( media-libs/gstreamer:1.0 ) libnotify? ( x11-libs/libnotify )
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c840c2d88fdaae8ef021f35b92bf1bb2
diff --git a/metadata/md5-cache/www-client/vivaldi-1.15.1147.64_p1 b/metadata/md5-cache/www-client/vivaldi-1.15.1147.64_p1
index 52a4513ce004..b31bac8a9238 100644
--- a/metadata/md5-cache/www-client/vivaldi-1.15.1147.64_p1
+++ b/metadata/md5-cache/www-client/vivaldi-1.15.1147.64_p1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/als
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_1.15.1147.64-1_amd64.deb -> vivaldi-1.15.1147.64_p1-amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_1.15.1147.64-1_armhf.deb -> vivaldi-1.15.1147.64_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/stable/vivaldi-stable_1.15.1147.64-1_i386.deb -> vivaldi-1.15.1147.64_p1-i386.deb )
-_eclasses_=chromium-2	3d468f3fc7ed63c78db7408ea04246e3	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=f9fdc08de1dd2cf6a25b8c62e992c90f
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
index 45a74d9ab024..004543f3f3e4 100644
--- a/metadata/md5-cache/www-client/vivaldi-2.0.1309.29_p2
+++ b/metadata/md5-cache/www-client/vivaldi-2.0.1309.29_p2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/als
 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	3d468f3fc7ed63c78db7408ea04246e3	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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
new file mode 100644
index 000000000000..84362472feca
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-2.0.1309.37_p2
@@ -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.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-snapshot-2.1.1317.4_p2 b/metadata/md5-cache/www-client/vivaldi-snapshot-2.1.1317.4_p2
index 587071b95de6..edea79847066 100644
--- 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
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/als
 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	3d468f3fc7ed63c78db7408ea04246e3	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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
new file mode 100644
index 000000000000..9dff166ada6e
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-2.1.1322.4_p2
@@ -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.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/weboob-1.3 b/metadata/md5-cache/www-client/weboob-1.3
index 2ad883f09daf..44b58141a7d1 100644
--- a/metadata/md5-cache/www-client/weboob-1.3
+++ b/metadata/md5-cache/www-client/weboob-1.3
@@ -10,5 +10,5 @@ RDEPEND=X? ( dev-python/PyQt5[multimedia,python_targets_python2_7(-)?,-python_si
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://symlink.me/attachments/download/356/weboob-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a2e2bec9f9bfc117a3440b892a50aa42
diff --git a/metadata/md5-cache/www-client/weboob-9998 b/metadata/md5-cache/www-client/weboob-9998
index 8b15cdec1980..8b69d25f9021 100644
--- a/metadata/md5-cache/www-client/weboob-9998
+++ b/metadata/md5-cache/www-client/weboob-9998
@@ -8,5 +8,5 @@ LICENSE=AGPL-3
 RDEPEND=X? ( dev-python/PyQt5[multimedia,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/cssselect[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/feedparser[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/html2text[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/prettytable[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/requests[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ssl] dev-python/six[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/termcolor[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/unidecode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-futures[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] deprecated? ( dev-python/mechanize[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) fast-libs? ( dev-python/pyyaml[libyaml,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) secure-updates? ( app-crypt/gnupg ) X? ( dev-python/google-api-python-client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl] ) >=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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a2e2bec9f9bfc117a3440b892a50aa42
diff --git a/metadata/md5-cache/www-client/weboob-9999 b/metadata/md5-cache/www-client/weboob-9999
index 8b15cdec1980..8b69d25f9021 100644
--- a/metadata/md5-cache/www-client/weboob-9999
+++ b/metadata/md5-cache/www-client/weboob-9999
@@ -8,5 +8,5 @@ LICENSE=AGPL-3
 RDEPEND=X? ( dev-python/PyQt5[multimedia,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/cssselect[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/feedparser[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/html2text[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/prettytable[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/requests[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ssl] dev-python/six[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/termcolor[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/unidecode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-futures[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] deprecated? ( dev-python/mechanize[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) fast-libs? ( dev-python/pyyaml[libyaml,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) secure-updates? ( app-crypt/gnupg ) X? ( dev-python/google-api-python-client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl] ) >=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	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a2e2bec9f9bfc117a3440b892a50aa42
diff --git a/metadata/md5-cache/www-misc/Manifest.gz b/metadata/md5-cache/www-misc/Manifest.gz
index 1d16fc0cba60..a6f438150dc7 100644
--- a/metadata/md5-cache/www-misc/Manifest.gz
+++ b/metadata/md5-cache/www-misc/Manifest.gz
diff --git a/metadata/md5-cache/www-misc/buku-3.5 b/metadata/md5-cache/www-misc/buku-3.5
index 00548d01fa05..cddd10ac3809 100644
--- a/metadata/md5-cache/www-misc/buku-3.5
+++ b/metadata/md5-cache/www-misc/buku-3.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/beautifulsoup:4[python_targets_python3_4(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buku/buku-3.5.tar.gz -> buku-3.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=68d1613635ab58281624d19b23b51578
diff --git a/metadata/md5-cache/www-misc/buku-3.6 b/metadata/md5-cache/www-misc/buku-3.6
index 1118b8222b08..b6bee718794b 100644
--- a/metadata/md5-cache/www-misc/buku-3.6
+++ b/metadata/md5-cache/www-misc/buku-3.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/beautifulsoup:4[python_targets_python3_4(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buku/buku-3.6.tar.gz -> buku-3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=68d1613635ab58281624d19b23b51578
diff --git a/metadata/md5-cache/www-misc/buku-3.7 b/metadata/md5-cache/www-misc/buku-3.7
index 0f487f9e66de..722306a5c60f 100644
--- a/metadata/md5-cache/www-misc/buku-3.7
+++ b/metadata/md5-cache/www-misc/buku-3.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/beautifulsoup:4[python_targets_python3_4(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buku/buku-3.7.tar.gz -> buku-3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=655b0d1fac44ae901de7eb501f30f4b9
diff --git a/metadata/md5-cache/www-misc/nx_util-0.52.1 b/metadata/md5-cache/www-misc/nx_util-0.52.1
index 3b5b7b2ad077..0cc927d6c17d 100644
--- a/metadata/md5-cache/www-misc/nx_util-0.52.1
+++ b/metadata/md5-cache/www-misc/nx_util-0.52.1
@@ -10,5 +10,5 @@ RDEPEND=www-servers/nginx[nginx_modules_http_naxsi] python_targets_python2_7? (
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/nbs-system/naxsi/archive/0.52-1.tar.gz -> ngx_http_naxsi-0.52-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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=14a9b1738d49fa546a11fcaeb2dbd9ac
diff --git a/metadata/md5-cache/www-misc/nx_util-0.53.1 b/metadata/md5-cache/www-misc/nx_util-0.53.1
index 250935e96b7e..7237d0a11934 100644
--- a/metadata/md5-cache/www-misc/nx_util-0.53.1
+++ b/metadata/md5-cache/www-misc/nx_util-0.53.1
@@ -10,5 +10,5 @@ RDEPEND=www-servers/nginx[nginx_modules_http_naxsi] python_targets_python2_7? (
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/nbs-system/naxsi/archive/0.53-1.tar.gz -> ngx_http_naxsi-0.53-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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=304208a44f212eb3dfbb08cf901bf994
diff --git a/metadata/md5-cache/www-misc/surl-0.7.1.1-r1 b/metadata/md5-cache/www-misc/surl-0.7.1.1-r1
index 7c75d33d6602..8fc2ea58959b 100644
--- a/metadata/md5-cache/www-misc/surl-0.7.1.1-r1
+++ b/metadata/md5-cache/www-misc/surl-0.7.1.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://launchpad.net/surl/trunk/0.7.1/+download/surl-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=95530f230bc651bb5a627b040b424bfe
diff --git a/metadata/md5-cache/www-misc/urlwatch-2.13 b/metadata/md5-cache/www-misc/urlwatch-2.13
index 9a6d9c2e4092..7474675e84c0 100644
--- a/metadata/md5-cache/www-misc/urlwatch-2.13
+++ b/metadata/md5-cache/www-misc/urlwatch-2.13
@@ -10,5 +10,5 @@ RDEPEND=dev-python/appdirs[python_targets_python3_4(-)?,python_targets_python3_5
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/u/urlwatch/urlwatch-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=254e1e345414602bb1764cbd1231580b
diff --git a/metadata/md5-cache/www-misc/urlwatch-2.5 b/metadata/md5-cache/www-misc/urlwatch-2.5
index 401dcef5186a..b228741d1e9a 100644
--- a/metadata/md5-cache/www-misc/urlwatch-2.5
+++ b/metadata/md5-cache/www-misc/urlwatch-2.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/keyring[python_targets_python3_4(-)?,python_targets_python3_5
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/u/urlwatch/urlwatch-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=df2d4e29b00b9b1c2a4ec4b2f2ebc694
diff --git a/metadata/md5-cache/www-misc/urlwatch-2.6 b/metadata/md5-cache/www-misc/urlwatch-2.6
index 40cd095e4392..f180a32c2452 100644
--- a/metadata/md5-cache/www-misc/urlwatch-2.6
+++ b/metadata/md5-cache/www-misc/urlwatch-2.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/u/urlwatch/urlwatch-2.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=544907e505b3073301b23d208d167639
diff --git a/metadata/md5-cache/www-misc/zoneminder-1.30.4 b/metadata/md5-cache/www-misc/zoneminder-1.30.4
index d9ca8ade5abc..d12b5a7a2fd0 100644
--- a/metadata/md5-cache/www-misc/zoneminder-1.30.4
+++ b/metadata/md5-cache/www-misc/zoneminder-1.30.4
@@ -10,5 +10,5 @@ RDEPEND=app-eselect/eselect-php[apache2] dev-lang/perl:= dev-lang/php:*[apache2,
 REQUIRED_USE=|| ( ssl gnutls )
 SLOT=0
 SRC_URI=https://github.com/ZoneMinder/ZoneMinder/archive/1.30.4.tar.gz -> zoneminder-1.30.4.tar.gz https://github.com/FriendsOfCake/crud/archive/v3.1.0.tar.gz -> Crud-3.1.0.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	perl-functions	f2e3420aed32cf1abe33b4129b842636	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	perl-functions	f2e3420aed32cf1abe33b4129b842636	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=eb3797f0cc1e44df5e35d6a31d39d8ac
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index 9543c97d9e75..ca0f05cd514a 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
index 820e70feeba3..a6e427c35cc9 100644
--- a/metadata/md5-cache/www-plugins/adobe-flash-31.0.0.108
+++ b/metadata/md5-cache/www-plugins/adobe-flash-31.0.0.108
@@ -11,5 +11,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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/chrome-binary-plugins-70.0.3538.22_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-70.0.3538.22_beta
deleted file mode 100644
index 1309275d17a8..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-70.0.3538.22_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.22-1_amd64.deb
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e
-_md5_=af88fcb905f586fa4bf5adc077702ee1
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
new file mode 100644
index 000000000000..12d3d1d59459
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-70.0.3538.35_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.35-1_amd64.deb
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e
+_md5_=f3a3562d16034ecff6c99838db35fbfa
diff --git a/metadata/md5-cache/www-plugins/freshplayerplugin-0.3.5-r2 b/metadata/md5-cache/www-plugins/freshplayerplugin-0.3.5-r2
index f939e480a6e6..843fd1d882bd 100644
--- a/metadata/md5-cache/www-plugins/freshplayerplugin-0.3.5-r2
+++ b/metadata/md5-cache/www-plugins/freshplayerplugin-0.3.5-r2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/glib:2= dev-libs/icu:0= dev-libs/libevent:=[threads] media-libs/alsa-lib:= media-libs/freetype:2= media-libs/mesa:=[egl,gles2?] x11-libs/cairo:=[X] x11-libs/libXcursor:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libdrm:= x11-libs/pango:=[X] jack? ( media-sound/jack-audio-connection-kit media-libs/soxr ) pulseaudio? ( media-sound/pulseaudio ) !gtk3? ( x11-libs/gtk+:2= ) gtk3? ( x11-libs/gtk+:3= ) libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) v4l? ( media-libs/libv4l:0= ) vaapi? ( libav? ( media-video/libav:0=[vaapi?,vdpau?] ) !libav? ( media-video/ffmpeg:0=[vaapi?,vdpau?] ) x11-libs/libva x11-libs/libvdpau ) vdpau? ( libav? ( media-video/libav:0=[vaapi?,vdpau?] ) !libav? ( media-video/ffmpeg:0=[vaapi?,vdpau?] ) x11-libs/libva x11-libs/libvdpau ) www-plugins/adobe-flash:22
 SLOT=0
 SRC_URI=https://github.com/i-rinat/freshplayerplugin/archive/v0.3.5.tar.gz -> freshplayerplugin-0.3.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=a98398aada700ab5c5b3ea3e754c7ade
diff --git a/metadata/md5-cache/www-plugins/freshplayerplugin-0.3.5-r3 b/metadata/md5-cache/www-plugins/freshplayerplugin-0.3.5-r3
index 17dd5a5f2cd1..b7c26a4c66a8 100644
--- a/metadata/md5-cache/www-plugins/freshplayerplugin-0.3.5-r3
+++ b/metadata/md5-cache/www-plugins/freshplayerplugin-0.3.5-r3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/glib:2= dev-libs/icu:0= dev-libs/libevent:=[threads] media-libs/alsa-lib:= media-libs/freetype:2= media-libs/mesa:=[egl,gles2?] x11-libs/cairo:=[X] x11-libs/libXcursor:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libdrm:= x11-libs/pango:=[X] jack? ( media-sound/jack-audio-connection-kit media-libs/soxr ) pulseaudio? ( media-sound/pulseaudio ) !gtk3? ( x11-libs/gtk+:2= ) gtk3? ( x11-libs/gtk+:3= ) libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) v4l? ( media-libs/libv4l:0= ) vaapi? ( libav? ( media-video/libav:0=[vaapi?,vdpau?] ) !libav? ( media-video/ffmpeg:0=[vaapi?,vdpau?] ) x11-libs/libva x11-libs/libvdpau ) vdpau? ( libav? ( media-video/libav:0=[vaapi?,vdpau?] ) !libav? ( media-video/ffmpeg:0=[vaapi?,vdpau?] ) x11-libs/libva x11-libs/libvdpau ) www-plugins/adobe-flash:22[abi_x86_64,ppapi(+)]
 SLOT=0
 SRC_URI=https://github.com/i-rinat/freshplayerplugin/archive/v0.3.5.tar.gz -> freshplayerplugin-0.3.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=b19ffe354e3d52d5aeacf20283be014f
diff --git a/metadata/md5-cache/www-plugins/freshplayerplugin-0.3.7 b/metadata/md5-cache/www-plugins/freshplayerplugin-0.3.7
index 06b8d0e146ab..9ef170ee2b07 100644
--- a/metadata/md5-cache/www-plugins/freshplayerplugin-0.3.7
+++ b/metadata/md5-cache/www-plugins/freshplayerplugin-0.3.7
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/glib:2= dev-libs/icu:0= dev-libs/libevent:=[threads] media-libs/alsa-lib:= media-libs/freetype:2= media-libs/mesa:=[egl,gles2?] x11-libs/cairo:=[X] x11-libs/libXcursor:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libdrm:= x11-libs/pango:=[X] jack? ( media-sound/jack-audio-connection-kit media-libs/soxr ) pulseaudio? ( media-sound/pulseaudio ) !gtk3? ( x11-libs/gtk+:2= ) gtk3? ( x11-libs/gtk+:3= ) libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) v4l? ( media-libs/libv4l:0= ) vaapi? ( libav? ( media-video/libav:0=[vaapi?,vdpau?] ) !libav? ( media-video/ffmpeg:0=[vaapi?,vdpau?] ) x11-libs/libva x11-libs/libvdpau ) vdpau? ( libav? ( media-video/libav:0=[vaapi?,vdpau?] ) !libav? ( media-video/ffmpeg:0=[vaapi?,vdpau?] ) x11-libs/libva x11-libs/libvdpau ) www-plugins/adobe-flash:22[abi_x86_64,ppapi(+)]
 SLOT=0
 SRC_URI=https://github.com/i-rinat/freshplayerplugin/archive/v0.3.7.tar.gz -> freshplayerplugin-0.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=12aef8503d648c18cd140bb6ff6d4b0b
diff --git a/metadata/md5-cache/www-plugins/freshplayerplugin-0.3.9 b/metadata/md5-cache/www-plugins/freshplayerplugin-0.3.9
index 1012abe5935a..8a52cf3bf4ef 100644
--- a/metadata/md5-cache/www-plugins/freshplayerplugin-0.3.9
+++ b/metadata/md5-cache/www-plugins/freshplayerplugin-0.3.9
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/glib:2= dev-libs/icu:0= dev-libs/libevent:=[threads] media-libs/alsa-lib:= media-libs/freetype:2= media-libs/mesa:=[egl,gles2?] x11-libs/cairo:=[X] x11-libs/libXcursor:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libdrm:= x11-libs/libva:= x11-libs/pango:=[X] jack? ( media-sound/jack-audio-connection-kit media-libs/soxr ) pulseaudio? ( media-sound/pulseaudio ) libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) v4l? ( media-libs/libv4l:0= ) vaapi? ( libav? ( media-video/libav:0=[vaapi?,vdpau?] ) !libav? ( media-video/ffmpeg:0=[vaapi?,vdpau?] ) x11-libs/libvdpau ) vdpau? ( libav? ( media-video/libav:0=[vaapi?,vdpau?] ) !libav? ( media-video/ffmpeg:0=[vaapi?,vdpau?] ) x11-libs/libvdpau ) www-plugins/adobe-flash:22[abi_x86_64,ppapi(+)]
 SLOT=0
 SRC_URI=https://github.com/i-rinat/freshplayerplugin/archive/v0.3.9.tar.gz -> freshplayerplugin-0.3.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=049e00853e959180afeeb84550170737
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
index 0c5014da28d8..57798a05b69b 100644
--- a/metadata/md5-cache/www-plugins/gnash-0.8.10_p20160329-r2
+++ b/metadata/md5-cache/www-plugins/gnash-0.8.10_p20160329-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=dump? ( agg ffmpeg ) fbcon? ( agg ) nsplugin? ( gtk ) openvg? ( egl
 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	89bb9f083a2590d9b447fd0b78a96186
+_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-plugins/lightspark-0.8.1 b/metadata/md5-cache/www-plugins/lightspark-0.8.1
index ff4fbf041923..e2d93120920a 100644
--- a/metadata/md5-cache/www-plugins/lightspark-0.8.1
+++ b/metadata/md5-cache/www-plugins/lightspark-0.8.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=app-arch/xz-utils:0= dev-cpp/glibmm:2= >=dev-libs/boost-1.42:0= dev-libs/glib:2= dev-libs/libpcre:3=[cxx] media-fonts/liberation-fonts media-libs/freetype:2= media-libs/libpng:0= media-libs/libsdl2:0= media-libs/sdl2-mixer:0= <sys-devel/llvm-7:= sys-libs/zlib:0= x11-libs/cairo:0= x11-libs/libX11:0= x11-libs/pango:0= virtual/jpeg:0= curl? ( net-misc/curl:0= ) ffmpeg? ( libav? ( <media-video/libav-13_pre:0= ) !libav? ( media-video/ffmpeg:0= ) ) gles? ( media-libs/mesa:0=[gles2] ) !gles? ( >=media-libs/glew-1.5.3:0= virtual/opengl:0= ) rtmp? ( media-video/rtmpdump:0= )
 SLOT=0
 SRC_URI=https://github.com/lightspark/lightspark/archive/0.8.1.tar.gz -> lightspark-0.8.1.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozextension	f47f008a138943f9e40e37c1fca10b24	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozextension	f47f008a138943f9e40e37c1fca10b24	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=07df61a61fbc06cbad2dc31e7c7dae0b
diff --git a/metadata/md5-cache/www-plugins/lightspark-9999 b/metadata/md5-cache/www-plugins/lightspark-9999
index f7e76ce4988b..04884f5da059 100644
--- a/metadata/md5-cache/www-plugins/lightspark-9999
+++ b/metadata/md5-cache/www-plugins/lightspark-9999
@@ -7,5 +7,5 @@ IUSE=cpu_flags_x86_sse2 curl ffmpeg gles libav nsplugin ppapi profile rtmp
 LICENSE=LGPL-3
 RDEPEND=app-arch/xz-utils:0= dev-cpp/glibmm:2= >=dev-libs/boost-1.42:0= dev-libs/glib:2= dev-libs/libpcre:3=[cxx] media-fonts/liberation-fonts media-libs/freetype:2= media-libs/libpng:0= media-libs/libsdl2:0= media-libs/sdl2-mixer:0= >=sys-devel/llvm-3.4:= sys-libs/zlib:0= x11-libs/cairo:0= x11-libs/libX11:0= x11-libs/pango:0= virtual/jpeg:0= curl? ( net-misc/curl:0= ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gles? ( media-libs/mesa:0=[gles2] ) !gles? ( >=media-libs/glew-1.5.3:0= virtual/opengl:0= ) rtmp? ( media-video/rtmpdump:0= )
 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	mozextension	f47f008a138943f9e40e37c1fca10b24	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozextension	f47f008a138943f9e40e37c1fca10b24	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5236ef5cc5848cf6f283a4fb7d48f935
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 6b2d15aa063d..d161479d7835 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/civetweb-1.10 b/metadata/md5-cache/www-servers/civetweb-1.10
index 5c6b567e7313..9a76f76f921e 100644
--- a/metadata/md5-cache/www-servers/civetweb-1.10
+++ b/metadata/md5-cache/www-servers/civetweb-1.10
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=https://github.com/civetweb/civetweb/archive/v1.10.tar.gz -> civetweb-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4a85131921eec31ae7ff0aadcfa27d22
diff --git a/metadata/md5-cache/www-servers/gunicorn-19.1.1 b/metadata/md5-cache/www-servers/gunicorn-19.1.1
index ce6de7ccbbe6..2768dcf2021a 100644
--- a/metadata/md5-cache/www-servers/gunicorn-19.1.1
+++ b/metadata/md5-cache/www-servers/gunicorn-19.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setproctitle[python_targets_pypy(-)?,python_targets_python2_7
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gunicorn/gunicorn-19.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a80c5e37eef0bc96ba4210579a0f6a99
diff --git a/metadata/md5-cache/www-servers/gunicorn-19.3.0 b/metadata/md5-cache/www-servers/gunicorn-19.3.0
index 660999dc0a1c..c9b3c1eb4e3e 100644
--- a/metadata/md5-cache/www-servers/gunicorn-19.3.0
+++ b/metadata/md5-cache/www-servers/gunicorn-19.3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setproctitle[python_targets_pypy(-)?,python_targets_python2_7
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gunicorn/gunicorn-19.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=48bfa52d155eebb29a79de420431e4b4
diff --git a/metadata/md5-cache/www-servers/gunicorn-19.4.5 b/metadata/md5-cache/www-servers/gunicorn-19.4.5
index fa79d861ec89..c2d2bbcc7c51 100644
--- a/metadata/md5-cache/www-servers/gunicorn-19.4.5
+++ b/metadata/md5-cache/www-servers/gunicorn-19.4.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setproctitle[python_targets_pypy(-)?,python_targets_python2_7
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gunicorn/gunicorn-19.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7b5e4f55fff07de5207759f78f191de0
diff --git a/metadata/md5-cache/www-servers/gunicorn-19.6.0 b/metadata/md5-cache/www-servers/gunicorn-19.6.0
index b9338a3dd47f..d36adb6d5f76 100644
--- a/metadata/md5-cache/www-servers/gunicorn-19.6.0
+++ b/metadata/md5-cache/www-servers/gunicorn-19.6.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setproctitle[python_targets_pypy(-)?,python_targets_python2_7
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gunicorn/gunicorn-19.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e7c0dffca2c5439550391df1b4482531
diff --git a/metadata/md5-cache/www-servers/gunicorn-19.8.1 b/metadata/md5-cache/www-servers/gunicorn-19.8.1
index 29f6cf73ab24..164bd46619c3 100644
--- a/metadata/md5-cache/www-servers/gunicorn-19.8.1
+++ b/metadata/md5-cache/www-servers/gunicorn-19.8.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setproctitle[python_targets_pypy(-)?,python_targets_python2_7
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gunicorn/gunicorn-19.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7581dde1cdb6098e6a6d2574947d2f64
diff --git a/metadata/md5-cache/www-servers/h2o-2.2.5 b/metadata/md5-cache/www-servers/h2o-2.2.5
index 543ff024cad3..604e39c40fe1 100644
--- a/metadata/md5-cache/www-servers/h2o-2.2.5
+++ b/metadata/md5-cache/www-servers/h2o-2.2.5
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-lang/perl sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 SLOT=0
 SRC_URI=https://github.com/h2o/h2o/archive/v2.2.5.tar.gz -> h2o-2.2.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	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	ssl-cert	a1a4daed6b2479901759d6fe367c4c29	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	ssl-cert	a1a4daed6b2479901759d6fe367c4c29	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=76bcd6a6e71dac47cd35cd355ed9d12b
diff --git a/metadata/md5-cache/www-servers/h2o-9999 b/metadata/md5-cache/www-servers/h2o-9999
index 3d2d979f04ca..11c5a0d0a17a 100644
--- a/metadata/md5-cache/www-servers/h2o-9999
+++ b/metadata/md5-cache/www-servers/h2o-9999
@@ -7,5 +7,5 @@ IUSE=libressl +mruby
 LICENSE=MIT
 RDEPEND=dev-lang/perl sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 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	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	ssl-cert	a1a4daed6b2479901759d6fe367c4c29	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	ssl-cert	a1a4daed6b2479901759d6fe367c4c29	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4ce3795e2c0afec09a6ee9d155ccb7f7
diff --git a/metadata/md5-cache/www-servers/hiawatha-9.15 b/metadata/md5-cache/www-servers/hiawatha-9.15
index 17fdbabe15f6..5ea109d6ea09 100644
--- a/metadata/md5-cache/www-servers/hiawatha-9.15
+++ b/metadata/md5-cache/www-servers/hiawatha-9.15
@@ -10,5 +10,5 @@ PDEPEND=monitor? ( www-apps/hiawatha-monitor )
 RDEPEND=sys-libs/zlib ssl? ( >=net-libs/mbedtls-2.0[threads] ) xslt? ( dev-libs/libxslt dev-libs/libxml2 )
 SLOT=0
 SRC_URI=https://www.hiawatha-webserver.org/files/hiawatha-9.15.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dc61c8bd5a9fd497b5e3ce3dac7e2350
diff --git a/metadata/md5-cache/www-servers/nginx-1.15.4 b/metadata/md5-cache/www-servers/nginx-1.15.4
deleted file mode 100644
index 9c03876991f2..000000000000
--- a/metadata/md5-cache/www-servers/nginx-1.15.4
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/expat ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_brotli? ( virtual/pkgconfig ) nginx_modules_http_security? ( !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ) arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops ) >=app-portage/elt-patches-20170815 virtual/pkgconfig
-DESCRIPTION=Robust, small and high performance http and reverse proxy server
-EAPI=6
-HOMEPAGE=https://nginx.org
-IUSE=aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_grpc +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_mirror +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_hash +nginx_modules_http_upstream_ip_hash +nginx_modules_http_upstream_keepalive +nginx_modules_http_upstream_least_conn +nginx_modules_http_upstream_zone +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_geo nginx_modules_stream_limit_conn nginx_modules_stream_map nginx_modules_stream_return nginx_modules_stream_split_clients nginx_modules_stream_upstream_hash nginx_modules_stream_upstream_least_conn nginx_modules_stream_upstream_zone nginx_modules_stream_geoip nginx_modules_stream_realip nginx_modules_stream_ssl_preread nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_auth_ldap nginx_modules_http_auth_pam nginx_modules_http_brotli nginx_modules_http_cache_purge nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_fancyindex nginx_modules_http_geoip2 nginx_modules_http_headers_more nginx_modules_http_javascript nginx_modules_http_lua nginx_modules_http_memc nginx_modules_http_metrics nginx_modules_http_mogilefs nginx_modules_http_naxsi nginx_modules_http_push_stream nginx_modules_http_security nginx_modules_http_slowfs_cache nginx_modules_http_sticky nginx_modules_http_upload_progress nginx_modules_http_upstream_check nginx_modules_http_vhost_traffic_status nginx_modules_stream_geoip2 nginx_modules_stream_javascript nginx_modules_http_spdy
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 )
-PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
-RDEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/expat ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:0
-REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_grpc? ( http2 ) nginx_modules_http_lua? ( nginx_modules_http_rewrite ) nginx_modules_http_naxsi? ( pcre ) nginx_modules_http_dav_ext? ( nginx_modules_http_dav ) nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) nginx_modules_http_security? ( pcre ) nginx_modules_http_push_stream? ( ssl )
-RESTRICT=test
-SLOT=mainline
-SRC_URI=https://nginx.org/download/nginx-1.15.4.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.0.tar.gz -> ngx_devel_kit-0.3.0-r1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.1.tar.gz -> ngx_http_auth_pam-1.5.1.tar.gz ) nginx_modules_http_brotli? ( https://github.com/eustas/ngx_brotli/archive/v0.1.2.tar.gz -> ngx_brotli-0.1.2.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v0.1.0.tar.gz -> ngx_http_dav_ext-0.1.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.61.tar.gz -> ngx_http_echo-0.61.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.3.tar.gz -> ngx_http_fancyindex-0.4.3.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/2.0.tar.gz -> ngx_http_geoip2_module-2.0.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.33.tar.gz -> ngx_http_headers_more-0.33.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.2.4.tar.gz -> njs-0.2.4.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.13.tar.gz -> ngx_http_lua-0.10.13.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.56.tar.gz -> ngx_http_naxsi-0.56.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.4.tar.gz -> ngx_http_push_stream-0.5.4.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.2/modsecurity-2.9.2.tar.gz -> modsecurity-2.9.2.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz -> ngx_http_vhost_traffic_status-46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/2.0.tar.gz -> ngx_http_geoip2_module-2.0.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.2.4.tar.gz -> njs-0.2.4.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz )
-_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	ssl-cert	a1a4daed6b2479901759d6fe367c4c29	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=cfcf9abbde9dce5a3fa4001680bacb04
diff --git a/metadata/md5-cache/www-servers/nginx-1.15.5 b/metadata/md5-cache/www-servers/nginx-1.15.5
new file mode 100644
index 000000000000..673a98de8a87
--- /dev/null
+++ b/metadata/md5-cache/www-servers/nginx-1.15.5
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/expat ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_brotli? ( virtual/pkgconfig ) nginx_modules_http_security? ( !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ) arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops ) >=app-portage/elt-patches-20170815 virtual/pkgconfig
+DESCRIPTION=Robust, small and high performance http and reverse proxy server
+EAPI=6
+HOMEPAGE=https://nginx.org
+IUSE=aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_grpc +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_mirror +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_hash +nginx_modules_http_upstream_ip_hash +nginx_modules_http_upstream_keepalive +nginx_modules_http_upstream_least_conn +nginx_modules_http_upstream_zone +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_geo nginx_modules_stream_limit_conn nginx_modules_stream_map nginx_modules_stream_return nginx_modules_stream_split_clients nginx_modules_stream_upstream_hash nginx_modules_stream_upstream_least_conn nginx_modules_stream_upstream_zone nginx_modules_stream_geoip nginx_modules_stream_realip nginx_modules_stream_ssl_preread nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_auth_ldap nginx_modules_http_auth_pam nginx_modules_http_brotli nginx_modules_http_cache_purge nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_fancyindex nginx_modules_http_geoip2 nginx_modules_http_headers_more nginx_modules_http_javascript nginx_modules_http_lua nginx_modules_http_memc nginx_modules_http_metrics nginx_modules_http_mogilefs nginx_modules_http_naxsi nginx_modules_http_push_stream nginx_modules_http_security nginx_modules_http_slowfs_cache nginx_modules_http_sticky nginx_modules_http_upload_progress nginx_modules_http_upstream_check nginx_modules_http_vhost_traffic_status nginx_modules_stream_geoip2 nginx_modules_stream_javascript nginx_modules_http_spdy
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 )
+PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
+RDEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/expat ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:0
+REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_grpc? ( http2 ) nginx_modules_http_lua? ( nginx_modules_http_rewrite ) nginx_modules_http_naxsi? ( pcre ) nginx_modules_http_dav_ext? ( nginx_modules_http_dav ) nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) nginx_modules_http_security? ( pcre ) nginx_modules_http_push_stream? ( ssl )
+RESTRICT=test
+SLOT=mainline
+SRC_URI=https://nginx.org/download/nginx-1.15.5.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.0.tar.gz -> ngx_devel_kit-0.3.0-r1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.1.tar.gz -> ngx_http_auth_pam-1.5.1.tar.gz ) nginx_modules_http_brotli? ( https://github.com/eustas/ngx_brotli/archive/v0.1.2.tar.gz -> ngx_brotli-0.1.2.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v0.1.0.tar.gz -> ngx_http_dav_ext-0.1.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.61.tar.gz -> ngx_http_echo-0.61.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.3.tar.gz -> ngx_http_fancyindex-0.4.3.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/2.0.tar.gz -> ngx_http_geoip2_module-2.0.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.33.tar.gz -> ngx_http_headers_more-0.33.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.2.4.tar.gz -> njs-0.2.4.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.13.tar.gz -> ngx_http_lua-0.10.13.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.56.tar.gz -> ngx_http_naxsi-0.56.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.4.tar.gz -> ngx_http_push_stream-0.5.4.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.2/modsecurity-2.9.2.tar.gz -> modsecurity-2.9.2.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz -> ngx_http_vhost_traffic_status-46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/2.0.tar.gz -> ngx_http_geoip2_module-2.0.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.2.4.tar.gz -> njs-0.2.4.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz )
+_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	ssl-cert	a1a4daed6b2479901759d6fe367c4c29	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=cfcf9abbde9dce5a3fa4001680bacb04
diff --git a/metadata/md5-cache/www-servers/pathod-0.10 b/metadata/md5-cache/www-servers/pathod-0.10
index 580ae876f070..17712a25ab87 100644
--- a/metadata/md5-cache/www-servers/pathod-0.10
+++ b/metadata/md5-cache/www-servers/pathod-0.10
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/netlib-0.10[python_targets_python2_7(-)?,-python_single_tar
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pathod/pathod-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b0618805bd8bc38997184d54e9888331
diff --git a/metadata/md5-cache/www-servers/pathod-0.11.1 b/metadata/md5-cache/www-servers/pathod-0.11.1
index 73adbdf29c9b..8b4982b33189 100644
--- a/metadata/md5-cache/www-servers/pathod-0.11.1
+++ b/metadata/md5-cache/www-servers/pathod-0.11.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/netlib-0.11.1[python_targets_python2_7(-)?,-python_single_t
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pathod/pathod-0.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=57d4778ef921218e1e216fa5ac89384d
diff --git a/metadata/md5-cache/www-servers/pathod-0.12.0 b/metadata/md5-cache/www-servers/pathod-0.12.0
index 181ab63fdca4..776b84f33a8b 100644
--- a/metadata/md5-cache/www-servers/pathod-0.12.0
+++ b/metadata/md5-cache/www-servers/pathod-0.12.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/netlib-0.12.0[python_targets_python2_7(-)?,-python_single_t
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pathod/pathod-0.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e10bc8f654f0f1b2764e75e6ae18cea3
diff --git a/metadata/md5-cache/www-servers/servefile-0.4.4 b/metadata/md5-cache/www-servers/servefile-0.4.4
index db30bc117ab0..99a2cec398ce 100644
--- a/metadata/md5-cache/www-servers/servefile-0.4.4
+++ b/metadata/md5-cache/www-servers/servefile-0.4.4
@@ -10,5 +10,5 @@ RDEPEND=ssl? ( dev-python/pyopenssl ) sys-apps/grep sys-apps/iproute2 sys-apps/n
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://seba-geek.de/proj/servefile/servefile-0.4.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=aa8104ebad17096da8d30f020dfa91a8
diff --git a/metadata/md5-cache/www-servers/tornado-4.4.2-r1 b/metadata/md5-cache/www-servers/tornado-4.4.2-r1
index fe6dc0eecc9d..e25a7eb294e6 100644
--- a/metadata/md5-cache/www-servers/tornado-4.4.2-r1
+++ b/metadata/md5-cache/www-servers/tornado-4.4.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/certifi[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/t/tornado/tornado-4.4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=82e0c248423cc975155100ae6ae4c123
diff --git a/metadata/md5-cache/www-servers/tornado-4.5.1 b/metadata/md5-cache/www-servers/tornado-4.5.1
index 7e1cfd5c2825..16d87dcd9845 100644
--- a/metadata/md5-cache/www-servers/tornado-4.5.1
+++ b/metadata/md5-cache/www-servers/tornado-4.5.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/certifi[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/t/tornado/tornado-4.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fe711a66750a25a129a9a96fcece2699
diff --git a/metadata/md5-cache/www-servers/tornado-4.5.3 b/metadata/md5-cache/www-servers/tornado-4.5.3
index 73e3636ddf13..0d477df9f9c4 100644
--- a/metadata/md5-cache/www-servers/tornado-4.5.3
+++ b/metadata/md5-cache/www-servers/tornado-4.5.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/certifi[python_targets_python2_7(-)?,python_targets_python3_4
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/t/tornado/tornado-4.5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a72a17ddeb143ddf85f7a8d3f2f6bbd6
diff --git a/metadata/md5-cache/www-servers/tornado-5.0.2 b/metadata/md5-cache/www-servers/tornado-5.0.2
index 23fb669c4e1c..4dce062c5677 100644
--- a/metadata/md5-cache/www-servers/tornado-5.0.2
+++ b/metadata/md5-cache/www-servers/tornado-5.0.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( dev-python/futures[python_targets_python2_7(
 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/tornado/tornado-5.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bdd48fff0d3fd7fe7069c683d485ea8a
diff --git a/metadata/md5-cache/www-servers/tornado-5.1 b/metadata/md5-cache/www-servers/tornado-5.1
index c0e53f3ed5f6..c595b576b43d 100644
--- a/metadata/md5-cache/www-servers/tornado-5.1
+++ b/metadata/md5-cache/www-servers/tornado-5.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( dev-python/futures[python_targets_python2_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/t/tornado/tornado-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e97edb05aa4f5870b35deae78817a619
diff --git a/metadata/md5-cache/www-servers/varnish-6.0.0 b/metadata/md5-cache/www-servers/varnish-6.0.0
deleted file mode 100644
index 451d92664ac4..000000000000
--- a/metadata/md5-cache/www-servers/varnish-6.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-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
-DESCRIPTION=Varnish is a state-of-the-art, high-performance HTTP accelerator
-EAPI=6
-HOMEPAGE=https://varnish-cache.org/
-IUSE=jemalloc jit static-libs python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~mips ~ppc ~ppc64 ~x86
-LICENSE=BSD-2 GPL-2
-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(-)] sys-libs/readline:0= dev-libs/libpcre[jit?] jemalloc? ( dev-libs/jemalloc ) sys-libs/ncurses:0= sys-devel/gcc
-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=http://varnish-cache.org/_downloads/varnish-6.0.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_=5304810e8aad745fb864aae8ec194c27
diff --git a/metadata/md5-cache/www-servers/varnish-6.0.1 b/metadata/md5-cache/www-servers/varnish-6.0.1
index 94105dfa7fbf..c969ab1aa235 100644
--- a/metadata/md5-cache/www-servers/varnish-6.0.1
+++ b/metadata/md5-cache/www-servers/varnish-6.0.1
@@ -9,7 +9,7 @@ LICENSE=BSD-2 GPL-2
 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(-)] sys-libs/readline:0= dev-libs/libpcre[jit?] jemalloc? ( dev-libs/jemalloc ) sys-libs/ncurses:0= sys-devel/gcc
 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
+SLOT=0/1
 SRC_URI=http://varnish-cache.org/_downloads/varnish-6.0.1.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_=5304810e8aad745fb864aae8ec194c27
+_md5_=ee2a5c4ad5db9946799df43c2a23679e
diff --git a/metadata/md5-cache/www-servers/varnish-6.1.0 b/metadata/md5-cache/www-servers/varnish-6.1.0
new file mode 100644
index 000000000000..adc4415780de
--- /dev/null
+++ b/metadata/md5-cache/www-servers/varnish-6.1.0
@@ -0,0 +1,15 @@
+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
+DESCRIPTION=Varnish is a state-of-the-art, high-performance HTTP accelerator
+EAPI=6
+HOMEPAGE=https://varnish-cache.org/
+IUSE=jemalloc jit static-libs python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~mips ~ppc ~ppc64 ~x86
+LICENSE=BSD-2 GPL-2
+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(-)] sys-libs/readline:0= dev-libs/libpcre[jit?] jemalloc? ( dev-libs/jemalloc ) sys-libs/ncurses:0= sys-devel/gcc
+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/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
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index 4a4893eaee66..781fd21d39d3 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/copyq-2.8.1 b/metadata/md5-cache/x11-apps/copyq-2.8.1
index 8529f37fd660..93e56e0c9afb 100644
--- a/metadata/md5-cache/x11-apps/copyq-2.8.1
+++ b/metadata/md5-cache/x11-apps/copyq-2.8.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libXtst webkit? ( dev-qt/qtwebkit:5 )
 SLOT=0
 SRC_URI=https://github.com/hluk/CopyQ/archive/v2.8.1.tar.gz -> copyq-2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b76695cb68f9517e49bcb22113be42a9
diff --git a/metadata/md5-cache/x11-apps/copyq-3.5.0 b/metadata/md5-cache/x11-apps/copyq-3.5.0
index b4149c178015..30bc97833fc1 100644
--- a/metadata/md5-cache/x11-apps/copyq-3.5.0
+++ b/metadata/md5-cache/x11-apps/copyq-3.5.0
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hluk/CopyQ/archive/v3.5.0.tar.gz -> CopyQ-3.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=9605cbc6dc1390ce238a5b79c59c84e5
diff --git a/metadata/md5-cache/x11-apps/mesa-progs-8.2.0 b/metadata/md5-cache/x11-apps/mesa-progs-8.2.0
index 3a55827273cd..3614eb522ed3 100644
--- a/metadata/md5-cache/x11-apps/mesa-progs-8.2.0
+++ b/metadata/md5-cache/x11-apps/mesa-progs-8.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=Mesa's OpenGL utility and demo programs (glxgears and glxinfo)
 EAPI=5
 HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
 IUSE=egl gles2
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2
 RDEPEND=media-libs/mesa[egl?,gles2?] virtual/opengl x11-libs/libX11
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/demos/8.2.0/mesa-demos-8.2.0.tar.bz2
 _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_=065283e2af6c9d0fc6408c349cccc26d
+_md5_=5c4c119ae473c9846e40623825cf3a42
diff --git a/metadata/md5-cache/x11-apps/mesa-progs-8.3.0 b/metadata/md5-cache/x11-apps/mesa-progs-8.3.0
index cbfaf4a5325d..402fa91d10da 100644
--- a/metadata/md5-cache/x11-apps/mesa-progs-8.3.0
+++ b/metadata/md5-cache/x11-apps/mesa-progs-8.3.0
@@ -4,10 +4,10 @@ DESCRIPTION=Mesa's OpenGL utility and demo programs (glxgears and glxinfo)
 EAPI=5
 HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
 IUSE=egl gles2
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2
 RDEPEND=media-libs/mesa[egl?,gles2?] virtual/opengl x11-libs/libX11
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/demos/8.3.0/mesa-demos-8.3.0.tar.bz2
 _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_=270a135c1080b9fadadd2c51718e41a8
+_md5_=24cffd3be22e7869c5c31fdaf1a3e90f
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index 989acb6a6f55..da6666f75fcb 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/xorg-server-1.20.0 b/metadata/md5-cache/x11-base/xorg-server-1.20.0
deleted file mode 100644
index b0e7d6ffab6b..000000000000
--- a/metadata/md5-cache/x11-base/xorg-server-1.20.0
+++ /dev/null
@@ -1,15 +0,0 @@
-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-10.3.4-r1[egl,gbm] !x11-libs/glamor ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-10.3.4-r1 ) 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-10.3.4-r1[egl,gbm] !x11-libs/glamor ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-10.3.4-r1 ) 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.0
-SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-1.20.0.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_=331b1309a0f3bb65b5de3b05670ccae4
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 1e4874a38f78..9c920e1b9b86 100644
--- a/metadata/md5-cache/x11-drivers/Manifest.gz
+++ b/metadata/md5-cache/x11-drivers/Manifest.gz
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-304.137 b/metadata/md5-cache/x11-drivers/nvidia-drivers-304.137
index 3200d2eadccc..d1f83a4b81ef 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-304.137
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-304.137
@@ -12,5 +12,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror
 SLOT=0/304
 SRC_URI=amd64-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86_64/304.137/NVIDIA-FreeBSD-x86_64-304.137.tar.gz ) amd64? ( http://http.download.nvidia.com/XFree86/Linux-x86_64/304.137/NVIDIA-Linux-x86_64-304.137.run ) x86-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86/304.137/NVIDIA-FreeBSD-x86-304.137.tar.gz ) x86? ( http://http.download.nvidia.com/XFree86/Linux-x86/304.137/NVIDIA-Linux-x86-304.137.run ) tools? ( http://http.download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-304.137.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	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
+_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_=7ec94060af11f5885817d92edf73f502
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-340.107 b/metadata/md5-cache/x11-drivers/nvidia-drivers-340.107
index fa6b857c35f1..0249e4ae735a 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-340.107
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-340.107
@@ -11,5 +11,5 @@ REQUIRED_USE=tools? ( X )
 RESTRICT=bindist mirror
 SLOT=0/340
 SRC_URI=amd64-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86_64/340.107/NVIDIA-FreeBSD-x86_64-340.107.tar.gz ) amd64? ( http://http.download.nvidia.com/XFree86/Linux-x86_64/340.107/NVIDIA-Linux-x86_64-340.107.run ) x86-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86/340.107/NVIDIA-FreeBSD-x86-340.107.tar.gz ) x86? ( http://http.download.nvidia.com/XFree86/Linux-x86/340.107/NVIDIA-Linux-x86-340.107.run ) tools? ( http://http.download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-340.107.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	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
+_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_=d88d5246888524f053fb17b81105b794
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-375.82 b/metadata/md5-cache/x11-drivers/nvidia-drivers-375.82
index 55ce80f9530f..25bb8b90fcd6 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-375.82
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-375.82
@@ -11,5 +11,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror
 SLOT=0/375
 SRC_URI=amd64-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86_64/375.82/NVIDIA-FreeBSD-x86_64-375.82.tar.gz ) amd64? ( http://http.download.nvidia.com/XFree86/Linux-x86_64/375.82/NVIDIA-Linux-x86_64-375.82.run ) arm? ( http://http.download.nvidia.com/XFree86/Linux-32bit-ARM/375.82/NVIDIA-Linux-armv7l-gnueabihf-375.82.run ) x86-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86/375.82/NVIDIA-FreeBSD-x86-375.82.tar.gz ) x86? ( http://http.download.nvidia.com/XFree86/Linux-x86/375.82/NVIDIA-Linux-x86-375.82.run ) tools? ( https://github.com/NVIDIA/nvidia-settings/archive/375.82.tar.gz -> nvidia-settings-375.82.tar.gz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	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
+_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_=eca9bbce7a93d15b7b1fd6e608543d51
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-378.13-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-378.13-r1
index 6bbbd35cf793..5f9234e44e55 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-378.13-r1
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-378.13-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror
 SLOT=0/378
 SRC_URI=amd64-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86_64/378.13/NVIDIA-FreeBSD-x86_64-378.13.tar.gz ) amd64? ( http://http.download.nvidia.com/XFree86/Linux-x86_64/378.13/NVIDIA-Linux-x86_64-378.13.run ) arm? ( http://http.download.nvidia.com/XFree86/Linux-32bit-ARM/378.13/NVIDIA-Linux-armv7l-gnueabihf-378.13.run ) x86-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86/378.13/NVIDIA-FreeBSD-x86-378.13.tar.gz ) x86? ( http://http.download.nvidia.com/XFree86/Linux-x86/378.13/NVIDIA-Linux-x86-378.13.run ) tools? ( https://github.com/NVIDIA/nvidia-settings/archive/378.13.tar.gz -> nvidia-settings-378.13.tar.gz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	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
+_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_=0ff214d1d95e6defd3396a748c5db633
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-381.22-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-381.22-r1
index a20cdd8813d3..056f5eb3591f 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-381.22-r1
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-381.22-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror
 SLOT=0/381
 SRC_URI=amd64-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86_64/381.22/NVIDIA-FreeBSD-x86_64-381.22.tar.gz ) amd64? ( http://http.download.nvidia.com/XFree86/Linux-x86_64/381.22/NVIDIA-Linux-x86_64-381.22.run ) arm? ( http://http.download.nvidia.com/XFree86/Linux-32bit-ARM/381.22/NVIDIA-Linux-armv7l-gnueabihf-381.22.run ) x86-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86/381.22/NVIDIA-FreeBSD-x86-381.22.tar.gz ) x86? ( http://http.download.nvidia.com/XFree86/Linux-x86/381.22/NVIDIA-Linux-x86-381.22.run ) tools? ( https://github.com/NVIDIA/nvidia-settings/archive/381.22.tar.gz -> nvidia-settings-381.22.tar.gz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	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
+_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_=5ddc5b4831b973495a8b6e3df9ce03fb
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-384.130 b/metadata/md5-cache/x11-drivers/nvidia-drivers-384.130
index b6ff17286346..a704fa5616be 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-384.130
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-384.130
@@ -11,5 +11,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror
 SLOT=0/384
 SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/384.130/NVIDIA-FreeBSD-x86_64-384.130.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/384.130/NVIDIA-Linux-x86_64-384.130.run ) arm? ( http://us.download.nvidia.com/XFree86/Linux-32bit-ARM/384.130/NVIDIA-Linux-armv7l-gnueabihf-384.130.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/384.130/NVIDIA-FreeBSD-x86-384.130.tar.gz ) x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/384.130/NVIDIA-Linux-x86-384.130.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-384.130.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	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
+_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_=086dc6aac5e3c22454f3adf0d615c20c
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-387.34 b/metadata/md5-cache/x11-drivers/nvidia-drivers-387.34
index aa40d1e9a79c..626224cc6f12 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-387.34
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-387.34
@@ -11,5 +11,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror
 SLOT=0/387
 SRC_URI=amd64-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86_64/387.34/NVIDIA-FreeBSD-x86_64-387.34.tar.gz ) amd64? ( http://http.download.nvidia.com/XFree86/Linux-x86_64/387.34/NVIDIA-Linux-x86_64-387.34.run ) arm? ( http://http.download.nvidia.com/XFree86/Linux-32bit-ARM/387.34/NVIDIA-Linux-armv7l-gnueabihf-387.34.run ) x86-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86/387.34/NVIDIA-FreeBSD-x86-387.34.tar.gz ) x86? ( http://http.download.nvidia.com/XFree86/Linux-x86/387.34/NVIDIA-Linux-x86-387.34.run ) tools? ( https://github.com/NVIDIA/nvidia-settings/archive/387.34.tar.gz -> nvidia-settings-387.34.tar.gz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	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
+_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_=34b517e7faa3080d75eab05d8a7d84ab
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.87 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.87
index 567b386aea36..931e1b572ed0 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.87
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.87
@@ -11,5 +11,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror
 SLOT=0/390
 SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/390.87/NVIDIA-FreeBSD-x86_64-390.87.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/390.87/NVIDIA-Linux-x86_64-390.87.run ) arm? ( http://us.download.nvidia.com/XFree86/Linux-x86-ARM/390.87/NVIDIA-Linux-armv7l-gnueabihf-390.87.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/390.87/NVIDIA-FreeBSD-x86-390.87.tar.gz ) x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/390.87/NVIDIA-Linux-x86-390.87.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.87.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	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_=06ca1af6146a1737e1b64dacab69e691
+_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_=29765f707a791a8b087634a2a622e386
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-396.54 b/metadata/md5-cache/x11-drivers/nvidia-drivers-396.54
index 7af7990eb261..0e4a567933e8 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-396.54
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-396.54
@@ -11,5 +11,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror
 SLOT=0/396
 SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/396.54/NVIDIA-FreeBSD-x86_64-396.54.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/396.54/NVIDIA-Linux-x86_64-396.54.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-396.54.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	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
+_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_=f51e393d0a9ccda7a79434612c5a0422
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-410.57 b/metadata/md5-cache/x11-drivers/nvidia-drivers-410.57
deleted file mode 100644
index 57f879efac3c..000000000000
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-410.57
+++ /dev/null
@@ -1,15 +0,0 @@
-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.57/NVIDIA-FreeBSD-x86_64-410.57.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/410.57/NVIDIA-Linux-x86_64-410.57.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-410.57.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	915cae3d7d636732918d18827fb1c226	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_=2a02fac78df15d920ae73a4cb81e8664
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-410.57-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-410.57-r1
new file mode 100644
index 000000000000..66760c55662c
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-410.57-r1
@@ -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.57/NVIDIA-FreeBSD-x86_64-410.57.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/410.57/NVIDIA-Linux-x86_64-410.57.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-410.57.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-evdev-2.10.5 b/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.5
index 74aa854dbd91..763bf561f17e 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.5
+++ b/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.5
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.18[udev] dev-libs/libevdev sys-libs/mtdev virtual/libudev:= x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-evdev-2.10.5.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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	3177e7a1a6d7ed77cd228f01de48336b
+_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_=c1c8665dea0a494ecd0500a381a22091
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.6 b/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.6
index d4382d69ec35..0fd9b5ef089b 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.6
+++ b/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.6
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.18[udev] dev-libs/libevdev sys-libs/mtdev virtual/libudev:= x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-evdev-2.10.6.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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	3177e7a1a6d7ed77cd228f01de48336b
+_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_=c1c8665dea0a494ecd0500a381a22091
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.27.1 b/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.27.1
index aca4d0ce2425..0020f137f76c 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.27.1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.27.1
@@ -9,5 +9,5 @@ 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.27.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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	3177e7a1a6d7ed77cd228f01de48336b
+_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_=ad56481a2dd13542f196f7277475ab54
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.28.0-r1 b/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.28.0-r1
index 6473176bd5e2..eec69150f84a 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.28.0-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.28.0-r1
@@ -9,5 +9,5 @@ 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.0.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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	3177e7a1a6d7ed77cd228f01de48336b
+_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_=9859808ab1f6f856df5bdabec1b4efcf
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.0 b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.0
index fbe5b9d85f0a..72e7a9089f91 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=kernel_linux? ( >=dev-libs/libevdev-0.4 ) >=x11-base/xorg-server-1.14 >=x11-libs/libXi-1.2 >=x11-libs/libXtst-1.1.0 x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-synaptics-1.9.0.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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	3177e7a1a6d7ed77cd228f01de48336b
+_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_=e7c2c1fdc81bb597bacae765363e83cc
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.1 b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.1
index ac77723892dc..24be585ed898 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=kernel_linux? ( >=dev-libs/libevdev-0.4 ) >=x11-base/xorg-server-1.14 >=x11-libs/libXi-1.2 >=x11-libs/libXtst-1.1.0 x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-synaptics-1.9.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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	3177e7a1a6d7ed77cd228f01de48336b
+_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_=e7c2c1fdc81bb597bacae765363e83cc
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.34.0 b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.34.0
index 7d073a3021fb..f1d8586e0714 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.34.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.34.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libwacom virtual/udev >=x11-base/xorg-server-1.7 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=mirror://sourceforge/linuxwacom/xf86-input-wacom/xf86-input-wacom-0.34.0.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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	3177e7a1a6d7ed77cd228f01de48336b
+_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_=48bd26fe473a254b3ac4c45d0ea2d93d
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.35.0 b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.35.0
index 84dbb9297c67..91ee5ed787ba 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.35.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.35.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libwacom virtual/udev >=x11-base/xorg-server-1.7 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=mirror://sourceforge/linuxwacom/xf86-input-wacom/xf86-input-wacom-0.35.0.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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	3177e7a1a6d7ed77cd228f01de48336b
+_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_=5ae716ffe1907550506664e0b0e1fa3d
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.36.0 b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.36.0
index af60cab39456..0b2afed66c8d 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.36.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.36.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libwacom virtual/udev >=x11-base/xorg-server-1.7 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=mirror://sourceforge/linuxwacom/xf86-input-wacom/xf86-input-wacom-0.36.0.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	3177e7a1a6d7ed77cd228f01de48336b
+_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_=ad71bfa693d0292b8ca516145ab02982
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.36.0-r2 b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.36.0-r2
index db6b1521560e..3fc42ba4fe23 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.36.0-r2
+++ b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.36.0-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libwacom virtual/libudev:= >=x11-base/xorg-server-1.7 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=mirror://sourceforge/linuxwacom/xf86-input-wacom/xf86-input-wacom-0.36.0.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	3177e7a1a6d7ed77cd228f01de48336b
+_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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	3177e7a1a6d7ed77cd228f01de48336b
 _md5_=38de417953d7cc723e05ae4f97893cf2
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ati-18.0.1 b/metadata/md5-cache/x11-drivers/xf86-video-ati-18.0.1
index d45fbd6112a7..798e29c89d46 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ati-18.0.1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ati-18.0.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.78[video_cards_radeon] >=x11-libs/libpciaccess-0.8.0 glamor? ( x11-base/xorg-server[glamor] ) udev? ( virtual/udev ) x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-ati-18.0.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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	3177e7a1a6d7ed77cd228f01de48336b
+_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_=a471ac4de4eb43eedf4e91e88eb4c112
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ati-18.0.1-r1 b/metadata/md5-cache/x11-drivers/xf86-video-ati-18.0.1-r1
index 7c176f935b22..fba0cd176133 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ati-18.0.1-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ati-18.0.1-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.78[video_cards_radeon] >=x11-libs/libpciaccess-0.8.0 glamor? ( x11-base/xorg-server[glamor] ) udev? ( virtual/libudev:= ) x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-ati-18.0.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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	3177e7a1a6d7ed77cd228f01de48336b
+_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_=185e92a1bef2ad00d17cfea3a3d8e368
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ati-18.1.0 b/metadata/md5-cache/x11-drivers/xf86-video-ati-18.1.0
index f128483ce0e2..7472c7518aea 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ati-18.1.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ati-18.1.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.78[video_cards_radeon] >=x11-libs/libpciaccess-0.8.0 glamor? ( x11-base/xorg-server[glamor] ) udev? ( virtual/libudev:= ) x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-ati-18.1.0.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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	3177e7a1a6d7ed77cd228f01de48336b
+_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_=c1ed85076df75778426606d4ccbc2a70
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ati-9999 b/metadata/md5-cache/x11-drivers/xf86-video-ati-9999
index 101a3a17e57e..087968609eb3 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ati-9999
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ati-9999
@@ -7,5 +7,5 @@ IUSE=+glamor udev kernel_linux
 LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.78[video_cards_radeon] >=x11-libs/libpciaccess-0.8.0 glamor? ( x11-base/xorg-server[glamor] ) udev? ( virtual/libudev:= ) x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	3177e7a1a6d7ed77cd228f01de48336b
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	3177e7a1a6d7ed77cd228f01de48336b
 _md5_=c1ed85076df75778426606d4ccbc2a70
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20180214 b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20180214
index 78d5ea5d8d0d..a5a48d6797aa 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20180214
+++ b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20180214
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/libXext x11-libs/libXfixes x11-libs/libXScrnSaver >=x11-libs/pi
 REQUIRED_USE=|| ( sna uxa )
 SLOT=0
 SRC_URI=https://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/75795523003798d789d417e82aaa81c7ea1ed616.tar.xz -> xf86-video-intel-2.99.917_p20180214.tar.xz
-_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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	3177e7a1a6d7ed77cd228f01de48336b
+_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_=0cebc6cb791a829f16963a905b0ec9f4
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20180214-r1 b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20180214-r1
index 0c175b334339..a3c5c85fc61b 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20180214-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20180214-r1
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/libXext x11-libs/libXfixes x11-libs/libXScrnSaver >=x11-libs/pi
 REQUIRED_USE=|| ( sna uxa )
 SLOT=0
 SRC_URI=https://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/75795523003798d789d417e82aaa81c7ea1ed616.tar.xz -> xf86-video-intel-2.99.917_p20180214.tar.xz
-_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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	3177e7a1a6d7ed77cd228f01de48336b
+_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_=d13634f32312f3988f4f18fe98b46bb3
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-intel-9999 b/metadata/md5-cache/x11-drivers/xf86-video-intel-9999
index 64a84781e45b..cfc2d7c7d940 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-intel-9999
+++ b/metadata/md5-cache/x11-drivers/xf86-video-intel-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXext x11-libs/libXfixes x11-libs/libXScrnSaver >=x11-libs/pixman-0.27.1 >=x11-libs/libdrm-2.4.52[video_cards_intel] dri3? ( >=x11-base/xorg-server-1.18 !<=media-libs/mesa-12.0.4 ) sna? ( >=x11-base/xorg-server-1.10 ) tools? ( x11-libs/libX11 x11-libs/libxcb x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libxshmfence x11-libs/libXtst ) udev? ( virtual/libudev:= ) xvmc? ( x11-libs/libXvMC >=x11-libs/libxcb-1.5 x11-libs/xcb-util ) x11-base/xorg-server:= dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 REQUIRED_USE=|| ( sna uxa )
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	3177e7a1a6d7ed77cd228f01de48336b
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	3177e7a1a6d7ed77cd228f01de48336b
 _md5_=4b04fb4a8a473ad37f2adceb8699a77d
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.4 b/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.4
index fddc0f1b7dbe..1e4e053b85ea 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.4
+++ b/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.6 >=x11-libs/libpciaccess-0.12.901 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-vesa-2.3.4.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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	3177e7a1a6d7ed77cd228f01de48336b
+_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_=7f1da616e39a2c4606ca85b0d7808426
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.4.0 b/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.4.0
index ded817d88ca1..dad253cb69df 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.4.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.4.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.6 >=x11-libs/libpciaccess-0.12.901 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-vesa-2.4.0.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	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	3177e7a1a6d7ed77cd228f01de48336b
+_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_=400530ba569d8bd0889ac929b9f5ebe3
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 783e7751e449..39305cd93d6c 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-r3 b/metadata/md5-cache/x11-libs/agg-2.5-r3
index 505a86dfe1b2..4ba3a9b6dd31 100644
--- a/metadata/md5-cache/x11-libs/agg-2.5-r3
+++ b/metadata/md5-cache/x11-libs/agg-2.5-r3
@@ -1,13 +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=sdl? ( >=media-libs/libsdl-1.2.0[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
+DEPEND=sdl? ( >=media-libs/libsdl-1.2.0[X?] ) X? ( >=x11-libs/libX11-1.3.99.901 ) truetype? ( media-libs/freetype:2 ) virtual/pkgconfig
 DESCRIPTION=High quality rendering engine library for C++
-EAPI=6
+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	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=b9832c2813192234b8477b4606970d98
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=6081737b8fd38aefd2deff7fc4fb8fc7
diff --git a/metadata/md5-cache/x11-libs/colord-gtk-0.1.26 b/metadata/md5-cache/x11-libs/colord-gtk-0.1.26
index d33364e59d63..b1ebff5c2628 100644
--- a/metadata/md5-cache/x11-libs/colord-gtk-0.1.26
+++ b/metadata/md5-cache/x11-libs/colord-gtk-0.1.26
@@ -11,5 +11,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=test
 SLOT=0/1
 SRC_URI=https://www.freedesktop.org/software/colord/releases/colord-gtk-0.1.26.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=13f91a67880118c7ba83052b024006c5
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 b696424ab081..344ea27f3087 100644
--- a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.11
+++ b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.11
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.48.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libpng-1.4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/jasper:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<gnome-base/gail-1000 !<gnome-base/librsvg-2.31.0 !<x11-libs/gtk+-2.21.3:2 !<x11-libs/gtk+-2.90.4:3
 SLOT=2
 SRC_URI=mirror://gnome/sources/gdk-pixbuf/2.36/gdk-pixbuf-2.36.11.tar.xz
-_eclasses_=autotools	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	89bb9f083a2590d9b447fd0b78a96186
+_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
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 f7c2e06c9ca0..3a647a1bbe25 100644
--- a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.12
+++ b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.12
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.48.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libpng-1.4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/jasper:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<gnome-base/gail-1000 !<gnome-base/librsvg-2.31.0 !<x11-libs/gtk+-2.21.3:2 !<x11-libs/gtk+-2.90.4:3
 SLOT=2
 SRC_URI=mirror://gnome/sources/gdk-pixbuf/2.36/gdk-pixbuf-2.36.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	89bb9f083a2590d9b447fd0b78a96186
+_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
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 497523cc7c77..b429b03b3b0a 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _md5_=560a3463c17a6a1d04113270f2078c5b
diff --git a/metadata/md5-cache/x11-libs/gksu-2.0.2-r2 b/metadata/md5-cache/x11-libs/gksu-2.0.2-r2
index 5c5ec48ba303..6b314aec5ea6 100644
--- a/metadata/md5-cache/x11-libs/gksu-2.0.2-r2
+++ b/metadata/md5-cache/x11-libs/gksu-2.0.2-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/libgksu-2.0.8 >=x11-libs/gtk+-2.4:2 >=gnome-base/gconf-2 gnome? ( >=gnome-base/nautilus-2 x11-terms/gnome-terminal )
 SLOT=0
 SRC_URI=https://people.debian.org/~kov/gksu/gksu-2.0.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	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_=0113386a9cf75f003c67ec1f71db991a
diff --git a/metadata/md5-cache/x11-libs/gl2ps-1.3.9 b/metadata/md5-cache/x11-libs/gl2ps-1.3.9
index 99bab6b19767..c626c1e45fea 100644
--- a/metadata/md5-cache/x11-libs/gl2ps-1.3.9
+++ b/metadata/md5-cache/x11-libs/gl2ps-1.3.9
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=media-libs/freeglut x11-libs/libXmu png? ( media-libs/libpng:0= ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://geuz.org/gl2ps/src/gl2ps-1.3.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0c3487aa503889939f857e6a6cfade49
diff --git a/metadata/md5-cache/x11-libs/gl2ps-1.4.0 b/metadata/md5-cache/x11-libs/gl2ps-1.4.0
index 4d111f7d27e2..26f41b0e9b64 100644
--- a/metadata/md5-cache/x11-libs/gl2ps-1.4.0
+++ b/metadata/md5-cache/x11-libs/gl2ps-1.4.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=media-libs/freeglut x11-libs/libXmu png? ( media-libs/libpng:0= ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://geuz.org/gl2ps/src/gl2ps-1.4.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=80e6ab2a4d22ec045ba7e414dc9ee400
diff --git a/metadata/md5-cache/x11-libs/gnome-pty-helper-0.36.3 b/metadata/md5-cache/x11-libs/gnome-pty-helper-0.36.3
index 30c6ac9c0b61..9b5cc9c0b8ce 100644
--- a/metadata/md5-cache/x11-libs/gnome-pty-helper-0.36.3
+++ b/metadata/md5-cache/x11-libs/gnome-pty-helper-0.36.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=!<x11-libs/vte-0.27.90
 SLOT=0
 SRC_URI=mirror://gnome/sources/vte/0.36/vte-0.36.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=75328259d94f0d493ff14ad5b71a4bfb
diff --git a/metadata/md5-cache/x11-libs/gnome-pty-helper-0.38.3 b/metadata/md5-cache/x11-libs/gnome-pty-helper-0.38.3
index 6c7ebef225c7..6d52829cae75 100644
--- a/metadata/md5-cache/x11-libs/gnome-pty-helper-0.38.3
+++ b/metadata/md5-cache/x11-libs/gnome-pty-helper-0.38.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=!<x11-libs/vte-0.27.90
 SLOT=0
 SRC_URI=mirror://gnome/sources/vte/0.38/vte-0.38.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f4367f6c27ac2421e9d2ea8532518d74
diff --git a/metadata/md5-cache/x11-libs/gnome-pty-helper-0.40.2 b/metadata/md5-cache/x11-libs/gnome-pty-helper-0.40.2
index 15fca665fb83..ef5fbb34914e 100644
--- a/metadata/md5-cache/x11-libs/gnome-pty-helper-0.40.2
+++ b/metadata/md5-cache/x11-libs/gnome-pty-helper-0.40.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=!<x11-libs/vte-0.27.90
 SLOT=0
 SRC_URI=mirror://gnome/sources/vte/0.40/vte-0.40.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f4367f6c27ac2421e9d2ea8532518d74
diff --git a/metadata/md5-cache/x11-libs/goffice-0.10.38 b/metadata/md5-cache/x11-libs/goffice-0.10.38
index 60221c4f09f5..67a8ffe39033 100644
--- a/metadata/md5-cache/x11-libs/goffice-0.10.38
+++ b/metadata/md5-cache/x11-libs/goffice-0.10.38
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-text/libspectre-0.2.6:= >=dev-libs/glib-2.38.0:2 dev-libs/libxslt >=gnome-base/librsvg-2.22:2 >=gnome-extra/libgsf-1.14.24:=[introspection?] >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.24:= >=x11-libs/cairo-1.10:=[svg] x11-libs/libXext:= x11-libs/libXrender:= >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/gtk+-3.20:3 introspection? ( >=dev-libs/gobject-introspection-1:= >=gnome-extra/libgsf-1.14.23:= )
 SLOT=0.10
 SRC_URI=mirror://gnome/sources/goffice/0.10/goffice-0.10.38.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b3d41288291f94633ec52773f7413d07
diff --git a/metadata/md5-cache/x11-libs/goffice-0.10.41 b/metadata/md5-cache/x11-libs/goffice-0.10.41
index ea6f6e1ca640..32b0dd7a49c7 100644
--- a/metadata/md5-cache/x11-libs/goffice-0.10.41
+++ b/metadata/md5-cache/x11-libs/goffice-0.10.41
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-text/libspectre-0.2.6:= >=dev-libs/glib-2.38.0:2 dev-libs/libxslt >=gnome-base/librsvg-2.22:2 >=gnome-extra/libgsf-1.14.24:=[introspection?] >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.24:= >=x11-libs/cairo-1.10:=[svg] x11-libs/libXext:= x11-libs/libXrender:= >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/gtk+-3.20:3 introspection? ( >=dev-libs/gobject-introspection-1:= >=gnome-extra/libgsf-1.14.23:= )
 SLOT=0.10
 SRC_URI=mirror://gnome/sources/goffice/0.10/goffice-0.10.41.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3c9730b08e9a3582097cf337780268c0
diff --git a/metadata/md5-cache/x11-libs/goocanvas-1.0.0 b/metadata/md5-cache/x11-libs/goocanvas-1.0.0
index 797d84a063bc..74ec26866466 100644
--- a/metadata/md5-cache/x11-libs/goocanvas-1.0.0
+++ b/metadata/md5-cache/x11-libs/goocanvas-1.0.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=x11-libs/gtk+-2.12:2 >=dev-libs/glib-2.10:2 >=x11-libs/cairo-1.4
 SLOT=0
 SRC_URI=mirror://gnome/sources/goocanvas/1.0/goocanvas-1.0.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=2ae2d730819f667d8af995056fc0e387
diff --git a/metadata/md5-cache/x11-libs/goocanvas-2.0.4 b/metadata/md5-cache/x11-libs/goocanvas-2.0.4
index e9ed2436f090..7c2531017eb6 100644
--- a/metadata/md5-cache/x11-libs/goocanvas-2.0.4
+++ b/metadata/md5-cache/x11-libs/goocanvas-2.0.4
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/gtk+-3.0.0:3 >=dev-libs/glib-2.28.0:2 >=x11-libs/cairo-1.10.0
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/goocanvas/2.0/goocanvas-2.0.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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e7bb1c8fcac0a49eec708c7beb1a8868
diff --git a/metadata/md5-cache/x11-libs/gtef-2.0.1 b/metadata/md5-cache/x11-libs/gtef-2.0.1
index 37b64504d2cd..4180b2d57af2 100644
--- a/metadata/md5-cache/x11-libs/gtef-2.0.1
+++ b/metadata/md5-cache/x11-libs/gtef-2.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=test? ( dev-util/valgrind ) vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) >=sys-devel/gettext-0.19.4 >=dev-util/gtk-doc-am-1.25 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=test? ( dev-util/valgrind ) vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) >=sys-devel/gettext-0.19.4 dev-util/glib-utils >=dev-util/gtk-doc-am-1.25 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=GtkSourceView-based text editors and IDE helper library
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Gtef
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.20 >=x11-libs/gtksourceview-3.2
 REQUIRED_USE=vala? ( introspection )
 SLOT=2
 SRC_URI=mirror://gnome/sources/gtef/2.0/gtef-2.0.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=8b3dc84fb5f31f06a96852b542ee3e2c
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=796a99b4c9fc56ecc6780f72ef8efce4
diff --git a/metadata/md5-cache/x11-libs/gtk+-2.24.31-r1 b/metadata/md5-cache/x11-libs/gtk+-2.24.31-r1
index 6f1c64cfb42a..a04ad1d8266c 100644
--- a/metadata/md5-cache/x11-libs/gtk+-2.24.31-r1
+++ b/metadata/md5-cache/x11-libs/gtk+-2.24.31-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=xinerama? ( !aqua )
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gtk+/2.24/gtk+-2.24.31.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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=49ec40f07f01f5eddfd068039711e133
diff --git a/metadata/md5-cache/x11-libs/gtk+-2.24.32 b/metadata/md5-cache/x11-libs/gtk+-2.24.32
index fa5492876c51..9c4c9a929910 100644
--- a/metadata/md5-cache/x11-libs/gtk+-2.24.32
+++ b/metadata/md5-cache/x11-libs/gtk+-2.24.32
@@ -12,5 +12,5 @@ REQUIRED_USE=xinerama? ( !aqua )
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gtk+/2.24/gtk+-2.24.32.tar.xz https://dev.gentoo.org/~leio/distfiles/gtk+-2.24.32-patchset.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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9a0a47a161329d2f1f4def93d8540749
diff --git a/metadata/md5-cache/x11-libs/gtk+-2.24.32-r1 b/metadata/md5-cache/x11-libs/gtk+-2.24.32-r1
index 0132b0362f24..58086f02a7b7 100644
--- a/metadata/md5-cache/x11-libs/gtk+-2.24.32-r1
+++ b/metadata/md5-cache/x11-libs/gtk+-2.24.32-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=xinerama? ( !aqua )
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gtk+/2.24/gtk+-2.24.32.tar.xz https://dev.gentoo.org/~leio/distfiles/gtk+-2.24.32-patchset-r1.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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e5e91898c3abd1ebecd5b3f86721ec5d
diff --git a/metadata/md5-cache/x11-libs/gtk+-3.22.19 b/metadata/md5-cache/x11-libs/gtk+-3.22.19
index 14722754939c..0a675e1d67d7 100644
--- a/metadata/md5-cache/x11-libs/gtk+-3.22.19
+++ b/metadata/md5-cache/x11-libs/gtk+-3.22.19
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( aqua wayland X ) xinerama? ( X )
 RESTRICT=test
 SLOT=3
 SRC_URI=mirror://gnome/sources/gtk+/3.22/gtk+-3.22.19.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=88304e72938372b4f6631bdb353da10c
diff --git a/metadata/md5-cache/x11-libs/gtk+-3.22.29 b/metadata/md5-cache/x11-libs/gtk+-3.22.29
index 43dfa40aa447..2a8a7d75d485 100644
--- a/metadata/md5-cache/x11-libs/gtk+-3.22.29
+++ b/metadata/md5-cache/x11-libs/gtk+-3.22.29
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( aqua wayland X ) xinerama? ( X )
 RESTRICT=test
 SLOT=3
 SRC_URI=mirror://gnome/sources/gtk+/3.22/gtk+-3.22.29.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c912b5cb43cfd05518353e3756e6d5a6
diff --git a/metadata/md5-cache/x11-libs/gtk+-3.22.30 b/metadata/md5-cache/x11-libs/gtk+-3.22.30
index 0b6fc549c559..a456f4d6cbff 100644
--- a/metadata/md5-cache/x11-libs/gtk+-3.22.30
+++ b/metadata/md5-cache/x11-libs/gtk+-3.22.30
@@ -4,7 +4,7 @@ DESCRIPTION=Gimp ToolKit +
 EAPI=6
 HOMEPAGE=https://www.gtk.org/
 IUSE=aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland +X xinerama 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 ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 PDEPEND=gnome-base/librsvg[abi_x86_32(-)?,abi_x86_64(-)?,abi_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/adwaita-icon-theme-3.14 vim-syntax? ( app-vim/gtk-syntax )
 RDEPEND=>=dev-libs/atk-2.15[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(-)?] >=dev-libs/glib-2.49.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(-)?] 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/libepoxy-1.0[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(-)?] >=x11-libs/cairo-1.14[aqua?,glib,svg,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(-)?] >=x11-libs/gdk-pixbuf-2.30: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(-)?] >=x11-libs/pango-1.37.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(-)?] x11-misc/shared-mime-info cloudprint? ( >=net-libs/rest-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(-)?] >=dev-libs/json-glib-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(-)?] ) colord? ( >=x11-misc/colord-0.1.9:0=[abi_x86_32(-)?,abi_x86_64(-)?,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-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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) wayland? ( >=dev-libs/wayland-1.9.91[abi_x86_32(-)?,abi_x86_64(-)?,abi_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.12 media-libs/mesa[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(-)?] >=x11-libs/libxkbcommon-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(-)?] ) X? ( >=app-accessibility/at-spi2-atk-2.5.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/libXi-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/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/libXrandr-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(-)?] 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/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/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(-)?] x11-libs/libXdamage[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) ) >=dev-util/gtk-update-icon-cache-3 !<gnome-base/gail-1000 !<x11-libs/vte-0.31.0:2.90
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( aqua wayland X ) xinerama? ( X )
 RESTRICT=test
 SLOT=3
 SRC_URI=mirror://gnome/sources/gtk+/3.22/gtk+-3.22.30.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=81b036c19dc818aa2a2fb400a2dd435d
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=12ed3f512ea51dc3650584eb70cd06ff
diff --git a/metadata/md5-cache/x11-libs/gtk+-3.24.0 b/metadata/md5-cache/x11-libs/gtk+-3.24.0
index ba597c8bf648..6066cb3bef57 100644
--- a/metadata/md5-cache/x11-libs/gtk+-3.24.0
+++ b/metadata/md5-cache/x11-libs/gtk+-3.24.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( aqua wayland X ) xinerama? ( X )
 RESTRICT=test
 SLOT=3
 SRC_URI=mirror://gnome/sources/gtk+/3.24/gtk+-3.24.0.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e2875687f735a33f04026c181028af3c
diff --git a/metadata/md5-cache/x11-libs/gtk+-3.24.1 b/metadata/md5-cache/x11-libs/gtk+-3.24.1
index b68900b5fd0e..8122ea2f32cb 100644
--- a/metadata/md5-cache/x11-libs/gtk+-3.24.1
+++ b/metadata/md5-cache/x11-libs/gtk+-3.24.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( aqua wayland X ) xinerama? ( X )
 RESTRICT=test
 SLOT=3
 SRC_URI=mirror://gnome/sources/gtk+/3.24/gtk+-3.24.1.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e2875687f735a33f04026c181028af3c
diff --git a/metadata/md5-cache/x11-libs/gtk+extra-3.3.3 b/metadata/md5-cache/x11-libs/gtk+extra-3.3.3
index dcb8f75fa350..b6c09ba7ebed 100644
--- a/metadata/md5-cache/x11-libs/gtk+extra-3.3.3
+++ b/metadata/md5-cache/x11-libs/gtk+extra-3.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=x11-libs/gtk+-2.12.0:2 dev-libs/glib:2 introspection? ( >=dev-libs/gobject-introspection-0.6.14:= ) 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=>=x11-libs/gtk+-2.12.0:2 dev-libs/glib:2 introspection? ( >=dev-libs/gobject-introspection-0.6.14:= ) dev-util/glib-utils 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=Useful Additional GTK+ widgets
 EAPI=6
 HOMEPAGE=http://gtkextra.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=FDL-1.1 LGPL-2
 RDEPEND=>=x11-libs/gtk+-2.12.0:2 dev-libs/glib:2 introspection? ( >=dev-libs/gobject-introspection-0.6.14:= )
 SLOT=0
 SRC_URI=mirror://sourceforge/gtkextra/gtkextra-3.3.3.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=49d0932be7cfee1cd4593d0c7e01670c
+_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_=155d370b9f72c32a6a0fe2336832b330
diff --git a/metadata/md5-cache/x11-libs/gtkglarea-2.0.1-r1 b/metadata/md5-cache/x11-libs/gtkglarea-2.0.1-r1
index 5f5885c272c0..42fd3ee73b50 100644
--- a/metadata/md5-cache/x11-libs/gtkglarea-2.0.1-r1
+++ b/metadata/md5-cache/x11-libs/gtkglarea-2.0.1-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ GPL-2+
 RDEPEND=>=x11-libs/gtk+-2.0.3:2 virtual/opengl
 SLOT=2
 SRC_URI=mirror://gnome/sources/gtkglarea/2.0/gtkglarea-2.0.1.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=a502f822a7a0f64f09d928c5dadd35d6
diff --git a/metadata/md5-cache/x11-libs/gtkglarea-2.1.0 b/metadata/md5-cache/x11-libs/gtkglarea-2.1.0
index de197060031b..b828e720af86 100644
--- a/metadata/md5-cache/x11-libs/gtkglarea-2.1.0
+++ b/metadata/md5-cache/x11-libs/gtkglarea-2.1.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ GPL-2+
 RDEPEND=>=x11-libs/gtk+-2.22:2 virtual/opengl
 SLOT=2
 SRC_URI=mirror://gnome/sources/gtkglarea/2.1/gtkglarea-2.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=91e2aae4dfe25e2d126639528b5d3565
diff --git a/metadata/md5-cache/x11-libs/gtkglext-1.2.0-r4 b/metadata/md5-cache/x11-libs/gtkglext-1.2.0-r4
index d73bcc5254d5..d3fd1793cbfa 100644
--- a/metadata/md5-cache/x11-libs/gtkglext-1.2.0-r4
+++ b/metadata/md5-cache/x11-libs/gtkglext-1.2.0-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=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(-)?] >=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(-)?] >=x11-libs/pango-1.36.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pangox-compat-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(-)?] >=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/libXmu-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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(-)?] >=sys-devel/autoconf-archive-2014.02.28 >=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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=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(-)?] >=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(-)?] >=x11-libs/pango-1.36.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pangox-compat-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(-)?] >=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/libXmu-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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(-)?] dev-util/glib-utils >=sys-devel/autoconf-archive-2014.02.28 >=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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=GL extensions for Gtk+ 2.0
 EAPI=6
 HOMEPAGE=http://gtkglext.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 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(-)?] >=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(-)?] >=x11-libs/pango-1.36.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pangox-compat-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(-)?] >=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/libXmu-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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(-)?]
 SLOT=0
 SRC_URI=mirror://sourceforge/gtkglext/gtkglext-1.2.0.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	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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=541342fe241ea93a20fbcbf5b5e521ca
+_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	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e9656a6893160d98cb6f8abc89a4b5d7
diff --git a/metadata/md5-cache/x11-libs/gtksourceview-2.10.5-r3 b/metadata/md5-cache/x11-libs/gtksourceview-2.10.5-r3
index 0232cd84db8b..8a18039a9c8c 100644
--- a/metadata/md5-cache/x11-libs/gtksourceview-2.10.5-r3
+++ b/metadata/md5-cache/x11-libs/gtksourceview-2.10.5-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=x11-libs/gtk+-2.12:2 >=dev-libs/libxml2-2.5:2 >=dev-libs/glib-2.14:2
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/gtksourceview/2.10/gtksourceview-2.10.5.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fea39b5b2e5678785917afab155e08f6
diff --git a/metadata/md5-cache/x11-libs/gtksourceview-3.24.7 b/metadata/md5-cache/x11-libs/gtksourceview-3.24.7
index 937cd19c15c5..af783ea25174 100644
--- a/metadata/md5-cache/x11-libs/gtksourceview-3.24.7
+++ b/metadata/md5-cache/x11-libs/gtksourceview-3.24.7
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.48:2 >=dev-libs/libxml2-2.6:2 >=x11-libs/gtk+-3.20:3[i
 REQUIRED_USE=vala? ( introspection )
 SLOT=3.0/3
 SRC_URI=mirror://gnome/sources/gtksourceview/3.24/gtksourceview-3.24.7.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=33c70d1f778fa4f5412d40b86208b3f4
diff --git a/metadata/md5-cache/x11-libs/gtksourceview-3.24.8 b/metadata/md5-cache/x11-libs/gtksourceview-3.24.8
index d54c4309c5ae..373358d5866d 100644
--- a/metadata/md5-cache/x11-libs/gtksourceview-3.24.8
+++ b/metadata/md5-cache/x11-libs/gtksourceview-3.24.8
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.48:2 >=dev-libs/libxml2-2.6:2 >=x11-libs/gtk+-3.20:3[i
 REQUIRED_USE=vala? ( introspection )
 SLOT=3.0/3
 SRC_URI=mirror://gnome/sources/gtksourceview/3.24/gtksourceview-3.24.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=68945f600448312068a3a6c18f626ffb
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 c9b7e2abc9f6..a386fafb5505 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
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.6:2 dev-libs/libcroco >=x11-libs/gtk+-2.6:2 x11-libs/p
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/x11-libs/libast-0.7 b/metadata/md5-cache/x11-libs/libast-0.7
deleted file mode 100644
index 71c4d26e11c0..000000000000
--- a/metadata/md5-cache/x11-libs/libast-0.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=!sci-astronomy/ast x11-base/xorg-proto x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-libs/libX11 =media-libs/freetype-2* imlib? ( media-libs/imlib2 ) pcre? ( dev-libs/libpcre )
-DESCRIPTION=LIBrary of Assorted Spiffy Things
-EAPI=0
-HOMEPAGE=http://www.eterm.org/download/
-IUSE=imlib cpu_flags_x86_mmx pcre
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=!sci-astronomy/ast x11-base/xorg-proto x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-libs/libX11 =media-libs/freetype-2* imlib? ( media-libs/imlib2 ) pcre? ( dev-libs/libpcre )
-SLOT=0
-SRC_URI=http://www.eterm.org/download/libast-0.7.tar.gz
-_md5_=8184d86ab2d42094c9074de7809b0430
diff --git a/metadata/md5-cache/x11-libs/libast-9999 b/metadata/md5-cache/x11-libs/libast-9999
deleted file mode 100644
index 82d718561e0f..000000000000
--- a/metadata/md5-cache/x11-libs/libast-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=!sci-astronomy/ast x11-base/xorg-proto x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-libs/libX11 =media-libs/freetype-2* imlib? ( media-libs/imlib2 ) pcre? ( dev-libs/libpcre ) dev-vcs/cvs >=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=LIBrary of Assorted Spiffy Things
-EAPI=0
-HOMEPAGE=http://www.eterm.org/download/
-IUSE=imlib cpu_flags_x86_mmx pcre
-LICENSE=GPL-2
-RDEPEND=!sci-astronomy/ast x11-base/xorg-proto x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-libs/libX11 =media-libs/freetype-2* imlib? ( media-libs/imlib2 ) pcre? ( dev-libs/libpcre )
-SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cvs	c57fc648b829862b38ad2a8b8c1c02e8	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=108a466f467470935f337f3b2259e5c8
diff --git a/metadata/md5-cache/x11-libs/libcryptui-3.12.2-r1 b/metadata/md5-cache/x11-libs/libcryptui-3.12.2-r1
index 28e1e8180f66..82bb0a712733 100644
--- a/metadata/md5-cache/x11-libs/libcryptui-3.12.2-r1
+++ b/metadata/md5-cache/x11-libs/libcryptui-3.12.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+ FDL-1.1
 RDEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3:3[introspection?] >=dev-libs/dbus-glib-0.72 >=app-crypt/gcr-3[gtk] x11-libs/libICE x11-libs/libSM >=app-crypt/gpgme-1:1= >=app-crypt/gnupg-1.4 introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) !<app-crypt/seahorse-3.1.4
 SLOT=0
 SRC_URI=mirror://gnome/sources/libcryptui/3.12/libcryptui-3.12.2.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=88d55446a3b423fbb67cd4b52cb63b24
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.95 b/metadata/md5-cache/x11-libs/libdrm-2.4.95
new file mode 100644
index 000000000000..86196c068e1c
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.95
@@ -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.95.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_=9e80c488dfb518adb38edcfd66e3b2e8
diff --git a/metadata/md5-cache/x11-libs/libfm-1.2.3-r1 b/metadata/md5-cache/x11-libs/libfm-1.2.3-r1
index 21be169cfd68..824fd3609806 100644
--- a/metadata/md5-cache/x11-libs/libfm-1.2.3-r1
+++ b/metadata/md5-cache/x11-libs/libfm-1.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.18:2 gtk? ( >=x11-libs/gtk+-2.16:2 ) >=lxde-base/menu-
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
index 7eae1ee4572f..c966869acd4b 100644
--- a/metadata/md5-cache/x11-libs/libfm-1.2.4
+++ b/metadata/md5-cache/x11-libs/libfm-1.2.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.18:2 gtk? ( >=x11-libs/gtk+-2.16:2 ) >=lxde-base/menu-
 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	89bb9f083a2590d9b447fd0b78a96186
+_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-1.2.5 b/metadata/md5-cache/x11-libs/libfm-1.2.5
index 2e211f23ddf3..1c7a4963ea66 100644
--- a/metadata/md5-cache/x11-libs/libfm-1.2.5
+++ b/metadata/md5-cache/x11-libs/libfm-1.2.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.18:2 gtk? ( >=x11-libs/gtk+-2.16:2 ) >=lxde-base/menu-
 REQUIRED_USE=udisks? ( automount ) doc? ( gtk )
 SLOT=0/4.5.0
 SRC_URI=https://github.com/lxde/libfm/archive/1.2.5.tar.gz -> libfm-1.2.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8bc3d1d8c4dda7009bfbc0535ab1fbdc
diff --git a/metadata/md5-cache/x11-libs/libfm-9999 b/metadata/md5-cache/x11-libs/libfm-9999
index 02c5abbb85ab..6aedf116fda7 100644
--- a/metadata/md5-cache/x11-libs/libfm-9999
+++ b/metadata/md5-cache/x11-libs/libfm-9999
@@ -8,5 +8,5 @@ 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 !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
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ea64544421939263f59662a473b509f4
diff --git a/metadata/md5-cache/x11-libs/libfm-extra-1.2.3 b/metadata/md5-cache/x11-libs/libfm-extra-1.2.3
index 701cdcb80bf5..a546309b5614 100644
--- a/metadata/md5-cache/x11-libs/libfm-extra-1.2.3
+++ b/metadata/md5-cache/x11-libs/libfm-extra-1.2.3
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
index 7ee88b9bf51c..6e13b3a47827 100644
--- a/metadata/md5-cache/x11-libs/libfm-extra-1.2.4
+++ b/metadata/md5-cache/x11-libs/libfm-extra-1.2.4
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=de77dd8bd934b9983f9d152f63863ff9
diff --git a/metadata/md5-cache/x11-libs/libfm-extra-1.2.5 b/metadata/md5-cache/x11-libs/libfm-extra-1.2.5
index b1f054936630..96140cd020be 100644
--- a/metadata/md5-cache/x11-libs/libfm-extra-1.2.5
+++ b/metadata/md5-cache/x11-libs/libfm-extra-1.2.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.18:2
 SLOT=0/4.5.0
 SRC_URI=https://github.com/lxde/libfm/archive/1.2.5.tar.gz -> libfm-1.2.5.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2adabbe44cd350d5ad80f001381fb6f6
diff --git a/metadata/md5-cache/x11-libs/libfm-qt-0.11.1 b/metadata/md5-cache/x11-libs/libfm-qt-0.11.1
index e5d83b164cd0..c8add4a7a21b 100644
--- a/metadata/md5-cache/x11-libs/libfm-qt-0.11.1
+++ b/metadata/md5-cache/x11-libs/libfm-qt-0.11.1
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
index aa6706a8ee26..3f23af9bb0da 100644
--- a/metadata/md5-cache/x11-libs/libfm-qt-0.13.1
+++ b/metadata/md5-cache/x11-libs/libfm-qt-0.13.1
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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 d6b101d1a87c..9b736003b8f4 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
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/x11-libs/libgksu-2.0.12-r3 b/metadata/md5-cache/x11-libs/libgksu-2.0.12-r3
index 212f27cac561..c846f4f37e8d 100644
--- a/metadata/md5-cache/x11-libs/libgksu-2.0.12-r3
+++ b/metadata/md5-cache/x11-libs/libgksu-2.0.12-r3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=x11-libs/gtk+-2.12:2 x11-libs/libX11 >=gnome-base/gconf-2 gnome-base/libgnome-keyring x11-libs/startup-notification >=gnome-base/libgtop-2:2= nls? ( >=sys-devel/gettext-0.14.1 ) app-admin/sudo
 SLOT=2
 SRC_URI=https://people.debian.org/~kov/gksu/libgksu-2.0.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=aba81b3c0220fe698d2755c9397b3ad0
diff --git a/metadata/md5-cache/x11-libs/libgksu-2.0.12-r4 b/metadata/md5-cache/x11-libs/libgksu-2.0.12-r4
index 40cead427b44..7bbe4acfc00c 100644
--- a/metadata/md5-cache/x11-libs/libgksu-2.0.12-r4
+++ b/metadata/md5-cache/x11-libs/libgksu-2.0.12-r4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=x11-libs/gtk+-2.12:2 x11-libs/libX11 >=gnome-base/gconf-2 gnome-base/libgnome-keyring x11-libs/startup-notification >=gnome-base/libgtop-2:2= nls? ( >=sys-devel/gettext-0.14.1 ) app-admin/sudo
 SLOT=2
 SRC_URI=https://people.debian.org/~kov/gksu/libgksu-2.0.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0a0ef9699fe5d101b6410b57d4129cfe
diff --git a/metadata/md5-cache/x11-libs/libgxim-0.5.0 b/metadata/md5-cache/x11-libs/libgxim-0.5.0
index 340da97137d7..5be6a234ef08 100644
--- a/metadata/md5-cache/x11-libs/libgxim-0.5.0
+++ b/metadata/md5-cache/x11-libs/libgxim-0.5.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/dbus-glib dev-libs/glib:2 sys-apps/dbus virtual/libintl x11-libs/gtk+:2 || ( dev-lang/ruby:2.3 dev-lang/ruby:2.4 ) virtual/rubygems dev-util/intltool sys-devel/autoconf-archive sys-devel/gettext 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
+DEPEND=dev-libs/dbus-glib dev-libs/glib:2 sys-apps/dbus virtual/libintl x11-libs/gtk+:2 x11-libs/libX11 || ( dev-lang/ruby:2.3 dev-lang/ruby:2.4 ) virtual/rubygems dev-util/glib-utils dev-util/intltool sys-devel/autoconf-archive sys-devel/gettext 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
 DESCRIPTION=GObject-based XIM protocol library
 EAPI=6
 HOMEPAGE=https://tagoh.bitbucket.io/libgxim
 IUSE=ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 static-libs test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 sys-apps/dbus virtual/libintl x11-libs/gtk+:2
+RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 sys-apps/dbus virtual/libintl x11-libs/gtk+:2 x11-libs/libX11
 SLOT=0
 SRC_URI=https://bitbucket.org/tagoh/libgxim/downloads/libgxim-0.5.0.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=9e44789f61f03e4d4c93a6359a064f6e
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=182e4061bcc41da6731331d7b2d577db
diff --git a/metadata/md5-cache/x11-libs/libnotify-0.7.6-r3 b/metadata/md5-cache/x11-libs/libnotify-0.7.6-r3
index 5cd324bebb81..9f92befac442 100644
--- a/metadata/md5-cache/x11-libs/libnotify-0.7.6-r3
+++ b/metadata/md5-cache/x11-libs/libnotify-0.7.6-r3
@@ -1,5 +1,5 @@
 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/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-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
+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-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
 DESCRIPTION=A library for sending desktop notifications
 EAPI=5
 HOMEPAGE=https://git.gnome.org/browse/libnotify
@@ -10,5 +10,5 @@ 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.6.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	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-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=a8c798dde5e0631dc2a6643f4a7b87ae
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	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-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=2a92596bda1260152968f5dab7d90ac4
diff --git a/metadata/md5-cache/x11-libs/libnotify-0.7.7 b/metadata/md5-cache/x11-libs/libnotify-0.7.7
index 9e3d10e75c64..b8e728cac737 100644
--- a/metadata/md5-cache/x11-libs/libnotify-0.7.7
+++ b/metadata/md5-cache/x11-libs/libnotify-0.7.7
@@ -1,5 +1,5 @@
 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/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
+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
@@ -10,5 +10,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=0b7cf01af359dd2bbcd0ff33a3d908b6
+_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/libwnck-2.31.0 b/metadata/md5-cache/x11-libs/libwnck-2.31.0
index c78b2b282e06..422487e4b184 100644
--- a/metadata/md5-cache/x11-libs/libwnck-2.31.0
+++ b/metadata/md5-cache/x11-libs/libwnck-2.31.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=x11-libs/gtk+-2.19.7:2[introspection?] >=dev-libs/glib-2.16:2 x11-libs/libX11 x11-libs/libXres x11-libs/libXext introspection? ( >=dev-libs/gobject-introspection-0.6.14:= ) startup-notification? ( >=x11-libs/startup-notification-0.4 ) dev-util/gtk-doc-am >=dev-util/intltool-0.40 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
+DEPEND=>=x11-libs/gtk+-2.19.7:2[introspection?] >=dev-libs/glib-2.16:2 x11-libs/libX11 x11-libs/libXres x11-libs/libXext introspection? ( >=dev-libs/gobject-introspection-0.6.14:= ) startup-notification? ( >=x11-libs/startup-notification-0.4 ) dev-util/glib-utils dev-util/gtk-doc-am >=dev-util/intltool-0.40 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
 DESCRIPTION=A window navigation construction kit
 EAPI=5
 HOMEPAGE=https://www.gnome.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=x11-libs/gtk+-2.19.7:2[introspection?] >=dev-libs/glib-2.16:2 x11-libs/libX11 x11-libs/libXres x11-libs/libXext introspection? ( >=dev-libs/gobject-introspection-0.6.14:= ) startup-notification? ( >=x11-libs/startup-notification-0.4 )
 SLOT=1
 SRC_URI=mirror://gnome/sources/libwnck/2.31/libwnck-2.31.0.tar.xz
-_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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=26a09f3105a9d2fe30fb8b4fe2687b28
+_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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=386d4af2b1995bd14b5b0e17c5fd3c47
diff --git a/metadata/md5-cache/x11-libs/libwnck-3.24.1 b/metadata/md5-cache/x11-libs/libwnck-3.24.1
index 41efc5bb6d96..d5d5c365cbc0 100644
--- a/metadata/md5-cache/x11-libs/libwnck-3.24.1
+++ b/metadata/md5-cache/x11-libs/libwnck-3.24.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=x11-libs/cairo[X] >=x11-libs/gtk+-3.22:3[introspection?] >=dev-libs/glib-2.32:2 x11-libs/libX11 x11-libs/libXres x11-libs/libXext introspection? ( >=dev-libs/gobject-introspection-0.6.14:= ) startup-notification? ( >=x11-libs/startup-notification-0.4 )
 SLOT=3
 SRC_URI=mirror://gnome/sources/libwnck/3.24/libwnck-3.24.1.tar.xz
-_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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=87e0c6f522f9a57986519198d0cf8103
diff --git a/metadata/md5-cache/x11-libs/libwnck-3.30.0 b/metadata/md5-cache/x11-libs/libwnck-3.30.0
index 680eaff35245..71c1c936d72d 100644
--- a/metadata/md5-cache/x11-libs/libwnck-3.30.0
+++ b/metadata/md5-cache/x11-libs/libwnck-3.30.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=x11-libs/cairo[X] >=x11-libs/gtk+-3.22:3[introspection?] >=dev-libs/glib-2.32:2 x11-libs/libX11 x11-libs/libXres x11-libs/libXext introspection? ( >=dev-libs/gobject-introspection-0.6.14:= ) startup-notification? ( >=x11-libs/startup-notification-0.4 )
 SLOT=3
 SRC_URI=mirror://gnome/sources/libwnck/3.30/libwnck-3.30.0.tar.xz
-_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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=03e6e85362e069e27bd27fb19be7b3d2
diff --git a/metadata/md5-cache/x11-libs/libxklavier-5.4 b/metadata/md5-cache/x11-libs/libxklavier-5.4
index d20e26ec859e..e381fc1eca69 100644
--- a/metadata/md5-cache/x11-libs/libxklavier-5.4
+++ b/metadata/md5-cache/x11-libs/libxklavier-5.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=app-text/iso-codes >=dev-libs/glib-2.16:2= dev-libs/libxml2:2= x11-apps/xkbcomp x11-libs/libX11:= >=x11-libs/libXi-1.1.3:= x11-libs/libxkbfile:= >=x11-misc/xkeyboard-config-2.4.1-r3 introspection? ( >=dev-libs/gobject-introspection-1.30:= ) vala? ( || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) ) >=dev-util/gtk-doc-am-1.4 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815
+DEPEND=app-text/iso-codes >=dev-libs/glib-2.16:2= dev-libs/libxml2:2= x11-apps/xkbcomp x11-libs/libX11:= >=x11-libs/libXi-1.1.3:= x11-libs/libxkbfile:= >=x11-misc/xkeyboard-config-2.4.1-r3 introspection? ( >=dev-libs/gobject-introspection-1.30:= ) vala? ( || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) ) dev-util/glib-utils >=dev-util/gtk-doc-am-1.4 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815
 DESCRIPTION=A library for the X Keyboard Extension (high-level API)
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/LibXklavier
@@ -10,5 +10,5 @@ RDEPEND=app-text/iso-codes >=dev-libs/glib-2.16:2= dev-libs/libxml2:2= x11-apps/
 REQUIRED_USE=vala? ( introspection )
 SLOT=0/16
 SRC_URI=https://people.freedesktop.org/~svu/libxklavier-5.4.tar.bz2
-_eclasses_=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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=ac20692b5c21d2114a1d30cd509f7f1f
+_eclasses_=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_=b058962c2b8df945f1f32bb5fa44ebf6
diff --git a/metadata/md5-cache/x11-libs/libyui-3.3.3 b/metadata/md5-cache/x11-libs/libyui-3.3.3
index 1c8d413c300e..5d12b1269d12 100644
--- a/metadata/md5-cache/x11-libs/libyui-3.3.3
+++ b/metadata/md5-cache/x11-libs/libyui-3.3.3
@@ -10,5 +10,5 @@ PDEPEND=gtk? ( x11-libs/libyui-gtk:0/6 ) ncurses? ( x11-libs/libyui-ncurses:0/6
 REQUIRED_USE=|| ( gtk ncurses qt5 )
 SLOT=0/6
 SRC_URI=https://github.com/libyui/libyui/archive/v3.3.3.tar.gz -> libyui-3.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a67530c2371dc82fdedee53ae8025a06
diff --git a/metadata/md5-cache/x11-libs/libyui-gtk-2.44.9 b/metadata/md5-cache/x11-libs/libyui-gtk-2.44.9
index 359bf7d41d8e..1003b82aef1a 100644
--- a/metadata/md5-cache/x11-libs/libyui-gtk-2.44.9
+++ b/metadata/md5-cache/x11-libs/libyui-gtk-2.44.9
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/gtk+:3 x11-libs/libyui:0/6
 SLOT=0/6
 SRC_URI=https://github.com/libyui/libyui-gtk/archive/v2.44.9.tar.gz -> libyui-gtk-2.44.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5f45f861e0dbf6cc9b2b9805da8b0360
diff --git a/metadata/md5-cache/x11-libs/libyui-ncurses-2.48.3 b/metadata/md5-cache/x11-libs/libyui-ncurses-2.48.3
index c65fc364d254..0a130b54352d 100644
--- a/metadata/md5-cache/x11-libs/libyui-ncurses-2.48.3
+++ b/metadata/md5-cache/x11-libs/libyui-ncurses-2.48.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=sys-libs/ncurses:0= x11-libs/libyui:0/6
 SLOT=0/6
 SRC_URI=https://github.com/libyui/libyui-ncurses/archive/v2.48.3.tar.gz -> libyui-ncurses-2.48.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e1f5125a66c8237cd11d7c317f37fbf5
diff --git a/metadata/md5-cache/x11-libs/libyui-qt-2.47.1 b/metadata/md5-cache/x11-libs/libyui-qt-2.47.1
index 964d41988ac9..c67a19323b9a 100644
--- a/metadata/md5-cache/x11-libs/libyui-qt-2.47.1
+++ b/metadata/md5-cache/x11-libs/libyui-qt-2.47.1
@@ -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/freetype x11-libs/libX11 x11-libs/libyui:0/6
 SLOT=0/6
 SRC_URI=https://github.com/libyui/libyui-qt/archive/v2.47.1.tar.gz -> libyui-qt-2.47.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=04b88f9654b2689f51d076388d91e4a4
diff --git a/metadata/md5-cache/x11-libs/mx-1.4.7-r2 b/metadata/md5-cache/x11-libs/mx-1.4.7-r2
index 2f4462e96fa7..4cb476e1a4bb 100644
--- a/metadata/md5-cache/x11-libs/mx-1.4.7-r2
+++ b/metadata/md5-cache/x11-libs/mx-1.4.7-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.28.0:2 >=media-libs/clutter-1.7.91:1.0 media-libs/cogl:= >=x11-apps/xrandr-1.2.0 x11-libs/gdk-pixbuf:2[introspection?] dbus? ( >=dev-libs/dbus-glib-0.82 ) gtk? ( >=x11-libs/gtk+-2.20:2[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) startup-notification? ( >=x11-libs/startup-notification-0.9 )
 SLOT=1.0
 SRC_URI=mirror://github/clutter-project/mx/mx-1.4.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4f672828b601f3751ba63f49e6f03165
diff --git a/metadata/md5-cache/x11-libs/pango-1.40.14-r1 b/metadata/md5-cache/x11-libs/pango-1.40.14-r1
index 1275cb5ee21e..645ff733b1a6 100644
--- a/metadata/md5-cache/x11-libs/pango-1.40.14-r1
+++ b/metadata/md5-cache/x11-libs/pango-1.40.14-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ FTL
 RDEPEND=>=media-libs/harfbuzz-1.2.3:=[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.11.91: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(-)?] 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.40/pango-1.40.14.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e3b6228514eca7f338bc2a6b39e5ed36
diff --git a/metadata/md5-cache/x11-libs/pango-1.42.4 b/metadata/md5-cache/x11-libs/pango-1.42.4
index 8041ab3eefe9..a48b396d1972 100644
--- a/metadata/md5-cache/x11-libs/pango-1.42.4
+++ b/metadata/md5-cache/x11-libs/pango-1.42.4
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/x11-libs/pangox-compat-0.0.2 b/metadata/md5-cache/x11-libs/pangox-compat-0.0.2
index 0924ad80e773..878be9956ff3 100644
--- a/metadata/md5-cache/x11-libs/pangox-compat-0.0.2
+++ b/metadata/md5-cache/x11-libs/pangox-compat-0.0.2
@@ -8,5 +8,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.31:2 >=x11-libs/pango-1.32 x11-libs/libX11
 SLOT=0
 SRC_URI=mirror://gnome/sources/pangox-compat/0.0/pangox-compat-0.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f55353ce0749f96baf1e869eda806de0
diff --git a/metadata/md5-cache/x11-libs/pangox-compat-0.0.2-r1 b/metadata/md5-cache/x11-libs/pangox-compat-0.0.2-r1
index ecdb5be65c2b..83015a7db763 100644
--- a/metadata/md5-cache/x11-libs/pangox-compat-0.0.2-r1
+++ b/metadata/md5-cache/x11-libs/pangox-compat-0.0.2-r1
@@ -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(-)?] >=x11-libs/pango-1.36.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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(-)?]
 SLOT=0
 SRC_URI=mirror://gnome/sources/pangox-compat/0.0/pangox-compat-0.0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0e131275582bd10e6db7b34a0b2cfb3f
diff --git a/metadata/md5-cache/x11-libs/qtermwidget-0.7.1 b/metadata/md5-cache/x11-libs/qtermwidget-0.7.1
index ace6b8d2cfc2..5537d0eaf7aa 100644
--- a/metadata/md5-cache/x11-libs/qtermwidget-0.7.1
+++ b/metadata/md5-cache/x11-libs/qtermwidget-0.7.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://github.com/lxde/qtermwidget/releases/download/0.7.1/qtermwidget-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1fb9f0f06b9b3bda834b3c3ed37f07b4
diff --git a/metadata/md5-cache/x11-libs/qtermwidget-0.9.0 b/metadata/md5-cache/x11-libs/qtermwidget-0.9.0
index b1b398829bbe..81d4650adb1a 100644
--- a/metadata/md5-cache/x11-libs/qtermwidget-0.9.0
+++ b/metadata/md5-cache/x11-libs/qtermwidget-0.9.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 SLOT=0/0.9.0
 SRC_URI=https://downloads.lxqt.org/downloads/qtermwidget/0.9.0/qtermwidget-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=244813f2b2d844c36f3934ca440105f3
diff --git a/metadata/md5-cache/x11-libs/qtermwidget-9999 b/metadata/md5-cache/x11-libs/qtermwidget-9999
index e6a060c3daf4..6df28891a574 100644
--- a/metadata/md5-cache/x11-libs/qtermwidget-9999
+++ b/metadata/md5-cache/x11-libs/qtermwidget-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/lxde/qtermwidget
 LICENSE=GPL-2+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=614bce0cf5079e005d8f7a82212d2e48
diff --git a/metadata/md5-cache/x11-libs/snorenotify-0.7.0-r1 b/metadata/md5-cache/x11-libs/snorenotify-0.7.0-r1
index 33681ef4e141..02781e60b513 100644
--- a/metadata/md5-cache/x11-libs/snorenotify-0.7.0-r1
+++ b/metadata/md5-cache/x11-libs/snorenotify-0.7.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-3+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 sound? ( dev-qt/qtmultimedia:5 )
 SLOT=0
 SRC_URI=mirror://kde/stable/snorenotify/0.7.0/src/snorenotify-0.7.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f5180b072d0b2bc426c597790476e171
diff --git a/metadata/md5-cache/x11-libs/vte-0.28.2-r208 b/metadata/md5-cache/x11-libs/vte-0.28.2-r208
index b29b9b4ab3d4..a97c89fa9b26 100644
--- a/metadata/md5-cache/x11-libs/vte-0.28.2-r208
+++ b/metadata/md5-cache/x11-libs/vte-0.28.2-r208
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.26:2 >=x11-libs/gtk+-2.20:2[introspection?] >=x11-libs
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/vte/0.28/vte-0.28.2.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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=82da4ba01fb2bb2aad1dbdcbbbbecbe6
diff --git a/metadata/md5-cache/x11-libs/vte-0.36.5 b/metadata/md5-cache/x11-libs/vte-0.36.5
index e0734cf86eab..dc2a06d3088b 100644
--- a/metadata/md5-cache/x11-libs/vte-0.36.5
+++ b/metadata/md5-cache/x11-libs/vte-0.36.5
@@ -10,5 +10,5 @@ PDEPEND=>=x11-libs/gnome-pty-helper-0.36.5
 RDEPEND=>=dev-libs/glib-2.31.13:2 >=x11-libs/gtk+-3.1.9:3[introspection?] >=x11-libs/pango-1.22.0 sys-libs/ncurses:0= x11-libs/libX11 x11-libs/libXft glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
 SLOT=2.90
 SRC_URI=mirror://gnome/sources/vte/0.36/vte-0.36.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8c15f672c3e26e5d6577f337b87c2935
diff --git a/metadata/md5-cache/x11-libs/vte-0.48.4 b/metadata/md5-cache/x11-libs/vte-0.48.4
index bd3c209d4dbb..edba55886a0f 100644
--- a/metadata/md5-cache/x11-libs/vte-0.48.4
+++ b/metadata/md5-cache/x11-libs/vte-0.48.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.40:2 >=dev-libs/libpcre2-10.21 >=x11-libs/gtk+-3.16:3[
 REQUIRED_USE=vala? ( introspection )
 SLOT=2.91
 SRC_URI=mirror://gnome/sources/vte/0.48/vte-0.48.4.tar.xz !vanilla? ( https://dev.gentoo.org/~eva/distfiles/vte/vte-0.48.4-command-notify.patch.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d03b0abd9d0c849f377be3ce9e730394
diff --git a/metadata/md5-cache/x11-libs/vte-0.54.0 b/metadata/md5-cache/x11-libs/vte-0.54.0
index 0d55ef363aee..66b840017c7e 100644
--- a/metadata/md5-cache/x11-libs/vte-0.54.0
+++ b/metadata/md5-cache/x11-libs/vte-0.54.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.40:2 >=dev-libs/libpcre2-10.21 >=x11-libs/gtk+-3.16:3[
 REQUIRED_USE=vala? ( introspection )
 SLOT=2.91
 SRC_URI=mirror://gnome/sources/vte/0.54/vte-0.54.0.tar.xz !vanilla? ( https://dev.gentoo.org/~leio/distfiles/vte-0.53.91-command-notify.patch.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0cf8268b03bf12f4b4e2931fad4fb8eb
diff --git a/metadata/md5-cache/x11-libs/vte-0.54.1 b/metadata/md5-cache/x11-libs/vte-0.54.1
new file mode 100644
index 000000000000..f3991ca26345
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/vte-0.54.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.40:2 >=dev-libs/libpcre2-10.21 >=x11-libs/gtk+-3.16:3[introspection?] >=x11-libs/pango-1.22.0 sys-libs/ncurses:0= sys-libs/zlib crypt? ( >=net-libs/gnutls-3.2.7:0= ) glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) dev-libs/libxml2:2 dev-util/glib-utils >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.35 sys-devel/gettext 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
+DESCRIPTION=Library providing a virtual terminal emulator widget
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/action/show/Apps/Terminal/VTE
+IUSE=+crypt debug glade +introspection vala vanilla
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/glib-2.40:2 >=dev-libs/libpcre2-10.21 >=x11-libs/gtk+-3.16:3[introspection?] >=x11-libs/pango-1.22.0 sys-libs/ncurses:0= sys-libs/zlib crypt? ( >=net-libs/gnutls-3.2.7:0= ) glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) !x11-libs/vte:2.90[glade]
+REQUIRED_USE=vala? ( introspection )
+SLOT=2.91
+SRC_URI=mirror://gnome/sources/vte/0.54/vte-0.54.1.tar.xz !vanilla? ( https://dev.gentoo.org/~leio/distfiles/vte-0.54.1-command-notify.patch.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d4e2e742ad3568b0b88e0ee88a5b3739
diff --git a/metadata/md5-cache/x11-libs/wxGTK-3.0.4 b/metadata/md5-cache/x11-libs/wxGTK-3.0.4
index 5a87cfdda049..437053526571 100644
--- a/metadata/md5-cache/x11-libs/wxGTK-3.0.4
+++ b/metadata/md5-cache/x11-libs/wxGTK-3.0.4
@@ -4,11 +4,11 @@ DESCRIPTION=GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit
 EAPI=6
 HOMEPAGE=https://wxwidgets.org/
 IUSE=+X aqua doc debug gstreamer libnotify opengl sdl tiff abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )
 PDEPEND=>=app-eselect/eselect-wxwidgets-20131230
 RDEPEND=dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sdl? ( media-libs/libsdl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=dev-libs/glib-2.22:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-2.18:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gdk-pixbuf[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libSM[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/pango[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libnotify? ( x11-libs/libnotify[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) aqua? ( x11-libs/gtk+:2[aqua=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 SLOT=3.0
 SRC_URI=https://github.com/wxWidgets/wxWidgets/releases/download/v3.0.4/wxWidgets-3.0.4.tar.bz2 https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20180507.tar.xz doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v3.0.4/wxWidgets-3.0.4-docs-html.tar.bz2 )
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=ef3bd83c9ee812c81c63fa69fcd4bdb1
+_md5_=02fe0445fa9a2eb58777e13e62ce87e4
diff --git a/metadata/md5-cache/x11-libs/wxGTK-3.0.4-r300 b/metadata/md5-cache/x11-libs/wxGTK-3.0.4-r300
index 8644d66b4e95..acf6d9230cf3 100644
--- a/metadata/md5-cache/x11-libs/wxGTK-3.0.4-r300
+++ b/metadata/md5-cache/x11-libs/wxGTK-3.0.4-r300
@@ -4,11 +4,11 @@ DESCRIPTION=GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit
 EAPI=6
 HOMEPAGE=https://wxwidgets.org/
 IUSE=+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )
 PDEPEND=>=app-eselect/eselect-wxwidgets-20131230
 RDEPEND=dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sdl? ( media-libs/libsdl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=dev-libs/glib-2.22:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gdk-pixbuf[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libSM[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/pango[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libnotify? ( x11-libs/libnotify[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webkit? ( net-libs/webkit-gtk:4 ) ) aqua? ( x11-libs/gtk+:3[aqua=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 SLOT=3.0-gtk3
 SRC_URI=https://github.com/wxWidgets/wxWidgets/releases/download/v3.0.4/wxWidgets-3.0.4.tar.bz2 https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20180507.tar.xz doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v3.0.4/wxWidgets-3.0.4-docs-html.tar.bz2 )
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=6cad4f2a98e62baabe7e09ab50b74897
+_md5_=9e665e88f62e317650c6e2065ce50b48
diff --git a/metadata/md5-cache/x11-libs/xapps-1.0.4 b/metadata/md5-cache/x11-libs/xapps-1.0.4
index 92b35508eede..358d94022394 100644
--- a/metadata/md5-cache/x11-libs/xapps-1.0.4
+++ b/metadata/md5-cache/x11-libs/xapps-1.0.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.37.3:2 dev-libs/gobject-introspection:0= gnome-base/libgnomekbd gnome-base/gnome-common x11-libs/cairo >=x11-libs/gdk-pixbuf-2.22.0:2[introspection?] >=x11-libs/gtk+-3.3.16:3[introspection?] x11-libs/libxkbfile
 SLOT=0
 SRC_URI=https://github.com/linuxmint/xapps/archive/1.0.4.tar.gz -> xapps-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5e0a9ef805bc546c17ff97296ddb4bc0
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index d6b38189e71a..c8b1c93267c2 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/alacarte-3.11.91 b/metadata/md5-cache/x11-misc/alacarte-3.11.91
index 4e6733e657b2..925a4d48fc38 100644
--- a/metadata/md5-cache/x11-misc/alacarte-3.11.91
+++ b/metadata/md5-cache/x11-misc/alacarte-3.11.91
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/alacarte/3.11/alacarte-3.11.91.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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f6bf534454da53070d1d578737c5d30b
diff --git a/metadata/md5-cache/x11-misc/albert-0.14.21 b/metadata/md5-cache/x11-misc/albert-0.14.21
index 3704c7b0025b..ca4cdc75b955 100644
--- a/metadata/md5-cache/x11-misc/albert-0.14.21
+++ b/metadata/md5-cache/x11-misc/albert-0.14.21
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-cpp/muParser dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXext
 SLOT=0
 SRC_URI=https://github.com/albertlauncher/albert/archive/v0.14.21.tar.gz -> albert-0.14.21.tar.gz https://github.com/albertlauncher/plugins/archive/67a7a34734c4665dcb1a504432de5d2e5a56ac90.tar.gz -> albert-0.14.21-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c74acf059c1418d4a6cc1c7ec5249102
diff --git a/metadata/md5-cache/x11-misc/albert-0.14.22 b/metadata/md5-cache/x11-misc/albert-0.14.22
index 378191fdea46..61dfee440ccc 100644
--- a/metadata/md5-cache/x11-misc/albert-0.14.22
+++ b/metadata/md5-cache/x11-misc/albert-0.14.22
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-cpp/muParser dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXext
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/x11-misc/arandr-0.1.9 b/metadata/md5-cache/x11-misc/arandr-0.1.9
index 10fb36e6f6e3..808c69932688 100644
--- a/metadata/md5-cache/x11-misc/arandr-0.1.9
+++ b/metadata/md5-cache/x11-misc/arandr-0.1.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pygtk-2[python_targets_python2_7(-)?,-python_single_target_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://christian.amsuess.com/tools/arandr/files/arandr_0.1.9.orig.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=fc55aa759440117f07470e61c2935213
diff --git a/metadata/md5-cache/x11-misc/calise-0.4.2 b/metadata/md5-cache/x11-misc/calise-0.4.2
index ac22b74c6d28..e2f1ff4c8384 100644
--- a/metadata/md5-cache/x11-misc/calise-0.4.2
+++ b/metadata/md5-cache/x11-misc/calise-0.4.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyxdg[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://sourceforge.net/projects/calise/files/calise-beta/0.4.2/calise-0.4.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	915cae3d7d636732918d18827fb1c226	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	89bb9f083a2590d9b447fd0b78a96186
+_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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cf8d24945025185ad4b970645c6a7972
diff --git a/metadata/md5-cache/x11-misc/cdm-0.6.1_pre20130419 b/metadata/md5-cache/x11-misc/cdm-0.6.1_pre20130419
deleted file mode 100644
index 9f9f522d4440..000000000000
--- a/metadata/md5-cache/x11-misc/cdm-0.6.1_pre20130419
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DEPEND=app-shells/bash
-DESCRIPTION=The Console Display Manager
-EAPI=4
-HOMEPAGE=https://wiki.archlinux.org/index.php/CDM
-IUSE=pam consolekit
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-shells/bash dev-util/dialog x11-apps/xdpyinfo x11-apps/xinit consolekit? ( sys-auth/consolekit sys-apps/dbus ) pam? ( virtual/pam )
-REQUIRED_USE=consolekit? ( pam )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~gienah/snapshots/cdm-0.6.1_pre20130419.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_=7ba1d3312675fac2dd7741c86aa327fd
diff --git a/metadata/md5-cache/x11-misc/cdm-0.7 b/metadata/md5-cache/x11-misc/cdm-0.7
new file mode 100644
index 000000000000..1a67d4f99984
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/cdm-0.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare
+DESCRIPTION=The Console Display Manager
+EAPI=7
+HOMEPAGE=https://github.com/evertiro/cdm
+IUSE=pam consolekit
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-util/dialog x11-apps/xdpyinfo x11-apps/xinit consolekit? ( sys-auth/consolekit sys-apps/dbus ) pam? ( virtual/pam )
+REQUIRED_USE=consolekit? ( pam )
+SLOT=0
+SRC_URI=https://github.com/evertiro/cdm/archive/0.7.tar.gz -> cdm-0.7.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=3c7f69e3ddcce8ae588dfa2b44f80e0f
diff --git a/metadata/md5-cache/x11-misc/colord-1.3.4 b/metadata/md5-cache/x11-misc/colord-1.3.4
index b7193272f080..2f892aef8efc 100644
--- a/metadata/md5-cache/x11-misc/colord-1.3.4
+++ b/metadata/md5-cache/x11-misc/colord-1.3.4
@@ -11,5 +11,5 @@ REQUIRED_USE=gusb? ( udev ) scanner? ( udev ) vala? ( introspection )
 RESTRICT=test
 SLOT=0/2
 SRC_URI=https://www.freedesktop.org/software/colord/releases/colord-1.3.4.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	2c6f909675083dce8430b648bf737cb0	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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	2c6f909675083dce8430b648bf737cb0	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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dec181ace7a69b1b405eba6947d41e54
diff --git a/metadata/md5-cache/x11-misc/driconf-0.9.1-r2 b/metadata/md5-cache/x11-misc/driconf-0.9.1-r2
index e5dc04c1f8b1..69e27d793001 100644
--- a/metadata/md5-cache/x11-misc/driconf-0.9.1-r2
+++ b/metadata/md5-cache/x11-misc/driconf-0.9.1-r2
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:2 dev-python/pygtk:2[python_targets_python2_7(-)?,-python_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://freedesktop.org/~fxkuehl/driconf/driconf-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4f7b84a24b60fcac3ee340b47ea09482
diff --git a/metadata/md5-cache/x11-misc/flow-pomodoro-1.2.0 b/metadata/md5-cache/x11-misc/flow-pomodoro-1.2.0
index 9abdd51c4cde..37129a33910c 100644
--- a/metadata/md5-cache/x11-misc/flow-pomodoro-1.2.0
+++ b/metadata/md5-cache/x11-misc/flow-pomodoro-1.2.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtcore-5.6:5 >=dev-qt/qtdbus-5.6:5 >=dev-qt/qtdeclarative-5.6:5 >=dev-qt/qtgui-5.6:5 >=dev-qt/qtquickcontrols-5.6:5 >=dev-qt/qtnetwork-5.6:5 >=dev-qt/qtwidgets-5.6:5
 SLOT=0
 SRC_URI=https://github.com/iamsergio/flow-pomodoro/archive/v1.2.0.tar.gz -> flow-pomodoro-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1b6118df4623a77bb551788323c54158
diff --git a/metadata/md5-cache/x11-misc/fraqtive-0.4.8 b/metadata/md5-cache/x11-misc/fraqtive-0.4.8
index d5f5c2ef32e5..d95275aae29c 100644
--- a/metadata/md5-cache/x11-misc/fraqtive-0.4.8
+++ b/metadata/md5-cache/x11-misc/fraqtive-0.4.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 virtual/glu
 SLOT=0
 SRC_URI=mirror://sourceforge/fraqtive/fraqtive-0.4.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c3e9c57fec04b590adaf981fe7fb49dd
diff --git a/metadata/md5-cache/x11-misc/gcolor2-0.4-r4 b/metadata/md5-cache/x11-misc/gcolor2-0.4-r4
index 743e27be96b8..1c2c7138cc34 100644
--- a/metadata/md5-cache/x11-misc/gcolor2-0.4-r4
+++ b/metadata/md5-cache/x11-misc/gcolor2-0.4-r4
@@ -8,5 +8,5 @@ LICENSE=GPL-2 public-domain
 RDEPEND=>=x11-libs/gtk+-2.4:2
 SLOT=0
 SRC_URI=mirror://sourceforge/gcolor2/gcolor2-0.4.tar.gz https://dev.gentoo.org/~pacho/gnome/gcolor2.svg
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f5cca6e5b1e811a91300809639dd2da9
diff --git a/metadata/md5-cache/x11-misc/gigolo-0.4.2-r1 b/metadata/md5-cache/x11-misc/gigolo-0.4.2-r1
index 29e6a5132b78..9a3909c42e66 100644
--- a/metadata/md5-cache/x11-misc/gigolo-0.4.2-r1
+++ b/metadata/md5-cache/x11-misc/gigolo-0.4.2-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.16 >=x11-libs/gtk+-2.12:2
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/gigolo/0.4/gigolo-0.4.2.tar.bz2
-_eclasses_=xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ca1b565bab72e3b772de533e1e00db2a
diff --git a/metadata/md5-cache/x11-misc/googsystray-1.3.1-r1 b/metadata/md5-cache/x11-misc/googsystray-1.3.1-r1
index fdf13d4a12da..37bd6c0e07b1 100644
--- a/metadata/md5-cache/x11-misc/googsystray-1.3.1-r1
+++ b/metadata/md5-cache/x11-misc/googsystray-1.3.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pygtk-2.14[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/googsystray/googsystray-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=f51878598e26fd4fe2bf33dd3c43416d
diff --git a/metadata/md5-cache/x11-misc/gpaste-3.20.3 b/metadata/md5-cache/x11-misc/gpaste-3.20.3
index e67e75676054..6075c02d6aca 100644
--- a/metadata/md5-cache/x11-misc/gpaste-3.20.3
+++ b/metadata/md5-cache/x11-misc/gpaste-3.20.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/appstream-glib >=dev-libs/glib-2.48:2 >=dev-libs/gobject-introspection-1.48.0 sys-apps/dbus >=x11-libs/gdk-pixbuf-2.34:2 >=x11-libs/gtk+-3.20:3 x11-libs/libX11 x11-libs/libXi gnome? ( gnome-base/gnome-control-center:2 media-libs/clutter x11-libs/pango ) gnome? ( gnome-base/gnome-shell )
 SLOT=0
 SRC_URI=https://github.com/Keruspe/GPaste/archive/v3.20.3.tar.gz -> gpaste-3.20.3.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fa5b1400e9769ab6bd12dddb67328daf
diff --git a/metadata/md5-cache/x11-misc/grub2-theme-preview-1.3.1 b/metadata/md5-cache/x11-misc/grub2-theme-preview-1.3.1
index 4991c138caee..10359e0b0a1d 100644
--- a/metadata/md5-cache/x11-misc/grub2-theme-preview-1.3.1
+++ b/metadata/md5-cache/x11-misc/grub2-theme-preview-1.3.1
@@ -10,5 +10,5 @@ RDEPEND=app-emulation/qemu dev-libs/libisoburn sys-fs/mtools sys-boot/grub:2[gru
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/hartwork/grub2-theme-preview/archive/1.3.1.tar.gz -> grub2-theme-preview-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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=574ca09cf582f71101dc7a0e386eeffd
diff --git a/metadata/md5-cache/x11-misc/grub2-theme-preview-1.3.2 b/metadata/md5-cache/x11-misc/grub2-theme-preview-1.3.2
index 652a0463b145..26a4c04e4275 100644
--- a/metadata/md5-cache/x11-misc/grub2-theme-preview-1.3.2
+++ b/metadata/md5-cache/x11-misc/grub2-theme-preview-1.3.2
@@ -10,5 +10,5 @@ RDEPEND=app-emulation/qemu dev-libs/libisoburn sys-fs/mtools sys-boot/grub:2[gru
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/hartwork/grub2-theme-preview/archive/1.3.2.tar.gz -> grub2-theme-preview-1.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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b892d3c6c9ecfa2caa5178ee1cba8da0
diff --git a/metadata/md5-cache/x11-misc/gxmessage-2.20.3 b/metadata/md5-cache/x11-misc/gxmessage-2.20.3
index 5c490f9d0b02..cef81144c158 100644
--- a/metadata/md5-cache/x11-misc/gxmessage-2.20.3
+++ b/metadata/md5-cache/x11-misc/gxmessage-2.20.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3 public-domain
 RDEPEND=>=x11-libs/gtk+-2.20:2
 SLOT=0
 SRC_URI=mirror://gnu/gxmessage/gxmessage-2.20.3.tar.gz http://homepages.ihug.co.nz/~trmusson/stuff/gxmessage-2.20.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e1ca83741cde3b90f35524c00ed26827
diff --git a/metadata/md5-cache/x11-misc/gxmessage-3.4.3 b/metadata/md5-cache/x11-misc/gxmessage-3.4.3
index a750bbb55658..e2302e26c39e 100644
--- a/metadata/md5-cache/x11-misc/gxmessage-3.4.3
+++ b/metadata/md5-cache/x11-misc/gxmessage-3.4.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3 public-domain
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:3 x11-libs/pango
 SLOT=0
 SRC_URI=mirror://gnu/gxmessage/gxmessage-3.4.3.tar.gz http://homepages.ihug.co.nz/~trmusson/stuff/gxmessage-3.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c7ef1319996baa7d8e54d589c6ed1cd0
diff --git a/metadata/md5-cache/x11-misc/j4-dmenu-desktop-2.16 b/metadata/md5-cache/x11-misc/j4-dmenu-desktop-2.16
index 2db5178f7045..7d732709b56d 100644
--- a/metadata/md5-cache/x11-misc/j4-dmenu-desktop-2.16
+++ b/metadata/md5-cache/x11-misc/j4-dmenu-desktop-2.16
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=x11-misc/dmenu
 SLOT=0
 SRC_URI=https://github.com/enkore/j4-dmenu-desktop/archive/r2.16.tar.gz -> j4-dmenu-desktop-r2.16.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5ada3a01320b3a43962853c6d18d4547
diff --git a/metadata/md5-cache/x11-misc/kapow-1.5.7 b/metadata/md5-cache/x11-misc/kapow-1.5.7
index 3db290e8f0f3..4e0452f88e53 100644
--- a/metadata/md5-cache/x11-misc/kapow-1.5.7
+++ b/metadata/md5-cache/x11-misc/kapow-1.5.7
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://gottcode.org/kapow/kapow-1.5.7-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0b0a6e27d9d24f9c1c4e5335416cb178
diff --git a/metadata/md5-cache/x11-misc/kapow-1.5.8 b/metadata/md5-cache/x11-misc/kapow-1.5.8
index 973de8601fda..12d1a34098d0 100644
--- a/metadata/md5-cache/x11-misc/kapow-1.5.8
+++ b/metadata/md5-cache/x11-misc/kapow-1.5.8
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://gottcode.org/kapow/kapow-1.5.8-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0b0a6e27d9d24f9c1c4e5335416cb178
diff --git a/metadata/md5-cache/x11-misc/kdocker-5.1 b/metadata/md5-cache/x11-misc/kdocker-5.1
index d7d31fe0746e..b04e0d5398d4 100644
--- a/metadata/md5-cache/x11-misc/kdocker-5.1
+++ b/metadata/md5-cache/x11-misc/kdocker-5.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXmu x11-libs/libXpm
 SLOT=0
 SRC_URI=https://github.com/user-none/KDocker/archive/5.1.tar.gz -> KDocker-5.1.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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_=5d6e446c3e2b1fd5da6d671e67a52e94
diff --git a/metadata/md5-cache/x11-misc/kdocker-5.2 b/metadata/md5-cache/x11-misc/kdocker-5.2
index e707ed560b20..e179a633c6aa 100644
--- a/metadata/md5-cache/x11-misc/kdocker-5.2
+++ b/metadata/md5-cache/x11-misc/kdocker-5.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXmu x11-libs/libXpm
 SLOT=0
 SRC_URI=https://github.com/user-none/KDocker/archive/5.2.tar.gz -> KDocker-5.2.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	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_=a632e9c1c45c12413142fb1778986db0
diff --git a/metadata/md5-cache/x11-misc/kronometer-2.2.1 b/metadata/md5-cache/x11-misc/kronometer-2.2.1
index c25f9eb4b38f..46b113301143 100644
--- a/metadata/md5-cache/x11-misc/kronometer-2.2.1
+++ b/metadata/md5-cache/x11-misc/kronometer-2.2.1
@@ -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 >=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
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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.34 b/metadata/md5-cache/x11-misc/libinput-gestures-2.34
index df034e2f60fc..40130d788386 100644
--- a/metadata/md5-cache/x11-misc/libinput-gestures-2.34
+++ b/metadata/md5-cache/x11-misc/libinput-gestures-2.34
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/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	89bb9f083a2590d9b447fd0b78a96186
+_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 05389b53c870..d83de000f817 100644
--- a/metadata/md5-cache/x11-misc/libinput-gestures-2.36
+++ b/metadata/md5-cache/x11-misc/libinput-gestures-2.36
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/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	89bb9f083a2590d9b447fd0b78a96186
+_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-9999 b/metadata/md5-cache/x11-misc/libinput-gestures-9999
index 5a75c64d2960..8089e71d3ce1 100644
--- a/metadata/md5-cache/x11-misc/libinput-gestures-9999
+++ b/metadata/md5-cache/x11-misc/libinput-gestures-9999
@@ -8,5 +8,5 @@ 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
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/x11-misc/light-locker-1.7.0 b/metadata/md5-cache/x11-misc/light-locker-1.7.0
index 89e8f9e49875..6ff6fbfac2e3 100644
--- a/metadata/md5-cache/x11-misc/light-locker-1.7.0
+++ b/metadata/md5-cache/x11-misc/light-locker-1.7.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=dev-libs/dbus-glib >=dev-libs/glib-2.25.6:2 >=sys-apps/dbus-0.30 x11-libs/cairo x11-libs/libX11 x11-libs/pango x11-libs/libXxf86vm consolekit? ( sys-auth/consolekit ) dpms? ( x11-libs/libXext ) !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( x11-libs/gtk+:3 ) screensaver? ( x11-libs/libXScrnSaver ) systemd? ( sys-apps/systemd ) upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) ) x11-misc/lightdm
 SLOT=0
 SRC_URI=https://github.com/the-cavalry/light-locker/releases/download/v1.7.0/light-locker-1.7.0.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	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_=04ee03dcfc4624e23263d2031484f6c2
diff --git a/metadata/md5-cache/x11-misc/light-locker-1.7.0-r1 b/metadata/md5-cache/x11-misc/light-locker-1.7.0-r1
index 1d25c964ba16..ae4a4fa4f616 100644
--- a/metadata/md5-cache/x11-misc/light-locker-1.7.0-r1
+++ b/metadata/md5-cache/x11-misc/light-locker-1.7.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=dev-libs/dbus-glib >=dev-libs/glib-2.25.6:2 >=sys-apps/dbus-0.30 x11-libs/cairo x11-libs/libX11 x11-libs/pango x11-libs/libXxf86vm consolekit? ( sys-auth/consolekit ) dpms? ( x11-libs/libXext ) !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( x11-libs/gtk+:3 ) screensaver? ( x11-libs/libXScrnSaver ) systemd? ( sys-apps/systemd ) upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) ) x11-misc/lightdm
 SLOT=0
 SRC_URI=https://github.com/the-cavalry/light-locker/releases/download/v1.7.0/light-locker-1.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f452e530c120e16c9c991983f8b2884a
diff --git a/metadata/md5-cache/x11-misc/light-locker-1.8.0 b/metadata/md5-cache/x11-misc/light-locker-1.8.0
index 4b578601b8fb..b00d13bc1219 100644
--- a/metadata/md5-cache/x11-misc/light-locker-1.8.0
+++ b/metadata/md5-cache/x11-misc/light-locker-1.8.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=dev-libs/dbus-glib >=dev-libs/glib-2.25.6:2 >=sys-apps/dbus-0.30 x11-libs/cairo x11-libs/libX11 x11-libs/pango x11-libs/libXxf86vm consolekit? ( sys-auth/consolekit ) dpms? ( x11-libs/libXext ) !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( x11-libs/gtk+:3 ) screensaver? ( x11-libs/libXScrnSaver ) systemd? ( sys-apps/systemd ) upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) ) x11-misc/lightdm
 SLOT=0
 SRC_URI=https://github.com/the-cavalry/light-locker/releases/download/v1.8.0/light-locker-1.8.0.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	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_=04ee03dcfc4624e23263d2031484f6c2
diff --git a/metadata/md5-cache/x11-misc/lightdm-1.18.3-r1 b/metadata/md5-cache/x11-misc/lightdm-1.18.3-r1
index 9b626c709501..e7ff065ef8ec 100644
--- a/metadata/md5-cache/x11-misc/lightdm-1.18.3-r1
+++ b/metadata/md5-cache/x11-misc/lightdm-1.18.3-r1
@@ -11,5 +11,5 @@ RDEPEND=audit? ( sys-process/audit ) >=dev-libs/glib-2.32.3:2 dev-libs/libxml2 g
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
index d6fb789940c8..56cc108b273a 100644
--- a/metadata/md5-cache/x11-misc/lightdm-1.24.0-r1
+++ b/metadata/md5-cache/x11-misc/lightdm-1.24.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.32.3:2 dev-libs/libxml2 virtual/pam x11-libs/libX11 >=
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
index ed4ac5b89da9..799e5a355b16 100644
--- a/metadata/md5-cache/x11-misc/lightdm-1.26.0
+++ b/metadata/md5-cache/x11-misc/lightdm-1.26.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.44.0:2 dev-libs/libxml2 virtual/pam x11-libs/libX11 >=
 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	89bb9f083a2590d9b447fd0b78a96186
+_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 8754065ed5a8..6bcebb10df64 100644
--- a/metadata/md5-cache/x11-misc/lightdm-1.26.0-r1
+++ b/metadata/md5-cache/x11-misc/lightdm-1.26.0-r1
@@ -4,12 +4,12 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=90b3d793c9c182ff0aad5b62f5a7a74e
+_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
diff --git a/metadata/md5-cache/x11-misc/lightdm-1.28.0 b/metadata/md5-cache/x11-misc/lightdm-1.28.0
index a2b46f3c4a52..bdee244aee20 100644
--- a/metadata/md5-cache/x11-misc/lightdm-1.28.0
+++ b/metadata/md5-cache/x11-misc/lightdm-1.28.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.44.0:2 dev-libs/libxml2 virtual/pam x11-libs/libX11 >=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/CanonicalLtd/lightdm/releases/download/1.28.0/lightdm-1.28.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5b155d55b0ffec203575586927f9d1a7
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 808ecb54afbf..ef7e405cd91f 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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=db680aad235eea755c20281b75a21b30
+_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
diff --git a/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.6 b/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.6
index a84146a34266..275b973e0345 100644
--- a/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.6
+++ b/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.6
@@ -9,5 +9,5 @@ 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.6/+download/lightdm-gtk-greeter-2.0.6.tar.gz branding? ( https://dev.gentoo.org/~hwoarang/distfiles/lightdm-gentoo-patch-2.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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_=c8ebc63ecdb699132344d8574e018e25
diff --git a/metadata/md5-cache/x11-misc/mate-notification-daemon-1.12.1 b/metadata/md5-cache/x11-misc/mate-notification-daemon-1.12.1
deleted file mode 100644
index 06fdc257f4cb..000000000000
--- a/metadata/md5-cache/x11-misc/mate-notification-daemon-1.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/atk:0 >=dev-libs/dbus-glib-0.78:0 >=dev-libs/glib-2.36:2 >=sys-apps/dbus-1:0 x11-libs/cairo:0 >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/libnotify-0.7:0 x11-libs/libX11:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 >=x11-libs/libwnck-1:1 >=media-libs/libcanberra-0.4:0[gtk] ) gtk3? ( >=x11-libs/gtk+-3.0:3 >=x11-libs/libwnck-3:3 >=media-libs/libcanberra-0.4:0[gtk3] ) !x11-misc/notify-osd:* !x11-misc/qtnotifydaemon:* !x11-misc/notification-daemon:* app-arch/xz-utils:0 >=dev-util/intltool-0.50.1:* sys-devel/gettext:* >=sys-devel/libtool-2.2.6:2 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.12
-DESCRIPTION=MATE Notification daemon
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=gtk3
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/atk:0 >=dev-libs/dbus-glib-0.78:0 >=dev-libs/glib-2.36:2 >=sys-apps/dbus-1:0 x11-libs/cairo:0 >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/libnotify-0.7:0 x11-libs/libX11:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 >=x11-libs/libwnck-1:1 >=media-libs/libcanberra-0.4:0[gtk] ) gtk3? ( >=x11-libs/gtk+-3.0:3 >=x11-libs/libwnck-3:3 >=media-libs/libcanberra-0.4:0[gtk3] ) !x11-misc/notify-osd:* !x11-misc/qtnotifydaemon:* !x11-misc/notification-daemon:*
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/mate-notification-daemon-1.12.1.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=7321e1dd7ca017349cbee8ced2b39da5
diff --git a/metadata/md5-cache/x11-misc/mate-notification-daemon-1.14.1 b/metadata/md5-cache/x11-misc/mate-notification-daemon-1.14.1
deleted file mode 100644
index 8c0b78f50a69..000000000000
--- a/metadata/md5-cache/x11-misc/mate-notification-daemon-1.14.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/atk:0 >=dev-libs/dbus-glib-0.78:0 >=dev-libs/glib-2.36:2 >=sys-apps/dbus-1:0 x11-libs/cairo:0 >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/libnotify-0.7:0 x11-libs/libX11:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 >=x11-libs/libwnck-1:1 >=media-libs/libcanberra-0.4:0[gtk] ) gtk3? ( >=x11-libs/gtk+-3.0:3 >=x11-libs/libwnck-3:3 >=media-libs/libcanberra-0.4:0[gtk3] ) !x11-misc/notify-osd:* !x11-misc/qtnotifydaemon:* !x11-misc/notification-daemon:* app-arch/xz-utils:0 >=dev-util/intltool-0.50.1:* sys-devel/gettext:* >=sys-devel/libtool-2.2.6:2 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.14
-DESCRIPTION=MATE Notification daemon
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=gtk3
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/atk:0 >=dev-libs/dbus-glib-0.78:0 >=dev-libs/glib-2.36:2 >=sys-apps/dbus-1:0 x11-libs/cairo:0 >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/libnotify-0.7:0 x11-libs/libX11:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 >=x11-libs/libwnck-1:1 >=media-libs/libcanberra-0.4:0[gtk] ) gtk3? ( >=x11-libs/gtk+-3.0:3 >=x11-libs/libwnck-3:3 >=media-libs/libcanberra-0.4:0[gtk3] ) !x11-misc/notify-osd:* !x11-misc/qtnotifydaemon:* !x11-misc/notification-daemon:*
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.14/mate-notification-daemon-1.14.1.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=69d1161a96ad2863a2819be0dc5bb605
diff --git a/metadata/md5-cache/x11-misc/mate-notification-daemon-1.16.1 b/metadata/md5-cache/x11-misc/mate-notification-daemon-1.16.1
deleted file mode 100644
index f58d76fee2ae..000000000000
--- a/metadata/md5-cache/x11-misc/mate-notification-daemon-1.16.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/atk:0 >=dev-libs/dbus-glib-0.78:0 >=dev-libs/glib-2.36:2 >=sys-apps/dbus-1:0 x11-libs/cairo:0 >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/libnotify-0.7:0 x11-libs/libX11:0 virtual/libintl:0 >=x11-libs/gtk+-3.14:3 >=x11-libs/libwnck-3:3 >=media-libs/libcanberra-0.4:0[gtk3] !x11-misc/notify-osd:* !x11-misc/qtnotifydaemon:* !x11-misc/notification-daemon:* app-arch/xz-utils:0 >=dev-util/intltool-0.50.1:* sys-devel/gettext:* >=sys-devel/libtool-2.2.6:2 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.16
-DESCRIPTION=MATE Notification daemon
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/atk:0 >=dev-libs/dbus-glib-0.78:0 >=dev-libs/glib-2.36:2 >=sys-apps/dbus-1:0 x11-libs/cairo:0 >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/libnotify-0.7:0 x11-libs/libX11:0 virtual/libintl:0 >=x11-libs/gtk+-3.14:3 >=x11-libs/libwnck-3:3 >=media-libs/libcanberra-0.4:0[gtk3] !x11-misc/notify-osd:* !x11-misc/qtnotifydaemon:* !x11-misc/notification-daemon:*
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-notification-daemon-1.16.1.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=8b0340f20dd06cc1cd36677bc7cc4ab1
diff --git a/metadata/md5-cache/x11-misc/mate-notification-daemon-1.18.1 b/metadata/md5-cache/x11-misc/mate-notification-daemon-1.18.1
index 5bf8414aaf35..78e9d7117892 100644
--- a/metadata/md5-cache/x11-misc/mate-notification-daemon-1.18.1
+++ b/metadata/md5-cache/x11-misc/mate-notification-daemon-1.18.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/atk:0 >=dev-libs/dbus-glib-0.78:0 >=dev-libs/glib-2.36:2 >=sys-apps/dbus-1:0 x11-libs/cairo:0 >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/libnotify-0.7:0 x11-libs/libX11:0 virtual/libintl:0 >=x11-libs/gtk+-3.14:3 >=x11-libs/libwnck-3:3 >=media-libs/libcanberra-0.4:0[gtk3] !x11-misc/notify-osd:* !x11-misc/qtnotifydaemon:* !x11-misc/notification-daemon:*
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-notification-daemon-1.18.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c777dda9584aeaa96690e820191e1057
diff --git a/metadata/md5-cache/x11-misc/menulibre-2.1.3 b/metadata/md5-cache/x11-misc/menulibre-2.1.3
index 794c3177d048..79026d43926a 100644
--- a/metadata/md5-cache/x11-misc/menulibre-2.1.3
+++ b/metadata/md5-cache/x11-misc/menulibre-2.1.3
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/gobject-introspection dev-python/psutil[python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://launchpad.net/menulibre/2.1/2.1.3/+download/menulibre-2.1.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8181542c37a688d95a606498f6b03721
diff --git a/metadata/md5-cache/x11-misc/menulibre-2.1.5 b/metadata/md5-cache/x11-misc/menulibre-2.1.5
index 3e154056813c..147c5e75a93e 100644
--- a/metadata/md5-cache/x11-misc/menulibre-2.1.5
+++ b/metadata/md5-cache/x11-misc/menulibre-2.1.5
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/gobject-introspection dev-python/psutil[python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://launchpad.net/menulibre/2.1/2.1.5/+download/menulibre-2.1.5.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=068fee3e8e48f1e3174e828b4984981c
diff --git a/metadata/md5-cache/x11-misc/menulibre-2.2.0 b/metadata/md5-cache/x11-misc/menulibre-2.2.0
index 3c9f479421e0..eec161a58c78 100644
--- a/metadata/md5-cache/x11-misc/menulibre-2.2.0
+++ b/metadata/md5-cache/x11-misc/menulibre-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/gobject-introspection dev-python/psutil[python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://launchpad.net/menulibre/2.2/2.2.0/+download/menulibre-2.2.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=01a0b0684e0bead92368652f897f9f18
diff --git a/metadata/md5-cache/x11-misc/mozo-1.12.0-r1 b/metadata/md5-cache/x11-misc/mozo-1.12.0-r1
deleted file mode 100644
index 543a1b9553ac..000000000000
--- a/metadata/md5-cache/x11-misc/mozo-1.12.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=mate-base/mate-menus-1.6[introspection] x11-libs/gdk-pixbuf:2[introspection] virtual/libintl:0 !!x11-misc/mate-menu-editor !gtk3? ( >=dev-python/pygobject-2.15.1:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygtk-2.13:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=mate-base/mate-menus-1.6[python] x11-libs/gtk+:2[introspection] ) gtk3? ( >=dev-python/pygobject-3:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:3[introspection] ) >=dev-util/intltool-0.40:* 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.12
-DESCRIPTION=Mozo menu editor for MATE
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=gtk3 python_targets_python2_7
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=mate-base/mate-menus-1.6[introspection] x11-libs/gdk-pixbuf:2[introspection] virtual/libintl:0 !!x11-misc/mate-menu-editor !gtk3? ( >=dev-python/pygobject-2.15.1:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygtk-2.13:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=mate-base/mate-menus-1.6[python] x11-libs/gtk+:2[introspection] ) gtk3? ( >=dev-python/pygobject-3:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:3[introspection] )
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/mozo-1.12.0.tar.xz gtk3? ( https://dev.gentoo.org/~np-hardass/distfiles/mozo/mozo-1.12.0-gtk3.patch.bz2 )
-_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	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=9e356f3ee15e633d1ac2505eda5a801c
diff --git a/metadata/md5-cache/x11-misc/mozo-1.14.1 b/metadata/md5-cache/x11-misc/mozo-1.14.1
deleted file mode 100644
index 3b3c1d3959eb..000000000000
--- a/metadata/md5-cache/x11-misc/mozo-1.14.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygobject-3:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=mate-base/mate-menus-1.6[introspection] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] virtual/libintl:0 !!x11-misc/mate-menu-editor >=dev-util/intltool-0.40:* 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.14
-DESCRIPTION=Mozo menu editor for MATE
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygobject-3:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=mate-base/mate-menus-1.6[introspection] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] virtual/libintl:0 !!x11-misc/mate-menu-editor
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.14/mozo-1.14.1.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	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=59273502528d9dd8361af9964b60bb24
diff --git a/metadata/md5-cache/x11-misc/mozo-1.16.0-r1 b/metadata/md5-cache/x11-misc/mozo-1.16.0-r1
deleted file mode 100644
index d6758e6cebf9..000000000000
--- a/metadata/md5-cache/x11-misc/mozo-1.16.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygobject-3:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=mate-base/mate-menus-1.6[introspection,python] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] virtual/libintl:0 !!x11-misc/mate-menu-editor >=dev-util/intltool-0.40:* 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.16
-DESCRIPTION=Mozo menu editor for MATE
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygobject-3:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=mate-base/mate-menus-1.6[introspection,python] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] virtual/libintl:0 !!x11-misc/mate-menu-editor
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/mozo-1.16.0.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	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=5c73b78cc2baa1ec23b75f580fa69ebd
diff --git a/metadata/md5-cache/x11-misc/mozo-1.18.0 b/metadata/md5-cache/x11-misc/mozo-1.18.0
index 55cccf300c59..c95df052b4b0 100644
--- a/metadata/md5-cache/x11-misc/mozo-1.18.0
+++ b/metadata/md5-cache/x11-misc/mozo-1.18.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygobject-3:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=mate-base/mate-menus-1.6[introspection,python] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] virtual/libintl:0 !!x11-misc/mate-menu-editor
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.18/mozo-1.18.0.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	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=206565f136f3a9213835ea8cffa0ebe1
diff --git a/metadata/md5-cache/x11-misc/mugshot-0.4.1 b/metadata/md5-cache/x11-misc/mugshot-0.4.1
index e87676ea821c..aac3c6585921 100644
--- a/metadata/md5-cache/x11-misc/mugshot-0.4.1
+++ b/metadata/md5-cache/x11-misc/mugshot-0.4.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/gobject-introspection dev-python/dbus-python[python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://launchpad.net/mugshot/0.4/0.4.1/+download/mugshot-0.4.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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_=a20a9e3286214f283078267fdb549d94
diff --git a/metadata/md5-cache/x11-misc/nitrogen-1.6.1 b/metadata/md5-cache/x11-misc/nitrogen-1.6.1
index 91cd1321d845..74e4882b369e 100644
--- a/metadata/md5-cache/x11-misc/nitrogen-1.6.1
+++ b/metadata/md5-cache/x11-misc/nitrogen-1.6.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-cpp/gtkmm-2.10:2.4 >=gnome-base/librsvg-2.20:2 >=x11-libs/gtk+-2.10:2 xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=http://projects.l3ib.org/nitrogen/files/nitrogen-1.6.1.tar.gz
-_eclasses_=autotools	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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6b8bd72e3ebf5d87006790d253e81942
diff --git a/metadata/md5-cache/x11-misc/notification-daemon-0.5.0 b/metadata/md5-cache/x11-misc/notification-daemon-0.5.0
index 8b27091944a6..7730a0663987 100644
--- a/metadata/md5-cache/x11-misc/notification-daemon-0.5.0
+++ b/metadata/md5-cache/x11-misc/notification-daemon-0.5.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2 >=x11-libs/gtk+-2.18:2 >=gnome-base/gconf-2 >=dev-libs/dbus-glib-0.100 >=sys-apps/dbus-1 >=media-libs/libcanberra-0.4[gtk] x11-libs/libnotify x11-libs/libwnck:1 x11-libs/libX11 !x11-misc/notify-osd !x11-misc/qtnotifydaemon
 SLOT=0
 SRC_URI=mirror://gnome/sources/notification-daemon/0.5/notification-daemon-0.5.0.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=72f7afc72f4cdc2d4dc1934fde6a45db
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 7619d8022c04..bd92c2933317 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
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.16:2 >=x11-libs/gtk+-3.2:3 >
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/x11-misc/nts-82-r1 b/metadata/md5-cache/x11-misc/nts-82-r1
index 8f119af9124c..216129acb90f 100644
--- a/metadata/md5-cache/x11-misc/nts-82-r1
+++ b/metadata/md5-cache/x11-misc/nts-82-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.duke.edu/~dgraham/NTS//nts-82.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8b24db4e6bd0e98d260997be83758727
diff --git a/metadata/md5-cache/x11-misc/obconf-2.0.4 b/metadata/md5-cache/x11-misc/obconf-2.0.4
index ebc001285cbd..eba97ce2925e 100644
--- a/metadata/md5-cache/x11-misc/obconf-2.0.4
+++ b/metadata/md5-cache/x11-misc/obconf-2.0.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=gnome-base/libglade:2.0 x11-libs/gtk+:2 x11-libs/startup-notification >=x11-wm/openbox-3.5.2
 SLOT=0
 SRC_URI=http://openbox.org/dist/obconf/obconf-2.0.4.tar.gz
-_eclasses_=xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6ef0b92bc90e1eed96a85db03a12a77a
diff --git a/metadata/md5-cache/x11-misc/obconf-9999 b/metadata/md5-cache/x11-misc/obconf-9999
index 1780201cdba9..e54e5c6c62e1 100644
--- a/metadata/md5-cache/x11-misc/obconf-9999
+++ b/metadata/md5-cache/x11-misc/obconf-9999
@@ -7,5 +7,5 @@ IUSE=nls
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:3 x11-libs/startup-notification =x11-wm/openbox-9999
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fd6ca92d4224c7b3d3f52512bf90e706
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 65105969df95..72d41fcd16f3 100644
--- a/metadata/md5-cache/x11-misc/obconf-qt-0.13.0
+++ b/metadata/md5-cache/x11-misc/obconf-qt-0.13.0
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
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
index f8361f53c0d8..8e979a7cf73e 100644
--- a/metadata/md5-cache/x11-misc/obconf-qt-0.9.0_p20150729
+++ b/metadata/md5-cache/x11-misc/obconf-qt-0.9.0_p20150729
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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/obmenu-1.0-r1 b/metadata/md5-cache/x11-misc/obmenu-1.0-r1
index 05942d33a5f2..2332a4d0f741 100644
--- a/metadata/md5-cache/x11-misc/obmenu-1.0-r1
+++ b/metadata/md5-cache/x11-misc/obmenu-1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygtk python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/obmenu/obmenu-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b548a73f1fd3ace30cc564232d134213
diff --git a/metadata/md5-cache/x11-misc/parcellite-1.2.1 b/metadata/md5-cache/x11-misc/parcellite-1.2.1
index c697e50a955f..925b3b49bf3c 100644
--- a/metadata/md5-cache/x11-misc/parcellite-1.2.1
+++ b/metadata/md5-cache/x11-misc/parcellite-1.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.14 >=x11-libs/gtk+-2.10:2 x11-misc/xdotool
 SLOT=0
 SRC_URI=mirror://sourceforge/parcellite/parcellite-1.2.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a52eaf1c99998e199d3cbf678c7347cd
diff --git a/metadata/md5-cache/x11-misc/pcmanfm-1.2.3 b/metadata/md5-cache/x11-misc/pcmanfm-1.2.3
index f471f8982348..7d29cc4d7a7d 100644
--- a/metadata/md5-cache/x11-misc/pcmanfm-1.2.3
+++ b/metadata/md5-cache/x11-misc/pcmanfm-1.2.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2 x11-misc/shared-mime-info >=x11-libs/libfm-1.2.3:=[gtk(+)] virtual/eject virtual/freedesktop-icon-theme
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~hwoarang/distfiles/pcmanfm-1.2.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f856f90425adfc92e3bfa915c98ffe97
diff --git a/metadata/md5-cache/x11-misc/pcmanfm-1.2.5 b/metadata/md5-cache/x11-misc/pcmanfm-1.2.5
index a9713bbadf69..9462639af8eb 100644
--- a/metadata/md5-cache/x11-misc/pcmanfm-1.2.5
+++ b/metadata/md5-cache/x11-misc/pcmanfm-1.2.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2 x11-misc/shared-mime-info >=x11-libs/libfm-1.2.5:=[gtk(+)] virtual/eject virtual/freedesktop-icon-theme
 SLOT=0
 SRC_URI=mirror://sourceforge/pcmanfm/pcmanfm-1.2.5.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=279585149184a3acc74cdc5cac973e19
diff --git a/metadata/md5-cache/x11-misc/pcmanfm-9999 b/metadata/md5-cache/x11-misc/pcmanfm-9999
index fcd484271955..49f7aae7186f 100644
--- a/metadata/md5-cache/x11-misc/pcmanfm-9999
+++ b/metadata/md5-cache/x11-misc/pcmanfm-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2 x11-misc/shared-mime-info >=x11-libs/libfm-9999:=[gtk(+)] virtual/eject virtual/freedesktop-icon-theme
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f3eadd2a1bd95c655bbd4b546c45abcd
diff --git a/metadata/md5-cache/x11-misc/pcmanfm-qt-0.11.1 b/metadata/md5-cache/x11-misc/pcmanfm-qt-0.11.1
index 155ef7d09608..6e6265d59607 100644
--- a/metadata/md5-cache/x11-misc/pcmanfm-qt-0.11.1
+++ b/metadata/md5-cache/x11-misc/pcmanfm-qt-0.11.1
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
index d878aa09c06a..8ce39fe1446e 100644
--- a/metadata/md5-cache/x11-misc/pcmanfm-qt-0.13.0
+++ b/metadata/md5-cache/x11-misc/pcmanfm-qt-0.13.0
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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 e7e9d4be4179..53999d7916d8 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
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/x11-misc/polybar-3.2.1 b/metadata/md5-cache/x11-misc/polybar-3.2.1
index 78335030d2d3..cd2ea444152b 100644
--- a/metadata/md5-cache/x11-misc/polybar-3.2.1
+++ b/metadata/md5-cache/x11-misc/polybar-3.2.1
@@ -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/jaagr/polybar/archive/3.2.1.tar.gz -> polybar-3.2.1.tar.gz https://github.com/jaagr/xpp/archive/1.4.0.tar.gz -> xpp-1.4.0.tar.gz https://github.com/jaagr/i3ipcpp/archive/v0.7.1.tar.gz -> i3ipcpp-0.7.1.tar.gz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c0db069149d2b088873d675b79804a78
diff --git a/metadata/md5-cache/x11-misc/polybar-9999 b/metadata/md5-cache/x11-misc/polybar-9999
index 5558b97a156a..177f0328b771 100644
--- a/metadata/md5-cache/x11-misc/polybar-9999
+++ b/metadata/md5-cache/x11-misc/polybar-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] x11-base/xcb-proto x11-libs/cairo[xcb] x11-libs/libxcb[xkb] x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-libs/xcb-util-xrm alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) i3wm? ( dev-libs/jsoncpp ) mpd? ( media-libs/libmpdclient ) network? ( net-wireless/wireless-tools ) pulseaudio? ( media-sound/pulseaudio )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
-_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=adad0588acbb4e303a996af2530921f1
diff --git a/metadata/md5-cache/x11-misc/py3status-3.12 b/metadata/md5-cache/x11-misc/py3status-3.12
index 030393a80a52..469a7e31cdb0 100644
--- a/metadata/md5-cache/x11-misc/py3status-3.12
+++ b/metadata/md5-cache/x11-misc/py3status-3.12
@@ -10,5 +10,5 @@ RDEPEND=x11-misc/i3status python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2
 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/ultrabug/py3status/archive/3.12.tar.gz -> py3status-3.12.tar.gz
-_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a2f5cb4ac82b709a681a366f0a194cd5
diff --git a/metadata/md5-cache/x11-misc/pypanel-2.4-r2 b/metadata/md5-cache/x11-misc/pypanel-2.4-r2
index c34f667b275e..e60b32342301 100644
--- a/metadata/md5-cache/x11-misc/pypanel-2.4-r2
+++ b/metadata/md5-cache/x11-misc/pypanel-2.4-r2
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/libXft dev-python/python-xlib[python_targets_python2_7(-)?,-pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pypanel/PyPanel-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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=54dd659467ebc995f2c0c8cd42e7983f
diff --git a/metadata/md5-cache/x11-misc/qcomicbook-0.9.1 b/metadata/md5-cache/x11-misc/qcomicbook-0.9.1
index 2bb114c52061..d683e97ab636 100644
--- a/metadata/md5-cache/x11-misc/qcomicbook-0.9.1
+++ b/metadata/md5-cache/x11-misc/qcomicbook-0.9.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/poppler[qt5] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5
 SLOT=0
 SRC_URI=https://github.com/stolowski/QComicBook/archive/0.9.1.tar.gz -> qcomicbook-0.9.1.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	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_=e75e0baddf72007a1d1edf92dc966ff6
diff --git a/metadata/md5-cache/x11-misc/qlipper-5.0.0 b/metadata/md5-cache/x11-misc/qlipper-5.0.0
index ee798a861e35..6a55c20f51e1 100644
--- a/metadata/md5-cache/x11-misc/qlipper-5.0.0
+++ b/metadata/md5-cache/x11-misc/qlipper-5.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-libs/libX11
 SLOT=0
 SRC_URI=https://github.com/pvanek/qlipper/archive/5.0.0.tar.gz -> qlipper-5.0.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=83ba9e761ffecb2c75c0a65c4d0be276
diff --git a/metadata/md5-cache/x11-misc/qps-1.10.17 b/metadata/md5-cache/x11-misc/qps-1.10.17
index eadc82378906..d1a4236208b4 100644
--- a/metadata/md5-cache/x11-misc/qps-1.10.17
+++ b/metadata/md5-cache/x11-misc/qps-1.10.17
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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 f84064bfaa7d..2e6c7eddc138 100644
--- a/metadata/md5-cache/x11-misc/qps-1.10.18
+++ b/metadata/md5-cache/x11-misc/qps-1.10.18
@@ -9,5 +9,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/x11-misc/qterm-0.7.1 b/metadata/md5-cache/x11-misc/qterm-0.7.1
index c27d0ff53b74..a6a9cb0a6538 100644
--- a/metadata/md5-cache/x11-misc/qterm-0.7.1
+++ b/metadata/md5-cache/x11-misc/qterm-0.7.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5[scripttools] dev-qt/qtwidgets:5 dev-qt/qtxml:5 x11-libs/libX11 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= )
 SLOT=0
 SRC_URI=https://github.com/qterm/qterm/archive/0.7.1.tar.gz -> qterm-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	89bb9f083a2590d9b447fd0b78a96186
+_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_=362c78d8937a660863e26c2612847431
diff --git a/metadata/md5-cache/x11-misc/qterm-0.7.3 b/metadata/md5-cache/x11-misc/qterm-0.7.3
index 63f171a7ef99..8f47aebba46f 100644
--- a/metadata/md5-cache/x11-misc/qterm-0.7.3
+++ b/metadata/md5-cache/x11-misc/qterm-0.7.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5[scripttools] dev-qt/qtwidgets:5 dev-qt/qtxml:5 x11-libs/libX11 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= )
 SLOT=0
 SRC_URI=https://github.com/qterm/qterm/archive/0.7.3.tar.gz -> qterm-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6a860919959e2e320ef912563bb8eaba
diff --git a/metadata/md5-cache/x11-misc/qtfm-5.9-r1 b/metadata/md5-cache/x11-misc/qtfm-5.9-r1
index c499688a03d6..ba9e1de2ec39 100644
--- a/metadata/md5-cache/x11-misc/qtfm-5.9-r1
+++ b/metadata/md5-cache/x11-misc/qtfm-5.9-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-apps/file
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jer/qtfm-5.9.zip
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=17741893592ab02bc780f162abc36a01
diff --git a/metadata/md5-cache/x11-misc/quitcount-3.1.3 b/metadata/md5-cache/x11-misc/quitcount-3.1.3
index 6353852bc9a4..9a116b8fd3d2 100644
--- a/metadata/md5-cache/x11-misc/quitcount-3.1.3
+++ b/metadata/md5-cache/x11-misc/quitcount-3.1.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/gtk+:3 >=dev-libs/glib-2.6:2
 SLOT=0
 SRC_URI=mirror://sourceforge/quitcount/3.1/quitcount-3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a9662294c0a2ea33d583a475eb338c68
diff --git a/metadata/md5-cache/x11-misc/qxkb-0.5.1_pre20150305 b/metadata/md5-cache/x11-misc/qxkb-0.5.1_pre20150305
index b2faf7073cf3..0ba72c405f7c 100644
--- a/metadata/md5-cache/x11-misc/qxkb-0.5.1_pre20150305
+++ b/metadata/md5-cache/x11-misc/qxkb-0.5.1_pre20150305
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libxkbfile
 SLOT=0
 SRC_URI=https://github.com/disels/qxkb/archive/d7474a06055108c833bbb55b6cdef47e0edfb17d.tar.gz -> qxkb-0.5.1_pre20150305.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e3ebbfa81d7784d6a09053aba2025aac
diff --git a/metadata/md5-cache/x11-misc/read-edid-3.0.2 b/metadata/md5-cache/x11-misc/read-edid-3.0.2
index 82d93fdf168a..c4d0b65a0395 100644
--- a/metadata/md5-cache/x11-misc/read-edid-3.0.2
+++ b/metadata/md5-cache/x11-misc/read-edid-3.0.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libx86-1.1
 SLOT=0
 SRC_URI=http://www.polypux.org/projects/read-edid/read-edid-3.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d20c5e357dac0e628e8aad2ffe92c8bc
diff --git a/metadata/md5-cache/x11-misc/redshift-1.12 b/metadata/md5-cache/x11-misc/redshift-1.12
index 7bcad508cc48..e7f2b4051e2a 100644
--- a/metadata/md5-cache/x11-misc/redshift-1.12
+++ b/metadata/md5-cache/x11-misc/redshift-1.12
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/libX11-1.4 x11-libs/libXxf86vm x11-libs/libxcb x11-libs/libdr
 REQUIRED_USE=gtk? ( || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://github.com/jonls/redshift/archive/v1.12.tar.gz -> redshift-1.12.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=32f426244c3a405c28b4f3a6367722cf
diff --git a/metadata/md5-cache/x11-misc/revelation-0.4.14-r1 b/metadata/md5-cache/x11-misc/revelation-0.4.14-r1
index 7d2859860908..b80f73aa7f7d 100644
--- a/metadata/md5-cache/x11-misc/revelation-0.4.14-r1
+++ b/metadata/md5-cache/x11-misc/revelation-0.4.14-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=18fbe39e66a333e05b051ad9f6d963f6
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 aff27a4ef0ec..e214c576bb39 100644
--- a/metadata/md5-cache/x11-misc/revelation-0.4.14-r2
+++ b/metadata/md5-cache/x11-misc/revelation-0.4.14-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/x11-misc/rodent-5.3.16.3-r1 b/metadata/md5-cache/x11-misc/rodent-5.3.16.3-r1
index e03d931ea79b..b26990a01330 100644
--- a/metadata/md5-cache/x11-misc/rodent-5.3.16.3-r1
+++ b/metadata/md5-cache/x11-misc/rodent-5.3.16.3-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=x11-libs/librfm-5.3.16.3
 SLOT=0
 SRC_URI=mirror://sourceforge/xffm/5.3.16.3/rodent-5.3.16.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f46e4c150dca655d555984500e2dea2b
diff --git a/metadata/md5-cache/x11-misc/safeeyes-2.0.2 b/metadata/md5-cache/x11-misc/safeeyes-2.0.2
index 7ccf873864b0..d0b8d67c1931 100644
--- a/metadata/md5-cache/x11-misc/safeeyes-2.0.2
+++ b/metadata/md5-cache/x11-misc/safeeyes-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/safeeyes/safeeyes-2.0.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	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=39d5b39e2442c062fa30fce8af70d4c9
diff --git a/metadata/md5-cache/x11-misc/safeeyes-2.0.4 b/metadata/md5-cache/x11-misc/safeeyes-2.0.4
index 45c5048e7045..e8ba862d0a3c 100644
--- a/metadata/md5-cache/x11-misc/safeeyes-2.0.4
+++ b/metadata/md5-cache/x11-misc/safeeyes-2.0.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/safeeyes/safeeyes-2.0.4.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	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=39d5b39e2442c062fa30fce8af70d4c9
diff --git a/metadata/md5-cache/x11-misc/safeeyes-2.0.5 b/metadata/md5-cache/x11-misc/safeeyes-2.0.5
index f19d627aae0a..ddf1f2fdf2e3 100644
--- a/metadata/md5-cache/x11-misc/safeeyes-2.0.5
+++ b/metadata/md5-cache/x11-misc/safeeyes-2.0.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/safeeyes/safeeyes-2.0.5.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	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=39d5b39e2442c062fa30fce8af70d4c9
diff --git a/metadata/md5-cache/x11-misc/safeeyes-2.0.6 b/metadata/md5-cache/x11-misc/safeeyes-2.0.6
index 824ba0b60a36..1ed95d825a99 100644
--- a/metadata/md5-cache/x11-misc/safeeyes-2.0.6
+++ b/metadata/md5-cache/x11-misc/safeeyes-2.0.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/safeeyes/safeeyes-2.0.6.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	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d623e445a766f54befa7387ce80e6593
diff --git a/metadata/md5-cache/x11-misc/screengrab-1.97 b/metadata/md5-cache/x11-misc/screengrab-1.97
index 00f6af7755e6..1119f3af568b 100644
--- a/metadata/md5-cache/x11-misc/screengrab-1.97
+++ b/metadata/md5-cache/x11-misc/screengrab-1.97
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libqtxdg 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://github.com/QtDesktop/screengrab/archive/1.97.tar.gz -> screengrab-1.97.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e7f2892a3249a9003f043920f599966d
diff --git a/metadata/md5-cache/x11-misc/screengrab-1.98 b/metadata/md5-cache/x11-misc/screengrab-1.98
index e415269a7b74..ff6efbe09cbe 100644
--- a/metadata/md5-cache/x11-misc/screengrab-1.98
+++ b/metadata/md5-cache/x11-misc/screengrab-1.98
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libqtxdg 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://github.com/QtDesktop/screengrab/archive/1.98.tar.gz -> screengrab-1.98.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b0e9de007cc45e88465ab124a42f29b2
diff --git a/metadata/md5-cache/x11-misc/screengrab-1.99 b/metadata/md5-cache/x11-misc/screengrab-1.99
index bbc1148cdd38..1e955ba0452b 100644
--- a/metadata/md5-cache/x11-misc/screengrab-1.99
+++ b/metadata/md5-cache/x11-misc/screengrab-1.99
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/x11-misc/sddm-0.15.0 b/metadata/md5-cache/x11-misc/sddm-0.15.0
index 030d49ae55f5..ae0738075fdb 100644
--- a/metadata/md5-cache/x11-misc/sddm-0.15.0
+++ b/metadata/md5-cache/x11-misc/sddm-0.15.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtcore-5.6:5 >=dev-qt/qtdbus-5.6:5 >=dev-qt/qtgui-5.6:5 >=dev-q
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=https://github.com/sddm/sddm/releases/download/v0.15.0/sddm-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	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bc8affc071a210e835e8bf7d6e3b76bb
diff --git a/metadata/md5-cache/x11-misc/sddm-0.17.0-r4 b/metadata/md5-cache/x11-misc/sddm-0.17.0-r4
index f7aaad88b1e9..6321d7e11cbe 100644
--- a/metadata/md5-cache/x11-misc/sddm-0.17.0-r4
+++ b/metadata/md5-cache/x11-misc/sddm-0.17.0-r4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtcore-5.6:5 >=dev-qt/qtdbus-5.6:5 >=dev-qt/qtdeclarative-5.6:5
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=https://github.com/sddm/sddm/releases/download/v0.17.0/sddm-0.17.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	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_=7322485700612d237118ea87edf12041
diff --git a/metadata/md5-cache/x11-misc/sddm-0.18.0 b/metadata/md5-cache/x11-misc/sddm-0.18.0
index b4831d8ecc13..91ddcf305e8e 100644
--- a/metadata/md5-cache/x11-misc/sddm-0.18.0
+++ b/metadata/md5-cache/x11-misc/sddm-0.18.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=https://github.com/sddm/sddm/releases/download/v0.18.0/sddm-0.18.0.tar.gz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	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_=f528b68f3637e8dbeff7dc27c01221d2
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 c247ee23706d..d1bc52432029 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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=9042445944786db1524a8699ce5abac7
+_eclasses_=xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=9a83c83eaf1e41a7dc396d1321dbcb30
diff --git a/metadata/md5-cache/x11-misc/shared-mime-info-1.9 b/metadata/md5-cache/x11-misc/shared-mime-info-1.9
index 0f85ed499309..c2ef9503afa2 100644
--- a/metadata/md5-cache/x11-misc/shared-mime-info-1.9
+++ b/metadata/md5-cache/x11-misc/shared-mime-info-1.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2 dev-libs/libxml2
 SLOT=0
 SRC_URI=https://people.freedesktop.org/~hadess/shared-mime-info-1.9.tar.xz
-_eclasses_=xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4f78c89af69d86882e607616e4e2a7be
diff --git a/metadata/md5-cache/x11-misc/slim-1.3.6-r5 b/metadata/md5-cache/x11-misc/slim-1.3.6-r5
index e19935676fe3..7f700583571f 100644
--- a/metadata/md5-cache/x11-misc/slim-1.3.6-r5
+++ b/metadata/md5-cache/x11-misc/slim-1.3.6-r5
@@ -11,5 +11,5 @@ RDEPEND=x11-libs/libXmu x11-libs/libX11 x11-libs/libXpm x11-libs/libXft x11-libs
 REQUIRED_USE=consolekit? ( pam )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/slim.berlios/slim-1.3.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	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3529c87225efc8e44ccd178e62047a36
diff --git a/metadata/md5-cache/x11-misc/slim-9999 b/metadata/md5-cache/x11-misc/slim-9999
index cef1df3b3844..07ad00d222e7 100644
--- a/metadata/md5-cache/x11-misc/slim-9999
+++ b/metadata/md5-cache/x11-misc/slim-9999
@@ -9,5 +9,5 @@ PDEPEND=branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )
 RDEPEND=x11-libs/libXmu x11-libs/libX11 x11-libs/libXpm x11-libs/libXft x11-libs/libXrandr media-libs/libpng:0= virtual/jpeg:= x11-apps/sessreg consolekit? ( sys-auth/consolekit sys-apps/dbus ) pam? ( virtual/pam !x11-misc/slimlock )
 REQUIRED_USE=consolekit? ( pam )
 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	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=32526353029c7813a1bb8ad67bd13bbd
diff --git a/metadata/md5-cache/x11-misc/slop-7.4 b/metadata/md5-cache/x11-misc/slop-7.4
index 55d6da317e6b..92c2a296f9b2 100644
--- a/metadata/md5-cache/x11-misc/slop-7.4
+++ b/metadata/md5-cache/x11-misc/slop-7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/icu:= x11-libs/libX11 x11-libs/libXext opengl? ( media-libs/glew:0= virtual/opengl x11-libs/libXrender:= )
 SLOT=0/7.4
 SRC_URI=https://github.com/naelstrof/slop/archive/v7.4.tar.gz -> slop-7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c96423ad29497d25757026c33e290803
diff --git a/metadata/md5-cache/x11-misc/slop-9999 b/metadata/md5-cache/x11-misc/slop-9999
index 312f1ce87b20..85f66bb0309d 100644
--- a/metadata/md5-cache/x11-misc/slop-9999
+++ b/metadata/md5-cache/x11-misc/slop-9999
@@ -7,5 +7,5 @@ IUSE=opengl
 LICENSE=GPL-3
 RDEPEND=dev-libs/icu:= x11-libs/libX11 x11-libs/libXext opengl? ( media-libs/glew:0= virtual/opengl x11-libs/libXrender:= )
 SLOT=0/9999
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c96423ad29497d25757026c33e290803
diff --git a/metadata/md5-cache/x11-misc/spacefm-1.0.5-r2 b/metadata/md5-cache/x11-misc/spacefm-1.0.5-r2
index dbdfd4be7cd9..7c242f42f6df 100644
--- a/metadata/md5-cache/x11-misc/spacefm-1.0.5-r2
+++ b/metadata/md5-cache/x11-misc/spacefm-1.0.5-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=dev-libs/glib:2 dev-util/desktop-file-utils >=virtual/udev-143 virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf gtk2? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk2? ( x11-libs/gtk+:3 ) x11-libs/pango x11-libs/libX11 x11-misc/shared-mime-info video-thumbnails? ( media-video/ffmpegthumbnailer ) startup-notification? ( x11-libs/startup-notification )
 SLOT=0
 SRC_URI=https://github.com/ignorantguru/spacefm/archive/1.0.5.tar.gz -> spacefm-1.0.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=756f4f9d74a822bccb107591e8d503ae
diff --git a/metadata/md5-cache/x11-misc/spacefm-1.0.6 b/metadata/md5-cache/x11-misc/spacefm-1.0.6
index 07650307b8b3..844f30215abb 100644
--- a/metadata/md5-cache/x11-misc/spacefm-1.0.6
+++ b/metadata/md5-cache/x11-misc/spacefm-1.0.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=dev-libs/glib:2 dev-util/desktop-file-utils >=virtual/udev-143 virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango x11-libs/libX11 x11-misc/shared-mime-info gtk2? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk2? ( x11-libs/gtk+:3 ) startup-notification? ( x11-libs/startup-notification ) video-thumbnails? ( media-video/ffmpegthumbnailer )
 SLOT=0
 SRC_URI=https://github.com/IgnorantGuru/spacefm/archive/1.0.6.tar.gz -> spacefm-1.0.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5b20622ac1c47d1e72e31dc15fe8a142
diff --git a/metadata/md5-cache/x11-misc/spacefm-9999 b/metadata/md5-cache/x11-misc/spacefm-9999
index 03e12cad40fc..1e554f90cd34 100644
--- a/metadata/md5-cache/x11-misc/spacefm-9999
+++ b/metadata/md5-cache/x11-misc/spacefm-9999
@@ -7,5 +7,5 @@ IUSE=gtk2 +gtk3 +startup-notification +video-thumbnails kernel_linux
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=dev-libs/glib:2 dev-util/desktop-file-utils >=virtual/udev-143 virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango x11-libs/libX11 x11-misc/shared-mime-info gtk2? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk2? ( x11-libs/gtk+:3 ) startup-notification? ( x11-libs/startup-notification ) video-thumbnails? ( media-video/ffmpegthumbnailer )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5b20622ac1c47d1e72e31dc15fe8a142
diff --git a/metadata/md5-cache/x11-misc/sunflower-0.2_alpha59 b/metadata/md5-cache/x11-misc/sunflower-0.2_alpha59
index 1acbf0e2e7b4..0dfa3fd710ee 100644
--- a/metadata/md5-cache/x11-misc/sunflower-0.2_alpha59
+++ b/metadata/md5-cache/x11-misc/sunflower-0.2_alpha59
@@ -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=http://sunflower-fm.org/pub/sunflower-0.2-59.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e5cebc45cc41e872723e7da6aa040b9d
diff --git a/metadata/md5-cache/x11-misc/synergy-1.9.1 b/metadata/md5-cache/x11-misc/synergy-1.9.1
index 073867b3d236..f8dc5fa30c08 100644
--- a/metadata/md5-cache/x11-misc/synergy-1.9.1
+++ b/metadata/md5-cache/x11-misc/synergy-1.9.1
@@ -10,5 +10,5 @@ RDEPEND=!libressl? ( dev-libs/openssl:* ) libressl? ( dev-libs/libressl ) net-mi
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/symless/synergy-core/archive/v1.9.1-stable.tar.gz -> synergy-1.9.1.tar.gz https://dev.gentoo.org/~jer/synergy.png
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=124336211558535c66edd51d262ca0c1
diff --git a/metadata/md5-cache/x11-misc/synergy-2.0.0 b/metadata/md5-cache/x11-misc/synergy-2.0.0
index 1027b6d7568c..54e3e483e544 100644
--- a/metadata/md5-cache/x11-misc/synergy-2.0.0
+++ b/metadata/md5-cache/x11-misc/synergy-2.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-misc/curl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXtst !libressl? ( dev-libs/openssl:* ) libressl? ( dev-libs/libressl )
 SLOT=0
 SRC_URI=https://github.com/symless/synergy-core/archive/v2.0.0-stable.tar.gz -> synergy-2.0.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=68356f8d4d5c884b1aeca2f08914c87f
diff --git a/metadata/md5-cache/x11-misc/tint2-0.12.12 b/metadata/md5-cache/x11-misc/tint2-0.12.12
index e19cc0fc124e..8ddda5ce2dd2 100644
--- a/metadata/md5-cache/x11-misc/tint2-0.12.12
+++ b/metadata/md5-cache/x11-misc/tint2-0.12.12
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 svg? ( gnome-base/librsvg:2 ) >=media-libs/imlib2-1.4.2[X,png] x11-libs/cairo[X] x11-libs/pango tint2conf? ( x11-libs/gtk+:2 ) x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXinerama >=x11-libs/libXrandr-1.3 x11-libs/libXrender startup-notification? ( x11-libs/startup-notification )
 SLOT=0
 SRC_URI=https://gitlab.com/o9000/tint2/repository/archive.tar.gz?ref=v0.12.12 -> tint2-0.12.12.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cdc55c5b373e0c89c4d18a5a91ff9080
diff --git a/metadata/md5-cache/x11-misc/tint2-0.14.6-r2 b/metadata/md5-cache/x11-misc/tint2-0.14.6-r2
index 1df126514589..1914ccdaa358 100644
--- a/metadata/md5-cache/x11-misc/tint2-0.14.6-r2
+++ b/metadata/md5-cache/x11-misc/tint2-0.14.6-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 svg? ( gnome-base/librsvg:2 ) >=media-libs/imlib2-1.4.2[X,png] x11-libs/cairo[X] x11-libs/pango tint2conf? ( x11-libs/gtk+:2 ) x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXinerama >=x11-libs/libXrandr-1.3 x11-libs/libXrender startup-notification? ( x11-libs/startup-notification )
 SLOT=0
 SRC_URI=https://gitlab.com/o9000/tint2/repository/archive.tar.gz?ref=v0.14.6 -> tint2-0.14.6.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9a0806f9046865f306b3c52fd8f5d69a
diff --git a/metadata/md5-cache/x11-misc/tint2-15.3 b/metadata/md5-cache/x11-misc/tint2-15.3
index 8adcd461bc81..b0c8045732ae 100644
--- a/metadata/md5-cache/x11-misc/tint2-15.3
+++ b/metadata/md5-cache/x11-misc/tint2-15.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 svg? ( gnome-base/librsvg:2 ) >=media-libs/imlib2-1.4.2[X,png] x11-libs/cairo[X] x11-libs/pango tint2conf? ( x11-libs/gtk+:2 ) x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXinerama >=x11-libs/libXrandr-1.3 x11-libs/libXrender startup-notification? ( x11-libs/startup-notification )
 SLOT=0
 SRC_URI=https://gitlab.com/o9000/tint2/repository/archive.tar.gz?ref=v15.3 -> tint2-15.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f1e70654968e944f2ff742a2e3591bad
diff --git a/metadata/md5-cache/x11-misc/tint2-16.1 b/metadata/md5-cache/x11-misc/tint2-16.1
index c7407c241fc2..03aad6b70b94 100644
--- a/metadata/md5-cache/x11-misc/tint2-16.1
+++ b/metadata/md5-cache/x11-misc/tint2-16.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 svg? ( gnome-base/librsvg:2 ) >=media-libs/imlib2-1.4.2[X,png] x11-libs/cairo[X] x11-libs/pango tint2conf? ( x11-libs/gtk+:2 ) x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXinerama >=x11-libs/libXrandr-1.3 x11-libs/libXrender startup-notification? ( x11-libs/startup-notification )
 SLOT=0
 SRC_URI=https://gitlab.com/o9000/tint2/repository/archive.tar.gz?ref=v16.1 -> tint2-16.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7d051402203648a3e23a323bd2986384
diff --git a/metadata/md5-cache/x11-misc/tint2-16.2 b/metadata/md5-cache/x11-misc/tint2-16.2
index bfe33e73650e..b091b9f186cb 100644
--- a/metadata/md5-cache/x11-misc/tint2-16.2
+++ b/metadata/md5-cache/x11-misc/tint2-16.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 svg? ( gnome-base/librsvg:2 ) >=media-libs/imlib2-1.4.2[X,png] x11-libs/cairo[X] x11-libs/pango tint2conf? ( x11-libs/gtk+:2 ) x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXinerama >=x11-libs/libXrandr-1.3 x11-libs/libXrender startup-notification? ( x11-libs/startup-notification )
 SLOT=0
 SRC_URI=https://gitlab.com/o9000/tint2/repository/archive.tar.gz?ref=v16.2 -> tint2-16.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c87cc75dac135e32465e288db0a056c2
diff --git a/metadata/md5-cache/x11-misc/tint2-16.6 b/metadata/md5-cache/x11-misc/tint2-16.6
index c8cc903d47e3..e2d2d39c2194 100644
--- a/metadata/md5-cache/x11-misc/tint2-16.6
+++ b/metadata/md5-cache/x11-misc/tint2-16.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 svg? ( gnome-base/librsvg:2 ) >=media-libs/imlib2-1.4.2[X,png] x11-libs/cairo[X] x11-libs/pango tint2conf? ( x11-libs/gtk+:2 ) x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXinerama >=x11-libs/libXrandr-1.3 x11-libs/libXrender startup-notification? ( x11-libs/startup-notification )
 SLOT=0
 SRC_URI=https://gitlab.com/o9000/tint2/repository/archive.tar.gz?ref=v16.6 -> tint2-16.6.tar.gz
-_eclasses_=cmake-utils	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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c87cc75dac135e32465e288db0a056c2
diff --git a/metadata/md5-cache/x11-misc/urxvt-font-size-1.3 b/metadata/md5-cache/x11-misc/urxvt-font-size-1.3
index 4b3d07f267ac..8d6486c88d14 100644
--- a/metadata/md5-cache/x11-misc/urxvt-font-size-1.3
+++ b/metadata/md5-cache/x11-misc/urxvt-font-size-1.3
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DESCRIPTION=Perl extension for rxvt-unicode to change the font size on the fly
 EAPI=6
 HOMEPAGE=https://github.com/majutsushi/urxvt-font-size/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=x11-apps/xlsfonts x11-terms/rxvt-unicode[perl]
 SLOT=0
 SRC_URI=https://github.com/majutsushi/urxvt-font-size/archive/v1.3.tar.gz -> urxvt-font-size-1.3.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=93f6efba0c31f12c58c661c915ef4650
+_md5_=b467f32ef1fcae968e09e76e3942d4f3
diff --git a/metadata/md5-cache/x11-misc/virtualgl-2.5.2 b/metadata/md5-cache/x11-misc/virtualgl-2.5.2
index 1fe63bd22bc8..6f570c368bfd 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	89bb9f083a2590d9b447fd0b78a96186
+_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
 _md5_=5d9e937a1706ff61d95bbcd4f9921509
diff --git a/metadata/md5-cache/x11-misc/xcalib-0.9.0_p20161210 b/metadata/md5-cache/x11-misc/xcalib-0.9.0_p20161210
index 0bbfa6b914be..22e500136452 100644
--- a/metadata/md5-cache/x11-misc/xcalib-0.9.0_p20161210
+++ b/metadata/md5-cache/x11-misc/xcalib-0.9.0_p20161210
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXrandr x11-libs/libXxf86vm
 SLOT=0
 SRC_URI=https://github.com/OpenICC/xcalib/archive/95c932996cfc9f792dea4a6c49fec3c1ed2267ac.tar.gz -> xcalib-0.9.0_p20161210.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=dae251b81863862efa124e8a945224d9
diff --git a/metadata/md5-cache/x11-misc/xdg-user-dirs-0.16 b/metadata/md5-cache/x11-misc/xdg-user-dirs-0.16
deleted file mode 100644
index 770b1a78dfbb..000000000000
--- a/metadata/md5-cache/x11-misc/xdg-user-dirs-0.16
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=app-text/docbook-xml-dtd:4.3 dev-libs/libxslt 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 tool to help manage 'well known' user directories
-EAPI=6
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/xdg-user-dirs
-IUSE=gtk
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2
-PDEPEND=gtk? ( x11-misc/xdg-user-dirs-gtk )
-SLOT=0
-SRC_URI=https://user-dirs.freedesktop.org/releases/xdg-user-dirs-0.16.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=de2dae242ea8073d94a212c938a30fe3
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 144fe590e5ab..bb89157b5c99 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_=cf0d01bc9064399e1912f1f94ef234d7
+_md5_=6afe50aa1c2a913882f9448817818a55
diff --git a/metadata/md5-cache/x11-misc/xembedsniproxy-5.12.0 b/metadata/md5-cache/x11-misc/xembedsniproxy-5.12.0
index d30e6c7ef97d..b8c2d0269fdd 100644
--- a/metadata/md5-cache/x11-misc/xembedsniproxy-5.12.0
+++ b/metadata/md5-cache/x11-misc/xembedsniproxy-5.12.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-plasma/plasma-workspace:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtdbus:5 dev-qt/qtx11extras:5 kde-frameworks/kwindowsystem:5 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image
 SLOT=0
 SRC_URI=mirror://kde/stable/plasma/5.12.0/plasma-workspace-5.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8f14c9c4840c3183a0e8997c2575a082
diff --git a/metadata/md5-cache/x11-misc/xfe-1.43.1 b/metadata/md5-cache/x11-misc/xfe-1.43.1
index fd24ea5fb409..737eb61ef19c 100644
--- a/metadata/md5-cache/x11-misc/xfe-1.43.1
+++ b/metadata/md5-cache/x11-misc/xfe-1.43.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libpng:0 x11-libs/fox:1.6[png,truetype] x11-libs/libX11 x11-libs/libXft startup-notification? ( x11-libs/startup-notification )
 SLOT=0
 SRC_URI=mirror://sourceforge/xfe/xfe/1.43.1/xfe-1.43.1.tar.gz
-_eclasses_=l10n	97f2753e3f1f3753d53d856c7c0bbb0b	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=l10n	97f2753e3f1f3753d53d856c7c0bbb0b	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=aa3de6861e47afa57686a44aa6ef31a1
diff --git a/metadata/md5-cache/x11-misc/xflux-gui-1.1.10 b/metadata/md5-cache/x11-misc/xflux-gui-1.1.10
index 41a814de6751..c443b77d2132 100644
--- a/metadata/md5-cache/x11-misc/xflux-gui-1.1.10
+++ b/metadata/md5-cache/x11-misc/xflux-gui-1.1.10
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libappindicator:2[python,python_targets_python2_7(-)?,-python_s
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/xflux-gui/fluxgui/archive/v1.1.10.tar.gz -> xflux-gui-1.1.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=97c9b2045b43be16aa271dd52e03cbe7
diff --git a/metadata/md5-cache/x11-misc/xflux-gui-1.1.10_p20180910 b/metadata/md5-cache/x11-misc/xflux-gui-1.1.10_p20180910
index 7a04c061f10b..8dcaabc992c2 100644
--- a/metadata/md5-cache/x11-misc/xflux-gui-1.1.10_p20180910
+++ b/metadata/md5-cache/x11-misc/xflux-gui-1.1.10_p20180910
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libappindicator:2[python,python_targets_python2_7(-)?,-python_s
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/xflux-gui/fluxgui/archive/a3b55da976053fc978b29d191db52dfb8da2f8ee.tar.gz -> fluxgui-a3b55da976053fc978b29d191db52dfb8da2f8ee.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=29c9740def40e2918700ec8c320f1f1f
diff --git a/metadata/md5-cache/x11-misc/xmonad-log-applet-2.0.0-r301 b/metadata/md5-cache/x11-misc/xmonad-log-applet-2.0.0-r301
index 7f27ea9ca1ab..d3d2459708f7 100644
--- a/metadata/md5-cache/x11-misc/xmonad-log-applet-2.0.0-r301
+++ b/metadata/md5-cache/x11-misc/xmonad-log-applet-2.0.0-r301
@@ -9,5 +9,5 @@ RDEPEND=sys-apps/dbus xfce-base/xfce4-panel dev-libs/dbus-glib dev-libs/glib:2 d
 RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://github/alexkay/xmonad-log-applet/xmonad-log-applet-2.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=20399e29c56152e8b55d7fa38127a0c7
diff --git a/metadata/md5-cache/x11-misc/xosview-1.20-r1 b/metadata/md5-cache/x11-misc/xosview-1.20-r1
index 11f329921109..305836f70391 100644
--- a/metadata/md5-cache/x11-misc/xosview-1.20-r1
+++ b/metadata/md5-cache/x11-misc/xosview-1.20-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 BSD
 RDEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXt media-fonts/font-misc-misc
 SLOT=0
 SRC_URI=http://www.pogo.org.uk/~mark/xosview/releases/xosview-1.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=be47f55a728786255eae455ade534f7e
diff --git a/metadata/md5-cache/x11-misc/xosview-1.21 b/metadata/md5-cache/x11-misc/xosview-1.21
new file mode 100644
index 000000000000..952bbce1152e
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/xosview-1.21
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare
+DEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXt x11-base/xorg-proto
+DESCRIPTION=X11 operating system viewer
+EAPI=7
+HOMEPAGE=http://www.pogo.org.uk/~mark/xosview/
+IUSE=suid
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2 BSD
+RDEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXt media-fonts/font-misc-misc
+SLOT=0
+SRC_URI=http://www.pogo.org.uk/~mark/xosview/releases/xosview-1.21.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=6846000423123084cf51f26dedb65bd8
diff --git a/metadata/md5-cache/x11-misc/xss-lock-0.3.0_p20140302-r1 b/metadata/md5-cache/x11-misc/xss-lock-0.3.0_p20140302-r1
index 6c892ddc494a..f51f25bf913b 100644
--- a/metadata/md5-cache/x11-misc/xss-lock-0.3.0_p20140302-r1
+++ b/metadata/md5-cache/x11-misc/xss-lock-0.3.0_p20140302-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/glib:2 x11-libs/libxcb x11-libs/xcb-util
 SLOT=0
 SRC_URI=https://bitbucket.org/raymonad/xss-lock/get/1e158fb20108058dbd62bd51d8e8c003c0a48717.tar.bz2 -> xss-lock-0.3.0_p20140302.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ad891022af83ada62fc3ada924d90d64
diff --git a/metadata/md5-cache/x11-misc/xwallpaper-0.3.0 b/metadata/md5-cache/x11-misc/xwallpaper-0.3.0
index 3590a95935a2..efd49c19f155 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_=5694ea0971daa9a2d09e0e428e9ec2fd
+_md5_=c2c13ca878092c91f54783ab6791183f
diff --git a/metadata/md5-cache/x11-misc/zim-0.65 b/metadata/md5-cache/x11-misc/zim-0.65
index 1e3d815893cb..3d392e0f9d75 100644
--- a/metadata/md5-cache/x11-misc/zim-0.65
+++ b/metadata/md5-cache/x11-misc/zim-0.65
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jyth
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://zim-wiki.org/downloads/zim-0.65.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7cfbd7f3f01874daad10a52169e1535e
diff --git a/metadata/md5-cache/x11-misc/zim-0.66 b/metadata/md5-cache/x11-misc/zim-0.66
index d08739f544df..bd7396003c41 100644
--- a/metadata/md5-cache/x11-misc/zim-0.66
+++ b/metadata/md5-cache/x11-misc/zim-0.66
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jyth
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://zim-wiki.org/downloads/zim-0.66.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d195df3e26ba2f1e0d0c8f11534dcf57
diff --git a/metadata/md5-cache/x11-misc/zim-0.67 b/metadata/md5-cache/x11-misc/zim-0.67
index 94bc162e1aff..f0fb62b142cc 100644
--- a/metadata/md5-cache/x11-misc/zim-0.67
+++ b/metadata/md5-cache/x11-misc/zim-0.67
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jyth
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://zim-wiki.org/downloads/zim-0.67.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a4d0c647f38e6f78d0dad25e4e298e92
diff --git a/metadata/md5-cache/x11-misc/zim-0.68 b/metadata/md5-cache/x11-misc/zim-0.68
index b05858d70b58..29c1b2698cac 100644
--- a/metadata/md5-cache/x11-misc/zim-0.68
+++ b/metadata/md5-cache/x11-misc/zim-0.68
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jyth
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://zim-wiki.org/downloads/zim-0.68.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f7e98b697080c95feddcc76aceb9365f
diff --git a/metadata/md5-cache/x11-misc/zim-0.68_rc1 b/metadata/md5-cache/x11-misc/zim-0.68_rc1
index d8e713cccbec..99f6e80fe4db 100644
--- a/metadata/md5-cache/x11-misc/zim-0.68_rc1
+++ b/metadata/md5-cache/x11-misc/zim-0.68_rc1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jyth
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://zim-wiki.org/downloads/zim-0.68-rc1.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2adfc9efcdef81494f481de38dffb5f2
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index edf5add4cda9..31a249eab974 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/wmSMPmon-3.1-r1 b/metadata/md5-cache/x11-plugins/wmSMPmon-3.1-r1
deleted file mode 100644
index f54374a2ef15..000000000000
--- a/metadata/md5-cache/x11-plugins/wmSMPmon-3.1-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=SMP system monitor dockapp
-EAPI=0
-HOMEPAGE=https://www.dockapps.net/wmsmpmon
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
-SLOT=0
-SRC_URI=https://www.dockapps.net/download/wmSMPmon-3.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_=d0ff6d9dfe5e6d0947d7c7f24e8bdb6b
diff --git a/metadata/md5-cache/x11-plugins/wmSMPmon-3.1-r2 b/metadata/md5-cache/x11-plugins/wmSMPmon-3.1-r2
index 72093707aff7..48b79f137ee5 100644
--- a/metadata/md5-cache/x11-plugins/wmSMPmon-3.1-r2
+++ b/metadata/md5-cache/x11-plugins/wmSMPmon-3.1-r2
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-base/xorg-proto
 DESCRIPTION=SMP system monitor dockapp
 EAPI=7
 HOMEPAGE=https://www.dockapps.net/wmsmpmon
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 SLOT=0
 SRC_URI=https://www.dockapps.net/download/wmSMPmon-3.1.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=55beb1b2e56f37fe285781f5bd0ecc0e
+_md5_=5747916619d3f29c4da00514cfe5bae3
diff --git a/metadata/md5-cache/x11-plugins/wmSpaceWeather-1.04_p19 b/metadata/md5-cache/x11-plugins/wmSpaceWeather-1.04_p19
deleted file mode 100644
index dc7d3c3538b9..000000000000
--- a/metadata/md5-cache/x11-plugins/wmSpaceWeather-1.04_p19
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-base/xorg-proto
-DESCRIPTION=dockapp showing weather at geosynchronous orbit
-EAPI=0
-HOMEPAGE=https://www.dockapps.net/wmspaceweather
-KEYWORDS=amd64 hppa ~mips ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm net-misc/curl dev-lang/perl
-SLOT=0
-SRC_URI=mirror://debian/pool/main/w/wmspaceweather/wmspaceweather_1.04.orig.tar.gz mirror://debian/pool/main/w/wmspaceweather/wmspaceweather_1.04-19.diff.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=23b900d4393f42363f4190a0cf952258
diff --git a/metadata/md5-cache/x11-plugins/wmSpaceWeather-1.04_p19-r1 b/metadata/md5-cache/x11-plugins/wmSpaceWeather-1.04_p19-r1
index 36175470f5e7..5358456b386b 100644
--- a/metadata/md5-cache/x11-plugins/wmSpaceWeather-1.04_p19-r1
+++ b/metadata/md5-cache/x11-plugins/wmSpaceWeather-1.04_p19-r1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-base/xorg-proto
 DESCRIPTION=dockapp showing weather at geosynchronous orbit
 EAPI=6
 HOMEPAGE=https://www.dockapps.net/wmspaceweather
-KEYWORDS=~amd64 ~hppa ~mips ppc ~sparc x86
+KEYWORDS=amd64 ~hppa ~mips ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm net-misc/curl dev-lang/perl
 SLOT=0
 SRC_URI=mirror://debian/pool/main/w/wmspaceweather/wmspaceweather_1.04.orig.tar.gz mirror://debian/pool/main/w/wmspaceweather/wmspaceweather_1.04-19.diff.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a6c00d7da33ff74fb453fb97257b5bf0
+_md5_=686f7ed6087c38dbb798940f62b217cb
diff --git a/metadata/md5-cache/x11-plugins/wmSun-1.05-r1 b/metadata/md5-cache/x11-plugins/wmSun-1.05-r1
index a62093e04522..901a4feefb2a 100644
--- a/metadata/md5-cache/x11-plugins/wmSun-1.05-r1
+++ b/metadata/md5-cache/x11-plugins/wmSun-1.05-r1
@@ -3,10 +3,10 @@ DEPEND=>=x11-libs/libdockapp-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/lib
 DESCRIPTION=dockapp which displays the rise/set time of the sun
 EAPI=7
 HOMEPAGE=https://www.dockapps.net/wmsun
-KEYWORDS=~amd64 ~mips ~ppc ~sparc x86
+KEYWORDS=amd64 ~mips ~ppc ~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/wmsun-1.05.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=f115c64fba8cfa997fbef1cd7596a05d
+_md5_=08ae12d96f80085bb7720669802ac9df
diff --git a/metadata/md5-cache/x11-plugins/wmcpuwatch-0.2-r1 b/metadata/md5-cache/x11-plugins/wmcpuwatch-0.2-r1
index eaf35d7dde86..d78b463b2376 100644
--- a/metadata/md5-cache/x11-plugins/wmcpuwatch-0.2-r1
+++ b/metadata/md5-cache/x11-plugins/wmcpuwatch-0.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=x11-libs/libdockapp-0.7:=
 SLOT=0
 SRC_URI=https://bitbucket.org/StarFire/wmcpuwatch/downloads/wmcpuwatch-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f1c2a11b2866e28d63456766c688b6e3
diff --git a/metadata/md5-cache/x11-plugins/wmsystray-0.1.1 b/metadata/md5-cache/x11-plugins/wmsystray-0.1.1
deleted file mode 100644
index 0d8febd84a75..000000000000
--- a/metadata/md5-cache/x11-plugins/wmsystray-0.1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=x11-libs/libX11 x11-libs/libXpm
-DESCRIPTION=Window Maker dock app that provides a system tray for GNOME/KDE applications
-EAPI=0
-HOMEPAGE=https://github.com/bbidulock/wmsystray
-KEYWORDS=amd64 ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXpm
-SLOT=0
-SRC_URI=https://github.com/bbidulock/wmsystray/releases/download/0.1.1/wmsystray-0.1.1.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_=f63c20103a879b8a4078faf71b7ff2da
diff --git a/metadata/md5-cache/x11-plugins/wmsystray-0.1.1-r1 b/metadata/md5-cache/x11-plugins/wmsystray-0.1.1-r1
index c5759b0ffa80..3854c06ed888 100644
--- a/metadata/md5-cache/x11-plugins/wmsystray-0.1.1-r1
+++ b/metadata/md5-cache/x11-plugins/wmsystray-0.1.1-r1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXpm
 DESCRIPTION=Window Maker dock app that provides a system tray for GNOME/KDE applications
 EAPI=7
 HOMEPAGE=https://github.com/bbidulock/wmsystray
-KEYWORDS=~amd64 ppc ~sparc x86
+KEYWORDS=amd64 ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXpm
 SLOT=0
 SRC_URI=https://github.com/bbidulock/wmsystray/releases/download/0.1.1/wmsystray-0.1.1.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d
-_md5_=6f27ace9167743e90e7674b249f37a62
+_md5_=4f40482851c5e2d24975253e42d59e3f
diff --git a/metadata/md5-cache/x11-plugins/wmudmount-2.2 b/metadata/md5-cache/x11-plugins/wmudmount-2.2
index dc3e78479533..88db56857f21 100644
--- a/metadata/md5-cache/x11-plugins/wmudmount-2.2
+++ b/metadata/md5-cache/x11-plugins/wmudmount-2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-fs/udisks:2 >=x11-libs/gtk+-3.8.0:3 gnome-keyring? ( gnome-base/libgnome-keyring ) libnotify? ( >=x11-libs/libnotify-0.7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/wmudmount/wmudmount-2.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cbb005ccea0a661aa578a15d0214f059
diff --git a/metadata/md5-cache/x11-plugins/wmudmount-2.2-r2 b/metadata/md5-cache/x11-plugins/wmudmount-2.2-r2
index 0ad6e740cf40..df2cbb82f5e3 100644
--- a/metadata/md5-cache/x11-plugins/wmudmount-2.2-r2
+++ b/metadata/md5-cache/x11-plugins/wmudmount-2.2-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A filesystem mounter that uses udisks to handle notification and mou
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/wmudmount/
 IUSE=gnome-keyring libnotify
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=sys-fs/udisks:2 >=x11-libs/gtk+-3.8.0:3 gnome-keyring? ( gnome-base/libgnome-keyring ) libnotify? ( >=x11-libs/libnotify-0.7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/wmudmount/wmudmount-2.2.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	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=6eac747afdf1adc0b8e3e10314663a72
+_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_=dea16f93504fe6bca47c5e001290e41e
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 3af938fc9c34..78080cddb1ae 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/cool-retro-term-1.0.1 b/metadata/md5-cache/x11-terms/cool-retro-term-1.0.1
index 60aa6e8dcea2..0493a01753f5 100644
--- a/metadata/md5-cache/x11-terms/cool-retro-term-1.0.1
+++ b/metadata/md5-cache/x11-terms/cool-retro-term-1.0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2 GPL-3
 RDEPEND=dev-qt/qtdeclarative:5[localstorage] dev-qt/qtgraphicaleffects:5 dev-qt/qtquickcontrols:5[widgets] dev-qt/qtsql:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://github.com/Swordfish90/cool-retro-term/archive/1.0.1.tar.gz -> cool-retro-term-1.0.1.tar.gz https://github.com/Swordfish90/qmltermwidget/archive/v0.1.0.tar.gz -> qmltermwidget-0.1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=15939a3e16593fb1ef637657a072383e
diff --git a/metadata/md5-cache/x11-terms/gnome-terminal-3.24.2 b/metadata/md5-cache/x11-terms/gnome-terminal-3.24.2
index 47abef17ecf8..4f123e190b07 100644
--- a/metadata/md5-cache/x11-terms/gnome-terminal-3.24.2
+++ b/metadata/md5-cache/x11-terms/gnome-terminal-3.24.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.42:2 >=x11-libs/gtk+-3.20:3 >=x11-libs/vte-0.48.3:2.91[!vanilla?] >=dev-libs/libpcre2-10 >=gnome-base/dconf-0.14 >=gnome-base/gsettings-desktop-schemas-0.1.0 sys-apps/util-linux gnome-shell? ( gnome-base/gnome-shell ) nautilus? ( >=gnome-base/nautilus-3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-terminal/3.24/gnome-terminal-3.24.2.tar.xz !vanilla? ( https://dev.gentoo.org/~leio/distfiles/gnome-terminal-notify-open-title-transparency.patch.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bde4f326178f08fe70b0f8f92bc4528e
diff --git a/metadata/md5-cache/x11-terms/gnome-terminal-3.28.2 b/metadata/md5-cache/x11-terms/gnome-terminal-3.28.2
index aa415a0ab612..6bff5e0aad7b 100644
--- a/metadata/md5-cache/x11-terms/gnome-terminal-3.28.2
+++ b/metadata/md5-cache/x11-terms/gnome-terminal-3.28.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.42:2 >=x11-libs/gtk+-3.20:3 >=x11-libs/vte-0.52.2:2.91[!vanilla?] >=dev-libs/libpcre2-10 >=gnome-base/dconf-0.14 >=gnome-base/gsettings-desktop-schemas-0.1.0 sys-apps/util-linux gnome-shell? ( gnome-base/gnome-shell ) nautilus? ( >=gnome-base/nautilus-3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-terminal/3.28/gnome-terminal-3.28.2.tar.xz !vanilla? ( https://dev.gentoo.org/~leio/distfiles/gnome-terminal-3.28.1-notify-open-title-transparency.patch.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f3ae86f4daf18843fb2daf072b1c85c6
diff --git a/metadata/md5-cache/x11-terms/gnome-terminal-3.30.1 b/metadata/md5-cache/x11-terms/gnome-terminal-3.30.1
new file mode 100644
index 000000000000..0fc9039ebdfc
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/gnome-terminal-3.30.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.42:2 >=x11-libs/gtk+-3.20:3 >=x11-libs/vte-0.54.1:2.91[!vanilla?] >=dev-libs/libpcre2-10 >=gnome-base/dconf-0.14 >=gnome-base/gsettings-desktop-schemas-0.1.0 sys-apps/util-linux gnome-shell? ( gnome-base/gnome-shell ) nautilus? ( >=gnome-base/nautilus-3 ) dev-libs/libxml2:2 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/intltool-0.50 dev-util/itstool 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
+DESCRIPTION=The Gnome Terminal
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Terminal/
+IUSE=debug +gnome-shell +nautilus vanilla
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/glib-2.42:2 >=x11-libs/gtk+-3.20:3 >=x11-libs/vte-0.54.1:2.91[!vanilla?] >=dev-libs/libpcre2-10 >=gnome-base/dconf-0.14 >=gnome-base/gsettings-desktop-schemas-0.1.0 sys-apps/util-linux gnome-shell? ( gnome-base/gnome-shell ) nautilus? ( >=gnome-base/nautilus-3 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-terminal/3.30/gnome-terminal-3.30.1.tar.xz !vanilla? ( https://dev.gentoo.org/~leio/distfiles/gnome-terminal-3.30.1-notify-open-title-transparency.patch.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=700a52941a4b5cab473dcdd6df611cee
diff --git a/metadata/md5-cache/x11-terms/guake-0.8.13 b/metadata/md5-cache/x11-terms/guake-0.8.13
index 0e3d558653ca..456bd339cf63 100644
--- a/metadata/md5-cache/x11-terms/guake-0.8.13
+++ b/metadata/md5-cache/x11-terms/guake-0.8.13
@@ -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/guake/guake/archive/0.8.13.tar.gz -> guake-0.8.13.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=256c116e4efe8024a4ab39d5a7466b24
diff --git a/metadata/md5-cache/x11-terms/guake-0.8.8 b/metadata/md5-cache/x11-terms/guake-0.8.8
index 0276a8018041..c68eeb25ea15 100644
--- a/metadata/md5-cache/x11-terms/guake-0.8.8
+++ b/metadata/md5-cache/x11-terms/guake-0.8.8
@@ -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/guake/guake/archive/0.8.8.tar.gz -> guake-0.8.8.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	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b6f6ca5703a9adc6f2e7bb56b859eb02
diff --git a/metadata/md5-cache/x11-terms/guake-3.3.0 b/metadata/md5-cache/x11-terms/guake-3.3.0
index 142896ef0f55..3027b06946b2 100644
--- a/metadata/md5-cache/x11-terms/guake-3.3.0
+++ b/metadata/md5-cache/x11-terms/guake-3.3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/keybinder:3 dev-python/dbus-python[python_targets_python3_5(-)?
 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.3.0.tar.gz -> guake-3.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f77ac4820c5bc990d836e43a28d98d52
diff --git a/metadata/md5-cache/x11-terms/guake-3.3.2 b/metadata/md5-cache/x11-terms/guake-3.3.2
index 086fba2a036f..a2c57ba0e6a9 100644
--- a/metadata/md5-cache/x11-terms/guake-3.3.2
+++ b/metadata/md5-cache/x11-terms/guake-3.3.2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/keybinder:3 dev-python/dbus-python[python_targets_python3_5(-)?
 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.3.2.tar.gz -> guake-3.3.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7e4bd5356860aaebe94c32bb971ab688
diff --git a/metadata/md5-cache/x11-terms/guake-3.4.0-r1 b/metadata/md5-cache/x11-terms/guake-3.4.0-r1
new file mode 100644
index 000000000000..937fadb28926
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/guake-3.4.0-r1
@@ -0,0 +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
+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(+)?]
+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
diff --git a/metadata/md5-cache/x11-terms/guake-9999 b/metadata/md5-cache/x11-terms/guake-9999
index 46aee744dac0..8c2473a73c19 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/keybinder:3 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 x11-libs/vte:2.91 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[python_targets_python3_5(-)?,python_targets_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
 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/keybinder:3 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 x11-libs/vte:2.91 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[python_targets_python3_5(-)?,python_targets_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(+)?]
 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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=2f4cf846580c688c173a67a674205338
+_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
diff --git a/metadata/md5-cache/x11-terms/kitty-0.11.1 b/metadata/md5-cache/x11-terms/kitty-0.11.1
deleted file mode 100644
index 6184716a882a..000000000000
--- a/metadata/md5-cache/x11-terms/kitty-0.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=media-libs/harfbuzz-1.5.0:= sys-libs/zlib media-libs/libpng:0= media-libs/freetype:2 media-libs/fontconfig x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 ) imagemagick? ( virtual/imagemagick-tools ) virtual/pkgconfig >=dev-python/sphinx-1.7[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=sys-apps/sed-4
-DESCRIPTION=A modern, hackable, featureful, OpenGL-based terminal emulator
-EAPI=6
-HOMEPAGE=https://github.com/kovidgoyal/kitty
-IUSE=debug imagemagick wayland python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=media-libs/harfbuzz-1.5.0:= sys-libs/zlib media-libs/libpng:0= media-libs/freetype:2 media-libs/fontconfig x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 ) imagemagick? ( virtual/imagemagick-tools )
-REQUIRED_USE=python_targets_python3_6
-SLOT=0
-SRC_URI=https://github.com/kovidgoyal/kitty/archive/v0.11.1.tar.gz -> kitty-0.11.1.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=694da39c35057597b79cc2cf9639ce24
diff --git a/metadata/md5-cache/x11-terms/kitty-0.11.2 b/metadata/md5-cache/x11-terms/kitty-0.11.2
deleted file mode 100644
index 077b46eb4d97..000000000000
--- a/metadata/md5-cache/x11-terms/kitty-0.11.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=media-libs/harfbuzz-1.5.0:= sys-libs/zlib media-libs/libpng:0= media-libs/freetype:2 media-libs/fontconfig x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 ) imagemagick? ( virtual/imagemagick-tools ) virtual/pkgconfig >=dev-python/sphinx-1.7[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=sys-apps/sed-4
-DESCRIPTION=A modern, hackable, featureful, OpenGL-based terminal emulator
-EAPI=6
-HOMEPAGE=https://github.com/kovidgoyal/kitty
-IUSE=debug imagemagick wayland python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=media-libs/harfbuzz-1.5.0:= sys-libs/zlib media-libs/libpng:0= media-libs/freetype:2 media-libs/fontconfig x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 ) imagemagick? ( virtual/imagemagick-tools )
-REQUIRED_USE=python_targets_python3_6
-SLOT=0
-SRC_URI=https://github.com/kovidgoyal/kitty/archive/v0.11.2.tar.gz -> kitty-0.11.2.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=694da39c35057597b79cc2cf9639ce24
diff --git a/metadata/md5-cache/x11-terms/kitty-0.12.1 b/metadata/md5-cache/x11-terms/kitty-0.12.1
index 7edf930482f2..91847511336d 100644
--- a/metadata/md5-cache/x11-terms/kitty-0.12.1
+++ b/metadata/md5-cache/x11-terms/kitty-0.12.1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 ) 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/kovidgoyal/kitty/archive/v0.12.1.tar.gz -> kitty-0.12.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1ffe76604fc1428c79dedfaa0fd7e1ea
diff --git a/metadata/md5-cache/x11-terms/kitty-0.12.3 b/metadata/md5-cache/x11-terms/kitty-0.12.3
new file mode 100644
index 000000000000..ec33e7f6caf7
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/kitty-0.12.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup test
+DEPEND=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_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(+)?] >=media-libs/harfbuzz-1.5.0:= sys-apps/dbus sys-libs/zlib media-libs/libpng:0= media-libs/freetype:2 media-libs/fontconfig x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] x11-libs/libxcb[xkb] wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 ) imagemagick? ( virtual/imagemagick-tools ) sys-libs/ncurses virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=A modern, hackable, featureful, OpenGL-based terminal emulator
+EAPI=6
+HOMEPAGE=https://github.com/kovidgoyal/kitty
+IUSE=debug doc imagemagick wayland python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=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_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(+)?] >=media-libs/harfbuzz-1.5.0:= sys-apps/dbus sys-libs/zlib media-libs/libpng:0= media-libs/freetype:2 media-libs/fontconfig x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] x11-libs/libxcb[xkb] wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 ) imagemagick? ( virtual/imagemagick-tools )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 ) 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/kovidgoyal/kitty/releases/download/v0.12.3/kitty-0.12.3.tar.xz
+_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_=6629ae3f72b8b34e12874e35644febee
diff --git a/metadata/md5-cache/x11-terms/kitty-9999 b/metadata/md5-cache/x11-terms/kitty-9999
index b2bd7cef996b..bc46d53dccb6 100644
--- a/metadata/md5-cache/x11-terms/kitty-9999
+++ b/metadata/md5-cache/x11-terms/kitty-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install postinst postrm prepare setup test unpack
-DEPEND=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_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(+)?] >=media-libs/harfbuzz-1.5.0:= sys-libs/zlib media-libs/libpng:0= media-libs/freetype:2 media-libs/fontconfig x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 ) imagemagick? ( virtual/imagemagick-tools ) virtual/pkgconfig >=dev-python/sphinx-1.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_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=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_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(+)?] >=media-libs/harfbuzz-1.5.0:= sys-apps/dbus sys-libs/zlib media-libs/libpng:0= media-libs/freetype:2 media-libs/fontconfig x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] x11-libs/libxcb[xkb] wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 ) imagemagick? ( virtual/imagemagick-tools ) sys-libs/ncurses virtual/pkgconfig >=dev-python/sphinx-1.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_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=A modern, hackable, featureful, OpenGL-based terminal emulator
 EAPI=6
 HOMEPAGE=https://github.com/kovidgoyal/kitty
-IUSE=debug imagemagick wayland python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=debug doc imagemagick wayland python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
 LICENSE=GPL-3
-RDEPEND=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_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(+)?] >=media-libs/harfbuzz-1.5.0:= sys-libs/zlib media-libs/libpng:0= media-libs/freetype:2 media-libs/fontconfig x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 ) imagemagick? ( virtual/imagemagick-tools )
+RDEPEND=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_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(+)?] >=media-libs/harfbuzz-1.5.0:= sys-apps/dbus sys-libs/zlib media-libs/libpng:0= media-libs/freetype:2 media-libs/fontconfig x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] x11-libs/libxcb[xkb] wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 ) imagemagick? ( virtual/imagemagick-tools )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 ) 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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=1ffe76604fc1428c79dedfaa0fd7e1ea
+_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_=6629ae3f72b8b34e12874e35644febee
diff --git a/metadata/md5-cache/x11-terms/mate-terminal-1.12.1 b/metadata/md5-cache/x11-terms/mate-terminal-1.12.1
deleted file mode 100644
index 583694385ff8..000000000000
--- a/metadata/md5-cache/x11-terms/mate-terminal-1.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-text/rarian:0 dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=mate-base/mate-desktop-1.6[gtk3(-)=] x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/pango:0 !gtk3? ( >=x11-libs/gtk+-2.24.0:2 >=x11-libs/vte-0.28:0 ) gtk3? ( >=x11-libs/gtk+-3.0:3 >=x11-libs/vte-0.38:2.91 ) >=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.12
-DESCRIPTION=The MATE Terminal
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=gtk3
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-3
-RDEPEND=app-text/rarian:0 dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=mate-base/mate-desktop-1.6[gtk3(-)=] x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/pango:0 !gtk3? ( >=x11-libs/gtk+-2.24.0:2 >=x11-libs/vte-0.28:0 ) gtk3? ( >=x11-libs/gtk+-3.0:3 >=x11-libs/vte-0.38:2.91 )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/mate-terminal-1.12.1.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=31045b73f69bcf1d5537673e41b811e5
diff --git a/metadata/md5-cache/x11-terms/mate-terminal-1.12.1-r1 b/metadata/md5-cache/x11-terms/mate-terminal-1.12.1-r1
deleted file mode 100644
index a1c7dd154e13..000000000000
--- a/metadata/md5-cache/x11-terms/mate-terminal-1.12.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-text/rarian:0 dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=mate-base/mate-desktop-1.6[gtk3(-)=] x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/pango:0 !gtk3? ( >=x11-libs/gtk+-2.24.0:2 >=x11-libs/vte-0.28:0 ) gtk3? ( >=x11-libs/gtk+-3.0:3[X] >=x11-libs/vte-0.38:2.91 ) >=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.12
-DESCRIPTION=The MATE Terminal
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=gtk3
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=app-text/rarian:0 dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=mate-base/mate-desktop-1.6[gtk3(-)=] x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/pango:0 !gtk3? ( >=x11-libs/gtk+-2.24.0:2 >=x11-libs/vte-0.28:0 ) gtk3? ( >=x11-libs/gtk+-3.0:3[X] >=x11-libs/vte-0.38:2.91 )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/mate-terminal-1.12.1.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=073cc6757f587cfe37ecfa1bf6f021d1
diff --git a/metadata/md5-cache/x11-terms/mate-terminal-1.14.1-r1 b/metadata/md5-cache/x11-terms/mate-terminal-1.14.1-r1
deleted file mode 100644
index 4e27a8878fa0..000000000000
--- a/metadata/md5-cache/x11-terms/mate-terminal-1.14.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=mate-base/mate-desktop-1.6[gtk3(-)=] x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/pango:0 !gtk3? ( >=x11-libs/gtk+-2.24.0:2 >=x11-libs/vte-0.28:0 ) gtk3? ( >=x11-libs/gtk+-3.0:3[X] >=x11-libs/vte-0.38:2.91 ) 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.14
-DESCRIPTION=The MATE Terminal
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=gtk3
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=mate-base/mate-desktop-1.6[gtk3(-)=] x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/pango:0 !gtk3? ( >=x11-libs/gtk+-2.24.0:2 >=x11-libs/vte-0.28:0 ) gtk3? ( >=x11-libs/gtk+-3.0:3[X] >=x11-libs/vte-0.38:2.91 )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.14/mate-terminal-1.14.1.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=b535c9ccd43f8c03c5002761abf590e6
diff --git a/metadata/md5-cache/x11-terms/mate-terminal-1.16.3 b/metadata/md5-cache/x11-terms/mate-terminal-1.16.3
deleted file mode 100644
index 33d4bb2148ba..000000000000
--- a/metadata/md5-cache/x11-terms/mate-terminal-1.16.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=gnome-base/dconf-0.13.4:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/pango:0 >=x11-libs/gtk+-3.14:3[X] >=x11-libs/vte-0.38:2.91 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.16
-DESCRIPTION=The MATE Terminal
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=gnome-base/dconf-0.13.4:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/pango:0 >=x11-libs/gtk+-3.14:3[X] >=x11-libs/vte-0.38:2.91 >=mate-base/mate-desktop-1.6
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-terminal-1.16.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=a9047243133c61db09cc2cefff71a36d
diff --git a/metadata/md5-cache/x11-terms/mate-terminal-1.18.2 b/metadata/md5-cache/x11-terms/mate-terminal-1.18.2
index a8aaac17ee45..edde0819af39 100644
--- a/metadata/md5-cache/x11-terms/mate-terminal-1.18.2
+++ b/metadata/md5-cache/x11-terms/mate-terminal-1.18.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=gnome-base/dconf-0.13.4:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/pango:0 >=x11-libs/gtk+-3.14:3[X] >=x11-libs/vte-0.38:2.91 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/atk:0 >=dev-libs/glib-2.36:2 >=gnome-base/dconf-0.13.4:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/pango:0 >=x11-libs/gtk+-3.14:3[X] >=x11-libs/vte-0.38:2.91 app-text/rarian:0 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 dev-util/glib-utils >=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=The MATE Terminal
 EAPI=6
 HOMEPAGE=https://mate-desktop.org
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=gnome-base/dconf-0.13.4:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/pango:0 >=x11-libs/gtk+-3.14:3[X] >=x11-libs/vte-0.38:2.91 >=mate-base/mate-desktop-1.6
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-terminal-1.18.2.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=11956ee4e2666d9887c04d7fb7199d7e
+_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_=c5a96e7f5d453b7feeb904fbd081f134
diff --git a/metadata/md5-cache/x11-terms/qterminal-0.7.1 b/metadata/md5-cache/x11-terms/qterminal-0.7.1
index c2deb12483d3..b8f47fa4af59 100644
--- a/metadata/md5-cache/x11-terms/qterminal-0.7.1
+++ b/metadata/md5-cache/x11-terms/qterminal-0.7.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 ~x11-libs/qtermwidget-0.7.1
 SLOT=0
 SRC_URI=https://github.com/lxde/qterminal/releases/download/0.7.1/qterminal-0.7.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3972376bee6a96cb7cc65236fa17f0ee
diff --git a/metadata/md5-cache/x11-terms/qterminal-0.9.0 b/metadata/md5-cache/x11-terms/qterminal-0.9.0
index 55f5315d3b14..276105a101b8 100644
--- a/metadata/md5-cache/x11-terms/qterminal-0.9.0
+++ b/metadata/md5-cache/x11-terms/qterminal-0.9.0
@@ -8,5 +8,5 @@ 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 x11-libs/libX11 =x11-libs/qtermwidget-0.9*:*
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/qterminal/0.9.0/qterminal-0.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	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=3dfefe200a4b73be28c218b7cd08367c
diff --git a/metadata/md5-cache/x11-terms/qterminal-9999 b/metadata/md5-cache/x11-terms/qterminal-9999
index 25bb7841fff1..ed68fb37218b 100644
--- a/metadata/md5-cache/x11-terms/qterminal-9999
+++ b/metadata/md5-cache/x11-terms/qterminal-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/lxde/qterminal
 LICENSE=GPL-2+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 ~x11-libs/qtermwidget-9999
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=06d0028b501969032c5542db68830f12
diff --git a/metadata/md5-cache/x11-terms/roxterm-3.1.5-r1 b/metadata/md5-cache/x11-terms/roxterm-3.1.5-r1
index 1605b9f277a6..72f4882e8f5c 100644
--- a/metadata/md5-cache/x11-terms/roxterm-3.1.5-r1
+++ b/metadata/md5-cache/x11-terms/roxterm-3.1.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-3
 RDEPEND=>=dev-libs/dbus-glib-0.100 dev-libs/glib:2 x11-libs/gtk+:3 x11-libs/libICE x11-libs/libSM x11-libs/vte:2.91 !x11-terms/roxterm:0
 SLOT=1
 SRC_URI=mirror://sourceforge/roxterm/roxterm-3.1.5.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0cd06ad5139da1ef7238c6a4f231854c
diff --git a/metadata/md5-cache/x11-terms/sakura-3.5.0 b/metadata/md5-cache/x11-terms/sakura-3.5.0
index 5787b0316bdf..ebf713b0db2a 100644
--- a/metadata/md5-cache/x11-terms/sakura-3.5.0
+++ b/metadata/md5-cache/x11-terms/sakura-3.5.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.20:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/vte:2.91
 SLOT=0
 SRC_URI=https://launchpad.net/sakura/trunk/3.5.0/+download/sakura-3.5.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=89bca8c87a3c12a148fb8d4df34ad9f8
diff --git a/metadata/md5-cache/x11-terms/sakura-3.6.0 b/metadata/md5-cache/x11-terms/sakura-3.6.0
index 37b49b4b996d..2ebd9906e100 100644
--- a/metadata/md5-cache/x11-terms/sakura-3.6.0
+++ b/metadata/md5-cache/x11-terms/sakura-3.6.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.20:2 x11-libs/gtk+:3[X] x11-libs/libX11 >x11-libs/vte-0.50:2.91
 SLOT=0
 SRC_URI=https://launchpad.net/sakura/trunk/3.6.0/+download/sakura-3.6.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=da6811e7617975e5e97d800e903dd2b8
diff --git a/metadata/md5-cache/x11-terms/terminator-1.91 b/metadata/md5-cache/x11-terms/terminator-1.91
index 2506d149c7b2..c4c7c2baebe1 100644
--- a/metadata/md5-cache/x11-terms/terminator-1.91
+++ b/metadata/md5-cache/x11-terms/terminator-1.91
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/gtk+-3.16:3 >=dev-libs/glib-2.32:2 dev-libs/keybinder:3[intro
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://launchpad.net/terminator/gtk3/1.91/+download/terminator-1.91.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b5b1af3e13f6fa27e3251c203b6dac0b
diff --git a/metadata/md5-cache/x11-terms/terminology-1.2.1-r1 b/metadata/md5-cache/x11-terms/terminology-1.2.1-r1
index 1310ce331c55..ee67cc42c920 100644
--- a/metadata/md5-cache/x11-terms/terminology-1.2.1-r1
+++ b/metadata/md5-cache/x11-terms/terminology-1.2.1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=|| ( dev-libs/efl[egl] dev-libs/efl[opengl] ) || ( dev-libs/efl[X] dev-libs/efl[wayland] ) app-arch/lz4 >=dev-libs/efl-1.20.0[eet,fontconfig]
 SLOT=0
 SRC_URI=https://download.enlightenment.org/rel/apps/terminology/terminology-1.2.1.tar.xz
-_eclasses_=meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0c7676055bc97b70614f48cea3a59dfe
diff --git a/metadata/md5-cache/x11-terms/xterm-331 b/metadata/md5-cache/x11-terms/xterm-331
deleted file mode 100644
index 8cbca3f4f78a..000000000000
--- a/metadata/md5-cache/x11-terms/xterm-331
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install setup
-DEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) >=sys-libs/ncurses-5.7-r7:0= x11-apps/xmessage x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig x11-base/xorg-proto
-DESCRIPTION=Terminal Emulator for X Windows
-EAPI=5
-HOMEPAGE=https://invisible-island.net/xterm/
-IUSE=+openpty toolbar truetype unicode Xaw3d xinerama
-KEYWORDS=~alpha ~amd64 ~arm ~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=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) >=sys-libs/ncurses-5.7-r7:0= x11-apps/xmessage x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama ) media-fonts/font-misc-misc x11-apps/rgb
-SLOT=0
-SRC_URI=ftp://ftp.invisible-island.net/xterm/xterm-331.tgz
-_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_=2c3f2ce46186dff888ae6ac48742979c
diff --git a/metadata/md5-cache/x11-terms/xterm-337 b/metadata/md5-cache/x11-terms/xterm-337
new file mode 100644
index 000000000000..14caec2ef287
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/xterm-337
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig x11-base/xorg-proto
+DEFINED_PHASES=configure install setup
+DEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) media-libs/fontconfig:1.0 >=sys-libs/ncurses-5.7-r7:0= x11-apps/xmessage x11-libs/libICE x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama )
+DESCRIPTION=Terminal Emulator for X Windows
+EAPI=7
+HOMEPAGE=https://invisible-island.net/xterm/
+IUSE=+openpty toolbar truetype unicode Xaw3d xinerama
+KEYWORDS=~alpha ~amd64 ~arm ~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=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) media-libs/fontconfig:1.0 >=sys-libs/ncurses-5.7-r7:0= x11-apps/xmessage x11-libs/libICE x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama ) media-fonts/font-misc-misc x11-apps/rgb
+SLOT=0
+SRC_URI=ftp://ftp.invisible-island.net/xterm/xterm-337.tgz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=146d474c4d38d67f3fe24459d6570783
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index 6f000b047075..1007358cbafa 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/adwaita-icon-theme-3.22.0-r2 b/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.22.0-r2
index 060f268be0e5..57c6b4cdce4a 100644
--- a/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.22.0-r2
+++ b/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.22.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=x11-themes/hicolor-icon-theme-0.10 gnome-base/librsvg:2 !<x11-themes/g
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/adwaita-icon-theme/3.22/adwaita-icon-theme-3.22.0.tar.xz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=71ab6518dd20fb463166eb6de203a03b
diff --git a/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.24.0 b/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.24.0
index 027fd98092a3..3ba81660e2a5 100644
--- a/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.24.0
+++ b/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.24.0
@@ -10,5 +10,5 @@ RDEPEND=>=x11-themes/hicolor-icon-theme-0.10 gnome-base/librsvg:2 !<x11-themes/g
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/adwaita-icon-theme/3.24/adwaita-icon-theme-3.24.0.tar.xz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=2705df6e9b024f308fe96601779f9bb5
diff --git a/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.26.1 b/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.26.1
index e853a38a5474..79c83d9fd04c 100644
--- a/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.26.1
+++ b/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.26.1
@@ -10,5 +10,5 @@ RDEPEND=>=x11-themes/hicolor-icon-theme-0.10 gnome-base/librsvg:2 !<x11-themes/g
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/adwaita-icon-theme/3.26/adwaita-icon-theme-3.26.1.tar.xz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=27a0a890d0cec3081e138f54d7658c34
diff --git a/metadata/md5-cache/x11-themes/adwaita-qt-1.0-r1 b/metadata/md5-cache/x11-themes/adwaita-qt-1.0-r1
index 51e2b32051fa..02ccd0a29793 100644
--- a/metadata/md5-cache/x11-themes/adwaita-qt-1.0-r1
+++ b/metadata/md5-cache/x11-themes/adwaita-qt-1.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=gnome? ( x11-themes/QGnomePlatform ) dev-qt/qtwidgets:5 dev-qt/qtdbus:5
 SLOT=0
 SRC_URI=https://github.com/MartinBriza/adwaita-qt/archive/1.0/adwaita-qt-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1e28b3fb766d3ac1f78f7c125f846539
diff --git a/metadata/md5-cache/x11-themes/arc-icon-theme-20161122 b/metadata/md5-cache/x11-themes/arc-icon-theme-20161122
index ab4ca92bf933..e9db90b9b514 100644
--- a/metadata/md5-cache/x11-themes/arc-icon-theme-20161122
+++ b/metadata/md5-cache/x11-themes/arc-icon-theme-20161122
@@ -9,5 +9,5 @@ RDEPEND=x11-themes/adwaita-icon-theme
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/horst3180/arc-icon-theme/archive/20161122.tar.gz -> arc-icon-theme-20161122.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=047b555709c4afa1354852d9edc51bf3
diff --git a/metadata/md5-cache/x11-themes/e-gtk-theme-0.19.3 b/metadata/md5-cache/x11-themes/e-gtk-theme-0.19.3
new file mode 100644
index 000000000000..2953be1f2058
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/e-gtk-theme-0.19.3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=A GTK theme to match Enlightenment WM's default theme
+EAPI=7
+HOMEPAGE=https://gitlab.com/tokiclover/e-gtk-theme
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+SLOT=0
+SRC_URI=https://gitlab.com/tokiclover/e-gtk-theme/-/archive/0.19.3/e-gtk-theme-0.19.3.tar.gz
+_md5_=9410ff7ffc535cebd28821faed961886
diff --git a/metadata/md5-cache/x11-themes/echo-icon-theme-0.3.89.0_pre20081031 b/metadata/md5-cache/x11-themes/echo-icon-theme-0.3.89.0_pre20081031
index d49eecd9e243..3bf3ce2a1a27 100644
--- a/metadata/md5-cache/x11-themes/echo-icon-theme-0.3.89.0_pre20081031
+++ b/metadata/md5-cache/x11-themes/echo-icon-theme-0.3.89.0_pre20081031
@@ -8,5 +8,5 @@ LICENSE=CC-BY-SA-3.0
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/echo-icon-theme-0.3.89.0_pre20081031.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=420f7be075c0393a3b4b7c5022d4b506
diff --git a/metadata/md5-cache/x11-themes/elementary-xfce-icon-theme-0.11 b/metadata/md5-cache/x11-themes/elementary-xfce-icon-theme-0.11
index 5a17fe9ea16f..3be893aea14a 100644
--- a/metadata/md5-cache/x11-themes/elementary-xfce-icon-theme-0.11
+++ b/metadata/md5-cache/x11-themes/elementary-xfce-icon-theme-0.11
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=public-domain GPL-1 GPL-2 GPL-3
 SLOT=0
 SRC_URI=https://github.com/shimmerproject/elementary-xfce/archive/elementary-xfce-0.11.tar.gz -> elementary-xfce-icon-theme-0.11.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d0eed41b4d9e0846d6b58a78df4e4a32
diff --git a/metadata/md5-cache/x11-themes/elementary-xfce-icon-theme-0.9 b/metadata/md5-cache/x11-themes/elementary-xfce-icon-theme-0.9
index 3acb5fff1538..5d59e0ee9650 100644
--- a/metadata/md5-cache/x11-themes/elementary-xfce-icon-theme-0.9
+++ b/metadata/md5-cache/x11-themes/elementary-xfce-icon-theme-0.9
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=public-domain GPL-1 GPL-2 GPL-3
 SLOT=0
 SRC_URI=https://github.com/shimmerproject/elementary-xfce/archive/v0.9.tar.gz -> elementary-xfce-icon-theme-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=00834d8ab944032efe16ef9998c333a7
diff --git a/metadata/md5-cache/x11-themes/faenza-icon-theme-1.3.1 b/metadata/md5-cache/x11-themes/faenza-icon-theme-1.3.1
index a32e0bcfe213..85d0b9a4b589 100644
--- a/metadata/md5-cache/x11-themes/faenza-icon-theme-1.3.1
+++ b/metadata/md5-cache/x11-themes/faenza-icon-theme-1.3.1
@@ -10,5 +10,5 @@ RDEPEND=!minimal? ( x11-themes/adwaita-icon-theme ) x11-themes/hicolor-icon-them
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://ppa.launchpad.net/tiheum/equinox/ubuntu/pool/main/f/faenza-icon-theme/faenza-icon-theme_1.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3509f6ab1d3040b8dcfbec54dd149b7a
diff --git a/metadata/md5-cache/x11-themes/gargantuan-icon-theme-1.7 b/metadata/md5-cache/x11-themes/gargantuan-icon-theme-1.7
index e84d449cc5fc..bb87feab82ef 100644
--- a/metadata/md5-cache/x11-themes/gargantuan-icon-theme-1.7
+++ b/metadata/md5-cache/x11-themes/gargantuan-icon-theme-1.7
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=x11-themes/hicolor-icon-theme
 SLOT=0
 SRC_URI=mirror://gentoo/gargantuan-icon-theme-1.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bc81ab366ae2431108eeef055339a9cf
diff --git a/metadata/md5-cache/x11-themes/gartoon-redux-1.10-r1 b/metadata/md5-cache/x11-themes/gartoon-redux-1.10-r1
index 4357fc7a163d..0edb939b0467 100644
--- a/metadata/md5-cache/x11-themes/gartoon-redux-1.10-r1
+++ b/metadata/md5-cache/x11-themes/gartoon-redux-1.10-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=http://tweenk.artfx.pl/gartoon/source/gartoon-redux-1.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6bd90e730b487383946dc8ab73e565b5
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 56696da28c83..c74fce6f4b20 100644
--- a/metadata/md5-cache/x11-themes/gnome-backgrounds-3.24.0
+++ b/metadata/md5-cache/x11-themes/gnome-backgrounds-3.24.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/x11-themes/gnome-colors-common-5.5.1-r1 b/metadata/md5-cache/x11-themes/gnome-colors-common-5.5.1-r1
index f2fda2e1751a..98f44937f48f 100644
--- a/metadata/md5-cache/x11-themes/gnome-colors-common-5.5.1-r1
+++ b/metadata/md5-cache/x11-themes/gnome-colors-common-5.5.1-r1
@@ -10,5 +10,5 @@ RDEPEND=x11-themes/adwaita-icon-theme
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://gnome-colors.googlecode.com/files/gnome-colors-5.5.1.tar.gz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=15c3591d3cce92c7c61fb282dd04a32f
diff --git a/metadata/md5-cache/x11-themes/gnome-colors-themes-5.5.1 b/metadata/md5-cache/x11-themes/gnome-colors-themes-5.5.1
index eaf0459cbc50..854fe1213e40 100644
--- a/metadata/md5-cache/x11-themes/gnome-colors-themes-5.5.1
+++ b/metadata/md5-cache/x11-themes/gnome-colors-themes-5.5.1
@@ -9,5 +9,5 @@ RDEPEND=x11-themes/gnome-colors-common
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://gnome-colors.googlecode.com/files/gnome-colors-5.5.1.tar.gz https://dev.gentoo.org/~pacho/gnome-gentoo-5.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=4dc8c103eb4cd9a35174fdeaf263afee
diff --git a/metadata/md5-cache/x11-themes/gnome-icon-theme-extras-3.12.0 b/metadata/md5-cache/x11-themes/gnome-icon-theme-extras-3.12.0
index 907bfe851e3e..56c03f30a4ef 100644
--- a/metadata/md5-cache/x11-themes/gnome-icon-theme-extras-3.12.0
+++ b/metadata/md5-cache/x11-themes/gnome-icon-theme-extras-3.12.0
@@ -9,5 +9,5 @@ RDEPEND=>=x11-themes/hicolor-icon-theme-0.10
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-icon-theme-extras/3.12/gnome-icon-theme-extras-3.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8a10b74a04669a2546c3d0cd8a139d69
diff --git a/metadata/md5-cache/x11-themes/gnome-icon-theme-symbolic-3.10.1 b/metadata/md5-cache/x11-themes/gnome-icon-theme-symbolic-3.10.1
index b6e5ff1fce4e..86c6a24e96ee 100644
--- a/metadata/md5-cache/x11-themes/gnome-icon-theme-symbolic-3.10.1
+++ b/metadata/md5-cache/x11-themes/gnome-icon-theme-symbolic-3.10.1
@@ -9,5 +9,5 @@ RDEPEND=>=x11-themes/hicolor-icon-theme-0.10 gnome-base/librsvg !=gnome-extra/gn
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-icon-theme-symbolic/3.10/gnome-icon-theme-symbolic-3.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=eb96b68a4f94a76d3b60a75e85dc7406
diff --git a/metadata/md5-cache/x11-themes/gnome-icon-theme-symbolic-3.12.0 b/metadata/md5-cache/x11-themes/gnome-icon-theme-symbolic-3.12.0
index bae5102a02b2..fd779b7837e1 100644
--- a/metadata/md5-cache/x11-themes/gnome-icon-theme-symbolic-3.12.0
+++ b/metadata/md5-cache/x11-themes/gnome-icon-theme-symbolic-3.12.0
@@ -9,5 +9,5 @@ RDEPEND=>=x11-themes/hicolor-icon-theme-0.10 gnome-base/librsvg !=gnome-extra/gn
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-icon-theme-symbolic/3.12/gnome-icon-theme-symbolic-3.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=eb96b68a4f94a76d3b60a75e85dc7406
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-2.20.2-r2 b/metadata/md5-cache/x11-themes/gtk-engines-2.20.2-r2
index 182c747f161a..e25360b8d052 100644
--- a/metadata/md5-cache/x11-themes/gtk-engines-2.20.2-r2
+++ b/metadata/md5-cache/x11-themes/gtk-engines-2.20.2-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=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(-)?] lua? ( dev-lang/lua:0[abi_x86_32(-)?,abi_x86_64(-)?,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=2
 SRC_URI=mirror://gnome/sources/gtk-engines/2.20/gtk-engines-2.20.2.tar.bz2
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=13833f3e1bbef01f0d19217ffa45ba5f
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-flat-2.0-r3 b/metadata/md5-cache/x11-themes/gtk-engines-flat-2.0-r3
index 0ec192d4d756..e352bfa5ec9d 100644
--- a/metadata/md5-cache/x11-themes/gtk-engines-flat-2.0-r3
+++ b/metadata/md5-cache/x11-themes/gtk-engines-flat-2.0-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2
 SLOT=2
 SRC_URI=http://download.freshmeat.net/themes/gtk2flat/gtk2flat-default.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a895d294ab709172200123ab7063351a
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-qtpixmap-0.28-r2 b/metadata/md5-cache/x11-themes/gtk-engines-qtpixmap-0.28-r2
index 5d03e9ef253e..c5c55ca890ee 100644
--- a/metadata/md5-cache/x11-themes/gtk-engines-qtpixmap-0.28-r2
+++ b/metadata/md5-cache/x11-themes/gtk-engines-qtpixmap-0.28-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://www.cpdrummond.freeuk.com/QtPixmap-0.28.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a91a6b1461476b7e8246b6e83412fa35
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-xfce-3.2.0-r200 b/metadata/md5-cache/x11-themes/gtk-engines-xfce-3.2.0-r200
index fb949f067ae1..51d4971d7b45 100644
--- a/metadata/md5-cache/x11-themes/gtk-engines-xfce-3.2.0-r200
+++ b/metadata/md5-cache/x11-themes/gtk-engines-xfce-3.2.0-r200
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.34.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+-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(-)?]
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/gtk-xfce-engine/3.2/gtk-xfce-engine-3.2.0.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186	xfconf	2d8c177734e778123f65326f8d05c3c8
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b	xfconf	2d8c177734e778123f65326f8d05c3c8
 _md5_=ac01cb1936fc288311a1683328c9355d
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-xfce-3.2.0-r300 b/metadata/md5-cache/x11-themes/gtk-engines-xfce-3.2.0-r300
index c58685911740..add3de61bdf1 100644
--- a/metadata/md5-cache/x11-themes/gtk-engines-xfce-3.2.0-r300
+++ b/metadata/md5-cache/x11-themes/gtk-engines-xfce-3.2.0-r300
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.24[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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://archive.xfce.org/src/xfce/gtk-xfce-engine/3.2/gtk-xfce-engine-3.2.0.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186	xfconf	2d8c177734e778123f65326f8d05c3c8
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	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	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b	xfconf	2d8c177734e778123f65326f8d05c3c8
 _md5_=d8edb56dbd59b1d6adc8212a7f83c54c
diff --git a/metadata/md5-cache/x11-themes/hicolor-icon-theme-0.17 b/metadata/md5-cache/x11-themes/hicolor-icon-theme-0.17
index 903774c20ad3..90b4fb2c96ca 100644
--- a/metadata/md5-cache/x11-themes/hicolor-icon-theme-0.17
+++ b/metadata/md5-cache/x11-themes/hicolor-icon-theme-0.17
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://icon-theme.freedesktop.org/releases/hicolor-icon-theme-0.17.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-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=c6528ea4d39260ee7911bf76968f35fb
diff --git a/metadata/md5-cache/x11-themes/human-icon-theme-0.36 b/metadata/md5-cache/x11-themes/human-icon-theme-0.36
index 1931fffaf1c1..2409a25293c4 100644
--- a/metadata/md5-cache/x11-themes/human-icon-theme-0.36
+++ b/metadata/md5-cache/x11-themes/human-icon-theme-0.36
@@ -9,5 +9,5 @@ RDEPEND=|| ( x11-themes/tangerine-icon-theme x11-themes/adwaita-icon-theme )
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://ubuntu/pool/universe/h/human-icon-theme/human-icon-theme_0.36.tar.gz https://www.gentoo.org/images/gentoo-logo.svg
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6464fbfb53370905f263c0a65f0de0f4
diff --git a/metadata/md5-cache/x11-themes/kvantum-0.10.5 b/metadata/md5-cache/x11-themes/kvantum-0.10.5
index e0158b3f2961..9e5ea511d235 100644
--- a/metadata/md5-cache/x11-themes/kvantum-0.10.5
+++ b/metadata/md5-cache/x11-themes/kvantum-0.10.5
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtx11extras:5 x11-libs/libXext
 SLOT=0
 SRC_URI=https://github.com/tsujan/Kvantum/archive/V0.10.5.tar.gz -> kvantum-0.10.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=700e25db38e97475284cf31dbf62987d
diff --git a/metadata/md5-cache/x11-themes/kvantum-0.10.6 b/metadata/md5-cache/x11-themes/kvantum-0.10.6
index d83cb62f611d..182a193f6ec3 100644
--- a/metadata/md5-cache/x11-themes/kvantum-0.10.6
+++ b/metadata/md5-cache/x11-themes/kvantum-0.10.6
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtx11extras:5 x11-libs/libXext
 SLOT=0
 SRC_URI=https://github.com/tsujan/Kvantum/archive/V0.10.6.tar.gz -> kvantum-0.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0ad0180717d91924c0d8a24e2f30c645
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 35c1d226601a..9b77d753f36a 100644
--- a/metadata/md5-cache/x11-themes/lxqt-themes-0.13.0
+++ b/metadata/md5-cache/x11-themes/lxqt-themes-0.13.0
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/x11-themes/mate-backgrounds-1.12.0 b/metadata/md5-cache/x11-themes/mate-backgrounds-1.12.0
deleted file mode 100644
index 79e87ff29c1d..000000000000
--- a/metadata/md5-cache/x11-themes/mate-backgrounds-1.12.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-util/intltool-0.35:* sys-devel/gettext:* >=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.12
-DESCRIPTION=A set of backgrounds packaged with the MATE desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/mate-backgrounds-1.12.0.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=689ba63a2e7a36f3c0b18f349af67a88
diff --git a/metadata/md5-cache/x11-themes/mate-backgrounds-1.14.0 b/metadata/md5-cache/x11-themes/mate-backgrounds-1.14.0
deleted file mode 100644
index 4df4e88f8ef5..000000000000
--- a/metadata/md5-cache/x11-themes/mate-backgrounds-1.14.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-util/intltool-0.35:* sys-devel/gettext:* >=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.14
-DESCRIPTION=A set of backgrounds packaged with the MATE desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.14/mate-backgrounds-1.14.0.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=c8a805c6b4d27645d3a9ac8105adbdf6
diff --git a/metadata/md5-cache/x11-themes/mate-backgrounds-1.16.0 b/metadata/md5-cache/x11-themes/mate-backgrounds-1.16.0
deleted file mode 100644
index fa56abd60496..000000000000
--- a/metadata/md5-cache/x11-themes/mate-backgrounds-1.16.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-util/intltool-0.35:* sys-devel/gettext:* >=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.16
-DESCRIPTION=A set of backgrounds packaged with the MATE desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-backgrounds-1.16.0.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=c8a805c6b4d27645d3a9ac8105adbdf6
diff --git a/metadata/md5-cache/x11-themes/mate-backgrounds-1.18.0 b/metadata/md5-cache/x11-themes/mate-backgrounds-1.18.0
index 25483d959632..9099c40175fa 100644
--- a/metadata/md5-cache/x11-themes/mate-backgrounds-1.18.0
+++ b/metadata/md5-cache/x11-themes/mate-backgrounds-1.18.0
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-backgrounds-1.18.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9b1bb3b295a4d0920f696de02348e889
diff --git a/metadata/md5-cache/x11-themes/mate-icon-theme-1.12.0 b/metadata/md5-cache/x11-themes/mate-icon-theme-1.12.0
deleted file mode 100644
index 5dcbb5d57726..000000000000
--- a/metadata/md5-cache/x11-themes/mate-icon-theme-1.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=x11-themes/hicolor-icon-theme-0.10 >=dev-util/intltool-0.40:* >=x11-misc/icon-naming-utils-0.8.7:0 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.12
-DESCRIPTION=MATE default icon themes
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=x11-themes/hicolor-icon-theme-0.10
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/mate-icon-theme-1.12.0.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=ef74992894f00eaed068ed9a700ef8b7
diff --git a/metadata/md5-cache/x11-themes/mate-icon-theme-1.14.0 b/metadata/md5-cache/x11-themes/mate-icon-theme-1.14.0
deleted file mode 100644
index ff8c0930a434..000000000000
--- a/metadata/md5-cache/x11-themes/mate-icon-theme-1.14.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=x11-themes/hicolor-icon-theme-0.10 >=dev-util/intltool-0.40:* >=x11-misc/icon-naming-utils-0.8.7:0 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.14
-DESCRIPTION=MATE default icon themes
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=x11-themes/hicolor-icon-theme-0.10
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.14/mate-icon-theme-1.14.0.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=874fa02a2c29ee3d76b131630a5db5a7
diff --git a/metadata/md5-cache/x11-themes/mate-icon-theme-1.16.2 b/metadata/md5-cache/x11-themes/mate-icon-theme-1.16.2
deleted file mode 100644
index 690d63d84c8c..000000000000
--- a/metadata/md5-cache/x11-themes/mate-icon-theme-1.16.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=x11-themes/hicolor-icon-theme-0.10 >=dev-util/intltool-0.40:* >=x11-misc/icon-naming-utils-0.8.7:0 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.16
-DESCRIPTION=MATE default icon themes
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=x11-themes/hicolor-icon-theme-0.10
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-icon-theme-1.16.2.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=bc12b7d5f83f11027f0e996630705f6f
diff --git a/metadata/md5-cache/x11-themes/mate-icon-theme-1.18.2 b/metadata/md5-cache/x11-themes/mate-icon-theme-1.18.2
index 4d523b5b415c..b4a2e90f5fa2 100644
--- a/metadata/md5-cache/x11-themes/mate-icon-theme-1.18.2
+++ b/metadata/md5-cache/x11-themes/mate-icon-theme-1.18.2
@@ -9,5 +9,5 @@ RDEPEND=>=x11-themes/hicolor-icon-theme-0.10
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-icon-theme-1.18.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d4601b9754340920408fb0b9d63029f7
diff --git a/metadata/md5-cache/x11-themes/mate-icon-theme-faenza-1.12.0-r1 b/metadata/md5-cache/x11-themes/mate-icon-theme-faenza-1.12.0-r1
deleted file mode 100644
index 34d3d6ea81e2..000000000000
--- a/metadata/md5-cache/x11-themes/mate-icon-theme-faenza-1.12.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=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.12
-DESCRIPTION=Faenza icon theme, that was adapted for MATE desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=minimal
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-3
-RDEPEND=x11-themes/hicolor-icon-theme:0 !minimal? ( >=x11-themes/mate-icon-theme-1.12 )
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/mate-icon-theme-faenza-1.12.0.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=c7633a1ba862af0e097b0f1be1c86442
diff --git a/metadata/md5-cache/x11-themes/mate-icon-theme-faenza-1.14.0 b/metadata/md5-cache/x11-themes/mate-icon-theme-faenza-1.14.0
deleted file mode 100644
index dd93586876e9..000000000000
--- a/metadata/md5-cache/x11-themes/mate-icon-theme-faenza-1.14.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=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.14
-DESCRIPTION=Faenza icon theme, that was adapted for MATE desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=minimal
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=x11-themes/hicolor-icon-theme:0 !minimal? ( >=x11-themes/mate-icon-theme-1.14 )
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.14/mate-icon-theme-faenza-1.14.0.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=1fa99caa5e3529e4303dd7a463d5406c
diff --git a/metadata/md5-cache/x11-themes/mate-icon-theme-faenza-1.16.0 b/metadata/md5-cache/x11-themes/mate-icon-theme-faenza-1.16.0
deleted file mode 100644
index 67a3980e34da..000000000000
--- a/metadata/md5-cache/x11-themes/mate-icon-theme-faenza-1.16.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=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.16
-DESCRIPTION=Faenza icon theme, that was adapted for MATE desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=minimal
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=x11-themes/hicolor-icon-theme:0 !minimal? ( >=x11-themes/mate-icon-theme-1.16 )
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-icon-theme-faenza-1.16.0.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=1fa99caa5e3529e4303dd7a463d5406c
diff --git a/metadata/md5-cache/x11-themes/mate-icon-theme-faenza-1.18.1 b/metadata/md5-cache/x11-themes/mate-icon-theme-faenza-1.18.1
index 5faaf41bbdc9..9b7593de4c02 100644
--- a/metadata/md5-cache/x11-themes/mate-icon-theme-faenza-1.18.1
+++ b/metadata/md5-cache/x11-themes/mate-icon-theme-faenza-1.18.1
@@ -10,5 +10,5 @@ RDEPEND=x11-themes/hicolor-icon-theme:0 !minimal? ( >=x11-themes/mate-icon-theme
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-icon-theme-faenza-1.18.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b6b0b1016487f8b418eca221000d9716
diff --git a/metadata/md5-cache/x11-themes/mate-themes-3.22.11 b/metadata/md5-cache/x11-themes/mate-themes-3.22.11
index 0a83decb29e4..697faec9a4f9 100644
--- a/metadata/md5-cache/x11-themes/mate-themes-3.22.11
+++ b/metadata/md5-cache/x11-themes/mate-themes-3.22.11
@@ -9,5 +9,5 @@ RDEPEND=>=x11-libs/gdk-pixbuf-2:2 >=x11-libs/gtk+-2:2 !<x11-libs/gtk+-3.22:3 !>=
 RESTRICT=binchecks strip
 SLOT=0/3.22
 SRC_URI=http://pub.mate-desktop.org/releases/themes/3.22/mate-themes-3.22.11.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=9a0a07cafd39d5c152aed59f1a0450bc
diff --git a/metadata/md5-cache/x11-themes/mate-themes-3.22.18 b/metadata/md5-cache/x11-themes/mate-themes-3.22.18
index d52dd16b60a1..a51db8bce0e5 100644
--- a/metadata/md5-cache/x11-themes/mate-themes-3.22.18
+++ b/metadata/md5-cache/x11-themes/mate-themes-3.22.18
@@ -9,5 +9,5 @@ RDEPEND=>=x11-libs/gdk-pixbuf-2:2 >=x11-libs/gtk+-2:2 >=x11-themes/gtk-engines-2
 RESTRICT=binchecks strip
 SLOT=0/3.22
 SRC_URI=http://pub.mate-desktop.org/releases/themes/3.22/mate-themes-3.22.18.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	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_=c198f17e2c898b72c40df2c7e0ff1e87
diff --git a/metadata/md5-cache/x11-themes/mate-themes-3.22.7 b/metadata/md5-cache/x11-themes/mate-themes-3.22.7
deleted file mode 100644
index 8752bc4ddf00..000000000000
--- a/metadata/md5-cache/x11-themes/mate-themes-3.22.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=postinst postrm preinst prepare
-DEPEND=>=x11-libs/gdk-pixbuf-2:2 >=x11-libs/gtk+-2:2 !<x11-libs/gtk+-3.22:3 !>=x11-libs/gtk+-3.23:3 >=x11-themes/gtk-engines-2.15.3:2 x11-themes/gtk-engines-murrine >=dev-util/intltool-0.35:* sys-devel/gettext:* >=sys-devel/autoconf-2.53:* >=x11-misc/icon-naming-utils-0.8.7: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 >=sys-apps/sed-4
-DESCRIPTION=A set of MATE themes, with sets for users with limited or low vision
-EAPI=6
-HOMEPAGE=http://mate-desktop.org
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2.1
-RDEPEND=>=x11-libs/gdk-pixbuf-2:2 >=x11-libs/gtk+-2:2 !<x11-libs/gtk+-3.22:3 !>=x11-libs/gtk+-3.23:3 >=x11-themes/gtk-engines-2.15.3:2 x11-themes/gtk-engines-murrine
-RESTRICT=binchecks strip
-SLOT=0/3.22
-SRC_URI=http://pub.mate-desktop.org/releases/themes/3.22/mate-themes-3.22.7.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=4247aff6dbbf3d7f987db3bd5ea06509
diff --git a/metadata/md5-cache/x11-themes/mate-themes-3.22.8 b/metadata/md5-cache/x11-themes/mate-themes-3.22.8
deleted file mode 100644
index 166d3920efd7..000000000000
--- a/metadata/md5-cache/x11-themes/mate-themes-3.22.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=postinst postrm preinst prepare
-DEPEND=>=x11-libs/gdk-pixbuf-2:2 >=x11-libs/gtk+-2:2 !<x11-libs/gtk+-3.22:3 !>=x11-libs/gtk+-3.23:3 >=x11-themes/gtk-engines-2.15.3:2 x11-themes/gtk-engines-murrine >=dev-util/intltool-0.35:* sys-devel/gettext:* >=sys-devel/autoconf-2.53:* >=x11-misc/icon-naming-utils-0.8.7: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 >=sys-apps/sed-4
-DESCRIPTION=A set of MATE themes, with sets for users with limited or low vision
-EAPI=6
-HOMEPAGE=http://mate-desktop.org
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=x11-libs/gdk-pixbuf-2:2 >=x11-libs/gtk+-2:2 !<x11-libs/gtk+-3.22:3 !>=x11-libs/gtk+-3.23:3 >=x11-themes/gtk-engines-2.15.3:2 x11-themes/gtk-engines-murrine
-RESTRICT=binchecks strip
-SLOT=0/3.22
-SRC_URI=http://pub.mate-desktop.org/releases/themes/3.22/mate-themes-3.22.8.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=d489a778f5cf18362e932e55244a9709
diff --git a/metadata/md5-cache/x11-themes/neutral-xcursors-20150106 b/metadata/md5-cache/x11-themes/neutral-xcursors-20150106
index 3b829d26279d..89d28c47e582 100644
--- a/metadata/md5-cache/x11-themes/neutral-xcursors-20150106
+++ b/metadata/md5-cache/x11-themes/neutral-xcursors-20150106
@@ -8,5 +8,5 @@ LICENSE=Artistic-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://opendesktop.org/CONTENT/content-files/28310-neutral-1.13a.tar.gz -> Neutral-1.13a.tar.gz https://opendesktop.org/CONTENT/content-files/48837-Neutral_Plus_1.2.tar.bz2 -> Neutral_Plus-1.2.tar.bz2 https://opendesktop.org/CONTENT/content-files/108142-Neutral++-1.0.3.tar.xz -> Neutral++-1.0.3.tar.bz2 https://opendesktop.org/CONTENT/content-files/108143-Neutral++_White-1.1.1.tar.xz -> Neutral++_White-1.1.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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7bbc8a3c5d066766cf930089c4e74734
diff --git a/metadata/md5-cache/x11-themes/nimbus-0.1.7-r1 b/metadata/md5-cache/x11-themes/nimbus-0.1.7-r1
index c71ca167f32a..78d2bbf1a60b 100644
--- a/metadata/md5-cache/x11-themes/nimbus-0.1.7-r1
+++ b/metadata/md5-cache/x11-themes/nimbus-0.1.7-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=gtk? ( x11-libs/gtk+:2 ) !minimal? ( || ( x11-themes/adwaita-icon-theme x11-themes/tango-icon-theme ) )
 SLOT=0
 SRC_URI=http://dlc.sun.com/osol/jds/downloads/extras/nimbus/nimbus-0.1.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=376695dabaa72d0729b267075e6bff80
diff --git a/metadata/md5-cache/x11-themes/nou-icon-theme-09.02.08 b/metadata/md5-cache/x11-themes/nou-icon-theme-09.02.08
index 076a21b9dfc9..6c8bcce923d2 100644
--- a/metadata/md5-cache/x11-themes/nou-icon-theme-09.02.08
+++ b/metadata/md5-cache/x11-themes/nou-icon-theme-09.02.08
@@ -10,5 +10,5 @@ RDEPEND=!minimal? ( || ( x11-themes/tango-icon-theme x11-themes/adwaita-icon-the
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=http://www.silvestre.com.ar/icons/Nou-090208.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6d9b2f2d39bd3c84d9c6086be082b387
diff --git a/metadata/md5-cache/x11-themes/numix-icon-theme-18.07.17 b/metadata/md5-cache/x11-themes/numix-icon-theme-18.07.17
index 50b6dab15bfc..6272a2f36ea7 100644
--- a/metadata/md5-cache/x11-themes/numix-icon-theme-18.07.17
+++ b/metadata/md5-cache/x11-themes/numix-icon-theme-18.07.17
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=https://github.com/numixproject/numix-icon-theme/archive/18.07.17.tar.gz -> numix-icon-theme-18.07.17.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=555766d57d2f427395785ed5d862527f
diff --git a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-18.08.29 b/metadata/md5-cache/x11-themes/numix-icon-theme-circle-18.08.29
index a4c0c5f54a3b..87586ee94776 100644
--- a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-18.08.29
+++ b/metadata/md5-cache/x11-themes/numix-icon-theme-circle-18.08.29
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=x11-themes/numix-icon-theme
 SLOT=0
 SRC_URI=https://github.com/numixproject/numix-icon-theme-circle/archive/18.08.29.tar.gz -> numix-icon-theme-circle-18.08.29.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=75dd03998df171086ff0d56c81a3637a
diff --git a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-18.09.19 b/metadata/md5-cache/x11-themes/numix-icon-theme-circle-18.09.19
index f69e604c7c76..1166f05f2baf 100644
--- a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-18.09.19
+++ b/metadata/md5-cache/x11-themes/numix-icon-theme-circle-18.09.19
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=x11-themes/numix-icon-theme
 SLOT=0
 SRC_URI=https://github.com/numixproject/numix-icon-theme-circle/archive/18.09.19.tar.gz -> numix-icon-theme-circle-18.09.19.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=814ade5e8954ae23539528c9138ae286
diff --git a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-18.10.03 b/metadata/md5-cache/x11-themes/numix-icon-theme-circle-18.10.03
new file mode 100644
index 000000000000..1837660ab17e
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/numix-icon-theme-circle-18.10.03
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst
+DEPEND=x11-themes/numix-icon-theme >=sys-apps/sed-4
+DESCRIPTION=An icon theme for Linux from the Numix project
+EAPI=6
+HOMEPAGE=https://github.com/numixproject
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=x11-themes/numix-icon-theme
+SLOT=0
+SRC_URI=https://github.com/numixproject/numix-icon-theme-circle/archive/18.10.03.tar.gz -> numix-icon-theme-circle-18.10.03.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_=e640529ffbf69041afa1e5af6cc965b5
diff --git a/metadata/md5-cache/x11-themes/nuovo-icon-theme-0.5 b/metadata/md5-cache/x11-themes/nuovo-icon-theme-0.5
index caacbd772fb1..827b6d3574f1 100644
--- a/metadata/md5-cache/x11-themes/nuovo-icon-theme-0.5
+++ b/metadata/md5-cache/x11-themes/nuovo-icon-theme-0.5
@@ -10,5 +10,5 @@ RDEPEND=!minimal? ( x11-themes/adwaita-icon-theme )
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=http://www.silvestre.com.ar/icons/dlg-nuovo-0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=44079384237bc5c772ffdaea534708f4
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 302c441fd760..1f8cdea4e87d 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=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 ce0a5cab306b..4722441fd9d8 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ed1491b652aa3cd101da90592113a126
diff --git a/metadata/md5-cache/x11-themes/qtcurve-1.9.0 b/metadata/md5-cache/x11-themes/qtcurve-1.9.0
index 0833116a5a96..02a7eac18334 100644
--- a/metadata/md5-cache/x11-themes/qtcurve-1.9.0
+++ b/metadata/md5-cache/x11-themes/qtcurve-1.9.0
@@ -10,5 +10,5 @@ RDEPEND=gtk? ( x11-libs/gtk+:2 ) plasma? ( >=kde-frameworks/frameworkintegration
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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
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 0728f72cfd6c..b9cec863eda2 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
@@ -10,5 +10,5 @@ RDEPEND=gtk? ( x11-libs/gtk+:2 ) plasma? ( >=kde-frameworks/frameworkintegration
 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	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	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 ade66c09ef66..01f0c973ed7c 100644
--- a/metadata/md5-cache/x11-themes/qtcurve-9999
+++ b/metadata/md5-cache/x11-themes/qtcurve-9999
@@ -8,5 +8,5 @@ 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
 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b4700ce093c927d3f723d4959611b93b
diff --git a/metadata/md5-cache/x11-themes/tangerine-icon-theme-0.27 b/metadata/md5-cache/x11-themes/tangerine-icon-theme-0.27
index 5fee147d3526..423c8bc4c897 100644
--- a/metadata/md5-cache/x11-themes/tangerine-icon-theme-0.27
+++ b/metadata/md5-cache/x11-themes/tangerine-icon-theme-0.27
@@ -10,5 +10,5 @@ RDEPEND=!minimal? ( || ( x11-themes/adwaita-icon-theme kde-frameworks/oxygen-ico
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://ubuntu/pool/universe/t/tangerine-icon-theme/tangerine-icon-theme_0.27.tar.gz https://www.gentoo.org/images/gentoo-logo.svg
-_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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b24acd9602d6882f9bc9436b0cd6fc75
diff --git a/metadata/md5-cache/x11-themes/tango-icon-theme-0.8.90-r1 b/metadata/md5-cache/x11-themes/tango-icon-theme-0.8.90-r1
index 3c197f58972d..9690c540f1a7 100644
--- a/metadata/md5-cache/x11-themes/tango-icon-theme-0.8.90-r1
+++ b/metadata/md5-cache/x11-themes/tango-icon-theme-0.8.90-r1
@@ -10,5 +10,5 @@ RDEPEND=!hppa? ( !minimal? ( x11-themes/adwaita-icon-theme ) ) >=x11-themes/hico
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=http://tango.freedesktop.org/releases/tango-icon-theme-0.8.90.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7d8fce6792f561a2069727ca81ab232b
diff --git a/metadata/md5-cache/x11-themes/tango-icon-theme-extras-0.1.0-r2 b/metadata/md5-cache/x11-themes/tango-icon-theme-extras-0.1.0-r2
index eb308d743de3..752e044a219a 100644
--- a/metadata/md5-cache/x11-themes/tango-icon-theme-extras-0.1.0-r2
+++ b/metadata/md5-cache/x11-themes/tango-icon-theme-extras-0.1.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=x11-themes/tango-icon-theme-0.8.90
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=http://tango.freedesktop.org/releases/tango-icon-theme-extras-0.1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1ca31de179dd3353435f34b181c9f62c
diff --git a/metadata/md5-cache/x11-themes/terminology-themes-0_p20180106 b/metadata/md5-cache/x11-themes/terminology-themes-0_p20180106
index e9dd40947e5c..a85f7f94ca71 100644
--- a/metadata/md5-cache/x11-themes/terminology-themes-0_p20180106
+++ b/metadata/md5-cache/x11-themes/terminology-themes-0_p20180106
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=x11-terms/terminology
 SLOT=0
 SRC_URI=https://github.com/sylveon/terminology-themes/archive/ba7b71ffd290cbce4bf87d47276fa516c6563345.tar.gz -> terminology-themes-0_p20180106.tgz
-_eclasses_=xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a921623d570ba2eb20d49edd84dc920c
diff --git a/metadata/md5-cache/x11-themes/terminology-themes-9999 b/metadata/md5-cache/x11-themes/terminology-themes-9999
index 29a80b2b7c04..8a7251e560de 100644
--- a/metadata/md5-cache/x11-themes/terminology-themes-9999
+++ b/metadata/md5-cache/x11-themes/terminology-themes-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://charlesmilette.net/terminology-themes/
 LICENSE=GPL-3
 RDEPEND=x11-terms/terminology
 SLOT=0
-_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f495666dc6a9e2ae1e5d9bdee7f05385
diff --git a/metadata/md5-cache/x11-themes/vertex-icon-theme-20150506 b/metadata/md5-cache/x11-themes/vertex-icon-theme-20150506
index bb0fea60c885..4e083863ce27 100644
--- a/metadata/md5-cache/x11-themes/vertex-icon-theme-20150506
+++ b/metadata/md5-cache/x11-themes/vertex-icon-theme-20150506
@@ -9,5 +9,5 @@ RDEPEND=>=x11-themes/hicolor-icon-theme-0.10
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/horst3180/vertex-icons/archive/f27e47edf392596b7967b7d134d3c62ac3fda0c9.tar.gz -> vertex-icon-theme-20150506.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6a2f282c7da608525dbdc0f5568b6075
diff --git a/metadata/md5-cache/x11-themes/xfce-gant-icon-theme-3.9_p6-r1 b/metadata/md5-cache/x11-themes/xfce-gant-icon-theme-3.9_p6-r1
index b0fa36df10ba..a7cd45c5eb09 100644
--- a/metadata/md5-cache/x11-themes/xfce-gant-icon-theme-3.9_p6-r1
+++ b/metadata/md5-cache/x11-themes/xfce-gant-icon-theme-3.9_p6-r1
@@ -9,5 +9,5 @@ RDEPEND=x11-themes/hicolor-icon-theme
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=http://overlay.uberpenguin.net/icons-xfce-gant-3.9-6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=40f283a88d6c3fb5827975ddbd1542c8
diff --git a/metadata/md5-cache/x11-themes/yasis-icon-theme-0.4.2 b/metadata/md5-cache/x11-themes/yasis-icon-theme-0.4.2
index 47b6051ae39a..41b9e2aee2bb 100644
--- a/metadata/md5-cache/x11-themes/yasis-icon-theme-0.4.2
+++ b/metadata/md5-cache/x11-themes/yasis-icon-theme-0.4.2
@@ -10,5 +10,5 @@ RDEPEND=!minimal? ( || ( x11-themes/adwaita-icon-theme x11-themes/nuovo-icon-the
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=http://www.silvestre.com.ar/icons/yasis-0.4.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2ac1fbe9c7f99c80de3b85edc1f03169
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index cd756f86302b..ad69966708a2 100644
--- a/metadata/md5-cache/x11-wm/Manifest.gz
+++ b/metadata/md5-cache/x11-wm/Manifest.gz
diff --git a/metadata/md5-cache/x11-wm/awesome-3.5.9-r2 b/metadata/md5-cache/x11-wm/awesome-3.5.9-r2
index 324ef9a1cb0e..85f8dadc0e1d 100644
--- a/metadata/md5-cache/x11-wm/awesome-3.5.9-r2
+++ b/metadata/md5-cache/x11-wm/awesome-3.5.9-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.7 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor x11-libs/libXcursor >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 SLOT=0
 SRC_URI=http://awesome.naquadah.org/download/awesome-3.5.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5cc47114671a484f9ab7168707bf6dd7
diff --git a/metadata/md5-cache/x11-wm/awesome-4.2-r2 b/metadata/md5-cache/x11-wm/awesome-4.2-r2
index e631575dd1b1..dd0914ff044b 100644
--- a/metadata/md5-cache/x11-wm/awesome-4.2-r2
+++ b/metadata/md5-cache/x11-wm/awesome-4.2-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/lua-5.1:0 luajit? ( dev-lang/luajit:2 ) dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.8 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6[xkb] >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor >=x11-libs/xcb-util-keysyms-0.3.4 >=x11-libs/xcb-util-wm-0.3.8 >=x11-libs/xcb-util-xrm-1.0 x11-libs/libXcursor x11-libs/libxkbcommon[X] >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 SLOT=0
 SRC_URI=https://github.com/awesomeWM/awesome-releases/raw/master/awesome-4.2.tar.xz
-_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0c19c3db02b531f00075d7c4b46dc939
diff --git a/metadata/md5-cache/x11-wm/awesome-9999 b/metadata/md5-cache/x11-wm/awesome-9999
index f1b1f972ec48..67a6320c1158 100644
--- a/metadata/md5-cache/x11-wm/awesome-9999
+++ b/metadata/md5-cache/x11-wm/awesome-9999
@@ -7,5 +7,5 @@ IUSE=dbus doc elibc_FreeBSD gnome luajit test
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/lua-5.1:0 luajit? ( dev-lang/luajit:2 ) dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.8 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6[xkb] >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor >=x11-libs/xcb-util-keysyms-0.3.4 >=x11-libs/xcb-util-wm-0.3.8 >=x11-libs/xcb-util-xrm-1.0 x11-libs/libXcursor x11-libs/libxkbcommon[X] >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 SLOT=0
-_eclasses_=cmake-utils	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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c2d23548dbabfcc8415646fea88a43f3
diff --git a/metadata/md5-cache/x11-wm/ctwm-4.0.1-r1 b/metadata/md5-cache/x11-wm/ctwm-4.0.1-r1
index 60a67cfc9afc..bed8509b593a 100644
--- a/metadata/md5-cache/x11-wm/ctwm-4.0.1-r1
+++ b/metadata/md5-cache/x11-wm/ctwm-4.0.1-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt
 SLOT=0
 SRC_URI=http://ctwm.org/dist/ctwm-4.0.1.tar.xz
-_eclasses_=cmake-utils	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c9a28767508c25e009dc7b6c49176b1e
diff --git a/metadata/md5-cache/x11-wm/ctwm-4.0.2 b/metadata/md5-cache/x11-wm/ctwm-4.0.2
index 8a78509bd66c..a4d379076e7b 100644
--- a/metadata/md5-cache/x11-wm/ctwm-4.0.2
+++ b/metadata/md5-cache/x11-wm/ctwm-4.0.2
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/x11-wm/enlightenment-0.22.3 b/metadata/md5-cache/x11-wm/enlightenment-0.22.3
index f82c499a7133..982ec4078788 100644
--- a/metadata/md5-cache/x11-wm/enlightenment-0.22.3
+++ b/metadata/md5-cache/x11-wm/enlightenment-0.22.3
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=dev-libs/efl-1.20.5[eet,X] virtual/udev x11-libs/libXext x11-libs/libxcb x11-libs/xcb-util-keysyms x11-misc/xkeyboard-config acpi? ( sys-power/acpid ) connman? ( net-misc/connman ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) udisks? ( sys-fs/udisks:2 ) wayland? ( =dev-libs/efl-1.20*[drm,wayland] >=dev-libs/wayland-1.12.0 x11-libs/libxkbcommon x11-libs/pixman )
 SLOT=0.17/0.22.3
 SRC_URI=https://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.22.3.tar.xz
-_eclasses_=meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f114fc0774af642ba38e08d61a7bfe13
diff --git a/metadata/md5-cache/x11-wm/enlightenment-0.22.4 b/metadata/md5-cache/x11-wm/enlightenment-0.22.4
index a1babab835ad..914ca9921b97 100644
--- a/metadata/md5-cache/x11-wm/enlightenment-0.22.4
+++ b/metadata/md5-cache/x11-wm/enlightenment-0.22.4
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=dev-libs/efl-1.20.5[eet,X] virtual/udev x11-libs/libXext x11-libs/libxcb x11-libs/xcb-util-keysyms x11-misc/xkeyboard-config acpi? ( sys-power/acpid ) bluetooth? ( net-wireless/bluez ) connman? ( dev-libs/efl[connman] ) geolocation? ( app-misc/geoclue:2.0 ) packagekit? ( app-admin/packagekit-base ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) udisks? ( sys-fs/udisks:2 ) wayland? ( >=dev-libs/efl-1.21.0[drm,wayland] dev-libs/wayland x11-libs/libxkbcommon x11-libs/pixman )
 SLOT=0.17/0.22.4
 SRC_URI=https://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.22.4.tar.xz
-_eclasses_=meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=meson	29ef682942c6ff558de2f797a61790c2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b1f5a3dbe65ad02e0b5d6aff29f91b7c
diff --git a/metadata/md5-cache/x11-wm/fluxbox-1.3.7-r3 b/metadata/md5-cache/x11-wm/fluxbox-1.3.7-r3
index f21e0232b49d..9595e4a48a88 100644
--- a/metadata/md5-cache/x11-wm/fluxbox-1.3.7-r3
+++ b/metadata/md5-cache/x11-wm/fluxbox-1.3.7-r3
@@ -10,5 +10,5 @@ RDEPEND=!!<=x11-misc/fbdesk-1.2.1 !!<=x11-misc/fluxconf-0.9.9 !!<x11-themes/flux
 REQUIRED_USE=systray? ( toolbar )
 SLOT=0
 SRC_URI=mirror://sourceforge/fluxbox/fluxbox-1.3.7.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=be1c097020e018aaa2d5c7cf25c7412d
diff --git a/metadata/md5-cache/x11-wm/fluxbox-1.3.7-r4 b/metadata/md5-cache/x11-wm/fluxbox-1.3.7-r4
index 0718fc79e5c2..19d37a07bc49 100644
--- a/metadata/md5-cache/x11-wm/fluxbox-1.3.7-r4
+++ b/metadata/md5-cache/x11-wm/fluxbox-1.3.7-r4
@@ -10,5 +10,5 @@ RDEPEND=!!<=x11-misc/fbdesk-1.2.1 !!<=x11-misc/fluxconf-0.9.9 !!<x11-themes/flux
 REQUIRED_USE=systray? ( toolbar )
 SLOT=0
 SRC_URI=mirror://sourceforge/fluxbox/fluxbox-1.3.7.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4014773bf4ac856eb46a5594fdb4b610
diff --git a/metadata/md5-cache/x11-wm/i3-4.15 b/metadata/md5-cache/x11-wm/i3-4.15
index 9c30671c0c74..c2129bf3ccc1 100644
--- a/metadata/md5-cache/x11-wm/i3-4.15
+++ b/metadata/md5-cache/x11-wm/i3-4.15
@@ -4,7 +4,7 @@ DESCRIPTION=An improved dynamic tiling window manager
 EAPI=6
 HOMEPAGE=https://i3wm.org/
 IUSE=doc debug test test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
 RDEPEND=dev-libs/libev dev-libs/libpcre >=dev-libs/yajl-2.0.3 x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-misc/xkeyboard-config >=x11-libs/cairo-1.14.4[X,xcb] >=x11-libs/pango-1.30.0[X] dev-lang/perl dev-perl/AnyEvent-I3 dev-perl/JSON-XS
 REQUIRED_USE=test? ( debug )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://i3wm.org/downloads/i3-4.15.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	out-of-source	15edba2977da53bbf4d1e5a60abc0e34	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=7ab965a05cc94d1dd6d02b7294b907c4
+_md5_=0de6775c505c2d92a6f0a68f746e5b9c
diff --git a/metadata/md5-cache/x11-wm/larswm-7.5.3-r2 b/metadata/md5-cache/x11-wm/larswm-7.5.3-r2
new file mode 100644
index 000000000000..911ca552bc74
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/larswm-7.5.3-r2
@@ -0,0 +1,12 @@
+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=7
+HOMEPAGE=http://www.fnurt.net/larswm/
+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
diff --git a/metadata/md5-cache/x11-wm/lumina-1.4.0_p1-r1 b/metadata/md5-cache/x11-wm/lumina-1.4.0_p1-r1
index 73be3863a54c..3a7b54e729e1 100644
--- a/metadata/md5-cache/x11-wm/lumina-1.4.0_p1-r1
+++ b/metadata/md5-cache/x11-wm/lumina-1.4.0_p1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtsvg:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtgui:5 dev-qt/qtdeclarative:5 dev-qt/qtprintsupport:5 x11-libs/libxcb:0 x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-wm desktop-utils? ( app-text/poppler[qt5] ) sys-fs/inotify-tools x11-misc/numlockx x11-wm/fluxbox || ( x11-apps/xbacklight sys-power/acpilight ) media-sound/alsa-utils sys-power/acpi app-admin/sysstat
 SLOT=0
 SRC_URI=https://github.com/trueos/lumina/archive/v1.4.0-p1.tar.gz -> lumina-1.4.0_p1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a030f460b299ac58f12cbd7ddf6006eb
diff --git a/metadata/md5-cache/x11-wm/marco-1.12.1 b/metadata/md5-cache/x11-wm/marco-1.12.1
deleted file mode 100644
index b4cc8b0bd0a5..000000000000
--- a/metadata/md5-cache/x11-wm/marco-1.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/atk:0 >=dev-libs/glib-2.32.10:2 >=gnome-base/libgtop-2:2= gnome-extra/zenity:0 x11-libs/cairo:0 >=x11-libs/pango-1.2:0[X] x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 >=x11-libs/libXcomposite-0.3:0 x11-libs/libXcursor:0 x11-libs/libXdamage:0 x11-libs/libXext:0 x11-libs/libXfixes:0 x11-libs/libXrandr:0 x11-libs/libXrender:0 >=x11-libs/startup-notification-0.7:0 virtual/libintl:0 !gtk3? ( media-libs/libcanberra:0[gtk] >=x11-libs/gtk+-2.24:2 ) gtk3? ( media-libs/libcanberra:0[gtk3] >=x11-libs/gtk+-3.0:3 ) xinerama? ( x11-libs/libXinerama:0 ) !!x11-wm/mate-window-manager app-text/yelp-tools:0 >=dev-util/intltool-0.34.90:* sys-devel/gettext:* virtual/pkgconfig:* x11-base/xorg-proto test? ( app-text/docbook-xml-dtd:4.5 ) >=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.12
-DESCRIPTION=MATE default window manager
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=gtk3 startup-notification test xinerama
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.32.10:2 >=gnome-base/libgtop-2:2= gnome-extra/zenity:0 x11-libs/cairo:0 >=x11-libs/pango-1.2:0[X] x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 >=x11-libs/libXcomposite-0.3:0 x11-libs/libXcursor:0 x11-libs/libXdamage:0 x11-libs/libXext:0 x11-libs/libXfixes:0 x11-libs/libXrandr:0 x11-libs/libXrender:0 >=x11-libs/startup-notification-0.7:0 virtual/libintl:0 !gtk3? ( media-libs/libcanberra:0[gtk] >=x11-libs/gtk+-2.24:2 ) gtk3? ( media-libs/libcanberra:0[gtk3] >=x11-libs/gtk+-3.0:3 ) xinerama? ( x11-libs/libXinerama:0 ) !!x11-wm/mate-window-manager
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/marco-1.12.1.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=53692d0091b636776984efe7ed8584fa
diff --git a/metadata/md5-cache/x11-wm/marco-1.12.1-r1 b/metadata/md5-cache/x11-wm/marco-1.12.1-r1
deleted file mode 100644
index d24e7fb96243..000000000000
--- a/metadata/md5-cache/x11-wm/marco-1.12.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/atk:0 >=dev-libs/glib-2.32.10:2 >=gnome-base/libgtop-2:2= gnome-extra/zenity:0 >=mate-base/mate-desktop-1.9[gtk3(-)=] x11-libs/cairo:0 >=x11-libs/pango-1.2:0[X] x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 >=x11-libs/libXcomposite-0.3:0 x11-libs/libXcursor:0 x11-libs/libXdamage:0 x11-libs/libXext:0 x11-libs/libXfixes:0 x11-libs/libXrandr:0 x11-libs/libXrender:0 >=x11-libs/startup-notification-0.7:0 virtual/libintl:0 !gtk3? ( media-libs/libcanberra:0[gtk] >=x11-libs/gtk+-2.24:2 ) gtk3? ( media-libs/libcanberra:0[gtk3] >=x11-libs/gtk+-3.0:3 ) xinerama? ( x11-libs/libXinerama:0 ) !!x11-wm/mate-window-manager app-text/yelp-tools:0 >=dev-util/intltool-0.34.90:* sys-devel/gettext:* virtual/pkgconfig:* x11-base/xorg-proto test? ( app-text/docbook-xml-dtd:4.5 ) >=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.12
-DESCRIPTION=MATE default window manager
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=gtk3 startup-notification test xinerama
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.32.10:2 >=gnome-base/libgtop-2:2= gnome-extra/zenity:0 >=mate-base/mate-desktop-1.9[gtk3(-)=] x11-libs/cairo:0 >=x11-libs/pango-1.2:0[X] x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 >=x11-libs/libXcomposite-0.3:0 x11-libs/libXcursor:0 x11-libs/libXdamage:0 x11-libs/libXext:0 x11-libs/libXfixes:0 x11-libs/libXrandr:0 x11-libs/libXrender:0 >=x11-libs/startup-notification-0.7:0 virtual/libintl:0 !gtk3? ( media-libs/libcanberra:0[gtk] >=x11-libs/gtk+-2.24:2 ) gtk3? ( media-libs/libcanberra:0[gtk3] >=x11-libs/gtk+-3.0:3 ) xinerama? ( x11-libs/libXinerama:0 ) !!x11-wm/mate-window-manager
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/marco-1.12.1.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=ff007cd8c1353ed8e5eaa97fc2801750
diff --git a/metadata/md5-cache/x11-wm/marco-1.14.2-r1 b/metadata/md5-cache/x11-wm/marco-1.14.2-r1
deleted file mode 100644
index 0ca83a6611f1..000000000000
--- a/metadata/md5-cache/x11-wm/marco-1.14.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/atk:0 >=dev-libs/glib-2.32.10:2 >=gnome-base/libgtop-2:2= x11-libs/cairo:0 >=x11-libs/pango-1.2:0[X] x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 >=x11-libs/libXcomposite-0.3:0 x11-libs/libXcursor:0 x11-libs/libXdamage:0 x11-libs/libXext:0 x11-libs/libXfixes:0 x11-libs/libXrandr:0 x11-libs/libXrender:0 >=x11-libs/startup-notification-0.7:0 virtual/libintl:0 !gtk3? ( media-libs/libcanberra:0[gtk] >=x11-libs/gtk+-2.24:2 ) gtk3? ( media-libs/libcanberra:0[gtk3] >=x11-libs/gtk+-3.0:3 ) xinerama? ( x11-libs/libXinerama:0 ) !!x11-wm/mate-window-manager app-text/yelp-tools:0 >=dev-util/intltool-0.34.90:* sys-devel/gettext:* virtual/pkgconfig:* x11-base/xorg-proto test? ( app-text/docbook-xml-dtd:4.5 ) >=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.14
-DESCRIPTION=MATE default window manager
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=gtk3 startup-notification test xinerama
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.32.10:2 >=gnome-base/libgtop-2:2= x11-libs/cairo:0 >=x11-libs/pango-1.2:0[X] x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 >=x11-libs/libXcomposite-0.3:0 x11-libs/libXcursor:0 x11-libs/libXdamage:0 x11-libs/libXext:0 x11-libs/libXfixes:0 x11-libs/libXrandr:0 x11-libs/libXrender:0 >=x11-libs/startup-notification-0.7:0 virtual/libintl:0 !gtk3? ( media-libs/libcanberra:0[gtk] >=x11-libs/gtk+-2.24:2 ) gtk3? ( media-libs/libcanberra:0[gtk3] >=x11-libs/gtk+-3.0:3 ) xinerama? ( x11-libs/libXinerama:0 ) !!x11-wm/mate-window-manager gnome-extra/zenity:0 >=mate-base/mate-desktop-1.9[gtk3(-)=]
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.14/marco-1.14.2.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=00ada5181ac13bb8322f7fbd1bec1819
diff --git a/metadata/md5-cache/x11-wm/marco-1.16.1 b/metadata/md5-cache/x11-wm/marco-1.16.1
deleted file mode 100644
index 946614796512..000000000000
--- a/metadata/md5-cache/x11-wm/marco-1.16.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/atk:0 >=dev-libs/glib-2.32.10:2 >=gnome-base/libgtop-2:2= x11-libs/cairo:0 >=x11-libs/pango-1.2:0[X] x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 >=x11-libs/libXcomposite-0.3:0 x11-libs/libXcursor:0 x11-libs/libXdamage:0 x11-libs/libXext:0 x11-libs/libXfixes:0 x11-libs/libXrandr:0 x11-libs/libXrender:0 >=x11-libs/startup-notification-0.7:0 virtual/libintl:0 !gtk3? ( media-libs/libcanberra:0[gtk] >=x11-libs/gtk+-2.24:2 ) gtk3? ( media-libs/libcanberra:0[gtk3] >=x11-libs/gtk+-3.0:3 ) xinerama? ( x11-libs/libXinerama:0 ) !!x11-wm/mate-window-manager app-text/yelp-tools:0 >=dev-util/intltool-0.34.90:* sys-devel/gettext:* virtual/pkgconfig:* x11-base/xorg-proto test? ( app-text/docbook-xml-dtd:4.5 ) >=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.16
-DESCRIPTION=MATE default window manager
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=gtk3 startup-notification test xinerama
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.32.10:2 >=gnome-base/libgtop-2:2= x11-libs/cairo:0 >=x11-libs/pango-1.2:0[X] x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 >=x11-libs/libXcomposite-0.3:0 x11-libs/libXcursor:0 x11-libs/libXdamage:0 x11-libs/libXext:0 x11-libs/libXfixes:0 x11-libs/libXrandr:0 x11-libs/libXrender:0 >=x11-libs/startup-notification-0.7:0 virtual/libintl:0 !gtk3? ( media-libs/libcanberra:0[gtk] >=x11-libs/gtk+-2.24:2 ) gtk3? ( media-libs/libcanberra:0[gtk3] >=x11-libs/gtk+-3.0:3 ) xinerama? ( x11-libs/libXinerama:0 ) !!x11-wm/mate-window-manager gnome-extra/zenity:0 >=mate-base/mate-desktop-1.9[gtk3(-)=]
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/marco-1.16.1.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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=00ada5181ac13bb8322f7fbd1bec1819
diff --git a/metadata/md5-cache/x11-wm/marco-1.18.2 b/metadata/md5-cache/x11-wm/marco-1.18.2
index 505c0889944e..a4ead4d40c3f 100644
--- a/metadata/md5-cache/x11-wm/marco-1.18.2
+++ b/metadata/md5-cache/x11-wm/marco-1.18.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.32.10:2 >=gnome-base/libgtop-2:2= media-libs/libcanberra:0[gtk3] x11-libs/cairo:0 >=x11-libs/pango-1.2:0[X] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.0:3 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 >=x11-libs/libXcomposite-0.3:0 x11-libs/libXcursor:0 x11-libs/libXdamage:0 x11-libs/libXext:0 x11-libs/libXfixes:0 x11-libs/libXrandr:0 x11-libs/libXrender:0 >=x11-libs/startup-notification-0.7:0 virtual/libintl:0 xinerama? ( x11-libs/libXinerama:0 ) !!x11-wm/mate-window-manager gnome-extra/zenity:0 >=mate-base/mate-desktop-1.17.0
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.18/marco-1.18.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=037561a18f0df76e9b169ed4c442b1bb
diff --git a/metadata/md5-cache/x11-wm/muffin-3.6.0 b/metadata/md5-cache/x11-wm/muffin-3.6.0
index 2fb9fe0294eb..15f28c893f18 100644
--- a/metadata/md5-cache/x11-wm/muffin-3.6.0
+++ b/metadata/md5-cache/x11-wm/muffin-3.6.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=x11-libs/pango-1.2[X,introspection?] >=x11-libs/cairo-1.14:=[X] x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.9.12:3[X,introspection?] >=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-2.4:0=[introspection?] >=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?] >=media-libs/clutter-1.14.3:1.0=[X,introspection?] >=media-libs/cogl-1.13.3:1.0=[introspection?] >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/libXcomposite-0.3 >=x11-libs/startup-notification-0.7:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender virtual/opengl gnome-extra/zenity introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) xinerama? ( x11-libs/libXinerama ) !x11-misc/expocity
 SLOT=0
 SRC_URI=https://github.com/linuxmint/muffin/archive/3.6.0.tar.gz -> muffin-3.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8131dfeddfc933c64ea6b9f329809e88
diff --git a/metadata/md5-cache/x11-wm/muffin-3.8.2 b/metadata/md5-cache/x11-wm/muffin-3.8.2
index 6a526f69e973..aefa5936c87b 100644
--- a/metadata/md5-cache/x11-wm/muffin-3.8.2
+++ b/metadata/md5-cache/x11-wm/muffin-3.8.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=x11-libs/pango-1.2[X,introspection?] >=x11-libs/cairo-1.14:=[X] x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.9.12:3[X,introspection?] >=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-2.4:0=[introspection?] >=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?] >=media-libs/clutter-1.14.3:1.0=[X,introspection?] >=media-libs/cogl-1.13.3:1.0=[introspection?] >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/libXcomposite-0.3 >=x11-libs/startup-notification-0.7:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender virtual/opengl gnome-extra/zenity introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) xinerama? ( x11-libs/libXinerama ) !x11-misc/expocity
 SLOT=0
 SRC_URI=https://github.com/linuxmint/muffin/archive/3.8.2.tar.gz -> muffin-3.8.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=70c7a6ba5bdedbe4c980785d362260ff
diff --git a/metadata/md5-cache/x11-wm/mutter-3.22.4-r1 b/metadata/md5-cache/x11-wm/mutter-3.22.4-r1
index f2f63bb909a6..c1e2ba465b54 100644
--- a/metadata/md5-cache/x11-wm/mutter-3.22.4-r1
+++ b/metadata/md5-cache/x11-wm/mutter-3.22.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/atk-2.5.3 >=x11-libs/gdk-pixbuf-2:2 >=dev-libs/json-glib-0.12.0 >=x11-libs/pango-1.30[introspection?] >=x11-libs/cairo-1.14[X] >=x11-libs/gtk+-3.19.8:3[X,introspection?] >=dev-libs/glib-2.49.0:2[dbus] >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/startup-notification-0.7 >=x11-libs/libXcomposite-0.2 >=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?] gnome-base/gnome-desktop:3= >sys-power/upower-0.99:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXinerama >=x11-libs/libXrandr-1.5 x11-libs/libXrender x11-libs/libxcb x11-libs/libxkbfile >=x11-libs/libxkbcommon-0.4.3[X] x11-misc/xkeyboard-config gnome-extra/zenity media-libs/mesa[egl] gles2? ( media-libs/mesa[gles2] ) input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= ) udev? ( virtual/libgudev:= ) wayland? ( >=dev-libs/libinput-1.4 >=dev-libs/wayland-1.6.90 >=dev-libs/wayland-protocols-1.7 >=media-libs/mesa-10.3[egl,gbm,wayland] sys-apps/systemd virtual/libgudev:= >=virtual/libudev-136:= x11-base/xorg-server[wayland] x11-libs/libdrm:= ) >=sys-devel/gettext-0.19.6 virtual/pkgconfig x11-base/xorg-proto test? ( app-text/docbook-xml-dtd:4.5 ) wayland? ( >=sys-kernel/linux-headers-4.4 ) >=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/atk-2.5.3 >=x11-libs/gdk-pixbuf-2:2 >=dev-libs/json-glib-0.12.0 >=x11-libs/pango-1.30[introspection?] >=x11-libs/cairo-1.14[X] >=x11-libs/gtk+-3.19.8:3[X,introspection?] >=dev-libs/glib-2.49.0:2[dbus] >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/startup-notification-0.7 >=x11-libs/libXcomposite-0.2 >=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?] gnome-base/gnome-desktop:3= >sys-power/upower-0.99:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXinerama >=x11-libs/libXrandr-1.5 x11-libs/libXrender x11-libs/libxcb x11-libs/libxkbfile >=x11-libs/libxkbcommon-0.4.3[X] x11-misc/xkeyboard-config gnome-extra/zenity media-libs/mesa[egl] gles2? ( media-libs/mesa[gles2] ) input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= ) udev? ( virtual/libgudev:= ) wayland? ( >=dev-libs/libinput-1.4 >=dev-libs/wayland-1.6.90 >=dev-libs/wayland-protocols-1.7 >=media-libs/mesa-10.3[egl,gbm,wayland] sys-apps/systemd virtual/libgudev:= >=virtual/libudev-136:= x11-base/xorg-server[wayland] x11-libs/libdrm:= ) dev-util/glib-utils >=sys-devel/gettext-0.19.6 virtual/pkgconfig x11-base/xorg-proto test? ( app-text/docbook-xml-dtd:4.5 ) wayland? ( >=sys-kernel/linux-headers-4.4 ) >=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=GNOME 3 compositing window manager based on Clutter
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/mutter/
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/atk-2.5.3 >=x11-libs/gdk-pixbuf-2:2 >=dev-libs/json-glib-0.12.0 >=x11-libs/pango-1.30[introspection?] >=x11-libs/cairo-1.14[X] >=x11-libs/gtk+-3.19.8:3[X,introspection?] >=dev-libs/glib-2.49.0:2[dbus] >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/startup-notification-0.7 >=x11-libs/libXcomposite-0.2 >=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?] gnome-base/gnome-desktop:3= >sys-power/upower-0.99:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXinerama >=x11-libs/libXrandr-1.5 x11-libs/libXrender x11-libs/libxcb x11-libs/libxkbfile >=x11-libs/libxkbcommon-0.4.3[X] x11-misc/xkeyboard-config gnome-extra/zenity media-libs/mesa[egl] gles2? ( media-libs/mesa[gles2] ) input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= ) udev? ( virtual/libgudev:= ) wayland? ( >=dev-libs/libinput-1.4 >=dev-libs/wayland-1.6.90 >=dev-libs/wayland-protocols-1.7 >=media-libs/mesa-10.3[egl,gbm,wayland] sys-apps/systemd virtual/libgudev:= >=virtual/libudev-136:= x11-base/xorg-server[wayland] x11-libs/libdrm:= ) !x11-misc/expocity
 SLOT=0
 SRC_URI=mirror://gnome/sources/mutter/3.22/mutter-3.22.4.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=5947c2ac94b11a687b8f3ce91b3f0c2f
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=91e1c76e36d219ba7cac3477f4ec9973
diff --git a/metadata/md5-cache/x11-wm/mutter-3.24.4 b/metadata/md5-cache/x11-wm/mutter-3.24.4
index 01ef6ec9a929..033fa1cd16b3 100644
--- a/metadata/md5-cache/x11-wm/mutter-3.24.4
+++ b/metadata/md5-cache/x11-wm/mutter-3.24.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/atk-2.5.3 >=x11-libs/gdk-pixbuf-2:2 >=dev-libs/json-glib-0.12.0 >=x11-libs/pango-1.30[introspection?] >=x11-libs/cairo-1.14[X] >=x11-libs/gtk+-3.19.8:3[X,introspection?] >=dev-libs/glib-2.49.0:2[dbus] >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/startup-notification-0.7 >=x11-libs/libXcomposite-0.2 >=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?] gnome-base/gnome-desktop:3= >sys-power/upower-0.99:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXinerama >=x11-libs/libXrandr-1.5 x11-libs/libXrender x11-libs/libxcb x11-libs/libxkbfile >=x11-libs/libxkbcommon-0.4.3[X] x11-misc/xkeyboard-config gnome-extra/zenity media-libs/mesa[egl] gles2? ( media-libs/mesa[gles2] ) input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= ) udev? ( >=virtual/libgudev-232:= ) wayland? ( >=dev-libs/libinput-1.4 >=dev-libs/wayland-1.6.90 >=dev-libs/wayland-protocols-1.7 >=media-libs/mesa-10.3[egl,gbm,wayland] sys-apps/systemd >=virtual/libgudev-232:= >=virtual/libudev-136:= x11-base/xorg-server[wayland] x11-libs/libdrm:= ) >=sys-devel/gettext-0.19.6 virtual/pkgconfig x11-base/xorg-proto test? ( app-text/docbook-xml-dtd:4.5 ) wayland? ( >=sys-kernel/linux-headers-4.4 ) >=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/atk-2.5.3 >=x11-libs/gdk-pixbuf-2:2 >=dev-libs/json-glib-0.12.0 >=x11-libs/pango-1.30[introspection?] >=x11-libs/cairo-1.14[X] >=x11-libs/gtk+-3.19.8:3[X,introspection?] >=dev-libs/glib-2.49.0:2[dbus] >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/startup-notification-0.7 >=x11-libs/libXcomposite-0.2 >=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?] gnome-base/gnome-desktop:3= >sys-power/upower-0.99:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXinerama >=x11-libs/libXrandr-1.5 x11-libs/libXrender x11-libs/libxcb x11-libs/libxkbfile >=x11-libs/libxkbcommon-0.4.3[X] x11-misc/xkeyboard-config gnome-extra/zenity media-libs/mesa[egl] gles2? ( media-libs/mesa[gles2] ) input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= ) udev? ( >=virtual/libgudev-232:= ) wayland? ( >=dev-libs/libinput-1.4 >=dev-libs/wayland-1.6.90 >=dev-libs/wayland-protocols-1.7 >=media-libs/mesa-10.3[egl,gbm,wayland] sys-apps/systemd >=virtual/libgudev-232:= >=virtual/libudev-136:= x11-base/xorg-server[wayland] x11-libs/libdrm:= ) dev-util/glib-utils >=sys-devel/gettext-0.19.6 virtual/pkgconfig x11-base/xorg-proto test? ( app-text/docbook-xml-dtd:4.5 ) wayland? ( >=sys-kernel/linux-headers-4.4 ) >=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=GNOME 3 compositing window manager based on Clutter
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/mutter/
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/atk-2.5.3 >=x11-libs/gdk-pixbuf-2:2 >=dev-libs/json-glib-0.12.0 >=x11-libs/pango-1.30[introspection?] >=x11-libs/cairo-1.14[X] >=x11-libs/gtk+-3.19.8:3[X,introspection?] >=dev-libs/glib-2.49.0:2[dbus] >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/startup-notification-0.7 >=x11-libs/libXcomposite-0.2 >=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?] gnome-base/gnome-desktop:3= >sys-power/upower-0.99:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXinerama >=x11-libs/libXrandr-1.5 x11-libs/libXrender x11-libs/libxcb x11-libs/libxkbfile >=x11-libs/libxkbcommon-0.4.3[X] x11-misc/xkeyboard-config gnome-extra/zenity media-libs/mesa[egl] gles2? ( media-libs/mesa[gles2] ) input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= ) udev? ( >=virtual/libgudev-232:= ) wayland? ( >=dev-libs/libinput-1.4 >=dev-libs/wayland-1.6.90 >=dev-libs/wayland-protocols-1.7 >=media-libs/mesa-10.3[egl,gbm,wayland] sys-apps/systemd >=virtual/libgudev-232:= >=virtual/libudev-136:= x11-base/xorg-server[wayland] x11-libs/libdrm:= ) !x11-misc/expocity
 SLOT=0/0
 SRC_URI=mirror://gnome/sources/mutter/3.24/mutter-3.24.4.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=98ead82619fb8cc93dbacf706e5cc10c
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=5eb380e863e1cf077dc151c94c240db7
diff --git a/metadata/md5-cache/x11-wm/mutter-3.26.2-r1 b/metadata/md5-cache/x11-wm/mutter-3.26.2-r1
index 87b188f23fc9..44905ebcf2b2 100644
--- a/metadata/md5-cache/x11-wm/mutter-3.26.2-r1
+++ b/metadata/md5-cache/x11-wm/mutter-3.26.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/atk-2.5.3 >=x11-libs/gdk-pixbuf-2:2 >=dev-libs/json-glib-0.12.0 >=x11-libs/pango-1.30[introspection?] >=x11-libs/cairo-1.14[X] >=x11-libs/gtk+-3.19.8:3[X,introspection?] >=dev-libs/glib-2.53.2:2 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/startup-notification-0.7 >=x11-libs/libXcomposite-0.2 >=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?] gnome-base/gnome-desktop:3= >sys-power/upower-0.99:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXinerama >=x11-libs/libXrandr-1.5 x11-libs/libXrender x11-libs/libxcb x11-libs/libxkbfile >=x11-libs/libxkbcommon-0.4.3[X] x11-misc/xkeyboard-config gnome-extra/zenity media-libs/mesa[egl] gles2? ( media-libs/mesa[gles2] ) input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= ) udev? ( >=virtual/libgudev-232:= ) wayland? ( >=dev-libs/libinput-1.4 >=dev-libs/wayland-1.13.0 >=dev-libs/wayland-protocols-1.9 >=media-libs/mesa-10.3[egl,gbm,wayland] sys-apps/systemd >=virtual/libgudev-232:= >=virtual/libudev-136:= x11-base/xorg-server[wayland] x11-libs/libdrm:= )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/mutter/3.26/mutter-3.26.2.tar.xz https://dev.gentoo.org/~leio/distfiles/mutter-3.26.2-patchset.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=fe205d6e3832bde7583186063b769c24
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=8fca878fb016c124f3703f1e2d0581f3
diff --git a/metadata/md5-cache/x11-wm/plwm-2.7_rc1-r1 b/metadata/md5-cache/x11-wm/plwm-2.7_rc1-r1
index ace9916064fa..f6a8ee29bca8 100644
--- a/metadata/md5-cache/x11-wm/plwm-2.7_rc1-r1
+++ b/metadata/md5-cache/x11-wm/plwm-2.7_rc1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/python-xlib-0.14[python_targets_python2_7(-)?,-python_singl
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/plwm/PLWM-2.7rc1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=bdb47c797dab178c22f9544c592c0dce
diff --git a/metadata/md5-cache/x11-wm/qtile-0.10.6 b/metadata/md5-cache/x11-wm/qtile-0.10.6
index 67fc3476bd0a..14e8d2b5c8bf 100644
--- a/metadata/md5-cache/x11-wm/qtile-0.10.6
+++ b/metadata/md5-cache/x11-wm/qtile-0.10.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/qtile/qtile/archive/v0.10.6.tar.gz -> qtile-0.10.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=7b840cf52f94d7d062f97fdc859ae8e6
diff --git a/metadata/md5-cache/x11-wm/qtile-0.12.0 b/metadata/md5-cache/x11-wm/qtile-0.12.0
index bfb2b1f97aa1..5633cfba9b76 100644
--- a/metadata/md5-cache/x11-wm/qtile-0.12.0
+++ b/metadata/md5-cache/x11-wm/qtile-0.12.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/qtile/qtile/archive/v0.12.0.tar.gz -> qtile-0.12.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	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=3aa644b84d29229e23fcddd96ac7cc7f
diff --git a/metadata/md5-cache/x11-wm/qtile-9999 b/metadata/md5-cache/x11-wm/qtile-9999
index 3297eae9e918..615b537b0994 100644
--- a/metadata/md5-cache/x11-wm/qtile-9999
+++ b/metadata/md5-cache/x11-wm/qtile-9999
@@ -9,5 +9,5 @@ RDEPEND=x11-libs/cairo[xcb] x11-libs/pango dev-python/setuptools[python_targets_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 RESTRICT=test
 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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3aa644b84d29229e23fcddd96ac7cc7f
diff --git a/metadata/md5-cache/x11-wm/stumpwm-1.0.1_rc b/metadata/md5-cache/x11-wm/stumpwm-1.0.1_rc
index 7da18e3de8ad..cde8888680bb 100644
--- a/metadata/md5-cache/x11-wm/stumpwm-1.0.1_rc
+++ b/metadata/md5-cache/x11-wm/stumpwm-1.0.1_rc
@@ -11,5 +11,5 @@ RDEPEND=dev-lisp/alexandria dev-lisp/cl-ppcre dev-lisp/clx >=dev-lisp/sbcl-1.3.0
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=https://github.com/stumpwm/stumpwm/archive/v1.0.1-rc.tar.gz -> stumpwm-1.0.1_rc.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	common-lisp-3	3f23602a5efddf587c5205de7b6de7f8	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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	common-lisp-3	3f23602a5efddf587c5205de7b6de7f8	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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=819f354c4dd42ecad62f498c6d8e0c83
diff --git a/metadata/md5-cache/x11-wm/stumpwm-18.05 b/metadata/md5-cache/x11-wm/stumpwm-18.05
index 5a32ad43cf54..d7329a9f689a 100644
--- a/metadata/md5-cache/x11-wm/stumpwm-18.05
+++ b/metadata/md5-cache/x11-wm/stumpwm-18.05
@@ -11,5 +11,5 @@ RDEPEND=dev-lisp/alexandria dev-lisp/cl-ppcre dev-lisp/clx >=dev-lisp/sbcl-1.3.0
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=https://github.com/stumpwm/stumpwm/archive/18.05.tar.gz -> stumpwm-18.05.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	common-lisp-3	3f23602a5efddf587c5205de7b6de7f8	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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	common-lisp-3	3f23602a5efddf587c5205de7b6de7f8	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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c2c45f9e6eb2a0760aca25d91ee82349
diff --git a/metadata/md5-cache/x11-wm/treewm-0.4.5-r2 b/metadata/md5-cache/x11-wm/treewm-0.4.5-r2
new file mode 100644
index 000000000000..039eb5b30e1c
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/treewm-0.4.5-r2
@@ -0,0 +1,12 @@
+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=7
+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_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=585367076dcff78b0f87e50b5c506776
diff --git a/metadata/md5-cache/x11-wm/wmfs-201003 b/metadata/md5-cache/x11-wm/wmfs-201003
index ac20b618443e..f068f579752c 100644
--- a/metadata/md5-cache/x11-wm/wmfs-201003
+++ b/metadata/md5-cache/x11-wm/wmfs-201003
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=media-libs/freetype media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr
 SLOT=0
 SRC_URI=https://github.com/xorg62/wmfs/archive/201003.tar.gz -> wmfs-201003.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c98c963be8a009cfdd36249af3c9b428
diff --git a/metadata/md5-cache/x11-wm/xpra-1.0.9 b/metadata/md5-cache/x11-wm/xpra-1.0.9
index f8cf19d4b53b..946d83d5a941 100644
--- a/metadata/md5-cache/x11-wm/xpra-1.0.9
+++ b/metadata/md5-cache/x11-wm/xpra-1.0.9
@@ -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 ) clipboard? ( || ( server client ) ) cups? ( dbus ) opengl? ( client ) || ( client server ) client? ( enc_x264? ( dec_avcodec2 ) enc_x265? ( dec_avcodec2 ) ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://xpra.org/src/xpra-1.0.9.tar.xz
-_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	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f4bc0ea6345a0f2839c4dca0b390c24b
diff --git a/metadata/md5-cache/x11-wm/xpra-2.1.3 b/metadata/md5-cache/x11-wm/xpra-2.1.3
index 10d2b012ac51..33fdce8fb582 100644
--- a/metadata/md5-cache/x11-wm/xpra-2.1.3
+++ b/metadata/md5-cache/x11-wm/xpra-2.1.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 ) clipboard? ( || ( server client ) ) cups? ( dbus ) opengl? ( client ) || ( client server ) client? ( enc_x264? ( dec_avcodec2 ) enc_x265? ( dec_avcodec2 ) ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://xpra.org/src/xpra-2.1.3.tar.xz
-_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	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3300f4fe4b85fe4cd5b68b4fd8ad36dc
diff --git a/metadata/md5-cache/x11-wm/xpra-2.2.1 b/metadata/md5-cache/x11-wm/xpra-2.2.1
index ed5b86e83247..1fcfe29cd931 100644
--- a/metadata/md5-cache/x11-wm/xpra-2.2.1
+++ b/metadata/md5-cache/x11-wm/xpra-2.2.1
@@ -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 ) clipboard? ( || ( server client ) ) cups? ( dbus ) opengl? ( client ) || ( client server ) client? ( enc_x264? ( dec_avcodec2 ) enc_x265? ( dec_avcodec2 ) ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://xpra.org/src/xpra-2.2.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=091389cb153949ef9174f33c5f3c4933
diff --git a/metadata/md5-cache/x11-wm/xpra-2.2.2 b/metadata/md5-cache/x11-wm/xpra-2.2.2
index ae6b511dd985..1fa931d40de7 100644
--- a/metadata/md5-cache/x11-wm/xpra-2.2.2
+++ b/metadata/md5-cache/x11-wm/xpra-2.2.2
@@ -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 ) clipboard? ( || ( server client ) ) cups? ( dbus ) opengl? ( client ) || ( client server ) client? ( enc_x264? ( dec_avcodec2 ) enc_x265? ( dec_avcodec2 ) ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://xpra.org/src/xpra-2.2.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6e5cbe5807b5db1577e53ea1e3c71a21
diff --git a/metadata/md5-cache/x11-wm/xpra-2.2.6-r1 b/metadata/md5-cache/x11-wm/xpra-2.2.6-r1
index 28d1e93a2817..964e0e333fa4 100644
--- a/metadata/md5-cache/x11-wm/xpra-2.2.6-r1
+++ b/metadata/md5-cache/x11-wm/xpra-2.2.6-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 ) clipboard? ( || ( server client ) ) cups? ( dbus ) opengl? ( client ) || ( client server ) client? ( enc_x264? ( dec_avcodec2 ) enc_x265? ( dec_avcodec2 ) ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://xpra.org/src/xpra-2.2.6.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	8595c9c7530ac3963f3aa0d77aa7e2d8	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=24bbad9cc98dbb9832a2e350e3226137
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index 058d10d81efe..8de2eea12d87 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.0 b/metadata/md5-cache/xfce-base/exo-0.12.0
index a4550f38f034..f3972fd65623 100644
--- a/metadata/md5-cache/xfce-base/exo-0.12.0
+++ b/metadata/md5-cache/xfce-base/exo-0.12.0
@@ -8,5 +8,5 @@ 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.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=80cd6e1209f7f08c0678c08c2d7a584f
diff --git a/metadata/md5-cache/xfce-base/exo-0.12.2 b/metadata/md5-cache/xfce-base/exo-0.12.2
index 363e62e36e7b..35c5c75f52f5 100644
--- a/metadata/md5-cache/xfce-base/exo-0.12.2
+++ b/metadata/md5-cache/xfce-base/exo-0.12.2
@@ -8,5 +8,5 @@ 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.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=71b173ad65bea75cbcb191a8371bf079
diff --git a/metadata/md5-cache/xfce-base/garcon-0.5.0-r2 b/metadata/md5-cache/xfce-base/garcon-0.5.0-r2
index b8b07e077ca8..94330fb3904d 100644
--- a/metadata/md5-cache/xfce-base/garcon-0.5.0-r2
+++ b/metadata/md5-cache/xfce-base/garcon-0.5.0-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2 FDL-1.1
 RDEPEND=>=dev-libs/glib-2.30:= >=x11-libs/gtk+-2.24:2= >=x11-libs/gtk+-3.14:3= >=xfce-base/libxfce4ui-4.11.1:=[gtk3(+)] >=xfce-base/libxfce4util-4.11:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/libs/garcon/0.5/garcon-0.5.0.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	89bb9f083a2590d9b447fd0b78a96186	xfconf	2d8c177734e778123f65326f8d05c3c8
+_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_=cb5a4c72c6bc75917c10518ef50087f5
diff --git a/metadata/md5-cache/xfce-base/garcon-0.6.1 b/metadata/md5-cache/xfce-base/garcon-0.6.1
index 15efbad3677f..4d61fb6b67d9 100644
--- a/metadata/md5-cache/xfce-base/garcon-0.6.1
+++ b/metadata/md5-cache/xfce-base/garcon-0.6.1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/glib-2.30:= gtk2? ( >=x11-libs/gtk+-2.24:2= ) >=x11-libs/gtk+-3.14:3= >=xfce-base/libxfce4ui-4.11.1:=[gtk3(+)] >=xfce-base/libxfce4util-4.11:= dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEPEND=>=dev-libs/glib-2.30:= gtk2? ( >=x11-libs/gtk+-2.24:2= ) >=x11-libs/gtk+-3.14:3= >=xfce-base/libxfce4ui-4.11.1:=[gtk3(+)] >=xfce-base/libxfce4util-4.11:= dev-util/glib-utils dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig
 DESCRIPTION=Xfce's freedesktop.org specification compatible menu implementation library
 EAPI=6
 HOMEPAGE=https://docs.xfce.org/xfce/exo/start
 IUSE=+gtk2
 KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=LGPL-2 FDL-1.1
+LICENSE=LGPL-2+ FDL-1.1+
 RDEPEND=>=dev-libs/glib-2.30:= gtk2? ( >=x11-libs/gtk+-2.24:2= ) >=x11-libs/gtk+-3.14:3= >=xfce-base/libxfce4ui-4.11.1:=[gtk3(+)] >=xfce-base/libxfce4util-4.11:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/garcon/0.6/garcon-0.6.1.tar.bz2
-_md5_=5269b0daa2f40513480a073a85f81762
+_md5_=f6e63d7921e9ffa9e74f0660f24d2fca
diff --git a/metadata/md5-cache/xfce-base/libxfce4ui-4.13.4 b/metadata/md5-cache/xfce-base/libxfce4ui-4.13.4
index 8eb77cdc321c..79ae436e6e52 100644
--- a/metadata/md5-cache/xfce-base/libxfce4ui-4.13.4
+++ b/metadata/md5-cache/xfce-base/libxfce4ui-4.13.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.42:2= >=x11-libs/gtk+-2.24:2= >=x11-libs/gtk+-3.18:3=[
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/libxfce4ui/4.13/libxfce4ui-4.13.4.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=59a93c6ce864e86edb75bbfddb0af3d6
diff --git a/metadata/md5-cache/xfce-base/libxfcegui4-4.10.0-r2 b/metadata/md5-cache/xfce-base/libxfcegui4-4.10.0-r2
index 26d41e7a69d5..dc00a3842f7e 100644
--- a/metadata/md5-cache/xfce-base/libxfcegui4-4.10.0-r2
+++ b/metadata/md5-cache/xfce-base/libxfcegui4-4.10.0-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=gnome-base/libglade x11-libs/libSM x11-libs/libX11 >=x11-libs/gtk+-2.10:2 >=xfce-base/libxfce4util-4.10 startup-notification? ( x11-libs/startup-notification )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/libxfcegui4/4.10/libxfcegui4-4.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=73b6a8265bffbf3b4fab5f0c318ac140
diff --git a/metadata/md5-cache/xfce-base/thunar-1.6.14 b/metadata/md5-cache/xfce-base/thunar-1.6.14
index 261ce50097d6..2931fb822af2 100644
--- a/metadata/md5-cache/xfce-base/thunar-1.6.14
+++ b/metadata/md5-cache/xfce-base/thunar-1.6.14
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30:= >=x11-libs/gdk-pixbuf-2.14:=
 REQUIRED_USE=trash-panel-plugin? ( dbus )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/thunar/1.6/Thunar-1.6.14.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=abbbd83f3b9a7a95375bbb0cdba39167
diff --git a/metadata/md5-cache/xfce-base/thunar-1.6.15 b/metadata/md5-cache/xfce-base/thunar-1.6.15
index dc9edcbd4efd..554adb4213ab 100644
--- a/metadata/md5-cache/xfce-base/thunar-1.6.15
+++ b/metadata/md5-cache/xfce-base/thunar-1.6.15
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30:= >=x11-libs/gdk-pixbuf-2.14:=
 REQUIRED_USE=trash-panel-plugin? ( dbus )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/thunar/1.6/Thunar-1.6.15.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9e41517a0c426ef830c0049f2b626ebc
diff --git a/metadata/md5-cache/xfce-base/thunar-1.7.2 b/metadata/md5-cache/xfce-base/thunar-1.7.2
index 611cae80c9c0..ec28b60583a3 100644
--- a/metadata/md5-cache/xfce-base/thunar-1.7.2
+++ b/metadata/md5-cache/xfce-base/thunar-1.7.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30:= >=x11-libs/gdk-pixbuf-2.14:= >=x11-libs/gtk+-3.22:3= >=xfce-base/exo-0.11:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfconf-4.12:= exif? ( >=media-libs/libexif-0.6.19:= ) introspection? ( dev-libs/gobject-introspection:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( virtual/libgudev:= ) >=dev-util/desktop-file-utils-0.20-r1 x11-misc/shared-mime-info trash-panel-plugin? ( >=gnome-base/gvfs-1.18.3 ) udisks? ( virtual/udev >=gnome-base/gvfs-1.18.3[udisks,udev] )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/thunar/1.7/Thunar-1.7.2.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=78fb0cc52ffd3c2d7d52b57bc842edf2
diff --git a/metadata/md5-cache/xfce-base/thunar-1.8.1 b/metadata/md5-cache/xfce-base/thunar-1.8.1
index b70c9ec8969a..41f93827d267 100644
--- a/metadata/md5-cache/xfce-base/thunar-1.8.1
+++ b/metadata/md5-cache/xfce-base/thunar-1.8.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30:= >=x11-libs/gdk-pixbuf-2.14:= >=x11-libs/gtk+-3.22:3= >=xfce-base/exo-0.12:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfconf-4.12:= exif? ( >=media-libs/libexif-0.6.19:= ) introspection? ( dev-libs/gobject-introspection:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( virtual/libgudev:= ) >=dev-util/desktop-file-utils-0.20-r1 x11-misc/shared-mime-info trash-panel-plugin? ( >=gnome-base/gvfs-1.18.3 ) udisks? ( virtual/udev >=gnome-base/gvfs-1.18.3[udisks,udev] )
 SLOT=0/3
 SRC_URI=https://archive.xfce.org/src/xfce/thunar/1.8/Thunar-1.8.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9030e464e68ed3b767e798cb703a6fed
diff --git a/metadata/md5-cache/xfce-base/thunar-1.8.2 b/metadata/md5-cache/xfce-base/thunar-1.8.2
new file mode 100644
index 000000000000..a6b3767e67e4
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/thunar-1.8.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm test
+DEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30:= >=x11-libs/gdk-pixbuf-2.14:= >=x11-libs/gtk+-3.22:3= >=xfce-base/exo-0.12:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfconf-4.12:= exif? ( >=media-libs/libexif-0.6.19:= ) introspection? ( dev-libs/gobject-introspection:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( virtual/libgudev:= ) dev-util/intltool sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=File manager for the Xfce desktop environment
+EAPI=6
+HOMEPAGE=https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start
+IUSE=exif introspection libnotify pcre test +trash-panel-plugin udisks test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2 LGPL-2
+RDEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30:= >=x11-libs/gdk-pixbuf-2.14:= >=x11-libs/gtk+-3.22:3= >=xfce-base/exo-0.12:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfconf-4.12:= exif? ( >=media-libs/libexif-0.6.19:= ) introspection? ( dev-libs/gobject-introspection:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( virtual/libgudev:= ) >=dev-util/desktop-file-utils-0.20-r1 x11-misc/shared-mime-info trash-panel-plugin? ( >=gnome-base/gvfs-1.18.3 ) udisks? ( virtual/udev >=gnome-base/gvfs-1.18.3[udisks,udev] )
+SLOT=0/3
+SRC_URI=https://archive.xfce.org/src/xfce/thunar/1.8/Thunar-1.8.2.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	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=9030e464e68ed3b767e798cb703a6fed
diff --git a/metadata/md5-cache/xfce-base/xfce4-appfinder-4.12.0-r1 b/metadata/md5-cache/xfce-base/xfce4-appfinder-4.12.0-r1
index eef5186ae656..43c5026aa10a 100644
--- a/metadata/md5-cache/xfce-base/xfce4-appfinder-4.12.0-r1
+++ b/metadata/md5-cache/xfce-base/xfce4-appfinder-4.12.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.30:= >=x11-libs/gtk+-3.2:3= >=xfce-base/garcon-0.3:= >=xfce-base/libxfce4util-4.11:= >=xfce-base/libxfce4ui-4.11:=[gtk3(+)] >=xfce-base/xfconf-4.10:= !xfce-base/xfce-utils
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-appfinder/4.12/xfce4-appfinder-4.12.0.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	89bb9f083a2590d9b447fd0b78a96186	xfconf	2d8c177734e778123f65326f8d05c3c8
+_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_=3fee837eb6317b9eff43b06542e6b9c6
diff --git a/metadata/md5-cache/xfce-base/xfce4-panel-4.12.2 b/metadata/md5-cache/xfce-base/xfce4-panel-4.12.2
index 9950c7efbaae..d9ba26831e10 100644
--- a/metadata/md5-cache/xfce-base/xfce4-panel-4.12.2
+++ b/metadata/md5-cache/xfce-base/xfce4-panel-4.12.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.24:= >=x11-libs/cairo-1:= >=x11-libs/gtk+-2.20:2= >=x11-libs/gtk+-3.2:3= x11-libs/libX11:= >=x11-libs/libwnck-2.31:1= >=xfce-base/exo-0.8:= >=xfce-base/garcon-0.3:=[gtk2(+)] >=xfce-base/libxfce4ui-4.11:= >=xfce-base/libxfce4util-4.11:= >=xfce-base/xfconf-4.10:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-panel/4.12/xfce4-panel-4.12.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2a00364e7029266ed42414e04db38a01
diff --git a/metadata/md5-cache/xfce-base/xfce4-panel-4.13.2 b/metadata/md5-cache/xfce-base/xfce4-panel-4.13.2
index 07a53f674d8d..a5b05cbe3719 100644
--- a/metadata/md5-cache/xfce-base/xfce4-panel-4.13.2
+++ b/metadata/md5-cache/xfce-base/xfce4-panel-4.13.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.24:= >=x11-libs/cairo-1:= >=x11-libs/gtk+-2.20:2= >=x11-libs/gtk+-3.16:3=[introspection?] x11-libs/libX11:= x11-libs/libwnck:3= >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-0.5:= >=xfce-base/libxfce4ui-4.13:= >=xfce-base/libxfce4util-4.13:=[introspection?] >=xfce-base/xfconf-4.13:= introspection? ( dev-libs/gobject-introspection:= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-panel/4.13/xfce4-panel-4.13.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=30b634d69225c73020738002dfffdb94
diff --git a/metadata/md5-cache/xfce-base/xfce4-panel-4.13.3 b/metadata/md5-cache/xfce-base/xfce4-panel-4.13.3
index ac0f4c227246..1c6af0f473ad 100644
--- a/metadata/md5-cache/xfce-base/xfce4-panel-4.13.3
+++ b/metadata/md5-cache/xfce-base/xfce4-panel-4.13.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.24:= >=x11-libs/cairo-1:= >=x11-libs/gtk+-2.20:2= >=x11-libs/gtk+-3.16:3=[introspection?] x11-libs/libX11:= x11-libs/libwnck:3= >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-0.5:= >=xfce-base/libxfce4ui-4.13:= >=xfce-base/libxfce4util-4.13:=[introspection?] >=xfce-base/xfconf-4.13:= introspection? ( dev-libs/gobject-introspection:= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-panel/4.13/xfce4-panel-4.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b56fa3f31b08fe3f73fb9a8d72dd21bb
diff --git a/metadata/md5-cache/xfce-base/xfce4-session-4.12.1-r1 b/metadata/md5-cache/xfce-base/xfce4-session-4.12.1-r1
index 5c666c394be3..86c214d6beed 100644
--- a/metadata/md5-cache/xfce-base/xfce4-session-4.12.1-r1
+++ b/metadata/md5-cache/xfce-base/xfce4-session-4.12.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/dbus-glib-0.100:= x11-apps/iceauth x11-libs/libSM:= >=x11-lib
 REQUIRED_USE=systemd? ( policykit )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-session/4.12/xfce4-session-4.12.1.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	89bb9f083a2590d9b447fd0b78a96186	xfconf	2d8c177734e778123f65326f8d05c3c8
+_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_=109ab3a01c802596f207061b5f0f56a6
diff --git a/metadata/md5-cache/xfce-base/xfce4-session-4.12.1-r2 b/metadata/md5-cache/xfce-base/xfce4-session-4.12.1-r2
index c941ad1e1b21..74c5b38d761e 100644
--- a/metadata/md5-cache/xfce-base/xfce4-session-4.12.1-r2
+++ b/metadata/md5-cache/xfce-base/xfce4-session-4.12.1-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/dbus-glib-0.100:= x11-apps/iceauth x11-libs/libSM:= >=x11-lib
 REQUIRED_USE=systemd? ( policykit )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-session/4.12/xfce4-session-4.12.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=a8c86a0be538859681bc82d0001f3c1c
diff --git a/metadata/md5-cache/xfce-base/xfce4-session-4.13.0-r1 b/metadata/md5-cache/xfce-base/xfce4-session-4.13.0-r1
index 6e3a49585610..5bbdfd91d858 100644
--- a/metadata/md5-cache/xfce-base/xfce4-session-4.13.0-r1
+++ b/metadata/md5-cache/xfce-base/xfce4-session-4.13.0-r1
@@ -10,5 +10,5 @@ RDEPEND=x11-apps/iceauth x11-libs/gtk+:3= x11-libs/libSM:= x11-libs/libwnck:3= x
 REQUIRED_USE=systemd? ( policykit )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-session/4.13/xfce4-session-4.13.0.tar.bz2
-_eclasses_=desktop	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=738d288ef875d0c89a388368477fdc52
diff --git a/metadata/md5-cache/xfce-base/xfce4-session-4.13.1 b/metadata/md5-cache/xfce-base/xfce4-session-4.13.1
index ff8488af8da0..6c390049b1de 100644
--- a/metadata/md5-cache/xfce-base/xfce4-session-4.13.1
+++ b/metadata/md5-cache/xfce-base/xfce4-session-4.13.1
@@ -10,5 +10,5 @@ RDEPEND=x11-apps/iceauth >=x11-libs/gtk+-3.20:3= x11-libs/libSM:= x11-libs/libwn
 REQUIRED_USE=systemd? ( policykit )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-session/4.13/xfce4-session-4.13.1.tar.bz2
-_eclasses_=desktop	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	89bb9f083a2590d9b447fd0b78a96186
-_md5_=77e1c285e9927270ab0d6b752b5243aa
+_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_=06c80374366db1534d484c2406d1868c
diff --git a/metadata/md5-cache/xfce-base/xfce4-settings-4.12.3 b/metadata/md5-cache/xfce-base/xfce4-settings-4.12.3
index 4141a845b1dc..511f8a5b6ee1 100644
--- a/metadata/md5-cache/xfce-base/xfce4-settings-4.12.3
+++ b/metadata/md5-cache/xfce-base/xfce4-settings-4.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.24 media-libs/fontconfig >=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2 >=xfce-base/exo-0.8 >=xfce-base/libxfce4ui-4.11 >=xfce-base/libxfce4util-4.11 >=xfce-base/xfconf-4.10 libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) ) xklavier? ( >=x11-libs/libxklavier-5 )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-settings/4.12/xfce4-settings-4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=287c1e4dc318745168d0e72c86cd12f2
diff --git a/metadata/md5-cache/xfce-base/xfce4-settings-4.12.4 b/metadata/md5-cache/xfce-base/xfce4-settings-4.12.4
index 5782085b75bd..a60680292699 100644
--- a/metadata/md5-cache/xfce-base/xfce4-settings-4.12.4
+++ b/metadata/md5-cache/xfce-base/xfce4-settings-4.12.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.24 media-libs/fontconfig >=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2 >=xfce-base/exo-0.8 >=xfce-base/libxfce4ui-4.11 >=xfce-base/libxfce4util-4.11 >=xfce-base/xfconf-4.10 libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) ) xklavier? ( >=x11-libs/libxklavier-5 )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-settings/4.12/xfce4-settings-4.12.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1c6a5ce1974620cc44b7b3cd7f8cced7
diff --git a/metadata/md5-cache/xfce-base/xfce4-settings-4.13.4 b/metadata/md5-cache/xfce-base/xfce4-settings-4.13.4
index 3de179508b00..3dd9749b0f22 100644
--- a/metadata/md5-cache/xfce-base/xfce4-settings-4.13.4
+++ b/metadata/md5-cache/xfce-base/xfce4-settings-4.13.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.24 media-libs/fontconfig x11-libs/gtk+:3 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2 >=xfce-base/exo-0.11 >=xfce-base/libxfce4ui-4.12 >=xfce-base/libxfce4util-4.12 >=xfce-base/xfconf-4.13 libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) ) xklavier? ( >=x11-libs/libxklavier-5 )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-settings/4.13/xfce4-settings-4.13.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ffdc5a2d4d2100e50da6fe6893a83b71
diff --git a/metadata/md5-cache/xfce-base/xfce4-settings-4.13.5 b/metadata/md5-cache/xfce-base/xfce4-settings-4.13.5
new file mode 100644
index 000000000000..002039ed59f3
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/xfce4-settings-4.13.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure postinst postrm
+DEPEND=>=dev-libs/glib-2.24 media-libs/fontconfig x11-libs/gtk+:3 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2 >=xfce-base/exo-0.11 >=xfce-base/libxfce4ui-4.12 >=xfce-base/libxfce4util-4.12 >=xfce-base/xfconf-4.13 libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) ) xklavier? ( >=x11-libs/libxklavier-5 ) dev-util/gdbus-codegen dev-util/intltool virtual/pkgconfig sys-devel/gettext x11-base/xorg-proto >=sys-apps/sed-4
+DESCRIPTION=Configuration system for the Xfce desktop environment
+EAPI=6
+HOMEPAGE=https://www.xfce.org/projects/
+IUSE=input_devices_libinput libcanberra libnotify upower +xklavier
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.24 media-libs/fontconfig x11-libs/gtk+:3 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2 >=xfce-base/exo-0.11 >=xfce-base/libxfce4ui-4.12 >=xfce-base/libxfce4util-4.12 >=xfce-base/xfconf-4.13 libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) ) xklavier? ( >=x11-libs/libxklavier-5 )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/xfce4-settings/4.13/xfce4-settings-4.13.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_=ffdc5a2d4d2100e50da6fe6893a83b71
diff --git a/metadata/md5-cache/xfce-base/xfconf-4.12.1 b/metadata/md5-cache/xfce-base/xfconf-4.12.1
index 4bf8ffab8e55..1070739b13c7 100644
--- a/metadata/md5-cache/xfce-base/xfconf-4.12.1
+++ b/metadata/md5-cache/xfce-base/xfconf-4.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.30 >=xfce-base/libxfce4util-4.10 perl? ( dev-lang/perl:=[-build(-)] dev-perl/glib-perl )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfconf/4.12/xfconf-4.12.1.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	89bb9f083a2590d9b447fd0b78a96186	xfconf	2d8c177734e778123f65326f8d05c3c8
+_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_=e930430f8c378509e8283404fb9f904a
diff --git a/metadata/md5-cache/xfce-base/xfconf-4.12.1-r1 b/metadata/md5-cache/xfce-base/xfconf-4.12.1-r1
index ab600df704cf..d704f6c1ed21 100644
--- a/metadata/md5-cache/xfce-base/xfconf-4.12.1-r1
+++ b/metadata/md5-cache/xfce-base/xfconf-4.12.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.30 >=xfce-base/libxfce4util-4.10 perl? ( dev-lang/perl:=[-build(-)] dev-perl/glib-perl )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfconf/4.12/xfconf-4.12.1.tar.bz2
-_eclasses_=virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6c60b094945593a4d4f1ef89daad03bb
diff --git a/metadata/md5-cache/xfce-base/xfconf-4.13.4 b/metadata/md5-cache/xfce-base/xfconf-4.13.4
index 22a587f7e452..5f099a658cbd 100644
--- a/metadata/md5-cache/xfce-base/xfconf-4.13.4
+++ b/metadata/md5-cache/xfce-base/xfconf-4.13.4
@@ -9,5 +9,5 @@ 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.4.tar.bz2
-_eclasses_=virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=31fa095b32676c98a10fe02bde43a1dc
diff --git a/metadata/md5-cache/xfce-base/xfconf-4.13.5 b/metadata/md5-cache/xfce-base/xfconf-4.13.5
index 9d4f2279978e..36484946a0f1 100644
--- a/metadata/md5-cache/xfce-base/xfconf-4.13.5
+++ b/metadata/md5-cache/xfce-base/xfconf-4.13.5
@@ -9,5 +9,5 @@ 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.5.tar.bz2
-_eclasses_=virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=31fa095b32676c98a10fe02bde43a1dc
diff --git a/metadata/md5-cache/xfce-base/xfdesktop-4.12.4 b/metadata/md5-cache/xfce-base/xfdesktop-4.12.4
index c3f31b0cfab9..7d82afbd9b34 100644
--- a/metadata/md5-cache/xfce-base/xfdesktop-4.12.4
+++ b/metadata/md5-cache/xfce-base/xfdesktop-4.12.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/cairo-1.6:= >=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-2.24:2= >=x11-libs/libwnck-2.30:1= x11-libs/libX11:= >=xfce-base/exo-0.8:= >=xfce-base/garcon-0.3:= >=xfce-base/libxfce4ui-4.11:= >=xfce-base/libxfce4util-4.11:= >=xfce-base/xfconf-4.10:= libnotify? ( >=x11-libs/libnotify-0.7:= ) thunar? ( >=dev-libs/glib-2.38:= =xfce-base/thunar-1.6*:=[dbus] )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfdesktop/4.12/xfdesktop-4.12.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b5be6a63fe6c85f4445475935d3d715a
diff --git a/metadata/md5-cache/xfce-base/xfdesktop-4.13.1 b/metadata/md5-cache/xfce-base/xfdesktop-4.13.1
index 817abc69e8f6..67c2625df45a 100644
--- a/metadata/md5-cache/xfce-base/xfdesktop-4.13.1
+++ b/metadata/md5-cache/xfce-base/xfdesktop-4.13.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/cairo-1.12:= >=dev-libs/glib-2.42:= >=x11-libs/gtk+-3.20:3= >=x11-libs/libwnck-3.14:3= x11-libs/libX11:= >=xfce-base/exo-0.11:= >=xfce-base/garcon-0.6:= >=xfce-base/libxfce4ui-4.13:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfconf-4.12.1:= libnotify? ( >=x11-libs/libnotify-0.7:= ) thunar? ( >=dev-libs/glib-2.38:= =xfce-base/thunar-1.6*:=[dbus] )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfdesktop/4.13/xfdesktop-4.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1b10d1a18aa0fac6efcc39ae2f3415c0
diff --git a/metadata/md5-cache/xfce-base/xfdesktop-4.13.2 b/metadata/md5-cache/xfce-base/xfdesktop-4.13.2
index a1d6fde876de..c9f4f6ddd340 100644
--- a/metadata/md5-cache/xfce-base/xfdesktop-4.13.2
+++ b/metadata/md5-cache/xfce-base/xfdesktop-4.13.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/cairo-1.12:= >=dev-libs/glib-2.42:= >=x11-libs/gtk+-3.20:3= >=x11-libs/libwnck-3.14:3= x11-libs/libX11:= >=xfce-base/exo-0.11:= >=xfce-base/garcon-0.6:= >=xfce-base/libxfce4ui-4.13:= >=xfce-base/libxfce4util-4.13:= >=xfce-base/xfconf-4.12.1:= libnotify? ( >=x11-libs/libnotify-0.7:= ) thunar? ( >=dev-libs/glib-2.38:= >=xfce-base/thunar-1.7:= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfdesktop/4.13/xfdesktop-4.13.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3e8f529c257ee546d8abf3c1326ff71d
diff --git a/metadata/md5-cache/xfce-base/xfwm4-4.13.0-r1 b/metadata/md5-cache/xfce-base/xfwm4-4.13.0-r1
index b016ecac603c..81b0e650e679 100644
--- a/metadata/md5-cache/xfce-base/xfwm4-4.13.0-r1
+++ b/metadata/md5-cache/xfce-base/xfwm4-4.13.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/dbus-glib:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-2.24:2= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/pango:= >=x11-libs/libwnck-2.30:1= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.11:= >=xfce-base/xfconf-4.10:= opengl? ( media-libs/libepoxy:=[X(+)] ) startup-notification? ( x11-libs/startup-notification:= ) xpresent? ( x11-libs/libXpresent ) xcomposite? ( x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXfixes:= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfwm4/4.13/xfwm4-4.13.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c4ec5d2ce58c872bedb003da61065d57
diff --git a/metadata/md5-cache/xfce-base/xfwm4-4.13.1 b/metadata/md5-cache/xfce-base/xfwm4-4.13.1
index e192211ae241..392f5bcb93eb 100644
--- a/metadata/md5-cache/xfce-base/xfwm4-4.13.1
+++ b/metadata/md5-cache/xfce-base/xfwm4-4.13.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/dbus-glib:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-3.20:3= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/pango:= >=x11-libs/libwnck-3.14:3= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/xfconf-4.13:= opengl? ( media-libs/libepoxy:=[X(+)] ) startup-notification? ( x11-libs/startup-notification:= ) xpresent? ( x11-libs/libXpresent ) xcomposite? ( x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXfixes:= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfwm4/4.13/xfwm4-4.13.1.tar.bz2
-_eclasses_=desktop	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=9a71801b3b00c9b87ac5b4ff26306cc2
diff --git a/metadata/md5-cache/xfce-base/xfwm4-4.13.1-r1 b/metadata/md5-cache/xfce-base/xfwm4-4.13.1-r1
index d7e836a5683d..cd4ab7cd6e2a 100644
--- a/metadata/md5-cache/xfce-base/xfwm4-4.13.1-r1
+++ b/metadata/md5-cache/xfce-base/xfwm4-4.13.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/dbus-glib:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-3.20:3= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/pango:= >=x11-libs/libwnck-3.14:3= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/xfconf-4.13:= opengl? ( media-libs/libepoxy:=[X(+)] ) startup-notification? ( x11-libs/startup-notification:= ) xpresent? ( x11-libs/libXpresent ) xcomposite? ( x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXfixes:= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfwm4/4.13/xfwm4-4.13.1.tar.bz2 https://dev.gentoo.org/~mgorny/dist/xfwm4-4.13.1-patchset.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1517b7928a11cabc0a08e9f5db6fdf0a
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index 776311c43ca7..cff6c149e6bb 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/eatmonkey-0.1.4-r1 b/metadata/md5-cache/xfce-extra/eatmonkey-0.1.4-r1
index 5cbed9043e19..0ffb2b4039d6 100644
--- a/metadata/md5-cache/xfce-extra/eatmonkey-0.1.4-r1
+++ b/metadata/md5-cache/xfce-extra/eatmonkey-0.1.4-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=x11-libs/gtk+-2.12:2 dev-libs/libunique:1 >=xfce-base/libxfce4util-4.8 >=net-libs/libsoup-2.26:2.4 >=net-misc/aria2-1.9.0[bittorrent,xmlrpc] dev-lang/ruby dev-ruby/ruby-glib2 dev-ruby/ruby-gtk2
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/eatmonkey/0.1/eatmonkey-0.1.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=84785e230074f461410879aa86ed4884
diff --git a/metadata/md5-cache/xfce-extra/thunar-archive-plugin-0.3.1-r3 b/metadata/md5-cache/xfce-extra/thunar-archive-plugin-0.3.1-r3
index 480c75320a6b..9c09f7f8ea3a 100644
--- a/metadata/md5-cache/xfce-extra/thunar-archive-plugin-0.3.1-r3
+++ b/metadata/md5-cache/xfce-extra/thunar-archive-plugin-0.3.1-r3
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=>=xfce-base/libxfce4util-4.8:= >=xfce-base/exo-0.6:= <xfce-base/thunar-1.7:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/thunar-plugins/thunar-archive-plugin/0.3/thunar-archive-plugin-0.3.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8aaae8f1305bb3a395ea245f22aa4f7f
diff --git a/metadata/md5-cache/xfce-extra/thunar-archive-plugin-0.4.0 b/metadata/md5-cache/xfce-extra/thunar-archive-plugin-0.4.0
index ab8a4bb2f894..af9edb9c7fa7 100644
--- a/metadata/md5-cache/xfce-extra/thunar-archive-plugin-0.4.0
+++ b/metadata/md5-cache/xfce-extra/thunar-archive-plugin-0.4.0
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=>=xfce-base/libxfce4util-4.12:= >=xfce-base/exo-0.10:= >=xfce-base/thunar-1.7:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/thunar-plugins/thunar-archive-plugin/0.4/thunar-archive-plugin-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0612d7c6ba3a016cdb4a0ee478539d6e
diff --git a/metadata/md5-cache/xfce-extra/thunar-shares-plugin-0.2.0_p20101105 b/metadata/md5-cache/xfce-extra/thunar-shares-plugin-0.2.0_p20101105
index 113f15bc90ac..c71a724058dc 100644
--- a/metadata/md5-cache/xfce-extra/thunar-shares-plugin-0.2.0_p20101105
+++ b/metadata/md5-cache/xfce-extra/thunar-shares-plugin-0.2.0_p20101105
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.18 >=x11-libs/gtk+-2.12:2 <xfce-base/thunar-1.7
 SLOT=0
 SRC_URI=mirror://gentoo/thunar-shares-plugin-0.2.0_p20101105.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	89bb9f083a2590d9b447fd0b78a96186	xfconf	2d8c177734e778123f65326f8d05c3c8
+_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_=278c001cfd2bbc7db58b18f7afd483f7
diff --git a/metadata/md5-cache/xfce-extra/thunar-vcs-plugin-0.1.5-r1 b/metadata/md5-cache/xfce-extra/thunar-vcs-plugin-0.1.5-r1
index 1cb4d906da7a..256985622b08 100644
--- a/metadata/md5-cache/xfce-extra/thunar-vcs-plugin-0.1.5-r1
+++ b/metadata/md5-cache/xfce-extra/thunar-vcs-plugin-0.1.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.18:2= >=x11-libs/gtk+-2.14:2= >=xfce-base/exo-0.6:= >=xfce-base/libxfce4util-4.8:= <xfce-base/thunar-1.7:= git? ( dev-vcs/git ) subversion? ( >=dev-libs/apr-0.9.7:= >=dev-vcs/subversion-1.5:= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/thunar-plugins/thunar-vcs-plugin/0.1/thunar-vcs-plugin-0.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=544b6f00d9df2d04ceec9f413f8affdd
diff --git a/metadata/md5-cache/xfce-extra/thunar-vcs-plugin-0.1.90 b/metadata/md5-cache/xfce-extra/thunar-vcs-plugin-0.1.90
index 5849665cc779..e97329480cbb 100644
--- a/metadata/md5-cache/xfce-extra/thunar-vcs-plugin-0.1.90
+++ b/metadata/md5-cache/xfce-extra/thunar-vcs-plugin-0.1.90
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.32:2= >=x11-libs/gtk+-3.20:3= >=xfce-base/exo-0.11.4:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/thunar-1.7:= git? ( dev-vcs/git ) subversion? ( >=dev-libs/apr-0.9.7:= >=dev-vcs/subversion-1.5:= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/thunar-plugins/thunar-vcs-plugin/0.1/thunar-vcs-plugin-0.1.90.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=b4aca8c819baf25981ea18b51b761e77
diff --git a/metadata/md5-cache/xfce-extra/thunar-vcs-plugin-0.2.0 b/metadata/md5-cache/xfce-extra/thunar-vcs-plugin-0.2.0
index 7ca5cb64b2e7..69729fd3c7f0 100644
--- a/metadata/md5-cache/xfce-extra/thunar-vcs-plugin-0.2.0
+++ b/metadata/md5-cache/xfce-extra/thunar-vcs-plugin-0.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.32:2= >=x11-libs/gtk+-3.20:3= >=xfce-base/exo-0.11.4:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/thunar-1.7:= git? ( dev-vcs/git ) subversion? ( >=dev-libs/apr-0.9.7:= >=dev-vcs/subversion-1.5:= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/thunar-plugins/thunar-vcs-plugin/0.2/thunar-vcs-plugin-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1742d32ef167116fc5919eb51f6312b4
diff --git a/metadata/md5-cache/xfce-extra/thunar-volman-0.8.1-r1 b/metadata/md5-cache/xfce-extra/thunar-volman-0.8.1-r1
index 2f3672952f8d..b40408335ce0 100644
--- a/metadata/md5-cache/xfce-extra/thunar-volman-0.8.1-r1
+++ b/metadata/md5-cache/xfce-extra/thunar-volman-0.8.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.30 virtual/libgudev:= >=x11-libs/gtk+-2.24:2 >=xfce-base/exo-0.10 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfconf-4.10 libnotify? ( >=x11-libs/libnotify-0.7 ) virtual/udev >=xfce-base/thunar-1.6[udisks]
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/thunar-volman/0.8/thunar-volman-0.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f137017b402770f517deb8f9214ad344
diff --git a/metadata/md5-cache/xfce-extra/thunar-volman-0.9.0 b/metadata/md5-cache/xfce-extra/thunar-volman-0.9.0
index 515eea02512d..fa6ac2665d5b 100644
--- a/metadata/md5-cache/xfce-extra/thunar-volman-0.9.0
+++ b/metadata/md5-cache/xfce-extra/thunar-volman-0.9.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.30:= virtual/libgudev:= >=x11-libs/gtk+-3.20:3= >=xfce-base/exo-0.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfconf-4.12:= libnotify? ( >=x11-libs/libnotify-0.7:= ) virtual/udev >=xfce-base/thunar-1.6[udisks]
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/thunar-volman/0.9/thunar-volman-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1674e1ebab7973d96cc40e65e5c78d35
diff --git a/metadata/md5-cache/xfce-extra/transd-0_p20120503 b/metadata/md5-cache/xfce-extra/transd-0_p20120503
index 3b1e45bc1029..2b428115cc68 100644
--- a/metadata/md5-cache/xfce-extra/transd-0_p20120503
+++ b/metadata/md5-cache/xfce-extra/transd-0_p20120503
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/libX11 >=xfce-base/libxfce4util-4.8
 SLOT=0
 SRC_URI=mirror://gentoo/transd-0_p20120503.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	89bb9f083a2590d9b447fd0b78a96186	xfconf	2d8c177734e778123f65326f8d05c3c8
+_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_=cd058dc8402c1e7e99bd75d0b92cba01
diff --git a/metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.1.0 b/metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.1.0
index eb6f37632e94..f0fc1973e617 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.1.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=dev-libs/glib-2.24:2= >=x11-libs/gtk+-3.14:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.8:= >=xfce-base/xfce4-panel-4.12:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-battery-plugin/1.1/xfce4-battery-plugin-1.1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dc391ae2e7b762824a9f4598ce8cc70a
diff --git a/metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.1.1 b/metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.1.1
index ad0871460ef9..99865cd36fc2 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.1.1
+++ b/metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=dev-libs/glib-2.24:2= >=x11-libs/gtk+-3.16:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.8:= >=xfce-base/xfce4-panel-4.12:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-battery-plugin/1.1/xfce4-battery-plugin-1.1.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=158e5c4d931d0b14a00a0f809e142846
diff --git a/metadata/md5-cache/xfce-extra/xfce4-cellmodem-plugin-0.0.5 b/metadata/md5-cache/xfce-extra/xfce4-cellmodem-plugin-0.0.5
index ffafe2b08b62..b62e2506a5b4 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-cellmodem-plugin-0.0.5
+++ b/metadata/md5-cache/xfce-extra/xfce4-cellmodem-plugin-0.0.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/pciutils virtual/libusb:0 >=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-cellmodem-plugin/0.0/xfce4-cellmodem-plugin-0.0.5.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	89bb9f083a2590d9b447fd0b78a96186	xfconf	2d8c177734e778123f65326f8d05c3c8
+_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_=939a5f9ad8a83647d6153bc07aa5ca01
diff --git a/metadata/md5-cache/xfce-extra/xfce4-clipman-plugin-1.4.2-r1 b/metadata/md5-cache/xfce-extra/xfce4-clipman-plugin-1.4.2-r1
index 04bed274fb36..8d7d2558e1f6 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-clipman-plugin-1.4.2-r1
+++ b/metadata/md5-cache/xfce-extra/xfce4-clipman-plugin-1.4.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.32:2= >=x11-libs/gtk+-3.14:3= x11-libs/libXtst:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.10:= qrcode? ( >=media-gfx/qrencode-3.3.0:= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-clipman-plugin/1.4/xfce4-clipman-plugin-1.4.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5c732d13139a8e5a9fe8423a3e084c6d
diff --git a/metadata/md5-cache/xfce-extra/xfce4-composite-editor-0 b/metadata/md5-cache/xfce-extra/xfce4-composite-editor-0
index e69e16205a5e..304db6b7bac1 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-composite-editor-0
+++ b/metadata/md5-cache/xfce-extra/xfce4-composite-editor-0
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=app-shells/bash:* >=x11-misc/gtkdialog-0.8
 SLOT=0
 SRC_URI=http://keithhedger.hostingsiteforfree.com/zips/Xfce4-Composite-Editor.tar.gz -> Xfce4-Composite-Editor-0.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	89bb9f083a2590d9b447fd0b78a96186	xfconf	2d8c177734e778123f65326f8d05c3c8
+_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_=9ec5dd0fe310debce9be9e65ae3d8ca0
diff --git a/metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.1.3 b/metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.1.3
index 3013975a5154..c21e5a3d7453 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.1.3
+++ b/metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.1.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.20:= >=x11-libs/gtk+-2.14:2= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-cpufreq-plugin/1.1/xfce4-cpufreq-plugin-1.1.3.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	89bb9f083a2590d9b447fd0b78a96186	xfconf	2d8c177734e778123f65326f8d05c3c8
+_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_=8f7b15168ac232f1216af478d35345ba
diff --git a/metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.2.0 b/metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.2.0
index 2b667fa4b24c..0460db6a11c1 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.2.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.2.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.20:= >=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-cpufreq-plugin/1.2/xfce4-cpufreq-plugin-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=782abd7d8fc64e9e421c5c722a3b2972
diff --git a/metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.2.1 b/metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.2.1
index ec1c1343045b..3aecfef45022 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.2.1
+++ b/metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.2.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.20:= >=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-cpufreq-plugin/1.2/xfce4-cpufreq-plugin-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=15bb4f079de5e56668c78140d88a8872
diff --git a/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.0.5 b/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.0.5
index bf6e2524b60e..1fdc8d2e2bed 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.0.5
+++ b/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.0.5
@@ -9,5 +9,5 @@ LICENSE=BSD-2 GPL-2
 RDEPEND=>=x11-libs/gtk+-2.12:2 >=xfce-base/libxfce4ui-4.8 >=xfce-base/xfce4-panel-4.8
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/1.0/xfce4-cpugraph-plugin-1.0.5.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	89bb9f083a2590d9b447fd0b78a96186	xfconf	2d8c177734e778123f65326f8d05c3c8
+_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_=9ad831a1ebe88c6e3824cdcfa73436db
diff --git a/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.0.5-r1 b/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.0.5-r1
index 50f5d82c009f..59a1a0ea47b8 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.0.5-r1
+++ b/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.0.5-r1
@@ -8,5 +8,5 @@ LICENSE=BSD-2 GPL-2
 RDEPEND=>=x11-libs/gtk+-2.12:2 >=xfce-base/libxfce4ui-4.8 >=xfce-base/xfce4-panel-4.8
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/1.0/xfce4-cpugraph-plugin-1.0.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0b74a3a21f7fe47a0e2fc690af338fd6
diff --git a/metadata/md5-cache/xfce-extra/xfce4-datetime-plugin-0.7.0 b/metadata/md5-cache/xfce-extra/xfce4-datetime-plugin-0.7.0
index 8f6ff792e9ef..190a8bb46782 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-datetime-plugin-0.7.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-datetime-plugin-0.7.0
@@ -8,5 +8,5 @@ LICENSE=GPL-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-datetime-plugin/0.7/xfce4-datetime-plugin-0.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=5ca2564a8a62aaeb5cf18ed00eab7d96
diff --git a/metadata/md5-cache/xfce-extra/xfce4-dict-0.8.0 b/metadata/md5-cache/xfce-extra/xfce4-dict-0.8.0
index cf1ba233d026..26c120feb151 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-dict-0.8.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-dict-0.8.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.24:= >=x11-libs/gtk+-3.20:3= x11-libs/libX11:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/xfce4-panel-4.10:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfce4-dict/0.8/xfce4-dict-0.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cf5ad24ed36a0018dd3696328415ed72
diff --git a/metadata/md5-cache/xfce-extra/xfce4-dict-0.8.1 b/metadata/md5-cache/xfce-extra/xfce4-dict-0.8.1
index a299a66233dc..4cab566aa259 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-dict-0.8.1
+++ b/metadata/md5-cache/xfce-extra/xfce4-dict-0.8.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.24:= >=x11-libs/gtk+-3.22:3= x11-libs/libX11:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/xfce4-panel-4.10:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfce4-dict/0.8/xfce4-dict-0.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cdaf1e8b4cc000e27768592c13f28b69
diff --git a/metadata/md5-cache/xfce-extra/xfce4-diskperf-plugin-2.6.1 b/metadata/md5-cache/xfce-extra/xfce4-diskperf-plugin-2.6.1
index c15542e63366..368b3edb8a9c 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-diskperf-plugin-2.6.1
+++ b/metadata/md5-cache/xfce-extra/xfce4-diskperf-plugin-2.6.1
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3da940f022bcefc1ee58ab552985967c
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 5d7805ff9ac3..3973406a4006 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
@@ -8,5 +8,5 @@ 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/xfce-extra/xfce4-embed-plugin-1.6.0 b/metadata/md5-cache/xfce-extra/xfce4-embed-plugin-1.6.0
index e1c2b1aa0563..0f1b25588403 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-embed-plugin-1.6.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-embed-plugin-1.6.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=x11-libs/gtk+-2.20:2= x11-libs/libX11:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-embed-plugin/1.6/xfce4-embed-plugin-1.6.0.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	89bb9f083a2590d9b447fd0b78a96186	xfconf	2d8c177734e778123f65326f8d05c3c8
+_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_=5c5d53ab0e62e9ff7ee4dcecc1d901fd
diff --git a/metadata/md5-cache/xfce-extra/xfce4-equake-plugin-1.3.8.1 b/metadata/md5-cache/xfce-extra/xfce4-equake-plugin-1.3.8.1
index daffd03d4fe2..0fc9e082a4b3 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-equake-plugin-1.3.8.1
+++ b/metadata/md5-cache/xfce-extra/xfce4-equake-plugin-1.3.8.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2:= x11-libs/gtk+:2= x11-libs/libX11:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-equake-plugin/1.3/xfce4-equake-plugin-1.3.8.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8a9562d2be7c4598ed98ec5d935d8454
diff --git a/metadata/md5-cache/xfce-extra/xfce4-eyes-plugin-4.4.5 b/metadata/md5-cache/xfce-extra/xfce4-eyes-plugin-4.4.5
index 041cbb463af3..12a346f44318 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-eyes-plugin-4.4.5
+++ b/metadata/md5-cache/xfce-extra/xfce4-eyes-plugin-4.4.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.20:= >=x11-libs/gtk+-2.14:2= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-eyes-plugin/4.4/xfce4-eyes-plugin-4.4.5.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	89bb9f083a2590d9b447fd0b78a96186	xfconf	2d8c177734e778123f65326f8d05c3c8
+_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_=165974b30dbda719f18c15edb8cb4679
diff --git a/metadata/md5-cache/xfce-extra/xfce4-fsguard-plugin-1.1.0 b/metadata/md5-cache/xfce-extra/xfce4-fsguard-plugin-1.1.0
index d4fa888c8c9c..c7bfd12ad552 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-fsguard-plugin-1.1.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-fsguard-plugin-1.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.8:= >=xfce-base/xfce4-panel-4.12:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-fsguard-plugin/1.1/xfce4-fsguard-plugin-1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6b3167ff4390850ac61a02679609e2f2
diff --git a/metadata/md5-cache/xfce-extra/xfce4-gvfs-mount-0.0.4-r1 b/metadata/md5-cache/xfce-extra/xfce4-gvfs-mount-0.0.4-r1
index 1340aa43e94b..d2856822444f 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-gvfs-mount-0.0.4-r1
+++ b/metadata/md5-cache/xfce-extra/xfce4-gvfs-mount-0.0.4-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.24 >=gnome-base/libglade-2.6 >=x11-libs/gtk+-2.20:2 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-gvfs-mount/0.0/xfce4-gvfs-mount-0.0.4-6d2684b.tar.bz2
-_eclasses_=xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5fe7752a1a56f5c1f622be7c067b2eee
diff --git a/metadata/md5-cache/xfce-extra/xfce4-hdaps-0.0.9 b/metadata/md5-cache/xfce-extra/xfce4-hdaps-0.0.9
index 41623d5f865f..48a0201975b3 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-hdaps-0.0.9
+++ b/metadata/md5-cache/xfce-extra/xfce4-hdaps-0.0.9
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8 >=app-laptop/hdapsd-20090101 >=app-laptop/tp_smapi-0.39
 SLOT=0
 SRC_URI=http://michael.orlitzky.com/code/releases/xfce4-hdaps-0.0.9.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186	xfconf	2d8c177734e778123f65326f8d05c3c8
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b	xfconf	2d8c177734e778123f65326f8d05c3c8
 _md5_=ef7c3ef5473015a80f8bf3da114218f6
diff --git a/metadata/md5-cache/xfce-extra/xfce4-hdaps-0.0.9-r1 b/metadata/md5-cache/xfce-extra/xfce4-hdaps-0.0.9-r1
index 7658cbdacf31..3cb1ae6dce43 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-hdaps-0.0.9-r1
+++ b/metadata/md5-cache/xfce-extra/xfce4-hdaps-0.0.9-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8 >=app-laptop/hdapsd-20090101 >=app-laptop/tp_smapi-0.39
 SLOT=0
 SRC_URI=http://michael.orlitzky.com/code/releases/xfce4-hdaps-0.0.9.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	915cae3d7d636732918d18827fb1c226	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_eclasses_=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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3f71fdb799fa5be1e71571abe5d6feb4
diff --git a/metadata/md5-cache/xfce-extra/xfce4-indicator-plugin-2.3.4 b/metadata/md5-cache/xfce-extra/xfce4-indicator-plugin-2.3.4
index 62d220c1916e..e0468f8704d1 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-indicator-plugin-2.3.4
+++ b/metadata/md5-cache/xfce-extra/xfce4-indicator-plugin-2.3.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=dev-libs/libindicator-12.10.1:3= >=x11-libs/gtk+-3.18:3= x11-libs/libX11:= >=xfce-base/libxfce4ui-4.11:=[gtk3(+)] >=xfce-base/libxfce4util-4.11:= >=xfce-base/xfce4-panel-4.11:= >=xfce-base/xfconf-4.13:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-indicator-plugin/2.3/xfce4-indicator-plugin-2.3.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=ec30a9b45201203432bcd7780a9523a4
diff --git a/metadata/md5-cache/xfce-extra/xfce4-kbdleds-plugin-0.0.6 b/metadata/md5-cache/xfce-extra/xfce4-kbdleds-plugin-0.0.6
index 7dace2a6bc87..629de89a5eae 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-kbdleds-plugin-0.0.6
+++ b/metadata/md5-cache/xfce-extra/xfce4-kbdleds-plugin-0.0.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8 >=x11-libs/gtk+-2.20:2
 SLOT=0
 SRC_URI=http://compas.com.ua/oco/file/xfce4-kbdleds-plugin-0.0.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	89bb9f083a2590d9b447fd0b78a96186	xfconf	2d8c177734e778123f65326f8d05c3c8
+_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_=e389fa4102a4ef81b8596efae1f65875
diff --git a/metadata/md5-cache/xfce-extra/xfce4-kbdleds-plugin-0.0.6-r1 b/metadata/md5-cache/xfce-extra/xfce4-kbdleds-plugin-0.0.6-r1
index d152658f0236..bd761cf439a2 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-kbdleds-plugin-0.0.6-r1
+++ b/metadata/md5-cache/xfce-extra/xfce4-kbdleds-plugin-0.0.6-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8 >=x11-libs/gtk+-2.20:2
 SLOT=0
 SRC_URI=http://compas.com.ua/oco/file/xfce4-kbdleds-plugin-0.0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=1a8261dc9d9239ac246e904e0ba2dcb8
diff --git a/metadata/md5-cache/xfce-extra/xfce4-linelight-plugin-0.1.7 b/metadata/md5-cache/xfce-extra/xfce4-linelight-plugin-0.1.7
index db8f84d7504c..e16a4a3263ce 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-linelight-plugin-0.1.7
+++ b/metadata/md5-cache/xfce-extra/xfce4-linelight-plugin-0.1.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.12:2 >=xfce-base/xfce4-panel-4.8 >=xfce-base/libxfcegui4-4.8 sys-apps/mlocate
 SLOT=0
 SRC_URI=mirror://debian/pool/main/x/xfce4-linelight-plugin/xfce4-linelight-plugin_0.1.7.orig.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	89bb9f083a2590d9b447fd0b78a96186	xfconf	2d8c177734e778123f65326f8d05c3c8
+_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_=468f7375e417c9e373170f25970f38b9
diff --git a/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.2.0 b/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.2.0
index 94fd0cf3b714..746231da327d 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.2.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2:= >=x11-libs/gtk+-2.18:2= x11-libs/libX11:= >=xfce-base/exo-0.7.2 >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10 ssl? ( dev-libs/libgcrypt:0= >=net-libs/gnutls-2:= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-mailwatch-plugin/1.2/xfce4-mailwatch-plugin-1.2.0.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	89bb9f083a2590d9b447fd0b78a96186	xfconf	2d8c177734e778123f65326f8d05c3c8
+_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_=1f204589470681eb65d233ad512bd42b
diff --git a/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.2.0-r1 b/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.2.0-r1
index 113aa0b1f276..6bf002de28c6 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.2.0-r1
+++ b/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.2.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2:= >=x11-libs/gtk+-2.18:2= x11-libs/libX11:= >=xfce-base/exo-0.7.2 >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10 ssl? ( dev-libs/libgcrypt:0= >=net-libs/gnutls-2:= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-mailwatch-plugin/1.2/xfce4-mailwatch-plugin-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=c6c41d7f015e55e3f317b726ae3359ef
diff --git a/metadata/md5-cache/xfce-extra/xfce4-messenger-plugin-0.1.0 b/metadata/md5-cache/xfce-extra/xfce4-messenger-plugin-0.1.0
index 2fa0bcc88e16..8cbcb0c47cdd 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-messenger-plugin-0.1.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-messenger-plugin-0.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/dbus-glib >=dev-libs/glib-2 sys-apps/dbus x11-libs/gtk+:2 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8
 SLOT=0
 SRC_URI=mirror://debian/pool/main/x/xfce4-messenger-plugin/xfce4-messenger-plugin_0.1.0.orig.tar.gz mirror://debian/pool/main/x/xfce4-messenger-plugin/xfce4-messenger-plugin_0.1.0-5.debian.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	89bb9f083a2590d9b447fd0b78a96186	xfconf	2d8c177734e778123f65326f8d05c3c8
+_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_=1968b5233fe66a9b4c8189fcc66b22d5
diff --git a/metadata/md5-cache/xfce-extra/xfce4-modemlights-plugin-0.1.3.99 b/metadata/md5-cache/xfce-extra/xfce4-modemlights-plugin-0.1.3.99
index 13e303dd8471..24a115c56e6f 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-modemlights-plugin-0.1.3.99
+++ b/metadata/md5-cache/xfce-extra/xfce4-modemlights-plugin-0.1.3.99
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2 x11-libs/gtk+:2 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-modemlights-plugin/0.1/xfce4-modemlights-plugin-0.1.3.99.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	89bb9f083a2590d9b447fd0b78a96186	xfconf	2d8c177734e778123f65326f8d05c3c8
+_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_=3d4e725e84d5d724bfcb1c4249d937b1
diff --git a/metadata/md5-cache/xfce-extra/xfce4-modemlights-plugin-0.1.3.99-r1 b/metadata/md5-cache/xfce-extra/xfce4-modemlights-plugin-0.1.3.99-r1
index 88e9d3f1f3b2..176a126d9e1d 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-modemlights-plugin-0.1.3.99-r1
+++ b/metadata/md5-cache/xfce-extra/xfce4-modemlights-plugin-0.1.3.99-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2 x11-libs/gtk+:2 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-modemlights-plugin/0.1/xfce4-modemlights-plugin-0.1.3.99.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=65eb32d31a6566c87a1391529c9907f0
diff --git a/metadata/md5-cache/xfce-extra/xfce4-mount-plugin-1.1.3 b/metadata/md5-cache/xfce-extra/xfce4-mount-plugin-1.1.3
index f1fa9c0ad137..c8bed37a0121 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-mount-plugin-1.1.3
+++ b/metadata/md5-cache/xfce-extra/xfce4-mount-plugin-1.1.3
@@ -8,5 +8,5 @@ LICENSE=GPL-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-mount-plugin/1.1/xfce4-mount-plugin-1.1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=19a86da651b00981ce86527914250033
diff --git a/metadata/md5-cache/xfce-extra/xfce4-mpc-plugin-0.5.0 b/metadata/md5-cache/xfce-extra/xfce4-mpc-plugin-0.5.0
index d8a3019d0137..7e82b2e01bf6 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-mpc-plugin-0.5.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-mpc-plugin-0.5.0
@@ -9,5 +9,5 @@ LICENSE=ISC
 RDEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= libmpd? ( media-libs/libmpd:= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-mpc-plugin/0.5/xfce4-mpc-plugin-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=294b8e355cf4889da249ab9d6968404f
diff --git a/metadata/md5-cache/xfce-extra/xfce4-netload-plugin-1.3.1 b/metadata/md5-cache/xfce-extra/xfce4-netload-plugin-1.3.1
index c8ec05fdabd6..65144fd056f3 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-netload-plugin-1.3.1
+++ b/metadata/md5-cache/xfce-extra/xfce4-netload-plugin-1.3.1
@@ -8,5 +8,5 @@ LICENSE=GPL-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-netload-plugin/1.3/xfce4-netload-plugin-1.3.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2e03aba81800d67cd845327113932ef2
diff --git a/metadata/md5-cache/xfce-extra/xfce4-netspeed-plugin-0.3.1 b/metadata/md5-cache/xfce-extra/xfce4-netspeed-plugin-0.3.1
index 3b2fd2c17bbb..9d43a52f6025 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-netspeed-plugin-0.3.1
+++ b/metadata/md5-cache/xfce-extra/xfce4-netspeed-plugin-0.3.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2:= >=gnome-base/libgtop-2:= x11-libs/gtk+:2= >=xfce-base/libxfce4ui-4.8:= >=xfce-base/libxfce4util-4.8:= >=xfce-base/xfce4-panel-4.8:=
 SLOT=0
 SRC_URI=https://xfce4-netspeed-plugin.googlecode.com/files/xfce4-netspeed-plugin-0.3.1.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	89bb9f083a2590d9b447fd0b78a96186	xfconf	2d8c177734e778123f65326f8d05c3c8
+_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_=80d48c7b602b1067e03804091d3a9c53
diff --git a/metadata/md5-cache/xfce-extra/xfce4-notes-plugin-1.8.1 b/metadata/md5-cache/xfce-extra/xfce4-notes-plugin-1.8.1
index 43a0c076b561..e3566e5fb6a3 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-notes-plugin-1.8.1
+++ b/metadata/md5-cache/xfce-extra/xfce4-notes-plugin-1.8.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.24:2= >=x11-libs/gtk+-2.20:2= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:= >=xfce-base/xfconf-4.10:= dev-libs/libunique:1=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-notes-plugin/1.8/xfce4-notes-plugin-1.8.1.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	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	89bb9f083a2590d9b447fd0b78a96186	xfconf	2d8c177734e778123f65326f8d05c3c8
+_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	xfconf	2d8c177734e778123f65326f8d05c3c8
 _md5_=e714a68ef08ec56e55142830abce8cec
diff --git a/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.4.1 b/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.4.1
index 2215a9b6005f..0fbc8c5696e5 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.4.1
+++ b/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.4.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.42:2= >=x11-libs/gtk+-3.14:3= >=x11-libs/libnotify-0.7:= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.10:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfce4-notifyd/0.4/xfce4-notifyd-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3ed3825ba5438f44e7bc8c6f9fa7029f
diff --git a/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.4.2 b/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.4.2
index cc59b80cb6ce..9e714a17e3de 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.4.2
+++ b/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.4.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.42:2= >=x11-libs/gtk+-3.14:3= >=x11-libs/libnotify-0.7:= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.10:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfce4-notifyd/0.4/xfce4-notifyd-0.4.2.tar.bz2
-_eclasses_=desktop	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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d5c5d1d4b6850cbc58caed03d8bc0c4e
diff --git a/metadata/md5-cache/xfce-extra/xfce4-places-plugin-1.7.0 b/metadata/md5-cache/xfce-extra/xfce4-places-plugin-1.7.0
index 5ef6843d22ac..b650b3e9c0f3 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-places-plugin-1.7.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-places-plugin-1.7.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.28:= >=x11-libs/gtk+-2.20:2= x11-libs/libX11:= >=xfce-base/exo-0.6:= >=xfce-base/libxfce4ui-4.8:= >=xfce-base/libxfce4util-4.8:= >=xfce-base/xfce4-panel-4.8:= >=xfce-base/xfconf-4.8:= libnotify? ( >=x11-libs/libnotify-0.7:= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-places-plugin/1.7/xfce4-places-plugin-1.7.0.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	89bb9f083a2590d9b447fd0b78a96186	xfconf	2d8c177734e778123f65326f8d05c3c8
+_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_=892a5e4a0dba66f24a1c21cc02bb2dba
diff --git a/metadata/md5-cache/xfce-extra/xfce4-playercontrol-plugin-0.3.0 b/metadata/md5-cache/xfce-extra/xfce4-playercontrol-plugin-0.3.0
index 60b078a7200a..9b337049dd23 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-playercontrol-plugin-0.3.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-playercontrol-plugin-0.3.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=x11-libs/gtk+:2 x11-libs/pango >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8 mpd? ( >=media-libs/libmpd-0.12 ) audacious? ( >=media-sound/audacious-1.4 )
 SLOT=0
 SRC_URI=http://www.bilimfeneri.gen.tr/ilgar/xfce4-playercontrol-plugin-0.3.0.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	89bb9f083a2590d9b447fd0b78a96186	xfconf	2d8c177734e778123f65326f8d05c3c8
+_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_=1bef464e058b4cf34cd05557ce8a27b4
diff --git a/metadata/md5-cache/xfce-extra/xfce4-power-manager-1.6.1 b/metadata/md5-cache/xfce-extra/xfce4-power-manager-1.6.1
index 6f42705edeaa..a098f9ef3865 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-power-manager-1.6.1
+++ b/metadata/md5-cache/xfce-extra/xfce4-power-manager-1.6.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.42:= >=sys-power/upower-0.99.0 sys-power/pm-utils >=x11-libs/gtk+-3.14:3= >=x11-libs/libnotify-0.7:= x11-libs/libX11:= >=x11-libs/libXrandr-1.2:= x11-libs/libXext:= x11-libs/libXtst:= >=xfce-base/xfconf-4.12:= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= panel-plugin? ( >=xfce-base/xfce4-panel-4.12:= ) policykit? ( >=sys-auth/polkit-0.112 ) networkmanager? ( net-misc/networkmanager )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-power-manager/1.6/xfce4-power-manager-1.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=8c325e377ac8b9f7b5f5d367594abeb5
diff --git a/metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.3.4 b/metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.3.4
index 70bc8d14040f..26802b3dbaa6 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.3.4
+++ b/metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.3.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.42.0:= media-sound/pulseaudio:= >=x11-libs/gtk+-3.20.0:3= >=xfce-base/libxfce4ui-4.11.0:=[gtk3(+)] >=xfce-base/libxfce4util-4.9.0:= >=xfce-base/xfce4-panel-4.11.0:= >=xfce-base/xfconf-4.6.0:= keybinder? ( dev-libs/keybinder:3= ) libnotify? ( x11-libs/libnotify:= ) wnck? ( x11-libs/libwnck:3= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-pulseaudio-plugin/0.3/xfce4-pulseaudio-plugin-0.3.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=868e88496b5f5dd68ce34df05b1aa14c
diff --git a/metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.4.0 b/metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.4.0
index 8abddcf066c1..332d5e2dad2c 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.4.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.42.0:= media-sound/pulseaudio:= >=x11-libs/gtk+-3.20.0:3= >=xfce-base/libxfce4ui-4.11.0:=[gtk3(+)] >=xfce-base/libxfce4util-4.9.0:= >=xfce-base/xfce4-panel-4.11.0:= >=xfce-base/xfconf-4.6.0:= keybinder? ( dev-libs/keybinder:3= ) libnotify? ( x11-libs/libnotify:= ) wnck? ( x11-libs/libwnck:3= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-pulseaudio-plugin/0.4/xfce4-pulseaudio-plugin-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=868e88496b5f5dd68ce34df05b1aa14c
diff --git a/metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.4.1 b/metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.4.1
index 967e2aa288de..09595c16e647 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.4.1
+++ b/metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.4.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.42.0:= media-sound/pulseaudio:= >=x11-libs/gtk+-3.20.0:3= >=xfce-base/libxfce4ui-4.11.0:=[gtk3(+)] >=xfce-base/libxfce4util-4.9.0:= >=xfce-base/xfce4-panel-4.11.0:= >=xfce-base/xfconf-4.6.0:= keybinder? ( dev-libs/keybinder:3= ) libnotify? ( x11-libs/libnotify:= ) wnck? ( x11-libs/libwnck:3= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-pulseaudio-plugin/0.4/xfce4-pulseaudio-plugin-0.4.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=e65f6ed7ff6dda0d45e08bc4edd5c70a
diff --git a/metadata/md5-cache/xfce-extra/xfce4-quicklauncher-plugin-1.9.4-r1 b/metadata/md5-cache/xfce-extra/xfce4-quicklauncher-plugin-1.9.4-r1
index 2bab36e35525..bb98d947a0a0 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-quicklauncher-plugin-1.9.4-r1
+++ b/metadata/md5-cache/xfce-extra/xfce4-quicklauncher-plugin-1.9.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=xfce-base/xfce4-panel-4.8 >=xfce-base/libxfcegui4-4.8
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-quicklauncher-plugin/1.9/xfce4-quicklauncher-plugin-1.9.4.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	89bb9f083a2590d9b447fd0b78a96186	xfconf	2d8c177734e778123f65326f8d05c3c8
+_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_=a71ad9d47b42fa4d2f8d8308b3c68986
diff --git a/metadata/md5-cache/xfce-extra/xfce4-radio-plugin-0.5.1-r1 b/metadata/md5-cache/xfce-extra/xfce4-radio-plugin-0.5.1-r1
index e49928dee220..9127eb66f109 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-radio-plugin-0.5.1-r1
+++ b/metadata/md5-cache/xfce-extra/xfce4-radio-plugin-0.5.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=xfce-base/libxfcegui4-4.8:= >=xfce-base/xfce4-panel-4.8:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-radio-plugin/0.5/xfce4-radio-plugin-0.5.1.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	89bb9f083a2590d9b447fd0b78a96186	xfconf	2d8c177734e778123f65326f8d05c3c8
+_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	xfconf	2d8c177734e778123f65326f8d05c3c8
 _md5_=32593139040d58206f67e17804e7dcb0
diff --git a/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.1 b/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.1
index 82cf593ff645..a06e25932f13 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.1
+++ b/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=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:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfce4-screenshooter/1.9/xfce4-screenshooter-1.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=808628d290224ad824f90d984622991b
diff --git a/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.2 b/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.2
index f48e01d17dd5..2f7cfe127ea9 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.2
+++ b/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=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:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfce4-screenshooter/1.9/xfce4-screenshooter-1.9.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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
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 129236536801..4bb0eaab45b0 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.3
+++ b/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=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:=
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
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 d232e48d964e..733c5dcce77d 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
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/gtk+-2.14:2= >=xfce-base/libxfce4ui-4.8:= >=xfce-base/xfce4-p
 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	89bb9f083a2590d9b447fd0b78a96186	xfconf	2d8c177734e778123f65326f8d05c3c8
+_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
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 f4c3f57cb84a..8fcc08c95100 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
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-ba
 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	89bb9f083a2590d9b447fd0b78a96186
+_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
diff --git a/metadata/md5-cache/xfce-extra/xfce4-smartbookmark-plugin-0.5.0 b/metadata/md5-cache/xfce-extra/xfce4-smartbookmark-plugin-0.5.0
index 09bc06e0a312..f207d3063f41 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-smartbookmark-plugin-0.5.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-smartbookmark-plugin-0.5.0
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-smartbookmark-plugin/0.5/xfce4-smartbookmark-plugin-0.5.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=3d01e7bbc5d352f054e46a2b25739a7c
diff --git a/metadata/md5-cache/xfce-extra/xfce4-soundmenu-plugin-0.7.0 b/metadata/md5-cache/xfce-extra/xfce4-soundmenu-plugin-0.7.0
index 74f87bc33fde..040c9be2b508 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-soundmenu-plugin-0.7.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-soundmenu-plugin-0.7.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=dev-libs/glib-2.28 >=media-libs/libmpris2client-0.1 >=media-sound/pulseaudio-2[glib] >=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfce4-panel-4.10 glyr? ( >=media-libs/glyr-1.0.0 ) lastfm? ( >=media-libs/libclastfm-0.5 ) keybinder? ( >=dev-libs/keybinder-0.2.2:0 )
 SLOT=0
 SRC_URI=https://github.com/matiasdelellis/xfce4-soundmenu-plugin/releases/download/v0.7.0/xfce4-soundmenu-plugin-0.7.0.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	89bb9f083a2590d9b447fd0b78a96186	xfconf	2d8c177734e778123f65326f8d05c3c8
+_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_=9c31e9cc95defdcefc5a1e7813ca4961
diff --git a/metadata/md5-cache/xfce-extra/xfce4-statusnotifier-plugin-0.2.1 b/metadata/md5-cache/xfce-extra/xfce4-statusnotifier-plugin-0.2.1
index ca8c7cc77452..14e583817ac6 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-statusnotifier-plugin-0.2.1
+++ b/metadata/md5-cache/xfce-extra/xfce4-statusnotifier-plugin-0.2.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.24:= >=dev-libs/libdbusmenu-16.04.0:=[gtk3] >=x11-libs/gtk+-3.18:3= x11-libs/libX11:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.12:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-statusnotifier-plugin/0.2/xfce4-statusnotifier-plugin-0.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0567c822dbce4ca9f45dc259732a18dc
diff --git a/metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.2.1 b/metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.2.1
index 98ea45da5f3c..ab6f8ff40b22 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.2.1
+++ b/metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.2.1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-systemload-plugin/1.2/xfce4-systemload-plugin-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=cee13b00f77ce35b1f479a667e0c912e
diff --git a/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.2.1 b/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.2.1
index f024e6783f9d..abd069936001 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.2.1
+++ b/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/cairo:= x11-libs/libX11:= x11-libs/libXmu:= gtk3? ( x11-libs/gtk+:3= x11-libs/libwnck:3= ) !gtk3? ( >=x11-libs/gtk+-2.12:2= x11-libs/libwnck:1= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfce4-taskmanager/1.2/xfce4-taskmanager-1.2.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=6bc7f227f3d5cb1e2cef3153df3a8d02
diff --git a/metadata/md5-cache/xfce-extra/xfce4-time-out-plugin-1.0.2 b/metadata/md5-cache/xfce-extra/xfce4-time-out-plugin-1.0.2
index 5c8f3697ac91..2ea2888dab58 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-time-out-plugin-1.0.2
+++ b/metadata/md5-cache/xfce-extra/xfce4-time-out-plugin-1.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2= x11-libs/libX11:= >=xfce-base/libxfce4ui-4.8:= >=xfce-base/libxfce4util-4.8:= >=xfce-base/xfce4-panel-4.8:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-time-out-plugin/1.0/xfce4-time-out-plugin-1.0.2.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	89bb9f083a2590d9b447fd0b78a96186	xfconf	2d8c177734e778123f65326f8d05c3c8
+_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_=31e161b5850ad452e45ed9a2392357b7
diff --git a/metadata/md5-cache/xfce-extra/xfce4-timer-plugin-1.6.0 b/metadata/md5-cache/xfce-extra/xfce4-timer-plugin-1.6.0
index 6914a6f05d51..667643cd75f8 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-timer-plugin-1.6.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-timer-plugin-1.6.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-timer-plugin/1.6/xfce4-timer-plugin-1.6.0.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	89bb9f083a2590d9b447fd0b78a96186	xfconf	2d8c177734e778123f65326f8d05c3c8
+_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_=8eff266290bab45253874d66cc19d7a3
diff --git a/metadata/md5-cache/xfce-extra/xfce4-timer-plugin-1.7.0 b/metadata/md5-cache/xfce-extra/xfce4-timer-plugin-1.7.0
index 0819e93ef41f..8384907a0b92 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-timer-plugin-1.7.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-timer-plugin-1.7.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.10:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-timer-plugin/1.7/xfce4-timer-plugin-1.7.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=0209ca2082fc9c58b503cd63ce2b1f38
diff --git a/metadata/md5-cache/xfce-extra/xfce4-vala-4.10.3-r3 b/metadata/md5-cache/xfce-extra/xfce4-vala-4.10.3-r3
index 2b6399485c11..0b5cd092940a 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-vala-4.10.3-r3
+++ b/metadata/md5-cache/xfce-extra/xfce4-vala-4.10.3-r3
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=|| ( dev-lang/vala:0.32[vapigen(+)] ) >=xfce-base/exo-0.10 >=xfce-base/garcon-0.2 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfce4-panel-4.10 >=xfce-base/xfconf-4.10
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/bindings/xfce4-vala/4.10/xfce4-vala-4.10.3.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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186	xfconf	2d8c177734e778123f65326f8d05c3c8
+_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	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b	xfconf	2d8c177734e778123f65326f8d05c3c8
 _md5_=77ba132b030c05b1c22816976c8179fc
diff --git a/metadata/md5-cache/xfce-extra/xfce4-verve-plugin-1.1.0 b/metadata/md5-cache/xfce-extra/xfce4-verve-plugin-1.1.0
index ec76f8ec2c6c..3bc62162d28a 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-verve-plugin-1.1.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-verve-plugin-1.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=xfce-base/exo-0.6:= >=xfce-base/libxfce4util-4.8:= >=xfce-base/libxfcegui4-4.8:= >=xfce-base/xfce4-panel-4.8:= dev-libs/glib:2= >=dev-libs/libpcre-5:= dbus? ( >=dev-libs/dbus-glib-0.98:= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-verve-plugin/1.1/xfce4-verve-plugin-1.1.0.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	89bb9f083a2590d9b447fd0b78a96186	xfconf	2d8c177734e778123f65326f8d05c3c8
+_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_=aa92d9b7012e3d3fdba66b822e16e470
diff --git a/metadata/md5-cache/xfce-extra/xfce4-volumed-pulse-0.2.2 b/metadata/md5-cache/xfce-extra/xfce4-volumed-pulse-0.2.2
index e05cd36f0bf7..6ed6f6a8772b 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-volumed-pulse-0.2.2
+++ b/metadata/md5-cache/xfce-extra/xfce4-volumed-pulse-0.2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.16:2= dev-libs/keybinder:0= >=media-sound/pulseaudio-0.9.19:=[glib] >=x11-libs/gtk+-2.20:2= >=xfce-base/xfconf-4.8:= libnotify? ( x11-libs/libnotify:= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfce4-volumed-pulse/0.2/xfce4-volumed-pulse-0.2.2.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	89bb9f083a2590d9b447fd0b78a96186	xfconf	2d8c177734e778123f65326f8d05c3c8
+_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_=abac046cdc77abaf56ea0455875a05e9
diff --git a/metadata/md5-cache/xfce-extra/xfce4-wavelan-plugin-0.6.0 b/metadata/md5-cache/xfce-extra/xfce4-wavelan-plugin-0.6.0
index 0f564b03c6db..c0c3c44c9f55 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-wavelan-plugin-0.6.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-wavelan-plugin-0.6.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= kernel_linux? ( sys-apps/net-tools )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-wavelan-plugin/0.6/xfce4-wavelan-plugin-0.6.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=2f613809dd9a3a763562833707a6a095
diff --git a/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.8.10 b/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.8.10
index c7aeafc3baa3..8c91f524f345 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.8.10
+++ b/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.8.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.20:= dev-libs/libxml2:= >=net-libs/libsoup-2.32:=[ssl] >=x11-libs/gtk+-2.14:2= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:= upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-weather-plugin/0.8/xfce4-weather-plugin-0.8.10.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=f74724f9906166ec81137ea6d8f30886
diff --git a/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.9.0 b/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.9.0
index 5278b875cc8d..d71f91a82b4f 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.9.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.9.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.42 dev-libs/libxml2:= >=net-libs/libsoup-2.42:=[ssl] >=x11-libs/gtk+-3.22:3 >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:= upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-weather-plugin/0.9/xfce4-weather-plugin-0.9.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	89bb9f083a2590d9b447fd0b78a96186
+_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_=d592365c4f57abf130595ee07600fad2
diff --git a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-1.7.5 b/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-1.7.5
index a974fd3cf0df..8c260670281b 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-1.7.5
+++ b/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-1.7.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libintl:= x11-libs/gtk+:2= xfce-base/exo:= xfce-base/garcon:= xfce-base/libxfce4ui:= xfce-base/libxfce4util:= xfce-base/xfce4-panel:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-whiskermenu-plugin/1.7/xfce4-whiskermenu-plugin-1.7.5.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=2eda28bf6b1dc48a8eefb8c7bbac0994
diff --git a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.1.5 b/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.1.5
index 0df6e898ee59..17ec2c6b19c3 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.1.5
+++ b/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.1.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libintl:= x11-libs/gtk+:3= >=xfce-base/exo-0.11.0:= xfce-base/garcon:= xfce-base/libxfce4ui:= xfce-base/libxfce4util:= xfce-base/xfce4-panel:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-whiskermenu-plugin/2.1/xfce4-whiskermenu-plugin-2.1.5.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=c9c57613dc8e53b9893bfee4f537ac35
diff --git a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.1.6 b/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.1.6
deleted file mode 100644
index 3de42f6d3239..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.1.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=virtual/libintl:= x11-libs/gtk+:3= >=xfce-base/exo-0.11.0:= xfce-base/garcon:= xfce-base/libxfce4ui:= xfce-base/libxfce4util:= xfce-base/xfce4-panel:= sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Alternate application launcher for Xfce
-EAPI=6
-HOMEPAGE=https://gottcode.org/xfce4-whiskermenu-plugin
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/libintl:= x11-libs/gtk+:3= >=xfce-base/exo-0.11.0:= xfce-base/garcon:= xfce-base/libxfce4ui:= xfce-base/libxfce4util:= xfce-base/xfce4-panel:=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-whiskermenu-plugin/2.1/xfce4-whiskermenu-plugin-2.1.6.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=d6cd30944d15a848535fdd6acb5ed42f
diff --git a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.1.7 b/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.1.7
index 437417a7532f..ac7acc57385e 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.1.7
+++ b/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.1.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libintl:= x11-libs/gtk+:3= >=xfce-base/exo-0.11.0:= xfce-base/garcon:= xfce-base/libxfce4ui:= xfce-base/libxfce4util:= xfce-base/xfce4-panel:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-whiskermenu-plugin/2.1/xfce4-whiskermenu-plugin-2.1.7.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=d6cd30944d15a848535fdd6acb5ed42f
diff --git a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.2.0 b/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.2.0
deleted file mode 100644
index 859d009d1846..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=virtual/libintl:= x11-libs/gtk+:3= >=xfce-base/exo-0.11.0:= xfce-base/garcon:= xfce-base/libxfce4ui:= xfce-base/libxfce4util:= xfce-base/xfce4-panel:= sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Alternate application launcher for Xfce
-EAPI=6
-HOMEPAGE=https://gottcode.org/xfce4-whiskermenu-plugin
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/libintl:= x11-libs/gtk+:3= >=xfce-base/exo-0.11.0:= xfce-base/garcon:= xfce-base/libxfce4ui:= xfce-base/libxfce4util:= xfce-base/xfce4-panel:=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-whiskermenu-plugin/2.2/xfce4-whiskermenu-plugin-2.2.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
-_md5_=d6cd30944d15a848535fdd6acb5ed42f
diff --git a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.2.1 b/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.2.1
index db540ae96b28..039f7b178787 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.2.1
+++ b/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.2.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libintl:= x11-libs/gtk+:3= >=xfce-base/exo-0.11.0:= xfce-base/garcon:= xfce-base/libxfce4ui:= xfce-base/libxfce4util:= xfce-base/xfce4-panel:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-whiskermenu-plugin/2.2/xfce4-whiskermenu-plugin-2.2.1.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	89bb9f083a2590d9b447fd0b78a96186
+_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_=d6cd30944d15a848535fdd6acb5ed42f
diff --git a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.3.0 b/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.3.0
new file mode 100644
index 000000000000..f279d37bdf3e
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.3.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=virtual/libintl:= x11-libs/gtk+:3= >=xfce-base/exo-0.11.0:= xfce-base/garcon:= xfce-base/libxfce4ui:= xfce-base/libxfce4util:= xfce-base/xfce4-panel:= sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=Alternate application launcher for Xfce
+EAPI=6
+HOMEPAGE=https://gottcode.org/xfce4-whiskermenu-plugin
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/libintl:= x11-libs/gtk+:3= >=xfce-base/exo-0.11.0:= xfce-base/garcon:= xfce-base/libxfce4ui:= xfce-base/libxfce4util:= xfce-base/xfce4-panel:=
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-whiskermenu-plugin/2.3/xfce4-whiskermenu-plugin-2.3.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	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d6cd30944d15a848535fdd6acb5ed42f
diff --git a/metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.2.4 b/metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.2.4
index 5f739b7f28d6..aec3dd93450d 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.2.4
+++ b/metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.2.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=x11-libs/libwnck-2.30:1 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfce4-panel-4.10 >=xfce-base/xfconf-4.10
 SLOT=0
 SRC_URI=https://github.com/cedl38/xfce4-windowck-plugin/archive/v0.2.4.tar.gz -> xfce4-windowck-plugin-0.2.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	89bb9f083a2590d9b447fd0b78a96186	xfconf	2d8c177734e778123f65326f8d05c3c8
+_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_=036d0c7aa032b2b58314e5d6be6f76ff
diff --git a/metadata/md5-cache/xfce-extra/xfce4-wmdock-plugin-0.6.0 b/metadata/md5-cache/xfce-extra/xfce4-wmdock-plugin-0.6.0
index 7fba4503cab1..23235729168b 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-wmdock-plugin-0.6.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-wmdock-plugin-0.6.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 >=xfce-base/libxfce4util-4.10 >=xfce-base/libxfcegui4-4.10 >=xfce-base/xfce4-panel-4.10 >=x11-libs/libwnck-2.8.1:1 x11-libs/libX11
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-wmdock-plugin/0.6/xfce4-wmdock-plugin-0.6.0.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	89bb9f083a2590d9b447fd0b78a96186	xfconf	2d8c177734e778123f65326f8d05c3c8
+_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_=048eaa7efa7fbf227848a0c2bdb5a9da
diff --git a/metadata/md5-cache/xfce-extra/xfdashboard-0.4.0 b/metadata/md5-cache/xfce-extra/xfdashboard-0.4.0
index 97bd0c1cd718..a90d4b346373 100644
--- a/metadata/md5-cache/xfce-extra/xfdashboard-0.4.0
+++ b/metadata/md5-cache/xfce-extra/xfdashboard-0.4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.32:= >=x11-libs/gtk+-3.2:3= >=media-libs/clutter-1.12:1.0= >=x11-libs/libwnck-3:3= x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXinerama:= >=xfce-base/garcon-0.2.0:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfconf-4.10:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfdashboard/0.4/xfdashboard-0.4.0.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	89bb9f083a2590d9b447fd0b78a96186	xfconf	2d8c177734e778123f65326f8d05c3c8
+_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_=dc8c549af959b96218610f0868b9662b
diff --git a/metadata/md5-cache/xfce-extra/xfswitch-plugin-0.0.1-r2 b/metadata/md5-cache/xfce-extra/xfswitch-plugin-0.0.1-r2
index d87446f0459b..16a680a84c24 100644
--- a/metadata/md5-cache/xfce-extra/xfswitch-plugin-0.0.1-r2
+++ b/metadata/md5-cache/xfce-extra/xfswitch-plugin-0.0.1-r2
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/gtk+-2.12:2 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfceg
 REQUIRED_USE=gdm? ( !lightdm !lxdm ) lightdm? ( !gdm !lxdm ) lxdm? ( !gdm !lightdm )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfswitch-plugin/0.0/xfswitch-plugin-0.0.1.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	89bb9f083a2590d9b447fd0b78a96186	xfconf	2d8c177734e778123f65326f8d05c3c8
+_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_=fceabc66610d81006341202604700a78
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 6f12b7c07816..3107120703a8 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-09-30T09:38:32Z
+TIMESTAMP 2018-10-07T09:08:39Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAluwmZhfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlu5zRhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAXtw/+MrPeLndJNwRwvWWPQmlXfvKBGtQS9AuBBP4Th23KbFFxpcEuIbrq+mw9
-m11DzzoGOlPtWu18LnmEu4FPFbGxbEdBPLpCOfqjd1Eu119JLay5Be+OojRprWek
-Jjny7qNJWoAJVL+e53BZYl/iaaJhGnIH/TFBlgJWVcHS6FepPnEu2G7T037D0Gn1
-JoOvUPrfzJg3bVoZ1p6YptWNCfCYrOW5XiLNahNDQe/3Be6AGNvfHBV+sLatuQ3b
-HiHp9mFrjYbCOoYIPToJz1bEg70SZ4FKg+mguJDsvi9x4QWoyztB573nqZjfxDRO
-eQUpTQvlgJyreALBnmbhxThsedrtf/Gq+fcxofUWr0pCHLC++9cFhu8WEH0OygD7
-OXBWHtjqNCgB3XwQImahTMEFw7zffwX5Z5YIhS/co2SU9/nibDzaVF7FbJyxyCvV
-X0ILBUERF0qe1hhx1pvShn3uEp+1FUlxh0tdLJZjw80sUzZCn4Gi0I3Ox9V6ABIu
-3tM2W7ju8+73VcBByEa2suYX1ML9qqTLjGvOHdYNi4cRJmfjbYAVLYhEeIZ1YYO3
-g6cJkM4efziUdQIiYSs4CpOCTObFdexOqCYLygHY020wPkytuIlwmrnyRznDLfL5
-2pfMvQkuWVu4yTa8BuFa1G/j5tCoGioihbycKjDN/09HaBfcE4k=
-=ixJJ
+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
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index bc54edd0cd8e..4b5c84dd0035 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 30 Sep 2018 09:38:28 +0000
+Sun, 07 Oct 2018 09:08:36 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index 9e14826bb996..5821c98b8c66 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -687,11 +687,6 @@
     <url>https://wiki.gentoo.org/wiki/Project:Containers</url>
     <description>Gentoo Containers provides minimal container images for a variety of container formats so that users can have a consistent experience when building application specific containers.</description>
     <member>
-      <email>mrueg@gentoo.org</email>
-      <name>Manuel Rüger</name>
-      <role>Member</role>
-    </member>
-    <member>
       <email>ultrabug@gentoo.org</email>
       <name>Ultrabug</name>
       <role>Member</role>
@@ -2478,6 +2473,11 @@ developers and volunteer mentors.</description>
       <name>Robin Johnson</name>
       <role>Member</role>
     </member>
+    <member>
+      <email>zlogene@gentoo.org</email>
+      <name>Mikle Kolyada</name>
+      <role>Member</role>
+    </member>
   </project>
   <project>
     <email>php-bugs@gentoo.org</email>
@@ -2906,11 +2906,6 @@ developers and volunteer mentors.</description>
       <role>Member</role>
     </member>
     <member>
-      <email>mrueg@gentoo.org</email>
-      <name>Manuel Rüger</name>
-      <role>Member</role>
-    </member>
-    <member>
       <email>perfinion@gentoo.org</email>
       <name>Jason Zaman</name>
       <role>Member</role>
@@ -3100,11 +3095,6 @@ developers and volunteer mentors.</description>
       <role>Developer</role>
     </member>
     <member>
-      <email>mrueg@gentoo.org</email>
-      <name>Manuel Rüger</name>
-      <role>Developer</role>
-    </member>
-    <member>
       <email>pinkbyte@gentoo.org</email>
       <name>Sergey Popov</name>
       <role>Developer</role>
@@ -3720,6 +3710,11 @@ developers and volunteer mentors.</description>
     <name>Gentoo Tcltk Project</name>
     <url>https://wiki.gentoo.org/wiki/Project:Tcltk</url>
     <description>Gentoo tcltk packages.</description>
+    <member>
+      <email>tupone@gentoo.org</email>
+      <name>Alfredo Tupone</name>
+      <role>member</role>
+    </member>
   </project>
   <project>
     <email>tex@gentoo.org</email>
@@ -3791,10 +3786,6 @@ developers and volunteer mentors.</description>
       <name>Matt Turner</name>
     </member>
     <member>
-      <email>mrueg@gentoo.org</email>
-      <name>Manuel Rüger</name>
-    </member>
-    <member>
       <email>nerdboy@gentoo.org</email>
       <name>Steve Arnold</name>
     </member>
diff --git a/metadata/timestamp b/metadata/timestamp
index 636586163ca4..461eee25200e 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Sep 30 09:38:28 UTC 2018
+Sun Oct  7 09:08:36 UTC 2018
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 5e29fd5dc8c9..1d691ac62de1 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 30 Sep 2018 09:45:01 +0000
+Sun, 07 Oct 2018 09:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 1d22338a4a8c..6faaa1953744 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-9cdda20b716f29b34b399f5600bd11a040c316b2 1538297200 2018-09-30T08:46:40+00:00
+e09c96777582b82f6d84fb2d865151fbced1dfb4 1538900203 2018-10-07T08:16:43+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 4ec706686edd..a18bd19b09a3 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1538300101 Sun 30 Sep 2018 09:35:01 AM UTC
+1538903101 Sun 07 Oct 2018 09:05:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index bc54edd0cd8e..4b5c84dd0035 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 30 Sep 2018 09:38:28 +0000
+Sun, 07 Oct 2018 09:08:36 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index e80e15acfa62..c5819c04d49c 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index b4f3dd2cfcbc..e84a8b50e8e5 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -1,8 +1,4 @@
-DIST fail2ban-0.10.2.tar.gz 474675 BLAKE2B 569599eec3c7b786933af332507ca148f49d38688f7467d3d9bb811353402646136fb28351e593fad0c95de4ece4ac4967d8215430827e8f5a2a52a6ea61a3ca SHA512 1c16682b3cbf26b5aed1bace4c09ed911e487fbd01f8e8355f2427dae85b86d1d28e7a18948ad66488393115c1439e9daf634f2edb8c3ce7ce8639aa53e35503
 DIST fail2ban-0.10.3.1.tar.gz 485826 BLAKE2B 79ca86a601bd79ba3729d4c9b00f20a0717df8c7ceb20183099e11f84cceade274173be90d0b4b000d37a1b9d242e14106c9e7e40e372e450d69bca003fff6fb SHA512 ed3646ef2113fe10d9130c239818087b228ac9708411e26acc412beae022e3f9ff8cea32d824bd491117882fb8f184dcb88bda295bd31e865ac8310c7e27fc7a
-DIST fail2ban-0.9.6.tar.gz 352145 BLAKE2B a529a7a1c78f29f457abc26215da015f7624f6d777571e96725775557725b6cbbfda5068e77520f1b3c20efcff07c11f210c5cca3ed47cf86c6f5e87c503052f SHA512 c09778d39741dc38d1073495a9f491012717d5ed04d28722f2ae6755104bdcc472baf06d33f500fed592b04c05277ba5cf74e527f1c0ed751108f4f1be22fa7e
-EBUILD fail2ban-0.10.2.ebuild 3349 BLAKE2B 030c91982ed07d229c72605bdb80648596a686416d6e695cd8057092bf9a4167a39b23b38d234c3ed91879f897c899d64a3f1b6fa7fc1c9828641b8f8e8a2e8a SHA512 d818e7e00258bccd14540ebedd427f3e05dc7b5feef3138a80123425726388d82e21b0f49ce71fd5e15a486a4042e4533e28e0a947941a985c78ae98939e7584
 EBUILD fail2ban-0.10.3.1.ebuild 3341 BLAKE2B 0b0f7d1f4ca20d23ef9d787c04bc984e9859900f9e3fec4c691338d6638a32e6e9fa4948ce31895821a7cc4787806051059687864c2cde8fce7f13f26ef0e084 SHA512 63c23a53745ce27797eeb686fb896d3dfaf86b7a1c4a7cfddaf1f2438fef6c44dead638719f884d4ed46fe19d40edd204dad20a0d05121d1646d51a5b4a40e60
-EBUILD fail2ban-0.9.6.ebuild 3118 BLAKE2B 421153aa5ee52702e6cb79dd780ed3706b22c4ee7497c4da505cc1a2c7aee27c80ad737b427e4de3abcaea129add9b9b70e008336597ca2e57bdc6d08dcda790 SHA512 e10fe1a544c0ea50eade24a3399cc2e4f27a0cbd4e4455a2cbc48cd1def13793474a24f4eefaefcb4ddc5c3e3773821c6149001c83ca953db3be1dcfb41d30b0
 EBUILD fail2ban-99999999.ebuild 3190 BLAKE2B dac84d04dc01c20b5af2a34c07be78ce7db25c79d00a5cfc7e6c58b4077e884b71e8fdb83b34e9abe7326c68836b3963d6ebd373bb618e74db4f13cb7464e086 SHA512 8b2a59c16a2a9bc712c7d905a30df88d72ebf47e5f89e227bd1371ae35aa7d44c6056c1aef7c9952ae166b0bab806e8a21ee584eff36652df43d0cc668f237e5
 MISC metadata.xml 372 BLAKE2B 7fca866187d9a128e6fb6787a4099d7a6442e0e51e558786773b91c3e2f06e67167d76f9bc96be0fe1baa1c44fc3f0e9e2105a327a10cb2720b3e3f9e4303a66 SHA512 4d5710e2fb4a7c353ca6bd3203bceef57d4d004367993dc1044800ee8713a3f4697fe8ba3472a73ecd015503656dfb7cd68d674c99188ce5702769cfeaf06b25
diff --git a/net-analyzer/fail2ban/fail2ban-0.10.2.ebuild b/net-analyzer/fail2ban/fail2ban-0.10.2.ebuild
deleted file mode 100644
index 1efe5233391c..000000000000
--- a/net-analyzer/fail2ban/fail2ban-0.10.2.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
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 eutils systemd vcs-snapshot
-
-DESCRIPTION="scans log files and bans IPs that show malicious signs"
-HOMEPAGE="http://www.fail2ban.org/"
-SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="selinux systemd"
-
-# TODO support ipfw and ipfilter
-RDEPEND="
-	kernel_linux? ( net-firewall/iptables )
-	kernel_FreeBSD? ( sys-freebsd/freebsd-pf )
-	net-misc/whois
-	virtual/logger
-	virtual/mta
-	selinux? ( sec-policy/selinux-fail2ban )
-	systemd? ( $(python_gen_cond_dep '|| (
-		dev-python/python-systemd[${PYTHON_USEDEP}]
-		sys-apps/systemd[python(-),${PYTHON_USEDEP}]
-	)' 'python*' ) )
-"
-
-REQUIRED_USE="systemd? ( !python_single_target_pypy )"
-
-DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
-
-python_prepare_all() {
-	eapply_user
-
-	# Replace /var/run with /run, but not in the top source directory
-	find . -mindepth 2 -type f -exec \
-		sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die
-
-	sed -i -e 's|runscript|openrc-run|g' files/gentoo-initd || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if python_is_python3; then
-		./fail2ban-2to3 || die
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	"${PYTHON}" "bin/${PN}-testcases" || die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	rm -rf "${D}"/usr/share/doc/${PN} "${D}"/run || die
-
-	# not FILESDIR
-	newconfd files/gentoo-confd ${PN}
-	newinitd files/gentoo-initd ${PN}
-	sed -e "s:@BINDIR@:${EPREFIX}/usr/bin:g" files/${PN}.service.in > "${T}/${PN}.service" || die
-	systemd_dounit "${T}/${PN}.service"
-	systemd_dotmpfilesd files/${PN}-tmpfiles.conf
-	doman man/*.{1,5}
-
-	# Use INSTALL_MASK  if you do not want to touch /etc/logrotate.d.
-	# See http://thread.gmane.org/gmane.linux.gentoo.devel/35675
-	insinto /etc/logrotate.d
-	newins files/${PN}-logrotate ${PN}
-}
-
-pkg_preinst() {
-	has_version "<${CATEGORY}/${PN}-0.7"
-	previous_less_than_0_7=$?
-}
-
-pkg_postinst() {
-	if [[ $previous_less_than_0_7 = 0 ]] ; then
-		elog
-		elog "Configuration files are now in /etc/fail2ban/"
-		elog "You probably have to manually update your configuration"
-		elog "files before restarting Fail2ban!"
-		elog
-		elog "Fail2ban is not installed under /usr/lib anymore. The"
-		elog "new location is under /usr/share."
-		elog
-		elog "You are upgrading from version 0.6.x, please see:"
-		elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8"
-	fi
-
-	if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin; then
-		elog "For most jail.conf configurations, it is recommended you install either"
-		elog "dev-python/pyinotify or app-admin/gamin (in order of preference)"
-		elog "to control how log file modifications are detected"
-	fi
-
-	if ! has_version dev-lang/python[sqlite]; then
-		elog "If you want to use ${PN}'s persistent database, then reinstall"
-		elog "dev-lang/python with USE=sqlite"
-	fi
-
-	if has_version sys-apps/systemd[-python]; then
-		elog "If you want to track logins through sys-apps/systemd's"
-		elog "journal backend, then reinstall sys-apps/systemd with USE=python"
-	fi
-}
diff --git a/net-analyzer/fail2ban/fail2ban-0.9.6.ebuild b/net-analyzer/fail2ban/fail2ban-0.9.6.ebuild
deleted file mode 100644
index 78c4e85f890a..000000000000
--- a/net-analyzer/fail2ban/fail2ban-0.9.6.ebuild
+++ /dev/null
@@ -1,102 +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} pypy )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 eutils systemd vcs-snapshot
-
-DESCRIPTION="scans log files and bans IPs that show malicious signs"
-HOMEPAGE="http://www.fail2ban.org/"
-SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="selinux systemd"
-
-# TODO support ipfw and ipfilter
-RDEPEND="
-	kernel_linux? ( net-firewall/iptables )
-	kernel_FreeBSD? ( sys-freebsd/freebsd-pf )
-	net-misc/whois
-	virtual/logger
-	virtual/mta
-	selinux? ( sec-policy/selinux-fail2ban )
-	systemd? ( $(python_gen_cond_dep '|| (
-		dev-python/python-systemd[${PYTHON_USEDEP}]
-		sys-apps/systemd[python(-),${PYTHON_USEDEP}]
-	)' 'python*' ) )
-"
-
-REQUIRED_USE="systemd? ( !python_single_target_pypy )"
-
-DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
-
-python_prepare_all() {
-	# Replace /var/run with /run, but not in the top source directory
-	find . -mindepth 2 -type f -exec \
-		sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die
-
-	sed -i -e 's|runscript|openrc-run|g' files/gentoo-initd || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" "bin/${PN}-testcases" || die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	rm -rf "${D}"/usr/share/doc/${PN} "${D}"/run || die
-
-	# not FILESDIR
-	newconfd files/gentoo-confd ${PN}
-	newinitd files/gentoo-initd ${PN}
-	systemd_dounit files/${PN}.service
-	systemd_dotmpfilesd files/${PN}-tmpfiles.conf
-	doman man/*.{1,5}
-
-	# Use INSTALL_MASK  if you do not want to touch /etc/logrotate.d.
-	# See http://thread.gmane.org/gmane.linux.gentoo.devel/35675
-	insinto /etc/logrotate.d
-	newins files/${PN}-logrotate ${PN}
-}
-
-pkg_preinst() {
-	has_version "<${CATEGORY}/${PN}-0.7"
-	previous_less_than_0_7=$?
-}
-
-pkg_postinst() {
-	if [[ $previous_less_than_0_7 = 0 ]] ; then
-		elog
-		elog "Configuration files are now in /etc/fail2ban/"
-		elog "You probably have to manually update your configuration"
-		elog "files before restarting Fail2ban!"
-		elog
-		elog "Fail2ban is not installed under /usr/lib anymore. The"
-		elog "new location is under /usr/share."
-		elog
-		elog "You are upgrading from version 0.6.x, please see:"
-		elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8"
-	fi
-	if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin; then
-		elog "For most jail.conf configurations, it is recommended you install either"
-		elog "dev-python/pyinotify or app-admin/gamin (in order of preference)"
-		elog "to control how log file modifications are detected"
-	fi
-
-	if ! has_version dev-lang/python[sqlite]; then
-		elog "If you want to use ${PN}'s persistent database, then reinstall"
-		elog "dev-lang/python with USE=sqlite"
-	fi
-
-	if has_version sys-apps/systemd[-python]; then
-		elog "If you want to track logins through sys-apps/systemd's"
-		elog "journal backend, then reinstall sys-apps/systemd with USE=python"
-	fi
-}
diff --git a/net-analyzer/nrpe/Manifest b/net-analyzer/nrpe/Manifest
index 52cf056c3f1c..3131a00a0c36 100644
--- a/net-analyzer/nrpe/Manifest
+++ b/net-analyzer/nrpe/Manifest
@@ -3,11 +3,13 @@ AUX nrpe-2.15-autoconf-header.patch 898 BLAKE2B 4cec3a40431057025c8aa711ea053588
 AUX nrpe-2.15-metachar-security-fix.patch 1165 BLAKE2B f7e4c7c7ac83627baeb87b05264cea254cc852a4bcf1e67fb7994c3e15605ebafa6b25819692d179e23c2f8fca729c52f49ec47f979ba63574a26d9cb03ba2ae SHA512 cba997f4433dd38c95a3e2166f091b53ac6f618f25944dc69bb9ae5864a74a1136667c557881a498ce6aa16e91b367c416a5935e20e348f94f140fdc09692b29
 AUX nrpe-2.15-no-ssl.patch 967 BLAKE2B e198d1c140ba6cdcc50739e79ffd955c9f5ca692e529a09cfcc31db991d229df85a7137c0a72747e881aff82aa16d3b08cd5f12e0dbda2ad2c2a2793ceef05bd SHA512 17163aa22fd9e03ca00679756413c9ac2051b2d66c894b3ec6dc6bad468d2835c95481eab915b40ccc37e7063e1a2b382af7ed47a5c2ea6d1aa94286a95c44ce
 AUX nrpe-2.15-tcpd-et-al.patch 2651 BLAKE2B 2ada9c800d41a9854102f5a469c9ec829212845e07c3d17aaed095f90e807acfe945b3eaac6cf5d51fedd25d3baa88cefb75e72476a84c105a706560b0512abf SHA512 d4c2b38f05b9ac19702ff81d0f07cabed9f98a309e0e4d287bd9784b0aa6ee50ff8b6aee0f4d5541cb10120d463b470d23a6d4a4a2627166d6cf1b07fb5d61de
+AUX nrpe-3.2.1-eliminate-systemd-pid.patch 1264 BLAKE2B e0fb75dcc231881fd02fba73de02b983098d7762852d5dea497e717e0c978d773c871d35ba8671a4d292896aa276703ea9d2450e053add1ff3f2d6d9f1c53bf1 SHA512 9e8d58dee6c60b48e209a69eaab10abcc5eccfc28edf073240afba3d3e70a36ead4a568fe6589dd8578d11f0149c968c5977742e9905fa0a407b120c6d168570
 AUX nrpe.init 1152 BLAKE2B eea4c8554ef02b7eb9e602a4b0750565520dd830435586043f61534a58563eaed379f1296df5eaf68aab88440f4199354118ffbcc5b4340eda633bb3eb49092c SHA512 19f470407d63b2949535acd6e5849afbea44f82a5773f9110f8b025c380c0626a0a733ead417b1ce293741168acea5a885c2e9f94fb1c0b3e38a06e0eae4ddca
 AUX nrpe.service 242 BLAKE2B 715f0e8b91d6c40405d6d1f3689bbbf750e61e78e1d727debbe998ae81922b36f1d5f7c011f6881979e485a81c08d3f1f405b962023fecea643c8f7a9e04c3df SHA512 ffd67467cc4f5ccdf73e0860d1355a8cc3e528d0c67f2054b0ad76c02a43f9c5a8964a3f6df6f91eaa8e15c3c9596259aa964ad69aa2da60678d68fa892b2346
 AUX nrpe.xinetd.2 245 BLAKE2B 3e9db31c7d5b28dab18d2f5855d0465f25fc9cf4a70deac9a5d0c87c7cc546a33b432dbca172a49addadc0bd6583d870ec0fe350bf60e015e325d8bb923aca47 SHA512 d687cb2a5babfd28a97d3a5f1ac665758341ecc37fdd0193dbf0df4cba68c88aa24776a33a706989843fa5356b2e3e995662a823ceb2b86ba8f846f8c47e18fb
 DIST nrpe-2.15.tar.gz 419695 BLAKE2B 999ecc633cbd2dc516ff0654db3ac0cc58a88d93ae4ace1040888fe73d8fb471306d95312ac364c79b3a47300ac57c0c429a24697c37bfa639f1da55cb6bc756 SHA512 03ce9774b5112d03235dc9da075770d89d1bcc5ffa5faf221ff7ea8ec5c92ded1e1ae9222581a87cf53736d190ac047e1acce7edc2f31f26c432d786cdef0e73
 DIST nrpe-3.2.1.tar.gz 518015 BLAKE2B c9be2bf24e3d9977a7ff5c2f0e08bfe841729289af836bb7ac6ccb2c173a519958b12cc3e90ece612ac6c2527ad472ef1464be648a66b11ff8ad483d5ad78cc1 SHA512 ec6ff42a00bd97ed80010a82e26dc35fd419f2feda65820cda0108068173c1ae44eee698833a50fd2079429a6f5eb1321c4f06b09c6708bc5fbe48f176389856
 EBUILD nrpe-2.15-r3.ebuild 4013 BLAKE2B 6609597c36f1df0228f627a66f1a2edaf2c30c93d3f143c69ab92c2c914f1e83bbb3bfd2bdd286fdc42411b3d86ca9716609f278838849ed940aa35dc7cad9c0 SHA512 d2442384f0bea253479f06186b78f013514f6fbaddc1aea531eec6b7f0436061aab3852d4035bd61fcaa6beefa2f2724200d8845d62851ced816895aa9258179
+EBUILD nrpe-3.2.1-r1.ebuild 2496 BLAKE2B fe7dd7428cd2a76c02906849290de27c91547251569516ebb34c3a4b497f6eee40b21015427e99c49aef49b6ab155ac94979ad45a9450abb98a349bf87aaa1e0 SHA512 0c96afc43353bd48fcfa4bfaf0ba05f537e9abd9d9e78e30dae26ec01546e7acc5ae4ecf690ab6f08010c486149fd5e86eb31b5c29468b9aa6ea8b74c1638daf
 EBUILD nrpe-3.2.1.ebuild 1938 BLAKE2B bd00244a5585503b24b108f167345560d0b7855a8cdd1497fc4e853b86b42e4f9fb67aa1fc767ca67f5e3b1e13424828f295b0a74316c95a17ebb26dbea7aa0f SHA512 f0fa9659e5c06ad4239ede15ac5303675812db6cd06febade51c68aaa05e289ad1f206e53f78c327e918955be4e69e07b621671110044b3f1fc1d161ee36ee64
 MISC metadata.xml 882 BLAKE2B 76bf034c9869b503725f301f0f478c0449787057f1ba4bc22842ddee2d4460b68be1654cdc18e04504469880b71113e7a4b5a0a37fc9138eeb1b39fc2c8833f1 SHA512 2bbdd6bb5d0802985b242b8c058c749eca1adfb102820e2c587699622299936df90ee1ff43445df8686e1dd1648d0131bee40639ddfad3e26e9877c0c61dc40e
diff --git a/net-analyzer/nrpe/files/nrpe-3.2.1-eliminate-systemd-pid.patch b/net-analyzer/nrpe/files/nrpe-3.2.1-eliminate-systemd-pid.patch
new file mode 100644
index 000000000000..6ee520dfa69d
--- /dev/null
+++ b/net-analyzer/nrpe/files/nrpe-3.2.1-eliminate-systemd-pid.patch
@@ -0,0 +1,38 @@
+From c4ad513294e8db25ebaf25127948cce37c13e1b2 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sat, 29 Sep 2018 20:23:53 -0400
+Subject: [PATCH 1/1] startup/default-service.in: remove PIDFile and
+ ExecStopPost lines.
+
+The nrpe systemd service is a "simple" service, which means that it
+runs in the foreground and doesn't need any PID file tracking to begin
+with. The tmpfiles.d entry associated with the PID file is causing
+problems in Gentoo bug 648992, and so as a prerequisite for deleting
+it, this commit eliminates the PID file.
+
+Bug: https://bugs.gentoo.org/648992
+Bug: https://github.com/NagiosEnterprises/nrpe/issues/188
+---
+ startup/default-service.in | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/startup/default-service.in b/startup/default-service.in
+index b6c6063..110a0cd 100644
+--- a/startup/default-service.in
++++ b/startup/default-service.in
+@@ -11,12 +11,10 @@ WantedBy=multi-user.target
+ [Service]
+ Type=simple
+ Restart=on-abort
+-PIDFile=@piddir@/nrpe.pid
+ RuntimeDirectory=nrpe
+ RuntimeDirectoryMode=0755
+ ExecStart=@sbindir@/nrpe -c @pkgsysconfdir@/nrpe.cfg -f
+ ExecReload=/bin/kill -HUP $MAINPID
+-ExecStopPost=/bin/rm -f @piddir@/nrpe.pid
+ TimeoutStopSec=60
+ User=@nrpe_user@
+ Group=@nrpe_group@
+-- 
+2.16.4
+
diff --git a/net-analyzer/nrpe/nrpe-3.2.1-r1.ebuild b/net-analyzer/nrpe/nrpe-3.2.1-r1.ebuild
new file mode 100644
index 000000000000..af8c100f0f30
--- /dev/null
+++ b/net-analyzer/nrpe/nrpe-3.2.1-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit systemd user
+
+DESCRIPTION="Nagios Remote Plugin Executor"
+HOMEPAGE="https://github.com/NagiosEnterprises/nrpe"
+SRC_URI="${HOMEPAGE}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="command-args libressl selinux ssl"
+
+DEPEND="sys-apps/tcp-wrappers
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+RDEPEND="${DEPEND}
+	|| ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )
+	selinux? ( sec-policy/selinux-nagios )"
+
+PATCHES=( "${FILESDIR}/nrpe-3.2.1-eliminate-systemd-pid.patch" )
+
+pkg_setup() {
+	enewgroup nagios
+	enewuser nagios -1 /bin/bash /var/nagios/home nagios
+}
+
+src_configure() {
+	# The configure script tries to detect what OS, distribution, and
+	# init system you're running and changes the build/install process
+	# depending on what it comes up with. We specify fixed values
+	# because we don't want it guessing, for example, whether or not
+	# to install the tmpfiles.d entry based on whether or not systemd
+	# is currently running (OpenRC uses them too).
+	econf \
+		--libexecdir=/usr/$(get_libdir)/nagios/plugins \
+		--localstatedir=/var/nagios \
+		--sysconfdir=/etc/nagios \
+		--with-nrpe-user=nagios \
+		--with-nrpe-group=nagios \
+		--with-piddir=/run \
+		--with-opsys=unknown \
+		--with-dist-type=unknown \
+		--with-init-type=unknown \
+		--with-inetd-type=unknown \
+		$(use_enable command-args) \
+		$(use_enable ssl)
+}
+
+src_compile() {
+	emake all
+}
+
+src_install() {
+	default
+
+	dodoc CHANGELOG.md SECURITY.md
+	insinto /etc/nagios
+	newins sample-config/nrpe.cfg nrpe.cfg
+	fowners root:nagios /etc/nagios/nrpe.cfg
+	fperms 0640 /etc/nagios/nrpe.cfg
+
+	newinitd "startup/openrc-init" nrpe
+	newconfd "startup/openrc-conf" nrpe
+	systemd_newunit "startup/default-service" "${PN}.service"
+
+	insinto /etc/xinetd.d/
+	newins "${FILESDIR}/nrpe.xinetd.2" nrpe
+
+	rm "${D}/usr/bin/nrpe-uninstall" || die 'failed to remove uninstall tool'
+}
+
+pkg_postinst(){
+	elog 'Some users have reported incompatibilities between nrpe-2.x and'
+	elog 'nrpe-3.x. We recommend that you use the same major version for'
+	elog 'both your server and clients.'
+
+	if use command-args ; then
+		ewarn ''
+		ewarn 'You have enabled command-args for NRPE. That lets clients'
+		ewarn 'supply arguments to the commands that are run, and IS A'
+		ewarn 'SECURITY RISK!'
+		ewarn''
+	fi
+}
diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest
index 365d54a98654..abd651f28691 100644
--- a/net-analyzer/ntopng/Manifest
+++ b/net-analyzer/ntopng/Manifest
@@ -1,9 +1,9 @@
 AUX ntopng-2.4-cxx.patch 809 BLAKE2B b142cddf5a76e6683c1220aaed4293d0a90cb2d67b2d446600faec2881c4d8b2ec4d41c247f9301b29ef2e94cedb9f12722cc5442f1e2b139b949143c2944fa1 SHA512 04345262208bc0a6043b83ae94a1fa83a08889f19e5d36e68cca5d11c93f12b026e6179c37aa27fb800a6f019b9eba58055920fcc555f2f9627dc8ee6c0e39ee
-AUX ntopng-2.4-dont-build-ndpi.patch 391 BLAKE2B 71db7d2236b51f6fd6933def076e4044ac289d60a6c1b33092bb2ab26af11a2a9d82bb0f66099ac5d7b09d0cc954466b3e025e5a671137ec5156676629ad76f7 SHA512 5ed80974b17ff7e3bcf369fdc72a4b82b6490b38f5ddaafc9fc21e8d4307debdec0c0dd8ef5fe8b7a4c1945ce1236b2295a3ec578227573769e4c829e501a33c
+AUX ntopng-2.4-dont-build-ndpi.patch 387 BLAKE2B a429abdf9acf6111aa44c5cd26818f1f3f86abd37323113a828d83772b81e42ccda9fe32491c005fddb04f7effc77371812e8a76465f9a3c343c05f3956aa12e SHA512 5e16fc3dcaa7e69802bf94dfd4f63903d07d1cdbd119fde483b01134af4542ef84ba3a14cfa61921f7e924b64d7bb191a8818d7bece21c726c8f5e3876ccc98d
 AUX ntopng-2.4-mysqltool.patch 430 BLAKE2B 052163786435b54d527e01a9e13fc385795f6c9895310bd084d3906307fe36247a549128284a6249dd1034f87a7f138370567fb64b16ae4c1d8b624ca08da204 SHA512 9ade5fb4e8a9f9b205327d482670b87fa249ab375be3414801e46ac34f1204605be4530326836b1ded48e9a63f38d0fecaf047cde09650e380495257a0e0832a
 AUX ntopng-3.0-gentoo.patch 1596 BLAKE2B 36349887ae8f418a0db67d8a96d33785fe5ec4875a987fa9b837857b1cbbdcaa802d2c5b2524b6edeb8cda5aaeec69102f4facd177d43bc321ed50de62135728 SHA512 fcab6670255d7c756694091d6b53a7880a74e8840fa8f77ec81b072dbe7c7a5ec5b4550892dc78c45304ee437a309fe8c79293f6205c570685b8f13178c1c306
 AUX ntopng-3.0-mysqltool.patch 430 BLAKE2B 94410cdac37f6d35b4c6b0f90c3391f79d36242932af2ab520a8db3057b37b3d059fd708e0af930bf8321babadade61621f79f77ac55581ebe46555e6cd9e6c6 SHA512 82b06a14f471bd037743a7563a80d6460e63ff262252d0318e40ba25bf8da849bc0394a5fa4d54befd5df6bd4b645b86711708198f8971d54eb15e8f32c83cd5
-AUX ntopng-3.0-pointer-cmp.patch 525 BLAKE2B 67e9038c49caeb8ca61cd48850f8d78c6c52a13b9768c390091e88563999ba28966b995dc10cdaff6ee5727d284dd90b9f125dc616a3bc41ad9e5872e7ce1c5a SHA512 17b3b230a94b4693aee6cb25219b6cc102d49d3029796646630e83a37db9a7417686defe810c524422e0dfc9367f2a776ca1d67dc84ed32182ff263e2e737c5b
+AUX ntopng-3.0-pointer-cmp.patch 340 BLAKE2B 2b361ac6fc25857125b192fab11cb1c060bef6fb220386ffaf5b3df68ee5f52e173fc63e3a70175d746df52ae258bb2fd01ab6b3888ccfd320700083540ab0e7 SHA512 30e0137046c5612d627c3efb7a17b303a04144e63dc14e3ffd393cd87444b623af6430a6520181e5cf3fef5e89e51594c9700306bba1ffea2a9e6795e7c5e861
 AUX ntopng.conf.d 117 BLAKE2B 67e2962fcb0303ab465b3d8def04192992e3e7306c5e76084a58cca5bdf1a797b08193f2a3512f876ff9c5300b0f3504055e7166afcbb4cbc527658c74b0616b SHA512 bb66d11245ce099f9e09f97d830da60df910682242db0c5c7d17bcd800e84cf3bce6288fb75fc3a8f3e214a580dc0d076f7f69aa924d9ad3e4c8bff093252061
 AUX ntopng.init.d 549 BLAKE2B de561950f001e35a26b522728affa5971d8a0fdd1d855746509c0e6861df7ed9c356abe6bc066df65524c340d05c072e7c4de0864c250164b8a1509b34d508c0 SHA512 1fbcc46fe10dcef82a1310d74c4351c72752cdd2a9b9908705c8c645698430e456f1ba14b77fd7c1f374a237a508c2d33324de61f5f1f8255ed75a384e874d84
 DIST ntopng-2.4.tar.gz 134074662 BLAKE2B dbf654e5cd1f9eddb5ae325bdf0ac2e7ce22c08f55363b10723bde2cb5fd86cf3b0c7fef0f55dc7fcce0341f5fbb9a7132f26e29649bcf66020b640975c0e6da SHA512 515dd7889ae3aaf2482371bb2c55ab7300cf4207fe07f37029b7529bfb710379c19a54f58cf6df87e42454c0c99d15291af334adff676252301d9edd0acf3c7a
diff --git a/net-analyzer/ntopng/files/ntopng-2.4-dont-build-ndpi.patch b/net-analyzer/ntopng/files/ntopng-2.4-dont-build-ndpi.patch
index ec628cd32242..ef40c72d5896 100644
--- a/net-analyzer/ntopng/files/ntopng-2.4-dont-build-ndpi.patch
+++ b/net-analyzer/ntopng/files/ntopng-2.4-dont-build-ndpi.patch
@@ -1,4 +1,4 @@
---- a/configure.ac.old
+--- a/configure.ac
 +++ b/configure.ac
 @@ -62,13 +62,6 @@
  fi
diff --git a/net-analyzer/ntopng/files/ntopng-3.0-pointer-cmp.patch b/net-analyzer/ntopng/files/ntopng-3.0-pointer-cmp.patch
index 11fb47ca3853..171bee36e897 100644
--- a/net-analyzer/ntopng/files/ntopng-3.0-pointer-cmp.patch
+++ b/net-analyzer/ntopng/files/ntopng-3.0-pointer-cmp.patch
@@ -1,6 +1,5 @@
-diff -Naur ntopng-3.0-orig/src/AddressResolution.cpp ntopng-3.0/src/AddressResolution.cpp
---- ntopng-3.0-orig/src/AddressResolution.cpp	2017-06-01 00:18:57.000000000 -0700
-+++ ntopng-3.0/src/AddressResolution.cpp	2017-11-27 23:13:50.158163187 -0800
+--- a/src/AddressResolution.cpp
++++ b/src/AddressResolution.cpp
 @@ -52,7 +52,7 @@
    u_int numeric_ip_len;
  
diff --git a/net-analyzer/sec/Manifest b/net-analyzer/sec/Manifest
index e4f4d683c640..d785bb6d4bdb 100644
--- a/net-analyzer/sec/Manifest
+++ b/net-analyzer/sec/Manifest
@@ -3,7 +3,9 @@ AUX sec.init.d 693 BLAKE2B c8c9320d9eed23c576ead743444bbb2f528bbb7ca6ef5511a7ca8
 DIST sec-2.7.12.tar.gz 134197 BLAKE2B 9997788c61a35c87036e6347c93782aacdd34e4cd3f6ec5d457a571237d5594b3f7860ab7be4ef37638c2dc1b22f7de666bdd287ae634d8ab259e0c0dd04d8bf SHA512 927ce602057c58993d7abd0aca0a7cde7ce6f77af01f72a414d165b93326a8e0a12bb5bc8c1f8d7737416beb16de92911db5ea20a8109e343e2e26e8efc649bd
 DIST sec-2.7.6.tar.gz 121621 BLAKE2B 43dbccd05aa274459ba8746c8aba33bae0307929524a9ad77087a6c28305b2f0b7d34f9cb79b7503d2269b84524687b24441263ee99a7061c0e033e15e4b9f01 SHA512 9c050b89970663784f5c149d46c6c6ab941590ef4300ca09ea35b347b2eaa3bad12083bd6e619f25d5024a35de69e020c354b507ac49e3faef1013336ea2d5f5
 DIST sec-2.8.0.tar.gz 143621 BLAKE2B f547635ee42860b6e9caa2d2a0604e91d3ae5c0846e10d5c9352650d822d9e2d884892c455b9cef3b39e649258720f4761055dd78d74ec6c6be4455438a4fb60 SHA512 e0a4bdc07c80ef6b061b20d4b444ff8dc406a63cf48a77defa3563d6980f5b5bc9f6ff8d70b2ff51e9f40955655ad3c750be5a01726a848b80a84aec0d6d1bad
+DIST sec-2.8.1.tar.gz 143700 BLAKE2B 4101883ccd947140546659c799f9641d496912f22e08debbae5bc9b8b65301ddfeb4c005a9885063c6381383d1f0581a7b96f56cf53bf2401438cfa6cf1755f0 SHA512 03c7acd1e1cfd6dc11143e0ff35758925ddc75e460987a91d5606564f0caa45afade497b8653ec2d8865cfcfab4d87743777eb104e1a16f79069cf61e17d0661
 EBUILD sec-2.7.12.ebuild 588 BLAKE2B c2ddde9713b7dce5df0adaeb529234b6b5a6e721799c0a50d6735b871eb7035f6196ee0501c9406dfc777825c379efaef0bcaa12a21d7f62324f820b6ec1de1c SHA512 a9d7f07089fad6109027d235cda4ad0e884903446abbdc8b7044e61ac1a9f592d1ff1bf491e6b40e27f746e1dd5635eff85a029f455dc69591c8610adfe3e1eb
 EBUILD sec-2.7.6-r1.ebuild 586 BLAKE2B e3bde9b861cc02de2581baf734db4010ebbee161112761bec720b29c6c8adf4edec9cb5ebe91f601ea0b7ff1192275de33bb9c39a540b83613dabb56927d49eb SHA512 4034915b115742ecb4af7064d5201b307a130d9f5f0c81d4d4c4107b144bc46de592cc01c391412e6c1e42f457b51d44abda67753f47856cd2ae3ea065b78b6d
 EBUILD sec-2.8.0.ebuild 588 BLAKE2B 5772d21353eda48ebfe7b4b3eb6ae773e9dd0b17a24e9e43bd40a6ddfdeeb60816a346b977d33956edbbeba1cadd3635f56c028a97cf0e2f8ee717332658c0a8 SHA512 5e0df4741d9983809aef22e7402ebdd8ea873bffdd87ba25eabc004263861699b829b2be6069052b7cfc725543699c4c1c01cd255ab3618f3833b1fb024fa37f
+EBUILD sec-2.8.1.ebuild 585 BLAKE2B bd6753b397aebb6bc4f0ac0f173ad17f436a9aa5d2124a62d05efcfdbac5d55a38fd2322a71b29bfbdf055713f07572fa2a0053b5513897d3053112ec433a2c3 SHA512 fe82437d3edf3ad40fc931efee30c32c15cc82ead092e62745100b7fdbdb6c07864c141be72f9d9c3cb1e4c406a8f90105f92bff88d69a26df5c0508315d074a
 MISC metadata.xml 420 BLAKE2B 29fa29df871421f64c8830bb568810b3a5247096ddd393276fa1fb0ae6f935f89c60ff4aa98a38ce5f3360d1974e454ab82f86c0a6e92c3f587140abbc0a6326 SHA512 328ae47d44a57623e92e4a03d1877898d18088aeca6998d4d5a827688e8f449337668e83ecb93ba4d74a011f5b19f8862e59ca657246a5e85a6749c19f0c7dab
diff --git a/net-analyzer/sec/sec-2.8.1.ebuild b/net-analyzer/sec/sec-2.8.1.ebuild
new file mode 100644
index 000000000000..1cd6cd62871c
--- /dev/null
+++ b/net-analyzer/sec/sec-2.8.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Simple Event Correlator"
+HOMEPAGE="https://github.com/simple-evcorr/sec"
+SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
+
+RDEPEND=">=dev-lang/perl-5.8.0"
+
+src_install() {
+	dobin sec
+
+	dodoc ChangeLog README
+	docinto contrib
+	dodoc contrib/{itostream.c,convert.pl,swatch2sec.pl}
+
+	newman sec.man sec.1
+
+	newinitd "${FILESDIR}"/sec.init.d sec
+	newconfd "${FILESDIR}"/sec.conf.d sec
+}
diff --git a/net-analyzer/testssl/Manifest b/net-analyzer/testssl/Manifest
index a314802cddcc..fc2f228394c5 100644
--- a/net-analyzer/testssl/Manifest
+++ b/net-analyzer/testssl/Manifest
@@ -1,3 +1,4 @@
 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.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-r1.ebuild b/net-analyzer/testssl/testssl-2.9.5_p5-r1.ebuild
new file mode 100644
index 000000000000..41bdd598f1b3
--- /dev/null
+++ b/net-analyzer/testssl/testssl-2.9.5_p5-r1.ebuild
@@ -0,0 +1,60 @@
+# 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"
+
+RDEPEND="
+	app-shells/bash[net]
+	net-dns/bind-tools
+	sys-apps/util-linux
+	sys-libs/ncurses:0
+	sys-process/procps
+	!bundled-openssl? ( dev-libs/openssl:0 )
+"
+
+S=${WORKDIR}/${MY_PN}-${MY_PV}
+
+QA_PREBUILT="opt/${PN}/*"
+
+pkg_setup() {
+	use amd64 && BUNDLED_OPENSSL="openssl.Linux.x86_64"
+}
+
+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 964050b2e00f..a5be1019f5be 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 884 BLAKE2B 74ab7b53d45f0243aa861b34a1a5cd6bc2a044164d1c07d65197b07bcfcf752655c6c91c278f27afcb041772457298e8f71e5cf950e9ebf5abc9dd7a5453fa8a SHA512 2826f659286d4c032827750627b5b9bad96cceb708a520671873d69f1dff6b8553f332594318bc8b8710fce22c4e63826fc98ae517cd5b55cd933a52070e11a1
+EBUILD traceroute-2.1.0.ebuild 874 BLAKE2B accd50fa5679831bf1ea019525d79b92ea193373c0f5f93a38f31f96cb0f0465769b0c4eaae572fac1062db9047f8a6d34f28f76fd8ee90c3e1c31b77448e20f SHA512 575f1debae404646d78434912ca0ee25b363947021f2dc99e3a058bae64aa5cd3f122c554114bf049a3a479efef03d4f1a52d9a04aff86f768fff87909704e9f
 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 59d723a8fac2..5b1611a1a775 100644
--- a/net-analyzer/traceroute/traceroute-2.1.0.ebuild
+++ b/net-analyzer/traceroute/traceroute-2.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
@@ -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-dns/Manifest.gz b/net-dns/Manifest.gz
index d86accf04ad9..a41568b15e2c 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index 46f9ae4bc7db..27575aec9b2e 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -4,8 +4,8 @@ AUX dnscrypt-proxy.initd 632 BLAKE2B 6f82264977f3ca795d4f92919cf7da606c02a0d10ce
 AUX dnscrypt-proxy.service 1198 BLAKE2B 14db1a48f94b07622e0f52d8510e6c1634013e66ab5e5cdd7ddf7c0cde4441fd78b71134e4cfb6f122ba4a191ec032d54e92b1be97e4bd49af61a873431ea002 SHA512 c7dfe482a8ea17cb67681b92ac65a2d2d58d2be364351d131b0b689905d80390c5df794f6c7fb944bd508f69af72af96d36c1b7f7c5c70af7ee636423ab77e11
 AUX dnscrypt-proxy.socket 517 BLAKE2B afa07d5a441b55de46059935a0fa9b7f61bcbfced925b24282be27978a507248303a43f32f2785d585e79c6a9f456a9c3118028014cb78cde5df4ea1be150b6c SHA512 9620307006642cd211b8032939b2e4f592f73d041c6a499f1c74160812853b03543ff84619e8060e064b99a3b7c44b794907722fe485233937e3804b49e29a36
 DIST dnscrypt-proxy-2.0.16.tar.gz 3770249 BLAKE2B e6dc40ec503cff11e4deec1a243875fff42ec7ecba8c7c3552b69322d405c762fa152e7e9417baf944e2a476715f00813a305c20db583970520d35acd378f1d4 SHA512 f138df20560dd440a2ed390c1468d630191ae7b0e50521b4dde3fa7ef4377c3ae6409e8c547858bace53216c84aeeea6794305546b9ff87832f704c160c6782f
-DIST dnscrypt-proxy-da5ee45b8ceb9233f4bc21b2a5f1eb7c875947cc.tar.gz 3266257 BLAKE2B bc724b56ef75faf1e2416e81fe3e68947f1581ef1c85575b8c7c5bde721f41f32604835678923dd12654b23a2c97a7e84d598eb8c7a7f553cb59c998141ff19c SHA512 cd23bc4cee7a1d9337ad5a41cf49c5603d9bfb8b7a0458532de68df35f8bd1bb75c39c069dc692506673bdba485e360b23712e997072ed86b541597aa3ea9b12
+DIST dnscrypt-proxy-2.0.17.tar.gz 3364933 BLAKE2B 65f2f1c91cc175a3bc92103dd0a2984dfccf5b961d070097035e8bd8058c7eab41c05cd3fabbff729f9521b16ebbfb188008c65efa5c89578b4b54ce43348d05 SHA512 c1cb2cfff4a5f6eba81ac3b520ddb3acb311031588495b9f94a7ee5ab35ed0827a856369ce0ac7ff206445dbf24f7931cf937ccd9f724b4e38c97f10814df129
 EBUILD dnscrypt-proxy-2.0.16-r1.ebuild 2906 BLAKE2B 00c7405d34cbfa51c219ad0e708f9bc93eb3517dbaf6484ad46ad9116a4e489e0c10495c4c10e710a5434bbd26f3bd1f54b61bcafdfec35ebd96ec71f2569aaf SHA512 00e944487ddaafb9b55cf67ebfce3b7d3e13f4a931c21e1770a3beeeb140dc1dc3f65f8308180dfe9fbda1d53aa6a2e04bc3fc87a63fbb1f83c299887e556b35
-EBUILD dnscrypt-proxy-2.0.17_pre20180903.ebuild 3340 BLAKE2B f6041dc3e96600aabbe7f2d4719c810f92e720c1f25a25bafe8ddadc2dc211c0370d764936b67b6b2314870c2dfedf336633b29e12c95ba80e2d00c66f28bdf9 SHA512 a90d21da4eb6bccde4d11bf7bb23e623d0a8dc66a39ec9012e5e82c1c2d2978fb6ff6c6907ac3cfb9624080cdc8dbd5c27b8a1f662cb84d67cb88c2e0f46376f
+EBUILD dnscrypt-proxy-2.0.17.ebuild 3049 BLAKE2B cecaec499e9351f833e675c48d6f0792b03fdfe90edb9fa7d62c3ed7e0c0a0bf9bc8805380f48df0b80986d3f8866ef7fc98cf829942257aa8a6cdf9da4b6030 SHA512 8842a6f5b6deb814355e17961cd6f107347751c017dab9ea15925079199e83618c866778d4a5e712e1eb02d263ac362970430bff5d3a009b6d6a0b26349fd31a
 EBUILD dnscrypt-proxy-9999.ebuild 3052 BLAKE2B f159a8b16482f32aa5eae337cb425a1800c6bdeb58c503ba0981f5e5cb8184c6d6b749602a113a7fe4b7738ac3dd5b08fe6fb99351d59259e1d91897a8b20d23 SHA512 151ef1a5565e836e2eb0bc4854ef1b89f5c3311ffd49ca760d466692190b819b5dd3742f6905221facd190b2e2d2170c8aa11c5ff7bfdcd8c54b2a0042dbb9bd
 MISC metadata.xml 630 BLAKE2B a20afc1f8db35b9833819322d9845519540f27864a21b743c364a14c70cabb23efca28fe4302a6d995846941ab41a92e3f811898c18281f613f2d44811249d4d SHA512 803fab528ee6776c5c101770a4fb93d021ac8bf4a71e341f99b067df8dceaa413d53604ba616b99cb695fefc25424035a2754fa033a0e62ec5fd7c3e24219d22
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.17.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.17.ebuild
new file mode 100644
index 000000000000..e2157844bf14
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.17.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/jedisct1/${PN}"
+
+inherit fcaps golang-build systemd user
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://${EGO_PN}.git"
+else
+	SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
+HOMEPAGE="https://github.com/jedisct1/dnscrypt-proxy"
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="pie test"
+
+FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
+PATCHES=( "${FILESDIR}"/config-full-paths-r10.patch )
+
+pkg_setup() {
+	enewgroup dnscrypt-proxy
+	enewuser dnscrypt-proxy -1 -1 /var/empty dnscrypt-proxy
+}
+
+src_prepare() {
+	default
+	# Create directory structure suitable for building
+	mkdir -p "src/${EGO_PN%/*}" || die
+	mv "${PN}" "src/${EGO_PN}" || die
+	mv "vendor" "src/" || die
+}
+
+src_configure() {
+	EGO_BUILD_FLAGS="-buildmode=$(usex pie pie default)"
+}
+
+src_install() {
+	dobin dnscrypt-proxy
+
+	insinto /etc/dnscrypt-proxy
+	newins "src/${EGO_PN}"/example-dnscrypt-proxy.toml dnscrypt-proxy.toml
+	doins "src/${EGO_PN}"/example-{blacklist.txt,whitelist.txt}
+	doins "src/${EGO_PN}"/example-{cloaking-rules.txt,forwarding-rules.txt}
+
+	insinto /usr/share/dnscrypt-proxy
+	doins -r "utils/generate-domains-blacklists/."
+
+	newinitd "${FILESDIR}"/dnscrypt-proxy.initd dnscrypt-proxy
+	newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy
+	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.service dnscrypt-proxy.service
+	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.socket dnscrypt-proxy.socket
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if ! use filecaps; then
+		ewarn "'filecaps' USE flag is disabled"
+		ewarn "${PN} will fail to listen on port 53"
+		ewarn "please do one the following:"
+		ewarn "1) re-enable 'filecaps'"
+		ewarn "2) change port to > 1024"
+		ewarn "3) configure to run ${PN} as root (not recommended)"
+		ewarn
+	fi
+
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if [[ ${v} == 1.* ]] ; then
+			elog "Version 2 is a complete rewrite of ${PN}"
+			elog "please clean up old config/log files"
+			elog
+		fi
+		if [[ ${v} == 2.* ]] ; then
+			elog "As of version 2.0.12 of ${PN} runs as an 'dnscrypt-proxy' user/group"
+			elog "you can remove obsolete 'dnscrypt' accounts from the system"
+			elog
+		fi
+	done
+
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		elog "Using systemd socket activation may cause issues with speed"
+		elog "latency and reliability of ${PN} and is discouraged by upstream"
+		elog "Existing installations advised to disable 'dnscrypt-proxy.socket'"
+		elog "It is disabled by default for new installations"
+		elog "check "$(systemd_get_systemunitdir)/${PN}.service" for details"
+		elog
+
+	fi
+
+	elog "After starting the service you will need to update your"
+	elog "/etc/resolv.conf and replace your current set of resolvers"
+	elog "with:"
+	elog
+	elog "nameserver 127.0.0.1"
+	elog
+	elog "Also see https://github.com/jedisct1/${PN}/wiki"
+}
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.17_pre20180903.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.17_pre20180903.ebuild
deleted file mode 100644
index c9ee2a53186f..000000000000
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.17_pre20180903.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_COMMIT="da5ee45b8ceb9233f4bc21b2a5f1eb7c875947cc"
-EGO_PN="github.com/jedisct1/${PN}"
-MY_P="${PN}-${EGIT_COMMIT}"
-
-inherit fcaps golang-build systemd user
-
-DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
-HOMEPAGE="https://github.com/jedisct1/dnscrypt-proxy"
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="pie test"
-
-FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
-PATCHES=( "${FILESDIR}"/config-full-paths-r10.patch )
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup dnscrypt-proxy
-	enewuser dnscrypt-proxy -1 -1 /var/empty dnscrypt-proxy
-}
-
-src_prepare() {
-	default
-	# Create directory structure suitable for building
-	mkdir -p "src/${EGO_PN%/*}" || die
-	mv "${PN}" "src/${EGO_PN}" || die
-	mv "vendor" "src/" || die
-}
-
-src_configure() {
-	EGO_BUILD_FLAGS="-buildmode=$(usex pie pie default)"
-}
-
-src_compile() {
-	ego_pn_check
-	GOPATH="${WORKDIR}/${MY_P}:$(get_golibdir_gopath)" \
-	go build -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
-}
-
-src_test() {
-	ego_pn_check
-	GOPATH="${WORKDIR}/${MY_P}:$(get_golibdir_gopath)" \
-	go test -v -work -x "${EGO_PN}"
-}
-
-src_install() {
-	dobin dnscrypt-proxy
-
-	insinto /etc/dnscrypt-proxy
-	newins "src/${EGO_PN}"/example-dnscrypt-proxy.toml dnscrypt-proxy.toml
-	doins "src/${EGO_PN}"/example-{blacklist.txt,whitelist.txt}
-	doins "src/${EGO_PN}"/example-{cloaking-rules.txt,forwarding-rules.txt}
-
-	insinto /usr/share/dnscrypt-proxy
-	doins -r "utils/generate-domains-blacklists/."
-
-	newinitd "${FILESDIR}"/dnscrypt-proxy.initd dnscrypt-proxy
-	newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy
-	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.service dnscrypt-proxy.service
-	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.socket dnscrypt-proxy.socket
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-
-	if ! use filecaps; then
-		ewarn "'filecaps' USE flag is disabled"
-		ewarn "${PN} will fail to listen on port 53"
-		ewarn "please do one the following:"
-		ewarn "1) re-enable 'filecaps'"
-		ewarn "2) change port to > 1024"
-		ewarn "3) configure to run ${PN} as root (not recommended)"
-		ewarn
-	fi
-
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if [[ ${v} == 1.* ]] ; then
-			elog "Version 2 is a complete rewrite of ${PN}"
-			elog "please clean up old config/log files"
-			elog
-		fi
-		if [[ ${v} == 2.* ]] ; then
-			elog "As of version 2.0.12 of ${PN} runs as an 'dnscrypt-proxy' user/group"
-			elog "you can remove obsolete 'dnscrypt' accounts from the system"
-			elog
-		fi
-	done
-
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		elog "Using systemd socket activation may cause issues with speed"
-		elog "latency and reliability of ${PN} and is discouraged by upstream"
-		elog "Existing installations advised to disable 'dnscrypt-proxy.socket'"
-		elog "It is disabled by default for new installations"
-		elog "check "$(systemd_get_systemunitdir)/${PN}.service" for details"
-		elog
-
-	fi
-
-	elog "After starting the service you will need to update your"
-	elog "/etc/resolv.conf and replace your current set of resolvers"
-	elog "with:"
-	elog
-	elog "nameserver 127.0.0.1"
-	elog
-	elog "Also see https://github.com/jedisct1/${PN}/wiki"
-}
diff --git a/net-dns/dnssec-root/Manifest b/net-dns/dnssec-root/Manifest
index 315e3e23df91..ba27085fd605 100644
--- a/net-dns/dnssec-root/Manifest
+++ b/net-dns/dnssec-root/Manifest
@@ -4,8 +4,12 @@ DIST Kjqmt7v-20100715.csr 765 BLAKE2B 7bb224d49a340d583c3bcfce7b8f9b1c12cb955998
 DIST Kjqmt7v-20150504.crt 974 BLAKE2B 24a4edd7638e14dd0983ea160f20613980342b78d8de0c9e7891e0b06c94c84e31ec2391cc40b745d1415310d6be0d11f415701feca288e253446101aeac886a SHA512 98adfc6a5d37c632eda9f642449ecd6c1bf1d49ebed2750cfe3bd99629b4935f51ecc4aafbd6ea69595b2f2cb15887bd9a1647aa255a564263f5c7b648c7adf1
 DIST icann-20110715.pgp 3401 BLAKE2B 0f1eabed0ab0d5ec78c5387c7f2b3a13a1da12643d6b60e39766d18ac603ef673e204bd7df5d600fa53cdbf51fcff5dfe6b690cddc3559cae95405ca96e7b391 SHA512 5fba8334850f2ae753f4f8a30d1e6c62abc341ece2dc83df4bc0f6db2b91ae68942c0d2a38eab3d33b5b91640cd1cf0970777225c15d5f961884c00077d539a2
 DIST icannbundle-20150504.pem 17435 BLAKE2B 3e532398142ebf62dc52174c4c705ebdd6a634a67e7ce6c1e0a38d41fdab548afd1b0b75f58481d69578fd0fd97b236c62fdbe65efc3ced132115826eff695d4 SHA512 f9b9e43ad71608921d1e79f25cd98ca8c712256d4e31b04035a9aac7b46f3ec951089ca23e84500c5901d53afb66991a30818b4cd6f6de6885a107f486f56994
+DIST icannbundle-20170203.pem 13026 BLAKE2B 36f760c69e8e22036d7d927071be25508b6906838f0f468900385d5a3b9ce301c5688f9bdcab471abc5445a14bfbbe34ecb39ca131b01d9e6bbebcc3f1481241 SHA512 6a8b8bec6d104d31253a8acafc1694a095714537a39a4dc53a379ac900c83715f85d75ea7322de430557691ff31ec95ae5104f47b050da3568dd68377c2d5767
 DIST root-anchors-20100715.asc 189 BLAKE2B b709f2f67cd3e197fcaf0ac2556434ff0b4fd86114084e3281f27b70ecb4770b81f22d22f46c6173f0eef384ce5440685af8e77b75c576ce55e8dbdc79d86c49 SHA512 e9c86b897d7e8edb979cba4bebe353b7c7f21b4061cd6f571c8671b02e73c2ea0b78a980169fa7d40987b9e962a0f1ba17dbb392b5ec6ad14fedce65a139c913
 DIST root-anchors-20100715.xml 418 BLAKE2B 71e809ed74c25283ea1db36707be57965d5b2dd28e6bf055851866746455bbc672e87b310b38b069936545a6ce99dbf67b1d542d78ef3ef84b76b31bd129ea8d SHA512 bca506c852bc83aa9d04ed0b52bef6d0baec745e466292273d52f49fd73cec73db4c6d55a9921fe086c7edc618f3ab21dc03146b6d617644495b3926e262e572
 DIST root-anchors-20150504.p7s 5001 BLAKE2B 088dc39160013dbc63a82fcb7666c7c73707958dddbaf730ea212a038301549ce19109ec2b11962a0855f864bc8675142b21aa65884be9eecdf5b9b9898e4f36 SHA512 af188871f2ef7f9efb0d3f4822754e962fb921d62de925823f90a0c7dbe80b7a0188534adbdb324680ae981912968fcfa851eb72fb37694df8701fd749e7ff51
-EBUILD dnssec-root-20150403.ebuild 2989 BLAKE2B dfc2115b1739d4405cb0f726d19062c2825c7c80a47e2476c60645aa49b303e2f1659cf59e5d3f3f1a015ca7f5223395b8ed381dd48e44fcdbfcf75fdefa8542 SHA512 bcd282c0096721ff0a0d4cf11be9f6d6206d5bc34e6f3b70a362a17548beba880feb4d6e1ecac10dfae0a7b07b59e141db2981030d0b3c95a7bc3868efdd7581
+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
 MISC metadata.xml 327 BLAKE2B 62401c527b8fc9b2bbcfe6502060fe06543e2fbebcea988e0b0c50223aec705d6c0e04e7233f5aedcf4694889fa23397c03b1048df07ec8de59f7bac3c3efdc0 SHA512 27361587e570a2f35e178724db7cf89cafc4da8e64984c7fd79971a469f96c128ed488b03e59fc3de4a1d1012664aaa66540dc79f0a85c9f191c19bc864bb1fc
diff --git a/net-dns/dnssec-root/dnssec-root-20150403.ebuild b/net-dns/dnssec-root/dnssec-root-20150403.ebuild
index 658f6733f181..fd08ba9793e3 100644
--- a/net-dns/dnssec-root/dnssec-root-20150403.ebuild
+++ b/net-dns/dnssec-root/dnssec-root-20150403.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-dns/dnssec-root/dnssec-root-20170203-r1.ebuild b/net-dns/dnssec-root/dnssec-root-20170203-r1.ebuild
new file mode 100644
index 000000000000..63c08e88bb7e
--- /dev/null
+++ b/net-dns/dnssec-root/dnssec-root-20170203-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="The DNSSEC root key(s)"
+HOMEPAGE="https://www.iana.org/dnssec/"
+SRC_URI="https://data.iana.org/root-anchors/root-anchors.xml -> root-anchors-${PV}.xml
+	https://data.iana.org/root-anchors/root-anchors.p7s -> root-anchors-${PV}.p7s
+	https://data.iana.org/root-anchors/icannbundle.pem -> icannbundle-${PV}.pem"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-macos"
+IUSE=""
+
+RDEPEND=""
+DEPEND=">=dev-perl/XML-XPath-1.420.0"
+
+src_unpack() {
+	mkdir "${S}" || die
+
+	cp -t "${S}" "${DISTDIR}"/root-anchors-${PV}.{p7s,xml} "${DISTDIR}"/icannbundle-${PV}.pem || die
+}
+
+src_prepare() {
+	mv root-anchors-${PV}.xml root-anchors.xml || die
+	mv root-anchors-${PV}.p7s root-anchors.p7s || die
+	mv icannbundle-${PV}.pem icannbundle.pem || die
+
+	if has_version "dev-libs/openssl" ; then
+		# Signature validating is optional:
+		#   - We are already downloading SRC, signature file & CA from same URI
+		#   - We store checksums for distfiles
+		einfo "dev-libs/openssl is available, will validate signature of root-anchors.xml"
+		openssl smime -verify \
+			-content root-anchors.xml \
+			-in root-anchors.p7s -inform der \
+			-CAfile icannbundle.pem || die "OpenSSL S/Mime verify failed"
+	else
+		einfo "dev-libs/openssl is not available, skipping optional validation root-anchors.xml"
+	fi
+
+	default
+}
+
+src_compile() {
+	local KEYTAGS="" ALGORITHMS="" DIGESTTYPES="" DIGESTS="" i=1
+
+	KEYTAGS=$(xpath -q -e '/TrustAnchor/KeyDigest/KeyTag/node()' root-anchors.xml)
+	ALGORITHMS=$(xpath -q -e '/TrustAnchor/KeyDigest/Algorithm/node()' root-anchors.xml)
+	DIGESTTYPES=$(xpath -q -e '/TrustAnchor/KeyDigest/DigestType/node()' root-anchors.xml)
+	DIGESTS=$(xpath -q -e '/TrustAnchor/KeyDigest/Digest/node()' root-anchors.xml)
+	while [ 1 ] ; do
+		KEYTAG=$(echo ${KEYTAGS} | cut -d" " -f$i)
+		[[ "${KEYTAG}" != "" ]] || break
+
+		ALGORITHM=$(echo ${ALGORITHMS} | cut -d" " -f$i)
+		[[ "${ALGORITHM}" == "" ]] && die "root-anchors.xml contains invalid key: ${KEYTAG} is missing algorithm"
+
+		DIGESTTYPE=$(echo ${DIGESTTYPES} | cut -d" " -f$i)
+		[[ "${DIGESTTYPE}" == "" ]] && die "root-anchors.xml contains invalid key: ${KEYTAG} is missing digest type"
+
+		DIGEST=$(echo ${DIGESTS} | cut -d" " -f$i)
+		[[ "${DIGEST}" == "" ]] && die "root-anchors.xml contains invalid key: ${KEYTAG} is missing digest"
+
+		echo ". IN DS $KEYTAG $ALGORITHM $DIGESTTYPE $DIGEST" >> root-anchors.txt
+		i=`expr $i + 1`
+	done
+
+	if [[ ! -s "root-anchors.txt" ]] ; then
+		die "Sanity check failed: root-anchors.txt is empty or does not exist!"
+	fi
+}
+
+src_install() {
+	insinto /etc/dnssec
+	doins root-anchors.{p7s,txt,xml} icannbundle.pem
+}
diff --git a/net-dns/s6-dns/Manifest b/net-dns/s6-dns/Manifest
index dcd80529d38b..923ede801e0c 100644
--- a/net-dns/s6-dns/Manifest
+++ b/net-dns/s6-dns/Manifest
@@ -2,4 +2,4 @@ DIST s6-dns-2.2.0.1.tar.gz 76046 BLAKE2B c7c7e94fa47fc20e2a328f2fc22650585e9bd02
 DIST s6-dns-2.3.0.0.tar.gz 76476 BLAKE2B 6896bf534d872aac19dd6b2ad819d7aee6d52737f33106640ad1c3afc7f8857e5672f3e35f7f2064cb8085a79adc33bdd33a99dc656a656040a93f813a986717 SHA512 9afa98d0a7a9d84311f6f93d5c1742f7dcfb84c76ca363f9e09b3b40cd3faa1721aebb6e974a98991c037d82b2540c1edbc3cc13ea5f7e3dd95a96d14918e454
 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
-MISC metadata.xml 544 BLAKE2B 815c27188ff1bee0ac1324206a32bc885224c7148108cc4189d84aa4e2a9db77a493ff56da6d64792709154c0652ae604ad327babc9d421e6d4658af0a6f191d SHA512 3927f465e32d28b0b0571a472ab36c7e5cacbf8eb5303d044e735be4345cbd0e215bc167e25027c5e91c744df54b7c7f22b993cf6a4a1a7aa4b43ce5330526ed
+MISC metadata.xml 764 BLAKE2B 7e6f7e1ea30dcf3e0b8c08d90457019cfb0d577f2c7ad4d4664d2770c150ac2e51d38c047a7b41c5541c1a3771b8c18ad547f2a87cb4d13f49b6cf9141cf1aae SHA512 d49c08c4eb0bcdc6bade611ced7588ed1f6e8bb6c71a677b1b1ab1ef2357229a3a380858aecbf57a4fd9a75511fcd32cb7ea1ea91b75c7a0787518a83fd4ab62
diff --git a/net-dns/s6-dns/metadata.xml b/net-dns/s6-dns/metadata.xml
index e93f8569c708..d62b9e59590b 100644
--- a/net-dns/s6-dns/metadata.xml
+++ b/net-dns/s6-dns/metadata.xml
@@ -9,6 +9,14 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>aranea@aixah.de</email>
+		<name>Luis Ressel</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		s6-dns is a suite of DNS client programs and libraries for Unix systems,
 		as an alternative to the BIND, djbdns or other DNS clients.
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index 238d3fbc0202..96e51a0cdbf5 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -32,5 +32,5 @@ 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 5362 BLAKE2B 4641dd8a572599793da384249d59a4f988847ebefdec73de43fb0320c212db63d60415cbf4d0c01f192e07f1977791d7be96c1eccc4637d33794336850e661df SHA512 f2216005d1fa1e5e1c73087af818c7767f446ab72e40358b4c30c02ee400e30c0c4c1517e2430739d363f3fc78979c42394ae97538e62cae4fc1d6b15d832f45
+EBUILD unbound-1.8.0-r1.ebuild 5357 BLAKE2B f502e7c2953e02706e0b960e289d262c02d7317af25c0715727dd9ec63ecff34da99818989ab5451a57ebf4a7aa61c3e8257a2d2e96c0463d885fc4028afed9f SHA512 62ed3dbb2460694c424923637d95e91e589ca3179b4885b3e2c4af7291401e53d1d8df09c82d02c17c6286ef0b79d1829a5d257c24aa160382feb0ea1d326ed1
 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 f294360a6d44..4a5830825022 100644
--- a/net-dns/unbound/unbound-1.8.0-r1.ebuild
+++ b/net-dns/unbound/unbound-1.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"
@@ -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-fs/Manifest.gz b/net-fs/Manifest.gz
index 244445175b94..9abb6a829cac 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/mc/Manifest b/net-fs/mc/Manifest
index 45659ef93903..0db116af9ea1 100644
--- a/net-fs/mc/Manifest
+++ b/net-fs/mc/Manifest
@@ -2,8 +2,10 @@ DIST mc-0_pre20180209.tar.gz 2770164 BLAKE2B 5ca4b9571df86ab4ac9d3f9a12bf9c99ff0
 DIST mc-0_pre20180325.tar.gz 1367439 BLAKE2B 4c4a78bca067647b16d4ae0f142d78adaaf0f2acc67ff58170d61247b0a6218d924b67e55e092729370592f304290318ebe7aece7fe8572c129c40bf78f8ef83 SHA512 b3e6eee944c662e732f5ddcee23a6be3480c0b862b08d8323683f4c56c891a826a9c49e5d5c1ff84447c9785be0f35c6cef56b504038411045d404838d022bd5
 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
 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
 MISC metadata.xml 316 BLAKE2B a9702a517ffa52bc439add8a4712f3835bb9b7200fcc0d0fba23c23e91387a185295198a80734c79dbd4cc0146f4b393f3396495830ecf0122cbbb334a5fa651 SHA512 630bdebb37c4df4255b8dd7dd28566e9f484697e1ff50981a743b94593ef56484b20aec86a0109458a0e88b7c357da78afa8ed946ba3bca2a7db5bf006747913
diff --git a/net-fs/mc/mc-2018.09.26.00.42.43.ebuild b/net-fs/mc/mc-2018.09.26.00.42.43.ebuild
new file mode 100644
index 000000000000..28574278fd8c
--- /dev/null
+++ b/net-fs/mc/mc-2018.09.26.00.42.43.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/samba/Manifest b/net-fs/samba/Manifest
index e01b10e0f05b..8dc7b6ae78de 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -19,8 +19,8 @@ DIST samba-4.8.5.tar.gz 17715401 BLAKE2B fc1aef2f5362fff1870abe40eebfe932f5ca347
 DIST samba-4.9.0.tar.gz 18014609 BLAKE2B d91eca23402d9e4940f806c2bf81a28d9739f9a3c054be2776c923ea75d1a837a14d932fa080bd1ef1ac07b8cab92ea4e4b652a66c645873921fffca973cf673 SHA512 436743aff6415dbdd3495dff8a5264df16833fc5678539c4294a0de755f34661b660ce7a7b4bbb02a808ff1ca046f34072a30b9e89391034f2f391d3884ea630
 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 8778 BLAKE2B b199b131ac0de5af8c4d49b7cec55548d03bf6e8e684c79ce624cf5507e68071db530398dfcc637cb0446fadab7ea1366ffc17ed544e968dfb23e7d6d3b9b796 SHA512 bda3727f4eac2ca5fe905776cecc260dea6a9fb5f829eaabb02caf421922e1d2836cb256442dcc2eb57de406574b361fb5a4acf3393e779f446ee5b53591df14
-EBUILD samba-4.8.5.ebuild 8389 BLAKE2B 5d3fa21c23909a1e52ba0c9f734497cd7092f622f543b9264b84c20d188800414cc693f19a0111824d90fa2beead3fd488d7bd6c2f376c7be31f47aa77f0053f SHA512 b46b72e4617328da1e0f7ca495b9360f72b158067b044883653879fee7171d2ad39067267323a5c2f25f23e3986129bbe37e56adf7c1a2d8deb66d1d5ce2db52
-EBUILD samba-4.9.0.ebuild 8473 BLAKE2B 6dd9b773ecd1d94bce4d9b94ea0c6d00135e83ff89e066c0c66872cbfac6f2eb6a6477ff0a3b1c79c2e8fcffe4ed6b90f1caf0a24cf5e1a089f099521276fe56 SHA512 fbd11faa9ebc804c8d1c3367deb37360a19d1daf20ab8eadac41e26032ec8c5cb0b1a52b548b0a49faeaaf77f52487d44387c2eec2f467e723b8637c10a2fc34
-EBUILD samba-4.9.1.ebuild 8470 BLAKE2B d2ecd097e39c29f245d07b84be5856b8b356c6e2c9a801243d85bd568c760244211b9ee2755138340f2d38b3c146143500f0116c0c96b9f34a6a34c92effc9db SHA512 b780bab48a18072c473de4a4c0198bd4262653aacb547f21e1484214756fdc33abbcc6d9a66f46f7e5b6782ae706f6198c42cf7c3b20476118ddc74a0e9fdbc1
+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
 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 c2d8e417223a..7d60b913219c 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 ~sparc ~x86"
+KEYWORDS="~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 8cc6add54092..0fe80b5fd005 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 ~x86"
+KEYWORDS="~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.9.0.ebuild b/net-fs/samba/samba-4.9.0.ebuild
index 8dc0be1a1c84..c95e2c0c1bd3 100644
--- a/net-fs/samba/samba-4.9.0.ebuild
+++ b/net-fs/samba/samba-4.9.0.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 ~x86"
+KEYWORDS="~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.9.1.ebuild b/net-fs/samba/samba-4.9.1.ebuild
index 4128c8bb8c07..89382226c0f1 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 ~x86"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 
 DESCRIPTION="Samba Suite Version 4"
 HOMEPAGE="https://www.samba.org/"
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 9bf69d1fc9ff..a581f620cf4a 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index d226b2a940d0..a7ca2febd9e8 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 7705 BLAKE2B 01b831b9354885c248c70cedd3c4a6babc3f856079c3a44d2c164372e9c97c56b73f1d38a7b14516f12b9b57e4695a1c587bacb2e1cbe3621ed0dc8c81a50640 SHA512 df8206480f955179dd76ab5a9c10aa7ec6f3c29e65017ca16db861526ac992d661aa3c83b11d2709185874a7ced06edaa6f0f147e872e0f84b121c379c87a460
+EBUILD pidgin-2.13.0.ebuild 7701 BLAKE2B 4ff3f7c783c845ef1e34275c9e1cd4ca83ff4061487faf7e2a5e0528ebd589743f488262ac091aacb6713219157ccd320102118157bc17e36ff4467ccb2aaa90 SHA512 10833787f051632aaff15d717d1fea2fbd6d0d4880d2250c01d9f7d6ed1aa39fc31d4f7f98514b5922fe441dbc4e293bd38b769670150613f709d27845a50bc6
 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 10ae284c57bc..773bcebb6445 100644
--- a/net-im/pidgin/pidgin-2.13.0.ebuild
+++ b/net-im/pidgin/pidgin-2.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
@@ -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/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index 79f33154c36e..3240f6e090ea 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,10 +1,8 @@
+AUX fonts.conf 1656 BLAKE2B 551a0651aeeaf43ac955731c492232014d10cdbac7e04a0be7bb915218e1f70c4082491d5e081b3cdc4c713398119a7ce9d25c787647f521b37f00a5b16caa15 SHA512 662ad4f6b91ae4d8479ee79f298d94f7862eb71031b5aa726b89e1d1e1bc71050437af73137a3aad71236fd3535527cbc37d394300a2191bcc51ea8d075ec513
 AUX telegram-desktop-bin-r1 379 BLAKE2B e97067e322177c771ac99e59690aa3d5587a78e1dab1c73f530dccb169c1823ca6eff6b7f96a863edd768bf49597f8c8158f7737d1796aa01487274901152b43 SHA512 b57a64e4b9a9edcdcc6a3c3bf09549e49785fe66f38a1e117598780b7637a0b6154e922e2ce0d15749dfd44081bec20d1d353f25f63c276e68d2dd30f8e35a39
-DIST tdesktop-1.3.14.tar.gz 17199969 BLAKE2B 996b1b8113253b12592727fcced27b26e9c9f020f8112ac2460b8c9665c3445f8e8707cc0d62c22a3452367d483a016a471119437ae3da6cea10cc3bc3ed656e SHA512 0fa0792970d4ed044ddc06f97b02d1b7de137cccba7792cc5cbbfbce0d3ef8dbf78cfe3464d3f846c2d6285a9d7db2f40cc4ff76b4ef7138f238ac9045cd2931
+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.3.14.tar.xz 34544980 BLAKE2B 3a0ec56d3e49fb47484c959006126a39ed41da6d58706a51808207c0d285a06d72954a17754e7b166468e924f549d08200355f5c83ca68b9fe535304fcb12e34 SHA512 b880782ead5acc40c81d62028e88b5565f6740bc044cdd1eb2e701854d2c5c23ecd2c6d68f7a3b00d8e85d2ad89b1cdf1e7b65b691b2178ea9556cd9b852a726
 DIST tsetup.1.4.0.tar.xz 34811788 BLAKE2B a46e38b8d27ce764b7e9e735809a5098456368ed747e83bc16d125d80e6b772e1fb0eeee0d6b8eab937c04148b2516d5130c365dbda7e7a05571b14137b5a9c5 SHA512 c646763d66a807ade2c5d475444ce651dfd8ff488cafc4148a9e6850485fcfa8bc41d821dea1a9a6d6d5ac8f97593f5cedefa20a533d057c40e72a497afe264c
-DIST tsetup32.1.3.14.tar.xz 37060108 BLAKE2B 5fb87cab91cef06cfd585907e5a40f3099f10a91cf6226704c2f5822d9ec4459f8a65b5714a1177ce1b8c2bbc7f8030af8d82d72ec98b4fe9dd4b3fbaeb09b76 SHA512 446f7091b568b56466d9ee53343a7433335817c0589e5338010dfccb78e615745262fcae18b856c0929d045d3caa46ddace1893c2a44fdf9507c09fad3b09626
 DIST tsetup32.1.4.0.tar.xz 37403084 BLAKE2B dd134c49da40fb25266e0bbaf5722675eea84bf760029646f0d727f6df587a789d42d40c1de1d3f8eb6a2623e5f5e569524b618df18ea48d26e0a05a1a597310 SHA512 8700221f791fa366bedbe666f8d73ec68a216db0dd0ceef43332fd4ce075897c003b069f51946e29dc1b1574dd50fdd6abb1ed491d1c09f5952d044628656a3a
-EBUILD telegram-desktop-bin-1.3.14.ebuild 1291 BLAKE2B beafdaae27e3b314ac53fd54e813f654c90f1c8d452e32a22cc25557d3e3cac830e70522c54548ab8f34aa613bf853194ea03de44f6848acce010e31201c8855 SHA512 57d47a377d349169f9ee8c3a3dcc8931b17103affc64d2219c00a4dcfa3a57c4b6ad0cef60287550aa3ebbdb1e7413e751bca80eccac6142236a0d71fb76a1f2
-EBUILD telegram-desktop-bin-1.4.0.ebuild 1552 BLAKE2B b15d5e41ecb4b0ce7d70e124136db5c96d06e4b14f2173387446df4a241e256ff60c3f1ea548163f1eaaf83648173e40cd9cff307a6c3e7570d2e91961223e84 SHA512 82831ff5408cddb6f633b0e3345ab48781ae1ec8868c60a497e7127d4d898f27c0b02252b08fd703dcaa8d4bd4c910f79197315f2af815f2abb08f8514ba881b
+EBUILD telegram-desktop-bin-1.4.0-r1.ebuild 1981 BLAKE2B f6eb9c0679418be38ca899e4d9f958e1d745ebb684c4534586af855c5cc77b49fafd4b2f29d255337b29ca7ff965d8dd139e883a66cfda94f27d9d1f7512f5c7 SHA512 cce4faa310dcaf5d6f4be9c5118dc48d76fa1835d02d7c8c06c8a7e4f9b612ff1e31d9d6ab383a79a9516be7c57cd93925c96179531f185b02186c2991c17046
 MISC metadata.xml 585 BLAKE2B 0f6f2dbb75e3fc543ad04b0d72652802b8de0336ccd1171fc06e2d2b61ff5288346b9e3c44afad9e5dbd9de9fa46d3324710697d83e94c9a5da5a8c5a137b26f SHA512 d5af59695ad9fa610865b3719637a7f5dd283f30bf7051f39fd6b8ae7c485f46d52627900cc3d46450491c7429844e0d7c535f2a028a112cb65d7523ff2c669b
diff --git a/net-im/telegram-desktop-bin/files/fonts.conf b/net-im/telegram-desktop-bin/files/fonts.conf
new file mode 100644
index 000000000000..d3ddc32d7776
--- /dev/null
+++ b/net-im/telegram-desktop-bin/files/fonts.conf
@@ -0,0 +1,60 @@
+<?xml version='1.0'?>
+<!--
+     This file is only here to work around
+     https://github.com/telegramdesktop/tdesktop/issues/4240
+     It has been taken from (with slight modification)
+     https://github.com/telegramdesktop/tdesktop/issues/4493
+-->
+<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
+<fontconfig>
+    <dir>/usr/share/fonts</dir>
+    <dir>/usr/local/share/fonts</dir>
+    <dir prefix="xdg">fonts</dir>
+    <match target="pattern">
+	<test qual="any" name="family">
+	    <string>mono</string>
+	</test>
+	<edit name="family" mode="assign" binding="same">
+	    <string>monospace</string>
+	</edit>
+    </match>
+    <match target="pattern">
+	<test qual="any" name="family">
+	    <string>sans serif</string>
+	</test>
+	<edit name="family" mode="assign" binding="same">
+	    <string>sans-serif</string>
+	</edit>
+    </match>
+    <match target="pattern">
+	<test qual="any" name="family">
+	    <string>sans</string>
+	</test>
+	<edit name="family" mode="assign" binding="same">
+	    <string>sans-serif</string>
+	</edit>
+    </match>
+    <cachedir>/var/cache/fontconfig</cachedir>
+    <cachedir prefix="xdg">fontconfig</cachedir>
+    <cachedir>~/.fontconfig</cachedir>
+    <match target="font">
+	<edit mode="assign" name="antialias">
+	    <bool>true</bool>
+	</edit>
+	<edit mode="assign" name="embeddedbitmap">
+	    <bool>false</bool>
+	</edit>
+	<edit mode="assign" name="hinting">
+	    <bool>true</bool>
+	</edit>
+	<edit mode="assign" name="hintstyle">
+	    <const>hintslight</const>
+	</edit>
+	<edit mode="assign" name="lcdfilter">
+	    <const>lcddefault</const>
+	</edit>
+	<edit mode="assign" name="rgba">
+	    <const>rgb</const>
+	</edit>
+    </match>
+</fontconfig>
diff --git a/net-im/telegram-desktop-bin/files/telegram-desktop-bin-r2 b/net-im/telegram-desktop-bin/files/telegram-desktop-bin-r2
new file mode 100644
index 000000000000..a8b0e3e6d99c
--- /dev/null
+++ b/net-im/telegram-desktop-bin/files/telegram-desktop-bin-r2
@@ -0,0 +1,15 @@
+#!/bin/sh
+# this wrapper disables the auto-updater of telegram-desktop
+# This program is licensed under the same license as telegram-desktop
+
+# telegram-desktop fails to set RestartCommand with the session manager
+# exclude it from session management to prevent restarts without the argument
+unset SESSION_MANAGER
+
+# telegram-desktop expects old fontconfig configuration files
+# this is a workaround to try and deal with that
+[ -e /etc/telegram-desktop-bin/fonts.conf ] && \
+  [ -z $( printenv FONTCONFIG_FILE ) ] && \
+  export FONTCONFIG_FILE=/etc/telegram-desktop-bin/fonts.conf
+
+exec /usr/lib/telegram-desktop-bin/Telegram -externalupdater $@
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.3.14.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.3.14.ebuild
deleted file mode 100644
index 8b7d2c549cd7..000000000000
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.3.14.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 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]
-"
-
-S="${WORKDIR}/Telegram"
-
-src_install() {
-	exeinto /usr/lib/${PN}
-	doexe "Telegram"
-	newbin "${FILESDIR}"/${PN}-r1 "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
-
-	domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
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
new file mode 100644
index 000000000000..c709f83a6719
--- /dev/null
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.4.0-r1.ebuild
@@ -0,0 +1,75 @@
+# 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.0.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.4.0.ebuild
deleted file mode 100644
index e0cfb12960a6..000000000000
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.4.0.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
-
-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]
-"
-
-S="${WORKDIR}/Telegram"
-
-src_install() {
-	exeinto /usr/lib/${PN}
-	doexe "Telegram"
-	newbin "${FILESDIR}"/${PN}-r1 "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
-
-	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)"
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 3522bc224b84..863b0bb00f80 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 9dd1e5194324..1b39767ceb6b 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,14 +1,9 @@
-AUX inspircd-2.0.23-fix-path-builds.patch 9669 BLAKE2B 8b6612800028658cf231be62fbdd92638bfbc64fc1e9634bfbbdfe997f2915f583aba8ee41fbf98f44e016b1bdf17936017d5e9217c29aa404576167526f9d1b SHA512 0595199d8c5c44ea3dff19e08d4a1fe9bb5011befbafe7b58fce2cf7678f30cbaa6ceedb408141519f4068c3b96dbc41aecb8112d180ca66e9deff00390935d9
 AUX inspircd-2.0.25-fix-path-builds.patch 9669 BLAKE2B 8b6612800028658cf231be62fbdd92638bfbc64fc1e9634bfbbdfe997f2915f583aba8ee41fbf98f44e016b1bdf17936017d5e9217c29aa404576167526f9d1b SHA512 0595199d8c5c44ea3dff19e08d4a1fe9bb5011befbafe7b58fce2cf7678f30cbaa6ceedb408141519f4068c3b96dbc41aecb8112d180ca66e9deff00390935d9
 AUX inspircd-2.0.26-fix-path-builds.patch 9655 BLAKE2B eaf233df43b48a156bee13e8113ff185b9fd3fb04686620e4759a5cc3a1d055f984b8cfe2ba32e2ad48d32386c34579b37161f7a1a82b9aa9e2356263f865314 SHA512 86117ecf4cdbec2181b48ff3737c6c4eda71d7bfdd3c6b3b6a195a79cfc6c884b5d6b9e7ba41a1943c39458e1d69a3a0f2e6b6338da7b846230e50f51064b402
-AUX inspircd-r2.initd 1390 BLAKE2B 870d3d458d28d7e6b7622659e712e4dfa4f525c8e77a5f92e64bc63c1ec50db702d484a389eaca014e1e5fb572bd092c17768d0d23b187dacdddeaac6d0e65a3 SHA512 88dcc6c50ebf4d16b97c193ca42185d66e7184c1b5bfb10bf807aef773e868ceb814dbcb57e121cc69d55f541aa7aaff093bb0d91938887e5bacd126ba931700
-AUX inspircd-r3.confd 1224 BLAKE2B 84545ec9acdb9c0a4368f64cbfb4a2483d487f3664818951aa0a952b4dfa270f5738a5016fe64057791f2b4002ce207fb42ff8128734cab4ab9b856c8a0ebda4 SHA512 5c47c8588bf39e33e07584492fc672ffe5529b80d7d357ff48d7b6b3bd89a58915c856eeb78d7a68aa2897760a086c193b661641d8a0741c602010d9d0d0efd2
-AUX inspircd-r3.initd 1189 BLAKE2B 1149e138cdcc189e53857538023a63b68261d6434f3b987fd74a2fe4c5b58087bcac6c42bd5c09262db2eafc29ef11847d1f8c000db663bec9851d64ae168dda SHA512 30bf71ec6fde9eb73f87179f55d33ec64367e447dba2c2ab5e383cd6b16e8f7db446a28017b115443e321305e245558f1f706185c4c2fb45c709380ac8cf67ff
-AUX inspircd.confd 1343 BLAKE2B d2ecb9509e9be700894bb2c9c85d8f68aed7b082f6b32bebed936424df294f7bf1ab80d0d1225744463b782165ec4c07e02c709b8f958ddcc5e4084527cc72c6 SHA512 23cd6b51f92c3054152bb268e87461e5b59960ffd2f8ce209223ba03a9de7d9e76336d104805904dcfdb59c65af318dbfab11417848b2433cb96a17f0af74903
-DIST inspircd-2.0.23.tar.gz 731695 BLAKE2B 58cd38af6244926f620a7e65b14d44062cc5aacb3aed394b736062f9f5ac0c2b689f8967e2e9577570766547bf8f694e1762bab71114dda9414e05ba8e01bfd2 SHA512 93a3dab04e797cfde158de8c2e959d1bb5df115aa3fe5a4066cdf9f56cb0c548fd2664a12d61bf2dbdb45549577974be99a0d6ffc6114c72cf0697f5ca4f85bb
+AUX inspircd.confd 1224 BLAKE2B 84545ec9acdb9c0a4368f64cbfb4a2483d487f3664818951aa0a952b4dfa270f5738a5016fe64057791f2b4002ce207fb42ff8128734cab4ab9b856c8a0ebda4 SHA512 5c47c8588bf39e33e07584492fc672ffe5529b80d7d357ff48d7b6b3bd89a58915c856eeb78d7a68aa2897760a086c193b661641d8a0741c602010d9d0d0efd2
+AUX inspircd.initd 1189 BLAKE2B 1149e138cdcc189e53857538023a63b68261d6434f3b987fd74a2fe4c5b58087bcac6c42bd5c09262db2eafc29ef11847d1f8c000db663bec9851d64ae168dda SHA512 30bf71ec6fde9eb73f87179f55d33ec64367e447dba2c2ab5e383cd6b16e8f7db446a28017b115443e321305e245558f1f706185c4c2fb45c709380ac8cf67ff
 DIST inspircd-2.0.25.tar.gz 734017 BLAKE2B d67af67a68d55e107c4492561fcc181ca17fda8b59d53e14e2a585057507f035d3178a9f5f04a22b8969f0fe6f331833e412f410f3276a610dc179ebf16c2399 SHA512 c404d3c296b48d34ad43f576eba1a1fe96ae3d644f032d11cb6050b8e777f93efe33715b0676f481ac3878eea1c17c884a26bff86b909f71f7329ebcfb97add8
 DIST inspircd-2.0.26.tar.gz 735414 BLAKE2B 817a96c95b3360cadfcf69ab093b0bbd0f5b89e66a1b03f0c5916e2a4c514fa529dc4094368b2f03ef98bfe89c584a9a6a555d2ee9e33c7e6b0b4784bccba946 SHA512 950982629eab0dabeac9e7f2ab6e8b923bc5dafa978280cb91aa28c40997b7cfac2e4d39d74bb4c9cdb8f818205cc17bf782ec86f0aae966cb9c47bbf8143d1a
-EBUILD inspircd-2.0.23.ebuild 2881 BLAKE2B 27bcd6028bcfbf5f0cf8889669b53fb4d0197c8d0fe366497a413f49c73d8fbf6ff930c1e499c3bb0980ba4ba7a29eb2b746dc50b1df3fba8955412f50444250 SHA512 bfa28ed4e8cf27389745b8b0582d76c2265350b2e6f980a40b65a914e5429d9e1bc4c2d88094c36834d86b9dea3479e2be91a554be43f7d51ba9ac4841fd51cb
-EBUILD inspircd-2.0.25.ebuild 3369 BLAKE2B daacb1c493bdbec1a6c5ca8e99503c0e868dc5d625737cff09eec5b380c78f6043f5a6d2747b6f5d1c74ae6b5d58f3a5664dd623faed00084a996c2bc0120444 SHA512 7890ce1b66d0a16cdd1576ae4067b65cae3fed113bf5d86aaca1d818b5423c22563e1ba5edb4f9df5e1ad5a21dd6b54dd429b59cbe51d3e0ff83032ea2abdda1
-EBUILD inspircd-2.0.26.ebuild 3171 BLAKE2B 2f0bec0034565b69f1631672ac995a878085cf461db81c35d3831b3dc9b2bf3c39a029763343bb92a09e8d86286a3b67343ca6cb72709b8618cf4b6ea3dfada8 SHA512 d88ac63c77fd88fa468d29900ce4aed990efce30281c985ccb57c44d5f15663b912d384a9dfc42fa6908f2bb8cad6691c8395689d272080475c0a75356b49a37
+EBUILD inspircd-2.0.25.ebuild 3376 BLAKE2B 802a96022a2cad65801d6dab88d2069523ce72914b2558718b39dde9891e6e0b78cd432541add655cdf1a01376ec1f8d216640c9480a84deb36b703345377859 SHA512 fd9a2c56b35f6855a68e8d697df1e63100c0abafdcd7a79b4ca53bc0f65a23876870352c3203e09a4a668844fd01735896d93ace6e60bd8a01e5253c5af9f99e
+EBUILD inspircd-2.0.26.ebuild 3178 BLAKE2B c9609fd1e6aab25b0cbe0c6642f57bf9b80eeb7afbe8f7e799c7053e3d8fde884c1424b3a1457b97694fb508c8d45e6e1fa60cd0e6c14a2f24e550e54a9445cc SHA512 ff05b05089ed8ea807efa9b1ec499304b32aac74711e9bf33ec0491147fb678159bdffcb4d9658a77e6276f9c5f7bf63718478a782e27f8464e30c685707d441
 MISC metadata.xml 1674 BLAKE2B 4d00f675f380e0bd75adca0eabbf455cdb27dab9a5c8cb170abc670909d647cf5dda0a2f3fbfd9b9cad2ce210cad3ea5d2fa07683d236f6f437be6d6d8be7c40 SHA512 ae6a96d1093024c9796788dea7fb23c8d2bb51ddea56eeb041e2443db2730f7f38cdb5fde42911ba75dd0cdfc4eac2c9c424f87660361d65cac6766729a60d98
diff --git a/net-irc/inspircd/files/inspircd-2.0.23-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.23-fix-path-builds.patch
deleted file mode 100644
index debf62a15f5e..000000000000
--- a/net-irc/inspircd/files/inspircd-2.0.23-fix-path-builds.patch
+++ /dev/null
@@ -1,253 +0,0 @@
-diff -Nuar a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example
---- a/docs/conf/inspircd.conf.example	2015-05-10 00:24:10.000000000 -0500
-+++ b/docs/conf/inspircd.conf.example	2015-07-27 05:22:26.107849785 -0500
-@@ -412,11 +412,11 @@
- 
- # This file has all the information about oper classes, types and o:lines.
- # You *MUST* edit it.
--<include file="conf/examples/opers.conf.example">
-+<include file="/etc/inspircd/opers.conf.example">
- 
- # This file has all the information about server links and ulined servers.
- # You *MUST* edit it if you intend to link servers.
--<include file="conf/examples/links.conf.example">
-+<include file="/etc/inspircd/links.conf.example">
- 
- #-#-#-#-#-#-#-#-#-#-  MISCELLANEOUS CONFIGURATION  -#-#-#-#-#-#-#-#-#-#
- #                                                                     #
-@@ -426,7 +426,8 @@
- #   motd - displayed on connect and when a user executes /MOTD
- #   rules - displayed when the user executes /RULES
- # Modules can also define their own files
--<files motd="conf/examples/motd.txt.example" rules="conf/examples/rules.txt.example">
-+<files motd="/etc/inspircd/motd.txt.example"
-+       rules="/etc/inspircd/rules.txt.example">
- 
- # Example of an executable file include. Note this will be read on rehash,
- # not when the command is run.
-@@ -472,7 +473,7 @@
- # the default of 'inspircd.pid' is used.                              #
- #                                                                     #
- 
--#<pid file="/path/to/inspircd.pid">
-+<pid file="/var/run/inspircd/inspircd.pid">
- 
- #-#-#-#-#-#-#-#-#-#-#-#-#- BANLIST LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#-#
- #                                                                     #
-@@ -953,7 +954,7 @@
- # provide almost all the features of InspIRCd. :)                     #
- #                                                                     #
- # The default does nothing -- we include it for simplicity for you.   #
--<include file="conf/examples/modules.conf.example">
-+<include file="/etc/inspircd/modules.conf.example">
- 
- # Here are some pre-built modules.conf files that closely match the
- # default configurations of some popular IRCd's. You still may want to
-@@ -965,10 +966,10 @@
- # recommended that you make your own modules file based on modules.conf.example.
- 
- # Settings similar to UnrealIRCd defaults.
--#<include file="conf/examples/modules/unrealircd.conf.example">
-+#<include file="/etc/inspircd/modules/unrealircd.conf.example">
- 
- # Settings similar to Charybdis IRCd defaults.
--#<include file="conf/examples/modules/charybdis.conf.example">
-+#<include file="/etc/inspircd/modules/charybdis.conf.example">
- 
- 
- #########################################################################
-diff -Nuar a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example
---- a/docs/conf/modules.conf.example    2016-02-28 17:38:30.492335461 -0600
-+++ b/docs/conf/modules.conf.example    2016-02-28 17:39:20.068559846 -0600
-@@ -315,7 +315,7 @@
- # specify some censor tags. See also:                                 #
- # http://wiki.inspircd.org/Modules/censor                             #
- #
--#<include file="conf/examples/censor.conf.example">
-+#<include file="/etc/inspircd/censor.conf.example">
- 
- #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
- # CGI:IRC module: Adds support for automatic host changing in CGI:IRC
-@@ -778,7 +778,7 @@
- # specify below the path to the filter.conf file, or define some      #
- # <filter> tags.                                                      #
- #                                                                     #
--#<include file="conf/examples/filter.conf.example">
-+#<include file="/etc/inspircd/filter.conf.example">
- 
- #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
- # Gecos ban: Implements extended ban 'r', which stops anyone matching
-@@ -834,7 +834,7 @@
- #                                                                     #
- # If you specify to use the m_helpop.so module, then specify below    #
- # the path to the helpop.conf file.                                   #
--#<include file="conf/examples/inspircd.helpop-full.example">
-+#<include file="/etc/inspircd/inspircd.helpop-full.example">
- 
- #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
- # Hide chans module: Allows users to hide their channels list from non-
-@@ -1284,7 +1284,7 @@
- #                 Read the comment above <connect:allowmotdcolors> in #
- #                 inspircd.conf.example for details.                  #
- #                                                                     #
--#<opermotd file="conf/examples/opermotd.txt.example" onoper="yes" processcolors="false">
-+#<opermotd file="/etc/inspircd/opermotd.txt.example" onoper="yes" processcolors="false">
- 
- #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
- # Override module: Adds support for oper override.
-diff -Nuar a/make/template/main.mk b/make/template/main.mk
---- a/make/template/main.mk	2015-05-10 00:24:10.000000000 -0500
-+++ b/make/template/main.mk	2015-07-27 05:22:26.107849785 -0500
-@@ -34,7 +34,7 @@
- SYSTEM = @SYSTEM@
- BUILDPATH = @BUILD_DIR@
- SOCKETENGINE = @SOCKETENGINE@
--CXXFLAGS = -pipe -fPIC -DPIC
-+MYCXXFLAGS = -pipe -fPIC -DPIC
- LDLIBS = -pthread -lstdc++
- LDFLAGS = 
- CORELDFLAGS = -rdynamic -L. $(LDFLAGS)
-@@ -51,9 +51,9 @@
- INSTMODE_LIB = 0644
- 
- @IFEQ $(CC) icpc
--  CXXFLAGS += -Wshadow
-+  MYCXXFLAGS += -Wshadow
- @ELSE
--  CXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute -Wall
-+  MYCXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute -Wall
- @ENDIF
- 
- 
-@@ -75,46 +75,46 @@
- 	INSTALL = ginstall
- @ENDIF
- @IFEQ $(SYSTEM) darwin
--  CXXFLAGS += -DDARWIN -frtti
-+  MYCXXFLAGS += -DDARWIN -frtti
-   LDLIBS += -ldl
-   CORELDFLAGS = -dynamic -bind_at_load -L. $(LDFLAGS)
-   PICLDFLAGS = -fPIC -shared -twolevel_namespace -undefined dynamic_lookup $(LDFLAGS)
- @ENDIF
- @IFEQ $(SYSTEM) interix
--  CXXFLAGS += -D_ALL_SOURCE -I/usr/local/include
-+  MYCXXFLAGS += -D_ALL_SOURCE -I/usr/local/include
- @ENDIF
- 
--@IFNDEF D
--  D=0
-+@IFNDEF DEBUGLEVEL
-+  DEBUGLEVEL=0
- @ENDIF
- 
- GCC6=@GCC6@
- @IFEQ $(GCC6) true
--  CXXFLAGS += -fno-delete-null-pointer-checks
-+  MYCXXFLAGS += -fno-delete-null-pointer-checks
- @ENDIF
- 
- DBGOK=0
--@IFEQ $(D) 0
--  CXXFLAGS += -O2
-+@IFEQ $(DEBUGLEVEL) 0
-+  MYCXXFLAGS += -O2
- @IFEQ $(CC) g++
--    CXXFLAGS += -g1
-+    MYCXXFLAGS += -g1
- @ENDIF
-   HEADER = std-header
-   DBGOK=1
- @ENDIF
--@IFEQ $(D) 1
--  CXXFLAGS += -O0 -g3 -Werror
-+@IFEQ $(DEBUGLEVEL) 1
-+  MYCXXFLAGS += -O0 -g3 -Werror
-   HEADER = debug-header
-   DBGOK=1
- @ENDIF
--@IFEQ $(D) 2
--  CXXFLAGS += -O2 -g3
-+@IFEQ $(DEBUGLEVEL) 2
-+  MYCXXFLAGS += -O2 -g3
-   HEADER = debug-header
-   DBGOK=1
- @ENDIF
- FOOTER = finishmessage
- 
--CXXFLAGS += -Iinclude
-+MYCXXFLAGS += -Iinclude
- 
- @GNU_ONLY MAKEFLAGS += --no-print-directory
- 
-@@ -134,10 +134,11 @@
- @ENDIF
- 
- @IFDEF PURE_STATIC
--  CXXFLAGS += -DPURE_STATIC
-+  MYCXXFLAGS += -DPURE_STATIC
- @ENDIF
- 
--@DO_EXPORT RUNCC RUNLD CXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS
-+MYCXXFLAGS += $(CXXFLAGS)
-+@DO_EXPORT RUNCC RUNLD MYCXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS
- @DO_EXPORT SOURCEPATH BUILDPATH PURE_STATIC SPLIT_CC
- 
- # Default target
-@@ -150,10 +151,10 @@
-     @GNU_ONLY TARGET = modules/$(M:.so=).so
- @ENDIF
- 
--@IFDEF T
-+@IFDEF TGT
-     HEADER =
-     FOOTER = target
--    TARGET = $(T)
-+    TARGET = $(TGT)
- @ENDIF
- 
- @IFEQ $(DBGOK) 0
-@@ -228,8 +229,8 @@
- 	@-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)/data
- 	@-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)/logs
- 	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(BINPATH)
--	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/aliases
--	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/modules
-+	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/aliases
-+	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/modules
- 	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(MODPATH)
- 	[ $(BUILDPATH)/bin/ -ef $(BINPATH) ] || $(INSTALL) -m $(INSTMODE_BIN) $(BUILDPATH)/bin/inspircd $(BINPATH)
- @IFNDEF PURE_STATIC
-@@ -237,9 +238,9 @@
- @ENDIF
- 	-$(INSTALL) -m $(INSTMODE_BIN) @STARTSCRIPT@ $(BASE) 2>/dev/null
- 	-$(INSTALL) -m $(INSTMODE_LIB) tools/gdbargs $(BASE)/.gdbargs 2>/dev/null
--	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)/examples
--	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/examples/aliases
--	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.example $(CONPATH)/examples/modules
-+	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)
-+	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/aliases
-+	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.example $(CONPATH)/modules
- 	@echo ""
- 	@echo "*************************************"
- 	@echo "*        INSTALL COMPLETE!          *"
-@@ -252,7 +253,7 @@
- 	@echo '  Data:' $(DATPATH)
- 	@echo 'To start the ircd, run:' $(BASE)/inspircd start
- 	@echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf
--	@echo 'Examples are available at:' $(CONPATH)/examples/
-+	@echo 'Examples are available at:' $(CONPATH)
- 
- @GNU_ONLY RCS_FILES = $(wildcard .git/index src/version.sh)
- @BSD_ONLY RCS_FILES = src/version.sh
-diff -Nuar a/make/unit-cc.pl b/make/unit-cc.pl
---- a/make/unit-cc.pl	2015-05-10 00:24:10.000000000 -0500
-+++ b/make/unit-cc.pl	2015-07-27 05:22:26.107849785 -0500
-@@ -113,7 +113,7 @@
- 	my $libs = '';
- 	my $binary = $ENV{RUNCC};
- 	if ($do_compile) {
--		$flags = $ENV{CXXFLAGS};
-+		$flags = $ENV{MYCXXFLAGS};
- 		$flags =~ s/ -pedantic// if nopedantic($file);
- 		$flags .= ' ' . getcompilerflags($file);
- 
diff --git a/net-irc/inspircd/files/inspircd-r2.initd b/net-irc/inspircd/files/inspircd-r2.initd
deleted file mode 100644
index 653e501627e6..000000000000
--- a/net-irc/inspircd/files/inspircd-r2.initd
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-INSPIRCD_USER=${INSPIRCD_USER:-"inspircd"}
-INSPIRCD_GROUP=${INSPIRCD_GROUP:-"inspircd"}
-INSPIRCD_CONFIGFILE=${INSPIRCD_CONFIGFILE:-"/etc/inspircd/inspircd.conf"}
-INSPIRCD_LOGFILE=${INSPIRCD_LOGFILE:-"/var/log/inspircd/ircd.log"}
-INSPIRCD_PIDFILE=${INSPIRCD_PIDFILE:-"/run/inspircd/inspircd.pid"}
-INSPIRCD_SSDARGS=${INSPIRCD_SSDARGS:-"--quiet --user \"${INSPIRCD_USER}\" --wait 1000"}
-INSPIRCD_TERMTIMEOUT=${INSPIRCD_TERMTIMEOUT:-"TERM/25/KILL/5"}
-INSPIRCD_OPTS=${INSPIRCD_OPTS:-""}
-
-command="/usr/bin/inspircd"
-command_args="${INSPIRCD_OPTS} --config \"${INSPIRCD_CONFIGFILE}\" --logfile \"${INSPIRCD_LOGFILE}\""
-start_stop_daemon_args="${INSPIRCD_SSDARGS}"
-pidfile="${INSPIRCD_PIDFILE}"
-retry="${INSPIRCD_TERMTIMEOUT}"
-
-required_files="${INSPIRCD_CONFIGFILE}"
-
-name="InspIRCd"
-
-description="InspIRCd is a modular Internet Relay Chat (IRC) server."
-
-extra_commands="version"
-extra_started_commands="rehash"
-
-depend() {
-	use dns
-	provide ircd
-}
-
-start_pre() {
-	checkpath --directory --mode 0750 --owner ${INSPIRCD_USER}:${INSPIRCD_GROUP} "$(dirname "${INSPIRCD_PIDFILE}")"
-}
-
-rehash() {
-	ebegin "Rehashing InspIRCd"
-	start-stop-daemon --signal HUP --pidfile "${pidfile}"
-	eend $?
-}
-
-version() {
-	ebegin "Retrieve InspIRCd version"
-	${command} --version
-	eend $?
-}
diff --git a/net-irc/inspircd/files/inspircd-r3.confd b/net-irc/inspircd/files/inspircd-r3.confd
deleted file mode 100644
index af9b3fe15e22..000000000000
--- a/net-irc/inspircd/files/inspircd-r3.confd
+++ /dev/null
@@ -1,33 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-
-# Location of configuration file. Modify if you don't like the standard
-# one.
-#
-#INSPIRCD_CONFIGFILE="/etc/inspircd/inspircd.conf"
-
-# File used to store the PID file. Usually you won't need to touch it.
-# If you are changing PID file do not forget to set new PID file in
-# INSPIRCD_CONFIGFILE as well.
-#
-#INSPIRCD_PIDFILE="/run/inspircd/inspircd.pid"
-
-# User to run InspIRCd as
-#
-#INSPIRCD_USER="inspircd"
-#INSPIRCD_GROUP="inspircd"
-
-# 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 start InspIRCd without any output (quiet)
-# as user $INSPIRCD_USER and wait 1000ms after we have started the service
-# to ensure that the daemon is really up and running.
-#INSPIRCD_SSDARGS="--quiet --user \"${INSPIRCD_USER}\" --wait 1000"
-
-# The termination timeout (start-stop-daemon parameter "retry") ensures
-# that the service will be terminated within a given time (25 + 5 seconds
-# per default) when you are stopping the service.
-#INSPIRCD_TERMTIMEOUT="TERM/25/KILL/5"
-
-# Options to collectd
-# See `/usr/bin/inspircd --help` for more details
-#INSPIRCD_OPTS=""
diff --git a/net-irc/inspircd/files/inspircd.confd b/net-irc/inspircd/files/inspircd.confd
index 1291f9fd552f..af9b3fe15e22 100644
--- a/net-irc/inspircd/files/inspircd.confd
+++ b/net-irc/inspircd/files/inspircd.confd
@@ -5,11 +5,6 @@
 #
 #INSPIRCD_CONFIGFILE="/etc/inspircd/inspircd.conf"
 
-# Location of log file. Modify if you don't like the standard
-# one.
-#
-#INSPIRCD_LOGFILE="/var/log/inspircd/ircd.log"
-
 # File used to store the PID file. Usually you won't need to touch it.
 # If you are changing PID file do not forget to set new PID file in
 # INSPIRCD_CONFIGFILE as well.
diff --git a/net-irc/inspircd/files/inspircd-r3.initd b/net-irc/inspircd/files/inspircd.initd
index 4d8dac819368..4d8dac819368 100644
--- a/net-irc/inspircd/files/inspircd-r3.initd
+++ b/net-irc/inspircd/files/inspircd.initd
diff --git a/net-irc/inspircd/inspircd-2.0.23.ebuild b/net-irc/inspircd/inspircd-2.0.23.ebuild
deleted file mode 100644
index 78dbcfc29285..000000000000
--- a/net-irc/inspircd/inspircd-2.0.23.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs user
-
-DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd"
-HOMEPAGE="https://inspircd.github.com/"
-SRC_URI="https://github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="geoip gnutls ipv6 ldap mysql pcre posix postgres sqlite ssl tre"
-
-RDEPEND="
-	dev-lang/perl
-	ssl? ( dev-libs/openssl:= )
-	geoip? ( dev-libs/geoip )
-	gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 )
-	ldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:= )
-	pcre? ( dev-libs/libpcre )
-	sqlite? ( >=dev-db/sqlite-3.0 )
-	tre? ( dev-libs/tre )"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.0.23-fix-path-builds.patch )
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	# Patch the inspircd launcher with the inspircd user
-	sed -i -e "s/@UID@/${PN}/" "${S}/make/template/${PN}" || die
-
-	default_src_prepare
-}
-
-src_configure() {
-	local extras=""
-
-	use geoip && extras="${extras}m_geoip.cpp,"
-	use gnutls && extras="${extras}m_ssl_gnutls.cpp,"
-	use ldap && extras="${extras}m_ldapauth.cpp,m_ldapoper.cpp,"
-	use mysql && extras="${extras}m_mysql.cpp,"
-	use pcre && extras="${extras}m_regex_pcre.cpp,"
-	use posix && extras="${extras}m_regex_posix.cpp,"
-	use postgres && extras="${extras}m_pgsql.cpp,"
-	use sqlite && extras="${extras}m_sqlite3.cpp,"
-	use ssl && extras="${extras}m_ssl_openssl.cpp,"
-	use tre && extras="${extras}m_regex_tre.cpp,"
-
-	if [[ -n "${extras}" ]]; then
-		econf --disable-interactive --enable-extras=${extras%,}
-	fi
-
-	econf \
-		--with-cc="$(tc-getCXX)" \
-		--disable-interactive \
-		--prefix="/usr/$(get_libdir)/${PN}" \
-		--config-dir="/etc/${PN}" \
-		--data-dir="/var/lib/${PN}/data" \
-		--log-dir="/var/log/${PN}" \
-		--binary-dir="/usr/bin" \
-		--module-dir="/usr/$(get_libdir)/${PN}/modules" \
-		$(usex ipv6 '' '--disable-ipv6') \
-		$(usex gnutls '--enable-gnutls' '') \
-		$(usex ssl '--enable-openssl' '')
-}
-
-src_compile() {
-	emake V=1 LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}"
-}
-
-src_install() {
-	emake INSTUID=${PN} DESTDIR="${D%/}" install
-
-	insinto "/usr/include/${PN}"
-	doins -r include/.
-
-	diropts -o"${PN}" -g"${PN}" -m0700
-	dodir "/var/lib/${PN}"
-	dodir "/var/lib/${PN}/data"
-
-	newinitd "${FILESDIR}/${PN}-r2.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-
-	keepdir "/var/log/${PN}"
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog "Before starting ${PN} the first time, you should create"
-		elog "the /etc/${PN}/${PN}.conf file."
-		elog "You can find example configuration files under /etc/${PN}"
-		elog "Read the ${PN}.conf.example file carefully before "
-		elog "(re)starting the service."
-		elog
-	fi
-}
diff --git a/net-irc/inspircd/inspircd-2.0.25.ebuild b/net-irc/inspircd/inspircd-2.0.25.ebuild
index 746628c56e7b..792cca4e9ae7 100644
--- a/net-irc/inspircd/inspircd-2.0.25.ebuild
+++ b/net-irc/inspircd/inspircd-2.0.25.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 	geoip? ( dev-libs/geoip )
 	gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 )
 	ldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
+	mysql? ( dev-db/mysql-connector-c:= )
 	postgres? ( dev-db/postgresql:= )
 	pcre? ( dev-libs/libpcre )
 	sqlite? ( >=dev-db/sqlite-3.0 )
@@ -90,8 +90,8 @@ src_install() {
 	dodir "/var/lib/${PN}"
 	dodir "/var/lib/${PN}/data"
 
-	newinitd "${FILESDIR}/${PN}-r3.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}-r3.confd" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
 
 	keepdir "/var/log/${PN}"
 
diff --git a/net-irc/inspircd/inspircd-2.0.26.ebuild b/net-irc/inspircd/inspircd-2.0.26.ebuild
index ead8598ef2c7..902f26ec9266 100644
--- a/net-irc/inspircd/inspircd-2.0.26.ebuild
+++ b/net-irc/inspircd/inspircd-2.0.26.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 	geoip? ( dev-libs/geoip )
 	gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 )
 	ldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
+	mysql? ( dev-db/mysql-connector-c:= )
 	postgres? ( dev-db/postgresql:= )
 	pcre? ( dev-libs/libpcre )
 	sqlite? ( >=dev-db/sqlite-3.0 )
@@ -89,8 +89,8 @@ src_install() {
 
 	einstalldocs
 
-	newinitd "${FILESDIR}/${PN}-r3.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}-r3.confd" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
 
 	keepdir "/var/log/${PN}"
 
diff --git a/net-irc/psybnc/Manifest b/net-irc/psybnc/Manifest
index 471c450491f4..152d35ad6b47 100644
--- a/net-irc/psybnc/Manifest
+++ b/net-irc/psybnc/Manifest
@@ -9,6 +9,5 @@ AUX psybnc.conf 313 BLAKE2B c56022b42942b100479b6c539e9da85178db679b6596fc2b4162
 AUX psybnc.confd 113 BLAKE2B e4fddc3cb37c5b9defea0d4d6e6c2b26f34bf50fbbe51679b8f0e686b504c2caf980c5a97864fac86a251431126c5a0338bb50a8eba9d3976156cf1eaf1b7681 SHA512 e58704dec299271d9a450eb243d0af1323aca58d555b61fc3aa899324a6bdc9aa82afc0597c190dc07c278f22c7cb448592a271e9ee6e4aa3552518ce6254753
 AUX psybnc.initd 898 BLAKE2B 7be60ef0dda81cb917e23e06e3fec88af952d71c2eef4255c316baf5a218e8bdc2d8d8bc4eb353ab7c19a697e97685441ec2a0c3503e4f22adf0d55c9a895e13 SHA512 2ea77dfd515b81d53d7fe1b38fe3069d7d2081d939fdbb2c6ff97cd859a86ad8a52dd1b40e0b592a9368488759a3fb35741e25c6a5ade3045eb7159acd64bbbd
 DIST psyBNC-2.3.2-9.tar.gz 318676 BLAKE2B 0197aa3bc8c770738a7d4d5a5a79b77f7a0cafeef60ccca1167172b28af05c0cd9836f7e9816c873dafa2e55b0bf9ce54cfbe3958939405f58f7f3874ec7ea64 SHA512 b664f57610e54fadd938b359a0e8052b8fe3dd36bd1ee339f36ee22ae4d36a76e803425c5133f925ac18c01767ffbc8a2f471c014b5b76b05894cfea9fe5416b
-EBUILD psybnc-2.3.2.9-r2.ebuild 4582 BLAKE2B 620329b195a3d03503fb72a38f78e9e125d091c3d7143a0a29fa3b3ddb006ac0b77bd68f6e3545b51a5d36f1185d53577648b7a0f0415148dbc767966fb549d5 SHA512 f4c18d8ec6bb989006fa6d81c9cff3a5cc7aa91ec5894b22e16d11948e02c24b5238d9d706f474f31a17d5020eb2621ad2f4a6af70799cbace0fb3ac96854374
 EBUILD psybnc-2.3.2.9-r3.ebuild 4618 BLAKE2B d27e82e18d1cb713f282278dacdb1a9fb61b92ce8bbbe3698355bfa353fce156204567a1f816ba0f712f98e1c016ac8166a3054efd095c0aace4e54cf4592ed2 SHA512 5c9500a9f673200841ba7cf14aa46889ba4b42312d7ce3a11158b640ec4e9fe1d8eb4539353cab767f7380c82c25d4b4aebd09b1da5c21fca4713ad75a639ebb
 MISC metadata.xml 434 BLAKE2B 7e478f33125a86a9298854d4f3196e74cdf7b7138139048d4d20bcb9a15b88ef988776fabacdbf247dbf08c99a5756007283e6e6ba20ec38529dc34c106a4abd SHA512 79ea36967c0e1d45d332e64c054e45114689f66d5c290bb1eb9c901244fb2f9a3629564d67581589cfee2e8764b9887bde66f07cc2d74e7abfaeb290ceac2286
diff --git a/net-irc/psybnc/psybnc-2.3.2.9-r2.ebuild b/net-irc/psybnc/psybnc-2.3.2.9-r2.ebuild
deleted file mode 100644
index 22fce24e47d3..000000000000
--- a/net-irc/psybnc/psybnc-2.3.2.9-r2.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils versionator toolchain-funcs flag-o-matic user
-MY_PV="$(replace_version_separator 3 -)"
-PSYBNC_HOME="/var/lib/psybnc"
-
-DESCRIPTION="psyBNC is a multi-user and multi-server gateway to IRC networks"
-HOMEPAGE="http://www.psybnc.at/index.html"
-SRC_URI="http://www.psybnc.at/download/beta/psyBNC-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86 ~ppc"
-IUSE="ipv6 ssl oidentd scripting multinetwork"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.7d )
-		oidentd? ( >=net-misc/oidentd-2.0 )"
-RDEPEND="${DEPEND}"
-S="${WORKDIR}"/"${PN}"
-
-pkg_setup() {
-	enewgroup psybnc
-	enewuser psybnc -1 -1 ${PSYBNC_HOME} psybnc
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Useless files
-	rm -f */INFO
-
-	# Pretend we already have a certificate, we generate it in pkg_config
-	mkdir key
-	touch key/psybnc.cert.pem
-
-	if [[ -f ${ROOT}/usr/share/psybnc/salt.h ]]
-	then
-		einfo "Using existing salt.h for password encryption"
-		cp "${ROOT}"/usr/share/psybnc/salt.h salt.h
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/compile.diff"
-	epatch "${FILESDIR}/ldflags-fix.patch"
-
-	# add oidentd
-	use oidentd && epatch "${FILESDIR}/${P}-oidentd.patch"
-
-	# add scripting support
-	use scripting && epatch "${FILESDIR}/${P}-scripting.patch"
-
-	# add multinetwork support
-	use multinetwork && epatch "${FILESDIR}/${P}-multinetwork.patch"
-
-	# Prevent stripping the binary
-	sed -i -e "/@strip/ d" tools/autoconf.c
-}
-
-src_compile() {
-	use ipv6 || rm -f tools/chkipv6.c
-	use ssl || rm -f tools/chkssl.c
-
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	dobin psybnc
-
-	insinto /usr/share/psybnc
-	doins -r help lang salt.h
-	fperms 0600 /usr/share/psybnc/salt.h
-
-	insinto /etc/psybnc
-	doins "${FILESDIR}"/psybnc.conf
-
-	keepdir "${PSYBNC_HOME}"/{log,motd,scripts}
-	dosym /usr/share/psybnc/lang "${PSYBNC_HOME}"/lang
-	dosym /usr/share/psybnc/help "${PSYBNC_HOME}"/help
-
-	fowners psybnc:psybnc "${PSYBNC_HOME}"/{,log,motd,scripts} /etc/psybnc/psybnc.conf
-	fperms 0750 "${PSYBNC_HOME}"/{,log,motd,scripts}
-	fperms 0640 /etc/psybnc/psybnc.conf
-
-	if use ssl
-	then
-		keepdir /etc/psybnc/ssl
-		dosym /etc/psybnc/ssl "${PSYBNC_HOME}"/key
-	else
-		# Drop SSL listener from psybnc.conf
-		sed -i -e "/^# Default SSL listener$/,+4 d" "${D}"/etc/psybnc/psybnc.conf
-	fi
-
-	if use oidentd
-	then
-		insinto /etc
-		doins "${FILESDIR}"/oidentd.conf.psybnc
-		fperms 640 /etc/oidentd.conf.psybnc
-		# install init-script with oidentd-support
-		newinitd "${FILESDIR}"/psybnc-oidentd.initd psybnc
-	else
-		# install init-script without oidentd-support
-		newinitd "${FILESDIR}"/psybnc.initd psybnc
-	fi
-
-	newconfd "${FILESDIR}"/psybnc.confd psybnc
-
-	dodoc CHANGES FAQ README SCRIPTING TODO
-	docinto example-script
-	dodoc scripts/example/DEFAULT.SCRIPT
-}
-
-pkg_config() {
-	if use ssl
-	then
-		if [[ -f ${ROOT}/etc/psybnc/ssl/psybnc.cert.pem || -f ${ROOT}/etc/psybnc/ssl/psybnc.key.pem ]]
-		then
-			ewarn "Existing /etc/psybnc/psybnc.cert.pem or /etc/psybnc/psybnc.key.pem found!"
-			ewarn "Remove /etc/psybnc/psybnc.*.pem and run emerge --config =${CATEGORY}/${PF} again."
-			return
-		fi
-
-		einfo "Generating certificate request..."
-		openssl req -new -out "${ROOT}"/etc/psybnc/ssl/psybnc.req.pem -keyout "${ROOT}"/etc/psybnc/ssl/psybnc.key.pem -nodes
-		einfo "Generating self-signed certificate..."
-		openssl req -x509 -days 365 -in "${ROOT}"/etc/psybnc/ssl/psybnc.req.pem -key "${ROOT}"/etc/psybnc/ssl/psybnc.key.pem -out "${ROOT}"/etc/psybnc/ssl/psybnc.cert.pem
-		einfo "Setting permissions on files..."
-		chown root:psybnc "${ROOT}"/etc/psybnc/ssl/psybnc.{cert,key,req}.pem
-		chmod 0640 "${ROOT}"/etc/psybnc/ssl/psybnc.{cert,key,req}.pem
-	fi
-}
-
-pkg_postinst() {
-	if use ssl
-	then
-		elog
-		elog "Please run \"emerge --config =${CATEGORY}/${PF}\" to create needed SSL certificates."
-	fi
-	if use oidentd
-	then
-		elog
-		elog "You have enabled oidentd-support. You will need to set"
-		elog "up your /etc/oident.conf file before running psybnc. An example"
-		elog "for psyBNC can be found under /etc/oidentd.conf.psybnc"
-	fi
-	elog
-	elog "You can connect to psyBNC on port 23998 with user gentoo and password gentoo."
-	elog "Please edit the psyBNC configuration at /etc/psybnc/psybnc.conf to change this."
-	elog
-	elog "To be able to reuse an existing psybnc.conf, you need to make sure that the"
-	elog "old salt.h is available at /usr/share/psybnc/salt.h when compiling a new"
-	elog "version of psyBNC. It is needed for password encryption and decryption."
-	elog
-}
diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index 7a371e539df1..a6fcb4adbeb9 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -6,7 +6,9 @@ AUX unrealircd.initd-r1 1180 BLAKE2B bcc078dbe9d5cde47c230ba0b0d17ac3584a97a3d3b
 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
+DIST unrealircd-4.0.18.tar.gz 5317767 BLAKE2B cb71144ce0fce7f719b3081f2da9f85c997dbc372492dfa57354eb51aee122f0e42fdba9e0aca997cd118ed9c75fb6f197ca13e371931fe45709d6b64651336d SHA512 b9541ea83c24963187931938eadbba746175ec1d9449631e799df038bb062625e4b508c2d0d4e9e69a6401158cc23a855cbfbda3d28a4b971fbb249f074d26d3
 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.ebuild 5413 BLAKE2B b13e7cba8238465aebb69ce2533773062cdecc01e87878c3fb11f3cb572157ac0b5dfb75b810c5fb1bd6ef28e74b663f56b95f5c3fae731f5849c4ea078e4720 SHA512 6a86677f08ad11732f74636992483e2c3c606db63263cab962c432a625811676606f58988ddff903d7f5ae48dde8d6708ea1b621f82d21f1270467a673f14470
 MISC metadata.xml 1133 BLAKE2B 28a4ad6235e9a0ec31202822149d2cdc68ddacc49130b14f960639eaed019654a0d90548201e7e312b33422762a23678f7e3e2c76cc9e004296c93309ebf3f29 SHA512 6066d46bce08535445ff400ded0a93ca6a0bb879771a512e05bc896a85ebaf98a0b80875f3cc4bac5eddb99c28bb7c855da0f577d603fb39d61e517ef69373a7
diff --git a/net-irc/unrealircd/unrealircd-4.0.18.ebuild b/net-irc/unrealircd/unrealircd-4.0.18.ebuild
new file mode 100644
index 000000000000..e2003270220a
--- /dev/null
+++ b/net-irc/unrealircd/unrealircd-4.0.18.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-r1 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd-r2 ${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-libs/Manifest.gz b/net-libs/Manifest.gz
index 8b8168a91961..49a2428cd968 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 6b99c9d42e30..71d27988805a 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,6 +1,6 @@
 DIST gnutls-3.5.19.tar.xz 7239744 BLAKE2B c12578e79d3e96e1df7a5dc5f05fe9bc4bce4150f7440a73fda8e69d3f137a9ad1ace28b56e976bc319bd7be7305bf93af9c20087229e0b8fefee85b64e8261d SHA512 a78a59505e59c62ca671b34eacaeadcf070a943b12d964b7362962ba05636136638063491c37bb1883807014b8b6cf4f83f7d5b918ed02d5fbb52155679ce52f
 DIST gnutls-3.6.3.tar.xz 8010284 BLAKE2B 3cbfcfc90b5bbcdcf01ef13b4a306b05e471e6cd14bb5b0c37e1e7358f2b223605901c0495c7ac3227f48ab77db30481050bf1f38de5e18659d7b91b8907aaa9 SHA512 6238502464d229a9777e3076f4c745d16deaada83c9da756ecdcd370947576e0446bda3a7f85d5a099b745bbf8c0134ebdf6632e4b26d61daf170792fb4f5abe
-EBUILD gnutls-3.5.19-r1.ebuild 4090 BLAKE2B e3436c057d92753371e1b274dcb05a2b170befe90e89ba507bacc09c7d2d7b308e7a0c97967797355c653be492eb6c0187fcc69338cccc2e6aeee877ac11f321 SHA512 368f32b66c4e750b06a81dfd74b9e5d58c1cde20d244e326bd7471f1209bdfaae2a84ce241b01630453fff6d447e812c9d82e539adb6139dac4a63ee00d9b902
+EBUILD gnutls-3.5.19-r1.ebuild 4025 BLAKE2B e166a177a1530255660c59e775d715b03a0140729c9dcb20bfd17f91a7a7c5a8f1edab502be03e33980bd23c01cd1d9b667a5f1f468585e8db6ba646521e15c5 SHA512 ec3dfd1a35e14528fe9765360ab623bc6f2f93a2ff8e6d9421add6a100da2937344986ff909d7036e00caf8806e87923daf4ce381671e9c0cb79d0a85d6053be
 EBUILD gnutls-3.5.19.ebuild 4102 BLAKE2B 8b4eec009a005860f2b138ceca61ce81e59263c640c2214d9729a3dce4c20df09da82c9a9f56b7e44c7f48d70c44c974bef1597f9d97531c03a716bf372e1a10 SHA512 09257ab61c491b99910db2b8b3a39ce4fb9d484d0d5e1a19006b0ee0073f6261b4c6f18d9a86bfe53a2472c4e285c829a256354676c380fa48cff05bcead0e6e
-EBUILD gnutls-3.6.3.ebuild 3737 BLAKE2B 8b3bec0c5ce869114ae0a148d324c149e8b41b0a5c031dc67d5558fda8510421dd8376724d7683641dc940175794c5f61f5634591ee03c77e7862abeaca482f8 SHA512 05e8bfb984fe359973b3f7c6720d9df76c7e2db00cb44bfa602dc042cd2516f43e0275ceeb04123b5bf2ba7cd89b8904464c4ff5e22674a80e2f738b6d716247
+EBUILD gnutls-3.6.3.ebuild 3672 BLAKE2B bb978d2c2b2903e10707874da1c3a896159c46bcb9505e9632a31e69e2bde8f73f3784ea723ce38c96d41b9ab2d5b034f5fafd367f56d8130f7768fc92c24675 SHA512 e1f082e5fa7f744a61a7f1936dfdd9e71e83327b59e86a57ad447a22d4935ca5453ade48e99ff8809f696dced9c108693176700251822370b01ca502e10c3264
 MISC metadata.xml 1261 BLAKE2B 28e1e92d76bd15212f59e5a118b8fb891e2dd6225dc78353188b90a20f776a0da23d2ee6368a61dd034f8cff0522e4aa0dbaa7ff43919c3c36f396cb9a13bb15 SHA512 80a2e2d7a81cd6f19d361d31b3f7356a3664aa637531943fdb8d0876b13eddbc5a72aeac60506ae751105c35004de8fe5149ce149dd4b56b10c3522428885992
diff --git a/net-libs/gnutls/gnutls-3.5.19-r1.ebuild b/net-libs/gnutls/gnutls-3.5.19-r1.ebuild
index 1635d976bdf4..9fc06eac7ed6 100644
--- a/net-libs/gnutls/gnutls-3.5.19-r1.ebuild
+++ b/net-libs/gnutls/gnutls-3.5.19-r1.ebuild
@@ -34,11 +34,11 @@ DEPEND="${RDEPEND}
 	test? (
 		seccomp? ( sys-libs/libseccomp )
 	)"
-BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	tools? ( sys-devel/autogen )
-	valgrind? ( dev-util/valgrind )
+BDEPEND=">=virtual/pkgconfig-0-r1
 	doc? ( dev-util/gtk-doc )
 	nls? ( sys-devel/gettext )
+	tools? ( sys-devel/autogen )
+	valgrind? ( dev-util/valgrind )
 	test-full? (
 		app-crypt/dieharder
 		app-misc/datefudge
@@ -79,10 +79,6 @@ src_prepare() {
 multilib_src_configure() {
 	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
 
-	# remove magic of library detection
-	# bug#438222
-	local libconf=($("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g'))
-
 	# TPM needs to be tested before being enabled
 	libconf+=( --without-tpm )
 
@@ -117,9 +113,11 @@ multilib_src_configure() {
 		$(use_with idn) \
 		$(use_with pkcs11 p11-kit) \
 		$(use_with zlib) \
+		--disable-rpath \
 		--with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \
 		--without-included-libtasn1 \
-		"${libconf[@]}"
+		"${libconf[@]}" \
+		$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
 }
 
 multilib_src_install_all() {
diff --git a/net-libs/gnutls/gnutls-3.6.3.ebuild b/net-libs/gnutls/gnutls-3.6.3.ebuild
index fefc8766f6af..e28279bbf276 100644
--- a/net-libs/gnutls/gnutls-3.6.3.ebuild
+++ b/net-libs/gnutls/gnutls-3.6.3.ebuild
@@ -33,11 +33,11 @@ DEPEND="${RDEPEND}
 	test? (
 		seccomp? ( sys-libs/libseccomp )
 	)"
-BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	tools? ( sys-devel/autogen )
-	valgrind? ( dev-util/valgrind )
+BDEPEND=">=virtual/pkgconfig-0-r1
 	doc? ( dev-util/gtk-doc )
 	nls? ( sys-devel/gettext )
+	tools? ( sys-devel/autogen )
+	valgrind? ( dev-util/valgrind )
 	test-full? (
 		app-crypt/dieharder
 		>=app-misc/datefudge-1.22
@@ -78,10 +78,6 @@ src_prepare() {
 multilib_src_configure() {
 	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
 
-	# remove magic of library detection
-	# bug#438222
-	local libconf=($("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g'))
-
 	# TPM needs to be tested before being enabled
 	libconf+=( --without-tpm )
 
@@ -113,9 +109,11 @@ multilib_src_configure() {
 		$(use_enable tls-heartbeat heartbeat-support) \
 		$(use_with idn) \
 		$(use_with pkcs11 p11-kit) \
+		--disable-rpath \
 		--with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \
 		--without-included-libtasn1 \
-		"${libconf[@]}"
+		"${libconf[@]}" \
+		$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
 }
 
 multilib_src_install_all() {
diff --git a/net-libs/gupnp-igd/Manifest b/net-libs/gupnp-igd/Manifest
index 6ecc12ca6ed3..028c66246d8b 100644
--- a/net-libs/gupnp-igd/Manifest
+++ b/net-libs/gupnp-igd/Manifest
@@ -1,6 +1,6 @@
 AUX gupnp-igd-0.1.11-disable_static_modules.patch 250 BLAKE2B dcc3697895faa8f525b07797e44add4a553ea7e9f750c0464543b22116489ade38086f0f4e29527409c421d40c98d09cf668fa3558e9b365030b1017025b46df SHA512 93e656357e1191972f14cf0e23a1a6eb5929af022e431e1c37f0f1196b6fbed874bcb27f1b787b634308bdcfbf9c7c5375df83385669ab6989c6eb2e0f891d86
 DIST gupnp-igd-0.2.4.tar.xz 272004 BLAKE2B d195187faab17fcb5510afec0d024071936c5d61ac9ce4b4fd266cbc1ac238876935b588d91d7e55d3280ded4a0b39560a3b3bdbfec9cbccc3ab883ab1f75e1c SHA512 4da8d401935c4237661310aec0acb38e9c9fe54aeb6b2ef1c9533a8576dbd2d9f9db3b50c4e86b7efc81c80059a10ea52f73517dab23f3cdc0f91a5c0944dab8
 DIST gupnp-igd-0.2.5.tar.xz 287964 BLAKE2B 2267b991a0137006f122b3454bfb1bd9df0fd7fae2c47b50a394a2859f6e04375b55447830f6606c8a25260b9cafb75329cbdcd201c220a66fe881dce368abfe SHA512 3d2af29d10c2939a81c8745a50d9cc20be53f97a2112cec6e45bf05373d807d86404b61c776fea34b15ac341f9b7bfff2f3c48901dd241e64e18b5bc7e614cc8
-EBUILD gupnp-igd-0.2.4.ebuild 2338 BLAKE2B 3e12803fb56566c218f22168798484b736ac33242c7f59bfed562a379f911879f3111cd37a533d63138647cf41bc3634efe8d12711d8efb1a90235ee45432a28 SHA512 3a251b986fcbbe0bafd702a62e86cebdba7fd70743a8760541569cf7582d4cf7363d425ec297e6e38ff6de7d0a8c5cdc07aad43e94c2670a66745c8facbd69ee
-EBUILD gupnp-igd-0.2.5.ebuild 1163 BLAKE2B 1a3c90a2c8c9c70816da75fee0c9655a1b5267fe1a108d0d86bd5728771a578d5d6a91725108d467ea1db68a08cc38075c64480eaebef3cafebcdd45aa5253fb SHA512 23940e772f6acbedaad1438677ff69ddda9c9997b8ca7ca3a927e8e4042510b3b52071e5e32c61ff5ab1d4ab06744a250c909bf3cb232f39678a442bfe8d241f
+EBUILD gupnp-igd-0.2.4.ebuild 2356 BLAKE2B 95f1a6eeace04555c56bbb17e88ea6675f6adf54db31ff056d981d4c5031a05a4801e26a2712a1378f36e37436860312928d4c047640500a349b2248693d6aaf SHA512 85fef8ef5215049f27531d49f3eba0b74078c13786f8c4d88d255c726101c9f652ac8dc11097654ed23f846736ad18524cb5a0f63576ed9d965618dada07ae87
+EBUILD gupnp-igd-0.2.5.ebuild 1181 BLAKE2B 45490842810ee17427fa4bc8f70d07b220c71187222bdfef173fca789ec9a99e9a934d8c3da0116dc83cba19fc9ed9f2c0399db165c65fb84379f7244add1ca3 SHA512 f13a0190a3b3859439b091961b4beb0c08680890dfebcddb499bbfe89f0fdee307910e395b43496a0c7c92b399e1a43a236b8d85536810f639add6ac8d484601
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.4.ebuild b/net-libs/gupnp-igd/gupnp-igd-0.2.4.ebuild
index 7bbcda8a9220..2b84b9c579f7 100644
--- a/net-libs/gupnp-igd/gupnp-igd-0.2.4.ebuild
+++ b/net-libs/gupnp-igd/gupnp-igd-0.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=5
@@ -28,6 +28,7 @@ RDEPEND="
 		>=dev-python/pygobject-2.16:2[${PYTHON_USEDEP}]
 	)"
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	dev-util/gtk-doc-am
 	sys-devel/gettext
 	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.5.ebuild b/net-libs/gupnp-igd/gupnp-igd-0.2.5.ebuild
index f825b004821b..7f0c4f8d162b 100644
--- a/net-libs/gupnp-igd/gupnp-igd-0.2.5.ebuild
+++ b/net-libs/gupnp-igd/gupnp-igd-0.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
@@ -20,6 +20,7 @@ RDEPEND="
 	introspection? ( >=dev-libs/gobject-introspection-0.10 )
 "
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.10
 	sys-devel/gettext
 	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
diff --git a/net-libs/http-parser/Manifest b/net-libs/http-parser/Manifest
index de8cbdc64db2..2d7b26fe1f95 100644
--- a/net-libs/http-parser/Manifest
+++ b/net-libs/http-parser/Manifest
@@ -9,6 +9,6 @@ DIST http-parser-2.8.0.tar.gz 50575 BLAKE2B 0ea1973b452b62915ad2a92be95e09281c1a
 DIST http-parser-2.8.1.tar.gz 50731 BLAKE2B 1c4f3f61550f7f8e86d7b47e3986754a108dc979c6232d87ac418f9f8295b88ee43c4a5af150460f707e6ade01f5d435801f980ccbff93369ee0a9dc2eb60656 SHA512 6f52f543d979f39688ccefae236527a8183929b3d30f5370570107b01cf89d0338b448249a81102b78d31615d2e8f6e7c708f8961f55ece08e7d3a40e5ad0883
 EBUILD http-parser-2.6.2.ebuild 1395 BLAKE2B 3ecf77d59826d0b5a82c3bb6dffb25b98837027e0ab915bfde595b38d2633203278422db4a60c6be2fcb142055b64ba9862e71b9bdf409fc3c074cb765a51bb3 SHA512 ff59a0b6f3b7aef3ca79483384df88eafaf7ad80f05ea809288c6798ce0234f83a9dd41b5b2c80a865c70cb449574b0f2100c87bec2a5c2fecf432874b5a07f3
 EBUILD http-parser-2.8.0.ebuild 980 BLAKE2B 95c2d5c50cb8571adc4ab93796c8622a816f6f94a20642cecc60e1ab5721c4d1016bc1b92df9e0da66067dc074350c52795de4bda35e17e96371681dbf358482 SHA512 20de8a72586400fdcd94da20ebadcc59c4c7dd22e60772d736c6b1b27bfe7fdbe16b89f0ae45f93c2524c2f3fedf3b7bc9fc6580fd15d7824feeee5442ab3f5d
-EBUILD http-parser-2.8.1.ebuild 976 BLAKE2B 831a0010160dd923ca77f39b56a5286266a0a55435fda2387251d55d6edc5d4a81ff5dc18ab5272b9689648ea60c401bdd1924cb5faaf46cc809eb0c6d504c51 SHA512 c21a74e44c107161c60e607f8acf63bdb7875350c2fd188a568d0d08aaf4ec39c6284ee66bf4df140fb1a3aa9aca4fe13fcc0e5170486cc6f18d749e54600409
+EBUILD http-parser-2.8.1.ebuild 1005 BLAKE2B eb920cd19be9b1222df2dd689a0bc428d0537ac4a94e96742927fcbe6a6a5bf58af935d89359721b2bb8851f5309262664c43d87fc27a68cc333736774bf280e SHA512 600d57522c7823422783a9c164c66bad54200adac19d62d66dc415ad17a2f5b9caa2353dab4f87f952700f41ff14c8845ae993fb3b0caf5f52ee850dded8ff01
 EBUILD http-parser-99999.ebuild 878 BLAKE2B f542c8332672550422d4de016d5921ca6972bcd1395bc466090a3d0f7cb8b2169a3424cfd017e9b42d676fd86bcfcce19577cb0cfa3a69a1948403608e7dda93 SHA512 49b9a884e6518be420614a59457eb6fc58f791e56c9c8ad2da866013331ae6b2413a21921c4298a0f9c9d5cdaf505d45d2368aa97a5d247531acfd1887721c62
 MISC metadata.xml 289 BLAKE2B 805f4cc8d1b3649e03fe78b6b9b54e24bb9fd20ce85ebfd26e0b3876a9694de33790fc36fcadb0776a3fffec46b9b9083b419e8db54f19d4f624b9892130e5e8 SHA512 099cab401d2a3b0f7ca10fdbb5d31a9cc1f14dc016d75cfdcce122b6c3250cf17ef0215ca92574b1e64d4dc9bb460b3286be1b6a6d123acd0511a3c25c34a022
diff --git a/net-libs/http-parser/http-parser-2.8.1.ebuild b/net-libs/http-parser/http-parser-2.8.1.ebuild
index d7882c334833..1431e169b4a5 100644
--- a/net-libs/http-parser/http-parser-2.8.1.ebuild
+++ b/net-libs/http-parser/http-parser-2.8.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 @@ SRC_URI="https://github.com/nodejs/http-parser/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0/2.8.0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/net-libs/libbitcoinconsensus/Manifest b/net-libs/libbitcoinconsensus/Manifest
index d29db9271268..f8c2d183771d 100644
--- a/net-libs/libbitcoinconsensus/Manifest
+++ b/net-libs/libbitcoinconsensus/Manifest
@@ -1,10 +1,7 @@
 DIST bitcoin-0.15.1.knots20171111.patches.tar.xz 443024 BLAKE2B 5010c8d0f6a0bc8cd22ca7d7c73d9e4e689e369f0ba39b59f62fa6b6af3dcf938dfc87d33d3fe595a6e54d99734277a34af068dc29a6e984c76d529fbbe2f383 SHA512 455fadeac6ad57be111104680ec6939d6bf235eb49cde89b9716d36f6914c255b1b69cdea459d89b1bbca56099e793be0c8d7aacf592a9d78495068297bb5890
-DIST bitcoin-0.16.0.knots20180322.patches.tar.xz 417544 BLAKE2B f14616c81e0694346fd0714032be501ad0b58e82e2a5fcc623b1fdd316759ae7ac584e6c4ab586e8c9f5a402694a36eceac6b2f1c7441da655479f832a8869bd SHA512 9eca9cbae8ce17b38ddb70326760e33e7812db78e79cfe2d1a3518b34eb8fc87fe4c145e46ab60278b14e70a75b3af238342b4e1808a77cbca4b62b8c72fb1eb
 DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
 DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b7c531ed179f7e3e8b601a69a423fa736238a2caae890fd8850eb505533995e578e676860a4014922fbc238185ebb SHA512 a09b6cb64a1649d11e3fd6deeb13a07b1bf4bed504a2fc1c585919459ca8ac1af8e5ecc89dee487359e831a8f12625d54f408f95bb341033d6380b82c290c0d9
-DIST bitcoin-v0.16.0.tar.gz 6628305 BLAKE2B 69adb5832e2a708431c06bd8ce695f25cfc2b84e7ccf11e77f40c8ec273146208c70a900d0d32f79790cf67fb359c2731b0cecfc1f27ac2d0c4057228a83aed3 SHA512 7a59de44196a3cd5b75bccfe851e8bd7d5a00ae45b6e771e082326d75846e7c6d1f6d449e18b539b95b25aa12b7b79c462367f1c89438bcd1ca6ec84eb42972c
 DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
 EBUILD libbitcoinconsensus-0.15.1.ebuild 2388 BLAKE2B af9dec58358b370c37b770d6a0762af2940f45aa4f8ba723df2ca8f605dc87672a5134c3c773f5c83103efb4df1e0c9efeb8487a584f37b2063e35510bac0e3a SHA512 fbf7381d56add2aaf0b62016f981efbac71031ecf266a6044f0742d86e30054e01c592e276a0c1e1c66f52f99c642a29fd91757cd39ec9905d85aeb4fe726124
-EBUILD libbitcoinconsensus-0.16.0.ebuild 2344 BLAKE2B 561422a65b6f7a80500cb5422aa116e7c5bbae782ab29c0a392f57abcd14e55669195a6330145e26f2a52558065c46325d825903a93ba35cd6b5af7c4f24f12b SHA512 93d3638e10b6f3200d30b21c9416240b41752da8f50f04968d917b08e268cfce616b764747705526af0cd9a8d7b886f1a970a8b6cc47bc890a59ec18e70c9fca
-EBUILD libbitcoinconsensus-0.16.3.ebuild 2340 BLAKE2B b815481671655acfdc1ffc7465246dcb322961f7b84a23d7aec7c962d9be745b0685941ecd9ba29847a4fd237ff5c84e4f9d0a1d337fcd7774df37c34f5efe00 SHA512 3f46b0f147c33f25e6182a243e25cbd95a9a00156fbe631fe7030b211929f40839ce00ea3bef2eba364ef2a18c9e2dc604a2ba77f05300da93b1027823c96b2e
+EBUILD libbitcoinconsensus-0.16.3.ebuild 2339 BLAKE2B 297cd6c0adafbb99a5b3da6f8a34171fc32b72de86800a4c0f1401906d25e62db6cf7d9f2446dfe2db7d18e7c776fa5fe738d95cc55f21ef1a12124e869dba4d SHA512 a412a06ed2725a8b86adb5b9c245c3b041a2e3fc38c8a4104c8f808aa7877c0343a9159efdb5f4021f13ecd6a923480332fc7150b7acd6b595353d40deb21b59
 MISC metadata.xml 679 BLAKE2B 5283fe5aba24ba5d425e68ee4f6b1059378027c116c675d94ffdd44fab28c68ea52434df749a3a906121e2a044e296e8a26975f9653b93e693f3815bddf98d9d SHA512 3a9ccff97c3e952ec4c321184144be64daf4d9a1c03d21cc8aa454162ad1c1d133382cbbf5d21a873ea3bf746ec68c4ed0be0b81e2b562724ca9bd05f481d665
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.16.0.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.16.0.ebuild
deleted file mode 100644
index 4fdba1775ec8..000000000000
--- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.16.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-BITCOINCORE_COMMITHASH="4b4d7eb255ca8f9a94b92479e6061d129c91a991"
-KNOTS_PV="${PV}.knots20180322"
-KNOTS_P="bitcoin-${KNOTS_PV}"
-
-DESCRIPTION="Bitcoin Core consensus library"
-HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
-SRC_URI="
-	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
-	https://bitcoinknots.org/files/0.16.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux"
-IUSE="+asm knots libressl"
-
-DEPEND="
-	>=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery]
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( doc/bips.md doc/release-notes.md doc/shared-libraries.md )
-
-S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
-
-pkg_pretend() {
-	if use knots; then
-		elog "You are building ${PN} from Bitcoin Knots."
-		elog "For more information, see:"
-		elog "https://bitcoinknots.org/files/0.16.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
-	else
-		elog "You are building ${PN} from Bitcoin Core."
-		elog "For more information, see:"
-		elog "https://bitcoincore.org/en/2017/11/11/release-${PV}/"
-	fi
-}
-
-src_prepare() {
-	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
-
-	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
-
-	if use knots; then
-		eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
-		eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
-		eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
-	fi
-
-	eapply_user
-
-	echo '#!/bin/true' >share/genbuild.sh || die
-	mkdir -p src/obj || die
-	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
-
-	eautoreconf
-	rm -r src/leveldb src/secp256k1 || die
-}
-
-src_configure() {
-	local my_econf=(
-		$(use_enable asm)
-		--without-qtdbus
-		--without-libevent
-		--without-qrencode
-		--without-miniupnpc
-		--disable-tests
-		--disable-wallet
-		--disable-zmq
-		--with-libs
-		--disable-util-cli
-		--disable-util-tx
-		--disable-bench
-		--without-daemon
-		--without-gui
-		--disable-ccache
-		--disable-static
-		--with-system-libsecp256k1
-	)
-	econf "${my_econf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.16.3.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.16.3.ebuild
index 404db5e9f3e4..3d00e4c0f957 100644
--- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.16.3.ebuild
+++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.16.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="+asm knots libressl"
 
 DEPEND="
diff --git a/net-libs/libdmapsharing/Manifest b/net-libs/libdmapsharing/Manifest
index e1a57c730d19..350e154a01b1 100644
--- a/net-libs/libdmapsharing/Manifest
+++ b/net-libs/libdmapsharing/Manifest
@@ -1,3 +1,3 @@
 DIST libdmapsharing-2.9.39.tar.gz 757492 BLAKE2B e9f47d793be05845d1afb6eb4a785cbd131ceac1e3146bdfb5c6914f584df2fb8db10b829447a6ac084e7a9e0576202485019b1e724cc033f11163fb1bb21b95 SHA512 7003b947e1982735b647c1fa8e7e80e05322acf4ed4b5c1c28708da00a0bfe3eecac01bc2ddf59966e7db045f14fc78e749a2859d7e909bcea41164939f15b4a
-EBUILD libdmapsharing-2.9.39.ebuild 1206 BLAKE2B ff391ef39ace17ff0a8fcf069bd2afdc4def03ba7cbbc048df0082a0e8d68b853e212e89cd885e6e408b7f35ba4f8ed3d77d00b5af1a7ca5150bc3ef858bfd5f SHA512 7753f86deb25242d1736310801db84db1b8a020313bc388c323249546468e17dfea2b0b4eec7c18a2a44e04406589aa209fd71001ea40857ca65dc065c1ad1fb
+EBUILD libdmapsharing-2.9.39.ebuild 1224 BLAKE2B d0c705451ef5f0eb914e425e5d728d966f498a225834eec5cfb7b543cfe6cd50a0e75ec205dd3290c7b25986a317bc172716c730c46de448057fd36098e52728 SHA512 1c7718a05b5527d4a6e7c55dee581d19ef209e9a8fef01c053373b6b22c0151866e095df7191e11adac8ad73f2cff43238b62d0d6a7078f78c709c59bfcb92bb
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/libdmapsharing/libdmapsharing-2.9.39.ebuild b/net-libs/libdmapsharing/libdmapsharing-2.9.39.ebuild
index 3bc13d376e0a..f39dca47af47 100644
--- a/net-libs/libdmapsharing/libdmapsharing-2.9.39.ebuild
+++ b/net-libs/libdmapsharing/libdmapsharing-2.9.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
@@ -26,6 +26,7 @@ RDEPEND="
 	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
 "
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	dev-util/gtk-doc-am
 	virtual/pkgconfig
 	test? ( >=dev-libs/check-0.9.4 )
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 7a696a4de9db..a4626de0bcc0 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -4,6 +4,7 @@ AUX libssh-0.7.5-fix-config-buffer-underflow.patch 742 BLAKE2B 5db1e2be05b45914b
 AUX libssh-0.7.5-fix-config-parsing.patch 1076 BLAKE2B f710d58d36ec529c9390647b1a53506defe4a480463e899f8d7aeb8fe7d0d463b80f87ab6ec35fd89afadadb5f7698ac3e33a6f5693092494bfb1cf43886a9e6 SHA512 45d21c11ce242d6f2a86fe1fe96ed934a06d0dd54b9e2af6ad873bbec1b0db91cb884879205f42c1006740a4cfc1c16723180f447640e96e8373b39be8828aa5
 AUX libssh-0.7.5-fix-internal-algo-selection.patch 4711 BLAKE2B 04d61ee7ab3eba651342ac2b3dba52ef191271de37e741b2cb82da11c2f9cfb19d64a6befe9ebbab8d8525bd75c9213dee56c32023340db92e046827835df7ae SHA512 29bf9b43c8ee2f65c65040163fc9f250f35d5ca77ace5db2782eb8478dc14d9d16c0cf0e991025443a701d3d60124f83134a35e7cde6fae20932e3d2ff4b6732
 AUX libssh-0.8.0-tests.patch 503 BLAKE2B 22c3527e4b06ab9a00936e84c66ed14c7163a285aa5c88cfec5543e7c7aada8ffb716e20f3d3a0fef9425e244629f0d1c35250bdb9ce454b6cb247a3537cd411 SHA512 43145c2c202510ebe5cf64b47a6963b9335a844997f986938eacb0171a129863cdbd2676b8016941c85ec8c820d0543b8ab20f6aca5af86b3506e78aa29cf7e8
+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
@@ -11,6 +12,7 @@ DIST libssh-0.8.3.tar.xz 422244 BLAKE2B b24e4eed3ad1cd336b1864c68e366788ea62d0df
 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-9999.ebuild 2916 BLAKE2B 93e0101f64f7a11d8a2a83295057cecc7a4cc8cfb9ef0acf49bf00cb6a89bfda5d0e83518d28d60ffddddb069e841b3575e69194373687b77794198ddadfe0d7 SHA512 04d6693527a5d9b97fac07acc487a2bea86b968dd7dafbd3607b5811bd1e1de2edea1e63c28d23e93ea87dd7f841b8e2bdbcb8aaa210378e5f2f90817cd61481
 MISC metadata.xml 687 BLAKE2B 788f87388b4ab449521ab57684fa2c52393697e4e9826640473a1bc08bd886d384354362424c64a01a8d091c157610dbb4cebf80243bb4b73d125f47996f4f5f SHA512 95ca85fe4d9070acfeeb6a81505236e004d1e93464f9ba17d6d45968a4ab855121d67b4e09a54812063e924aa8b3a8e7ca3f13b68dc243b4fc0d062fb600fea8
diff --git a/net-libs/libssh/files/libssh-0.8.3-strict-overflow.patch b/net-libs/libssh/files/libssh-0.8.3-strict-overflow.patch
new file mode 100644
index 000000000000..93b15ec061b8
--- /dev/null
+++ b/net-libs/libssh/files/libssh-0.8.3-strict-overflow.patch
@@ -0,0 +1,21 @@
+Neither i nor j are ever counted downward for the array pointers, so assume
+they were intended to be signed integers.
+
+Fixes a compiler warning on HPPA triggering an error because of
+-Werror=strict-overflow -Wstrict-overflow=2:
+
+src/connect.c:509:7: error: assuming signed overflow does not occur when
+simplifying conditional to constant [-Werror=strict-overflow]
+     if(j != 0)
+	        ^
+--- a/src/connect.c
++++ b/src/connect.c
+@@ -471,7 +471,7 @@
+     fd_set *readfds, struct timeval *timeout) {
+   fd_set origfds;
+   socket_t fd;
+-  int i,j;
++  unsigned int i,j;
+   int rc;
+   int base_tm, tm;
+   struct ssh_timestamp ts;
diff --git a/net-libs/libssh/libssh-0.8.3-r1.ebuild b/net-libs/libssh/libssh-0.8.3-r1.ebuild
new file mode 100644
index 000000000000..7b660604f3aa
--- /dev/null
+++ b/net-libs/libssh/libssh-0.8.3-r1.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 c7d63ec1de40..e307766d4f9a 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -4,5 +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-9999.ebuild 1131 BLAKE2B d4413bf097b892cb8fa1747614e0194ea0db57c91b00dad158da1b88405e3d1d6d9372efd5c39447f4a7c87b2e3d215f66df8bcc212e1fc599b839e8275ff6f2 SHA512 a9ed6e5e56b005f8c46f957befa279360e127f30b95a33f98e0f3dcd73fa3e921f45e5577f4d2632b841ee1ae002011b1042e1f67ac55bab2e56bbc19ef532c5
-MISC metadata.xml 432 BLAKE2B b528bab0bd90699af37096d4b6a4e06767e39011b4ef299600c8d35987768693224869ef5e05255ff28edb0ae8e14c38a04e20df953391a3df527d8609700a8f SHA512 c0fd5dce9a697c02886aeea4e001695bf51c6cec82a1c32d58a839dbd63f0085f9005c3504d40bd858bcca80ec2018bbf44bca64dd7692029e158612da39cabd
+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
new file mode 100644
index 000000000000..501d50e45694
--- /dev/null
+++ b/net-libs/libssh2/libssh2-1.8.0-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-multilib
+
+DESCRIPTION="Library implementing the SSH2 protocol"
+HOMEPAGE="https://www.libssh2.org"
+SRC_URI="https://www.${PN}.org/download/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="gcrypt libressl mbedtls zlib"
+REQUIRED_USE="
+	?? ( gcrypt libressl mbedtls )
+"
+RESTRICT="test"
+
+RDEPEND="
+	!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.0-libgcrypt-prefix.patch
+	"${FILESDIR}"/${PN}-1.8.0-mansyntax_sh.patch
+	"${FILESDIR}"/${PN}-1.8.0-openssl11-memleak.patch
+	"${FILESDIR}"/${PN}-1.8.0-openssl11.patch
+)
+
+multilib_src_configure() {
+	local crypto_backend=OpenSSL
+	if use gcrypt; then
+		crypto_backend=Libgcrypt
+	elif use mbedtls; then
+		crypto_backend=mbedTLS
+	fi
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DCRYPTO_BACKEND=${crypto_backend}
+		-DENABLE_ZLIB_COMPRESSION=$(usex zlib)
+	)
+	cmake-utils_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
+}
diff --git a/net-libs/libssh2/metadata.xml b/net-libs/libssh2/metadata.xml
index e9e734ab02f9..2149f2ed0c6f 100644
--- a/net-libs/libssh2/metadata.xml
+++ b/net-libs/libssh2/metadata.xml
@@ -10,5 +10,7 @@
 </maintainer>
 <use>
 	<flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> instead of <pkg>dev-libs/openssl</pkg></flag>
+	<flag name="libressl">Use <pkg>dev-libs/libressl</pkg> instead of <pkg>dev-libs/openssl</pkg></flag>
+	<flag name="mbedtls">Use <pkg>net-libs/mbedtls</pkg> instead of <pkg>dev-libs/openssl</pkg></flag>
 </use>
 </pkgmetadata>
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index 9849ba3ad600..90bff5635980 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -1,7 +1,7 @@
+DIST libtorrent-rasterbar-1.1.10.tar.gz 3902542 BLAKE2B 3a78862ce2825c9da32ab38122db05c2816daa237559446a60702f562e971c5597210dfc2612235294cec3f60fa3de8cab3a0246887ac4779b01171a460f70f0 SHA512 414deeb9765bfb6072af5fa00ad836bfe3751622a80783ea84389e31355b342a4371f0dc195b2d27b154826e515b2e6063c8786f792afa347abba9caadaa5b2a
 DIST libtorrent-rasterbar-1.1.5.tar.gz 3942894 BLAKE2B 0a1102e1b74049c1f5d8980363a6b92a3378339349609d64d3b7a38a58baf6c2898a26f70e92b0de0d6a1f4b6725a576a850aacaa5764fe7d96fa0b541dfa2d7 SHA512 d0e7fe944c8a396aaf79ce80c7513be07a855bc8a9eee3bca46ed83d5e190aaa5ea4dc9a8a7208e27e18ae8f15733e6e34eabd375f0bde43d4dc4607840782e7
-DIST libtorrent-rasterbar-1.1.7.tar.gz 3951887 BLAKE2B 4729a718f5ce5bf2a41506f18f48bc588ad863ea8e640dde6f9e0a35bb909ff651fca3c8729668b25507fa3928218be579964c683d9d6bf3dc1c3abcce0f9452 SHA512 e35e95eec55a69b81c1d21f73e230dc4de7502b5adce99193c01b0d89a04b0f484788ff235d3f73cc77eeccba8d8d441fac92aa76a17afb56bafabd318b4a75e
 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.7.ebuild 2402 BLAKE2B 56c5cd008f5228123a10ff5947d181fade302610184e6f5e17061f67644876f3b7cfe1531a0844ec16ecfd2b7c2b506e12566f06cbe4fd9e51e27a67f5426b83 SHA512 7381f9f833bc83d01504b4d47312185d6459cd0e9ec4c49999e31c877220260326db5136d7d6390d014af52a5abd20ec9523f3491b8bb91a4af5d068d1453a19
 EBUILD libtorrent-rasterbar-1.1.9.ebuild 2389 BLAKE2B 070a26370780dd74a6066a10669822918d3089c7d2d3480566b991829d30f40c8e02baa658b8657fdd4ab83400d46ca5767a780a3b980206084a9a64ada30045 SHA512 fd0c27c7c6ccad5f01fce80a3427933a950ea3bb4f7b9a1ceb803640667c9854edefdb1ae7504f023d7d25797ec0ad6ebe93b4eee2738e9b7c8ba736b8c7739e
 MISC metadata.xml 524 BLAKE2B cb56b15139e8d52871acb1f2979178e182c385658d3fb59025e3f19e1844deb4c0442c12ad490c645d456ec09dd68c268fd6863a205f30a0c241a3d02f10a45b SHA512 47c117d10a88cd13375fa10bfaaa827012d0451713bfff80c587295f68f1243051c477611d9b830a7b525ff2bd77d38c2a45f172ecbe18ba66827e3e6ca664f3
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.10.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.10.ebuild
new file mode 100644
index 000000000000..c74205693ccd
--- /dev/null
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.10.ebuild
@@ -0,0 +1,104 @@
+# 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"
+DISTUTILS_OPTIONAL=true
+DISTUTILS_IN_SOURCE_BUILD=true
+
+inherit distutils-r1 flag-o-matic
+
+MY_PV=$(ver_rs 1-2 '_')
+
+DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
+HOMEPAGE="http://libtorrent.org"
+SRC_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${MY_PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/9"
+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} )"
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	virtual/libiconv
+	examples? ( !net-p2p/mldonkey )
+	python? (
+		${PYTHON_DEPS}
+		dev-libs/boost:=[python,${PYTHON_USEDEP}]
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+"
+
+src_prepare() {
+	default
+
+	# bug 578026
+	# prepend -L${S}/... to ensure bindings link against the lib we just built
+	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
+
+	# prepend -I${S}/... to ensure bindings use the right headers
+	sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
+
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	append-cxxflags -std=c++11 # bug 634506
+
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable debug logging)
+		$(use_enable debug disk-stats)
+		$(use_enable dht dht $(usex debug logging $(usex ('yes' 'no'))))
+		$(use_enable examples)
+		$(use_enable ssl encryption)
+		$(use_enable static-libs static)
+		$(use_enable test tests)
+		--with-libiconv
+	)
+	econf "${myeconfargs[@]}"
+
+	if use python; then
+		python_configure() {
+			econf "${myeconfargs[@]}" \
+				--enable-python-binding \
+				--with-boost-python="${EPYTHON#python}"
+		}
+		distutils-r1_src_configure
+	fi
+}
+
+src_compile() {
+	default
+
+	python_compile() {
+		cd "${BUILD_DIR}/../bindings/python" || die
+		distutils-r1_python_compile
+	}
+	use python && distutils-r1_src_compile
+}
+
+src_install() {
+	use doc && HTML_DOCS+=( "${S}"/docs )
+
+	default
+
+	python_install() {
+		cd "${BUILD_DIR}/../bindings/python" || die
+		distutils-r1_python_install
+	}
+	use python && distutils-r1_src_install
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.7.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.7.ebuild
deleted file mode 100644
index 562bd62d7a8a..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.7.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads"
-DISTUTILS_OPTIONAL=true
-DISTUTILS_IN_SOURCE_BUILD=true
-
-inherit distutils-r1 flag-o-matic versionator
-
-MY_PV=$(replace_all_version_separators _)
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="http://libtorrent.org"
-SRC_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${MY_PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/9"
-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} )"
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	virtual/libiconv
-	examples? ( !net-p2p/mldonkey )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	)
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-"
-
-src_prepare() {
-	default
-
-	# bug 578026
-	# prepend -L${S}/... to ensure bindings link against the lib we just built
-	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
-
-	# prepend -I${S}/... to ensure bindings use the right headers
-	sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
-
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	append-cxxflags -std=c++11 # bug 634506
-
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable debug logging)
-		$(use_enable debug disk-stats)
-		$(use_enable dht dht $(usex debug logging yes))
-		$(use_enable examples)
-		$(use_enable ssl encryption)
-		$(use_enable static-libs static)
-		$(use_enable test tests)
-		--with-libiconv
-	)
-	econf "${myeconfargs[@]}"
-
-	if use python; then
-		python_configure() {
-			econf "${myeconfargs[@]}" \
-				--enable-python-binding \
-				--with-boost-python="${EPYTHON#python}"
-		}
-		distutils-r1_src_configure
-	fi
-}
-
-src_compile() {
-	default
-
-	python_compile() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_compile
-	}
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	use doc && HTML_DOCS+=( "${S}"/docs )
-
-	default
-
-	python_install() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_install
-	}
-	use python && distutils-r1_src_install
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index e248b5c46af3..b43c1e06dbd7 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -1,9 +1,7 @@
 DIST mbedtls-2.10.0.tar.gz 2190139 BLAKE2B f4e6da0bc433992a79088a86c7bad48564e5d8eca110633960c8197becf1fb64b77e36f2bd63e241ff0a3eb86aae1b6b538de2043e1bb6626b9b18fa9951db91 SHA512 a1dcb46d3e27c93b511a0dc846b5ed6dc35992cdcf04fce6ad83f5a92440d11d60a07e0fec64f9d6c5e2f27365bdd7a557a35af4ff250b342adbde6193240a95
-DIST mbedtls-2.11.0.tar.gz 2224911 BLAKE2B adbcdb9e002fc2d84e345aec00aaae1cbef67f686895a45e6263339f0d7c9d0453d81d6bf4b30c31d6c4db96ab9d631918fc93e5d361e0b305053462b7fbf64e SHA512 301ddc6757be32aaa8ddbfd6c665a1d78c4869007a5aff954b54479c26f90d25bbfcb8c866dd6ae73a8222123928355e84ca5b59d24512d2bfdf1cdc41050e29
 DIST mbedtls-2.12.0.tar.gz 2299830 BLAKE2B e65da9feaca4dc22e843cb645259ab8c81e24cec709f0f79475b53e3c319f6e5239bd6c82db07562252a35d9746600502c5a856bf6c0de67f2fbbea840b4491c SHA512 c7c2aeb1717886ad87486af2dccb05b2f051372c69fc914f30e4ace1067f5be39ba04e093ad522f904e23a576c1ff430bd772e77823d0f4720f6fc5c1b8aa98c
-DIST mbedtls-2.7.2.tar.gz 2127772 BLAKE2B d66c65f0d974baf97ae361e64db5028af6c402ea248a785009b422d993deaa4facee98dd338ee4b5d36087fd07e679069fc4fb57cce548097d1f788cedb825fa SHA512 52455b68744a3c220aed7346d19c7b9bebd3a065406242b446816a3b02325d72005b5c381b158bfff90e2fe5854064629b297fbec95fea3ad203bfae51a15cab
+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.11.0.ebuild 2455 BLAKE2B 0f57b97cda5b255df96a725a919c89c0bc0b0a77c2718a7763b237be97c5028611d453ffe507e2f899c92b0dc2dec15529f70a8a5594757bedc1eb53a51967a0 SHA512 3131c793d93aa5b3fdfc9bb4ca23095fe09a07f850cbf6a7eec5416f4927d6b2ee94a2e17022646938e6d86880b3b4f318d42898da97def446f234a624dbfaa9
-EBUILD mbedtls-2.12.0.ebuild 2455 BLAKE2B 0f57b97cda5b255df96a725a919c89c0bc0b0a77c2718a7763b237be97c5028611d453ffe507e2f899c92b0dc2dec15529f70a8a5594757bedc1eb53a51967a0 SHA512 3131c793d93aa5b3fdfc9bb4ca23095fe09a07f850cbf6a7eec5416f4927d6b2ee94a2e17022646938e6d86880b3b4f318d42898da97def446f234a624dbfaa9
-EBUILD mbedtls-2.7.2.ebuild 2415 BLAKE2B 124241763616413f50d6180e83489a5d215236c7498a21ebe6915cdb193fb822e2b9bd39ec9226a97bce55ead0e4b43d029dee755d1b596a1657c4ccda9a7b75 SHA512 1dc5dcc839abca03ef4fb2d997498987ddc14ff6a1dd7fd51dd8922793f8398d2483d58956d6f459a844c4dfc18ba0c444f885c0fbf1dbf45ea6cc3dc8a836e5
+EBUILD mbedtls-2.12.0.ebuild 2446 BLAKE2B 7b6cff2d3aa000039062e1757044bbf9ee19830c990da4fc43ac8b9e3f7e32ecab248190a536cf5c6faef787ebe5861953ac83cc42868b3ed58992e3b7e93a7f SHA512 5e935a03dc7d638bfe7ad9d7664652d0078a23f6c6c58d2b8bb38c79c67b33a6571651bf62f47c283742263815856ea1ae3cf26255c1d5a0b428ea225c0adcc2
+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.11.0.ebuild b/net-libs/mbedtls/mbedtls-2.11.0.ebuild
deleted file mode 100644
index ce835a31211c..000000000000
--- a/net-libs/mbedtls/mbedtls-2.11.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils multilib-minimal
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="https://tls.mbed.org/"
-SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
-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"
-IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
-
-RDEPEND="
-	programs? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen media-gfx/graphviz )
-	test? ( dev-lang/perl )"
-
-enable_mbedtls_option() {
-	local myopt="$@"
-	# check that config.h syntax is the same at version bump
-	sed -i \
-		-e "s://#define ${myopt}:#define ${myopt}:" \
-		include/mbedtls/config.h || die
-}
-
-src_prepare() {
-	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
-	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
-	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
-		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
-		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
-		-DENABLE_TESTING=$(usex test)
-		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
-		-DINSTALL_MBEDTLS_HEADERS=ON
-		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-	use doc && multilib_is_native_abi && emake apidoc
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
-		cmake-utils_src_test
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-}
-
-multilib_src_install_all() {
-	use doc && HTML_DOCS=( apidoc )
-
-	einstalldocs
-
-	if use programs ; then
-		# avoid file collisions with sys-apps/coreutils
-		local p e
-		for p in "${ED%/}"/usr/bin/* ; do
-			if [[ -x "${p}" && ! -d "${p}" ]] ; then
-				mv "${p}" "${ED%/}"/usr/bin/mbedtls_${p##*/} || die
-			fi
-		done
-		for e in aes hash pkey ssl test ; do
-			docinto "${e}"
-			dodoc programs/"${e}"/*.c
-			dodoc programs/"${e}"/*.txt
-		done
-	fi
-}
diff --git a/net-libs/mbedtls/mbedtls-2.12.0.ebuild b/net-libs/mbedtls/mbedtls-2.12.0.ebuild
index ce835a31211c..78a3d9a831f2 100644
--- a/net-libs/mbedtls/mbedtls-2.12.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.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
@@ -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/mbedtls/mbedtls-2.13.1.ebuild b/net-libs/mbedtls/mbedtls-2.13.1.ebuild
new file mode 100644
index 000000000000..32c435985e20
--- /dev/null
+++ b/net-libs/mbedtls/mbedtls-2.13.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils multilib-minimal
+
+DESCRIPTION="Cryptographic library for embedded systems"
+HOMEPAGE="https://tls.mbed.org/"
+SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
+S=${WORKDIR}/${PN}-${P}
+
+LICENSE="Apache-2.0"
+SLOT="0/12" # slot for libmbedtls.so
+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="
+	programs? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen media-gfx/graphviz )
+	test? ( dev-lang/perl )"
+
+enable_mbedtls_option() {
+	local myopt="$@"
+	# check that config.h syntax is the same at version bump
+	sed -i \
+		-e "s://#define ${myopt}:#define ${myopt}:" \
+		include/mbedtls/config.h || die
+}
+
+src_prepare() {
+	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
+	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
+	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
+	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
+	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
+
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
+		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
+		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
+		-DENABLE_TESTING=$(usex test)
+		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
+		-DINSTALL_MBEDTLS_HEADERS=ON
+		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+	use doc && multilib_is_native_abi && emake apidoc
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
+		cmake-utils_src_test
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+	use doc && HTML_DOCS=( apidoc )
+
+	einstalldocs
+
+	if use programs ; then
+		# avoid file collisions with sys-apps/coreutils
+		local p e
+		for p in "${ED%/}"/usr/bin/* ; do
+			if [[ -x "${p}" && ! -d "${p}" ]] ; then
+				mv "${p}" "${ED%/}"/usr/bin/mbedtls_${p##*/} || die
+			fi
+		done
+		for e in aes hash pkey ssl test ; do
+			docinto "${e}"
+			dodoc programs/"${e}"/*.c
+			dodoc programs/"${e}"/*.txt
+		done
+	fi
+}
diff --git a/net-libs/mbedtls/mbedtls-2.7.2.ebuild b/net-libs/mbedtls/mbedtls-2.7.2.ebuild
deleted file mode 100644
index 92a6856edbb5..000000000000
--- a/net-libs/mbedtls/mbedtls-2.7.2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils multilib-minimal
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="https://tls.mbed.org/"
-SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="Apache-2.0"
-SLOT="0/10" # slot for libmbedtls.so
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="cpu_flags_x86_sse2 doc havege libressl programs test threads zlib"
-
-RDEPEND="
-	programs? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen media-gfx/graphviz )
-	test? ( dev-lang/perl )"
-
-enable_mbedtls_option() {
-	local myopt="$@"
-	# check that config.h syntax is the same at version bump
-	sed -i \
-		-e "s://#define ${myopt}:#define ${myopt}:" \
-		include/mbedtls/config.h || die
-}
-
-src_prepare() {
-	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
-	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
-	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
-		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
-		-DUSE_STATIC_MBEDTLS_LIBRARY=OFF
-		-DENABLE_TESTING=$(usex test)
-		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
-		-DINSTALL_MBEDTLS_HEADERS=ON
-		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-	use doc && multilib_is_native_abi && emake apidoc
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
-		cmake-utils_src_test
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-}
-
-multilib_src_install_all() {
-	use doc && HTML_DOCS=( apidoc )
-
-	einstalldocs
-
-	if use programs ; then
-		# avoid file collisions with sys-apps/coreutils
-		local p e
-		for p in "${ED%/}"/usr/bin/* ; do
-			if [[ -x "${p}" && ! -d "${p}" ]] ; then
-				mv "${p}" "${ED%/}"/usr/bin/mbedtls_${p##*/} || die
-			fi
-		done
-		for e in aes hash pkey ssl test ; do
-			docinto "${e}"
-			dodoc programs/"${e}"/*.c
-			dodoc programs/"${e}"/*.txt
-		done
-	fi
-}
diff --git a/net-libs/nDPI/Manifest b/net-libs/nDPI/Manifest
index 62cd6ae6d1bc..f27ad2c17085 100644
--- a/net-libs/nDPI/Manifest
+++ b/net-libs/nDPI/Manifest
@@ -1,4 +1,4 @@
-AUX nDPI-2.2-libcache-include.patch 1038 BLAKE2B 654e66477b6fa32589d57dde8ba44baab2defaf2a001cc82eb46486fe62d840b25f5480c1512c0f4947162cca767530794eb2a6e74ef6edb02a0712d44603b8c SHA512 b93a74066e94ba767973cf1f2ca7dd8776459d8fe9eb352185ded766bbabcc6a28fb57f5acaca1e7660be0778c3298e22e5066969c6298c6782925c077e2ff35
+AUX nDPI-2.2-libcache-include.patch 819 BLAKE2B 5a0698bc19917ebfd737e886937d023e83452bfdd812010e2b2622461ca8eb6758533ecf5c1b01495eab21de72fd7f0608dd826d864336446f893d083b68ed55 SHA512 854b65c5dbdb19bd73040ed12740c945e0f31e50c51a0ebd32c646177043e28eee79e572747fe23580f7c2cca7cf59a22655f084e111bec3e146a4d4b6d941cc
 DIST nDPI-2.0.tar.gz 19280901 BLAKE2B d08bd807b556394b708713061ef23025be296b3c847c90680170b2d39f23f05fac35a1ced091925383f57c0d0be6e5f0c7ad239168c76caa7b9a46847413e860 SHA512 c8dac1990ff49fc04ee321068d8fc722528c6be0543af2d0bda77936eff12713c36d5abd3fd2472121f2e322e99ba8e57facca813f7b012240c61e16c1a6cd44
 DIST nDPI-2.2.tar.gz 19937173 BLAKE2B a00287d5901487f7e56d7aeab7dcb357c0eb6348be5621952d9f357058419b6378d41b42d0d6e9ea6e20680cfda96fa501f2ebaae5c83dd4e62f756d1089a160 SHA512 ee1e0a1cc87a3971408877bd5d3154f6bd5d4ddcd2437c8e03e5d8a5093da2b1cbfefad1e28e77145af4286eecbd341ef90f94aa5c7f36a98e3625e9948e96d6
 EBUILD nDPI-2.0.ebuild 630 BLAKE2B eea945c7fdb4c68e7dc87fd754dc58d6816470b4872639c2ac867978d8e1507c1b9f49f6f07adcc24a87a6343fc09b8af0c917f12b5951893fffbddfe1886493 SHA512 269357550fde0644e13e2597ad9af379c2eb11525d00579bda9a8d67442ec233eaf8b501686c81069f9e1fffa41bf85133d9b94ca8eef0da11566b31238b6fb8
diff --git a/net-libs/nDPI/files/nDPI-2.2-libcache-include.patch b/net-libs/nDPI/files/nDPI-2.2-libcache-include.patch
index 5ee089f46bf3..44d78e99f327 100644
--- a/net-libs/nDPI/files/nDPI-2.2-libcache-include.patch
+++ b/net-libs/nDPI/files/nDPI-2.2-libcache-include.patch
@@ -1,5 +1,5 @@
---- src/include/Makefile.am.orig	2018-01-22 21:24:17.802100061 +0100
-+++ src/include/Makefile.am	2018-01-22 21:24:30.080100801 +0100
+--- a/src/include/Makefile.am
++++ b/src/include/Makefile.am
 @@ -7,4 +7,5 @@
  		ndpi_protocol_ids.h \
  		ndpi_protocols.h \
@@ -7,8 +7,8 @@
 -		ndpi_includes.h
 +		ndpi_includes.h \
 +		libcache.h
---- src/include/ndpi_typedefs.h.orig	2018-01-22 21:27:35.994112009 +0100
-+++ src/include/ndpi_typedefs.h	2018-01-22 21:27:47.463112701 +0100
+--- a/src/include/ndpi_typedefs.h
++++ b/src/include/ndpi_typedefs.h
 @@ -25,7 +25,7 @@
  #define __NDPI_TYPEDEFS_H__
  
@@ -18,8 +18,8 @@
  
  #define BT_ANNOUNCE
  #define SNAP_EXT
---- src/lib/Makefile.am.orig	2018-01-22 21:34:57.055138600 +0100
-+++ src/lib/Makefile.am	2018-01-22 21:35:10.431139406 +0100
+--- a/src/lib/Makefile.am
++++ b/src/lib/Makefile.am
 @@ -12,7 +12,8 @@
  			     ../include/ndpi_includes.h \
  			     ../include/ndpi_protocol_ids.h \
diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest
index 25ee2124080d..5ce5bafeeff0 100644
--- a/net-libs/pjproject/Manifest
+++ b/net-libs/pjproject/Manifest
@@ -3,6 +3,6 @@ AUX pjproject-2.7.2-libressl.patch 3446 BLAKE2B 47b21f621ffd1990e276459d9692ed7e
 AUX pjproject-2.7.2-ssl-flipflop.patch 4336 BLAKE2B 999150475bd24989f64bb718d082ff1c40d5ba383103371550d2c682578a9c57d58b4029e512ac5a064fae3a526bd6e62fb645ba45b4067c47fd148bcce668aa SHA512 438a61353c0200d3f230b81cc13f565a178d078b4580aa468a9241b5b95f5a2336d039f4aaf99cd57e7b1042f4c0a1cafd00c29191e36c08f2194d984811b8d6
 DIST pjproject-2.7.1.tar.bz2 4880007 BLAKE2B 33fca89f07abc0b9662b1070c96b903c236a60149734755286dad3111411dbeef5779077a77d21112be6db2957cb7e18c5c833b3c5fd32c26be44d4550fb215e SHA512 cd15afee2a02659668ff228b2652d2bd179393e3b5031afae1c326354fb9676babc08eb689e466165536abc360684299b4fdb41dbb1148aed89afe1ce7e5d979
 DIST pjproject-2.7.2.tar.bz2 4994233 BLAKE2B 44ecaf0997d5dd9b18e0b811cead7c9104e63894fa06fb1d64e79b60fa4210968fd90ef47e5f5be3629675363c8756ce3bc1834caa9700654ab4c53efe676ee7 SHA512 3d355ffcbbeed62cfc711e574a987dc06043ccf4f2625820adffa89167022b8306fcee3fada71d3d45e7b902fc9c65ac8221de101cbafed25362a3921f702afd
-EBUILD pjproject-2.7.1.ebuild 2610 BLAKE2B a67e4c4c21bea82aba8fd25cdc152329734d6d9aa6550c8bcba951b997e6ee9db0e509ff344ab296dc401422ce6d2fcc4c675cd8101dae30bf254b99aee621f9 SHA512 d0d93d97ac40394416ad4e7286e226160ccb9652922a318e1293610361355130f95cabc4133e2144b62bb59d57fa8bfc2d3e5742832dbd420b87c7a7ee48ed75
-EBUILD pjproject-2.7.2.ebuild 2751 BLAKE2B 7d1d48306d0e09013a07c14a50c36bf870b887430411903d2005f0e23f4c16bb4fc011621df4c42b28e4791c8d98f4d2e1caf8b7b8d1ac59c913c9e44af11498 SHA512 4814671e3263338ba9f9c57692ded5ea1a2925d29ff9d75cb73461d7f4fa637a8d8dc04a9218fe393da289d55c6b75cbbcd7de13f1a7c84cbdca48afa751fefe
+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
diff --git a/net-libs/pjproject/pjproject-2.7.1.ebuild b/net-libs/pjproject/pjproject-2.7.1.ebuild
index c19d6042cf6d..b245f2b754bc 100644
--- a/net-libs/pjproject/pjproject-2.7.1.ebuild
+++ b/net-libs/pjproject/pjproject-2.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
@@ -8,7 +8,7 @@ inherit autotools flag-o-matic
 DESCRIPTION="Open source SIP, Media, and NAT Traversal Library"
 HOMEPAGE="http://www.pjsip.org/"
 SRC_URI="http://www.pjsip.org/release/${PV}/${P}.tar.bz2"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc x86"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-libs/pjproject/pjproject-2.7.2.ebuild b/net-libs/pjproject/pjproject-2.7.2.ebuild
index 8f9962b2e278..2b77f3de1c31 100644
--- a/net-libs/pjproject/pjproject-2.7.2.ebuild
+++ b/net-libs/pjproject/pjproject-2.7.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 @@ inherit autotools flag-o-matic
 DESCRIPTION="Open source SIP, Media, and NAT Traversal Library"
 HOMEPAGE="http://www.pjsip.org/"
 SRC_URI="http://www.pjsip.org/release/${PV}/${P}.tar.bz2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-libs/rest/Manifest b/net-libs/rest/Manifest
index 7c1913fc2a86..951737bb2efb 100644
--- a/net-libs/rest/Manifest
+++ b/net-libs/rest/Manifest
@@ -1,3 +1,3 @@
 DIST rest-0.8.1.tar.xz 333376 BLAKE2B 595576f29ebe35121b7a896086abd3411ac3b2d324d2e50d646274c4060cfaffbd3b701eaae80afdc60d52c77bb5076135064648536378f2562f27c79c5738b7 SHA512 824a341db3827e4360abe03e33735918c68913c70d797699ef74271080a1985872006ec70fd994dc8fa3fbfef417e6fe979883c11286512d0ce623b8368e40c3
-EBUILD rest-0.8.1.ebuild 1482 BLAKE2B 4c86930d30dfc3d5b1cc587dc32dd1542d1fd6d34bd8235871ac75263f88dc107729a32619a6e0b5e210b4919f34350677a8a043f1d766de14e0a814fe449bec SHA512 52e34462b11ec31375f566922d6d64747301681e935d078e256526cde9e31a23e41709e21ad975e1e9e0ebe034de5503696ba225ea8cf136c84cc8c95efa7252
+EBUILD rest-0.8.1.ebuild 1500 BLAKE2B e7e102d1529c6aed63c22adb97dff2ede198b33e85b2fc8189be2d672a1a80a144cfde3966a737924598550f6066a0307be85ad4344c54f3b3eb8f701a6f159c SHA512 2262dc3bd64e0a6e6798bff6b876b129e022a183033a14d69206fab64191d3b7b89fa2f07e18057df47d097e6628c33e8183bb7b2fb985b00dc2c57b8cc0fe47
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/net-libs/rest/rest-0.8.1.ebuild b/net-libs/rest/rest-0.8.1.ebuild
index ef2f5ab73746..ebfd6ac2bc28 100644
--- a/net-libs/rest/rest-0.8.1.ebuild
+++ b/net-libs/rest/rest-0.8.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"
@@ -23,6 +23,7 @@ RDEPEND="
 	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
 "
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.13
 	>=dev-util/intltool-0.40
 	virtual/pkgconfig[${MULTILIB_USEDEP}]
diff --git a/net-libs/telepathy-glib/Manifest b/net-libs/telepathy-glib/Manifest
index fdff45f6d83e..06d49b28f7b6 100644
--- a/net-libs/telepathy-glib/Manifest
+++ b/net-libs/telepathy-glib/Manifest
@@ -1,3 +1,3 @@
 DIST telepathy-glib-0.24.1.tar.gz 3898149 BLAKE2B a4bc704b5b98c9e6df656833eec38b5f69a0b5d2621a6816ffa6c7da64f2c512cb992ffadd2ec2ac89a1b8cf6581c28aedad6b4019b3d16d9165c7d874370eb6 SHA512 2fed94f76a19d6069f671cdd45d2fd8a4b4ad27c4601aff66041ca205456be397c76a86f92cc9bf20fa4eb6d4c15a67ed8196644c143c37e945f382229a63335
-EBUILD telepathy-glib-0.24.1.ebuild 1522 BLAKE2B 48b58e7f68b4654fa0380db8867302ab4b24b6520e39e0ffa342f4ee638e072dba68e4d72bfb9a62987af39838c5acbba9c04f29c2d39df80cab92efe9f3807a SHA512 d5a4d5edb1fbbde379d995d2f72faef06f5855be0ec7d4feb04681e242b018c3976ced3e3a2efaebed35fc2968720b66d512ca5921f466ceb7c55445bedc33d9
+EBUILD telepathy-glib-0.24.1.ebuild 1540 BLAKE2B 94ddc615e7b176fad63249befdd31198776e5f7b18e9b237f2e1383243149d564d51909f39a855a2289c16fe581c1eb137233be790f0d252053ddf98e67d3251 SHA512 41e8a99610f40af64aa5da3692b76f5142fd5d5e6df0df0ec86821a1beade8861b17a104c53dd9b3104f19204e5a8323948467e05b52ca568d41da5f17d70277
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.24.1.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.24.1.ebuild
index 34a912ab9e11..daa7ae76ac8b 100644
--- a/net-libs/telepathy-glib/telepathy-glib-0.24.1.ebuild
+++ b/net-libs/telepathy-glib/telepathy-glib-0.24.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"
@@ -35,6 +35,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-libs/libxslt
+	dev-util/glib-utils
 	dev-util/gtk-doc-am
 	virtual/pkgconfig
 	vala? ( $(vala_depend) )
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 0f152b4d14ab..67c8cb6242a1 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,5 +1,7 @@
 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
 MISC metadata.xml 680 BLAKE2B f984312660f4c50297f07b4618ac873dea2c68ea9d38c14e623cbf28fd01a2c8253b632b321647efb517c9b921908497bb83e2713c037deac61d3c5e8ad62877 SHA512 acbcc1a46d844cb1b5fe7f69c77cf98c920c78e535a4cc3ab33269da8361aedb4a6a7a8433b053cf73b5d07b8981d6892ef92ff25471f4e133ad5179c7df181e
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild
new file mode 100644
index 000000000000..57d749ac75cf
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild
@@ -0,0 +1,272 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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.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 )
+"
+
+# 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/glib-utils
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	dev-lang/perl
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JIT=$(usex jit)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_WOFF2=ON
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 6ffb995683f7..551602d3cdc2 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 529bbea84134..e17ced12648f 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,6 +1,8 @@
 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.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
 DIST dovecot-2.2-pigeonhole-0.4.24.tar.gz 1808131 BLAKE2B e8a19b5c3b4876e71556e52ba6a984f6ed0abe93a222f692303fd41cd7a1e6e4e8fd0e5ab0821e9e179b595694752813689a07b428b2590582c3ca7dbb99a08f SHA512 2e21c95ece475ffcb78e5b5d4efa29e61471faf90b80b44a49963fb287de2784ebfb4c2b7ddfc66732fd073e9f02995d5950840336f6babe618b3d7d5166059f
 DIST dovecot-2.2-pigeonhole-0.4.9.tar.gz 1577127 BLAKE2B 7e6f11bf74d56887b640ab5ebffd6e2ad7878d47da808f81b2f21ab4de02495f6ca79453ab5867568afee7f2d9a0915601ceccf5c6a9581d38994c4d35f692e7 SHA512 9e7a18b43d59ed955b142d16696ca221822a547ea59ac70c1bb374eedb28b6ed99ea49f34ead1f9a16ded4573605e410a5cc8e038e1bdf5f943a65588b5d3af2
@@ -8,9 +10,12 @@ DIST dovecot-2.2.19.tar.gz 5256627 BLAKE2B 0b7fe57ced1b1f7eb5e29e8d6723d237cc107
 DIST dovecot-2.2.34.tar.gz 6181270 BLAKE2B dfdb1e6812574e79595202e830167400569adf61155aa5ddaae443e798c4a05ccec2acd2975e00e9e7ffc63ee1dcf7e4e2a9288b1e6e1e1427d1e89790a8fa13 SHA512 9f08a7116a08a08495aa0e7b4cb6b11a924ea61006970487946e338bc79bba7fd7619c345cbf278a74de285d548af04fc66eaaee508185b8b9d7335cf5612055
 DIST dovecot-2.2.36.tar.gz 6239707 BLAKE2B 702bb24265b5fefec9c484b3cca890fb1536ff94d1f2d6c99ee8c294ee4e38091eef5a727f0d4bd03700263286361f55747a22fa74def350710f9e49a4b10580 SHA512 327c50971e276f6013ca7f7bb59498ee88d76c9f8419bd18ee531cf10142214350fb81c6d64eaef73ee01765dd0fcf4142ab146ed67d9d7d86d5a58d41cf8db5
 DIST dovecot-2.3-pigeonhole-0.5.2.tar.gz 1814618 BLAKE2B b1187021673429bee1b45a1f657bea995e9881257919ff55bac63106d65963294ee2b3829167c6d50e351c4bc3c7e88a5ccfb757308d2500c5d4146246145074 SHA512 6bc24d9241f94db795a012346d9bc94b5cc7d7ce0175c03213c2b5d179d80dec95e9bdbd50bed628c8f9f7c51639e692ba5e429212a3b4a654c1e4764ac4f11c
+DIST dovecot-2.3-pigeonhole-0.5.3.tar.gz 1827329 BLAKE2B 0d484906022217b1082233e6a3a20c17bafc68b90ce1c5c956c714d111ffb9ab49a3794e199695bb61a1f3ad6bd46e56e63ee3c140cb01eaa7589ef7bd754b19 SHA512 8403b1976a915836ba875b96825446d46e0d8c7ff245ed1f2b014347fdc78a81f9ed6dbd05bd3b4f1f7072edc5e9a302201cdb375de44436adcbb83919f203f5
 DIST dovecot-2.3.2.1.tar.gz 6797491 BLAKE2B 92b88fd0f0cb8ed6c418bf27c2e1fc4efe13f1ccfb4948ce5eed1a4e76a4e96f0d6770d9841026ec5a515310ebaa4b335063e3516de454db8ba06cc4ee5a00ec SHA512 c085a0d04925485423086736a3c7d919ad0ca9efeff005890382da5333edb68c7d23ccb89fbe2ac44f8f016fc993bf2c669e450794c3ab13463676cbb47c7bf7
+DIST dovecot-2.3.3.tar.gz 6851107 BLAKE2B 87d6e11c8ff59cfe0b49d3561c307535efb09296af617530a4d5a89b4fc12055d006d1b283a4de076f27d59deb64324b96f28620958ad85c38197710c5decdf7 SHA512 8666c4f92f7df883067540f85be9d03dbe6815b58a7f5de55b4292e986e9a2a1ef52c7e0c72dde2bc781fe40d57488b78a99b6b813745b8e4683f1a2fdc1f2ff
 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.3.ebuild 8789 BLAKE2B 6ab8548635742ba2dc82fe4b06ee4438840ebcd1e2d4cbef4662e3fb42a74a10aed252e6e28ac6f56b60006f44c1fcd823373f86d4b06245e06a8ae3cb7b6cbd SHA512 466b7ef0098884c9ef885048337ac68aa9aa3f40ad9a2c5fa6231f3dfbc5909fa97128c2872c8e9fde6a9a2129a096cabb1e681e2dd5fa0ac3d9cf89912d2445
 MISC metadata.xml 1374 BLAKE2B 629969318c5bcbdf0521d2293c6ead5e735ba5a113db3166e4df82103a3a84cbc62f3a2843082c9d5bdb635f25353ac7d3a4fcdf80d45e07b11b98754e744506 SHA512 16bdf15120dd8c957cd6e4957910acf21440dd0b8774cac9d9c5a48635cd46c7093850974b592ebbcd49085607fff2051691a42112f4ab9df44c51b9fea6d180
diff --git a/net-mail/dovecot/dovecot-2.3.3.ebuild b/net-mail/dovecot/dovecot-2.3.3.ebuild
new file mode 100644
index 000000000000..9d28a2916e95
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.3.3.ebuild
@@ -0,0 +1,291 @@
+# 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" )
+
+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-glibc228.patch b/net-mail/dovecot/files/dovecot-glibc228.patch
new file mode 100644
index 000000000000..9549c12f6e8f
--- /dev/null
+++ b/net-mail/dovecot/files/dovecot-glibc228.patch
@@ -0,0 +1,44 @@
+From 63a74b9e8e0604486a15a879e7f1a27257322400 Mon Sep 17 00:00:00 2001
+From: Aki Tuomi <aki.tuomi@dovecot.fi>
+Date: Wed, 8 Aug 2018 12:33:20 +0300
+Subject: [PATCH] auth: mycrypt - include crypt.h
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes crypt usage on glibc-2.28
+
+Reported by Reuben Farrelly
+Patch provided by Thore Bödecker
+---
+ configure.ac       | 2 +-
+ src/auth/mycrypt.c | 3 +++
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index dd545ebfdc..c5d8fae666 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -315,7 +315,7 @@ AC_CHECK_HEADERS(strings.h stdint.h unistd.h dirent.h malloc.h \
+   quota.h sys/fs/quota_common.h \
+   mntent.h sys/mnttab.h sys/event.h sys/time.h sys/mkdev.h linux/dqblk_xfs.h \
+   xfs/xqm.h execinfo.h ucontext.h malloc_np.h sys/utsname.h sys/vmount.h \
+-  sys/utsname.h glob.h linux/falloc.h ucred.h sys/ucred.h)
++  sys/utsname.h glob.h linux/falloc.h ucred.h sys/ucred.h crypt.h)
+ 
+ CC_CLANG
+ AC_CC_PIE
+diff --git a/src/auth/mycrypt.c b/src/auth/mycrypt.c
+index c49fcf842e..0bd00bc238 100644
+--- a/src/auth/mycrypt.c
++++ b/src/auth/mycrypt.c
+@@ -14,6 +14,9 @@
+ #  define _XPG6 /* Some Solaris versions require this, some break with this */
+ #endif
+ #include <unistd.h>
++#ifdef HAVE_CRYPT_H
++# include <crypt.h>
++#endif
+ 
+ #include "mycrypt.h"
+ 
diff --git a/net-mail/dovecot/files/dovecot.init-r5 b/net-mail/dovecot/files/dovecot.init-r5
new file mode 100644
index 000000000000..8a98603d4b42
--- /dev/null
+++ b/net-mail/dovecot/files/dovecot.init-r5
@@ -0,0 +1,57 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+extra_started_commands="reload"
+
+depend() {
+	need localmount
+	before postfix
+	after bootmisc ldap mysql ntp-client ntpd postgresql saslauthd slapd 
+	use logger net
+}
+
+checkconfig() {
+	DOVECOT_INSTANCE=${SVCNAME##*.}
+	if [ -n "${DOVECOT_INSTANCE}" -a "${SVCNAME}" != "dovecot" ]; then
+		DOVECOT_CONF=/etc/dovecot/dovecot.${DOVECOT_INSTANCE}.conf
+	else
+		DOVECOT_CONF=/etc/dovecot/dovecot.conf
+	fi
+	if [ ! -e ${DOVECOT_CONF} ]; then
+		eerror "You will need an ${DOVECOT_CONF} first"
+		return 1
+	fi
+	if [ -x /usr/sbin/dovecot ]; then
+		DOVECOT_BASEDIR=$(/usr/sbin/dovecot -c ${DOVECOT_CONF} config -h base_dir)
+	else
+		eerror "dovecot not executable"
+		return 1
+	fi
+	DOVECOT_BASEDIR=${DOVECOT_BASEDIR:-/run/dovecot}
+	DOVECOT_PIDFILE=${DOVECOT_BASEDIR}/master.pid
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --exec /usr/sbin/dovecot \
+		--pidfile "${DOVECOT_PIDFILE}" -- -c "${DOVECOT_CONF}"
+	eend $?
+}
+
+stop() {
+	checkconfig || return 1
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --exec /usr/sbin/dovecot \
+		--pidfile "${DOVECOT_PIDFILE}"
+	eend $?
+}
+
+reload() {
+	checkconfig || return 1
+	ebegin "Reloading ${SVCNAME} configs and restarting auth/login processes"
+	start-stop-daemon --signal HUP --exec /usr/sbin/dovecot \
+		--pidfile "${DOVECOT_PIDFILE}"
+	eend $?
+}
diff --git a/net-mail/metamail/Manifest b/net-mail/metamail/Manifest
index a3b13060a135..396ac51183d0 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 1692 BLAKE2B 032bec0cf3e19cdeac2c97286afae6d4c0ff1d12c24727bc86c7d0f4c733f45bda9b828f5870eb96cad4e6a5fe0437f18b5f64cf8c6c6d4a7ce84da4dabdc780 SHA512 4542ca8108ddcef025c5022798374e2f56562e16ebc6a5415c31d07669a52172f2b61e7e54423a0d9707ec617b727ec8c2ae0de5e40d4160cdf60d31ccf006a7
+EBUILD metamail-2.7.53.3-r2.ebuild 1684 BLAKE2B b979cf434c02994f178f484db9b141cb4d85600a35e4b6939c893903cf78a89eac20af15fe632c7bdf6011796e457ddade02eedfce606d6e6e0cfa4425c0f80a SHA512 90a62004832eefd7febe843295d2ca33c3e6a86ca5ec289c04e87535b726bcdc80a76a3ae75c0cdad1a17b0fc120376a97a447903cd08ec2dfc03ec952ca5bef
 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 84c02dac00bf..61aa9f24f9bf 100644
--- a/net-mail/metamail/metamail-2.7.53.3-r2.ebuild
+++ b/net-mail/metamail/metamail-2.7.53.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,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 10076a9af9d5..a4a6154c6e00 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/asterisk-core-sounds/Manifest b/net-misc/asterisk-core-sounds/Manifest
index 1391f5389258..d4804b80804f 100644
--- a/net-misc/asterisk-core-sounds/Manifest
+++ b/net-misc/asterisk-core-sounds/Manifest
@@ -71,5 +71,5 @@ DIST asterisk-core-sounds-ru-ulaw-1.4.22.tar.gz 8460881 BLAKE2B f9c6b4ead0a31cac
 DIST asterisk-core-sounds-ru-wav-1.4.21.tar.gz 16446330 BLAKE2B 8c09a8b49f9de856eda58c22bc86a24d91727e19f2a1fdd33c6428ed769df492a5e7e1c93d680b06db4ee293a7a3031b786f128fb917e6f326b57fa0d9d87233 SHA512 951a7b156cf7f92e9640f6704bd12013d73d688aaaff8ab18d15ea0c99f10fa0386e12b65c086a02536d8cd68c372c686e4485cff3afc4f40933d14bdb41e109
 DIST asterisk-core-sounds-ru-wav-1.4.22.tar.gz 16591836 BLAKE2B 95b16e2680753c2b141f6e5a5b12f06e87d6e2c998d941b9ea8d3e1229d8efa511b59a2aa5d00ad4f39ef0acc69953e933878cf60763c3f3daecf8497150bf41 SHA512 1f8484da7975bd91b38d8354ec84110892c42b44d2a0cbcd9a2d5a3756e56e0446d388e0e9343be8c3561c4a02cf55cd135d86051db5b4d232575ae4c4b60d1b
 EBUILD asterisk-core-sounds-1.4.21-r1.ebuild 1851 BLAKE2B d5cc2da39d0f1d33af354fec4ef895349ebf4819bf0ec7d6c2d5ade325a77f6c86992c50926f1c71a2fa4bd942341ac28f1e75e21f8fdd6f785aed62ff968bb3 SHA512 41db422df01d02b098e88972d5a71c73accbfea198837c5dbc682c5dbc6c707ee33136bca50e1b304d4aec3b43673140fcba8ccf4ecf323be1cb98f88be63200
-EBUILD asterisk-core-sounds-1.4.22.ebuild 1851 BLAKE2B d5cc2da39d0f1d33af354fec4ef895349ebf4819bf0ec7d6c2d5ade325a77f6c86992c50926f1c71a2fa4bd942341ac28f1e75e21f8fdd6f785aed62ff968bb3 SHA512 41db422df01d02b098e88972d5a71c73accbfea198837c5dbc682c5dbc6c707ee33136bca50e1b304d4aec3b43673140fcba8ccf4ecf323be1cb98f88be63200
+EBUILD asterisk-core-sounds-1.4.22.ebuild 1853 BLAKE2B bbdd6efb432a829f6c3408d5b72fe51bc2758db0800a660d98c6cda8be15af82ce6ed4026ce1d73bdc8de442e225505bf2b598d378a4c7de7822b3c12ac9208a SHA512 b798ec930025c9c5ed86a0c911da5403c57c015f1fd92dbf53e2dcd6c79e951eac4d02692b874147537a518b4d3aade0aec634c635f506bbac75876390d95194
 MISC metadata.xml 846 BLAKE2B 581e9e2325c925ddc9bffcdb3d545e2dc5d862a06bf79875eccda7d18412e24dcf3ac4c3293474225a38189dd534030a5d5095dec992dd52c0798b4287a6a921 SHA512 d09b435f10066acf15bb1b6c2454e4a207e7604eae199958bfc9de6f130f4f3380af5b3d95d686cc20dfabe38b58f9c3dc308517b63f8ff6675779b97ef471d2
diff --git a/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.4.22.ebuild b/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.4.22.ebuild
index a748f38a57bf..acc24a55d222 100644
--- a/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.4.22.ebuild
+++ b/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.4.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="4"
@@ -25,7 +25,7 @@ done
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc x86"
 
 DEPEND=">=net-misc/asterisk-1.4"
 
diff --git a/net-misc/asterisk-extra-sounds/Manifest b/net-misc/asterisk-extra-sounds/Manifest
index 5505e2517123..11d378cafdb0 100644
--- a/net-misc/asterisk-extra-sounds/Manifest
+++ b/net-misc/asterisk-extra-sounds/Manifest
@@ -16,5 +16,5 @@ DIST asterisk-extra-sounds-fr-siren7-1.4.11.tar.gz 7128320 BLAKE2B cfc9b2fb2734d
 DIST asterisk-extra-sounds-fr-sln16-1.4.11.tar.gz 48517491 BLAKE2B 80b6e4da30b5e2c65c48c81bfa44cd14bff3eb19fbb3d6385dbe7fbca7e39a881154f6c1fa839360874c65f6e4916ef9574006041ef0f68ee9245c7340d1e46e SHA512 f8b0a1eebd93fdda707846dc73d30418462a07572962cbe822eb11ed5c2ce7741b185b0e4abd05c47d0c2c53e817c47b3c493d94e92e50848c7a270e87e9a586
 DIST asterisk-extra-sounds-fr-ulaw-1.4.11.tar.gz 11818928 BLAKE2B e6669c4b041e96fda7beed7de4af3ad876c28419e639b4d45797c00272ac03fb71ce23cd584aca480e203e37585a1e793e42514f83341a745e4111ed49bdba54 SHA512 34ba851729186250a3fc459b685c0a4d475e32820e4a49b3a1b2c038e0252a71a0637e1bfd67e0bd4960cb90ec24f8cb28435a049fcc91f7b3ed4f0f1009b0ab
 DIST asterisk-extra-sounds-fr-wav-1.4.11.tar.gz 23829634 BLAKE2B 8d45ecaa92673599430a9d652e4965cf1d7d8557bbcc07d49238e21a22b7dbf35fc1bf41f66c35df298bdd2af189a3f63dc3aab7df43961003a0cd42fd8f19fc SHA512 4482f7a95fcd5b43ead86e877e4df88d017ea003bbe56c4813fe6814956fb015d4359bd1257513b34c3d80ac171472c0749e534ede6ab9aecf42a589ad76c0ba
-EBUILD asterisk-extra-sounds-1.4.11.ebuild 1774 BLAKE2B 89035b1a80f2c875a761f6b093bac2a3fa2dc772cba2c622b923855267b5ba144be8cafd3d80f7d09bbdcf596e13ddc441f9b92deb7a07aad89da488f4236a83 SHA512 595e254f5a7982ce4e605c14dd4185795ec8c5104699512192282c4c8d5c59ae4a446e1a29cc94e50654e87b02ae4310caf146dde4aded264c9c831d50bd557d
+EBUILD asterisk-extra-sounds-1.4.11.ebuild 1776 BLAKE2B 3a0177d12cea37b08e56cb20a27f8db13d1332a4b837c9645dfb9076f48635075c0dc03e1788d80a4ebe208459800cc5cd24cadcbb508539779a75e830bd7e5e SHA512 9cb8c04f6213fb16d84d54f6247fcd9c94850a1a4c002668bd21d46ec8749a5c444bea028364ce8fd3dba87080a779d538be1de0acac9f298b9a041a2b95cd80
 MISC metadata.xml 917 BLAKE2B 267b110b5ef3fea60a4fba48147dc7d47897f0b5854039df6e8a47f3c2ce3ddb94f832926b28853caa6fa3e6dbfd0182cd63cf07c4377e796b9ad467ccec1ff8 SHA512 834aff23b944bdd2ad940458323fee9db3e4b9cf3b2e83265bc59a1c7a1b9d992c244b834fbf465a1f3d135470741b27dfa150193f9371519e19d8550a86742a
diff --git a/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.4.11.ebuild b/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.4.11.ebuild
index a95de07b5c81..939771f572ce 100644
--- a/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.4.11.ebuild
+++ b/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.4.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="2"
@@ -20,7 +20,7 @@ done
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc x86"
 
 DEPEND=">=net-misc/asterisk-1.4"
 
diff --git a/net-misc/asterisk-moh-opsound/Manifest b/net-misc/asterisk-moh-opsound/Manifest
index 5d54bbad5f4e..57866026c0a5 100644
--- a/net-misc/asterisk-moh-opsound/Manifest
+++ b/net-misc/asterisk-moh-opsound/Manifest
@@ -7,5 +7,5 @@ DIST asterisk-moh-opsound-siren7-2.03.tar.gz 4233366 BLAKE2B b628d092b47997b1cd2
 DIST asterisk-moh-opsound-sln16-2.03.tar.gz 31309094 BLAKE2B 1567b63c6e93ea70a1ff3452ed7a0a457bb118a2605248d5fd9cae11ac72ef53e8bb663fb826031a8c680715194d05bb6c0abc7ff7597e62f61608ab403437ba SHA512 e5555af8f08720c01bff19200efb7f139dcbb9d1ffa168716dbf93bed97009a441bfe63080c9ca7b15db2c98fe5839d311c39cdf8c0a8a40f8dd93a89b8a11b6
 DIST asterisk-moh-opsound-ulaw-2.03.tar.gz 7479839 BLAKE2B 87ae22a72ab6da7358fe887af5562a701bca89bec35d7f72644cb6f691e0619671bfacd02ec0f0f269447dad1cd050f144b22254af3812268fbabb1944056bc5 SHA512 2827b635a61e520bb0efb8c5e77ce0d1319d58c027cd3721819b58e4136918b7767c5776a4ca02f675cdb35d6f40154fc863eb7d7cb702a637fe9ec966fe13c1
 DIST asterisk-moh-opsound-wav-2.03.tar.gz 15359473 BLAKE2B a3e9ddf0d54989f07c581facfe4f157120e2b2ae9dbba84bb2edb85ec4bdb98db5bc4783924af0845920d3736c5a512a7615effdf8c4f0b212ea347193efd115 SHA512 e8fefcac32ac88735519f3f9df766d77d1007c8e98952c396943966dd554d4237177f7fbfbb707a838b5f4d479c13c6b4bfecd62d78ba5ea40b248d1bf007872
-EBUILD asterisk-moh-opsound-2.03.ebuild 1122 BLAKE2B 2c49003234b8b7ffd710439afa02d76f1e7c5cc0bc0419728cba6ef2364cabab0bac43ec1ec8333549513cb23336f032e073fbd5783e9bb503fcd919f0e9b9b9 SHA512 c3439287224612fa84b10af29c0591eeac9642c6769f821fd395eaf4be9fdc4ba047f8fc3b2fe8de1539f30395f86badf4a1dcc368ab71cb6e36666cfa11901b
+EBUILD asterisk-moh-opsound-2.03.ebuild 1124 BLAKE2B e87f5cabf00a8b1375be232b3addf198ccdbd3fcdb69c1341649e512c216996ab1051b2f3c8cfe47f1abf441266edd43552de7180de3edb15928e2e4cd1a030d SHA512 5db9614a6705b5c5f515b56f497f8074061310140bf6c443c0ef5d1d0b3c62dabfb5ae5b171f8c7b5a644cfee49a32e91f896dfa87d68b4a8fcc568d051ea579
 MISC metadata.xml 917 BLAKE2B 267b110b5ef3fea60a4fba48147dc7d47897f0b5854039df6e8a47f3c2ce3ddb94f832926b28853caa6fa3e6dbfd0182cd63cf07c4377e796b9ad467ccec1ff8 SHA512 834aff23b944bdd2ad940458323fee9db3e4b9cf3b2e83265bc59a1c7a1b9d992c244b834fbf465a1f3d135470741b27dfa150193f9371519e19d8550a86742a
diff --git a/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03.ebuild b/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03.ebuild
index 539efbedde7e..cbbc2b3aa585 100644
--- a/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03.ebuild
+++ b/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03.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="2"
@@ -15,7 +15,7 @@ done
 IUSE="${CODECS}"
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc x86"
 
 DEPEND=">=net-misc/asterisk-1.4"
 
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 7a1494b50903..9446ac70463d 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -24,8 +24,8 @@ DIST gentoo-asterisk-patchset-4.07.tar.bz2 2471 BLAKE2B d9026e7e8c12431496c24f20
 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 9717 BLAKE2B 66ed61fd4b10c09012830fcd9d8260d75861de3e3f3d5c0697519f7d32ae469cac97d1545bf04ec3bf5b7188769ebb81f5cce33dd21916187876ac372a098825 SHA512 0733f846272e439e0e30061cb9b23f806b540eb935b0daf4cf27a9bc745b478796f037726983d75c8b96f78d59f486adca5efd408452dedd269cf422f21950bf
-EBUILD asterisk-13.20.0.ebuild 9717 BLAKE2B 66ed61fd4b10c09012830fcd9d8260d75861de3e3f3d5c0697519f7d32ae469cac97d1545bf04ec3bf5b7188769ebb81f5cce33dd21916187876ac372a098825 SHA512 0733f846272e439e0e30061cb9b23f806b540eb935b0daf4cf27a9bc745b478796f037726983d75c8b96f78d59f486adca5efd408452dedd269cf422f21950bf
-EBUILD asterisk-13.21.0.ebuild 9717 BLAKE2B 66ed61fd4b10c09012830fcd9d8260d75861de3e3f3d5c0697519f7d32ae469cac97d1545bf04ec3bf5b7188769ebb81f5cce33dd21916187876ac372a098825 SHA512 0733f846272e439e0e30061cb9b23f806b540eb935b0daf4cf27a9bc745b478796f037726983d75c8b96f78d59f486adca5efd408452dedd269cf422f21950bf
-EBUILD asterisk-13.22.0.ebuild 9717 BLAKE2B 66ed61fd4b10c09012830fcd9d8260d75861de3e3f3d5c0697519f7d32ae469cac97d1545bf04ec3bf5b7188769ebb81f5cce33dd21916187876ac372a098825 SHA512 0733f846272e439e0e30061cb9b23f806b540eb935b0daf4cf27a9bc745b478796f037726983d75c8b96f78d59f486adca5efd408452dedd269cf422f21950bf
+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
 MISC metadata.xml 1135 BLAKE2B c4572b7c187ff1e7ac66ad38c03a04b51b601990ad48563dbcfa046f03fe0f3587a1e58c1bed7abe6a13a7e2252526d03a0937b5ddbf1a2427ec14b3f115c58c SHA512 660666a8abae2edae04e3c32b272e4f1d509d18566c6c9eb0b0b8a93710d8a1284c68f7ee613ca70bf4c54779a1df1e29d9a56093212bc0fdf1c057450037ab1
diff --git a/net-misc/asterisk/asterisk-13.19.2.ebuild b/net-misc/asterisk/asterisk-13.19.2.ebuild
index e0b88a37696c..99d5134312a7 100644
--- a/net-misc/asterisk/asterisk-13.19.2.ebuild
+++ b/net-misc/asterisk/asterisk-13.19.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
@@ -12,7 +12,7 @@ SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.t
 	 mirror://gentoo/gentoo-asterisk-patchset-4.07.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE_VOICEMAIL_STORAGE="
 	+voicemail_storage_file
diff --git a/net-misc/asterisk/asterisk-13.20.0.ebuild b/net-misc/asterisk/asterisk-13.20.0.ebuild
index e0b88a37696c..99d5134312a7 100644
--- a/net-misc/asterisk/asterisk-13.20.0.ebuild
+++ b/net-misc/asterisk/asterisk-13.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
@@ -12,7 +12,7 @@ SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.t
 	 mirror://gentoo/gentoo-asterisk-patchset-4.07.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE_VOICEMAIL_STORAGE="
 	+voicemail_storage_file
diff --git a/net-misc/asterisk/asterisk-13.21.0.ebuild b/net-misc/asterisk/asterisk-13.21.0.ebuild
index e0b88a37696c..99d5134312a7 100644
--- a/net-misc/asterisk/asterisk-13.21.0.ebuild
+++ b/net-misc/asterisk/asterisk-13.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
@@ -12,7 +12,7 @@ SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.t
 	 mirror://gentoo/gentoo-asterisk-patchset-4.07.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE_VOICEMAIL_STORAGE="
 	+voicemail_storage_file
diff --git a/net-misc/asterisk/asterisk-13.22.0.ebuild b/net-misc/asterisk/asterisk-13.22.0.ebuild
index e0b88a37696c..99d5134312a7 100644
--- a/net-misc/asterisk/asterisk-13.22.0.ebuild
+++ b/net-misc/asterisk/asterisk-13.22.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="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.t
 	 mirror://gentoo/gentoo-asterisk-patchset-4.07.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE_VOICEMAIL_STORAGE="
 	+voicemail_storage_file
diff --git a/net-misc/econnman/Manifest b/net-misc/econnman/Manifest
new file mode 100644
index 000000000000..f94775b7b907
--- /dev/null
+++ b/net-misc/econnman/Manifest
@@ -0,0 +1,3 @@
+DIST econnman-1.1.tar.xz 108100 BLAKE2B 85a0a38847955c5338f95ae8b1144231d4d2b05b10cc3056af798a7a49658b1e042acad2570d5d0fea181a6bacfc565ac974fd2af78a057c95939292a288c8ce SHA512 8a20d2d5387f9a2eae552178eb2c399ff0c0952c1591f63ca0865f016240ebec6608795c4a722b84c0d703434f70d97d561b95174ed9c08d3a855cd0e9d0929b
+EBUILD econnman-1.1.ebuild 669 BLAKE2B b5d11ac819269b010ad40cf2b188c01e8b03bd3dfbd9d9e704aa675a426fc41a42cdad3cdf90c41f809b9f281dbfaf862427ef0170e35be2f329a972d31df90c SHA512 f4410904df3f23f575bdcb9539b22a2d6fda4a050ee7cb394c05fa09acd187ca607fdb8f8f237fd2c909a3591c0c431649013101245c9c6a532be0648f9b2b7f
+MISC metadata.xml 344 BLAKE2B 2b09c758b212196592a83ba9e2f30591f97d222619bf3a494fcc025789c46d70f55b955400c580dbc9d3f5ea3cdb3662d79e2960d88e8b7e089a741c7fa6041d SHA512 f9e35a54a3d719a4114e2bc758096c1f6365838163ab5f6a3353bd318581683ca4757be60d0dbb8457099c1e174518078091a94e2f23f086903f45be94c4915d
diff --git a/net-misc/econnman/econnman-1.1.ebuild b/net-misc/econnman/econnman-1.1.ebuild
new file mode 100644
index 000000000000..c8d70fe25a94
--- /dev/null
+++ b/net-misc/econnman/econnman-1.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{4..7} )
+
+inherit python-single-r1
+
+DESCRIPTION="ConnMan User Interface written with EFL & python"
+HOMEPAGE="https://phab.enlightenment.org/w/projects/econnman/ https://www.enlightenment.org/"
+SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="
+	${DEPEND}
+	dev-libs/efl[X,connman]
+	dev-python/python-efl[${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+	default
+	python_fix_shebang econnman-bin.in
+}
diff --git a/net-misc/econnman/metadata.xml b/net-misc/econnman/metadata.xml
new file mode 100644
index 000000000000..d9a6217dd22d
--- /dev/null
+++ b/net-misc/econnman/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>juippis@gmail.com</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/net-misc/igmpproxy/Manifest b/net-misc/igmpproxy/Manifest
index 76421e545a06..f75377c43c62 100644
--- a/net-misc/igmpproxy/Manifest
+++ b/net-misc/igmpproxy/Manifest
@@ -7,6 +7,6 @@ DIST igmpproxy-0.1.tar.gz 140159 BLAKE2B d4a0fb0f69f1e8c7221ecd2842e95cfa390f548
 DIST igmpproxy-0.2.1.tar.gz 166951 BLAKE2B d47a2b236679c7d05cf453fb5d6dc3a9e4174776845e2a1f71ca28e02c6e6270b5db09eaf5a48581dd85ecca8ff198a3e4b7f84fd61e455fe33c4f60ec079c15 SHA512 17f6891bf49d3e70cdf3930ab1abe6a0ad7b9f12ff2d1cdde3761771988585301f459995ba5ea956c742597de4ce13fbf0ba3c1ae37d13b2eee2a09f16f51ae2
 DIST igmpproxy-0.2.tar.gz 170705 BLAKE2B a2a13399995f283fb77b500140c1750ed306511eb5f51a71491edc245c8d8f873809fac9a82dc7ba0be7a7390643d85d7f4a2a8521b3c2c20fb8f09ad33b507d SHA512 a06f95c912456191d0953c08058ccb987120f6b11426d15e329c2de95878b9fc6ee5742b253e2c06b8002771478c382a58a14a0af76fb835ebb1d132b9f34e4f
 EBUILD igmpproxy-0.1-r2.ebuild 587 BLAKE2B d96e2871845a21ddbab6a481915a82f5de977ff0e36d2c9c72cfc1d55a5bbf706349079151ada0f7b44a348a3a137c902dce9b4d88ffdfd96f3a1a8936ccf79c SHA512 75036b6de777dd630a89c6d08f729cb6c51c591c9ec9b206f492e081914f6c49ecb93bc9dd6e7026703a72b8adb1a4596d7c9aa326ab72b7e5cf72aa29ab3b86
-EBUILD igmpproxy-0.2.1.ebuild 602 BLAKE2B e3351e6d194227f05fc30582639776ccfdb610052ab0f9809002874ad834cc5f6f8286ed759730a149d55311d3a821549db06c3ed734cf3cd3aa1b52cb78d993 SHA512 ad5f68f84aedc6b557373053b3d3ff648d17e0543a621789d85a248d3a14a36722b7e2ee37a36e14f618d937ab37e19aa8a5c2912b3a7f832fe165f359074e47
+EBUILD igmpproxy-0.2.1.ebuild 598 BLAKE2B 1bf3249e8ea3c27b7630581cc41a687d11097ba182b042bdda71b5426ca699ffdcac22bd1f541a272c526eebec7ea6235f7d719709b3ae9b15f1ca5edab59aac SHA512 a8ff0939b0f5ca1e5d546ca15233fe6caaa62668329b700de4e69c93231b552a9b8924df66db5e93ff463dabab92897244cab3ca5f84ef86dee8135a8d73860a
 EBUILD igmpproxy-0.2.ebuild 623 BLAKE2B 1712e810c9dd4e4420744c8d43a8887f6b505d68888d2febc0ed279c3761acec388725ab6e71ffd8c8ad63dbf03501b72754e7d68d358b88f1065541ac6fbc0e SHA512 dbe1f4d9674952c00cd625bdb0c598d0241d2c6075aeb16c56ce5798fbd5dc731c124223fa557439a6c11d829cac67161aba89cbbba0d73aeb4ae10014ee341c
 MISC metadata.xml 712 BLAKE2B 265497a27d79fceb3e2ea9cb44c1ec4b5dfc29876e5816041840c91cd1af9f3302eef4acb5b6499667f0a60c6758e56eb64725553bbbc524906c3796c6703748 SHA512 fde844efe66aef823179827b96541c8242f132bec2b58504848d332872c95b0007133f76806121a6285f305f9d7e773b166e7e4c634681a29d1c17576a843e40
diff --git a/net-misc/igmpproxy/igmpproxy-0.2.1.ebuild b/net-misc/igmpproxy/igmpproxy-0.2.1.ebuild
index 9154819d42db..8a4c5726ce7d 100644
--- a/net-misc/igmpproxy/igmpproxy-0.2.1.ebuild
+++ b/net-misc/igmpproxy/igmpproxy-0.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
@@ -11,7 +11,7 @@ DESCRIPTION="A multicast routing daemon which uses IGMP forwarding"
 HOMEPAGE="https://github.com/pali/igmpproxy"
 SRC_URI="https://github.com/pali/igmpproxy/releases/download/${PV}/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 LICENSE="GPL-2+"
 SLOT="0"
 
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 42bf30c63a3b..76fc9c5d08e3 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -1,4 +1,5 @@
 AUX iputils-20150815-nonroot-floodping.patch 406 BLAKE2B 18c9adf92bb64ddae4a62aaf280a858e1ade2d34938f29026bc62c6b0b43919c26a909f2997d7caaaa5e9c82f139c8bc2aefc752aceeff6fe5f15f0c7b53618c SHA512 4f63d788d4aeccd66c410b6cc3352934a9b7d9b1222dedbcd7688c2b884b620a308b44e2dc777421cef20365a6ae371d59ad349f76bc5fcc751f90169a8f0d34
+AUX iputils-20180629-fix-ping-on-musl.patch 1514 BLAKE2B 32085fa6a7b21a6d5d0d5bba9ca59931f01489dd69ef57f1422e95d3fb2cac151fbfd437b933feb00753a6d3f3eaa0c63ed7eea81021e8a1bb8b26ec7dd6584d SHA512 d78aeaf4c746412855344b248c518218570103c082afd6fe8ee0c38ae2bf9a33d34c85ce5a846accd6442f8ec0f7a8727b5b747bd8a5adada53e1188e6e770df
 AUX iputils-20180629-musl.patch 1718 BLAKE2B cd701f102a57743ba5494645c78b5c70004623530d8c82f20b2dc6b7d006c422fc23ac9493040ab9eccbcf87874b8db6ab394620a4ea61a7eb2e33e32761290f SHA512 0f623a1644592211b8935b6a7556a2a2c95151ac9b291e574bb1e9a5371fd72f27994867f8d599bca22a402627213807338d6cac17d17e7d175eab847658398d
 AUX iputils-99999999-musl.patch 1799 BLAKE2B d178697fd3f3dad9977b15d5a48f3742408f8d3d72fd3883ad512b11a16a719ce56c81ca00281bf754d934192dc3d980998f9947d66974dd3993ba0ed8760be0 SHA512 d3e4cd51591d1c1bb96b58aedd131bbadf6c4f523ce6ec0aebd991d4396fcd516a1aa3af180510efd8484852caf5301cfe4b0936a449b62caffb251d78794c54
 AUX iputils-99999999-tracepath46.patch 824 BLAKE2B c964390aad46b75bda363ca77a87f90856a5a7f23e7b66bacd640034e09b07620f413bde16c1879659d2f01ea9d99ace664141907406239e58841e0ffcda3097 SHA512 65638246a73334640b02a136aa55a4a709d7c4639c57b7634d5595ec40d4bc9c41068a1469a76d22d0a216e9a2c8a52f7840432c435f40ee7035981494d0a443
@@ -10,6 +11,6 @@ DIST iputils-manpages-20171016_pre.tar.xz 29764 BLAKE2B 47def1413b2cdcfba7f924dd
 DIST iputils-manpages-20180629.tar.xz 29804 BLAKE2B 15983cc97bc6b6853c193f046687f10be11902f7e1d2dc2eec6c58edd1926f10152108d378858b0d7eb2d2908f038965b05515c4927aedc460282a22307883ad SHA512 1c5b0bab8496a3f3d9b5080029221231a497d9a5e91c61bd0ddd0b63fd51572d052801294aafd08e1dc8ad448b82cdaf48c72f0b08cc143f9c144f3db6848d9a
 EBUILD iputils-20171016_pre-r1.ebuild 4045 BLAKE2B 8762cc82fd5c71865106bf2e9763fa5150a8228b292e617654279e517e5a3f4bebc50f312133740d4c54d0ef0a75abac2e42775cd9d865d41b5444e75f56769a SHA512 397bd386cfff8a3551af24ac67677de021e56bf75908e6495e9e4b7eeb6bb2435b7c72101b78523da7e502d1a7fac92d5640d45a1da463986f01ec5230273c95
 EBUILD iputils-20171016_pre.ebuild 4082 BLAKE2B 8c9aedbe404bd31ddcb466b93eb6272eebba0e3fa18f7a0de285dd7aa007894614a47a9cab018f6c5546a172ca3ae240b7fdcf6196eb3cdd7a6fcfc6d34cd652 SHA512 08f92d29d3baeb0eadac360b5a7f81e550d264fda70945b416d38ae39239e75ef201587d7466d6a9431df1a4be28c62e59d11b685fc811f40f1c755bbae2637d
-EBUILD iputils-20180629.ebuild 3930 BLAKE2B 61bb13126203cb4a07d3431c410dc1a1cd522ba1ae604b64ffaa4df532e615337ea24faaf49ca9116069b3539d9508e44906780e0bcc5c00be5dc9090de681ab SHA512 725501c0bfb6c52ede0222130da9c5302a921c9fd5d2d1126e630f3ce3071372b077987a54877695c0c8ff3244066a9b8d34a79f1743c8acc978872c211ed71e
+EBUILD iputils-20180629.ebuild 3970 BLAKE2B 3653a9223833bd1c8923647ed798679961ed02a9852fe83bcbef97c6210f997fb87de97533aaa198779ef0fc9d258dda2d21fb3d0a248a99a5a0bd8cd5567479 SHA512 8376d7ffef01f1047fb816d5f08a09f029027c1cdaf64626fba8351b8b5cbbd7ce5526f6039452694f60bc1c2c0cd419563228b93782854a1b1f9a588e7b0725
 EBUILD iputils-99999999.ebuild 3861 BLAKE2B 49cda306c5a9d1bc7200b1f1256f3ef867b0b573aa9b0620f98ec77f679e0599883fdff56de559fb06f0510d5d13960bb0bb998bfe0d42b737f08484066cf1e6 SHA512 26607fbcf1fc36f8c44ab10922866d6cc076dba5cb08dc3c0ffb7921dec0e188b7e680f61148616d172a73e27029413834aae431a87c9163e06837fc904a0b83
 MISC metadata.xml 1698 BLAKE2B 0351c77626f66e4a50d83072124088cc7195c4666f6a66f6a981fa66b16b3740da6a08d63da9db0b2a4d02f8a75a04f97142e5b78099525ee8ed4921738d0236 SHA512 f1d211dbe4212072614039c5aea1996270560a24dfa3734af86c4f1f4254cc3abf8440c03d8894b925b71b970e70fb60e79682753655a68b82203cdc401f6ebc
diff --git a/net-misc/iputils/files/iputils-20180629-fix-ping-on-musl.patch b/net-misc/iputils/files/iputils-20180629-fix-ping-on-musl.patch
new file mode 100644
index 000000000000..8d8160a3d4af
--- /dev/null
+++ b/net-misc/iputils/files/iputils-20180629-fix-ping-on-musl.patch
@@ -0,0 +1,54 @@
+From 25899e849aa3abc1ad29ebf0b830262a859eaed5 Mon Sep 17 00:00:00 2001
+From: Petr Vorel <petr.vorel@gmail.com>
+Date: Sat, 21 Jul 2018 17:46:14 +0200
+Subject: [PATCH] ping: Fix AI_CANONIDN usage on some systems
+
+Commit 99f67db used AI_CANONIDN in a way, which broke compilation on
+systems where AI_CANONIDN is not defined in netdb.h (e.g. glibc < 2.3.4,
+alternative libcs that don't support IDN: e.g. current musl 1.1.19 and
+uClibc-ng 1.0.30) when not using the system libidn2.
+
+Fixes: 99f67db ping: Fix ping name encoded using ACE on C locale
+
+Reported-by: Nicholas Fish
+Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
+---
+ ping.c | 2 +-
+ ping.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/ping.c b/ping.c
+index 733477f..b241815 100644
+--- a/ping.c
++++ b/ping.c
+@@ -207,9 +207,9 @@ main(int argc, char **argv)
+ 
+ #ifdef USE_IDN
+ 	setlocale(LC_ALL, "");
+-#endif
+ 	if (!strcmp(setlocale(LC_ALL, NULL), "C"))
+ 		hints.ai_flags &= ~ AI_CANONIDN;
++#endif
+ 
+ 	/* Support being called using `ping4` or `ping6` symlinks */
+ 	if (argv[0][strlen(argv[0])-1] == '4')
+diff --git a/ping.h b/ping.h
+index 3e09685..8a0c4ef 100644
+--- a/ping.h
++++ b/ping.h
+@@ -28,7 +28,6 @@
+ #include <netinet/icmp6.h>
+ #include <linux/filter.h>
+ #include <resolv.h>
+-#include <locale.h>
+ 
+ #ifdef CAPABILITIES
+ #include <sys/prctl.h>
+@@ -36,6 +35,7 @@
+ #endif
+ 
+ #ifdef USE_IDN
++#include <locale.h>
+ #include <idn2.h>
+ #define getaddrinfo_flags (AI_CANONNAME | AI_IDN | AI_CANONIDN)
+ #define getnameinfo_flags NI_IDN
diff --git a/net-misc/iputils/iputils-20180629.ebuild b/net-misc/iputils/iputils-20180629.ebuild
index fb577b0efbb1..98e13d04e31d 100644
--- a/net-misc/iputils/iputils-20180629.ebuild
+++ b/net-misc/iputils/iputils-20180629.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # For released versions, we precompile the man/html pages and store
@@ -15,6 +15,7 @@ MY_PV="${PV/_pre/}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-20180629-musl.patch
+	"${FILESDIR}"/${P}-fix-ping-on-musl.patch
 )
 
 if [[ ${PV} == "99999999" ]] ; then
diff --git a/net-misc/jlj/Manifest b/net-misc/jlj/Manifest
index 5447ccaef9e7..da91bb4ea2c6 100644
--- a/net-misc/jlj/Manifest
+++ b/net-misc/jlj/Manifest
@@ -1,3 +1,4 @@
 DIST jlj_2.12.tar.gz 32480 BLAKE2B 9d0cc73a1c75c5ca2e856593ed5ae19d694cfc4b4c91d19ceac17604709bb887464ffde712c7fb0f243f240585f5d2321cdf8552494d118bff10e63c240d1877 SHA512 e0d14520c584ca6bca473286cadef46c7deefc47d48fc39e3bd61e01189fe445a9452406a3aec1ed05d9d44925042589cc1396991b56f02018ea01df11ab8594
+EBUILD jlj-2.12-r1.ebuild 620 BLAKE2B fa8a66ede2819967d0925e0702653aa868c314a5de9c448308dc0e935313e0b18393766ec60537b738a4cfbae030318add6ae550a516d332f5f8693aea005f15 SHA512 10b20e57d26cdb266926287fa8133ee9c39a0b37490f33a4be592c9f32075f87fe91d029178cc6b0629d28252218186106d180dbd7bead92052d3dd35f43ced3
 EBUILD jlj-2.12.ebuild 638 BLAKE2B 60a4956223b340af24a7aca3f29cb99a1d88abc8d53bbf48832edcfcc25c8f236b6cd242e0a9b165ef6cf2336c932b2b8206cb5e8077fdabcbf2a724af758326 SHA512 5e5c77c5b0ada7710b47cc15a71598d1c20fe155ceb9b06392e7708d7667607a56e05b3f54d3d18f30539b85d0b788c3af772bcca4d359ebfca79ef6ae1334e5
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/jlj/jlj-2.12-r1.ebuild b/net-misc/jlj/jlj-2.12-r1.ebuild
new file mode 100644
index 000000000000..5534c8e01b5a
--- /dev/null
+++ b/net-misc/jlj/jlj-2.12-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="Simple console LiveJournal entry system"
+HOMEPAGE="http://umlautllama.com/projects/perl/#jlj"
+SRC_URI="http://umlautllama.com/projects/perl/${PN}_${PV}.tar.gz"
+
+LICENSE="freedist"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+SLOT="0"
+
+DEPEND="dev-lang/perl"
+
+S=${WORKDIR}/${PN}
+
+src_install() {
+	newbin ${PN}.pl ${PN}
+	newdoc .livejournal.rc livejournal.rc
+	dodoc README.JLJ
+}
+
+pkg_postinst() {
+	elog "README.JLJ and a sample livejournal.rc have been installed to"
+	elog "/usr/share/doc/${PF}/"
+}
diff --git a/net-misc/lksctp-tools/Manifest b/net-misc/lksctp-tools/Manifest
index 3dfbe615b41d..a81717c6f181 100644
--- a/net-misc/lksctp-tools/Manifest
+++ b/net-misc/lksctp-tools/Manifest
@@ -3,7 +3,9 @@ AUX lksctp-tools-1.0.8-prefix.patch 332 BLAKE2B a83cc8172bb96f7cade25b049608ef46
 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
 DIST lksctp-tools-1.0.17.tar.gz 795762 BLAKE2B a37b653b1f9effd039c5241669c767d8b0918bf4790d9f017c70eefd4ce1efdbe5d76f6e88e15ddf214308267ee62a6004d2af781ad720ef847e8d99ae5a55f6 SHA512 055719130b7dda4da9cf002dcd5f1fb3d8cf75300a99365976e087b2b6971b4ccd357f95b515a44e37874af161f7b7f9b42c60191aff938d18fada5a49aa44c4
+DIST lksctp-tools-1.0.18.tar.gz 560302 BLAKE2B 6151109a0f43044048ff64a6ca021710f28e695017b79513412a44999ec67bdbe7cb0bbba7d5e0deb28b8fdd097379100046ef77508678f726f18944b9799f22 SHA512 1d7275fadc0f2270865307cff2645810e9bab6c1a97e70be6115cace737334dbdd87a072fae25b89dd9cac2e05974556542de70ea8ef70b9e4f14873c82a5055
 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
 MISC metadata.xml 550 BLAKE2B f7143883df23ece0587a094751eeb897d933d98d7a93548b9e531cde8768ff6b71e570f12a467be8ae5745d7a5319173da1423556c3896cfeb844eaa22073dc8 SHA512 099abe7a3849b871accd886b220b1d26234e3f5ab90f58e70e2670e25f66a78966deedeaf65f667ff3186aacfcc642ab962ba31c16583ea437b738d8f075c0ff
diff --git a/net-misc/lksctp-tools/lksctp-tools-1.0.18.ebuild b/net-misc/lksctp-tools/lksctp-tools-1.0.18.ebuild
new file mode 100644
index 000000000000..3f6e48874618
--- /dev/null
+++ b/net-misc/lksctp-tools/lksctp-tools-1.0.18.ebuild
@@ -0,0 +1,58 @@
+# 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/networkmanager-openvpn/Manifest b/net-misc/networkmanager-openvpn/Manifest
index 12b548e8a6dc..96649ee1af3a 100644
--- a/net-misc/networkmanager-openvpn/Manifest
+++ b/net-misc/networkmanager-openvpn/Manifest
@@ -1,3 +1,5 @@
 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
 EBUILD networkmanager-openvpn-1.8.4.ebuild 1239 BLAKE2B 5fabaf60af8232a3505af4453bf9f5dc38a764497ce79925df896803c4bd5ae4d0921232eee01af83c383d3f7aa590c20912fa01e25bbe38b794e957eb1b9779 SHA512 204909799d3d9df3b9e14de9797ecc20e95c9cf9d3290c0479450a6a87ec90793a94c05925ba75019a7ed02819033d67463f5d86c1adcdcaad904e5f06a9fb3d
+EBUILD networkmanager-openvpn-1.8.6.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.6.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.6.ebuild
new file mode 100644
index 000000000000..8fb5003d6544
--- /dev/null
+++ b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.6.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-pptp/Manifest b/net-misc/networkmanager-pptp/Manifest
index 241426ebf6b0..31ab715a0fe8 100644
--- a/net-misc/networkmanager-pptp/Manifest
+++ b/net-misc/networkmanager-pptp/Manifest
@@ -1,5 +1,7 @@
 DIST NetworkManager-pptp-1.2.4.tar.xz 382512 BLAKE2B 94e0bcfa3d3574bad016cec571e134d713bf4df48480a3fd71d3313a7c90c76ab7e3b9c8def60ceed9fcf4e3035425e5fe9a1924694535970d6458e0d202acea SHA512 b8983c6a6415e2f8757e91dfdeba66a7ba1264c01569f39b6da830def86d2c09d1084f4b561ca5ff48511b48f83d94fa004342efd54862d235ab75a49e4e7b33
 DIST NetworkManager-pptp-1.2.6.tar.xz 399292 BLAKE2B 91ca52d0e4373d9273c4d19cd9dec74e30106daf9bd10b4215a998ceef1680ebd0a369d5b7c4b75e2fed0d6179ea22e4a8c1399d56e97b98cc214b4112b19986 SHA512 aaa74eba949a93a132ebb956bfec46f8cf7b9807cf984a1fd8c4f71a252709d9e2b144cd7b4ce1f560501056c758f028eeb2c53d5cccaa79f8dc6b9d595763f8
+DIST NetworkManager-pptp-1.2.8.tar.xz 401540 BLAKE2B 64b3fe344a39eb64b462bda9204fb80b95a6cb54988efef9dbd1a5a6b04b3577edee97afabef410488868736d751846bdd98f3965a96806790527434c8207ec8 SHA512 ff1bee257d6aa6750c2fbd302edc3022780e9182fde1d79d4b37246daf01b0a9e5115dd64ec70a4b128e273eff6f9bc22af87fe2b25618008be6f452bbcd41a7
 EBUILD networkmanager-pptp-1.2.4.ebuild 1164 BLAKE2B b8109adb694a84b150b8e7ecf693e41cc1ff7accc49417068c0c80d447f93b7e79806571c995338ce864c97286adde5ca4ef3fb51f97cb58ac4dafc9c9c15b9e SHA512 1d7bfc257fe3927bf5591cdfa1e57c57fac968e56f28b6abd67ea284ed02aa8865aa662c1bd18a4979b90d41e6cf41d2d22d170ef2e46aba446ddd4d7726860b
 EBUILD networkmanager-pptp-1.2.6.ebuild 1256 BLAKE2B f43fd43b30ba745a5bb1632f0e4ae86f424110a97ce4336e77190b9fa7e75c2f59a55a6634115910027e6200144433144dd54aa05b334e29f175e10cd001069a SHA512 853a0589681ee891b4be98bd42e2c57cd579af5420a720760a7c225d4094238ce41a167a53e5cfa8616c191c0f9c66ee0788865fe5a434c78f9fa32a431a1ce6
+EBUILD networkmanager-pptp-1.2.8.ebuild 1261 BLAKE2B 513b96b4b03f2bd25417454656e2763279ba68216ca695734feeae843ab12d4eb5cabad6adba3d48180207fcf2f55735e667abdbadd1b4efb8bc802fd00e58ae SHA512 ae358f37cbf00cb03977d06252c2a999e4501ec63e30c71ba0b11f1dbf8b563081cb76db1c176c3aae3a710b9ac4a13713090b713a8cdeb5d294853fbcb112b0
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-misc/networkmanager-pptp/networkmanager-pptp-1.2.8.ebuild b/net-misc/networkmanager-pptp/networkmanager-pptp-1.2.8.ebuild
new file mode 100644
index 000000000000..ff701efd67d2
--- /dev/null
+++ b/net-misc/networkmanager-pptp/networkmanager-pptp-1.2.8.ebuild
@@ -0,0 +1,52 @@
+# 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
+
+DESCRIPTION="NetworkManager PPTP VPN plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/VPN"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="gtk"
+
+RDEPEND="
+	>=net-misc/networkmanager-1.2.0:=
+	>=dev-libs/dbus-glib-0.74
+	>=dev-libs/glib-2.32:2
+	net-dialup/ppp:=
+	net-dialup/pptpclient
+	gtk? (
+		>=app-crypt/libsecret-0.18
+		>=gnome-extra/nm-applet-1.2.0
+		>=x11-libs/gtk+-3.4:3
+	)
+"
+# libxml2 required for glib-compile-resources
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-libs/libxml2:2
+	dev-util/gdbus-codegen
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local myconf
+	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
+	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="${myconf} --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER}"
+
+	gnome2_src_configure \
+		--disable-more-warnings \
+		--disable-static \
+		--with-dist-version=Gentoo \
+		$(use_with gtk gnome) \
+		${myconf}
+}
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 45a2b3ebe457..70cfeda7f496 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -8,7 +8,7 @@ DIST NetworkManager-1.12.4.tar.xz 4195812 BLAKE2B 11c59da430cdf6f70cc841d980e0bc
 DIST NetworkManager-1.14.0.tar.xz 4389692 BLAKE2B 1d1b12764503d5f56d27f11449f3a0149491887312ed735c5cd25c0eeb6928fead30544d32cdd65262e00c4bdaed55dfb6dbc731c82de41ff8c49ff85937211e SHA512 cb0add2585c586ad36b4fb986a654de30047dc77f038927437156227f42622ac1045c58b76573f4e1acef22aa9f695da417f392a50fde70f4a086504701cecf1
 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 10769 BLAKE2B 0adb377fc034856e1e1045a9134f231009e9e4181e13e9b7a9e990dcf562d3b98984ebcb27c15ee475b9024a76e3e262b9a9a162f58c16510a86ac920cca7d57 SHA512 af2868a2490d80ecaa0e703b5f2091fe481e6c47e3362a781344cd2313e2cbf5bd5cfdd0ee5c404b1dcebc70e9ebc32f2bcc59416718659b2e0af6925f0b97f1
+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
diff --git a/net-misc/networkmanager/networkmanager-1.10.10.ebuild b/net-misc/networkmanager/networkmanager-1.10.10.ebuild
index 35a4798cab10..f5f2d2126524 100644
--- a/net-misc/networkmanager/networkmanager-1.10.10.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.10.10.ebuild
@@ -26,7 +26,7 @@ REQUIRED_USE="
 	?? ( consolekit elogind systemd )
 "
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 ~sparc x86"
+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
diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest
index 7780ca401879..7558dcd3a17b 100644
--- a/net-misc/ntpsec/Manifest
+++ b/net-misc/ntpsec/Manifest
@@ -7,7 +7,7 @@ DIST ntpsec-1.0.0.tar.gz 2405862 BLAKE2B b1631491500cafa5d41761fe6cb2db523450ed7
 DIST ntpsec-1.1.1.tar.gz 2451415 BLAKE2B 516c87f0710ecacfde27f801a5fc4a492e7871eb35cc3afb8a107e0c381cd9787a4af2d0b01e2cf5d4f43043afe042321e5bbd2299578723e870b2fa502646d2 SHA512 838ed81c94e14a3d8588670ce63a1c4f6216d2f79be5149ad6a845cec00bdf6d7fe77310ce9c33c4675d3db54e59c3d9d02ae4351913ffbd9a3883716c443f83
 DIST ntpsec-1.1.2.tar.gz 2458805 BLAKE2B e9ab493f60179ce94a5995287423c3a0038298b622b0dcffd5a299261a7b42fc8d0d04256726e049c625c0789882f601615eaa7169047e984a274f62e0cf40d2 SHA512 83d2d3bc59202f1e5f3e76eeb6810e575e24c6f392f20c25732a6881a0a0a9f72453b76b294399351ec4baf88bc64da089dc1340aee38576021659f81bcd0e19
 EBUILD ntpsec-1.0.0-r6.ebuild 3984 BLAKE2B d1752c19aedecd7cb4a7522ab4f4adbc6c86daf0a3d33a45aa81f501142b0daab5e66785362f751d3603f21fdab66c17a22304365db99af5dd808ae6beccc95a SHA512 fecd7e354283d83be97445a4d7dd36e103f56e123519bbfacfd2983d8e94953dcafc461d97a628be7b019e06a989ef1778afa1af63a41d2e42b61023debc92a9
-EBUILD ntpsec-1.1.1.ebuild 3920 BLAKE2B 41c8e51bf42125994bffc8d5a6793769311eb66e78ee5cb5e7b575992e335f9fdecf18e0224709a281d2d9c0a2e0784b9dae568e33daea99f33ab2ecfc61278c SHA512 5131e8e735ef0a15d56c355e40d32d3b60ae76d659f45a2f173ef66a4cc2a12f619c3804ac2f054b385f46362c86627992a554bb0659872b5a9e7747cf8044e3
-EBUILD ntpsec-1.1.2.ebuild 3920 BLAKE2B 41c8e51bf42125994bffc8d5a6793769311eb66e78ee5cb5e7b575992e335f9fdecf18e0224709a281d2d9c0a2e0784b9dae568e33daea99f33ab2ecfc61278c SHA512 5131e8e735ef0a15d56c355e40d32d3b60ae76d659f45a2f173ef66a4cc2a12f619c3804ac2f054b385f46362c86627992a554bb0659872b5a9e7747cf8044e3
-EBUILD ntpsec-9999.ebuild 3920 BLAKE2B 41c8e51bf42125994bffc8d5a6793769311eb66e78ee5cb5e7b575992e335f9fdecf18e0224709a281d2d9c0a2e0784b9dae568e33daea99f33ab2ecfc61278c SHA512 5131e8e735ef0a15d56c355e40d32d3b60ae76d659f45a2f173ef66a4cc2a12f619c3804ac2f054b385f46362c86627992a554bb0659872b5a9e7747cf8044e3
+EBUILD ntpsec-1.1.1.ebuild 3943 BLAKE2B 9285726a6f69db99dcaaf094d70dc7cdef2094312622409726b8efd079e4d25b461c582d05a38bfd8446a3ddafe48a97adb3db0d1ba7cc60dba57a25de508784 SHA512 fffa219833786776ddc3af23fea0f1a3b7bd9a189b8072829039560b4324c11a0d885e16b93c187bf972163ed654a82cdd819498125ed097b8bd79b03456b40e
+EBUILD ntpsec-1.1.2.ebuild 3943 BLAKE2B 9285726a6f69db99dcaaf094d70dc7cdef2094312622409726b8efd079e4d25b461c582d05a38bfd8446a3ddafe48a97adb3db0d1ba7cc60dba57a25de508784 SHA512 fffa219833786776ddc3af23fea0f1a3b7bd9a189b8072829039560b4324c11a0d885e16b93c187bf972163ed654a82cdd819498125ed097b8bd79b03456b40e
+EBUILD ntpsec-9999.ebuild 3943 BLAKE2B 9285726a6f69db99dcaaf094d70dc7cdef2094312622409726b8efd079e4d25b461c582d05a38bfd8446a3ddafe48a97adb3db0d1ba7cc60dba57a25de508784 SHA512 fffa219833786776ddc3af23fea0f1a3b7bd9a189b8072829039560b4324c11a0d885e16b93c187bf972163ed654a82cdd819498125ed097b8bd79b03456b40e
 MISC metadata.xml 2008 BLAKE2B e4f1a7e79fbaf5011ba2b26143c138f39663be73664ec9f1270e9b6cbcb553c245201c9a5bd0771435a24e1f342907861e8a2b6808cc2e3f6d6a7a10ad6ed021 SHA512 5c8fc24233d577ebc254a6d92d93734bfb10ef287217ef61f4f6e8b28f059ee7e92bc5e18326d61a9e80fa7504f79c820d831cdad489321a9f45bae0a4d54a16
diff --git a/net-misc/ntpsec/ntpsec-1.1.1.ebuild b/net-misc/ntpsec/ntpsec-1.1.1.ebuild
index 680e3dcba1d5..46234cf71a8b 100644
--- a/net-misc/ntpsec/ntpsec-1.1.1.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.1.1.ebuild
@@ -33,7 +33,7 @@ IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
 LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
 SLOT="0"
 IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libressl nist ntpviz samba seccomp smear tests" #ionice
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
 
 # net-misc/pps-tools oncore,pps
 CDEPEND="${PYTHON_DEPS}
diff --git a/net-misc/ntpsec/ntpsec-1.1.2.ebuild b/net-misc/ntpsec/ntpsec-1.1.2.ebuild
index 680e3dcba1d5..46234cf71a8b 100644
--- a/net-misc/ntpsec/ntpsec-1.1.2.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.1.2.ebuild
@@ -33,7 +33,7 @@ IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
 LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
 SLOT="0"
 IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libressl nist ntpviz samba seccomp smear tests" #ionice
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
 
 # net-misc/pps-tools oncore,pps
 CDEPEND="${PYTHON_DEPS}
diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild
index 680e3dcba1d5..46234cf71a8b 100644
--- a/net-misc/ntpsec/ntpsec-9999.ebuild
+++ b/net-misc/ntpsec/ntpsec-9999.ebuild
@@ -33,7 +33,7 @@ IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
 LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
 SLOT="0"
 IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libressl nist ntpviz samba seccomp smear tests" #ionice
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
 
 # net-misc/pps-tools oncore,pps
 CDEPEND="${PYTHON_DEPS}
diff --git a/net-misc/nyx/Manifest b/net-misc/nyx/Manifest
index 91b743be3292..892259a58da2 100644
--- a/net-misc/nyx/Manifest
+++ b/net-misc/nyx/Manifest
@@ -1,3 +1,4 @@
 DIST nyx-2.0.4.tar.gz 4074259 BLAKE2B 92296a319947803195a6ae3991f1991c9ee5dc8293144b31d143995a0b897e89812d4b012c330cb2d9e7ee2d2dbbc0ab0bbeb49135ec7e302aefde2dbe8159de SHA512 bb64b6c38bbfc9837215503a69b4a6b7a11b8a1e230f42c51a405472689a3d46d74dd06b2417c90512b63e9605b33198c5132b660f9eca037016a39c5e4f0ecf
-EBUILD nyx-2.0.4.ebuild 532 BLAKE2B 30ad1ebcaceb4e1868ef514849db3db8455a3d0b2810e5c97a9be409c3120af372122422fd4f283a526a2e5ddc07aa0d10c5854a1f2c0280cf1eccb00a7c00d3 SHA512 d1929d6236954df74741a5bd2398a1caded9134a708c9db8ebf3b3aa27df82b905ca6af8634094d0a7c3bafdb4414347f114788470df86680bb29767d2a68786
+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-2.0.4.ebuild b/net-misc/nyx/nyx-2.0.4.ebuild
index 93d2f04eb224..a27cb04c7b15 100644
--- a/net-misc/nyx/nyx-2.0.4.ebuild
+++ b/net-misc/nyx/nyx-2.0.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
@@ -8,11 +8,16 @@ inherit vcs-snapshot distutils-r1
 
 DESCRIPTION="Utility to monitor real time Tor status information"
 HOMEPAGE="https://nyx.torproject.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+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"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="test"
 
 DEPEND="
diff --git a/net-misc/nyx/nyx-9999.ebuild b/net-misc/nyx/nyx-9999.ebuild
new file mode 100644
index 000000000000..a27cb04c7b15
--- /dev/null
+++ b/net-misc/nyx/nyx-9999.ebuild
@@ -0,0 +1,27 @@
+# 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/pyhoca-cli/Manifest b/net-misc/pyhoca-cli/Manifest
index 8a8611b8c9f4..ea62b4342e84 100644
--- a/net-misc/pyhoca-cli/Manifest
+++ b/net-misc/pyhoca-cli/Manifest
@@ -1,5 +1,5 @@
-DIST pyhoca-cli-0.5.0.3.tar.gz 32170 BLAKE2B 933c6a4d5b2daf3802f45de4162ee76671ca4516d07e4d91d908e29f6b2341d636bfa8bbe448b58ff8d066b1a4c61a35b48bca7c25eda72196d94f39b8da5d61 SHA512 84f92008b099fa3f753a2143115486e121d66407f318ffa4840d7b4e8fd2ee2aa620b152a384ea1c59823eb2acfdb9426257247041cbc248872e2e33dbc9c279
 DIST pyhoca-cli-0.5.0.4.tar.gz 32486 BLAKE2B e47799519715c14ba89f8696ed8d394248397548ccbd0dcfc514d8c8ba96071dfa12a191eace4cc6f92aeaeb8fd0b17addf471e6f11d5ffb4e456977d38c7e14 SHA512 6dadbd01922f9957469c2f401a6b1d7da4ad7bfa9c82f38d951b230cd880b826e96a63cf3d244d27299ea9bab4d1f42239a2f0d73702e62eb4859a52c25158bd
-EBUILD pyhoca-cli-0.5.0.3.ebuild 632 BLAKE2B 5d59b7c160b26eeb8d689be95dbd1191c607b23cae18bf608734a26f3047fd6d883c9425fcaea4b89220091bf169814152762288f910523f75f6187244124d02 SHA512 c33f3342e3aebfea8e1624d96dbb190650550a6e0c8c4a0b2988a1d3078933b601709f497fd9720c1dd615caa96f573c3f024b91525de2ea4c17b426fcf8249d
+DIST pyhoca-cli-0.6.0.0.tar.gz 40513 BLAKE2B 203ba683c65a77c8f136ac65fea156e938b86b8338dff4c39c5b0ab9368a5e0b1e845e4862b9d95fd02cec9484691b9b11b6d2dbd41cc8a1089e32a4e9c9d717 SHA512 a6e2504cf40eb847db826eb016bcba4ead83f5b8d45de8c251c4c3b0f4cef86dbdfe4c8663f900ce9afe6fef868e67ff5ab1e3222179d19afcc7d0233b4804c6
 EBUILD pyhoca-cli-0.5.0.4.ebuild 632 BLAKE2B 2fb2dc256b574eb5c0513aea1dca34e4da1bfab381e79c52c050671d58cb181012feae8fbbe551b8681102dedbad602b3f98fda72b9037bd270ac05a5fd86ce3 SHA512 f8f04b7e2eefe51364fe3288037eca80ba02fb5b254824d5504802d9b14e54324d3b88989a02354535b138a14cfeea3fe7bb7dde670f395f601d80cf1c0248c1
+EBUILD pyhoca-cli-0.6.0.0.ebuild 676 BLAKE2B c3c543015469c793dfd7c3d4679c2668b8cb951c2a6159e28ee7af9d69a4a0282ab56d772ab88ca7b78256910110c078839019c8206d446a0700f03f6f4bb689 SHA512 3f10663f7eb34e17dbf511f4976b95381a55df5d3ffc20e66e650e2a017bcf6dfe0bf1e3932405e33f9cf2188f0fd0fe4c6d357586f083821ff6f9a7c9cf2f3e
 MISC metadata.xml 521 BLAKE2B 07e613991af22f75609d554e9c533773fb4ae1b00227c717dde027b16cc14c5a31c0144b8970dc8095e2eabd62d3bff0578b290489eb44787611b860120ed35d SHA512 7be8e7f29191fc70cfb2c9f3482dc536803ba374996c52fb8c7011c60c0f7de0b10ab333792ee59b391d04e8a74bd778a30db7a6722118e612db232567527959
diff --git a/net-misc/pyhoca-cli/pyhoca-cli-0.5.0.3.ebuild b/net-misc/pyhoca-cli/pyhoca-cli-0.5.0.3.ebuild
deleted file mode 100644
index 93547ab26559..000000000000
--- a/net-misc/pyhoca-cli/pyhoca-cli-0.5.0.3.ebuild
+++ /dev/null
@@ -1,30 +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="X2Go command line client"
-HOMEPAGE="http://www.x2go.org"
-SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setproctitle[${PYTHON_USEDEP}]
-	>=net-misc/python-x2go-0.5.0.0[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_install() {
-	distutils-r1_python_install
-	python_doscript ${PN}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman man/man1/*
-}
diff --git a/net-misc/pyhoca-cli/pyhoca-cli-0.6.0.0.ebuild b/net-misc/pyhoca-cli/pyhoca-cli-0.6.0.0.ebuild
new file mode 100644
index 000000000000..858a77c4648b
--- /dev/null
+++ b/net-misc/pyhoca-cli/pyhoca-cli-0.6.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=( python3_{5,6} )
+inherit distutils-r1
+
+DESCRIPTION="X2Go command line client"
+HOMEPAGE="http://www.x2go.org"
+SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setproctitle[${PYTHON_USEDEP}]
+	>=net-misc/python-x2go-0.6.0.1[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_install() {
+	distutils-r1_python_install
+	python_doscript ${PN}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman man/man1/*
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/net-misc/pyhoca-gui/Manifest b/net-misc/pyhoca-gui/Manifest
index 806ec0f6b00b..f2da4c1ccf2d 100644
--- a/net-misc/pyhoca-gui/Manifest
+++ b/net-misc/pyhoca-gui/Manifest
@@ -1,5 +1,3 @@
-DIST pyhoca-gui-0.5.0.6.tar.gz 1345011 BLAKE2B aafb54d2e863afd93b0fa40191a3f8508af91b1f2839448399e64ca273b2eefce4b8dca76bdcd9b30e046bcefb2b1ec01841dd50f07ea12d7de63f762aac6dc9 SHA512 46edc32425e083ef9043f6fdd6b2e4f973109688e5cc3167ed09132441213292f6aed94b26a63829101912388293c239eb689163f933cf4d95125295e3336b89
 DIST pyhoca-gui-0.5.0.7.tar.gz 1345182 BLAKE2B 4986c1d19663ed3df29992cb7b442bed4fc95bdd6e0f1d3521e1bc3d2ab0d98aa9578a470995ab0b28ba13fb29fdb8c384a59f09d08270dd1d689177a9548045 SHA512 bfb0eb95a87e19ff84fd13c642725be40369ec8e7f58615301033d22e3c1f81ed8b47542989711b1ee9414382989c8e258fa24f3f3c6cb950c42a53a9a6bd8b6
-EBUILD pyhoca-gui-0.5.0.6.ebuild 809 BLAKE2B 18c315042a5ad97a1708cc79f80c36ec88d4385e47fd11e408ba5af6dc71d6fd4edce18a1c72a4d56b42fead448cf880710c1aa341e9517b9a7c8f4a3cf50513 SHA512 5a4a47d0e9aee92b0f23fac9758e66aeb9c4f62a197b31305d35a32f36d41d3b94d319069ad0f3642daaff6ed1396ceaeeda0e70b8e24952078f55b53d304062
 EBUILD pyhoca-gui-0.5.0.7.ebuild 809 BLAKE2B bc974a3908bc993af18c86483bcfbdf655dde6cbb2c7ba80229f8dce0efde64e6f7222c1b53a119ba57f3f1d1f7714349afef887abd370de3f95df3a912f038e SHA512 c4e457b3f8d597fabc3842cde26f5acd5fad4a54d7849a0c1349aaf253146217ba8695e9ebc879bdec939dad897e5f57680e7121981da0483ae8d4ff382ec092
 MISC metadata.xml 791 BLAKE2B 7f823d058d401072a1e1407391c2eb02c0b70705f5beac53656d582b977455201f0687c3b93653314be45339dfc749a81a06197a3e6e1b0c78205986fbf033ef SHA512 5e05aefac383cb0cc65e2747aa5d9eef23b2f26931196fa544f263a0c0bf2dfc63c026fa606fd910ab589f447d3bd78f42de0bff61a44286964098531000a5cb
diff --git a/net-misc/pyhoca-gui/pyhoca-gui-0.5.0.6.ebuild b/net-misc/pyhoca-gui/pyhoca-gui-0.5.0.6.ebuild
deleted file mode 100644
index 7f3d94759271..000000000000
--- a/net-misc/pyhoca-gui/pyhoca-gui-0.5.0.6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-DESCRIPTION="X2Go graphical client applet"
-HOMEPAGE="http://www.x2go.org"
-SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/notify-python[${PYTHON_USEDEP}]
-	dev-python/pycups[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	dev-python/wxpython[${PYTHON_USEDEP}]
-	>=net-misc/python-x2go-0.5.0.0[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
-	dev-python/python-distutils-extra[${PYTHON_USEDEP}]"
-
-python_install() {
-	distutils-r1_python_install
-	python_doscript ${PN}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman man/man1/*
-}
diff --git a/net-misc/python-x2go/Manifest b/net-misc/python-x2go/Manifest
index 40933fe12003..6c2ba6fbb609 100644
--- a/net-misc/python-x2go/Manifest
+++ b/net-misc/python-x2go/Manifest
@@ -1,5 +1,5 @@
-DIST python-x2go-0.5.0.5.tar.gz 198260 BLAKE2B 36a35e7db8897e0209b54d3b4ecb29200caf22d036b7fe5cb4ebdd7d867ba8d019bbea1fbc3b347a2f0a05cf7ce6e37d19333babab8b1bb868736aadd60de645 SHA512 a8cb97f321921b9c98a64b2ef9b3763118150a585b6797837ec890dc588d8f4884fa58d374690a0cfe025ad338b1f7e1c048e4d8c48736205975856a5d82d1d1
 DIST python-x2go-0.5.0.6.tar.gz 198236 BLAKE2B fb39afe9dadf104c8e348ad699539522977da839c8db2df23b3b976e7603064c4882d1a058e194847553e3a2c3e614e242e5fc0bd117f55594e7de0d682d9ed0 SHA512 bad064490ed1b30ec63631d4e6af4ad133f4f1049e60f345dfc0a45abfd5d54a54556953baeae40bb543573d23987da745ad67bf6270f28be4dd6b130a05a9f2
-EBUILD python-x2go-0.5.0.5.ebuild 591 BLAKE2B 9f661376976d06605f0480d3396cfa9486031f491c4d1561b4fae07f44e192c1f85b072f11613eee45d7a4e6d4ddb739b01296170671012221bb0a7abc239d0f SHA512 fbddfe4f5dae098c33f30047d369d3fb9d0c2d9e367200396b9ff7f1f095c5b45d5be316bed423547e6b1ff69392cce6cceccae7bfd508ced473d945d6bed1fa
+DIST python-x2go-0.6.0.1.tar.gz 243623 BLAKE2B 60d0b6245d089f168bfc8c47f6360f53cecf5553de04a741d5993c2a78875bbe4367ae5c6d430b472df1870ed3b12cf9a11a046081fe1272d634ee1a46ff2afc SHA512 d4ee7b6d8a6efa8c6071cb5e899c624e3f4527ab8da85c4a088ccee02dd518da0da2d49b5cfb4940f585939b5761ddd9aacb00cb82e2c21c5b22cebc2d0575df
 EBUILD python-x2go-0.5.0.6.ebuild 591 BLAKE2B 9f661376976d06605f0480d3396cfa9486031f491c4d1561b4fae07f44e192c1f85b072f11613eee45d7a4e6d4ddb739b01296170671012221bb0a7abc239d0f SHA512 fbddfe4f5dae098c33f30047d369d3fb9d0c2d9e367200396b9ff7f1f095c5b45d5be316bed423547e6b1ff69392cce6cceccae7bfd508ced473d945d6bed1fa
+EBUILD python-x2go-0.6.0.1.ebuild 602 BLAKE2B ce7d2e0dabc87fc36298214494bb95b000823f561a13d9d453b888bc0d929252bf3ea730e4b8ab145ab003b5df75252f8274b864cce9fefd7d8bb038a5e43148 SHA512 b94fd3a989739df4c8badf16bcf0aeb927536ac310164d991cc8cfca26070b55072ea286f83ce1954e41a7fdb4e8faf415fe140b012bbf796b62ebce7485752e
 MISC metadata.xml 483 BLAKE2B 556d85d173fd848484a7ede8e26d1b66fcfc95c49c1231b12273a6e8bbc42c4421fbc1933f7aefa846369f474caa25163095774daf6be7680c6b3b79b09c3e67 SHA512 42c6decd895d3cf1097fc1e9a4a8eeeda0fff769a74fe4a74b17ba2943c76b63bc243d200b08d050aa1e778f3ee71f8a504f59384c79a54b220c7a022b23bc6e
diff --git a/net-misc/python-x2go/python-x2go-0.5.0.5.ebuild b/net-misc/python-x2go/python-x2go-0.5.0.5.ebuild
deleted file mode 100644
index 8f666b8ffe49..000000000000
--- a/net-misc/python-x2go/python-x2go-0.5.0.5.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
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-DESCRIPTION="X2Go client-side Python API"
-HOMEPAGE="http://www.x2go.org"
-SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# TODO: minimal USE flag in net-misc/nx, we only need nxproxy/nxcomp
-DEPEND="dev-python/gevent[${PYTHON_USEDEP}]
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/python-xlib[${PYTHON_USEDEP}]
-	net-misc/nx"
-RDEPEND="${DEPEND}"
diff --git a/net-misc/python-x2go/python-x2go-0.6.0.1.ebuild b/net-misc/python-x2go/python-x2go-0.6.0.1.ebuild
new file mode 100644
index 000000000000..e9d9ddc2fde1
--- /dev/null
+++ b/net-misc/python-x2go/python-x2go-0.6.0.1.ebuild
@@ -0,0 +1,23 @@
+# 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
+
+DESCRIPTION="X2Go client-side Python API"
+HOMEPAGE="http://www.x2go.org"
+SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# TODO: minimal USE flag in net-misc/nx, we only need nxproxy/nxcomp
+DEPEND="dev-python/gevent[${PYTHON_USEDEP}]
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/python-xlib[${PYTHON_USEDEP}]
+	net-misc/nx"
+RDEPEND="${DEPEND}"
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index 16954b655162..8c80c7d591b6 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 2241 BLAKE2B 63c9742c96d5a6da07651416b84f66f39ab41d8a4c47164ba3abfb110008d0300f1fa419bf5fc6dc5b6fc7e7d54f56ec3290743466e41bbc0ba9a5ba48a9b0c4 SHA512 5f85dbfdd8e7cca66648155a089dd77d683f7b8d7398af394302457b0f16918a025a48e8756bb5fabb895c91f2e916e9a3ee7b7ab5297626a4d4baa127702586
+EBUILD remmina-1.2.31.3.ebuild 2236 BLAKE2B 9a8cd2fa813e2579b8cc400e7056812b6cf1f8afe814da1978b102962d77b00183a206303a22f7cc779435d10f7e1889ac261fae0a51361b574b6e1a5846a9cf SHA512 847f9a0bebcca9e888ce0498d9cec2146c31480579c9d133435c71552676acd44c76ba35a99b4c80db8b2560381a699fc50f982fe20c7a0353e284034e2e5f47
 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 53a4922379f8..4fbd25cd8a09 100644
--- a/net-misc/remmina/remmina-1.2.31.3.ebuild
+++ b/net-misc/remmina/remmina-1.2.31.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="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="ayatana crypt examples gnome-keyring libressl nls spice ssh rdp telepathy vnc zeroconf"
 
 CDEPEND="
diff --git a/net-misc/s6-networking/Manifest b/net-misc/s6-networking/Manifest
index a147bd4fb081..44a16ae21e92 100644
--- a/net-misc/s6-networking/Manifest
+++ b/net-misc/s6-networking/Manifest
@@ -1,3 +1,3 @@
 DIST s6-networking-2.3.0.2.tar.gz 85977 BLAKE2B 883caa1d2376e1897b35fd6992a512bb9915be08b0fed10447fac3bf3acf8587153bb15d3b2c4750b02e7fdba8793253d7145afe9aef83a10efd33df3ee46c67 SHA512 c99afd9bdbd5003f57de8f88f091971f0269cd8efee5791c3c4aa90ad34b978d0f57724d4128e9d20d6a40d731853bb4bdaa76dd860f975ff7f84a56b0050256
 EBUILD s6-networking-2.3.0.2.ebuild 1892 BLAKE2B 80830d023c1bebc7457fe4d882924f3761879665c771fd465e22e0cf095a76127f0b01eb891316366452d8fbe4065ddaaec7f157549ca72e6f21e97cc9d4cafe SHA512 26539e1976690200ff1882ae1fe761f45c670ac2192234d1a920d644a397be8144ee000100a43086ed19add9a5d403bee021f85b2be3badff1e3e2e67b60f76c
-MISC metadata.xml 750 BLAKE2B 1671f7a3da0ab5ad674c63d516ca693c202a1700b2ffc7bddd87a897607670e643e3504b33d5358f3f974388354a6a33c067844c181a349fe7af3a2188a89beb SHA512 75cfc47bfa5d8ea7f62fb48adcb0c946e1fa6b256f89b4a2e9a037053da5ed2e7139a1872f2933dd48194dc794903dff2314e6ac228c1a63ac7b7c80c0d1c82f
+MISC metadata.xml 970 BLAKE2B f9792b261130ed67ef4d8c39e2d2527af114ffa21c0fbb1213b9fda6f76235254b77521ecafb551345694e2a3334837a6f03f208048b6b109b06decdb8d9dd57 SHA512 29c7d44849f2e08812af16e5da7ac72858d9deff240d8ee71dae789b498e1f7385f3b94f39d87672ffb625eff4b4645f441858bf9463c269510439bb7c3987bc
diff --git a/net-misc/s6-networking/metadata.xml b/net-misc/s6-networking/metadata.xml
index 179bb46bd2aa..0f888cc49b6a 100644
--- a/net-misc/s6-networking/metadata.xml
+++ b/net-misc/s6-networking/metadata.xml
@@ -9,6 +9,14 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>aranea@aixah.de</email>
+		<name>Luis Ressel</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		s6-networking is a suite of small networking utilities for Unix systems.
 		It includes command-line client and server management, TCP access
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 2f50fbc6f6e0..da66c95ce4ee 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,10 +1,10 @@
 DIST youtube-dl-2017.11.15.tar.gz 2834012 BLAKE2B fd93e3923f99874be58681a886c09e31ac10063975ab636badf27e59b44743c72cddf05e3a431c49ffd0f7b40f9b005f4d90feff85d4ca889dee80833300b076 SHA512 e10c0d53db7fdfb02610b53f54046c0a9354b305ba05c5d00a43649a283a6449263f66ff56171d52cf18f906c6aeccc25dc48ea708b4b1bb2b8323b937abca96
 DIST youtube-dl-2018.08.22.tar.gz 3025389 BLAKE2B e8d2d8bccab8c169d08de35544e5efb05c65799c26894807e075edfe090d36de30fea787f54d59e4fc8b671356ce2e1d9002627948fb05becc9d2e3bc634164c SHA512 ef17c744ac27b3bf547124f18a155908a66ee75f3f6fb5d7dd8a1d8da61a5a598bbade6cf0362e8c93c337dcf47750db5f56357919226430f02d0b764011ffb5
-DIST youtube-dl-2018.09.18.tar.gz 3041086 BLAKE2B 6cca8e87c26f9b2d1c9aa117d4e798cd80b12a423a9f63f2d79a6b55d21f497f372a1d5d72f48ebdf52d658f26934c7f1db9e44b5b6ed030bcb55a452a3e8f44 SHA512 9ec58e05fb7db0e08ffeea3810631b21654dda9a57849db76a7a8f9dfb6fc95fd685b36188354c9b28f6e35c818a56c44e4c55bc826d2d1c19b96cecfcc8662e
 DIST youtube-dl-2018.09.26.tar.gz 3042551 BLAKE2B 1cf4fe51a55bd82bacf5405119f91c78d975d755c8dc50e41b52f8e0af26074d6873b4046970afda81b3732825918c3bd1a14aaf3ef554096db063b365a72e6a SHA512 b54721bd9b6c6bb66d0ddf4000a435bf8f4d3884a513aada844497db38a5bca34f82484b483b20adb709043ffdd1c00b6aa6cb9c5e6d5be2306d0ae7be77caee
+DIST youtube-dl-2018.10.05.tar.gz 3044157 BLAKE2B c65651eebda6bd9c28245415f7aa804c78a74fa33a9717a3e9589734334ed8d12d5432eadd18d55ee46d4b51b1cacbe458c2ad175ed2e135b838fac54d468192 SHA512 b581372522d467b3277d81bdc9978352c720d4f33e0d8249cd0271eb1814a153324a5b34608d88d392bb52b1c57d0a6f425baf8377d5609810ef770839586714
 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.18.ebuild 3289 BLAKE2B a166bf5cd416617633a5809e712fa972fe9ff5c52d550e93e94e4c7c82a03832e6f9d515af8f4316d49cf4332e78f353b74578a85128daa911d748641452bbaf SHA512 be1262c6cda81052b15b443b4c1a5613c50c930fee336cc0dc34ba504db9bdc80afce105cd838e20997ade21cc22185390abc209c2639975efcde017aa72f994
 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
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2018.09.18.ebuild b/net-misc/youtube-dl/youtube-dl-2018.09.18.ebuild
deleted file mode 100644
index 1c433fb38eca..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2018.09.18.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://rg3.github.com/youtube-dl/"
-SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="+offensive test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-python/nose[coverage(+)] )
-"
-
-S="${WORKDIR}/${PN}"
-
-python_prepare_all() {
-	if ! use offensive; then
-		sed -i -e "/..version../s|'$|+gentoo.no.offensive.sites'|g" \
-			youtube_dl/version.py || die
-		# these have single line import statements
-		local xxx=(
-			alphaporno anysex behindkink camwithher chaturbate eporner
-			eroprofile extremetube foxgay goshgay hellporno hentaistigma
-			hornbunny keezmovies lovehomeporn mofosex myvidster porn91 porncom
-			pornflip pornhd pornotube pornovoisines pornoxo ruleporn sexu
-			slutload spankbang spankwire sunporno thisav vporn watchindianporn
-			xbef xnxx xtube xvideos xxxymovies youjizz youporn
-		)
-		# these have multi-line import statements
-		local mxxx=(
-			drtuber fourtube motherless pornhub redtube tnaflix tube8 xhamster
-		)
-		# do single line imports
-		sed -i \
-			-e $( printf '/%s/d;' ${xxx[@]} ) \
-			youtube_dl/extractor/extractors.py \
-			|| die
-
-		# do multiple line imports
-		sed -i \
-			-e $( printf '/%s/,/)/d;' ${mxxx[@]} ) \
-			youtube_dl/extractor/extractors.py \
-			|| die
-
-		sed -i \
-			-e $( printf '/%s/d;' ${mxxx[@]} ) \
-			youtube_dl/extractor/generic.py \
-			|| die
-
-		rm \
-			$( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
-			$( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \
-			test/test_age_restriction.py \
-			|| die
-	fi
-
-	eapply_user
-
-	distutils-r1_python_prepare_all
-}
-
-src_compile() {
-	distutils-r1_src_compile
-}
-
-python_test() {
-	emake test
-}
-
-python_install_all() {
-	dodoc README.txt
-	doman ${PN}.1
-
-	newbashcomp ${PN}.bash-completion ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	newins youtube-dl.zsh _youtube-dl
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins youtube-dl.fish
-
-	distutils-r1_python_install_all
-
-	rm -r "${ED}"/usr/etc || die
-	rm -r "${ED}"/usr/share/doc/youtube_dl || die
-}
-
-pkg_postinst() {
-	elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /"
-	elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :"
-	elog
-	elog "${PN} works fine on its own on most sites. However, if you want"
-	elog "to convert video/audio, you'll need avconf (media-video/libav) or"
-	elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -"
-	elog "videos can be retrieved in a higher quality format without sound."
-	elog "${PN} will detect whether avconv/ffmpeg is present and"
-	elog "automatically pick the best option."
-
-	elog
-	elog "Videos or video formats streamed via RTMP protocol can only be"
-	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
-	elog "Downloading MMS and RTSP videos requires either mplayer"
-	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2018.10.05.ebuild b/net-misc/youtube-dl/youtube-dl-2018.10.05.ebuild
new file mode 100644
index 000000000000..8a6b3e14fd72
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2018.10.05.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=(python{2_7,3_4,3_5,3_6})
+inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="https://rg3.github.com/youtube-dl/"
+SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="+offensive test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-python/nose[coverage(+)] )
+"
+
+S="${WORKDIR}/${PN}"
+
+python_prepare_all() {
+	if ! use offensive; then
+		sed -i -e "/..version../s|'$|+gentoo.no.offensive.sites'|g" \
+			youtube_dl/version.py || die
+		# these have single line import statements
+		local xxx=(
+			alphaporno anysex behindkink camwithher chaturbate eporner
+			eroprofile extremetube foxgay goshgay hellporno hentaistigma
+			hornbunny keezmovies lovehomeporn mofosex myvidster porn91 porncom
+			pornflip pornhd pornotube pornovoisines pornoxo ruleporn sexu
+			slutload spankbang spankwire sunporno thisav vporn watchindianporn
+			xbef xnxx xtube xvideos xxxymovies youjizz youporn
+		)
+		# these have multi-line import statements
+		local mxxx=(
+			drtuber fourtube motherless pornhub redtube tnaflix tube8 xhamster
+		)
+		# do single line imports
+		sed -i \
+			-e $( printf '/%s/d;' ${xxx[@]} ) \
+			youtube_dl/extractor/extractors.py \
+			|| die
+
+		# do multiple line imports
+		sed -i \
+			-e $( printf '/%s/,/)/d;' ${mxxx[@]} ) \
+			youtube_dl/extractor/extractors.py \
+			|| die
+
+		sed -i \
+			-e $( printf '/%s/d;' ${mxxx[@]} ) \
+			youtube_dl/extractor/generic.py \
+			|| die
+
+		rm \
+			$( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
+			$( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \
+			test/test_age_restriction.py \
+			|| die
+	fi
+
+	eapply_user
+
+	distutils-r1_python_prepare_all
+}
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+python_test() {
+	emake test
+}
+
+python_install_all() {
+	dodoc README.txt
+	doman ${PN}.1
+
+	newbashcomp ${PN}.bash-completion ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	newins youtube-dl.zsh _youtube-dl
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins youtube-dl.fish
+
+	distutils-r1_python_install_all
+
+	rm -r "${ED}"/usr/etc || die
+	rm -r "${ED}"/usr/share/doc/youtube_dl || die
+}
+
+pkg_postinst() {
+	elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /"
+	elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :"
+	elog
+	elog "${PN} works fine on its own on most sites. However, if you want"
+	elog "to convert video/audio, you'll need avconf (media-video/libav) or"
+	elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -"
+	elog "videos can be retrieved in a higher quality format without sound."
+	elog "${PN} will detect whether avconv/ffmpeg is present and"
+	elog "automatically pick the best option."
+
+	elog
+	elog "Videos or video formats streamed via RTMP protocol can only be"
+	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
+	elog "Downloading MMS and RTSP videos requires either mplayer"
+	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
+}
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index dcd1028e848f..f26ed35fcce4 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest
index 7b2dbcc899fc..9640d4a6ff0a 100644
--- a/net-p2p/amule/Manifest
+++ b/net-p2p/amule/Manifest
@@ -10,5 +10,5 @@ AUX amuleweb.confd 720 BLAKE2B 1bcb4349f34c8deef069d156da29ff3dcb642f9b5c15fbef7
 AUX amuleweb.initd 1149 BLAKE2B ef29bae12cf72764798eecb6866405525b601ee6ea869b6191954799805f47b75976884ee566ecb03eca907b3b13ff7870541b7682a70d5db058fb1257d6f00d SHA512 4cc944af90ad81f09d74d79dede57d1ff26c1b87649432d14ed294770b04f6ea256c25c194edfdc8f9d0c85929b1c576c31eba9228703e5a21259d83968289b0
 DIST aMule-2.3.2.tar.xz 3895300 BLAKE2B cf1bce3a0fcd0c108e369b7aed257f067a4ce3ce2fd4e8509b577ac58f8bc52fbc9aabc5c703bc9111dd06ac011ee1f3756279b093b69bcaada106226493237a SHA512 3064b086f8459b4372ea0c11f239a08167c7beac3dde26889f056f617b480b487bea10c2cae8fdfa1ae99c10fc9e715adc8e01e4b968389861aa47c3ec8c0016
 EBUILD amule-2.3.2-r1.ebuild 2264 BLAKE2B ffa5219b33d63414838be657972556be4122717478698053454e3a7da290a5f174e6730e52b3ff05305b7010821a0588ca2ab092d28c9e0daae19e83d0f6043a SHA512 defd04e15bc4d77fe48a78999dac8410228199029011bba8ecf295388354029bf43a1f17741696c65b36acc90dea0e4b5c47ebbcbab5111d4eb95a84949179fc
-EBUILD amule-2.3.2-r2.ebuild 2343 BLAKE2B d67d4114c16769c3df24d09669d856631bf8ea7bbd891cf2212232c0463333d909f3820dc5a7f0bff4ac6f7c31348c7e448b238785fe2d8630644fd818c7abb5 SHA512 71e12032180834d2ec7164744c3acd67a9040cb3b0acfc17437a1e5c5d2b96963454ca497fc7de84910718cff5107d342fb63c17274cf7bb4e97626926c5f0cf
+EBUILD amule-2.3.2-r2.ebuild 2339 BLAKE2B 16698d20edb786d3a1be426c65a89c53d3127dca0b6b0ce38adff0d37bf03ac2cb428f30935f75fd99ef62ba1f900a30c8e7eec3ae79a088885b74c26638dce7 SHA512 490dec5064d9e560626931616e4c9d9188f68815cc477df4ea39a4ff4a82af25f5ceea12a223c7b5188c8e661990a960534bffeca35ce97afb402713b5e1029c
 MISC metadata.xml 636 BLAKE2B 3384c1c34c9963570b17793188db257a5c0648390aaa8ca73f4bad50db8b54be9d0fe5d379b873fd0f21bf6ecaeaf5840ca65ad92c72a1449b25035f9b7ee3c3 SHA512 bd93ef13a5d116f81c8a6901e524032a85eab90589067e57e165f643f8f0a75047869801b4485fa47a0bc41008f3b8f1aff1aa8b413c83b4c27610ef6ea58d5f
diff --git a/net-p2p/amule/amule-2.3.2-r2.ebuild b/net-p2p/amule/amule-2.3.2-r2.ebuild
index ac7f657aa113..3fc08e6fc94c 100644
--- a/net-p2p/amule/amule-2.3.2-r2.ebuild
+++ b/net-p2p/amule/amule-2.3.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 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ppc ppc64 ~sparc x86"
 IUSE="daemon debug geoip nls remote stats upnp +X"
 
 COMMON_DEPEND="
diff --git a/net-p2p/bitcoin-cli/Manifest b/net-p2p/bitcoin-cli/Manifest
index 876c66652ca4..f6270e0018a0 100644
--- a/net-p2p/bitcoin-cli/Manifest
+++ b/net-p2p/bitcoin-cli/Manifest
@@ -1,10 +1,7 @@
 DIST bitcoin-0.15.1.knots20171111.patches.tar.xz 443024 BLAKE2B 5010c8d0f6a0bc8cd22ca7d7c73d9e4e689e369f0ba39b59f62fa6b6af3dcf938dfc87d33d3fe595a6e54d99734277a34af068dc29a6e984c76d529fbbe2f383 SHA512 455fadeac6ad57be111104680ec6939d6bf235eb49cde89b9716d36f6914c255b1b69cdea459d89b1bbca56099e793be0c8d7aacf592a9d78495068297bb5890
-DIST bitcoin-0.16.0.knots20180322.patches.tar.xz 417544 BLAKE2B f14616c81e0694346fd0714032be501ad0b58e82e2a5fcc623b1fdd316759ae7ac584e6c4ab586e8c9f5a402694a36eceac6b2f1c7441da655479f832a8869bd SHA512 9eca9cbae8ce17b38ddb70326760e33e7812db78e79cfe2d1a3518b34eb8fc87fe4c145e46ab60278b14e70a75b3af238342b4e1808a77cbca4b62b8c72fb1eb
 DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
 DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b7c531ed179f7e3e8b601a69a423fa736238a2caae890fd8850eb505533995e578e676860a4014922fbc238185ebb SHA512 a09b6cb64a1649d11e3fd6deeb13a07b1bf4bed504a2fc1c585919459ca8ac1af8e5ecc89dee487359e831a8f12625d54f408f95bb341033d6380b82c290c0d9
-DIST bitcoin-v0.16.0.tar.gz 6628305 BLAKE2B 69adb5832e2a708431c06bd8ce695f25cfc2b84e7ccf11e77f40c8ec273146208c70a900d0d32f79790cf67fb359c2731b0cecfc1f27ac2d0c4057228a83aed3 SHA512 7a59de44196a3cd5b75bccfe851e8bd7d5a00ae45b6e771e082326d75846e7c6d1f6d449e18b539b95b25aa12b7b79c462367f1c89438bcd1ca6ec84eb42972c
 DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
 EBUILD bitcoin-cli-0.15.1.ebuild 2444 BLAKE2B d669c80e3dae939a4b869743c26b45167c70770b5edebf640b10292a9fa9637e794aec41319ef50c593e12e153ee48fe89bd679b193aa352de69ed1937ea5cd8 SHA512 115f6fc08d571ef46a410236ea9cf6c26ccb4c2a45f5abee117d35e30ddf32f912714603e83b89c9735ea45dab2f2e346e445e2fe0ad127292289d56a3b968a0
-EBUILD bitcoin-cli-0.16.0.ebuild 2406 BLAKE2B 2714ba8a053856cfb567f5fd01e17db751760dc7da85f1d29ad4e93dbf5376c7d0ebc1cb6f2ec07aba755a2944d5f6c7fc66245a96fb1b0325454897292b9cbc SHA512 01514da32f5f7592fc203696137d527094cab593669799155d818d98fdc1ac9ac8d285b0e01121ab0acd8e2f976eb4ac9a2ebce02edee0fd7b0b8c6a4537fb6d
-EBUILD bitcoin-cli-0.16.3.ebuild 2402 BLAKE2B f1755fe152c63b5086c7c742e7939dbc168de31bc13f5988b921370f0b5955b05cf71161125f7ade0559e909f7944b71f8a2673cc06f6e1bd5d6b3f8d8e80c5d SHA512 fe284ace782528bed5e15b8647e49eb3d6afa191841f63bfdcdc79a733da24e73748da4e9aef1027cb30c392c79d38093ffc463bb73b3c3c60e400d8cd8e2d1c
+EBUILD bitcoin-cli-0.16.3.ebuild 2401 BLAKE2B 1f372febaea711cab1ba45ae3b9e29a55138d34b01235f3c6e375b67621b98086bf5b1982c305c50e050164238723e7e4550f686e86fcd80e35d734109d81b8c SHA512 e836b2ff0c3127febca2574bc09bc7e7e98171eafed08af54a8f5f19c9c87410acdb0be2341b8142f76d90ed450bf3ced1bfe57ecf106a77c865c2e72ce018d0
 MISC metadata.xml 620 BLAKE2B e779b6a929a58fad28773a0aba3ef3112df14ce82ce62376b88cbc3519a857faaac6b580d2b5d866b0ec809062cf170e3c29324b03acc005246aea3cef9a0381 SHA512 c253ed29dff90ef2b9cd19b191ad870bd22cbdd371b2f353e724ba950735350225fe6d83c4ca8823ebb395dde9fb5004e781ff78987e2a30c0281ad5e0a4623a
diff --git a/net-p2p/bitcoin-cli/bitcoin-cli-0.16.0.ebuild b/net-p2p/bitcoin-cli/bitcoin-cli-0.16.0.ebuild
deleted file mode 100644
index dca844f05621..000000000000
--- a/net-p2p/bitcoin-cli/bitcoin-cli-0.16.0.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
-
-inherit autotools bash-completion-r1
-
-BITCOINCORE_COMMITHASH="4b4d7eb255ca8f9a94b92479e6061d129c91a991"
-KNOTS_PV="${PV}.knots20180322"
-KNOTS_P="bitcoin-${KNOTS_PV}"
-
-DESCRIPTION="Command-line JSON-RPC client specifically for interfacing with bitcoind"
-HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
-SRC_URI="
-	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
-	https://bitcoinknots.org/files/0.16.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux"
-IUSE="knots libressl"
-
-DEPEND="
-	>=dev-libs/boost-1.52.0:=[threads(+)]
-	dev-libs/libevent:=
-	dev-libs/univalue:=
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( doc/bips.md doc/release-notes.md )
-
-S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
-
-pkg_pretend() {
-	if use knots; then
-		elog "You are building ${PN} from Bitcoin Knots."
-		elog "For more information, see:"
-		elog "https://bitcoinknots.org/files/0.16.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
-	else
-		elog "You are building ${PN} from Bitcoin Core."
-		elog "For more information, see:"
-		elog "https://bitcoincore.org/en/2017/11/11/release-${PV}/"
-	fi
-}
-
-src_prepare() {
-	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
-
-	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
-
-	if use knots; then
-		eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
-		eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
-		eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
-	fi
-
-	eapply_user
-
-	echo '#!/bin/true' >share/genbuild.sh || die
-	mkdir -p src/obj || die
-	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
-
-	eautoreconf
-	rm -r src/leveldb src/secp256k1 || die
-}
-
-src_configure() {
-	local my_econf=(
-		--disable-asm
-		--without-qtdbus
-		--with-libevent
-		--without-qrencode
-		--without-miniupnpc
-		--disable-tests
-		--disable-wallet
-		--disable-zmq
-		--enable-util-cli
-		--disable-util-tx
-		--disable-bench
-		--without-libs
-		--without-daemon
-		--without-gui
-		--disable-ccache
-		--disable-static
-		--with-system-univalue
-	)
-	econf "${my_econf[@]}"
-}
-
-src_install() {
-	default
-
-	newbashcomp contrib/bitcoin-cli.bash-completion ${PN}
-}
diff --git a/net-p2p/bitcoin-cli/bitcoin-cli-0.16.3.ebuild b/net-p2p/bitcoin-cli/bitcoin-cli-0.16.3.ebuild
index 7e22bc827352..77d9f8e1ff55 100644
--- a/net-p2p/bitcoin-cli/bitcoin-cli-0.16.3.ebuild
+++ b/net-p2p/bitcoin-cli/bitcoin-cli-0.16.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="knots libressl"
 
 DEPEND="
diff --git a/net-p2p/bitcoin-qt/Manifest b/net-p2p/bitcoin-qt/Manifest
index 904084ec7f53..06f87d56255d 100644
--- a/net-p2p/bitcoin-qt/Manifest
+++ b/net-p2p/bitcoin-qt/Manifest
@@ -1,14 +1,9 @@
 AUX bitcoin-qt-0.15.1-test-build-fix.patch 985 BLAKE2B 9e479dbd4bf8b518b9cf7b759edfb9a866cb8542d90d4bcbc72db99dd23eab695b0fec7c5e8eef617281d208d4c54c03bd3a2bb82ccc170b21f7e2cb73227f3e SHA512 ceb21e20b4356b6eab1c8ad927abef43878d77b27ce5cc83d86b9331c12d3d85c495a2bfc5269973ca0c573c11bd459a0e4fc99410216249e1c4b58be242776d
 AUX bitcoin-qt-0.15.1-test-util-fix.patch 532 BLAKE2B dca53c1f11da6862af7b04e03818b5d18e964278508b659467b21d128573a2a031033eefa68a77ba135fc53ae616e9203f39b9378086e957ccccff781ccd1660 SHA512 6895c05ac33da58db597b9fdf83bccade30fc2984893807789e70e23db3077ecc42360410290467d32f264bdcc0602409286ab24229a8adc93de143dc8e14a6f
-AUX bitcoin-qt-0.16.0-fix_memory_include.patch 310 BLAKE2B 4df06eee24f316412828f56ce535cbe867b5414b377a29878b41d095d939c6b43a5cada5d20c2e9f15f6a0fdd6cde36a0a0e3b9afa74be1e6e95ee8bd4b87820 SHA512 77b292f17332aea0443dc7104d2b6a679170c82fa320f3b5a5f2e98d7bb1cf3d3e4ad6a672f39a7a7edc1bb22a6795e6fe4fe78292e9cb892a07038d7e5c477c
-AUX bitcoin-qt-0.16.0-fix_mempoolstats.patch 1672 BLAKE2B 252efa28461f2367044da6e2a46e2273857022da8a73af654ab6b7acd02fd90051290190d3c3de1ce283a930beac64cf15847f2cc8c2b79f3d3ace61b7181bc4 SHA512 b1143d45e8de2d4a1de572bca758b01889bd14140d475de1cdf8224cdb1962dd3c418e504879a0ba81abd5e4e673131646c72ff54e1cf5972d9cc1dafac52b7f
 DIST bitcoin-0.15.1.knots20171111.patches.tar.xz 443024 BLAKE2B 5010c8d0f6a0bc8cd22ca7d7c73d9e4e689e369f0ba39b59f62fa6b6af3dcf938dfc87d33d3fe595a6e54d99734277a34af068dc29a6e984c76d529fbbe2f383 SHA512 455fadeac6ad57be111104680ec6939d6bf235eb49cde89b9716d36f6914c255b1b69cdea459d89b1bbca56099e793be0c8d7aacf592a9d78495068297bb5890
-DIST bitcoin-0.16.0.knots20180322.patches.tar.xz 417544 BLAKE2B f14616c81e0694346fd0714032be501ad0b58e82e2a5fcc623b1fdd316759ae7ac584e6c4ab586e8c9f5a402694a36eceac6b2f1c7441da655479f832a8869bd SHA512 9eca9cbae8ce17b38ddb70326760e33e7812db78e79cfe2d1a3518b34eb8fc87fe4c145e46ab60278b14e70a75b3af238342b4e1808a77cbca4b62b8c72fb1eb
 DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
 DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b7c531ed179f7e3e8b601a69a423fa736238a2caae890fd8850eb505533995e578e676860a4014922fbc238185ebb SHA512 a09b6cb64a1649d11e3fd6deeb13a07b1bf4bed504a2fc1c585919459ca8ac1af8e5ecc89dee487359e831a8f12625d54f408f95bb341033d6380b82c290c0d9
-DIST bitcoin-v0.16.0.tar.gz 6628305 BLAKE2B 69adb5832e2a708431c06bd8ce695f25cfc2b84e7ccf11e77f40c8ec273146208c70a900d0d32f79790cf67fb359c2731b0cecfc1f27ac2d0c4057228a83aed3 SHA512 7a59de44196a3cd5b75bccfe851e8bd7d5a00ae45b6e771e082326d75846e7c6d1f6d449e18b539b95b25aa12b7b79c462367f1c89438bcd1ca6ec84eb42972c
 DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
 EBUILD bitcoin-qt-0.15.1.ebuild 7198 BLAKE2B ba06d49cb5eb176fef2d617029856b90adc534d236ae117b413e9dc75bfda39250f15c9d4e7b39b89eee305eb6d795e28d049e79936bb510b9b3777387a6eb39 SHA512 bdbb8b14bb79604111b574daf6682a6ec330ad4c3c6b33ab966da5e47d957f841a17e3b1533261e2d851d3b095e86e65eb9665ff7f372868151b1c5bd3110d66
-EBUILD bitcoin-qt-0.16.0-r1.ebuild 5182 BLAKE2B bf0dab729c8bbd7c79aa9b732b974afed7fd91413674cdb36071100ae8c701160f3c0326c403a0f7484cc284e4cb1c513a832c0e64328771f97c99f802e47dcc SHA512 327af32f1dd507c3f5c5464c1f6d63e3691b484409d1998e1d5ce7dae5cdd3677fcdd59780e1ea0226f8fea01e8d4a6fee77f6f956230933669aed9aa32afa8b
-EBUILD bitcoin-qt-0.16.3.ebuild 4873 BLAKE2B 1bf4ec2761650e97b8fae9174011d39c6da462a0680714809448dc39a83e5ab179d050c9778d41312cc929074b357ac3b89279c73ef7ed134b733aed02210424 SHA512 733abee4945af421fe31566cfc7f3dcd98275021c5fad1ce27cd79dcc2f943a916618dd1bcc354c05de008bb4cced86441e60801b7ccfd1d94a5951b642c3c2b
+EBUILD bitcoin-qt-0.16.3.ebuild 4872 BLAKE2B 2cade1bc6b69928e1d05b74e11e29f3c8a79bec23cf8036724d0d535f91ffba04f47f9735a614c32baff08e16e6e863427e61e5e66de9b4752f33e7920ea2ccc SHA512 3409277590f09004dfcb08841eaab154f067d91cba3d265f1ffcfc59237827e25581b38fb296d5db0e7bd4e996b7e8556190227e5af879c786c8131cb043ba3c
 MISC metadata.xml 1485 BLAKE2B e372351807fa1375c29e2fe88cd15e9aa85111069c8876ae1d806bcd509692fc4d173c37c94a8e5bf63d9d1f25b0ddb8895b2cad4e957c4cb11cd29fe837b8c7 SHA512 ebdf31d2908f1828a57b3728a86b65b1818d7ccee0d2725b3f049fb624cc32d72db48b53ce5f99c98cce7926a3e5840eae375227a5ec6ec6719f7c12ae858c20
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.16.0-r1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.16.0-r1.ebuild
deleted file mode 100644
index 07a5658ba4ba..000000000000
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.16.0-r1.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DB_VER="4.8"
-inherit autotools bash-completion-r1 db-use gnome2-utils xdg-utils
-
-BITCOINCORE_COMMITHASH="4b4d7eb255ca8f9a94b92479e6061d129c91a991"
-KNOTS_PV="${PV}.knots20180322"
-KNOTS_P="bitcoin-${KNOTS_PV}"
-
-DESCRIPTION="An end-user Qt GUI for the Bitcoin crypto-currency"
-HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
-SRC_URI="
-	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
-	https://bitcoinknots.org/files/0.16.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="+asm +bip70 +bitcoin_policy_rbf dbus kde +libevent knots libressl +qrcode test upnp +wallet zeromq"
-
-RDEPEND="
-	>=dev-libs/boost-1.52.0:=[threads(+)]
-	>=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery]
-	dev-libs/univalue:=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	virtual/bitcoin-leveldb
-	bip70? ( dev-libs/protobuf:= )
-	dbus? (
-		dev-qt/qtdbus:5
-	)
-	libevent? ( dev-libs/libevent:= )
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	qrcode? (
-		media-gfx/qrencode:=
-	)
-	upnp? ( >=net-libs/miniupnpc-1.9.20150916:= )
-	wallet? ( sys-libs/db:$(db_ver_to_slot "${DB_VER}")=[cxx] )
-	zeromq? ( net-libs/zeromq:= )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	knots? (
-		gnome-base/librsvg
-		media-gfx/imagemagick[png]
-	)
-"
-
-DOCS=( doc/bips.md doc/files.md doc/release-notes.md )
-
-S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
-
-pkg_pretend() {
-	if use knots; then
-		elog "You are building ${PN} from Bitcoin Knots."
-		elog "For more information, see:"
-		elog "https://bitcoinknots.org/files/0.16.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
-	else
-		elog "You are building ${PN} from Bitcoin Core."
-		elog "For more information, see:"
-		elog "https://bitcoincore.org/en/2017/11/11/release-${PV}/"
-	fi
-	if use bitcoin_policy_rbf; then
-		elog "Replace By Fee policy is enabled: Your node will preferentially mine and"
-		elog "relay transactions paying the highest fee, regardless of receive order."
-	else
-		elog "Replace By Fee policy is disabled: Your node will only accept the first"
-		elog "transaction seen consuming a conflicting input, regardless of fee"
-		elog "offered by later ones."
-	fi
-}
-
-src_prepare() {
-	sed -i 's/^\(complete -F _bitcoind \)bitcoind \(bitcoin-qt\)$/\1\2/' contrib/bitcoind.bash-completion || die
-
-	# Save the generic icon for later
-	cp src/qt/res/src/bitcoin.svg bitcoin128.svg || die
-
-	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
-
-	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
-
-	if use knots; then
-		eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
-		eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
-		eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
-		eapply "${FILESDIR}/${P}-fix_mempoolstats.patch"
-	fi
-
-	eapply "${FILESDIR}/${P}-fix_memory_include.patch"
-
-	eapply_user
-
-	if ! use bitcoin_policy_rbf; then
-		sed -i 's/\(DEFAULT_ENABLE_REPLACEMENT = \)true/\1false/' src/validation.h || die
-	fi
-
-	echo '#!/bin/true' >share/genbuild.sh || die
-	mkdir -p src/obj || die
-	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
-
-	if use knots; then
-		sed -i 's/^\(Icon=\).*$/\1bitcoinknots/' contrib/debian/bitcoin-qt.desktop || die
-	fi
-	sed -i 's/^\(Categories=.*\)$/\1P2P;Network;Qt;/' contrib/debian/bitcoin-qt.desktop || die
-
-	eautoreconf
-	rm -r src/leveldb src/secp256k1 || die
-}
-
-src_configure() {
-	local my_econf=(
-		$(use_enable asm)
-		$(use_enable bip70)
-		$(use_with dbus qtdbus)
-		$(use_with libevent)
-		$(use_with qrcode qrencode)
-		$(use_with upnp miniupnpc)
-		$(use_enable upnp upnp-default)
-		$(use_enable test tests)
-		$(use_enable wallet)
-		$(use_enable zeromq zmq)
-		--with-gui=qt5
-		--disable-util-cli
-		--disable-util-tx
-		--disable-bench
-		--without-libs
-		--without-daemon
-		--disable-ccache
-		--disable-static
-		--with-system-leveldb
-		--with-system-libsecp256k1
-		--with-system-univalue
-	)
-	econf "${my_econf[@]}"
-}
-
-src_install() {
-	default
-
-	rm -f "${ED%/}/usr/bin/test_bitcoin" || die
-
-	insinto /usr/share/icons/hicolor/scalable/apps/
-	doins bitcoin128.svg
-	if use knots; then
-		newins src/qt/res/src/bitcoin.svg bitcoinknots.svg
-	fi
-
-	insinto /usr/share/applications
-	newins "contrib/debian/bitcoin-qt.desktop" "org.bitcoin.bitcoin-qt.desktop"
-
-	use libevent && dodoc doc/REST-interface.md doc/tor.md
-
-	use zeromq && dodoc doc/zmq.md
-
-	newbashcomp contrib/bitcoind.bash-completion ${PN}
-
-	if use kde; then
-		insinto /usr/share/kservices5
-		doins contrib/debian/bitcoin-qt.protocol
-		dosym "../../kservices5/bitcoin-qt.protocol" "/usr/share/kde4/services/bitcoin-qt.protocol"
-	fi
-}
-
-update_caches() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	update_caches
-
-	if use libevent; then
-		elog "To have ${PN} automatically use Tor when it's running, be sure your"
-		elog "'torrc' config file has 'ControlPort' and 'CookieAuthentication' setup"
-		elog "correctly, and add your user to the 'tor' user group."
-	fi
-}
-
-pkg_postrm() {
-	update_caches
-}
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.16.3.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.16.3.ebuild
index cc2c9435803b..20571065eed0 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.16.3.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.16.3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
 
 IUSE="+asm +bip70 +bitcoin_policy_rbf dbus kde +libevent knots libressl +qrcode test upnp +wallet zeromq"
 
diff --git a/net-p2p/bitcoin-qt/files/bitcoin-qt-0.16.0-fix_memory_include.patch b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.16.0-fix_memory_include.patch
deleted file mode 100644
index 66b7d361ee5b..000000000000
--- a/net-p2p/bitcoin-qt/files/bitcoin-qt-0.16.0-fix_memory_include.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/qt/walletmodeltransaction.h b/src/qt/walletmodeltransaction.h
-index cd531dba4b..816b0c35af 100644
---- a/src/qt/walletmodeltransaction.h
-+++ b/src/qt/walletmodeltransaction.h
-@@ -7,6 +7,8 @@
- 
- #include <qt/walletmodel.h>
- 
-+#include <memory>
-+
- #include <QObject>
- 
- class SendCoinsRecipient;
diff --git a/net-p2p/bitcoin-qt/files/bitcoin-qt-0.16.0-fix_mempoolstats.patch b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.16.0-fix_mempoolstats.patch
deleted file mode 100644
index 95219c67982b..000000000000
--- a/net-p2p/bitcoin-qt/files/bitcoin-qt-0.16.0-fix_mempoolstats.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 450ac607a3568f8c991df1681155de6fa7f5a5cb Mon Sep 17 00:00:00 2001
-From: Luke Dashjr <luke-jr+git@utopios.org>
-Date: Fri, 23 Mar 2018 20:30:11 +0000
-Subject: [PATCH] Bugfix: GUI/MempoolStats: Avoid dereferencing NULL
-
----
- src/qt/mempoolstats.cpp | 12 ++++--------
- 1 file changed, 4 insertions(+), 8 deletions(-)
-
-diff --git a/src/qt/mempoolstats.cpp b/src/qt/mempoolstats.cpp
-index ebc72e95d0..50a3ef71ab 100644
---- a/src/qt/mempoolstats.cpp
-+++ b/src/qt/mempoolstats.cpp
-@@ -79,13 +79,9 @@ void MempoolStats::setClientModel(ClientModel *model)
- 
- void MempoolStats::drawChart()
- {
--    if (!isVisible())
-+    if (!(isVisible() && clientModel))
-         return;
- 
--    const bool drawTxCount = cbShowNumTxns->isChecked();
--    const bool drawMinFee = cbShowMinFeerate->isChecked();
--    const bool drawDynMemUsage = cbShowMemUsage->isChecked();
--
-     if (!titleItem)
-     {
-         // create labels (only once)
-@@ -349,11 +345,11 @@ void MempoolStats::drawChart()
-     QPen linePenRed(QColor(188,49,62, 250), 2, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
-     QPen linePenGreen(QColor(49,188,62, 250), 2, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
- 
--    if (drawTxCount)
-+    if (cbShowNumTxns->isChecked())
-         redrawItems.append(scene->addPath(txCountPath, linePenRed));
--    if (drawMinFee)
-+    if (cbShowMinFeerate->isChecked())
-         redrawItems.append(scene->addPath(minFeePath, linePenGreen));
--    if (drawDynMemUsage)
-+    if (cbShowMemUsage->isChecked())
-     {
-         redrawItems.append(scene->addPath(dynMemUsagePath, linePenBlue));
-         redrawItems.append(scene->addPath(dynMemUsagePathFill, QPen(Qt::NoPen), graBru));
--- 
-2.16.1
-
diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest
index 81f45a6f0576..9736b787f3b8 100644
--- a/net-p2p/bitcoind/Manifest
+++ b/net-p2p/bitcoind/Manifest
@@ -5,12 +5,9 @@ AUX bitcoind-0.15.1-test-util-fix.patch 532 BLAKE2B dca53c1f11da6862af7b04e03818
 AUX bitcoind.logrotate-r1 121 BLAKE2B 815316d97eaf71f1fe94673a58a91eaee3020fac39d5d6b84cc72afe5c22d48cb80ed561f9c6b43b6f85bd6f269f37fdd4fc1e4e96688f7a8ae25023ac560cea SHA512 a4783a310ea6b77f607bcc45d86d25ffd72794983bd1854b77eb057e86377e067f666ca38073c8efcb06256e1202918c77c8e09382cd8462832dee769017dde1
 AUX bitcoind.service-r1 719 BLAKE2B 69a97909ccd6e1cef79f9c9835d8f9b63451d3bcc9ac9136f4a4695976b00ec71559b73811a027046e26373da506125b94439c031ca6cfcccd268b3217c7ac17 SHA512 43f0224d2a60f19b62f1b805be73efe91882339ed02267f8852d4154ddd634beefef6130101d92fc771c56477daf6aedab0bd751ee614bc8b9bf3a042697d76f
 DIST bitcoin-0.15.1.knots20171111.patches.tar.xz 443024 BLAKE2B 5010c8d0f6a0bc8cd22ca7d7c73d9e4e689e369f0ba39b59f62fa6b6af3dcf938dfc87d33d3fe595a6e54d99734277a34af068dc29a6e984c76d529fbbe2f383 SHA512 455fadeac6ad57be111104680ec6939d6bf235eb49cde89b9716d36f6914c255b1b69cdea459d89b1bbca56099e793be0c8d7aacf592a9d78495068297bb5890
-DIST bitcoin-0.16.0.knots20180322.patches.tar.xz 417544 BLAKE2B f14616c81e0694346fd0714032be501ad0b58e82e2a5fcc623b1fdd316759ae7ac584e6c4ab586e8c9f5a402694a36eceac6b2f1c7441da655479f832a8869bd SHA512 9eca9cbae8ce17b38ddb70326760e33e7812db78e79cfe2d1a3518b34eb8fc87fe4c145e46ab60278b14e70a75b3af238342b4e1808a77cbca4b62b8c72fb1eb
 DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
 DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b7c531ed179f7e3e8b601a69a423fa736238a2caae890fd8850eb505533995e578e676860a4014922fbc238185ebb SHA512 a09b6cb64a1649d11e3fd6deeb13a07b1bf4bed504a2fc1c585919459ca8ac1af8e5ecc89dee487359e831a8f12625d54f408f95bb341033d6380b82c290c0d9
-DIST bitcoin-v0.16.0.tar.gz 6628305 BLAKE2B 69adb5832e2a708431c06bd8ce695f25cfc2b84e7ccf11e77f40c8ec273146208c70a900d0d32f79790cf67fb359c2731b0cecfc1f27ac2d0c4057228a83aed3 SHA512 7a59de44196a3cd5b75bccfe851e8bd7d5a00ae45b6e771e082326d75846e7c6d1f6d449e18b539b95b25aa12b7b79c462367f1c89438bcd1ca6ec84eb42972c
 DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
 EBUILD bitcoind-0.15.1.ebuild 5035 BLAKE2B c23995b5457256b33cbd726c8e7d5d840212ecac7450409d31e38bdc9589f3172c668ec4105d22435998c6118d0f85170f9cc133ccfa25bc1690b1417eb5aa4f SHA512 0d311093f9ff11ab9d795e7b6fc12ef477ff46964b4d94259f882da7fbcfab3a7252b0dc9bacda09fea96ebd5cca58b470464e8a220f66d511d8bc3ca224953b
-EBUILD bitcoind-0.16.0.ebuild 4852 BLAKE2B 56480326d77fee37121a4cb9124d09a08cbf913c51529f09c3426f99f62f814b6143cb64264ab2e85bda5206e5dcb304e4691bd9321d7d7b33094a7d2b07c620 SHA512 a0ed87cdb9e9dc49b2471037546295144e0afb95dce1ae9208a70a2f9a2f1b5665e2e655503ebe0da91a8b76888c28e09fe5c0ad7d1f6141ff77b4287f9f432b
-EBUILD bitcoind-0.16.3.ebuild 4846 BLAKE2B a9fd968880e9429b898742da39abc28e0489a779e5eb99db9f65933f6f4f4093aee19b879dfd31f7b3316ef8abb529995d33a324ec6b439da54651c218635c72 SHA512 fc98a5008e3f2a11138a585a3735f465f14e16727f6c52ef29e1e9e16a21c2ee5c89562d503f16bbabbd8a9fb06f1b216785b200cc588943ba2809a0a86de984
+EBUILD bitcoind-0.16.3.ebuild 4845 BLAKE2B 6e974ad55e23ad07c81f03c841768be8df2967d18aab6cac73264c7ed812604aa5372bd7b06d97e7a40415cbcd346ddcb4181ae1d7224cdf4bf1092f781da7f5 SHA512 213152b613a69dadafc4d93e8eeb295cf652eed8eb058dfe7b6aaf84fe4e81623d75e29272c610ee335de8f520516a31b3e3042e44ccf9034aaae07a7c4819e1
 MISC metadata.xml 1033 BLAKE2B e79ed83740379df868320d024cf761995aac60ad9fcb451b137910814ce5b7964c8231853819c2b2ed95890f75c8ef18aee455eedd79543d8c44b2199124f0d0 SHA512 4e530a735d38119cc26b8fa31c2d4a117555004e79fad00f105f581ae6ba20d00d59d54f155c6e3f8c2bbe36aae745ff6e79a66187dac1975ec399e329d9a919
diff --git a/net-p2p/bitcoind/bitcoind-0.16.0.ebuild b/net-p2p/bitcoind/bitcoind-0.16.0.ebuild
deleted file mode 100644
index 299419adc9fb..000000000000
--- a/net-p2p/bitcoind/bitcoind-0.16.0.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
-
-DB_VER="4.8"
-inherit autotools bash-completion-r1 db-use systemd user
-
-BITCOINCORE_COMMITHASH="4b4d7eb255ca8f9a94b92479e6061d129c91a991"
-KNOTS_PV="${PV}.knots20180322"
-KNOTS_P="bitcoin-${KNOTS_PV}"
-
-DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
-HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
-SRC_URI="
-	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
-	https://bitcoinknots.org/files/0.16.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux"
-IUSE="+asm +bitcoin_policy_rbf examples knots libressl test upnp +wallet zeromq"
-
-DEPEND="
-	>=dev-libs/boost-1.52.0:=[threads(+)]
-	dev-libs/libevent:=
-	>=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery]
-	dev-libs/univalue:=
-	virtual/bitcoin-leveldb
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	upnp? ( >=net-libs/miniupnpc-1.9.20150916:= )
-	wallet? ( sys-libs/db:$(db_ver_to_slot "${DB_VER}")=[cxx] )
-	zeromq? ( net-libs/zeromq:= )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( doc/bips.md doc/files.md doc/reduce-traffic.md doc/release-notes.md doc/REST-interface.md doc/tor.md )
-
-S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
-
-pkg_pretend() {
-	if use knots; then
-		elog "You are building ${PN} from Bitcoin Knots."
-		elog "For more information, see:"
-		elog "https://bitcoinknots.org/files/0.16.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
-	else
-		elog "You are building ${PN} from Bitcoin Core."
-		elog "For more information, see:"
-		elog "https://bitcoincore.org/en/2017/11/11/release-${PV}/"
-	fi
-	if use bitcoin_policy_rbf; then
-		elog "Replace By Fee policy is enabled: Your node will preferentially mine and"
-		elog "relay transactions paying the highest fee, regardless of receive order."
-	else
-		elog "Replace By Fee policy is disabled: Your node will only accept the first"
-		elog "transaction seen consuming a conflicting input, regardless of fee"
-		elog "offered by later ones."
-	fi
-}
-
-pkg_setup() {
-	enewgroup bitcoin
-	enewuser bitcoin -1 -1 /var/lib/bitcoin bitcoin
-}
-
-src_prepare() {
-	sed -i 's/^\(complete -F _bitcoind bitcoind\) bitcoin-qt$/\1/' contrib/${PN}.bash-completion || die
-
-	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
-
-	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
-
-	if use knots; then
-		eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
-		eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
-		eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
-	fi
-
-	eapply_user
-
-	if ! use bitcoin_policy_rbf; then
-		sed -i 's/\(DEFAULT_ENABLE_REPLACEMENT = \)true/\1false/' src/validation.h || die
-	fi
-
-	echo '#!/bin/true' >share/genbuild.sh || die
-	mkdir -p src/obj || die
-	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
-
-	eautoreconf
-	rm -r src/leveldb src/secp256k1 || die
-}
-
-src_configure() {
-	local my_econf=(
-		$(use_enable asm)
-		--without-qtdbus
-		--with-libevent
-		--without-qrencode
-		$(use_with upnp miniupnpc)
-		$(use_enable upnp upnp-default)
-		$(use_enable test tests)
-		$(use_enable wallet)
-		$(use_enable zeromq zmq)
-		--with-daemon
-		--disable-util-cli
-		--disable-util-tx
-		--disable-bench
-		--without-libs
-		--without-gui
-		--disable-ccache
-		--disable-static
-		--with-system-leveldb
-		--with-system-libsecp256k1
-		--with-system-univalue
-	)
-	econf "${my_econf[@]}"
-}
-
-src_install() {
-	default
-
-	rm -f "${ED%/}/usr/bin/test_bitcoin" || die
-
-	insinto /etc/bitcoin
-	newins "${FILESDIR}/bitcoin.conf" bitcoin.conf
-	fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf
-	fperms 600 /etc/bitcoin/bitcoin.conf
-
-	newconfd "contrib/init/bitcoind.openrcconf" ${PN}
-	newinitd "contrib/init/bitcoind.openrc" ${PN}
-	systemd_newunit "${FILESDIR}/bitcoind.service-r1" "bitcoind.service"
-
-	keepdir /var/lib/bitcoin/.bitcoin
-	fperms 700 /var/lib/bitcoin
-	fowners bitcoin:bitcoin /var/lib/bitcoin/
-	fowners bitcoin:bitcoin /var/lib/bitcoin/.bitcoin
-	dosym ../../../../etc/bitcoin/bitcoin.conf /var/lib/bitcoin/.bitcoin/bitcoin.conf
-
-	doman "${FILESDIR}/bitcoin.conf.5"
-
-	use zeromq && dodoc doc/zmq.md
-
-	newbashcomp contrib/${PN}.bash-completion ${PN}
-
-	if use examples; then
-		docinto examples
-		dodoc -r contrib/{linearize,qos,tidy_datadir.sh}
-		use zeromq && dodoc -r contrib/zmq
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind
-}
-
-pkg_postinst() {
-	elog "To have ${PN} automatically use Tor when it's running, be sure your"
-	elog "'torrc' config file has 'ControlPort' and 'CookieAuthentication' setup"
-	elog "correctly, and:"
-	elog "- Using an init script: add the 'bitcoin' user to the 'tor' user group."
-	elog "- Running bitcoind directly: add that user to the 'tor' user group."
-}
diff --git a/net-p2p/bitcoind/bitcoind-0.16.3.ebuild b/net-p2p/bitcoind/bitcoind-0.16.3.ebuild
index 669acb449ca9..2d55b6d0cf6c 100644
--- a/net-p2p/bitcoind/bitcoind-0.16.3.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.16.3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="+asm +bitcoin_policy_rbf examples knots libressl test upnp +wallet zeromq"
 
 DEPEND="
diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 854e23d29187..80185d1da7e2 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -8,8 +8,10 @@ DIST syncthing-0.14.38.tar.gz 8246629 BLAKE2B 93c01750fedd57cc07bffa14fe65d98fc1
 DIST syncthing-0.14.46.tar.gz 10200015 BLAKE2B 679b82af8ee5dad769ef01b77d0d3545d953ec2f2889faa129c433863094f431bf3e44a633109d944cbcaba6486a8b51257557eddfc20a2fb3f0cd8a77861b96 SHA512 ebf8491d1ac1dda90df35b8a9dafb808a9171d4a8083f0f24ac1c9b3aa8d2baac6cef61c5cd897a88c3fb93b114d79a31a341168859f091ed2cdef529321178c
 DIST syncthing-0.14.47.tar.gz 10278343 BLAKE2B 8aace6ae059af3317a4f1aabfc06ff21140168428fa5a808dbb3aacbb27fdbfbe56ff910124b5b4c5b54637d444178ddc31492a59ec0bbd7fa4012a2e59ce997 SHA512 16718528fd4c618ea0e0eab1971405870d72ac60d391c27a06313a6ce9b9d023301eac052cfc00aab51e2b1f7c65800becfb822c5bca2d467fcb267b77ba55a9
 DIST syncthing-0.14.49.tar.gz 10952008 BLAKE2B a5c5b59720585a6a444d4c0a25c22639263330c1a1987471149773b257a3a0975428c3d63885f567fefbeb7cdf690f0a7ac3296448a2ca070d8ce53e3d657879 SHA512 7a9974e0d45582c5f184165456ea8fcaca0f7ba07a01b9f8eb2de1e1f0410ca36dc978ddde9c725a2b9d08bae8286fc2ce67595a0e510cbfe22fde9cdd9fc694
+DIST syncthing-0.14.51.tar.gz 10970620 BLAKE2B ba41debaddf217069b47901d0c43f163ff0ae3ca4aadb8689401195cfc9f11a3ed641d2d96a590821adac62d12d0ff83df26a4a336ca09476d755b8230a63c87 SHA512 d670b1df341c8da95d38170e03b40deb19dfcdf0c0df9b4630c74b4fcc979bd9a863c0ca0510e28739bac14b1aad51ce40abe695765186acad78ea0d7eb3a20c
 EBUILD syncthing-0.14.38.ebuild 3604 BLAKE2B 60ab7ee9417858f5732a894a19786e66aa875d68d2ae699dba844f0efd8c0db9addd91f88b21c3e54930fc55a14d3545ea65af1c2ed43b26fa1158bfe918f6a8 SHA512 7188b18639c97775e1aad68f8a8aa1e41e95e10855f491bee61aa5898599b34d7cc0c23ea7c585d2a30dcbf1e4f16a7b08b9a5f1fa55064b6e36bb7f35cb73be
 EBUILD syncthing-0.14.46.ebuild 3607 BLAKE2B 505dd788fd96503f0952acf33ae38d1343e781573bb987110bc5ec16112b4c6735ff132e72b67123d970b843448f4498853e3e8362d7530049efa51b6888ba35 SHA512 bf28b811f3e126914f60ea9632449fee4db627db7a7054d80d949d47732a1981015bd40c46a198d3904cf5003e463acac6ebc697b6af3d9691aec67f9e6842b7
 EBUILD syncthing-0.14.47.ebuild 3607 BLAKE2B 505dd788fd96503f0952acf33ae38d1343e781573bb987110bc5ec16112b4c6735ff132e72b67123d970b843448f4498853e3e8362d7530049efa51b6888ba35 SHA512 bf28b811f3e126914f60ea9632449fee4db627db7a7054d80d949d47732a1981015bd40c46a198d3904cf5003e463acac6ebc697b6af3d9691aec67f9e6842b7
 EBUILD syncthing-0.14.49.ebuild 3607 BLAKE2B 505dd788fd96503f0952acf33ae38d1343e781573bb987110bc5ec16112b4c6735ff132e72b67123d970b843448f4498853e3e8362d7530049efa51b6888ba35 SHA512 bf28b811f3e126914f60ea9632449fee4db627db7a7054d80d949d47732a1981015bd40c46a198d3904cf5003e463acac6ebc697b6af3d9691aec67f9e6842b7
+EBUILD syncthing-0.14.51.ebuild 3525 BLAKE2B 9a8bff37b22ba1fa7f90b457f3ddbae39252f188b52bb91d2ecafb8208be83af8e1ffc88e250180793e8126520c9e187602037374d0d76b02a5d9edab8be04dc SHA512 354fd1e41dc6ebd675d162f64ba3054f3ed1eca71343bec1f3ec23e80b1f575b3188d6e5bd574fd14e9a92ecbbbbc70c4c4deca791ad89a1122ccaa434c0ac3e
 MISC metadata.xml 869 BLAKE2B e59a433fd94dda05e06eca9017cf4f35aa4d9897adcc76d5dc503d5ae90e90bf5c23b859c4b7abe9af86cd7f327dad99a7a1a095015330a105debeb1a428052c SHA512 f58ce3a33241a316a81ba94318cd8fa1ea8a9954cd3721ae6f78f96df08b38a6ee5ea214483dc92aa4301a2252bc712a65c196da4c871962d76d17d5ba2b7238
diff --git a/net-p2p/syncthing/syncthing-0.14.51.ebuild b/net-p2p/syncthing/syncthing-0.14.51.ebuild
new file mode 100644
index 000000000000..ada15a2f82f9
--- /dev/null
+++ b/net-p2p/syncthing/syncthing-0.14.51.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/${PN}/${PN}"
+
+inherit golang-vcs-snapshot systemd user eapi7-ver
+
+DESCRIPTION="Open Source Continuous File Synchronization"
+HOMEPAGE="https://syncthing.net"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="selinux tools"
+
+RDEPEND="selinux? ( sec-policy/selinux-syncthing )"
+
+DOCS=( README.md AUTHORS CONTRIBUTING.md )
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+
+	if use tools ; then
+		# separate user for the relay server
+		enewgroup strelaysrv
+		enewuser strelaysrv -1 -1 /var/lib/strelaysrv strelaysrv
+		# and his home folder
+		keepdir /var/lib/strelaysrv
+		fowners strelaysrv:strelaysrv /var/lib/strelaysrv
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i \
+		's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/strelaysrv|' \
+		src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \
+		|| die
+}
+
+src_compile() {
+	export GOPATH="${S}:$(get_golibdir_gopath)"
+	cd src/${EGO_PN} || die
+	go run build.go -version "v${PV}" -no-upgrade install \
+		$(usex tools "all" "") || die "build failed"
+}
+
+src_test() {
+	cd src/${EGO_PN} || die
+	go run build.go test || die "test failed"
+}
+
+src_install() {
+	pushd src/${EGO_PN} >& /dev/null || die
+	doman man/*.[157]
+	einstalldocs
+
+	dobin bin/syncthing
+	if use tools ; then
+		exeinto /usr/libexec/syncthing
+		local exe
+		for exe in bin/* ; do
+			[[ "${exe}" == "bin/syncthing" ]] || doexe "${exe}"
+		done
+	fi
+	popd >& /dev/null || die
+
+	# openrc and systemd service files
+	systemd_dounit src/${EGO_PN}/etc/linux-systemd/system/${PN}{@,-resume}.service
+	systemd_douserunit src/${EGO_PN}/etc/linux-systemd/user/${PN}.service
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+
+	keepdir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	if use tools ; then
+		# openrc and systemd service files
+		systemd_dounit src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service
+		newconfd "${FILESDIR}/strelaysrv.confd" strelaysrv
+		newinitd "${FILESDIR}/strelaysrv.initd" strelaysrv
+
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/strelaysrv.logrotate" strelaysrv
+	fi
+}
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if [[ $(ver_cut 2) -gt \
+				$(ver_cut 2 ${v}) ]]; then
+			ewarn "Version ${PV} is not protocol-compatible with version" \
+				"0.$(($(ver_cut 2) - 1)).x or lower."
+			ewarn "Make sure all your devices are running at least version" \
+				"0.$(ver_cut 2).0."
+		fi
+		ewarn "Syncthing OpenRC init script now uses the upstream default of"
+		ewarn ""
+		ewarn "  /var/lib/${PN}/.config/${PN}"
+		ewarn ""
+		ewarn "as its configuration directory. Please set SYNCTHING_HOMEDIR"
+		ewarn "to /var/lib/${PN} in /etc/conf.d/${PN} if you wish to continue"
+		ewarn "using the old Gentoo default. Systemd users are not affected."
+	done
+
+	# check if user syncthing-relaysrv exists
+	# if yes, warn that it has been moved to strelaysrv
+	if [[ -n "$(egetent passwd syncthing-relaysrv 2>/dev/null)" ]]; then
+		ewarn
+		ewarn "The user and group for the relay server have been changed"
+		ewarn "from syncthing-relaysrv to strelaysrv"
+		ewarn "The old user and group are not deleted automatically. Delete them by running:"
+		ewarn "    userdel -r syncthing-relaysrv"
+		ewarn "    groupdel syncthing-relaysrv"
+	fi
+}
diff --git a/net-p2p/vuze-coreplugins/Manifest b/net-p2p/vuze-coreplugins/Manifest
index 4c5727dd7fdc..af025e0d1a49 100644
--- a/net-p2p/vuze-coreplugins/Manifest
+++ b/net-p2p/vuze-coreplugins/Manifest
@@ -7,5 +7,5 @@ DIST azupdater_1.9.2.zip 26390 BLAKE2B 9c146beee646cd4a31a1014286d4a2bdbe791b584
 DIST azupnpav_0.4.6.zip 247837 BLAKE2B 1c4060515b963bc1edab9a8f5195232aec268eabc67830c94ace69868726e89ff697647c1f00056cb551c53b517c672990dcb7693f025f8f4a6c6cf77dde0b4c SHA512 eee392cf82aae37b2689ce086fb00727728064552ca31bbf228d3d76407c15f92d30527b979dfc555dbf3a1ead65d991c55d8c517c0f5c93d5a3890b88bfa6b1
 DIST azupnpav_0.5.6.zip 264588 BLAKE2B dafaaa89dc9978e06e40bb56e4a76523c2c5e66f0e01beaa0af1b216f2f23348850c93d2f4e85ee2c9458b3d932dc44598a1d72f9c0149964e0533b30395dc59 SHA512 f780e708db51eb4e02ee1dedd445aa72f8a52dc6711d473b93339a2db9492654f93d44cde8456bb7db457b3bca88e15132ce0bc5221247ccb34672ae58bca172
 EBUILD vuze-coreplugins-4.8.1.2.ebuild 1978 BLAKE2B dc7a4e6e4032b9bdc95a25e57b5013dc71c8f2c6bd3f13d8e111d096821cba74d4ebccc5a9f3e9a6cc60ecd974732168a8df033ea84047b56c0287ff58582ada SHA512 e3190df7d088dc28a7c935249596798f3a519920f3adea77827bffab9755d6b71569a93d27356faaf8abdf7190c646f7b5983d5c23b57abaea589204e86f552d
-EBUILD vuze-coreplugins-5.7.2.0.ebuild 1471 BLAKE2B 0d5ae98876e78507846ca0bfbfe02a6efad793951fc74675a6d9cdf5b54c3c470a67cdf3762380a706c60b07299a177162c49697ac8befadffdd47570ff48863 SHA512 0d5617f1370d5621f517e8398b8e60cbe40164570b6a9b20dcdb57a93c855039a392d9cd428c34061f2d6d727dd5e671a264e2b9642ddc184df1198e3da079c2
+EBUILD vuze-coreplugins-5.7.2.0.ebuild 1467 BLAKE2B c583f2ab339ad8048ac3684bb42c3671a103733d776fb58ecfc4e583538bc9a37b61610b248605df7a8d467f112a021a351f557f75b2b535804e814df8ebfc51 SHA512 c2db8fb998f28b14365eb7fead8033f56a309e8135378de67ecd1fd8b0f348f9215f005cf917e5923a97271f1990289f2ce812c765169333ebf32be8cb96370f
 MISC metadata.xml 313 BLAKE2B fc77cc23994c00f76b282bfb170062f085fb1c83ced23e4a38d141acb5e2c4d259988541a0538de48dfe7e943132d4446467df8745b1e171ecdf3ece1f2e0eff SHA512 f77617dfe493bf5cc08c1db751bb8eed8275938f57c9fbe19584adf19bdaa4481c9bf3ece012859641f0e811ae2ce4ce058899a6c3075defc738c25e21b300d1
diff --git a/net-p2p/vuze-coreplugins/vuze-coreplugins-5.7.2.0.ebuild b/net-p2p/vuze-coreplugins/vuze-coreplugins-5.7.2.0.ebuild
index 3d6868c12b7d..dfc1e48678c4 100644
--- a/net-p2p/vuze-coreplugins/vuze-coreplugins-5.7.2.0.ebuild
+++ b/net-p2p/vuze-coreplugins/vuze-coreplugins-5.7.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="5"
@@ -26,7 +26,7 @@ SRC_URI="
 LICENSE="GPL-2 BSD"
 
 SLOT="0"
-KEYWORDS="amd64 ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 RDEPEND="~net-p2p/vuze-${PV}"
diff --git a/net-p2p/vuze/Manifest b/net-p2p/vuze/Manifest
index 39ff84d91530..ef0a16e0d92f 100644
--- a/net-p2p/vuze/Manifest
+++ b/net-p2p/vuze/Manifest
@@ -14,6 +14,6 @@ DIST Vuze_4812_source.zip 9530217 BLAKE2B af55951a9d8b86a03483e6e9ebc6f63cd7a730
 DIST Vuze_5720_source.zip 10709515 BLAKE2B e2824c3486cbf942ba644563cf8a0b47d99f42cdba6c0fe2d93e47c5717f1331df632a4a100b6679f3f456697f70837202e84bf2fa89c362186353af98a36173 SHA512 073af0c68219884aaf1b860fcc04cf75edaf662f1e82fe6c49f615b928b00d1a50d25f348c6bf5a922fa1c5a53c7bce5f75b7a0c065602675bcb6d80c1c92edf
 DIST vuze-4.5.0.2-gentoo-patches.tar.bz2 3143 BLAKE2B 4acaf56539798102e498c2678c8f3239ecc141909738dd1a84fca5cb38516fb363da6ff87d65b08fe04b550d8aafc9f33fa2d404b70f5e34a3129a43080794b5 SHA512 aacaeb404d9b7dbb40d89b04f9ad26caf447202b1fcb63d532f5e01dc611152adbc38804563f1a35227a080b2eadec0e2e42d0baa163d1d5489eec65cd28f83d
 EBUILD vuze-4.8.1.2-r1.ebuild 4000 BLAKE2B 5ce11619ce22b732bd1f7c0f38c5d48f72cce4bce2092ccc93bc261b6888b40d24cf0bd1e2a120549c2adddd9576226faa9049105a0b81df188eb49f3d094593 SHA512 bffeac4eaab07b89d9e80cdfa3483cd0d3027f4fc53d5e70177c6e07cecc06f64a606fc8daf06fa2dfbeba84e96fc4ecbd82666203bc939347e021e0931da706
-EBUILD vuze-5.7.2.0-r1.ebuild 4257 BLAKE2B f14281f700b2d17703e5208b1bcf205f7b64845255d18e71712743d1b372e1cb8d12739f1aee43be1a4ac6fe4819633219e8157a8bd8341c379dfa65b339c775 SHA512 59c1127fe0a2f30ea62441f4350870b519ad24fc66c60354e66d92850cb7b1093f7033126a45dc19f73f59dc89024af6c1b9c181328cff92ee307188a8b2c5d9
+EBUILD vuze-5.7.2.0-r1.ebuild 4253 BLAKE2B c857b5ff4dc750b3d2790c919f24b38d49ca7272dad17c80b789f6aa2fb8978dbe2e525131cedbb829525c51843efcf74ae04067258c6891687af5c8a844bfc9 SHA512 2b5299478c69ac75e28d47c35d0e3ca7a3064fd168a53a78e11545baa674940e62ae11b62bc46883b1561184da5b3e81002bb4a9309e38579d2a5ed1c63bc6dd
 EBUILD vuze-5.7.2.0.ebuild 4193 BLAKE2B c1845f9c926717ea470ab39122771498a1d49d0cd9bc5fe406f8c9aa20f99a1b02489c4ef490855743646c184b819c4a767e4fc2b0912caac99cb337f18d5054 SHA512 57542781decd415deaf345fc00977d9502def7faac9685273b2d9df8e55a3233f15efc861183ac85af2bf9d9febad5c99bcac3137d6cf15f96c1083b0cd5044c
 MISC metadata.xml 313 BLAKE2B fc77cc23994c00f76b282bfb170062f085fb1c83ced23e4a38d141acb5e2c4d259988541a0538de48dfe7e943132d4446467df8745b1e171ecdf3ece1f2e0eff SHA512 f77617dfe493bf5cc08c1db751bb8eed8275938f57c9fbe19584adf19bdaa4481c9bf3ece012859641f0e811ae2ce4ce058899a6c3075defc738c25e21b300d1
diff --git a/net-p2p/vuze/vuze-5.7.2.0-r1.ebuild b/net-p2p/vuze/vuze-5.7.2.0-r1.ebuild
index c76d294bb89d..fe78a487f71c 100644
--- a/net-p2p/vuze/vuze-5.7.2.0-r1.ebuild
+++ b/net-p2p/vuze/vuze-5.7.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=6
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/azureus/${PN}/${MY_SRC}/${MY_SRC}_source.zip"
 LICENSE="GPL-2 BSD"
 
 SLOT="0"
-KEYWORDS="amd64 ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 # bundles parts of http://www.programmers-friend.org/
 # bundles bcprov - 1.37 required but not in the tree
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index de6e95c8fc68..858805f6549b 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 a7afc5dbb979..761899c029dd 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -4,7 +4,7 @@ DIST cups-filters-1.17.9.tar.xz 1454068 BLAKE2B 7c4b1c1a017cbaaf5d413071195ce53e
 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
 EBUILD cups-filters-1.17.9.ebuild 3495 BLAKE2B 0354831007a19a9a5fc00152e52fec2d95a0b35adfb498278c3312cbcf00ecfc62f717e353e21085b1c55462ba81bb8aed9e60e8d439a5dbe9da9af838b2db92 SHA512 35391fc1cc809d8fbc2c7ba4944924244ea1f97bb14180532b30f841c2a6a8da3fc8e34def58417d11fc604821d010914d8f6462ce4fca69c44adcd754169d3e
-EBUILD cups-filters-1.20.4.ebuild 3559 BLAKE2B a4c8d0bfcdced811f94541db220f08ed9360384011debc7439050cd58fd5cccc9e58aab085d019f99f4b63e928bd9bc1e1dfbe1578f349e02c18f807fa0a39ed SHA512 378d47ffe7219565f4fcf50ed8481858f3099a591bc962282236e0fa2caf4d3cd85fc72ff0631f9bc3d8f7c044bb9c2ceb9ea15ae684f5267fca8906ee5529e5
+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-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.20.4.ebuild b/net-print/cups-filters/cups-filters-1.20.4.ebuild
index 607764b5fbc4..c062a162b564 100644
--- a/net-print/cups-filters/cups-filters-1.20.4.ebuild
+++ b/net-print/cups-filters/cups-filters-1.20.4.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
 else
 	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~m68k-mint"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~m68k-mint"
 fi
 DESCRIPTION="Cups filters"
 HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 85440cd83d4f..02865ee65a77 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 0e837af01874..47683c4e4536 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -9,6 +9,7 @@ DIST haproxy-1.6.14.tar.gz 1583859 BLAKE2B 91695f0b3d901ba70b6bce6572c2f549479c2
 DIST haproxy-1.7.10.tar.gz 1750937 BLAKE2B 26d970862e415b079d4130fd00564677584a7aad74d6812cabed36de9a629321330434b7d4fdf7c2e8b2945b7f394ca33e444158e7fa9b49937db501ea33e78a SHA512 ca6c50848c559ee2ffb9af2d281c3931473dd90d1686d95d962cf604cd92d2feb2b63e006e217cf9078cf08fdd73dc523318c97e13400bc0ef325de47111394e
 DIST haproxy-1.7.11.tar.gz 1752129 BLAKE2B 1947ab837f6b81761eec931e97c7349462561abecc78b2b58b285ebb4b0ae498753d236f3a243d3b5c1115a9ff6e5fe9392d428314a6342e2c1907d6886e09e4 SHA512 48ee30a1057e92971c041b088b6aef16d6843da9ecee9b738aaa64bb55d3c3b0be090a37bb5fc63ac42fe34ce994820349cc770756136c823051039fa6d01f74
 DIST haproxy-1.8.13.tar.gz 2063046 BLAKE2B 9ebccf2520719cdf209bc9a87bf28d015b5b673e0d017d5387af4025f930ac401f6a2cfa851583ffe6b6645b7b91ad255bb5db737688a1f310958072a11c8a80 SHA512 54d4cb0721a3868267d7e085b3d3bb050384e4279eb49e88abb925bb3ea8cc39ef9069bdc99b7b18a23fd22e0d29e24dfcb8a0507ddca9243a845e4418be9cc5
+DIST haproxy-1.8.14.tar.gz 2070813 BLAKE2B 113c80cc2f5f427dd419f9c4602d852dec3ae396f8f2cda67993aff4571c88edbd0a84df5c13585999369081182d5d9f8ac86b5bac3d81f7c04c08a00fcd16d2 SHA512 17727c19e0439a2b45be2ec583cd2ce30d1af2bf48bd3cdb2dce1eff670ab8b24d93eaa7bebb410947528d1ad88c3856495e498fff518620efbd32b9adf4eb66
 DIST haproxy-1.8.8.tar.gz 2054534 BLAKE2B 5eabd37dfb79783dc20425cbb16ca1e1afed23861f66c9e8a738dd56d9ca35b3ceb2604c308543ca99222aa867e11ff613fc09012669882a4bdaaff03cb76450 SHA512 8310f84b364348600273c295a3b315a79cba1f782b86b47d8d47b3ffd1e6fb62fd278c4f2dfa185d0a269f73c1067695a763733736877989a941162b625462a1
 DIST haproxy-1.8.9.tar.gz 2057051 BLAKE2B d81d18f68a27ae8a77660c1ecb1dfc28599263ebfd57f25ea574af2b101b35eb7a1a89ba4034b55dfa89673ae6ac4c0dca5428b4b494a02184b1b157850ce96b SHA512 e59c29af3a39d6212f012ae8341b169436e10e42fadaf8f1aa68d2bb7ee181fd1fe3b74640bfcd8c37c17dfc5062b36bd69d90290d7c59cd3e4648ef2ab1c8dd
 EBUILD haproxy-1.5.14.ebuild 3269 BLAKE2B fed37e73d128612260d8266045891a5e271ba399ee61af005409ab07b089297f4ca39adb67c50e0721efa9b7cdc112f0d5d30a65cb60ac027684ddb69e606c9c SHA512 41d1cfec30d177661f4402143ccf1335f5407adeb9f1581ea866011b1ec26c99da67fb2edd33e71e96b64665fa9c62641fd4b5dc1cd1383cc49877a0ce4292b4
@@ -18,6 +19,7 @@ EBUILD haproxy-1.6.14.ebuild 4608 BLAKE2B d85f4160498f8af8fcc05ccdbe68d771b9d8b5
 EBUILD haproxy-1.7.10.ebuild 4628 BLAKE2B 267e5228e4c1eb2386ab13a6f21d018e8f8643d9adcdb61851d150b281e2241eda97c701b4577fef8feee00c01409f8f2fc715a9681874fc05fc3f89c09da440 SHA512 941f9c3e0982ee44d51339b3feef43d93c7259413f2d77f8919e63056a0d0504468bd0637965141842af6c8dbb223f23155ffc0728f54bc1bbf539eef678c235
 EBUILD haproxy-1.7.11.ebuild 4632 BLAKE2B 06dd613111ce7410ce9190b2cbd825f4b9acd16d3c9995ca507fda90a77696e6c931b2f2caeb916ed0f6894110edaa056df5923c204107230af6a4f596c061ab SHA512 bb080ed92cbef8e2851262648519b5e0563749e3bd92396707791775801bf19f029e57fbe4fa029ea240cbc8f55b14e91d5656e85101fb2dc1e8ae219d111d51
 EBUILD haproxy-1.8.13.ebuild 4886 BLAKE2B 61bc37ea42b0dd5bc447b68cb45532c184f14ad40461faddb940e041682e88ac81af36ce44d961d1011bc54b788ad9baa4c9447950a97708ea33dcb9d677fc32 SHA512 5dad241368a64aba2b07e429ab82adff67df556fc2b5a447d4863a12d50098545127f30725887b447e6ed583e39177458267777c5b321636211aab5a61b85a65
+EBUILD haproxy-1.8.14.ebuild 4886 BLAKE2B de3d4a728a6ebc7d0aa7861982921a6de7ee412efcf819df59f7f63872866a848c395af26b5bfbfa2b29ef3969e60306ccb6a0c2c93bcbd7cdce1df976ab2c31 SHA512 6a9fc1b8200c62be0d271e4ba5d293c07fb872d4832a2d7ff743ed7b2c21995adb2007295dcf3653cd75e5af724bf9f184ae32ae132c88f8e8dd18dfc273c3b8
 EBUILD haproxy-1.8.8.ebuild 4889 BLAKE2B a40d2bf75ece4fcba6f0ac6e8bfcf81763ded4b315781183230a8b514f5931de4c383afbe8d4152f4d2d4d496fd2421f2f10d04e4240b52a7ab15f3c31bc0864 SHA512 2e132cd3018d845450a94857a544c0306a5cf0efe08d5102a7096a424355a4b628bf85c69f02f812577d134ebabef197aa2bb4ff6f5b8f8d3609d072a55af86e
 EBUILD haproxy-1.8.9.ebuild 4885 BLAKE2B beb86eb5714d77b8dad4ac0abc55b46a0e4727ceae1a503ff1febe3943f6393f8ce99f97c098e4046c17de04a32c4f9d0a8708fd4c81eeb69e82f900f156285a SHA512 93290df98b67334d2c89ced563d15d25943a5c87c691fdce2ace423ca38acc364f9307f8a28a6654fb390d41c72ec627e005d0179d10138d92396365496ab8b8
 EBUILD haproxy-1.9.9999.ebuild 4889 BLAKE2B a40d2bf75ece4fcba6f0ac6e8bfcf81763ded4b315781183230a8b514f5931de4c383afbe8d4152f4d2d4d496fd2421f2f10d04e4240b52a7ab15f3c31bc0864 SHA512 2e132cd3018d845450a94857a544c0306a5cf0efe08d5102a7096a424355a4b628bf85c69f02f812577d134ebabef197aa2bb4ff6f5b8f8d3609d072a55af86e
diff --git a/net-proxy/haproxy/haproxy-1.8.14.ebuild b/net-proxy/haproxy/haproxy-1.8.14.ebuild
new file mode 100644
index 000000000000..5e9022d20eb6
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-1.8.14.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit user versionator toolchain-funcs flag-o-matic systemd linux-info $SCM
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://www.haproxy.org"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+else
+	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(get_version_component_range 1-2).git/"
+	EGIT_BRANCH=master
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl
+systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+	pcre2-jit? ( pcre2 )
+	pcre? ( !pcre2 )
+	device-atlas? ( pcre )
+	?? ( slz zlib )"
+
+DEPEND="
+	pcre? (
+		dev-libs/libpcre
+		pcre-jit? ( dev-libs/libpcre[jit] )
+	)
+	pcre2? (
+		dev-libs/libpcre
+		pcre2-jit? ( dev-libs/libpcre2[jit] )
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[zlib?] )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	slz? ( dev-libs/libslz:= )
+	zlib? ( sys-libs/zlib )
+	lua? ( dev-lang/lua:5.3 )
+	device-atlas? ( dev-libs/device-atlas-api-c )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
+CONTRIBS=( halog iprange )
+# ip6range is present in 1.6, but broken.
+version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop )
+# TODO: mod_defender - requires apache / APR, modsecurity - the same
+version_is_at_least 1.8.0 $PV && CONTRIBS+=( hpack )
+
+haproxy_use() {
+	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
+
+	usex "${1}" "USE_${2}=1" "USE_${2}="
+}
+
+pkg_setup() {
+	enewgroup haproxy
+	enewuser haproxy -1 -1 -1 haproxy
+
+	if use net_ns; then
+		CONFIG_CHECK="~NET_NS"
+		linux-info_pkg_setup
+	fi
+}
+
+src_compile() {
+	local -a args=(
+		TARGET=linux2628
+		USE_GETADDRINFO=1
+		USE_TFO=1
+	)
+
+	# TODO: PCRE2_WIDTH?
+	args+=( $(haproxy_use threads THREAD) )
+	args+=( $(haproxy_use crypt LIBCRYPT) )
+	args+=( $(haproxy_use net_ns NS) )
+	args+=( $(haproxy_use pcre PCRE) )
+	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
+	args+=( $(haproxy_use ssl OPENSSL) )
+	args+=( $(haproxy_use slz SLZ) )
+	args+=( $(haproxy_use zlib ZLIB) )
+	args+=( $(haproxy_use lua LUA) )
+	args+=( $(haproxy_use 51degrees 51DEGREES) )
+	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
+	args+=( $(haproxy_use wurfl WURFL) )
+	args+=( $(haproxy_use systemd SYSTEMD) )
+
+	# For now, until the strict-aliasing breakage will be fixed
+	append-cflags -fno-strict-aliasing
+
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+	emake -C contrib/systemd SBINDIR=/usr/sbin
+
+	if use tools ; then
+		for contrib in ${CONTRIBS[@]} ; do
+			emake -C contrib/${contrib} \
+				CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+		done
+	fi
+}
+
+src_install() {
+	dosbin haproxy
+	dosym ../sbin/haproxy /usr/bin/haproxy
+
+	newconfd "${FILESDIR}/${PN}.confd" $PN
+	newinitd "${FILESDIR}/${PN}.initd-r6" $PN
+
+	doman doc/haproxy.1
+
+	systemd_dounit contrib/systemd/haproxy.service
+
+	einstalldocs
+
+	# The errorfiles are used by upstream defaults.
+	insinto /etc/haproxy/errors/
+	doins examples/errorfiles/*
+
+	if use doc; then
+		dodoc ROADMAP doc/*.txt
+		#if use lua; then
+		# TODO: doc/lua-api/
+		#fi
+	fi
+
+	if use tools ; then
+		has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
+		has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
+		has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
+		has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
+		has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
+		has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
+		has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.cfg
+		dodoc examples/seamless_reload.txt
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins examples/haproxy.vim
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
+		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
+		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
+		ewarn "Make use of them with the \"user\" and \"group\" directives."
+
+		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
+			einfo "Please consult the installed documentation for learning the configuration file's syntax."
+			einfo "The documentation and sample configuration files are installed here:"
+			einfo "   ${EROOT}usr/share/doc/${PF}"
+		fi
+	fi
+}
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 634343d46442..e76c2cfb0354 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/openfortivpn/Manifest b/net-vpn/openfortivpn/Manifest
index caa0229fd4a4..3a8638d403a8 100644
--- a/net-vpn/openfortivpn/Manifest
+++ b/net-vpn/openfortivpn/Manifest
@@ -1,5 +1,3 @@
-DIST openfortivpn-1.6.0.tar.gz 55606 BLAKE2B 649ca2a8112313fc7b63d89867efe33c4cf8e75cb4c2f7f19839e1f569ac04e3ace841b17ac0e7aa9b51a7e6d9b1f7910925761d5052cac6ef5aec1e257b93bc SHA512 547dca62022f56271717191a10a645b8a1c554568536f0695ef73d8c2883926e957dc070570648ed672786374a01b110de34b4ea19c4ae8cb2e3657c27716c69
 DIST openfortivpn-1.7.1.tar.gz 61236 BLAKE2B b382ceac577e63ebb7a92ee3ca80c45e94f77eb95f8ea75f91a4c2ca2fb006f4d2e5e4c7bdf3974875cfb3611f34ef249218d194d58f66f3b51b30c8b90a3f82 SHA512 9c151ce3f914a7cba13be3e3b98e35d49329ac2c04410b653ce40dfb9fe1912c2e51d0322f9e37d5ed47bb28a46203a19ce87ab2fa670229f2b5ccf5b9bb6fc1
-EBUILD openfortivpn-1.6.0.ebuild 766 BLAKE2B 3dfa3574c89f8101c5e10915118fccf5d5bf50954d411390e501d701fa746a6f58b89fb0b37140bb301c4baea697ec527cceb77b38107842f433b55139c907ef SHA512 f5e8bdac45457934df2e749c45eb91e15909edbdb3b3aab3891bef1a34732e6dfab2f739954c9240250d0e09a5cf5a93a378a5cc1b7d9e3770f1cf682f578704
 EBUILD openfortivpn-1.7.1.ebuild 766 BLAKE2B 59675dd6afd568ef60fc345e96c401e462063bb570c4e5c094c4a2c5f4061e862e6b185763af143d34a79d817fbe61ff1783180a981611e9405875c19d8bbece SHA512 19abaec0e7981787d4f2995bfe905a0d24643d17cfdb651dec7d2dc4be2c80af6042876ef06d5196c953d3209c90bd8d9bea2650bfab650d2608609d211bd048
 MISC metadata.xml 334 BLAKE2B f24aad8486bdfc65b3b679b17aee075a53b08cda8e80df8c6119cf224885d6ed25a23b14ca38bda9a1c8a651263d59e42d84719dd27749f25d109e7a6f8a3783 SHA512 383c645edf7e7baa6588a4639ec81290b4260d329f3839e540ecd506d7945a72a35bd039514b377454c0c81f23ecadaa9334c746e96aa91e0408712f112148fd
diff --git a/net-vpn/openfortivpn/openfortivpn-1.6.0.ebuild b/net-vpn/openfortivpn/openfortivpn-1.6.0.ebuild
deleted file mode 100644
index 159200d14e79..000000000000
--- a/net-vpn/openfortivpn/openfortivpn-1.6.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
-
-inherit autotools linux-info
-
-DESCRIPTION="A Fortinet compatible VPN client"
-HOMEPAGE="https://github.com/adrienverge/openfortivpn"
-SRC_URI="https://github.com/adrienverge/openfortivpn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3-with-openssl-exception openssl"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="libressl"
-
-DEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-dialup/ppp
-"
-RDEPEND="${DEPEND}"
-
-CONFIG_CHECK="~PPP ~PPP_ASYNC"
-
-src_prepare() {
-	default
-
-	sed -i 's/-Werror//g' Makefile.am || die "Failed to remove -Werror from Makefile.am"
-
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	keepdir /etc/openfortivpn
-}
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 5e3a7de8ac6b..963ef93e3935 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -9,7 +9,7 @@ DIST tor-0.3.4.7-rc.tar.gz 6668322 BLAKE2B 863d24d04ba7919d08b3c69bca2edf3ee46af
 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
 EBUILD tor-0.3.1.10.ebuild 2018 BLAKE2B 5c001ed0ad1fd3f0d6a3dee6bcc53bc3590a90a5c0aa931c0e67e0cbceb000ef710fa33fe11b06fc08798c6286ffa877376ef6ebf2cbd426e7a26c94311e19c2 SHA512 65f6054ac7b50c46679d88ed1a5b556f5e3c40fe44e784e6b4de324bd317e3d118a8d0d4574ac62bcd17131412c3ad1cbdd0c27f4afd53568091ce400b171244
-EBUILD tor-0.3.4.7_rc.ebuild 2233 BLAKE2B ddebd2fb89e2af106e1c2dcf66cb3f15f870eccab4258425e056b609f7baa0d82c1813c71c60f8f811e89bc0920e384d513707d374961b2e27cbe74f5e82e6e2 SHA512 2614bd244399582f59558e82ba53465d8215eb8dbb1b7e9ccd58a77bff0256b3a957c86261585e9dc87d8e1c36cb18f75b762607b70663daf7261b26e652cec0
+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
 MISC metadata.xml 594 BLAKE2B 006e1ebc9876f83cb7cc3dcb7cea9ff0dfc763e9eb47c025e38b7588e1e4fef7c26ab130c61cdd3200b8d3d9be886b3aab377585972be178c93b758aff48c4c3 SHA512 011f77654a507d13c0542e6983df8ec86c5f2cff7cd1408f99c9d4da9d00ffb4b432317b2fd21500e62131e6f7c9bc60235cf55f2b8082391b9fe3bcf924ab2b
diff --git a/net-vpn/tor/tor-0.3.4.7_rc.ebuild b/net-vpn/tor/tor-0.3.4.7_rc.ebuild
index a1e437a32f9a..bc751cb3cb4c 100644
--- a/net-vpn/tor/tor-0.3.4.7_rc.ebuild
+++ b/net-vpn/tor/tor-0.3.4.7_rc.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PF}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc ppc64 x86 ~ppc-macos"
+KEYWORDS="amd64 arm ~mips ppc ppc64 x86 ~ppc-macos"
 IUSE="caps libressl lzma scrypt seccomp selinux systemd tor-hardening test web zstd"
 
 DEPEND="
diff --git a/net-vpn/wireguard/Manifest b/net-vpn/wireguard/Manifest
index e69ba5eee610..a78155158b23 100644
--- a/net-vpn/wireguard/Manifest
+++ b/net-vpn/wireguard/Manifest
@@ -1,4 +1,4 @@
-DIST WireGuard-0.0.20180925.tar.xz 296460 BLAKE2B c760891c91585d1bf9e9b3ac045ecd6f824288d041531f040b901a59c5fdc0ce9562bc6b2f058f5fcb0cf05098e972aa11799fef404fb84be785f7f09378f890 SHA512 8385a7fa8a928372d98147bd61de89fc3d90a886eec92ac2795581433566c48e07e0f8aba45c3e6454697254cd77c9ef20c2004bbd7b1762b960e2ad8574395e
-EBUILD wireguard-0.0.20180925.ebuild 5145 BLAKE2B af179f6e992bc0df635ac391fed3d0178395bb9f3de8b7180d24c990140ba2ae5c4fbed0eb673443ab2e7e8de2d4477af26ea0819c9cf07ef532804ad4b4c7b3 SHA512 beff711ea1ec42806f780144b48f53fb02d1fb001f84f484c6d5bdf11384e78fe1bf77cdf07b0c971c4163927cac3b68c4f70211c5aa2b352009c6ab866c1fb9
+DIST WireGuard-0.0.20181006.tar.xz 298168 BLAKE2B 711c3dfe601b99f5525176aa2cb38722d6f4bf2b1704c6e0d09f78f588258e21d3a5dcbc407f18421964c79fd42e9f62a13312ba254fb1d7fe08c0fd1d75d5b7 SHA512 a8cfae43c3d1c4bcebd5f301eb7ce3d45f799383c8b696757e84e53d921027d415dc4459628a1dd441f0c5d31079582a54517e8de0b258452ea4a310362be9bf
+EBUILD wireguard-0.0.20181006.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.20180925.ebuild b/net-vpn/wireguard/wireguard-0.0.20180925.ebuild
deleted file mode 100644
index 332e52b44d29..000000000000
--- a/net-vpn/wireguard/wireguard-0.0.20180925.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MODULES_OPTIONAL_USE="module"
-inherit linux-mod bash-completion-r1
-
-DESCRIPTION="Simple yet fast and modern VPN that utilizes state-of-the-art cryptography."
-HOMEPAGE="https://www.wireguard.com/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.zx2c4.com/WireGuard"
-	KEYWORDS=""
-else
-	SRC_URI="https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${PV}.tar.xz"
-	S="${WORKDIR}/WireGuard-${PV}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug +module +tools module-src"
-
-DEPEND="tools? ( net-libs/libmnl )"
-RDEPEND="${DEPEND}"
-
-MODULE_NAMES="wireguard(kernel/drivers/net:src)"
-BUILD_TARGETS="module"
-CONFIG_CHECK="NET INET NET_UDP_TUNNEL CRYPTO_BLKCIPHER"
-
-wg_quick_optional_config_nob() {
-	CONFIG_CHECK="$CONFIG_CHECK ~$1"
-	declare -g ERROR_$1="CONFIG_$1: This option is required for automatic routing of default routes inside of wg-quick(8), though it is not required for general WireGuard usage."
-}
-
-pkg_setup() {
-	if use module; then
-		if use tools; then
-			wg_quick_optional_config_nob IP_ADVANCED_ROUTER
-			wg_quick_optional_config_nob IP_MULTIPLE_TABLES
-			wg_quick_optional_config_nob NETFILTER_XT_MARK
-		fi
-
-		linux-mod_pkg_setup
-		kernel_is -lt 3 10 0 && die "This version of ${PN} requires Linux >= 3.10"
-	fi
-}
-
-src_compile() {
-	BUILD_PARAMS="KERNELDIR=${KERNEL_DIR}"
-	use debug && BUILD_PARAMS="CONFIG_WIREGUARD_DEBUG=y ${BUILD_PARAMS}"
-	use module && linux-mod_src_compile
-	use tools && emake RUNSTATEDIR="${EPREFIX}/run" -C src/tools CC="$(tc-getCC)" LD="$(tc-getLD)"
-}
-
-src_install() {
-	use module && linux-mod_src_install
-	if use tools; then
-		dodoc README.md
-		dodoc -r contrib/examples
-		emake \
-			WITH_BASHCOMPLETION=yes \
-			WITH_SYSTEMDUNITS=yes \
-			WITH_WGQUICK=yes \
-			DESTDIR="${D}" \
-			BASHCOMPDIR="$(get_bashcompdir)" \
-			PREFIX="${EPREFIX}/usr" \
-			-C src/tools install
-	fi
-	use module-src && emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" -C src dkms-install
-}
-
-pkg_postinst() {
-	if use module-src && ! use module; then
-		einfo
-		einfo "You have enabled the module-src USE flag without the module USE"
-		einfo "flag. This means that sources are installed to"
-		einfo "${ROOT}usr/src/wireguard instead of having the"
-		einfo "kernel module compiled. You will need to compile the module"
-		einfo "yourself. Most likely, you don't want this USE flag, and should"
-		einfo "rather use USE=module"
-		einfo
-	fi
-	use module && linux-mod_pkg_postinst
-
-	einfo
-	einfo "This software is experimental and has not yet been released."
-	einfo "As such, it may contain significant issues. Please do not file"
-	einfo "bug reports with Gentoo, but rather direct them upstream to:"
-	einfo
-	einfo "    team@wireguard.com    security@wireguard.com"
-	einfo
-
-	if use tools; then
-		einfo
-		einfo "After installing WireGuard, if you'd like to try sending some packets through"
-		einfo "WireGuard, you may use, for testing purposes only, the insecure client.sh"
-		einfo "test example script:"
-		einfo
-		einfo "  \$ bzcat ${ROOT}usr/share/doc/${PF}/examples/ncat-client-server/client.sh.bz2 | sudo bash -"
-		einfo
-		einfo "This will automatically setup interface wg0, through a very insecure transport"
-		einfo "that is only suitable for demonstration purposes. You can then try loading the"
-		einfo "hidden website or sending pings:"
-		einfo
-		einfo "  \$ chromium http://192.168.4.1"
-		einfo "  \$ ping 192.168.4.1"
-		einfo
-		einfo "If you'd like to redirect your internet traffic, you can run it with the"
-		einfo "\"default-route\" argument. You may not use this server for any abusive or illegal"
-		einfo "purposes. It is for quick testing only."
-		einfo
-		einfo "More info on getting started can be found at: https://www.wireguard.com/quickstart/"
-		einfo
-	fi
-	if use module; then
-		local old new
-		if [[ $(uname -r) != "${KV_FULL}" ]]; then
-			ewarn
-			ewarn "You have just built WireGuard for kernel ${KV_FULL}, yet the currently running"
-			ewarn "kernel is $(uname -r). If you intend to use this WireGuard module on the currently"
-			ewarn "running machine, you will first need to reboot it into the kernel ${KV_FULL}, for"
-			ewarn "which this module was built."
-			ewarn
-		elif [[ -f /sys/module/wireguard/version ]] && \
-		     old="$(< /sys/module/wireguard/version)" && \
-		     new="$(modinfo -F version "${ROOT}/lib/modules/${KV_FULL}/net/wireguard.ko" 2>/dev/null)" && \
-		     [[ $old != "$new" ]]; then
-			ewarn
-			ewarn "You appear to have just upgraded WireGuard from version v$old to v$new."
-			ewarn "However, the old version is still running on your system. In order to use the"
-			ewarn "new version, you will need to remove the old module and load the new one. As"
-			ewarn "root, you can accomplish this with the following commands:"
-			ewarn
-			ewarn "    # rmmod wireguard"
-			ewarn "    # modprobe wireguard"
-			ewarn
-			ewarn "Do note that doing this will remove current WireGuard interfaces, so you may want"
-			ewarn "to gracefully remove them yourself prior."
-			ewarn
-		fi
-	fi
-}
diff --git a/net-vpn/wireguard/wireguard-0.0.20181006.ebuild b/net-vpn/wireguard/wireguard-0.0.20181006.ebuild
new file mode 100644
index 000000000000..035320b20fd3
--- /dev/null
+++ b/net-vpn/wireguard/wireguard-0.0.20181006.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MODULES_OPTIONAL_USE="module"
+inherit linux-mod bash-completion-r1
+
+DESCRIPTION="Simple yet fast and modern VPN that utilizes state-of-the-art cryptography."
+HOMEPAGE="https://www.wireguard.com/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.zx2c4.com/WireGuard"
+	KEYWORDS=""
+else
+	SRC_URI="https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${PV}.tar.xz"
+	S="${WORKDIR}/WireGuard-${PV}"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug +module +tools module-src"
+
+DEPEND="tools? ( net-libs/libmnl )"
+RDEPEND="${DEPEND}"
+
+MODULE_NAMES="wireguard(kernel/drivers/net:src)"
+BUILD_TARGETS="module"
+CONFIG_CHECK="NET INET NET_UDP_TUNNEL CRYPTO_BLKCIPHER"
+
+wg_quick_optional_config_nob() {
+	CONFIG_CHECK="$CONFIG_CHECK ~$1"
+	declare -g ERROR_$1="CONFIG_$1: This option is required for automatic routing of default routes inside of wg-quick(8), though it is not required for general WireGuard usage."
+}
+
+pkg_setup() {
+	if use module; then
+		if use tools; then
+			wg_quick_optional_config_nob IP_ADVANCED_ROUTER
+			wg_quick_optional_config_nob IP_MULTIPLE_TABLES
+			wg_quick_optional_config_nob NETFILTER_XT_MARK
+		fi
+
+		linux-mod_pkg_setup
+		kernel_is -lt 3 10 0 && die "This version of ${PN} requires Linux >= 3.10"
+	fi
+}
+
+src_compile() {
+	BUILD_PARAMS="KERNELDIR=${KERNEL_DIR}"
+	use debug && BUILD_PARAMS="CONFIG_WIREGUARD_DEBUG=y ${BUILD_PARAMS}"
+	use module && linux-mod_src_compile
+	use tools && emake RUNSTATEDIR="${EPREFIX}/run" -C src/tools CC="$(tc-getCC)" LD="$(tc-getLD)"
+}
+
+src_install() {
+	use module && linux-mod_src_install
+	if use tools; then
+		dodoc README.md
+		dodoc -r contrib/examples
+		emake \
+			WITH_BASHCOMPLETION=yes \
+			WITH_SYSTEMDUNITS=yes \
+			WITH_WGQUICK=yes \
+			DESTDIR="${D}" \
+			BASHCOMPDIR="$(get_bashcompdir)" \
+			PREFIX="${EPREFIX}/usr" \
+			-C src/tools install
+	fi
+	use module-src && emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" -C src dkms-install
+}
+
+pkg_postinst() {
+	if use module-src && ! use module; then
+		einfo
+		einfo "You have enabled the module-src USE flag without the module USE"
+		einfo "flag. This means that sources are installed to"
+		einfo "${ROOT}usr/src/wireguard instead of having the"
+		einfo "kernel module compiled. You will need to compile the module"
+		einfo "yourself. Most likely, you don't want this USE flag, and should"
+		einfo "rather use USE=module"
+		einfo
+	fi
+	use module && linux-mod_pkg_postinst
+
+	einfo
+	einfo "This software is experimental and has not yet been released."
+	einfo "As such, it may contain significant issues. Please do not file"
+	einfo "bug reports with Gentoo, but rather direct them upstream to:"
+	einfo
+	einfo "    team@wireguard.com    security@wireguard.com"
+	einfo
+
+	if use tools; then
+		einfo
+		einfo "After installing WireGuard, if you'd like to try sending some packets through"
+		einfo "WireGuard, you may use, for testing purposes only, the insecure client.sh"
+		einfo "test example script:"
+		einfo
+		einfo "  \$ bzcat ${ROOT}usr/share/doc/${PF}/examples/ncat-client-server/client.sh.bz2 | sudo bash -"
+		einfo
+		einfo "This will automatically setup interface wg0, through a very insecure transport"
+		einfo "that is only suitable for demonstration purposes. You can then try loading the"
+		einfo "hidden website or sending pings:"
+		einfo
+		einfo "  \$ chromium http://192.168.4.1"
+		einfo "  \$ ping 192.168.4.1"
+		einfo
+		einfo "If you'd like to redirect your internet traffic, you can run it with the"
+		einfo "\"default-route\" argument. You may not use this server for any abusive or illegal"
+		einfo "purposes. It is for quick testing only."
+		einfo
+		einfo "More info on getting started can be found at: https://www.wireguard.com/quickstart/"
+		einfo
+	fi
+	if use module; then
+		local old new
+		if [[ $(uname -r) != "${KV_FULL}" ]]; then
+			ewarn
+			ewarn "You have just built WireGuard for kernel ${KV_FULL}, yet the currently running"
+			ewarn "kernel is $(uname -r). If you intend to use this WireGuard module on the currently"
+			ewarn "running machine, you will first need to reboot it into the kernel ${KV_FULL}, for"
+			ewarn "which this module was built."
+			ewarn
+		elif [[ -f /sys/module/wireguard/version ]] && \
+		     old="$(< /sys/module/wireguard/version)" && \
+		     new="$(modinfo -F version "${ROOT}/lib/modules/${KV_FULL}/net/wireguard.ko" 2>/dev/null)" && \
+		     [[ $old != "$new" ]]; then
+			ewarn
+			ewarn "You appear to have just upgraded WireGuard from version v$old to v$new."
+			ewarn "However, the old version is still running on your system. In order to use the"
+			ewarn "new version, you will need to remove the old module and load the new one. As"
+			ewarn "root, you can accomplish this with the following commands:"
+			ewarn
+			ewarn "    # rmmod wireguard"
+			ewarn "    # modprobe wireguard"
+			ewarn
+			ewarn "Do note that doing this will remove current WireGuard interfaces, so you may want"
+			ewarn "to gracefully remove them yourself prior."
+			ewarn
+		fi
+	fi
+}
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 420536aef44b..e280e798a136 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 f43a631b27a8..556106a10b13 100644
--- a/net-wireless/aircrack-ng/Manifest
+++ b/net-wireless/aircrack-ng/Manifest
@@ -3,7 +3,9 @@ AUX aircrack-ng-1.2_rc4-openssl.patch 1227 BLAKE2B ac474222d14a25d6ea4f95c313f0f
 AUX aircrack-ng-1.3-8812au.patch 7279 BLAKE2B 80ce8246b2719bf897c22d727beb3fe71d58e9866e35e9d4930535b4695044d9183d4e7f781c97ed5ab3dd45e59453d10239482073baa75f3b2c9be0e02556b9 SHA512 53cecc21d6b091e3ebbd2c163a918513382d35697f7df5e2462a774863e3cbbfdecd5aebe341b9b62bb1987ee8d22acbd962526e78b6f6537185bcb286ffcbc3
 DIST aircrack-ng-1.2-rc1.tar.gz 2046476 BLAKE2B aec848a3dedae564cc29fc94475d0dec9cfb33af5185a4bceb9f88c1a3cce7a910439405fd76390ca352e52393b9094e570bf54980af27a50709a36ffab33752 SHA512 897427c535846c0ede58b2f99ed469bc01f50f9b38fc70d5711261fca7342339192cc0c71a724fc04c99114db7534d825a44f09e7bc5754286ec44933a33e40d
 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-9999.ebuild 2857 BLAKE2B 838c8e5ebc6da51e589284bb651635c26bc47d5b8c9cd7520cff71686016681999aa25ccc7f527b1a5244243c56f7d75895e967c6eca6e5a585479afb5d151a9 SHA512 715cce5beedd1eb14b75fd9894ad5160de4b3341aeda0236ece837fdbceca6dfbaf856bcc13c8e40de8b171701fc7475483d35fcad52a0f11eba888e5ad5f294
+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.4.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.4.ebuild
new file mode 100644
index 000000000000..131e6f9c4ac2
--- /dev/null
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.4.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_OPTIONAL=1
+
+inherit toolchain-funcs distutils-r1 flag-o-matic autotools
+
+DESCRIPTION="WLAN tools for breaking 802.11 WEP/WPA keys"
+HOMEPAGE="http://www.aircrack-ng.org"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/aircrack-ng/aircrack-ng.git"
+	KEYWORDS="amd64 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"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD libressl +netlink +pcre +sqlite +experimental"
+
+DEPEND="net-libs/libpcap
+	sys-apps/hwloc
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	netlink? ( dev-libs/libnl:3 )
+	pcre? ( dev-libs/libpcre )
+	airdrop-ng? ( ${PYTHON_DEPS} )
+	airgraph-ng? ( ${PYTHON_DEPS} )
+	experimental? ( sys-libs/zlib )
+	sqlite? ( >=dev-db/sqlite-3.4 )"
+RDEPEND="${DEPEND}"
+PDEPEND="kernel_linux? (
+		net-wireless/iw
+		net-wireless/wireless-tools
+		sys-apps/ethtool
+		sys-apps/usbutils
+		sys-apps/pciutils )
+	sys-apps/hwids
+	airdrop-ng? ( net-wireless/lorcon[python,${PYTHON_USEDEP}] )"
+
+REQUIRED_USE="
+	airdrop-ng? ( ${PYTHON_REQUIRED_USE} )
+	airgraph-ng? ( ${PYTHON_REQUIRED_USE} )"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-asan \
+		--enable-shared \
+		--disable-static \
+		--without-opt \
+		$(use_enable netlink libnl) \
+		$(use_with experimental) \
+		$(use_with sqlite sqlite3)
+}
+
+src_compile() {
+	if [[ $($(tc-getCC) --version) == clang* ]] ; then
+		#https://bugs.gentoo.org/show_bug.cgi?id=472890
+		filter-flags -frecord-gcc-switches
+	fi
+
+	default
+
+	if use airgraph-ng; then
+		cd "${S}/scripts/airgraph-ng"
+		distutils-r1_src_compile
+	fi
+	if use airdrop-ng; then
+		cd "${S}/scripts/airdrop-ng"
+		distutils-r1_src_compile
+	fi
+}
+
+src_install() {
+	default
+
+	if use airgraph-ng; then
+		cd "${S}/scripts/airgraph-ng"
+		distutils-r1_src_install
+	fi
+	if use airdrop-ng; then
+		cd "${S}/scripts/airdrop-ng"
+		distutils-r1_src_install
+	fi
+
+	# we don't need aircrack-ng's oui updater, we have our own
+	rm "${ED}"/usr/sbin/airodump-ng-oui-update
+}
+
+pkg_postinst() {
+	# Message is (c) FreeBSD
+	# http://www.freebsd.org/cgi/cvsweb.cgi/ports/net-mgmt/aircrack-ng/files/pkg-message.in?rev=1.5
+	if use kernel_FreeBSD ; then
+		einfo "Contrary to Linux, it is not necessary to use airmon-ng to enable the monitor"
+		einfo "mode of your wireless card.  So do not care about what the manpages say about"
+		einfo "airmon-ng, airodump-ng sets monitor mode automatically."
+		echo
+		einfo "To return from monitor mode, issue the following command:"
+		einfo "    ifconfig \${INTERFACE} -mediaopt monitor"
+		einfo
+		einfo "For aireplay-ng you need FreeBSD >= 7.0."
+	fi
+}
diff --git a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
index 9c0c449c9577..f5006d8091e0 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-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
@@ -27,6 +27,7 @@ SLOT="0"
 IUSE="+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD libressl +netlink +pcre +sqlite +experimental"
 
 DEPEND="net-libs/libpcap
+	sys-apps/hwloc
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
 	netlink? ( dev-libs/libnl:3 )
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 0acb870b3465..407226d27c0f 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 8039 BLAKE2B e2aa3673173e3ccd0635635a5e8dd3461a247f047c84ed8ce501f231180de88f16630e05450a808019eb77115e1122cb63eed184645eee58635d9e3621366d0f SHA512 e50e6f3c9d1867b12230e304ce6b61c055f694f3e8288b507e4dc61f3be3db054936608dd5ca7c32badef14653303981db97a846b680790b43358e03286231a1
+EBUILD bluez-5.50.ebuild 8035 BLAKE2B e1b00db7d72012a8f3c6273ffa79bbabc3ec4581a2cd66b590ab235e5c4b231976bcf4e8ac44eed4063c71835b3282f07bb5f1eaba0b309ec588c422bb0f6c0c SHA512 244725cdc9572c8d5fcd724d0d00ce5fa372fbec9a757a7d63086143a20a4cd42d142be483c54b05ecd16eed87991973da482958591528f69fdabf9775d40e87
 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 498daaaabfd6..0d27acb9a3b5 100644
--- a/net-wireless/bluez/bluez-5.50.ebuild
+++ b/net-wireless/bluez/bluez-5.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
@@ -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 e691de6d5fcf..5ba453bd9b11 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -1,7 +1,9 @@
 AUX iwd.initd 246 BLAKE2B 02a422e96de99256e55f2ed86cfd9ed43bf93130021c523d0e4600ab1b7e34212a56def5ab2819c79e2d60cd63e70de4d7c31ae349326b9a15c35a025da4df29 SHA512 699f51082cb44d5ce52ea9dbb9adc4b0eeff945461c66ec4bfcb9d8f26fcc13aee3e7fe69b406d0a7e1ca89af24e655e830c7a61e028a1c0fff1ef8a2b3e153a
 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.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
 MISC metadata.xml 507 BLAKE2B fbe55ec45043cda66a6e67c2fe1c74963f555888bea54648c555a856c2c7b2b416adfdd27f8e36e87fb6159900ae3688ef343f327346bf28475556ec82704ec2 SHA512 31f01f5a9f5076bd8280fff136dac3ddac33c22997246cbe8d63df401a1c4c97ef66e0b081d3698c63ec34548d839c00eaaa165cbec53b5ad31fc5f07e8dfbff
diff --git a/net-wireless/iwd/iwd-0.9.ebuild b/net-wireless/iwd/iwd-0.9.ebuild
new file mode 100644
index 000000000000..3296d7599855
--- /dev/null
+++ b/net-wireless/iwd/iwd-0.9.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/profiles/Manifest.gz b/profiles/Manifest.gz
index 3f79e32c7ecc..13631b71e6ef 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 2f61400500f4..dfc273aa4adc 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,14 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Mikle Kolyada <zlogene@gentoo.org> (05 Oct 2018)
+# Not keyworded (see bug #540540c#8)
+app-admin/sudo sssd
+
+# Andreas Sturmlechner <asturm@gentoo.org> (30 Sep 2018)
+# Optional dependency blocking security cleanup, bug #627316
+media-sound/mpd wildmidi
+
 # Joonas Niilola <juippis@gmail.com> (09 Sep 2018)
 # Optional dependency blocking updates.
 media-plugins/imlib2_loaders eet
diff --git a/profiles/arch/amd64-fbsd/package.use.mask b/profiles/arch/amd64-fbsd/package.use.mask
index cf031a82d4a2..cb2abc7f3545 100644
--- a/profiles/arch/amd64-fbsd/package.use.mask
+++ b/profiles/arch/amd64-fbsd/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Mikle Kolyada <zlogene@gentoo.org> (05 Oct 2018)
+# Not keyworded
+app-admin/sudo sssd
+
 # Ulrich Müller <ulm@gentoo.org> (01 May 2018)
 # Missing keyword on virtual/gsasl dependency, bug #635216.
 net-mail/mailutils sasl
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 9f896a204d6e..e1524c7aca18 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Thomas Deutschmann <whissi@gentoo.org> (30 Sep 2018)
+# Unmask libheif support where media-libs/libheif is keyworded
+media-gfx/imagemagick -heif
+
 # Ben Kohler <bkohler@gentoo.org> (23 Aug 2018)
 # Unmask iwd support where net-wireless/iwd is keyworded
 net-misc/connman -iwd
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index 85ead1a21bea..ac5b35002a76 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -17,10 +17,6 @@
 
 #--- END OF EXAMPLES ---
 
-# Thomas Deutschmann <whissi@gentoo.org> (27 Sep 2018)
-# sys-devel/lld is unstable
-www-client/firefox clang
-
 # Mikle Kolyada <zlogene@gentoo.org> (15 Sep 2018)
 # the dependency is unstable
 media-video/libav nvidia
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index de2c0398d358..63d1d9945951 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
 
+# Thomas Deutschmann <whissi@gentoo.org> (30 Sep 2018)
+# Requires media-libs/libheif which is only keyworded for amd64 and x86
+media-gfx/imagemagick heif
+
 # Ben Kohler <bkohler@gentoo.org> (23 Aug 2018)
 # Mask iwd support until net-wireless/iwd is keyworded
 net-misc/connman iwd
diff --git a/profiles/arch/hppa/package.use.stable.mask b/profiles/arch/hppa/package.use.stable.mask
index ee0fa1d71c3e..a14b29ec6d41 100644
--- a/profiles/arch/hppa/package.use.stable.mask
+++ b/profiles/arch/hppa/package.use.stable.mask
@@ -17,13 +17,18 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas Sturmlechner <asturm@gentoo.org> (30 Sep 2018)
+# media-libs/game-music-emu is not stable.
+media-video/ffmpeg gme
+
 # Andreas Sturmlechner <asturm@gentoo.org> (20 May 2018)
 # media-libs/libraw is not stable
 media-gfx/imagemagick raw
 
 # Andreas Sturmlechner <asturm@gentoo.org> (20 May 2018)
+# media-video/faac is not stable.
 # media-libs/{libdc1394,x264} is not stable.
-media-video/libav ieee1394 x264
+media-video/libav faac ieee1394 x264
 media-video/ffmpeg ieee1394 x264
 
 # Andreas Sturmlechner <asturm@gentoo.org> (6 May 2018)
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 0fbc759c8e5f..36084bc584a6 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -3,6 +3,10 @@
 
 # This file requires >=portage-2.1.1
 
+# Thomas Deutschmann <whissi@gentoo.org> (30 Sep 2018)
+# Unmask libheif support where media-libs/libheif is keyworded
+media-gfx/imagemagick -heif
+
 # Tomáš Mózes <hydrapolic@gmail.com> (28 Sep 2018)
 # Requires dev-db/mongodb which has dropped x86 support
 dev-python/pymongo test
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 7ebcd86cfe06..6cfe118fb8ae 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# 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
diff --git a/profiles/default/linux/arm/17.0/uclibc/armv6j/eapi b/profiles/default/linux/arm/17.0/uclibc/armv6j/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/uclibc/armv6j/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm/17.0/uclibc/armv6j/hardened/eapi b/profiles/default/linux/arm/17.0/uclibc/armv6j/hardened/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/uclibc/armv6j/hardened/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm/17.0/uclibc/armv6j/hardened/parent b/profiles/default/linux/arm/17.0/uclibc/armv6j/hardened/parent
new file mode 100644
index 000000000000..3e3d7782bae7
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/uclibc/armv6j/hardened/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/hardened
diff --git a/profiles/default/linux/arm/17.0/uclibc/armv6j/make.defaults b/profiles/default/linux/arm/17.0/uclibc/armv6j/make.defaults
new file mode 100644
index 000000000000..d5f3c4a8df89
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/uclibc/armv6j/make.defaults
@@ -0,0 +1,10 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="armv6j-unknown-linux-uclibceabihf"
+CHOST_arm="${CHOST}"
+
+CFLAGS="-O2 -pipe -march=armv6j -mfpu=vfp -mfloat-abi=hard"
+CXXFLAGS="${CFLAGS}"
+FFLAGS="${CFLAGS}"
+FCFLAGS="${CFLAGS}"
diff --git a/profiles/default/linux/arm/17.0/uclibc/armv6j/parent b/profiles/default/linux/arm/17.0/uclibc/armv6j/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/uclibc/armv6j/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/default/linux/arm/17.0/uclibc/armv7a/eapi b/profiles/default/linux/arm/17.0/uclibc/armv7a/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/uclibc/armv7a/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm/17.0/uclibc/armv7a/hardened/eapi b/profiles/default/linux/arm/17.0/uclibc/armv7a/hardened/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/uclibc/armv7a/hardened/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm/17.0/uclibc/armv7a/hardened/parent b/profiles/default/linux/arm/17.0/uclibc/armv7a/hardened/parent
new file mode 100644
index 000000000000..3e3d7782bae7
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/uclibc/armv7a/hardened/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/hardened
diff --git a/profiles/default/linux/arm/17.0/uclibc/armv7a/make.defaults b/profiles/default/linux/arm/17.0/uclibc/armv7a/make.defaults
new file mode 100644
index 000000000000..ff9bd9e3abda
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/uclibc/armv7a/make.defaults
@@ -0,0 +1,10 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="armv7a-unknown-linux-uclibceabihf"
+CHOST_arm="${CHOST}"
+
+CFLAGS="-O2 -pipe -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
+CXXFLAGS="${CFLAGS}"
+FFLAGS="${CFLAGS}"
+FCFLAGS="${CFLAGS}"
diff --git a/profiles/default/linux/arm/17.0/uclibc/armv7a/parent b/profiles/default/linux/arm/17.0/uclibc/armv7a/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/uclibc/armv7a/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/default/linux/arm/17.0/uclibc/eapi b/profiles/default/linux/arm/17.0/uclibc/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/uclibc/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm/17.0/uclibc/parent b/profiles/default/linux/arm/17.0/uclibc/parent
new file mode 100644
index 000000000000..a22f101e8a92
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/uclibc/parent
@@ -0,0 +1,3 @@
+..
+../../../../../arch/arm
+../../../../../features/uclibc/
diff --git a/profiles/features/uclibc/eapi b/profiles/features/uclibc/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/features/uclibc/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/features/uclibc/make.defaults b/profiles/features/uclibc/make.defaults
new file mode 100644
index 000000000000..e744805b1e76
--- /dev/null
+++ b/profiles/features/uclibc/make.defaults
@@ -0,0 +1,12 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+PORTAGE_LIBC="uClibc"
+ELIBC=uclibc
+
+FEATURES="sandbox sfperms strict"
+
+USE="nptl unicode -berkdb"
+BOOTSTRAP_USE="${BOOTSTRAP_USE} nptl -berkdb"
+
+SYMLINK_LIB="no"
diff --git a/profiles/features/uclibc/package.mask b/profiles/features/uclibc/package.mask
new file mode 100644
index 000000000000..b2b832a58bd7
--- /dev/null
+++ b/profiles/features/uclibc/package.mask
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+sys-libs/musl
+sys-libs/glibc
+sys-libs/pam
+
+# We use eudev which is tested on both uclibc and musl
+sys-apps/systemd
+sys-fs/udev
+
+# Working on it, bug #470884
+dev-libs/elfutils
+>virtual/libelf-2
+
+## MJE 18/09/2018 - Do these still apply?:
+## These binary pkgs have a hard dep on glibc; make repoman shut up
+#app-arch/rar
+#www-plugins/adobe-flash
diff --git a/profiles/features/uclibc/package.use b/profiles/features/uclibc/package.use
new file mode 100644
index 000000000000..53754c2c64e5
--- /dev/null
+++ b/profiles/features/uclibc/package.use
@@ -0,0 +1,11 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# 17 Aug 2014; Anthony G. Basile <blueness@gentoo.org>
+# Avoid pulling in glib
+dev-util/pkgconfig internal-glib
+
+# Anthony G. Basile <blueness@gentoo.org> (14 Jul 2018)
+# We need this to break a circular dependency with
+# 'sys-libs/libcap pam' in stage3 catalyst builds
+sys-libs/pam -filecaps
diff --git a/profiles/features/uclibc/package.use.mask b/profiles/features/uclibc/package.use.mask
new file mode 100644
index 000000000000..d50e095b0281
--- /dev/null
+++ b/profiles/features/uclibc/package.use.mask
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Michał Górny <mgorny@gentoo.org> (12 Jan 2018)
+# Those require USE=java that is masked in this profile.
+app-emulation/virtualbox vboxwebsrv
+app-office/libreoffice libreoffice_extensions_wiki-publisher
+
+# Thomas Deutschmann <whissi@gentoo.org> (21 Jan 2017)
+# Mask due Gnome3 not going to be stabilized on this arch
+# due to uclibc
+dev-util/geany-plugins gtkspell
+
+# Joshua Kinard <kumba@gentoo.org> (18 Jan 2016)
+# Fails linking to gettext/libintl for symbol 'libintl_gettext'.
+# Is fixable by using 'append-ldflags' from flag-o-matic to force
+# -lintl, but that's a QA violation.  Real solution is to use
+# 'append-libs', but xfsdump's build system doesn't honor $LIBS.
+# So this is the best way for now.  See 570548.
+sys-fs/xfsdump nls
diff --git a/profiles/features/uclibc/packages b/profiles/features/uclibc/packages
new file mode 100644
index 000000000000..0ff81f33bfb2
--- /dev/null
+++ b/profiles/features/uclibc/packages
@@ -0,0 +1,7 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+*app-misc/pax-utils
+*dev-libs/libiconv
+*dev-libs/libintl
+-*sys-apps/man-pages
diff --git a/profiles/features/uclibc/packages.build b/profiles/features/uclibc/packages.build
new file mode 100644
index 000000000000..bc9b89070183
--- /dev/null
+++ b/profiles/features/uclibc/packages.build
@@ -0,0 +1,9 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+# This file lists extra packages needed to build for
+# a stage 1 based on this profile.
+
+dev-util/pkgconfig
+dev-libs/libiconv
+dev-libs/libintl
diff --git a/profiles/features/uclibc/use.force b/profiles/features/uclibc/use.force
new file mode 100644
index 000000000000..6225883ae668
--- /dev/null
+++ b/profiles/features/uclibc/use.force
@@ -0,0 +1,6 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+# Select the correct ELIBC
+elibc_uclibc
+uclibc
diff --git a/profiles/features/uclibc/use.mask b/profiles/features/uclibc/use.mask
new file mode 100644
index 000000000000..540851c0f4f0
--- /dev/null
+++ b/profiles/features/uclibc/use.mask
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+# Thomas Deutschmann <whissi@gentoo.org> (28 Jan 2017)
+# No JAVA in uclibc
+java
+
+nls
+pam
+
+-uclibc
+
+-elibc_uclibc
+elibc_glibc
+elibc_musl
diff --git a/profiles/package.mask b/profiles/package.mask
index 8ffab13352db..14902d7e7374 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,39 @@
 
 #--- END OF EXAMPLES ---
 
+# Mart Raudsepp <leio@gentoo.org> (06 Oct 2018)
+# Netspeed applet moved into mate-base/mate-applets since v1.14,
+# use that instead. Bug #667910
+net-analyzer/mate-netspeed
+
+# Mart Raudsepp <leio@gentoo.org> (06 Oct 2018)
+# Crashes on Youtube MSE videos, while older versions lack support
+# for higher resolution MSE videos. Pending further investigation.
+=www-client/epiphany-3.30.1
+
+# Thomas Deutschmann <whissi@gentoo.org> (06 Oct 2018)
+# Outdated and vulnerable snapshot; libav-12.3 is the better
+# version for now
+=media-video/libav-13_pre20171219
+
+# Virgil Dupras <vdupras@gentoo.org> (30 Sep 2018)
+# Dead upstream, unmaintained, no revdeps.
+# Removal in 30 days, bug #611614
+dev-python/recaptcha-client
+
+# Michał Górny <mgorny@gentoo.org> (30 Sep 2018)
+# Poor quality NIH ebuilds with multiple issues and lack of test suites.
+# They do not support Python 3 (even if somebody claimed otherwise,
+# completely ignoring all the errors during install phase), depend
+# on old Twisted packages and have no reverse dependencies in ::gentoo.
+# Removal in 30 days.  Bug #667354.
+dev-python/python-application
+dev-python/python-cjson
+dev-python/python-eventlib
+dev-python/python-gnutls
+dev-python/python-msrplib
+dev-python/python-xcaplib
+
 # Matt Turner <mattst88@gentoo.org> (29 Sep 2018)
 # Removal in 30 days, bug #576334
 app-eselect/eselect-mesa
@@ -38,11 +71,6 @@ app-eselect/eselect-mesa
 # Removal in 30 days, bug #623292
 dev-python/tinydb
 
-# Mike Gilbert <floppym@gentoo.org> (24 Sep 2018)
-# Breaks multilib builds.
-# https://bugs.gentoo.org/666968
-=dev-util/meson-0.48.0
-
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2018)
 # Apparently breaks sys-devel/gcc.  Bug #666954.
 =dev-util/debugedit-4.14.2
@@ -149,10 +177,10 @@ media-plugins/vdr-xvdr
 media-plugins/vdr-autosort
 
 # Matthias Maier <tamiko@gentoo.org> (1 Sep 2018)
-# Mask 0.7.0 and  1.0.0 for the time being until a compatible LLVM version
+# 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.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.
@@ -275,11 +303,6 @@ virtual/httpd-php:7.3
 # x11-drivers/nvidia-drivers. Work in progress.
 media-libs/libglvnd
 
-# Maciej Mrozowski <reavertm@gentoo.org> (6 May 2018)
-# SoQt does not build yet
->=media-libs/coin-4.0.0
->=media-libs/simage-1.7.1
-
 # Aaron Bauman <bman@gentoo.org> (30 Apr 2018)
 # Masked for testing
 =dev-libs/libressl-2.7*
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 19c7f9d142fb..1c2ea775d5bd 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -302,8 +302,8 @@ amd64		hardened/linux/amd64/selinux				stable
 amd64		hardened/linux/amd64/no-multilib			stable
 amd64		hardened/linux/amd64/no-multilib/selinux		stable
 amd64		hardened/linux/amd64/x32				dev
-arm		hardened/linux/arm/armv7a				dev
 arm		hardened/linux/arm/armv6j				dev
+arm		hardened/linux/arm/armv7a				dev
 ia64		hardened/linux/ia64					dev
 mips		hardened/linux/mips/mipsel/multilib/n32			exp
 mips		hardened/linux/mips/mipsel/multilib/n64			exp
@@ -353,6 +353,10 @@ amd64		default/linux/uclibc/amd64				exp
 amd64		hardened/linux/uclibc/amd64				exp
 arm		default/linux/uclibc/arm/armv7a				exp
 arm		hardened/linux/uclibc/arm/armv7a			exp
+arm		default/linux/arm/17.0/uclibc/armv6j			exp
+arm		default/linux/arm/17.0/uclibc/armv6j/hardened		exp
+arm		default/linux/arm/17.0/uclibc/armv7a			exp
+arm		default/linux/arm/17.0/uclibc/armv7a/hardened		exp
 mips		default/linux/uclibc/mips				exp
 mips		hardened/linux/uclibc/mips				exp
 mips		default/linux/uclibc/mips/mipsel			exp
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index eeee41a2b80d..d69638783243 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -170,6 +170,7 @@ app-admin/sudo:gcrypt - Use SHA2 from dev-libs/libgcrypt instead of sudo's inter
 app-admin/sudo:offensive - Let sudo print insults when the user types the wrong password
 app-admin/sudo:openssl - Use SHA2 from dev-libs/openssl instead of sudo's internal SHA2
 app-admin/sudo:sendmail - Allow sudo to send emails with sendmail
+app-admin/sudo:sssd - Add System Security Services Daemon support
 app-admin/sysklogd:logrotate - use app-admin/logrotate for rotating logs rather than custom cron scripts
 app-admin/syslog-ng:amqp - Enable support for AMQP destinations
 app-admin/syslog-ng:geoip2 - Add support for geo lookup based on IPs via dev-libs/libmaxminddb
@@ -200,6 +201,7 @@ app-admin/yaala:storable - Support for persistence of Perl data structures.
 app-antivirus/clamav:clamdtop - A Top like tool which shows what clamd is currently scanning amongst other things
 app-antivirus/clamav:metadata-analysis-api - Enables collection of file property metadata using ClamAV API for analysis by ClamAV bytecode programs.
 app-antivirus/clamav:system-libmspack - Use system libmspack instead of built in
+app-antivirus/clamav:xml - DMG and XAR support
 app-antivirus/clamtk:kde - Install the Dolphin plugin.
 app-antivirus/clamtk:nautilus - Install the Nautilus plugin.
 app-antivirus/clamtk:nemo - Install the Nemo plugin.
@@ -212,7 +214,6 @@ app-arch/dpkg:update-alternatives - Install update-alternatives
 app-arch/dump:ermt - encrypted rmt support
 app-arch/dump:uuid - Enable UUID support
 app-arch/engrampa:caja - Enable engrampa to integrate with mate-base/caja by providing entries in its context menu
-app-arch/engrampa:gtk3 - Build with GTK+3 instead of GTK+2
 app-arch/engrampa:magic - Enable filetype auto-detection via sys-apps/file
 app-arch/engrampa:packagekit - Enable support for installing via app-admin/packagekit based on archive type
 app-arch/file-roller:nautilus - Build contextual menu extension for gnome-base/nautilus.
@@ -433,7 +434,6 @@ 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
 app-editors/okteta:designer - Build plugins for dev-qt/designer
-app-editors/pluma:gtk3 - Build with GTK+3 instead of GTK+2
 app-editors/qhexedit2:gui - Install Qt5 hex editor
 app-editors/tea:aspell - Enable spellchecking using app-text/aspell
 app-editors/tea:hunspell - Enable spellchecking using app-text/hunspell
@@ -1195,7 +1195,6 @@ app-text/asciidoc:highlight - Enable source code highlighting
 app-text/atril:caja - Enable property page extension in mate-base/caja
 app-text/atril:dvi - Enable build-in DVI viewer
 app-text/atril:epub - Enable build-in DVI viewer using net-libs/webkit-gtk
-app-text/atril:gtk3 - Build with GTK+3 instead of GTK+2
 app-text/atril:t1lib - Enable the Type-1 fonts for the build-in DVI viewer (media-libs/t1lib)
 app-text/atril:xps - Enable XPS viewer using app-text/libgxps
 app-text/blogc:git - Build blogc-git-receiver tool
@@ -1965,6 +1964,7 @@ dev-lang/erlang:compat-ethread - Enable compatibility with pre-pentium 4 CPUs in
 dev-lang/erlang:dirty-schedulers - Enable dirty schedulers
 dev-lang/erlang:hipe - HIgh Performance Erlang extension
 dev-lang/erlang:kpoll - Enable kernel polling support
+dev-lang/erlang:pgo - Build erts with profile-guided optimizations
 dev-lang/fpc:ide - Build and install the Free Pascal Compiler IDE
 dev-lang/gdl:eigen - Build matrix manipulation with dev-cpp/eigen
 dev-lang/gdl:grib - Add support for the meteorological GRIB format with sci-libs/grib_api
@@ -2061,7 +2061,6 @@ dev-lang/ruby:readline - Use the sys-libs/readline library to provide the readli
 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:extended - Build and install rls, rustfmt and cargo alongside the compiler and stdlib
 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
@@ -2384,7 +2383,6 @@ dev-libs/libisofs:verbose-debug - Enable verbose debug messages
 dev-libs/liblogging:rfc3195 - Enables RFC 3195 protocol (aka syslog-reliable) support. If you don't know what this is, you don't need it!
 dev-libs/liblogging:stdlog - Enables liblogging's core component (think of it as a the next version of the syslog(3) API).
 dev-libs/libmail:apop - Enables the APOP authentication method
-dev-libs/libmateweather:gtk3 - Build with GTK+3 instead of GTK+2
 dev-libs/libmemcached:hsieh - Use Hsieh hash algorithm.
 dev-libs/libmemcached:libevent - Use the libevent event loop interface.
 dev-libs/libmemcached:sasl - Use sasl auth for communications.
@@ -2801,7 +2799,6 @@ dev-python/pypy:low-memory - Build using PyPy with the engine configured towards
 dev-python/pypy:sandbox - Enable sandboxing functionality
 dev-python/pypy3:low-memory - Build using PyPy with the engine configured towards low memory footprint. This makes it possible to build PyPy using ~3.5G of RAM on amd64 and ~half of that on x86, at the cost of lengthened build time.
 dev-python/pypy3:sandbox - Enable sandboxing functionality
-dev-python/python-caja:gtk3 - Build with GTK+3 instead of GTK+2
 dev-python/python-stdnum:vies - Enable VIES
 dev-python/pyudev:pygobject - Install PyGobject bindings
 dev-python/pyudev:qt5 - Install PyQt5 bindings
@@ -3141,8 +3138,8 @@ dev-util/lttng-tools:ust - Support LTTng-UST (Userspace Tracing)
 dev-util/massif-visualizer:callgraph - Enable detailed snapshot analysis using media-gfx/kgraphviewer
 dev-util/mdds:valgrind - Add support for memory debugging using dev-util/valgrind
 dev-util/mingw64-runtime:idl - Install idl files.
-dev-util/mingw64-runtime:libraries - Build extra libraries.
-dev-util/mingw64-runtime:tools - Build extra tools.
+dev-util/mingw64-runtime:libraries - Build extra libraries: mangle, pseh, winpthreads.
+dev-util/mingw64-runtime:tools - Build extra tools: gendef, genidl.
 dev-util/molecule:plugins - Add plugins provided by dev-util/molecule-plugins
 dev-util/nemiver:memoryview - Enable the optional hexadecimal memory inspection with app-editors/ghex
 dev-util/nvidia-cuda-sdk:cuda - Build CUDA binaries
@@ -3910,7 +3907,6 @@ 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:jemalloc3 - Enable or disable jemalloc3 (forced-on when supported prior to 38.0)
 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
@@ -4048,55 +4044,32 @@ mail-mta/qmail-ldap:rfc2307 - Add support for RFC2307 compliant uid/gid attribut
 mail-mta/qmail-ldap:rfc822 - Add support for RFC822 compliant mail attributes
 mail-mta/qpsmtpd:postfix - create user with permissions for proper postfix interaction
 mail-mta/ssmtp:mta - Install symlinks for sendmail-compatible MTA.
-mate-base/caja:gtk3 - Build with GTK+3 instead of GTK+2
 mate-base/caja:mate - Install x11-themes/mate-icon-theme which is needed when this package is used in the MATE desktop environment.
 mate-base/caja:packagekit - Enable support for installing via app-admin/packagekit based on mimetype
-mate-base/libmatekbd:gtk3 - Build with GTK+3 instead of GTK+2
 mate-base/mate:base - Install base MATE Desktop applications that are recommended for the most common usage; for example, this installs the file manager. Disable this and other USE flags if you want a more minimal MATE Desktop.
 mate-base/mate:extras - Install additional MATE Desktop applications that are recommended for extended usage of the MATE Desktop as upstream sees it; for example, this installs MATE Desktop's office related applications. Disable this if you plan to use your own non-MATE Desktop alternatives or a custom mixture of MATE and non-MATE packages.
-mate-base/mate:gtk3 - Build all of MATE DE with GTK+3 instead of GTK+2
 mate-base/mate:help - Install gnome-extra/yelp to handle in application help menus and documentation browsing
 mate-base/mate:notification - Force notification daemon to default to MATE's notification daemon. Enabled by default. Disable if it causes conflicts with other installed desktop environments.
 mate-base/mate:themes - Install MATE Desktop's themes; if you use other themes, you can disable this to spare some space and time.
-mate-base/mate-applets:gtk3 - Build with GTK+3 instead of GTK+2
 mate-base/mate-applets-meta:appindicator - Pull in mate-extra/mate-indicator-applet for AppIndicator applet
-mate-base/mate-applets-meta:gtk3 - Make sure applets are built with GTK+3 instead of GTK+2
-mate-base/mate-applets-meta:netspeed - Pull in net-analyzer/mate-netspeed for net speed monitoring applet
 mate-base/mate-applets-meta:sensors - Pull in mate-extra/mate-sensors-applet for hw sensors applet
 mate-base/mate-control-center:appindicator - Add support for AppIndicator
-mate-base/mate-control-center:gtk3 - Build with GTK+3 instead of GTK+2
-mate-base/mate-desktop:gtk3 - Build with GTK+3 instead of GTK+2
-mate-base/mate-panel:gtk3 - Build with GTK+3 instead of GTK+2
-mate-base/mate-session-manager:gtk3 - Build with GTK+3 instead of GTK+2
 mate-base/mate-session-manager:xtrans - Build with Xtrans support; WARNING: Disabling this flag will result in ICE binding on all interfaces
-mate-base/mate-settings-daemon:gtk3 - Build with GTK+3 instead of GTK+2
 mate-extra/caja-extensions:cdr - Add an extension to burn files to cds using app-cdr/brasero.
 mate-extra/caja-extensions:gajim - Add an extension to support net-im/gajim.
 mate-extra/caja-extensions:gksu - Add an extension to support opening files as root with x11-libs/gksu.
-mate-extra/caja-extensions:gtk3 - Build with GTK+3 instead of GTK+2
 mate-extra/caja-extensions:image-converter - Add image conversion support.
 mate-extra/caja-extensions:mail - Add an extension to support e-mail functionality.
 mate-extra/caja-extensions:open-terminal - Add an extension to support an open terminal.
 mate-extra/caja-extensions:pidgin - Add an extension to support net-im/pidgin
 mate-extra/caja-extensions:share - Add an extension to support sharing files.
 mate-extra/caja-extensions:wallpaper - Add an extension to support setting an image as the current wallpaper
-mate-extra/mate-indicator-applet:gtk3 - Build with GTK+3 instead of GTK+2
-mate-extra/mate-media:gtk3 - Build with GTK+3 instead of GTK+2
-mate-extra/mate-netbook:gtk3 - Build with GTK+3 instead of GTK+2
 mate-extra/mate-polkit:accountsservice - Support extraction of data from AccountsService
 mate-extra/mate-polkit:appindicator - Add support for AppIndicator
-mate-extra/mate-polkit:gtk3 - Build with GTK+3 instead of GTK+2
 mate-extra/mate-power-manager:applet - Enable building of the MATE applet.
-mate-extra/mate-power-manager:gtk3 - Build with GTK+3 instead of GTK+2
-mate-extra/mate-power-manager:man - Build power manager's man page.
 mate-extra/mate-power-manager:pm-utils - Adds support for suspend/resume using sys-power/upower-pm-utils instead of sys-power/upower
 mate-extra/mate-screensaver:consolekit - Enable support for sys-auth/consolekit
-mate-extra/mate-screensaver:gtk3 - Build with GTK+3 instead of GTK+2
-mate-extra/mate-sensors-applet:gtk3 - Build with GTK+3 instead of GTK+2
-mate-extra/mate-system-monitor:gtk3 - Build with GTK+3 instead of GTK+2
-mate-extra/mate-user-share:gtk3 - Build with GTK+3 instead of GTK+2
 mate-extra/mate-utils:applet - Enable the mate dictionary applet
-mate-extra/mate-utils:gtk3 - Build with GTK+3 instead of GTK+2
 media-fonts/corefonts:tahoma - Also install the Tahoma font. Due to the lack of a free bold variant, this may render badly. See bug 184790.
 media-fonts/culmus:ancient - Install ancient semitic scripts
 media-fonts/culmus:fancy - Install fancy fonts
@@ -4130,9 +4103,14 @@ media-fonts/unifont:fontforge - Use media-gfx/fontforge to build fonts from sour
 media-fonts/unifont:utils - Install unifont utilities
 media-gfx/album:plugins - Install optional plugins
 media-gfx/album:themes - Install optional themes
+media-gfx/alembic:arnold - Add support for arnold renderer (experimental)
 media-gfx/alembic:boost - Use dev-libs/boost library
+media-gfx/alembic:examples - Install alembic examples
 media-gfx/alembic:hdf5 - Add support sci-libs/hdf5
+media-gfx/alembic:maya - Compile Alembic plugin for Maya (experimental)
+media-gfx/alembic:prman - Compile Alembic plugin for Renderman (experimental)
 media-gfx/alembic:pyalembic - Build pyalembic python bindings (needs dev-python/pyilmbase)
+media-gfx/alembic:python - Build pyalembic python bindings (needs dev-python/pyilmbase)
 media-gfx/alembic:test - Build and run the test-suite
 media-gfx/alembic:zlib - Use sys-libs/zlib for compressions
 media-gfx/apngasm:7z - Enable support for 7zip compression
@@ -4183,7 +4161,6 @@ media-gfx/digikam:panorama - Build the panorama plugin which requires media-gfx/
 media-gfx/digikam:semantic-desktop - Enable kde-frameworks/kfilemetadata support
 media-gfx/eog-plugins:map - Enable world map display using media-libs/libchamplain
 media-gfx/eog-plugins:picasa - Enable uploading to Google's Picasa Web Albums
-media-gfx/eom:gtk3 - Build with GTK+3 instead of GTK+2
 media-gfx/exact-image:swig - Adds Swig support dev-lang/swig
 media-gfx/exiv2:webready - Support reading metadata over the internet
 media-gfx/fbida:X - Install the Motif based image viewer "ida"
@@ -4251,6 +4228,7 @@ media-gfx/jpeg2ps:metric - Default to A4 paper size
 media-gfx/kphotoalbum:kipi - Support for the KDE Image Plugin Interface
 media-gfx/kphotoalbum:map - Enable map display support using kde-apps/libkgeomap
 media-gfx/krita:color-management - Enable color management via media-libs/opencolorio
+media-gfx/krita:heif - Enable support for ISO/IEC 23008-12:2017 HEIF/HEIC image format using media-libs/libheif
 media-gfx/krita:qtmedia - Enable sound support for animations via dev-qt/qtmultimedia
 media-gfx/krita:vc - Enable support for dev-libs/vc, could be a significant speed boost
 media-gfx/librecad:3d - Require all 2D coordinates stored as 3D
@@ -4943,7 +4921,6 @@ media-sound/supercollider:gpl3 - Build GPL-3 licensed code (recommended)
 media-sound/supercollider:server - Build with internal server
 media-sound/supercollider:vim - Enable the SCVIM user interface
 media-sound/teamspeak-server:tsdns - Install TeamSpeaks own DNS service for handling multiple virtual servers.
-media-sound/tomahawk:hatchet - Enable support for the synchronisation through Hatchet
 media-sound/tomahawk:telepathy - Enable support for the real-time communication framework telepathy
 media-sound/traverso:lv2 - Add support for Ladspa V2
 media-sound/tuxguitar:fluidsynth - Enables Fluidsynth MIDI software synthesis (with external sound fonts). JSA must be disabled in the plug-ins menu to use this.
@@ -4979,6 +4956,7 @@ media-sound/xwax:fallback - Sets runtime dependencies to support decoding "other
 media-sound/xwax:jack - Adds support for audio input/output via the JACK Audio Connection Kit.
 media-sound/xwax:mp3 - Sets runtime dependencies to support decoding MP3 audio.
 media-sound/xwax:oss - Adds support for OSS (open sound system) audio input/output.
+media-sound/yarock:phonon - Use media-libs/phonon backend instead of media-video/vlc
 media-sound/yoshimi:lv2 - Add support for Ladspa V2
 media-tv/gentoo-vdr-scripts:nvram - Add support for using nvram-wakeup to set wakeup time in bios
 media-tv/kodi:airplay - enable AirPlay support
@@ -5264,7 +5242,7 @@ media-video/obs-studio:imagemagick - Use ImageMagick for image loading instead o
 media-video/obs-studio:luajit - Build support for scripting via Luajit.
 media-video/obs-studio:nvenc - Enable NVENC encoding for nVidia video cards.
 media-video/obs-studio:python - Build support for scripting via Python 3.
-media-video/obs-studio:speexdsp - Enable noise suppression filter support via media-libs/speexdsp.
+media-video/obs-studio:speex - Enable noise suppression filter support via media-libs/speexdsp.
 media-video/ogmrip:ogm - Support for OGM container format
 media-video/ogmrip:srt - Support for SRT subtitle format
 media-video/orion:mpv - Use the media-video/mpv player (upstream default)
@@ -6213,6 +6191,8 @@ net-libs/libssh:server - Build with SSH server support
 net-libs/libssh:sftp - Build with SFTP support
 net-libs/libssh:ssh1 - Build with SSH1 support
 net-libs/libssh2:gcrypt - Use dev-libs/libgcrypt instead of dev-libs/openssl
+net-libs/libssh2:libressl - Use dev-libs/libressl instead of dev-libs/openssl
+net-libs/libssh2:mbedtls - Use net-libs/mbedtls instead of dev-libs/openssl
 net-libs/libtorrent-rasterbar:dht - Enable DHT (distributed hash table) support
 net-libs/libtrace:numa - Use sys-process/numactl
 net-libs/libupnp:blocking-tcp - Do not use async socket calls.
@@ -7262,7 +7242,6 @@ sci-astronomy/psfex:plplot - Build with sci-libs/plplot to allow diagnostic plot
 sci-astronomy/scamp:plplot - Build with sci-libs/plplot to allow diagnostic plots during processing
 sci-astronomy/sextractor:modelfit - Enable profile model fitting, needs sci-libs/atlas and sci-libs/fftw
 sci-astronomy/stellarium:media - Enable sound and video support
-sci-astronomy/stellarium:sound - Enable sound support
 sci-astronomy/stellarium:stars - Install extra star catalogs
 sci-astronomy/wcslib:fits - Enable support for the FITS format through sci-libs/cfitsio
 sci-astronomy/wcslib:pgplot - Builds PGBSOX routines, needs sci-libs/pgplot library
@@ -7897,6 +7876,7 @@ sys-apps/net-tools:slattach - build the slattach tool (for working with old seri
 sys-apps/nix:etc_profile - Install /etc/profile.d/ entry to inject nix support for all users.
 sys-apps/nix:gc - Enable garbage collection in the Nix expression evaluator (use dev-libs/boehm-gc).
 sys-apps/nix:sodium - Use dev-libs/libsodium for cryptography
+sys-apps/nvme-cli:uuid - UUID support
 sys-apps/openrc:netifrc - enable Gentoo's network stack (net.* scripts)
 sys-apps/openrc:newnet - enable the new network stack (experimental)
 sys-apps/pacman:doc - Install extended documentation using app-doc/doxygen. (Man pages are included by default.)
@@ -7942,6 +7922,8 @@ sys-apps/smartmontools:caps - Build against sys-libs/libcap-ng to allow smartd t
 sys-apps/smartmontools:daemon - Install the monitoring daemon (smartd) and associated scripts.
 sys-apps/smartmontools:minimal - Do not install the monitoring daemon and associated scripts.
 sys-apps/smartmontools:update_drivedb - Install a script to update the drivedb file.
+sys-apps/superdiag:iso - Install an iso image, which can be used with sys-apps/smc-sum.
+sys-apps/superdiag:usb - Install all files, which are needed for an installation on an usb thumb drive.
 sys-apps/superiotool:pci - Support for PCI-attached "Super I/Os" (e.g. in VIA VT82686A/B).
 sys-apps/systemd:apparmor - Enable AppArmor support
 sys-apps/systemd:audit - Enable support for sys-process/audit
@@ -8010,7 +7992,6 @@ sys-auth/passwdqc:utils - Install pwqcheck and pwqgen helper utilities
 sys-auth/polkit:elogind - Use sys-auth/elogind instead of sys-auth/consolekit for session tracking
 sys-auth/polkit:systemd - Use sys-apps/systemd instead of sys-auth/consolekit for session tracking
 sys-auth/sssd:acl - Build and use the cifsidmap plugin
-sys-auth/sssd:augeas - Build internal configuration library
 sys-auth/sssd:autofs - Build helper to let net-fs/autofs use sssd provided information
 sys-auth/sssd:locator - Install sssd's Kerberos plugin
 sys-auth/sssd:manpages - Build man pages with dev-libs/libxslt
@@ -8111,6 +8092,7 @@ sys-cluster/cinder:scheduler - Installs the initscripts for the cinder scheduler
 sys-cluster/cinder:tcp - Enables tcp support for the iscsi backend
 sys-cluster/cinder:tgt - Enable tgt storage backend support
 sys-cluster/cinder:volume - Installs the initscripts for the cinder volume service
+sys-cluster/cluster-glue:ipmilan - Install the ipmilan plugin (requires sys-libs/openipmi)
 sys-cluster/cluster-glue:libnet - Force use of net-libs/libnet
 sys-cluster/corosync:infiniband - Enable Infiniband RDMA transport support
 sys-cluster/drbd-utils:heartbeat - Enable Heartbeat integration
@@ -8343,7 +8325,7 @@ sys-freebsd/freebsd-usbin:floppy - Enable floppy disk utilities (fdcontrol, fdfo
 sys-freebsd/freebsd-usbin:netware - Build libraries and tools to work with NetWare protocols (IPX and NCP).
 sys-freebsd/freebsd-usbin:zfs - Enable ZFS support.
 sys-fs/android-file-transfer-linux:fuse - Add FUSE mount helper
-sys-fs/bees:tools - Build extra tools useful for debugging (fiemap, feiwalk, beestop)
+sys-fs/bees:tools - Build extra tools useful for debugging (fiemap, fiewalk)
 sys-fs/btrfs-progs:convert - Build ext2 conversion utility (btrfs-convert)
 sys-fs/btrfs-progs:reiserfs - Enable reiserfs support in btrfs-convert tool.
 sys-fs/btrfs-progs:static - Build static binaries in addition to the dynamic ones
@@ -8994,8 +8976,6 @@ x11-misc/light-locker:dpms - Turn on the display on screensaver deactivation.
 x11-misc/light-locker:gtk3 - Build with GTK+ 3 instead of GTK+ 2.
 x11-misc/light-locker:screensaver - Lock the screen on screensaver activation.
 x11-misc/lightdm:gtk - Pull in the gtk+ greeter
-x11-misc/mate-notification-daemon:gtk3 - Build with GTK+3 instead of GTK+2
-x11-misc/mozo:gtk3 - Build with GTK+3 instead of GTK+2
 x11-misc/mugshot:gnome - Add support for gnome-base/gnome-control-center
 x11-misc/mugshot:libreoffice - Add support for app-office/libreoffice and app-office/libreoffice-bin
 x11-misc/mugshot:webcam - Add support for setting a profile photo in media-video/cheese
@@ -9052,7 +9032,6 @@ x11-terms/gnome-terminal:gnome-shell - Integrate with gnome-base/gnome-shell sea
 x11-terms/gnome-terminal:nautilus - Build gnome-base/nautilus extension
 x11-terms/guake:utempter - Include utmp management support via sys-libs/libutempter
 x11-terms/kitty:imagemagick - Support displaying images in the terminal with icat
-x11-terms/mate-terminal:gtk3 - Build with GTK+3 instead of GTK+2
 x11-terms/mlterm:brltty - Enable support for app-accessibility/brltty
 x11-terms/mlterm:fcitx - Enable support for app-i18n/fcitx
 x11-terms/mlterm:gtk2 - Build with x11-libs/gtk+:2 instead of x11-libs/gtk+:3
@@ -9129,7 +9108,6 @@ x11-wm/fvwm:rplay - Enable rplay support
 x11-wm/fvwm:stroke - Mouse Gesture support
 x11-wm/i3:doc - Build and install the HTML documentation and regenerate the man pages
 x11-wm/lumina:desktop-utils - Build and install lumina's desktop-utils
-x11-wm/marco:gtk3 - Build with GTK+3 instead of GTK+2
 x11-wm/musca:apis - Optionally install the experimental `apis' window manager
 x11-wm/musca:xlisten - Optionally install the xlisten utility
 x11-wm/mutter:gles2 - Enable OpenGL ES 2.0 support
diff --git a/ros-meta/Manifest.gz b/ros-meta/Manifest.gz
index 0f55c033e6f1..314024aeadde 100644
--- a/ros-meta/Manifest.gz
+++ b/ros-meta/Manifest.gz
diff --git a/ros-meta/pr2_common/Manifest b/ros-meta/pr2_common/Manifest
index 178ede3ca852..9974c4da0000 100644
--- a/ros-meta/pr2_common/Manifest
+++ b/ros-meta/pr2_common/Manifest
@@ -6,6 +6,7 @@ DIST pr2_common-1.11.9.tar.gz 33337556 BLAKE2B b743f4fcde9b3688d3630ce42e5f194fd
 DIST pr2_common-1.12.0.tar.gz 33598910 BLAKE2B 3c44fe6ba6214d0c35ca674f5433a89bb6ba703bf5522615bd67912cb077f7ebf1eb9239fa8f076dc4bd813f89fa341617301ac873166ddbd43243d8e5001661 SHA512 da933ff9521a9337198a890e0ba10281510b861b4bff3023e7d251251f7ef7f8579f86b2992238975329c5c63ecdf00b17e895f1e0dec4e180336860fdd0c921
 DIST pr2_common-1.12.1.tar.gz 33597926 BLAKE2B eef3676b2ad029514aef09c09b4e463246397c2fd605b60bdba355e54ce44b1248efe6eef02e0303fd347f8c9b6b8965abafccee07b1f77e70f6e7db4a12a5e5 SHA512 e74be6f0507b1a7ae0fa385a06ff0a960661c5f0ec723bd7ac6d4782d4a61e3b4a95fda5cd09b37ed62ecf72be7c9c55132d3967644211c957c224717bc15485
 DIST pr2_common-1.12.2.tar.gz 33598279 BLAKE2B e381e14b965d675a7cbf14a652f633514dfe72a4bf1d7b8808164da79c7cba63b47b405c8b57482a20a3b6284f0f5f957df1f97ea4699a4c0888936d2d4930a5 SHA512 29794f7ea5aaff0082ec9496f1b29bc7a1ea71694993a03832b039c655f3ba29cd322db3665401b2a1b5715d0d6793d19a7ab93f7fe5e891369ead5fbefed95a
+DIST pr2_common-1.12.3.tar.gz 33597275 BLAKE2B fbbfa933bea8ecd18b988e5bce1c31365718a97ddbfcb698bb901066eff1191293e377d97a3174b501b07ff5f3011b00d19c0843a63e5777a2b5fb6ee4b559cb SHA512 423eb73634a0c2ab9b4f89a902a7dbb8e416f80815e591ad8fd24de4b92c8b7ea0312196ad0697d181fa6157603b082645590d0cdb7216186e4c5cba27fb68da
 EBUILD pr2_common-1.11.10.ebuild 464 BLAKE2B b88782b2d79c3d00b9f2d980a7535f447670f001448ca2236f403239aa57e8e235407428786618934eade09d9f99d3859652aba7a946cba2cbde6353808feaaf SHA512 b48a1b893a214a50d8c7517fc178abb6f443a0f32118b1018e70b4e9a7e507713435eafcc13dfd5895f8fd86df1df0471963726f9eaeac90bf131186351a44ab
 EBUILD pr2_common-1.11.11.ebuild 464 BLAKE2B b88782b2d79c3d00b9f2d980a7535f447670f001448ca2236f403239aa57e8e235407428786618934eade09d9f99d3859652aba7a946cba2cbde6353808feaaf SHA512 b48a1b893a214a50d8c7517fc178abb6f443a0f32118b1018e70b4e9a7e507713435eafcc13dfd5895f8fd86df1df0471963726f9eaeac90bf131186351a44ab
 EBUILD pr2_common-1.11.13.ebuild 464 BLAKE2B b88782b2d79c3d00b9f2d980a7535f447670f001448ca2236f403239aa57e8e235407428786618934eade09d9f99d3859652aba7a946cba2cbde6353808feaaf SHA512 b48a1b893a214a50d8c7517fc178abb6f443a0f32118b1018e70b4e9a7e507713435eafcc13dfd5895f8fd86df1df0471963726f9eaeac90bf131186351a44ab
@@ -14,5 +15,6 @@ EBUILD pr2_common-1.11.9.ebuild 464 BLAKE2B b88782b2d79c3d00b9f2d980a7535f447670
 EBUILD pr2_common-1.12.0.ebuild 464 BLAKE2B b88782b2d79c3d00b9f2d980a7535f447670f001448ca2236f403239aa57e8e235407428786618934eade09d9f99d3859652aba7a946cba2cbde6353808feaaf SHA512 b48a1b893a214a50d8c7517fc178abb6f443a0f32118b1018e70b4e9a7e507713435eafcc13dfd5895f8fd86df1df0471963726f9eaeac90bf131186351a44ab
 EBUILD pr2_common-1.12.1.ebuild 464 BLAKE2B 294148d725203f8daa604d596c2daa10f0dad8f11bfc1fa602c45784df7f7d68c2120b8d97a2ee8ba5fb18732815576ab1c8c793fcf683a8e77621538bfef2a4 SHA512 42972118902b27a1f5ebd183cad5721ee2eba6a833cfaae3c919cc892909fb2ef0ebf402f4cdd4d0b4166d73d32458e98570daec31fee9512caa4fa90941e6d4
 EBUILD pr2_common-1.12.2.ebuild 464 BLAKE2B 294148d725203f8daa604d596c2daa10f0dad8f11bfc1fa602c45784df7f7d68c2120b8d97a2ee8ba5fb18732815576ab1c8c793fcf683a8e77621538bfef2a4 SHA512 42972118902b27a1f5ebd183cad5721ee2eba6a833cfaae3c919cc892909fb2ef0ebf402f4cdd4d0b4166d73d32458e98570daec31fee9512caa4fa90941e6d4
+EBUILD pr2_common-1.12.3.ebuild 461 BLAKE2B 23105ca80af40f9f9d3c0f7cd28e1953f9b5a770430d80d8505af20a22d5458186eb8c1cc7d749b2f2adf9036aff37e25cbf50207f6b780858ef6a1fa5aa847d SHA512 a79d5fca98df427fceead6643132e118c75d7d1bc2236d5f08ae387bf34c7e626d49ed3b051ac8004d3a39a820a7b2a8f0cec34898edf26290335e02623b793d
 EBUILD pr2_common-9999.ebuild 464 BLAKE2B b88782b2d79c3d00b9f2d980a7535f447670f001448ca2236f403239aa57e8e235407428786618934eade09d9f99d3859652aba7a946cba2cbde6353808feaaf SHA512 b48a1b893a214a50d8c7517fc178abb6f443a0f32118b1018e70b4e9a7e507713435eafcc13dfd5895f8fd86df1df0471963726f9eaeac90bf131186351a44ab
 MISC metadata.xml 328 BLAKE2B 2d51f6fac18e20274b308b8de5aeb2ad80a4b118697ca1c93dc5c0350e8a7ae2e7c14d7a84692d0b7fb5da114e4fb7ad39d93d7d5831c5a09589add99aa5f6da SHA512 2f52806adfce77e7d54809d57a0b8b59b26f25da96f50f10672ed76ce8bda8e4555f1531af953e61cd1cfa82d46d46a3760b12b537ffcc191407125604abcbbc
diff --git a/ros-meta/pr2_common/pr2_common-1.12.3.ebuild b/ros-meta/pr2_common/pr2_common-1.12.3.ebuild
new file mode 100644
index 000000000000..435b325d5dd6
--- /dev/null
+++ b/ros-meta/pr2_common/pr2_common-1.12.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/pr2/pr2_common"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="URDF description and 3D models of robot components of the PR2 robot"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/pr2_msgs
+	dev-ros/pr2_dashboard_aggregator
+	dev-ros/pr2_description
+	dev-ros/pr2_machine
+"
+DEPEND="${RDEPEND}"
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 469a991089af..384d917e6bbd 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index 7973c8ba2950..0f07006214da 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -3,8 +3,6 @@ DIST stars_5_2v0_1.cat 42580300 BLAKE2B eb6528c0577b3f2001a8b03cc5a4e08fa4e75723
 DIST stars_6_2v0_1.cat 148352404 BLAKE2B c605b284b3d768cb1619ada3f58d406fa7737f09949e8926d6c14b82a85927d124d7fcb50c6d6c357d21b003938cc0b28937f2adb28ae268bb5c85d575f5e0ff SHA512 794279407595f44bbc1e492086063d98068bf332202a5448cd83dd7afbdcf7c6c3ff2878f3016369ebb5a98552874eb4eddb38e2c40e9a163c6231b640e02977
 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.14.3.tar.gz 137661611 BLAKE2B 560b67d2fd4845f49ebd4801b2ec8a72b1a198b4a87e0263e91204f7d74e9385edf111edf7ef33dddb60c288304ede12b50432a77a7439982197c656784f458d SHA512 83d9a1c53f118c143e81d31e7f87dbf73368bfa981311c8bc41a51307fe6108c9169b43ad1fdde1cec84b9b1e8a4ef51d4de3b91d7aa676be38302b2223a6675
 DIST stellarium-0.16.0.tar.gz 204675673 BLAKE2B fe34ab611569e23277ae9f273d1ae72139d5b860d0ae1b5650a9744960ce8bac6953d7de98b60bd224374aa77db33c00081ed90d1683b2007ef1b5068af158ff SHA512 0f75441435ff1d0fa149264116e9ae6ec3b3553f7c66e78832bdb0ffd55cbef656b820680134d95f89c73e80ef283372660ea7545db7fff205da66cf4cf8e9d6
-EBUILD stellarium-0.14.3.ebuild 2418 BLAKE2B 6b54c260bdcc09a23b83054fd76cdc7357c29af3674aaa5577cb42a51de5481bb2b67cfde273bf5df79cc00f80db67dcb3e9d6c93b2b797d714402d9af233dfb SHA512 abbd4a92df7c89e49bc9e37bed98e7b180b33618efd48b601c1df6c4827d4d6c1e598a5ed3095b584fc7fdb0c952dfe01c0b249fb287460f9fdb86952ea8b159
 EBUILD stellarium-0.16.0-r1.ebuild 2682 BLAKE2B a7d339dba9db7e9e61d7ae2f87392ccd2e75f127aead0c93f79c0dcf6477ecaf891b9318a4a8e0741ef6ffaf7d91f0a49cc1d45d54b3c16299dc899622847400 SHA512 d3f8dd098fa304ed3e9030d02b842bf8c640ca0200731b9864f70f8e5e0b141b9666dc22014d54308ce4a7c5cc563a632460aa8beb41189f8c466c62f0a88afa
-MISC metadata.xml 809 BLAKE2B 37d40ebbf6629413456f1244ddc0ab896c2a0ecfb89bb12035133eb2c6b988031ad5612ac03c0779dc4e459518e47bf8640d0ca47b73634e20af748bc11741f7 SHA512 b7782e539a43493a90705d9a603f347a56b296817592b70f20799014b99be085709d910a1c7f85409d44c796bbcb8cb0b4c3470d45c3ee1c3cece89689cc2296
+MISC metadata.xml 758 BLAKE2B 69f3db0b3705b55f1eb04d67e0e6d6baab7e7e7df214f0a5386b74efd2863b63290581cd6c5b90000bab20a423902722ab560a670aa25796c7d555875a5961ac SHA512 33bc261705580ece702dce6d2f4d4143e80daa072a09bfbb40bb522d3a494f5f438d560a3ff0aa089313b365015189aa909b831a95166c8e709477dc6625a31c
diff --git a/sci-astronomy/stellarium/metadata.xml b/sci-astronomy/stellarium/metadata.xml
index 435fd9626204..05142448e046 100644
--- a/sci-astronomy/stellarium/metadata.xml
+++ b/sci-astronomy/stellarium/metadata.xml
@@ -14,7 +14,6 @@
   <use>
     <flag name="media">Enable sound and video support</flag>
     <flag name="stars">Install extra star catalogs</flag>
-    <flag name="sound">Enable sound support</flag>
   </use>
   <upstream>
     <remote-id type="sourceforge">stellarium</remote-id>
diff --git a/sci-astronomy/stellarium/stellarium-0.14.3.ebuild b/sci-astronomy/stellarium/stellarium-0.14.3.ebuild
deleted file mode 100644
index bb76024588df..000000000000
--- a/sci-astronomy/stellarium/stellarium-0.14.3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils eutils flag-o-matic gnome2-utils
-
-DESCRIPTION="3D photo-realistic skies in real time"
-HOMEPAGE="http://www.stellarium.org/"
-SRC_URI="
-	mirror://sourceforge/stellarium/${P}.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
-	)"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug nls sound stars"
-
-RESTRICT="test"
-
-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/qtwidgets:5
-	virtual/opengl
-	sys-libs/zlib
-	sound? ( dev-qt/qtmultimedia:5[widgets] )"
-DEPEND="${RDEPEND}
-	dev-qt/qttest:5
-	dev-qt/qtconcurrent:5
-	nls? ( dev-qt/linguist-tools:5 )"
-
-src_prepare() {
-	cmake-utils_src_prepare
-	if [[ -n ${LINGUAS} ]] ; then
-		sed -i \
-			-e '/aa ab ae/d' \
-			-e "/GETTEXT_CREATE_TRANSLATIONS/a \ ${LINGUAS}" \
-			po/stellarium{,-skycultures}/CMakeLists.txt || die #403647
-	fi
-	# Turn off TelescopeControl since dev-qt/qtserialport isn't
-	# marked stable and is missing keywords besides.
-	sed -i \
-		-e '/SimpleDrawLine/  s:0:1:g' \
-		-e '/TelescopeControl/s:1:0:g' \
-		CMakeLists.txt || die
-	sed -i -e '/stellarium Core/s/SerialPort//' src/CMakeLists.txt || die
-	use debug || append-cppflags -DQT_NO_DEBUG #415769
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_enable nls)
-		$(cmake-utils_use_enable sound)
-	)
-	CMAKE_IN_SOURCE_BUILD=1 cmake-utils_src_configure
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog README" \
-		cmake-utils_src_install
-
-	# use the more up-to-date system fonts
-	rm "${ED}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf || die
-	dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf
-	dosym ../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf
-
-	if use stars ; then
-		insinto /usr/share/${PN}/stars/default
-		doins "${DISTDIR}"/stars_{4_1,{5,6,7,8}_2}v0_1.cat
-	fi
-	newicon doc/images/stellarium-logo.png ${PN}.png
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index b2df4a67b191..1be75c4273c8 100644
--- a/sci-chemistry/Manifest.gz
+++ b/sci-chemistry/Manifest.gz
diff --git a/sci-chemistry/votca-xtp/Manifest b/sci-chemistry/votca-xtp/Manifest
index d635ec72db9d..077f76c40cab 100644
--- a/sci-chemistry/votca-xtp/Manifest
+++ b/sci-chemistry/votca-xtp/Manifest
@@ -4,5 +4,5 @@ DIST votca-xtp-manual-1.4.1.pdf 1066873 BLAKE2B 8cbd4b55b013794a19a8b5867b929b8e
 DIST votca-xtp-manual-1.4.pdf 1064006 BLAKE2B e4f0c20c6d40a5f58b863258cc122e5a7cf376b7138927c0a6bdd400841c330fc013287513258f6f68609e39f0bf39b965fd099171594c5e2730fba82a2488d4 SHA512 96d7f59dbcc3a6efdc297237025217d5a56d2c81e491d90680786ea4769a5ebbea379df3b06c4847307ee30accd7415e316dee4730361262f5aff73d2f5d387e
 EBUILD votca-xtp-1.4.1.ebuild 1622 BLAKE2B 1358e16a21b653584fefdf8eb673744f18ba75ef59ae5410c609857ca0b6d73676b5f7ca101dd24d2d58ca1547ca062941c71296ca57e45cdfed29052dfc7cb2 SHA512 bee48dc7a8c0caba3a9a7ed546ad690fb9fc22310f512bc613aa76b35f72b39f4a2b620ab2789237465ce07a0be7b8fbb444eccd45e795b0c1cc3667b046f978
 EBUILD votca-xtp-1.4.ebuild 1618 BLAKE2B bab1c2d4cd442bc2208f87ff16ed1218aaf6c34ccb229c63d9de14086055684ee9440102b0c9a5bf807ddad69d22ee1b680120f493f18891e8719211509a418f SHA512 affe412a6c4cb8139530d559ae4c12d519eb6b9190075743ed7806c2975a4647f48282893d71b4bef3477b0d35ee07815e416c33095be819967d235c9623a48a
-EBUILD votca-xtp-9999.ebuild 1539 BLAKE2B 9f4d2fe45e0ea4afeeb22023cd9d4161be58b938e0db77f99c7ad86f7f6f115921338a8cd2e48daf334c1429df399f14b84eb2a32d672ee0dfeffc836d7a49f7 SHA512 b712e1702190f0668be113e4953cd760bdb669ec2ee32ce9f3453322b060f52ce0898790b225f952f62536fb27264be5b21ef402883b88ead6f86df4cd539f09
+EBUILD votca-xtp-9999.ebuild 1578 BLAKE2B 4bb4b3043c4005e87fa940c32beed2a11c6ede911d780136c78bda1606e107974bf06f4b62396f610d2a9c26a176739fa895ab3847c085f3158db99ecc4cdbfa SHA512 28d38840cec12742a274183926e1b05fba54bab9148fa1b3bb4ea435611e3aad7bb6d43ef68df6ec57c1234a1de2927fb327978ba8a130e6152368254d34119b
 MISC metadata.xml 453 BLAKE2B 51ee11d9c55f15fd0382a7c422d1c12364901a5ac257f57d04b91b8ca77acf9c1eb709879bfc6042b577961352cbc4e31b01ece3a8c650eaffa9b4ebc6d385fb SHA512 892c8f84df6bd19e969b372def9a485be9121d8f7ab410b532529980298e57d0705f73fac409d8f251449cf2119dd3f28133e08d21d0e73b27d5ec0e9a3f205e
diff --git a/sci-chemistry/votca-xtp/votca-xtp-9999.ebuild b/sci-chemistry/votca-xtp/votca-xtp-9999.ebuild
index 34942d79c596..40eff61cae68 100644
--- a/sci-chemistry/votca-xtp/votca-xtp-9999.ebuild
+++ b/sci-chemistry/votca-xtp/votca-xtp-9999.ebuild
@@ -29,7 +29,9 @@ RDEPEND="
 	~sci-libs/votca-tools-${PV}[sqlite]
 	>=dev-cpp/eigen-3.3
 	~sci-chemistry/votca-csg-${PV}
-	~sci-chemistry/votca-ctp-${PV}"
+	~sci-chemistry/votca-ctp-${PV}
+	sci-libs/ceres-solver
+	sci-libs/libxc"
 
 DEPEND="${RDEPEND}
 	doc? (
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 6b320bdab264..23f0ff84127d 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index 812c5cb179d0..01b50d55dd52 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1,6 +1,8 @@
 AUX qwt.patch 2136 BLAKE2B 3ab69581d1dac006ebd493c82bebee7df34fc00accf7957411a143ce1ba6fffebdffe3468ada7c1e51375cb55adca5d1b28c7a6d1708355d60508f85422e2494 SHA512 4a9edac8565bc7a77644d9b6adeec61187c34dcf72f309066eb6575de7baef5cb59668c70bf5b51fb22a8e5bad00da4d664d279b1d22aae5dbb8fe07f69ae91b
 DIST gazebo-9.3.0.tar.bz2 52924750 BLAKE2B c908827fca7786b0dac10401549265d6d0ca0ce5c952816b5d3d5f2feec096f0465778b4165a4054abd285ec1fedc80e3d2ed3c81be234574d7419d2635f61f4 SHA512 5874582e015cfc2b690b26cd810e4c79cc5dba1ecea7eaa72d3c12e0a5f3dd6f42185666f0cf36a1d00564b642c2c63662b06657da82cfd2ce3ebd9219012cb4
 DIST gazebo-9.3.1.tar.bz2 52961705 BLAKE2B d1860a13f1c23d3ffaeb8087c94a5b72682c99eec03927105a4e2fc9e951a41c2723f394fe613be4a2603aacd153817e5445b21518ecdb0f0d4d8e6eb4ee28eb SHA512 d3d41a32cab440358fb1dd2524d9a1601fbff8b272c86120d82ddc3337f2a8dcda46c3ba24f95dba99e061ef69c15ac919b5c8e4d16ea71a9da572bb9a5cee12
+DIST gazebo-9.4.1.tar.bz2 53014386 BLAKE2B c3e450f869f3e5f88bd9b5f5924a6b003880fff492849d6570222c7c37e98f1b89df4dca1af16c9a766b049067bbcc9d86334882041c6420b6b5221dfd643bb0 SHA512 76fb217c396f4d70fa4617df3aa5a672b5ddd4680df22eb3fbe67182ef8b3e05affda2e61f71d03e31f9c47b2f7d56aac162b63dec2f122cef1e47fd65d25f02
 EBUILD gazebo-9.3.0.ebuild 1863 BLAKE2B fdc678548a0cfc8af2959b043562dabdc1b55bb1b38d68c10bed909977a66c03acb95c5ba403db3f2025c5abcf1abc772ef2efb3d0434bc461b2f2419207d604 SHA512 a66748b7ead2b075e0e4dc5b24ac1cb27413eaa75e47920cedae3e658286d45a8bd8a3507efce4bb0b16a3aa40fd2d6ea23cf03f70942cf2d92a968a5c77ba19
 EBUILD gazebo-9.3.1.ebuild 1863 BLAKE2B fdc678548a0cfc8af2959b043562dabdc1b55bb1b38d68c10bed909977a66c03acb95c5ba403db3f2025c5abcf1abc772ef2efb3d0434bc461b2f2419207d604 SHA512 a66748b7ead2b075e0e4dc5b24ac1cb27413eaa75e47920cedae3e658286d45a8bd8a3507efce4bb0b16a3aa40fd2d6ea23cf03f70942cf2d92a968a5c77ba19
+EBUILD gazebo-9.4.1.ebuild 1860 BLAKE2B 34803940ef219c1231d1a543b90eb6fe3fcbed2e857fff7c385ab2d5982607bcaeccb23506361665f772d7efeaf99f1409c815799725deea32aca57ce67c3c7e SHA512 e74178fdb49183973ceb33a1a86a4b12b409856afdf2ce71adc809379386a9665cb6b0bbb52480a10eb619b2edaad9cc3eb12396a07941124d8825b07035dfd5
 MISC metadata.xml 243 BLAKE2B 13c40383778472fec33f877963b2be8d44c354e5449e3ac38dfba06cb38e4cfb6a63d5d73c5acb1e02a1c8ee783131c46c8b56eb14de786de7f77635f15d18d7 SHA512 c9d5c1cdd2874fe293f21f7584c6e15ef9439bd82b0d2e862e3e34c9a9e0e3191370fee2727b9d4d8647fb85cf56a39fdd6c1e0003ada1554496aad311ef335c
diff --git a/sci-electronics/gazebo/gazebo-9.4.1.ebuild b/sci-electronics/gazebo/gazebo-9.4.1.ebuild
new file mode 100644
index 000000000000..d1bd0c594b06
--- /dev/null
+++ b/sci-electronics/gazebo/gazebo-9.4.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils versionator vcs-snapshot flag-o-matic
+
+DESCRIPTION="A 3D multiple robot simulator with dynamics"
+HOMEPAGE="http://gazebosim.org/"
+SRC_URI="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+# Subslot = major version = soname of libs
+SLOT="0/9"
+KEYWORDS="~amd64"
+IUSE="cpu_flags_x86_sse2 libav test"
+
+RDEPEND="
+	>=dev-libs/protobuf-2:=
+	virtual/opengl
+	media-libs/openal
+	net-misc/curl
+	dev-libs/tinyxml
+	>=dev-libs/tinyxml2-6:=
+	dev-libs/libtar
+	dev-cpp/tbb
+	>=dev-games/ogre-1.7.4:=[freeimage]
+	<dev-games/ogre-1.10
+	>=media-libs/freeimage-3.15.4[png]
+	sci-libs/libccd
+	libav? ( >=media-video/libav-9:0= )
+	!libav? ( >=media-video/ffmpeg-2.6:0= )
+	sci-libs/gts
+	>=sci-physics/bullet-2.82
+	>=dev-libs/sdformat-6.0:=
+	dev-qt/qtwidgets:5
+	dev-qt/qtcore:5
+	dev-qt/qtopengl:5
+	dev-libs/boost:=[threads]
+	sci-libs/gdal:=
+	virtual/libusb:1
+	dev-libs/libspnav
+	media-libs/freeimage
+	sci-libs/hdf5:=[cxx]
+	sys-apps/util-linux
+	media-gfx/graphviz
+	net-libs/ignition-msgs:1=
+	sci-libs/ignition-math:4=
+	net-libs/ignition-transport:4=
+	x11-libs/qwt:6=[qt5(+)]
+"
+DEPEND="${RDEPEND}
+	dev-qt/qttest:5
+	app-text/ronn
+	app-arch/gzip
+	virtual/pkgconfig
+	x11-apps/mesa-progs
+	test? ( dev-libs/libxslt )
+"
+CMAKE_BUILD_TYPE=RelWithDebInfo
+PATCHES=( "${FILESDIR}/qwt.patch" )
+
+src_configure() {
+	# doesnt build without it
+	append-cxxflags "-std=c++11"
+	# doesnt build with as-needed either
+	append-ldflags "-Wl,--no-as-needed"
+
+	local mycmakeargs=(
+		"-DUSE_UPSTREAM_CFLAGS=OFF"
+		"-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)"
+		"-DUSE_HOST_CFLAGS=FALSE"
+		"-DBUILD_TESTING=$(usex test TRUE FALSE)"
+		"-DENABLE_SCREEN_TESTS=FALSE"
+		"-DUSE_EXTERNAL_TINYXML2=TRUE"
+	)
+	cmake-utils_src_configure
+}
diff --git a/sci-electronics/ngspice/Manifest b/sci-electronics/ngspice/Manifest
index c55e46682fc3..dddadc3a5a70 100644
--- a/sci-electronics/ngspice/Manifest
+++ b/sci-electronics/ngspice/Manifest
@@ -4,6 +4,6 @@ AUX ngspice-27-fix_parsing_tcl_commands.patch 448 BLAKE2B d5d3532bca4301aa4c2811
 AUX ngspice-27-split_terminfo.patch 1081 BLAKE2B 8e44c6fe8447b419986206cc658a255e3c574d81cbbb3079d00f08046978f7a08c8c3e9697fdbf009aa1840df60d0045bd6712351280977cf8e66e3d2d505ab2 SHA512 2e5b7f83045304fbc5b35a9c7aeff3ed343b27d830e4d69bf5b30c631f59965241116afc5d062f3fb16b20710e42897605fc614fecb01997a92c595c47510f66
 DIST ngspice-27-manual.pdf 3117788 BLAKE2B 6e271abc50b0139c4776844ea31176d231e68c70ce34d0daec48aefc5ef5a9eac90a77f3141081f38c6ac8d42bb95ec061bf1d43bfd3a4fb13e4822c2eff4f57 SHA512 ed87764715917e2cd832c49e911a2908dba9907f9f01c933cb7f97a92c7f9ff345bc26a2f0561dd34b2eede6874b6a67b4864abf3dcff127bd0306e778e997b5
 DIST ngspice-27.tar.gz 7372998 BLAKE2B ce8590518fa4eb4292c73c4eaefdd9d0da19bca8120b51daae954a5b9d86f51912d2dccb5a827480caadce8321373d96f045226db4986a78bcc9170f2e46f9a5 SHA512 1714f95ab5716c228a0b39395a742e8b9a823e0e6f7e08625d089541ea786df5fd7b9d2982bcec8431e27ac6ba7603ecc507f9cfcb0a6aacd53f5633f52bd2ea
-EBUILD ngspice-27-r1.ebuild 4283 BLAKE2B 67439d2b41e5feee5df3a403c3272770369f071ee119f14a55b3e933ec9c56330f5b7f56bacf41adf831bebfa0b29c9cc07168a95b9c122e66cc00922b5850d0 SHA512 9c7827ef53f3334ebc531bf2163f060b8c9c9ec7ac5661e1b4864523ed6995f5a611c39906482d9c706edba780290f9135dc737ebf53953825413f71c40cda45
+EBUILD ngspice-27-r1.ebuild 4281 BLAKE2B def66993990b59da6920f3fafb4b55b0219308323ebc5d64398cd1ef149219dd54d77bcf8b7c60a4207d70e6e9a39c389877e72d49cda1663fd97e3e1d41d8f7 SHA512 568bc61f6770fde21b14ab3412afa9d8e1054fdb7b5794c0504fb7de3cddaa6ef190756c2944c50dc7ca7754d5bc2c81fb272a96b189b52b720dcf61b0e2838e
 EBUILD ngspice-27.ebuild 1828 BLAKE2B f7e886b443f1d58cce69434a5dd9dd87cbd67cd0d6432b99a7efd857f4f7feb36cec3f56502550227785cbffd51f11b819394d247fd4b45c7ed0862f1e5739c1 SHA512 e2fc30a6ce6ef0ecc83444f4e3a305826bdb7c3591984382e0f1cfd9469d5caf0771d4aacd8c8e0e35fff6eb06e3577c13e655692cf610c30586e02558b2292f
 MISC metadata.xml 613 BLAKE2B 658a1ccd1c1149c4b3626b482b1c80845502b80d0cd9316117f433edc4d2e5106ac92b97c3bebc23c43a82247592cc85068b08eea3caa859f976548f2a890a73 SHA512 791dc0311699db360c5e013f33786fb546119010cb8bbc36fc91ac6a522f1642f4297d8ffb945291ee20ce337647777d06e463083ac6ca0888d36ff0e1a71dcc
diff --git a/sci-electronics/ngspice/ngspice-27-r1.ebuild b/sci-electronics/ngspice/ngspice-27-r1.ebuild
index 849d3e48a217..d38410833c7f 100644
--- a/sci-electronics/ngspice/ngspice-27-r1.ebuild
+++ b/sci-electronics/ngspice/ngspice-27-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
@@ -12,7 +12,7 @@ HOMEPAGE="http://ngspice.sourceforge.net"
 LICENSE="BSD GPL-2"
 
 SLOT="0"
-IUSE="X debug doc examples fftw openmp readline shared tcl"
+IUSE="X debug doc examples fftw openmp readline +shared tcl"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x64-macos"
 
 DEPEND="sys-libs/ncurses:0=
diff --git a/sci-electronics/qelectrotech/Manifest b/sci-electronics/qelectrotech/Manifest
index 94b00adaa92c..1046a5c55b47 100644
--- a/sci-electronics/qelectrotech/Manifest
+++ b/sci-electronics/qelectrotech/Manifest
@@ -1,5 +1,7 @@
 AUX qelectrotech-0.3-fix-paths.patch 2304 BLAKE2B 113afe4cd025baecc3ddd4060179d3b81da32ac172eb452bb74215cc9a2e227bd7f31474452fb4055cc9d4cbda5cd0eea856929b191917a263a7e9ac20de9483 SHA512 3d57c172bf63faa3bd5ead082be1c3143330bae8ebdde580a5b5a860d5419371a05082f4b69e39054629e9f39f258b26ec65f773238b8b7b4b892176ad998c31
 DIST qelectrotech-0.5-src.tar.gz 13814511 BLAKE2B 930498fea6023936f2c3f38134a6d3d337cedc8c557ef69aa3ed2269ba12ca95dd35e77640d03c1701e0c57f865adf5d87283999c782917c7e3058d88bc4944b SHA512 af918d77661c2aaa0f57b150512faec6337512edf6c67e22b9ce50e5a68a300ac37add28d24109732f981af8f9549003c4aaca2a3969913e94ba61404945dcfd
+DIST qelectrotech-0.61-src.tar.gz 9083192 BLAKE2B 25966e70f7f297ed55b539472970698f0947985c377cd90648d03fce8bf73c1bdede97e1104163147c5e60bb8ad05c55718f182528e6131adef6efeaf76f8e82 SHA512 b07d28520bef5773f5f93595c53a839a160c5927a7534ec30eba451fd33ab090909fc1971f28aea53538ff8e20ca45eff0b6597f3ab103b00b89eaa65067f918
 EBUILD qelectrotech-0.50.ebuild 1132 BLAKE2B fc20f37a2c06027ab8d1b06e816a2b911c7569755e33b3b2ab29e057d5fd56ac6b0e22f017e54ae5a38a18b0ad17d0df04c470e32543a8670d001e588b754204 SHA512 075ef688f11da4d5ba56f4eecd585559acb0bfb6d57f207e422595497b746f77bf44ce8f7609610477c543dd84c3200c431979f14a3bbf5b24976960d42c8b71
-EBUILD qelectrotech-9999.ebuild 1122 BLAKE2B 508473c4ca6d8f66d6b2a547b88686ca0da5ebcc079051cf5dbc4c13c53fcd85d596a8e34711cb0c0f5cd370a97ec4e84674ad91714d7c38c7d28d94b246a6e6 SHA512 3d8fadd3b1e1bb1c1b3c55813f3dd82763a9935432a71f3c2715365d988db4b86d23c0449016541cd429aba6bae8df32d3d5e186ea1b3c52e2c8f006f83cc6d1
+EBUILD qelectrotech-0.61.ebuild 1152 BLAKE2B b4a0f8d1a24c5cc2f1fa02d2b54fc182d9cf17bfe22edc34e88617e0f179a71ce12fb07e30e7c656f665a04b5555653bc280337471c80f72b69998fbcee6e870 SHA512 9d0bb675a8efe74505fa3f2208aff72169353f4dc57371d13fb8f01ab739f5ba16acc6c18e134175364942ff2b9399bfa1df068f11dd19f139dccc37a0d4843b
+EBUILD qelectrotech-9999.ebuild 1140 BLAKE2B 6b8d5a31d843e36140c2ba4d978e4c81c93a9fc2e592c4e00f04c1a47381469415741757f6c5aea1ee4a3eaedf417d48496ad920513a47483a19a30882378aac SHA512 59201435121eb4efe6d68a194c221ac97738c6fb871ffdb9b3ae06ceb7e1ade5d62f0f34380e0145537e61b7cb0991af0abfbe24c49b5a0208596fe063f162b4
 MISC metadata.xml 247 BLAKE2B 1428e575bd9b69424c4711499480493ae371840c146149819dc41c38335cbd16d7ce50ce8f6b7be1b77db73092ed6900a9a2d8032cc790058a56e533b01f562d SHA512 b43c8e84c3c753b49b203921a5aca792639a36d6efdbe16c069ff9abfbce0585718bb3824c03abdd7bd19ada13fb0a98a378c85ed369ac5fdc53ad3b3d5465d2
diff --git a/sci-electronics/qelectrotech/qelectrotech-0.61.ebuild b/sci-electronics/qelectrotech/qelectrotech-0.61.ebuild
new file mode 100644
index 000000000000..65c80501b9a6
--- /dev/null
+++ b/sci-electronics/qelectrotech/qelectrotech-0.61.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 qmake-utils xdg-utils
+
+MY_P=${PN}-${PV%0}-src
+
+DESCRIPTION="Qt5 application to design electric diagrams"
+HOMEPAGE="https://qelectrotech.org/"
+SRC_URI="https://download.tuxfamily.org/qet/tags/20180823/${MY_P}.tar.gz"
+
+LICENSE="CC-BY-3.0 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( CREDIT ChangeLog README )
+PATCHES=( "${FILESDIR}/${PN}-0.3-fix-paths.patch" )
+
+src_configure() {
+	eqmake5 ${PN}.pro
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	einstalldocs
+
+	if use doc; then
+		doxygen Doxyfile || die
+		dodoc -r doc/html
+	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/sci-electronics/qelectrotech/qelectrotech-9999.ebuild b/sci-electronics/qelectrotech/qelectrotech-9999.ebuild
index 471a94431395..beb66ed5e787 100644
--- a/sci-electronics/qelectrotech/qelectrotech-9999.ebuild
+++ b/sci-electronics/qelectrotech/qelectrotech-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2001-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit eutils gnome2-utils qmake-utils subversion xdg-utils
+inherit gnome2-utils qmake-utils subversion xdg-utils
 
 MY_P=${PN}-${PV%0}-src
 
@@ -17,6 +17,7 @@ KEYWORDS=""
 IUSE="doc"
 
 RDEPEND="
+	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
@@ -33,14 +34,12 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${MY_P}
 
 DOCS=( CREDIT ChangeLog README )
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.3-fix-paths.patch"
-}
+PATCHES=( "${FILESDIR}/${PN}-0.3-fix-paths.patch" )
 
 src_configure() {
 	eqmake5 ${PN}.pro
 }
+
 src_install() {
 	emake INSTALL_ROOT="${D}" install
 
@@ -52,16 +51,14 @@ src_install() {
 	fi
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
 	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index c54cd61b1912..264ab4b4136b 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index ecfdf1f1a293..184dbc541b3e 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -4,7 +4,6 @@ AUX gpsd-9999-do_not_rm_library.patch 630 BLAKE2B ca14382bd2a15a6dad255d52484fb3
 AUX gpsd.conf-2 198 BLAKE2B c72808d1b43c8f1d97d97369d3f95fe2726a7972ea08915dcd35e82f543265cd457646405b00bd15e45b4a131c5f8d0efefb910be6013476ba7b052650298934 SHA512 75dbfe39eb900cc9587dd70794ee77ae2230765bbede47760ca227145aa3f2290b6995335ffcfeae6cd86f56b01ca87367548f4fbcf810aff1bc012b7416deef
 AUX gpsd.init-2 825 BLAKE2B 340bd992093d81067cef4329e50e4daa6e663ae214e560080ee58f99fbde742272979ca8b843c47ad6f1c2038d5bcab5c7886a963881bcf09079fb1ec1730aae SHA512 51319247eb78c3021d3eb897cb5d6026cc09d46a532a245a835459ed525947ffb6239f08126dd7e344de52e3b0387226bce060191ec3f14f99fc9f255d96f8ea
 DIST gpsd-3.17.tar.gz 8755304 BLAKE2B d1f82b5734fd90fe903a6f2fe8835fe8292fe3e729306e7abe4054821971fece4c23f382c08a233503f07ad66b7b3a02a52a000e55c08491bf254ab6e99378b5 SHA512 71085053f600730e0f2de269c59ce0a17ae106ef01403f02d78418b267c6adb9818d541fba59eb23bf71cdb67c5442c82b4948d262ef7e74bb993dcae677a1b1
-EBUILD gpsd-3.17-r2.ebuild 4605 BLAKE2B ae605e7afa0995de4d44d854674af3d90270cf1e14becd4e64985f59afff68ef925d8597158f3eb6fbec752b3cb3e0fb518693d304bdb23d890421ddfd1ee1ba SHA512 481f9df3dc6bf931f090a73d12ecadeb929dbe4a3bef4d274826c2a4e7017e3ae34bb50fd4bf5ef10d8a6aa42ab020097c909cb38d06324232e1484125f73183
-EBUILD gpsd-3.17-r3.ebuild 4629 BLAKE2B 78fdb2fb9e6bd96dcbbe6a775b5dd575b76511da17ecefa450e9923d4b0126526f4cd9ee11ae8e351e59a21c96567831754713a6752be371fab4e2076c863199 SHA512 da4de6ccd8b65323796bf7f1dd02c63e03599a1cce6b19a1eaafe55cb8ff148a4fda6931acdb0e1fa0da541633b097afb3784e2736b60860d9eafd22b525ca09
-EBUILD gpsd-9999.ebuild 4747 BLAKE2B 35b27062bb061c181550a0ca6ef7e7a77a271abfa882983bbf1cee1f2f178e132eeae4140974d15b1bbaac279642b86cdb5926fc171268a1410ba09ee90be051 SHA512 457d0269b9c66244bf2cf45e5e5f40c82cc4770cff7460588781035b48602c6d388c9bcb051df17d061366aa1bc40eaa9edce06ff4cb9628b8a3bc81de3d0096
+EBUILD gpsd-3.17-r3.ebuild 4671 BLAKE2B d969f11c968bc53c6d1db3b44437ac9bd794f16fba2ecebff9aba9ee4edaaf5cdbaf609549c5960fea984ccb1fb5585d8aca959691ea3b7a91689cfa35e6fe38 SHA512 f2a2343380066222632f51fe68216eb69ec424bfb70ee33ce3072665661901f9e03cd1d66e700e681f67ad6327d740654b792aa81152fd41851eb1b415c34e0e
+EBUILD gpsd-9999.ebuild 4782 BLAKE2B a2b28f71cfba21150a8ca8355b6fcdaf4829622d26c22406fbe57bc0044f08a1fb22648b4ecd19301e02455285de64ecaa499416d50e525abbe98dcf71b1a929 SHA512 26f42e20dabbfed867f570c145eb4501fbe1871d61b9ba7759f95c93d9d3f0f044ebdc015f11c1231cecef3a6333db73dcf9030d1c4e0252613523b712e31971
 MISC metadata.xml 950 BLAKE2B a2250377cdd4f1e827e7fe7dd5f8707316e8cbe9552f4ca2e56828e138d2d2b31d5c6cc930247c8666c9546fbe8dad618b2c38a34b6caac7f9e82ca620806ef3 SHA512 a5e8e60afc8c02e769cf496caa30003173455d82554378457ee7350bcc64b57a88b697cf2284a7a56f008461a33d260d167ce866bde0710e235f684e201a5bf8
diff --git a/sci-geosciences/gpsd/gpsd-3.17-r2.ebuild b/sci-geosciences/gpsd/gpsd-3.17-r2.ebuild
deleted file mode 100644
index 6b0e491c7b74..000000000000
--- a/sci-geosciences/gpsd/gpsd-3.17-r2.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python2_7 )
-SCONS_MIN_VERSION="1.2.1"
-
-inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.savannah.nongnu.org/gpsd.git"
-	inherit git-2
-else
-	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
-fi
-
-DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
-HOMEPAGE="http://catb.org/gpsd/"
-
-LICENSE="BSD"
-SLOT="0/23"
-
-GPSD_PROTOCOLS=(
-	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
-	gpsclock isync itrax mtk3301 navcom nmea0183 nmea2000 ntrip oceanserver
-	oncore passthrough rtcm104v2 rtcm104v3 sirf skytraq superstar2 tnt
-	tripmate tsip ublox
-)
-IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
-IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth dbus debug ipv6 latency_timing ncurses ntp python qt5 +shm +sockets static test udev usb X"
-REQUIRED_USE="X? ( python )
-	gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	bluetooth? ( net-wireless/bluez )
-	dbus? (
-		sys-apps/dbus
-		dev-libs/dbus-glib
-	)
-	ncurses? ( sys-libs/ncurses:= )
-	ntp? ( || (
-		net-misc/ntp
-		net-misc/chrony
-	) )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtnetwork:5
-	)
-	python? ( ${PYTHON_DEPS} )
-	usb? ( virtual/libusb:1 )
-	X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( sys-devel/bc )"
-
-# xml packages are for man page generation
-if [[ ${PV} == *9999* ]] ; then
-	DEPEND+="
-		app-text/xmlto
-		=app-text/docbook-xml-dtd-4.1*"
-fi
-
-src_prepare() {
-	# Make sure our list matches the source.
-	local src_protocols=$(echo $(
-		sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConstruct | awk '{print $1}' | LC_ALL=C sort
-	) )
-	if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then
-		eerror "Detected protocols: ${src_protocols}"
-		eerror "Ebuild protocols:   ${GPSD_PROTOCOLS[*]}"
-		die "please sync ebuild & source"
-	fi
-
-	epatch "${FILESDIR}"/${P}-do_not_rm_library.patch
-
-	# Avoid useless -L paths to the install dir
-	sed -i \
-		-e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
-		SConstruct || die
-
-	use python && distutils-r1_src_prepare
-}
-
-python_prepare_all() {
-	python_export_best
-	# Extract python info out of SConstruct so we can use saner distribute
-	pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
-	local pybins=$(pyvar python_progs | tail -1)
-	local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct)
-	local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])")
-	local client=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])")
-	sed \
-		-e "s|@VERSION@|$(pyvar gpsd_version)|" \
-		-e "s|@URL@|$(pyvar website)|" \
-		-e "s|@EMAIL@|$(pyvar devmail)|" \
-		-e "s|@SCRIPTS@|${pybins}|" \
-		-e "s|@GPS_PACKET_SOURCES@|${packet}|" \
-		-e "s|@GPS_CLIENT_SOURCES@|${client}|" \
-		-e "s|@SCRIPTS@|${pybins}|" \
-		"${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	myesconsargs=(
-		prefix="${EPREFIX}/usr"
-		libdir="\$prefix/$(get_libdir)"
-		udevdir="$(get_udevdir)"
-		chrpath=False
-		gpsd_user=gpsd
-		gpsd_group=uucp
-		nostrip=True
-		libgpsmm=True
-		manbuild=False
-		shared=$(usex !static True False)
-		$(use_scons bluetooth bluez)
-		$(use_scons debug clientdebug)
-		$(use_scons dbus dbus_export)
-		$(use_scons ipv6)
-		$(use_scons latency_timing timing)
-		$(use_scons ncurses)
-		$(use_scons ntp ntpshm)
-		$(use_scons ntp pps)
-		$(use_scons X python)
-		$(use_scons qt5 libQgpsmm)
-		$(use_scons shm shm_export)
-		$(use_scons sockets socket_export)
-		$(use_scons usb)
-	)
-
-	use X && myesconsargs+=( xgps=1 )
-	use qt5 && myesconsargs+=( qt_versioned=5 )
-
-	# enable specified protocols
-	local protocol
-	for protocol in ${GPSD_PROTOCOLS[@]} ; do
-		myesconsargs+=( $(use_scons gpsd_protocols_${protocol} ${protocol}) )
-	done
-}
-
-src_compile() {
-	export CHRPATH=
-	tc-export CC CXX PKG_CONFIG
-	export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
-	escons
-
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	DESTDIR="${D}" escons install $(usex udev udev-install "")
-
-	newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
-	newinitd "${FILESDIR}"/gpsd.init-2 gpsd
-
-	use python && distutils-r1_src_install
-}
-
-pkg_preinst() {
-	# Run the gpsd daemon as gpsd and group uucp; create it here
-	# as it doesn't seem to be needed during compile/install ...
-	enewuser gpsd -1 -1 -1 "uucp"
-}
diff --git a/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild b/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild
index 4a84dbffcc3a..67bbed4914e3 100644
--- a/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-2
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 arm ~ppc ~ppc64 ~sparc x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
@@ -37,6 +37,7 @@ REQUIRED_USE="X? ( python )
 	qt5? ( cxx )"
 
 RDEPEND="
+	>=net-misc/pps-tools-0.0.20120407
 	bluetooth? ( net-wireless/bluez )
 	dbus? (
 		sys-apps/dbus
diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index e3db55c44b07..445bb73cc6e4 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -37,6 +37,7 @@ REQUIRED_USE="X? ( python )
 	qt5? ( cxx )"
 
 RDEPEND="
+	>=net-misc/pps-tools-0.0.20120407
 	bluetooth? ( net-wireless/bluez )
 	dbus? (
 		sys-apps/dbus
diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest
index 30a6fecfc198..f373246d955b 100644
--- a/sci-geosciences/qmapshack/Manifest
+++ b/sci-geosciences/qmapshack/Manifest
@@ -2,7 +2,7 @@ AUX qmapshack-1.11.1-qt-5.11.patch 738 BLAKE2B f67a505ae4c63f7aac616c6dab7c6b0d9
 DIST qmapshack-1.11.1.tar.gz 11446871 BLAKE2B fa92b93787306d23110112fd851f0ee02418ac7b27316f57b4045efc4ae726e36c4014682d1ee32879f8894bab7dcac70852384f8b158e01026d7782f67b5ede SHA512 43e1b587bd3f4901b155ea6d1d520cf303681640c1bd521b30ef7f23aaf49b2fffe9b764e5dd3fcaef360b0d32b360b76eb8d737ec5e186aa75362ff2507956e
 DIST qmapshack-1.12.0.tar.gz 12030329 BLAKE2B af641e76b00ee7dc7d964fd9f4ba75e51d7d6bcc4b33e020129181655371cda91f8ddffdcfd489f55228c22fc63416e6e5c8f4b1755a6a07e5832895a921afc7 SHA512 dac6081b37eab39431221acdd48a3e61876ff40e4f76aac7eed9232e839cabc69a099cb2e9e29fcc23cf439eaa8a3d1522be17e24c71e2b6d3f332eb3127efb5
 DIST qmapshack-1.6.3.tar.gz 5181205 BLAKE2B 89e7a638f35e0e555b237a000992f48b1a126ed9de5c2892ee8e147060866656b87abbc46937cc5187e473681b71a2dfb250160d4847824df4989c352afd676b SHA512 6e9efdd35ebf3980011aea0cefdbcc433e4f0d333cbeff72e70880a41bff972cc27f4517e243f4990b5e04112a50af2651d99cb5c1c6e542341db30e5e000133
-EBUILD qmapshack-1.11.1-r1.ebuild 941 BLAKE2B 2a6dcae97ebdde708bfecd2fb530195bd845574a82ba0da988c5799399f5f812c1b5e970e20ffc1e2c4916e655030b631822b9a49868192316bb5990fceacd4a SHA512 6675e905256dabe54b8dded277425e5f3fa7501ecf1974843632077cc42b84a89e43238cb5b1e921287039b11d0876ca2730f4d828af1c861191337caefe43bb
+EBUILD qmapshack-1.11.1-r1.ebuild 937 BLAKE2B e85730518ec6b863e90db2b77a24f2a4def775338a7683e80f7040e61806e3f2d6e0bc823afd1acdeb25641743261ea2a0cf2470795de1a20d2edcaefb3c5998 SHA512 148bab65d8f829d89e84f1df532701085d378fc9bda4f51fc68c8b05c9c48874e9acbc7ae721044db7a56b907ca9fe417094281c5460f571e7ebddad6cfcc57b
 EBUILD qmapshack-1.12.0.ebuild 922 BLAKE2B fc3b1c8317a13af3a85c85225df00470cc0ea4a2a0968cd843f827e23d0c4dd2f1c078df3c4dc3664b10e0f3e2165d1f92c1447175e2e53d60e78da68016948e SHA512 a146801935f9816c3e3abb09f88468cfd5e2d89881f6130325f17fa58d55705cbb6dfadd93340a531e4efe5b6eae7751bca741f1a20c153f45786385212fc623
 EBUILD qmapshack-1.6.3.ebuild 594 BLAKE2B 47fca8a961fe1e76d41cfee2ae99c4716bb3897a596e4ed29cc872e0296eee06fbc47188f84e423b28cf0c2d725f8e0fd5dc8e903761a1fafc4f2eedc481a4c3 SHA512 d6ba2f2fb68520668a89240021ab195477c94648b8fcf50040e671922a19f35d9107a8f0b56d33077bbb4b85f36787e995b26f54462ce8b62247d2fc4d118092
 MISC metadata.xml 772 BLAKE2B b1bd146b3ae624d365dd366cef81f3eaf37c8220ddd4eeb1f64916275f6520f3bd2d458a339bdea85d0f13cde14b3038d98c32f6265204e3aa1e22424f9dbfd2 SHA512 03cd1cf6d4e0b5a420b4301ffb1077f2dda9e023572dedd1c56ba4574ab4460c125d63bb5c7475b66b023ff15dc0b9c4cfc8479218366c935108e89850ed5d4d
diff --git a/sci-geosciences/qmapshack/qmapshack-1.11.1-r1.ebuild b/sci-geosciences/qmapshack/qmapshack-1.11.1-r1.ebuild
index ed50e9be5b8b..b3f1c55aef8f 100644
--- a/sci-geosciences/qmapshack/qmapshack-1.11.1-r1.ebuild
+++ b/sci-geosciences/qmapshack/qmapshack-1.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
@@ -10,7 +10,7 @@ HOMEPAGE="https://bitbucket.org/maproom/qmapshack/wiki/Home"
 SRC_URI="https://bitbucket.org/maproom/${PN}/downloads/${P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 RDEPEND="dev-qt/qtwebkit:5
 	dev-qt/qtscript:5
diff --git a/sci-geosciences/routino/Manifest b/sci-geosciences/routino/Manifest
index c601cbf6a061..b5fcf38de2ea 100644
--- a/sci-geosciences/routino/Manifest
+++ b/sci-geosciences/routino/Manifest
@@ -3,5 +3,5 @@ AUX routino-3.2.patch 1357 BLAKE2B d921a025e377c5a8edb2ae9bd0ba634b7b40b159b9707
 DIST routino-3.1.1.tgz 1795118 BLAKE2B 4b8a44d917f2f71e333eb233eebee37de6d19adac7b31111f9b244e125d9a9a54bbbec5e166d53f3ac435f27dcb5633c9626e0ffc4025d5e8dc0cbaed6274800 SHA512 088f22e9297f485418ed369d00827690f86e224e331b69085513339870fe6d97cffef62aa5e7e14883800469beff4af4b0a581ba8bad78920a383d7152be6ede
 DIST routino-3.2.tgz 2463662 BLAKE2B 4be17e83105d95052a9fbe0158b15bf5d64b4f720fb1bb61cbbb5fcd61451b933507e4dcc8867bff5e8602c6e681e916e45328d2a0ce766e9ab37366984cf378 SHA512 f5be46d9c026fcd92658490630d9ff6e4827e84ee57ccbaae48f54372da37ab78de24432ab9fa1d6860304a9a2ac86061eb876c12b39e821693282c4d4aaefcf
 EBUILD routino-3.1.1.ebuild 659 BLAKE2B 6e61c569be646d4970b5c18cd9495988f78cfaed9477008be9d13ce1512d152849b6e12116ef2094cfdc526f6940b27b596b58dc356d53b0db6e2578c89137e9 SHA512 fd1dfd7fc8fc5821e8e7ac976aa04f3d1737509415a5a2451174e6dbe74c8ed5f1638d13cde17bdd1eedfc87c60b638470b49f42cf3e7e0787371395ff92eaba
-EBUILD routino-3.2.ebuild 724 BLAKE2B 72568d54b7afaf6727565bcf4d5152f4d1eed717ebdd097241430cfb53652a0bc401eb66ba9d53130f4b09bbc491d6f1218c2e905ca4199423d52e5e5ac76b42 SHA512 8d0ab8188fc54d3ed6f23a47b344ceec79711d1e3f3aa4f80ccb162f341e9a9b182000f05f570c63107aa47c5f4761401f52b1c4bfcc55de22ff3d53b312a119
+EBUILD routino-3.2.ebuild 719 BLAKE2B 2ebcbe7a5356b375512a682696f4bc39eb337f4a9f87362af1f003dd6c99423c4ce168fa2896590abcfc860412068d84ee80face8b3c871499042ab51c092ab6 SHA512 ea8d262efbe278b659b935bce78dcba5b1418d76edaf8f296c62315ee33533e8dd4d218b1f65f87399de63bb7762fe4a0e2cd2752ea3740993d5cdf23e40d1c4
 MISC metadata.xml 893 BLAKE2B cdfadafcae0c3898788652b567a8145efb0f98aa819df589d32c49ead219222691b19361b90c8bc5153fef1659d3c2d7e6933a21fcb86db9dfa37ab774d8d2b5 SHA512 84bd42eadbfae10a8762f0d8e28d410d2bf6c69a02e38cf870a846b5f7431130116658e22de5b2411cca0965e027d2f5c71e02bcf6b5ce1e1a804f1c235f60ff
diff --git a/sci-geosciences/routino/routino-3.2.ebuild b/sci-geosciences/routino/routino-3.2.ebuild
index 4827cce51b00..0420304cb506 100644
--- a/sci-geosciences/routino/routino-3.2.ebuild
+++ b/sci-geosciences/routino/routino-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
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.routino.org/"
 SRC_URI="http://www.routino.org/download/${P}.tgz"
 LICENSE="AGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 DEPEND=""
 
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 34cb2a80d54c..603cee54f7ae 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/libsigrokdecode/Manifest b/sci-libs/libsigrokdecode/Manifest
index 22c198f483f2..3629bd1f2dc2 100644
--- a/sci-libs/libsigrokdecode/Manifest
+++ b/sci-libs/libsigrokdecode/Manifest
@@ -5,10 +5,12 @@ DIST libsigrokdecode-0.4.0.tar.gz 694223 BLAKE2B bf1cc0f78086b64ce029b794c3c9060
 DIST libsigrokdecode-0.4.1.tar.gz 751546 BLAKE2B b1625714a75e481d94956bd64af264c87b440c0a236f19ff02d18cc16964b701de8799a81943f4e9ec1181b1906c5e62deca98fbbbc30dfbdf8bff2208f86bc6 SHA512 b072001190e80a194986524fd4de4d32f4559d618b151a3dbfa2c63b292c8a490535cb7479cfa665c4e8d3798251a5d6f5ecfa456ca669237237ffced3e88272
 DIST libsigrokdecode-0.5.0.tar.gz 790399 BLAKE2B a9d57ddfa72b96937a8ebb2f5009ab06d73a040778163fd24bc29d9379061aa7d9837277bc460ebaea65d266e4c53659c1e84e078b2fbffc7414925237b11058 SHA512 79d497f6c20efcffdf840b6f4a437b29e68fa49b9c6e73f66e5e2429d58033b83272a602289dd46ffe9f1115c36f2ad8c7d40e43f58494b027890bebcfe080a5
 DIST libsigrokdecode-0.5.1.tar.gz 813809 BLAKE2B 6850d6a543917989e277ed93335005c9d802a33f7f3c1f5a5883d060b0063da797ae271847fc63b70b7dc2149926bd8e2a6387e5d488830096bc1924ca1f2205 SHA512 bda14475317863c06615f578f9d26e267da83f7d9fdd7cd24f4e1f23344694763fb78b3b77acfa83eafc792ecd8f4554a9bbdd24fa42bee760426df4a428be7a
+DIST libsigrokdecode-0.5.2.tar.gz 852133 BLAKE2B 7a73c3766582d6fd33e597ca286b0125ece3e5e9f5f3b70dcd79dd42693b9688df674dd5d1876ddef798a5b3aee97f47df4d40b52c5a24b9b8c09a347cda96ad SHA512 49d0cba3a5fe17593165c3669dc8530e4e68497369b461f39b63c903f41a3060766c23d44c4112c9b9a5e740ae1e2c03a735494ac798dc631f3913079be04e22
 EBUILD libsigrokdecode-0.3.0.ebuild 1146 BLAKE2B 903c06444799299c6115b8650cbc8f80c0eeaaea55884afde9212c0271fbebf229204f2c4945e93f4cb45c96d5194d883adfde8482fd34feba7b987d1ffe3d6e SHA512 b991b1a35c272e7599604090f639bbc6e73adac82aafbd3b2b2a83e9ce9ab7de95c466123c44292f5a57722a078156fe7a0f0448d5538b79b7bf161f7b2d1f72
 EBUILD libsigrokdecode-0.4.0.ebuild 1064 BLAKE2B 898c2fee7c0d0c7a39e7ce25bbbce8d4060b76a9c2e3627c7a6b4f169442c0918c3d19c44b9204e92570dc1c993d3d51c233e1de79dc519a81e979fc678b57be SHA512 d7b1ae790e1d5d92c8db3a9caef5ba488ff8fc0efc32eaf8942a6a1e2a59a9e161ed6cff5119faf4e58b14873760c46e6888216e367a895ffa70d4178c5784e4
 EBUILD libsigrokdecode-0.4.1.ebuild 1070 BLAKE2B e057628b15f227858b25f4722d684dc66ea30e2d003d74b3d3034ed74f142baa49380c486cd48e3b580a3a9438f8fcf36c236ec40d33f77006ef7c9f1a7d43c4 SHA512 e2761ca53895c5384fc8d306ad2225a6d2a2ec28872016577d9a704df6175e982940dd259d14d21644b91cc43ebf63aee23f9d6e0b0b0442fb05cd83cb50014a
 EBUILD libsigrokdecode-0.5.0.ebuild 1070 BLAKE2B 765f93807990b87833264d1db1a37b7ef59f9093e55be30df3b562dcfa4958a278f0c1468e0ec16660b023eae9d89b54bbb5333704f0be7f2849fcdf0af5128e SHA512 8a299bcfbd66c1c11a50ac1cca8abe94ab4101915cb59942eae9cf1c79fcee73071cb7ab6b3b939821d3e28390c7609a101974cf76257d66f7d4c7d82b91a01e
 EBUILD libsigrokdecode-0.5.1.ebuild 1070 BLAKE2B cf752fbebc51fe06af6b350383a98daa1c1e30ed90fb32763c74f70d212b2ef27f2555d8e6010799238a181768776890e58473cc292f7840043aa77b0b84c995 SHA512 f0a6433678ebdc41da1715593d62b84ef2071bbc3559c61a11a1498ea46855c779ec278e40e64a19f9feb93dd31eae3b4c07e171e6b38b7a05107a2c49711cbd
-EBUILD libsigrokdecode-9999.ebuild 1073 BLAKE2B 8b2bf207315eace5e21e6eb2502c1448770416c2adc82a9cef8797f6af9942ea8e361836a3ad570b0270d41443ef22c55140a6681f472c694a5b8981bd4289bc SHA512 7c401109d22980b700af500ca3471dc41e0fa761cc8d6e2a83950b53e4054d46000985e13de3babab3f20703734e6ee12a3803231b4cf34ecf45732b33f06cd8
+EBUILD libsigrokdecode-0.5.2.ebuild 1070 BLAKE2B cf752fbebc51fe06af6b350383a98daa1c1e30ed90fb32763c74f70d212b2ef27f2555d8e6010799238a181768776890e58473cc292f7840043aa77b0b84c995 SHA512 f0a6433678ebdc41da1715593d62b84ef2071bbc3559c61a11a1498ea46855c779ec278e40e64a19f9feb93dd31eae3b4c07e171e6b38b7a05107a2c49711cbd
+EBUILD libsigrokdecode-9999.ebuild 1073 BLAKE2B 947b61a0838eb856a600b9f0e2f4602377d51a9051b77150a3cfffc128a965e43168b3e496bc54705d6e6427c0820cf89f8ed1cde8e5398c672f39537a90f261 SHA512 17f7c43521edf3618da79bf4264849311ab7ddd42ec7b99ec2b7fac26b4c824535d407a3dbdfd7056bf30a66ba2ae46d7eefe9ede32d0883da5a2997d635e199
 MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-0.5.2.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.2.ebuild
new file mode 100644
index 000000000000..7c39504420c1
--- /dev/null
+++ b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit eutils python-single-r1
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://sigrok.org/${PN}"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="provide (streaming) protocol decoding functionality"
+HOMEPAGE="https://sigrok.org/wiki/Libsigrokdecode"
+
+LICENSE="GPL-3"
+SLOT="0/4"
+IUSE="static-libs"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=dev-libs/glib-2.34.0
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	[[ ${PV} == "9999" ]] && eautoreconf
+
+	# Only a test program (not installed, and not used by src_test)
+	# is used by libsigrok, so disable it to avoid the compile.
+	sed -i \
+		-e '/build_runtc=/s:yes:no:' \
+		configure || die
+
+	eapply_user
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild
index 496898985daf..f16280982d7e 100644
--- a/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild
+++ b/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild
@@ -23,7 +23,7 @@ SLOT="0/9999"
 IUSE="static-libs"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND=">=dev-libs/glib-2.28.0
+RDEPEND=">=dev-libs/glib-2.34.0
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
diff --git a/sci-libs/libxc/Manifest b/sci-libs/libxc/Manifest
new file mode 100644
index 000000000000..13360a9aafea
--- /dev/null
+++ b/sci-libs/libxc/Manifest
@@ -0,0 +1,7 @@
+DIST libxc-2.1.3.tar.gz 750044 BLAKE2B 6d6bb348bd8f7e25d6a3857fc40f0d7d3a7fe22c0a0514ca9f0ca60aadd67fde65b6052bc04e076a6328841c7ebe154921937083b8e9e2b9e55a5bcf197d08d0 SHA512 6cc7e4cb9b6187d3f7be9bca0aa574a1e0807db47201bee271d651e23c34ff7f00590cbe2ab1a6c399735e55d088a27e5b3456af6df46817137b3e6857c1c221
+DIST libxc-2.2.3.tar.gz 734714 BLAKE2B c5c4c3aec3373b8b481de8ec1779366b6916899e0b77964cbde0e83904b351e009b14a3ff64e9f020640e6ebf68d78828615b8abf83a46fdf86ea16480083643 SHA512 bfcd88c1946e459227e9b1a32c513f0e68ae7a5497925ac6e692085542526ebad9fe2cd5722077c839c06dbaaceca601c7f615ee6936e638eb150a9d68278d5a
+DIST libxc-3.0.0.tar.gz 8388775 BLAKE2B e82a7310c583c39b6c2313668a5d3a3d5ae7bf71ad450e9ac6241d1601bf1bb429abf98787f7e0c3c252e881c381b895e277d18619b57c46f2f910d7e079941c SHA512 42173341f917c2aed6954f76885d2a9149d7212d2525becf77072b9878753c28d752b5cf6b2c79c90a88d8aa033f0aa94fa9753eb67108e9325cee6919cece52
+EBUILD libxc-2.1.3.ebuild 1400 BLAKE2B ccf6c433ccfb77c19b49ddef89b53db5eaee87f8204e66e94752be41e26940fce8e45c9af73374ea04ae8a27353366be778859dd6b8f2f4c8c7f39e83262b660 SHA512 ed74981ed5f5ab997e4bf34145be37aee881355a8dc60cae8e86561bb7b9f64b2926ba491e826d4d76fb11f51dfd01a63f9da7f50e73f2825d34a32360d2a14e
+EBUILD libxc-2.2.3.ebuild 1400 BLAKE2B ccf6c433ccfb77c19b49ddef89b53db5eaee87f8204e66e94752be41e26940fce8e45c9af73374ea04ae8a27353366be778859dd6b8f2f4c8c7f39e83262b660 SHA512 ed74981ed5f5ab997e4bf34145be37aee881355a8dc60cae8e86561bb7b9f64b2926ba491e826d4d76fb11f51dfd01a63f9da7f50e73f2825d34a32360d2a14e
+EBUILD libxc-3.0.0.ebuild 1400 BLAKE2B ccf6c433ccfb77c19b49ddef89b53db5eaee87f8204e66e94752be41e26940fce8e45c9af73374ea04ae8a27353366be778859dd6b8f2f4c8c7f39e83262b660 SHA512 ed74981ed5f5ab997e4bf34145be37aee881355a8dc60cae8e86561bb7b9f64b2926ba491e826d4d76fb11f51dfd01a63f9da7f50e73f2825d34a32360d2a14e
+MISC metadata.xml 1339 BLAKE2B 4c98e1fa7345593b8f160ba4ad84ea3a5eb321437715137e94a1926b92a53ce87c41b27e8fd0edb5c479293e24f9049956100f0070ae7a27550144ff697b63ac SHA512 95e03f10949c2a2350063cc1666bc232f166b10669f5b1d050da91b6119b8280d69aca0f35527ab938c71666bb78019640426ab0acab18bd335e6fff2345e128
diff --git a/sci-libs/libxc/libxc-2.1.3.ebuild b/sci-libs/libxc/libxc-2.1.3.ebuild
new file mode 100644
index 000000000000..527f29e46918
--- /dev/null
+++ b/sci-libs/libxc/libxc-2.1.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils flag-o-matic fortran-2 multilib
+
+MY_P=${P//_/-}
+
+DESCRIPTION="A library of exchange-correlation functionals for use in DFT"
+HOMEPAGE="http://octopus-code.org/wiki/Libxc"
+SRC_URI="http://www.tddft.org/programs/octopus/download/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="fortran static-libs -test"
+
+S="${WORKDIR}"/${MY_P}
+
+pkg_setup() {
+	use fortran && fortran-2_pkg_setup
+}
+
+src_prepare() {
+	sed \
+		-e "s:${PN}.f90:${PN}.F90:g" \
+		-i src/Makefile.am || die
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=( $(use_enable fortran) )
+	autotools-utils_src_configure
+}
+
+## Upstream recommends not running the test suite because it requires
+## human expert interpretation to determine whether output is an error or
+## expected under certain circumstances. Nevertheless, experts might want the option.
+# The autotools src_test function modified not to die. Runs emake check in build directory.
+src_test() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	_check_build_dir
+	pushd "${BUILD_DIR}" > /dev/null || die
+	make check || ewarn "Make check failed. See above for details."
+	einfo "emake check done"
+	popd > /dev/null || die
+}
+
+src_install() {
+	autotools-utils_src_install
+
+}
diff --git a/sci-libs/libxc/libxc-2.2.3.ebuild b/sci-libs/libxc/libxc-2.2.3.ebuild
new file mode 100644
index 000000000000..527f29e46918
--- /dev/null
+++ b/sci-libs/libxc/libxc-2.2.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils flag-o-matic fortran-2 multilib
+
+MY_P=${P//_/-}
+
+DESCRIPTION="A library of exchange-correlation functionals for use in DFT"
+HOMEPAGE="http://octopus-code.org/wiki/Libxc"
+SRC_URI="http://www.tddft.org/programs/octopus/download/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="fortran static-libs -test"
+
+S="${WORKDIR}"/${MY_P}
+
+pkg_setup() {
+	use fortran && fortran-2_pkg_setup
+}
+
+src_prepare() {
+	sed \
+		-e "s:${PN}.f90:${PN}.F90:g" \
+		-i src/Makefile.am || die
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=( $(use_enable fortran) )
+	autotools-utils_src_configure
+}
+
+## Upstream recommends not running the test suite because it requires
+## human expert interpretation to determine whether output is an error or
+## expected under certain circumstances. Nevertheless, experts might want the option.
+# The autotools src_test function modified not to die. Runs emake check in build directory.
+src_test() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	_check_build_dir
+	pushd "${BUILD_DIR}" > /dev/null || die
+	make check || ewarn "Make check failed. See above for details."
+	einfo "emake check done"
+	popd > /dev/null || die
+}
+
+src_install() {
+	autotools-utils_src_install
+
+}
diff --git a/sci-libs/libxc/libxc-3.0.0.ebuild b/sci-libs/libxc/libxc-3.0.0.ebuild
new file mode 100644
index 000000000000..527f29e46918
--- /dev/null
+++ b/sci-libs/libxc/libxc-3.0.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils flag-o-matic fortran-2 multilib
+
+MY_P=${P//_/-}
+
+DESCRIPTION="A library of exchange-correlation functionals for use in DFT"
+HOMEPAGE="http://octopus-code.org/wiki/Libxc"
+SRC_URI="http://www.tddft.org/programs/octopus/download/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="fortran static-libs -test"
+
+S="${WORKDIR}"/${MY_P}
+
+pkg_setup() {
+	use fortran && fortran-2_pkg_setup
+}
+
+src_prepare() {
+	sed \
+		-e "s:${PN}.f90:${PN}.F90:g" \
+		-i src/Makefile.am || die
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=( $(use_enable fortran) )
+	autotools-utils_src_configure
+}
+
+## Upstream recommends not running the test suite because it requires
+## human expert interpretation to determine whether output is an error or
+## expected under certain circumstances. Nevertheless, experts might want the option.
+# The autotools src_test function modified not to die. Runs emake check in build directory.
+src_test() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	_check_build_dir
+	pushd "${BUILD_DIR}" > /dev/null || die
+	make check || ewarn "Make check failed. See above for details."
+	einfo "emake check done"
+	popd > /dev/null || die
+}
+
+src_install() {
+	autotools-utils_src_install
+
+}
diff --git a/sci-libs/libxc/metadata.xml b/sci-libs/libxc/metadata.xml
new file mode 100644
index 000000000000..064923854d28
--- /dev/null
+++ b/sci-libs/libxc/metadata.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>Hloupy.Honza@centrum.cz</email>
+		<name>Honza Machá�ek</name>
+	</maintainer>
+	<longdescription lang="en">
+Libxc is a library of exchange-correlation functionals for density-functional theory.
+The aim is to provide a portable, well tested and reliable set of exchange and correlation
+functionals that can be used by all the ETSF codes and also other codes.
+
+In Libxc you can find different types of functionals: LDA, GGA, hybrids, and mGGA (experimental).
+These functionals depend on local information, in the sense that the value of the potential
+at a given point depends only on the values of the density -- and the gradient of the density
+and the kinetic energy density, for the GGA and mGGA cases.
+
+It can calculate the functional itself and its derivative; for some functionals,
+higher-order derivatives are available.
+
+Libxc is written in C and has Fortran bindings. It is released under the LGPL license (v. 3.0).
+Contributions are welcome. 
+</longdescription>
+	<upstream>
+		<doc>http://octopus-code.org/wiki/Libxc:manual</doc>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-libs/linux-gpib/Manifest b/sci-libs/linux-gpib/Manifest
index 13eb931d9d04..073b7e3e5878 100644
--- a/sci-libs/linux-gpib/Manifest
+++ b/sci-libs/linux-gpib/Manifest
@@ -4,5 +4,7 @@ AUX linux-gpib-4.0.3-reallydie.patch 621 BLAKE2B 367ea6a50513b86591e5dfe60df11a4
 AUX linux-gpib-4.0.4_rc2-kernel-4.11.0.patch 387 BLAKE2B 38516ea8a9ca5dd3dc32cfd605bd68100726bbcc8d96fa457caabfb91cbc17ce37e61194ac32e573acc797d71c448454d03e6202ec331cb25c056f8ee7b78829 SHA512 6f6b25695ae81671a93e8b86978ea1ef9e71ba5a38d14ad95b9a6aa59704bb2d6a8064c1ac006b1e7c4740d059184d4d4cefef88a2fd0c2a09406f64f6597187
 DIST gpib_firmware-2006-11-12.tar.gz 169357 BLAKE2B 05f1be78545e025d76e2b9819a5dcac5a6715dfbb6df5c6fbe8b78900adf8ca7b1c28db350674ff1dd9c77e24507e98b536ca1af8b558c9a46ef8c25034c9769 SHA512 164d6fcfb3af43933f0a16645276f7d527a7aa24ef311f6ae3dcd7f45c41f92c855cf221bc946772f43fc2f9524057abc34bbd7d805c89b33ed7e111bc6870af
 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
 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
new file mode 100644
index 000000000000..b378c006c710
--- /dev/null
+++ b/sci-libs/linux-gpib/linux-gpib-4.2.0_rc1.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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
+
+DESCRIPTION="Driver library for GPIB (IEEE 488.2) hardware"
+HOMEPAGE="https://linux-gpib.sourceforge.io/"
+SRC_URI="mirror://sourceforge/linux-gpib/${PN}-user-${PV}.tar.gz
+	firmware? ( https://linux-gpib.sourceforge.io/firmware/gpib_firmware-2006-11-12.tar.gz )
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="pcmcia static guile perl php python tcl doc firmware"
+
+S="${WORKDIR}/${PN}-user-${PV}"
+
+COMMONDEPEND="
+	sys-libs/readline:=
+	tcl? ( dev-lang/tcl:0= )
+	guile? ( dev-scheme/guile:12 )
+	perl? ( dev-lang/perl:= )
+	php? ( dev-lang/php:= )
+	python? ( ${PYTHON_DEPS} )
+	firmware? ( sys-apps/fxload )"
+RDEPEND="${COMMONDEPEND}"
+DEPEND="${COMMONDEPEND}
+	virtual/pkgconfig
+	doc? ( app-text/docbook-sgml-utils )
+	perl? ( virtual/perl-ExtUtils-MakeMaker )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2.16-perl.patch
+)
+
+pkg_setup () {
+	use perl && perl_set_version
+	use python && python_setup
+}
+
+src_prepare () {
+	[[ ${I_KNOW_WHAT_I_AM_DOING} == "1" ]] || \
+		die "This ebuild is work in progress. Do not use."
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static) \
+		$(use_enable guile guile-binding) \
+		$(use_enable perl perl-binding) \
+		$(use_enable php php-binding) \
+		$(use_enable python python-binding) \
+		$(use_enable tcl tcl-binding) \
+		$(use_enable doc documentation)
+}
+
+src_compile() {
+	FIRM_DIR=/usr/share/usb
+	emake \
+		DESTDIR="${D}" \
+		INSTALL_MOD_PATH="${D}" \
+		HOTPLUG_USB_CONF_DIR=/etc/hotplug/usb \
+		UDEV_RULES_DIR="$(get_udevdir)"/rules.d \
+		USB_FIRMWARE_DIR="${D}"${FIRM_DIR} \
+		docdir=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	FIRM_DIR=/usr/share/usb
+	emake \
+		DESTDIR="${D}" \
+		INSTALL_MOD_PATH="${D}" \
+		HOTPLUG_USB_CONF_DIR=/etc/hotplug/usb \
+		UDEV_RULES_DIR="$(get_udevdir)"/rules.d \
+		USB_FIRMWARE_DIR="${D}"${FIRM_DIR} \
+		docdir=/usr/share/doc/${PF}/html install
+
+	if use perl; then
+		einfo "Installing perl module"
+		cd "${S}"/language/perl || die
+		DESTDIR=${D} emake install
+		perl_fix_packlist
+		perl_delete_emptybsdir
+		cd "${S}" || die
+	fi
+
+	echo "KERNEL==\"gpib[0-9]*\",	MODE=\"0660\", GROUP=\"gpib\"" >> 99-gpib.rules
+	udev_dorules 99-gpib.rules
+
+	dodoc doc/linux-gpib.pdf ChangeLog AUTHORS README* NEWS
+
+	insinto /etc
+	newins util/templates/gpib.conf gpib.conf
+	newins util/templates/gpib.conf gpib.conf.example
+
+	if use pcmcia; then
+		dodir /etc/pcmcia
+		insinto /etc/pcmcia
+		doins "${S}"/etc/pcmcia/*
+	fi
+
+	# fix rules files
+	local f
+	find "${D}$(get_udevdir)"/rules.d -type f -print0 | while read -rd '' f ; do
+		grep -q "${D}" "${f}" && einfo "File ${f} contains a temporary path, fixing."
+		sed -i -e "s:${D}:/:g" "${f}"
+	done
+
+	DOC_CONTENTS="
+You need to run the 'gpib_config' utility to setup the driver before
+you can use it. In order to do it automatically you can add to your
+start script something like this (supposing the appropriate driver
+is loaded on the startup):
+\n
+		gpib_config --minor 0
+\n
+To give a user access to the computer's gpib board you will have to add
+them to the group 'gpib' or, you could change the permissions on the device
+files /dev/gpib[0-15] to something you like better, using 'chmod'
+\n
+Edit /etc/gpib.conf to match your interface board, and any devices you wish
+to open via ibfind().  See the documentation in /usr/share/linux-gpib/html for
+more information.
+\n
+"
+
+	if use pcmcia; then
+		DOC_CONTENTS+='
+For PCMCIA cards:\n
+All files needed for a PCMCIA board were copied to /etc/pcmcia.
+You may wish to edit the options passed to the gpib_config call in the
+/etc/pcmcia/linux-gpib-pcmcia script.
+You may need to send a SIGHUP signal to the cardmgr daemon to force it
+to reload the files in /etc/pcmcia \(alternatively you could use your
+pcmcia init.d script to restart the cardmgr, or you could just reboot\).
+The driver module will be loaded as needed by the cardmgr.
+
+'
+	fi
+
+	if use firmware; then
+		DOC_CONTENTS+='
+For Agilent \(HP\) 82341C and 82341D cards:
+The firmware for these boards is uploaded by passing the appropriate
+firmware file from /usr/share/linux-gpib/hp_82341 directory to
+gpib_config using the -I or --init-data command line option. Example:\n
+gpib_config --minor 0 --init-data /usr/share/linux-gpib/hp_82341/hp_82341c_fw.bin
+'
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst () {
+	use perl && perl_set_version
+	enewgroup gpib
+}
+
+pkg_postinst () {
+	readme.gentoo_print_elog
+}
diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest
index d7f18140d51e..18879e3c5b07 100644
--- a/sci-libs/netcdf/Manifest
+++ b/sci-libs/netcdf/Manifest
@@ -6,5 +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.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
new file mode 100644
index 000000000000..a37c4a93ef33
--- /dev/null
+++ b/sci-libs/netcdf/netcdf-4.6.1-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="Scientific library and interface for array oriented data access"
+HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/"
+SRC_URI="https://github.com/Unidata/netcdf-c/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="UCAR-Unidata"
+SLOT="0/13"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="+dap examples hdf +hdf5 mpi static-libs szip test tools"
+
+RDEPEND="
+	dap? ( net-misc/curl:0= )
+	hdf? ( sci-libs/hdf:0= sci-libs/hdf5:0= )
+	hdf5? ( sci-libs/hdf5:0=[hl(+),mpi=,szip=,zlib] )"
+DEPEND="${RDEPEND}"
+# doc generation is missing many doxygen files in tar ball
+#	doc? ( app-doc/doxygen[dot] )"
+
+REQUIRED_USE="test? ( tools ) szip? ( hdf5 ) mpi? ( hdf5 )"
+
+S="${WORKDIR}/${PN}-c-${PV}"
+
+src_configure() {
+	local myconf
+	if use mpi; then
+		export CC=mpicc
+	fi
+	econf "${myconf}" \
+		--disable-examples \
+		--disable-dap-remote-tests \
+		$(use_enable dap) \
+		$(use_enable hdf hdf4) \
+		$(use_enable hdf5 netcdf-4) \
+		$(use_enable static-libs static) \
+		$(use_enable tools utilities)
+}
+
+src_test() {
+	# fails parallel tests: bug #621486
+	emake check -j1
+}
+
+src_install() {
+	default
+	use examples && dodoc -r examples
+	prune_libtool_files
+}
diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index a232aee93c2b..adb13858a205 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -24,15 +24,9 @@ DIST oourafft-20061228.tgz 72213 BLAKE2B 4a3ac2b4c0bc3275b5743df59241e1cdbd02003
 DIST protobuf-3.6.0.tar.gz 4483224 BLAKE2B b6716d33c14ab98a05676a3369b4762179df88ed3e8c34b93075c12edc10213bf1c427a59a8840bc64b53365264021b8075a02a44478c998062cf04da95c0075 SHA512 46df0187e5c9e7d213930d916f6c89e7a41eca1aaac228d8f56e3f784598a9f323d7cc2d3cf20668ceb776d3237c4eccf685ef8d7808f09107fa8e441f9899f4
 DIST tensorflow-1.10.0.tar.gz 24490786 BLAKE2B 2ecec19b2b2ebb2e292ec07fee458017aa3fcc4c1445e6c9419ea9bd37990a58607c8f3134c785be0e3ae098c332a734fb85717b2ecd781551a0c8f20ffca8f2 SHA512 a25257ad7e561c2040ba9dda699acb24b757e6d79c60324cab20d8d8a428fef79a06a3627a95a59e2c8408a094666b9aa6d8af1c5419fa8c238e1f5e10e9ec33
 DIST tensorflow-1.11.0.tar.gz 25024790 BLAKE2B 74129fb1e6db0317fd45266dae7aa4fab811e1ebf0d093f3153684fa4465f4319cbf8fd50c6667f9c4ddbce5c100ee00151ec2873eca93ef7d5ebbc04ab6b965 SHA512 26e9542c43e11a663cbc5cf42859ae7b6dc0e92cfa88775fd4d1badba7f08c59b60c05010fd9f3ec501313be5c042f39b17323bb4753babf365ba2a48af836c2
-DIST tensorflow-1.11.0_rc0.tar.gz 25032294 BLAKE2B 7a99630445eb51db39c9a0b948dc04b63d48a55cf56e96f431a597695bfc9f36701b42ba9de3bcbb4134661f583fec2f2068a396a559b422806b973b149e62f0 SHA512 1f537188338d09fb63705d8d1eb9e6f6e89274ded5d16f165f63ff97d6e1f534d7e9dc412fb38e00d834f8ff5ec5f00a6fa5ab464ba0ab47b501916cb8828d7f
-DIST tensorflow-1.11.0_rc2.tar.gz 25032827 BLAKE2B 66235ac6c07f9855143a669716c5937badf225e4c7e656b1d0f205f00d387a197cf72bb887b28856e7a162d27b5886508d39a7004de0c204769edb8c5a94367b SHA512 6221ae7bf4f4406993428b02a5e98af846d9e5b222c2f155a89d5c7609a0dbdd6df4c93d9729a3cb57a0682c422be4fe144f47738deb11498590f35cbb273441
 DIST tensorflow-patches-1.10.0.tar.bz2 4032 BLAKE2B 8588deec74179d8044af631de8e651491cc713553ee15ece9dff5052bd95b10924bdbe4301453f00d0f2fccd5d595d496b48fe45b0259837653b2de9e1898ab9 SHA512 1f57995ca9b3278735636cc42c88dc45558fa6a1d656108293f8df3fd9961d75f5e979bf0a9909136134e1cdaab41a34f83e605b48b23dddf17a6b1be684117b
 DIST tensorflow-patches-1.11.0.tar.bz2 11013 BLAKE2B 929cb9fee5e6b63f00341351908d3050c676670d9cc2c1241bd2e3c86601704a7495ab598b992718f0b51fc369e33e7c646bc5db3ba3b86b18326b1c2d2974a8 SHA512 76a94c9444e1d984afaf080222d430032636204d05a5e3ff5530012dfa1eba78619dd2a2942343ccc2f7fc489eb8c6f51fddd0b84cb2c2db645b2b914cc61f80
-DIST tensorflow-patches-1.11.0_rc0.tar.bz2 10103 BLAKE2B 66c9e8838f25be13851be3265af880a22355d0e8eb2cc297fff2118df1d6070bbbb216631e522f704a0d41d4029742f073a76acb01bbf150d827e69c9f6f5fc5 SHA512 05c3e7c1dfe50716b8043d7b1febf7a4f3e641c65b9c778a2fe0486ac0e9c091d50dba1c8e3c2b9417758ce8181688bb47ec0eb7804f8aa50726d52cfd202a8b
-DIST tensorflow-patches-1.11.0_rc2.tar.bz2 11013 BLAKE2B 929cb9fee5e6b63f00341351908d3050c676670d9cc2c1241bd2e3c86601704a7495ab598b992718f0b51fc369e33e7c646bc5db3ba3b86b18326b1c2d2974a8 SHA512 76a94c9444e1d984afaf080222d430032636204d05a5e3ff5530012dfa1eba78619dd2a2942343ccc2f7fc489eb8c6f51fddd0b84cb2c2db645b2b914cc61f80
 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
-EBUILD tensorflow-1.11.0_rc0.ebuild 13572 BLAKE2B 04226216d85717f0ca85fc5a81b9cd6634f506277693eac3061aa5d64277f4a666913255c8e8bc774b3841980448b481e3a40ec78c8438204f04e979b840de9e SHA512 143d675bc78aa5599e54ae9525340e9f32930e630dcc3400025e2e4c795225193631d17526683ea72cd18882e756d0a2792b12c6398bb6bc26e212cf8fb8fdbb
-EBUILD tensorflow-1.11.0_rc2.ebuild 13567 BLAKE2B d34755dcf4fe510d5cfa342efdca27b0e4915667ffe6249db051afd42f97ee437974230982b4d238e5be1cdb034d7a19f48d3f76d9fe9ed469a79a6091a849fd SHA512 575bd55db18b89340383dcef35ad3a7ef5391e715e7482c8e34973b6bfdfa5de186b7d731f3f7d84460f6e74bcf7b9bab2f9ba3e8ffdae500c59390277da80b2
 MISC metadata.xml 720 BLAKE2B f8069d999e401f2110a64b002912462d9a6f30674dd42efcd4d5f9d16641e320ba078c539f562d9257c5be1028d58963d060672c9df0f4615519bc02baa0bcd2 SHA512 5f5813e3a398381254e86c96c718ecfd3b0503029f10adc6601476ab3f5f80033cbfd5292280c94d4ca1cda7774b66bc13796e62d1d3d3181b7c72dcb6420b47
diff --git a/sci-libs/tensorflow/tensorflow-1.11.0_rc0.ebuild b/sci-libs/tensorflow/tensorflow-1.11.0_rc0.ebuild
deleted file mode 100644
index f0ce2845ea8d..000000000000
--- a/sci-libs/tensorflow/tensorflow-1.11.0_rc0.ebuild
+++ /dev/null
@@ -1,433 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python2_7 python3_6 )
-MY_PV=${PV/_rc/-rc}
-MY_P=${PN}-${MY_PV}
-
-inherit check-reqs cuda distutils-r1 eapi7-ver multiprocessing toolchain-funcs
-
-DESCRIPTION="Computation framework using data flow graphs for scalable machine learning"
-HOMEPAGE="https://www.tensorflow.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="cuda jemalloc mpi +python +system-libs"
-CPU_USE_FLAGS_X86="sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma3 fma4"
-for i in $CPU_USE_FLAGS_X86; do
-	IUSE+=" cpu_flags_x86_$i"
-done
-
-# distfiles that bazel uses for the workspace, will be copied to basel-distdir
-bazel_external_uris="
-	http://www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz -> oourafft-20061228.tgz
-	https://bitbucket.org/eigen/eigen/get/fd6845384b86.tar.gz -> eigen-fd6845384b86.tar.gz
-	https://github.com/abseil/abseil-cpp/archive/f0f15c2778b0e4959244dd25e63f445a455870f5.tar.gz -> abseil-cpp-f0f15c2778b0e4959244dd25e63f445a455870f5.tar.gz
-	https://github.com/bazelbuild/rules_closure/archive/dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz -> bazelbuild-rules_closure-dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz
-	https://github.com/google/double-conversion/archive/3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip -> double-conversion-3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip
-	https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz
-	https://github.com/google/gemmlowp/archive/38ebac7b059e84692f53e5938f97a9943c120d98.zip -> gemmlowp-38ebac7b059e84692f53e5938f97a9943c120d98.zip
-	https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz
-	cuda? (
-		https://github.com/nvidia/nccl/archive/03d856977ecbaac87e598c0c4bafca96761b9ac7.tar.gz -> nvidia-nccl-03d856977ecbaac87e598c0c4bafca96761b9ac7.tar.gz
-		https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip
-	)
-	python? (
-		https://github.com/intel/ARM_NEON_2_x86_SSE/archive/0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz -> ARM_NEON_2_x86_SSE-0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz
-		https://mirror.bazel.build/docs.python.org/2.7/_sources/license.txt -> tensorflow-python-license.txt
-		https://pypi.python.org/packages/5c/78/ff794fcae2ce8aa6323e789d1f8b3b7765f601e7702726f430e814822b96/gast-0.2.0.tar.gz
-		https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz
-		!system-libs? (
-			https://github.com/abseil/abseil-py/archive/pypi-v0.2.2.tar.gz -> abseil-py-0.2.2.tar.gz
-			https://github.com/googleapis/googleapis/archive/f81082ea1e2f85c43649bee26e0d9871d4b41cdb.zip -> googleapis-f81082ea1e2f85c43649bee26e0d9871d4b41cdb.zip
-			https://github.com/GoogleCloudPlatform/google-cloud-cpp/archive/f875700a023bdd706333cde45aee8758b272c357.tar.gz -> google-cloud-cpp-f875700a023bdd706333cde45aee8758b272c357.tar.gz
-			https://github.com/google/boringssl/archive/a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz -> boringssl-a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz
-		)
-	)
-	!system-libs? (
-		https://github.com/google/protobuf/archive/v3.6.0.tar.gz -> protobuf-3.6.0.tar.gz
-	)"
-
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-${PVR}.tar.bz2
-		${bazel_external_uris}"
-
-RDEPEND="
-	app-arch/snappy
-	dev-db/lmdb
-	dev-db/sqlite
-	>=dev-libs/jsoncpp-1.8.4
-	dev-libs/libpcre
-	dev-libs/nsync
-	>=dev-libs/protobuf-3.6.0
-	>=dev-libs/re2-0.2018.04.01
-	media-libs/giflib
-	media-libs/libjpeg-turbo
-	media-libs/libpng:0
-	>=net-libs/grpc-1.13.0
-	net-misc/curl
-	sys-libs/zlib
-	cuda? (
-		>=dev-util/nvidia-cuda-toolkit-8.0[profiler]
-		>=dev-libs/cudnn-6.0
-	)
-	jemalloc? ( >=dev-libs/jemalloc-4.4.0 )
-	mpi? ( virtual/mpi )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-libs/flatbuffers-1.8.0
-		dev-python/absl-py[${PYTHON_USEDEP}]
-		dev-python/astor[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		>=dev-python/protobuf-python-3.6.0[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/termcolor[${PYTHON_USEDEP}]
-		>=net-libs/grpc-1.13.0[python,${PYTHON_USEDEP}]
-		sci-libs/keras-applications[${PYTHON_USEDEP}]
-		sci-libs/keras-preprocessing[${PYTHON_USEDEP}]
-		virtual/python-enum34[${PYTHON_USEDEP}]
-		system-libs? (
-			net-libs/google-cloud-cpp
-		)
-	)
-	system-libs? (
-		dev-libs/openssl:0
-	)"
-DEPEND="${RDEPEND}
-	!python? ( dev-lang/python )
-	app-arch/unzip
-	>=dev-util/bazel-0.16.0
-	dev-java/java-config
-	dev-python/mock
-	dev-lang/nasm
-	dev-lang/swig
-	dev-python/cython"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md )
-CHECKREQS_MEMORY="5G"
-CHECKREQS_DISK_BUILD="5G"
-
-bazel-get-cpu-flags() {
-	local i f=()
-	# Keep this list in sync with tensorflow/core/platform/cpu_feature_guard.cc.
-	for i in sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma4; do
-		use cpu_flags_x86_${i} && f+=( -m${i/_/.} )
-	done
-	use cpu_flags_x86_fma3 && f+=( -mfma )
-	echo "${f[*]}"
-}
-
-bazel-get-flags() {
-	local i fs=()
-	for i in ${CFLAGS} $(bazel-get-cpu-flags); do
-		fs+=( "--copt=${i}" "--host_copt=${i}" )
-	done
-	for i in ${CXXFLAGS} $(bazel-get-cpu-flags); do
-		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
-	done
-	for i in ${CPPFLAGS}; do
-		fs+=( "--copt=${i}" "--host_copt=${i}" )
-		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
-	done
-	for i in ${LDFLAGS}; do
-		fs+=( "--linkopt=${i}" "--host_linkopt=${i}" )
-	done
-	echo "${fs[*]}"
-}
-
-setup_bazelrc() {
-	if [[ -f "${T}/bazelrc" ]]; then
-		return
-	fi
-
-	# F: fopen_wr
-	# P: /proc/self/setgroups
-	# Even with standalone enabled, the Bazel sandbox binary is run for feature test:
-	# https://github.com/bazelbuild/bazel/blob/7b091c1397a82258e26ab5336df6c8dae1d97384/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunner.java#L61
-	# https://github.com/bazelbuild/bazel/blob/76555482873ffcf1d32fb40106f89231b37f850a/src/main/tools/linux-sandbox-pid1.cc#L113
-	addpredict /proc
-
-	mkdir -p "${T}/bazel-cache" || die
-	mkdir -p "${T}/bazel-distdir" || die
-
-	cat > "${T}/bazelrc" <<-EOF || die
-	startup --batch
-
-	# dont strip HOME, portage sets a temp per-package dir
-	build --action_env HOME
-
-	# make bazel respect MAKEOPTS
-	build --jobs=$(makeopts_jobs) $(bazel-get-flags)
-	build --compilation_mode=opt --host_compilation_mode=opt
-
-	# Use standalone strategy to deactivate the bazel sandbox, since it
-	# conflicts with FEATURES=sandbox.
-	build --spawn_strategy=standalone --genrule_strategy=standalone
-	test --spawn_strategy=standalone --genrule_strategy=standalone
-
-	build --strip=never
-	build --verbose_failures --noshow_loading_progress
-	test --verbose_test_summary --verbose_failures --noshow_loading_progress
-
-	# make bazel only fetch distfiles from the cache
-	fetch --repository_cache=${T}/bazel-cache/ --distdir=${T}/bazel-distdir/
-	build --repository_cache=${T}/bazel-cache/ --distdir=${T}/bazel-distdir/
-
-	build --define=PREFIX=${EPREFIX%/}/usr
-	build --define=LIBDIR=\$(PREFIX)/$(get_libdir)
-
-	EOF
-}
-
-ebazel() {
-	# Use different build folders for each multibuild variant.
-	local base_suffix="${MULTIBUILD_VARIANT+-}${MULTIBUILD_VARIANT}"
-	local output_base="${WORKDIR}/bazel-base${base_suffix}"
-	mkdir -p "${output_base}" || die
-
-	einfo Running: bazel --output_base="${output_base}" "$@"
-	bazel --output_base="${output_base}" $@ || die
-}
-
-load_distfiles() {
-	# Populate the bazel distdir to fetch from since it cannot use the network
-	# Bazel looks in distdir but will only look for the original filename, not
-	# the possibly renamed one that portage downloaded. If the line has -> we
-	# need to rename it back, otherwise a simple copy is fine.
-
-	local src dst uri rename
-
-	while read uri rename dst; do
-		src="${uri##*/}"
-		[[ -z $src ]] && continue
-		if [[ "$rename" != "->" ]]; then
-			dst="${src}"
-		fi
-
-		[[ ${A} =~ ${dst} ]] || continue
-
-		if [[ "$dst" == "$src" ]]; then
-			einfo "Copying $dst to bazel distdir ..."
-		else
-			einfo "Copying $dst to bazel distdir $src ..."
-		fi
-		ln -s "${DISTDIR}/${dst}" "${T}/bazel-distdir/${src}" || die
-	done <<< "$(sed -re 's/!?[A-Za-z]+\?\s+\(\s*//g; s/\s+\)//g' <<< "${bazel_external_uris}")"
-}
-
-pkg_setup() {
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	# Only unpack the main distfile
-	unpack "${P}.tar.gz"
-	unpack tensorflow-patches-${PVR}.tar.bz2
-}
-
-src_prepare() {
-	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
-
-	setup_bazelrc
-	load_distfiles
-
-	eapply "${WORKDIR}"/patches/*.patch
-
-	default
-	use python && python_copy_sources
-
-	if use cuda; then
-		local i
-		for i in /dev/nvidia*; do
-			addpredict $i
-		done
-	fi
-}
-
-src_configure() {
-	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
-
-	do_configure() {
-		export CC_OPT_FLAGS=" "
-		export TF_NEED_JEMALLOC=$(usex jemalloc 1 0)
-		export TF_NEED_GCP=0
-		export TF_NEED_HDFS=0
-		export TF_NEED_S3=0
-		export TF_NEED_AWS=0
-		export TF_NEED_KAFKA=0
-		export TF_ENABLE_XLA=0
-		export TF_NEED_GDR=0
-		export TF_NEED_VERBS=0
-		export TF_NEED_NGRAPH=0
-		export TF_NEED_OPENCL_SYCL=0
-		export TF_NEED_OPENCL=0
-		export TF_NEED_COMPUTECPP=0
-		export TF_NEED_MKL=0
-		export TF_NEED_MPI=$(usex mpi 1 0)
-		export TF_SET_ANDROID_WORKSPACE=0
-
-		if use python; then
-			python_export PYTHON_SITEDIR
-			export PYTHON_BIN_PATH="${PYTHON}"
-			export PYTHON_LIB_PATH="${PYTHON_SITEDIR}"
-		else
-			export PYTHON_BIN_PATH="$(which python)"
-			export PYTHON_LIB_PATH="$(python -c 'from distutils.sysconfig import *; print(get_python_lib())')"
-		fi
-
-		export TF_NEED_CUDA=$(usex cuda 1 0)
-		export TF_DOWNLOAD_CLANG=0
-		export TF_CUDA_CLANG=0
-		export TF_NEED_TENSORRT=0
-		if use cuda; then
-			export CUDA_TOOLKIT_PATH="${EPREFIX%/}/opt/cuda"
-			export CUDNN_INSTALL_PATH="${EPREFIX%/}/opt/cuda"
-			export GCC_HOST_COMPILER_PATH="$(cuda_gccdir)/$(tc-getCC)"
-			export TF_NCCL_VERSION="1"
-
-			TF_CUDA_VERSION="$(best_version dev-util/nvidia-cuda-toolkit)"
-			TF_CUDA_VERSION="${TF_CUDA_VERSION##*cuda-toolkit-}"
-			export TF_CUDA_VERSION="$(ver_cut 1-2 ${TF_CUDA_VERSION})"
-			einfo "Setting CUDA version: $TF_CUDA_VERSION"
-
-			TF_CUDNN_VERSION="$(best_version dev-libs/cudnn)"
-			TF_CUDNN_VERSION="${TF_CUDNN_VERSION##*cudnn-}"
-			export TF_CUDNN_VERSION="$(ver_cut 1-2 ${TF_CUDNN_VERSION})"
-			einfo "Setting CUDNN version: $TF_CUDNN_VERSION"
-		fi
-
-		local SYSLIBS=(
-			astor_archive
-			com_googlesource_code_re2
-			curl
-			cython
-			flatbuffers
-			gif_archive
-			grpc
-			jemalloc
-			jpeg
-			jsoncpp_git
-			lmdb
-			nasm
-			nsync
-			org_sqlite
-			pcre
-			png_archive
-			six_archive
-			snappy
-			swig
-			termcolor_archive
-			zlib_archive
-		)
-		if use system-libs; then
-			SYSLIBS+=(
-				absl_py
-				astor_archive
-				boringssl
-				com_github_googleapis_googleapis
-				com_github_googlecloudplatform_google_cloud_cpp
-				com_google_protobuf
-				com_google_protobuf_cc
-				protobuf_archive
-			)
-		fi
-
-		SYSLIBS="${SYSLIBS[@]}"
-		export TF_SYSTEM_LIBS="${SYSLIBS// /,}"
-
-		# Only one bazelrc is read, import our one before configure sets its options
-		echo "import ${T}/bazelrc" >> ./.bazelrc
-
-		# This is not autoconf
-		./configure || die
-	}
-	if use python; then
-		python_foreach_impl run_in_build_dir do_configure
-	else
-		do_configure
-	fi
-}
-
-src_compile() {
-	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
-
-	if use python; then
-		python_setup
-		local MULTIBUILD_VARIANT="${EPYTHON/./_}"
-		cd "${S}-${MULTIBUILD_VARIANT}" || die
-	fi
-
-	# fail early if anything is missing
-	ebazel build --nobuild \
-		//tensorflow:libtensorflow_framework.so \
-		//tensorflow:libtensorflow.so \
-		//tensorflow:libtensorflow_cc.so \
-		$(usex python '//tensorflow/tools/pip_package:build_pip_package' '')
-
-	ebazel build \
-		//tensorflow:libtensorflow_framework.so \
-		//tensorflow:libtensorflow.so
-	ebazel build //tensorflow:libtensorflow_cc.so
-
-	do_compile() {
-		ebazel build //tensorflow/tools/pip_package:build_pip_package
-	}
-	use python && python_foreach_impl run_in_build_dir do_compile
-}
-
-src_install() {
-	local i j
-	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
-
-	do_install() {
-		einfo "Installing ${EPYTHON} files"
-		local srcdir="${T}/src-${MULTIBUILD_VARIANT}"
-		mkdir -p "${srcdir}" || die
-		bazel-bin/tensorflow/tools/pip_package/build_pip_package --src "${srcdir}" || die
-		cd "${srcdir}" || die
-		esetup.py install
-
-		# libtensorflow_framework.so is in /usr/lib already
-		python_export PYTHON_SITEDIR PYTHON_SCRIPTDIR
-		rm -f "${D}/${PYTHON_SITEDIR}/${PN}/lib${PN}_framework.so" "${D}/${PYTHON_SCRIPTDIR}/tensorboard" || die
-		python_optimize
-	}
-
-	if use python; then
-		python_foreach_impl run_in_build_dir do_install
-
-		# Symlink to python-exec scripts
-		for i in "${ED}"/usr/lib/python-exec/*/*; do
-			n="${i##*/}"
-			[[ -e "${ED}/usr/bin/${n}" ]] || dosym ../lib/python-exec/python-exec2 "/usr/bin/${n}"
-		done
-
-		python_setup
-		local MULTIBUILD_VARIANT="${EPYTHON/./_}"
-		cd "${S}-${MULTIBUILD_VARIANT}" || die
-	fi
-
-	einfo "Installing headers"
-	ebazel build //tensorflow:install_headers
-	insinto /usr/include/${PN}/
-	doins -r bazel-genfiles/tensorflow/include/*
-
-	einfo "Installing libs"
-	# Generate pkg-config file
-	${PN}/c/generate-pc.sh --prefix="${EPREFIX}"/usr --libdir=$(get_libdir) --version=${MY_PV} || die
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-
-	dolib.so bazel-bin/tensorflow/lib${PN}_framework.so
-	dolib.so bazel-bin/tensorflow/lib${PN}.so
-	dolib.so bazel-bin/tensorflow/lib${PN}_cc.so
-
-	einstalldocs
-}
diff --git a/sci-libs/tensorflow/tensorflow-1.11.0_rc2.ebuild b/sci-libs/tensorflow/tensorflow-1.11.0_rc2.ebuild
deleted file mode 100644
index 2d82b286c6e6..000000000000
--- a/sci-libs/tensorflow/tensorflow-1.11.0_rc2.ebuild
+++ /dev/null
@@ -1,435 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python2_7 python3_6 )
-MY_PV=${PV/_rc/-rc}
-MY_P=${PN}-${MY_PV}
-
-inherit check-reqs cuda distutils-r1 multiprocessing toolchain-funcs
-
-DESCRIPTION="Computation framework using data flow graphs for scalable machine learning"
-HOMEPAGE="https://www.tensorflow.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="cuda jemalloc mpi +python +system-libs"
-CPU_USE_FLAGS_X86="sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma3 fma4"
-for i in $CPU_USE_FLAGS_X86; do
-	IUSE+=" cpu_flags_x86_$i"
-done
-
-# distfiles that bazel uses for the workspace, will be copied to basel-distdir
-bazel_external_uris="
-	http://www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz -> oourafft-20061228.tgz
-	https://bitbucket.org/eigen/eigen/get/fd6845384b86.tar.gz -> eigen-fd6845384b86.tar.gz
-	https://github.com/abseil/abseil-cpp/archive/f0f15c2778b0e4959244dd25e63f445a455870f5.tar.gz -> abseil-cpp-f0f15c2778b0e4959244dd25e63f445a455870f5.tar.gz
-	https://github.com/bazelbuild/rules_closure/archive/dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz -> bazelbuild-rules_closure-dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz
-	https://github.com/google/double-conversion/archive/3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip -> double-conversion-3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip
-	https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz
-	https://github.com/google/gemmlowp/archive/38ebac7b059e84692f53e5938f97a9943c120d98.zip -> gemmlowp-38ebac7b059e84692f53e5938f97a9943c120d98.zip
-	https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz
-	cuda? (
-		https://github.com/nvidia/nccl/archive/03d856977ecbaac87e598c0c4bafca96761b9ac7.tar.gz -> nvidia-nccl-03d856977ecbaac87e598c0c4bafca96761b9ac7.tar.gz
-		https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip
-	)
-	python? (
-		https://github.com/intel/ARM_NEON_2_x86_SSE/archive/0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz -> ARM_NEON_2_x86_SSE-0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz
-		https://mirror.bazel.build/docs.python.org/2.7/_sources/license.txt -> tensorflow-python-license.txt
-		https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz
-		!system-libs? (
-			https://github.com/abseil/abseil-py/archive/pypi-v0.2.2.tar.gz -> abseil-py-0.2.2.tar.gz
-			https://github.com/googleapis/googleapis/archive/f81082ea1e2f85c43649bee26e0d9871d4b41cdb.zip -> googleapis-f81082ea1e2f85c43649bee26e0d9871d4b41cdb.zip
-			https://github.com/GoogleCloudPlatform/google-cloud-cpp/archive/f875700a023bdd706333cde45aee8758b272c357.tar.gz -> google-cloud-cpp-f875700a023bdd706333cde45aee8758b272c357.tar.gz
-			https://github.com/google/boringssl/archive/a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz -> boringssl-a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz
-			https://pypi.python.org/packages/5c/78/ff794fcae2ce8aa6323e789d1f8b3b7765f601e7702726f430e814822b96/gast-0.2.0.tar.gz
-		)
-	)
-	!system-libs? (
-		https://github.com/google/protobuf/archive/v3.6.0.tar.gz -> protobuf-3.6.0.tar.gz
-	)"
-
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-${PVR}.tar.bz2
-		${bazel_external_uris}"
-
-RDEPEND="
-	app-arch/snappy
-	dev-db/lmdb
-	dev-db/sqlite
-	>=dev-libs/jsoncpp-1.8.4
-	dev-libs/libpcre
-	dev-libs/nsync
-	>=dev-libs/protobuf-3.6.0
-	>=dev-libs/re2-0.2018.04.01
-	media-libs/giflib
-	media-libs/libjpeg-turbo
-	media-libs/libpng:0
-	>=net-libs/grpc-1.13.0
-	net-misc/curl
-	sys-libs/zlib
-	cuda? (
-		>=dev-util/nvidia-cuda-toolkit-8.0[profiler]
-		>=dev-libs/cudnn-6.0
-	)
-	jemalloc? ( >=dev-libs/jemalloc-4.4.0 )
-	mpi? ( virtual/mpi )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-libs/flatbuffers-1.8.0
-		dev-python/absl-py[${PYTHON_USEDEP}]
-		dev-python/astor[${PYTHON_USEDEP}]
-		dev-python/gast[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		>=dev-python/protobuf-python-3.6.0[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/termcolor[${PYTHON_USEDEP}]
-		>=net-libs/grpc-1.13.0[python,${PYTHON_USEDEP}]
-		sci-libs/keras-applications[${PYTHON_USEDEP}]
-		sci-libs/keras-preprocessing[${PYTHON_USEDEP}]
-		virtual/python-enum34[${PYTHON_USEDEP}]
-		system-libs? (
-			net-libs/google-cloud-cpp
-		)
-	)
-	system-libs? (
-		dev-libs/openssl:0
-	)"
-DEPEND="${RDEPEND}
-	dev-python/mock"
-BDEPEND="
-	app-arch/unzip
-	>=dev-libs/protobuf-3.6.0
-	>=dev-util/bazel-0.16.0
-	dev-java/java-config
-	dev-python/mock
-	dev-lang/swig
-	dev-python/cython
-	cuda? (
-		>=dev-util/nvidia-cuda-toolkit-8.0[profiler]
-	)
-	!python? ( dev-lang/python )
-	python? (
-		>=net-libs/grpc-1.13.0[tools]
-	)"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md )
-CHECKREQS_MEMORY="5G"
-CHECKREQS_DISK_BUILD="5G"
-
-bazel-get-cpu-flags() {
-	local i f=()
-	# Keep this list in sync with tensorflow/core/platform/cpu_feature_guard.cc.
-	for i in sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma4; do
-		use cpu_flags_x86_${i} && f+=( -m${i/_/.} )
-	done
-	use cpu_flags_x86_fma3 && f+=( -mfma )
-	echo "${f[*]}"
-}
-
-bazel-get-flags() {
-	local i fs=()
-	for i in ${CFLAGS} $(bazel-get-cpu-flags); do
-		fs+=( "--copt=${i}" "--host_copt=${i}" )
-	done
-	for i in ${CXXFLAGS} $(bazel-get-cpu-flags); do
-		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
-	done
-	for i in ${CPPFLAGS}; do
-		fs+=( "--copt=${i}" "--host_copt=${i}" )
-		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
-	done
-	for i in ${LDFLAGS}; do
-		fs+=( "--linkopt=${i}" "--host_linkopt=${i}" )
-	done
-	echo "${fs[*]}"
-}
-
-setup_bazelrc() {
-	if [[ -f "${T}/bazelrc" ]]; then
-		return
-	fi
-
-	# F: fopen_wr
-	# P: /proc/self/setgroups
-	# Even with standalone enabled, the Bazel sandbox binary is run for feature test:
-	# https://github.com/bazelbuild/bazel/blob/7b091c1397a82258e26ab5336df6c8dae1d97384/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunner.java#L61
-	# https://github.com/bazelbuild/bazel/blob/76555482873ffcf1d32fb40106f89231b37f850a/src/main/tools/linux-sandbox-pid1.cc#L113
-	addpredict /proc
-
-	mkdir -p "${T}/bazel-cache" || die
-	mkdir -p "${T}/bazel-distdir" || die
-
-	cat > "${T}/bazelrc" <<-EOF || die
-	startup --batch
-
-	# dont strip HOME, portage sets a temp per-package dir
-	build --action_env HOME
-
-	# make bazel respect MAKEOPTS
-	build --jobs=$(makeopts_jobs) $(bazel-get-flags)
-	build --compilation_mode=opt --host_compilation_mode=opt
-
-	# Use standalone strategy to deactivate the bazel sandbox, since it
-	# conflicts with FEATURES=sandbox.
-	build --spawn_strategy=standalone --genrule_strategy=standalone
-	test --spawn_strategy=standalone --genrule_strategy=standalone
-
-	build --strip=never
-	build --verbose_failures --noshow_loading_progress
-	test --verbose_test_summary --verbose_failures --noshow_loading_progress
-
-	# make bazel only fetch distfiles from the cache
-	fetch --repository_cache="${T}/bazel-cache/" --distdir="${T}/bazel-distdir/"
-	build --repository_cache="${T}/bazel-cache/" --distdir="${T}/bazel-distdir/"
-
-	build --define=PREFIX=${EPREFIX%/}/usr
-	build --define=LIBDIR=\$(PREFIX)/$(get_libdir)
-
-	EOF
-
-	tc-is-cross-compiler || \
-		echo "build --nodistinct_host_configuration" >> "${T}/bazelrc" || die
-}
-
-ebazel() {
-	# Use different build folders for each multibuild variant.
-	local base_suffix="${MULTIBUILD_VARIANT+-}${MULTIBUILD_VARIANT}"
-	local output_base="${WORKDIR}/bazel-base${base_suffix}"
-	mkdir -p "${output_base}" || die
-
-	einfo Running: bazel --output_base="${output_base}" "$@"
-	bazel --output_base="${output_base}" $@ || die
-}
-
-load_distfiles() {
-	# Populate the bazel distdir to fetch from since it cannot use the network
-	# Bazel looks in distdir but will only look for the original filename, not
-	# the possibly renamed one that portage downloaded. If the line has -> we
-	# need to rename it back, otherwise a simple copy is fine.
-
-	local src dst uri rename
-
-	while read uri rename dst; do
-		src="${uri##*/}"
-		[[ -z $src ]] && continue
-		if [[ "$rename" != "->" ]]; then
-			dst="${src}"
-		fi
-
-		[[ ${A} =~ ${dst} ]] || continue
-
-		if [[ "$dst" == "$src" ]]; then
-			einfo "Copying $dst to bazel distdir ..."
-		else
-			einfo "Copying $dst to bazel distdir $src ..."
-		fi
-		dst="$(readlink -f "${DISTDIR}/${dst}")"
-		ln -s "${dst}" "${T}/bazel-distdir/${src}" || die
-	done <<< "$(sed -re 's/!?[A-Za-z]+\?\s+\(\s*//g; s/\s+\)//g' <<< "${bazel_external_uris}")"
-}
-
-pkg_setup() {
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	# Only unpack the main distfile
-	unpack "${P}.tar.gz"
-	unpack tensorflow-patches-${PVR}.tar.bz2
-}
-
-src_prepare() {
-	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
-
-	setup_bazelrc
-	load_distfiles
-
-	eapply "${WORKDIR}"/patches/*.patch
-
-	default
-	use python && python_copy_sources
-
-	use cuda && cuda_add_sandbox
-}
-
-src_configure() {
-	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
-
-	do_configure() {
-		export CC_OPT_FLAGS=" "
-		export TF_NEED_JEMALLOC=$(usex jemalloc 1 0)
-		export TF_NEED_GCP=0
-		export TF_NEED_HDFS=0
-		export TF_NEED_S3=0
-		export TF_NEED_AWS=0
-		export TF_NEED_KAFKA=0
-		export TF_ENABLE_XLA=0
-		export TF_NEED_GDR=0
-		export TF_NEED_VERBS=0
-		export TF_NEED_NGRAPH=0
-		export TF_NEED_OPENCL_SYCL=0
-		export TF_NEED_OPENCL=0
-		export TF_NEED_COMPUTECPP=0
-		export TF_NEED_MKL=0
-		export TF_NEED_MPI=$(usex mpi 1 0)
-		export TF_SET_ANDROID_WORKSPACE=0
-
-		if use python; then
-			python_export PYTHON_SITEDIR
-			export PYTHON_BIN_PATH="${PYTHON}"
-			export PYTHON_LIB_PATH="${PYTHON_SITEDIR}"
-		else
-			export PYTHON_BIN_PATH="$(which python)"
-			export PYTHON_LIB_PATH="$(python -c 'from distutils.sysconfig import *; print(get_python_lib())')"
-		fi
-
-		export TF_NEED_CUDA=$(usex cuda 1 0)
-		export TF_DOWNLOAD_CLANG=0
-		export TF_CUDA_CLANG=0
-		export TF_NEED_TENSORRT=0
-		if use cuda; then
-			export CUDA_TOOLKIT_PATH="${EPREFIX%/}/opt/cuda"
-			export CUDNN_INSTALL_PATH="${EPREFIX%/}/opt/cuda"
-			export GCC_HOST_COMPILER_PATH="$(cuda_gccdir)/$(tc-getCC)"
-			export TF_NCCL_VERSION="1"
-			export TF_CUDA_VERSION="$(cuda_toolkit_version)"
-			export TF_CUDNN_VERSION="$(cuda_cudnn_version)"
-			einfo "Setting CUDA version: $TF_CUDA_VERSION"
-			einfo "Setting CUDNN version: $TF_CUDNN_VERSION"
-		fi
-
-		local SYSLIBS=(
-			astor_archive
-			com_googlesource_code_re2
-			curl
-			cython
-			flatbuffers
-			gif_archive
-			grpc
-			jemalloc
-			jpeg
-			jsoncpp_git
-			lmdb
-			nasm
-			nsync
-			org_sqlite
-			pcre
-			png_archive
-			six_archive
-			snappy
-			swig
-			termcolor_archive
-			zlib_archive
-		)
-		if use system-libs; then
-			SYSLIBS+=(
-				absl_py
-				astor_archive
-				boringssl
-				com_github_googleapis_googleapis
-				com_github_googlecloudplatform_google_cloud_cpp
-				com_google_protobuf
-				com_google_protobuf_cc
-				protobuf_archive
-				gast_archive
-			)
-		fi
-
-		export TF_SYSTEM_LIBS="${SYSLIBS[@]}"
-
-		# Only one bazelrc is read, import our one before configure sets its options
-		echo "import ${T}/bazelrc" >> ./.bazelrc
-
-		# This is not autoconf
-		./configure || die
-	}
-	if use python; then
-		python_foreach_impl run_in_build_dir do_configure
-	else
-		do_configure
-	fi
-}
-
-src_compile() {
-	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
-
-	if use python; then
-		python_setup
-		local MULTIBUILD_VARIANT="${EPYTHON/./_}"
-		cd "${S}-${MULTIBUILD_VARIANT}" || die
-	fi
-
-	# fail early if anything is missing
-	ebazel build --nobuild \
-		//tensorflow:libtensorflow_framework.so \
-		//tensorflow:libtensorflow.so \
-		//tensorflow:libtensorflow_cc.so \
-		$(usex python '//tensorflow/tools/pip_package:build_pip_package' '')
-
-	ebazel build \
-		//tensorflow:libtensorflow_framework.so \
-		//tensorflow:libtensorflow.so
-	ebazel build //tensorflow:libtensorflow_cc.so
-
-	do_compile() {
-		ebazel build //tensorflow/tools/pip_package:build_pip_package
-	}
-	use python && python_foreach_impl run_in_build_dir do_compile
-}
-
-src_install() {
-	local i j
-	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
-
-	do_install() {
-		einfo "Installing ${EPYTHON} files"
-		local srcdir="${T}/src-${MULTIBUILD_VARIANT}"
-		mkdir -p "${srcdir}" || die
-		bazel-bin/tensorflow/tools/pip_package/build_pip_package --src "${srcdir}" || die
-		cd "${srcdir}" || die
-		esetup.py install
-
-		# libtensorflow_framework.so is in /usr/lib already
-		python_export PYTHON_SITEDIR PYTHON_SCRIPTDIR
-		rm -f "${D}/${PYTHON_SITEDIR}/${PN}/lib${PN}_framework.so" "${D}/${PYTHON_SCRIPTDIR}/tensorboard" || die
-		python_optimize
-	}
-
-	if use python; then
-		python_foreach_impl run_in_build_dir do_install
-
-		# Symlink to python-exec scripts
-		for i in "${ED}"/usr/lib/python-exec/*/*; do
-			n="${i##*/}"
-			[[ -e "${ED}/usr/bin/${n}" ]] || dosym ../lib/python-exec/python-exec2 "/usr/bin/${n}"
-		done
-
-		python_setup
-		local MULTIBUILD_VARIANT="${EPYTHON/./_}"
-		cd "${S}-${MULTIBUILD_VARIANT}" || die
-	fi
-
-	einfo "Installing headers"
-	ebazel build //tensorflow:install_headers
-	insinto /usr/include/${PN}/
-	doins -r bazel-genfiles/tensorflow/include/*
-
-	einfo "Installing libs"
-	# Generate pkg-config file
-	${PN}/c/generate-pc.sh --prefix="${EPREFIX}"/usr --libdir=$(get_libdir) --version=${MY_PV} || die
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-
-	dolib.so bazel-bin/tensorflow/lib${PN}_framework.so
-	dolib.so bazel-bin/tensorflow/lib${PN}.so
-	dolib.so bazel-bin/tensorflow/lib${PN}_cc.so
-
-	einstalldocs
-}
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 6227b47f8d34..16da0672bb28 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index 01c4fec0fd5d..1eedb1109b1e 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -3,6 +3,7 @@ AUX clisp-1.patch 1194 BLAKE2B b64764d80b5908a35081b9bb7114e18de266156cb80bae1c7
 AUX clozurecl-2.patch 1505 BLAKE2B c5550f79e67dd007c970759c5e734009d1cb4fa0af728d414ce271175770ed32bd2cf5e58c9738e32afa76b0053b2eee77c886650b0ba99c7e0e3176bc946d69 SHA512 41664b77eae0f2c3cc0e551bd2c26c02769faed339b5725dc790691929094cd5d5008169eba9788515392d9fed00919aaacbb24ee91b76f5d51eb6468335cf9c
 AUX cmucl-1.patch 1336 BLAKE2B 59767907f9f2734fa43e8d9c0e876cf2bf1f2cb0e360976ddd08b4eda9685cd1b862aa072a2f0202733db5ab91958bf0d6b48af3d20e6748f4de2e6b366f49ed SHA512 3b8c01ecbbcd87101e4e31356293216d9c2a018ddabc076905a8b87eeda27bea6cd36242ab6b9caf7553fb9187544beb620b739211c63e21afa1b2f050ef318e
 AUX ecls-2.patch 1612 BLAKE2B 1f06a895ed09844e8d42f462e4541a49de46762a3e9189073a7624785937da2b5ec0e5c54e230652f80bc47a359793c1ed25209061787c3e2b0da76025bdbc86 SHA512 cd37e62c24f24e49f264d63526615537cb088386cfc48f3eac8fcc746d16f6d79c585dee6f24c664fca355f539728a1a23cc75f3672c240a210a407e87b73141
+AUX ecls-3.patch 2147 BLAKE2B d454b620f01d734d6a774f64dbac67f0996aeacc2a029225cc8a9269211169e7b69237f8b734b92b1f037b5abdcd7ec3ba374924b498fdc63025a1eca5a0d9e6 SHA512 1fcaa4a79d4aaf08dd4162c6d59f8f168909320575a43dcb435cbd758338244ac3b89888501f4cb1fc0f9d8d43b3abe587bc898aacb45c19ba0858f74512366e
 AUX emacs-0.patch 807 BLAKE2B 82c879f9c252c4efefb007f8553e845ddc52d76af5cbeab740a1f2bde459b5e87957e0f3e5a9d76d5c1e879ddbebdfb9a6d6b80745cc40e3ddc4379887f4e9b2 SHA512 f62d364651838ed196a2e8965930b42313cb73f912b898b953b526ffc5dc0135841b53618fbbb6a32d21d3412ba5f2bfb253bf41c640a136f68d830f43628ac4
 AUX emacs-27.patch 667 BLAKE2B 2482b30a6940b4d217c9e19485c825435ec37bd030a835ce6aaad3cf3c50170c14cb831a0aef246e75c1b5508a1a6d2e5a6e2642d2a03cea58d0ac482e254125 SHA512 8dc34146327e5ff2ab0fb84e39b240e6ee25ee4457e756e6fba6d521615b2fa9c0c86d1bd3980db6153ea1651399d359aac7a17189ad8a7f40f76392aade8bb2
 AUX rmaxima-0.patch 552 BLAKE2B 8b8ceb5ea671049490ab006be31f6e81f85d9e43950296db920b3a0d4eb8b19cd14b8b599c98e1dc82f69d441d04c631c4aec2315eaee68f791ddce75dc7ed56 SHA512 a60c8c5ac23b0342823fbcd15e27f44ea85652640271ea845e383796422fa416b221dd036eb0a1639f70f9b09473471657612c7a5f99892cfb214d52156a6907
@@ -12,7 +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
 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
 MISC metadata.xml 1521 BLAKE2B 5b42a6b4f68699a032b2a1cc43a34b8b7a1050e41b1875f758eb8ffd82151825d3f920587cf89e25f4f692c8fc587e5b405ca8e2fb3e842b7d7ce61e068f0dc4 SHA512 d2db86fcab10cabb9533954838babc9cee4ebb26b99604ebe0cb995b1239ac2a462455cc72d6311dab142290fbf460eaec920138c09045003b46dd382ed8cbf3
diff --git a/sci-mathematics/maxima/files/ecls-3.patch b/sci-mathematics/maxima/files/ecls-3.patch
new file mode 100644
index 000000000000..b44dea4d09a8
--- /dev/null
+++ b/sci-mathematics/maxima/files/ecls-3.patch
@@ -0,0 +1,48 @@
+diff -r -U3 maxima-5.42.0.orig/src/maxima.in maxima-5.42.0/src/maxima.in
+--- maxima-5.42.0.orig/src/maxima.in	2018-09-21 08:21:11.000000000 +0700
++++ maxima-5.42.0/src/maxima.in	2018-10-01 21:49:23.551633882 +0700
+@@ -236,7 +236,7 @@
+    fi
+ 
+ elif [ "$MAXIMA_LISP" = "ecl" ]; then
+-   exec "$maxima_image_base" --frame-stack 4096 --lisp-stack 65536 $MAXIMA_LISP_OPTIONS -- "$@"
++   exec "$maxima_image_base" --frame-stack 4096 --lisp-stack 65536 $MAXIMA_LISP_OPTIONS -norc -- "$@"
+ 
+ elif [ "$MAXIMA_LISP" = "sbcl" ]; then
+ # Use executable image if it exists.
+diff -r -U3 maxima-5.42.0.orig/src/maxima.system maxima-5.42.0/src/maxima.system
+--- maxima-5.42.0.orig/src/maxima.system	2016-12-04 05:27:40.000000000 +0700
++++ maxima-5.42.0/src/maxima.system	2018-10-01 22:01:08.068604254 +0700
+@@ -59,6 +59,14 @@
+ 	 (c:build-fasl output :lisp-files (list object-output)))))
+ 
+ #+ecl
++(defun split-ld-flags-for-ecl (string &aux space)
++  (setf string (string-trim '(#\Space) string))
++  (if (setf space (position #\Space string))
++    (cons (subseq string 0 space)
++      (split-ld-flags-for-ecl (subseq string (1+ space))))
++    (cons string nil)))
++
++#+ecl
+ (defun build-maxima-lib ()
+   (labels ((list-all-objects (module)
+              (if (eql (mk::component-type module) :file)
+@@ -75,11 +83,16 @@
+ 			     ;; Convert dir/foo.fas to dir/foo.o
+ 			     (make-pathname :type "o" :defaults p))
+ 			 files)))
++       (c::build-fasl "binary-ecl/maxima" :lisp-files obj
++                      :ld-flags
++                       (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
++                                                           (find-package "MAXIMA")))))
++                         (if (and x (not (string= x ""))) (split-ld-flags-for-ecl x))))
+ 	(c::build-program "binary-ecl/maxima" :lisp-files obj
+ 			  :ld-flags
+ 			  (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
+ 							      (find-package "MAXIMA")))))
+-			    (if (and x (not (string= x ""))) (list x)))
++			    (if (and x (not (string= x ""))) (split-ld-flags-for-ecl x)))
+ 			  :epilogue-code '(progn (require :defsystem)
+ 					         (cl-user::run)))))))
+ 
diff --git a/sci-mathematics/maxima/maxima-5.42.0.ebuild b/sci-mathematics/maxima/maxima-5.42.0.ebuild
new file mode 100644
index 000000000000..1c0c67e3ac6e
--- /dev/null
+++ b/sci-mathematics/maxima/maxima-5.42.0.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools elisp-common eutils xdg-utils
+
+DESCRIPTION="Free computer algebra environment based on Macsyma"
+HOMEPAGE="http://maxima.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+# Supported lisps
+LISPS=(     sbcl cmucl gcl             ecls clozurecl clisp )
+# <lisp> supports readline: . - no, y - yes
+SUPP_RL=(   .    .     y               .    .         y     )
+# . - just --enable-<lisp>, <flag> - --enable-<flag>
+CONF_FLAG=( .    .     .               ecl  ccl       .     )
+# patch file version; . - no patch
+PATCH_V=(   2    1     .               3    2         1     )
+
+IUSE="emacs tk nls unicode X ${LISPS[*]}"
+
+# Languages
+LANGS="de es pt pt_BR"
+for lang in ${LANGS}; do
+	IUSE="${IUSE} l10n_${lang/_/-}"
+done
+
+# texlive-latexrecommended needed by imaxima for breqn.sty
+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 )"
+
+# generating lisp dependencies
+depends() {
+	local LISP DEP
+	LISP=${LISPS[$1]}
+	DEP="dev-lisp/${LISP}:="
+	if [ "${SUPP_RL[$1]}" = "." ]; then
+		DEP="${DEP} app-misc/rlwrap"
+	fi
+	echo ${DEP}
+}
+
+n=${#LISPS[*]}
+for ((n--; n >= 0; n--)); do
+	LISP=${LISPS[${n}]}
+	RDEPEND="${RDEPEND} ${LISP}? ( $(depends ${n}) )"
+	DEF_DEP="${DEF_DEP} !${LISP}? ( "
+done
+
+# default lisp
+DEF_LISP=0 # sbcl
+ARM_LISP=2 # gcl
+DEF_DEP="${DEF_DEP} arm? ( `depends ${ARM_LISP}` ) !arm? ( `depends ${DEF_LISP}` )"
+
+n=${#LISPS[*]}
+for ((n--; n >= 0; n--)); do
+	DEF_DEP="${DEF_DEP} )"
+done
+
+unset LISP
+
+RDEPEND="${RDEPEND}
+	${DEF_DEP}"
+
+DEPEND="${RDEPEND}
+	sys-apps/texinfo"
+
+TEXMF="${EPREFIX}"/usr/share/texmf-site
+
+pkg_setup() {
+	local n=${#LISPS[*]}
+
+	for ((n--; n >= 0; n--)); do
+		use ${LISPS[${n}]} && NLISPS="${NLISPS} ${n}"
+	done
+
+	if [ -z "${NLISPS}" ]; then
+		use arm && DEF_LISP=${ARM_LISP}
+		ewarn "No lisp specified in USE flags, choosing ${LISPS[${DEF_LISP}]} as default"
+		NLISPS=${DEF_LISP}
+	fi
+}
+
+src_prepare() {
+	local n PATCHES v
+	PATCHES=( emacs-0 rmaxima-0 wish-2 xdg-utils-1 )
+
+	n=${#PATCHES[*]}
+	for ((n--; n >= 0; n--)); do
+		eapply "${FILESDIR}"/${PATCHES[${n}]}.patch
+	done
+
+	n=${#LISPS[*]}
+	for ((n--; n >= 0; n--)); do
+		v=${PATCH_V[${n}]}
+		if [ "${v}" != "." ]; then
+			eapply "${FILESDIR}"/${LISPS[${n}]}-${v}.patch
+		fi
+	done
+
+	eapply_user
+
+	# bug #343331
+	rm share/Makefile.in || die
+	rm src/Makefile.in || die
+	touch src/*.mk
+	touch src/Makefile.am
+	eautoreconf
+}
+
+src_configure() {
+	local CONFS CONF n lang
+	for n in ${NLISPS}; do
+		CONF=${CONF_FLAG[${n}]}
+		if [ ${CONF} = . ]; then
+			CONF=${LISPS[${n}]}
+		fi
+		CONFS="${CONFS} --enable-${CONF}"
+	done
+
+	# enable existing translated doc
+	if use nls; then
+		for lang in ${LANGS}; do
+			if use "l10n_${lang/_/-}"; then
+				CONFS="${CONFS} --enable-lang-${lang}"
+				use unicode && CONFS="${CONFS} --enable-lang-${lang}-utf8"
+			fi
+		done
+	fi
+
+	econf ${CONFS} \
+		$(use_with tk wish) \
+		$(use_enable emacs) \
+		--with-lispdir="${EPREFIX}/${SITELISP}/${PN}"
+}
+
+src_compile() {
+	emake
+	if use emacs; then
+		pushd interfaces/emacs/emaxima > /dev/null
+		elisp-compile *.el
+		popd > /dev/null
+		pushd interfaces/emacs/imaxima > /dev/null
+		BYTECOMPFLAGS="-L . -L ../emaxima"
+		elisp-compile *.el
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	docompress -x /usr/share/info
+	emake DESTDIR="${D}" emacsdir="${EPREFIX}/${SITELISP}/${PN}" install
+
+	use tk && make_desktop_entry xmaxima xmaxima \
+		/usr/share/${PN}/${PV}/xmaxima/maxima-new.png \
+		"Science;Math;Education"
+
+	# do not use dodoc because interfaces can't read compressed files
+	# read COPYING before attempt to remove it from dodoc
+	insinto /usr/share/${PN}/${PV}/doc
+	doins AUTHORS COPYING README README.lisps
+	dodir /usr/share/doc
+	dosym ../${PN}/${PV}/doc /usr/share/doc/${PF}
+
+	if use emacs; then
+		elisp-install ${PN} interfaces/emacs/{emaxima,imaxima}/*.{el,elc,lisp}
+		elisp-site-file-install "${FILESDIR}"/50maxima-gentoo-1.el
+
+		rm "${ED}"/${SITELISP}/${PN}/emaxima.sty || die
+		insinto ${TEXMF}/tex/latex/emaxima
+		doins interfaces/emacs/emaxima/emaxima.sty
+
+		insinto /usr/share/${PN}/${PV}/doc/imaxima
+		doins interfaces/emacs/imaxima/README
+		doins -r interfaces/emacs/imaxima/imath-example
+	fi
+
+	# if we use ecls, build an ecls library for maxima
+	if use ecls; then
+		ECLLIB=`ecl -eval "(princ (SI:GET-LIBRARY-PATHNAME))" -eval "(quit)"`
+		insinto "${ECLLIB#${EPREFIX}}"
+		doins src/binary-ecl/maxima.fas
+	fi
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	if use emacs; then
+		elisp-site-regen
+		mktexlsr
+	fi
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	if use emacs; then
+		elisp-site-regen
+		mktexlsr
+	fi
+}
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 6917dfb769ee..ca7c136e202a 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/tensorboard/Manifest b/sci-visualization/tensorboard/Manifest
index f880fa2491f2..23c8c571c633 100644
--- a/sci-visualization/tensorboard/Manifest
+++ b/sci-visualization/tensorboard/Manifest
@@ -1,5 +1,5 @@
 DIST tensorboard-1.10.0.zip 3280385 BLAKE2B b4e9f6d4fc6252b57f31e8514516205c8f8150d3d2c0f46049338fe7d7dd601b75c0b1c21945e06d077511426f85c65a318e184f9fd40758b1f83a7e93364518 SHA512 2c3a741c4627242e2e4c144d09089c951291826fe1839cf04d9f369b4e88cd5d7fb02b0789ea11cb4810ef458e167e98562ba55ac7cfcc048e4117f12b531818
 DIST tensorboard-1.11.0.zip 3027414 BLAKE2B 5a0c325755551d5dfea98cc96cfa5ee0a8c9d39c2e7bcf8139daea54dcc89e5004de0dd90069e626264e11633acc283055ee3e73654b3d883418e07eef6f0f08 SHA512 d3948143a883ed6c6353cfab945814ff4ef21833b38875f003ef375d1e3a63dd65fce49ef80b2eec5827c46ffb6a82f8464f2b0e7d4af348ad8ba51ce4829426
 EBUILD tensorboard-1.10.0.ebuild 1330 BLAKE2B b1300796ebf50322673def76c4f14b5a847c86ca7f07450ff2c359ed9cebb7ca30ff354f4f5d86fec6f78a91f4717cb6b127f0f6be32e8139221493df49efa6a SHA512 a505ef05c7ab8457b48b3ae6e9530f26524d69e9f1b2e3e0ee22bedcc21139fce22f32a21537899cbe473d55eff63db3dc039e5efb80eea6b04d82e009b9b37a
-EBUILD tensorboard-1.11.0.ebuild 1241 BLAKE2B 89ac0afe6153fa08a04b016e6213c66ff67547e78e28b9b46e4c6afdef3b2275823cd624dc17147618969e79ba0af7a75ca7d7fee9123cd44690d2eacbb9087d SHA512 0e52834b626dfd0834404735265bbc7718dcd666f45c9993a4026f9c7af76225e23908173cde20753f3cebba18c00c0e7062586ad7b6866aab587d0fe77a5f3e
+EBUILD tensorboard-1.11.0-r1.ebuild 1492 BLAKE2B fe713d5dbad7170491d504a3216d6af6696e20a2b14cf18b9d4e664123424ae23402702aba861319888e2f6cdd07f1934109690acd859eaf7ab5c15d1ecdb19b SHA512 41da7faac2d44fe3237b78be3a6ccd5c92a6533d549dbecf7d61a09d930bf55aa807be67e21fbc960d95e214b6d45ef5140e2003a3cc6fb9175f13b5b0675d20
 MISC metadata.xml 494 BLAKE2B 367959e934fdf8e447da9632a05ea0ada6116a7c39cf42096a3b24f0dcf0c0bfbd3263e6f3913611c27e76f629b77d1e5022fa124d7e79f03a224bd3627bb538 SHA512 b59bedcac4e07ddbb62e90df57670116ba51c3d8c6294679ba5d8f17d7adbf3644f3d203c1d1ef4fa06d7e50640148ee259a081afb807477784350b98c52da11
diff --git a/sci-visualization/tensorboard/tensorboard-1.11.0-r1.ebuild b/sci-visualization/tensorboard/tensorboard-1.11.0-r1.ebuild
new file mode 100644
index 000000000000..c7bf274d1a98
--- /dev/null
+++ b/sci-visualization/tensorboard/tensorboard-1.11.0-r1.ebuild
@@ -0,0 +1,52 @@
+# 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 python-r1 python-utils-r1
+
+DESCRIPTION="TensorFlow's Visualization Toolkit"
+HOMEPAGE="https://www.tensorflow.org/"
+SRC_URI="https://files.pythonhosted.org/packages/9b/2f/4d788919b1feef04624d63ed6ea45a49d1d1c834199ec50716edb5d310f4/${P}-py3-none-any.whl -> ${P}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	dev-python/bleach[${PYTHON_USEDEP}]
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/markdown[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]"
+BDEPEND="app-arch/unzip"
+PDEPEND="sci-libs/tensorflow[python,${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	rm -rf "${S}/_vendor/bleach" || die
+	rm -rf "${S}/_vendor/html5lib" || die
+
+	find "${S}" -name '*.py' -exec sed -i \
+		-e 's/^from tensorboard\._vendor import html5lib/import html5lib/' \
+		-e 's/^from tensorboard\._vendor import bleach/import bleach/' \
+		-e 's/^from tensorboard\._vendor\.html5lib/from html5lib/' \
+		-e 's/^from tensorboard\._vendor\.bleach/from bleach/' \
+		{} + || die "failed to unvendor"
+
+	eapply_user
+}
+
+src_install() {
+	do_install() {
+		python_domodule "${S}"
+	}
+	python_foreach_impl do_install
+}
diff --git a/sci-visualization/tensorboard/tensorboard-1.11.0.ebuild b/sci-visualization/tensorboard/tensorboard-1.11.0.ebuild
deleted file mode 100644
index 5e3272e5be05..000000000000
--- a/sci-visualization/tensorboard/tensorboard-1.11.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=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-inherit python-r1 python-utils-r1
-
-DESCRIPTION="TensorFlow's Visualization Toolkit"
-HOMEPAGE="https://www.tensorflow.org/"
-SRC_URI="https://files.pythonhosted.org/packages/9b/2f/4d788919b1feef04624d63ed6ea45a49d1d1c834199ec50716edb5d310f4/${P}-py3-none-any.whl -> ${P}.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	dev-python/bleach[${PYTHON_USEDEP}]
-	dev-python/html5lib[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]"
-BDEPEND="app-arch/unzip"
-PDEPEND="sci-libs/tensorflow[python,${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	rm -rf "${S}/_vendor" || die
-	find "${S}" -name '*.py' -exec sed -i -e \
-		's/^from tensorboard\._vendor import /import /;
-		s/^from tensorboard\._vendor\./from /' {} + || die "failed to unvendor"
-
-	eapply_user
-}
-
-src_install() {
-	do_install() {
-		python_domodule "${S}"
-	}
-	python_foreach_impl do_install
-}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index a90eb27d9559..58aa4696fb65 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/accountsservice/Manifest b/sys-apps/accountsservice/Manifest
index e519e5ffe2ae..bf53dbbcf680 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 1613 BLAKE2B fc8a9793424fcb8b6fd35072b6d415042b52c71a7a712ae1d1dcfd4ae8de309b011aecca6cb2f4326939958cc5f1baa1922b7389634da998d26d01aa7733e3d6 SHA512 1fc972a74ea8fa04931775e386037496dac6f4915669e5084f3b886f7868f44ac7b0fc3af6da165204e71f9ba04a685cb02a59ba7389a6f676178f7213d6e9e0
+EBUILD accountsservice-0.6.50-r1.ebuild 1608 BLAKE2B ff6a6740463ac1cc16a18de721b0fdac4573ba95ca575c540aee719c39928f51d904b002926f2b01da5f560e180e806a674e8b6edc3518956b641537a270cf56 SHA512 e06f0d20b0d9883753d33ba66c45507d25665a55b8b54e0f1275f08a8bf595ed50dd75d47aa3e009a1a4a1a4a70c44d6263e4ae90a50cf324239ffaae1a4cbb1
 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 3036d2bed673..ac040961862d 100644
--- a/sys-apps/accountsservice/accountsservice-0.6.50-r1.ebuild
+++ b/sys-apps/accountsservice/accountsservice-0.6.50-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 @@ 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/bolt/Manifest b/sys-apps/bolt/Manifest
index 1a1695a7f684..479ff204448b 100644
--- a/sys-apps/bolt/Manifest
+++ b/sys-apps/bolt/Manifest
@@ -1,3 +1,5 @@
 DIST bolt-0.4.tar.gz 113525 BLAKE2B 4d6b25b60a35bbeee724e4549a49709ff19d99457c8a35c02c66026cdca999359220d09812f8e9f44586b5e3cf3dda2e3ff30f35a4f37ed6d815535e62af39f3 SHA512 3ea6b748768b5d9df60425274ecdb4ccd5ce6599e01f0648a24704643fbbadd7a114d4a1946ee3b7bd8866935758cbfe4494734c26c12ccc508c205a036d5317
+DIST bolt-0.5.tar.gz 149665 BLAKE2B ca7f937d4b7f4911cba93f8619e52af37f18a6542bc76aaee388a9122ea38d11ba0a21f4afb45bd6109e12ada4662783cb8f7aebec0d58751ace6c18c49ace88 SHA512 d36f2e39ac53b131fb9607055231a5a205c368547c0db2c3a7537b6e60b156c8b0663d1e5b09c825e1e1a63fbe21087746d0bafde1bd474eb90f1d0cff991246
 EBUILD bolt-0.4.ebuild 811 BLAKE2B e28db1546f449f68019161dd5b85ad5a48355df464c9faf29d4197570538d030d9af840c46fcdc8c56291d4be83942fe3bc9f61486ab9571b4ea61164748489f SHA512 8951b1d10ddd4c7102c1047630d9b3cacd5563d1c1d494e306abcde839b85ea31c762e1d16b0caa5e103e66a3faf1b251526c0ef6ee4d340318e44873b19155e
+EBUILD bolt-0.5.ebuild 908 BLAKE2B bba91781931c9be0cfd2f21ebe5fb8fa12eb5d7079deca835856bbdf77d4a5e0941326fab01ae38e817d6503a46dd3cd4a6b2a304c0a6c0fbe04ec2f8ced7d9d SHA512 72ef83615267edac04824a4a7059c5203236d9f43eebb27c51f07da75b1ebcae8f6c03a551ce0b5f7fdf1d4e8263a4ff954279349262a5b2220a73e1a800c8eb
 MISC metadata.xml 387 BLAKE2B 9c5d99308a9bf4340ad48310dc9cc5f67ad7db1683f54794f025b90667dfb2f178b25c1d9a3d0fa0a7fde249ea8bf40cb608265e96aca30e547f3e2e536b91f0 SHA512 16060e68e59d82a6a556bc0149f5e365a4092b14edadeb09dfad8278b19e28e0d1835fcb24a2f335809d1ec910c788cc69d579d7aaaba9ff32b4090a904c7706
diff --git a/sys-apps/bolt/bolt-0.5.ebuild b/sys-apps/bolt/bolt-0.5.ebuild
new file mode 100644
index 000000000000..1156dc761c54
--- /dev/null
+++ b/sys-apps/bolt/bolt-0.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit meson systemd
+
+DESCRIPTION="Userspace system daemon to enable security levels for Thunderbolt 3."
+HOMEPAGE="https://gitlab.freedesktop.org/bolt/bolt"
+SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc systemd"
+
+DEPEND="
+	>=dev-libs/glib-2.50.0:2
+	dev-util/glib-utils
+	virtual/libudev
+	virtual/udev
+	dev-util/umockdev
+	sys-auth/polkit[introspection]
+	systemd? ( sys-apps/systemd:0= )
+	doc? ( app-text/asciidoc )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local emesonargs=(
+		-Dman=$(usex doc true false)
+		--sysconfdir=/etc
+		--localstatedir=/var
+		--sharedstatedir=/var/lib
+		-Dsystemd=$(usex systemd true false)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	keepdir /var/lib/boltd
+}
diff --git a/sys-apps/daemonize/Manifest b/sys-apps/daemonize/Manifest
index 6b3040e78b97..15aa749c5b55 100644
--- a/sys-apps/daemonize/Manifest
+++ b/sys-apps/daemonize/Manifest
@@ -1,7 +1,5 @@
 DIST daemonize-1.7.4.tar.gz 66005 BLAKE2B 6bcd1fb514d4ffaaa07f9c296b9ae4795aa4f2a2ab3a3232897e733d7c09f2727764b7c79ae4a254dc53ac3a7c77ed2ee16a537829827ae475ad6bce34315355 SHA512 aa5dd1d89650fc4a7e783163852de176877b0e999c4d16950a03a81c0db1477e2994fe8d97d8e2bd61baafb7810522754eade96f3ff0301c1e6ce74f9252d34e
-DIST daemonize-1.7.5.tar.gz 65817 BLAKE2B 4f523031a4bd2396a57965ed217784bef9d8825305eeda73c0fb8090a9f3eb1c15cbd99b079016e14b179fc293341afe0150ec646ef5cba66272c325d51a4b2d SHA512 8e1c7cf47a2026d13505c83c5987ea7237226e104dd5fdd4d57d006000846b387216b2506604f60c6178a7445493591254696dddbb334d89ee611954a65659ea
-DIST daemonize-1.7.6.tar.gz 65927 BLAKE2B 5a91928edbef2487db15de8d72c018dbc209b54985e680a8164f1fcc79b739f57940b84171a719753f7f0ea4ce06bdb0711ba1125651cef50b37952564cada2a SHA512 e0276c504727004edf02f97d3295daca6c9990ae7130c536d388a967ee8711625308eb8ffdd989b6e3e25915038095f4a53b4cf051a6f2a2a397369ea99ab14c
+DIST daemonize-1.7.8.tar.gz 66009 BLAKE2B 323b98357c1750ae051378d8d432a4997fb3d162f65f102a3f7d5e1c0271eec77aad7f5253c4712209c9c2cba1c725b3daeaf1c240dca31be13990d3a833fbc0 SHA512 77cb7f6d41fd3484222831540aa8dedcd1f3cbb2f4be2a9b5e0bc1c848fb1392b616ff30b9ff3bb46f3decd1ff2829dbf7130887f81ed66a7cd2c710755a0836
 EBUILD daemonize-1.7.4.ebuild 593 BLAKE2B f8e7a3b6b40618121f7a990f6d953b8f60e1d78cff4c316d53601401cd514aa952fa312c5cab9218048ec6487dc1f40926e5620b1b73c4b111d47fc6c9c22360 SHA512 5df8000970f909dfb73200b254780a7598a1b08e262b6991ea2e1629a47f168c9307c4b09cac5bb8ed801b7a55057479e390bf36fb9d0e96a12a99576f053fa5
-EBUILD daemonize-1.7.5.ebuild 595 BLAKE2B c7b52aa3c60803287e4ba6d8177ded570caf572f5dab13f4dd0809b23bef0e62ab5fc5b4f4ada34981be8d6d502cb43be271a39f5d37801e28e4c1a6657360dd SHA512 6d347f37c42da231a73872a03b38ce1b51ed34097313d238e51b938a49b509efd568ec4c7c1aa258bd2224550adb4b100c51beacec179cd27fb135b4b15921ca
-EBUILD daemonize-1.7.6.ebuild 595 BLAKE2B 2947f4d468f040c640668eb6595acc2b5730196f20f09ee3218d2dbebe06836326c62b15298583ca6bb7a3e5ea9ea67c18ff467a7084593a3d8f4fde848be006 SHA512 27a028624ad1b66c7ea110126801932a587b2ade1a42b6f2a45a95ee4ef5ffb43792c7f4db8e2648c085da0c2e7a3302fbbf2d0855be86917399028541af04d3
+EBUILD daemonize-1.7.8.ebuild 529 BLAKE2B 792525122f902ddd62fb0a41390586b173fcffb9533b70b1e10a33c1407fd0250ede85686401cd101df34d696c301381f1726202ffad332f19efd2d1357bc057 SHA512 61c046196f9a53a308e5414e1cde3b1d4aac9e4e5c9ff95ecb01dd178b10f19ff51c5c7a9737ee46d82af3f8fb2b05bef9becf063b102ead5458858784f9ffcc
 MISC metadata.xml 323 BLAKE2B 489ae3e56f15b64d9842744ff57160a94b16211ffed2abf3d0cf2fde5e53a65be5fb5e42cddee855838c76cd85b7dd6c62716b99d2451aadc74858c20b99c660 SHA512 fdddf9c23f5f171bd9c1c5f8ca98c61e8a1187b57b77a8a12de8e1d339f44d405e19b42330ef8e53f146798950eaef9e9a8e44849d8cba6aeb828db14d97113c
diff --git a/sys-apps/daemonize/daemonize-1.7.5.ebuild b/sys-apps/daemonize/daemonize-1.7.5.ebuild
deleted file mode 100644
index 65bf5f18250e..000000000000
--- a/sys-apps/daemonize/daemonize-1.7.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Runs a command as a Unix daemon"
-HOMEPAGE="https://bmc.github.com/daemonize/"
-SRC_URI="https://github.com/bmc/${PN}/tarball/release-${PV} -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DOCS=( README.md CHANGELOG.md )
-
-src_unpack() {
-	unpack ${A}
-	# Workaround commit suffix from github.
-	mv "${WORKDIR}"/bmc-${PN}-* "${S}" || die
-}
-
-src_prepare() {
-	sed -i \
-		-e 's:\($(CC)\) $(CFLAGS) \(.*\.o\):\1 $(LDFLAGS) \2:' \
-		Makefile.in || die
-}
diff --git a/sys-apps/daemonize/daemonize-1.7.6.ebuild b/sys-apps/daemonize/daemonize-1.7.6.ebuild
deleted file mode 100644
index 72704fcc0425..000000000000
--- a/sys-apps/daemonize/daemonize-1.7.6.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Runs a command as a Unix daemon"
-HOMEPAGE="https://bmc.github.com/daemonize/"
-SRC_URI="https://github.com/bmc/${PN}/tarball/release-${PV} -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DOCS=( README.md CHANGELOG.md )
-
-src_unpack() {
-	unpack ${A}
-	# Workaround commit suffix from github.
-	mv "${WORKDIR}"/bmc-${PN}-* "${S}" || die
-}
-
-src_prepare() {
-	sed -i \
-		-e 's:\($(CC)\) $(CFLAGS) \(.*\.o\):\1 $(LDFLAGS) \2:' \
-		Makefile.in || die
-}
diff --git a/sys-apps/daemonize/daemonize-1.7.8.ebuild b/sys-apps/daemonize/daemonize-1.7.8.ebuild
new file mode 100644
index 000000000000..16382e7c34eb
--- /dev/null
+++ b/sys-apps/daemonize/daemonize-1.7.8.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Runs a command as a Unix daemon"
+HOMEPAGE="https://bmc.github.com/daemonize/"
+SRC_URI="https://github.com/bmc/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DOCS=( CHANGELOG.md README.md )
+
+S="${WORKDIR}/${PN}-release-${PV}"
+
+src_prepare() {
+	default
+	sed -i \
+		-e 's:\($(CC)\) $(CFLAGS) \(.*\.o\):\1 $(LDFLAGS) \2:' \
+		Makefile.in || die
+}
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index 142f91a1d328..5ff32ae66e59 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -3,7 +3,7 @@ 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
-EBUILD etckeeper-1.18.6-r1.ebuild 1768 BLAKE2B 31e5a00dab3080b8e2241848a8d2c510b732d0330fc9b732d72e48789b403e65b52fbeeb0f73c8b1b9b7f5afbdeb9cfa7c30932dcf1ba1159c58a773a9945932 SHA512 ac0fac599f4b7917486c671ac949eab706103d0304e2a157267224a07fd6af449565de66ec13988b383380f8624ed443cc1d7b0872a18abea11a2cad93d79781
-EBUILD etckeeper-1.18.6.ebuild 1711 BLAKE2B 9f338ff11900fb652bb9f942dc993caed137ac5fc7af58e8b8741252f1ecac3f328c771f137533b5dfd7afab30acb186f67ac52c476023ffd0379ece8a202ec1 SHA512 870d331516eda64ee50228751d1d6552359e8b7fc8afe57293d2415d3380653185729e22018b17773b5573f1b151d3c46846fa5e226b6a6a66f9203b775913e7
-EBUILD etckeeper-1.18.7.ebuild 1852 BLAKE2B 986fc04533c6d045578aeff774c1d7984a116bff863ca56b58f95f8a7852aa787b7befec61ff40dc957a28d25925a856cfdb87a9917e6a8b88d2c2ad5f3f5225 SHA512 841c2593f2f4d251607cbcf4345232fcf8bec6f940590126d9681f2d680e8b60a9cb87c1e76b17565b87325663f7b0cc4c11349f492ac5b8ee06c6d7602a6deb
+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
 MISC metadata.xml 980 BLAKE2B c3c6a13f0b45eddef29c767f55c739298f6554e94f444723e19d6b93dd9af2bfda7aabcf8c6d0e56fba482b4067a2130c4474373708652eb9d8216119177fd7d SHA512 41d4b97b4073278af7543cd459c1c5bcfc951bdb6a6c2a201cba6cdc0e0fedc640fca5d9e59041951315a961f5eea284eb3c12260148bfbe97c11ee15b11ad9f
diff --git a/sys-apps/etckeeper/etckeeper-1.18.6-r1.ebuild b/sys-apps/etckeeper/etckeeper-1.18.6-r1.ebuild
index 3f0dd55eb8f8..60ffce7651d5 100644
--- a/sys-apps/etckeeper/etckeeper-1.18.6-r1.ebuild
+++ b/sys-apps/etckeeper/etckeeper-1.18.6-r1.ebuild
@@ -12,7 +12,7 @@ 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 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 SLOT="0"
 IUSE="bazaar cron"
 REQUIRED_USE="bazaar? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sys-apps/etckeeper/etckeeper-1.18.6.ebuild b/sys-apps/etckeeper/etckeeper-1.18.6.ebuild
index 036e3fa29f9a..59f27252629f 100644
--- a/sys-apps/etckeeper/etckeeper-1.18.6.ebuild
+++ b/sys-apps/etckeeper/etckeeper-1.18.6.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://etckeeper.branchable.com/"
 SRC_URI="https://github.com/joeyh/etckeeper/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
 SLOT="0"
 IUSE="bazaar cron"
 REQUIRED_USE="bazaar? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sys-apps/etckeeper/etckeeper-1.18.7.ebuild b/sys-apps/etckeeper/etckeeper-1.18.7.ebuild
index f18078fe62db..32667889cf27 100644
--- a/sys-apps/etckeeper/etckeeper-1.18.7.ebuild
+++ b/sys-apps/etckeeper/etckeeper-1.18.7.ebuild
@@ -12,7 +12,7 @@ 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 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 SLOT="0"
 IUSE="bazaar cron test"
 REQUIRED_USE="bazaar? ( ${PYTHON_REQUIRED_USE} )"
@@ -32,6 +32,11 @@ RESTRICT="!test? ( test )"
 
 PATCHES=( "${FILESDIR}"/${PN}-1.18.6-gentoo.patch )
 
+src_prepare() {
+	default
+	hprefixify *.d/* etckeeper
+}
+
 src_compile() {
 	:
 }
@@ -45,10 +50,7 @@ src_install(){
 	}
 	use bazaar && python_foreach_impl bzr_install
 
-	if use prefix; then
-		doenvd "${FILESDIR}"/99${PN}
-		eprefixify "${ED%/}"/etc/env.d/99${PN}
-	fi
+	doenvd "$(prefixify_ro "${FILESDIR}"/99${PN})"
 
 	newbashcomp bash_completion ${PN}
 	dodoc doc/README.mdwn
diff --git a/sys-apps/gptfdisk/Manifest b/sys-apps/gptfdisk/Manifest
index 6c4bc20738ff..2764c577beae 100644
--- a/sys-apps/gptfdisk/Manifest
+++ b/sys-apps/gptfdisk/Manifest
@@ -2,6 +2,6 @@ DIST gptfdisk-1.0.1.tar.gz 195378 BLAKE2B 50cbfe1143c1e26595757bb40a94952ee9d26c
 DIST gptfdisk-1.0.3.tar.gz 199924 BLAKE2B f664398cb58d081ad19e267a370a4a7363e1060358aac394d87cd5874efe558fbd7bea4a33da871287c144b664c60e283d3338ca88d7d494503afe9a0b652e7a SHA512 80d437bfa2365abfffbd4812ea928fcebd52c5421de321cf190d395549e32c5ebdbb2d060cc4b95f77fe13cdd719f4d2bb3d0ed5d97792b100325f92d7c852d7
 DIST gptfdisk-1.0.4.tar.gz 204075 BLAKE2B 45be16bd4e8312e4797a70c07447702a7f966edec94a9e9e17cff89eee51bf33cb9418dcac2a103e68ea2ebb8df4e7a997fd006bfa4109cfd774838bd4bd7d19 SHA512 2df6db6974c06a6677a155d32566b8b46dad0df7781131e9018072db9acce5e41f6c4e7024b0e5f236dd43350a63572be34fb4b6fdb580cd9b946619a7a683bf
 EBUILD gptfdisk-1.0.1.ebuild 1187 BLAKE2B bff741cf8c43f0f3b060e4febd75f9a41d76328ded6415f7d022e306e07836af7051fa5d6a755d59d88b97dee403eba2f260871435736863b6024e35e8ee4515 SHA512 f8d8c14f2a549aca37e9eb13e0365b6e3029568c44902fac2881374804b772abd8d7cf6d5d34f74c43d757dffbf1026014ad6ea11e6343b670c72c58c166d63e
-EBUILD gptfdisk-1.0.3.ebuild 1245 BLAKE2B fe0861c438e837708fa8052f7ad0d9cc7926403fc6530cf638bd3326ef8b51ca2deabd7d2fd89002431454fea4b480b1f0648847e0d2cf0c9cf5553a9807f344 SHA512 9e4a5ee7a5ffc79e29396c01427ba9503c3623746e431809e30efac4563fe20e14a73cf5c0797bedde745517fb4008ce7b1013aec0a057c7ab3414d98c1cbb0a
-EBUILD gptfdisk-1.0.4.ebuild 1248 BLAKE2B ddc6d9cb111fbf70b5f2bc668f2b16402405007ea338f9597c39c5d900fb92dcc67a0b5802db00d6ab5f0e7df5cf16afe34e84b4e929d1c0d5e8ed593adebdf2 SHA512 c528801dd6b4d0d3495e0b70e0dcdec485682440f721ab07b8d186be365f3a3ad4cd698797e611623cdac6614c9323481339f1a45b99e748af69ff255a4903c0
+EBUILD gptfdisk-1.0.3.ebuild 1244 BLAKE2B 30db017ad95d995589200cdc2026ff32ec414262b4f178970f73f8a88bd2653b5690bdcde4e47cc8bb459e35933d7ed2692d196f8eaa54ef8e1a76c8f5071934 SHA512 72529d598e3c94a2886b3b54093bcaa0015ada90dd729818d0a2fc6b7befabbece64821c7a342c9ea44e3c4c2d8cddb17877afb33edfcc343fd6ee1f6fd1e690
+EBUILD gptfdisk-1.0.4.ebuild 1254 BLAKE2B 254054a09a965918a1f9c08d07f671a02b47cb6d7688158bb985c0072bd1bf3e357cb7a8b0502eb11eeacd6b227ece6629371425e5140eabb4d67a7e769f92be SHA512 315f7b2547974cf27a33b30e860cb7291f57ba60006207c1bb6779b119c3d8e8feddebf613abc316913b354cde7fd99108c326aa905cf120d67b6ed9c1d92a2a
 MISC metadata.xml 339 BLAKE2B 3f08c8aa6a482a6d923388fcbf800cac3282c5c864b9fe27868491d10e7edb75ed04f8d7bc86f5295c90e338d99d59b275ae79813b4d549a04331992526c6979 SHA512 d8334a3e741adf97739f9fef66d7b38bfab9e2d189ac5fbc96ab27a7c1551938b6184ebb08b03ef8b6864f6e43d536836f373e03f3491cacc8f6ee3496f615b5
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild
index 70a5f059ee87..1b20d951d671 100644
--- a/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-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="kernel_linux ncurses static"
 
 # libuuid from util-linux is required.
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild
index a1046c70120d..5f5ea9aeddda 100644
--- a/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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="kernel_linux ncurses static"
 
 # libuuid from util-linux is required.
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index b6259c4a0342..d03878eb7f3e 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 1410 BLAKE2B c0c968993b0ddb07195b90ffa8a64e1a03b291ba2aa9b369209706868bf3583796e3e54223f95d7b1fb2170e824c9ec59ef9e0ae7eeaea7f4715ee9cede07411 SHA512 d143f8353bc8f7789098d4240736d764a337d77565455306390924c8c6b6a25b92c27f1fdbbdc60740e177b9cccd4f173796430e30a7e06d5abc6c653ff9c5d4
+EBUILD grep-3.1.ebuild 1402 BLAKE2B dd1e60f885b919e2c9baa0b5ab6119011553171b503f0986172fdcf03920a74c1d587cc0058715666ebb94a26b5fd05ec032e957e95d6db956997a10ce4d3ed1 SHA512 0d4f22aaf6ef1e60bfbab6a3b11e9096fa9e0e3d984f109a55138c69b63a28336c19d85bbef237ace38157ee9ce082917014d6cb85bb4ac22d8857bb3eb3e7e9
 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 74350ee63c18..24f509c2bfa5 100644
--- a/sys-apps/grep/grep-3.1.ebuild
+++ b/sys-apps/grep/grep-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=5
@@ -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/gsmartcontrol/Manifest b/sys-apps/gsmartcontrol/Manifest
index bf65f471fdd5..caf0fbb9bd37 100644
--- a/sys-apps/gsmartcontrol/Manifest
+++ b/sys-apps/gsmartcontrol/Manifest
@@ -1,7 +1,5 @@
 DIST gsmartcontrol-1.0.2.tar.bz2 695445 BLAKE2B cccfe2d96eab050fbcc2b99107e6a962a75c6cce492d64e40cab371f7d23cec6eaf6df7682cc0a43a8678152be3425ccd6eeb6f8743bd1a8e2edb7f4624d4238 SHA512 a9dd037fc4223afa762408bc34325fb31947822250efe32ae97b88e836c5bb68d8354d7605925b2ab7c834764ea473a14f2cd1f234577ef76730b02ad9a8b701
-DIST gsmartcontrol-1.1.1.tar.bz2 667372 BLAKE2B 3a1f0ba8b3083c34e32c2cca571f427f0d123e5183c593cddf150b61e855da941e9fae855a6d7cf7be5931555d67f3587db17d6f52fc77b35d27af9403425cba SHA512 fc180b85a9db232add4260856e078a578801e11b87df417a5572fab284e992c85009ab9e7d9d6213b2842097067fc119fa0183d5b0dedf8dde71fe4e9e0b38cc
 DIST gsmartcontrol-1.1.3.tar.bz2 677998 BLAKE2B f444dd29602f6934b440650e57d5d981a3b9823a905ce3c178109b230e6536edd4f38ed0762872b38186774127a164feb7363bb45cbd80e9c0b34398c1a06092 SHA512 7a8bb79875a53d742923fc8ff8336d7fbbdaf2e1b1f64296840557997125d4dcfea9a93a5e8a834003d592083a180ee85ca0e29d3aecf0eb475a3d4fed460456
 EBUILD gsmartcontrol-1.0.2.ebuild 985 BLAKE2B 6ba808f9716a9b89bb394f98c289a38c8c0108893139a5ea41b43200a404d831fe73102f1ff808c8aee1310e77f6a63aa39192c0d880cc920788de0de7996938 SHA512 d94227eae7f6e3b7ddc5c728efdbf4ef1994de75dcd7596dda6a80591e8e55769aa9dbdca98003031efaab58ed7d4e4cccefa17bf1585ab2938deca86be7532b
-EBUILD gsmartcontrol-1.1.1.ebuild 987 BLAKE2B 5a0721c0f4e9b9e8bc880ebbd742c05a8ee595a31313782c4e72a923ae27a2c4e5fa8626a4ad87441eaf04f872aff47157c907e9eafb2b95a322a531d944095e SHA512 1e968ff6815c7479268435a64aa35d86bee145d71f6718e3208296f00766ce889a026f351b95af4dcd9f9ba2e67945973dc430a30e91832223ac94ab3b245ee6
-EBUILD gsmartcontrol-1.1.3.ebuild 987 BLAKE2B 5a0721c0f4e9b9e8bc880ebbd742c05a8ee595a31313782c4e72a923ae27a2c4e5fa8626a4ad87441eaf04f872aff47157c907e9eafb2b95a322a531d944095e SHA512 1e968ff6815c7479268435a64aa35d86bee145d71f6718e3208296f00766ce889a026f351b95af4dcd9f9ba2e67945973dc430a30e91832223ac94ab3b245ee6
+EBUILD gsmartcontrol-1.1.3.ebuild 982 BLAKE2B 28b241d2dab6972d8203e1a4622f35f5f9c74d6fd83479e2571ccb277da25f9c28701bc0b9a505ab03ab7c06a87dc3cfafb58d6c45f668a2762be03e3c96a91f SHA512 99143012593566e3b7bec9fd7a94f4a8ee3a81e29ac274280a0f72a6a897a89cc6f45677d9800a06eaf74dfe08c07871a7318bc5b49ccf648730395d443d1294
 MISC metadata.xml 340 BLAKE2B f4f46445999e4db825f8d50018a9c6a8c8ee431340653e1c78519e60eaf4316b2e8387fa67aebdea0fa814f92433f65872b78028f746d9367666a158411ee8ad SHA512 f769fe192e485692a86f1ac75f8de07be0a8f5c2ddd7d3ea0a526d271881746417e01e09e765e3160f7d8b516d9240b5bb09030dc18ea9551192fbd8df5b4cc3
diff --git a/sys-apps/gsmartcontrol/gsmartcontrol-1.1.1.ebuild b/sys-apps/gsmartcontrol/gsmartcontrol-1.1.1.ebuild
deleted file mode 100644
index 4757ae7e2385..000000000000
--- a/sys-apps/gsmartcontrol/gsmartcontrol-1.1.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic gnome2-utils
-
-DESCRIPTION="Hard disk drive health inspection tool"
-HOMEPAGE="https://gsmartcontrol.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="|| ( GPL-2 GPL-3 ) Boost-1.0 BSD Unlicense ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-COMMON_DEPEND="
-	dev-cpp/gtkmm:3.0
-	dev-libs/libpcre:3
-	sys-apps/smartmontools
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/xmessage
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	test? ( dev-util/gtk-builder-convert )
-"
-
-DOCS="TODO" # See 'dist_doc_DATA' value in Makefile.am
-
-src_prepare() {
-	default
-	append-cxxflags -std=c++11
-}
-
-src_configure() {
-	econf $(use test tests)
-}
-
-src_install() {
-	default
-	rm -f "${ED}"/usr/share/doc/${PF}/LICENSE_* || die
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/sys-apps/gsmartcontrol/gsmartcontrol-1.1.3.ebuild b/sys-apps/gsmartcontrol/gsmartcontrol-1.1.3.ebuild
index 4757ae7e2385..b5b1c6d82126 100644
--- a/sys-apps/gsmartcontrol/gsmartcontrol-1.1.3.ebuild
+++ b/sys-apps/gsmartcontrol/gsmartcontrol-1.1.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 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-2 GPL-3 ) Boost-1.0 BSD Unlicense ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 COMMON_DEPEND="
diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index 0c1a4224d6cb..84281e83d5f2 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -3,6 +3,6 @@ DIST help2man-1.47.4.tar.xz 189456 BLAKE2B 58bccbaa5f126b369683b6e051446242750e0
 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 1051 BLAKE2B dc5d5389293e3cddb11938a2962593db4be26edda0288b8c08d7edec9e2845e636ef134badcce1a3f5b5d57a6fb7dae9518b0d76b90ffae681537296ae57d9c2 SHA512 4b907cdc2ef4673140931eb9a5a698a9a62f135aeac148106352a46928dc1a3888a98c0f20b28161b1bc91b5d247bceb1630207137521dedaaa879fd35c9ea74
+EBUILD help2man-1.47.6.ebuild 1043 BLAKE2B 2fe0d25baacac4a7179380f4787d1b6b339c8551923b1f619cc81c3111ea8a289b8730742431aa3180b77dcad4257871116e436b0edf65702cf468550ead6bac SHA512 bc782810b7953cabcabc34ba7ec63dfa648e8756a586973e29f2510f58e395c034703735884a211d6cb3438d923fbf539a0470fca5ee603673b5fc83298898da
 EBUILD help2man-1.47.7.ebuild 1051 BLAKE2B 6bde9567cb042fb11341f6d6081b7efefaf3f0c1231523040d42267d9abd1d774e276c497d767a0ca475e64524e92f71d30c811532296cc166861ed95a0e68f4 SHA512 a1dafde12c1bd8a58714601bc36e28589940d3e709060722b8996fcce0087d7604f6342d1fe006b297e29100d4d216f12d75377103c31642a43ed93b3170fc6b
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/help2man/help2man-1.47.6.ebuild b/sys-apps/help2man/help2man-1.47.6.ebuild
index d17ef937b47f..ac10192b4498 100644
--- a/sys-apps/help2man/help2man-1.47.6.ebuild
+++ b/sys-apps/help2man/help2man-1.47.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
@@ -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/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 5867cf421e12..1dd7d4f570ec 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -11,7 +11,7 @@ DIST iproute2-4.18.0.tar.xz 692868 BLAKE2B ad40a5fa0aecb7c5eb98c3ee2b3a8da212c4b
 DIST iproute2-4.4.0.tar.xz 528552 BLAKE2B cad90d2734647a5a5e90b0a8b1337656c6480471caa06beee54fb3abd9c3bc64fc21da349d9b8aa0decf6208de325dd37a9e02fd9e994b024f9142dcd229b87c SHA512 48236fc6103a55d977efa4f93ad7fdfc0944df975ce771d57fd3dcfb13b761b0c05dbe749978ac86c7a471d023bee62a2f1648a6ca75f50da9252acfde174b69
 EBUILD iproute2-4.14.1-r2.ebuild 4092 BLAKE2B b3e3ae2b24182aa2d99f16120231bd4ac2029b73b9af53f0098046ecce73049e3dac510ee405f4dd12aa8c0e45b0504b7f82425c8063d05b5a958475ac2ce9d6 SHA512 c4f5cb98704d5a78d74a17a057bebb89f059c0a622d5e7ed28c6b36a73ed6be6d2a9205ed6b1ac4401f23ae46372e25d85a1038631d6ed215b2fd68c2e6a4c73
 EBUILD iproute2-4.14.1-r4.ebuild 4275 BLAKE2B d8d6a43be5eb593ab7107bff4126cda9f41fff88ccb72fd4d3aee7464457739732b2e3a161114302f7e1d9ff18a5b3c7d73a92ed523254ff4857584bc2baa109 SHA512 ae5db8ad15d20df0ec18e2703d43be081189366f535ff700d83da449eed8c120df869a6d2873e817e07bd2920eea46387bda0866ccce0b48d0e7a71e8faa8752
-EBUILD iproute2-4.17.0.ebuild 4203 BLAKE2B 648438d095571d6900cb8724ce3d93d87b9e24fa143d32929e0beae98ce13d47f432ab6c52e4ebb1e7920d66b470b566ada902e6bd8456cd79f458d0b6c345a7 SHA512 ae8bde274a67fe22beeec1fbd18725ea61351cd0beb81c0c764891321270c7dda97bb76b0fc2e89c0778df669551ca110a6994923e3e45260a8ef49c727ee06d
+EBUILD iproute2-4.17.0.ebuild 4198 BLAKE2B 5f9c2cb3e058550c4412e400d6ecae7cac784a66641e8c11417f98aaec35a82451ac3f185f896631dcd752296fc6d7a41b3105d9ea682e13a353268ea46c089a SHA512 4bd00acc93f0012114aa74de44756dbc2dc88a1246a988479a0c0537a990c74f37ab3d4e3ae8bf3fc3cf2c1aea097e96b6f37bf0b57835c7b835dab9e305af5f
 EBUILD iproute2-4.18.0.ebuild 4214 BLAKE2B 4c6a9d68cb27d3b41e8da00e1fc25c083c5277706186414d407c9000b4343dfaad8913ee640e9060b1e9acda5ed43fa642631ab3b2bf8c3a956ed1ae68cebd0f SHA512 30839985403cbda2401bccfb822d394590508836e0e780bf321f64235f372819225afbbd4dcf4ec3d05992435408ebcaba401bb7c7f2872f5e474bb2b3566f5b
 EBUILD iproute2-4.4.0.ebuild 3883 BLAKE2B 40d441c04e746f197263fa22f5b7bdd3302daa94896103311773feae8c68b193ee9d8c46659aaced6525f1af1bde444f1c6963e4807c7123f795fee530dccd1b SHA512 a751a4d91b63dea7cf43ec0532bffb795291d7ec9c04f762691e4e6cad9e47ce24895f315cc3ccfc11c30cfee94e66f855c477c3f95850f7c546dfd6675ad9eb
 EBUILD iproute2-9999.ebuild 4246 BLAKE2B 256792b60179fb5d92d0b66871edaf53e41f31fd664593e757638c771004e875e01370cd13ed78b623d165d5be152ce7f174f02573b184177d623e73b0cb7099 SHA512 06dc3174d116d4f191beebf14df1b62765eb3ce34cf41d3cb0b78de8d4216f38875ac539740aa0c7c79f8b0cbe1ea1bcca8fda30d4471682dc103c6423272ba5
diff --git a/sys-apps/iproute2/iproute2-4.17.0.ebuild b/sys-apps/iproute2/iproute2-4.17.0.ebuild
index 70299ede914f..03a8a55c50ad 100644
--- a/sys-apps/iproute2/iproute2-4.17.0.ebuild
+++ b/sys-apps/iproute2/iproute2-4.17.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 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/lsb-release/Manifest b/sys-apps/lsb-release/Manifest
index f3dba4ffafba..e0cbdad2c1d4 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 919 BLAKE2B 39cdf3b809b2e1644ae06cd9e7f11b36615b3ac4ed31f67b26a84a23079446e192b4bcf57dc62ad207b57448f5b8cbce1046da815eed66f5cb901d5e445afdfc SHA512 78f6f7dfe8e1275ee07e12ce6e920a055e1cda207d60594f63484278f35a6fcfdd6dd10c75e153c2b2f1b1971ac1a9a7b15bc69c9ae6c8b3faf724f267e52733
+EBUILD lsb-release-1.4-r3.ebuild 908 BLAKE2B 2a0960731df44a0c16c4504bd4a8d400f2b68921e027ea8be548092ff1d9186c9eba02b493f053eee03d6100ac3293337a37bb238c52ea6e80fbe9f8155feae8 SHA512 f7c1c31bae996497ae0c73df1b707c4a69b05439a7a9e0db2bb102e276699a878b092484492cd094920a5ff3940b3f50b9db7a0362a11b6a9c3a62a621ee884a
 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 4629e5f4c285..ab2624601ee8 100644
--- a/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild
+++ b/sys-apps/lsb-release/lsb-release-1.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=5
@@ -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/nix/Manifest b/sys-apps/nix/Manifest
index 70b90dbb537e..35231d975d8c 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -5,8 +5,8 @@ AUX nix-2.0-user-path.patch 390 BLAKE2B 08118fb6664ffe96bccd68596e7aa26fe895a928
 AUX nix-daemon.initd 369 BLAKE2B bae15823ecd559733ebc8bd6f88314d93dccdf586dafe785ae58ed46949d1329c9bb7da93dc2918e2c0ccd3aacb50e3fdb380c019c85fb09f86575d9c80ce116 SHA512 e5a05a9f5efb179ebf3a98e58435a571e87716166a351045be4cbd19423e426cf11ed9b2eb2df6222d00e43e5d38fbed5da579820f776031e3c70de0206f980d
 DIST nix-2.0.2.tar.xz 796404 BLAKE2B 0906488bf2c800544c0747a6860ef51f667467f50039f725cf6ec05b8389462fe073bddceba106922a7611fd784b58ed5ca321efba0065b0f424aa53d7620990 SHA512 605e2c6dbc814470c25aa4f0aca77bfd11fd6d5c263ef38915cb9b852e77bcff08d515e76de8d929c9eacd02ffeaa5dd5f6b337461d54a1b2648b1fc505c98fa
 DIST nix-2.0.4.tar.xz 798352 BLAKE2B 0eaf7e507c87e5398ab5967e1f2064a5827038bb84208768aa1c1deadc95e44aab922846b728467e3355d1f25e740590c3d1748ec05dfeae6a171952fd941b77 SHA512 bce3b3a14269d42648a4935770260c36dab25fde3ebcfed730063d1d139603468e1c30acf15eb0cffff617fa36a6b39d4ae31ccfd9cba762f631ecac213fd09a
-DIST nix-2.1.2.tar.xz 816492 BLAKE2B 21365f2f7a88456aa566882780a65cabc190789e8e0f0aa62838bd7c9e2326c59776d78c6eaa4a2836039d02d6899114d5bc236bfadff5a2ef329531873e9e85 SHA512 6d54612f911438d5094c9d41fbf43ba4d8cada1da2b3eddbf7a3309262f9a9e94a2a826bb45247d5766bd6a419456ecdca5a8bebccff12607ebe004328bbc76a
+DIST nix-2.1.3.tar.xz 816396 BLAKE2B 9627626075841e7f389f5010418fe17569ae69ea07de5ff9a0557df864052cc8b48f2a4dbfe16dffc5dca3fb180f527199f367810899ae9474d00e8fcc00b760 SHA512 d22718d23d8960dac7d07739835caa8183f573b303d77613e77314d873c1fe6da1cb0ed78337fe3219a94675307b23132a62ae7d9aa5354707e58400f403524b
 EBUILD nix-2.0.2.ebuild 3110 BLAKE2B d7930a0e21775cb2d531621f4ce6dbc52a2b7d4a437506bedd19bf34694bed08c99aec4e36b017af283bdf5c3069b757b68a9b45549d3fc42beec59c29aa79de SHA512 234a27599be84a79a035c1c9a7633ba85c36f44e4fd53f104d981bc4795f8ff59de68768e21b722735c760e2a8bbb9714d562a2d13c8be4a0014b4c819ef9d48
 EBUILD nix-2.0.4.ebuild 3110 BLAKE2B d7930a0e21775cb2d531621f4ce6dbc52a2b7d4a437506bedd19bf34694bed08c99aec4e36b017af283bdf5c3069b757b68a9b45549d3fc42beec59c29aa79de SHA512 234a27599be84a79a035c1c9a7633ba85c36f44e4fd53f104d981bc4795f8ff59de68768e21b722735c760e2a8bbb9714d562a2d13c8be4a0014b4c819ef9d48
-EBUILD nix-2.1.2.ebuild 3182 BLAKE2B 9b6a0aac5c73bc3f9dc688eddc6d2b327c80f40c9431f76e285640dfc44dccc603e1d18302ab0f2c5a04a8f679737cb8a702c4682fae4e1bdb58468c22b195bb SHA512 89ed502fdb9472df48ee061541449e087e2630595c3b97053d828ff90d0ab13610c260bc458c94a11857f9d7f7a696f7a702ef36a5ebb931f89996095b549d85
+EBUILD nix-2.1.3.ebuild 3179 BLAKE2B 619405197f3593f020bfb08df60ba2834882eaf6458f9913724a80634ad1cb53ed7ff971eaf700f7721e67a7408a4ad5fe328153d11cdc71d22a45dca7ea0f88 SHA512 f976aa9d2f78f7be65355201b14588ae36be2e326f8f2b259230165cde378afe85facd32cbaef024fdbb522392d3b6349cd38e85bb80db72cf302cb396c0edf0
 MISC metadata.xml 566 BLAKE2B 3891567411993e2864f7e0d6fd158937c0c7075ca92aef2413d28e0aa18e6d51982383d3ee71ab6b926ba6a397c59c3ef84f4a4b7cdd4f103f4256f4693f0cf0 SHA512 93d33392316264e30403abbf79a0bf836ed35f2eaf802f930743cb9f31955f939ac263946b93ee32bba34d2534329d95476e96816d1893747b077b0d9690281c
diff --git a/sys-apps/nix/nix-2.1.2.ebuild b/sys-apps/nix/nix-2.1.2.ebuild
deleted file mode 100644
index 66d217abf098..000000000000
--- a/sys-apps/nix/nix-2.1.2.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
-
-inherit autotools flag-o-matic readme.gentoo-r1 user
-
-DESCRIPTION="A purely functional package manager"
-HOMEPAGE="https://nixos.org/nix"
-
-SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-#keywords are blocked by boost-1.66
-#KEYWORDS="~amd64 ~x86"
-IUSE="+etc_profile +gc doc sodium"
-
-RDEPEND="
-	app-arch/brotli
-	app-arch/bzip2
-	app-arch/xz-utils
-	dev-db/sqlite
-	dev-libs/openssl:0=
-	>=dev-libs/boost-1.66:0=[context]
-	net-misc/curl
-	sys-libs/libseccomp
-	sys-libs/zlib
-	gc? ( dev-libs/boehm-gc[cxx] )
-	doc? ( dev-libs/libxml2
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-	)
-	sodium? ( dev-libs/libsodium:0= )
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/bison-2.6
-	>=sys-devel/flex-2.5.35
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.11.6-systemd.patch
-	"${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
-	"${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
-	"${FILESDIR}"/${PN}-2.0-user-path.patch
-)
-
-DISABLE_AUTOFORMATTING=yes
-DOC_CONTENTS=" Quick start user guide on Gentoo:
-
-[as root] enable nix-daemon service:
-	[systemd] # systemctl enable nix-daemon
-	[openrc]  # rc-update add nix-daemon
-[as a user] relogin to get environment and profile update
-[as a user] fetch nixpkgs update:
-	\$ nix-channel --update
-[as a user] install nix packages:
-	\$ nix-env -i mc
-[as a user] configure environment:
-	Somewhere in .bash_profile you might want to set
-	LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
-	but please read https://github.com/NixOS/nixpkgs/issues/21820
-
-Next steps:
-	nix package manager user manual: http://nixos.org/nix/manual/
-"
-
-pkg_setup() {
-	enewgroup nixbld
-	for i in {1..10}; do
-		# we list 'nixbld' twice to
-		# both assign a primary group for user
-		# and add a user to /etc/group
-		enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
-	done
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/nix/var \
-		$(use_enable gc)
-}
-
-src_compile() {
-	local make_vars=(
-		OPTIMIZE=0 # disable hardcoded -O3
-		V=1 # verbose build
-	)
-	emake "${make_vars[@]}"
-}
-
-src_install() {
-	# TODO: emacs highlighter
-	default
-
-	readme.gentoo_create_doc
-
-	# here we use an eager variant of something that
-	# is lazily done by nix-daemon and root nix-env
-
-	# TODO: will need a tweak for prefix
-	keepdir             /nix/store
-	fowners root:nixbld /nix/store
-	fperms 1775         /nix/store
-
-	keepdir             /nix/var/nix/channel-cache
-	fperms 0777         /nix/var/nix/channel-cache
-
-	keepdir             /nix/var/nix/profiles/per-user
-	fperms 1777         /nix/var/nix/profiles/per-user
-
-	# setup directories nix-daemon: /etc/profile.d/nix-daemon.sh
-	keepdir             /nix/var/nix/gcroots/per-user
-	fperms 1777         /nix/var/nix/gcroots/per-user
-
-	newinitd "${FILESDIR}"/nix-daemon.initd nix-daemon
-
-	if ! use etc_profile; then
-		rm "${ED}"/etc/profile.d/nix.sh || die
-		rm "${ED}"/etc/profile.d/nix-daemon.sh || die
-	fi
-}
-
-pkg_postinst() {
-	if ! use etc_profile; then
-		ewarn "${EROOT}etc/profile.d/nix.sh was removed (due to USE=-etc_profile)."
-	fi
-
-	readme.gentoo_print_elog
-}
diff --git a/sys-apps/nix/nix-2.1.3.ebuild b/sys-apps/nix/nix-2.1.3.ebuild
new file mode 100644
index 000000000000..a104f3b883a0
--- /dev/null
+++ b/sys-apps/nix/nix-2.1.3.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic readme.gentoo-r1 user
+
+DESCRIPTION="A purely functional package manager"
+HOMEPAGE="https://nixos.org/nix"
+
+SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+#keywords are blocked by boost-1.66
+#KEYWORDS="~amd64 ~x86"
+IUSE="+etc_profile +gc doc sodium"
+
+RDEPEND="
+	app-arch/brotli
+	app-arch/bzip2
+	app-arch/xz-utils
+	dev-db/sqlite
+	dev-libs/openssl:0=
+	>=dev-libs/boost-1.66:0=[context]
+	net-misc/curl
+	sys-libs/libseccomp
+	sys-libs/zlib
+	gc? ( dev-libs/boehm-gc[cxx] )
+	doc? ( dev-libs/libxml2
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+	)
+	sodium? ( dev-libs/libsodium:0= )
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/bison-2.6
+	>=sys-devel/flex-2.5.35
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.11.6-systemd.patch
+	"${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
+	"${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
+	"${FILESDIR}"/${PN}-2.0-user-path.patch
+)
+
+DISABLE_AUTOFORMATTING=yes
+DOC_CONTENTS=" Quick start user guide on Gentoo:
+
+[as root] enable nix-daemon service:
+	[systemd] # systemctl enable nix-daemon
+	[openrc]  # rc-update add nix-daemon
+[as a user] relogin to get environment and profile update
+[as a user] fetch nixpkgs update:
+	\$ nix-channel --update
+[as a user] install nix packages:
+	\$ nix-env -i mc
+[as a user] configure environment:
+	Somewhere in .bash_profile you might want to set
+	LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
+	but please read https://github.com/NixOS/nixpkgs/issues/21820
+
+Next steps:
+	nix package manager user manual: http://nixos.org/nix/manual/
+"
+
+pkg_setup() {
+	enewgroup nixbld
+	for i in {1..10}; do
+		# we list 'nixbld' twice to
+		# both assign a primary group for user
+		# and add a user to /etc/group
+		enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
+	done
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}"/nix/var \
+		$(use_enable gc)
+}
+
+src_compile() {
+	local make_vars=(
+		OPTIMIZE=0 # disable hardcoded -O3
+		V=1 # verbose build
+	)
+	emake "${make_vars[@]}"
+}
+
+src_install() {
+	# TODO: emacs highlighter
+	default
+
+	readme.gentoo_create_doc
+
+	# here we use an eager variant of something that
+	# is lazily done by nix-daemon and root nix-env
+
+	# TODO: will need a tweak for prefix
+	keepdir             /nix/store
+	fowners root:nixbld /nix/store
+	fperms 1775         /nix/store
+
+	keepdir             /nix/var/nix/channel-cache
+	fperms 0777         /nix/var/nix/channel-cache
+
+	keepdir             /nix/var/nix/profiles/per-user
+	fperms 1777         /nix/var/nix/profiles/per-user
+
+	# setup directories nix-daemon: /etc/profile.d/nix-daemon.sh
+	keepdir             /nix/var/nix/gcroots/per-user
+	fperms 1777         /nix/var/nix/gcroots/per-user
+
+	newinitd "${FILESDIR}"/nix-daemon.initd nix-daemon
+
+	if ! use etc_profile; then
+		rm "${ED}"/etc/profile.d/nix.sh || die
+		rm "${ED}"/etc/profile.d/nix-daemon.sh || die
+	fi
+}
+
+pkg_postinst() {
+	if ! use etc_profile; then
+		ewarn "${EROOT}etc/profile.d/nix.sh was removed (due to USE=-etc_profile)."
+	fi
+
+	readme.gentoo_print_elog
+}
diff --git a/sys-apps/nvme-cli/Manifest b/sys-apps/nvme-cli/Manifest
index 6e8d27dc596d..9997619cb1c0 100644
--- a/sys-apps/nvme-cli/Manifest
+++ b/sys-apps/nvme-cli/Manifest
@@ -9,5 +9,6 @@ EBUILD nvme-cli-1.2.ebuild 595 BLAKE2B 63bbaa12561818fae5ec1bdc49e1589b8b403c21f
 EBUILD nvme-cli-1.3.ebuild 568 BLAKE2B ecf0ba7fadc2aaaf14da03c66ced763dce19e20eacacb9f68617528740a58d2d6862fdd4efe057fd5a9d0ef04b3d14cc1cdec35de7242958aa3e5e4e60f41179 SHA512 db12e2ecfcccab7cadaa134695e5235c98baffe34d76b889e12119a73b49c630fa5a82d6894caacb17dbaadaac4f4536031ef3b4dfeedc01a067999e897c999f
 EBUILD nvme-cli-1.4.ebuild 566 BLAKE2B cb2dd807e6c5328816a527a5ebae478cb323506fde758fd2f47c23e620a195373163b030ef6f57bd4863e90c5099efff0ac76a8486d12e2ae8e01ce70efb7403 SHA512 1bd5660ea24b05ad923106b860c11b1934f78da54c87c9ae5dd2cdfaa4f7a44bb0af9c5170da3a231ea915e6697c5f8e47e67c01d02403885007f726bc64fec3
 EBUILD nvme-cli-1.5.ebuild 566 BLAKE2B e723786af2108253b54742b752ea755b84964e2155e68a3500c90a8900a2cf80de952c3a212c3e0809009518b274158aace3afa9c7f2bf16d2e2b31321581c2f SHA512 3fb2c2818a77fe647dc8216004bc817ebcdefff99e18abffc62883d98d0448972975651eae704b945324bd809aaa6215d9803145955a971a15ae19357ca647ee
+EBUILD nvme-cli-1.6-r1.ebuild 631 BLAKE2B f35a3e4808f96a80425b1cf272ed5c7cfb08f9dbe67d9cd529627e545d5c4f1dbc514eba16c2d2effe7e68851194cd8ce72097c86748f92abcf3dcd9013380d8 SHA512 8ae659abb70ae9d84e04a776b3c4fd563dd318dd0f9b0a5e8cfe2639fa3a97ca25a25f06b3cdfa829877d09a2f77825e44de721fd257a4adb171deb5d4dfc4e2
 EBUILD nvme-cli-1.6.ebuild 563 BLAKE2B 4494d38c8091d084bffc00ee18e1752cfc78f37f8b78684c738849aaadc93e9edc4cf8c1a3b13879dcc5bd86c9ed5053a72c6e7da367606605eadd7ea5c734fc SHA512 25a4590cc15ef4aff600cd0c18ec52e9bc7f043723ad569d7b1957b808e0d995abc5838f28b5af27350c38098c198274797b9eb6a059412ce86142b0ea18b75b
-MISC metadata.xml 310 BLAKE2B 08c09b5876534bafc616d925be9898f2679ce3727a430ebcebd265b1a330118f3f14aab98189112e718bd7d6762878d2445b514d85bcf792b92144ba8ce36bd5 SHA512 f32474bd2f6daa3306a5bcea0ad742c51142823dd6a14a6bd18c8201016c0182d2e87762c66b95882a42d5ff9083813ff995b0774d615745c2a6666c444bf616
+MISC metadata.xml 369 BLAKE2B 67a0c73fe0e2de97927a7c827bf4d216c7460c2ec4383c07e028c0b2d10e71a45559482bab635a6b9374fbec557ab83327baf041eb47bbc06c5e624bb29f6925 SHA512 d9439fc99f1bc5051b670e7d287185af8e7db4ba9045fd9a9aeb4c0f04a33716650d3a01f0ad8640e8b62db048a0f536fbd6145d5a7d79bb7aa524d63112db61
diff --git a/sys-apps/nvme-cli/metadata.xml b/sys-apps/nvme-cli/metadata.xml
index b267c4856951..f9ed9d1035db 100644
--- a/sys-apps/nvme-cli/metadata.xml
+++ b/sys-apps/nvme-cli/metadata.xml
@@ -7,4 +7,7 @@
   <upstream>
     <remote-id type="github">linux-nvme/nvme-cli</remote-id>
   </upstream>
+  <use>
+    <flag name="uuid">UUID support</flag>
+  </use>
 </pkgmetadata>
diff --git a/sys-apps/nvme-cli/nvme-cli-1.6-r1.ebuild b/sys-apps/nvme-cli/nvme-cli-1.6-r1.ebuild
new file mode 100644
index 000000000000..f54d27afc76d
--- /dev/null
+++ b/sys-apps/nvme-cli/nvme-cli-1.6-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="NVM-Express user space tooling for Linux"
+HOMEPAGE="https://github.com/linux-nvme/nvme-cli"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RESTRICT="test"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+uuid"
+
+RDEPEND="uuid? ( sys-apps/util-linux:= )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	sed -i 's:^LIBUUID =:LIBUUID ?=:' -i Makefile || die
+}
+
+src_configure() {
+	tc-export CC
+	export PREFIX="${EPREFIX}/usr"
+	MAKEOPTS+=" LIBUUID=$(usex uuid 0 1)"
+}
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 9a47ba980769..139732269328 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -10,6 +10,6 @@ EBUILD openrc-0.34.11.ebuild 10093 BLAKE2B 4f1e8fd970cc608d56df44eefe714390bf68e
 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 9845 BLAKE2B 658fa666907c6be846af33bb224e921325543676b3a5b496103526dc5ea64a423933f911385117d727e49bdb6f3a855123523d0a21aeac10f07b64c5eba39539 SHA512 bec6c4afcd99e21b816d75d083f4f0e49d41e75b6f1b622760d0a7a8956a35323fb333c96451e80181959abc739f13004e263359e3c898b05dfac969f80045a7
+EBUILD openrc-0.38.2.ebuild 9837 BLAKE2B f089ebcc4c20bd528cffaa50aa4db2ac99b82efa2c449ec7ba9f88ca09bbc515d5df5637d639cd4650497e277057d6cb9078a6c7a417c9b2d9eb7ec59aa48e7d SHA512 9658b8f880105ce6cff9c11d40ba2526bdec9089dbfafcf5214e6660855f28b344da042d4411b9c1b2940b2fa00197d1a173fd75280ebf17d10201cbd01a0417
 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 5897de98e54b..86ce817e9122 100644
--- a/sys-apps/openrc/openrc-0.38.2.ebuild
+++ b/sys-apps/openrc/openrc-0.38.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 @@ 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/portage-mgorny/Manifest b/sys-apps/portage-mgorny/Manifest
index da16c960ff31..37d6cd853cb2 100644
--- a/sys-apps/portage-mgorny/Manifest
+++ b/sys-apps/portage-mgorny/Manifest
@@ -1,6 +1,4 @@
-DIST portage-mgorny-2.3.43.3.tar.gz 1254313 BLAKE2B afb5101537bfff9b05622f4357757215bbe9641f2ca058baa59316b72ad3280ca7905f75e10b3270627c0b703434691bbfbbd88c6e375ba3f405d69d983b1944 SHA512 4fe3d1a8809a91fb52a9ccccac7d66cd25e8b6ff23b0ab2b4fae5f26a2036296a1c4eba78fee819003a8a8c44a5c6fcb0f04b9eded220d124bf08019a4f2fb02
 DIST portage-mgorny-2.3.49.1.tar.gz 1255740 BLAKE2B a64b3d1a96d7ec808168830fee03e40dd4070745f8670ec50e3d286173178bd3af8e6f823e2f732f374b59f3b88b4f44033eb6dcc21633edd25a9c8d563d04d7 SHA512 bfdf4aad186635770b05178e3c552fdca42a20790d4db17c7a204af27117b540545ba19f253924ac6ce18dd5036fe9a0503630a522303739f536b6e3b5178319
-EBUILD portage-mgorny-2.3.43.3.ebuild 7168 BLAKE2B 4ef17f24f9d2cdc07b0951ffbbd6ecc1ed14cbe6948457103583d691c0fe2d8e2394e73157759ccbe886ad3b90033742f1c0c6d3908796fc96a0fc46c1ec9f3c SHA512 7ce5aa4b699a9b5938e13c0f6d6a5592bbe1edeb1d01e8ee9869a5e9bad7f6b6270cf7b79e47e98677bc7868aad0751fb011da22ad0fa89dce53646186f2dd15
 EBUILD portage-mgorny-2.3.49.1.ebuild 7168 BLAKE2B 4ef17f24f9d2cdc07b0951ffbbd6ecc1ed14cbe6948457103583d691c0fe2d8e2394e73157759ccbe886ad3b90033742f1c0c6d3908796fc96a0fc46c1ec9f3c SHA512 7ce5aa4b699a9b5938e13c0f6d6a5592bbe1edeb1d01e8ee9869a5e9bad7f6b6270cf7b79e47e98677bc7868aad0751fb011da22ad0fa89dce53646186f2dd15
 EBUILD portage-mgorny-9999.ebuild 7080 BLAKE2B 703c046e27a79356ed4a0c88690e83677ef0493ea63e4a19be21778513ce9a3f8f14ff03e8116aedbfe9c8baed2f31fbe613d88586eae647386b2625527a6c2c SHA512 d7fa51354786bb879c6f2954b633a07d863126becaeede41e11f8f3d1c52ad80f8ffde671ccd4ffafc5552b2074e5cd6c30270f525f828244d5a7b339147b445
 MISC metadata.xml 817 BLAKE2B 8792bea6f73e3d72c747a11a0946c119abd9a24e3a1f40c457563536a9a1ce304c8c2ff0682fad3f94913d171806a262cf73de7437b5f250215810d8ffb32447 SHA512 e3498363b89e349d37b13dd40c7b3225f8c445b1ea2db9f70f2a1d718b7576103296d52581aa5ae0edc4ddd3fa8123161425c2732753f88e997b1cca818572b2
diff --git a/sys-apps/portage-mgorny/portage-mgorny-2.3.43.3.ebuild b/sys-apps/portage-mgorny/portage-mgorny-2.3.43.3.ebuild
deleted file mode 100644
index 36bbee3032b0..000000000000
--- a/sys-apps/portage-mgorny/portage-mgorny-2.3.43.3.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} pypy )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1
-
-DESCRIPTION="Fork of Portage focused on cleaning up and useful features"
-HOMEPAGE="https://github.com/mgorny/portage-mgorny"
-SRC_URI="https://github.com/mgorny/portage-mgorny/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-SLOT="0"
-IUSE="build +ipc +native-extensions selinux xattr kernel_linux"
-
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	>=sys-apps/sed-4.0.5
-	sys-devel/patch"
-RDEPEND="
-	>=app-arch/tar-1.27
-	!build? (
-		>=app-admin/eselect-1.2
-		app-crypt/openpgp-keys-gentoo-release
-		>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		>=app-portage/gemato-10[${PYTHON_USEDEP}]
-		app-shells/bash:0[readline]
-		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-			python{2_7,3_4,3_5} pypy)
-		>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
-		>=sys-apps/sed-4.0.5
-	)
-	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-portage/repoman
-	!sys-apps/portage"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-	)"
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-pkg_pretend() {
-	if [[ -f ${EROOT%/}/etc/make.conf ]]; then
-		eerror "You seem to be using /etc/make.conf. Please migrate to the new"
-		eerror "/etc/portage/make.conf location before upgrading."
-		if [[ ! -f ${EROOT%/}/etc/portage/make.conf ]]; then
-			eerror
-			eerror "  mv ${EROOT%/}/etc/make.conf ${EROOT%/}/etc/portage/make.conf"
-		else
-			ewarn
-			ewarn "WARNING: You seem to have make.conf in both locations. Please take"
-			ewarn "care not to accientally overwrite one with the other."
-		fi
-		die "${EROOT%/}/etc/make.conf present"
-	fi
-
-	if [[ -f ${EROOT%/}/etc/portage/package.keywords ]]; then
-		eerror "You seem to be using /etc/portage/package.keywords. Please migrate"
-		eerror "to the new /etc/portage/package.accept_keywords location before"
-		eerror "upgrading."
-		eerror
-		if [[ -d ${EROOT%/}/etc/portage/package.accept_keywords ]]; then
-			eerror "  mv ${EROOT%/}/etc/portage/package.keywords ${EROOT%/}/etc/portage/package.accept_keywords/99old"
-		else
-			if [[ -f ${EROOT%/}/etc/portage/package.accept_keywords ]]; then
-				eerror "  cat ${EROOT%/}/etc/portage/package.accept_keywords >> ${EROOT%/}/etc/portage/package.keywords"
-			fi
-			eerror "  mv ${EROOT%/}/etc/portage/package.keywords ${EROOT%/}/etc/portage/package.accept_keywords"
-		fi
-		die "${EROOT%/}/etc/portage/package.keywords present"
-	fi
-
-	if has_version sys-apps/portage; then
-		ewarn "If you are migrating from sys-apps/portage to sys-apps/portage-mgorny,"
-		ewarn "please note that Portage will abort upon having to unmerge itself."
-		ewarn "However, sys-apps/portage-mgorny will already be installed at this"
-		ewarn "point, so you simply have to restart emerge and it will successfully"
-		ewarn "clean the old package afterwards."
-		ewarn
-		ewarn "If you did not use '--dynamic-deps n' in Portage, your VDB dependency"
-		ewarn "graph is probably broken. You may need to use '--changed-deps y'"
-		ewarn "for your first @world upgrade to resolve the conflicts. Afterwards,"
-		ewarn "--changed-deps should no longer be necessary and any conflicts"
-		ewarn "introduced afterwards should be reported to bugs.gentoo.org."
-	fi
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	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 [[ -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 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_configure_all() {
-	cat >> setup.cfg <<-EOF || die
-		[build_ext]
-		portage-ext-modules=$(usex native-extensions true false)
-	EOF
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-
-	keepdir /var/log/portage/elog
-}
-
-pkg_preinst() {
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED%/}"/var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED%/}"/var/log/portage{,/elog}
-	fi
-}
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 4f1171e7b5ad..ceb8b1e5cc22 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -7,7 +7,7 @@ DIST portage-2.3.49.tar.bz2 1010414 BLAKE2B be8e0194855eda8e8a617ee4415d702199e1
 DIST portage-2.3.50.tar.bz2 1012905 BLAKE2B 8eebb6ea412db4d07be64047c8e9995c7d61906ff3c387495f144acd5b7d31e9d8ede3f9e606dc7a28df5b5726a0a6d55e2e0d79c78848213f4835fb1a588f30 SHA512 120514e4e176de9ad27892d547825d4fd51d250266f9de8f2f96d689ff1373adab77b838e9801043f0053111063857e957e83b495d520db8cc7733af28b03b64
 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 8679 BLAKE2B 1da913abd7eb3e3008d5413e9e62e4568182086c7fea7a54475cdeefde33ef745bd3a8920732aef767a46f1a3b2cec4997b1c4701c2e44301d356333b909c204 SHA512 7b291a6db82c3e1f7d00e35b611508de8132692112122b7c3d60f4b8db49a9bac0d862a240054d6b2fe0395d9102918d3326e09875dd58db50e003adda35143a
+EBUILD portage-2.3.49.ebuild 8683 BLAKE2B c0a2a77fe3c82a1dfbf190773b88fdc4d8f4bc92eb72c7f2806dd4854f3f1a14532ff46c8d10c8a795ecb0adb1320656b537ae5207a000bc57d24f76967d55b4 SHA512 b89cf6c8e80646955869c0ea3fedab46bb37cb9e5edb8f5363d989ce47a5a953118d214f2bbe6bd33eb28a8b239933879f85ba91452acc69fad995399dc7dfab
 EBUILD portage-2.3.50-r4.ebuild 9772 BLAKE2B 5a8d97b843b85a65e1dc5814018d88cded1d6b6a9122172eb1bc23eec223b131d21649ecd2d8097a8f902dba2037562acc6bd584e0e42c02d95abe8e8c469d09 SHA512 656d58ea557bb3664291730c50cca18648770bf23ab5a6cc78e85ba0318ee57bdeb380247d48ab7b02dce7e06917946a8d38f526fd14faf6694aa33dad866535
 EBUILD portage-2.3.8.ebuild 7912 BLAKE2B 1ce75b28134fdd89a42bf12973dc87d609f3dc115f125e66159d8fda21f31f7e7629ff0832db995e11b711addb4ecab1500985700527758eaabbaa020fd75b18 SHA512 3b96e079c2c9be6213a40216a6eb0f7ffba6629263cd9f3bb1ad6d48ac66d45cddbf6df724e54252320e964de87a1c0d5cf0e7a8e22f287c3d3401652b745e3c
 EBUILD portage-9999.ebuild 8553 BLAKE2B 3341e4fe3dd6601a1a5c94a166910f61bdb9bf860fdcd7bdf725bb0e424b016800a58cae1c547cabd70604d7b4b1a3ef11535afa875a75203e1911c42f8f920d SHA512 de3bee0495126b35c22947a238c57fa6b92eb9b553f540f6617f12cb4861f1f5e9ab611548a4660e87612bc2dee8f1f5c1e38de207fa67ea9617d89858d9ff54
diff --git a/sys-apps/portage/portage-2.3.49.ebuild b/sys-apps/portage/portage-2.3.49.ebuild
index 83bc4fb447ea..8ca04fb2dee1 100644
--- a/sys-apps/portage/portage-2.3.49.ebuild
+++ b/sys-apps/portage/portage-2.3.49.ebuild
@@ -1,4 +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
@@ -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 ~mips ppc ppc64 ~s390 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/rename/Manifest b/sys-apps/rename/Manifest
index 1471abd98ec3..742ca263e4b8 100644
--- a/sys-apps/rename/Manifest
+++ b/sys-apps/rename/Manifest
@@ -2,5 +2,5 @@ AUX rename-1.3-build.patch 172 BLAKE2B 47ae1d23ce99ad6ef2099bd6484cfad23a7aa46cd
 AUX rename-1.3-gcc44.patch 330 BLAKE2B c574203c3df6d984de18dda43512ac3f91165789ee6a7525824d2ac0a11403a53e33a31dc843eb295b31c8119ced7bc3f0393482e60003673c9cf83d43d78b80 SHA512 5a40ab4c81b4c197af051e01682f4fbb580b3fea9287539f601b4c07c6155c3aba802e38752566f9d2a41239cf2d20d748bfd64d2f7007eff578344cd12852c9
 AUX rename-1.3-rename.patch 2345 BLAKE2B 7c7e513726d482c8243e64d1f414c242f8f3b49e2a028567fcee0ae2acf65af4e50f63ffb1a3b6b9740544970e2b648e3c5795e5d60224103a776b6f8bd1b08a SHA512 6d0d757c3991448a1937480bb5c1cd219b681e7cbb9b1fbdb27097715cac04b2d2c0bb0b9c77ab2b131f6bbb8e0774f4da5845e815918d4de6faf96f218adb47
 DIST rename-1.3.tar.gz 83854 BLAKE2B 2dedb5f7765f9f44da1efe61b2152c56b2d3731a2787a89677792434663252f4a0f22c3c2703211fd1c7f0017e98a7e566e369c13a4affeeea62843278d9e940 SHA512 7959ef0417d02aecd23200fbc226acd0cc34595d16efdb931657c2292ec2a0b9ff794406b6baa5234db5c95b1eae8a1dcf1862936a40e66bb70710154c89e5dd
-EBUILD rename-1.3-r2.ebuild 904 BLAKE2B c622dd555b9ca55842551f472d8f58e889ea075e2bed2ed8ec98e05efaa4ff787c62e5a3eeb76d96dde06b00280d1edf0a54eb866fbaed2679686d53aa8033d6 SHA512 a219a73bae81d3edbb11aa389f621c7d371c8395124eab360ead04bae52a1e3e8cbfd19f7286cb503ea23b2d1957bd6e62cc2aebe07399c4c19cbe81c8b70bd1
+EBUILD rename-1.3-r2.ebuild 894 BLAKE2B 49510c145acd276f067258e6dfd6193caa8f4e6143e6d377d3590d837c68be82c63b6449bad246db1e86b9d47dba980ffb9b378b75b262568e72e9b2a63f316d SHA512 9a6856d85c2d33f27a4ec93c527d26db05714c22a825f208638629ec9ee956a6b9db3ce45e75c97c8fd4f90b133c57561dcff641aa2ff6261ef5936272b8bcf0
 MISC metadata.xml 326 BLAKE2B 0952c4b08788858859a0b53a418f4e2504d8a05ad4623495992fed7983c3f70d7eb40a7e042a6adf2b6785bf1228af302704988dbd715acf2347b67b97701d3c SHA512 5d7e26ff9fa47efcf1728be310c91822d85ef3e521a5903d66c9ae8e6449e72465f5f87a2fecc0a51086edc34a325545a0d40210ed320f56bd34af9db9fa45c0
diff --git a/sys-apps/rename/rename-1.3-r2.ebuild b/sys-apps/rename/rename-1.3-r2.ebuild
index fc964811bd6b..d82f8e908445 100644
--- a/sys-apps/rename/rename-1.3-r2.ebuild
+++ b/sys-apps/rename/rename-1.3-r2.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 toolchain-funcs eutils
+inherit toolchain-funcs
 
 DESCRIPTION="Easily rename files"
 HOMEPAGE="http://rename.sourceforge.net/"
@@ -27,7 +27,7 @@ src_prepare() {
 		-e '/^CFLAGS/s:-O3:@CFLAGS@:' \
 		-e '/strip /s:.*::' \
 		Makefile.in || die
-	epatch "${MY_PATCHES[@]}"
+	eapply "${MY_PATCHES[@]}"
 	tc-export CC
 }
 
diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index ecd7825391c2..e2b518ae759b 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -2,4 +2,4 @@ DIST s6-linux-init-0.3.1.1.tar.gz 25955 BLAKE2B 46e8e88c9c48fd00819cd0f437eea7ca
 DIST s6-linux-init-0.4.0.0.tar.gz 26744 BLAKE2B d56ba8def4e4a0158721fd9b9c4f19aa2e13e615e7e598fdced2b7c341820f31830c021d9181792bfd324e70163fed826c691a80fbbb7ae6f30be46eeb6330b9 SHA512 5b53d3afad28b476d366d649f9989de79adaaa3b7d255323bb121a6f8e6fef051306cd6368ddcc3745b6472bf4ac2ccb7f4088f6addeb6d52ebc40e703dcbb44
 EBUILD s6-linux-init-0.3.1.1.ebuild 1472 BLAKE2B b2d10b719f4668df01bbf241390d6203cf489786e0129e4076336a5a5ef6e44de370749313e06e008984ea78b0f07014d68288fb33912902bee21f2bfb59c887 SHA512 57607c57abc5adb22a22c1aa3d24545d591d83c9a7bfb87931a394229fd4ace887b5a5e859983c5b30fb6d08d151bc76f6cc88b69d31154d218b258221aebb89
 EBUILD s6-linux-init-0.4.0.0.ebuild 1472 BLAKE2B b68c06f32c2f3482ba1f4bb38e70bc0fcde3d8523d74c77867811231e1126e26a042bffc3aa7b6a98e1d39fbf3d37f4a39f604e02e397d085a43e85a795ad58f SHA512 2cdfdb084ab008bd5ae29b63eaca26be3e8d6e40520e2d6c266f4072cf98709872ef0d79bf39d22a62a144c50c413e95eea6016ec3999286b7db75ea1d50a0a9
-MISC metadata.xml 461 BLAKE2B a9b075ac9aacaa5fba1cc8d768dd188eea6fc1b44d36dc785698db2c8658db6af198a7c534621e41c85a3fac8d4a8bb724470afe90335e2d1afff2ca5d03a454 SHA512 6d7640d82400f43a58eaf536a0275dbffd45dc33fdde49e1d41da959ba0fb0ea68ad9fee8b7e2991d0d4a78b69a224880ed91e4a922f067bf6e1a741748bb4b9
+MISC metadata.xml 578 BLAKE2B b561feef1f9d63bdacc7129cfb8d3c10731717f22eac65c85053e138ce52c2e8e0cb6cd36cfe132b52d082f610c0c2b3864bf0964f3f8e68eb0be474d67a0a2e SHA512 76ae04f79a98469ed522cb1f0a8b1088c85cfd2d06801b2d53428f08ac0bea6545e815884850e01661b4225d0d40206dc7d96dc479d258e3d64f3372d87cfcec
diff --git a/sys-apps/s6-linux-init/metadata.xml b/sys-apps/s6-linux-init/metadata.xml
index 96c083c9b378..34f39bd4b285 100644
--- a/sys-apps/s6-linux-init/metadata.xml
+++ b/sys-apps/s6-linux-init/metadata.xml
@@ -13,4 +13,8 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/s6-linux-utils/Manifest b/sys-apps/s6-linux-utils/Manifest
index 0bc212e46790..c59edb44eb9c 100644
--- a/sys-apps/s6-linux-utils/Manifest
+++ b/sys-apps/s6-linux-utils/Manifest
@@ -1,3 +1,3 @@
 DIST s6-linux-utils-2.4.0.2.tar.gz 40832 BLAKE2B 24ce6d51aacfcaeeb8531931a0deac4e2430f627907157022ed6378e7058afcc946f1c620bb3758e43a1911db517dd46e65a43f338c446e61711b000d6751523 SHA512 4b0c8f1b65b8eb47f3aa7aa365d20dcd46fc144e166f78825ee53aeb789e009b2716a826efa1e92e86e8fe86421efc6ae07970ce421c6913f0b1db679eb6117e
 EBUILD s6-linux-utils-2.4.0.2.ebuild 1149 BLAKE2B 9bde0a49a4d14c1be0642e590f568a0ab15c7a29f51480779f96ff25799494f73e268d6ca9e8ccbd82c3259b6df1dba770d29f94459b9c4d2fe97b1eba27eab1 SHA512 bfd9bba07e7071baa00df31f5980952f6312b370d4f9762650afb1dfce909f8d6d50029bd7d7d78f2cafafc8ac7e3162bdc31c68b13d610394730be35ebc429a
-MISC metadata.xml 461 BLAKE2B a9b075ac9aacaa5fba1cc8d768dd188eea6fc1b44d36dc785698db2c8658db6af198a7c534621e41c85a3fac8d4a8bb724470afe90335e2d1afff2ca5d03a454 SHA512 6d7640d82400f43a58eaf536a0275dbffd45dc33fdde49e1d41da959ba0fb0ea68ad9fee8b7e2991d0d4a78b69a224880ed91e4a922f067bf6e1a741748bb4b9
+MISC metadata.xml 578 BLAKE2B b561feef1f9d63bdacc7129cfb8d3c10731717f22eac65c85053e138ce52c2e8e0cb6cd36cfe132b52d082f610c0c2b3864bf0964f3f8e68eb0be474d67a0a2e SHA512 76ae04f79a98469ed522cb1f0a8b1088c85cfd2d06801b2d53428f08ac0bea6545e815884850e01661b4225d0d40206dc7d96dc479d258e3d64f3372d87cfcec
diff --git a/sys-apps/s6-linux-utils/metadata.xml b/sys-apps/s6-linux-utils/metadata.xml
index 96c083c9b378..34f39bd4b285 100644
--- a/sys-apps/s6-linux-utils/metadata.xml
+++ b/sys-apps/s6-linux-utils/metadata.xml
@@ -13,4 +13,8 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/s6-portable-utils/Manifest b/sys-apps/s6-portable-utils/Manifest
index 550cd77895a5..fb0ea461b1a7 100644
--- a/sys-apps/s6-portable-utils/Manifest
+++ b/sys-apps/s6-portable-utils/Manifest
@@ -1,3 +1,3 @@
 DIST s6-portable-utils-2.2.1.1.tar.gz 47138 BLAKE2B f5519fbedc2599c0b9366bbff38a9438cb4cdf3b770dfec6e519f8857bd77a3bea172284318df224104fe7003af4a68cadc8089d77c98ba4da85eb59d59819f4 SHA512 fba7a4d1f5e0c969dc254775f28c02f1b8673ead28022962175bd605125dc56012cfdeb177037c322780be93a5191a5292a47cb26cf5d466bb5eb081fa5a9657
 EBUILD s6-portable-utils-2.2.1.1.ebuild 1165 BLAKE2B 2606b82a595387a09d74f1295ca6bf89428f339f55827290cdbaa185adb62982247fc61346adc75025c0d0312d0292c7364105cc787b550e52bac09dc4e9db1d SHA512 e29fc657d3088c4d160a0526ed09d6377d777ee3b9c4c5ff23db7eeb174e0ed52f14f08d7a02e3a72249391d0c91f038e1d348763071ed100a200b4611ccc5f3
-MISC metadata.xml 461 BLAKE2B a9b075ac9aacaa5fba1cc8d768dd188eea6fc1b44d36dc785698db2c8658db6af198a7c534621e41c85a3fac8d4a8bb724470afe90335e2d1afff2ca5d03a454 SHA512 6d7640d82400f43a58eaf536a0275dbffd45dc33fdde49e1d41da959ba0fb0ea68ad9fee8b7e2991d0d4a78b69a224880ed91e4a922f067bf6e1a741748bb4b9
+MISC metadata.xml 578 BLAKE2B b561feef1f9d63bdacc7129cfb8d3c10731717f22eac65c85053e138ce52c2e8e0cb6cd36cfe132b52d082f610c0c2b3864bf0964f3f8e68eb0be474d67a0a2e SHA512 76ae04f79a98469ed522cb1f0a8b1088c85cfd2d06801b2d53428f08ac0bea6545e815884850e01661b4225d0d40206dc7d96dc479d258e3d64f3372d87cfcec
diff --git a/sys-apps/s6-portable-utils/metadata.xml b/sys-apps/s6-portable-utils/metadata.xml
index 96c083c9b378..34f39bd4b285 100644
--- a/sys-apps/s6-portable-utils/metadata.xml
+++ b/sys-apps/s6-portable-utils/metadata.xml
@@ -13,4 +13,8 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index 5bc803dfd6cd..344be908619d 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -4,4 +4,4 @@ DIST s6-rc-0.4.0.1.tar.gz 96491 BLAKE2B fe6aa6e2ed868cca6d76928571d561784012ded4
 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
-MISC metadata.xml 461 BLAKE2B a9b075ac9aacaa5fba1cc8d768dd188eea6fc1b44d36dc785698db2c8658db6af198a7c534621e41c85a3fac8d4a8bb724470afe90335e2d1afff2ca5d03a454 SHA512 6d7640d82400f43a58eaf536a0275dbffd45dc33fdde49e1d41da959ba0fb0ea68ad9fee8b7e2991d0d4a78b69a224880ed91e4a922f067bf6e1a741748bb4b9
+MISC metadata.xml 578 BLAKE2B b561feef1f9d63bdacc7129cfb8d3c10731717f22eac65c85053e138ce52c2e8e0cb6cd36cfe132b52d082f610c0c2b3864bf0964f3f8e68eb0be474d67a0a2e SHA512 76ae04f79a98469ed522cb1f0a8b1088c85cfd2d06801b2d53428f08ac0bea6545e815884850e01661b4225d0d40206dc7d96dc479d258e3d64f3372d87cfcec
diff --git a/sys-apps/s6-rc/metadata.xml b/sys-apps/s6-rc/metadata.xml
index 96c083c9b378..34f39bd4b285 100644
--- a/sys-apps/s6-rc/metadata.xml
+++ b/sys-apps/s6-rc/metadata.xml
@@ -13,4 +13,8 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index e04d907cbe2c..c43ea2011072 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -6,4 +6,4 @@ EBUILD s6-2.1.3.0.ebuild 1284 BLAKE2B 805f6f16a33b6a150ef75c2c3775c715598694b13d
 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
-MISC metadata.xml 413 BLAKE2B ad4e5f70c72eb8fcbc679c329e16d9eadcec41aeb07b391098676a9c52739b4e3a27fe86e742d1322a50261e62060f7a93eafd6534ccc7514f2402295e2b01b5 SHA512 000e085535127bf6a340451b6cbd51549dd2f1f9cba1bcf76dde590f628f780fc756f344844982f1d3a6ef69299b6db4fb71ddd92f72650e38f7a24aa541257c
+MISC metadata.xml 743 BLAKE2B 51cce1b0cbf5b0a026853d24c760d20cd8a82baae31bd4c7dc67af31933beaec632d8937dc8236ae2fec3807ffdc748f82cdd50a025179659ac3e3854f209006 SHA512 7391141506e39054d73b3ef9a336feaef887896603db105d493cfa50fa7dad721c8b0aaee16efb10be5aaa0561f2db19987de1431ee79e312cdb04e7edf77b6f
diff --git a/sys-apps/s6/metadata.xml b/sys-apps/s6/metadata.xml
index 48d60bf54d56..b8be92c8b77b 100644
--- a/sys-apps/s6/metadata.xml
+++ b/sys-apps/s6/metadata.xml
@@ -5,6 +5,18 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>aranea@aixah.de</email>
+		<name>Luis Ressel</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>samuel@sholland.org</email>
+		<name>Samuel Holland</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		S6 is a small suite of programs for UNIX designed to allow
 		service supervision similar to daemontools or runit.
diff --git a/sys-apps/superdiag/Manifest b/sys-apps/superdiag/Manifest
new file mode 100644
index 000000000000..98252f7892f6
--- /dev/null
+++ b/sys-apps/superdiag/Manifest
@@ -0,0 +1,3 @@
+DIST SuperDiag_1.1.0_20180731_package.zip 2564515 BLAKE2B 9ae34682daf5aa8996989c434906dd59f64e569a1cd1ae107d1e7861430ae028829efd1a1aa1ba2b5269d13e0ac2bef33b106a945fbd800fba6766b10f7486a5 SHA512 b79eae3063fc1425ee2a7a71304ae8993da52e9a2a8b2565e5f4fe0f3f3cdf8a7016cf765dab9e440c71cb8ff6b311fa2e4067459d76268bcf2697e8344c4e9a
+EBUILD superdiag-1.1.0.20180731.ebuild 2053 BLAKE2B 71e957a37cc5360703ced5eb60a1aa91d790ff5ab6853eede1018d223c878c4d20dd3e78b0f38d1f13d800aa60be3b3ae3801526b11f4da81c85a66dbfb9dc8d SHA512 e1ac41f6d2dc61c7517c5a491f389274f97551d5821ce58c70b692536464ba3269ab0d2c4e3dc4b02e48ab97e5db837c65d3c5e303c7f08edb290cb85de72598
+MISC metadata.xml 1029 BLAKE2B 13723c78dd32c1f8c2109f857e6c4920416847a759dd2676060468cfba802cadd87d5ebf90deae548f04b71e1bab00e8f4f6668ef8bb5487c504ce3823bfc708 SHA512 48410f21f790cc13623ac9f0812b205b017b57a47d82b8af11a9b9fd6a3d83b8d761205d6fe919c3d1fe637ff8554c17fee5af9754c4d978e0d3f52e749eff0e
diff --git a/sys-apps/superdiag/metadata.xml b/sys-apps/superdiag/metadata.xml
new file mode 100644
index 000000000000..c8ab6cc03ab4
--- /dev/null
+++ b/sys-apps/superdiag/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		The Super Diagnostics provides offline the capability to determine
+		the health of Supermicro server's components, including CPU, memory and I/O.
+		Features: Designed for Supermicro Sytems, offline diagnostics,
+		command line interface (CLI), local and remote diagnostics,
+		automatically collects information on detected devices,
+		test results reported in output files and flexible test coverage.
+	</longdescription>
+	<use>
+		<flag name="iso">Install an iso image, which can be used with <pkg>sys-apps/smc-sum</pkg>.</flag>
+		<flag name="usb">Install all files, which are needed for an installation on an usb thumb drive.</flag>
+	</use>
+</pkgmetadata>
diff --git a/sys-apps/superdiag/superdiag-1.1.0.20180731.ebuild b/sys-apps/superdiag/superdiag-1.1.0.20180731.ebuild
new file mode 100644
index 000000000000..99c892c14414
--- /dev/null
+++ b/sys-apps/superdiag/superdiag-1.1.0.20180731.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_BUILD="0724"
+MY_DATE="$(ver_cut 4)"
+MY_DATE_ISO="20180724"
+MY_PN="SuperDiag"
+MY_PV="$(ver_cut 1-3)"
+MY_P="${MY_PN}_${MY_PV}_${MY_DATE}"
+
+DESCRIPTION="Provides the capability to determine the health of Supermicro servers components"
+HOMEPAGE="https://www.supermicro.com"
+SRC_URI="${MY_PN}_${MY_PV}_${MY_DATE}_package.zip"
+
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="supermicro"
+SLOT="0"
+IUSE="iso usb"
+
+DEPEND="app-arch/unzip"
+
+RESTRICT="bindist fetch mirror"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack ${A}
+	unpack "${S}"/${MY_P}.zip
+
+	if use iso; then
+		unzip ${MY_P}/Diagnose_Remotely/ISOFor${MY_PN}_v${MY_PV}_${MY_BUILD}.zip -d iso || die
+	fi
+
+	if use usb; then
+		unzip ${MY_P}/Diagnose_Remotely/USBFor${MY_PN}_v${MY_PV}_${MY_BUILD}.zip -d usb || die
+	fi
+}
+
+pkg_nofetch() {
+	elog "Please download ${A} from"
+	elog "https://www.supermicro.com/SwDownload/UserInfo.aspx?sw=0&cat=SDO"
+	elog "and place it in your DISTDIR directory."
+}
+
+src_install() {
+	insinto /usr/share/superdiag
+	doins ${MY_P}/startup.nsh ${MY_P}/${MY_PN}_v${MY_PV}.efi ${MY_P}/EFI/Boot/BootX64.efi
+
+	insinto /usr/share/superdiag/Picture
+	doins ${MY_P}/Picture/*.bmp
+
+	insinto /usr/share/superdiag/SelData
+	doins ${MY_P}/SelData/*.dat
+
+	local DOCS=(
+		"Superdiag_${MY_PV}_addendum_release_notes.docx"
+		"${MY_P}/Supermicro Super Diagnostics Offline readme.txt"
+		"${MY_P}/Supermicro Super Diagnostics Offline User Guide V${MY_PV}.pdf"
+	)
+	dodoc "${DOCS[@]}"
+
+	if use iso; then
+		insinto /usr/share/superdiag/ISO
+		doins iso/${MY_PN}_v${MY_PV}_${MY_DATE_ISO}.iso
+
+		newdoc iso/Readme.txt Readme.ISO.txt
+	fi
+
+	if use usb; then
+		insinto /usr/share/superdiag/USB
+		doins usb/STARTUP.nsh
+
+		dosym ../BootX64.efi /usr/share/superdiag/USB/BootX64.efi
+		dosym ../${MY_PN}_v${MY_PV}.efi /usr/share/superdiag/USB/${MY_PN}_v${MY_PV}.efi
+		dosym ../Picture /usr/share/superdiag/USB/Picture
+		dosym ../SelData /usr/share/superdiag/USB/SelData
+
+		newdoc usb/Readme.txt Readme.USB.txt
+	fi
+}
diff --git a/sys-apps/usb_modeswitch/Manifest b/sys-apps/usb_modeswitch/Manifest
index 8bc60c28b1af..9b17da4db0eb 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 1673 BLAKE2B 56bcccb342017c86c98abe3df44c91c5f927c571cf77cfd5c6446258fd3e4eaad0e618c7a669be8e803a0a2eea118104d1232b5deff78f0d0455591399609219 SHA512 bbe4a4a31bdfcd769dd8287cacc15d4fcf23b4634534bc72b2f1e7a3aedb28d88c20ea71664fcf95952c5170c6c0d646af849641fa76afbbec2109c533980706
+EBUILD usb_modeswitch-2.5.2.ebuild 1669 BLAKE2B a755ff2453b15e72245fa837a7f9abd83abd0da932e955abb04caacaba8c6dc0584ae48562667725598b0f8472dbaf04a336623551afcf91c098eb5075748158 SHA512 f3b5eb0c6fb9d96ea280db886c093c524da0fd637e5ac7b47e135a6791ae9ee8be3964d2b20182fb8b1235baa4a12b39cf6ce61c3472950cdabbc14f3487fc3e
 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 cf78e7d75d8c..2192dbd4d067 100644
--- a/sys-apps/usb_modeswitch/usb_modeswitch-2.5.2.ebuild
+++ b/sys-apps/usb_modeswitch/usb_modeswitch-2.5.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
@@ -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/usbutils/Manifest b/sys-apps/usbutils/Manifest
index 8e2236440bf1..ecd250df1c63 100644
--- a/sys-apps/usbutils/Manifest
+++ b/sys-apps/usbutils/Manifest
@@ -1,9 +1,6 @@
-AUX usbutils-006-stdint.patch 701 BLAKE2B 511a0466d35f452c48bf6490415f1fdc3925fc2b613cd9f0f1d29258afae1e8fb03a5c6ea0ec9a1606b227af1e3e8160f07959b281a1e62d7115779a80779ab8 SHA512 8854846ec60652490401932a751e1e7ea61f59afa83447dd976ac351f898418777780b5e240c76771580aa8a879dbb63928adc053a3a95649dde5d9fab52798a
 AUX usbutils-010-fix-py3-support.patch 4251 BLAKE2B 46cb941e30da1b3b9f1a346bba5815485b6423578175b999a57475e6e2d917da9ce4a80943c74b84ce8488d6cbf1461010d4866d5e4813945e04d8b5aa0b5e8c SHA512 652824dcea10591ba74769703f60f49a3fb592e7cd5435756804c200cee45e9c9a818c6d6a4d3b315ba3b9e2dfa7314f94f870b2da768f6e887348b1aa5597f6
-DIST usbutils-008.tar.xz 287052 BLAKE2B eb9b998adb69938d004828585f782840e34f453327de54a32c563268db22a870fd7298cf839692e58ae42148e63037260e09bc2f1d5700ff96bcc451aff626ba SHA512 ab1ad36467ff79ff5ab0b924620001612cae44def58c05ade01a4e58d8a4d48df61c09faba49a20497b7d6314045bbaf137b51a9f4e6b65ed0ea3bb339bf1c45
 DIST usbutils-009.tar.xz 309608 BLAKE2B bb5d7f756241377e81aa8f5b074bb0ba36bc778698afaebf7054cdb153149e4f3808a7b172019434756cae8b33410643cd6a03a36277f80ead9b0f4446385fd9 SHA512 e5936a42615690c13e618655fc5eb4f414d9a84f85b860eaeb3bcf737258e05d299b09d1c5388d50c718626036ec8cac5d670ad567ceadfaab85f401f0744a8a
 DIST usbutils-010.tar.xz 308344 BLAKE2B 5f0ba85564acaf60faad0e187e7ed5c870056cf80a1e1ae888fa498429a7a9e28eaced49047f8f793bad3c59f3b515557054860286b17d9f89f915d0db5943cc SHA512 8bc197307bc34b38c406c58c939be32f0b20ce9d3e7c977472fe4c3d47e791765432e381fd8d7393df621bbd4bf159ca24a08b22441770e7ae464e767f99a2e3
-EBUILD usbutils-008-r1.ebuild 1233 BLAKE2B bd4a135641d42af965c9419b9d2cefd4f0b0f9a66de24bad5ed127a05fffa4c6aa2328a9cb331223691189b3ad7d42b10338f82f5da3d8b62f484108fff4db00 SHA512 6bf060d7773c9abc7935df695783ee523a160cda99e8b405a495e424034b209b039bc551cd1f711ffa07f503313348cb2f3f34fb9169387785469ba3fa99b31c
 EBUILD usbutils-009.ebuild 1133 BLAKE2B 93d5326da2d8a76846292a395eb8a96cd5fce8bfb24812ddd2657ca0a37d782611533cafbc5a60fe0da4aca2032a52a5bc1bdea0c0a7c1b73bf6ba63644a2d69 SHA512 c5ee7dc9644cfa0d709af886e1ad89a1272a156bceb3580d05ebc667a570b2dfb4fdedfd8c4c973186e62d6171c9595d7922cab8ca3d5c5ea70dc52cd1464845
 EBUILD usbutils-010-r1.ebuild 1249 BLAKE2B d81e58baa5928f383358b9b2adfb274c6cef0e5a547bf062e521b989e9e50a1a91c6ee0e4e1eb65815055044220496659ba3379fcb5d9ca86773e2d6ddfd9e72 SHA512 53b65fa4bf4bd01142527e51e2d6644dbf22a8f81f679d07f95ecb2a0d541936349d10c6d2c5aee493b1bcd2265e758dbde8292b6404bf238d9b119984608bd5
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/usbutils/files/usbutils-006-stdint.patch b/sys-apps/usbutils/files/usbutils-006-stdint.patch
deleted file mode 100644
index 3aecbdfec04c..000000000000
--- a/sys-apps/usbutils/files/usbutils-006-stdint.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://sourceforge.net/p/digimend/bugs/41/
-
---- a/usbhid-dump/lib/iface.c
-+++ b/usbhid-dump/lib/iface.c
-@@ -30,6 +30,7 @@
- #include <assert.h>
- #include <stdlib.h>
- #include <stdio.h>
-+#include <stdint.h>
- #include <string.h>
- 
- bool
---- a/usbhid-dump/lib/iface_list.c
-+++ b/usbhid-dump/lib/iface_list.c
-@@ -30,6 +30,7 @@
- #include <assert.h>
- #include <stdlib.h>
- #include <stdio.h>
-+#include <stdint.h>
- 
- bool
- uhd_iface_list_valid(const uhd_iface *list)
---- a/usbhid-dump/src/usbhid-dump.c
-+++ b/usbhid-dump/src/usbhid-dump.c
-@@ -40,6 +40,7 @@
- #include <unistd.h>
- #include <getopt.h>
- #include <stdio.h>
-+#include <stdint.h>
- 
- /* Define LIBUSB_CALL for libusb <= 1.0.8 */
- #ifndef LIBUSB_CALL
diff --git a/sys-apps/usbutils/usbutils-008-r1.ebuild b/sys-apps/usbutils/usbutils-008-r1.ebuild
deleted file mode 100644
index b4a75cd8ce37..000000000000
--- a/sys-apps/usbutils/usbutils-008-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="USB enumeration utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/usb/usbutils/
-	https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usbutils.git/"
-SRC_URI="mirror://kernel/linux/utils/usb/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="virtual/libusb:1=
-	virtual/libudev:="
-DEPEND="${CDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	sys-apps/hwids
-	python? ( ${PYTHON_DEPS} )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-006-stdint.patch
-	sed -i -e '/^usbids/s:/usr/share:/usr/share/misc:' lsusb.py || die
-	use python && python_fix_shebang lsusb.py
-}
-
-src_configure() {
-	econf \
-		--datarootdir="${EPREFIX}/usr/share" \
-		--datadir="${EPREFIX}/usr/share/misc"
-}
-
-src_install() {
-	default
-	newdoc usbhid-dump/NEWS NEWS.usbhid-dump
-
-	use python || rm -f "${ED}"/usr/bin/lsusb.py
-}
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 37edb6702896..9c4808ab64b2 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/consolekit/Manifest b/sys-auth/consolekit/Manifest
index 21353dbacdf7..abb589493e3f 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 3544 BLAKE2B edd3668f348028412d4ddad3767e32b3c32148be4d58297c8cd1fe3b7b04f57befc0ca8dece505030117ca4287a546601178b8ae4915aac620ec6c3abfde0fcc SHA512 03019491f7e0972f11e0af0f8430bd78537145b52f6ab23e8461fe620fc27d62cebce6781d1f11d0c85246945c71dbe21c86a4c78772eb8057cbbde454f42cda
+EBUILD consolekit-1.2.1.ebuild 3537 BLAKE2B 5ba6c3ea67c43c0e79aff6a698bf80a31db6fdff4daf874f0165d68acdd12fd686a0311d64112d261bae98449f5a6b0cc6fcea2749dba7ae0df66b3e27225ed1 SHA512 fda196c65297f40617f35c8d09213be18880685b496a91bd8b7fab8b8516877fec78e7a46173db7c4b67caf8f949effa3515619d3b726529d33585f90f0df495
 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 ad224d1d9a6a..729174707654 100644
--- a/sys-auth/consolekit/consolekit-1.2.1.ebuild
+++ b/sys-auth/consolekit/consolekit-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=6
@@ -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/sssd/Manifest b/sys-auth/sssd/Manifest
index e1d68a250571..5d38714ab219 100644
--- a/sys-auth/sssd/Manifest
+++ b/sys-auth/sssd/Manifest
@@ -2,14 +2,6 @@ AUX sssd 489 BLAKE2B 552ffc9c5053e6de3e4d59ae50cbd95ae44460f51d7f753d9792eefb105
 AUX sssd-1.13.0-fix-init.patch 814 BLAKE2B f7b242d81cae98a96c21c64b2ad672123acbc18ca5843a19ba2468204ec695673a43c73cd3c2048d40fe735ec5dbd727587db4b6f01209a708f7f521e4803217 SHA512 6e25c091789fe31ca515de85510a473189b4007c9ad180f20e6c372ea4a78a64f1c881fbf36ac4c648897dcef3d61586bb4d66b7256c7bba3bca83d11f83ecc8
 AUX sssd.conf 124 BLAKE2B b6f9c016a014510f97b036d23d5f50e1e13085220fe82b0e6ef7a3ceeb114e59af935f39e66e4ad60a46f43983930e5d381b16b0ed31ba4349abe38c4b509367 SHA512 f16908c44b213edbf6b0c6e8d49df92e8c06fc623279037074fe51e49b8aca7dc18f5ed83f71909fc8209df80dfc150583edb1687f88e61588bdf9d1fbf6ed5a
 AUX sssd.service 341 BLAKE2B 0cffcd43786633aa8e5bb42c54741cba676021c5a07554b08499504f8f630ff821ff334a21e2a4f9ae2d77d70d969018dd5a85d11b12bb31235a0ffcda4105c8 SHA512 99510d11f390722f56bc164059033fc40299dd4ea29f98cd5f08b2648f31b2e70afeb6b2d90f919bde595546c80b4e6941cf6f48130661ead09c0576043e4cf5
-DIST sssd-1.12.1.tar.gz 4088341 BLAKE2B 00f251eb23603441fdf9948598aab9c8b3626ca0cacab155ad29afb63332991b7aab5139429258284e1cc2a3b15c338f2f23195e7b847228bbd3cb25e336870f SHA512 9514586eb51ac7e8d9639f2aba52cfd5cf71c442ee0a6c652e7838a96cf0fcb62ce4ffa9f9b956d984cd5ecfb3d13b8c21a66677e1e3e9e76f13202792ee2a7e
-DIST sssd-1.12.4.tar.gz 4226841 BLAKE2B 496f6fcf2fc22b4d121a36ac81552c66716f4dd2c011bcda5884a7fcd6b62ea86687afd8fad84c763f9efe05e00676ad188e52e674ade9a197caf82cb8b059d2 SHA512 817141378d4c535ee1018c4246c77a61b963ab10c026e6983e1be90860fa68698dd60cd27ab7ac77da096057f8c71cba90387cf3329e9d43e98a23163f8bb233
-DIST sssd-1.12.5.tar.gz 4300869 BLAKE2B 608a6963b69410fac7bb9f12eea7bdf6f7ec690847f18e33ec3e4e8b77eebb15fee6f4c6073490c859874c93d3f1e8da1771c5f23069771403725bc4956c49a2 SHA512 573947c58dc53b92b6b60390375a70f3842e0bfd22c696e60dd84b8dd671bc508f30f3a0952135b0c6a1e555d43493f59ce60f780a5130696cada06cc467fa6c
-DIST sssd-1.13.0.tar.gz 4417697 BLAKE2B 52602ab021241ae80222d59ebc1eb216f9df4145b4103c040f2606013c847961e8ddbfe58deb005f3c162e4af22377d97fc4a2a53de8f71b5086cfd43703138c SHA512 c11303557180d6491933f5732ed831d1725d33e7444d92d5a20ba24a35d77845711d8427d869fe526fbdea482944269469f5bbbb779e3006998fbe09403ebf7f
-DIST sssd-1.13.1.tar.gz 4517171 BLAKE2B 4c02d44de2c1fdfdc545e49bdf9f46a26223e095bb3d7db20399f5677b014ce1c60730dc52f9669ce10b8ee14e9a162d91af676b05af8433f872e75234954b2f SHA512 93d7f9230e6464c3346abad374e7b4a17a148a5d6e37736a4d1aaf9c99dce6065e0b1eed329c8de997c7cf902728077dd31ec4920a8d192fc67cc27f16723346
-EBUILD sssd-1.12.1.ebuild 3257 BLAKE2B a34f5e91f9158565332b4a3b47bd1475a6dd7bedfe4310384946f26a81349288178ff6faffedcf66c0e1ca1251373538736ccb885a5eb2bc12763e931d53c5be SHA512 ac5ecf3c76572035761f3ec00fd72e722d0a4552819deb2fa0bc2848538c592ecadfe973000b8a2af113246e7dc5eb401bc9a7ef9b4d3729bb9b4672923eebf2
-EBUILD sssd-1.12.4.ebuild 5102 BLAKE2B c57797462eda4e3034338b4d78102461ae61d8450527c422b39e5ede688352e52a0fb5ad89b7f8922f0f0a0755f921c45948845be8dd147e5c7386df30569c24 SHA512 a029a5dbe2d3abbcfd78a7db9f6b72af0e5babf6e6b1527692506d555352d8c55df8f8fbb4274da82666092c2aff0277acd6aaa8486166f93916b3fe68a7ee29
-EBUILD sssd-1.12.5.ebuild 5102 BLAKE2B c57797462eda4e3034338b4d78102461ae61d8450527c422b39e5ede688352e52a0fb5ad89b7f8922f0f0a0755f921c45948845be8dd147e5c7386df30569c24 SHA512 a029a5dbe2d3abbcfd78a7db9f6b72af0e5babf6e6b1527692506d555352d8c55df8f8fbb4274da82666092c2aff0277acd6aaa8486166f93916b3fe68a7ee29
-EBUILD sssd-1.13.0.ebuild 5309 BLAKE2B 567973eb37e027d812f0845bc988f5acbff6697a9374b49e85d0a0b026409c943283f4271c64c029aabac42d2f100ed894c83bc53de897e88833cddd6e9169b5 SHA512 2a210cb0f2958f7f826ad2c278f384e7f8b214c32884b3fad4820462c8448869c20a415f9ccb0e9b5111bfa660266d5fef5ed02513f1ba5b4d00769e17215d13
-EBUILD sssd-1.13.1.ebuild 5272 BLAKE2B e6cd036a2045dae0458eb73e33398cb607b3088142ebf04f893bc1c154bd5e1167935a4361c0354aad056e8359cacb4b646fc270b33139cb60afe31c8b98d7b9 SHA512 562fe04c445a30b64793bc676033ab65a02a6d8729ab91c3d36a178de1ffa55a1f9b6829f0e2c6d306a758106e0da043be85eee189d05edf43028619c04f732d
-MISC metadata.xml 1045 BLAKE2B ca2f031380d06dc5c9ebce3c63476b622c3cc0f716fd4dd2603e3f7bf01654f06886b50a00b6250ba3161995513d9bca0489333391dfe376992a229717b91c58 SHA512 4bbf8db0eb4ad42d4868cf64421afe33cd5e7d8e2edfc2606cbc6fa892d80a073198cafc657a0873d3cd7ce3ff8b0e23bad6f4a9d64d50253a4ed9354d9014a7
+DIST sssd-1.16.3.tar.gz 6217114 BLAKE2B eefaf8de466d0d76e9a4b60aefef6eb63c17a55b9a1f2e07e973a61d71cbe5432e92357656a1eb353d45bbc2fa92290cef45898d0b315d4a4c4074652ff25a23 SHA512 6165923f652f624bbe3ddc625ae682c4867eb7a20652d0cf74bbb8dda2307c917d3189ede26fd21a4fb5fd5926149271a65fa09f3affe928029ed99e6422b728
+EBUILD sssd-1.16.3.ebuild 6152 BLAKE2B e7f48ce2e4f31e9357c34f0bcdea27279450a4a1ea98d1aa9f681d88c53e7c4608d349762d24ddeaa000128453ec5fd60931a8ac52e79eec6b0054015cf8f9f7 SHA512 0c009b5e3d0ed083622239f728f9bb52dc27c2ae1643f4c5f1e3e5e849d02a1103b11d7bb6f61407eb63dfbcff0c45274cf6a87e5303329d2b80128e965c696d
+MISC metadata.xml 979 BLAKE2B ae7a77ef24839b280479080a868386834b66060e675425133765ffa37f582b8d9d26a879c502c7241e47f8cab952d37ca01d294d75b2c80637f45208240cbd41 SHA512 b4181dc83bf2308005fdc77632d8a3da55ac1fb3c09d4b89b4e1f08ba9c016d2a16adef1c6715eb036e6bac663f4afac6e5924f5da4ac8f1b3af9d7680c29d04
diff --git a/sys-auth/sssd/metadata.xml b/sys-auth/sssd/metadata.xml
index 45e95a76f6c3..4a4874f3d84e 100644
--- a/sys-auth/sssd/metadata.xml
+++ b/sys-auth/sssd/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="acl"> Build and use the cifsidmap plugin</flag>
-		<flag name="augeas">Build internal configuration library</flag>
 		<flag name="locator">Install sssd's Kerberos plugin</flag>
 		<flag name="netlink">Add support for netlink protocol via <pkg>dev-libs/libnl</pkg></flag>
 		<flag name="nfsv4">Add support for the nfsv4 idmapd plugin provided by <pkg>net-libs/libnfsidmap</pkg></flag>
diff --git a/sys-auth/sssd/sssd-1.12.1.ebuild b/sys-auth/sssd/sssd-1.12.1.ebuild
deleted file mode 100644
index 7bb9af287262..000000000000
--- a/sys-auth/sssd/sssd-1.12.1.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 )
-
-WANT_AUTOMAKE="1.13"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-
-inherit python-single-r1 multilib pam linux-info autotools-utils systemd
-
-DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
-HOMEPAGE="https://pagure.io/sssd/sssd"
-SRC_URI="https://releases.pagure.org/SSSD/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86"
-IUSE="acl augeas autofs +locator netlink nfsv4 nls +manpages python selinux sudo ssh test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEP="
-	virtual/pam
-	>=dev-libs/popt-1.16
-	dev-libs/glib:2
-	>=dev-libs/ding-libs-0.2
-	>=sys-libs/talloc-2.0.7
-	>=sys-libs/tdb-1.2.9
-	>=sys-libs/tevent-0.9.16
-	>=sys-libs/ldb-1.1.17-r1:=
-	>=net-nds/openldap-2.4.30[sasl]
-	>=dev-libs/libpcre-8.30
-	>=app-crypt/mit-krb5-1.10.3
-	>=sys-apps/keyutils-1.5
-	>=net-dns/c-ares-1.7.4
-	>=dev-libs/nss-3.12.9
-	python? ( ${PYTHON_DEPS} )
-	selinux? (
-		>=sys-libs/libselinux-2.1.9
-		>=sys-libs/libsemanage-2.1
-	)
-	>=net-dns/bind-tools-9.9[gssapi]
-	>=dev-libs/cyrus-sasl-2.1.25-r3[kerberos]
-	>=sys-apps/dbus-1.6
-	acl? ( net-fs/cifs-utils[acl] )
-	augeas? ( app-admin/augeas )
-	nfsv4? ( net-libs/libnfsidmap )
-	nls? ( >=sys-devel/gettext-0.18 )
-	virtual/libintl
-	netlink? ( dev-libs/libnl:3 )
-	"
-
-RDEPEND="${COMMON_DEP}
-	>=sys-libs/glibc-2.17[nscd]
-	selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )
-	"
-DEPEND="${COMMON_DEP}
-	test? ( dev-libs/check )
-	manpages? (
-		>=dev-libs/libxslt-1.1.26
-		app-text/docbook-xml-dtd:4.4
-		)"
-
-CONFIG_CHECK="~KEYS"
-
-pkg_setup(){
-	use python && python-single-r1_pkg_setup
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	autotools-utils_src_prepare
-}
-
-src_configure(){
-	# no samba4 per 447022
-	# set initscript to sysv because the systemd option needs systemd to
-	# be installed. We provide our own systemd file anyway.
-	local myeconfargs=(
-		--localstatedir="${EPREFIX}"/var
-		--enable-nsslibdir="${EPREFIX}"/$(get_libdir)
-		--with-plugin-path="${EPREFIX}"/usr/$(get_libdir)/sssd
-		--enable-pammoddir="${EPREFIX}"/$(getpam_mod_dir)
-		--with-ldb-lib-dir="${EPREFIX}"/usr/$(get_libdir)/samba/ldb
-		--without-nscd
-		--with-unicode-lib="glib2"
-		--disable-rpath
-		--disable-silent-rules
-		--sbindir=/usr/sbin
-		--without-samba
-		$(use_enable acl cifs-idmap-plugin)
-		$(use_enable augeas config-lib)
-		$(use_with selinux)
-		$(use_with selinux semanage)
-		$(use_with python python-bindings)
-		$(use_enable locator krb5-locator-plugin)
-		$(use_with nfsv4 nfsv4-idmapd-plugin)
-		$(use_enable nls )
-		$(use_with netlink libnl)
-		$(use_with manpages)
-		$(use_with sudo)
-		$(use_with autofs)
-		$(use_with ssh)
-		--with-crypto="libcrypto"
-		--with-initscript="sysv"
-		)
-
-	autotools-utils_src_configure
-}
-
-src_install(){
-	autotools-utils_src_install
-	use python && python_optimize
-
-	insinto /etc/sssd
-	insopts -m600
-	doins "${S}"/src/examples/sssd-example.conf
-
-	insinto /etc/logrotate.d
-	insopts -m644
-	newins "${S}"/src/examples/logrotate sssd
-
-	newconfd "${FILESDIR}"/sssd.conf sssd
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-src_test() {
-	autotools-utils_src_test
-}
diff --git a/sys-auth/sssd/sssd-1.12.4.ebuild b/sys-auth/sssd/sssd-1.12.4.ebuild
deleted file mode 100644
index 3e4e1d38e424..000000000000
--- a/sys-auth/sssd/sssd-1.12.4.ebuild
+++ /dev/null
@@ -1,202 +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} )
-
-WANT_AUTOMAKE="1.13"
-
-inherit python-single-r1 multilib pam linux-info autotools multilib-minimal systemd toolchain-funcs
-
-DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
-HOMEPAGE="https://pagure.io/sssd/sssd"
-SRC_URI="https://releases.pagure.org/SSSD/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="acl augeas autofs +locator netlink nfsv4 nls +manpages python samba selinux sudo ssh test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEP="
-	>=virtual/pam-0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/popt-1.16
-	dev-libs/glib:2
-	>=dev-libs/ding-libs-0.2
-	>=sys-libs/talloc-2.0.7
-	>=sys-libs/tdb-1.2.9
-	>=sys-libs/tevent-0.9.16
-	>=sys-libs/ldb-1.1.17-r1:=
-	>=net-nds/openldap-2.4.30[sasl]
-	>=dev-libs/libpcre-8.30
-	>=app-crypt/mit-krb5-1.10.3
-	locator? (
-		>=app-crypt/mit-krb5-1.12.2[${MULTILIB_USEDEP}]
-		>=net-dns/c-ares-1.10.0-r1[${MULTILIB_USEDEP}]
-	)
-	>=sys-apps/keyutils-1.5
-	>=net-dns/c-ares-1.7.4
-	>=dev-libs/nss-3.12.9
-	python? ( ${PYTHON_DEPS} )
-	selinux? (
-		>=sys-libs/libselinux-2.1.9
-		>=sys-libs/libsemanage-2.1
-	)
-	>=net-dns/bind-tools-9.9[gssapi]
-	>=dev-libs/cyrus-sasl-2.1.25-r3[kerberos]
-	>=sys-apps/dbus-1.6
-	acl? ( net-fs/cifs-utils[acl] )
-	augeas? ( app-admin/augeas )
-	nfsv4? ( net-libs/libnfsidmap )
-	nls? ( >=sys-devel/gettext-0.18 )
-	virtual/libintl
-	netlink? ( dev-libs/libnl:3 )
-	samba? ( >=net-fs/samba-4.0 )
-	"
-
-RDEPEND="${COMMON_DEP}
-	>=sys-libs/glibc-2.17[nscd]
-	selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )
-	"
-DEPEND="${COMMON_DEP}
-	test? ( dev-libs/check )
-	manpages? (
-		>=dev-libs/libxslt-1.1.26
-		app-text/docbook-xml-dtd:4.4
-		)"
-
-CONFIG_CHECK="~KEYS"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/ipa_hbac.h
-	/usr/include/sss_idmap.h
-	/usr/include/sss_nss_idmap.h
-	/usr/include/wbclient_sssd.h
-	# --with-ifp
-	/usr/include/sss_sifp.h
-	/usr/include/sss_sifp_dbus.h
-)
-
-pkg_setup(){
-	use python && python-single-r1_pkg_setup
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	eautoreconf
-
-	multilib_copy_sources
-}
-
-src_configure() {
-	local native_dbus_cflags=$($(tc-getPKG_CONFIG) --cflags dbus-1)
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# set initscript to sysv because the systemd option needs systemd to
-	# be installed. We provide our own systemd file anyway.
-	local myconf=(
-		--localstatedir="${EPREFIX}"/var
-		--enable-nsslibdir="${EPREFIX}"/$(get_libdir)
-		--with-plugin-path="${EPREFIX}"/usr/$(get_libdir)/sssd
-		--enable-pammoddir="${EPREFIX}"/$(getpam_mod_dir)
-		--with-ldb-lib-dir="${EPREFIX}"/usr/$(get_libdir)/samba/ldb
-		--without-nscd
-		--with-unicode-lib="glib2"
-		--disable-rpath
-		--disable-silent-rules
-		--sbindir=/usr/sbin
-		$(multilib_native_use_with samba)
-		$(multilib_native_use_enable acl cifs-idmap-plugin)
-		$(multilib_native_use_enable augeas config-lib)
-		$(multilib_native_use_with selinux)
-		$(multilib_native_use_with selinux semanage)
-		$(multilib_native_use_with python python-bindings)
-		$(use_enable locator krb5-locator-plugin)
-		$(multilib_native_use_with nfsv4 nfsv4-idmapd-plugin)
-		$(use_enable nls )
-		$(multilib_native_use_with netlink libnl)
-		$(multilib_native_use_with manpages)
-		$(multilib_native_use_with sudo)
-		$(multilib_native_use_with autofs)
-		$(multilib_native_use_with ssh)
-		--with-crypto="libcrypto"
-		--with-initscript="sysv"
-
-		KRB5_CONFIG=/usr/bin/${CHOST}-krb5-config
-		)
-
-	if ! multilib_is_native_abi; then
-		# work-around all the libraries that are used for CLI and server
-		myconf+=(
-			{POPT,TALLOC,TDB,TEVENT,LDB}_{CFLAGS,LIBS}=' '
-			# ldb headers are fine since native needs it
-			# ldb lib fails... but it does not seem to bother
-			{DHASH,COLLECTION,INI_CONFIG_V{0,1,1_1}}_{CFLAGS,LIBS}=' '
-			{PCRE,CARES,SYSTEMD_LOGIN,SASL,GLIB2,DBUS,CRYPTO}_{CFLAGS,LIBS}=' '
-
-			# use native include path for dbus (needed for build)
-			DBUS_CFLAGS="${native_dbus_cflags}"
-
-			# non-pkgconfig checks
-			ac_cv_lib_ldap_ldap_search=yes
-		)
-
-		use locator || myconf+=(
-			KRB5_CONFIG=/bin/true
-		)
-	fi
-
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake libnss_sss.la pam_sss.la
-		use locator && emake sssd_krb5_locator_plugin.la
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake -j1 DESTDIR="${D}" "${_at_args[@]}" install
-	else
-		# easier than playing with automake...
-		dopammod .libs/pam_sss.so
-
-		into /
-		dolib .libs/libnss_sss.so*
-
-		if use locator; then
-			exeinto /usr/$(get_libdir)/krb5/plugins/libkrb5
-			doexe .libs/sssd_krb5_locator_plugin.so
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
-	use python && python_optimize
-
-	insinto /etc/sssd
-	insopts -m600
-	doins "${S}"/src/examples/sssd-example.conf
-
-	insinto /etc/logrotate.d
-	insopts -m644
-	newins "${S}"/src/examples/logrotate sssd
-
-	newconfd "${FILESDIR}"/sssd.conf sssd
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-multilib_src_test() {
-	default
-}
diff --git a/sys-auth/sssd/sssd-1.12.5.ebuild b/sys-auth/sssd/sssd-1.12.5.ebuild
deleted file mode 100644
index 3e4e1d38e424..000000000000
--- a/sys-auth/sssd/sssd-1.12.5.ebuild
+++ /dev/null
@@ -1,202 +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} )
-
-WANT_AUTOMAKE="1.13"
-
-inherit python-single-r1 multilib pam linux-info autotools multilib-minimal systemd toolchain-funcs
-
-DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
-HOMEPAGE="https://pagure.io/sssd/sssd"
-SRC_URI="https://releases.pagure.org/SSSD/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="acl augeas autofs +locator netlink nfsv4 nls +manpages python samba selinux sudo ssh test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEP="
-	>=virtual/pam-0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/popt-1.16
-	dev-libs/glib:2
-	>=dev-libs/ding-libs-0.2
-	>=sys-libs/talloc-2.0.7
-	>=sys-libs/tdb-1.2.9
-	>=sys-libs/tevent-0.9.16
-	>=sys-libs/ldb-1.1.17-r1:=
-	>=net-nds/openldap-2.4.30[sasl]
-	>=dev-libs/libpcre-8.30
-	>=app-crypt/mit-krb5-1.10.3
-	locator? (
-		>=app-crypt/mit-krb5-1.12.2[${MULTILIB_USEDEP}]
-		>=net-dns/c-ares-1.10.0-r1[${MULTILIB_USEDEP}]
-	)
-	>=sys-apps/keyutils-1.5
-	>=net-dns/c-ares-1.7.4
-	>=dev-libs/nss-3.12.9
-	python? ( ${PYTHON_DEPS} )
-	selinux? (
-		>=sys-libs/libselinux-2.1.9
-		>=sys-libs/libsemanage-2.1
-	)
-	>=net-dns/bind-tools-9.9[gssapi]
-	>=dev-libs/cyrus-sasl-2.1.25-r3[kerberos]
-	>=sys-apps/dbus-1.6
-	acl? ( net-fs/cifs-utils[acl] )
-	augeas? ( app-admin/augeas )
-	nfsv4? ( net-libs/libnfsidmap )
-	nls? ( >=sys-devel/gettext-0.18 )
-	virtual/libintl
-	netlink? ( dev-libs/libnl:3 )
-	samba? ( >=net-fs/samba-4.0 )
-	"
-
-RDEPEND="${COMMON_DEP}
-	>=sys-libs/glibc-2.17[nscd]
-	selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )
-	"
-DEPEND="${COMMON_DEP}
-	test? ( dev-libs/check )
-	manpages? (
-		>=dev-libs/libxslt-1.1.26
-		app-text/docbook-xml-dtd:4.4
-		)"
-
-CONFIG_CHECK="~KEYS"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/ipa_hbac.h
-	/usr/include/sss_idmap.h
-	/usr/include/sss_nss_idmap.h
-	/usr/include/wbclient_sssd.h
-	# --with-ifp
-	/usr/include/sss_sifp.h
-	/usr/include/sss_sifp_dbus.h
-)
-
-pkg_setup(){
-	use python && python-single-r1_pkg_setup
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	eautoreconf
-
-	multilib_copy_sources
-}
-
-src_configure() {
-	local native_dbus_cflags=$($(tc-getPKG_CONFIG) --cflags dbus-1)
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# set initscript to sysv because the systemd option needs systemd to
-	# be installed. We provide our own systemd file anyway.
-	local myconf=(
-		--localstatedir="${EPREFIX}"/var
-		--enable-nsslibdir="${EPREFIX}"/$(get_libdir)
-		--with-plugin-path="${EPREFIX}"/usr/$(get_libdir)/sssd
-		--enable-pammoddir="${EPREFIX}"/$(getpam_mod_dir)
-		--with-ldb-lib-dir="${EPREFIX}"/usr/$(get_libdir)/samba/ldb
-		--without-nscd
-		--with-unicode-lib="glib2"
-		--disable-rpath
-		--disable-silent-rules
-		--sbindir=/usr/sbin
-		$(multilib_native_use_with samba)
-		$(multilib_native_use_enable acl cifs-idmap-plugin)
-		$(multilib_native_use_enable augeas config-lib)
-		$(multilib_native_use_with selinux)
-		$(multilib_native_use_with selinux semanage)
-		$(multilib_native_use_with python python-bindings)
-		$(use_enable locator krb5-locator-plugin)
-		$(multilib_native_use_with nfsv4 nfsv4-idmapd-plugin)
-		$(use_enable nls )
-		$(multilib_native_use_with netlink libnl)
-		$(multilib_native_use_with manpages)
-		$(multilib_native_use_with sudo)
-		$(multilib_native_use_with autofs)
-		$(multilib_native_use_with ssh)
-		--with-crypto="libcrypto"
-		--with-initscript="sysv"
-
-		KRB5_CONFIG=/usr/bin/${CHOST}-krb5-config
-		)
-
-	if ! multilib_is_native_abi; then
-		# work-around all the libraries that are used for CLI and server
-		myconf+=(
-			{POPT,TALLOC,TDB,TEVENT,LDB}_{CFLAGS,LIBS}=' '
-			# ldb headers are fine since native needs it
-			# ldb lib fails... but it does not seem to bother
-			{DHASH,COLLECTION,INI_CONFIG_V{0,1,1_1}}_{CFLAGS,LIBS}=' '
-			{PCRE,CARES,SYSTEMD_LOGIN,SASL,GLIB2,DBUS,CRYPTO}_{CFLAGS,LIBS}=' '
-
-			# use native include path for dbus (needed for build)
-			DBUS_CFLAGS="${native_dbus_cflags}"
-
-			# non-pkgconfig checks
-			ac_cv_lib_ldap_ldap_search=yes
-		)
-
-		use locator || myconf+=(
-			KRB5_CONFIG=/bin/true
-		)
-	fi
-
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake libnss_sss.la pam_sss.la
-		use locator && emake sssd_krb5_locator_plugin.la
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake -j1 DESTDIR="${D}" "${_at_args[@]}" install
-	else
-		# easier than playing with automake...
-		dopammod .libs/pam_sss.so
-
-		into /
-		dolib .libs/libnss_sss.so*
-
-		if use locator; then
-			exeinto /usr/$(get_libdir)/krb5/plugins/libkrb5
-			doexe .libs/sssd_krb5_locator_plugin.so
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
-	use python && python_optimize
-
-	insinto /etc/sssd
-	insopts -m600
-	doins "${S}"/src/examples/sssd-example.conf
-
-	insinto /etc/logrotate.d
-	insopts -m644
-	newins "${S}"/src/examples/logrotate sssd
-
-	newconfd "${FILESDIR}"/sssd.conf sssd
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-multilib_src_test() {
-	default
-}
diff --git a/sys-auth/sssd/sssd-1.13.0.ebuild b/sys-auth/sssd/sssd-1.13.0.ebuild
deleted file mode 100644
index b3bd639ff0c9..000000000000
--- a/sys-auth/sssd/sssd-1.13.0.ebuild
+++ /dev/null
@@ -1,211 +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} )
-
-inherit eutils multilib pam linux-info autotools multilib-minimal python-r1 systemd toolchain-funcs
-
-DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
-HOMEPAGE="https://pagure.io/sssd/sssd"
-SRC_URI="https://releases.pagure.org/SSSD/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="acl augeas autofs +locator netlink nfsv4 nls +manpages python samba selinux sudo ssh test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEP="
-	>=virtual/pam-0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/popt-1.16
-	dev-libs/glib:2
-	>=dev-libs/ding-libs-0.2
-	>=sys-libs/talloc-2.0.7
-	>=sys-libs/tdb-1.2.9
-	>=sys-libs/tevent-0.9.16
-	>=sys-libs/ldb-1.1.17-r1:=
-	>=net-nds/openldap-2.4.30[sasl]
-	>=dev-libs/libpcre-8.30
-	>=app-crypt/mit-krb5-1.10.3
-	locator? (
-		>=app-crypt/mit-krb5-1.12.2[${MULTILIB_USEDEP}]
-		>=net-dns/c-ares-1.10.0-r1[${MULTILIB_USEDEP}]
-	)
-	>=sys-apps/keyutils-1.5
-	>=net-dns/c-ares-1.7.4
-	>=dev-libs/nss-3.12.9
-	python? ( ${PYTHON_DEPS} )
-	selinux? (
-		>=sys-libs/libselinux-2.1.9
-		>=sys-libs/libsemanage-2.1
-	)
-	>=net-dns/bind-tools-9.9[gssapi]
-	>=dev-libs/cyrus-sasl-2.1.25-r3[kerberos]
-	>=sys-apps/dbus-1.6
-	acl? ( net-fs/cifs-utils[acl] )
-	augeas? ( app-admin/augeas )
-	nfsv4? ( net-libs/libnfsidmap )
-	nls? ( >=sys-devel/gettext-0.18 )
-	virtual/libintl
-	netlink? ( dev-libs/libnl:3 )
-	samba? ( >=net-fs/samba-4.0 )
-	"
-
-RDEPEND="${COMMON_DEP}
-	>=sys-libs/glibc-2.17[nscd]
-	selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )
-	"
-DEPEND="${COMMON_DEP}
-	test? ( dev-libs/check )
-	manpages? (
-		>=dev-libs/libxslt-1.1.26
-		app-text/docbook-xml-dtd:4.4
-		)"
-
-CONFIG_CHECK="~KEYS"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/ipa_hbac.h
-	/usr/include/sss_idmap.h
-	/usr/include/sss_nss_idmap.h
-	/usr/include/wbclient_sssd.h
-	# --with-ifp
-	/usr/include/sss_sifp.h
-	/usr/include/sss_sifp_dbus.h
-)
-
-pkg_setup(){
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	# bug #553678
-	epatch "${FILESDIR}"/${P}-fix-init.patch
-
-	eautoreconf
-
-	multilib_copy_sources
-
-	# Maybe run it before eautoreconf?
-	epatch_user
-}
-
-src_configure() {
-	local native_dbus_cflags=$($(tc-getPKG_CONFIG) --cflags dbus-1)
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# set initscript to sysv because the systemd option needs systemd to
-	# be installed. We provide our own systemd file anyway.
-	local myconf=()
-	if [[ "${PYTHON_TARGETS}" == *python2* ]]; then
-		myconf+=($(multilib_native_use_with python python2-bindings))
-	fi
-	if [[ "${PYTHON_TARGETS}" == *python3* ]]; then
-		myconf+=($(multilib_native_use_with python python3-bindings))
-	fi
-
-	myconf+=(
-		--localstatedir="${EPREFIX}"/var
-		--enable-nsslibdir="${EPREFIX}"/$(get_libdir)
-		--with-plugin-path="${EPREFIX}"/usr/$(get_libdir)/sssd
-		--enable-pammoddir="${EPREFIX}"/$(getpam_mod_dir)
-		--with-ldb-lib-dir="${EPREFIX}"/usr/$(get_libdir)/samba/ldb
-		--without-nscd
-		--with-unicode-lib="glib2"
-		--disable-rpath
-		--disable-silent-rules
-		--sbindir=/usr/sbin
-		$(multilib_native_use_with samba)
-		$(multilib_native_use_enable acl cifs-idmap-plugin)
-		$(multilib_native_use_enable augeas config-lib)
-		$(multilib_native_use_with selinux)
-		$(multilib_native_use_with selinux semanage)
-		$(use_enable locator krb5-locator-plugin)
-		$(multilib_native_use_with nfsv4 nfsv4-idmapd-plugin)
-		$(use_enable nls )
-		$(multilib_native_use_with netlink libnl)
-		$(multilib_native_use_with manpages)
-		$(multilib_native_use_with sudo)
-		$(multilib_native_use_with autofs)
-		$(multilib_native_use_with ssh)
-		--with-crypto="libcrypto"
-		--with-initscript="sysv"
-
-		KRB5_CONFIG=/usr/bin/${CHOST}-krb5-config
-		)
-
-	if ! multilib_is_native_abi; then
-		# work-around all the libraries that are used for CLI and server
-		myconf+=(
-			{POPT,TALLOC,TDB,TEVENT,LDB}_{CFLAGS,LIBS}=' '
-			# ldb headers are fine since native needs it
-			# ldb lib fails... but it does not seem to bother
-			{DHASH,COLLECTION,INI_CONFIG_V{0,1,1_1}}_{CFLAGS,LIBS}=' '
-			{PCRE,CARES,SYSTEMD_LOGIN,SASL,GLIB2,DBUS,CRYPTO}_{CFLAGS,LIBS}=' '
-
-			# use native include path for dbus (needed for build)
-			DBUS_CFLAGS="${native_dbus_cflags}"
-
-			# non-pkgconfig checks
-			ac_cv_lib_ldap_ldap_search=yes
-		)
-
-		use locator || myconf+=(
-			KRB5_CONFIG=/bin/true
-		)
-	fi
-
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake libnss_sss.la pam_sss.la
-		use locator && emake sssd_krb5_locator_plugin.la
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake -j1 DESTDIR="${D}" "${_at_args[@]}" install
-	else
-		# easier than playing with automake...
-		dopammod .libs/pam_sss.so
-
-		into /
-		dolib .libs/libnss_sss.so*
-
-		if use locator; then
-			exeinto /usr/$(get_libdir)/krb5/plugins/libkrb5
-			doexe .libs/sssd_krb5_locator_plugin.so
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
-
-	insinto /etc/sssd
-	insopts -m600
-	doins "${S}"/src/examples/sssd-example.conf
-
-	insinto /etc/logrotate.d
-	insopts -m644
-	newins "${S}"/src/examples/logrotate sssd
-
-	newconfd "${FILESDIR}"/sssd.conf sssd
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-multilib_src_test() {
-	default
-}
diff --git a/sys-auth/sssd/sssd-1.13.1.ebuild b/sys-auth/sssd/sssd-1.13.1.ebuild
deleted file mode 100644
index c3b23efc7364..000000000000
--- a/sys-auth/sssd/sssd-1.13.1.ebuild
+++ /dev/null
@@ -1,208 +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} )
-
-inherit eutils multilib pam linux-info autotools multilib-minimal python-r1 systemd toolchain-funcs
-
-DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
-HOMEPAGE="https://pagure.io/sssd/sssd"
-SRC_URI="https://releases.pagure.org/SSSD/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="acl augeas autofs +locator netlink nfsv4 nls +manpages python samba selinux sudo ssh test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEP="
-	>=virtual/pam-0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/popt-1.16
-	dev-libs/glib:2
-	>=dev-libs/ding-libs-0.2
-	>=sys-libs/talloc-2.0.7
-	>=sys-libs/tdb-1.2.9
-	>=sys-libs/tevent-0.9.16
-	>=sys-libs/ldb-1.1.17-r1:=
-	>=net-nds/openldap-2.4.30[sasl]
-	>=dev-libs/libpcre-8.30
-	>=app-crypt/mit-krb5-1.10.3
-	locator? (
-		>=app-crypt/mit-krb5-1.12.2[${MULTILIB_USEDEP}]
-		>=net-dns/c-ares-1.10.0-r1[${MULTILIB_USEDEP}]
-	)
-	>=sys-apps/keyutils-1.5
-	>=net-dns/c-ares-1.7.4
-	>=dev-libs/nss-3.12.9
-	python? ( ${PYTHON_DEPS} )
-	selinux? (
-		>=sys-libs/libselinux-2.1.9
-		>=sys-libs/libsemanage-2.1
-	)
-	>=net-dns/bind-tools-9.9[gssapi]
-	>=dev-libs/cyrus-sasl-2.1.25-r3[kerberos]
-	>=sys-apps/dbus-1.6
-	acl? ( net-fs/cifs-utils[acl] )
-	augeas? ( app-admin/augeas )
-	nfsv4? ( net-libs/libnfsidmap )
-	nls? ( >=sys-devel/gettext-0.18 )
-	virtual/libintl
-	netlink? ( dev-libs/libnl:3 )
-	samba? ( >=net-fs/samba-4.0 )
-	"
-
-RDEPEND="${COMMON_DEP}
-	>=sys-libs/glibc-2.17[nscd]
-	selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )
-	"
-DEPEND="${COMMON_DEP}
-	test? ( dev-libs/check )
-	manpages? (
-		>=dev-libs/libxslt-1.1.26
-		app-text/docbook-xml-dtd:4.4
-		)"
-
-CONFIG_CHECK="~KEYS"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/ipa_hbac.h
-	/usr/include/sss_idmap.h
-	/usr/include/sss_nss_idmap.h
-	/usr/include/wbclient_sssd.h
-	# --with-ifp
-	/usr/include/sss_sifp.h
-	/usr/include/sss_sifp_dbus.h
-)
-
-pkg_setup(){
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	eautoreconf
-
-	multilib_copy_sources
-
-	# Maybe run it before eautoreconf?
-	epatch_user
-}
-
-src_configure() {
-	local native_dbus_cflags=$($(tc-getPKG_CONFIG) --cflags dbus-1)
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# set initscript to sysv because the systemd option needs systemd to
-	# be installed. We provide our own systemd file anyway.
-	local myconf=()
-	if [[ "${PYTHON_TARGETS}" == *python2* ]]; then
-		myconf+=($(multilib_native_use_with python python2-bindings))
-	fi
-	if [[ "${PYTHON_TARGETS}" == *python3* ]]; then
-		myconf+=($(multilib_native_use_with python python3-bindings))
-	fi
-
-	myconf+=(
-		--localstatedir="${EPREFIX}"/var
-		--enable-nsslibdir="${EPREFIX}"/$(get_libdir)
-		--with-plugin-path="${EPREFIX}"/usr/$(get_libdir)/sssd
-		--enable-pammoddir="${EPREFIX}"/$(getpam_mod_dir)
-		--with-ldb-lib-dir="${EPREFIX}"/usr/$(get_libdir)/samba/ldb
-		--without-nscd
-		--with-unicode-lib="glib2"
-		--disable-rpath
-		--disable-silent-rules
-		--sbindir=/usr/sbin
-		$(multilib_native_use_with samba)
-		$(multilib_native_use_enable acl cifs-idmap-plugin)
-		$(multilib_native_use_enable augeas config-lib)
-		$(multilib_native_use_with selinux)
-		$(multilib_native_use_with selinux semanage)
-		$(use_enable locator krb5-locator-plugin)
-		$(multilib_native_use_with nfsv4 nfsv4-idmapd-plugin)
-		$(use_enable nls )
-		$(multilib_native_use_with netlink libnl)
-		$(multilib_native_use_with manpages)
-		$(multilib_native_use_with sudo)
-		$(multilib_native_use_with autofs)
-		$(multilib_native_use_with ssh)
-		--with-crypto="libcrypto"
-		--with-initscript="sysv"
-
-		KRB5_CONFIG=/usr/bin/${CHOST}-krb5-config
-		)
-
-	if ! multilib_is_native_abi; then
-		# work-around all the libraries that are used for CLI and server
-		myconf+=(
-			{POPT,TALLOC,TDB,TEVENT,LDB}_{CFLAGS,LIBS}=' '
-			# ldb headers are fine since native needs it
-			# ldb lib fails... but it does not seem to bother
-			{DHASH,COLLECTION,INI_CONFIG_V{0,1,1_1}}_{CFLAGS,LIBS}=' '
-			{PCRE,CARES,SYSTEMD_LOGIN,SASL,GLIB2,DBUS,CRYPTO}_{CFLAGS,LIBS}=' '
-
-			# use native include path for dbus (needed for build)
-			DBUS_CFLAGS="${native_dbus_cflags}"
-
-			# non-pkgconfig checks
-			ac_cv_lib_ldap_ldap_search=yes
-		)
-
-		use locator || myconf+=(
-			KRB5_CONFIG=/bin/true
-		)
-	fi
-
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake libnss_sss.la pam_sss.la
-		use locator && emake sssd_krb5_locator_plugin.la
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake -j1 DESTDIR="${D}" "${_at_args[@]}" install
-	else
-		# easier than playing with automake...
-		dopammod .libs/pam_sss.so
-
-		into /
-		dolib .libs/libnss_sss.so*
-
-		if use locator; then
-			exeinto /usr/$(get_libdir)/krb5/plugins/libkrb5
-			doexe .libs/sssd_krb5_locator_plugin.so
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
-
-	insinto /etc/sssd
-	insopts -m600
-	doins "${S}"/src/examples/sssd-example.conf
-
-	insinto /etc/logrotate.d
-	insopts -m644
-	newins "${S}"/src/examples/logrotate sssd
-
-	newconfd "${FILESDIR}"/sssd.conf sssd
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-multilib_src_test() {
-	default
-}
diff --git a/sys-auth/sssd/sssd-1.16.3.ebuild b/sys-auth/sssd/sssd-1.16.3.ebuild
new file mode 100644
index 000000000000..6a5c351e0027
--- /dev/null
+++ b/sys-auth/sssd/sssd-1.16.3.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5,3_6,3_7} )
+
+inherit autotools flag-o-matic linux-info multilib-minimal pam python-r1 systemd toolchain-funcs
+
+DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
+HOMEPAGE="https://pagure.io/SSSD/sssd"
+SRC_URI="http://releases.pagure.org/SSSD/${PN}/${P}.tar.gz"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="acl autofs +locator +netlink nfsv4 nls +manpages python samba selinux sudo ssh test"
+
+COMMON_DEP="
+	>=virtual/pam-0-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/popt-1.16
+	dev-libs/glib:2
+	>=dev-libs/ding-libs-0.2
+	>=sys-libs/talloc-2.0.7
+	>=sys-libs/tdb-1.2.9
+	>=sys-libs/tevent-0.9.16
+	>=sys-libs/ldb-1.1.17-r1:=
+	>=net-nds/openldap-2.4.30[sasl]
+	net-libs/http-parser
+	>=dev-libs/libpcre-8.30
+	>=app-crypt/mit-krb5-1.10.3
+	dev-libs/jansson
+	locator? (
+		>=app-crypt/mit-krb5-1.12.2[${MULTILIB_USEDEP}]
+		>=net-dns/c-ares-1.10.0-r1[${MULTILIB_USEDEP}]
+	)
+	>=sys-apps/keyutils-1.5
+	>=net-dns/c-ares-1.7.4
+	>=dev-libs/nss-3.12.9
+	selinux? (
+		>=sys-libs/libselinux-2.1.9
+		>=sys-libs/libsemanage-2.1
+	)
+	>=net-dns/bind-tools-9.9[gssapi]
+	>=dev-libs/cyrus-sasl-2.1.25-r3[kerberos]
+	>=sys-apps/dbus-1.6
+	acl? ( net-fs/cifs-utils[acl] )
+	nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) )
+	nls? ( >=sys-devel/gettext-0.18 )
+	virtual/libintl
+	netlink? ( dev-libs/libnl:3 )
+	samba? ( >=net-fs/samba-4.5 )
+	"
+
+RDEPEND="${COMMON_DEP}
+	>=sys-libs/glibc-2.17[nscd]
+	selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )
+	"
+DEPEND="${COMMON_DEP}
+	test? ( dev-libs/check )
+	manpages? (
+		>=dev-libs/libxslt-1.1.26
+		app-text/docbook-xml-dtd:4.4
+		)"
+
+CONFIG_CHECK="~KEYS"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/ipa_hbac.h
+	/usr/include/sss_idmap.h
+	/usr/include/sss_nss_idmap.h
+	/usr/include/wbclient_sssd.h
+	# --with-ifp
+	/usr/include/sss_sifp.h
+	/usr/include/sss_sifp_dbus.h
+	# from 1.15.3
+	/usr/include/sss_certmap.h
+)
+
+pkg_setup(){
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	sed -i 's:#!/sbin/runscript:#!/sbin/openrc-run:' \
+		"${S}"/src/sysv/gentoo/sssd.in || die "sed sssd.in"
+
+	default
+	eautoreconf
+	multilib_copy_sources
+}
+
+src_configure() {
+	local native_dbus_cflags=$($(tc-getPKG_CONFIG) --cflags dbus-1)
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	# set initscript to sysv because the systemd option needs systemd to
+	# be installed. We provide our own systemd file anyway.
+	local myconf=()
+	if [[ "${PYTHON_TARGETS}" == *python2* ]]; then
+		myconf+=($(multilib_native_use_with python python2-bindings))
+	fi
+	if [[ "${PYTHON_TARGETS}" == *python3* ]]; then
+		myconf+=($(multilib_native_use_with python python3-bindings))
+	fi
+	#Work around linker dependency problem.
+	append-ldflags "-Wl,--allow-shlib-undefined"
+
+	myconf+=(
+		--localstatedir="${EPREFIX}"/var
+		--enable-nsslibdir="${EPREFIX}"/$(get_libdir)
+		--with-plugin-path="${EPREFIX}"/usr/$(get_libdir)/sssd
+		--enable-pammoddir="${EPREFIX}"/$(getpam_mod_dir)
+		--with-ldb-lib-dir="${EPREFIX}"/usr/$(get_libdir)/samba/ldb
+		--with-os=gentoo
+		--with-nscd
+		--with-unicode-lib="glib2"
+		--disable-rpath
+		--disable-silent-rules
+		--sbindir=/usr/sbin
+		--without-kcm
+		$(use_with samba libwbclient)
+		--with-secrets
+		$(multilib_native_use_with samba)
+		$(multilib_native_use_enable acl cifs-idmap-plugin)
+		$(multilib_native_use_with selinux)
+		$(multilib_native_use_with selinux semanage)
+		$(use_enable locator krb5-locator-plugin)
+		$(multilib_native_use_with nfsv4 nfsv4-idmapd-plugin)
+		$(use_enable nls )
+		$(multilib_native_use_with netlink libnl)
+		$(multilib_native_use_with manpages)
+		$(multilib_native_use_with sudo)
+		$(multilib_native_use_with autofs)
+		$(multilib_native_use_with ssh)
+		--with-crypto="nss"
+		--with-initscript="sysv"
+
+		KRB5_CONFIG=/usr/bin/${CHOST}-krb5-config
+	)
+
+	if ! multilib_is_native_abi; then
+		# work-around all the libraries that are used for CLI and server
+		myconf+=(
+			{POPT,TALLOC,TDB,TEVENT,LDB}_{CFLAGS,LIBS}=' '
+			# ldb headers are fine since native needs it
+			# ldb lib fails... but it does not seem to bother
+			{DHASH,COLLECTION,INI_CONFIG_V{0,1,1_1}}_{CFLAGS,LIBS}=' '
+			{PCRE,CARES,SYSTEMD_LOGIN,SASL,GLIB2,DBUS,CRYPTO}_{CFLAGS,LIBS}=' '
+
+			# use native include path for dbus (needed for build)
+			DBUS_CFLAGS="${native_dbus_cflags}"
+
+			# non-pkgconfig checks
+			ac_cv_lib_ldap_ldap_search=yes
+			--without-secrets
+			--without-libwbclient
+			--without-kcm
+			--with-crypto=""
+		)
+
+		use locator || myconf+=(
+				KRB5_CONFIG=/bin/true
+		)
+	fi
+
+	econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake libnss_sss.la pam_sss.la
+		use locator && emake sssd_krb5_locator_plugin.la
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake -j1 DESTDIR="${D}" "${_at_args[@]}" install
+	else
+		# easier than playing with automake...
+		dopammod .libs/pam_sss.so
+
+		into /
+		dolib .libs/libnss_sss.so*
+
+		if use locator; then
+			exeinto /usr/$(get_libdir)/krb5/plugins/libkrb5
+			doexe .libs/sssd_krb5_locator_plugin.so
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	insinto /etc/sssd
+	insopts -m600
+	doins "${S}"/src/examples/sssd-example.conf
+
+	insinto /etc/logrotate.d
+	insopts -m644
+	newins "${S}"/src/examples/logrotate sssd
+
+	newconfd "${FILESDIR}"/sssd.conf sssd
+	newinitd "${FILESDIR}"/sssd sssd
+
+	keepdir /var/lib/sss/db
+	keepdir /var/lib/sss/deskprofile
+	keepdir /var/lib/sss/gpo_cache
+	keepdir /var/lib/sss/keytabs
+	keepdir /var/lib/sss/mc
+	keepdir /var/lib/sss/pipes/private
+	keepdir /var/lib/sss/pubconf/krb5.include.d
+	keepdir /var/lib/sss/secrets
+	keepdir /var/log/sssd
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+multilib_src_test() {
+	default
+}
+
+pkg_postinst(){
+	elog "You must set up sssd.conf (default installed into /etc/sssd)"
+	elog "and (optionally) configuration in /etc/pam.d in order to use SSSD"
+	elog "features. Please see howto in	http://fedorahosted.org/sssd/wiki/HOWTO_Configure_1_0_2"
+}
diff --git a/sys-auth/ykpers/Manifest b/sys-auth/ykpers/Manifest
index bc2e4326a526..ba03bf5c5040 100644
--- a/sys-auth/ykpers/Manifest
+++ b/sys-auth/ykpers/Manifest
@@ -1,5 +1,7 @@
 DIST ykpers-1.18.0.tar.gz 124932 BLAKE2B 48e7045429081c1e577ca560b3a10a4cc380820add40526dbb2a8e0fe347eae79c1dff8335c5363148da55cb374e193230ecb6273b08566ef94959848ceb848e SHA512 d636fcabf94a3fb48841572b7b0f03a12a3b3243b11ed7377654d01c33c7282dc321ee13b13c1ee3f2a49fc5015e326a96ef5bc1594b8592d07c1e5aa0521d20
 DIST ykpers-1.18.1.tar.gz 125397 BLAKE2B 7393373414f9f2f9474408c86b8abba0f2034f5908ab8c14fd1dbf9acab40994b43b19031a58f5e889acaf289869b82bd429199237da173e3fa19154b4424374 SHA512 faf9c98fc41a64ae17e2002cd22e89fa2f51de9941aa6eb10c49aa78fd2e2867a5d47fc91fd91ab8e916117cba08629f3f1b076d91698ac2fee6e43366d948a8
+DIST ykpers-1.19.0.tar.gz 125960 BLAKE2B 8b0ce106ec0c6e390f13e960f26d64bf17e4f481f8bf4cdfb29f050bdbcc9f73750993caa00c46f6bc0c59a8cef0891d2d4fa97cea96084b0c9a762adfc3f81a SHA512 413f81325782f0d71501d3dbf5aaaf646bd5dc02d87308a7f650044dfe860dc13b7cef11afa8794df3049c729e10da33ffad86e3f148ac429ee64685bf0fe56e
 EBUILD ykpers-1.18.0.ebuild 937 BLAKE2B ea45c65f0927b0a6c810b90c5662505f68f85e78eeb6aa1f0be6a83ffe13c3237d46aef84614da11321cdf02224629a2344413f1f5d8880fd0cbeb9db660cb5a SHA512 8313c2c13adeacf11427cfa6dfd8455f141ac5d992a3bd418731867e3d599a946edb02e0b9cfc319ceef9506c4e6e60ee75b46ce78f8a5f3c0925cab9a9f348c
 EBUILD ykpers-1.18.1.ebuild 981 BLAKE2B af4f36e8d758a125997188c48e16083d3d45cc66334fdc3330dafa175ee552ebbf0a4a88a78c598e6f00b6d12097f7295d874381fcd653c3e0f60d209fe32beb SHA512 b118dd9c1897a434460ca12f3887868c7240eaa5c81035e3f6101300f4519267802aae1f6882e3a24b5a40e669031697635fb87ad8caa1ea35262b93665b0e3f
+EBUILD ykpers-1.19.0.ebuild 995 BLAKE2B 5efa3e2d974e0597b8963765ba3f465d6b38f22dfcf768e519db0811262ff3324b8fe981ad1ce2b8cfe3fbd02f82eff541b6bab390b3d56eaa64efc22b0015fd SHA512 67bf2d37f0356580900f6cdd87dd60a16998dcd0d6645a4a79586e9d539ae895b41f6adde50117fde4119f3ed82a919e3a2fd98cb88b33b2e2b33cfb5f375e85
 MISC metadata.xml 632 BLAKE2B b03dff691e31f6d0ff188f1e10156140f0b9d5a91993be3be01f291e5edb75a0e8776a550ad3a66ac0244c402bbb40aa9e7948307d498d05d5c8d6b9b1997c4a SHA512 1cb1ba38e29077530438a94c0a2c4e6724abc4b8e3f946466d141497495b6f316094c5f6d2313e260b163c979f65a777570de03a7630c2908a085ce5da34580b
diff --git a/sys-auth/ykpers/ykpers-1.19.0.ebuild b/sys-auth/ykpers/ykpers-1.19.0.ebuild
new file mode 100644
index 000000000000..7bbdcf401e9f
--- /dev/null
+++ b/sys-auth/ykpers/ykpers-1.19.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools udev
+
+DESCRIPTION="Library and tool for personalization of Yubico's YubiKey"
+SRC_URI="https://github.com/Yubico/yubikey-personalization/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/Yubico/yubikey-personalization"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="BSD-2"
+IUSE="static-libs consolekit"
+
+RDEPEND="
+	dev-libs/json-c
+	>=sys-auth/libyubikey-1.6
+	virtual/libusb:1"
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+	consolekit? ( sys-auth/consolekit[acl] )"
+
+S="${WORKDIR}/yubikey-personalization-${PV}"
+
+DOCS=( doc/. AUTHORS NEWS README )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		--localstatedir=/var \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	use consolekit && udev_dorules *.rules
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/sys-auth/yubico-piv-tool/Manifest b/sys-auth/yubico-piv-tool/Manifest
index 6b5740eba44a..c91aba3a2a11 100644
--- a/sys-auth/yubico-piv-tool/Manifest
+++ b/sys-auth/yubico-piv-tool/Manifest
@@ -1,6 +1,8 @@
 AUX yubico-piv-tool-1.5.0-openssl110.patch 5114 BLAKE2B f21851a171dc94a7862b47d094d25e1c39aa874c62c8753b5b6d6f01dbcecfe2db7b94322a9e8326fe66f6c800199e407a964a4cdf3a2dca7e5fb88fa83e4290 SHA512 d7561f1d9e0cc2f1ffae2ae46ad140ac63ee77daac0e0fc8c4e975678e3abe33c9ac2181ce7c1e237ebbd54511ecd65271f463fec55672e6e904c2edafd97b0e
 DIST yubico-piv-tool-1.4.4.tar.gz 109397 BLAKE2B ed1299508cd5f90c662a184527ae696e7cd463b0e8d327413c8acff47d41de7393570798b9582e845262afb1780e0c759246980051a62335d7033de913147bb9 SHA512 3edc341fdbeeacfbf541adc37d0bd2b1df9777ca04e13bc1825e99a151008213b816ff811e83e623f52eb1400a8146c36a5a874fc5e26a89c9398e79a0e234e1
 DIST yubico-piv-tool-1.5.0.tar.gz 179092 BLAKE2B d15eed89699989ff545f18cf54fd42349fc81862e7bb3e182fad59d0604cc9729dedcc4aaa40d3f28c1d40b78ddbb5ed073c107cb233d0fa66a17a2ef1e29d68 SHA512 10d7f7a2f163e5f61d6f7463f2124d06213506bff39f3fe0c5b361f90f8bc372de97ab1fa8d6bfcb77659f086d71f8ff536a064ee8f300a620b929ee76e8f8b9
+DIST yubico-piv-tool-1.6.2.tar.gz 182957 BLAKE2B 0ca9bdcda68f7ee100078604854caccc5141ab01e40f894ae36c3175afa3989c1d0074ef0994e1e369d67499a9778e22f0c5a3cf930d1ba162b0ee0ddbc05f91 SHA512 fc72b9d381f10b63c8958b6c90c1ee97e3ef6b5fb283a9513e6f2ace972710c2872903f38350d9e4a3576b16cb0890b067dd55f5c125f443d353df3f628a9f96
 EBUILD yubico-piv-tool-1.4.4.ebuild 647 BLAKE2B 527ff9328cdc01228974aaa7b4f846ec22aea8dc1b7b63078784a6100293db1b4c0992558fb26fd9b33f5b7f72404e06a675141b11fd785919d5a981362af184 SHA512 96360ad999f9f1af146b2ea6f2795791221f8b0803b4f6de2accd20d03e2bf5b1b8091cf00cdb05aea52995664bdafabe3a3bbf695f909de85d44ec9d8e3a0ac
 EBUILD yubico-piv-tool-1.5.0.ebuild 1012 BLAKE2B 9f43dc92c0d0cdac06620494838a5f555d9bf7236289f48ed12a71a4579206202e0df3c471a88a2ac4fe1f680072b80ba13efb582f50826278174e36f679a672 SHA512 16de41a9380636e55add90752abc9cace3364607cfc6f4dac90fa3d11e5b59c7d28e8bdf14d702ec4216f324695ce96bb6a9eb0829dd1d8d45b48385e45727d2
+EBUILD yubico-piv-tool-1.6.2.ebuild 960 BLAKE2B 73eafe198e477a1d1cc0e5e49546c9fc4ee90f50359259e6715e63756ac21c2cbcca5aca0553f4109e0115cc43ff1080a5368cef7b4ac412676dad88e55e8c35 SHA512 007572085768d401170351ee740ff5fcbdfb18648ab889ed4ac3d5cbcfeeecb0cfe77451e6ac4a8da931e127375f17390abe95b465b954d3576d69ae526eb027
 MISC metadata.xml 254 BLAKE2B 469b2f4552e9db14cd35556a77359913ea2470137cd26ae2ecc0dd253c155a1e3bd04d19d16a8588c7e72b85057da2f3d62c5ca093992f121d9a32835f1b5ed4 SHA512 b30ec6f0a6c90d7e5d21552c23b34d6326e29fed03c766edf9da7a2a0848edbf694c0fca4fbb81cf291e607cd5de342b9e2f59a3ea5cf27e5b50d6dc2384e8b1
diff --git a/sys-auth/yubico-piv-tool/yubico-piv-tool-1.6.2.ebuild b/sys-auth/yubico-piv-tool/yubico-piv-tool-1.6.2.ebuild
new file mode 100644
index 000000000000..5bbb1bafd01d
--- /dev/null
+++ b/sys-auth/yubico-piv-tool/yubico-piv-tool-1.6.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Command line tool for the YubiKey PIV application"
+SRC_URI="https://github.com/Yubico/yubico-piv-tool/archive/yubico-piv-tool-${PV}.tar.gz"
+HOMEPAGE="https://developers.yubico.com/yubico-piv-tool/ https://github.com/Yubico/yubico-piv-tool"
+
+LICENSE="BSD-2"
+SLOT="0/1"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+	dev-libs/openssl:0=[-bindist]
+	sys-apps/pcsc-lite
+"
+DEPEND="${RDEPEND}
+	dev-util/gengetopt
+	sys-apps/help2man
+	virtual/pkgconfig
+	test? ( dev-libs/check )
+"
+
+S=${WORKDIR}/${PN}-${P}
+
+src_prepare() {
+	default
+
+	if ! use test; then
+		sed -i -e "/PKG_CHECK_MODULES(\[CHECK/d" configure.ac || die
+		sed -i -e "s/@CHECK_CFLAGS@//" -e "s/@CHECK_LIBS@//" */*/Makefile.am || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	rm "${D}"/usr/$(get_libdir)/*.la || die
+}
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 150b2ca9cdf2..93039853311d 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/zram-init/Manifest b/sys-block/zram-init/Manifest
index a5211c09da6d..4e96979376e6 100644
--- a/sys-block/zram-init/Manifest
+++ b/sys-block/zram-init/Manifest
@@ -1,5 +1,5 @@
 DIST zram-init-3.8.tar.gz 6619 BLAKE2B c22482a619e5b0137c2d3eb45babee82ff36778a32caaed959beaf6ed3683e0010ef42328f8c4db7956696ca9c6a80c9e676c9db7d533f7283832036203beb34 SHA512 c083f34bba6031f8e247f61a1451343e14cc4bc5c4731ad3a32a5f0eea265936a83b27ad0e3cbd2ba0e05e2bec1e6ae739b6e4149d120dafbcc057437188f07f
 DIST zram-init-7.1.tar.gz 9054 BLAKE2B 70c1aee839db3c4599fa59a0ecda7bb7a905a18cbbd90872865f266364da0602bd6ada85c35d7da5f8e6f4c6f9da122abf01abd57080a0728d4314fc2ed03c0d SHA512 6a9a6568d1c439f941401cb5638645a034a3cb29aaafa0d7595ad19fe7c50296e72c6751393eaa5cd8877b0d2bd0376339fb0f596c9517f9b17d425cc9c5ed53
 EBUILD zram-init-3.8.ebuild 1151 BLAKE2B e183bed4112e7b6808fdf1f62725d5be30d0c79a47955ee507c897142887c12897c6ccf2b4868d67fd41c823badfb30ce62c76678b3c6466ff8f45802e00eaa4 SHA512 7e7054291226d0576c56225508c60fcc0f4be6cfc96c8c01c50928d314edac1b79b5a2acfca532b3509c317ddc633fde2578d3a9afbd4050dce17d36828bf85a
-EBUILD zram-init-7.1-r1.ebuild 1213 BLAKE2B 80858d6790b463261b622bdf31d29f8f159665f1e5196a380c7b31a2782e33e2d12cea97df7e5e7928fcd3d5920035f2240a06fa76773402a7206759875b23f3 SHA512 cbd41b4bf29c8fda5b3c56bea4a81d780d06ad121db441809536b0fe7f183fa294c102710487b9982da7c5aed8a43a977d6924282b698799794259e7ed872d1f
+EBUILD zram-init-7.1-r1.ebuild 1211 BLAKE2B 53c600cabe84fbd83fffc3c03997579ed88f81fd7d45b470ca589373c738a78e51dedc2a3272600318b7b59c0eb4b7d357c654a4293cccefa404ed28a0cc0025 SHA512 d20801a96ba8db1aa04abe7703c57a2fd71d165a2dec6a4ef2352b8663d248f71503457f22c3ce06dcea0f953438ff44b0fc54d5da1417da5475227cf0f033f7
 MISC metadata.xml 328 BLAKE2B 844b8904dd7452f6d78ba5322008aeedcb1cfbc25447320b37cc3a7e810d6725af9399150aaffa1d0b17b6c531e65d2ac5b37a90db7201c99a8d20f7fbfc2d90 SHA512 9f64f5788512ad221a6921fbf60a1cc4c1cab6e0a42e0fddb0f9642b4a1139d366bbe95a6aac5d6bc34f4a223801f3b58fb66290700700cff5b1f3e50c6b5e43
diff --git a/sys-block/zram-init/zram-init-7.1-r1.ebuild b/sys-block/zram-init/zram-init-7.1-r1.ebuild
index e3dedd90a01c..14b7900f485c 100644
--- a/sys-block/zram-init/zram-init-7.1-r1.ebuild
+++ b/sys-block/zram-init/zram-init-7.1-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND=">=app-shells/push-2.0
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 63fb802b879d..d52935938a5b 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/elilo/Manifest b/sys-boot/elilo/Manifest
index 4128ede5c71a..7c5e799b7f44 100644
--- a/sys-boot/elilo/Manifest
+++ b/sys-boot/elilo/Manifest
@@ -1,5 +1,6 @@
 AUX elilo-3.16-elilo-loop.patch 299 BLAKE2B 5fe27b5b89d18adace762e2691854140437c5d33281d8b4e6573303b9d80913fa59283ae231213dda985dc9751c019db0a070e77284c56ed3871d799897b3c69 SHA512 6480d3e9403bc54b4a923e77df049eeb42929020f222450e32c12d4dcb09b098aa52924be0ebdda95e01ee8d0ced624ec96c3977cc1213b66dc5a8639797bc20
 AUX elilo-3.16-gnu-efi-3.0.6-ia64.patch 3796 BLAKE2B 9008b004b24b390f46d6b05cf9e9ae0627d4ed930b9965d0295e700ea0c7617f2ac3e1da0b583ab931e8a7bffc0bf8452eb19318d7d1d256a5d4781cde4e710e SHA512 c2ec3ba0d2f5ee3447363a44d9d7863eb323095c40f72243241f608437fd9e2b17ee603666a1103f14a0c66cae025e8f9be09c27d8fb57554f480209a02f39e5
+AUX elilo-3.16-strncpy-clash.patch 744 BLAKE2B 421530303406aa819e07883d4b80a27da20844929d0f1749e121b2e05cf8eda2af082ad8c02476cabf864258133964b0fb02ab3ed9969202fe62392718e7e047 SHA512 4cb593ac6b56bbe63b1ff632d00ef1192dc28c9a5af355e740b9ee41697fb48766ccb678636c66ecdb05d7cdf8d16b0a14d99e0347022bbe1cb6ec9be09bfcf8
 AUX elilo.conf.sample 150 BLAKE2B d823113e1fcdaf08398f09b6fe9b4b2284004be2886799a69fd776bfaab194413c51969c65d1d81607c0a46699e84132b88bdd2a82f6f41a65ae6fbb061d9356 SHA512 3f99527724759f5c03a5f244b957bc6d50ca378f2b66cbcb19f73fa721d2fd76119ae90669e4cce045f5bc66a80d46b21e76e8c4895d23b22df23ec69262b0e0
 AUX elilo.sh-chkspace.patch 833 BLAKE2B 72d99e45c6deff5262ea02bc8417e77e9e1158e5ef921d142f6ea941fc2c2da1b9f3624bd1e9ca6f9debe63f174d0ee55536bd295706c59dc197227739c03316 SHA512 063131fd53866e717d87a4ca23e5f4143cb166480d89312bbf9f5be9540e29930794657f1eb2709559435abceb415b7775e049a1f8d410ae5007dc967fbf9224
 AUX elilo.sh-vmm.patch 2099 BLAKE2B 8bfca9c76e9dc5232e3602013103dc3e26bc29f880287f1204d429878b0e13cc95ff005934bbf06c9f848cd8c7d7a0162e52c827e1ceaa8809d28864e16712ca SHA512 2bbeca88b38790b3821e4ba54c46d194fbb776cf56788634e91da91e028fedb81a38928d0dbbb503cdf1a047c281800aea1d56a2eae47953dbc2203d795862cc
@@ -15,6 +16,7 @@ EBUILD elilo-3.10.ebuild 1889 BLAKE2B a244e16b853675851ebca1ec3610cf42ee7a5b1661
 EBUILD elilo-3.12.ebuild 1883 BLAKE2B 929411191803ac913ce5eb3fe343c830ad9532713c484d1d589f2b1a6c549d9de817087dce01b89333ee364861719312b8d0d4dc8e7f0e3ddd96207b947d917a SHA512 5a2f73187dc2c70d5742b2a9e0d18d4d17af029c2621f0171945a5466b47f13b1c07b1dc61f357fecce46e5fce8341c2aeb597e15a2e24cbacaf534f39a68c9b
 EBUILD elilo-3.16-r1.ebuild 2022 BLAKE2B 2b7e34a158bbb348c1468d1e79bfccf885f8479f0d209a36e1f9fff334d52fb5eadbb98082ad75b44e5cae50bc2909fb710aab42fee9f54a7c9e73be7e7faa9f SHA512 428ff3638702d11ff93a19c6b3aeca9c9dab556773a6b6a6b3632ed240ae64a3c6269e48f1466dbaf58ebc23c2eb340cbd98c50b0f7a5b45c3224a17b7ed4110
 EBUILD elilo-3.16-r2.ebuild 2072 BLAKE2B 8f3719a94e45a0e7c49304b1ff2c8bfc1727c8256eaf4b11aa4b5e0dacb4caefe9ddb685da60597e4aa1bd2eaf88e18f2c05380e79b72136ee14cacf3a854fdf SHA512 a6be44876a80bd87401bbab2e69edc53b7dd4c1da05c207c8f9a18240cf5c33cb674ee9017658dc17c4b83f4bec26a30088293d084826b813ed187a5a2a61a01
+EBUILD elilo-3.16-r3.ebuild 2116 BLAKE2B 1bd70b5de2b47767160c9296d7b7dc728441860d392a5056f2b6aa183b644b196093f9b43baf0eca5145f5d0552fec672e65f6b113c6614fc01da2c886dc61d8 SHA512 3df96916f9651460544450d280a66c0d78f402f197af5b2b2c39d1364abd295a5f8566d8cd9c00eea2a9b3222415aec512039f2df1c1fcc1f16fbd6f752a6c5b
 EBUILD elilo-3.16.ebuild 2032 BLAKE2B 12c7a08970bcb568944607fb6f9066d6b4bd19dda8a956f0f98480ddae577dab1cba0566b39c4214fd50b618c6df6d797957cafa7f40ccc1d70540dd7d642f3b SHA512 3eefb2956ce6cd1f5322c7ef537fb04fb9518ffb294361c0a449154adf11729ec7999167754cd034cfcbadb16616324c6866f8356e72e73e4aaf52a4e4f77398
 EBUILD elilo-3.6_p20060314.ebuild 2298 BLAKE2B 6ecc279508387df95baf7f32f155a1c33f7307ed58be58616450c4c936a50c42d1510c1801a5e2573c2a0d7570bbe3b4ee608beee4a3242f4e4c31fd2f70d6cd SHA512 0c7d728b8bdf326f9a1597e73d024f1f3069c301bfe09bedddc02cd4ef395d01ccedcf999ae3327065869c84e482b7f0f028284f48a0af70ea76622c73e2225e
 MISC metadata.xml 337 BLAKE2B 7c9b3e56e9680252631db0691b3acfc2a2cbfee80c42af709979085124a35bb9d184e58de3ef4f88b2f3e6cc873b4ef2bd285ce3fc2645aaa9ae869c3b729d87 SHA512 13691bef927bf7f8a4a6d0640d38dabb53fdae1d8bd986c5fe73c1643e2bdbaaac50bfe864e2185a584fa6265a3197afc5273b60b70675481cef61706dde8d87
diff --git a/sys-boot/elilo/elilo-3.16-r3.ebuild b/sys-boot/elilo/elilo-3.16-r3.ebuild
new file mode 100644
index 000000000000..de13af20f9a2
--- /dev/null
+++ b/sys-boot/elilo/elilo-3.16-r3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs eutils multilib
+
+DESCRIPTION="Linux boot loader for EFI-based systems such as IA-64"
+HOMEPAGE="https://sourceforge.net/projects/elilo/"
+SRC_URI="mirror://sourceforge/elilo/${P}-all.tar.gz
+	mirror://debian/pool/main/e/elilo/elilo_3.14-3.debian.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE=""
+
+# gnu-efi contains only static libs, so there's no run-time dep on it
+DEPEND=">=sys-boot/gnu-efi-3.0g
+	dev-util/patchutils"
+# dosfstools[compat] to enable 'dosfsck' symlink
+RDEPEND="sys-boot/efibootmgr
+	sys-fs/dosfstools[compat]"
+
+S="${WORKDIR}/${P}-source"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.16-elilo-loop.patch #299665
+	"${FILESDIR}"/${PN}-3.16-gnu-efi-3.0.6-ia64.patch
+	"${FILESDIR}"/${PN}-3.16-strncpy-clash.patch
+)
+
+src_unpack() {
+	unpack ${A} ./${P}-source.tar.gz
+	mv debian "${S}"/ || die
+}
+
+src_prepare() {
+	default
+
+	case $(tc-arch) in
+	ia64)  iarch=ia64 ;;
+	x86)   iarch=ia32 ;;
+	amd64) iarch=x86_64 ;;
+	*)     die "unknown architecture: $(tc-arch)" ;;
+	esac
+
+	# Now Gentooize it.
+	sed -i \
+		-e '1s:/bin/sh:/bin/bash:' \
+		-e "s:##VERSION##:${PV}:" \
+		-e 's:Debian GNU/:Gentoo :g' \
+		-e 's:Debian:Gentoo:g' \
+		-e 's:debian:gentoo:g' \
+		-e "s:dpkg --print-architecture:echo ${iarch}:" \
+		debian/elilo.sh || die
+}
+
+src_compile() {
+	# "prefix" on the next line specifies where to find gcc, as, ld,
+	# etc.  It's not the usual meaning of "prefix".  By blanking it we
+	# allow PATH to be searched.
+	local libdir="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
+	emake -j1 \
+		prefix= \
+		AS="$(tc-getAS)" \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getLD)" \
+		HOSTARCH=${iarch} \
+		ARCH=${iarch} \
+		EFIINC="${SYSROOT}${EPREFIX}/usr/include/efi" \
+		GNUEFILIB="${libdir}" \
+		EFILIB="${libdir}" \
+		EFICRT0="${libdir}"
+}
+
+src_install() {
+	exeinto /usr/lib/elilo
+	doexe elilo.efi
+
+	newsbin debian/elilo.sh elilo
+	dosbin tools/eliloalt
+
+	insinto /etc
+	newins "${FILESDIR}"/elilo.conf.sample elilo.conf
+
+	dodoc docs/* "${FILESDIR}"/elilo.conf.sample
+	doman debian/*.[0-9]
+}
diff --git a/sys-boot/elilo/files/elilo-3.16-strncpy-clash.patch b/sys-boot/elilo/files/elilo-3.16-strncpy-clash.patch
new file mode 100644
index 000000000000..fb2f6878be03
--- /dev/null
+++ b/sys-boot/elilo/files/elilo-3.16-strncpy-clash.patch
@@ -0,0 +1,23 @@
+gnu-efi-3.0.8 added StrnCpy. This caused conflict with elilo's definition:
+  ./../fs/../strops.h:30:16: error: conflicting types for 'StrnCpy'
+  extern CHAR16 *StrnCpy(OUT CHAR16 *dst, IN const CHAR16 *src, UINTN count);
+                  ^~~~~~~
+
+Work it around by always using private copy.
+
+Reported-by: Bill Glessner
+--- a/strops.h
++++ b/strops.h
+@@ -29,3 +29,4 @@
+ extern CHAR16 *StrChr(IN const CHAR16 *s, const CHAR16 c);
++#define StrnCpy elilo_StrnCpy
+ extern CHAR16 *StrnCpy(OUT CHAR16 *dst, IN const CHAR16 *src, UINTN count);
+ extern CHAR8 *StrnXCpy(OUT CHAR8 *dst, IN const CHAR16 *src, UINTN count);
+--- a/strops.c
++++ b/strops.c
+@@ -27,4 +27,6 @@
+ #include <efilib.h>
+ 
++#include "strops.h"
++
+ //#define CHAR_NULL    (CHAR16)'\0'
diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest
index 527f0572a4d9..da13294058de 100644
--- a/sys-boot/systemd-boot/Manifest
+++ b/sys-boot/systemd-boot/Manifest
@@ -1,6 +1,7 @@
 AUX 233-Force-libsystemd-shared-to-be-static.patch 601 BLAKE2B 2473eb2d2a355e468a7d994637ae10f22f08001b57e5e05ccef7636754ca448f46513fc33a54e8349b7444676bad6c0f03f5f7943f37a65e914efbb27f4ed321 SHA512 05e666114764a97d20bf115e1b114035fc882b101ad01bde8864a31385886e0711e4b37e03d713052aa985503cf7a94eeb5d28c33cc4a504cbb4fc263998d4e1
 AUX 235-libshared-static.patch 968 BLAKE2B 8979c8fa294d1dc3a0356e32ff1a6d15bd3b3a93d5f9bacbbd137bbc38931ae5ec383ecc9ca237e62b80353ac36cd1c0b8df96ff1afd86e1a43c2601574fae01 SHA512 b37a097a14a455f91e1f1f2b00782aa5f1af4e201bbc9c2ebd69b4bb426cabc9d169733f70e09caf8fa36ae62f3eb44d5f7b805bb242310d18c94230f18835ee
 AUX 237-libshared-static.patch 659 BLAKE2B f97c3c4e9d6ef3da674bc74fce8326d18fe1ebd4008e0929f1362ef0c2e854a67c8786c0b4ce9b29aee2b4409c54c668429f61e3c4ab85844d72c3d060b41925 SHA512 79cd97a176c91c76b512bce5f30605d673fb5480921cc76e221da9e78a8f7caec802efb481f8811c7aefba2901d007e340ba032a07a53e907f77e4bbd52169a7
+AUX 239-debug-extra.patch 1641 BLAKE2B 37dae0aa6fb95be3f6b7ad5647ddc7e6e7cf6654e0119c5a41280a0db630d13746d5aaa0d1de8e66f49525a0b5a25f4f1136e0b8edc27e628cc82b386f5c0759 SHA512 091f4a0a6d8f4f5963002f33ebafa36f00f7635caafa14ac618ed7c5e08538cffbe655930802e14a0f744851ed7acacc217d2ad7e625627eeb82e14cc3fabd4a
 DIST systemd-233.tar.gz 4660737 BLAKE2B 38cdd74543447b3c02391b328428fed169fe2cf2df6e9341dcaf2f7d3d977612ec102301e144c1cada90d61e9e9bda3b2faaef708c8ff4bd0b52b143760a83b2 SHA512 5ad5329ea116d973cf67096f7e7ad28e9ea0905696e9451291f1d25e5064f4a9bfcfae87e912996c6a38397e9f4a148d4ccecfa9b70f7ecdf04deadb61784c8e
 DIST systemd-235.tar.gz 6586406 BLAKE2B f2e46a6c51fc9445800c4b7eee66f23ae83b42c2fedf2304acf612e6cb99122afe67f1b93cf72ed022b52384975afb92ab38cfb4efc6026384602c973d2eb98e SHA512 243f2eb5340fa37dd1286eaa63e83387bda9e03953af266cd6196a37535a13491482caf14c6ab10608bba4ed23b6c41923608e52017e0c26988ed72ddd2b9993
 DIST systemd-237.tar.gz 6871350 BLAKE2B 4734a110a297fbbd6679bced6302fcdca55ab5d4207905e8dee9f5545f1de841d5adeaa4fd89961b9e63709d04b5c862b8bc81481311cf8e72ee327e459c9d91 SHA512 15ef4b92815a6dd9a6c51672dbc00fd7cd0f08068ef0cbeaca574f68d330b28bc67ba1946f24f75ef3d9e7b63843a73eea700db54688061dbf5c9f8470394c3b
@@ -8,5 +9,5 @@ DIST systemd-239.tar.gz 7157293 BLAKE2B 975f6215c8bb6662d6e161f637e1fece22930c01
 EBUILD systemd-boot-233.ebuild 2118 BLAKE2B 02b1df09cf96432b865586699bc0c4da4d3bc064182ac5f55a6e16e3f24691467d8e7fec65d0c658a535dab7b79112cba645c81077772d398a6a963c06be4c0b SHA512 aa7f7259549b397403b7a539015f1435c47e2933d0f67c68e0a633393fc64ac4bb0fac99d7860d400e9da8f68dbc8235340426ceab715e51f4881fbc991ecfa8
 EBUILD systemd-boot-235.ebuild 2274 BLAKE2B 20cae085bbeabfd265d84c16cc80fa9a162cc9d46776984206e04c368697015a6eb4bdb2e16dca2b137417b3ef51ca02f4a368e7c118bb7ce92ccc436e06c290 SHA512 c016caa2373bd5b5893e7db7d0044c71dbed1d7393a8ac42252e2420e8e554624defd644e6d0a8e1ca32e52496b0e674a09c6feb98232293e19b05b2c890e39d
 EBUILD systemd-boot-237.ebuild 2326 BLAKE2B 0525544b11bfe923ea0a9d75f0a3c2dc6af19cda15ee5c5d9855478533a83694e22ab77b8fd8efce7ae54b97b539b3343f9f238fc22633d984acd3939310d5f9 SHA512 f942a34573f78249a0ddc40ab927cf7acf88ded00420a4a3048b8b0ce66b11b75450fb3b1bd9ff914a9d9c9b8e5dbe07e75ff0c263a620b03e31ece738d80df1
-EBUILD systemd-boot-239.ebuild 2326 BLAKE2B 0525544b11bfe923ea0a9d75f0a3c2dc6af19cda15ee5c5d9855478533a83694e22ab77b8fd8efce7ae54b97b539b3343f9f238fc22633d984acd3939310d5f9 SHA512 f942a34573f78249a0ddc40ab927cf7acf88ded00420a4a3048b8b0ce66b11b75450fb3b1bd9ff914a9d9c9b8e5dbe07e75ff0c263a620b03e31ece738d80df1
+EBUILD systemd-boot-239.ebuild 2360 BLAKE2B 255bb3335539490af4f09e1d372900794255f70d6cbae2a6adba257b5221a6f41291146b3f75cbcdf63737a0ddfa8466c357fb4d75707adbaec2a69acaa2a996 SHA512 3e58b2e39ff984ba133c2e2d51d87904d43670ab8375a50518dfd0cb4014309b26205fdcadbbb6fa06a175a95237f987cb1fcb3d1dd2dbd836969eb20f5a9d4e
 MISC metadata.xml 326 BLAKE2B f33138d9048d3a13295360f070b8d610a22909f99ee0127d3138bc1e0a066fc4590f580c4cd8fd539d5c86efc005b4662eb0dddeb085469719d0aa951c36af9a SHA512 7d33f5273a066af06b319d04f9a01c2d8f14a6de2102cf77918d7abdf6846fd0b271f5c5adb503354f93402eb341af280853f20dbb673264196c552aa24eb6fe
diff --git a/sys-boot/systemd-boot/files/239-debug-extra.patch b/sys-boot/systemd-boot/files/239-debug-extra.patch
new file mode 100644
index 000000000000..19db590257cf
--- /dev/null
+++ b/sys-boot/systemd-boot/files/239-debug-extra.patch
@@ -0,0 +1,40 @@
+From 8f6b442a78d0b485f044742ad90b2e8271b4e68e 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 #9883.
+---
+ meson.build       | 2 +-
+ meson_options.txt | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index f79ac4b12e7..2209c935ad6 100644
+--- a/meson.build
++++ b/meson.build
+@@ -763,7 +763,7 @@ substs.set('DEBUGTTY', get_option('debug-tty'))
+ 
+ enable_debug_hashmap = false
+ enable_debug_mmap_cache = false
+-foreach name : get_option('debug')
++foreach name : get_option('debug-extra')
+         if name == 'hashmap'
+                 enable_debug_hashmap = true
+         elif name == 'mmap-cache'
+diff --git a/meson_options.txt b/meson_options.txt
+index e3140c8c110..7b1f61bf464 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -45,7 +45,7 @@ option('debug-shell', type : 'string', value : '/bin/sh',
+        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 : 'array', choices : ['hashmap', 'mmap-cache'], value : [],
++option('debug-extra', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [],
+        description : 'enable extra debugging')
+ option('memory-accounting-default', type : 'boolean',
+        description : 'enable MemoryAccounting= by default')
diff --git a/sys-boot/systemd-boot/systemd-boot-239.ebuild b/sys-boot/systemd-boot/systemd-boot-239.ebuild
index 48d61ac38b29..4eb8570b73cc 100644
--- a/sys-boot/systemd-boot/systemd-boot-239.ebuild
+++ b/sys-boot/systemd-boot/systemd-boot-239.ebuild
@@ -1,4 +1,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,6 +37,7 @@ S="${WORKDIR}/systemd-${PV}"
 
 PATCHES=(
 	"${FILESDIR}/237-libshared-static.patch"
+	"${FILESDIR}/239-debug-extra.patch"
 )
 
 src_configure() {
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 3cb9d952a63b..01b204193b34 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest
index 9790bb75b0b1..6077bb02338c 100644
--- a/sys-cluster/charliecloud/Manifest
+++ b/sys-cluster/charliecloud/Manifest
@@ -1,6 +1,6 @@
-DIST charliecloud-0.2.4.tar.gz 178589 BLAKE2B 45330f67e4b116150219a2753f341248878e8fa540583a97c5cd55e42498825e749c5ca9133580c180438898e25dd22bbcec37c31c31258ccf1fa0ffb5814375 SHA512 456b45d071a18562d914e70b141de55950fcf4a5e2aa882b85bdd8c4abab3a62ab1e413c0524a31be2e278328aab67a898f319bd640e9d9a84163efe24e5a872
 DIST charliecloud-0.9.1.tar.gz 194937 BLAKE2B 2ef2ee70cee3293ec4f7f589c9a034afa82835981132ea433d720b2a2750df68adb261540c98bc04e7f8904375dd8804819fb3015dc6e65bbe097fa55d558976 SHA512 6a54912ceb3ea99e9d3d1fa8469d7288df0b71872c6cb1d5a4d324f6f84754b7e4804ec1a3c2a30e7dd6377a3b474fea849eb42014f3599ad27a3f6214642a2b
-EBUILD charliecloud-0.2.4.ebuild 1505 BLAKE2B 6b84d37c066ef552272760ab0e635d23dfaaee7db75b462e42da32699580f08940c75362de64c5d864cb3e88d5751f75386ed2ce68982ae59adcd46ea7c8c01d SHA512 80edeab864fc47f0f634edafa4bcf3c9ceed3e9ad4451f48974ed2a3c5a9cc432b5b1fe7c2391e88f2de74c94016ca3788cc40e58408a0a7491217052621a7da
+DIST charliecloud-0.9.3.tar.gz 200507 BLAKE2B debd06bd6158a473d07618bc8fd9ae8c431212eef87699cdd412cf29390e25f6f9e596ac93eb0d663c47ca0b8243cfbcbfc634066f6de03bb673488471e7ef01 SHA512 d312a583438d579ef4ddd6b1d78cc2c6b32e352dad99dcff93f7e0a346aa11fa534091ad6446217bc6fe0dc6d7299d99ffb2c7bb1a441353fd9b2f118ead2c80
 EBUILD charliecloud-0.9.1.ebuild 1505 BLAKE2B 6b84d37c066ef552272760ab0e635d23dfaaee7db75b462e42da32699580f08940c75362de64c5d864cb3e88d5751f75386ed2ce68982ae59adcd46ea7c8c01d SHA512 80edeab864fc47f0f634edafa4bcf3c9ceed3e9ad4451f48974ed2a3c5a9cc432b5b1fe7c2391e88f2de74c94016ca3788cc40e58408a0a7491217052621a7da
+EBUILD charliecloud-0.9.3.ebuild 1505 BLAKE2B 6b84d37c066ef552272760ab0e635d23dfaaee7db75b462e42da32699580f08940c75362de64c5d864cb3e88d5751f75386ed2ce68982ae59adcd46ea7c8c01d SHA512 80edeab864fc47f0f634edafa4bcf3c9ceed3e9ad4451f48974ed2a3c5a9cc432b5b1fe7c2391e88f2de74c94016ca3788cc40e58408a0a7491217052621a7da
 EBUILD charliecloud-9999.ebuild 1505 BLAKE2B 6b84d37c066ef552272760ab0e635d23dfaaee7db75b462e42da32699580f08940c75362de64c5d864cb3e88d5751f75386ed2ce68982ae59adcd46ea7c8c01d SHA512 80edeab864fc47f0f634edafa4bcf3c9ceed3e9ad4451f48974ed2a3c5a9cc432b5b1fe7c2391e88f2de74c94016ca3788cc40e58408a0a7491217052621a7da
 MISC metadata.xml 699 BLAKE2B 778ae447db939c0593dd147ad669e07fe8de217079988f82bd21ca545f1afe8056347173028056a9f0407a72b435dfc021dccbed1d860491712351ae727906b3 SHA512 2b19c7878b104128f537b3b5ab2070a3f643ae536af3f91ab52284aa13ae5752e4e8c012a51fa4261e140154f0c2c49f1aa480b22ace552fdab5067174247515
diff --git a/sys-cluster/charliecloud/charliecloud-0.2.4.ebuild b/sys-cluster/charliecloud/charliecloud-0.9.3.ebuild
index f7d1882d07be..f7d1882d07be 100644
--- a/sys-cluster/charliecloud/charliecloud-0.2.4.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-0.9.3.ebuild
diff --git a/sys-cluster/cluster-glue/Manifest b/sys-cluster/cluster-glue/Manifest
index 82bcd3e7f6e6..3d94e3c73119 100644
--- a/sys-cluster/cluster-glue/Manifest
+++ b/sys-cluster/cluster-glue/Manifest
@@ -2,5 +2,6 @@ AUX heartbeat-logd.init 954 BLAKE2B b00280f93cb0a3f3f8f19d3170472e87d705f91113fc
 DIST glue-1.0.11.tar.bz2 466057 BLAKE2B 929c9f803814fb1162d4058e0fb78deb96b6be9b4064dae96ea5653521f5dfb862850ab2c9010530ac652264c5e8e379cb397fc173f720d126540405b264ca5b SHA512 35ac8ac555c39f24c11e3a768cc50eba051fe617edf4cdc0429dac73f45a472f144cfe6ec5faff575606f2b04ff76a2f732556d848b61410c2683d93ba928413
 DIST glue-1.0.12.tar.bz2 451569 BLAKE2B c074507563e797f105318bfcfab3e73eb1b62eb3037689c2b68f1b98f02b4a2c1da2e0b2931cd28ccc194d9f3b486733f642c6ff071c4f7629062d40c8d39427 SHA512 d5d2f6c426d2bed0d39269338fedfffe840a90ff56b05dff395243d0d8b803593bf35bbce5f7dce376120cd7ddef78400914cb7515b5451c287a1e9e74233122
 EBUILD cluster-glue-1.0.11.ebuild 2191 BLAKE2B b5498424f8ea748d3e3b0e6a36091fccb181ef8a9f04e0173ac8172440a66101958f516f51df822a32f54a7148126d584790ac1ecda9f866c6704d36a9615034 SHA512 f8af50aa16f76e992bde0e57660e5f7de171b3a80de86827a5b70c6406e86e8b52c1ed89f4963e7f1e583a3845bc9fe4fab44224fcf050f22233064506ba4238
+EBUILD cluster-glue-1.0.12-r1.ebuild 2362 BLAKE2B ce64dedf7a8918914df5bd993702b319889ed58eff6d830ad1450ed62f22917ba97dde30a05c58339ea81e0a432b9ba7a9e951feca339f5c97b00b9a20d1ca2b SHA512 25626908d67a837d84cec46d1b9626e9425c38800886e9c7b90b109fabf9a046b29b33815e9077278c68abe4c503dfa6636c227f4cac2002d1b966b54422b386
 EBUILD cluster-glue-1.0.12.ebuild 2209 BLAKE2B acce4fe14e0bec15ab36318002404d9fca7c6eefe7214525409f29aab497cf6c9126dbea8f01c21148caa44c2dc7445ed2196229418e9142bb638a199b685e93 SHA512 ab138ae57b746200dbbf53744389d58c82fe43405fca01dd661a5d64f565e00ce35d3189a5557cec3b79580a9f1df19cbf8e25a78d001a6656a451e580020bc4
-MISC metadata.xml 485 BLAKE2B 0e23a9a25bd6a826ec5f3adfed6b2ce58f8ce240ce13492ef9b64621e2153b8c7fea82e9b8f11926ae9aa02d77b2d9dbdfa26eba125c5d3a28ae15702fce0cee SHA512 b7a28d9474e30b96337ed2222d86e1811e7f0e4eef31ab6dd2d3bd10d3afc18f4b091ad7d49185b9c4a7e82d3be31ab80be5e4cee769d642f0a0eb73e27ea2ae
+MISC metadata.xml 582 BLAKE2B 5792be1499f85328ff85ec074189187e014c2eadf29b4ddaf4a64c71977ccf5ce91d86f251fe90f3540a7cfab8d52145cd5c085199c6e1099df5dbe801fc4291 SHA512 a2312279ff8e3e47db3d1a560699d76233dae3963cc094aefbbe965af053fe4299e95133d5f40aa69a565c91c21ce9d358020726d3c8c590255dcac72901d7e3
diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild
new file mode 100644
index 000000000000..74f9306385af
--- /dev/null
+++ b/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${P/cluster-}"
+inherit autotools eutils flag-o-matic multilib user
+
+DESCRIPTION="Library pack for Heartbeat / Pacemaker"
+HOMEPAGE="http://www.linux-ha.org/wiki/Cluster_Glue"
+SRC_URI="http://hg.linux-ha.org/glue/archive/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="doc ipmilan libnet static-libs"
+
+RDEPEND="
+	!<sys-cluster/heartbeat-3.0
+	app-arch/bzip2
+	app-text/asciidoc
+	app-text/docbook-xml-dtd:4.4
+	dev-libs/glib:2
+	dev-libs/libaio
+	dev-libs/libxml2
+	ipmilan? ( sys-libs/openipmi )
+	libnet? ( net-libs/libnet:1.1 )
+	net-misc/curl
+	net-misc/iputils
+	|| ( net-misc/netkit-telnetd net-misc/telnet-bsd )
+"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+		)"
+
+S="${WORKDIR}/Reusable-Cluster-Components-glue--${MY_P}"
+
+pkg_setup() {
+	enewgroup haclient
+	enewuser  hacluster -1 /dev/null /var/lib/heartbeat haclient
+}
+
+src_prepare() {
+	default
+	sed -e '/ -ggdb/d;/-fstack-protector-all/d' -i configure.ac || die
+	sed -e "s@http://docbook.sourceforge.net/release/xsl/current@/usr/share/sgml/docbook/xsl-stylesheets/@g" \
+		-i doc/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -DOPENIPMI_DEFINE_SELECTOR_T
+	local myopts
+
+	use doc && myopts=" --enable-doc"
+	econf \
+		$(use_enable ipmilan) \
+		$(use_enable libnet) \
+		$(use_enable static-libs static) \
+		--disable-fatal-warnings \
+		--disable-dependency-tracking \
+		--docdir=/usr/share/doc/${PF} \
+		--localstatedir=/var \
+		--with-ocf-root=/usr/$(get_libdir)/ocf \
+		${myopts} \
+		--with-group-id=$(id -g hacluster) \
+		--with-ccmuser-id=$(id -u hacluster) \
+		--with-daemon-user=hacluster --with-daemon-group=haclient
+}
+
+src_install() {
+	default
+
+	dodir /var/lib/heartbeat/cores
+	dodir /var/lib/heartbeat/lrm
+
+	keepdir /var/lib/heartbeat/cores
+	keepdir /var/lib/heartbeat/lrm
+
+	# init.d file
+	cp "${FILESDIR}"/heartbeat-logd.init "${T}/" || die
+	sed -i \
+		-e "s:%libdir%:$(get_libdir):" \
+		"${T}/heartbeat-logd.init" || die
+# 	newinitd "${T}/heartbeat-logd.init" heartbeat-logd || die
+	rm "${D}"/etc/init.d/logd
+
+	use static-libs || find "${D}" -type f -name "*.la" -delete
+}
+
+pkg_postinst() {
+	chown -R hacluster:haclient /var/lib/heartbeat/cores
+	chown -R hacluster:haclient /var/lib/heartbeat/lrm
+}
diff --git a/sys-cluster/cluster-glue/metadata.xml b/sys-cluster/cluster-glue/metadata.xml
index c8788d4ba459..a3716ef230b3 100644
--- a/sys-cluster/cluster-glue/metadata.xml
+++ b/sys-cluster/cluster-glue/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<longdescription>Cluster Glue is a set of libraries, tools and utilities suitable for the Heartbeat/Pacemaker cluster stack.</longdescription>
 	<use>
+		<flag name="ipmilan">Install the ipmilan plugin (requires <pkg>sys-libs/openipmi</pkg>)</flag>
 		<flag name="libnet">Force use of <pkg>net-libs/libnet</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-cluster/minikube/Manifest b/sys-cluster/minikube/Manifest
index 045710a83b9b..7879989e2dbc 100644
--- a/sys-cluster/minikube/Manifest
+++ b/sys-cluster/minikube/Manifest
@@ -6,5 +6,5 @@ EBUILD minikube-0.28.0-r1.ebuild 1396 BLAKE2B 385a36de987144b41ab2fc7595d09d247f
 EBUILD minikube-0.28.0.ebuild 1253 BLAKE2B 90c331c2f4a98e774edc39993b849e370376ecc50d644f4f6a56070617eff8bdce141ae4f9131dd92d492b1b101c2f5f699f9da96d5e3cd04c11d0dd2e428a9e SHA512 d43962f11e8f1566f56663a8553e7e2fee45440a568e0d167654b8eb0e8a12128f2b7a26f3063223f7aa2b6df1f49d9b5da2f55369434bb11a9533b856c05dd5
 EBUILD minikube-0.28.1.ebuild 1491 BLAKE2B b3ad1951a44ebbc52fe1456eea11230a7a6944d27aa1f5d053caa0feb8df37234ab1c4eb22774f0516ae3e23c0e56c89772b6e63a44b7a661e731805a55fc5fe SHA512 057df45317b4f4f7c2d170efce625e30a9c4f9397ee0a5aeca05b4bafc5526882b5a795b0924989f2905f6289b36c4784e29a34bf1295088954ff0681522cd7a
 EBUILD minikube-0.28.2.ebuild 1646 BLAKE2B d18bac524a7a719188d1eb47201053aa75efa283db9e23c6109a6751be38b1e3d34be783e64c68c627be4510b0597a2073ce901ea586095c2ad2396ea7a95c84 SHA512 1e7c472fd74e6e5da75f3670d427988ac6d5a8ec7d4673a9eaa24f05dec02e57464a5d572bc51f312d8c4d1f57efe01d7f3215048eb32b6ce8cbb749f2c74821
-EBUILD minikube-0.29.0.ebuild 1628 BLAKE2B d008e0397b7fc979cce84f7fbf3fc9d6bfcbe4a5ce2e83882c44900d99978deabce1068406a9b5c0799e3105f8420ed6725bf226b23908af30a071d5181c2389 SHA512 38fb71ebc6d0b7385a767f73129da999c0a816f3d6db02242a12dbb847b5ed3a4e149285af53b5e22ffe34bf8be45616dd05eb4f89e7867e621b1de81473612d
+EBUILD minikube-0.29.0.ebuild 1622 BLAKE2B bc9bfd9a6b693bc71719750f01b81a313eabbd4bea23604a939588f06a3783604ae264f49376883b83a8599c5bca2259c4043afa3e1fbf3dfe9fe020467be13a SHA512 41801a7f65a66a4b0a6fbfeefde14b5f32fe09246bd76967ca34c28b56a0008acf0f7ffd6d7705966a83fa3d3e6f89063774b228bef59310e085d4ece9f2a39c
 MISC metadata.xml 394 BLAKE2B ca9fbc7af4a84d99a6d22c00cb28c09747675dc66ef21a43b3011bdccd129df698cacad0375f4ef360de2874d1cf6282834c6b901cd86c6c4dd213f67f006f45 SHA512 0690f97963d432904a0f002273d73ac4d998cde1d2f2fafddc2eeb5d841970b634c58ffa534fd5982a8166a40159164422771baa000566561b4f428ebe818bd8
diff --git a/sys-cluster/minikube/minikube-0.29.0.ebuild b/sys-cluster/minikube/minikube-0.29.0.ebuild
index f55d3182b850..4a324bff4ad4 100644
--- a/sys-cluster/minikube/minikube-0.29.0.ebuild
+++ b/sys-cluster/minikube/minikube-0.29.0.ebuild
@@ -39,7 +39,7 @@ src_compile() {
 src_install() {
 	pushd src/${EGO_PN} || die
 	newbin out/minikube-linux-amd64 minikube
-	dobin $(usex libvirt "out/docker-machine-driver-kvm2" "")
+	use libvirt && dobin out/docker-machine-driver-kvm2
 	dodoc -r docs CHANGELOG.md README.md
 	popd || die
 }
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 5409015cbf87..67cafb4e8f65 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/binutils-hppa64/Manifest b/sys-devel/binutils-hppa64/Manifest
index bbf9dca93251..9e4b094062d5 100644
--- a/sys-devel/binutils-hppa64/Manifest
+++ b/sys-devel/binutils-hppa64/Manifest
@@ -30,6 +30,6 @@ EBUILD binutils-hppa64-2.29.ebuild 650 BLAKE2B d5fe2e9a8c5fc3d906838e6c0621329e0
 EBUILD binutils-hppa64-2.30-r2.ebuild 10688 BLAKE2B 17ad6713868d47398f7a08d4510d0e403ceceb07dd62e6fade49f721f7f3cbe45f2793ad4cc3b52d89e51ace2996b74fa27c05fbd6364cada107f30edfbb44ba SHA512 8226d4dc2d24550222165deb982e97e597c0ef5ddf48ece858a048ea9cf3e6a6cdab1cdfdb5c76d8bf3994b1f7b5c79645ee170de9e6e7c9e873cf2f048ff2af
 EBUILD binutils-hppa64-2.30-r3.ebuild 10689 BLAKE2B 4dc6ce16fa2e3e2e39da1b8eb132de17e98dbc86878454192d52fcecbe834b9b63b5201a36866353fb698d35e6b558074056f22b430d962c356962ec9c9709dd SHA512 d092f185d5dabd98cb3ba6bc6ac5f7355c033ad8b0d94b1a562a75eab0f6fde93bdcfb56dfd724eca5e58c384d21702746617c92eec1561af48f93cb5fda069e
 EBUILD binutils-hppa64-2.30-r4.ebuild 10861 BLAKE2B e85b0a6d364df7f3ecda590bc14157aac33193eb6c23e89b1589b7890691ddedab88ad1ac7b80b34f991afa6dacd1cafec8f17ff800375535c89e0b35cac6bc6 SHA512 8d581adaba17d864725bd9f472a985727f3c2698a032631ca5739ae717248ec63fc7584602ec671d5682c56a0169d569a274a734b0d5ff8efaf9a3eb557a8ba9
-EBUILD binutils-hppa64-2.31.1-r1.ebuild 10889 BLAKE2B d49e5c452bfda92fbc60bcf635df07d7e2548862d757730bb828ca9aef866698e9cc23bdfc842098847f4301529fbbc9eab750001021873254896a8fa866b1ba SHA512 b20009a8cdd53b6921a081cb938c827e5c6f4a9ec813b681c41e048bcee8283bc80ba1fe5e6f4c4e06d4c97769dfd7c4e04ba0c32713cf9051cd8af888cf8bfd
+EBUILD binutils-hppa64-2.31.1-r1.ebuild 10631 BLAKE2B a3a7e52bd788f1f35b9463fef1801b1aac34f6878d8dec6dbf02860a8a7ac5bb816b2ee63c1d09b837f62c4354325f999cc6c6a5e19030a21500f508fea82140 SHA512 8a9d15daeca5b9d07eaf3122b6d2badb26ea58706f24a3f78529cd1d276b622ca943d3a5bad997161e8820a1bebf80d1cc1780ca9e931ebb1a3a424af23c0a89
 EBUILD binutils-hppa64-2.31.1.ebuild 10711 BLAKE2B debe3e5e18c81f44dce882f583405ab278ab478f62ee16cde92dcdaf2c2b7b2dc9a70c53c7fc67b99a89bcfebe0384cb07b34a682aed4d2933e5c19c445eb318 SHA512 d43e204dbce8547ac48310ac3e25abded9942f55f92a589f7ea26d7006f1ec2868c6f0636e5b32b442de385c26eff7f5096c9c6f1077633e0fa6b13d7db530d2
 MISC metadata.xml 445 BLAKE2B 38db0981b080e996e57421a2c75b2ebb2172ef38c0cfadf4b6105901985e9d46b5ba1c939641747be35cfacb4e1928a9f711465b2e17909a282d0acf244b8be3 SHA512 dd2ce9defb3a005665ad2f495513c40b5420629e31a336f6640ef91c9effc6f062bd338a87fe70de8a6a2993dda9e141396b602a1e2b7445f15e6f33473d29ef
diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.31.1-r1.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.31.1-r1.ebuild
index 47c79e64af9f..a6fcd63079d7 100644
--- a/sys-devel/binutils-hppa64/binutils-hppa64-2.31.1-r1.ebuild
+++ b/sys-devel/binutils-hppa64/binutils-hppa64-2.31.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
@@ -73,12 +73,6 @@ DEPEND="${RDEPEND}
 	sys-devel/flex
 	virtual/yacc
 "
-if is_cross ; then
-	# The build assumes the host has libiberty and such when cross-compiling
-	# its build tools.  We should probably make binutils itself build a local
-	# copy to use, but until then, be lazy.
-	DEPEND+=" >=sys-libs/binutils-libs-${PV}"
-fi
 
 MY_BUILDDIR=${WORKDIR}/build
 S=${WORKDIR}/${P/-hppa64/}
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index d15cd7927782..1a29018fa883 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -26,8 +26,8 @@ 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 12036 BLAKE2B 480736e14e65fead7eb154fb3c67fe049847fd20192bb5ad604516d4c968eb1d126774cd010fd56ef38ceee9c70806cd5c7670227936e9d27dcebbbb474ac8d0 SHA512 cd65dc9d505a05e6f2c39b76301fcf9c595157dd1eb552528c7e164822b617bae3b1dcbb2dc6fda663d46c5ad22a6bfd9e423d6bab817bcb2864c25613735e70
-EBUILD binutils-2.31.1-r1.ebuild 12240 BLAKE2B 59f44d949374f60d2de8c9cb83f86d1d2eb08025bfceb2694c37096c325126c7cd30b9ca4ed6e2b1aff7e1be60b0a9bd7015af652ffe16ec278dc99f35be74a6 SHA512 697ce2034a119fb8c46f97271c7c8f3064326f3ae7d65645982fd4def4921cc67edd1d662e76868b6da320c962e632d3f81c091d86f7b2fb00b1ffca3db7482c
+EBUILD binutils-2.30-r4.ebuild 12031 BLAKE2B c7a34d2f9807b0bddcc5836af75f33b1fa396f3972b4c2fa8d09f97eb694203e22a773e23177497f807c0be14dca1b1b8e11ea9837ee442a037462a04505800e SHA512 8dc6c9aced9face3b6259d35190ef4b15020432aa522b8529cd40ffe14564f4e611e9bf3e2151c3dc2300dd2f323ffb098bf1ef8b84d69ec4e783a10729f269d
+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 12145 BLAKE2B a4bd604a814411f51d56ee246f334a850a04e0aeaf5278b755341d206bf943ed4d04fad4ee51087cab7d1cfa8667eb6335a40e4fb584c93fd090eaded1e6a56a SHA512 a4cea7dfec33a68ce8e2e054a0039b0fd41a1e94587d4fe553e6fb861269d990de3c8db2005b3babd4bf780d757f04094fe91254249428a03940dc3ed06f0d99
+EBUILD binutils-9999.ebuild 11887 BLAKE2B 22f26d379bf519b20672f745913d559ed8a0d5098bf7b721b5fd52718de791e46edb7a2b1f3748676dbeffda68d4c2ab36a993d05b8282d136be13e746175b53 SHA512 de5c353d38df1f386d95383f0a782e6220a279ebd4c44894042a2a92e418271371ea4e7e4d070996e6507599209ad0f89f458822b38c8c45b989894ec715b6c8
 MISC metadata.xml 447 BLAKE2B 78d0b6e0a34f19d0f90f568fb84fcddbc995eb2c64f9c4feef2545d49322311fc6825b3b208dc03718bd75d550581efbdc9ee26e7f7a6f856902e640f90bf0f5 SHA512 73cb18db3a677767a78d5cab44ca721083ef17b4a158c10a66a186835b57a3d763b6f6753c836620b32ec912834ae8da2148c8fa0e4932170956b92c75169a9d
diff --git a/sys-devel/binutils/binutils-2.30-r4.ebuild b/sys-devel/binutils/binutils-2.30-r4.ebuild
index 3689025ad45b..9c417b75742d 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/binutils/binutils-2.31.1-r1.ebuild b/sys-devel/binutils/binutils-2.31.1-r1.ebuild
index d7752af4f3ff..180506d1f3ec 100644
--- a/sys-devel/binutils/binutils-2.31.1-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.31.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
@@ -79,12 +79,6 @@ DEPEND="${RDEPEND}
 	sys-devel/flex
 	virtual/yacc
 "
-if is_cross ; then
-	# The build assumes the host has libiberty and such when cross-compiling
-	# its build tools.  We should probably make binutils itself build a local
-	# copy to use, but until then, be lazy.
-	DEPEND+=" >=sys-libs/binutils-libs-${PV}"
-fi
 
 MY_BUILDDIR=${WORKDIR}/build
 
diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild
index 93dcbdf26b08..52df1648f4f1 100644
--- a/sys-devel/binutils/binutils-9999.ebuild
+++ b/sys-devel/binutils/binutils-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
@@ -79,12 +79,6 @@ DEPEND="${RDEPEND}
 	sys-devel/flex
 	virtual/yacc
 "
-if is_cross ; then
-	# The build assumes the host has libiberty and such when cross-compiling
-	# its build tools.  We should probably make binutils itself build a local
-	# copy to use, but until then, be lazy.
-	DEPEND+=" >=sys-libs/binutils-libs-${PV}"
-fi
 
 MY_BUILDDIR=${WORKDIR}/build
 
diff --git a/sys-devel/bison/Manifest b/sys-devel/bison/Manifest
index 667699f661fb..609690f3adfc 100644
--- a/sys-devel/bison/Manifest
+++ b/sys-devel/bison/Manifest
@@ -1,12 +1,10 @@
-DIST bison-2.7.1.tar.xz 1781068 BLAKE2B bd3161bcf4d2a9f046073280a8d751eb770147f942d48326a9ac869cf31fd8f127759167dced662b826fa54a24cd0cf87b0c096814c84e34afed8078368828a1 SHA512 ac0c7ca57142bcb84af498f606acb86091984a00359294fbf721a4ca8112f9fcf26497f7dd2e65f527e04a6e1de94142ecb76602d407e548475970e5a566d370
 DIST bison-3.0.4-patchset.tar.xz 8216 BLAKE2B dd059a7a24faf351fa28bc72b6e183935d4409f91b5dcd8640a14d01b480a3e5b28ddb8f5660f16300a3cf1639d67bd3436d016fa304bb4666c9a43fd7897bd7 SHA512 87b62c5848360fee5b566c664c378ff08bb81d2b6c07b0d385ebd4dfd6b1a687af1da96ed43ca120695877cfc5e30a149ef35424c7a332e9223179dab6665d0b
 DIST bison-3.0.4.tar.xz 1973796 BLAKE2B 6320424a5fece04734325226981af287e5745c898df7f0f79c26207599227f40e9ef54f93b2e231e20766ab9a19c0b266545bc5d0bfeabbb958e3e2f6686386c SHA512 bbdc23e7772e49da1c7c47e66d4e4efbfbfe9b21dbc59bf3ad9a6e573eecac6c9f52c7f11a64be9897e8deb99ef7ba015164aa8232aa391b901dd7db03632412
 DIST bison-3.0.5-patches-1.1.tar.xz 5188 BLAKE2B 437a202cfc2431a5fe9a31ea6bcce5978d5a6ca5e812f3a45928a67aa78ec7c93327e0520516aa5f79a0d7c395e7b959f22d3f2f962eab5a5b826d3f9816786a SHA512 54371d28f3d0ec7a2709684030f4f008cff4cb1a74ba30586615caace5417d4d475a7453ba956d8d10ee819391779d74725c203412339388d4131ddebd46f93d
 DIST bison-3.0.5.tar.xz 1954868 BLAKE2B b6a8b426304f414c1b7601e75dcae8a63847b71361fba2538ad5cc52f3527fe464b066add670a236d5e1d2aff65bbe7a99c282ee3c72a0bfaa498d40e3a50398 SHA512 00b448db8abe91b07e32ff5273c6617bc1350d806f92073a9472f4c2f0de5d22c152795674171b74f2eb9eff8d36f8173b82dacb215601bb071ae39404d4a8a2
 DIST bison-3.1-patches-1.0.tar.xz 7268 BLAKE2B 9195c00be1706664762598926913cd8fc18a32a6ae6ae4ec58748d5e8fc4877f63258db51cbe3bf84f3345ea0fc7c27d2e1190632c529615d9e6922baef74915 SHA512 5569b7901b40ea01eb7bccdc1b090207bc1ea6c50d144b561b2725ae79f3bcd51e7ea4e8ea37b60ea50ff4882e82110a07986cba1d2397a0333e7e01ae466e79
 DIST bison-3.1.tar.xz 1990536 BLAKE2B 6223642f2934927ca118410e2655f7c677bb1d3d981875ca2224f5aa344a43efbbbea34e79dff94ea489853e505b1d7f5920f4d159d1464ce61d8956ca0401ad SHA512 2a8e217ffb55ed5b1fcc989377ac348a066e62b8a4b0b0da40c3c7202f3ea487b2aab6a704a10b48d2d17673be0e22f6ff1be91fc05c4e0a57969b42a59d0152
-EBUILD bison-2.7.1.ebuild 1630 BLAKE2B e5172368221a1a6a51d2949e3d3e9a2a8d31bb7e56edfa2b80d183cf6f7ed645368e6bd705d3858667dfa3dca2939240a4a603f1051ba1dbf62be3d71231d30e SHA512 9d8022a854924d5998b2312070d18604661d59200ab0dc9b5698975dedf9bfe3060f8b647b067c96dd6834b5d356b2f8b9f45552acb5566bae5972a9d95f793d
 EBUILD bison-3.0.4-r1.ebuild 2458 BLAKE2B 1105bccd73e0a25f34c549a3b1eb95affe13ae79c09d4d16f8525134ef3ded288914c1a2868e72e2088d2e38148a305a5d7228dca42d5884eeed421e3e5a6437 SHA512 2a29d81a8e2284897aa0d5d687eb3253f063a2a152d8d72ad1092a2df64caf84013d758a2f77df4f62d86b7c3af61c1136e74b51a7e5dde487913286402d1782
-EBUILD bison-3.0.5-r1.ebuild 2519 BLAKE2B 564d777f0c85384e9856de0cc3c9a82f7ceb2b8c744d74d25ce9a401f3cd82633204d155f0b50bb8d6e27af4ba83cd58780edcb83d69fb6a905cee9d84e2d7d9 SHA512 3c8a4da87262001bf4ec91493015c17dc0f56ac4393265b4e9298f3e3a2af0dd13a21c459f8a0f2f18cb55534bfaa3584e84d8005603788af231b83798abd661
+EBUILD bison-3.0.5-r1.ebuild 2515 BLAKE2B 02762a402b75a4658408326ca667aad61e9a96b763aeaad5bd9e266a6323f853c25ad38c56677e9002b9c5157bd6e3a02054100741ee577f158e64b7ba1a6b00 SHA512 cc831c96c9287da5ec1d2dd0c80ccf3c02f95a00436879623318224bc28840193cccdc5b102613aaf6c242c8bfaf768fb9bb603a41b239565f96b94118eb1bc8
 EBUILD bison-3.1.ebuild 2531 BLAKE2B 9be554bb8efb508541c3159699ff7e724b10d554d19d233800ed01b6ecbb17b61178fc1ddb26d9283e67acf77668bf23fcdc5eaa0fb43f1aa94bd8bc518d885a SHA512 1e3eee454e2df1ed4d0ff1e6a2aa739d84569e3df9d44614a6a3e1a80c45b49d03d6fa6c22b77a0d8aa3ed72a8543edef6fd2057e50ada9f16b0fb8837a7b1e8
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/bison/bison-2.7.1.ebuild b/sys-devel/bison/bison-2.7.1.ebuild
deleted file mode 100644
index fadc63d444a4..000000000000
--- a/sys-devel/bison/bison-2.7.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=4
-
-inherit flag-o-matic
-
-DESCRIPTION="A general-purpose (yacc-compatible) parser generator"
-HOMEPAGE="https://www.gnu.org/software/bison/"
-SRC_URI="mirror://gnu/${PN}/${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 ~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 static test"
-
-RDEPEND=">=sys-devel/m4-1.4.16"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	nls? ( sys-devel/gettext )
-	test? ( dev-lang/perl )"
-
-DOCS="AUTHORS ChangeLog-2012 NEWS README THANKS TODO" # ChangeLog-1998 PACKAGING README-alpha README-release
-
-src_configure() {
-	use static && append-ldflags -static
-
-	# We don't need perl unless we run tests.
-	use test || export ac_cv_path_PERL=true
-	econf \
-		$(use_enable nls)
-}
-
-src_install() {
-	default
-
-	# This one is installed by dev-util/yacc
-	mv "${ED}"/usr/bin/yacc{,.bison} || die
-	mv "${ED}"/usr/share/man/man1/yacc{,.bison}.1 || die
-
-	# We do not need liby.a
-	rm -r "${ED}"/usr/lib* || die
-
-	# Move to documentation directory and leave compressing for EAPI>=4
-	mv "${ED}"/usr/share/${PN}/README "${ED}"/usr/share/doc/${PF}/README.data
-}
-
-pkg_postinst() {
-	local f="${EROOT}/usr/bin/yacc"
-	if [[ ! -e ${f} ]] ; then
-		ln -s yacc.bison "${f}"
-	fi
-}
-
-pkg_postrm() {
-	# clean up the dead symlink when we get unmerged #377469
-	local f="${EROOT}/usr/bin/yacc"
-	if [[ -L ${f} && ! -e ${f} ]] ; then
-		rm -f "${f}"
-	fi
-}
diff --git a/sys-devel/bison/bison-3.0.5-r1.ebuild b/sys-devel/bison/bison-3.0.5-r1.ebuild
index 84a3d5d1770d..8474dc7fffb2 100644
--- a/sys-devel/bison/bison-3.0.5-r1.ebuild
+++ b/sys-devel/bison/bison-3.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="6"
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${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="examples nls static test"
 
 RDEPEND=">=sys-devel/m4-1.4.16"
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 545c0b5f8fca..aac2cade67be 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -18,8 +18,7 @@ DIST bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 829688 BLAKE2B 5a33cf9ecf04df64
 DIST bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 815566 BLAKE2B b202610cbc3e5a902a2bd9f3d217d224ea5f3ee68247557af907736cff577cd720065ab1567046d89f6d87cc433b3edbd1a24a3c8ef2ced97af9782ce49cab26 SHA512 da11cb354d5ec95c74081c2cbb29bcb49817a1f9d6875587b4a27f1c9fdea8f07eec8147b739bd18a4fa2365e5da50e4bca7d7531612fbf2514c50516d225ac2
 DIST ecj-4.3.jar 1377431 BLAKE2B 1d6a8ae1cef0fc4ee325f935873e4a2e560c34cac929bc4190c7dd47e1ca4480ad608f0b7a5d00f2bde30ff2dc78f74ccb0effa48db1df9358a6e35ebce32100 SHA512 c4be72186d81747f1adce5a50de303c24bd6ed9f401bfa8871b1b864fe7591392218b1937b10d0e76014de8e0b6a1d5c4280475976218141cd1878c4a35217ff
 DIST ecj-4.5.jar 1470676 BLAKE2B 793c10ba09fd8040c0e1181204141aea16780c9c9088e07126e00da2b510af2ad6f58d876357d7e98cbb02d783a3be434469d5de1df134ccb8cc508e45028d80 SHA512 d4e1bf7538ace56e3d69fa91da5bbd16c272923b4de0a9d8dee23ea2b75f9f38c603de72fc4061df49285c450b63f3df211cee5270e9fffc5447445d1a9c9e4e
-DIST gcc-2.95.3-patches-1.4.tar.bz2 125654 BLAKE2B c11b26d77d8f6409c3a87bdd4346ef98b148399bb341ff3fff5f502a296ca4f19617eb3fd3856675194af4e2fb450e376d797b17b8afca8f4a82ec906448cd0b SHA512 7cc79439162ddf6f5dea4fd88e172e815684a34ed70e67f33c6acf4e1a687a748a78dee232d462adb5858cc3f9609e34cf1b8a75707947f4fcdf3d33251738e5
-DIST gcc-2.95.3.tar.bz2 9848842 BLAKE2B b1d5287802ef7e13105517d129f9f03e3e09c23826cbee02bfdcf2b0258f23a7fdb1afd80bc39732409c7ec3b6becd738744b3e8e52577c1a6fa3e0445c151d6 SHA512 683eafd1788a0021867797796444868100d244f72749dd8f014eb04495554ca43eba852179554710d516ff4b94527f40ff9c9189e007ef6fd958ec7293f17e4d
+DIST gcc-3.3.6-patches-1.10.tar.bz2 53739 BLAKE2B d22772d30c432669299e3e6df350920408c510a241a20e6795dcc680227342a16c3b6d2e477a17d6c49794005b42972ed30b4efe5b2d69398d283f50efdeb459 SHA512 be6cc8fae217f789982e324e0d3ad12d527e43ca4c168bce613397aaf3d86219b125e7b39c2b236638a68112cfee0e06c1b297fead712d92b3923b7195299d0a
 DIST gcc-3.3.6-patches-1.9.tar.bz2 51760 BLAKE2B 68704c1ddb73d2966746dd1a57b9699c3130d9165dd990b0b70f13b0dc4c7c4503afcbb268fd54242e17bdd571d5d0a20c172ee431c3c772e7c3412d3f0ac884 SHA512 306220c537c5cd90af7638431e6547ee9a80199c384629b5fbda06c28b2d6168fcf1dd448c0e178b104f41e03a8ebda4f389489d205b9e66ade6637e4747196c
 DIST gcc-3.3.6-uclibc-patches-1.0.tar.bz2 28882 BLAKE2B e1e1a1e24368d238b999df061e086c1376b095bba703154fd35edd6337b5fbc265722ffa01ae496e55a524d52792d7802867b38cd426c56397056d96e62036c9 SHA512 d060c1552d4f21b8b1cd6a6e56b9af4f62f61ce8ef4362afb1982b2ad9defe6a9648705cf780103d4f2061737553b6737c276d79b803b6b75ae94035bc881f0e
 DIST gcc-3.3.6.tar.bz2 23972413 BLAKE2B e7b33edcdbbb13b0be41a41156bf6fb6dcfe4f5ad75c41de86cb37f854be6b7a6a8dda0e65d331461469848cd912e25920e8aa2dcb142cb661731ba571cb5de1 SHA512 576b88e2fa675314a79a85f180684fe5af370c596476a0bf02e33e8ae0e2be838417ea80675ce4194a8213792cf7ada50cae5131149e4b890ab61e0b8d50d0ed
@@ -84,11 +83,11 @@ DIST gcc-7.3.0-patches-1.6.tar.bz2 11313 BLAKE2B cdb823d73a66949cd73f9ebff50cf1c
 DIST gcc-7.3.0-patches-1.7.tar.bz2 12828 BLAKE2B 9748f8817850532062481d8f56fc47b0d581ae16e622d41dae5613f14173719c7fa3b3030f9668b75edd8c968687bee5ba3f136f69daeaea0dd002d48433d7ca SHA512 0cb1c73c125120117d662b80b503a17f2e3fd5b276a6a1f6a9214e1cb906bb79cb4c794c48f6f10a409dc6ac636d0e466f5519d3541bfa6bf0748fe645eec8c9
 DIST gcc-7.3.0.tar.xz 62462388 BLAKE2B dc8f132b21bd0543c3d9dd17557038aafe65675aa73c540954234a3c972b4c31c939149bd50183d072ab6c8d16919e19daeaaffd619ce2ccd62dbdf9a5bb3302 SHA512 ad41a7e4584e40e92cdf860bc0288500fbaf5dfb7e8c3fcabe9eba809c87bcfa85b46c19c19921b0cdf6d05483faede8287bb9ea120c0d1559449a70e602c8d4
 DIST gcc-8.2.0-patches-1.2.tar.bz2 11419 BLAKE2B 3d7a274ee42da5b73a3430c5043d38ae39cf27e9e642555c2e53a5c0ca3223b2a002cbc46c2d43c28ad1d5e40c9846019036868d91e22975e09351116ab62280 SHA512 dae9a9c0bb93ad35812d403ebba7aa2bb923b5b90ae66c68e34144e0e88466b78ac757ec3337a29118e8deeb5d945d6609829f9fd7c2cb8d133762333e599408
-DIST gcc-8.2.0-patches-1.3.tar.bz2 13455 BLAKE2B c941cbeeae4137a9403b5cdbc2c904f83bb4cf3248e60fd718869787ba895e14e17546f38a49ab585369a02931e9f368c952f72f63fd240790df7d25c6767423 SHA512 1b25bb8c904d3426b8cca41cf8ddc8e0b48c8b9dbc6229e14da45926bfa42aabd3c7103d4cdfdd62953cc894a23d5811d68259fef61e9d5910d76e034427ccc8
+DIST gcc-8.2.0-patches-1.4.tar.bz2 14213 BLAKE2B 6585447944f15bcc2757a9eea94b5dafe5e4faafd78a096da08dd2b183062917c0606d49f8d3057a24cb320b7e32fc5454e301935a20395107ec3f6fd4016082 SHA512 33303602296ab881dc590534cd9f5d8ddf22985dd397a94ed232c5fd39f3d3cb860559cf3bae5405eeb26c6e6c655c75a8e10bd50a54757c65a78a3798947aa2
 DIST gcc-8.2.0.tar.xz 63460876 BLAKE2B c5372b0bdfcd2729577dca287b294623b78c583491998404eb307768c573618bdaaedb7d9ae0e39ba41a62a14b9525dff0e3083285754b7f5bb9987ecf635185 SHA512 64898a165f67e136d802a92e7633bf1b06c85266027e52127ea025bf5fc2291b5e858288aac0bdba246e6cdf7c6ec88bc8e0e7f3f6f1985f4297710cafde56ed
 DIST gdc-0.24-src.tar.bz2 1012099 BLAKE2B 2c85058aad09af328719a702f69d655b9aa9655f2a83bb46bd21367cd442ed72c9b471ddaa764753f782dcb2f22fe51b052a965ed08290e0d9415b543481d144 SHA512 9aec7e4b102e602dfb61cd09ea4b4a96af637ceb3d726235261d09ebd35dbd416abcbfe0e46918e48474bd241fe9bb29abc145a65aa834669295aaee4fca0686
-EBUILD gcc-2.95.3-r10.ebuild 752 BLAKE2B 45764d63636c0fa25a7b7538a814f8e3088e5b584f0ccdfd290064bf2d2282ec0804d5c525736e7d1d97bbdf4798710fd79a71ce8216c9665e3388efb1f34a0b SHA512 88e3a89474f1b46077b74a7c9931cdb7275bedc72d2be4ebb0272f45ae7a64b533fc80263275839a6c67fd2ce5cfde6580d28b613a37608db26b3c62590dbd82
 EBUILD gcc-3.3.6-r1.ebuild 1249 BLAKE2B 4fd694cda071603038aec136b37d6722b135e7db317c210aa484f68f47eaf0489c126ceb13309f84e7a96e034761835d1ca1f3baf88ba373f391bd44ace2b074 SHA512 a18cabe5c02f3ba85b28292ce6fd0e3973ef15f5ffa847fc67d57ed2d04d96e1a6910f36a9ec08a4833eac3e247df5a7893bfc19ca6354233352d38651809092
+EBUILD gcc-3.3.6-r2.ebuild 1247 BLAKE2B 1c6ab3cf11ab715bf9896a9b731c216ef7a5ffdad2bd4f76325c13a55d1991054b7dcdc5e4449d1654f6ce0046ebe16f920b215f3716e39e46e368d2e35d98a3 SHA512 61a1e5a717c3af4d8846c64d9dc613b6ca0f2bab884c8e2b3776ed826ba01a6f0d63b987475586d0d573aa777b1d5753900506b3811ed085a26685465503b88b
 EBUILD gcc-3.4.6-r2.ebuild 1374 BLAKE2B 7e38335fa6a4dede1b581fb2b42c14ebab65a16c81d10517601a1e8e9f63f42673ed099f483616a0a720ea01b43e97c7a05362665353bffa6bdf8b56409318a6 SHA512 5c31bf85dab53b0670ca7606c29e5fcdc9cdade9596b02320d95e2ab215952de4dc2f4fc4ce17bf4826c26bb76e820135a9317198753cb071b3ff7e39f1069ad
 EBUILD gcc-4.0.4-r1.ebuild 244 BLAKE2B bb80196afd1fdc3c0318a79992b44ca6b9a63f702deb3fc16539b7dcd3526f5bf1ec026831362509fa270e6dbb5657984a9fa41b134d74e10d89dc2b3f08d425 SHA512 ceed99a86365766e7b6cf4e6825fe75c9ad0bfeee119cdb2dcb0bbbdc4eac3ba3c50f01e706575162ba93a867af00117f89648cbb85b4f56f972275059379bbf
 EBUILD gcc-4.0.4.ebuild 247 BLAKE2B 3fed6acdd82f733a2aea4251d568466e4177b530d1af839366dbdd534490849b0e438cec31c2c972101ed6e56f4826d4f5a6324d143fb2018cffbc5b2b451459 SHA512 6f988f06da4516223bc9862eaf9bd082f26713a8aba4564d809d9daba6ffffd97e623804982062f421e733434b95ef02c76b230e0cc2322eeccaef616b6e98d1
@@ -118,5 +117,5 @@ EBUILD gcc-7.3.0-r3.ebuild 534 BLAKE2B 6cf318ef9641c52f34955d7937f4e49b81e033f0b
 EBUILD gcc-7.3.0-r4.ebuild 547 BLAKE2B 13c8fb365339fafd2c1f218180da5412e12dcbc8745b03037a8dcaa7959ca6a5770dd1daa2cb10e2a1d732e0c3179863392f15338a0e71649b0a0ade18739cc4 SHA512 bddfd5dc8ff869df0b111e22d221950f8848ad865772158092ba590e140c1df937674018332a89601500fd4a2ac3dd8a7a4a2fdcd25b204b7ec9b1ac43db817f
 EBUILD gcc-7.3.0-r5.ebuild 544 BLAKE2B 1be74edd79e4cf097c7cb5af1b6f63ecfac280c38cb1172d9b5b338f956f1f8ff2a5ad195a5ea0c842e6e479b1735b876306447daa5ac6af1e593cade1dfbc9e SHA512 5cc28c986afb1b7464e03300fbba30fe1af1f5bdb9435ccfa54e47c05e4881185b92d8e427648df862a18837b31106e9a6b584b76a7c7c235df20773a1d34c42
 EBUILD gcc-8.2.0-r2.ebuild 494 BLAKE2B 6019cb705d82c9525c9d265945b61c294680ab6f0ce00d4fa2371f1420fcfbb2bf962a750f264080dfdc387dc22c8091e086031c2bc1dddc4cd7be769e5cf225 SHA512 d134a1ab171f41478dbe0ff2b766f7f72f5f08553ed43e1a7d568a07c6a031457ad427f6acafc6fab0bd70f224abe9c61565052878a85f36354f2f6c5671b25a
-EBUILD gcc-8.2.0-r3.ebuild 491 BLAKE2B eed3e28e36743415548dc406bd44e93b1a2726860a6613faa8693774255be22c0a931c0805734cd524ec699b3fbac45028f37bd071b3638289518ac3c367c6a0 SHA512 d81abf63a87c66895df3457595cb4f11e54ad9559d33c00d655683216c5450ea424c70c5ecaafcd671abb7775cdc3a8d73055cf85446300851660afe3a88af1a
+EBUILD gcc-8.2.0-r3.ebuild 491 BLAKE2B 78a789ad5486d734426803c5ae867c08d4b32f6ca43f42fcb1747443837e76b00150b962b35bbfb2f49709a051aaad945b9363e0ac16c4a6c9c86047a3a13088 SHA512 012af7647ee125ecc4e67733aac58416ef45a8625f8b29545d5daef6e56ab7d8aba0b7236a6e775f767fb59dfdfd8a23625c5316b184db4e54b0970087cec178
 MISC metadata.xml 2591 BLAKE2B ac029d38d0b2001f9d21214ccd272347f16f541cae5b86a00aa24802af42cc5e85a6447c854ca540274b991c77112b6083fd710209a785638ad64f0d4c78292a SHA512 3691a50f215303f18c8624852dba09f9486fc3818a9dac770c1e4c1a4be15b1bc5291e2584ed7e48510160ce264e1eef26126c075cc7d09b62e1963cc84edc7d
diff --git a/sys-devel/gcc/gcc-2.95.3-r10.ebuild b/sys-devel/gcc/gcc-2.95.3-r10.ebuild
deleted file mode 100644
index 08958abea5c6..000000000000
--- a/sys-devel/gcc/gcc-2.95.3-r10.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"
-
-PATCH_VER="1.4"
-
-inherit eutils flag-o-matic toolchain
-
-KEYWORDS="~alpha ~ppc ~sparc ~x86"
-
-gcc2-flags() {
-	# Are we trying to compile with gcc3 ?  CFLAGS and CXXFLAGS needs to be
-	# valid for gcc-2.95.3 ...
-	if [[ $(tc-arch) == "x86" || $(tc-arch) == "amd64" ]] ; then
-		CFLAGS=${CFLAGS//-mtune=/-mcpu=}
-		CXXFLAGS=${CXXFLAGS//-mtune=/-mcpu=}
-	fi
-
-	replace-cpu-flags k6-{2,3} k6
-	replace-cpu-flags athlon{,-{tbird,4,xp,mp}} i686
-
-	replace-cpu-flags pentium-mmx i586
-	replace-cpu-flags pentium{2,3,4} i686
-
-	replace-cpu-flags ev6{7,8} ev6
-}
-
-src_prepare() {
-	rm -rf texinfo
-	strip-linguas -u */po
-	gcc2-flags
-	toolchain_src_prepare
-}
diff --git a/sys-devel/gcc/gcc-3.3.6-r2.ebuild b/sys-devel/gcc/gcc-3.3.6-r2.ebuild
new file mode 100644
index 000000000000..75e1ed193382
--- /dev/null
+++ b/sys-devel/gcc/gcc-3.3.6-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PATCH_VER="1.10"
+UCLIBC_VER="1.0"
+HTB_VER="1.00-r2"
+
+inherit eutils toolchain
+
+# ia64 - broken static handling; USE=static emerge busybox
+KEYWORDS="~amd64 ~x86"
+
+# NOTE: we SHOULD be using at least binutils 2.15.90.0.1 everywhere for proper
+# .eh_frame ld optimisation and symbol visibility support, but it hasnt been
+# well tested in gentoo on any arch other than amd64!!
+RDEPEND=">=sys-devel/binutils-2.14.90.0.6-r1"
+DEPEND="${RDEPEND}
+	amd64? ( >=sys-devel/binutils-2.15.90.0.1.1-r1 )"
+
+src_prepare() {
+	toolchain_src_prepare
+
+	if [[ -n ${UCLIBC_VER} ]] && [[ ${CTARGET} == *-uclibc* ]] ; then
+		mv "${S}"/gcc-3.3.2/libstdc++-v3/config/os/uclibc "${S}"/libstdc++-v3/config/os/ || die
+		mv "${S}"/gcc-3.3.2/libstdc++-v3/config/locale/uclibc "${S}"/libstdc++-v3/config/locale/ || die
+	fi
+
+	# Anything useful and objc will require libffi. Seriously. Lets just force
+	# libffi to install with USE="objc", even though it normally only installs
+	# if you attempt to build gcj.
+	if use objc && ! use gcj ; then
+		epatch "${FILESDIR}"/3.3.4/libffi-without-libgcj.patch
+		#epatch "${FILESDIR}"/3.4.3/libffi-nogcj-lib-path-fix.patch
+	fi
+}
diff --git a/sys-devel/gcc/gcc-8.2.0-r3.ebuild b/sys-devel/gcc/gcc-8.2.0-r3.ebuild
index 004b9ed02b74..27ef0bf2ab2e 100644
--- a/sys-devel/gcc/gcc-8.2.0-r3.ebuild
+++ b/sys-devel/gcc/gcc-8.2.0-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-PATCH_VER="1.3"
+PATCH_VER="1.4"
 #UCLIBC_VER="1.0"
 
 inherit toolchain
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index e18028f7f5cc..99e3febc258d 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -10,7 +10,7 @@ DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f
 DIST llvm-7.0.0.src.tar.xz 28324368 BLAKE2B 10168ff9be8f68536db3b2263c85c1c98213ef03dc542b83628ff176542452582bc496bab236fdf40d4a6463a33f04b27f1458c072ad8b66b641f8df8d494046 SHA512 bdc9b851c158b17e1bbeb7ac5ae49821bfb1251a3826fe8a3932cd1a43f9fb0d620c3de67150c1d9297bf0b86fa917e75978da29c3f751b277866dc90395abec
 EBUILD lld-4.0.1.ebuild 1721 BLAKE2B f3e848199052fbec33376e9630afd80c031cd729457d1e3c302d78c42a128cc7d8baa626ed294bdde19dc2ec00683a01e4e9d5d0f6d893e24a575024b9e92556 SHA512 e971195cbf8976a0bd5140c62c3c4d9a375beaf3813119342f3f8f28db9843e53dc9804cb13b6f1a49a1b7dc60cd631cd69f742faf1de56001f59230625dbef1
 EBUILD lld-5.0.2.ebuild 1589 BLAKE2B ce6f2b7d0b095223600a236432966cbc44d89d781f6fe20b699aeb77b859bbcdf65bab0b1ad37df63918ce95f75c018a5eb9d56605e5d56d057e062399427271 SHA512 16b397e9d580a52fa430b07788a1c73aabfdc3dec87ed8ee12807e231c9590f637966f412a0657a574476b3b27b0a952718c61de955246cc1f585ab4526d49cc
-EBUILD lld-6.0.1.ebuild 1736 BLAKE2B fc3a21c3abd1e6777644dcbef0e7ce1fd6b4b895934fd39a8c265926e24f33bd84382d4d1e9c357b06885364e75d495f79100bd039465ac3f69a410a6a5c6ce6 SHA512 7d1833c83406eae3af97546bbf4a34d7f9744bed0b541a06114f6406f73a4dfff15f6b2f3a6643b9840208999485cc4109c79052cb4d8f3fa65afff8554c81ce
+EBUILD lld-6.0.1.ebuild 1731 BLAKE2B 94a45353bb5db9ff18974afbbf2f77f00814302af1f146298da97cc53941811b91367aee89c82365e1a712ad7d86b2e8ad0b6b59653e56296c7e45e8ab65a266 SHA512 3985af3b2b300c6ddfade3c848a51f8dd1254f15bc3c51cf4d6a5bf8d655de756c8e5315c5594f65f07530b8d21526367f4397fd9b39f895a5f1e525a3aef409
 EBUILD lld-7.0.0.ebuild 1736 BLAKE2B fc3a21c3abd1e6777644dcbef0e7ce1fd6b4b895934fd39a8c265926e24f33bd84382d4d1e9c357b06885364e75d495f79100bd039465ac3f69a410a6a5c6ce6 SHA512 7d1833c83406eae3af97546bbf4a34d7f9744bed0b541a06114f6406f73a4dfff15f6b2f3a6643b9840208999485cc4109c79052cb4d8f3fa65afff8554c81ce
 EBUILD lld-7.0.9999.ebuild 1674 BLAKE2B 14f026b7d86c935329e9909ac9ed73519350e8a845dffd669a1c0c1f1f82c8ef9ccfa06140f25efe78ff765eed2e05a667f495007a2a40259b1e75fb798a48a3 SHA512 6d1786893ec8348de2b8efb675c13672be1d366b108f633adf1772c0b96e3f2574aaf624cd37bca76af86032431589cd3788cca76e5fc64b4aa49a86904498e1
 EBUILD lld-9999.ebuild 1625 BLAKE2B 2308235d2368d9eb25a1d8ae41eaa6b182475e5d49aeb37ff5fc025cb500d268a2f935b4dbe26ed1c2ab950d082e40030a5d5d39a5e3357ca8610f927ccc0fb6 SHA512 6abdc37eef950c50164a29752ab370e08aefe9db909a4ac2ec1f9eb1e6a8b3fdca8ed776945f0e9b745bed11633b2ff33f1f00853e7fdfd22664756eba839f14
diff --git a/sys-devel/lld/lld-6.0.1.ebuild b/sys-devel/lld/lld-6.0.1.ebuild
index f797ef986a5f..0117f71487d2 100644
--- a/sys-devel/lld/lld-6.0.1.ebuild
+++ b/sys-devel/lld/lld-6.0.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
@@ -20,7 +20,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-fbsd"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 0ac5c8e2441c..8b9c879401b2 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -2,6 +2,7 @@ AUX 4.0.1/0001-cmake-Pass-Wl-z-nodelete-on-Linux-to-prevent-unloadi.patch 2408 B
 AUX 5.0.2/0001-Fix-return-type-in-ORC-readMem-client-interface.patch 1299 BLAKE2B 486ead622d4885f9e218a6fb44496ace574950e9946455050ffdde7bfac56c0893a5dc62fa6ffe6e8e18cdd706073454f8e1f2bc75a8ad98cf5246449ffe4df2 SHA512 3e17e72508242172c59547eaa2a8238bd145cfb888d4323818a943f075645b9bc5a272656e39f37d9f7997a16491b6a3a3b5c51101465369d8570a0d078cd335
 AUX 6.0.1/0001-cmake-Append-Wl-rpath-link-conditionally-to-GNULD.patch 1575 BLAKE2B 3a650b244c2b97fa6e76327348a7bb00ace08b18441a59af238ccf0cdea4409e2d0b46c0a381737d7d0879dbc5eb0f71007fee0c9f0f5b92369453223d25397d SHA512 f09bf2b2bbac1f875f32f8761697717fbbfda2939fcccb8b03ecb8e4e65377c875355a3523d54f81c53d11bfaf3557f80000918bea003cfdba0662469283563a
 AUX 6.0.1/0002-llvm-mc-Produce-R_X86_64_PLT32-for-call-jmp-foo.patch 13865 BLAKE2B 03f677e386115c3c7333db39664f75b2b4c22e18c2e487e515dc2a55acaa1bf569d2945ae620420b4b4323fb2e4fb7d3c3313dcc7e648942afa25d055d36efc7 SHA512 2820793ef29f08b55b7d94ef700085dce02c6a029c5877a77c5296e9a05dfc9946d10ee66d2d3d8a150cd511e3346d2acf259b873aeed25c1b0aaefebe95790d
+AUX 7.0.0/0001-X86-Stop-X86DomainReassignment-from-creating-copies-.patch 4263 BLAKE2B f0b073f90968b008ce758a43f00a4268dad1037f949704f3d86741319b6972d1ad69bed0944152f21b837486404948c1f290babc90a4da5ac0c300f0d2a868ee SHA512 efcb4b4bf0320304df680e6b69d8db1e732539e6cde0d9f11566e00533ecf8383d1520edca0a69c96e1722b33dcc8bc33da23470faf59774724cedc9f522d9b1
 AUX 9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch 2626 BLAKE2B 6c3afe6941568119b6bbce1c66be913a29a2ac7853a881804c1c22e981075f1677ca7e4744738ad858f58a58c1a7295aeb5f1d87b3a2b2adfb971a54d76c04fb SHA512 34a84427c34fa8886f55e05cf0ffce258cdee8e98190e070eb40dc555a30784c49ebe4f946f7ea51b7d00fceb8071fc745007250dc5b5a61c4d2bb9910672ec5
 AUX 9999/musl-fixes.patch 1258 BLAKE2B fe275412bc908884239ea71de9a9ddf1d2f64debaa1a9ada18170195a7775c41571600ed3666343bf967aff5f9117900f73155f60de5077bc4584cfc2f782f53 SHA512 314dcbe846a66312c9f1634f4ff3f4670b3db1d3210bb550f1d3877a423333ba042da2e90c8736918a36be4d4faf58dab8d3236d4f26df5af7f7f019b0e0ec8f
 DIST cfe-3.4.2.src.tar.gz 10612313 BLAKE2B 6a5d9f20d181b217f3ca72b6585bd953150cc0d207a203feb24aa9cb9b2e341ac6a2e152a1c40baf2d53e5a52c4e4e86a518a329bdda39c08986b3437b04cee8 SHA512 e01fa8e312e9b3b7b3cb572ac21349161aaa50078ecfe7bded273b75db4a0c44acde524f8fdfcbeec54c61eeeb8339e9917d1f205a8fda18e34fe7ccbe89c36d
@@ -51,7 +52,9 @@ EBUILD llvm-3.9.1-r1.ebuild 16317 BLAKE2B a4edb45656ae073f618d899787a339b0c5e7f8
 EBUILD llvm-4.0.1-r1.ebuild 6985 BLAKE2B e280f2ce69aeef46f6043c9ebb49205788045d796c294fe071d1776c63850ccb84378fa2bd7fc1f3023677672895dcd618073e6d3b67a95800dd247ceac6bdd5 SHA512 0a0c1f83f350cb8c86a39bcbc6b1678c12e3936369a3f24bae4b7aa5014896c09a45986e059f280eb5737a08c6d2dd1491fa6a11cf441d100c0a6506c2118410
 EBUILD llvm-5.0.2.ebuild 7795 BLAKE2B d09a6cf50eb4da309e68ff7ac347da1ecea7c8f7f994cf7b69b5c98823d373a5e0e4023271a8b5b920d0eba79d5a70f865d2b4d50bf148731f93abf0991ed94d SHA512 3ce3fd983255ce1c1762c4e9186b06f26d4fc7cbf409709c9326b8ee6d9fab9e0a090560de3af87e544b4ae2ae631f55c76160de6a77109a0b02677345172ef1
 EBUILD llvm-6.0.1-r1.ebuild 7997 BLAKE2B d25f6f3d2814b66db41936b808d72f625f432393619d1a7658fa959918244c00ba94f63b959f0e2feddd71b7b0f1f8fd6fa0549cedfb5a4d0962c5c3aeb52293 SHA512 e8228d1f4d63052f3b5c56f8d2d36ada7815aa1758ea0264e92eec341a87b64db97d682fdf55e4fa2da11f0caf4e349083c0040bbc7ed6eae71ea40e50c8a7b8
+EBUILD llvm-6.0.1-r2.ebuild 8169 BLAKE2B 214212c5960b9a2e6b8c2d1506ac4f59227ba31a6b52c310d7557a1523a09cf74d9ed0433e68d828419eddf1ea42e75588d6e8de694a0e0a469eca60317c7d98 SHA512 9db6c08277904689064bd492e9c5a63873ee6df9c34577a62f66aaebc110c071f63b7b1864e821e9ce2389f66b7a582d280deb3403ff3a890d3c47e1148f3cc2
 EBUILD llvm-6.0.1.ebuild 7820 BLAKE2B 0077de543904f588bf856b4f279d1ced9a06bfe77da0e7149469ff960b4d0c7c1e557d92074c4c0570a7054a0b14d8663d2a502678884581fb35060f8bb0397f SHA512 b1fc081efff6cc0c77230058b261c5880fe57641544b21e03ff55ab993d64c00b4df1b12a5af5fa4b5f5528a1bb0c04a3f056be2aa8b528fbac29ec484e7f35b
+EBUILD llvm-7.0.0-r1.ebuild 7891 BLAKE2B e7739e453a169c9f15d11adc298e8c3bc3140bd2d1b2506a2be1338a8e7018c732e5ed2d320c15e55c7e1ae8c58d1ff7b0e6c7c9d54e941bae41e5d633bcb930 SHA512 1975529ea2dff95e5353367091153d04226525df77b50b4a065ed03dc12b257ab295fc543a975842a3cbb2891ad3bad537679b3b3a496174985cd09bb925522c
 EBUILD llvm-7.0.0.ebuild 7719 BLAKE2B 31abb64164994fbddbf699efc8eaf27a6ae56d3bfe62c41d92df150f2522d2cfb45e0846d16577bc595bce6c6643b5db8b1ec7792a04b191fbb3f1481597af4f SHA512 76b0087874525dc4402a9c79aa35051af61d9cd59d01ed1d2f3488eff36aec972ad822c657aaa599012ec79be7952b2ad51722ad16ab8cc770c8b6b3db096aa9
 EBUILD llvm-7.0.9999.ebuild 7406 BLAKE2B 19b08c7a3f6c7c6939764baa622bea7dea09362d281874ebcaa235563b60154c56b6e7e80bc87767442277192ed6a5d725a9694f872d6e2e449cb11c728157a5 SHA512 5e613af19834c142a45a688468587efb4f9198c1aefc9772048ed1775d27dbb9336c0f2f362433d7b1e6fc57151025083037dbbaed8ad407710b534df55f1e58
 EBUILD llvm-9999.ebuild 8533 BLAKE2B b77410643fbcfc2bbc9884ee13c40fb7bb262c4935301d9e09e02743117c654c246783121c06aa7e241ba5964012b917dbfb90f527f98291f176ec0388db5fd2 SHA512 44006ca5a022656b53fcc006f3e8adbc5828e183a69b2952bb556c580ea92d755b01ffedc8a4736b22ded70df8d51df0dcb5b906211503aaef7a97e715295232
diff --git a/sys-devel/llvm/files/7.0.0/0001-X86-Stop-X86DomainReassignment-from-creating-copies-.patch b/sys-devel/llvm/files/7.0.0/0001-X86-Stop-X86DomainReassignment-from-creating-copies-.patch
new file mode 100644
index 000000000000..f38907cdd4c1
--- /dev/null
+++ b/sys-devel/llvm/files/7.0.0/0001-X86-Stop-X86DomainReassignment-from-creating-copies-.patch
@@ -0,0 +1,110 @@
+From 72da952b396f43d2ce6ca20a0f0d75212fea6b28 Mon Sep 17 00:00:00 2001
+From: Craig Topper <craig.topper@intel.com>
+Date: Mon, 1 Oct 2018 07:08:41 +0000
+Subject: [PATCH] [X86] Stop X86DomainReassignment from creating copies between
+ GR8/GR16 physical registers and k-registers.
+
+We can only copy between a k-register and a GR32/GR64 register.
+
+This patch detects that the copy will be illegal and prevents the domain reassignment from happening for that closure.
+
+This probably isn't the best fix, and we should probably figure out how to handle this correctly.
+
+Fixes PR38803.
+
+git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@343443 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ lib/Target/X86/X86DomainReassignment.cpp | 21 +++++++++++
+ test/CodeGen/X86/pr38803.ll              | 48 ++++++++++++++++++++++++
+ 2 files changed, 69 insertions(+)
+ create mode 100644 test/CodeGen/X86/pr38803.ll
+
+diff --git a/lib/Target/X86/X86DomainReassignment.cpp b/lib/Target/X86/X86DomainReassignment.cpp
+index 5196446b39e..62588e9509d 100644
+--- a/lib/Target/X86/X86DomainReassignment.cpp
++++ b/lib/Target/X86/X86DomainReassignment.cpp
+@@ -217,6 +217,27 @@ public:
+   InstrCOPYReplacer(unsigned SrcOpcode, RegDomain DstDomain, unsigned DstOpcode)
+       : InstrReplacer(SrcOpcode, DstOpcode), DstDomain(DstDomain) {}
+ 
++  bool isLegal(const MachineInstr *MI,
++               const TargetInstrInfo *TII) const override {
++    if (!InstrConverterBase::isLegal(MI, TII))
++      return false;
++
++    // Don't allow copies to/flow GR8/GR16 physical registers.
++    // FIXME: Is there some better way to support this?
++    unsigned DstReg = MI->getOperand(0).getReg();
++    if (TargetRegisterInfo::isPhysicalRegister(DstReg) &&
++        (X86::GR8RegClass.contains(DstReg) ||
++         X86::GR16RegClass.contains(DstReg)))
++      return false;
++    unsigned SrcReg = MI->getOperand(1).getReg();
++    if (TargetRegisterInfo::isPhysicalRegister(SrcReg) &&
++        (X86::GR8RegClass.contains(SrcReg) ||
++         X86::GR16RegClass.contains(SrcReg)))
++      return false;
++
++    return true;
++  }
++
+   double getExtraCost(const MachineInstr *MI,
+                       MachineRegisterInfo *MRI) const override {
+     assert(MI->getOpcode() == TargetOpcode::COPY && "Expected a COPY");
+diff --git a/test/CodeGen/X86/pr38803.ll b/test/CodeGen/X86/pr38803.ll
+new file mode 100644
+index 00000000000..a1ca27d89b0
+--- /dev/null
++++ b/test/CodeGen/X86/pr38803.ll
+@@ -0,0 +1,48 @@
++; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
++; RUN: llc < %s -mcpu=skylake-avx512 -mtriple=x86_64-unknown-unknown | FileCheck %s
++
++@b = local_unnamed_addr global i32 0, align 4
++@c = local_unnamed_addr global i32 0, align 4
++@d = local_unnamed_addr global float 0.000000e+00, align 4
++
++define float @_Z3fn2v() {
++; CHECK-LABEL: _Z3fn2v:
++; CHECK:       # %bb.0: # %entry
++; CHECK-NEXT:    pushq %rax
++; CHECK-NEXT:    .cfi_def_cfa_offset 16
++; CHECK-NEXT:    callq _Z1av
++; CHECK-NEXT:    # kill: def $al killed $al def $eax
++; CHECK-NEXT:    kmovd %eax, %k1
++; CHECK-NEXT:    vmovss {{.*#+}} xmm0 = mem[0],zero,zero,zero
++; CHECK-NEXT:    vmovss %xmm0, %xmm0, %xmm0 {%k1} {z}
++; CHECK-NEXT:    cmpl $0, {{.*}}(%rip)
++; CHECK-NEXT:    je .LBB0_2
++; CHECK-NEXT:  # %bb.1: # %if.then
++; CHECK-NEXT:    vcvtsi2ssl {{.*}}(%rip), %xmm1, %xmm1
++; CHECK-NEXT:    kmovd %eax, %k1
++; CHECK-NEXT:    vxorps %xmm2, %xmm2, %xmm2
++; CHECK-NEXT:    vmovss %xmm2, %xmm0, %xmm1 {%k1}
++; CHECK-NEXT:    vmovss %xmm1, {{.*}}(%rip)
++; CHECK-NEXT:  .LBB0_2: # %if.end
++; CHECK-NEXT:    popq %rax
++; CHECK-NEXT:    .cfi_def_cfa_offset 8
++; CHECK-NEXT:    retq
++entry:
++  %call = tail call zeroext i1 @_Z1av()
++  %cond = select i1 %call, float 7.500000e-01, float 0.000000e+00
++  %0 = load i32, i32* @c, align 4
++  %tobool2 = icmp eq i32 %0, 0
++  br i1 %tobool2, label %if.end, label %if.then
++
++if.then:                                          ; preds = %entry
++  %1 = load i32, i32* @b, align 4
++  %2 = sitofp i32 %1 to float
++  %conv5 = select i1 %call, float 0.000000e+00, float %2
++  store float %conv5, float* @d, align 4
++  br label %if.end
++
++if.end:                                           ; preds = %entry, %if.then
++  ret float %cond
++}
++
++declare zeroext i1 @_Z1av()
+-- 
+2.19.0
+
diff --git a/sys-devel/llvm/llvm-6.0.1-r2.ebuild b/sys-devel/llvm/llvm-6.0.1-r2.ebuild
new file mode 100644
index 000000000000..d20789791507
--- /dev/null
+++ b/sys-devel/llvm/llvm-6.0.1-r2.ebuild
@@ -0,0 +1,270 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils eapi7-ver flag-o-matic multilib-minimal \
+	multiprocessing pax-utils python-any-r1 toolchain-funcs
+
+DESCRIPTION="Low Level Virtual Machine"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz
+	!doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/${P}-manpages.tar.bz2 )"
+
+# Keep in sync with CMakeLists.txt
+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_}" )
+
+# Additional licenses:
+# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
+# 2. ARM backend: LLVM Software Grant by ARM.
+# 3. MD5 code: public-domain.
+# 4. Tests (not installed):
+#  a. gtest: BSD.
+#  b. YAML tests: MIT.
+
+LICENSE="UoI-NCSA rc BSD public-domain
+	llvm_targets_ARM? ( LLVM-Grant )"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug doc gold libedit +libffi ncurses test xar xml
+	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-libs/zlib:0=
+	gold? ( >=sys-devel/binutils-2.22:*[cxx] )
+	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
+	libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
+	xar? ( app-arch/xar )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )"
+# configparser-3.2 breaks the build (3.3 or none at all are fine)
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	|| ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5
+		( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
+	)
+	kernel_Darwin? (
+		<sys-libs/libcxx-$(ver_cut 1-3).9999
+		>=sys-devel/binutils-apple-5.1
+	)
+	doc? ( dev-python/sphinx )
+	gold? ( sys-libs/binutils-libs )
+	libffi? ( virtual/pkgconfig )
+	!!<dev-python/configparser-3.3.0.2
+	${PYTHON_DEPS}"
+# There are no file collisions between these versions but having :0
+# installed means llvm-config there will take precedence.
+RDEPEND="${RDEPEND}
+	!sys-devel/llvm:0"
+PDEPEND="sys-devel/llvm-common
+	gold? ( >=sys-devel/llvmgold-${SLOT} )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( ${ALL_LLVM_TARGETS[*]} )"
+
+S=${WORKDIR}/${P/_/}.src
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+src_prepare() {
+	# Fix llvm-config for shared linking and sane flags
+	# https://bugs.gentoo.org/show_bug.cgi?id=565358
+	eapply "${FILESDIR}"/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
+
+	# Fix appending -Wl,-rpath-link on non-Linux (-> FreeBSD).
+	eapply "${FILESDIR}"/6.0.1/0001-cmake-Append-Wl-rpath-link-conditionally-to-GNULD.patch
+
+	# Fix assembly compatibility with binutils-2.31.1
+	# https://bugs.gentoo.org/663442
+	eapply "${FILESDIR}"/6.0.1/0002-llvm-mc-Produce-R_X86_64_PLT32-for-call-jmp-foo.patch
+
+	# Fix x86 codegen bug triggered by Chromium
+	# https://bugs.gentoo.org/664868
+	eapply "${FILESDIR}"/7.0.0/0001-X86-Stop-X86DomainReassignment-from-creating-copies-.patch
+
+	# disable use of SDK on OSX, bug #568758
+	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
+
+	# User patches + QA
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	local ffi_cflags ffi_ldflags
+	if use libffi; then
+		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
+		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		# disable appending VCS revision to the version to improve
+		# direct cache hit ratio
+		-DLLVM_APPEND_VC_REV=OFF
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=ON
+		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		-DLLVM_ENABLE_FFI=$(usex libffi)
+		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+		-DLLVM_ENABLE_LIBXML2=$(usex xml)
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DWITH_POLLY=OFF # TODO
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
+		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
+		# used only for llvm-objdump tool
+		-DHAVE_LIBXAR=$(multilib_native_usex xar 1 0)
+
+		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
+		-DOCAMLFIND=NO
+	)
+
+#	Note: go bindings have no CMake rules at the moment
+#	but let's kill the check in case they are introduced
+#	if ! multilib_is_native_abi || ! use go; then
+		mycmakeargs+=(
+			-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+		)
+#	fi
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+	)
+
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			-DLLVM_BUILD_DOCS=$(usex doc)
+			-DLLVM_ENABLE_OCAMLDOC=OFF
+			-DLLVM_ENABLE_SPHINX=$(usex doc)
+			-DLLVM_ENABLE_DOXYGEN=OFF
+			-DLLVM_INSTALL_UTILS=ON
+		)
+		use doc && mycmakeargs+=(
+			-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+			-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+			-DSPHINX_WARNINGS_AS_ERRORS=OFF
+		)
+		use gold && mycmakeargs+=(
+			-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen"
+		[[ -x "${tblgen}" ]] \
+			|| die "${tblgen} not found or usable"
+		mycmakeargs+=(
+			-DCMAKE_CROSSCOMPILING=ON
+			-DLLVM_TABLEGEN="${tblgen}"
+		)
+	fi
+
+	# workaround BMI bug in gcc-7 (fixed in 7.4)
+	# https://bugs.gentoo.org/649880
+	# apply only to x86, https://bugs.gentoo.org/650506
+	if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] &&
+			[[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]]
+	then
+		local CFLAGS="${CFLAGS} -mno-bmi"
+		local CXXFLAGS="${CXXFLAGS} -mno-bmi"
+	fi
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+
+	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
+	pax-mark m "${BUILD_DIR}"/bin/lli
+	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
+
+	if use test; then
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake-utils_src_make check
+}
+
+src_install() {
+	local MULTILIB_CHOST_TOOLS=(
+		/usr/lib/llvm/${SLOT}/bin/llvm-config
+	)
+
+	local MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/llvm/Config/llvm-config.h
+	)
+
+	local LLVM_LDPATHS=()
+	multilib-minimal_src_install
+
+	# move wrapped headers back
+	mv "${ED%/}"/usr/include "${ED%/}"/usr/lib/llvm/${SLOT}/include || die
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+
+	# move headers to /usr/include for wrapping
+	rm -rf "${ED%/}"/usr/include || die
+	mv "${ED%/}"/usr/lib/llvm/${SLOT}/include "${ED%/}"/usr/include || die
+
+	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)" )
+}
+
+multilib_src_install_all() {
+	local revord=$(( 9999 - ${SLOT} ))
+	cat <<-_EOF_ > "${T}/10llvm-${revord}" || die
+		PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
+		# we need to duplicate it in ROOTPATH for Portage to respect...
+		ROOTPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
+		MANPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
+_EOF_
+	doenvd "${T}/10llvm-${revord}"
+
+	# install pre-generated manpages
+	if ! use doc; then
+		# (doman does not support custom paths)
+		insinto "/usr/lib/llvm/${SLOT}/share/man/man1"
+		doins "${WORKDIR}/${P}-manpages/llvm"/*.1
+	fi
+
+	docompress "/usr/lib/llvm/${SLOT}/share/man"
+}
+
+pkg_postinst() {
+	elog "You can find additional opt-viewer utility scripts in:"
+	elog "  ${EROOT}/usr/lib/llvm/${SLOT}/share/opt-viewer"
+	elog "To use these scripts, you will need Python 2.7 along with the following"
+	elog "packages:"
+	elog "  dev-python/pygments (for opt-viewer)"
+	elog "  dev-python/pyyaml (for all of them)"
+}
diff --git a/sys-devel/llvm/llvm-7.0.0-r1.ebuild b/sys-devel/llvm/llvm-7.0.0-r1.ebuild
new file mode 100644
index 000000000000..49fdc4c05a6c
--- /dev/null
+++ b/sys-devel/llvm/llvm-7.0.0-r1.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils eapi7-ver flag-o-matic multilib-minimal \
+	multiprocessing pax-utils python-any-r1 toolchain-funcs
+
+DESCRIPTION="Low Level Virtual Machine"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz
+	!doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/${P}-manpages.tar.bz2 )"
+
+# Keep in sync with CMakeLists.txt
+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_}" )
+
+# Additional licenses:
+# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
+# 2. ARM backend: LLVM Software Grant by ARM.
+# 3. MD5 code: public-domain.
+# 4. Tests (not installed):
+#  a. gtest: BSD.
+#  b. YAML tests: MIT.
+
+LICENSE="UoI-NCSA rc BSD public-domain
+	llvm_targets_ARM? ( LLVM-Grant )"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml
+	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-libs/zlib:0=
+	exegesis? ( dev-libs/libpfm:= )
+	gold? ( >=sys-devel/binutils-2.22:*[cxx] )
+	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
+	libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
+	xar? ( app-arch/xar )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )"
+# configparser-3.2 breaks the build (3.3 or none at all are fine)
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	|| ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5
+		( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
+	)
+	kernel_Darwin? (
+		<sys-libs/libcxx-$(ver_cut 1-3).9999
+		>=sys-devel/binutils-apple-5.1
+	)
+	doc? ( dev-python/sphinx )
+	gold? ( sys-libs/binutils-libs )
+	libffi? ( virtual/pkgconfig )
+	!!<dev-python/configparser-3.3.0.2
+	${PYTHON_DEPS}"
+# There are no file collisions between these versions but having :0
+# installed means llvm-config there will take precedence.
+RDEPEND="${RDEPEND}
+	!sys-devel/llvm:0"
+PDEPEND="sys-devel/llvm-common
+	gold? ( >=sys-devel/llvmgold-${SLOT} )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( ${ALL_LLVM_TARGETS[*]} )"
+
+S=${WORKDIR}/${P/_/}.src
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+src_prepare() {
+	# Fix llvm-config for shared linking and sane flags
+	# https://bugs.gentoo.org/show_bug.cgi?id=565358
+	eapply "${FILESDIR}"/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
+
+	# Fix x86 codegen bug triggered by Chromium
+	# https://bugs.gentoo.org/664868
+	eapply "${FILESDIR}"/7.0.0/0001-X86-Stop-X86DomainReassignment-from-creating-copies-.patch
+
+	# disable use of SDK on OSX, bug #568758
+	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
+
+	# User patches + QA
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	local ffi_cflags ffi_ldflags
+	if use libffi; then
+		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
+		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		# disable appending VCS revision to the version to improve
+		# direct cache hit ratio
+		-DLLVM_APPEND_VC_REV=OFF
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=ON
+		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		-DLLVM_ENABLE_FFI=$(usex libffi)
+		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+		-DLLVM_ENABLE_LIBXML2=$(usex xml)
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_LIBPFM=$(usex exegesis)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DWITH_POLLY=OFF # TODO
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
+		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
+		# used only for llvm-objdump tool
+		-DHAVE_LIBXAR=$(multilib_native_usex xar 1 0)
+
+		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
+		-DOCAMLFIND=NO
+	)
+
+#	Note: go bindings have no CMake rules at the moment
+#	but let's kill the check in case they are introduced
+#	if ! multilib_is_native_abi || ! use go; then
+		mycmakeargs+=(
+			-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+		)
+#	fi
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+	)
+
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			-DLLVM_BUILD_DOCS=$(usex doc)
+			-DLLVM_ENABLE_OCAMLDOC=OFF
+			-DLLVM_ENABLE_SPHINX=$(usex doc)
+			-DLLVM_ENABLE_DOXYGEN=OFF
+			-DLLVM_INSTALL_UTILS=ON
+		)
+		use doc && mycmakeargs+=(
+			-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+			-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+			-DSPHINX_WARNINGS_AS_ERRORS=OFF
+		)
+		use gold && mycmakeargs+=(
+			-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen"
+		[[ -x "${tblgen}" ]] \
+			|| die "${tblgen} not found or usable"
+		mycmakeargs+=(
+			-DCMAKE_CROSSCOMPILING=ON
+			-DLLVM_TABLEGEN="${tblgen}"
+		)
+	fi
+
+	# workaround BMI bug in gcc-7 (fixed in 7.4)
+	# https://bugs.gentoo.org/649880
+	# apply only to x86, https://bugs.gentoo.org/650506
+	if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] &&
+			[[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]]
+	then
+		local CFLAGS="${CFLAGS} -mno-bmi"
+		local CXXFLAGS="${CXXFLAGS} -mno-bmi"
+	fi
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+
+	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
+	pax-mark m "${BUILD_DIR}"/bin/lli
+	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
+
+	if use test; then
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake-utils_src_make check
+}
+
+src_install() {
+	local MULTILIB_CHOST_TOOLS=(
+		/usr/lib/llvm/${SLOT}/bin/llvm-config
+	)
+
+	local MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/llvm/Config/llvm-config.h
+	)
+
+	local LLVM_LDPATHS=()
+	multilib-minimal_src_install
+
+	# move wrapped headers back
+	mv "${ED%/}"/usr/include "${ED%/}"/usr/lib/llvm/${SLOT}/include || die
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+
+	# move headers to /usr/include for wrapping
+	rm -rf "${ED%/}"/usr/include || die
+	mv "${ED%/}"/usr/lib/llvm/${SLOT}/include "${ED%/}"/usr/include || die
+
+	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)" )
+}
+
+multilib_src_install_all() {
+	local revord=$(( 9999 - ${SLOT} ))
+	newenvd - "10llvm-${revord}" <<-_EOF_
+		PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
+		# we need to duplicate it in ROOTPATH for Portage to respect...
+		ROOTPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
+		MANPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
+	_EOF_
+
+	# install pre-generated manpages
+	if ! use doc; then
+		# (doman does not support custom paths)
+		insinto "/usr/lib/llvm/${SLOT}/share/man/man1"
+		doins "${WORKDIR}/${P}-manpages/llvm"/*.1
+	fi
+
+	docompress "/usr/lib/llvm/${SLOT}/share/man"
+}
+
+pkg_postinst() {
+	elog "You can find additional opt-viewer utility scripts in:"
+	elog "  ${EROOT%/}/usr/lib/llvm/${SLOT}/share/opt-viewer"
+	elog "To use these scripts, you will need Python 2.7 along with the following"
+	elog "packages:"
+	elog "  dev-python/pygments (for opt-viewer)"
+	elog "  dev-python/pyyaml (for all of them)"
+}
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 2015c629e33a..4c5bbe6fb152 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/bees/Manifest b/sys-fs/bees/Manifest
index dd95c2c90fda..f0a3b555bf09 100644
--- a/sys-fs/bees/Manifest
+++ b/sys-fs/bees/Manifest
@@ -1,2 +1,4 @@
-EBUILD bees-9999.ebuild 2001 BLAKE2B 7fa1c9d043a4334579dfad3560d1593717e548c0d31695cf8ccf8ffe45f2347584c7da43b47cad873745f3c843207433c6b892a0469c5618f107c68f78fd5fe2 SHA512 d49266e007895c049e1c9f7e28ec2f649b386a6441eccba02ee411f14ad395925eecdaa8a747962ccc526f9e1d3aba9fd68f4452a1d276d4e5b7d48c80102cd8
-MISC metadata.xml 600 BLAKE2B f772b28d500fc9e77397073dd0f09e2522dbe9c4c5a17236018f050e10057b02a471ac284f480b58592d315352776b08b57316856b914441e9842b7e2f0ff6c9 SHA512 c69131207ee3485d539024c9b2a34be233d4066320346744038a0ae5c1177790288a0ea4cd9319323c3f23230213b706e7841dc1b5000ffdcc620f52bf9b7b07
+DIST bees-0.6.tar.gz 124049 BLAKE2B 7a2d77366758325cebbc51767781a3eff4fa52180b53ebf5eb982433bfc1c80acd4f3befa5968c888be443815e6231625e9ecc2763c35e33e5ed55c13bd702bc SHA512 bb288da8d2e0fad100dc40e3f9060055220e0ec948bc571a1cb06a7d78d0d0e6db30164e7dbde040c264c496cb59d50bb0694dd9432a8229e04f2cdc33bab31d
+EBUILD bees-0.6.ebuild 2099 BLAKE2B ca8f34586b0005dff546cc251be3696a3415c120847026e1d719f7e463ea82f5069730402d609c3447f3902eae494b4ec3d85fad783160fba01fdf893af45db2 SHA512 5a0a8a7b5a11f2bd5e2695e595c5688793ac314f1e5bd96b4a69783e696ac40172a8cd6447474bbbd8c6cc6836863e5e8ed5c3f5a0dab09ee41b6c48cc51bd0a
+EBUILD bees-9999.ebuild 2099 BLAKE2B 88a9e370419db85e8f459626489a4dd06fbc55abd59ad367229d0aa4eb360bbbca0d4f46e4feada0d01d434a360bdac4015c3bfc063af3eb1940c3ada6a34665 SHA512 65745b2e09d1b7231a9ea29d78479f68f2d3a628353032ccaaf43245376e526721fae5f0a22a3586462634271a9798feb4608bc2349a48d2c5e7df7052bf5970
+MISC metadata.xml 591 BLAKE2B 8744c233c9718ce545165c6c8deaa455efe283cfe186aeee9876ad31195891b1255ae20851e5d5f52c19f4bb038558dffd7c2f3bd091af1b0b5c3d6e7a717975 SHA512 333a091d0869955cc3fce76c1d462b44715f8f1b89017c1b240cd5398e53ee1b370f7fc2d76407efa8a045c1088a195786da072d4d6ec30c1f09f42977839b20
diff --git a/sys-fs/bees/bees-0.6.ebuild b/sys-fs/bees/bees-0.6.ebuild
new file mode 100644
index 000000000000..dfda78fae30b
--- /dev/null
+++ b/sys-fs/bees/bees-0.6.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info
+
+DESCRIPTION="Best-Effort Extent-Same, a btrfs dedup agent"
+HOMEPAGE="https://github.com/Zygo/bees"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/Zygo/bees.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/Zygo/bees/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="tools"
+
+DEPEND="
+	>=sys-apps/util-linux-2.30.2
+	>=sys-fs/btrfs-progs-4.1
+"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~BTRFS_FS"
+ERROR_BTRFS_FS="CONFIG_BTRFS_FS: bees does currently only work with btrfs"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		if kernel_is -lt 4 4 3; then
+			ewarn "Kernel versions below 4.4.3 lack critical features needed for bees to"
+			ewarn "properly operate, so it won't work. It's recommended to run at least"
+			ewarn "kernel version 4.11 for best performance and reliability."
+			ewarn
+		elif kernel_is -lt 4 11; then
+			ewarn "With kernel versions below 4.11, bees may severely degrade system performance"
+			ewarn "and responsiveness. Especially, the kernel may deadlock while bees is"
+			ewarn "running, it's recommended to run at least kernel 4.11."
+			ewarn
+		elif kernel_is -lt 4 14 29; then
+			ewarn "With kernel versions below 4.14.29, bees may generate a lot of bogus WARN_ON()"
+			ewarn "messages in the kernel log. These messages can be ignored and this is fixed"
+			ewarn "with more recent kernels:"
+			ewarn "# WARNING: CPU: 3 PID: 18172 at fs/btrfs/backref.c:1391 find_parent_nodes+0xc41/0x14e0"
+			ewarn
+		fi
+		elog "Bees recommends to run the latest current kernel for performance and"
+		elog "reliability reasons, see README.md."
+	fi
+}
+
+src_configure() {
+	cat >localconf <<-EOF || die
+		LIBEXEC_PREFIX=/usr/libexec
+		PREFIX=/usr
+		LIBDIR=$(get_libdir)
+		DEFAULT_MAKE_TARGET=all
+	EOF
+	if use tools; then
+		echo OPTIONAL_INSTALL_TARGETS=install_tools >>localconf || die
+	fi
+
+	# quickfix, will be removed when fixed upstream
+	sed -i "s/UNKNOWN/v${PV}/" src/Makefile || die
+}
diff --git a/sys-fs/bees/bees-9999.ebuild b/sys-fs/bees/bees-9999.ebuild
index 72fef108e72d..22a1b0a48880 100644
--- a/sys-fs/bees/bees-9999.ebuild
+++ b/sys-fs/bees/bees-9999.ebuild
@@ -60,6 +60,11 @@ src_configure() {
 		LIBDIR=$(get_libdir)
 		DEFAULT_MAKE_TARGET=all
 	EOF
+	if [[ ${PV} != "9999" ]] ; then
+		cat >>localconf <<-EOF || die
+			BEES_VERSION=v${PV}
+		EOF
+	fi
 	if use tools; then
 		echo OPTIONAL_INSTALL_TARGETS=install_tools >>localconf || die
 	fi
diff --git a/sys-fs/bees/metadata.xml b/sys-fs/bees/metadata.xml
index ba18bd51ea03..1231725fe211 100644
--- a/sys-fs/bees/metadata.xml
+++ b/sys-fs/bees/metadata.xml
@@ -10,7 +10,7 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 <use>
-	<flag name="tools">Build extra tools useful for debugging (fiemap, feiwalk, beestop)</flag>
+	<flag name="tools">Build extra tools useful for debugging (fiemap, fiewalk)</flag>
 </use>
 <upstream>
 	<bugs-to>https://github.com/Zygo/bees/issues</bugs-to>
diff --git a/sys-fs/dosfstools/Manifest b/sys-fs/dosfstools/Manifest
index a00b189d7e5b..cab325f5d379 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 1001 BLAKE2B ddc181a69a0168f18c8f35040aab32f00707660e1e17f1b418d630250a3a917bef43c66e594183e9727f1f676d23edb3c76d7f4c6ddbd484596d465dddbffed5 SHA512 26afe1536b2d6902b09a569820c501cbca6570802c61c6c2137fccffdcf1a4dc8899eb849175f10e569487c5db2ce29a791beaea2ef2ae14d9782f11d6677f82
+EBUILD dosfstools-4.1.ebuild 992 BLAKE2B 51e05ea5b1dadbcb7a8f751e44e858f1b3c99723f806e76aca14969f2ed2a156c21d76f38621f16da95eea5c0b98f6c7ebeb97a0648145ac13284ffaa911a595 SHA512 1539f755bea79409f8adb3e275da612fc0040bf57f6aae058431d713a98054f4da37fc2fef83d60fc76be7179ec580077482395cb356599c069995b14f9fc165
 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 00dc71c5ffad..c78c0fbac6ff 100644
--- a/sys-fs/dosfstools/dosfstools-4.1.ebuild
+++ b/sys-fs/dosfstools/dosfstools-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="5"
@@ -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 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="compat test +udev"
 
 CDEPEND="udev? ( virtual/libudev )"
diff --git a/sys-fs/fuse-zip/Manifest b/sys-fs/fuse-zip/Manifest
index a150378f8396..e78f12238fd7 100644
--- a/sys-fs/fuse-zip/Manifest
+++ b/sys-fs/fuse-zip/Manifest
@@ -1,3 +1,4 @@
-DIST fuse-zip-0.4.2.tar.gz 672323 BLAKE2B f21a630c3aee48547efa354069410e5c1691fa358fe925d55b3839d0c514b9f886b6a39629132956104406c77485f6c1976d81801f7f86781c3225dd7f4d3e38 SHA512 73e38ee96b6bd24ee74b13e57994dddcd97abb99997c1d2bae4801f37a2cf1665cef0cbe4c6cca26d8423c4a9cb5fec2583ad033e242b4807ae87719f2e5f2a7
-EBUILD fuse-zip-0.4.2.ebuild 881 BLAKE2B 663b579c733087e8af1e34d5940c6045e33bbcc330a95fb49071cb8edfaa9f1d8e52a741156a11f5871a9a86a4439952acd2de3a137c80b18783b6c392f49260 SHA512 d521fc413a82072f38cd9193a5bc0f24cd86f0b882c7b6a0d70ed1be130130efce4f99e0c9b361b5d48cb87fdec6087a0f80b39fba9a62715073fa400956a212
+AUX fuse-zip-0.4.5-makefile.patch 820 BLAKE2B cf6bbce2be6d9da05ab6974759b1fde5f05f0ab1f4fbda79dc0dd439409480a183d6e3c116dc488c9f8e098be47dfad7ea1adb1c4b0d07daef854c70d655763f SHA512 64eb06111deaa858558de068a331c0b086983390c13be39857b38a87e5d24ddb9efe652e4612a3cd50c45dc052dc2f147743c898a5933aa6828fc0810d47d9b6
+DIST fuse-zip-0.4.5.tar.gz 687727 BLAKE2B 5a03eee7e44eb0599129c3266cf8779545426e8992b8d4a473ca87e3b65c51bdde5720e9cea3e5a121b2983dd320f7ff4f352359702e5e2e8e83598153d575c5 SHA512 5a3338d8b820ec5b218db849d139b74d2f4413b94ec75ba8d1a69b8d0e3fdbca0195b1af2f33322fdf9c35f56d3e2e5c4142a7ff3fd3a84bfe7649bbe29b6e98
+EBUILD fuse-zip-0.4.5.ebuild 696 BLAKE2B e52b9478f293898c3ff965fc10f942695b75715b8e5d13f0025b9372f118e0f0eb70eb84de0bbb256e4d006a392e81c38e2767ff0d0b7ca5a1c76ae0b4ca82c0 SHA512 86a8e8f055b969fc1cdcfe10d1655455f24b982cacddac2d8ac2f51b13640183b67ea461df7ef7416be5d9a924fd28778deb869a23f03646b646ebada590868d
 MISC metadata.xml 383 BLAKE2B 9fbc9f2c9ddbe2560cee3301a08f6705818607c3f43deea8a964208843eb4954ec3169362ffea084689e90313a9e18518c315a422de8719a6bbeda103358257f SHA512 e7962c4db2054e682b47d78745cbea5bd0a1d2da9c2d17dc4e48b7f88f83ac18515f23f5ae09a3b07b6bb0ad81cb28881ba9bca977f35536503b8737a3134fce
diff --git a/sys-fs/fuse-zip/files/fuse-zip-0.4.5-makefile.patch b/sys-fs/fuse-zip/files/fuse-zip-0.4.5-makefile.patch
new file mode 100644
index 000000000000..d72e5eb99e6c
--- /dev/null
+++ b/sys-fs/fuse-zip/files/fuse-zip-0.4.5-makefile.patch
@@ -0,0 +1,29 @@
+--- A/Makefile.orig	2018-02-04 03:55:50.000000000 +0100
++++ B/Makefile	2018-10-02 12:14:42.209976366 +0200
+@@ -1,5 +1,5 @@
+ DEST=fuse-zip
+-prefix=/usr/local
++prefix=/usr
+ exec_prefix=$(prefix)
+ bindir=$(exec_prefix)/bin
+ datarootdir=$(prefix)/share
+@@ -62,18 +62,12 @@
+ install: all doc
+ 	mkdir -p "$(DESTDIR)$(bindir)/"
+ 	$(INSTALL_PROGRAM) "$(DEST)" "$(DESTDIR)$(bindir)/"
+-	mkdir -p "$(DESTDIR)$(docdir)/"
+-	$(INSTALL_DATA) $(DOCFILES) "$(DESTDIR)$(docdir)/"
+-	mkdir -p "$(DESTDIR)$(man1dir)/"
+-	$(INSTALL_DATA) $(MAN) "$(DESTDIR)$(man1dir)/"
+ 
+ install-strip:
+-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
++	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM)' install
+ 
+ uninstall:
+ 	rm "$(DESTDIR)$(bindir)/$(DEST)"
+-	rm -r "$(DESTDIR)$(docdir)"
+-	rm "$(DESTDIR)$(man1dir)/$(MAN)"
+ 
+ dist:
+ 	./makeArchives.sh
diff --git a/sys-fs/fuse-zip/fuse-zip-0.4.2.ebuild b/sys-fs/fuse-zip/fuse-zip-0.4.2.ebuild
deleted file mode 100644
index 4436c8c05131..000000000000
--- a/sys-fs/fuse-zip/fuse-zip-0.4.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="FUSE file system to navigate, extract, create and modify ZIP archives"
-HOMEPAGE="https://bitbucket.org/agalanin/fuse-zip"
-SRC_URI="https://bitbucket.org/agalanin/${PN}/downloads/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-libs/libzip-0.11.2:=
-	>=sys-fs/fuse-2.7:="
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
-
-src_prepare() {
-	# Fix strip than installing fuse-zip
-	sed -i -e 's/install -m 755 -s/install -m 755/' Makefile || die "sed failed"
-	#enable parallel build
-	sed -i -e "s:make :\$\(MAKE\) :" Makefile || die "sed failed"
-	# Fix prefix
-	sed -i -e "s:^prefix=.*:prefix=/usr:" Makefile || die "sed failed"
-}
-
-src_compile() {
-	emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} ${LDFLAGS}"
-}
diff --git a/sys-fs/fuse-zip/fuse-zip-0.4.5.ebuild b/sys-fs/fuse-zip/fuse-zip-0.4.5.ebuild
new file mode 100644
index 000000000000..a6bf2433100a
--- /dev/null
+++ b/sys-fs/fuse-zip/fuse-zip-0.4.5.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="FUSE file system to navigate, extract, create and modify ZIP archives"
+HOMEPAGE="https://bitbucket.org/agalanin/fuse-zip"
+SRC_URI="https://bitbucket.org/agalanin/${PN}/downloads/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-libs/libzip-0.11.2:=
+	>=sys-fs/fuse-2.7:="
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"
+
+DOCS=( changelog README.md )
+
+PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
+
+src_compile() {
+	emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} ${LDFLAGS}"
+}
+
+src_install() {
+	default
+	doman fuse-zip.1
+}
diff --git a/sys-fs/lsscsi/Manifest b/sys-fs/lsscsi/Manifest
index 9f4362b25529..0751a0bb7e42 100644
--- a/sys-fs/lsscsi/Manifest
+++ b/sys-fs/lsscsi/Manifest
@@ -3,6 +3,6 @@ DIST lsscsi-0.28.tgz 150259 BLAKE2B e8376f306c61ebcbef055ba603bf42ece4dab13bd775
 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 345 BLAKE2B c6102c0262aba02d78cfa6274bcbba16bd6babf3939cc6b21b48dd14d0540ba4b42b7ffc998522c981442ab48781416bea75c8be43fef71a25ec5854b92ff783 SHA512 4d605fd75b3011f99dc0be2f07ff27c511272110bfebab22b1401c526ab5b0b590bf429fa557f5a69b3431920af42098f596feba1a27a040489ec92aef5f6e43
+EBUILD lsscsi-0.29.ebuild 340 BLAKE2B 7ec2757d4b6f46bc4b80dc1de287ef6235e1c876d8c738d22fd70c9f875af3dc0fc8242875e213096b5fa1632c548734b0350259de6335c7ba5aba25903d9f47 SHA512 1dd0ebe8a4d85a1dcf1f8d85095723077f34b5bf5285cb4e24094dcd175c4be261f1338d8479dab62f7b3d2c779770ea75fd9630d92e14c44980d4b0fa568b9d
 EBUILD lsscsi-0.30.ebuild 377 BLAKE2B aac0c30fcbd3b83940dab241e9bae9b62a8e31c36bbb293aa09997ed2a7d4483e1c73e89519c79ef2b546be0726ec24b8a29a9a8b5ad50028031cd5ddc55d4ef SHA512 d437e2da55502b0dbfc524c66409a3a90c255df0b92a27fb63d49059d1b5b9e9deec473e5abd0646be8e468f9ef2183e9b9cc10494c9e8ce08dfc810b25408df
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/lsscsi/lsscsi-0.29.ebuild b/sys-fs/lsscsi/lsscsi-0.29.ebuild
index 6664fe62da8f..f327ebdf96e8 100644
--- a/sys-fs/lsscsi/lsscsi-0.29.ebuild
+++ b/sys-fs/lsscsi/lsscsi-0.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
@@ -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/mtools/Manifest b/sys-fs/mtools/Manifest
index 50dfd9b25f91..1feca55eba1b 100644
--- a/sys-fs/mtools/Manifest
+++ b/sys-fs/mtools/Manifest
@@ -2,5 +2,7 @@ AUX mtools-4.0.18-attr.patch 1804 BLAKE2B dee4d21870fd9f633ef8966513960b74a1fdaf
 AUX mtools-4.0.18-locking.patch 5744 BLAKE2B 509462f40e2a832d1a04358972d606d29d6a0b5d7d095438d1c17bb8b7636aac382f9bb0055e669aed661a89bd6e018f1d88a588f0bddf701e5c0eb88449f94e SHA512 0698b5c5f5d4c22f3439a835c3bb6f73a90c3030073f3497fa04a8e29241af867f664f253b37299d69ca043858b55e7290aaab1fa6f751084a52e7812cae4170
 AUX mtools-4.0.18-memset.patch 877 BLAKE2B 5a331eb50cca56c64c135974b56bcc651e6f7498740cad8dc4c5121efe23802a228bb73e5f18ee20b0e3ef81ea6ebd78cc19e037556f0294519b54a84697f993 SHA512 1e8d697c1cd98a7fedaed96e6019b6af96bf5ed6633f50f7c45649555a27727d93ba828e2852f23fb633832902bdb93c23afacd7022c72adf5c4a146f5b8a1a8
 DIST mtools-4.0.18.tar.bz2 420190 BLAKE2B 92fdf8b054287e3cb4eddb40c98f5ac4229a38473b633c25ab74a07a8a72d38c2767ae648a35cf0dac9dedfa2f7789afc4904a50e1328e2baa0a289d93b094fb SHA512 3981a4727aa4e2ec5c931201b236f52fcd1c9d55f888cb2fbdc5c4172402e2b229ede9a5005b972ffdad59bcb861e2fcc01404845e521116419079ae78239090
+DIST mtools-4.0.19.tar.bz2 445566 BLAKE2B 2f35eaccb65ba39cb365ecaf1de95cff038370503bcb9dad4dc1bb654d00d1559c7183f8a30538f0fb6ce12332521083eefaa34f4eda9bdc9698cd54a0689fa9 SHA512 8928baa197bb3ad0f5e5b6852bfb1b4220bc50d19527e703025cec98bf9988faba496d91df71b14d936a095cc89ce92ce533abe9adf5fff2602f139cb3c6085a
 EBUILD mtools-4.0.18-r2.ebuild 1442 BLAKE2B 7aaa093e1f1bbc4df2201b1c66044141914cbf49479cbac748026604ead012f986dc5228340448d60aa169023f6f5b7a2d5d826e19bf5e2618059ab8bacdc4af SHA512 32a807769bebeffad14f2a366e5536cb9b055f24cfa3a15508267eb88e4015f33713e8fa338078834942fcfc0d44ac22e15bb3265f45ab96420466ed4c1b77d5
+EBUILD mtools-4.0.19.ebuild 1460 BLAKE2B d4dbeeb9a245221fd74e478a026bd35a618bbcf1a4d33ab9f1ad9dee0264fc77dbc1bbdcd3b9ea78128cfa54fa83c0611f2a3d266853dceb93b987bb7b2dd8bf SHA512 0601d64c3b944d8ee6727a934038addd6a4a24e3710ab4d7c0499541a7944506f35650c74188dc932b848e4c05e124b96f31afab702a1d0726bba94775f37941
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/mtools/mtools-4.0.19.ebuild b/sys-fs/mtools/mtools-4.0.19.ebuild
new file mode 100644
index 000000000000..241e6ded35ab
--- /dev/null
+++ b/sys-fs/mtools/mtools-4.0.19.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic
+
+DESCRIPTION="utilities to access MS-DOS disks from Unix without mounting them"
+HOMEPAGE="https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
+IUSE="X elibc_glibc"
+
+RDEPEND="
+	!elibc_glibc? ( virtual/libiconv )
+	X? (
+		x11-libs/libICE
+		x11-libs/libXau
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXt
+	)"
+DEPEND="${RDEPEND}
+	sys-apps/texinfo"
+# texinfo is required because we patch mtools.texi
+# drop it when mtools-4.0.18-locking.patch is no longer applied
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.18-locking.patch # https://crbug.com/508713
+	"${FILESDIR}"/${PN}-4.0.18-attr.patch # https://crbug.com/644387
+	"${FILESDIR}"/${PN}-4.0.18-memset.patch
+)
+
+src_prepare() {
+	default
+
+	# Don't throw errors on existing directories
+	sed -i -e "s:mkdir:mkdir -p:" mkinstalldirs || die
+}
+
+src_configure() {
+	# 447688
+	use !elibc_glibc && use !elibc_musl && append-libs "-liconv"
+	econf \
+		--sysconfdir="${EPREFIX%/}"/etc/mtools \
+		$(use_with X x)
+}
+
+src_install() {
+	local -a DOCS=( README* Release.notes )
+	default
+
+	insinto /etc/mtools
+	doins mtools.conf
+
+	# default is fine
+	sed -i -e '/^SAMPLE FILE$/s:^:#:' "${ED%/}"/etc/mtools/mtools.conf || die
+}
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index 9c037cdc6828..f35db4947a82 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -15,5 +15,5 @@ EBUILD squashfs-tools-3.2_p2.ebuild 953 BLAKE2B a4d1a831009bf68138e760847c6e9647
 EBUILD squashfs-tools-3.4.ebuild 937 BLAKE2B 77ce02b82aae8aae9a5e64b7c4e28e416d70bf92f1ce2d4b017eb3a3a9bd257e7355176c149668a85f757ddb66f017543b55f366782b2ad7c1bd8f01a0921689 SHA512 ea53dbc7607757087c89d6ce7e1396b0ffaa462534bfaadc13e4400172d242c5089c85d722f4b52e26c35cfeb328c9d2495f9d826e2fdcd24135934de55f924b
 EBUILD squashfs-tools-4.3-r2.ebuild 2129 BLAKE2B c5c6b8fb86ae83ddc1c4c22c528665123ab08b9d2fc212faea1f460d8be277ff26f7d9f58c4fd912d1b3a4d2a36d8a65028d922e9e50fbc2198859207ee44103 SHA512 f6623c42b03d85ec1d60b5c591d9467ce22ba202c3b8d73c303550825f5b9c0cd9bd62feafae4c615bea9301a1d8cb20aee9194bc8d26d20372ca974a5715fec
 EBUILD squashfs-tools-4.3_p6.ebuild 2102 BLAKE2B aff4d868da046f29a32d4a8c3b741bb4a6a443d1c8778e1ea3f0d2f35cd29f47d9f86060d51c8be1b0a34ef386338e958eeb9cd55328c7022559cb50539f755e SHA512 5bbe36316133880a5f4ef71f5edf6b0aa90a61e87f71f227de655a5c261996c6a9760e8672d3a39168a8b9e8f8f95b0fbd127ff30de43c7aad29ebb403fbc586
-EBUILD squashfs-tools-9999.ebuild 1627 BLAKE2B 0110dda14ddddc8ae01127b016df014d10a1fe278a12580469c352b0b7da70ff9a1aee7fbf4906ba6cf1908b7d0a8d0a4566e14a1ea6f540d8f8cb69e3c5d46d SHA512 5b285f492107a3de0302a5ea6c00382c667f0e69429bcd52ec906272c3e6ad1e15db0018b7ef5f3a5317383a0f5209cad59388a9f9eb42a30452e5204a9a7af3
+EBUILD squashfs-tools-9999.ebuild 1662 BLAKE2B 07e5705480853692733b18b433b5d08fa302cc24143c7ae4703efba82c8a563979e57528487e5326d2fb6d61bd864e6f8eccc978f62228124139d53103ccee38 SHA512 f5c9e3c4c4082bd6fbcb53c5ea7caccee5ebb3f86c393e883aa2d2fde1e1673b56e88b0e84781b298dcba9a58ff477d3cd50306cab968d2d456dd8102878d973
 MISC metadata.xml 619 BLAKE2B d54bfccd3de76d4c236ad8514d966713f72b61b6306d9c443ef72565ebb90c08e424b94d99276c499e403aeb28ce15e93a7fd4df00140a2200e99ab9cfa12fe5 SHA512 8da433deb63f3665c0423570472415dcb6b901686ba2cebe6e0f2a72a61a3226ebb6845755eb82dbc80478ec0a521793473c82f42938ad779877de11238195a9
diff --git a/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild b/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild
index 11c0570d7f45..5668f68d5054 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild
@@ -1,12 +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
 inherit flag-o-matic git-r3 toolchain-funcs
 
 DESCRIPTION="Tool for creating compressed filesystem type squashfs"
-HOMEPAGE="http://squashfs.sourceforge.net"
-EGIT_REPO_URI="https://github.com/plougher/squashfs-tools"
+HOMEPAGE="
+	http://squashfs.sourceforge.net
+	https://github.com/plougher/squashfs-tools
+"
+EGIT_REPO_URI="https://github.com/plougher/${PN}"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug lz4 lzma lzo static xattr +xz zstd"
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 611920959d30..092993c36618 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index b2b80100f0e8..53300d063c31 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -5,11 +5,9 @@ DIST ck-sources-4.18-muqss.patch 300666 BLAKE2B 6b813475a1aab23d47f261ec4a86717c
 DIST ck-sources-4.9-freezer-fix.patch 684 BLAKE2B 63894db45e5653af1851c7cee2493b6717d37f50d55c3a2b41316075d0f3e0bcb8975ff1c647c764bdf088ceeb4c716657e189d1e5337a69346e6dcefac332b9 SHA512 4241ca604f928263c29a49aca076832c06469db734864ec8c648cbbc30ba63cfb0b21d076ea4a7f3c438868802feb4e369d976e9ef6e091ce7bacf1a69c2c588
 DIST ck-sources-4.9-muqss.patch 303456 BLAKE2B be42cf125910d3978a6da69f5bd6050063b1bfba591c1a196bedf34f25338d57455ff1e8152a1ac11b05db4542058ec0283fe433ebb4c4312709400babccd21c SHA512 1325a18ce2f758ebf0aad95e29c4f2636eb952cf8306f863b1acbf74e982aecfbc82e321064c89fe19ee63938e4930662f40f55cd16284f86743effb79cef3ee
 DIST deblob-4.14 143883 BLAKE2B aaad9858bf626f1495f83187fd2ab91f812504534c7294cfb6818c773229eb780096a2c78a6aa963f3826df3cfdf7a7db5238f71fa8955c21b4acd75660d2b17 SHA512 662a11c03f51d85158175a8bf35fce20f01d94659d36b97a9773304ff9c091b2a9ab72a0445065c20188457fbe174fb43334a79e17b3a9e8553bb6144a971f4c
-DIST deblob-4.17 142269 BLAKE2B 7ac3e9565b1e72c0cba7590aa8ca8eedb3cab1b31cdbcced2a9170dac9b6e4b3979bc319c1b9b342827754b586ed8571057778862e294658c19c78e25d39dc81 SHA512 a0120c94ed132fec3870a836df715a8952aaad54c348938fecd6c755186c69f00b80c9f95fa8b33612d30bcb047fcb21a642a689b255e9ca4abc45e6d97c3e37
 DIST deblob-4.18 143094 BLAKE2B 6ad1f08bc48923dead72c25cc5e9ca2722d01f59b95684893b01717c0e1da67bb4b87c2516e74e0e4fdddbbaddc20960533dfedbdae7272c870bb76eb2d1a826 SHA512 4914fabe913a72e63e61b2f313a9e9147ede28971ceddd8ab4d3fd046f284d6020507a0b08b2e4251ddd7015ca942f1dba07fa6ec891f497418d4594196d2619
 DIST deblob-4.9 146273 BLAKE2B 8bc593ca375e003183dc6260aab0b2f81675b0814ec50fae3afe5d4ce9ce41c1c1401ce80e1c285153f610f8f730f82d6ad03e2578c792fd4af8779f2d1e3079 SHA512 3654b28e72b343bafdb38de10ef0c3621db0539bc0e7434bc99bb8f8ed911d4c9e53ca4785fd193fcfec369328f014fa5c6f3bda51b6f1a8f98b8c37ece119a6
 DIST deblob-check-4.14 755969 BLAKE2B 5573bdf913554e23dba3d3c56227a2c8c3fcfad7f4a99e1ec9208171008b5d2d50bdc55000672af95e020ef8171325b9d1797a69c988b4df5b0f71bc2a186fad SHA512 09626864cea33804d3dc94ceb691b24b6c14d1b9531eee8e745276dbc403903d762b1f75d685bf831f42b942d6f7ea265efb0d4889fecc976d95b11faf843fd3
-DIST deblob-check-4.17 772327 BLAKE2B 1c004c633bfb9948fb4f4529b4adc222f3aa8fbeb01d7eec3d60f574420187977db8e151c9ee963bf54a7580ae2a519acf9e39d416dce79b34246695406aa87f SHA512 bcd5406b566dd59d8d82c293866ccdf8d37e62f6b1283f83042b1a5c366764a4f16a873a4179eacbd7cf6422fbd746f6e8a5f2c02f4f062bcd63a549b9b46c52
 DIST deblob-check-4.18 781430 BLAKE2B b5e23f938eb7641ce6127cf2b0909a910f698e8d1ffd34212f999eb5d7a62e2c1846f30b7e349ec1dc995ee24d7fdc824c9dbf3c66cdcf3ceb2a4f457368c6fb SHA512 70ef576b3e56c6671a9c533e7766899e87a197d057639f603ff185dcd3de2e0cc17d51eb725b5b4c6a1ef52e1caa8e4875ae1d65e6d2876447513d1ba0710cba
 DIST deblob-check-4.9 717834 BLAKE2B f2471b45f6953ce83c0819b9157ce638a1d93959ec4074a329766ecb0c3adf90fd3022307ea70c2cb3bd3c291f98d6153576cc6597c62ca97abae6524b98112e SHA512 46258698f1c574b44a8c5c78cc2b7fdbaca746976266974ee0f6787904531754b17ad15d542b68e07d4633ee91a8e2d9c32a991ea214292ac072c4f26deed9c9
 DIST genpatches-4.14-69.base.tar.xz 1723168 BLAKE2B c0c9cbf34647abacefe97a76962f7b460ee3fda43a6530dd4eb8a380647842d7508c4e190aa05ee2eaa372e557c4528d1d36100f4a838727e633ba0d41de0979 SHA512 16b38854b1bfe9cbafa4feacc77dd88bde74e9d860db08cb143e2917360d80eb71bc298517b325eef1cabafcce0f35f0debf95e9122a6a016b3381a104a38e27
@@ -27,15 +25,18 @@ DIST genpatches-4.14-75.extras.tar.xz 17488 BLAKE2B 64b765bc55181449566ef672bdbc
 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.17-12.base.tar.xz 246780 BLAKE2B 64cafd4ba5492db8df42f20d92040fa758d61044398562432f0111d07a4e8e3a5dcf9c2c1d52cb503f10ffc44162616185697186344cd5291390457a807aa376 SHA512 b9ea2c3181dac826da6db02bfb677f8889b9ff06497e7231b1ddb90cdcc6b8be70b85d25c70ccea874493fe26c338f2639fd5aee8cfa77a164f4a2d07278e4e7
-DIST genpatches-4.17-12.experimental.tar.xz 5228 BLAKE2B 303a95aa5d28940446d41530e02b251a3b2a4fb5123f2f0f7d7ce9f674012b4be27e2f6149760efcc3e7a92d91b4be0a6c46d34b320f50f1b3317b205da1d38e SHA512 758f92ba2a94e1a5052dc2470fc2a459032a25954fd799b1aa15cfdc37335f6ad642d2c06ec13250134bdece9ca0b9c30ddba31d70ea47fce87c6d637aaa3f63
-DIST genpatches-4.17-12.extras.tar.xz 17496 BLAKE2B 4e62accefe05f592f514403a5ee38aaa3e68f629e2cdc9b4048ac9884b7ef26940b9663055614881fc849fdc2948aeecb12b81ed283d587c3cf765784453ff45 SHA512 2c55ee4a36046b8c487ee2cf8a0484df9e00b529cf5d5296d3e7dc0f611a4ae748841574df2f996ffe81fcd98578bf9872523a795d3c2657df15f836af5a4975
+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.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
 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-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-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
@@ -54,17 +55,19 @@ DIST genpatches-4.9-130.extras.tar.xz 17356 BLAKE2B 299388e6feda84ee34d24583a8d1
 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-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 linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
-DIST linux-4.17.tar.xz 102165892 BLAKE2B b9e1fe2c063d2761b4d54594b841f6591fd6f5b634a402c07e0fa5518a2b271293d97c5a7a8e3c30c9c4d78df16bf20a4f0befe998c9a9393bb3290d2df1dda3 SHA512 4d9de340a26155a89ea8773131c76220cc2057f2b5d031b467b60e8b14c1842518e2d60a863d8c695f0f7640f3f18d43826201984a238dade857b6cef79837db
 DIST linux-4.18.tar.xz 101781564 BLAKE2B 138bdc49dc8871e5566b5e23a9e5ed0e68fff480a7a04fc659a9efe2d4bcc778ac01368a32bc5d1dbde870102ce7294b9d315f81c4e6e762ee781135e83033f2 SHA512 950eb85ac743b291afe9f21cd174d823e25f11883ee62cecfbfff8fe8c5672aae707654b1b8f29a133b1f2e3529e63b9f7fba4c45d6dacccc8000b3a9a9ae038
 DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
-DIST patch-4.17-ck1.xz 94940 BLAKE2B 06eab5fdf2d77ad3c6d7c66d799c23f70ea4f147ae7af8455366909d3a5eb98f979ebb2546a24ecfdbde4cea8e2a000ed4be080d211678b24fa2ea27554dee29 SHA512 ca04ea335189042b90c9ecc3a2cdac4d0f8f4a7c1f8fa2bd05e7a792193d7a0f7f369ba8acbe7bc620fa63375e90990e58c3cb8546bfd2b35d153f8535ed1862
 EBUILD ck-sources-4.14.63.ebuild 2074 BLAKE2B 3c93cd6cb5d9b9374b15307cff90d49c5f5f47036459dcb73668d1a9be821365b44de0ffadc0b8f1d096b6f9e6b9e44912a276f46a3cf60d6395441475e277d1 SHA512 5a6151ed3c57260b02014fc33ee9ec692a3a38dcbcfc0ead53671ab4216b7467edbb14484b8491c1e6ea089f78591fa3da1c62fd5134690b02cd77b7b08425b0
 EBUILD ck-sources-4.14.66.ebuild 2074 BLAKE2B 43b30874c7c219b51b2c3817251fd9be52b2230a82ba8a82ce8897fa4819f81cbdbdbdbe8ef452633df7097bd5d03d79aa98adbed4391ccea3e926a806d3fb3e SHA512 d5779b7e8df3b002696c3c265c9a84312d156883c8e074b0eb040222014420e52af644fad6da326c0bb623070668beef0148716ce852422ce987a15591478b1a
 EBUILD ck-sources-4.14.67.ebuild 2074 BLAKE2B f7146a9c010f385bd795b0af2794d1520072785aaf5fda59796bc33c0f173d4bb10b2a05a46f49d779a450bc6ee2ffe28d13a7770da4fd9873a7361ae09e1ebe SHA512 e9b153c30995710d37380eea6d1436cd67e0667aff9672bceda11042049e08a4646134af370d40e3d451a30dfd9d769e7b962430c8e7a79304292d51c83c0561
 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.17.11.ebuild 1578 BLAKE2B 464a1f4c40b54ffccd6d63318bc3a5691a0271926f0d5774fb1016f7279f1481888f19db2f8252a55763cf90fe53f99eed1d84f3d8d2721085e530b17fb2ea3c SHA512 251740fb29bd7d4a145b42ab9618c18732f44fc889e3cd29a574ad66f52d1f383f6bfc1fb432400ea5291b2b0ceac89a7e7bd6571fa9b4a0f5e028df3d13cf9b
+EBUILD ck-sources-4.14.73.ebuild 2073 BLAKE2B 0110288e6a73b02fb59b848787423acb968bb7caf9eea90cf7730b709e0e6a9c26d7fb4540eaa186d1bb6403f2544eb8ac2ab63fc3282e51fa46a1c5cd188158 SHA512 8272b48308fab58379e9f75d3079ef2a602340d1b578c735b545338f6ce7727528a819a7f157cf96ca56b974dbfbf5bfda6038e2b3c323eaed501f424accb154
+EBUILD ck-sources-4.18.11.ebuild 1511 BLAKE2B 8915cc92f239bceef46074191b5fc9afd2d89075d106700321e05715700a0754bae4720bd163aa18586317d272b4a6d01c0721477d69b9f437097339d3db5a53 SHA512 f09f855b5fe3ed9fd6b292d8c3f8e923cbbd47fce95ad2667b3b82f769fed69a3af154fba7f6c14694026b0d313bb27bed758bc9060561f6dcff87215e00ffce
 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
@@ -73,4 +76,5 @@ EBUILD ck-sources-4.9.123.ebuild 1774 BLAKE2B f4fccc1f084d4bd551ea97b269f7c991ed
 EBUILD ck-sources-4.9.124.ebuild 1774 BLAKE2B b71617301bdc9e3c07dbea8d7fb7769e9e4b1e988b48a0369ca5f91679de6797271929abcc3f50db29e73be604be75e1aa2152ab92480d2161ea31250cbb2f51 SHA512 5118b5076eb64b3796d05a5e86a31970dbf6675076cf308b70ed7e1fc189cb18d8ddcae117346bdeb6161a126fd0fe73b240287253f0557faec9efd8ffffe3f9
 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
 MISC metadata.xml 930 BLAKE2B 6db7f2d1532b0023fdf4c931210e471efce5566762d899ccbb8e40249d3622fea3a275f3ea7e42842b841655e22d9efd8831eaef661bc19d7354ad8a9eacc169 SHA512 30b9d4dbaae0820bdd294c1a94faa96d0d395ac3c9c7313e01f122a36349921cf624286022e750c43b80839018c348ab86baed21b34dc9c189fee0415e9c5fc6
diff --git a/sys-kernel/ck-sources/ck-sources-4.14.73.ebuild b/sys-kernel/ck-sources/ck-sources-4.14.73.ebuild
new file mode 100644
index 000000000000..9e4b49a70169
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.14.73.ebuild
@@ -0,0 +1,64 @@
+# 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="79"
+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
+}
+
+pkg_postinst() {
+	elog "CPU optimizations patch (from genpatches) is off by default."
+	elog "Set USE=\"experimental\" if you need this patch / feature."
+	elog "This can be set in /etc/portage/package.use (or make.conf)"
+	elog "make menuconfig as usual to edit .config for this feature."
+}
diff --git a/sys-kernel/ck-sources/ck-sources-4.17.11.ebuild b/sys-kernel/ck-sources/ck-sources-4.17.11.ebuild
deleted file mode 100644
index ae581c138e88..000000000000
--- a/sys-kernel/ck-sources/ck-sources-4.17.11.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"
-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="12"
-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="Con Kolivas' high performance patchset and Gentoo's genpatches for Linux ${K_BRANCH_ID}"
-
-CK_VERSION="1"
-
-CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.xz"
-
-CK_BASE_URL="http://ck.kolivas.org/patches/4.0"
-CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
-CK_URI="${CK_LVER_URL}/${CK_FILE}"
-
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/${CK_FILE}"
-UNIPATCH_STRICTORDER="yes"
-
-pkg_setup() {
-	use deblob && python-any-r1_pkg_setup
-	kernel-2_pkg_setup
-}
-
-src_prepare() {
-
-#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
-
-	# linux-info eclass cannot handle recursively expanded variables in Makefile #490328
-	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile" || die
-
-	kernel-2_src_prepare
-}
-
-pkg_postinst() {
-	elog "ck-sources previously enabled CPU optimizations by default."
-	elog "USE=\"experimental\" is now required to enable this patch."
-	elog "this can be set in /etc/portage/package.use (or make.conf)"
-}
diff --git a/sys-kernel/ck-sources/ck-sources-4.18.11.ebuild b/sys-kernel/ck-sources/ck-sources-4.18.11.ebuild
new file mode 100644
index 000000000000..b009eb9828d0
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.18.11.ebuild
@@ -0,0 +1,54 @@
+# 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="14"
+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
+}
+
+pkg_postinst() {
+	elog "CPU optimizations patch (from genpatches) is off by default."
+	elog "Set USE=\"experimental\" if you need this patch / feature."
+	elog "This can be set in /etc/portage/package.use (or make.conf)"
+	elog "make menuconfig as usual to edit .config for this feature."
+}
diff --git a/sys-kernel/ck-sources/ck-sources-4.9.130.ebuild b/sys-kernel/ck-sources/ck-sources-4.9.130.ebuild
new file mode 100644
index 000000000000..63e70f3bc755
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.9.130.ebuild
@@ -0,0 +1,59 @@
+# 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="134"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1 kernel-2
+detect_version
+detect_arch
+
+DEPEND="deblob? ( ${PYTHON_DEPS} )"
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+
+DESCRIPTION="Gentoo's genpatches for Linux ${K_BRANCH_ID}, with Con Kolivas' MuQSS process scheduler."
+
+MUQSS_VERSION="150"
+MUQSS_FILE="${K_BRANCH_ID}-sched-MuQSS_${MUQSS_VERSION}.patch"
+MUQSS_BASE_URL="http://ck.kolivas.org/patches/muqss/4.0"
+
+# clearly identify package name in distrdir
+MUQSS_DISTNAME="${PN}-${K_BRANCH_ID}-muqss.patch"
+
+CK_LVER_URL="${MUQSS_BASE_URL}/${K_BRANCH_ID}"
+CK_URI="${CK_LVER_URL}/${MUQSS_FILE} -> ${MUQSS_DISTNAME}"
+
+# solves bug #606866 (Fix build for CONFIG_FREEZER disabled.x)
+FRZR_HASH="7de569950716147ed436b27936628ee3ab5b45cc"
+FRZR_FILE="${PN}-4.9-freezer-fix.patch"
+FRZR_URI="https://github.com/ckolivas/linux/commit/${FRZR_HASH}.patch -> ${FRZR_FILE}"
+
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI} ${FRZR_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/${MUQSS_DISTNAME} ${DISTDIR}/${FRZR_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+pkg_setup() {
+	use deblob && python-any-r1_pkg_setup
+	kernel-2_pkg_setup
+}
+
+pkg_postinst() {
+	elog "CPU optimizations patch (from genpatches) is off by default."
+	elog "Set USE=\"experimental\" if you need this patch / feature."
+	elog "This can be set in /etc/portage/package.use (or make.conf)"
+	elog "make menuconfig as usual to edit .config for this feature."
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 45ee853575c4..200d8ed01660 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -13,6 +13,9 @@ DIST genpatches-4.14-78.extras.tar.xz 17492 BLAKE2B 204b65089d2f320424fff929d21f
 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.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
@@ -22,6 +25,9 @@ DIST genpatches-4.18-13.extras.tar.xz 17496 BLAKE2B defec1bd1c54e450673498b22bb6
 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.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
@@ -55,6 +61,9 @@ DIST genpatches-4.9-133.extras.tar.xz 17360 BLAKE2B 047b135d3c06e48c80eb84d75cca
 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-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
@@ -67,8 +76,10 @@ EBUILD gentoo-sources-4.14.65.ebuild 735 BLAKE2B ea78c02664501abea9fa390a09cc0c4
 EBUILD gentoo-sources-4.14.71.ebuild 742 BLAKE2B bc74daa96072fba3bdc880132b8c3ee089b922a783b83f5a05c88e5f34d5d0afc5c0e28509e97d93ed5109d4ce33d9af0cd5d8ca581688e4c2636b03387a3f11 SHA512 39b5b4306ecb1f4add091640cac1329b3c0b1e2794f980e09ef2a6c9dce664db655efe8af4465a6958f3113c7fa653b6811ba31a9ce1f99cb283f6dcec8f421b
 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.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.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
@@ -81,5 +92,6 @@ EBUILD gentoo-sources-4.9.122.ebuild 736 BLAKE2B 5ec7f2f3a8f97684ff8f68035b115f7
 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
 MISC metadata.xml 500 BLAKE2B 0876bc03bc9d32afee87523a55415ba549942acc4e9a1b65511ced2aa4038557854fd9f570dd1afb6d94ecd899d9cc48034911f547eb88ef76457cdfa62845e4 SHA512 c01d2263a3faff75c3b1f01eef806a9b0c0950c904c28c11b057cfdf2f5c302b95b20f45e649a3749c4ffafa6dafd759e7738bd8e807f23e49d2febaa212ec6b
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.74.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.74.ebuild
new file mode 100644
index 000000000000..1b1b0efb780f
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.74.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="80"
+
+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.12.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.18.12.ebuild
new file mode 100644
index 000000000000..e61f1e6deeff
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.18.12.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="15"
+
+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
new file mode 100644
index 000000000000..5e2e7a8e60d6
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.131.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="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/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index 7889077f1b03..fec0f47acb6c 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -4,9 +4,11 @@ DIST patch-4.19-rc2.patch 38326203 BLAKE2B 7cb9f6a80591dcecc13b22d9990d2ea03218f
 DIST patch-4.19-rc3.patch 38635039 BLAKE2B c6f5840a1483c0a97b284f038f965d74b268c3f2eb7c60d7c0b6136e8d996482127653a000135af32a9c2d69d42bea571acbe88d1a0ee42be38fee07853aa121 SHA512 ba836197b02bc25af6201c819efc3266a8e12214161203b82aac488c28f939065b8b7887c035cfe3ca18f0cbec5b833bb9623277686b05228002f9f0f2986a8c
 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
 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
 MISC metadata.xml 596 BLAKE2B 967f959eca5873ccd58ab34aeabf965ec03e9ff41850fa4eb1c49f908ed7ad090ad2f5d7904f350c84cd47d99109e977835a2b216bb8605001b4098cdbdebda5 SHA512 c3476f5b64efc298e0df021b00dc4978a34ea48e5839a9cfee583291a4b5fe7ccc35db89a335db81e9c2cded36663691e6324dcabc90d0b287213d0fccddb227
diff --git a/sys-kernel/git-sources/git-sources-4.19_rc6.ebuild b/sys-kernel/git-sources/git-sources-4.19_rc6.ebuild
new file mode 100644
index 000000000000..d03b0ba0d27b
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-4.19_rc6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="4.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-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index 3e23cf4a1e17..afb0c669d781 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -1,6 +1,6 @@
 DIST linux-firmware-20180825.tar.gz 156618714 BLAKE2B 1bf44c456a87dce2e0622c8ef80bacae9d1aa76efacbb1519718be4a2c3e36a72b8baced8dc17953515052be923b85a8368179dfad591fbc7402521bce564e20 SHA512 583623fedf18a987a20cb6f5337146131a7b17a95ee79cb4b35199b6ecf42af039b824623235501685db18839c0d7e9e81cd79ed47fb993b4e72346bf9159021
-DIST linux-firmware-20180913.tar.gz 157719795 BLAKE2B 6eb2b9f4c753cf2b9fbef7e720d4fedcc452ca694c330a4884e5713050fbe2461e5ad135b6b514c8e84b3c2d8ae587b4b4017d390dcf7180d63c58e67c135d0c SHA512 1db808849d1858e1c7c444315adbe3e112c12ec739bc98f5b56e07b756563dec79fd84f709200d0c2c5e0b76134caac006ea747d224b67bfdf949dfcff6ce83c
+DIST linux-firmware-20181001.tar.gz 158397569 BLAKE2B 2694014f847fb60f5f0c208a479f4cdf0b422ef249735f22f0ef72e0fd385e8ba6737da1b1cf24daf74fd5f28c3c69b96e14850520f16b8a556c7ca734a3557e SHA512 f20b65122381423597cebd5a3018bbe55f0f8697a03b5ae3e7c1c6dd1cddcb1da4f3fddc8e4accb2d780faf1c0e66bed7dda6b1ab1c48d2e0b2435a5a7eb03f7
 EBUILD linux-firmware-20180825.ebuild 3267 BLAKE2B af9772d5a6ff37b56de73a8dd87b1b0a7b6e298e8e555e592d38f79352247a42c734509fd41e2649f6cc8a38eac9d0f3dad986b0dfd01fadc550998500ade419 SHA512 e03803624d6f37db6c8073b4600126febbe5de0b1df9c03f2f075fdf422e485c702358ccfd0f10121a81988d15a73fb715bae934ce8d5438c16d11b01638bc31
-EBUILD linux-firmware-20180913.ebuild 3280 BLAKE2B 6ad0fd38c7a5158ff493b5358af8e71a1e8b0564c4d83a07006b51d8a71adf932edfc2b8224f68f0454e22a53b2e0e600cb271ec6b3a62a0da26e352e3d02438 SHA512 5ca03c8b4eb4be1b913f7cc34307a0182ab6aa413a1b171af586d07ccfd3ec7411e769b58c6bb913266434d5ca4461c1a68bd23dd5b125fb0edd2b373e67f40b
+EBUILD linux-firmware-20181001.ebuild 3264 BLAKE2B 4f8dff705b3f70b953d3be7ecc8bfdc68a94e246d886d49e25982c49076b6b9925ec66f9994eac49a1546afd5dda668d4c237fbfbb1b0eb463b299722e1d656e SHA512 f540498b39140bb32f4cd23bed95df812f9268dcb40b0966bde4f366a5ba38c07f4b6528f09233f4ea892390d20064eb4195d339a2703a37bb054f35b99d3ec2
 EBUILD linux-firmware-99999999.ebuild 3240 BLAKE2B 672dd57268adc5adfbf53809ff5bd270d890fffd7b1fa243d706ef4d5ae314b827078514f76c4c6e972982c5df122542ef406ef258315376f94ae9f06d8f1cf3 SHA512 a72f9a5b5e3900be6ea59d38cd9ab6c76811cc68a4dedaade883fe932cf3742f36b4c7246c6057938a4011939d8b54f2bded6f67e5879aa4a8faf1c437fe0171
 MISC metadata.xml 570 BLAKE2B 16be542cd3a809097b54d505c5a4d93d5728e326d025f6c303404919832014868afb7cbb19e51052083d01d212ebb39f4a3d400bd1d2bd1bc676a5de9a9ddda8 SHA512 55b3274fb2d43a015620bdfa759c554a2e966b8a83b8fd72a6ef1c08dd0f3b8b0b6afba00fc846fa39b631e100d4df059aed44c98111a6a260d1a3f5048916c9
diff --git a/sys-kernel/linux-firmware/linux-firmware-20180913.ebuild b/sys-kernel/linux-firmware/linux-firmware-20180913.ebuild
deleted file mode 100644
index 1b03975e839a..000000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20180913.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit savedconfig
-
-if [[ ${PV} == 99999999* ]]; then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
-else
-	GIT_COMMIT="44d4fca9922a252a0bd81f6307bcc072a78da54a"
-	SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-DESCRIPTION="Linux firmware files"
-HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
-
-LICENSE="linux-firmware ( BSD ISC MIT no-source-code ) GPL-2 GPL-2+ freedist"
-SLOT="0"
-IUSE="savedconfig"
-
-DEPEND=""
-RDEPEND="!savedconfig? (
-		!sys-firmware/alsa-firmware[alsa_cards_ca0132]
-		!sys-firmware/alsa-firmware[alsa_cards_korg1212]
-		!sys-firmware/alsa-firmware[alsa_cards_maestro3]
-		!sys-firmware/alsa-firmware[alsa_cards_sb16]
-		!sys-firmware/alsa-firmware[alsa_cards_ymfpci]
-		!media-tv/cx18-firmware
-		!<sys-firmware/ivtv-firmware-20080701-r1
-		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
-		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
-		!media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
-		!net-dialup/ueagle-atm
-		!net-dialup/ueagle4-atm
-		!net-wireless/ar9271-firmware
-		!net-wireless/i2400m-fw
-		!net-wireless/libertas-firmware
-		!sys-firmware/rt61-firmware
-		!net-wireless/rt73-firmware
-		!net-wireless/rt2860-firmware
-		!net-wireless/rt2870-firmware
-		!sys-block/qla-fc-firmware
-		!sys-firmware/amd-ucode
-		!sys-firmware/iwl1000-ucode
-		!sys-firmware/iwl2000-ucode
-		!sys-firmware/iwl2030-ucode
-		!sys-firmware/iwl3945-ucode
-		!sys-firmware/iwl4965-ucode
-		!sys-firmware/iwl5000-ucode
-		!sys-firmware/iwl5150-ucode
-		!sys-firmware/iwl6000-ucode
-		!sys-firmware/iwl6005-ucode
-		!sys-firmware/iwl6030-ucode
-		!sys-firmware/iwl6050-ucode
-		!sys-firmware/iwl3160-ucode
-		!sys-firmware/iwl7260-ucode
-		!sys-firmware/iwl7265-ucode
-		!sys-firmware/iwl3160-7260-bt-ucode
-		!sys-firmware/radeon-ucode
-	)"
-#add anything else that collides to this
-
-RESTRICT="binchecks strip"
-
-src_unpack() {
-	if [[ ${PV} == 99999999* ]]; then
-		git-r3_src_unpack
-	else
-		default
-		# rename directory from git snapshot tarball
-		mv ${PN}-*/ ${P} || die
-	fi
-}
-
-src_prepare() {
-	default
-
-	echo "# Remove files that shall not be installed from this list." > ${PN}.conf
-	find * \( \! -type d -and \! -name ${PN}.conf \) >> ${PN}.conf
-
-	if use savedconfig; then
-		restore_config ${PN}.conf
-		ebegin "Removing all files not listed in config"
-		find * \( \! -type d -and \! -name ${PN}.conf \) \
-			| sort ${PN}.conf ${PN}.conf - \
-			| uniq -u | xargs -r rm
-		eend $? || die
-		# remove empty directories, bug #396073
-		find -type d -empty -delete || die
-	fi
-}
-
-src_install() {
-	if use !savedconfig; then
-		save_config ${PN}.conf
-	fi
-	rm ${PN}.conf || die
-	insinto /lib/firmware/
-	doins -r *
-}
-
-pkg_preinst() {
-	if use savedconfig; then
-		ewarn "USE=savedconfig is active. You must handle file collisions manually."
-	fi
-}
-
-pkg_postinst() {
-	elog "If you are only interested in particular firmware files, edit the saved"
-	elog "configfile and remove those that you do not want."
-}
diff --git a/sys-kernel/linux-firmware/linux-firmware-20181001.ebuild b/sys-kernel/linux-firmware/linux-firmware-20181001.ebuild
new file mode 100644
index 000000000000..f095154ff465
--- /dev/null
+++ b/sys-kernel/linux-firmware/linux-firmware-20181001.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit savedconfig
+
+if [[ ${PV} == 99999999* ]]; then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
+else
+	GIT_COMMIT="7c81f23ad903f72e87e2102d8f52408305c0f7a2"
+	SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 mips ppc ppc64 s390 sh sparc x86"
+fi
+
+DESCRIPTION="Linux firmware files"
+HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
+
+LICENSE="linux-firmware ( BSD ISC MIT no-source-code ) GPL-2 GPL-2+ freedist"
+SLOT="0"
+IUSE="savedconfig"
+
+DEPEND=""
+RDEPEND="!savedconfig? (
+		!sys-firmware/alsa-firmware[alsa_cards_ca0132]
+		!sys-firmware/alsa-firmware[alsa_cards_korg1212]
+		!sys-firmware/alsa-firmware[alsa_cards_maestro3]
+		!sys-firmware/alsa-firmware[alsa_cards_sb16]
+		!sys-firmware/alsa-firmware[alsa_cards_ymfpci]
+		!media-tv/cx18-firmware
+		!<sys-firmware/ivtv-firmware-20080701-r1
+		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
+		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
+		!media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
+		!net-dialup/ueagle-atm
+		!net-dialup/ueagle4-atm
+		!net-wireless/ar9271-firmware
+		!net-wireless/i2400m-fw
+		!net-wireless/libertas-firmware
+		!sys-firmware/rt61-firmware
+		!net-wireless/rt73-firmware
+		!net-wireless/rt2860-firmware
+		!net-wireless/rt2870-firmware
+		!sys-block/qla-fc-firmware
+		!sys-firmware/amd-ucode
+		!sys-firmware/iwl1000-ucode
+		!sys-firmware/iwl2000-ucode
+		!sys-firmware/iwl2030-ucode
+		!sys-firmware/iwl3945-ucode
+		!sys-firmware/iwl4965-ucode
+		!sys-firmware/iwl5000-ucode
+		!sys-firmware/iwl5150-ucode
+		!sys-firmware/iwl6000-ucode
+		!sys-firmware/iwl6005-ucode
+		!sys-firmware/iwl6030-ucode
+		!sys-firmware/iwl6050-ucode
+		!sys-firmware/iwl3160-ucode
+		!sys-firmware/iwl7260-ucode
+		!sys-firmware/iwl7265-ucode
+		!sys-firmware/iwl3160-7260-bt-ucode
+		!sys-firmware/radeon-ucode
+	)"
+#add anything else that collides to this
+
+RESTRICT="binchecks strip"
+
+src_unpack() {
+	if [[ ${PV} == 99999999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+		# rename directory from git snapshot tarball
+		mv ${PN}-*/ ${P} || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	echo "# Remove files that shall not be installed from this list." > ${PN}.conf
+	find * \( \! -type d -and \! -name ${PN}.conf \) >> ${PN}.conf
+
+	if use savedconfig; then
+		restore_config ${PN}.conf
+		ebegin "Removing all files not listed in config"
+		find * \( \! -type d -and \! -name ${PN}.conf \) \
+			| sort ${PN}.conf ${PN}.conf - \
+			| uniq -u | xargs -r rm
+		eend $? || die
+		# remove empty directories, bug #396073
+		find -type d -empty -delete || die
+	fi
+}
+
+src_install() {
+	if use !savedconfig; then
+		save_config ${PN}.conf
+	fi
+	rm ${PN}.conf || die
+	insinto /lib/firmware/
+	doins -r *
+}
+
+pkg_preinst() {
+	if use savedconfig; then
+		ewarn "USE=savedconfig is active. You must handle file collisions manually."
+	fi
+}
+
+pkg_postinst() {
+	elog "If you are only interested in particular firmware files, edit the saved"
+	elog "configfile and remove those that you do not want."
+}
diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index 94a6526bef99..b652eed6591d 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -17,9 +17,9 @@ DIST gentoo-headers-base-4.4.tar.xz 3911752 BLAKE2B 5031ecd48b99cb0c9c35ca935fa6
 DIST gentoo-headers-base-4.9.tar.xz 4052748 BLAKE2B e279954c56170fbfa4ebae8dade731825b3d5f0cd5d73a5b33cd93a9c8f5fa140e14edf0d5ac26a452fe8a61b16fdcc851f5329f56e4c8dcf4472a995de44c4c SHA512 a03418cfba7fa4531279d9122411af3e285e962506e8df9279fbbb27ae08a4e30725bd1cf03f48ad523f61f2889195e6c844fa4c7b4ef2f828baf47ef402abfa
 EBUILD linux-headers-3.18.ebuild 1433 BLAKE2B e9f705fade3656a6e3662737a30e44dc2c2354184304222fe466471440116762ad1976f6ca56d223bcd51afa82bde434c9d26c43450b274d0842f0ee87afef6d SHA512 8bba162f7ec52127681302a552fdb090a6fbe000e741307663d98003476a056ebc25e2cbd1b98f0e1bff0b8ef274627ff920901d3c79cf6196e16a5da04b8a98
 EBUILD linux-headers-4.13.ebuild 1507 BLAKE2B c52f49cf153cb2cb59bf9202c9eac06197da88e85353984048423300bdc0383ad70ce08b24f06839cd43cabebbee311c17b3482e42552d343c48ce2dbeb8c7df SHA512 f2635872e189cc11fea828b5d0e392218eef81b7a98807c12cfdccf8901fdefe96614d27174ebceaa35e492b358729b904669f285c852cd7535e4f595e7e98fb
-EBUILD linux-headers-4.14.ebuild 1528 BLAKE2B fb9310be0da0e7ae3db425d73b7de486c2d55377ed8b5357a8a046a001a50b20b2a50f503a2a765bf2d11353ab71d133e1e7426ba7850d7e69e1d30f7939a28d SHA512 9d224720d7a8a98b03a0c17ccc0bf322f4028b843b81b7b232417d13194ff188837595d66f592929b05379c4a4dd639e42ae79a2f66551f737aed0e29736ddf1
-EBUILD linux-headers-4.15.ebuild 1536 BLAKE2B a83e73bd199ff11a07add470819e3c8ff941923258ad584cd7485625537f1478a1cbab946591da1b81ffd820f1ff705c19a9313ee8c730b7a9b73d48aa9d94e7 SHA512 1fdae8c19fd456d6b9193a37147369717fae3518d4d840ff1c78d1809bd2f2841f8dd7c1572262ba3d973359c668825908d11e0f59be45cef03282d11963bfd2
-EBUILD linux-headers-4.16-r1.ebuild 1715 BLAKE2B 316cedd9071a98de5b60f949e1d093e755a27d639c4a58b33171079ab3caf13131672b6a20e3c0179dc9df684402515a6a1db4204a123d14019af382d908daa8 SHA512 98519dbcbb76fbd2fd727a20d6437889078bc892970c23bb0e00d7ed5d9e60f2621bed576e13762fd40d3dd2a6f24e999ae44285152b09c28526346582a5694c
+EBUILD linux-headers-4.14-r1.ebuild 1511 BLAKE2B 86939783a76ee8ec2aba59a954a6a5223d2b14cd6b6ae547e801bd93ebe23b54460d8be6462bafc378a21c66ec2460d9a64b4886afa5b3906f90fb37bf8cedfb SHA512 b4f47310efbe66727e310fe4415c7dbc1be3fd318f092186dc871269ee94353aa6e8265f175e06b3f5b7cd5420820da91cc8db2e998aa5d68ecd3bf5c8ae1b5a
+EBUILD linux-headers-4.15-r1.ebuild 1519 BLAKE2B 6d1b24772c1aea77fc91386872801ebe3fe06c2bbed531eb82c028f09fbce4b25fbb2883b487aff0e0fa491f5aa804ca18b43096c9fd2fa36df0cf4a6f1c79bc SHA512 43997a52bcdee13acb3e8fd8d6068fdd00deb8cbe18fe5874b2a0b53576a52293f0ce58973b018572947cd8e1f1c6f0a99bc8636ef2ad144a49bb35d11b53157
+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.4.ebuild 1507 BLAKE2B f2d0b18c5199f23281c13133126b8c9a44f82c5aefa67e301e07a23a92d47fb994a91c83a8bde12b6c31e1774f429ca1f7d9d82deb7e1675bc1ea1ee32f4b45d SHA512 043a707b24da31410c0c238fe504494dcade9d120508e951086b0176966cf053e63aab7463bdaacb5a7aba851959413bd9c99230c6e54d5bb128346a987dc105
diff --git a/sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild b/sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild
new file mode 100644
index 000000000000..48f732fede33
--- /dev/null
+++ b/sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild
@@ -0,0 +1,57 @@
+# 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 bfin cris frv hexagon hppa ia64 m32r m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 s390 score sh sparc tile x86 xtensa"
+inherit kernel-2
+detect_version
+
+PATCH_VER="1"
+SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
+	${PATCH_VER:+mirror://gentoo/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="!!media-sound/alsa-headers"
+
+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/linux-headers/linux-headers-4.14.ebuild b/sys-kernel/linux-headers/linux-headers-4.14.ebuild
deleted file mode 100644
index 3f0f236b112e..000000000000
--- a/sys-kernel/linux-headers/linux-headers-4.14.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="headers"
-H_SUPPORTEDARCH="alpha amd64 arc arm arm64 avr32 bfin cris frv hexagon hppa ia64 m32r m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 s390 score sh sparc tile x86 xtensa"
-inherit kernel-2
-detect_version
-
-PATCH_VER="1"
-SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
-	${PATCH_VER:+mirror://gentoo/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="!!media-sound/alsa-headers"
-
-S=${WORKDIR}/gentoo-headers-base-${PV}
-
-src_unpack() {
-	unpack ${A}
-}
-
-src_prepare() {
-	default
-
-	[[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/${PV}
-}
-
-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/linux-headers/linux-headers-4.15-r1.ebuild b/sys-kernel/linux-headers/linux-headers-4.15-r1.ebuild
new file mode 100644
index 000000000000..40da92cde1f3
--- /dev/null
+++ b/sys-kernel/linux-headers/linux-headers-4.15-r1.ebuild
@@ -0,0 +1,57 @@
+# 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 bfin cris frv hexagon hppa ia64 m32r m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 riscv s390 score sh sparc tile x86 xtensa"
+inherit kernel-2
+detect_version
+
+PATCH_VER="1"
+SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
+	${PATCH_VER:+mirror://gentoo/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="!!media-sound/alsa-headers"
+
+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/linux-headers/linux-headers-4.15.ebuild b/sys-kernel/linux-headers/linux-headers-4.15.ebuild
deleted file mode 100644
index e85428405f31..000000000000
--- a/sys-kernel/linux-headers/linux-headers-4.15.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"
-
-ETYPE="headers"
-H_SUPPORTEDARCH="alpha amd64 arc arm arm64 avr32 bfin cris frv hexagon hppa ia64 m32r m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 riscv s390 score sh sparc tile x86 xtensa"
-inherit kernel-2
-detect_version
-
-PATCH_VER="1"
-SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
-	${PATCH_VER:+mirror://gentoo/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="!!media-sound/alsa-headers"
-
-S=${WORKDIR}/gentoo-headers-base-${PV}
-
-src_unpack() {
-	unpack ${A}
-}
-
-src_prepare() {
-	default
-
-	[[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/${PV}
-}
-
-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/linux-headers/linux-headers-4.16-r1.ebuild b/sys-kernel/linux-headers/linux-headers-4.16-r1.ebuild
deleted file mode 100644
index 2a419772a98e..000000000000
--- a/sys-kernel/linux-headers/linux-headers-4.16-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="6"
-
-ETYPE="headers"
-H_SUPPORTEDARCH="alpha amd64 arc arm arm64 avr32 bfin cris frv hexagon hppa ia64 m32r m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 riscv s390 score sh sparc tile x86 xtensa"
-inherit kernel-2
-detect_version
-
-PATCH_VER="1"
-SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}-r1.tar.xz
-	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}
-	https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-${PV}-r1.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="!!media-sound/alsa-headers"
-
-S=${WORKDIR}/gentoo-headers-base-${PV}
-
-src_unpack() {
-	unpack ${A}
-}
-
-src_prepare() {
-	default
-
-	[[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/${PV}
-}
-
-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/linux-headers/linux-headers-4.16-r2.ebuild b/sys-kernel/linux-headers/linux-headers-4.16-r2.ebuild
new file mode 100644
index 000000000000..a8906fa89407
--- /dev/null
+++ b/sys-kernel/linux-headers/linux-headers-4.16-r2.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 bfin cris frv hexagon hppa ia64 m32r m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 riscv s390 score sh sparc tile x86 xtensa"
+inherit kernel-2
+detect_version
+
+PATCH_VER="1"
+SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}-r1.tar.xz
+	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}
+	https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-${PV}-r1.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="!!media-sound/alsa-headers"
+
+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/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index b02e6cc38af8..73d956d18bf4 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -3,14 +3,14 @@ DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97
 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.16.58.xz 2041612 BLAKE2B 1328b41f8b8c59d48de552ae557a6456e5359c463c05f5842a09d418018bf521c4c6f4b5eb22c3fa6c0b4e52e944c81692850d20e311ac21a50a80ac1e030f30 SHA512 364c7702d601245c536ef355fe19354b4f52e143c10dc9bc46235f83d202d0c0bdbe87d6455df7c7379f0a926d203abfbbe49bec1f1d9e5a62242a7ecf56bcd3
-DIST patch-4.14.73.xz 1791804 BLAKE2B 35e65123bf1c982170a559174eeb94bc009b44f74bb924f454e855fadfe50978941a6152e445e14cbd13adbb6af54d3c126f98711888a38ba37f1fbe30606897 SHA512 d509365295b6bb5ad55d8859a6cc7cae00ef7b7b34aef21167fcfc992accbf9ac1f4191446c911b55844b09ff0c7f83fd422aea71c2877521331b7b0e05a9205
-DIST patch-4.18.11.xz 304168 BLAKE2B 2394fc1b81857c815b7d7174e122cf34cede401c58de5f6c766afa216d109fca3fee7ebb7e88695a0dc916a493b7cbe6c98356bf1efa7fb4a1167659ae41582f SHA512 a1cfab9c4fb7bec8da33fa95da0986ed7605ff9953fd425f5122978c462a6024886955827ce52a87f93312d5e17a4533606bbabf3e6ad6a5dd353d430db92e7e
+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.130.xz 2248772 BLAKE2B a7e059b5ec45813089ab07baf3907fda140beb5b4556816dc04d04ed27c4c9afda68b00d91dc09020a555609656b7365cb20807f6ab856ccc0f3b27218089d8f SHA512 272856579a1ffb0bfd022639f25708af8f84fd98a433539293bc34d1edf3fdd02c3236b55caa78a90590ead2d73ccb69ff776bee0d99bd749a21279ee68dd8a6
-EBUILD vanilla-sources-3.16.58.ebuild 423 BLAKE2B 5acda14d8cb95461c977673ebdd223fd562cfe5fc58667b78a3cd62d96d1920f169f9676c2f6e60c6ad7ae3e2aaa2bdbbfe0b3c43467d9bcd868fd98699cb51d SHA512 4e599f139182f3e7040e2b3c0e13ee4712a67e6f7902bc1be1b73e198f5f2516511fc13032c10c28bdad2e74dea1459956f5f42021c50150932963590ce397ee
-EBUILD vanilla-sources-4.14.73.ebuild 423 BLAKE2B 5acda14d8cb95461c977673ebdd223fd562cfe5fc58667b78a3cd62d96d1920f169f9676c2f6e60c6ad7ae3e2aaa2bdbbfe0b3c43467d9bcd868fd98699cb51d SHA512 4e599f139182f3e7040e2b3c0e13ee4712a67e6f7902bc1be1b73e198f5f2516511fc13032c10c28bdad2e74dea1459956f5f42021c50150932963590ce397ee
-EBUILD vanilla-sources-4.18.11.ebuild 423 BLAKE2B 5acda14d8cb95461c977673ebdd223fd562cfe5fc58667b78a3cd62d96d1920f169f9676c2f6e60c6ad7ae3e2aaa2bdbbfe0b3c43467d9bcd868fd98699cb51d SHA512 4e599f139182f3e7040e2b3c0e13ee4712a67e6f7902bc1be1b73e198f5f2516511fc13032c10c28bdad2e74dea1459956f5f42021c50150932963590ce397ee
+DIST patch-4.9.131.xz 2263536 BLAKE2B 3792e6fec407d64c7a478f49352a50c63616ca6c5f66113023711cece268d54a77151ca17415cca806453aa5811027c78500a314556fc7f345d654eb5ee0f8bc SHA512 02228ddfb02b077ab48241b6e2e1fbc4e6994ad4fa37a8d2856d95b8ff6869a0750eb7effcb6ba6f36a8f58a3557d4b6e3c9c1b994b638b77702342df36b5136
+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.130.ebuild 423 BLAKE2B 5acda14d8cb95461c977673ebdd223fd562cfe5fc58667b78a3cd62d96d1920f169f9676c2f6e60c6ad7ae3e2aaa2bdbbfe0b3c43467d9bcd868fd98699cb51d SHA512 4e599f139182f3e7040e2b3c0e13ee4712a67e6f7902bc1be1b73e198f5f2516511fc13032c10c28bdad2e74dea1459956f5f42021c50150932963590ce397ee
+EBUILD vanilla-sources-4.9.131.ebuild 423 BLAKE2B 5acda14d8cb95461c977673ebdd223fd562cfe5fc58667b78a3cd62d96d1920f169f9676c2f6e60c6ad7ae3e2aaa2bdbbfe0b3c43467d9bcd868fd98699cb51d SHA512 4e599f139182f3e7040e2b3c0e13ee4712a67e6f7902bc1be1b73e198f5f2516511fc13032c10c28bdad2e74dea1459956f5f42021c50150932963590ce397ee
 MISC metadata.xml 642 BLAKE2B 6aa41c5f612d15c0b53c6aed058b2dd01bf9d7dd1ef8abb188f85cad84b43be94b3279d7c7ba50b3ac1b112c385ce01a8a8bf77d3a85dfd8e18838d7def5031d SHA512 b7e1d4e4e6a4a75046ace025fa1b42a38068dcbdafddf2b468287e9280832173617202c036b1ad1fb42c2f2e16920c44f0580039e3844cbb73402143361f764e
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.16.58.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.16.59.ebuild
index 4d8a2803b8a7..4d8a2803b8a7 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-3.16.58.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-3.16.59.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.14.73.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.74.ebuild
index 4d8a2803b8a7..4d8a2803b8a7 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.14.73.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.14.74.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.18.11.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.18.12.ebuild
index 4d8a2803b8a7..4d8a2803b8a7 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.18.11.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.18.12.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.130.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.9.131.ebuild
index 4d8a2803b8a7..4d8a2803b8a7 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.9.130.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.9.131.ebuild
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index fdaab7c7c535..cc8bf67b112f 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 b4c44c6f1813..6f0e84d6c24a 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 3607 BLAKE2B 11c27127f22d50c0ef7de7f2445356ca6c0f0648b2da34ae0994e4313c2d5f77f87dc8bb80ed47bdf3b642455a0fc83f91ea7c58e1f9597dc1703f545ab21174 SHA512 b97c1e80f5b92da523e20bd7b9f2a2e1bb743f7b6a38713f344153b95b5886d3fc8573039b7176bf8c52090566be8b8891fc8ce5e4596e315e1ed2acbcd8dd54
+EBUILD binutils-libs-2.30-r4.ebuild 3602 BLAKE2B 79fae579b8f61c1ba84ee242491d5cc38401814b9b15b07a8e1c77315790123569302b29999a96de97ea86e4e9ab456ed5a53b6f92ec6ca029725e8a0b811309 SHA512 ffae2a03e5c53c205bd92adf0afc77a4a52306dd52f2d488c1250758eb11ea6b72a38f10cf53ed0edcfb6994b98645ea3268eb88dc249441feca7d5e31b390d1
 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 5894685fb9bb..f44a3e1e5349 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/libcxx/Manifest b/sys-libs/libcxx/Manifest
index 2303e671aaa4..c982aed68d79 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -1,6 +1,7 @@
 AUX Makefile 874 BLAKE2B 67203d8f3223422b1ca2f4af614c0bf7e6c7658c93b206ccf3a3c978510e4ad4e5ad11ee1aea8fa27d2cfd560b553f475a24ccff1b547051918cbeda1951305c SHA512 96eef2e897075bc7d9fc799ce6c54f6a33ee917efd5666376ac578cb16e15d965205630dbd076f92a3a7091d58ecc235e37bc327c211bf3594244981f089135f
 AUX libcxx-3.9-cmake-link-flags.patch 1014 BLAKE2B 8e86059e00a5ebcd7a1528882876607c80ab14bcd0ebf2c8dbec87f71a48761e6433ff94db92b41192edb6e3cc74972cd9fb518f18a657229bd30afa3a65bdf8 SHA512 5df85c66bf865900197effe3905976bf165b4c4d79b8d14352753f6baca93ab5dc26bf735fd9478a0c13df489b860d8b629240134b7e26be6233138ea95dbab3
 AUX libcxx-3.9-cmake-static-lib.patch 7507 BLAKE2B ee900dc9409a24fbacceb1a74c9728995662a7b04d3df248c2cae433196e7e8e1bf984b19539249d6b14e29243f835176089f04241f0e7a577346968d703eb56 SHA512 435c14edfb7bca9ef35fa1e9e44ab9655d5b47e373e6437839027b6d56894a37dfb0f228cce062d84aaaf60677d9435b2cdee2c9248b4f25cf3f6890ec353f46
+AUX libcxx-7.0.0-libsupcxx-install.patch 1217 BLAKE2B 2f931095e638a4b7e4778233258d96b116e47be316106fca92e2f8762536af3ebcc6a084c1a78b4549bad91fcbb1ff5952b4f380b791ff58744519adea74ea8b SHA512 f370c84acafcf1ed5a5891af362e37f8107673e564052c200a0e6c3a7a0a551a7fa7d8f2eb173035909e37cfdef8b33cc121aa53a3807f2e33953e68656e2c2c
 AUX prepare_snapshot.sh 427 BLAKE2B 373ff29ec8da6e650d00f229fceeb171afacd6d66fe4abc86026410bf41ed6d3a4b5db5471fb54350cbeb0ea909e3e51404c6513a779328afc8a8f8db637deb1 SHA512 ebac2a467f8b1dfb68f1dc46a35f8294d1cf74b70be2a008217fa13b3366ddf4a9f2ebbe611cd63824f42305c5c0304aac2f46386b2956c9e07d82d5d984b435
 DIST libcxx-3.7.1.src.tar.xz 995724 BLAKE2B aab68f1b99a2c817e7154b71c04c81bd809154d1ae1c077a2dfede37319070729d6d768223b6ba5e2a866d6c2f18972dd501ce517864378ebc26c49cacafb635 SHA512 08d2399a8b36aa15290733256c896c9fa43f1a1223bc5c73bbcd014fddf8880e514d2a6dcc456bcf18b537c01fb6911b092e6d9958bccd8e64e9f375ed7a1ab9
 DIST libcxx-3.9.1.src.tar.xz 1209020 BLAKE2B 510e77c2c1163babbba904933f441e8720b0d366b9f0cfa2cdde2401368c224e00efd66afc1403b0087c40549cda4ebbc4d0c4b2d0906178324fa6158502d5ad SHA512 a5976e4096624a7307b3e43f4a22ac2dc74572226e0f57af9f3ef537a14c3cff1601b7042aef9dc40a0ee53ca76b08d72eb9c253dcf34f115d3153c302db7070
@@ -9,11 +10,11 @@ DIST libcxx-5.0.2.src.tar.xz 1530908 BLAKE2B e0c47d6803668267a71c75df873a136a2c3
 DIST libcxx-6.0.1.src.tar.xz 1552328 BLAKE2B 65a6addd04e530c2a72e8cba207282b9e9fafc01a594d7b11f63d10b6f88eca67a3cdf90b8055e410ede358d9be1f63fbe427f308e1337833447c0260d96e1c8 SHA512 c04f628b0924d76f035f615b59d19ce42dfc19c9a8eea4fe2b22a95cfe5a037ebdb30943fd741443939df5b4cf692bc1e51c840fefefbd134e3afbe2a75fe875
 DIST libcxx-7.0.0.src.tar.xz 1652496 BLAKE2B 7c8e4b7743a775a5f41ef1a2e511b44ca67af32be03f4fec9a4f70b49b540a442724afd69a312d68719ace3eee9e3d600c7596bda68496212827e140da5a258e SHA512 5ebf8418bc9d311c1744c257ab7a26cf2436a64a47451905df70ec64b12d25ec33acf99e1b9d552fd54ed850bed8f53dffde2ea20292ecd9976eaa31f144caf5
 EBUILD libcxx-3.7.1.ebuild 5335 BLAKE2B 6f4dbbb8dbc7f6e8b97f05ff3e638bb037bad416feffe5207a9cba166a5c0e0c92c3cac954088cc04cdf2a9be62f17cd5d7ece472e4e20d3c0be5b3c1edb2f52 SHA512 f4e04906e7205cd3d2f3180a0b897c1a9eaf5c65249bdbb62ed32a0455132009c88ae6f080b52abe6973752073ca3bc32e37e3491db9de2fc030cf77e4ed91b0
-EBUILD libcxx-3.9.1.ebuild 6815 BLAKE2B d15c83602e244f8a50e0a9d15869dbd4c7be226d8b1f93249cb6658149ad2408f0feada97403a0dfa3dcd8ac25b98ae084d1d17c879f67ae24d33f8497aba569 SHA512 9c9632590b49cd01ad324641ee296f08442940ab1dda1f0c7cdc77abe6b653f70d0baa9b796ef7d77e1f4728e96fe27fcd42d79a389cfcf2b2427b087b9985af
-EBUILD libcxx-4.0.1.ebuild 6453 BLAKE2B 2cab9946b4b79c4fc5310aae7ad32ae21f28a87e3e43c87731fe0542478342c4c7f5587472c39198b43f2a1f61329fc55a9e5c24804a34f70c70236e017eb964 SHA512 b656520a6bf00a73763fdf6f052869c76adb76ae9650d763c6b78a02393202c9bfeadd807ebafd6a071395aa64a0ede464fad0e4c127dfe39720e13342f82fc0
-EBUILD libcxx-5.0.2.ebuild 6363 BLAKE2B 8b4814e161304c2f69bf13e470c80ac1b681bbca60ce4076f4a06d22b35cea98e1f33a2afcfd7ef131d406ccdcde8f2dfaf9c4ea0b10ec7c40f13c0f259dbeba SHA512 820fbaa761cb4c078ed65f0bf6f4455428714d83628dd57f267b9480ef78a485ff2527bb98f71f10728cf58b8b53f699182ed52b9275dc9fd597eb41202884a4
-EBUILD libcxx-6.0.1.ebuild 6607 BLAKE2B aaab87d186c40106e35c90350eb57b820dda610cc65705c4464763f89067bc8f4ef09c023c03ebaaddcbc15c3a2982a9069ec0f940efe7959b58d0f45ea417dc SHA512 ec9f51f549956d45c1fd1ad42b8640fb2a390c51cf53abc3fc47f33077eb4b0d0a8d180bb4e8ecfeb408175c400147d13fbea6049a4346635416629a64179610
-EBUILD libcxx-7.0.0.ebuild 6609 BLAKE2B b812983026056b7223ec037688a4885a52aaac448a6f7939384d0d83ef4b67a165b887169db459768c8f818d557fda676bfa888cb602b9d825abd7741d4d5a5e SHA512 b88e4069c1236b9c2484420389250abf0b7d9bce6f8d4f1315528f7835008c41eb43df739db6694b017f4ee868e93135da7727963eb17d269a34a00b02b207c6
-EBUILD libcxx-7.0.9999.ebuild 6908 BLAKE2B edbb4b1c6fc2e2b813f5181f91b10dcc7106e806e222d02dc01cae726fab7df4323b198c497f5c39dc15ef4dd1a868ba4930e34b6bd5eb3399ad653846d25a11 SHA512 29fa5ef9ce51485d64458514a464e4000ba51b8b24535d0c57aca7777316e35ae901bf1c99fb148e28b6f54f01200d7a7457934d6c64ace1ca6b0ee5c39db872
-EBUILD libcxx-9999.ebuild 6880 BLAKE2B ba22276470631bb5e5e7781e0c2678b3a6a12bc6b5d39fcf37f20ffe5d2f90c24f0185c69d8cf79924a957fdcfd016609aa88f13f291d863a1919cef23e41f30 SHA512 0501d14d588a2231c6dbe15aee9428b66f7c3dad6915215abb65bdcc5aec23f8185a6aaa7bc838ad44bf7fc9ad2027fb68e33879b7f4a0ee311c71ff27fa0d4d
+EBUILD libcxx-3.9.1.ebuild 6954 BLAKE2B 041f1c1cbf105eace82b9d14ff2c4d1fbb55370cc0194896bf8a9ff2f43f9c2cab698402d0fc3833a0a73c09d8a4d76aed30133e3e36058aaf375112561484e7 SHA512 d8d080cd668a1d8833b1555def2d6383b63169e1091c54941f13707099627829246e70c94e8b070e429faab0b80b635e4a52b1a376eae110f7d818266b59937e
+EBUILD libcxx-4.0.1.ebuild 6592 BLAKE2B 79d1934e18efc7a221e235c372b15e13f71c0d58e41294385f1eaef39b9602336119aa6c1ca0ec608ee6497df14e3bcac9608cb8a01cb1f062eafcf7661145ce SHA512 a7cccd1799c55897ba0d116ef1cfeffe56d553429ea73618692b72de52e5d63d25417b518f0c9b2d96c30e7f6d0ed481d8e4d9d53046fe598f45de7473198c14
+EBUILD libcxx-5.0.2.ebuild 6502 BLAKE2B d6b0b4b2fc3ca56858c2b785da51187964074d55d5e9a1e2f7c4b6c41f4a819f7548cf56cff9977e1f65afbf4e9c1c6a699b44d6188d16c0aa0f3a5c0795790f SHA512 05bd5dd8bae0fae0f18bd69bd328482d8fea2004a70bbab72a3600c9c20071dd5108bee4ad770403594e7aa10e393783cc6703ccd279755383b58afcfbbce3ab
+EBUILD libcxx-6.0.1.ebuild 6746 BLAKE2B 616128b9d49049ac6de90b84f89a48c7033f5927edc5e15674df5e3a2225630f59a99c8047c71d9128304d726241ceaa1cefabf8d44e4b2d6a491611f63bee88 SHA512 3df9e7e79b62893441212fe7baa51190ac69f0bf64332718ae53596a043dc3583b8125bbcf7339cca7cf9937aa870ea0d8b12670700962c1cb22892f706e3129
+EBUILD libcxx-7.0.0.ebuild 6882 BLAKE2B 33c21050c65ce4c3ea40b511a50c84bfba2dfbadc947183a8ef1fba057bc88fae1ca604f9a4f4dd3736f32c88b804bc130fd4fe10cdfd30369cd408e13a7a422 SHA512 1b9a4b280c72b546734d900e250eb0d39310ea6a0dec9715a89ce1dfe5c4833bdd60f5072575b135ee56bde725417766e3fd6fef282668100097480a304f01dd
+EBUILD libcxx-7.0.9999.ebuild 7047 BLAKE2B eb80753b38042cdb3ae3f01db2c4dc9bc7a588e00bcf1d7da85d3c30c73e941bbc1096d9b6be67c21dd47874354f909255a843371cb0fe9f479ee09d3439b292 SHA512 ae81c9c856f39dfef3dec1e66decab8b20987eb82c4093b6bfda2937c5111bc6a24058f95a92b3a3beb0b91df6f5bb83216ff4997a0be8fd7d28b8f29f91290f
+EBUILD libcxx-9999.ebuild 7019 BLAKE2B ea929ac8759c5b70e48fe32ade6ef24c2ce8830be6bb5a35411a654212c7b2d127ecaa2a94bebbbb01807ff57c7d814379f23047c206d265d917958478df54b6 SHA512 5dddc6b30accff0ad414953ec2cd177ee5b151106282113687a2977c00b1a85e7151f772000118d341d0074ae91875b8ef1bd0e03de1816875bcd289b03d14ef
 MISC metadata.xml 854 BLAKE2B f731ffbb07722face32cfe5ef0576c572fc45d93e8d78ec4adb46c43b95999dc4eb48f20311517fe08a397f2e5dec56c530bb6787a058358cfd1af8d79ffad90 SHA512 8ef3feab266e09442a42baced2d72667fa8b1290624c2c84bab7b173ead72669568847f6e995388fc1d7bc722381f60805d87b2a0cc2d04ae0c49e36bec3802a
diff --git a/sys-libs/libcxx/files/libcxx-7.0.0-libsupcxx-install.patch b/sys-libs/libcxx/files/libcxx-7.0.0-libsupcxx-install.patch
new file mode 100644
index 000000000000..35b04e253e61
--- /dev/null
+++ b/sys-libs/libcxx/files/libcxx-7.0.0-libsupcxx-install.patch
@@ -0,0 +1,32 @@
+From 84f960980e5bbaf136bc130cb385379b8f610335 Mon Sep 17 00:00:00 2001
+From: Petr Hosek <phosek@chromium.org>
+Date: Thu, 4 Oct 2018 05:38:53 +0000
+Subject: [PATCH] [CMake] Use just basename when copying C++ ABI headers
+
+This avoids duplicate directories when the filename includes path.
+
+Fixes PR39145
+
+Differential Revision: https://reviews.llvm.org/D52762
+
+git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@343753 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ cmake/Modules/HandleLibCXXABI.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/Modules/HandleLibCXXABI.cmake b/cmake/Modules/HandleLibCXXABI.cmake
+index ef3b4f5dd..1c19d7e01 100644
+--- a/cmake/Modules/HandleLibCXXABI.cmake
++++ b/cmake/Modules/HandleLibCXXABI.cmake
+@@ -41,7 +41,7 @@ macro(setup_abi_lib abidefines abilib abifiles abidirs)
+         get_filename_component(ifile ${fpath} NAME)
+         set(src ${incpath}/${fpath})
+ 
+-        set(dst ${LIBCXX_BINARY_INCLUDE_DIR}/${dstdir}/${fpath})
++        set(dst ${LIBCXX_BINARY_INCLUDE_DIR}/${dstdir}/${ifile})
+         add_custom_command(OUTPUT ${dst}
+             DEPENDS ${src}
+             COMMAND ${CMAKE_COMMAND} -E copy_if_different ${src} ${dst}
+-- 
+2.19.0
+
diff --git a/sys-libs/libcxx/libcxx-3.9.1.ebuild b/sys-libs/libcxx/libcxx-3.9.1.ebuild
index e847a9f5d318..d5282680825b 100644
--- a/sys-libs/libcxx/libcxx-3.9.1.ebuild
+++ b/sys-libs/libcxx/libcxx-3.9.1.ebuild
@@ -86,7 +86,9 @@ src_configure() {
 	cmake-multilib_src_configure
 }
 
-multilib_src_configure() {
+src_configure() {
+	# note: we need to do this before multilib kicks in since it will
+	# alter the CHOST
 	local cxxabi cxxabi_incs
 	if use libcxxabi; then
 		cxxabi=libcxxabi
@@ -100,6 +102,10 @@ multilib_src_configure() {
 		cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
 	fi
 
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
 	# we want -lgcc_s for unwinder, and for compiler runtime when using
 	# gcc, clang with gcc runtime (or any unknown compiler)
 	local extra_libs=() want_gcc_s=ON
diff --git a/sys-libs/libcxx/libcxx-4.0.1.ebuild b/sys-libs/libcxx/libcxx-4.0.1.ebuild
index 64f610ce5bb2..4273ce8d76ec 100644
--- a/sys-libs/libcxx/libcxx-4.0.1.ebuild
+++ b/sys-libs/libcxx/libcxx-4.0.1.ebuild
@@ -71,7 +71,9 @@ pkg_setup() {
 	fi
 }
 
-multilib_src_configure() {
+src_configure() {
+	# note: we need to do this before multilib kicks in since it will
+	# alter the CHOST
 	local cxxabi cxxabi_incs
 	if use libcxxabi; then
 		cxxabi=libcxxabi
@@ -85,6 +87,10 @@ multilib_src_configure() {
 		cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
 	fi
 
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
 	# we want -lgcc_s for unwinder, and for compiler runtime when using
 	# gcc, clang with gcc runtime (or any unknown compiler)
 	local extra_libs=() want_gcc_s=ON
diff --git a/sys-libs/libcxx/libcxx-5.0.2.ebuild b/sys-libs/libcxx/libcxx-5.0.2.ebuild
index bd65e51b774b..eda78625c067 100644
--- a/sys-libs/libcxx/libcxx-5.0.2.ebuild
+++ b/sys-libs/libcxx/libcxx-5.0.2.ebuild
@@ -71,7 +71,9 @@ pkg_setup() {
 	fi
 }
 
-multilib_src_configure() {
+src_configure() {
+	# note: we need to do this before multilib kicks in since it will
+	# alter the CHOST
 	local cxxabi cxxabi_incs
 	if use libcxxabi; then
 		cxxabi=libcxxabi
@@ -85,6 +87,10 @@ multilib_src_configure() {
 		cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
 	fi
 
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
 	# we want -lgcc_s for unwinder, and for compiler runtime when using
 	# gcc, clang with gcc runtime (or any unknown compiler)
 	local extra_libs=() want_gcc_s=ON
diff --git a/sys-libs/libcxx/libcxx-6.0.1.ebuild b/sys-libs/libcxx/libcxx-6.0.1.ebuild
index 6c5c866f9c61..5d8314c5988a 100644
--- a/sys-libs/libcxx/libcxx-6.0.1.ebuild
+++ b/sys-libs/libcxx/libcxx-6.0.1.ebuild
@@ -78,7 +78,9 @@ test_compiler() {
 		<<<'int main() { return 0; }' &>/dev/null
 }
 
-multilib_src_configure() {
+src_configure() {
+	# note: we need to do this before multilib kicks in since it will
+	# alter the CHOST
 	local cxxabi cxxabi_incs
 	if use libcxxabi; then
 		cxxabi=libcxxabi
@@ -92,6 +94,10 @@ multilib_src_configure() {
 		cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
 	fi
 
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
 	# we want -lgcc_s for unwinder, and for compiler runtime when using
 	# gcc, clang with gcc runtime (or any unknown compiler)
 	local extra_libs=() want_gcc_s=ON
diff --git a/sys-libs/libcxx/libcxx-7.0.0.ebuild b/sys-libs/libcxx/libcxx-7.0.0.ebuild
index 3a997e98c088..790f5dc12210 100644
--- a/sys-libs/libcxx/libcxx-7.0.0.ebuild
+++ b/sys-libs/libcxx/libcxx-7.0.0.ebuild
@@ -46,6 +46,10 @@ PATCHES=(
 	# Add link flag "-Wl,-z,defs" to avoid underlinking; this is needed in a
 	# out-of-tree build.
 	"${FILESDIR}/${PN}-3.9-cmake-link-flags.patch"
+
+	# Fix installing when using libsupc++ backend.
+	# https://bugs.gentoo.org/667174
+	"${FILESDIR}/${PN}-7.0.0-libsupcxx-install.patch"
 )
 
 # least intrusive of all
@@ -78,7 +82,9 @@ test_compiler() {
 		<<<'int main() { return 0; }' &>/dev/null
 }
 
-multilib_src_configure() {
+src_configure() {
+	# note: we need to do this before multilib kicks in since it will
+	# alter the CHOST
 	local cxxabi cxxabi_incs
 	if use libcxxabi; then
 		cxxabi=libcxxabi
@@ -92,6 +98,10 @@ multilib_src_configure() {
 		cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
 	fi
 
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
 	# we want -lgcc_s for unwinder, and for compiler runtime when using
 	# gcc, clang with gcc runtime (or any unknown compiler)
 	local extra_libs=() want_gcc_s=ON
diff --git a/sys-libs/libcxx/libcxx-7.0.9999.ebuild b/sys-libs/libcxx/libcxx-7.0.9999.ebuild
index e5777074eeda..536457a13802 100644
--- a/sys-libs/libcxx/libcxx-7.0.9999.ebuild
+++ b/sys-libs/libcxx/libcxx-7.0.9999.ebuild
@@ -90,7 +90,9 @@ test_compiler() {
 		<<<'int main() { return 0; }' &>/dev/null
 }
 
-multilib_src_configure() {
+src_configure() {
+	# note: we need to do this before multilib kicks in since it will
+	# alter the CHOST
 	local cxxabi cxxabi_incs
 	if use libcxxabi; then
 		cxxabi=libcxxabi
@@ -104,6 +106,10 @@ multilib_src_configure() {
 		cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
 	fi
 
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
 	# we want -lgcc_s for unwinder, and for compiler runtime when using
 	# gcc, clang with gcc runtime (or any unknown compiler)
 	local extra_libs=() want_gcc_s=ON
diff --git a/sys-libs/libcxx/libcxx-9999.ebuild b/sys-libs/libcxx/libcxx-9999.ebuild
index 4272b2117944..2547da3dfa77 100644
--- a/sys-libs/libcxx/libcxx-9999.ebuild
+++ b/sys-libs/libcxx/libcxx-9999.ebuild
@@ -89,7 +89,9 @@ test_compiler() {
 		<<<'int main() { return 0; }' &>/dev/null
 }
 
-multilib_src_configure() {
+src_configure() {
+	# note: we need to do this before multilib kicks in since it will
+	# alter the CHOST
 	local cxxabi cxxabi_incs
 	if use libcxxabi; then
 		cxxabi=libcxxabi
@@ -103,6 +105,10 @@ multilib_src_configure() {
 		cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
 	fi
 
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
 	# we want -lgcc_s for unwinder, and for compiler runtime when using
 	# gcc, clang with gcc runtime (or any unknown compiler)
 	local extra_libs=() want_gcc_s=ON
diff --git a/sys-libs/libstdc++-v3/Manifest b/sys-libs/libstdc++-v3/Manifest
index c49ed0ef3f88..ce250773c61b 100644
--- a/sys-libs/libstdc++-v3/Manifest
+++ b/sys-libs/libstdc++-v3/Manifest
@@ -1,5 +1,4 @@
-AUX libstdc++-v3-3.3.6-glibc226.patch 1349 BLAKE2B e16351bae2539fac5d71b1cec43e0869f079c34e1bc59a170b7ff699e6c9aff95dbde09b07c17f3ec4a66f02548a3c78e4679eab38244aa5a2ddde12856fb1fc SHA512 05e2195c385b8cfbeb7b4978a70c3dbcee02210ff7b1785ad736f6c2cbbb8bf3abefec93417c427c2719b2bf6ebe565f432f45e5e17a4c51672785ed5b650a22
-DIST gcc-3.3.6-patches-1.9.tar.bz2 51760 BLAKE2B 68704c1ddb73d2966746dd1a57b9699c3130d9165dd990b0b70f13b0dc4c7c4503afcbb268fd54242e17bdd571d5d0a20c172ee431c3c772e7c3412d3f0ac884 SHA512 306220c537c5cd90af7638431e6547ee9a80199c384629b5fbda06c28b2d6168fcf1dd448c0e178b104f41e03a8ebda4f389489d205b9e66ade6637e4747196c
+DIST gcc-3.3.6-patches-1.10.tar.bz2 53739 BLAKE2B d22772d30c432669299e3e6df350920408c510a241a20e6795dcc680227342a16c3b6d2e477a17d6c49794005b42972ed30b4efe5b2d69398d283f50efdeb459 SHA512 be6cc8fae217f789982e324e0d3ad12d527e43ca4c168bce613397aaf3d86219b125e7b39c2b236638a68112cfee0e06c1b297fead712d92b3923b7195299d0a
 DIST gcc-3.3.6.tar.bz2 23972413 BLAKE2B e7b33edcdbbb13b0be41a41156bf6fb6dcfe4f5ad75c41de86cb37f854be6b7a6a8dda0e65d331461469848cd912e25920e8aa2dcb142cb661731ba571cb5de1 SHA512 576b88e2fa675314a79a85f180684fe5af370c596476a0bf02e33e8ae0e2be838417ea80675ce4194a8213792cf7ada50cae5131149e4b890ab61e0b8d50d0ed
-EBUILD libstdc++-v3-3.3.6-r1.ebuild 4929 BLAKE2B a62ee481cc9e7b9d85f9ea2bea7288a906ca8c959c980e018e65925de45e78cb9c8bb20a838c3b480d57a1cc7eae37c1d8b842cc69785f6d7f60189a688ee3bc SHA512 e335354d270253ddcccd7947cf4ae4284f37025519905edf49bbefc9598fa42dfe62144c81d726a289104a81249c9a9eac17c6f5303764a9479a80f8870761a6
+EBUILD libstdc++-v3-3.3.6-r1.ebuild 4872 BLAKE2B b45e951ab75cdc54f096bcd28d1f420d32f62b0b26f36a3a3a5b23417f0dfdedd56e279625e7ca3964471b09f3ecf3a3ff81bd039cdf0010d838e0cd3eeb84f8 SHA512 c8c2f7e4b8fb9f927258e2d9cf9a87891f0d7f640cfbe7db7dcd080d2b878352998eec4bae31fbda17d5580391c0337f29e99cf1a0385d40fed100c1c5d6f4f5
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/sys-libs/libstdc++-v3/files/libstdc++-v3-3.3.6-glibc226.patch b/sys-libs/libstdc++-v3/files/libstdc++-v3-3.3.6-glibc226.patch
deleted file mode 100644
index a444da2d2bfc..000000000000
--- a/sys-libs/libstdc++-v3/files/libstdc++-v3-3.3.6-glibc226.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ruN gcc-3.3.6.orig/gcc/config/i386/linux.h gcc-3.3.6/gcc/config/i386/linux.h
---- gcc-3.3.6.orig/gcc/config/i386/linux.h	2018-01-01 20:14:36.311860098 +0100
-+++ gcc-3.3.6/gcc/config/i386/linux.h	2018-01-01 20:16:05.912287579 +0100
-@@ -261,7 +261,7 @@
- 	  siginfo_t *pinfo;						\
- 	  void *puc;							\
- 	  siginfo_t info;						\
--	  struct ucontext uc;						\
-+	  struct ucontext_t uc;						\
- 	} *rt_ = (CONTEXT)->cfa;					\
- 	sc_ = (struct sigcontext *) &rt_->uc.uc_mcontext;		\
-       }									\
-diff -ruN gcc-3.3.6.orig/gcc/config/i386/linux64.h gcc-3.3.6/gcc/config/i386/linux64.h
---- gcc-3.3.6.orig/gcc/config/i386/linux64.h	2018-01-01 20:14:36.271859907 +0100
-+++ gcc-3.3.6/gcc/config/i386/linux64.h	2018-01-01 20:16:05.912287579 +0100
-@@ -112,7 +112,7 @@
-     if (*(unsigned char *)(pc_+0) == 0x48				\
- 	&& *(unsigned long *)(pc_+1) == 0x050f0000000fc0c7)		\
-       {									\
--	struct ucontext *uc_ = (CONTEXT)->cfa;				\
-+	struct ucontext_t *uc_ = (CONTEXT)->cfa;				\
- 	sc_ = (struct sigcontext *) &uc_->uc_mcontext;			\
-       }									\
-     else								\
-@@ -182,7 +182,7 @@
- 	  siginfo_t *pinfo;						\
- 	  void *puc;							\
- 	  siginfo_t info;						\
--	  struct ucontext uc;						\
-+	  struct ucontext_t uc;						\
- 	} *rt_ = (CONTEXT)->cfa;					\
- 	sc_ = (struct sigcontext *) &rt_->uc.uc_mcontext;		\
-       }									\
diff --git a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r1.ebuild b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r1.ebuild
index 5023f2aaed91..65b417750fcd 100644
--- a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r1.ebuild
+++ b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.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=0
@@ -18,6 +18,8 @@ transform_known_flags() {
 	replace-cpu-flags G3 750
 	replace-cpu-flags G4 7400
 	replace-cpu-flags G5 7400
+
+	filter-flags -fdiagnostics-show-option
 }
 
 is_arch_allowed() {
@@ -111,7 +113,7 @@ do_filter_flags() {
 	strip-flags
 }
 
-PATCH_VER="1.9"
+PATCH_VER="1.10"
 
 DESCRIPTION="Compatibility package for binaries linked against a pre gcc 3.4 libstdc++"
 HOMEPAGE="https://gcc.gnu.org/libstdc++/"
@@ -133,9 +135,6 @@ src_unpack() {
 	cd "${S}"
 	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
 
-	# bug 637608
-	has_version '>=sys-libs/glibc-2.26' && epatch "${FILESDIR}/${P}-glibc226.patch"
-
 	elibtoolize --portage --shallow
 	./contrib/gcc_update --touch
 	mkdir -p "${WORKDIR}"/build
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index 800d02760f09..b774b86c9208 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -1,10 +1,12 @@
 AUX ldconfig.in 2552 BLAKE2B c94f9900e8582d707519171c4b61079c801b60c555677b1740b04adbdec9645578b9a8fc91f11413072568f316c795e46a332970f3d2dde5272b0c49a5d60a78 SHA512 59f1b57361196363d3f127366764f05d26c23dbe3d3dbcdba9bd3c8ca26a671fd713b96d31c509d22805c57ada2b596d979a3f5795bcf0a4d3ac7d168f3bf377
+AUX musl-1.1.20-fix-getaddrinfo.patch 1877 BLAKE2B 2b213efe9da356f0b07a448c311cf608c5452884859833a0a664ee7801ad421e051c7d4719d889210927b4b03ee981ea6bb56276a9c97f5170ff011731540434 SHA512 e3953a3a73ef11696dd3eb216e18b152ae35198d8bff686d157e27bc90fb558f9a0be518025a90534e9afd6ea1bf731ffdb6fcb202bb9368f2c8eec7ca886141
 DIST getconf.c 11614 BLAKE2B ba49a573fc16d51780a0b0b81fbf7b64a1142f1dbad203c9609a59b6b07e7404f676c415383ae88c0aede95694821f6ee381bffd93cc3330501e17dc07d122bd SHA512 0d80f37b34a35e3d14b012257c50862dfeb9d2c81139ea2dfa101d981d093b009b9fa450ba27a708ac59377a48626971dfc58e20a3799084a65777a0c32cbc7d
 DIST getent.c 9438 BLAKE2B dc20353583c10a001bd8fe8474f32b70254dc56da186d1cdbaf4081570c3d7a10497024da5815a485fc4728adc9eebd270aec99ba93b7546b38c728978e3e00b SHA512 b35de9847353b273516162ed4828a810c6130fc5b7de44ee4433003b3f99647b25792d9b1c40dfc67069add11f3fb850e5c35d4f1912dccac108059bbbdfd5a2
 DIST iconv.c 2577 BLAKE2B 070ca87b30c90ab98c27d5faf7a2fcb64ff7c67ca212ee6072165b2146979c551f714954dbd465462a171837c59b6ea027e0206458a2df0f977e45f01be3ce48 SHA512 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf
 DIST musl-1.1.19.tar.gz 960319 BLAKE2B 3e69de2ed9384fe200bb64e603f342a930acf035cf7bac8fe3cd4225800424207df2b73fe6fabf3147fc8023a655839c33f50c0be8e30f51f76b84aba4de30b5 SHA512 abee52d53af4b3c14c9088866c911a24d2b6ef67dc494f38a7a09dfe77250026f77528c24c52469c89cffa8ced2f0fa95badbdcf8d4460c90faba47e3927bcc5
 DIST musl-1.1.20.tar.gz 977827 BLAKE2B c8ce3cc1885e8103e1cf9d67183d89e5e222fd317158b20f25a8e1855a3cd5d16c79b4d95ff896fe7262f233141c3f3ca4dfc6a26a2373ab1d29a3c66b904e61 SHA512 d3a7a30aa375ca50d7dcfbd618581d59e1aa5378417f50a0ca5510099336fd74cc9db468e05c93dda3067abd890f6bd47af226c3446bb833adf0a5054bff2e5d
 EBUILD musl-1.1.19.ebuild 3052 BLAKE2B 5ef489e0ed841a692375c06e85b304eefc046dfe91cd15b9255208ebc34ef571bd8d32074fa0e7babae1d93497e3b5d46295e74e3fd33eab6210d2f08b04c848 SHA512 1eb90564e0f0939fff635a48799c992e8301911a5c1382e0a20975a149eec6bcc5a3f79e3ac51f5e8bcd5ee7bd22bc01aa28ee378be7b684a1c0235af2d6ef0d
+EBUILD musl-1.1.20-r1.ebuild 3136 BLAKE2B ac7f9b1413667e9521a19f1f607a1d54253528ca33357d56cace91bdbc5aa48e7c570ef4c04f3c8633077b91e18e19d455423302ed0652a2fe826459b7346faa SHA512 8e37303e3635916ee40f8ac5162786a38c9cb721d8b48922054fd63d9fc665aaf0eb995d1ba4182351ffca38aecc69956bc06ef066fc8b2ae309ce2be72a5a5a
 EBUILD musl-1.1.20.ebuild 3055 BLAKE2B db7546fa0a34f8d422d9413ae4459516b49223072a804b89a8893d156c8e909aeb8cb6c7b31b136300ac88710fc23193cd23f6472bb6eff0bfe871436d1fad82 SHA512 6c9d750ac2db36f9875d738f4e20e3885eae7e870d5ff07d7e87f6445e4e4c6740ab4ae67281ae1c00d93c77540949da8691d65da9760cf769c919da6dcf003f
 EBUILD musl-9999.ebuild 3057 BLAKE2B 0d689b80a869101edc855978b619d4e668f11886122294f242e27093647c64388c9481fc3d50303ceadeafc6ea37f9e29682e04e2bde0f82da59834bf97ebbcb SHA512 11ee3bc218c99a891c62d7efe4de1fedf650b1614a117c62b9d1469e5c8ffc448385533b5ff9320dc838e7ed8ccd9d5dce24f8fd46787c1f6f027dd54685d348
 MISC metadata.xml 452 BLAKE2B f6d26f456e1a1005b0103c6921d59504dcacddfaf9ec3c788f6f626df670ec7e979a8a66626d7de24d0b850651bf095610c191d520b67915a701bf8564189fc4 SHA512 676d8122179a5cb56e0b9c7aeb7f0aec8c19b5d7b604a19c9ee01aeca837a74cc4284e87cc743d0eaf527f0c79afdfeb1f238c204a8a6c1c5590b2718bbc9b03
diff --git a/sys-libs/musl/files/musl-1.1.20-fix-getaddrinfo.patch b/sys-libs/musl/files/musl-1.1.20-fix-getaddrinfo.patch
new file mode 100644
index 000000000000..28d4558b8b6c
--- /dev/null
+++ b/sys-libs/musl/files/musl-1.1.20-fix-getaddrinfo.patch
@@ -0,0 +1,51 @@
+From f381c118b2d4f7d914481d3cdc830ce41369b002 Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Wed, 19 Sep 2018 18:03:22 -0400
+Subject: fix getaddrinfo regression with AI_ADDRCONFIG on some configurations
+
+despite not being documented to do so in the standard or Linux
+documentation, attempts to udp connect to 127.0.0.1 or ::1 generate
+EADDRNOTAVAIL when the loopback device is not configured and there is
+no default route for IPv6. this caused getaddrinfo with AI_ADDRCONFIG
+to fail with EAI_SYSTEM and EADDRNOTAVAIL on some no-IPv6
+configurations, rather than the intended behavior of detecting IPv6 as
+unsuppported and producing IPv4-only results.
+
+previously, only EAFNOSUPPORT was treated as unavailability of the
+address family being probed. instead, treat all errors related to
+inability to get an address or route as conclusive that the family
+being probed is unsupported, and only fail with EAI_SYSTEM on other
+errors.
+
+further improvements may be desirable, such as reporting EAI_AGAIN
+instead of EAI_SYSTEM for errors which are expected to be transient,
+but this patch should suffice to fix the serious regression.
+---
+ src/network/getaddrinfo.c | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/src/network/getaddrinfo.c b/src/network/getaddrinfo.c
+index ba26847a..e33bfa28 100644
+--- a/src/network/getaddrinfo.c
++++ b/src/network/getaddrinfo.c
+@@ -76,7 +76,16 @@ int getaddrinfo(const char *restrict host, const char *restrict serv, const stru
+ 				close(s);
+ 				if (!r) continue;
+ 			}
+-			if (errno != EAFNOSUPPORT) return EAI_SYSTEM;
++			switch (errno) {
++			case EADDRNOTAVAIL:
++			case EAFNOSUPPORT:
++			case EHOSTUNREACH:
++			case ENETDOWN:
++			case ENETUNREACH:
++				break;
++			default:
++				return EAI_SYSTEM;
++			}
+ 			if (family == tf[i]) return EAI_NONAME;
+ 			family = tf[1-i];
+ 		}
+-- 
+cgit v1.2.1
+
diff --git a/sys-libs/musl/musl-1.1.20-r1.ebuild b/sys-libs/musl/musl-1.1.20-r1.ebuild
new file mode 100644
index 000000000000..f336112e3797
--- /dev/null
+++ b/sys-libs/musl/musl-1.1.20-r1.ebuild
@@ -0,0 +1,123 @@
+# 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
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.musl-libc.org/musl"
+	inherit git-r3
+	SRC_URI="
+	https://dev.gentoo.org/~blueness/musl-misc/getconf.c
+	https://dev.gentoo.org/~blueness/musl-misc/getent.c
+	https://dev.gentoo.org/~blueness/musl-misc/iconv.c"
+	KEYWORDS=""
+else
+	SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz
+	https://dev.gentoo.org/~blueness/musl-misc/getconf.c
+	https://dev.gentoo.org/~blueness/musl-misc/getent.c
+	https://dev.gentoo.org/~blueness/musl-misc/iconv.c"
+	KEYWORDS="-* amd64 ~arm ~arm64 ~mips ~ppc x86"
+fi
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
+HOMEPAGE="http://www.musl-libc.org/"
+LICENSE="MIT LGPL-2 GPL-2"
+SLOT="0"
+IUSE="headers-only"
+
+QA_SONAME="/usr/lib/libc.so"
+QA_DT_NEEDED="/usr/lib/libc.so"
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+just_headers() {
+	use headers-only && is_crosscompile
+}
+
+pkg_setup() {
+	if [ ${CTARGET} == ${CHOST} ] ; then
+		case ${CHOST} in
+		*-musl*) ;;
+		*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
+		esac
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/${P}-fix-getaddrinfo.patch"
+	eapply_user
+}
+
+src_configure() {
+	tc-getCC ${CTARGET}
+	just_headers && export CC=true
+
+	local sysroot
+	is_crosscompile && sysroot=/usr/${CTARGET}
+	./configure \
+		--target=${CTARGET} \
+		--prefix=${sysroot}/usr \
+		--syslibdir=${sysroot}/lib \
+		--disable-gcc-wrapper || die
+}
+
+src_compile() {
+	emake obj/include/bits/alltypes.h
+	just_headers && return 0
+
+	emake
+	if [[ ${CATEGORY} != cross-* ]] ; then
+		$(tc-getCC) ${CFLAGS} "${DISTDIR}"/getconf.c -o "${T}"/getconf || die
+		$(tc-getCC) ${CFLAGS} "${DISTDIR}"/getent.c -o "${T}"/getent || die
+		$(tc-getCC) ${CFLAGS} "${DISTDIR}"/iconv.c -o "${T}"/iconv || die
+	fi
+}
+
+src_install() {
+	local target="install"
+	just_headers && target="install-headers"
+	emake DESTDIR="${D}" ${target}
+	just_headers && return 0
+
+	# musl provides ldd via a sym link to its ld.so
+	local sysroot
+	is_crosscompile && sysroot=/usr/${CTARGET}
+	local ldso=$(basename "${D}"${sysroot}/lib/ld-musl-*)
+	dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
+
+	if [[ ${CATEGORY} != cross-* ]] ; then
+		local arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
+		[[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
+		cp "${FILESDIR}"/ldconfig.in "${T}" || die
+		sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
+		into /
+		dosbin "${T}"/ldconfig
+		into /usr
+		dobin "${T}"/getconf
+		dobin "${T}"/getent
+		dobin "${T}"/iconv
+		echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
+		doenvd "${T}"/00musl || die
+	fi
+}
+
+pkg_postinst() {
+	is_crosscompile && return 0
+
+	[ "${ROOT}" != "/" ] && return 0
+
+	ldconfig || die
+	# reload init ...
+	/sbin/telinit U 2>/dev/null
+}
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index bc9c8454d9b5..9dd20048b65a 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -1,7 +1,10 @@
+AUX pam-remove-browsers.patch 985 BLAKE2B 3e258e00f7287436b1b6a97323764612a3098dc4effb12e62cd8d55151ace2b97b6ea7b67ae33613aa6b3cca318bfbfc310b48a99b0c81e1beaa9d16188e69eb SHA512 42d89d35fc754e51112040a5468067ee9f6a3a411e538cb634187e28975040c0b7ef48fab166ec6a20a849f6ed9d74a069355269cf708d9985ded6b87fe13ed1
 DIST Linux-PAM-1.2.0-docs.tar.bz2 490586 BLAKE2B 1b4b6a7a2988f3f3e9f74edab9a47136b2d93e0cc969e983e3d9a16b73a952b2a44836b14ccd6df7c391037bcb0ecd168606308486c7752066a993de9b15e57f SHA512 028b7f9d6b0a5cf38f063e0f82ac3d0955e1e41d77c9f3fc803363d9ea710d71366e0a91f31b418cac397bb6639442de908fa00f02cd94cf612496d1b43c7e4c
 DIST Linux-PAM-1.2.1.tar.bz2 1279523 BLAKE2B 246f3742bcf1c6dc0fe0c3d203ec6262c59093b75170d1a376a6080540d638551bed2d7f6f193bb583c34f8fbc742d904dfc3e6f1776dc4479914485c6ce15d4 SHA512 4572aa1eaf5a1312410c74b5ed055b2592c5efe2bb82f59981da4e9e93555ad40aee3a89f446d9dc6c6af79efc04c33f739f66db9edc07e02479475a14e426da
 DIST Linux-PAM-1.3.0-docs.tar.bz2 492805 BLAKE2B 1dd48f65ae76e0d4d2c02664f9a2adac127604a7552ff70c378323a0de8141445332430205946823097170edf217122196ea03ae665284751fed3748d9f8ac3d SHA512 b6b8497e6a4307b3f9a2af1c74456a0577b848cbc5417fb88fabe305b67ca022a6bcf632d68faaaacc701cdcf6254ec196707551a1ea70985cdde6add68bbbfe
 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 6003 BLAKE2B 5a3f40e744e8dfd3e98a0fe19ba4e222069964ec31b6f7fa14df95ce6ec30d5dc72cc6bb1252d54d78f0729545172aef3d3b3d2385eba64de540cdcc33c1a7e3 SHA512 68db29d9ffce95fade292e2a108d9080cf9c10c2a7171bcf0739819c37d222b91a5942966eccd76b0d7ac2d0eaf7a0496e438003ca8f6df9605c9bda13dc1bbf
-MISC metadata.xml 1135 BLAKE2B 60f9755133a79fbab65834d70360b430c2e0ec097647d640ddbec0b74ee86fbba65eed8600c49386aa01d1a78d55dc3b47f58a97eb62572d2fabd6b18eb7868d SHA512 de2a617918085c4e6a7a1976447ed2c0bcdb8eb257d28351e095b29ea219382ce8964206ba0fcdefe9b69db9ab17a52556371cfbee3ed4d5c5293c8d21738d55
+EBUILD pam-1.3.0-r2.ebuild 5989 BLAKE2B 1f81638ced909b267474c79bcee93a1dd0e417a8d14ea320cc928c6156f998dca1eaf1994042c6a5a3ee43354f21a963b238b21674d1c492ff2992a4829a297d SHA512 405d2f70877fa938e24f121121a653c0a4cef3abce8ee4770f18c2e0727b18588bd19687503460fcd59399a8a8d40527ac849c022adbe9e60c3d9c1b359334c3
+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/files/pam-remove-browsers.patch b/sys-libs/pam/files/pam-remove-browsers.patch
new file mode 100644
index 000000000000..7e3ae99731ad
--- /dev/null
+++ b/sys-libs/pam/files/pam-remove-browsers.patch
@@ -0,0 +1,34 @@
+From baadfdc644fcb88170c358c449a731520e1747a5 Mon Sep 17 00:00:00 2001
+From: Mikle Kolyada <zlogene@gentoo.org>
+Date: Mon, 1 Oct 2018 23:12:08 +0300
+Subject: [PATCH] configure.ac remobe browser logic for DocBook
+
+---
+ configure.ac | 11 -----------
+ 1 file changed, 11 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 3012ceb..e7e7dac 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -554,17 +554,6 @@ JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.4//EN],
+ JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl],
+                 [DocBook XSL Stylesheets], [], enable_docu=no)
+ 
+-AC_PATH_PROG([BROWSER], [w3m])
+-if test ! -z "$BROWSER"; then
+-     BROWSER="$BROWSER -T text/html -dump"
+-else
+-     AC_PATH_PROG([BROWSER], [elinks])
+-     if test ! -z "$BROWSER"; then
+-          BROWSER="$BROWSER -no-numbering -no-references -dump"
+-     else
+-          enable_docu=no
+-     fi
+-fi
+ 
+ AC_PATH_PROG([FO2PDF], [fop])
+ 
+-- 
+2.16.4
+
diff --git a/sys-libs/pam/metadata.xml b/sys-libs/pam/metadata.xml
index 2933b7ddf8c8..cea4a44e6cdc 100644
--- a/sys-libs/pam/metadata.xml
+++ b/sys-libs/pam/metadata.xml
@@ -1,29 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>pam-bugs@gentoo.org</email>
-  </maintainer>
-  <use>
-    <flag name="berkdb">
-      Build the pam_userdb module, that allows to authenticate users
-      against a Berkeley DB file. Please note that enabling this USE
-      flag will create a PAM module that links to the Berkeley DB (as
-      provided by <pkg>sys-libs/db</pkg>) installed in /usr/lib and
-      will thus not work for boot-critical services authentication.
-    </flag>
+<maintainer type="person">
+	<email>zlogene@gentoo.org</email>
+	<name>Mikle Kolyada</name>
+</maintainer>
+<maintainer type="project">
+	<email>pam-bugs@gentoo.org</email>
+	<name>PAM bugs</name>
+</maintainer>
+<use>
+	<flag name="berkdb">
+		Build the pam_userdb module, that allows to authenticate users
+		against a Berkeley DB file. Please note that enabling this USE
+		flag will create a PAM module that links to the Berkeley DB (as
+		provided by <pkg>sys-libs/db</pkg>) installed in /usr/lib and
+		will thus not work for boot-critical services authentication.
+	</flag>
 
-    <flag name="cracklib">
-      Build the pam_cracklib module, that allows to verify the chosen
-      passwords' strength through the use of
-      <pkg>sys-libs/cracklib</pkg>. Please note that simply enabling
-      the USE flag on this package will not make use of pam_cracklib
-      by default, you should also enable it in
-      <pkg>sys-auth/pambase</pkg> as well as update your configuration
-      files.
-    </flag>
-  </use>
-  <upstream>
-    <remote-id type="cpe">cpe:/a:kernel:linux-pam</remote-id>
-  </upstream>
+	<flag name="cracklib">
+		Build the pam_cracklib module, that allows to verify the chosen
+		passwords' strength through the use of
+		<pkg>sys-libs/cracklib</pkg>. Please note that simply enabling
+		the USE flag on this package will not make use of pam_cracklib
+		by default, you should also enable it in
+		<pkg>sys-auth/pambase</pkg> as well as update your configuration
+		files.
+		</flag>
+		</use>
+<upstream>
+	<remote-id type="cpe">cpe:/a:kernel:linux-pam</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/sys-libs/pam/pam-1.3.0-r2.ebuild b/sys-libs/pam/pam-1.3.0-r2.ebuild
index 8b9be141a931..2c79c948e747 100644
--- a/sys-libs/pam/pam-1.3.0-r2.ebuild
+++ b/sys-libs/pam/pam-1.3.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="5"
@@ -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/pam/pam-1.3.1.ebuild b/sys-libs/pam/pam-1.3.1.ebuild
new file mode 100644
index 000000000000..75f1b0b62cf6
--- /dev/null
+++ b/sys-libs/pam/pam-1.3.1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools db-use fcaps multilib-minimal toolchain-funcs
+
+DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)"
+HOMEPAGE="https://github.com/linux-pam/linux-pam"
+SRC_URI="https://github.com/linux-pam/linux-pam/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+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"
+IUSE="audit berkdb +cracklib debug nis nls +pie selinux static-libs"
+
+DEPEND="app-text/docbook-xml-dtd:4.3
+	app-text/docbook-xml-dtd:4.4
+	app-text/docbook-xml-dtd:4.5
+	nls? ( sys-devel/gettext )"
+
+RDEPEND="${DEPEND}
+	audit? ( >=sys-process/audit-2.2.2[${MULTILIB_USEDEP}] )
+	berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
+	cracklib? ( >=sys-libs/cracklib-2.9.1-r1[${MULTILIB_USEDEP}] )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
+	nis? ( >=net-libs/libtirpc-0.2.4-r2[${MULTILIB_USEDEP}] )
+	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
+	!<sys-apps/openrc-0.11.8
+	!sys-auth/openpam
+	!sys-auth/pam_userdb"
+
+BDEPEND="virtual/pkgconfig"
+
+PDEPEND="sys-auth/pambase"
+
+S="${WORKDIR}/linux-${P}"
+
+src_prepare() {
+	default
+	eapply "${FILESDIR}/${PN}-remove-browsers.patch"
+	touch ChangeLog || die
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# Do not let user's BROWSER setting mess us up. #549684
+	unset BROWSER
+
+	# Disable automatic detection of libxcrypt; we _don't_ want the
+	# user to link libxcrypt in by default, since we won't track the
+	# dependency and allow to break PAM this way.
+
+	export ac_cv_header_xcrypt_h=no
+
+	local myconf=(
+		--with-db-uniquename=-$(db_findver sys-libs/db)
+		--enable-securedir="${EPREFIX}"/$(get_libdir)/security
+		--libdir=/usr/$(get_libdir)
+		--disable-prelude
+		$(use_enable audit)
+		$(use_enable berkdb db)
+		$(use_enable cracklib)
+		$(use_enable debug)
+		$(use_enable nis)
+		$(use_enable nls)
+		$(use_enable pie)
+		$(use_enable selinux)
+		$(use_enable static-libs static)
+		--enable-isadir='.' #464016
+		)
+	ECONF_SOURCE="${S}" econf ${myconf[@]}
+}
+
+multilib_src_compile() {
+	emake sepermitlockdir="${EPREFIX}/run/sepermit"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install \
+		sepermitlockdir="${EPREFIX}/run/sepermit"
+
+	local prefix
+	if multilib_is_native_abi; then
+		prefix=
+		gen_usr_ldscript -a pam pamc pam_misc
+	else
+		prefix=/usr
+	fi
+
+	# create extra symlinks just in case something depends on them...
+	local lib
+	for lib in pam pamc pam_misc; do
+		if ! [[ -f "${ED}"${prefix}/$(get_libdir)/lib${lib}$(get_libname) ]]; then
+			dosym lib${lib}$(get_libname 0) ${prefix}/$(get_libdir)/lib${lib}$(get_libname)
+		fi
+	done
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	if use selinux; then
+		dodir /usr/lib/tmpfiles.d
+		cat - > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<EOF
+d /run/sepermit 0755 root root
+EOF
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Some software with pre-loaded PAM libraries might experience"
+	ewarn "warnings or failures related to missing symbols and/or versions"
+	ewarn "after any update. While unfortunate this is a limit of the"
+	ewarn "implementation of PAM and the software, and it requires you to"
+	ewarn "restart the software manually after the update."
+	ewarn ""
+	ewarn "You can get a list of such software running a command like"
+	ewarn "  lsof / | egrep -i 'del.*libpam\\.so'"
+	ewarn ""
+	ewarn "Alternatively, simply reboot your system."
+
+	# The pam_unix module needs to check the password of the user which requires
+	# read access to /etc/shadow only.
+	fcaps cap_dac_override sbin/unix_chkpwd
+}
diff --git a/sys-libs/uclibc-ng/Manifest b/sys-libs/uclibc-ng/Manifest
index 70f3e57bc732..9ec693f852ab 100644
--- a/sys-libs/uclibc-ng/Manifest
+++ b/sys-libs/uclibc-ng/Manifest
@@ -3,6 +3,6 @@ AUX uclibc-ng-1.0.30-fix-ld.so.cache.patch 1515 BLAKE2B 20f317c623cf66f835191563
 DIST uClibc-ng-1.0.26.tar.bz2 2285709 BLAKE2B 6276f1d080f0c90b5a0ce4a4fc3556070852ad157b9c0a15305108b2f46a2d0f5371dde12ac0a8f05cad7db942cceb8057b5ef351e100a52609f2ebdc6b19634 SHA512 48c37ab2000af13848ef007ce89f226bded5188f37839c11371bab48497670d30d39fda2a031c6aff95f429a4abadc431ddd77c0e023810a341e2c2d2645f71b
 DIST uClibc-ng-1.0.30.tar.bz2 2302796 BLAKE2B 21888dfe5a68f83b7ba56bb557ecc5aa19fd75cedc82f2ed48073f47655888719feb27943e0309f8101a24fd2fd9165af31d5679f21c00b12f27ebfccf354bac SHA512 ddd1d91dcfdf7be8471afecf13196563ad348c41e2fa8b63ae50b83f103cf8ed8d9f003b51a54a58db2935b84692b7c011a4779582f30610ede44cb583aae742
 EBUILD uclibc-ng-1.0.26.ebuild 10527 BLAKE2B b3a1934999ee73c5d12f8ff9601236ece8b3a5a26f589f901344c4704ae9ccff941f5d6839faf5b7e153ada8e44d3e76eba2b67ad103d8fe274daa9d00e9bb27 SHA512 3f53c4201a477ce9c29f37b6c67177ab1f7c923dea153146ad192c13d465a3a939ad159825d491c18744d5d0c34c6263877b8c3fab061552cf74408b82248221
-EBUILD uclibc-ng-1.0.30-r1.ebuild 10363 BLAKE2B 17e64f956c0e8a342e9503ebd15aa5d9e17ac1951e9231cf0ebd2b8fad60a89e286216f3689444d54d7a250612752b069b834604aee3cfd466d2f895bbdab7d9 SHA512 227305429e2ff5aae49ac21bc4475fc68b15926629213ec7622c867a11bfba7431a890e056e344da48d9c3994c403a0f199929335051e42c3cfb4d701c1250ee
+EBUILD uclibc-ng-1.0.30-r1.ebuild 10362 BLAKE2B 06dd5830979b297138f30c1c86b2f26655beaaf32beb4e5bd407a10b846690ea1e24953b2967aa5d3e4dfd0c1eacc5c1b26ac9418296fc3f3b0b0e2e8bac1348 SHA512 494d2ddf2030c5f7e0188b57ef231db8d2032b61ccecc5f7f43337093782f2a6588be79a6e62a8c113bd1dccbb80c1c5c7ad5f0ccf4eda48e9bef68690cf5785
 EBUILD uclibc-ng-9999.ebuild 10284 BLAKE2B bc67c39ae7c486f56a26448058706769454b2dfbe7cf5053ae855f3079495d184b5b772e6be76842df2c25a3f763982a56228070e643b8b7cb2adb4d190f7667 SHA512 2bee867278dc264688ea8ee516e6147f62568bf39758d0a098d32cb7de7b3a6024a6cb1ab9dc3726726a8fb477a92bd32fbf22f3ee375040a08295aa15a3462a
 MISC metadata.xml 877 BLAKE2B 191277020e32edd39fc3a1594aaf3fad65ca7b48a2f0df3f0e381d3c7cc5451c09f9ad87a6da9e75b146c2ebe209918d699519582fc64fb8c3b7ae2e51eaf507 SHA512 3988e346916b283836e5c3d094eec4f25c66763e4e10a6413fe97f98629e1f14b67d6013f13f9ca2e2712dd638567973c02e6ebcce3554c55caf5483c3c9dfd4
diff --git a/sys-libs/uclibc-ng/uclibc-ng-1.0.30-r1.ebuild b/sys-libs/uclibc-ng/uclibc-ng-1.0.30-r1.ebuild
index 4b7f7e366e45..87c97563169a 100644
--- a/sys-libs/uclibc-ng/uclibc-ng-1.0.30-r1.ebuild
+++ b/sys-libs/uclibc-ng/uclibc-ng-1.0.30-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://uclibc-ng.org/"
 if [[ ${PV} != "9999" ]] ; then
 	PATCH_VER=""
 	SRC_URI="https://downloads.uclibc-ng.org/releases/${PV}/${MY_P}.tar.bz2"
-	KEYWORDS="-* amd64 ~arm ~mips ppc x86"
+	KEYWORDS="-* amd64 arm ~mips ppc x86"
 fi
 
 LICENSE="LGPL-2"
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 921475e1f1e1..5122b88d5ce3 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/apcupsd/Manifest b/sys-power/apcupsd/Manifest
index db954e3adc31..42e443ea4a20 100644
--- a/sys-power/apcupsd/Manifest
+++ b/sys-power/apcupsd/Manifest
@@ -8,6 +8,5 @@ AUX apcupsd.service 111 BLAKE2B bf2ac8161af5b971642298c30b08ad78d289044bb2452bde
 DIST apcupsd-3.14.13.tar.gz 1935043 BLAKE2B 56d8fb9c6a055b20c2d99867e43b6a2d6ebe1d55c724d8a6701d9baa569a14f600cb03c6176380c6c42c46ac610f43136a4b52c47c8b86bc41966d4091481e95 SHA512 74f7763de268626e24f9dd99090b01d5bff35c2fde769039104105ec27941673d1613c41fcac11e3d97d2fe5c364bcc0459847fcba5d2f7f1aac85795d6d8570
 DIST apcupsd-3.14.14.tar.gz 1843409 BLAKE2B 48a3b249780064d699d86b658584aa222ce9f3b46a81209110b4684bf737cca7492b87b063154864ce76478f29f73cda83ab96b47f4a7aa7aa91e29a8abbf4a8 SHA512 c953bbf3e08f809748a7978a3952604176390d1cd276f187fe096d9bc3c8993b52127e8350c0363387da41318e24b4d1e00ea58df71f3bb8f50c9a5a64cd2d7f
 EBUILD apcupsd-3.14.13.ebuild 3958 BLAKE2B e87053e35983347d5dad1c61ff484e65322678a90e59b23cdd8d97bd745b1590c01958ee8cf04e08b62d037d0bfb10a43f2707b37518877ba3371f49a6a9bb82 SHA512 6563b422815aa8904af1b50983fcf68d951c37be64caea016d5299fa87101d3e7323126f36973a4f43a409d4dd4116cee6876987986ce9def5cecfc67701ae38
-EBUILD apcupsd-3.14.14-r1.ebuild 4085 BLAKE2B c8f0842bc550d8a40d5ebf1809a0a27db293a5425895df35502d77b700a5a235aa9fdb6a66c4c786670816bb14cfbaf0a4d6f968e58733f2171cd60b2cb6bee5 SHA512 b0fb1ddaa60c864cc301a9b35e8ccb455df27a3f9fd0c8f2b768b55d8a79a6329ac8d11f1d2d6e68e16502f3ca0e7db0a3b692d2fa805288e21773fe808c2609
-EBUILD apcupsd-3.14.14-r2.ebuild 4089 BLAKE2B 2e9da901aaeb715fc79b763ab20b2c19369eb27c089ead0339a1248e11c5e92cead419abbcd2b2e621c8c0a408245c771630b92901fae509fc54cc2946325202 SHA512 1fc24c9a15098f00ad003cda26a22e1043822fa6f680797e94b200a5983ca71ffe5e8753bba56e55b9c939a589cc94418f0acccfc146b3e312bcf593cc6a1ae0
+EBUILD apcupsd-3.14.14-r2.ebuild 4086 BLAKE2B a4419fe2b919c1aaf1ccfa0696ae899a0e6f3f0b4e7347c36cf67f03938e101a2ad97c07f82274b21e1e187c4e58a6ffd6758b75ba2ab35928de2e6e4ba9d4fc SHA512 3fe844171f9ec9fd2993f551738481dcdb9cc97f1ee19cb8a2076687834c21c0e7bd18416bd541de30cc7ef9e833602b42f3eea0b902d0ad20a44e6d83edc2e2
 MISC metadata.xml 1259 BLAKE2B ca28cef92e8edcea0aaeece78cadb43ad8ad836297d8e857540558877a7781922f50c05b018d1a9f7d0753ddfb0a99aff84d16051fdfe5f0d407b79509058a35 SHA512 ba5660026926c0334a47aa3f84bfc0a4ef745db2170a1d773547cf495101cf1274cc24d71d3afa46fa62ebcb49e0913e92e9a0efe4cb70a349f77538b7f60eff
diff --git a/sys-power/apcupsd/apcupsd-3.14.14-r1.ebuild b/sys-power/apcupsd/apcupsd-3.14.14-r1.ebuild
deleted file mode 100644
index dc193a1d0fee..000000000000
--- a/sys-power/apcupsd/apcupsd-3.14.14-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils linux-info flag-o-matic systemd udev
-
-DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
-HOMEPAGE="http://www.apcupsd.org/"
-SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~x86-fbsd"
-IUSE="snmp +usb +modbus cgi nls gnome kernel_linux"
-
-DEPEND="
-	||	( >=sys-apps/util-linux-2.23[tty-helpers(-)]
-		  sys-freebsd/freebsd-ubin
-		)
-	modbus? ( usb? ( virtual/libusb:0 ) )
-	cgi? ( >=media-libs/gd-1.8.4 )
-	nls? ( sys-devel/gettext )
-	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
-	gnome? ( >=x11-libs/gtk+-2.4.0:2
-		dev-libs/glib:2
-		>=gnome-base/gconf-2.0 )"
-RDEPEND="${DEPEND}
-	virtual/mailx"
-
-CONFIG_CHECK="~USB_HIDDEV ~HIDRAW"
-ERROR_USB_HIDDEV="CONFIG_USB_HIDDEV:	needed to access USB-attached UPSes"
-ERROR_HIDRAW="CONFIG_HIDRAW:		needed to access USB-attached UPSes"
-
-pkg_setup() {
-	if use kernel_linux && use usb && linux_config_exists; then
-		check_extra_config
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.14.9-aliasing.patch"
-}
-
-src_configure() {
-	local myconf
-	use cgi && myconf="${myconf} --enable-cgi --with-cgi-bin=/usr/libexec/${PN}/cgi-bin"
-	if use usb; then
-		myconf="${myconf} --with-upstype=usb --with-upscable=usb --enable-usb --with-dev= "
-		use modbus && myconf="${myconf} --enable-modbus-usb"
-	else
-		myconf="${myconf} --with-upstype=apcsmart --with-upscable=smart --disable-usb"
-		use modbus || myconf="${myconf} --disable-modbus"
-	fi
-
-	# We force the DISTNAME to gentoo so it will use gentoo's layout also
-	# when installed on non-linux systems.
-	econf \
-		--sbindir=/sbin \
-		--sysconfdir=/etc/apcupsd \
-		--with-pwrfail-dir=/etc/apcupsd \
-		--with-lock-dir=/run/apcupsd \
-		--with-pid-dir=/run/apcupsd \
-		--with-log-dir=/var/log \
-		--with-nis-port=3551 \
-		--enable-net --enable-pcnet \
-		--with-distname=gentoo \
-		$(use_enable snmp) \
-		$(use_enable gnome gapcmon) \
-		${myconf} \
-		APCUPSD_MAIL=/bin/mail
-}
-
-src_compile() {
-	# Workaround for bug #280674; upstream should really just provide
-	# the text files in the distribution, but I wouldn't count on them
-	# doing that anytime soon.
-	MANPAGER=$(type -p cat) \
-		emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	rm -f "${D}"/etc/init.d/halt || die
-
-	insinto /etc/apcupsd
-	newins examples/safe.apccontrol safe.apccontrol
-	doins "${FILESDIR}"/apcupsd.conf
-
-	dodoc ChangeLog* ReleaseNotes
-	doman doc/*.8 doc/*.5
-
-	dohtml -r doc/manual/*
-
-	rm "${D}"/etc/init.d/apcupsd || die
-	newinitd "${FILESDIR}/${PN}.init.4" "${PN}"
-	newinitd "${FILESDIR}/${PN}.powerfail.init" "${PN}".powerfail
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	systemd_dotmpfilesd "${FILESDIR}"/${PN}-tmpfiles.conf
-
-	# remove hal settings, we don't really want to have it around still.
-	rm -r "${D}"/usr/share/hal || die
-
-	# replace it with our udev rules if we're in Linux
-	if use kernel_linux; then
-		udev_newrules "${FILESDIR}"/apcupsd-udev.rules 60-${PN}.rules
-	fi
-
-}
-
-pkg_postinst() {
-	if use cgi; then
-		elog "The cgi-bin directory for ${PN} is /usr/libexec/${PN}/cgi-bin."
-		elog "Set up your ScriptAlias or symbolic links accordingly."
-	fi
-
-	elog ""
-	elog "Since version 3.14.0 you can use multiple apcupsd instances to"
-	elog "control more than one UPS in a single box with openRC."
-	elog "To do this, create a link between /etc/init.d/apcupsd to a new"
-	elog "/etc/init.d/apcupsd.something, and it will then load the"
-	elog "configuration file at /etc/apcupsd/something.conf."
-	elog ""
-
-	elog 'If you want apcupsd to power off your UPS when it'
-	elog 'shuts down your system in a power failure, you must'
-	elog 'add apcupsd.powerfail to your shutdown runlevel:'
-	elog ''
-	elog ' \e[01m rc-update add apcupsd.powerfail shutdown \e[0m'
-	elog ''
-
-	if use kernel_linux; then
-		elog "Starting from version 3.14.9-r1, ${PN} installs udev rules"
-		elog "for persistent device naming. If you have multiple UPS"
-		elog "connected to the machine, you can point them to the devices"
-		elog "in /dev/apcups/by-id directory."
-	fi
-}
diff --git a/sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild b/sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild
index 9212cf4864ce..6b1c1f839c97 100644
--- a/sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc x86 ~x86-fbsd"
 IUSE="snmp +usb +modbus cgi nls gnome kernel_linux"
 
 DEPEND="
diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest
index 8451c2cde842..8eb778b66b59 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -3,5 +3,5 @@ DIST upower-0.99.7.tar.xz 447832 BLAKE2B 3342f38552a5eb6abffc6b15803db0e8a24e6a3
 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 2175 BLAKE2B 9453243627a001836ccba5fe418934d0fc9a93ae5c43df63f907a7e15e9c089046bafe63edce40f33e310d70168a66a0f4a13f1f58846507141ae66e33a84e06 SHA512 525c97415e4bce4dee6fd487d89ffca9f3c8a7be8c08edae7595231e85a5bfeedee97c6cab31806291aac8ef8ec3ba7310e7866fed3e1989836a69f2643e576b
+EBUILD upower-0.99.8.ebuild 2173 BLAKE2B e9ed21c7e7a47902768db82aff42c6b79e98845efeb73cf9a868ab4eaec97f2918158ef2537bc67fee4ac30d904331c8a5450218117c527d65d239aae6ae1dd2 SHA512 0c9991706616683feb6f92a3a6410136af797d8e1a571098b2e44840b09fb3b2f7396ed7084ecc8fffcdac4351d9e25ea79743fccd1cbd5412d8781cbee86637
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/sys-power/upower/upower-0.99.8.ebuild b/sys-power/upower/upower-0.99.8.ebuild
index 009a7c7b43b4..2885a37afdab 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 3717cfb77ba0..d8cf7b8f9314 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index 1a0055a75be1..9ca2675ac8cc 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 6216 BLAKE2B ad2391a4eb0802a63b1831646a1da196820605c9a6cf16c595bf1daabcd8b10161c09e23097f48b37378cfd3b18973fa264da92fdfb3df9942e99b736202156a SHA512 17f9261ca660386c6a24cf978dba360b3e911d5515c7ccb6174ad736b67ae33583185f1a758e57c692820d81886b7871a8283b809a959ff231e2700757f0de95
+EBUILD audit-2.8.3.ebuild 6206 BLAKE2B 53f6c31cef0611bce59eb7e133416298059ddad30bd269dd82ce4382ad8ea14848acc18bb0f194ad1f46f047ea0d61ca32ba95e4807948e745d01dafba612089 SHA512 1d6faa1c4d716b5f37b6d265b5d61f18a07f341fcc4197530d4d6437fd76cddead0233e7d46cf00832ceb51c381f5f567bcc13639d5099247697c5eb3c1b9163
 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 44ef93b51bdc..4e8dbdc441a3 100644
--- a/sys-process/audit/audit-2.8.3.ebuild
+++ b/sys-process/audit/audit-2.8.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="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/evisum/Manifest b/sys-process/evisum/Manifest
index 8715af7ef7ad..9c426f6a7d2d 100644
--- a/sys-process/evisum/Manifest
+++ b/sys-process/evisum/Manifest
@@ -1,3 +1,3 @@
-DIST evisum-0.1.1.tar.xz 77748 BLAKE2B 32c3330586d7d919ff54d8c3166bbece11efb1031617f039e7806dca268a6df3739db27ebc456c3b28e3d7599d325fb8aff16b21cc65b20e6011aa551a10e006 SHA512 dcfa7cdf18e08e63c53baff69c88fc81939534c7b1ecfe6a87567c30334d6f2c2899092c8eb630112f79d36e42cc2f4accc3ed3e389ed8cd0e78f52a566c2ca2
-EBUILD evisum-0.1.1.ebuild 464 BLAKE2B 7d4b4e56c16a1fbc8e57f4383add68b30a9522bf3590287d536dda40c9e81f8044fd4a210fd7953e6723f0528777a5b6ae57f25620af32cd87cf3ba4aefe354f SHA512 d1f799e5025e202ef28fda97c5b6e2d8009f393afd029418395a0be2b7b1130316c297b0ed21dfaa2e90a7634e4f067207fc3a7328c954ca286ece903803361f
+DIST evisum-0.1.2.tar.xz 77796 BLAKE2B 79baf9acd755af381e8a2f377727fb7e9d452a7ef57e9e5b4cee0013236e96ec8c8170072790a9a09f22a7d166ba86be4d0580767714a26cbfabc63d2a47aee9 SHA512 30e03c4468079f2932f5b1c3a6c3b2ddcf263c7bcd1a767bc45ac7c6e97a33bc2cd9d5cf1201907d0c76b149fa9798c28b25a81f451074af1c53016bb25fd53b
+EBUILD evisum-0.1.2.ebuild 453 BLAKE2B 0153fb80698947ecc36017fdd5cef8110dfdc602d4c2dde188f0c735044a2622401f0a3f2caa6f683af88171dbdc40c28d30c13accf6c7141cf89f665ac746cf SHA512 24fba1d9c02f41f07d946aaec236c6c124f0a7536abf908205e738dc09596c7fbabe5dca93400d2255070f7ca1bf75c4075497ca042ff7a5d1f21167cf08ca32
 MISC metadata.xml 905 BLAKE2B c288b46a8df2a24a0e509001487c8d987443c139407cb9ec2b964c2cabd02d39566fd2cbda5e77356df2648db9cde543a881350522382734795f3dbc82d460c5 SHA512 75dd35bac971d67c6fd9a78b2cfb599f50d1f8d6107a83729efc9df0cea4fd414ddc50719bfbeddb48edfee82a4a1888a66a2932e35d6b61df8299f87331e381
diff --git a/sys-process/evisum/evisum-0.1.1.ebuild b/sys-process/evisum/evisum-0.1.1.ebuild
deleted file mode 100644
index b495f2d787b7..000000000000
--- a/sys-process/evisum/evisum-0.1.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=7
-
-DESCRIPTION="System and process monitor written with EFL"
-HOMEPAGE="https://www.enlightenment.org/"
-SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-libs/efl-1.20.0[X]"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	emake PREFIX="${D}"/usr install
-	einstalldocs
-}
diff --git a/sys-process/evisum/evisum-0.1.2.ebuild b/sys-process/evisum/evisum-0.1.2.ebuild
new file mode 100644
index 000000000000..c8a0cadb3539
--- /dev/null
+++ b/sys-process/evisum/evisum-0.1.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="System and process monitor written with EFL"
+HOMEPAGE="https://www.enlightenment.org/"
+SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=dev-libs/efl-1.20.0[X]"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	emake PREFIX="${D}"/usr install
+	einstalldocs
+}
diff --git a/sys-process/lsof/Manifest b/sys-process/lsof/Manifest
index f6c418aa6ff4..02f27dbf3b26 100644
--- a/sys-process/lsof/Manifest
+++ b/sys-process/lsof/Manifest
@@ -5,5 +5,5 @@ DIST lsof_4.90.tar.bz2 791758 BLAKE2B 250025eb553ee4574cadadcc57fa52bd97d8ce4432
 DIST lsof_4.91.tar.bz2 791734 BLAKE2B cd6211caedea34fdbb89266fd78a70902117eda6d4d7fa69115426f4a6f5cb5296fa09bbd946648d8d93483881e4ea4e2190f090be155c1081850e8366cfd05a SHA512 49f811941dd6303f7cb0655fddb8b1177af5d1b18f2bd1edfab09d2c128aea73daecf09c7a5375979c66ba764c88a6e70c9086b55c3634e3be01ab1aa12e9f92
 EBUILD lsof-4.89.ebuild 2980 BLAKE2B 2d2229df4d2d952bffff94f3fe0066107e3a1ed93d410a043c6ac57221f3a4a65a5f1e63cc7614c8b34cb93a3bea6668938663d30c3ca8f10fee3a59e2af370c SHA512 3b3d5ce06f3123aca989c683d8c3ef165eafc488258e87e429c96159f5c402326cbfee8426594b89b3106c36d7c2c80e3a501c4d2f4dddd6c8fb2687017772b1
 EBUILD lsof-4.90.ebuild 3665 BLAKE2B f5450b27154595a2d30e07ed804c18f281d2f7a563a550fdb5437099cce5e1f45406da063c97fceca04e38f0f73eb99afbd01228aeaceec8631bc8b093363e74 SHA512 f652c0eaffc1dc51b298f68e1935621d9063d1709ec6154b63e560f3f39c16407efb3dac647c216b9552a02de3559ba115222252e01da4c4ee0cde02912c0dda
-EBUILD lsof-4.91.ebuild 3665 BLAKE2B f5450b27154595a2d30e07ed804c18f281d2f7a563a550fdb5437099cce5e1f45406da063c97fceca04e38f0f73eb99afbd01228aeaceec8631bc8b093363e74 SHA512 f652c0eaffc1dc51b298f68e1935621d9063d1709ec6154b63e560f3f39c16407efb3dac647c216b9552a02de3559ba115222252e01da4c4ee0cde02912c0dda
+EBUILD lsof-4.91.ebuild 3659 BLAKE2B ba11cce6fad509bc861a5c40b3986d738a0b97d146bca7d14dec73d6a59d0a1119bb13f96a79c9e3220529e5a8458f3565a0e1d0f83078e5816a0f95ca68cc3e SHA512 0c375c7c6205ab9fded1f24f199df4f6b7c610140492ce97154e66a7d801443204f9fc395ac033188285956725af2005551d331067799c72c111bafcfe10156d
 MISC metadata.xml 327 BLAKE2B 4dec6763546c6f65ccd6a2483e6cc99203313a267ee5f18ca0e646f9af8774c8760e4f56711735f2c64880af8bc78e26b22e47774b36fb48ccd2d841647d274e SHA512 c8c0efc3b339063936d805d533cf3528e1a4e1a84829c0e0f993fd3268751f4d7d4713f45cc6fec2956101b611e6e344e0c0336eb8d1b769a47481d72088fb98
diff --git a/sys-process/lsof/lsof-4.91.ebuild b/sys-process/lsof/lsof-4.91.ebuild
index 8a1faa697af2..123467289fd4 100644
--- a/sys-process/lsof/lsof-4.91.ebuild
+++ b/sys-process/lsof/lsof-4.91.ebuild
@@ -1,4 +1,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="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2
 
 LICENSE="lsof"
 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 ~sparc-solaris ~x64-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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples ipv6 rpc selinux static"
 
 RDEPEND="rpc? ( net-libs/libtirpc )
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 47e41c3deecc..e26eaf278ed8 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/cargo/Manifest b/virtual/cargo/Manifest
index 5515aba10acd..ad91b12535f7 100644
--- a/virtual/cargo/Manifest
+++ b/virtual/cargo/Manifest
@@ -1,4 +1,2 @@
-EBUILD cargo-1.25.0.ebuild 317 BLAKE2B 39596c36e8d49b47b33ad848a1d5a39e7dd555ffe69d2bb971852b410ecc3f86cd06cb3b65311600a337746ea6028e47424c509185eb3fa1757c6ee7a7993937 SHA512 0da3f8e2d3883f00c22953ad148a7312019a9af29ae7f8db7b4ef544af00fc68d8fb9bbf51c7e3f412c3b7ac61fb7569ec5d0d557bd4078c023a9244e60d6d51
-EBUILD cargo-1.28.0.ebuild 410 BLAKE2B 5d5bedd3d9c198cd8322ff6376294f88a6f3fd002d39a716b015d848e198d79879272cb730f035be1bfd5d7410dffb39bd147833ccd843f68f2afacb0c8a9bff SHA512 0a57a376867a408f3b24f3ed49cdfd5d4232ef623f0d9bb64ee0aca5bd0294ac36a1a28cb9bccfc2bca85bb50321f319ad4f6a72eac95d7cce8d592e617b3d52
-EBUILD cargo-1.29.1.ebuild 411 BLAKE2B 899395d81f0be64fa30bbcc216bcd9da6ff36830e89f2e57ed4132bf861bcefba4edc2e047e8b99ad38694bcf154c5fa03482c433aec6e40a30a850e24b0edb7 SHA512 330ecbb23d04521f0e066f70a61af5cae1529f43a57406de21abca3e3325a1696bc52fcab00bd94246c6ac400ee979b2ae216d7f20218ba4812d898eccd8f2e4
+EBUILD cargo-1.29.1.ebuild 406 BLAKE2B 95fcbb2f79bf6172755f87f8da1fd7068a9af9f4da1638907467216e5055481990ce6b9f10cde120cbb770344e538fc9dcfb0d2607360b9279ab2699464592e2 SHA512 2137c8e5524319bc8a21f27032c220a94b1bc2b181254f758b50f64cd25c5fb8610c78d7b2e1b91835dbabdbbab2a7563abac5566643e4bf4dbd7edcdd2b5ad7
 MISC metadata.xml 250 BLAKE2B fe9734e0ff554c2ae0be039e12f780b2a36e30b518a00cac557fc63b2eecb4c9c61d914aae6f9a3f80efd109e596717ed3e5db4756440f923657fe41cb208e78 SHA512 659ffa5a36819a0534e5c614275998a130d02260924fa03d43b667f38672041b6740fb9c1efbc74d3f900ee4d3c14280aefa93d0c99fa27c1159683956f2c8f0
diff --git a/virtual/cargo/cargo-1.25.0.ebuild b/virtual/cargo/cargo-1.25.0.ebuild
deleted file mode 100644
index ecc9d88e9198..000000000000
--- a/virtual/cargo/cargo-1.25.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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"
-
-BDEPEND=""
-RDEPEND="|| (
-			=dev-lang/rust-${PV}*[extended]
-			=dev-util/cargo-0.26.0*
-		)"
diff --git a/virtual/cargo/cargo-1.28.0.ebuild b/virtual/cargo/cargo-1.28.0.ebuild
deleted file mode 100644
index 58d8d61dc885..000000000000
--- a/virtual/cargo/cargo-1.28.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=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/cargo/cargo-1.29.1.ebuild b/virtual/cargo/cargo-1.29.1.ebuild
index e05ec4b31305..078515624fc5 100644
--- a/virtual/cargo/cargo-1.29.1.ebuild
+++ b/virtual/cargo/cargo-1.29.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
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 CARGO_DEPEND_VERSION="0.$(($(ver_cut 2) + 1)).0"
 
diff --git a/virtual/libffi/Manifest b/virtual/libffi/Manifest
index 2997c6b983a5..afb8b038b949 100644
--- a/virtual/libffi/Manifest
+++ b/virtual/libffi/Manifest
@@ -1,4 +1,5 @@
 EBUILD libffi-3.0.10.ebuild 600 BLAKE2B 0c6732b0db5ba900f94ae65aae06c196efe64d70fd895aaf58d666bb3d9a43e8a217a0fae75554568ec8c7f44e8fc3b97256d59873ab27c3c3fdae5b6019c9e4 SHA512 4816f4904e24674caea50e8a0ae621a70a53fe2635a91d6e1e3354f35b93d1cb94c0eb92c52b31ce8fe61a5df804e8ab7b2e1cc352f123bc19320b325189002e
 EBUILD libffi-3.0.11.ebuild 601 BLAKE2B be01a763073cd8874f1c3ec07dcd0b9058536f43cc3adf9da5f5e893bffabd37a99971ef52c3dbd6e70db62595fbfe306094a54ae1b616a4a45c291f80fc6e62 SHA512 6651fd8cec053b59ea1297945bc590da58f147fc4d6fed6dcb2b08f8fc9b6277dc5a4124293fea79c2ffdcf85efdd1b799701fd10f84d6e64ad1829445b84cd8
 EBUILD libffi-3.0.13-r1.ebuild 676 BLAKE2B 75a53a2cfe5ea7056c115adb95b980233fad60397c6e5b152b12d4214b0c4866181e48d8cb2ff4ca5868538cc3e46def2dc22c7b77f20b1d613844037c7b0b23 SHA512 e4a943c879412c740720192c9f659ff339226536fcc08b6df0d61845317cea622b24f0aa35071eae8ee8d507e44bad131aae3cd84a31aedb2ba916652d1a61df
+EBUILD libffi-3.3_rc0.ebuild 711 BLAKE2B 1d5305c18f507d75177cc9335f45132e7dc0067764ea683e9d01bb7fab8d2b9f43af64b3fdcfdc4d322645ebadc75cbd5f1fe36f2276b0757db94ecb1f355937 SHA512 b3460e3a4be37ec9e8d61c1921582d04de0d609241f9fe319566335e7c473c5fe4172f82b2eea60a2584edab9bcb04ce24d90111eb45a87bc989d811cc04d4a6
 MISC metadata.xml 267 BLAKE2B 5267526ad53ec7bedfe46f8cba86c810629394fa4f3c59e1b69619b0a11a9edbb746ae6abf818182da7ade72c862360f43a19209007a23da9701df26b96f77dd SHA512 715bb37d958c1e508b2ef00711ab3a4abee982efe90867fd2bcf91fa91305d5a413a4f3d13d01ea6e27eb15f5f9dcb58fa13ecfed7025cae43745792ac1a105d
diff --git a/virtual/libffi/libffi-3.3_rc0.ebuild b/virtual/libffi/libffi-3.3_rc0.ebuild
new file mode 100644
index 000000000000..793387cd3e83
--- /dev/null
+++ b/virtual/libffi/libffi-3.3_rc0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# The purpose of this ebuild is to provide quick fallback if and when we need to
+# switch back to internal copy of libffi from sys-devel/gcc.
+
+EAPI=7
+
+inherit multilib-build
+
+DESCRIPTION="A virtual for the Foreign Function Interface implementation"
+SLOT="0/7" # SONAME=libffi.so.7
+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-libs/libffi-3.3_rc0:0/7[${MULTILIB_USEDEP}]"
diff --git a/virtual/rust/Manifest b/virtual/rust/Manifest
index bc2805f23d45..7f4b0e02b786 100644
--- a/virtual/rust/Manifest
+++ b/virtual/rust/Manifest
@@ -1,4 +1,2 @@
-EBUILD rust-1.25.0.ebuild 315 BLAKE2B 9b8dc0635a5f3616c6aae90b9d9deebfda2e410f5bdf14560305d5e8f732e40e4f19dca8fb9ddd024403aba02269ea572f9534a66a79b01a63cdd8ae73711e7a SHA512 e1788d6d3877f1b04ce08ad35668673e3e52f2d1243fe167e1fb38c7dbb816f1c70cb778d839a96aea2130bc672e8026bf6f0f8608bb0ca328c14fce4157d96a
-EBUILD rust-1.28.0.ebuild 315 BLAKE2B d930ce879f0c355eb27e9499c4080f5044553b2fcd9432f28b4f29c6c4b53294d0c36c0d1ac589c245dafbc4f3ab0c69b456fa903db72837d2347fb5bbbd2b57 SHA512 0f9d7135ac168d829e90b66ee9dc7cb5969b8015fc5840a794f8bfea44180aacdaa716c3465b9c9bd8b833d66b7b0dab523a64ad9b545fee68931acda3f40089
-EBUILD rust-1.29.1.ebuild 316 BLAKE2B 42011cc292fb034308820d2daf342120b736834151bd05ccb12378551862a8fc5dba286401872c8af6a71741018cd5f709d0e7401cb92dcb295d36f23d91d28b SHA512 1083147da3fa25ba69f561eae232f1a60e8bb967205bb483dde126e3e3e69f83cbe02a8179d46849d3ef70aada88cb8d8ed1af4aa0ff1eacc558b141a28deb4e
+EBUILD rust-1.29.1.ebuild 311 BLAKE2B 2da16fc2517bdef6fba4c22e3c0be641ea877ad69a221f6e0f0fdfe0b102cf8375e747453fa911443387397638966554ce399076198b7da9900f146738242fa6 SHA512 8340b1479cdf26fa44497e26786389946870c73883f1aa2fb331eb5d3de7c44189e44384b08a9f36b8ece50037a323a8c2425b8834b56d105ace54e349e05a00
 MISC metadata.xml 250 BLAKE2B fe9734e0ff554c2ae0be039e12f780b2a36e30b518a00cac557fc63b2eecb4c9c61d914aae6f9a3f80efd109e596717ed3e5db4756440f923657fe41cb208e78 SHA512 659ffa5a36819a0534e5c614275998a130d02260924fa03d43b667f38672041b6740fb9c1efbc74d3f900ee4d3c14280aefa93d0c99fa27c1159683956f2c8f0
diff --git a/virtual/rust/rust-1.25.0.ebuild b/virtual/rust/rust-1.25.0.ebuild
deleted file mode 100644
index 7cc0e2e73fb0..000000000000
--- a/virtual/rust/rust-1.25.0.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"
-
-DESCRIPTION="Virtual for Rust language compiler"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-DEPEND=""
-RDEPEND="|| ( =dev-lang/rust-${PV}* =dev-lang/rust-bin-${PV}* )"
diff --git a/virtual/rust/rust-1.28.0.ebuild b/virtual/rust/rust-1.28.0.ebuild
deleted file mode 100644
index 529febdafe20..000000000000
--- a/virtual/rust/rust-1.28.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for Rust language compiler"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-BDEPEND=""
-RDEPEND="|| ( =dev-lang/rust-${PV}* =dev-lang/rust-bin-${PV}* )"
diff --git a/virtual/rust/rust-1.29.1.ebuild b/virtual/rust/rust-1.29.1.ebuild
index fa78c78a3e78..f0bd8de3f2a8 100644
--- a/virtual/rust/rust-1.29.1.ebuild
+++ b/virtual/rust/rust-1.29.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
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 BDEPEND=""
 RDEPEND="|| ( =dev-lang/rust-${PV}* =dev-lang/rust-bin-${PV}* )"
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 711a5b004351..92fe4e7d6a8a 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index c0399d6e65ed..cf6467792a76 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,12 +1,8 @@
 AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca
-AUX chromium-compiler-r2.patch 5649 BLAKE2B 211945cbb207e956517470210d97b2dbbf6c496f71cacda7f2fa288e5ba631a791a0e60214e982d4f91c4db723dd5c4aaa2e9f51423d2e63fce8b334687170f8 SHA512 563017b56d410080ae3bee8053cb65f0308d841b96222cb6ea7e444cfd066dbd8c6161489240c778de63794ada76c90189fd794001d4fe50ab875251c0b7f41f
 AUX chromium-compiler-r4.patch 5640 BLAKE2B 2fe93975237f112bb280bd5b51f48e0e8454d11a91b81ce2ae0520fb59ff2c00498319e202e34f4c2abb1330ba2c7dbe9dd1a75bfd578453da533531b7dfaf8e SHA512 34e32d9e46a5981b021cffee3440582ef312e78ec1bf287c6d0f14f5ff7921a5b229238394259b8df5aa081360dd76aa6d7db095ed4e1841479d8fe55cde9fe8
-AUX chromium-cors-string-r0.patch 1819 BLAKE2B 80f68395eebbc8425dd5d17c46364bc8d3f8cb657c4e4ffe94a221a22f006f15eb6aad68160e0da767a23276ebd6a4efb6fe2d468501c48571b32bf8c17486c9 SHA512 06314e759c7073d19bb18f41713e43ca34e608ebec4d269cecb7d592e84fe7f10e839e1c3824c574e938746b26a6f2f9d6361f7d21b5698b917c7b3e0fe87b94
+AUX chromium-compiler-r5.patch 5577 BLAKE2B 622f89f30ce182805198cf9162b867cadc72bf480a64b043772f3a525ad65beca429d3b7f6bb225cd22857d0335ed2e9a7cb72659c0c90d1a49daefeea0e7d72 SHA512 ed66baa3db6d31c9f5bfaab0fba82ff97a10fa009724d3a11db448e93c8e37ae0ba96b22476b41981da94a65d568866a0756a72b3a92cc385f8a54485612cc71
 AUX chromium-ffmpeg-ebp-r1.patch 553 BLAKE2B 2f9799b38436f37ed7f7de06d6f7692bcadcacc0269169cc75e48f52ad6eb1c5af54891249eecf1bd5e10efad3888dc650326b53878ad1d9360d6304b12d51ed SHA512 27d929756707b964465c2cc1b586b118ffd67b3fec84e1c6606c2d4141a6717741cbc1ebf5b4c3b40f9476220610a1ada6e80b342506c4f9d2ccbe7e067191ba
-AUX chromium-ffmpeg-r1.patch 528 BLAKE2B c6cbbbb13093b10d0d8e95bd382dbc7f9afb6634802f6560a7b5886482c912cb493aed4c231b4c781b89de6dcf4200b17ba9315e337a3f73e8fdca12dceb80fb SHA512 1dc7dd844e8e0aec379ace3a163200735bbab0644f9d02fa0736f91a4156e9cede5b66eb6a015f8679ecd26dab2345b82ed181591bb78a1e88d3cc0174237ea0
 AUX chromium-launcher-r3.sh 1199 BLAKE2B 85f57b380cdc25bd000cf57d3c129b67f6e55d96dd958190040b0680f8d4d358ac777e0c1ebd6a1b32dd3821a377bcf9f598e073584528d0480460978c4c1fb1 SHA512 f1909314ae74985c85740d26c9bfab694f3202de8ccc392a1c4ec5c8760db21b6cc46146c78a9abebd09e6d24f37e19466f0c4d2d61815400b48d859f8ce154d
-AUX chromium-libjpeg-r0.patch 2734 BLAKE2B b30bdc08c9c2ab84824a963cd0cad6b3c6c1f42b0056ad70a336fcef024ab25ffec9d06330a61fe7869ffe1dab02a71589d46a56ba531aaafe6a3cc4284bc037 SHA512 ccc5887c3c1ef2a84de7db6318bdeab4330a48a83cc4b11b7b4834b5a579f1da9cd8c78bd4b22e4fada41de25651fcf7539be69745c767a4540e69d26096a532
-AUX chromium-libwebp-shim-r0.patch 921 BLAKE2B e273db17653b56f79916ed64d5c612675dad01a8f4b72ed3ce924147e90d458574ecf557e07874ca0547088b211b5e360b0ba421764917557a39c364179d8ad6 SHA512 d2dc9ce579bb900b131061a2f8070bd43c36d61b619b1f3addd460f19bc55236ce1d44ba405f0adb084ddde66e564b94bbd516b80af5c89f778bf2c55354dd78
 AUX chromium-math.h-r0.patch 1092 BLAKE2B abdef69cacaa5af0cd84b293b300fa5db631b7df8d4f1237449e858dc3ff56589a3f46d8228fc0c969552f41bd9cf2a0c2cbf4a1936c2729f701aa1d4ad86b94 SHA512 91a0d74ec51a6776bfc4212a132963fbc4688c47ee1da40cfbebf696ef26a766f5189cb0a972ef2cf4338daa5355ce79002d624b5f30a7c2de36e40b07355f8d
 AUX chromium-memcpy-r0.patch 1306 BLAKE2B 585c015fbc6cfda61fb28c451da1433047c21e439c6a23e2f27844c308984a2066a70913669b3e1797233f86e25a119e494156c0b869eccc94d21c2abaeadba4 SHA512 1aeeb70929acee529dea66860b42f106afe18c0f6219eb03c9c710faf8d20a997135550e289839599ec325d8f032243fd70c07d397bd89302a192c41e8c4660a
 AUX chromium-pdfium-stdlib-r0.patch 986 BLAKE2B 58dadfcf17149382890e168cbfffefd245a7df5b6a1465bb9706a5b08aaafa2fa94683a7c3c73a98c832d08a053bd20e8d81de13e89a52651b591a545ca849fb SHA512 f401b632ec6cba9a119b623aa08e222ef72cc080d61bbb3fd58eaf44ff950f89ab0a6bce1d5b134ed6d389de8375c0dcc3a8b4ef4ff78005e05490f6cef3e4fa
@@ -15,11 +11,13 @@ AUX chromium-webrtc-r0.patch 972 BLAKE2B 1c49db0ba631c8e517a5b361e2882e7f00d9b01
 AUX chromium-widevine-r2.patch 1488 BLAKE2B fc4dc6ce40b2d2a152a0bbc5958d8050d9a7f4176cd0121d81ae1a9e76d361c064f54e034fb9213fc802e0a4b1b8d661788dbe9089daf8b197414724a057d4e4 SHA512 6fe8eb7b0e6c88e00d1b3dadf433b886c71cbf9b3dd4e712845a636a689cad6bc58fa8b20b412a1f7a8a1b649bccc8c961e762fa5f4d4ae092355e70db0a9cfe
 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
 DIST chromium-69.0.3497.100.tar.xz 617374764 BLAKE2B 45805e7a743982c167974cbe223b126dad83cca2eca6c78b6fe707431b2df45cb30271c0ee5002839c84f661260063852a1e1a913d26a073a87fb20e7b4d964e SHA512 bc9dd4a63eb9a8c369bd360f7fd0fb9b72addfa553e9a9d8adbfafe7ec4af39ec1fb3dd6523af1f17cb141aaf017ca4b6abc357c4a595ff627e88c58e87e8f6f
-DIST chromium-70.0.3538.16.tar.xz 622798348 BLAKE2B c9082858b9716f0550892ac3b611744b8a9bf991e61eb51e4e528caa69daa9e9751a12bfc3ef85bdef46b38f4a779cd6a536159279b6c58b4b2602a43ad534f8 SHA512 d2c62b6d5b39fec066e9a6c78484026453d4bfb228c4653c4824ee56a813e7af8172211a1ee7c494aa36b9419b3a2746dc47d879a2ea68300b0ca434f326347b
 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.16.ebuild 20960 BLAKE2B dd67448e53cde83b2cd565a5d7482fa507badea01147c76b8b1dc6a7cc5eefa933201b3854ac41bfed2d1e1f9eae05d2c038fce06a24ce50580f115ff87e2bb4 SHA512 28c81e7d5addd39ef2a6a893b9a41c474ed9ba80b49d5f308c91e46b96031584233620e5ef2501e196ab29e583c3b0cec588ce592cb8a11a02e1175f8eb20ca9
 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
 MISC metadata.xml 1418 BLAKE2B 0fd718bd70dc0fa890bf7e0efa2f6a186df446617f36bb5e4689989c4766da4016b5325d8a81f8959e887fc182ff792bb10909b5724df8c4fcaade221b289d8b SHA512 1c68218f5cab5787a7524823975474065794aa18f8301e9efe066847b9a566b870a68a3768cee925a3ad6543fb182575043c1cb45e145db67382c502a535d039
diff --git a/www-client/chromium/chromium-70.0.3538.16.ebuild b/www-client/chromium/chromium-70.0.3538.16.ebuild
deleted file mode 100644
index 64b814054bae..000000000000
--- a/www-client/chromium/chromium-70.0.3538.16.ebuild
+++ /dev/null
@@ -1,693 +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-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
-
-	# 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
-
-	# 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
new file mode 100644
index 000000000000..536322cbe16a
--- /dev/null
+++ b/www-client/chromium/chromium-70.0.3538.35.ebuild
@@ -0,0 +1,695 @@
+# 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-71.0.3559.6.ebuild b/www-client/chromium/chromium-71.0.3559.6.ebuild
new file mode 100644
index 000000000000..71d7284a09c2
--- /dev/null
+++ b/www-client/chromium/chromium-71.0.3559.6.ebuild
@@ -0,0 +1,702 @@
+# 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/files/chromium-compiler-r2.patch b/www-client/chromium/files/chromium-compiler-r2.patch
deleted file mode 100644
index 3ac2eb81f4cb..000000000000
--- a/www-client/chromium/files/chromium-compiler-r2.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-From 4310db462fab74bf14066f2a6f7cf250ecba0cf1 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Wed, 25 Apr 2018 13:22:49 -0400
-Subject: [PATCH] Disable various compiler configs
-
----
- build/config/compiler/BUILD.gn | 61 ++++++++++------------------------
- 1 file changed, 18 insertions(+), 43 deletions(-)
-
-diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 83337d52e4b9..f2c192fc31ca 100644
---- a/build/config/compiler/BUILD.gn
-+++ b/build/config/compiler/BUILD.gn
-@@ -228,8 +228,6 @@ config("compiler") {
- 
-   configs += [
-     # See the definitions below.
--    ":clang_revision",
--    ":compiler_cpu_abi",
-     ":compiler_codegen",
-   ]
- 
-@@ -488,18 +486,6 @@ config("compiler") {
-     }
-   }
- 
--  if (is_clang && !is_nacl && current_toolchain == host_toolchain &&
--      target_os != "chromeos") {
--    cflags += [
--      # TODO(hans): Remove this once Clang generates better optimized debug info
--      # by default. https://crbug.com/765793
--      "-Xclang",
--      "-mllvm",
--      "-Xclang",
--      "-instcombine-lower-dbg-declare=0",
--    ]
--  }
--
-   # Print absolute paths in diagnostics. There is no precedent for doing this
-   # on Linux/Mac (GCC doesn't support it), but MSVC does this with /FC and
-   # Windows developers rely on it (crbug.com/636109) so only do this on Windows.
-@@ -1415,10 +1401,6 @@ config("default_warnings") {
- 
-         # TODO(hans): https://crbug.com/766891
-         "-Wno-null-pointer-arithmetic",
--
--        # Ignore warnings about MSVC optimization pragmas.
--        # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314
--        "-Wno-ignored-pragma-optimize",
-       ]
-     } else if (use_xcode_clang) {
-       cflags += [
-@@ -1462,22 +1444,6 @@ config("chromium_code") {
-       "__STDC_FORMAT_MACROS",
-     ]
- 
--    if (!is_debug && !using_sanitizer &&
--        (!is_linux || !is_clang || is_official_build) &&
--        current_cpu != "s390x" && current_cpu != "s390" &&
--        current_cpu != "ppc64" && current_cpu != "ppc64" &&
--        current_cpu != "mips" && current_cpu != "mips64") {
--      # _FORTIFY_SOURCE isn't really supported by Clang now, see
--      # http://llvm.org/bugs/show_bug.cgi?id=16821.
--      # It seems to work fine with Ubuntu 12 headers though, so use it in
--      # official builds.
--      #
--      # Non-chromium code is not guaranteed to compile cleanly with
--      # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are
--      # disabled, so only do that for Release build.
--      defines += [ "_FORTIFY_SOURCE=2" ]
--    }
--
-     if (is_mac || is_ios) {
-       cflags_objc = [ "-Wobjc-missing-property-synthesis" ]
-       cflags_objcc = [ "-Wobjc-missing-property-synthesis" ]
-@@ -1807,7 +1773,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) {
-@@ -1841,7 +1808,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.
-@@ -1864,7 +1832,8 @@ config("optimize_no_wpo") {
- }
- 
- # Turn off optimizations.
--config("no_optimize") {
-+config("no_optimize") { }
-+config("xno_optimize") {
-   if (is_win) {
-     cflags = [
-       "/Od",  # Disable optimization.
-@@ -1888,7 +1857,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:
-@@ -1935,7 +1905,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:
-@@ -1973,7 +1944,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" ]
-@@ -2057,7 +2029,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.
-@@ -2155,7 +2128,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 = []
-@@ -2186,7 +2160,8 @@ config("minimal_symbols") {
- }
- 
- # No symbols.
--config("no_symbols") {
-+config("no_symbols") { }
-+config("xno_symbols") {
-   if (!is_win) {
-     cflags = [ "-g0" ]
-     asmflags = cflags
--- 
-2.17.0
-
diff --git a/www-client/chromium/files/chromium-compiler-r5.patch b/www-client/chromium/files/chromium-compiler-r5.patch
new file mode 100644
index 000000000000..6d6b980b1687
--- /dev/null
+++ b/www-client/chromium/files/chromium-compiler-r5.patch
@@ -0,0 +1,167 @@
+From 07fa6b9176dfd1acd4eb6706323ab4823f530432 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 | 60 ++++++++++------------------------
+ 1 file changed, 18 insertions(+), 42 deletions(-)
+
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+index 0e796978d479..fa77c2476e4e 100644
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
+@@ -235,8 +235,6 @@ config("compiler") {
+ 
+   configs += [
+     # See the definitions below.
+-    ":clang_revision",
+-    ":compiler_cpu_abi",
+     ":compiler_codegen",
+   ]
+ 
+@@ -501,17 +499,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.
+@@ -1510,10 +1497,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",
+         ]
+       }
+     }
+@@ -1555,22 +1538,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" ]
+@@ -1940,7 +1907,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) {
+@@ -1974,7 +1942,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.
+@@ -1997,7 +1966,8 @@ config("optimize_no_wpo") {
+ }
+ 
+ # Turn off optimizations.
+-config("no_optimize") {
++config("no_optimize") { }
++config("xno_optimize") {
+   if (is_win) {
+     cflags = [
+       "/Od",  # Disable optimization.
+@@ -2021,7 +1991,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:
+@@ -2068,7 +2039,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:
+@@ -2106,7 +2078,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" ]
+@@ -2192,7 +2165,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.
+@@ -2290,7 +2264,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 = []
+@@ -2330,7 +2305,8 @@ config("minimal_symbols") {
+ }
+ 
+ # No symbols.
+-config("no_symbols") {
++config("no_symbols") { }
++config("xno_symbols") {
+   if (!is_win) {
+     cflags = [ "-g0" ]
+     asmflags = cflags
+-- 
+2.19.0
+
diff --git a/www-client/chromium/files/chromium-cors-string-r0.patch b/www-client/chromium/files/chromium-cors-string-r0.patch
deleted file mode 100644
index b724cd44df70..000000000000
--- a/www-client/chromium/files/chromium-cors-string-r0.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 01d891fa0790950549c7bedb34edf869827a372e Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jose.dapena@lge.com>
-Date: Thu, 31 May 2018 17:03:37 +0000
-Subject: [PATCH] CORS legacy: add missing string include
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The cors_legacy.h file includes declarations using std::string, but
-it is not declared due to missing #include <string>.
-
-Also drop unneeded declarations in .cpp file.
-
-Change-Id: I00df799f84a6c3530c2f12f1e52d24c7d9bd6bfd
-Reviewed-on: https://chromium-review.googlesource.com/1080707
-Reviewed-by: Tom Sepez <tsepez@chromium.org>
-Commit-Queue: José Dapena Paz <jose.dapena@lge.com>
-Cr-Commit-Position: refs/heads/master@{#563282}
----
- services/network/public/cpp/cors/cors_legacy.cc | 2 --
- services/network/public/cpp/cors/cors_legacy.h  | 1 +
- 2 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/services/network/public/cpp/cors/cors_legacy.cc b/services/network/public/cpp/cors/cors_legacy.cc
-index 8f32ac3be64e..f01af63619b5 100644
---- a/services/network/public/cpp/cors/cors_legacy.cc
-+++ b/services/network/public/cpp/cors/cors_legacy.cc
-@@ -5,8 +5,6 @@
- #include "services/network/public/cpp/cors/cors_legacy.h"
- 
- #include <algorithm>
--#include <string>
--#include <vector>
- 
- #include "url/gurl.h"
- #include "url/url_util.h"
-diff --git a/services/network/public/cpp/cors/cors_legacy.h b/services/network/public/cpp/cors/cors_legacy.h
-index d2cdf026ca3a..dc9295a92c47 100644
---- a/services/network/public/cpp/cors/cors_legacy.h
-+++ b/services/network/public/cpp/cors/cors_legacy.h
-@@ -5,6 +5,7 @@
- #ifndef SERVICES_NETWORK_PUBLIC_CPP_CORS_CORS_LEGACY_H_
- #define SERVICES_NETWORK_PUBLIC_CPP_CORS_CORS_LEGACY_H_
- 
-+#include <string>
- #include <vector>
- 
- #include "base/component_export.h"
--- 
-2.17.1
-
diff --git a/www-client/chromium/files/chromium-ffmpeg-r1.patch b/www-client/chromium/files/chromium-ffmpeg-r1.patch
deleted file mode 100644
index 53d61e8f38b8..000000000000
--- a/www-client/chromium/files/chromium-ffmpeg-r1.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/build/linux/unbundle/ffmpeg.gn
-+++ b/build/linux/unbundle/ffmpeg.gn
-@@ -14,8 +14,8 @@ pkg_config("system_ffmpeg") {
-   ]
- }
- 
--buildflag_header("ffmpeg_buildflags") {
--  header = "ffmpeg_buildflags.h"
-+buildflag_header("ffmpeg_features") {
-+  header = "ffmpeg_features.h"
-   flags = [ "USE_SYSTEM_FFMPEG=true" ]
- }
- 
-@@ -30,7 +30,7 @@ shim_headers("ffmpeg_shim") {
- 
- source_set("ffmpeg") {
-   deps = [
--    ":ffmpeg_buildflags",
-+    ":ffmpeg_features",
-     ":ffmpeg_shim",
-   ]
-   public_configs = [ ":system_ffmpeg" ]
diff --git a/www-client/chromium/files/chromium-libjpeg-r0.patch b/www-client/chromium/files/chromium-libjpeg-r0.patch
deleted file mode 100644
index 5354281caced..000000000000
--- a/www-client/chromium/files/chromium-libjpeg-r0.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From c6b0194f7a4d9f494b2d51f46d2c332e2e5f4050 Mon Sep 17 00:00:00 2001
-From: Daniel Bratell <bratell@opera.com>
-Date: Mon, 28 May 2018 13:13:01 +0000
-Subject: [PATCH] Use the same libjpeg in all of blink/platform
-
-The normal libjpeg renames some symbols with macros so if its
-headers are included together with libjpeg-turbo's headers
-in the same translation unit, there will be an inconsistent
-renaming of libjpeg symbols. This happened in some extreme
-jumbo configuration and resulted in confising linker errors.
-
-This patch changes an include so that jpeglib.h becomes included
-the same way everywhere.
-
-Change-Id: I7f122d0919d58371bb40dc0097a766b857b9815e
-Reviewed-on: https://chromium-review.googlesource.com/1073423
-Reviewed-by: Kentaro Hara <haraken@chromium.org>
-Commit-Queue: Daniel Bratell <bratell@opera.com>
-Cr-Commit-Position: refs/heads/master@{#562243}
----
- .../renderer/platform/image-encoders/image_encoder.cc | 11 +++++++++++
- .../renderer/platform/image-encoders/image_encoder.h  |  2 --
- 2 files changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/third_party/blink/renderer/platform/image-encoders/image_encoder.cc b/third_party/blink/renderer/platform/image-encoders/image_encoder.cc
-index 0c7f14c7c0e4..4c450f5d6783 100644
---- a/third_party/blink/renderer/platform/image-encoders/image_encoder.cc
-+++ b/third_party/blink/renderer/platform/image-encoders/image_encoder.cc
-@@ -4,6 +4,17 @@
- 
- #include "third_party/blink/renderer/platform/image-encoders/image_encoder.h"
- 
-+#include "build/build_config.h"
-+
-+#if defined(OS_WIN)
-+#include <basetsd.h>  // Included before jpeglib.h because of INT32 clash
-+#endif                // OS_WIN
-+#include <stdio.h>    // Needed by jpeglib.h
-+
-+#include "jpeglib.h"  // for JPEG_MAX_DIMENSION
-+
-+#include "third_party/libwebp/src/webp/encode.h"  // for WEBP_MAX_DIMENSION
-+
- namespace blink {
- 
- bool ImageEncoder::Encode(Vector<unsigned char>* dst,
-diff --git a/third_party/blink/renderer/platform/image-encoders/image_encoder.h b/third_party/blink/renderer/platform/image-encoders/image_encoder.h
-index 0d1460f34827..40306097d507 100644
---- a/third_party/blink/renderer/platform/image-encoders/image_encoder.h
-+++ b/third_party/blink/renderer/platform/image-encoders/image_encoder.h
-@@ -7,8 +7,6 @@
- 
- #include "third_party/blink/renderer/platform/platform_export.h"
- #include "third_party/blink/renderer/platform/wtf/vector.h"
--#include "third_party/libjpeg/jpeglib.h"          // for JPEG_MAX_DIMENSION
--#include "third_party/libwebp/src/webp/encode.h"  // for WEBP_MAX_DIMENSION
- #include "third_party/skia/include/core/SkStream.h"
- #include "third_party/skia/include/encode/SkJpegEncoder.h"
- #include "third_party/skia/include/encode/SkPngEncoder.h"
--- 
-2.17.1
-
diff --git a/www-client/chromium/files/chromium-libwebp-shim-r0.patch b/www-client/chromium/files/chromium-libwebp-shim-r0.patch
deleted file mode 100644
index cb387a4a0030..000000000000
--- a/www-client/chromium/files/chromium-libwebp-shim-r0.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/build/linux/unbundle/libwebp.gn b/build/linux/unbundle/libwebp.gn
-index ab92adecf400..12574d87be58 100644
---- a/build/linux/unbundle/libwebp.gn
-+++ b/build/linux/unbundle/libwebp.gn
-@@ -2,12 +2,34 @@
- # Use of this source code is governed by a BSD-style license that can be
- # found in the LICENSE file.
- 
-+import("//build/config/linux/pkg_config.gni")
-+import("//build/shim_headers.gni")
-+
-+pkg_config("system_libwebp") {
-+  packages = [
-+    "libwebp",
-+    "libwebpdemux",
-+    "libwebpmux",
-+  ]
-+}
-+
-+shim_headers("libwebp_shim") {
-+  root_path = "src"
-+  headers = [
-+    "webp/decode.h",
-+    "webp/demux.h",
-+    "webp/encode.h",
-+    "webp/mux.h",
-+    "webp/mux_types.h",
-+    "webp/types.h",
-+  ]
-+}
-+
- source_set("libwebp_webp") {
--  libs = [
--    "webp",
--    "webpdemux",
--    "webpmux",
-+  deps = [
-+    ":libwebp_shim",
-   ]
-+  public_configs = [ ":system_libwebp" ]
- }
- 
- group("libwebp") {
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index f3fe916eb09e..16eb1a67bd00 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,7 +1,7 @@
-AUX epiphany-3.14.0-unittest-2.patch 1725 BLAKE2B 1464841241c618137db834933094968d7769c513ecd8934f73e6522744175efb5d41e05be11ed629cf3072135de39a2c6f05c083d48ea219bc29952ac000487e SHA512 5ec81de76fb8bb1574e954d5bdffd81114c022d558573f049c415f037855b65c03e727fd3fa2ce557c12f3a17921dc655c60ef4e1ad06f3bc9a6a42e58ddde70
-AUX epiphany-3.16.0-unittest-1.patch 972 BLAKE2B bf27a8b68a9526ed3b481bae00c614dc57db57c2b6909a6e0d1936c86a395cf577cba8db8bc272a3485527118e69b0f8109ad1427f957b5b2eeff4437c954c5a SHA512 ec59eb312e7826306af76fc587fb9435c6ac2da96cd574df381829bda2e2f987a47afef9bdff0e8dc162fe63f43d1a744edc84b84ae387edd1279d77ebdfdc86
-DIST epiphany-3.24.5.tar.xz 3216736 BLAKE2B 8a4dd668606521d1b0144afc9ace8607f52eac457f0059e6087216323ec1132dbe1c755e40dfe9993bf685e5444db1268ada1cdf55edc04c51058fdd256c6047 SHA512 a8f203d182b8c87878a3272f8b4f642b0cf4128476e0727208135cfdffeb293425cf662c58820f0d3aed2e1b20fe6dc4cf5cbb8277a398c6f533a0bea34f40f2
 DIST epiphany-3.26.7.tar.xz 4429308 BLAKE2B cdd8cf084631891e97585307c90bd67f45e71deb6564f54711deb8dfd39c09007732efeb22ad5be45c1b0af6af7be30cf13a9d90aa1e9506a2e997f6f3f8d854 SHA512 686c8825d476a4c6675dadd7a68bf72727714bc6fe01b4dbf67d39b2dc7e3f21d4f630417865800664a716d6316df8a97fde5201ec72c90f448fd6f0af4b49a0
-EBUILD epiphany-3.24.5.ebuild 1949 BLAKE2B f17b4603d8f1dbfc26cde3be0c333fa50d3147b61255d1d1618180d5578330a388ed866439e4506c83fb2b06dbc37cf767cd4e25cf2b2a971c222ab0613afecb SHA512 49dabbd617bf90f4af2dbb45d08d6c9a0854555a58a933872b15dca299e7bce9e9084fe07a51571be96d3310651475b0e95e4babf4cf0f7456aea0313fa42f3a
+DIST epiphany-3.30.0.tar.xz 4528508 BLAKE2B 75d605a1117131bebaf0e0a7013ae4e9599b7058e26f4acf84140a6e345255cccac910cc9d5a2f90be0835f7dbaa6c77d16e127dfb5b1ae139ef179a20795444 SHA512 80ba03c67bd467e31e572afd4e8632232bc002c63e584e87bc6c3b74d23cd470f14e696080fd952a8617c6c07202eafff01bc97f72d9a06f0121d75565e667f3
+DIST epiphany-3.30.1.tar.xz 4528876 BLAKE2B 1dbb630128a9af975939d386b3113a41ef92ce1bb756a5407a216fa8f25f1dfcd051a11c54a034aeafd8ca5aa5ada7da83f3ecf825370801b04b10b7ef794c80 SHA512 37d6814d9dfb1f70e6cfd3395179b9e213eb79773c1fed238999d5c6ae34c0b93b6f93dff695eb959cb46e89a2cd6b705c1a294d1424c82137ba26d0b7a37503
 EBUILD epiphany-3.26.7.ebuild 1926 BLAKE2B 213faa2400f2c1eff31f7d37d37230ee8022642b60d19eea97cd4d037a72d296902e18b2358878aa4722ad5b6255de06fcaeb70a7c3a190e38e1cce5f8463c57 SHA512 c3c5887d9a71d936214cf20e921207d161a2f43b79e041d9639979afc64529a9654c40c2b5c08d5031a54d572170d9446284a6ea1c9c8cd43b6ea265f3a346f9
+EBUILD epiphany-3.30.0.ebuild 1561 BLAKE2B 476b4e0489917a78702f8548f3e9704de7259edfe244d6fef532c409961a5503b963ebc2b8e84c0b5e2e1530fba876f60868018bce597c35409e9bc0f7dde31b SHA512 8895ff2cf36458620e308d8cda505a9243acaab2c477f1a2967c04690e01ab51d06f21b125689a3ceed47ffedde5624c0a2fc81c002f01ec6686a9f34173119f
+EBUILD epiphany-3.30.1.ebuild 1561 BLAKE2B 476b4e0489917a78702f8548f3e9704de7259edfe244d6fef532c409961a5503b963ebc2b8e84c0b5e2e1530fba876f60868018bce597c35409e9bc0f7dde31b SHA512 8895ff2cf36458620e308d8cda505a9243acaab2c477f1a2967c04690e01ab51d06f21b125689a3ceed47ffedde5624c0a2fc81c002f01ec6686a9f34173119f
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/www-client/epiphany/epiphany-3.24.5.ebuild b/www-client/epiphany/epiphany-3.24.5.ebuild
deleted file mode 100644
index 873a5036a2b4..000000000000
--- a/www-client/epiphany/epiphany-3.24.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
-GNOME2_LA_PUNT="yes"
-
-inherit flag-o-matic gnome2 virtualx
-
-DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="https://wiki.gnome.org/Apps/Web"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="test"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.46.0:2[dbus]
-	>=x11-libs/gtk+-3.22.13:3
-	>=net-libs/webkit-gtk-2.15.90:4=
-	>=x11-libs/cairo-1.2
-	>=app-crypt/gcr-3.5.5:=[gtk]
-	>=x11-libs/gdk-pixbuf-2.36.5:2
-	>=gnome-base/gnome-desktop-2.91.2:3=
-	dev-libs/icu:=
-	>=x11-libs/libnotify-0.5.1:=
-	>=app-crypt/libsecret-0.14
-	>=net-libs/libsoup-2.48:2.4
-	>=dev-libs/libxml2-2.6.12:2
-	>=dev-libs/libxslt-1.1.7
-	dev-db/sqlite:3
-	>=app-text/iso-codes-0.35
-	>=gnome-base/gsettings-desktop-schemas-0.0.1
-"
-# epiphany-extensions support was removed in 3.7; let's not pretend it still works
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/adwaita-icon-theme
-	!www-client/epiphany-extensions
-"
-# paxctl needed for bug #407085
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	sys-apps/paxctl
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# https://bugzilla.gnome.org/show_bug.cgi?id=751591
-	"${FILESDIR}"/${PN}-3.16.0-unittest-1.patch
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=751593
-	"${FILESDIR}"/${PN}-3.14.0-unittest-2.patch
-)
-
-src_configure() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=778495
-	append-cflags -std=gnu11
-
-	# httpseverywhere is experimental in 3.24; gnome bug #775575
-	# firefox sync storage is not quite ready in 3.24; deps on hogweed/nettle
-	gnome2_src_configure \
-		--enable-shared \
-		--disable-static \
-		--with-distributor-name=Gentoo \
-		--without-libhttpseverywhere \
-		--disable-firefox-sync \
-		$(use_enable test tests)
-}
-
-src_test() {
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-	GSETTINGS_SCHEMA_DIR="${S}/data" virtx emake check
-}
diff --git a/www-client/epiphany/epiphany-3.30.0.ebuild b/www-client/epiphany/epiphany-3.30.0.ebuild
new file mode 100644
index 000000000000..b961e6b11920
--- /dev/null
+++ b/www-client/epiphany/epiphany-3.30.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome.org gnome2-utils meson xdg virtualx
+
+DESCRIPTION="GNOME webbrowser based on Webkit"
+HOMEPAGE="https://wiki.gnome.org/Apps/Web"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="test"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.52.0:2
+	>=x11-libs/gtk+-3.22.13:3
+	>=dev-libs/nettle-3.2:=
+	>=net-libs/webkit-gtk-2.21.92:4=
+	>=x11-libs/cairo-1.2
+	>=dev-libs/libdazzle-3.28.0
+	>=app-crypt/gcr-3.5.5:=[gtk]
+	>=x11-libs/gdk-pixbuf-2.36.5:2
+	dev-libs/icu:=
+	>=app-text/iso-codes-0.35
+	>=dev-libs/json-glib-1.2.4
+	>=x11-libs/libnotify-0.5.1
+	>=app-crypt/libsecret-0.14
+	>=net-libs/libsoup-2.48:2.4
+	>=dev-libs/libxml2-2.6.12:2
+	>=dev-libs/libxslt-1.1.7
+	dev-db/sqlite:3
+	dev-libs/gmp:0=
+	>=gnome-base/gsettings-desktop-schemas-0.0.1
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/adwaita-icon-theme
+"
+# paxctl needed for bug #407085
+# appstream-glib needed for appdata.xml gettext translation
+DEPEND="${COMMON_DEPEND}
+	dev-libs/appstream-glib
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	sys-apps/paxctl
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Ddeveloper_mode=false
+		-Ddistributor_name=Gentoo
+		-Dtech_preview=false
+		$(meson_use test unit_tests)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/www-client/epiphany/epiphany-3.30.1.ebuild b/www-client/epiphany/epiphany-3.30.1.ebuild
new file mode 100644
index 000000000000..b961e6b11920
--- /dev/null
+++ b/www-client/epiphany/epiphany-3.30.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 gnome.org gnome2-utils meson xdg virtualx
+
+DESCRIPTION="GNOME webbrowser based on Webkit"
+HOMEPAGE="https://wiki.gnome.org/Apps/Web"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="test"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.52.0:2
+	>=x11-libs/gtk+-3.22.13:3
+	>=dev-libs/nettle-3.2:=
+	>=net-libs/webkit-gtk-2.21.92:4=
+	>=x11-libs/cairo-1.2
+	>=dev-libs/libdazzle-3.28.0
+	>=app-crypt/gcr-3.5.5:=[gtk]
+	>=x11-libs/gdk-pixbuf-2.36.5:2
+	dev-libs/icu:=
+	>=app-text/iso-codes-0.35
+	>=dev-libs/json-glib-1.2.4
+	>=x11-libs/libnotify-0.5.1
+	>=app-crypt/libsecret-0.14
+	>=net-libs/libsoup-2.48:2.4
+	>=dev-libs/libxml2-2.6.12:2
+	>=dev-libs/libxslt-1.1.7
+	dev-db/sqlite:3
+	dev-libs/gmp:0=
+	>=gnome-base/gsettings-desktop-schemas-0.0.1
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/adwaita-icon-theme
+"
+# paxctl needed for bug #407085
+# appstream-glib needed for appdata.xml gettext translation
+DEPEND="${COMMON_DEPEND}
+	dev-libs/appstream-glib
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	sys-apps/paxctl
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Ddeveloper_mode=false
+		-Ddistributor_name=Gentoo
+		-Dtech_preview=false
+		$(meson_use test unit_tests)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/www-client/epiphany/files/epiphany-3.14.0-unittest-2.patch b/www-client/epiphany/files/epiphany-3.14.0-unittest-2.patch
deleted file mode 100644
index 36dcb30ce3bd..000000000000
--- a/www-client/epiphany/files/epiphany-3.14.0-unittest-2.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 3d2ca8dfb33f9dd658293d14d6b75983d1d2f57d Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sun, 19 Oct 2014 23:06:29 +0200
-Subject: [PATCH 3/3] Disable broken tests
-
-Not the first time these are failing even though issue was reported
-upstream.
----
- tests/ephy-file-helpers-test.c | 4 ++--
- tests/ephy-migration-test.c    | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/tests/ephy-file-helpers-test.c b/tests/ephy-file-helpers-test.c
-index bdf7455..718fa29 100644
---- a/tests/ephy-file-helpers-test.c
-+++ b/tests/ephy-file-helpers-test.c
-@@ -341,8 +341,8 @@ main (int argc, char *argv[])
-   g_test_add_func ("/lib/ephy-file-helpers/get_downloads_dir",
-                    test_ephy_file_get_downloads_dir);
- 
--  g_test_add_func ("/lib/ephy-file-helpers/create_delete_dir",
--                   test_ephy_file_create_delete_dir);
-+  /*g_test_add_func ("/lib/ephy-file-helpers/create_delete_dir",
-+                   test_ephy_file_create_delete_dir);*/
- 
-   g_test_add_func ("/lib/ephy-file-helpers/desktop_dir",
-                    test_ephy_file_desktop_dir);
-diff --git a/tests/ephy-migration-test.c b/tests/ephy-migration-test.c
-index fab9ee7..64cdd65 100644
---- a/tests/ephy-migration-test.c
-+++ b/tests/ephy-migration-test.c
-@@ -65,8 +65,8 @@ main (int argc, char *argv[])
- 
-   g_test_add_func ("/lib/ephy-profile-utils/do_migration_simple",
-                    test_do_migration_simple);
--  g_test_add_func ("/lib/ephy-profile-utils/do_migration_invalid",
--                   test_do_migration_invalid);
-+  /*g_test_add_func ("/lib/ephy-profile-utils/do_migration_invalid",
-+                   test_do_migration_invalid);*/
- 
-   return g_test_run ();
- }
--- 
-2.1.2
-
diff --git a/www-client/epiphany/files/epiphany-3.16.0-unittest-1.patch b/www-client/epiphany/files/epiphany-3.16.0-unittest-1.patch
deleted file mode 100644
index baa8a421da13..000000000000
--- a/www-client/epiphany/files/epiphany-3.16.0-unittest-1.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 7ed4a68e2106480f0984703f70b7c25734803161 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sun, 10 May 2015 17:35:57 +0200
-Subject: [PATCH 2/3] Gentoo tests run in ${PORTAGE_TMPDIR} which is not
- guaranteed to be /tmp
-
----
- tests/ephy-file-helpers-test.c | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/tests/ephy-file-helpers-test.c b/tests/ephy-file-helpers-test.c
-index 43d0009..0fcb585 100644
---- a/tests/ephy-file-helpers-test.c
-+++ b/tests/ephy-file-helpers-test.c
-@@ -89,12 +89,7 @@ test_ephy_file_helpers_init (void)
- 
-     /* Cleanup dir left behind. */
-     if (keep_dir) {
--      /* As a safety measure, only try recursive delete on paths
--       * prefixed with /tmp. */
--      if (g_str_has_prefix (tmp_dir, "/tmp"))
-         g_assert (ephy_file_delete_dir_recursively (tmp_dir, NULL));
--      else
--        g_warning ("INIT: dangerous path returned as tmp_dir: %s", tmp_dir);
-     }
- 
-     g_free (tmp_dir);
--- 
-2.3.6
-
diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index 443f3d5aa8b3..eb0f3ed2678d 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -87,181 +87,181 @@ DIST firefox-52.9.0esr-vi.xpi 450805 BLAKE2B 9dacebac235a738cf7f068e16335b8b15ca
 DIST firefox-52.9.0esr-xh.xpi 441173 BLAKE2B 3e1b907a7659c639d17d25a1825f472853242891d55f6a5ad93c1f5a12e12f05706173dc6ef5594f27e049d9b9a4c748d7371780843f1da204c5d93a39213197 SHA512 54ac64f0c119ab42d4f87dd2663ba7e14310c215a1ea76acd463b4c1a9073491f8df8c9b03d391ecc6f9ffbbdccc3756a7b13ed559336a6d1527fad3097ddb53
 DIST firefox-52.9.0esr-zh-CN.xpi 461679 BLAKE2B 745b2cfb86e93a379e13fa73b7e3721bae06694768316e31a2aed608e3050f585a9603375cd35b90affca11b3e5e44401b1e676f9c8050ade287ed0feb442a7a SHA512 ca62e0e2ab075086741159b185b5eba44c6bdfc29fd9ba1cf25808f127c1aed8875ea61c1c33e4f742fa26af4455a8873730f96ad9c7bec1f66aed0595f253f1
 DIST firefox-52.9.0esr-zh-TW.xpi 453068 BLAKE2B 84e08ea4fd119db1f1c6f84b212fbbb5d6999c5ac6010c0e7836d8734726d281107f3d91ba7bac1aeaf855dc36d3b018ae3913dccdbe2b11aad02a8d8aaa893c SHA512 a99042ef7d00820e341dfcf2c45a8b5bd77eaf2cc8ecf0ff5ee982b7bd9beac7cb4bf051c57ef3b7a5d9b67cd35858dca396d21e65718e248f3b1fdba5273999
-DIST firefox-60.2.1esr-ach.xpi 496841 BLAKE2B 1beafba6bc5877b2e44b3cbb2319f1e42d0070f6aaf57c95ba2df4c22ef0994e0a0530e40504f92e916eb54311d64d45fdb28f57fe2b12603c8da160e5b26650 SHA512 897c88cf347f3605bb1c65050fd32c7ae6c22559041c45c7dfee5bb7416b13f74d681c8a68d2a8f5945577a971a2d30e408f369e5d18ae900af1927cf596cb12
-DIST firefox-60.2.1esr-af.xpi 487309 BLAKE2B 40bc8e982f0680355813e40c9459e4bb4446720f234f2051d12bbcbb0c2317a6e8b72b7cafbff430f3ffe782b8d37a24d43d4010e727ecd9e85d6ea515d65d74 SHA512 a026dbb3f7c96f76d8cbefa17fa700794a93f5a2c52a92f52b391f6ef870e747164465251abbc858afd647654472dd0384f7d11ee069dfe37910ce528dbf8e2e
-DIST firefox-60.2.1esr-an.xpi 520500 BLAKE2B c47ea4c021bc2552fa235851b922e4e726bc8a4f05863c6cca90212da4e5d71c67c3de79559c7a8e76b2d49f434170da6bc31a0441960a9e8f71ce9a1d2cd7bf SHA512 a72eb01001c78d420bbef06a84cb75768ffb45d0d30bfd8e0410b59711fa1fbbb878677aeb9667f1221e889de53a5c9eeb90741308918cd6b4a7e9b50f4c5979
-DIST firefox-60.2.1esr-ar.xpi 547822 BLAKE2B 386e6c3c65aed613677ff13d231f26bd9e02316ee323fa2d18f8b8cec9fb99a5938637aa5eaa7e4c1847a682d46b84ff3ea09394c0886d060377d6169c4f2c44 SHA512 90357408a40980b9e90f05b708af08e2fdd1ca30a3bc07b17d8c34b6011677be39dee32921f93fe92c3c87e0c463e25cb9df65ac316f16a8662043521bb5272d
-DIST firefox-60.2.1esr-as.xpi 530721 BLAKE2B e534287257412ae9f2d409d214d269a46d1af8b3bcb9311b6e0b9a2a1a9baa40645ec73ea2d6b0dc75ac6a69c369b12642b0b6f268ee7e6cb6bfcefbd16d5286 SHA512 228f391cd3f8cac67d9db2baa3e89e9aab295cf5fbfc494deb1df803982e5c552d24ce23592ef5281e370b8bb9c925113017a73590c10f1643e343e425aa42cb
-DIST firefox-60.2.1esr-ast.xpi 508657 BLAKE2B cce3c0c358fc3518d98b68a4ad6ab647374c05d00f1e5440fc5ecdcc012cf0cc38b99f7e523035ce6dba5d8f3c9bd30e73522faff4d644a3120d8e169b78442e SHA512 0933a6f98524aec4feef86ebfab65987b7146c729ebfbdd15a555444255c7abdbcec2e00c4dd0703fe3817faad3dbc12ab08549682ec123c184fc9de4b23402d
-DIST firefox-60.2.1esr-az.xpi 524744 BLAKE2B d25d43455df37eaadc21878ffcfe118bb0c0125448a693f78a7d2f7f23a11634ffba6f9b09cda5bd5be78745cd53ad6b0d51747138408761a59395dc513e69ae SHA512 74502ce380c43e39be4fc1906b92badee1e4072ce43adb7fdba30b439474fb5f6af2f6653cc6328a5a7f4e7c2115e304d4e07ef39ea6f15f9afd3ab8c3c0d48e
-DIST firefox-60.2.1esr-bg.xpi 573850 BLAKE2B 700a0d443c27fb28c853ede1b5b3695491a01f11e465823aafcaf72a6a2834615b4591552f3dabeca958554f9cc4a720a9abfed490b4a74dcbfec5086f026a9c SHA512 713ab2367f96643d09184c90b96a546212481752c8eafd0b288bc179668954324cdcf0776e9d3260d2dcc51309c69ab427e81d628d292a90437c89daac96ce7b
-DIST firefox-60.2.1esr-bn-BD.xpi 590419 BLAKE2B 1fed2f29c8b2b5a6f891cfc3df57cb2b412efdacff80b72fb3317e9e05d03e90e2e6046234ee18982c19cc001ffd7d527eb992b30c27a65b159ebf8ac93f3972 SHA512 e0ce69f4e318e795ba8f7b1036956327bdee40c10b529c40814ae326b58a4b2df71baf22fdd8801c29b19a445c8f5eaa289470d10bd5434d25b5a8dfcdb929c4
-DIST firefox-60.2.1esr-bn-IN.xpi 570872 BLAKE2B ecf77b607abedcc02d3c1876ad59468f44a6f2425bd38c1334fc1a42e121a3e31488f73a0c7069cb515b8043f4857690e20e2354f675332a71cc35306d353a87 SHA512 823ec55699c0256f4f4acbe51ccf2c6c323450d162b27b47d039bbf197ecb46a4d83f1254962acd68e0ba6e4c9642cb656a3fdb6dc685461e0d3ecc5d9fc3722
-DIST firefox-60.2.1esr-br.xpi 512028 BLAKE2B 51c049920d4affd5a06dc9ea4f83a4fdcc7cb94811d0eed66d8b910dcd59140db5264c3516353b6bfb6079c89a23e98c4a76dd6ebc586d6002cbe72a89f34910 SHA512 554f2164265786ea7574c5bbe25f8b463cdedd94f239571f3c93b15675e8d29e2c614b308c7869b3b74dc0b475dfd6c9d4b87a00d1320557e46cfc8fd580e622
-DIST firefox-60.2.1esr-bs.xpi 514709 BLAKE2B ade6a79e4caa43f732bcd5c20bf9448cfe937d5ebaf01d9505585c806c2f674b7a97dcd1f5795098a27d5b81b5fd632675f64fe68f959a1418c9831a08d12ab8 SHA512 d62d71219cf7c88fed885eef8985066ed9cd8dbcb7143780d951f3f092748ace780c7917367f1d1f456b4596c6068fa3bc33119b228a743f1ab8444a4d74c3b3
-DIST firefox-60.2.1esr-ca.xpi 525260 BLAKE2B 63c5e5f32266455e2a9c540dccece04bbe816bbd15f1ac7ffea0fb55645550a24aef89c798e7abb081bf220c1ca2281c036c7604c92fcc64d21ff823d6b63c5d SHA512 c4db680536dad3060a495fa893b8e6cfe37e1fdfc63cd2f5a797cd506ef1aa3a85325440623ff59630b98546d9ef0d7444902972837283cdf8fe7b9441aabe90
-DIST firefox-60.2.1esr-cs.xpi 531795 BLAKE2B a72c33d8068c92b246e64e7380ba6d0a6d6dc8b2806af910fe2077e0e8a04f1a72fce16743a7b483ca44183464b7300956109f1d28fde47fd89fd1cc87dd2ffe SHA512 43162e481e0c688c73bb1c6eea9b2c155c3de1dc9bf2cf6e213e11fee5d25b11fe863a640a1e71bb799d9be60dc4110533456141b1b36be14c5d9740216495a0
-DIST firefox-60.2.1esr-cy.xpi 516631 BLAKE2B 70a67b1e38aa878f30bbec329c9befec544c37cf16e43b11b5b6ed5fad20f5ba0553d2fc279599d4dc363c1b3274154ff28cc54760ffd9026afab3c748c8d7eb SHA512 bf66b62269d5f8048d3778ef0cfea7011ec170e517c21eb7af96e8c36babe3b411108787bb6f65a6edb958bbf83b5046a49a910b55952d7a5eb2074420493042
-DIST firefox-60.2.1esr-da.xpi 510750 BLAKE2B dd86a1084236da7b421154e321de6595e611b9074d2a0c3c467fcbf831dd591d5a5049e6b7b649dee8c2bbd44537d301cf9b9a0634c55f8dfad74482c53a00af SHA512 2196fd2be67c1e94f0084912d804a049ac4334639479cfb75f58b439a53018350bb360b809280511a01bc9d24b9807650607ef28b9dca413933bac145119831b
-DIST firefox-60.2.1esr-de.xpi 526520 BLAKE2B 7f905eb624fbcf97f7fa5e043312b6f9a82bb2ef2b100d7eef8b69afe0e81763977ea1c1c7381a5220222ced8270a9c05d0314889040b8395c7056ae338a731c SHA512 b88b3903270221313c6b46cff9fd9f371d7b1e72d4527dcc5980592ebdf5355f6cfa8a04654f2ab780f4332a6a0185e33ea641e7ea5fb709b48b02e350eb3196
-DIST firefox-60.2.1esr-el.xpi 593693 BLAKE2B 08c8f66fedbf18d25599b25d979cb851990d719356411c5f46892b6786c04c1f3b7e4bfba0ea842e02ce130490fa741d6682b5f6960adfa25acb08323c98c168 SHA512 cc2febcf1b132ede062fd1f713fa0273b78d8cbf30ff5660562068e9d29c50aeb4d6fb2e525ef46e1cb695dc530f92ad15e7c84f48bfa863a55a93d674aa852b
-DIST firefox-60.2.1esr-en-GB.xpi 491693 BLAKE2B cd9a5a8d72f975ed59736411600433c8ae3808e3f65f470e05c0f6d45199f969ad3167d9ac44799da7d23acb5a1d84d31fdb9dd04dfe2f3e75a1e16d83ffd315 SHA512 8f3596ca7752c26ad9343688da04079d6f4b7fcb27dca4e278f4f914baa5c46d9e83a28b0725adf21af342803e8a6bb56899f4dfc52ed323cd915fe303328bc3
-DIST firefox-60.2.1esr-en-ZA.xpi 474678 BLAKE2B 85ab17f191e2995ed8eac45d70d4db50e298b8696039fb2edd7fa75759d9898d71446bdc9afe744e502858c9b1057f3615561bae78c6c95e50155c5047cf8bc1 SHA512 66c38a8bbf4be07fc701ad3386185063769611dce0e87c74ddb69e2ac9a342d326709f705e8d09d4afe2c0032ad404ca6befe2a8591e36ef3f4a8080f5956003
-DIST firefox-60.2.1esr-eo.xpi 511260 BLAKE2B 0a7aac7d52c142ce7267a2adeeee7c0facf18d6069247d1ae37fc363847a957bb6d5c950629cd6c0af7d46d52c70d7b85f4cc5d18b07b73194ee5489a6dc4fc4 SHA512 da64f335b6ef373532e9026d63a70c01e3240d8fb5a2f6a3dc78e234572a4bec1aacd4f8ca75b31d8c9e334f82d31e8cb4c0f9108f8c0429cebdee48da71576a
-DIST firefox-60.2.1esr-es-AR.xpi 524652 BLAKE2B a8cf3c00743d49872f9e77fa8c3a825d7d7c73fb0c85ec9efe451312cd529efe713ce7eabbd2cbdf59d8065c513f8b7c5e4119f6ece7f93a27fc842a2db7f9ab SHA512 e6ab5074fa89c036b7ec9bf8072f7baccf9d1322f41351be7d991afcdb96e587ea9c0c844128534f46f38e4f06c4f88fe0c1d937a10863709ea102b941c9b81b
-DIST firefox-60.2.1esr-es-CL.xpi 527326 BLAKE2B f9e47bc109683b42962f8f4ef3ac3a450ff7ce6c791a817eae82c0fd26ea48b2ca7761595548d51a03d3c0458967e59dd95d9b9d7fc496f2799ff5d3e250cbdd SHA512 6afafca49ec98fd85a7bc08596c1fd905cb39449c89bd343283250f9547b18f8cbfb213f2e9dd23fcdfbdc413716572abbdeb4ca5c4621196e3127eb1eec79dd
-DIST firefox-60.2.1esr-es-ES.xpi 459964 BLAKE2B b2b751574724b07776b29f7a27a6565077620d28bf06b89bf9d9433097a6ba307c2f9d993f4292025d755aed6662b563712d4a0912ba4f77db91c2b2b3f83871 SHA512 fdf8430a1acc8cdfe4c6d6d3f5d2697a69fd599dfbf207f1802128b6333e533dc1ec4e43505835d150d8d23d4ce6528c732ef98ca0e1d022b4f508e7d1fcfc96
-DIST firefox-60.2.1esr-es-MX.xpi 528661 BLAKE2B 5b522485b324ca7c74258a3f4fa06df20badaa022892ac9e5aa6a4920ca2061ac995642f4b84001c09391e28ef065bf1d61b30cd91d0135226dc83e73261d09f SHA512 8e26ee724c87e2e5f385a53f4e04fb6d04f4bb223cca427c2a36df06af379d020d6caea937f9ef4a1353e4157f98c92b8b6eb80f02c7b486c56bae0563f13550
-DIST firefox-60.2.1esr-et.xpi 504970 BLAKE2B e4b385ecaefa9f97bc2b39b2fd7b2612c9177690b157633489897655aa5a799e9b4f7b4f8d2939a4ed9bb73895f2aa65c0959f65d5cfdc7f0a90ee8df5787046 SHA512 b13c9cb89f9dc316788ada4d1b4fa6ff9290993d26436b73bf7cc9c3913aae018918d73b5cf3a14f28edd5e8f3fb602188c7c8b3ec9e17f3dea5928d4e6e7986
-DIST firefox-60.2.1esr-eu.xpi 511713 BLAKE2B e6614ea19a7605277016865bbc4122caa0440477e44e023d9d5fc2b7b94880285b5aca7697c924a78a3c55014818c84e9c169842213e88b2cf33e5a0acd07525 SHA512 0c018b3c36910277677125281194c7deeb2df59f2016bb37f9a051fff7ead6a92bda579e3b6dd5b416ad239462b9c5cfd58a53b02d68f00c10c31346bc44fcbc
-DIST firefox-60.2.1esr-fa.xpi 566263 BLAKE2B 323e22fb85a9cf19d1b1995d331b21d370a4c2ba303f43f9ec2ced0662d1241d7e81f8c3a3e03836795214c746a87426a209e35b9a750264a680f068a4f3da34 SHA512 1c3e96a63af1aabf425df8dc8666e89906611a29829f2f2a73beec68db2d72e7b83009b4686fdbc6926ad16faa527e5990ac4b31c2e93cec2f53c3396101b3d1
-DIST firefox-60.2.1esr-fi.xpi 506180 BLAKE2B 355a70fefb3498bc6d6fc55324144d6ea07bc7ba41da967bf5e43614e3a5cea1e503e31ca76ec61582bdd284fe7bdabe9c44efa119f73c38c30f23294f1c9ede SHA512 7c9646231ddcd7ed15281d8e3f226924cc3007f4e15e2b3fe94ad1a397fce6a0af8a80809f894ad6aea9a9b9f0d969c81302d6d6d22551998d5a7099a92320a5
-DIST firefox-60.2.1esr-fr.xpi 536070 BLAKE2B 26a32910d0721a75b6efdebf2cffeb90788530164d69642683101962f62245407a0b6d7fe2a85cf009cddf868a000ee4c6bcc0fd3a27c5eea55c5ac4f737ee20 SHA512 16d4d083d757fbf7e157240216710e5a0ae68756dd0debe24c17b4b58216aee776919a398cd1694a41fcefe9b62e056ed7a30d3f6252ccbda4ae14daf3610a63
-DIST firefox-60.2.1esr-fy-NL.xpi 524520 BLAKE2B a37ae4b18ee5ca9bb5633fb0a1a0e4912340377f1e89517ca5afbbe6d3efadc6b0bb2ccddb273dfd9326d1a07d9d8c613f6e8ce0df852f303d00400195e0b120 SHA512 8541b14adc3f0137315bb1f8e01f8d16774ea733b9ddcacab30c4ac5d2ec638e01bb8a78c652ec487d137ef2512d17ed783bd6ac77f61cf9aee1729a5969a556
-DIST firefox-60.2.1esr-ga-IE.xpi 526986 BLAKE2B 891216da282cc7e388346b233f239988ac14a862203f23c94c97373e06fa84f4248c0d8d5cb2ac4e95f2f70b947adcde4f5ca2b139119b6677205241a5f4d468 SHA512 80bb5da8a33050e2576b15ae89cb1a412a9bda63d1ccd0744dfa564540c9c74eddebcf4981a159fdff30c1a3f5b5896f3a155f2aa2f74ccdce22974fcddafb82
-DIST firefox-60.2.1esr-gd.xpi 520866 BLAKE2B 8e631dbb5ab964f9e24ed663150dae899f5bd63d914439b36630f3dd4b8ffaa68f4a76eabfc56d99edf4df12f8d5823a04baca5ec6d48997f227dde9deebae9b SHA512 63081b97e3fd156dc75eeab35fbdd2adaf8a56f326fb930b96364e9087f184e866c43cb4cf9605e24b80de1a393684b1b88edd81bfc1d5f3d463d147fd75d664
-DIST firefox-60.2.1esr-gl.xpi 497372 BLAKE2B 5db157c69413cef5f510c2b8a5f0170e6152172e14198a0deb92eac67ce97e05362b0850d0bf691b20a8d8617cf2b894c9801478bb6f6bdcb756eefc55dcebf8 SHA512 9c721d8fc7815dabfd7f753e4c11b877bb9d7a594c786620b0ef91f362bc9d1ceb357c8be8c1e1767e6499d52511af0450fb2de2d901bab43ca2c2a517f7db32
-DIST firefox-60.2.1esr-gu-IN.xpi 590264 BLAKE2B e70c3d860e860266ad590826a1332ddd198892e4ffa11a45ec42a56c3581b97c67b85c21734b91699d991ef1c66b90d8aa457b9540279958b667113d3d2243bf SHA512 2350735c90709df3e9faad4245709ad52d9794cbdbebdecfb40c70e778d8d1f3e9735b515861856df58e3e2c787cefe7d9927fc51d44ac4732740fc9394bea09
-DIST firefox-60.2.1esr-he.xpi 535983 BLAKE2B 5193f243ba051bde88f274d801fbfd6c177d630fdd13b71bf28e7a30ca53500f903a989c9fe5e3b7a5dda48f38d74210a7e0f1e0a8653a84cea8e89a854c0d91 SHA512 a5fcf5b887e307d16b381b8c9ed535c921fc312854924b05a985510949a358bfa069108541cdd0a1d72e6e0693a610de69dd39e08d945c138a4a66ddae030bdb
-DIST firefox-60.2.1esr-hi-IN.xpi 590854 BLAKE2B bccc9162ebb1b598d664d92dbe1556dce2456fbc4ee0c93ac4142d45bb494db317fc5ad1091cee31253404785831b21ca1b420738acfad48d70e1ca055a86c04 SHA512 7f7768907fc8f7d430ddc745f487c16867dda3260ff93f63043a90d116b9d2b8c80ff7fbea5eebcb174ff4ac47ba9cb1df579a124579cc201082630eb216265d
-DIST firefox-60.2.1esr-hr.xpi 515957 BLAKE2B dbd9710e96b52366a4bd46f31c5407d4eba07e2ba595af1ab1254f28d48d5cfb6a56b1322352e35b46a80045f33ac72a735e727129d0bef950fba027295265f3 SHA512 fead336c0a605c9b926ab0c8335fcb8a4c4df59ffd375e6798805bd43bd10807543773fcaa31b5687bd42677d063711fa446133f43347f3a69c63386345d4f8a
-DIST firefox-60.2.1esr-hsb.xpi 537068 BLAKE2B b548bb08f0e5a3a3f37e51ae41d4d5f220902d9feea3ee31417c7f44af8742e7e1d475b4d965921d9953120e6ccb2199de5cf88795770aea9485e794ce8a6625 SHA512 39122073ea2df43646e90cb503c2db7b16e21f709552fcad2db9ad2cc8ec52b37bde3eb0897fa0edcf0452675e37b790572dff32369b9e1cc98c952b4ae299f2
-DIST firefox-60.2.1esr-hu.xpi 538416 BLAKE2B b2bc693907c7ce871d9ba248d57d292329cc274117da43aea014c15143fdcaded23f006414f1998a0b65e8a7465cc3b84e802ef481104c29ba016c578c56834f SHA512 ae93e50efa9cb95a9920a1bf254b151cbd43188c780705a21f67d384f7a7f2a1c02ee0fb63c49cd178c6b8fb5d0ba2e743374466a5080f087fff4f7759af1fc9
-DIST firefox-60.2.1esr-hy-AM.xpi 569422 BLAKE2B 8562d5e4910826b6702a6e18eb03e0f6b297ee622413ac513b5d507ba75e1d1592a9a96479cbb312df5c59e7596549bff3b5d1d9205c9ffcad9141c7bc286109 SHA512 dfd0bd88dbe993a4b2083880bd722b0c26e88283b110a35e9bf1f69f05e516c584338db5a7585bf6aeae6a546eb337adb7c79380f41bea3f58fcab79d5411285
-DIST firefox-60.2.1esr-id.xpi 502222 BLAKE2B add6228c2e78c3f791b39c9d96bdbed449ea6a4b35d81cfb3931030b6015f14bd7656ef7a1b62eac90779733c184020d0c51255c1acd730754fb04aae398e305 SHA512 4e4bebcccbba023f6e0326c6115de01eb96196c155991944ccedecf3d1f95bf687d19b67097a6e7f6fa160d5132ea1b632db895ef8c59fb0f59e2c6e96b84aa3
-DIST firefox-60.2.1esr-is.xpi 513264 BLAKE2B 998fcf37b5feefec731109ab3a9a72675ad235611a8e4b32a83508a219a0b9435d542da1f1a77d02d711d2c31bec68045aee4de91c9b3c798c15963c6bbfd301 SHA512 3f8a220a4db3feaca7d16e6ab488edb4f9addf8e2824cfe99f321bbd743fa269ee15ae43843c3b9c8a11e88f01595af3b66bda49fb608efd575f41f17d623cf5
-DIST firefox-60.2.1esr-it.xpi 399099 BLAKE2B 8ac0493880ba91eba2cdb254459e61c87c78e924191b3812caa2a08816274c200e214a201fdc4649167c32286850caaac69dfdddd7b5d2c1553a8b398f621a64 SHA512 1b8fa8c1359b71a36c5e2f34c8c376cff01eadcf13db39449a3462f2a68ff6c0f0ed96e4e94509f4c45f81e8913e8bd0da3bf6a355ad018ebce417eb72adbe29
-DIST firefox-60.2.1esr-ja.xpi 572012 BLAKE2B bed397a84b29d4f18c4a4070ed62639cba44cb2195e40657b19d91f105e8e8cc5c5cd32a10961a34b73bd5432ec213098f289f5bf9da7839a87e1cc068a8b26f SHA512 814c7149f21e9ce570206691ea7b9079963a9107dcf994dfe385c4cbba5ab8c55aa81dd796f6c8db4cf4232aeb122a633790340dc76a936a200952ac8e31789a
-DIST firefox-60.2.1esr-kk.xpi 582980 BLAKE2B ceb3c59528cd199d09e3bf69f483b133c9fb44b7c0c7e2666f183b686343c8f10e5b74c2cf6ed6a8175427f8cf13ea5fecf07f2feff434957592b67b3241c888 SHA512 29551f9649cc70a1f8952a74c85cb2195967190580646f2fc4120418f925541cad84b11b3b4a18d4d1b60ad3f4ad3f99929014d365681414a8c731914f752259
-DIST firefox-60.2.1esr-km.xpi 583107 BLAKE2B ab4e9bd2479f12f8db01e338b3b84b8cbe1446143f0c6720b6ada1c66ff7f6126881a3815647ee1faa18b05d816dbf06b538b3867edbd47849fd24e9fbba95b4 SHA512 4d951d3db8ca2ed74ec9bb83cc0a350727cb71ffb165fa72b2cc9c7688e3889e7af019f8eeb46910f13e14fe8edc219f40c5c13acd50da996ee782b791ab5d25
-DIST firefox-60.2.1esr-kn.xpi 585866 BLAKE2B 7db228c0d8f7e24d829d183be1ce8b1084b6c2de76d202ced4898f06878095329f28f20d52d40dfe4eaa8f73cd798ef04296fd426a42809c1831fa4d0eea9c69 SHA512 2a4668ef159b51f7a9e0b6731a202dba39040403e70499d8c2963436eb83a6cfd7dd8f7dbbc067e584954d51be13bb1c61515f1e3a050697788dac7deb95bb9d
-DIST firefox-60.2.1esr-ko.xpi 547820 BLAKE2B 6ecaae033c6276592fcf31f32c16ce1ffbf751594c4a2fd5e4e91de33b25c1038d9b3c3a12a538c9c6f820341d7f766a57ead19ff872ba337643445bbb3aa9a8 SHA512 739497a39e2da6e3b6fee9140d164e3540fbe29013bb94e31b874c3b291a0e8ed8ee1f63da86e5e68ef1961ef4aecdef7349fa75a9a3af591b1cc20004d01af5
-DIST firefox-60.2.1esr-lt.xpi 536465 BLAKE2B 175f1c4ebdec885e0e9464d078744e6eab918c0fa6e32925a0195b2f402d88cc318df2f2b9888a5ad4d2ac97f9266b0d4541c16cf31eb775b2bc2ed8093f54bd SHA512 350b3386063a529bd49030d0cde5be13c3b6482112e42400f177e31747c2a19edd4c4bb33d26875c7895e4dfe32aa773d4f02f3cdbea64c4bb6be64418ffa7aa
-DIST firefox-60.2.1esr-lv.xpi 526414 BLAKE2B 6e78687327d8fba93828599169d539de8f4f16826a1fb906a9788537e4b3c31aef3a87aa53166512ac637e677059b30885eab223fdd3de81bf3cd4a7192a91f7 SHA512 99ac1f9680bb57166b2cafa973748a2b1eea2572b2abd44fe80da475e167a42fff6f78b0df3d30e657642c7c9f5e8a878835491ff96d30b2b7eca2d7b4353cc5
-DIST firefox-60.2.1esr-mai.xpi 549254 BLAKE2B 1245f6d28d3a16c6a2ed3cbd3104eb19674035bfde76c8a2457219c3742cedf5d1cde0f67902511776a640ba6c8a26593529c10e1813a4c99f60bd44fa9c2f04 SHA512 cc31855cf4a49972bba6a807cb64f084eb4093d156b529fe8619903577ade6e37fb114e99563a5901e279cb7958085eb3fa3e97dc16e3abb01fd1f67e1b8e1b5
-DIST firefox-60.2.1esr-mk.xpi 513807 BLAKE2B 7abb877766a81b348533cb47a035213efd12f22fd6c386d7a459367431b189726e9d2aaa7890618a81279a172cb111d11bb9642363536929e7e417c147bede2a SHA512 bbfd9ed4d3c1e94b56610bdfa7280c203690ba91b6976e2ba948a0e6375c80886a86233c7140267e9043179ad876d703ba178270843d099923bb4aba599454c1
-DIST firefox-60.2.1esr-ml.xpi 598973 BLAKE2B 34679739f35860298f185a8779dff6c1be932ad1523364719d5ac493476565c9f9c3d8c7838f2a36200e14cd6f299abaf30439034869c1be70642e489d087e1f SHA512 be33c3b405862f4bc2a44cb7cb49f6cd273ee4b6310af9f63668db8f19204cacb1c3f2298e042d0d6b6bcf11bd590054c1982a98777fa94f8cea80aed327833e
-DIST firefox-60.2.1esr-mr.xpi 579110 BLAKE2B ac6310cf6101e99699fdcd33d95e87e154a5eec0d350c0348773602bd2be36327630191f6b6665cb220f25a9fd061fd8c92e36e124b8fc8f5ec918a1b2ec6eb2 SHA512 42e515596edfde99e3804cbbba7b4e33beaa055f58e0682f7f9ab8f3e95845f5dbecf3abef3613bdf6a7f37cf16c79166b123cbb5027b621e1921148891de84f
-DIST firefox-60.2.1esr-ms.xpi 509555 BLAKE2B 5deedebc4bf81af55d24e4b1ee5289c9b93ffc5470f76ea216a35b8eb415bdb6ff8234073012c09b6827353550be12dfe7b1331f97b4fcf513a6d549f546c014 SHA512 4c12378825fdbaed2c17228ff12a5669abd913cb9c56a9b17bb4cc4510529a56140058d14c22b7804570a80b21affa5930fb71d8110f45beb6b21062af4a8aeb
-DIST firefox-60.2.1esr-nb-NO.xpi 509881 BLAKE2B 8c0b393a3dc584b4049d2b09305d0f5f66178f3b87c59d852a0025cad58470f32f43ce404de515d141a91b4cbfba175d8fe1d369b087df4f9c0ad12ff755d3f2 SHA512 adadae5b1754757a0461ce1ba107ba5ba23f3f867b68d0361e2d6a5051729b06befdcad6fd8b3b63e13b9a4aa6871a0f26f3216e44d564fc809c22ff2672f7a7
-DIST firefox-60.2.1esr-nl.xpi 517459 BLAKE2B 73f77da10b4359f9939e49167e0c0edb1f2355ca8d03f8daf256102f9fe5e2a21b7cd782e29ef64c81cf0a478a5e8623d0306936ad72534bc997a9215dd4eb3e SHA512 de739eb10b35ea1ee9f058aa7660c3e64032194fc73b5234bf578ea961c29ed7a4600f1df467e5a356f1b3dae6f1223763ae00b0dc8d8669756a369736d0559b
-DIST firefox-60.2.1esr-nn-NO.xpi 511436 BLAKE2B 6e941052e77b1c8ba4180a0fad7875dab66ee3fead9b69bf51c485b0c5be2e8d8cf227f0452776d369ced1d4b8ff4e4ff02b7591e996325b71545d77ec364a7d SHA512 fe80c4cbcd5b05ce331f33c898d9482b7071c33aced0df03b9c195c375bea353877317d228acde3874c911c5ef6c946b8ddad0c113c9f0b7f8936ea5f727a174
-DIST firefox-60.2.1esr-or.xpi 540869 BLAKE2B 6e9252300e931c605d8c64631d631b5679414a56d8e9b5607d8be7e2385c424617efa01c06abca8df0892865ffc3dcc66274609716c6a2b0033ca91ed15173df SHA512 0d6747b1fb490cd8d9edc6497826d87dff7d3d6058e11a1d423f35aea2490dd9061a5f6048b24db65c6b7bf885baf3564873835eac96c2125366cdd646e87671
-DIST firefox-60.2.1esr-pa-IN.xpi 557873 BLAKE2B 44b6dba7c6462a762b3e6ac63ce11e51bed9524ac1726ef77a38ecc03983b5a1eb6e5229fdb817c6e94cfa10a751106b7939d0ffcf84649e3a12ac4f8dc2edcb SHA512 aae349a239adda60640b528020700cad18bb7aa63f0c164a0a8fddbfa7d4533b9dd0ed73997496ef7f1eb79adb38a8495d36f91ed56d9cf3b85b83611b99c4eb
-DIST firefox-60.2.1esr-pl.xpi 419019 BLAKE2B 4b62ad449ffd2582ef2e1eaece156d142b16c17121ae5837ffb67bd236d45c786c1989a38d4b0be77df11cad2e9b9709cd2f91e8294a7edfca5afcd3a6822fed SHA512 423c3368feb5c279c5ad1aab63ebcc7d28728af434ebde438ad9df8eba8ff525382f2929d9f01bef3e35b4b1fb822d975efdbdbe0f11088b6fbb753c9d8ed61c
-DIST firefox-60.2.1esr-pt-BR.xpi 514760 BLAKE2B 10c7f55ee9e6ca5a7242efbb86b44c6539b9992980f1f3576da8277cce9dc0875973f9915a23f3eb86e81b04d30563a998a941b09f7d7dd778f34bed9832d685 SHA512 3c91cec7e15e22b5654e52155d44c7449da87a5276e59860da5c8006db79126fa1d756bcec215b8e69a5f3e1f5cd907adb4aedd90ce4834b0f401180d86d84f9
-DIST firefox-60.2.1esr-pt-PT.xpi 519358 BLAKE2B b35ba550360332c4056d487e243392ef2e16b79f9da37d158106b22f37a3eaafb7b97c3cae5ebac3baea8e4f5ebcb35a8cb6994b86da7271bafd3e9124eef0c2 SHA512 090189f942d8a8befbf50ec027fc030e6e4cadf0d044bafa1c4973e6d34416eb6f4961c3d0c1027c80e56414c1cbf4340dd1a53d2d8f7b6266d7f76e1b92f4d2
-DIST firefox-60.2.1esr-rm.xpi 506044 BLAKE2B 9b9305ddab1a84d363df9e261582bc26a8f4c47df7d99e87e53f389dd8d86f705164041d4bc2bde4199999e48ea8909611c7f46fe199da0d766a3b09655cae5b SHA512 156a003bc3af6c8a437ed0f28436cbda322614bf82ab2bdef01d16763c0de1fb68201087006fae9032cbedbef98bad699374617e9e5f01f90032abcc94eb9e7c
-DIST firefox-60.2.1esr-ro.xpi 514055 BLAKE2B 0b5d3065d2f0ba5929ed65e4d7680187c046d7fcfbbc1e4875a38c725c999aa8e8ad3089c99299cf32984e4ecae318cf95d68f6c9e691889009026ccd1330acb SHA512 a591e67839cec4b31abf9cdb404f3140b891fff7cb230ca1612558bf74efee03c90d78029c0a515622abce223bd62d2a04cd156fe53f16aff9ca28157cec6d5b
-DIST firefox-60.2.1esr-ru.xpi 591394 BLAKE2B 79aa85678ae0592c6aef5805da8b7c4f072a954aa0246350c27b8f2f1119a783aa2345c47735fa08684da4cfd251c6a54056d07e6ceab4923d999eb4ca3a77cb SHA512 e394b677b2778fa2102339e0c4251005454318380863b68f547597ada1edfe039d737ef3abcfb97a75caa5e3a7b603b9db1afe852d75472852d4d7ea5e34eb35
-DIST firefox-60.2.1esr-si.xpi 545575 BLAKE2B cd4e94ce1578cfe5cb40edbf073d540c678a5aef00b1b39ace6ead1fa6e0a37238f7e8f3f51d1705d30dcd9e9bef3af78e2d14e9a65f72bc4a30797fe3822724 SHA512 05ba2b4d892a775a17b94137ac48ea525dd7bb34da4c33d0b8c10727b50b47ee799323aeb6ca7b3e76308d694806a7e17442b2fc660dc82c1f645a22c2606ae3
-DIST firefox-60.2.1esr-sk.xpi 541694 BLAKE2B 826bba811e5bba44962720b2235f5efbf98657bf27652b6aa98d6e96e497478d2bfc1cc8db25466ef12a548289ec124736c1b31762b7a262dd2f1fcbe2158342 SHA512 5413b9f3c1f7c04d40b326399364b33c94300a49c62e48a39182694a266bc84ab67fc796b0a65400462327c714d6af387e44d86a56c2f98632f7cd246a25ebdd
-DIST firefox-60.2.1esr-sl.xpi 519371 BLAKE2B 31bfe473f4c13178e810fb266269aaa9c49f4201c9fc336ffbbd842cefe4523bc1c6c8d446fd9e1b9aee522ede009b595ccd58b04d1ffc4bc8a0d12e0a1b6855 SHA512 d3826ac50f26a869c129e98709cdf7b06d800a3829621f9e5eac5169ab2e5d049ad9556e90bc956c4eaea46cf35ade5d009c8fa97339fd2af31f8786102a16a7
-DIST firefox-60.2.1esr-son.xpi 497697 BLAKE2B 0c809b5ced3e8770a33fdfd86e56b780fe3f5a261b131aa1b1996bd5939d193559ae3192d2b1db9aa1f62cc7a99ed70f874de12c25fc87354bf031ffeb058a60 SHA512 fe0e8e48c42aa55d608c85fe4ef2c795a0afb94a19bbf8752e70f578c3bada4da4a85f6152f8b4e5cac108befcfcdc9665c81fe0d99dca0e0a76176550ce1133
-DIST firefox-60.2.1esr-sq.xpi 521263 BLAKE2B e04919fab3520bd728db9a69c7b4a4d1c8b41d2a0a0bae680f9a4f0764697ecc5ec9bc1b114179fd278ac720fdf37d7454269ef7db8078a618e2ebd7b649f739 SHA512 de302505d8c574c988df9c98e39f450c27a24b4845e21cb47aec504932d754ac3fcc32e74ad49c3d5b74dab2ac313db74799680414b0c5dbed11a3683046f27f
-DIST firefox-60.2.1esr-sr.xpi 548770 BLAKE2B 31935000400ae4fcb419dfcb69bb3c7d9bf623dda5369117ed39f08fe35ee982af98226d7b92d1868a74b9d87462cd7d2ee47b1551b3ec71713012a0c675a898 SHA512 9e74fa29c4aa33ea8e90bbde249549debf46b6f360c065f6c0c155648fd01da35b137c33bcf16af6f9d732b4f7eea7c238c032e81ffc37c1f2a0ba009b058dd1
-DIST firefox-60.2.1esr-sv-SE.xpi 518656 BLAKE2B 064900b8d4f84c74406489cdee0b076dd37385f39ba355775cd069e2977f070ad25d5b5db16c90322e3b768912e53b49f08ace42676d9c063630155c1156572a SHA512 31f8ec90b71d6873d86163e0f63af1f4ba45eb5efce990d8351f849d4e06305c52b5c79ffd26ff37449d224fb599b87f47015efcb4ebf37195711e333657e383
-DIST firefox-60.2.1esr-ta.xpi 577911 BLAKE2B 2d384d19251d2f22984347c9ec7c58720d4d2aa0cf484672e36a5d5f63947d3208a02515025eb6e9233e4f02b893da09d0313323ee2b66c78d0c90fcac6ea1e6 SHA512 6a2c1339c3d87cf322a2f1ef2e9421087fc3ad4fed6f3e3dc81b7d1113e96ded4bc05d7dcd2db6f4e8c9d9eae95fedd68c6d11e7a98b9dd22b08d6f4c5e3ee1e
-DIST firefox-60.2.1esr-te.xpi 590961 BLAKE2B 70c2e6d771f8857f009e6beae689adbd49eb57c50a0913327c5f851ced7da5d0e2cc5c87ebf36c7fe52ed0e85c8fb824e288c479140f5ea6d771900e36768ca0 SHA512 8a531a9afacc4466451baba2373455cc23c9013884cebc48150276ee78985062fc52bf30e344889de23a3773dbd5b09643fddb63d8da125e1216bfc014fa38c4
-DIST firefox-60.2.1esr-th.xpi 562813 BLAKE2B 7a72847298a6164dda6cd18b1dfbfb7505f847458c6c28054bdf7b04ee78c6bdbc9ddcf20f2b48577e99e0070bb5674b1ef4058642f4a62697f76a0e15adb265 SHA512 ced65477b7413663ec52b642f3b2a43e78b38076f1cffbdad89a29b61927a0482e8f602a2e0fbf52fd175bc7adac45da923e4dfa445a452aea2016b53e034e85
-DIST firefox-60.2.1esr-tr.xpi 525859 BLAKE2B b52179232b290d648e2d2afa43fe9ff720d7b340c427a19f2e99557e85dd96a881128d8f1fd98746dd5036a6b6a63ccb1948fd4333ad5202cc8c0d6007124e28 SHA512 04e27ef3bd5685c2c9c6697beafa65f4675f014063708dce4c5ce1e245462e283b06af7d4e7d9f8534ca7be24233a8de661adad43dbd4dae481362fb1d923692
-DIST firefox-60.2.1esr-uk.xpi 580919 BLAKE2B 752c3e15de54fff45988a39ad9be4dbb31a1b1d00cbb33a6a4f4183af9b61e9434a3f623b7d8fb148ea72e1c8fd58bcca34bf2546e12030cca9a834e46e6d0b5 SHA512 457899758c0a16cedc32992877f7a62c1666b2c99a5c5d8f50a10b94e3e8a281d373cd2022e30522ef0ba60d493a2d8ca42d2ab4388bde4c856cc0cd7bd17b91
-DIST firefox-60.2.1esr-uz.xpi 513686 BLAKE2B 8ed43b76b7f9a11d5cb48adb4198057d3c81e6863d5259b38eff2919adfb754caaa516e8139c38bc4a810eb4c96fa487a5a3622e08de3460551d3eb0bd9b8197 SHA512 fbd22f3566864587110f484e7633e13e7118fe8a836de033ec7aeda6a89e68756fd673fbac506c24fab679ce40d5e805396e48154b84ad8e428c5fe8e8712b15
-DIST firefox-60.2.1esr-vi.xpi 528188 BLAKE2B 64ab7584a01a96afe29b124d3b1bf53128060a00e5acfcd314f0caf22e56574c4cb15e0b56b879318e7d11b6f1d733eff7dc41e66bdc8281c81c02e028ef0d13 SHA512 f961bf471b565366bdb3550de42c1dafead3e72f20cb393895e1b0dd30b7a5e364c598d6db9cc4342075ba226e8f3a39e1bfbae39dd003090cb427c0db3c135e
-DIST firefox-60.2.1esr-xh.xpi 511857 BLAKE2B 2ed815e8ebc98a9e4c389e471c987a707c79b60869495dd5c3aa372d5319b0e2d90979347aeec244225cd6372a8955a3ccc0a8ea4ef895e7a9a0fb1b33f8f656 SHA512 d69522bc1d3a4e9b4dde4737b77035b2ba38744454eb84e0ab2b05acad1f6f62952b4028a91dedeaaee30f36813a5779be3f468483ea715d76f3c34d390181c0
-DIST firefox-60.2.1esr-zh-CN.xpi 543584 BLAKE2B bd1dd46b8981c6adef6ca980b89a27592323ec61f9f40249457e0c7a3e6d154138373c28548c66c96de9ded28d30b50a42c280ed9082457a688e65fa55961652 SHA512 5df4dcdd4b0590e4d044ed5808a2f36613f32c24d7a766325537230ab1437649e93a907454043278791ba6f04b4b96b60211dbd32105d7775b731f61e6e0b115
-DIST firefox-60.2.1esr-zh-TW.xpi 541914 BLAKE2B 0e3cf925506073e9a17f4a8f746631a026b22d36b5af1c391f0fce61bfb740d7af724d337d35cb4558d8246e22d9352ac9ddfc840d40875820f0f9706902b965 SHA512 9c257e48b226547681acacaac714e15d3f7b9e4369977402ce409ab6ed3d03cb4e5cffb598be27ca80c45c62a6d01daf63dfda5cee5a33cda8818593250a79ee
-DIST firefox-62.0.2-ach.xpi 446319 BLAKE2B 4a75f3e49600a17a0c83f41f1401eddb44cf49cc9623bef93830b53abe8ea423c9e97d0436f85b7645bbd128161b0671648746bbc4f7eed6d5c521e42abed0c2 SHA512 c898035cc7138fc22ab526b6ae167cde741b014d2b94d3b886d5d1f542ec8a45311bc379de3857afedf8545978dc022616298896d18fc50867ba2e6db3a49a3a
-DIST firefox-62.0.2-af.xpi 432296 BLAKE2B a0c62bc0a8d2a40598da1992d804b8051ce1c7d63f95244d506ae7e6ea5f1afc0ad6bc2afab97779debb9f87520a439a9d0a3c4ea14683d7710d1a43d042c37a SHA512 2a258f44b01f3dabe6d9162559152f254adc899549aca5a9a66e9f537ca08874411a501d4662ad7d891e266ba1b9e26f5a96e7f3afa909f0227c47db5266d629
-DIST firefox-62.0.2-an.xpi 467502 BLAKE2B ced18a2649b8732f2f8c8db5d094d7259d815d5cb367f9cbf32146facf72675783e921ab9083d6524eb36575e03e79e0827304d4ba30aca777d1d0b0f943286d SHA512 b7cc14ee6d4e3a4ef469c59f6b309b0ec5712eef4118fc7127ee5f4c3f5aa787cc81e9e52e9473ef8130b6ba0e7c681d7bfcf6457704db96332b2ea4e40172da
-DIST firefox-62.0.2-ar.xpi 497988 BLAKE2B 49ee9217a01665621ed4190434b67ad1f5fd6988a7bf5a899a9cc989349f58b2352c41094dd02f5a60bb09f76e23c3f6b06221d7849a850cdd13301b0a10d5e7 SHA512 a2442c0c075aeb0b7814ad0eb6f436e17b4cd7e7164e2d911da76e570d8488d9076c9b8c66168bb91e7de728a68dc07d2549d3e96594f4834f11882884c8769f
-DIST firefox-62.0.2-as.xpi 478314 BLAKE2B 1c9c5aa14f6eb2af1094cc1671f0b5a71359ceb0d597332b69b07d6985a6529b7d2f5412dce4ac1951ffe3a7e673f57609ec726e6f64c7ce267a28f9188af9fd SHA512 1fb0ff65f619d60be958284acff6c4d19b6cefcc04cabab8619cb5087e0f5e856cbc23a85947b40f63359cec5a2e1d3ff75290aa261dc6d6f0a87078fe732740
-DIST firefox-62.0.2-ast.xpi 455184 BLAKE2B 551875de7639cc28326023d4c53e53740f68afb2eb2c959ba352380856354db71e01531f2d7440f4011d6950d50f919f09bd14146f4e92469a69d3bf3a470b29 SHA512 138023248373d8cdd3d9c2cfd21cf07d34016ac709f0540262c62bc5fa8ef027683e7721978a8b71c3bb34114f784f8cdd9d0e9b1e790da40e8057f5b1360e02
-DIST firefox-62.0.2-az.xpi 477133 BLAKE2B b0015b6932b2cc9116ab676fdac9f03be4d36be8077c39b3d7c5e7a4089c36790dd1d4b5bab1b50fd8f0e9124a2f9aad968e05ff5a31a4842365e368a4d50302 SHA512 d19b8c9facb0ad842bce26433a158f27d3427e65c8e33c578d0b719429e63f69023a088968e0bb689e5b5be574f5b9edc4fb9d3b010121ffe307bbbd54173e14
-DIST firefox-62.0.2-bg.xpi 524205 BLAKE2B 351e5d8cc948e083147f3ddfaa42378a1d550c422e0099406298156a7221ffcd46465d12ddecaaa43f279c401b5401256aefa2eb9b647dd94c4e953e14f86096 SHA512 c6049786e37a41646483b2b12c44a4396b1a352971ec8d157b3649c4091de3c66613dc6f1609369616e39735affba8f6bf5c72bc13ce16e8997a1abd007f0f83
-DIST firefox-62.0.2-bn-BD.xpi 538602 BLAKE2B 8e11ee7ddec5f2a730ddae4cf2030c9f65b6168b0d3453142bd695fbd929be37809e666cafd58610eac1843d6d0a528c6d628d19a6f92ea858b5cd43c1159367 SHA512 bb9e546731a6f2452f067b4f4f700378925577dc915bd0d7d2536e04755fdfbbba1cdc66fa45f7f2729d2f7040c8c6fc0fca99cde63e1c95c10540c2b005c8bb
-DIST firefox-62.0.2-bn-IN.xpi 509954 BLAKE2B 48f255850e1bae24b920e138e8796c88e222b36c191e6e332e780ad48c0c3c3aa38cbf04495b1dc4cd3de57260f46afb8340dad35e5cf00776f2dd56b2e6213c SHA512 ec20cb19752fcf433b95c5623a5207fdb56075cf8900447c6269257ed745d2c05661b186f4f897f0876359017697566b58ce00558978e56220876c777bbddefa
-DIST firefox-62.0.2-br.xpi 464404 BLAKE2B c47e13622b6438cd5c158e3bc0c652b1194b60c3a71e68204f04907d115e558bbcf9da86bb26ae8343de0e458f77447e98dea1e3053f06a10cd93d13a3a15f73 SHA512 8acf5f08ce4eb4ae0497e4701c769a0e1d409c736c3896fa6c5d3cf9847d5f947777f3a8eea0959ba263e4c6cfd137fd2ec98db44d53faa826678b464edeae79
-DIST firefox-62.0.2-bs.xpi 466252 BLAKE2B 1f84726188910283073a692ec702a7d79ca16aeb5ca6930da5b91cf09a41c6caf1b921da143c9fb519a782e73ca7b5bc61670095da3c1ccbfde4299acbbdb9b0 SHA512 0019649877ad598c3f6ab8a62d438819043b6159b09995f872c3acfffa4321c7602a3a792a98ccb0491cf7f52f30734da9fb222b09cfb1f8798bf659b8a4e833
-DIST firefox-62.0.2-ca.xpi 470060 BLAKE2B cd836d0f6715430cf5f1a5bb29ee1d3a5aa35302ea25c40fd9e03684de312a8128a4bc9031e0970be900e41745d133a42389eaa6d55daaf57cc48349ca96e9be SHA512 9a88a21ffe696cdff4316b02377bdfedf2bae48856dff78082d8cd13b98acb2d34cebc1cfd77740f7a6bbd9ec755a4f151972d57c91dfa132ff70751aff9dbc2
-DIST firefox-62.0.2-cs.xpi 478357 BLAKE2B ed37f4a39f8f7b26f106a4b55cd79fbb86720b9b2ed9db1e02009631f24ee0041a3c9a783cfdda87c6d05210e298d5ecbd26b188bab3c209d10bf702f575320a SHA512 3628e26ff908720f01818b304a27c130ce137329e2a15809a40f5d84e73997659a30d522cd3bb89b5086d35354f68d8fa2775f3f5174cef68a19a63add3944e0
-DIST firefox-62.0.2-cy.xpi 468861 BLAKE2B 31e8780e95eb49300e15e7ea9d3a48772664104845adf402a5ad74caf4ff96a1902a1848142c95b838959e2f07fcf3588f1625bb4d0a690ad6d50bc3d65ff193 SHA512 f8f009e23e4f4e9b70cdc9b220f2d0df2a17af27f28e5193a9976d91f74c59b28cad01f9f22c7108b5b304c4fde8292e1644d244da9fa009379ecadb20b16bf6
-DIST firefox-62.0.2-da.xpi 467292 BLAKE2B fa805301b88a1058ba6d87344350b402a913494820718db82ea5fc3312dd61bd85aa351fc926f1917c2a40bbe62682ad5745de560827c51d004e5700f1ade664 SHA512 51ecf374aabb0037fc93116ee970b1271d73c51ec768c27fac37294564a0370c365060ef128b684483b2760c6277abf432dc9937d2f8919d8f75a53949b0268e
-DIST firefox-62.0.2-de.xpi 475935 BLAKE2B 429cc6cb8e044ce9216acbc4bda8d55f4c0e4d6b29dada0d22d82f900f3e3ff9c307157d1177544696a57aa09897462ce310bfd1e4e9c060bd4dba12df91c29b SHA512 23779fdb5e5da7cdfa74b9905911c1580359bdb611ef2c9d5f8d20b01bd8552630c0ee28696e2b8cfd1c3407df3868f72c7d26cd5058fcbc01bc09b1c4101a89
-DIST firefox-62.0.2-el.xpi 546431 BLAKE2B 43cd76de959b21e0c2033ff82a2f3afff639e34b03eac214c87eb948d6886d47d1bfca42752ac663206e2a61be1b3dd1047e4196fd9fbcd7245fa167113ed378 SHA512 44315d85126cfc71bcad9a62710edfcdf94093eee7bc7373c809a823484f0a9167f5773d659628422b9fe26d90170cef945adcc4dc1cc18e531e53e6525fddfd
-DIST firefox-62.0.2-en-GB.xpi 436175 BLAKE2B 0035e4a9921f844f6ff3470cd2c900110f4215c975e998c7e7529901184d1479a4f1fbffbc9db99f4a6cfba2c6ed0d75e6cbdd34f7e36ad9670eb6e29ab2b8c2 SHA512 c9aa04274473da19b0ade15249c19153613facb81e90301e0516014eb37aa2de7c322d0ef4e9c24b95b9c4d4d0142ea0fa6d5e6855c1f784f26d8d9e8135340a
-DIST firefox-62.0.2-en-ZA.xpi 422865 BLAKE2B 6e9f48b3f6eb7f8ff3fe47bcd8d43e37a492ed1aac904427d8b51dc5f4c13427e75862cdb6e9388a046f309aa09d45558f827ac0a5d67c4775e05d509cd17035 SHA512 13e3f98c677a84bf46721cc9b2f0fe32df0e3054ccf352536f53dce1f96628c734425ad5286c7584134295eee8ecc703968af50f06037ac61d1853a4a38d6f98
-DIST firefox-62.0.2-eo.xpi 466537 BLAKE2B 656126e4f2bf9db68a1944300629cce1bae0985c5cd561c536ebb31024c5c7e64c5420fb3f892df7ef2120195e667bc62fc27f82e094dd25d1e52bb1a4a2cee1 SHA512 84435b40766d22f19c694469d150b5e7789f28195fce75539bf3050e1afe59efd3a87c1c402962d84f6b28b5d6d931bc90e75562561662b376634dacaae25c56
-DIST firefox-62.0.2-es-AR.xpi 473516 BLAKE2B ca71ec8cc86b25b399e63958646f2c03272f3b43de8ea4d3e48dcc04c5f9f1178bb8b86601e0647256523de67230c123a5deddc52f3164676e45e170a92c21f8 SHA512 24b116249996c065af87a53821f3534bbf807ead04b33ba46f120e26da8a14b1c75b00aff3b69c2b8fc948b7f10e2bdffdb4179f0bb444a9e31973aa2bf2d6d7
-DIST firefox-62.0.2-es-CL.xpi 473984 BLAKE2B fdc4cfd8f12b3a99d2dac296015c84ae2d05bb7778eedc3356498b9e4c95a9138617836e3d8132336feacc303fbc27f2df96a6e6aebe4aef06a9f2a5de4c7f9b SHA512 15924beb6c37d336d69a65df2c68bee5fcfe53edd37ba7c47b889850a0aa08c74254df9fd4cf70887fc56db0856fcb0d8d8e9d7c45a788b5f6f4325b6163795a
-DIST firefox-62.0.2-es-ES.xpi 414983 BLAKE2B c7f19fb48da14f590e8e3d7c7c20908f5bfe3866f1ec8355e4f3ad5ac01e3021da21b7759f5ecc21f04cb082238f3889dbc2958b606996a946ed90e26fcb58ec SHA512 525a89724c8fd76bc079c757e2d69b9e7bde2ed92981d3a4368542e558779d2378e0caa81468591fc96e55da7d1fbe155d08b76dd404d0dae2d2a8f9acbbdc37
-DIST firefox-62.0.2-es-MX.xpi 477954 BLAKE2B 6345700fa0b63468a280b1374d42fb3ca072d9a214f77b3aad4a303d6e736a5bccbb72a98c237fd74c092116e6fb8c903b1c770500f3c8e106a3d5eeff05ac44 SHA512 f30dfe898da5a244270257184dc28e55b9a1cc7b76a3766ed85471814e464ae13dd43ab03596d5d0f2bdb9931e5b42990731b55b96f6ea609b59613fc0bdc234
-DIST firefox-62.0.2-et.xpi 455378 BLAKE2B 5bd672c8a0bf63e3c2ee336ea9fa442aa94c7c0ee405d7fbb28c55d3d5c7c87dc058aa59fd020673d5a926a79fcff71472ed8926f3ba936efb53ecd014a26dc1 SHA512 3dd8d33f648e1152b78ac76bb391a11dffc96d231fee4b777c8500473854dbc2e793df78bc6bc1f6e66324d8330822c487e93a1570e9862cfd101ce80d5d5074
-DIST firefox-62.0.2-eu.xpi 465901 BLAKE2B 1e409b15f2ce9425cba85b93407fc32c8e2b4e240211d1c7abaf41797744dc3c35b1228790f10ef2d6eea8e5cbfccd647308f2acbb6195b97aaf1cf8dee2afe4 SHA512 7a6b1256bf65d41c9c27458d2be3ebc74771dfd39bd284aa4e990607fdfeb19c49ceea4f52767d566b65a4c36c798d9cc18fe7460bd9a1df280aa3fd2499ca23
-DIST firefox-62.0.2-fa.xpi 514444 BLAKE2B 04cf4fbb31705afcf3d126bed71c2ff000cf157d13117c463a87d9d513906a935d4b8c73c8f31e0f62c51f5c8adb65a11bd0c3ac79db5c28fc6d62cb9a2b7785 SHA512 889e2c450bc0201892b395b083ca22dd1e630e887b9393323887b5b8475636a46c09c44462168b7bf1b78bcaf70b9ccce47e2f13fb00fd77414f50105e9efc15
-DIST firefox-62.0.2-fi.xpi 458680 BLAKE2B 855237cab4fe145004daf18706f66a461db5225c727e01a3632e0bad207936721a3c6009737e9db9b893745ab961241c5f8b6cdbcd6c519d0a3f1b8afa8e0c0b SHA512 e4367eae770cf2b47e68c806f41f7184f7c49ec0900858fe557b6ed9bf7ab305fdf4225b33e6cab86711319442e794ecf2009e56a167375be2ecee32deab951a
-DIST firefox-62.0.2-fr.xpi 482960 BLAKE2B 6ca28463dfa36e4e85da8c27bd65c2489cf256caa1da9c04b6690d45a07030b1fe907a8899df83e78f4ebdbaf319a144a87bc378c876888c866c8b99a0ef458f SHA512 b946bcd72f470ded0da8a7c198c03c8a20d38990cad454682afccab007d6c92b4afce4490c163cb612b4a3da6fbac4fc9bb0622cd998aa231e1dca78e7bc4291
-DIST firefox-62.0.2-fy-NL.xpi 470424 BLAKE2B af06da104519cab2d6b5a10d0729600340f705141beeafd6bcb7d5e9c378a1f67b3e4350a1f4c61ddc9f1ee1dbebe3e7adde673858ec2fd3f801847ef43b8ba1 SHA512 f233ffb15370ee0bee2a033a996fb7c48b9a8ca3a38cbe8bd7731080b0030da96a4062fcc791f9eb5b9930530593c2330f7cdbb02f33abcb81ec92bc37fdc0ee
-DIST firefox-62.0.2-ga-IE.xpi 472261 BLAKE2B fe8bc3a7e156dd634ee269c95d89a69570bc4388739e253ad7207c3e83cba86917fed2e247031ebb79abad9729602b8d6803f836f2628bb1e54f2fed2bf42c69 SHA512 2efc12176a8091d9eeecb35d6c2be79bf1a751f21d8dfc211b3a5cdb7e54769a7adacf097fe28e7b09574b3f23b101b451571442523069969bd415f698a85fc6
-DIST firefox-62.0.2-gd.xpi 473971 BLAKE2B 06a9f34964abd2bcf8965b96742e3e065ec4605b30588e7d5c2afd21788e48df905be14c8f97d3fa02b3b10664851f849e8f86390ef272301e34e2f4f6dba7e1 SHA512 951f2904372b9f066d5c4b5b4616a77f63368b9334779b0c0e6e70c1d662785f5a996d0d8170539d015429065d81fc0187113517bc1f060a5cc9694f81c66726
-DIST firefox-62.0.2-gl.xpi 451821 BLAKE2B 51e7fb733b57d2f572a6504ef8703a98827823c5ccf64a0a0a8db86f7a8a29cb38d4d30c36aaab93b94e6f3b9a8b7ac97fe80e6d143e572115b6115408f5eef3 SHA512 3cbf4a7d60b4f4e25fe7a9eefa18dffc348ec3d91b2eb53264856bbea154029d3fa6b36fadccb73d9d23137962e21c8b43e45900c70bad4e7b196fc6ffd94e5d
-DIST firefox-62.0.2-gu-IN.xpi 539984 BLAKE2B f82cca6f0746ee58b58aee92bd72d9a11e56380a0e2fd7e7ee3e5df4ae287c2b47db147dc5a522640724642e374a418a45dcb823358dc6d4a10e759bc5e98117 SHA512 977c6e8f853fbfbe79b195b5642fd4f0076001a85572107becfaebc27f09fa50aff4418364ca703240534819afaa4a89862e973cd73b4937b74e6f876cf3e974
-DIST firefox-62.0.2-he.xpi 484819 BLAKE2B 60239954e5be25d68b6e3f277d7154bdba6aaa6072a998f698174616362c2c7a3483ea47ea22df9e15315d7bae9b75ad3bee0a09d9ca0f2cbe98fd165e03407c SHA512 44e4d7f73c3bcf2ff049be97e429b6434402af0cd0052fac775759a9cf3693d7cffb236b1af1da05c90a81b8d5de56e9c255027ee331bf0bb58114d5c12b2cd7
-DIST firefox-62.0.2-hi-IN.xpi 537125 BLAKE2B 9da54bfbde4ec9a8da2cb4b64e116aa48c5fa055cb9b3ba603a8ddfeb7a7ef5a8d9c888b7b01e08e2f94c9b232ab682361f8fecd70e702934d65335f0e9a4509 SHA512 64b30bc77120114974e0c256c07cf4bbb9534b62ff54e679160f75e2d3f38e90f7b882270ee02759ab20805ab0d95294bde2eb64bb713442874caea82b50cf14
-DIST firefox-62.0.2-hr.xpi 459607 BLAKE2B f5522513c1fbabd64e48cd42600f2fb5cff27f10bb937f2e956f3e5cbfd2da2ced4cdcc9106829097a34eda82ad251a8d9e7854349ef16c441aad7bd4f863bf2 SHA512 dd1ee3137c5dfc3ecd5789d3bdeb1dc29b1ec8a9acac6971a6c831e9ed3bae5dcc10fd44c09733f38a3a828a1ff6e09b209c84624252bd6490c1689547cfd8d5
-DIST firefox-62.0.2-hsb.xpi 488118 BLAKE2B 0f7ec922406da38b9f4ff7d6275a33078eb6ac218dc2c7453d0af6a40ed6a1759b0688fcab8860e01a71b5c1529f68c5a9382be2ffdc4a139208cd5b68556c8c SHA512 8579b33b2fbffa51f5c0c7bf795cec5aea91e9a16d62360369d79bb75b00bda9207f01e752392522dc775e8235b8eb67310e2cda2bc2643f4bfe822d58d94399
-DIST firefox-62.0.2-hu.xpi 487432 BLAKE2B 0e492dfe3b3def23f46153d74c1bc586d8255758bb73050ce6e4425d4f1874a9ef3fecc1df59ae300ae44c7e1750eefa4c40f87df990a25d04c5fbabca45cc2c SHA512 3fabebd6451a2c3ae82489eb18a7b27f644cf52a49ca513a6bbdc057b6270101fdd5f3b2d7d3b49480aa4daed98bea3a36d3ae3e0f3f581c68e824f52f74ff88
-DIST firefox-62.0.2-hy-AM.xpi 518007 BLAKE2B eb7e7f41fa74629e4df35fed26d73f8d35eeecd8faab2d8d71d25806cb434ed27f5ebfe1bf5a3fc899140d402282b1feff440f144326e8ee864987a6f636c5bc SHA512 44974aff3f060d5fb52e36a31216d056f049c71df6c6530a13da5be7e33ff9ced02acfc735aec0438e1c2ec6493ba194b7f3710c417798947d40f59cd8ebc0bc
-DIST firefox-62.0.2-id.xpi 458272 BLAKE2B 1daab6e50927f329de6c2406696e0a5a98982736d4284d9b454d3bccbdaeff2206f27799c2ccb42d97d9fcfa3fc8c767c80939808021fd6e5cc9a3768337d204 SHA512 701bc16d72bce82f5a40119f901d6e237bf4a834b3f96996b532de83ef10257612b4f7fe18ba0caae778a35ff9eed4567529bcc81499d4bc51ad31a581175805
-DIST firefox-62.0.2-is.xpi 459612 BLAKE2B 90e72c613b3180440b18ac58676a990cb67450acbae0c953a3176b27451bc6e3eb3c745cc0c1ea256b1abfb2ac6b669210125c3eaa44d819196d91ba659069db SHA512 f0d40a37c2f01d752f453ccb9b2da4a0b8996cb367cf59004a3951a060213218100c724226a08f5a2442c07937210441bfb6a81a23368e9e7cc9ca6fdc114114
-DIST firefox-62.0.2-it.xpi 347134 BLAKE2B 4dc56ca280f52620b0af862a53007f6efddb52d7582cf967589d6a03a36336f035c408ce2bea6e1d7097fbba81262079009604561834e79af261f032f77d1d7b SHA512 61804d0600dd664f446cb3c65fd2ba9398c8d25b9f060dbf312c31a557c673e66921472256db13b124477c7447756a22822c57b883933e4e13ca36e0af0d9a08
-DIST firefox-62.0.2-ja.xpi 504024 BLAKE2B 69402f20a24366c14c27974d7fc816d38d8335124b3501da4e113f125f75b48b987f8ea2cb3f4ee5f01a8ed6e5e6247879d246327a02573705a9f89531830c09 SHA512 d0e955673df89a2a4afd5ed5e742cc9802a0496d30a3ecef307d7afa39c312d127501dcb33399127b422485b7d639b38422352c8f8217dc4b7a0470e9c30a3c0
-DIST firefox-62.0.2-kk.xpi 530652 BLAKE2B 744a98b3d427ad08ac62842b22b1f45e694740ee574262d5ea8d68b4d437f674f3c601521aa4c486a12d49df9a3c9c6f3537ec892bc8c4d0a363c8df56ed89fb SHA512 00ee4e146ec5a8bbafe76db3608557bd51c2ba882b34f82e92e1a39009d38655e39264cb0e7fa4c200a0c3fa168919547606ca4aeddc97041300045f9acd4659
-DIST firefox-62.0.2-km.xpi 521446 BLAKE2B 528f9bcd19d342944549ecae9de24a7296c8b102ebe25ef735e4acc287948bf161bc7fd156f9a3412e1ebffbb9e3a214cbb2e9422de5e8232dd95f12c09da57c SHA512 18cd6c0bfe87330fa864f9a6ae9fdbb3024b27f7bb35b4329e7dc0ef7bea5811824b176c87c56e53ba28b7f2769bf5ef19f6d190618d4139e4ce655b30d2555d
-DIST firefox-62.0.2-kn.xpi 528083 BLAKE2B a3d87093958ce465d512f8c285de647d1a60982708125c22a2ce1e56f554093edcd0993bdb533f1eedbeea07663f399e1fcdda1801002c3036183bef1e8fa4a7 SHA512 9d3e53031840493c6582a7f3cd348abc356ffe758981888ca39972bd9c48700dbc739cf26512391dd37154ab7de9ffb3909fb050c2e77d01a67f7f9622d435d1
-DIST firefox-62.0.2-ko.xpi 498336 BLAKE2B 92041b661304cbe279257e63d04098a80e6654281e6792c07aba67569189ad822bce1f295bd1cd490fae90ae5da250b1800d7d6ed6328502ea3137668e148b37 SHA512 e13266bc40d632859630db9c363595334bdba3c4ebade1977f89b08fbaf7c3e7c07fcbf298871e27104505da06022bbedbe7794288fe10868e2dca31b6d4a8ad
-DIST firefox-62.0.2-lt.xpi 487646 BLAKE2B 3e28a8a529c03566b2d87d5470fe6a144f3f4d7a63198fd28df9ffdd4b598a6d42298048bc7a93fd09693aefbc9b9a170a7b03766580591f2d3c99074d408b99 SHA512 1d391e1404a4964481a9c516613695504715f1e3355cfc398fbeb02c0c2e46f0236155d814151afe4e4c8e71f231215d3b0b664a8378982ff2d8935d64e5f0e8
-DIST firefox-62.0.2-lv.xpi 475696 BLAKE2B edca0ca0cbd0ca941c412a031a21c7b148f9f00b9fc9a37cefc7bd679e99b94c444d4ac8b203d20c7f7589052b8bdd413d325b278bd145571e2e11b717e20e09 SHA512 a498992c8a5ea2996d3a3897eaf032c8b5d9b77554147d137d4ed617e5dcdbe8eb1a23cd4a9bbfced8e5d8c1f4131d0fab5172fde042e838b2750020f6e673b6
-DIST firefox-62.0.2-mai.xpi 494723 BLAKE2B aa683c310fca2bd96ff3377be2f20689e8d23e41a482ff08893327425568167cad8ab4302c0cf6d9e906905daf06b42618199172fcd0bb377ee945b42ea3a748 SHA512 ffd824eed685ffa017b6c1c8046f045855792a3f61499dbc41b3033246cbaa401bae1162e35fda19f9a5d789eef669b84b68956b1f07a83920eb5cf9c14fa0fa
-DIST firefox-62.0.2-mk.xpi 457527 BLAKE2B 278c8ccc15ad71eedfede8ff090260adfc6334bea4a1f712417585c38b81c304ed1eb7ae9ad1bdca1f11720d4f6305b59fafde6f8cb2f26ff8332bcf4c462518 SHA512 2962c8023d65460ecab223061316491341cfb3854b6f595cc40b1fb8e632305751e89d1f58961330d469dd63d0ec91964d1c1e7157a82b751417f60fbb08b6ac
-DIST firefox-62.0.2-ml.xpi 538826 BLAKE2B 157cac472c27184bb2a1a666ae82cfaf050f1812749e3232649586894c38259a8b3b7290f21c645bb99e362bfaeecdb3282ff2ebf7926084a9c0f7fdf00fde26 SHA512 ea80ad648a0e8af3fb8a1b7b8b3d2c66509578226bc74f4cb699fc4a1c5a115c5fbf2040ca2a342e894d477eb1c2030f800192aa3c0f96bf81dbdc7f84d60d54
-DIST firefox-62.0.2-mr.xpi 530354 BLAKE2B 54741102256f8b82d12b18790ead3af96d5309426e0d351e9277e77db642838024f11b087a14c3e255db249d437393392a8f8e99fb1800de0af1f2ef17457d02 SHA512 7754ceeae7168fb0eb985193385aa54e1d3db827f7f2e983fafa89cb4343d44ea17d3958685a419aa45a71f46de86cb8dfffcd3deb181a273b84bd2fefe35f48
-DIST firefox-62.0.2-ms.xpi 459911 BLAKE2B 6bc8c8460def32070cedf5278a2cc07669d9de501d109f95274c9c50d15759293c77fa50a50ce5684a09dbb30e52408ff9cd9c12d265ec5129bf0da93da2a191 SHA512 b2da65dde3af0944532ed0f34091f2f896f11c43798274ad3335c3adeec2c087d65f8681bc04794686cd7bc374ed73250468189896cab77693b2090f703efd2a
-DIST firefox-62.0.2-nb-NO.xpi 458925 BLAKE2B 485dc6dc485800735290decf4cf7a6e3965f8fb356cb6ea07fea890ed408adca2304a502c00d1cf86bc2df1ce5bf815635ea7cd4949cdb2bdc5ebf03fb24fe50 SHA512 3e1c2394b1fff9ddde349a013ab365e5fbe2b9ef89d430bff69b1462d10fcc7f02eaa75a2a88ef2deac3b38cc618f45eb1b22534f451ae77d8fe8ec15033b9da
-DIST firefox-62.0.2-nl.xpi 459511 BLAKE2B 6fac145ee48d082292d5b41da947a0515df9e93600c209b16554e726c384bad71e497a8b98dec7d2804ec3afab88f2e22d61a468789f5a817633a8b14bb8792f SHA512 0214d00e74fcfe958e7b3ee7d460fc56625975910c275adafbc99cd5e1938fe7652a8d309747b8e2d4eea81ccaae168b52d3a597589b3240260da65eecc5a47b
-DIST firefox-62.0.2-nn-NO.xpi 457057 BLAKE2B 3f68568802e6dc9496cbbe91b9c54325ac29d5799db719288105821c3fa1b2ae56d839f8aa4945b451831ab91243eadff8086b39171d23408551c8247b082cb4 SHA512 9be36d6fd0280506ef30af266730ea7ba57a0ec8438893e0ea8ddafeb4f83f85089b97ce997139d13f16aac7bde41479a0ec1b2f07eeee023632d7c84e2aa705
-DIST firefox-62.0.2-or.xpi 485374 BLAKE2B e8af79a432c674b4ef78fca16f57a699aedc1e061bad37e5deaeae53e7a2417310c763bf3f8fc093194cb198108b3af41955c89ce6ed7452fa69313bfbd6c090 SHA512 a05836bdc384c6052e546bb91fdc5d1f33b375ee812a7b676bd09d35c7156f80799c18b1af4b8af72eca087d0231a1f60cd582431aa95fa378354f1648ab870e
-DIST firefox-62.0.2-pa-IN.xpi 496916 BLAKE2B 2b075b407df9ff9758d88eec47b7c79b30bf95f0e170aaa289c81c09e31275ce78ccc610270c3d57dd698c40aabad49208bcd121a9f24f6229cfe8f0ec0338d0 SHA512 9fe90ebfc1091242f83887b506b93175421ae00faaff7fd1d438cb61e39e5484398ebe6108a89cab31a9ea299daa280206dd67d38bb9b6b668b8c63ecfefbe3a
-DIST firefox-62.0.2-pl.xpi 370890 BLAKE2B 2192d0ec996be573e3c857988c00e05aab9033674ef30944775b903f7ab70fc32b59882aa65d4439d8554c55f043354e53220484ad11284ed6f31c589961afeb SHA512 12c5beaee75097ca311f6991a0b1c4907391b54fbe6ea27652d045c8e5bb75b67702bac891bd803fa7145f4c046dadfc3ab84fd923460d642f8cf74ff865bc82
-DIST firefox-62.0.2-pt-BR.xpi 460866 BLAKE2B d2a1777a7dd0266591adfc9344ed8ceb5a26f5ca07f51bc15de092b1fa83d7c141aebec6677f9dd9aa8d483e83ea46f9ac576465c4d11614cb95c12cf6794fb9 SHA512 ace809bc44796ae0d2e8ec8f2b871dc841c0ef696eb434fedc5f3e2317c8093b31c2531207e97a13db1d0040f0ddd36d02ec2b67b4a5d33db5c9c8c4c166be07
-DIST firefox-62.0.2-pt-PT.xpi 473526 BLAKE2B e75771752756a4f1eb3906fc014f66158443eb349098d0039f9e3afcb5eee0e7e3f0117644c27cb1dca40c63901c4f0d6ed1ec57034089610594834136476ddb SHA512 ad4999f508ac8cc33030566dfb98a0417c5061c14d7804c934677c482126d3381419e6737a969df826e6f8db5357dc046ad90295592953450ca79cd578faee29
-DIST firefox-62.0.2-rm.xpi 462470 BLAKE2B fb72c1096cd9f6f1ffae48f6d7fd8df393397bed0cad7785befa4ca9bcf9a9aa2e6f86275c26373b77a79c3a612fce1f51d69f65a6eb38732a7d21b62ffde75d SHA512 84817163733c6bdaeec1abd5bb4384bdabef25ba2c21247eb420a3832ef51d3f53e6a40cb5952e53cb7b3a92fd4432067c880d80c39c6cba40512b91b65684fc
-DIST firefox-62.0.2-ro.xpi 463401 BLAKE2B e5239f48edaa6dcbf96417ac9dea41802d8a2e4de246455d03797d1dace27311539fcad33a7a4ee3c1dad2365f0649dbf0461c07c559f3825de12675eed8721a SHA512 89525412f4d53c067773757b5ab740733a025265fcf68d725317e54351af83e61a9c05980cea62b8c90ceb2d8d597bf2e9c97e6dbd06ff730b46ffafdd9fcfa3
-DIST firefox-62.0.2-ru.xpi 539884 BLAKE2B 04ad8775aa310b44238b161db1783e778d82fb985ba226a21951a6473bf9c9a7481dee2f09c29daa0d44cd512e09287706fbce83a956af086005c2ca1403bf68 SHA512 54143cffcc09a519d7df5be882039e888567211817a864e1b733a347cef5763828c08355b16e08b69891e2a18ac113af6995940a514db0f0345bd36bf8b130fc
-DIST firefox-62.0.2-si.xpi 487601 BLAKE2B a4e0d82467f7abc9d1824d93705e0dbf45cbe3e49e1bae9ac172e29f78f1b6553a5773a5174ad0c3207bfde511e8a9877ff6720afb1416dc30796867d86c0934 SHA512 9a6a88afdfa70a48d0f19ab999d9bf8dcb8334bc342add5ae30f3b36bf791e1e9e5f7086003135f93e81ffc1492d119568b0317aee3092bd16f6ac939e697f4b
-DIST firefox-62.0.2-sk.xpi 488135 BLAKE2B 551ef2286d691586fc68366c2bb9efa8d25f7ed9812d4e82de3c68bd94ca42542cfccb5b024c551c29283eae93fb8ca2c75eb65c249b9bc41743eecf6b6c7ee3 SHA512 5dbec9a977ce0551458d190cdc1b94890c42f60e3986e8dfa12333125567c915fe8f49e42fd23226ae572dfda878576a1f1da70a490576f6f68cbc359caf6057
-DIST firefox-62.0.2-sl.xpi 468414 BLAKE2B 173e354e7881a039fe2721bca66bda2fef6eb7d1311e2065d17d6c7e215ebeefd23bf4b991f012367787236cd0d527adae91fcfabab35435e5d8e9177f74b758 SHA512 6332fee680d1845cba0b1c794c483e340f0bff09d8dcdf5302e5347b3f010c116e5b86099591a1def16a30941d16b01904558d57738c8f773fb2728bdc44525e
-DIST firefox-62.0.2-son.xpi 445941 BLAKE2B 52ce53c553c96ac4076222a33433a9c58249bd8ab0115885c8384901291773e53781e7efcf213a838f66d9ac44f1295315b04296ce3f89f519d018c56c55149b SHA512 19f600fce137f874f43276c3b7201b7f14fb4480cd8be09cfad55d5b4b7cca097c7812d04f65dbbf75d47eee383997d239ab5c2d3e21d0459c22a0a0d12e8a24
-DIST firefox-62.0.2-sq.xpi 475530 BLAKE2B 8c6f1bfbbbc6401c86a247ae9aff3ab7f5263350538f912625b1f12e67b2621dfcb06726b569c2003cdb93634a7573424cd7f3542d4af5f02e11f4ad451f8bde SHA512 a12a259000702f500d533c7eae48472322080fe1bcdea98c19c2fc863aebeeb5e4b949f213e487c413c89e3b01b568134aaa491ce9024a04f05ee0b34f7d3357
-DIST firefox-62.0.2-sr.xpi 498809 BLAKE2B 331a2d740b38f2331be261a28bd80e5cdd798f74574af6485bbe275d7d3158b308e0729506dd61ad49b8338b213e7fd82ae03582f23ad268731a1074f03af782 SHA512 442bed4d7f32cb4cdccf275eafb21acb3ef4142aefcbab61707c82f8408be568aed3269a34e885451ed51eeffd22165585e193c6d687f7bf942410b7d777558d
-DIST firefox-62.0.2-sv-SE.xpi 469508 BLAKE2B 4ada4b477599b65a9f20998c2cc7aa3f7870fbc1138b0bc71e556bd533f47f3a1c487b09fa2802c1b84b934283dd8d0c695444818284546893a175c08e734675 SHA512 ebb3690236307a7bb1a7c26d01e305f5082783c0f1b42753b1afab40f36941ff5dd0a5b600a4c02bc64b81a48fffe459b501f0b1f2a599ba99fbb071ea0a2860
-DIST firefox-62.0.2-ta.xpi 526479 BLAKE2B 69d29fc712ea06c625bea55dea27d61889886f852647097b2288ca080ea3d164a693dad4ae8103b8880fe161ce3bc78efa9934529cf073036b2f2e99c0a1d4c5 SHA512 7e52cb5ded50fb960967a3808bd6d7acb2eb70e74f3d906a4337df79dfec619d5979dfc0de2c900a102bcf7bddf2d8e9f4d519d63573c0575b86311eba8a9b97
-DIST firefox-62.0.2-te.xpi 536779 BLAKE2B e2951535347b82bf825139a695442f8f0d4c2842e284ee0aa8b2d252f52e5ad309a1196c5d630fef075842273400c1110f9c65699892911cb36e1501ecd85ea1 SHA512 06344045a928585bf1f72ec6a79df8643f124957b5884af4522322bcf2a3e5c7755f7598c316cbfbcd3be3846f162e8b2e66c6c71b2ca0d81ef06f9a1bc150ba
-DIST firefox-62.0.2-th.xpi 507130 BLAKE2B b87d8d75d82fca4b0565b4e6e727167196e388075cd2b73d7dcd6c1f9596c2037d43a79d5a08ec1cdb67739ed2dbcc3adba4a742f0c912a5dd32c4471f0a3d18 SHA512 b949b240a0a1e4225a1c63e1c24b27cd91f18f0e9577e88ad2ee15020c0c0a83b920cd2725117204d57d1a60b2f18f206682df9401aadebb57a9efddc9fc2c05
-DIST firefox-62.0.2-tr.xpi 477277 BLAKE2B 1399a97a5064cddd9c9845e37ba15868142d3fed14d186c3999e309070c665b4f41b165fce43b0606fd1ebf6642eff403f9ab5173da391dc721194fcc1026c3f SHA512 9e50fb892db573361046188ad05da867b35fc72b609219fd733190cf7601340f90185105c1618cf7a7c5c2044395c312245fd21f9dd39bd81d5fdf0408db611a
-DIST firefox-62.0.2-uk.xpi 532590 BLAKE2B 0ef05e76161516906333a6e3afa5737a0d4d2240e3e73e6a772093d0aaf9105c20f70f6d594dd96f3ee292ca59e18e0c0085d0e4c6e245fd518a82a48dba9e8f SHA512 5ece2d55c831ea127bc1748d677deceaa9619ff80b5b1dc29b51c14cd3e9543bcc19e6b61f6880f1f111b35584af4a389bd8c33a230616179aa590403229ae44
-DIST firefox-62.0.2-uz.xpi 458001 BLAKE2B 1f6d4097ea2c8ab5a1e5fca98279877df2c7841ec4ae3083495e9548ea2a5f9b8ade99d9f58c3bb4acf6a15666ab0eb17fd8095dada89ce930e665702195465a SHA512 d57b979ecf940e73c36cb7f462b0ee7515dfc3682ddbb5bd837a26779acb10e3ccf023f68cbd8c05f1f6e17e8d6286b35d5314bb2349ea6c91143e5d270489aa
-DIST firefox-62.0.2-vi.xpi 478327 BLAKE2B c3c40cc98e4ace6dc64cc696e3e7e2b5ec941f064a1fadcdb3522ac92915ffe64cf2480d6941d35554aa92ed2741e59dd90a5509f7b06e46d6ce377bbb135dd0 SHA512 4d25dfbb0b76b23f532636e649732dd4bfcbe110e5fa9e46e617e12096701c95c838491fb43eea4a3f18f70a4336f18bc8e4e71e9842d153ffe1e9d84fcd73dc
-DIST firefox-62.0.2-xh.xpi 461198 BLAKE2B 816fd0f17d914e055945731691b03ad34005dc777a935d9a05bd7ea02166835ecdc2cd4adf37698f3ed859fb0b9015d90396a86c2cb72ca24274d7e5b520b008 SHA512 3741bfb3ce0a8c451b60801827b80841961fe04cde587dcd91df04dd5bde13f786930571ea9cb7d732fa86fe47b631fa2fe213d4452c84f44ec60d9a83ca81f0
-DIST firefox-62.0.2-zh-CN.xpi 491485 BLAKE2B 9063efba817aada697f8edbd4f154df3ca8d17d101409d15d1bd2ef98abbeed42ecb25480d685dddefbe2cf894c45549ca7be0bd580c0bcb829abaf1b48fe63f SHA512 5e45f942b115eac8d338faa74c4962b203b0340036688237e388bba04f3a4e62bc46e216540d9611bf3eb8e3919379d40042acca4eda8aa7876025cd6b828706
-DIST firefox-62.0.2-zh-TW.xpi 494522 BLAKE2B a27c11631c4a1f4e5777b9e8f465399bc1881218a4e9a51c8927a989f9ea02ffafb293595627f50b43c5d26c5dab99935e763102fbebb27dfefe64cc368cc545 SHA512 af2666a28edf4e883b3effbcf684e95641dab8b6609bd8150362ec9d961bb043b6dc99ac686bd0ae0a0cd1d2b2a0da76319e27a6e71db47ccb16247603705e02
+DIST firefox-60.2.2esr-ach.xpi 496840 BLAKE2B 1419b3ee223a1e5505d6d596068f68c4d3f6df3152112b877926b23515d33f701aeeeac9ccc7a1d2fca828ceb314a6e1fd2fe4c1619283dbbe763ff05a3e35ac SHA512 765d6859e15189d410cb08d42ca565de42f56413e7d4fb88c1d500eaf199c32089e2dd4a567681e9ff083995378a8dc220a46ba7740847096572f4de7a49c1e2
+DIST firefox-60.2.2esr-af.xpi 487308 BLAKE2B f9cbbaa1d7ddd32f13d0d0181fc669bf2602dab285733e360d3304a3b19ef4e6d33330c1b58e3f8918a77050f2e0767e8acbd2baeafc4f645820d6a249f24dab SHA512 b272b4c3a032e11db1db44be0a2c3e0734b0a2029cf5cc130877ee6f288b4c7c47cd676da7ef369d2835025540c03f676f4906c6655b4e738f9b36635bc397dc
+DIST firefox-60.2.2esr-an.xpi 520494 BLAKE2B 304bc120fb2e1cc3dbf9ce138d9c69e27ddaa8680814d66a5e86c0ab1fe1ef24d684549f5bc71c8ab4bcad6285fdfb97b1683a2606305bc3ca7f07f1811cb3a9 SHA512 5263e17bb9ae3ae4bfdc8952a749508fca145a5f1fc80768df5ac69328d7f34d37ace69068b18010e91f300dc359b653d62a227c66b2f23716c97f53fb34ef5c
+DIST firefox-60.2.2esr-ar.xpi 547818 BLAKE2B 1f0e1645ad37b4f6b6a89b22d4af935ebb57edf73ee5b1e641dd03e12fe53a854d73ae8b9771d1a70e6b61870e1c0c70287428901587debed7e29afe41f376ab SHA512 e8748fe47580e41dd3f8f47a8d3d28a069b65f161340d4b183d60b3016c6822d559f7390c2b8eb09e9a83d005a93bdb7704997cbc5585d1bac97cf910ccf3077
+DIST firefox-60.2.2esr-as.xpi 530719 BLAKE2B 4f02b2671a8a8ebf65d8fcad68a706f9f607fc6d7eccfaed79eb7339c3a479b1476032478d2026ecd1815d9c783f4e11df09a2b2b4068942645051543c456ad3 SHA512 3ec556467464933c1060d3ec8e36189e205082d826f49c30f6e9d8c99049b7cea951cd9dcbbcff585a51c4badbf39495946310a01f4c35c9070cf2205f6ba157
+DIST firefox-60.2.2esr-ast.xpi 508650 BLAKE2B c0ca69499f4387ace206e214fc818f25f6a4bd3164ebeee4b3f092394141c82bfd80d454987c51287577b1b07ace82e23d6a19bd6830b62d260a7f239943f446 SHA512 08508a24513f51fed657904279aeb079bdb41484e4f8726b0bb096e53ca62a8e57aff82e7ca2484f521961ec107a600fb262307b5146de690021f1db7ccc3fe8
+DIST firefox-60.2.2esr-az.xpi 524745 BLAKE2B c952d62f4a40b572551ee07e9f4aded116ef28a27b94b112cff0f5a7440405b113a8a3c1755ba43291fc7e07810914d346aef303ba8fe563de25ba0d779a3269 SHA512 b94f5b8c53bd238776f5d7f3c8070541fa733e3bad7f8f3571707b5e74a004dfa797fb398f295d0b9198cf82b893313474ffa3beb276e9a5fdab9081949ba7f1
+DIST firefox-60.2.2esr-bg.xpi 573853 BLAKE2B 4272e4d2358ff2942f6ea7ef35ed2e38375df97de9c270959edeac4be26b6eaea25c49e162919a03a5744631ce331a9f919a2b0dfffae4882444c88e944c208a SHA512 274fd36bda8a851b60d3e060865336b01af76cc4f1b96b6398f7ba20c658e4632ade35c49c623abbddae518bbde6482f80bc4f035a776ec07587f38b98995370
+DIST firefox-60.2.2esr-bn-BD.xpi 590419 BLAKE2B f542129ffc5027a0ed30ef2f1cd06c0a736fee2d57533f70fb8e2bf373658f743d2872dbc5a612676a58adc0930f7e28551dd9585d86d8583f8caa257a9cdf1c SHA512 2bc208b71409b9238362ea894e4fa8c840d06720efb212145bc26431141cbf12ef1265f119ef9e01aa7f1edd42e362ab022c22c4fe7c883fe9cf676d06a96fda
+DIST firefox-60.2.2esr-bn-IN.xpi 570864 BLAKE2B eb5ff620b1da6785c7dda177567cd36aa7b9fcf927aa858a68a28e9ba3b7da48e233e165baa45709636bb28586ee4b42a9116f1758f588e2313c9b792d81607d SHA512 3c8c6bc67b20d81920740e50eaf3cc1e1de169321bad3cf4690a4466a95406b5fcdfb5bfa18902e224c05463f5a9e9e14ef18170b728875867cfeb644f4589ae
+DIST firefox-60.2.2esr-br.xpi 512027 BLAKE2B f1c14314b2c0958d72dfab2c885569fad6a1628e46d7daa4c01117c78340a650f45c4c63464d318b41ef5ba9fc7ae5683baf3924d67b5457564c8018affc7684 SHA512 b12a9d95f0751998ecee6c6f740bca5704c0a002b8845ba1508cc2e9fb7fd7f96a4122cb1745f7303832c2612a6d53c03c176e4a0660fe146b673025a6ac7e0b
+DIST firefox-60.2.2esr-bs.xpi 514715 BLAKE2B 4f9af6ca844cdc350a65e5765819335b1ef1220f6e390178bb672ae408ab8e1e847cd83978a666e52f9b98622f1b15e6b4dd9d06c38e7c23f671621bb07bb04a SHA512 6aab08b50e23e08a0fa4757aa882912ab0d72beed41fc1beda2f1fed2da151f4d886c77cab7fec4c19483af2b8c535fa5cada60b0eea651ed25d1248eb815f26
+DIST firefox-60.2.2esr-ca.xpi 525257 BLAKE2B 4033556092ad6d1ccb17a761f62ffd5363930fda364f4e16136e4527eba66bec84c50950fb08e3df946a091e0b4fb8952a5ff6ada2864801c3199eecaf1fbfc4 SHA512 c90dd9c3e7131c3a862b256c7e12ce9f87cdff8704ad7ad506f7e6a4b55abdcc6d11328348607b44af5b0bdd1dc95dcbd685effcdff3c05b85ea17c525751e8a
+DIST firefox-60.2.2esr-cs.xpi 531798 BLAKE2B 978cf3a8d7744b46e5d45fda8b2e64f782dabdde8f7885b3c23209a136a86ee1cb7886ecb0d10b82cbe7c1518a8cb44a5fa53b5b63811541caf20c15a9721e69 SHA512 3d9cf4c3658d3c12930c9f6f7257136ec6039d8dd5c836ead013c1298b80fe3ac2d228b407d91ac3ab2b08f8468d654442d47754e0eabb9ac8d2daa470075006
+DIST firefox-60.2.2esr-cy.xpi 516642 BLAKE2B d52a497f74071e222e7ca840e7cc00f7ce9bbb51e88589bc6274cb020e29d510d1e62ae25020e8540339e1bb887d303c64ec2ee6c0edb51ab4c46b52435336f5 SHA512 4dab0a446c263048ab0049b0c47bcccb0d0b013f60aea4eceddde6f1f74e74a37135cefe019a45dba9f7b17322ac49851ac2813c7351efa8f1bb528ccd9280be
+DIST firefox-60.2.2esr-da.xpi 510753 BLAKE2B 0bbf6ec9fff43bf8a4b72fc0f5d50604ddb9ed79e3e51a010bb64130f8b2f798e65cc58081bab85325d02941e6acd0138efef9faa1282939a2062bcbcc7c7efd SHA512 582694115b423660b2b188e2cfa8609e8aa2e1b7095f0d111751944976ca98d068a34ec52a4590e8ffe7fb68ef92f9dff60911e9a0ab1e5d3fb873263b391be8
+DIST firefox-60.2.2esr-de.xpi 526515 BLAKE2B cabb9558d950185f6e2ef61e4d444b7d4d32970d2ca6072e29d47fefe124222812f588119298e5ecec267004f8b0781e68ad2a0edc7f86d2d2ef32f9f7c666a4 SHA512 db828f5d57453b297ab411f281c6cc860ccd002157dcf861cf064facf89b000c140eea4f2e16b6c95bf589d231ff01eb9837c4a9fb11f71edaed2cd25fc24606
+DIST firefox-60.2.2esr-el.xpi 593691 BLAKE2B cd036f3f0416f72826131961877eee40cb560098392f13693b89aac08f7e80c3f93ac763ce33e55b5c9be076b034501649c84fd7a096b6c1cf1e8a31902c4af1 SHA512 bee9683a97114c8398ec962ee4f1eee58bb48c5fe677591415bcfbd1cd156f6d5283f366b9eb1d5b4d603bed4cc6f500616ea7850f807c55bd8350e7830b7999
+DIST firefox-60.2.2esr-en-GB.xpi 491694 BLAKE2B a51e0374dbaf356c99759fbe47ee1b9b05d08e2c9970e712ffdaf17fad3f4cb54fb03852fb5a810eb04a7cbf31d85376227514f903f48ec3c77c75c47660a19f SHA512 68b4f8ed5a155de5d296f51414d822335182bde0506c55d1b40adb46b5863c8f1c4f30566b715d261e997c0b83020e5b98b690cc73736b20ae35302222d1e21f
+DIST firefox-60.2.2esr-en-ZA.xpi 474679 BLAKE2B 2bebace02ad7a29532589d2031598db171780340001d4ff85cb322ebc0d4c2484085cbef4f8159f139e21905433827651d841d2def44b5a0b230e938a4aa0cf7 SHA512 89f1e74297b522d82ca709edf9b4db7059fa4c6c2661ac8e911a4522af1141beca5768eb3142053b045ca84f4b5cb02dd6d3d3066aa87f85d3ca3c8bdf8ee3e0
+DIST firefox-60.2.2esr-eo.xpi 511267 BLAKE2B 3ddc82f3882d32ec28fe45c9bed8f717ca5f79ec65bd26e37c33527cb471fc26ca282d90d8387e7a1d589f90289ce224321f753608b29abb75acb3b328952b4d SHA512 653c7607deb0d93ae20a3ca717889086e044d9db547a7f8ca8417b6f130880b4ae507d9d3edd00be93a4aa4afcef1f2660e10f6f0ad5705bb6bbe65f4cb0e6a8
+DIST firefox-60.2.2esr-es-AR.xpi 524650 BLAKE2B 6bed69f6e63cc55d97fc09127bd03c68da410500949b105c17adb54416ac4ff98c3977f107e546b21004be8c86ec1dbaf7390926e68ad879deaa65bb6c741474 SHA512 35e4a6e02058cb05f07d3b8b80865e093d6d78af8c75160289bac260ad0b4a7aba060c48c8242ac10905e36f86000822abb501438d2900ae0a714f19ebdc8ab3
+DIST firefox-60.2.2esr-es-CL.xpi 527320 BLAKE2B c8f9a35496831800fc1462e1714f29f78bb9f68ea69d9e215bf8efbd14f9bb100fe39a9dbe6b7e7b993dbf957024381e50dd2a9a65b294d5bd71a123ea830e8d SHA512 910abc2a339ecb9c95195b0dd2c3f2d1bf540e3c09241f58016559602871ed75a5c8c9404e2eb1eac72c99a481874802479f7aa968dbf4b058286a689883e228
+DIST firefox-60.2.2esr-es-ES.xpi 459958 BLAKE2B adff22340542af4ac47ead2a26eabd601620bde1087d4f80dff517b259904f2dd6c80491404176ec3f49769a0bbc77b65948a7d8cc538914bb3c47e722927ba9 SHA512 035212fc7f14a3efedb112a6cd4a3ecc77cd414eb2b056a37ab558d6f8fa3f6896a41f7a193b8bccb1d338f0baef7c1638ec34895bf8e34d74ac63f915c9d388
+DIST firefox-60.2.2esr-es-MX.xpi 528664 BLAKE2B 006ec7f57887c4b95a831e666c2f2960ac4853d31f05373cd4f3f499d7b820e776f5cfaff27b3202316eb005c9aace6bc9164a4bad4e9555f48c31cf8672b40a SHA512 43c39b80725f3c82908878260493c1c269230a53196d237604075e6a45b54d0764fbd6d049fa032f7a03c4902265ae38da0e9c1f8c9372fa8c4d873f24d82e27
+DIST firefox-60.2.2esr-et.xpi 504975 BLAKE2B 7927c499db43fbb58c1c5ce0811af6bd73359ae255144f09e76a3937b54a513b1f2221cb7107c7c868bc4f06d318b8d21f85ea805e1008c2a03554469f956b81 SHA512 7e2e41635e5b37b036f5f8205d98c077b698262b2a84284c165b5f9011b575af5b271570f91fa78997c256e2bfbe5bee091061bbf36710e21374548779e81c7e
+DIST firefox-60.2.2esr-eu.xpi 511710 BLAKE2B 5d421483f8fe8f952cf8bc1abe4331b6d929c61078660ec4b464b03a51010ae145d422b81dd671c19001e25f35726813a0e1c48013142f7c745f96f6d0453f77 SHA512 da8c25758c16f8d9c0161aa33e27b6e9f0481ff2bfbc7ee1d44da5800e18fe43225ec983a73793980559d53e40312399d98850943a9475994f0375a0b0d49966
+DIST firefox-60.2.2esr-fa.xpi 566262 BLAKE2B 25a67354c0a50272d8be4ce73f17f98b23f5b4dcd253b54f56da81ed263d809a211218ae1e7e967718b5f03b1e0e37f680bd257e9c0ea7a5b5be75844daa0637 SHA512 8de060ceb8fec5f5774dcf3822aa7614dc771db7907abddc56b7d55a998b7424978b8ad37b8307b8614307d3134279e11fb78093559347c431358c7e351c4edb
+DIST firefox-60.2.2esr-fi.xpi 506177 BLAKE2B 1121ce955b60a7e8ebaedbb5088f29ebbaf34c3d4337f5768493b883ee3d5565f559f071461a4ec58818997acc71a40f2d299bd866900b2586e0f7895edd1ad6 SHA512 656d84677627a38e8c4fe275d9f50aa6b702bedfad9a1668c2501a57d8e73a5315135a0fbeb78d41bf86bf15c1c85051d538ed7d50826dbcd6bbdd6c0a132d63
+DIST firefox-60.2.2esr-fr.xpi 536072 BLAKE2B 6132150464e929a8932423c3af286f4420352369fedc1ea227c92dc179c98235f7fb7354f5d911e5006a8ee9c1ec73d25dc4e8f9a0f92062e6e242073b883638 SHA512 18732efa9435225757ee42d72ffe52a63457ace9963f92f10ed16d1a4728f2b5d273bd1867c271ff3b6b74f4957ccf069ec1ae473011cb4ceb526b0a8f27c1ca
+DIST firefox-60.2.2esr-fy-NL.xpi 524520 BLAKE2B 118388ff5283d378cfc4584aa73a1ad83e768f255c0f653739dd3c5388b430413f069053a963076369c5e37c7f2166e4141b84a76bfa577b4305d1c301c661e7 SHA512 acd8ccd151f46c9df7a48b9ed27f2235411353f49027fa804dd87d92c9bcd641747d268e72848d282163d26100af17c8ca92fde70cc06e10e78a23c254c9cfe2
+DIST firefox-60.2.2esr-ga-IE.xpi 526986 BLAKE2B 6d5a9070e7c6ce303229b7a5fbc754593fd491468305713c3e29654c970a1a29a24baa3939c122c8a1791d6deea268e0310e11f8e9d0bf2e6e9ec2f8fe038339 SHA512 08b9c58fec687df3ba7e5d21542bcdceec7fef61e2d9af2e52bd4a79dfa4687bdc7f627d641da3acad893257ca5199a256bbf24491917330dc26d65ec8d4fae4
+DIST firefox-60.2.2esr-gd.xpi 520872 BLAKE2B 53af25e18039629b798edff6e4d2cbcd62380c561af0f0d99dca5c2caa979f8b5bffe94e57cddcb8bd11ccd3b01410a74c92afec6670f50fe0e642d1364f7f30 SHA512 128f1f6427fb1bbf7944560803981082e4a1b7ad023ef5a88612375201202f14da636294dd074de3c3250f569d2ac57c7462352a6d35f0a2bc98c3594fa679fe
+DIST firefox-60.2.2esr-gl.xpi 497371 BLAKE2B 6c99f56d2684ab6ba81356289fc664648cd370c2a8aa8c18831054ad65f5cbc1c8eef74130aa4d66a35a2f52de47c967f4e4b0ed342cff71319a14ccb88ca614 SHA512 c1ffad84b3c316cc3e7c80e13d5b8a6f4de2cdd012bd1eb17659adb8c8f355870baa9d9098899dbef4b44df40f644871fb12b5649823b1f62c9081cc00cca8c7
+DIST firefox-60.2.2esr-gu-IN.xpi 590266 BLAKE2B d35528b9cec4823a93b8de75f65357d3c92477ea850434f144083c8c4d54312ad0081944b5846ebbbf15b7453ebb66f4aa54eb4f0a53853e02466579c5fef99b SHA512 1952e6e48df6b12774d4fe489af2befe1be2302b6d8b66ff77015c2b327ebfefe32d2d7b77e47925d35da33acd6ea83769c02d0a039e719ecb92a1b9fbf01218
+DIST firefox-60.2.2esr-he.xpi 535979 BLAKE2B 6f97ff0c81ef500837cf1aea144eee374db7eeda06517171cd45e8944fcfded14df8778fa06ea609845102fab50cba457f624cca8c1e532816dce92bd02ef69b SHA512 a3011daf6e70eb93049f99f23c9202e4b8f14714fb01ec87b482fb243d1250baf573a8d769e6ff81c44eab9dc6b2ae712f984cced11b0c37c0f4bdc279b8c6b5
+DIST firefox-60.2.2esr-hi-IN.xpi 590870 BLAKE2B 2159373d4ff2ee878770b3779cf4ab900dac03c7310459c77ab5f8463d21f76b759fee78d6a1ba59256e3c49c3d96c82ee7d2bbfedd47d43e50d8a70e930923f SHA512 9cfa7a1ffba8aa18813bd98536462aded0f2e6d77721b933f6ab8924cdcaeb4f2998a0c86b742afd66fb26766250edecdcddd032ebeafe197c5305eaecaf0acf
+DIST firefox-60.2.2esr-hr.xpi 515960 BLAKE2B 94d89bff75d4d4c9ae2c1a0277285b47ab0c1c3d85f6f2485229f0ab3281622039ae4940c7a11c09dd4363d35bf8654e7aca4a2bc9ba94688cd4eb529ac47a11 SHA512 c2b7cd4f41e6f0f604e0be59dfcec25e39fa89d1753f53245d59a5f427b6ccc91333166e511437d4c23d7a1b7d6902391511caa4a2d0053d683e1a4a2845306b
+DIST firefox-60.2.2esr-hsb.xpi 537059 BLAKE2B 7bc112d977db006bb4c527dc35002fa1ec9f47b065ac9c5372382a5048b2c9edc6cf4914f8a1c42465d413a72089f9cafd6b2e6001065cf880a35832354c7b08 SHA512 41f08dfc6f0cc3ae1be34187d04c1cea5b12c8648b98af8f9ba63c944c75e61e9ddf8172bd514f00e403abd249bd8c4f2f89955426a7ef17ea95fbb5d4256a51
+DIST firefox-60.2.2esr-hu.xpi 538418 BLAKE2B 1c139cb48b3805a259bb120607ff098b77355f71a1c00512ba16849b7c58f236993dfc1faf82e63f649355998edcae60921722d668172f348288c219d86385b5 SHA512 29b00f4064001d829093a6d0570f69e3555c92f1d9a22d97d72d311da6b255c91f811ca436db3211e3f764db0512f225ba06591df4b766d469ce3dc614443bed
+DIST firefox-60.2.2esr-hy-AM.xpi 569415 BLAKE2B 29f5e0fbd7050d3e7a94f0923b9e8520e2e9ac48f6d5c1bf61d09d239f326d27731ddfa939c2ce78d921f0746917ed119f6cb6a4640feaaf35de4b6b6688650d SHA512 4912736ad06ea845ba6b7439176afa18b627527ab94ba66873a73b88884e8ad7af0e6cd0f22fd3ffb24d4c6d646fda0d51ad6581b0462c8657f218c12daf7ed1
+DIST firefox-60.2.2esr-id.xpi 502220 BLAKE2B f3f86a1f32e33095825f97effc4afeb12e6b3072739987e8614d7a7da5b715959ed63512092d40613621bbe1fe1a7f4d68c6f8d8108e44b1152fa715a3cd4039 SHA512 c5bf5527a10150db03588fdea0958cb3c332cbff730b9889f265e333ee652db1c12255242019a92d7f402e9252d62900228451c753fcbf391447e7a842f27632
+DIST firefox-60.2.2esr-is.xpi 513271 BLAKE2B 51d2f070e806afcc8b4d127d18e013214193a504d05a87ed32940df57afde6e1ecaa059928ad35cc9a02fb7065355306c1a69e50fe7e086c0f07eef6044e724c SHA512 b469007a2ae873dc483e4f62b2014cdaaa16e99b18112ccd8db338fb604e9291a0b87732b23cb94cd27ae291847195e99c3be5ef1f456fc402e8edc3c76a96e1
+DIST firefox-60.2.2esr-it.xpi 399096 BLAKE2B 7ee6d12d89c3f9e82427b23a8a8e20add5e68413222199f742333eabb64abfeb48e102e93ec38d260d37420ea6ec31437485845b6c2b4e4f17a89d04f9adc82e SHA512 62a4a45ed227757c4ffbceaef280976a9dc4f7cccbefc221705a2806a42d8f59a8c8d8a2d3cd45f12dcd0de103f2a3402549e4f376238566890ee65eb1d5ab47
+DIST firefox-60.2.2esr-ja.xpi 572015 BLAKE2B 2d01e5318bd27ed43373744e67d12a1c47f1dd377bb81e541c5eb7d3d952c1aa067caa397fc1d4fa3bc097c5096e63947fedfce4a85d8094c8ef1edcbe03e7ab SHA512 5b6e95abb652ed6ac143198646ef2214342d2c0686f4241aebf849ce1b419a40f62dbfb310d64ded325731f7e973ec00e1d61384e2cbcc5eeb2d510705e5bff7
+DIST firefox-60.2.2esr-kk.xpi 582980 BLAKE2B aebaa7e4eb0a4e6acd74ed3d892eee161d85ff62ea51218f0c2e61950f2c4247cfc3eee6b47097dd7674c73e3efc21d478cc11e5d9dbd56878825823a250c2a9 SHA512 b610071dbbaa7ac30b45022bd8a558f71451d0f2a72b8e2801ab3a57f40b524a41738197846c58955ccf4024bbe69adb4b506258e530f79da3c3470e9b93fb18
+DIST firefox-60.2.2esr-km.xpi 583116 BLAKE2B a9efe205c83486729f6bb642c64ac551c78755783cdcef57b213fea8dfc6f02348f180d5c1e1926748fe0f37bd673f8506263945a15b74b92984383fdc8c10da SHA512 2260342e18c9cf8dc33bd0622a249912d29d3466a960cca6f029e43436534919755a1b29de13725e73b1e0e9726719666eeb78293570542b12ffca5a42239c4c
+DIST firefox-60.2.2esr-kn.xpi 585873 BLAKE2B 72c0bef61647e1b770fe4677ef435140d4291d5a52d72e2cad904c004ce5657199aa6888ba9c477d02bff0dfea5d7491a23b43c0e3989b161bc076d842750ab1 SHA512 f55fbabcdcc0aa3269e33c0c7b03cb04cd1a26c54e78c8a29910d3108ed55ac1f9623f8fdb3b822fd586d5d798aa2d2306fe0d42a109360142e564b63869a9a8
+DIST firefox-60.2.2esr-ko.xpi 547826 BLAKE2B fd36278f959a63ac7904d2451cafaa3761a087beb955947eb4fc1b9061b4c68756a167cf9ecd5fbb1b6d891bdd7c2e0610ffd3754b0135ffce59c85adef746dc SHA512 6572453b84e57dcb8626b11a438e9b498400429fa60f3e63e4f40a10a4272a1fdc94798e3c6d4a7f58adc3ff0b442348e0da4b70e17002f5ee470e620d1d8c43
+DIST firefox-60.2.2esr-lt.xpi 536464 BLAKE2B 6fb621867cf88de1d81f04f50e0bccf663d4163b8ab25d6a1452a2927b119e0825ee61a747cad931d7857714f3a2deaaed9543d6755d353930be9c6f63fb7f2c SHA512 257be3fb41cba7e12b4de8a1118fa3a33db68aae8f176651649cb39c4ccdf8986022f744d23f3998cbe14ff1bb4ab60d83e516d287f181b496a58662af476792
+DIST firefox-60.2.2esr-lv.xpi 526414 BLAKE2B 381106227a612310cf2ec4e65b509d0324d4e367100739f2ce1073946acf7979703c2f749929614f5b5338328355f446eb16d4c3ddd2b2c70fbccc9db3c21bdf SHA512 42aa2caa1eae883abe3a40c9e07ff61bde7f4f9a7c51962697b23fa3504399d792e0739efd88fc51a4e5c579f877a8f665a0268ae44b5bed122a539c88de9bd7
+DIST firefox-60.2.2esr-mai.xpi 549256 BLAKE2B 637ef1886a4c75c4816e6d7d231dd09863f8231c1514ba26ba2b257519af19b26536ad518d04129c2c84f57f03aebcc5d96cfa35543c1d9ebc9a39e99ef98e90 SHA512 f4d3b747cf3fddf11b00e764550d4dc28b896c04b130d2a3bd5841588444d843e7d51ef47fce71d90c110417ee74c6a6bf5b3f00dcca738b3cc44c8bc2fa91ca
+DIST firefox-60.2.2esr-mk.xpi 513807 BLAKE2B b94dc767c3bd7b000655e7471907f08d52b2b8c7530e15d25e2091d611818c2b9b65b16aceacd8591dc298ee056cb40162f2ce91d35a26b8ca29d287be02a8af SHA512 df84f8b3bce96b7307d82efb53adbdae4682996b6145009e19e8928a619aef13869046558592909722ececa8819f10b28c7438ea83ed021db648cc0cbf9f8651
+DIST firefox-60.2.2esr-ml.xpi 598976 BLAKE2B 2215a66ecd8bf5d21f92f3596985a211dae9491f3af093c927884fc55d345a2a16d1660f7aee628b7f1189a3f729dca9d7fda2bfec4d22373e575a9f678269f5 SHA512 504880af6117e2a5717468618a530093668589fafb269e893256c6c739f956b08ee75e9da97222878b783384b7f972d51df2d515e71365788a17355bc789836d
+DIST firefox-60.2.2esr-mr.xpi 579120 BLAKE2B a5fe2a820617ae33d2757fc0828517b40a2641ef2af0637e78418d7807498f3a8f8d35bad796322db90b0d89f4d984f8b305034f32ebb2839d2196e4b21b717d SHA512 e7039205e325ce0a7de414672c0766a336f599a49e30decb949c5779e6ccd2a86732454d6a0d6a9bb413a8cfa4b5428d931d47867d049cdf1acce380287d1618
+DIST firefox-60.2.2esr-ms.xpi 509552 BLAKE2B d6f3da9fffd81157fc3003d03d466b268fad1210484d6fd4b8afe29af1a79e1ad42d9ab2cc200b52e996c18ea254bbbf6198c13b587bd78a1b77dc8d78e787f5 SHA512 f2595e52f56cd4cea214ee21bb08b8bccd3f10de54c21391fd4ee5c8a56ea0a175c51d9f5a67df8a1b1e33e291c754dc1e73be1fd443f7abea19aca9592fa8a0
+DIST firefox-60.2.2esr-nb-NO.xpi 509890 BLAKE2B f6e675b493d9accfd89c563e7cc0c0e0add6607add2a3fdb7253b94f0897946ee6d3d0a72de03c6d1f7bfb8efb885b2d034820d50797e5995190331062d915cb SHA512 c7498353385587ed73308482ba576df03377bc8e51053de0eff08fcc0690d5bd3eedc674f42cffb1cfb39b3442c8b676e97aa9795e093d25014ec60d76311bdd
+DIST firefox-60.2.2esr-nl.xpi 517459 BLAKE2B 1b8515023a169527e82361399b0eb70b87108301a4f3f97180cf1b469f580d8195bc5582c3b8194682fcf53b55e8f09e18a797cc00d9eb8a014c2f9bf3f1a9c0 SHA512 8d6d09a4a62b095ceebdf4190850482650e933d606b1709b123e7e7255127bf8784cd582f6c3be005a2f043c87d45730a4bbcedb4ef3eae8377d8687f6f8b6e5
+DIST firefox-60.2.2esr-nn-NO.xpi 511429 BLAKE2B a009d8a6398c5a8b717ca719f99e06a58846a93822e3c63417904e91915754d98b93c8a3405bdbf5d8b2516cf4df8d92e38b75bdaddb6eaea43b4e8390ed474e SHA512 4aada7b3118afea2cd99c3a9c21b6208a482c384b3ef11cdb3c1bee2ee3ac27b59719e601c97cd5324586236771e208b46ac4c1c2619523f1982e8b7daf7bf04
+DIST firefox-60.2.2esr-or.xpi 540863 BLAKE2B a0f52161d610cb87934161cfb225dda4ef2ee68f933adb775d7fdb78f377e61548e38fc380dab31a9fb6097b6bf0b24806778c1b2d26bb9f0f88a8ae40cd0438 SHA512 b95c0a064870fca58d09a9c7036297a4e1f1b60cd9f80cb2b0d333a3f96aa229d34f354f4fb9ce16c83c82653e2ec6ea9b0322f2c1cf88e492f324d8c92f8b39
+DIST firefox-60.2.2esr-pa-IN.xpi 557877 BLAKE2B 02a1a25df3afaf36a5a033cf675a3a2ea5eb690d871f4ee5ee325b9760d85f36f40541b54665365df07bea609d1820cbe98bbbf2c02c87b998174b305a5a56c3 SHA512 0b00529af679ebcbac41192b84c7c2d1addf298d7a2c563724ccf14eef464730be912214f3f25eea60c774ee4150200aa938223ba50922e017e760bc091a998a
+DIST firefox-60.2.2esr-pl.xpi 419023 BLAKE2B f173e5cb75277f509cdfc2b82011d4f6308097675fb25263f416ffdf83ef4e351f2b2983f9c4fa3e032e8e50812ac7f2e83cbf4d4c0efa7ea87ef5b52ef06649 SHA512 c74869a5150572eee28e78f3da2bc563953afef10a55c38ec560d5cdd9f52f57704166fc86b03255699fc1273bbef2f701f130744a57fd0ecd081b48bce9d850
+DIST firefox-60.2.2esr-pt-BR.xpi 514759 BLAKE2B 8d16aa88cb3785e59652ff6323215cfe7bf1d150496dbd2e4af7411e85b86ea8289a13d1f76dcbe7d88d6b3d5741638b3d108dbd9a6a00b454d74377997f4748 SHA512 997b3488eb34ff71546794961144d80b24cc7c7f80e40aa5aad61456457ba2446ac6948456bbe441a3f01d87019fc561fbbfcf3c8219c84e3509148d09422ca3
+DIST firefox-60.2.2esr-pt-PT.xpi 519361 BLAKE2B b5bb415fd5160603dbf6adc203d5dd9727ede8559fc80f64ed3d13a24ec76d7a9bc31c29fc3a8a4a1b7af87166219a26a3f0054e0e777f9ce0de5e197b26fb52 SHA512 68f933a0eb131adc3977f945bd0f8344ceaab67686e303bb21ba633c2161ea27af353f71a23b33bf7c01a29ad777260ce3b688c66a6a69e72c001f63a3b5f80a
+DIST firefox-60.2.2esr-rm.xpi 506037 BLAKE2B cdb27e8a315eb85726fc629d2f8d6647df7819b0028d10f5a1c4e9a951554cfc4f26a72ec479aaf8cb3ac47e09bd46b1c4deed582c00f68c39f055d2eaac1b00 SHA512 8245f6b2abad18e4c8c81ff95b5a23d9a38d18ad22470773b02ddbb10bbdfe373838d7ddc6977acf9769a7ceef555ac6b8f80d0585a4e35bdd1151d184e4e0fc
+DIST firefox-60.2.2esr-ro.xpi 514050 BLAKE2B 60a21a7656dbd9bbbd98f450b32752f3de2d805b29653d1bdb7a6f70ebf3e1b9fc40aeb6a66c61d42058557e1d07e90ce3f3d3a648befad601c03d691547f59c SHA512 76c9298e0460c7460f71bb3d1b050b906808f4377bf1eee7832ca90f88fa0ec255e5b77da3d62999942fad24aa8acd921e56d39892889ad1202d6e70db365d4d
+DIST firefox-60.2.2esr-ru.xpi 591397 BLAKE2B 3467f438dc6dd3dae7d3bc6e3c842f17dce48fc2253796c9c8aead4d6e24536ecd5c5695f00ebe3a4fd1d572bd13d02f7cad2f8e1b3534a9b9dfba03e1338611 SHA512 cc17e4d3d5f10b89ab47967ee5f11ae7ef72fd84b595d6d7c4faffe9862fb02ba3882affa86e681d3e8eeafcd37f5b30030907a32c6a5803027a9597f038b8db
+DIST firefox-60.2.2esr-si.xpi 545572 BLAKE2B b0ebdc71d56cca6ef7f3e8be9583005096c9041c2f02df37cbc5fb62475befb6f7c100fa798d107dd10c8b7558e650e2c405ee5d7f19d55a0aedcb992e2f4c77 SHA512 d37c7a61e56a7fb5cd97621b3be8f6eb52257c2ddf148eb9af5848b8278d245f78a20e11d05696f6bd6d2d5ee649e4daf06b9c894bb7a7d2b44625f3a7db69dc
+DIST firefox-60.2.2esr-sk.xpi 541702 BLAKE2B c517271494f8c267ee3565119dde72dc34e860f37c04eb064b5d1f4ff426dd0c14b7d9157e59f52b64ef4d4448c5f5659b6f06062fca0eb4594c337faa7189b0 SHA512 647243724d899ee070b67f570b7cf6b4f12fa34d86a7b4c847c6a9061892b68f9553e5b481c6ca08771462cdd5f342475f25146a6cd3916afd19bb5550eeaea1
+DIST firefox-60.2.2esr-sl.xpi 519378 BLAKE2B 8f352a867ba0e4cddc4512df33448af376477c6f4f75f4983e319f1d60311a5cfc3e5d4f858e8686c8bd7f73df1141f6084d0ed9257a18f54174d0786753864e SHA512 d50e02e2b94fe6cff6c06b80b58c892b7297bf5390bfeb92598aabfdafc9bfb181b410f3e39db4fb17676a6edab79bd4f6d12ec3c741c7d19670b4de4bde5407
+DIST firefox-60.2.2esr-son.xpi 497699 BLAKE2B 85baf0da0078c799a6f4acb95a79fc146522d727588ab046099e84c7f1e333ad9cf8a35367ab0984d60f9b7c49e37c9fdad8a7cc118451264a0ef7b7326051c2 SHA512 40dc45bdaa45d3be1328f8c40af6d6ca5a5cac03aa91c8c96e043bdee5e19aae97e45570bd4d36bf5731d87e827e94a95af3002c0c0b0b6248e4d522cd708963
+DIST firefox-60.2.2esr-sq.xpi 521266 BLAKE2B 30d8e156a5e00a33adf790f4504a5b71420b7366b1da96074823e3d59f9b7c579d89b9a45cfe7f8478cda0b4859de0f35378097a7eb20b25c25a34c9a71cdbdc SHA512 b212928722deba9b53f860a25686b5d1778d98ce3a43e0dd6f75f5d9c5a6f87a7f36f1c920ea9110b798cf4783307d324c6f200ea925e2106d860de2425730ae
+DIST firefox-60.2.2esr-sr.xpi 548771 BLAKE2B 635c9f8e2893f68b15976bbbff7b511c87150ba3c5e3f1577cd8c9567950dbd5805a12edd124ead44bbfe32afe9558d7567d3ac682acbf427047281f8ca8853d SHA512 9cdde47b8df9bacdbb25b8907739e5919cc997773f50b9dc0dce2d75a89ac62069828e1fb31eb520970ed8d517ec6896f13accb7c2ed611a6497f4ad92e82375
+DIST firefox-60.2.2esr-sv-SE.xpi 518661 BLAKE2B d0a3d7a86fdff6f11e236591b9927bdfba10f836e6a504f9390a662cf106fb2daff50216de865a0ca0cf0acba60a5c392fd4a0311552dde401d3c4c6abeed544 SHA512 855a23807f65a01bf9437dd3fe6558f4167ecb1aed5bcfdb4ae712cf6fa169621989188ab01ff2e7b4db20f9c922f39298f1f7e16a067600f7f14a6346ed065e
+DIST firefox-60.2.2esr-ta.xpi 577920 BLAKE2B 631e58b7abe7ab4e7cc5a0e8ab5bdea44702ed0fa3c83cd8eede05f858bbbe5e9159f011e8fba6ecf3c111b8c16f7b34cad5c060cda3c922d0391b77d3a69f53 SHA512 f62e11112eb261f9ccea2bb8c139b3b3e8bd07c4dd473dc3d0b995edee9d59750375c0d2541da1740e9e9efc305b7f365f6f9fe3c1b78bb0b11d41ffa1bc8b09
+DIST firefox-60.2.2esr-te.xpi 590956 BLAKE2B 487532722507d3a5d3a881b87223c7b14ba41796e97e27afa487872259d193881bc1105bfc33b95e64261341242ce57edb5c3ea8f29cac29adc4701590f82c52 SHA512 1e7d29805274074cbd8d4bc32e65b29ae2b8eeee1f24a9c2a9c794ec09f2a4825bbb078819ec065aeb55688613cfc3ecaad3a8bf7da0c43d31f863f84fa680e5
+DIST firefox-60.2.2esr-th.xpi 562814 BLAKE2B e430665bf824c10152b87219011972b1f5a0f7bb562139db001fe232e2efb89f78cce437ae25476c0e7b0b7fa6ee720e2c944dc03eb2c48f3cd2a03a20030a92 SHA512 9dbc18e5338176b631fb7487521df3de6116777ff405e36b1cd6aa4513f5a2b3e61cd59e41539a6342e81fd9165fe0a537ac8a65dd38083f1a220af25ce5ef89
+DIST firefox-60.2.2esr-tr.xpi 525852 BLAKE2B dd868efc371c136bd23997f48c80ecfdff7fc7d78175ee3b18b2d23a1970e1f77e4e9d88e5cf33b67bb0b096da74d85269d148d0a1f645b574954ae199f63e9c SHA512 f397ee33cf8c4b7dd67e67a0d52a5d9fc2783beccc7e38f9e0f7303a237fb31949c4e368d27eb9ae8a623f5fe5b3faa40653ffa4ab1067f5e0ab2c18142e539b
+DIST firefox-60.2.2esr-uk.xpi 580921 BLAKE2B c423a2d1707c91f4b89501b101f7e6289b41b57ad42185c08c87583eb69ec9d8f17a86290a80a6e483bdd97e15c5b68eecbff8ac1268a54fe2d52093f4dbb9e3 SHA512 db48969a713a92226aedb18623a59b4f4ac65b54d36abf267dff476744cc4b35c62e03e2c5a79ec16847df473f57fc1b4fd2252e36b3d0c79f2ab479f01ce0ec
+DIST firefox-60.2.2esr-uz.xpi 513689 BLAKE2B ad18cfd6d3be7a6ced237713b67ccef04340aed712a9bb7bfcb784cb7ef7d009756cfff5b7a4de04fb343edd01282855cbd8cada2447b4bad6d21e81c67d8c66 SHA512 9eb1c8bf583677d39b3de8985cf908363f775c1c84af88fcf3dceb6fa14517efcb84c21f12c6fa18e5ab641a8c2480f3a81e15bdeef9341e68bdb50878559c80
+DIST firefox-60.2.2esr-vi.xpi 528190 BLAKE2B 27026450542b4c642a4ca29a79ef933dab1011b41e915395b60a4e1975fb085665ee4fd8d03ddb7c97ea5ad5f6058628542ac380d574ca8044542820aa2eb12d SHA512 281fb799dda1ce4a03a7fc704af82f9856a23f1182e7c014107d1ff53e45a43ebc0d889472e8bc0b08dfeaeb9a16a78735c3cfa91399eae3f0c7ec3a20f59f64
+DIST firefox-60.2.2esr-xh.xpi 511856 BLAKE2B 70194a17a8ef8dc0bdb37ddcc829cfc7ad6603c850868223afcf20b640bdf85956db53f760427618381800095bb2a2ed65784f007f35cc18b20548c15bba6548 SHA512 2b5eb358b21b5119f7aa7a421cc1cfd6ba3ea311559a9869ae2ffd1965584296671d0ce5539c4190849ef197c2e81a347d610b7857128794c23f5b180185b566
+DIST firefox-60.2.2esr-zh-CN.xpi 543584 BLAKE2B 95b242cb974b96613a76808f414d0a63c9a4b57c9b752463d80c65b0869645823bfab8478e52e859783b48e9632ecd65843ec5703498f3efdcf00dca0f0a866b SHA512 9f111eaa621799c7aa37f8a0788296582bd60b8bdd424ced70785d12f8653d957be2ce35dcaea8ae3a7c4fa8a54124b36484572e3b354a0c7ce48da34f7d4e0b
+DIST firefox-60.2.2esr-zh-TW.xpi 541908 BLAKE2B af43fe323f6113b6d9cdda1b3a106559648fbd52751bcc28df15f7de1189a36e3dce1810e213f494922639b75c44e504e3fd3df06e26258affc92810929c96d9 SHA512 991aaaae66bac24e92cbd00314caf9a226cc1a5509e0cb812e8bd7f14d21d842ed8ec2435cab0c36c4a785b397c15f98c70d92c83790a1ef5a47a97ad01b5200
+DIST firefox-62.0.3-ach.xpi 446325 BLAKE2B b7722cf6f8a8de868fb9f283a7203d1c7d40690bb78b38f244c392714d7f232581d04c6e59f647135f8d315dca4ccd60c5340d1fa36671871eca6cb8e47445ea SHA512 eb79bec0b69b53cf1653d7498cc6a5701b1f898f89b90ae40a414201e460db5ed7141f0fb7032f5c212b1eafe2676a09b4954c5c4ce5857850c00ffc318cd019
+DIST firefox-62.0.3-af.xpi 432293 BLAKE2B 44780db3f4d9d6482dc48790620f128704d351bca138f0b1639c46e5840eb634d99406c5a64d924d6ef379297dfbd40eb8f06ab83cb18a317913d47b3d391f2f SHA512 8d16bf335c5ef120d72f1eb5a088860d0d25d3787f8e1099a40437658cb706d58aad64059bceea51aa958d64e1824227c43950ac6bca6e1df0cee4e60f809f2d
+DIST firefox-62.0.3-an.xpi 467499 BLAKE2B 7175b6470b157fa9a898d048c0b3c574a6ddd599c802adeb8c2d38bc473d58d521a9ccc7917824d3c56809d96da36e7b24cdba5229941e88f5dce475be9cbd07 SHA512 51d0cccdbc2f294fe9a4341c89f32ad3cd935afd84417f4f01f15090fc5834a3b386b9004ecb22db3a8abe83ea9c7b8b192f6106328b68b97df3dd4bae5d1385
+DIST firefox-62.0.3-ar.xpi 497996 BLAKE2B b164a06577240aaa09e8f37743606662178e5a506e3dd374800cb4b65f12710aaa83ef4d7d985f7a4a93c128c7263637bec6c825ef4baa6024f1a061f7192332 SHA512 c6c49171c78f311e000d8350885ccbbe9666666ceffc704840bbc598a70e7b39a597185194870545bc9abdc3f051ca47a64bfcfb14c129152c94cad873b40cc4
+DIST firefox-62.0.3-as.xpi 478315 BLAKE2B 49267e25a454feb4eaacd6785d385aa533525645029acf75ba8f4a3f82b1f71f272f1ba9a5687f1d2477b4eb4c754e4b857e5aa78026ec523028bd37fb2e3217 SHA512 4761ebbdbd908a29b3ce9509e1d5e1d3b10951bb78f4ad156d9e502580226e6d88ad5ccb70d4b689981afbe83ad95db047bd14c524897b9270636920e7558e2a
+DIST firefox-62.0.3-ast.xpi 455191 BLAKE2B a22f51f7573ceeaaea199f0ca760722e40066bc919a8c44b2e61312ba90c73514ff0fd587495a146ad60259e122eeef49c546e40b79f60e1cbcf07964e4e1559 SHA512 3d8c41c8f62926c09240fecda6c59a71ad58c2e6c25099b750fe3b9c7885a7eb4d2fc0cfaca6a1080b947b56df26e114299a99997e49730e369342cbc44726bd
+DIST firefox-62.0.3-az.xpi 477135 BLAKE2B 03293c53210257e89c5c905abcdbaee8331ed00b14862bdc5e7fdde8c230d8d7d335aed484defd0592bc0dde8e95589ec88ec5179a05b3598441cb6723c63eaa SHA512 40732afa8650e187efa769333dda574a1cc77dc8cd94c533e29029e8f919e0428dc23ff956bb8e39a2167489d54d05a888bc2e6642121c3d6c302b7e6539eda7
+DIST firefox-62.0.3-bg.xpi 524199 BLAKE2B 7cc8c0c88ef46001d36ceab58261b3758ebcf25800ca308a85086c78d5385737099bf436ea4d3d30e5973be4bcbf3207f57f94ac10234fe57f49a33b9c468b5a SHA512 ac6327f0956114596e79aaf145bba27813dab0a56689fd47e7fbb887942c1cc68f961a9094be83830b92ad4814ada2f91831ba409ac86c89f91700b0cbf3184d
+DIST firefox-62.0.3-bn-BD.xpi 538605 BLAKE2B 5b8e059dc4e610947bf1e9c143e87fb5c6f8efce0d59a7c59818fdb30a8cbe0b39599959f281dcb9123e05caf39854ff8c279c974df3f5f9d13c456192e32528 SHA512 3e0206b8ae2c0c9ef736646aa45b94d12d2f18f285cce826f4a3391fe8c8eee685a274cf67c335067880d1f4c95e41a124e1b8e8c5da582940e6ae86abd2388d
+DIST firefox-62.0.3-bn-IN.xpi 509953 BLAKE2B 2169e571fb1fbd17f88a9fe895ce564561a6a432874b0cbd2beb4feae4408928dc6c65bebee1dbfa7249e0780fcb2c2991dabf309177ca62e4d53a6c15a11ef4 SHA512 9c27baa07e824ae026cdf33ec702b47de29afd3cbbe6599706a8f13f1e2f1a73d6a42725bb511abac2164028f64e72d2b64fe11d18feb2790bdf9f77ce9024ec
+DIST firefox-62.0.3-br.xpi 464406 BLAKE2B 3e9f54745436eaa60ed872dcc0c0edeb40004ef1d3a3bede9c84b4e12bc479eeb04ec1c142d02f501f999a0bbbfd6f83436a46721e48f778a29f57853f6ab643 SHA512 f6b07034195faae1aa0d2413b7b4293fd948937d1439c5b9e76cbab00818aef898aae36d6f5023082232984fce7bfc0292e2a70f600e84d039246cecc2bf5e94
+DIST firefox-62.0.3-bs.xpi 466249 BLAKE2B abf2e1dca8cc0a4484ddd98a20e0325c622c627fe6f5519418c77d962562a6f9cbaec8d6cc4ce851b2ce27c6d9d59a490aae3c4f5728bafe4bed904233f4a571 SHA512 ebf626d49a3762da6fa1e3ea12073b2d3e02174a1cf2a4d1b5825a3ba05b9c2112adc8bd7997f058e46ba2d66655373c9ca7fd8b92b5f8700294a02a94538671
+DIST firefox-62.0.3-ca.xpi 470055 BLAKE2B 67af43041899cd1c8c127b5c75f6edba43f91a35ee2a9cd65142dab7dd5f8ac798090e04188854bec5d6ebcc7f3351a60e8d8d499b512f5bbabf372585c0ca88 SHA512 661ba8d03352fbae574c718076c3f5ad260a741c331e02bf2fb5e4add82c3ab8e61f3a441f40847272fd258537d6b36f7cd25bdd287bdb40d8d61ca37669feb5
+DIST firefox-62.0.3-cs.xpi 478354 BLAKE2B 22de5eb99ae94e741b6df4f085bc99024c7436998f4d959bada64d7fa90efc6077f8a16a8d4129ef5696b245bd9aa091e71aab2eb48f79ef17aacdf8e50858d4 SHA512 c82a959c0300ef01b7ef5001eb8c7adb65089200ed444cd7abdec62f00c9a12cbdbb209b29e828381c1c5768945d0d6d851ecb50d4b659d0715e62eec6a7508e
+DIST firefox-62.0.3-cy.xpi 468857 BLAKE2B 908235d7b594c7edf77eae004240ee26ef97199fe76bb3e8f37c38f0ca1aa97034c88bd615dbcc5e37b35a422cae83a568b04933f880b5314883b3520e7425d9 SHA512 3228f164fbebaf4272e2af778179a83751eb7ed5afcbefef739ad6a60da29e955117bc0456fd36c24b3036b3f95ce72bfe64ed131599e75925e6f9d78301007d
+DIST firefox-62.0.3-da.xpi 467290 BLAKE2B ad50b43550ba7714bee2fad72bfb0cfd4cae359c99dd92a94ed1715a57f500f24ee4513e9fac9599cf5865edbfaecfabe17b43ac82347d8da5ba57193979221e SHA512 8c9c48d3fb687bb5240f672968dec42f1b081592104dd921cf09102cccc06c4d662ed6032feace5d6d162544ad9021144f4efd1f52fe204a669fd199056a703a
+DIST firefox-62.0.3-de.xpi 475935 BLAKE2B 02d221c317406dd9f16c6b7a86d98589368c06ac1a411ead157cd3bbb22cca7e4157c1c6cb272b8f0f8f580453638fd0f457212a4c7284169a1d652a159bff1f SHA512 2f21533f5dc836a11d97db3856ae96e7725ea3d098e510a715eea8e5c572d7550d5be8afc733807641843d30ac4aa3442494d3d6205b837b7c8c7f7cacfc641a
+DIST firefox-62.0.3-el.xpi 546433 BLAKE2B a70227f90acf8826f72c6bd579ed497372d2cb391e2096ceece20aef830e5c5b58a704b40251baafc255e510ead78caf6451aba4ac8dfbc035acef2a05fa0949 SHA512 6e192e856cf370a49a16c2259d61bc22d9f2d681f56d49b72e68ec73ee72c0820eae95c82ded166c2b9d3ba73ed671b3d19089d26636e99c54184a6f97321279
+DIST firefox-62.0.3-en-GB.xpi 436177 BLAKE2B fb12520d027dfdf7681b4fb6b8ca9ca5314b52f31db8417c53d096fa27cf5f5cd8291e3e5cd72b4da31f05a17a2c80d157b0f01cbccec4b4fb26f4d73f761a92 SHA512 886333d113e94d63af08748ca0a599e8c2c05746de69297cfb30d020feed43bcbf5e4fa5327c940db5ecdddbc31738157c4b50b5ac57367f0096f106e99fa8e8
+DIST firefox-62.0.3-en-ZA.xpi 422871 BLAKE2B 0408a5edd61942b3613088b21871fb74c85490889d95623b25dd6bcc7e236b3f12f066677e0263a8ee02ed0f509c73ce047998d567c9f566661fdf2467903cba SHA512 40014af81a3bef8082e88102b84236514ecdc26bbf6a22a130beba5e5f12145492f557abacbdf072da695005ebc51de70bb8487cc777aa6c082b6ad1eb03639f
+DIST firefox-62.0.3-eo.xpi 466535 BLAKE2B fbaa93a513e1e464ca6a1f3c772fc17545a93e8458084bce869aae10a5befbcae5230ac515ce9dc6e5bd61fe253bc136e1491407fe2107d05e3c92fc38147ce5 SHA512 f7dbab432f6d48859115a46390681322f296d2a20daadd3d0a49def37194414b35d0b73f41485eb7636a43f27fee1a2b20e0d5b95ddcca582457b238ae2a63a4
+DIST firefox-62.0.3-es-AR.xpi 473522 BLAKE2B 783a8151664ebec02e9ee190ecb868f7e57a59ec5ea12c98f9cdea7ade8ab8ccbca2748222e5661dc272328363a2a150cc38fcf03f1d4ba0bf6bcd2051e5a86c SHA512 378477ff2b1d84653b8c0bb2483359b9ff7bd4fa7619aeaad18ab77286a82db647b4c41397557967599dc1b4a2f6560e49716b61aec16d7560e992197299926c
+DIST firefox-62.0.3-es-CL.xpi 473990 BLAKE2B 8d034ea71a81cf21f9441b8f00aa0056b62239441ff85f9dba0be23148b69b86333facdf01e7c92ae63e02388e86f2a591d03c4f6e83574305d446708d02fd72 SHA512 b64d123a9d7000320b98c563669d34a938de0ef9f9dfd2776348b1ed38b0f221e733d765473bc4fafd26f74e33db5adf73ed75985859d682595e48a1ac998908
+DIST firefox-62.0.3-es-ES.xpi 414987 BLAKE2B 45ef9e2a4baebc806b7380c33417ceadcedbd66311a1a1970a7a1e9d664880aaae89375cbb69ca466c7104b845ebddf8204a1a8c6f9aa5d702978f67a071a63c SHA512 9f8849f7977b245ae15e755315821b7487e988daf5bab3c4244df8643618fe5ebe10cfcc846d7b5783b55d4a2b283a15a9559cddb5aec7e49c7d83787207d08c
+DIST firefox-62.0.3-es-MX.xpi 477957 BLAKE2B 2edd11360258ffaff34f32c17847e7097a90d1e2a5fc0e888e029d641bd0ffe9f8539b56659287fd8a1b516459e80c829f953e95b124dfa28a556c4a6a1b12f7 SHA512 cbaf5b5dc4df636ce308cb1332a987eb44c1cc27673c5ad99c9bc66910bd896d503e92af867b6a3456956d3b70c997891283971190901dfcbb2bb7c48b4db43f
+DIST firefox-62.0.3-et.xpi 455377 BLAKE2B e5b98b9857319d673cac00c4195f76740b6cf1ca6b16fb7e7e22dede9ecc48aa4973d2b50bf9ff7742c7603861829c97db34fd9eb340507460693215757efb44 SHA512 6bdac58593cceb5e5f49a032482d7877857c67f2edd2c2da8fabdc80e7c2552a337cbc60bfe0439f062f901db8685e9f8b1c9e410d83dfbdae0fd9c0213b1a65
+DIST firefox-62.0.3-eu.xpi 465903 BLAKE2B abbccad102f65097b6a4e02dafadc6d75ec6ec83ea0b6cd8c3cef3b8cfedb9d0c3dd805bd37219dfbdc24eea1392d024a828db2992f67a7ca2c90bf87d373ddc SHA512 f54b3ab2508ef3638ee03c14575ca6f256c9c4310333577adb9a70198db4bd5b86feeac22c59e14cd2b750bbd6e7595b70317bbf2e597d3414a244c8988afab3
+DIST firefox-62.0.3-fa.xpi 514442 BLAKE2B d3b732e94b26f6816c86a31a2c680792f742ab5e99753b2fb049592e782d1e9c6273ed4de3c00825ae3afb6d593c51ae2b07b37d287125c445dc696cc0c4d9d6 SHA512 c1be98ab1590ea7000d0faef1f1ae8aafa2a7c925d8c621bc8085b433e8d957e8ee6689458683fa1ab6df38fd1329229cec41e474043a997e98273e2a00962e3
+DIST firefox-62.0.3-fi.xpi 458677 BLAKE2B 7bf0690ff1683e06da4ff0c73a00c2789ca2ed491e7cff8d87b91243a502fd022117c378f9a2a6e2348315c27d4f64a4079077ca9108ce6331ae78c9cabaf117 SHA512 788d2d14f82c0134e15b341a56179a08ebf0dd3b1702a1d337f3faf31864bb2d9354329816beb430215503b7c2ee857aae19b3f4c9be38c763e18bae631a7a31
+DIST firefox-62.0.3-fr.xpi 482968 BLAKE2B 87dbef7e69b52c3c020588d3aa48ee4593d49fbb37660e70d9a230ad47a425789a5bfc4a3e8fe162814b14b5f23be13edfc9c0dc5f6d53b31717796ad38e988c SHA512 7db0be65c7eeb944b3ac1c2ddd4937b8728cf8a2342cacf5caca95182543cc398ab41454557d33a5b8743d190a7e852729c08e0d175bdeaf504993507bde0e0d
+DIST firefox-62.0.3-fy-NL.xpi 470422 BLAKE2B bd1b2754fedc8bfbb4ec08d20a941d6541514bef6ed50c817df6a820a1d66cfc4918507b3d4211037f4fc7b17d4bd2bc2f265fa0892f889f990a145f3fc92fcb SHA512 693064c9a81bd7c4d0aabed393a5c4978dd2ea1306441360d6c6f7e1f8312a94c475587dd2feb9924161b121648d1a1f2238f24492956dad74b6d19730300c07
+DIST firefox-62.0.3-ga-IE.xpi 472265 BLAKE2B 762f7f156fb1b505238db03ddc67eedb50bb1f7f5151f3a9274556578634181c5e5fb74b81dec8ef478ef9847d1b7290c6a149869e537fca10a19fbdb18b454e SHA512 4259d128b05d9412903401c8e240c309c656a24de0820befffcd60a77c94e22fd971a3bd31ac358e298819292d9f22714298800ca9663a814b70a43c88ffeaa0
+DIST firefox-62.0.3-gd.xpi 473970 BLAKE2B 9dea50da0b160eba4ac776e729ab41cbfc4f4cca0de822b652931412e9c8a6c61f61b142c1f78d6d63bea37ad2a37369049d8d451d51caf7fbb7a918674372be SHA512 329137fb59779263dc9fa7612af864a42686e3a494c81a000d3b0442c6a2b57a98a07a2a234a8ebfaf1bc4e797f0fb680634f8c937448bfcb516e5932bbc408d
+DIST firefox-62.0.3-gl.xpi 451816 BLAKE2B 85ddc2a190a6c91bee4a5f002050da7b7ff1b50e1528061c48a6fd32941735b6c643830d9209b094f97ba9ab5979f69b75560e997eefabd2bf0835103389f89e SHA512 6a898a8f80deef54d48fb76a13d90ecd687e3ecd53acba3d18e492559ec63d624d06633b5876a7126a69d42eb18756bc282ce86a3ebbe27c892a680a3bb4a966
+DIST firefox-62.0.3-gu-IN.xpi 539984 BLAKE2B 2672357f8ddc919f3448c87ff54f7c72f9f1a864ef271004847628d4fc4657ee703c1d6f0d97f934d0f0b84b8fd520706a2af20d305301ff634dbe799ca8dad1 SHA512 329f5308c615899dcd5c92b950b6b0162e45997ee1f5914ca5d920f3ae5d312a71e9b377f8cce38c9eae30c47b3c0cd5c912b1b3856d6f599efd7de78cbad881
+DIST firefox-62.0.3-he.xpi 484809 BLAKE2B 269748c0caa7645127745feac2c3a6a822d7f0084a794f0822b1de09131517ccc401f1a4b693a2aba0778249466d2154c4e64d4792cf276bf6bfa12dded618a3 SHA512 74f7c9ea2b1e3677b2db72aa095a78c17243bb9890f0a01b2be349513295d33dabf421373e44cfb6ab34c42080476a06a53213e01dda71e8330dac40afbbe2df
+DIST firefox-62.0.3-hi-IN.xpi 537121 BLAKE2B 3278a50efd70819821e15eb2a523574f056bb74f745027bb6aea216177104d9dbff606c1b2b1cc6f5c3aa59d590b2855c6417ba4621189ec511ee103a59b5344 SHA512 71c9c0bf91d7ac4b9fa0ef194ec86e6fc130cf2cda42681bdc265c6ff22cd8813dad7576ab5000264b10346d6a6a33675dd92902e4ac15c9daf82899d8ba627c
+DIST firefox-62.0.3-hr.xpi 459608 BLAKE2B 4b57920171717ba7ef30ff439b9cc5b8fa92791b5a88dd0f09552106dda7a39a143e2245d96172c5ff49422ab59f9f455fe1fe0da715d69d6fca1d05d04e6b49 SHA512 9e04eb814287c12cb490b3766498568d8bffce135a2aabed161dc9636c006f4bc95f35c95d769c044e7bbe059c3a92c5b6b41cfea7073aaa8158b847ec57baaa
+DIST firefox-62.0.3-hsb.xpi 488120 BLAKE2B f0849da6180587679facde1e170397e2717034a8c008421b4c988f61e0bef2e6e989c35bcb92612396d0982d694a9f720e91e8b14d87d9794de7d6d4c7e5de17 SHA512 0a944b415ea14ccb98ef5376911fe36f64a7c72f4a76a53b00e8e3f1e7c6024db3799a0f97c5aa28bdcd43ec8bae5942cf5283fa96438a448b70447b7d72be1f
+DIST firefox-62.0.3-hu.xpi 487428 BLAKE2B f5d53e55e355d1f8e4028cd7db565a250470eaafe36242defb794d1bb8cca03c150cedb8401bbb33c0dd36c0c99361a799b242cd9c0300653f1961cf2edde3e5 SHA512 8dad4828e2f270d1f8381226c974c632ec58f603028a350558351234e97fffb690ca9b50a68e0f82c2bd92c0cd32b107233df3f00bfea5f92526f8298520a631
+DIST firefox-62.0.3-hy-AM.xpi 518019 BLAKE2B 03dc18856fa0df24655cabde57ce0fc582b14fb2b77d3c5a02bb91fa0ab6f27b12292f88e25a57aea43ca72de28fca51540c433b6cda02e3774b5896bc6caebd SHA512 f613672f5b2d5da34d6b32832adb10d4c8841cb54570972d84e3d02fb16d99af182d75105dcf181bdf3b6eb1b072bd4c90f1bf5e1f19e6f8031e2efa0ebed293
+DIST firefox-62.0.3-id.xpi 458276 BLAKE2B 3ff19c62df09b34f3956f07c590fcb0d42aca156197ea227db11fe8a3b7d46e16ab96e79a3d7dce1aac28039b1b4205d5869c26e09a391f6c911ef51356a25d6 SHA512 d0f46596583a2f92ad3921e11cac0c6d970f38c98e4015ad17973a674d9bc5d1617cf3fe4e91e65239de4ad6035702dca48157e843a3150bd141f7471e46f7c8
+DIST firefox-62.0.3-is.xpi 459617 BLAKE2B a8e3bdbb7db3499b809ca1f43f2b153e16e07fd22519c926338f4d8ba9ff0284eca90f32a71bb208c1313e85c3270fe4a31186343be396bd54749c1584b0e8e9 SHA512 1c946d4fe58958a7589fc55781c5b11cba5ed7133df723af688efca52aa53226a64d812bd6685b06117e8c15cfa1465a8ae569288323253259e079e25251983c
+DIST firefox-62.0.3-it.xpi 347139 BLAKE2B 192f9f280e3bb33072ed4b7a2153b7cfe9b6c01c5e9e0ecb5ad7698fab8ed6380dd8b8cc8a76ea64e15f1e6bdb01e62ebcd78fba7a892a3b8541799bc89fd06a SHA512 02c2f89e9e5cd595b825a2239517333c47063e90e19dfc4505bacd8fc5d09f79ff8511129568895360b917192db01a78cdc1a970cb74947215dd3df7b0a7882d
+DIST firefox-62.0.3-ja.xpi 504031 BLAKE2B 9d80d68643268438cf93c7b1d0a8ce0c68f19d5a57053cf39520bf9600ac8deb971a20e89edfcf1fd5da564b26ffc284694d0a2c80df10aa143c47ad162f0710 SHA512 58be82999b4c42b0ab786d67b5f4cc4e63be8c84f4df227e4b94026b1e5c62a1bb9c2046c29a895caf3c086222e70b2e11d664babd1f259983e34d99436d3cf9
+DIST firefox-62.0.3-kk.xpi 530654 BLAKE2B 147fc758e07a4f3b2b653e1fc12853273c954971e4e31bca639b109e182e860be4c754cd3c236dc6fbe40598e5dcd3bad9a3d1fd1c48c5259a31540294bcaf87 SHA512 54cf420717258954e219ce073fba3938ef959c7f4132bc621b0ef716d98e65c54345bdebce3f2584a5e6174fff44caa6c34550e8c8e4763e174626076470e15f
+DIST firefox-62.0.3-km.xpi 521445 BLAKE2B 3d62b7a3d3eba96f466c7ab6aa8aeb4de07201e046078f4d3dfcf216ee2c63c44f1c025db1941fb099218432964e5f4f2f078e8b7f325b494369c0bce28021ff SHA512 550670d9523b2a9d338586105081e5c150c2a0d2a9bd2c20ad670343760d28781c0fbb7bd56f3f88a9f9cf32f9e44279e7ad9c594a158769c631067db9d5ada1
+DIST firefox-62.0.3-kn.xpi 528103 BLAKE2B 60bfd6dd8a4cadd556a971dff5dc38b86e63e0ded9f2e884dad23f970daea299d2a07bc998d24dbb8ea8568d429d3ba681ba153d0155bfeb814559590dbf2cec SHA512 6398ebe1f32d927ad2c36487962f730efe8d1035c96b415218471975f5eadf379ccae5ea2bee8f694fd7b9164011b63ac12fd6647bdbb174415c27027ca4ebaa
+DIST firefox-62.0.3-ko.xpi 498342 BLAKE2B a1957b344169faab6d59366ff3eea2602d150ed71a1df918a64ee6f38541863b261bafaac491971dbf7435c11f9605d416b62abb28ede2b70141005ea1413e9a SHA512 65a3e637801588a77efd662cda3c0bbdb8de487e810f56d9323e0170623dc7da683cf517056784e0e839dc7908b2877e7ce8447d13842c7dde85620400703338
+DIST firefox-62.0.3-lt.xpi 487650 BLAKE2B 20f5db09e5a7d01be430a69b63d234ee6d1dca8f6652238d3f65c17e2554cb4c978f3a64b67ca60b9e436379d262699c468b69c3d0294e7d2e49713a6efdb959 SHA512 dab852b7209f64a55c734fefa0238b7daa08b155efb5ff95a88a347164a06f58d55f1bd049a516309a724627ffd4329b021d473d29350e323713e62138e68101
+DIST firefox-62.0.3-lv.xpi 475710 BLAKE2B 434c2ba0267f7ccb1e6bd8d2f2efcc0e94026400254bdea320954408c4bf2bd9dcdff1e93ad43f32335a04777b1c9f2e513fda678b713e10197f8ea142b82172 SHA512 a887f82cac85051e599e5f728c7de908cc003dd9f0f3fb9ad838496cdfbaefb4151b5dec5f727aaa517793c6613b6ab7d3e84c8620f5654606dd7e7887ceb7f2
+DIST firefox-62.0.3-mai.xpi 494726 BLAKE2B a85a1b071a206d2918327e8f293cfd5b57a9872563fd2eba9a7e2235dab2655a8b5d63061c10079deaf75c5e0d0bfec4d246459d6e620cd48b6c1024e54437c4 SHA512 24aff560e303268148680c046413e067e64118826fedc426eec5742afded0f287adee35d156f617cb5ce22706f444d487af37eb7add691b34fccd467ac34dae6
+DIST firefox-62.0.3-mk.xpi 457532 BLAKE2B 622fd27e39ccb70a8bca5ea0d0444ad935ae342424cbdcaa7bad5db32f4bc9d27839a2778127a6d1f60eaf6af76f2452cd253c2a3c571ecd593d7ce2e1467fec SHA512 32d03bebe02c7f85cbea47970d6ec1ed72792ccafb9ead5f7fe74fca4ed722320ecc30c95b73ddb4338f1b9eae391939ba6ca60fb507b42304f092e045f2641e
+DIST firefox-62.0.3-ml.xpi 538825 BLAKE2B 57cb6512a6e36c08695c2f284d83cc9ddbed49f217dffd2b05c1f85661d36686fd4853a3dea95cc31ede5857026638a4bff3d735b70a5546b150fbb81971c68f SHA512 dc43cbaaf9f40b8b1b526a0301341f7e84eb78eba06b3450dfacd4d914ea31af47de4aae16dfe7dcb0e2f5653b80cfca0e31707fa77c8b8c6da456481340417f
+DIST firefox-62.0.3-mr.xpi 530350 BLAKE2B db928dfc0dd2a00b6093f674ab6fa4069f29837edb292167374f9276128c3e0efc68176d9500de622317376add496f95fdddf9cf4ed8dc8eb91eb7aabf2c0d14 SHA512 7f6bae467a939ce3bcf2a7d0b6339a03dc34815dca87f13359f54e615142414125da896f348bd7e9cc20cbb21b714eb38393ffc7614afc624801c77025f91133
+DIST firefox-62.0.3-ms.xpi 459916 BLAKE2B d285c47cd1c56c74009570e2be8844c4295093554bf202b8fbfc11eb6c72d3132d8119a1368f4266e1e2b3d0937cd9c8af21fa4ad0b3fdeeca7b495367ac9055 SHA512 58f7a3560616b6c69a6d6826ab4ca9c4fcb15bf9333887a8858f47135bc2a0881fc375a2c8c821714867dfbf9be02e64be848428463c1a8d6e90ded7fe16ef6d
+DIST firefox-62.0.3-nb-NO.xpi 458931 BLAKE2B b9bbfa8952788ebdfb1d2470ed95754c3eb14715e0dd73318099acc66f3a7e720bcde6a651c01e4b9aae9edbddd2e7b9af6e193eb10f169d6517af23836ef3e9 SHA512 b282a8177051cf803c9924ba0501b06f97d3d82fe98a3074c7b0fd72dfb1d0f548f85abaaa75d3c0613d1393c388279c0848c2d62445270d42a71f401d9400ef
+DIST firefox-62.0.3-nl.xpi 459511 BLAKE2B abf24bc016d93a6e41019f8fba737736c497047abc36a1b77f7a005751663e0da86721f09f7addd629022793d23c5e3da8058e63daa974aba16032f037296ca9 SHA512 b30723296f2c3d5aeef86702fe3231ea6b712e03bae498d2f34e730ca210ea5c0177db5d745db687ac9452ae7c0e980119a4d9f0577613944953aee64101a656
+DIST firefox-62.0.3-nn-NO.xpi 457054 BLAKE2B 55c46965787bd4811ae019144379db44c63bf3e610645c9b79881b7985ac2d98bcce5d645763154bbec17a4301b4991c83e26819c27b29c932c0696393760878 SHA512 80a5d23058ee70f1950405b58f106cc389a2a22b19079cb7ec9ce0a9875b95888d745048d44989ce59bfbeda78b7f66052269d36597b37df29148f73daa2a046
+DIST firefox-62.0.3-or.xpi 485373 BLAKE2B b7646941c6ff48aadec2080b396f9683942aff763cdd211662c64ef60637cc5d21e497897e1220224aadc51715f5cb685d6e2a1916de2d6eba466aa37ae1ed93 SHA512 1a553762f5d24b0aa258ea65644c1bef6041ed32e8ed8ed2a51c03a894c7505ed27994aa91b8114daa3228371e7ebabc713c454ece497ed183de5b36e149317c
+DIST firefox-62.0.3-pa-IN.xpi 496915 BLAKE2B 16a3fe36573ccae0e433d0617c193678b11fc9f2ffdf424d04f616d86ee94343b6a12e8a834f8ccd003ddb47d406d80312108664ebb62c2825307583a9db1c16 SHA512 b963d6a0d961557fbe3d35c14a321240a4d57474302672a670f71847ef45440b7373eff4f6820e111329d39383425f97b329aebcc7f729a56eed4ce6de22c4f6
+DIST firefox-62.0.3-pl.xpi 370890 BLAKE2B f7a91525896804d3e67a257a399d9e51b403220ac017ab36f55bd695f82506de2d781f70ba2cf55136e8d4563740a32da3b7648a9fbef668f604b311b8831055 SHA512 ab9a5a034f47af378b68b9511bea7aa8233d21f2e37dc087c30944f52c81eec29f114bf5a54238ab686b805f7a85bc5f76449bd2b582a1b4097ff886def378a9
+DIST firefox-62.0.3-pt-BR.xpi 460872 BLAKE2B 9984103ca60aa26191282ecee0281c41b2d345e40be6eb20a493d0aa75df8a720e1a2e80bfad0bc550780cc5c2512d1a0a90fb0a7e60e96c8754ed317a5f1fbd SHA512 7aa346872cb29ff0be1f05c8653079e712ca6757532bbfdddc10714e8c519e3c7a1eee10b00579d70f8472d48d228e1abe0d4172cee76490177f80684c9843e4
+DIST firefox-62.0.3-pt-PT.xpi 473528 BLAKE2B ee93c1367bbcb55c2c8ef388282043156163bf5dd90e6362e142af03d6bde93334859d82659e30ab2381791d1753ae7674062cfbe01712f4d396525a78a39a8d SHA512 cf1f1036f05763269ff759c5967d53ff93a4b2da8d4f6980c78406e519b6957be3b94c71a70e9d0323019d4183accc29b81e47ab08221b8a75ae84297aee9778
+DIST firefox-62.0.3-rm.xpi 462474 BLAKE2B b093695ade461a541f9d4f60a9f09f6904691ab84767cf314853712fb0006f84ff53f42a49f8e0d04babbba018d77e89b0d6f11112fe01b035583d92136f6d5b SHA512 dd400340cd22a38d20d9fe70d2f8b1de98fea3f3e91116f50b801b8fabbb8c05f30a9771ab621da92c77b6dff54379b0b684d9390d6de92bbfab44de6ab67d87
+DIST firefox-62.0.3-ro.xpi 463410 BLAKE2B a3bce065ac2d0369c3d264f933af89b8e97ca73355cee0fff7957efdaa2fd753b1271b316ad746c1c27005fc5096b04fa408e9aaa96857a6579c205c7fd7efbf SHA512 6faae43f4c595a38162267769a6e95b72def73c76176bbf9deb412f513a285830fb9a3fd68b675e043986595934e81068ab2ab5ab135b544a90a528abc73307d
+DIST firefox-62.0.3-ru.xpi 539883 BLAKE2B 2b373c5cd08e34b435d476fdf24a5a62512433e8fa8081f543171b2c29fb09f683171fd2cb7b9a738b2ae88d18bc7933ea868bf4d38568dca0bcc7a8de690d29 SHA512 61070ab84255daf4fb15060fb8b449b2f72050b30a359865b73810a1fda04da0cbada58e9542f28487f4d5a61313895b22498f610ba9f208369ee87ea9933d56
+DIST firefox-62.0.3-si.xpi 487601 BLAKE2B 1c342c1744d1fdca0eda79f469cacd9f95c0261d5d1c918c530a97821f722035cb01297863bf320064fb6f2948149fe5c36a372583ef11f38b9686f1d5622b61 SHA512 0c8f9c2860bd85c4fd0648049d75dc789f2a3b813876383309c84789e5f5c457187923cea3143b9bdb5bb2e05e7aadd94e804063249d8b28d8d1d7d275a00ec0
+DIST firefox-62.0.3-sk.xpi 488135 BLAKE2B ebc75309a6c7f288a6b0ed90096cc086b94465110ba12f1a58e2474cd8e89f7a36b7fc8fac166970d27f91d04007f0b3d7af10c3c2653314da54462e142e29bd SHA512 7d7114ddc7ee74f97019be69844f978f5a54480aa7a14880ec9017cc0ba18f11b8a42f02f057b53fb8171aeef05116dada458650bdf286fc07ed1bfb358d1527
+DIST firefox-62.0.3-sl.xpi 468413 BLAKE2B 021dee74eaa217a2c8e5dd7a21b4b2b17a684bb9dfe175e9eb932ca717cd0d6fbac2fa63269ab8e45fb660a934b3502d33d0e120e4a41509013fee3ee8cc71d6 SHA512 884a543d205ff86abc6ad200a82d9585c5e174ea80e7c1f322567061f42c38002ca5b28f70e1fde398c0ed2df47b7fcf9bc70ca8c482a4cc2761efc312176fcb
+DIST firefox-62.0.3-son.xpi 445942 BLAKE2B de503bfbbe8d9b9e158c8c32d8bb497431142e44270f8b7afb3a3e82f48e80aecc8fdb35a45d71da18fd142df62a9a2d508732065afe95a47059cb1bec9f5d52 SHA512 5da14a162b64528560c55a2d046491cca79d9de928a16aa95bc3a805f7202e4714001a32452655f414badd392268dc17dd6ed4af8b843dd2d924e42c6742c687
+DIST firefox-62.0.3-sq.xpi 475527 BLAKE2B ff434796651224a3bca8bc8696b1b44d1cb85f8ccdd3b18ce37a570c02d99235d9b09bf5330e2ced15593b8e28fef462bffd953f44fdf31c4b2d37be7cc984ef SHA512 25959f4d2ab19bba10070f411eacbe0aad8d6da2e096451e8db3a92b100b37ac082b59b19b5796d81477ed21a021ba61675ffd2e529cefa029f9280b6a512293
+DIST firefox-62.0.3-sr.xpi 498808 BLAKE2B 2f5e8f9c975643085fe5e256baa28721c709f709515bab167f4914c5b8d7c9921228f51ae1594ff09d23e3604a831f3e3534b5a011ff33db5cd9f88c79000119 SHA512 89b3cdc133a26a63b476df2a1c06b0fe1bac8eac8f5a6e4921d626d7905053121c13189196790cd31a3e175126eaac868ceb49c317f1746888fc28e15fb5b4d5
+DIST firefox-62.0.3-sv-SE.xpi 469502 BLAKE2B fd316fcbdd579cfac3735396bb2247350d5eb72282b1c03ac2d2ded744b14dbca5b4f6f19d0fe75747e1efc8f8bf5419c1c8a9ed4935aa0d2b6275a1e8b9f13c SHA512 d0f08048ccffdbed2987908b9e22afb36bf42bee957ecfd23245316f6ce2dffdc20b05dce982999cf31014ede618d83bda7e04603d23db00d8cf92b6cb70cecd
+DIST firefox-62.0.3-ta.xpi 526475 BLAKE2B 8c5c8d1862d6123bb804101ee9b1b8763600caff7c9ccafa7151ce8d037f8c7e2f0a76a34344574fb56181a79fcfe15537df5b35d4244c9a62bd66c589eefb5d SHA512 56a655b014be8c7c1df9054fe1ef065a8250248b1178022f3bc76d2d72f68a397ada668622e681d89ee73db6e25d3bc131d0812d90e08da306dd968fc6b8b5b1
+DIST firefox-62.0.3-te.xpi 536779 BLAKE2B 59d12c2cddbf76f7f154cb86acc7db05b35c198711d6bb4058c0da1e7376a650226f8c940bdd176a2c14ad7fb553ccac8d1ae2a58a9bb9755441c9229bddc9a9 SHA512 21c380a6c2c75ec2280ff8f759fd6b7f37a70aecc21bb64e357a1704a88eae6dba44c22209d48f76dbb75d5f243aab4e420af0518c49a462339d5093bfb1d557
+DIST firefox-62.0.3-th.xpi 507128 BLAKE2B bc671a33153c23688562ce77c10e0f1be25ac4b632165d4ff4b919bbc208e74f4bcab3992c65913ac96fd91874dfdfb5483725a66836d5d65adad35217ef99af SHA512 8815ec800faecad51296220179cbcbc6906c781b2b986cbb7dfebc8624211bb1146de1c44090218f2df1ae0eda5a5039ad08432d913081067a0bcc12851d50db
+DIST firefox-62.0.3-tr.xpi 477275 BLAKE2B e25948064e0f8a4f1f8476fdacc96c3467631743c068c3b80ad30ed5c9503e64069ef073944a0285e59e56cab63759aebda3751cd115dd5c120626e26e52bf18 SHA512 371be3fa55a14f46960a2e4d0fb349908c2c9bb9347868e1475ae57d233b4cc0d033e4366993fa3c49306765fc6c86b45e9015f7f7b74751ee99006b1f922052
+DIST firefox-62.0.3-uk.xpi 532597 BLAKE2B 91c44cdb09bd1f61356de74c6f5525b032009f55f5d6faf3a62226d824c0268b7f348827801198a0d325640ac42f852980ced2d08d6c835ddc6f2f180b242f3a SHA512 4f7460f81a6dd5428b4af3325cc4139b13af7ceaf485998ff156d30a962ed90fc093235b245aaca6e6371ae867aaa4175bdfd5de66edd6778027865fea9ccf07
+DIST firefox-62.0.3-uz.xpi 457999 BLAKE2B d715d38da8741a8850a2c186bad4bf741e8eae8e023d14c8a209e71480a90a55803530417fc0179d2c135ad5fe22daecd389a97889cc2d1ecaed211f6eea08a1 SHA512 e465ea3ef0c38b644cef099bea7fdb5e410c877a9eec8d153c750bebee5aad3e41bf1d7a1cd12f08d6c3587f575bf5bf554babecc35b5fd7a186280ec65b5a0e
+DIST firefox-62.0.3-vi.xpi 478333 BLAKE2B 5c492017759cba46a69b209a9b95f130a4749f2f25f347fd803763200552ff53f6badbeba082444bd37a4c3d53dcf3404a71811390cc096a145d62376aaa89b6 SHA512 d560446571fa3767af03f4e857c26b7caa59307961e44baccc82647de9395187321b8ddb47f854dc054475aa90d874fb70b9cba3c3fbb925bdb5ad61f67a982c
+DIST firefox-62.0.3-xh.xpi 461205 BLAKE2B 38682f7f0fe4bb99b54c05b0e042e66bb4932d6c289483a322b4d2bf25364bc7b676855ad4a0c5d68828b26907302a0bd7f4abeb09c54ab03c574f3e73758e1c SHA512 1dd1b16e9dcb468306a34b3d8b60bd1b1ab0c942d82c185a9caa1d33da3f32fe479fe548970de0799556b89db370a9522cd76558f4d0e2b15573eef9a88da435
+DIST firefox-62.0.3-zh-CN.xpi 491488 BLAKE2B 0540afcf3de006d39b8065335a2470245da51b18402dc51a1d84f047f57d7c0ba12b4c8a0c55cdab33fa1b82d158844e4c9f0e7073f309a486842c29b8dd3574 SHA512 4b1fb095b0f120b40cb72922df2d96e95eace516c4f18d311cabdcf1654110d7d8be588b4949f0918117d5fb72a3b09eb263f09ddca676822745d19daedb25ec
+DIST firefox-62.0.3-zh-TW.xpi 494524 BLAKE2B 491437706ecf92a563e79735ea7ddd91d60b177cd34f754ed40f54f2a130c307f0ae4f62665fffd56efb00da4ead24ebfdcf926d079e6fbb863e89d26ba3dc3e SHA512 e3beb785228264299b777724b19d98ee5ff40916a6f7fccf96b95e7040ac491afb9ddb48ef484053908b58edc8874f43c055bbbeb6937d7b10b70fb8c40200c3
 DIST firefox-bin_i686-52.9.0.tar.bz2 58598632 BLAKE2B b9cde89261bcaa57841d2ff5e440c2fd86ce0011a1a6c4c6292abe51f2d479324a5e6c9f6a6a135c2811975ca850656cb35d922a169ea2604f3c13aa5aee4856 SHA512 f0f6b494eed4f84eb013065ed1a586efb03b50441023fea866306fbb65de3e7ebe5ff572575d868c17e3ca11958d90b1d6a8cffda0babfa8432e4bd3f19eda15
-DIST firefox-bin_i686-60.2.1.tar.bz2 55528121 BLAKE2B 55aa0a44418f6b31477d1988fe2494f331485990f5c3ccb5e95c2d0e83c84320d61c1361033b300061033526e909f64afbd2456235776cfbc09107aec989af18 SHA512 e491034146f28097c31c5863ba6df3e0eb18725546345dea546bce0323b0e5336a34761dedcc3b5ad8bafa73501e55706dadf2f1379724d6380911db9e7824b0
-DIST firefox-bin_i686-62.0.2.tar.bz2 55860779 BLAKE2B 6656d09de673f6c795230db3f0dab38e5ad4804fb5e38e7669dfde666ec05a2dd194cfe74701ae312e8f45015d26957ba9818dac106e85c4fa6eee2d33225041 SHA512 bdb45cca1c207502ae5f76fe10e4b73d3f7e6079913bc9a6216e9325b8c70fac37d14e32b4e5ef6acadd73c301c3ca1aa2d72a5d44acc0b6cb0c22b481de2e46
+DIST firefox-bin_i686-60.2.2.tar.bz2 55443888 BLAKE2B 2d2ba6499ed95136cf15ab38ff5482f5f232610f1ed595a1bea1f0121a68338cd06401399ff558b9067b7e8440d6fd10ba3ba0141c1adc5c99b526c9c9ec570c SHA512 7a0b61b436381108164751f7984e499bb07024231a7d825e0d6f1d511585d18daf0875b3228332dd1f77e7459d0d612e6d9dc0a1f3af7f5ad447930a2178b5f2
+DIST firefox-bin_i686-62.0.3.tar.bz2 55847605 BLAKE2B e9b623a9f05f1f107a870e883996e35067b95bb4278beece6e484a2f68048949b38a1acc11d0142022bb747fa8154411672ea1f892c6dfdbc6f804098fe4e4b3 SHA512 08e3ca5f859a531b2895a5442734112de9c450bc8bdc2eea9a8fe3231f3b97b8a243cfb408311c56c1703dce63fc2f5201026719fa01b9c76061a204d59942d4
 DIST firefox-bin_x86_64-52.9.0.tar.bz2 57795546 BLAKE2B d767749ed07a0d54da8acf0273c59d9a4d7f46491aab34b7995ce76fe43366c06b859dd2ea1d8566861e1086e73aa30df28ff4d9dd634c1948868fad7643ce6a SHA512 b5d7da00766354e72f5a48f4f2143623428256d79d0b3e958ed6764b680afdf2b3188c61b09a02dd1537c8b8d3ddd1a1b828b1cc13a16df02a52538a42c62954
-DIST firefox-bin_x86_64-60.2.1.tar.bz2 53373175 BLAKE2B 2dceb482e2542164a75d372838ab161b36f250fd494321376a451dcb48043fe0dfdb32687acd89a2d09ae0d0dd556a1a17842d73dea0b4260bfbb1a444aa3aa6 SHA512 f3eff0b1f7a2862dfd86f6c74dd91b20aa00d5aaedbc0ecd1c90fe85537a25a2ec6dd42c71c9de3ac3fb1175a58e9b686ca5d371f8c20cae010b26af18e8d3fb
-DIST firefox-bin_x86_64-62.0.2.tar.bz2 53695099 BLAKE2B 84c063af48d6e326655a2e5d50c889ad4ce44c723bd5a463111d5842d8350ff46c18b46b46cbc69b8e701f960ad3f79d477d70b00c52baffa262324916c6b837 SHA512 f19a938af6bfe6499bb4e4337ece1cc0918fe56b361ced0f131f010652b2849d98e48a7cd06277580cc87843454c7bdfe816b65c99189e1ba749aaa64059a6ef
+DIST firefox-bin_x86_64-60.2.2.tar.bz2 53261895 BLAKE2B 8856247ba921b31d1b667def101efec1df256f7751b18383a406532c441af3c0f1b372ccc5d46ff95bd5440773b72ea58c1b753b574cb7d20321097db2653c08 SHA512 657809556651dfd9f383a0cf54febeb7511b1e3c3375d86b247e5669c4d00bc213ace0a607374d02a79c7ffe2749a62d8e629de1f1f9f0d48b39e0bfeab99965
+DIST firefox-bin_x86_64-62.0.3.tar.bz2 53845007 BLAKE2B a5a6b0f3cc52843e1670971ebdb0fd29f41dfd244c148278ca2656357b0f62581249c6423e6f9c48085608bbcdc16e66fc7e928b97408d9ec9a6d2d1fb94f3c6 SHA512 577cdf1e1c4845e0b22c174833b0e20375443121e429a57d16f1f0e3af86533a6c27d35d8451ab25b3f7ba10ee9385d0f497866b50d4f37a81f9663137aa3395
 EBUILD firefox-bin-52.9.0.ebuild 5498 BLAKE2B b41af46ad84a043be3957ea1032fe35b38b7f5f03f966e4723e6e33f7a87f706da13e19cf05d3d5cff775e5dffd5817702b88d6b3361b2fef34b0daf3d06eb7e SHA512 47254987ef534c0ff7b1514334c26fe7636efe60a1a4735beb111242fc393664eff9a05e45975d6b6d7db3e8b3da68f2d886fc58b253f4e0640edc4c0e03c30b
-EBUILD firefox-bin-60.2.1.ebuild 5414 BLAKE2B 217e0b2c093135888785e440fb6b3fc592543c1a233bc5acd46daf6d4459de5afc18826ea888c50df9caee6c0bedae6d651d944850c9f2852aec27f04835bf1b SHA512 e6dcacfe4a9218e62e5641489e8c4c4de91b417a82d1165fffc2072e0d01385df46d4d96107bc36aab544dc899c9e9ad54c16b22cd7860cad4adc2909876f3d6
-EBUILD firefox-bin-62.0.2.ebuild 5414 BLAKE2B edabeb3c6bbbf0729b731e8c3e64c3c917140da40aba840639e2c0740da4f1f40c9064e829954ed64e8bf7c743cf92beb4b2339e4558945e16c889a41e90cfcf SHA512 f13732f938db65306b13c3c6ab24aaf0dfef819a8c99c3a0240c54ad473e336e8967ffcf73849f70a465433eb3c0e8e4a089cc89e81387cb23efc4ce381b0207
+EBUILD firefox-bin-60.2.2.ebuild 5411 BLAKE2B 7442e6e95ba8da38bd6393d2f6c04873774c20024a5055957ca5631bf1ad91765226d36f11463b95c5af34e0a2a65f5dd76ca18acfcf2ccccde3ad32d9a61225 SHA512 82e60ed9b91323b30898883cfea49d989b17962f065cdfc5fd7833868be934eeccec60eadc335f7a373dbe3b07d9a9d0df1b9f3b746c1857f64c88db5c223144
+EBUILD firefox-bin-62.0.3.ebuild 5411 BLAKE2B 08ae52db9c43fa24d33e93b1734a08c1f7c7c1640cb42b8d393fa93a2927daa08aadd2acacafac892c956806f0b23c1f8292486017a972d6b25613c5470a5b84 SHA512 f266ffac5c111b23226823dc0f125bebb8c2ebb9c65550948aed7330dfe46059d53eb8a349762ca88c9c709915d193076838c7e3bdc5a9144b6b9d2dd5362c33
 MISC metadata.xml 587 BLAKE2B f38f7c9fffdc422e11b9fd2d8aa2f9c4cab6b91cb5616a3fc324038bfdf720bcce97a80a22b012e61d3d466ac5569f76a29512ac8e7e209efea1bf6d3dce05b4 SHA512 c74cebdc88753d406ab9edd9b51f7dcb17dc1ce5eebc3d6d674d2e54d9af1619147e07a110629a5df003a0c506002e470563d36521a1708c40a10221a26c421f
diff --git a/www-client/firefox-bin/firefox-bin-60.2.1.ebuild b/www-client/firefox-bin/firefox-bin-60.2.1.ebuild
deleted file mode 100644
index e20a615230e3..000000000000
--- a/www-client/firefox-bin/firefox-bin-60.2.1.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-MOZ_ESR=1
-
-# Can be updated using scripts/get_langs.sh from mozilla overlay
-# Missing when bumped : be
-MOZ_LANGS=( ach af an ar as ast az bg bn-BD bn-IN br bs ca cs cy da de
-el en en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL
-ga-IE gd gl gu-IN he hi-IN hr hsb hu hy-AM id is it ja kk km kn ko lt
-lv mai mk ml mr ms nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl
-son sq sr sv-SE ta te th tr uk uz vi xh zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_beta/b}" # Handle beta for SRC_URI
-MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
-MOZ_PN="${PN/-bin}"
-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/mozilla.org/${MOZ_PN}/releases/"
-
-inherit eutils pax-utils xdg-utils gnome2-utils mozlinguas-v2 nsplugins
-
-DESCRIPTION="Firefox Web Browser"
-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 )"
-HOMEPAGE="https://www.mozilla.org/en-US/firefox/"
-RESTRICT="strip mirror"
-
-KEYWORDS="-* amd64 x86"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+ffmpeg +pulseaudio selinux startup-notification"
-
-DEPEND="app-arch/unzip"
-RDEPEND="dev-libs/atk
-	>=sys-apps/dbus-0.60
-	>=dev-libs/dbus-glib-0.72
-	>=dev-libs/glib-2.26:2
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	>=x11-libs/cairo-1.10[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/gtk+-2.18:2
-	>=x11-libs/gtk+-3.4.0:3
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXt
-	>=x11-libs/pango-1.22.0
-	virtual/freedesktop-icon-theme
-	pulseaudio? ( !<media-sound/apulse-0.1.9
-		|| ( media-sound/pulseaudio media-sound/apulse ) )
-	ffmpeg? ( media-video/ffmpeg )
-	selinux? ( sec-policy/selinux-mozilla )
-"
-
-QA_PREBUILT="
-	opt/${MOZ_PN}/*.so
-	opt/${MOZ_PN}/${MOZ_PN}
-	opt/${MOZ_PN}/${PN}
-	opt/${MOZ_PN}/crashreporter
-	opt/${MOZ_PN}/webapprt-stub
-	opt/${MOZ_PN}/plugin-container
-	opt/${MOZ_PN}/mozilla-xremote-client
-	opt/${MOZ_PN}/updater
-	opt/${MOZ_PN}/minidump-analyzer
-	opt/${MOZ_PN}/pingsender
-"
-
-S="${WORKDIR}/${MOZ_PN}"
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME=/opt/${MOZ_PN}
-
-	local size sizes icon_path icon name
-	sizes="16 32 48 128"
-	icon_path="${S}/browser/chrome/icons/default"
-	icon="${PN}"
-	name="Mozilla Firefox"
-
-	# 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" || die
-	done
-	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${S}"/browser/chrome/icons/default/default48.png ${PN}.png
-	domenu "${FILESDIR}"/${PN}.desktop
-	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
-		"${ED}usr/share/applications/${PN}.desktop" || die
-
-	# Add StartupNotify=true bug 237317
-	if use startup-notification; then
-		echo "StartupNotify=true" >> "${ED}"usr/share/applications/${PN}.desktop
-	fi
-
-	# Install firefox in /opt
-	dodir ${MOZILLA_FIVE_HOME%/*}
-	mv "${S}" "${ED}"${MOZILLA_FIVE_HOME} || die
-
-	# Fix prefs that make no sense for a system-wide install
-	insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
-	doins "${FILESDIR}"/local-settings.js
-	insinto ${MOZILLA_FIVE_HOME}
-	newins "${FILESDIR}"/all-gentoo-1.js all-gentoo.js
-
-	# Install language packs
-	MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install
-
-	local LANG=${LINGUAS%% *}
-	if [[ -n ${LANG} && ${LANG} != "en" ]]; then
-		elog "Setting default locale to ${LANG}"
-		echo "pref(\"intl.locale.requested\", \"${LANG}\");" \
-			>> "${ED}${MOZILLA_FIVE_HOME}"/defaults/pref/${PN}-prefs.js || \
-			die "sed failed to change locale"
-	fi
-
-	# Create /usr/bin/firefox-bin
-	dodir /usr/bin/
-	local apulselib=$(usex pulseaudio "/usr/$(get_libdir)/apulse:" "")
-	cat <<-EOF >"${ED}"usr/bin/${PN}
-	#!/bin/sh
-	unset LD_PRELOAD
-	LD_LIBRARY_PATH="${apulselib}/opt/firefox/" \\
-	GTK_PATH=/usr/$(get_libdir)/gtk-3.0/ \\
-	exec /opt/${MOZ_PN}/${MOZ_PN} "\$@"
-	EOF
-	fperms 0755 /usr/bin/${PN}
-
-	# revdep-rebuild entry
-	insinto /etc/revdep-rebuild
-	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10${PN}
-	doins "${T}"/10${PN} || die
-
-	# Plugins dir, still used for flash
-	share_plugins_dir
-
-	# Required in order to use plugins and even run firefox on hardened.
-	pax-mark mr "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
-		|| ! has_version 'net-misc/curl'; then
-		einfo
-		einfo "For using the crashreporter, you need gnome-base/gconf,"
-		einfo "gnome-base/orbit and net-misc/curl emerged."
-		einfo
-	fi
-	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"
-
-	# Update mimedb for the new .desktop file
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/www-client/firefox-bin/firefox-bin-60.2.2.ebuild b/www-client/firefox-bin/firefox-bin-60.2.2.ebuild
new file mode 100644
index 000000000000..af452de7b79d
--- /dev/null
+++ b/www-client/firefox-bin/firefox-bin-60.2.2.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+MOZ_ESR=1
+
+# Can be updated using scripts/get_langs.sh from mozilla overlay
+# Missing when bumped : be
+MOZ_LANGS=( ach af an ar as ast az bg bn-BD bn-IN br bs ca cs cy da de
+el en en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL
+ga-IE gd gl gu-IN he hi-IN hr hsb hu hy-AM id is it ja kk km kn ko lt
+lv mai mk ml mr ms nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl
+son sq sr sv-SE ta te th tr uk uz vi xh zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_beta/b}" # Handle beta for SRC_URI
+MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
+MOZ_PN="${PN/-bin}"
+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/mozilla.org/${MOZ_PN}/releases/"
+
+inherit eutils pax-utils xdg-utils gnome2-utils mozlinguas-v2 nsplugins
+
+DESCRIPTION="Firefox Web Browser"
+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 )"
+HOMEPAGE="https://www.mozilla.org/en-US/firefox/"
+RESTRICT="strip mirror"
+
+KEYWORDS="-* amd64 x86"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+ffmpeg +pulseaudio selinux startup-notification"
+
+DEPEND="app-arch/unzip"
+RDEPEND="dev-libs/atk
+	>=sys-apps/dbus-0.60
+	>=dev-libs/dbus-glib-0.72
+	>=dev-libs/glib-2.26:2
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.4.0:3
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/pango-1.22.0
+	virtual/freedesktop-icon-theme
+	pulseaudio? ( !<media-sound/apulse-0.1.9
+		|| ( media-sound/pulseaudio media-sound/apulse ) )
+	ffmpeg? ( media-video/ffmpeg )
+	selinux? ( sec-policy/selinux-mozilla )
+"
+
+QA_PREBUILT="
+	opt/${MOZ_PN}/*.so
+	opt/${MOZ_PN}/${MOZ_PN}
+	opt/${MOZ_PN}/${PN}
+	opt/${MOZ_PN}/crashreporter
+	opt/${MOZ_PN}/webapprt-stub
+	opt/${MOZ_PN}/plugin-container
+	opt/${MOZ_PN}/mozilla-xremote-client
+	opt/${MOZ_PN}/updater
+	opt/${MOZ_PN}/minidump-analyzer
+	opt/${MOZ_PN}/pingsender
+"
+
+S="${WORKDIR}/${MOZ_PN}"
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME=/opt/${MOZ_PN}
+
+	local size sizes icon_path icon name
+	sizes="16 32 48 128"
+	icon_path="${S}/browser/chrome/icons/default"
+	icon="${PN}"
+	name="Mozilla Firefox"
+
+	# 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" || die
+	done
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${S}"/browser/chrome/icons/default/default48.png ${PN}.png
+	domenu "${FILESDIR}"/${PN}.desktop
+	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
+		"${ED}usr/share/applications/${PN}.desktop" || die
+
+	# Add StartupNotify=true bug 237317
+	if use startup-notification; then
+		echo "StartupNotify=true" >> "${ED}"usr/share/applications/${PN}.desktop
+	fi
+
+	# Install firefox in /opt
+	dodir ${MOZILLA_FIVE_HOME%/*}
+	mv "${S}" "${ED}"${MOZILLA_FIVE_HOME} || die
+
+	# Fix prefs that make no sense for a system-wide install
+	insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
+	doins "${FILESDIR}"/local-settings.js
+	insinto ${MOZILLA_FIVE_HOME}
+	newins "${FILESDIR}"/all-gentoo-1.js all-gentoo.js
+
+	# Install language packs
+	MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install
+
+	local LANG=${LINGUAS%% *}
+	if [[ -n ${LANG} && ${LANG} != "en" ]]; then
+		elog "Setting default locale to ${LANG}"
+		echo "pref(\"intl.locale.requested\", \"${LANG}\");" \
+			>> "${ED}${MOZILLA_FIVE_HOME}"/defaults/pref/${PN}-prefs.js || \
+			die "sed failed to change locale"
+	fi
+
+	# Create /usr/bin/firefox-bin
+	dodir /usr/bin/
+	local apulselib=$(usex pulseaudio "/usr/$(get_libdir)/apulse:" "")
+	cat <<-EOF >"${ED}"usr/bin/${PN}
+	#!/bin/sh
+	unset LD_PRELOAD
+	LD_LIBRARY_PATH="${apulselib}/opt/firefox/" \\
+	GTK_PATH=/usr/$(get_libdir)/gtk-3.0/ \\
+	exec /opt/${MOZ_PN}/${MOZ_PN} "\$@"
+	EOF
+	fperms 0755 /usr/bin/${PN}
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10${PN}
+	doins "${T}"/10${PN} || die
+
+	# Plugins dir, still used for flash
+	share_plugins_dir
+
+	# Required in order to use plugins and even run firefox on hardened.
+	pax-mark mr "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
+		|| ! has_version 'net-misc/curl'; then
+		einfo
+		einfo "For using the crashreporter, you need gnome-base/gconf,"
+		einfo "gnome-base/orbit and net-misc/curl emerged."
+		einfo
+	fi
+	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"
+
+	# Update mimedb for the new .desktop file
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/www-client/firefox-bin/firefox-bin-62.0.2.ebuild b/www-client/firefox-bin/firefox-bin-62.0.2.ebuild
deleted file mode 100644
index 9fd612e00c0a..000000000000
--- a/www-client/firefox-bin/firefox-bin-62.0.2.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-MOZ_ESR=0
-
-# Can be updated using scripts/get_langs.sh from mozilla overlay
-# Missing when bumped : be
-MOZ_LANGS=( ach af an ar as ast az bg bn-BD bn-IN br bs ca cs cy da de
-el en en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL
-ga-IE gd gl gu-IN he hi-IN hr hsb hu hy-AM id is it ja kk km kn ko lt
-lv mai mk ml mr ms nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl
-son sq sr sv-SE ta te th tr uk uz vi xh zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_beta/b}" # Handle beta for SRC_URI
-MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
-MOZ_PN="${PN/-bin}"
-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/mozilla.org/${MOZ_PN}/releases/"
-
-inherit eutils pax-utils xdg-utils gnome2-utils mozlinguas-v2 nsplugins
-
-DESCRIPTION="Firefox Web Browser"
-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 )"
-HOMEPAGE="https://www.mozilla.org/en-US/firefox/"
-RESTRICT="strip mirror"
-
-KEYWORDS="-* amd64 x86"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+ffmpeg +pulseaudio selinux startup-notification"
-
-DEPEND="app-arch/unzip"
-RDEPEND="dev-libs/atk
-	>=sys-apps/dbus-0.60
-	>=dev-libs/dbus-glib-0.72
-	>=dev-libs/glib-2.26:2
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	>=x11-libs/cairo-1.10[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/gtk+-2.18:2
-	>=x11-libs/gtk+-3.4.0:3
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXt
-	>=x11-libs/pango-1.22.0
-	virtual/freedesktop-icon-theme
-	pulseaudio? ( !<media-sound/apulse-0.1.9
-		|| ( media-sound/pulseaudio media-sound/apulse ) )
-	ffmpeg? ( media-video/ffmpeg )
-	selinux? ( sec-policy/selinux-mozilla )
-"
-
-QA_PREBUILT="
-	opt/${MOZ_PN}/*.so
-	opt/${MOZ_PN}/${MOZ_PN}
-	opt/${MOZ_PN}/${PN}
-	opt/${MOZ_PN}/crashreporter
-	opt/${MOZ_PN}/webapprt-stub
-	opt/${MOZ_PN}/plugin-container
-	opt/${MOZ_PN}/mozilla-xremote-client
-	opt/${MOZ_PN}/updater
-	opt/${MOZ_PN}/minidump-analyzer
-	opt/${MOZ_PN}/pingsender
-"
-
-S="${WORKDIR}/${MOZ_PN}"
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME=/opt/${MOZ_PN}
-
-	local size sizes icon_path icon name
-	sizes="16 32 48 128"
-	icon_path="${S}/browser/chrome/icons/default"
-	icon="${PN}"
-	name="Mozilla Firefox"
-
-	# 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" || die
-	done
-	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${S}"/browser/chrome/icons/default/default48.png ${PN}.png
-	domenu "${FILESDIR}"/${PN}.desktop
-	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
-		"${ED}usr/share/applications/${PN}.desktop" || die
-
-	# Add StartupNotify=true bug 237317
-	if use startup-notification; then
-		echo "StartupNotify=true" >> "${ED}"usr/share/applications/${PN}.desktop
-	fi
-
-	# Install firefox in /opt
-	dodir ${MOZILLA_FIVE_HOME%/*}
-	mv "${S}" "${ED}"${MOZILLA_FIVE_HOME} || die
-
-	# Fix prefs that make no sense for a system-wide install
-	insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
-	doins "${FILESDIR}"/local-settings.js
-	insinto ${MOZILLA_FIVE_HOME}
-	newins "${FILESDIR}"/all-gentoo-1.js all-gentoo.js
-
-	# Install language packs
-	MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install
-
-	local LANG=${LINGUAS%% *}
-	if [[ -n ${LANG} && ${LANG} != "en" ]]; then
-		elog "Setting default locale to ${LANG}"
-		echo "pref(\"intl.locale.requested\", \"${LANG}\");" \
-			>> "${ED}${MOZILLA_FIVE_HOME}"/defaults/pref/${PN}-prefs.js || \
-			die "sed failed to change locale"
-	fi
-
-	# Create /usr/bin/firefox-bin
-	dodir /usr/bin/
-	local apulselib=$(usex pulseaudio "/usr/$(get_libdir)/apulse:" "")
-	cat <<-EOF >"${ED}"usr/bin/${PN}
-	#!/bin/sh
-	unset LD_PRELOAD
-	LD_LIBRARY_PATH="${apulselib}/opt/firefox/" \\
-	GTK_PATH=/usr/$(get_libdir)/gtk-3.0/ \\
-	exec /opt/${MOZ_PN}/${MOZ_PN} "\$@"
-	EOF
-	fperms 0755 /usr/bin/${PN}
-
-	# revdep-rebuild entry
-	insinto /etc/revdep-rebuild
-	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10${PN}
-	doins "${T}"/10${PN} || die
-
-	# Plugins dir, still used for flash
-	share_plugins_dir
-
-	# Required in order to use plugins and even run firefox on hardened.
-	pax-mark mr "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
-		|| ! has_version 'net-misc/curl'; then
-		einfo
-		einfo "For using the crashreporter, you need gnome-base/gconf,"
-		einfo "gnome-base/orbit and net-misc/curl emerged."
-		einfo
-	fi
-	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"
-
-	# Update mimedb for the new .desktop file
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/www-client/firefox-bin/firefox-bin-62.0.3.ebuild b/www-client/firefox-bin/firefox-bin-62.0.3.ebuild
new file mode 100644
index 000000000000..39a6591abfd6
--- /dev/null
+++ b/www-client/firefox-bin/firefox-bin-62.0.3.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+MOZ_ESR=0
+
+# Can be updated using scripts/get_langs.sh from mozilla overlay
+# Missing when bumped : be
+MOZ_LANGS=( ach af an ar as ast az bg bn-BD bn-IN br bs ca cs cy da de
+el en en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL
+ga-IE gd gl gu-IN he hi-IN hr hsb hu hy-AM id is it ja kk km kn ko lt
+lv mai mk ml mr ms nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl
+son sq sr sv-SE ta te th tr uk uz vi xh zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_beta/b}" # Handle beta for SRC_URI
+MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
+MOZ_PN="${PN/-bin}"
+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/mozilla.org/${MOZ_PN}/releases/"
+
+inherit eutils pax-utils xdg-utils gnome2-utils mozlinguas-v2 nsplugins
+
+DESCRIPTION="Firefox Web Browser"
+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 )"
+HOMEPAGE="https://www.mozilla.org/en-US/firefox/"
+RESTRICT="strip mirror"
+
+KEYWORDS="-* amd64 x86"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+ffmpeg +pulseaudio selinux startup-notification"
+
+DEPEND="app-arch/unzip"
+RDEPEND="dev-libs/atk
+	>=sys-apps/dbus-0.60
+	>=dev-libs/dbus-glib-0.72
+	>=dev-libs/glib-2.26:2
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.4.0:3
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/pango-1.22.0
+	virtual/freedesktop-icon-theme
+	pulseaudio? ( !<media-sound/apulse-0.1.9
+		|| ( media-sound/pulseaudio media-sound/apulse ) )
+	ffmpeg? ( media-video/ffmpeg )
+	selinux? ( sec-policy/selinux-mozilla )
+"
+
+QA_PREBUILT="
+	opt/${MOZ_PN}/*.so
+	opt/${MOZ_PN}/${MOZ_PN}
+	opt/${MOZ_PN}/${PN}
+	opt/${MOZ_PN}/crashreporter
+	opt/${MOZ_PN}/webapprt-stub
+	opt/${MOZ_PN}/plugin-container
+	opt/${MOZ_PN}/mozilla-xremote-client
+	opt/${MOZ_PN}/updater
+	opt/${MOZ_PN}/minidump-analyzer
+	opt/${MOZ_PN}/pingsender
+"
+
+S="${WORKDIR}/${MOZ_PN}"
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME=/opt/${MOZ_PN}
+
+	local size sizes icon_path icon name
+	sizes="16 32 48 128"
+	icon_path="${S}/browser/chrome/icons/default"
+	icon="${PN}"
+	name="Mozilla Firefox"
+
+	# 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" || die
+	done
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${S}"/browser/chrome/icons/default/default48.png ${PN}.png
+	domenu "${FILESDIR}"/${PN}.desktop
+	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
+		"${ED}usr/share/applications/${PN}.desktop" || die
+
+	# Add StartupNotify=true bug 237317
+	if use startup-notification; then
+		echo "StartupNotify=true" >> "${ED}"usr/share/applications/${PN}.desktop
+	fi
+
+	# Install firefox in /opt
+	dodir ${MOZILLA_FIVE_HOME%/*}
+	mv "${S}" "${ED}"${MOZILLA_FIVE_HOME} || die
+
+	# Fix prefs that make no sense for a system-wide install
+	insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
+	doins "${FILESDIR}"/local-settings.js
+	insinto ${MOZILLA_FIVE_HOME}
+	newins "${FILESDIR}"/all-gentoo-1.js all-gentoo.js
+
+	# Install language packs
+	MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install
+
+	local LANG=${LINGUAS%% *}
+	if [[ -n ${LANG} && ${LANG} != "en" ]]; then
+		elog "Setting default locale to ${LANG}"
+		echo "pref(\"intl.locale.requested\", \"${LANG}\");" \
+			>> "${ED}${MOZILLA_FIVE_HOME}"/defaults/pref/${PN}-prefs.js || \
+			die "sed failed to change locale"
+	fi
+
+	# Create /usr/bin/firefox-bin
+	dodir /usr/bin/
+	local apulselib=$(usex pulseaudio "/usr/$(get_libdir)/apulse:" "")
+	cat <<-EOF >"${ED}"usr/bin/${PN}
+	#!/bin/sh
+	unset LD_PRELOAD
+	LD_LIBRARY_PATH="${apulselib}/opt/firefox/" \\
+	GTK_PATH=/usr/$(get_libdir)/gtk-3.0/ \\
+	exec /opt/${MOZ_PN}/${MOZ_PN} "\$@"
+	EOF
+	fperms 0755 /usr/bin/${PN}
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10${PN}
+	doins "${T}"/10${PN} || die
+
+	# Plugins dir, still used for flash
+	share_plugins_dir
+
+	# Required in order to use plugins and even run firefox on hardened.
+	pax-mark mr "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
+		|| ! has_version 'net-misc/curl'; then
+		einfo
+		einfo "For using the crashreporter, you need gnome-base/gconf,"
+		einfo "gnome-base/orbit and net-misc/curl emerged."
+		einfo
+	fi
+	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"
+
+	# Update mimedb for the new .desktop file
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 228610c44ca9..543a7b02afd1 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -5,7 +5,7 @@ AUX firefox-60.0-do-not-force-lld.patch 10340 BLAKE2B 552544f1d637e192cf04f6b9f6
 AUX firefox-60.0-missing-errno_h-in-SandboxOpenedFiles_cpp.patch 721 BLAKE2B 3327c6d637aacf06bd0e430e423f271ffb19871aea1425c807b2d0008ffd970883142d7ad2efc80b1c45796aa599c81f15f9474286cd9702eb2539b99dab54ed SHA512 9a45109953929434ecbbc6eaf6ae276808045d4727d373aac0581c737aac6af20ffcc0e75ce6ae3171d5bf0d58315c5a8c53d73940bbf24950aa2648ab87def9
 AUX firefox-60.0-rust-1.29-comp.patch 1541 BLAKE2B bb50527b8bb07311d6e40900c45fa628b276475bcd1cc137fda2d5c621baf8939c5c9c5ae27b9ab7e63a0a0aff925ea28424ce4363c81fd7c68fe476544b834b SHA512 022a26844e35aa9881022b8ba9f8686627983f490d67d5d9bcb54e53d2f0a9384d3885fd43fcafc59dd8172e5a990aaa994f53888a27a63e93b16e65ced879dc
 AUX firefox-60.0-sandbox-lto.patch 465 BLAKE2B 220b53fb428c15c41aba9b7dd1a88d1c4472e554963e5ea6569d9bed1597647eb41ad6bd778b53cc75fb179a6fdaa81d7afcb69bf8ee3e6de9d37c701e0d34ad SHA512 f10f83f18de0bfa6c93a99d93f555bed2e4afb4c36b0d68b8c127d9113e791f7a5cbc74d4b46db2b1dd568aef9b0f25e84d66eb66bae87dfb1e04c79880344f2
-AUX firefox-61.0-mozHunspell.patch 884 BLAKE2B 5c7da7e893b21744d991de2713f2f7d1d8840077d88cb51c9000295e8816cd476f16b98f8fdafd7ca99b35eba16a6b45436367440678b488a723da522486228d SHA512 db72555f1e24e768723343f49dc0662e3f2dd41b29ee55028b8dce8affab821e68a943e3fbc27176b2992f65e4da1d3028c49f1327e50f435a99a2f37049c69f
+AUX firefox-60.0-update-cc-to-honor-CC.patch 32154 BLAKE2B eb84edb8d0c075764c7034c866eb6bfec21eef0bfd6c018a3946f337282147e3a6955529a293d1eb9f58265b5db6ba9bf4fb2993e8343e43f268253ea5741ec5 SHA512 05ee0495162cc880ead5bcafa53b61d5756e90105778753ec3f7fec695874f9a7aa5cb1258e272ea55ea809162cf4b2e23ceab330fd816a3162a14f43121efdb
 AUX gentoo-default-prefs.js-1 821 BLAKE2B 2af9a9e9f3a71fae918a4098397e931c02df5a8021d0bc87ebc4981076674aba99d88c5b8acf2380c915e92ad07a7636891ea8a07cfc850e9c4d15e58d0cd276 SHA512 b63542c51edfe0158ce487b317ea6d36ffc17cf8457534adb6aa3f613d9a027f4285c9dcf76eb1b96de6bbc10ba09948fa6c081e00cfb25ca47450cbc32923f2
 AUX gentoo-default-prefs.js-2 880 BLAKE2B 5a40aabaf6678b3c73f06adffebac3ebc9908da02e55250dc6a544f6dcda1b738d6e6f45dd84d08ad14f733fc313d7b2852160cc1a95ad290010f75d2d1286bd SHA512 d03da4b9692b5b71aa2a170093cff2e4f8e5e32e314f918b5aaeb5a07c3b5edf52e096ac60830ec54a0dfe50834218c899c262176c0719f81aa68b475bbeb87a
 AUX gentoo-hwaccel-prefs.js-1 100 BLAKE2B 08be790b58524077a5681cc06e10890b72dc6e8155c9e03e6ef9165035087d4b8cbcac4a6b8997f61db3721895c9247a12171eec7d082fa15e1d5312bf51fbee SHA512 cf5385c793056e66b8853fd641dce2e7804d6878675afd24485487f2201801e1bdd5d27c15cb0d483eb34bfb75e7a21c01f1bbf701cb1c2dfa48f8f6422ed42c
@@ -104,378 +104,192 @@ DIST firefox-52.9.0esr-zh-CN.xpi 461679 BLAKE2B 745b2cfb86e93a379e13fa73b7e3721b
 DIST firefox-52.9.0esr-zh-TW.xpi 453068 BLAKE2B 84e08ea4fd119db1f1c6f84b212fbbb5d6999c5ac6010c0e7836d8734726d281107f3d91ba7bac1aeaf855dc36d3b018ae3913dccdbe2b11aad02a8d8aaa893c SHA512 a99042ef7d00820e341dfcf2c45a8b5bd77eaf2cc8ecf0ff5ee982b7bd9beac7cb4bf051c57ef3b7a5d9b67cd35858dca396d21e65718e248f3b1fdba5273999
 DIST firefox-52.9.0esr.source.tar.xz 214087304 BLAKE2B eba5305ae3fc9a4306cbcbcd8d4610272ca5b75e369367961e9d94919b003de8aae8f3c58fe1c628787d98105a85fab575ae2b051e92a0b35bbb8b402c100766 SHA512 bfca42668ca78a12a9fb56368f4aae5334b1f7a71966fbba4c32b9c5e6597aac79a6e340ac3966779d2d5563eb47c054ab33cc40bfb7306172138ccbd3adb2b9
 DIST firefox-60.0-patches-03.tar.xz 111764 BLAKE2B dd6fca1a7dad526cf1bdebb606773fab6bbb18e3cd601252f5b627e3d5ccb50a60bdc3ca228b1ed57d8b2334275fe5ef2669f8c98f8acf278effdb9dc7fc61df SHA512 24a09df0e785cd9ba71ae6baee33ef159c1fc3b580784f7d20a775dc846aaa51d660eca67e284960af72651d245236623a0736695c76be75a8b395e5b69ba1ce
-DIST firefox-60.2.0esr-ach.xpi 496145 BLAKE2B 97bce2e13a8c73c2d0dde9f60f482b064df4556f53772fa4670999e8b023b7128742869a5d0d8bded33754f547b8b4f4294126f0b5dadd2131eb07b9782908c0 SHA512 1db47c7691d024049a2309a3f2be42b117f2eff1b00d81adaca65119a8d144b10f7339cce10652331b7f98f4fccadfeab020f733d4347441962dd419db9b7898
-DIST firefox-60.2.0esr-af.xpi 486622 BLAKE2B d78eb520d3161c316d833518ca78b0b4757ad2aa85f4055ca202d9a095da01ea5ca50b4ac05c960826e2619bfcd88902a89762df2642363fb2b8f6ca1e71dac4 SHA512 f7aa4314dc9d725d8edf6197b11ce1e1a36ccb0aa571a1bd6ba7dfe51285f0bf96bd9209621516850312937371280357ba4068d8cc49c6b801d2f8690674ef8e
-DIST firefox-60.2.0esr-an.xpi 519809 BLAKE2B 3b5c8de38761c7b7796367016b54a7f0dc162f9ee962c2849df8a15bfd13aeccccdf830d8e3a8ab465a0ad0c299384111ed43efcd0a9c52db9b1938243a46894 SHA512 04d772704ed4fc5c72198f0343baef15ccade22ac0e1cd0942ee3e3e37e334a4e4e0e12c4fe89ca001451b5151dbf18ce047e6aacb90644eb75508d339958bed
-DIST firefox-60.2.0esr-ar.xpi 547037 BLAKE2B 1e528b2a19fdfb167506d46415d5fcce66b41b6c57b89999e50cdb20a466a4c985ea1a10c7f6e7d41996641b4cf8d3802370e1d3361a75affc3c21b9a5f5f446 SHA512 2d0b30211effcc5ee1560311bfea8b4ba6f7f43a538ee2327e8aa7a16031849a7989406498d1b09f678bc8d6e5d6c633beb98134ca317d5fa08b13409ded8847
-DIST firefox-60.2.0esr-as.xpi 530031 BLAKE2B 2e7633d31b3c945e15ebce3bad759043f99a65b130555992f3bd395d6ca40608c35003ec7a494e3b6c2fe14f767455414f8bb024b49757c2a2cd54d3278a2e8e SHA512 ef3e71d6df63901efc6ba4fa7b2302fd1662d87dfa952862773e867114fe13a5676f0b73df4c56341c1be485300613f2398086a7473b073b693052e8e52693e1
-DIST firefox-60.2.0esr-ast.xpi 507954 BLAKE2B 38222e77bc3f7f77d969830382b586d9c23988f89341e99ee18d289e8728170ca61fab31f6dafd31889ee3274cad1b5aededae97096ed79ce3a5b68ff6c52390 SHA512 394288e3952152280c84e178f6f2bd7c39be412f7a9f1528f82ae36ed3804714b9c4d291807ec0939af1326c957b299de1c6d5166713b5506654c6ee4bd91551
-DIST firefox-60.2.0esr-az.xpi 524057 BLAKE2B 4d2efc825cffe00917377fecdeb09de963cd909443b8177268d8150044b1b0adfc9046b35f47316235ee82b4ce029a5a2bbf8659fe187d75b5ae2cb5bb90954a SHA512 1821f841a1c7eea80c983f4128e8c4ea4ee6ccb066d018863fe7c3f2817b0473c6ba1b733695ea90d021ba884127bdf277c9ca10797229618ef2dc4f5434f62c
-DIST firefox-60.2.0esr-bg.xpi 573157 BLAKE2B 32d6572ef9a231eaa3bbd21f3e33c7268642ced02562393c2666f001f42fe37c293ea4b01add8c88f1f6aac72e64e762e55d5c14db01fa188313f9448c4da5bc SHA512 0c7f5483f27afe5957846f724b97e6511a91432116c02471c51ac7299eb64c7bc76df6071ebe2fd03d008d080a57d3e8fcdad4f07da313d7540b4c0cf50b73eb
-DIST firefox-60.2.0esr-bn-BD.xpi 589720 BLAKE2B 7bbac81cf63e4539998b3cfbd2cba9e33c7ea2493639b1a355313569d8c8ffe7dad5730f5006837f570ef9b75d54f10888bab9f911ee5a215af3f4f5f65b5d64 SHA512 37e6f9d7d42dd2db51f47820b07de4b7ea248ca27c4f8addfbd2e41fe9488ff793b6fe39bf2be659a3726c4e2c9c4dfec1e0f9d47feabf4ac7e74e54a59eb5e4
-DIST firefox-60.2.0esr-bn-IN.xpi 570163 BLAKE2B dc0cb32661d4a9336642904b5006f43f6c71a7aa02598f46c36166dc866e5be9390a8e825af5b2454759a50f2e461e7e51f5a60c8eaf27fb862694d5d09cc9dd SHA512 95364e3b021ccdcb90850b24d70b9e06e2c764474136826799105c14922ef5326a67e3e0810d93d9f7838cc606ff265b4971b49c788c0b514091d24c65c2f5c2
-DIST firefox-60.2.0esr-br.xpi 511335 BLAKE2B 43de006be98e3b468c5723de412b60743535279b4305b3b03b73ea916e36cafb97547385db4943cba35aa1de067d971988eee90bf40f8478d132bc2a40973624 SHA512 395378b5cb94af508d50a1c1fe2983b793efa399430c3401f2ede12611ae3ec2b5104501f676a9373dfbb21e6edd8f70cefaff6de0802edc7eacb7fdcc678048
-DIST firefox-60.2.0esr-bs.xpi 514014 BLAKE2B 96e598c39ef54b09b57696b9970a6c63cfb7f8af12f1fc295c58a7988f2750b64f470d238d09eebd25d40e2397cdd9d55365307e6a878928eaddf1c46febbbfb SHA512 d8d83f10fd967592915cce6b065cbd523580e47e46cc7c5e65bf751bfddf76022e38ef1d88a105bb3c2bba521178b3c17643a75dc8feae6f678b2b5ad2815688
-DIST firefox-60.2.0esr-ca.xpi 524566 BLAKE2B a28429edc40c28b37256ab702ef515e8becd322e2975634f497ad066ec34f76c07a63133bcb132615b587dfc1a2bda019810fcd7060ab4f56cda018568505262 SHA512 d2923101c681e2b451d3ad90ebbcfc4d1526f5453a85d07a65d110d823ca6bbd8ed538f13dfbcfe4693f0619e8a6f45faab892b4afd2138055ddf36b5f659bb1
-DIST firefox-60.2.0esr-cak.xpi 535603 BLAKE2B ebfc6a268e3e8ccc8dd6f153f47fc25ba0d0f12b9cb2874bbc8be2be37e32b25fc20c7563dbb6cf477612234c094db2a61ab61ace7f867262fd41bd17282ff10 SHA512 8296afe92a45bd85daf1638f9f4912b1348eec42bcb0f801e5bd7c2e513fdfa8ba41e4ff21be3293f678858d836d51cef806ee752f0bf83c99f5ccf84ac7cd94
-DIST firefox-60.2.0esr-cs.xpi 531101 BLAKE2B 47efbec96fedb7870c3d86558b13c32cf3c65943f3d56d7b8c697b49146141b914705cc6460ddd648f2e698a60f99129c01434d5ee13b66eba0a81d22cf12b9d SHA512 3920a3216633db1333edc7f8fccaec6f2e013379736e162a66578da453c3e6a50fd6f2cb16e5dab7540ee877dcbcb9acd3045af3b713e5cce6434758a12bf7a2
-DIST firefox-60.2.0esr-cy.xpi 515946 BLAKE2B 832720adaf8709e79b648329112147da317398d3c843a871e831282881ad80c08979e4f4db4b9c925aefbf70e847df9e750a9e2814cdce7492edae44055443f2 SHA512 69bd138260e41a33492fd2050f44c1e4d446e8561e73b26d1aef342a4348d8912b02c0e6bb407208bc218295680ab1764b3b738924227ea1b85240010e5c1c56
-DIST firefox-60.2.0esr-da.xpi 510064 BLAKE2B a00d7aef7ba084b000ad717400716252729e9b6321ad14757258fa9aed8b1aa56098b05250849bec4b74069c1256451f74c8bacbc33d04e6e7ddaffb965fe695 SHA512 05279bab990e73fd395dc839a0cd268fce8cb08289109d4bd1a1840d082d44aafa08c10693229b5be83fcc60d1ab0d35fabf48fd1d9d8fcfe8f08ed41f065bc4
-DIST firefox-60.2.0esr-de.xpi 525783 BLAKE2B dba94a413a1e4ea7445b09decf0ea5606b7e585d0e1b85eab6ff5ffdd0e54f93cb692ae1fe99421aa101b5a2330bc37abdf325f8c496c92e19f0a60c6b127ef6 SHA512 749f1810a5ccbe9d930bc5fd6438bd4701b5918aada12db886dbc509bdcc93cfa22e21a85cce8b63e39d9d78448172e9d743dae6e40f589ffb80f75a01070319
-DIST firefox-60.2.0esr-dsb.xpi 538833 BLAKE2B 44631c72f3d5c17ad0f8dc5f1a2b5409079fbab82fbad6f9698507ddcdc5cc949b772570967470370ad27620b2064ae191ce9d241940f7b1d45ed25bd77d9cc5 SHA512 43b51a35a1e351aa95933f8a74b768a289c6867b112e0aa6dc47afd00cf51dca5779ab631f49b0186163a001a0ad7cb42abb7b1778ce1994be76628c1f2019d3
-DIST firefox-60.2.0esr-el.xpi 592997 BLAKE2B 18b37217a9417af263b666d0b1d033af492c7b45f23fdb8bd2a309ee37a26573838977cf506d721b3ca5e86242836056a6bff1c1135376b0d3009d8e717a99d0 SHA512 f14956d0fd292c38d2f0f69a0ef135b542b4c9ea975e12fe41aa6233322f317a353d7199f4e0baee3efc1ca85db64facf7578f5e112e5535f1bfbfdcc7590937
-DIST firefox-60.2.0esr-en-GB.xpi 490988 BLAKE2B ecb74b8d81e9b6a6f4433173fe05d9737a4b2218480366f5e86df0ce27efce363e711a52fa41eaa8f498116f7b11ecb3c26dad3562ad0b20eb5faaa08a4ba6a9 SHA512 108f4b2811de0ab5e2979e811990621cfc47f6a375317040e4893669a81f218d429a99c667b1dc782fff44bf08cfb7b86a9413b023ed6bb160ef978f1f97ddd3
-DIST firefox-60.2.0esr-en-ZA.xpi 473981 BLAKE2B a4014d70556794d5306d1f601799604450cbb3d798c4b640c378db8f930430b56cac3912786428c0cb04f47d5e8d98b6a84aa1e7d7b836f47274c12e881236a0 SHA512 37f121591feca865df4cff6f5152a0b0206c9582b01ffdd50aa0ba1301b232fce2e566cd485dfea7f14781e68c54412090379628948e26eaffbdff8c5640ee21
-DIST firefox-60.2.0esr-eo.xpi 510575 BLAKE2B dbba84ac1480e01cf90b5e836fcfcfc1ad5139cf74cbdac25efdf2cdf8248d87017c3dde7997450c512f1831526b65a7d1d5e696df4ee61452a7550064f9d93b SHA512 f03456b8eaa170de4389780b11a2ce45e02db8621de6305c80cf0a5f4691c8c6742093714ef7667a99a5793383f244d2370284f0914827bd08abf3142f8ee6da
-DIST firefox-60.2.0esr-es-AR.xpi 523906 BLAKE2B 87a7bcc4e30427b832b16c9d3fb4685be2a2e5bc1768864b1fca12fce64dd7773a7a4bfcc9556c7fc2e2b5bb188de910303fb3ac38fc62da70b19fd80b82e2b7 SHA512 9627c783255923869f5af52e94fe1501b6162468a8bbb950dba75e55d65c2142d871370016a6d4feab2b65df05174887b3167ddb2b832fdae16dab68f98d3d1a
-DIST firefox-60.2.0esr-es-CL.xpi 526593 BLAKE2B d8648cb941a67f72e5cda68f4cb53e4afc963749b4bf778569812e5d1cfa0040824483ac735f6f56e61813a82471daff4dbd19eb84f8dfc18ee8951975060452 SHA512 a5dc9302c7291342c49703af005aeb8cf83e8ec04736c8d57673fbdcafdd336c73f5a4212a15a35d81252ff14656da3d67668b5fd0ab2a0247c1457649f914d8
-DIST firefox-60.2.0esr-es-ES.xpi 459226 BLAKE2B faac49e5fe3bc000aadab9ddc8b3d898a5012721ec46b7911a32c2e9452c6d18888cf9b80e5370e92585f5eb8df5505cb7451a8f7bd0cb59501882842dc3936a SHA512 da94a4b0effc1041240889e6eb38a4f128d281df18162f3fddb99b93374a3b49ca7495cad2d729088c0bfb95298c5461ab242cad18b4ad09ce06f81aa59ea117
-DIST firefox-60.2.0esr-es-MX.xpi 527921 BLAKE2B 4af4a2033e51b426b73f8409320948a057b612104d208228ff1278548ca61442cb2b7859250f78d6b48bc232c998696519d19790e57ccb7bc3e866ada1cea505 SHA512 9c6d3f0e5f34e3de56c2fc86aa6725cef9880f2d06afcc2278e0aaaebb1dd6ce9ad2c8cda765b9244a4b4eb2ed0cce887a4f1ecb19c835a83a9c151d66e601bc
-DIST firefox-60.2.0esr-et.xpi 504257 BLAKE2B 2a14f4e219155b9feacba229b90bed27ef945841a2b603dfc647473b37bbd73f00521ad7c6491c34af6a61f5e36b54c84491cdaacf78eebdc649aac422e1ffde SHA512 d29cdb8dfe960583fabc1a07b9a9b8a99bd5f6a335079a24dcb4aa42eacdd7ea2f54239f16fd72cd047d7ed9dfb19512b6b80e9751b2e343fe5dc9f2171d4c71
-DIST firefox-60.2.0esr-eu.xpi 511010 BLAKE2B 6272a5d7a0f3f5d8ba959ef2eb9c2c12abc983104d70e659fec9a5febb045ddf560695509066ad922ea48833adec4531591b856d9868289fe7e0c06998f1c35a SHA512 039063c542a47edfdaf8f7efc31c5204be59ae3e8df83189caff9e5dccafa441afe9f4c288387005d85ab1436ca466e9d392c8410f1448c586abc274b2a85298
-DIST firefox-60.2.0esr-fa.xpi 565577 BLAKE2B 7a593f88f9acc48001cb5ef8aa25b6e958f2288a5b98c17a797e65e6d1d57bce7960a363efa9289bd291aaaa63612933ccc2aba8d2be2b7eef7b9228cc4205d7 SHA512 a471d1aab26c489ac9d4a1b4bf604df3c4ef42a405d77c4b3876c6851a5a0f022a59b7d44d28421e6c133f4c39dc8d67edf05de0d0c30637d85996440b4fdfd8
-DIST firefox-60.2.0esr-ff.xpi 511519 BLAKE2B fd00d782b407ec94394a7b00850b8e13d0af024faad223f585ab875d4e8f2e647147192c1531fce0547a245d3be0fcac2d4378d37aea66f851ed99886fb534fe SHA512 0e183db4020e4b0f0bc209cd944eae1ead2156dbe4ae5b702cbf22279afa8ef7cea26364d78e3ad36a817808576371489407293bdbb982f20579f02e6166226b
-DIST firefox-60.2.0esr-fi.xpi 505487 BLAKE2B 17f4f5b59fd5213b6e1be9bd2178a263f7c135fd5131e9f65a3c320d6dbd668bee6ede4434858f78e00921f484ead51907f45b87ea00fcaeaadc973de0c3a619 SHA512 b4303101f920df82df613cd0d0022e7e8ef4370abba58aa3d64f9de4388204fbb148ff9a78991c621edd6c6b89b8ddd4eb8b66191b0afab2af04b19000d466f9
-DIST firefox-60.2.0esr-fr.xpi 535319 BLAKE2B 045154272ee66c55a50043d3398103d8c06ed1215436ec178d7d8505f58f4af1f05bbfa15b1b7fe8bb0b0eff74de5d9f7032109d7a419fdf4318403a5591f67f SHA512 a6a536776bab3cf13e2f0d8a49c0969fc5a4f78d2d2aee4dca686dd1da63fcdb0aea665880202e86f80d23c411ce9934a06875cce1738dc20a85e3c344df255d
-DIST firefox-60.2.0esr-fy-NL.xpi 523820 BLAKE2B f529323266a869e5799882afd41f1c5e18bbc09db0fb514e0b14998ca1e6cebd98ef64911103fa5d8f2db122cff3223068bf1bde3dd58b93b99aee68c6e011c0 SHA512 f556f741f4077191a98a7923bf341a2e451a79e21d0260e937d904d1a6bb3ccbc4aaa4d156e3e58a7082c8b6fbf969f64368f03ba0f1b77bb44e51284283c02c
-DIST firefox-60.2.0esr-ga-IE.xpi 526282 BLAKE2B e4ba95e44377b198a646419b170f2450f85ee723e492897a04a222308f825f185e05443d29814d861a8a8e0696507bf7caf19003bd87326aa32a14de80859f81 SHA512 be8355c2220168ee62988ebba071dd250d78f7c256dfd7795b6f73652af0c4e31f4d213825aa02a5f91850c1796001b1ebacdee1450e7a8a56bd28cbaa9f9f29
-DIST firefox-60.2.0esr-gd.xpi 520176 BLAKE2B 9a276e5d5ab9cf306adfe7a95f803ab9586cb92b5c845d50bf5c68ea26d466bf35948eaf62fd2628a83b4cccdec1d35353d8960a6557e85d133c524ec7f34b89 SHA512 306b71564ead5105b2783b2480c887aa63c4b0e1848a08531d47b9fe23530dc485a5a909ac61c6f612adcb0ebdd16a959c5e890f34b9883df93221cd3278e82d
-DIST firefox-60.2.0esr-gl.xpi 496680 BLAKE2B 88264d765ccb7a0680108b964765ff27f48c6a299549eafa478ae0df97775fb36b15124cc9996cf9c64f50eb79edeae67150c727f4ed33b6fb45d6dab30fb6dc SHA512 032dc841d7a8d5108fb51314e34e98a8b906c288c6de21bb0db4fbc9166394d83d453c7e709a4c3535ee6d408c389e9db9af1c0d6599d656fab8038c296b3ba2
-DIST firefox-60.2.0esr-gn.xpi 532530 BLAKE2B 9c000b482fd9fd77de41ac9c44ee4ec0e018f8cb0ad20622a0b8cd26066495908c0b4ef59e1ae42f49b6acd76cfe030550d7d686bbdc130f889de82b5e876a28 SHA512 9b8cddc63b4d08416e73ce6dfbc6ca0f18bf4153be3f246e1c837fd2d1dc05ca846de47165b7ad599162b8b68cacf8f83abf3e265f3ab22339f03dcfb2dc1798
-DIST firefox-60.2.0esr-gu-IN.xpi 589563 BLAKE2B c0b91c0eff6ed8abb83acfa8cbb4f65fa40db11151a405c31d0a6494d66d36a28b02d5ca85b3e1a1f8b4e9f9b131584af11cea089d1141863a557860a1d51e59 SHA512 03c3b4439f7a1fad773684d0e52e8362f987ac697bd448d6bd3ee78665051798106d9fac39b661665ad0ae9c2ee08df1603bfd933efd28dc57803c99bdca69ff
-DIST firefox-60.2.0esr-he.xpi 535297 BLAKE2B 72ce905784de01789d3e3d1f08fc5b1f637ed617c62b6c519417481761fe08911ec78e3380513e4d6d21767d5007ea23d04fa2a136d464dc0d733f754295ee0a SHA512 48754e8dbd1b72f2a126025fa50c61debd82dc679aed5e1964e80df2992b0b37390711b70924e0826e224dacbb4afc832050f19022c3c54c1abe16c2a97d9bfd
-DIST firefox-60.2.0esr-hi-IN.xpi 590160 BLAKE2B 15744d55c9630e0b37cb694f50f3b87ff0b953113f7b26af81ff4f40ad8f107aefcb679079ef02712d7e111ffe4f4529533c58087bcccff385803cb58859f306 SHA512 ffb81ef7d1fa92f898eae1f32fc417b3633f1f931b2fd673135795d9d7a643a0329c3b31c2cfa65e8bd3cf88b2366e9a1c1ed5febd95eba59a115ce3d5c55456
-DIST firefox-60.2.0esr-hr.xpi 515264 BLAKE2B 5f4c718e541832cb2fdc2724a34fefb6947a6af2b7e5bfb4ffa4fa826d5653aac91be2ed1610d9d2b4540bfe527b969d978dfd7b30a74a27994fc9e967999350 SHA512 d847a591bf1ceafc0fb41dcb4f753155fbb515130f109114627158c0df5d46eede393266c33ce986b96dfb44be1da7712832e53af3fb98a007be767470c2899a
-DIST firefox-60.2.0esr-hsb.xpi 536363 BLAKE2B ec9632d3a0a1cab0a2a4ef68e0f07cf12c4d04774434d51eded2841571654c85636bd9fe0f3b29258b2fa7d21290270c7110b080ecc15effdb02994181951ac6 SHA512 74cea9c2c7cb36ea3365534b2670e70368ca1251cd5b76d439ee707b7989b7b8fea67909e7ab5953dd8c271061a2cafb320ea4ec6d54057f7b17b8c2c4185b97
-DIST firefox-60.2.0esr-hu.xpi 537665 BLAKE2B 4d79ee98b64f10445a10a6d7479c580b1a1c731fce909a3af11b1e64104cd0f7abe625501d3fdd2230c9d685e07b4ed522e988171ad45e59f46cf9ce75e4eeca SHA512 71335d4bd9d01399b1f3ea1fe721330ed3f12b6aefeac3c813fd1322400a97314038f9cffe91370686404f8447c8e3dba663c4b20e4493bbb1caa61ca8cd15f6
-DIST firefox-60.2.0esr-hy-AM.xpi 568718 BLAKE2B ee46650a4d649bc32d59310aa57dfe6cce6b8c913d9ad95a380482488b1e6954e33f89712bf4f0f948c2566c7c29d95eb0bfb3acb67440d2ac76e1568ef6c0f8 SHA512 865ab034a7983b2cd34d0b765563642eb6025a2a8c702bb8b7a429d5ca890846406754ce5cd62b83be6993e7f5e88678e9c563452e80d97d322965f6c4f21ea7
-DIST firefox-60.2.0esr-id.xpi 501534 BLAKE2B d03c3eed74ffb412ddad6284545a77b9cef9c0c2e5c20f39615d23f10b7870795a508a64421b7874e1aa0c677e42d8c96543ecdba8fef7afe01715163be9f24f SHA512 ae239633f9229dfef2062d614a6947086f3d43e6853eea181861b64c6e578440a04a6ba20290c95bf593c1a73170736bdc1c962c1fa5110fbf78d61578d5a112
-DIST firefox-60.2.0esr-is.xpi 512592 BLAKE2B 11c1f1eab80458e2078d3477c33a3f478837849122cbb0c66ffcf4983d4a01b34b3a1dfcf165deeea17cb64171c62abb8833224f82d15b259c208414c55eb19b SHA512 f13a3af33123f2001b831ee00bfb9ff268db844449847ff9325e9d7e8aa0d0287dfa6fd3313ad353cc7a872de5e807cadbc64cdb9cff0a3ceebe0dba29b2c72b
-DIST firefox-60.2.0esr-it.xpi 398344 BLAKE2B 79c504125395569e96336d8c7346c7bbb85b9b3485a167d505ba1da8945fdeca30ea9c4271214a12f68cf75ee0fc3c8ad4b967f84b62ed25d3b6b74921c2183d SHA512 28a51cac0de0da774d6f154877ea84708699eacf61363904b20dc6f3f0d268af8ebde62f3836c8a44f2cec5229ece333b2916c53b69e36fa94bbaa9a9572153f
-DIST firefox-60.2.0esr-ja.xpi 571319 BLAKE2B 4c628339a3ce47d59631c7ed6fb721cfd9d71a4bfbdf6e78f686f2e3e3aee08153a09a128a459eb970dd45b87b80106ef796e205ba5fdad67481aaa17144837f SHA512 dd4a63779da8aedaf714f174808da5d2bb8536629a37b4d0f1350c719f3d46a503269d81c34fe1787733a38b227faea6595f44caee6cdcd6e7f6f9a362afc6b7
-DIST firefox-60.2.0esr-ka.xpi 556157 BLAKE2B 8c33f141ec1547c94f43ded7285582939de3c2084f49cc77dede5ed027c1fb7ddacb569d2b1fe7a1066d2ae9823035f7dfc4f8b332059ef2e91db3a80830527c SHA512 d08d5e3bb50b165b2f8f321fd0afad9054d39784209febb77379979932a0727d9bc9106bb638da00e74a12fa04f0a0da3c9d07789b6bbfdad24816157471b03e
-DIST firefox-60.2.0esr-kab.xpi 519706 BLAKE2B 55d3620859eedb928a14ceb2f3010e43cdde271525845e276a9ceac25247c82d0f3be098efd9d8c5c238f22dc210048254c3fdc91b43f0c710e51a7bcd625d96 SHA512 1ce1d0ec528b315d3e13079b1391f1a2dfbfbb1d86cb0e210b6173aca418d742f6e6dcf6accabb21ee7accfbedac16eb98dc9616c18dd233c5d08bb8905ecafc
-DIST firefox-60.2.0esr-kk.xpi 582290 BLAKE2B d4f380c4d2bd937038d22665bddb773486ad18c687dfac5331ebb51f3667876cc953958187be038d321a1d8456d1b40cae80f76a09f8f2e20b661fc31401331d SHA512 d2dc7acb396c6ca33732a505a35a17010ee63cd19eaa1b78ca519a0710122a3332ebc364210ff4a48e067c51f37b4c3452d72acc9ddb4764575ab951a21f5333
-DIST firefox-60.2.0esr-km.xpi 582419 BLAKE2B 37042dc3c3627cd2515093f37d63ea49e9b69b995652ebc4dae774b6c40436422a562fb4c9a4ea02fb81128567fa5cbee12ac3a6831f2f7a50fb2ff64178577c SHA512 1174b8f0d10bfc033b166556a2be360c8ef6e92f463febd13214161d46293150c03b45a279b9d8ebdbc7fa678e0216aeb0219f67d8fb09f05b6a7c8c142174ea
-DIST firefox-60.2.0esr-kn.xpi 585177 BLAKE2B 96b3b64e563c76c7c6b14d81a8f6dd344bac09b97aeae4f7f1b7f93959d0fcb2d20f2af89792f8fce34c5b62cc5efeddf2f707f8c946c20caf9ed0d5b5737163 SHA512 923b9942f664cecfa029ee870a306f69846a8e90415f635c4439831797c3a9ed2becbdf3dcc87ea387de7ae7c6b866337773afd9a7d246537ca13ee623de87e8
-DIST firefox-60.2.0esr-ko.xpi 547138 BLAKE2B b630affbf633ca16145b9c064a550232830ea398087b59446597fe3ca18bf0357190abdce8b3937c405acd448c54b2bbfdaf68b92c2afb0eb9fa14ebe58eedfc SHA512 dc956ecc3d00e8fe4e22515e68c9702b443c41de120dbfde174dd048e1ec1b3fdb819d234fc17577617cd799f07c226e6dfbd1b5ee662a35e9d9b7f73ef2310e
-DIST firefox-60.2.0esr-lij.xpi 512482 BLAKE2B 54de124c841a94301e5ea4ce6bff9c7ba9917b41d47c12544509b7ce1c8799d3f918b43a07a8b9b46b88d2959ccb9491cbe300cfc6fe50002bd602de342b7a35 SHA512 d2e14647f9ad709bdb572d5af627f70d419f90805b65da503a31f143cdea23c7fc30528b10d350e497f856f7915dfee597bd9fedc354185d6c5e54e461ba000b
-DIST firefox-60.2.0esr-lt.xpi 535713 BLAKE2B 6c3ab4eddeaee86ff9c1be165e606997e6cff995b5c442458023ea40eee49cbefccf33a5a15d405f31d3a39d6801e3ac50874d043de441c70dedb7e887c29fe8 SHA512 2934c8ed2facdba1890d109a0064acace84324136b52a2d2b2ec4f89b5e46ff0d7a5746105d2d484aa7a05ac132633e8b5c9fabde88c786113afc9ff2a27bb51
-DIST firefox-60.2.0esr-lv.xpi 525720 BLAKE2B d1e5d5c0657cf534798d0070038a3345a8ea19d042820ed84feb723480a1a106f6ff114817b7d355bbd39bdaa491446722ddc5508af6a5bfac1c611380625fc8 SHA512 40f0f4ba99a45fe64756d5f74bc2c8931674dcf983a4cb57fac76a82c8b4232fab6c634562defab7cf7658fa8c8d2f2d17492706b5409026c7c7e2aafcd78022
-DIST firefox-60.2.0esr-mai.xpi 548559 BLAKE2B c834a07c26c878eb1b093825cdad3c468fb096cb04fe28b9ecc4734ba91942a059e1d1a180222ec122518c5c2a69819d7f166e8d28975a89667a0ea7d1ed85a9 SHA512 f424a9a504152b4bc2b09d89d01f2d6eb29753ecbf95b6b557afe4bb2ca5acf7cdc77389a7884d0eee81fd7dbe5e705aab3f36ab18a6903a34cbdc4d7098306c
-DIST firefox-60.2.0esr-mk.xpi 513114 BLAKE2B 1c5fa277ad1a3146d0b09cb3e4c40c3bff3eae9d3e2f3cbfb4117b85ae52859502b5c671bdf7ac6bacfc8714b1b6de552faaa7d39bfad7e8b28312b8e4465a6e SHA512 fcdd16fabf8553de6f5419a3ef43914a4e27f97583682c7cf6fa592844b7ad2fe377e901990f5a854923043a310c0f25349e22ecf29381973112318c1fc4cb78
-DIST firefox-60.2.0esr-ml.xpi 598285 BLAKE2B d6218fa02ace8ad93049bbcc5d34dcec7d82350dd66afbf154485472765bc31f0d7374bd95428556b92712078563dfe1b3b32ab1059be600824cc940d8df5bec SHA512 9cf97fe9581102b13163e392a7f982dd79487a0459d6f9379c87838fc9c889338d0ba7ca5121be114a3745552f5030b412a67cb2137283f84fe5678d20eb3297
-DIST firefox-60.2.0esr-mr.xpi 578425 BLAKE2B cc71c0efe3dcc6a5ace71143cd620fbb048c772ba788d2c5ba237e2f436d0f23e4b6679c44fa86744206f5e4a433e59379775ff39034a5b1ccbbcf5f4cd7c97f SHA512 a02e7341dfc596c2ea77633cf88fd793e9ff773c6e6a2e67a139808f5f93780bb992a37d76a24975ebc29b55cfbaa7415ab95095f41fc1102a4b1971c3ecfe04
-DIST firefox-60.2.0esr-ms.xpi 508863 BLAKE2B 340084254a75dcb660969ab37a4e9929bbf297c1db712778a67ac47ec01a20bab80b5770f45565ddf39f4c06279c3de79ad97e1fdfc3f8d0e389b2d37d2efa7f SHA512 d08da0e31bd237b14bfc53016d5162a168dd28e8587cee712afb8a916407d99b123f476b80f8757fd0e48e9f84d274ad7ac7afcffb24c9a32399d04d51204b0f
-DIST firefox-60.2.0esr-nb-NO.xpi 509188 BLAKE2B a8cd993fb41f0d393c28c1ffca127584a0f301bda58d1034b38f27b7f310aa2468f40356bd0003f8703f3e30f8e921d38b88c31160673f9d3e2246adc4da9a56 SHA512 a6cc8fc127efa6eada0985d0094d8d9be245e2102118e98794c56ca04200cab65770a48ec4a7379374e62c210c4815dde0c2427d65288eac5a62b0b015250b50
-DIST firefox-60.2.0esr-nl.xpi 516741 BLAKE2B 5304ddde686d688550d35c4436d97c2b8a3eb0c38b35fa2cbbcf6ff5b2a2fdceb424b5255e74149fc794436a0fee1f1377f52044cbecb2e780d45c90a4efce90 SHA512 ea5e32537faf944eafd9602d8687a5790f22610e28a565f2f861ea6651da4c2687697344ea2c026950fd756feecbc106e766db57a80bcd5f1dee7a7e306713fe
-DIST firefox-60.2.0esr-nn-NO.xpi 510707 BLAKE2B a5d9df5b90c5a3104c06e589ba716f9939696d4e34e6024f940e098aa0e83bb266218655b8d2c5ada90c9a527bf197046f980293f112c8175642edf81a7bee58 SHA512 b7ae1fd9aa84e7b83b986a71d38fd4bb9965732e81e9d53559e63b07a79491330e50f64afc238445d25afbc63c8649ac6ea25dd0e8c37d3f69730f4e5553e25d
-DIST firefox-60.2.0esr-or.xpi 540172 BLAKE2B 2122f23bc653ea80a67d7f113fcccef85e5efa1b8bebbb3b28fcf775812321a080bac031406ae11a0e728879840e08b761d9acecd6075138ea7c5f671df39e46 SHA512 5a24eff5fea67adb71bf4568e533b8446163eb86d344cd650013fbd7588fc0e71ff75c7d2d73e0085782b6f755c99d24c1938301e299eed9bf2224d7c3964d19
-DIST firefox-60.2.0esr-pa-IN.xpi 557173 BLAKE2B 02406bf3ec59194b7b2589124d9cca8c850c61a6b05c65abd7e79caed973160bea7baf38abd2e232239ae510e2a625697248fff98b02b3b8446bc529440e6779 SHA512 eb32445c80fda9b48f8b7e4246f7db9a8345da836773847483c70fe7e2908dcba2c14eb824a48c546f2b734ee1e29523942fdee8fcaa0c9a569a1bb978d80f9e
-DIST firefox-60.2.0esr-pl.xpi 418275 BLAKE2B 73daa355415e5fb8273319bf9f4116baa72fde12a1ad7d3d0ecc957f04722908652f203ee3800df82758f666c6c1a87808b3f8275a96690cb4d82f80317548db SHA512 1a591b2732399f63b61572a1ecfeebffb12443c3e924794c8caac7264322ba1daec639b310d93eae41d6d94957a88eb91efe385257e49a3c7da788e6dd51a11d
-DIST firefox-60.2.0esr-pt-BR.xpi 514025 BLAKE2B 1eeb8afb692cd96035ef2fe5220a7f2eadd05b62223b175fd9f61e644a6ab963cedbefdfd3373a318f2d7b7ebfcd8dd2192ab6629eb20c5f221a5bc25c303da7 SHA512 54d11d2a4065c5e296258fde885d9f1a7bbb915718aa01709ae3030fc8e891df1c59d408ff95cd7a4703aab6df74d3e906ea075a86fa56adef2c441f06712ffd
-DIST firefox-60.2.0esr-pt-PT.xpi 518618 BLAKE2B 7220b88ac02231f7cfd419d59ce86ca5b274b85b9346cf0dffbffd3d342054f64b574f9752da4e2420a2f99f5089dea9947a3126d8e768d7e7ba1c1a44efdc6a SHA512 0a5f6fe3d704ad2ac3ef5d80abd3c74b30ec682acb9cc0332bd0fa5ef7d6697ca5035efa277ec4b68caf6a9d1b0c732a6dcdaaee08cf865d858cb2cb9b83bf91
-DIST firefox-60.2.0esr-rm.xpi 505346 BLAKE2B e20f409266b6bde71a91fd581a4346872afe188bce5cf7e8df9a7160c3dad26a4d93abf09f9a9092618cf64a8b48d660f0c99e800bfb5366c63c84db1c748e59 SHA512 871746c5f311afbc5c63b7c676ab7961cb5656c0855633353aca39ef7e4eca91e7ec05963a68b9c5eccf676c763f84d8df9149353e268cfc66e3cc90b7f5f73e
-DIST firefox-60.2.0esr-ro.xpi 513364 BLAKE2B 9a72a2abe74bc1d92bfc68bf72213e3f3ed83a8480c6a41cf9d6de6a9e2163934cc02a10c661748a0af1f8eababdbee75d0e3ab805d49d3963ffa70bab0caee4 SHA512 44cfa0606cf5671ceb1cd7634d2a3bedba5dd94050b6472d83d3e684553da825e79c2ccaebbe905dc0107ae9c63d45a79a2aacca268820fdaa6f932b45a82423
-DIST firefox-60.2.0esr-ru.xpi 590603 BLAKE2B a66afa15189a6a7acd1431ca8c182594f014e07f1a1d3d01489f448544d73f5cca9f31ecef0c70009906310f63c2b8daa054ba95dff06fa291aa320ba37302ae SHA512 11e35a2dfd6fd223c8220177d9f9852df6747a141fd382e6f4c6a20bd1a27199b2ca163561bec9ef4df54890d3154e7aec75910666098899dd468d3d08190fc5
-DIST firefox-60.2.0esr-si.xpi 544878 BLAKE2B 7cf51127cea724b92da59ebc6a79f5a60a309f9f3bfdfb00fb568c30382605dae3b6ad53b5157eb3a3c079d0fc007089c7325d185ffe44469218b107f1f881ed SHA512 afe0aaed2bc1b58b6315798e63ec0f17244dde109afa9d711cd5f0b67b556a787622e64d16de031355d3f66fdb677d8c5cb4b2787fe99136e73886510a0bf93f
-DIST firefox-60.2.0esr-sk.xpi 541016 BLAKE2B 18e07f8fb52d9bcc9b39658a79cc01f0ac2e8d8fe4e9f81be93dfebe24534aa7d49ab5f88720b9a61a37908617dab0c65ab06378b0fb352a848f85db065178fb SHA512 6c8a3735945b71ea53c73179875d860382ff8613376b20d87c22a5a30c2d46ffcc00072e73f1053879737b145cd65d2f5039ff563783737db74a1cc4fcdce780
-DIST firefox-60.2.0esr-sl.xpi 518659 BLAKE2B 84225bbb9de839fc682e42f061da5bd84032c250ecb3858593156f3f66718277a56d708738fbd9ed65e5fc7e82b6891eac2a231ad58f2664448d6d712bc3cca9 SHA512 75b4eade9e4bb8c4ad4160d9ec6463346da3f594dc2b249193279f978539556181dfce7322142967a95acef1b1516305cab4c5838cbd78149b555a837a7ea79e
-DIST firefox-60.2.0esr-son.xpi 497003 BLAKE2B e49f1719435880c66ea779e4c668b69b2afdf9f1b2e2bef99364a97c30f3c6f8a621443b6f1b3f7b7cdf4009ecc5f0b5ed4ad29aaff63c195cdd0e28b4fffc74 SHA512 eefe510d765e336f9ceb273417281759291a2019a81f3fb8e5bbc22bdf01504bc876688383daeaff4e2eda58ddb5a08eab80adf5eae89f45d59fb185171c7375
-DIST firefox-60.2.0esr-sq.xpi 520575 BLAKE2B 09e614694af98ff216e7089946aca43afef0e52c725e3b1462b10f95e01569f84796a0f73675f6b6823cb2ba44ca36c1538d5234ffa234a05fd5b98767d7e0f5 SHA512 c3f518c3f412d44975744e97f165c55d59a4ddd2a93e569378d58d02efe91891ce3551a609cbc5102ccfddf7a4a6122aae5977201e595ad2591c1782bb9788f7
-DIST firefox-60.2.0esr-sr.xpi 548081 BLAKE2B d7f670510801e67d957ee83b81ec0561c5ee9e562b68a2e0dd5af9c8ede56503ef55663c3a9b6633fae0c6bdf90e8b40dbd995caefaa1f886faa776ce8827b8b SHA512 1df35e44956959249f33722c2f94d8db97e4ad3b08cb51efffbc159de7bfa40bde42c6b5aeafb1dac61437a9151641cfef48d901df7a1a7ae407c91544f7145b
-DIST firefox-60.2.0esr-sv-SE.xpi 517934 BLAKE2B 9b5e70d48bec563f7b482aab684ce1d8c323d446e812b761c663fb126469bd520c1d949a70532810f43c8a0127a537513ab9603b5f3de8d170584c83d3db3def SHA512 f3bf69a07422b831a569d26b0830b702f2f9cfb81191cdc48f7e33afb2db8984512f0e4a8fa95ba8abe0841219da05acfb3129fcaff4065e2ceb19938a0f85cf
-DIST firefox-60.2.0esr-ta.xpi 577232 BLAKE2B 3945199f89f860f9d6f487945c3dd181ea29f31d319f4a7ec73e4426e4f73432d5ce93681ba7a0c5cdc75ad1008b3a5f4ff1da7388d2cfb3999cc627eaeff608 SHA512 96c717c999dfc58498f3126d97fee2af9e315c7b815608bae0170762b983102fe2404decd8920bc93b44e2f18c4b6f1f4520a5fff790f2b8f93ec31b6bdd6968
-DIST firefox-60.2.0esr-te.xpi 590261 BLAKE2B 157460014631cfcc0ee852737078a404e9972f209f15a7276c807499c3a93082b1b00121abde04b2ee1a5a22bb8f2aa578fe6aa5acfcf961bc3cd8f412dda47d SHA512 89303c831ab96bdc107593bbe2218233123666989d1d2ba4af58fa0acb5a1d46ece5e4773bcf10ba8246ffcc3d75a85ebd329f4fe76d7c96649fc50f54a8cca9
-DIST firefox-60.2.0esr-th.xpi 562115 BLAKE2B a3f54a3d1e3f3e1349c2c1d056b0dfca963cf77e173a0766fc45d14f2301b60584cf68e1ea84fd1af60f159a156568b07706570e771d03f7140a86495fe6e0c9 SHA512 3b198c4ff0c44fc2a7bc1c433304d0c01a89df6876ae092ec2cdcaf0a0975d289aa4c9c25d14d68aa96970d35f8cf41fcfc4ccc7fc6874373e4fce6b135a8b79
-DIST firefox-60.2.0esr-tr.xpi 525115 BLAKE2B 3467597d727accdc7f9b794165b5d11b0ed9080c62ae03640950aa9bf8cbc9f29d64002c29de3bc7ad202f048cd25c4dab85ba651af56fb2f46fe197bb144793 SHA512 eceb8e337bab27b7a346385901ac80cba463b7f09aec5d45b38b5a0d0707660d696284480f840d31d83f2463dd8a51d9f7ceb90df3c57f8917f4c83bd9de9db2
-DIST firefox-60.2.0esr-uk.xpi 580233 BLAKE2B eb57a942117cbf8c2b35e02596b30407413f149d054b5efa5b19a9a161b408f61bb6a34e01265264cf0ae20a40860e7ecdf557e8765cad69e755a9053d3ebdbc SHA512 606310974e2b95b1f9ac9952fcbb9b9839da4484906822856e3eb4498abb47ecdfd024e9a884f7e26a589795e8d0f2aefd130d01f87d97e4369b7815989fe531
-DIST firefox-60.2.0esr-uz.xpi 513000 BLAKE2B f7ed229776168de2b51274ee05655edb9dd435b5cfa72552be8cdc5204150c8169acd4795667ce290a9efc4ccd1bb12843eba1c789984b7930c1432ef939f1b8 SHA512 9558d1e56a862aadb0a76f9712442fccf0b3642f4cb8dceff51158ccf60526bb00a7ef0555d6cdb565cead734099d649050c91817efd572d37cca316bb266c00
-DIST firefox-60.2.0esr-vi.xpi 527496 BLAKE2B da67baa44ca506146b1848e9e0ed02e8d78ebd46134d3f715ffcccfed32567716f19900f940fef305ea28714418d5a050a6bda3befbc3e8cc848af7f51b566c4 SHA512 19806e58c7fcf45909a67540bba6e6ef6d9de32d498c0f9ae5c7cd66b089004ef7ecf6ff4a99916078b8d040ee6dd48a03adb65e21bacf84a7cc18fe08712d02
-DIST firefox-60.2.0esr-xh.xpi 511170 BLAKE2B f2966fcc062040bfc75466cb97ec276cc21b225ecf5aabd7bc8a25c3c0d2ae6dfc2e843ba928fa57c55655308cea49014f27b6cc39143438cf95ceb0265977d2 SHA512 f241ded240e5585127767acbb1f336bff74e6a17839b95b1395481102903857d2a1f0013933745a0db240b4f56f637e109ec1276a93b832a1197bd30cc5264e1
-DIST firefox-60.2.0esr-zh-CN.xpi 542882 BLAKE2B 7fa748cdafa1cedde30445f47914565686e2d4126d110407080e4c601a586c6c4958a24d719abfc8d6f7c11a73c4a38b63f317faec45aa16277ec80cd736da92 SHA512 f744bcfa11f8a96451a740ac519b83a32b1329391c226ba3612b70cd75fa1b6d859df01f858845e806b855d537923fea22d0c517daddc2bb747e972293193c64
-DIST firefox-60.2.0esr-zh-TW.xpi 541208 BLAKE2B 2ffac442565790eed529e3edb87a39144e62c2469f1701e915d07215a1c42c0e1efbaac0949036491a11e49e00f8d01380ef30c75be04e00561029049cf4d673 SHA512 bd9a7c6f598920e6503c6cd16c38521a951f18fd5d24b348a2cbe586ab94516919d5541efcd90501dea39d6596f1cfaad6149a2c7e5dfba736e5194ee55339a0
-DIST firefox-60.2.0esr.source.tar.xz 267132936 BLAKE2B 7a1c7531feff4c010974eab65a2798dafbc2853f7008101d7c8b56a667d089367f3aa10fbc14e6d62f7817a3a020d4e1ca6e8fd32a891403e135021451120c15 SHA512 672632ad7868a013250ec9540287e9fee30a890b1357dd1c475877d8917273d31135c38607e20c8232a890ba7b273055454b05f612a994c46fa7fe665edbe36c
-DIST firefox-60.2.1esr-ach.xpi 496841 BLAKE2B 1beafba6bc5877b2e44b3cbb2319f1e42d0070f6aaf57c95ba2df4c22ef0994e0a0530e40504f92e916eb54311d64d45fdb28f57fe2b12603c8da160e5b26650 SHA512 897c88cf347f3605bb1c65050fd32c7ae6c22559041c45c7dfee5bb7416b13f74d681c8a68d2a8f5945577a971a2d30e408f369e5d18ae900af1927cf596cb12
-DIST firefox-60.2.1esr-af.xpi 487309 BLAKE2B 40bc8e982f0680355813e40c9459e4bb4446720f234f2051d12bbcbb0c2317a6e8b72b7cafbff430f3ffe782b8d37a24d43d4010e727ecd9e85d6ea515d65d74 SHA512 a026dbb3f7c96f76d8cbefa17fa700794a93f5a2c52a92f52b391f6ef870e747164465251abbc858afd647654472dd0384f7d11ee069dfe37910ce528dbf8e2e
-DIST firefox-60.2.1esr-an.xpi 520500 BLAKE2B c47ea4c021bc2552fa235851b922e4e726bc8a4f05863c6cca90212da4e5d71c67c3de79559c7a8e76b2d49f434170da6bc31a0441960a9e8f71ce9a1d2cd7bf SHA512 a72eb01001c78d420bbef06a84cb75768ffb45d0d30bfd8e0410b59711fa1fbbb878677aeb9667f1221e889de53a5c9eeb90741308918cd6b4a7e9b50f4c5979
-DIST firefox-60.2.1esr-ar.xpi 547822 BLAKE2B 386e6c3c65aed613677ff13d231f26bd9e02316ee323fa2d18f8b8cec9fb99a5938637aa5eaa7e4c1847a682d46b84ff3ea09394c0886d060377d6169c4f2c44 SHA512 90357408a40980b9e90f05b708af08e2fdd1ca30a3bc07b17d8c34b6011677be39dee32921f93fe92c3c87e0c463e25cb9df65ac316f16a8662043521bb5272d
-DIST firefox-60.2.1esr-as.xpi 530721 BLAKE2B e534287257412ae9f2d409d214d269a46d1af8b3bcb9311b6e0b9a2a1a9baa40645ec73ea2d6b0dc75ac6a69c369b12642b0b6f268ee7e6cb6bfcefbd16d5286 SHA512 228f391cd3f8cac67d9db2baa3e89e9aab295cf5fbfc494deb1df803982e5c552d24ce23592ef5281e370b8bb9c925113017a73590c10f1643e343e425aa42cb
-DIST firefox-60.2.1esr-ast.xpi 508657 BLAKE2B cce3c0c358fc3518d98b68a4ad6ab647374c05d00f1e5440fc5ecdcc012cf0cc38b99f7e523035ce6dba5d8f3c9bd30e73522faff4d644a3120d8e169b78442e SHA512 0933a6f98524aec4feef86ebfab65987b7146c729ebfbdd15a555444255c7abdbcec2e00c4dd0703fe3817faad3dbc12ab08549682ec123c184fc9de4b23402d
-DIST firefox-60.2.1esr-az.xpi 524744 BLAKE2B d25d43455df37eaadc21878ffcfe118bb0c0125448a693f78a7d2f7f23a11634ffba6f9b09cda5bd5be78745cd53ad6b0d51747138408761a59395dc513e69ae SHA512 74502ce380c43e39be4fc1906b92badee1e4072ce43adb7fdba30b439474fb5f6af2f6653cc6328a5a7f4e7c2115e304d4e07ef39ea6f15f9afd3ab8c3c0d48e
-DIST firefox-60.2.1esr-bg.xpi 573850 BLAKE2B 700a0d443c27fb28c853ede1b5b3695491a01f11e465823aafcaf72a6a2834615b4591552f3dabeca958554f9cc4a720a9abfed490b4a74dcbfec5086f026a9c SHA512 713ab2367f96643d09184c90b96a546212481752c8eafd0b288bc179668954324cdcf0776e9d3260d2dcc51309c69ab427e81d628d292a90437c89daac96ce7b
-DIST firefox-60.2.1esr-bn-BD.xpi 590419 BLAKE2B 1fed2f29c8b2b5a6f891cfc3df57cb2b412efdacff80b72fb3317e9e05d03e90e2e6046234ee18982c19cc001ffd7d527eb992b30c27a65b159ebf8ac93f3972 SHA512 e0ce69f4e318e795ba8f7b1036956327bdee40c10b529c40814ae326b58a4b2df71baf22fdd8801c29b19a445c8f5eaa289470d10bd5434d25b5a8dfcdb929c4
-DIST firefox-60.2.1esr-bn-IN.xpi 570872 BLAKE2B ecf77b607abedcc02d3c1876ad59468f44a6f2425bd38c1334fc1a42e121a3e31488f73a0c7069cb515b8043f4857690e20e2354f675332a71cc35306d353a87 SHA512 823ec55699c0256f4f4acbe51ccf2c6c323450d162b27b47d039bbf197ecb46a4d83f1254962acd68e0ba6e4c9642cb656a3fdb6dc685461e0d3ecc5d9fc3722
-DIST firefox-60.2.1esr-br.xpi 512028 BLAKE2B 51c049920d4affd5a06dc9ea4f83a4fdcc7cb94811d0eed66d8b910dcd59140db5264c3516353b6bfb6079c89a23e98c4a76dd6ebc586d6002cbe72a89f34910 SHA512 554f2164265786ea7574c5bbe25f8b463cdedd94f239571f3c93b15675e8d29e2c614b308c7869b3b74dc0b475dfd6c9d4b87a00d1320557e46cfc8fd580e622
-DIST firefox-60.2.1esr-bs.xpi 514709 BLAKE2B ade6a79e4caa43f732bcd5c20bf9448cfe937d5ebaf01d9505585c806c2f674b7a97dcd1f5795098a27d5b81b5fd632675f64fe68f959a1418c9831a08d12ab8 SHA512 d62d71219cf7c88fed885eef8985066ed9cd8dbcb7143780d951f3f092748ace780c7917367f1d1f456b4596c6068fa3bc33119b228a743f1ab8444a4d74c3b3
-DIST firefox-60.2.1esr-ca.xpi 525260 BLAKE2B 63c5e5f32266455e2a9c540dccece04bbe816bbd15f1ac7ffea0fb55645550a24aef89c798e7abb081bf220c1ca2281c036c7604c92fcc64d21ff823d6b63c5d SHA512 c4db680536dad3060a495fa893b8e6cfe37e1fdfc63cd2f5a797cd506ef1aa3a85325440623ff59630b98546d9ef0d7444902972837283cdf8fe7b9441aabe90
-DIST firefox-60.2.1esr-cak.xpi 536294 BLAKE2B 4aae7867ebb0ca38e15106c566607109f62b2237dcdd40356814d9734fd4e819c261000ea4663154a2ccd0af3cd0c140b55bb64e5f3f7dff07b37583cf9ba69d SHA512 e5d4a0bfb129a49aa5ef3e0dc93362d585dac677a0d8704e46508e63a8d23ad0c0e36b858bf7422c63efdf02d0ad01a12fdfd7007419d91d109d8d0cb0dc2968
-DIST firefox-60.2.1esr-cs.xpi 531795 BLAKE2B a72c33d8068c92b246e64e7380ba6d0a6d6dc8b2806af910fe2077e0e8a04f1a72fce16743a7b483ca44183464b7300956109f1d28fde47fd89fd1cc87dd2ffe SHA512 43162e481e0c688c73bb1c6eea9b2c155c3de1dc9bf2cf6e213e11fee5d25b11fe863a640a1e71bb799d9be60dc4110533456141b1b36be14c5d9740216495a0
-DIST firefox-60.2.1esr-cy.xpi 516631 BLAKE2B 70a67b1e38aa878f30bbec329c9befec544c37cf16e43b11b5b6ed5fad20f5ba0553d2fc279599d4dc363c1b3274154ff28cc54760ffd9026afab3c748c8d7eb SHA512 bf66b62269d5f8048d3778ef0cfea7011ec170e517c21eb7af96e8c36babe3b411108787bb6f65a6edb958bbf83b5046a49a910b55952d7a5eb2074420493042
-DIST firefox-60.2.1esr-da.xpi 510750 BLAKE2B dd86a1084236da7b421154e321de6595e611b9074d2a0c3c467fcbf831dd591d5a5049e6b7b649dee8c2bbd44537d301cf9b9a0634c55f8dfad74482c53a00af SHA512 2196fd2be67c1e94f0084912d804a049ac4334639479cfb75f58b439a53018350bb360b809280511a01bc9d24b9807650607ef28b9dca413933bac145119831b
-DIST firefox-60.2.1esr-de.xpi 526520 BLAKE2B 7f905eb624fbcf97f7fa5e043312b6f9a82bb2ef2b100d7eef8b69afe0e81763977ea1c1c7381a5220222ced8270a9c05d0314889040b8395c7056ae338a731c SHA512 b88b3903270221313c6b46cff9fd9f371d7b1e72d4527dcc5980592ebdf5355f6cfa8a04654f2ab780f4332a6a0185e33ea641e7ea5fb709b48b02e350eb3196
-DIST firefox-60.2.1esr-dsb.xpi 539523 BLAKE2B 4d2b5739bdf72ead5f763ec6b14f6ae6a062e387a265b499b2bd1e317157e340277394f456d0858da20ef1c1fe92d52d99bcc718491be0364e58bad585a48cb2 SHA512 0828349aae9f0dff237e0922b157fbb1c39a4a60a61eb788f02ba367038da44d85417a336abb78cceccfd682066897b60a23c0acaf05fa159d89b12bb1618bd3
-DIST firefox-60.2.1esr-el.xpi 593693 BLAKE2B 08c8f66fedbf18d25599b25d979cb851990d719356411c5f46892b6786c04c1f3b7e4bfba0ea842e02ce130490fa741d6682b5f6960adfa25acb08323c98c168 SHA512 cc2febcf1b132ede062fd1f713fa0273b78d8cbf30ff5660562068e9d29c50aeb4d6fb2e525ef46e1cb695dc530f92ad15e7c84f48bfa863a55a93d674aa852b
-DIST firefox-60.2.1esr-en-GB.xpi 491693 BLAKE2B cd9a5a8d72f975ed59736411600433c8ae3808e3f65f470e05c0f6d45199f969ad3167d9ac44799da7d23acb5a1d84d31fdb9dd04dfe2f3e75a1e16d83ffd315 SHA512 8f3596ca7752c26ad9343688da04079d6f4b7fcb27dca4e278f4f914baa5c46d9e83a28b0725adf21af342803e8a6bb56899f4dfc52ed323cd915fe303328bc3
-DIST firefox-60.2.1esr-en-ZA.xpi 474678 BLAKE2B 85ab17f191e2995ed8eac45d70d4db50e298b8696039fb2edd7fa75759d9898d71446bdc9afe744e502858c9b1057f3615561bae78c6c95e50155c5047cf8bc1 SHA512 66c38a8bbf4be07fc701ad3386185063769611dce0e87c74ddb69e2ac9a342d326709f705e8d09d4afe2c0032ad404ca6befe2a8591e36ef3f4a8080f5956003
-DIST firefox-60.2.1esr-eo.xpi 511260 BLAKE2B 0a7aac7d52c142ce7267a2adeeee7c0facf18d6069247d1ae37fc363847a957bb6d5c950629cd6c0af7d46d52c70d7b85f4cc5d18b07b73194ee5489a6dc4fc4 SHA512 da64f335b6ef373532e9026d63a70c01e3240d8fb5a2f6a3dc78e234572a4bec1aacd4f8ca75b31d8c9e334f82d31e8cb4c0f9108f8c0429cebdee48da71576a
-DIST firefox-60.2.1esr-es-AR.xpi 524652 BLAKE2B a8cf3c00743d49872f9e77fa8c3a825d7d7c73fb0c85ec9efe451312cd529efe713ce7eabbd2cbdf59d8065c513f8b7c5e4119f6ece7f93a27fc842a2db7f9ab SHA512 e6ab5074fa89c036b7ec9bf8072f7baccf9d1322f41351be7d991afcdb96e587ea9c0c844128534f46f38e4f06c4f88fe0c1d937a10863709ea102b941c9b81b
-DIST firefox-60.2.1esr-es-CL.xpi 527326 BLAKE2B f9e47bc109683b42962f8f4ef3ac3a450ff7ce6c791a817eae82c0fd26ea48b2ca7761595548d51a03d3c0458967e59dd95d9b9d7fc496f2799ff5d3e250cbdd SHA512 6afafca49ec98fd85a7bc08596c1fd905cb39449c89bd343283250f9547b18f8cbfb213f2e9dd23fcdfbdc413716572abbdeb4ca5c4621196e3127eb1eec79dd
-DIST firefox-60.2.1esr-es-ES.xpi 459964 BLAKE2B b2b751574724b07776b29f7a27a6565077620d28bf06b89bf9d9433097a6ba307c2f9d993f4292025d755aed6662b563712d4a0912ba4f77db91c2b2b3f83871 SHA512 fdf8430a1acc8cdfe4c6d6d3f5d2697a69fd599dfbf207f1802128b6333e533dc1ec4e43505835d150d8d23d4ce6528c732ef98ca0e1d022b4f508e7d1fcfc96
-DIST firefox-60.2.1esr-es-MX.xpi 528661 BLAKE2B 5b522485b324ca7c74258a3f4fa06df20badaa022892ac9e5aa6a4920ca2061ac995642f4b84001c09391e28ef065bf1d61b30cd91d0135226dc83e73261d09f SHA512 8e26ee724c87e2e5f385a53f4e04fb6d04f4bb223cca427c2a36df06af379d020d6caea937f9ef4a1353e4157f98c92b8b6eb80f02c7b486c56bae0563f13550
-DIST firefox-60.2.1esr-et.xpi 504970 BLAKE2B e4b385ecaefa9f97bc2b39b2fd7b2612c9177690b157633489897655aa5a799e9b4f7b4f8d2939a4ed9bb73895f2aa65c0959f65d5cfdc7f0a90ee8df5787046 SHA512 b13c9cb89f9dc316788ada4d1b4fa6ff9290993d26436b73bf7cc9c3913aae018918d73b5cf3a14f28edd5e8f3fb602188c7c8b3ec9e17f3dea5928d4e6e7986
-DIST firefox-60.2.1esr-eu.xpi 511713 BLAKE2B e6614ea19a7605277016865bbc4122caa0440477e44e023d9d5fc2b7b94880285b5aca7697c924a78a3c55014818c84e9c169842213e88b2cf33e5a0acd07525 SHA512 0c018b3c36910277677125281194c7deeb2df59f2016bb37f9a051fff7ead6a92bda579e3b6dd5b416ad239462b9c5cfd58a53b02d68f00c10c31346bc44fcbc
-DIST firefox-60.2.1esr-fa.xpi 566263 BLAKE2B 323e22fb85a9cf19d1b1995d331b21d370a4c2ba303f43f9ec2ced0662d1241d7e81f8c3a3e03836795214c746a87426a209e35b9a750264a680f068a4f3da34 SHA512 1c3e96a63af1aabf425df8dc8666e89906611a29829f2f2a73beec68db2d72e7b83009b4686fdbc6926ad16faa527e5990ac4b31c2e93cec2f53c3396101b3d1
-DIST firefox-60.2.1esr-ff.xpi 512203 BLAKE2B 53063222d72cccf160685a5ed207e1edd827800340fa62fc6eff6648033ef1bf6c01675babc5f3d30c279870ef527e63ab7678a617e92d3a7f4e3308577b5553 SHA512 0e42c92af27061491b99418ec5975441881c0051231cd6856f488fe7e9ebd27712f95fa37cef9f864b64f723c377714799e4655cb327deeea0a83117d29e1ee8
-DIST firefox-60.2.1esr-fi.xpi 506180 BLAKE2B 355a70fefb3498bc6d6fc55324144d6ea07bc7ba41da967bf5e43614e3a5cea1e503e31ca76ec61582bdd284fe7bdabe9c44efa119f73c38c30f23294f1c9ede SHA512 7c9646231ddcd7ed15281d8e3f226924cc3007f4e15e2b3fe94ad1a397fce6a0af8a80809f894ad6aea9a9b9f0d969c81302d6d6d22551998d5a7099a92320a5
-DIST firefox-60.2.1esr-fr.xpi 536070 BLAKE2B 26a32910d0721a75b6efdebf2cffeb90788530164d69642683101962f62245407a0b6d7fe2a85cf009cddf868a000ee4c6bcc0fd3a27c5eea55c5ac4f737ee20 SHA512 16d4d083d757fbf7e157240216710e5a0ae68756dd0debe24c17b4b58216aee776919a398cd1694a41fcefe9b62e056ed7a30d3f6252ccbda4ae14daf3610a63
-DIST firefox-60.2.1esr-fy-NL.xpi 524520 BLAKE2B a37ae4b18ee5ca9bb5633fb0a1a0e4912340377f1e89517ca5afbbe6d3efadc6b0bb2ccddb273dfd9326d1a07d9d8c613f6e8ce0df852f303d00400195e0b120 SHA512 8541b14adc3f0137315bb1f8e01f8d16774ea733b9ddcacab30c4ac5d2ec638e01bb8a78c652ec487d137ef2512d17ed783bd6ac77f61cf9aee1729a5969a556
-DIST firefox-60.2.1esr-ga-IE.xpi 526986 BLAKE2B 891216da282cc7e388346b233f239988ac14a862203f23c94c97373e06fa84f4248c0d8d5cb2ac4e95f2f70b947adcde4f5ca2b139119b6677205241a5f4d468 SHA512 80bb5da8a33050e2576b15ae89cb1a412a9bda63d1ccd0744dfa564540c9c74eddebcf4981a159fdff30c1a3f5b5896f3a155f2aa2f74ccdce22974fcddafb82
-DIST firefox-60.2.1esr-gd.xpi 520866 BLAKE2B 8e631dbb5ab964f9e24ed663150dae899f5bd63d914439b36630f3dd4b8ffaa68f4a76eabfc56d99edf4df12f8d5823a04baca5ec6d48997f227dde9deebae9b SHA512 63081b97e3fd156dc75eeab35fbdd2adaf8a56f326fb930b96364e9087f184e866c43cb4cf9605e24b80de1a393684b1b88edd81bfc1d5f3d463d147fd75d664
-DIST firefox-60.2.1esr-gl.xpi 497372 BLAKE2B 5db157c69413cef5f510c2b8a5f0170e6152172e14198a0deb92eac67ce97e05362b0850d0bf691b20a8d8617cf2b894c9801478bb6f6bdcb756eefc55dcebf8 SHA512 9c721d8fc7815dabfd7f753e4c11b877bb9d7a594c786620b0ef91f362bc9d1ceb357c8be8c1e1767e6499d52511af0450fb2de2d901bab43ca2c2a517f7db32
-DIST firefox-60.2.1esr-gn.xpi 533218 BLAKE2B 30f3f874679bcc357b032b89c92a9ec188afebe9fa457e177b9259b11916f8623ab850d1022f8954c05e8593f6aab08c2070c2d00b7277114a8ab344627a124e SHA512 3f80ac79820927f5d3b7c6848e3bae8f1d18da4a9f6a26daf1fd8263e6109d01b727e8f936240c8ee808d62ec3ca652045f49585ab8ea5a9cf83ddb163c189d7
-DIST firefox-60.2.1esr-gu-IN.xpi 590264 BLAKE2B e70c3d860e860266ad590826a1332ddd198892e4ffa11a45ec42a56c3581b97c67b85c21734b91699d991ef1c66b90d8aa457b9540279958b667113d3d2243bf SHA512 2350735c90709df3e9faad4245709ad52d9794cbdbebdecfb40c70e778d8d1f3e9735b515861856df58e3e2c787cefe7d9927fc51d44ac4732740fc9394bea09
-DIST firefox-60.2.1esr-he.xpi 535983 BLAKE2B 5193f243ba051bde88f274d801fbfd6c177d630fdd13b71bf28e7a30ca53500f903a989c9fe5e3b7a5dda48f38d74210a7e0f1e0a8653a84cea8e89a854c0d91 SHA512 a5fcf5b887e307d16b381b8c9ed535c921fc312854924b05a985510949a358bfa069108541cdd0a1d72e6e0693a610de69dd39e08d945c138a4a66ddae030bdb
-DIST firefox-60.2.1esr-hi-IN.xpi 590854 BLAKE2B bccc9162ebb1b598d664d92dbe1556dce2456fbc4ee0c93ac4142d45bb494db317fc5ad1091cee31253404785831b21ca1b420738acfad48d70e1ca055a86c04 SHA512 7f7768907fc8f7d430ddc745f487c16867dda3260ff93f63043a90d116b9d2b8c80ff7fbea5eebcb174ff4ac47ba9cb1df579a124579cc201082630eb216265d
-DIST firefox-60.2.1esr-hr.xpi 515957 BLAKE2B dbd9710e96b52366a4bd46f31c5407d4eba07e2ba595af1ab1254f28d48d5cfb6a56b1322352e35b46a80045f33ac72a735e727129d0bef950fba027295265f3 SHA512 fead336c0a605c9b926ab0c8335fcb8a4c4df59ffd375e6798805bd43bd10807543773fcaa31b5687bd42677d063711fa446133f43347f3a69c63386345d4f8a
-DIST firefox-60.2.1esr-hsb.xpi 537068 BLAKE2B b548bb08f0e5a3a3f37e51ae41d4d5f220902d9feea3ee31417c7f44af8742e7e1d475b4d965921d9953120e6ccb2199de5cf88795770aea9485e794ce8a6625 SHA512 39122073ea2df43646e90cb503c2db7b16e21f709552fcad2db9ad2cc8ec52b37bde3eb0897fa0edcf0452675e37b790572dff32369b9e1cc98c952b4ae299f2
-DIST firefox-60.2.1esr-hu.xpi 538416 BLAKE2B b2bc693907c7ce871d9ba248d57d292329cc274117da43aea014c15143fdcaded23f006414f1998a0b65e8a7465cc3b84e802ef481104c29ba016c578c56834f SHA512 ae93e50efa9cb95a9920a1bf254b151cbd43188c780705a21f67d384f7a7f2a1c02ee0fb63c49cd178c6b8fb5d0ba2e743374466a5080f087fff4f7759af1fc9
-DIST firefox-60.2.1esr-hy-AM.xpi 569422 BLAKE2B 8562d5e4910826b6702a6e18eb03e0f6b297ee622413ac513b5d507ba75e1d1592a9a96479cbb312df5c59e7596549bff3b5d1d9205c9ffcad9141c7bc286109 SHA512 dfd0bd88dbe993a4b2083880bd722b0c26e88283b110a35e9bf1f69f05e516c584338db5a7585bf6aeae6a546eb337adb7c79380f41bea3f58fcab79d5411285
-DIST firefox-60.2.1esr-id.xpi 502222 BLAKE2B add6228c2e78c3f791b39c9d96bdbed449ea6a4b35d81cfb3931030b6015f14bd7656ef7a1b62eac90779733c184020d0c51255c1acd730754fb04aae398e305 SHA512 4e4bebcccbba023f6e0326c6115de01eb96196c155991944ccedecf3d1f95bf687d19b67097a6e7f6fa160d5132ea1b632db895ef8c59fb0f59e2c6e96b84aa3
-DIST firefox-60.2.1esr-is.xpi 513264 BLAKE2B 998fcf37b5feefec731109ab3a9a72675ad235611a8e4b32a83508a219a0b9435d542da1f1a77d02d711d2c31bec68045aee4de91c9b3c798c15963c6bbfd301 SHA512 3f8a220a4db3feaca7d16e6ab488edb4f9addf8e2824cfe99f321bbd743fa269ee15ae43843c3b9c8a11e88f01595af3b66bda49fb608efd575f41f17d623cf5
-DIST firefox-60.2.1esr-it.xpi 399099 BLAKE2B 8ac0493880ba91eba2cdb254459e61c87c78e924191b3812caa2a08816274c200e214a201fdc4649167c32286850caaac69dfdddd7b5d2c1553a8b398f621a64 SHA512 1b8fa8c1359b71a36c5e2f34c8c376cff01eadcf13db39449a3462f2a68ff6c0f0ed96e4e94509f4c45f81e8913e8bd0da3bf6a355ad018ebce417eb72adbe29
-DIST firefox-60.2.1esr-ja.xpi 572012 BLAKE2B bed397a84b29d4f18c4a4070ed62639cba44cb2195e40657b19d91f105e8e8cc5c5cd32a10961a34b73bd5432ec213098f289f5bf9da7839a87e1cc068a8b26f SHA512 814c7149f21e9ce570206691ea7b9079963a9107dcf994dfe385c4cbba5ab8c55aa81dd796f6c8db4cf4232aeb122a633790340dc76a936a200952ac8e31789a
-DIST firefox-60.2.1esr-ka.xpi 556851 BLAKE2B 925fc42fc427988133b38a4df06e30b767f1c51fc03d3ee31e472769fbf19e4592a4604afa38d6c30bd2da9d2df8da5cd44693f0517a79e9de59f05b021b4c0b SHA512 3f097b225bb60c4752bf39d2514748a32bfc371fc70258566ff83c4e6717065437c43dd504af9c757983bb1f5f4a8092478b64c6c8efebd302d416e1d256e738
-DIST firefox-60.2.1esr-kab.xpi 520397 BLAKE2B 6bff05c149de308eafe3ca649f928635cbb2b2545a1287d1a175a7941615bc861d7c3423580d23ce0ef26dea3d2c69ac56dec89774ab3f3186abef835ffc3bf5 SHA512 349ad63ac904ff09a7410ff37d7d6975ed4b6b0df46b4dd3f17c8101bb17390522a3cf058432c58c3d4ed874c05b6bf35c81f462807399a390acec41dc32329f
-DIST firefox-60.2.1esr-kk.xpi 582980 BLAKE2B ceb3c59528cd199d09e3bf69f483b133c9fb44b7c0c7e2666f183b686343c8f10e5b74c2cf6ed6a8175427f8cf13ea5fecf07f2feff434957592b67b3241c888 SHA512 29551f9649cc70a1f8952a74c85cb2195967190580646f2fc4120418f925541cad84b11b3b4a18d4d1b60ad3f4ad3f99929014d365681414a8c731914f752259
-DIST firefox-60.2.1esr-km.xpi 583107 BLAKE2B ab4e9bd2479f12f8db01e338b3b84b8cbe1446143f0c6720b6ada1c66ff7f6126881a3815647ee1faa18b05d816dbf06b538b3867edbd47849fd24e9fbba95b4 SHA512 4d951d3db8ca2ed74ec9bb83cc0a350727cb71ffb165fa72b2cc9c7688e3889e7af019f8eeb46910f13e14fe8edc219f40c5c13acd50da996ee782b791ab5d25
-DIST firefox-60.2.1esr-kn.xpi 585866 BLAKE2B 7db228c0d8f7e24d829d183be1ce8b1084b6c2de76d202ced4898f06878095329f28f20d52d40dfe4eaa8f73cd798ef04296fd426a42809c1831fa4d0eea9c69 SHA512 2a4668ef159b51f7a9e0b6731a202dba39040403e70499d8c2963436eb83a6cfd7dd8f7dbbc067e584954d51be13bb1c61515f1e3a050697788dac7deb95bb9d
-DIST firefox-60.2.1esr-ko.xpi 547820 BLAKE2B 6ecaae033c6276592fcf31f32c16ce1ffbf751594c4a2fd5e4e91de33b25c1038d9b3c3a12a538c9c6f820341d7f766a57ead19ff872ba337643445bbb3aa9a8 SHA512 739497a39e2da6e3b6fee9140d164e3540fbe29013bb94e31b874c3b291a0e8ed8ee1f63da86e5e68ef1961ef4aecdef7349fa75a9a3af591b1cc20004d01af5
-DIST firefox-60.2.1esr-lij.xpi 513177 BLAKE2B 7433fc07ed639165a1de5089296a6624e5e2c6301e0088ad516e2c7f594e427ba4848f2c86052410280690182561f0a2fe39f5590722c4356c5b77e5cf582e09 SHA512 43eca35efe6f6c4c61f3b83283ae190e4b5901d5e00bf40fa41d4da035452d6283b61f17803028c8e4b17babbde6847001e7d4ebac1c563ca75baa7f12c632d7
-DIST firefox-60.2.1esr-lt.xpi 536465 BLAKE2B 175f1c4ebdec885e0e9464d078744e6eab918c0fa6e32925a0195b2f402d88cc318df2f2b9888a5ad4d2ac97f9266b0d4541c16cf31eb775b2bc2ed8093f54bd SHA512 350b3386063a529bd49030d0cde5be13c3b6482112e42400f177e31747c2a19edd4c4bb33d26875c7895e4dfe32aa773d4f02f3cdbea64c4bb6be64418ffa7aa
-DIST firefox-60.2.1esr-lv.xpi 526414 BLAKE2B 6e78687327d8fba93828599169d539de8f4f16826a1fb906a9788537e4b3c31aef3a87aa53166512ac637e677059b30885eab223fdd3de81bf3cd4a7192a91f7 SHA512 99ac1f9680bb57166b2cafa973748a2b1eea2572b2abd44fe80da475e167a42fff6f78b0df3d30e657642c7c9f5e8a878835491ff96d30b2b7eca2d7b4353cc5
-DIST firefox-60.2.1esr-mai.xpi 549254 BLAKE2B 1245f6d28d3a16c6a2ed3cbd3104eb19674035bfde76c8a2457219c3742cedf5d1cde0f67902511776a640ba6c8a26593529c10e1813a4c99f60bd44fa9c2f04 SHA512 cc31855cf4a49972bba6a807cb64f084eb4093d156b529fe8619903577ade6e37fb114e99563a5901e279cb7958085eb3fa3e97dc16e3abb01fd1f67e1b8e1b5
-DIST firefox-60.2.1esr-mk.xpi 513807 BLAKE2B 7abb877766a81b348533cb47a035213efd12f22fd6c386d7a459367431b189726e9d2aaa7890618a81279a172cb111d11bb9642363536929e7e417c147bede2a SHA512 bbfd9ed4d3c1e94b56610bdfa7280c203690ba91b6976e2ba948a0e6375c80886a86233c7140267e9043179ad876d703ba178270843d099923bb4aba599454c1
-DIST firefox-60.2.1esr-ml.xpi 598973 BLAKE2B 34679739f35860298f185a8779dff6c1be932ad1523364719d5ac493476565c9f9c3d8c7838f2a36200e14cd6f299abaf30439034869c1be70642e489d087e1f SHA512 be33c3b405862f4bc2a44cb7cb49f6cd273ee4b6310af9f63668db8f19204cacb1c3f2298e042d0d6b6bcf11bd590054c1982a98777fa94f8cea80aed327833e
-DIST firefox-60.2.1esr-mr.xpi 579110 BLAKE2B ac6310cf6101e99699fdcd33d95e87e154a5eec0d350c0348773602bd2be36327630191f6b6665cb220f25a9fd061fd8c92e36e124b8fc8f5ec918a1b2ec6eb2 SHA512 42e515596edfde99e3804cbbba7b4e33beaa055f58e0682f7f9ab8f3e95845f5dbecf3abef3613bdf6a7f37cf16c79166b123cbb5027b621e1921148891de84f
-DIST firefox-60.2.1esr-ms.xpi 509555 BLAKE2B 5deedebc4bf81af55d24e4b1ee5289c9b93ffc5470f76ea216a35b8eb415bdb6ff8234073012c09b6827353550be12dfe7b1331f97b4fcf513a6d549f546c014 SHA512 4c12378825fdbaed2c17228ff12a5669abd913cb9c56a9b17bb4cc4510529a56140058d14c22b7804570a80b21affa5930fb71d8110f45beb6b21062af4a8aeb
-DIST firefox-60.2.1esr-nb-NO.xpi 509881 BLAKE2B 8c0b393a3dc584b4049d2b09305d0f5f66178f3b87c59d852a0025cad58470f32f43ce404de515d141a91b4cbfba175d8fe1d369b087df4f9c0ad12ff755d3f2 SHA512 adadae5b1754757a0461ce1ba107ba5ba23f3f867b68d0361e2d6a5051729b06befdcad6fd8b3b63e13b9a4aa6871a0f26f3216e44d564fc809c22ff2672f7a7
-DIST firefox-60.2.1esr-nl.xpi 517459 BLAKE2B 73f77da10b4359f9939e49167e0c0edb1f2355ca8d03f8daf256102f9fe5e2a21b7cd782e29ef64c81cf0a478a5e8623d0306936ad72534bc997a9215dd4eb3e SHA512 de739eb10b35ea1ee9f058aa7660c3e64032194fc73b5234bf578ea961c29ed7a4600f1df467e5a356f1b3dae6f1223763ae00b0dc8d8669756a369736d0559b
-DIST firefox-60.2.1esr-nn-NO.xpi 511436 BLAKE2B 6e941052e77b1c8ba4180a0fad7875dab66ee3fead9b69bf51c485b0c5be2e8d8cf227f0452776d369ced1d4b8ff4e4ff02b7591e996325b71545d77ec364a7d SHA512 fe80c4cbcd5b05ce331f33c898d9482b7071c33aced0df03b9c195c375bea353877317d228acde3874c911c5ef6c946b8ddad0c113c9f0b7f8936ea5f727a174
-DIST firefox-60.2.1esr-or.xpi 540869 BLAKE2B 6e9252300e931c605d8c64631d631b5679414a56d8e9b5607d8be7e2385c424617efa01c06abca8df0892865ffc3dcc66274609716c6a2b0033ca91ed15173df SHA512 0d6747b1fb490cd8d9edc6497826d87dff7d3d6058e11a1d423f35aea2490dd9061a5f6048b24db65c6b7bf885baf3564873835eac96c2125366cdd646e87671
-DIST firefox-60.2.1esr-pa-IN.xpi 557873 BLAKE2B 44b6dba7c6462a762b3e6ac63ce11e51bed9524ac1726ef77a38ecc03983b5a1eb6e5229fdb817c6e94cfa10a751106b7939d0ffcf84649e3a12ac4f8dc2edcb SHA512 aae349a239adda60640b528020700cad18bb7aa63f0c164a0a8fddbfa7d4533b9dd0ed73997496ef7f1eb79adb38a8495d36f91ed56d9cf3b85b83611b99c4eb
-DIST firefox-60.2.1esr-pl.xpi 419019 BLAKE2B 4b62ad449ffd2582ef2e1eaece156d142b16c17121ae5837ffb67bd236d45c786c1989a38d4b0be77df11cad2e9b9709cd2f91e8294a7edfca5afcd3a6822fed SHA512 423c3368feb5c279c5ad1aab63ebcc7d28728af434ebde438ad9df8eba8ff525382f2929d9f01bef3e35b4b1fb822d975efdbdbe0f11088b6fbb753c9d8ed61c
-DIST firefox-60.2.1esr-pt-BR.xpi 514760 BLAKE2B 10c7f55ee9e6ca5a7242efbb86b44c6539b9992980f1f3576da8277cce9dc0875973f9915a23f3eb86e81b04d30563a998a941b09f7d7dd778f34bed9832d685 SHA512 3c91cec7e15e22b5654e52155d44c7449da87a5276e59860da5c8006db79126fa1d756bcec215b8e69a5f3e1f5cd907adb4aedd90ce4834b0f401180d86d84f9
-DIST firefox-60.2.1esr-pt-PT.xpi 519358 BLAKE2B b35ba550360332c4056d487e243392ef2e16b79f9da37d158106b22f37a3eaafb7b97c3cae5ebac3baea8e4f5ebcb35a8cb6994b86da7271bafd3e9124eef0c2 SHA512 090189f942d8a8befbf50ec027fc030e6e4cadf0d044bafa1c4973e6d34416eb6f4961c3d0c1027c80e56414c1cbf4340dd1a53d2d8f7b6266d7f76e1b92f4d2
-DIST firefox-60.2.1esr-rm.xpi 506044 BLAKE2B 9b9305ddab1a84d363df9e261582bc26a8f4c47df7d99e87e53f389dd8d86f705164041d4bc2bde4199999e48ea8909611c7f46fe199da0d766a3b09655cae5b SHA512 156a003bc3af6c8a437ed0f28436cbda322614bf82ab2bdef01d16763c0de1fb68201087006fae9032cbedbef98bad699374617e9e5f01f90032abcc94eb9e7c
-DIST firefox-60.2.1esr-ro.xpi 514055 BLAKE2B 0b5d3065d2f0ba5929ed65e4d7680187c046d7fcfbbc1e4875a38c725c999aa8e8ad3089c99299cf32984e4ecae318cf95d68f6c9e691889009026ccd1330acb SHA512 a591e67839cec4b31abf9cdb404f3140b891fff7cb230ca1612558bf74efee03c90d78029c0a515622abce223bd62d2a04cd156fe53f16aff9ca28157cec6d5b
-DIST firefox-60.2.1esr-ru.xpi 591394 BLAKE2B 79aa85678ae0592c6aef5805da8b7c4f072a954aa0246350c27b8f2f1119a783aa2345c47735fa08684da4cfd251c6a54056d07e6ceab4923d999eb4ca3a77cb SHA512 e394b677b2778fa2102339e0c4251005454318380863b68f547597ada1edfe039d737ef3abcfb97a75caa5e3a7b603b9db1afe852d75472852d4d7ea5e34eb35
-DIST firefox-60.2.1esr-si.xpi 545575 BLAKE2B cd4e94ce1578cfe5cb40edbf073d540c678a5aef00b1b39ace6ead1fa6e0a37238f7e8f3f51d1705d30dcd9e9bef3af78e2d14e9a65f72bc4a30797fe3822724 SHA512 05ba2b4d892a775a17b94137ac48ea525dd7bb34da4c33d0b8c10727b50b47ee799323aeb6ca7b3e76308d694806a7e17442b2fc660dc82c1f645a22c2606ae3
-DIST firefox-60.2.1esr-sk.xpi 541694 BLAKE2B 826bba811e5bba44962720b2235f5efbf98657bf27652b6aa98d6e96e497478d2bfc1cc8db25466ef12a548289ec124736c1b31762b7a262dd2f1fcbe2158342 SHA512 5413b9f3c1f7c04d40b326399364b33c94300a49c62e48a39182694a266bc84ab67fc796b0a65400462327c714d6af387e44d86a56c2f98632f7cd246a25ebdd
-DIST firefox-60.2.1esr-sl.xpi 519371 BLAKE2B 31bfe473f4c13178e810fb266269aaa9c49f4201c9fc336ffbbd842cefe4523bc1c6c8d446fd9e1b9aee522ede009b595ccd58b04d1ffc4bc8a0d12e0a1b6855 SHA512 d3826ac50f26a869c129e98709cdf7b06d800a3829621f9e5eac5169ab2e5d049ad9556e90bc956c4eaea46cf35ade5d009c8fa97339fd2af31f8786102a16a7
-DIST firefox-60.2.1esr-son.xpi 497697 BLAKE2B 0c809b5ced3e8770a33fdfd86e56b780fe3f5a261b131aa1b1996bd5939d193559ae3192d2b1db9aa1f62cc7a99ed70f874de12c25fc87354bf031ffeb058a60 SHA512 fe0e8e48c42aa55d608c85fe4ef2c795a0afb94a19bbf8752e70f578c3bada4da4a85f6152f8b4e5cac108befcfcdc9665c81fe0d99dca0e0a76176550ce1133
-DIST firefox-60.2.1esr-sq.xpi 521263 BLAKE2B e04919fab3520bd728db9a69c7b4a4d1c8b41d2a0a0bae680f9a4f0764697ecc5ec9bc1b114179fd278ac720fdf37d7454269ef7db8078a618e2ebd7b649f739 SHA512 de302505d8c574c988df9c98e39f450c27a24b4845e21cb47aec504932d754ac3fcc32e74ad49c3d5b74dab2ac313db74799680414b0c5dbed11a3683046f27f
-DIST firefox-60.2.1esr-sr.xpi 548770 BLAKE2B 31935000400ae4fcb419dfcb69bb3c7d9bf623dda5369117ed39f08fe35ee982af98226d7b92d1868a74b9d87462cd7d2ee47b1551b3ec71713012a0c675a898 SHA512 9e74fa29c4aa33ea8e90bbde249549debf46b6f360c065f6c0c155648fd01da35b137c33bcf16af6f9d732b4f7eea7c238c032e81ffc37c1f2a0ba009b058dd1
-DIST firefox-60.2.1esr-sv-SE.xpi 518656 BLAKE2B 064900b8d4f84c74406489cdee0b076dd37385f39ba355775cd069e2977f070ad25d5b5db16c90322e3b768912e53b49f08ace42676d9c063630155c1156572a SHA512 31f8ec90b71d6873d86163e0f63af1f4ba45eb5efce990d8351f849d4e06305c52b5c79ffd26ff37449d224fb599b87f47015efcb4ebf37195711e333657e383
-DIST firefox-60.2.1esr-ta.xpi 577911 BLAKE2B 2d384d19251d2f22984347c9ec7c58720d4d2aa0cf484672e36a5d5f63947d3208a02515025eb6e9233e4f02b893da09d0313323ee2b66c78d0c90fcac6ea1e6 SHA512 6a2c1339c3d87cf322a2f1ef2e9421087fc3ad4fed6f3e3dc81b7d1113e96ded4bc05d7dcd2db6f4e8c9d9eae95fedd68c6d11e7a98b9dd22b08d6f4c5e3ee1e
-DIST firefox-60.2.1esr-te.xpi 590961 BLAKE2B 70c2e6d771f8857f009e6beae689adbd49eb57c50a0913327c5f851ced7da5d0e2cc5c87ebf36c7fe52ed0e85c8fb824e288c479140f5ea6d771900e36768ca0 SHA512 8a531a9afacc4466451baba2373455cc23c9013884cebc48150276ee78985062fc52bf30e344889de23a3773dbd5b09643fddb63d8da125e1216bfc014fa38c4
-DIST firefox-60.2.1esr-th.xpi 562813 BLAKE2B 7a72847298a6164dda6cd18b1dfbfb7505f847458c6c28054bdf7b04ee78c6bdbc9ddcf20f2b48577e99e0070bb5674b1ef4058642f4a62697f76a0e15adb265 SHA512 ced65477b7413663ec52b642f3b2a43e78b38076f1cffbdad89a29b61927a0482e8f602a2e0fbf52fd175bc7adac45da923e4dfa445a452aea2016b53e034e85
-DIST firefox-60.2.1esr-tr.xpi 525859 BLAKE2B b52179232b290d648e2d2afa43fe9ff720d7b340c427a19f2e99557e85dd96a881128d8f1fd98746dd5036a6b6a63ccb1948fd4333ad5202cc8c0d6007124e28 SHA512 04e27ef3bd5685c2c9c6697beafa65f4675f014063708dce4c5ce1e245462e283b06af7d4e7d9f8534ca7be24233a8de661adad43dbd4dae481362fb1d923692
-DIST firefox-60.2.1esr-uk.xpi 580919 BLAKE2B 752c3e15de54fff45988a39ad9be4dbb31a1b1d00cbb33a6a4f4183af9b61e9434a3f623b7d8fb148ea72e1c8fd58bcca34bf2546e12030cca9a834e46e6d0b5 SHA512 457899758c0a16cedc32992877f7a62c1666b2c99a5c5d8f50a10b94e3e8a281d373cd2022e30522ef0ba60d493a2d8ca42d2ab4388bde4c856cc0cd7bd17b91
-DIST firefox-60.2.1esr-uz.xpi 513686 BLAKE2B 8ed43b76b7f9a11d5cb48adb4198057d3c81e6863d5259b38eff2919adfb754caaa516e8139c38bc4a810eb4c96fa487a5a3622e08de3460551d3eb0bd9b8197 SHA512 fbd22f3566864587110f484e7633e13e7118fe8a836de033ec7aeda6a89e68756fd673fbac506c24fab679ce40d5e805396e48154b84ad8e428c5fe8e8712b15
-DIST firefox-60.2.1esr-vi.xpi 528188 BLAKE2B 64ab7584a01a96afe29b124d3b1bf53128060a00e5acfcd314f0caf22e56574c4cb15e0b56b879318e7d11b6f1d733eff7dc41e66bdc8281c81c02e028ef0d13 SHA512 f961bf471b565366bdb3550de42c1dafead3e72f20cb393895e1b0dd30b7a5e364c598d6db9cc4342075ba226e8f3a39e1bfbae39dd003090cb427c0db3c135e
-DIST firefox-60.2.1esr-xh.xpi 511857 BLAKE2B 2ed815e8ebc98a9e4c389e471c987a707c79b60869495dd5c3aa372d5319b0e2d90979347aeec244225cd6372a8955a3ccc0a8ea4ef895e7a9a0fb1b33f8f656 SHA512 d69522bc1d3a4e9b4dde4737b77035b2ba38744454eb84e0ab2b05acad1f6f62952b4028a91dedeaaee30f36813a5779be3f468483ea715d76f3c34d390181c0
-DIST firefox-60.2.1esr-zh-CN.xpi 543584 BLAKE2B bd1dd46b8981c6adef6ca980b89a27592323ec61f9f40249457e0c7a3e6d154138373c28548c66c96de9ded28d30b50a42c280ed9082457a688e65fa55961652 SHA512 5df4dcdd4b0590e4d044ed5808a2f36613f32c24d7a766325537230ab1437649e93a907454043278791ba6f04b4b96b60211dbd32105d7775b731f61e6e0b115
-DIST firefox-60.2.1esr-zh-TW.xpi 541914 BLAKE2B 0e3cf925506073e9a17f4a8f746631a026b22d36b5af1c391f0fce61bfb740d7af724d337d35cb4558d8246e22d9352ac9ddfc840d40875820f0f9706902b965 SHA512 9c257e48b226547681acacaac714e15d3f7b9e4369977402ce409ab6ed3d03cb4e5cffb598be27ca80c45c62a6d01daf63dfda5cee5a33cda8818593250a79ee
-DIST firefox-60.2.1esr.source.tar.xz 269948396 BLAKE2B de085d8a01729a38b66fb556ab4ba751893764401a071f9f704a4965f2ce1fde43919db83f35388fc0609d3254274614966ce7c3365fc79ac62f8d8bb832b85a SHA512 555f36176c1db94580fe45ec71140d2600ab1d281dd752748b8b2d888eb63b1f0b8b219b624a7199abedfe2d5d64b2f2c743fb9628b41c3ca438154c40733aab
-DIST firefox-62.0-ach.xpi 446322 BLAKE2B 71d657ab28d498ac6a19f0212a23f353e66d054ee83e021395d9545dec2ba87145a3c50794215d68ba6cba499e031f8ba1bdd9679e160f060d5e781ea5941aa3 SHA512 edf25863b126619e50a1e39a1930c85826b252c23b5d36c4dc5e808f612e3cbd624932bf63b13244e26d994b71f48e9543e652e74b4decbdcee045ac5697ed99
-DIST firefox-62.0-af.xpi 432298 BLAKE2B 386c4179a2c1b90bfad71a75ce96f78c2be95debf2e2c5893990602d92a53c8332494f93f34bb64d1bec1a6dc494b87f73a80264219aa190e019559cb278ed09 SHA512 34e5130cf2ba469c6b27ee15535cf3783150798bc73cfcc44ef4afa5d90d7e47c1eae24d055ea5ce7317d6f875a4b5b2320a1f28ecc1baeba4b6992eaa6fb716
-DIST firefox-62.0-an.xpi 467495 BLAKE2B 7f961abf6ceaab928e8568f4fdfa2b370c17ffae53deba8b1ddde767b09680aebbd050813869414e33ca5a102bd9f8d74d1ab8aedc8f27fc162c28bcbbd09242 SHA512 425b7e4436dd9b78a93d6b6fab04d1d0dca4c603b7b31cabf505327ed98145215bcab815c478d26c2ace6ece1665283a9c9dec7199c521a84dcd33c34b4b6b2b
-DIST firefox-62.0-ar.xpi 497992 BLAKE2B 3e0cee4665909a58ec9517bffefa11ecf35a3e8858de34ec332bea188d03b9e12edcfb5d190631b95325764d6fb797a83c51560c378bed03152860a123bbd961 SHA512 52ef5921eb3009731126823bc6aebdbcd03166aa3d8450d3a371046a417c41a86c57fdf495e10d17079c3d43901472bc8bd1de3be0ddf589ecd12a5fd0ecc72d
-DIST firefox-62.0-as.xpi 478311 BLAKE2B a156ae4eabe691ffab04d6cd015ce6d77ec9757e7fcaf764650eb5073ade914a17ddb2e10031cb94d08d70396db42fa9e3331e777bc3436216f679b1983c357e SHA512 aad2c64b4b389d8cadfb12efa1c06156e0875f2338f5e1e8d30d82837bcb6f846f2588a476848074bf4b2d0df57511f2ce6078cdd479ae3d673e77294a962c15
-DIST firefox-62.0-ast.xpi 455181 BLAKE2B 4842e278c80a78ea4b1e79d35e7dd038052e5302bc7fe2335a303ebb6572e0cc7785398e40b45b31fac5f223c4e65f5be63d50fd65915576a558e6add0ce5de8 SHA512 a9a35029b9b699294b47b4ddeb69545968497ae8998c87f1335423967ce2ffd127fad86fea626b303e3c6321ec6967f205630a9f23fc9129bef71a0cbcfe529b
-DIST firefox-62.0-az.xpi 477133 BLAKE2B ce82badae789b03ca2dfb0477b635c05c15f23c4861c163e3549fddde9db79d14c7bc1e5c85f62e0adcc4eed80c96bf69fcae39218e136dd32f2d2d6cb7307f1 SHA512 0da7b37a46487a693e261733e390edcd78d25679f40642dd6fc032beff0f7620942344e5644f660456838324ae95dbec6dc97f6e69e664365b3f52df855bd66b
-DIST firefox-62.0-bg.xpi 524206 BLAKE2B c8cd02e672334b1869bc92d9b9f31f30dad3eb485c3f303d83df1736cb755104f48ceffda130f4eaa425b0d3883483a83dc5290534672da86e39aeaa808bfeb3 SHA512 d5c15b851dc1d61874ad81b2e43691a6d525aca8dd30582dc2c23fe68cf23dd96608bb7c2e5c70e4a00965a73246d48eb356bb287e14fb9ce5646baf4c6ed6d0
-DIST firefox-62.0-bn-BD.xpi 538602 BLAKE2B 4ac14a26d0bcd20d16a9c7cc88e42e9edf47ad79061c33258ade65c7acf7308222db3696c0d73017eebed03bbb4e474c07b485466b5fa334c0bbc97f0bc906f2 SHA512 1a776552a454c82399941d34addc834dfb72c84906f243e32543363b6f022c97bc9050eb4c50c44d1e774eebdb877966ae64e8556d120bec9bbae1a3f3f4ccc5
-DIST firefox-62.0-bn-IN.xpi 509949 BLAKE2B 92842ab5d7921f8620fb07a48a1337864633367c17ae56644741edf182aad4c59a6282a452fcba8bc76d15da241409bfb6f5217dcc56eac9bdedea352e0164ce SHA512 e80bdc106f3d73571cb1f803672e6506f9d34c3b47c130628375a77091867bc9225ee1b45512fc6d5ed8b035275b346c3b0b9bd881400d150732e1b2ea2f3426
-DIST firefox-62.0-br.xpi 464398 BLAKE2B dcb2a3f0e1933221938cd734726afa8595723a140ee823fa1b97c227be4d9b747b5fe5ba35c175adb46ea0280672b3e1961e6ad911422e2a8d212746fac2f7e9 SHA512 1b0228e9602032e6b51f4f2f8d0bf55cd416ffad2811c84e31054aa59eaef79400a8233eee89e2d52ff467c4522393b46f2c71f0a1607d3b398c1d1868ebd4cf
-DIST firefox-62.0-bs.xpi 466249 BLAKE2B e8a84f38acde7b03e16cd8265549f0247a5497db85870265a487f5a8aa8334e2cbc66f4abbe4ee39baf07f90e930ce2854d715be4bd068b3ed1daca5c3e1820b SHA512 0b9a6b222be0fd4849dcc5b82ae55d379c284b178076c36945ba8dd8507f0a106eecc1042bd6f54177cf1a86c89879ce1bcff0c52bc5dc7c2f12091619413285
-DIST firefox-62.0-ca.xpi 470058 BLAKE2B 7f9dac4a5010e6ac5d722f398f4b26f3429b9ccbd6a1eaa6078d8351d38b1ef1869012c05214523540f5f2aa516f87ff5ad61b1ef80ab74ccae69e4752686af3 SHA512 03b96834ea051f486b6b4e59e5b36e1f99bd2920c7cb4943bc715b63d2ffd10db199312a9ec2732114bd92faa927a6dfc932512fb3d2b170f306c7933823ad56
-DIST firefox-62.0-cak.xpi 488838 BLAKE2B 0573b0f1078999d510828e91e2dd1eb5edd7d499893b9bfb98dd5c4a7ebad56c8ed7a48b45f3186a8ed755943e3a9693b29cfdd3d590273b0ae23c89fd2be297 SHA512 11db80f1cc450effe94b8211cd5ade6ba2ad50106fd51c27bedb70901cdc2610cae74cec78572c155da77773add6128f182b9dacc9277d34cad3796ea8d9cd8c
-DIST firefox-62.0-cs.xpi 478359 BLAKE2B b306baf986bbcf85fbe0f601088432dc8be5e3a3c0fd85bb198f36f221da520e860f63b551d052f859a4b604a9b878a3a87371a9cce717401b95d0cafb20287e SHA512 8c83954f7ac10df2f432cce0600c62fbc2a6af287e6d38528c6d413ee5a96ab814ed908ea0be362b68f6105a6418997f2adfaa9f96f50288288ed135d718fec8
-DIST firefox-62.0-cy.xpi 468857 BLAKE2B db0c3108a089d0d17c997657fba75da5fda2a8b3f165b08b8367067847f8a6c7c57d163b4e05c534ca08287c6bc2df44173e5fc6477b3b72d23e624c69c6c4bf SHA512 76d50df28f10c8232d67ad8b459d8cf77779dec53252918cab337712131ddf94997382de8d84d4c7f99f680fa12df29683754a97c359ae2247f14270ddcc1c3e
-DIST firefox-62.0-da.xpi 467290 BLAKE2B 5e653f7717ee6e6e607c76971a99944601b46259e668cfcfde4d557aa97f988db92ad5f196beae37cfca65cf87d5c8dc2a35b3bedef67a00b269807ce6a725b1 SHA512 cb28dc5192b205bf4616db0a8f0eabe9f2f6c4b3cec8816c68210cff2d49ed4d987bd91628066eafcce194b0fc86c340aab8c343c630f8cb1e01c4598564a599
-DIST firefox-62.0-de.xpi 475937 BLAKE2B 763a74f2e37509abc1d7810f5c729e3c3c41577550b8ff07102157669e0e2ffeb8ebc99f114780b4768738d688ac538667184552393321189a41396af9de0e48 SHA512 5d279e3fd5e5e38c2e2fac330e5824568d85e39d47eed15e7e522ab8b57d3b40d783ee962cba539f56fa9afd86c5de33a76ed6d3fba488f53c61979fa9203f9c
-DIST firefox-62.0-dsb.xpi 488173 BLAKE2B 010d180ea9dcf902c988b5350fcd52cef9b956510de82068c7b0f63e97f84e1a0132713c1ed452f289d3ff8a1bc9a7a614fb0c5a4f7776c70fef0e3f191ad27f SHA512 9c1cef8601c3d6301e16dd875fd38ab2c3677c93f8cd83cba0577e7ffd8a29ff5978cfbf95d00af93ae15cbf31ffd4b980e46846bac6f705f7e0417dfdb94d55
-DIST firefox-62.0-el.xpi 546431 BLAKE2B 69d0db360dc1a9a4ab0096f810286d1d7af41f9d68ffc382aaa79e0207b6a2fb62c139e02c77ba7abc9defd6ebf7a2936b12e42835da82299e4c329ba55152e2 SHA512 413978c8935fd3f2774abb5769ace4cfbb7e87276970392a873bdbe9b8afec325c553dcc9ee73208db365230da43eac6715472474109228e27d612caa3f20441
-DIST firefox-62.0-en-GB.xpi 436171 BLAKE2B 0cac4c744af097758096f9201a3639c376a3b6e595fb5b42bcac5e2fbc527ae9fbe86a0d661c1b68ccf9482714b9ba4cf1266364abe7d78ce4c2f3b42e5172b0 SHA512 3f3be43788e6137d8f12ecf2ce7ad0f53f5d9fa8226e1649514859957be8481df5a0e31e3a66324410fdff43127bacf2e56c1b8101071cffe17950960ee5b1ad
-DIST firefox-62.0-en-ZA.xpi 422869 BLAKE2B d4e47ddee598f7e07aaaa869d601913dc6b64990f36c3f2f6b69b500e6c82fe5a0e5edb831926ac6209dc64c3a9d156ee8943e672cc3dadb037b4db8ea552193 SHA512 0bc3f546e6aeddc8bf819d965ea0c6acf3d27c8d4f3d437122e4b28a4797ec2a932240f52a7b09d9db995302a2198faf1a5fa44046efd3c12e5d2f738d61d489
-DIST firefox-62.0-eo.xpi 466537 BLAKE2B 14f2595f5e375cd3aab21de674249bf8ff2cac87a07a7f8b924cb9f1ec7a9010be5289041266971f679e44f25aaa8c75d44a5adefcb06b8897b9b3d02d94f5d2 SHA512 67460a0e9807371581601fc7e522e891f3e30cf3bb9e48e6a15d4e1362bfad1e0e282743bee95142476f60c6da052c1ed1b841759ad68af6804ad07f3b3bfa5c
-DIST firefox-62.0-es-AR.xpi 473528 BLAKE2B c2c15cf53410b73646cda9df22168ce7eec0a1206cdfaf75cd7c5fa7bcb8c2b9689ef8383d1e2bfd1a52b41b3f48dc22b790291797b266965364080d5d64ccef SHA512 73b20857966b2a81feb1d57ed9f71c543a247363b4e67dc1f7e987908477ab04ac8fbd0bfa1635fec1e39398573abdcc955846d6346250e71968db3a2db6b141
-DIST firefox-62.0-es-CL.xpi 473981 BLAKE2B f6b8af97ae061fdb9303f540d074439f50f7cfcadc320cbce7d880d2278a09d8ca2ecde3cfac042d9068a7cdefd84aec83df5735598675d067bb2f088b400291 SHA512 e95eb1c60203f4e6271668ebdbdb07c766cafcbdd9f0a5355ce148aaa28a93dc5a0babe5bac1dd0a63ba1938ff47b2ec0576294491588162a1bf13802052d40f
-DIST firefox-62.0-es-ES.xpi 414986 BLAKE2B 4b51a1c2a60d0fa8153a036af2e22ad479831c381bba4575c74725a9b860f855eacd252645c1dd7cf9a49ccc8d686478327aaabc2ef1fb7a3e640a97905e4a83 SHA512 d8062adbafbf2062a817717a21a7d0380c77236760c8779198a3979d78200fcac99b92bb1683bb3110c2ea72fb347fe7f370adaee1cffd3d45cbeabd25d8307d
-DIST firefox-62.0-es-MX.xpi 477958 BLAKE2B 72034a8bda62cadae18bd5ccb6d5d95bd75bad9df1f16778825245a2fdd0fd0f8720d50b00a119dfc42316bcfa398ac965960248fb8c6dae68add9000da2a20d SHA512 0cb1ab0130006e6c05e01e3cf897d4ff70334d1ea0ad761501eab86aa4cf43f0b86c9d5cd2899c6098ce10c238a37c188bccf1c6eb2c582f5f112aa4142ef613
-DIST firefox-62.0-et.xpi 455372 BLAKE2B ae72151a410869d3ebf67947c47352aa1b0f364990676d057f1aec56df479f8036919270c35bdda31c3fab21bfd9469834e157d66fc541e29850732bd69a8ada SHA512 88ef2bb4b1ee259ea26396f716afe283c8ec94cd977205256e9b6e6aec845e786b977ea18f328f61beb65e72051cd0d257a23a5f7631231340cc7476cfea1e67
-DIST firefox-62.0-eu.xpi 465902 BLAKE2B a95ae4a88318cf7be8ed5d0659e724de42a83117becb94759d4ae3c0e1a7de958cecfd92a60b54485e1abe34f9b30712fce994405e6d644135b0ebbdf1e79427 SHA512 51cc93b7b4fa3b3f68edc9589b9cd4426db97b39a5431abae63bfb2651a073426454831b5f471f264e5dfd9cc7a21d8f52e246d4888d992596479c929b4b1272
-DIST firefox-62.0-fa.xpi 514441 BLAKE2B d49a288ed6f4c3548a7dbe315334f56cb3b17bb52ce46aaa688341ca6bf917cd31c3aacf9344ec09f5e559f04e51c6c8d5008a07711b13971ba43d4a2cbac559 SHA512 4d1e358def6e3759851619c0a64247c96a39fd9edffcfb2eb664410bc0c7a3518462070e569afd7f5860bc94c7d2d27f1ce7465d1b589af884846ba2ff5e8fed
-DIST firefox-62.0-ff.xpi 459042 BLAKE2B 8317f742f62ec869c4ec8b76f63d9c0770de80d31b76a3e8c78196fee825118b15f4fd33eb3d555f6bef4011809a02a435a09ba771ecf4163179876da244662c SHA512 cc994fd3c1de47dd0af074ecefd3e05c894742a809c79950941806eade1cb4ee8260d9669fc7aee2c21357ea0e98053aee990080aa9e9e33f7b90b2e672ca9bb
-DIST firefox-62.0-fi.xpi 458676 BLAKE2B 2a7db790906d7ac6da330e2353012a8d81690f62fe7974e1a39904f1cbd2298a2e9c611c73bcba7c1349796f31a8fa6543b09d0bde19bb3d383f02dc27802c4a SHA512 9d18b606e9b3e19d1afa00cf2e49fb60e747c505534e865d5092645c89456569511c9acea4696378a9425892b77ee2d685e9faa8bbd4eb466e1a5d7823b626f1
-DIST firefox-62.0-fr.xpi 482960 BLAKE2B 43ae1c037850b67f0e8044b52f9a194c887ff3c5dffd05e5a0c1e830997b155c1c40302121a255371c2cbf686af5e5acb2c586cd1d31ba8c7e998a6a0ff88570 SHA512 2ffe2bce6eb44e22f5bb941c99dd82c885869c8aa3187b7ba10bb1ea0da8e8f79347eb970d5bc2717e7fdf1be022fa6be1b70c295b8e8fe6d9e9b0e48a6aa584
-DIST firefox-62.0-fy-NL.xpi 470423 BLAKE2B d7b329b27370fad0e32f05cf3680db55094a3a457845335d1da243714e5bf6fae789cdd2ad7a9d7f90b7d89a3353414dea6081172ec6d70b825a196aa521418f SHA512 ee89c047fb9e15e114af241ecd042fa62d0556e59ffd1d1f8606948b8f53388c6a3240b8ae26a4967f154c939114c6b11cc3de3ba389072330305d85c141149d
-DIST firefox-62.0-ga-IE.xpi 472265 BLAKE2B 0850bedf8daf58075f82ea261e04642c81a7eb2b24eecd9262127bea9f23748e27d15457ff7292fe10b3fd339a3e3a121cf562d8fd0fd7ad3f00f3d684d4ae5a SHA512 1ef54c4b6a9fe26fedb74cbb7087dab0c77ce36b66950f7a65f45356fd546d67b1fc19d43617cfccdc3efabbf300d0c7b73b79ef6dad5a7a947bc78dd8f4f05d
-DIST firefox-62.0-gd.xpi 473974 BLAKE2B 1e38222c56f8d37c3db662535f45c287e887d3b7f01417ba95cc90c4385cd3c78b449a51a52d30a7065e0317f906c8c789846fbfc23c0b34a1f0871e64a5d6b5 SHA512 c7d702d2685758c88ad702385e6315baf6833b9692fbe28e3aeeeaa8d7f851ca85e529817c7038692a47a8b482d7079a11a552de9d36d02c55bee87f434d0e73
-DIST firefox-62.0-gl.xpi 451814 BLAKE2B 9a61133b9d0742224e55a61edfb15e2aa38f52dc8f29ca9916c30336689d1175df066c59c9eeec67fa135fc8afe9bdfed6c9744081d8935d7b910b250f38b741 SHA512 2c3852235b53abead123b44a857a1b4c39fd79a316bf989cda40cd68dc8cb09bf6c171ef76323b4f8dc028b47d09802b4591668301728721eb8cd4ba89574de1
-DIST firefox-62.0-gn.xpi 483149 BLAKE2B 3b8df6874730142cb3598a11abe34515a6723d0fa6b4c675dc7290e90d398992fbcae0536844de6cd1f79482f34623969e00dd31eb36302e9618f82dd3353f60 SHA512 ca76eb05665b5d904cbb79f2287cc60c61ee2f3cb0e43f7b9ce51840d644105cdffb97d4851c42ae479681956a47df8f7ea42a5fe0a5b800e0f9c1b8ace264a9
-DIST firefox-62.0-gu-IN.xpi 539985 BLAKE2B d866a8a187032b2ef5a4cb1b9e6c228d0c4ec4b01188d87c6c5b930c6339ee6d0b75fbc3aeabf55285c5f7a1e2e11522ed8358a3afb5543c5587b46e933b0dbf SHA512 10cc50851b4e0be54a6fde6a372ccc93fd5af4b9f26459437362592f183166e86785e04dc968a9127a20debad795629415f9f0c02857ff3ae198d60c3d2b6c7e
-DIST firefox-62.0-he.xpi 484817 BLAKE2B 13f2f1c9a368f7d088094ffd0f2921faf01dd86c1fb869e0fc45cc551afe2ba370ae59e8a72c9189d60f1b8cc7e2cde3ab56b1736bf2ed3dce919ce8a74ebab1 SHA512 5f4acc852b776c4e408e385a8b33c02b93cb37a48c4aa7bd40ac03c0875191fd929461d7464f7a9c83e19342d79d7b6402f738f2ea828e7af6d6585fc72b35c9
-DIST firefox-62.0-hi-IN.xpi 537122 BLAKE2B d4b6137f03d81c917101ae60db97cc5ce6bd7295d5a31fdcde4dca2f5734d800fdf667734ba30b9a3a590de2229cffca2157b1fc50b6f485a0b642c728cbe3d4 SHA512 f8950de1ee37d6a7b508fc0bb0bd9ade3f10d3d2a82cf9b6cf8a391e31e99e94c22c1f3001191d0d25a1cf09d102b28ea118d34bf213b687dc08b5cb003659e4
-DIST firefox-62.0-hr.xpi 459613 BLAKE2B 354cbe71e73d0495a6c9333798619f585186187d35e3e2b41cf7f6c50b05a74b20e78b488066a29380917c2c71a9853e1f0d38085be61783e1d9624ee47a2161 SHA512 5e7cda24a3a58e154847a19330f77f19c1f9832e4828072644f9e4c49c6e2d4f857d2cc0ee5f15f573adecede2285f8d82eb8f40480d1629f5237ff35960addc
-DIST firefox-62.0-hsb.xpi 488112 BLAKE2B 3cf3b2b4665f2442759b0ffbfa810556b13d3aa41ed401bf1ad7a9a3af7af0f3289828b4402ca4ddf3e5bcf68a8d14162ef81920ace931420186a9faa439b231 SHA512 35193642ee8eeaaa369a4e1b0793458cd8578bfa5275f5e91f719ccd898fcb971f005941f084b42208771bb6839b59a2ce5de7cfe49761a23a8dfccae32b9182
-DIST firefox-62.0-hu.xpi 487430 BLAKE2B dc24988837b4b6f1b94cbb0808a5dcd58d98cab349205b286b29fb51b33f3bc08c606d75ddc5c1a79946d50d9447be8705b8b7224a0463c827e368a5288116ce SHA512 b319542188efd7320b14bf443d83262095593370334eb9dcf0caf9ad22ab7735906cdb2858b1e3e1a82bf1d5f2146f83608d38ac111f81415952f3e4518b7ab0
-DIST firefox-62.0-hy-AM.xpi 518010 BLAKE2B 5c5b90b89bd249de114df8a2e2209b0ba33f1776d5f672a71367e8e2b62feace36fa83eaf36a1474644c253f93df7ca6587b9da746d59519889e15823a66549c SHA512 9981d63e2602104246d19d454b0f8d381d056d5ef53f5edf1db1c4958fa7907ba9c9363b0f354f30da0510240bec57c9526ecdc7a9ea27a7cf89d9475acc5b20
-DIST firefox-62.0-id.xpi 458275 BLAKE2B 79d91214769e490867956f9e0fb531647fd1223f0a65e3870c1b563be430d0c58c51da13bc090333bf563a53a94b5fc958edcba46450d4bf682ccf717a9d807b SHA512 2402986f1c4591a1c605d23fb09682ca2e98f16f553a688ad2ef56c99b66eb8d94a65d83a65528f46128a258b7b408c85c348f2af76b3148d88d46c680c60a84
-DIST firefox-62.0-is.xpi 459606 BLAKE2B a5e3e99a8274aaa7a502654dab2a32e62eaa7ad6ad470a0d563c17f95a195d596e0c46e62b58e280e5acfe53371b45eafaf85362366ffa7e62232c4dec492d46 SHA512 244d1f71d07fb969fe812a75128a02eb08cf031f11100fb424a1eb4294fa9e34585040d8517d5ecc0b884337497721c7dc465b4621224f794ed2f7b33a13b7a8
-DIST firefox-62.0-it.xpi 347127 BLAKE2B 97d1b0a7bbddeb4ff375963e90534fc1c32d217aa113bc49e9ee0a8267a090491d222f2b542d16b3bf0e0564a65070e5d22f06f3960d97333b7c0951fcdc47b0 SHA512 89ec0cdb77aab74f7d6ef7a1abb2119d3b953a83e5f446ae9428e52eefcf2c1b3bd2e0d176111f2f61e8b0e2afcae9ab5fc19229b492ce3c4736cac27793d7fd
-DIST firefox-62.0-ja.xpi 504028 BLAKE2B ade9a94369e788e861d65123ede91f6a40f2664dd87faa06f448a26c1da95d6b827d9b9e33f543ba831867ab2c531cda233fc153241047874b68e34e75e8b987 SHA512 b70fdf58d9b84a2bbef81818e6e1b898c4c5b8c8fa8b8c485699499fc7cf68a4fb51789334d24f5f5175e9d310b954ffeb8e231577aaaad303f2f49b917d84a4
-DIST firefox-62.0-ka.xpi 503703 BLAKE2B 3b6a65371855f1faa34dfb3e05482efe121bc6b94978033537abda74ab99d90ea457140c237ccf3377750d232e9a650490103b52e18b4c720e8f5d412024b8d4 SHA512 3bb9effdd8e86869990fc4e1d26ee9a23a3f2c8f274f36f0a017441b16c62f3a78bee581ab4ebe34fffc206350f37ff26821f009a83e42e867e83701ccf289f0
-DIST firefox-62.0-kab.xpi 478239 BLAKE2B aec98ed8494467bf61cbb451c6739b22d904c0a1195ca5fd307b8f1fcef43de85be2a37caad75ed3dc5d710bac2639f3fce1cc6c38b9b678969a3bb83e492570 SHA512 8b4815a89dd7357a99a606e001c2c1abde3e5c2639ef2587e2732d7f3bdb36b6ef34b4d2576d80658902bd589672a1cebb01a63e93e49a28c215bf15581ab4f2
-DIST firefox-62.0-kk.xpi 530652 BLAKE2B 5950f59a3e6d83776945bfe3cc661dab9baca89ecde0b09f45088270ab408022662e076d54d27189370807e705bc6f66171370fb4d6ddf37119d79d12a634e56 SHA512 6169796e2094872517f234046950bfdb3b351473569e8c057ad3f23030f3e62dde185877e36b4f70dd13422b6733911a5139877c36699434a5b8cc126e0a97e5
-DIST firefox-62.0-km.xpi 521446 BLAKE2B 8ab9fb30382290c6b090b7e047d16be23f865f0dd488ad5c351aa01d56feca36ea2dd508b37d824881fdb7555c6420e10e0634863b4b8e83495af3ceb643e03b SHA512 c17b93f40cd67cb9789f3f5dccc3a5aff40bab5ce45ef86c652e0ad0666b29db6f7a15f4bb44633768f406a239edce2e643becd720770a8bdeccf886137d6b63
-DIST firefox-62.0-kn.xpi 528089 BLAKE2B c68e27de39d32990dba9d407ad03608165d7549f5c0d4133c8ba114d3096da468cb3b604a6b0a2c6e2f360334b78ebcb16e75403181d241d8a21fff1e99e70b5 SHA512 38a9e75989768172199aef6c35ff9081d45002a153a8a0c0377a9a69ae672dc36df473a37798a46c5b5749b48496a74be2db3a88c40c4a67b4958540f85aa41b
-DIST firefox-62.0-ko.xpi 498335 BLAKE2B 4a10729c923fdfbde207c49820abc6cb8f102c79f79a8f90902144a38eb8b961f295fd1e41730b1bb992d659247624ac62bc40d8a1631a87afa250aea6bbee03 SHA512 8d57e43ab4a47e2e57bb9ea33aa8d2827343b5916f21259cfcb2071b8a03aeaf17de8dc3df442cc11a2c53ada412a2600cba24ef96368c77d204b463fd64f2fd
-DIST firefox-62.0-lij.xpi 463436 BLAKE2B 9725304fa4089d871a6ad13cf48e1e47e2e8d0a281388af1e9cabd7b6c97ae1aa705a01e54a4c86c81345b34d5c454753ca0f10d1f92a6a420b7533129052b19 SHA512 3bebdd4a51a38a6e93bbeed3e6c8b67f38acfd5ce4c109c7b66fde262ac1372861e718eef352f4089de885efc00f0c09a271b1b58baff452027261d5a8660105
-DIST firefox-62.0-lt.xpi 487650 BLAKE2B ef951144b1d19d6f71cc53fb5ca4809fb6d869f0eec683f295d82980636c3853d8094f9e90c1b17b6d640df55894e4448bfe56dd142387a0ec180e50c517315e SHA512 5cf5b322a5e7fafff56d70bb3fbfcdecfaf4fbe96a08f5990859ff88129f4fa6587125db59065ff84802615cfbbc54e680ab38674adc87ee66469a313d033f6e
-DIST firefox-62.0-lv.xpi 475704 BLAKE2B dc870279aa5ed293a4fbc91d5e083823c0f24b7a3828585092e6559e1c3d3c74e526fea17e2bcaf9e108461979929da229a2bc6ee8fe7563bc60cd63bfc947ba SHA512 e8aa4f99989ab9e9379a4964b0d2e2737ef90f4534e453e7285e01abc89fd218854ac5dfb85dfc5871161dd194431b008556b4f86be9e496126b7bece4fdb25a
-DIST firefox-62.0-mai.xpi 494716 BLAKE2B cbc5d9a7dbdd3856ddcacf3d9acd2c5ce3a0f8420209a6e89ec18ed040e0831868709051dfb80db64fceed54271000036db476988ea841c01a0b037b00f52c8b SHA512 ac78e1fa2af0f00425abdaca82b0447e7c0a8272ebc362615ac08af3da6a0f1e315aa50659133d705ec8432c55644da190fa00db4b44d704af76e6128534732d
-DIST firefox-62.0-mk.xpi 457528 BLAKE2B 1b398582185ba56bf6cda95f991a94096230dbe7e8013b486bca4ceccee1705c2c0b96418ba992f224b39c6e9fb43d27e52a59235b3073407192aa0120392b79 SHA512 b88a1c33111b6cd873543eb45fc45246c91f1c12019449dbfe464fc8f455fd4ed483edc6c05c4b178890df0e6bc5e1231c4483a663fe400b04f524662a1dfc9a
-DIST firefox-62.0-ml.xpi 538826 BLAKE2B ea5eb668b5e5a815f73ff37ba52468fadfd14144afade265ca87f29167ced7b685132ce18cc6159eeb945954ca4c1bf5c290415e047fdfde949cf9b360543ac7 SHA512 fdec1879e7309f9f8b77d7e76720a0b9c5a49b0e465158470d11c6f4da82c69575d3dbaedbc554e1830d503b7106e062878f722e20d5d4ec31e4c0f046c079da
-DIST firefox-62.0-mr.xpi 530355 BLAKE2B 756b6c8e572fdb8ce550b09972d48443f0b4c965666580729c9a6b8cabfa75c56f397cbb2888abdeccaf8555c149858a1aece909d510b3e7fd59867af6a41a31 SHA512 230ca6dfc30b9b75b4e3b270aa1622f556dffe8eb77e6d456f86bcff16af8afba4257a9544c87d9c3786628bca18fd263351f5fad8030c1296d2b5648d769368
-DIST firefox-62.0-ms.xpi 459910 BLAKE2B a4994f061a0deb4479889d07f000c3192e36c4203b9d3e7d3eae9ed23a129aeab9e622894c72dd981c13ed55628aa0431c2ed08c6bc19e3bfd7ccaba49f997e5 SHA512 f5c471ecb35e921245c2e57b7f89dcff2f9d71d88a3c2310e303098eed7315be9ad288a7a63710c1b51e48313fa8d5bf9967ef65a46d2351e3f3d52fbe7b9d77
-DIST firefox-62.0-nb-NO.xpi 458929 BLAKE2B db56e7290133af1448592e330dc0d37da3cc6c06c78ae225559d3634d7ef4ef5cd598a5ac1683de9a9df1fa9bf0bd4a653571fa7f334ad3e0c88ad38b065982f SHA512 9ff491d1b11058b1e740f68bb8918a0cf0e21daa170922d04b6fff500f11ae054d6921647341d2dc2f3c502ac5c184107d86661f28c5e6a972c8792218260dd2
-DIST firefox-62.0-nl.xpi 459508 BLAKE2B 0c858e1b0f27a93169eb079917576df379c2ec8dc1d63d1fda2841459718d4dd0a5f99b2defc8ae1bb34b589aacc0bbf1b61f50a4cd8aa48039d5f8f0a4e4c5d SHA512 6119b38a2679a216069311211e76ae97a354adacfcb9f41a3af72349ddb1cf52d94b9c88409d4771af5f4780f98840f0612c4e4a8beb9785a859808c6b726653
-DIST firefox-62.0-nn-NO.xpi 457059 BLAKE2B 2ac8ea8790ec2358fb61a113d2063dfa74f132d51e1d4d1937b86bbcf7f69079cc7c3e21ad171c5e5537afb82a96a4b01cd06c1593bfb7080c97167424fbad00 SHA512 5abdcd55bdde9c45e2ccf0e290e829cac371c36525116c79f1ea3ef946e4d9af9b4ff45a97c2a43f07058ce265f01fb2d90c315f759d472a7baaf7dc95a3a6f1
-DIST firefox-62.0-or.xpi 485377 BLAKE2B eecf96d582cbc487964f26190038cd39e9a9fbfadf5079e37ac5d37a4a866ddceb163f4f71b9662d84a9567ae69a9619d3c82a44b60b4107399b7ddd6d66fb23 SHA512 dc0809d2bc981b35a81b61fe9b94f5444a554ff332350abc7cade9dfaed03157e6981c73ba2dfb10b20db99f0c60c58898b2571cc9ac756dfef978c57785abe4
-DIST firefox-62.0-pa-IN.xpi 496914 BLAKE2B 74d048fff369c822fddc2f7aa734be6823c9e6d49a1e7ef19d40a503deaefb7d4d018600dddaf245b087d361b052f8c943b67ce5e3d4f2deca82483d093d8880 SHA512 fb73618fdbc88b14995f8bcfabdd01dcb3294e2e36c42af62d9192a6e0278c4720101dad315c5b9188763045d9b9c863d5809ed0170e101076ca608a88c6738b
+DIST firefox-60.2.2esr-ach.xpi 496840 BLAKE2B 1419b3ee223a1e5505d6d596068f68c4d3f6df3152112b877926b23515d33f701aeeeac9ccc7a1d2fca828ceb314a6e1fd2fe4c1619283dbbe763ff05a3e35ac SHA512 765d6859e15189d410cb08d42ca565de42f56413e7d4fb88c1d500eaf199c32089e2dd4a567681e9ff083995378a8dc220a46ba7740847096572f4de7a49c1e2
+DIST firefox-60.2.2esr-af.xpi 487308 BLAKE2B f9cbbaa1d7ddd32f13d0d0181fc669bf2602dab285733e360d3304a3b19ef4e6d33330c1b58e3f8918a77050f2e0767e8acbd2baeafc4f645820d6a249f24dab SHA512 b272b4c3a032e11db1db44be0a2c3e0734b0a2029cf5cc130877ee6f288b4c7c47cd676da7ef369d2835025540c03f676f4906c6655b4e738f9b36635bc397dc
+DIST firefox-60.2.2esr-an.xpi 520494 BLAKE2B 304bc120fb2e1cc3dbf9ce138d9c69e27ddaa8680814d66a5e86c0ab1fe1ef24d684549f5bc71c8ab4bcad6285fdfb97b1683a2606305bc3ca7f07f1811cb3a9 SHA512 5263e17bb9ae3ae4bfdc8952a749508fca145a5f1fc80768df5ac69328d7f34d37ace69068b18010e91f300dc359b653d62a227c66b2f23716c97f53fb34ef5c
+DIST firefox-60.2.2esr-ar.xpi 547818 BLAKE2B 1f0e1645ad37b4f6b6a89b22d4af935ebb57edf73ee5b1e641dd03e12fe53a854d73ae8b9771d1a70e6b61870e1c0c70287428901587debed7e29afe41f376ab SHA512 e8748fe47580e41dd3f8f47a8d3d28a069b65f161340d4b183d60b3016c6822d559f7390c2b8eb09e9a83d005a93bdb7704997cbc5585d1bac97cf910ccf3077
+DIST firefox-60.2.2esr-as.xpi 530719 BLAKE2B 4f02b2671a8a8ebf65d8fcad68a706f9f607fc6d7eccfaed79eb7339c3a479b1476032478d2026ecd1815d9c783f4e11df09a2b2b4068942645051543c456ad3 SHA512 3ec556467464933c1060d3ec8e36189e205082d826f49c30f6e9d8c99049b7cea951cd9dcbbcff585a51c4badbf39495946310a01f4c35c9070cf2205f6ba157
+DIST firefox-60.2.2esr-ast.xpi 508650 BLAKE2B c0ca69499f4387ace206e214fc818f25f6a4bd3164ebeee4b3f092394141c82bfd80d454987c51287577b1b07ace82e23d6a19bd6830b62d260a7f239943f446 SHA512 08508a24513f51fed657904279aeb079bdb41484e4f8726b0bb096e53ca62a8e57aff82e7ca2484f521961ec107a600fb262307b5146de690021f1db7ccc3fe8
+DIST firefox-60.2.2esr-az.xpi 524745 BLAKE2B c952d62f4a40b572551ee07e9f4aded116ef28a27b94b112cff0f5a7440405b113a8a3c1755ba43291fc7e07810914d346aef303ba8fe563de25ba0d779a3269 SHA512 b94f5b8c53bd238776f5d7f3c8070541fa733e3bad7f8f3571707b5e74a004dfa797fb398f295d0b9198cf82b893313474ffa3beb276e9a5fdab9081949ba7f1
+DIST firefox-60.2.2esr-bg.xpi 573853 BLAKE2B 4272e4d2358ff2942f6ea7ef35ed2e38375df97de9c270959edeac4be26b6eaea25c49e162919a03a5744631ce331a9f919a2b0dfffae4882444c88e944c208a SHA512 274fd36bda8a851b60d3e060865336b01af76cc4f1b96b6398f7ba20c658e4632ade35c49c623abbddae518bbde6482f80bc4f035a776ec07587f38b98995370
+DIST firefox-60.2.2esr-bn-BD.xpi 590419 BLAKE2B f542129ffc5027a0ed30ef2f1cd06c0a736fee2d57533f70fb8e2bf373658f743d2872dbc5a612676a58adc0930f7e28551dd9585d86d8583f8caa257a9cdf1c SHA512 2bc208b71409b9238362ea894e4fa8c840d06720efb212145bc26431141cbf12ef1265f119ef9e01aa7f1edd42e362ab022c22c4fe7c883fe9cf676d06a96fda
+DIST firefox-60.2.2esr-bn-IN.xpi 570864 BLAKE2B eb5ff620b1da6785c7dda177567cd36aa7b9fcf927aa858a68a28e9ba3b7da48e233e165baa45709636bb28586ee4b42a9116f1758f588e2313c9b792d81607d SHA512 3c8c6bc67b20d81920740e50eaf3cc1e1de169321bad3cf4690a4466a95406b5fcdfb5bfa18902e224c05463f5a9e9e14ef18170b728875867cfeb644f4589ae
+DIST firefox-60.2.2esr-br.xpi 512027 BLAKE2B f1c14314b2c0958d72dfab2c885569fad6a1628e46d7daa4c01117c78340a650f45c4c63464d318b41ef5ba9fc7ae5683baf3924d67b5457564c8018affc7684 SHA512 b12a9d95f0751998ecee6c6f740bca5704c0a002b8845ba1508cc2e9fb7fd7f96a4122cb1745f7303832c2612a6d53c03c176e4a0660fe146b673025a6ac7e0b
+DIST firefox-60.2.2esr-bs.xpi 514715 BLAKE2B 4f9af6ca844cdc350a65e5765819335b1ef1220f6e390178bb672ae408ab8e1e847cd83978a666e52f9b98622f1b15e6b4dd9d06c38e7c23f671621bb07bb04a SHA512 6aab08b50e23e08a0fa4757aa882912ab0d72beed41fc1beda2f1fed2da151f4d886c77cab7fec4c19483af2b8c535fa5cada60b0eea651ed25d1248eb815f26
+DIST firefox-60.2.2esr-ca.xpi 525257 BLAKE2B 4033556092ad6d1ccb17a761f62ffd5363930fda364f4e16136e4527eba66bec84c50950fb08e3df946a091e0b4fb8952a5ff6ada2864801c3199eecaf1fbfc4 SHA512 c90dd9c3e7131c3a862b256c7e12ce9f87cdff8704ad7ad506f7e6a4b55abdcc6d11328348607b44af5b0bdd1dc95dcbd685effcdff3c05b85ea17c525751e8a
+DIST firefox-60.2.2esr-cak.xpi 536290 BLAKE2B e807f6c70e2d6117d2b4f8b3f6aefa0d7bcbb5f59f6c1290b54bbeb21cf62c563b69f518b78f57f2bba3b826cffadb96d75e4da077ce3832eeddeb45ae342c1a SHA512 ac5e589ed3bf915f595695d2c4d6904dca54cb3fba613e4a133300d8d23ce0a979d316918a6137457f2ec73fc81ae8fd68a4fa539156f5e8138606572e3345cb
+DIST firefox-60.2.2esr-cs.xpi 531798 BLAKE2B 978cf3a8d7744b46e5d45fda8b2e64f782dabdde8f7885b3c23209a136a86ee1cb7886ecb0d10b82cbe7c1518a8cb44a5fa53b5b63811541caf20c15a9721e69 SHA512 3d9cf4c3658d3c12930c9f6f7257136ec6039d8dd5c836ead013c1298b80fe3ac2d228b407d91ac3ab2b08f8468d654442d47754e0eabb9ac8d2daa470075006
+DIST firefox-60.2.2esr-cy.xpi 516642 BLAKE2B d52a497f74071e222e7ca840e7cc00f7ce9bbb51e88589bc6274cb020e29d510d1e62ae25020e8540339e1bb887d303c64ec2ee6c0edb51ab4c46b52435336f5 SHA512 4dab0a446c263048ab0049b0c47bcccb0d0b013f60aea4eceddde6f1f74e74a37135cefe019a45dba9f7b17322ac49851ac2813c7351efa8f1bb528ccd9280be
+DIST firefox-60.2.2esr-da.xpi 510753 BLAKE2B 0bbf6ec9fff43bf8a4b72fc0f5d50604ddb9ed79e3e51a010bb64130f8b2f798e65cc58081bab85325d02941e6acd0138efef9faa1282939a2062bcbcc7c7efd SHA512 582694115b423660b2b188e2cfa8609e8aa2e1b7095f0d111751944976ca98d068a34ec52a4590e8ffe7fb68ef92f9dff60911e9a0ab1e5d3fb873263b391be8
+DIST firefox-60.2.2esr-de.xpi 526515 BLAKE2B cabb9558d950185f6e2ef61e4d444b7d4d32970d2ca6072e29d47fefe124222812f588119298e5ecec267004f8b0781e68ad2a0edc7f86d2d2ef32f9f7c666a4 SHA512 db828f5d57453b297ab411f281c6cc860ccd002157dcf861cf064facf89b000c140eea4f2e16b6c95bf589d231ff01eb9837c4a9fb11f71edaed2cd25fc24606
+DIST firefox-60.2.2esr-dsb.xpi 539524 BLAKE2B 6b14736997d9bcaa849aba3772e1fade6db3d941bbaf84baa9dbccf184d4a2e1175224d4ae28932374abf191885aa510aa056cdab7476a42e564b4cfc27ce845 SHA512 97efc6252afa3998241408cc2bee39976a48063507b9128f8741e4f25ab0a294686b4e6def23de887165b5d804102c50dbccdf0aefd44d56cf6b1a0a8a2eb2eb
+DIST firefox-60.2.2esr-el.xpi 593691 BLAKE2B cd036f3f0416f72826131961877eee40cb560098392f13693b89aac08f7e80c3f93ac763ce33e55b5c9be076b034501649c84fd7a096b6c1cf1e8a31902c4af1 SHA512 bee9683a97114c8398ec962ee4f1eee58bb48c5fe677591415bcfbd1cd156f6d5283f366b9eb1d5b4d603bed4cc6f500616ea7850f807c55bd8350e7830b7999
+DIST firefox-60.2.2esr-en-GB.xpi 491694 BLAKE2B a51e0374dbaf356c99759fbe47ee1b9b05d08e2c9970e712ffdaf17fad3f4cb54fb03852fb5a810eb04a7cbf31d85376227514f903f48ec3c77c75c47660a19f SHA512 68b4f8ed5a155de5d296f51414d822335182bde0506c55d1b40adb46b5863c8f1c4f30566b715d261e997c0b83020e5b98b690cc73736b20ae35302222d1e21f
+DIST firefox-60.2.2esr-en-ZA.xpi 474679 BLAKE2B 2bebace02ad7a29532589d2031598db171780340001d4ff85cb322ebc0d4c2484085cbef4f8159f139e21905433827651d841d2def44b5a0b230e938a4aa0cf7 SHA512 89f1e74297b522d82ca709edf9b4db7059fa4c6c2661ac8e911a4522af1141beca5768eb3142053b045ca84f4b5cb02dd6d3d3066aa87f85d3ca3c8bdf8ee3e0
+DIST firefox-60.2.2esr-eo.xpi 511267 BLAKE2B 3ddc82f3882d32ec28fe45c9bed8f717ca5f79ec65bd26e37c33527cb471fc26ca282d90d8387e7a1d589f90289ce224321f753608b29abb75acb3b328952b4d SHA512 653c7607deb0d93ae20a3ca717889086e044d9db547a7f8ca8417b6f130880b4ae507d9d3edd00be93a4aa4afcef1f2660e10f6f0ad5705bb6bbe65f4cb0e6a8
+DIST firefox-60.2.2esr-es-AR.xpi 524650 BLAKE2B 6bed69f6e63cc55d97fc09127bd03c68da410500949b105c17adb54416ac4ff98c3977f107e546b21004be8c86ec1dbaf7390926e68ad879deaa65bb6c741474 SHA512 35e4a6e02058cb05f07d3b8b80865e093d6d78af8c75160289bac260ad0b4a7aba060c48c8242ac10905e36f86000822abb501438d2900ae0a714f19ebdc8ab3
+DIST firefox-60.2.2esr-es-CL.xpi 527320 BLAKE2B c8f9a35496831800fc1462e1714f29f78bb9f68ea69d9e215bf8efbd14f9bb100fe39a9dbe6b7e7b993dbf957024381e50dd2a9a65b294d5bd71a123ea830e8d SHA512 910abc2a339ecb9c95195b0dd2c3f2d1bf540e3c09241f58016559602871ed75a5c8c9404e2eb1eac72c99a481874802479f7aa968dbf4b058286a689883e228
+DIST firefox-60.2.2esr-es-ES.xpi 459958 BLAKE2B adff22340542af4ac47ead2a26eabd601620bde1087d4f80dff517b259904f2dd6c80491404176ec3f49769a0bbc77b65948a7d8cc538914bb3c47e722927ba9 SHA512 035212fc7f14a3efedb112a6cd4a3ecc77cd414eb2b056a37ab558d6f8fa3f6896a41f7a193b8bccb1d338f0baef7c1638ec34895bf8e34d74ac63f915c9d388
+DIST firefox-60.2.2esr-es-MX.xpi 528664 BLAKE2B 006ec7f57887c4b95a831e666c2f2960ac4853d31f05373cd4f3f499d7b820e776f5cfaff27b3202316eb005c9aace6bc9164a4bad4e9555f48c31cf8672b40a SHA512 43c39b80725f3c82908878260493c1c269230a53196d237604075e6a45b54d0764fbd6d049fa032f7a03c4902265ae38da0e9c1f8c9372fa8c4d873f24d82e27
+DIST firefox-60.2.2esr-et.xpi 504975 BLAKE2B 7927c499db43fbb58c1c5ce0811af6bd73359ae255144f09e76a3937b54a513b1f2221cb7107c7c868bc4f06d318b8d21f85ea805e1008c2a03554469f956b81 SHA512 7e2e41635e5b37b036f5f8205d98c077b698262b2a84284c165b5f9011b575af5b271570f91fa78997c256e2bfbe5bee091061bbf36710e21374548779e81c7e
+DIST firefox-60.2.2esr-eu.xpi 511710 BLAKE2B 5d421483f8fe8f952cf8bc1abe4331b6d929c61078660ec4b464b03a51010ae145d422b81dd671c19001e25f35726813a0e1c48013142f7c745f96f6d0453f77 SHA512 da8c25758c16f8d9c0161aa33e27b6e9f0481ff2bfbc7ee1d44da5800e18fe43225ec983a73793980559d53e40312399d98850943a9475994f0375a0b0d49966
+DIST firefox-60.2.2esr-fa.xpi 566262 BLAKE2B 25a67354c0a50272d8be4ce73f17f98b23f5b4dcd253b54f56da81ed263d809a211218ae1e7e967718b5f03b1e0e37f680bd257e9c0ea7a5b5be75844daa0637 SHA512 8de060ceb8fec5f5774dcf3822aa7614dc771db7907abddc56b7d55a998b7424978b8ad37b8307b8614307d3134279e11fb78093559347c431358c7e351c4edb
+DIST firefox-60.2.2esr-ff.xpi 512205 BLAKE2B 4e406f005e5373f208be15111794225995a918f4bd025d543bcb31a2e2c50e2a20800e99e26579e6b5e6fa8bb623e24ecb88efff1d9d9664427474a1df96d67a SHA512 7778c36392aafc558aa0e6fd4ab01b73ea6d6b151db9a1833275857f6dcc4fd164e7dc38aae20ba64d25dffde25c6e27c2510dcde3a764253fe15c4ccae97260
+DIST firefox-60.2.2esr-fi.xpi 506177 BLAKE2B 1121ce955b60a7e8ebaedbb5088f29ebbaf34c3d4337f5768493b883ee3d5565f559f071461a4ec58818997acc71a40f2d299bd866900b2586e0f7895edd1ad6 SHA512 656d84677627a38e8c4fe275d9f50aa6b702bedfad9a1668c2501a57d8e73a5315135a0fbeb78d41bf86bf15c1c85051d538ed7d50826dbcd6bbdd6c0a132d63
+DIST firefox-60.2.2esr-fr.xpi 536072 BLAKE2B 6132150464e929a8932423c3af286f4420352369fedc1ea227c92dc179c98235f7fb7354f5d911e5006a8ee9c1ec73d25dc4e8f9a0f92062e6e242073b883638 SHA512 18732efa9435225757ee42d72ffe52a63457ace9963f92f10ed16d1a4728f2b5d273bd1867c271ff3b6b74f4957ccf069ec1ae473011cb4ceb526b0a8f27c1ca
+DIST firefox-60.2.2esr-fy-NL.xpi 524520 BLAKE2B 118388ff5283d378cfc4584aa73a1ad83e768f255c0f653739dd3c5388b430413f069053a963076369c5e37c7f2166e4141b84a76bfa577b4305d1c301c661e7 SHA512 acd8ccd151f46c9df7a48b9ed27f2235411353f49027fa804dd87d92c9bcd641747d268e72848d282163d26100af17c8ca92fde70cc06e10e78a23c254c9cfe2
+DIST firefox-60.2.2esr-ga-IE.xpi 526986 BLAKE2B 6d5a9070e7c6ce303229b7a5fbc754593fd491468305713c3e29654c970a1a29a24baa3939c122c8a1791d6deea268e0310e11f8e9d0bf2e6e9ec2f8fe038339 SHA512 08b9c58fec687df3ba7e5d21542bcdceec7fef61e2d9af2e52bd4a79dfa4687bdc7f627d641da3acad893257ca5199a256bbf24491917330dc26d65ec8d4fae4
+DIST firefox-60.2.2esr-gd.xpi 520872 BLAKE2B 53af25e18039629b798edff6e4d2cbcd62380c561af0f0d99dca5c2caa979f8b5bffe94e57cddcb8bd11ccd3b01410a74c92afec6670f50fe0e642d1364f7f30 SHA512 128f1f6427fb1bbf7944560803981082e4a1b7ad023ef5a88612375201202f14da636294dd074de3c3250f569d2ac57c7462352a6d35f0a2bc98c3594fa679fe
+DIST firefox-60.2.2esr-gl.xpi 497371 BLAKE2B 6c99f56d2684ab6ba81356289fc664648cd370c2a8aa8c18831054ad65f5cbc1c8eef74130aa4d66a35a2f52de47c967f4e4b0ed342cff71319a14ccb88ca614 SHA512 c1ffad84b3c316cc3e7c80e13d5b8a6f4de2cdd012bd1eb17659adb8c8f355870baa9d9098899dbef4b44df40f644871fb12b5649823b1f62c9081cc00cca8c7
+DIST firefox-60.2.2esr-gn.xpi 533219 BLAKE2B 4af69b43c25d73910463fa13c332173f35eb478923db111c45fe802d90bff8ee727278452da019ae40ab6e7d11511b6d0cf8799114c77c6629b99eced7d29d5d SHA512 b9057b916bcb11a4ff7cba279e65079aca267c610806b24532238179b40788fcbf6e049be01e8373d1b094244b1e1cd9ad97d705ab7e1595516b21e92843d2c2
+DIST firefox-60.2.2esr-gu-IN.xpi 590266 BLAKE2B d35528b9cec4823a93b8de75f65357d3c92477ea850434f144083c8c4d54312ad0081944b5846ebbbf15b7453ebb66f4aa54eb4f0a53853e02466579c5fef99b SHA512 1952e6e48df6b12774d4fe489af2befe1be2302b6d8b66ff77015c2b327ebfefe32d2d7b77e47925d35da33acd6ea83769c02d0a039e719ecb92a1b9fbf01218
+DIST firefox-60.2.2esr-he.xpi 535979 BLAKE2B 6f97ff0c81ef500837cf1aea144eee374db7eeda06517171cd45e8944fcfded14df8778fa06ea609845102fab50cba457f624cca8c1e532816dce92bd02ef69b SHA512 a3011daf6e70eb93049f99f23c9202e4b8f14714fb01ec87b482fb243d1250baf573a8d769e6ff81c44eab9dc6b2ae712f984cced11b0c37c0f4bdc279b8c6b5
+DIST firefox-60.2.2esr-hi-IN.xpi 590870 BLAKE2B 2159373d4ff2ee878770b3779cf4ab900dac03c7310459c77ab5f8463d21f76b759fee78d6a1ba59256e3c49c3d96c82ee7d2bbfedd47d43e50d8a70e930923f SHA512 9cfa7a1ffba8aa18813bd98536462aded0f2e6d77721b933f6ab8924cdcaeb4f2998a0c86b742afd66fb26766250edecdcddd032ebeafe197c5305eaecaf0acf
+DIST firefox-60.2.2esr-hr.xpi 515960 BLAKE2B 94d89bff75d4d4c9ae2c1a0277285b47ab0c1c3d85f6f2485229f0ab3281622039ae4940c7a11c09dd4363d35bf8654e7aca4a2bc9ba94688cd4eb529ac47a11 SHA512 c2b7cd4f41e6f0f604e0be59dfcec25e39fa89d1753f53245d59a5f427b6ccc91333166e511437d4c23d7a1b7d6902391511caa4a2d0053d683e1a4a2845306b
+DIST firefox-60.2.2esr-hsb.xpi 537059 BLAKE2B 7bc112d977db006bb4c527dc35002fa1ec9f47b065ac9c5372382a5048b2c9edc6cf4914f8a1c42465d413a72089f9cafd6b2e6001065cf880a35832354c7b08 SHA512 41f08dfc6f0cc3ae1be34187d04c1cea5b12c8648b98af8f9ba63c944c75e61e9ddf8172bd514f00e403abd249bd8c4f2f89955426a7ef17ea95fbb5d4256a51
+DIST firefox-60.2.2esr-hu.xpi 538418 BLAKE2B 1c139cb48b3805a259bb120607ff098b77355f71a1c00512ba16849b7c58f236993dfc1faf82e63f649355998edcae60921722d668172f348288c219d86385b5 SHA512 29b00f4064001d829093a6d0570f69e3555c92f1d9a22d97d72d311da6b255c91f811ca436db3211e3f764db0512f225ba06591df4b766d469ce3dc614443bed
+DIST firefox-60.2.2esr-hy-AM.xpi 569415 BLAKE2B 29f5e0fbd7050d3e7a94f0923b9e8520e2e9ac48f6d5c1bf61d09d239f326d27731ddfa939c2ce78d921f0746917ed119f6cb6a4640feaaf35de4b6b6688650d SHA512 4912736ad06ea845ba6b7439176afa18b627527ab94ba66873a73b88884e8ad7af0e6cd0f22fd3ffb24d4c6d646fda0d51ad6581b0462c8657f218c12daf7ed1
+DIST firefox-60.2.2esr-id.xpi 502220 BLAKE2B f3f86a1f32e33095825f97effc4afeb12e6b3072739987e8614d7a7da5b715959ed63512092d40613621bbe1fe1a7f4d68c6f8d8108e44b1152fa715a3cd4039 SHA512 c5bf5527a10150db03588fdea0958cb3c332cbff730b9889f265e333ee652db1c12255242019a92d7f402e9252d62900228451c753fcbf391447e7a842f27632
+DIST firefox-60.2.2esr-is.xpi 513271 BLAKE2B 51d2f070e806afcc8b4d127d18e013214193a504d05a87ed32940df57afde6e1ecaa059928ad35cc9a02fb7065355306c1a69e50fe7e086c0f07eef6044e724c SHA512 b469007a2ae873dc483e4f62b2014cdaaa16e99b18112ccd8db338fb604e9291a0b87732b23cb94cd27ae291847195e99c3be5ef1f456fc402e8edc3c76a96e1
+DIST firefox-60.2.2esr-it.xpi 399096 BLAKE2B 7ee6d12d89c3f9e82427b23a8a8e20add5e68413222199f742333eabb64abfeb48e102e93ec38d260d37420ea6ec31437485845b6c2b4e4f17a89d04f9adc82e SHA512 62a4a45ed227757c4ffbceaef280976a9dc4f7cccbefc221705a2806a42d8f59a8c8d8a2d3cd45f12dcd0de103f2a3402549e4f376238566890ee65eb1d5ab47
+DIST firefox-60.2.2esr-ja.xpi 572015 BLAKE2B 2d01e5318bd27ed43373744e67d12a1c47f1dd377bb81e541c5eb7d3d952c1aa067caa397fc1d4fa3bc097c5096e63947fedfce4a85d8094c8ef1edcbe03e7ab SHA512 5b6e95abb652ed6ac143198646ef2214342d2c0686f4241aebf849ce1b419a40f62dbfb310d64ded325731f7e973ec00e1d61384e2cbcc5eeb2d510705e5bff7
+DIST firefox-60.2.2esr-ka.xpi 556846 BLAKE2B 6f9e6bfe2051ee3466f85be872fb758ae9df6fb552e5f07a333efb80e4c6eef54aa9ebb16ab58351494316b501117c7635768f8a2a9fb20047b3c7802981289c SHA512 d07566979d2fc608796dd34cb8af2d253c666a2af3436c894910b216906000b6eabc938ca839e67af2af08a58d4767038145d6ae852e06602b6683c95ae2f823
+DIST firefox-60.2.2esr-kab.xpi 520399 BLAKE2B 6beabc507e12f3cbf524a808d0de3133097aa1425c5dbdd6f0b100b8dba459fc342ff21fe34b3781ed32af8a4a7183765c5d4465a84428500febcbdd3764794d SHA512 48954ed39479de7620cee563316c3605a999c6e4ecdb42b7a874292c6f9b16266876befe906cf95313d6486221b23fb678bee64546eefbf82081c24853892c2f
+DIST firefox-60.2.2esr-kk.xpi 582980 BLAKE2B aebaa7e4eb0a4e6acd74ed3d892eee161d85ff62ea51218f0c2e61950f2c4247cfc3eee6b47097dd7674c73e3efc21d478cc11e5d9dbd56878825823a250c2a9 SHA512 b610071dbbaa7ac30b45022bd8a558f71451d0f2a72b8e2801ab3a57f40b524a41738197846c58955ccf4024bbe69adb4b506258e530f79da3c3470e9b93fb18
+DIST firefox-60.2.2esr-km.xpi 583116 BLAKE2B a9efe205c83486729f6bb642c64ac551c78755783cdcef57b213fea8dfc6f02348f180d5c1e1926748fe0f37bd673f8506263945a15b74b92984383fdc8c10da SHA512 2260342e18c9cf8dc33bd0622a249912d29d3466a960cca6f029e43436534919755a1b29de13725e73b1e0e9726719666eeb78293570542b12ffca5a42239c4c
+DIST firefox-60.2.2esr-kn.xpi 585873 BLAKE2B 72c0bef61647e1b770fe4677ef435140d4291d5a52d72e2cad904c004ce5657199aa6888ba9c477d02bff0dfea5d7491a23b43c0e3989b161bc076d842750ab1 SHA512 f55fbabcdcc0aa3269e33c0c7b03cb04cd1a26c54e78c8a29910d3108ed55ac1f9623f8fdb3b822fd586d5d798aa2d2306fe0d42a109360142e564b63869a9a8
+DIST firefox-60.2.2esr-ko.xpi 547826 BLAKE2B fd36278f959a63ac7904d2451cafaa3761a087beb955947eb4fc1b9061b4c68756a167cf9ecd5fbb1b6d891bdd7c2e0610ffd3754b0135ffce59c85adef746dc SHA512 6572453b84e57dcb8626b11a438e9b498400429fa60f3e63e4f40a10a4272a1fdc94798e3c6d4a7f58adc3ff0b442348e0da4b70e17002f5ee470e620d1d8c43
+DIST firefox-60.2.2esr-lij.xpi 513176 BLAKE2B 67a9785fe379dcdbd4553dec6056efced59ed58b9ba26b2dd1d08e13e4754a802fd183dd71524289a78f1a33c835cc807258421b0603d9a3cb2266610e64c4e3 SHA512 fc1a7d1eec6b49ffa8f9f2f6067fd2c207a6bf4b1f80211877f266102de342f19c75aaa931b463a20520a3df417b451cfd115868f15ad9560b1c4034b5c7bab8
+DIST firefox-60.2.2esr-lt.xpi 536464 BLAKE2B 6fb621867cf88de1d81f04f50e0bccf663d4163b8ab25d6a1452a2927b119e0825ee61a747cad931d7857714f3a2deaaed9543d6755d353930be9c6f63fb7f2c SHA512 257be3fb41cba7e12b4de8a1118fa3a33db68aae8f176651649cb39c4ccdf8986022f744d23f3998cbe14ff1bb4ab60d83e516d287f181b496a58662af476792
+DIST firefox-60.2.2esr-lv.xpi 526414 BLAKE2B 381106227a612310cf2ec4e65b509d0324d4e367100739f2ce1073946acf7979703c2f749929614f5b5338328355f446eb16d4c3ddd2b2c70fbccc9db3c21bdf SHA512 42aa2caa1eae883abe3a40c9e07ff61bde7f4f9a7c51962697b23fa3504399d792e0739efd88fc51a4e5c579f877a8f665a0268ae44b5bed122a539c88de9bd7
+DIST firefox-60.2.2esr-mai.xpi 549256 BLAKE2B 637ef1886a4c75c4816e6d7d231dd09863f8231c1514ba26ba2b257519af19b26536ad518d04129c2c84f57f03aebcc5d96cfa35543c1d9ebc9a39e99ef98e90 SHA512 f4d3b747cf3fddf11b00e764550d4dc28b896c04b130d2a3bd5841588444d843e7d51ef47fce71d90c110417ee74c6a6bf5b3f00dcca738b3cc44c8bc2fa91ca
+DIST firefox-60.2.2esr-mk.xpi 513807 BLAKE2B b94dc767c3bd7b000655e7471907f08d52b2b8c7530e15d25e2091d611818c2b9b65b16aceacd8591dc298ee056cb40162f2ce91d35a26b8ca29d287be02a8af SHA512 df84f8b3bce96b7307d82efb53adbdae4682996b6145009e19e8928a619aef13869046558592909722ececa8819f10b28c7438ea83ed021db648cc0cbf9f8651
+DIST firefox-60.2.2esr-ml.xpi 598976 BLAKE2B 2215a66ecd8bf5d21f92f3596985a211dae9491f3af093c927884fc55d345a2a16d1660f7aee628b7f1189a3f729dca9d7fda2bfec4d22373e575a9f678269f5 SHA512 504880af6117e2a5717468618a530093668589fafb269e893256c6c739f956b08ee75e9da97222878b783384b7f972d51df2d515e71365788a17355bc789836d
+DIST firefox-60.2.2esr-mr.xpi 579120 BLAKE2B a5fe2a820617ae33d2757fc0828517b40a2641ef2af0637e78418d7807498f3a8f8d35bad796322db90b0d89f4d984f8b305034f32ebb2839d2196e4b21b717d SHA512 e7039205e325ce0a7de414672c0766a336f599a49e30decb949c5779e6ccd2a86732454d6a0d6a9bb413a8cfa4b5428d931d47867d049cdf1acce380287d1618
+DIST firefox-60.2.2esr-ms.xpi 509552 BLAKE2B d6f3da9fffd81157fc3003d03d466b268fad1210484d6fd4b8afe29af1a79e1ad42d9ab2cc200b52e996c18ea254bbbf6198c13b587bd78a1b77dc8d78e787f5 SHA512 f2595e52f56cd4cea214ee21bb08b8bccd3f10de54c21391fd4ee5c8a56ea0a175c51d9f5a67df8a1b1e33e291c754dc1e73be1fd443f7abea19aca9592fa8a0
+DIST firefox-60.2.2esr-nb-NO.xpi 509890 BLAKE2B f6e675b493d9accfd89c563e7cc0c0e0add6607add2a3fdb7253b94f0897946ee6d3d0a72de03c6d1f7bfb8efb885b2d034820d50797e5995190331062d915cb SHA512 c7498353385587ed73308482ba576df03377bc8e51053de0eff08fcc0690d5bd3eedc674f42cffb1cfb39b3442c8b676e97aa9795e093d25014ec60d76311bdd
+DIST firefox-60.2.2esr-nl.xpi 517459 BLAKE2B 1b8515023a169527e82361399b0eb70b87108301a4f3f97180cf1b469f580d8195bc5582c3b8194682fcf53b55e8f09e18a797cc00d9eb8a014c2f9bf3f1a9c0 SHA512 8d6d09a4a62b095ceebdf4190850482650e933d606b1709b123e7e7255127bf8784cd582f6c3be005a2f043c87d45730a4bbcedb4ef3eae8377d8687f6f8b6e5
+DIST firefox-60.2.2esr-nn-NO.xpi 511429 BLAKE2B a009d8a6398c5a8b717ca719f99e06a58846a93822e3c63417904e91915754d98b93c8a3405bdbf5d8b2516cf4df8d92e38b75bdaddb6eaea43b4e8390ed474e SHA512 4aada7b3118afea2cd99c3a9c21b6208a482c384b3ef11cdb3c1bee2ee3ac27b59719e601c97cd5324586236771e208b46ac4c1c2619523f1982e8b7daf7bf04
+DIST firefox-60.2.2esr-or.xpi 540863 BLAKE2B a0f52161d610cb87934161cfb225dda4ef2ee68f933adb775d7fdb78f377e61548e38fc380dab31a9fb6097b6bf0b24806778c1b2d26bb9f0f88a8ae40cd0438 SHA512 b95c0a064870fca58d09a9c7036297a4e1f1b60cd9f80cb2b0d333a3f96aa229d34f354f4fb9ce16c83c82653e2ec6ea9b0322f2c1cf88e492f324d8c92f8b39
+DIST firefox-60.2.2esr-pa-IN.xpi 557877 BLAKE2B 02a1a25df3afaf36a5a033cf675a3a2ea5eb690d871f4ee5ee325b9760d85f36f40541b54665365df07bea609d1820cbe98bbbf2c02c87b998174b305a5a56c3 SHA512 0b00529af679ebcbac41192b84c7c2d1addf298d7a2c563724ccf14eef464730be912214f3f25eea60c774ee4150200aa938223ba50922e017e760bc091a998a
+DIST firefox-60.2.2esr-pl.xpi 419023 BLAKE2B f173e5cb75277f509cdfc2b82011d4f6308097675fb25263f416ffdf83ef4e351f2b2983f9c4fa3e032e8e50812ac7f2e83cbf4d4c0efa7ea87ef5b52ef06649 SHA512 c74869a5150572eee28e78f3da2bc563953afef10a55c38ec560d5cdd9f52f57704166fc86b03255699fc1273bbef2f701f130744a57fd0ecd081b48bce9d850
+DIST firefox-60.2.2esr-pt-BR.xpi 514759 BLAKE2B 8d16aa88cb3785e59652ff6323215cfe7bf1d150496dbd2e4af7411e85b86ea8289a13d1f76dcbe7d88d6b3d5741638b3d108dbd9a6a00b454d74377997f4748 SHA512 997b3488eb34ff71546794961144d80b24cc7c7f80e40aa5aad61456457ba2446ac6948456bbe441a3f01d87019fc561fbbfcf3c8219c84e3509148d09422ca3
+DIST firefox-60.2.2esr-pt-PT.xpi 519361 BLAKE2B b5bb415fd5160603dbf6adc203d5dd9727ede8559fc80f64ed3d13a24ec76d7a9bc31c29fc3a8a4a1b7af87166219a26a3f0054e0e777f9ce0de5e197b26fb52 SHA512 68f933a0eb131adc3977f945bd0f8344ceaab67686e303bb21ba633c2161ea27af353f71a23b33bf7c01a29ad777260ce3b688c66a6a69e72c001f63a3b5f80a
+DIST firefox-60.2.2esr-rm.xpi 506037 BLAKE2B cdb27e8a315eb85726fc629d2f8d6647df7819b0028d10f5a1c4e9a951554cfc4f26a72ec479aaf8cb3ac47e09bd46b1c4deed582c00f68c39f055d2eaac1b00 SHA512 8245f6b2abad18e4c8c81ff95b5a23d9a38d18ad22470773b02ddbb10bbdfe373838d7ddc6977acf9769a7ceef555ac6b8f80d0585a4e35bdd1151d184e4e0fc
+DIST firefox-60.2.2esr-ro.xpi 514050 BLAKE2B 60a21a7656dbd9bbbd98f450b32752f3de2d805b29653d1bdb7a6f70ebf3e1b9fc40aeb6a66c61d42058557e1d07e90ce3f3d3a648befad601c03d691547f59c SHA512 76c9298e0460c7460f71bb3d1b050b906808f4377bf1eee7832ca90f88fa0ec255e5b77da3d62999942fad24aa8acd921e56d39892889ad1202d6e70db365d4d
+DIST firefox-60.2.2esr-ru.xpi 591397 BLAKE2B 3467f438dc6dd3dae7d3bc6e3c842f17dce48fc2253796c9c8aead4d6e24536ecd5c5695f00ebe3a4fd1d572bd13d02f7cad2f8e1b3534a9b9dfba03e1338611 SHA512 cc17e4d3d5f10b89ab47967ee5f11ae7ef72fd84b595d6d7c4faffe9862fb02ba3882affa86e681d3e8eeafcd37f5b30030907a32c6a5803027a9597f038b8db
+DIST firefox-60.2.2esr-si.xpi 545572 BLAKE2B b0ebdc71d56cca6ef7f3e8be9583005096c9041c2f02df37cbc5fb62475befb6f7c100fa798d107dd10c8b7558e650e2c405ee5d7f19d55a0aedcb992e2f4c77 SHA512 d37c7a61e56a7fb5cd97621b3be8f6eb52257c2ddf148eb9af5848b8278d245f78a20e11d05696f6bd6d2d5ee649e4daf06b9c894bb7a7d2b44625f3a7db69dc
+DIST firefox-60.2.2esr-sk.xpi 541702 BLAKE2B c517271494f8c267ee3565119dde72dc34e860f37c04eb064b5d1f4ff426dd0c14b7d9157e59f52b64ef4d4448c5f5659b6f06062fca0eb4594c337faa7189b0 SHA512 647243724d899ee070b67f570b7cf6b4f12fa34d86a7b4c847c6a9061892b68f9553e5b481c6ca08771462cdd5f342475f25146a6cd3916afd19bb5550eeaea1
+DIST firefox-60.2.2esr-sl.xpi 519378 BLAKE2B 8f352a867ba0e4cddc4512df33448af376477c6f4f75f4983e319f1d60311a5cfc3e5d4f858e8686c8bd7f73df1141f6084d0ed9257a18f54174d0786753864e SHA512 d50e02e2b94fe6cff6c06b80b58c892b7297bf5390bfeb92598aabfdafc9bfb181b410f3e39db4fb17676a6edab79bd4f6d12ec3c741c7d19670b4de4bde5407
+DIST firefox-60.2.2esr-son.xpi 497699 BLAKE2B 85baf0da0078c799a6f4acb95a79fc146522d727588ab046099e84c7f1e333ad9cf8a35367ab0984d60f9b7c49e37c9fdad8a7cc118451264a0ef7b7326051c2 SHA512 40dc45bdaa45d3be1328f8c40af6d6ca5a5cac03aa91c8c96e043bdee5e19aae97e45570bd4d36bf5731d87e827e94a95af3002c0c0b0b6248e4d522cd708963
+DIST firefox-60.2.2esr-sq.xpi 521266 BLAKE2B 30d8e156a5e00a33adf790f4504a5b71420b7366b1da96074823e3d59f9b7c579d89b9a45cfe7f8478cda0b4859de0f35378097a7eb20b25c25a34c9a71cdbdc SHA512 b212928722deba9b53f860a25686b5d1778d98ce3a43e0dd6f75f5d9c5a6f87a7f36f1c920ea9110b798cf4783307d324c6f200ea925e2106d860de2425730ae
+DIST firefox-60.2.2esr-sr.xpi 548771 BLAKE2B 635c9f8e2893f68b15976bbbff7b511c87150ba3c5e3f1577cd8c9567950dbd5805a12edd124ead44bbfe32afe9558d7567d3ac682acbf427047281f8ca8853d SHA512 9cdde47b8df9bacdbb25b8907739e5919cc997773f50b9dc0dce2d75a89ac62069828e1fb31eb520970ed8d517ec6896f13accb7c2ed611a6497f4ad92e82375
+DIST firefox-60.2.2esr-sv-SE.xpi 518661 BLAKE2B d0a3d7a86fdff6f11e236591b9927bdfba10f836e6a504f9390a662cf106fb2daff50216de865a0ca0cf0acba60a5c392fd4a0311552dde401d3c4c6abeed544 SHA512 855a23807f65a01bf9437dd3fe6558f4167ecb1aed5bcfdb4ae712cf6fa169621989188ab01ff2e7b4db20f9c922f39298f1f7e16a067600f7f14a6346ed065e
+DIST firefox-60.2.2esr-ta.xpi 577920 BLAKE2B 631e58b7abe7ab4e7cc5a0e8ab5bdea44702ed0fa3c83cd8eede05f858bbbe5e9159f011e8fba6ecf3c111b8c16f7b34cad5c060cda3c922d0391b77d3a69f53 SHA512 f62e11112eb261f9ccea2bb8c139b3b3e8bd07c4dd473dc3d0b995edee9d59750375c0d2541da1740e9e9efc305b7f365f6f9fe3c1b78bb0b11d41ffa1bc8b09
+DIST firefox-60.2.2esr-te.xpi 590956 BLAKE2B 487532722507d3a5d3a881b87223c7b14ba41796e97e27afa487872259d193881bc1105bfc33b95e64261341242ce57edb5c3ea8f29cac29adc4701590f82c52 SHA512 1e7d29805274074cbd8d4bc32e65b29ae2b8eeee1f24a9c2a9c794ec09f2a4825bbb078819ec065aeb55688613cfc3ecaad3a8bf7da0c43d31f863f84fa680e5
+DIST firefox-60.2.2esr-th.xpi 562814 BLAKE2B e430665bf824c10152b87219011972b1f5a0f7bb562139db001fe232e2efb89f78cce437ae25476c0e7b0b7fa6ee720e2c944dc03eb2c48f3cd2a03a20030a92 SHA512 9dbc18e5338176b631fb7487521df3de6116777ff405e36b1cd6aa4513f5a2b3e61cd59e41539a6342e81fd9165fe0a537ac8a65dd38083f1a220af25ce5ef89
+DIST firefox-60.2.2esr-tr.xpi 525852 BLAKE2B dd868efc371c136bd23997f48c80ecfdff7fc7d78175ee3b18b2d23a1970e1f77e4e9d88e5cf33b67bb0b096da74d85269d148d0a1f645b574954ae199f63e9c SHA512 f397ee33cf8c4b7dd67e67a0d52a5d9fc2783beccc7e38f9e0f7303a237fb31949c4e368d27eb9ae8a623f5fe5b3faa40653ffa4ab1067f5e0ab2c18142e539b
+DIST firefox-60.2.2esr-uk.xpi 580921 BLAKE2B c423a2d1707c91f4b89501b101f7e6289b41b57ad42185c08c87583eb69ec9d8f17a86290a80a6e483bdd97e15c5b68eecbff8ac1268a54fe2d52093f4dbb9e3 SHA512 db48969a713a92226aedb18623a59b4f4ac65b54d36abf267dff476744cc4b35c62e03e2c5a79ec16847df473f57fc1b4fd2252e36b3d0c79f2ab479f01ce0ec
+DIST firefox-60.2.2esr-uz.xpi 513689 BLAKE2B ad18cfd6d3be7a6ced237713b67ccef04340aed712a9bb7bfcb784cb7ef7d009756cfff5b7a4de04fb343edd01282855cbd8cada2447b4bad6d21e81c67d8c66 SHA512 9eb1c8bf583677d39b3de8985cf908363f775c1c84af88fcf3dceb6fa14517efcb84c21f12c6fa18e5ab641a8c2480f3a81e15bdeef9341e68bdb50878559c80
+DIST firefox-60.2.2esr-vi.xpi 528190 BLAKE2B 27026450542b4c642a4ca29a79ef933dab1011b41e915395b60a4e1975fb085665ee4fd8d03ddb7c97ea5ad5f6058628542ac380d574ca8044542820aa2eb12d SHA512 281fb799dda1ce4a03a7fc704af82f9856a23f1182e7c014107d1ff53e45a43ebc0d889472e8bc0b08dfeaeb9a16a78735c3cfa91399eae3f0c7ec3a20f59f64
+DIST firefox-60.2.2esr-xh.xpi 511856 BLAKE2B 70194a17a8ef8dc0bdb37ddcc829cfc7ad6603c850868223afcf20b640bdf85956db53f760427618381800095bb2a2ed65784f007f35cc18b20548c15bba6548 SHA512 2b5eb358b21b5119f7aa7a421cc1cfd6ba3ea311559a9869ae2ffd1965584296671d0ce5539c4190849ef197c2e81a347d610b7857128794c23f5b180185b566
+DIST firefox-60.2.2esr-zh-CN.xpi 543584 BLAKE2B 95b242cb974b96613a76808f414d0a63c9a4b57c9b752463d80c65b0869645823bfab8478e52e859783b48e9632ecd65843ec5703498f3efdcf00dca0f0a866b SHA512 9f111eaa621799c7aa37f8a0788296582bd60b8bdd424ced70785d12f8653d957be2ce35dcaea8ae3a7c4fa8a54124b36484572e3b354a0c7ce48da34f7d4e0b
+DIST firefox-60.2.2esr-zh-TW.xpi 541908 BLAKE2B af43fe323f6113b6d9cdda1b3a106559648fbd52751bcc28df15f7de1189a36e3dce1810e213f494922639b75c44e504e3fd3df06e26258affc92810929c96d9 SHA512 991aaaae66bac24e92cbd00314caf9a226cc1a5509e0cb812e8bd7f14d21d842ed8ec2435cab0c36c4a785b397c15f98c70d92c83790a1ef5a47a97ad01b5200
+DIST firefox-60.2.2esr.source.tar.xz 267599268 BLAKE2B 2f5dc77e55905a0ff7dd8868862bb0586420e4037bb264abc5abfec14c48c7778612be169f137056eee433361971be836ba424916c9013d7fa19db657dabf097 SHA512 8149ad0c974a70d8cb18a9212540235089b2a3470edf4dab5eece68b2fab2c10ff426a8a8acde5543b81f847d751ef4a286c9aa8aa33bb7281b429e95d292ba0
 DIST firefox-62.0-patches-01.tar.xz 9696 BLAKE2B 4154162d2502378473d7dba37214a82ff146cb0be33f75c5c1bc9c1d344eba47e005df4b8512219f1b5467b5285405da284e29e86e2f773fe181c06c8cce6950 SHA512 f8a2469fc8b6094a44f396dbb87996a599ce6379c57507234d1ee87a82095809d4094fa89ce3a115dc3068c1a52056b4095941e9664646ef497c629f11c105cc
-DIST firefox-62.0-pl.xpi 370888 BLAKE2B 4bce7ac9fda7f8e9657c4fe08a5cd5de266517a2945c9b50ece865d5c167fafc70d410238ddcb13772808b22a1b8409349b26bea50d95960439202ea35dba4cb SHA512 0ccce65cb9fdb23d625ad86d1342e4d046173051d168e15c5139a2c99edfe8cf54d8069b8088facae127c716346efe31a9c983015cb93ce5a7e441b2caf95a18
-DIST firefox-62.0-pt-BR.xpi 460868 BLAKE2B 8de5fd510c383db4c8bbc115deebfe4f0a3b0d447baf0431571ad9f41b6ed39401495a3d3d51178c4665b7c8f18aebd316ad46018fe97ac084a81ed841843330 SHA512 e3473759e94e2ca79e08e3889429c21cbc22d66565d5cb0c207c0fa5e6236577e77855dd7b1c322f10686aab9b3f15247970370ebd1eb2964f7715774ac8bf90
-DIST firefox-62.0-pt-PT.xpi 473528 BLAKE2B 804604fe02bb9268e05fb997c16cdaa0f88c9bcf20a23a5e3a49c6d332eee731e24ba0372307cf9b350b830b40d1bf4d10de7a76466003bde445295b60e5c073 SHA512 fddf6512818e3429749e53486c4c7ae0778868b7d984868793be92398637f05769abb95b838aba91cffa4706cdcf754e27fc9cb2e012a13d3e6784c504faa8b8
-DIST firefox-62.0-rm.xpi 462466 BLAKE2B 3c287c9eb40122dd8ec3b575b4bd9d31d36f080096304802b0ea92d0275dfe92d495dbfadafc71dbaefc0a70afb4acd77e4612022c96e103c38b94e1ada19129 SHA512 193769a4bc03c7b34172da634bac8133ab24824ed4b75c7a6910c29810fe97c73bfb87e9f99949b77b762ee6364e2b6109e0ef41f77077b2f177143143ff3a05
-DIST firefox-62.0-ro.xpi 463404 BLAKE2B 325880adbb576dccffec5483dd2444c913f2d79bb0086e7eb3862f6dd26bff332c3a07bb64f664781a9e49813a8671db347933b1a4de74b3f0886238afbcb542 SHA512 970a75510392bb90f89e00faab26d398266f2e5b6293a0821529c6dffc12e2313dd5323ecf128ee4b4d93d3193e4bfebd5469927e66874a982bf7601147ae07c
-DIST firefox-62.0-ru.xpi 539889 BLAKE2B 44c151d155b2c58b9247bb4f9076dc732a96ba69876fee7f0430365cfbadf2a57de7ea6b8300e64cd47aa128355dec918557ef4abbca78dd9f30af7d134e1873 SHA512 d051eee75a1cb113db6dc869a1e3edd70771765184004007195b7c1c9169f97c576f9db19a5da8987811ac270a838a84398f7dc8c99b81effb313ceb39ae9222
-DIST firefox-62.0-si.xpi 487593 BLAKE2B 257f728c47c9955d4e271b46613b6612b39827df10f1702464a2bf80495b484070d343baa62fa0315a5e1dbaad89bbaf29b2a090af3d780b5acaf93530fddb4b SHA512 212756882b4950c5d18ce51ba60a31731b4614ce5bb97f688c0cc2588452cb0a457f9a37882c98b19eb93983ca52eff53beb59392eb9ae8b2ece49bf98ca9561
-DIST firefox-62.0-sk.xpi 488132 BLAKE2B adb9698fffb1a79a26e1db12724669eac93d024c1c632c58f2651ab14a2c2d5affb42864509adb7249ab5c6767218f0336594220c42845d689cc3217433b729e SHA512 5ec7bb9ec968347d8aacdf09b6d7bc049429b80035c74db10be9055b7752097fa41a10cffbf24e659e2840cf5d2af1af07c5760cb2f11377783cf5e4c8b20e4a
-DIST firefox-62.0-sl.xpi 468413 BLAKE2B 83e6cf1f6c07f96767f90a8b742264e4575951b49e988fe8a29da8937493b2d101a45a7dcf2362ea5c3e297e4874f3a4aa68010860a436c92695b4bdca06ce58 SHA512 cbd7a623dd6cf3d15288424dfaf642ce81fb46b0067c8cfb61deac71f3718258ac0a9f48895b19eecb3a4326eff7352cad6fea46b3b85e65dd5b8b10fc747e7f
-DIST firefox-62.0-son.xpi 445941 BLAKE2B cfc6e6087ca082b75622ea2a3aca31c02ba81591416ea3743b1c36a2167152349c85f7c4baa7426f6559583f7eb5ee59bddd41223f1dbc0fcd55b655b6f545c2 SHA512 0534ae2fa505dc6e21cb3d9ce7c2474f7b6361050b2660172534c780e86a50f5aa7829256b1276bf777d095b1f966e3eb2b2a7d74ae084cd489e4144f3988fe7
-DIST firefox-62.0-sq.xpi 475527 BLAKE2B d07502b8fdf6b51aaf573ec242ebb7d329d8f6ba8120f66c46f6f63b435596aa4969701c1ce5aede3cb75f11bf28603e5194e94e4b77fdc3d75b04ea22ff8552 SHA512 f0e86baaf4fc3a57f8d6e4009462351835366cb04f684e0e5856200e604c910d8ec9db64ff0d2dee03791dff17e6e843cecf4721d0334371de784e14d43dcdb4
-DIST firefox-62.0-sr.xpi 498808 BLAKE2B 018ff68b284090d486963ccfd4726fe8da0760c502e6df72bd3d4c8ccf32bf18df6081c5da9c604ee1f7cd0f0f44ae135c196a62e0f95afb68a011045dab5047 SHA512 87ddf8e50d5697367c7e572f73eae9d7811636d9fecce309353bcec2ab78d24bb5a3ae553a61d0b134a7b382ad7583e67a45ccc6b613f8eaacd90491cb1d551d
-DIST firefox-62.0-sv-SE.xpi 469495 BLAKE2B ecb12bfeddeabc8ee77cc41684bfaf1e95b18e50053da967281951061d8f33c369b1c65689a7f985212fabde6af1c71275dd7a5cece4cde12dc7526d02482f8b SHA512 4b4c2581c55c28f50423759258c8054ba26ab53e1b7ef7f8ce07223e91bda76d2811140f9c686ff7354516be1fb53cf6d10ac4b6716970487e94b53a1b0bd04e
-DIST firefox-62.0-ta.xpi 526480 BLAKE2B 1454ccd9f7495ac7e8b03903376349ad44537de018f211867eba0e597555e336f78b46b232c8e2ab747abd3a4cdaade14eecd61d7e7e93b13eb50ca10f4ffb47 SHA512 5b202d294c7a6a9db8d1a8d2800d915566e7aa649d4d3e88bf0f0d93739b159b5da2eef030fc78157549a0f853bb78aeed401ff3d48bbb3d73ab6d1ecdff957f
-DIST firefox-62.0-te.xpi 536772 BLAKE2B f761123284530a1520e9b3fbea5072664ae073ed520d10e26853bbacdb044c4d901c1a2c4541314bc9075630b55a7c979953ae0327981be37d1dc0457df55700 SHA512 548ba890e950e8191af327862c450df69c1e0bbe0eabc0fd93e1314bf7d333d6545ad1856c94164c31f22941fb0480d06f3f9dacb61b932b1a7298660a3ec928
-DIST firefox-62.0-th.xpi 507132 BLAKE2B dc379440bc8e45b6824832eb2d12f1d7673179794e3af4f1a5f49bd58b70d0ba43731c5f451ba79455e9ebc594767d0e1418b8a42dea5d3011e90ae5115178ec SHA512 11a27472f158943844090c615984e60a7253d77c21c5b79d319dd5a949d9c493a7dfbb202ea0bcf8f0b235d2646adbacdc467ba41e615715ce639c159cca3725
-DIST firefox-62.0-tr.xpi 477277 BLAKE2B 1a91a0556e6f8205a94e143edc51933fc88caa45c706407fe29bff342a104de098f41338c740d738a04b2b1b7d4872a2a930c1169cd04453911386364787b37b SHA512 5460596c9e950ea0dfc340e875ad55aec27c23011fd04ef632b1a3014a12894f88a8846c2d2a7799aa2d6eeb800c9af9ba2d1bf7e6bba5be72c77b6e1f842475
-DIST firefox-62.0-uk.xpi 532585 BLAKE2B 37ef06660ced9eb1a1d7af7e2e8e4cb17e980b17f821c3268262a9fc067c51aecbcc1b3866ea942220aec13964c9e08c6b6c311eed5a697e4d0f8b4e02cade65 SHA512 ff7a33eec0ed01fbb4b00c5ba452bf59a5c7f7e4d7a34ec14176e8368fed217037a6e7e2ca654d617cdc9764c95155a71ccd4fd9ec0f54d6e94d1a6896e9c488
-DIST firefox-62.0-uz.xpi 457993 BLAKE2B 142476913163e695e7684c8c8faf6f669d9b4096d1620647ead9a868977560ec76125eccbd815f733cbaaacc1a82a95cee285c10d64d4b6341c489d769dc9ae6 SHA512 4555bff8b31ce430c0c7de0bc564ba41b1e0507baece6d09916ede7539879c6beb10a92ae0e94bec7fde3862feea870c8d8c1b51170a2234a706f1e79f9327eb
-DIST firefox-62.0-vi.xpi 478322 BLAKE2B 6d62479b4afcb36afee69715422394a134b0fac1559161a907202a59d459f4d7db817e5a48fc5d817e2117833007d467a117e3dc6e4be39a5834d2ba05c73c28 SHA512 92a1e8f71b0e1338338bf03d93eaa58d305fd32d2cd4918212de704718383867117337436956a770b1ee66c98e7322e371a44aefdced42c3c5b3302122f4f4bf
-DIST firefox-62.0-xh.xpi 461200 BLAKE2B 6c6662895281e7d59f1cf6b340aeb8df747db89d63e035f8d2b679c0b9e5d2fcc8f02d954d45218f00927247e980948530636db6cd0bbeb12729e10de3d86862 SHA512 9fab4324da3a9e9179249ab0da57ef21c1572aca6a7fa326e744541381b2fc12ed87c606e2593f33c6e1b1921cfecbf577e4291afe3cec37df7ac990c7d1efc5
-DIST firefox-62.0-zh-CN.xpi 491486 BLAKE2B a764eb0bf3c3d4e48c7efb2ab0ec4ec34d1a57e1e69dab6503315a60d15747f2c84c1a62cdb7c02c24a9c81af41353e47620b1d08377c47555a988d94b204e3e SHA512 d6751b1e4c4362845c8b32adf8ba3705b352683c5be972a21862f759752b2c313f7681d3166a8a342a27922f19d1a8940a6c5aa0102a2362cc33dd7f95656c24
-DIST firefox-62.0-zh-TW.xpi 494523 BLAKE2B 7da4de7bcfad1549eba91b7bbbc2075c92f9a9e55c1c93200316b3066c494d6de914b97e63bf3f8c0f23944e08389d7ced297e059322e46d7de9e47dab49cc16 SHA512 a2e02af4e7bde2af4889229ed3abceb34e0fe081ec17c0173ff89a54b6d4b1d0a58da73a813b72683c663bfbbda015d9721a9467c6775b970d872bd1e0f81020
-DIST firefox-62.0.2-ach.xpi 446319 BLAKE2B 4a75f3e49600a17a0c83f41f1401eddb44cf49cc9623bef93830b53abe8ea423c9e97d0436f85b7645bbd128161b0671648746bbc4f7eed6d5c521e42abed0c2 SHA512 c898035cc7138fc22ab526b6ae167cde741b014d2b94d3b886d5d1f542ec8a45311bc379de3857afedf8545978dc022616298896d18fc50867ba2e6db3a49a3a
-DIST firefox-62.0.2-af.xpi 432296 BLAKE2B a0c62bc0a8d2a40598da1992d804b8051ce1c7d63f95244d506ae7e6ea5f1afc0ad6bc2afab97779debb9f87520a439a9d0a3c4ea14683d7710d1a43d042c37a SHA512 2a258f44b01f3dabe6d9162559152f254adc899549aca5a9a66e9f537ca08874411a501d4662ad7d891e266ba1b9e26f5a96e7f3afa909f0227c47db5266d629
-DIST firefox-62.0.2-an.xpi 467502 BLAKE2B ced18a2649b8732f2f8c8db5d094d7259d815d5cb367f9cbf32146facf72675783e921ab9083d6524eb36575e03e79e0827304d4ba30aca777d1d0b0f943286d SHA512 b7cc14ee6d4e3a4ef469c59f6b309b0ec5712eef4118fc7127ee5f4c3f5aa787cc81e9e52e9473ef8130b6ba0e7c681d7bfcf6457704db96332b2ea4e40172da
-DIST firefox-62.0.2-ar.xpi 497988 BLAKE2B 49ee9217a01665621ed4190434b67ad1f5fd6988a7bf5a899a9cc989349f58b2352c41094dd02f5a60bb09f76e23c3f6b06221d7849a850cdd13301b0a10d5e7 SHA512 a2442c0c075aeb0b7814ad0eb6f436e17b4cd7e7164e2d911da76e570d8488d9076c9b8c66168bb91e7de728a68dc07d2549d3e96594f4834f11882884c8769f
-DIST firefox-62.0.2-as.xpi 478314 BLAKE2B 1c9c5aa14f6eb2af1094cc1671f0b5a71359ceb0d597332b69b07d6985a6529b7d2f5412dce4ac1951ffe3a7e673f57609ec726e6f64c7ce267a28f9188af9fd SHA512 1fb0ff65f619d60be958284acff6c4d19b6cefcc04cabab8619cb5087e0f5e856cbc23a85947b40f63359cec5a2e1d3ff75290aa261dc6d6f0a87078fe732740
-DIST firefox-62.0.2-ast.xpi 455184 BLAKE2B 551875de7639cc28326023d4c53e53740f68afb2eb2c959ba352380856354db71e01531f2d7440f4011d6950d50f919f09bd14146f4e92469a69d3bf3a470b29 SHA512 138023248373d8cdd3d9c2cfd21cf07d34016ac709f0540262c62bc5fa8ef027683e7721978a8b71c3bb34114f784f8cdd9d0e9b1e790da40e8057f5b1360e02
-DIST firefox-62.0.2-az.xpi 477133 BLAKE2B b0015b6932b2cc9116ab676fdac9f03be4d36be8077c39b3d7c5e7a4089c36790dd1d4b5bab1b50fd8f0e9124a2f9aad968e05ff5a31a4842365e368a4d50302 SHA512 d19b8c9facb0ad842bce26433a158f27d3427e65c8e33c578d0b719429e63f69023a088968e0bb689e5b5be574f5b9edc4fb9d3b010121ffe307bbbd54173e14
-DIST firefox-62.0.2-bg.xpi 524205 BLAKE2B 351e5d8cc948e083147f3ddfaa42378a1d550c422e0099406298156a7221ffcd46465d12ddecaaa43f279c401b5401256aefa2eb9b647dd94c4e953e14f86096 SHA512 c6049786e37a41646483b2b12c44a4396b1a352971ec8d157b3649c4091de3c66613dc6f1609369616e39735affba8f6bf5c72bc13ce16e8997a1abd007f0f83
-DIST firefox-62.0.2-bn-BD.xpi 538602 BLAKE2B 8e11ee7ddec5f2a730ddae4cf2030c9f65b6168b0d3453142bd695fbd929be37809e666cafd58610eac1843d6d0a528c6d628d19a6f92ea858b5cd43c1159367 SHA512 bb9e546731a6f2452f067b4f4f700378925577dc915bd0d7d2536e04755fdfbbba1cdc66fa45f7f2729d2f7040c8c6fc0fca99cde63e1c95c10540c2b005c8bb
-DIST firefox-62.0.2-bn-IN.xpi 509954 BLAKE2B 48f255850e1bae24b920e138e8796c88e222b36c191e6e332e780ad48c0c3c3aa38cbf04495b1dc4cd3de57260f46afb8340dad35e5cf00776f2dd56b2e6213c SHA512 ec20cb19752fcf433b95c5623a5207fdb56075cf8900447c6269257ed745d2c05661b186f4f897f0876359017697566b58ce00558978e56220876c777bbddefa
-DIST firefox-62.0.2-br.xpi 464404 BLAKE2B c47e13622b6438cd5c158e3bc0c652b1194b60c3a71e68204f04907d115e558bbcf9da86bb26ae8343de0e458f77447e98dea1e3053f06a10cd93d13a3a15f73 SHA512 8acf5f08ce4eb4ae0497e4701c769a0e1d409c736c3896fa6c5d3cf9847d5f947777f3a8eea0959ba263e4c6cfd137fd2ec98db44d53faa826678b464edeae79
-DIST firefox-62.0.2-bs.xpi 466252 BLAKE2B 1f84726188910283073a692ec702a7d79ca16aeb5ca6930da5b91cf09a41c6caf1b921da143c9fb519a782e73ca7b5bc61670095da3c1ccbfde4299acbbdb9b0 SHA512 0019649877ad598c3f6ab8a62d438819043b6159b09995f872c3acfffa4321c7602a3a792a98ccb0491cf7f52f30734da9fb222b09cfb1f8798bf659b8a4e833
-DIST firefox-62.0.2-ca.xpi 470060 BLAKE2B cd836d0f6715430cf5f1a5bb29ee1d3a5aa35302ea25c40fd9e03684de312a8128a4bc9031e0970be900e41745d133a42389eaa6d55daaf57cc48349ca96e9be SHA512 9a88a21ffe696cdff4316b02377bdfedf2bae48856dff78082d8cd13b98acb2d34cebc1cfd77740f7a6bbd9ec755a4f151972d57c91dfa132ff70751aff9dbc2
-DIST firefox-62.0.2-cak.xpi 488841 BLAKE2B 26fa6e636d9b4c43bc8e3666de64cc529cdc71b62931ff6544f742c45022358e57f8b0601b2fabf11c2f234c22527b6f32e6dcac0a3b26a807953451da246825 SHA512 da045e12b5d087ce8317e04022fef0f21d23a7163907b92ed6d824bdf08a17e786ae8c51f353534036103d6ac46b8754d366f49a753717ef6a09499fadc35fd9
-DIST firefox-62.0.2-cs.xpi 478357 BLAKE2B ed37f4a39f8f7b26f106a4b55cd79fbb86720b9b2ed9db1e02009631f24ee0041a3c9a783cfdda87c6d05210e298d5ecbd26b188bab3c209d10bf702f575320a SHA512 3628e26ff908720f01818b304a27c130ce137329e2a15809a40f5d84e73997659a30d522cd3bb89b5086d35354f68d8fa2775f3f5174cef68a19a63add3944e0
-DIST firefox-62.0.2-cy.xpi 468861 BLAKE2B 31e8780e95eb49300e15e7ea9d3a48772664104845adf402a5ad74caf4ff96a1902a1848142c95b838959e2f07fcf3588f1625bb4d0a690ad6d50bc3d65ff193 SHA512 f8f009e23e4f4e9b70cdc9b220f2d0df2a17af27f28e5193a9976d91f74c59b28cad01f9f22c7108b5b304c4fde8292e1644d244da9fa009379ecadb20b16bf6
-DIST firefox-62.0.2-da.xpi 467292 BLAKE2B fa805301b88a1058ba6d87344350b402a913494820718db82ea5fc3312dd61bd85aa351fc926f1917c2a40bbe62682ad5745de560827c51d004e5700f1ade664 SHA512 51ecf374aabb0037fc93116ee970b1271d73c51ec768c27fac37294564a0370c365060ef128b684483b2760c6277abf432dc9937d2f8919d8f75a53949b0268e
-DIST firefox-62.0.2-de.xpi 475935 BLAKE2B 429cc6cb8e044ce9216acbc4bda8d55f4c0e4d6b29dada0d22d82f900f3e3ff9c307157d1177544696a57aa09897462ce310bfd1e4e9c060bd4dba12df91c29b SHA512 23779fdb5e5da7cdfa74b9905911c1580359bdb611ef2c9d5f8d20b01bd8552630c0ee28696e2b8cfd1c3407df3868f72c7d26cd5058fcbc01bc09b1c4101a89
-DIST firefox-62.0.2-dsb.xpi 488172 BLAKE2B bbbb81ffeae9958e18a2513c4d8ca160d267c9695fd76867013e95eceb8a4110ef1e4438d49d677d1bac4a3135281af3d145165d80fce1e13d19bb9b2cbdb2d7 SHA512 b3565483bab6d360034d5724d4af2cb285d919aace678ec335a22ebad4946f90a7bae55e3b7306cae7e409e7d983698e2099a44c5c29cbbbc5e8d724991c6426
-DIST firefox-62.0.2-el.xpi 546431 BLAKE2B 43cd76de959b21e0c2033ff82a2f3afff639e34b03eac214c87eb948d6886d47d1bfca42752ac663206e2a61be1b3dd1047e4196fd9fbcd7245fa167113ed378 SHA512 44315d85126cfc71bcad9a62710edfcdf94093eee7bc7373c809a823484f0a9167f5773d659628422b9fe26d90170cef945adcc4dc1cc18e531e53e6525fddfd
-DIST firefox-62.0.2-en-GB.xpi 436175 BLAKE2B 0035e4a9921f844f6ff3470cd2c900110f4215c975e998c7e7529901184d1479a4f1fbffbc9db99f4a6cfba2c6ed0d75e6cbdd34f7e36ad9670eb6e29ab2b8c2 SHA512 c9aa04274473da19b0ade15249c19153613facb81e90301e0516014eb37aa2de7c322d0ef4e9c24b95b9c4d4d0142ea0fa6d5e6855c1f784f26d8d9e8135340a
-DIST firefox-62.0.2-en-ZA.xpi 422865 BLAKE2B 6e9f48b3f6eb7f8ff3fe47bcd8d43e37a492ed1aac904427d8b51dc5f4c13427e75862cdb6e9388a046f309aa09d45558f827ac0a5d67c4775e05d509cd17035 SHA512 13e3f98c677a84bf46721cc9b2f0fe32df0e3054ccf352536f53dce1f96628c734425ad5286c7584134295eee8ecc703968af50f06037ac61d1853a4a38d6f98
-DIST firefox-62.0.2-eo.xpi 466537 BLAKE2B 656126e4f2bf9db68a1944300629cce1bae0985c5cd561c536ebb31024c5c7e64c5420fb3f892df7ef2120195e667bc62fc27f82e094dd25d1e52bb1a4a2cee1 SHA512 84435b40766d22f19c694469d150b5e7789f28195fce75539bf3050e1afe59efd3a87c1c402962d84f6b28b5d6d931bc90e75562561662b376634dacaae25c56
-DIST firefox-62.0.2-es-AR.xpi 473516 BLAKE2B ca71ec8cc86b25b399e63958646f2c03272f3b43de8ea4d3e48dcc04c5f9f1178bb8b86601e0647256523de67230c123a5deddc52f3164676e45e170a92c21f8 SHA512 24b116249996c065af87a53821f3534bbf807ead04b33ba46f120e26da8a14b1c75b00aff3b69c2b8fc948b7f10e2bdffdb4179f0bb444a9e31973aa2bf2d6d7
-DIST firefox-62.0.2-es-CL.xpi 473984 BLAKE2B fdc4cfd8f12b3a99d2dac296015c84ae2d05bb7778eedc3356498b9e4c95a9138617836e3d8132336feacc303fbc27f2df96a6e6aebe4aef06a9f2a5de4c7f9b SHA512 15924beb6c37d336d69a65df2c68bee5fcfe53edd37ba7c47b889850a0aa08c74254df9fd4cf70887fc56db0856fcb0d8d8e9d7c45a788b5f6f4325b6163795a
-DIST firefox-62.0.2-es-ES.xpi 414983 BLAKE2B c7f19fb48da14f590e8e3d7c7c20908f5bfe3866f1ec8355e4f3ad5ac01e3021da21b7759f5ecc21f04cb082238f3889dbc2958b606996a946ed90e26fcb58ec SHA512 525a89724c8fd76bc079c757e2d69b9e7bde2ed92981d3a4368542e558779d2378e0caa81468591fc96e55da7d1fbe155d08b76dd404d0dae2d2a8f9acbbdc37
-DIST firefox-62.0.2-es-MX.xpi 477954 BLAKE2B 6345700fa0b63468a280b1374d42fb3ca072d9a214f77b3aad4a303d6e736a5bccbb72a98c237fd74c092116e6fb8c903b1c770500f3c8e106a3d5eeff05ac44 SHA512 f30dfe898da5a244270257184dc28e55b9a1cc7b76a3766ed85471814e464ae13dd43ab03596d5d0f2bdb9931e5b42990731b55b96f6ea609b59613fc0bdc234
-DIST firefox-62.0.2-et.xpi 455378 BLAKE2B 5bd672c8a0bf63e3c2ee336ea9fa442aa94c7c0ee405d7fbb28c55d3d5c7c87dc058aa59fd020673d5a926a79fcff71472ed8926f3ba936efb53ecd014a26dc1 SHA512 3dd8d33f648e1152b78ac76bb391a11dffc96d231fee4b777c8500473854dbc2e793df78bc6bc1f6e66324d8330822c487e93a1570e9862cfd101ce80d5d5074
-DIST firefox-62.0.2-eu.xpi 465901 BLAKE2B 1e409b15f2ce9425cba85b93407fc32c8e2b4e240211d1c7abaf41797744dc3c35b1228790f10ef2d6eea8e5cbfccd647308f2acbb6195b97aaf1cf8dee2afe4 SHA512 7a6b1256bf65d41c9c27458d2be3ebc74771dfd39bd284aa4e990607fdfeb19c49ceea4f52767d566b65a4c36c798d9cc18fe7460bd9a1df280aa3fd2499ca23
-DIST firefox-62.0.2-fa.xpi 514444 BLAKE2B 04cf4fbb31705afcf3d126bed71c2ff000cf157d13117c463a87d9d513906a935d4b8c73c8f31e0f62c51f5c8adb65a11bd0c3ac79db5c28fc6d62cb9a2b7785 SHA512 889e2c450bc0201892b395b083ca22dd1e630e887b9393323887b5b8475636a46c09c44462168b7bf1b78bcaf70b9ccce47e2f13fb00fd77414f50105e9efc15
-DIST firefox-62.0.2-ff.xpi 459043 BLAKE2B b519c2af14267dd0bd1cc8b2a0703ffa48881cf6867a5e772fbadd93b40024f303e35eef1e4302c0612cc9d1597b29035cfe2181108a9aec47135bc0ead18b9e SHA512 bf7c3fbef3b02e1c4e3bf6021500b3ce6b59f981aabc6077d772bff66d3d239c56178b139c21673bee9adc8a2d2f0eea70371aa7a8575a94681eb481fb67731e
-DIST firefox-62.0.2-fi.xpi 458680 BLAKE2B 855237cab4fe145004daf18706f66a461db5225c727e01a3632e0bad207936721a3c6009737e9db9b893745ab961241c5f8b6cdbcd6c519d0a3f1b8afa8e0c0b SHA512 e4367eae770cf2b47e68c806f41f7184f7c49ec0900858fe557b6ed9bf7ab305fdf4225b33e6cab86711319442e794ecf2009e56a167375be2ecee32deab951a
-DIST firefox-62.0.2-fr.xpi 482960 BLAKE2B 6ca28463dfa36e4e85da8c27bd65c2489cf256caa1da9c04b6690d45a07030b1fe907a8899df83e78f4ebdbaf319a144a87bc378c876888c866c8b99a0ef458f SHA512 b946bcd72f470ded0da8a7c198c03c8a20d38990cad454682afccab007d6c92b4afce4490c163cb612b4a3da6fbac4fc9bb0622cd998aa231e1dca78e7bc4291
-DIST firefox-62.0.2-fy-NL.xpi 470424 BLAKE2B af06da104519cab2d6b5a10d0729600340f705141beeafd6bcb7d5e9c378a1f67b3e4350a1f4c61ddc9f1ee1dbebe3e7adde673858ec2fd3f801847ef43b8ba1 SHA512 f233ffb15370ee0bee2a033a996fb7c48b9a8ca3a38cbe8bd7731080b0030da96a4062fcc791f9eb5b9930530593c2330f7cdbb02f33abcb81ec92bc37fdc0ee
-DIST firefox-62.0.2-ga-IE.xpi 472261 BLAKE2B fe8bc3a7e156dd634ee269c95d89a69570bc4388739e253ad7207c3e83cba86917fed2e247031ebb79abad9729602b8d6803f836f2628bb1e54f2fed2bf42c69 SHA512 2efc12176a8091d9eeecb35d6c2be79bf1a751f21d8dfc211b3a5cdb7e54769a7adacf097fe28e7b09574b3f23b101b451571442523069969bd415f698a85fc6
-DIST firefox-62.0.2-gd.xpi 473971 BLAKE2B 06a9f34964abd2bcf8965b96742e3e065ec4605b30588e7d5c2afd21788e48df905be14c8f97d3fa02b3b10664851f849e8f86390ef272301e34e2f4f6dba7e1 SHA512 951f2904372b9f066d5c4b5b4616a77f63368b9334779b0c0e6e70c1d662785f5a996d0d8170539d015429065d81fc0187113517bc1f060a5cc9694f81c66726
-DIST firefox-62.0.2-gl.xpi 451821 BLAKE2B 51e7fb733b57d2f572a6504ef8703a98827823c5ccf64a0a0a8db86f7a8a29cb38d4d30c36aaab93b94e6f3b9a8b7ac97fe80e6d143e572115b6115408f5eef3 SHA512 3cbf4a7d60b4f4e25fe7a9eefa18dffc348ec3d91b2eb53264856bbea154029d3fa6b36fadccb73d9d23137962e21c8b43e45900c70bad4e7b196fc6ffd94e5d
-DIST firefox-62.0.2-gn.xpi 483153 BLAKE2B 170b22236a10e681c67683f321b1f2c42fc2308f552941aec8446767b17dadb65269ed0a929506fc8ae82739d24530ef8775ed282c6656f78b1f4c0f18e9816e SHA512 d33718052780cdd44e85383a9ab51372bc306f3f9f8c136c0ab35d0e97303ced9a5e040c0fcd600d1aa3abeca18b3966d809e7398d65cd742b1db7248f05fd4f
-DIST firefox-62.0.2-gu-IN.xpi 539984 BLAKE2B f82cca6f0746ee58b58aee92bd72d9a11e56380a0e2fd7e7ee3e5df4ae287c2b47db147dc5a522640724642e374a418a45dcb823358dc6d4a10e759bc5e98117 SHA512 977c6e8f853fbfbe79b195b5642fd4f0076001a85572107becfaebc27f09fa50aff4418364ca703240534819afaa4a89862e973cd73b4937b74e6f876cf3e974
-DIST firefox-62.0.2-he.xpi 484819 BLAKE2B 60239954e5be25d68b6e3f277d7154bdba6aaa6072a998f698174616362c2c7a3483ea47ea22df9e15315d7bae9b75ad3bee0a09d9ca0f2cbe98fd165e03407c SHA512 44e4d7f73c3bcf2ff049be97e429b6434402af0cd0052fac775759a9cf3693d7cffb236b1af1da05c90a81b8d5de56e9c255027ee331bf0bb58114d5c12b2cd7
-DIST firefox-62.0.2-hi-IN.xpi 537125 BLAKE2B 9da54bfbde4ec9a8da2cb4b64e116aa48c5fa055cb9b3ba603a8ddfeb7a7ef5a8d9c888b7b01e08e2f94c9b232ab682361f8fecd70e702934d65335f0e9a4509 SHA512 64b30bc77120114974e0c256c07cf4bbb9534b62ff54e679160f75e2d3f38e90f7b882270ee02759ab20805ab0d95294bde2eb64bb713442874caea82b50cf14
-DIST firefox-62.0.2-hr.xpi 459607 BLAKE2B f5522513c1fbabd64e48cd42600f2fb5cff27f10bb937f2e956f3e5cbfd2da2ced4cdcc9106829097a34eda82ad251a8d9e7854349ef16c441aad7bd4f863bf2 SHA512 dd1ee3137c5dfc3ecd5789d3bdeb1dc29b1ec8a9acac6971a6c831e9ed3bae5dcc10fd44c09733f38a3a828a1ff6e09b209c84624252bd6490c1689547cfd8d5
-DIST firefox-62.0.2-hsb.xpi 488118 BLAKE2B 0f7ec922406da38b9f4ff7d6275a33078eb6ac218dc2c7453d0af6a40ed6a1759b0688fcab8860e01a71b5c1529f68c5a9382be2ffdc4a139208cd5b68556c8c SHA512 8579b33b2fbffa51f5c0c7bf795cec5aea91e9a16d62360369d79bb75b00bda9207f01e752392522dc775e8235b8eb67310e2cda2bc2643f4bfe822d58d94399
-DIST firefox-62.0.2-hu.xpi 487432 BLAKE2B 0e492dfe3b3def23f46153d74c1bc586d8255758bb73050ce6e4425d4f1874a9ef3fecc1df59ae300ae44c7e1750eefa4c40f87df990a25d04c5fbabca45cc2c SHA512 3fabebd6451a2c3ae82489eb18a7b27f644cf52a49ca513a6bbdc057b6270101fdd5f3b2d7d3b49480aa4daed98bea3a36d3ae3e0f3f581c68e824f52f74ff88
-DIST firefox-62.0.2-hy-AM.xpi 518007 BLAKE2B eb7e7f41fa74629e4df35fed26d73f8d35eeecd8faab2d8d71d25806cb434ed27f5ebfe1bf5a3fc899140d402282b1feff440f144326e8ee864987a6f636c5bc SHA512 44974aff3f060d5fb52e36a31216d056f049c71df6c6530a13da5be7e33ff9ced02acfc735aec0438e1c2ec6493ba194b7f3710c417798947d40f59cd8ebc0bc
-DIST firefox-62.0.2-id.xpi 458272 BLAKE2B 1daab6e50927f329de6c2406696e0a5a98982736d4284d9b454d3bccbdaeff2206f27799c2ccb42d97d9fcfa3fc8c767c80939808021fd6e5cc9a3768337d204 SHA512 701bc16d72bce82f5a40119f901d6e237bf4a834b3f96996b532de83ef10257612b4f7fe18ba0caae778a35ff9eed4567529bcc81499d4bc51ad31a581175805
-DIST firefox-62.0.2-is.xpi 459612 BLAKE2B 90e72c613b3180440b18ac58676a990cb67450acbae0c953a3176b27451bc6e3eb3c745cc0c1ea256b1abfb2ac6b669210125c3eaa44d819196d91ba659069db SHA512 f0d40a37c2f01d752f453ccb9b2da4a0b8996cb367cf59004a3951a060213218100c724226a08f5a2442c07937210441bfb6a81a23368e9e7cc9ca6fdc114114
-DIST firefox-62.0.2-it.xpi 347134 BLAKE2B 4dc56ca280f52620b0af862a53007f6efddb52d7582cf967589d6a03a36336f035c408ce2bea6e1d7097fbba81262079009604561834e79af261f032f77d1d7b SHA512 61804d0600dd664f446cb3c65fd2ba9398c8d25b9f060dbf312c31a557c673e66921472256db13b124477c7447756a22822c57b883933e4e13ca36e0af0d9a08
-DIST firefox-62.0.2-ja.xpi 504024 BLAKE2B 69402f20a24366c14c27974d7fc816d38d8335124b3501da4e113f125f75b48b987f8ea2cb3f4ee5f01a8ed6e5e6247879d246327a02573705a9f89531830c09 SHA512 d0e955673df89a2a4afd5ed5e742cc9802a0496d30a3ecef307d7afa39c312d127501dcb33399127b422485b7d639b38422352c8f8217dc4b7a0470e9c30a3c0
-DIST firefox-62.0.2-ka.xpi 503706 BLAKE2B 2b26ea8d5f277b02cb77a7b3989e6b72591b2f155519247f65ba542a1e7e731d4c979b59e232255490fdbaa820fc0343c1b0808cc9c7433e72aba22046186b07 SHA512 82db8266d676060dd4fbfc3ba2483721f72d73ec08262c1059e93e23c5a41c68c5e36398bd68b69f990ea1c211dc27b4309081456cb50bdf7bcbe1e24aacc084
-DIST firefox-62.0.2-kab.xpi 478240 BLAKE2B da8daf16151de409f850e5ff2a6dd263dcc13ae78dff02c7f4ac5ecf98d6f9e531c44e6ab5137f4641ecfe2c5b1d8a49dec5a9ae9fa1cf7bbcd20bd3d0778774 SHA512 868025e2adbacf72971238c64b890457144b719348cacac355ffe3d060265272680ade1d531ab13b0db9eee6d8cb84cd23720cef4c893e643ac2501b6da26fc8
-DIST firefox-62.0.2-kk.xpi 530652 BLAKE2B 744a98b3d427ad08ac62842b22b1f45e694740ee574262d5ea8d68b4d437f674f3c601521aa4c486a12d49df9a3c9c6f3537ec892bc8c4d0a363c8df56ed89fb SHA512 00ee4e146ec5a8bbafe76db3608557bd51c2ba882b34f82e92e1a39009d38655e39264cb0e7fa4c200a0c3fa168919547606ca4aeddc97041300045f9acd4659
-DIST firefox-62.0.2-km.xpi 521446 BLAKE2B 528f9bcd19d342944549ecae9de24a7296c8b102ebe25ef735e4acc287948bf161bc7fd156f9a3412e1ebffbb9e3a214cbb2e9422de5e8232dd95f12c09da57c SHA512 18cd6c0bfe87330fa864f9a6ae9fdbb3024b27f7bb35b4329e7dc0ef7bea5811824b176c87c56e53ba28b7f2769bf5ef19f6d190618d4139e4ce655b30d2555d
-DIST firefox-62.0.2-kn.xpi 528083 BLAKE2B a3d87093958ce465d512f8c285de647d1a60982708125c22a2ce1e56f554093edcd0993bdb533f1eedbeea07663f399e1fcdda1801002c3036183bef1e8fa4a7 SHA512 9d3e53031840493c6582a7f3cd348abc356ffe758981888ca39972bd9c48700dbc739cf26512391dd37154ab7de9ffb3909fb050c2e77d01a67f7f9622d435d1
-DIST firefox-62.0.2-ko.xpi 498336 BLAKE2B 92041b661304cbe279257e63d04098a80e6654281e6792c07aba67569189ad822bce1f295bd1cd490fae90ae5da250b1800d7d6ed6328502ea3137668e148b37 SHA512 e13266bc40d632859630db9c363595334bdba3c4ebade1977f89b08fbaf7c3e7c07fcbf298871e27104505da06022bbedbe7794288fe10868e2dca31b6d4a8ad
-DIST firefox-62.0.2-lij.xpi 463445 BLAKE2B 235e5e8b0554f8c98601828b524d033ad911010900f4ffc2ecef45e0e94325a4aad60451c1e5ce6f2ac41efb933a5a86d6b3788e8a43cee6b56823a58106a164 SHA512 a61d3d4a2c1351c78c2442b16ca3ddd9f47e9e916227f74673170b1e3b3ac335ed4437ab4c9c4c7b5f42d640de8c93f66e6620a3a9c220b804e082ba11212354
-DIST firefox-62.0.2-lt.xpi 487646 BLAKE2B 3e28a8a529c03566b2d87d5470fe6a144f3f4d7a63198fd28df9ffdd4b598a6d42298048bc7a93fd09693aefbc9b9a170a7b03766580591f2d3c99074d408b99 SHA512 1d391e1404a4964481a9c516613695504715f1e3355cfc398fbeb02c0c2e46f0236155d814151afe4e4c8e71f231215d3b0b664a8378982ff2d8935d64e5f0e8
-DIST firefox-62.0.2-lv.xpi 475696 BLAKE2B edca0ca0cbd0ca941c412a031a21c7b148f9f00b9fc9a37cefc7bd679e99b94c444d4ac8b203d20c7f7589052b8bdd413d325b278bd145571e2e11b717e20e09 SHA512 a498992c8a5ea2996d3a3897eaf032c8b5d9b77554147d137d4ed617e5dcdbe8eb1a23cd4a9bbfced8e5d8c1f4131d0fab5172fde042e838b2750020f6e673b6
-DIST firefox-62.0.2-mai.xpi 494723 BLAKE2B aa683c310fca2bd96ff3377be2f20689e8d23e41a482ff08893327425568167cad8ab4302c0cf6d9e906905daf06b42618199172fcd0bb377ee945b42ea3a748 SHA512 ffd824eed685ffa017b6c1c8046f045855792a3f61499dbc41b3033246cbaa401bae1162e35fda19f9a5d789eef669b84b68956b1f07a83920eb5cf9c14fa0fa
-DIST firefox-62.0.2-mk.xpi 457527 BLAKE2B 278c8ccc15ad71eedfede8ff090260adfc6334bea4a1f712417585c38b81c304ed1eb7ae9ad1bdca1f11720d4f6305b59fafde6f8cb2f26ff8332bcf4c462518 SHA512 2962c8023d65460ecab223061316491341cfb3854b6f595cc40b1fb8e632305751e89d1f58961330d469dd63d0ec91964d1c1e7157a82b751417f60fbb08b6ac
-DIST firefox-62.0.2-ml.xpi 538826 BLAKE2B 157cac472c27184bb2a1a666ae82cfaf050f1812749e3232649586894c38259a8b3b7290f21c645bb99e362bfaeecdb3282ff2ebf7926084a9c0f7fdf00fde26 SHA512 ea80ad648a0e8af3fb8a1b7b8b3d2c66509578226bc74f4cb699fc4a1c5a115c5fbf2040ca2a342e894d477eb1c2030f800192aa3c0f96bf81dbdc7f84d60d54
-DIST firefox-62.0.2-mr.xpi 530354 BLAKE2B 54741102256f8b82d12b18790ead3af96d5309426e0d351e9277e77db642838024f11b087a14c3e255db249d437393392a8f8e99fb1800de0af1f2ef17457d02 SHA512 7754ceeae7168fb0eb985193385aa54e1d3db827f7f2e983fafa89cb4343d44ea17d3958685a419aa45a71f46de86cb8dfffcd3deb181a273b84bd2fefe35f48
-DIST firefox-62.0.2-ms.xpi 459911 BLAKE2B 6bc8c8460def32070cedf5278a2cc07669d9de501d109f95274c9c50d15759293c77fa50a50ce5684a09dbb30e52408ff9cd9c12d265ec5129bf0da93da2a191 SHA512 b2da65dde3af0944532ed0f34091f2f896f11c43798274ad3335c3adeec2c087d65f8681bc04794686cd7bc374ed73250468189896cab77693b2090f703efd2a
-DIST firefox-62.0.2-nb-NO.xpi 458925 BLAKE2B 485dc6dc485800735290decf4cf7a6e3965f8fb356cb6ea07fea890ed408adca2304a502c00d1cf86bc2df1ce5bf815635ea7cd4949cdb2bdc5ebf03fb24fe50 SHA512 3e1c2394b1fff9ddde349a013ab365e5fbe2b9ef89d430bff69b1462d10fcc7f02eaa75a2a88ef2deac3b38cc618f45eb1b22534f451ae77d8fe8ec15033b9da
-DIST firefox-62.0.2-nl.xpi 459511 BLAKE2B 6fac145ee48d082292d5b41da947a0515df9e93600c209b16554e726c384bad71e497a8b98dec7d2804ec3afab88f2e22d61a468789f5a817633a8b14bb8792f SHA512 0214d00e74fcfe958e7b3ee7d460fc56625975910c275adafbc99cd5e1938fe7652a8d309747b8e2d4eea81ccaae168b52d3a597589b3240260da65eecc5a47b
-DIST firefox-62.0.2-nn-NO.xpi 457057 BLAKE2B 3f68568802e6dc9496cbbe91b9c54325ac29d5799db719288105821c3fa1b2ae56d839f8aa4945b451831ab91243eadff8086b39171d23408551c8247b082cb4 SHA512 9be36d6fd0280506ef30af266730ea7ba57a0ec8438893e0ea8ddafeb4f83f85089b97ce997139d13f16aac7bde41479a0ec1b2f07eeee023632d7c84e2aa705
-DIST firefox-62.0.2-or.xpi 485374 BLAKE2B e8af79a432c674b4ef78fca16f57a699aedc1e061bad37e5deaeae53e7a2417310c763bf3f8fc093194cb198108b3af41955c89ce6ed7452fa69313bfbd6c090 SHA512 a05836bdc384c6052e546bb91fdc5d1f33b375ee812a7b676bd09d35c7156f80799c18b1af4b8af72eca087d0231a1f60cd582431aa95fa378354f1648ab870e
-DIST firefox-62.0.2-pa-IN.xpi 496916 BLAKE2B 2b075b407df9ff9758d88eec47b7c79b30bf95f0e170aaa289c81c09e31275ce78ccc610270c3d57dd698c40aabad49208bcd121a9f24f6229cfe8f0ec0338d0 SHA512 9fe90ebfc1091242f83887b506b93175421ae00faaff7fd1d438cb61e39e5484398ebe6108a89cab31a9ea299daa280206dd67d38bb9b6b668b8c63ecfefbe3a
-DIST firefox-62.0.2-pl.xpi 370890 BLAKE2B 2192d0ec996be573e3c857988c00e05aab9033674ef30944775b903f7ab70fc32b59882aa65d4439d8554c55f043354e53220484ad11284ed6f31c589961afeb SHA512 12c5beaee75097ca311f6991a0b1c4907391b54fbe6ea27652d045c8e5bb75b67702bac891bd803fa7145f4c046dadfc3ab84fd923460d642f8cf74ff865bc82
-DIST firefox-62.0.2-pt-BR.xpi 460866 BLAKE2B d2a1777a7dd0266591adfc9344ed8ceb5a26f5ca07f51bc15de092b1fa83d7c141aebec6677f9dd9aa8d483e83ea46f9ac576465c4d11614cb95c12cf6794fb9 SHA512 ace809bc44796ae0d2e8ec8f2b871dc841c0ef696eb434fedc5f3e2317c8093b31c2531207e97a13db1d0040f0ddd36d02ec2b67b4a5d33db5c9c8c4c166be07
-DIST firefox-62.0.2-pt-PT.xpi 473526 BLAKE2B e75771752756a4f1eb3906fc014f66158443eb349098d0039f9e3afcb5eee0e7e3f0117644c27cb1dca40c63901c4f0d6ed1ec57034089610594834136476ddb SHA512 ad4999f508ac8cc33030566dfb98a0417c5061c14d7804c934677c482126d3381419e6737a969df826e6f8db5357dc046ad90295592953450ca79cd578faee29
-DIST firefox-62.0.2-rm.xpi 462470 BLAKE2B fb72c1096cd9f6f1ffae48f6d7fd8df393397bed0cad7785befa4ca9bcf9a9aa2e6f86275c26373b77a79c3a612fce1f51d69f65a6eb38732a7d21b62ffde75d SHA512 84817163733c6bdaeec1abd5bb4384bdabef25ba2c21247eb420a3832ef51d3f53e6a40cb5952e53cb7b3a92fd4432067c880d80c39c6cba40512b91b65684fc
-DIST firefox-62.0.2-ro.xpi 463401 BLAKE2B e5239f48edaa6dcbf96417ac9dea41802d8a2e4de246455d03797d1dace27311539fcad33a7a4ee3c1dad2365f0649dbf0461c07c559f3825de12675eed8721a SHA512 89525412f4d53c067773757b5ab740733a025265fcf68d725317e54351af83e61a9c05980cea62b8c90ceb2d8d597bf2e9c97e6dbd06ff730b46ffafdd9fcfa3
-DIST firefox-62.0.2-ru.xpi 539884 BLAKE2B 04ad8775aa310b44238b161db1783e778d82fb985ba226a21951a6473bf9c9a7481dee2f09c29daa0d44cd512e09287706fbce83a956af086005c2ca1403bf68 SHA512 54143cffcc09a519d7df5be882039e888567211817a864e1b733a347cef5763828c08355b16e08b69891e2a18ac113af6995940a514db0f0345bd36bf8b130fc
-DIST firefox-62.0.2-si.xpi 487601 BLAKE2B a4e0d82467f7abc9d1824d93705e0dbf45cbe3e49e1bae9ac172e29f78f1b6553a5773a5174ad0c3207bfde511e8a9877ff6720afb1416dc30796867d86c0934 SHA512 9a6a88afdfa70a48d0f19ab999d9bf8dcb8334bc342add5ae30f3b36bf791e1e9e5f7086003135f93e81ffc1492d119568b0317aee3092bd16f6ac939e697f4b
-DIST firefox-62.0.2-sk.xpi 488135 BLAKE2B 551ef2286d691586fc68366c2bb9efa8d25f7ed9812d4e82de3c68bd94ca42542cfccb5b024c551c29283eae93fb8ca2c75eb65c249b9bc41743eecf6b6c7ee3 SHA512 5dbec9a977ce0551458d190cdc1b94890c42f60e3986e8dfa12333125567c915fe8f49e42fd23226ae572dfda878576a1f1da70a490576f6f68cbc359caf6057
-DIST firefox-62.0.2-sl.xpi 468414 BLAKE2B 173e354e7881a039fe2721bca66bda2fef6eb7d1311e2065d17d6c7e215ebeefd23bf4b991f012367787236cd0d527adae91fcfabab35435e5d8e9177f74b758 SHA512 6332fee680d1845cba0b1c794c483e340f0bff09d8dcdf5302e5347b3f010c116e5b86099591a1def16a30941d16b01904558d57738c8f773fb2728bdc44525e
-DIST firefox-62.0.2-son.xpi 445941 BLAKE2B 52ce53c553c96ac4076222a33433a9c58249bd8ab0115885c8384901291773e53781e7efcf213a838f66d9ac44f1295315b04296ce3f89f519d018c56c55149b SHA512 19f600fce137f874f43276c3b7201b7f14fb4480cd8be09cfad55d5b4b7cca097c7812d04f65dbbf75d47eee383997d239ab5c2d3e21d0459c22a0a0d12e8a24
-DIST firefox-62.0.2-sq.xpi 475530 BLAKE2B 8c6f1bfbbbc6401c86a247ae9aff3ab7f5263350538f912625b1f12e67b2621dfcb06726b569c2003cdb93634a7573424cd7f3542d4af5f02e11f4ad451f8bde SHA512 a12a259000702f500d533c7eae48472322080fe1bcdea98c19c2fc863aebeeb5e4b949f213e487c413c89e3b01b568134aaa491ce9024a04f05ee0b34f7d3357
-DIST firefox-62.0.2-sr.xpi 498809 BLAKE2B 331a2d740b38f2331be261a28bd80e5cdd798f74574af6485bbe275d7d3158b308e0729506dd61ad49b8338b213e7fd82ae03582f23ad268731a1074f03af782 SHA512 442bed4d7f32cb4cdccf275eafb21acb3ef4142aefcbab61707c82f8408be568aed3269a34e885451ed51eeffd22165585e193c6d687f7bf942410b7d777558d
-DIST firefox-62.0.2-sv-SE.xpi 469508 BLAKE2B 4ada4b477599b65a9f20998c2cc7aa3f7870fbc1138b0bc71e556bd533f47f3a1c487b09fa2802c1b84b934283dd8d0c695444818284546893a175c08e734675 SHA512 ebb3690236307a7bb1a7c26d01e305f5082783c0f1b42753b1afab40f36941ff5dd0a5b600a4c02bc64b81a48fffe459b501f0b1f2a599ba99fbb071ea0a2860
-DIST firefox-62.0.2-ta.xpi 526479 BLAKE2B 69d29fc712ea06c625bea55dea27d61889886f852647097b2288ca080ea3d164a693dad4ae8103b8880fe161ce3bc78efa9934529cf073036b2f2e99c0a1d4c5 SHA512 7e52cb5ded50fb960967a3808bd6d7acb2eb70e74f3d906a4337df79dfec619d5979dfc0de2c900a102bcf7bddf2d8e9f4d519d63573c0575b86311eba8a9b97
-DIST firefox-62.0.2-te.xpi 536779 BLAKE2B e2951535347b82bf825139a695442f8f0d4c2842e284ee0aa8b2d252f52e5ad309a1196c5d630fef075842273400c1110f9c65699892911cb36e1501ecd85ea1 SHA512 06344045a928585bf1f72ec6a79df8643f124957b5884af4522322bcf2a3e5c7755f7598c316cbfbcd3be3846f162e8b2e66c6c71b2ca0d81ef06f9a1bc150ba
-DIST firefox-62.0.2-th.xpi 507130 BLAKE2B b87d8d75d82fca4b0565b4e6e727167196e388075cd2b73d7dcd6c1f9596c2037d43a79d5a08ec1cdb67739ed2dbcc3adba4a742f0c912a5dd32c4471f0a3d18 SHA512 b949b240a0a1e4225a1c63e1c24b27cd91f18f0e9577e88ad2ee15020c0c0a83b920cd2725117204d57d1a60b2f18f206682df9401aadebb57a9efddc9fc2c05
-DIST firefox-62.0.2-tr.xpi 477277 BLAKE2B 1399a97a5064cddd9c9845e37ba15868142d3fed14d186c3999e309070c665b4f41b165fce43b0606fd1ebf6642eff403f9ab5173da391dc721194fcc1026c3f SHA512 9e50fb892db573361046188ad05da867b35fc72b609219fd733190cf7601340f90185105c1618cf7a7c5c2044395c312245fd21f9dd39bd81d5fdf0408db611a
-DIST firefox-62.0.2-uk.xpi 532590 BLAKE2B 0ef05e76161516906333a6e3afa5737a0d4d2240e3e73e6a772093d0aaf9105c20f70f6d594dd96f3ee292ca59e18e0c0085d0e4c6e245fd518a82a48dba9e8f SHA512 5ece2d55c831ea127bc1748d677deceaa9619ff80b5b1dc29b51c14cd3e9543bcc19e6b61f6880f1f111b35584af4a389bd8c33a230616179aa590403229ae44
-DIST firefox-62.0.2-uz.xpi 458001 BLAKE2B 1f6d4097ea2c8ab5a1e5fca98279877df2c7841ec4ae3083495e9548ea2a5f9b8ade99d9f58c3bb4acf6a15666ab0eb17fd8095dada89ce930e665702195465a SHA512 d57b979ecf940e73c36cb7f462b0ee7515dfc3682ddbb5bd837a26779acb10e3ccf023f68cbd8c05f1f6e17e8d6286b35d5314bb2349ea6c91143e5d270489aa
-DIST firefox-62.0.2-vi.xpi 478327 BLAKE2B c3c40cc98e4ace6dc64cc696e3e7e2b5ec941f064a1fadcdb3522ac92915ffe64cf2480d6941d35554aa92ed2741e59dd90a5509f7b06e46d6ce377bbb135dd0 SHA512 4d25dfbb0b76b23f532636e649732dd4bfcbe110e5fa9e46e617e12096701c95c838491fb43eea4a3f18f70a4336f18bc8e4e71e9842d153ffe1e9d84fcd73dc
-DIST firefox-62.0.2-xh.xpi 461198 BLAKE2B 816fd0f17d914e055945731691b03ad34005dc777a935d9a05bd7ea02166835ecdc2cd4adf37698f3ed859fb0b9015d90396a86c2cb72ca24274d7e5b520b008 SHA512 3741bfb3ce0a8c451b60801827b80841961fe04cde587dcd91df04dd5bde13f786930571ea9cb7d732fa86fe47b631fa2fe213d4452c84f44ec60d9a83ca81f0
-DIST firefox-62.0.2-zh-CN.xpi 491485 BLAKE2B 9063efba817aada697f8edbd4f154df3ca8d17d101409d15d1bd2ef98abbeed42ecb25480d685dddefbe2cf894c45549ca7be0bd580c0bcb829abaf1b48fe63f SHA512 5e45f942b115eac8d338faa74c4962b203b0340036688237e388bba04f3a4e62bc46e216540d9611bf3eb8e3919379d40042acca4eda8aa7876025cd6b828706
-DIST firefox-62.0.2-zh-TW.xpi 494522 BLAKE2B a27c11631c4a1f4e5777b9e8f465399bc1881218a4e9a51c8927a989f9ea02ffafb293595627f50b43c5d26c5dab99935e763102fbebb27dfefe64cc368cc545 SHA512 af2666a28edf4e883b3effbcf684e95641dab8b6609bd8150362ec9d961bb043b6dc99ac686bd0ae0a0cd1d2b2a0da76319e27a6e71db47ccb16247603705e02
-DIST firefox-62.0.2.source.tar.xz 258831964 BLAKE2B ec1a174e19fc146997343daaa51e37bed32e160aa57bd1687cad0a2280f019e15d3938aa4d42bcab3d4d87c1f4d3be4d8abc9ed3b986221fce2f82fbd896bb06 SHA512 7b43fe6bb7072eec8b907f63933486d7ecfe479f1121470cfa66416ad02feb8f61af1b1327032209179780057f63f314065bb17a74b957cd5f82a13c4a055c24
-DIST firefox-62.0.source.tar.xz 258026884 BLAKE2B b9f1601272992000c1bc2310039b6712565f6ed2e58107f66685fb1de154c90ee78cfa35f51c45e7d62be095761a957fefff4ff65528ce65860b24e2345b8818 SHA512 88a4ed72a9aa934b0ee654549784885a9c543de4f57bbbcbde84a4fad1aef9bc520d92a58291a890e4fa2304e3722e9c8612ac50eef95039547d467e8beaee17
+DIST firefox-62.0.3-ach.xpi 446325 BLAKE2B b7722cf6f8a8de868fb9f283a7203d1c7d40690bb78b38f244c392714d7f232581d04c6e59f647135f8d315dca4ccd60c5340d1fa36671871eca6cb8e47445ea SHA512 eb79bec0b69b53cf1653d7498cc6a5701b1f898f89b90ae40a414201e460db5ed7141f0fb7032f5c212b1eafe2676a09b4954c5c4ce5857850c00ffc318cd019
+DIST firefox-62.0.3-af.xpi 432293 BLAKE2B 44780db3f4d9d6482dc48790620f128704d351bca138f0b1639c46e5840eb634d99406c5a64d924d6ef379297dfbd40eb8f06ab83cb18a317913d47b3d391f2f SHA512 8d16bf335c5ef120d72f1eb5a088860d0d25d3787f8e1099a40437658cb706d58aad64059bceea51aa958d64e1824227c43950ac6bca6e1df0cee4e60f809f2d
+DIST firefox-62.0.3-an.xpi 467499 BLAKE2B 7175b6470b157fa9a898d048c0b3c574a6ddd599c802adeb8c2d38bc473d58d521a9ccc7917824d3c56809d96da36e7b24cdba5229941e88f5dce475be9cbd07 SHA512 51d0cccdbc2f294fe9a4341c89f32ad3cd935afd84417f4f01f15090fc5834a3b386b9004ecb22db3a8abe83ea9c7b8b192f6106328b68b97df3dd4bae5d1385
+DIST firefox-62.0.3-ar.xpi 497996 BLAKE2B b164a06577240aaa09e8f37743606662178e5a506e3dd374800cb4b65f12710aaa83ef4d7d985f7a4a93c128c7263637bec6c825ef4baa6024f1a061f7192332 SHA512 c6c49171c78f311e000d8350885ccbbe9666666ceffc704840bbc598a70e7b39a597185194870545bc9abdc3f051ca47a64bfcfb14c129152c94cad873b40cc4
+DIST firefox-62.0.3-as.xpi 478315 BLAKE2B 49267e25a454feb4eaacd6785d385aa533525645029acf75ba8f4a3f82b1f71f272f1ba9a5687f1d2477b4eb4c754e4b857e5aa78026ec523028bd37fb2e3217 SHA512 4761ebbdbd908a29b3ce9509e1d5e1d3b10951bb78f4ad156d9e502580226e6d88ad5ccb70d4b689981afbe83ad95db047bd14c524897b9270636920e7558e2a
+DIST firefox-62.0.3-ast.xpi 455191 BLAKE2B a22f51f7573ceeaaea199f0ca760722e40066bc919a8c44b2e61312ba90c73514ff0fd587495a146ad60259e122eeef49c546e40b79f60e1cbcf07964e4e1559 SHA512 3d8c41c8f62926c09240fecda6c59a71ad58c2e6c25099b750fe3b9c7885a7eb4d2fc0cfaca6a1080b947b56df26e114299a99997e49730e369342cbc44726bd
+DIST firefox-62.0.3-az.xpi 477135 BLAKE2B 03293c53210257e89c5c905abcdbaee8331ed00b14862bdc5e7fdde8c230d8d7d335aed484defd0592bc0dde8e95589ec88ec5179a05b3598441cb6723c63eaa SHA512 40732afa8650e187efa769333dda574a1cc77dc8cd94c533e29029e8f919e0428dc23ff956bb8e39a2167489d54d05a888bc2e6642121c3d6c302b7e6539eda7
+DIST firefox-62.0.3-bg.xpi 524199 BLAKE2B 7cc8c0c88ef46001d36ceab58261b3758ebcf25800ca308a85086c78d5385737099bf436ea4d3d30e5973be4bcbf3207f57f94ac10234fe57f49a33b9c468b5a SHA512 ac6327f0956114596e79aaf145bba27813dab0a56689fd47e7fbb887942c1cc68f961a9094be83830b92ad4814ada2f91831ba409ac86c89f91700b0cbf3184d
+DIST firefox-62.0.3-bn-BD.xpi 538605 BLAKE2B 5b8e059dc4e610947bf1e9c143e87fb5c6f8efce0d59a7c59818fdb30a8cbe0b39599959f281dcb9123e05caf39854ff8c279c974df3f5f9d13c456192e32528 SHA512 3e0206b8ae2c0c9ef736646aa45b94d12d2f18f285cce826f4a3391fe8c8eee685a274cf67c335067880d1f4c95e41a124e1b8e8c5da582940e6ae86abd2388d
+DIST firefox-62.0.3-bn-IN.xpi 509953 BLAKE2B 2169e571fb1fbd17f88a9fe895ce564561a6a432874b0cbd2beb4feae4408928dc6c65bebee1dbfa7249e0780fcb2c2991dabf309177ca62e4d53a6c15a11ef4 SHA512 9c27baa07e824ae026cdf33ec702b47de29afd3cbbe6599706a8f13f1e2f1a73d6a42725bb511abac2164028f64e72d2b64fe11d18feb2790bdf9f77ce9024ec
+DIST firefox-62.0.3-br.xpi 464406 BLAKE2B 3e9f54745436eaa60ed872dcc0c0edeb40004ef1d3a3bede9c84b4e12bc479eeb04ec1c142d02f501f999a0bbbfd6f83436a46721e48f778a29f57853f6ab643 SHA512 f6b07034195faae1aa0d2413b7b4293fd948937d1439c5b9e76cbab00818aef898aae36d6f5023082232984fce7bfc0292e2a70f600e84d039246cecc2bf5e94
+DIST firefox-62.0.3-bs.xpi 466249 BLAKE2B abf2e1dca8cc0a4484ddd98a20e0325c622c627fe6f5519418c77d962562a6f9cbaec8d6cc4ce851b2ce27c6d9d59a490aae3c4f5728bafe4bed904233f4a571 SHA512 ebf626d49a3762da6fa1e3ea12073b2d3e02174a1cf2a4d1b5825a3ba05b9c2112adc8bd7997f058e46ba2d66655373c9ca7fd8b92b5f8700294a02a94538671
+DIST firefox-62.0.3-ca.xpi 470055 BLAKE2B 67af43041899cd1c8c127b5c75f6edba43f91a35ee2a9cd65142dab7dd5f8ac798090e04188854bec5d6ebcc7f3351a60e8d8d499b512f5bbabf372585c0ca88 SHA512 661ba8d03352fbae574c718076c3f5ad260a741c331e02bf2fb5e4add82c3ab8e61f3a441f40847272fd258537d6b36f7cd25bdd287bdb40d8d61ca37669feb5
+DIST firefox-62.0.3-cak.xpi 488840 BLAKE2B 9169fb32b2b432f86071376ef657fb09fc77e8fb18ed75f4682c63a51b30835085fe4c196f090b9d128982309e9101c8cb514739eec55da3bea970d924ceed91 SHA512 2b734ebc5ffa91d9a78ae4908d34d7c638ee323b8c4d8a5a2ed8f5370a3b47e04909331b9f8a3141b9248baee9fab1fec701d6548364ef1a4f794a248cd68ebf
+DIST firefox-62.0.3-cs.xpi 478354 BLAKE2B 22de5eb99ae94e741b6df4f085bc99024c7436998f4d959bada64d7fa90efc6077f8a16a8d4129ef5696b245bd9aa091e71aab2eb48f79ef17aacdf8e50858d4 SHA512 c82a959c0300ef01b7ef5001eb8c7adb65089200ed444cd7abdec62f00c9a12cbdbb209b29e828381c1c5768945d0d6d851ecb50d4b659d0715e62eec6a7508e
+DIST firefox-62.0.3-cy.xpi 468857 BLAKE2B 908235d7b594c7edf77eae004240ee26ef97199fe76bb3e8f37c38f0ca1aa97034c88bd615dbcc5e37b35a422cae83a568b04933f880b5314883b3520e7425d9 SHA512 3228f164fbebaf4272e2af778179a83751eb7ed5afcbefef739ad6a60da29e955117bc0456fd36c24b3036b3f95ce72bfe64ed131599e75925e6f9d78301007d
+DIST firefox-62.0.3-da.xpi 467290 BLAKE2B ad50b43550ba7714bee2fad72bfb0cfd4cae359c99dd92a94ed1715a57f500f24ee4513e9fac9599cf5865edbfaecfabe17b43ac82347d8da5ba57193979221e SHA512 8c9c48d3fb687bb5240f672968dec42f1b081592104dd921cf09102cccc06c4d662ed6032feace5d6d162544ad9021144f4efd1f52fe204a669fd199056a703a
+DIST firefox-62.0.3-de.xpi 475935 BLAKE2B 02d221c317406dd9f16c6b7a86d98589368c06ac1a411ead157cd3bbb22cca7e4157c1c6cb272b8f0f8f580453638fd0f457212a4c7284169a1d652a159bff1f SHA512 2f21533f5dc836a11d97db3856ae96e7725ea3d098e510a715eea8e5c572d7550d5be8afc733807641843d30ac4aa3442494d3d6205b837b7c8c7f7cacfc641a
+DIST firefox-62.0.3-dsb.xpi 488173 BLAKE2B 10c351cad7a73329657ebe36e1cc4c3fa50b4552887ff61a5560a9bea8ae1b668023d4538937c601ec6a68d14ede8fce75fe6a133091cf02a7251a27e4cbd637 SHA512 c39529c355521b5f28f11fd5f50acc48a4605408020cb5454d39e87fe98a1c8dfed45aa8d2dfd9b150b877f23a1296dd093e0c3fc3844a41193aeeaa22f5a050
+DIST firefox-62.0.3-el.xpi 546433 BLAKE2B a70227f90acf8826f72c6bd579ed497372d2cb391e2096ceece20aef830e5c5b58a704b40251baafc255e510ead78caf6451aba4ac8dfbc035acef2a05fa0949 SHA512 6e192e856cf370a49a16c2259d61bc22d9f2d681f56d49b72e68ec73ee72c0820eae95c82ded166c2b9d3ba73ed671b3d19089d26636e99c54184a6f97321279
+DIST firefox-62.0.3-en-GB.xpi 436177 BLAKE2B fb12520d027dfdf7681b4fb6b8ca9ca5314b52f31db8417c53d096fa27cf5f5cd8291e3e5cd72b4da31f05a17a2c80d157b0f01cbccec4b4fb26f4d73f761a92 SHA512 886333d113e94d63af08748ca0a599e8c2c05746de69297cfb30d020feed43bcbf5e4fa5327c940db5ecdddbc31738157c4b50b5ac57367f0096f106e99fa8e8
+DIST firefox-62.0.3-en-ZA.xpi 422871 BLAKE2B 0408a5edd61942b3613088b21871fb74c85490889d95623b25dd6bcc7e236b3f12f066677e0263a8ee02ed0f509c73ce047998d567c9f566661fdf2467903cba SHA512 40014af81a3bef8082e88102b84236514ecdc26bbf6a22a130beba5e5f12145492f557abacbdf072da695005ebc51de70bb8487cc777aa6c082b6ad1eb03639f
+DIST firefox-62.0.3-eo.xpi 466535 BLAKE2B fbaa93a513e1e464ca6a1f3c772fc17545a93e8458084bce869aae10a5befbcae5230ac515ce9dc6e5bd61fe253bc136e1491407fe2107d05e3c92fc38147ce5 SHA512 f7dbab432f6d48859115a46390681322f296d2a20daadd3d0a49def37194414b35d0b73f41485eb7636a43f27fee1a2b20e0d5b95ddcca582457b238ae2a63a4
+DIST firefox-62.0.3-es-AR.xpi 473522 BLAKE2B 783a8151664ebec02e9ee190ecb868f7e57a59ec5ea12c98f9cdea7ade8ab8ccbca2748222e5661dc272328363a2a150cc38fcf03f1d4ba0bf6bcd2051e5a86c SHA512 378477ff2b1d84653b8c0bb2483359b9ff7bd4fa7619aeaad18ab77286a82db647b4c41397557967599dc1b4a2f6560e49716b61aec16d7560e992197299926c
+DIST firefox-62.0.3-es-CL.xpi 473990 BLAKE2B 8d034ea71a81cf21f9441b8f00aa0056b62239441ff85f9dba0be23148b69b86333facdf01e7c92ae63e02388e86f2a591d03c4f6e83574305d446708d02fd72 SHA512 b64d123a9d7000320b98c563669d34a938de0ef9f9dfd2776348b1ed38b0f221e733d765473bc4fafd26f74e33db5adf73ed75985859d682595e48a1ac998908
+DIST firefox-62.0.3-es-ES.xpi 414987 BLAKE2B 45ef9e2a4baebc806b7380c33417ceadcedbd66311a1a1970a7a1e9d664880aaae89375cbb69ca466c7104b845ebddf8204a1a8c6f9aa5d702978f67a071a63c SHA512 9f8849f7977b245ae15e755315821b7487e988daf5bab3c4244df8643618fe5ebe10cfcc846d7b5783b55d4a2b283a15a9559cddb5aec7e49c7d83787207d08c
+DIST firefox-62.0.3-es-MX.xpi 477957 BLAKE2B 2edd11360258ffaff34f32c17847e7097a90d1e2a5fc0e888e029d641bd0ffe9f8539b56659287fd8a1b516459e80c829f953e95b124dfa28a556c4a6a1b12f7 SHA512 cbaf5b5dc4df636ce308cb1332a987eb44c1cc27673c5ad99c9bc66910bd896d503e92af867b6a3456956d3b70c997891283971190901dfcbb2bb7c48b4db43f
+DIST firefox-62.0.3-et.xpi 455377 BLAKE2B e5b98b9857319d673cac00c4195f76740b6cf1ca6b16fb7e7e22dede9ecc48aa4973d2b50bf9ff7742c7603861829c97db34fd9eb340507460693215757efb44 SHA512 6bdac58593cceb5e5f49a032482d7877857c67f2edd2c2da8fabdc80e7c2552a337cbc60bfe0439f062f901db8685e9f8b1c9e410d83dfbdae0fd9c0213b1a65
+DIST firefox-62.0.3-eu.xpi 465903 BLAKE2B abbccad102f65097b6a4e02dafadc6d75ec6ec83ea0b6cd8c3cef3b8cfedb9d0c3dd805bd37219dfbdc24eea1392d024a828db2992f67a7ca2c90bf87d373ddc SHA512 f54b3ab2508ef3638ee03c14575ca6f256c9c4310333577adb9a70198db4bd5b86feeac22c59e14cd2b750bbd6e7595b70317bbf2e597d3414a244c8988afab3
+DIST firefox-62.0.3-fa.xpi 514442 BLAKE2B d3b732e94b26f6816c86a31a2c680792f742ab5e99753b2fb049592e782d1e9c6273ed4de3c00825ae3afb6d593c51ae2b07b37d287125c445dc696cc0c4d9d6 SHA512 c1be98ab1590ea7000d0faef1f1ae8aafa2a7c925d8c621bc8085b433e8d957e8ee6689458683fa1ab6df38fd1329229cec41e474043a997e98273e2a00962e3
+DIST firefox-62.0.3-ff.xpi 459046 BLAKE2B 202a442fbc26ad5c54c39de75dfa14423141e61041056526bdbae4be4fcf3443fbf9b3e2dd4480e728f224454b1f0ac394cd086bed8324a5cc9f8b8c0cee835c SHA512 70bb37d4cf292bf3131870668aabb6ccca4ca96eb85cc72605b6b263304b2d8c041d1bd6b3977356c02c33c669413fe4373cfdde286a2aac3115ef016c15f181
+DIST firefox-62.0.3-fi.xpi 458677 BLAKE2B 7bf0690ff1683e06da4ff0c73a00c2789ca2ed491e7cff8d87b91243a502fd022117c378f9a2a6e2348315c27d4f64a4079077ca9108ce6331ae78c9cabaf117 SHA512 788d2d14f82c0134e15b341a56179a08ebf0dd3b1702a1d337f3faf31864bb2d9354329816beb430215503b7c2ee857aae19b3f4c9be38c763e18bae631a7a31
+DIST firefox-62.0.3-fr.xpi 482968 BLAKE2B 87dbef7e69b52c3c020588d3aa48ee4593d49fbb37660e70d9a230ad47a425789a5bfc4a3e8fe162814b14b5f23be13edfc9c0dc5f6d53b31717796ad38e988c SHA512 7db0be65c7eeb944b3ac1c2ddd4937b8728cf8a2342cacf5caca95182543cc398ab41454557d33a5b8743d190a7e852729c08e0d175bdeaf504993507bde0e0d
+DIST firefox-62.0.3-fy-NL.xpi 470422 BLAKE2B bd1b2754fedc8bfbb4ec08d20a941d6541514bef6ed50c817df6a820a1d66cfc4918507b3d4211037f4fc7b17d4bd2bc2f265fa0892f889f990a145f3fc92fcb SHA512 693064c9a81bd7c4d0aabed393a5c4978dd2ea1306441360d6c6f7e1f8312a94c475587dd2feb9924161b121648d1a1f2238f24492956dad74b6d19730300c07
+DIST firefox-62.0.3-ga-IE.xpi 472265 BLAKE2B 762f7f156fb1b505238db03ddc67eedb50bb1f7f5151f3a9274556578634181c5e5fb74b81dec8ef478ef9847d1b7290c6a149869e537fca10a19fbdb18b454e SHA512 4259d128b05d9412903401c8e240c309c656a24de0820befffcd60a77c94e22fd971a3bd31ac358e298819292d9f22714298800ca9663a814b70a43c88ffeaa0
+DIST firefox-62.0.3-gd.xpi 473970 BLAKE2B 9dea50da0b160eba4ac776e729ab41cbfc4f4cca0de822b652931412e9c8a6c61f61b142c1f78d6d63bea37ad2a37369049d8d451d51caf7fbb7a918674372be SHA512 329137fb59779263dc9fa7612af864a42686e3a494c81a000d3b0442c6a2b57a98a07a2a234a8ebfaf1bc4e797f0fb680634f8c937448bfcb516e5932bbc408d
+DIST firefox-62.0.3-gl.xpi 451816 BLAKE2B 85ddc2a190a6c91bee4a5f002050da7b7ff1b50e1528061c48a6fd32941735b6c643830d9209b094f97ba9ab5979f69b75560e997eefabd2bf0835103389f89e SHA512 6a898a8f80deef54d48fb76a13d90ecd687e3ecd53acba3d18e492559ec63d624d06633b5876a7126a69d42eb18756bc282ce86a3ebbe27c892a680a3bb4a966
+DIST firefox-62.0.3-gn.xpi 483149 BLAKE2B 535ace3a8bb655dff53e30d3116ef3c913964e5570732410fc0f60aeccee3d91c692738bf07cbe906f379f54e9137951bc3a7edfa641dcb6360a8f4ff436e719 SHA512 a1c94e52f881a36aa43841a2a197ad522b110f66d7055d88a84e3755afd941eb4e8e4d351120d68f03ebe0099c79c01397cb25695c8cc72c3da9cbe5119e14f3
+DIST firefox-62.0.3-gu-IN.xpi 539984 BLAKE2B 2672357f8ddc919f3448c87ff54f7c72f9f1a864ef271004847628d4fc4657ee703c1d6f0d97f934d0f0b84b8fd520706a2af20d305301ff634dbe799ca8dad1 SHA512 329f5308c615899dcd5c92b950b6b0162e45997ee1f5914ca5d920f3ae5d312a71e9b377f8cce38c9eae30c47b3c0cd5c912b1b3856d6f599efd7de78cbad881
+DIST firefox-62.0.3-he.xpi 484809 BLAKE2B 269748c0caa7645127745feac2c3a6a822d7f0084a794f0822b1de09131517ccc401f1a4b693a2aba0778249466d2154c4e64d4792cf276bf6bfa12dded618a3 SHA512 74f7c9ea2b1e3677b2db72aa095a78c17243bb9890f0a01b2be349513295d33dabf421373e44cfb6ab34c42080476a06a53213e01dda71e8330dac40afbbe2df
+DIST firefox-62.0.3-hi-IN.xpi 537121 BLAKE2B 3278a50efd70819821e15eb2a523574f056bb74f745027bb6aea216177104d9dbff606c1b2b1cc6f5c3aa59d590b2855c6417ba4621189ec511ee103a59b5344 SHA512 71c9c0bf91d7ac4b9fa0ef194ec86e6fc130cf2cda42681bdc265c6ff22cd8813dad7576ab5000264b10346d6a6a33675dd92902e4ac15c9daf82899d8ba627c
+DIST firefox-62.0.3-hr.xpi 459608 BLAKE2B 4b57920171717ba7ef30ff439b9cc5b8fa92791b5a88dd0f09552106dda7a39a143e2245d96172c5ff49422ab59f9f455fe1fe0da715d69d6fca1d05d04e6b49 SHA512 9e04eb814287c12cb490b3766498568d8bffce135a2aabed161dc9636c006f4bc95f35c95d769c044e7bbe059c3a92c5b6b41cfea7073aaa8158b847ec57baaa
+DIST firefox-62.0.3-hsb.xpi 488120 BLAKE2B f0849da6180587679facde1e170397e2717034a8c008421b4c988f61e0bef2e6e989c35bcb92612396d0982d694a9f720e91e8b14d87d9794de7d6d4c7e5de17 SHA512 0a944b415ea14ccb98ef5376911fe36f64a7c72f4a76a53b00e8e3f1e7c6024db3799a0f97c5aa28bdcd43ec8bae5942cf5283fa96438a448b70447b7d72be1f
+DIST firefox-62.0.3-hu.xpi 487428 BLAKE2B f5d53e55e355d1f8e4028cd7db565a250470eaafe36242defb794d1bb8cca03c150cedb8401bbb33c0dd36c0c99361a799b242cd9c0300653f1961cf2edde3e5 SHA512 8dad4828e2f270d1f8381226c974c632ec58f603028a350558351234e97fffb690ca9b50a68e0f82c2bd92c0cd32b107233df3f00bfea5f92526f8298520a631
+DIST firefox-62.0.3-hy-AM.xpi 518019 BLAKE2B 03dc18856fa0df24655cabde57ce0fc582b14fb2b77d3c5a02bb91fa0ab6f27b12292f88e25a57aea43ca72de28fca51540c433b6cda02e3774b5896bc6caebd SHA512 f613672f5b2d5da34d6b32832adb10d4c8841cb54570972d84e3d02fb16d99af182d75105dcf181bdf3b6eb1b072bd4c90f1bf5e1f19e6f8031e2efa0ebed293
+DIST firefox-62.0.3-id.xpi 458276 BLAKE2B 3ff19c62df09b34f3956f07c590fcb0d42aca156197ea227db11fe8a3b7d46e16ab96e79a3d7dce1aac28039b1b4205d5869c26e09a391f6c911ef51356a25d6 SHA512 d0f46596583a2f92ad3921e11cac0c6d970f38c98e4015ad17973a674d9bc5d1617cf3fe4e91e65239de4ad6035702dca48157e843a3150bd141f7471e46f7c8
+DIST firefox-62.0.3-is.xpi 459617 BLAKE2B a8e3bdbb7db3499b809ca1f43f2b153e16e07fd22519c926338f4d8ba9ff0284eca90f32a71bb208c1313e85c3270fe4a31186343be396bd54749c1584b0e8e9 SHA512 1c946d4fe58958a7589fc55781c5b11cba5ed7133df723af688efca52aa53226a64d812bd6685b06117e8c15cfa1465a8ae569288323253259e079e25251983c
+DIST firefox-62.0.3-it.xpi 347139 BLAKE2B 192f9f280e3bb33072ed4b7a2153b7cfe9b6c01c5e9e0ecb5ad7698fab8ed6380dd8b8cc8a76ea64e15f1e6bdb01e62ebcd78fba7a892a3b8541799bc89fd06a SHA512 02c2f89e9e5cd595b825a2239517333c47063e90e19dfc4505bacd8fc5d09f79ff8511129568895360b917192db01a78cdc1a970cb74947215dd3df7b0a7882d
+DIST firefox-62.0.3-ja.xpi 504031 BLAKE2B 9d80d68643268438cf93c7b1d0a8ce0c68f19d5a57053cf39520bf9600ac8deb971a20e89edfcf1fd5da564b26ffc284694d0a2c80df10aa143c47ad162f0710 SHA512 58be82999b4c42b0ab786d67b5f4cc4e63be8c84f4df227e4b94026b1e5c62a1bb9c2046c29a895caf3c086222e70b2e11d664babd1f259983e34d99436d3cf9
+DIST firefox-62.0.3-ka.xpi 503705 BLAKE2B af01b8875fd9438fd354dbabd13c6575456ed33a98189cf6db1c48af4d985bcc4c5f99193028fa737df4172d2dd10ed7bc96095046870a67bcddb5427c4733ed SHA512 0fe2988e2133093599be21ee9191b636c13e44ed1ed2fa859779e309b39614742ddb5ea0910890f2e237fe4e4c6b515fe83c809a20212e80248e7e17ca52af77
+DIST firefox-62.0.3-kab.xpi 478240 BLAKE2B 91f49b947cdbf0f0569ab5181e96f9e90bcb7a8231d3913f282f7a2736771d3af844eb30bcb20898f206383ac4e5e6f2914b233432aa8eef0569f1c5b0392b2e SHA512 337cd6267f282de4d18b23342018ff9f863a5c6b8c68a3ab63a551a859d3e780117fbe74edae50a92a75f2227bbba2fb3a2d0edb55dedda3d7f32e0199f2805d
+DIST firefox-62.0.3-kk.xpi 530654 BLAKE2B 147fc758e07a4f3b2b653e1fc12853273c954971e4e31bca639b109e182e860be4c754cd3c236dc6fbe40598e5dcd3bad9a3d1fd1c48c5259a31540294bcaf87 SHA512 54cf420717258954e219ce073fba3938ef959c7f4132bc621b0ef716d98e65c54345bdebce3f2584a5e6174fff44caa6c34550e8c8e4763e174626076470e15f
+DIST firefox-62.0.3-km.xpi 521445 BLAKE2B 3d62b7a3d3eba96f466c7ab6aa8aeb4de07201e046078f4d3dfcf216ee2c63c44f1c025db1941fb099218432964e5f4f2f078e8b7f325b494369c0bce28021ff SHA512 550670d9523b2a9d338586105081e5c150c2a0d2a9bd2c20ad670343760d28781c0fbb7bd56f3f88a9f9cf32f9e44279e7ad9c594a158769c631067db9d5ada1
+DIST firefox-62.0.3-kn.xpi 528103 BLAKE2B 60bfd6dd8a4cadd556a971dff5dc38b86e63e0ded9f2e884dad23f970daea299d2a07bc998d24dbb8ea8568d429d3ba681ba153d0155bfeb814559590dbf2cec SHA512 6398ebe1f32d927ad2c36487962f730efe8d1035c96b415218471975f5eadf379ccae5ea2bee8f694fd7b9164011b63ac12fd6647bdbb174415c27027ca4ebaa
+DIST firefox-62.0.3-ko.xpi 498342 BLAKE2B a1957b344169faab6d59366ff3eea2602d150ed71a1df918a64ee6f38541863b261bafaac491971dbf7435c11f9605d416b62abb28ede2b70141005ea1413e9a SHA512 65a3e637801588a77efd662cda3c0bbdb8de487e810f56d9323e0170623dc7da683cf517056784e0e839dc7908b2877e7ce8447d13842c7dde85620400703338
+DIST firefox-62.0.3-lij.xpi 463444 BLAKE2B 81a3245edb34bec066626629675d9d4d6e5c507fd7a09d6de80f41d5f4d43bc924f6b65e6d67f276dfb923a55676c0d63bae21ec9f603c48e19a153c921906ae SHA512 7bc2b72177a4be528f477d5fe9d36411baa1222bd92ef002465b957fbe3249a7a629eb39f76228964b071e4a9c21a15c722f1bdc42240c76a86966aabaa59225
+DIST firefox-62.0.3-lt.xpi 487650 BLAKE2B 20f5db09e5a7d01be430a69b63d234ee6d1dca8f6652238d3f65c17e2554cb4c978f3a64b67ca60b9e436379d262699c468b69c3d0294e7d2e49713a6efdb959 SHA512 dab852b7209f64a55c734fefa0238b7daa08b155efb5ff95a88a347164a06f58d55f1bd049a516309a724627ffd4329b021d473d29350e323713e62138e68101
+DIST firefox-62.0.3-lv.xpi 475710 BLAKE2B 434c2ba0267f7ccb1e6bd8d2f2efcc0e94026400254bdea320954408c4bf2bd9dcdff1e93ad43f32335a04777b1c9f2e513fda678b713e10197f8ea142b82172 SHA512 a887f82cac85051e599e5f728c7de908cc003dd9f0f3fb9ad838496cdfbaefb4151b5dec5f727aaa517793c6613b6ab7d3e84c8620f5654606dd7e7887ceb7f2
+DIST firefox-62.0.3-mai.xpi 494726 BLAKE2B a85a1b071a206d2918327e8f293cfd5b57a9872563fd2eba9a7e2235dab2655a8b5d63061c10079deaf75c5e0d0bfec4d246459d6e620cd48b6c1024e54437c4 SHA512 24aff560e303268148680c046413e067e64118826fedc426eec5742afded0f287adee35d156f617cb5ce22706f444d487af37eb7add691b34fccd467ac34dae6
+DIST firefox-62.0.3-mk.xpi 457532 BLAKE2B 622fd27e39ccb70a8bca5ea0d0444ad935ae342424cbdcaa7bad5db32f4bc9d27839a2778127a6d1f60eaf6af76f2452cd253c2a3c571ecd593d7ce2e1467fec SHA512 32d03bebe02c7f85cbea47970d6ec1ed72792ccafb9ead5f7fe74fca4ed722320ecc30c95b73ddb4338f1b9eae391939ba6ca60fb507b42304f092e045f2641e
+DIST firefox-62.0.3-ml.xpi 538825 BLAKE2B 57cb6512a6e36c08695c2f284d83cc9ddbed49f217dffd2b05c1f85661d36686fd4853a3dea95cc31ede5857026638a4bff3d735b70a5546b150fbb81971c68f SHA512 dc43cbaaf9f40b8b1b526a0301341f7e84eb78eba06b3450dfacd4d914ea31af47de4aae16dfe7dcb0e2f5653b80cfca0e31707fa77c8b8c6da456481340417f
+DIST firefox-62.0.3-mr.xpi 530350 BLAKE2B db928dfc0dd2a00b6093f674ab6fa4069f29837edb292167374f9276128c3e0efc68176d9500de622317376add496f95fdddf9cf4ed8dc8eb91eb7aabf2c0d14 SHA512 7f6bae467a939ce3bcf2a7d0b6339a03dc34815dca87f13359f54e615142414125da896f348bd7e9cc20cbb21b714eb38393ffc7614afc624801c77025f91133
+DIST firefox-62.0.3-ms.xpi 459916 BLAKE2B d285c47cd1c56c74009570e2be8844c4295093554bf202b8fbfc11eb6c72d3132d8119a1368f4266e1e2b3d0937cd9c8af21fa4ad0b3fdeeca7b495367ac9055 SHA512 58f7a3560616b6c69a6d6826ab4ca9c4fcb15bf9333887a8858f47135bc2a0881fc375a2c8c821714867dfbf9be02e64be848428463c1a8d6e90ded7fe16ef6d
+DIST firefox-62.0.3-nb-NO.xpi 458931 BLAKE2B b9bbfa8952788ebdfb1d2470ed95754c3eb14715e0dd73318099acc66f3a7e720bcde6a651c01e4b9aae9edbddd2e7b9af6e193eb10f169d6517af23836ef3e9 SHA512 b282a8177051cf803c9924ba0501b06f97d3d82fe98a3074c7b0fd72dfb1d0f548f85abaaa75d3c0613d1393c388279c0848c2d62445270d42a71f401d9400ef
+DIST firefox-62.0.3-nl.xpi 459511 BLAKE2B abf24bc016d93a6e41019f8fba737736c497047abc36a1b77f7a005751663e0da86721f09f7addd629022793d23c5e3da8058e63daa974aba16032f037296ca9 SHA512 b30723296f2c3d5aeef86702fe3231ea6b712e03bae498d2f34e730ca210ea5c0177db5d745db687ac9452ae7c0e980119a4d9f0577613944953aee64101a656
+DIST firefox-62.0.3-nn-NO.xpi 457054 BLAKE2B 55c46965787bd4811ae019144379db44c63bf3e610645c9b79881b7985ac2d98bcce5d645763154bbec17a4301b4991c83e26819c27b29c932c0696393760878 SHA512 80a5d23058ee70f1950405b58f106cc389a2a22b19079cb7ec9ce0a9875b95888d745048d44989ce59bfbeda78b7f66052269d36597b37df29148f73daa2a046
+DIST firefox-62.0.3-or.xpi 485373 BLAKE2B b7646941c6ff48aadec2080b396f9683942aff763cdd211662c64ef60637cc5d21e497897e1220224aadc51715f5cb685d6e2a1916de2d6eba466aa37ae1ed93 SHA512 1a553762f5d24b0aa258ea65644c1bef6041ed32e8ed8ed2a51c03a894c7505ed27994aa91b8114daa3228371e7ebabc713c454ece497ed183de5b36e149317c
+DIST firefox-62.0.3-pa-IN.xpi 496915 BLAKE2B 16a3fe36573ccae0e433d0617c193678b11fc9f2ffdf424d04f616d86ee94343b6a12e8a834f8ccd003ddb47d406d80312108664ebb62c2825307583a9db1c16 SHA512 b963d6a0d961557fbe3d35c14a321240a4d57474302672a670f71847ef45440b7373eff4f6820e111329d39383425f97b329aebcc7f729a56eed4ce6de22c4f6
+DIST firefox-62.0.3-pl.xpi 370890 BLAKE2B f7a91525896804d3e67a257a399d9e51b403220ac017ab36f55bd695f82506de2d781f70ba2cf55136e8d4563740a32da3b7648a9fbef668f604b311b8831055 SHA512 ab9a5a034f47af378b68b9511bea7aa8233d21f2e37dc087c30944f52c81eec29f114bf5a54238ab686b805f7a85bc5f76449bd2b582a1b4097ff886def378a9
+DIST firefox-62.0.3-pt-BR.xpi 460872 BLAKE2B 9984103ca60aa26191282ecee0281c41b2d345e40be6eb20a493d0aa75df8a720e1a2e80bfad0bc550780cc5c2512d1a0a90fb0a7e60e96c8754ed317a5f1fbd SHA512 7aa346872cb29ff0be1f05c8653079e712ca6757532bbfdddc10714e8c519e3c7a1eee10b00579d70f8472d48d228e1abe0d4172cee76490177f80684c9843e4
+DIST firefox-62.0.3-pt-PT.xpi 473528 BLAKE2B ee93c1367bbcb55c2c8ef388282043156163bf5dd90e6362e142af03d6bde93334859d82659e30ab2381791d1753ae7674062cfbe01712f4d396525a78a39a8d SHA512 cf1f1036f05763269ff759c5967d53ff93a4b2da8d4f6980c78406e519b6957be3b94c71a70e9d0323019d4183accc29b81e47ab08221b8a75ae84297aee9778
+DIST firefox-62.0.3-rm.xpi 462474 BLAKE2B b093695ade461a541f9d4f60a9f09f6904691ab84767cf314853712fb0006f84ff53f42a49f8e0d04babbba018d77e89b0d6f11112fe01b035583d92136f6d5b SHA512 dd400340cd22a38d20d9fe70d2f8b1de98fea3f3e91116f50b801b8fabbb8c05f30a9771ab621da92c77b6dff54379b0b684d9390d6de92bbfab44de6ab67d87
+DIST firefox-62.0.3-ro.xpi 463410 BLAKE2B a3bce065ac2d0369c3d264f933af89b8e97ca73355cee0fff7957efdaa2fd753b1271b316ad746c1c27005fc5096b04fa408e9aaa96857a6579c205c7fd7efbf SHA512 6faae43f4c595a38162267769a6e95b72def73c76176bbf9deb412f513a285830fb9a3fd68b675e043986595934e81068ab2ab5ab135b544a90a528abc73307d
+DIST firefox-62.0.3-ru.xpi 539883 BLAKE2B 2b373c5cd08e34b435d476fdf24a5a62512433e8fa8081f543171b2c29fb09f683171fd2cb7b9a738b2ae88d18bc7933ea868bf4d38568dca0bcc7a8de690d29 SHA512 61070ab84255daf4fb15060fb8b449b2f72050b30a359865b73810a1fda04da0cbada58e9542f28487f4d5a61313895b22498f610ba9f208369ee87ea9933d56
+DIST firefox-62.0.3-si.xpi 487601 BLAKE2B 1c342c1744d1fdca0eda79f469cacd9f95c0261d5d1c918c530a97821f722035cb01297863bf320064fb6f2948149fe5c36a372583ef11f38b9686f1d5622b61 SHA512 0c8f9c2860bd85c4fd0648049d75dc789f2a3b813876383309c84789e5f5c457187923cea3143b9bdb5bb2e05e7aadd94e804063249d8b28d8d1d7d275a00ec0
+DIST firefox-62.0.3-sk.xpi 488135 BLAKE2B ebc75309a6c7f288a6b0ed90096cc086b94465110ba12f1a58e2474cd8e89f7a36b7fc8fac166970d27f91d04007f0b3d7af10c3c2653314da54462e142e29bd SHA512 7d7114ddc7ee74f97019be69844f978f5a54480aa7a14880ec9017cc0ba18f11b8a42f02f057b53fb8171aeef05116dada458650bdf286fc07ed1bfb358d1527
+DIST firefox-62.0.3-sl.xpi 468413 BLAKE2B 021dee74eaa217a2c8e5dd7a21b4b2b17a684bb9dfe175e9eb932ca717cd0d6fbac2fa63269ab8e45fb660a934b3502d33d0e120e4a41509013fee3ee8cc71d6 SHA512 884a543d205ff86abc6ad200a82d9585c5e174ea80e7c1f322567061f42c38002ca5b28f70e1fde398c0ed2df47b7fcf9bc70ca8c482a4cc2761efc312176fcb
+DIST firefox-62.0.3-son.xpi 445942 BLAKE2B de503bfbbe8d9b9e158c8c32d8bb497431142e44270f8b7afb3a3e82f48e80aecc8fdb35a45d71da18fd142df62a9a2d508732065afe95a47059cb1bec9f5d52 SHA512 5da14a162b64528560c55a2d046491cca79d9de928a16aa95bc3a805f7202e4714001a32452655f414badd392268dc17dd6ed4af8b843dd2d924e42c6742c687
+DIST firefox-62.0.3-sq.xpi 475527 BLAKE2B ff434796651224a3bca8bc8696b1b44d1cb85f8ccdd3b18ce37a570c02d99235d9b09bf5330e2ced15593b8e28fef462bffd953f44fdf31c4b2d37be7cc984ef SHA512 25959f4d2ab19bba10070f411eacbe0aad8d6da2e096451e8db3a92b100b37ac082b59b19b5796d81477ed21a021ba61675ffd2e529cefa029f9280b6a512293
+DIST firefox-62.0.3-sr.xpi 498808 BLAKE2B 2f5e8f9c975643085fe5e256baa28721c709f709515bab167f4914c5b8d7c9921228f51ae1594ff09d23e3604a831f3e3534b5a011ff33db5cd9f88c79000119 SHA512 89b3cdc133a26a63b476df2a1c06b0fe1bac8eac8f5a6e4921d626d7905053121c13189196790cd31a3e175126eaac868ceb49c317f1746888fc28e15fb5b4d5
+DIST firefox-62.0.3-sv-SE.xpi 469502 BLAKE2B fd316fcbdd579cfac3735396bb2247350d5eb72282b1c03ac2d2ded744b14dbca5b4f6f19d0fe75747e1efc8f8bf5419c1c8a9ed4935aa0d2b6275a1e8b9f13c SHA512 d0f08048ccffdbed2987908b9e22afb36bf42bee957ecfd23245316f6ce2dffdc20b05dce982999cf31014ede618d83bda7e04603d23db00d8cf92b6cb70cecd
+DIST firefox-62.0.3-ta.xpi 526475 BLAKE2B 8c5c8d1862d6123bb804101ee9b1b8763600caff7c9ccafa7151ce8d037f8c7e2f0a76a34344574fb56181a79fcfe15537df5b35d4244c9a62bd66c589eefb5d SHA512 56a655b014be8c7c1df9054fe1ef065a8250248b1178022f3bc76d2d72f68a397ada668622e681d89ee73db6e25d3bc131d0812d90e08da306dd968fc6b8b5b1
+DIST firefox-62.0.3-te.xpi 536779 BLAKE2B 59d12c2cddbf76f7f154cb86acc7db05b35c198711d6bb4058c0da1e7376a650226f8c940bdd176a2c14ad7fb553ccac8d1ae2a58a9bb9755441c9229bddc9a9 SHA512 21c380a6c2c75ec2280ff8f759fd6b7f37a70aecc21bb64e357a1704a88eae6dba44c22209d48f76dbb75d5f243aab4e420af0518c49a462339d5093bfb1d557
+DIST firefox-62.0.3-th.xpi 507128 BLAKE2B bc671a33153c23688562ce77c10e0f1be25ac4b632165d4ff4b919bbc208e74f4bcab3992c65913ac96fd91874dfdfb5483725a66836d5d65adad35217ef99af SHA512 8815ec800faecad51296220179cbcbc6906c781b2b986cbb7dfebc8624211bb1146de1c44090218f2df1ae0eda5a5039ad08432d913081067a0bcc12851d50db
+DIST firefox-62.0.3-tr.xpi 477275 BLAKE2B e25948064e0f8a4f1f8476fdacc96c3467631743c068c3b80ad30ed5c9503e64069ef073944a0285e59e56cab63759aebda3751cd115dd5c120626e26e52bf18 SHA512 371be3fa55a14f46960a2e4d0fb349908c2c9bb9347868e1475ae57d233b4cc0d033e4366993fa3c49306765fc6c86b45e9015f7f7b74751ee99006b1f922052
+DIST firefox-62.0.3-uk.xpi 532597 BLAKE2B 91c44cdb09bd1f61356de74c6f5525b032009f55f5d6faf3a62226d824c0268b7f348827801198a0d325640ac42f852980ced2d08d6c835ddc6f2f180b242f3a SHA512 4f7460f81a6dd5428b4af3325cc4139b13af7ceaf485998ff156d30a962ed90fc093235b245aaca6e6371ae867aaa4175bdfd5de66edd6778027865fea9ccf07
+DIST firefox-62.0.3-uz.xpi 457999 BLAKE2B d715d38da8741a8850a2c186bad4bf741e8eae8e023d14c8a209e71480a90a55803530417fc0179d2c135ad5fe22daecd389a97889cc2d1ecaed211f6eea08a1 SHA512 e465ea3ef0c38b644cef099bea7fdb5e410c877a9eec8d153c750bebee5aad3e41bf1d7a1cd12f08d6c3587f575bf5bf554babecc35b5fd7a186280ec65b5a0e
+DIST firefox-62.0.3-vi.xpi 478333 BLAKE2B 5c492017759cba46a69b209a9b95f130a4749f2f25f347fd803763200552ff53f6badbeba082444bd37a4c3d53dcf3404a71811390cc096a145d62376aaa89b6 SHA512 d560446571fa3767af03f4e857c26b7caa59307961e44baccc82647de9395187321b8ddb47f854dc054475aa90d874fb70b9cba3c3fbb925bdb5ad61f67a982c
+DIST firefox-62.0.3-xh.xpi 461205 BLAKE2B 38682f7f0fe4bb99b54c05b0e042e66bb4932d6c289483a322b4d2bf25364bc7b676855ad4a0c5d68828b26907302a0bd7f4abeb09c54ab03c574f3e73758e1c SHA512 1dd1b16e9dcb468306a34b3d8b60bd1b1ab0c942d82c185a9caa1d33da3f32fe479fe548970de0799556b89db370a9522cd76558f4d0e2b15573eef9a88da435
+DIST firefox-62.0.3-zh-CN.xpi 491488 BLAKE2B 0540afcf3de006d39b8065335a2470245da51b18402dc51a1d84f047f57d7c0ba12b4c8a0c55cdab33fa1b82d158844e4c9f0e7073f309a486842c29b8dd3574 SHA512 4b1fb095b0f120b40cb72922df2d96e95eace516c4f18d311cabdcf1654110d7d8be588b4949f0918117d5fb72a3b09eb263f09ddca676822745d19daedb25ec
+DIST firefox-62.0.3-zh-TW.xpi 494524 BLAKE2B 491437706ecf92a563e79735ea7ddd91d60b177cd34f754ed40f54f2a130c307f0ae4f62665fffd56efb00da4ead24ebfdcf926d079e6fbb863e89d26ba3dc3e SHA512 e3beb785228264299b777724b19d98ee5ff40916a6f7fccf96b95e7040ac491afb9ddb48ef484053908b58edc8874f43c055bbbeb6937d7b10b70fb8c40200c3
+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.0.ebuild 12262 BLAKE2B 875ffc4d579ded75c524c5f4d4d1337c24222507f684bf68abb64923cd6dfa6f5dbe52eef11db976d449bb8d703c798bd16c4c6b6af782f547d2335a204e9b2d SHA512 acdc6b07c9815b21ccb63f729c9e14d3426e6a38ceb49ff4f88aec43b9bff8fc0afbc3ca4fa2ce6f25e9d3764eaeb1873a358e1493885d9605920ca8740e1069
-EBUILD firefox-60.2.1-r1.ebuild 12941 BLAKE2B 2c1f42c065db8510d479d2930e488f2830d0b1a1ecbd08235a7ce5cafdb45ad34f9e132ab8ad7ed3d5e68e14f20df3a0d7af9b8fd77fccc49c0e4ceda5244390 SHA512 aaf46bac842e2124306df6dcc49ce354be8919bd2baaf71f093d8ca182ea40bfeef75e0a6600290b8560a2fcb4d13e3826c23c9c843d82eb8d745c2226b4b7ed
-EBUILD firefox-62.0-r1.ebuild 17739 BLAKE2B b4bc0ad305e2b5cec6173e9d57d9fa8d047f94841b62edca1156ed39c96e9683263df9a011d0546eb5a857c69347cc8d3d114d2132ebb06d0e5443fd8ced4d54 SHA512 a20d5faf68e88489d0cf6432bc1e780d67de379161f2964aad4e5e54443ffb8735ae908dde42e9917c3915dcf4341eee1fc8336112b61332300c7d70edd405cc
-EBUILD firefox-62.0.2.ebuild 19587 BLAKE2B 7923033985d2e6988e84b0c2a44d0d218d537037088fd1dc56d980dd101684feade9239a27dcf45b1d4b9696becdaf9765a2188cb7d6bbcdca9417755a69889a SHA512 e85a7ea848e6c495c6a428a8b787da96a4c53cc5b2c7184f482224eda09bca2383f07232c470f5b1d8d7d7310bb4043acd3ac2cadeaf773046a30069903f113a
+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
diff --git a/www-client/firefox/files/firefox-60.0-update-cc-to-honor-CC.patch b/www-client/firefox/files/firefox-60.0-update-cc-to-honor-CC.patch
new file mode 100644
index 000000000000..9bca3f57a0ab
--- /dev/null
+++ b/www-client/firefox/files/firefox-60.0-update-cc-to-honor-CC.patch
@@ -0,0 +1,745 @@
+https://bugzilla.mozilla.org/show_bug.cgi?id=1496270
+https://bugzilla.mozilla.org/show_bug.cgi?id=1445528
+
+--- a/third_party/rust/cc/.cargo-checksum.json
++++ b/third_party/rust/cc/.cargo-checksum.json
+@@ -1 +1 @@
+-{"files":{".travis.yml":"1a4a3f7f90349924378e93acbb524b9127e37c02cfbc6dc59fd904bbdc1c8d0b","Cargo.toml":"623dd06a83bcbf2f292ab51af93e9b79b689e3be06a62968b79f4e36f1bb769f","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"186c5c8a62520cb7a3d90d77161c954b52ae8456fca0e0669bc3a5b889592a43","appveyor.yml":"ab45bfdcf2596f357225a54e730c34d518a8f3ad56c2ed33af682cfd45bddc02","src/bin/gcc-shim.rs":"d6be9137cb48b86891e7b263adbf492e1193ffe682db9ba4a88eb1079b874b58","src/com.rs":"0cb06f5db0fb70d27db0e5917ca337de6e7032119e6aabfea1bad9c719f5f34b","src/lib.rs":"996b650e19d5ccd6e64e741789427017c913644e980862a7286ec4ed53c14a17","src/registry.rs":"3876ef9573e3bbc050aef41a684b9a510cc1a91b15ae874fe032cf4377b4d116","src/setup_config.rs":"1a3eeb11c6847c31f2a4685b62ab35c76f0b6d5a17f7ed99e9df164283a771f7","src/winapi.rs":"cb5e6cab3eb570b0f97c660ca448ccfb5024262c0c7b245c181daad91a79f211","src/windows_registry.rs":"6de548aa94215e449f0e58e9a3b1702939d7c2f7b63a9040901c948bf138201d","tests/cc_env.rs":"7402315eea7ffa23b29b393c1de8e236294ede9de562ff0a562704a157135341","tests/support/mod.rs":"092551f9f6e3a999fa0aa02f93314aac0bda2b09268f948c423df56a43575e0b","tests/test.rs":"b1164258714e13173f3861126e97bedf1e29aa24618993c4eb0edd57c431dcc7"},"package":"deaf9ec656256bb25b404c51ef50097207b9cbb29c933d31f92cae5a8a0ffee0"}
+\ No newline at end of file
++{"files":{".travis.yml":"1a4a3f7f90349924378e93acbb524b9127e37c02cfbc6dc59fd904bbdc1c8d0b","Cargo.toml":"623dd06a83bcbf2f292ab51af93e9b79b689e3be06a62968b79f4e36f1bb769f","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"186c5c8a62520cb7a3d90d77161c954b52ae8456fca0e0669bc3a5b889592a43","appveyor.yml":"ab45bfdcf2596f357225a54e730c34d518a8f3ad56c2ed33af682cfd45bddc02","src/bin/gcc-shim.rs":"d6be9137cb48b86891e7b263adbf492e1193ffe682db9ba4a88eb1079b874b58","src/com.rs":"0cb06f5db0fb70d27db0e5917ca337de6e7032119e6aabfea1bad9c719f5f34b","src/lib.rs":"6e8cea99f5fc8e5982b1ea9a336ee2f9a6158a9498c8f0c36f1e8cee8c99716e","src/registry.rs":"3876ef9573e3bbc050aef41a684b9a510cc1a91b15ae874fe032cf4377b4d116","src/setup_config.rs":"1a3eeb11c6847c31f2a4685b62ab35c76f0b6d5a17f7ed99e9df164283a771f7","src/winapi.rs":"cb5e6cab3eb570b0f97c660ca448ccfb5024262c0c7b245c181daad91a79f211","src/windows_registry.rs":"6de548aa94215e449f0e58e9a3b1702939d7c2f7b63a9040901c948bf138201d","tests/cc_env.rs":"7402315eea7ffa23b29b393c1de8e236294ede9de562ff0a562704a157135341","tests/support/mod.rs":"092551f9f6e3a999fa0aa02f93314aac0bda2b09268f948c423df56a43575e0b","tests/test.rs":"b1164258714e13173f3861126e97bedf1e29aa24618993c4eb0edd57c431dcc7"},"package":"deaf9ec656256bb25b404c51ef50097207b9cbb29c933d31f92cae5a8a0ffee0"}
+\ No newline at end of file
+--- a/third_party/rust/cc/src/lib.rs
++++ b/third_party/rust/cc/src/lib.rs
+@@ -61,15 +61,14 @@
+ extern crate rayon;
+ 
+ use std::env;
+-use std::ffi::{OsString, OsStr};
++use std::ffi::{OsStr, OsString};
+ use std::fs;
+-use std::path::{PathBuf, Path};
+-use std::process::{Command, Stdio, Child};
+-use std::io::{self, BufReader, BufRead, Read, Write};
++use std::path::{Path, PathBuf};
++use std::process::{Child, Command, Stdio};
++use std::io::{self, BufRead, BufReader, Read, Write};
+ use std::thread::{self, JoinHandle};
+-
+-#[cfg(feature = "parallel")]
+-use std::sync::Mutex;
++use std::collections::HashMap;
++use std::sync::{Arc, Mutex};
+ 
+ // These modules are all glue to support reading the MSVC version from
+ // the registry and from COM interfaces
+@@ -97,6 +96,7 @@ pub struct Build {
+     objects: Vec<PathBuf>,
+     flags: Vec<String>,
+     flags_supported: Vec<String>,
++    known_flag_support_status: Arc<Mutex<HashMap<String, bool>>>,
+     files: Vec<PathBuf>,
+     cpp: bool,
+     cpp_link_stdlib: Option<Option<String>>,
+@@ -241,8 +241,7 @@ impl ToolFamily {
+     fn nvcc_debug_flag(&self) -> &'static str {
+         match *self {
+             ToolFamily::Msvc => unimplemented!(),
+-            ToolFamily::Gnu |
+-            ToolFamily::Clang => "-G",
++            ToolFamily::Gnu | ToolFamily::Clang => "-G",
+         }
+     }
+ 
+@@ -251,8 +250,7 @@ impl ToolFamily {
+     fn nvcc_redirect_flag(&self) -> &'static str {
+         match *self {
+             ToolFamily::Msvc => unimplemented!(),
+-            ToolFamily::Gnu |
+-            ToolFamily::Clang => "-Xcompiler",
++            ToolFamily::Gnu | ToolFamily::Clang => "-Xcompiler",
+         }
+     }
+ }
+@@ -269,10 +267,7 @@ struct Object {
+ impl Object {
+     /// Create a new source file -> object file pair.
+     fn new(src: PathBuf, dst: PathBuf) -> Object {
+-        Object {
+-            src: src,
+-            dst: dst,
+-        }
++        Object { src: src, dst: dst }
+     }
+ }
+ 
+@@ -289,6 +284,7 @@ impl Build {
+             objects: Vec::new(),
+             flags: Vec::new(),
+             flags_supported: Vec::new(),
++            known_flag_support_status: Arc::new(Mutex::new(HashMap::new())),
+             files: Vec::new(),
+             shared_flag: None,
+             static_flag: None,
+@@ -344,10 +340,8 @@ impl Build {
+     ///     .compile("foo");
+     /// ```
+     pub fn define<'a, V: Into<Option<&'a str>>>(&mut self, var: &str, val: V) -> &mut Build {
+-        self.definitions.push((
+-            var.to_string(),
+-            val.into().map(|s| s.to_string()),
+-        ));
++        self.definitions
++            .push((var.to_string(), val.into().map(|s| s.to_string())));
+         self
+     }
+ 
+@@ -398,7 +392,16 @@ impl Build {
+     ///
+     /// It may return error if it's unable to run the compilier with a test file
+     /// (e.g. the compiler is missing or a write to the `out_dir` failed).
++    ///
++    /// Note: Once computed, the result of this call is stored in the
++    /// `known_flag_support` field. If `is_flag_supported(flag)`
++    /// is called again, the result will be read from the hash table.
+     pub fn is_flag_supported(&self, flag: &str) -> Result<bool, Error> {
++        let mut known_status = self.known_flag_support_status.lock().unwrap();
++        if let Some(is_supported) = known_status.get(flag).cloned() {
++            return Ok(is_supported);
++        }
++
+         let out_dir = self.get_out_dir()?;
+         let src = self.ensure_check_file()?;
+         let obj = out_dir.join("flag_check");
+@@ -413,7 +416,8 @@ impl Build {
+             .cuda(self.cuda);
+         let compiler = cfg.try_get_compiler()?;
+         let mut cmd = compiler.to_command();
+-        command_add_output_file(&mut cmd, &obj, target.contains("msvc"), false);
++        let is_arm = target.contains("aarch64") || target.contains("arm");
++        command_add_output_file(&mut cmd, &obj, target.contains("msvc"), false, is_arm);
+ 
+         // We need to explicitly tell msvc not to link and create an exe
+         // in the root directory of the crate
+@@ -424,7 +428,10 @@ impl Build {
+         cmd.arg(&src);
+ 
+         let output = cmd.output()?;
+-        Ok(output.stderr.is_empty())
++        let is_supported = output.stderr.is_empty();
++
++        known_status.insert(flag.to_owned(), is_supported);
++        Ok(is_supported)
+     }
+ 
+     /// Add an arbitrary flag to the invocation of the compiler if it supports it
+@@ -777,9 +784,8 @@ impl Build {
+         A: AsRef<OsStr>,
+         B: AsRef<OsStr>,
+     {
+-        self.env.push(
+-            (a.as_ref().to_owned(), b.as_ref().to_owned()),
+-        );
++        self.env
++            .push((a.as_ref().to_owned(), b.as_ref().to_owned()));
+         self
+     }
+ 
+@@ -880,31 +886,19 @@ impl Build {
+     fn compile_objects(&self, objs: &[Object]) -> Result<(), Error> {
+         use self::rayon::prelude::*;
+ 
+-        let mut cfg = rayon::Configuration::new();
+         if let Ok(amt) = env::var("NUM_JOBS") {
+             if let Ok(amt) = amt.parse() {
+-                cfg = cfg.num_threads(amt);
++                let _ = rayon::ThreadPoolBuilder::new()
++                    .num_threads(amt)
++                    .build_global();
+             }
+         }
+-        drop(rayon::initialize(cfg));
+-
+-        let results: Mutex<Vec<Result<(), Error>>> = Mutex::new(Vec::new());
+-
+-        objs.par_iter().with_max_len(1).for_each(
+-            |obj| {
+-                let res = self.compile_object(obj);
+-                results.lock().unwrap().push(res)
+-            },
+-        );
+ 
+         // Check for any errors and return the first one found.
+-        for result in results.into_inner().unwrap().iter() {
+-            if result.is_err() {
+-                return result.clone();
+-            }
+-        }
+-
+-        Ok(())
++        objs.par_iter()
++            .with_max_len(1)
++            .map(|obj| self.compile_object(obj))
++            .collect()
+     }
+ 
+     #[cfg(not(feature = "parallel"))]
+@@ -917,7 +911,8 @@ impl Build {
+ 
+     fn compile_object(&self, obj: &Object) -> Result<(), Error> {
+         let is_asm = obj.src.extension().and_then(|s| s.to_str()) == Some("asm");
+-        let msvc = self.get_target()?.contains("msvc");
++        let target = self.get_target()?;
++        let msvc = target.contains("msvc");
+         let (mut cmd, name) = if msvc && is_asm {
+             self.msvc_macro_assembler()?
+         } else {
+@@ -931,15 +926,17 @@ impl Build {
+                 compiler
+                     .path
+                     .file_name()
+-                    .ok_or_else(|| {
+-                        Error::new(ErrorKind::IOError, "Failed to get compiler path.")
+-                    })?
++                    .ok_or_else(|| Error::new(ErrorKind::IOError, "Failed to get compiler path."))?
+                     .to_string_lossy()
+                     .into_owned(),
+             )
+         };
+-        command_add_output_file(&mut cmd, &obj.dst, msvc, is_asm);
+-        cmd.arg(if msvc { "/c" } else { "-c" });
++        let is_arm = target.contains("aarch64") || target.contains("arm");
++        command_add_output_file(&mut cmd, &obj.dst, msvc, is_asm, is_arm);
++        // armasm and armasm64 don't requrie -c option
++        if !msvc || !is_asm || !is_arm {
++            cmd.arg(if msvc { "/c" } else { "-c" });
++        }
+         cmd.arg(&obj.src);
+ 
+         run(&mut cmd, &name)?;
+@@ -967,9 +964,7 @@ impl Build {
+         let name = compiler
+             .path
+             .file_name()
+-            .ok_or_else(|| {
+-                Error::new(ErrorKind::IOError, "Failed to get compiler path.")
+-            })?
++            .ok_or_else(|| Error::new(ErrorKind::IOError, "Failed to get compiler path."))?
+             .to_string_lossy()
+             .into_owned();
+ 
+@@ -1054,8 +1049,8 @@ impl Build {
+                 cmd.args.push(crt_flag.into());
+ 
+                 match &opt_level[..] {
+-                    "z" | "s" => cmd.args.push("/Os".into()),
+-                    "1" => cmd.args.push("/O1".into()),
++                    // Msvc uses /O1 to enable all optimizations that minimize code size.
++                    "z" | "s" | "1" => cmd.args.push("/O1".into()),
+                     // -O3 is a valid value for gcc and clang compilers, but not msvc. Cap to /O2.
+                     "2" | "3" => cmd.args.push("/O2".into()),
+                     _ => {}
+@@ -1070,8 +1065,10 @@ impl Build {
+                     cmd.args.push(format!("-O{}", opt_level).into());
+                 }
+ 
+-                cmd.push_cc_arg("-ffunction-sections".into());
+-                cmd.push_cc_arg("-fdata-sections".into());
++                if !target.contains("-ios") {
++                    cmd.push_cc_arg("-ffunction-sections".into());
++                    cmd.push_cc_arg("-fdata-sections".into());
++                }
+                 if self.pic.unwrap_or(!target.contains("windows-gnu")) {
+                     cmd.push_cc_arg("-fPIC".into());
+                 }
+@@ -1169,7 +1166,7 @@ impl Build {
+                 // linker that we're generating 32-bit executables as well. This'll
+                 // typically only be used for build scripts which transitively use
+                 // these flags that try to compile executables.
+-                if target == "i686-unknown-linux-musl" {
++                if target == "i686-unknown-linux-musl" || target == "i586-unknown-linux-musl" {
+                     cmd.args.push("-Wl,-melf_i386".into());
+                 }
+ 
+@@ -1212,14 +1209,13 @@ impl Build {
+         if self.cpp {
+             match (self.cpp_set_stdlib.as_ref(), cmd.family) {
+                 (None, _) => {}
+-                (Some(stdlib), ToolFamily::Gnu) |
+-                (Some(stdlib), ToolFamily::Clang) => {
++                (Some(stdlib), ToolFamily::Gnu) | (Some(stdlib), ToolFamily::Clang) => {
+                     cmd.push_cc_arg(format!("-stdlib=lib{}", stdlib).into());
+                 }
+                 _ => {
+                     println!(
+                         "cargo:warning=cpp_set_stdlib is specified, but the {:?} compiler \
+-                              does not support this option, ignored",
++                         does not support this option, ignored",
+                         cmd.family
+                     );
+                 }
+@@ -1272,6 +1268,10 @@ impl Build {
+         let target = self.get_target()?;
+         let tool = if target.contains("x86_64") {
+             "ml64.exe"
++        } else if target.contains("arm") {
++            "armasm.exe"
++        } else if target.contains("aarch64") {
++            "armasm64.exe"
+         } else {
+             "ml.exe"
+         };
+@@ -1307,20 +1307,55 @@ impl Build {
+         if target.contains("msvc") {
+             let mut cmd = match self.archiver {
+                 Some(ref s) => self.cmd(s),
+-                None => {
+-                    windows_registry::find(&target, "lib.exe").unwrap_or_else(
+-                        || {
+-                            self.cmd("lib.exe")
+-                        },
+-                    )
+-                }
++                None => windows_registry::find(&target, "lib.exe")
++                    .unwrap_or_else(|| self.cmd("lib.exe")),
+             };
++
+             let mut out = OsString::from("/OUT:");
+             out.push(dst);
+-            run(
+-                cmd.arg(out).arg("/nologo").args(&objects).args(&self.objects),
+-                "lib.exe",
+-            )?;
++            cmd.arg(out).arg("/nologo");
++
++            // Similar to https://github.com/rust-lang/rust/pull/47507
++            // and https://github.com/rust-lang/rust/pull/48548
++            let estimated_command_line_len = objects
++                .iter()
++                .chain(&self.objects)
++                .map(|a| a.as_os_str().len())
++                .sum::<usize>();
++            if estimated_command_line_len > 1024 * 6 {
++                let mut args = String::from("\u{FEFF}"); // BOM
++                for arg in objects.iter().chain(&self.objects) {
++                    args.push('"');
++                    for c in arg.to_str().unwrap().chars() {
++                        if c == '"' {
++                            args.push('\\')
++                        }
++                        args.push(c)
++                    }
++                    args.push('"');
++                    args.push('\n');
++                }
++
++                let mut utf16le = Vec::new();
++                for code_unit in args.encode_utf16() {
++                    utf16le.push(code_unit as u8);
++                    utf16le.push((code_unit >> 8) as u8);
++                }
++
++                let mut args_file = OsString::from(dst);
++                args_file.push(".args");
++                fs::File::create(&args_file)
++                    .unwrap()
++                    .write_all(&utf16le)
++                    .unwrap();
++
++                let mut args_file_arg = OsString::from("@");
++                args_file_arg.push(args_file);
++                cmd.arg(args_file_arg);
++            } else {
++                cmd.args(&objects).args(&self.objects);
++            }
++            run(&mut cmd, "lib.exe")?;
+ 
+             // The Rust compiler will look for libfoo.a and foo.lib, but the
+             // MSVC linker will also be passed foo.lib, so be sure that both
+@@ -1412,6 +1447,18 @@ impl Build {
+ 
+         cmd.args.push("-isysroot".into());
+         cmd.args.push(sdk_path.trim().into());
++        cmd.args.push("-fembed-bitcode".into());
++        /*
++         * TODO we probably ultimatedly want the -fembed-bitcode-marker flag
++         * but can't have it now because of an issue in LLVM:
++         * https://github.com/alexcrichton/cc-rs/issues/301
++         * https://github.com/rust-lang/rust/pull/48896#comment-372192660
++         */
++        /*
++        if self.get_opt_level()? == "0" {
++            cmd.args.push("-fembed-bitcode-marker".into());
++        }
++        */
+ 
+         Ok(())
+     }
+@@ -1437,37 +1484,44 @@ impl Build {
+         };
+ 
+         // On Solaris, c++/cc unlikely to exist or be correct.
+-        let default = if host.contains("solaris") { gnu } else { traditional };
+-
+-        let tool_opt: Option<Tool> =
+-            self.env_tool(env)
+-                .map(|(tool, cc, args)| {
+-                    let mut t = Tool::new(PathBuf::from(tool));
+-                    if let Some(cc) = cc {
+-                        t.cc_wrapper_path = Some(PathBuf::from(cc));
+-                    }
+-                    for arg in args {
+-                        t.cc_wrapper_args.push(arg.into());
+-                    }
+-                    t
+-                })
+-                .or_else(|| {
+-                    if target.contains("emscripten") {
+-                        let tool = if self.cpp { "em++" } else { "emcc" };
+-                        // Windows uses bat file so we have to be a bit more specific
+-                        if cfg!(windows) {
+-                            let mut t = Tool::new(PathBuf::from("cmd"));
+-                            t.args.push("/c".into());
+-                            t.args.push(format!("{}.bat", tool).into());
+-                            Some(t)
+-                        } else {
+-                            Some(Tool::new(PathBuf::from(tool)))
+-                        }
++        let default = if host.contains("solaris") {
++            gnu
++        } else {
++            traditional
++        };
++
++        let tool_opt: Option<Tool> = self.env_tool(env)
++            .map(|(tool, cc, args)| {
++                // chop off leading/trailing whitespace to work around
++                // semi-buggy build scripts which are shared in
++                // makefiles/configure scripts (where spaces are far more
++                // lenient)
++                let mut t = Tool::new(PathBuf::from(tool.trim()));
++                if let Some(cc) = cc {
++                    t.cc_wrapper_path = Some(PathBuf::from(cc));
++                }
++                for arg in args {
++                    t.cc_wrapper_args.push(arg.into());
++                }
++                t
++            })
++            .or_else(|| {
++                if target.contains("emscripten") {
++                    let tool = if self.cpp { "em++" } else { "emcc" };
++                    // Windows uses bat file so we have to be a bit more specific
++                    if cfg!(windows) {
++                        let mut t = Tool::new(PathBuf::from("cmd"));
++                        t.args.push("/c".into());
++                        t.args.push(format!("{}.bat", tool).into());
++                        Some(t)
+                     } else {
+-                        None
++                        Some(Tool::new(PathBuf::from(tool)))
+                     }
+-                })
+-                .or_else(|| windows_registry::find_tool(&target, "cl.exe"));
++                } else {
++                    None
++                }
++            })
++            .or_else(|| windows_registry::find_tool(&target, "cl.exe"));
+ 
+         let tool = match tool_opt {
+             Some(t) => t,
+@@ -1501,6 +1555,7 @@ impl Build {
+                         "armv7-unknown-linux-gnueabihf" => Some("arm-linux-gnueabihf"),
+                         "armv7-unknown-linux-musleabihf" => Some("arm-linux-musleabihf"),
+                         "armv7-unknown-netbsd-eabihf" => Some("armv7--netbsdelf-eabihf"),
++                        "i586-unknown-linux-musl" => Some("musl"),
+                         "i686-pc-windows-gnu" => Some("i686-w64-mingw32"),
+                         "i686-unknown-linux-musl" => Some("musl"),
+                         "i686-unknown-netbsd" => Some("i486--netbsdelf"),
+@@ -1509,10 +1564,12 @@ impl Build {
+                         "mips64-unknown-linux-gnuabi64" => Some("mips64-linux-gnuabi64"),
+                         "mips64el-unknown-linux-gnuabi64" => Some("mips64el-linux-gnuabi64"),
+                         "powerpc-unknown-linux-gnu" => Some("powerpc-linux-gnu"),
++                        "powerpc-unknown-linux-gnuspe" => Some("powerpc-linux-gnuspe"),
+                         "powerpc-unknown-netbsd" => Some("powerpc--netbsd"),
+                         "powerpc64-unknown-linux-gnu" => Some("powerpc-linux-gnu"),
+                         "powerpc64le-unknown-linux-gnu" => Some("powerpc64le-linux-gnu"),
+                         "s390x-unknown-linux-gnu" => Some("s390x-linux-gnu"),
++                        "sparc-unknown-linux-gnu" => Some("sparc-linux-gnu"),
+                         "sparc64-unknown-linux-gnu" => Some("sparc64-linux-gnu"),
+                         "sparc64-unknown-netbsd" => Some("sparc64--netbsd"),
+                         "sparcv9-sun-solaris" => Some("sparcv9-sun-solaris"),
+@@ -1538,14 +1595,18 @@ impl Build {
+         };
+ 
+         let tool = if self.cuda {
+-            assert!(tool.args.is_empty(),
+-                "CUDA compilation currently assumes empty pre-existing args");
++            assert!(
++                tool.args.is_empty(),
++                "CUDA compilation currently assumes empty pre-existing args"
++            );
+             let nvcc = match self.get_var("NVCC") {
+                 Err(_) => "nvcc".into(),
+                 Ok(nvcc) => nvcc,
+             };
+             let mut nvcc_tool = Tool::with_features(PathBuf::from(nvcc), self.cuda);
+-            nvcc_tool.args.push(format!("-ccbin={}", tool.path.display()).into());
++            nvcc_tool
++                .args
++                .push(format!("-ccbin={}", tool.path.display()).into());
+             nvcc_tool
+         } else {
+             tool
+@@ -1568,10 +1629,7 @@ impl Build {
+             Some(res) => Ok(res),
+             None => Err(Error::new(
+                 ErrorKind::EnvVarNotFound,
+-                &format!(
+-                    "Could not find environment variable {}.",
+-                    var_base
+-                ),
++                &format!("Could not find environment variable {}.", var_base),
+             )),
+         }
+     }
+@@ -1585,21 +1643,68 @@ impl Build {
+             .collect()
+     }
+ 
+-
+     /// Returns compiler path, optional modifier name from whitelist, and arguments vec
+     fn env_tool(&self, name: &str) -> Option<(String, Option<String>, Vec<String>)> {
+-        self.get_var(name).ok().map(|tool| {
+-            let whitelist = ["ccache", "distcc", "sccache"];
++        let tool = match self.get_var(name) {
++            Ok(tool) => tool,
++            Err(_) => return None,
++        };
+ 
+-            for t in whitelist.iter() {
+-                if tool.starts_with(t) && tool[t.len()..].starts_with(' ')  {
+-                    let args = tool.split_whitespace().collect::<Vec<_>>();
++        // If this is an exact path on the filesystem we don't want to do any
++        // interpretation at all, just pass it on through. This'll hopefully get
++        // us to support spaces-in-paths.
++        if Path::new(&tool).exists() {
++            return Some((tool, None, Vec::new()));
++        }
++
++        // Ok now we want to handle a couple of scenarios. We'll assume from
++        // here on out that spaces are splitting separate arguments. Two major
++        // features we want to support are:
++        //
++        //      CC='sccache cc'
++        //
++        // aka using `sccache` or any other wrapper/caching-like-thing for
++        // compilations. We want to know what the actual compiler is still,
++        // though, because our `Tool` API support introspection of it to see
++        // what compiler is in use.
++        //
++        // additionally we want to support
++        //
++        //      CC='cc -flag'
++        //
++        // where the CC env var is used to also pass default flags to the C
++        // compiler.
++        //
++        // It's true that everything here is a bit of a pain, but apparently if
++        // you're not literally make or bash then you get a lot of bug reports.
++        let known_wrappers = ["ccache", "distcc", "sccache", "icecc"];
++
++        let mut parts = tool.split_whitespace();
++        let maybe_wrapper = match parts.next() {
++            Some(s) => s,
++            None => return None,
++        };
+ 
+-                    return (args[1].to_string(), Some(t.to_string()), args[2..].iter().map(|s| s.to_string()).collect());
+-                }
++        let file_stem = Path::new(maybe_wrapper)
++            .file_stem()
++            .unwrap()
++            .to_str()
++            .unwrap();
++        if known_wrappers.contains(&file_stem) {
++            if let Some(compiler) = parts.next() {
++                return Some((
++                    compiler.to_string(),
++                    Some(maybe_wrapper.to_string()),
++                    parts.map(|s| s.to_string()).collect(),
++                ));
+             }
+-            (tool, None, Vec::new())
+-        })
++        }
++
++        Some((
++            maybe_wrapper.to_string(),
++            None,
++            parts.map(|s| s.to_string()).collect(),
++        ))
+     }
+ 
+     /// Returns the default C++ standard library for the current target: `libc++`
+@@ -1611,7 +1716,7 @@ impl Build {
+                 let target = self.get_target()?;
+                 if target.contains("msvc") {
+                     Ok(None)
+-                } else if target.contains("darwin") {
++                } else if target.contains("apple") {
+                     Ok(Some("c++".to_string()))
+                 } else if target.contains("freebsd") {
+                     Ok(Some("c++".to_string()))
+@@ -1700,10 +1805,7 @@ impl Build {
+             Some(s) => Ok(s),
+             None => Err(Error::new(
+                 ErrorKind::EnvVarNotFound,
+-                &format!(
+-                    "Environment variable {} not defined.",
+-                    v.to_string()
+-                ),
++                &format!("Environment variable {} not defined.", v.to_string()),
+             )),
+         }
+     }
+@@ -1731,8 +1833,9 @@ impl Tool {
+         let family = if let Some(fname) = path.file_name().and_then(|p| p.to_str()) {
+             if fname.contains("clang") {
+                 ToolFamily::Clang
+-            } else if fname.contains("cl") && !fname.contains("cloudabi") &&
+-                      !fname.contains("uclibc") {
++            } else if fname.contains("cl") && !fname.contains("cloudabi")
++                && !fname.contains("uclibc")
++            {
+                 ToolFamily::Msvc
+             } else {
+                 ToolFamily::Gnu
+@@ -1775,8 +1878,8 @@ impl Tool {
+                 cmd.arg(&self.path);
+                 cmd.args(&self.cc_wrapper_args);
+                 cmd
+-            },
+-            None => Command::new(&self.path)
++            }
++            None => Command::new(&self.path),
+         };
+         cmd.args(&self.args);
+         for &(ref k, ref v) in self.env.iter() {
+@@ -1822,10 +1925,8 @@ impl Tool {
+                     cc_env.push(arg);
+                 }
+                 cc_env
+-            },
+-            None => {
+-                OsString::from("")
+             }
++            None => OsString::from(""),
+         }
+     }
+ 
+@@ -1868,8 +1969,7 @@ fn run(cmd: &mut Command, program: &str) -> Result<(), Error> {
+                 ErrorKind::ToolExecError,
+                 &format!(
+                     "Failed to wait on spawned child process, command {:?} with args {:?}.",
+-                    cmd,
+-                    program
++                    cmd, program
+                 ),
+             ))
+         }
+@@ -1884,9 +1984,7 @@ fn run(cmd: &mut Command, program: &str) -> Result<(), Error> {
+             ErrorKind::ToolExecError,
+             &format!(
+                 "Command {:?} with args {:?} did not execute successfully (status code {}).",
+-                cmd,
+-                program,
+-                status
++                cmd, program, status
+             ),
+         ))
+     }
+@@ -1909,8 +2007,7 @@ fn run_output(cmd: &mut Command, program: &str) -> Result<Vec<u8>, Error> {
+                 ErrorKind::ToolExecError,
+                 &format!(
+                     "Failed to wait on spawned child process, command {:?} with args {:?}.",
+-                    cmd,
+-                    program
++                    cmd, program
+                 ),
+             ))
+         }
+@@ -1925,9 +2022,7 @@ fn run_output(cmd: &mut Command, program: &str) -> Result<Vec<u8>, Error> {
+             ErrorKind::ToolExecError,
+             &format!(
+                 "Command {:?} with args {:?} did not execute successfully (status code {}).",
+-                cmd,
+-                program,
+-                status
++                cmd, program, status
+             ),
+         ))
+     }
+@@ -1943,39 +2038,30 @@ fn spawn(cmd: &mut Command, program: &str) -> Result<(Child, JoinHandle<()>), Er
+     match cmd.stderr(Stdio::piped()).spawn() {
+         Ok(mut child) => {
+             let stderr = BufReader::new(child.stderr.take().unwrap());
+-            let print = thread::spawn(move || for line in stderr.split(b'\n').filter_map(
+-                |l| l.ok(),
+-            )
+-            {
+-                print!("cargo:warning=");
+-                std::io::stdout().write_all(&line).unwrap();
+-                println!("");
++            let print = thread::spawn(move || {
++                for line in stderr.split(b'\n').filter_map(|l| l.ok()) {
++                    print!("cargo:warning=");
++                    std::io::stdout().write_all(&line).unwrap();
++                    println!("");
++                }
+             });
+             Ok((child, print))
+         }
+         Err(ref e) if e.kind() == io::ErrorKind::NotFound => {
+             let extra = if cfg!(windows) {
+                 " (see https://github.com/alexcrichton/cc-rs#compile-time-requirements \
+-                   for help)"
++                 for help)"
+             } else {
+                 ""
+             };
+             Err(Error::new(
+                 ErrorKind::ToolNotFound,
+-                &format!(
+-                    "Failed to find tool. Is `{}` installed?{}",
+-                    program,
+-                    extra
+-                ),
++                &format!("Failed to find tool. Is `{}` installed?{}", program, extra),
+             ))
+         }
+         Err(_) => Err(Error::new(
+             ErrorKind::ToolExecError,
+-            &format!(
+-                "Command {:?} with args {:?} failed to start.",
+-                cmd,
+-                program
+-            ),
++            &format!("Command {:?} with args {:?} failed to start.", cmd, program),
+         )),
+     }
+ }
+@@ -1984,9 +2070,10 @@ fn fail(s: &str) -> ! {
+     panic!("\n\nInternal error occurred: {}\n\n", s)
+ }
+ 
+-
+-fn command_add_output_file(cmd: &mut Command, dst: &Path, msvc: bool, is_asm: bool) {
+-    if msvc && is_asm {
++fn command_add_output_file(cmd: &mut Command, dst: &Path, msvc: bool, is_asm: bool, is_arm: bool) {
++    if msvc && is_asm && is_arm {
++        cmd.arg("-o").arg(&dst);
++    } else if msvc && is_asm {
+         cmd.arg("/Fo").arg(dst);
+     } else if msvc {
+         let mut s = OsString::from("/Fo");
diff --git a/www-client/firefox/files/firefox-61.0-mozHunspell.patch b/www-client/firefox/files/firefox-61.0-mozHunspell.patch
deleted file mode 100644
index 2002bd1da50d..000000000000
--- a/www-client/firefox/files/firefox-61.0-mozHunspell.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5bdc1dc7a4541338b13096ae52627ceecd0cca9e Mon Sep 17 00:00:00 2001
-From: nvinson234@gmail.com
-Date: Sun, 8 Jul 2018 16:52:04 -0500
-Subject: [PATCH] Add missing include of nsCOMPtr.h, bug #660726
-
-Signed-off-by: nvinson234@gmail.com
----
- extensions/spellcheck/hunspell/glue/mozHunspellFileMgr.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/extensions/spellcheck/hunspell/glue/mozHunspellFileMgr.h b/extensions/spellcheck/hunspell/glue/mozHunspellFileMgr.h
-index dc33fdfb3..415e00973 100644
---- a/extensions/spellcheck/hunspell/glue/mozHunspellFileMgr.h
-+++ b/extensions/spellcheck/hunspell/glue/mozHunspellFileMgr.h
-@@ -13,6 +13,7 @@
- #include "mozilla/ResultExtensions.h"
- #include "nsIInputStream.h"
- #include "nsReadLine.h"
-+#include "nsCOMPtr.h"
- 
- // Note: This class name and lack of namespacing terrible, but are necessary
- // for Hunspell compatibility.
--- 
-2.18.0
-
diff --git a/www-client/firefox/firefox-60.2.0.ebuild b/www-client/firefox/firefox-60.2.0.ebuild
deleted file mode 100644
index ba70aed601c2..000000000000
--- a/www-client/firefox/firefox-60.2.0.ebuild
+++ /dev/null
@@ -1,390 +0,0 @@
-# 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="1"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
-
-# This list can be updated with scripts/get_langs.sh from the mozilla overlay
-MOZ_LANGS=( ach af an ar as ast az bg bn-BD bn-IN br bs ca cak cs cy da de dsb
-el en en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE
-gd gl gn gu-IN he hi-IN hr hsb hu hy-AM id is it ja ka kab kk km kn ko lij lt lv
-mai mk ml mr ms nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq
-sr sv-SE ta te th tr uk uz vi xh zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
-MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
-MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
-
-if [[ ${MOZ_ESR} == 1 ]]; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-# Patch version
-PATCH="${PN}-60.0-patches-03"
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
-
-MOZCONFIG_OPTIONAL_WIFI=1
-
-inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils llvm \
-		mozconfig-v6.60 pax-utils xdg-utils autotools mozlinguas-v2
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="http://www.mozilla.com/firefox"
-
-KEYWORDS="amd64 x86"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist eme-free +gmp-autoupdate hardened hwaccel jack +screenshot selinux test"
-RESTRICT="!bindist? ( bindist )"
-
-SRCHASH=239e434d6d2b8e1e2b697c3416d1e96d48fe98e5
-SDIR="release"
-[[ ${PV} = *_beta* ]] && SDIR="beta"
-
-PATCH_URIS=( https://dev.gentoo.org/~whissi/dist/firefox/${PATCH}.tar.xz https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/${PATCH}.tar.xz )
-SRC_URI="${SRC_URI}
-	${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz
-	${PATCH_URIS[@]}"
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-RDEPEND="
-	system-icu? ( >=dev-libs/icu-60.2 )
-	jack? ( virtual/jack )
-	>=dev-libs/nss-3.36.4
-	>=dev-libs/nspr-4.19
-	selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/llvm-4.0.1
-	>=sys-devel/clang-4.0.1
-	amd64? ( ${ASM_DEPEND} virtual/opengl )
-	x86? ( ${ASM_DEPEND} virtual/opengl )"
-
-S="${WORKDIR}/firefox-${PV%_*}"
-
-QA_PRESTRIPPED="usr/lib*/${PN}/firefox"
-
-BUILD_OBJ_DIR="${S}/ff"
-
-# allow GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z $GMP_PLUGIN_LIST ]]; then
-	GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-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
-		einfo
-		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"
-	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() {
-	rm "${WORKDIR}/firefox/2005_ffmpeg4.patch"
-	eapply "${WORKDIR}/firefox"
-
-	eapply "${FILESDIR}"/bug_1461221.patch
-	eapply "${FILESDIR}"/${PN}-60.0-blessings-TERM.patch # 654316
-
-	# Enable gnomebreakpad
-	if use debug ; then
-		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
-			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
-	fi
-
-	# Drop -Wl,--as-needed related manipulation for ia64 as it causes ld sefgaults, bug #582432
-	if use ia64 ; then
-		sed -i \
-		-e '/^OS_LIBS += no_as_needed/d' \
-		-e '/^OS_LIBS += as_needed/d' \
-		"${S}"/widget/gtk/mozgtk/gtk2/moz.build \
-		"${S}"/widget/gtk/mozgtk/gtk3/moz.build \
-		|| die "sed failed to drop --as-needed for ia64"
-	fi
-
-	# Ensure that our 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!"
-
-	# Fix sandbox violations during make clean, bug 372817
-	sed -e "s:\(/no-such-file\):${T}\1:g" \
-		-i "${S}"/config/rules.mk \
-		-i "${S}"/nsprpub/configure{.in,} \
-		|| 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}"/browser/installer/Makefile.in || die
-
-	# 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
-
-	# Keep codebase the same even if not using official branding
-	sed '/^MOZ_DEV_EDITION=1/d' \
-		-i "${S}"/browser/branding/aurora/configure.sh || 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"
-	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-	# get your own set of keys.
-	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	mozconfig_config
-
-	# enable JACK, bug 600002
-	mozconfig_use_enable jack
-
-	# Enable/Disable eme support
-	use eme-free && mozconfig_annotate '+eme-free' --disable-eme
-
-	# 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
-
-	# Only available on mozilla-overlay for experimentation -- Removed in Gentoo repo per bug 571180
-	#use egl && mozconfig_annotate 'Enable EGL as GL provider' --with-gl-provider=EGL
-
-	# 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"
-
-	# Setup api key for location services
-	echo -n "${_google_api_key}" > "${S}"/google-api-key
-	mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-
-	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
-	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
-
-	# Default mozilla_five_home no longer valid option
-	sed '/with-default-mozilla-five-home=/d' -i "${S}"/.mozconfig
-
-	# Finalize and report settings
-	mozconfig_final
-
-	# 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() {
-	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
-
-	# Add our default prefs for firefox
-	cp "${FILESDIR}"/gentoo-default-prefs.js-2 \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-
-	mozconfig_install_prefs \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js"
-
-	# Augment this with hwaccel prefs
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-1 >> \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-	fi
-
-	if ! use screenshot; then
-		echo "pref(\"extensions.screenshots.disabled\", true);" >> \
-			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-			|| die
-	fi
-
-	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-
-	local plugin
-	use gmp-autoupdate || use eme-free || for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
-		echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
-			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-			|| die
-	done
-
-	cd "${S}"
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	DESTDIR="${D}" ./mach install
-
-	# Install language packs
-	mozlinguas_src_install
-
-	local size sizes icon_path icon name
-	if use bindist; then
-		sizes="16 32 48"
-		icon_path="${S}/browser/branding/aurora"
-		# Firefox's new rapid release cycle means no more codenames
-		# Let's just stick with this one...
-		icon="aurora"
-		name="Aurora"
-
-		# Override preferences to set the MOZ_DEV_EDITION defaults, since we
-		# don't define MOZ_DEV_EDITION to avoid profile debaucles.
-		# (source: browser/app/profile/firefox.js)
-		cat >>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" <<PROFILE_EOF
-pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/firefoxdev/%VERSION%/");
-sticky_pref("lightweightThemes.selectedThemeID", "firefox-devedition@mozilla.org");
-sticky_pref("browser.devedition.theme.enabled", true);
-sticky_pref("devtools.theme", "dark");
-PROFILE_EOF
-
-	else
-		sizes="16 22 24 32 48 64 128 256"
-		icon_path="${S}/browser/branding/official"
-		icon="${PN}"
-		name="Mozilla Firefox"
-	fi
-
-	# 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 "${icon_path}/default48.png" "${icon}.png"
-	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop"
-	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
-		"${ED}/usr/share/applications/${PN}.desktop" || die
-
-	# Add StartupNotify=true bug 237317
-	if use startup-notification ; then
-		echo "StartupNotify=true"\
-			 >> "${ED}/usr/share/applications/${PN}.desktop" \
-			|| die
-	fi
-
-	# Required in order to use plugins and even run firefox on hardened.
-	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-
-	# if the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# doesn't need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then
-		einfo "APULSE found - Generating library symlinks for sound support"
-		local lib
-		pushd "${ED}"${MOZILLA_FIVE_HOME} &>/dev/null || die
-		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
-			# a quickpkg rolled by hand will grab symlinks as part of the package,
-			# so we need to avoid creating them if they already exist.
-			if ! [ -L ${lib##*/} ]; then
-				ln -s "${lib}" ${lib##*/} || die
-			fi
-		done
-		popd &>/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	# Update mimedb for the new .desktop file
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-
-	if ! use gmp-autoupdate && ! use eme-free ; then
-		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
-		elog "installing into new profiles:"
-		local plugin
-		for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
-		elog
-	fi
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9"; then
-		elog "Apulse was detected at merge time on this system and so it will always be"
-		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
-		elog "media-sound/apulse."
-		elog
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/www-client/firefox/firefox-60.2.1-r1.ebuild b/www-client/firefox/firefox-60.2.1-r1.ebuild
deleted file mode 100644
index 944c98fcc47a..000000000000
--- a/www-client/firefox/firefox-60.2.1-r1.ebuild
+++ /dev/null
@@ -1,413 +0,0 @@
-# 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="1"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
-
-# This list can be updated with scripts/get_langs.sh from the mozilla overlay
-MOZ_LANGS=( ach af an ar as ast az bg bn-BD bn-IN br bs ca cak cs cy da de dsb
-el en en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE
-gd gl gn gu-IN he hi-IN hr hsb hu hy-AM id is it ja ka kab kk km kn ko lij lt lv
-mai mk ml mr ms nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq
-sr sv-SE ta te th tr uk uz vi xh zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
-MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
-MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
-
-if [[ ${MOZ_ESR} == 1 ]]; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-# Patch version
-PATCH="${PN}-60.0-patches-03"
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
-
-MOZCONFIG_OPTIONAL_WIFI=1
-
-inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils llvm \
-		mozconfig-v6.60 pax-utils xdg-utils autotools mozlinguas-v2
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="https://www.mozilla.com/firefox"
-
-KEYWORDS="~amd64 ~x86"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist eme-free geckodriver +gmp-autoupdate hardened hwaccel jack +screenshot selinux test"
-RESTRICT="!bindist? ( bindist )"
-
-SDIR="release"
-[[ ${PV} = *_beta* ]] && SDIR="beta"
-
-PATCH_URIS=( https://dev.gentoo.org/~whissi/dist/firefox/${PATCH}.tar.xz https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/${PATCH}.tar.xz )
-SRC_URI="${SRC_URI}
-	${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz
-	${PATCH_URIS[@]}"
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-RDEPEND="
-	system-icu? ( >=dev-libs/icu-60.2 )
-	jack? ( virtual/jack )
-	>=dev-libs/nss-3.36.4
-	>=dev-libs/nspr-4.19
-	selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/llvm-4.0.1
-	>=sys-devel/clang-4.0.1
-	amd64? ( ${ASM_DEPEND} virtual/opengl )
-	x86? ( ${ASM_DEPEND} virtual/opengl )"
-
-S="${WORKDIR}/firefox-${PV%_*}"
-
-QA_PRESTRIPPED="usr/lib*/${PN}/firefox"
-
-BUILD_OBJ_DIR="${S}/ff"
-
-# allow GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z $GMP_PLUGIN_LIST ]]; then
-	GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-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
-		einfo
-		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"
-	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() {
-	rm "${WORKDIR}/firefox/2005_ffmpeg4.patch"
-	eapply "${WORKDIR}/firefox"
-
-	eapply "${FILESDIR}"/bug_1461221.patch
-	eapply "${FILESDIR}"/${PN}-60.0-blessings-TERM.patch # 654316
-	eapply "${FILESDIR}"/${PN}-60.0-rust-1.29-comp.patch
-	eapply "${FILESDIR}"/${PN}-60.0-missing-errno_h-in-SandboxOpenedFiles_cpp.patch
-
-	# Enable gnomebreakpad
-	if use debug ; then
-		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
-			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
-	fi
-
-	# Drop -Wl,--as-needed related manipulation for ia64 as it causes ld sefgaults, bug #582432
-	if use ia64 ; then
-		sed -i \
-		-e '/^OS_LIBS += no_as_needed/d' \
-		-e '/^OS_LIBS += as_needed/d' \
-		"${S}"/widget/gtk/mozgtk/gtk2/moz.build \
-		"${S}"/widget/gtk/mozgtk/gtk3/moz.build \
-		|| die "sed failed to drop --as-needed for ia64"
-	fi
-
-	# Ensure that our 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!"
-
-	# Fix sandbox violations during make clean, bug 372817
-	sed -e "s:\(/no-such-file\):${T}\1:g" \
-		-i "${S}"/config/rules.mk \
-		-i "${S}"/nsprpub/configure{.in,} \
-		|| 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}"/browser/installer/Makefile.in || die
-
-	# 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
-
-	# Keep codebase the same even if not using official branding
-	sed '/^MOZ_DEV_EDITION=1/d' \
-		-i "${S}"/browser/branding/aurora/configure.sh || 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"
-	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-	# get your own set of keys.
-	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-
-	# 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
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	mozconfig_config
-
-	mozconfig_use_enable geckodriver
-
-	# enable JACK, bug 600002
-	mozconfig_use_enable jack
-
-	# Enable/Disable eme support
-	use eme-free && mozconfig_annotate '+eme-free' --disable-eme
-
-	# 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
-
-	# 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"
-
-	# Setup api key for location services
-	echo -n "${_google_api_key}" > "${S}"/google-api-key
-	mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-
-	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
-	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
-
-	# Default mozilla_five_home no longer valid option
-	sed '/with-default-mozilla-five-home=/d' -i "${S}"/.mozconfig
-
-	# Finalize and report settings
-	mozconfig_final
-
-	# 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() {
-	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
-
-	# Add our default prefs for firefox
-	cp "${FILESDIR}"/gentoo-default-prefs.js-2 \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-
-	mozconfig_install_prefs \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js"
-
-	# Augment this with hwaccel prefs
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-1 >> \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-	fi
-
-	if ! use screenshot; then
-		echo "pref(\"extensions.screenshots.disabled\", true);" >> \
-			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-			|| die
-	fi
-
-	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-
-	local plugin
-	use gmp-autoupdate || use eme-free || for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
-		echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
-			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-			|| die
-	done
-
-	cd "${S}"
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	DESTDIR="${D}" ./mach install || die
-
-	if use geckodriver ; then
-		cp "${BUILD_OBJ_DIR}"/dist/bin/geckodriver "${ED%/}"${MOZILLA_FIVE_HOME} || die
-		pax-mark m "${ED%/}"${MOZILLA_FIVE_HOME}/geckodriver
-
-		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
-	fi
-
-	# Install language packs
-	mozlinguas_src_install
-
-	local size sizes icon_path icon name
-	if use bindist; then
-		sizes="16 32 48"
-		icon_path="${S}/browser/branding/aurora"
-		# Firefox's new rapid release cycle means no more codenames
-		# Let's just stick with this one...
-		icon="aurora"
-		name="Aurora"
-
-		# Override preferences to set the MOZ_DEV_EDITION defaults, since we
-		# don't define MOZ_DEV_EDITION to avoid profile debaucles.
-		# (source: browser/app/profile/firefox.js)
-		cat >>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" <<PROFILE_EOF
-pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/firefoxdev/%VERSION%/");
-sticky_pref("lightweightThemes.selectedThemeID", "firefox-devedition@mozilla.org");
-sticky_pref("browser.devedition.theme.enabled", true);
-sticky_pref("devtools.theme", "dark");
-PROFILE_EOF
-
-	else
-		sizes="16 22 24 32 48 64 128 256"
-		icon_path="${S}/browser/branding/official"
-		icon="${PN}"
-		name="Mozilla Firefox"
-	fi
-
-	# 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 "${icon_path}/default48.png" "${icon}.png"
-	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop"
-	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
-		"${ED}/usr/share/applications/${PN}.desktop" || die
-
-	# Add StartupNotify=true bug 237317
-	if use startup-notification ; then
-		echo "StartupNotify=true"\
-			 >> "${ED}/usr/share/applications/${PN}.desktop" \
-			|| die
-	fi
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	[[ -f "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] && \
-		rm "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer"
-
-	# firefox and firefox-bin are identical
-	rm "${ED%/}"${MOZILLA_FIVE_HOME}/firefox-bin || die
-	dosym firefox ${MOZILLA_FIVE_HOME}/firefox-bin
-
-	# Required in order to use plugins and even run firefox on hardened.
-	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,plugin-container}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-
-	# if the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# doesn't need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then
-		einfo "APULSE found - Generating library symlinks for sound support"
-		local lib
-		pushd "${ED}"${MOZILLA_FIVE_HOME} &>/dev/null || die
-		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
-			# a quickpkg rolled by hand will grab symlinks as part of the package,
-			# so we need to avoid creating them if they already exist.
-			if ! [ -L ${lib##*/} ]; then
-				ln -s "${lib}" ${lib##*/} || die
-			fi
-		done
-		popd &>/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-
-	if ! use gmp-autoupdate && ! use eme-free ; then
-		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
-		elog "installing into new profiles:"
-		local plugin
-		for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
-		elog
-	fi
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9"; then
-		elog "Apulse was detected at merge time on this system and so it will always be"
-		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
-		elog "media-sound/apulse."
-		elog
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/www-client/firefox/firefox-60.2.2.ebuild b/www-client/firefox/firefox-60.2.2.ebuild
new file mode 100644
index 000000000000..5e93109b74cf
--- /dev/null
+++ b/www-client/firefox/firefox-60.2.2.ebuild
@@ -0,0 +1,418 @@
+# 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="1"
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
+
+# This list can be updated with scripts/get_langs.sh from the mozilla overlay
+MOZ_LANGS=( ach af an ar as ast az bg bn-BD bn-IN br bs ca cak cs cy da de dsb
+el en en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE
+gd gl gn gu-IN he hi-IN hr hsb hu hy-AM id is it ja ka kab kk km kn ko lij lt lv
+mai mk ml mr ms nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq
+sr sv-SE ta te th tr uk uz vi xh zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
+MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
+MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
+
+if [[ ${MOZ_ESR} == 1 ]]; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+# Patch version
+PATCH="${PN}-60.0-patches-03"
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
+
+MOZCONFIG_OPTIONAL_WIFI=1
+
+inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils llvm \
+		mozconfig-v6.60 pax-utils xdg-utils autotools mozlinguas-v2
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="https://www.mozilla.com/firefox"
+
+KEYWORDS="amd64 x86"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="bindist eme-free geckodriver +gmp-autoupdate hardened hwaccel jack +screenshot selinux test"
+RESTRICT="!bindist? ( bindist )"
+
+SDIR="release"
+[[ ${PV} = *_beta* ]] && SDIR="beta"
+
+PATCH_URIS=( https://dev.gentoo.org/~whissi/dist/firefox/${PATCH}.tar.xz https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/${PATCH}.tar.xz )
+SRC_URI="${SRC_URI}
+	${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz
+	${PATCH_URIS[@]}"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+RDEPEND="
+	system-icu? ( >=dev-libs/icu-60.2 )
+	jack? ( virtual/jack )
+	>=dev-libs/nss-3.36.4
+	>=dev-libs/nspr-4.19
+	selinux? ( sec-policy/selinux-mozilla )"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/llvm-4.0.1
+	>=sys-devel/clang-4.0.1
+	amd64? ( ${ASM_DEPEND} virtual/opengl )
+	x86? ( ${ASM_DEPEND} virtual/opengl )"
+
+S="${WORKDIR}/firefox-${PV%_*}"
+
+QA_PRESTRIPPED="usr/lib*/${PN}/firefox"
+
+BUILD_OBJ_DIR="${S}/ff"
+
+# allow GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z $GMP_PLUGIN_LIST ]]; then
+	GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+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
+		einfo
+		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"
+	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() {
+	rm "${WORKDIR}/firefox/2005_ffmpeg4.patch"
+	eapply "${WORKDIR}/firefox"
+
+	eapply "${FILESDIR}"/bug_1461221.patch
+	eapply "${FILESDIR}"/${PN}-60.0-blessings-TERM.patch # 654316
+	eapply "${FILESDIR}"/${PN}-60.0-missing-errno_h-in-SandboxOpenedFiles_cpp.patch
+	eapply "${FILESDIR}"/${PN}-60.0-update-cc-to-honor-CC.patch
+
+	# Enable gnomebreakpad
+	if use debug ; then
+		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
+	fi
+
+	# Drop -Wl,--as-needed related manipulation for ia64 as it causes ld sefgaults, bug #582432
+	if use ia64 ; then
+		sed -i \
+		-e '/^OS_LIBS += no_as_needed/d' \
+		-e '/^OS_LIBS += as_needed/d' \
+		"${S}"/widget/gtk/mozgtk/gtk2/moz.build \
+		"${S}"/widget/gtk/mozgtk/gtk3/moz.build \
+		|| die "sed failed to drop --as-needed for ia64"
+	fi
+
+	# Ensure that our 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!"
+
+	# Fix sandbox violations during make clean, bug 372817
+	sed -e "s:\(/no-such-file\):${T}\1:g" \
+		-i "${S}"/config/rules.mk \
+		-i "${S}"/nsprpub/configure{.in,} \
+		|| 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}"/browser/installer/Makefile.in || die
+
+	# 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
+
+	# Keep codebase the same even if not using official branding
+	sed '/^MOZ_DEV_EDITION=1/d' \
+		-i "${S}"/browser/branding/aurora/configure.sh || 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"
+	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+	# get your own set of keys.
+	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+
+	# 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
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	mozconfig_use_enable geckodriver
+
+	# enable JACK, bug 600002
+	mozconfig_use_enable jack
+
+	# Enable/Disable eme support
+	use eme-free && mozconfig_annotate '+eme-free' --disable-eme
+
+	# 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
+
+	# 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"
+
+	# Setup api key for location services
+	echo -n "${_google_api_key}" > "${S}"/google-api-key
+	mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+
+	if use clang ; then
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1423822
+		mozconfig_annotate 'elf-hack is broken when using Clang' --disable-elf-hack
+	fi
+
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
+
+	# Default mozilla_five_home no longer valid option
+	sed '/with-default-mozilla-five-home=/d' -i "${S}"/.mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	# 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() {
+	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
+
+	# Add our default prefs for firefox
+	cp "${FILESDIR}"/gentoo-default-prefs.js-2 \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+
+	mozconfig_install_prefs \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js"
+
+	# Augment this with hwaccel prefs
+	if use hwaccel ; then
+		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-1 >> \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+	fi
+
+	if ! use screenshot; then
+		echo "pref(\"extensions.screenshots.disabled\", true);" >> \
+			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+			|| die
+	fi
+
+	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+
+	local plugin
+	use gmp-autoupdate || use eme-free || for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
+		echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
+			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+			|| die
+	done
+
+	cd "${S}"
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
+	DESTDIR="${D}" ./mach install || die
+
+	if use geckodriver ; then
+		cp "${BUILD_OBJ_DIR}"/dist/bin/geckodriver "${ED%/}"${MOZILLA_FIVE_HOME} || die
+		pax-mark m "${ED%/}"${MOZILLA_FIVE_HOME}/geckodriver
+
+		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
+	fi
+
+	# Install language packs
+	mozlinguas_src_install
+
+	local size sizes icon_path icon name
+	if use bindist; then
+		sizes="16 32 48"
+		icon_path="${S}/browser/branding/aurora"
+		# Firefox's new rapid release cycle means no more codenames
+		# Let's just stick with this one...
+		icon="aurora"
+		name="Aurora"
+
+		# Override preferences to set the MOZ_DEV_EDITION defaults, since we
+		# don't define MOZ_DEV_EDITION to avoid profile debaucles.
+		# (source: browser/app/profile/firefox.js)
+		cat >>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" <<PROFILE_EOF
+pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/firefoxdev/%VERSION%/");
+sticky_pref("lightweightThemes.selectedThemeID", "firefox-devedition@mozilla.org");
+sticky_pref("browser.devedition.theme.enabled", true);
+sticky_pref("devtools.theme", "dark");
+PROFILE_EOF
+
+	else
+		sizes="16 22 24 32 48 64 128 256"
+		icon_path="${S}/browser/branding/official"
+		icon="${PN}"
+		name="Mozilla Firefox"
+	fi
+
+	# 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 "${icon_path}/default48.png" "${icon}.png"
+	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop"
+	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
+		"${ED}/usr/share/applications/${PN}.desktop" || die
+
+	# Add StartupNotify=true bug 237317
+	if use startup-notification ; then
+		echo "StartupNotify=true"\
+			 >> "${ED}/usr/share/applications/${PN}.desktop" \
+			|| die
+	fi
+
+	# Don't install llvm-symbolizer from sys-devel/llvm package
+	[[ -f "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] && \
+		rm "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer"
+
+	# firefox and firefox-bin are identical
+	rm "${ED%/}"${MOZILLA_FIVE_HOME}/firefox-bin || die
+	dosym firefox ${MOZILLA_FIVE_HOME}/firefox-bin
+
+	# Required in order to use plugins and even run firefox on hardened.
+	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,plugin-container}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+
+	# if the apulse libs are available in MOZILLA_FIVE_HOME then apulse
+	# doesn't need to be forced into the LD_LIBRARY_PATH
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then
+		einfo "APULSE found - Generating library symlinks for sound support"
+		local lib
+		pushd "${ED}"${MOZILLA_FIVE_HOME} &>/dev/null || die
+		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
+			# a quickpkg rolled by hand will grab symlinks as part of the package,
+			# so we need to avoid creating them if they already exist.
+			if ! [ -L ${lib##*/} ]; then
+				ln -s "${lib}" ${lib##*/} || die
+			fi
+		done
+		popd &>/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+
+	if ! use gmp-autoupdate && ! use eme-free ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
+		elog
+	fi
+
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9"; then
+		elog "Apulse was detected at merge time on this system and so it will always be"
+		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
+		elog "media-sound/apulse."
+		elog
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/www-client/firefox/firefox-62.0-r1.ebuild b/www-client/firefox/firefox-62.0-r1.ebuild
deleted file mode 100644
index 86d4ef268904..000000000000
--- a/www-client/firefox/firefox-62.0-r1.ebuild
+++ /dev/null
@@ -1,540 +0,0 @@
-# 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=""
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
-
-# This list can be updated with scripts/get_langs.sh from the mozilla overlay
-MOZ_LANGS=( ach af an ar as ast az bg bn-BD bn-IN br bs ca cak cs cy da de dsb
-el en en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE
-gd gl gn gu-IN he hi-IN hr hsb hu hy-AM id is it ja ka kab kk km kn ko lij lt lv
-mai mk ml mr ms nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq
-sr sv-SE ta te th tr uk uz vi xh zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
-MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
-MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
-
-if [[ ${MOZ_ESR} == 1 ]]; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-# Patch version
-PATCH="${PN}-62.0-patches-01"
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
-
-inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils llvm \
-		mozcoreconf-v6 pax-utils xdg-utils autotools mozlinguas-v2
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="https://www.mozilla.com/firefox"
-
-KEYWORDS="~amd64 ~x86"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist dbus debug eme-free +gmp-autoupdate hardened hwaccel jack neon
-	pulseaudio +screenshot selinux startup-notification system-harfbuzz system-icu
-	system-jpeg system-libevent system-sqlite system-libvpx test wifi"
-RESTRICT="!bindist? ( bindist )"
-
-PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/${PATCH}.tar.xz )
-SRC_URI="${SRC_URI}
-	${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz
-	${PATCH_URIS[@]}"
-
-CDEPEND="
-	>=dev-libs/nss-3.38
-	>=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-icu? ( >=dev-libs/icu-60.2:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0= )
-	system-sqlite? ( >=dev-db/sqlite-3.24.0:3[secure-delete,debug=] )
-	system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] )
-	system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 )
-	wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60
-			>=dev-libs/dbus-glib-0.72
-			net-misc/networkmanager ) )
-	jack? ( virtual/jack )
-	selinux? ( sec-policy/selinux-mozilla )"
-
-RDEPEND="${CDEPEND}
-	jack? ( virtual/jack )
-	pulseaudio? ( || ( media-sound/pulseaudio
-		>=media-sound/apulse-0.1.9 ) )
-	selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${CDEPEND}
-	app-arch/zip
-	app-arch/unzip
-	>=sys-devel/binutils-2.16.1
-	sys-apps/findutils
-	pulseaudio? ( media-sound/pulseaudio )
-	elibc_glibc? ( || (
-		( >=dev-lang/rust-1.24.0[-extended(-)] >=dev-util/cargo-0.25.0 )
-		>=dev-lang/rust-1.24.0[extended]
-		( >=dev-lang/rust-bin-1.24.0 >=dev-util/cargo-0.25.0 )
-	) )
-	elibc_musl? ( || ( >=dev-lang/rust-1.24.0
-		>=dev-util/cargo-0.25.0
-	) )
-	>=sys-devel/llvm-4.0.1
-	>=sys-devel/clang-4.0.1
-	amd64? ( >=dev-lang/yasm-1.1 virtual/opengl )
-	x86? ( >=dev-lang/yasm-1.1 virtual/opengl )"
-
-REQUIRED_USE="wifi? ( dbus )"
-
-S="${WORKDIR}/firefox-${PV%_*}"
-
-QA_PRESTRIPPED="usr/lib*/${PN}/firefox"
-
-BUILD_OBJ_DIR="${S}/ff"
-
-# allow GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z $GMP_PLUGIN_LIST ]]; then
-	GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-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
-		einfo
-		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"
-	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() {
-	eapply "${WORKDIR}/firefox"
-
-	eapply "${FILESDIR}"/${PN}-60.0-blessings-TERM.patch # 654316
-
-	# Enable gnomebreakpad
-	if use debug ; then
-		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
-			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
-	fi
-
-	# Drop -Wl,--as-needed related manipulation for ia64 as it causes ld sefgaults, bug #582432
-	if use ia64 ; then
-		sed -i \
-		-e '/^OS_LIBS += no_as_needed/d' \
-		-e '/^OS_LIBS += as_needed/d' \
-		"${S}"/widget/gtk/mozgtk/gtk2/moz.build \
-		"${S}"/widget/gtk/mozgtk/gtk3/moz.build \
-		|| die "sed failed to drop --as-needed for ia64"
-	fi
-
-	# Ensure that our 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!"
-
-	# Fix sandbox violations during make clean, bug 372817
-	sed -e "s:\(/no-such-file\):${T}\1:g" \
-		-i "${S}"/config/rules.mk \
-		-i "${S}"/nsprpub/configure{.in,} \
-		|| 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}"/browser/installer/Makefile.in || die
-
-	# 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
-
-	# Keep codebase the same even if not using official branding
-	sed '/^MOZ_DEV_EDITION=1/d' \
-		-i "${S}"/browser/branding/aurora/configure.sh || 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"
-	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-	# get your own set of keys.
-	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	# common config components
-	mozconfig_annotate 'system_libs' \
-		--with-system-zlib \
-		--with-system-bz2
-
-	# Stylo is only broken on x86 builds
-	use x86 && mozconfig_annotate 'Upstream bug 1341234' --disable-stylo
-
-	# Must pass release in order to properly select linker
-	mozconfig_annotate 'Enable by Gentoo' --enable-release
-
-	# Must pass --enable-gold if using ld.gold
-	if tc-ld-is-gold ; then
-		mozconfig_annotate 'tc-ld-is-gold=true' --enable-gold
-	else
-		mozconfig_annotate 'tc-ld-is-gold=false' --disable-gold
-	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
-		mozconfig_annotate '' --with-thumb=yes
-		mozconfig_annotate '' --with-thumb-interwork=no
-	fi
-	if [[ ${CHOST} == armv* ]] ; 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 '' --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
-
-	# 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"
-
-	mozconfig_use_enable dbus
-
-	mozconfig_use_enable wifi necko-wifi
-
-	# enable JACK, bug 600002
-	mozconfig_use_enable jack
-
-	# Enable/Disable eme support
-	use eme-free && mozconfig_annotate '+eme-free' --disable-eme
-
-	# Setup api key for location services
-	echo -n "${_google_api_key}" > "${S}"/google-api-key
-	mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-
-	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
-	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
-
-	# Finalize and report settings
-	mozconfig_final
-
-	# 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() {
-	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
-
-	# Add our default prefs for firefox
-	cp "${FILESDIR}"/gentoo-default-prefs.js-2 \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/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/browser/defaults/preferences/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/browser/defaults/preferences/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/browser/defaults/preferences/all-gentoo.js" || die
-		echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \
-			>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
-	fi
-
-	# Augment this with hwaccel prefs
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-1 >> \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-	fi
-
-	if ! use screenshot; then
-		echo "pref(\"extensions.screenshots.disabled\", true);" >> \
-			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-			|| die
-	fi
-
-	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-
-	local plugin
-	use gmp-autoupdate || use eme-free || for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
-		echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
-			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-			|| die
-	done
-
-	cd "${S}"
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	DESTDIR="${D}" ./mach install
-
-	# Install language packs
-	MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install
-
-	local size sizes icon_path icon name
-	if use bindist; then
-		sizes="16 32 48"
-		icon_path="${S}/browser/branding/aurora"
-		# Firefox's new rapid release cycle means no more codenames
-		# Let's just stick with this one...
-		icon="aurora"
-		name="Aurora"
-
-		# Override preferences to set the MOZ_DEV_EDITION defaults, since we
-		# don't define MOZ_DEV_EDITION to avoid profile debaucles.
-		# (source: browser/app/profile/firefox.js)
-		cat >>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" <<PROFILE_EOF
-pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/firefoxdev/%VERSION%/");
-sticky_pref("lightweightThemes.selectedThemeID", "firefox-devedition@mozilla.org");
-sticky_pref("browser.devedition.theme.enabled", true);
-sticky_pref("devtools.theme", "dark");
-PROFILE_EOF
-
-	else
-		sizes="16 22 24 32 48 64 128 256"
-		icon_path="${S}/browser/branding/official"
-		icon="${PN}"
-		name="Mozilla Firefox"
-	fi
-
-	# 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 "${icon_path}/default48.png" "${icon}.png"
-	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop"
-	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
-		"${ED}/usr/share/applications/${PN}.desktop" || die
-
-	# Add StartupNotify=true bug 237317
-	if use startup-notification ; then
-		echo "StartupNotify=true"\
-			 >> "${ED}/usr/share/applications/${PN}.desktop" \
-			|| die
-	fi
-
-	# Required in order to use plugins and even run firefox on hardened.
-	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-
-	# if the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# doesn't need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then
-		einfo "APULSE found - Generating library symlinks for sound support"
-		local lib
-		pushd "${ED}"${MOZILLA_FIVE_HOME} &>/dev/null || die
-		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
-			# a quickpkg rolled by hand will grab symlinks as part of the package,
-			# so we need to avoid creating them if they already exist.
-			if ! [ -L ${lib##*/} ]; then
-				ln -s "${lib}" ${lib##*/} || die
-			fi
-		done
-		popd &>/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	# Update mimedb for the new .desktop file
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-
-	if ! use gmp-autoupdate && ! use eme-free ; then
-		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
-		elog "installing into new profiles:"
-		local plugin
-		for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
-		elog
-	fi
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9"; then
-		elog "Apulse was detected at merge time on this system and so it will always be"
-		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
-		elog "media-sound/apulse."
-		elog
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/www-client/firefox/firefox-62.0.2.ebuild b/www-client/firefox/firefox-62.0.2.ebuild
deleted file mode 100644
index fa5d585375ba..000000000000
--- a/www-client/firefox/firefox-62.0.2.ebuild
+++ /dev/null
@@ -1,606 +0,0 @@
-# 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=""
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
-
-# This list can be updated with scripts/get_langs.sh from the mozilla overlay
-MOZ_LANGS=( ach af an ar as ast az bg bn-BD bn-IN br bs ca cak cs cy da de dsb
-el en en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE
-gd gl gn gu-IN he hi-IN hr hsb hu hy-AM id is it ja ka kab kk km kn ko lij lt lv
-mai mk ml mr ms nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq
-sr sv-SE ta te th tr uk uz vi xh zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
-MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
-MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
-
-if [[ ${MOZ_ESR} == 1 ]]; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-# Patch version
-PATCH="${PN}-62.0-patches-01"
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
-
-inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils llvm \
-		mozcoreconf-v6 pax-utils xdg-utils autotools mozlinguas-v2
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="https://www.mozilla.com/firefox"
-
-KEYWORDS="~amd64 ~x86"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist clang dbus debug eme-free geckodriver +gmp-autoupdate hardened hwaccel
-	jack lto neon pulseaudio +screenshot selinux startup-notification
-	system-harfbuzz system-icu system-jpeg system-libevent system-sqlite
-	system-libvpx test wifi"
-RESTRICT="!bindist? ( bindist )"
-
-PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/${PATCH}.tar.xz )
-SRC_URI="${SRC_URI}
-	${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz
-	${PATCH_URIS[@]}"
-
-CDEPEND="
-	>=dev-libs/nss-3.38
-	>=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-icu? ( >=dev-libs/icu-60.2:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0= )
-	system-sqlite? ( >=dev-db/sqlite-3.24.0:3[secure-delete,debug=] )
-	system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] )
-	system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 )
-	wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60
-			>=dev-libs/dbus-glib-0.72
-			net-misc/networkmanager ) )
-	jack? ( virtual/jack )
-	selinux? ( sec-policy/selinux-mozilla )"
-
-RDEPEND="${CDEPEND}
-	jack? ( virtual/jack )
-	pulseaudio? ( || ( media-sound/pulseaudio
-		>=media-sound/apulse-0.1.9 ) )
-	selinux? ( sec-policy/selinux-mozilla )"
-
-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? ( >=dev-lang/yasm-1.1 virtual/opengl )
-	x86? ( >=dev-lang/yasm-1.1 virtual/opengl )"
-
-REQUIRED_USE="wifi? ( dbus )"
-
-S="${WORKDIR}/firefox-${PV%_*}"
-
-QA_PRESTRIPPED="usr/lib*/${PN}/firefox"
-
-BUILD_OBJ_DIR="${S}/ff"
-
-# allow GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z $GMP_PLUGIN_LIST ]]; then
-	GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-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
-		einfo
-		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."
-	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() {
-	eapply "${WORKDIR}/firefox"
-
-	eapply "${FILESDIR}"/${PN}-60.0-blessings-TERM.patch # 654316
-	eapply "${FILESDIR}"/${PN}-60.0-do-not-force-lld.patch
-	eapply "${FILESDIR}"/${PN}-60.0-sandbox-lto.patch # 666580
-	eapply "${FILESDIR}"/${PN}-60.0-missing-errno_h-in-SandboxOpenedFiles_cpp.patch
-
-	# Enable gnomebreakpad
-	if use debug ; then
-		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
-			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
-	fi
-
-	# Drop -Wl,--as-needed related manipulation for ia64 as it causes ld sefgaults, bug #582432
-	if use ia64 ; then
-		sed -i \
-		-e '/^OS_LIBS += no_as_needed/d' \
-		-e '/^OS_LIBS += as_needed/d' \
-		"${S}"/widget/gtk/mozgtk/gtk2/moz.build \
-		"${S}"/widget/gtk/mozgtk/gtk3/moz.build \
-		|| die "sed failed to drop --as-needed for ia64"
-	fi
-
-	# Ensure that our 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!"
-
-	# Fix sandbox violations during make clean, bug 372817
-	sed -e "s:\(/no-such-file\):${T}\1:g" \
-		-i "${S}"/config/rules.mk \
-		-i "${S}"/nsprpub/configure{.in,} \
-		|| 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}"/browser/installer/Makefile.in || die
-
-	# 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
-
-	# Keep codebase the same even if not using official branding
-	sed '/^MOZ_DEV_EDITION=1/d' \
-		-i "${S}"/browser/branding/aurora/configure.sh || 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"
-	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-	# get your own set of keys.
-	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-
-	# 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}-gcc++
-		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
-
-	# Don't let user's LTO flags clash with upstream's flags
-	filter-flags -flto*
-
-	if use lto ; then
-		if use clang ; then
-			# Upstream only supports lld when using clang
-			mozconfig_annotate "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-		else
-			# Linking only works when using ld.gold when LTO is enabled
-			mozconfig_annotate "forcing ld=gold due to USE=lto" --enable-linker=gold
-		fi
-
-		mozconfig_annotate '+lto' --enable-lto=full
-	else
-		# 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
-	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 '' --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
-
-	# 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"
-
-	mozconfig_use_enable dbus
-
-	mozconfig_use_enable wifi necko-wifi
-
-	mozconfig_use_enable geckodriver
-
-	# enable JACK, bug 600002
-	mozconfig_use_enable jack
-
-	# Enable/Disable eme support
-	use eme-free && mozconfig_annotate '+eme-free' --disable-eme
-
-	# Setup api key for location services
-	echo -n "${_google_api_key}" > "${S}"/google-api-key
-	mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-
-	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
-	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
-
-	# Finalize and report settings
-	mozconfig_final
-
-	# 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() {
-	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
-
-	# Add our default prefs for firefox
-	cp "${FILESDIR}"/gentoo-default-prefs.js-2 \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/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/browser/defaults/preferences/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/browser/defaults/preferences/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/browser/defaults/preferences/all-gentoo.js" || die
-		echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \
-			>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
-	fi
-
-	# Augment this with hwaccel prefs
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-1 >> \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-	fi
-
-	if ! use screenshot; then
-		echo "pref(\"extensions.screenshots.disabled\", true);" >> \
-			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-			|| die
-	fi
-
-	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-
-	local plugin
-	use gmp-autoupdate || use eme-free || for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
-		echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
-			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-			|| die
-	done
-
-	cd "${S}"
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	DESTDIR="${D}" ./mach install || die
-
-	if use geckodriver ; then
-		cp "${BUILD_OBJ_DIR}"/dist/bin/geckodriver "${ED%/}"${MOZILLA_FIVE_HOME} || die
-		pax-mark m "${ED%/}"${MOZILLA_FIVE_HOME}/geckodriver
-
-		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
-	fi
-
-	# Install language packs
-	MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install
-
-	local size sizes icon_path icon name
-	if use bindist; then
-		sizes="16 32 48"
-		icon_path="${S}/browser/branding/aurora"
-		# Firefox's new rapid release cycle means no more codenames
-		# Let's just stick with this one...
-		icon="aurora"
-		name="Aurora"
-
-		# Override preferences to set the MOZ_DEV_EDITION defaults, since we
-		# don't define MOZ_DEV_EDITION to avoid profile debaucles.
-		# (source: browser/app/profile/firefox.js)
-		cat >>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" <<PROFILE_EOF
-pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/firefoxdev/%VERSION%/");
-sticky_pref("lightweightThemes.selectedThemeID", "firefox-devedition@mozilla.org");
-sticky_pref("browser.devedition.theme.enabled", true);
-sticky_pref("devtools.theme", "dark");
-PROFILE_EOF
-
-	else
-		sizes="16 22 24 32 48 64 128 256"
-		icon_path="${S}/browser/branding/official"
-		icon="${PN}"
-		name="Mozilla Firefox"
-	fi
-
-	# 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 "${icon_path}/default48.png" "${icon}.png"
-	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop"
-	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
-		"${ED}/usr/share/applications/${PN}.desktop" || die
-
-	# Add StartupNotify=true bug 237317
-	if use startup-notification ; then
-		echo "StartupNotify=true"\
-			 >> "${ED}/usr/share/applications/${PN}.desktop" \
-			|| die
-	fi
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	[[ -f "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] && \
-		rm "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer"
-
-	# firefox and firefox-bin are identical
-	rm "${ED%/}"${MOZILLA_FIVE_HOME}/firefox-bin || die
-	dosym firefox ${MOZILLA_FIVE_HOME}/firefox-bin
-
-	# Required in order to use plugins and even run firefox on hardened.
-	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,plugin-container}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-
-	# if the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# doesn't need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then
-		einfo "APULSE found - Generating library symlinks for sound support"
-		local lib
-		pushd "${ED}"${MOZILLA_FIVE_HOME} &>/dev/null || die
-		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
-			# a quickpkg rolled by hand will grab symlinks as part of the package,
-			# so we need to avoid creating them if they already exist.
-			if ! [ -L ${lib##*/} ]; then
-				ln -s "${lib}" ${lib##*/} || die
-			fi
-		done
-		popd &>/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-
-	if ! use gmp-autoupdate && ! use eme-free ; then
-		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
-		elog "installing into new profiles:"
-		local plugin
-		for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
-		elog
-	fi
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9"; then
-		elog "Apulse was detected at merge time on this system and so it will always be"
-		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
-		elog "media-sound/apulse."
-		elog
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/www-client/firefox/firefox-62.0.3.ebuild b/www-client/firefox/firefox-62.0.3.ebuild
new file mode 100644
index 000000000000..98a5c00667ab
--- /dev/null
+++ b/www-client/firefox/firefox-62.0.3.ebuild
@@ -0,0 +1,614 @@
+# 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=""
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
+
+# This list can be updated with scripts/get_langs.sh from the mozilla overlay
+MOZ_LANGS=( ach af an ar as ast az bg bn-BD bn-IN br bs ca cak cs cy da de dsb
+el en en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE
+gd gl gn gu-IN he hi-IN hr hsb hu hy-AM id is it ja ka kab kk km kn ko lij lt lv
+mai mk ml mr ms nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq
+sr sv-SE ta te th tr uk uz vi xh zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
+MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
+MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
+
+if [[ ${MOZ_ESR} == 1 ]]; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+# Patch version
+PATCH="${PN}-62.0-patches-01"
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
+
+inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils llvm \
+		mozcoreconf-v6 pax-utils xdg-utils autotools mozlinguas-v2
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="https://www.mozilla.com/firefox"
+
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="bindist clang dbus debug eme-free geckodriver +gmp-autoupdate hardened hwaccel
+	jack lto neon pulseaudio +screenshot selinux startup-notification
+	system-harfbuzz system-icu system-jpeg system-libevent system-sqlite
+	system-libvpx test wifi"
+RESTRICT="!bindist? ( bindist )"
+
+PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/${PATCH}.tar.xz )
+SRC_URI="${SRC_URI}
+	${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz
+	${PATCH_URIS[@]}"
+
+CDEPEND="
+	>=dev-libs/nss-3.38
+	>=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-icu? ( >=dev-libs/icu-60.2:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-libevent? ( >=dev-libs/libevent-2.0:0= )
+	system-sqlite? ( >=dev-db/sqlite-3.24.0:3[secure-delete,debug=] )
+	system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] )
+	system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 )
+	wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60
+			>=dev-libs/dbus-glib-0.72
+			net-misc/networkmanager ) )
+	jack? ( virtual/jack )
+	selinux? ( sec-policy/selinux-mozilla )"
+
+RDEPEND="${CDEPEND}
+	jack? ( virtual/jack )
+	pulseaudio? ( || ( media-sound/pulseaudio
+		>=media-sound/apulse-0.1.9 ) )
+	selinux? ( sec-policy/selinux-mozilla )"
+
+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? ( >=dev-lang/yasm-1.1 virtual/opengl )
+	x86? ( >=dev-lang/yasm-1.1 virtual/opengl )"
+
+REQUIRED_USE="wifi? ( dbus )"
+
+S="${WORKDIR}/firefox-${PV%_*}"
+
+QA_PRESTRIPPED="usr/lib*/${PN}/firefox"
+
+BUILD_OBJ_DIR="${S}/ff"
+
+# allow GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z $GMP_PLUGIN_LIST ]]; then
+	GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+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
+		einfo
+		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."
+	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() {
+	eapply "${WORKDIR}/firefox"
+
+	eapply "${FILESDIR}"/${PN}-60.0-blessings-TERM.patch # 654316
+	eapply "${FILESDIR}"/${PN}-60.0-do-not-force-lld.patch
+	eapply "${FILESDIR}"/${PN}-60.0-sandbox-lto.patch # 666580
+	eapply "${FILESDIR}"/${PN}-60.0-missing-errno_h-in-SandboxOpenedFiles_cpp.patch
+
+	# Enable gnomebreakpad
+	if use debug ; then
+		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
+	fi
+
+	# Drop -Wl,--as-needed related manipulation for ia64 as it causes ld sefgaults, bug #582432
+	if use ia64 ; then
+		sed -i \
+		-e '/^OS_LIBS += no_as_needed/d' \
+		-e '/^OS_LIBS += as_needed/d' \
+		"${S}"/widget/gtk/mozgtk/gtk2/moz.build \
+		"${S}"/widget/gtk/mozgtk/gtk3/moz.build \
+		|| die "sed failed to drop --as-needed for ia64"
+	fi
+
+	# Ensure that our 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!"
+
+	# Fix sandbox violations during make clean, bug 372817
+	sed -e "s:\(/no-such-file\):${T}\1:g" \
+		-i "${S}"/config/rules.mk \
+		-i "${S}"/nsprpub/configure{.in,} \
+		|| 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}"/browser/installer/Makefile.in || die
+
+	# 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
+
+	# Keep codebase the same even if not using official branding
+	sed '/^MOZ_DEV_EDITION=1/d' \
+		-i "${S}"/browser/branding/aurora/configure.sh || 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"
+	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+	# get your own set of keys.
+	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+
+	# 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
+
+	# Don't let user's LTO flags clash with upstream's flags
+	filter-flags -flto*
+
+	if use lto ; then
+		if use clang ; then
+			# Upstream only supports lld when using clang
+			mozconfig_annotate "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
+		else
+			# Linking only works when using ld.gold when LTO is enabled
+			mozconfig_annotate "forcing ld=gold due to USE=lto" --enable-linker=gold
+		fi
+
+		mozconfig_annotate '+lto' --enable-lto=full
+	else
+		# 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
+	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 '' --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
+
+	# 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"
+
+	mozconfig_use_enable dbus
+
+	mozconfig_use_enable wifi necko-wifi
+
+	mozconfig_use_enable geckodriver
+
+	# enable JACK, bug 600002
+	mozconfig_use_enable jack
+
+	# Enable/Disable eme support
+	use eme-free && mozconfig_annotate '+eme-free' --disable-eme
+
+	# Setup api key for location services
+	echo -n "${_google_api_key}" > "${S}"/google-api-key
+	mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+
+	# disable webrtc for now, bug 667642
+	use arm && mozconfig_annotate 'broken on arm' --disable-webrtc
+
+	if use clang ; then
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1423822
+		mozconfig_annotate 'elf-hack is broken when using Clang' --disable-elf-hack
+	fi
+
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	# 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() {
+	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
+
+	# Add our default prefs for firefox
+	cp "${FILESDIR}"/gentoo-default-prefs.js-2 \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/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/browser/defaults/preferences/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/browser/defaults/preferences/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/browser/defaults/preferences/all-gentoo.js" || die
+		echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \
+			>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
+	fi
+
+	# Augment this with hwaccel prefs
+	if use hwaccel ; then
+		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-1 >> \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+	fi
+
+	if ! use screenshot; then
+		echo "pref(\"extensions.screenshots.disabled\", true);" >> \
+			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+			|| die
+	fi
+
+	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+
+	local plugin
+	use gmp-autoupdate || use eme-free || for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
+		echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
+			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+			|| die
+	done
+
+	cd "${S}"
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
+	DESTDIR="${D}" ./mach install || die
+
+	if use geckodriver ; then
+		cp "${BUILD_OBJ_DIR}"/dist/bin/geckodriver "${ED%/}"${MOZILLA_FIVE_HOME} || die
+		pax-mark m "${ED%/}"${MOZILLA_FIVE_HOME}/geckodriver
+
+		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
+	fi
+
+	# Install language packs
+	MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install
+
+	local size sizes icon_path icon name
+	if use bindist; then
+		sizes="16 32 48"
+		icon_path="${S}/browser/branding/aurora"
+		# Firefox's new rapid release cycle means no more codenames
+		# Let's just stick with this one...
+		icon="aurora"
+		name="Aurora"
+
+		# Override preferences to set the MOZ_DEV_EDITION defaults, since we
+		# don't define MOZ_DEV_EDITION to avoid profile debaucles.
+		# (source: browser/app/profile/firefox.js)
+		cat >>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" <<PROFILE_EOF
+pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/firefoxdev/%VERSION%/");
+sticky_pref("lightweightThemes.selectedThemeID", "firefox-devedition@mozilla.org");
+sticky_pref("browser.devedition.theme.enabled", true);
+sticky_pref("devtools.theme", "dark");
+PROFILE_EOF
+
+	else
+		sizes="16 22 24 32 48 64 128 256"
+		icon_path="${S}/browser/branding/official"
+		icon="${PN}"
+		name="Mozilla Firefox"
+	fi
+
+	# 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 "${icon_path}/default48.png" "${icon}.png"
+	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop"
+	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
+		"${ED}/usr/share/applications/${PN}.desktop" || die
+
+	# Add StartupNotify=true bug 237317
+	if use startup-notification ; then
+		echo "StartupNotify=true"\
+			 >> "${ED}/usr/share/applications/${PN}.desktop" \
+			|| die
+	fi
+
+	# Don't install llvm-symbolizer from sys-devel/llvm package
+	[[ -f "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] && \
+		rm "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer"
+
+	# firefox and firefox-bin are identical
+	rm "${ED%/}"${MOZILLA_FIVE_HOME}/firefox-bin || die
+	dosym firefox ${MOZILLA_FIVE_HOME}/firefox-bin
+
+	# Required in order to use plugins and even run firefox on hardened.
+	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,plugin-container}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+
+	# if the apulse libs are available in MOZILLA_FIVE_HOME then apulse
+	# doesn't need to be forced into the LD_LIBRARY_PATH
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then
+		einfo "APULSE found - Generating library symlinks for sound support"
+		local lib
+		pushd "${ED}"${MOZILLA_FIVE_HOME} &>/dev/null || die
+		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
+			# a quickpkg rolled by hand will grab symlinks as part of the package,
+			# so we need to avoid creating them if they already exist.
+			if ! [ -L ${lib##*/} ]; then
+				ln -s "${lib}" ${lib##*/} || die
+			fi
+		done
+		popd &>/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+
+	if ! use gmp-autoupdate && ! use eme-free ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
+		elog
+	fi
+
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9"; then
+		elog "Apulse was detected at merge time on this system and so it will always be"
+		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
+		elog "media-sound/apulse."
+		elog
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 7316abc62da7..8a20966ba2a0 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.22-1_amd64.deb 57115922 BLAKE2B e963deccf0cee55fc581c43bcab388e5197df560be3769ce3c32a091d556844c034f9897753f53d700c42079d96db529db0db1c5767238e5327129d9f0003931 SHA512 ecc07e8ecad852035f60692b5b3d04ec15567ada4d519095067f6d937116fdc2350a1b5cb62f0f4bb8fdc19f720a9f652f77b50b6556010b1128733c504377b7
-EBUILD google-chrome-beta-70.0.3538.22.ebuild 2715 BLAKE2B e390e4af632a26200d63279a35ef5edba71eb9316f508837edd92dd5dd1b1208b325555f3fab6130b39a29e8c5667e748388791e49ec1cce1ab1a5e13cda8b97 SHA512 31b8b89c65dd7c0a5efcf8ae7775970c4513d6d2b6200e07493bfca8428618dc8beb46f455393614ba9f51c5cabd3513dba67a1957558fabdcfd05f58f42ab8a
+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
 MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
diff --git a/www-client/google-chrome-beta/google-chrome-beta-70.0.3538.22.ebuild b/www-client/google-chrome-beta/google-chrome-beta-70.0.3538.22.ebuild
deleted file mode 100644
index 3a57de6d8e18..000000000000
--- a/www-client/google-chrome-beta/google-chrome-beta-70.0.3538.22.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}_beta.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-beta/google-chrome-beta-70.0.3538.35.ebuild b/www-client/google-chrome-beta/google-chrome-beta-70.0.3538.35.ebuild
new file mode 100644
index 000000000000..3a03ee42c9b5
--- /dev/null
+++ b/www-client/google-chrome-beta/google-chrome-beta-70.0.3538.35.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}_beta.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/opera-developer/Manifest b/www-client/opera-developer/Manifest
index 3baea292034e..9c4699c1d113 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,5 +1,5 @@
-DIST opera-developer_57.0.3082.0_amd64.deb 58678266 BLAKE2B 0fbed5f242581a907fccd14ad8362172d15d22d8a149386dbfc7f008a326f06d783533735530cc7e1ae56bbb5203f05697075a81266f556613eb7630a3183fc5 SHA512 f697242f9aa29794c82cf70db2f80a170336ccbf5416c76aa08779d4ae29848aa17bd9c429c0009ec1fad8504808f6b82da5270832831632bd09469cd32490ef
 DIST opera-developer_57.0.3090.0_amd64.deb 69308000 BLAKE2B 1309205234788452f333f18bbf55d0d4d795e433f9cbf95ada7417597db4d6bb90aeb510402a9669f8188c6689eb5b3976f831312659454f7565ebf2399bbe9f SHA512 9c33f1c171543f56fa1a26369ca0fe8a393d180e46c7edc4224a0fc74a19345b8f9236abe556f858b76bb00baa351c5c5d0cc5cc16c70bc3afa659e64a24d88e
-EBUILD opera-developer-57.0.3082.0.ebuild 2242 BLAKE2B 21468f533de2510265a623401d4deb9024ee55c0c1edf48cfa2c991788180ca3fcd286bc924d003b9646d77d5bae7ded6f353f11e7a770b50a2333ac3b7af535 SHA512 de35508ca08c9c87f8f5f80ac1c5b521888e3a84e378fdb2f24f69015d8c09212a7f2cd2a81b1fe39b7a1df6731997e03d9eae923f3868d2ead3e1a1841ce846
+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
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-developer/opera-developer-57.0.3082.0.ebuild b/www-client/opera-developer/opera-developer-57.0.3082.0.ebuild
deleted file mode 100644
index bb41cc9d6e5c..000000000000
--- a/www-client/opera-developer/opera-developer-57.0.3082.0.ebuild
+++ /dev/null
@@ -1,113 +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 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
-
-	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-57.0.3098.1.ebuild b/www-client/opera-developer/opera-developer-57.0.3098.1.ebuild
new file mode 100644
index 000000000000..c09ad3685d1c
--- /dev/null
+++ b/www-client/opera-developer/opera-developer-57.0.3098.1.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 adda35924616..63e0bdd29b00 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_55.0.2994.61_amd64.deb 56894912 BLAKE2B 536629564c0b0b3e80020ecd7e5e074f38304095f670848d4086505b613bd3dcf8768deabb5a67a2dacfb3fc3d1e19f5075b60e7fe90150b08722b7b11bc1e97 SHA512 dcda8466c67b4dfc9663ee81f219db97d62ab576f8809c9d99f7c4834fa94643a82734cbb1d5f92cdd25cddb786063c79e142efb7ae1babc621d1373fffb958b
 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
 EBUILD opera-12.16_p1860-r1.ebuild 6118 BLAKE2B 72e7be2d8786ef62b3a7b9fe93019e0df26b60d37826789c0e1ff691571a84d9f964c18517cb2acee0c4a6ba98c86ba00a032cb309197b83101ab8edf4a17dda SHA512 109edf5cd49938f57a59ce704efa46abfa93e1f72edabc57cffd8ca72e15193b3d35280b458ceb569a7163e7f7ec25cf84aaf602114855fad849f3c6c2125937
-EBUILD opera-55.0.2994.61.ebuild 2258 BLAKE2B 46fd91a67c6957e3d91c1ac8ee10e823ae01b1d8c70613e3ffde5e342d3f21810ac6d036e5306e42700d503892bfcdbbdc81e53b2a2cf972ed66bb986cbc0a8d SHA512 a3d6ee9b6eb7c29911cb8ed2f5bbf2f35b0ff2a4932fb22a7f6d39643d5edc5a465f0a8d4ac38e8a3052f592761bae70f3c80e3fcf52ef79a9380fa4815a9d41
 EBUILD opera-56.0.3051.31.ebuild 2303 BLAKE2B e0086b6f875e066c6dcea26b6143d51c0a9e04cac9bcd9035622f0bd1c3020e8c37f7bed2ec8603dd10411a483586ec0527b4ad3fe1ce226f903ef9738bff6d2 SHA512 5ede826e20541e5e44e7b0e729960ef5e1acd3a454b3a9b2868d7a836031aa648e649d596c156f5bc5e467635d1e2d0c6f1eb271bbcf4f0bdc711e4061832cbf
+EBUILD opera-56.0.3051.36.ebuild 2303 BLAKE2B e0086b6f875e066c6dcea26b6143d51c0a9e04cac9bcd9035622f0bd1c3020e8c37f7bed2ec8603dd10411a483586ec0527b4ad3fe1ce226f903ef9738bff6d2 SHA512 5ede826e20541e5e44e7b0e729960ef5e1acd3a454b3a9b2868d7a836031aa648e649d596c156f5bc5e467635d1e2d0c6f1eb271bbcf4f0bdc711e4061832cbf
 MISC metadata.xml 576 BLAKE2B b7741cc8f83a9b2f8b5a408f90123000ff5daab77771adaefeb72ae1cdfaf7213f674097e6875c168907bc6820764ccb93c2a3696e792e1f6db92d5f13d664af SHA512 475c622917d4c749b7d940d023519152820a6d6cba48b01f3fdeee8261a2faf217fee10c0e482d6dee5d46f26b2e8ca938d79b93cde178aeb66fb71c268d2374
diff --git a/www-client/opera/opera-55.0.2994.61.ebuild b/www-client/opera/opera-55.0.2994.61.ebuild
deleted file mode 100644
index 36e972f68391..000000000000
--- a/www-client/opera/opera-55.0.2994.61.ebuild
+++ /dev/null
@@ -1,111 +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/
-"
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/desktop/${PV}/linux/${PN}-stable_${PV}_amd64.deb"
-"
-done
-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
-			;;
-	esac
-
-	rm usr/bin/${PN} || die
-
-	rm usr/share/doc/${PN}-stable/copyright || die
-	mv usr/share/doc/${PN}-stable 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/opera-56.0.3051.36.ebuild b/www-client/opera/opera-56.0.3051.36.ebuild
new file mode 100644
index 000000000000..89d2858058e3
--- /dev/null
+++ b/www-client/opera/opera-56.0.3051.36.ebuild
@@ -0,0 +1,112 @@
+# 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-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/
+"
+for uri in ${SRC_URI_BASE}; do
+SRC_URI+="
+	"${uri}${PN}/desktop/${PV}/linux/${PN}-stable_${PV}_amd64.deb"
+"
+done
+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
+			;;
+	esac
+
+	rm usr/bin/${PN} || die
+
+	rm usr/share/doc/${PN}-stable/copyright || die
+	mv usr/share/doc/${PN}-stable usr/share/doc/${PF} || die
+	gunzip usr/share/doc/${PF}/changelog.gz || 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/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 79514d41da32..148c27c1b9c5 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,6 +1,6 @@
-DIST qutebrowser-1.4.1.tar.gz 3552660 BLAKE2B 66398ec5480cd229b6ca00ac46b5cea0476c58c00335c68167bb62981a040ce91c0f3ab83bdde19ba0d35cbc5e791ee070fc992f8aba71cb4ceb644203330594 SHA512 a77b786980326f67ffb933d019438933de3a6f43244bfc0f42f22a8f189480b093757b2d5d81de58ab774f39ee4442c2482be4f78ffcad7b73f03d028e2b455d
 DIST qutebrowser-1.4.2.tar.gz 3549553 BLAKE2B a3f5c6b8b12ca050618a0a949a29b38c6c02bbb2c754e959f691650f5283861ab7cdb1ae14844b2e8331eaf18f263c5e4c5279441b75393fcd2388890ad456c3 SHA512 bad09a49dc69fdf2188f88d94056f30cc7e0107e02b2acbcdaa64706efdf748e1bd499f28419c6a91438572f005070a379b33f431c38e437975f11aa69f49a31
-EBUILD qutebrowser-1.4.1.ebuild 2005 BLAKE2B 330559c2ca17ccba51df27f172f9b304186cf895d5eae00b7e0b0876057377fd4aff859f7e72ae7b7fae1a81c00485be8511ff501973915bc1962914b3d60793 SHA512 b7de83ed4059748b04d6f65bdc1456f9c2211f1ba8e1a81f998b5bcf659ad7d790a1584c88ab811768b2862d257714f81164b9f10b5952855c818662475c0e36
+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
 MISC metadata.xml 445 BLAKE2B 11eed2c826838fbdf314c3c1a070bf152fd440891896e5adf6614c29685a4a4c4f5bf46e767de31ef7fbe3ee057ae752f12cfa078c5dda41860cf41708844d2e SHA512 441a63c005894a6527b1521de85b2a26ba107c79fd0663521250808381fe2264972049d14585f153ba3a81d026d715f604382c40489da72398d9eb0fbfd5a6ed
diff --git a/www-client/qutebrowser/qutebrowser-1.4.1.ebuild b/www-client/qutebrowser/qutebrowser-1.5.0.ebuild
index e7535337c44e..e7535337c44e 100644
--- a/www-client/qutebrowser/qutebrowser-1.4.1.ebuild
+++ b/www-client/qutebrowser/qutebrowser-1.5.0.ebuild
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 23a37a52e264..6344bdcba270 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -2,5 +2,10 @@ DIST vivaldi-snapshot-2.1.1317.4_p2-amd64.deb 58852884 BLAKE2B 887de4a17ef097d87
 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
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.1.1322.4_p2.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.1.1322.4_p2.ebuild
new file mode 100644
index 000000000000..91b5d4fe6abf
--- /dev/null
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.1.1322.4_p2.ebuild
@@ -0,0 +1,118 @@
+# 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_HOME="opt/${PN}"
+DESCRIPTION="A browser for our friends"
+HOMEPAGE="https://vivaldi.com/"
+VIVALDI_BASE_URI="https://downloads.vivaldi.com/snapshot/${PN}_${PV/_p/-}_"
+SRC_URI="
+	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
+	arm64? ( ${VIVALDI_BASE_URI}arm64.deb -> ${P}-arm64.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 ~arm64 ~x86"
+RESTRICT="bindist mirror"
+
+DEPEND="
+	virtual/libiconv
+"
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/speex
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango[X]
+"
+QA_PREBUILT="*"
+S=${WORKDIR}
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	iconv -c -t UTF-8 usr/share/applications/${PN}.desktop > "${T}"/${PN}.desktop || die
+	mv "${T}"/${PN}.desktop usr/share/applications/${PN}.desktop || die
+
+	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+	chmod 0755 usr/share/doc/${PF} || die
+
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	rm \
+		_gpgbuilder \
+		etc/cron.daily/${PN} \
+		${VIVALDI_HOME}/libwidevinecdm.so \
+		|| die
+	rmdir \
+		etc/cron.daily/ \
+		etc/ \
+		|| die
+
+	local c d
+	for d in 16 22 24 32 48 64 128 256; do
+		mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
+		cp \
+			${VIVALDI_HOME}/product_logo_${d}.png \
+			usr/share/icons/hicolor/${d}x${d}/apps/${PN}.png || die
+	done
+
+	pushd "${VIVALDI_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	epatch_user
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
+
+	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
+}
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index b8468a504f82..1bcdaae7ab34 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -4,6 +4,10 @@ DIST vivaldi-1.15.1147.64_p1-i386.deb 52496664 BLAKE2B 3b246203e11c0654bc455ca96
 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
 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
 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
new file mode 100644
index 000000000000..5978d2dcb6e5
--- /dev/null
+++ b/www-client/vivaldi/vivaldi-2.0.1309.37_p2.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 bade242c0a80..0bd80181ca83 100644
--- a/www-plugins/Manifest.gz
+++ b/www-plugins/Manifest.gz
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index 1289d1e5e4b3..ac84e01dc1f1 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.22-1_amd64.deb 57115922 BLAKE2B e963deccf0cee55fc581c43bcab388e5197df560be3769ce3c32a091d556844c034f9897753f53d700c42079d96db529db0db1c5767238e5327129d9f0003931 SHA512 ecc07e8ecad852035f60692b5b3d04ec15567ada4d519095067f6d937116fdc2350a1b5cb62f0f4bb8fdc19f720a9f652f77b50b6556010b1128733c504377b7
+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.22_beta.ebuild 1363 BLAKE2B d187db8909cb0f2a0d456fea51268756c7ac4350711f445c9bf215b45d96ddb560dee8000ea2746c95239001f7a64b2e2ab42f2e541e324a97b0fcc75407db7c SHA512 3f97ed97b94ef6cd965ee74a76c38c93bfe58cc964823183a927c26c82bd844ab1e97efd75ae1c74111d08c87db2034a10a93122e575ba05a8a3eca0a0a0331d
+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
 MISC metadata.xml 341 BLAKE2B da1d1a85bb21e659671b98e12d0b3b31760dab269f8d298b44923f6936a4c43a27b67bff50adf76cb883460d5fe3112027d9b678826eeb220448cd114805320e SHA512 253960d995af2946bafa0bcd96a874e50197aa629efd0dfe7ce404dc72180a2298119b9cabd0b605c65b0894fe0316f7b3bdab602bdfade4323a0bdd70311fdd
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-70.0.3538.22_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-70.0.3538.22_beta.ebuild
deleted file mode 100644
index 08f94544e0a3..000000000000
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-70.0.3538.22_beta.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.35_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-70.0.3538.35_beta.ebuild
new file mode 100644
index 000000000000..6fcfccb7dc18
--- /dev/null
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-70.0.3538.35_beta.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-servers/Manifest.gz b/www-servers/Manifest.gz
index afd7ba304512..667532f700fb 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 1a45efd45f46..537335a8b4dc 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -14,7 +14,7 @@ DIST nginx-1.14.0.tar.gz 1016272 BLAKE2B 37d292955dc5f03f6b3b05fd434807ba1033fab
 DIST nginx-1.15.1.tar.gz 1024086 BLAKE2B 411f566f53fcae62a8b539ac3809d75dc7eaae763c757818931a666e9ed9d2f2b266a7691f58d2ab62bb97d930dfc40f2dc96d199d9a066329ccbcd82d4d2200 SHA512 bdb15791cd599d72a93d85772f8d35d83a76bab10fdfd76929173f81ed1dbad125addc305a6308c0f3d71efb836bc715acf48940047ec17fd48cf37e05b56d17
 DIST nginx-1.15.2.tar.gz 1025746 BLAKE2B 96b1b1d660571e35b7f97c71da241fa88b44d3928868019b4fffdfa68cd40bb8bd31bba9429cc9e4ca2c2f8d7abf03129577003f4cca50e6d0325644eb47aad4 SHA512 ef8171138246b851f3713ea027d6b96de414b15e24de244fa4fcb428da3a68f4df0c54152e5c0993e36c9c97d4dabcd55a019d6709840b4393c86995604668ff
 DIST nginx-1.15.3.tar.gz 1022881 BLAKE2B 5a33a36a2a0dfa9b276c1fe9aeb148d191244973844ee9e411a88792fa8c80d2605efd83da708535f0e39234418b955eb15642a0d4d14e5c7c26e805ed921a2e SHA512 112fafd0841b79a165cee6a94da6d0c6c828b29ef1e3af00f4a12809c5d3bc8fd2a94f6d0cb05f6b487be81a414be42ea64f88e63a4d62fe9bebc9cf946aa94a
-DIST nginx-1.15.4.tar.gz 1024694 BLAKE2B e43f04a39f1c4fb42e1f896475341010e7ce5f50653e96dd5c7f71f403a5f4d1641db719f8557b1368338b67d1929032958736eab48b8e08e5ecef5f5dd7ef24 SHA512 9aa20aa2a23b4fac859858f22d09bb1bee74e1d7450e4a9ea8486014078006d8937f5440684d98fa0bb23feec464ec57129da6a70659fff31d9f2ac370684ac8
+DIST nginx-1.15.5.tar.gz 1024791 BLAKE2B 713373b908c40c5cf676cec7698807a7de0a3ba81e8215b00896f178f2369bdbd01318c688276cf9fea8b9274be75eab0fbf403ac629ca730198eccf363ec92f SHA512 90b3d8148fca183bd3f6d16fd9212e2eedbe13f151c079d67086fca5a9f58256b99a87b4444ee18b1f9fb2b65fbe2d5353985145e1c075b6236b31d0ce7e9051
 DIST nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz 18457 BLAKE2B 22225ca9e5299b20ab5a93a001cac48e446bd86b3a24ac49e716bc975b128890bdb4b0dbbf5730fbaaeadfd958160093c7a6af798dd0e6de27062f149a760333 SHA512 ec59637fda5acac053e815cb1d04b545fc6b765e5ec63d8c2c9c301abad87afaa2698145acac08e9e14c91e1423ebff7aff0cca2b940b19ccccbf4cf53973269
 DIST nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 124047 BLAKE2B d37ef9a15c91abe3c6258e420d1f99fa452f9d9966a0e13102174973314a3bac5413957a5fe632a9dcb1163b3be5df8116e05cc053ee061e19319ec25f341570 SHA512 6c1bfdcf89884b2855d51ae7da0f6e53a4ca3629e1aaf58433b70c07dcb2af797ba6e87d9b3eb4fe2fb6d4d697e862f2b4c2f8d8b3fdaea201740c97ec936529
 DIST ngx_brotli-0.1.2.tar.gz 12668 BLAKE2B 904d3f28dcf9f2d5a8eefa2ab8ff991e34624897a9932e351ec4cea05f2b0dbee34ea495de2d546510a556fb10041b388be963f28fecfcd7dc8638f950b36fd0 SHA512 661b4ce5cc678600e5df6be7588b0f0d5d914df9a6788c994cebfa25e211720b9e7d2c08fc34eb6a84743ae2929920ebf2888075e122ac23816ab7c0f3ef4b76
@@ -46,5 +46,5 @@ EBUILD nginx-1.15.1-r1.ebuild 40384 BLAKE2B 361936e392b9cc5d981258039fe9d151f543
 EBUILD nginx-1.15.2-r1.ebuild 40417 BLAKE2B 401008b5deeddae4d965c58713b5348d44ac3aabf18c3ec30335bc3d38ff68fa8389effa1a7739bba9c4dced16c55fa248449e4e044f538230839dca3024efc4 SHA512 517b81445a1d624c0ca43fd709790b971576c65acf67c142e28ef8853f5c0e3e15ef5c4390a4a2d1427b9a16f5b91db4fed1c998c59805005504172dec45e839
 EBUILD nginx-1.15.2.ebuild 40417 BLAKE2B 3831270718626b142aa035808ed47f73c0a77cc741e2a0c067c9df81e4c7dde99e5d846849bc4c9d095253cdcebd2aa3c1701db0216931d7bd59a3551b5a7e1c SHA512 eb99c00af11f44d0704ab2ed5223939cdca5cbefc21e9908af9b279dac71472033cfa70c77516f61b6dbf22f75e706572e017c911cdfa20edbf2dae39dbe80e3
 EBUILD nginx-1.15.3.ebuild 40417 BLAKE2B 401008b5deeddae4d965c58713b5348d44ac3aabf18c3ec30335bc3d38ff68fa8389effa1a7739bba9c4dced16c55fa248449e4e044f538230839dca3024efc4 SHA512 517b81445a1d624c0ca43fd709790b971576c65acf67c142e28ef8853f5c0e3e15ef5c4390a4a2d1427b9a16f5b91db4fed1c998c59805005504172dec45e839
-EBUILD nginx-1.15.4.ebuild 40414 BLAKE2B 86585cf3f0b352bed0aa18a8a1753221a4e07757b56ae270eae1fac16bef56011270845dfadc03b5c2824edacfde45b3614b062b3ed1a4b2d53dcdeb58423058 SHA512 7a1e3286c6668a04fbcc9704168168017587b6dfbeeff253c21119a6a9dcba48b96733c009392537357eecda2cd9a74b87273bcaf7769d4bed32f405e3423bef
+EBUILD nginx-1.15.5.ebuild 40414 BLAKE2B 86585cf3f0b352bed0aa18a8a1753221a4e07757b56ae270eae1fac16bef56011270845dfadc03b5c2824edacfde45b3614b062b3ed1a4b2d53dcdeb58423058 SHA512 7a1e3286c6668a04fbcc9704168168017587b6dfbeeff253c21119a6a9dcba48b96733c009392537357eecda2cd9a74b87273bcaf7769d4bed32f405e3423bef
 MISC metadata.xml 1310 BLAKE2B 6f40252a833a188f4b62cb2f2a126f93e68cdcd0e3575febdc371106c82d7ebdc6931b162a5ef8070fb6fe1f18e969191f67d3ccdd5e55712dc4d209c16c34c9 SHA512 10403ec29eaa83eb45b7b0b78340103b226145b52b3795e18b1e8bf272efa83586bc190e6e66061f33544434e3c2f94d2229be988733713578e9bb495ce7219c
diff --git a/www-servers/nginx/nginx-1.15.4.ebuild b/www-servers/nginx/nginx-1.15.5.ebuild
index 1ea681b2bcfb..1ea681b2bcfb 100644
--- a/www-servers/nginx/nginx-1.15.4.ebuild
+++ b/www-servers/nginx/nginx-1.15.5.ebuild
diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index d6b685949055..c62e696ba6e8 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -12,12 +12,12 @@ DIST varnish-4.0.5.tgz 1947888 BLAKE2B d921dc6f2abae7b0bd1816470fd41f8555c02a026
 DIST varnish-4.1.8.tgz 2254772 BLAKE2B acadf4079d58bb8f0dc5e24713aba7f2786ca6f06a683465b1564bacd986e209d858f9a3100cfb7586fa5d17f7e5f4d8425ece10c609bb3412d3adafa6ad0d05 SHA512 c642359118d87e8713d2ccf817da317a454a0f9ae6f7a07da1d10b5076aa7e5d7dcc203ef71ae19d56b7592db0c66b4ca96cb43d5fa0e6aa588d1dc8e03e026e
 DIST varnish-5.1.3.tgz 2643223 BLAKE2B 85bae87785da1284d7d916b8948a0984eea9cf07e96012255435ba04c28e8078e5dad893946bbc12da6cbe9326699458f0e3af6be55cb5e7bba4e622724ddac2 SHA512 a10c317dc38ddff139ca8153f6388955df449c3abeb4d4f069b632ba2b32064a2827ab05fa8515994b251a68507fc3a7bf4e08eacc991fc03283ab234b9efd0a
 DIST varnish-5.2.1.tgz 2827676 BLAKE2B 6f50a55a9b16d137eaec59aea98a0179b808bb67fc3de26c9b0924b9937a3688b7f9db45d2f0a71be2b7c6f77bfd47cd22e7b898348b5236114572b5bb33ff22 SHA512 2e979983c7f2325e289768752cc474dc3032c3420de65ccfd5871098c076aecf18e962b04308ecb1860f542fd6f6418dc79220fdd6cf4a75f7476a733faa589c
-DIST varnish-6.0.0.tgz 3033621 BLAKE2B 8fb3c8bf64527476251500ebf809dcff927c8097811e500172d489dd02828981e92034d8c95b8b6d183381d8f3a0fdba633451e8ab17d40d56f7727376378d68 SHA512 39bae462fe40bda9b7c93114ab8256c838a7d67f1a9f7397c37ad090163a33232676120eb7609d0512684a563d8e02c1c2ff5e1b9da0ddedef2250db51c3cc79
 DIST varnish-6.0.1.tgz 3065822 BLAKE2B b99d0d50444872353367007f2ee97c5d5f0e60031ece7b07f8b2c3a7a84b31be88fe2b850304b1f2e47a35f35c2c41f43888bee1d1874721a72ad078acfddfa1 SHA512 057cb69ae6a4d980401effb7561d3a9b537216d8626fdf4e7bcc75971958517f51b6bd7f7af86c11bc92a2e77876831c577736dfcd11447ad0128f222c5ad138
+DIST varnish-6.1.0.tgz 3137149 BLAKE2B 8db1fb3460a25763bd28c92fa8b9181711b497a7d1cadfbbf19794c9df3e64e60aefac87032892a02eed3ff380686f047fb67d8c7f70b602e65c63b69224e674 SHA512 48584fc2d938cc0759fa5d795992a0c6d5d9fb49db5f3063dca8d3d88c6282dac971ed268edc07bec95b4f25e26562089b1b84abdd26099e12be9ea66557716d
 EBUILD varnish-4.0.5.ebuild 2050 BLAKE2B 22e332f95d1138577e37deebee8e0e77f11bb1ead55f672cd67db4765b3d3e8ae5854b940d59a652ec6619c56a5e3a379f425c39780685c0e8fa7a54869a2141 SHA512 b1520598b99b94f29afd63305470e06fc9a8ef4f6d816cc56390b73fb980cbffcd62488e644e4eaa56991445f153ff39661a04726babbb89e574bca3f891a796
 EBUILD varnish-4.1.8.ebuild 2208 BLAKE2B 6a0509906c324ead94dc1706dfcb22156d04c2390615acd541277d90c25fe2e0bf4e96d1210d03f8f886711b67b2deb6fa635d14ef4fe249ab7b71bcf350fdf3 SHA512 166fe6d8e1d89fbf4064f2d6995b00156bbca7920b1131a6fbbde45605d26fdfaf54dadff626ed72546fdfd66ccdec20efb31a526c2ff3336261da2f31d6b84e
 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.0.ebuild 2242 BLAKE2B 985fa674cd406733137c8e32772044818422431639de32162b8fd1baab8cee6449d601d7ee6ff24428762755407e2275e7a95cb9315e3d2f2ffe18b05dcaa472 SHA512 ff7a0fa8e3beb7731df50d0ff910b224291cd2ff1bdea3623a3a1ccc436b2611d3487681c7273a717db1b387f96699a79ad2e8c56bf5de371ad4dc36c973d582
-EBUILD varnish-6.0.1.ebuild 2242 BLAKE2B 985fa674cd406733137c8e32772044818422431639de32162b8fd1baab8cee6449d601d7ee6ff24428762755407e2275e7a95cb9315e3d2f2ffe18b05dcaa472 SHA512 ff7a0fa8e3beb7731df50d0ff910b224291cd2ff1bdea3623a3a1ccc436b2611d3487681c7273a717db1b387f96699a79ad2e8c56bf5de371ad4dc36c973d582
-MISC metadata.xml 1148 BLAKE2B b9f3dcc97112ee180ce62b82d50d3c9ba038b2015f1707061ee80a2771ee98be0855f84d58cb87f7a7483762a0afe21638f9597912021c3793e64e7539932787 SHA512 88f914d30836f5337e6aa56bed18a4ff37463607e7475c0d78b7d14033d5e9ae9de5076186fb5f4d256cf6b41c69c1712dd3c961f38b2f1349e4b2077731493c
+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
diff --git a/www-servers/varnish/metadata.xml b/www-servers/varnish/metadata.xml
index 271e7eab665a..5046b2337ea0 100644
--- a/www-servers/varnish/metadata.xml
+++ b/www-servers/varnish/metadata.xml
@@ -22,4 +22,7 @@
 	managment and good documentation is also a main goal of the project since the
 	lack of either one will render Varnish useless.
 	</longdescription>
+	<slots>
+		<subslots>Reflect ABI compatibility for libvarnishapi.so.</subslots>
+	</slots>
 </pkgmetadata>
diff --git a/www-servers/varnish/varnish-6.0.0.ebuild b/www-servers/varnish/varnish-6.0.0.ebuild
deleted file mode 100644
index fd1d1a8b7caf..000000000000
--- a/www-servers/varnish/varnish-6.0.0.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=( python{2_7,3_4,3_5,3_6} pypy )
-
-inherit user autotools systemd python-r1
-
-DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
-HOMEPAGE="https://varnish-cache.org/"
-SRC_URI="http://varnish-cache.org/_downloads/${P}.tgz"
-
-LICENSE="BSD-2 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="jemalloc jit static-libs"
-
-CDEPEND="
-	sys-libs/readline:0=
-	dev-libs/libpcre[jit?]
-	jemalloc? ( dev-libs/jemalloc )
-	sys-libs/ncurses:0="
-
-#varnish compiles stuff at run time
-RDEPEND="
-	${PYTHON_DEPS}
-	${CDEPEND}
-	sys-devel/gcc"
-
-DEPEND="
-	${CDEPEND}
-	dev-python/docutils
-	virtual/pkgconfig"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test" #315725
-
-pkg_setup() {
-	ebegin "Creating varnish user and group"
-	enewgroup varnish
-	enewuser varnish -1 -1 /var/lib/varnish varnish
-	eend $?
-}
-
-src_prepare() {
-	# Remove -Werror bug #528354
-	sed -i -e 's/-Werror\([^=]\)/\1/g' configure.ac
-
-	# Upstream doesn't put varnish.m4 in the m4/ directory
-	# We link because the Makefiles look for the file in
-	# the original location
-	ln -sf ../varnish.m4 m4/varnish.m4
-
-	eapply_user
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable jit pcre-jit ) \
-		$(use_with jemalloc)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	python_replicate_script "${D}/usr/share/varnish/vmodtool.py"
-
-	newinitd "${FILESDIR}"/varnishlog.initd varnishlog
-	newconfd "${FILESDIR}"/varnishlog.confd varnishlog
-
-	newinitd "${FILESDIR}"/varnishncsa.initd varnishncsa
-	newconfd "${FILESDIR}"/varnishncsa.confd varnishncsa
-
-	newinitd "${FILESDIR}"/varnishd.initd-r4 varnishd
-	newconfd "${FILESDIR}"/varnishd.confd-r4 varnishd
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/varnishd.logrotate-r2" varnishd
-
-	diropts -m750
-
-	keepdir /var/lib/varnish
-	keepdir /var/log/varnish
-
-	systemd_dounit "${FILESDIR}/${PN}d.service"
-
-	insinto /etc/varnish/
-	doins lib/libvmod_std/vmod.vcc
-	doins etc/example.vcl
-
-	dodoc README.rst
-	dodoc doc/changes.rst
-
-	fowners root:varnish /etc/varnish/
-	fowners varnish:varnish /var/lib/varnish/
-	fperms 0750 /var/lib/varnish/ /etc/varnish/
-}
diff --git a/www-servers/varnish/varnish-6.0.1.ebuild b/www-servers/varnish/varnish-6.0.1.ebuild
index fd1d1a8b7caf..c5595875a13e 100644
--- a/www-servers/varnish/varnish-6.0.1.ebuild
+++ b/www-servers/varnish/varnish-6.0.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 @@ HOMEPAGE="https://varnish-cache.org/"
 SRC_URI="http://varnish-cache.org/_downloads/${P}.tgz"
 
 LICENSE="BSD-2 GPL-2"
-SLOT="0"
+SLOT="0/1"
 KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
 IUSE="jemalloc jit static-libs"
 
diff --git a/www-servers/varnish/varnish-6.1.0.ebuild b/www-servers/varnish/varnish-6.1.0.ebuild
new file mode 100644
index 000000000000..87fca369e166
--- /dev/null
+++ b/www-servers/varnish/varnish-6.1.0.ebuild
@@ -0,0 +1,102 @@
+# 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} pypy )
+
+inherit user autotools systemd python-r1
+
+DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
+HOMEPAGE="https://varnish-cache.org/"
+SRC_URI="http://varnish-cache.org/_downloads/${P}.tgz"
+
+LICENSE="BSD-2 GPL-2"
+SLOT="0/2"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="jemalloc jit static-libs"
+
+CDEPEND="
+	sys-libs/readline:0=
+	dev-libs/libpcre[jit?]
+	jemalloc? ( dev-libs/jemalloc )
+	sys-libs/ncurses:0="
+
+#varnish compiles stuff at run time
+RDEPEND="
+	${PYTHON_DEPS}
+	${CDEPEND}
+	sys-devel/gcc"
+
+DEPEND="
+	${CDEPEND}
+	dev-python/docutils
+	virtual/pkgconfig"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test" #315725
+
+pkg_setup() {
+	ebegin "Creating varnish user and group"
+	enewgroup varnish
+	enewuser varnish -1 -1 /var/lib/varnish varnish
+	eend $?
+}
+
+src_prepare() {
+	# Remove -Werror bug #528354
+	sed -i -e 's/-Werror\([^=]\)/\1/g' configure.ac
+
+	# Upstream doesn't put varnish.m4 in the m4/ directory
+	# We link because the Makefiles look for the file in
+	# the original location
+	ln -sf ../varnish.m4 m4/varnish.m4
+
+	eapply_user
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable jit pcre-jit ) \
+		$(use_with jemalloc)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	python_replicate_script "${D}/usr/share/varnish/vmodtool.py"
+
+	newinitd "${FILESDIR}"/varnishlog.initd varnishlog
+	newconfd "${FILESDIR}"/varnishlog.confd varnishlog
+
+	newinitd "${FILESDIR}"/varnishncsa.initd varnishncsa
+	newconfd "${FILESDIR}"/varnishncsa.confd varnishncsa
+
+	newinitd "${FILESDIR}"/varnishd.initd-r4 varnishd
+	newconfd "${FILESDIR}"/varnishd.confd-r4 varnishd
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/varnishd.logrotate-r2" varnishd
+
+	diropts -m750
+
+	keepdir /var/lib/varnish
+	keepdir /var/log/varnish
+
+	systemd_dounit "${FILESDIR}/${PN}d.service"
+
+	insinto /etc/varnish/
+	doins lib/libvmod_std/vmod.vcc
+	doins etc/example.vcl
+
+	dodoc README.rst
+	dodoc doc/changes.rst
+
+	fowners root:varnish /etc/varnish/
+	fowners varnish:varnish /var/lib/varnish/
+	fperms 0750 /var/lib/varnish/ /etc/varnish/
+}
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index fa6129232eae..ef6d32e4ec3a 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/mesa-progs/Manifest b/x11-apps/mesa-progs/Manifest
index 8c40bec7ce78..c6da0a3800b0 100644
--- a/x11-apps/mesa-progs/Manifest
+++ b/x11-apps/mesa-progs/Manifest
@@ -1,7 +1,7 @@
 AUX mesa-progs-8.2.0-remove-EGL_SCREEN_BIT_MESA.patch 1182 BLAKE2B 38cf9b073cae923cec2797ef8c7b0a5df752ef5ebb11363e5cdd8d23ccef500b1cdd7eee654d48820b78c2e53af1d65d674d2b0b15713f15f6c5f29405b95d15 SHA512 0c2c5bf3b938215ab433e698c253b35a535562ebf8f8be0dc903b4e916224b298d0381e19bae462c75733a078b929173f3074230e1953d5135b7e0721cb5117e
 DIST mesa-demos-8.2.0.tar.bz2 10071635 BLAKE2B 3619738f9aabb8a32e23e96fb3283c1215354f1b45c5c8df315d339b7d3153b0f0042bd0a5e1f45c8ca4c461284a1843615904a6f0d32b108f60c9a043cb99a8 SHA512 590e9fb66e23c0ad526754e9084858eb3e1fa906be55ee6121089325254b970e135e04d53c634cabd13d59c572ea39a4a877bce14b120d73850aafd159a5c8de
 DIST mesa-demos-8.3.0.tar.bz2 10044647 BLAKE2B 66605d2be7a3e1ea30429b29c574d866961e7df6f17479647d8d4a3cb788f52701ee8c6379c208157348a265d0a3eb90b929415073fa03ba6aefc47f8a45e5c8 SHA512 9ba96980306953f7b72745063e75809fb8399bbd5fc58fca96290a8b4e61741bb82fb6171311eddf249ea12face83d7c7b087e6dade6833699a8d220fc752e3f
-EBUILD mesa-progs-8.2.0.ebuild 1786 BLAKE2B 82361bc640f94d04a176c4a0da13abe5d9f335c5fc199b282a9b9be9a4baad9fbb40588891cf329bf72002f8f1486289a540b2444e20b6fb14fc5300e2e5c851 SHA512 6e1f814476e8cc7232361c7e0e1164a2e060dd4dc7cd2acb60b0ef42472ee8e9360ea741795023baaab9708d8821ac13670d3c8f4d9cf7d7af43b5bb0a93cc85
-EBUILD mesa-progs-8.3.0.ebuild 1765 BLAKE2B 68c0105fe8e293a37dfd985fe66f6ffab9fb5f68effc364c9c50ae1059b83ae4f919cca7f01973dc7a7848e139a465b492aa85145c121ed84a52b503437bbac9 SHA512 53ff646fd9e744b5943500861f97fad9dc7ca196b9a3fd1606bfe72d2117ee40e6d2a72a23d34912b3d7ef9a498339943daa23faadd6ad6a3013fa2dafec78ac
+EBUILD mesa-progs-8.2.0.ebuild 1771 BLAKE2B 3a7f9b806bd7498b1d6e50dd4dacb5a24a75069a7357c5784d107da255df7cd65df4425bd9ce15a29dba87d81b0cb8b884c38a7d8c11aaffe1f1ae52d1c91f81 SHA512 406da0678a7da32b5ad7e2b51dd2de696b72726232ec2043adf1d9b511e2ba0df445b817fa7977ac5c06fc9803ae3bf1ee144690bd2c672314dc128d410bb0f8
+EBUILD mesa-progs-8.3.0.ebuild 1764 BLAKE2B 499172094f77efa68f4d250d9d8cac989f139d948979d88960dcaf878244765ff6d97edc0a395ef9cc80ba3eb702be1a0f0253ada146a52ee7f9541a56b4bcc4 SHA512 b72ae02172f62526e0b3340fb37c84f5863202b17827284bdb0854029dc32c9302ba0160ddd2db85675a33dc9390993a19a32c92fa930a17d6620d2a8a569ddf
 EBUILD mesa-progs-9999.ebuild 1729 BLAKE2B 9c5a305aaee1d42fa12f078e2e262d7f75140f4a30d2566ec0c1899dbbcde4828b5f684619666839260a913b7739017bfb92e631e71e8cae6d5042d5065cc267 SHA512 784a05d1eb56e042e9fbbcd951455816b18b24afc4f599fdf80eb67ab751c96740382fb2cabecc9a14b086fc94c0ba4d01d9b63df6e0c78b43118ef4e1d9ed4e
 MISC metadata.xml 475 BLAKE2B 4275e3d7871f0b092559ddf5c898bad781441267b093d55bdb14d7e9795ac070aa7d9a87cf7248d58b75798eb28a4413d588492bb6ab092ef79373434fb1652e SHA512 624480e9601ad6ad1cb996b25074c3e47a539113af39633de80c9eb0330322453f545ecfede9d602de7259d66047f507bf3a1cb115becb5f5e7d0613cb5bc675
diff --git a/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild
index aa6ffbd8f9a2..ea5356de6cb9 100644
--- a/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-8.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=5
@@ -18,10 +18,9 @@ DESCRIPTION="Mesa's OpenGL utility and demo programs (glxgears and glxinfo)"
 HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
 if [[ ${PV} == 9999* ]]; then
 	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/demos/${PV}/${MY_P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2"
diff --git a/x11-apps/mesa-progs/mesa-progs-8.3.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.3.0.ebuild
index 07729580b329..3888f77a8927 100644
--- a/x11-apps/mesa-progs/mesa-progs-8.3.0.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-8.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=5
@@ -18,10 +18,10 @@ DESCRIPTION="Mesa's OpenGL utility and demo programs (glxgears and glxinfo)"
 HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
 if [[ ${PV} == 9999* ]]; then
 	SRC_URI=""
-	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
+	KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86"
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/demos/${PV}/${MY_P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2"
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index b02147e23677..356de0a04a21 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 6187576ec29b..ee3ffc37f2f0 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -5,13 +5,10 @@ AUX xorg-server-1.12-unloadsubmodule.patch 1373 BLAKE2B 4c6017bcdc53964ecc796e1b
 AUX xorg-server-1.18-support-multiple-Files-sections.patch 1902 BLAKE2B 69ba852b425d652ebb83d116cabbf92d1530d2c616910ddbb96fb574cdad8d3f1ce2b4fcf9fb16aa2950b40a0723c9d00465d8e6d72299f1ea181a257d014c80 SHA512 5cd0a4ce9c2efef7abc84df805a3c6da33bd64fdb16c3aa2fa61da4f805605a3d12cab0f452d3bc217b6e5d5d5bea29c9f3bf262e46347a074770ebd75ddf5b5
 AUX xorg-server-1.19.4-sysmacros.patch 986 BLAKE2B 04c111591a6a558913217b24aa2357478e7d931b6cee5185dda31ebd38d68463b4a158a18d8a60ffa7ccc5c65e246f261ebbf7c0ebc81fd3ae31e7579b7adab4 SHA512 858676058779363741901ffbf79666f723f917b49f8627ddd2f31768873adfb416a70bc298e2356861cb5abca8be54a6c64f8fa4fd11a91cce072b93857ad168
 AUX xorg-server-1.19.5-glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch 1555 BLAKE2B ef0a52b2341939f254bdce6b705f0591d0888c8043e5c0da1c4c4e97cdac632c56b27392ac2d7ac63653c7dfe1d381edd619a5e0c1c78f3bf255348c99c30f24 SHA512 66cd27608019557029f15aa81cf1a067e124ec0f854af9e732fef8b12bade4f1797481c86de2437b63ec5364fbeb1e3e05a39aa08df71ad08df79cd7d244e280
-AUX xorg-server-1.20.0-xfree86-Inline-xf86-Read-Write-Mmio-8-16-32-on-alpha.patch 8053 BLAKE2B a6acfbdddc8a4114856ed8bfb7cf215f47e5c3ca9c58d539b9e5affb760cab7c61979e2252d2aba4fc138ac29078b8aa03fe83539aca54044b19b828c88ac472 SHA512 ad46621216f9a8c2b4ac044e02bac528df8696ee203d32310ac6665a519d36c98936f2f1c3598afc269e95ecf68e256f62faba9ab087abbe50aed2faff9d458a
 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.0.tar.bz2 6096838 BLAKE2B 34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046 SHA512 1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde
 DIST xorg-server-1.20.1.tar.bz2 6103772 BLAKE2B ac71d603cef8efe814275b658d4a76e231eb0fda14dd6e7177509bf147feaf37657789d8fc83f8017435c84760d7be357f203a8346aac612a53083cf413f7d75 SHA512 ef2b93a61683c8ca8d1f14b771e70db65ba119a73db8a46e7cdbf2ac2243e3f4b2732068eb5aa5d7b76f460db995a3c04390870198a5210ec30df4360ad9f94b
 EBUILD xorg-server-1.19.5-r2.ebuild 5766 BLAKE2B 87a961606f85b4c83d9eaebc9cac3ab8d650bf27a204a74f847459996c6cd51c28b94f5ee91bcee549e06a07aa260bf132609a60be733ddc5b51759d111aef4b SHA512 d63b8c99b046240476c93559fb9b672f0214db117c82e05130413b1751e57a43babdc366c7ec9ff0d9db9d08a3b1aa7493da7a6e3e9a73d531722374067b6dd6
-EBUILD xorg-server-1.20.0.ebuild 5615 BLAKE2B ddb0154b4300b05d404dc349351a25d92b2cf5e6c967b2c9df8532489cf76790609619e29dde927a4f6a0db34c4154c194a151622e6ed429ced8b61a733aa0a5 SHA512 7c3f57a4404ca97ad26a607e8446b36ed69fb69eb3e65a80f0146b326fdb3b50e1c5514e8ce49b600b402032d915e58fba762f4b6a454c6789ee02b93c394ef2
 EBUILD xorg-server-1.20.1.ebuild 5522 BLAKE2B 7b66829d822ddff06e190d566871b7a9d915ae093264be4fd25ae5a4fd786f93394dee8e91132aef4b3faae88280e8cbd5786fd6efd658dadeeaa9c7a7fa8041 SHA512 e8a8fb57d5f527786cd6567d9f26f88de0bee3706e7da9a1c59f7d9fd4753db4ebb998288b7d3b663fc0f9869f8992db6615d3371c933f4a1b8f97913b348c4e
 EBUILD xorg-server-9999.ebuild 5527 BLAKE2B ec541ef3827abbdd2a7408df5f00b37692989f3225fd8fbe187bbdc5719a24aae8f6fec8537baffbb32ee3f394d4ce99540985a846109405297a27cdb70abc1d SHA512 011350ca9a119d266bb0a87e05b61c2c64344db1505aae3ed157d0815bf5559dad0cab0fecc6870c9fa58d3d39c93fde8b080345b75a5fec96b1b2992b59ab80
 MISC metadata.xml 934 BLAKE2B ffffcceb822cadfd48ff18063acd7adfeba6b651099c91f14159b2af4486b1475578da54865d99ef0acc78e34bfc3b1e7e6bca1d179ab7f151417c53c1a05a35 SHA512 97fffbdf402a70c9cb84062ac6c906b8a9d35ceebbe35b28547387e4a9e2706c595f842f64bee92925415bd49593f3a3b0213072ff2c0ab22209dc37e243d4ac
diff --git a/x11-base/xorg-server/files/xorg-server-1.20.0-xfree86-Inline-xf86-Read-Write-Mmio-8-16-32-on-alpha.patch b/x11-base/xorg-server/files/xorg-server-1.20.0-xfree86-Inline-xf86-Read-Write-Mmio-8-16-32-on-alpha.patch
deleted file mode 100644
index ebf677ae9c40..000000000000
--- a/x11-base/xorg-server/files/xorg-server-1.20.0-xfree86-Inline-xf86-Read-Write-Mmio-8-16-32-on-alpha.patch
+++ /dev/null
@@ -1,224 +0,0 @@
-From eecedfffd40f0465d85347f14547ddc6b30e57df Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Tue, 22 May 2018 21:10:55 -0700
-Subject: [PATCH xserver] xfree86: Inline xf86{Read,Write}Mmio{8,16,32} on
- alpha
-
-In commit 9db2af6f757e (xfree86: Remove xf86{Map,Unmap}VidMem) we
-somehow stopped exporting xf86{Read,Write}Mmio{8,16,32}. Since the
-function pointer indirection was intended to support dense vs sparse and
-sparse support is now gone, we can just make the functions static inline
-in compiler.h and avoid all of this.
-
-Bugzilla: https://bugs.gentoo.org/548906
-Tested-by: Christopher May-Townsend <chris@maytownsend.co.uk>
-Reviewed-by: Adam Jackson <ajax@redhat.com>
-Signed-off-by: Matt Turner <mattst88@gmail.com>
----
- configure.ac                            |  4 --
- hw/xfree86/common/compiler.h            | 67 ++++++++++++++++++++++++---------
- hw/xfree86/os-support/bsd/Makefile.am   |  3 +-
- hw/xfree86/os-support/linux/Makefile.am | 12 ------
- hw/xfree86/os-support/linux/lnx_video.c | 27 -------------
- hw/xfree86/os-support/meson.build       |  1 -
- 6 files changed, 50 insertions(+), 64 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index ddc47faa2..0075b6ace 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1908,9 +1908,6 @@ if test "x$XORG" = xyes; then
- 		XORG_OS_SUBDIR="linux"
- 		linux_acpi="no"
- 		case $host_cpu in
--		  alpha*)
--		  	linux_alpha=yes
--			;;
- 		  i*86|amd64*|x86_64*|ia64*)
- 			linux_acpi=$enable_linux_acpi
- 			;;
-@@ -2075,7 +2072,6 @@ AM_CONDITIONAL([XORG], [test "x$XORG" = xyes])
- AM_CONDITIONAL([XORG_BUS_PCI], [test "x$PCI" = xyes])
- AM_CONDITIONAL([XORG_BUS_BSDPCI], [test "x$xorg_bus_bsdpci" = xyes])
- AM_CONDITIONAL([XORG_BUS_SPARC], [test "x$xorg_bus_sparc" = xyes])
--AM_CONDITIONAL([LINUX_ALPHA], [test "x$linux_alpha" = xyes])
- AM_CONDITIONAL([LNXACPI], [test "x$linux_acpi" = xyes])
- AM_CONDITIONAL([LNXAPM], [test "x$linux_apm" = xyes])
- AM_CONDITIONAL([SOLARIS_VT], [test "x$solaris_vt" = xyes])
-diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
-index eea29dfb5..7144c6a27 100644
---- a/hw/xfree86/common/compiler.h
-+++ b/hw/xfree86/common/compiler.h
-@@ -986,33 +986,64 @@ inl(unsigned PORT_SIZE port)
- #endif
- 
- #ifdef __alpha__
--/* entry points for Mmio memory access routines */
--extern _X_EXPORT int (*xf86ReadMmio8) (void *, unsigned long);
--extern _X_EXPORT int (*xf86ReadMmio16) (void *, unsigned long);
--extern _X_EXPORT int (*xf86ReadMmio32) (void *, unsigned long);
--extern _X_EXPORT void (*xf86WriteMmio8) (int, void *, unsigned long);
--extern _X_EXPORT void (*xf86WriteMmio16) (int, void *, unsigned long);
--extern _X_EXPORT void (*xf86WriteMmio32) (int, void *, unsigned long);
-+static inline int
-+xf86ReadMmio8(void *Base, unsigned long Offset)
-+{
-+    mem_barrier();
-+    return *(CARD8 *) ((unsigned long) Base + (Offset));
-+}
-+
-+static inline int
-+xf86ReadMmio16(void *Base, unsigned long Offset)
-+{
-+    mem_barrier();
-+    return *(CARD16 *) ((unsigned long) Base + (Offset));
-+}
-+
-+static inline int
-+xf86ReadMmio32(void *Base, unsigned long Offset)
-+{
-+    mem_barrier();
-+    return *(CARD32 *) ((unsigned long) Base + (Offset));
-+}
-+
-+static inline void
-+xf86WriteMmio8(int Value, void *Base, unsigned long Offset)
-+{
-+    write_mem_barrier();
-+    *(CARD8 *) ((unsigned long) Base + (Offset)) = Value;
-+}
-+
-+static inline void
-+xf86WriteMmio16(int Value, void *Base, unsigned long Offset)
-+{
-+    write_mem_barrier();
-+    *(CARD16 *) ((unsigned long) Base + (Offset)) = Value;
-+}
-+
-+static inline void
-+xf86WriteMmio32(int Value, void *Base, unsigned long Offset)
-+{
-+    write_mem_barrier();
-+    *(CARD32 *) ((unsigned long) Base + (Offset)) = Value;
-+}
-+
- extern _X_EXPORT void xf86SlowBCopyFromBus(unsigned char *, unsigned char *,
-                                            int);
- extern _X_EXPORT void xf86SlowBCopyToBus(unsigned char *, unsigned char *, int);
- 
- /* Some macros to hide the system dependencies for MMIO accesses */
- /* Changed to kill noise generated by gcc's -Wcast-align */
--#define MMIO_IN8(base, offset) (*xf86ReadMmio8)(base, offset)
--#define MMIO_IN16(base, offset) (*xf86ReadMmio16)(base, offset)
--#define MMIO_IN32(base, offset) (*xf86ReadMmio32)(base, offset)
--
--#define MMIO_OUT32(base, offset, val) \
--    do { \
--	write_mem_barrier(); \
--	*(volatile CARD32 *)(void *)(((CARD8*)(base)) + (offset)) = (val); \
--    } while (0)
-+#define MMIO_IN8(base, offset) xf86ReadMmio8(base, offset)
-+#define MMIO_IN16(base, offset) xf86ReadMmio16(base, offset)
-+#define MMIO_IN32(base, offset) xf86ReadMmio32(base, offset)
- 
- #define MMIO_OUT8(base, offset, val) \
--    (*xf86WriteMmio8)((CARD8)(val), base, offset)
-+    xf86WriteMmio8((CARD8)(val), base, offset)
- #define MMIO_OUT16(base, offset, val) \
--    (*xf86WriteMmio16)((CARD16)(val), base, offset)
-+    xf86WriteMmio16((CARD16)(val), base, offset)
-+#define MMIO_OUT32(base, offset, val) \
-+    xf86WriteMmio32((CARD32)(val), base, offset)
- 
- #elif defined(__powerpc__) || defined(__sparc__)
-  /*
-diff --git a/hw/xfree86/os-support/bsd/Makefile.am b/hw/xfree86/os-support/bsd/Makefile.am
-index b01ea5bca..66ac83805 100644
---- a/hw/xfree86/os-support/bsd/Makefile.am
-+++ b/hw/xfree86/os-support/bsd/Makefile.am
-@@ -26,8 +26,7 @@ endif
- if ALPHA_VIDEO
- # Cheat here and piggyback other alpha bits on ALPHA_VIDEO.
- ARCH_SOURCES = \
--	alpha_video.c \
--	bsd_ev56.c
-+	alpha_video.c
- endif
- 
- if ARM_VIDEO
-diff --git a/hw/xfree86/os-support/linux/Makefile.am b/hw/xfree86/os-support/linux/Makefile.am
-index 26e40bb93..9b4535b53 100644
---- a/hw/xfree86/os-support/linux/Makefile.am
-+++ b/hw/xfree86/os-support/linux/Makefile.am
-@@ -1,13 +1,5 @@
- noinst_LTLIBRARIES = liblinux.la
- 
--if LINUX_ALPHA
--noinst_LTLIBRARIES += liblinuxev56.la
--
--liblinuxev56_la_CFLAGS = $(AM_CFLAGS) -mcpu=ev56
--
--liblinuxev56_la_SOURCES = lnx_ev56.c
--endif
--
- if LNXACPI
- ACPI_SRCS = lnx_acpi.c
- if !LNXAPM
-@@ -39,7 +31,3 @@ liblinux_la_SOURCES = linux.h lnx_init.c lnx_video.c \
- AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES)
- 
- AM_CPPFLAGS = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS)
--
--if LINUX_ALPHA
--liblinux_la_LIBADD = liblinuxev56.la
--endif
-diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c
-index c09d71947..04e45092a 100644
---- a/hw/xfree86/os-support/linux/lnx_video.c
-+++ b/hw/xfree86/os-support/linux/lnx_video.c
-@@ -166,30 +166,3 @@ xf86DisableIO(void)
- 
-     ExtendedEnabled = FALSE;
- }
--
--#if defined (__alpha__)
--
--extern int readDense8(void *Base, register unsigned long Offset);
--extern int readDense16(void *Base, register unsigned long Offset);
--extern int readDense32(void *Base, register unsigned long Offset);
--extern void
-- writeDense8(int Value, void *Base, register unsigned long Offset);
--extern void
-- writeDense16(int Value, void *Base, register unsigned long Offset);
--extern void
-- writeDense32(int Value, void *Base, register unsigned long Offset);
--
--void (*xf86WriteMmio8) (int Value, void *Base, unsigned long Offset)
--    = writeDense8;
--void (*xf86WriteMmio16) (int Value, void *Base, unsigned long Offset)
--    = writeDense16;
--void (*xf86WriteMmio32) (int Value, void *Base, unsigned long Offset)
--    = writeDense32;
--int (*xf86ReadMmio8) (void *Base, unsigned long Offset)
--    = readDense8;
--int (*xf86ReadMmio16) (void *Base, unsigned long Offset)
--    = readDense16;
--int (*xf86ReadMmio32) (void *Base, unsigned long Offset)
--    = readDense32;
--
--#endif                          /* __alpha__ */
-diff --git a/hw/xfree86/os-support/meson.build b/hw/xfree86/os-support/meson.build
-index 901422786..b6e5c975d 100644
---- a/hw/xfree86/os-support/meson.build
-+++ b/hw/xfree86/os-support/meson.build
-@@ -100,7 +100,6 @@ elif host_machine.system().endswith('bsd')
-         srcs_xorg_os_support += 'shared/ioperm_noop.c'
-     elif host_machine.cpu_family() == 'alpha'
-         srcs_xorg_os_support += 'bsd/alpha_video.c'
--        srcs_xorg_os_support += 'bsd/bsd_ev56.c'
-     endif
- 
-     if host_machine.system() == 'freebsd'
--- 
-2.16.1
-
diff --git a/x11-base/xorg-server/xorg-server-1.20.0.ebuild b/x11-base/xorg-server/xorg-server-1.20.0.ebuild
deleted file mode 100644
index ec715ede7a29..000000000000
--- a/x11-base/xorg-server/xorg-server-1.20.0.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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-10.3.4-r1[egl,gbm]
-		!x11-libs/glamor
-	)
-	kdrive? (
-		>=x11-libs/libXext-1.0.5
-		x11-libs/libXv
-	)
-	xephyr? (
-		x11-libs/libxcb[xkb]
-		x11-libs/xcb-util
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-keysyms
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-	)
-	!minimal? (
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXext-1.0.5
-		>=media-libs/mesa-10.3.4-r1
-	)
-	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=(
-	"${FILESDIR}"/${P}-xfree86-Inline-xf86-Read-Write-Mmio-8-16-32-on-alpha.patch
-)
-
-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 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-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 686b87a90f41..35652f61cefe 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 28dc9cd70b48..74af6f5dd1aa 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -76,7 +76,7 @@ EBUILD nvidia-drivers-378.13-r1.ebuild 15877 BLAKE2B 91ea0f5d3bf4c9a21ebd082456f
 EBUILD nvidia-drivers-381.22-r1.ebuild 15903 BLAKE2B 5801973844001f824db6e85d379a8567b879d6ff82ade650142049ee993952d17750ce4ff473ded81695e4ffa59b6ac71c9cabe7cd8c20b1e5e4976eeaa3981d SHA512 8c08570ac6487367948ff166e26a2ce9f1ff8d8f808fff6c0cba2780886f69de538e09699ec05974e98b99137dd3eb68ba47b6a875a356d09453ad61a25c9d3d
 EBUILD nvidia-drivers-384.130.ebuild 16122 BLAKE2B 24a59ab053d40caa6bace34cf34c4db8917a84b0e87efb463a9651d2d152dc497e8170421574a6be9b482a4af622c2e876c342921350ddf860d4c739fb87e15e SHA512 0820948df0d87a780bf9b281f89ac6413b259239ca1d476908e77aac60552171417a0a83d4233ba162dd72b7bb0ebe584a0e534308023eedb0855bba72606992
 EBUILD nvidia-drivers-387.34.ebuild 16295 BLAKE2B 0e6e77ed5654425bf03e358d5d8c539dd302d8ea1566f2ccd0604818dae31825127779a1bc735b28ab994db0e947afa32985f145c793bfc5a4f00b4bfafeb484 SHA512 15e1fc883e77bebf8e4642dbb3575f2a5f016083624491bd3b4b047d6fd02d5cc4c6987529819f19dbfc3dd741bcf73dc1a6143c7ea5fd64aa8429aefc97b8cb
-EBUILD nvidia-drivers-390.87.ebuild 16291 BLAKE2B 7a3748763d42bc2f51b7410b89a0309ec865d5d61b73ce74d51e2c05201ec6072e1494b1e1be4fcc7124e61416a5bfab2639c860b1b55a49101746544d29fda3 SHA512 a1e483782e37a18cc3476c4027fc549a5f02e325a2ae8d263e0670915ddc793c9986ff46b05f9dc0900135d034d8316165b3ed7f143b38f6f460a13ba403e553
+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.ebuild 15957 BLAKE2B 492255eadcb07aaf98bee00cc432c90b5642d13cc917c0aa6cb53429ef3e4473d6f760d1eafdf77293496ab8e620adafde9909aaf54d0926a83ff7cdf79baa4f SHA512 e1a3b61e078bb218f94f7a8440b41553024f6d45a6248ce4ad50f4f5d201b378361fef59b340b6ddefd08619ab7b807984b3be6894c5d6026081a1aeb96d5255
+EBUILD nvidia-drivers-410.57-r1.ebuild 16174 BLAKE2B a1557248b2f07b4a9025ed05f31fb59a96f2ab89209cc8267ef381da6e2fdb47746b3fdec46f00d10e6dc3fd40bbeb1472dd4efb1aea957108a8447ad2c79ea8 SHA512 5de509e3548bc0874079cbe8214639295f575bae473408019fe898e06b18412fc309496df3e4c205644bd97485a90c9ca825f665246c6f87a12bbf6dcf8d6ab3
 MISC metadata.xml 1275 BLAKE2B df5cb10ac396802437bf6efb3e80226124c11d6167bef2b64c3e525c17fb27213b13d7413ef909469440804a373b6e5c7088c53e0a6b44897860b7276ac3de6b SHA512 464ba5638a5d82a6e6bcbfe11b52759846f9f81e3f223cc313e0059b923427f21dab95b84595d6bffad4441fec96fe5f01044be572b72add8196a812f5682edb
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.87.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.87.ebuild
index b5342ac68dda..ebae1a078369 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.87.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.87.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -91,11 +91,11 @@ nvidia_drivers_versions_check() {
 		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
 	fi
 
-	if use kernel_linux && kernel_is ge 4 18; then
+	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.18"
-		ewarn "<sys-kernel/vanilla-sources-4.18"
+		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"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-410.57-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-410.57-r1.ebuild
new file mode 100644
index 000000000000..530a5814ec31
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-410.57-r1.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/nvidia-drivers/nvidia-drivers-410.57.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-410.57.ebuild
deleted file mode 100644
index 76fd7d20ca90..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-410.57.ebuild
+++ /dev/null
@@ -1,581 +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 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
-
-		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-tslib/Manifest b/x11-drivers/xf86-input-tslib/Manifest
index 388cf2e9fdee..810bea3c3a2e 100644
--- a/x11-drivers/xf86-input-tslib/Manifest
+++ b/x11-drivers/xf86-input-tslib/Manifest
@@ -1,6 +1,3 @@
-AUX fix-overlapped-variable.patch 485 BLAKE2B e7fd7e023965a2a193f6fa4d1f428ca30d8f561c42bfb806f56c6b6ebda44025a7979f611939e4d4ea7fa980ef5806cdbc904dc8c1eba80f90b4bf5906de207b SHA512 1230565723b1afaa0b63e1c0f5f9c3a010d20bebee57e5ec26b5875688b7dd78a4d71a63f8187b98434f9bd529dcf80af78fe7df5237aa79c5065119461e5036
-AUX xf86-input-tslib-0.0.6-xf86XInputSetScreen.patch 782 BLAKE2B 71c706b4d4e01a9257b56e1c0d2245e78c2e1fcea34146312ad6d57b48d3e4196e14b36143677c69ae2fe7dd158b27a11337d594e222ac8cdd40b6c40f58e494 SHA512 264c921d12591795e8b04c22a7f3b85e63605b3bbc2aaab8418b61ac6ebeb3683bf4e357dddea6c73d416d233bc4d1249f3af17011cc542880772a885c7f4d28
-AUX xf86-input-tslib-port-ABI-12-r48.patch 5306 BLAKE2B e5421a0cf4f0fd645d61777eb7cadf444dd04989eede04b7766453940b65d3a319ec72f57838be14f106215b6aaf5aebd7af73b28dc02b2cad7fcb8e014eb4d0 SHA512 9cdd4c47e8efa3560dd0b508422322f0f4185f4359d98cd7d5c06394bdf096de23e42c5af9f682c457d44831091823867233ced8c6329d2776cf3b5b6bd1ba34
 DIST xf86-input-tslib-1.2.0_rc1.tar.gz 12029 BLAKE2B 28841961882af8285d12830c5774eb86b0c4a3ed515394d493d384933209020e6593680a087c9d70a6e7b351e6556bf73246e3deff4eee7ab52d57f89ecc8f7c SHA512 6ab358470b01c5c29e8004624c5a0ac9e9737bf7ccc946a08606a2d5fe36657af7c062cf8a8fe98f692f9f352a3bc7aa90592faa43647fc133ac22ecb52d4805
 EBUILD xf86-input-tslib-1.2.0_rc1.ebuild 656 BLAKE2B 9d622f63db1a30f7a66322cfbc684162821be2afef1c4a27cc8c7098f53222d646da7c2369b8dd9ab8a524ff4aa546890713224a7e64430ff546a27a9e4d426f SHA512 ef8bc987de09cee3c10ab0cf6d4b7c8698e7db363ea1ec7d94e984427b6367692b5568a004b138b8298e2aef61c4b5a8d64848175edac0e6f2c60beb005017d2
 MISC metadata.xml 338 BLAKE2B 3f7f7614c07d92a52a1499634820de2891cf891fd2c86230b69a99b83afae1af395ed8eaabd32b4b17b19b3ffcfd717ea6e7963beb18dfca0ae3db77269eeb87 SHA512 cf7eafaffce2e1064714ac53d374fcb81a4a77cf7a3b9826c595b0b40a01a54b0280ecf4c824b8741b09893d770e80495084ede42281242959f283b5c0d51d2c
diff --git a/x11-drivers/xf86-input-tslib/files/fix-overlapped-variable.patch b/x11-drivers/xf86-input-tslib/files/fix-overlapped-variable.patch
deleted file mode 100644
index 7a4363e97277..000000000000
--- a/x11-drivers/xf86-input-tslib/files/fix-overlapped-variable.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/tslib.c.orig	2010-05-19 19:01:01.000000000 +0200
-+++ src/tslib.c	2010-05-19 19:02:00.000000000 +0200
-@@ -543,7 +543,7 @@
- 	return (pInfo);
- }
- 
--_X_EXPORT InputDriverRec TSLIB = {
-+_X_EXPORT InputDriverRec TSLIB_DRIVER = {
- 	1,			/* driver version */
- 	"tslib",		/* driver name */
- 	NULL,			/* identify */
-@@ -580,7 +580,7 @@
- {
- 	static Bool Initialised = FALSE;
- 
--	xf86AddInputDriver(&TSLIB, module, 0);
-+	xf86AddInputDriver(&TSLIB_DRIVER, module, 0);
- 
- 	return module;
- }
diff --git a/x11-drivers/xf86-input-tslib/files/xf86-input-tslib-0.0.6-xf86XInputSetScreen.patch b/x11-drivers/xf86-input-tslib/files/xf86-input-tslib-0.0.6-xf86XInputSetScreen.patch
deleted file mode 100644
index d3738bfecb96..000000000000
--- a/x11-drivers/xf86-input-tslib/files/xf86-input-tslib-0.0.6-xf86XInputSetScreen.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ur xf86-input-tslib-0.0.6.orig/src/tslib.c xf86-input-tslib-0.0.6/src/tslib.c
---- xf86-input-tslib-0.0.6.orig/src/tslib.c	2012-12-05 01:12:16.286597071 +0100
-+++ xf86-input-tslib-0.0.6/src/tslib.c	2012-12-05 01:11:02.686598595 +0100
-@@ -75,6 +75,19 @@
- #define COLLECT_INPUT_OPTIONS(pInfo, options) xf86CollectInputOptions((pInfo), (options))
- #endif
- 
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) > 13
-+static void
-+xf86XInputSetScreen(InputInfoPtr	pInfo,
-+		    int			screen_number,
-+		    int			x,
-+		    int			y)
-+{
-+    if (miPointerGetScreen(pInfo->dev) !=
-+          screenInfo.screens[screen_number]) {
-+	miPointerSetScreen(pInfo->dev, screen_number, x, y);
-+    }
-+}
-+#endif
- 
- enum { TSLIB_ROTATE_NONE=0, TSLIB_ROTATE_CW=270, TSLIB_ROTATE_UD=180, TSLIB_ROTATE_CCW=90 };
- 
diff --git a/x11-drivers/xf86-input-tslib/files/xf86-input-tslib-port-ABI-12-r48.patch b/x11-drivers/xf86-input-tslib/files/xf86-input-tslib-port-ABI-12-r48.patch
deleted file mode 100644
index a4288fdc1350..000000000000
--- a/x11-drivers/xf86-input-tslib/files/xf86-input-tslib-port-ABI-12-r48.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-Index: xf86-input-tslib-trunk/src/tslib.c
-===================================================================
---- xf86-input-tslib-trunk/src/tslib.c	(revision 48)
-+++ xf86-input-tslib-trunk/src/tslib.c	(working copy)
-@@ -69,6 +69,13 @@
- #define DEFAULT_HEIGHT		240
- #define DEFAULT_WIDTH		320
- 
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
-+#define COLLECT_INPUT_OPTIONS(pInfo, options) xf86CollectInputOptions((pInfo), (options), NULL)
-+#else
-+#define COLLECT_INPUT_OPTIONS(pInfo, options) xf86CollectInputOptions((pInfo), (options))
-+#endif
-+
-+
- enum { TSLIB_ROTATE_NONE=0, TSLIB_ROTATE_CW=270, TSLIB_ROTATE_UD=180, TSLIB_ROTATE_CCW=90 };
- 
- enum button_state { BUTTON_NOT_PRESSED = 0, BUTTON_1_PRESSED = 1, BUTTON_3_CLICK = 3, BUTTON_3_CLICKED=4, BUTTON_EMULATION_OFF=-1 };
-@@ -106,7 +113,7 @@
- }
- 
- static Bool
--ConvertProc( LocalDevicePtr local,
-+ConvertProc( InputInfoPtr local,
- 			 int first,
- 			 int num,
- 			 int v0,
-@@ -135,7 +142,7 @@
-     return t;
- }
- 
--static void ReadInput (LocalDevicePtr local)
-+static void ReadInput (InputInfoPtr local)
- {
- 	struct ts_priv *priv = (struct ts_priv *) (local->private);
- 	struct ts_sample samp;
-@@ -382,7 +389,11 @@
- 					       axiswidth - 1,	/* max val */
- 					       axiswidth,	/* resolution */
- 					       0,		/* min_res */
--					       axiswidth);	/* max_res */
-+					       axiswidth	/* max_res */
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
-+					       ,Absolute
-+#endif
-+					       );
- 
- 		InitValuatorAxisStruct(device, 1,
- #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
-@@ -392,7 +403,11 @@
- 					       axisheight - 1,	/* max val */
- 					       axisheight,	/* resolution */
- 					       0,		/* min_res */
--					       axisheight);	/* max_res */
-+					       axisheight	/* max_res */
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
-+					       ,Absolute
-+#endif
-+					       );
- 
- 		if (InitProximityClassDeviceStruct (device) == FALSE) {
- 			ErrorF ("Unable to allocate EVTouch touchscreen ProximityClassDeviceStruct\n");
-@@ -434,7 +449,7 @@
- 	ErrorF("%s\n", __FUNCTION__);
- 	xf86TslibControlProc(pInfo->dev, DEVICE_OFF);
- 	ts_close(priv->ts);
--	xfree(pInfo->private);
-+	free(pInfo->private);
- 	pInfo->private = NULL;
- 	xf86DeleteInput(pInfo, 0);
- }
-@@ -444,47 +459,57 @@
-  *
-  * called when the module subsection is found in XF86Config
-  */
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
-+static int 
-+xf86TslibInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
-+#else
- static InputInfoPtr
- xf86TslibInit(InputDriverPtr drv, IDevPtr dev, int flags)
-+#endif
- {
- 	struct ts_priv *priv;
- 	char *s;
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
- 	InputInfoPtr pInfo;
-+#endif
- 
--	priv = xcalloc (1, sizeof (struct ts_priv));
-+	priv = calloc (1, sizeof (struct ts_priv));
-         if (!priv)
--                return NULL;
-+                return BadValue;
- 
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
- 	if (!(pInfo = xf86AllocateInput(drv, 0))) {
--		xfree(priv);
--		return NULL;
-+		free(priv);
-+		return BadValue;
- 	}
- 
- 	/* Initialise the InputInfoRec. */
- 	pInfo->name = dev->identifier;
--	pInfo->type_name = XI_TOUCHSCREEN;
- 	pInfo->flags =
- 	    XI86_KEYBOARD_CAPABLE | XI86_POINTER_CAPABLE |
- 	    XI86_SEND_DRAG_EVENTS;
--	pInfo->device_control = xf86TslibControlProc;
--	pInfo->read_input = ReadInput;
- #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
- 	pInfo->motion_history_proc = xf86GetMotionEvents;
- 	pInfo->history_size = 0;
- #endif
--	pInfo->control_proc = NULL;
-+	pInfo->conf_idev = dev;
- 	pInfo->close_proc = NULL;
--	pInfo->switch_mode = NULL;
- 	pInfo->conversion_proc = ConvertProc;
- 	pInfo->reverse_conversion_proc = NULL;
--	pInfo->dev = NULL;
- 	pInfo->private_flags = 0;
- 	pInfo->always_core_feedback = 0;
--	pInfo->conf_idev = dev;
-+#endif
-+
-+	pInfo->type_name = XI_TOUCHSCREEN;
-+	pInfo->control_proc = NULL;
-+	pInfo->read_input = ReadInput;
-+	pInfo->device_control = xf86TslibControlProc;
-+	pInfo->switch_mode = NULL;
- 	pInfo->private = priv;
-+	pInfo->dev = NULL;
- 
- 	/* Collect the options, and process the common options. */
--	xf86CollectInputOptions(pInfo, NULL, NULL);
-+	COLLECT_INPUT_OPTIONS(pInfo, NULL);
- 	xf86ProcessCommonOptions(pInfo, pInfo->options);
- 
- 	priv->screen_num = xf86SetIntOption(pInfo->options, "ScreenNumber", 0 );
-@@ -510,23 +535,31 @@
- 		priv->rotate = TSLIB_ROTATE_NONE;
- 	}
- 
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
-  	s = xf86CheckStrOption(dev->commonOptions, "path", NULL);
-+#else
-+	s = xf86CheckStrOption(pInfo->options, "path", NULL);
-+#endif
-   	if (!s)
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
- 		s = xf86CheckStrOption(dev->commonOptions, "Device", NULL);
-+#else
-+		s = xf86CheckStrOption(pInfo->options, "Device", NULL);
-+#endif
-  
- 	priv->ts = ts_open(s, 1);
--	xfree(s);
-+	free(s);
- 
- 	if (!priv->ts) {
- 		ErrorF("ts_open failed (device=%s)\n",s);
- 		xf86DeleteInput(pInfo, 0);
--		return NULL;
-+		return BadValue;
- 	}
- 
- 	if (ts_config(priv->ts)) {
- 		ErrorF("ts_config failed\n");
- 		xf86DeleteInput(pInfo, 0);
--		return NULL;
-+		return BadValue;
- 	}
- 
- 	pInfo->fd = ts_fd(priv->ts);
-@@ -536,11 +569,13 @@
- 		priv->state = BUTTON_EMULATION_OFF;
- 	}
- 
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
- 	/* Mark the device configured */
- 	pInfo->flags |= XI86_CONFIGURED;
-+#endif
- 
- 	/* Return the configured device */
--	return (pInfo);
-+	return Success;
- }
- 
- _X_EXPORT InputDriverRec TSLIB = {
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 1590922530f9..946b69277c84 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/agg/Manifest b/x11-libs/agg/Manifest
index d287a1edc6c6..0574f2101098 100644
--- a/x11-libs/agg/Manifest
+++ b/x11-libs/agg/Manifest
@@ -17,10 +17,11 @@ AUX 2.5/02_maintainer_mode.patch 590 BLAKE2B 61804fbb72b05975b1bf4470e466ae39eac
 AUX 2.5/04_no_rpath.patch 359 BLAKE2B c78f3555f371203c8355a2b8e6ac3c300b9757a1d74e14f3bfdbe58abc1332ed76f8486963b0b484a50ffd8fb48deea315a09b5cf7b44ac0156488a8b7fb251b SHA512 f44a98258cef2bdb1ed86a2614162d749f7d191ac3e7c642fe8055bdc757e65d8b7a26ad44ea3f7b760776b308dd9d07af3100826504c5547c8a111a3dbdbc8e
 AUX agg-2.4-depends.patch 2154 BLAKE2B ecea231011d0779bd3fa42f8364cd31ac9d2dc17f9de2aff98045abcde5e562b04ca5da295d35ac2aef8924eb65a4bbcd42b54ce8da4453383f5b0bcac2e85e3 SHA512 22b15f495c313417e05431516239bd04889d26b05c559b4905f0ad0aac3b8e4053a6bdc19e1c8e0c192f3b65c200cf5e3074db15011e01e4deaa4c13070418ef
 AUX agg-2.5-autotools.patch 277 BLAKE2B 9579b23d043b151f5404cd6f97586c3f1b1098b23d3aacfc1c287431c3b52b654c1c4057859f5708afc5fdfe0fd57e24538d6865f156b345c87240cf48a2ba3f SHA512 facfb36e8de3987153d988d4ff4227da6531a1508c2263d85364809b5dc3b564e76469a134084b2d020709fc32cfd319141126653b700dc38e266b68528c8f47
+AUX agg-2.5-gcc8.patch 816 BLAKE2B b959d281e57111ca74fd981a9d0a06f2ab9d0e05ef69fd2e7cd15c5385d860141400aebf2b89124022468f9c21633bc449b7802084112be68c078818503dbb0e SHA512 92cb8742068e839143094dccf77b81b37484d7a521c45d8bdb6653f2dc9055ed0b65fc2554234e1f635221f6624d4259dd86b7b3bbc5fc9edf29cc86cc58e360
 AUX agg-2.5-pkgconfig.patch 387 BLAKE2B 7f0034bf791618bf3fdc59ec60210732f582b54d933a11399c10d7c8ad63a419e44a1f8430acdcdfef5268600e088664cc8bbbc9a5513b3170f62cba86f07d4b SHA512 113ac9deb4d0992ef4bdaeb1654f5c1ab199d3865b525c573926b73b2351e9c551f2a7b77082f87fd78bcdab3036621b72bba9502028c35b28dc8f18acf11f53
 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 1310 BLAKE2B b38e25771857f92a380258ede6e816595f69944f332c3b08d347b45cd0dd2f4bf82062159a945497f2dfead1de0d545794612e0cc3ad4ecd6e5ab22489cc207a SHA512 65b75c8ada4e082900e91790e64534412d0f771be45f4ea18a5aafe022ca1fd751a1b9fb1f752f88b769bcb15ab55fc030c7c0908b75ec2002dee8d44caeec7c
+EBUILD agg-2.5-r3.ebuild 1347 BLAKE2B ffc1e449b15e237ae544c5d85ac1e6b9806e897cfec021406865474799f773f22772ce4227dd979a3f6f51e8ecbb39b73f88a8b4a23c109454866f17cbda6545 SHA512 deb1e61acae6a43f9a205d0fcd6192b339c3c5f6475e0c584bb9f479926a7d3ce330241293f084e276c2cbe47f1a0503b4f9d29439b86bb594eb2ff527571b00
 MISC metadata.xml 335 BLAKE2B 4f8f3f570b1640e3dd48210e17eba5e9e0749313f4ba21d1d2f2565d8dbb2a7ec16ad73852ddeb0dd11f25887319bbbc44b9bc1c7397e02e43c36123789d186a SHA512 014f102fc0a515f69a841d11f7485287fe7fd4c4b44f33ea972813879d20e6c26d0ff2146268caf7332219055f6c968feb5d59951ee2c0e3e4a439c8f7fef68f
diff --git a/x11-libs/agg/agg-2.5-r3.ebuild b/x11-libs/agg/agg-2.5-r3.ebuild
index 0925c837a906..a8beefe015cf 100644
--- a/x11-libs/agg/agg-2.5-r3.ebuild
+++ b/x11-libs/agg/agg-2.5-r3.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 ltprune
+EAPI=7
+inherit autotools
 
 DESCRIPTION="High quality rendering engine library for C++"
 HOMEPAGE="http://antigrain.com/"
@@ -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
@@ -32,6 +32,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-autotools.patch
 	"${FILESDIR}"/${P}-sdl-m4.patch
 	"${FILESDIR}"/${P}-sdl-automagic.patch
+	"${FILESDIR}"/${P}-gcc8.patch
 	"${FILESDIR}"/${PVR}
 )
 
@@ -56,5 +57,5 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/x11-libs/agg/files/agg-2.5-gcc8.patch b/x11-libs/agg/files/agg-2.5-gcc8.patch
new file mode 100644
index 000000000000..2e43d0bf79b3
--- /dev/null
+++ b/x11-libs/agg/files/agg-2.5-gcc8.patch
@@ -0,0 +1,12 @@
+diff -uprN agg-2.5/include/agg_renderer_outline_aa.h agg-2.5-fixed/include/agg_renderer_outline_aa.h
+--- agg-2.5/include/agg_renderer_outline_aa.h	2018-08-25 02:02:52.507254241 +0800
++++ agg-2.5-fixed/include/agg_renderer_outline_aa.h	2018-08-25 02:04:15.291175316 +0800
+@@ -1375,7 +1375,7 @@ namespace agg
+         //---------------------------------------------------------------------
+         void profile(const line_profile_aa& prof) { m_profile = &prof; }
+         const line_profile_aa& profile() const { return *m_profile; }
+-        line_profile_aa& profile() { return *m_profile; }
++        const line_profile_aa& profile() { return *m_profile; }
+ 
+         //---------------------------------------------------------------------
+         int subpixel_width() const { return m_profile->subpixel_width(); }
diff --git a/x11-libs/gtef/Manifest b/x11-libs/gtef/Manifest
index 3846ae537c18..4f30a3a06512 100644
--- a/x11-libs/gtef/Manifest
+++ b/x11-libs/gtef/Manifest
@@ -1,3 +1,3 @@
 DIST gtef-2.0.1.tar.xz 429800 BLAKE2B a76484bded4355a4bf263dfb2552fd498b10d623441d14732e61d76395f28cba3ae1998bc3ddd3fae17c39e73d1301487c90dbedb8d7cddccf8ffbcbab138fda SHA512 51cec42405f41c8d3d311811f3a9f6c67ca2a6a87cb305f9becc14694683ed427bf14797d8c997f17d4a05b3048d91cb5ebde81d0db4d11048e8978ecb7e64e1
-EBUILD gtef-2.0.1.ebuild 1309 BLAKE2B ee959cffa0b9a4d4bc5e4e98613991eb6b2551a3c9e94f413dbecea55dccc5c6f7dc84d7ddf3bc3e01fcb89533aa73771e504dcb423eef5fc9a7c3067abb6108 SHA512 4af4a9a852d3f5de81d2c821d47552007f7b5d32497f9b2401c38af5fdb17d28258707bba52794431de2b55e9421b2dfb6875e0c9a2fddcb6d34919c73e422ce
+EBUILD gtef-2.0.1.ebuild 1327 BLAKE2B c6d8f774fe97638711c5e90442b0c44b74ccf4e6979b949476680b7bd3ce6da6a23fe4358138effa3ee7fc12af012c591398cbf2e4b11e3dbd64076285c5c073 SHA512 015871efc5d0940f09dd4e62215b9f184e6874e19229d190eab46de59f42d5789afeb6b78e1e070ab65d41652ad1eb3d4a4893dfd9d601627390fa3a23e320ec
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/x11-libs/gtef/gtef-2.0.1.ebuild b/x11-libs/gtef/gtef-2.0.1.ebuild
index 8be374567d7e..e674966f57aa 100644
--- a/x11-libs/gtef/gtef-2.0.1.ebuild
+++ b/x11-libs/gtef/gtef-2.0.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
@@ -27,6 +27,7 @@ DEPEND="${DEPEND}
 	test? ( dev-util/valgrind )
 	vala? ( $(vala_depend) )
 	>=sys-devel/gettext-0.19.4
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.25
 	virtual/pkgconfig
 "
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 897911d76c86..0c4065152829 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -19,7 +19,7 @@ EBUILD gtk+-2.24.32-r1.ebuild 10022 BLAKE2B f8c96cf303148709c5b0b26fc17c41f4d902
 EBUILD gtk+-2.24.32.ebuild 9991 BLAKE2B 600affbb940664dc8765af635d394ea68472a0476acb9ee63347fc6bd08fd1a9c2a30b81e92c31731176dc8b2df2301df1bc42c6bfa07b184238fd6c3bfc4bcb SHA512 559c6691daac95ec50b503f682f8eea280cf9164a3e66b14dcf91e0ba11bb9d34c266aa340655590d6a784ee0d7afa7888866ad87a880e9eb19846bd43b5cc46
 EBUILD gtk+-3.22.19.ebuild 6559 BLAKE2B 3bd0611294ee3a3811e5d99c910e48c935e32acf991a4a5bd74826cc52d710883bae68354d07ca7249bed5ef49fbb22beab8adddccca1c18fc3cf162fba373ad SHA512 179ee609778c70342ae29ef0f25da28ed506eef801da98a396b3b3a039668e416a7a16892e698507fd47fc2ec6763806ff2cd75ae319301943d727d3b47f2725
 EBUILD gtk+-3.22.29.ebuild 6734 BLAKE2B e9d0774ca24b5db57ea83e4a2df0340402814150aad1c382bc89ad3ff7fb110f462aa1920c47a477c282f7f1fc1391d9afe908d4c34bc07fc80a3d23dad736e6 SHA512 908ec9a5128cdb285ce4745dbdf72101d36fae133528c86e2864c3852f5a75ab22b7c29d12f46608030da6a92e4bf55d1f8b855af7fa36336e232a2b9fead310
-EBUILD gtk+-3.22.30.ebuild 6736 BLAKE2B ebc3d6792a7507e41f5d196f77353bc1554f8239c9986e105e0b09bee58d4dd357ffd174cdce1f6f86f6aab8815a6b78117ca1dcd453f735da749b80e44eb85d SHA512 48278952460713c7bcde954b0f61f72a81ccaff1401a80fe9178e609696834daea611302762a2239e004f2aaefc4232a28a99a5eb58224cbf8236fc0852cc392
+EBUILD gtk+-3.22.30.ebuild 6735 BLAKE2B f33077d8b1411bfff2184fe84a9667e8257516301d50ee8238744d986724af1287682f0dc51241d65fc757549821230ee4dfd08defb1dced58f3ca92b3ed0d42 SHA512 00f615837f7aae0eaf0d1da586406128a5166709fa4453f40464802237afb4abc421c44b2bdcd45b013f2a86385ebb11000bfaf0d2697a8cfc54e5d78e0ae15f
 EBUILD gtk+-3.24.0.ebuild 6792 BLAKE2B 32c0dfea563e15d5c7f7671b4562f60a9eb231bdf70acb76ebca84554ed8c462256367f17438fe3e6f0e2696745d0fba5fd19a34cc1a88afe40861c87f70df6e SHA512 d683b4d197c90d723b29167cb1e4b3395665ad3ddf783e5ccdfee4d4eeea07fc2001a65d10b49896e48b841cd2f839672c203b3371ded916dd0ef48af21136ef
 EBUILD gtk+-3.24.1.ebuild 6792 BLAKE2B 32c0dfea563e15d5c7f7671b4562f60a9eb231bdf70acb76ebca84554ed8c462256367f17438fe3e6f0e2696745d0fba5fd19a34cc1a88afe40861c87f70df6e SHA512 d683b4d197c90d723b29167cb1e4b3395665ad3ddf783e5ccdfee4d4eeea07fc2001a65d10b49896e48b841cd2f839672c203b3371ded916dd0ef48af21136ef
 MISC metadata.xml 834 BLAKE2B 0b1145d2da83bf549af3758dbca4c5dbf734e5c90c99f3856404b98584dc18d913ac70a19480fb0a16cc503c9831e4209df77c0adf7283eb0d8146079a381fe9 SHA512 e1ec73c4c9433c70c17fc3826193d8289200e347a32d67a824b803213ac281f21364a08c21c819c3e93a2d8582d90bef48766f22ba9ed495099b3eb6071aa561
diff --git a/x11-libs/gtk+/gtk+-3.22.30.ebuild b/x11-libs/gtk+/gtk+-3.22.30.ebuild
index 14b9ed417faf..8d39dac9de73 100644
--- a/x11-libs/gtk+/gtk+-3.22.30.ebuild
+++ b/x11-libs/gtk+/gtk+-3.22.30.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-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 ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
diff --git a/x11-libs/gtk+extra/Manifest b/x11-libs/gtk+extra/Manifest
index 7b97199c7447..d6893e722f7e 100644
--- a/x11-libs/gtk+extra/Manifest
+++ b/x11-libs/gtk+extra/Manifest
@@ -1,3 +1,3 @@
 DIST gtkextra-3.3.3.tar.gz 1503817 BLAKE2B dc99923ad962348d617b8db2171b99e925d0dc06501110d805f166ba25cff72094c02031e3375304ddfd96cc7d3f76a1b06d56b196aec1d1868f10d154acfc8e SHA512 864fa2e957941a05a9c4b4a4283ae48e733d72ab334e2fb8440fc884166b0d1ad34d381924184f7a88f829d00bbd857d5f3f32d89f159e0133dd89233a8a93e9
-EBUILD gtk+extra-3.3.3.ebuild 834 BLAKE2B 70567b42bb33c1e93734cddb760af3f4955db6a8f57e475adfc21a45da37f8a850558f4f8c9d8db1773472592cac207367b39c14cc706c95f5c087808dedc7ba SHA512 759b55a2acfd89c5bf799e0760029b0f3d1fa10238e95b6685dd3242bc8041c89a3c4a7dfa419b5e83b2cf0063908966c5449e3ad630f9f82bedfed7d22fe037
+EBUILD gtk+extra-3.3.3.ebuild 852 BLAKE2B aa7bd51f6e45f8a046f0a97cb5630ed581523613f0f7a6c073a434e540fe3b0bfd4686f39a9124524639f88043bf2a5cadb4ab66333c2da1fdd4b6ff14f2f5d4 SHA512 d7ddd41cd69b7f613253d1d6b43face44c9809fe0e7ac456af623667e0e0ed8849ced06d0a55a198e9d9af6bbbd260aa1d6bb96767d07312e8d8f69360c97013
 MISC metadata.xml 331 BLAKE2B aba9451bf53641f26c08773cf5146351d4bce301ae44d153dfe6650de8523ca85144e850e1ad3363094afd27b592d54b551f02c92e3de58bf6b5733752a43fe8 SHA512 af4ad9c00fe60299ada4ee678335173a37696f53b35fb9409b477622952b9b952d897168eed5c1bdb18d11d1797a9a80b6cce3782f3b6dd487a7cb682bfe127c
diff --git a/x11-libs/gtk+extra/gtk+extra-3.3.3.ebuild b/x11-libs/gtk+extra/gtk+extra-3.3.3.ebuild
index a072f27eba04..b91ed6667f0c 100644
--- a/x11-libs/gtk+extra/gtk+extra-3.3.3.ebuild
+++ b/x11-libs/gtk+extra/gtk+extra-3.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=6
@@ -19,6 +19,7 @@ RDEPEND="
 	introspection? ( >=dev-libs/gobject-introspection-0.6.14:= )
 "
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	virtual/pkgconfig
 "
 # dev-libs/gobject-introspection-common needed for eautoreconf
diff --git a/x11-libs/gtkglext/Manifest b/x11-libs/gtkglext/Manifest
index f803a3ea2e05..6b024845281b 100644
--- a/x11-libs/gtkglext/Manifest
+++ b/x11-libs/gtkglext/Manifest
@@ -1,5 +1,5 @@
 AUX gtkglext-1.2.0-gcc8-fixes.patch 791 BLAKE2B d0f17c83bccd6e92c640383fecdce384cd0ecb92868f3f70d87b16aed8a85357e9391134c3c233549f7471d64e02416bde03ff92028d8d2f19eacd3802542875 SHA512 b6240ce1f293e3bd37d71a09233417c4acfa2a7fce05ba65ba364181e6075f86fc72797586b93fb81e057ab8de2191ad345415bd6cc6e29e38945cfb4362f3cb
 AUX gtkglext-1.2.0-gl-configure.patch 11350 BLAKE2B ad0cadfa12bda13866da64433935520bcbb77a9fb430640d31c66b14ffb867a1ae1cb236e459b9d13c0493279185dbe8c8eddafce86abd14b2ab4b2d0a59a0f9 SHA512 b164b8e64ff8fbe6d9b3437100c35d1352056094c4395fc1df4a40d8c91edf7543317ec05e3a05af1da9fe432817e312e7a8fc80fd3343824365d4579046f8fb
 DIST gtkglext-1.2.0.tar.bz2 703821 BLAKE2B 985d84cf1b87a23cfebcf536cecb087bbfd050f5131cf70b2a09e9a2e556e7f2549ed1b4b26ec6eccf790a383e3530d27171a553145614b641437c7c2d8462b5 SHA512 c5452b7594195da3c1428dc3021a041d70bb8079a514b7310fe7b66f638748ad2399adead36047b52b60b033757581e72f0532c0301e033019bf909f7365071d
-EBUILD gtkglext-1.2.0-r4.ebuild 1554 BLAKE2B a337a17177ec9a90e7218a08a20cf44469644202aa95719fd34a1223f85f3a20854c936c2a26281e05f1616389916c677b88ab416706a17fcfb7553b3eb90530 SHA512 bdd055aa81a04be324a555e501e372eb5d7640f4b7ac19b8e40107dfe3a206e7fc28ee4f11bf627d5fa9792882da0b7bb6d5a18e1dd6b26fb9247a4ffa7b3608
+EBUILD gtkglext-1.2.0-r4.ebuild 1572 BLAKE2B 9bdce738b9fee3ba626b62797cf3fa14bfcaca60a3aea101f3183cc7ef3abfc032ea8c844500000447ed3a1c8a76fcb70fe512c328eef5a85cef1f4e2f5c1dd5 SHA512 0a7644d45b01dbe3b0ab321c7cd1c41bb4be9293273e6ca782491852982ab7a6b7b5d33d2b6a3e65b8bab5b86b51de292666ab9c95ecc84c54a8d69b98930e1c
 MISC metadata.xml 331 BLAKE2B 214f9245eccb98bed5314d370a2e16d8605c46629c656c05a22c1a037e7aeeb9d3255f24203405b148fc73276241db48243303a86abea879c08a944025cc51b4 SHA512 8c9768b7a27485752cb816de376d4e9e352e6522e42eb489d41aab48f0fd47541483913c7fec9ec4bbdfea3aa846c35bedab83ac2524901635337a7111f14ab9
diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
index 948cc280bb4e..d817a80ab438 100644
--- a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
+++ b/x11-libs/gtkglext/gtkglext-1.2.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
@@ -24,6 +24,7 @@ RDEPEND="
 	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
 "
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	>=sys-devel/autoconf-archive-2014.02.28
 	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
 "
diff --git a/x11-libs/libast/Manifest b/x11-libs/libast/Manifest
index eb11a69d6b1d..4cda3fa399e2 100644
--- a/x11-libs/libast/Manifest
+++ b/x11-libs/libast/Manifest
@@ -1,5 +1,3 @@
 DIST libast-0.7.tar.gz 508654 BLAKE2B 0c5bf31d5b73fe11d4665bc0d8e1c9a987b944fcdcd89106a47ebf01eb90c2895b3e74e39874b360e91f027b8beaf5698363e9920ad879bfd241b13ef0232870 SHA512 0af1d508af88ce0a2f29fe7841e23759be7c6540a1e2698980c289245ba284fdbf76c593e457c0cd6cfc54dcb6d891b01a3fd4d4a6ecc511fb2de698c9a3046d
 EBUILD libast-0.7-r2.ebuild 949 BLAKE2B b7dd3edb036b951690c70983d33cf01ce2fb816acb2faef09bde94cdf3681d581d87d28dee24d4e12fc4d20bad54cfe1ea57029f9bafc4c1dd98adc126bcc4da SHA512 d067d1355f62d7a8a7fc601ac1a5bef185e23a0353e7f1a960f4cff0dea39c4772af1191681d63a2c530ade60f1d0719b69f380ee8a46742940387d7ee76862b
-EBUILD libast-0.7.ebuild 956 BLAKE2B 51ad500db03219e1860f4a20c73d283cf25632d9413660f26ef59ea71408ca2003d6b94bd21a2619fa36d70a1280443008b02479af241957e13f101d642e280f SHA512 119258ed0398b0a007795a0889a0d1f57b15dee7135db65703e722c03d58a2da85eaa155eaac2bd8f23c79ad5ec96653a0b802d986e9faa303e50becfe554c16
-EBUILD libast-9999.ebuild 1046 BLAKE2B 961ad3edf0693b6ae5339c82fa0a9410a34b050361f4d5f5d826fc1dffebbccccbc07fd89e9676a2e53246140bb17a2a1de70badaf9842c04a2b95ff624c7dea SHA512 831b2b42607f673510482a48f8a5eb4bbc3fad111945cc3f00a9e6dc578ef65f4dec03fbae504727e2cef4f841f1ba129c9d07a72238b0639be866d4799a4cfe
 MISC metadata.xml 736 BLAKE2B 603c1752552864610f08d8b3144503837feb5c7bddb3ebfe108f4d090e25d38fee56ed63f392c98f5468c69b6bc47ecb65e53bed8c335e6996351522e4257df0 SHA512 a2fd1a0875f0a0c866845b4fcc63d0ab715ad73fdd1cde271e6174606180ee5e1f4924270171c08074a0ffc7af52fb9299dcd32a5f057c1548175bf638598acc
diff --git a/x11-libs/libast/libast-0.7.ebuild b/x11-libs/libast/libast-0.7.ebuild
deleted file mode 100644
index c2ef2a3a112e..000000000000
--- a/x11-libs/libast/libast-0.7.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="LIBrary of Assorted Spiffy Things"
-HOMEPAGE="http://www.eterm.org/download/"
-SRC_URI="http://www.eterm.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="imlib cpu_flags_x86_mmx pcre"
-
-RDEPEND="!sci-astronomy/ast
-	x11-base/xorg-proto
-	x11-libs/libXt
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	=media-libs/freetype-2*
-	imlib? ( media-libs/imlib2 )
-	pcre? ( dev-libs/libpcre )"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	local myregexp="posix"
-	use pcre && myregexp="pcre"
-	econf \
-		$(use_with imlib) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		--with-regexp=${myregexp} \
-		|| die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc README DESIGN ChangeLog
-}
diff --git a/x11-libs/libast/libast-9999.ebuild b/x11-libs/libast/libast-9999.ebuild
deleted file mode 100644
index 94feeb7a119c..000000000000
--- a/x11-libs/libast/libast-9999.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-#ECVS_SERVER="cvs.sourceforge.net:/cvsroot/enlightenment"
-ECVS_SERVER="anoncvs.enlightenment.org:/var/cvs/e"
-ECVS_MODULE="eterm/libast"
-inherit eutils cvs autotools
-
-DESCRIPTION="LIBrary of Assorted Spiffy Things"
-HOMEPAGE="http://www.eterm.org/download/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="imlib cpu_flags_x86_mmx pcre"
-
-RDEPEND="!sci-astronomy/ast
-	x11-base/xorg-proto
-	x11-libs/libXt
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	=media-libs/freetype-2*
-	imlib? ( media-libs/imlib2 )
-	pcre? ( dev-libs/libpcre )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${ECVS_MODULE}
-
-src_unpack() {
-	cvs_src_unpack
-	cd "${S}"
-	eautoreconf
-}
-
-src_compile() {
-	local myregexp="posix"
-	use pcre && myregexp="pcre"
-	econf \
-		$(use_with imlib) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		--with-regexp=${myregexp} \
-		|| die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc README DESIGN ChangeLog
-}
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index c280f3626208..441330329c14 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,6 +1,8 @@
 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
 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-9999.ebuild 2122 BLAKE2B d12b473e20e26342b25d1feb09d0fd43d4e63258dbd5a5a5b948a5d9adc773edf6873915f24d480073289f00ba3110093071033d8dbbb095ea365d64cdb52333 SHA512 7f9731b2b4022520d127d0ee0644e040ae402792a12f083530bd5d0f392c1be6a2e6e07d377eede06d3928df64decdfeaad1e5859a56832454e5555ec050f118
 MISC metadata.xml 406 BLAKE2B 2a08dbfc07e8d6ee0f61373821fe6b369130b98d30786ff4559dfd57a9a5189a4d2e0f9faae2ba19cffe023460433a4874d30aa26913ec3ff7263efb10ab0850 SHA512 703594ef462bb5b76a61d53268c043ad5f9b0febc907e48236f425ad047d931ae7fcc0a433d8b30acd8b6f0582eb0263586010bd95a17c4c383e7d703166b9da
diff --git a/x11-libs/libdrm/libdrm-2.4.95.ebuild b/x11-libs/libdrm/libdrm-2.4.95.ebuild
new file mode 100644
index 000000000000..ec0bdd16c350
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.95.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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/libgxim/Manifest b/x11-libs/libgxim/Manifest
index aa616bcaa6ba..845b0716b6ab 100644
--- a/x11-libs/libgxim/Manifest
+++ b/x11-libs/libgxim/Manifest
@@ -1,3 +1,3 @@
 DIST libgxim-0.5.0.tar.bz2 469547 BLAKE2B 183ea514b990b93efcf41a56704385e8b84b18d1f4f992ddaa8f7481a74b132f05b56322450258d53bc1fbcaf42d2528d297922ae042f5831010d58540974982 SHA512 ca143e16e8ddd8e3cea01cc0857cb0e665f9cf397462e2fd9ed714b825eaa06056dae4115aacd117f8113e815f11184d9dd9f239259a1eee691d0b120db580f7
-EBUILD libgxim-0.5.0.ebuild 1257 BLAKE2B 878d1b3d2c48997cf18776310e4857a8eb2a307326aa10a769c6cc67e8e0ad3d423c88da3c919623c8c9e41018577393ba0b2e735c94daedb6cf5b3f090a0244 SHA512 853cc83ea8654685cdd41467c26ff3b821260a6a150f64757696c05c0781df757a57751237786fc1ebb86566dfaabfc17d5df50dcc9963abf8616de7128b8efe
+EBUILD libgxim-0.5.0.ebuild 1304 BLAKE2B 1038604c35a9e5a980e9f22809f2d9b8a601ebd245b9cbd75e6ce03712cf30f574ab0f7187c5de50ef50341ff738f7c49389de5e89dc3ef1bdda2328ae909ac3 SHA512 5b41599875ea020c4c54ab57678dc13623bb9d779a2192c7b2bde7c756593d040674d806c32e071b0f24f228ae91128ff6b5c5634ae7ece655983c1b1984e203
 MISC metadata.xml 325 BLAKE2B 842e0838af5a3aa081c0cd65b5ffda14736b9d597c8f9117d8e61be977078741a61edec36a1eaf11d3dd8883ab9c821e664194dd298aab39ebee684e20c8e757 SHA512 20ad59c0776da8a8541052eed41f71d8e40604056ffab37a1899d822880d8423d26395ef46d581d71c10128d943a5ad5b45b26f126bd446790c1ba72e33356c0
diff --git a/x11-libs/libgxim/libgxim-0.5.0.ebuild b/x11-libs/libgxim/libgxim-0.5.0.ebuild
index 8d4bb4e5405b..bc716195e9fe 100644
--- a/x11-libs/libgxim/libgxim-0.5.0.ebuild
+++ b/x11-libs/libgxim/libgxim-0.5.0.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="6"
 USE_RUBY="ruby21 ruby22 ruby23 ruby24"
 
-inherit autotools ltprune ruby-single
+inherit autotools ruby-single
 
 DESCRIPTION="GObject-based XIM protocol library"
 HOMEPAGE="https://tagoh.bitbucket.io/libgxim"
@@ -19,9 +19,11 @@ RDEPEND="dev-libs/dbus-glib
 	dev-libs/glib:2
 	sys-apps/dbus
 	virtual/libintl
-	x11-libs/gtk+:2"
+	x11-libs/gtk+:2
+	x11-libs/libX11"
 DEPEND="${RDEPEND}
 	${RUBY_DEPS}
+	dev-util/glib-utils
 	dev-util/intltool
 	sys-devel/autoconf-archive
 	sys-devel/gettext
@@ -57,5 +59,5 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/x11-libs/libnotify/Manifest b/x11-libs/libnotify/Manifest
index e846c1d2f40b..9bda6d76788f 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 1586 BLAKE2B b60ab68e2d7e9d84fec352a730f79d4e48f980c952376312ae493d2f31c4109c33f851cd9941b712d4d557ae28057c6e3ef1e988517b4376e3e296c0045dee2f SHA512 2a1978fb2ce23e223d7ab38cc985b389d08170ca9c51dc293f98035ccb2b5e40ca9a16aabb132b23c21ccf9e643a7ed39ba29a019a8285da384052f6828f2523
-EBUILD libnotify-0.7.7.ebuild 1472 BLAKE2B afdb6d7ff092e58d1167d91239fafd34c75fe92dd6e054de77f235f05afd6184acd7a14c2f85e3f880fedb312e0482b77214eac864992916cd6d77c3353a5385 SHA512 18a6a46bfffff277a239ae11a6d8cf2f0c8063ea577fa527f903edea984c6b1a18ee562b04e7e9625a6d7ac693f9b6201a51095223f9d12af05e50860de84591
+EBUILD libnotify-0.7.6-r3.ebuild 1604 BLAKE2B f32ab469583abf5e62f6ee4cda0fa93397d7da8d4f050d014db0ec401b7370b5a1abecf3a4812bad09b128b185afd33e89630fce013c64aeeb9fbab32062c863 SHA512 7fee9407a9e5aae59ea94cc58c797d888992f754b3e17090de2b59b047a70aa7c962aa55788640d23d89d92efbf90a4c7cf82dd08842f0a845c69fca6494e339
+EBUILD libnotify-0.7.7.ebuild 1490 BLAKE2B 24679e740e217b1d79ff2e116eb1d270ca817875914f32f3d21f86fc5304dd5fe042c380fd55a2c2db7f5dabca426a4e0c21553e8e9f6511ff6c6f3107b7afbb SHA512 75911e883870aa6c9f41bd98e922e35cc18480f9e7f5fd6562e3ff69962622af54a4cd679ea13889962d6b3db9f36342da69c2eb68091bbe7930fbcec0849cb5
 MISC metadata.xml 276 BLAKE2B 889856a4e8b234e03eb27d32a4bce748a561f98ca0faa36de124e58e3832d804d1492f59db1154c4ec0e2e0e46c7d9cf38d9911ee83dd0863699581000610f31 SHA512 673180ba375ea401c0a8f197d516417b3f9361b11943c71bac88b0d0b1407b0bc657f5763c6fb6e429cc6ee112869a2247083fe56743e9ce918855c0ea929e59
diff --git a/x11-libs/libnotify/libnotify-0.7.6-r3.ebuild b/x11-libs/libnotify/libnotify-0.7.6-r3.ebuild
index 9eef580869b9..ade915f3dd37 100644
--- a/x11-libs/libnotify/libnotify-0.7.6-r3.ebuild
+++ b/x11-libs/libnotify/libnotify-0.7.6-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=5
@@ -20,6 +20,7 @@ RDEPEND="
 "
 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}] )
diff --git a/x11-libs/libnotify/libnotify-0.7.7.ebuild b/x11-libs/libnotify/libnotify-0.7.7.ebuild
index 7616626ccace..b281671c8f6a 100644
--- a/x11-libs/libnotify/libnotify-0.7.7.ebuild
+++ b/x11-libs/libnotify/libnotify-0.7.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
@@ -21,6 +21,7 @@ RDEPEND="
 "
 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}] )
diff --git a/x11-libs/libwnck/Manifest b/x11-libs/libwnck/Manifest
index 5ada7a874317..ed7702235903 100644
--- a/x11-libs/libwnck/Manifest
+++ b/x11-libs/libwnck/Manifest
@@ -1,7 +1,7 @@
 DIST libwnck-2.31.0.tar.xz 630792 BLAKE2B 8201537d3c9a8a0a8668fc16d33a8eaa05c14312401f1c763c922402df04ef03260dd259f5c46508f85390f7aefd551e83143e654b24b412272dddb7c7c4bd62 SHA512 54262a08882021f08f3ba7f2ddfa33fc1f02e391a0f61cf999a50a089e0d277dfe13ab133c1a46e9abf0599bd24c21dacff80b51013cbb1375d2cd71ac9abbe9
 DIST libwnck-3.24.1.tar.xz 821508 BLAKE2B 18bc01a08107e0b2b040cb6036a80cb289955aa9365b7568292aa1c29dc77758bc9b11caa57b8cff6bebb75dd1d0bf7135b0cebed1e42c6ccc1c1372c6a224b5 SHA512 e8a31ab2dc0c282f1e0994ce6a2ccd18678dc5c140943399262e795052b7f5da2d6a5d388a74f4b10f8fac66ab138983a9caaee4e72c92a17c01ca5c39b731e1
 DIST libwnck-3.30.0.tar.xz 800296 BLAKE2B 5917ac8a69f6f1e0d639f301a77349015226ca6d0fc12e8b23c00a81e18f6e9dbb7716b01e50aceb15bdbd64b5b1a8295be5b931d513e120508cdf14d2d15a23 SHA512 79842e4645de828941ac030eeff9d232b18a51fe0d18baf5ceb2beaf897d328ee5bf3b297501e2b27e66c63d42f6546a7605a37c6d7d52ff76e9b2bc5c328128
-EBUILD libwnck-2.31.0.ebuild 1259 BLAKE2B edd3433c026c1403b11f3fb7a7dc75c1c2110e843f025db21a00590549ce060349b6f10dd689b1d28b04aec7d9eaa835f80ccedb806af78f0a302b404f53629c SHA512 f950573e13c676f6f7a802a7773b2b5bf1e6fc09d9c87e106edb4e94322ba3ae22fe39d1944803cba9011dc0ed05ab9e05230f31051a36f0c6d3b9288556f908
+EBUILD libwnck-2.31.0.ebuild 1277 BLAKE2B 521bf8ecde7f1c5907a6c82fa76c6262aa01b1dc0d47c61d58a36b8738fc95c8cc953c25d3f181cebbcfe565b9ea2d03c650e741c9f67f7f8cdb78d6e7681716 SHA512 df4fb078670c4ccafac707d6987a1a681cd2b3e6567b093b6ecdf7550d9bd097852738502757347fc761f3d6488d261625b91204b6228b73410a6114efad8779
 EBUILD libwnck-3.24.1.ebuild 1155 BLAKE2B bf5a92d122bceea6c1a781a5fe882abd4cf68186ea1c2fb6d261480a94fbcd10db6d288e4c92c6834ac7ce103246ef90802cce1efa46a0aba0d940321cbc7841 SHA512 202d37dcaeeb54994965ad51de9c3b9b193b9f295af116a258e711e022c09a403f3e45f51c0bc3ef62e7e64c6912cb235a9fd7a0428d3ade6499efc005ebe8c1
 EBUILD libwnck-3.30.0.ebuild 1163 BLAKE2B 4bd2ab5fcf3815f3dc9d043b50d0544d9b5dcbd3cfab9aadabdb5254c19cccd57917d4e2202e314812a1c919e870cbb328e16be048f56448becf3cc00f700c22 SHA512 7cf96b245530a0b2f6f1eb3e2627e139322b8d3915c9453b8df7ab4ca587c83e6630158541a46ea971ed4c6d0fe80850fb12650dc3333ed235df18dc2e0fc7ef
 MISC metadata.xml 364 BLAKE2B c8583191e40b2bf98262fbd4401a0ac47e53ec64294178a919499695b014f3ae8ee623de803cfffde58b4d63eda4572035703c5f1d550f14f4dcc974e9035c65 SHA512 47cae64c0f13376c312169703c6213582e37ccc70f00599754d7fa3daf0511e5da4221cd659e9ad98fe90d7791b0d513db45d2d0b7f1d833ef125f64ba40f2ce
diff --git a/x11-libs/libwnck/libwnck-2.31.0.ebuild b/x11-libs/libwnck/libwnck-2.31.0.ebuild
index 5a6db92b21ff..ef06538442c4 100644
--- a/x11-libs/libwnck/libwnck-2.31.0.ebuild
+++ b/x11-libs/libwnck/libwnck-2.31.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
@@ -26,6 +26,7 @@ RDEPEND="
 	startup-notification? ( >=x11-libs/startup-notification-0.4 )
 "
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.40
 	sys-devel/gettext
diff --git a/x11-libs/libxklavier/Manifest b/x11-libs/libxklavier/Manifest
index 072120e0fb3d..3d7d0c9491d6 100644
--- a/x11-libs/libxklavier/Manifest
+++ b/x11-libs/libxklavier/Manifest
@@ -1,3 +1,3 @@
 DIST libxklavier-5.4.tar.bz2 390428 BLAKE2B 3cd109c6200ef977533d39b1362c33f871c2cd0b011779b726546aa7dc95bf7dc89931dff7ca2e9a012a51aeec602a53df499591ab30e1dd813fcc823318a2e2 SHA512 e9342d94f6cd67e900e44d9751ee0d8c75bec8e3a7b30989612bd71a5f890be52ff843465162dbbe0bfc9004da76e1d47158a4671b8f915e51c91f9d82f7baae
-EBUILD libxklavier-5.4.ebuild 1346 BLAKE2B 71ef2427c8fe252fb71acda1cdaa58a7da4e41fac6ff5cb7e8bc092f91ef3a74b2e86be37126237db0545b2b37196a3328a42c4569c3b585d761da0439071dd9 SHA512 41abdfbe34824733a3c3dafdc44de6340c9d05fc3b96cae2b39724e7f79bc4701131d437a4effe2f65f196a4e2cd141b264a1d46f2c837c6dec34125c8e1bc9a
+EBUILD libxklavier-5.4.ebuild 1367 BLAKE2B 2bf6ca8f1c4b355df387a8bd61344768909beb1b150662ab6509efd0186696d9c1675f0d2c68434ace6522bcee8e19fa45f80740a58c128dc3190a1395f44cda SHA512 3d89b0905d08fad3db0e259025ed2346ae17edd58313d848a3fed7df55d2524b3ee00e5fec193c7b09d1ce2c68d777250fe25c04fcb517b34713353201eafb56
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/x11-libs/libxklavier/libxklavier-5.4.ebuild b/x11-libs/libxklavier/libxklavier-5.4.ebuild
index a22a09bb1107..3004befeac46 100644
--- a/x11-libs/libxklavier/libxklavier-5.4.ebuild
+++ b/x11-libs/libxklavier/libxklavier-5.4.ebuild
@@ -28,6 +28,7 @@ RDEPEND="
 	vala? ( $(vala_depend) )
 "
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.4
 	sys-devel/gettext
 	virtual/pkgconfig
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index e361342e11a9..04ea218d1cd1 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -8,8 +8,11 @@ DIST vte-0.48.4-command-notify.patch.xz 5500 BLAKE2B 88b655403d2bef034604a283b17
 DIST vte-0.48.4.tar.xz 1008296 BLAKE2B 9f946d6909d38896ec80db2a02666d809155997b27109724fb318d28200220f1514fb23e4cdc90263a756914b5db442c947578c8854a535cb960a06f7bc03a77 SHA512 4b75bd881e58b5043bc44e391ef3a826a2c25d0f1bb5ffb890367e11a60b1bcbce091575ede6972a89ae043b39c51897f91fca1faf6872664d602e503d8020fc
 DIST vte-0.53.91-command-notify.patch.xz 3336 BLAKE2B f1eb7ce8ae5a975028474e0d31b14a35722cc32578dcb68905ec92b0ca048c8e1b7c903c7195248435db58a6cc60afce7376b38a3606b8ec88c8f28a7c127f71 SHA512 aab84dd050b5b9f59e9dc5e17a41a27f4650aecbd3fcb847b63b9bb79c84d3e544212e6cf6b4693424a44e14f8576c4f54eaea70a211dc0c40ae5887ca6114e8
 DIST vte-0.54.0.tar.xz 1082032 BLAKE2B 6349a7d7d04df26be3fca3c414aecd00e8a25b912af39446a412cd86c8b0165977933945786e840e2ed39d0f2fa8d51f2fc8052f00f56e47b4f1d62ffa00b968 SHA512 69dd0caae4eacc179f84eccf98625a31140286beca4244a8f06420bd36ac62dcaddf9e9d8b114549ca97927e94b562df3e7daa9fad971484f05ebdd1c0f7b787
+DIST vte-0.54.1-command-notify.patch.xz 3428 BLAKE2B 75b0c22720276300be2e49e8444aa68fed77fb7a6cc6b0e93a5c2d41257626bd60ff1084d68579769cb3d85e7ec567927591746de48e860b138d0c1f24f64cc7 SHA512 a53da569f8168c8e9e21e186dcfc00bf9fdb78a0c767ba35033c1c1e4f836406b4d9bf70ee3e071f6c749fd6f72101a6960d201617bd0bc23021e1eeaac6fd0c
+DIST vte-0.54.1.tar.xz 1083552 BLAKE2B 1e52275c953b5fbf51a1cc727dfca0bde3cc8f51a18055cd0c65c949479d0b4d926466016fa7d6f6dbebc9117c1b6fbde9a4bde38c5d82bb44ecce8612290de6 SHA512 5cb866e75c35e1b5728d17b0433641ceb4837495d59185a04fde9dd8c9849ab905a6b2718a50b27cc70323c7a6c5db31a808816576c30d7f18ece889a329fb61
 EBUILD vte-0.28.2-r208.ebuild 2962 BLAKE2B 7004c56381a05ed2c0c309736581f2e03478faae88903ca6eb2b74acfefaf37464fc8b1f1a077d3bff1344ad6a60383f4338b0a27ce2521bb0f68727eb252da6 SHA512 bf607001b0dd305cef30e4f1ae3389b73ae30c747a52915e4dd3df9bb051c44f29317c591a2d47add9bc0e95559ead75155338a69acd31fea9fb79c57f18577d
 EBUILD vte-0.36.5.ebuild 1684 BLAKE2B 8e5a971eaeb84f198cda7ef9a853c1917dfe646002e5206652d3447881e7d30ad3f47bdc6131e671dc6175c9c86cede3ce7c537c3e5b912526faa549fd22c993 SHA512 f776c181fbea6dd5c27e6d9a4c8ca55859fae513ef3fb6fc7a98db638c61a5df4a45770e18c032ec191a652365a1840e1f8834b485c559e7e5f82022f7447af6
 EBUILD vte-0.48.4.ebuild 2311 BLAKE2B ab8a4a1113f242af86b006aa1030c7225df44639b3e1c4247b8f66584bbaf9b62db42969ca60d5b39df62da3c508aee1760f7c7023c033365d09fa6ef1796705 SHA512 0af0a71e7796cc2dfc60390800e8d8b8e3184533fdc0e091cd3567fb0496b38668d96c63548066d1f5ba5246de530570ea24157d07ffd9be8c6b367640fa94e5
 EBUILD vte-0.54.0.ebuild 2356 BLAKE2B 7598b5ddc72a905f9fc0ef009dbe3299476665ce460252f0dc7681f08f03e68fe9c5aa32a80515d95d12ee8f49e21d3e94ab6fdf8b864c88b2a33b7ea085189f SHA512 77db835f20a655e29cf1e3a68ff61ed667d8f82aca4c262de6a313e7ccb269535c0f7a793646762577c6a69852e1b29911231885ddc311759387d02e58ef7919
+EBUILD vte-0.54.1.ebuild 2219 BLAKE2B 848523f5a310b0356c6475cfc7490220599a461a9ad2e545a9c917dc95bb2484f12756132a48e2c591005d738d865fc6cada08b2d624adc536b6f255810ff3ff SHA512 3a09c4180e067b24f9ac7a84f695ea71fe124cc27ce2124254cb3e8e743fe953b3185cc4ec733f61531a1f2084930a8cc09dc70579c26131ed3f1e2f0f501b04
 MISC metadata.xml 348 BLAKE2B 3bf56ab8eced6c72e3d4dcb9979464b9652010b09d6576da3f1b9061f92b508d9bfa11ae081083ff07b2d7ec05c8e72123e25d6ec8c6edfa738b241a9f4339cb SHA512 3e3da8172df02c72e955968530e757124b502cb2b3ff750fdc3c52f28c763f22d918fa9b2f08da7d1b87bf3719e4cc726528c9496adde96eee3111f08a54d8d4
diff --git a/x11-libs/vte/vte-0.54.1.ebuild b/x11-libs/vte/vte-0.54.1.ebuild
new file mode 100644
index 000000000000..f8c6fcc8b2f8
--- /dev/null
+++ b/x11-libs/vte/vte-0.54.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.32"
+
+inherit gnome2 vala
+
+DESCRIPTION="Library providing a virtual terminal emulator widget"
+HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
+
+LICENSE="LGPL-2+"
+SLOT="2.91"
+IUSE="+crypt debug glade +introspection vala vanilla"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+REQUIRED_USE="vala? ( introspection )"
+
+SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/${P}-command-notify.patch.xz )"
+
+RDEPEND="
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libpcre2-10.21
+	>=x11-libs/gtk+-3.16:3[introspection?]
+	>=x11-libs/pango-1.22.0
+
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+
+	crypt?  ( >=net-libs/gnutls-3.2.7:0= )
+	glade? ( >=dev-util/glade-3.9:3.10 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.13
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	vala? ( $(vala_depend) )
+"
+RDEPEND="${RDEPEND}
+	!x11-libs/vte:2.90[glade]
+"
+
+src_prepare() {
+	if ! use vanilla; then
+		# First half of http://pkgs.fedoraproject.org/cgit/rpms/vte291.git/tree/vte291-command-notify-scroll-speed.patch
+		# Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere
+		eapply "${WORKDIR}"/${P}-command-notify.patch
+	fi
+
+	use vala && vala_src_prepare
+
+	# build fails because of -Werror with gcc-5.x
+	sed -e 's#-Werror=format=2#-Wformat=2#' -i configure || die "sed failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf=""
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		myconf="${myconf} --disable-Bsymbolic"
+
+		# interix stropts.h is empty...
+		export ac_cv_header_stropts_h=no
+	fi
+
+	gnome2_src_configure \
+		--disable-static \
+		--with-gtk=3.0 \
+		--with-iconv \
+		$(use_enable debug) \
+		$(use_enable glade glade-catalogue) \
+		$(use_with crypt gnutls) \
+		$(use_enable introspection) \
+		$(use_enable vala) \
+		${myconf}
+}
+
+src_install() {
+	gnome2_src_install
+	mv "${ED}"/etc/profile.d/vte{,-${SLOT}}.sh || die
+}
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 47e8f9310423..fac3089b3fb3 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -8,6 +8,6 @@ DIST wxWidgets-3.0.4-docs-html.tar.bz2 24122986 BLAKE2B ffd38d50e6cb44077f346597
 DIST wxWidgets-3.0.4.tar.bz2 20204622 BLAKE2B 97b9f3f44f080104cae290bc3e162b51ce27a96fb22b191d52f30db1f1dc7951defcc220afc4dcb8417cfe23490762c2a25f62164ac21809f73ccf442dd19347 SHA512 c9e6b35d541a99921c54cfdac260843f574f146b27f924a7a0fca5007344fa99865a96ded95e6802329ad9221b4880d62b92277a1b4c1ce71420acb672ad9158
 EBUILD wxGTK-3.0.3-r300.ebuild 5056 BLAKE2B 187c4e043e912beee9a58c9796866493fe83b85e5c814b30029bf5e4d92a3c561d814cd41e635028d97b9e9d8b7dbdb9b19694023caed063976b9ec1b919d5fe SHA512 aa1ba5f27f7593e0a3f57010509169173ab6521f66890400d2f654f636cbc154723cc2fea403c02bdfca516ef7ec5cf83e71be74ef5cdc543b2676d01ec3d65e
 EBUILD wxGTK-3.0.3.ebuild 3982 BLAKE2B 5b49474a6ab03648d801c2cc1e1df298bb52b2cc61c2e957368f1d2bb06f910d20b533ab1cf80dcf9fdf124b9c37b56b9233b775e3fc07803173d440e3a28e29 SHA512 4c63f058ba1c7eded7978a9adac5637d3d4b40de6cdb92eb079eb697a3792581a32641f4d8e6062181d1c2e763e2528416691f5b4fe8d88d7bd41092eeda0509
-EBUILD wxGTK-3.0.4-r300.ebuild 5204 BLAKE2B b7d741d315a1091eb1ebc59e410991bf5311ee23366c71977ea23d5573d96496fe853de25860b24e990becb24995c61d5dbaa2f178097f22781600efcb6961b4 SHA512 13e00e1e0435a9be0e521373b59a0760755bdb26b8e7644976a3df7253fe8eed320ac7b8b4a1356d344b51339521f48661ce563d5806e907e5031f89e2b5e687
-EBUILD wxGTK-3.0.4.ebuild 3984 BLAKE2B 335dbfe8bfdd5e6fee7a35d9553436f9cc3572f53a46e51f86efe929ebf339499e536e406ac3a3e68a6f44c1301757fa2ffe3be3c59c9d1c0000d7c85dd535b3 SHA512 e9e39fc7c106a244c219443ba4a90150832f9bebe80456e004693d5440f3b3f9dc80603e394c40784c803190383973c435ba2092990db58cf08d9fc9e20bfcea
+EBUILD wxGTK-3.0.4-r300.ebuild 5200 BLAKE2B bc4cfe6fe8ff393323d6695611b126a476dc414ef35e56748f09417e3483e9b7a314300b413e88172d300adcc3d4c9b3faa188ac61feff6f0b8b92d2869a184a SHA512 adde834493c288b350e10c12ca0531a7fbdff479f4970ee04f5cfaf73b4e43f522a9b7227ed4fdfb065a67686f8bf3ba80dca8f6cefaaa265fdbe981f1ccab1d
+EBUILD wxGTK-3.0.4.ebuild 3980 BLAKE2B 2eaa5964205dcb93da849879abb060bde0f6b04c07fb5122797de5881492106461c838fa999edf26ae794071eee39a6577123fb8eacfdb7a00049fe503f89eb4 SHA512 0ea8c93932d70059f2623f96047a9fb0d89c8419ebc886c8b193e4feb1b39feb98f6266682a31638b14e7193c467a56b473d7a644bf53cdb3afba3ecf9015534
 MISC metadata.xml 759 BLAKE2B 4bafb6bd1d082eae5773d84fb116779f337e662090c4d01e22296f891114458de4a50f1f10775b61f06f22c6db7d4288c66c0c59836cc362298c23fecef499af SHA512 a7bf3b8cecf7ffba0dbfded9884fb7df3866c1a00c473f9ecb2d3fc1c84c5713dcde949f6acc35ee688741efb2da74fc189ed9c58b24bd2874c7e95908eb1f60
diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r300.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r300.ebuild
index 68a8c1fa35fb..8675e0098d98 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.4-r300.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.4-r300.ebuild
@@ -1,4 +1,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/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidge
 	https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20180507.tar.xz
 	doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit"
 
 WXSUBVERSION=${PV}.0-gtk3			# 3.0.3.0-gtk3
diff --git a/x11-libs/wxGTK/wxGTK-3.0.4.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4.ebuild
index fd106604fa08..fcfff9af0b8a 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.4.ebuild
+++ b/x11-libs/wxGTK/wxGTK-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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidge
 	https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20180507.tar.xz
 	doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )"
 
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff"
 
 SLOT="3.0"
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 0920669fbcc9..0c1244f75bb6 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/cdm/Manifest b/x11-misc/cdm/Manifest
index 7f82e577afd3..7b0d55f28332 100644
--- a/x11-misc/cdm/Manifest
+++ b/x11-misc/cdm/Manifest
@@ -1,5 +1,5 @@
-DIST cdm-0.6.1_pre20130419.tar.gz 16056 BLAKE2B a92eabbc044b58e751b29bc05073052605b03460fa1aa62f15385c78e3c2ca033f8a25b40c646eed1602f3856e97d8dd6f987ecbc6ba50ad68aad4813725e72b SHA512 638d92c536609b8bf1d08f4be80933e5ff23acfe412ee6b72ff924edbe1e510110b7941caea9b206136ee5a75dddd998275e89c132feba0ed3df26ab1657bf8b
 DIST cdm-0.6.1_pre20180107.tar.gz 16541 BLAKE2B 19b7a8f6ef7541333b96bb3c2d6a9d3b7ce3bffdcf6653a3799d963d3b3bab3fe3553469a9cbf0f493109ad5308c739b25ce9e5801d0904f5d7b6e78b680e2fc SHA512 dc5587debb304636be25afdf60e8328b1eb9b961694813b089df504567f63cfeac6de17df715d589cec597f51044b8c121242ebefbe5bfeccf6aa072b1c03a40
-EBUILD cdm-0.6.1_pre20130419.ebuild 1867 BLAKE2B 1496f15109e6b493c6181493d74b712b8f60c24a09ffe485b08688667be553df4238df089b52db87b16e9e5c5b1837f20a3709dfdefa69c6c344bba66d398e8b SHA512 e8ca7ae97e632a8d8190a5019b373d9bd30c70cc888632071ce05bed16297d5166ea068dac0f97368b44f0c7ce844d065cbc1a361729664f3a42e8353ea01133
+DIST cdm-0.7.tar.gz 16154 BLAKE2B ca240e253ad4ed6b5e634069b98c90c00852fc6d6550ca1f72b3399435264055cfca31f88f6061daa3e2e3445bd1a8ad9f950b44968df4c77d6c8150b2782a34 SHA512 51591b953ec83c06a5a4407c6d6083ac11e7095c7fb22e491ed3d6626217462529d3dd3590c2a256273b3668c7246b13bfd1f2f682f5bd860ca8a34aaca0b6f5
 EBUILD cdm-0.6.1_pre20180107.ebuild 1851 BLAKE2B 6b9fe3ccc497f06c1941401b9246e1a5379be522b8b95d7b235fe3cf5a9cc40115a17797720dc9dc0e0d6dfcc73965a23f3cd4604f1a2ebbe2d103c5008467ee SHA512 ada7bacbae684ad50ae25c4eb92b23ab11c6c0d63e670c440f5b8f52cfe487ec12da1406008c9d3024f32212eee98347ea715417ed82d2fe9282c412a2b872ee
+EBUILD cdm-0.7.ebuild 1865 BLAKE2B d24fc52915b49253327b7f1719621da33e8532ce39aee76c373609cc72185f392e84e62dc623b999532f7979e9e25c65bc3871bd86d8e360987f714af23251b1 SHA512 eeb099553a7395f47d1c9f04a31a57094c79f34b768ccfa6127c5cdd6d373f136ca3c6426a72e0e71c0889e2778ca780ee3caf9d675e68758e5170ebbbd3931e
 MISC metadata.xml 717 BLAKE2B 08ac966702b39c5c912ab82c1115a3eb9166719fe1e87cbd193ba7ba61b8fca81546c86361ad9c5c51ffb7bfbfc283c4e89d250b58925c5d034d8f37d72e1357 SHA512 cfabe6705c7af59ba703ca849a7cddd649cad9c0dbd939c4fb5e2fcc2cd5383f5771f0d259b1259516037c9d8c41bd2b59a86d70109494d7e4a131ce232b5929
diff --git a/x11-misc/cdm/cdm-0.6.1_pre20130419.ebuild b/x11-misc/cdm/cdm-0.6.1_pre20130419.ebuild
deleted file mode 100644
index 2544ebcfa1a4..000000000000
--- a/x11-misc/cdm/cdm-0.6.1_pre20130419.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit pam eutils
-
-DESCRIPTION="The Console Display Manager"
-HOMEPAGE="https://wiki.archlinux.org/index.php/CDM"
-SRC_URI="https://dev.gentoo.org/~gienah/snapshots/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pam consolekit"
-REQUIRED_USE="consolekit? ( pam )"
-
-DEPEND="app-shells/bash"
-
-RDEPEND="${DEPEND}
-	dev-util/dialog
-	x11-apps/xdpyinfo
-	x11-apps/xinit
-	consolekit? ( sys-auth/consolekit
-		sys-apps/dbus )
-	pam? ( virtual/pam )"
-
-src_prepare() {
-	if ! use consolekit; then
-		sed -e 's@consolekit=yes@consolekit=no@' \
-			-i "${S}/src/cdmrc" || die "Could not turn off consolekit in cdmrc"
-	fi
-}
-
-src_install() {
-	if use pam ; then
-		pamd_mimic system-local-login cdm auth account session
-	fi
-
-	insinto /usr/bin/
-	insopts -m0755
-	dobin src/${PN} src/${PN}-xlaunch
-
-	insinto /etc
-	insopts -Dm644
-	doins src/cdmrc
-
-	insinto /etc/profile.d/
-	insopts -Dm755
-	newins src/profile.sh zzz-${PN}.sh
-
-	# Install themes
-	insinto /usr/share/${PN}/themes
-	doins themes/*
-	# Copy documentation manually
-	dodoc ChangeLog-0.6 ChangeLog-before-0.6 README.md
-}
-
-pkg_postinst() {
-	ewarn "In order to use CDM you must first edit your /etc/cdmrc"
-	ewarn "At least the binlist, namelist and flaglist entries should be added or edited"
-	ewarn "to specify the X window managers and console shells that you want before"
-	ewarn "you start CDM.  Something like:"
-	ewarn "binlist=('xmonad' 'startkde' '/bin/zsh --login' '/bin/bash --login')"
-	ewarn "namelist=('XMonad' 'KDE' 'Console Zsh' 'Console Bash')"
-	ewarn "flaglist=(X X C C)"
-	ewarn "Ensure the flaglist X entries correspond to the X-Windows programs, and the"
-	ewarn "C entries correspond to console shells.  Then just login with your username."
-	ewarn "Remove xdm from default runlevel."
-}
diff --git a/x11-misc/cdm/cdm-0.7.ebuild b/x11-misc/cdm/cdm-0.7.ebuild
new file mode 100644
index 000000000000..a2ed855b1c53
--- /dev/null
+++ b/x11-misc/cdm/cdm-0.7.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit pam eutils
+
+DESCRIPTION="The Console Display Manager"
+HOMEPAGE="https://github.com/evertiro/cdm"
+SRC_URI="https://github.com/evertiro/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pam consolekit"
+REQUIRED_USE="consolekit? ( pam )"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-util/dialog
+	x11-apps/xdpyinfo
+	x11-apps/xinit
+	consolekit? ( sys-auth/consolekit
+		sys-apps/dbus )
+	pam? ( virtual/pam )"
+
+src_prepare() {
+	default
+	if ! use consolekit; then
+		sed -e 's@consolekit=yes@consolekit=no@' \
+			-i "${S}/src/cdmrc" || die "Could not turn off consolekit in cdmrc"
+	fi
+}
+
+src_install() {
+	if use pam ; then
+		pamd_mimic system-local-login cdm auth account session
+	fi
+
+	insinto /usr/bin/
+	insopts -m0755
+	dobin src/${PN} src/${PN}-xlaunch
+
+	insinto /etc
+	insopts -Dm644
+	doins src/cdmrc
+
+	insinto /etc/profile.d/
+	insopts -Dm755
+	newins src/profile.sh zzz-${PN}.sh
+
+	# Install themes
+	insinto /usr/share/${PN}/themes
+	doins themes/*
+	# Copy documentation manually
+	dodoc ChangeLog-0.6 ChangeLog-before-0.6 README.md
+}
+
+pkg_postinst() {
+	ewarn "In order to use CDM you must first edit your /etc/cdmrc"
+	ewarn "At least the binlist, namelist and flaglist entries should be added or edited"
+	ewarn "to specify the X window managers and console shells that you want before"
+	ewarn "you start CDM.  Something like:"
+	ewarn "binlist=('xmonad' 'startkde' '/bin/zsh --login' '/bin/bash --login')"
+	ewarn "namelist=('XMonad' 'KDE' 'Console Zsh' 'Console Bash')"
+	ewarn "flaglist=(X X C C)"
+	ewarn "Ensure the flaglist X entries correspond to the X-Windows programs, and the"
+	ewarn "C entries correspond to console shells.  Then just login with your username."
+	ewarn "Remove xdm from default runlevel."
+}
diff --git a/x11-misc/lightdm-gtk-greeter/Manifest b/x11-misc/lightdm-gtk-greeter/Manifest
index b644cfdd3c89..42d6dabc038c 100644
--- a/x11-misc/lightdm-gtk-greeter/Manifest
+++ b/x11-misc/lightdm-gtk-greeter/Manifest
@@ -5,6 +5,6 @@ DIST lightdm-gtk-greeter-2.0.1.tar.gz 467375 BLAKE2B 9b6e4c597b0dcace770609f7bbe
 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 2089 BLAKE2B 5fef01529195723be45e206b6f1f148d691f52c6b5cdfe385b16ca61ecd594c1072aa5838eed38c9ef5099705af1db35b44fff3f4e55b5b85434b4abc5eb6094 SHA512 7ebd430fae70dd07160fafdd77e72a0ff0c3f4e97544f052d1fa0c76d0cc0e177e3b1eb120cb5a2da1177fbab522ab8c226c94dd35999c05d33b13032e4f706c
+EBUILD lightdm-gtk-greeter-2.0.5-r1.ebuild 2085 BLAKE2B 5b74f1788e563c1b32615df7d1cb37f54cabe2d2e1420df73805e52ce32b31cf228334f7188bc6a0bcd586a47f8d50c1ae49577fa1dc34eb48ff29dc0202a1f0 SHA512 88497f45067513784612497866e0029927116f1fed2c9eb4de09f68e9244411742d45ea0b7b8bc757805d45c2a22b21fee054ad248ad7651b459a55c9afc2628
 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/lightdm-gtk-greeter-2.0.5-r1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.5-r1.ebuild
index 29d9947b7e8b..d0278ccc4699 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
@@ -1,4 +1,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://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 a52105fbccc8..40729a78002f 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -10,7 +10,7 @@ DIST lightdm-1.26.0.tar.xz 516092 BLAKE2B 0bbbe11959a2ea0c21e723d10e8831fc0d9e15
 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 3867 BLAKE2B c61a27aeb76a85368b47c06bfb02ccc1c90f80f254ac47de7eddd67d492c08014000c2dfae163e12eec4a7d162c7f44028e454604faad12a5bcc7d9ff683755a SHA512 96a3ecfe08c54ea795ab2155902b8b8cb0bd8fa5e0f3e97c76facaec5a293fa6d7897bb806d6d3d5936095bb826688a0d3ff1d43068decad7bca5f82d5208357
+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.28.0.ebuild 3899 BLAKE2B 8dae4273893bde7f0f6f0818e03f61e40bb5b7896d500e6ec804816e4aa190b2475bb1dfed979e336a010dc6d061505f82f1ba44698a417bd2ccd1ec9e88c340 SHA512 7258bede873fd974a3fe1e63678b518626b656922c0bed6a5a631b7ddf91c3fa996aa66f3139d97ff4bc868408d64305c0fdcef10662f016ef71c45257b9da6b
 MISC metadata.xml 392 BLAKE2B b3c495f83a30fe7dfee0e7f244c8d2d2df1a30fa8e50a071e0d63dbefa15189058d54ea3e881ab953c1cd9cd8dca74c37b0013da56f795422c0d0e9c2a0297bb SHA512 f44fb165a56a51fea1f3c1afddaab69971d9d56249b74eb7bf1263c120581d2e0b699f1f7fa94a9d3da57421b5d6070f03cb10643e3b3713c771f8c992457fa3
diff --git a/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild b/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild
index 4b348398380f..8d4e3781fef1 100644
--- a/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild
+++ b/x11-misc/lightdm/lightdm-1.26.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
@@ -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/mate-notification-daemon/Manifest b/x11-misc/mate-notification-daemon/Manifest
index b26145e97ae7..903c516e95ff 100644
--- a/x11-misc/mate-notification-daemon/Manifest
+++ b/x11-misc/mate-notification-daemon/Manifest
@@ -1,10 +1,4 @@
 AUX org.freedesktop.Notifications.service 94 BLAKE2B 1a97aac2db9c803c9e4babf9067283b564a1eecb1d251aee3a5e66b8a4f63d2554e3e09ea06749383ce3d5b8e77c8cc3bd87ae2dde48ae8feb4886ecaf7a3c27 SHA512 0575cbfc094455c0a2f04faa534a5e0d9cc41e6d9566ab9bcb0fcbce99e142213ded786ad00c36dc434ae1b9208d34d234a341dfc86adb72925dad0ee2b25f97
-DIST mate-notification-daemon-1.12.1.tar.xz 304752 BLAKE2B 045cb71199f555ebe2b179c36508b73c94fb3b43ebd957298946c06acaa9169ee9aed42444bd74a443a819370c189a5af2e3aa3e72b9fefe8476a5ce28bec9ba SHA512 ce9cd1737cc70b0e17fa856730b51747f78bb40639ff58e205a3f1432edf53aba38442d59b7a4fca6ff460cbdc6c611c0a05a46bbf5db92db0ce5e714e19daae
-DIST mate-notification-daemon-1.14.1.tar.xz 336196 BLAKE2B 68582f5c29e4a92187fd7b1b259350ba6ed783c92853dfb39b63faa58cc316dd9ecc7133710e0ec2555f534f2f61bce65b2bf190d5703d55d01dad550bc17839 SHA512 6913e0a7891726fb2f4098b4c7ba578344d29960e6d27a9fa917687f745aedb9482fb65ea9c6d8816a0c8e505ef586f13ac08b010e558b6557e14e8961b1c1f6
-DIST mate-notification-daemon-1.16.1.tar.xz 337088 BLAKE2B a4ba0ab6e66a7771ec7c7786201a5e5e98cf30111212e57cf15ae03b6a49756503e2e9d68f288497166d3c1ee350a29393247dc3c9ece655775384964fb8fcb5 SHA512 93c9a09801e54f7cd7f3c6542e3593886201bb59a9bca56af7454ff901540ef7fbb236c38786ba9444fe3aaff7598c549c274ce0a90fee27bcf28fc201f64b88
 DIST mate-notification-daemon-1.18.1.tar.xz 330940 BLAKE2B e05d2b69a66037a49cf0a1aa44a417d9fb55fecc1dd713861907b38d0361d6a9d79faa95094027add0d0e549a979eb237e8e71e1e2102664813b7745f34316f3 SHA512 92edb738e38b879a94985d97c961fd900853e330cc49024cf33a1b564734e86c076b47a05c64ec7ea34a170425b97f80aedb60ad14db98718c4609c464e091e4
-EBUILD mate-notification-daemon-1.12.1.ebuild 1142 BLAKE2B dbf150b144dc157b083beceaeaf2228a6b5772be4edb8b64e4428a43e60208d1622f0f6ab7f313de69dab6cf3e1b54acd0ebec8c08cc5cfd557a4f7cb1ba9594 SHA512 a613fd6ca276038f53d29bf26aa0fa69e4f1de1d86b2e50f0a7b95352ef34a864997e298ca5bfb69324bc4613f12a4d265fc55fb05b2d815f08ab57d2c61d5ae
-EBUILD mate-notification-daemon-1.14.1.ebuild 1182 BLAKE2B 73103c6bf7704647238f440be8b8432e2b4352ec042322f7ca9991fcd41f7a08c39d2d668792d06704f0144e730574976e473ab71bd68b763f32350b503bb3e7 SHA512 c1675a178a05379c5c15533290ca4548731c81ac1577b753227742c74b6279641f21d387ad36daa1879dfa38af3e5f8bed1989fb33b7b2203ececc843d29401b
-EBUILD mate-notification-daemon-1.16.1.ebuild 1027 BLAKE2B e3060b0e84f47d6c1dfc66d98c2e8ad86c69d2d60ed7155698c34d07edacf38ed7396c3d33764174535595b8b4687322ba888bb6d2f3ee3a3958f9a6ea6ae414 SHA512 a98ea3dc08effc311f49b0b4fc5f28146829895f9e3cd9e5dcb0bb56934f54d2579f37eb38b0c547386278f7407848b61dc5929a0256326a5fd02b93351e54b1
 EBUILD mate-notification-daemon-1.18.1.ebuild 1032 BLAKE2B 5ebe5bee75855a462c86e3490738dbc92b566700907addf857cf11fb4c259da209e425f93e2a8b58b90ced736eb2f1c861b681b52984c4a22458850637b564a0 SHA512 80c2d4d22ad21388adf2f8aece0af19d927290b2d0f4808cb0d52e35c409a1ed8b7f02da0ad6c7c0ca569a4510f47237b7cda8df3e53c2e82b5e41663daeb9fa
-MISC metadata.xml 429 BLAKE2B e6d7c9c85dee38c96c6160b31931e12284e62c507e35595203b8c8b0c187e9a3605c1b25df14f829f46203977c8a995251cb3b5ae09277c229ab997b99a4b87f SHA512 24f0a76380f18822df9024ebf95fddc8fb944ad6200f70a2f8952a6ab5028466793b3e26cbb4b6dffdbd685ee0ba6c1bbcd76d9d9bff87cac5c697a879ee93ed
+MISC metadata.xml 353 BLAKE2B 774bcae8807bbb16a1ee8bc12320e487ec817fb45d3169f4929cbd8c3f7f33a35eb1aad2682e5d87131567c56e6ffe8f2bdbda612c58926ddc3d78b14cb69e53 SHA512 3f46b4bb5e12fdb448e7b7f54db4f4a4683cbdbd89019156601abf80be0333690b65670fb110120cf613dd42ecdfb38b329ddde67fd265257d6ddb32e24bfbbd
diff --git a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.12.1.ebuild b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.12.1.ebuild
deleted file mode 100644
index 3ce818bdd6e8..000000000000
--- a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.12.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="MATE Notification daemon"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk3"
-
-RDEPEND="
-	dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.78:0
-	>=dev-libs/glib-2.36:2
-	>=sys-apps/dbus-1:0
-	x11-libs/cairo:0
-	>=x11-libs/gdk-pixbuf-2.22:2
-	>=x11-libs/libnotify-0.7:0
-	x11-libs/libX11:0
-	virtual/libintl:0
-	!gtk3? (
-		>=x11-libs/gtk+-2.24:2
-		>=x11-libs/libwnck-1:1
-		>=media-libs/libcanberra-0.4:0[gtk]
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3
-		>=x11-libs/libwnck-3:3
-		>=media-libs/libcanberra-0.4:0[gtk3]
-	)
-	!x11-misc/notify-osd:*
-	!x11-misc/qtnotifydaemon:*
-	!x11-misc/notification-daemon:*"
-
-DEPEND="${RDEPEND}
-	app-arch/xz-utils:0
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	>=sys-devel/libtool-2.2.6:2
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0)
-}
-
-src_install() {
-	mate_src_install
-
-	insinto /usr/share/dbus-1/services
-	doins "${FILESDIR}/org.freedesktop.Notifications.service"
-}
diff --git a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.14.1.ebuild b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.14.1.ebuild
deleted file mode 100644
index f8ba713dc2e2..000000000000
--- a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.14.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE Notification daemon"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk3"
-
-COMMON_DEPEND="dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.78:0
-	>=dev-libs/glib-2.36:2
-	>=sys-apps/dbus-1:0
-	x11-libs/cairo:0
-	>=x11-libs/gdk-pixbuf-2.22:2
-	>=x11-libs/libnotify-0.7:0
-	x11-libs/libX11:0
-	virtual/libintl:0
-	!gtk3? (
-		>=x11-libs/gtk+-2.24:2
-		>=x11-libs/libwnck-1:1
-		>=media-libs/libcanberra-0.4:0[gtk]
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3
-		>=x11-libs/libwnck-3:3
-		>=media-libs/libcanberra-0.4:0[gtk3]
-	)
-	!x11-misc/notify-osd:*
-	!x11-misc/qtnotifydaemon:*
-	!x11-misc/notification-daemon:*"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils:0
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	>=sys-devel/libtool-2.2.6:2
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0)
-}
-
-src_install() {
-	mate_src_install
-
-	insinto /usr/share/dbus-1/services
-	doins "${FILESDIR}/org.freedesktop.Notifications.service"
-}
diff --git a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.16.1.ebuild b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.16.1.ebuild
deleted file mode 100644
index d83471e84741..000000000000
--- a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.16.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE Notification daemon"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE=""
-
-COMMON_DEPEND="dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.78:0
-	>=dev-libs/glib-2.36:2
-	>=sys-apps/dbus-1:0
-	x11-libs/cairo:0
-	>=x11-libs/gdk-pixbuf-2.22:2
-	>=x11-libs/libnotify-0.7:0
-	x11-libs/libX11:0
-	virtual/libintl:0
-	>=x11-libs/gtk+-3.14:3
-	>=x11-libs/libwnck-3:3
-	>=media-libs/libcanberra-0.4:0[gtk3]
-	!x11-misc/notify-osd:*
-	!x11-misc/qtnotifydaemon:*
-	!x11-misc/notification-daemon:*"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils:0
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	>=sys-devel/libtool-2.2.6:2
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure
-}
-
-src_install() {
-	mate_src_install
-
-	insinto /usr/share/dbus-1/services
-	doins "${FILESDIR}/org.freedesktop.Notifications.service"
-}
diff --git a/x11-misc/mate-notification-daemon/metadata.xml b/x11-misc/mate-notification-daemon/metadata.xml
index 95b491804603..249738c0cd36 100644
--- a/x11-misc/mate-notification-daemon/metadata.xml
+++ b/x11-misc/mate-notification-daemon/metadata.xml
@@ -5,9 +5,6 @@
 		<email>mate@gentoo.org</email>
 		<name>Gentoo MATE Desktop</name>
 	</maintainer>
-	<use>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/mate-notification-daemon</remote-id>
 	</upstream>
diff --git a/x11-misc/mozo/Manifest b/x11-misc/mozo/Manifest
index 5ee422c4b483..c05888158a7b 100644
--- a/x11-misc/mozo/Manifest
+++ b/x11-misc/mozo/Manifest
@@ -1,10 +1,3 @@
-DIST mozo-1.12.0-gtk3.patch.bz2 6562 BLAKE2B 1b594ad4f3fbab0534ee90be8b10aa219b836d349031175237863db8f32394f4e387f5114c5fa29c26c1c13d77dd8bc2b8ffa425e6f4e55b49c184cd5a3689d4 SHA512 9f86a77f29fb359fb59092d819634d2223b74c5eb149917b1442589306d989cfb87df2cc8c4f1e36fd086ba57a75274feccb4978cc0156e20cfd73712ea2a48b
-DIST mozo-1.12.0.tar.xz 163820 BLAKE2B 337bf187e9d14fb61750a306314eb5d4a57f4dd187cb7d0fed953fb91907e71a3afa57625cf68d96605dcaf63689305b07de94327e39b38012d9d64835217ec4 SHA512 93e760b791a74b6a6ca0377d5aaa060c8bf339dcfde91fcb146ef1e37cc25912b3c93fa2b4d612c0abf2bbd00597c80b58769bc88b57925ec4c465967f32c05b
-DIST mozo-1.14.1.tar.xz 171576 BLAKE2B b4ca3588e57cadd1ee814045b59b464487265a0eb391288d936d8c2290be2e28ed24e541eabe6a912fe54a238569e0832a62a911d52dc0758db3b7aee3ac3822 SHA512 62269ed358807d7ebcf04e6bcbfd3689f019396ebd43a8634bca752f13d6609e94b97688b5fdfa83b1168f0e1cdf284275dc08054e27ab507ce40c2de881bc76
-DIST mozo-1.16.0.tar.xz 172312 BLAKE2B d1fd10aa32b7619238584ab33637b7bbc6404f5741445f1c09fed2132c69eeb4f2727a43c0cd3d7673bf689e15750739d04dd84c39d5c611016a0401fd48415e SHA512 507a35bbdad944ec55ce81e5193af9e5697747c2fc55817b3e3913aca68f1d99caa75df1d79f3b7abc1ba354a5c4f34c868e054e20cb86e5d0a7d65b463af57a
 DIST mozo-1.18.0.tar.xz 173432 BLAKE2B 46c791b056c3fb8bb768599f4b474cd9434d6918d9deb740e2d65bef5853199822818e02a7cf9b653d3ef49453aff413b09ad92cda218f70db950b19b5f74363 SHA512 e333c572e5bc1d0905daed17eacd3dda10df5f80ed5b5b01ca3478d345a8c724e0161ccf51914f4982f16df71f252a3b08b194bec18e6aee05eb7af021369a12
-EBUILD mozo-1.12.0-r1.ebuild 1585 BLAKE2B 9a8efa5e5e5b8a3607b038b97a0fbc06e12a873c20afe7c795e91480aaa2606b420772e3692eb31169847ff47afb88680460eb3f538c508821a6a19937a4ace0 SHA512 d78543192113d0ee62d7b9942580a6bc9aab9b38fa4b822ed40b037062ed459c675ec3d2d222c2c8455b43bdec5404e192a5a72d5eb7d039d2d2b7dad4de7778
-EBUILD mozo-1.14.1.ebuild 1269 BLAKE2B 7b27dbfef7ba6f4cb6a5f5f22b6a5d962c502203dd69bf413a6db6f22c9fd4df5b78259c00006a805d8c197130dd7b4e6126521c54d5ad7d35e0be0f1223cc9b SHA512 82ca5080f8c219fc826cf2d54fb7563d9755d7a4a50ee1de370dd235c7b9a06e1d830749e177b40189a5d099572c9b7487e1d0724940644ef7ae47d06d2c4bee
-EBUILD mozo-1.16.0-r1.ebuild 1276 BLAKE2B f83da25567034b28429ad8d524d2bc1b8321de0b9e281a7cc9b2964507b68bc71d1a623159b92e7cd199c88faeaf5b17e4d64fa401d3c75ac5aed0dfef021881 SHA512 acbc78914cdb301b86b8cc002c5dee690c8ef24af612356e832e7fef98c69f9f4b41bda83f8d021bc35b13fa68b8e6dab2d300007533c6531973116ac1ce8ffa
 EBUILD mozo-1.18.0.ebuild 1244 BLAKE2B 905b4b829c793d2f92e1dbce3789899dfb453723b40d8583bc1a3d4436c8ca670c70ed477ac6ba239f0116291a2496860215ec3b5e8c6926b4f2cf6e252f3044 SHA512 89c75d5549f13452ca1e642f46aa6011e055fd82a435e9ee027a6a3cad5caba90589dac45e6dddb8e299eea3cd5516aeef4caab3a655c72330dd9f2e234132a6
-MISC metadata.xml 409 BLAKE2B 6f681539e5a6893c65760326ee1f6eecb3b3526da969e9398d36ec5e8bfe5ff540dd700be6b2b491bc8014ef1ba532ed2b0f3924efd80e7f2cbb656938779a95 SHA512 a99cda7183e71decfb25316fc3466140b701878a053a9375213760f0c1b6497b4d772731d60242b421e3283913884939911c561eb9116bb6972e7abcfeb2f1a8
+MISC metadata.xml 333 BLAKE2B 9901ffa7d882f0f741c95670130db70920ebbe94af75b8d9b72f48f8eb1b48d9425b7ff49dafbe001e5287ff3eafd2d60a8760a262ab6601fecc63642e242591 SHA512 eb3bc4b3cf1cfde5f96cd414138790deae0435e8ba41576e1e44b150defd5fdda0b921d4dbb0798b9653ad5aa7690247fb69cd25d03752f8bde8017419596a76
diff --git a/x11-misc/mozo/metadata.xml b/x11-misc/mozo/metadata.xml
index 6931d558370c..dae74193c803 100644
--- a/x11-misc/mozo/metadata.xml
+++ b/x11-misc/mozo/metadata.xml
@@ -5,9 +5,6 @@
 		<email>mate@gentoo.org</email>
 		<name>Gentoo MATE Desktop</name>
 	</maintainer>
-	<use>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/mozo</remote-id>
 	</upstream>
diff --git a/x11-misc/mozo/mozo-1.12.0-r1.ebuild b/x11-misc/mozo/mozo-1.12.0-r1.ebuild
deleted file mode 100644
index 9cf53b815bbd..000000000000
--- a/x11-misc/mozo/mozo-1.12.0-r1.ebuild
+++ /dev/null
@@ -1,75 +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 python-r1 mate
-
-SRC_URI="${SRC_URI} gtk3? ( https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${P}-gtk3.patch.bz2 )"
-KEYWORDS="amd64 ~arm x86"
-
-DESCRIPTION="Mozo menu editor for MATE"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="gtk3"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=mate-base/mate-menus-1.6[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	virtual/libintl:0
-	!!x11-misc/mate-menu-editor
-	!gtk3? (
-		>=dev-python/pygobject-2.15.1:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.13:2[${PYTHON_USEDEP}]
-		>=mate-base/mate-menus-1.6[python]
-		x11-libs/gtk+:2[introspection]
-	)
-	gtk3? (
-		>=dev-python/pygobject-3:3[${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-	)"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_prepare() {
-	if use gtk3; then
-		eapply "${WORKDIR}/${P}-gtk3.patch"
-		MATE_FORCE_AUTORECONF=true
-	fi
-	mate_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	python_foreach_impl run_in_build_dir mate_src_configure \
-		--disable-icon-update
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_test() {
-	python_foreach_impl run_in_build_dir emake check
-}
-
-src_install() {
-	installing() {
-		mate_src_install
-
-		# Massage shebang to make python_doscript happy
-		sed -e 's:#! '"${PYTHON}:#!/usr/bin/python:" \
-			-i mozo || die
-
-		python_doscript mozo
-	}
-
-	python_foreach_impl run_in_build_dir installing
-}
diff --git a/x11-misc/mozo/mozo-1.14.1.ebuild b/x11-misc/mozo/mozo-1.14.1.ebuild
deleted file mode 100644
index 7d024452e8bb..000000000000
--- a/x11-misc/mozo/mozo-1.14.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit python-r1 mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Mozo menu editor for MATE"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=dev-python/pygobject-3:3[${PYTHON_USEDEP}]
-	>=mate-base/mate-menus-1.6[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	x11-libs/gtk+:3[introspection]
-	virtual/libintl:0
-	!!x11-misc/mate-menu-editor"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_prepare() {
-	mate_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	python_foreach_impl run_in_build_dir mate_src_configure \
-		--disable-icon-update
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_test() {
-	python_foreach_impl run_in_build_dir emake check
-}
-
-src_install() {
-	installing() {
-		mate_src_install
-
-		# Massage shebang to make python_doscript happy
-		sed -e 's:#! '"${PYTHON}:#!/usr/bin/python:" \
-			-i mozo || die
-
-		python_doscript mozo
-	}
-
-	python_foreach_impl run_in_build_dir installing
-}
diff --git a/x11-misc/mozo/mozo-1.16.0-r1.ebuild b/x11-misc/mozo/mozo-1.16.0-r1.ebuild
deleted file mode 100644
index 8f48007b8fc7..000000000000
--- a/x11-misc/mozo/mozo-1.16.0-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit python-r1 mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Mozo menu editor for MATE"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=dev-python/pygobject-3:3[${PYTHON_USEDEP}]
-	>=mate-base/mate-menus-1.6[introspection,python]
-	x11-libs/gdk-pixbuf:2[introspection]
-	x11-libs/gtk+:3[introspection]
-	virtual/libintl:0
-	!!x11-misc/mate-menu-editor"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_prepare() {
-	mate_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	python_foreach_impl run_in_build_dir mate_src_configure \
-		--disable-icon-update
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_test() {
-	python_foreach_impl run_in_build_dir emake check
-}
-
-src_install() {
-	installing() {
-		mate_src_install
-
-		# Massage shebang to make python_doscript happy
-		sed -e 's:#! '"${PYTHON}:#!/usr/bin/python:" \
-			-i mozo || die
-
-		python_doscript mozo
-	}
-
-	python_foreach_impl run_in_build_dir installing
-}
diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest
index 3d462c46f179..08102d2adcbb 100644
--- a/x11-misc/polybar/Manifest
+++ b/x11-misc/polybar/Manifest
@@ -3,4 +3,4 @@ DIST polybar-3.2.1.tar.gz 242327 BLAKE2B eb7bfe6e6d58fb4389016b8e5c73feea3984ce3
 DIST xpp-1.4.0.tar.gz 84095 BLAKE2B 2af4221953abe7f40473c55cd50c608b54ebc85a62be65af987ed5e6c5eaf56fbd92531788becf39ba5ad52099ac78f36e9b2a2515b473f4d86ed5fda3fa5065 SHA512 d34cbbe2391db36db7dffac0415d26b7487536e97c4d7efd472ab0aeffa4c8e757ee030b05e2aa1cfa8a591ee591bb96a6db7eb9fa5850027f958e92f078739c
 EBUILD polybar-3.2.1.ebuild 1788 BLAKE2B c44044b3a7e3db34d10c9e018e52f192920f8a42fa6ea93e27c3cd0109143d8331c5f28e74958ed90fd569c632aa88257132c61625b0f5fb30cdfdb09f91b460 SHA512 db2abec6f14c08ed7beeff4fe90b2d832b5f249b64e5b0e4897316de597675bf06e4704ae8aa8635ec40fb3eca0e9be81c38889e82ddb7e98b73d99a69529980
 EBUILD polybar-9999.ebuild 1187 BLAKE2B b42e5685622509643cd9b8c73c2d119eb0adfc5904c52ddce1b66cb0ae4735e05e46a8e18e98f62ee6f47080c57869704b11fc2af7e593292d9736ee4d533551 SHA512 e548c3f17e6ee4c2f5190d5706d83ca567eb3c2f5c2a8bdda6e9984e6d2ba36b1f38c6052095152ca02958ff2fda7af211ff13e44f1294a0c4c7bf2a998fa5d0
-MISC metadata.xml 500 BLAKE2B b465aaa93414c90da842bba99b5b2c8310107cb3cf1e763fa59f20a3d9a0322f1395caf64bdc2363ab128bd3b9d2b03006af47783dfb444217341e727d2f1d65 SHA512 8a4148eec8d8ea0fd1ca070e98a48db0554fb8efbadc00cae85ea3aabd0a2010bc0c3e9997543cb9587d30be0156e0826228861641a19e85541329ccddccd9c4
+MISC metadata.xml 580 BLAKE2B 965fdbd2a3799e0c8a9b6f03bfb7e21f1f413a226bd4748d860f4711d60bfadc2d6c2fdb37f3bf9933f2c494e7e6e0c0705c9a0ebef943ec2978f3aaf65c0176 SHA512 15b64a04e588b5edeec9aa5e579881c3e7c5a7f3fb66ed4443f32d50b850c437f65bc9050960710f2bb1e80ea52ccca9ecb19e8bf68fe66edddc8896a58aeeb9
diff --git a/x11-misc/polybar/metadata.xml b/x11-misc/polybar/metadata.xml
index 0d096068a332..7a2477b509ec 100644
--- a/x11-misc/polybar/metadata.xml
+++ b/x11-misc/polybar/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
+	<maintainer type="person">
+		<email>johu@gentoo.org</email>
+		<name>Johannes Huber</name>
+	</maintainer>
 	<use>
 		<flag name="i3wm">Add support for i3 window manager</flag>
 		<flag name="ipc">Add support for Inter-Process Messaging</flag>
diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest
index ae7cd88f7007..4f4c5c5e86d1 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 1506 BLAKE2B 0770576b025a2bbf30226124bf9d662f31c92c0148b17d8d99b9ced6a65980855117be98140d5b727422cc77638627d59e37170e9e73efb0aef256320151a8e2 SHA512 174b112cf09e880d193c4b7dcc4bd5d07556256aad0096c4d119d411e6d4226a18565e4dca7d7d93376586248962d50301beaff092a848aa2cb968b3a0746552
+EBUILD shared-mime-info-1.10.ebuild 1499 BLAKE2B 35b714f53be2155c2b52fff34a1433ed03538dfd000a90aa9be84ee11a5449eaaedf5e98178d9e53d071e9a97375d5f28c34bd3d3658baf19e30f6f7b987a351 SHA512 6a01d4bbdaec281003bb7f580d75a7964921c0d3c8250f3adff57dbb8055954c24b2dabb211731a76142363c4c54468060be3519fcc6c2e63bca71205e91e9db
 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 5f1052b62554..95efb722f106 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
@@ -1,4 +1,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://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/urxvt-font-size/Manifest b/x11-misc/urxvt-font-size/Manifest
index c9dbf5c5584c..4762a92405a2 100644
--- a/x11-misc/urxvt-font-size/Manifest
+++ b/x11-misc/urxvt-font-size/Manifest
@@ -1,6 +1,6 @@
 DIST urxvt-font-size-1.1.tar.gz 5490 BLAKE2B 5e9388c25a143a41d84511a03c8821058568d2032cfd4f3f9929d66d47273be0d091ec8787485cf2eb02a9a2f4a00160d745b72cf9c2c8c552c2308dd9cc8260 SHA512 923cf79dc11cdfd53bf7f0a5bc909cc80916f9e956f1aadc2cfa609d1c9c33211c0b023f5dca4c56a12acf7d3c70d7229e5a78783d20965964511b5f6ad01b1d
 DIST urxvt-font-size-1.3.tar.gz 6276 BLAKE2B 55d0585d8bd817bb39a0d4336f4627592ae7805c03484a273d4151bd81454fd740ac675649d6ed7643cb78de5d911f2aa3471426ffec8770673096a13999b810 SHA512 546c3cdc1290bac934b36acf74c6148c43385d2cfdd3141afe5a8fe369477cc219d1db5c9d98a53678de4d297fd541d49ebbd702f80f91dd41a11aeab02270e7
 EBUILD urxvt-font-size-1.1.ebuild 674 BLAKE2B b63126a49961d9e16c30ad8a3ce8925b20a1d23f8ebb92bda96961f7f9bb8552e6a68fdbf0294f99e98bd3ec4dc05f1c01be8ac4762a38c2a7d055ec494a64cb SHA512 469e221f2efa870c9fd40621cbbbdfc1195b7e73fbe7d31df123e4900d1ebb51c6a30eb1090765a04960adf9a2352cef46ab19332258544a5289d6bfe10f7af2
-EBUILD urxvt-font-size-1.3.ebuild 676 BLAKE2B 1af18bf3e152c753259cfe1c29463b155c230783d508f89e19ee9f68ce97d24322d90d9a0082f9bbede26b7e850d2ba6de312c62e44b752c995bad66d123164b SHA512 936d1d0cea2b7ed2ecfad24fde158353998f5d2c5792faf15634928dc8010b851330f31899b765d8d8f770becf0edbd018b79a328baff7df265c50e39952e629
+EBUILD urxvt-font-size-1.3.ebuild 671 BLAKE2B 1d3f2b503caeb75d8299cdeb161b035208d82fba9370e6f610333adfc62fc9893c8051879c479c47f8d6b9972a76ca9305cc270829a44a5e5699f79768d57847 SHA512 4565c5e074f4b8e848b95facb9bd9b6a8fbdbc58ac925808a8ceb767b6132e97cf2f5506745c19712c049bc12c1653ac8f6df029da37c3179396ce305e34999b
 EBUILD urxvt-font-size-9999.ebuild 676 BLAKE2B 1af18bf3e152c753259cfe1c29463b155c230783d508f89e19ee9f68ce97d24322d90d9a0082f9bbede26b7e850d2ba6de312c62e44b752c995bad66d123164b SHA512 936d1d0cea2b7ed2ecfad24fde158353998f5d2c5792faf15634928dc8010b851330f31899b765d8d8f770becf0edbd018b79a328baff7df265c50e39952e629
 MISC metadata.xml 337 BLAKE2B e279a1905d82d8a310c26ea83cff2147cc909dac9650a51b48aa1863d7a10573d284d786dc2ae95ae9a95d1c1b4717323ef470341f8ff9dbe4b7a3f65f3b2b28 SHA512 4278134484822c6a8c9a1538301100c0196f3e32b4c172f21fb56af4db4a0d759a5813f7ecbfee23a25fd2b8e4c880a9e2a593135bb4e70c1b4101ea4277b218
diff --git a/x11-misc/urxvt-font-size/urxvt-font-size-1.3.ebuild b/x11-misc/urxvt-font-size/urxvt-font-size-1.3.ebuild
index 1c2ed2ed18ec..2820f18eea02 100644
--- a/x11-misc/urxvt-font-size/urxvt-font-size-1.3.ebuild
+++ b/x11-misc/urxvt-font-size/urxvt-font-size-1.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
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/majutsushi/${PN}.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	SRC_URI="https://github.com/majutsushi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/x11-misc/xdg-user-dirs/Manifest b/x11-misc/xdg-user-dirs/Manifest
index 0e98fb805615..02f116bd98ba 100644
--- a/x11-misc/xdg-user-dirs/Manifest
+++ b/x11-misc/xdg-user-dirs/Manifest
@@ -1,6 +1,4 @@
 AUX xdg-user-dirs-0.15-libiconv.patch 298 BLAKE2B 5028bfcafccc0310c192894cbeee12627b5b599cc5b612b6a38dcec45e36b9aa1f4ab2cdc31f29899b278088e61776bff51b5216adbf6c2497370c7966b17a50 SHA512 227b134d0782067f8c8688832036da8cb1afbcda247349db3502867e3f1b1eaa09885f2419762712ab9ce82655d4bb9a7ec17f63afdb9f00be5efcfd895ca7d4
-DIST xdg-user-dirs-0.16.tar.gz 255933 BLAKE2B 827e1ec8265592cc2abe4861945fc0cb32ce777fc951df3a00e4f7e53f53f49e1c57ae242c6d3ff62eacd75ff7965fbb482aa4f8d2b4c2aece3b535e3a83ee47 SHA512 245513d1b16adc970b4a3c0b4a078cdeda62d36b39e4561754d8331e76ee0013a769d8c2e43c94f8b5c378619ee58bca534721a8675ceaeccbb3fdf69cf6f7ae
 DIST xdg-user-dirs-0.17.tar.gz 257291 BLAKE2B 75b44a841b7961977824581dbbc760282fa3a5eed0a5496746ff6e09cabe4dec022d0f6fb129a877d8310c1fb214035f1e917c0e327dd5267bb83c47bbe00d5f SHA512 a02cc251f2d0a8bd0dad498901c8c6fbe8dae0e0e156abcaf27b1ded376a1ed369c2e59201d56ab4e38c9d521026fa39199177f3868c30e5c50cc03665dc335f
-EBUILD xdg-user-dirs-0.16.ebuild 958 BLAKE2B 8bc39473a803fbdc008203ac14d524b3052920a2477dfcbcaa152ffa229712a149f5f4653817482582bd0a69677e49c70ba7ae0d22605e6c483a01d0126f7d0c SHA512 b3bd6a03aa1a11cfb3303cd94c3409d9b4dff9507015a014c60b4e35905d42b3679d1d02d8ad2e31d15bbe80760cd454e0e4f178e56e4eab220faad783398c37
 EBUILD xdg-user-dirs-0.17.ebuild 958 BLAKE2B 9e7803c311d8af146e587079c29655213ed46f77f0f69488f208ad0ff8f786688172c3cd400ae552299bef2a0917301e961862fa1be4883bee82007fd73ab157 SHA512 26b9143f2464459b31bda07c382c341b4fe86f866410dab2bcd9df901149c7788790a14ff027d44ee21b271d026d654f684a8128200808413a68bbd3cce2f301
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.16.ebuild b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.16.ebuild
deleted file mode 100644
index 2fe86c80de66..000000000000
--- a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.16.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 autotools
-
-DESCRIPTION="A tool to help manage 'well known' user directories"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-user-dirs"
-SRC_URI="https://user-dirs.freedesktop.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="gtk"
-
-RDEPEND=""
-# libxslt is mandatory because 0.15 tarball is broken, re:
-# https://bugs.freedesktop.org/show_bug.cgi?id=66251
-DEPEND="app-text/docbook-xml-dtd:4.3
-	dev-libs/libxslt
-	sys-devel/gettext"
-PDEPEND="gtk? ( x11-misc/xdg-user-dirs-gtk )"
-
-DOCS=( AUTHORS ChangeLog NEWS )
-PATCHES=( "${FILESDIR}"/${PN}-0.15-libiconv.patch )
-
-src_prepare() {
-	default
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467032
-	eautoreconf # for the above patch
-}
diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
index 3d5e163e245a..3d9168478508 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 2144 BLAKE2B ed0e69e676a9e38fedeedd1a6c49a1d548c8217bc02f953b28e7553cb1ce92a1b96e890ab213eb5c8d129b662bc5658f14352c946ec6950b66351d971d4ebded SHA512 8e640e9c4f7360c74d561ac2724e0d0bef096226c1068ea0a5de9133aab06b0e88602b8212c3cd9b91d848d1aac1c238bdcc058231a09910419c2b57d2a84f19
+EBUILD xdg-utils-1.1.3-r1.ebuild 2138 BLAKE2B 28b572021c43fb8d04a2c27e88599cd2297af917dd72db1df51547c37a8519e56589bf989e8b6616510f8f2ff328ea21a8fe0625c3d2299ceb7063960d0a0f14 SHA512 751d728cc95288d3e9a4ed99f9a4ca4d9e524ccb0929574ca7702dda0c92654daf04c01598b812368597744a438db6a109022acbd9a30e1557de89344a6ada29
 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 900de2256998..dd9b39c7adb5 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
@@ -1,4 +1,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://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/xosview/Manifest b/x11-misc/xosview/Manifest
index c7c5589c178f..cf214e2e8efc 100644
--- a/x11-misc/xosview/Manifest
+++ b/x11-misc/xosview/Manifest
@@ -1,3 +1,5 @@
 DIST xosview-1.20.tar.gz 146373 BLAKE2B 7d53b5f2f8ce463917a1cfa65eedb60c835c6d530a19ede6bba6bfe295a01582861ca3fb7513b9a8590d9fe5111779a38db8723a2e38c911f002bce88bfc95f6 SHA512 25cd6a8cdaaff9121f0e8de7a1799d4c2706c5eb1111f3b3f8427b16e45a333fb4c675a1dec2ef6b40773e83124ff27eacc82f2b9eb6c836855930cbbf08957a
+DIST xosview-1.21.tar.gz 146428 BLAKE2B 899e0cb68489bd02e035765f8f33424d41996b80a7c16651f60a2e46538cf4eac1a9377342c2ed4f35da6cb00aa3961e34802c77fe26e4743a23e2d3dc443484 SHA512 9c42247d9e9b391b94c18ffc8c38df414f5293b7426aa57d3b357e680b02e9a3a2b332299905f2f529d488c23590e957cad9e088ddf753a6904905e2dff8074b
 EBUILD xosview-1.20-r1.ebuild 1209 BLAKE2B 4dd8a3dc63cd238022db4952abc2970b15de99e3d833221255de4c3c604eba709ed1bc81c398a06ab58fd1170fc9840322ae2d2d337296765230760ca3d97fbb SHA512 e0a95ad65e44bb364b7eaf3f767bc08a4f41f3483e9e5fd9fe67e7d870125bd664b88ef34a91ca9a1ef55410c5a18af40e5fa415b1f3ce85ea3eac40c062d286
+EBUILD xosview-1.21.ebuild 1210 BLAKE2B e2443c9ac1f85d22361ddc93a4dd50eaf92b4132ca37187e4f5716a7091e2bb689681ecb7d814929c4d0ecf3a03c782c98e47d223871a44c3e7b6b54981814d8 SHA512 3dc670f4f16e0513ca0d33686fe6cdaaff4b100006aea2728bddfab4a336a5feb38875c9ec860bc63efffa5af72fa828c78633f80c52728f920cd2356bf0fe05
 MISC metadata.xml 318 BLAKE2B e2fde4c35c72439790ea9e4c0e403f1a0666a7ebc8e9f350b29138d01c171765fac8cd6adee54667bbc19921e6fc976a427c3429464769a02d9e8dc8c83a8925 SHA512 7d56445a5c7fffdc1104633cdd30eafa17588079b8a1f4cb226984b1aad4e41fe84320608681143dc01c5f1ac5f104cf0717e8183164031644220f9c61086a3b
diff --git a/x11-misc/xosview/xosview-1.21.ebuild b/x11-misc/xosview/xosview-1.21.ebuild
new file mode 100644
index 000000000000..a88949d99bbb
--- /dev/null
+++ b/x11-misc/xosview/xosview-1.21.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils toolchain-funcs xdg-utils
+
+DESCRIPTION="X11 operating system viewer"
+HOMEPAGE="http://www.pogo.org.uk/~mark/xosview/"
+SRC_URI="http://www.pogo.org.uk/~mark/${PN}/releases/${P}.tar.gz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="suid"
+
+COMMON_DEPS="x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXt"
+RDEPEND="${COMMON_DEPS}
+	media-fonts/font-misc-misc"
+DEPEND="${COMMON_DEPS}
+	x11-base/xorg-proto"
+
+DOCS=( CHANGES README.linux TODO )
+
+src_prepare() {
+	default
+
+	sed -i -e 's:lib/X11/app:share/X11/app:g' -i ${PN}.1 || die
+	sed -i -e "s:Git:${PV}:g" ${PN}.cc || die
+	tc-export CXX
+}
+
+src_compile() {
+	emake OPTFLAGS=''
+}
+
+src_install() {
+	emake PREFIX="${D%/}/usr" install
+	use suid && fperms 4755 /usr/bin/${PN}
+	insinto /usr/share/X11/app-defaults
+	newins Xdefaults XOsview
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	if ! use suid ; then
+		ewarn "If you want to use serial meters ${PN} needs to be executed as root."
+		ewarn "Please see ${EPREFIX}/usr/share/doc/${PF}/README.linux for details."
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/x11-misc/xwallpaper/Manifest b/x11-misc/xwallpaper/Manifest
index 3df9f59886a6..83cd3533ef83 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 989 BLAKE2B 99fb573839f4990f7a3ab6b0ece3e87f8389b66e4dac4a303fb5372d143c008b808fc06a0ca43636d612d6c976717cea5d7f8cd711136476a837bf7f3a26fbec SHA512 b338de596750da56107cf760420451b129ead2bd233b593012e921fd86bd5b19554b74e1304442a038c79a1542ad64a2e9016d9212f30a5d783020b95204da19
+EBUILD xwallpaper-0.3.0.ebuild 985 BLAKE2B ca30cbc340bc8fe03c97580d31e93a48fb81c67e9fceeffa491e0c193e297a7fa6981abac9cbc8e24913c2246c850c78e478021de5eea3f6f50ef4412ddfcb1c SHA512 514fa89bfafab2b0e2086d74eccf45f6e64b1d447167f5ba83c185ae0764cd5c03336f08a3755a80b947eb80ed9abf6666648288ccdf1c6731aabe0fca73fde2
 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 45080788129f..bcd7c89858c7 100644
--- a/x11-misc/xwallpaper/xwallpaper-0.3.0.ebuild
+++ b/x11-misc/xwallpaper/xwallpaper-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
@@ -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 c77f58b7877f..eedea28623b1 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/wmSMPmon/Manifest b/x11-plugins/wmSMPmon/Manifest
index eb005713fed8..f1ca3925b967 100644
--- a/x11-plugins/wmSMPmon/Manifest
+++ b/x11-plugins/wmSMPmon/Manifest
@@ -1,5 +1,4 @@
 AUX wmSMPmon-3.1-makefile.patch 1300 BLAKE2B d017661312fe29484eaeffe05a5f8cbacd54c19c3ebc9f52ca6605704427292b23ec695b9403360aaec0d48c61453cf69d4e269f777cbffd8b194a3d078150bc SHA512 e94f9a66d782aaaab3bd637c2657cd34efe1b5e1f556c932171e30814551236f67a1846b688bda8983a072ba1622d37f8aa14528c657e9542404fa8b96358826
 DIST wmSMPmon-3.1.tar.gz 24834 BLAKE2B c02c49810f69b9d28d42f24e7fde6556d46f214d4cb5b47cd705bed2ff5c2c00205829018179ecd6c63162a58d0a957d5fa35d33f0075532c72d3d6876ac6c40 SHA512 b13caa3c4bc7971d35bc52bb66c1f6da482b55a5073b61b3f059fac97f6affbf091816c933981c1c88c17127ab8d21c09c59d0f3c93364e659ca409f13de43b7
-EBUILD wmSMPmon-3.1-r1.ebuild 756 BLAKE2B 66ba5e71a613e7eb4e0ff34afa1d36d043a564c00450f2049f64364d50adc1b3cc6b967f84a1166c8c111584de69bfc527bcc5265353b72f10b8d4e8c0385cb0 SHA512 c3ada7218117596b7472613c96d54515ed16b9b54afa3aca675ce951c3ff5ae00e58187d030ffc0d33929d99bdf6400efcedf51a676cc964d69aa540491a0d6a
-EBUILD wmSMPmon-3.1-r2.ebuild 610 BLAKE2B 3a9012afdded56e4257dc955b67ccd6ee2fc1d0d1cfb009a15f608cf416c32a7cb140f1545432a50305c520b5bd63c0a08f2aca71dc0f3b6f20ab7be0f98436d SHA512 2e46edf7078a58e07467b155312b083a39c941a6c64ca1536ad44388be6069853b412046210403f05ab67b90af79006aa4867b850736d08a92ee9bc4aa34bb14
+EBUILD wmSMPmon-3.1-r2.ebuild 606 BLAKE2B cb23f1aa1c267ed95ad3387aab7a4df80c3d19dabf92d29c2466b72a58874723027527db5c2f26b0480b99d37eee45e7f4fd58d1f3d1ed54122d02cae4ec51dc SHA512 9258edec15c7ad331f3fb13d9c6fa7db32c0e6f374a7c219dc20fbc9fb24bda8b0f418a93b7e4d0c1491b056a761e8f8140dde473ff5eb4d80e4cdb7ac52de99
 MISC metadata.xml 379 BLAKE2B 8d029b244f6cba1311fc8af0fa96705ad2701ffe2d4aad6a45e3e86d6a7b07c1749f7ffdd171217c5f610681921006400f6641618a6cf93541e7b257f2441198 SHA512 2fc60cceb3fbdbbb8fd85048bc50b6777461a9c7cf37d8b672ac09d1556f284acfa5df747d704c9335bfe91f93142be1cf39cd4eb19c808a50eb8fe5a27f67d5
diff --git a/x11-plugins/wmSMPmon/wmSMPmon-3.1-r1.ebuild b/x11-plugins/wmSMPmon/wmSMPmon-3.1-r1.ebuild
deleted file mode 100644
index 8005c831f09c..000000000000
--- a/x11-plugins/wmSMPmon/wmSMPmon-3.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=0
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="SMP system monitor dockapp"
-HOMEPAGE="https://www.dockapps.net/wmsmpmon"
-SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 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}"
-	epatch "${FILESDIR}"/${P}-makefile.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)" || die "compile failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc ../Changelog
-}
diff --git a/x11-plugins/wmSMPmon/wmSMPmon-3.1-r2.ebuild b/x11-plugins/wmSMPmon/wmSMPmon-3.1-r2.ebuild
index 268d59eb5219..9619fe673e8c 100644
--- a/x11-plugins/wmSMPmon/wmSMPmon-3.1-r2.ebuild
+++ b/x11-plugins/wmSMPmon/wmSMPmon-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 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-plugins/wmSpaceWeather/Manifest b/x11-plugins/wmSpaceWeather/Manifest
index 2e16fad1b7c2..710a5317d18c 100644
--- a/x11-plugins/wmSpaceWeather/Manifest
+++ b/x11-plugins/wmSpaceWeather/Manifest
@@ -2,6 +2,5 @@ AUX wmSpaceWeather-1.04_p19-gentoo.patch 2034 BLAKE2B b81b73f9fb8c64c8ba9560f999
 AUX wmSpaceWeather-1.04_p19-getkp.patch 1290 BLAKE2B dd350e57e2c0d40716ead4fb6bdc215f263bf5340c242550668ba252d78873a5ceab7cbf789209214daec41e33abea3a128b6cd5a5a83ee4e22b9de694ccecec SHA512 54f1ee8d2152bafc7895b2a626f27a4c5bf7b3702a2d14e2523952fcffb8e636f6f3ceb30d95b12b80470a58cb16dd50e04435ccae91e81c83097d41e2949b59
 DIST wmspaceweather_1.04-19.diff.gz 9429 BLAKE2B c32b02d123783789962ef56f54b79b7afacc69573526cd5254b7083673a5ae0d70abaa82d84421c86d95139f9033a35de6511d131f73ff1360d43d1d0e320979 SHA512 f8228c15642b88b355f977a8ce73b474bf8874b4b64bce3f519e6ec6c5de1db7bbd1e5f40e57e367dc0a1dec47e5c32b87d4ce61e35043d71cee0005b06a5a78
 DIST wmspaceweather_1.04.orig.tar.gz 36295 BLAKE2B 8f12a4ba7dc55d06ab1b3c86f387c0f4dc930d89b8ccf151096d736adb80deaf647e47bb4592f309042e2273936996b215cb2fffe83dbbe20bd10d94b1b7c109 SHA512 d422806d44a2929cfdb3e36c7075a4e02b64416db7c528d08411944f574dc34bb5e5ee48c55a3b9e796b15529857bcb480dc650ebdfe23cf1079ba09e2749154
-EBUILD wmSpaceWeather-1.04_p19-r1.ebuild 1619 BLAKE2B f836bc702eafe72bdacae41fd2bdea9767f82f925862b7157175c701927f6e1704ea5fcf51d11193c888464f59887e83e690538ffbd7120ab81b7590d095a107 SHA512 810e92b8dc510b127adcc6cd87cc64e4de65096e16c27b7f1c5f1325bc244a9bc01c8225f4773cb3ebbb8f328f42416f2898afed95856014c790a8f594a08aaf
-EBUILD wmSpaceWeather-1.04_p19.ebuild 1744 BLAKE2B a50f25070cef9f86cde7af708cc5549f064f6d2bf0ca2c5889d9bde24ab847a238b767f819d3e813baeddc9d8315257fef85aa511aa33f06dbc868962c4b28f9 SHA512 a918147033cb30022ab49c7121531fc14c5dad791d79f156cd220f9ef573fd51e30a903a9465d28b1395d9366d2d5fb1c2bc4dd17339db4e53c20f32490442bd
+EBUILD wmSpaceWeather-1.04_p19-r1.ebuild 1615 BLAKE2B 14fe0fcfbd5c1f97d41544d5da48a40c38c017c097c925dd164166bb7c20bf6538f814d2d87eb1a9f87f7393b15f4c7af4859f37e36a72052abf2506e6d5f6d6 SHA512 22994e3a83bb5b196e2815d42991dc2231e3cbe998125a32078e886d3c48b24e6121061a67daafd13a222416d42e637a18ac94dcf3e340abb20abd24b9ce638c
 MISC metadata.xml 349 BLAKE2B 1b79557d30af25f4419b0824e2f99a529447ad80c9c398d22b023eada927a3c840f8787aca77fff8f9073873f01a6be766595bd073cf8b11d335fea81f3e01ab SHA512 f39cf6f8c99788992a57ed0598fcd5d13b25fdf80dc5cf133091f5babae34e269b55e3464bec7b660e3ebb295edc4d46e76dda1978e4fde30e70620cefa21264
diff --git a/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild b/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild
index 21f8049f3673..568c3f7524fb 100644
--- a/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild
+++ b/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-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 @@ SRC_URI="mirror://debian/pool/main/w/${MY_PN}/${MY_P_ORIG}.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~mips ppc ~sparc x86"
+KEYWORDS="amd64 ~hppa ~mips ppc ~sparc x86"
 
 DOCS=( ../{BUGS,CHANGES,HINTS,README} )
 
diff --git a/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19.ebuild b/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19.ebuild
deleted file mode 100644
index 8a6964c62500..000000000000
--- a/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19.ebuild
+++ /dev/null
@@ -1,64 +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
-
-MY_PN="wmspaceweather"
-MY_PV_ORIG="${PV/_p*}"
-MY_PV_PATCH="${PV/_p/-}"
-MY_P_ORIG="${MY_PN}_${MY_PV_ORIG}.orig"
-MY_P_PATCH="${MY_PN}_${MY_PV_PATCH}.diff"
-
-DESCRIPTION="dockapp showing weather at geosynchronous orbit"
-HOMEPAGE="https://www.dockapps.net/wmspaceweather"
-SRC_URI="mirror://debian/pool/main/w/${MY_PN}/${MY_P_ORIG}.tar.gz
-	    mirror://debian/pool/main/w/${MY_PN}/${MY_P_PATCH}.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 hppa ~mips ppc sparc x86"
-IUSE=""
-
-CDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${CDEPEND}
-	x11-base/xorg-proto"
-RDEPEND="${CDEPEND}
-	net-misc/curl
-	dev-lang/perl"
-
-S="${WORKDIR}/${MY_P_ORIG/_/-}/${PN}"
-
-src_unpack() {
-	unpack ${MY_P_ORIG}.tar.gz
-	epatch "${DISTDIR}"/${MY_P_PATCH}.gz
-
-	# need to apply patches from Debian first, do NOT change the order
-	cd "${S}"
-	mv ../debian/patches "${WORKDIR}"/patch
-	EPATCH_SUFFIX="dpatch" EPATCH_FORCE="yes" \
-		EPATCH_MULTI_MSG="Applying Debian patches ..." epatch
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-getkp.patch
-}
-
-src_compile() {
-	emake clean || die "make clean failed"
-	emake CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)" || die "parallel make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die install failed
-	dodoc ../{BUGS,CHANGES,HINTS,README}
-}
-
-pkg_postinst() {
-	elog "You need to emerge www-client/firefox or www-client/firefox-bin"
-	elog "to use the -url functionality - see man ${PN} for more info."
-	elog
-	elog "This version uses curl instead of wget. You may edit /usr/share/wmspaceweather/GetKp"
-	elog "if you don't like it."
-}
diff --git a/x11-plugins/wmSun/Manifest b/x11-plugins/wmSun/Manifest
index 4e6c84919f70..6b669199d376 100644
--- a/x11-plugins/wmSun/Manifest
+++ b/x11-plugins/wmSun/Manifest
@@ -1,4 +1,4 @@
 DIST wmsun-1.05.tar.gz 20680 BLAKE2B 86e75467133b23e3f062203df6bbd8fe0aa1ca90c468bd91f3de3ec360e4d677bf5a117becf63e111557a17dbf346a1b23a61b78030d197264d71989097c9d77 SHA512 baa610db04ba67ca09112765e28c0fa945a98a61b642925dbaaa56a5b3e7da7424d8dd15097dcec932e3b603219d1f8806c0e50c025370226a157791f16911da
-EBUILD wmSun-1.05-r1.ebuild 701 BLAKE2B 361e7281d6df55bc048dcbc7cd6e301b9ef3019d525aab1a9e7b98a1836d00cbdfe52d299fe139a0fcf4a9000ebcfbddceb42d9e07ec0b5fd99404d5065a4b34 SHA512 62ec7d190c1c3e1019ecdac87e63032afb023b6c2e708cbd6bcf07d73d0a4d232626f1f6f3add6b5ac36c640f6ee5bc7e271527e10459d3f285ad23147889d01
+EBUILD wmSun-1.05-r1.ebuild 697 BLAKE2B 5199b2477717b7549e85c224296a2b801b70f06dba811ffd40b20aa5585539a47d5c1ffe29fc6d5b6394142030e19832ddfc552905e79145a0febbfafcd6b87b SHA512 ada913df888b6a5513746119b02e26d27a89ec558b84752e82015764595ccda6b2cfc8213ea844f5d9131044dc33b63681c92c8e0acb234196d02effa8df1ad0
 EBUILD wmSun-1.05.ebuild 723 BLAKE2B 60e1ef0c33cb53316b2c3bf0b10862880b73bfdb0a83b6eb1690207515d033270d05b1a276cb1130e87310d0db7f9f8e3e394b64d8287ce848e463c95c251ddb SHA512 b0e878e7d950679e66279deea4e9ae76689a665236056b82e42af16eb09f8b2e4b2f2c88e357aa1b35f61b5b7164f9a54ac7522eec86c6fd4df2a83f044092a9
 MISC metadata.xml 498 BLAKE2B 5b9cf3d5fc309ce34ff85551823b360a8bab9af01b39896d8c305837dfcbe64b4ada8f2bd61245870bffeec9d64bd7f70db1c16b6676af3996df64ab59898de5 SHA512 e94d3712d961ae49fdb73b15a70270915cfcdaacf95acb7176c35d64ba6b186d6144d55f4c6e1eed36d33656ed82ced988ece1a38f08a5b08658db063d1ce3df
diff --git a/x11-plugins/wmSun/wmSun-1.05-r1.ebuild b/x11-plugins/wmSun/wmSun-1.05-r1.ebuild
index eef53142a91a..a68c23d6c316 100644
--- a/x11-plugins/wmSun/wmSun-1.05-r1.ebuild
+++ b/x11-plugins/wmSun/wmSun-1.05-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/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~sparc x86"
+KEYWORDS="amd64 ~mips ~ppc ~sparc x86"
 
 RDEPEND=">=x11-libs/libdockapp-0.7:=
 	x11-libs/libX11
diff --git a/x11-plugins/wmsystray/Manifest b/x11-plugins/wmsystray/Manifest
index 9d0bacb27c96..e06c33649c8d 100644
--- a/x11-plugins/wmsystray/Manifest
+++ b/x11-plugins/wmsystray/Manifest
@@ -2,6 +2,5 @@ AUX wmsystray-0.1.1-Makefile.patch 1551 BLAKE2B b58ebdc03508d47d1eb6c58913493bbf
 AUX wmsystray-0.1.1-gcc-3.4.patch 269 BLAKE2B c3b126db45c7d2dcf38dfce5db9965f9f5c7bf9636a5f9f194d4f0209a737cf11d115ac42430b5ae6f00ad9770256a95e8f03cf47f23127251927172f2e8783a SHA512 ee03a2986af6e1f3de6751a2d90738ffeec2fff0c1f7f0ddc686cc4baeeb010bf2fca764b886e9ee1af82ac2926d4571519ae2371c172053834f3d6bac7e2570
 AUX wmsystray.desktop 185 BLAKE2B 5d4f524ddcc939ef335a043fad6c136e03f2a2cc7fdcc9a4703e210ad301d5e101f8c03caa6c5a069ca805ca44abdf6e56a18fcb8e98596f80f469482b8927e5 SHA512 f7a2c0391257d76c9024f2804de067b07f3669fbba6fd0af6471297f4c0fb876ecfdd7cd6b931187d657d6558ff27d01766c299048f7c16c4d4eed5c4586213b
 DIST wmsystray-0.1.1.tar.bz2 18261 BLAKE2B d232dcfd3077760d7990ec8e22249aafa9dacf415e71b6a662a1a32464e233cd5460f9b99d6e1c478ce69c6ad0e9973febfce2292992d5619792d4bf4dcc1d7c SHA512 a28d8cb6a3e74909a1467459f81a853dae2d74c28db166be15f398f00bc8066fbb1caa0e982fb3874279a7edd376ab892499e8981d2c2126eed591ef52f8d604
-EBUILD wmsystray-0.1.1-r1.ebuild 1180 BLAKE2B 8b0ad145eb5f3e4b7cc38afba7d25bf950b0aed22fb3cf88213ce675e9d1deab7288e1135a86bcb126b4690183efe92b34884d1d52e03e2ca0fae932d7d7d964 SHA512 f7f3b446527f88eb08e294cfc9147a8bbfd97498ba5051f8b0de42623bae14b3d55dda6079f8c55ea5ba22080a80c2224e1b5e4cfa0ee91dfe173c9fac201f63
-EBUILD wmsystray-0.1.1.ebuild 1204 BLAKE2B 8e9235f29442507f9f54ed5ec6e7680b9153d1a5a0a5d8d0dcbe0475faa62e831d8b2333d2e5141696bd17bfd1351210acaee59e6935f049c1a4ca44cf8788ce SHA512 dc8ba563e2c1da0e05f79541d701d89d3ad11d335eda486f00bd557aa141c27711ba92e7ee1cf5328733d6e7907e18bfb2fb42f959bfe1d9710825d9036ec522
+EBUILD wmsystray-0.1.1-r1.ebuild 1176 BLAKE2B ef119e6cff86bc2a4a07d86ac099ec6452ea8b1fb8e5d52f67e35090d604a05a02b3239182ad96d27e8d186c2232a9ca0e25ff2e4b3654c3814c242e161fc39d SHA512 85cf15c7ce31786d0d8551ecbb408d0d380d6e339a9d2600b84def259945ad218e12579b5f4b2054073c9db8853dda7141e433787667c9f7a7f4158c69195d81
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmsystray/wmsystray-0.1.1-r1.ebuild b/x11-plugins/wmsystray/wmsystray-0.1.1-r1.ebuild
index 0522567eab76..4756f31445fd 100644
--- a/x11-plugins/wmsystray/wmsystray-0.1.1-r1.ebuild
+++ b/x11-plugins/wmsystray/wmsystray-0.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=7
@@ -15,7 +15,7 @@ DEPEND="${RDEPEND}"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ppc ~sparc x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 
 # Let's honour Gentoo CFLAGS and use correct install program
 # Fix for #61704, cannot compile with gcc 3.4.1:
diff --git a/x11-plugins/wmsystray/wmsystray-0.1.1.ebuild b/x11-plugins/wmsystray/wmsystray-0.1.1.ebuild
deleted file mode 100644
index 470cb2956245..000000000000
--- a/x11-plugins/wmsystray/wmsystray-0.1.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=0
-
-inherit eutils
-
-DESCRIPTION="Window Maker dock app that provides a system tray for GNOME/KDE applications"
-HOMEPAGE="https://github.com/bbidulock/wmsystray"
-SRC_URI="https://github.com/bbidulock/wmsystray/releases/download/${PV}/${P}.tar.bz2"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Let's honour Gentoo CFLAGS and use correct install program
-	epatch "${FILESDIR}/${P}-Makefile.patch"
-
-	# Fix for #61704, cannot compile with gcc 3.4.1:
-	# it's a trivial change and does not affect other compilers...
-	epatch "${FILESDIR}/${P}-gcc-3.4.patch"
-
-	# Fix parallel compilation
-	sed -ie "s/make EXTRACFLAGS/make \${MAKEOPTS} EXTRACFLAGS/" Makefile
-
-	# Honour Gentoo LDFLAGS, see bug #336296
-	sed -ie "s/-o wmsystray/${LDFLAGS} -o wmsystray/" wmsystray/Makefile
-}
-
-src_compile() {
-	emake EXTRACFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	einstall || die "einstall failed"
-	dodoc AUTHORS HACKING README || die
-
-	domenu "${FILESDIR}/${PN}.desktop"
-}
diff --git a/x11-plugins/wmudmount/Manifest b/x11-plugins/wmudmount/Manifest
index a5bd408402cf..bf32a5ab0671 100644
--- a/x11-plugins/wmudmount/Manifest
+++ b/x11-plugins/wmudmount/Manifest
@@ -1,5 +1,5 @@
 AUX wmudmount-2.2-perl_brace_regex.patch 417 BLAKE2B cada3b139df63f9cc78c2d6bdb3f243c3fac5d4517c166de6cfc166439beedf7398510ab9ff76596316db6b3ad6dd8fb234e42d55614e89bfaed671614e0ed18 SHA512 93afa7793d64cf0d3f2e7be5a112fbf8c8823006e97f8d7c654d5aed91e8578012558b8cafce43c73b09c6279ca3a9741214bd851899c63f3eb5cd0641862c73
 DIST wmudmount-2.2.tar.gz 181700 BLAKE2B f375aca9da44b5cba1483b70c36bbed81d897a691ce91ca5d3e11f8bbbbe1cc46685480d41144d6cca0bd10f625e46b5eec2ffc573ec7dd90b9b241dde7605a2 SHA512 6bc08b60430bbe66710ce183f0e7693a7818cee68cefac3a3bc191104663dd3649f8cdb62c7f214bdf4ed377b01fef250fe388f14645690aab7993c6071ceffe
-EBUILD wmudmount-2.2-r2.ebuild 917 BLAKE2B 570314970cb5985b6bf77577d91a324ca8c85a4afb4cb40a16b4df316857b56cc9adb52651f6c52fa6dac84bb484ee99e5e270a604ec3d89676069080f33fdd9 SHA512 89d5d3934ef2163db37324bf49c5457bdfa2d51bfe632472d5c139caedce738b259bdb921554b9388ec55f4e5f3288eb8cc9cf061c25628f613f87971b9f39a7
+EBUILD wmudmount-2.2-r2.ebuild 913 BLAKE2B ba78be7d9870e82c11d622b141e824717336b4c319e46add3a4aeabdac7df059f291df8faad2f7a777abff50a683dfd4f98435f55af32c49a3020e8703156b8e SHA512 35cdd7552465185f61632233bcedee4584bbdcfd1b7407a23420e15fac7d43e40efcb39a80f52f69ba24aefb662260b8b9765c602a81e814e60d7810b8f68818
 EBUILD wmudmount-2.2.ebuild 902 BLAKE2B 56afc5aada175b7623c238146fc74c68ba12779e5c9df60b1f3e043a6b9753e83e6bff4dce4f2e9f1831490f312e41f6b900d4249731f352f5a33599849b3e0a SHA512 c99a70da25007efcac2c16eec30420fba944dd43b1a54a43c84370bf45d7d67668acf0f41d859474e378103652a2eae1ad02e1c92438f4aa704bba63404a8689
 MISC metadata.xml 331 BLAKE2B 17327d6a39e4d1bc33e46b0e3e958713aac557a46aa2d478d455abdd9911531d6292c044604ebbdece25adb283fd80ed90538ebe18e910b4bb24ccd39a290cef SHA512 c930e5cae4d2478d607c0e1c21c4979cb49ec11140cddd5789844cce0bab5c48922f69306f26e98ca4c6d95939c93d2d5dcd99326a74886228839d9e30edc3c9
diff --git a/x11-plugins/wmudmount/wmudmount-2.2-r2.ebuild b/x11-plugins/wmudmount/wmudmount-2.2-r2.ebuild
index 231361dfca59..041cd3e713c4 100644
--- a/x11-plugins/wmudmount/wmudmount-2.2-r2.ebuild
+++ b/x11-plugins/wmudmount/wmudmount-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
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="gnome-keyring libnotify"
 
 RDEPEND="sys-fs/udisks:2
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index abafcbacec3d..ca26f42e8506 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index 81d8afe4d8ef..a4962e072b5a 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -1,7 +1,11 @@
+AUX separate-new-tab-window.gschema.override 56 BLAKE2B ca7934aa89ddad5bbc86a35c79c8e02215888fea4706df5c2740480d9534980f54bc1b298ac02983a56c2bc5c1fc988d02b5cadb2a8e30d6443577b745a55533 SHA512 09eee78d2756752ce32cc9379f1a445e55c6f5f01bde972a8e5801a5c7bf3b385ab081ebc4a1ddd2bc463a8a67dd1ad03f1d531c99aa36eb6e850bf4f2a2b265
 DIST gnome-terminal-3.24.2.tar.xz 1960952 BLAKE2B c94303cd8b322a37c70487fbab0f6ecd27b8e831cf44cdc80c82b31d2758f7c6927704d31c229cbbe41be565748238bbfcfae72470f273f7f3a9378c218af8b5 SHA512 08cd7b1b08cf22618554b1a051dcfee4a967165bfe93b77a6bc8b0c935695101e773e8d53a482d71aadb9ba7be7ac991d82dbf53b7a6f74f1f5144e4158f8a93
 DIST gnome-terminal-3.28.1-notify-open-title-transparency.patch.xz 33036 BLAKE2B 76c35db10664e02d1537aae586b47062b2ad85a48279426478ab2c9a9a659f728a7c01af2caaf058a71f4918d3d1e35a14c01dd7c67a2cf1aa368b4f4bc6eae7 SHA512 87d77fe8d9ab5b9ca3ff7eddcd462bf718b0f2d9dc1a60a2744ef8015b0910b588e0dc57ab10964602efa47465fd59f91381969157d9255fb5370039319a5f44
 DIST gnome-terminal-3.28.2.tar.xz 2094920 BLAKE2B 02f6e9b7273247169966e3125931e452ee4ac4669c53c79c93f49073511ef25a3f21df60510df0e7aefffad5e3ea14acdd1338a1c7ce934439863728e2d709ec SHA512 a20fe13fd2e533a90236410ce6ddd11e4da9da13f2d8952baa3cbf07379dbe253cf897b596421852084bbfc000264de11fb605c73909af8188baa93e46ddae8f
+DIST gnome-terminal-3.30.1-notify-open-title-transparency.patch.xz 32204 BLAKE2B d32cabea06df4290c592814a60443c3fb627ae7e837560bffdd0f803fd970b2962d7fc1d57a53f9bc62bd0ceb23ccade623e0d7099cb2610e599d9c2243c3ec2 SHA512 14e6e9baf1cd3fdd34ba320502de0ba99b0259598947562b5057472b099e85bcb6c60be8e5f58296c222deb85c35ddf5feefd1dbfac83710050e038f6e1b3a28
+DIST gnome-terminal-3.30.1.tar.xz 2099736 BLAKE2B a3100c7faf10f5d8ed3f16ae3ee28a7850e181dcf97ed52c0509143aa88114583466ddd3dfa1ea61372674cd6f16f9490c5ba9fafa4f5ce56eaeebe33ce259d5 SHA512 486fe7a9841114d49428208fdea195f1ce6a27ecfc66e2c77632385a7b106a28d3e6a0f1a198bd08f3e2a89d201ac49dafa376c002eab6470ff9d64cf30194ec
 DIST gnome-terminal-notify-open-title-transparency.patch.xz 37448 BLAKE2B 159bbcf6ca387af8ae2f05c23b48afcdf11351025420ecfd10d1b8a1dd9c2c8016d1c89c6fca20dde3bf8ffe3a6091232a989cfd520fa6761f65eec29b569d84 SHA512 9af0d56df105a5bdb81b2609794669557a7f442f71b240ee10a6411fab20ad74c14489dbb9a536e208515053ea17776b3a15afb3b949a75a66f8c2ab3dbbff96
 EBUILD gnome-terminal-3.24.2.ebuild 2604 BLAKE2B 5ed19f08bd6f5f0e1cf906d1936cff022af37e2338106e72317354ce2e13e740b3e7e2253b6164517c215687e5af703c144f21800b773ff5f02fb980711b1c7c SHA512 8321fd29e858800cf7b7c71e9e0cdc6cc1bed07cc0841df63fc12a5492e7d3a36bd68221384145b8be9da0af92d1a0e559cac71ccd71130c1433b1209dc75f8e
 EBUILD gnome-terminal-3.28.2.ebuild 2487 BLAKE2B 84deec3d63b57776fa69e418c4a9eba30bfc135d6a3dc51e89e9d542d2c3c30a39092c00dffcf901508b2c0d5956498e5b06e062d192b9d8c8732bcde6d443ee SHA512 d9df4b14da08a36c15860cbbe6bcf4be54bb2dcf95abbd730710e01aebff0200058d9dc2d23112df0ec0eb01174732aa43dd5bb6e70aa4cbbe28b3bc6dcf5ccd
+EBUILD gnome-terminal-3.30.1.ebuild 2699 BLAKE2B dfb6c17fd39d7152cb79cf179d203882e2fbb06dae8abb9935540b77e3736e37524589ad9910550dae454279d8913785dbb6858ac3925aa5d4c205f1bc82c643 SHA512 36f000d88db9ebc3747da6e8b8a7fbc0041e8f037ab1d768d752316c19e76a99785c103ff58ff3d98153f19df3a8f8dd905f627e90861127daeee5488c223d47
 MISC metadata.xml 417 BLAKE2B ddec99c80b9ff060709ef724996eb8e73a8e587e022947b9f237adcd1ecb049fc48b8f7e8b6cd725d2f5e3276b9aecdcdb5acacddadfbd7edcc61dd9346789ae SHA512 a41ea1b6fc9d3dcbdf296590b206f924cb42c7dea27b68f593eb3e50aa37c6dd3df20b47c34f8cca2671dacd4fba6ec0f86caebebe6f66d496b7936d3cf0a688
diff --git a/x11-terms/gnome-terminal/files/separate-new-tab-window.gschema.override b/x11-terms/gnome-terminal/files/separate-new-tab-window.gschema.override
new file mode 100644
index 000000000000..65d39a4966be
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/separate-new-tab-window.gschema.override
@@ -0,0 +1,2 @@
+[org.gnome.Terminal.Legacy.Settings]
+unified-menu=false
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.30.1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.30.1.ebuild
new file mode 100644
index 000000000000..b824aba23f60
--- /dev/null
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.30.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 readme.gentoo-r1
+
+DESCRIPTION="The Gnome Terminal"
+HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="debug +gnome-shell +nautilus vanilla"
+SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/${P}-notify-open-title-transparency.patch.xz )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+# FIXME: automagic dependency on gtk+[X], just transitive but needs proper control, bug 624960
+RDEPEND="
+	>=dev-libs/glib-2.42:2
+	>=x11-libs/gtk+-3.20:3
+	>=x11-libs/vte-0.54.1:2.91[!vanilla?]
+	>=dev-libs/libpcre2-10
+	>=gnome-base/dconf-0.14
+	>=gnome-base/gsettings-desktop-schemas-0.1.0
+	sys-apps/util-linux
+	gnome-shell? ( gnome-base/gnome-shell )
+	nautilus? ( >=gnome-base/nautilus-3 )
+"
+# itstool required for help/* with non-en LINGUAS, see bug #549358
+# xmllint required for glib-compile-resources, see bug #549304
+DEPEND="${RDEPEND}
+	dev-libs/libxml2:2
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/intltool-0.50
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+DOC_CONTENTS="To get previous working directory inherited in new opened tab, or
+	notifications of long-running commands finishing, you will need
+	to add the following line to your ~/.bashrc:\n
+	. /etc/profile.d/vte-2.91.sh"
+
+src_prepare() {
+	if ! use vanilla; then
+		# https://bugzilla.gnome.org/show_bug.cgi?id=695371
+		# Fedora patches:
+		# Restore transparency support (with compositing WMs only)
+		# OSC 777 desktop notification support (notifications on tabs for long-running commands completing)
+		# Restore separate menuitems for opening tabs and windows
+		# Restore "Set title" support
+		# http://pkgs.fedoraproject.org/cgit/rpms/gnome-terminal.git/plain/gnome-terminal-notify-open-title-transparency.patch
+		# Depends on vte[-vanilla] for OSC 777 patch in VTE
+		eapply "${WORKDIR}"/${P}-notify-open-title-transparency.patch
+	fi
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable debug) \
+		$(use_enable gnome-shell search-provider) \
+		$(use_with nautilus nautilus-extension)
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS"
+	gnome2_src_install
+	if ! use vanilla; then
+		# Separate "New Window/Tab" menu entries by default, instead of unified "New Terminal"
+		insinto /usr/share/glib-2.0/schemas
+		newins "${FILESDIR}"/separate-new-tab-window.gschema.override org.gnome.Terminal.gschema.override
+	fi
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/x11-terms/guake/Manifest b/x11-terms/guake/Manifest
index 667f448893f4..6f0a55273f71 100644
--- a/x11-terms/guake/Manifest
+++ b/x11-terms/guake/Manifest
@@ -1,11 +1,14 @@
 AUX guake-3.3.2-paths.patch 763 BLAKE2B f097157d3a6516bf5df888a8148cf2120695fc8dc6a80d14b6bc0326ab7a3a7fb4ad17adcd837766e8df442cd6d274eab9e1490c07f9969517785dd2a71641d4 SHA512 32015e084ba1e47c4cb5ece36548721f576e254ddcb29243db1609a403464a53a0ffb198f58cac84d54a2e22a432273687ced076d0ec7045865bfaf8536c1275
+AUX guake-3.4.0-paths.patch 507 BLAKE2B b314a96a6a3f3795046a1d19dffc2037d8cfbba7028f83cfd30a913ada76b1d6073c9439857de1a4a5ee293ef7e9d7b8d0ad90eb01613ef61d099dc26ac32d23 SHA512 509ed5717eeb39330fa8f2fbb5653b8065e31ae2a5cbd36eb8b3ce768cff39f5ec42819cfff7ef7f12e114b242febb69af068d0be7f18b70ebce83eebdbda159
 DIST guake-0.8.13.tar.gz 410816 BLAKE2B 37240d5f86cee596243a23ce47c3d3502cc889dc90d98e8a073325bd8c7fb74929308b5f91756100b2bd641134992e61ec833581380b3733613cf83526e26e92 SHA512 89c21bab2b1e5fc17c16349e4a4a4e8d089b084ddffedcf7a20aa059d4269a2a1c5754ec7b343f4f0e2ffae135b78a6128b8c14642f50645ddd52f700fd82a38
 DIST guake-0.8.8.tar.gz 395143 BLAKE2B 34b47948fd03e3187ca5cad4697b0bffd81f5c1add3951a42904837075768bc9f39a278a0e0e3bd555e1d3a9814efd5aefae3c1baa9fac98108eb6dfc81f6035 SHA512 cbff208ea985669c5063793aaa74504a0de92127b52af23499b7c95df7c3841558ae61586e56771ce8e0d444bbe95a95e12e1af41f8a4ac9c74c13b3e9df8dc2
 DIST guake-3.3.0.tar.gz 1006849 BLAKE2B 387ca17a881beebb84c81fda29a3f44ab3f297841010128bc4c5c4eded83d3325562bc88858fd1a8824a7c26d3bb9050bbe17399934f6e6cdcf8b4bf3c15d8a6 SHA512 1558e34f29060e449d676077c90df92ea9bc3a57857094be8d98cd283010de1125b7eeb3fbc3b3fcd08cacac9cf8ee461adb28cc29c491e8d2c3ad32fa39754b
 DIST guake-3.3.2.tar.gz 1084094 BLAKE2B b534ed18a6b9ad686fbe41fe1aa6e522429a50725103455cc5ccc5c4c7b67df6ce9eeac3c769ef3cb44bcc2e60305df80b6aa6af83c89a27b290e5ea48d19f8e SHA512 4d5585178d1e70d5b954071c4b68af22c459518df7af5930bd9a44f1f63afaff7b89bcab43422f9ae178c1dccf1268e5555d5776adb01fc8f11666dae2c3e766
+DIST guake-3.4.0.tar.gz 1167667 BLAKE2B 66cb4ae07894e06b37a264a79c52ac7b97fdd8e31f753a9e30f1609eba34b1f09bb133bd5413436e375eda39bb2716c1ad8ef8e0baf6641b540f03efc95e9406 SHA512 94053383a28c60fefbed70f166669a9a1528e9505c3bbfc1688312ef896e1c25c006536c755f01dca4868a97b30d857b044715f59f7a345fa4dc6075fac72ab6
 EBUILD guake-0.8.13.ebuild 1061 BLAKE2B 612ed58bcfddcb870c16fdf09cf6c76c55af652c2fba08a6fb9453ef090c3f8b08e326c278fe84d4fa6537c594ea3651dd29dd1ccece14e36a747a828f2dde6e SHA512 aaaa86875a7895377e99d06a4aa5fe2c0a62cdc058eb6aab9827370f79db9f3a16f967318f5daeff322cb005333fd30392b286652da00fc529cd7ca12f0fd039
 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-9999.ebuild 1337 BLAKE2B ed4774014d089d3d1cab77ec1a942a753a0f29d4889614261896d695b97fb6dbd6da0de0e931f0ab4f0ff87fe3992f50f64234c2f6ac1fd3234b580710903700 SHA512 214191f9ba92e65b38d0b0813c274c80d2fb0ce834001f9141ab752f0b62470d9738fa21ac16c213728649e5945c7586fee5d3c65c63a9ae975c20ed2e50f5bf
+EBUILD guake-3.4.0-r1.ebuild 1489 BLAKE2B 8305fd4a2f76f780686758d6958b8986923ed6400512b5e539e35888b804afa241e405874e618aade95db0f2575f1f11c15a17c93997e9bc97f809dcc7a089bd SHA512 428689bded27b8f67b4123c8c7d475eb4ece7531e86d7b80dcbaf6aff4912539a5782d27f00dc04f3046a0e01c425590f3391af861d9d6040b22666708ecfdfb
+EBUILD guake-9999.ebuild 1451 BLAKE2B 88093ded4bca1b26b77d554a5b048733e6a19ca728fcf7c513fcd11f8180de68e139edcca2984adbc912fdfcaf9a3d89a04041688660638203442da5511bb204 SHA512 1dd05b62e534278e2e728ca8ff211b5c1dc68a3ad22a6c19d9ce84691d6243a6da7eebec09a2e6d0a3534f7b9c66e9ef2e16c446537958bbfd9c99153e63ee61
 MISC metadata.xml 486 BLAKE2B 9ee73f9998b8af468c329f5507fa04f8345f1d6e9e2ef0702a788592afb8794cdfbb56859429d9161e017ac0ba02531177a80cad92c7516267d9e4554aaf5150 SHA512 1b2fec3b8354be9db573823f834f923c07bba089705afdebc626ec9e30663b4c5c10cc1de4f646dcc47190e4647d520f706daa6152e1587af9f10074caa61f87
diff --git a/x11-terms/guake/files/guake-3.4.0-paths.patch b/x11-terms/guake/files/guake-3.4.0-paths.patch
new file mode 100644
index 000000000000..30a47294d5ec
--- /dev/null
+++ b/x11-terms/guake/files/guake-3.4.0-paths.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/667878
+https://github.com/Guake/guake/issues/1436
+
+--- a/guake/paths.py
++++ b/guake/paths.py
+@@ -35,7 +35,7 @@
+ 
+ 
+ def get_data_files_dir():
+-    d = os.path.dirname(os.path.dirname(sys.modules["guake"].__file__))
++    d = os.path.dirname(sys.modules["guake"].__file__)
+     p = os.path.basename(os.path.abspath(os.path.join(d, "..")))
+     if p in ["site-packages", "dist-packages"]:
+         # current "guake" package has been installed in a prefix structure (/usr, /usr/local or
diff --git a/x11-terms/guake/guake-3.4.0-r1.ebuild b/x11-terms/guake/guake-3.4.0-r1.ebuild
new file mode 100644
index 000000000000..a9aeb41ea1cf
--- /dev/null
+++ b/x11-terms/guake/guake-3.4.0-r1.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=( python3_{5,6} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 gnome2-utils xdg-utils
+
+DESCRIPTION="Drop-down terminal for GNOME"
+HOMEPAGE="https://github.com/Guake/guake https://pypi.org/project/Guake"
+SRC_URI="mirror://pypi/G/${PN^}/${P^}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="utempter"
+
+RDEPEND="
+	dev-libs/glib[${PYTHON_USEDEP}]
+	dev-libs/keybinder:3[introspection]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pbr[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/libnotify[introspection]
+	x11-libs/vte:2.91[introspection]
+	utempter? ( sys-libs/libutempter )
+"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	gnome-base/gsettings-desktop-schemas
+	sys-devel/gettext
+	sys-devel/make
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.3.2-paths.patch
+	"${FILESDIR}"/${PN}-3.4.0-paths.patch
+)
+S=${WORKDIR}/${P^}
+
+python_compile_all() {
+	emake prepare-install prefix=/usr
+	emake generate-paths prefix=/usr DATA_DIR='$(datadir)/guake' DEV_SCHEMA_DIR='$(gsettingsschemadir)'
+	default
+}
+
+python_install_all() {
+	emake install-schemas install-locale prefix=/usr DESTDIR="${D}"
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	xdg_desktop_database_update
+}
diff --git a/x11-terms/guake/guake-9999.ebuild b/x11-terms/guake/guake-9999.ebuild
index 46f3706e7f3d..593f8375adb6 100644
--- a/x11-terms/guake/guake-9999.ebuild
+++ b/x11-terms/guake/guake-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
@@ -17,13 +17,14 @@ KEYWORDS=""
 IUSE="utempter"
 
 RDEPEND="
-	dev-libs/keybinder:3
+	dev-libs/glib[${PYTHON_USEDEP}]
+	dev-libs/keybinder:3[introspection]
 	dev-python/dbus-python[${PYTHON_USEDEP}]
 	dev-python/pbr[${PYTHON_USEDEP}]
 	dev-python/pycairo[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	x11-libs/libnotify
-	x11-libs/vte:2.91
+	x11-libs/libnotify[introspection]
+	x11-libs/vte:2.91[introspection]
 	utempter? ( sys-libs/libutempter )
 "
 DEPEND="
@@ -36,6 +37,7 @@ DEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.3.2-paths.patch
+	"${FILESDIR}"/${PN}-3.4.0-paths.patch
 )
 
 python_compile_all() {
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 868051c9bd1e..bcfd03039d5f 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,10 +1,8 @@
 AUX kitty-0.11.0-flags.patch 1615 BLAKE2B 862ce366a8a2975b0fd40cf7579b9f5b7eb4de106005509c80d027719a8bef1a90d5c780a439c8c19bb126036e1bf00b46119a5db251c98b1f06b76a16f3f695 SHA512 472b057080800ef6d033f47255b25db0f4029ae0981a997ce057013c7dcce8829472e26810125612f89e0ea292623106eeabe1f4952aad3e9b7de06e97e427e5
 AUX kitty-0.11.0-svg-icon.patch 668 BLAKE2B 53fbe58492ebc9e78a9aab1f7ecd977c1daee9a097e34ebd0a98efefc2cf3625dc785e4c6e074f348cf24c9425734d3d521779d0c5fc5dd546f8322d35c3b11a SHA512 9b0aa40447d9ff137d45bdb3c2e4f5a8d9d68cdbc62c486a080107b02c6251d7075eaf212274c53f07977a370c8688cb3ace46828aac3b9467080d0334a05a21
-DIST kitty-0.11.1.tar.gz 3924068 BLAKE2B a71535cfffe863ee06f699eba3a06c1665c851673bee0d1134fe992fe0335cc13d9a89cebf5814082a155166aaa0939b0e6296ad567564c608bf72eedce5cce3 SHA512 79a3ed4ffbc58e34e6c907646dc33168a8dcb58db859549549e2983186521dc69990e2d2e3eb120fcd31af03187d9a8233a60b75c205ac4e59bb7b575836cceb
-DIST kitty-0.11.2.tar.gz 3442111 BLAKE2B ebd5f11e57dd77a4336dfee51e2cf8c6c218d88957fe8988edcab9ecef73b7934b28e761733e9d8ca7842efb8a53fb30e785ed16fe73ac8c01b04a138d0e17a3 SHA512 28c4f7e8b87479cae47a00ea39ef31171ebeebf4888da4f9eaec250b4ed36ae6076b40e1a3b7ef88da2c9c860ba4d9af279a8b1d0d6e721f9fa3febee89bc151
 DIST kitty-0.12.1.tar.gz 3477416 BLAKE2B 4c8c99a16ec903498b17921093542d4389784c1d5bc8c8cbc2fb4c56aab7a0996f94c9442ca0ce403c2cb660c8a27e4f20165bb8dca6e9ce9eb6c9a06b03c1b9 SHA512 3efdc2ee9d41cddda7ff033fa69531ce48a163ef4b6efa7c5f10ca20511046c26313115383aec6bcef1b2a0fbbac19b2de9a43835130624aada48e12fe54b7df
-EBUILD kitty-0.11.1.ebuild 1893 BLAKE2B 93a866a598960c909955c7269e4f66b18ef59fe9ad4f12910ecc503bd9f494fbd2df454e22d1e34cda62d9c202f932fbb44eb0f981294da3db3e812cc3f2f368 SHA512 4cf663fda3be919848a90def27e1cba69252cbef5d05977c681a76c1c6c28630f39e3ca37dc7157ca0db91ffd6f2003c48a5192e872e144292c4069c29d20a88
-EBUILD kitty-0.11.2.ebuild 1893 BLAKE2B 93a866a598960c909955c7269e4f66b18ef59fe9ad4f12910ecc503bd9f494fbd2df454e22d1e34cda62d9c202f932fbb44eb0f981294da3db3e812cc3f2f368 SHA512 4cf663fda3be919848a90def27e1cba69252cbef5d05977c681a76c1c6c28630f39e3ca37dc7157ca0db91ffd6f2003c48a5192e872e144292c4069c29d20a88
+DIST kitty-0.12.3.tar.xz 2832760 BLAKE2B dcf338d6d66bd33c5d1bc164964f344d458fd0bf4869536681ba72c5e2920dc84b18187f0c343b68fe954396a351b887bff0034993966e9feade69593f35272d SHA512 6e4ac5f6a44ae1cdade71f0e3fee7cfbdde15f5770d960904b2d762abef9814f9bcef2b32d4a630de8a0c88d7a7945b7cbb7fef05d62625650c2eea9932c93db
 EBUILD kitty-0.12.1.ebuild 1897 BLAKE2B ce76a872f9c72f4079f3c5ba4e208defebc65b9a712f41ba43f071a4a2c885cf5adc8f2e9c6b29f526d439f9132ccd23be0d346d46d2dd9cff06561e5fa13692 SHA512 696cd41a9357d17a83d34bace843966e356e917c1162cb2a5f8b61fc0ac08ea4f4de55a2abd4d83932c02d1144636b21214ecb5875b301cee97985622c338fba
-EBUILD kitty-9999.ebuild 1897 BLAKE2B ce76a872f9c72f4079f3c5ba4e208defebc65b9a712f41ba43f071a4a2c885cf5adc8f2e9c6b29f526d439f9132ccd23be0d346d46d2dd9cff06561e5fa13692 SHA512 696cd41a9357d17a83d34bace843966e356e917c1162cb2a5f8b61fc0ac08ea4f4de55a2abd4d83932c02d1144636b21214ecb5875b301cee97985622c338fba
+EBUILD kitty-0.12.3.ebuild 2064 BLAKE2B ba783ecd219f7ed469b72709c6bde7a12cddd914b423483218c10d24ece856d6a0edc81c6428421398340b631ee7b60cf41a757c2b1378ecb41f551a3cbb22a8 SHA512 42c1f5ef221514ba863759514cd04a56ce469669b2e1cf6b217c810528a54681f2e664feaffaaabbf7d2a048c5460970529d48966e5c4ed2f01e7b4e89747139
+EBUILD kitty-9999.ebuild 2064 BLAKE2B ba783ecd219f7ed469b72709c6bde7a12cddd914b423483218c10d24ece856d6a0edc81c6428421398340b631ee7b60cf41a757c2b1378ecb41f551a3cbb22a8 SHA512 42c1f5ef221514ba863759514cd04a56ce469669b2e1cf6b217c810528a54681f2e664feaffaaabbf7d2a048c5460970529d48966e5c4ed2f01e7b4e89747139
 MISC metadata.xml 428 BLAKE2B 961cd7fc3036c8f5a641cb97de57765c423f157430bf1fd68ce7febf24713ab1b15080e03f568d20f6360da467044ea4ed1d3ee7bfb132250951b4239df58980 SHA512 49ffa8dee6be29ab8adacbc0717dc574ad15f690fa1e0726b2a9de439f90867d3770e3628734d9a7457aa45896334d96f15a51e217ad248c766271aa62d85061
diff --git a/x11-terms/kitty/kitty-0.11.1.ebuild b/x11-terms/kitty/kitty-0.11.1.ebuild
deleted file mode 100644
index 8bef706b26df..000000000000
--- a/x11-terms/kitty/kitty-0.11.1.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
-PYTHON_COMPAT=( python3_6 )
-
-inherit python-single-r1 toolchain-funcs gnome2-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/kovidgoyal/kitty/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator"
-HOMEPAGE="https://github.com/kovidgoyal/kitty"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug imagemagick wayland"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPS="
-	${PYTHON_DEPS}
-	>=media-libs/harfbuzz-1.5.0:=
-	sys-libs/zlib
-	media-libs/libpng:0=
-	media-libs/freetype:2
-	media-libs/fontconfig
-	x11-libs/libXcursor
-	x11-libs/libXrandr
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libxkbcommon[X]
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-	)
-"
-RDEPEND="
-	${COMMON_DEPS}
-	imagemagick? ( virtual/imagemagick-tools )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-python/sphinx-1.7[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.11.0-flags.patch
-	"${FILESDIR}"/${PN}-0.11.0-svg-icon.patch
-)
-
-src_prepare() {
-	default
-
-	# disable wayland as required
-	if ! use wayland; then
-		sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
-	fi
-
-	# respect doc dir
-	sed -i "/htmldir =/s/appname/'${PF}'/" setup.py
-
-	tc-export CC
-}
-
-doecho() {
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	doecho "${EPYTHON}" setup.py --verbose $(usex debug --debug "") --libdir-name $(get_libdir) linux-package
-}
-
-src_test() {
-	export KITTY_CONFIG_DIRECTORY=${T}
-	"${EPYTHON}" test.py || die
-}
-
-src_install() {
-	mkdir -p "${ED}"usr || die
-	cp -r linux-package/* "${ED}usr" || die
-	python_fix_shebang "${ED}"
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-terms/kitty/kitty-0.11.2.ebuild b/x11-terms/kitty/kitty-0.11.2.ebuild
deleted file mode 100644
index 8bef706b26df..000000000000
--- a/x11-terms/kitty/kitty-0.11.2.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
-PYTHON_COMPAT=( python3_6 )
-
-inherit python-single-r1 toolchain-funcs gnome2-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/kovidgoyal/kitty/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator"
-HOMEPAGE="https://github.com/kovidgoyal/kitty"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug imagemagick wayland"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPS="
-	${PYTHON_DEPS}
-	>=media-libs/harfbuzz-1.5.0:=
-	sys-libs/zlib
-	media-libs/libpng:0=
-	media-libs/freetype:2
-	media-libs/fontconfig
-	x11-libs/libXcursor
-	x11-libs/libXrandr
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libxkbcommon[X]
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-	)
-"
-RDEPEND="
-	${COMMON_DEPS}
-	imagemagick? ( virtual/imagemagick-tools )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-python/sphinx-1.7[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.11.0-flags.patch
-	"${FILESDIR}"/${PN}-0.11.0-svg-icon.patch
-)
-
-src_prepare() {
-	default
-
-	# disable wayland as required
-	if ! use wayland; then
-		sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
-	fi
-
-	# respect doc dir
-	sed -i "/htmldir =/s/appname/'${PF}'/" setup.py
-
-	tc-export CC
-}
-
-doecho() {
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	doecho "${EPYTHON}" setup.py --verbose $(usex debug --debug "") --libdir-name $(get_libdir) linux-package
-}
-
-src_test() {
-	export KITTY_CONFIG_DIRECTORY=${T}
-	"${EPYTHON}" test.py || die
-}
-
-src_install() {
-	mkdir -p "${ED}"usr || die
-	cp -r linux-package/* "${ED}usr" || die
-	python_fix_shebang "${ED}"
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-terms/kitty/kitty-0.12.3.ebuild b/x11-terms/kitty/kitty-0.12.3.ebuild
new file mode 100644
index 000000000000..b265ed95339e
--- /dev/null
+++ b/x11-terms/kitty/kitty-0.12.3.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit python-single-r1 toolchain-funcs gnome2-utils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator"
+HOMEPAGE="https://github.com/kovidgoyal/kitty"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="debug doc imagemagick wayland"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPS="
+	${PYTHON_DEPS}
+	>=media-libs/harfbuzz-1.5.0:=
+	sys-apps/dbus
+	sys-libs/zlib
+	media-libs/libpng:0=
+	media-libs/freetype:2
+	media-libs/fontconfig
+	x11-libs/libXcursor
+	x11-libs/libXrandr
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libxkbcommon[X]
+	x11-libs/libxcb[xkb]
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+	)
+"
+RDEPEND="
+	${COMMON_DEPS}
+	imagemagick? ( virtual/imagemagick-tools )
+"
+DEPEND="${RDEPEND}
+	sys-libs/ncurses
+	virtual/pkgconfig
+"
+[[ ${PV} == *9999 ]] && DEPEND+=" >=dev-python/sphinx-1.7[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.11.0-flags.patch
+	"${FILESDIR}"/${PN}-0.11.0-svg-icon.patch
+)
+
+src_prepare() {
+	default
+
+	# disable wayland as required
+	if ! use wayland; then
+		sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
+	fi
+
+	# respect doc dir
+	sed -i "/htmldir =/s/appname/'${PF}'/" setup.py
+
+	tc-export CC
+}
+
+doecho() {
+	echo "$@"
+	"$@" || die
+}
+
+src_compile() {
+	doecho "${EPYTHON}" setup.py \
+		--verbose $(usex debug --debug "") \
+		--libdir-name $(get_libdir) \
+		linux-package
+}
+
+src_test() {
+	export KITTY_CONFIG_DIRECTORY=${T}
+	"${EPYTHON}" test.py || die
+}
+
+src_install() {
+	mkdir -p "${ED}"usr || die
+	cp -r linux-package/* "${ED}usr" || die
+	python_fix_shebang "${ED}"
+
+	if ! use doc; then
+		rm -r "${ED}"/usr/share/doc || die
+	fi
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index a97e7a7a8c5a..b265ed95339e 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/kovidgoyal/kitty/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -19,12 +19,13 @@ HOMEPAGE="https://github.com/kovidgoyal/kitty"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="debug imagemagick wayland"
+IUSE="debug doc imagemagick wayland"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 COMMON_DEPS="
 	${PYTHON_DEPS}
 	>=media-libs/harfbuzz-1.5.0:=
+	sys-apps/dbus
 	sys-libs/zlib
 	media-libs/libpng:0=
 	media-libs/freetype:2
@@ -34,6 +35,7 @@ COMMON_DEPS="
 	x11-libs/libXi
 	x11-libs/libXinerama
 	x11-libs/libxkbcommon[X]
+	x11-libs/libxcb[xkb]
 	wayland? (
 		dev-libs/wayland
 		>=dev-libs/wayland-protocols-1.12
@@ -44,9 +46,10 @@ RDEPEND="
 	imagemagick? ( virtual/imagemagick-tools )
 "
 DEPEND="${RDEPEND}
+	sys-libs/ncurses
 	virtual/pkgconfig
-	>=dev-python/sphinx-1.7[${PYTHON_USEDEP}]
 "
+[[ ${PV} == *9999 ]] && DEPEND+=" >=dev-python/sphinx-1.7[${PYTHON_USEDEP}]"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.11.0-flags.patch
@@ -73,7 +76,10 @@ doecho() {
 }
 
 src_compile() {
-	doecho "${EPYTHON}" setup.py --verbose $(usex debug --debug "") --libdir-name $(get_libdir) linux-package
+	doecho "${EPYTHON}" setup.py \
+		--verbose $(usex debug --debug "") \
+		--libdir-name $(get_libdir) \
+		linux-package
 }
 
 src_test() {
@@ -85,6 +91,10 @@ src_install() {
 	mkdir -p "${ED}"usr || die
 	cp -r linux-package/* "${ED}usr" || die
 	python_fix_shebang "${ED}"
+
+	if ! use doc; then
+		rm -r "${ED}"/usr/share/doc || die
+	fi
 }
 
 pkg_postinst() {
diff --git a/x11-terms/mate-terminal/Manifest b/x11-terms/mate-terminal/Manifest
index 23fc22e7b038..63a7b5acf5d3 100644
--- a/x11-terms/mate-terminal/Manifest
+++ b/x11-terms/mate-terminal/Manifest
@@ -1,10 +1,3 @@
-DIST mate-terminal-1.12.1.tar.xz 1143628 BLAKE2B 241edfc9cf36518638e7817e4f11ab89dfcbbc1dd11d7e10ee17bc81ceb8224fd582a1cab4b4e2aa3a24f2997298689f7bc98f07b698243885cad1c85a81eea6 SHA512 c37b725db1522153fcb4dc596205f9382605bf981504217c8b087a4d7e6086a5c40644cdab1eb3c0593632d4f38d45fbcdfd763cb1ef62ff7359335c54b6ff42
-DIST mate-terminal-1.14.1.tar.xz 1313612 BLAKE2B d8710d336964d7bc46e2e309de214bd5968697ae4b9ee750b30ff5af93480ba2bf74661698b14e4a81287c3689be4e45afb1031864183c9864773ea2097b2b2c SHA512 e7c68dfce1e9b886449774567f225cf267366ab857e510de3bae9867442306defe0b1d86bc90782326f4c252620311f6846a50b89a3f8939e8cfb816e25db209
-DIST mate-terminal-1.16.3.tar.xz 1279764 BLAKE2B 2908a9d003f1fd0e9faae3a69b55fe2a21c8ce7f54e91497964090f24f1abe553c0c4e9a28d31ac8351e9745acd496b843e1282c74fe37e41590d1b30faa5688 SHA512 b5045b57e6ad8931230edbd83cbad4e99422ccf8dbeb760327d091993012981c0ad6bfc7ae39aaeffdf8beb27a18d74c831b4e51bcef7709d7dc63bf77bcf7ad
 DIST mate-terminal-1.18.2.tar.xz 1302216 BLAKE2B 9b2e0171f62e75e967389aa3b06bcf908a9884055d220bca895ac01f8f21a4102f21a759f2b5e2f06bf2d8c18af3688f000ed9414525df203a79d2b6e66d7443 SHA512 ac35890dc955743ccf7d8176e710820179cc5dd8a89a8322eb99c29796c27586a6abb1503288896faf1eeba6047fad12cf506e67674ee6221313679061acf8c8
-EBUILD mate-terminal-1.12.1-r1.ebuild 826 BLAKE2B acb174bb84906768e94f111ebe6785b0138567ad82ece9a50489feb261e137c1fe55a8f9fb4ef23298f8582a0478446de0e88a51e453431eb08687cdfb3618b3 SHA512 68f12ae9b1a734a4c69347487a7974a9dabdb971f0286abdf87e6485119aec13b85db64f1c4d504733ab2a57115870fe06e08449740e1602d0c0478a67612623
-EBUILD mate-terminal-1.12.1.ebuild 821 BLAKE2B a479523ff16449f56372133ce46e8ac30f0da377810a801b2bce3c69db0f360bff4b980ad062cdc67c6b375d765e926e1b3d39e826b4b0b4ed013d318ba69872 SHA512 80f90a2640950924ba5c7133d11fbfa7f44ca1914d4c5b387b8712ea1dd62247051dca12cd978dd204cebd7400bdd223220a70f046ed651adefac2ad927e370a
-EBUILD mate-terminal-1.14.1-r1.ebuild 866 BLAKE2B 7d1162a088fc9b90ed036b571adb0b64b2adcde79764ff399d3a3ff9ea32935a8f9f94350da622828eed599d07b8a15125ed8a49b2d6c92ea8bef8de181dfddd SHA512 aeb95bf228187367d4f84e874982b7a9fd2a7fdbd7cf55b4b3f29ae8e7765d14558d8d22ee25dc95d96e771aa73a0f82069ada2bc0c12ff33a0c8bf706bb14c0
-EBUILD mate-terminal-1.16.3.ebuild 727 BLAKE2B 322a0b3055192fa1a470ef3262cd5b3c0ed019c5665d11067f4981dea847dda196784dd31a7c3ac7dcad5a012fee9c8b0260def69d45d1dba7ec736987b8c895 SHA512 34ddf000b0c34e5ff8deeccd003457b390028b3ed7584cbc389257e00501a9267b78a950a2624da1320eb87fe1972afd213860787698a0aa4c48fc58cb55eb03
-EBUILD mate-terminal-1.18.2.ebuild 732 BLAKE2B e4a51cfa9050f1529e8c4f1973759933310cafc4e549aa5e1b813618f83a94cff3831004fdba2c876cd80a156f590eea6f4a04c8194014631e7045a591ac7d14 SHA512 4addb84d2e72e408030d8c39bbe5a716354cdefafecc4e271bbd75e29fbb84dd333ebdd73c319df63180c46c6d12270147894dd7c79b0171fd9196c33f0bc0d3
-MISC metadata.xml 418 BLAKE2B d1b548c3d32a7ace12f9b99517feb78a64263476a32bbb9dfb167f67039ae207e1cabed5201121f0576fbc1e507c8dbb7b6277598872710e4ffc1927d67e319b SHA512 fc7439e9cd6aee179e6e6bf2ad282c0a62dc78b53dc5a0b33798ac90006159ffcc00625c156cdf93a474ef592ee3be2134ac4c7778d5d8b2768fed1ae1464cee
+EBUILD mate-terminal-1.18.2.ebuild 750 BLAKE2B 7b19c0857d4811baa6bd37d72a9f90724d066ebcc3c6b957fc48df48d99281f466d16a65306deb4f06ac695e94028d34178b66f58c73ad314ddaf0a94e943c3d SHA512 ec47a5c0b80e3384beeff37faf971e9b5f14ca9bdbb79f9388db87a3c2ce457655ec45f9c3b5dc29bce2d6abca8891590ff92f636f015025c1b7eebaa9272b89
+MISC metadata.xml 342 BLAKE2B 811cbd769e0b0c1b5766cde7b50689d7c921289cf776132d66c79203373555c83d9059505da2a441030c4aa576179130aa985c7deee4f75c8bb6c56f4968cc13 SHA512 9edc7ffa3bbd772e794786c786eeca99dc500d9f22632a54bc700ce648084f096d9fc7c1786af446711293bf0e294078abe5ce94073de091b9d48248875e7cb9
diff --git a/x11-terms/mate-terminal/mate-terminal-1.12.1-r1.ebuild b/x11-terms/mate-terminal/mate-terminal-1.12.1-r1.ebuild
deleted file mode 100644
index 9823dc8c3f04..000000000000
--- a/x11-terms/mate-terminal/mate-terminal-1.12.1-r1.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 mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="The MATE Terminal"
-LICENSE="GPL-3"
-SLOT="0"
-
-IUSE="gtk3"
-
-RDEPEND="app-text/rarian:0
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=mate-base/mate-desktop-1.6[gtk3(-)=]
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	x11-libs/pango:0
-	!gtk3? (
-		>=x11-libs/gtk+-2.24.0:2
-		>=x11-libs/vte-0.28:0
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3[X]
-		>=x11-libs/vte-0.38:2.91
-	)"
-
-DEPEND="${RDEPEND}
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0)
-}
diff --git a/x11-terms/mate-terminal/mate-terminal-1.12.1.ebuild b/x11-terms/mate-terminal/mate-terminal-1.12.1.ebuild
deleted file mode 100644
index 9eb68011adb6..000000000000
--- a/x11-terms/mate-terminal/mate-terminal-1.12.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="The MATE Terminal"
-LICENSE="GPL-3"
-SLOT="0"
-
-IUSE="gtk3"
-
-RDEPEND="app-text/rarian:0
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=mate-base/mate-desktop-1.6[gtk3(-)=]
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	x11-libs/pango:0
-	!gtk3? (
-		>=x11-libs/gtk+-2.24.0:2
-		>=x11-libs/vte-0.28:0
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3
-		>=x11-libs/vte-0.38:2.91
-	)"
-
-DEPEND="${RDEPEND}
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0)
-}
diff --git a/x11-terms/mate-terminal/mate-terminal-1.14.1-r1.ebuild b/x11-terms/mate-terminal/mate-terminal-1.14.1-r1.ebuild
deleted file mode 100644
index 8c3f9cc7b3bd..000000000000
--- a/x11-terms/mate-terminal/mate-terminal-1.14.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="The MATE Terminal"
-LICENSE="GPL-3"
-SLOT="0"
-
-IUSE="gtk3"
-
-COMMON_DEPEND="dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=mate-base/mate-desktop-1.6[gtk3(-)=]
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	x11-libs/pango:0
-	!gtk3? (
-		>=x11-libs/gtk+-2.24.0:2
-		>=x11-libs/vte-0.28:0
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3[X]
-		>=x11-libs/vte-0.38:2.91
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	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:*"
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0)
-}
diff --git a/x11-terms/mate-terminal/mate-terminal-1.16.3.ebuild b/x11-terms/mate-terminal/mate-terminal-1.16.3.ebuild
deleted file mode 100644
index 33f211aa820c..000000000000
--- a/x11-terms/mate-terminal/mate-terminal-1.16.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="The MATE Terminal"
-LICENSE="GPL-3"
-SLOT="0"
-
-IUSE=""
-
-COMMON_DEPEND="dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=gnome-base/dconf-0.13.4:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	x11-libs/pango:0
-	>=x11-libs/gtk+-3.14:3[X]
-	>=x11-libs/vte-0.38:2.91"
-
-RDEPEND="${COMMON_DEPEND}
-	>=mate-base/mate-desktop-1.6"
-
-DEPEND="${COMMON_DEPEND}
-	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:*"
diff --git a/x11-terms/mate-terminal/mate-terminal-1.18.2.ebuild b/x11-terms/mate-terminal/mate-terminal-1.18.2.ebuild
index 49f9068abe51..fbcc14a77757 100644
--- a/x11-terms/mate-terminal/mate-terminal-1.18.2.ebuild
+++ b/x11-terms/mate-terminal/mate-terminal-1.18.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
@@ -33,6 +33,7 @@ DEPEND="${COMMON_DEPEND}
 	app-text/rarian:0
 	>=app-text/scrollkeeper-dtd-1:1.0
 	app-text/yelp-tools:0
+	dev-util/glib-utils
 	>=dev-util/intltool-0.50.1:*
 	sys-devel/gettext:*
 	virtual/pkgconfig:*"
diff --git a/x11-terms/mate-terminal/metadata.xml b/x11-terms/mate-terminal/metadata.xml
index 2f0acb5747d8..85e126f0649a 100644
--- a/x11-terms/mate-terminal/metadata.xml
+++ b/x11-terms/mate-terminal/metadata.xml
@@ -5,9 +5,6 @@
 		<email>mate@gentoo.org</email>
 		<name>Gentoo MATE Desktop</name>
 	</maintainer>
-	<use>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/mate-terminal</remote-id>
 	</upstream>
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index f8bf756dfb22..96411c8dd184 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,7 +1,7 @@
 DIST xterm-327.tgz 1240131 BLAKE2B 7f009ec995fa9f8007cd5497d13f1120440df40ef0801da9be6c708e6e9a31e5c43ddb8fe1af1abfa24ce4c1c9e769bf8d74d0bd7acf94d172ea4cc10ddc177c SHA512 d9d9f3b870fea8db9ae3c076a9d85152488b2d392b9b1e2e4ebbeded287ed4911f1f63e5e035d5b3793b2506b993125c6fca437393b435a28aeb519d76147672
-DIST xterm-331.tgz 1286312 BLAKE2B 4299f2d0d1f79c88e855850b028c7778c71a1d38a8f78ad1344e8a5794dfbb24cacea544b51ba63374d0c634d0051383331084dfe2363d8f68de917934d4b7bc SHA512 88229d682553d4780c7b9c081bba6396f319ecd17461dd344478ae6456e35aff9d7a7411d863d35a03886d9a6b082b5d3325fbb990cea22cb82970173f6f3347
 DIST xterm-333.tgz 1298897 BLAKE2B 4b4c00639498201bd73d871f8274f52c62c0e852b17a25d241b9af09a137cb11639503b0d7eba8f2e6c1a79efe83a9c56a45bb6cab18ce1ee786402b2973fb3b SHA512 90c5d8d3d039417915d40d22fcc6244d1c86e8bcc39d865ba6cb67fc9d1ff6e0f3ee79da06a094d23f6801195f0baa26564a553d04c974d62a331016118215a0
+DIST xterm-337.tgz 1336781 BLAKE2B 6878154cc5d2f8547b8b8ffac0bff7603dce6d58c294b4153e169654fc441f1209c97a6d17bf3f880d0160a42e102ca8fd4a291c2b7d373269290a7bbebeeb8d SHA512 fad31aa971a42cf38d3e3db2edc615b408d92226c305654b9276592c6dee075f31c7f082a3f549284f1685a31d5d9dedbda99c2c308a90bd741958f862806609
 EBUILD xterm-327.ebuild 2602 BLAKE2B 3a890f115ef21ec8a0efcf6a7860895e5dee80631f5f9d82741be07cdd99622f945bd6c268b5095424b6db2b32028166867f3f9da49b76c6c8493809fe0b7c4a SHA512 6ffa30d6d1d640e8d5dad853c73a37b61350dce24baff2a380914f3b6e81d4b30d7b6adc96cd7f24bb5fdb9b5d843c1fe490308503fd20da2e12eef11f7bef05
-EBUILD xterm-331.ebuild 2612 BLAKE2B 8f1822ad662254d404c6b29984aa9d8c6e898249c728890507cbc561daafd1064f578051c6dd33509264b962d6369bb4ff57136f264252fa996cf28ad8a406a4 SHA512 c359b1f01968f0dacd9d4e566ac2e5c1e75b9e56c248b518f449d5c29e9b8365201bc28ad4c22d34822c2c218875c1b30cdbd27ec426d12a0834d00e1362708e
 EBUILD xterm-333.ebuild 2644 BLAKE2B 26ec3b74546d5c71a70e1de8264a146de15120334923f844e2c94083ba28796072cab342c3ecb1d9816d527ce7aa0188cf2633009a671c8cb806bcef125e053f SHA512 0d187ccdea85c6709a112287291b5d3f8d86b82b25689263c4127c5ead67861ebda03a71d139f8627a6931d253579695f81cd633a813b94c69bca3b94ab01bf2
+EBUILD xterm-337.ebuild 2654 BLAKE2B 00966164e3d921a1143494965c9a9de354d3002f0c4b538598f3bd4516d89c3dcaf21d4f0fb58d8be56f25d0e71c3824d1e42519676846a94274033c88754d80 SHA512 fba7b1e53e3959adce1f00f4f4f721369a9109964eb347623159f4f22c49ed38d05720193b4501880044496f4844029fe593204310f775fbe1929453bba43a5a
 MISC metadata.xml 403 BLAKE2B 7b0420abb55d7db9c383ae340cd74e518b4dd857fae33aa3a51bee1093261f0542a81f2b1c3250ff2b4701750201701e40fa4e24d9520961482c05bd181a7918 SHA512 a42b014499c03fb890ecd8e4f799ebd928d7a8d6db1ccd05236772faf8aca39a060fd590fbf4e5f7bb21dccf4b17cafa957d628c06db20650e6a87fd1ebef788
diff --git a/x11-terms/xterm/xterm-331.ebuild b/x11-terms/xterm/xterm-331.ebuild
deleted file mode 100644
index 7df0e025fc6b..000000000000
--- a/x11-terms/xterm/xterm-331.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="Terminal Emulator for X Windows"
-HOMEPAGE="https://invisible-island.net/xterm/"
-SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+openpty toolbar truetype unicode Xaw3d xinerama"
-
-COMMON_DEPEND="kernel_linux? ( sys-libs/libutempter )
-	kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
-	>=sys-libs/ncurses-5.7-r7:0=
-	x11-apps/xmessage
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXft
-	x11-libs/libxkbfile
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXt
-	unicode? ( x11-apps/luit )
-	Xaw3d? ( x11-libs/libXaw3d )
-	xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${COMMON_DEPEND}
-	media-fonts/font-misc-misc
-	x11-apps/rgb"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-DOCS=( README{,.i18n} ctlseqs.txt )
-
-pkg_setup() {
-	DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
-}
-
-src_configure() {
-	# 454736
-	# Workaround for ncurses[tinfo] until upstream fixes their buildsystem using
-	# something sane like pkg-config or ncurses5-config and stops guessing libs
-	# Everything gets linked against ncurses anyways, so don't shout
-	append-libs $(pkg-config --libs ncurses)
-
-	econf \
-		--libdir="${EPREFIX}"/etc \
-		--disable-full-tgetent \
-		--with-app-defaults="${DEFAULTS_DIR}" \
-		--disable-setuid \
-		--disable-setgid \
-		--with-utempter \
-		--with-x \
-		$(use_with Xaw3d) \
-		$(use_with xinerama) \
-		--disable-imake \
-		--enable-256-color \
-		--enable-broken-osc \
-		--enable-broken-st \
-		--enable-exec-xterm \
-		$(use_enable truetype freetype) \
-		--enable-i18n \
-		--enable-load-vt-fonts \
-		--enable-logging \
-		$(use_enable openpty) \
-		$(use_enable toolbar) \
-		$(use_enable unicode mini-luit) \
-		$(use_enable unicode luit) \
-		--enable-wide-chars \
-		--enable-dabbrev \
-		--enable-warnings
-}
-
-src_install() {
-	default
-
-	dohtml xterm.log.html
-	domenu *.desktop
-
-	# Fix permissions -- it grabs them from live system, and they can
-	# be suid or sgid like they were in pre-unix98 pty or pre-utempter days,
-	# respectively (#69510).
-	# (info from Thomas Dickey) - Donnie Berkholz <spyderous@gentoo.org>
-	fperms 0755 /usr/bin/xterm
-
-	# restore the navy blue
-	sed -i -e "s:blue2$:blue:" "${D}${DEFAULTS_DIR}"/XTerm-color || die
-}
diff --git a/x11-terms/xterm/xterm-337.ebuild b/x11-terms/xterm/xterm-337.ebuild
new file mode 100644
index 000000000000..dd0e7348c83a
--- /dev/null
+++ b/x11-terms/xterm/xterm-337.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop flag-o-matic multilib
+
+DESCRIPTION="Terminal Emulator for X Windows"
+HOMEPAGE="https://invisible-island.net/xterm/"
+SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+openpty toolbar truetype unicode Xaw3d xinerama"
+
+BDEPEND="virtual/pkgconfig
+	x11-base/xorg-proto"
+DEPEND="kernel_linux? ( sys-libs/libutempter )
+	kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
+	media-libs/fontconfig:1.0
+	>=sys-libs/ncurses-5.7-r7:0=
+	x11-apps/xmessage
+	x11-libs/libICE
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXft
+	x11-libs/libxkbfile
+	x11-libs/libXmu
+	x11-libs/libXrender
+	x11-libs/libXt
+	unicode? ( x11-apps/luit )
+	Xaw3d? ( x11-libs/libXaw3d )
+	xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${DEPEND}
+	media-fonts/font-misc-misc
+	x11-apps/rgb"
+
+DOCS=( README{,.i18n} ctlseqs.txt )
+
+pkg_setup() {
+	DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
+}
+
+src_configure() {
+	# 454736
+	# Workaround for ncurses[tinfo] until upstream fixes their buildsystem using
+	# something sane like pkg-config or ncurses5-config and stops guessing libs
+	# Everything gets linked against ncurses anyways, so don't shout
+	append-libs $(pkg-config --libs ncurses)
+
+	local myeconfargs=(
+		--disable-full-tgetent
+		--disable-imake
+		--disable-setgid
+		--disable-setuid
+		--enable-256-color
+		--enable-broken-osc
+		--enable-broken-st
+		--enable-dabbrev
+		--enable-exec-xterm
+		--enable-i18n
+		--enable-load-vt-fonts
+		--enable-logging
+		--enable-screen-dumps
+		--enable-warnings
+		--enable-wide-chars
+		--libdir="${EPREFIX}"/etc
+		--with-app-defaults="${DEFAULTS_DIR}"
+		--with-utempter
+		--with-x
+		$(use_enable openpty)
+		$(use_enable toolbar)
+		$(use_enable truetype freetype)
+		$(use_enable unicode luit)
+		$(use_enable unicode mini-luit)
+		$(use_with Xaw3d)
+		$(use_with xinerama)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	docinto html
+	dodoc xterm.log.html
+	domenu *.desktop
+
+	# Fix permissions -- it grabs them from live system, and they can
+	# be suid or sgid like they were in pre-unix98 pty or pre-utempter days,
+	# respectively (#69510).
+	# (info from Thomas Dickey) - Donnie Berkholz <spyderous@gentoo.org>
+	fperms 0755 /usr/bin/xterm
+
+	# restore the navy blue
+	sed -i -e "s:blue2$:blue:" "${D}${DEFAULTS_DIR}"/XTerm-color || die
+}
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 3a1a3730ec60..3ca573e11c15 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/e-gtk-theme/Manifest b/x11-themes/e-gtk-theme/Manifest
new file mode 100644
index 000000000000..247de898dc68
--- /dev/null
+++ b/x11-themes/e-gtk-theme/Manifest
@@ -0,0 +1,3 @@
+DIST e-gtk-theme-0.19.3.tar.gz 488203 BLAKE2B a6f19d1da6aeb78030f71face4239bc63c8a550c7ba3ab6cad2b06827ec5ae0da3f14372c1e552454f74f7b18a3aa0c007ca4f7f8040993fc366d5bd25da36cb SHA512 6a833a3c0c38388d56370ae3fe2a3477423fc56133469ddfe482ce0c82e0f4cf39c773448a554227946c8787d588ee637a8f9d2a341f175c1b9ebc1db4f9d990
+EBUILD e-gtk-theme-0.19.3.ebuild 582 BLAKE2B 1b4cbc294306fc0f32ec47b413d0012b565a5119b8d16e39698321790f04d3e09c086e2ea8134345b571fe15fc8e295a3e069764f67b6ef343ee6c133615cd93 SHA512 c429951ccbaf0282658498ce6e853ca8e8c181b606adcb38ba5d8f95c42448c09a78bb6ca92aef6d60e0b8377ae1ce291a265962f7e9c2c2fdadf2ab4902fcc0
+MISC metadata.xml 344 BLAKE2B 2b09c758b212196592a83ba9e2f30591f97d222619bf3a494fcc025789c46d70f55b955400c580dbc9d3f5ea3cdb3662d79e2960d88e8b7e089a741c7fa6041d SHA512 f9e35a54a3d719a4114e2bc758096c1f6365838163ab5f6a3353bd318581683ca4757be60d0dbb8457099c1e174518078091a94e2f23f086903f45be94c4915d
diff --git a/x11-themes/e-gtk-theme/e-gtk-theme-0.19.3.ebuild b/x11-themes/e-gtk-theme/e-gtk-theme-0.19.3.ebuild
new file mode 100644
index 000000000000..4e63c0096b58
--- /dev/null
+++ b/x11-themes/e-gtk-theme/e-gtk-theme-0.19.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A GTK theme to match Enlightenment WM's default theme"
+HOMEPAGE="https://gitlab.com/tokiclover/e-gtk-theme"
+SRC_URI="https://gitlab.com/tokiclover/${PN}/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+	default
+	find . -name 'Makefile' -delete || die
+}
+
+src_install() {
+	insinto /usr/share/themes/e-gtk-theme
+	doins -r apps/ gtk-2.0/ gtk-3.0/ metacity-1/ openbox-3/ index.theme start-here.png
+
+	einstalldocs
+}
diff --git a/x11-themes/e-gtk-theme/metadata.xml b/x11-themes/e-gtk-theme/metadata.xml
new file mode 100644
index 000000000000..d9a6217dd22d
--- /dev/null
+++ b/x11-themes/e-gtk-theme/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>juippis@gmail.com</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/x11-themes/mate-backgrounds/Manifest b/x11-themes/mate-backgrounds/Manifest
index c9285f50cbb9..764113c7ca19 100644
--- a/x11-themes/mate-backgrounds/Manifest
+++ b/x11-themes/mate-backgrounds/Manifest
@@ -1,9 +1,3 @@
-DIST mate-backgrounds-1.12.0.tar.xz 20885844 BLAKE2B 86e1c18c699662f21a252c89c3379072fd5d2dfc3132cb7cba634bc3f25b9b72f05d0bce43f0dbfeee3ee4580fc27c6d0f85a919efda824b6e8fe6af26cfd496 SHA512 3dfb175bf0a2240b2639a6038625679d9f13ed7c9b8e381eb4249f9938410cbb24593fa00baac7a1dd7458ecd00ea6e24ab03ff161381d250ddbac5b5cbabc55
-DIST mate-backgrounds-1.14.0.tar.xz 20889156 BLAKE2B c94702a8ff3d4436dcf4860e90a51dfacb921a8e7b0e9e559b879a41fc027da73280026941a796a120c9dbab916bd99fdbb7b11961313d43e50bd485b117ac58 SHA512 01bbe17b6c42626a056e3648bdbaef5b3fac950c7da951641634f543b496b24f5b0777d85269d6905f0b08e636eb50e19a348030b874e6c91208434c042d204f
-DIST mate-backgrounds-1.16.0.tar.xz 20889904 BLAKE2B d1414f5be30036c657fcbd8970908619ee69dafed2a64501482fd4871b848b80dabc576b81500b5fe1356406303c40e911b97a6cace6feb5864deda93ac88e16 SHA512 fa9d3913089a90fa4260820b4d074d7d1209cf9a384929cd041fe9eef396b6796cc61eb3897d08283eb4d7ad852686e8e99d345514194523cdfb22566c5487e8
 DIST mate-backgrounds-1.18.0.tar.xz 20890260 BLAKE2B 628e572a557244d2a7fef15a69a0d61a37485a2efe048754c7a3e1338bfb93e04ea343017a7f646b0a84c5a54e905db548c4947b806be2fbeeebd859a349f407 SHA512 489ed3c57f60b471cba6afa8243cd752b534ac1881db30310b603949af7e3bfb3c9fa8d55c37942377cb36c0fc7545d940de2d03c1166e829b128e6c576f587e
-EBUILD mate-backgrounds-1.12.0.ebuild 339 BLAKE2B 3c78bca6289676eca669448bd2b62133edb57d5ec050e710b2e4cd4a71eff70c01ace500f91126338945de65cb98940212aab5c8d169837c9802fcb27083a889 SHA512 f1fca9030a486620e586b795d5754808687f71198c2bf46112c6ac7e243ab91120bd31efa5edec94fd7b7cdabe164add6b555e13a953f72a16dd5ed1fa3f80bc
-EBUILD mate-backgrounds-1.14.0.ebuild 341 BLAKE2B 1dc213f8cb5b57a7128306d9dbdb8ab773c909eee27b57434374930d6e9fe8d06941b2dd8ede8f39052c8f7e781d9064c085fa06e3e869877876f3d0ccb16072 SHA512 14ea3b9126306fdfc31d39d14b73f51080f48462d7f6da59dfa581af831587c50c9e2a878fb8504981f15a08618a1b43e79105a62662392bc1046069563112d5
-EBUILD mate-backgrounds-1.16.0.ebuild 341 BLAKE2B 1dc213f8cb5b57a7128306d9dbdb8ab773c909eee27b57434374930d6e9fe8d06941b2dd8ede8f39052c8f7e781d9064c085fa06e3e869877876f3d0ccb16072 SHA512 14ea3b9126306fdfc31d39d14b73f51080f48462d7f6da59dfa581af831587c50c9e2a878fb8504981f15a08618a1b43e79105a62662392bc1046069563112d5
 EBUILD mate-backgrounds-1.18.0.ebuild 346 BLAKE2B 6b9da1345993b6e862f64efe5c20ae4809e3cf58f8a2b570119173949d37fce403b89f816b8cb67888beeda8c37d87aae666509d50fa4840d769cf2a925f2ff3 SHA512 a0f92ada8dd1a036c5f65e755a478f4a2f7a5de14a1130d9455127e051a497e9091c38b89a10fff2c51495843a796f10737d91a1b13232104191669db26ffa21
 MISC metadata.xml 345 BLAKE2B 28aa7d5e9322cc6467efe367a61c8c6dfcb915155f071cdc2b5d7068d205e6d55dff935c975f1198f905d39995d8d86f26aeee2275bab05be094b65008a338c5 SHA512 9880e456177c6c1557c36c3dbf99a55f8abe497be5778db47a0b80f2a3d15bb8e3b3c9f3b00b3161d3aa4cf61dc6ed106ade41e8aba3ed99fc3a879bcf47bc8f
diff --git a/x11-themes/mate-backgrounds/mate-backgrounds-1.12.0.ebuild b/x11-themes/mate-backgrounds/mate-backgrounds-1.12.0.ebuild
deleted file mode 100644
index 5a18363adc0d..000000000000
--- a/x11-themes/mate-backgrounds/mate-backgrounds-1.12.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="A set of backgrounds packaged with the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=dev-util/intltool-0.35:*
-	sys-devel/gettext:*"
diff --git a/x11-themes/mate-backgrounds/mate-backgrounds-1.14.0.ebuild b/x11-themes/mate-backgrounds/mate-backgrounds-1.14.0.ebuild
deleted file mode 100644
index d73aa9e13343..000000000000
--- a/x11-themes/mate-backgrounds/mate-backgrounds-1.14.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="A set of backgrounds packaged with the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=dev-util/intltool-0.35:*
-	sys-devel/gettext:*"
diff --git a/x11-themes/mate-backgrounds/mate-backgrounds-1.16.0.ebuild b/x11-themes/mate-backgrounds/mate-backgrounds-1.16.0.ebuild
deleted file mode 100644
index d73aa9e13343..000000000000
--- a/x11-themes/mate-backgrounds/mate-backgrounds-1.16.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="A set of backgrounds packaged with the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=dev-util/intltool-0.35:*
-	sys-devel/gettext:*"
diff --git a/x11-themes/mate-icon-theme-faenza/Manifest b/x11-themes/mate-icon-theme-faenza/Manifest
index 30d3295162fa..3ca5d8f687d1 100644
--- a/x11-themes/mate-icon-theme-faenza/Manifest
+++ b/x11-themes/mate-icon-theme-faenza/Manifest
@@ -1,9 +1,3 @@
-DIST mate-icon-theme-faenza-1.12.0.tar.xz 19058516 BLAKE2B 7908613361d66a8ef1f6630667cf0101f869700069395030891f8903d16df9653d5d4e3667248dd24f010ea67f5affae609862256dca839bc58db5d0987367dd SHA512 58c26458027bc9938ca01f88942faedce5189b090302adb3c4f63f1c042616fb4fb8f53f1454a9d7de1b642af1074fa3f7a1a75eeaacbc675a4467dad9b95be4
-DIST mate-icon-theme-faenza-1.14.0.tar.xz 19314908 BLAKE2B 4ed817e4ee61d996c98ad915892967a28ed5d4c063400239f65b33f50f9e53f2362530668704d08cd09ee4b541b42ec6bee11ed59d87e62220e171b00aa70f63 SHA512 91c92eb1e3db91425a6fba13803b050227acf3bc0e9b6c0f07f6805d7c154cc21e2dbf38fac567aa4953abebb678663936491a65a0de5889be837f53068a6e58
-DIST mate-icon-theme-faenza-1.16.0.tar.xz 19312972 BLAKE2B c9ca971cf366630b98d503848a524cfd637dd33749e2ba078c0bc6600fe0bc83c841341a172345eace9c068a400913986b1085c53e586e16774d6755c2333029 SHA512 27d7521f52edf274eb066c7a7c689237dc584b68712787e5e008b22d90427391c952fd59eb372c4d08063af7f0bd85dbab35c57fd63b3e86fda174010f76c0fb
 DIST mate-icon-theme-faenza-1.18.1.tar.xz 19330596 BLAKE2B dc7dfb5ac21b4caf19a7d4672d8ec39b9d6f4fd0762c40dd598ad98c446059d53aa6d7a291a391126e18bfb3d16369415a06d91d11ba34d3e336ad1c9a30daa1 SHA512 16ddccf5b69c69a8a6c8167c38ef4603c997b756e222e61d7b2d1540598efabde01cafbc1248082054e92d078dcc792f2afd1c68ceedcbf15846cdbe6241875b
-EBUILD mate-icon-theme-faenza-1.12.0-r1.ebuild 661 BLAKE2B 9ee7d7a2fc50e23fefeefa4f0c029e31b1841a81591e30176f770a2df327c6bffa1ee5a5d3e4e2ba17e79c402755d652fb4313e8d4e2f6c1fb74cdb483e6bb0d SHA512 28ad25b80d706cae1bdb8102c5b3197f37c6397407d7e6c65757ba45a74bb6e8730c01cdc7542f64f9a375fea71c3ffa44615fcb7cc8a8e4cd51a15e58829486
-EBUILD mate-icon-theme-faenza-1.14.0.ebuild 663 BLAKE2B 80fa9105a063e17570ccdd9456e9dcb3e6865a0dbe91c3908bf7d36ea9f5af9bbd544c691ad96a63fa2e81f4a731366486b9c376cba894838f58aa23c4019636 SHA512 001d53dde0443a8c2db6f836d97a886046e5b7698dedbda1d0b6d74b35d626c1928e1e5409a069af3c645c58e9623a1d420f1c45605cc0555473c65958e124f8
-EBUILD mate-icon-theme-faenza-1.16.0.ebuild 663 BLAKE2B 80fa9105a063e17570ccdd9456e9dcb3e6865a0dbe91c3908bf7d36ea9f5af9bbd544c691ad96a63fa2e81f4a731366486b9c376cba894838f58aa23c4019636 SHA512 001d53dde0443a8c2db6f836d97a886046e5b7698dedbda1d0b6d74b35d626c1928e1e5409a069af3c645c58e9623a1d420f1c45605cc0555473c65958e124f8
 EBUILD mate-icon-theme-faenza-1.18.1.ebuild 661 BLAKE2B be5028c4c9a7a698e93ef9331353baa931b3a863819e9c85bafd9871b1134e37696e63bf4af522236ccf42fcb64a6f5fecf7e6ad826b69f24be04923695c8795 SHA512 23b5f165c6a8e2852e50436799c88b31abaa56ffad817df32a856e4f2b6b62dd1a2c2d1bcb046055f6a750c34b53f8a9b3f0485eae365a717c40098c9e9929d2
 MISC metadata.xml 351 BLAKE2B 6f8590edfb9db226c598aa41b3d1ca697abb763802c5eb6dced57f0f8740bc421be86795a12b7e54a8b705cda50afbef9e70d116c821f8e7894dd5585a532d16 SHA512 1ac9de3c843085a3d3bda3682d0131a64ab1c8d05f71dfa113661d565371fb34238cba69f5838263305eb38e8ced3add1d511613369ea1fd0e8ea51952508d85
diff --git a/x11-themes/mate-icon-theme-faenza/mate-icon-theme-faenza-1.12.0-r1.ebuild b/x11-themes/mate-icon-theme-faenza/mate-icon-theme-faenza-1.12.0-r1.ebuild
deleted file mode 100644
index f0a87931b88d..000000000000
--- a/x11-themes/mate-icon-theme-faenza/mate-icon-theme-faenza-1.12.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Faenza icon theme, that was adapted for MATE desktop"
-LICENSE="GPL-3"
-SLOT="0"
-
-IUSE="minimal"
-
-RDEPEND="x11-themes/hicolor-icon-theme:0
-	!minimal? ( >=x11-themes/mate-icon-theme-${MATE_BRANCH} )"
-
-RESTRICT="binchecks strip"
-
-# https://github.com/mate-desktop/mate-icon-theme-faenza/issues/13
-MATE_FORCE_AUTORECONF=true
-
-src_prepare() {
-	# Remove broken libreoffice icons (dangling symlinks).
-	rm matefaenza/apps/16/*libreoffice* || die
-
-	mate_src_prepare
-}
diff --git a/x11-themes/mate-icon-theme-faenza/mate-icon-theme-faenza-1.14.0.ebuild b/x11-themes/mate-icon-theme-faenza/mate-icon-theme-faenza-1.14.0.ebuild
deleted file mode 100644
index 4001c98ccd63..000000000000
--- a/x11-themes/mate-icon-theme-faenza/mate-icon-theme-faenza-1.14.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Faenza icon theme, that was adapted for MATE desktop"
-LICENSE="GPL-3"
-SLOT="0"
-
-IUSE="minimal"
-
-RDEPEND="x11-themes/hicolor-icon-theme:0
-	!minimal? ( >=x11-themes/mate-icon-theme-${MATE_BRANCH} )"
-
-RESTRICT="binchecks strip"
-
-# https://github.com/mate-desktop/mate-icon-theme-faenza/issues/13
-MATE_FORCE_AUTORECONF=true
-
-src_prepare() {
-	# Remove broken libreoffice icons (dangling symlinks).
-	rm matefaenza/apps/16/*libreoffice* || die
-
-	mate_src_prepare
-}
diff --git a/x11-themes/mate-icon-theme-faenza/mate-icon-theme-faenza-1.16.0.ebuild b/x11-themes/mate-icon-theme-faenza/mate-icon-theme-faenza-1.16.0.ebuild
deleted file mode 100644
index 4001c98ccd63..000000000000
--- a/x11-themes/mate-icon-theme-faenza/mate-icon-theme-faenza-1.16.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Faenza icon theme, that was adapted for MATE desktop"
-LICENSE="GPL-3"
-SLOT="0"
-
-IUSE="minimal"
-
-RDEPEND="x11-themes/hicolor-icon-theme:0
-	!minimal? ( >=x11-themes/mate-icon-theme-${MATE_BRANCH} )"
-
-RESTRICT="binchecks strip"
-
-# https://github.com/mate-desktop/mate-icon-theme-faenza/issues/13
-MATE_FORCE_AUTORECONF=true
-
-src_prepare() {
-	# Remove broken libreoffice icons (dangling symlinks).
-	rm matefaenza/apps/16/*libreoffice* || die
-
-	mate_src_prepare
-}
diff --git a/x11-themes/mate-icon-theme/Manifest b/x11-themes/mate-icon-theme/Manifest
index b083973f6e77..42d55331dc56 100644
--- a/x11-themes/mate-icon-theme/Manifest
+++ b/x11-themes/mate-icon-theme/Manifest
@@ -1,9 +1,3 @@
-DIST mate-icon-theme-1.12.0.tar.xz 19330108 BLAKE2B 55c4aa0d228ce3e6d8d128959556f862f99b2a39dcacf7182b2376a8cda1a30cd5c04c122295e83137d3bc99728f40de623c37643ced931faf61c517016e76cd SHA512 b108a677ead07eec8811c4e97d478c1d0ee319a684e48076cffca893120537564748e9ecba02b44feabf3e255610e2d596c1490fdb2fc9fed5b04f1908c5726f
-DIST mate-icon-theme-1.14.0.tar.xz 19054508 BLAKE2B b9596a60e950b1429426cb7efbb472c0a53a333c6dbd1f281704441a6e8f3d2ee2b121994fa361c344280b13dd52616451c31e4ccfff9cc365851d710efaa6db SHA512 e75c1d6ad0781050a359fe1b54f836e9bc4e099f465a5bc4dc3e235432558304561c047f7f1e4d1764522073f04aa65ca9ae4dbde44627de8b3a9de1e7178490
-DIST mate-icon-theme-1.16.2.tar.xz 20071516 BLAKE2B b7f47ab4d35a1d24fbcb790f868f18f54fac6c68c1b4227a49dca5e82dc4aed41574d085cbc7921882cb7d617249d59c8f2e21930d77f8f2134882c7a950ed87 SHA512 cb863e4230eeca069e961fd363a72554ef79a53fb051b8a7d962851f5e594b3ef7f1416aa2da91561345787dabfd1a1eab899bc0b29ff15c02a08f22f4631e51
 DIST mate-icon-theme-1.18.2.tar.xz 20071792 BLAKE2B b9e14479b2fbf34a8c1ca9cd889099fc547924c3b9ebdf3035a730f946d9462ee8d44774fef2d66a7d1395051b85b9aac84d17be344c876c9767c601e97073fa SHA512 6e6d60b7eeba474d4d9d4d069f9fa4f8098cf54aa8367c02b05c5ec556ccd5310d791183ec961e9227867b37ec7e27b8ac8aadfee1f1446b34cee1985b4ef1fb
-EBUILD mate-icon-theme-1.12.0.ebuild 522 BLAKE2B ddc8976edcbb70f6401428130b173a78165952cdbbf44c0f37a264f525c15e670cdecc788ed15ff1362bf10b943eadc22ae4bff077a28b6dde6e7180d6b15013 SHA512 fe08073e659d76d88f987e5772d5e0fab36b0ecd8f407bcc1715e5d27086bacc627d1b3d32a1ab7713a9d5d5caa2540510714b25a4c9e53427039de10e9f6768
-EBUILD mate-icon-theme-1.14.0.ebuild 564 BLAKE2B 90a6c24bacc4499158c15818bb5f8e1792b25ca878b0a0d2653268aab41bdd396e289e998ff83115ec9d13bd6b19acd6de1780feb58bda69d77b203cab55efd8 SHA512 b464ad032d9768f5f398d7ab951ea056a4c022708c08464cf4fb3095b59064b94a570e8feffff94c08adf4dde389120690a302ac97d1118b792796d02a7bf999
-EBUILD mate-icon-theme-1.16.2.ebuild 564 BLAKE2B 0078de882cc05f51f7339bb8b9bf5e505b784edc092a221b8164071434d190fc73c6902d1fb07a27ac2b4a23b49aeace81df5c6e471ce80e777f49e9c4a2cd18 SHA512 7a17dbf9bb286374e76601e186bfd0ffc181677293e029edeac7e9e5f8e6fc09ef166d5dd26028373cfeba39260cf99440700e7c6a5c7795957fcb1da2b338b2
 EBUILD mate-icon-theme-1.18.2.ebuild 569 BLAKE2B 24a5684236dcbe2f76e648118313b42a2515824b95ebc90cacd909a6dfa977fec062527e504e0d63c158e42ef691d374b2827d4dbe23b66cdd817a2648ef1484 SHA512 c8483415afaf8a99d085964d967834a123351295f59dfecc445af0e12d7579a9971a67889ea480d298275187f060c66e5b206694e7b5cd4051bcce1f0ae76813
 MISC metadata.xml 344 BLAKE2B 68e920d9ee5bc270b90b69afd553a9010971d678bcaa94e11345369c0ac5be27719f2acb9d213ec48a42e6be609b2f8ea392a72d39b43bd24b2ebf76f162ce48 SHA512 fc069bbf06319886e8f884c8ffe2d869e4224a062f3aa26af997442db92015261c3e1ebe73e6e9c9e4d8dc69d1d3f7d8df12134967bebbbadaea98911dad05bf
diff --git a/x11-themes/mate-icon-theme/mate-icon-theme-1.12.0.ebuild b/x11-themes/mate-icon-theme/mate-icon-theme-1.12.0.ebuild
deleted file mode 100644
index b1c3ff2ba322..000000000000
--- a/x11-themes/mate-icon-theme/mate-icon-theme-1.12.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="MATE default icon themes"
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND=">=x11-themes/hicolor-icon-theme-0.10"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40:*
-	>=x11-misc/icon-naming-utils-0.8.7:0
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-RESTRICT="binchecks strip"
-
-src_configure() {
-	mate_src_configure --enable-icon-mapping
-}
diff --git a/x11-themes/mate-icon-theme/mate-icon-theme-1.14.0.ebuild b/x11-themes/mate-icon-theme/mate-icon-theme-1.14.0.ebuild
deleted file mode 100644
index eff34f68d1c6..000000000000
--- a/x11-themes/mate-icon-theme/mate-icon-theme-1.14.0.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 mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE default icon themes"
-LICENSE="GPL-2"
-SLOT="0"
-
-COMMON_DEPEND=">=x11-themes/hicolor-icon-theme-0.10"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40:*
-	>=x11-misc/icon-naming-utils-0.8.7:0
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-RESTRICT="binchecks strip"
-
-src_configure() {
-	mate_src_configure --enable-icon-mapping
-}
diff --git a/x11-themes/mate-icon-theme/mate-icon-theme-1.16.2.ebuild b/x11-themes/mate-icon-theme/mate-icon-theme-1.16.2.ebuild
deleted file mode 100644
index 1e10653efdf6..000000000000
--- a/x11-themes/mate-icon-theme/mate-icon-theme-1.16.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE default icon themes"
-LICENSE="GPL-2"
-SLOT="0"
-
-COMMON_DEPEND=">=x11-themes/hicolor-icon-theme-0.10"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40:*
-	>=x11-misc/icon-naming-utils-0.8.7:0
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-RESTRICT="binchecks strip"
-
-src_configure() {
-	mate_src_configure --enable-icon-mapping
-}
diff --git a/x11-themes/mate-themes/Manifest b/x11-themes/mate-themes/Manifest
index 2275e2bfe47b..f93da7e8c1b5 100644
--- a/x11-themes/mate-themes/Manifest
+++ b/x11-themes/mate-themes/Manifest
@@ -1,9 +1,5 @@
 DIST mate-themes-3.22.11.tar.xz 4268704 BLAKE2B 7a85bc6987b2d530d4ecdeebb7d1d9c4833a86ec01b7d734d0b88b8ef829035d4e4f9c5c2afda06a91c85f06db5c96fb6c0944539b0053f450d51ca0dee62c05 SHA512 e8f36ed93485b8229370cb9a009e2473695477574ef2d70f638ecc5757b4d387a0e59a5eadfad5a5c240460cd61f594ee56be015730cdaf62490fc66a652c234
 DIST mate-themes-3.22.18.tar.xz 6103368 BLAKE2B 35cb77fc40d364e19d4e7cf25e7a168773bd8c33e256d97b4cbea91368b38c17201480f21f74c107b5c47fa6254042bdd64e4186dc1b87e00dab89e6b26ad439 SHA512 0851dee8ddb7495b43cbb7590ca3ecd1b3fa5a474f66806cb644462a70324c8221630d1d555e84beb8fa7025c080edc9524f244e47ac42c9843cc9eccc78dd74
-DIST mate-themes-3.22.7.tar.xz 4266344 BLAKE2B 4ae92fdea650bae3bcbe9be324b5457b5df4617dcb572c25637cc94228b452c792dc99b15430ba288941dc76c7caa643970bb7336856a1ede8c5468a3cd6c157 SHA512 bf44841686461fc55238bb3d62a6bdccf41e23116b321787dae2c4995ab5c5df7c9431dc7c831473c0a78867eb10f6142554434991a7654fa59ab3f76eafdca2
-DIST mate-themes-3.22.8.tar.xz 4266436 BLAKE2B 65e6ab39455b791f58a05319367106ba424ad4797d0e376c3578e6296bf51733d782a7ee1be5811103d966f8c53735840bccc233cf62515a42eb444207bfbd43 SHA512 1ee02a93ff03a2e2c50c352e9a4b2fd3f093a8d7990fce36bc0d3af65501202a281904bee74c095eda549b1be9a50bf4a293071cf0980fced8158df97d986d0e
 EBUILD mate-themes-3.22.11.ebuild 1317 BLAKE2B cd689979f3f3141d547561a67bdc0f1cee30ae5e23ea78a27b62651197f717b60d4b0cc91795ea022cb43846e420ba11db8c0d05c3d328119c93363b5481bf5c SHA512 51275e079d7d7199441c622cf27c2555d9e5069edd6f63c45b8a3f1617c8faf7026ac429b0521b0ee8a376c930265fdd98f5c339406cdb0334a2c991fc9c72ed
 EBUILD mate-themes-3.22.18.ebuild 994 BLAKE2B a3a83dc3e03ba12b67c8e563f4caa9031dd263b0295f814da8362109c6f58bcd69cd6495bad5fe6b3a0a7c355c13250e5ca09f32a82a8494f5a45803b5ca6454 SHA512 fde30d05101d06ca2b80eb54eaca0002e821d30f0ca4cf3b6b21800239c11500f778d8ca26a057b2118756e6269292344b73c421f752927d323ab8560600b80d
-EBUILD mate-themes-3.22.7.ebuild 1310 BLAKE2B c5df46bb43cdc391d093c7473e334486eab2fc26a146bbbd52fb2f5b537dc42ac7a419ae4df22c3565b7b4e5a34f0df785f4dfe8525f8b1c2144f63071b324d2 SHA512 ed65bf13f0dcb31e42eaf7b43d090a1fada0161a40bf204b99fbfed10f29411b39cfbbb543222174a13f7aaa10ca667ac5e0048ba5c6ab445ab3f956a5ac2950
-EBUILD mate-themes-3.22.8.ebuild 1312 BLAKE2B f0e85e441ccd6c1d4cc290d245d01e20c2818d4ce74ac87e66d523ec18aee2fd61333e0a85b712c8b3bd0c356361bcaa80500a9936543963933894d4cc64b8ab SHA512 b5bdf564e0b23d91ab21a89d94b37da828b7f385a1decc0a321a1418de3867efb0da1e75a7e1d94f5f289dc87ecc409319a8a7835de9d19947aaf001b7c0efd3
 MISC metadata.xml 340 BLAKE2B 0f81542df7350281f9a6c6e9dcbfba92c1cc5c0c2ff08061bf1365d66b9fbf3ce6174d4abb0fdc424972f0eb849a3fc828f43dad005f62046aefa116613db3ae SHA512 27950f2be161bae9f2efe16f8c1be8283414a56f79ec6cc11569e6a3f32591ace7728c7805ca50a1f7262f900e90269657b151f50751c757fce843e00d20ffb1
diff --git a/x11-themes/mate-themes/mate-themes-3.22.7.ebuild b/x11-themes/mate-themes/mate-themes-3.22.7.ebuild
deleted file mode 100644
index 6d991b4395aa..000000000000
--- a/x11-themes/mate-themes/mate-themes-3.22.7.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools gnome2-utils versionator
-
-MATE_GTK_V="$(get_version_component_range 1-2)"
-MATE_GTK_NV="3.$(( ${MATE_GTK_V#3.} + 1 ))" #variable to allow negation of =$P-1*
-
-if [[ ${PV#${MATE_GTK_V}.} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mate-desktop/${PN}.git"
-	EGIT_BRANCH="gtk${MATE_GTK_V}"
-else
-	SRC_URI="http://pub.mate-desktop.org/releases/themes/${MATE_GTK_V}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-HOMEPAGE="http://mate-desktop.org"
-DESCRIPTION="A set of MATE themes, with sets for users with limited or low vision"
-LICENSE="LGPL-2.1"
-SLOT="0/${MATE_GTK_V}"
-
-COMMON_DEPEND=">=x11-libs/gdk-pixbuf-2:2
-	>=x11-libs/gtk+-2:2
-	!<x11-libs/gtk+-${MATE_GTK_V}:3
-	!>=x11-libs/gtk+-${MATE_GTK_NV}:3
-	>=x11-themes/gtk-engines-2.15.3:2
-	x11-themes/gtk-engines-murrine"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35:*
-	sys-devel/gettext:*
-	>=sys-devel/autoconf-2.53:*
-	>=x11-misc/icon-naming-utils-0.8.7:0
-	virtual/pkgconfig:*"
-
-RESTRICT="binchecks strip"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-themes/mate-themes/mate-themes-3.22.8.ebuild b/x11-themes/mate-themes/mate-themes-3.22.8.ebuild
deleted file mode 100644
index 55aed57590a7..000000000000
--- a/x11-themes/mate-themes/mate-themes-3.22.8.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools gnome2-utils versionator
-
-MATE_GTK_V="$(get_version_component_range 1-2)"
-MATE_GTK_NV="3.$(( ${MATE_GTK_V#3.} + 1 ))" #variable to allow negation of =$P-1*
-
-if [[ ${PV#${MATE_GTK_V}.} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mate-desktop/${PN}.git"
-	EGIT_BRANCH="gtk${MATE_GTK_V}"
-else
-	SRC_URI="http://pub.mate-desktop.org/releases/themes/${MATE_GTK_V}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-HOMEPAGE="http://mate-desktop.org"
-DESCRIPTION="A set of MATE themes, with sets for users with limited or low vision"
-LICENSE="LGPL-2.1"
-SLOT="0/${MATE_GTK_V}"
-
-COMMON_DEPEND=">=x11-libs/gdk-pixbuf-2:2
-	>=x11-libs/gtk+-2:2
-	!<x11-libs/gtk+-${MATE_GTK_V}:3
-	!>=x11-libs/gtk+-${MATE_GTK_NV}:3
-	>=x11-themes/gtk-engines-2.15.3:2
-	x11-themes/gtk-engines-murrine"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35:*
-	sys-devel/gettext:*
-	>=sys-devel/autoconf-2.53:*
-	>=x11-misc/icon-naming-utils-0.8.7:0
-	virtual/pkgconfig:*"
-
-RESTRICT="binchecks strip"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-themes/numix-icon-theme-circle/Manifest b/x11-themes/numix-icon-theme-circle/Manifest
index b069db6ebfdc..18e60e758609 100644
--- a/x11-themes/numix-icon-theme-circle/Manifest
+++ b/x11-themes/numix-icon-theme-circle/Manifest
@@ -1,5 +1,7 @@
 DIST numix-icon-theme-circle-18.08.29.tar.gz 2095843 BLAKE2B b39bd5eaf3c9ec4156a71d235059b28d049ddf25ec600a5f3a782e4b51149d0e7eccf37379a117ae7471a3885f7a529989f9085419864975afbb07a325bda629 SHA512 433c343730b23dd3969903f85d7ac36d40a4723f342b259e8136c1fbe35b7af8c17227541f3ccacffbeacf2873547c9327a1c5f0d522da04483719606e26293b
 DIST numix-icon-theme-circle-18.09.19.tar.gz 2196678 BLAKE2B a58ab5381f4ad1e441d188c1b7db0836b025d57c4075030c0e83a12de7917cd775be7bb8ae686afe302188232569c67d21772c119102a30d4bc717f301b3e44e SHA512 ace6c50ec9e9b08aac579ae92a44ba48494f2f22403e233c5ec00bb967c9bb6b70e785fbb061bfc9693db4de0ee90023af66c66e6984bd36d1e92be5f68afb02
+DIST numix-icon-theme-circle-18.10.03.tar.gz 2198504 BLAKE2B 632baceb5dd56cce372a79cb8a0e21cc5201d4bf32f939db10fd9dcfb5642f64ab38e180c622e832e23299580b3c4c4f23baccf6a771e09c1e7efeb4864af4e7 SHA512 0e494367cffd7e77dca282ceb7d368950eb6c2e64d8bc58ded95bfdf4b83265be5bd9c7ed8cb5377a5e8250109dbc87ba48c2fcab29e9c3e2626e93cd999eb54
 EBUILD numix-icon-theme-circle-18.08.29.ebuild 656 BLAKE2B 2b8c3adfbe332b3d7756d932436dd91bbd4bb3980e1c771a3a40e34d84089fbad6bc77302bf9ea0cb71dadc02e3e85ae13f95cc70dbd13bfc8a79109fbfe5491 SHA512 13e9ef15122930c5bef8f06a69e9536cae6a87872d0872438989dee3422882e8a3c2d769eacbe3a4de6327a6d9563308969d1ffa6a77871b45314215548aa8a6
 EBUILD numix-icon-theme-circle-18.09.19.ebuild 658 BLAKE2B bdf504c4bed139c463f9f53bf909566572fdcbd839df81d3f3a2865b5261b82de6b3f4d43d4d30b842f1f0f656d37fd1473e72940435ac29f03c0367ccbb7aa9 SHA512 03dc8c0bfe49741f67202254481b9a6527f254485bd103d5a96fd526496bc2f7d38fdf8f8a5de70f152817b3061a8302597939f7b082b8c7f758ed3128598914
+EBUILD numix-icon-theme-circle-18.10.03.ebuild 655 BLAKE2B a61d0b3b4873188d9543ef6a3b796f9774375f71545cd0efdf5112f0cf54d5db45095e6c433b285af49eef3844aeebb595cf1cfdcf9b9c709198ece1de9d52c2 SHA512 71590593d27b1a537137006f687f0b869688fad7b8c9439cd4bcc9073f67f50a66c47649478345ccd4452fc76f2ffc5628d83282b1f2483ed9181d1bd915d893
 MISC metadata.xml 341 BLAKE2B e5184c4dd30e2cb0aa7d87a8aab5cc9886b6f3ef0351bbaedefa7565231dc7933c4c37958bc5f4ede9286ae795edf16896576274882156b998b70bfd4b34d293 SHA512 a013dcf5530f09aac85d3098dc08eee4746f0a25439cdecf2824209177cf9a05759602bb5b3f5d7118ccf9e8c8e234fc7fc99d089c9f4749945b4c6b438374e9
diff --git a/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-18.10.03.ebuild b/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-18.10.03.ebuild
new file mode 100644
index 000000000000..d2b6a630f0ba
--- /dev/null
+++ b/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-18.10.03.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils
+
+DESCRIPTION="An icon theme for Linux from the Numix project"
+HOMEPAGE="https://github.com/numixproject"
+SRC_URI="https://github.com/numixproject/numix-icon-theme-circle/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="x11-themes/numix-icon-theme"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	insinto /usr/share/icons
+	doins -r Numix-Circle{,-Light}
+
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 6b25980417d7..4f9677aa880d 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index e2145797fb05..f0fba8270154 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -7,6 +7,6 @@ DIST i3-4.15.tar.bz2 1196263 BLAKE2B 36f20327202957dba30aface91af4d2c6261979e726
 EBUILD i3-4.13-r1.ebuild 1993 BLAKE2B 60d2df3b1f17b4e0fe0a547a736c64dd46ab46642f68837730498038348615e69dde8a80f035591ef1486cb6d8b07127fb4cbfd299ea6ef9795eeaf7412e3697 SHA512 d56ad669b2c30627401cce39b4a8489e3657aa9ec42a3443305a4d3453dd876ec969544ff2a862fafcb84d17c9ebe3074bbb2ba8176a30c88ea5181a0225362c
 EBUILD i3-4.14.1.ebuild 2376 BLAKE2B 00f9ca5d7c45ee211a834a50da364a72c0968a778a4846065bec847a927c52b066e2e673d96d372ecd6f10fa70fddf49631f4c806dd5009207850b572ff67f87 SHA512 03a988ac0ab63792d7712e18eb622077b29bbd280030bf435096741a65024a1f9ea6ac01cacd64e09b336c3c2e792319ae1f18b8e03938268aeb00a0381a70ab
 EBUILD i3-4.14.ebuild 2113 BLAKE2B c602bbb48b166ffa70d735f9181ec81a4174fe7df08830bff5c2cd955f668d2e34453f421dd1c8fb616497be5cc5707332f412d73397287ed55ea5468ffc755d SHA512 709efb5ca49d7e2e1aa6426c631e653b66f15e261eb1462036b4bdef61cd68a690a03a71ae787d221939808b9b15f3d7604551c1cc3227b9194efea076b1390e
-EBUILD i3-4.15.ebuild 2383 BLAKE2B cdc0275edf65a942f0b437efd9626d2fe266797aa8e7ee4a81e068347a26850450b17e78af7086ff5d2988a1b9c7495e1bebb81f096b13993db6db975c2a6e05 SHA512 3f728a008566c80c17f96800c0fbc1b2cd54ec9a7708e0ab87466275ff247f9a712ffd3ff25d5366241d2b59659b8eba8ef8a3752088d213a9ec07c148604f40
+EBUILD i3-4.15.ebuild 2378 BLAKE2B 77e8d97976727d1e744bbfa30c4622438a03beaec260c285e94f0e6e0c928a524cc812c78e49bf7cbae019404fc156b29b38fb55a7cd0ef60dd5c1da8855b787 SHA512 9ade8311053db9c8c9c5951a162aaba959ad83dca2011734fd1adf4c1ac18fab4c267b724a3381591fc4d4b9c74c84720fba243422cb503cd41ca527f4983e2d
 EBUILD i3-9999.ebuild 1812 BLAKE2B ce78f54be6f2cd1949342fa8b24fa4b162679edaa062eef113619af1aca0c976dc3d50302bd49ed80e3a8dc417816b0fdb802f71f31d16305a4a02be9962bfc7 SHA512 77bee1cddd30f86bfbea6276c44aea2112be335aa6d8720856be4aa6f8d77c84282f7c2e2fa32adba35fddfd2e1ac60cd7924f779e1b9bd4705e3a068dcb82cf
 MISC metadata.xml 470 BLAKE2B 1c4fd7b44860934e88fb5165254fe0e8ca7e647c11af9af7d959f240e51002e6a454d9b93b30da8944891a1aa6a989f7a3e2a8af44ba41de174e78745393dd79 SHA512 52eddb56541d1172b04ca3ae646d01e52fb300dd62f5dfeaf2abe9d791965813e87b24a1477743797227bf8d407051f79076d54edb599524f89f3cfc716cc47e
diff --git a/x11-wm/i3/i3-4.15.ebuild b/x11-wm/i3/i3-4.15.ebuild
index 90f223b0d2c3..350a31d97589 100644
--- a/x11-wm/i3/i3-4.15.ebuild
+++ b/x11-wm/i3/i3-4.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
@@ -13,7 +13,7 @@ SRC_URI="https://i3wm.org/downloads/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc debug test"
 
 CDEPEND="dev-libs/libev
diff --git a/x11-wm/larswm/Manifest b/x11-wm/larswm/Manifest
index 6efd7d97d3b5..58463d11b78c 100644
--- a/x11-wm/larswm/Manifest
+++ b/x11-wm/larswm/Manifest
@@ -1,4 +1,5 @@
 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
 MISC metadata.xml 605 BLAKE2B a55956469773e235d3c3bae88bcc826689fcc80aad5b1cfbf36908875253a0ce4728cd1a8692bd91c551e1cc1c2c5aa293a5339beb27799c5fa8d5fcf94438c8 SHA512 5c777d2c54e8cbe89c8644cd68697e1da2049c75a450cd6be085fba62bab7d56a8b4a28850330599684dfe9c9725977d14f8de1e52e624911d5c5c7088acb29d
diff --git a/x11-wm/larswm/larswm-7.5.3-r2.ebuild b/x11-wm/larswm/larswm-7.5.3-r2.ebuild
new file mode 100644
index 000000000000..84b61cef262f
--- /dev/null
+++ b/x11-wm/larswm/larswm-7.5.3-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Tiling window manager for X11, based on 9wm by David Hogan"
+HOMEPAGE="http://www.fnurt.net/larswm/"
+SRC_URI="http://www.fnurt.net/larswm/${P}.tar.gz"
+LICENSE="9wm"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+
+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}"
+}
+
+src_install() {
+	dobin larsclock larsmenu larsremote larswm
+	newbin sample.xsession larswm-session
+	local x
+	for x in *.man; do
+		newman ${x} ${x/man/1}
+	done
+	dodoc ChangeLog README* sample.*
+
+	insinto /etc/X11
+	newins sample.larswmrc larswmrc
+	exeinto /etc/X11/Sessions
+	newexe sample.xsession larswm
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/larswm.desktop
+}
diff --git a/x11-wm/marco/Manifest b/x11-wm/marco/Manifest
index 2e96632f65f1..0fd04e5eceea 100644
--- a/x11-wm/marco/Manifest
+++ b/x11-wm/marco/Manifest
@@ -1,10 +1,3 @@
-DIST marco-1.12.1.tar.xz 1163996 BLAKE2B ff133af6d56a7c91c0b104fdbfe82ce16492429ec24a06251d106b76b52b3cf4c560ec1c304b398ced61350d79410aceb5e004fc4cd8d9893faae6743788cf34 SHA512 d271c4627fc50643d8e1a2faec33b5327999ad16a3975d62ea3ded956bccf3d5e015ed8085d43a200a34f1ea78f17d7e4ea4afaa9111e5f2e3a2230b51752945
-DIST marco-1.14.2.tar.xz 1244076 BLAKE2B a1f88f49a2d5048ba6fec2c5c5b86ff1ed546638256782ef1e9fa27f5253e65d67055e96d8d337d4bcc41fbe614164695483e76c2f2fac6bccd1f842548ab795 SHA512 6ca782f5dbbc01f5df4be901a1a6bf5b23398716e5802118482a0bf98e35f4dc544a6070358a931ca11f2d8b71cbbfb7e8768e0535c6605433a202be348ddf84
-DIST marco-1.16.1.tar.xz 1247072 BLAKE2B 71959f5b37a2e499ae7a304de279d0b87b56618ffb135e6792dccbbdf0fe4dbff091257d6c6e856162a0c80d3c08c0aae8233e94d8526af3072479b4d06a02b5 SHA512 c5f88d71378a210e6490edab2db8bedf12eb013ce89fe232863c6538b240f38b7393474893bcead6904aad1835d1dc8794328e71235f17194ba3f0c3c426de36
 DIST marco-1.18.2.tar.xz 1255492 BLAKE2B 034ad26789f894d7fa829e48ed39d11925e304dd8f6c3c74b14972a332b63782d1a8c4cb5b81b20f4d8bc12a74d053bf587ed72e3c1dca8b4fddd567dd6551ef SHA512 f18cd8d46c2ad6e6d86e6e110fb588ea8c6c301c6ffc1ee72ce80984125be5cbdeb20bf4a7fe8d1d1a60b93c7cb32de8dbd00532462c5637b747068f96e79129
-EBUILD marco-1.12.1-r1.ebuild 1502 BLAKE2B 2c53f9c4df33cd624d2ed1abd1f290d2d0cd1912931f3947057f00a7ecd4715da7402ebde8dd640dcdef6a03edce59b5044f09755874f6f90ede2991a3ee3f5f SHA512 e1204bc07cc8485caf2c877e623edc8bfe15f6e990efd00810611c17dd6a461e42d0300ab864c4a6bec940272d0bf9153ac54ea9b2a6db1568e29219a4bf34d8
-EBUILD marco-1.12.1.ebuild 1460 BLAKE2B b2bbb460a3eba5c2ffa7e6ffb9c135d848d1c5ec0bc76e7fe440b9d9f1a3cee5e7924296a4bcb3f64197dba91ed956ca677a065825000eceff2e7938a4958947 SHA512 44cd5b5dee0a98fcb55e89db74a519bd852f3bee3a3676ff43b40b85ae98a62bcd3a7349cad9e5ba4e8d4a7627c11fa900a62b5cae3b19906552ea01106f7bb7
-EBUILD marco-1.14.2-r1.ebuild 1543 BLAKE2B 401d6c5b53ed2e44917f73b6ddaed9f606ff159f001ce62db1306a06d2dc5027d16debf3c805ba26b73052509639278bd17ae8012b101e37fd1f5431a8b1d7c8 SHA512 7fc91ad79deb72fc660455b8db00571bd17fe6974d44e4c6bf447b54ea2c2ecafef631a577ef36ab8844774026bc46d42697e6e75581193acfc18541c5a074f8
-EBUILD marco-1.16.1.ebuild 1543 BLAKE2B 401d6c5b53ed2e44917f73b6ddaed9f606ff159f001ce62db1306a06d2dc5027d16debf3c805ba26b73052509639278bd17ae8012b101e37fd1f5431a8b1d7c8 SHA512 7fc91ad79deb72fc660455b8db00571bd17fe6974d44e4c6bf447b54ea2c2ecafef631a577ef36ab8844774026bc46d42697e6e75581193acfc18541c5a074f8
 EBUILD marco-1.18.2.ebuild 1415 BLAKE2B 66a7ff62f82a0c175317f6ad8c45a9673af56f1189a73a65ab1d9300edad4cee9913d0c3393686d2c67300f47a5c6f5d869e81040a9c216f1ac03cde8f3b2c7e SHA512 8e55470bb754512e57a949b07702381969005bd7ddeb0a5a26c654a88cb748466e04f8c2a9a37a38fce7fdc7b5697c047c4f5346b1020b4e94c6a709a553a3dd
-MISC metadata.xml 410 BLAKE2B 11d9345ad1a0ebbb5b537c27a3447cfb56cdcb621bb3df330f163612415a48e542a78c563689c33e52ee81eb19a9654a2ed45f27f45604b5f6cc2e6ef04953d5 SHA512 3736e03b4952f45354445560aa2aa6118a3257fe8b00d8d39df7946f65cfee017ef04f48447807387a9a4b6f37641bc55074efa7cadd944e1243feb183ab1d84
+MISC metadata.xml 334 BLAKE2B 4a521e1c77d597f68a11cdaa695afcb40a5a2670a7fd643db0999362884a0bad7fb8106b7ba479a939930fbf0323c7f22186cf3fca5583210227a819631ead5d SHA512 f55f007780c371bc133eb3b8eed1bb4f930cab1e29c9ff0ab2dd99cd2e1458058dc86bf3fd70e9f4e9f1db259a7b8a5a247b04282ca08e88d767ee2f1878a451
diff --git a/x11-wm/marco/marco-1.12.1-r1.ebuild b/x11-wm/marco/marco-1.12.1-r1.ebuild
deleted file mode 100644
index 72471cfeadd6..000000000000
--- a/x11-wm/marco/marco-1.12.1-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
-
-MATE2_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE default window manager"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk3 startup-notification test xinerama"
-
-RDEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.32.10:2
-	>=gnome-base/libgtop-2:2=
-	gnome-extra/zenity:0
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-	x11-libs/cairo:0
-	>=x11-libs/pango-1.2:0[X]
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	>=x11-libs/libXcomposite-0.3:0
-	x11-libs/libXcursor:0
-	x11-libs/libXdamage:0
-	x11-libs/libXext:0
-	x11-libs/libXfixes:0
-	x11-libs/libXrandr:0
-	x11-libs/libXrender:0
-	>=x11-libs/startup-notification-0.7:0
-	virtual/libintl:0
-	!gtk3? (
-		media-libs/libcanberra:0[gtk]
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		media-libs/libcanberra:0[gtk3]
-		>=x11-libs/gtk+-3.0:3
-	)
-	xinerama? ( x11-libs/libXinerama:0 )
-	!!x11-wm/mate-window-manager"
-
-DEPEND="${RDEPEND}
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.34.90:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto
-	test? ( app-text/docbook-xml-dtd:4.5 )"
-
-src_configure() {
-	mate_src_configure \
-		--enable-compositor \
-		--enable-render \
-		--enable-shape \
-		--enable-sm \
-		--enable-xsync \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable startup-notification) \
-		$(use_enable xinerama)
-}
-
-src_install() {
-	mate_src_install
-	dodoc {,doc/}*.txt
-}
diff --git a/x11-wm/marco/marco-1.12.1.ebuild b/x11-wm/marco/marco-1.12.1.ebuild
deleted file mode 100644
index 81301b782686..000000000000
--- a/x11-wm/marco/marco-1.12.1.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
-
-MATE2_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="MATE default window manager"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk3 startup-notification test xinerama"
-
-RDEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.32.10:2
-	>=gnome-base/libgtop-2:2=
-	gnome-extra/zenity:0
-	x11-libs/cairo:0
-	>=x11-libs/pango-1.2:0[X]
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	>=x11-libs/libXcomposite-0.3:0
-	x11-libs/libXcursor:0
-	x11-libs/libXdamage:0
-	x11-libs/libXext:0
-	x11-libs/libXfixes:0
-	x11-libs/libXrandr:0
-	x11-libs/libXrender:0
-	>=x11-libs/startup-notification-0.7:0
-	virtual/libintl:0
-	!gtk3? (
-		media-libs/libcanberra:0[gtk]
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		media-libs/libcanberra:0[gtk3]
-		>=x11-libs/gtk+-3.0:3
-	)
-	xinerama? ( x11-libs/libXinerama:0 )
-	!!x11-wm/mate-window-manager"
-
-DEPEND="${RDEPEND}
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.34.90:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto
-	test? ( app-text/docbook-xml-dtd:4.5 )"
-
-src_configure() {
-	mate_src_configure \
-		--enable-compositor \
-		--enable-render \
-		--enable-shape \
-		--enable-sm \
-		--enable-xsync \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable startup-notification) \
-		$(use_enable xinerama)
-}
-
-src_install() {
-	mate_src_install
-	dodoc {,doc/}*.txt
-}
diff --git a/x11-wm/marco/marco-1.14.2-r1.ebuild b/x11-wm/marco/marco-1.14.2-r1.ebuild
deleted file mode 100644
index 33a7096f18cd..000000000000
--- a/x11-wm/marco/marco-1.14.2-r1.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
-
-MATE2_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE default window manager"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk3 startup-notification test xinerama"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.32.10:2
-	>=gnome-base/libgtop-2:2=
-	x11-libs/cairo:0
-	>=x11-libs/pango-1.2:0[X]
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	>=x11-libs/libXcomposite-0.3:0
-	x11-libs/libXcursor:0
-	x11-libs/libXdamage:0
-	x11-libs/libXext:0
-	x11-libs/libXfixes:0
-	x11-libs/libXrandr:0
-	x11-libs/libXrender:0
-	>=x11-libs/startup-notification-0.7:0
-	virtual/libintl:0
-	!gtk3? (
-		media-libs/libcanberra:0[gtk]
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		media-libs/libcanberra:0[gtk3]
-		>=x11-libs/gtk+-3.0:3
-	)
-	xinerama? ( x11-libs/libXinerama:0 )
-	!!x11-wm/mate-window-manager"
-
-RDEPEND="${COMMON_DEPEND}
-	gnome-extra/zenity:0
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.34.90:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto
-	test? ( app-text/docbook-xml-dtd:4.5 )"
-
-src_configure() {
-	mate_src_configure \
-		--enable-compositor \
-		--enable-render \
-		--enable-shape \
-		--enable-sm \
-		--enable-xsync \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable startup-notification) \
-		$(use_enable xinerama)
-}
-
-src_install() {
-	mate_src_install
-	dodoc {,doc/}*.txt
-}
diff --git a/x11-wm/marco/marco-1.16.1.ebuild b/x11-wm/marco/marco-1.16.1.ebuild
deleted file mode 100644
index 33a7096f18cd..000000000000
--- a/x11-wm/marco/marco-1.16.1.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
-
-MATE2_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE default window manager"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk3 startup-notification test xinerama"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.32.10:2
-	>=gnome-base/libgtop-2:2=
-	x11-libs/cairo:0
-	>=x11-libs/pango-1.2:0[X]
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	>=x11-libs/libXcomposite-0.3:0
-	x11-libs/libXcursor:0
-	x11-libs/libXdamage:0
-	x11-libs/libXext:0
-	x11-libs/libXfixes:0
-	x11-libs/libXrandr:0
-	x11-libs/libXrender:0
-	>=x11-libs/startup-notification-0.7:0
-	virtual/libintl:0
-	!gtk3? (
-		media-libs/libcanberra:0[gtk]
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		media-libs/libcanberra:0[gtk3]
-		>=x11-libs/gtk+-3.0:3
-	)
-	xinerama? ( x11-libs/libXinerama:0 )
-	!!x11-wm/mate-window-manager"
-
-RDEPEND="${COMMON_DEPEND}
-	gnome-extra/zenity:0
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.34.90:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto
-	test? ( app-text/docbook-xml-dtd:4.5 )"
-
-src_configure() {
-	mate_src_configure \
-		--enable-compositor \
-		--enable-render \
-		--enable-shape \
-		--enable-sm \
-		--enable-xsync \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable startup-notification) \
-		$(use_enable xinerama)
-}
-
-src_install() {
-	mate_src_install
-	dodoc {,doc/}*.txt
-}
diff --git a/x11-wm/marco/metadata.xml b/x11-wm/marco/metadata.xml
index e5009557a916..cfe84acaa324 100644
--- a/x11-wm/marco/metadata.xml
+++ b/x11-wm/marco/metadata.xml
@@ -5,9 +5,6 @@
 		<email>mate@gentoo.org</email>
 		<name>Gentoo MATE Desktop</name>
 	</maintainer>
-	<use>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/marco</remote-id>
 	</upstream>
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 6e7266798d83..dc69739c50b1 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -5,11 +5,12 @@ AUX 3.22.4-wayland-ensure-pending-geometry.patch 1744 BLAKE2B 7bfa1bc1b1111829af
 AUX 3.22.4-wayland-size-hints.patch 2281 BLAKE2B 022782665cfd36da1bb60ff7ee459041e10d41d59b99cf1a806bc76c207f6e168e96e0980e72b6bdf12307874343a9f27cd83961ce01ce88a331fd88671e0107 SHA512 cf2afdb822f67a729713df571db446e955b111ac5d56342ba318646a6b3302a8cac394d63166c4043b94678360d19e3d35ddf60102794c038fdfc9039729318a
 AUX 3.24.4-build-debug.patch 1159 BLAKE2B 1ceb783c5c1c8117c7b4e9809a370d2b46ebd4fa59b401a99f60c7a8c06ba88fdef6a382149fa6ae0b0d05344b24640d730d56736dfe38b645578f3b01c41528 SHA512 e0ae9b9ed1dc74b4b2a641f03589408d078ac7a2250e75fb024dd765dc755a6dcd1917d62cb271f541db5cd97ca8417433f8cfe8e40250331adc5609bbf1ffc6
 AUX 3.24.4-gudev-232.patch 1034 BLAKE2B 8f6bfbaa50dca872c6ad21eaef5b23af8d75749140f16f595deaec1aa47021650da569e2f46b0fc4c446cf86f735c3b3a5a04df72737d175a51eacb52c0b7891 SHA512 a73aabd388c73a6a4ab91f69cdd647e5e2b1295f67c1576725f7cbaa8dc24afeb77a7f4e3880f6b2e8fc604aeefb4b44f30cc80f3f2f88b0d0c03b49dd6bbfe2
+AUX 3.26.2-non-wayland-build.patch 1035 BLAKE2B 7c9beb268c2f1b5784bbb2b44d8199f9821462c0be7678b69c9feb05171f46a2ccf96c18e8ed45b32c7ce576a7693839d03a90b4beb787f5291e7853b28b514c SHA512 88bda28953ba08bb6cf7847de49356d7896d554169d0039b599963eb333a0c688b49dc9d55c8b8e497b15d54ad3bed495bf18ded00d09d6510bb399d20750ca0
 DIST mutter-3.22.4.tar.xz 3536792 BLAKE2B e395dec6a8f5f46864ab5d7da3c345c20adf65f7609547d296036b0cb4be79e451387395f32d3d9a736a5b8c4be5a03a9fa56d5fbebeedaef3c35ea6e5c16302 SHA512 849e98186cecb4ffcab3da055febf72ef76fa87ecbdc506c696c2c7debd5183361c4b3b31d00d3c85e45d7f47aa5abf748d999571b147c831eb999116919023c
 DIST mutter-3.24.4.tar.xz 3583916 BLAKE2B 86a9e16ed96270713e400ccb4dc64b91c263125ea4a04373ed1f8364e906031ef26dc991fa13d01cf0e50895360c87be6773e3332d823c2ce1991cd57d59b292 SHA512 7ae579ab3e9df09cae37fbc1b277e382c9f610058b914b69a7bdb89f3bec510403210c0cded16a6487111507151f4d7075d161e051c0b88585d6ab6b4575b8d3
 DIST mutter-3.26.2-patchset.tar.xz 48156 BLAKE2B 7b33495a8bb7ac69f5610e1dfcb1fef49a983403fd176b229a75bcc7691e83e76a3dd87b7663ece0fcdc4077becd3ffa5e33217584f156456813769646730bf9 SHA512 2eeb9dfe137d6ea65f957ed19aa5ef83106aa16a049531c0c41d3ab6afac6c1b345cc68f2a9a9c41658172cc0dde61b946e6bf2507979ff4155e79770adf5e90
 DIST mutter-3.26.2.tar.xz 3622904 BLAKE2B b32af24c6ffcd0e6af38ab1ff7cd0ba16ea3ceb84c62ed21d9e38fff5357eda2648050beada3fc8727474407a419a2c218331c8a87f7eb68eddf824d26ca9c51 SHA512 95885b4c053d4bc467a7c11615ee3d1a3086a674ae10e7cb9bb241f692e66dd8190508db1cdf1760bc2f19100e532e68d5e147d344e94d1430d80dd26ca0156b
-EBUILD mutter-3.22.4-r1.ebuild 4074 BLAKE2B f8d93705b79bbdc066d5e2637318c988288d57c538ae7ab11ab715cf629568b4b78c953f4bb0116a3cd36aa4a6aac8e05680994277308d6c3a4eda5b5ed744c0 SHA512 fd0cae9ccceb3eeb158cc331b077c7ac664266509f6d6669bdac16b8651a5f8c769488109ac9701e32cdfad7ed2bfd11f2fe49bac8a6d4d81086fae46acda047
-EBUILD mutter-3.24.4.ebuild 3672 BLAKE2B f07f0b1874371e26460ec17112af090f6bfe93537a7a56063ec0b00ee5cae91ba9d65e0c6cd06245fc7db06bf071a437dd8dc123a4b04934c99e658e04e2f874 SHA512 f74446183f52159acb10684bd027001cceb671ca6110b3898e3f16590a6deca65e70ec619f90b0c9a91c3dd0084c795df5b1358145005ad6f0df87817c914b8f
-EBUILD mutter-3.26.2-r1.ebuild 3949 BLAKE2B c064f5a7f5f663dfd87e9d800a31805293ef370c9a8a443bb4a73c3f0f344dba10569afb2433891ae57bf60782356a3cbdc757c7858e4dc2ee2b511aa7cba247 SHA512 78d27692678f4c0583363e391bf79c5480fedb9da39f63755ff65398f30abbce176ec6cb95ae656e8782ab13821edbad00d5bc938d0feac895017977b53875b9
+EBUILD mutter-3.22.4-r1.ebuild 4092 BLAKE2B a0ccf9508af2cf98cc54a48d39f1eb35ff07bc0b8f5da7f10348ee51974a66993a964c72aeda9288d8aa30263338a6cf54e2771eec60fd86e5dcf66f9179e578 SHA512 4e77a16dce245c654a3dba1abcabeb3115fa60a09c3748261f3bda1443a183f8611b9d3d52b22e73dc53c2607dcf1f9b7921d8a9e71acf470b05d6132377f20a
+EBUILD mutter-3.24.4.ebuild 3690 BLAKE2B 318c35b0902a8c6805231ac9878b364a7b266a0a2f7c9751c3e44680e29fbbaf19945db05adc8f14a5325581fe1d0b1151580d31506b7951c7fc037fcd0ebb8e SHA512 26e2dde5942f74e15aad3ceba56987228e21c7229829aee2dd35d1fad1e8b7795a9ec80ff965a5ea44822cb27c844e73eb8459cf82e0bf4b8d628eda3ca56c85
+EBUILD mutter-3.26.2-r1.ebuild 4034 BLAKE2B 6eac303303c5d14baaf6f35eb93d2a38083b5bbe49520af2bc36fcdbb05a1bfcf5ac85d7fb9ff869abebeaa678cd8758950a4c01435867bcfedd8e9425c82be5 SHA512 555e9d5cf89f37dcf3e1033bbf636a2d1a447b3212d848054989a4dc878caf94532122a73d7648bbac97ce13dc70e75b385032e10078e17af2c4c295358018ac
 MISC metadata.xml 325 BLAKE2B 3ee20e50b2bbbab4ac5083cf64dd2817b397a0e8a77895f5aa7197f016af1e958d6debe92e6e69c10319b1d468f80f16831aa57a0dda1f57173732056b5856c4 SHA512 2732e366e7870b21a854e6bccf57d479c754fe5a9cf17673c3a78e231a1b476b684fd97497f8ab51c57137d066f9bfa6590458f56e5f42c5c38e1cd00962fe80
diff --git a/x11-wm/mutter/files/3.26.2-non-wayland-build.patch b/x11-wm/mutter/files/3.26.2-non-wayland-build.patch
new file mode 100644
index 000000000000..a2a8d356e07e
--- /dev/null
+++ b/x11-wm/mutter/files/3.26.2-non-wayland-build.patch
@@ -0,0 +1,33 @@
+From 6cc48d8cbbf11fa82ec78cac0b29d52f05eabb60 Mon Sep 17 00:00:00 2001
+From: Ting-Wei Lan <lantw@src.gnome.org>
+Date: Sun, 24 Dec 2017 17:55:14 +0800
+Subject: [PATCH] build: Fix non-wayland builds
+
+meta_dnd_wayland_handle_end_modal is not available on non-wayland build.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=791916
+---
+ src/compositor/compositor.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c
+index 51d22bc17..aa49347c9 100644
+--- a/src/compositor/compositor.c
++++ b/src/compositor/compositor.c
+@@ -419,11 +419,13 @@ meta_end_modal_for_plugin (MetaCompositor *compositor,
+   meta_backend_ungrab_device (backend, META_VIRTUAL_CORE_POINTER_ID, timestamp);
+   meta_backend_ungrab_device (backend, META_VIRTUAL_CORE_KEYBOARD_ID, timestamp);
+ 
++#ifdef HAVE_WAYLAND
+   if (meta_is_wayland_compositor ())
+     {
+       meta_dnd_wayland_handle_end_modal (compositor);
+       meta_display_sync_wayland_input_focus (display);
+     }
++#endif
+ }
+ 
+ static void
+-- 
+2.18.0
+
diff --git a/x11-wm/mutter/mutter-3.22.4-r1.ebuild b/x11-wm/mutter/mutter-3.22.4-r1.ebuild
index 8868471403f7..01419c52e5c7 100644
--- a/x11-wm/mutter/mutter-3.22.4-r1.ebuild
+++ b/x11-wm/mutter/mutter-3.22.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=6
@@ -68,6 +68,7 @@ COMMON_DEPEND="
 	)
 "
 DEPEND="${COMMON_DEPEND}
+	dev-util/glib-utils
 	>=sys-devel/gettext-0.19.6
 	virtual/pkgconfig
 	x11-base/xorg-proto
diff --git a/x11-wm/mutter/mutter-3.24.4.ebuild b/x11-wm/mutter/mutter-3.24.4.ebuild
index 7307af626908..8a196f8d6038 100644
--- a/x11-wm/mutter/mutter-3.24.4.ebuild
+++ b/x11-wm/mutter/mutter-3.24.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
@@ -68,6 +68,7 @@ COMMON_DEPEND="
 	)
 "
 DEPEND="${COMMON_DEPEND}
+	dev-util/glib-utils
 	>=sys-devel/gettext-0.19.6
 	virtual/pkgconfig
 	x11-base/xorg-proto
diff --git a/x11-wm/mutter/mutter-3.26.2-r1.ebuild b/x11-wm/mutter/mutter-3.26.2-r1.ebuild
index 71a77b248294..209182f780be 100644
--- a/x11-wm/mutter/mutter-3.26.2-r1.ebuild
+++ b/x11-wm/mutter/mutter-3.26.2-r1.ebuild
@@ -81,6 +81,9 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	# Lots of patches from gnome-3-26 branch on top of 3.26.2
 	"${WORKDIR}"/patches/
+
+	# Fix non-wayland builds, bug #667244
+	"${FILESDIR}"/${PV}-non-wayland-build.patch
 )
 
 src_prepare() {
diff --git a/x11-wm/treewm/Manifest b/x11-wm/treewm/Manifest
index a93cd220759a..4ee581955458 100644
--- a/x11-wm/treewm/Manifest
+++ b/x11-wm/treewm/Manifest
@@ -1,5 +1,6 @@
-AUX treewm-0.4.5-gcc43.patch 614 BLAKE2B 033c54a54ec06e81ac80890501f4d1f9d27633cd1b489566e6f32bdbab59286175eebe6f6a063aa7cae47f5acc7a74212744bded7bef5f2be5e25b8b27dbe026 SHA512 2e2e965c8592083e411da78eb3abdf2112e0b37b5759dd98ea62ad8c19859a59b72de1d0b9630962d8651921f220ad8e670e9e963a062dd3435a9e7d9e517e94
+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
 MISC metadata.xml 436 BLAKE2B 666d6583ce2dc47607e4e99557a889d765cd2436131ccba2496e4ea00e9d288e943e4b8aeed2bf4645671baa6911b5063c41fc65511bd854c0dd008b9ba65ba3 SHA512 cde7c7c0dadb71cb58c15a2fa7efb031fda246d1464bebb476c4a02c64baf1f90a03198b82e1188ac83b36eb4778e21595335bce5af14beb1cf20de4b978b7e8
diff --git a/x11-wm/treewm/files/treewm-0.4.5-gcc43.patch b/x11-wm/treewm/files/treewm-0.4.5-gcc43.patch
index a8faf4319871..687bf809e3c7 100644
--- a/x11-wm/treewm/files/treewm-0.4.5-gcc43.patch
+++ b/x11-wm/treewm/files/treewm-0.4.5-gcc43.patch
@@ -1,5 +1,5 @@
---- treewm-0.4.5b/src/action.cc	2009-01-17 18:17:32.000000000 -0400
-+++ treewm-0.4.5/src/action.cc	2009-01-17 18:20:41.000000000 -0400
+--- a/src/action.cc	2009-01-17 18:17:32.000000000 -0400
++++ b/src/action.cc	2009-01-17 18:20:41.000000000 -0400
 @@ -9,6 +9,7 @@
  #include "clienttree.h"
  #include "clientinfo.h"
@@ -8,8 +8,8 @@
  
  Action::Action(Section *section) {
    s = section;
---- treewm-0.4.5b/src/resmanager.h	2009-01-17 18:17:32.000000000 -0400
-+++ treewm-0.4.5/src/resmanager.h	2009-01-17 18:21:10.000000000 -0400
+--- a/src/resmanager.h	2009-01-17 18:17:32.000000000 -0400
++++ b/src/resmanager.h	2009-01-17 18:21:10.000000000 -0400
 @@ -12,6 +12,7 @@
  #include "global.h"
  #include "client.h"
diff --git a/x11-wm/treewm/treewm-0.4.5-r2.ebuild b/x11-wm/treewm/treewm-0.4.5-r2.ebuild
new file mode 100644
index 000000000000..751b8b2fe249
--- /dev/null
+++ b/x11-wm/treewm/treewm-0.4.5-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="WindowManager that arranges the windows in a tree (not in a list)"
+HOMEPAGE="http://treewm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/treewm/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~ppc ~sparc ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXxf86vm
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-misc/imake"
+
+src_prepare() {
+	default
+	# bug 251845
+	eapply "${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}"
+}
+
+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/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index ba8e4703dc42..9c3b9b452b10 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/garcon/Manifest b/xfce-base/garcon/Manifest
index 88a78e625453..0ab4470e6e92 100644
--- a/xfce-base/garcon/Manifest
+++ b/xfce-base/garcon/Manifest
@@ -1,5 +1,5 @@
 DIST garcon-0.5.0.tar.bz2 456940 BLAKE2B 1e2eb7351fc63c3dcaef358174f38e6da308141923474ad215309304644db85112d7f1edfd258bca5bca3c596f8e98c5d38cc830bcc11e91d5fc71e4c1c956d4 SHA512 9e360e71ae12dbfb5e948fd86c2ec3d6993e6ec68379adb588492386a4fe492480c365bd33f811c5cc7c8bf80044eff8bd942690b4dd4e0a9d4fc0c58dd29cf5
 DIST garcon-0.6.1.tar.bz2 511415 BLAKE2B 03c9076d8507737ed64b48597ff53c4cb3ae9beafd14b28d4d61fc29fa007f5ac4757f96ba0dc56c8b069a4eebd5d38202862856f96a1b08474de2aa93d518ca SHA512 36c5b1ba3c91e613853cd5e986176c8cbd2a509fafde1b302334deda872b7f7073fd06ba341220b030d8d5728346b7339368190b225203f33c023dd96f3ed1a3
 EBUILD garcon-0.5.0-r2.ebuild 894 BLAKE2B 596f95f6cb42333a7345352f39d2a2c1ffdad669d9a36ebf23ac1f053f43790101c5b1908208ac70ef6e32e34984731bd421e22befe12f61bad3540559a3c7de SHA512 ab5e6a3f8f7eb0af2a0ce525b66b954fe063a3d21f0ffbd67c894fca045f9cfc529f9614e4db2ac755aa29578fc1aad74f4e509713b6507e0e384cce56fa2b7f
-EBUILD garcon-0.6.1.ebuild 1022 BLAKE2B 8461ab1ab40cba155a5471fa97bee5fb5536a3cc401072ae444a145392b58b6902c9f1e39165c144d67cad7aae27e1ec58663c7ed0a400e4c677f86040e99a67 SHA512 62f4ddfbd37f8b1ddd01ba977dad268071a639191c3b9116c34a82c71a10c5c5faabc98084d0ccf79ddd7675a8b0e0312910aaa05236ff9ae7a399bc6e520ccc
+EBUILD garcon-0.6.1.ebuild 1045 BLAKE2B fa3a310133435fa9bb0536e2d69173d6b10c49b992c3a58115812e1c96d720550c55589ada3a91e026d0b81b42cbacaa0a7d6c33e1c3a5099102e16a421f83c2 SHA512 90611bac1fda29c045e05ac9112da1d2753ba135077f7a5f49a87a80445ef854cc452ebceb0c89188167adfd514ea9e9554de35f8c8749455a1b4e82f73eba93
 MISC metadata.xml 395 BLAKE2B 13ea597065b0ffcb8a57e82f980dfa9b271a16f0c6ba824cb66f551d7bd6c49946985d1391a28360c4160bca5b88cc796b578b23f0b321d1670ab9f1c0addf23 SHA512 8783901107619bafc30acd3962284cf56376a14cd61039f862e1a7f0b5e17fc9d51f0e278c85161fb8b42c53b132a1ae7abe00c7e933eccf2ce3b74fa9956d54
diff --git a/xfce-base/garcon/garcon-0.6.1.ebuild b/xfce-base/garcon/garcon-0.6.1.ebuild
index f2bd18b89cf8..e06db1aff671 100644
--- a/xfce-base/garcon/garcon-0.6.1.ebuild
+++ b/xfce-base/garcon/garcon-0.6.1.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="Xfce's freedesktop.org specification compatible menu implementation
 HOMEPAGE="https://docs.xfce.org/xfce/exo/start"
 SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
-LICENSE="LGPL-2 FDL-1.1"
+LICENSE="LGPL-2+ FDL-1.1+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+gtk2"
@@ -18,6 +18,7 @@ RDEPEND=">=dev-libs/glib-2.30:=
 	>=xfce-base/libxfce4ui-4.11.1:=[gtk3(+)]
 	>=xfce-base/libxfce4util-4.11:="
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	dev-util/gtk-doc-am
 	dev-util/intltool
 	sys-devel/gettext
diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
index baff676dde6d..41e2da1a96ae 100644
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -2,8 +2,10 @@ DIST Thunar-1.6.14.tar.bz2 1964822 BLAKE2B f080f3d0634b4b4a8e11cdb902d5f300b1829
 DIST Thunar-1.6.15.tar.bz2 1964447 BLAKE2B 07dd4241f5aad975ae8f3c4cffb1b40338fd31f5434fb436a2772a9671673b4b124ac4363dd7c1267b0b51d42550735bbb733ada16f77a5b89176a353c84edbc SHA512 836d2d10347915b2e03be5501806e358af1c60786284c5e5afa11a6a79bc6a790966ea43bd9add6783fab91b08f06ae7852c21152f3aa0f29814325a16d65a7f
 DIST Thunar-1.7.2.tar.bz2 2236176 BLAKE2B e7ebcd8b74295539edfeed710cc25204691af3eaa1c84dcd9b56399f5af2220aabc9ce2736f03c7c1bfe9a61600c6acc4f659ba8d56e575f0e4679a644f1c459 SHA512 b98b72558c9a8872f89632820be816f2c2e7f7e07750cc62eace741794cde4aa4daf2f4ed7fd52a5b1e3c4e9965925a038a948124d32ed6d392db65b8780ccdb
 DIST Thunar-1.8.1.tar.bz2 2289891 BLAKE2B 79ccb1408bcacba7ed50536f0a8e622d2e251fedf4b0ffef425f1e0926dbaa93ccef0fa751c8362cb420eef013f9f442de3fe58d411558dd7b9cb5751d2e89f4 SHA512 89aa29af5e272d58c7de02ba1c96d7f0c32eed49cda9621ef863dd679712cc653f58e729e49b9dc3d1626c9b8ebe2b18a2307e00c7ea1d1d2b42fa71272aced7
+DIST Thunar-1.8.2.tar.bz2 2274521 BLAKE2B b5460a4bc5dd6547b8d620fd60a506899b4cfe6fdbadc46c9e7d259bed90ae5f98de2fa337762f8cbe5c7bdcb020ce3afd3d942763f0ea5aa84d1d9ceb47154f SHA512 c770fae8b6e5e0e42148ed2b9777afba5159783e5fc716eba1e0499b5390684f386eb575f1a608814bc118bbf05ede34c6737e28c06470c4d01717b579308ec9
 EBUILD thunar-1.6.14.ebuild 1970 BLAKE2B 83e3ce6a0c069817781c5f62d32cfe60c255aadce6686821e1bc42190089a57a05b86bb2d0aeac07a6877b97ae9aceaa2690628aa2bc620c810bde3289b5903d SHA512 5bdf24285de7371faf55ffae6a820c40af03a77aa5e4abdf2c1c359efb7bc8440ccec58075a70aade6689d1f2e63f7deb285635665882f93df4e347ae624f2b0
 EBUILD thunar-1.6.15.ebuild 1977 BLAKE2B 9776c8cf558e86c8945d2c6b7d3545a27fc3823703954370ed8eb3a6790ccdac2b1c5ef11ddb497b6ca166b602e0998a74b239be6a897b18ab094f39ebc29579 SHA512 db1fa4fbd51b6e6305026a669711b2e2854e0e077623a10fcf323f3746d64c87491146528714acfd9ab4a537100cb395ec6183227fe8fa92e091f06f07006397
 EBUILD thunar-1.7.2.ebuild 2004 BLAKE2B 8452b4a373125cf16c212c74af3b35a6d491d0f91a43e6120aa4aad685b2f702e69f74b9cd15d3c3de2e17e1b5aed90957ac5edff1ae8c2d805ffa4d455ad0b6 SHA512 0d18b2f25503c899e1ae9067350265e1a9e2f67a023b7855edacf821d81161e02589bdaa97f7169930218c159a5011ae42752321a82fadbe5753f10e7ecfcf35
 EBUILD thunar-1.8.1.ebuild 2006 BLAKE2B 0b842d7d0bafeee107a849dfbc826dff698dcf9ca04f4f64f9b7fe6303ef16519f18be79c772288cdda44b14e288a2693fe842b3c392c873ac43e0e770563a90 SHA512 1f0e98c6e308f5fd982609e100f1383283f92a9f27dec8d3445ff9efbd1f269380b359f62e2662eccc7a658a4add1839c4e3f94abcf36d1b0c4f73e969fa3367
+EBUILD thunar-1.8.2.ebuild 2006 BLAKE2B 0b842d7d0bafeee107a849dfbc826dff698dcf9ca04f4f64f9b7fe6303ef16519f18be79c772288cdda44b14e288a2693fe842b3c392c873ac43e0e770563a90 SHA512 1f0e98c6e308f5fd982609e100f1383283f92a9f27dec8d3445ff9efbd1f269380b359f62e2662eccc7a658a4add1839c4e3f94abcf36d1b0c4f73e969fa3367
 MISC metadata.xml 372 BLAKE2B e681d80da66f68cf89aea0e932d2a2c3008e388abcc40f20ffe31e859dd677fdd002c37af8c71912e1836bb6d008fe2b6f838453dc5c1e944fc66e9216b3708e SHA512 3ecb379e314ff3f9c745b61707c6df0a912b1466bd56abeebdba0ee138e14ee331fcd61acb3c5b64ace4daa42cbaaec8331cc83d6ae5d0bdc1fa5a69a258ef17
diff --git a/xfce-base/thunar/thunar-1.8.2.ebuild b/xfce-base/thunar/thunar-1.8.2.ebuild
new file mode 100644
index 000000000000..dc5dc32391c8
--- /dev/null
+++ b/xfce-base/thunar/thunar-1.8.2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2-utils virtualx xdg-utils
+
+MY_P=${P^}
+
+DESCRIPTION="File manager for the Xfce desktop environment"
+HOMEPAGE="https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="exif introspection libnotify pcre test +trash-panel-plugin udisks"
+
+GVFS_DEPEND=">=gnome-base/gvfs-1.18.3"
+COMMON_DEPEND=">=dev-lang/perl-5.6
+	>=dev-libs/glib-2.30:=
+	>=x11-libs/gdk-pixbuf-2.14:=
+	>=x11-libs/gtk+-3.22:3=
+	>=xfce-base/exo-0.12:=
+	>=xfce-base/libxfce4ui-4.12:=
+	>=xfce-base/libxfce4util-4.12:=
+	>=xfce-base/xfconf-4.12:=
+	exif? ( >=media-libs/libexif-0.6.19:= )
+	introspection? ( dev-libs/gobject-introspection:= )
+	libnotify? ( >=x11-libs/libnotify-0.7:= )
+	pcre? ( >=dev-libs/libpcre-6:= )
+	trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= )
+	udisks? ( virtual/libgudev:= )"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-util/desktop-file-utils-0.20-r1
+	x11-misc/shared-mime-info
+	trash-panel-plugin? ( ${GVFS_DEPEND} )
+	udisks? (
+		virtual/udev
+		${GVFS_DEPEND}[udisks,udev]
+		)"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( AUTHORS ChangeLog FAQ HACKING NEWS README THANKS TODO )
+
+src_configure() {
+	local myconf=(
+		$(use_enable introspection)
+		$(use_enable udisks gudev)
+		$(use_enable libnotify notifications)
+		$(use_enable exif)
+		$(use_enable pcre)
+		$(use_enable trash-panel-plugin tpa-plugin)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index 69c7f56965a8..b49eab0210b4 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -1,11 +1,12 @@
 AUX xfce4-session-4.10.1-alock_support_to_xflock4.patch 371 BLAKE2B 7737f95e5ce5ad9d421b8d39e577899b145d12ce4faebc135eaa052a6637508dfd4d5a8d9c6bcbe987026cedbedb5a396b294edadfc7241a607c7b0ef9a218b8 SHA512 85914b96def54a504f5dbaecc57f47f3529be0bd2efc8dae8529c56bd764ff9a644e17e14599b947aef4a7311a32a3e0b2ef5aa6dea45287cdc09b01bfcfcc48
 AUX xfce4-session-4.12.1-light-locker_support_to_xflock4.patch 569 BLAKE2B f05f03f7ee891fe286d4cb2781393d1a836e89c5ab6b2f7e0bfdba3582549d054cc6beaefb805d83d12ff1fafc8581ce12d2e284314ac14ef6b3fd9cd1c724f1 SHA512 da3b4fcc3cd059db267807fc46db6b484a2cf9d27e457850adc71e465300eb3d776ae8f10c204f0d419dbfbb135fce60ee5a89a75aad8d3644c7ba749f0a2c83
 AUX xfce4-session-4.13.0-add-edit-autostart-segv.patch 2511 BLAKE2B 028e1b05cd830f6eec9e2668414e94e792569811eccc9bf9ccbec300d80fcab300e8039538e11fb371ca2c5cc7c8c3816267751aa32d1d843d5b0850a4dbea99 SHA512 96e4ee3fe66c02775efc2d3222e9c668c9f422a303e0bc5837e2fb1dba5e07d4fda2c420c37e35da73731597b922f995c1e30dd40dfcd903081d566fc5a569ea
+AUX xfce4-session-4.13.1-kill-dbus-includes.patch 1279 BLAKE2B 3c446b5dcadc9f68dcfd9b2fd9d8ebd1b94e54fc6f3815ff7ee5d01f9be9fbefd1b2b269344bcff148a4c5199bb3dc58d4e1253450c541f4f996e6d4c55ad64d SHA512 8d5265737db4ade8fe59b7b051b741ca5b1a90a7d2abcdf5a48e658c04b3fc25f304555116009e58125662b243cf3dae1822c7ab387c7fe6ac6e0fb661b2d6b3
 DIST xfce4-session-4.12.1.tar.bz2 1289284 BLAKE2B 00af274ac1160a413c9e2c8b308dfc84248f0078e8c294528614bb642988468f9dadaae906b4a8e2179d2beef0a48ebf5e2eedcb2ed3ad7ea73a8f7a9b90e224 SHA512 d7f37dbff59acb316965ab2224674ac3b5b7cfd7262acd4426b582001cee313945acb8883be21553dd6d7a046934bbbe116f451e6d5fd35b6fa5444da94605df
 DIST xfce4-session-4.13.0.tar.bz2 1314715 BLAKE2B 7ab5bf645feaf9862e9cc4f36f26cfd614e7c66aa32cdb41ded8b0067e3aa23a6897beb6c362685f84c5b2a0f3d91462ab3dc7fed5a15875eff49107719c6c1c SHA512 61f9a547b03eb109a1a0fc83feaac743ea2119360f2f7208e589feb3e8f1db016ffe85cf1c8e20633ec399f263dcbccd35c431bde6f6f1482658688096da5cb0
 DIST xfce4-session-4.13.1.tar.bz2 1322823 BLAKE2B e50cc2628a068bed39d2aa6344eab7676e6464c84e3cf11d79518f78db54ea01316bd098a541b6f0897f3decbed2eb37e55009d4bf89d460e136d7a44d31c26a SHA512 5845e3591919e23ca176199e81075a097ef9d65cbcf23b34d84afc649a307bfa8c6492e3a01855cacff9328da809725213ec1fa9d76024c0a0c25cce3c51da1b
 EBUILD xfce4-session-4.12.1-r1.ebuild 1918 BLAKE2B f031e4d584bb86a02542543db6289d235e355f54bdafbb4b14b43198d683449be3ef1fa09a8425af8c5642dba7c7b0a91cb401d8a4d84a9fe95303cc3ee42c8e SHA512 5248448b59df99255762ee61dda50b487cbfae77d01c5bc41ea7e04e2211df99190f4f544d77d38c0db86e25ca7a5c7582d1915053b8da33d70c9e0a2f2a242f
 EBUILD xfce4-session-4.12.1-r2.ebuild 1893 BLAKE2B 767bec90fd2e60d63c6d83c35104178505bdca2c4e79b342271cf73f6c299c32fbd3ad8d32ed61952a38757eed97f58e7916a197f6a21a4551ee69b459d726d0 SHA512 0e8a76a1d685b980aaaf7d837926dd22d6e8281f764744c5e9cb85fb06128876e8adf74bd127bf612a6dbd939c02e6e99240981d56cd80769b31ce84d6f84160
 EBUILD xfce4-session-4.13.0-r1.ebuild 1820 BLAKE2B cf9018c5a77b4faf3d5b05725080d248d1d5f731fe3f469927511283ba0e0d345468f1e2296ee0d7b85eeb4f3465bec856cd0fda57abcf980c5706759d769b73 SHA512 de30ec68465bc12f9be4b6b54f44511d42c136e446a79e49fbea0eb7b8bb7fd0d75477d6aa5607d15cbfa397c68c24bb5fd40f953babe096aa94e147176dcad2
-EBUILD xfce4-session-4.13.1.ebuild 1776 BLAKE2B 954e327842b856fc5953a0cb0bf5715556b5cb0f7c758aabb58c0801879e989c153c1676a4cb2b8cc7403e681c340c9b126574f4f0dd885967e66adbab6475ca SHA512 2b73dab2044f0c9f3dbe3819bc4ec9a016e7c94edea87fb77cd6a654c62e4cfb2bd827af490bc356d54f1debf2977b02fd807d8de30a861e1b3edf2f96975b56
+EBUILD xfce4-session-4.13.1.ebuild 1912 BLAKE2B de6a89c260be73b8e01a98ab8737d8a53bbca0442c1d22d23d947fe914ec24f2635b6d1ce765fd6e8f8636f4de96e31707235fe0b285bc2fcc9efa39d686ba44 SHA512 5cf4fb7960a5ae8bcbf929d9e9a2599fa96d6441e240762929cc5e6392ebd2aae67aadc5d3a3777e74a6c312e5a8f1c44dd2e4d42728af072986a06a0239bb93
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfce4-session/files/xfce4-session-4.13.1-kill-dbus-includes.patch b/xfce-base/xfce4-session/files/xfce4-session-4.13.1-kill-dbus-includes.patch
new file mode 100644
index 000000000000..cc5bb9d653ee
--- /dev/null
+++ b/xfce-base/xfce4-session/files/xfce4-session-4.13.1-kill-dbus-includes.patch
@@ -0,0 +1,43 @@
+From 3bddf152b902d8a1e0f674b792577b2cca635c4b Mon Sep 17 00:00:00 2001
+From: Brandon Bergren <xfce@bdragon.rtk0.net>
+Date: Sun, 26 Aug 2018 10:28:05 -0400
+Subject: [PATCH] fix build failure when dbus is not in the system include path
+ (Bug #14386)
+
+The d-bus direct depenencies were taken out in 91860af3a38080,
+but the #include <dbus/dbus.h> in xfce4-session/xfsm-global.h
+and the #include <dbus/dbus-glib.h> line in xfsm-error.c got left
+in accidentally.
+---
+ xfce4-session/xfsm-error.c  | 2 --
+ xfce4-session/xfsm-global.h | 1 -
+ 2 files changed, 3 deletions(-)
+
+diff --git a/xfce4-session/xfsm-error.c b/xfce4-session/xfsm-error.c
+index 2b7f6c04..f0766f5f 100644
+--- a/xfce4-session/xfsm-error.c
++++ b/xfce4-session/xfsm-error.c
+@@ -20,8 +20,6 @@
+ #include <config.h>
+ #endif
+ 
+-#include <dbus/dbus-glib.h>
+-
+ #include <xfce4-session/xfsm-error.h>
+ 
+ #define XFSM_DBUS_NAME "org.xfce.SessionManager"
+diff --git a/xfce4-session/xfsm-global.h b/xfce4-session/xfsm-global.h
+index d4587123..610d5bf7 100644
+--- a/xfce4-session/xfsm-global.h
++++ b/xfce4-session/xfsm-global.h
+@@ -27,7 +27,6 @@
+ #include <X11/SM/SMlib.h>
+ 
+ #include <xfce4-session/xfsm-splash-screen.h>
+-#include <dbus/dbus.h>
+ 
+ typedef struct _FailsafeClient FailsafeClient;
+ struct _FailsafeClient
+-- 
+2.19.0
+
diff --git a/xfce-base/xfce4-session/xfce4-session-4.13.1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.13.1.ebuild
index 7819b1d88835..d0df74cf881d 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.13.1.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.13.1.ebuild
@@ -44,6 +44,10 @@ PATCHES=(
 # TODO: this patch needs updating for the new version, and finding
 # upstream bug.
 #	"${FILESDIR}"/${PN}-4.12.1-light-locker_support_to_xflock4.patch
+
+	# fix building with no dbus dependency
+	# https://bugs.gentoo.org/667440
+	"${FILESDIR}"/xfce4-session-4.13.1-kill-dbus-includes.patch
 )
 
 src_configure() {
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index 61d0ed8000c2..d9abe7a74b0a 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -1,7 +1,9 @@
 DIST xfce4-settings-4.12.3.tar.bz2 1035504 BLAKE2B db045839ea075d08acbad2bb316a4b577df959312146f8487e667c1de3fe69d129e9c80a21b97834e7f86598d776d7aaf7104f7640429a45a6d02ca3ca6c8bc4 SHA512 46bde0de70d8ebcc869ea5ba4f3eb0f123fb2e6f16e8a837c301e445044d65d90843fe3c8274a53818099112e43ff6217dfffd32bc032560331f5ca5fc5ba3ad
 DIST xfce4-settings-4.12.4.tar.bz2 1036773 BLAKE2B 512547a172081d75e7eeb97f499e77320a3df1090e80ef548dbbaf84d454b614ddb6a36bbfe4cd06d18b478ada7bd76f385dde374a93380f848ffcc232b133d3 SHA512 9b74daa3f98f15c8cb696dc79f9913fecb37f2ca44c2fd3f24865ae03e9a1db93cb5a8ddb27da3c4af7d7a9e9d718a22e46188ff515caf925a5cedfaab37b189
 DIST xfce4-settings-4.13.4.tar.bz2 1046733 BLAKE2B 8694a72e32568b963d4c754faf578ac3e651ce0be5a4b650a45393822fcb6102de4ea9ce0eb16c387605ddecd763057dcb622ef60ce546aeca2d42d3ea5561d0 SHA512 39e2adaa93e2d86ff51e47f194306e57d025c13b5c07ee76cad7f67994f26fe03677c5a3bac91d1db4a25201371f6d135f36eed110dc15a1fbb46228ee715893
+DIST xfce4-settings-4.13.5.tar.bz2 1067538 BLAKE2B e1c747582744bd2102f46fa45340d5695240f98941ebe55a83067b9c99b00946b8df9c522313418219acd11048d49b8c6617abde64eb3dce583be59c9272ade3 SHA512 5e7b13b25767091ab0b1a5683359f33e4a86151dd9321681fc4d896fcd9cc569effaebfbab70bc734e07041e9fbb1c3015f9a177146de8a128c4a539462dba5e
 EBUILD xfce4-settings-4.12.3.ebuild 1538 BLAKE2B 837b802a9ab371d5254cd614a18f5ed302fb9e5ad00292b8e32a5a6c317a8e3addfdf09f9b650644d5eac79eeb6545a6d2044e078f567c922a3bb5d69f4a3ab3 SHA512 eed0caceb050be9531554027ef3cd2c8565faab86b6c9179b18d74cf8602f0076968bedcdcb81bf3644a3e0276dcec4d79133497dca72a75b8b6a5764fef3571
 EBUILD xfce4-settings-4.12.4.ebuild 1545 BLAKE2B 73ba84e843636cb6e94a6f6dc1831b1c1437a6a77b8c740f404f9abc023579f8eab0f906cca2e9de8dd03c3929c75fe7008291e78777c02c6a6ffcbd55da2c05 SHA512 4b34b89e69a4b32a50372303b4c5d289f007f75b83233efba43ba40dfc4e079739d4d13f665b1bdc849a78d9054a7cad87c4ccac2513b6ccf9961a5a89142119
 EBUILD xfce4-settings-4.13.4.ebuild 1537 BLAKE2B 8df96eab92c84ffee72c62cec458c91ee387f9b60c090cbe111d4e95708bd2841f3ebf8a4cd2e37fd38f9d60e946660ace933f25a64a3aad50c3e0a414839593 SHA512 b47ee676ddac58d4ca54386edadfd9c247e81b3fd472f89857b441574e2ee3b1a42c5b8af214035bc73bf5c094d4515852587e999d1015475f8d5039741f6715
+EBUILD xfce4-settings-4.13.5.ebuild 1537 BLAKE2B 8df96eab92c84ffee72c62cec458c91ee387f9b60c090cbe111d4e95708bd2841f3ebf8a4cd2e37fd38f9d60e946660ace933f25a64a3aad50c3e0a414839593 SHA512 b47ee676ddac58d4ca54386edadfd9c247e81b3fd472f89857b441574e2ee3b1a42c5b8af214035bc73bf5c094d4515852587e999d1015475f8d5039741f6715
 MISC metadata.xml 479 BLAKE2B d15c203e15371edc17aabffe86e690c03c7e853e78c74e0de5753f977dbb9d080813706e3d3170dffb952591abc70f0aea6ac96ce9ca24ca7dbb627beeb8ea1f SHA512 56e89d92ba3fc3c53a86855721394993d8ac930549f19389728e0f8d60de6e92eb3475aeb0e09ca8f43412ba5e86c59482e7488dd5d0cd357968fabc6b3227b9
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.13.5.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.13.5.ebuild
new file mode 100644
index 000000000000..c72c06e61b71
--- /dev/null
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.13.5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2-utils
+
+DESCRIPTION="Configuration system for the Xfce desktop environment"
+HOMEPAGE="https://www.xfce.org/projects/"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="input_devices_libinput libcanberra libnotify upower +xklavier"
+
+RDEPEND="
+	>=dev-libs/glib-2.24
+	media-libs/fontconfig
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	>=x11-libs/libXcursor-1.1
+	>=x11-libs/libXi-1.3
+	>=x11-libs/libXrandr-1.2
+	>=xfce-base/garcon-0.2
+	>=xfce-base/exo-0.11
+	>=xfce-base/libxfce4ui-4.12
+	>=xfce-base/libxfce4util-4.12
+	>=xfce-base/xfconf-4.13
+	libcanberra? ( >=media-libs/libcanberra-0.25[sound] )
+	input_devices_libinput? ( x11-drivers/xf86-input-libinput )
+	libnotify? ( >=x11-libs/libnotify-0.7 )
+	upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
+	xklavier? ( >=x11-libs/libxklavier-5 )"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext
+	x11-base/xorg-proto"
+
+src_configure() {
+	econf \
+		$(use_enable upower upower-glib) \
+		$(use_enable input_devices_libinput xorg-libinput) \
+		$(use_enable libnotify) \
+		$(use_enable xklavier libxklavier) \
+		$(use_enable libcanberra sound-settings)
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index d15e5c52fb04..ded5a83e4570 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/Manifest b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
index d4089baa0c82..8c78d0a7f3c4 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/Manifest
+++ b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
@@ -1,13 +1,11 @@
 DIST xfce4-whiskermenu-plugin-1.7.5.tar.bz2 164129 BLAKE2B 904cc32ec73ff8984773256e1efe5cf1dc02eba0b6dd76e15ebecd5507ef4c1fff506888ed2cc3d01674a8773ef7a250da6baee26746b6d34d61b8034071e7f5 SHA512 28c0684642577af656ec95b6977f1dc88d81f690125ad42d0022ebde456dc6da02081028f8f80950f40c3e6bea0f6b8e0fefe153e2de6fa9b77d1d5555e4e89c
 DIST xfce4-whiskermenu-plugin-2.1.5.tar.bz2 166227 BLAKE2B c7e1a460692495a19a76f789ab69c3ce9bff91a4fd6507202cf4e78950b8f29ab2585b5142ecab9d009b3e08fe8161d82c51a442c055f63b7012fd73fa972136 SHA512 54e308b516ef1694f9649578cb8297f830132e456e1f498183074386956873f7f9f6ea8a0167d506086a87ae17acfbfd8a2b34eb6f0acb97f896872f8799b1f1
-DIST xfce4-whiskermenu-plugin-2.1.6.tar.bz2 166910 BLAKE2B 344bf87bca119fe52da48a62be5d762db1498ea0e248bf394e657f5aa08f48c721806d17acedd52edf34b4775b80d054d95a8d482a8c3c3c0fb1c64b72981bec SHA512 20888a8d16edfccc8da0ec958af39041c423683ed3f56f60b1d520bb54bbc4cfd58841582d24813a4eea364030d2a16fce7f7eb3beeb386ccfa2b43cb1471ef4
 DIST xfce4-whiskermenu-plugin-2.1.7.tar.bz2 167498 BLAKE2B 415466b61bb9e7c940a5234024ce04b4d505393c3732bf77b8a706e853273070bd61a3df33bbf72747e4a8ca486cd50cca1eeaac50d023710812c6c697dad475 SHA512 ae912318c0e60b5040486a3dd9b832822a66073db66afc0a7f9344bec25486c57d164ec0fdc18917ff439bcb8715a650e1a39897243b10d33413964729865704
-DIST xfce4-whiskermenu-plugin-2.2.0.tar.bz2 168577 BLAKE2B aca6aaa7cf7da6ead40ded6025a5ae67ebe360ae6ad358aaf3563044751fe97bcc231c03a9137b9635fefc57a2978430d9e842ab2285344b843dbe3c8e082111 SHA512 0fd86a2f82f196cc24022a0a5c17882bef4f554ccd0d271f86ec61ea0d2b3dd9206990e7469e874aaabb6f0931ed62da2e50d5086b850137ee759a5a54b4c41b
 DIST xfce4-whiskermenu-plugin-2.2.1.tar.bz2 145751 BLAKE2B b0addf7ffcd3bb2bf5a7498a50597ccd622d2e87b8fb4153c9d19c7388cade65d2457dec37ef07772e00b3d5bf93f23a95cdcf561960f4f60255d37611a78a57 SHA512 e5b8ab54b66397d0d956d0ddcf7ab9c7531936fa7413094d4cae99aca8f7fca4659012beceec06c9bd6f1ba7695a3e0955d1fd2f10ebf08cf5701224a5dbeb18
+DIST xfce4-whiskermenu-plugin-2.3.0.tar.bz2 156013 BLAKE2B 56b2a55160d9976e91efe7edc65f2e5df931a997b5038b8f5a9d4ae90780bdf8e92732df4891e1c8a25ceb7f0047dd4621097e34398bc2ad479f9d2a2def6547 SHA512 c4dbf7b45d6dca59b0034dbe995ada5f51a09588d2dddbcb940c8c7af0975ebad066763534ac93e65896551e1a9b10459308a4b2f38772fb28d5d7ceabec043d
 EBUILD xfce4-whiskermenu-plugin-1.7.5.ebuild 884 BLAKE2B 950d7782cc57b4699a6f15304cdb60abf43ac739f768ef9677d7458901c968dbd154869ce05abedaf8786c1995e47c93844df7bab6501258dec5aa7770dd14df SHA512 b62c8c969b92a7f805f7b92adcb4174212d3502646a686ee2ec011ac0e071b8f7d62228fc182b3526bfb4aa8b122ea24cbee1c6a7689c14df908b38b076873c8
 EBUILD xfce4-whiskermenu-plugin-2.1.5.ebuild 893 BLAKE2B ebbd32d93e569ee8fc15aa3524e883e046e288a4484165b67bab0c368ebbd03add962f2bfc37143d2f5868b3ea8b4e9190694fcd8daff4e50f5ff3570f10299f SHA512 d8ff9dadee92df1762156e618328f34207434d4a7956c16064cb004a77982ee050c59adb9aa607148993d5d1aa409fe0372eab73d39851c32cdb3c3ddf5b830b
-EBUILD xfce4-whiskermenu-plugin-2.1.6.ebuild 895 BLAKE2B 649dc9efbf317379e219c807e950e7ef36a12bb6891c3bd6f060d07b13744a2d388f6bce75ef0ecf9ed76d153d9e4522e9e1b95331db40b3d9112e167bd9a746 SHA512 8fa5d1952e60a77bff596621876778ff53430d5cf73f0308ee263b7b1363d58d7c15f58172942afb318cc5e8daf844bbe21c55acc1b42ed773f3df3044cbed46
 EBUILD xfce4-whiskermenu-plugin-2.1.7.ebuild 895 BLAKE2B 649dc9efbf317379e219c807e950e7ef36a12bb6891c3bd6f060d07b13744a2d388f6bce75ef0ecf9ed76d153d9e4522e9e1b95331db40b3d9112e167bd9a746 SHA512 8fa5d1952e60a77bff596621876778ff53430d5cf73f0308ee263b7b1363d58d7c15f58172942afb318cc5e8daf844bbe21c55acc1b42ed773f3df3044cbed46
-EBUILD xfce4-whiskermenu-plugin-2.2.0.ebuild 895 BLAKE2B 649dc9efbf317379e219c807e950e7ef36a12bb6891c3bd6f060d07b13744a2d388f6bce75ef0ecf9ed76d153d9e4522e9e1b95331db40b3d9112e167bd9a746 SHA512 8fa5d1952e60a77bff596621876778ff53430d5cf73f0308ee263b7b1363d58d7c15f58172942afb318cc5e8daf844bbe21c55acc1b42ed773f3df3044cbed46
 EBUILD xfce4-whiskermenu-plugin-2.2.1.ebuild 895 BLAKE2B 649dc9efbf317379e219c807e950e7ef36a12bb6891c3bd6f060d07b13744a2d388f6bce75ef0ecf9ed76d153d9e4522e9e1b95331db40b3d9112e167bd9a746 SHA512 8fa5d1952e60a77bff596621876778ff53430d5cf73f0308ee263b7b1363d58d7c15f58172942afb318cc5e8daf844bbe21c55acc1b42ed773f3df3044cbed46
+EBUILD xfce4-whiskermenu-plugin-2.3.0.ebuild 895 BLAKE2B 649dc9efbf317379e219c807e950e7ef36a12bb6891c3bd6f060d07b13744a2d388f6bce75ef0ecf9ed76d153d9e4522e9e1b95331db40b3d9112e167bd9a746 SHA512 8fa5d1952e60a77bff596621876778ff53430d5cf73f0308ee263b7b1363d58d7c15f58172942afb318cc5e8daf844bbe21c55acc1b42ed773f3df3044cbed46
 MISC metadata.xml 2083 BLAKE2B 4e8d91617b37e4f239098a391229bbb4e3a58906e89586b7b3b24459e419bd2a83db41ec0707e5cb1fee21f14f07d98557682566f1776a178baa436874351bec SHA512 8bb378a95fda0f395ce115761dfa52889f1a2d024cca07d0547042c0611b49949c91867d06405812b5048bd49de123bc216802d1193d7b4baf91a598bcd84313
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.2.0.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.2.0.ebuild
deleted file mode 100644
index 0a191020f9aa..000000000000
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.2.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 cmake-utils gnome2-utils
-
-DESCRIPTION="Alternate application launcher for Xfce"
-HOMEPAGE="https://gottcode.org/xfce4-whiskermenu-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="
-	virtual/libintl:=
-	x11-libs/gtk+:3=
-	>=xfce-base/exo-0.11.0:=
-	xfce-base/garcon:=
-	xfce-base/libxfce4ui:=
-	xfce-base/libxfce4util:=
-	xfce-base/xfce4-panel:="
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_AS_NEEDED=OFF
-		-DENABLE_LINKER_OPTIMIZED_HASH_TABLES=OFF
-		-DENABLE_DEVELOPER_MODE=OFF
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.1.6.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.0.ebuild
index 0a191020f9aa..0a191020f9aa 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.1.6.ebuild
+++ b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.0.ebuild